This commit was manufactured by cvs2svn to create tag 'v20070315-1648'.
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/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 d249b83..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;&#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.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, 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/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="Link"
-            description="Create new Link"
-            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 1d41fd7..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/model/epfdiagram.gmfgraph
+++ /dev/null
@@ -1,313 +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"/>
-    </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="185"
-          green="205"
-          blue="230"/>
-      <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 ca96b0f..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="Link"
-          description="Create new Link">
-        <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 465e171..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/plugin.properties
+++ /dev/null
@@ -1,17 +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
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 3b68eab..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/plugin.xml
+++ /dev/null
@@ -1,527 +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>                      
-  </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>
-   </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>
-   </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="Link"
-               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>
-    <extension
-         point="org.eclipse.epf.library.edit.nestedCommandProviders">
-      <nestedCommandProvider class="org.eclipse.epf.diagramming.base.commands.NestedCommandProvider"/>
-  </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 cfa1877..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/DiagrammingResources.java
+++ /dev/null
@@ -1,59 +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.diagram.DiagramResources;
-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, DiagramResources.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/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/CopyDiagramCommand.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CopyDiagramCommand.java
deleted file mode 100644
index e9e8668..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CopyDiagramCommand.java
+++ /dev/null
@@ -1,326 +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 implementation
-//------------------------------------------------------------------------------
-
-package org.eclipse.epf.diagramming.base.commands;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.Transaction;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.epf.common.CommonPlugin;
-import org.eclipse.epf.diagram.core.DiagramCorePlugin;
-import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.diagram.core.services.DiagramHelper;
-import org.eclipse.epf.diagram.core.services.DiagramManager;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.NodeContainer;
-import org.eclipse.epf.library.edit.command.IResourceAwareCommand;
-import org.eclipse.epf.library.edit.util.IDiagramManager;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.uml2.uml.ActivityParameterNode;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-
-/**
- * 
- * It does copy the diagram for the activity
- * 
- * @author Shilpa Toraskar
- * @since 1.2
- */
-public class CopyDiagramCommand extends AbstractCommand implements
-		IResourceAwareCommand {
-
-	private Collection elements;
-
-	private Map copyToOriginalMap;
-
-	private Collection<Diagram> copiedElements;
-
-	private static final boolean DEBUG = DiagramCorePlugin.getDefault()
-			.isDebugging();
-
-	private Process targetProcess;
-
-	private DiagramManager mgr;
-	private InternalTransactionalEditingDomain domain;
-
-	/**
-	 * 
-	 */
-	public CopyDiagramCommand(Collection elements, Map copyToOriginalMap,
-			Process targetProcess) {
-		this.elements = elements;
-		this.copyToOriginalMap = copyToOriginalMap;
-		this.targetProcess = targetProcess;
-
-		// get diagram manager and domain
-		mgr = DiagramManager.getInstance(targetProcess);
-		domain = mgr.getEditingDomain();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.command.Command#execute()
-	 */
-	public void execute() {
-		redo();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.command.Command#redo()
-	 */
-	public void redo() {
-		
-		if (copiedElements == null) {
-			copiedElements = new ArrayList<Diagram>();
-		} else {
-			copiedElements.clear();
-		}
-
-		try {
-			for (Iterator iter = elements.iterator(); iter.hasNext();) {
-				Object e = (Object) iter.next();
-				Object orig = copyToOriginalMap.get(e);
-				if (orig != null && orig instanceof Activity && e != null
-						&& e instanceof Activity) {
-					Activity copyActivity = (Activity) e;
-					Activity origActivity = (Activity) orig;
-
-					Collection diagrams = DiagramHelper
-							.getDiagrams(origActivity);
-					if (diagrams != null && !diagrams.isEmpty()) {
-						for (Iterator itor = diagrams.iterator(); itor
-								.hasNext();) {
-							Diagram diagram = (Diagram) itor.next();
-							if (diagram != null) {
-								// copy the diagram
-								Diagram diagramCopy = (Diagram) DiagramHelper
-										.copyDiagram(domain, diagram);
-
-								// update children references
-								updateReferences(diagramCopy);
-
-								Transaction tx = domain.startTransaction(false,
-										Collections.EMPTY_MAP);
-
-								// associate with the activity
-								int diagramType = DiagramHelper
-										.getDiagramType(diagramCopy);
-								mgr.associate(diagramCopy, diagramType,
-										(Activity) copyActivity);
-
-								tx.commit();
-
-								copiedElements.add(diagramCopy);
-							}
-						}
-					}
-				}
-			}
-		} catch (Exception ex) {
-			CommonPlugin.getDefault().getLogger().logError(ex);
-			if (DEBUG) {
-				ex.printStackTrace();
-			}
-		} finally {
-		}
-	}
-
-	/**
-	 * Update eAnnotations references
-	 * 
-	 * @param copy
-	 */
-	public void updateReferences(Diagram copy) {
-		int diagramType = DiagramHelper.getDiagramType(copy);
-		for (Iterator itor = copy.getChildren().iterator(); itor.hasNext();) {
-
-			Node node = (Node) itor.next();
-			EObject obj = node.getElement();
-
-			if (diagramType == IDiagramManager.ACTIVITY_DIAGRAM) {
-				if (obj instanceof StructuredActivityNode
-						|| obj instanceof ActivityParameterNode) {
-					EModelElement modelElement = (EModelElement) obj;
-					MethodElement me = BridgeHelper
-							.getMethodElementFromAnnotation(modelElement,
-									targetProcess.eResource().getResourceSet());
-
-					Object mappedMethodElement = getCopiedElement(
-							copyToOriginalMap, me);
-					if (mappedMethodElement != null) {
-						BridgeHelper.addEAnnotation(modelElement,
-								(MethodElement) mappedMethodElement);
-					}
-
-				}
-			} else if (diagramType == IDiagramManager.ACTIVITY_DETAIL_DIAGRAM) {
-				if (obj instanceof NodeContainer) {
-					NodeContainer nodeContainer = (NodeContainer) obj;
-					// do mapping for nodecontainer
-					MethodElement me = nodeContainer.getLinkedElement();
-					Object mappedMethodElement = getCopiedElement(
-							copyToOriginalMap, me);
-					if (mappedMethodElement != null) {
-						nodeContainer
-								.setLinkedElement((MethodElement) mappedMethodElement);
-					}
-
-					// do mapping for its children
-					List nodes = nodeContainer.getNodes();
-
-					for (int i = 0; i < nodes.size(); i++) {
-						NamedNode namedNode = (NamedNode) nodes.get(i);
-						me = namedNode.getLinkedElement();
-
-						mappedMethodElement = getCopiedElement(
-								copyToOriginalMap, me);
-						if (mappedMethodElement != null) {
-							namedNode
-									.setLinkedElement((MethodElement) mappedMethodElement);
-						}
-					}
-				}
-			} else if (diagramType == IDiagramManager.WORK_PRODUCT_DEPENDENCY_DIAGRAM) {
-				if (obj instanceof NamedNode) {
-					NamedNode namedNode = (NamedNode) obj;
-					MethodElement me = namedNode.getLinkedElement();
-
-					Object mappedMethodElement = getCopiedElement(
-							copyToOriginalMap, me);
-					if (mappedMethodElement != null) {
-						namedNode
-								.setLinkedElement((MethodElement) mappedMethodElement);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get copied element from the map
-	 * 
-	 * @param copiedMap
-	 * @param element
-	 * @return
-	 */
-	private Object getCopiedElement(Map copiedMap, Object element) {
-		Set keys = copiedMap.keySet();
-		for (Iterator itor = keys.iterator(); itor.hasNext();) {
-			Object key = itor.next();
-			Object value = copiedMap.get(key);
-			if (value.equals(element))
-				return key;
-		}
-
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.command.AbstractCommand#prepare()
-	 */
-	protected boolean prepare() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.command.AbstractCommand#undo()
-	 */
-	public void undo() {
-		if (!(copiedElements == null || copiedElements.isEmpty())) {
-			try {
-				Transaction tx = domain.startTransaction(false,
-						Collections.EMPTY_MAP);
-				for (Iterator iter = copiedElements.iterator(); iter.hasNext();) {
-					Diagram diagram = (Diagram) iter.next();
-
-					mgr.getResource().getContents()
-							.remove(diagram.getElement());
-					mgr.getResource().getContents().remove(diagram);
-				}
-				copiedElements.clear();
-				tx.commit();
-			} catch (Exception ex) {
-				CommonPlugin.getDefault().getLogger().logError(ex);
-				if (DEBUG) {
-					ex.printStackTrace();
-				}
-			} finally {
-
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.library.edit.command.IResourceAwareCommand#getModifiedResources()
-	 */
-	public Collection getModifiedResources() {
-		if (copiedElements == null || copiedElements.isEmpty()) {
-			// command is not executed yet
-			return Collections.EMPTY_LIST;
-		}
-		HashSet<Object> modifiedResources = new HashSet<Object>();
-
-		for (Iterator iter = copiedElements.iterator(); iter.hasNext();) {
-			Diagram diagram = (Diagram) iter.next();
-			if(diagram != null && diagram.eResource() != null)
-				modifiedResources.add(diagram.eResource());
-		}
-
-		return modifiedResources;
-	}
-	
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.command.AbstractCommand#dispose()
-	 */
-	public void dispose() {
-		if (mgr != null)
-			mgr.release();
-
-		super.dispose();
-	}
-}
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/DeleteDiagramCommand.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/DeleteDiagramCommand.java
deleted file mode 100644
index 25806f9..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/DeleteDiagramCommand.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 java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.epf.diagram.core.services.DiagramHelper;
-import org.eclipse.epf.diagram.core.services.DiagramManager;
-import org.eclipse.epf.library.edit.command.DeleteMethodElementCommand;
-import org.eclipse.epf.library.edit.command.IResourceAwareCommand;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.gmf.runtime.common.ui.services.editor.EditorService;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Command to delete the diagram/diagram element of given Activity/CP, this command is performed
- * through nested commands in {@link DeleteMethodElementCommand}.  
- * @author Shashidhar Kannoori
- */
-public class DeleteDiagramCommand extends AbstractCommand implements IResourceAwareCommand {
-
-	private Collection elementsToRemove;
-	private Process targetProcess;
-	private DiagramManager dMgr = null;
-
-	/**
-	 * 
-	 */
-	public DeleteDiagramCommand(Collection elementsToRemove, Process targetProcess) {
-		this.elementsToRemove = elementsToRemove;
-		this.targetProcess = targetProcess;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.command.Command#execute()
-	 */
-	public void execute() {
-		try {
-			for (Iterator iter = elementsToRemove.iterator(); iter.hasNext();) {
-				MethodElement element = (MethodElement) iter.next();
-				if (element instanceof Activity) {
-					Collection diagrams = DiagramHelper
-							.getDiagrams((Activity) element);
-					for (Iterator iterator = diagrams.iterator(); iterator
-							.hasNext();) {
-						Diagram diagram = (Diagram) iterator.next();
-						if (diagram != null) {
-							// Before deleting close opened diagram editors.
-							closeDiagramEditor(diagram);
-							// Delete Diagram.
-							DiagramHelper.deleteDiagram(diagram);
-						}
-					}
-				}
-			}
-		} catch (Exception e) {
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.command.Command#redo()
-	 */
-	public void redo() {
-		execute();
-	}
-
-	public Collection getModifiedResources() {
-		dMgr = DiagramManager.getInstance(targetProcess);
-		HashSet<Object> modifiedResources = new HashSet<Object>();
-		try{
-			if(dMgr != null && dMgr.getResource() != null){
-				modifiedResources.add(dMgr.getResource());
-			}
-		}catch(Exception e){
-			
-		}
-		return modifiedResources;
-	}
-	@Override
-	public boolean canExecute() {
-		return targetProcess != null;
-	}
-	
-	@Override
-	public void dispose() {
-		if(dMgr != null){
-			dMgr.release();
-		}
-		super.dispose();
-	}
-	
-	private void closeDiagramEditor(Diagram diagram){
-		List editors = EditorService.getInstance().getRegisteredEditorParts();
-		Iterator it = editors.iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-
-			if (obj instanceof DiagramEditor) {
-				DiagramEditor diagramEditor = ((DiagramEditor) obj);
-				if (diagramEditor.getDiagram().equals(diagram)) {
-					//it's already open, just close it.
-					PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-						.getActivePage().activate(diagramEditor);
-					PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-					.getActivePage().closeEditor(diagramEditor, false);
-				}
-			}
-		}
-	}
-	
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/DiagramCopyCommand.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/DiagramCopyCommand.java
deleted file mode 100644
index bf26c57..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/DiagramCopyCommand.java
+++ /dev/null
@@ -1,195 +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.Collections;
-import java.util.HashMap;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
-import org.eclipse.emf.edit.command.CopyCommand.Helper;
-import org.eclipse.emf.transaction.Transaction;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.diagramming.base.util.UmaUmlUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.ObjectNode;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class DiagramCopyCommand extends AbstractCommand {
-
-	private Diagram diagram;
-	private InternalTransactionalEditingDomain domain;
-	private Resource resource;
-	private Diagram copyDiagram;
-	private Activity origAct;
-	private Activity copyAct;
-	private Helper copiedHelper;
-	/**
-	 * 
-	 */
-	public DiagramCopyCommand(InternalTransactionalEditingDomain domain, Diagram diagram, 
-			Activity origAct, Activity copyAct, Resource resource, Helper copiedHelper) {
-		this.domain = domain;
-		this.diagram = diagram;
-		this.copyAct = copyAct;
-		this.origAct = origAct;
-		this.resource = resource;
-		this.copiedHelper = copiedHelper;
-
-	}
-
-	/**
-	 * @param label
-	 */
-	public DiagramCopyCommand(String label) {
-		super(label);
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param label
-	 * @param description
-	 */
-	public DiagramCopyCommand(String label, String description) {
-		super(label, description);
-		// TODO Auto-generated constructor stub
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.command.Command#execute()
-	 */
-	public void execute() {
-		
-		try{
-			Transaction t = domain.startTransaction(false, new HashMap());
-			copyDiagram = copyDiagram(diagram, copyAct);
-			UmaUmlUtil.updateEAnnotationForUml((NamedElement)copyDiagram.getElement(),
-				copyAct.getGuid());
-			resource.getContents().add(copyDiagram.getElement());
-			resource.getContents().add(copyDiagram);
-			
-			// TODO: should not save until, save action performed.
-			resource.save(Collections.EMPTY_MAP);
-			t.commit();
-			
-		}catch(Exception e){
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.command.Command#redo()
-	 */
-	public void redo() {
-		execute();
-	}
-	public void undo() {
-		if(copyDiagram != null){
-			try{
-				Transaction t = domain.startTransaction(false, new HashMap());
-				resource.getContents().remove(copyDiagram);
-				resource.getContents().remove(copyDiagram.getElement());
-				resource.save(Collections.EMPTY_MAP);
-				t.commit();
-			}catch(Exception e){
-				e.printStackTrace();
-			}
-		}
-		super.undo();
-	}
-	public boolean canExecute() {
-		// TODO Auto-generated method stub
-		return diagram != 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);
-			UmaUmlUtil.updateEAnnotationForUml((NamedElement)umlCopy, act.getGuid());
-		}
-		if(copy != null){
-			return copy;
-		}
-		return null;
-	}
-	private Diagram copy(Diagram sourceObject){
-		Copier copier = new Copier() {
-		
-			/**
-			 * 
-			 */
-			private static final long serialVersionUID = 1L;
-
-			public EObject copy(EObject eObject) {
-				// TODO Auto-generated method stub
-				EObject copy = super.copy(eObject);
-				if(copy instanceof StructuredActivityNode || copy instanceof ObjectNode){
-					MethodElement orig = getMethodElementFromAnnotation((EModelElement)eObject);
-					EObject copyelement = (EObject)copiedHelper.get(orig);
-					BridgeHelper.addEAnnotation((EModelElement)copy, (MethodElement)copyelement);
-				}
-				return copy;
-			}
-		};
-		EObject umlCopy = copier.copy(sourceObject.getElement());
-		Diagram result = (Diagram)copier.copy(sourceObject);
-		result.setElement(umlCopy);
-		copier.copyReferences();
-		return result;
-	}
-	
-	public MethodElement getMethodElementFromAnnotation(EModelElement node) {		
-		
-		org.eclipse.epf.uma.Process p = TngUtil.getOwningProcess(origAct);
-		Resource resource = p.eResource();
-		if (resource != null && resource.getResourceSet() != null) {
-			EAnnotation eAnnotation = node.getEAnnotation(BridgeHelper.UMA_ELEMENT);
-			if (eAnnotation != null) {
-				String uri = (String) eAnnotation.getDetails().get(BridgeHelper.UMA_URI);
-				if (uri != null) {
-					EObject o = resource.getResourceSet().getEObject(
-							URI.createURI(uri), false);
-					if (o instanceof MethodElement) {
-						return (MethodElement) o;
-					} else {
-						// TODO: log error
-						System.err.println("Not a method element: " + o); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/EditNameCommand.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/EditNameCommand.java
deleted file mode 100644
index 388722b..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/EditNameCommand.java
+++ /dev/null
@@ -1,79 +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.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.NamedElement;
-
-/**
- * 
- * @author Shashidhar Kannoori
- */
-public class EditNameCommand extends Command {
-	
-	public static final String label = "EditNameCommand";
-	private NamedElement object;
-	private String newValue;
-	private String oldName, oldPresentationName;
-	private String elementGuid;
-	
-	public EditNameCommand(NamedElement object, String newValue) {
-		super(label);
-		this.object = object;
-		this.newValue = newValue;
-	}
-	
-	public boolean canExecute() {
-		return super.canExecute();
-	}
-	
-	public void execute() {
-		MethodElement element = BridgeHelper.getMethodElement((ActivityNode)object);
-		
-		// set Name
-		this.oldName = element.getName();
-		element.setName(newValue);
-		elementGuid = element.getGuid();
-		
-		// setPresentationName
-		if(element instanceof DescribableElement){
-			this.oldPresentationName = ((DescribableElement)element).getPresentationName(); 
-			((DescribableElement)element).setPresentationName(newValue);
-		}
-		
-	}
-	
-	public void redo() {
-		execute();
-	}
-	public void undo() {
-		ILibraryManager manager = LibraryService.getInstance()
-							.getCurrentLibraryManager();
-		if(manager != null){
-			MethodElement element = manager.getMethodElement(elementGuid);
-			if(element != null){
-				element.setName(this.oldName);
-				if(element instanceof DescribableElement){
-					((DescribableElement)element).setPresentationName(this.oldPresentationName);
-				}
-			}
-		}
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/NestedCommandProvider.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/NestedCommandProvider.java
deleted file mode 100644
index c7c59e0..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/NestedCommandProvider.java
+++ /dev/null
@@ -1,342 +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 implementation
-//------------------------------------------------------------------------------
-
-package org.eclipse.epf.diagramming.base.commands;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.CopyCommand.Helper;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.AdapterFactoryTreeIterator;
-import org.eclipse.emf.edit.provider.WrapperItemProvider;
-import org.eclipse.epf.common.CommonPlugin;
-import org.eclipse.epf.diagram.core.DiagramCorePlugin;
-import org.eclipse.epf.library.edit.IConfigurator;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.DeleteMethodElementCommand;
-import org.eclipse.epf.library.edit.command.INestedCommandProvider;
-import org.eclipse.epf.library.edit.command.MethodElementAddCommand;
-import org.eclipse.epf.library.edit.command.ResourceAwareCompoundCommand;
-import org.eclipse.epf.library.edit.process.command.ActivityDropCommand;
-import org.eclipse.epf.library.edit.ui.IActionTypeProvider;
-import org.eclipse.epf.library.edit.util.ActivityHandler;
-import org.eclipse.epf.library.edit.util.ExposedAdapterFactory;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.edit.domain.TraceableAdapterFactoryEditingDomain;
-
-/**
- * @author Shilpa Toraskar
- * @since 1.2
- * 
- */
-public class NestedCommandProvider implements INestedCommandProvider {
-
-	private static final boolean DEBUG = DiagramCorePlugin.getDefault()
-			.isDebugging();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.library.edit.command.INestedCommandProvider#createNestedCommand(org.eclipse.emf.common.command.Command)
-	 */
-	public Command createNestedCommand(Command command) {
-		if (command instanceof ActivityDropCommand) {
-			ActivityDropCommand cmd = (ActivityDropCommand) command;
-			if (IActionTypeProvider.COPY == cmd.getType())
-				return createNestedCommandForCopy(cmd);
-			else if (IActionTypeProvider.DEEP_COPY == cmd.getType())
-				return createNestedCommandForDeepCopy(cmd);
-		}
-		return null;
-	}
-
-	/**
-	 * Create nested command for Drag & Drop Copy
-	 * 
-	 * @param command
-	 * @return
-	 */
-	private Command createNestedCommandForCopy(ActivityDropCommand command) {
-		ActivityHandler activityHandler = ((ActivityDropCommand) command)
-				.getActivityHandler();
-		if (activityHandler != null
-				&& !activityHandler.getActivities().isEmpty()) {
-			CompoundCommand cmd = new ResourceAwareCompoundCommand(
-					CompoundCommand.MERGE_COMMAND_ALL);
-
-			Helper copiedHelper = command.getActivityHandler().getCopyHelper();
-			Activity targetActivity = command.getActivity();
-			Process targetProc = TngUtil.getOwningProcess(targetActivity);
-			Set keys = copiedHelper.keySet();
-
-			if (targetProc != null) {
-				try {
-					Map copyToOriginalMap = new HashMap();
-					for (Iterator iter = keys.iterator(); iter.hasNext();) {
-						EObject origAct = (EObject) iter.next();
-						EObject copyAct = (EObject) copiedHelper.get(origAct);
-	
-						if (origAct instanceof Activity
-								&& copyAct instanceof Activity) {
-							if (DEBUG) {
-								System.out.println("OrigAct:" + origAct);
-								System.out.println("CopyAct:" + copyAct);
-							}
-	
-							copyToOriginalMap.put(copyAct, origAct);
-						}
-	
-					}
-	
-					cmd.append(new CopyDiagramCommand(copyToOriginalMap.keySet(),
-							copyToOriginalMap, targetProc));
-				
-				} catch (Exception ex) {
-					CommonPlugin.getDefault().getLogger().logError(ex);
-					if (DEBUG) {
-						ex.printStackTrace();
-					}
-				} finally {
-	
-				}
-			}
-			if (!cmd.isEmpty()) {
-				return cmd;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Created nested command for Drag and Drop Deep copy
-	 * 
-	 * @param command
-	 * @return
-	 */
-	private Command createNestedCommandForDeepCopy(ActivityDropCommand command) {
-		ActivityHandler activityHandler = ((ActivityDropCommand) command)
-				.getActivityHandler();
-		if (activityHandler != null
-				&& !activityHandler.getDeepCopies().isEmpty()) {
-			CompoundCommand cmd = new ResourceAwareCompoundCommand(
-					CompoundCommand.MERGE_COMMAND_ALL);
-			ExposedAdapterFactory adapterFactory = (ExposedAdapterFactory) TngAdapterFactory.INSTANCE
-					.getProcessComposedAdapterFactory();
-			MethodConfiguration config = activityHandler.getDeepCopyConfig();
-			Process targetProc = activityHandler.getTargetProcess();
-			if (config == null) {
-				config = targetProc.getDefaultContext();
-			}
-			IConfigurator configurator = ((IConfigurator) adapterFactory
-					.getFilter());
-			MethodConfiguration oldConfig = configurator
-					.getMethodConfiguration();
-			try {
-				configurator.setMethodConfiguration(config);
-				int size = activityHandler.getDeepCopies().size();
-				for (int i = 0; i < size; i++) {
-					Activity copyAct = (Activity) activityHandler
-							.getDeepCopies().get(i);
-					Activity origAct = (Activity) activityHandler
-							.getDeepCopyToOriginalMap().get(copyAct);
-					org.eclipse.epf.uma.Process srcProc = TngUtil
-							.getOwningProcess(origAct);
-
-					Map copyToOriginalMap = new HashMap();
-
-					final Set deepCopySet = new HashSet(activityHandler
-							.getDeepCopies());
-					boolean sameProcess = srcProc == targetProc;
-					Iterator copyTree = new AdapterFactoryTreeIterator(
-							adapterFactory, copyAct);
-					Iterator originalTree;
-					if (sameProcess) {
-						originalTree = new AdapterFactoryTreeIterator(
-								adapterFactory, origAct) {
-
-							private static final long serialVersionUID = 1L;
-
-							protected Iterator getChildren(Object o) {
-								if (deepCopySet.contains(o)) {
-									return Collections.EMPTY_LIST.iterator();
-								}
-								return super.getChildren(o);
-							}
-						};
-					} else {
-						originalTree = new AdapterFactoryTreeIterator(
-								adapterFactory, origAct);
-					}
-					while (copyTree.hasNext()) {
-						Object copy = copyTree.next();
-						Object orig;
-						if (sameProcess) {
-							do {
-								orig = originalTree.next();
-							} while (deepCopySet.contains(orig));
-						} else {
-							orig = originalTree.next();
-						}
-						if (copy instanceof WrapperItemProvider)
-							copy = TngUtil.unwrap(copy);
-						if (orig instanceof WrapperItemProvider)
-							orig = TngUtil.unwrap(orig);
-						copyToOriginalMap.put(copy, orig);
-					}
-					cmd.append(new CopyDiagramCommand(copyToOriginalMap
-							.keySet(), copyToOriginalMap, targetProc));
-				}
-			} finally {
-				configurator.setMethodConfiguration(oldConfig);
-			}
-			if (!cmd.isEmpty()) {
-				return cmd;
-			}
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.library.edit.command.INestedCommandProvider#createRelatedObjects(java.util.Collection,
-	 *      org.eclipse.emf.common.command.Command)
-	 */
-	public Command createRelatedObjects(Collection createdElements,
-			Command createCommand) {
-
-		CompoundCommand cmd = new ResourceAwareCompoundCommand(
-				CompoundCommand.MERGE_COMMAND_ALL);
-		if (createCommand instanceof MethodElementAddCommand) {
-
-			MethodElementAddCommand meCommand = ((MethodElementAddCommand) createCommand);
-			Command addCommand = meCommand.getCommand();
-			if (addCommand instanceof AddCommand) {
-				EditingDomain ed = ((AddCommand) addCommand).getDomain();
-				
-				if (((AddCommand)addCommand).getOwner() instanceof ProcessPackage) {
-					if (ed instanceof TraceableAdapterFactoryEditingDomain) {
-						Map copyToOriginalMap = ((TraceableAdapterFactoryEditingDomain) ed)
-								.getCopyToOriginalMap();
-						if (!copyToOriginalMap.isEmpty()) {
-							Collection affects = meCommand.getAffectedObjects();
-							for (Iterator iter = affects.iterator(); iter
-									.hasNext();) {
-								MethodElement element = (MethodElement) iter
-										.next();
-								if (element instanceof ProcessComponent) {
-									cmd.append(new CopyDiagramCommand(
-											copyToOriginalMap.keySet(),
-											copyToOriginalMap,
-											((ProcessComponent) element)
-													.getProcess()));
-								}
-							}
-						}
-					}
-				} else {
-					// Copy/paste within the process editor
-					if (ed instanceof TraceableAdapterFactoryEditingDomain) {
-						Map originalToCopyMap = ((TraceableAdapterFactoryEditingDomain) ed)
-								.getOriginalToClipboardMap();
-						Map copyToOriginalMap = new HashMap();
-						Object owner = ((AddCommand) addCommand).getOwner();
-						Process targetProc = TngUtil.getOwningProcess(owner);
-						if (targetProc != null) {
-							for (Iterator iter = originalToCopyMap.keySet()
-									.iterator(); iter.hasNext();) {
-								Object key = iter.next();
-								Object val = originalToCopyMap.get(key);
-	
-								copyToOriginalMap.put(val, key);
-							}
-	
-							cmd.append(new CopyDiagramCommand(copyToOriginalMap.keySet(),
-									copyToOriginalMap, targetProc));
-						}
-					}
-				}
-			}
-		}
-		if (!cmd.isEmpty()) {
-			return cmd;
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.library.edit.command.INestedCommandProvider#removeRelatedObjects(java.util.Collection,
-	 *      org.eclipse.emf.common.command.Command)
-	 */
-	public Command removeRelatedObjects(Collection deletedElements,
-			Command deleteCommand) {
-		CompoundCommand cmd = new ResourceAwareCompoundCommand(
-				CompoundCommand.MERGE_COMMAND_ALL);
-		if(deleteCommand instanceof DeleteMethodElementCommand){
-			Command removeCommand = ((DeleteMethodElementCommand)deleteCommand).getCommand();
-			if(removeCommand instanceof RemoveCommand){
-				Object owner = ((RemoveCommand)removeCommand).getOwner();
-				if(owner instanceof BreakdownElement){
-					Collection allElements = new ArrayList();
-					for (Iterator iter = deletedElements.iterator(); iter
-							.hasNext();) {
-						MethodElement element = (MethodElement) iter.next();
-						if(element instanceof Activity){
-							allElements.add(element);
-							allElements.addAll(((Activity)element).getBreakdownElements());
-						}
-					}
-					
-					if(!allElements.isEmpty()){
-						cmd.append(new DeleteDiagramCommand(allElements, TngUtil.getOwningProcess((BreakdownElement)owner)));
-					}
-				}
-			}
-		}
-		if(!cmd.isEmpty()){
-			return cmd;
-		}
-		return null;
-	}
-
-}
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/parts/DiamondNodeEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/parts/DiamondNodeEditPart.java
deleted file mode 100644
index 6491e8b..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/parts/DiamondNodeEditPart.java
+++ /dev/null
@@ -1,174 +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.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagramming.base.figures.DecisionNodeFigure;
-import org.eclipse.epf.diagramming.base.figures.RelativeXYAnchor;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.LocationRequest;
-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 DiamondNodeEditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @param view
-	 */
-	public DiamondNodeEditPart(View view) {
-		super(view);
-		// TODO Auto-generated constructor stub
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#createNodeFigure()
-	 */
-	protected NodeFigure createNodeFigure() {
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.edit.NodeEditPart#getSourceConnectionAnchor(org.eclipse.gef.ConnectionEditPart)
-	 * @custom
-	 */
-	public ConnectionAnchor getSourceConnectionAnchor(
-			ConnectionEditPart connection) {
-		boolean isRelative = false;
-		Point sourceEndPoint;
-		if (recentSourceEndPoint == null) {
-			// get source end point from the model
-			Link link = (Link) connection.getModel();
-			sourceEndPoint = link.getSourceEndPoint();
-			isRelative = true;
-		} else {
-			sourceEndPoint = recentSourceEndPoint;
-		}
-		if (sourceEndPoint != null) {
-			return new RelativeXYAnchor(getFigure(), sourceEndPoint, isRelative);
-		}
-		return super.getSourceConnectionAnchor(connection);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.edit.NodeEditPart#getSourceConnectionAnchor(org.eclipse.gef.Request)
-	 * @custom
-	 */
-	public ConnectionAnchor getSourceConnectionAnchor(Request request) {
-		Point p = null;
-		if (request instanceof CreateConnectionRequest) {
-			CreateConnectionRequest req = (CreateConnectionRequest) request;
-			p = req.getLocation();
-		} else if (request instanceof LocationRequest) {
-			p = ((LocationRequest) request).getLocation();
-		}
-		if (p != null) {
-			recentSourceEndPoint = getLocation(p);
-			return new RelativeXYAnchor(getFigure(), recentSourceEndPoint, true);
-		}
-		return super.getSourceConnectionAnchor(request);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.edit.NodeEditPart#getTargetConnectionAnchor(org.eclipse.gef.ConnectionEditPart)
-	 * @custom
-	 */
-	public ConnectionAnchor getTargetConnectionAnchor(
-			ConnectionEditPart connection) {
-		boolean isRelative = false;
-		Point targetEndPoint;
-		if (recentTargetEndPoint == null) {
-			// get target end point from model
-			Link link = (Link) connection.getModel();
-			targetEndPoint = link.getTargetEndPoint();
-			isRelative = true;
-		} else {
-			targetEndPoint = recentTargetEndPoint;
-		}
-		if (targetEndPoint != null) {
-			return new RelativeXYAnchor(getFigure(), targetEndPoint, isRelative);
-		}
-
-		return super.getTargetConnectionAnchor(connection);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.edit.NodeEditPart#getTargetConnectionAnchor(org.eclipse.gef.Request)
-	 * @custom
-	 */
-	public ConnectionAnchor getTargetConnectionAnchor(Request request) {
-		Point p = null;
-		if (request instanceof CreateConnectionRequest) {
-			CreateConnectionRequest req = (CreateConnectionRequest) request;
-			p = req.getLocation();
-		} else if (request instanceof LocationRequest) {
-			p = ((LocationRequest) request).getLocation();
-		}
-		if (p != null) {
-			recentTargetEndPoint = getLocation(p);
-			return new RelativeXYAnchor(getFigure(), recentTargetEndPoint, true);
-		}
-
-		return super.getTargetConnectionAnchor(request);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.util.ConnectionAnchorLocator#getLocation(Point)
-	 * @custom
-	 * 
-	 */
-	public Point getLocation(Point reference) {
-		DecisionNodeFigure f = ((DecisionNodeFigure) getFigure());
-
-		// translate points to absolute
-		Point[] points = new Point[f.getPoints().size()];
-		for (int i = f.getPoints().size() - 1; i > -1; i--) {
-			Point p = f.getPoints().getPoint(i);
-			f.translateToAbsolute(p);
-			points[i] = p;
-		}
-
-		Point p = org.eclipse.epf.diagramming.base.util.AnchorUtil.getClosestPoint(points, reference);
-		if (p != null) {
-			Rectangle r = f.getBounds().getCopy();
-			f.translateToAbsolute(r);
-			p.performTranslate(-r.x, -r.y);
-		}
-		return p;
-	}
-	
-	/*
-	 * @custom
-	 */
-	private Point recentSourceEndPoint;
-
-	/*
-	 * @custom
-	 */
-	private Point recentTargetEndPoint;
-
-}
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/ViewLabelDirectEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ViewLabelDirectEditPolicy.java
deleted file mode 100644
index 49ec5f2..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ViewLabelDirectEditPolicy.java
+++ /dev/null
@@ -1,65 +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.emf.ecore.EObject;
-import org.eclipse.epf.diagramming.base.commands.EditNameCommand;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.gef.ui.internal.parts.TextCellEditorEx;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ObjectNode;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class ViewLabelDirectEditPolicy extends LabelDirectEditPolicy {
-
-	protected Command getDirectEditCommand(DirectEditRequest edit) {
-		Command command;
-		command = super.getDirectEditCommand(edit);
-
-		// stitch the uma command to change the name on uma side.
-		if (command != null) {
-			if (edit.getCellEditor() instanceof TextCellEditorEx)
-				if (!((TextCellEditorEx) edit.getCellEditor())
-						.hasValueChanged())
-					return null;
-
-			String labelText = (String) edit.getCellEditor().getValue();
-
-			ITextAwareEditPart compartment = (ITextAwareEditPart) getHost();
-			EObject model = (EObject) compartment.getModel();
-			EObject umlObject = null;
-			if (model instanceof View) {
-				View view = (View) model;
-				umlObject = ViewUtil.resolveSemanticElement(view);
-				if (umlObject instanceof ActivityNode) {
-					command = command.chain(new EditNameCommand(
-							(ActivityNode) umlObject, labelText));
-				}
-				if (umlObject instanceof ObjectNode) {
-					command = command.chain(new EditNameCommand(
-							(ObjectNode) umlObject, labelText));
-				}
-			}
-		}
-		return command;
-	}
-}
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 78fc548..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityFinalNodeEditPart.java
+++ /dev/null
@@ -1,316 +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;
-	}
-
-	/**
-	 * @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(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
-
-			);
-
-			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 8701da7..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityParameterNodeName2EditPart.java
+++ /dev/null
@@ -1,651 +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());
-	}
-
-	/**
-	 * @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.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 7fab6d5..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityParameterNodeNameEditPart.java
+++ /dev/null
@@ -1,627 +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());
-	}
-
-	/**
-	 * @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.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 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.ActivityPartition_1008;
-					}
-					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();
-		refreshBounds();
-	}
-
-	/**
-	 * @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 addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(this,
-				getFigure(), new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		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/ActivityPartitionNameEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartitionNameEditPart.java
deleted file mode 100644
index 89224de..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartitionNameEditPart.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 ActivityPartitionNameEditPart extends CompartmentEditPart
-		implements ITextAwareEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4006;
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * @generated
-	 */
-	public ActivityPartitionNameEditPart(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 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.ActivityPartition_2001;
-					}
-					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();
-		refreshBounds();
-	}
-
-	/**
-	 * @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 addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(this,
-				getFigure(), new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		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/ActivityPartitionPartitionCampartment2EditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartitionPartitionCampartment2EditPart.java
deleted file mode 100644
index cf60ee5..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartitionPartitionCampartment2EditPart.java
+++ /dev/null
@@ -1,155 +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.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-
-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.epf.diagramming.edit.policies.ActivityPartitionPartitionCampartment2CanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ActivityPartitionPartitionCampartment2ItemSemanticEditPolicy;
-
-import org.eclipse.gef.GraphicalEditPart;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-
-/**
- * @generated
- */
-public class ActivityPartitionPartitionCampartment2EditPart extends
-		ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5002;
-
-	/**
-	 * @generated
-	 */
-	public ActivityPartitionPartitionCampartment2EditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return "PartitionCampartment";
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super
-				.createFigure();
-		result.setTitleVisibility(false);
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(
-				EditPolicyRoles.SEMANTIC_ROLE,
-				new ActivityPartitionPartitionCampartment2ItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE,
-				new CreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,
-				new DragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new ActivityPartitionPartitionCampartment2CanonicalEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	//public IFigure createFigure() {
-	//	IFigure result = super.createFigure();
-	//	result.setBorder(new LineBorder());
-	//	return result;
-	//}
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		super.handleNotificationEvent(notification);
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(this,
-				getFigure(), new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		// nothing to do -- parent layout does not accept Double constraints as ratio
-		// super.setRatio(ratio); 
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartitionPartitionCampartmentEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartitionPartitionCampartmentEditPart.java
deleted file mode 100644
index 3e65abe..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartitionPartitionCampartmentEditPart.java
+++ /dev/null
@@ -1,162 +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.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-
-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.epf.diagramming.edit.policies.ActivityPartitionPartitionCampartmentCanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ActivityPartitionPartitionCampartmentItemSemanticEditPolicy;
-
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ContainerNodeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;
-
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-
-/**
- * @generated
- */
-public class ActivityPartitionPartitionCampartmentEditPart extends
-		ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5001;
-
-	/**
-	 * @generated
-	 */
-	public ActivityPartitionPartitionCampartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return "PartitionCampartment";
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super
-				.createFigure();
-		result.setTitleVisibility(false);
-		return result;
-	}
-
-	/**
-	 * @modified
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(
-				EditPolicyRoles.SEMANTIC_ROLE,
-				new ActivityPartitionPartitionCampartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE,
-				new CreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,
-				new DragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new ActivityPartitionPartitionCampartmentCanonicalEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new ContainerNodeEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new XYLayoutEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	//public IFigure createFigure() {
-	//	IFigure result = super.createFigure();
-	//	result.setBorder(new LineBorder());
-	//	return result;
-	//}
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		super.handleNotificationEvent(notification);
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(this,
-				getFigure(), new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		// nothing to do -- parent layout does not accept Double constraints as ratio
-		// super.setRatio(ratio); 
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ControlFlowEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ControlFlowEditPart.java
deleted file mode 100644
index ad8ea7d..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ControlFlowEditPart.java
+++ /dev/null
@@ -1,103 +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.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.draw2d.Connection;
-
-import org.eclipse.epf.diagramming.edit.policies.ControlFlowItemSemanticEditPolicy;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
-
-/**
- * @generated
- */
-public class ControlFlowEditPart extends ConnectionNodeEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3001;
-
-	/**
-	 * @generated
-	 */
-	public ControlFlowEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-				new ControlFlowItemSemanticEditPolicy());
-	}
-
-	/**
-	 * 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 Connection createConnectionFigure() {
-		return new ControlFlowFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public class ControlFlowFigure extends
-			org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {
-
-		/**
-		 * @generated
-		 */
-		public ControlFlowFigure() {
-
-			setTargetDecoration(createTargetDecoration());
-		}
-
-		/**
-		 * @generated
-		 */
-		private org.eclipse.draw2d.PolylineDecoration createTargetDecoration() {
-			org.eclipse.draw2d.PolylineDecoration df = new org.eclipse.draw2d.PolylineDecoration();
-			// dispatchNext?
-
-			org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();
-			pl.addPoint(-1, 1);
-			pl.addPoint(0, 0);
-			pl.addPoint(-1, -1);
-			df.setTemplate(pl);
-			df.setScale(getMapMode().DPtoLP(7), getMapMode().DPtoLP(3));
-
-			return df;
-		}
-
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ControlFlowNameEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ControlFlowNameEditPart.java
deleted file mode 100644
index 375c6a3..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ControlFlowNameEditPart.java
+++ /dev/null
@@ -1,643 +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.ConnectionLocator;
-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.editparts.LabelEditPart;
-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 ControlFlowNameEditPart extends LabelEditPart implements
-		ITextAwareEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4012;
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry
-				.getType(ControlFlowNameEditPart.VISUAL_ID), new Point(0, 40));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ControlFlowNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,
-				new LabelDirectEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @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() {
-		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 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.ControlFlow_3001;
-					}
-					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 ControlFlowLabelFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public class ControlFlowLabelFigure extends
-			org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {
-
-		/**
-		 * @generated
-		 */
-		public ControlFlowLabelFigure() {
-
-			this.setText("");
-			createContents();
-		}
-
-		/**
-		 * @generated
-		 */
-		private void createContents() {
-		}
-
-		/**
-		 * @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/DecisionNodeEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/DecisionNodeEditPart.java
deleted file mode 100644
index b5f673f..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/DecisionNodeEditPart.java
+++ /dev/null
@@ -1,271 +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.diagramming.base.figures.DecisionNodeFigure;
-import org.eclipse.epf.diagramming.edit.policies.DecisionNodeCanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.DecisionNodeGraphicalNodeEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.DecisionNodeItemSemanticEditPolicy;
-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
- * @modified by Shashidhar Kannoori.
- */
-public class DecisionNodeEditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 1005;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public DecisionNodeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-				new DecisionNodeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new DecisionNodeGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new DecisionNodeCanonicalEditPolicy());
-		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() {
-		DecisionDiamondFigure figure = new DecisionDiamondFigure();
-		return primaryShape = figure;
-	}
-
-	/**
-	 * @generated
-	 */
-	public DecisionDiamondFigure getPrimaryShape() {
-		return (DecisionDiamondFigure) primaryShape;
-	}
-
-	/**
-	 * @modified
-	 */
-	protected NodeFigure createNodePlate() {
-		return new DecisionNodeFigure(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(DecisionNodeNameEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @modified
-	 */
-	public class DecisionDiamondFigure extends DecisionNodeFigure {
-
-		/**
-		 * @modified
-		 */
-		public DecisionDiamondFigure() {
-
-			super(getMapMode().DPtoLP(50), getMapMode().DPtoLP(50),
-					getMapMode().DPtoLP(50));
-			this.setForegroundColor(org.eclipse.draw2d.ColorConstants.darkBlue
-
-			);
-
-			this.setBackgroundColor(DECISIONDIAMONDFIGURE_BACK);
-
-			this.setPreferredSize(getMapMode().DPtoLP(50), getMapMode().DPtoLP(
-					50));
-			this.setSize(getMapMode().DPtoLP(50), getMapMode().DPtoLP(50));
-
-			createContents();
-		}
-
-		/**
-		 * @generated
-		 */
-		private void createContents() {
-			org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig_0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();
-
-			setFigureDiamondLabel(fig_0);
-
-			Object layData0 = null;
-
-			this.add(fig_0, layData0);
-		}
-
-		/**
-		 * @generated
-		 */
-		private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fDiamondLabel;
-
-		/**
-		 * @generated
-		 */
-		public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureDiamondLabel() {
-			return fDiamondLabel;
-		}
-
-		/**
-		 * @generated
-		 */
-		private void setFigureDiamondLabel(
-				org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig) {
-			fDiamondLabel = 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 DECISIONDIAMONDFIGURE_BACK = new org.eclipse.swt.graphics.Color(
-			null, 185, 205, 230);
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/DecisionNodeNameEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/DecisionNodeNameEditPart.java
deleted file mode 100644
index 208197c..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/DecisionNodeNameEditPart.java
+++ /dev/null
@@ -1,660 +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.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 DecisionNodeNameEditPart extends CompartmentEditPart implements
-		ITextAwareEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4004;
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * @generated
-	 */
-	public DecisionNodeNameEditPart(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(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.DecisionNode_1005;
-					}
-					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 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() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new NodeNameFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public class NodeNameFigure extends
-			org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {
-
-		/**
-		 * @generated
-		 */
-		public NodeNameFigure() {
-
-			this.setText("<...>");
-			createContents();
-		}
-
-		/**
-		 * @generated
-		 */
-		private void createContents() {
-		}
-
-		/**
-		 * @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/ForkNodeEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ForkNodeEditPart.java
deleted file mode 100644
index f21cb6c..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ForkNodeEditPart.java
+++ /dev/null
@@ -1,254 +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.PositionConstants;
-import org.eclipse.draw2d.StackLayout;
-
-import org.eclipse.epf.diagramming.edit.policies.ForkNodeCanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ForkNodeGraphicalNodeEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ForkNodeItemSemanticEditPolicy;
-
-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.editpolicies.ResizableEditPolicy;
-
-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 ForkNodeEditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 1003;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ForkNodeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-				new ForkNodeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new ForkNodeGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new ForkNodeCanonicalEditPolicy());
-		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() {
-		ForkNodeFigure figure = new ForkNodeFigure();
-		return primaryShape = figure;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ForkNodeFigure getPrimaryShape() {
-		return (ForkNodeFigure) primaryShape;
-	}
-
-	/**
-	 * @modified
-	 */
-	protected NodeFigure createNodePlate() {
-		return new DefaultSizeNodeFigure(getMapMode().DPtoLP(100), getMapMode()
-				.DPtoLP(8));
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPolicy getPrimaryDragEditPolicy() {
-		ResizableEditPolicy ep = (ResizableEditPolicy) super
-				.getPrimaryDragEditPolicy();
-
-		ep.setResizeDirections(PositionConstants.WEST | PositionConstants.EAST);
-
-		return ep;
-	}
-
-	/**
-	 * 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 class ForkNodeFigure extends org.eclipse.draw2d.RectangleFigure {
-
-		/**
-		 * @generated
-		 */
-		public ForkNodeFigure() {
-
-			this.setBackgroundColor(FORKNODEFIGURE_BACK
-
-			);
-			this.setPreferredSize(getMapMode().DPtoLP(100), getMapMode()
-					.DPtoLP(8));
-			this.setSize(getMapMode().DPtoLP(100), getMapMode().DPtoLP(8));
-			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 FORKNODEFIGURE_BACK = new org.eclipse.swt.graphics.Color(
-			null, 51, 102, 102);
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ForkNodeNameEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ForkNodeNameEditPart.java
deleted file mode 100644
index 878b183..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ForkNodeNameEditPart.java
+++ /dev/null
@@ -1,660 +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.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 ForkNodeNameEditPart extends CompartmentEditPart implements
-		ITextAwareEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4003;
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * @generated
-	 */
-	public ForkNodeNameEditPart(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(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.ForkNode_1003;
-					}
-					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 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() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new NodeNameFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public class NodeNameFigure extends
-			org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {
-
-		/**
-		 * @generated
-		 */
-		public NodeNameFigure() {
-
-			this.setText("<...>");
-			createContents();
-		}
-
-		/**
-		 * @generated
-		 */
-		private void createContents() {
-		}
-
-		/**
-		 * @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/InitialNodeEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/InitialNodeEditPart.java
deleted file mode 100644
index a0cec14..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/InitialNodeEditPart.java
+++ /dev/null
@@ -1,327 +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.InitialNodeCanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.InitialNodeGraphicalNodeEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.InitialNodeItemSemanticEditPolicy;
-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 InitialNodeEditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 1004;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public InitialNodeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-				new InitialNodeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new InitialNodeGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new InitialNodeCanonicalEditPolicy());
-		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 InitialNodeEditPart.this.isExternalLabel(editPart);
-			}
-		};
-		xlep.setRealLayoutEditPolicy(lep);
-		return xlep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		InitialNodeFigure figure = new InitialNodeFigure();
-		return primaryShape = figure;
-	}
-
-	/**
-	 * @generated
-	 */
-	public InitialNodeFigure getPrimaryShape() {
-		return (InitialNodeFigure) primaryShape;
-	}
-
-	/**
-	 * @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(InitialNodeNameEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isExternalLabel(EditPart childEditPart) {
-		if (childEditPart instanceof InitialNodeNameEditPart) {
-			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();
-	}
-
-	/**
-	 * @generated
-	 */
-	public class InitialNodeFigure extends org.eclipse.draw2d.Ellipse {
-
-		/**
-		 * @generated
-		 */
-		public InitialNodeFigure() {
-
-			this.setForegroundColor(org.eclipse.draw2d.ColorConstants.darkBlue
-
-			);
-			this.setBackgroundColor(INITIALNODEFIGURE_BACK
-
-			);
-			this.setSize(getMapMode().DPtoLP(20), getMapMode().DPtoLP(20));
-			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 INITIALNODEFIGURE_BACK = new org.eclipse.swt.graphics.Color(
-			null, 185, 205, 230);
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/InitialNodeNameEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/InitialNodeNameEditPart.java
deleted file mode 100644
index 7e52705..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/InitialNodeNameEditPart.java
+++ /dev/null
@@ -1,587 +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 InitialNodeNameEditPart extends UMLExtNodeLabelEditPart implements
-		ITextAwareEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4003;
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry
-				.getType(InitialNodeNameEditPart.VISUAL_ID), new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public InitialNodeNameEditPart(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.InitialNode_1004;
-					}
-					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/JoinNodeEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/JoinNodeEditPart.java
deleted file mode 100644
index ba3c9b2..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/JoinNodeEditPart.java
+++ /dev/null
@@ -1,254 +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.PositionConstants;
-import org.eclipse.draw2d.StackLayout;
-
-import org.eclipse.epf.diagramming.edit.policies.JoinNodeCanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.JoinNodeGraphicalNodeEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.JoinNodeItemSemanticEditPolicy;
-
-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.editpolicies.ResizableEditPolicy;
-
-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 JoinNodeEditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 1006;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public JoinNodeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-				new JoinNodeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new JoinNodeGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new JoinNodeCanonicalEditPolicy());
-		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() {
-		ForkNodeFigure figure = new ForkNodeFigure();
-		return primaryShape = figure;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ForkNodeFigure getPrimaryShape() {
-		return (ForkNodeFigure) primaryShape;
-	}
-
-	/**
-	 * @modified
-	 */
-	protected NodeFigure createNodePlate() {
-		return new DefaultSizeNodeFigure(getMapMode().DPtoLP(100), getMapMode()
-				.DPtoLP(8));
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPolicy getPrimaryDragEditPolicy() {
-		ResizableEditPolicy ep = (ResizableEditPolicy) super
-				.getPrimaryDragEditPolicy();
-
-		ep.setResizeDirections(PositionConstants.WEST | PositionConstants.EAST);
-
-		return ep;
-	}
-
-	/**
-	 * 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 class ForkNodeFigure extends org.eclipse.draw2d.RectangleFigure {
-
-		/**
-		 * @generated
-		 */
-		public ForkNodeFigure() {
-
-			this.setBackgroundColor(FORKNODEFIGURE_BACK
-
-			);
-			this.setPreferredSize(getMapMode().DPtoLP(100), getMapMode()
-					.DPtoLP(8));
-			this.setSize(getMapMode().DPtoLP(100), getMapMode().DPtoLP(8));
-			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 FORKNODEFIGURE_BACK = new org.eclipse.swt.graphics.Color(
-			null, 51, 102, 102);
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/JoinNodeNameEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/JoinNodeNameEditPart.java
deleted file mode 100644
index c4be366..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/JoinNodeNameEditPart.java
+++ /dev/null
@@ -1,660 +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.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 JoinNodeNameEditPart extends CompartmentEditPart implements
-		ITextAwareEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4006;
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * @generated
-	 */
-	public JoinNodeNameEditPart(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(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.JoinNode_1006;
-					}
-					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 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() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new NodeNameFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public class NodeNameFigure extends
-			org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {
-
-		/**
-		 * @generated
-		 */
-		public NodeNameFigure() {
-
-			this.setText("<...>");
-			createContents();
-		}
-
-		/**
-		 * @generated
-		 */
-		private void createContents() {
-		}
-
-		/**
-		 * @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/MergeNodeEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/MergeNodeEditPart.java
deleted file mode 100644
index 8430927..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/MergeNodeEditPart.java
+++ /dev/null
@@ -1,268 +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.diagramming.base.figures.DecisionNodeFigure;
-import org.eclipse.epf.diagramming.edit.policies.MergeNodeCanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.MergeNodeGraphicalNodeEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.MergeNodeItemSemanticEditPolicy;
-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;
-
-/**
- * @modified
- */
-public class MergeNodeEditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 1002;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public MergeNodeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-				new MergeNodeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new MergeNodeGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new MergeNodeCanonicalEditPolicy());
-		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() {
-		DecisionDiamondFigure figure = new DecisionDiamondFigure();
-		return primaryShape = figure;
-	}
-
-	/**
-	 * @generated
-	 */
-	public DecisionDiamondFigure getPrimaryShape() {
-		return (DecisionDiamondFigure) primaryShape;
-	}
-
-	/**
-	 * @modified
-	 */
-	protected NodeFigure createNodePlate() {
-		return new DecisionNodeFigure(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(MergeNodeNameEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * modified
-	 */
-	public class DecisionDiamondFigure extends DecisionNodeFigure {
-
-		/**
-		 * @modified
-		 */
-		public DecisionDiamondFigure() {
-
-			super(getMapMode().DPtoLP(50), getMapMode().DPtoLP(50),
-					getMapMode().DPtoLP(50));
-			this.setForegroundColor(org.eclipse.draw2d.ColorConstants.darkBlue
-
-			);
-			this.setBackgroundColor(DECISIONDIAMONDFIGURE_BACK);
-			this.setPreferredSize(getMapMode().DPtoLP(50), getMapMode().DPtoLP(
-					50));
-			this.setSize(getMapMode().DPtoLP(50), getMapMode().DPtoLP(50));
-
-			createContents();
-		}
-
-		/**
-		 * @generated
-		 */
-		private void createContents() {
-			org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig_0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();
-
-			setFigureDiamondLabel(fig_0);
-
-			Object layData0 = null;
-
-			this.add(fig_0, layData0);
-		}
-
-		/**
-		 * @generated
-		 */
-		private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fDiamondLabel;
-
-		/**
-		 * @generated
-		 */
-		public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureDiamondLabel() {
-			return fDiamondLabel;
-		}
-
-		/**
-		 * @generated
-		 */
-		private void setFigureDiamondLabel(
-				org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig) {
-			fDiamondLabel = 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 DECISIONDIAMONDFIGURE_BACK = new org.eclipse.swt.graphics.Color(
-			null, 185, 205, 230);
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/MergeNodeNameEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/MergeNodeNameEditPart.java
deleted file mode 100644
index 1aaa77c..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/MergeNodeNameEditPart.java
+++ /dev/null
@@ -1,660 +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.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 MergeNodeNameEditPart extends CompartmentEditPart implements
-		ITextAwareEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4002;
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * @generated
-	 */
-	public MergeNodeNameEditPart(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(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.MergeNode_1002;
-					}
-					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 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() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new NodeNameFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public class NodeNameFigure extends
-			org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {
-
-		/**
-		 * @generated
-		 */
-		public NodeNameFigure() {
-
-			this.setText("<...>");
-			createContents();
-		}
-
-		/**
-		 * @generated
-		 */
-		private void createContents() {
-		}
-
-		/**
-		 * @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/StructuredActivityNode2EditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/StructuredActivityNode2EditPart.java
deleted file mode 100644
index 6194f03..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/StructuredActivityNode2EditPart.java
+++ /dev/null
@@ -1,296 +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.StructuredActivityNode2CanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.StructuredActivityNode2GraphicalNodeEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.StructuredActivityNode2ItemSemanticEditPolicy;
-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 StructuredActivityNode2EditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 1010;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public StructuredActivityNode2EditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-				new StructuredActivityNode2ItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new StructuredActivityNode2GraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new StructuredActivityNode2CanonicalEditPolicy());
-		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() {
-		StructuredActivityNodeFigure figure = new StructuredActivityNodeFigure();
-		return primaryShape = figure;
-	}
-
-	/**
-	 * @generated
-	 */
-	public StructuredActivityNodeFigure getPrimaryShape() {
-		return (StructuredActivityNodeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof StructuredActivityNodeName2EditPart) {
-			((StructuredActivityNodeName2EditPart) childEditPart)
-					.setLabel(getPrimaryShape().getFigureNodeNameFigure());
-			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(StructuredActivityNodeName2EditPart.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 StructuredActivityNodeFigure extends
-			org.eclipse.draw2d.RectangleFigure {
-
-		/**
-		 * @generated
-		 */
-		public StructuredActivityNodeFigure() {
-
-			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();
-			fig_0.setText("<...>");
-
-			DiagramCoreUtil.setLabelProperties(fig_0);
-
-			setFigureNodeNameFigure(fig_0);
-
-			Object layData0 = null;
-
-			this.add(fig_0, layData0);
-		}
-
-		/**
-		 * @generated
-		 */
-		private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fNodeNameFigure;
-
-		/**
-		 * @generated
-		 */
-		public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureNodeNameFigure() {
-			return fNodeNameFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		private void setFigureNodeNameFigure(
-				org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig) {
-			fNodeNameFigure = 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/StructuredActivityNode3EditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/StructuredActivityNode3EditPart.java
deleted file mode 100644
index d0ec57a..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/StructuredActivityNode3EditPart.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.StructuredActivityNode3CanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.StructuredActivityNode3GraphicalNodeEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.StructuredActivityNode3ItemSemanticEditPolicy;
-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 StructuredActivityNode3EditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 1011;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public StructuredActivityNode3EditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-				new StructuredActivityNode3ItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new StructuredActivityNode3GraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new StructuredActivityNode3CanonicalEditPolicy());
-		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() {
-		StructuredActivityNodeFigure figure = new StructuredActivityNodeFigure();
-		return primaryShape = figure;
-	}
-
-	/**
-	 * @generated
-	 */
-	public StructuredActivityNodeFigure getPrimaryShape() {
-		return (StructuredActivityNodeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof StructuredActivityNodeName3EditPart) {
-			((StructuredActivityNodeName3EditPart) childEditPart)
-					.setLabel(getPrimaryShape().getFigureNodeNameFigure());
-			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(StructuredActivityNodeName3EditPart.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 StructuredActivityNodeFigure extends
-			org.eclipse.draw2d.RectangleFigure {
-
-		/**
-		 * @generated
-		 */
-		public StructuredActivityNodeFigure() {
-
-			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();
-			fig_0.setText("<...>");
-
-			DiagramCoreUtil.setLabelProperties(fig_0);
-			setFigureNodeNameFigure(fig_0);
-
-			Object layData0 = null;
-
-			this.add(fig_0, layData0);
-		}
-
-		/**
-		 * @generated
-		 */
-		private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fNodeNameFigure;
-
-		/**
-		 * @generated
-		 */
-		public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureNodeNameFigure() {
-			return fNodeNameFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		private void setFigureNodeNameFigure(
-				org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig) {
-			fNodeNameFigure = 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/StructuredActivityNodeEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/StructuredActivityNodeEditPart.java
deleted file mode 100644
index 70fbb67..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/StructuredActivityNodeEditPart.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.StructuredActivityNodeCanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.StructuredActivityNodeGraphicalNodeEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.StructuredActivityNodeItemSemanticEditPolicy;
-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 StructuredActivityNodeEditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 1007;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public StructuredActivityNodeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-				new StructuredActivityNodeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new StructuredActivityNodeGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new StructuredActivityNodeCanonicalEditPolicy());
-		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() {
-		StructuredActivityNodeFigure figure = new StructuredActivityNodeFigure();
-		return primaryShape = figure;
-	}
-
-	/**
-	 * @generated
-	 */
-	public StructuredActivityNodeFigure getPrimaryShape() {
-		return (StructuredActivityNodeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof StructuredActivityNodeNameEditPart) {
-			((StructuredActivityNodeNameEditPart) childEditPart)
-					.setLabel(getPrimaryShape().getFigureNodeNameFigure());
-			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(StructuredActivityNodeNameEditPart.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 StructuredActivityNodeFigure extends
-			org.eclipse.draw2d.RectangleFigure {
-
-		/**
-		 * @generated
-		 */
-		public StructuredActivityNodeFigure() {
-
-			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();
-			fig_0.setText("<...>");
-
-			DiagramCoreUtil.setLabelProperties(fig_0);
-			setFigureNodeNameFigure(fig_0);
-
-			Object layData0 = null;
-
-			this.add(fig_0, layData0);
-		}
-
-		/**
-		 * @generated
-		 */
-		private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fNodeNameFigure;
-
-		/**
-		 * @generated
-		 */
-		public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureNodeNameFigure() {
-			return fNodeNameFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		private void setFigureNodeNameFigure(
-				org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig) {
-			fNodeNameFigure = 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/StructuredActivityNodeName2EditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/StructuredActivityNodeName2EditPart.java
deleted file mode 100644
index 8f667dc..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/StructuredActivityNodeName2EditPart.java
+++ /dev/null
@@ -1,651 +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 StructuredActivityNodeName2EditPart extends CompartmentEditPart
-		implements ITextAwareEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4009;
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * @generated
-	 */
-	public StructuredActivityNodeName2EditPart(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/phase.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());
-	}
-
-	/**
-	 * @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.StructuredActivityNode_1010;
-					}
-					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() {
-							((StructuredActivityNodeName2EditPart)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/StructuredActivityNodeName3EditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/StructuredActivityNodeName3EditPart.java
deleted file mode 100644
index 32c1548..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/StructuredActivityNodeName3EditPart.java
+++ /dev/null
@@ -1,652 +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 StructuredActivityNodeName3EditPart extends CompartmentEditPart
-		implements ITextAwareEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4010;
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * @generated
-	 */
-	public StructuredActivityNodeName3EditPart(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/iteration.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());
-	}
-
-	/**
-	 * @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.StructuredActivityNode_1011;
-					}
-					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() {
-							((StructuredActivityNodeName3EditPart)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/StructuredActivityNodeNameEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/StructuredActivityNodeNameEditPart.java
deleted file mode 100644
index d0f988e..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/StructuredActivityNodeNameEditPart.java
+++ /dev/null
@@ -1,654 +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.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.epf.diagram.core.bridge.ActivityDiagramAdapter;
-import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.diagram.core.part.DiagramEditorInput;
-import org.eclipse.epf.diagram.core.part.IDiagramEditorInputProvider;
-import org.eclipse.epf.diagram.core.util.DiagramConstants;
-import org.eclipse.epf.diagram.core.util.DiagramCoreUtil;
-import org.eclipse.epf.diagram.core.util.ValidatingTextDirectEditManager;
-import org.eclipse.epf.diagramming.base.policies.ViewLabelDirectEditPolicy;
-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.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPartViewer;
-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.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.Node;
-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 StructuredActivityNodeNameEditPart extends CompartmentEditPart
-		implements ITextAwareEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4005;
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * @generated
-	 */
-	public StructuredActivityNodeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @modified
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,
-				new ViewLabelDirectEditPolicy()); //modified
-		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();
-	}
-
-	/**
-	 * @gmodified
-	 */
-	protected Image getLabelIcon() {
-		//		return null;
-		return EPFDiagramEditorPlugin.getInstance().getImage(
-				"diagram/activity.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());
-	}
-
-	/**
-	 * @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.StructuredActivityNode_1007;
-					}
-					return super.getAdapter(adapter);
-				}
-			};
-			parser = ParserService.getInstance().getParser(hintAdapter);
-		}
-		return parser;
-	}
-
-	/**
-	 * @modified
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new ValidatingTextDirectEditManager(this, ValidatingTextDirectEditManager
-					.getTextCellEditorClass(this), UMLEditPartFactory
-					.getTextCellEditorLocator(this)){
-					@Override
-					protected String validate(String txt) {
-						
-						Object obj = getEditPart().getModel();
-						if (obj instanceof Node) {
-							Node node = (Node) obj;
-							EObject umlE = node.getElement();
-							Object e = BridgeHelper.getMethodElement((EModelElement)umlE);
-							EObject umlA = node.getDiagram().getElement();
-							ActivityDiagramAdapter adapter = (ActivityDiagramAdapter)BridgeHelper.getNodeAdapter(umlA);
-							
-							if (e instanceof Activity) {
-								return TngUtil.checkWBSActivityPresentationName(e, txt, adapter.getSuppression());
-							}
-							else {
-								return TngUtil
-										.checkWorkBreakdownElementPresentationName(e,
-												txt, adapter.getSuppression());
-							}
-						}
-						return null;
-					}
-					@Override
-					protected void performDirectEdit() {
-						((StructuredActivityNodeNameEditPart)getEditPart()).performDirectEdit();
-					}
-				
-			});
-		}
-		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() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation
-					.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @modified
-	 */
-	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/UMLEditPartFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/UMLEditPartFactory.java
deleted file mode 100644
index 69c7994..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/UMLEditPartFactory.java
+++ /dev/null
@@ -1,233 +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.FigureUtilities;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-/**
- * @generated
- */
-public class UMLEditPartFactory implements EditPartFactory {
-
-	/**
-	 * @generated
-	 */
-	public static final String EXTERNAL_NODE_LABELS_LAYER = "External Node Labels"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public EditPart createEditPart(EditPart context, Object model) {
-		if (model instanceof View) {
-			View view = (View) model;
-			int viewVisualID = UMLVisualIDRegistry.getVisualID(view);
-			switch (viewVisualID) {
-			case ActivityFinalNodeEditPart.VISUAL_ID:
-				return new ActivityFinalNodeEditPart(view);
-			case ActivityFinalNodeNameEditPart.VISUAL_ID:
-				return new ActivityFinalNodeNameEditPart(view);
-			case MergeNodeEditPart.VISUAL_ID:
-				return new MergeNodeEditPart(view);
-			case MergeNodeNameEditPart.VISUAL_ID:
-				return new MergeNodeNameEditPart(view);
-			case ForkNodeEditPart.VISUAL_ID:
-				return new ForkNodeEditPart(view);
-			case InitialNodeEditPart.VISUAL_ID:
-				return new InitialNodeEditPart(view);
-			case InitialNodeNameEditPart.VISUAL_ID:
-				return new InitialNodeNameEditPart(view);
-			case DecisionNodeEditPart.VISUAL_ID:
-				return new DecisionNodeEditPart(view);
-			case DecisionNodeNameEditPart.VISUAL_ID:
-				return new DecisionNodeNameEditPart(view);
-			case JoinNodeEditPart.VISUAL_ID:
-				return new JoinNodeEditPart(view);
-			case StructuredActivityNodeEditPart.VISUAL_ID:
-				return new StructuredActivityNodeEditPart(view);
-			case StructuredActivityNodeNameEditPart.VISUAL_ID:
-				return new StructuredActivityNodeNameEditPart(view);
-			case ActivityPartitionEditPart.VISUAL_ID:
-				return new ActivityPartitionEditPart(view);
-			case ActivityPartitionName2EditPart.VISUAL_ID:
-				return new ActivityPartitionName2EditPart(view);
-			case ActivityParameterNodeEditPart.VISUAL_ID:
-				return new ActivityParameterNodeEditPart(view);
-			case ActivityParameterNodeNameEditPart.VISUAL_ID:
-				return new ActivityParameterNodeNameEditPart(view);
-			case StructuredActivityNode2EditPart.VISUAL_ID:
-				return new StructuredActivityNode2EditPart(view);
-			case StructuredActivityNodeName2EditPart.VISUAL_ID:
-				return new StructuredActivityNodeName2EditPart(view);
-			case StructuredActivityNode3EditPart.VISUAL_ID:
-				return new StructuredActivityNode3EditPart(view);
-			case StructuredActivityNodeName3EditPart.VISUAL_ID:
-				return new StructuredActivityNodeName3EditPart(view);
-			case ActivityParameterNode2EditPart.VISUAL_ID:
-				return new ActivityParameterNode2EditPart(view);
-			case ActivityParameterNodeName2EditPart.VISUAL_ID:
-				return new ActivityParameterNodeName2EditPart(view);
-			case ActivityPartition2EditPart.VISUAL_ID:
-				return new ActivityPartition2EditPart(view);
-			case ActivityPartitionNameEditPart.VISUAL_ID:
-				return new ActivityPartitionNameEditPart(view);
-			case ActivityPartitionPartitionCampartmentEditPart.VISUAL_ID:
-				return new ActivityPartitionPartitionCampartmentEditPart(view);
-			case ActivityPartitionPartitionCampartment2EditPart.VISUAL_ID:
-				return new ActivityPartitionPartitionCampartment2EditPart(view);
-			case ActivityEditPart.VISUAL_ID:
-				return new ActivityEditPart(view);
-			case ControlFlowEditPart.VISUAL_ID:
-				return new ControlFlowEditPart(view);
-			case ControlFlowNameEditPart.VISUAL_ID:
-				return new ControlFlowNameEditPart(view);
-			}
-		}
-		return createUnrecognizedEditPart(context, model);
-	}
-
-	/**
-	 * @generated
-	 */
-	private EditPart createUnrecognizedEditPart(EditPart context, Object model) {
-		// Handle creation of unrecognized child node EditParts here
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static CellEditorLocator getTextCellEditorLocator(
-			ITextAwareEditPart source) {
-		if (source.getFigure() instanceof WrapLabel)
-			return new TextCellEditorLocator((WrapLabel) source.getFigure());
-		else {
-			IFigure figure = source.getFigure();
-			return new LabelCellEditorLocator((Label) figure);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	static private class TextCellEditorLocator implements CellEditorLocator {
-
-		/**
-		 * @generated
-		 */
-		private WrapLabel wrapLabel;
-
-		/**
-		 * @generated
-		 */
-		public TextCellEditorLocator(WrapLabel wrapLabel) {
-			super();
-			this.wrapLabel = wrapLabel;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrapLabel getWrapLabel() {
-			return wrapLabel;
-		}
-
-		/**
-		 * @generated
-		 */
-		public void relocate(CellEditor celleditor) {
-			Text text = (Text) celleditor.getControl();
-			Rectangle rect = getWrapLabel().getTextBounds().getCopy();
-			getWrapLabel().translateToAbsolute(rect);
-
-			if (getWrapLabel().isTextWrapped()
-					&& getWrapLabel().getText().length() > 0)
-				rect.setSize(new Dimension(text.computeSize(rect.width,
-						SWT.DEFAULT)));
-			else {
-				int avr = FigureUtilities.getFontMetrics(text.getFont())
-						.getAverageCharWidth();
-				rect.setSize(new Dimension(text.computeSize(SWT.DEFAULT,
-						SWT.DEFAULT)).expand(avr * 2, 0));
-			}
-
-			if (!rect.equals(new Rectangle(text.getBounds())))
-				text.setBounds(rect.x, rect.y, rect.width, rect.height);
-		}
-
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class LabelCellEditorLocator implements CellEditorLocator {
-
-		/**
-		 * @generated
-		 */
-		private Label label;
-
-		/**
-		 * @generated
-		 */
-		public LabelCellEditorLocator(Label label) {
-			this.label = label;
-		}
-
-		/**
-		 * @generated
-		 */
-		public Label getLabel() {
-			return label;
-		}
-
-		/**
-		 * @generated
-		 */
-		public void relocate(CellEditor celleditor) {
-			Text text = (Text) celleditor.getControl();
-			Rectangle rect = getLabel().getTextBounds().getCopy();
-			getLabel().translateToAbsolute(rect);
-
-			int avr = FigureUtilities.getFontMetrics(text.getFont())
-					.getAverageCharWidth();
-			rect.setSize(new Dimension(text.computeSize(SWT.DEFAULT,
-					SWT.DEFAULT)).expand(avr * 2, 0));
-
-			if (!rect.equals(new Rectangle(text.getBounds())))
-				text.setBounds(rect.x, rect.y, rect.width, rect.height);
-		}
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/UMLExtNodeLabelEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/UMLExtNodeLabelEditPart.java
deleted file mode 100644
index 0c6d3bd..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/UMLExtNodeLabelEditPart.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
-//------------------------------------------------------------------------------
-/*
- * 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.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.LabelLocator;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class UMLExtNodeLabelEditPart extends LabelEditPart {
-
-	/**
-	 * @generated
-	 */
-	public UMLExtNodeLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public void refreshBounds() {
-		IFigure refFigure = ((GraphicalEditPart) getParent()).getFigure();
-		int dx = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getLocation_X())).intValue();
-		int dy = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getLocation_Y())).intValue();
-		Point offset = new Point(dx, dy);
-		getFigure().getParent().setConstraint(getFigure(),
-				new LabelLocator(refFigure, offset, getKeyPoint()) {
-
-					public void relocate(IFigure target) {
-						Point location = getReferencePoint().getTranslated(
-								getOffset());
-						location.translate(-target.getBounds().width / 2, 0);
-						target.setLocation(location);
-						target.setSize(new Dimension(
-								target.getPreferredSize().width, target
-										.getPreferredSize().height));
-					}
-
-					protected Point getReferencePoint() {
-						return getLabelLocation(parent);
-					}
-				});
-	}
-
-	/**
-	 * @generated
-	 */
-	public Point getReferencePoint() {
-		return getLabelLocation(((GraphicalEditPart) getParent()).getFigure());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Point getLabelLocation(IFigure parent) {
-		return parent.getBounds().getBottom();
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityCanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityCanonicalEditPolicy.java
deleted file mode 100644
index 85ddc67..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityCanonicalEditPolicy.java
+++ /dev/null
@@ -1,532 +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.policies;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityFinalNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityParameterNode2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityParameterNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartition2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ControlFlowEditPart;
-import org.eclipse.epf.diagramming.edit.parts.DecisionNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ForkNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.InitialNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.JoinNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.MergeNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNode2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNode3EditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeEditPart;
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;
-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.CanonicalConnectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.uml2.uml.Activity;
-import org.eclipse.uml2.uml.ActivityEdge;
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- * @author Phong Nguyen Le
- */
-public class ActivityCanonicalEditPolicy extends CanonicalConnectionEditPolicy {
-
-	/**
-	 * @modified
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		EObject modelObject = ((View) getHost().getModel()).getElement();
-		View viewObject = (View) getHost().getModel();
-		EObject nextValue;
-		int nodeVID;
-		for (Iterator values = ((Activity) modelObject).getNodes().iterator(); values
-				.hasNext();) {
-			nextValue = (EObject) values.next();
-			// modified START
-			// To avoid the ActivityNode show in duplicate places
-			if (nextValue instanceof ActivityNode) {
-				if (!((ActivityNode) nextValue).getInPartitions().isEmpty())
-					continue;
-			}
-			// modified END
-			nodeVID = UMLVisualIDRegistry
-					.getNodeVisualID(viewObject, nextValue);
-			switch (nodeVID) {
-			case ActivityFinalNodeEditPart.VISUAL_ID: {
-				result.add(nextValue);
-				break;
-			}
-			case MergeNodeEditPart.VISUAL_ID: {
-				result.add(nextValue);
-				break;
-			}
-			case ForkNodeEditPart.VISUAL_ID: {
-				result.add(nextValue);
-				break;
-			}
-			case InitialNodeEditPart.VISUAL_ID: {
-				result.add(nextValue);
-				break;
-			}
-			case DecisionNodeEditPart.VISUAL_ID: {
-				result.add(nextValue);
-				break;
-			}
-			case JoinNodeEditPart.VISUAL_ID: {
-				result.add(nextValue);
-				break;
-			}
-			case StructuredActivityNodeEditPart.VISUAL_ID: {
-				result.add(nextValue);
-				break;
-			}
-			case ActivityParameterNodeEditPart.VISUAL_ID: {
-				result.add(nextValue);
-				break;
-			}
-			case StructuredActivityNode2EditPart.VISUAL_ID: {
-				result.add(nextValue);
-				break;
-			}
-			case StructuredActivityNode3EditPart.VISUAL_ID: {
-				result.add(nextValue);
-				break;
-			}
-			case ActivityParameterNode2EditPart.VISUAL_ID: {
-				result.add(nextValue);
-				break;
-			}
-			}
-		}
-		for (Iterator values = ((Activity) modelObject).getGroups().iterator(); values
-				.hasNext();) {
-			nextValue = (EObject) values.next();
-			nodeVID = UMLVisualIDRegistry
-					.getNodeVisualID(viewObject, nextValue);
-			if (ActivityPartitionEditPart.VISUAL_ID == nodeVID) {
-				result.add(nextValue);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @modified
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement()
-				&& view.getElement() != null
-				&& (view.getElement().eIsProxy() || (view.getElement() instanceof EModelElement && BridgeHelper
-						.getMethodElement((EModelElement) view.getElement()) != null));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-	/**
-	 * @modified
-	 */
-	protected List getSemanticConnectionsList() {
-		//		return Collections.EMPTY_LIST;
-
-		Activity act = (Activity) ((View) getHost().getModel()).getElement();
-		return new ArrayList(act.getEdges());
-	}
-
-	/**
-	 * @modified
-	 */
-	protected EObject getSourceElement(EObject relationship) {
-		if (relationship instanceof ActivityEdge) {
-			return ((ActivityEdge) relationship).getSource();
-		}
-		return null;
-	}
-
-	/**
-	 * @modified
-	 */
-	protected EObject getTargetElement(EObject relationship) {
-		if (relationship instanceof ActivityEdge) {
-			return ((ActivityEdge) relationship).getTarget();
-		}
-		return null;
-	}
-
-	/**
-	 * @modified
-	 */
-	protected boolean shouldIncludeConnection(Edge connector,
-			Collection children) {
-		return super.shouldIncludeConnection(connector, children);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshSemantic() {
-		List createdViews = new LinkedList();
-		createdViews.addAll(refreshSemanticChildren());
-		List createdConnectionViews = new LinkedList();
-		createdConnectionViews.addAll(refreshSemanticConnections());
-		createdConnectionViews.addAll(refreshConnections());
-
-		if (createdViews.size() > 1) {
-			// perform a layout of the container
-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()
-					.getEditingDomain(), createdViews, host());
-			executeCommand(new ICommandProxy(layoutCmd));
-		}
-
-		createdViews.addAll(createdConnectionViews);
-		makeViewsImmutable(createdViews);
-	}
-
-	/**
-	 * @generated
-	 */
-	private Collection myLinkDescriptors = new LinkedList();
-
-	/**
-	 * @generated
-	 */
-	private Map myEObject2ViewMap = new HashMap();
-
-	/**
-	 * @generated
-	 */
-	private Collection refreshConnections() {
-		try {
-			collectAllLinks(getDiagram());
-			Collection existingLinks = new LinkedList(getDiagram().getEdges());
-			for (Iterator diagramLinks = existingLinks.iterator(); diagramLinks
-					.hasNext();) {
-				Edge nextDiagramLink = (Edge) diagramLinks.next();
-				EObject diagramLinkObject = nextDiagramLink.getElement();
-				EObject diagramLinkSrc = nextDiagramLink.getSource()
-						.getElement();
-				EObject diagramLinkDst = nextDiagramLink.getTarget()
-						.getElement();
-				int diagramLinkVisualID = UMLVisualIDRegistry
-						.getVisualID(nextDiagramLink);
-				for (Iterator modelLinkDescriptors = myLinkDescriptors
-						.iterator(); modelLinkDescriptors.hasNext();) {
-					LinkDescriptor nextLinkDescriptor = (LinkDescriptor) modelLinkDescriptors
-							.next();
-					if (diagramLinkObject == nextLinkDescriptor
-							.getLinkElement()
-							&& diagramLinkSrc == nextLinkDescriptor.getSource()
-							&& diagramLinkDst == nextLinkDescriptor
-									.getDestination()
-							&& diagramLinkVisualID == nextLinkDescriptor
-									.getVisualID()) {
-						diagramLinks.remove();
-						modelLinkDescriptors.remove();
-					}
-				}
-			}
-			deleteViews(existingLinks.iterator());
-			return createConnections(myLinkDescriptors);
-		} finally {
-			myLinkDescriptors.clear();
-			myEObject2ViewMap.clear();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void collectAllLinks(View view) {
-		EObject modelElement = view.getElement();
-		int diagramElementVisualID = UMLVisualIDRegistry.getVisualID(view);
-		switch (diagramElementVisualID) {
-		case ActivityFinalNodeEditPart.VISUAL_ID:
-		case MergeNodeEditPart.VISUAL_ID:
-		case ForkNodeEditPart.VISUAL_ID:
-		case InitialNodeEditPart.VISUAL_ID:
-		case DecisionNodeEditPart.VISUAL_ID:
-		case JoinNodeEditPart.VISUAL_ID:
-		case StructuredActivityNodeEditPart.VISUAL_ID:
-		case ActivityPartitionEditPart.VISUAL_ID:
-		case ActivityParameterNodeEditPart.VISUAL_ID:
-		case StructuredActivityNode2EditPart.VISUAL_ID:
-		case StructuredActivityNode3EditPart.VISUAL_ID:
-		case ActivityParameterNode2EditPart.VISUAL_ID:
-		case ActivityPartition2EditPart.VISUAL_ID:
-		case ActivityEditPart.VISUAL_ID: {
-			myEObject2ViewMap.put(modelElement, view);
-			storeLinks(modelElement, getDiagram());
-		}
-		default: {
-		}
-			for (Iterator children = view.getChildren().iterator(); children
-					.hasNext();) {
-				View childView = (View) children.next();
-				collectAllLinks(childView);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private Collection createConnections(Collection linkDescriptors) {
-		if (linkDescriptors.isEmpty()) {
-			return Collections.EMPTY_LIST;
-		}
-		List adapters = new LinkedList();
-		for (Iterator linkDescriptorsIterator = linkDescriptors.iterator(); linkDescriptorsIterator
-				.hasNext();) {
-			final LinkDescriptor nextLinkDescriptor = (LinkDescriptor) linkDescriptorsIterator
-					.next();
-			EditPart sourceEditPart = getEditPartFor(nextLinkDescriptor
-					.getSource());
-			EditPart targetEditPart = getEditPartFor(nextLinkDescriptor
-					.getDestination());
-			if (sourceEditPart == null || targetEditPart == null) {
-				continue;
-			}
-			CreateConnectionViewRequest.ConnectionViewDescriptor descriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(
-					nextLinkDescriptor.getSemanticAdapter(), null,
-					ViewUtil.APPEND, false, ((IGraphicalEditPart) getHost())
-							.getDiagramPreferencesHint());
-			CreateConnectionViewRequest ccr = new CreateConnectionViewRequest(
-					descriptor);
-			ccr.setType(RequestConstants.REQ_CONNECTION_START);
-			ccr.setSourceEditPart(sourceEditPart);
-			sourceEditPart.getCommand(ccr);
-			ccr.setTargetEditPart(targetEditPart);
-			ccr.setType(RequestConstants.REQ_CONNECTION_END);
-			Command cmd = targetEditPart.getCommand(ccr);
-			if (cmd != null && cmd.canExecute()) {
-				executeCommand(cmd);
-				IAdaptable viewAdapter = (IAdaptable) ccr.getNewObject();
-				if (viewAdapter != null) {
-					adapters.add(viewAdapter);
-				}
-			}
-		}
-		return adapters;
-	}
-
-	/**
-	 * @generated
-	 */
-	private EditPart getEditPartFor(EObject modelElement) {
-		View view = (View) myEObject2ViewMap.get(modelElement);
-		if (view != null) {
-			return (EditPart) getHost().getViewer().getEditPartRegistry().get(
-					view);
-		}
-		return null;
-	}
-
-	/**
-	 *@generated
-	 */
-	private void storeLinks(EObject container, Diagram diagram) {
-		EClass containerMetaclass = container.eClass();
-		storeFeatureModelFacetLinks(container, containerMetaclass, diagram);
-		storeTypeModelFacetLinks(container, containerMetaclass);
-	}
-
-	/**
-	 * @generated
-	 */
-	private void storeTypeModelFacetLinks(EObject container,
-			EClass containerMetaclass) {
-		if (UMLPackage.eINSTANCE.getStructuredActivityNode().isSuperTypeOf(
-				containerMetaclass)) {
-			for (Iterator values = ((StructuredActivityNode) container)
-					.getEdges().iterator(); values.hasNext();) {
-				EObject nextValue = ((EObject) values.next());
-				int linkVID = UMLVisualIDRegistry
-						.getLinkWithClassVisualID(nextValue);
-				if (ControlFlowEditPart.VISUAL_ID == linkVID) {
-					Object structuralFeatureResult = ((ActivityEdge) nextValue)
-							.getTarget();
-					if (structuralFeatureResult instanceof EObject) {
-						EObject dst = (EObject) structuralFeatureResult;
-						structuralFeatureResult = ((ActivityEdge) nextValue)
-								.getSource();
-						if (structuralFeatureResult instanceof EObject) {
-							EObject src = (EObject) structuralFeatureResult;
-							myLinkDescriptors.add(new LinkDescriptor(src, dst,
-									nextValue, linkVID));
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 *@generated
-	 */
-	private void storeFeatureModelFacetLinks(EObject container,
-			EClass containerMetaclass, Diagram diagram) {
-
-	}
-
-	/**
-	 * @generated
-	 */
-	private Diagram getDiagram() {
-		return ((View) getHost().getModel()).getDiagram();
-	}
-
-	/**
-	 * @generated
-	 */
-	private class LinkDescriptor {
-
-		/**
-		 * @generated
-		 */
-		private EObject mySource;
-
-		/**
-		 * @generated
-		 */
-		private EObject myDestination;
-
-		/**
-		 * @generated
-		 */
-		private EObject myLinkElement;
-
-		/**
-		 * @generated
-		 */
-		private int myVisualID;
-
-		/**
-		 * @generated
-		 */
-		private IAdaptable mySemanticAdapter;
-
-		/**
-		 * @generated
-		 */
-		protected LinkDescriptor(EObject source, EObject destination,
-				EObject linkElement, int linkVID) {
-			this(source, destination, linkVID);
-			myLinkElement = linkElement;
-			mySemanticAdapter = new EObjectAdapter(linkElement);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected LinkDescriptor(EObject source, EObject destination,
-				IElementType elementType, int linkVID) {
-			this(source, destination, linkVID);
-			myLinkElement = null;
-			final IElementType elementTypeCopy = elementType;
-			mySemanticAdapter = new IAdaptable() {
-				public Object getAdapter(Class adapter) {
-					if (IElementType.class.equals(adapter)) {
-						return elementTypeCopy;
-					}
-					return null;
-				}
-			};
-		}
-
-		/**
-		 * @generated
-		 */
-		private LinkDescriptor(EObject source, EObject destination, int linkVID) {
-			mySource = source;
-			myDestination = destination;
-			myVisualID = linkVID;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EObject getSource() {
-			return mySource;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EObject getDestination() {
-			return myDestination;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EObject getLinkElement() {
-			return myLinkElement;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected int getVisualID() {
-			return myVisualID;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected IAdaptable getSemanticAdapter() {
-			return mySemanticAdapter;
-		}
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityFinalNodeCanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityFinalNodeCanonicalEditPolicy.java
deleted file mode 100644
index ae75687..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityFinalNodeCanonicalEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @generated
- */
-public class ActivityFinalNodeCanonicalEditPolicy extends CanonicalEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement() && view.getElement() != null
-				&& view.getElement().eIsProxy();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityFinalNodeGraphicalNodeEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityFinalNodeGraphicalNodeEditPolicy.java
deleted file mode 100644
index 7b9078e..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityFinalNodeGraphicalNodeEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-/**
- * @generated
- */
-public class ActivityFinalNodeGraphicalNodeEditPolicy extends
-		UMLGraphicalNodeEditPolicy {
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityFinalNodeItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityFinalNodeItemSemanticEditPolicy.java
deleted file mode 100644
index 205208a..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityFinalNodeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,158 +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.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-
-import org.eclipse.gef.commands.UnexecutableCommand;
-
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ControlFlow;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ActivityFinalNodeItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return getMSLWrapper(new DestroyElementCommand(req) {
-
-			protected EObject getElementToDestroy() {
-				View view = (View) getHost().getModel();
-				EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-				if (annotation != null) {
-					return view;
-				}
-				return super.getElementToDestroy();
-			}
-
-		});
-	}
-
-	/**
-	 * @modified
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		//		if (UMLElementTypes.ControlFlow_3001 == req.getElementType()) {
-		//			return req.getTarget() == null ? getCreateStartOutgoingControlFlow3001Command(req)
-		//					: getCreateCompleteIncomingControlFlow3001Command(req);
-		//		}
-		return super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateStartOutgoingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		return new Command() {
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCompleteIncomingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		if (!(req.getSource() instanceof ActivityNode)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		final StructuredActivityNode element = (StructuredActivityNode) getRelationshipContainer(
-				req.getSource(), UMLPackage.eINSTANCE
-						.getStructuredActivityNode(), req.getElementType());
-		if (element == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		if (req.getContainmentFeature() == null) {
-			req.setContainmentFeature(UMLPackage.eINSTANCE
-					.getStructuredActivityNode_Edge());
-		}
-		return getMSLWrapper(new CreateIncomingControlFlow3001Command(req) {
-
-			/**
-			 * @generated
-			 */
-			protected EObject getElementToEdit() {
-				return element;
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateIncomingControlFlow3001Command extends
-			CreateRelationshipCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateIncomingControlFlow3001Command(
-				CreateRelationshipRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getStructuredActivityNode();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected void setElementToEdit(EObject element) {
-			throw new UnsupportedOperationException();
-		}
-
-		/**
-		 * @generated
-		 */
-		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/edit/policies/ActivityItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityItemSemanticEditPolicy.java
deleted file mode 100644
index ce2dc2a..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,655 +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.policies;
-
-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.transaction.TransactionalEditingDomain;
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.commands.core.commands.DuplicateEObjectsCommand;
-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.emf.type.core.requests.DuplicateElementsRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.uml2.uml.ActivityParameterNode;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ActivityItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		if (UMLElementTypes.ActivityFinalNode_1001 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivity_Node());
-			}
-			return getMSLWrapper(new CreateActivityFinalNode_1001Command(req));
-		}
-		if (UMLElementTypes.MergeNode_1002 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivity_Node());
-			}
-			return getMSLWrapper(new CreateMergeNode_1002Command(req));
-		}
-		if (UMLElementTypes.ForkNode_1003 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivity_Node());
-			}
-			return getMSLWrapper(new CreateForkNode_1003Command(req));
-		}
-		if (UMLElementTypes.InitialNode_1004 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivity_Node());
-			}
-			return getMSLWrapper(new CreateInitialNode_1004Command(req));
-		}
-		if (UMLElementTypes.DecisionNode_1005 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivity_Node());
-			}
-			return getMSLWrapper(new CreateDecisionNode_1005Command(req));
-		}
-		if (UMLElementTypes.JoinNode_1006 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivity_Node());
-			}
-			return getMSLWrapper(new CreateJoinNode_1006Command(req));
-		}
-		if (UMLElementTypes.StructuredActivityNode_1007 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivity_Node());
-			}
-			return getMSLWrapper(new CreateStructuredActivityNode_1007Command(
-					req));
-		}
-		if (UMLElementTypes.ActivityPartition_1008 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivity_Group());
-			}
-			return getMSLWrapper(new CreateActivityPartition_1008Command(req));
-		}
-		if (UMLElementTypes.ActivityParameterNode_1009 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivity_Node());
-			}
-			return getMSLWrapper(new CreateActivityParameterNode_1009Command(
-					req));
-		}
-		if (UMLElementTypes.StructuredActivityNode_1010 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivity_Node());
-			}
-			return getMSLWrapper(new CreateStructuredActivityNode_1010Command(
-					req));
-		}
-		if (UMLElementTypes.StructuredActivityNode_1011 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivity_Node());
-			}
-			return getMSLWrapper(new CreateStructuredActivityNode_1011Command(
-					req));
-		}
-		if (UMLElementTypes.ActivityParameterNode_1012 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivity_Node());
-			}
-			return getMSLWrapper(new CreateActivityParameterNode_1012Command(
-					req));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateActivityFinalNode_1001Command extends
-			CreateElementCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateActivityFinalNode_1001Command(CreateElementRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getActivity();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected EObject getElementToEdit() {
-			EObject container = ((CreateElementRequest) getRequest())
-					.getContainer();
-			if (container instanceof View) {
-				container = ((View) container).getElement();
-			}
-			return container;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateMergeNode_1002Command extends
-			CreateElementCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateMergeNode_1002Command(CreateElementRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getActivity();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected EObject getElementToEdit() {
-			EObject container = ((CreateElementRequest) getRequest())
-					.getContainer();
-			if (container instanceof View) {
-				container = ((View) container).getElement();
-			}
-			return container;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateForkNode_1003Command extends
-			CreateElementCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateForkNode_1003Command(CreateElementRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getActivity();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected EObject getElementToEdit() {
-			EObject container = ((CreateElementRequest) getRequest())
-					.getContainer();
-			if (container instanceof View) {
-				container = ((View) container).getElement();
-			}
-			return container;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateInitialNode_1004Command extends
-			CreateElementCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateInitialNode_1004Command(CreateElementRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getActivity();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected EObject getElementToEdit() {
-			EObject container = ((CreateElementRequest) getRequest())
-					.getContainer();
-			if (container instanceof View) {
-				container = ((View) container).getElement();
-			}
-			return container;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateDecisionNode_1005Command extends
-			CreateElementCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateDecisionNode_1005Command(CreateElementRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getActivity();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected EObject getElementToEdit() {
-			EObject container = ((CreateElementRequest) getRequest())
-					.getContainer();
-			if (container instanceof View) {
-				container = ((View) container).getElement();
-			}
-			return container;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateJoinNode_1006Command extends
-			CreateElementCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateJoinNode_1006Command(CreateElementRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getActivity();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected EObject getElementToEdit() {
-			EObject container = ((CreateElementRequest) getRequest())
-					.getContainer();
-			if (container instanceof View) {
-				container = ((View) container).getElement();
-			}
-			return container;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateStructuredActivityNode_1007Command extends
-			CreateElementCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateStructuredActivityNode_1007Command(CreateElementRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getActivity();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected EObject getElementToEdit() {
-			EObject container = ((CreateElementRequest) getRequest())
-					.getContainer();
-			if (container instanceof View) {
-				container = ((View) container).getElement();
-			}
-			return container;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EObject doDefaultElementCreation() {
-			StructuredActivityNode newElement = (StructuredActivityNode) super
-					.doDefaultElementCreation();
-			if (newElement != null) {
-				UMLElementTypes.Initializers.StructuredActivityNode_1007
-						.init(newElement);
-			}
-			return newElement;
-		}
-
-		/**
-		 * @see org.eclipse.gmf.runtime.emf.type.core.commands.CreateElementCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-		 * @modiifed
-		 */
-		protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
-				IAdaptable info) throws ExecutionException {
-			CommandResult result = super.doExecuteWithResult(monitor, info);
-			//View container = (View)((CreateElementRequest)getRequest()).getContainer();
-
-			//((CreateElementRequest)getRequest()).
-			return result;
-		}
-
-		/**
-		 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doUndo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-		 * @modified
-		 */
-		protected IStatus doUndo(IProgressMonitor monitor, IAdaptable info)
-				throws ExecutionException {
-			return super.doUndo(monitor, info);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateActivityPartition_1008Command extends
-			CreateElementCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateActivityPartition_1008Command(CreateElementRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getActivity();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected EObject getElementToEdit() {
-			EObject container = ((CreateElementRequest) getRequest())
-					.getContainer();
-			if (container instanceof View) {
-				container = ((View) container).getElement();
-			}
-			return container;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateActivityParameterNode_1009Command extends
-			CreateElementCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateActivityParameterNode_1009Command(CreateElementRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getActivity();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected EObject getElementToEdit() {
-			EObject container = ((CreateElementRequest) getRequest())
-					.getContainer();
-			if (container instanceof View) {
-				container = ((View) container).getElement();
-			}
-			return container;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EObject doDefaultElementCreation() {
-			ActivityParameterNode newElement = (ActivityParameterNode) super
-					.doDefaultElementCreation();
-			if (newElement != null) {
-				UMLElementTypes.Initializers.ActivityParameterNode_1009
-						.init(newElement);
-			}
-			return newElement;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateStructuredActivityNode_1010Command extends
-			CreateElementCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateStructuredActivityNode_1010Command(CreateElementRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getActivity();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected EObject getElementToEdit() {
-			EObject container = ((CreateElementRequest) getRequest())
-					.getContainer();
-			if (container instanceof View) {
-				container = ((View) container).getElement();
-			}
-			return container;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EObject doDefaultElementCreation() {
-			StructuredActivityNode newElement = (StructuredActivityNode) super
-					.doDefaultElementCreation();
-			if (newElement != null) {
-				UMLElementTypes.Initializers.StructuredActivityNode_1010
-						.init(newElement);
-			}
-			return newElement;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateStructuredActivityNode_1011Command extends
-			CreateElementCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateStructuredActivityNode_1011Command(CreateElementRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getActivity();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected EObject getElementToEdit() {
-			EObject container = ((CreateElementRequest) getRequest())
-					.getContainer();
-			if (container instanceof View) {
-				container = ((View) container).getElement();
-			}
-			return container;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EObject doDefaultElementCreation() {
-			StructuredActivityNode newElement = (StructuredActivityNode) super
-					.doDefaultElementCreation();
-			if (newElement != null) {
-				UMLElementTypes.Initializers.StructuredActivityNode_1011
-						.init(newElement);
-			}
-			return newElement;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateActivityParameterNode_1012Command extends
-			CreateElementCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateActivityParameterNode_1012Command(CreateElementRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getActivity();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected EObject getElementToEdit() {
-			EObject container = ((CreateElementRequest) getRequest())
-					.getContainer();
-			if (container instanceof View) {
-				container = ((View) container).getElement();
-			}
-			return container;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EObject doDefaultElementCreation() {
-			ActivityParameterNode newElement = (ActivityParameterNode) super
-					.doDefaultElementCreation();
-			if (newElement != null) {
-				UMLElementTypes.Initializers.ActivityParameterNode_1012
-						.init(newElement);
-			}
-			return newElement;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDuplicateCommand(DuplicateElementsRequest req) {
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-				.getEditingDomain();
-		return getMSLWrapper(new DuplicateAnythingCommand(editingDomain, req));
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class DuplicateAnythingCommand extends
-			DuplicateEObjectsCommand {
-
-		/**
-		 * @generated
-		 */
-		public DuplicateAnythingCommand(
-				TransactionalEditingDomain editingDomain,
-				DuplicateElementsRequest req) {
-			super(editingDomain, req.getLabel(), req
-					.getElementsToBeDuplicated(), req
-					.getAllDuplicatedElementsMap());
-		}
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNode2CanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNode2CanonicalEditPolicy.java
deleted file mode 100644
index 8f95085..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNode2CanonicalEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @generated
- */
-public class ActivityParameterNode2CanonicalEditPolicy extends
-		CanonicalEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement() && view.getElement() != null
-				&& view.getElement().eIsProxy();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNode2GraphicalNodeEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNode2GraphicalNodeEditPolicy.java
deleted file mode 100644
index 1f18332..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNode2GraphicalNodeEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-/**
- * @generated
- */
-public class ActivityParameterNode2GraphicalNodeEditPolicy extends
-		UMLGraphicalNodeEditPolicy {
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNode2ItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNode2ItemSemanticEditPolicy.java
deleted file mode 100644
index 04503dc..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNode2ItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,158 +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.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-
-import org.eclipse.gef.commands.UnexecutableCommand;
-
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ControlFlow;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ActivityParameterNode2ItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return getMSLWrapper(new DestroyElementCommand(req) {
-
-			protected EObject getElementToDestroy() {
-				View view = (View) getHost().getModel();
-				EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-				if (annotation != null) {
-					return view;
-				}
-				return super.getElementToDestroy();
-			}
-
-		});
-	}
-
-	/**
-	 * @modified
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		//		if (UMLElementTypes.ControlFlow_3001 == req.getElementType()) {
-		//			return req.getTarget() == null ? getCreateStartOutgoingControlFlow3001Command(req)
-		//					: getCreateCompleteIncomingControlFlow3001Command(req);
-		//		}
-		return super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateStartOutgoingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		return new Command() {
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCompleteIncomingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		if (!(req.getSource() instanceof ActivityNode)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		final StructuredActivityNode element = (StructuredActivityNode) getRelationshipContainer(
-				req.getSource(), UMLPackage.eINSTANCE
-						.getStructuredActivityNode(), req.getElementType());
-		if (element == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		if (req.getContainmentFeature() == null) {
-			req.setContainmentFeature(UMLPackage.eINSTANCE
-					.getStructuredActivityNode_Edge());
-		}
-		return getMSLWrapper(new CreateIncomingControlFlow3001Command(req) {
-
-			/**
-			 * @generated
-			 */
-			protected EObject getElementToEdit() {
-				return element;
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateIncomingControlFlow3001Command extends
-			CreateRelationshipCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateIncomingControlFlow3001Command(
-				CreateRelationshipRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getStructuredActivityNode();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected void setElementToEdit(EObject element) {
-			throw new UnsupportedOperationException();
-		}
-
-		/**
-		 * @generated
-		 */
-		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/edit/policies/ActivityParameterNodeCanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNodeCanonicalEditPolicy.java
deleted file mode 100644
index 01076e3..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNodeCanonicalEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @generated
- */
-public class ActivityParameterNodeCanonicalEditPolicy extends
-		CanonicalEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement() && view.getElement() != null
-				&& view.getElement().eIsProxy();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNodeGraphicalNodeEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNodeGraphicalNodeEditPolicy.java
deleted file mode 100644
index d9690bf..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNodeGraphicalNodeEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-/**
- * @generated
- */
-public class ActivityParameterNodeGraphicalNodeEditPolicy extends
-		UMLGraphicalNodeEditPolicy {
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNodeItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNodeItemSemanticEditPolicy.java
deleted file mode 100644
index dc8ddb4..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityParameterNodeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,158 +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.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-
-import org.eclipse.gef.commands.UnexecutableCommand;
-
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ControlFlow;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ActivityParameterNodeItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return getMSLWrapper(new DestroyElementCommand(req) {
-
-			protected EObject getElementToDestroy() {
-				View view = (View) getHost().getModel();
-				EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-				if (annotation != null) {
-					return view;
-				}
-				return super.getElementToDestroy();
-			}
-
-		});
-	}
-
-	/**
-	 * @modified
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		//		if (UMLElementTypes.ControlFlow_3001 == req.getElementType()) {
-		//			return req.getTarget() == null ? getCreateStartOutgoingControlFlow3001Command(req)
-		//					: getCreateCompleteIncomingControlFlow3001Command(req);
-		//		}
-		return super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateStartOutgoingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		return new Command() {
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCompleteIncomingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		if (!(req.getSource() instanceof ActivityNode)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		final StructuredActivityNode element = (StructuredActivityNode) getRelationshipContainer(
-				req.getSource(), UMLPackage.eINSTANCE
-						.getStructuredActivityNode(), req.getElementType());
-		if (element == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		if (req.getContainmentFeature() == null) {
-			req.setContainmentFeature(UMLPackage.eINSTANCE
-					.getStructuredActivityNode_Edge());
-		}
-		return getMSLWrapper(new CreateIncomingControlFlow3001Command(req) {
-
-			/**
-			 * @generated
-			 */
-			protected EObject getElementToEdit() {
-				return element;
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateIncomingControlFlow3001Command extends
-			CreateRelationshipCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateIncomingControlFlow3001Command(
-				CreateRelationshipRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getStructuredActivityNode();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected void setElementToEdit(EObject element) {
-			throw new UnsupportedOperationException();
-		}
-
-		/**
-		 * @generated
-		 */
-		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/edit/policies/ActivityPartition2CanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartition2CanonicalEditPolicy.java
deleted file mode 100644
index cb7580b..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartition2CanonicalEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @generated
- */
-public class ActivityPartition2CanonicalEditPolicy extends CanonicalEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement() && view.getElement() != null
-				&& view.getElement().eIsProxy();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartition2GraphicalNodeEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartition2GraphicalNodeEditPolicy.java
deleted file mode 100644
index 5defe16..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartition2GraphicalNodeEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-/**
- * @generated
- */
-public class ActivityPartition2GraphicalNodeEditPolicy extends
-		UMLGraphicalNodeEditPolicy {
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartition2ItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartition2ItemSemanticEditPolicy.java
deleted file mode 100644
index d53830a..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartition2ItemSemanticEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class ActivityPartition2ItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return getMSLWrapper(new DestroyElementCommand(req) {
-
-			protected EObject getElementToDestroy() {
-				View view = (View) getHost().getModel();
-				EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-				if (annotation != null) {
-					return view;
-				}
-				return super.getElementToDestroy();
-			}
-
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		return super.getCreateRelationshipCommand(req);
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionCanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionCanonicalEditPolicy.java
deleted file mode 100644
index 28496db..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionCanonicalEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @generated
- */
-public class ActivityPartitionCanonicalEditPolicy extends CanonicalEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement() && view.getElement() != null
-				&& view.getElement().eIsProxy();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionGraphicalNodeEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionGraphicalNodeEditPolicy.java
deleted file mode 100644
index 87899d6..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionGraphicalNodeEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-/**
- * @generated
- */
-public class ActivityPartitionGraphicalNodeEditPolicy extends
-		UMLGraphicalNodeEditPolicy {
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionItemSemanticEditPolicy.java
deleted file mode 100644
index c2feeb1..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionItemSemanticEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class ActivityPartitionItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return getMSLWrapper(new DestroyElementCommand(req) {
-
-			protected EObject getElementToDestroy() {
-				View view = (View) getHost().getModel();
-				EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-				if (annotation != null) {
-					return view;
-				}
-				return super.getElementToDestroy();
-			}
-
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		return super.getCreateRelationshipCommand(req);
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionPartitionCampartment2CanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionPartitionCampartment2CanonicalEditPolicy.java
deleted file mode 100644
index 0897db4..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionPartitionCampartment2CanonicalEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartition2EditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.uml2.uml.ActivityPartition;
-
-/**
- * @generated
- */
-public class ActivityPartitionPartitionCampartment2CanonicalEditPolicy extends
-		CanonicalEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		EObject modelObject = ((View) getHost().getModel()).getElement();
-		View viewObject = (View) getHost().getModel();
-		EObject nextValue;
-		int nodeVID;
-		for (Iterator values = ((ActivityPartition) modelObject)
-				.getSubpartitions().iterator(); values.hasNext();) {
-			nextValue = (EObject) values.next();
-			nodeVID = UMLVisualIDRegistry
-					.getNodeVisualID(viewObject, nextValue);
-			if (ActivityPartition2EditPart.VISUAL_ID == nodeVID) {
-				result.add(nextValue);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement() && view.getElement() != null
-				&& view.getElement().eIsProxy();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionPartitionCampartment2ItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionPartitionCampartment2ItemSemanticEditPolicy.java
deleted file mode 100644
index 6d6e51f..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionPartitionCampartment2ItemSemanticEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-
-import org.eclipse.gef.commands.Command;
-
-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.UMLPackage;
-
-/**
- * @generated
- */
-public class ActivityPartitionPartitionCampartment2ItemSemanticEditPolicy
-		extends UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		if (UMLElementTypes.ActivityPartition_2001 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivityPartition_Subpartition());
-			}
-			return getMSLWrapper(new CreateActivityPartition_2001Command(req));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateActivityPartition_2001Command extends
-			CreateElementCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateActivityPartition_2001Command(CreateElementRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getActivityPartition();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected EObject getElementToEdit() {
-			EObject container = ((CreateElementRequest) getRequest())
-					.getContainer();
-			if (container instanceof View) {
-				container = ((View) container).getElement();
-			}
-			return container;
-		}
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionPartitionCampartmentCanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionPartitionCampartmentCanonicalEditPolicy.java
deleted file mode 100644
index 9778260..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionPartitionCampartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,83 +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.policies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartition2EditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.uml2.uml.ActivityPartition;
-
-/**
- * @generated
- */
-public class ActivityPartitionPartitionCampartmentCanonicalEditPolicy extends
-		CanonicalEditPolicy {
-
-	/**
-	 * @modified
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		EObject modelObject = ((View) getHost().getModel()).getElement();
-		View viewObject = (View) getHost().getModel();
-		EObject nextValue;
-		int nodeVID;
-		// modified to check ActivityPartition or not. to avoid classcast exception.
-		if (modelObject instanceof ActivityPartition) {
-			for (Iterator values = ((ActivityPartition) modelObject)
-					.getSubpartitions().iterator(); values.hasNext();) {
-				nextValue = (EObject) values.next();
-				nodeVID = UMLVisualIDRegistry.getNodeVisualID(viewObject,
-						nextValue);
-				if (ActivityPartition2EditPart.VISUAL_ID == nodeVID) {
-					result.add(nextValue);
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement() && view.getElement() != null
-				&& view.getElement().eIsProxy();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionPartitionCampartmentItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionPartitionCampartmentItemSemanticEditPolicy.java
deleted file mode 100644
index d8455f1..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ActivityPartitionPartitionCampartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,175 +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.policies;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.diagramming.base.commands.ActivityPartitionDestroyCommand;
-import org.eclipse.epf.diagramming.base.commands.CreateActivityNodeInActivityPartition;
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-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.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.notation.View;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ActivityPartitionPartitionCampartmentItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @modified
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		if (UMLElementTypes.ActivityPartition_2001 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivityPartition_Subpartition());
-			}
-			return getMSLWrapper(new CreateActivityPartition_2001Command(req));
-		}
-		// modified START
-		Command command = getCreateActivityNodeCommand(req);
-		if (command != null) {
-
-			//			command = command.chain(getMSLWrapper(new UpdateActivityCommand(req)));
-			//			command = command.chain(new UmaActivityCreationCommand(req));
-			return command;
-		}
-		// modified END
-
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateActivityPartition_2001Command extends
-			CreateElementCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateActivityPartition_2001Command(CreateElementRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getActivityPartition();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected EObject getElementToEdit() {
-			EObject container = ((CreateElementRequest) getRequest())
-					.getContainer();
-			if (container instanceof View) {
-				container = ((View) container).getElement();
-			}
-			return container;
-		}
-	}
-
-	/**
-	 * @custom
-	 */
-	private Command getCreateActivityNodeCommand(CreateElementRequest req) {
-		if (UMLElementTypes.StructuredActivityNode_1007 == req.getElementType()
-				|| UMLElementTypes.StructuredActivityNode_1010 == req
-						.getElementType()
-				|| UMLElementTypes.StructuredActivityNode_1011 == req
-						.getElementType()
-				|| UMLElementTypes.MergeNode_1002 == req.getElementType()
-				|| UMLElementTypes.ForkNode_1003 == req.getElementType()
-				|| UMLElementTypes.InitialNode_1004 == req.getElementType()
-				|| UMLElementTypes.DecisionNode_1005 == req.getElementType()
-				|| UMLElementTypes.JoinNode_1006 == req.getElementType()
-				|| UMLElementTypes.ActivityFinalNode_1001 == req
-						.getElementType()
-				|| UMLElementTypes.ActivityParameterNode_1009 == req
-						.getElementType()
-				|| UMLElementTypes.ActivityParameterNode_1012 == req
-						.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivityPartition_Node());
-			}
-			return getMSLWrapper(new CreateActivityNodeInActivityPartition(req));
-		}
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.epf.gmf.diagram.edit.policies.UMLBaseItemSemanticEditPolicy#getCreateOutgoing(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest)
-	 * @modiifed
-	 */
-	protected Command getCreateOutgoing(CreateRelationshipRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/*
-	 * @custom
-	 */
-	//	private void updateActivityCommand(CreateElementRequest request, Command cmd){
-	//		EObject obj = request.getNewElement();
-	//		if (obj != null) {
-	//			EObject parent = obj;
-	//			while (!(parent.eContainer() instanceof Activity)) {
-	//				parent = parent.eContainer();
-	//			}
-	//			EStructuralFeature feature = UMLPackage.eINSTANCE
-	//					.getActivity_Node();
-	//			SetRequest req = new SetRequest(parent, feature, request
-	//					.getNewElement());
-	//			cmd.chain(getMSLWrapper(new SetValueCommand(req)));
-	//		}
-	//	}
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.diagramming.edit.policies.UMLBaseItemSemanticEditPolicy#getDestroyElementCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest)
-	 * @modified
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		/* modify START */
-		return getMSLWrapper(new ActivityPartitionDestroyCommand(req, getHost()));
-		/* modify END */
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.diagramming.edit.policies.UMLBaseItemSemanticEditPolicy#getDestroyReferenceCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest)
-	 * @modified
-	 */
-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {
-		return super.getDestroyReferenceCommand(req);
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ControlFlowItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ControlFlowItemSemanticEditPolicy.java
deleted file mode 100644
index dcf4f46..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ControlFlowItemSemanticEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gef.commands.Command;
-
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-
-/**
- * @generated
- */
-public class ControlFlowItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return getMSLWrapper(new DestroyElementCommand(req));
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/DecisionNodeCanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/DecisionNodeCanonicalEditPolicy.java
deleted file mode 100644
index af1a4e1..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/DecisionNodeCanonicalEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @generated
- */
-public class DecisionNodeCanonicalEditPolicy extends CanonicalEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement() && view.getElement() != null
-				&& view.getElement().eIsProxy();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/DecisionNodeGraphicalNodeEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/DecisionNodeGraphicalNodeEditPolicy.java
deleted file mode 100644
index 8022279..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/DecisionNodeGraphicalNodeEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-/**
- * @generated
- */
-public class DecisionNodeGraphicalNodeEditPolicy extends
-		UMLGraphicalNodeEditPolicy {
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/DecisionNodeItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/DecisionNodeItemSemanticEditPolicy.java
deleted file mode 100644
index 94a0787..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/DecisionNodeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,158 +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.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-
-import org.eclipse.gef.commands.UnexecutableCommand;
-
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ControlFlow;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class DecisionNodeItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return getMSLWrapper(new DestroyElementCommand(req) {
-
-			protected EObject getElementToDestroy() {
-				View view = (View) getHost().getModel();
-				EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-				if (annotation != null) {
-					return view;
-				}
-				return super.getElementToDestroy();
-			}
-
-		});
-	}
-
-	/**
-	 * @modified
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		//		if (UMLElementTypes.ControlFlow_3001 == req.getElementType()) {
-		//			return req.getTarget() == null ? getCreateStartOutgoingControlFlow3001Command(req)
-		//					: getCreateCompleteIncomingControlFlow3001Command(req);
-		//		}
-		return super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateStartOutgoingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		return new Command() {
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCompleteIncomingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		if (!(req.getSource() instanceof ActivityNode)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		final StructuredActivityNode element = (StructuredActivityNode) getRelationshipContainer(
-				req.getSource(), UMLPackage.eINSTANCE
-						.getStructuredActivityNode(), req.getElementType());
-		if (element == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		if (req.getContainmentFeature() == null) {
-			req.setContainmentFeature(UMLPackage.eINSTANCE
-					.getStructuredActivityNode_Edge());
-		}
-		return getMSLWrapper(new CreateIncomingControlFlow3001Command(req) {
-
-			/**
-			 * @generated
-			 */
-			protected EObject getElementToEdit() {
-				return element;
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateIncomingControlFlow3001Command extends
-			CreateRelationshipCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateIncomingControlFlow3001Command(
-				CreateRelationshipRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getStructuredActivityNode();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected void setElementToEdit(EObject element) {
-			throw new UnsupportedOperationException();
-		}
-
-		/**
-		 * @generated
-		 */
-		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/edit/policies/ForkNodeCanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ForkNodeCanonicalEditPolicy.java
deleted file mode 100644
index ca3deda..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ForkNodeCanonicalEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @generated
- */
-public class ForkNodeCanonicalEditPolicy extends CanonicalEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement() && view.getElement() != null
-				&& view.getElement().eIsProxy();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ForkNodeGraphicalNodeEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ForkNodeGraphicalNodeEditPolicy.java
deleted file mode 100644
index 1447388..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ForkNodeGraphicalNodeEditPolicy.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.policies;
-
-/**
- * @generated
- */
-public class ForkNodeGraphicalNodeEditPolicy extends UMLGraphicalNodeEditPolicy {
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ForkNodeItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ForkNodeItemSemanticEditPolicy.java
deleted file mode 100644
index 347f770..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/ForkNodeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,158 +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.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-
-import org.eclipse.gef.commands.UnexecutableCommand;
-
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ControlFlow;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ForkNodeItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return getMSLWrapper(new DestroyElementCommand(req) {
-
-			protected EObject getElementToDestroy() {
-				View view = (View) getHost().getModel();
-				EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-				if (annotation != null) {
-					return view;
-				}
-				return super.getElementToDestroy();
-			}
-
-		});
-	}
-
-	/**
-	 * @modified
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		//		if (UMLElementTypes.ControlFlow_3001 == req.getElementType()) {
-		//			return req.getTarget() == null ? getCreateStartOutgoingControlFlow3001Command(req)
-		//					: getCreateCompleteIncomingControlFlow3001Command(req);
-		//		}
-		return super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateStartOutgoingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		return new Command() {
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCompleteIncomingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		if (!(req.getSource() instanceof ActivityNode)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		final StructuredActivityNode element = (StructuredActivityNode) getRelationshipContainer(
-				req.getSource(), UMLPackage.eINSTANCE
-						.getStructuredActivityNode(), req.getElementType());
-		if (element == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		if (req.getContainmentFeature() == null) {
-			req.setContainmentFeature(UMLPackage.eINSTANCE
-					.getStructuredActivityNode_Edge());
-		}
-		return getMSLWrapper(new CreateIncomingControlFlow3001Command(req) {
-
-			/**
-			 * @generated
-			 */
-			protected EObject getElementToEdit() {
-				return element;
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateIncomingControlFlow3001Command extends
-			CreateRelationshipCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateIncomingControlFlow3001Command(
-				CreateRelationshipRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getStructuredActivityNode();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected void setElementToEdit(EObject element) {
-			throw new UnsupportedOperationException();
-		}
-
-		/**
-		 * @generated
-		 */
-		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/edit/policies/InitialNodeCanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/InitialNodeCanonicalEditPolicy.java
deleted file mode 100644
index 9058922..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/InitialNodeCanonicalEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @generated
- */
-public class InitialNodeCanonicalEditPolicy extends CanonicalEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement() && view.getElement() != null
-				&& view.getElement().eIsProxy();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/InitialNodeGraphicalNodeEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/InitialNodeGraphicalNodeEditPolicy.java
deleted file mode 100644
index db751c4..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/InitialNodeGraphicalNodeEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-/**
- * @generated
- */
-public class InitialNodeGraphicalNodeEditPolicy extends
-		UMLGraphicalNodeEditPolicy {
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/InitialNodeItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/InitialNodeItemSemanticEditPolicy.java
deleted file mode 100644
index f9aa899..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/InitialNodeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,170 +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.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-
-import org.eclipse.gef.commands.UnexecutableCommand;
-
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ControlFlow;
-import org.eclipse.uml2.uml.InitialNode;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class InitialNodeItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return getMSLWrapper(new DestroyElementCommand(req) {
-
-			protected EObject getElementToDestroy() {
-				View view = (View) getHost().getModel();
-				EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-				if (annotation != null) {
-					return view;
-				}
-				return super.getElementToDestroy();
-			}
-
-		});
-	}
-
-	/**
-	 * @modified
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		//		if (UMLElementTypes.ControlFlow_3001 == req.getElementType()) {
-		//			return req.getTarget() == null ? getCreateStartOutgoingControlFlow3001Command(req)
-		//					: getCreateCompleteIncomingControlFlow3001Command(req);
-		//		}
-		return super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @see org.eclipse.epf.gmf.diagram.edit.policies.UMLBaseItemSemanticEditPolicy#getCreateIncomingComplete(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest)
-	 * @modified
-	 */
-	protected Command getCreateIncomingComplete(CreateRelationshipRequest req) {
-		if (req.getTarget() instanceof InitialNode) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		return super.getCreateIncomingComplete(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateStartOutgoingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		return new Command() {
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCompleteIncomingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		if (!(req.getSource() instanceof ActivityNode)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		final StructuredActivityNode element = (StructuredActivityNode) getRelationshipContainer(
-				req.getSource(), UMLPackage.eINSTANCE
-						.getStructuredActivityNode(), req.getElementType());
-		if (element == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		if (req.getContainmentFeature() == null) {
-			req.setContainmentFeature(UMLPackage.eINSTANCE
-					.getStructuredActivityNode_Edge());
-		}
-		return getMSLWrapper(new CreateIncomingControlFlow3001Command(req) {
-
-			/**
-			 * @generated
-			 */
-			protected EObject getElementToEdit() {
-				return element;
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateIncomingControlFlow3001Command extends
-			CreateRelationshipCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateIncomingControlFlow3001Command(
-				CreateRelationshipRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getStructuredActivityNode();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected void setElementToEdit(EObject element) {
-			throw new UnsupportedOperationException();
-		}
-
-		/**
-		 * @generated
-		 */
-		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/edit/policies/JoinNodeCanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/JoinNodeCanonicalEditPolicy.java
deleted file mode 100644
index 449cfb0..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/JoinNodeCanonicalEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @generated
- */
-public class JoinNodeCanonicalEditPolicy extends CanonicalEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement() && view.getElement() != null
-				&& view.getElement().eIsProxy();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/JoinNodeGraphicalNodeEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/JoinNodeGraphicalNodeEditPolicy.java
deleted file mode 100644
index 8d61953..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/JoinNodeGraphicalNodeEditPolicy.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.policies;
-
-/**
- * @generated
- */
-public class JoinNodeGraphicalNodeEditPolicy extends UMLGraphicalNodeEditPolicy {
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/JoinNodeItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/JoinNodeItemSemanticEditPolicy.java
deleted file mode 100644
index 31702f0..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/JoinNodeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,178 +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.policies;
-
-import java.util.List;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-
-import org.eclipse.gef.commands.UnexecutableCommand;
-
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ControlFlow;
-import org.eclipse.uml2.uml.JoinNode;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class JoinNodeItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return getMSLWrapper(new DestroyElementCommand(req) {
-
-			protected EObject getElementToDestroy() {
-				View view = (View) getHost().getModel();
-				EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-				if (annotation != null) {
-					return view;
-				}
-				return super.getElementToDestroy();
-			}
-
-		});
-	}
-
-	/**
-	 * @modified
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		//		if (UMLElementTypes.ControlFlow_3001 == req.getElementType()) {
-		//			return req.getTarget() == null ? getCreateStartOutgoingControlFlow3001Command(req)
-		//					: getCreateCompleteIncomingControlFlow3001Command(req);
-		//		}
-		return super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @see org.eclipse.epf.gmf.diagram.edit.policies.UMLBaseItemSemanticEditPolicy#getCreateOutgoing(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest)
-	 * @modified
-	 */
-	protected Command getCreateOutgoing(CreateRelationshipRequest req) {
-
-		// Validation Join Node should allow only one outgoing connection.
-		if (req.getSource() instanceof JoinNode) {
-			JoinNode join = (JoinNode) req.getSource();
-			List list = join.getOutgoings();
-			if (list != null && list.size() >= 1) {
-				return UnexecutableCommand.INSTANCE;
-			}
-		}
-		return super.getCreateOutgoing(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateStartOutgoingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		return new Command() {
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCompleteIncomingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		if (!(req.getSource() instanceof ActivityNode)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		final StructuredActivityNode element = (StructuredActivityNode) getRelationshipContainer(
-				req.getSource(), UMLPackage.eINSTANCE
-						.getStructuredActivityNode(), req.getElementType());
-		if (element == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		if (req.getContainmentFeature() == null) {
-			req.setContainmentFeature(UMLPackage.eINSTANCE
-					.getStructuredActivityNode_Edge());
-		}
-		return getMSLWrapper(new CreateIncomingControlFlow3001Command(req) {
-
-			/**
-			 * @generated
-			 */
-			protected EObject getElementToEdit() {
-				return element;
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateIncomingControlFlow3001Command extends
-			CreateRelationshipCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateIncomingControlFlow3001Command(
-				CreateRelationshipRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getStructuredActivityNode();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected void setElementToEdit(EObject element) {
-			throw new UnsupportedOperationException();
-		}
-
-		/**
-		 * @generated
-		 */
-		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/edit/policies/MergeNodeCanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/MergeNodeCanonicalEditPolicy.java
deleted file mode 100644
index 488d29b..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/MergeNodeCanonicalEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @generated
- */
-public class MergeNodeCanonicalEditPolicy extends CanonicalEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement() && view.getElement() != null
-				&& view.getElement().eIsProxy();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/MergeNodeGraphicalNodeEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/MergeNodeGraphicalNodeEditPolicy.java
deleted file mode 100644
index 15e675a..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/MergeNodeGraphicalNodeEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-/**
- * @generated
- */
-public class MergeNodeGraphicalNodeEditPolicy extends
-		UMLGraphicalNodeEditPolicy {
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/MergeNodeItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/MergeNodeItemSemanticEditPolicy.java
deleted file mode 100644
index fb8b5ae..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/MergeNodeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,158 +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.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-
-import org.eclipse.gef.commands.UnexecutableCommand;
-
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ControlFlow;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class MergeNodeItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return getMSLWrapper(new DestroyElementCommand(req) {
-
-			protected EObject getElementToDestroy() {
-				View view = (View) getHost().getModel();
-				EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-				if (annotation != null) {
-					return view;
-				}
-				return super.getElementToDestroy();
-			}
-
-		});
-	}
-
-	/**
-	 * @modified
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		//		if (UMLElementTypes.ControlFlow_3001 == req.getElementType()) {
-		//			return req.getTarget() == null ? getCreateStartOutgoingControlFlow3001Command(req)
-		//					: getCreateCompleteIncomingControlFlow3001Command(req);
-		//		}
-		return super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateStartOutgoingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		return new Command() {
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCompleteIncomingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		if (!(req.getSource() instanceof ActivityNode)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		final StructuredActivityNode element = (StructuredActivityNode) getRelationshipContainer(
-				req.getSource(), UMLPackage.eINSTANCE
-						.getStructuredActivityNode(), req.getElementType());
-		if (element == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		if (req.getContainmentFeature() == null) {
-			req.setContainmentFeature(UMLPackage.eINSTANCE
-					.getStructuredActivityNode_Edge());
-		}
-		return getMSLWrapper(new CreateIncomingControlFlow3001Command(req) {
-
-			/**
-			 * @generated
-			 */
-			protected EObject getElementToEdit() {
-				return element;
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateIncomingControlFlow3001Command extends
-			CreateRelationshipCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateIncomingControlFlow3001Command(
-				CreateRelationshipRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getStructuredActivityNode();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected void setElementToEdit(EObject element) {
-			throw new UnsupportedOperationException();
-		}
-
-		/**
-		 * @generated
-		 */
-		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/edit/policies/StructuredActivityNode2CanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode2CanonicalEditPolicy.java
deleted file mode 100644
index 7502725..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode2CanonicalEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @generated
- */
-public class StructuredActivityNode2CanonicalEditPolicy extends
-		CanonicalEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement() && view.getElement() != null
-				&& view.getElement().eIsProxy();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode2GraphicalNodeEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode2GraphicalNodeEditPolicy.java
deleted file mode 100644
index 8790068..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode2GraphicalNodeEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-/**
- * @generated
- */
-public class StructuredActivityNode2GraphicalNodeEditPolicy extends
-		UMLGraphicalNodeEditPolicy {
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode2ItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode2ItemSemanticEditPolicy.java
deleted file mode 100644
index 04129b6..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode2ItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,158 +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.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-
-import org.eclipse.gef.commands.UnexecutableCommand;
-
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ControlFlow;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class StructuredActivityNode2ItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return getMSLWrapper(new DestroyElementCommand(req) {
-
-			protected EObject getElementToDestroy() {
-				View view = (View) getHost().getModel();
-				EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-				if (annotation != null) {
-					return view;
-				}
-				return super.getElementToDestroy();
-			}
-
-		});
-	}
-
-	/**
-	 * @modified
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		//		if (UMLElementTypes.ControlFlow_3001 == req.getElementType()) {
-		//			return req.getTarget() == null ? getCreateStartOutgoingControlFlow3001Command(req)
-		//					: getCreateCompleteIncomingControlFlow3001Command(req);
-		//		}
-		return super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateStartOutgoingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		return new Command() {
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCompleteIncomingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		if (!(req.getSource() instanceof ActivityNode)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		final StructuredActivityNode element = (StructuredActivityNode) getRelationshipContainer(
-				req.getSource(), UMLPackage.eINSTANCE
-						.getStructuredActivityNode(), req.getElementType());
-		if (element == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		if (req.getContainmentFeature() == null) {
-			req.setContainmentFeature(UMLPackage.eINSTANCE
-					.getStructuredActivityNode_Edge());
-		}
-		return getMSLWrapper(new CreateIncomingControlFlow3001Command(req) {
-
-			/**
-			 * @generated
-			 */
-			protected EObject getElementToEdit() {
-				return element;
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateIncomingControlFlow3001Command extends
-			CreateRelationshipCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateIncomingControlFlow3001Command(
-				CreateRelationshipRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getStructuredActivityNode();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected void setElementToEdit(EObject element) {
-			throw new UnsupportedOperationException();
-		}
-
-		/**
-		 * @generated
-		 */
-		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/edit/policies/StructuredActivityNode3CanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode3CanonicalEditPolicy.java
deleted file mode 100644
index a00b7a2..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode3CanonicalEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @generated
- */
-public class StructuredActivityNode3CanonicalEditPolicy extends
-		CanonicalEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement() && view.getElement() != null
-				&& view.getElement().eIsProxy();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode3GraphicalNodeEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode3GraphicalNodeEditPolicy.java
deleted file mode 100644
index 5f7ae1b..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode3GraphicalNodeEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-/**
- * @generated
- */
-public class StructuredActivityNode3GraphicalNodeEditPolicy extends
-		UMLGraphicalNodeEditPolicy {
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode3ItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode3ItemSemanticEditPolicy.java
deleted file mode 100644
index 721bf28..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNode3ItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,158 +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.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-
-import org.eclipse.gef.commands.UnexecutableCommand;
-
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ControlFlow;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class StructuredActivityNode3ItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return getMSLWrapper(new DestroyElementCommand(req) {
-
-			protected EObject getElementToDestroy() {
-				View view = (View) getHost().getModel();
-				EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-				if (annotation != null) {
-					return view;
-				}
-				return super.getElementToDestroy();
-			}
-
-		});
-	}
-
-	/**
-	 * @modified
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		//		if (UMLElementTypes.ControlFlow_3001 == req.getElementType()) {
-		//			return req.getTarget() == null ? getCreateStartOutgoingControlFlow3001Command(req)
-		//					: getCreateCompleteIncomingControlFlow3001Command(req);
-		//		}
-		return super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateStartOutgoingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		return new Command() {
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCompleteIncomingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		if (!(req.getSource() instanceof ActivityNode)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		final StructuredActivityNode element = (StructuredActivityNode) getRelationshipContainer(
-				req.getSource(), UMLPackage.eINSTANCE
-						.getStructuredActivityNode(), req.getElementType());
-		if (element == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		if (req.getContainmentFeature() == null) {
-			req.setContainmentFeature(UMLPackage.eINSTANCE
-					.getStructuredActivityNode_Edge());
-		}
-		return getMSLWrapper(new CreateIncomingControlFlow3001Command(req) {
-
-			/**
-			 * @generated
-			 */
-			protected EObject getElementToEdit() {
-				return element;
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateIncomingControlFlow3001Command extends
-			CreateRelationshipCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateIncomingControlFlow3001Command(
-				CreateRelationshipRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getStructuredActivityNode();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected void setElementToEdit(EObject element) {
-			throw new UnsupportedOperationException();
-		}
-
-		/**
-		 * @generated
-		 */
-		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/edit/policies/StructuredActivityNodeCanonicalEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNodeCanonicalEditPolicy.java
deleted file mode 100644
index 711666c..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNodeCanonicalEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @generated
- */
-public class StructuredActivityNodeCanonicalEditPolicy extends
-		CanonicalEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected List getSemanticChildrenList() {
-		List result = new LinkedList();
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.isSetElement() && view.getElement() != null
-				&& view.getElement().eIsProxy();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFactoryHint() {
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNodeGraphicalNodeEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNodeGraphicalNodeEditPolicy.java
deleted file mode 100644
index cbbd0f1..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNodeGraphicalNodeEditPolicy.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
-//------------------------------------------------------------------------------
-/*
- * 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.policies;
-
-/**
- * @generated
- */
-public class StructuredActivityNodeGraphicalNodeEditPolicy extends
-		UMLGraphicalNodeEditPolicy {
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNodeItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNodeItemSemanticEditPolicy.java
deleted file mode 100644
index 46daebd..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/StructuredActivityNodeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,158 +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.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-
-import org.eclipse.gef.commands.UnexecutableCommand;
-
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ControlFlow;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class StructuredActivityNodeItemSemanticEditPolicy extends
-		UMLBaseItemSemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return getMSLWrapper(new DestroyElementCommand(req) {
-
-			protected EObject getElementToDestroy() {
-				View view = (View) getHost().getModel();
-				EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-				if (annotation != null) {
-					return view;
-				}
-				return super.getElementToDestroy();
-			}
-
-		});
-	}
-
-	/**
-	 * @modified
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		//		if (UMLElementTypes.ControlFlow_3001 == req.getElementType()) {
-		//			return req.getTarget() == null ? getCreateStartOutgoingControlFlow3001Command(req)
-		//					: getCreateCompleteIncomingControlFlow3001Command(req);
-		//		}
-		return super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateStartOutgoingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		return new Command() {
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCompleteIncomingControlFlow3001Command(
-			CreateRelationshipRequest req) {
-		if (!(req.getSource() instanceof ActivityNode)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		final StructuredActivityNode element = (StructuredActivityNode) getRelationshipContainer(
-				req.getSource(), UMLPackage.eINSTANCE
-						.getStructuredActivityNode(), req.getElementType());
-		if (element == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		if (req.getContainmentFeature() == null) {
-			req.setContainmentFeature(UMLPackage.eINSTANCE
-					.getStructuredActivityNode_Edge());
-		}
-		return getMSLWrapper(new CreateIncomingControlFlow3001Command(req) {
-
-			/**
-			 * @generated
-			 */
-			protected EObject getElementToEdit() {
-				return element;
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class CreateIncomingControlFlow3001Command extends
-			CreateRelationshipCommand {
-
-		/**
-		 * @generated
-		 */
-		public CreateIncomingControlFlow3001Command(
-				CreateRelationshipRequest req) {
-			super(req);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected EClass getEClassToEdit() {
-			return UMLPackage.eINSTANCE.getStructuredActivityNode();
-		};
-
-		/**
-		 * @generated
-		 */
-		protected void setElementToEdit(EObject element) {
-			throw new UnsupportedOperationException();
-		}
-
-		/**
-		 * @generated
-		 */
-		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/edit/policies/UMLBaseItemSemanticEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLBaseItemSemanticEditPolicy.java
deleted file mode 100644
index c2adbaa..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,355 +0,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
- *
- */
-package org.eclipse.epf.diagramming.edit.policies;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.epf.diagram.core.util.DiagramCoreValidation;
-import org.eclipse.epf.diagramming.base.commands.CreateIncomingControlFlowCommand;
-import org.eclipse.epf.diagramming.base.commands.CreateOutgoingControlFlowCommand;
-import org.eclipse.epf.diagramming.edit.helpers.UMLBaseEditHelper;
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-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.SemanticEditPolicy;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IEditHelperContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-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.DestroyRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.uml2.uml.Activity;
-import org.eclipse.uml2.uml.ActivityEdge;
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected Command getSemanticCommand(IEditCommandRequest request) {
-		IEditCommandRequest completedRequest = completeRequest(request);
-		Object editHelperContext = completedRequest.getEditHelperContext();
-		if (editHelperContext instanceof View
-				|| (editHelperContext instanceof IEditHelperContext && ((IEditHelperContext) editHelperContext)
-						.getEObject() instanceof View)) {
-			// no semantic commands are provided for pure design elements
-			return null;
-		}
-		if (editHelperContext == null) {
-			editHelperContext = ViewUtil
-					.resolveSemanticElement((View) getHost().getModel());
-		}
-		IElementType elementType = ElementTypeRegistry.getInstance()
-				.getElementType(editHelperContext);
-		if (elementType == ElementTypeRegistry.getInstance().getType(
-				"org.eclipse.gmf.runtime.emf.type.core.default")) { //$NON-NLS-1$ 
-			elementType = null;
-		}
-		Command epCommand = getSemanticCommandSwitch(completedRequest);
-		if (epCommand != null) {
-			ICommand command = epCommand instanceof ICommandProxy ? ((ICommandProxy) epCommand)
-					.getICommand()
-					: new CommandProxy(epCommand);
-			completedRequest.setParameter(
-					UMLBaseEditHelper.EDIT_POLICY_COMMAND, command);
-		}
-		Command ehCommand = null;
-		if (elementType != null) {
-			ICommand command = elementType.getEditCommand(completedRequest);
-			if (command != null) {
-				if (!(command instanceof CompositeTransactionalCommand)) {
-					TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-							.getEditingDomain();
-					command = new CompositeTransactionalCommand(editingDomain,
-							null).compose(command);
-				}
-				ehCommand = new ICommandProxy(command);
-			}
-		}
-		boolean shouldProceed = true;
-		if (completedRequest instanceof DestroyRequest) {
-			shouldProceed = shouldProceed((DestroyRequest) completedRequest);
-		}
-		if (shouldProceed) {
-			if (completedRequest instanceof DestroyRequest) {
-				TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-						.getEditingDomain();
-				Command deleteViewCommand = new ICommandProxy(
-						new DeleteCommand(editingDomain, (View) getHost()
-								.getModel()));
-				ehCommand = ehCommand == null ? deleteViewCommand : ehCommand
-						.chain(deleteViewCommand);
-			}
-			return ehCommand;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getSemanticCommandSwitch(IEditCommandRequest req) {
-		if (req instanceof CreateRelationshipRequest) {
-			return getCreateRelationshipCommand((CreateRelationshipRequest) req);
-		} else if (req instanceof CreateElementRequest) {
-			return getCreateCommand((CreateElementRequest) req);
-		} else if (req instanceof ConfigureRequest) {
-			return getConfigureCommand((ConfigureRequest) req);
-		} else if (req instanceof DestroyElementRequest) {
-			return getDestroyElementCommand((DestroyElementRequest) req);
-		} else if (req instanceof DestroyReferenceRequest) {
-			return getDestroyReferenceCommand((DestroyReferenceRequest) req);
-		} else if (req instanceof DuplicateElementsRequest) {
-			return getDuplicateCommand((DuplicateElementsRequest) req);
-		} else if (req instanceof GetEditContextRequest) {
-			return getEditContextCommand((GetEditContextRequest) req);
-		} else if (req instanceof MoveRequest) {
-			return getMoveCommand((MoveRequest) req);
-		} else if (req instanceof ReorientReferenceRelationshipRequest) {
-			return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest) req);
-		} else if (req instanceof ReorientRelationshipRequest) {
-			return getReorientRelationshipCommand((ReorientRelationshipRequest) req);
-		} else if (req instanceof SetRequest) {
-			return getSetCommand((SetRequest) req);
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getConfigureCommand(ConfigureRequest req) {
-		return null;
-	}
-
-	/**
-	 * @modified
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		if (UMLElementTypes.ControlFlow_3001 == req.getElementType()) {
-			return req.getTarget() == null ? getCreateOutgoing(req)
-					: getCreateIncomingComplete(req);
-		}
-		return null;
-	}
-
-	/**
-	 * Children should override this, for any extra validations.
-	 * @modified
-	 */
-	protected Command getCreateIncomingComplete(CreateRelationshipRequest req) {
-		Command command;
-		if (req.getSource() == req.getTarget()) {
-			return new Command() {
-			};
-		}
-
-		if (!(req.getSource() instanceof ActivityNode)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		final EObject element = (EObject) req.getSource();
-		if (element == null || !(element instanceof ActivityNode)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		if (isDuplicateRelationship(req.getSource(), req.getTarget())) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		
-		if(DiagramCoreValidation.canConnect((EditPart)getHost(), req.getTarget(), req.getSource()) != null)
-			return UnexecutableCommand.INSTANCE;
-		
-		if (element instanceof ActivityNode) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivity_Edge());
-			}
-			command = getMSLWrapper(new CreateIncomingControlFlowCommand(req,
-					element.eContainer()));
-
-			//			if (req.getTarget() != req.getSource()) {
-			//				command = command.chain(new CreatePredecessorCommand(req));
-			//			}
-			return command;
-
-		}
-		return null;
-	}
-
-	/**
-	 * Check  if the link between two ends already exists.
-	 * @modified
-	 */
-	private boolean isDuplicateRelationship(EObject source, EObject target) {
-		EObject container = source.eContainer();
-		if (container instanceof Activity) {
-			Activity activity = (Activity) container;
-			List list = activity.getEdges();
-			for (Iterator iter = list.iterator(); iter.hasNext();) {
-				ActivityEdge element = (ActivityEdge) iter.next();
-				if ((element.getSource() == source)
-						&& element.getTarget() == target) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @modified
-	 */
-	protected Command getCreateOutgoing(CreateRelationshipRequest req) {
-		if (!(req.getSource() instanceof ActivityNode)) {
-			return null;
-		}
-		final EObject element = (EObject) req.getTarget();
-		if (element == null || !(element instanceof ActivityNode)) {
-			return new Command() {
-			};
-		}
-		if (element instanceof ActivityNode) {
-			// TODO:  check the same type, don't create connection.
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(UMLPackage.eINSTANCE
-						.getActivity_Edge());
-			}
-		}
-		return getMSLWrapper(new CreateOutgoingControlFlowCommand(req));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getSetCommand(SetRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getEditContextCommand(GetEditContextRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDuplicateCommand(DuplicateElementsRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getMoveCommand(MoveRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getMSLWrapper(ICommand cmd) {
-		return new ICommandProxy(cmd);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getSemanticElement() {
-		return ViewUtil.resolveSemanticElement((View) getHost().getModel());
-	}
-
-	/**
-	 * Finds container element for the new relationship of the specified type.
-	 * Default implementation goes up by containment hierarchy starting from
-	 * the specified element and returns the first element that is instance of
-	 * the specified container class.
-	 * 
-	 * @generated
-	 */
-	protected EObject getRelationshipContainer(EObject element,
-			EClass containerClass, IElementType relationshipType) {
-		for (; element != null; element = element.eContainer()) {
-			if (containerClass.isSuperTypeOf(element.eClass())) {
-				return element;
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLExtNodeLabelHostLayoutEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLExtNodeLabelHostLayoutEditPolicy.java
deleted file mode 100644
index 5ec155a..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLExtNodeLabelHostLayoutEditPolicy.java
+++ /dev/null
@@ -1,240 +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.policies;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class UMLExtNodeLabelHostLayoutEditPolicy extends XYLayoutEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	private LayoutEditPolicy realLayoutEditPolicy;
-
-	/**
-	 * @generated
-	 */
-	public LayoutEditPolicy getRealLayoutEditPolicy() {
-		return realLayoutEditPolicy;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setRealLayoutEditPolicy(LayoutEditPolicy realLayoutEditPolicy) {
-		this.realLayoutEditPolicy = realLayoutEditPolicy;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isExternalLabel(EditPart editPart) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected final List getExternalLabels(GroupRequest request) {
-		List editParts = new ArrayList();
-		if (request.getEditParts() != null) {
-			for (Iterator it = request.getEditParts().iterator(); it.hasNext();) {
-				EditPart editPart = (EditPart) it.next();
-				if (isExternalLabel(editPart)) {
-					editParts.add(editPart);
-				}
-			}
-		}
-		return editParts;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Command getCommand(Request request) {
-		if (REQ_MOVE_CHILDREN.equals(request.getType())) {
-			ChangeBoundsRequest cbRequest = (ChangeBoundsRequest) request;
-			List extLabels = getExternalLabels(cbRequest);
-			if (!extLabels.isEmpty()) {
-				List editParts = cbRequest.getEditParts();
-				Command cmd = null;
-				if (realLayoutEditPolicy != null
-						&& editParts.size() > extLabels.size()) {
-					List other = new ArrayList(editParts);
-					other.removeAll(extLabels);
-					cbRequest.setEditParts(other);
-					cmd = realLayoutEditPolicy.getCommand(request);
-				}
-				cbRequest.setEditParts(extLabels);
-				Command extLabelsCmd = getMoveChildrenCommand(request);
-				cbRequest.setEditParts(editParts);
-				return cmd == null ? extLabelsCmd : cmd.chain(extLabelsCmd);
-			}
-		}
-		if (request instanceof GroupRequest) {
-			List extLabels = getExternalLabels((GroupRequest) request);
-			if (!extLabels.isEmpty()) {
-				return null;
-			}
-		}
-		return realLayoutEditPolicy == null ? null : realLayoutEditPolicy
-				.getCommand(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Object getConstraintFor(ChangeBoundsRequest request,
-			GraphicalEditPart child) {
-		int dx = ((Integer) ViewUtil.getStructuralFeatureValue((View) child
-				.getModel(), NotationPackage.eINSTANCE.getLocation_X()))
-				.intValue();
-		int dy = ((Integer) ViewUtil.getStructuralFeatureValue((View) child
-				.getModel(), NotationPackage.eINSTANCE.getLocation_Y()))
-				.intValue();
-		Rectangle r = new Rectangle(dx, dy, 0, 0);
-		child.getFigure().translateToAbsolute(r);
-		r.translate(request.getMoveDelta());
-		child.getFigure().translateToRelative(r);
-		return r;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean understandsRequest(Request req) {
-		if (realLayoutEditPolicy != null
-				&& realLayoutEditPolicy.understandsRequest(req)) {
-			return true;
-		}
-		return super.understandsRequest(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateChild(EditPart child) {
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setHost(EditPart host) {
-		super.setHost(host);
-		if (realLayoutEditPolicy != null) {
-			realLayoutEditPolicy.setHost(host);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		if (realLayoutEditPolicy != null) {
-			realLayoutEditPolicy.activate();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		super.deactivate();
-		if (realLayoutEditPolicy != null) {
-			realLayoutEditPolicy.deactivate();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		if (realLayoutEditPolicy != null) {
-			return realLayoutEditPolicy.getTargetEditPart(request);
-		} else {
-			return super.getTargetEditPart(request);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void showSourceFeedback(Request request) {
-		if (realLayoutEditPolicy != null) {
-			realLayoutEditPolicy.showSourceFeedback(request);
-		} else {
-			super.showSourceFeedback(request);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void eraseSourceFeedback(Request request) {
-		if (realLayoutEditPolicy != null) {
-			realLayoutEditPolicy.eraseSourceFeedback(request);
-		} else {
-			super.eraseSourceFeedback(request);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void showTargetFeedback(Request request) {
-		if (realLayoutEditPolicy != null) {
-			realLayoutEditPolicy.showTargetFeedback(request);
-		} else {
-			super.showTargetFeedback(request);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void eraseTargetFeedback(Request request) {
-		if (realLayoutEditPolicy != null) {
-			realLayoutEditPolicy.eraseTargetFeedback(request);
-		} else {
-			super.eraseTargetFeedback(request);
-		}
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLGraphicalNodeEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLGraphicalNodeEditPolicy.java
deleted file mode 100644
index 1601a19..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLGraphicalNodeEditPolicy.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.policies;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-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.GraphicalNodeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.epf.diagramming.edit.commands.UMLReorientConnectionViewCommand;
-
-/**
- * @generated
- */
-public class UMLGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	protected IElementType getElementType(CreateConnectionRequest request) {
-		if (request instanceof CreateConnectionViewAndElementRequest) {
-			CreateElementRequestAdapter requestAdapter = ((CreateConnectionViewAndElementRequest) request)
-					.getConnectionViewAndElementDescriptor()
-					.getCreateElementRequestAdapter();
-			return (IElementType) requestAdapter.getAdapter(IElementType.class);
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getConnectionWithReorientedViewCompleteCommand(
-			CreateConnectionRequest request) {
-		ICommandProxy c = (ICommandProxy) super
-				.getConnectionCompleteCommand(request);
-		CompositeCommand cc = (CompositeCommand) c.getICommand();
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-				.getEditingDomain();
-		UMLReorientConnectionViewCommand rcvCommand = new UMLReorientConnectionViewCommand(
-				editingDomain, null);
-		rcvCommand.setEdgeAdaptor(getViewAdapter());
-		cc.compose(rcvCommand);
-		return c;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLReferenceConnectionEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLReferenceConnectionEditPolicy.java
deleted file mode 100644
index 6c7f84a..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLReferenceConnectionEditPolicy.java
+++ /dev/null
@@ -1,186 +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.policies;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.gef.editpolicies.ConnectionEditPolicy;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
-import org.eclipse.gmf.runtime.diagram.ui.requests.GroupRequestViaKeyboard;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @generated
- */
-public class UMLReferenceConnectionEditPolicy extends ConnectionEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	private static final String DELETE_FROM_DIAGRAM_DLG_TITLE = DiagramUIMessages.PromptingDeleteAction_DeleteFromDiagramDialog_Title;
-
-	/**
-	 * @generated
-	 */
-	private static final String DELETE_FROM_DIAGRAM_DLG_MESSAGE = DiagramUIMessages.PromptingDeleteAction_DeleteFromDiagramDialog_Message;
-
-	/**
-	 * @generated
-	 */
-	private static final String DELETE_FROM_MODEL_DLG_TOGGLE_LABEL = DiagramUIMessages.MessageDialogWithToggle_DoNotPromptAgainToggle_label;
-
-	/**
-	 * @generated
-	 */
-	protected final Command getDeleteCommand(GroupRequest deleteRequest) {
-		boolean isDeleteFromKeyBoard = deleteRequest instanceof GroupRequestViaKeyboard;
-		if (shouldDeleteSemantic()) {
-			return createDeleteSemanticCommand(deleteRequest);
-		} else {
-			boolean proceedToDeleteView = true;
-			if (isDeleteFromKeyBoard) {
-				GroupRequestViaKeyboard groupRequestViaKeyboard = (GroupRequestViaKeyboard) deleteRequest;
-				if (groupRequestViaKeyboard.isShowInformationDialog()) {
-					proceedToDeleteView = showPrompt();
-					groupRequestViaKeyboard.setShowInformationDialog(false);
-					if (!(proceedToDeleteView))
-						return UnexecutableCommand.INSTANCE;
-				}
-			}
-			return createDeleteViewCommand(deleteRequest);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean shouldDeleteSemantic() {
-		Assert.isTrue(getHost() instanceof AbstractConnectionEditPart);
-		AbstractConnectionEditPart cep = (AbstractConnectionEditPart) getHost();
-		boolean isCanonical = false;
-		if (cep.getSource() != null)
-			isCanonical = IsCanonical(cep.getSource());
-		if (cep.getTarget() != null)
-			return isCanonical ? isCanonical : IsCanonical(cep.getTarget());
-		return isCanonical;
-	}
-
-	/**
-	 * @generated
-	 */
-	private boolean IsCanonical(EditPart ep) {
-		EditPart parent = ep.getParent();
-		return parent instanceof GraphicalEditPart ? ((GraphicalEditPart) parent)
-				.isCanonical()
-				: false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command createDeleteViewCommand(GroupRequest deleteRequest) {
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-				.getEditingDomain();
-		return new ICommandProxy(new DeleteCommand(editingDomain,
-				(View) getHost().getModel()));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command createDeleteSemanticCommand(GroupRequest deleteRequest) {
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-				.getEditingDomain();
-		EditCommandRequestWrapper semReq = new EditCommandRequestWrapper(
-				new DestroyElementRequest(editingDomain, false), deleteRequest
-						.getExtendedData());
-		Command semanticCmd = getHost().getCommand(semReq);
-		if (semanticCmd != null && semanticCmd.canExecute()) {
-			CompoundCommand cc = new CompoundCommand();
-			cc.add(semanticCmd);
-			return cc;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private boolean showPrompt() {
-		boolean prompt = ((IPreferenceStore) ((IGraphicalEditPart) getHost())
-				.getDiagramPreferencesHint().getPreferenceStore())
-				.getBoolean(IPreferenceConstants.PREF_PROMPT_ON_DEL_FROM_DIAGRAM);
-		if (prompt)
-			if (showMessageDialog())
-				return true;
-			else
-				return false;
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	private boolean showMessageDialog() {
-		MessageDialogWithToggle dialog = MessageDialogWithToggle
-				.openYesNoQuestion(Display.getCurrent().getActiveShell(),
-						DELETE_FROM_DIAGRAM_DLG_TITLE,
-						DELETE_FROM_DIAGRAM_DLG_MESSAGE,
-						DELETE_FROM_MODEL_DLG_TOGGLE_LABEL, false,
-						(IPreferenceStore) ((IGraphicalEditPart) getHost())
-								.getDiagramPreferencesHint()
-								.getPreferenceStore(),
-						IPreferenceConstants.PREF_PROMPT_ON_DEL_FROM_DIAGRAM);
-		if (dialog.getReturnCode() == IDialogConstants.YES_ID)
-			return true;
-		else
-			return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Command getCommand(Request request) {
-		if (request instanceof GroupRequestViaKeyboard) {
-			return getDeleteCommand((GroupRequest) request);
-		}
-		return super.getCommand(request);
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLTextNonResizableEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLTextNonResizableEditPolicy.java
deleted file mode 100644
index a2cad96..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLTextNonResizableEditPolicy.java
+++ /dev/null
@@ -1,231 +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.policies;
-
-import java.util.Collections;
-import java.util.List;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableEditPolicyEx;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel;
-
-/**
- * @generated
- */
-public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx {
-
-	/**
-	 * @generated
-	 */
-	private IFigure selectionFeedbackFigure;
-
-	/**
-	 * @generated
-	 */
-	private IFigure focusFeedbackFigure;
-
-	/**
-	 * @generated
-	 */
-	protected void showPrimarySelection() {
-		if (getHostFigure() instanceof WrapLabel) {
-			((WrapLabel) getHostFigure()).setSelected(true);
-			((WrapLabel) getHostFigure()).setFocus(true);
-		} else {
-			showSelection();
-			showFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void showSelection() {
-		if (getHostFigure() instanceof WrapLabel) {
-			((WrapLabel) getHostFigure()).setSelected(true);
-			((WrapLabel) getHostFigure()).setFocus(false);
-		} else {
-			hideSelection();
-			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());
-			refreshSelectionFeedback();
-			hideFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void hideSelection() {
-		if (getHostFigure() instanceof WrapLabel) {
-			((WrapLabel) getHostFigure()).setSelected(false);
-			((WrapLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (selectionFeedbackFigure != null) {
-				removeFeedback(selectionFeedbackFigure);
-				selectionFeedbackFigure = null;
-			}
-			hideFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void showFocus() {
-		if (getHostFigure() instanceof WrapLabel) {
-			((WrapLabel) getHostFigure()).setFocus(true);
-		} else {
-			hideFocus();
-			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());
-			refreshFocusFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void hideFocus() {
-		if (getHostFigure() instanceof WrapLabel) {
-			((WrapLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (focusFeedbackFigure != null) {
-				removeFeedback(focusFeedbackFigure);
-				focusFeedbackFigure = null;
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getFeedbackLayer() {
-		return getLayer(LayerConstants.SCALED_FEEDBACK_LAYER);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Rectangle getFeedbackBounds() {
-		Rectangle bounds;
-		if (getHostFigure() instanceof Label) {
-			bounds = ((Label) getHostFigure()).getTextBounds();
-			bounds.intersect(getHostFigure().getBounds());
-		} else {
-			bounds = getHostFigure().getBounds().getCopy();
-		}
-		getHostFigure().getParent().translateToAbsolute(bounds);
-		getFeedbackLayer().translateToRelative(bounds);
-		return bounds;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createSelectionFeedbackFigure() {
-		if (getHostFigure() instanceof Label) {
-			Label feedbackFigure = new Label();
-			feedbackFigure.setOpaque(true);
-			feedbackFigure
-					.setBackgroundColor(ColorConstants.menuBackgroundSelected);
-			feedbackFigure
-					.setForegroundColor(ColorConstants.menuForegroundSelected);
-			return feedbackFigure;
-		} else {
-			RectangleFigure feedbackFigure = new RectangleFigure();
-			feedbackFigure.setFill(false);
-			return feedbackFigure;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFocusFeedbackFigure() {
-		return new Figure() {
-
-			protected void paintFigure(Graphics graphics) {
-				graphics.drawFocus(getBounds().getResized(-1, -1));
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void updateLabel(Label target) {
-		Label source = (Label) getHostFigure();
-		target.setText(source.getText());
-		target.setTextAlignment(source.getTextAlignment());
-		target.setFont(source.getFont());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshSelectionFeedback() {
-		if (selectionFeedbackFigure != null) {
-			if (selectionFeedbackFigure instanceof Label) {
-				updateLabel((Label) selectionFeedbackFigure);
-				selectionFeedbackFigure.setBounds(getFeedbackBounds());
-			} else {
-				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5,
-						5));
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFocusFeedback() {
-		if (focusFeedbackFigure != null) {
-			focusFeedbackFigure.setBounds(getFeedbackBounds());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void refreshFeedback() {
-		refreshSelectionFeedback();
-		refreshFocusFeedback();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List createSelectionHandles() {
-		MoveHandle moveHandle = new MoveHandle((GraphicalEditPart) getHost());
-		moveHandle.setBorder(null);
-		moveHandle.setDragTracker(new DragEditPartsTrackerEx(getHost()));
-		return Collections.singletonList(moveHandle);
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLTextSelectionEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLTextSelectionEditPolicy.java
deleted file mode 100644
index 427a96a..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/policies/UMLTextSelectionEditPolicy.java
+++ /dev/null
@@ -1,216 +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.policies;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editpolicies.SelectionEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel;
-
-/**
- * @generated
- */
-public class UMLTextSelectionEditPolicy extends SelectionEditPolicy {
-
-	/**
-	 * @generated
-	 */
-	private IFigure selectionFeedbackFigure;
-
-	/**
-	 * @generated
-	 */
-	private IFigure focusFeedbackFigure;
-
-	/**
-	 * @generated
-	 */
-	protected void showPrimarySelection() {
-		if (getHostFigure() instanceof WrapLabel) {
-			((WrapLabel) getHostFigure()).setSelected(true);
-			((WrapLabel) getHostFigure()).setFocus(true);
-		} else {
-			showSelection();
-			showFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void showSelection() {
-		if (getHostFigure() instanceof WrapLabel) {
-			((WrapLabel) getHostFigure()).setSelected(true);
-			((WrapLabel) getHostFigure()).setFocus(false);
-		} else {
-			hideSelection();
-			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());
-			refreshSelectionFeedback();
-			hideFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void hideSelection() {
-		if (getHostFigure() instanceof WrapLabel) {
-			((WrapLabel) getHostFigure()).setSelected(false);
-			((WrapLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (selectionFeedbackFigure != null) {
-				removeFeedback(selectionFeedbackFigure);
-				selectionFeedbackFigure = null;
-			}
-			hideFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void showFocus() {
-		if (getHostFigure() instanceof WrapLabel) {
-			((WrapLabel) getHostFigure()).setFocus(true);
-		} else {
-			hideFocus();
-			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());
-			refreshFocusFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void hideFocus() {
-		if (getHostFigure() instanceof WrapLabel) {
-			((WrapLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (focusFeedbackFigure != null) {
-				removeFeedback(focusFeedbackFigure);
-				focusFeedbackFigure = null;
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getFeedbackLayer() {
-		return getLayer(LayerConstants.SCALED_FEEDBACK_LAYER);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Rectangle getFeedbackBounds() {
-		Rectangle bounds;
-		if (getHostFigure() instanceof Label) {
-			bounds = ((Label) getHostFigure()).getTextBounds();
-			bounds.intersect(getHostFigure().getBounds());
-		} else {
-			bounds = getHostFigure().getBounds().getCopy();
-		}
-		getHostFigure().getParent().translateToAbsolute(bounds);
-		getFeedbackLayer().translateToRelative(bounds);
-		return bounds;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createSelectionFeedbackFigure() {
-		if (getHostFigure() instanceof Label) {
-			Label feedbackFigure = new Label();
-			feedbackFigure.setOpaque(true);
-			feedbackFigure
-					.setBackgroundColor(ColorConstants.menuBackgroundSelected);
-			feedbackFigure
-					.setForegroundColor(ColorConstants.menuForegroundSelected);
-			return feedbackFigure;
-		} else {
-			RectangleFigure feedbackFigure = new RectangleFigure();
-			feedbackFigure.setFill(false);
-			return feedbackFigure;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFocusFeedbackFigure() {
-		return new Figure() {
-
-			protected void paintFigure(Graphics graphics) {
-				graphics.drawFocus(getBounds().getResized(-1, -1));
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void updateLabel(Label target) {
-		Label source = (Label) getHostFigure();
-		target.setText(source.getText());
-		target.setTextAlignment(source.getTextAlignment());
-		target.setFont(source.getFont());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshSelectionFeedback() {
-		if (selectionFeedbackFigure != null) {
-			if (selectionFeedbackFigure instanceof Label) {
-				updateLabel((Label) selectionFeedbackFigure);
-				selectionFeedbackFigure.setBounds(getFeedbackBounds());
-			} else {
-				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5,
-						5));
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFocusFeedback() {
-		if (focusFeedbackFigure != null) {
-			focusFeedbackFigure.setBounds(getFeedbackBounds());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void refreshFeedback() {
-		refreshSelectionFeedback();
-		refreshFocusFeedback();
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/expressions/UMLAbstractExpression.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/expressions/UMLAbstractExpression.java
deleted file mode 100644
index 104040b..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/expressions/UMLAbstractExpression.java
+++ /dev/null
@@ -1,244 +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.expressions;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public abstract class UMLAbstractExpression {
-	/**
-	 * @generated
-	 */
-	private static final boolean DISABLED_NO_IMPL_EXCEPTION_LOG = Boolean
-			.valueOf(
-					Platform.getDebugOption(EPFDiagramEditorPlugin
-							.getInstance().getBundle().getSymbolicName()
-							+ "/debug/disableNoExprImplExceptionLog"))
-			.booleanValue();
-
-	/**
-	 * @generated
-	 */
-	private String body;
-
-	/**
-	 * @generated
-	 */
-	private EClassifier context;
-
-	/**
-	 * @generated
-	 */
-	private IStatus status = Status.OK_STATUS;
-
-	/**
-	 * @generated
-	 */
-	protected UMLAbstractExpression(EClassifier context) {
-		this.context = context;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected UMLAbstractExpression(String body, EClassifier context, Map env) {
-		this.body = body;
-		this.context = context;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setStatus(int severity, String message, Throwable throwable) {
-		String pluginID = EPFDiagramEditorPlugin.ID;
-		this.status = new Status(severity, pluginID, -1,
-				(message != null) ? message : "", throwable); //$NON-NLS-1$
-		if (!this.status.isOK()) {
-			EPFDiagramEditorPlugin
-					.getInstance()
-					.logError(
-							"Expression problem:" + message + "body:" + body, throwable); //$NON-NLS-1$ //$NON-NLS-2$
-
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected abstract Object doEvaluate(Object context, Map env);
-
-	/**
-	 * @generated
-	 */
-	public Object evaluate(Object context) {
-		return evaluate(context, Collections.EMPTY_MAP);
-	}
-
-	/**
-	 * @generated
-	 */
-	public Object evaluate(Object context, Map env) {
-		if (context().isInstance(context)) {
-			try {
-				return doEvaluate(context, env);
-			} catch (Exception e) {
-				if (DISABLED_NO_IMPL_EXCEPTION_LOG
-						&& e instanceof NoImplException) {
-					return null;
-				}
-				EPFDiagramEditorPlugin.getInstance().logError(
-						"Expression evaluation failure: " + body, e);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IStatus getStatus() {
-		return status;
-	}
-
-	/**
-	 * @generated
-	 */
-	public String body() {
-		return body;
-	}
-
-	/**
-	 * @generated
-	 */
-	public EClassifier context() {
-		return context;
-	}
-
-	/**
-	 * @modified
-	 */
-	public void assignTo(EStructuralFeature feature, EObject target) {
-		Object value = evaluate(target);
-		//		value = (value != null) ? performCast(value, feature) : null;
-		//		if (feature.isMany()) {
-		//			Collection destCollection = (Collection) target.eGet(feature);
-		//			destCollection.clear();
-		//			if (value instanceof Collection) {
-		//				Collection valueCollection = (Collection) value;
-		//				for (Iterator it = valueCollection.iterator(); it.hasNext();) {
-		//					destCollection.add(performCast(it.next(), feature));
-		//				}
-		//			} else {
-		//				destCollection.add(value);
-		//			}
-		//			return;
-		//		}
-		//		target.eSet(feature, value);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Object performCast(Object value, ETypedElement targetType) {
-		if (targetType.getEType() == null
-				|| targetType.getEType().getInstanceClass() == null) {
-			return value;
-		}
-		Class targetClass = targetType.getEType().getInstanceClass();
-		if (value != null && value instanceof Number) {
-			Number num = (Number) value;
-			Class valClass = value.getClass();
-			Class targetWrapperClass = targetClass;
-			if (targetClass.isPrimitive()) {
-				targetWrapperClass = EcoreUtil.wrapperClassFor(targetClass);
-			}
-			if (valClass.equals(targetWrapperClass)) {
-				return value;
-			}
-			if (Number.class.isAssignableFrom(targetWrapperClass)) {
-				if (targetWrapperClass.equals(Byte.class))
-					return new Byte(num.byteValue());
-				if (targetWrapperClass.equals(Integer.class))
-					return new Integer(num.intValue());
-				if (targetWrapperClass.equals(Short.class))
-					return new Short(num.shortValue());
-				if (targetWrapperClass.equals(Long.class))
-					return new Long(num.longValue());
-				if (targetWrapperClass.equals(BigInteger.class))
-					return BigInteger.valueOf(num.longValue());
-				if (targetWrapperClass.equals(Float.class))
-					return new Float(num.floatValue());
-				if (targetWrapperClass.equals(Double.class))
-					return new Double(num.doubleValue());
-				if (targetWrapperClass.equals(BigDecimal.class))
-					return new BigDecimal(num.doubleValue());
-			}
-		}
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static final UMLAbstractExpression createNullExpression(
-			EClassifier context) {
-		return new UMLAbstractExpression(context) {
-			protected Object doEvaluate(Object context, Map env) {
-				// TODO - log entry about not provider available for this expression
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public static class NoImplException extends RuntimeException {
-		/**
-		 * @generated
-		 */
-		public NoImplException(String message) {
-			super(message);
-		}
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/DiagramEditor.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/DiagramEditor.java
deleted file mode 100644
index 8e02a95..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/DiagramEditor.java
+++ /dev/null
@@ -1,153 +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.part;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.draw2d.DelegatingLayout;
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.LayeredPane;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-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.DiagramFileEditorInputProxy;
-import org.eclipse.epf.diagram.core.part.util.DiagramEditorUtil;
-import org.eclipse.epf.diagram.core.services.DiagramHelper;
-import org.eclipse.epf.diagramming.edit.parts.UMLEditPartFactory;
-import org.eclipse.epf.library.edit.util.IDiagramManager;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @modified
- */
-public class DiagramEditor extends org.eclipse.epf.diagram.core.part.AbstractDiagramEditor {
-	/**
-	 * @generated
-	 */
-	public static final String ID = "org.eclipse.epf.diagramming.part.DiagramEditorID"; //$NON-NLS-1$
-
-
-	/**
-	 * @generated
-	 */
-	protected void configureGraphicalViewer() {
-		super.configureGraphicalViewer();
-		DiagramRootEditPart root = (DiagramRootEditPart) getDiagramGraphicalViewer()
-				.getRootEditPart();
-		LayeredPane printableLayers = (LayeredPane) root
-				.getLayer(LayerConstants.PRINTABLE_LAYERS);
-		FreeformLayer extLabelsLayer = new FreeformLayer();
-		extLabelsLayer.setLayoutManager(new DelegatingLayout());
-		printableLayers.addLayerAfter(extLabelsLayer,
-				UMLEditPartFactory.EXTERNAL_NODE_LABELS_LAYER,
-				LayerConstants.PRIMARY_LAYER);
-		LayeredPane scalableLayers = (LayeredPane) root
-				.getLayer(LayerConstants.SCALABLE_LAYERS);
-		FreeformLayer scaledFeedbackLayer = new FreeformLayer();
-		scaledFeedbackLayer.setEnabled(false);
-		scalableLayers.addLayerAfter(scaledFeedbackLayer,
-				LayerConstants.SCALED_FEEDBACK_LAYER,
-				DiagramRootEditPart.DECORATION_UNPRINTABLE_LAYER);
-	}
-
-	@Override
-	protected PreferencesHint getPreferencesHint() {
-		return new PreferencesHint(EPFDiagramEditorPlugin.ID);
-	}
-
-	
-	/**
-	 * @param event
-	 */
-	protected void handleDoubleClick(Event event) {
-		List editParts = getGraphicalViewer().getSelectedEditParts();
-
-		// do nothing if 0 or more than 1 edit parts are selected
-		//
-		if (editParts.size() != 1)
-			return;
-
-		EditPart editPart = (EditPart) editParts.get(0);
-		Node node = (Node)editPart.getModel();
-		EObject model = node.getElement();
-		DiagramFileEditorInputProxy editorInput = (DiagramFileEditorInputProxy)getEditorInput();
-		DiagramEditorInput dInput = editorInput.getDiagramEditorInput();
-
-		if(model instanceof org.eclipse.uml2.uml.Activity){
-			NodeAdapter nodeAdapter = BridgeHelper.getNodeAdapter(model);
-			Object e = null;
-			// TODO: handle Wrapper change below line after wrapper implement
-				e = nodeAdapter.getElement();
-			if(e == null){
-				e = BridgeHelper.getMethodElement((EModelElement)model);
-			}
-			if(e != null){
-				IEditorPart parent = getSite().getPage().getActiveEditor();
-				DiagramEditorInput input = new org.eclipse.epf.diagram.core.part.DiagramEditorInput(
-						e, dInput.getSuppression(), IDiagramManager.ACTIVITY_DIAGRAM);
-				DiagramEditorUtil.openDiagramEditor(getSite().getPage(), input, 
-						EPFDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT, new NullProgressMonitor());					
-
-			}
-		}
-
-	}
-	@Override
-	protected void initializeGraphicalViewer() {
-		super.initializeGraphicalViewer();
-		// Code for disabling the readonly element in the diagram.
-//		DiagramEditPart diagramPart = getDiagramEditPart();
-//		List children = diagramPart.getChildren();
-//		if(!children.isEmpty()){
-//			for (Iterator iter = children.iterator(); iter.hasNext();) {
-//				EditPart part = (EditPart) iter.next();
-//				if(part instanceof GraphicalEditPart){
-//					Node node = (Node)part.getModel();
-//					if(BridgeHelper.isInherited(node)){
-//						((GraphicalEditPart)part).disableEditMode();
-//					}
-//				}
-//			}
-//		}
-	}
-	
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/EPFDiagramEditorPlugin.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/EPFDiagramEditorPlugin.java
deleted file mode 100644
index 17bee28..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/EPFDiagramEditorPlugin.java
+++ /dev/null
@@ -1,250 +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.part;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;
-import org.osgi.framework.BundleContext;
-
-/**
- * @modified
- */
-public class EPFDiagramEditorPlugin extends AbstractPlugin {
-
-	/**
-	 * @generated
-	 */
-	public static final String ID = "org.eclipse.epf.diagramming"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(
-			ID);
-
-	/**
-	 * @generated
-	 */
-	private static EPFDiagramEditorPlugin instance;
-
-	/**
-	 * @generated
-	 */
-	private ComposedAdapterFactory adapterFactory;
-
-	/**
-	 * @generated
-	 */
-	public EPFDiagramEditorPlugin() {
-	}
-
-	/**
-	 * @generated
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		instance = this;
-		PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT,
-				getPreferenceStore());
-		adapterFactory = createAdapterFactory();
-	}
-
-	/**
-	 * @generated
-	 */
-	public void stop(BundleContext context) throws Exception {
-		adapterFactory.dispose();
-		adapterFactory = null;
-		instance = null;
-		super.stop(context);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static EPFDiagramEditorPlugin getInstance() {
-		return instance;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ComposedAdapterFactory createAdapterFactory() {
-		List factories = new ArrayList();
-		fillItemProviderFactories(factories);
-		return new ComposedAdapterFactory(factories);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void fillItemProviderFactories(List factories) {
-		factories.add(new UMLItemProviderAdapterFactory());
-		factories.add(new EcoreItemProviderAdapterFactory());
-		factories.add(new ResourceItemProviderAdapterFactory());
-		factories.add(new ReflectiveItemProviderAdapterFactory());
-	}
-
-	/**
-	 * @generated
-	 */
-	public AdapterFactory getItemProvidersAdapterFactory() {
-		return adapterFactory;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ImageDescriptor getItemImageDescriptor(Object item) {
-		IItemLabelProvider labelProvider = (IItemLabelProvider) adapterFactory
-				.adapt(item, IItemLabelProvider.class);
-		if (labelProvider != null) {
-			return ExtendedImageRegistry.getInstance().getImageDescriptor(
-					labelProvider.getImage(item));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @generated
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getBundledImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(ID, path);
-	}
-
-	/**
-	 * Respects images residing in any plug-in. If path is relative,
-	 * then this bundle is looked up for the image, otherwise, for absolute 
-	 * path, first segment is taken as id of plug-in with image
-	 *
-	 * @generated
-	 * @param path the path to image, either absolute (with plug-in id as first segment), or relative for bundled images
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor findImageDescriptor(String path) {
-		final IPath p = new Path(path);
-		if (p.isAbsolute() && p.segmentCount() > 1) {
-			return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0), p
-					.removeFirstSegments(1).makeAbsolute().toString());
-		} else {
-			return getBundledImageDescriptor(p.makeAbsolute().toString());
-		}
-	}
-
-	/**
-	 * Returns an image for the image file at the given plug-in relative path.
-	 * Client do not need to dispose this image. Images will be disposed automatically.
-	 *
-	 * @generated
-	 * @param path the path
-	 * @return image instance
-	 */
-	public Image getBundledImage(String path) {
-		Image image = getImageRegistry().get(path);
-		if (image == null) {
-			getImageRegistry().put(path, getBundledImageDescriptor(path));
-			image = getImageRegistry().get(path);
-		}
-		return image;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void logError(String error) {
-		logError(error, null);
-	}
-
-	/**
-	 * @param throwable actual error or null could be passed
-	 * @generated
-	 */
-	public void logError(String error, Throwable throwable) {
-		if (error == null && throwable != null) {
-			error = throwable.getMessage();
-		}
-		getLog().log(
-				new Status(IStatus.ERROR, EPFDiagramEditorPlugin.ID,
-						IStatus.OK, error, throwable));
-		debug(error, throwable);
-	}
-
-	/**
-	 * @generated
-	 */
-	public void logInfo(String message) {
-		logInfo(message, null);
-	}
-
-	/**
-	 * @param throwable actual error or null could be passed
-	 * @generated
-	 */
-	public void logInfo(String message, Throwable throwable) {
-		if (message == null && message != null) {
-			message = throwable.getMessage();
-		}
-		getLog().log(
-				new Status(IStatus.INFO, EPFDiagramEditorPlugin.ID, IStatus.OK,
-						message, throwable));
-		debug(message, throwable);
-	}
-
-	/**
-	 * @generated
-	 */
-	private void debug(String message, Throwable throwable) {
-		if (!isDebugging()) {
-			return;
-		}
-		if (message != null) {
-			System.err.println(message);
-		}
-		if (throwable != null) {
-			throwable.printStackTrace();
-		}
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLCreationWizard.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLCreationWizard.java
deleted file mode 100644
index e9c8d5c..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLCreationWizard.java
+++ /dev/null
@@ -1,54 +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.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.EditorCreationWizard;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * @generated
- */
-public class UMLCreationWizard extends EditorCreationWizard {
-
-	/**
-	 * @generated
-	 */
-	public void addPages() {
-		super.addPages();
-		if (page == null) {
-			page = new UMLCreationWizardPage(getWorkbench(), getSelection());
-		}
-		addPage(page);
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		super.init(workbench, selection);
-		setWindowTitle("New AD Diagram"); //$NON-NLS-1$
-		setDefaultPageImageDescriptor(EPFDiagramEditorPlugin
-				.getBundledImageDescriptor("icons/wizban/NewUMLWizard.gif")); //$NON-NLS-1$
-		setNeedsProgressMonitor(true);
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLCreationWizardPage.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLCreationWizardPage.java
deleted file mode 100644
index 1774393..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLCreationWizardPage.java
+++ /dev/null
@@ -1,85 +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.part;
-
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.EditorWizardPage;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.DiagramFileCreator;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-
-/**
- * @generated
- */
-public class UMLCreationWizardPage extends EditorWizardPage {
-
-	/**
-	 * @generated
-	 */
-	public UMLCreationWizardPage(IWorkbench workbench,
-			IStructuredSelection selection) {
-		super("CreationWizardPage", workbench, selection); //$NON-NLS-1$
-		setTitle("Create AD Diagram");
-		setDescription("Create a new AD diagram.");
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFile createAndOpenDiagram(IPath containerPath, String fileName,
-			InputStream initialContents, String kind, IWorkbenchWindow dWindow,
-			IProgressMonitor progressMonitor, boolean saveDiagram) {
-		return UMLDiagramEditorUtil.createAndOpenDiagram(
-				getDiagramFileCreator(), containerPath, fileName,
-				initialContents, kind, dWindow, progressMonitor,
-				isOpenNewlyCreatedDiagramEditor(), saveDiagram);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultFileName() {
-		return "default"; //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public DiagramFileCreator getDiagramFileCreator() {
-		return UMLDiagramFileCreator.getInstance();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDiagramKind() {
-		return ActivityEditPart.MODEL_ID;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDiagramActionBarContributor.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDiagramActionBarContributor.java
deleted file mode 100644
index 5ba4500..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDiagramActionBarContributor.java
+++ /dev/null
@@ -1,44 +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.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor;
-
-/**
- * @generated
- */
-public class UMLDiagramActionBarContributor extends DiagramActionBarContributor {
-
-	/**
-	 * @generated
-	 */
-	protected Class getEditorClass() {
-		return DiagramEditor.class;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getEditorId() {
-		return DiagramEditor.ID;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDiagramEditor.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDiagramEditor.java
deleted file mode 100644
index 927fa52..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDiagramEditor.java
+++ /dev/null
@@ -1,105 +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.part;
-
-import org.eclipse.draw2d.DelegatingLayout;
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.LayeredPane;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.editor.FileDiagramEditor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.epf.diagramming.edit.parts.UMLEditPartFactory;
-
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document.StorageDiagramDocumentProvider;
-
-/**
- * @generated
- */
-public class UMLDiagramEditor extends FileDiagramEditor implements IGotoMarker {
-
-	/**
-	 * @generated
-	 */
-	public static final String ID = "org.eclipse.epf.diagramming.part.UMLDiagramEditorID"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public UMLDiagramEditor() {
-		super(true);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getEditingDomainID() {
-		return "org.eclipse.epf.diagramming.EditingDomain"; //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected TransactionalEditingDomain createEditingDomain() {
-		TransactionalEditingDomain domain = super.createEditingDomain();
-		domain.setID(getEditingDomainID());
-		return domain;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setDocumentProvider(IEditorInput input) {
-		if (input.getAdapter(IFile.class) != null) {
-			setDocumentProvider(new UMLDocumentProvider());
-		} else {
-			setDocumentProvider(new StorageDiagramDocumentProvider());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void configureGraphicalViewer() {
-		super.configureGraphicalViewer();
-		DiagramRootEditPart root = (DiagramRootEditPart) getDiagramGraphicalViewer()
-				.getRootEditPart();
-		LayeredPane printableLayers = (LayeredPane) root
-				.getLayer(LayerConstants.PRINTABLE_LAYERS);
-		FreeformLayer extLabelsLayer = new FreeformLayer();
-		extLabelsLayer.setLayoutManager(new DelegatingLayout());
-		printableLayers.addLayerAfter(extLabelsLayer,
-				UMLEditPartFactory.EXTERNAL_NODE_LABELS_LAYER,
-				LayerConstants.PRIMARY_LAYER);
-		LayeredPane scalableLayers = (LayeredPane) root
-				.getLayer(LayerConstants.SCALABLE_LAYERS);
-		FreeformLayer scaledFeedbackLayer = new FreeformLayer();
-		scaledFeedbackLayer.setEnabled(false);
-		scalableLayers.addLayerAfter(scaledFeedbackLayer,
-				LayerConstants.SCALED_FEEDBACK_LAYER,
-				DiagramRootEditPart.DECORATION_UNPRINTABLE_LAYER);
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDiagramEditorUtil.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDiagramEditorUtil.java
deleted file mode 100644
index 7ac279d..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDiagramEditorUtil.java
+++ /dev/null
@@ -1,349 +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.part;
-
-import java.io.IOException;
-import java.io.File;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-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.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.epf.diagramming.base.commands.CreateDiagramCommand;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.util.IDEEditorUtil;
-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.diagram.ui.resources.editor.util.EditorUtil;
-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.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.uml2.uml.Activity;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @generated
- */
-public class UMLDiagramEditorUtil extends IDEEditorUtil {
-
-	/**
-	 * @generated
-	 */
-	public static final IFile createAndOpenDiagram(
-			DiagramFileCreator diagramFileCreator, IPath containerPath,
-			String fileName, InputStream initialContents, String kind,
-			IWorkbenchWindow window, IProgressMonitor progressMonitor,
-			boolean openEditor, boolean saveDiagram) {
-		IFile diagramFile = UMLDiagramEditorUtil.createNewDiagramFile(
-				diagramFileCreator, containerPath, fileName, initialContents,
-				kind, window.getShell(), progressMonitor);
-		if (diagramFile != null && openEditor) {
-			IDEEditorUtil.openDiagram(diagramFile, window, saveDiagram,
-					progressMonitor);
-		}
-		return diagramFile;
-	}
-
-	/**
-	 * <p>
-	 * This method should be called within a workspace modify operation since it creates resources.
-	 * </p>
-	 * @generated
-	 * @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) {
-		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE
-				.createEditingDomain();
-		ResourceSet resourceSet = editingDomain.getResourceSet();
-		progressMonitor.beginTask("Creating diagram and model files", 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);
-					}
-				});
-		final Resource diagramResource = resourceSet
-				.createResource(URI.createPlatformResourceURI(diagramFile
-						.getFullPath().toString()));
-		List affectedFiles = new ArrayList();
-		affectedFiles.add(diagramFile);
-
-		final String kindParam = kind;
-		AbstractTransactionalCommand command = new AbstractTransactionalCommand(
-				editingDomain, "Creating diagram and model", affectedFiles) { //$NON-NLS-1$
-			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) {
-					diagramResource.getContents().add(diagram);
-					diagram.setName(diagramFile.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();
-			}
-		};
-
-		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$
-		}
-
-		try {
-			diagramFile.setCharset(
-					"UTF-8", new SubProgressMonitor(progressMonitor, 1)); //$NON-NLS-1$
-		} catch (CoreException e) {
-			EPFDiagramEditorPlugin.getInstance().logError(
-					"Unable to set charset for diagram file", e); //$NON-NLS-1$
-		}
-
-		return diagramFile;
-	}
-
-	/**
-	 * @modified
-	 */
-	public static final IFile createAndOpenDiagram(
-			DiagramFileCreator diagramFileCreator, IPath containerPath,
-			String fileName, InputStream initialContents, String kind,
-			IWorkbenchWindow window, IProgressMonitor progressMonitor,
-			boolean openEditor, boolean saveDiagram, IEditorInput input) {
-		IFile diagramFile = UMLDiagramEditorUtil.createNewDiagramFile(
-				diagramFileCreator, containerPath, fileName, initialContents,
-				kind, window.getShell(), progressMonitor, input);
-		if (diagramFile != null && openEditor) {
-			IDEEditorUtil.openDiagram(diagramFile, window, saveDiagram,
-					progressMonitor);
-		}
-		return diagramFile;
-
-	}
-
-	/**
-	 * <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) {
-		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE
-				.createEditingDomain();
-		ResourceSet resourceSet = editingDomain.getResourceSet();
-		progressMonitor.beginTask("Creating diagram and model files", 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);
-					}
-				});
-		final Resource diagramResource = resourceSet
-				.createResource(URI.createPlatformResourceURI(diagramFile
-						.getFullPath().toString()));
-		List affectedFiles = new ArrayList();
-		affectedFiles.add(diagramFile);
-
-		//final String kindParam = kind;
-		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$
-		}
-
-		try {
-			diagramFile.setCharset(
-					"UTF-8", new SubProgressMonitor(progressMonitor, 1)); //$NON-NLS-1$
-		} catch (CoreException e) {
-			EPFDiagramEditorPlugin.getInstance().logError(
-					"Unable to set charset for diagram file", e); //$NON-NLS-1$
-		}
-
-		return diagramFile;
-	}
-
-	/**
-	 * 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();
-	}
-
-	/**
-	 * To open a diagram and create a file.
-	 * @custom
-	 */
-	public static void createAndOpenDiagram(IWorkbenchWindow dWindow,
-			IEditorInput input, Process proc) {
-		UMLDiagramEditorUtil.createAndOpenDiagram(UMLDiagramFileCreator
-				.getInstance(), getContainerPath(proc), "default", EditorUtil
-				.getInitialContents(), "EPF UML", dWindow,
-				new NullProgressMonitor(), true, true, input);
-	}
-
-	/**
-	 * @custom
-	 */
-	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;
-	}
-
-	/**
-	 * @custom
-	 * 
-	 * @param proc
-	 * @return
-	 */
-	public static IPath getContainerPath(Process proc) {
-
-		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;
-
-			Path path = new Path(diagramDir);
-			return path;
-
-			//			return workspacePath;
-		} else
-			return null;
-	}
-
-	public static void setEditorInputToDiagram(Diagram diagram,
-			IEditorInput input) {
-
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDiagramFileCreator.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDiagramFileCreator.java
deleted file mode 100644
index 1d1b82a..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDiagramFileCreator.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.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.util.IDEEditorFileCreator;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.DiagramFileCreator;
-
-/**
- * @generated
- */
-public class UMLDiagramFileCreator extends IDEEditorFileCreator {
-
-	/**
-	 * @generated
-	 */
-	private static UMLDiagramFileCreator INSTANCE = new UMLDiagramFileCreator();
-
-	/**
-	 * @generated
-	 */
-	public static DiagramFileCreator 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/part/UMLDiagramPreferenceInitializer.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDiagramPreferenceInitializer.java
deleted file mode 100644
index 4243eeb..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDiagramPreferenceInitializer.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.part;
-
-import org.eclipse.epf.diagram.core.util.DiagramCoreUtil;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * @generated
- */
-public class UMLDiagramPreferenceInitializer extends
-		DiagramPreferenceInitializer {
-
-	/**
-	 * @generated
-	 */
-	protected IPreferenceStore getPreferenceStore() {
-		return org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin
-				.getInstance().getPreferenceStore();
-	}
-	
-	/**
-	 * @modified
-	 */
-	@Override
-	public void initializeDefaultPreferences() {
-		// TODO Auto-generated method stub
-		super.initializeDefaultPreferences();
-		DiagramCoreUtil.setDefaultFontPreference(getPreferenceStore());
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDocumentProvider.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDocumentProvider.java
deleted file mode 100644
index 78535f0..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLDocumentProvider.java
+++ /dev/null
@@ -1,216 +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.part;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.MultiRule;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.DemultiplexingListener;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.epf.diagramming.base.providers.DiagramEditorDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramDocument;
-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.diagram.ui.resources.editor.ide.document.FileDiagramModificationListener;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.ui.IFileEditorInput;
-
-/**
- * @modified
- */
-public class UMLDocumentProvider extends DiagramEditorDocumentProvider {
-
-	/**
-	 * @modified
-	 */
-	protected void saveDocumentToFile(IDocument document, IFile file,
-			boolean overwrite, IProgressMonitor monitor) throws CoreException {
-		//Diagram diagram = (Diagram) document.getContent();
-		//Resource diagramResource = diagram.eResource();
-		IDiagramDocument diagramDocument = (IDiagramDocument) document;
-		TransactionalEditingDomain domain = diagramDocument.getEditingDomain();
-		List resources = domain.getResourceSet().getResources();
-
-		monitor.beginTask("Saving diagram", resources.size() + 1); //$NON-NLS-1$
-		super.saveDocumentToFile(document, file, overwrite,
-				new SubProgressMonitor(monitor, 1));
-		//		for (Iterator it = resources.iterator(); it.hasNext();) {
-		//			Resource nextResource = (Resource) it.next();
-		//			monitor.setTaskName("Saving " + nextResource.getURI()); //$NON-NLS-1$
-		//			if (nextResource != diagramResource && nextResource.isLoaded()) {
-		//				try {
-		//					nextResource.save(Collections.EMPTY_MAP);
-		//				} catch (IOException e) {
-		//					EPFDiagramEditorPlugin
-		//							.getInstance()
-		//							.logError(
-		//									"Unable to save resource: " + nextResource.getURI(), e); //$NON-NLS-1$
-		//				}
-		//			}
-		//			monitor.worked(1);
-		//		}
-		monitor.done();
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ISchedulingRule getSaveRule(Object element) {
-		IDiagramDocument diagramDocument = getDiagramDocument(element);
-		if (diagramDocument != null) {
-			Diagram diagram = diagramDocument.getDiagram();
-			if (diagram != null) {
-				Collection rules = new ArrayList();
-				for (Iterator it = diagramDocument.getEditingDomain()
-						.getResourceSet().getResources().iterator(); it
-						.hasNext();) {
-					IFile nextFile = WorkspaceSynchronizer
-							.getFile((Resource) it.next());
-					if (nextFile != null) {
-						rules.add(computeSaveSchedulingRule(nextFile));
-					}
-				}
-				return new MultiRule((ISchedulingRule[]) rules
-						.toArray(new ISchedulingRule[rules.size()]));
-			}
-		}
-		return super.getSaveRule(element);
-	}
-
-	/**
-	 * @modified
-	 */
-	protected FileInfo createFileInfo(IDocument document,
-			FileSynchronizer synchronizer, IFileEditorInput input) {
-		//    assert document instanceof DiagramDocument;
-
-		DiagramModificationListener diagramListener = new CustomModificationListener(
-				this, (DiagramDocument) document, input);
-		//		DiagramFileInfo info = new DiagramFileInfo(document, synchronizer,
-		//				diagramListener);
-		DiagramFileInfoSync info = new DiagramFileInfoSync(document,
-				synchronizer, diagramListener, input);
-
-		diagramListener.startListening();
-		return info;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ISchedulingRule computeSaveSchedulingRule(IResource toCreateOrModify) {
-		if (toCreateOrModify.exists()
-				&& toCreateOrModify.isSynchronized(IResource.DEPTH_ZERO))
-			return fResourceRuleFactory.modifyRule(toCreateOrModify);
-
-		IResource parent = toCreateOrModify;
-		do {
-			/*
-			 * XXX This is a workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=67601
-			 * IResourceRuleFactory.createRule should iterate the hierarchy itself.
-			 */
-			toCreateOrModify = parent;
-			parent = toCreateOrModify.getParent();
-		} while (parent != null && !parent.exists()
-				&& !parent.isSynchronized(IResource.DEPTH_ZERO));
-
-		return fResourceRuleFactory.createRule(toCreateOrModify);
-	}
-
-	/**
-	 * @generated
-	 */
-	private class CustomModificationListener extends
-			FileDiagramModificationListener {
-
-		/**
-		 * @generated
-		 */
-		private DemultiplexingListener myListener = null;
-
-		/**
-		 * @generated
-		 */
-		public CustomModificationListener(
-				UMLDocumentProvider documentProviderParameter,
-				DiagramDocument documentParameter,
-				IFileEditorInput inputParameter) {
-			super(documentProviderParameter, documentParameter, inputParameter);
-			final DiagramDocument document = documentParameter;
-			NotificationFilter diagramResourceModifiedFilter = NotificationFilter
-					.createEventTypeFilter(Notification.SET);
-			myListener = new DemultiplexingListener(
-					diagramResourceModifiedFilter) {
-				protected void handleNotification(
-						TransactionalEditingDomain domain,
-						Notification notification) {
-					if (notification.getNotifier() instanceof EObject) {
-						Resource modifiedResource = ((EObject) notification
-								.getNotifier()).eResource();
-						if (modifiedResource != document.getDiagram()
-								.eResource()) {
-							document.setContent(document.getContent());
-						}
-					}
-
-				}
-			};
-		}
-
-		/**
-		 * @generated
-		 */
-		public void startListening() {
-			super.startListening();
-			getEditingDomain().addResourceSetListener(myListener);
-		}
-
-		/**
-		 * @generated
-		 */
-		public void stopListening() {
-			getEditingDomain().removeResourceSetListener(myListener);
-			super.stopListening();
-		}
-
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLInitDiagramFileAction.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLInitDiagramFileAction.java
deleted file mode 100644
index d128fd9..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLInitDiagramFileAction.java
+++ /dev/null
@@ -1,148 +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.part;
-
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-
-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
-
-import org.eclipse.jface.action.IAction;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @generated
- */
-public class UMLInitDiagramFileAction implements IObjectActionDelegate {
-
-	/**
-	 * @generated
-	 */
-	private IWorkbenchPart myPart;
-
-	/**
-	 * @generated
-	 */
-	private IFile mySelectedModelFile;
-
-	/**
-	 * @generated
-	 */
-	private IStructuredSelection mySelection;
-
-	/**
-	 * @generated
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		myPart = targetPart;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		mySelectedModelFile = null;
-		mySelection = StructuredSelection.EMPTY;
-		action.setEnabled(false);
-		if (selection instanceof IStructuredSelection == false
-				|| selection.isEmpty()) {
-			return;
-		}
-		mySelection = (IStructuredSelection) selection;
-		mySelectedModelFile = (IFile) ((IStructuredSelection) selection)
-				.getFirstElement();
-		action.setEnabled(true);
-	}
-
-	/**
-	 * @generated
-	 */
-	public void run(IAction action) {
-		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE
-				.createEditingDomain();
-		ResourceSet resourceSet = new ResourceSetImpl();
-		EObject diagramRoot = null;
-		try {
-			Resource resource = resourceSet.getResource(URI
-					.createPlatformResourceURI(mySelectedModelFile
-							.getFullPath().toString()), true);
-			diagramRoot = (EObject) resource.getContents().get(0);
-		} catch (WrappedException ex) {
-			EPFDiagramEditorPlugin
-					.getInstance()
-					.logError(
-							"Unable to load resource: " + mySelectedModelFile.getFullPath().toString(), ex); //$NON-NLS-1$
-		}
-		if (diagramRoot == null) {
-			MessageDialog.openError(myPart.getSite().getShell(), "Error",
-					"Model file loading failed");
-			return;
-		}
-		Wizard wizard = new UMLNewDiagramFileWizard(mySelectedModelFile, myPart
-				.getSite().getPage(), mySelection, diagramRoot, editingDomain);
-		IDialogSettings pluginDialogSettings = EPFDiagramEditorPlugin
-				.getInstance().getDialogSettings();
-		IDialogSettings initDiagramFileSettings = pluginDialogSettings
-				.getSection("InisDiagramFile"); //$NON-NLS-1$
-		if (initDiagramFileSettings == null) {
-			initDiagramFileSettings = pluginDialogSettings
-					.addNewSection("InisDiagramFile"); //$NON-NLS-1$
-		}
-		wizard.setDialogSettings(initDiagramFileSettings);
-		wizard.setForcePreviousAndNextButtons(false);
-		wizard.setWindowTitle("Initialize new " + ActivityEditPart.MODEL_ID
-				+ " diagram file");
-
-		WizardDialog dialog = new WizardDialog(myPart.getSite().getShell(),
-				wizard);
-		dialog.create();
-		dialog.getShell().setSize(Math.max(500, dialog.getShell().getSize().x),
-				500);
-		dialog.open();
-	}
-
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLLoadResourceAction.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLLoadResourceAction.java
deleted file mode 100644
index e8c486b..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLLoadResourceAction.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
-//------------------------------------------------------------------------------
-/*
- * 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.part;
-
-import org.eclipse.emf.edit.ui.action.LoadResourceAction.LoadResourceDialog;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-
-/**
- * @generated
- */
-public class UMLLoadResourceAction implements IObjectActionDelegate {
-
-	/**
-	 * @generated
-	 */
-	private ActivityEditPart mySelectedElement;
-
-	/**
-	 * @generated
-	 */
-	private Shell myShell;
-
-	/**
-	 * @generated
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		myShell = targetPart.getSite().getShell();
-	}
-
-	/**
-	 * @generated
-	 */
-	public void run(IAction action) {
-		LoadResourceDialog loadResourceDialog = new LoadResourceDialog(myShell,
-				mySelectedElement.getEditingDomain());
-		loadResourceDialog.open();
-	}
-
-	/**
-	 * @generated
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		mySelectedElement = null;
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-			if (structuredSelection.size() == 1
-					&& structuredSelection.getFirstElement() instanceof ActivityEditPart) {
-				mySelectedElement = (ActivityEditPart) structuredSelection
-						.getFirstElement();
-			}
-		}
-		action.setEnabled(isEnabled());
-	}
-
-	/**
-	 * @generated
-	 */
-	private boolean isEnabled() {
-		return mySelectedElement != null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLMatchingStrategy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLMatchingStrategy.java
deleted file mode 100644
index c5e476c..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLMatchingStrategy.java
+++ /dev/null
@@ -1,101 +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.part;
-
-import org.eclipse.epf.diagramming.base.parts.DiagramFileEditorInput;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DocumentProviderRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.MEditingDomainElement;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DocumentProviderRegistry.IDocumentProviderSelector;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditorMatchingStrategy;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.PartInitException;
-
-/**
- * @generated
- */
-public class UMLMatchingStrategy extends DiagramDocumentEditorMatchingStrategy {
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditorMatchingStrategy#matches(org.eclipse.ui.IEditorReference, org.eclipse.ui.IEditorInput)
-	 * @custom
-	 */
-	public boolean matches(IEditorReference editorRef, IEditorInput input) {
-		// TODO Auto-generated method stub
-		//return super.matches(editorRef, input);
-		IEditorInput existingEditorInput;
-		IEditorPart editor = editorRef.getEditor(false);
-
-		try {
-			existingEditorInput = editorRef.getEditorInput();
-		} catch (PartInitException e) {
-			return false;
-		}
-
-		// If the ExistingEditorInput is same as the passed input,
-		// return true
-		if (existingEditorInput.equals(input))
-			return true;
-		else if (!(input instanceof MEditingDomainElement)
-				&& (editor instanceof DiagramDocumentEditor)) {
-			// If the input isn't an instanceof MEditingDomainElement, and the editor is instanceof DiagramDocumentEditor
-			// then don't match it, This indicates that the client shouldn't use this strategy for non-DiagramDocumentEditor.
-			IDiagramDocumentProvider docProvider = (IDiagramDocumentProvider) DocumentProviderRegistry
-					.getDefault().getDocumentProvider(input,
-							new IDocumentProviderSelector() {
-
-								public boolean select(String documentType) {
-									// Only checking of the interface name
-									return documentType
-											.equals(IDiagramDocument.class
-													.getName());
-								}
-							});
-
-			if (input instanceof DiagramFileEditorInput) {
-				MethodElement e = ((DiagramFileEditorInput) input)
-						.getDiagramEditorInput().getMethodElement();
-				//MethodElement exisitngE =((DiagramFileEditorInput)existingEditorInput).getDiagramEditorInput().getMethodElement();
-				MethodElement existingE = ((DiagramFileEditorInput) existingEditorInput
-						.getPersistable()).getDiagramEditorInput()
-						.getMethodElement();
-				if (e != existingE)
-					return false;
-			}
-
-			if (docProvider != null) {
-				IEditorInput editorInput = docProvider
-						.createInputWithEditingDomain(input,
-								((DiagramDocumentEditor) editor)
-										.getEditingDomain());
-				return editorInput.equals(existingEditorInput);
-			}
-		}
-		return false;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLNewDiagramFileWizard.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLNewDiagramFileWizard.java
deleted file mode 100644
index 37aed56..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLNewDiagramFileWizard.java
+++ /dev/null
@@ -1,349 +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.part;
-
-import java.io.IOException;
-
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-
-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.ecore.util.FeatureMap;
-
-import org.eclipse.emf.edit.provider.IWrapperItemProvider;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;
-
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-
-import org.eclipse.swt.SWT;
-
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-import org.eclipse.ui.ide.IDE;
-
-/**
- * @generated
- */
-public class UMLNewDiagramFileWizard extends Wizard {
-
-	/**
-	 * @generated
-	 */
-	private TransactionalEditingDomain myEditingDomain;
-
-	/**
-	 * @generated
-	 */
-	private WizardNewFileCreationPage myFileCreationPage;
-
-	/**
-	 * @generated
-	 */
-	private IFile mySelectedModelFile;
-
-	/**
-	 * @generated
-	 */
-	private IWorkbenchPage myWorkbenchPage;
-
-	/**
-	 * @generated
-	 */
-	private IStructuredSelection mySelection;
-
-	/**
-	 * @generated
-	 */
-	private EObject myDiagramRoot;
-
-	/**
-	 * @modified
-	 */
-	public UMLNewDiagramFileWizard(IFile selectedModelFile,
-			IWorkbenchPage workbenchPage, IStructuredSelection selection,
-			EObject diagramRoot, TransactionalEditingDomain editingDomain) {
-		//    assert selectedModelFile != null : "Null selectedModelFile in UMLNewDiagramFileWizard constructor"; //$NON-NLS-1$
-		//    assert workbenchPage != null : "Null workbenchPage in UMLNewDiagramFileWizard constructor"; //$NON-NLS-1$
-		//    assert selection != null : "Null selection in UMLNewDiagramFileWizard constructor"; //$NON-NLS-1$
-		//      assert diagramRoot != null : "Null diagramRoot in UMLNewDiagramFileWizard constructor"; //$NON-NLS-1$
-		//      assert editingDomain != null : "Null editingDomain in UMLNewDiagramFileWizard constructor"; //$NON-NLS-1$
-
-		mySelectedModelFile = selectedModelFile;
-		myWorkbenchPage = workbenchPage;
-		mySelection = selection;
-		myDiagramRoot = diagramRoot;
-		myEditingDomain = editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void addPages() {
-		myFileCreationPage = new WizardNewFileCreationPage(
-				"Initialize new Ecore diagram file", mySelection) {
-
-			public void createControl(Composite parent) {
-				super.createControl(parent);
-
-				IContainer parentContainer = mySelectedModelFile.getParent();
-				String originalFileName = mySelectedModelFile
-						.getProjectRelativePath().removeFileExtension()
-						.lastSegment();
-				String fileExtension = ".xmi"; //$NON-NLS-1$
-				String fileName = originalFileName + fileExtension;
-				for (int i = 1; parentContainer.getFile(new Path(fileName))
-						.exists(); i++) {
-					fileName = originalFileName + i + fileExtension;
-				}
-				setFileName(fileName);
-			}
-
-		};
-		myFileCreationPage.setTitle("Diagram file");
-		myFileCreationPage.setDescription("Create new diagram based on "
-				+ ActivityEditPart.MODEL_ID + " model content");
-		addPage(myFileCreationPage);
-		addPage(new RootElementSelectorPage());
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean performFinish() {
-		IFile diagramFile = myFileCreationPage.createNewFile();
-		try {
-			diagramFile.setCharset("UTF-8", new NullProgressMonitor()); //$NON-NLS-1$
-		} catch (CoreException e) {
-			EPFDiagramEditorPlugin.getInstance().logError(
-					"Unable to set charset for diagram file", e); //$NON-NLS-1$
-		}
-
-		ResourceSet resourceSet = myEditingDomain.getResourceSet();
-		final Resource diagramResource = resourceSet
-				.createResource(URI.createPlatformResourceURI(diagramFile
-						.getFullPath().toString()));
-
-		List affectedFiles = new LinkedList();
-		affectedFiles.add(mySelectedModelFile);
-		affectedFiles.add(diagramFile);
-
-		AbstractTransactionalCommand command = new AbstractTransactionalCommand(
-				myEditingDomain, "Initializing diagram contents", affectedFiles) { //$NON-NLS-1$
-			protected CommandResult doExecuteWithResult(
-					IProgressMonitor monitor, IAdaptable info)
-					throws ExecutionException {
-				int diagramVID = UMLVisualIDRegistry
-						.getDiagramVisualID(myDiagramRoot);
-				if (diagramVID != ActivityEditPart.VISUAL_ID) {
-					return CommandResult
-							.newErrorCommandResult("Incorrect model object stored as a root resource object"); //$NON-NLS-1$
-				}
-				Diagram diagram = ViewService.createDiagram(myDiagramRoot,
-						ActivityEditPart.MODEL_ID,
-						EPFDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
-				diagramResource.getContents().add(diagram);
-				diagramResource.getContents().add(diagram.getElement());
-				return CommandResult.newOKCommandResult();
-			}
-		};
-
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(command,
-					new NullProgressMonitor(), null);
-			diagramResource.save(Collections.EMPTY_MAP);
-			IDE.openEditor(myWorkbenchPage, diagramFile);
-		} catch (ExecutionException e) {
-			EPFDiagramEditorPlugin.getInstance().logError(
-					"Unable to create model and diagram", e); //$NON-NLS-1$
-		} catch (IOException ex) {
-			EPFDiagramEditorPlugin
-					.getInstance()
-					.logError(
-							"Save operation failed for: " + diagramFile.getFullPath().toString(), ex); //$NON-NLS-1$
-		} catch (PartInitException ex) {
-			EPFDiagramEditorPlugin.getInstance().logError(
-					"Unable to open editor", ex); //$NON-NLS-1$
-		}
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	private class RootElementSelectorPage extends WizardPage implements
-			ISelectionChangedListener {
-
-		/**
-		 * @generated
-		 */
-		protected RootElementSelectorPage() {
-			super("Select diagram root element");
-			setTitle("Diagram root element");
-			setDescription("Select semantic model element to be depicted on diagram");
-		}
-
-		/**
-		 * @generated
-		 */
-		public void createControl(Composite parent) {
-			initializeDialogUnits(parent);
-			Composite topLevel = new Composite(parent, SWT.NONE);
-			topLevel.setLayout(new GridLayout());
-			topLevel.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL
-					| GridData.HORIZONTAL_ALIGN_FILL));
-			topLevel.setFont(parent.getFont());
-			setControl(topLevel);
-			createModelBrowser(topLevel);
-			setPageComplete(validatePage());
-		}
-
-		/**
-		 * @generated
-		 */
-		private void createModelBrowser(Composite parent) {
-			Composite panel = new Composite(parent, SWT.NONE);
-			panel.setLayoutData(new GridData(GridData.FILL_BOTH));
-			GridLayout layout = new GridLayout();
-			layout.marginWidth = 0;
-			panel.setLayout(layout);
-
-			Label label = new Label(panel, SWT.NONE);
-			label.setText("Select diagram root element:");
-			label.setLayoutData(new GridData(
-					GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-			TreeViewer treeViewer = new TreeViewer(panel, SWT.SINGLE
-					| SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-			GridData layoutData = new GridData(GridData.FILL_BOTH);
-			layoutData.heightHint = 300;
-			layoutData.widthHint = 300;
-			treeViewer.getTree().setLayoutData(layoutData);
-			treeViewer.setContentProvider(new AdapterFactoryContentProvider(
-					EPFDiagramEditorPlugin.getInstance()
-							.getItemProvidersAdapterFactory()));
-			treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(
-					EPFDiagramEditorPlugin.getInstance()
-							.getItemProvidersAdapterFactory()));
-			treeViewer.setInput(myDiagramRoot.eResource());
-			treeViewer.setSelection(new StructuredSelection(myDiagramRoot));
-			treeViewer.addSelectionChangedListener(this);
-		}
-
-		/**
-		 * @generated
-		 */
-		public void selectionChanged(SelectionChangedEvent event) {
-			myDiagramRoot = null;
-			if (event.getSelection() instanceof IStructuredSelection) {
-				IStructuredSelection selection = (IStructuredSelection) event
-						.getSelection();
-				if (selection.size() == 1) {
-					Object selectedElement = selection.getFirstElement();
-					if (selectedElement instanceof IWrapperItemProvider) {
-						selectedElement = ((IWrapperItemProvider) selectedElement)
-								.getValue();
-					}
-					if (selectedElement instanceof FeatureMap.Entry) {
-						selectedElement = ((FeatureMap.Entry) selectedElement)
-								.getValue();
-					}
-					if (selectedElement instanceof EObject) {
-						myDiagramRoot = (EObject) selectedElement;
-					}
-				}
-			}
-			setPageComplete(validatePage());
-		}
-
-		/**
-		 * @generated
-		 */
-		private boolean validatePage() {
-			if (myDiagramRoot == null) {
-				setErrorMessage("No diagram root element selected");
-				return false;
-			}
-			boolean result = ViewService.getInstance().provides(
-					new CreateDiagramViewOperation(new EObjectAdapter(
-							myDiagramRoot), ActivityEditPart.MODEL_ID,
-							EPFDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT));
-			setErrorMessage(result ? null
-					: "Invalid diagram root element was selected");
-			return result;
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLPaletteFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLPaletteFactory.java
deleted file mode 100644
index 9644d5a..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLPaletteFactory.java
+++ /dev/null
@@ -1,412 +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.part;
-
-import java.util.List;
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.jface.resource.ImageDescriptor;
-import java.util.ArrayList;
-
-import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-
-import org.eclipse.gef.palette.PaletteDrawer;
-
-import org.eclipse.gef.palette.PaletteSeparator;
-
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeConnectionTool;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;
-
-/**
- * @generated
- */
-public class UMLPaletteFactory {
-
-	/**
-	 * @generated
-	 */
-	public void fillPalette(PaletteRoot paletteRoot) {
-		paletteRoot.add(createFlows1Group());
-		paletteRoot.add(createNodes2Group());
-	}
-
-	/**
-	 * @generated
-	 */
-	private PaletteContainer createFlows1Group() {
-		PaletteContainer paletteContainer = new PaletteDrawer("Flows");
-		paletteContainer.setDescription("Creation tool for flows");
-		paletteContainer.add(createLink1CreationTool());
-		return paletteContainer;
-	}
-
-	/**
-	 * @generated
-	 */
-	private PaletteContainer createNodes2Group() {
-		PaletteContainer paletteContainer = new PaletteDrawer("Nodes");
-		paletteContainer.setDescription("Creation tool group for nodes");
-		paletteContainer.add(createActivityPartition1CreationTool());
-		paletteContainer.add(createStartNode2CreationTool());
-		paletteContainer.add(createForkNode3CreationTool());
-		paletteContainer.add(createMergeNode4CreationTool());
-		paletteContainer.add(createDecisionNode5CreationTool());
-		paletteContainer.add(createEndNode6CreationTool());
-		paletteContainer.add(createJoinNode7CreationTool());
-		paletteContainer.add(new PaletteSeparator());
-		paletteContainer.add(createActivity9CreationTool());
-		paletteContainer.add(createPhase10CreationTool());
-		paletteContainer.add(createIteration11CreationTool());
-		paletteContainer.add(createTaskDescriptor12CreationTool());
-		paletteContainer.add(createMilestone13CreationTool());
-		return paletteContainer;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ToolEntry createActivityPartition1CreationTool() {
-		ImageDescriptor smallImage;
-		ImageDescriptor largeImage;
-
-		smallImage = EPFDiagramEditorPlugin
-				.findImageDescriptor("/org.eclipse.epf.diagramming/icons/full/obj16/ActivityPartition.gif");
-
-		largeImage = smallImage;
-
-		final List elementTypes = new ArrayList();
-		elementTypes.add(UMLElementTypes.ActivityPartition_1008);
-		elementTypes.add(UMLElementTypes.ActivityPartition_2001);
-		ToolEntry result = new NodeToolEntry("Activity Partition",
-				"Create new Activity Partition", smallImage, largeImage,
-				elementTypes);
-
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ToolEntry createStartNode2CreationTool() {
-		ImageDescriptor smallImage;
-		ImageDescriptor largeImage;
-
-		smallImage = EPFDiagramEditorPlugin
-				.findImageDescriptor("/org.eclipse.epf.diagramming/icons/full/obj16/InitialNode.gif");
-
-		largeImage = smallImage;
-
-		final List elementTypes = new ArrayList();
-		elementTypes.add(UMLElementTypes.InitialNode_1004);
-		ToolEntry result = new NodeToolEntry("Start Node",
-				"Create new Start Node", smallImage, largeImage, elementTypes);
-
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ToolEntry createForkNode3CreationTool() {
-		ImageDescriptor smallImage;
-		ImageDescriptor largeImage;
-
-		smallImage = EPFDiagramEditorPlugin
-				.findImageDescriptor("/org.eclipse.epf.diagramming/icons/full/obj16/ForkNode.gif");
-
-		largeImage = smallImage;
-
-		final List elementTypes = new ArrayList();
-		elementTypes.add(UMLElementTypes.ForkNode_1003);
-		ToolEntry result = new NodeToolEntry("Fork Node",
-				"Create new Fork Node", smallImage, largeImage, elementTypes);
-
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ToolEntry createMergeNode4CreationTool() {
-		ImageDescriptor smallImage;
-		ImageDescriptor largeImage;
-
-		smallImage = EPFDiagramEditorPlugin
-				.findImageDescriptor("/org.eclipse.epf.diagramming/icons/full/obj16/MergeNode.gif");
-
-		largeImage = smallImage;
-
-		final List elementTypes = new ArrayList();
-		elementTypes.add(UMLElementTypes.MergeNode_1002);
-		ToolEntry result = new NodeToolEntry("Merge Node",
-				"Create new Merge Node", smallImage, largeImage, elementTypes);
-
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ToolEntry createDecisionNode5CreationTool() {
-		ImageDescriptor smallImage;
-		ImageDescriptor largeImage;
-
-		smallImage = EPFDiagramEditorPlugin
-				.findImageDescriptor("/org.eclipse.epf.diagramming/icons/full/obj16/DecisionNode.gif");
-
-		largeImage = smallImage;
-
-		final List elementTypes = new ArrayList();
-		elementTypes.add(UMLElementTypes.DecisionNode_1005);
-		ToolEntry result = new NodeToolEntry("Decision Node",
-				"Create new Decision Node", smallImage, largeImage,
-				elementTypes);
-
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ToolEntry createEndNode6CreationTool() {
-		ImageDescriptor smallImage;
-		ImageDescriptor largeImage;
-
-		smallImage = EPFDiagramEditorPlugin
-				.findImageDescriptor("/org.eclipse.epf.diagramming/icons/full/obj16/ActivityFinalNode.gif");
-
-		largeImage = smallImage;
-
-		final List elementTypes = new ArrayList();
-		elementTypes.add(UMLElementTypes.ActivityFinalNode_1001);
-		ToolEntry result = new NodeToolEntry("End Node", "Create new End Node",
-				smallImage, largeImage, elementTypes);
-
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ToolEntry createJoinNode7CreationTool() {
-		ImageDescriptor smallImage;
-		ImageDescriptor largeImage;
-
-		smallImage = EPFDiagramEditorPlugin
-				.findImageDescriptor("/org.eclipse.epf.diagramming/icons/full/obj16/JoinNode.gif");
-
-		largeImage = smallImage;
-
-		final List elementTypes = new ArrayList();
-		elementTypes.add(UMLElementTypes.JoinNode_1006);
-		ToolEntry result = new NodeToolEntry("Join Node",
-				"Create new Join Node", smallImage, largeImage, elementTypes);
-
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ToolEntry createActivity9CreationTool() {
-		ImageDescriptor smallImage;
-		ImageDescriptor largeImage;
-
-		smallImage = EPFDiagramEditorPlugin
-				.findImageDescriptor("/org.eclipse.epf.diagramming/icons/full/obj16/Activity.gif");
-
-		largeImage = smallImage;
-
-		final List elementTypes = new ArrayList();
-		elementTypes.add(UMLElementTypes.StructuredActivityNode_1007);
-		ToolEntry result = new NodeToolEntry("Activity", "Create new Activity",
-				smallImage, largeImage, elementTypes);
-
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ToolEntry createPhase10CreationTool() {
-		ImageDescriptor smallImage;
-		ImageDescriptor largeImage;
-
-		smallImage = EPFDiagramEditorPlugin
-				.findImageDescriptor("/org.eclipse.epf.diagramming/icons/full/obj16/Phase.gif");
-
-		largeImage = smallImage;
-
-		final List elementTypes = new ArrayList();
-		elementTypes.add(UMLElementTypes.StructuredActivityNode_1010);
-		ToolEntry result = new NodeToolEntry("Phase", "Create new Phase",
-				smallImage, largeImage, elementTypes);
-
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ToolEntry createIteration11CreationTool() {
-		ImageDescriptor smallImage;
-		ImageDescriptor largeImage;
-
-		smallImage = EPFDiagramEditorPlugin
-				.findImageDescriptor("/org.eclipse.epf.diagramming/icons/full/obj16/Iteration.gif");
-
-		largeImage = smallImage;
-
-		final List elementTypes = new ArrayList();
-		elementTypes.add(UMLElementTypes.StructuredActivityNode_1011);
-		ToolEntry result = new NodeToolEntry("Iteration",
-				"Create new Iteration", smallImage, largeImage, elementTypes);
-
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ToolEntry createTaskDescriptor12CreationTool() {
-		ImageDescriptor smallImage;
-		ImageDescriptor largeImage;
-
-		smallImage = EPFDiagramEditorPlugin
-				.findImageDescriptor("/org.eclipse.epf.diagramming/icons/full/obj16/TaskDescriptor.gif");
-
-		largeImage = smallImage;
-
-		final List elementTypes = new ArrayList();
-		elementTypes.add(UMLElementTypes.ActivityParameterNode_1009);
-		ToolEntry result = new NodeToolEntry("Task Descriptor",
-				"Create new Task Descriptor", smallImage, largeImage,
-				elementTypes);
-
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ToolEntry createMilestone13CreationTool() {
-		ImageDescriptor smallImage;
-		ImageDescriptor largeImage;
-
-		smallImage = EPFDiagramEditorPlugin
-				.findImageDescriptor("/org.eclipse.epf.diagramming/icons/full/obj16/Milestone.gif");
-
-		largeImage = smallImage;
-
-		final List elementTypes = new ArrayList();
-		elementTypes.add(UMLElementTypes.ActivityParameterNode_1012);
-		ToolEntry result = new NodeToolEntry("Milestone",
-				"Create new Milestone", smallImage, largeImage, elementTypes);
-
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ToolEntry createLink1CreationTool() {
-		ImageDescriptor smallImage;
-		ImageDescriptor largeImage;
-
-		smallImage = EPFDiagramEditorPlugin
-				.findImageDescriptor("/org.eclipse.epf.diagramming/icons/full/obj16/ControlFlow.gif");
-
-		largeImage = smallImage;
-
-		final List relationshipTypes = new ArrayList();
-		relationshipTypes.add(UMLElementTypes.ControlFlow_3001);
-		ToolEntry result = new LinkToolEntry("Link", "Create new Link",
-				smallImage, largeImage, relationshipTypes);
-
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class NodeToolEntry extends ToolEntry {
-
-		/**
-		 * @generated
-		 */
-		private final List elementTypes;
-
-		/**
-		 * @generated
-		 */
-		private NodeToolEntry(String title, String description,
-				ImageDescriptor smallIcon, ImageDescriptor largeIcon,
-				List elementTypes) {
-			super(title, description, smallIcon, largeIcon);
-			this.elementTypes = elementTypes;
-		}
-
-		/**
-		 * @modified
-		 */
-		public Tool createTool() {
-			Tool tool = new UnspecifiedTypeCreationTool(elementTypes);
-			tool.setProperties(getToolProperties());
-			BridgeHelper.elementTypes.add(elementTypes
-					.get(elementTypes.size() - 1));
-			return tool;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class LinkToolEntry extends ToolEntry {
-
-		/**
-		 * @generated
-		 */
-		private final List relationshipTypes;
-
-		/**
-		 * @generated
-		 */
-		private LinkToolEntry(String title, String description,
-				ImageDescriptor smallIcon, ImageDescriptor largeIcon,
-				List relationshipTypes) {
-			super(title, description, smallIcon, largeIcon);
-			this.relationshipTypes = relationshipTypes;
-		}
-
-		/**
-		 * @generated
-		 */
-		public Tool createTool() {
-			Tool tool = new UnspecifiedTypeConnectionTool(relationshipTypes);
-			tool.setProperties(getToolProperties());
-			return tool;
-		}
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLVisualIDRegistry.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLVisualIDRegistry.java
deleted file mode 100644
index 549abb4..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/part/UMLVisualIDRegistry.java
+++ /dev/null
@@ -1,1000 +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.part;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityFinalNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityFinalNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityParameterNode2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityParameterNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityParameterNodeName2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityParameterNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartition2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionName2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionPartitionCampartment2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionPartitionCampartmentEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ControlFlowEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ControlFlowNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.DecisionNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.DecisionNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ForkNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ForkNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.InitialNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.InitialNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.JoinNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.JoinNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.MergeNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.MergeNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNode2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNode3EditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeName2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeName3EditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeNameEditPart;
-import org.eclipse.epf.diagramming.expressions.UMLAbstractExpression;
-
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.uml2.uml.Activity;
-import org.eclipse.uml2.uml.ActivityFinalNode;
-import org.eclipse.uml2.uml.ActivityParameterNode;
-import org.eclipse.uml2.uml.ActivityPartition;
-import org.eclipse.uml2.uml.ControlFlow;
-import org.eclipse.uml2.uml.DecisionNode;
-import org.eclipse.uml2.uml.ForkNode;
-import org.eclipse.uml2.uml.InitialNode;
-import org.eclipse.uml2.uml.JoinNode;
-import org.eclipse.uml2.uml.MergeNode;
-import org.eclipse.uml2.uml.ObjectNode;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * This registry is used to determine which type of visual object should be
- * created for the corresponding Diagram, Node, ChildNode or Link represented 
- * by a domain model object.
- *
- * @generated
- */
-public class UMLVisualIDRegistry {
-
-	/**
-	 * @generated
-	 */
-	private static final String DEBUG_KEY = EPFDiagramEditorPlugin
-			.getInstance().getBundle().getSymbolicName()
-			+ "/debug/visualID"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static int getVisualID(View view) {
-		if (view instanceof Diagram) {
-			if (ActivityEditPart.MODEL_ID.equals(view.getType())) {
-				return ActivityEditPart.VISUAL_ID;
-			} else {
-				return -1;
-			}
-		}
-		return getVisualID(view.getType());
-	}
-
-	/**
-	 * @generated
-	 */
-	public static String getModelID(View view) {
-		View diagram = view.getDiagram();
-		while (view != diagram) {
-			EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-			if (annotation != null) {
-				return (String) annotation.getDetails().get("modelID"); //$NON-NLS-1$
-			}
-			view = (View) view.eContainer();
-		}
-		return diagram != null ? diagram.getType() : null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static int getVisualID(String type) {
-		try {
-			return Integer.parseInt(type);
-		} catch (NumberFormatException e) {
-			if (Boolean.TRUE.toString().equalsIgnoreCase(
-					Platform.getDebugOption(DEBUG_KEY))) {
-				EPFDiagramEditorPlugin.getInstance().logError(
-						"Unable to parse view type as a visualID number: "
-								+ type);
-			}
-		}
-		return -1;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static String getType(int visualID) {
-		return String.valueOf(visualID);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static int getDiagramVisualID(EObject domainElement) {
-		if (domainElement == null) {
-			return -1;
-		}
-		EClass domainElementMetaclass = domainElement.eClass();
-		return getDiagramVisualID(domainElement, domainElementMetaclass);
-	}
-
-	/**
-	 * @generated
-	 */
-	private static int getDiagramVisualID(EObject domainElement,
-			EClass domainElementMetaclass) {
-		if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(
-				domainElementMetaclass)
-				&& isDiagramActivity_79((Activity) domainElement)) {
-			return ActivityEditPart.VISUAL_ID;
-		}
-		return getUnrecognizedDiagramID(domainElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static int getNodeVisualID(View containerView, EObject domainElement) {
-		if (domainElement == null) {
-			return -1;
-		}
-		EClass domainElementMetaclass = domainElement.eClass();
-		return getNodeVisualID(containerView, domainElement,
-				domainElementMetaclass, null);
-	}
-
-	/**
-	 * @modified
-	 */
-	public static int getNodeVisualID(View containerView,
-			EObject domainElement, EClass domainElementMetaclass,
-			String semanticHint) {
-		String containerModelID = getModelID(containerView);
-		if (!ActivityEditPart.MODEL_ID.equals(containerModelID)) {
-			return -1;
-		}
-		int containerVisualID;
-		if (ActivityEditPart.MODEL_ID.equals(containerModelID)) {
-			containerVisualID = getVisualID(containerView);
-		} else {
-			if (containerView instanceof Diagram) {
-				containerVisualID = ActivityEditPart.VISUAL_ID;
-			} else {
-				return -1;
-			}
-		}
-		int nodeVisualID = semanticHint != null ? getVisualID(semanticHint)
-				: -1;
-		switch (containerVisualID) {
-		case ActivityFinalNodeEditPart.VISUAL_ID:
-			if (ActivityFinalNodeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return ActivityFinalNodeNameEditPart.VISUAL_ID;
-			}
-			return getUnrecognizedActivityFinalNode_1001ChildNodeID(
-					domainElement, semanticHint);
-		case MergeNodeEditPart.VISUAL_ID:
-			if (MergeNodeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return MergeNodeNameEditPart.VISUAL_ID;
-			}
-			return getUnrecognizedMergeNode_1002ChildNodeID(domainElement,
-					semanticHint);
-		case ForkNodeEditPart.VISUAL_ID:
-			if (ForkNodeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return ForkNodeNameEditPart.VISUAL_ID;
-			}
-			return getUnrecognizedForkNode_1003ChildNodeID(domainElement,
-					semanticHint);
-		case InitialNodeEditPart.VISUAL_ID:
-			if (InitialNodeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return InitialNodeNameEditPart.VISUAL_ID;
-			}
-			return getUnrecognizedInitialNode_1004ChildNodeID(domainElement,
-					semanticHint);
-		case DecisionNodeEditPart.VISUAL_ID:
-			if (DecisionNodeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return DecisionNodeNameEditPart.VISUAL_ID;
-			}
-			return getUnrecognizedDecisionNode_1005ChildNodeID(domainElement,
-					semanticHint);
-		case JoinNodeEditPart.VISUAL_ID:
-			if (JoinNodeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return JoinNodeNameEditPart.VISUAL_ID;
-			}
-			return getUnrecognizedJoinNode_1006ChildNodeID(domainElement,
-					semanticHint);
-		case StructuredActivityNodeEditPart.VISUAL_ID:
-			if (StructuredActivityNodeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return StructuredActivityNodeNameEditPart.VISUAL_ID;
-			}
-			return getUnrecognizedStructuredActivityNode_1007ChildNodeID(
-					domainElement, semanticHint);
-		case ActivityPartitionEditPart.VISUAL_ID:
-			if (ActivityPartitionName2EditPart.VISUAL_ID == nodeVisualID) {
-				return ActivityPartitionName2EditPart.VISUAL_ID;
-			}
-			if (ActivityPartitionPartitionCampartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return ActivityPartitionPartitionCampartmentEditPart.VISUAL_ID;
-			}
-			if (StructuredActivityNodeEditPart.VISUAL_ID == nodeVisualID) {
-				return StructuredActivityNodeEditPart.VISUAL_ID;
-			}
-			if (StructuredActivityNode2EditPart.VISUAL_ID == nodeVisualID) {
-				return StructuredActivityNode2EditPart.VISUAL_ID;
-			}
-			if (StructuredActivityNode3EditPart.VISUAL_ID == nodeVisualID) {
-				return StructuredActivityNode3EditPart.VISUAL_ID;
-			}
-			if (InitialNodeEditPart.VISUAL_ID == nodeVisualID) {
-				return InitialNodeEditPart.VISUAL_ID;
-			}
-			if (ActivityFinalNodeEditPart.VISUAL_ID == nodeVisualID) {
-				return ActivityFinalNodeEditPart.VISUAL_ID;
-			}
-			if (JoinNodeEditPart.VISUAL_ID == nodeVisualID) {
-				return JoinNodeEditPart.VISUAL_ID;
-			}
-			if (ForkNodeEditPart.VISUAL_ID == nodeVisualID) {
-				return ForkNodeEditPart.VISUAL_ID;
-			}
-			if (MergeNodeEditPart.VISUAL_ID == nodeVisualID) {
-				return MergeNodeEditPart.VISUAL_ID;
-			}
-			if (DecisionNodeEditPart.VISUAL_ID == nodeVisualID) {
-				return DecisionNodeEditPart.VISUAL_ID;
-			}
-			if (ActivityParameterNodeEditPart.VISUAL_ID == nodeVisualID) {
-				return ActivityParameterNodeEditPart.VISUAL_ID;
-			}
-			if (ActivityParameterNode2EditPart.VISUAL_ID == nodeVisualID) {
-				return ActivityParameterNode2EditPart.VISUAL_ID;
-			}
-			return getUnrecognizedActivityPartition_1008ChildNodeID(
-					domainElement, semanticHint);
-		case ActivityParameterNodeEditPart.VISUAL_ID:
-			if (ActivityParameterNodeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return ActivityParameterNodeNameEditPart.VISUAL_ID;
-			}
-			return getUnrecognizedActivityParameterNode_1009ChildNodeID(
-					domainElement, semanticHint);
-		case StructuredActivityNode2EditPart.VISUAL_ID:
-			if (StructuredActivityNodeName2EditPart.VISUAL_ID == nodeVisualID) {
-				return StructuredActivityNodeName2EditPart.VISUAL_ID;
-			}
-			return getUnrecognizedStructuredActivityNode_1010ChildNodeID(
-					domainElement, semanticHint);
-		case StructuredActivityNode3EditPart.VISUAL_ID:
-			if (StructuredActivityNodeName3EditPart.VISUAL_ID == nodeVisualID) {
-				return StructuredActivityNodeName3EditPart.VISUAL_ID;
-			}
-			return getUnrecognizedStructuredActivityNode_1011ChildNodeID(
-					domainElement, semanticHint);
-		case ActivityParameterNode2EditPart.VISUAL_ID:
-			if (ActivityParameterNodeName2EditPart.VISUAL_ID == nodeVisualID) {
-				return ActivityParameterNodeName2EditPart.VISUAL_ID;
-			}
-			return getUnrecognizedActivityParameterNode_1012ChildNodeID(
-					domainElement, semanticHint);
-		case ActivityPartition2EditPart.VISUAL_ID:
-			if (ActivityPartitionNameEditPart.VISUAL_ID == nodeVisualID) {
-				return ActivityPartitionNameEditPart.VISUAL_ID;
-			}
-			if (ActivityPartitionPartitionCampartment2EditPart.VISUAL_ID == nodeVisualID) {
-				return ActivityPartitionPartitionCampartment2EditPart.VISUAL_ID;
-			}
-			return getUnrecognizedActivityPartition_2001ChildNodeID(
-					domainElement, semanticHint);
-		case ActivityPartitionPartitionCampartmentEditPart.VISUAL_ID:
-			if ((semanticHint == null || ActivityPartition2EditPart.VISUAL_ID == nodeVisualID)
-					&& UMLPackage.eINSTANCE.getActivityPartition()
-							.isSuperTypeOf(domainElementMetaclass)
-					&& (domainElement == null || isNodeActivityPartition_2001((ActivityPartition) domainElement))) {
-				return ActivityPartition2EditPart.VISUAL_ID;
-			}
-			return getUnrecognizedActivityPartitionPartitionCampartment_5001ChildNodeID(
-					domainElement, semanticHint);
-		case ActivityPartitionPartitionCampartment2EditPart.VISUAL_ID:
-			if ((semanticHint == null || ActivityPartition2EditPart.VISUAL_ID == nodeVisualID)
-					&& UMLPackage.eINSTANCE.getActivityPartition()
-							.isSuperTypeOf(domainElementMetaclass)
-					&& (domainElement == null || isNodeActivityPartition_2001((ActivityPartition) domainElement))) {
-				return ActivityPartition2EditPart.VISUAL_ID;
-			}
-			return getUnrecognizedActivityPartitionPartitionCampartment_5002ChildNodeID(
-					domainElement, semanticHint);
-		case ActivityEditPart.VISUAL_ID:
-			if ((semanticHint == null || ActivityFinalNodeEditPart.VISUAL_ID == nodeVisualID)
-					&& UMLPackage.eINSTANCE.getActivityFinalNode()
-							.isSuperTypeOf(domainElementMetaclass)
-					&& (domainElement == null || isNodeActivityFinalNode_1001((ActivityFinalNode) domainElement))) {
-				return ActivityFinalNodeEditPart.VISUAL_ID;
-			}
-			if ((semanticHint == null || MergeNodeEditPart.VISUAL_ID == nodeVisualID)
-					&& UMLPackage.eINSTANCE.getMergeNode().isSuperTypeOf(
-							domainElementMetaclass)
-					&& (domainElement == null || isNodeMergeNode_1002((MergeNode) domainElement))) {
-				return MergeNodeEditPart.VISUAL_ID;
-			}
-			if ((semanticHint == null || ForkNodeEditPart.VISUAL_ID == nodeVisualID)
-					&& UMLPackage.eINSTANCE.getForkNode().isSuperTypeOf(
-							domainElementMetaclass)
-					&& (domainElement == null || isNodeForkNode_1003((ForkNode) domainElement))) {
-				return ForkNodeEditPart.VISUAL_ID;
-			}
-			if ((semanticHint == null || InitialNodeEditPart.VISUAL_ID == nodeVisualID)
-					&& UMLPackage.eINSTANCE.getInitialNode().isSuperTypeOf(
-							domainElementMetaclass)
-					&& (domainElement == null || isNodeInitialNode_1004((InitialNode) domainElement))) {
-				return InitialNodeEditPart.VISUAL_ID;
-			}
-			if ((semanticHint == null || DecisionNodeEditPart.VISUAL_ID == nodeVisualID)
-					&& UMLPackage.eINSTANCE.getDecisionNode().isSuperTypeOf(
-							domainElementMetaclass)
-					&& (domainElement == null || isNodeDecisionNode_1005((DecisionNode) domainElement))) {
-				return DecisionNodeEditPart.VISUAL_ID;
-			}
-			if ((semanticHint == null || JoinNodeEditPart.VISUAL_ID == nodeVisualID)
-					&& UMLPackage.eINSTANCE.getJoinNode().isSuperTypeOf(
-							domainElementMetaclass)
-					&& (domainElement == null || isNodeJoinNode_1006((JoinNode) domainElement))) {
-				return JoinNodeEditPart.VISUAL_ID;
-			}
-			if ((semanticHint == null || StructuredActivityNodeEditPart.VISUAL_ID == nodeVisualID)
-					&& UMLPackage.eINSTANCE.getStructuredActivityNode()
-							.isSuperTypeOf(domainElementMetaclass)
-					&& (domainElement == null || isNodeStructuredActivityNode_1007((StructuredActivityNode) domainElement))) {
-				return StructuredActivityNodeEditPart.VISUAL_ID;
-			}
-			if ((semanticHint == null || ActivityPartitionEditPart.VISUAL_ID == nodeVisualID)
-					&& UMLPackage.eINSTANCE.getActivityPartition()
-							.isSuperTypeOf(domainElementMetaclass)
-					&& (domainElement == null || isNodeActivityPartition_1008((ActivityPartition) domainElement))) {
-				return ActivityPartitionEditPart.VISUAL_ID;
-			}
-			if ((semanticHint == null || ActivityParameterNodeEditPart.VISUAL_ID == nodeVisualID)
-					&& UMLPackage.eINSTANCE.getActivityParameterNode()
-							.isSuperTypeOf(domainElementMetaclass)
-					&& (domainElement == null || isNodeActivityParameterNode_1009((ActivityParameterNode) domainElement))) {
-				return ActivityParameterNodeEditPart.VISUAL_ID;
-			}
-			if ((semanticHint == null || StructuredActivityNode2EditPart.VISUAL_ID == nodeVisualID)
-					&& UMLPackage.eINSTANCE.getStructuredActivityNode()
-							.isSuperTypeOf(domainElementMetaclass)
-					&& (domainElement == null || isNodeStructuredActivityNode_1010((StructuredActivityNode) domainElement))) {
-				return StructuredActivityNode2EditPart.VISUAL_ID;
-			}
-			if ((semanticHint == null || StructuredActivityNode3EditPart.VISUAL_ID == nodeVisualID)
-					&& UMLPackage.eINSTANCE.getStructuredActivityNode()
-							.isSuperTypeOf(domainElementMetaclass)
-					&& (domainElement == null || isNodeStructuredActivityNode_1011((StructuredActivityNode) domainElement))) {
-				return StructuredActivityNode3EditPart.VISUAL_ID;
-			}
-			if ((semanticHint == null || ActivityParameterNode2EditPart.VISUAL_ID == nodeVisualID)
-					&& UMLPackage.eINSTANCE.getActivityParameterNode()
-							.isSuperTypeOf(domainElementMetaclass)
-					&& (domainElement == null || isNodeActivityParameterNode_1012((ActivityParameterNode) domainElement))) {
-				return ActivityParameterNode2EditPart.VISUAL_ID;
-			}
-			return getUnrecognizedActivity_79ChildNodeID(domainElement,
-					semanticHint);
-		case ControlFlowEditPart.VISUAL_ID:
-			if (ControlFlowNameEditPart.VISUAL_ID == nodeVisualID) {
-				return ControlFlowNameEditPart.VISUAL_ID;
-			}
-			return getUnrecognizedControlFlow_3001LinkLabelID(semanticHint);
-		}
-		return -1;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static int getLinkWithClassVisualID(EObject domainElement) {
-		if (domainElement == null) {
-			return -1;
-		}
-		EClass domainElementMetaclass = domainElement.eClass();
-		return getLinkWithClassVisualID(domainElement, domainElementMetaclass);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static int getLinkWithClassVisualID(EObject domainElement,
-			EClass domainElementMetaclass) {
-		if (UMLPackage.eINSTANCE.getControlFlow().isSuperTypeOf(
-				domainElementMetaclass)
-				&& (domainElement == null || isLinkWithClassControlFlow_3001((ControlFlow) domainElement))) {
-			return ControlFlowEditPart.VISUAL_ID;
-		} else {
-			return getUnrecognizedLinkWithClassID(domainElement);
-		}
-	}
-
-	/**
-	 * User can change implementation of this method to check some additional 
-	 * conditions here.
-	 *
-	 * @generated
-	 */
-	private static boolean isDiagramActivity_79(Activity element) {
-		return true;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedDiagramID(EObject domainElement) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to check some additional 
-	 * conditions here.
-	 *
-	 * @generated
-	 */
-	private static boolean isNodeActivityFinalNode_1001(
-			ActivityFinalNode element) {
-		return true;
-	}
-
-	/**
-	 * User can change implementation of this method to check some additional 
-	 * conditions here.
-	 *
-	 * @generated
-	 */
-	private static boolean isNodeMergeNode_1002(MergeNode element) {
-		return true;
-	}
-
-	/**
-	 * User can change implementation of this method to check some additional 
-	 * conditions here.
-	 *
-	 * @generated
-	 */
-	private static boolean isNodeForkNode_1003(ForkNode element) {
-		return true;
-	}
-
-	/**
-	 * User can change implementation of this method to check some additional 
-	 * conditions here.
-	 *
-	 * @generated
-	 */
-	private static boolean isNodeInitialNode_1004(InitialNode element) {
-		return true;
-	}
-
-	/**
-	 * User can change implementation of this method to check some additional 
-	 * conditions here.
-	 *
-	 * @generated
-	 */
-	private static boolean isNodeDecisionNode_1005(DecisionNode element) {
-		return true;
-	}
-
-	/**
-	 * User can change implementation of this method to check some additional 
-	 * conditions here.
-	 *
-	 * @generated
-	 */
-	private static boolean isNodeJoinNode_1006(JoinNode element) {
-		return true;
-	}
-
-	/**
-	 * User can change implementation of this method to check some additional 
-	 * conditions here.
-	 *
-	 * @generated
-	 */
-	private static boolean isNodeStructuredActivityNode_1007(
-			StructuredActivityNode element) {
-		return StructuredActivityNode_1007.matches(element);
-	}
-
-	/**
-	 * User can change implementation of this method to check some additional 
-	 * conditions here.
-	 *
-	 * @generated
-	 */
-	private static boolean isNodeActivityPartition_1008(
-			ActivityPartition element) {
-		return true;
-	}
-
-	/**
-	 * User can change implementation of this method to check some additional 
-	 * conditions here.
-	 *
-	 * @generated
-	 */
-	private static boolean isNodeActivityParameterNode_1009(
-			ActivityParameterNode element) {
-		return ActivityParameterNode_1009.matches(element);
-	}
-
-	/**
-	 * User can change implementation of this method to check some additional 
-	 * conditions here.
-	 *
-	 * @generated
-	 */
-	private static boolean isNodeStructuredActivityNode_1010(
-			StructuredActivityNode element) {
-		return StructuredActivityNode_1010.matches(element);
-	}
-
-	/**
-	 * User can change implementation of this method to check some additional 
-	 * conditions here.
-	 *
-	 * @generated
-	 */
-	private static boolean isNodeStructuredActivityNode_1011(
-			StructuredActivityNode element) {
-		return StructuredActivityNode_1011.matches(element);
-	}
-
-	/**
-	 * User can change implementation of this method to check some additional 
-	 * conditions here.
-	 *
-	 * @generated
-	 */
-	private static boolean isNodeActivityParameterNode_1012(
-			ActivityParameterNode element) {
-		return ActivityParameterNode_1012.matches(element);
-	}
-
-	/**
-	 * User can change implementation of this method to check some additional 
-	 * conditions here.
-	 *
-	 * @generated
-	 */
-	private static boolean isNodeActivityPartition_2001(
-			ActivityPartition element) {
-		return true;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedActivityFinalNode_1001ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedMergeNode_1002ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedForkNode_1003ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedInitialNode_1004ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedDecisionNode_1005ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedJoinNode_1006ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedStructuredActivityNode_1007ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedActivityPartition_1008ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedActivityParameterNode_1009ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedStructuredActivityNode_1010ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedStructuredActivityNode_1011ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedActivityParameterNode_1012ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedActivityPartition_2001ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedActivityPartitionPartitionCampartment_5001ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedActivityPartitionPartitionCampartment_5002ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedActivity_79ChildNodeID(
-			EObject domainElement, String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedControlFlow_3001LinkLabelID(
-			String semanticHint) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 *
-	 * @generated
-	 */
-	private static int getUnrecognizedLinkWithClassID(EObject domainElement) {
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to check some additional 
-	 * conditions here.
-	 *
-	 * @generated
-	 */
-	private static boolean isLinkWithClassControlFlow_3001(ControlFlow element) {
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final Matcher StructuredActivityNode_1007 = new Matcher(
-			new UMLAbstractExpression(UMLPackage.eINSTANCE
-					.getStructuredActivityNode()) {
-				protected Object doEvaluate(Object context, Map env) {
-					StructuredActivityNode self = (StructuredActivityNode) context;
-					return JavaMatchers.getUmaType_Activity(self);
-				}
-			});
-
-	/**
-	 * @generated
-	 */
-	private static final Matcher ActivityParameterNode_1009 = new Matcher(
-			new UMLAbstractExpression(UMLPackage.eINSTANCE
-					.getActivityParameterNode()) {
-				protected Object doEvaluate(Object context, Map env) {
-					ActivityParameterNode self = (ActivityParameterNode) context;
-					return JavaMatchers.getUmaType_TaskDescriptor(self);
-				}
-			});
-
-	/**
-	 * @generated
-	 */
-	private static final Matcher StructuredActivityNode_1010 = new Matcher(
-			new UMLAbstractExpression(UMLPackage.eINSTANCE
-					.getStructuredActivityNode()) {
-				protected Object doEvaluate(Object context, Map env) {
-					StructuredActivityNode self = (StructuredActivityNode) context;
-					return JavaMatchers.getUmaType_Phase(self);
-				}
-			});
-
-	/**
-	 * @generated
-	 */
-	private static final Matcher StructuredActivityNode_1011 = new Matcher(
-			new UMLAbstractExpression(UMLPackage.eINSTANCE
-					.getStructuredActivityNode()) {
-				protected Object doEvaluate(Object context, Map env) {
-					StructuredActivityNode self = (StructuredActivityNode) context;
-					return JavaMatchers.getUmaType_Iteration(self);
-				}
-			});
-
-	/**
-	 * @generated
-	 */
-	private static final Matcher ActivityParameterNode_1012 = new Matcher(
-			new UMLAbstractExpression(UMLPackage.eINSTANCE
-					.getActivityParameterNode()) {
-				protected Object doEvaluate(Object context, Map env) {
-					ActivityParameterNode self = (ActivityParameterNode) context;
-					return JavaMatchers.getUmaType_Milestone(self);
-				}
-			});
-
-	/**
-	 * @generated	
-	 */
-	static class Matcher {
-
-		/**
-		 * @generated	
-		 */
-		private UMLAbstractExpression condition;
-
-		/**
-		 * @generated	
-		 */
-		Matcher(UMLAbstractExpression conditionExpression) {
-			this.condition = conditionExpression;
-		}
-
-		/**
-		 * @generated	
-		 */
-		boolean matches(EObject object) {
-			Object result = condition.evaluate(object);
-			return result instanceof Boolean
-					&& ((Boolean) result).booleanValue();
-		}
-	}// Matcher
-
-	/**
-	 * @generated
-	 */
-	private static class JavaMatchers {
-
-		/**
-		 * @modified
-		 */
-		private static Boolean getUmaType_Activity(StructuredActivityNode self) {
-			// TODO: implement this method
-			// Ensure that you remove @generated or mark it @generated NOT
-
-			Boolean bl = new Boolean(false);
-			String type = BridgeHelper.getEAnnotationType(self,
-					BridgeHelper.UMA_TYPE);
-			if (BridgeHelper.UMA_ACTIVITY.equalsIgnoreCase(type)) {
-				return bl.TRUE;
-			}
-			return bl;
-			//			throw new UMLAbstractExpression.NoImplException(
-			//					"No user java implementation provided in 'getUmaType_Activity' operation"); //$NON-NLS-1$
-		}
-
-		/**
-		 * @modified
-		 */
-		private static Boolean getUmaType_TaskDescriptor(
-				ActivityParameterNode self) {
-			// TODO: implement this method
-			// Ensure that you remove @generated or mark it @generated NOT
-
-			Boolean bl = new Boolean(false);
-			String type = BridgeHelper.getEAnnotationType(self,
-					BridgeHelper.UMA_TYPE);
-			if (BridgeHelper.UMA_TASK_DESCRIPTOR.equalsIgnoreCase(type)) {
-				return bl.TRUE;
-			}
-			return bl;
-			//			throw new UMLAbstractExpression.NoImplException(
-			//					"No user java implementation provided in 'getUmaType_TaskDescriptor' operation"); //$NON-NLS-1$
-		}
-
-		/**
-		 * @modified
-		 */
-		private static Boolean getUmaType_Phase(StructuredActivityNode self) {
-			// TODO: implement this method
-			// Ensure that you remove @generated or mark it @generated NOT
-
-			Boolean bl = new Boolean(false);
-			String type = BridgeHelper.getEAnnotationType(self,
-					BridgeHelper.UMA_TYPE);
-			if (BridgeHelper.UMA_PHASE.equalsIgnoreCase(type)) {
-				return bl.TRUE;
-			}
-			return bl;
-			//			throw new UMLAbstractExpression.NoImplException(
-			//					"No user java implementation provided in 'getUmaType_Phase' operation"); //$NON-NLS-1$
-		}
-
-		/**
-		 * @modified
-		 */
-		private static Boolean getUmaType_Iteration(StructuredActivityNode self) {
-			// TODO: implement this method
-			// Ensure that you remove @generated or mark it @generated NOT
-			Boolean bl = new Boolean(false);
-			String type = BridgeHelper.getEAnnotationType(self,
-					BridgeHelper.UMA_TYPE);
-			if (BridgeHelper.UMA_ITERATION.equalsIgnoreCase(type)) {
-				return bl.TRUE;
-			}
-			return bl;
-			//			throw new UMLAbstractExpression.NoImplException(
-			//					"No user java implementation provided in 'getUmaType_Iteration' operation"); //$NON-NLS-1$
-		}
-
-		/**
-		 * @modified
-		 */
-		private static Boolean getUmaType_Milestone(ActivityParameterNode self) {
-			// TODO: implement this method
-			// Ensure that you remove @generated or mark it @generated NOT
-
-			Boolean bl = new Boolean(false);
-			String type = BridgeHelper.getEAnnotationType(self,
-					BridgeHelper.UMA_TYPE);
-			if (BridgeHelper.UMA_MILESTONE.equalsIgnoreCase(type)) {
-				return bl.TRUE;
-			}
-			return bl;
-			//			throw new UMLAbstractExpression.NoImplException(
-			//					"No user java implementation provided in 'getUmaType_Milestone' operation"); //$NON-NLS-1$
-		}
-
-	}// JavaMatchers
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLAbstractParser.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLAbstractParser.java
deleted file mode 100644
index 9531842..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLAbstractParser.java
+++ /dev/null
@@ -1,410 +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.providers;
-
-import java.text.MessageFormat;
-import java.text.ParsePosition;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
-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.emf.type.core.commands.SetValueCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-
-/**
- * @generated
- */
-public abstract class UMLAbstractParser implements IParser {
-
-	/**
-	 * @generated
-	 */
-	private String viewPattern;
-
-	/**
-	 * @generated
-	 */
-	private MessageFormat viewProcessor;
-
-	/**
-	 * @generated
-	 */
-	private String editPattern;
-
-	/**
-	 * @generated
-	 */
-	private MessageFormat editProcessor;
-
-	/**
-	 * @generated
-	 */
-	public String getViewPattern() {
-		return viewPattern;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected MessageFormat getViewProcessor() {
-		return viewProcessor;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setViewPattern(String viewPattern) {
-		this.viewPattern = viewPattern;
-		viewProcessor = createViewProcessor(viewPattern);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected MessageFormat createViewProcessor(String viewPattern) {
-		return new MessageFormat(viewPattern);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditPattern() {
-		return editPattern;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected MessageFormat getEditProcessor() {
-		return editProcessor;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setEditPattern(String editPattern) {
-		this.editPattern = editPattern;
-		editProcessor = createEditProcessor(editPattern);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected MessageFormat createEditProcessor(String editPattern) {
-		return new MessageFormat(editPattern);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getPrintString(IAdaptable adapter, int flags) {
-		return getStringByPattern(adapter, flags, getViewPattern(),
-				getViewProcessor());
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditString(IAdaptable adapter, int flags) {
-		return getStringByPattern(adapter, flags, getEditPattern(),
-				getEditProcessor());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected abstract String getStringByPattern(IAdaptable adapter, int flags,
-			String pattern, MessageFormat processor);
-
-	/**
-	 * @generated
-	 */
-	public IParserEditStatus isValidEditString(IAdaptable element,
-			String editString) {
-		ParsePosition pos = new ParsePosition(0);
-		Object[] values = getEditProcessor().parse(editString, pos);
-		if (values == null) {
-			return new ParserEditStatus(EPFDiagramEditorPlugin.ID,
-					IParserEditStatus.UNEDITABLE, "Invalid input at "
-							+ pos.getErrorIndex());
-		}
-		return validateNewValues(values);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParserEditStatus validateNewValues(Object[] values) {
-		return ParserEditStatus.EDITABLE_STATUS;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICommand getParseCommand(IAdaptable adapter, String newString,
-			int flags) {
-		Object[] values = getEditProcessor().parse(newString,
-				new ParsePosition(0));
-		if (values == null
-				|| validateNewValues(values).getCode() != IParserEditStatus.EDITABLE) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		return getParseCommand(adapter, values);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected abstract ICommand getParseCommand(IAdaptable adapter,
-			Object[] values);
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor(IAdaptable element) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ICommand getModificationCommand(EObject element,
-			EStructuralFeature feature, Object value) {
-		value = getValidNewValue(feature, value);
-		if (value instanceof InvalidValue) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		SetRequest request = new SetRequest(element, feature, value);
-		return new SetValueCommand(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Object getValidValue(EStructuralFeature feature, Object value) {
-		EClassifier type = feature.getEType();
-		if (type instanceof EDataType) {
-			Class iClass = type.getInstanceClass();
-			if (String.class.equals(iClass)) {
-				if (value == null) {
-					value = ""; //$NON-NLS-1$
-				}
-			}
-		}
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Object getValidNewValue(EStructuralFeature feature, Object value) {
-		EClassifier type = feature.getEType();
-		if (type instanceof EDataType) {
-			Class iClass = type.getInstanceClass();
-			if (Boolean.TYPE.equals(iClass)) {
-				if (value instanceof Boolean) {
-					// ok
-				} else if (value instanceof String) {
-					value = Boolean.valueOf((String) value);
-				} else {
-					value = new InvalidValue(
-							"Value of type Boolean is expected");
-				}
-			} else if (Character.TYPE.equals(iClass)) {
-				if (value instanceof Character) {
-					// ok
-				} else if (value instanceof String) {
-					String s = (String) value;
-					if (s.length() == 0) {
-						value = null;
-					} else {
-						value = new Character(s.charAt(0));
-					}
-				} else {
-					value = new InvalidValue(
-							"Value of type Character is expected");
-				}
-			} else if (Byte.TYPE.equals(iClass)) {
-				if (value instanceof Byte) {
-					// ok
-				} else if (value instanceof Number) {
-					value = new Byte(((Number) value).byteValue());
-				} else if (value instanceof String) {
-					String s = (String) value;
-					if (s.length() == 0) {
-						value = null;
-					} else {
-						try {
-							value = Byte.valueOf(s);
-						} catch (NumberFormatException nfe) {
-							value = new InvalidValue(
-									"String value does not convert to Byte value");
-						}
-					}
-				} else {
-					value = new InvalidValue("Value of type Byte is expected");
-				}
-			} else if (Short.TYPE.equals(iClass)) {
-				if (value instanceof Short) {
-					// ok
-				} else if (value instanceof Number) {
-					value = new Short(((Number) value).shortValue());
-				} else if (value instanceof String) {
-					String s = (String) value;
-					if (s.length() == 0) {
-						value = null;
-					} else {
-						try {
-							value = Short.valueOf(s);
-						} catch (NumberFormatException nfe) {
-							value = new InvalidValue(
-									"String value does not convert to Short value");
-						}
-					}
-				} else {
-					value = new InvalidValue("Value of type Short is expected");
-				}
-			} else if (Integer.TYPE.equals(iClass)) {
-				if (value instanceof Integer) {
-					// ok
-				} else if (value instanceof Number) {
-					value = new Integer(((Number) value).intValue());
-				} else if (value instanceof String) {
-					String s = (String) value;
-					if (s.length() == 0) {
-						value = null;
-					} else {
-						try {
-							value = Integer.valueOf(s);
-						} catch (NumberFormatException nfe) {
-							value = new InvalidValue(
-									"String value does not convert to Integer value");
-						}
-					}
-				} else {
-					value = new InvalidValue(
-							"Value of type Integer is expected");
-				}
-			} else if (Long.TYPE.equals(iClass)) {
-				if (value instanceof Long) {
-					// ok
-				} else if (value instanceof Number) {
-					value = new Long(((Number) value).longValue());
-				} else if (value instanceof String) {
-					String s = (String) value;
-					if (s.length() == 0) {
-						value = null;
-					} else {
-						try {
-							value = Long.valueOf(s);
-						} catch (NumberFormatException nfe) {
-							value = new InvalidValue(
-									"String value does not convert to Long value");
-						}
-					}
-				} else {
-					value = new InvalidValue("Value of type Long is expected");
-				}
-			} else if (Float.TYPE.equals(iClass)) {
-				if (value instanceof Float) {
-					// ok
-				} else if (value instanceof Number) {
-					value = new Float(((Number) value).floatValue());
-				} else if (value instanceof String) {
-					String s = (String) value;
-					if (s.length() == 0) {
-						value = null;
-					} else {
-						try {
-							value = Float.valueOf(s);
-						} catch (NumberFormatException nfe) {
-							value = new InvalidValue(
-									"String value does not convert to Float value");
-						}
-					}
-				} else {
-					value = new InvalidValue("Value of type Float is expected");
-				}
-			} else if (Double.TYPE.equals(iClass)) {
-				if (value instanceof Double) {
-					// ok
-				} else if (value instanceof Number) {
-					value = new Double(((Number) value).doubleValue());
-				} else if (value instanceof String) {
-					String s = (String) value;
-					if (s.length() == 0) {
-						value = null;
-					} else {
-						try {
-							value = Double.valueOf(s);
-						} catch (NumberFormatException nfe) {
-							value = new InvalidValue(
-									"String value does not convert to Double value");
-						}
-					}
-				} else {
-					value = new InvalidValue("Value of type Double is expected");
-				}
-			} else if (type instanceof EEnum) {
-				if (value instanceof String) {
-					EEnumLiteral literal = ((EEnum) type)
-							.getEEnumLiteralByLiteral((String) value);
-					if (literal == null) {
-						value = new InvalidValue("Unknown literal: " + value);
-					} else {
-						value = literal.getInstance();
-					}
-				} else {
-					value = new InvalidValue("Value of type String is expected");
-				}
-			}
-		}
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected class InvalidValue {
-
-		private String description;
-
-		public InvalidValue(String description) {
-			this.description = description;
-		}
-
-		public String toString() {
-			return description;
-		}
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLEditPartProvider.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLEditPartProvider.java
deleted file mode 100644
index 32b582b..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLEditPartProvider.java
+++ /dev/null
@@ -1,164 +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.providers;
-
-import java.lang.ref.WeakReference;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.epf.diagramming.edit.parts.UMLEditPartFactory;
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-/**
- * @generated
- */
-public class UMLEditPartProvider extends AbstractEditPartProvider {
-
-	/**
-	 * @generated
-	 */
-	private EditPartFactory factory;
-
-	/**
-	 * @generated
-	 */
-	private boolean allowCaching;
-
-	/**
-	 * @generated
-	 */
-	private WeakReference cachedPart;
-
-	/**
-	 * @generated
-	 */
-	private WeakReference cachedView;
-
-	/**
-	 * @generated
-	 */
-	public UMLEditPartProvider() {
-		setFactory(new UMLEditPartFactory());
-		setAllowCaching(true);
-	}
-
-	/**
-	 * @generated
-	 */
-	public final EditPartFactory getFactory() {
-		return factory;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFactory(EditPartFactory factory) {
-		this.factory = factory;
-	}
-
-	/**
-	 * @generated
-	 */
-	public final boolean isAllowCaching() {
-		return allowCaching;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected synchronized void setAllowCaching(boolean allowCaching) {
-		this.allowCaching = allowCaching;
-		if (!allowCaching) {
-			cachedPart = null;
-			cachedView = null;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IGraphicalEditPart createEditPart(View view) {
-		EditPart part = factory.createEditPart(null, view);
-		if (part instanceof IGraphicalEditPart) {
-			return (IGraphicalEditPart) part;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IGraphicalEditPart getCachedPart(View view) {
-		if (cachedView != null && cachedView.get() == view) {
-			return (IGraphicalEditPart) cachedPart.get();
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public synchronized IGraphicalEditPart createGraphicEditPart(View view) {
-		if (isAllowCaching()) {
-			IGraphicalEditPart part = getCachedPart(view);
-			cachedPart = null;
-			cachedView = null;
-			if (part != null) {
-				return part;
-			}
-		}
-		return createEditPart(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public synchronized boolean provides(IOperation operation) {
-		if (operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation) operation).getView();
-			if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-					.getModelID(view))) {
-				return false;
-			}
-			if (isAllowCaching() && getCachedPart(view) != null) {
-				return true;
-			}
-			IGraphicalEditPart part = createEditPart(view);
-			if (part != null) {
-				if (isAllowCaching()) {
-					cachedPart = new WeakReference(part);
-					cachedView = new WeakReference(view);
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLElementTypes.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLElementTypes.java
deleted file mode 100644
index ff793f4..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLElementTypes.java
+++ /dev/null
@@ -1,508 +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.providers;
-
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.diagramming.expressions.UMLAbstractExpression;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.uml2.uml.ActivityParameterNode;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class UMLElementTypes {
-
-	/**
-	 * @generated
-	 */
-	private UMLElementTypes() {
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Map elements;
-
-	/**
-	 * @generated
-	 */
-	private static ImageRegistry imageRegistry;
-
-	/**
-	 * @generated
-	 */
-	private static ImageRegistry getImageRegistry() {
-		if (imageRegistry == null) {
-			imageRegistry = new ImageRegistry();
-		}
-		return imageRegistry;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static String getImageRegistryKey(ENamedElement element) {
-		return element.getName();
-	}
-
-	/**
-	 * @generated
-	 */
-	private static ImageDescriptor getProvidedImageDescriptor(
-			ENamedElement element) {
-		if (element instanceof EStructuralFeature) {
-			element = ((EStructuralFeature) element).getEContainingClass();
-		}
-		if (element instanceof EClass) {
-			EClass eClass = (EClass) element;
-			if (!eClass.isAbstract()) {
-				return EPFDiagramEditorPlugin.getInstance()
-						.getItemImageDescriptor(
-								eClass.getEPackage().getEFactoryInstance()
-										.create(eClass));
-			}
-		}
-		// TODO : support structural features
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static ImageDescriptor getImageDescriptor(ENamedElement element) {
-		String key = getImageRegistryKey(element);
-		ImageDescriptor imageDescriptor = getImageRegistry().getDescriptor(key);
-		if (imageDescriptor == null) {
-			imageDescriptor = getProvidedImageDescriptor(element);
-			if (imageDescriptor == null) {
-				imageDescriptor = ImageDescriptor.getMissingImageDescriptor();
-			}
-			getImageRegistry().put(key, imageDescriptor);
-		}
-		return imageDescriptor;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static Image getImage(ENamedElement element) {
-		String key = getImageRegistryKey(element);
-		Image image = getImageRegistry().get(key);
-		if (image == null) {
-			ImageDescriptor imageDescriptor = getProvidedImageDescriptor(element);
-			if (imageDescriptor == null) {
-				imageDescriptor = ImageDescriptor.getMissingImageDescriptor();
-			}
-			getImageRegistry().put(key, imageDescriptor);
-			image = getImageRegistry().get(key);
-		}
-		return image;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static ImageDescriptor getImageDescriptor(IAdaptable hint) {
-		ENamedElement element = getElement(hint);
-		if (element == null) {
-			return null;
-		}
-		return getImageDescriptor(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static Image getImage(IAdaptable hint) {
-		ENamedElement element = getElement(hint);
-		if (element == null) {
-			return null;
-		}
-		return getImage(element);
-	}
-
-	/**
-	 * Returns 'type' of the ecore object associated with the hint.
-	 * 
-	 * @generated
-	 */
-	public static ENamedElement getElement(IAdaptable hint) {
-		Object type = hint.getAdapter(IElementType.class);
-		if (elements == null) {
-			elements = new IdentityHashMap();
-			elements.put(Activity_79, UMLPackage.eINSTANCE.getActivity());
-			elements.put(ActivityPartition_2001, UMLPackage.eINSTANCE
-					.getActivityPartition());
-			elements.put(ActivityFinalNode_1001, UMLPackage.eINSTANCE
-					.getActivityFinalNode());
-			elements.put(MergeNode_1002, UMLPackage.eINSTANCE.getMergeNode());
-			elements.put(ForkNode_1003, UMLPackage.eINSTANCE.getForkNode());
-			elements.put(InitialNode_1004, UMLPackage.eINSTANCE
-					.getInitialNode());
-			elements.put(DecisionNode_1005, UMLPackage.eINSTANCE
-					.getDecisionNode());
-			elements.put(JoinNode_1006, UMLPackage.eINSTANCE.getJoinNode());
-			elements.put(StructuredActivityNode_1007, UMLPackage.eINSTANCE
-					.getStructuredActivityNode());
-			elements.put(ActivityPartition_1008, UMLPackage.eINSTANCE
-					.getActivityPartition());
-			elements.put(ActivityParameterNode_1009, UMLPackage.eINSTANCE
-					.getActivityParameterNode());
-			elements.put(StructuredActivityNode_1010, UMLPackage.eINSTANCE
-					.getStructuredActivityNode());
-			elements.put(StructuredActivityNode_1011, UMLPackage.eINSTANCE
-					.getStructuredActivityNode());
-			elements.put(ActivityParameterNode_1012, UMLPackage.eINSTANCE
-					.getActivityParameterNode());
-			elements.put(ControlFlow_3001, UMLPackage.eINSTANCE
-					.getControlFlow());
-		}
-		return (ENamedElement) elements.get(type);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType Activity_79 = getElementType("org.eclipse.epf.diagramming.Activity_79"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType ActivityPartition_2001 = getElementType("org.eclipse.epf.diagramming.ActivityPartition_2001"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType ActivityFinalNode_1001 = getElementType("org.eclipse.epf.diagramming.ActivityFinalNode_1001"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType MergeNode_1002 = getElementType("org.eclipse.epf.diagramming.MergeNode_1002"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType ForkNode_1003 = getElementType("org.eclipse.epf.diagramming.ForkNode_1003"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType InitialNode_1004 = getElementType("org.eclipse.epf.diagramming.InitialNode_1004"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType DecisionNode_1005 = getElementType("org.eclipse.epf.diagramming.DecisionNode_1005"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType JoinNode_1006 = getElementType("org.eclipse.epf.diagramming.JoinNode_1006"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType StructuredActivityNode_1007 = getElementType("org.eclipse.epf.diagramming.StructuredActivityNode_1007"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType ActivityPartition_1008 = getElementType("org.eclipse.epf.diagramming.ActivityPartition_1008"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType ActivityParameterNode_1009 = getElementType("org.eclipse.epf.diagramming.ActivityParameterNode_1009"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType StructuredActivityNode_1010 = getElementType("org.eclipse.epf.diagramming.StructuredActivityNode_1010"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType StructuredActivityNode_1011 = getElementType("org.eclipse.epf.diagramming.StructuredActivityNode_1011"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType ActivityParameterNode_1012 = getElementType("org.eclipse.epf.diagramming.ActivityParameterNode_1012"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final IElementType ControlFlow_3001 = getElementType("org.eclipse.epf.diagramming.ControlFlow_3001"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private static IElementType getElementType(String id) {
-		return ElementTypeRegistry.getInstance().getType(id);
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Set KNOWN_ELEMENT_TYPES;
-
-	/**
-	 * @generated
-	 */
-	public static boolean isKnownElementType(IElementType elementType) {
-		if (KNOWN_ELEMENT_TYPES == null) {
-			KNOWN_ELEMENT_TYPES = new HashSet();
-			KNOWN_ELEMENT_TYPES.add(Activity_79);
-			KNOWN_ELEMENT_TYPES.add(ActivityPartition_2001);
-			KNOWN_ELEMENT_TYPES.add(ActivityFinalNode_1001);
-			KNOWN_ELEMENT_TYPES.add(MergeNode_1002);
-			KNOWN_ELEMENT_TYPES.add(ForkNode_1003);
-			KNOWN_ELEMENT_TYPES.add(InitialNode_1004);
-			KNOWN_ELEMENT_TYPES.add(DecisionNode_1005);
-			KNOWN_ELEMENT_TYPES.add(JoinNode_1006);
-			KNOWN_ELEMENT_TYPES.add(StructuredActivityNode_1007);
-			KNOWN_ELEMENT_TYPES.add(ActivityPartition_1008);
-			KNOWN_ELEMENT_TYPES.add(ActivityParameterNode_1009);
-			KNOWN_ELEMENT_TYPES.add(StructuredActivityNode_1010);
-			KNOWN_ELEMENT_TYPES.add(StructuredActivityNode_1011);
-			KNOWN_ELEMENT_TYPES.add(ActivityParameterNode_1012);
-			KNOWN_ELEMENT_TYPES.add(ControlFlow_3001);
-		}
-		return KNOWN_ELEMENT_TYPES.contains(elementType);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static class Initializers {
-
-		/**
-		 * @generated
-		 */
-		public static final ObjectInitializer StructuredActivityNode_1007 = new ObjectInitializer(
-				new FeatureInitializer[] { new FeatureInitializer(
-						new UMLAbstractExpression(UMLPackage.eINSTANCE
-								.getStructuredActivityNode()) {
-							protected Object doEvaluate(Object context, Map env) {
-								StructuredActivityNode self = (StructuredActivityNode) context;
-								return Java.createUmaType_Activity(self);
-							}
-						}, EcorePackage.eINSTANCE
-								.getEModelElement_EAnnotations()) });
-
-		/**
-		 * @generated
-		 */
-		public static final ObjectInitializer ActivityParameterNode_1009 = new ObjectInitializer(
-				new FeatureInitializer[] { new FeatureInitializer(
-						new UMLAbstractExpression(UMLPackage.eINSTANCE
-								.getActivityParameterNode()) {
-							protected Object doEvaluate(Object context, Map env) {
-								ActivityParameterNode self = (ActivityParameterNode) context;
-								return Java.createUmaType_TaskDescriptor(self);
-							}
-						}, EcorePackage.eINSTANCE
-								.getEModelElement_EAnnotations()) });
-
-		/**
-		 * @generated
-		 */
-		public static final ObjectInitializer StructuredActivityNode_1010 = new ObjectInitializer(
-				new FeatureInitializer[] { new FeatureInitializer(
-						new UMLAbstractExpression(UMLPackage.eINSTANCE
-								.getStructuredActivityNode()) {
-							protected Object doEvaluate(Object context, Map env) {
-								StructuredActivityNode self = (StructuredActivityNode) context;
-								return Java.createUmaType_Phase(self);
-							}
-						}, EcorePackage.eINSTANCE
-								.getEModelElement_EAnnotations()) });
-
-		/**
-		 * @generated
-		 */
-		public static final ObjectInitializer StructuredActivityNode_1011 = new ObjectInitializer(
-				new FeatureInitializer[] { new FeatureInitializer(
-						new UMLAbstractExpression(UMLPackage.eINSTANCE
-								.getStructuredActivityNode()) {
-							protected Object doEvaluate(Object context, Map env) {
-								StructuredActivityNode self = (StructuredActivityNode) context;
-								return Java.createUmaType_Iteration(self);
-							}
-						}, EcorePackage.eINSTANCE
-								.getEModelElement_EAnnotations()) });
-
-		/**
-		 * @generated
-		 */
-		public static final ObjectInitializer ActivityParameterNode_1012 = new ObjectInitializer(
-				new FeatureInitializer[] { new FeatureInitializer(
-						new UMLAbstractExpression(UMLPackage.eINSTANCE
-								.getActivityParameterNode()) {
-							protected Object doEvaluate(Object context, Map env) {
-								ActivityParameterNode self = (ActivityParameterNode) context;
-								return Java.createUmaType_Milestone(self);
-							}
-						}, EcorePackage.eINSTANCE
-								.getEModelElement_EAnnotations()) });
-
-		/** 
-		 * @generated
-		 */
-		private Initializers() {
-		}
-
-		/** 
-		 * @generated
-		 */
-		public static class ObjectInitializer {
-			/** 
-			 * @generated
-			 */
-			private FeatureInitializer[] initExpressions;
-
-			/** 
-			 * @generated
-			 */
-			ObjectInitializer(FeatureInitializer[] initExpressions) {
-				this.initExpressions = initExpressions;
-			}
-
-			/** 
-			 * @generated
-			 */
-			public void init(EObject instance) {
-				for (int i = 0; i < initExpressions.length; i++) {
-					FeatureInitializer nextExpr = initExpressions[i];
-					try {
-						nextExpr.init(instance);
-					} catch (RuntimeException e) {
-						EPFDiagramEditorPlugin.getInstance().logError(
-								"Feature initialization failed", e); //$NON-NLS-1$						
-					}
-				}
-			}
-		} // end of ObjectInitializer
-
-		/** 
-		 * @generated
-		 */
-		static class FeatureInitializer {
-
-			/** 
-			 * @generated
-			 */
-			private EStructuralFeature sFeature;
-
-			/** 
-			 * @generated
-			 */
-			private UMLAbstractExpression expression;
-
-			/**
-			 * @generated
-			 */
-			FeatureInitializer(UMLAbstractExpression expression,
-					EStructuralFeature sFeature) {
-				this.sFeature = sFeature;
-				this.expression = expression;
-			}
-
-			/** 
-			 * @generated
-			 */
-			void init(EObject contextInstance) {
-				expression.assignTo(sFeature, contextInstance);
-			}
-		} // end of FeatureInitializer
-
-		/** 
-		 * @generated
-		 */
-		static class Java {
-
-			/**
-			 * @modified
-			 */
-			private static EList createUmaType_Phase(StructuredActivityNode self) {
-				return BridgeHelper.addEAnnotationType(self,
-						BridgeHelper.UMA_PHASE);
-			}
-
-			/**
-			 * @modified
-			 */
-			private static EList createUmaType_Milestone(
-					ActivityParameterNode self) {
-				return BridgeHelper.addEAnnotationType(self,
-						BridgeHelper.UMA_MILESTONE);
-			}
-
-			/**
-			 * @modified
-			 */
-			private static EList createUmaType_Activity(
-					StructuredActivityNode self) {
-				return BridgeHelper.addEAnnotationType(self,
-						BridgeHelper.UMA_ACTIVITY);
-			}
-
-			/**
-			 * @modified
-			 */
-			private static EList createUmaType_TaskDescriptor(
-					ActivityParameterNode self) {
-				return BridgeHelper.addEAnnotationType(self,
-						BridgeHelper.UMA_TASK_DESCRIPTOR);
-			}
-
-			/**
-			 * @modified
-			 */
-			private static EList createUmaType_Iteration(
-					StructuredActivityNode self) {
-				return BridgeHelper.addEAnnotationType(self,
-						BridgeHelper.UMA_ITERATION);
-			}
-		} //Java
-	} // end of Initializers
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLIconProvider.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLIconProvider.java
deleted file mode 100644
index 717871d..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLIconProvider.java
+++ /dev/null
@@ -1,52 +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.providers;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.icon.GetIconOperation;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IIconProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @generated
- */
-public class UMLIconProvider extends AbstractProvider implements IIconProvider {
-
-	/**
-	 * @generated
-	 */
-	public Image getIcon(IAdaptable hint, int flags) {
-		return UMLElementTypes.getImage(hint);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean provides(IOperation operation) {
-		if (operation instanceof GetIconOperation) {
-			return ((GetIconOperation) operation).execute(this) != null;
-		}
-		return false;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLModelingAssistantProvider.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLModelingAssistantProvider.java
deleted file mode 100644
index 66ba47f..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLModelingAssistantProvider.java
+++ /dev/null
@@ -1,201 +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.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionPartitionCampartment2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionPartitionCampartmentEditPart;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssistantProvider;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-
-/**
- * @generated
- */
-public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
-
-	/**
-	 * @generated
-	 */
-	public List getTypesForPopupBar(IAdaptable host) {
-		IGraphicalEditPart editPart = (IGraphicalEditPart) host
-				.getAdapter(IGraphicalEditPart.class);
-		if (editPart instanceof ActivityPartitionPartitionCampartmentEditPart) {
-			List types = new ArrayList();
-			types.add(UMLElementTypes.ActivityPartition_2001);
-			return types;
-		}
-		if (editPart instanceof ActivityPartitionPartitionCampartment2EditPart) {
-			List types = new ArrayList();
-			types.add(UMLElementTypes.ActivityPartition_2001);
-			return types;
-		}
-		if (editPart instanceof ActivityEditPart) {
-			List types = new ArrayList();
-			types.add(UMLElementTypes.ActivityFinalNode_1001);
-			types.add(UMLElementTypes.MergeNode_1002);
-			types.add(UMLElementTypes.ForkNode_1003);
-			types.add(UMLElementTypes.InitialNode_1004);
-			types.add(UMLElementTypes.DecisionNode_1005);
-			types.add(UMLElementTypes.JoinNode_1006);
-			types.add(UMLElementTypes.StructuredActivityNode_1007);
-			types.add(UMLElementTypes.ActivityPartition_1008);
-			types.add(UMLElementTypes.ActivityParameterNode_1009);
-			types.add(UMLElementTypes.StructuredActivityNode_1010);
-			types.add(UMLElementTypes.StructuredActivityNode_1011);
-			types.add(UMLElementTypes.ActivityParameterNode_1012);
-			return types;
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List getRelTypesOnSource(IAdaptable source) {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List getRelTypesOnTarget(IAdaptable target) {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List getRelTypesOnSourceAndTarget(IAdaptable source,
-			IAdaptable target) {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List getTypesForSource(IAdaptable target,
-			IElementType relationshipType) {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public List getTypesForTarget(IAdaptable source,
-			IElementType relationshipType) {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public EObject selectExistingElementForSource(IAdaptable target,
-			IElementType relationshipType) {
-		return selectExistingElement(target, getTypesForSource(target,
-				relationshipType));
-	}
-
-	/**
-	 * @generated
-	 */
-	public EObject selectExistingElementForTarget(IAdaptable source,
-			IElementType relationshipType) {
-		return selectExistingElement(source, getTypesForTarget(source,
-				relationshipType));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject selectExistingElement(IAdaptable host, Collection types) {
-		if (types.isEmpty()) {
-			return null;
-		}
-		IGraphicalEditPart editPart = (IGraphicalEditPart) host
-				.getAdapter(IGraphicalEditPart.class);
-		if (editPart == null) {
-			return null;
-		}
-		Diagram diagram = (Diagram) editPart.getRoot().getContents().getModel();
-		Collection elements = new HashSet();
-		for (Iterator it = diagram.getElement().eAllContents(); it.hasNext();) {
-			EObject element = (EObject) it.next();
-			if (isApplicableElement(element, types)) {
-				elements.add(element);
-			}
-		}
-		if (elements.isEmpty()) {
-			return null;
-		}
-		return selectElement((EObject[]) elements.toArray(new EObject[elements
-				.size()]));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isApplicableElement(EObject element, Collection types) {
-		IElementType type = ElementTypeRegistry.getInstance().getElementType(
-				element);
-		return types.contains(type);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject selectElement(EObject[] elements) {
-		Shell shell = Display.getCurrent().getActiveShell();
-		ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-				EPFDiagramEditorPlugin.getInstance()
-						.getItemProvidersAdapterFactory());
-		ElementListSelectionDialog dialog = new ElementListSelectionDialog(
-				shell, labelProvider);
-		dialog.setMessage("Available domain model elements:");
-		dialog.setTitle("Select domain model element");
-		dialog.setMultipleSelection(false);
-		dialog.setElements(elements);
-		EObject selected = null;
-		if (dialog.open() == Window.OK) {
-			selected = (EObject) dialog.getFirstResult();
-		}
-		return selected;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLPaletteProvider.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLPaletteProvider.java
deleted file mode 100644
index 3383f0e..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLPaletteProvider.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.providers;
-
-import java.util.Map;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.IPaletteProvider;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.epf.diagramming.part.UMLPaletteFactory;
-
-/**
- * @generated
- */
-public class UMLPaletteProvider extends AbstractProvider implements
-		IPaletteProvider {
-
-	/**
-	 * @generated
-	 */
-	public void contributeToPalette(IEditorPart editor, Object content,
-			PaletteRoot root, Map predefinedEntries) {
-		UMLPaletteFactory factory = new UMLPaletteFactory();
-		factory.fillPalette(root);
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setContributions(IConfigurationElement configElement) {
-		// no configuration
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean provides(IOperation operation) {
-		return false; // all logic is done in the service
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLParserProvider.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLParserProvider.java
deleted file mode 100644
index 12c661f..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLParserProvider.java
+++ /dev/null
@@ -1,415 +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.providers;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.epf.diagramming.edit.parts.ActivityFinalNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityParameterNodeName2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityParameterNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionName2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ControlFlowNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.DecisionNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ForkNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.InitialNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.JoinNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.MergeNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeName2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeName3EditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeNameEditPart;
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.parser.GetParserOperation;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class UMLParserProvider extends AbstractProvider implements
-		IParserProvider {
-
-	/**
-	 * @generated
-	 */
-	private IParser activityPartitionActivityPartitionName_4006Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getActivityPartitionActivityPartitionName_4006Parser() {
-		if (activityPartitionActivityPartitionName_4006Parser == null) {
-			activityPartitionActivityPartitionName_4006Parser = createActivityPartitionActivityPartitionName_4006Parser();
-		}
-		return activityPartitionActivityPartitionName_4006Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createActivityPartitionActivityPartitionName_4006Parser() {
-		UMLStructuralFeatureParser parser = new UMLStructuralFeatureParser(
-				UMLPackage.eINSTANCE.getNamedElement().getEStructuralFeature(
-						"name")); //$NON-NLS-1$
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser activityFinalNodeActivityFinalNodeName_4001Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getActivityFinalNodeActivityFinalNodeName_4001Parser() {
-		if (activityFinalNodeActivityFinalNodeName_4001Parser == null) {
-			activityFinalNodeActivityFinalNodeName_4001Parser = createActivityFinalNodeActivityFinalNodeName_4001Parser();
-		}
-		return activityFinalNodeActivityFinalNodeName_4001Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createActivityFinalNodeActivityFinalNodeName_4001Parser() {
-		UMLStructuralFeatureParser parser = new UMLStructuralFeatureParser(
-				UMLPackage.eINSTANCE.getNamedElement().getEStructuralFeature(
-						"name")); //$NON-NLS-1$
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser mergeNodeMergeNodeName_4002Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getMergeNodeMergeNodeName_4002Parser() {
-		if (mergeNodeMergeNodeName_4002Parser == null) {
-			mergeNodeMergeNodeName_4002Parser = createMergeNodeMergeNodeName_4002Parser();
-		}
-		return mergeNodeMergeNodeName_4002Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createMergeNodeMergeNodeName_4002Parser() {
-		UMLStructuralFeatureParser parser = new UMLStructuralFeatureParser(
-				UMLPackage.eINSTANCE.getNamedElement().getEStructuralFeature(
-						"name")); //$NON-NLS-1$
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser initialNodeInitialNodeName_4003Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInitialNodeInitialNodeName_4003Parser() {
-		if (initialNodeInitialNodeName_4003Parser == null) {
-			initialNodeInitialNodeName_4003Parser = createInitialNodeInitialNodeName_4003Parser();
-		}
-		return initialNodeInitialNodeName_4003Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createInitialNodeInitialNodeName_4003Parser() {
-		UMLStructuralFeatureParser parser = new UMLStructuralFeatureParser(
-				UMLPackage.eINSTANCE.getNamedElement().getEStructuralFeature(
-						"name")); //$NON-NLS-1$
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser decisionNodeDecisionNodeName_4004Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDecisionNodeDecisionNodeName_4004Parser() {
-		if (decisionNodeDecisionNodeName_4004Parser == null) {
-			decisionNodeDecisionNodeName_4004Parser = createDecisionNodeDecisionNodeName_4004Parser();
-		}
-		return decisionNodeDecisionNodeName_4004Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createDecisionNodeDecisionNodeName_4004Parser() {
-		UMLStructuralFeatureParser parser = new UMLStructuralFeatureParser(
-				UMLPackage.eINSTANCE.getNamedElement().getEStructuralFeature(
-						"name")); //$NON-NLS-1$
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser structuredActivityNodeStructuredActivityNodeName_4005Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getStructuredActivityNodeStructuredActivityNodeName_4005Parser() {
-		if (structuredActivityNodeStructuredActivityNodeName_4005Parser == null) {
-			structuredActivityNodeStructuredActivityNodeName_4005Parser = createStructuredActivityNodeStructuredActivityNodeName_4005Parser();
-		}
-		return structuredActivityNodeStructuredActivityNodeName_4005Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createStructuredActivityNodeStructuredActivityNodeName_4005Parser() {
-		UMLStructuralFeatureParser parser = new UMLStructuralFeatureParser(
-				UMLPackage.eINSTANCE.getNamedElement().getEStructuralFeature(
-						"name")); //$NON-NLS-1$
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser activityPartitionActivityPartitionName_4007Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getActivityPartitionActivityPartitionName_4007Parser() {
-		if (activityPartitionActivityPartitionName_4007Parser == null) {
-			activityPartitionActivityPartitionName_4007Parser = createActivityPartitionActivityPartitionName_4007Parser();
-		}
-		return activityPartitionActivityPartitionName_4007Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createActivityPartitionActivityPartitionName_4007Parser() {
-		UMLStructuralFeatureParser parser = new UMLStructuralFeatureParser(
-				UMLPackage.eINSTANCE.getNamedElement().getEStructuralFeature(
-						"name")); //$NON-NLS-1$
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser activityParameterNodeActivityParameterNodeName_4008Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getActivityParameterNodeActivityParameterNodeName_4008Parser() {
-		if (activityParameterNodeActivityParameterNodeName_4008Parser == null) {
-			activityParameterNodeActivityParameterNodeName_4008Parser = createActivityParameterNodeActivityParameterNodeName_4008Parser();
-		}
-		return activityParameterNodeActivityParameterNodeName_4008Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createActivityParameterNodeActivityParameterNodeName_4008Parser() {
-		UMLStructuralFeatureParser parser = new UMLStructuralFeatureParser(
-				UMLPackage.eINSTANCE.getNamedElement().getEStructuralFeature(
-						"name")); //$NON-NLS-1$
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser structuredActivityNodeStructuredActivityNodeName_4009Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getStructuredActivityNodeStructuredActivityNodeName_4009Parser() {
-		if (structuredActivityNodeStructuredActivityNodeName_4009Parser == null) {
-			structuredActivityNodeStructuredActivityNodeName_4009Parser = createStructuredActivityNodeStructuredActivityNodeName_4009Parser();
-		}
-		return structuredActivityNodeStructuredActivityNodeName_4009Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createStructuredActivityNodeStructuredActivityNodeName_4009Parser() {
-		UMLStructuralFeatureParser parser = new UMLStructuralFeatureParser(
-				UMLPackage.eINSTANCE.getNamedElement().getEStructuralFeature(
-						"name")); //$NON-NLS-1$
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser structuredActivityNodeStructuredActivityNodeName_4010Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getStructuredActivityNodeStructuredActivityNodeName_4010Parser() {
-		if (structuredActivityNodeStructuredActivityNodeName_4010Parser == null) {
-			structuredActivityNodeStructuredActivityNodeName_4010Parser = createStructuredActivityNodeStructuredActivityNodeName_4010Parser();
-		}
-		return structuredActivityNodeStructuredActivityNodeName_4010Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createStructuredActivityNodeStructuredActivityNodeName_4010Parser() {
-		UMLStructuralFeatureParser parser = new UMLStructuralFeatureParser(
-				UMLPackage.eINSTANCE.getNamedElement().getEStructuralFeature(
-						"name")); //$NON-NLS-1$
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser activityParameterNodeActivityParameterNodeName_4011Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getActivityParameterNodeActivityParameterNodeName_4011Parser() {
-		if (activityParameterNodeActivityParameterNodeName_4011Parser == null) {
-			activityParameterNodeActivityParameterNodeName_4011Parser = createActivityParameterNodeActivityParameterNodeName_4011Parser();
-		}
-		return activityParameterNodeActivityParameterNodeName_4011Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createActivityParameterNodeActivityParameterNodeName_4011Parser() {
-		UMLStructuralFeatureParser parser = new UMLStructuralFeatureParser(
-				UMLPackage.eINSTANCE.getNamedElement().getEStructuralFeature(
-						"name")); //$NON-NLS-1$
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser controlFlowControlFlowName_4012Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getControlFlowControlFlowName_4012Parser() {
-		if (controlFlowControlFlowName_4012Parser == null) {
-			controlFlowControlFlowName_4012Parser = createControlFlowControlFlowName_4012Parser();
-		}
-		return controlFlowControlFlowName_4012Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createControlFlowControlFlowName_4012Parser() {
-		UMLStructuralFeatureParser parser = new UMLStructuralFeatureParser(
-				UMLPackage.eINSTANCE.getNamedElement().getEStructuralFeature(
-						"name")); //$NON-NLS-1$
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser getParser(int visualID) {
-		switch (visualID) {
-		case ActivityPartitionNameEditPart.VISUAL_ID:
-			return getActivityPartitionActivityPartitionName_4006Parser();
-		case ActivityFinalNodeNameEditPart.VISUAL_ID:
-			return getActivityFinalNodeActivityFinalNodeName_4001Parser();
-		case MergeNodeNameEditPart.VISUAL_ID:
-			return getMergeNodeMergeNodeName_4002Parser();
-		case InitialNodeNameEditPart.VISUAL_ID:
-			return getInitialNodeInitialNodeName_4003Parser();
-		case DecisionNodeNameEditPart.VISUAL_ID:
-			return getDecisionNodeDecisionNodeName_4004Parser();
-		case StructuredActivityNodeNameEditPart.VISUAL_ID:
-			return getStructuredActivityNodeStructuredActivityNodeName_4005Parser();
-		case ActivityPartitionName2EditPart.VISUAL_ID:
-			return getActivityPartitionActivityPartitionName_4007Parser();
-		case ActivityParameterNodeNameEditPart.VISUAL_ID:
-			return getActivityParameterNodeActivityParameterNodeName_4008Parser();
-		case StructuredActivityNodeName2EditPart.VISUAL_ID:
-			return getStructuredActivityNodeStructuredActivityNodeName_4009Parser();
-		case StructuredActivityNodeName3EditPart.VISUAL_ID:
-			return getStructuredActivityNodeStructuredActivityNodeName_4010Parser();
-		case ActivityParameterNodeName2EditPart.VISUAL_ID:
-			return getActivityParameterNodeActivityParameterNodeName_4011Parser();
-		case ControlFlowNameEditPart.VISUAL_ID:
-			return getControlFlowControlFlowName_4012Parser();
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser(IAdaptable hint) {
-		String vid = (String) hint.getAdapter(String.class);
-		if (vid != null) {
-			return getParser(UMLVisualIDRegistry.getVisualID(vid));
-		}
-		View view = (View) hint.getAdapter(View.class);
-		if (view != null) {
-			return getParser(UMLVisualIDRegistry.getVisualID(view));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean provides(IOperation operation) {
-		if (operation instanceof GetParserOperation) {
-			IAdaptable hint = ((GetParserOperation) operation).getHint();
-			if (UMLElementTypes.getElement(hint) == null) {
-				return false;
-			}
-			return getParser(hint) != null;
-		}
-		return false;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLPropertyProvider.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLPropertyProvider.java
deleted file mode 100644
index 3d041a6..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLPropertyProvider.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
-//------------------------------------------------------------------------------
-/*
- * 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.providers;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.properties.GetPropertySourceOperation;
-import org.eclipse.gmf.runtime.common.ui.services.properties.ICompositePropertySource;
-import org.eclipse.gmf.runtime.common.ui.services.properties.IPropertiesProvider;
-import org.eclipse.gmf.runtime.emf.ui.properties.providers.GenericEMFPropertiesProvider;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-/**
- * @generated
- */
-public class UMLPropertyProvider extends GenericEMFPropertiesProvider implements
-		IPropertiesProvider {
-
-	/**
-	 * @generated
-	 */
-	public boolean provides(IOperation operation) {
-		if (operation instanceof GetPropertySourceOperation) {
-			Object object = ((GetPropertySourceOperation) operation)
-					.getObject();
-			return getSemanticElement(object) != null;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICompositePropertySource getPropertySource(Object object) {
-		EObject element = getSemanticElement(object);
-		if (element != null) {
-			return super.getPropertySource(element);
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getSemanticElement(Object object) {
-		View view = null;
-		if (object instanceof View) {
-			view = (View) object;
-		} else if (object instanceof EditPart) {
-			EditPart editPart = (EditPart) object;
-			if (editPart.getModel() instanceof View) {
-				view = (View) editPart.getModel();
-			}
-		}
-		if (view != null
-				&& ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-						.getModelID(view))) {
-			return view.getElement();
-		}
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLStructuralFeatureParser.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLStructuralFeatureParser.java
deleted file mode 100644
index 3108319..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLStructuralFeatureParser.java
+++ /dev/null
@@ -1,154 +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.providers;
-
-import java.text.FieldPosition;
-import java.text.MessageFormat;
-import java.util.Collections;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
-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.emf.commands.core.command.CompositeTransactionalCommand;
-
-/**
- * @generated
- */
-public class UMLStructuralFeatureParser extends UMLAbstractParser {
-
-	/**
-	 * @generated
-	 */
-	private static final MessageFormat DEFAULT_PROCESSOR = new MessageFormat(
-			"{0}"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private EStructuralFeature feature;
-
-	/**
-	 * @generated
-	 */
-	public UMLStructuralFeatureParser(EStructuralFeature feature) {
-		this.feature = feature;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected MessageFormat getViewProcessor() {
-		MessageFormat processor = super.getViewProcessor();
-		return processor == null ? DEFAULT_PROCESSOR : processor;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected MessageFormat getEditProcessor() {
-		MessageFormat processor = super.getEditProcessor();
-		return processor == null ? DEFAULT_PROCESSOR : processor;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getStringByPattern(IAdaptable adapter, int flags,
-			String pattern, MessageFormat processor) {
-		EObject element = (EObject) adapter.getAdapter(EObject.class);
-		Object value = element.eGet(feature);
-		value = getValidValue(feature, value);
-		return processor.format(new Object[] { value }, new StringBuffer(),
-				new FieldPosition(0)).toString();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParserEditStatus validateValues(Object[] values) {
-		if (values.length > 1) {
-			return ParserEditStatus.UNEDITABLE_STATUS;
-		}
-		Object value = values.length == 1 ? values[0] : null;
-		value = getValidNewValue(feature, value);
-		if (value instanceof InvalidValue) {
-			return new ParserEditStatus(EPFDiagramEditorPlugin.ID,
-					IParserEditStatus.UNEDITABLE, value.toString());
-		}
-		return ParserEditStatus.EDITABLE_STATUS;
-	}
-
-	/**
-	 * @modified
-	 */
-	public ICommand getParseCommand(IAdaptable adapter, Object[] values) {
-		EObject element = (EObject) adapter.getAdapter(EObject.class);
-		if (element == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		TransactionalEditingDomain editingDomain = TransactionUtil
-				.getEditingDomain(element);
-		if (editingDomain == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		Object value = values.length == 1 ? values[0] : null;
-		ICommand command = getModificationCommand(element, feature, value);
-		//		Collection<ICommand> col = new ArrayList<ICommand>();
-		//		col.add(command);
-		//		ICommand command1 = getUmaCommand(adapter, value);
-
-		//TODO: Change to Command. for undo action.
-		//		View view = (View)((View)adapter.getAdapter(View.class)).eContainer();
-		//		EAnnotation eAnnotation = view.getEAnnotation(Constants.UMA_SOURCE);
-		//		if(eAnnotation != null){
-		//			String guid = (String)eAnnotation.getDetails().get(Constants.UMA_ELEMENT_GUID);
-		//			ILibraryManager manager = LibraryService.getInstance().getCurrentLibraryManager();
-		//			MethodElement me = manager.getMethodElement(guid);
-		//			me.setName((String)value);
-		//			if(me instanceof DescribableElement){
-		//				((DescribableElement)me).setPresentationName((String)value);
-		//			}
-		//		}
-		return new CompositeTransactionalCommand(editingDomain, command
-				.getLabel(), Collections.singletonList(command));
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isAffectingEvent(Object event, int flags) {
-		if (event instanceof Notification) {
-			if (feature == ((Notification) event).getFeature()) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLStructuralFeaturesParser.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLStructuralFeaturesParser.java
deleted file mode 100644
index bee0edb..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLStructuralFeaturesParser.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
-//------------------------------------------------------------------------------
-/*
- * 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.providers;
-
-import java.text.FieldPosition;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
-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.emf.commands.core.command.CompositeTransactionalCommand;
-
-/**
- * @generated
- */
-public class UMLStructuralFeaturesParser extends UMLAbstractParser {
-
-	/**
-	 * @generated
-	 */
-	private List features;
-
-	/**
-	 * @generated
-	 */
-	public UMLStructuralFeaturesParser(List features) {
-		this.features = features;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getStringByPattern(IAdaptable adapter, int flags,
-			String pattern, MessageFormat processor) {
-		EObject element = (EObject) adapter.getAdapter(EObject.class);
-		List values = new ArrayList(features.size());
-		for (Iterator it = features.iterator(); it.hasNext();) {
-			EStructuralFeature feature = (EStructuralFeature) it.next();
-			Object value = element.eGet(feature);
-			value = getValidValue(feature, value);
-			values.add(value);
-		}
-		return processor.format(values.toArray(new Object[values.size()]),
-				new StringBuffer(), new FieldPosition(0)).toString();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParserEditStatus validateValues(Object[] values) {
-		if (values.length != features.size()) {
-			return ParserEditStatus.UNEDITABLE_STATUS;
-		}
-		for (int i = 0; i < values.length; i++) {
-			Object value = getValidNewValue((EStructuralFeature) features
-					.get(i), values[i]);
-			if (value instanceof InvalidValue) {
-				return new ParserEditStatus(EPFDiagramEditorPlugin.ID,
-						IParserEditStatus.UNEDITABLE, value.toString());
-			}
-		}
-		return ParserEditStatus.EDITABLE_STATUS;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICommand getParseCommand(IAdaptable adapter, Object[] values) {
-		EObject element = (EObject) adapter.getAdapter(EObject.class);
-		if (element == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		TransactionalEditingDomain editingDomain = TransactionUtil
-				.getEditingDomain(element);
-		if (editingDomain == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		CompositeTransactionalCommand command = new CompositeTransactionalCommand(
-				editingDomain, "Set Values"); //$NON-NLS-1$
-		for (int i = 0; i < values.length; i++) {
-			EStructuralFeature feature = (EStructuralFeature) features.get(i);
-			command
-					.compose(getModificationCommand(element, feature, values[i]));
-		}
-		return command;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isAffectingEvent(Object event, int flags) {
-		if (event instanceof Notification) {
-			Object feature = ((Notification) event).getFeature();
-			if (features.contains(feature)) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLViewProvider.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLViewProvider.java
deleted file mode 100644
index 906b46a..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/providers/UMLViewProvider.java
+++ /dev/null
@@ -1,228 +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.providers;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityFinalNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityFinalNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityParameterNode2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityParameterNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityParameterNodeName2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityParameterNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartition2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionName2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionPartitionCampartment2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionPartitionCampartmentEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ControlFlowEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ControlFlowNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.DecisionNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.DecisionNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ForkNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.InitialNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.InitialNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.JoinNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.MergeNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.MergeNodeNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNode2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNode3EditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeEditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeName2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeName3EditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeNameEditPart;
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-import org.eclipse.epf.diagramming.view.factories.ActivityFinalNodeNameViewFactory;
-import org.eclipse.epf.diagramming.view.factories.ActivityFinalNodeViewFactory;
-import org.eclipse.epf.diagramming.view.factories.ActivityParameterNode2ViewFactory;
-import org.eclipse.epf.diagramming.view.factories.ActivityParameterNodeName2ViewFactory;
-import org.eclipse.epf.diagramming.view.factories.ActivityParameterNodeNameViewFactory;
-import org.eclipse.epf.diagramming.view.factories.ActivityParameterNodeViewFactory;
-import org.eclipse.epf.diagramming.view.factories.ActivityPartition2ViewFactory;
-import org.eclipse.epf.diagramming.view.factories.ActivityPartitionName2ViewFactory;
-import org.eclipse.epf.diagramming.view.factories.ActivityPartitionNameViewFactory;
-import org.eclipse.epf.diagramming.view.factories.ActivityPartitionPartitionCampartment2ViewFactory;
-import org.eclipse.epf.diagramming.view.factories.ActivityPartitionPartitionCampartmentViewFactory;
-import org.eclipse.epf.diagramming.view.factories.ActivityPartitionViewFactory;
-import org.eclipse.epf.diagramming.view.factories.ActivityViewFactory;
-import org.eclipse.epf.diagramming.view.factories.ControlFlowNameViewFactory;
-import org.eclipse.epf.diagramming.view.factories.ControlFlowViewFactory;
-import org.eclipse.epf.diagramming.view.factories.DecisionNodeNameViewFactory;
-import org.eclipse.epf.diagramming.view.factories.DecisionNodeViewFactory;
-import org.eclipse.epf.diagramming.view.factories.ForkNodeViewFactory;
-import org.eclipse.epf.diagramming.view.factories.InitialNodeNameViewFactory;
-import org.eclipse.epf.diagramming.view.factories.InitialNodeViewFactory;
-import org.eclipse.epf.diagramming.view.factories.JoinNodeViewFactory;
-import org.eclipse.epf.diagramming.view.factories.MergeNodeNameViewFactory;
-import org.eclipse.epf.diagramming.view.factories.MergeNodeViewFactory;
-import org.eclipse.epf.diagramming.view.factories.StructuredActivityNode2ViewFactory;
-import org.eclipse.epf.diagramming.view.factories.StructuredActivityNode3ViewFactory;
-import org.eclipse.epf.diagramming.view.factories.StructuredActivityNodeName2ViewFactory;
-import org.eclipse.epf.diagramming.view.factories.StructuredActivityNodeName3ViewFactory;
-import org.eclipse.epf.diagramming.view.factories.StructuredActivityNodeNameViewFactory;
-import org.eclipse.epf.diagramming.view.factories.StructuredActivityNodeViewFactory;
-import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class UMLViewProvider extends AbstractViewProvider {
-
-	/**
-	 * @generated
-	 */
-	protected Class getDiagramViewClass(IAdaptable semanticAdapter,
-			String diagramKind) {
-		EObject semanticElement = getSemanticElement(semanticAdapter);
-		if (ActivityEditPart.MODEL_ID.equals(diagramKind)
-				&& UMLVisualIDRegistry.getDiagramVisualID(semanticElement) != -1) {
-			return ActivityViewFactory.class;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Class getNodeViewClass(IAdaptable semanticAdapter,
-			View containerView, String semanticHint) {
-		if (containerView == null) {
-			return null;
-		}
-		IElementType elementType = getSemanticElementType(semanticAdapter);
-		if (elementType != null
-				&& !UMLElementTypes.isKnownElementType(elementType)) {
-			return null;
-		}
-		EClass semanticType = getSemanticEClass(semanticAdapter);
-		EObject semanticElement = getSemanticElement(semanticAdapter);
-		int nodeVID = UMLVisualIDRegistry.getNodeVisualID(containerView,
-				semanticElement, semanticType, semanticHint);
-		switch (nodeVID) {
-		case ActivityFinalNodeEditPart.VISUAL_ID:
-			return ActivityFinalNodeViewFactory.class;
-		case ActivityFinalNodeNameEditPart.VISUAL_ID:
-			return ActivityFinalNodeNameViewFactory.class;
-		case MergeNodeEditPart.VISUAL_ID:
-			return MergeNodeViewFactory.class;
-		case MergeNodeNameEditPart.VISUAL_ID:
-			return MergeNodeNameViewFactory.class;
-		case ForkNodeEditPart.VISUAL_ID:
-			return ForkNodeViewFactory.class;
-		case InitialNodeEditPart.VISUAL_ID:
-			return InitialNodeViewFactory.class;
-		case InitialNodeNameEditPart.VISUAL_ID:
-			return InitialNodeNameViewFactory.class;
-		case DecisionNodeEditPart.VISUAL_ID:
-			return DecisionNodeViewFactory.class;
-		case DecisionNodeNameEditPart.VISUAL_ID:
-			return DecisionNodeNameViewFactory.class;
-		case JoinNodeEditPart.VISUAL_ID:
-			return JoinNodeViewFactory.class;
-		case StructuredActivityNodeEditPart.VISUAL_ID:
-			return StructuredActivityNodeViewFactory.class;
-		case StructuredActivityNodeNameEditPart.VISUAL_ID:
-			return StructuredActivityNodeNameViewFactory.class;
-		case ActivityPartitionEditPart.VISUAL_ID:
-			return ActivityPartitionViewFactory.class;
-		case ActivityPartitionName2EditPart.VISUAL_ID:
-			return ActivityPartitionName2ViewFactory.class;
-		case ActivityParameterNodeEditPart.VISUAL_ID:
-			return ActivityParameterNodeViewFactory.class;
-		case ActivityParameterNodeNameEditPart.VISUAL_ID:
-			return ActivityParameterNodeNameViewFactory.class;
-		case StructuredActivityNode2EditPart.VISUAL_ID:
-			return StructuredActivityNode2ViewFactory.class;
-		case StructuredActivityNodeName2EditPart.VISUAL_ID:
-			return StructuredActivityNodeName2ViewFactory.class;
-		case StructuredActivityNode3EditPart.VISUAL_ID:
-			return StructuredActivityNode3ViewFactory.class;
-		case StructuredActivityNodeName3EditPart.VISUAL_ID:
-			return StructuredActivityNodeName3ViewFactory.class;
-		case ActivityParameterNode2EditPart.VISUAL_ID:
-			return ActivityParameterNode2ViewFactory.class;
-		case ActivityParameterNodeName2EditPart.VISUAL_ID:
-			return ActivityParameterNodeName2ViewFactory.class;
-		case ActivityPartition2EditPart.VISUAL_ID:
-			return ActivityPartition2ViewFactory.class;
-		case ActivityPartitionNameEditPart.VISUAL_ID:
-			return ActivityPartitionNameViewFactory.class;
-		case ActivityPartitionPartitionCampartmentEditPart.VISUAL_ID:
-			return ActivityPartitionPartitionCampartmentViewFactory.class;
-		case ActivityPartitionPartitionCampartment2EditPart.VISUAL_ID:
-			return ActivityPartitionPartitionCampartment2ViewFactory.class;
-		case ControlFlowNameEditPart.VISUAL_ID:
-			return ControlFlowNameViewFactory.class;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Class getEdgeViewClass(IAdaptable semanticAdapter,
-			View containerView, String semanticHint) {
-		IElementType elementType = getSemanticElementType(semanticAdapter);
-		if (elementType != null
-				&& !UMLElementTypes.isKnownElementType(elementType)) {
-			return null;
-		}
-		EClass semanticType = getSemanticEClass(semanticAdapter);
-		if (semanticType == null) {
-			return null;
-		}
-		EObject semanticElement = getSemanticElement(semanticAdapter);
-		int linkVID = UMLVisualIDRegistry.getLinkWithClassVisualID(
-				semanticElement, semanticType);
-		switch (linkVID) {
-		case ControlFlowEditPart.VISUAL_ID:
-			return ControlFlowViewFactory.class;
-		}
-		return getUnrecognizedConnectorViewClass(semanticAdapter,
-				containerView, semanticHint);
-	}
-
-	/**
-	 * @generated
-	 */
-	private IElementType getSemanticElementType(IAdaptable semanticAdapter) {
-		if (semanticAdapter == null) {
-			return null;
-		}
-		return (IElementType) semanticAdapter.getAdapter(IElementType.class);
-	}
-
-	/**
-	 * @generated
-	 */
-	private Class getUnrecognizedConnectorViewClass(IAdaptable semanticAdapter,
-			View containerView, String semanticHint) {
-		// Handle unrecognized child node classes here
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityFinalNodeNameViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityFinalNodeNameViewFactory.java
deleted file mode 100644
index ff43c2d..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityFinalNodeNameViewFactory.java
+++ /dev/null
@@ -1,65 +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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractLabelViewFactory;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.diagram.ui.util.MeasurementUnitHelper;
-
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-
-import org.eclipse.gmf.runtime.notation.Location;
-
-/**
- * @generated
- */
-public class ActivityFinalNodeNameViewFactory extends AbstractLabelViewFactory {
-
-	/**
-	 * @generated
-	 */
-	public View createView(IAdaptable semanticAdapter, View containerView,
-			String semanticHint, int index, boolean persisted,
-			PreferencesHint preferencesHint) {
-		Node view = (Node) super.createView(semanticAdapter, containerView,
-				semanticHint, index, persisted, preferencesHint);
-		Location location = (Location) view.getLayoutConstraint();
-		IMapMode mapMode = MeasurementUnitHelper.getMapMode(containerView
-				.getDiagram().getMeasurementUnit());
-		location.setX(mapMode.DPtoLP(0));
-		location.setY(mapMode.DPtoLP(5));
-		return view;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		return styles;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityFinalNodeViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityFinalNodeViewFactory.java
deleted file mode 100644
index 7c20339..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityFinalNodeViewFactory.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
-//------------------------------------------------------------------------------
-/*
- * 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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityFinalNodeNameEditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class ActivityFinalNodeViewFactory extends AbstractShapeViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.ActivityFinalNodeEditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-		getViewService().createNode(
-				semanticAdapter,
-				view,
-				UMLVisualIDRegistry
-						.getType(ActivityFinalNodeNameEditPart.VISUAL_ID),
-				ViewUtil.APPEND, true, getPreferencesHint());
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityParameterNode2ViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityParameterNode2ViewFactory.java
deleted file mode 100644
index 17fb65f..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityParameterNode2ViewFactory.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
-//------------------------------------------------------------------------------
-/*
- * 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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityParameterNodeName2EditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class ActivityParameterNode2ViewFactory extends AbstractShapeViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.ActivityParameterNode2EditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-		getViewService().createNode(
-				semanticAdapter,
-				view,
-				UMLVisualIDRegistry
-						.getType(ActivityParameterNodeName2EditPart.VISUAL_ID),
-				ViewUtil.APPEND, true, getPreferencesHint());
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityParameterNodeName2ViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityParameterNodeName2ViewFactory.java
deleted file mode 100644
index 9bfa00c..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityParameterNodeName2ViewFactory.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
-//------------------------------------------------------------------------------
-/*
- * 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.view.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
-
-/**
- * @generated
- */
-public class ActivityParameterNodeName2ViewFactory extends BasicNodeViewFactory {
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		return styles;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityParameterNodeNameViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityParameterNodeNameViewFactory.java
deleted file mode 100644
index 0d61f92..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityParameterNodeNameViewFactory.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
-//------------------------------------------------------------------------------
-/*
- * 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.view.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
-
-/**
- * @generated
- */
-public class ActivityParameterNodeNameViewFactory extends BasicNodeViewFactory {
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		return styles;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityParameterNodeViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityParameterNodeViewFactory.java
deleted file mode 100644
index 866a9d3..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityParameterNodeViewFactory.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
-//------------------------------------------------------------------------------
-/*
- * 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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityParameterNodeNameEditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class ActivityParameterNodeViewFactory extends AbstractShapeViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.ActivityParameterNodeEditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-		getViewService().createNode(
-				semanticAdapter,
-				view,
-				UMLVisualIDRegistry
-						.getType(ActivityParameterNodeNameEditPart.VISUAL_ID),
-				ViewUtil.APPEND, true, getPreferencesHint());
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartition2ViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartition2ViewFactory.java
deleted file mode 100644
index c7fb15a..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartition2ViewFactory.java
+++ /dev/null
@@ -1,99 +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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionNameEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionPartitionCampartment2EditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class ActivityPartition2ViewFactory extends AbstractShapeViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.ActivityPartition2EditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-		getViewService().createNode(
-				semanticAdapter,
-				view,
-				UMLVisualIDRegistry
-						.getType(ActivityPartitionNameEditPart.VISUAL_ID),
-				ViewUtil.APPEND, true, getPreferencesHint());
-		getViewService()
-				.createNode(
-						semanticAdapter,
-						view,
-						UMLVisualIDRegistry
-								.getType(ActivityPartitionPartitionCampartment2EditPart.VISUAL_ID),
-						ViewUtil.APPEND, true, getPreferencesHint());
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartitionName2ViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartitionName2ViewFactory.java
deleted file mode 100644
index b4b378c..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartitionName2ViewFactory.java
+++ /dev/null
@@ -1,81 +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.view.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.notation.Location;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.util.MeasurementUnitHelper;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-
-/**
- * @generated
- */
-public class ActivityPartitionName2ViewFactory extends AbstractShapeViewFactory {
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		return styles;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory#createView(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.notation.View, java.lang.String, int, boolean, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)
-	 * @modified
-	 */
-	public View createView(IAdaptable semanticAdapter, View containerView,
-			String semanticHint, int index, boolean persisted,
-			PreferencesHint preferencesHint) {
-		Node view = (Node) super.createView(semanticAdapter, containerView,
-				semanticHint, index, persisted, preferencesHint);
-		Location location = (Location) view.getLayoutConstraint();
-		IMapMode mapMode = MeasurementUnitHelper.getMapMode(containerView
-				.getDiagram().getMeasurementUnit());
-		location.setX(mapMode.DPtoLP(0));
-		location.setY(mapMode.DPtoLP(5));
-		return view;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartitionNameViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartitionNameViewFactory.java
deleted file mode 100644
index 5e2bf76..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartitionNameViewFactory.java
+++ /dev/null
@@ -1,59 +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.view.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-
-/**
- * @generated
- */
-public class ActivityPartitionNameViewFactory extends AbstractShapeViewFactory {
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		return styles;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartitionPartitionCampartment2ViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartitionPartitionCampartment2ViewFactory.java
deleted file mode 100644
index 24a5044..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartitionPartitionCampartment2ViewFactory.java
+++ /dev/null
@@ -1,148 +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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.ListCompartmentViewFactory;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-
-import org.eclipse.gmf.runtime.notation.DrawerStyle;
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.TitleStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * @generated
- */
-public class ActivityPartitionPartitionCampartment2ViewFactory extends
-		ListCompartmentViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createSortingStyle());
-		styles.add(NotationFactory.eINSTANCE.createFilteringStyle());
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.ActivityPartitionPartitionCampartment2EditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		setupCompartmentTitle(view);
-		setupCompartmentCollapsed(view);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutConstraint createLayoutConstraint() {
-		return NotationFactory.eINSTANCE.createBounds();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeFromPreferences(View view) {
-		super.initializeFromPreferences(view);
-
-		IPreferenceStore store = (IPreferenceStore) getPreferencesHint()
-				.getPreferenceStore();
-
-		// fill color
-		RGB fillRGB = PreferenceConverter.getColor(store,
-				IPreferenceConstants.PREF_FILL_COLOR);
-		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE
-				.getFillStyle_FillColor(), FigureUtilities
-				.RGBToInteger(fillRGB));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setupCompartmentTitle(View view) {
-		TitleStyle titleStyle = (TitleStyle) view
-				.getStyle(NotationPackage.eINSTANCE.getTitleStyle());
-		if (titleStyle != null) {
-			titleStyle.setShowTitle(true);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setupCompartmentCollapsed(View view) {
-		DrawerStyle drawerStyle = (DrawerStyle) view
-				.getStyle(NotationPackage.eINSTANCE.getDrawerStyle());
-		if (drawerStyle != null) {
-			drawerStyle.setCollapsed(false);
-		}
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartitionPartitionCampartmentViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartitionPartitionCampartmentViewFactory.java
deleted file mode 100644
index d1d5e77..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartitionPartitionCampartmentViewFactory.java
+++ /dev/null
@@ -1,148 +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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.ListCompartmentViewFactory;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-
-import org.eclipse.gmf.runtime.notation.DrawerStyle;
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.TitleStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * @generated
- */
-public class ActivityPartitionPartitionCampartmentViewFactory extends
-		ListCompartmentViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createSortingStyle());
-		styles.add(NotationFactory.eINSTANCE.createFilteringStyle());
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.ActivityPartitionPartitionCampartmentEditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		setupCompartmentTitle(view);
-		setupCompartmentCollapsed(view);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutConstraint createLayoutConstraint() {
-		return NotationFactory.eINSTANCE.createBounds();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeFromPreferences(View view) {
-		super.initializeFromPreferences(view);
-
-		IPreferenceStore store = (IPreferenceStore) getPreferencesHint()
-				.getPreferenceStore();
-
-		// fill color
-		RGB fillRGB = PreferenceConverter.getColor(store,
-				IPreferenceConstants.PREF_FILL_COLOR);
-		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE
-				.getFillStyle_FillColor(), FigureUtilities
-				.RGBToInteger(fillRGB));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setupCompartmentTitle(View view) {
-		TitleStyle titleStyle = (TitleStyle) view
-				.getStyle(NotationPackage.eINSTANCE.getTitleStyle());
-		if (titleStyle != null) {
-			titleStyle.setShowTitle(true);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setupCompartmentCollapsed(View view) {
-		DrawerStyle drawerStyle = (DrawerStyle) view
-				.getStyle(NotationPackage.eINSTANCE.getDrawerStyle());
-		if (drawerStyle != null) {
-			drawerStyle.setCollapsed(false);
-		}
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartitionViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartitionViewFactory.java
deleted file mode 100644
index 466ebce..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityPartitionViewFactory.java
+++ /dev/null
@@ -1,99 +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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionName2EditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionPartitionCampartmentEditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class ActivityPartitionViewFactory extends AbstractShapeViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.ActivityPartitionEditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-		getViewService().createNode(
-				semanticAdapter,
-				view,
-				UMLVisualIDRegistry
-						.getType(ActivityPartitionName2EditPart.VISUAL_ID),
-				ViewUtil.APPEND, true, getPreferencesHint());
-		getViewService()
-				.createNode(
-						semanticAdapter,
-						view,
-						UMLVisualIDRegistry
-								.getType(ActivityPartitionPartitionCampartmentEditPart.VISUAL_ID),
-						ViewUtil.APPEND, true, getPreferencesHint());
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityViewFactory.java
deleted file mode 100644
index 4c4fa6d..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ActivityViewFactory.java
+++ /dev/null
@@ -1,110 +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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.diagramming.base.view.DiagramImpl;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class ActivityViewFactory extends DiagramViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createPageStyle());
-		styles.add(NotationFactory.eINSTANCE.createGuideStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View view, IAdaptable semanticAdapter,
-			String diagramKind) {
-		super.decorateView(view, semanticAdapter, diagramKind);
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory#createDiagram(org.eclipse.core.runtime.IAdaptable, java.lang.String, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)
-	 * @modified
-	 */
-	public Diagram createDiagram(IAdaptable semanticAdapter,
-			String diagramKind, PreferencesHint thePreferencesHint) {
-		setPreferencesHint(thePreferencesHint);
-		Diagram diagram = new DiagramImpl();
-		List styles = createStyles(diagram);
-		if (styles.size() > 0) {
-			diagram.getStyles().addAll(styles);
-		}
-
-		if (diagramKind != null)
-			diagram.setType(diagramKind);
-		if (semanticAdapter != null)
-			diagram.setElement((EObject) semanticAdapter
-					.getAdapter(EObject.class));
-		else
-			// enforce a set to NULL
-			diagram.setElement(null);
-
-		initializeMeasurementUnit(diagram);
-
-		// do the necessary initializations (creating children, setting properties...etc)
-		decorateView(diagram, semanticAdapter, diagramKind);
-
-		return diagram;
-	}
-
-	/**
-	 * 
-	 * @param diagram
-	 * @custom
-	 */
-	private void initializeMeasurementUnit(Diagram diagram) {
-		if (!diagram.isSetMeasurementUnit()) {
-			diagram.setMeasurementUnit(getMeasurementUnit());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected MeasurementUnit getMeasurementUnit() {
-		return MeasurementUnit.PIXEL_LITERAL;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ControlFlowNameViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ControlFlowNameViewFactory.java
deleted file mode 100644
index 343a343..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ControlFlowNameViewFactory.java
+++ /dev/null
@@ -1,65 +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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractLabelViewFactory;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.diagram.ui.util.MeasurementUnitHelper;
-
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-
-import org.eclipse.gmf.runtime.notation.Location;
-
-/**
- * @generated
- */
-public class ControlFlowNameViewFactory extends AbstractLabelViewFactory {
-
-	/**
-	 * @generated
-	 */
-	public View createView(IAdaptable semanticAdapter, View containerView,
-			String semanticHint, int index, boolean persisted,
-			PreferencesHint preferencesHint) {
-		Node view = (Node) super.createView(semanticAdapter, containerView,
-				semanticHint, index, persisted, preferencesHint);
-		Location location = (Location) view.getLayoutConstraint();
-		IMapMode mapMode = MeasurementUnitHelper.getMapMode(containerView
-				.getDiagram().getMeasurementUnit());
-		location.setX(mapMode.DPtoLP(0));
-		location.setY(mapMode.DPtoLP(40));
-		return view;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		return styles;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ControlFlowViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ControlFlowViewFactory.java
deleted file mode 100644
index f23b633..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ControlFlowViewFactory.java
+++ /dev/null
@@ -1,186 +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.view.factories;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-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.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.transaction.Transaction;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ControlFlowNameEditPart;
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.ConnectionViewFactory;
-import org.eclipse.gmf.runtime.notation.Bendpoints;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class ControlFlowViewFactory extends ConnectionViewFactory {
-
-	private static final Map options = new HashMap();
-	static {
-		options.put(Transaction.OPTION_UNPROTECTED, Boolean.TRUE);
-		options.put(Transaction.OPTION_NO_NOTIFICATIONS, Boolean.TRUE);
-		options.put(Transaction.OPTION_NO_TRIGGERS, Boolean.TRUE);
-	}
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createRoutingStyle());
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.ControlFlowEditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-		getViewService().createNode(semanticAdapter, view,
-				UMLVisualIDRegistry.getType(ControlFlowNameEditPart.VISUAL_ID),
-				ViewUtil.APPEND, true, getPreferencesHint());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.core.view.factories.ViewFactory#createView(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.notation.View, java.lang.String, int, boolean, java.lang.String)
-	 * 
-	 * Overrode createView since there is a bug in 
-	 * org.eclipse.gmf.runtime.diagram.ui.view.factories.ConnectionViewFactory.java
-	 */
-	public View createView(final IAdaptable semanticAdapter,
-			final View containerView, final String semanticHint,
-			final int index, final boolean persisted,
-			final PreferencesHint preferencesHint) {
-
-		setPreferencesHint(preferencesHint);
-
-		final Edge edge = NotationFactory.eINSTANCE.createEdge();
-		List styles = createStyles(edge);
-		if (styles.size() > 0) {
-			edge.getStyles().addAll(styles);
-		}
-
-		Bendpoints bendPoints = createBendpoints();
-		if (bendPoints != null) {
-			edge.setBendpoints(bendPoints);
-		}
-
-		EObject semanticEl = semanticAdapter == null ? null
-				: (EObject) semanticAdapter.getAdapter(EObject.class);
-		if (semanticEl == null)
-			// enforce a set to NULL
-			edge.setElement(null);
-		else if (requiresElement(semanticAdapter, containerView)) {
-			edge.setElement(semanticEl);
-		}
-
-		edge.setType(semanticHint);
-
-		// decorate view assumes the view had been inserted already, so 
-		// we had to call insert child before calling decorate view
-		ViewUtil.insertChildView(containerView, edge, index, persisted);
-
-		TransactionalEditingDomain domain = getEditingDomain(semanticEl,
-				containerView);
-
-		if (domain != null) {
-			if (isUnProtectedSilentTransactionInProgress(domain)) {
-				// decorate view had to run as a silent operation other wise
-				// it will generate too many events
-				decorateView(containerView, edge, semanticAdapter,
-						semanticHint, index, true);
-
-			} else {
-				AbstractEMFOperation operation = new AbstractEMFOperation(
-						domain, StringStatics.BLANK, options) {
-
-					protected IStatus doExecute(IProgressMonitor monitor,
-							IAdaptable info) throws ExecutionException {
-						decorateView(containerView, edge, semanticAdapter,
-								semanticHint, index, true);
-
-						return Status.OK_STATUS;
-					}
-				};
-				try {
-					operation.execute(new NullProgressMonitor(), null);
-				} catch (ExecutionException e) {
-					Trace.catching(DiagramUIPlugin.getInstance(),
-							DiagramUIDebugOptions.EXCEPTIONS_CATCHING,
-							getClass(), "createView", e); //$NON-NLS-1$
-					Log.warning(DiagramUIPlugin.getInstance(),
-							DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-							"createView", e); //$NON-NLS-1$
-				}
-			}
-		}
-
-		return edge;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/DecisionNodeNameViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/DecisionNodeNameViewFactory.java
deleted file mode 100644
index 71cf119..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/DecisionNodeNameViewFactory.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
-//------------------------------------------------------------------------------
-/*
- * 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.view.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
-
-/**
- * @generated
- */
-public class DecisionNodeNameViewFactory extends BasicNodeViewFactory {
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		return styles;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/DecisionNodeViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/DecisionNodeViewFactory.java
deleted file mode 100644
index 35833d7..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/DecisionNodeViewFactory.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
-//------------------------------------------------------------------------------
-/*
- * 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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.DecisionNodeNameEditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class DecisionNodeViewFactory extends AbstractShapeViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.DecisionNodeEditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-		getViewService()
-				.createNode(
-						semanticAdapter,
-						view,
-						UMLVisualIDRegistry
-								.getType(DecisionNodeNameEditPart.VISUAL_ID),
-						ViewUtil.APPEND, true, getPreferencesHint());
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ForkNodeViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ForkNodeViewFactory.java
deleted file mode 100644
index df4c51c..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/ForkNodeViewFactory.java
+++ /dev/null
@@ -1,85 +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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ForkNodeNameEditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class ForkNodeViewFactory extends AbstractShapeViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.ForkNodeEditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/InitialNodeNameViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/InitialNodeNameViewFactory.java
deleted file mode 100644
index ef2dc58..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/InitialNodeNameViewFactory.java
+++ /dev/null
@@ -1,65 +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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractLabelViewFactory;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.diagram.ui.util.MeasurementUnitHelper;
-
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-
-import org.eclipse.gmf.runtime.notation.Location;
-
-/**
- * @generated
- */
-public class InitialNodeNameViewFactory extends AbstractLabelViewFactory {
-
-	/**
-	 * @generated
-	 */
-	public View createView(IAdaptable semanticAdapter, View containerView,
-			String semanticHint, int index, boolean persisted,
-			PreferencesHint preferencesHint) {
-		Node view = (Node) super.createView(semanticAdapter, containerView,
-				semanticHint, index, persisted, preferencesHint);
-		Location location = (Location) view.getLayoutConstraint();
-		IMapMode mapMode = MeasurementUnitHelper.getMapMode(containerView
-				.getDiagram().getMeasurementUnit());
-		location.setX(mapMode.DPtoLP(0));
-		location.setY(mapMode.DPtoLP(5));
-		return view;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		return styles;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/InitialNodeViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/InitialNodeViewFactory.java
deleted file mode 100644
index e7b220b..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/InitialNodeViewFactory.java
+++ /dev/null
@@ -1,88 +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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.InitialNodeNameEditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class InitialNodeViewFactory extends AbstractShapeViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.InitialNodeEditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-		getViewService().createNode(semanticAdapter, view,
-				UMLVisualIDRegistry.getType(InitialNodeNameEditPart.VISUAL_ID),
-				ViewUtil.APPEND, true, getPreferencesHint());
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/JoinNodeViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/JoinNodeViewFactory.java
deleted file mode 100644
index 1e9df86..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/JoinNodeViewFactory.java
+++ /dev/null
@@ -1,85 +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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.JoinNodeNameEditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class JoinNodeViewFactory extends AbstractShapeViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.JoinNodeEditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/MergeNodeNameViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/MergeNodeNameViewFactory.java
deleted file mode 100644
index 6cfd96c..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/MergeNodeNameViewFactory.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
-//------------------------------------------------------------------------------
-/*
- * 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.view.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
-
-/**
- * @generated
- */
-public class MergeNodeNameViewFactory extends BasicNodeViewFactory {
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		return styles;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/MergeNodeViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/MergeNodeViewFactory.java
deleted file mode 100644
index 05cbd1e..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/MergeNodeViewFactory.java
+++ /dev/null
@@ -1,88 +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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.MergeNodeNameEditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class MergeNodeViewFactory extends AbstractShapeViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.MergeNodeEditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-		getViewService().createNode(semanticAdapter, view,
-				UMLVisualIDRegistry.getType(MergeNodeNameEditPart.VISUAL_ID),
-				ViewUtil.APPEND, true, getPreferencesHint());
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNode2ViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNode2ViewFactory.java
deleted file mode 100644
index bc43b45..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNode2ViewFactory.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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeName2EditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class StructuredActivityNode2ViewFactory extends
-		AbstractShapeViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.StructuredActivityNode2EditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-		getViewService()
-				.createNode(
-						semanticAdapter,
-						view,
-						UMLVisualIDRegistry
-								.getType(StructuredActivityNodeName2EditPart.VISUAL_ID),
-						ViewUtil.APPEND, true, getPreferencesHint());
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNode3ViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNode3ViewFactory.java
deleted file mode 100644
index 4aebea4..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNode3ViewFactory.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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeName3EditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class StructuredActivityNode3ViewFactory extends
-		AbstractShapeViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.StructuredActivityNode3EditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-		getViewService()
-				.createNode(
-						semanticAdapter,
-						view,
-						UMLVisualIDRegistry
-								.getType(StructuredActivityNodeName3EditPart.VISUAL_ID),
-						ViewUtil.APPEND, true, getPreferencesHint());
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNodeName2ViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNodeName2ViewFactory.java
deleted file mode 100644
index 1e47417..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNodeName2ViewFactory.java
+++ /dev/null
@@ -1,54 +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.view.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
-
-/**
- * @generated
- */
-public class StructuredActivityNodeName2ViewFactory extends
-		BasicNodeViewFactory {
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		return styles;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNodeName3ViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNodeName3ViewFactory.java
deleted file mode 100644
index d454318..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNodeName3ViewFactory.java
+++ /dev/null
@@ -1,54 +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.view.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
-
-/**
- * @generated
- */
-public class StructuredActivityNodeName3ViewFactory extends
-		BasicNodeViewFactory {
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		return styles;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNodeNameViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNodeNameViewFactory.java
deleted file mode 100644
index c2ba9ea..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNodeNameViewFactory.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
-//------------------------------------------------------------------------------
-/*
- * 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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class StructuredActivityNodeNameViewFactory extends BasicNodeViewFactory {
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		return styles;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNodeViewFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNodeViewFactory.java
deleted file mode 100644
index ce898c6..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/view/factories/StructuredActivityNodeViewFactory.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
-//------------------------------------------------------------------------------
-/*
- * 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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeNameEditPart;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class StructuredActivityNodeViewFactory extends AbstractShapeViewFactory {
-
-	/**
-	 * @generated 
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createFontStyle());
-		styles.add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		styles.add(NotationFactory.eINSTANCE.createFillStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineStyle());
-		return styles;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		if (semanticHint == null) {
-			semanticHint = UMLVisualIDRegistry
-					.getType(org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeEditPart.VISUAL_ID);
-			view.setType(semanticHint);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-				index, persisted);
-		if (!ActivityEditPart.MODEL_ID.equals(UMLVisualIDRegistry
-				.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
-					.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put(
-					"modelID", ActivityEditPart.MODEL_ID); //$NON-NLS-1$
-			view.getEAnnotations().add(shortcutAnnotation);
-		}
-		getViewService().createNode(
-				semanticAdapter,
-				view,
-				UMLVisualIDRegistry
-						.getType(StructuredActivityNodeNameEditPart.VISUAL_ID),
-				ViewUtil.APPEND, true, getPreferencesHint());
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/.classpath b/plugins/org.eclipse.epf.authoring.ui/.classpath
deleted file mode 100755
index 84205b2..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="com/ibm/uma/authoring/views/BSEditorView.java|com/ibm/uma/authoring/views/ContentPackageTab.java|com/ibm/uma/authoring/views/GuidanceTab.java|com/ibm/uma/authoring/views/ProductEditorView.java|com/ibm/uma/authoring/views/ProductViewer.java|com/ibm/uma/authoring/views/RoleDocumentationTab.java|com/ibm/uma/authoring/views/RoleTasksTab.java|com/ibm/uma/authoring/views/RoleWorkProductsTab.java|com/ibm/uma/authoring/views/TaskDisciplineTab.java|com/ibm/uma/authoring/views/TaskDocumentationTab.java|com/ibm/uma/authoring/views/TaskGuidancesTab.java|com/ibm/uma/authoring/views/TaskStepTab.java|com/ibm/uma/authoring/views/WorkProductDocumentationTab.java|com/ibm/uma/authoring/views/WorkProductGuidancesTab.java|com/ibm/uma/authoring/views/WorkProductTasksTab.java" kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.authoring.ui/.cvsignore b/plugins/org.eclipse.epf.authoring.ui/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.authoring.ui/.options b/plugins/org.eclipse.epf.authoring.ui/.options
deleted file mode 100755
index 499b328..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-# Turn on debug trace for the Authoring UI plug-in
-org.eclipse.epf.authoring.ui/debug=true
diff --git a/plugins/org.eclipse.epf.authoring.ui/.project b/plugins/org.eclipse.epf.authoring.ui/.project
deleted file mode 100755
index 623352b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.authoring.ui</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/plugins/org.eclipse.epf.authoring.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.epf.authoring.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100755
index 86bb2ac..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Nov 29 18:09:49 PST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/plugins/org.eclipse.epf.authoring.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.authoring.ui/META-INF/MANIFEST.MF
deleted file mode 100755
index 4209f01..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,50 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.authoring.ui; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.epf.authoring.ui.AuthoringUIPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.epf.library.xmi,
- org.eclipse.epf.library.ui;visibility:=reexport,
- org.eclipse.epf.richtext,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.draw2d,
- org.eclipse.gef,
- org.eclipse.ui.cheatsheets,
- org.eclipse.ui.forms,
- org.eclipse.ui.intro,
- org.eclipse.ui.views.properties.tabbed,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.epf.validation,
- org.eclipse.team.cvs.ui,
- org.eclipse.epf.diagramming,
- org.eclipse.epf.diagram.add,
- org.eclipse.epf.diagram.wpdd,
- org.eclipse.search,
- org.eclipse.gmf.runtime.draw2d.ui.render,
- org.eclipse.gmf.runtime.draw2d.ui.render.awt
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.authoring.gef.commands,
- org.eclipse.epf.authoring.gef.edit,
- org.eclipse.epf.authoring.gef.edit.policies,
- org.eclipse.epf.authoring.gef.figures,
- org.eclipse.epf.authoring.gef.util,
- org.eclipse.epf.authoring.gef.viewer,
- org.eclipse.epf.authoring.ui,
- org.eclipse.epf.authoring.ui.actions,
- org.eclipse.epf.authoring.ui.celleditors,
- org.eclipse.epf.authoring.ui.cheatsheets.actions,
- org.eclipse.epf.authoring.ui.dialogs,
- org.eclipse.epf.authoring.ui.dnd,
- org.eclipse.epf.authoring.ui.editors,
- org.eclipse.epf.authoring.ui.filters,
- org.eclipse.epf.authoring.ui.forms,
- org.eclipse.epf.authoring.ui.preferences,
- org.eclipse.epf.authoring.ui.properties,
- org.eclipse.epf.authoring.ui.richtext,
- org.eclipse.epf.authoring.ui.util,
- org.eclipse.epf.authoring.ui.views,
- org.eclipse.epf.authoring.ui.wizards
diff --git a/plugins/org.eclipse.epf.authoring.ui/build.properties b/plugins/org.eclipse.epf.authoring.ui/build.properties
deleted file mode 100755
index e6fe78d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               .options,\
-               META-INF/,\
-               help/,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml
-
diff --git a/plugins/org.eclipse.epf.authoring.ui/help/book.xml b/plugins/org.eclipse.epf.authoring.ui/help/book.xml
deleted file mode 100755
index 87b0818..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/help/book.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<toc label="EPF Composer Method Authroing Help Page"  topic="html/book.html">
-	<topic label="Mthod Authoring Overview" href="html/overview.html"/>
-	<topic label="Authoring Tutorial" href="html/tutorial.html"/>
-</toc>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/Iteration16.gif b/plugins/org.eclipse.epf.authoring.ui/icons/Iteration16.gif
deleted file mode 100755
index 4311e46..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/Iteration16.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/Phase16.gif b/plugins/org.eclipse.epf.authoring.ui/icons/Phase16.gif
deleted file mode 100755
index ad60bd9..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/Phase16.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/RoleDescriptor.gif b/plugins/org.eclipse.epf.authoring.ui/icons/RoleDescriptor.gif
deleted file mode 100755
index 368c7b8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/RoleDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/SynchBar16.gif b/plugins/org.eclipse.epf.authoring.ui/icons/SynchBar16.gif
deleted file mode 100755
index bc9944a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/SynchBar16.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/SynchBar24.gif b/plugins/org.eclipse.epf.authoring.ui/icons/SynchBar24.gif
deleted file mode 100755
index bc9944a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/SynchBar24.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/TaskDescriptor.gif b/plugins/org.eclipse.epf.authoring.ui/icons/TaskDescriptor.gif
deleted file mode 100755
index 554e26e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/TaskDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/Template.gif b/plugins/org.eclipse.epf.authoring.ui/icons/Template.gif
deleted file mode 100755
index c763251..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/Template.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/TemplateDescription.gif b/plugins/org.eclipse.epf.authoring.ui/icons/TemplateDescription.gif
deleted file mode 100755
index c763251..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/TemplateDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/activity.gif b/plugins/org.eclipse.epf.authoring.ui/icons/activity.gif
deleted file mode 100755
index 77393e6..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/activity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/activity16.gif b/plugins/org.eclipse.epf.authoring.ui/icons/activity16.gif
deleted file mode 100755
index cf20deb..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/activity16.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/activity24.gif b/plugins/org.eclipse.epf.authoring.ui/icons/activity24.gif
deleted file mode 100755
index cf20deb..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/activity24.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/addAllDependentElem.gif b/plugins/org.eclipse.epf.authoring.ui/icons/addAllDependentElem.gif
deleted file mode 100755
index 9cacb96..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/addAllDependentElem.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/addref_co.gif b/plugins/org.eclipse.epf.authoring.ui/icons/addref_co.gif
deleted file mode 100755
index 6840cd9..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/addref_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/checked.gif b/plugins/org.eclipse.epf.authoring.ui/icons/checked.gif
deleted file mode 100755
index d6344db..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/checked.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/closure_co.gif b/plugins/org.eclipse.epf.authoring.ui/icons/closure_co.gif
deleted file mode 100755
index 8b5541a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/closure_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/collapseall.gif b/plugins/org.eclipse.epf.authoring.ui/icons/collapseall.gif
deleted file mode 100755
index a2d80a9..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/collapseall.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/collapsed.gif b/plugins/org.eclipse.epf.authoring.ui/icons/collapsed.gif
deleted file mode 100755
index 5f4c8bb..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/collapsed.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/connection16.gif b/plugins/org.eclipse.epf.authoring.ui/icons/connection16.gif
deleted file mode 100755
index 186a127..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/connection16.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/connection24.gif b/plugins/org.eclipse.epf.authoring.ui/icons/connection24.gif
deleted file mode 100755
index 66a5fe7..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/connection24.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/conwarn_co.gif b/plugins/org.eclipse.epf.authoring.ui/icons/conwarn_co.gif
deleted file mode 100755
index 5b50c06..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/conwarn_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/decnode_pal16.gif b/plugins/org.eclipse.epf.authoring.ui/icons/decnode_pal16.gif
deleted file mode 100755
index 715a5b4..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/decnode_pal16.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/decnode_pal24.gif b/plugins/org.eclipse.epf.authoring.ui/icons/decnode_pal24.gif
deleted file mode 100755
index 246eaa1..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/decnode_pal24.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/endnode_pal16.gif b/plugins/org.eclipse.epf.authoring.ui/icons/endnode_pal16.gif
deleted file mode 100755
index d06506d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/endnode_pal16.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/endnode_pal24.gif b/plugins/org.eclipse.epf.authoring.ui/icons/endnode_pal24.gif
deleted file mode 100755
index cb177fd..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/endnode_pal24.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/error.gif b/plugins/org.eclipse.epf.authoring.ui/icons/error.gif
deleted file mode 100755
index c5e7a94..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/error.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/expandall.gif b/plugins/org.eclipse.epf.authoring.ui/icons/expandall.gif
deleted file mode 100755
index 0205b29..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/expandall.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/expanded.gif b/plugins/org.eclipse.epf.authoring.ui/icons/expanded.gif
deleted file mode 100755
index ff4d9c4..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/expanded.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/freetext_pal16.gif b/plugins/org.eclipse.epf.authoring.ui/icons/freetext_pal16.gif
deleted file mode 100755
index bdb813f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/freetext_pal16.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/freetext_pal24.gif b/plugins/org.eclipse.epf.authoring.ui/icons/freetext_pal24.gif
deleted file mode 100755
index 88b4e06..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/freetext_pal24.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/Pres_name_toggle.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/Pres_name_toggle.gif
deleted file mode 100755
index 570afaf..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/Pres_name_toggle.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/Print.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/Print.gif
deleted file mode 100755
index 045de75..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/Print.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/Refresh.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/Refresh.gif
deleted file mode 100755
index 3ca04d0..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/Refresh.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/Stop.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/Stop.gif
deleted file mode 100755
index 120823b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/Stop.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/flatLayout.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/flatLayout.gif
deleted file mode 100755
index 1ef74cf..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/flatLayout.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/hierarchicalLayout.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/hierarchicalLayout.gif
deleted file mode 100755
index 2344861..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/hierarchicalLayout.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/move_down.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/move_down.gif
deleted file mode 100755
index 1d43e17..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/move_down.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/move_down_disabled.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/move_down_disabled.gif
deleted file mode 100755
index b0dcf51..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/move_down_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/move_up.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/move_up.gif
deleted file mode 100755
index fd74706..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/move_up.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/move_up_disabled.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/move_up_disabled.gif
deleted file mode 100755
index b62df18..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/move_up_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/show_linked_element.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/show_linked_element.gif
deleted file mode 100755
index d684f7e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/show_linked_element.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/show_linked_element_disabled.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/show_linked_element_disabled.gif
deleted file mode 100755
index 0a7f8fc..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/show_linked_element_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/synced.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/synced.gif
deleted file mode 100755
index 81a7602..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/etool16/synced.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Activity.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Activity.gif
deleted file mode 100755
index cf20deb..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Activity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Check.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Check.gif
deleted file mode 100755
index a289722..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Check.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Collapsed.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Collapsed.gif
deleted file mode 100755
index db33c38..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Collapsed.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/DisableCheck.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/DisableCheck.gif
deleted file mode 100755
index f367376..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/DisableCheck.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/DisableUncheck.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/DisableUncheck.gif
deleted file mode 100755
index ee2a78e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/DisableUncheck.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Expanded.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Expanded.gif
deleted file mode 100755
index 6357454..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Expanded.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/MethodConfiguration.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/MethodConfiguration.gif
deleted file mode 100755
index de89602..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/MethodConfiguration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/MethodElement.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/MethodElement.gif
deleted file mode 100755
index c4fb30e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/MethodElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/MethodLibrary.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/MethodLibrary.gif
deleted file mode 100755
index 00a311e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/MethodLibrary.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/MethodPlugin.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/MethodPlugin.gif
deleted file mode 100755
index bb82c39..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/MethodPlugin.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Process.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Process.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Process.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Uncheck.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Uncheck.gif
deleted file mode 100755
index c4fa963..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/Uncheck.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/WorkProductDescriptor.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/WorkProductDescriptor.gif
deleted file mode 100755
index 6218229..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/obj16/WorkProductDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/ovr16/error_ovr.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/ovr16/error_ovr.gif
deleted file mode 100755
index c112416..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/ovr16/error_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/AuthoringPerspective.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/AuthoringPerspective.gif
deleted file mode 100755
index 00a311e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/AuthoringPerspective.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/BrowsingPerspective.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/BrowsingPerspective.gif
deleted file mode 100755
index de89602..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/BrowsingPerspective.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/ConfigurationErrorLogView.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/ConfigurationErrorLogView.gif
deleted file mode 100755
index e1b637d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/ConfigurationErrorLogView.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/ConfigurationView.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/ConfigurationView.gif
deleted file mode 100755
index de89602..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/ConfigurationView.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/ContentView.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/ContentView.gif
deleted file mode 100755
index 00a311e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/ContentView.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/LibraryView.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/LibraryView.gif
deleted file mode 100755
index 00a311e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/LibraryView.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/MethodPlugin.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/MethodPlugin.gif
deleted file mode 100755
index bb82c39..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/view16/MethodPlugin.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/wizban/New.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/wizban/New.gif
deleted file mode 100755
index e249831..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/wizban/New.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/full/wizban/synchronization.gif b/plugins/org.eclipse.epf.authoring.ui/icons/full/wizban/synchronization.gif
deleted file mode 100755
index b24b368..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/full/wizban/synchronization.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/hideUncheckedElem.gif b/plugins/org.eclipse.epf.authoring.ui/icons/hideUncheckedElem.gif
deleted file mode 100755
index 870934b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/hideUncheckedElem.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/link_pal16.gif b/plugins/org.eclipse.epf.authoring.ui/icons/link_pal16.gif
deleted file mode 100755
index 18f408c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/link_pal16.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/link_pal24.gif b/plugins/org.eclipse.epf.authoring.ui/icons/link_pal24.gif
deleted file mode 100755
index 94137e1..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/link_pal24.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/marq_pal16.gif b/plugins/org.eclipse.epf.authoring.ui/icons/marq_pal16.gif
deleted file mode 100755
index d7f875b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/marq_pal16.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/marq_pal24.gif b/plugins/org.eclipse.epf.authoring.ui/icons/marq_pal24.gif
deleted file mode 100755
index 957d784..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/marq_pal24.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/move_down.gif b/plugins/org.eclipse.epf.authoring.ui/icons/move_down.gif
deleted file mode 100755
index 0328357..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/move_down.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/move_up.gif b/plugins/org.eclipse.epf.authoring.ui/icons/move_up.gif
deleted file mode 100755
index 830c2c9..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/move_up.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/select_pal16.gif b/plugins/org.eclipse.epf.authoring.ui/icons/select_pal16.gif
deleted file mode 100755
index fd5cafa..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/select_pal16.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/select_pal24.gif b/plugins/org.eclipse.epf.authoring.ui/icons/select_pal24.gif
deleted file mode 100755
index eb0fcfc..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/select_pal24.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/activity.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/activity.gif
deleted file mode 100755
index 77393e6..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/activity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/artifact.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/artifact.gif
deleted file mode 100755
index 501d219..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/artifact.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/capabilitypattern.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/capabilitypattern.gif
deleted file mode 100755
index d80b1ac..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/capabilitypattern.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/checklist.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/checklist.gif
deleted file mode 100755
index c33aa3b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/checklist.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/concept.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/concept.gif
deleted file mode 100755
index f0e95cd..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/concept.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/contentpackage.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/contentpackage.gif
deleted file mode 100755
index e3ad96a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/contentpackage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/customcat.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/customcat.gif
deleted file mode 100755
index 4bb2d8f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/customcat.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/deliverable.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/deliverable.gif
deleted file mode 100755
index ca10563..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/deliverable.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/deliveryprocess.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/deliveryprocess.gif
deleted file mode 100755
index c2ba788..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/deliveryprocess.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/discipline.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/discipline.gif
deleted file mode 100755
index 7715a9b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/discipline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/disciplinegroup.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/disciplinegroup.gif
deleted file mode 100755
index 7b43069..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/disciplinegroup.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/domain.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/domain.gif
deleted file mode 100755
index d0e257d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/domain.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/guideline.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/guideline.gif
deleted file mode 100755
index 9e91e5b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/guideline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/iteration.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/iteration.gif
deleted file mode 100755
index 25c8a14..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/iteration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/methodlibrary.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/methodlibrary.gif
deleted file mode 100755
index 8b4f970..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/methodlibrary.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/methodplugin.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/methodplugin.gif
deleted file mode 100755
index 791a23c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/methodplugin.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/milestone.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/milestone.gif
deleted file mode 100755
index 576ff94..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/milestone.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/outcome.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/outcome.gif
deleted file mode 100755
index e703518..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/outcome.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/phase.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/phase.gif
deleted file mode 100755
index 55cb3cd..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/phase.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/process.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/process.gif
deleted file mode 100755
index 8f9a085..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/process.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/processcomponent.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/processcomponent.gif
deleted file mode 100755
index 8f9a085..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/processcomponent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/processcontribution.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/processcontribution.gif
deleted file mode 100755
index b966b60..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/processcontribution.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/processpackage.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/processpackage.gif
deleted file mode 100755
index 3757fc8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/processpackage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/processplanningtemplate.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/processplanningtemplate.gif
deleted file mode 100755
index bd06804..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/processplanningtemplate.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/role.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/role.gif
deleted file mode 100755
index 69ebdf2..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/role.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/roledes_obj.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/roledes_obj.gif
deleted file mode 100755
index 75524ab..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/roledes_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/roledescriptor.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/roledescriptor.gif
deleted file mode 100755
index e5a22b0..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/roledescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/roleset.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/roleset.gif
deleted file mode 100755
index 8fb67c6..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/roleset.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/task.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/task.gif
deleted file mode 100755
index 7633d58..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/task.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/taskdes_obj.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/taskdes_obj.gif
deleted file mode 100755
index 149efe0..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/taskdes_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/taskdescriptor.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/taskdescriptor.gif
deleted file mode 100755
index 345d651..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/taskdescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/taskdescriptor1.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/taskdescriptor1.gif
deleted file mode 100755
index 345d651..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/taskdescriptor1.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/technique.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/technique.gif
deleted file mode 100755
index 015135c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/technique.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/template.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/template.gif
deleted file mode 100755
index 957a7e0..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/template.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/tool.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/tool.gif
deleted file mode 100755
index 4c55a2c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/tool.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/toolmentor.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/toolmentor.gif
deleted file mode 100755
index 4c55a2c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/toolmentor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/whitepaper.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/whitepaper.gif
deleted file mode 100755
index 62e48ef..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/whitepaper.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/workdes_obj.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/workdes_obj.gif
deleted file mode 100755
index 0eea8cc..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/workdes_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/workorder.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/workorder.gif
deleted file mode 100755
index f05ebc0..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/workorder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/workproductdescriptor.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/workproductdescriptor.gif
deleted file mode 100755
index 6218229..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/workproductdescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/shape/wpguideline.gif b/plugins/org.eclipse.epf.authoring.ui/icons/shape/wpguideline.gif
deleted file mode 100755
index 9e91e5b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/shape/wpguideline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/showConfigError.gif b/plugins/org.eclipse.epf.authoring.ui/icons/showConfigError.gif
deleted file mode 100755
index e1b637d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/showConfigError.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/stnode_pal16.gif b/plugins/org.eclipse.epf.authoring.ui/icons/stnode_pal16.gif
deleted file mode 100755
index c222f4d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/stnode_pal16.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/stnode_pal24.gif b/plugins/org.eclipse.epf.authoring.ui/icons/stnode_pal24.gif
deleted file mode 100755
index a56b1fc..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/stnode_pal24.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/syncbar_pal16.gif b/plugins/org.eclipse.epf.authoring.ui/icons/syncbar_pal16.gif
deleted file mode 100755
index 2d9d0fd..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/syncbar_pal16.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/syncbar_pal24.gif b/plugins/org.eclipse.epf.authoring.ui/icons/syncbar_pal24.gif
deleted file mode 100755
index d07d07f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/syncbar_pal24.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/warning.gif b/plugins/org.eclipse.epf.authoring.ui/icons/warning.gif
deleted file mode 100755
index 1ee20aa..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/warning.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/wf_editor_icon.gif b/plugins/org.eclipse.epf.authoring.ui/icons/wf_editor_icon.gif
deleted file mode 100755
index 7ddc1cc..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/wf_editor_icon.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/icons/wizban/synchronization.gif b/plugins/org.eclipse.epf.authoring.ui/icons/wizban/synchronization.gif
deleted file mode 100755
index b24b368..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/icons/wizban/synchronization.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.authoring.ui/plugin.properties b/plugins/org.eclipse.epf.authoring.ui/plugin.properties
deleted file mode 100755
index d84ec52..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/plugin.properties
+++ /dev/null
@@ -1,119 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Authoring UI
-providerName=Eclipse.org
-
-# Category
-methodCategoryName=Method
-
-# Perspective
-authoringPerspectiveName=Authoring
-browsingPerspectiveName=Browsing
-
-# Views
-libraryViewName=Library
-configurationViewName=Configuration
-contentViewName=Content
-configurationErrorLogViewName=Configuration Error Log
-
-# Editors
-methodElementEditorName=Method Element Editor
-configurationEditorName=Configuration Editor
-processEditorName=Process Editor
-activityDiagramEditorName=Activity Diagram Editor
-activityDetailDiagramEditorName=Activity Detail Diagram Editor
-workProductDepedencyDiagramEditorName=Work Product Dependency Diagram Editor
-
-# Wizards
-newMethodLibraryWizardName=Method Library
-newMethodLibraryWizardDescription=Create a new method library.
-newMethodPluginWizardName=Method Plug-in
-newMethodPluginWizardDescription=Create a new method plug-in.
-newConfigurationWizardName=Method Configuration
-newConfigurationWizardDescription=Create a new method configuration.
-
-# Cheat Sheets
-methodAuthoringCheatSheetsName=Method Authoring Cheat Sheets
-CheatsheetGetstartedCategoryText=Getting Started
-CheatsheetReusableContentCategoryText=Create Reusable Method Content
-CheatsheetWriteContentCategoryText=Write Method Content
-CheatsheetProcessesCategoryText=Work with Processes
-CheatsheetNavigateMethodContent=Navigate Method Content
-CheatsheetCreateMethodConfiguration=Create your own Method Configuration
-CheatsheetCreateMethodPlugin=Create your own Method Plug-in
-CheatsheetAddMethodContent=Add new Method Content such as Roles, Tasks, Work Products, or Guidance
-CheatsheetTailorMethodElements=Tailor existing Method Elements (Roles, Tasks, Work Products or Guidance) Using Contribution
-CheatsheetReplaceMehtodElements=Replace existing Method Elements (Roles, Tasks, Work Products or Guidance)
-CheatsheetAddMethodRefOrHyperlink=Add a Method Reference or Hyperlink (URL)
-CheatsheetApplyCapabilityPattern=Apply a Capability Pattern
-CheatsheetCreateProcess=Create a Process (Capability Pattern or Delivery Process)
-
-# Action Set
-authoringActionSet=Authoring
-cheatSheetsActionSet=Cheat Sheets
-
-# Global Actions
-newLibraryAction=Method &Library
-newLibraryActionTooltip=Create a new Method Library
-newPluginAction=Method &Plug-in
-newPluginActionTooltip=Create a new Method Plug-in
-newConfigAction=Method &Configuration
-newConfigActionTooltip=Create a new Method Configuration
-openLibraryAction=Method &Library
-openLibraryActionTooltip=Open an existing Method Library
-openConfigAction=Method &Configuration
-openConfigActionTooltip=Open an existing Method Configuration
-openCheatSheets=&Cheat Sheets...
-
-# Library View Actions
-linkWithEditor=Link with Editor
-linkWithEditorTooltip=Link with Editor
-showPresentationNames=Show Presentation Names
-showPresentationNamesTooltip=Show Presentation Names
-
-# Configuration View Actions
-refreshConfig=Refresh
-refreshConfigTooltip=Refresh Configuration
-
-# Preference Page
-methodAuthoringPage=Method Authoring
-processEditor=Process Editor
-libraryOptions=Library Options
-diagram=Diagram
-startupAndShutdown=Startup and Shutdown
-debug=Debug
-modelingOptions=Modeling Options
-
-# Command Handler
-selectAll=Select All
-
-# Properties View
-_UI_ProcessEditor_menu=Process
-_UI_CreateChild_menu_item=&New Child
-_UI_CreateSibling_menu_item=N&ew Sibling
-_UI_ShowPropertiesView_menu_item=Show Properties &View
-_UI_RefreshViewer_menu_item=Re&fresh
-_UI_Properties_General=General
-_UI_Properties_Documentation=Documentation
-_UI_Properties_Guidance=Guidance
-_UI_Properties_Work_Rollup=Work Rollup
-_UI_Properties_Team_Rollup=Team Rollup
-## The following value of string should be "Work Product Rollup". But
-## due to limitation/bug in Eclipse WTP, it's been truncated to 
-## "Work Prod Rollup". So during translation, please take this into consideration.
-_UI_Properties_WP_Rollup=Work Prod Rollup
-_UI_Properties_Roles=Roles
-_UI_Properties_WorkProducts=Work Products
-_UI_Properties_Steps=Steps
-_UI_Properties_Teams=Teams
diff --git a/plugins/org.eclipse.epf.authoring.ui/plugin.xml b/plugins/org.eclipse.epf.authoring.ui/plugin.xml
deleted file mode 100755
index fbf4908..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/plugin.xml
+++ /dev/null
@@ -1,649 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="TaskEditorPageProvider" name="Task Editor Page Provider" schema="schema/TaskEditorPageProvider.exsd"/>
-   <extension-point id="ProcessEditorPageProvider" name="Process Editor Page Provider" schema="schema/ProcessEditorPageProvider.exsd"/>
-
-   <extension point="org.eclipse.ui.perspectives">
-      <perspective
-            class="org.eclipse.epf.authoring.ui.AuthoringPerspective"
-            fixed="false"
-            icon="icons/full/view16/AuthoringPerspective.gif"
-            id="org.eclipse.epf.authoring.ui.AuthoringPerspective"
-            name="%authoringPerspectiveName"/>
-      <perspective
-            class="org.eclipse.epf.authoring.ui.BrowsingPerspective"
-            fixed="false"
-            icon="icons/full/view16/BrowsingPerspective.gif"
-            id="org.eclipse.epf.authoring.ui.BrowsingPerspective"
-            name="%browsingPerspectiveName"/>
-   </extension>
-
-   <extension point="org.eclipse.ui.views">
-      <view
-            category="org.eclipse.epf.ui.views.category"
-            class="org.eclipse.epf.authoring.ui.views.LibraryView"
-            icon="icons/full/view16/LibraryView.gif"
-            id="org.eclipse.epf.authoring.ui.views.LibraryView"
-            name="%libraryViewName"/>
-      <view
-            category="org.eclipse.epf.ui.views.category"
-            class="org.eclipse.epf.authoring.ui.views.ConfigurationView"
-            icon="icons/full/view16/ConfigurationView.gif"
-            id="org.eclipse.epf.authoring.ui.views.ConfigurationView"
-            name="%configurationViewName"/>
-      <view
-            category="org.eclipse.epf.ui.views.category"
-            class="org.eclipse.epf.authoring.ui.views.ContentView"
-            icon="icons/full/view16/ContentView.gif"
-            id="org.eclipse.epf.authoring.ui.views.ContentView"
-            name="%contentViewName"/>
-      <view
-            category="org.eclipse.epf.ui.views.category"
-            class="org.eclipse.epf.authoring.ui.views.MessageView"
-            icon="icons/full/view16/ConfigurationErrorLogView.gif"
-            id="org.eclipse.epf.authoring.ui.views.MessageView"
-            name="%configurationErrorLogViewName"/>
-   </extension>
-   
-   <extension point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.eclipse.epf.authoring.ui.AuthoringPerspective">
-         <view
-               closeable="false"
-               id="org.eclipse.epf.authoring.ui.views.ConfigurationView"
-               moveable="true"
-               ratio="0.5f"
-               relationship="bottom"
-               relative="org.eclipse.epf.authoring.ui.views.LibraryView"/>
-         <viewShortcut
-               id="org.eclipse.epf.authoring.ui.views.LibraryView"/>
-         <viewShortcut
-               id="org.eclipse.epf.authoring.ui.views.ConfigurationView"/>
-         <showInPart id="org.eclipse.epf.authoring.ui.views.LibraryView"/>
-      </perspectiveExtension>
-      
-      <perspectiveExtension
-            targetID="org.eclipse.epf.authoring.ui.BrowsingPerspective">
-         <view
-               closeable="false"
-               id="org.eclipse.epf.authoring.ui.views.ContentView"
-               moveable="true"
-               ratio="0.70f"
-               relationship="right"
-               relative="org.eclipse.ui.editorss"/>
-      </perspectiveExtension>
-   </extension>
-
-   <extension point="org.eclipse.ui.editors">
-      <editor
-            class="org.eclipse.epf.authoring.ui.editors.MethodElementEditor"
-            icon="icons/full/obj16/MethodElement.gif"
-            id="org.eclipse.epf.authoring.ui.editors.MethodElementEditor"
-            name="%methodElementEditorName"/>
-      <editor
-            class="org.eclipse.epf.authoring.ui.editors.ConfigurationEditor"
-            icon="icons/full/obj16/MethodConfiguration.gif"
-            id="org.eclipse.epf.authoring.ui.editors.ConfigurationEditor"
-            name="%configurationEditorName"/>
-      <editor
-            class="org.eclipse.epf.authoring.ui.editors.ProcessEditor"
-            contributorClass="org.eclipse.epf.authoring.ui.editors.ProcessEditor$BSActionBarContributor"
-            icon="icons/full/obj16/Process.gif"
-            id="org.eclipse.epf.authoring.ui.editors.ProcessEditor"
-            name="%processEditorName"/>
-      <editor
-            class="org.eclipse.epf.authoring.ui.editors.GraphicalWorkflowEditor"
-            icon="icons/full/obj16/Activity.gif"
-            id="org.eclipse.epf.authoring.ui.editors.GraphicalWorkflowEditor"
-            name="%activityDiagramEditorName"/>
-      <editor
-            class="org.eclipse.epf.authoring.ui.editors.ActivityDetailDiagramEditor"
-            icon="icons/full/obj16/Activity.gif"
-            id="org.eclipse.epf.authoring.ui.editors.ActivityDetailDiagramEditor"
-            name="%activityDetailDiagramEditorName"/>
-      <editor
-            class="org.eclipse.epf.authoring.ui.editors.GraphicalWPDependencyEditor"
-            icon="icons/full/obj16/WorkProductDescriptor.gif"
-            id="org.eclipse.epf.authoring.ui.editors.GraphicalWPDependencyEditor"
-            name="%workProductDepedencyDiagramEditorName"/>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <wizard
-            category="org.eclipse.epf.ui.newWizards.category"
-            class="org.eclipse.epf.authoring.ui.wizards.NewLibraryWizard"
-            icon="icons/full/obj16/MethodLibrary.gif"
-            id="org.eclipse.epf.authoring.ui.wizards.NewLibraryWizard"
-            name="%newMethodLibraryWizardName">
-         <description>
-               %newMethodLibraryWizardDescription
-         </description>
-      </wizard>       
-      <wizard
-            category="org.eclipse.epf.ui.newWizards.category"
-            class="org.eclipse.epf.authoring.ui.wizards.NewMethodPluginWizard"
-            icon="icons/full/obj16/MethodPlugin.gif"
-            id="org.eclipse.epf.authoring.ui.wizards.NewMethodPluginWizard"
-            name="%newMethodPluginWizardName">
-         <description>
-               %newMethodPluginWizardDescription
-         </description>
-      </wizard>
-      <wizard
-            category="org.eclipse.epf.ui.newWizards.category"
-            class="org.eclipse.epf.authoring.ui.wizards.NewConfigurationWizard"
-            icon="icons/full/obj16/MethodConfiguration.gif"
-            id="org.eclipse.epf.authoring.ui.wizards.NewConfigurationWizard"
-            name="%newConfigurationWizardName">
-         <description>
-               %newConfigurationWizardDescription
-         </description>
-      </wizard>
-   </extension>     
-
-<!--
-   <extension point="org.eclipse.ui.actionSets">
-      <actionSet
-            id="org.eclipse.epf.authoringActionSet"
-            label="%authoringActionSet"
-            visible="true">
-         <action
-               class="org.eclipse.epf.authoring.ui.actions.NewConfigurationAction"
-               helpContextId="file_new_configuration_context"
-               icon="icons/full/obj16/MethodConfiguration.gif"
-               id="org.eclipse.epf.authoring.ui.actions.NewConfigurationAction"
-               label="%newConfigAction"
-               menubarPath="file/new.ext/groupm2"
-               tooltip="%newConfigActionTooltip"/>
-         <action
-               class="org.eclipse.epf.authoring.ui.actions.NewPluginAction"
-               helpContextId="file_new_plugin_context"
-               icon="icons/full/obj16/MethodPlugin.gif"
-               id="org.eclipse.epf.authoring.ui.actions.NewPluginAction"
-               label="%newPluginAction"
-               menubarPath="file/new.ext/groupm2"
-               tooltip="%newLPluginActionTooltip"/>
-         <action
-               class="org.eclipse.epf.authoring.ui.actions.NewLibraryAction"
-               helpContextId="file_new_library_context"
-               icon="icons/full/obj16/MethodLibrary.gif"
-               id="org.eclipse.epf.authoring.ui.actions.NewLibraryAction"
-               label="%newLibraryAction"
-               menubarPath="file/new.ext/groupm1"
-               tooltip="%newLibraryActionTooltip"/>
-         <action
-               class="org.eclipse.epf.authoring.ui.actions.OpenConfigurationAction"
-               helpContextId="file_open_configuration_context"
-               icon="icons/full/obj16/MethodConfiguration.gif"
-               id="org.eclipse.epf.authoring.ui.actions.OpenConfigurationAction"
-               label="%openConfigAction"
-               menubarPath="file/open.ext/groupm2"
-               tooltip="%openConfigActionTooltip"/>
-         <action
-               class="org.eclipse.epf.authoring.ui.actions.OpenLibraryAction"
-               helpContextId="file_open_library_context"
-               icon="icons/full/obj16/MethodLibrary.gif"
-               id="org.eclipse.epf.authoring.ui.actions.OpenLibraryAction"
-               label="%openLibraryAction"
-               menubarPath="file/open.ext/groupm1"
-               tooltip="%openLibraryActionTooltip"/>
-         <menu
-               id="org.eclipse.epf.authoring.ui.fileNewExtRMC"
-               label="FileNewExtRMC"
-               path="file/new.ext">
-            <separator name="groupm1"/>
-            <separator name="groupm2"/>
-         </menu>
-         <menu
-               id="org.eclipse.epf.authoring.ui.fileOpenExtRMC"
-               label="FileOpenExtRMC"
-               path="file/open.ext">
-            <separator name="groupm1"/>
-            <separator name="groupm2"/>
-         </menu>
-      </actionSet>
-   </extension>
--->
-
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
-      <propertyContributor
-            typeMapper="org.eclipse.epf.authoring.ui.properties.ElementTypeMapper"
-            contributorId="org.eclipse.epf.authoring.ui.editors.ProcessEditor"
-            labelProvider="org.eclipse.epf.authoring.ui.properties.ElementLabelProvider">
-         <propertyCategory category="element"/>
-         <propertyCategory category="other"/>
-      </propertyContributor>
-   </extension>
-   
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
-      <propertyTabs
-            contributorId="org.eclipse.epf.authoring.ui.editors.ProcessEditor">
-         <!-- START GENERAL -->
-         <propertyTab
-               label="%_UI_Properties_General"
-               category="element"
-               id="properties.tab.BreakdownElement.General"/>
-         <propertyTab
-               label="%_UI_Properties_General"
-               category="element"
-               id="properties.tab.WorkBreakdownElement.General"/>
-         <propertyTab
-               label="%_UI_Properties_General"
-               category="element"
-               id="properties.tab.Activity.General"/>
-         <propertyTab
-               label="%_UI_Properties_General"
-               category="element"
-               id="properties.tab.TaskDescriptor.General"/>
-         <propertyTab
-               label="%_UI_Properties_General"
-               category="element"
-               id="properties.tab.RoleDescriptor.General"/>
-         <propertyTab
-               label="%_UI_Properties_General"
-               category="element"
-               id="properties.tab.WorkProductDescriptor.General"/>
-		 <!-- END GENERAL-->
-         
-         <!-- START DOCUMENTATION -->
-         <propertyTab
-               label="%_UI_Properties_Documentation"
-               category="element"
-               id="properties.tab.BreakdownElement.Documentation"
-               afterTab="properties.tab.BreakdownElement.General"/>
-         <propertyTab
-               label="%_UI_Properties_Documentation"
-               category="element"
-               id="properties.tab.Activity.Documentation"
-               afterTab="properties.tab.Activity.General"/>
-         <propertyTab
-               label="%_UI_Properties_Documentation"
-               category="element"
-               id="properties.tab.Descriptor.Documentation"
-               afterTab="properties.tab.TaskDescriptor.General"/>
-		 <!-- END DOCUMENTATION -->
-		
-		 <!-- ACTIVITY -->
-         <propertyTab
-               label="%_UI_Properties_Guidance"
-               category="element"
-               afterTab="properties.tab.Activity.Documentation"
-               id="properties.tab.Activity.Guidance"/>  
-         <propertyTab
-               label="%_UI_Properties_Work_Rollup"
-               category="element"
-               afterTab="properties.tab.Activity.Guidance"
-               id="properties.tab.Activity.WorkRollup"/>
-         <propertyTab
-               label="%_UI_Properties_Team_Rollup"
-               category="element"
-               afterTab="properties.tab.Activity.WorkRollup"
-               id="properties.tab.Activity.TeamRollup"/>
-         <propertyTab
-               label="%_UI_Properties_WP_Rollup"
-               category="element"
-               afterTab="properties.tab.Activity.TeamRollup"
-               id="properties.tab.Activity.WorkProductsRollup"/>
-        
-         <!-- TASK DESCRIPTOR -->
-         <propertyTab
-               label="%_UI_Properties_Roles"
-               category="element"
-               afterTab="properties.tab.Descriptor.Documentation"
-               id="properties.tab.TaskDescriptor.Role"/>
-         <propertyTab
-               label="%_UI_Properties_WorkProducts"
-               category="element"
-               afterTab="properties.tab.TaskDescriptor.Role"
-               id="properties.tab.TaskDescriptor.WorkProduct"/>
-         <propertyTab
-               label="%_UI_Properties_Steps"
-               category="element"
-               afterTab="properties.tab.TaskDescriptor Relation"
-               id="properties.tab.TaskDescriptor.Step"/>
-         
-         <!-- ROLE DESCRIPTOR -->
-         <propertyTab
-               label="%_UI_Properties_WorkProducts"
-               category="element"
-               afterTab="properties.tab.RoleDescriptor.Task"
-               id="properties.tab.RoleDescriptor.WorkProduct"/>
-         <propertyTab
-               label="%_UI_Properties_Teams"
-               category="element"
-               afterTab="properties.tab.RoleDescriptor.WorkProduct"
-               id="properties.tab.RoleDescriptor.Team"/>
-         
-         <!-- TEAM PROFILE -->
-         <propertyTab
-               label="%_UI_Properties_Roles"
-               category="element"
-               afterTab="properties.tab.TeamProfile.Documentation"
-               id="properties.tab.TeamProfile.Role"/>
-         
-         <!-- COMPOSITE ROLE -->
-         <propertyTab
-               label="%_UI_Properties_Roles"
-               category="element"
-               afterTab="properties.tab.RoleDescriptor.Team"
-               id="properties.tab.CompositeRole.Role"/>
-      </propertyTabs>
-   </extension>
-   
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections">
-      <propertySections
-            contributorId="org.eclipse.epf.authoring.ui.editors.ProcessEditor">
-         <!-- START GENERAL SECTION -->
-         <propertySection
-               tab="properties.tab.Activity.General"
-               class="org.eclipse.epf.authoring.ui.properties.ActivityGeneralSection"
-               id="properties.section.Activity.General">
-            <input type="org.eclipse.epf.uma.Activity"/>
-            <input type="org.eclipse.epf.library.edit.process.ActivityWrapperItemProvider"/>
-         </propertySection>
-         <propertySection
-               tab="properties.tab.TaskDescriptor.General"
-               class="org.eclipse.epf.authoring.ui.properties.TaskDescriptorGeneralSection"
-               id="properties.section.TaskDescriptor.General">
-            <input type="org.eclipse.epf.uma.TaskDescriptor"/>
-            <input type="org.eclipse.epf.library.edit.process.TaskDescriptorWrapperItemProvider"/>
-         </propertySection> 
-         <propertySection
-               class="org.eclipse.epf.authoring.ui.properties.RoleDescriptorGeneralSection"
-               id="properties.section.RoleDescriptor.General"
-               tab="properties.tab.RoleDescriptor.General">
-            <input type="org.eclipse.epf.uma.RoleDescriptor"/>
-            <input type="org.eclipse.epf.library.edit.process.RoleDescriptorWrapperItemProvider"/>
-         </propertySection>
-         <propertySection
-               class="org.eclipse.epf.authoring.ui.properties.WorkProductDescriptorGeneralSection"
-               id="properties.section.WorkProductDescriptor.General"
-               tab="properties.tab.WorkProductDescriptor.General">      
-            <input type="org.eclipse.epf.uma.WorkProductDescriptor"/>
-            <input type="org.eclipse.epf.library.edit.process.WorkProductDescriptorWrapperItemProvider"/>
-         </propertySection>       
-         <propertySection
-               tab="properties.tab.WorkBreakdownElement.General"
-               class="org.eclipse.epf.authoring.ui.properties.WorkBreakdownElementGeneralSection"
-               id="properties.section.WorkBreakdownElement.General">
-            <input type="org.eclipse.epf.uma.Milestone"/>
-            <input type="org.eclipse.epf.library.edit.process.MilestoneWrapperItemProvider"/>
-         </propertySection>
-         <propertySection
-               tab="properties.tab.BreakdownElement.General"
-               class="org.eclipse.epf.authoring.ui.properties.BreakdownElementGeneralSection"
-               id="properties.section.BreakdownElement.General">
-            <input type="org.eclipse.epf.uma.TeamProfile"/>
-            <input type="org.eclipse.epf.library.edit.process.TeamProfileWrapperItemProvider"/>
-         </propertySection>
-         <!-- END GENERAL SECTION -->
-        
-         <!-- START DOCUMENTATION SECTION -->
-         <propertySection
-               tab="properties.tab.Activity.Documentation"
-               class="org.eclipse.epf.authoring.ui.properties.ActivityDocumentSection"
-               id="properties.section.Activity.Documentation">
-            <input type="org.eclipse.epf.uma.Activity"/>
-            <input type="org.eclipse.epf.library.edit.process.ActivityWrapperItemProvider"/>
-         </propertySection>
-         <propertySection
-               tab="properties.tab.Descriptor.Documentation"
-               class="org.eclipse.epf.authoring.ui.properties.DescriptorDocumentSection"
-               id="properties.section.Descriptor.Documentation">
-            <input type="org.eclipse.epf.uma.Descriptor"/>
-            <input type="org.eclipse.epf.library.edit.process.TaskDescriptorWrapperItemProvider"/>
-            <input type="org.eclipse.epf.library.edit.process.RoleDescriptorWrapperItemProvider"/>
-            <input type="org.eclipse.epf.library.edit.process.WorkProductDescriptorWrapperItemProvider"/>
-         </propertySection> 
-         <propertySection
-               tab="properties.tab.BreakdownElement.Documentation"
-               class="org.eclipse.epf.authoring.ui.properties.MilestoneDocumentSection"
-               id="properties.section.BreakdownElement.Document">
-            <input type="org.eclipse.epf.uma.Milestone"/>
-            <input type="org.eclipse.epf.uma.TeamProfile"/>
-            <input type="org.eclipse.epf.library.edit.process.MilestoneWrapperItemProvider"/>
-            <input type="org.eclipse.epf.library.edit.process.TeamProfileWrapperItemProvider"/>
-         </propertySection>       
-         <!-- END DOCUMENTATION SECTION -->
-      
-         <!-- ACTIVITY -->
-         <propertySection
-               tab="properties.tab.Activity.Guidance"
-               class="org.eclipse.epf.authoring.ui.properties.ActivityGuidanceSection"
-               id="properties.section.Activity.Guidance">
-            <input type="org.eclipse.epf.uma.Activity"/>
-            <input type="org.eclipse.epf.library.edit.process.ActivityWrapperItemProvider"/>
-         </propertySection>
-         <propertySection
-               tab="properties.tab.Activity.WorkRollup"
-               class="org.eclipse.epf.authoring.ui.properties.ActivityWorkRollupSection"
-               id="properties.section.Activity.WorkRollup">
-            <input type="org.eclipse.epf.uma.Activity"/>
-            <input type="org.eclipse.epf.library.edit.process.ActivityWrapperItemProvider"/>
-         </propertySection>
-         <propertySection
-               tab="properties.tab.Activity.TeamRollup"
-               class="org.eclipse.epf.authoring.ui.properties.ActivityTeamRollupSection"
-               id="properties.section.Activity.TeamRollup">
-            <input type="org.eclipse.epf.uma.Activity"/>
-            <input type="org.eclipse.epf.library.edit.process.ActivityWrapperItemProvider"/>
-         </propertySection>
-         <propertySection
-               tab="properties.tab.Activity.WorkProductsRollup"
-               class="org.eclipse.epf.authoring.ui.properties.ActivityWorkProductsRollupSection"
-               id="properties.section.Activity.WorkProductsRollup">
-            <input type="org.eclipse.epf.uma.Activity"/>
-            <input type="org.eclipse.epf.library.edit.process.ActivityWrapperItemProvider"/>
-         </propertySection>
-         <!-- END ACTIVITY -->
-         
-         <!-- Sections for TaskDescriptor -->
-         <propertySection
-               tab="properties.tab.TaskDescriptor.Role"
-               class="org.eclipse.epf.authoring.ui.properties.TaskDescriptorRoleSection"
-               id="properties.section.TaskDescriptor.Role">
-            <input type="org.eclipse.epf.uma.TaskDescriptor"/>
-            <input type="org.eclipse.epf.library.edit.process.TaskDescriptorWrapperItemProvider"/>
-         </propertySection>  
-         <propertySection
-               tab="properties.tab.TaskDescriptor.WorkProduct"
-               class="org.eclipse.epf.authoring.ui.properties.TaskDescriptorWorkProductSection"
-               id="properties.section.TaskDescriptor.WorkProduct">
-            <input type="org.eclipse.epf.uma.TaskDescriptor"/>
-            <input type="org.eclipse.epf.library.edit.process.TaskDescriptorWrapperItemProvider"/>
-         </propertySection> 
-         <propertySection
-               tab="properties.tab.TaskDescriptor.Step"
-               class="org.eclipse.epf.authoring.ui.properties.TaskDescriptorStepSection"
-               id="properties.section.TaskDescriptor.Step">
-            <input type="org.eclipse.epf.uma.TaskDescriptor"/>
-            <input type="org.eclipse.epf.library.edit.process.TaskDescriptorWrapperItemProvider"/>
-         </propertySection> 
-         
-         <!-- Sections for RoleDescriptor -->
-         <propertySection
-               tab="properties.tab.RoleDescriptor.WorkProduct"
-               class="org.eclipse.epf.authoring.ui.properties.RoleDescriptorWorkProductSection"
-               id="properties.section.RoleDescriptor.WorkProduct">
-            <input type="org.eclipse.epf.uma.RoleDescriptor"/>
-            <input type="org.eclipse.epf.library.edit.process.RoleDescriptorWrapperItemProvider"/>
-         </propertySection>  
-         <propertySection
-               tab="properties.tab.RoleDescriptor.Team"
-               class="org.eclipse.epf.authoring.ui.properties.RoleDescriptorTeamSection"
-               id="properties.section.RoleDescriptor.Team">
-            <input type="org.eclipse.epf.uma.RoleDescriptor"/>
-            <input type="org.eclipse.epf.library.edit.process.RoleDescriptorWrapperItemProvider"/>
-         </propertySection> 
-      
-
-         <!-- Section for TeamProfile -->
-         <propertySection
-               tab="properties.tab.TeamProfile.Role"
-               class="org.eclipse.epf.authoring.ui.properties.TeamProfileRoleSection"
-               id="properties.section.TeamProfile.Role">
-            <input type="org.eclipse.epf.uma.TeamProfile"/>
-            <input type="org.eclipse.epf.library.edit.process.TeamProfileWrapperItemProvider"/>
-         </propertySection> 
-         
-         <!-- Section for CompositeRole -->
-         <propertySection
-               tab="properties.tab.CompositeRole.Role"
-               class="org.eclipse.epf.authoring.ui.properties.CompositeRoleRoleSection"
-               id="properties.section.CompositeRole.Role">
-            <input type="org.eclipse.epf.uma.CompositeRole"/>
-            <input type="org.eclipse.epf.library.edit.process.CompositeRoleWrapperItemProvider"/>
-         </propertySection>
-      </propertySections>
-   </extension>
-   
-   <extension point="org.eclipse.ui.preferencePages">
-      <page
-            class="org.eclipse.epf.authoring.ui.preferences.RootPrefPage"
-            name="%methodAuthoringPage"
-            id="org.eclipse.epf.authoring.ui.preferences.rootprefpage"/>
-      <page
-            category="org.eclipse.epf.authoring.ui.preferences.rootprefpage"
-            class="org.eclipse.epf.authoring.ui.preferences.ProcessEditorPreferencePage"
-            id="org.eclipse.epf.authoring.ui.preferences.ProcessEditorPreferencePage"
-            name="%processEditor"/>
-      <page
-            category="org.eclipse.epf.authoring.ui.preferences.rootprefpage"
-            class="org.eclipse.epf.authoring.ui.preferences.LibraryPrefPage"
-            id="org.eclipse.epf.authoring.ui.preferences.libraryprefpage"
-            name="%libraryOptions"/>
-      <page
-            category="org.eclipse.epf.authoring.ui.preferences.rootprefpage"
-            class="org.eclipse.epf.authoring.ui.preferences.DiagramPrefPage"
-            id="org.eclipse.epf.authoring.ui.preferences.DiagramPrefPage"
-            name="%diagram"/>
-     <page
-            category="org.eclipse.epf.authoring.ui.preferences.rootprefpage"
-            class="org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage"
-            id="org.eclipse.epf.authoring.ui.preferences.DiagramPrefPage1"
-            name="New Diagram"/>       
-      <page 
-            category="org.eclipse.epf.authoring.ui.preferences.rootprefpage"
-            class="org.eclipse.epf.authoring.ui.preferences.StartupPrefPage"
-            id="org.eclipse.epf.authoring.ui.preferences.startupPrefPage"
-            name="%startupAndShutdown"/>
-      <page
-            category="org.eclipse.epf.authoring.ui.preferences.rootprefpage"
-            class="org.eclipse.epf.authoring.ui.preferences.DebugPrefPage"
-            id="org.eclipse.epf.authoring.ui.preferences.DebugPrefPage"
-            name="%debug"/>
-      <page
-            category="org.eclipse.epf.authoring.ui.preferences.rootprefpage"
-            class="org.eclipse.epf.authoring.ui.preferences.ModelingOptionsPrefPage"
-            id="org.eclipse.epf.authoring.ui.preferences.ModelingOptionsPrefPage"
-            name="%modelingOptions"/>
-   </extension>
-   
-   <extension point="org.eclipse.core.runtime.preferences">
-      <initializer
-            class="org.eclipse.epf.authoring.ui.preferences.LibraryPreferenceInitializer"/>
-      <initializer
-            class="org.eclipse.epf.authoring.ui.preferences.AuthoringPreferenceInitializer"/>
-   </extension>
-   
-   <extension point="org.eclipse.ui.viewActions">
-      <viewContribution
-            id="org.eclipse.epf.authoring.ui.viewContribution.refreshConfiguration"
-            targetID="org.eclipse.epf.authoring.ui.views.ConfigurationView">
-         <action
-               class="org.eclipse.epf.authoring.ui.actions.RefreshConfiguration"
-               disabledIcon="icons/full/etool16/Refresh.gif"
-               enablesFor="+"
-               icon="icons/full/etool16/Refresh.gif"
-               id="org.eclipse.epf.authoring.ui.actions.refresh"
-               label="%refreshConfig"
-               menubarPath="additions"
-               style="push"
-               toolbarPath="additions"
-               tooltip="%refreshConfigTooltip"/>
-      </viewContribution>
-      <viewContribution
-            id="org.eclipse.epf.authoring.ui.viewContribution.linkWithEditor"
-            targetID="org.eclipse.epf.authoring.ui.views.LibraryView">
-         <action
-               class="org.eclipse.epf.authoring.ui.actions.LinkWithEditor"
-               disabledIcon="icons/full/etool16/synced.gif"
-               icon="icons/full/etool16/synced.gif"
-               id="org.eclipse.epf.authoring.ui.actions.linkWithEditor"
-               label="%linkWithEditor"
-               menubarPath="additions"
-               style="toggle"
-               toolbarPath="additions"
-               tooltip="%linkWithEditorTooltip"/>
-      </viewContribution>
-      <viewContribution
-            id="org.eclipse.epf.authoring.ui.viewContribution.showPresNames"
-            targetID="org.eclipse.epf.authoring.ui.views.LibraryView">
-         <action
-               class="org.eclipse.epf.authoring.ui.actions.ShowPresentationNames"
-               disabledIcon="icons/full/etool16/Pres_name_toggle.gif"
-               icon="icons/full/etool16/Pres_name_toggle.gif"
-               id="org.eclipse.epf.authoring.ui.actions.showPresNames"
-               label="%showPresentationNames"
-               menubarPath="additions"
-               style="toggle"
-               toolbarPath="additions"
-               tooltip="%showPresentationNamesTooltip"/>
-      </viewContribution>
-   </extension>
-   
-   <extension point="org.eclipse.ui.bindings">
-      <key
-            commandId="org.eclipse.ui.edit.selectAll"
-            contextId="org.eclipse.ui.contexts.wiindow"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="Ctrl+A"/>
-   </extension>
-   
-   <extension point="org.eclipse.ui.commands">
-      <command
-            categoryId="org.eclipse.ui.category.edit"
-            defaultHandler="org.eclipse.ui.internal.handlers.SelectAllHandler"
-            description="%selectAll"
-            id="org.eclipse.ui.edit.selectAll"
-            name="selectAll"/>
-   </extension>
-
-   <extension point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%cheatSheetsActionSet"
-            visible="true"
-            id="org.eclipse.ui.cheatsheets.actionSet">
-         <action
-            label="%openCheatSheets"
-            class="org.eclipse.ui.internal.cheatsheets.actions.CheatSheetHelpMenuAction"
-            menubarPath="help/group.assist" id="org.eclipse.ui.cheatsheets.actions.CheatSheetHelpMenuAction">
-         </action>
-      </actionSet>
-   </extension>
-   <extension
-         point="org.eclipse.ui.ide.markerResolution">
-      <markerResolutionGenerator class="org.eclipse.epf.authoring.ui.util.MarkerResolutionGenerator"/>
-   </extension>
-   <extension
-         point="org.eclipse.epf.library.edit.userInteractionHandler">
-      <userInteractionHandler class="org.eclipse.epf.authoring.ui.actions.UserInteractionHandler"/>
-   </extension>
-   <extension
-         point="org.eclipse.ui.decorators">
-      <decorator
-            class="org.eclipse.epf.authoring.ui.providers.MethodElementLightweightLabelDecorator"
-            id="org.eclipse.epf.authoring.ui.providers.MethodElementLightweightLabelDecorator"
-            label="Method Element Lightweight Label Decorator"
-            lightweight="true"
-            location="TOP_LEFT"
-            state="true"/>
-   </extension>
-   <extension id="methodRichText" point="org.eclipse.core.resources.markers" name="%RichTextMarkerTypeName"> 
-      <persistent value="true"/> 
-      <super type="org.eclipse.core.resources.problemmarker"/> 
-      <attribute name="owner"/> 
-   </extension>
-</plugin>
diff --git a/plugins/org.eclipse.epf.authoring.ui/schema/ProcessEditorPageProvider.exsd b/plugins/org.eclipse.epf.authoring.ui/schema/ProcessEditorPageProvider.exsd
deleted file mode 100755
index 82e6161..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/schema/ProcessEditorPageProvider.exsd
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.epf.authoring.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.epf.authoring.ui" id="ProcessEditorPageProvider" name="Process Editor Page Provider"/>
-      </appInfo>
-      <documentation>
-         1.0
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="editorPage"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="editorPage">
-      <complexType>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.epf.authoring.ui.forms.IExtensionFormPage"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         &lt;pre&gt;
- &lt;extension
-  point=&quot;org.eclipse.epf.authoring.ui.ProcessEditorPageProvider&quot;&gt;
-  &lt;editorPage
-   id=&quot;org.eclipse.epf.authoring.ui.ProcessEstimationPage&quot;
-   name=&quot;Estimation&quot;
-   class=&quot;org.eclipse.epf.authoring.ui.forms.ProcessEstimationPage&quot;&gt;
-  &lt;/editorPage&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.epf.authoring.ui/schema/TaskEditorPageProvider.exsd b/plugins/org.eclipse.epf.authoring.ui/schema/TaskEditorPageProvider.exsd
deleted file mode 100755
index 9994a49..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/schema/TaskEditorPageProvider.exsd
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.epf.authoring.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.epf.authoring.ui" id="EditorPageProvider" name="Editor Page Provider"/>
-      </appInfo>
-      <documentation>
-         This extension point enables a plug-in to register one or more pages in authoring editor. Though this page will only be added for method element type &quot;task&quot;.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="editorPage"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="editorPage">
-      <complexType>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.epf.authoring.ui.forms.IExtensionFormPage"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         1.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         &lt;pre&gt;
- &lt;extension
-  point=&quot;org.eclipse.epf.authoring.ui.TaskEditorPageProvider&quot;&gt;
-  &lt;editorPage
-   id=&quot;org.eclipse.epf.authoring.ui.TaskEstimationPage&quot;
-   name=&quot;Estimation&quot;
-   class=&quot;org.eclipse.epf.authoring.ui.forms.TaskEstimationPage&quot;&gt;
-  &lt;/editorPage&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/ChangeBoundsCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/ChangeBoundsCommand.java
deleted file mode 100755
index 44d08f9..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/ChangeBoundsCommand.java
+++ /dev/null
@@ -1,70 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.commands;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.gef.commands.Command;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class ChangeBoundsCommand extends Command {
-
-	private Node node;
-
-	private Point newLocation, oldLocation;
-
-	private int newWidth, oldWidth;
-
-	private static final String LABEL = AuthoringUIResources.gef_changeBoundsCommand_label; //$NON-NLS-1$
-
-	public ChangeBoundsCommand(Node node, Point newLocation, int newWidth) {
-		super(ChangeBoundsCommand.LABEL);
-		setNode(node);
-		setNewLocation(newLocation.getCopy());
-		this.newWidth = newWidth;
-	}
-
-	public boolean canExecute() {
-		return node != null
-				&& newLocation != null
-				&& (newWidth != oldWidth || !(node.getLocation()
-						.equals(newLocation)));
-	}
-
-	public void execute() {
-		oldLocation = node.getLocation();
-		oldWidth = node.getWidth();
-		redo();
-	}
-
-	public void redo() {
-		node.setLocation(newLocation);
-		node.setWidth(newWidth);
-	}
-
-	public void setNode(Node node) {
-		this.node = node;
-	}
-
-	public void setNewLocation(Point loc) {
-		newLocation = loc;
-	}
-
-	public void undo() {
-		node.setWidth(oldWidth);
-		node.setLocation(oldLocation);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/ChangeHeightCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/ChangeHeightCommand.java
deleted file mode 100755
index 38d4957..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/ChangeHeightCommand.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.eclipse.epf.authoring.gef.commands;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.gef.commands.Command;
-
-/**
- * @author Shashidhar Kannoori
- * Command to handle Node's height changes.
- * ChangeBoundsCommand handles Node's width changes. 
- */
-public class ChangeHeightCommand extends Command {
-
-	private Node node;
-
-	private Point newLocation, oldLocation;
-
-	private int newHeight, oldHeight;
-
-	private static final String LABEL = "Change Height Command"; //$NON-NLS-1$
-
-	public ChangeHeightCommand(Node node, Point newLocation, int newHeight) {
-		super(ChangeHeightCommand.LABEL);
-		setNode(node);
-		setNewLocation(newLocation.getCopy());
-		this.newHeight = newHeight;
-	}
-
-	public boolean canExecute() {
-		return node != null
-				&& newLocation != null
-				&& (newHeight != oldHeight || !(node.getLocation()
-						.equals(newLocation)));
-	}
-
-	public void execute() {
-		oldLocation = node.getLocation();
-		oldHeight = node.getHeight();
-		redo();
-	}
-
-	public void redo() {
-		node.setLocation(newLocation);
-		node.setHeight(newHeight);
-	}
-
-	public void setNode(Node node) {
-		this.node = node;
-	}
-
-	public void setNewLocation(Point loc) {
-		newLocation = loc;
-	}
-
-	public void undo() {
-		node.setHeight(oldHeight);
-		node.setLocation(oldLocation);
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/ChangeNameCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/ChangeNameCommand.java
deleted file mode 100755
index 8d5e767..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/ChangeNameCommand.java
+++ /dev/null
@@ -1,77 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.commands;
-
-import org.eclipse.epf.authoring.gef.edit.NamedNodeEditPart;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class ChangeNameCommand extends Command {
-
-	private NamedNode element;
-
-	private String newName, oldName;
-
-	private static final String LABEL = AuthoringUIResources.gef_changeNameCommand_label;
-	private static final String UNDO_MESSAGE = AuthoringUIResources.gef_changeNameCommand_undoMessage;
-
-	public ChangeNameCommand(NamedNode elem, String newName) {
-		super(LABEL);
-		element = elem;
-		oldName = elem.getName();
-		this.newName = newName.trim();
-	}
-
-	public boolean canExecute() {
-		return element != null;
-	}
-
-	public void execute() {
-		element.setName(newName);
-	}
-
-	public void undo() {
-		if (!StrUtil.isBlank(oldName)) {
-			element.setName(oldName);
-		} else {
-			Display.getCurrent().asyncExec(new PromptEdit(null, UNDO_MESSAGE));
-		}
-	}
-
-	static class PromptEdit implements Runnable {
-		
-		private String msg;
-
-		PromptEdit(NamedNodeEditPart part, String msg) {
-			this.msg = msg;
-		}
-
-		/**
-		 * @see java.lang.Runnable#run()
-		 */
-		public void run() {
-			String title = AuthoringUIResources.warningDialog_title;
-			MsgDialog dialog = AuthoringUIPlugin.getDefault().getMsgDialog();
-			dialog.displayError(title, msg, ""); //$NON-NLS-1$
-		}
-
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/ChangePropertyValueCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/ChangePropertyValueCommand.java
deleted file mode 100755
index 87ede74..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/ChangePropertyValueCommand.java
+++ /dev/null
@@ -1,63 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.commands;
-
-import java.util.List;
-
-import org.eclipse.epf.authoring.gef.edit.NodeEditPart;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.gef.commands.Command;
-
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class ChangePropertyValueCommand extends Command {
-
-	private Node element;
-
-	private NodeEditPart part;
-
-	private String newName, oldName;
-
-	private static final String LABEL = AuthoringUIResources.gef_changePropertyValueCommand_label; //$NON-NLS-1$
-
-	public ChangePropertyValueCommand(NodeEditPart elem, String newName) {
-		super(LABEL);
-		part = elem;
-		element = (Node) elem.getModel();
-		GraphNode graphNode = element.getGraphNode();
-		List list = graphNode.getProperty();
-		oldName = ((Property) list.get(0)).getValue();
-		this.newName = newName.trim();
-	}
-
-	public boolean canExecute() {
-		return element != null;
-	}
-
-	public void execute() {
-		((Property) element.getGraphNode().getProperty().get(0))
-				.setValue(newName);
-		part.refresh();
-	}
-
-	public void undo() {
-		((Property) element.getGraphNode().getProperty().get(0))
-				.setValue(oldName);
-		part.refresh();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/CreateBendpointCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/CreateBendpointCommand.java
deleted file mode 100755
index 3dd083d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/CreateBendpointCommand.java
+++ /dev/null
@@ -1,53 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.commands;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.gef.commands.Command;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class CreateBendpointCommand extends Command {
-
-	private Link link;
-
-	private Bendpoint point;
-
-	private int index = -1;
-
-	private static final String LABEL = AuthoringUIResources.gef_createBendpointCommand_label; //$NON-NLS-1$
-
-	public CreateBendpointCommand(Link link, Point location, int index) {
-		super(LABEL);
-		this.link = link;
-		point = new AbsoluteBendpoint(location);
-		this.index = index;
-	}
-
-	public boolean canExecute() {
-		return link != null && point != null;
-	}
-
-	public void execute() {
-		link.getBendpoints().add(index, point);
-	}
-
-	public void undo() {
-		link.getBendpoints().remove(index);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/CreateLinkCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/CreateLinkCommand.java
deleted file mode 100755
index 17c7822..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/CreateLinkCommand.java
+++ /dev/null
@@ -1,107 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.commands;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.epf.authoring.gef.util.Validation;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.gef.commands.Command;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class CreateLinkCommand extends Command {
-
-	private Link link;
-
-	private Node source, target;
-
-	private Point targetEndPoint;
-
-	private Point sourceEndPoint;
-
-	private static final String LABEL = AuthoringUIResources.gef_createLinkCommand_label; //$NON-NLS-1$
-
-	public CreateLinkCommand(Link newObj, Node src) {
-		super(LABEL);
-		link = newObj;
-		source = src;
-	}
-
-	public boolean canExecute() {
-		boolean result = source != null && target != null && link != null;
-		if (!result)
-			return result;
-
-		String msg = Validation.checkConnect(source, target, link);
-		if (msg != null) {
-			return false;
-		}
-		return true;
-	}
-
-	public void execute() {
-		if (source == target) {
-			link.getBendpoints().add(
-					new AbsoluteBendpoint(source.getLocation().getTranslated(
-							-10, 10)));
-			link.getBendpoints().add(
-					new AbsoluteBendpoint(source.getLocation().getTranslated(
-							-10, -10)));
-			link.getBendpoints().add(
-					new AbsoluteBendpoint(source.getLocation().getTranslated(
-							10, -10)));
-		}
-
-		link.setTargetEndPoint(targetEndPoint);
-		link.setSourceEndPoint(sourceEndPoint);
-		link.setSource(source);
-		link.setTarget(target);
-	}
-
-	public void setTarget(Node target) {
-		this.target = target;
-	}
-
-	public void setTargetEndPoint(Point p) {
-		targetEndPoint = p;
-	}
-
-	public void setSourceEndPoint(Point p) {
-		sourceEndPoint = p;
-	}
-
-	public Point getTargetEndPoint() {
-		return targetEndPoint;
-	}
-
-	/**
-	 * @return Returns the sourceEndPoint.
-	 */
-	public Point getSourceEndPoint() {
-		return sourceEndPoint;
-	}
-
-	public void undo() {
-		link.setSourceEndPoint(null);
-		link.setTargetEndPoint(null);
-		link.setSource(null);
-		link.setTarget(null);
-		if (source == target) {
-			link.getBendpoints().clear();
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/CreateNodeCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/CreateNodeCommand.java
deleted file mode 100755
index 5f5b445..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/CreateNodeCommand.java
+++ /dev/null
@@ -1,68 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.commands;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.Node;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class CreateNodeCommand extends DiagramModifyCommand {
-
-	private Point loc;
-
-	private Node node;
-
-	private Diagram diagram;
-
-	private static final String LABEL = AuthoringUIResources.gef_createNodeCommand_label; //$NON-NLS-1$
-
-	public CreateNodeCommand(Node newObject, Diagram parent, Point location) {
-		super(LABEL);
-		node = newObject;
-		diagram = parent;
-		loc = location.getCopy();
-		setDiagram(parent);
-	}
-
-	public void undo() {
-		node.setLocation(null);
-		node.setDiagram(null);
-		diagram.getNodes().remove(node);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.commands.DiagramModifyCommand#doExecute()
-	 */
-	protected void doExecute() {
-		node.setLocation(loc);
-		node.setDiagram(diagram);
-		if (node instanceof NamedNode) {
-			diagram.setDefaultName((NamedNode) node);
-		}
-		diagram.getNodes().add(node);
-	}
-
-	public boolean canExecute() {
-		if (diagram instanceof Diagram) {
-			if (diagram.isReadOnly()) {
-				return false;
-			}
-		}
-		return super.canExecute();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/DeleteBendpointCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/DeleteBendpointCommand.java
deleted file mode 100755
index d1f1023..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/DeleteBendpointCommand.java
+++ /dev/null
@@ -1,51 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.commands;
-
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.gef.commands.Command;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class DeleteBendpointCommand extends Command {
-
-	private Link link;
-
-	private Bendpoint bendpoint;
-
-	private int index;
-
-	private static final String LABEL = AuthoringUIResources.gef_deleteBendpointCommand_label; //$NON-NLS-1$
-
-	public DeleteBendpointCommand(Link link, int index) {
-		super(LABEL);
-		this.link = link;
-		this.index = index;
-		bendpoint = (Bendpoint) link.getBendpoints().get(index);
-	}
-
-	public boolean canExecute() {
-		return index >= 0 && bendpoint != null && link != null;
-	}
-
-	public void execute() {
-		link.getBendpoints().remove(index);
-	}
-
-	public void undo() {
-		link.getBendpoints().add(index, bendpoint);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/DeleteCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/DeleteCommand.java
deleted file mode 100755
index 717acf2..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/DeleteCommand.java
+++ /dev/null
@@ -1,201 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.commands;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.epf.authoring.gef.util.Validation;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.NodeContainer;
-import org.eclipse.gef.commands.Command;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class DeleteCommand extends Command {
-
-	private Command delegate;
-
-	private static final String LABEL = AuthoringUIResources.gef_deleteCommand_label; //$NON-NLS-1$
-
-	public static final String KEY_PERM_DELETE = "gef.ediagram.$perm"; //$NON-NLS-1$
-
-	public DeleteCommand(boolean hardDelete) {
-		super(LABEL);
-	}
-
-	public boolean canExecute() {
-		return delegate != null && delegate.canExecute();
-	}
-
-	public void execute() {
-		delegate.execute();
-	}
-
-	public Command setPartToBeDeleted(Object model) {
-		if (model instanceof Node)
-			delegate = new DeleteNodeCommand(model);
-		else
-			delegate = null;
-		return this;
-	}
-
-	public void undo() {
-		delegate.undo();
-	}
-
-	private static class DeleteNodeCommand extends Command {
-		protected Map incomingConnectionsToSource;
-
-		protected Map outgoingConnectionsToTarget;
-
-		protected NodeContainer container;
-
-		protected Node node;
-
-		protected int index;
-
-		public DeleteNodeCommand(Object node) {
-			this.node = (Node) node;
-			container = (NodeContainer) this.node.eContainer();
-		}
-
-		public void execute() {
-			index = container.getNodes().indexOf(node);
-			// There's always the possibility that this node has already been
-			// deleted by the time this command is executed (eg., when the
-			// package containing this class is also selected). Hence, we check
-			// to see if the node exists in the diagram. If not, do nothing.
-			if (index == -1)
-				return;
-			incomingConnectionsToSource = new HashMap();
-			outgoingConnectionsToTarget = new HashMap();
-			for (Iterator iter = node.getOutgoingConnections().iterator(); iter
-					.hasNext();) {
-				Link link = (Link) iter.next();
-				outgoingConnectionsToTarget.put(link, link.getTarget());
-				link.setTarget(null);
-			}
-			for (Iterator iter = node.getIncomingConnections().iterator(); iter
-					.hasNext();) {
-				Link link = (Link) iter.next();
-				incomingConnectionsToSource.put(link, link.getSource());
-				link.setSource(null);
-			}
-			// Commenting below two lines, Links get removed from the model
-			// when link.setTarget(null) or link.setSource(null) is done.  For 
-			// Node if we clear incoming/outgoing connections, Undo command will not work.
-			
-			//node.getOutgoingConnections().clear();
-			//node.getIncomingConnections().clear();
-			container.getNodes().remove(index);
-		}
-
-		public void undo() {
-			if (index == -1)
-				return;
-			container.getNodes().add(index, node);
-			for (Iterator iter = outgoingConnectionsToTarget.keySet()
-					.iterator(); iter.hasNext();) {
-				Link link = (Link) iter.next();
-				link.setTarget((Node) outgoingConnectionsToTarget.get(link));
-				link.setSource(node);
-			}
-			for (Iterator iter = incomingConnectionsToSource.keySet()
-					.iterator(); iter.hasNext();) {
-				Link link = (Link) iter.next();
-				link.setTarget(node);
-				link.setSource((Node) incomingConnectionsToSource.get(link));
-			}
-			outgoingConnectionsToTarget = null;
-			incomingConnectionsToSource = null;
-		}
-
-		/**
-		 * @see org.eclipse.gef.commands.Command#canExecute()
-		 */
-		public boolean canExecute() {
-			if (Validation.checkDelete(node) != null)
-				return false;
-			return super.canExecute();
-		}
-	}
-	/*
-	 * Not in use. Need modification for future feature implementations. 
-	 * Compound Command deletion do the recursive deletion and undo. 
-	 */
-//	private static class DeleteNodeCompoundCommand extends CompoundCommand {
-//		protected Map incomingConnectionsToSource;
-//
-//		protected Map outgoingConnectionsToTarget;
-//
-//		protected NodeContainer container;
-//
-//		protected Node node;
-//
-//		protected int index;
-//
-//		public DeleteNodeCompoundCommand(Object node) {
-//			this.node = (Node) node;
-//			container = (NodeContainer) this.node.eContainer();
-//			incomingConnectionsToSource = new HashMap();
-//			outgoingConnectionsToTarget = new HashMap();
-//			for (Iterator iter = this.node.getOutgoingConnections().iterator(); iter
-//					.hasNext();) {
-//				Link link = (Link) iter.next();
-//				outgoingConnectionsToTarget.put(link, link.getTarget());
-//				add(new DeleteLinkCommand( link, false));
-//			}
-//			for (Iterator iter = this.node.getIncomingConnections().iterator(); iter
-//					.hasNext();) {
-//				Link link = (Link) iter.next();
-//				incomingConnectionsToSource.put(link, link.getSource());
-//				add(new DeleteLinkCommand( link, false));
-//			}
-//		}
-//
-//		public void execute() {
-//			index = container.getNodes().indexOf(node);
-//			// There's always the possibility that this node has already been
-//			// deleted by the time this command is executed (eg., when the
-//			// package containing this class is also selected). Hence, we check
-//			// to see if the node exists in the diagram. If not, do nothing.
-//			if (index == -1)
-//				return;
-//
-//			super.execute();
-//			container.getNodes().remove(index);
-//			
-//		}
-//
-//		public void undo() {
-//			if (index == -1)
-//				return;
-//			container.getNodes().add(index, node);
-//			super.undo();
-//		}
-//
-//		/**
-//		 * @see org.eclipse.gef.commands.Command#canExecute()
-//		 */
-//		public boolean canExecute() {
-//			if (Validation.checkDelete(node) != null)
-//				return false;
-//			return super.canExecute();
-//		}
-//	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/DeleteLinkCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/DeleteLinkCommand.java
deleted file mode 100755
index 30e5f1b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/DeleteLinkCommand.java
+++ /dev/null
@@ -1,68 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.commands;
-
-import org.eclipse.epf.authoring.gef.util.Validation;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.gef.commands.Command;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class DeleteLinkCommand extends Command {
-
-	private Link link;
-
-	private Node src, target;
-
-	private int srcIndex, targetIndex;
-
-	private static final String LABEL = AuthoringUIResources.gef_deleteLinkCommand_label; //$NON-NLS-1$
-
-	public DeleteLinkCommand(Link link, boolean isHardDelete) {
-		super(LABEL);
-		this.link = link;
-		src = link.getSource();
-		target = link.getTarget();
-	}
-
-	public boolean canExecute() {
-		if (Validation.checkDelete(link) != null)
-			return false;
-		return link != null && src != null && target != null;
-	}
-
-	/*
-	 * This should work even if the link (view) was deleted. Eg., user selects a
-	 * class and one of its references, and hits Ctrl+Del. The class will be
-	 * deleted first and it will delete all its references. When this command is
-	 * executed, it should do the hard-delete part.
-	 */
-	public void execute() {
-		srcIndex = src.getOutgoingConnections().indexOf(link);
-		targetIndex = target.getIncomingConnections().indexOf(link);
-		if (srcIndex != -1 && targetIndex != -1) {
-			src.getOutgoingConnections().remove(srcIndex);
-			target.getIncomingConnections().remove(targetIndex);
-		}
-	}
-
-	public void undo() {
-		if (srcIndex != -1 && targetIndex != -1) {
-			src.getOutgoingConnections().add(srcIndex, link);
-			target.getIncomingConnections().add(targetIndex, link);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/DiagramModifyCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/DiagramModifyCommand.java
deleted file mode 100755
index 6c79536..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/DiagramModifyCommand.java
+++ /dev/null
@@ -1,78 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.commands;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.authoring.gef.util.DiagramUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.gef.commands.Command;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public abstract class DiagramModifyCommand extends Command {
-
-	private EObject object;
-
-	private boolean canUndo = true;
-
-	public DiagramModifyCommand(String label) {
-		super(label);
-	}
-
-	protected void setDiagram(Diagram diagram) {
-		Object obj = diagram.getObject();
-		if (obj instanceof EObject) {
-			object = (EObject) obj;
-		}
-	}
-
-	protected boolean prepareExecute() {
-		IStatus status = UserInteractionHelper.checkModify(object, MsgBox.getDefaultShell());
-		if (status.isOK()) {
-			return true;
-		} else {
-			AuthoringUIPlugin.getDefault().getMsgDialog()
-					.displayWarning(
-							DiagramUIResources.errorDialog_title, //$NON-NLS-1$
-							DiagramUIResources.command_cannotEdit, //$NON-NLS-1$
-							status);
-			return false;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gef.commands.Command#execute()
-	 */
-	public void execute() {
-		if (prepareExecute()) {
-			doExecute();
-			canUndo = true;
-		} else {
-			canUndo = false;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gef.commands.Command#canUndo()
-	 */
-	public boolean canUndo() {
-		return canUndo;
-	}
-
-	protected abstract void doExecute();
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/MoveBendpointCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/MoveBendpointCommand.java
deleted file mode 100755
index a328b5c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/MoveBendpointCommand.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.commands;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.gef.commands.Command;
-
-/**
- * Bendpoint manipulation commands cannot be chained or compounded.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MoveBendpointCommand extends Command {
-
-	private Link link;
-
-	private int index;
-
-	private Bendpoint oldBendpoint, newBendpoint;
-
-	private static final String LABEL = AuthoringUIResources.gef_moveBendpointCommand_label; //$NON-NLS-1$
-
-	public MoveBendpointCommand(Link link, Point location, int index) {
-		super(LABEL);
-		this.link = link;
-		this.index = index;
-		newBendpoint = new AbsoluteBendpoint(location);
-		oldBendpoint = (Bendpoint) link.getBendpoints().get(index);
-	}
-
-	public boolean canExecute() {
-		return link != null && index >= 0 && newBendpoint != null
-				&& oldBendpoint != null;
-	}
-
-	public void execute() {
-		link.getBendpoints().set(index, newBendpoint);
-	}
-
-	public void undo() {
-		link.getBendpoints().set(index, oldBendpoint);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/ReconnectLinkCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/ReconnectLinkCommand.java
deleted file mode 100755
index b42de5b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/ReconnectLinkCommand.java
+++ /dev/null
@@ -1,93 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.commands;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.epf.authoring.gef.util.Validation;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.gef.commands.Command;
-
-/**
- * @author Phong Nguyen Le
- * @since 3.1
- */
-public class ReconnectLinkCommand extends Command {
-
-	private boolean isSource;
-
-	private Link link;
-
-	private Node newNode, oldNode;
-
-	private int viewIndex;
-
-	private Point endPoint;
-
-	private static final String LABEL = AuthoringUIResources.gef_reconnectLinkCommand_label; //$NON-NLS-1$
-
-	public ReconnectLinkCommand(Link link, Node newNode, boolean isSource) {
-		super(LABEL);
-		this.link = link;
-		this.newNode = newNode;
-		this.isSource = isSource;
-	}
-
-	public void setEndPoint(Point p) {
-		endPoint = p.getCopy();
-	}
-
-	public boolean canExecute() {
-		boolean result = link != null && newNode != null;
-		if (!result) {
-			return false;
-		}
-		if (isSource) {
-			return Validation.checkReconnect(newNode, link.getTarget(), link) == null;
-		} else {
-			return Validation.checkReconnect(link.getSource(), newNode, link) == null;
-		}
-	}
-
-	public void execute() {
-
-		// Link
-		if (isSource) {
-			oldNode = link.getSource();
-			if (oldNode != null) { // safety check to handle dangling link
-				viewIndex = oldNode.getOutgoingConnections().indexOf(link);
-			}
-			link.setSource(newNode);
-			link.setSourceEndPoint(endPoint);
-		} else {
-			oldNode = link.getTarget();
-			if (oldNode != null) { // safety check to handle dangling link
-				viewIndex = oldNode.getIncomingConnections().indexOf(link);
-			}
-			link.setTarget(newNode);
-			link.setTargetEndPoint(endPoint);
-		}
-
-	}
-
-	public void undo() {
-		if (isSource) {
-			newNode.getOutgoingConnections().remove(link);
-			oldNode.getOutgoingConnections().add(viewIndex, link);
-		} else {
-			newNode.getIncomingConnections().remove(link);
-			oldNode.getIncomingConnections().add(viewIndex, link);
-		}
-		oldNode = null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/RefreshDiagramFromBaseActivityCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/RefreshDiagramFromBaseActivityCommand.java
deleted file mode 100755
index 23f8705..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/RefreshDiagramFromBaseActivityCommand.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.commands;
-
-import org.eclipse.epf.authoring.gef.util.DiagramUIResources;
-import org.eclipse.gef.commands.Command;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class RefreshDiagramFromBaseActivityCommand extends Command {
-
-	private static final String LABEL = DiagramUIResources.refreshFromBaseCmd_label; //$NON-NLS-1$
-
-	public RefreshDiagramFromBaseActivityCommand() {
-		super(LABEL);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/package.html
deleted file mode 100755
index 4ce2d7b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/commands/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides commands for editing the activity diagrams.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ActivityDetailDiagramEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ActivityDetailDiagramEditPart.java
deleted file mode 100755
index 7050436..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ActivityDetailDiagramEditPart.java
+++ /dev/null
@@ -1,321 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.TaskNode;
-import org.eclipse.epf.diagram.model.WorkProductComposite;
-import org.eclipse.epf.diagram.model.WorkProductDescriptorNode;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-
-
-/**
- * @author Phong Nguyen Le
- * @author Shashidhar Kannoori
- * @since 1.0
- * 
- */
-public class ActivityDetailDiagramEditPart extends DiagramEditPart {
-
-	int y = 60;
-
-	boolean xaxisbegin = false;
-
-	boolean loading = true;
-
-	final static int spacing = 40;
-
-	final static int yspacing = 20;
-
-	boolean miscellaneous = false;
-
-	int x = 10;
-
-	public static final String OUTPUTS = "outputs"; //$NON-NLS-1$
-
-	public static final String INPUTS = "inputs"; //$NON-NLS-1$
-
-	private List recentlyAddedParts = new ArrayList();
-
-	/** 
-	 * EditPart for ActivityDetailDiagram.
-	 */
-	public ActivityDetailDiagramEditPart(ActivityDetailDiagram model) {
-		super(model);
-	}
-
-	/**
-	 * Override method super.resetChildrenLocations. In this, All the Task's
-	 * MandatoryInput workproducts placed on top. and RoleTask composite in the
-	 * middle. and Task's output workproducts south.
-	 */
-	protected void resetChildrenLocations() {
-		final int yspacing = 40;
-		List rolecompositeList = new ArrayList();
-		List inputworkproductCompositeList = new ArrayList();
-		List outputWorkProductCompositeList = new ArrayList();
-		List miscList = new ArrayList();
-		List taskList = new ArrayList();
-		this.recentlyAddedParts = new ArrayList();
-
-		HashMap map = new HashMap();
-
-		for (Iterator iter = getChildren().iterator(); iter.hasNext();) {
-			Object child = iter.next();
-			Node n = (Node) ((EditPart) child).getModel();
-			if (n.getLocation() == null || n.getLocation().x == -1) {
-				this.recentlyAddedParts.add(child);
-			}
-			if (child instanceof RoleTaskCompositeEditPart) {
-				rolecompositeList.add(child);
-				List list = ((RoleTaskCompositeEditPart) child).getChildren();
-				for (Iterator it = list.iterator(); it.hasNext();) {
-					Object obj = it.next();
-					Node objNode = (Node) ((NodeEditPart) obj).getModel();
-					if (objNode instanceof TaskNode) {
-						taskList.add(objNode);
-						HashMap taskMap = new HashMap();
-						List inputList = new ArrayList();
-						List outputList = new ArrayList();
-						taskMap.put("inputs", inputList); //$NON-NLS-1$
-						taskMap.put("outputs", outputList); //$NON-NLS-1$
-						map.put(objNode, taskMap);
-					}
-				}
-			} else if (child instanceof WorkProductCompositeEditPart) {
-				GraphicalEditPart part = (GraphicalEditPart) child;
-				if (part.getModel() instanceof WorkProductComposite) {
-					WorkProductComposite node = (WorkProductComposite) part
-							.getModel();
-					if (node.getType() == WorkProductComposite.INPUTS) {
-						inputworkproductCompositeList.add(child);
-					} else if (node.getType() == WorkProductComposite.OUTPUTS) {
-						outputWorkProductCompositeList.add(child);
-					}
-					calcSize(child);
-				}
-			} else {
-				miscList.add(child);
-			}
-		}
-
-		// Set size for the rolecomposite.
-		if (!rolecompositeList.isEmpty()) {
-			for (Iterator itor = rolecompositeList.iterator(); itor.hasNext();) {
-				Object object = itor.next();
-				List list = ((RoleTaskCompositeEditPart) object).getChildren();
-				for (Iterator itor1 = list.iterator(); itor1.hasNext();) {
-					Object obj = itor1.next();
-					if (obj instanceof DescriptorNodeEditPart) {
-						if (((DescriptorNodeEditPart) obj).getModel() instanceof TaskNode) {
-							TaskNode taskNode = (TaskNode) ((DescriptorNodeEditPart) obj)
-									.getModel();
-							TaskDescriptor task = (TaskDescriptor) taskNode
-									.getObject();
-							for (Iterator wpitor = inputworkproductCompositeList
-									.iterator(); wpitor.hasNext();) {
-								WorkProductCompositeEditPart wpEditPart = (WorkProductCompositeEditPart) wpitor
-										.next();
-								WorkProductComposite wpCompositeNode = (WorkProductComposite) wpEditPart
-										.getModel();
-								Object wpObject = wpCompositeNode.getObject();
-								if (wpObject.equals(task)) {
-									int width = wpEditPart.getFigure()
-											.getPreferredSize().width;
-									int height = ((DescriptorNodeEditPart) obj)
-											.getFigure().getPreferredSize().height;
-									((DescriptorNodeEditPart) obj)
-											.getFigure()
-											.setPreferredSize(
-													new Dimension(width, height));
-									if (((WorkProductComposite) wpEditPart
-											.getModel()).getType() == WorkProductComposite.INPUTS) {
-										List inputList = (List) ((HashMap) map
-												.get(taskNode)).get(INPUTS);
-										inputList.add(wpEditPart);
-									} else if (((WorkProductComposite) wpEditPart
-											.getModel()).getType() == WorkProductComposite.OUTPUTS) {
-										List outputList = (List) ((HashMap) map
-												.get(taskNode)).get(OUTPUTS);
-										outputList.add(wpEditPart);
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		if (!rolecompositeList.isEmpty()) {
-			for (int i = 0; i < rolecompositeList.size(); i++) {
-				List confirmedSeqInputList = new ArrayList();
-				List confirmedSeqOutputList = new ArrayList();
-				List list = ((RoleTaskCompositeEditPart) rolecompositeList
-						.get(i)).getChildren();
-				for (int j = 0; j < list.size(); j++) {
-					DescriptorNodeEditPart task = (DescriptorNodeEditPart) list
-							.get(j);
-					if (task.getModel() instanceof TaskNode) {
-						TaskNode tasknode = (TaskNode) task.getModel();
-						for (int k = 0; k < inputworkproductCompositeList
-								.size(); k++) {
-							WorkProductComposite wpcomp = ((WorkProductComposite) ((WorkProductCompositeEditPart) inputworkproductCompositeList
-									.get(k)).getModel());
-							if (wpcomp.getObject().equals(tasknode.getObject())) {
-								if (wpcomp.getType() == WorkProductComposite.INPUTS) {
-									confirmedSeqInputList
-											.add(inputworkproductCompositeList
-													.get(k));
-								}
-							}
-						}
-						for (int k = 0; k < outputWorkProductCompositeList
-								.size(); k++) {
-							WorkProductComposite wpcomp = ((WorkProductComposite) ((WorkProductCompositeEditPart) outputWorkProductCompositeList
-									.get(k)).getModel());
-							if (wpcomp.getObject().equals(tasknode.getObject())) {
-								if (wpcomp.getType() == WorkProductComposite.OUTPUTS) {
-									confirmedSeqOutputList
-											.add(outputWorkProductCompositeList
-													.get(k));
-								}
-							}
-						}
-					}
-				}
-				if (!confirmedSeqInputList.isEmpty()) {
-					setObjectsLocations(confirmedSeqInputList);
-					y = cachedPoint.y + cachedHeight + yspacing;
-				}
-				List roleC = new ArrayList();
-				roleC.add(rolecompositeList.get(i));
-				setObjectsLocations(roleC);
-
-				y = cachedPoint.y + cachedHeight + yspacing;
-				if (!confirmedSeqOutputList.isEmpty()) {
-					setObjectsLocations(confirmedSeqOutputList);
-					y = cachedPoint.y + cachedHeight + yspacing;
-				}
-			}
-
-		}
-
-		if (!miscList.isEmpty()) {
-			if (debug) {
-				System.out.println("Print Size of misc: " + miscList.size()); //$NON-NLS-1$
-			}
-			if (!loading) {
-				miscellaneous = true;
-			}
-			setObjectsLocations(miscList);
-			miscellaneous = false;
-		}
-
-		loading = false;
-	}
-
-	private void calcSize(Object child) {
-		List list = ((GraphicalEditPart) child).getChildren();
-		int largestWidth = 0;
-		int largestHeight = 0;
-		for (Iterator it = list.iterator(); it.hasNext();) {
-			Object obj = it.next();
-			Node objNode = (Node) ((NodeEditPart) obj).getModel();
-			if (objNode instanceof WorkProductDescriptorNode) {
-				int nodeWidth = ((DescriptorNodeEditPart) obj).getFigure()
-						.getPreferredSize().width;
-				int nodeHeight = ((DescriptorNodeEditPart) obj).getFigure()
-						.getPreferredSize().height;
-				if (nodeWidth > largestWidth)
-					largestWidth = nodeWidth;
-				if (nodeHeight > largestHeight)
-					largestHeight = nodeHeight;
-			}
-		}
-		((WorkProductCompositeEditPart) child).getFigure().setPreferredSize(
-				new Dimension(largestWidth * 2 + 10, 20 + largestHeight
-						* (list.size() / 2 + 1)));
-	}
-
-	private void setObjectsLocations(List list) {
-
-		xaxisbegin = true;
-		x = 10;
-		for (Iterator iter = list.iterator(); iter.hasNext();) {
-			Object child = iter.next();
-			if (child instanceof GraphicalEditPart) {
-				GraphicalEditPart part = (GraphicalEditPart) child;
-				if (part.getModel() instanceof Node) {
-					Node node = (Node) part.getModel();
-					Point p = node.getLocation();
-					if (p == null || p.x == -1) {
-						int viewerWidth = part.getRoot().getViewer()
-								.getControl().getBounds().width;
-						if (!xaxisbegin) {
-							x = cachedPoint.x + cachedWidth + spacing;
-						}
-						// check if p is null, create Point.
-						if (p == null)
-							p = new Point();
-
-						if (!loading && miscellaneous) {
-							p.x = x;
-							p.y = 10;
-						} else {
-							p.x = x;
-							p.y = y;
-						}
-						node.setLocation(p);
-						if (!miscellaneous)
-							cachedPoint = p;
-						cachedWidth = part.getFigure().getPreferredSize().width;
-						if (part.getFigure().getPreferredSize().height > cachedHeight)
-							cachedHeight = part.getFigure().getPreferredSize().height;
-						xaxisbegin = false;
-						if (debug) {
-							System.out
-									.println("Point : " + new Point(x, y).toString() + "And width=" //$NON-NLS-1$ //$NON-NLS-2$
-											+ cachedWidth
-											+ ", Height=" + cachedHeight + ", Width of Viewer: " + viewerWidth); //$NON-NLS-1$ //$NON-NLS-2$
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns recently addded editparts. Usually called 
-	 * by diagram services to do autolayout adjustment.
-	 */
-	public List getRecentlyAddedParts() {
-		return recentlyAddedParts;
-	}
-
-	/**
-	 * Clear the recently added editparts from the list.
-	 */
-	public void clearRecentlyAddedParts() {
-		recentlyAddedParts.clear();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ActivityDetailDiagramEditPartFactory.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ActivityDetailDiagramEditPartFactory.java
deleted file mode 100755
index 9f46f55..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ActivityDetailDiagramEditPartFactory.java
+++ /dev/null
@@ -1,71 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.RoleNode;
-import org.eclipse.epf.diagram.model.RoleTaskComposite;
-import org.eclipse.epf.diagram.model.TaskNode;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.WorkProductComposite;
-import org.eclipse.epf.diagram.model.WorkProductDescriptorNode;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-
-/**
- * Factory for ActivityDetailDiagram's EditPart. Creates an EditPart for
- * Activity Detail Diagram's children.  
- * 
- * @author Jinhua Xi
- * @since 1.0
- * 
- */
-public class ActivityDetailDiagramEditPartFactory implements EditPartFactory {
-
-	/**
-	 * Creates an EditPart for a child with in the context.
-	 */
-	public EditPart createEditPart(EditPart context, Object model) {
-		if (model instanceof ActivityDetailDiagram) {
-			return new ActivityDetailDiagramEditPart(
-					(ActivityDetailDiagram) model);
-		} else if (model instanceof RoleTaskComposite) {
-			return new RoleTaskCompositeEditPart((RoleTaskComposite) model);
-		} else if (model instanceof WorkProductComposite) {
-			return new WorkProductCompositeEditPart(
-					(WorkProductComposite) model);
-		} else if (model instanceof RoleNode || model instanceof TaskNode
-				|| model instanceof WorkProductDescriptorNode) {
-			return new DescriptorNodeEditPart((NamedNode) model);
-		} else if (model instanceof Link) {
-			return new LinkEditPart((Link) model);
-		}
-		if (model instanceof TypedNode) {
-			TypedNode node = (TypedNode) model;
-			switch (node.getType()) {
-			case TypedNode.START:
-				return new StartNodeEditPart(node);
-			case TypedNode.END:
-				return new EndNodeEditPart(node);
-			case TypedNode.DECISION:
-				return new DecisionNodeEditPart(node);
-			case TypedNode.SYNCH_BAR:
-				return new SynchBarNodeEditPart(node);
-			case TypedNode.FREE_TEXT:
-				return new FreeTextNodeEditPart(node);
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ActivityDiagramEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ActivityDiagramEditPart.java
deleted file mode 100755
index 7079f90..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ActivityDiagramEditPart.java
+++ /dev/null
@@ -1,31 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.epf.diagram.model.ActivityDiagram;
-
-/**
- * EditPart for ActivityDiagram.
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class ActivityDiagramEditPart extends DiagramEditPart {
-
-	/**
-	 * Creates a editpart for Activity Diagram. 
-	 * 
-	 * @param model {@link ActivityDiagram}
-	 */
-	public ActivityDiagramEditPart(ActivityDiagram model) {
-		super(model);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ActivityDiagramEditPartFactory.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ActivityDiagramEditPartFactory.java
deleted file mode 100755
index 3ec976a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ActivityDiagramEditPartFactory.java
+++ /dev/null
@@ -1,58 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.epf.diagram.model.ActivityDiagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.WorkBreakdownElementNode;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class ActivityDiagramEditPartFactory implements EditPartFactory {
-
-	/**
-	 * Creates editpart for ActivityDiagram's children. 
-	 * 
-	 * @see org.eclipse.gef.EditPartFactory#createEditPart(org.eclipse.gef.EditPart,
-	 *      java.lang.Object)
-	 */
-	public EditPart createEditPart(EditPart context, Object model) {
-		if (model instanceof ActivityDiagram) {
-			return new ActivityDiagramEditPart((ActivityDiagram) model);
-		} else if (model instanceof WorkBreakdownElementNode) {
-			return new WorkBreakdownElementNodeEditPart((NamedNode) model);
-		} else if (model instanceof Link) {
-			return new LinkEditPart((Link) model);
-		} else if (model instanceof TypedNode) {
-			TypedNode node = (TypedNode) model;
-			switch (node.getType()) {
-			case TypedNode.START:
-				return new StartNodeEditPart(node);
-			case TypedNode.END:
-				return new EndNodeEditPart(node);
-			case TypedNode.DECISION:
-				return new DecisionNodeEditPart(node);
-			case TypedNode.SYNCH_BAR:
-				return new SynchBarNodeEditPart(node);
-			case TypedNode.FREE_TEXT:
-				return new FreeTextNodeEditPart(node);
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/BaseEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/BaseEditPart.java
deleted file mode 100755
index 32197da..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/BaseEditPart.java
+++ /dev/null
@@ -1,115 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.text.TextFlow;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.authoring.gef.edit.policies.LabelSelectionEditPolicy;
-import org.eclipse.epf.authoring.gef.figures.SelectableLabel;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.viewers.TextCellEditor;
-
-/**
- * Provides infrastructure for deletion, direct-editing, property source and
- * model-listening.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public abstract class BaseEditPart extends AbstractGraphicalEditPart {
-
-	protected DirectEditManager manager;
-
-	protected Adapter modelListener = new AdapterImpl() {
-		public void notifyChanged(Notification msg) {
-			handlePropertyChanged(msg);
-		}
-	};
-
-	/**
-	 * Constructor 
-	 * @param obj {@link EObject}
-	 */
-	public BaseEditPart(EObject obj) {
-		super();
-		setModel(obj);
-	}
-
-	public void activate() {
-		super.activate();
-		((EObject) getModel()).eAdapters().add(modelListener);
-	}
-
-	protected abstract DirectEditPolicy createDirectEditPolicy();
-
-	protected void createEditPolicies() {
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,
-				new LabelSelectionEditPolicy());
-	}
-
-	protected IFigure createFigure() {
-		return new SelectableLabel();
-	}
-
-	/**
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#deactivate()
-	 */
-	public void deactivate() {
-		((EObject) getModel()).eAdapters().remove(modelListener);
-		super.deactivate();
-	}
-
-	IFigure getDirectEditFigure() {
-		return getFigure();
-	}
-
-	String getDirectEditText() {
-		IFigure fig = getDirectEditFigure();
-		if (fig instanceof Label) {
-			return ((Label) fig).getText();
-		} else if (fig instanceof TextFlow) {
-			return ((TextFlow) fig).getText();
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	protected abstract void handlePropertyChanged(Notification msg);
-
-	protected DirectEditManager getDirectEditManager() {
-		if (manager == null) {
-			manager = createDirectEditManager();
-		}
-		return manager;
-	}
-
-	protected void performDirectEdit() {
-		getDirectEditManager();
-
-		if (manager != null) {
-			manager.show();
-		}
-	}
-
-	protected DirectEditManager createDirectEditManager() {
-		return new LabelDirectEditManager(this, TextCellEditor.class,
-				new LabelCellEditorLocator(getDirectEditFigure()));
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/BottomAnchor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/BottomAnchor.java
deleted file mode 100755
index 9b7f56a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/BottomAnchor.java
+++ /dev/null
@@ -1,45 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.AbstractConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * Provides support for bottom anchor for a figure's bottom location.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-class BottomAnchor extends AbstractConnectionAnchor {
-
-	private int offset;
-
-	BottomAnchor(IFigure source, int offset) {
-		super(source);
-		this.offset = offset;
-	}
-
-	public Point getLocation(Point reference) {
-		Rectangle r = getOwner().getBounds().getCopy();
-		getOwner().translateToAbsolute(r);
-		int off = offset;
-		if (off == -1)
-			off = r.width / 2;
-		if (r.contains(reference) || r.bottom() > reference.y)
-			return r.getTopLeft().translate(off, 0);
-		else
-			return r.getBottomLeft().translate(off, -1);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ClosestAnchor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ClosestAnchor.java
deleted file mode 100755
index c604a5e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ClosestAnchor.java
+++ /dev/null
@@ -1,106 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.AbstractConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.epf.authoring.gef.util.AnchorUtil;
-
-/**
- * Provides support to find the closest location in figure
- * for anchor. 
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class ClosestAnchor extends AbstractConnectionAnchor {
-
-	public ClosestAnchor(IFigure figure) {
-		super(figure);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.ConnectionAnchor#getLocation(Point)
-	 */
-	public Point getLocation(Point reference) {
-		return getLocation(getOwner(), reference);
-	}
-
-	/**
-	 * Finds the location in the closest location in figure, based on 
-	 * figure bounds and the reference point.   
-	 * 
-	 * @param figure {@link IFigure}  Figure to which connection is establishing.
-	 * @param reference {@link Point}
-	 */
-	public static Point getLocation(IFigure figure, Point reference) {
-		Rectangle r = figure.getBounds().getCopy();
-		figure.translateToAbsolute(r);
-		Rectangle absoluteBounds = r.getCopy();
-		Point p = null;
-		switch (r.getPosition(reference)) {
-		case PositionConstants.NORTH:
-			p = r.getTopLeft().translate(reference.x - r.x, 0);
-			break;
-		case PositionConstants.NORTH_EAST:
-			p = r.getTopRight();
-			break;
-		case PositionConstants.EAST:
-			p = r.getTopRight().translate(0, reference.y - r.y);
-			break;
-		case PositionConstants.SOUTH_EAST:
-			p = r.getBottomRight();
-			break;
-		case PositionConstants.SOUTH:
-			p = r.getBottomLeft().translate(reference.x - r.x, 0);
-			break;
-		case PositionConstants.SOUTH_WEST:
-			p = r.getBottomLeft();
-			break;
-		case PositionConstants.WEST:
-			p = r.getTopLeft().translate(0, reference.y - r.y);
-			break;
-		case PositionConstants.NORTH_WEST:
-			p = r.getTopLeft();
-			break;
-		default:
-			int topDistance = reference.y - r.y;
-			int rightDistance = r.right() - reference.x;
-			int bottomDistance = r.bottom() - reference.y;
-			int leftDistance = reference.x - r.x;
-			int[] distances = { topDistance, rightDistance, bottomDistance,
-					leftDistance };
-			int id = AnchorUtil.min(distances);
-			switch (id) {
-			case 0:
-				p = r.getTopLeft().translate(leftDistance, 0);
-				break;
-			case 1:
-				p = r.getTopRight().translate(0, topDistance);
-				break;
-			case 2:
-				p = r.getBottomLeft().translate(leftDistance, 0);
-				break;
-			case 4:
-				p = r.getTopLeft().translate(topDistance, 0);
-				break;
-			}
-		}
-		if (p != null) {
-			p.performTranslate(-absoluteBounds.x, -absoluteBounds.y);
-		}
-		return p;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/DecisionNodeEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/DecisionNodeEditPart.java
deleted file mode 100755
index 89e2abf..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/DecisionNodeEditPart.java
+++ /dev/null
@@ -1,171 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.epf.authoring.gef.figures.Diamond;
-import org.eclipse.epf.authoring.gef.util.AnchorUtil;
-import org.eclipse.epf.authoring.gef.util.ConnectionAnchorLocator;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.LocationRequest;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * EditPart for  DecisionNode, used in activity diagram.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class DecisionNodeEditPart extends NodeEditPart implements
-		ConnectionAnchorLocator {
-
-	private static final Color BG_COLOR = new Color(null, 254, 204, 153);
-
-	private Point recentSourceEndPoint;
-
-	private Point recentTargetEndPoint;
-
-	public DecisionNodeEditPart(TypedNode model) {
-		super(model);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.BaseEditPart#createDirectEditPolicy()
-	 */
-	protected DirectEditPolicy createDirectEditPolicy() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.BaseEditPart#createFigure()
-	 */
-	protected IFigure createFigure() {
-		Diamond figure = new Diamond();
-		figure.setBackgroundColor(BG_COLOR);
-		figure.setSize(48, 24);
-		return figure;
-	}
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.edit.NodeEditPart#getSourceConnectionAnchor(org.eclipse.gef.ConnectionEditPart)
-	 */
-	public ConnectionAnchor getSourceConnectionAnchor(
-			ConnectionEditPart connection) {
-		boolean isRelative = false;
-		Point sourceEndPoint;
-		if (recentSourceEndPoint == null) {
-			// get source end point from the model
-			Link link = (Link) connection.getModel();
-			sourceEndPoint = link.getSourceEndPoint();
-			isRelative = true;
-		} else {
-			sourceEndPoint = recentSourceEndPoint;
-		}
-		if (sourceEndPoint != null) {
-			return new RelativeXYAnchor(getFigure(), sourceEndPoint, isRelative);
-		}
-		return super.getSourceConnectionAnchor(connection);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.edit.NodeEditPart#getSourceConnectionAnchor(org.eclipse.gef.Request)
-	 */
-	public ConnectionAnchor getSourceConnectionAnchor(Request request) {
-		Point p = null;
-		if (request instanceof CreateConnectionRequest) {
-			CreateConnectionRequest req = (CreateConnectionRequest) request;
-			p = req.getLocation();
-		} else if (request instanceof LocationRequest) {
-			p = ((LocationRequest) request).getLocation();
-		}
-		if (p != null) {
-			recentSourceEndPoint = getLocation(p);
-			return new RelativeXYAnchor(getFigure(), recentSourceEndPoint, true);
-		}
-		return super.getSourceConnectionAnchor(request);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.edit.NodeEditPart#getTargetConnectionAnchor(org.eclipse.gef.ConnectionEditPart)
-	 */
-	public ConnectionAnchor getTargetConnectionAnchor(
-			ConnectionEditPart connection) {
-		boolean isRelative = false;
-		Point targetEndPoint;
-		if (recentTargetEndPoint == null) {
-			// get target end point from model
-			Link link = (Link) connection.getModel();
-			targetEndPoint = link.getTargetEndPoint();
-			isRelative = true;
-		} else {
-			targetEndPoint = recentTargetEndPoint;
-		}
-		if (targetEndPoint != null) {
-			return new RelativeXYAnchor(getFigure(), targetEndPoint, isRelative);
-		}
-
-		return super.getTargetConnectionAnchor(connection);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.edit.NodeEditPart#getTargetConnectionAnchor(org.eclipse.gef.Request)
-	 */
-	public ConnectionAnchor getTargetConnectionAnchor(Request request) {
-		Point p = null;
-		if (request instanceof CreateConnectionRequest) {
-			CreateConnectionRequest req = (CreateConnectionRequest) request;
-			p = req.getLocation();
-		} else if (request instanceof LocationRequest) {
-			p = ((LocationRequest) request).getLocation();
-		}
-		if (p != null) {
-			recentTargetEndPoint = getLocation(p);
-			return new RelativeXYAnchor(getFigure(), recentTargetEndPoint, true);
-		}
-
-		return super.getTargetConnectionAnchor(request);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.util.ConnectionAnchorLocator#getLocation(Point)
-	 */
-	public Point getLocation(Point reference) {
-		Diamond f = ((Diamond) getFigure());
-
-		// translate points to absolute
-		Point[] points = new Point[f.getPoints().size()];
-		for (int i = f.getPoints().size() - 1; i > -1; i--) {
-			Point p = f.getPoints().getPoint(i);
-			f.translateToAbsolute(p);
-			points[i] = p;
-		}
-
-		Point p = AnchorUtil.getClosestPoint(points, reference);
-		if (p != null) {
-			Rectangle r = f.getBounds().getCopy();
-			f.translateToAbsolute(r);
-			p.performTranslate(-r.x, -r.y);
-		}
-		return p;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/DescriptorNodeEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/DescriptorNodeEditPart.java
deleted file mode 100755
index aa7a64b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/DescriptorNodeEditPart.java
+++ /dev/null
@@ -1,121 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.epf.authoring.gef.figures.Images;
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.LinkedObject;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.RoleNode;
-import org.eclipse.epf.diagram.model.TaskNode;
-import org.eclipse.epf.diagram.model.WorkProductDescriptorNode;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Artifact;
-import org.eclipse.epf.uma.Deliverable;
-import org.eclipse.epf.uma.Outcome;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * EditPart for WorkBreakdown Elements in an Activity.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class DescriptorNodeEditPart extends NamedNodeEditPart {
-
-	public DescriptorNodeEditPart(NamedNode model) {
-		super(model);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.NamedNodeEditPart#getImage()
-	 */
-	protected Image getImage() {
-		Object model = getModel();
-		if (model instanceof RoleNode) {
-			if(((Node)model).getDiagram() instanceof ActivityDetailDiagram)
-				return Images.ROLE_DESCRIPTOR_16;
-			return Images.ROLE;
-		} else if (model instanceof TaskNode) {
-			if(((Node)model).getDiagram() instanceof ActivityDetailDiagram)
-				return Images.TASK_DESCRIPTOR_16;
-			return Images.TASK_DESCRIPTOR;
-		} else if (model instanceof WorkProductDescriptorNode) {
-			if(((Node)model).getDiagram() instanceof ActivityDetailDiagram)
-				return Images.WORK_PRODUCT_DESCRIPTOR_16;
-			WorkProductDescriptor wpd = (WorkProductDescriptor) ((LinkedObject) model)
-					.getObject();
-			WorkProduct wp = wpd.getWorkProduct();
-			if (wp instanceof Artifact) {
-				return Images.WORK_PRODUCT_DESCRIPTOR_16;
-			} else if (wp instanceof Deliverable) {
-				return Images.DELIVERABLE;
-			} else if (wp instanceof Outcome) {
-				return Images.OUTCOME;
-			}
-			return Images.WORK_PRODUCT_DESCRIPTOR_16;
-		}
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.NamedNodeEditPart#createDirectEditPolicy() *
-	 */
-	protected DirectEditManager createDirectEditManager() {
-		Label l = (Label) getFigure();
-		return new ValidatingDirectEditManager(this, TextCellEditor.class,
-				new LabelTextCellEditorLocator(l), l) {
-
-			protected String validate(String txt) {
-				Object obj = getEditPart().getModel();
-				if (obj instanceof WorkProductDescriptorNode) {
-					Node node = (Node) obj;
-					Object e = node.getObject();
-					return TngUtil.checkWorkProductDescriptorPresentationName(
-							e, txt, node.getDiagram().getSuppression());
-				}
-				if (obj instanceof TaskNode) {
-					Node node = (Node) obj;
-					Object e = node.getObject();
-					return TngUtil.checkWorkBreakdownElementPresentationName(e,
-							txt, node.getDiagram().getSuppression());
-				}
-				if (obj instanceof RoleNode) {
-					Node node = (Node) obj;
-					Object e = node.getObject();
-					return TngUtil.checkRoleDescriptorPresentationName(e, txt, node.getDiagram().getSuppression());
-				}
-
-				return super.validate(txt);
-			}
-		};
-	}
-
-	protected void refreshSourceConnections() {
-		super.refreshSourceConnections();
-	}
-
-	protected void createEditPolicies() {
-		super.createEditPolicies();
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, null);
-	}
-	protected DirectEditManager getDirectEditManager() {
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/DiagramActionService.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/DiagramActionService.java
deleted file mode 100755
index 17c29c4..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/DiagramActionService.java
+++ /dev/null
@@ -1,514 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.epf.authoring.gef.commands.ChangeBoundsCommand;
-import org.eclipse.epf.authoring.gef.commands.ReconnectLinkCommand;
-import org.eclipse.epf.authoring.gef.util.DiagramUIResources;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-
-/**
- * Service class to allow create and register common action to the action
- * register. Most of the code are moved from the Editor class.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class DiagramActionService {
-
-	public static final String ALIGN_HORZ_AVERAGE = "align_horizontal_to_average"; //$NON-NLS-1$
-
-	public static final String ALIGN_HORZ_FIRST_SELECTED = "align_horizontal_to_first_selection"; //$NON-NLS-1$
-
-	public static final String ALIGN_VERT_AVERAGE = "align_vertical_to_average"; //$NON-NLS-1$
-
-	public static final String ALIGN_VERT_FIRST_SELECTED = "align_vertical_to_first_selection"; //$NON-NLS-1$
-
-	private DefaultEditDomain editDomain;
-
-	private GraphicalViewer graphicalViewer;
-
-	private ActionRegistry actionRegistry;
-
-	/**
-	 * Constructor 
-	 * @param graphicalViewer {@link GraphicalViewer}
-	 * @param editDomain 	{@link DefaultEditDomain}
-	 * @param actionRegistry 	{@link ActionRegistry}
-	 */
-	public DiagramActionService(GraphicalViewer graphicalViewer,
-			DefaultEditDomain editDomain, ActionRegistry actionRegistry) {
-		this.graphicalViewer = graphicalViewer;
-		this.editDomain = editDomain;
-		this.actionRegistry = actionRegistry;
-	}
-
-	/**
-	 * Sets the GraphicalViewer.
-	 */
-	public void setGraphicalViewer(GraphicalViewer graphicalViewer) {
-		this.graphicalViewer = graphicalViewer;
-	}
-
-	/**
-	 * returns GraphicalViewer
-	 */
-	private GraphicalViewer getGraphicalViewer() {
-		return graphicalViewer;
-	}
-
-	/**
-	 * Returns the command stack.
-	 * 
-	 * @return the command stack
-	 */
-	protected CommandStack getCommandStack() {
-		return getEditDomain().getCommandStack();
-	}
-
-	/**
-	 * Returns the edit domain.
-	 * 
-	 * @return the edit domain
-	 */
-	protected DefaultEditDomain getEditDomain() {
-		return editDomain;
-	}
-
-	protected ActionRegistry getActionRegistry() {
-		return actionRegistry;
-	}
-
-	/**
-	 * Register HorizontalAlignAverageAction action. 
-	 * HorizontalAignAverage Action aligns selected editparts to horizontal average.  
-	 */
-	public IAction registerHorizontalAlignAverageAction() {
-		// align horizontally to average y-value of all nodes
-		IAction hAlignAverageAction = new Action(
-				DiagramUIResources.AbstractDiagramEditor_hAlignAverageAction_text) { //$NON-NLS-1$
-			public void run() {
-				horizAlignToAverageSelected();
-			}
-
-			public String getId() {
-				return ALIGN_HORZ_AVERAGE;
-			}
-		};
-		getActionRegistry().registerAction(hAlignAverageAction);
-
-		return hAlignAverageAction;
-	}
-	
-	/**
-	 * Register HorizontalAlignFirstSelectedAction action. 
-	 * HorizontalAlignFirstSelectedAction aligns selected editparts with 
-	 * respect to first selected editpart. 
-	 */
-
-	public IAction registerHorizontalAlignFirstSelectedAction() {
-		// align horizontally to y-value of first selected node
-		IAction hAlignFirstSelectedAction = new Action(
-				DiagramUIResources.AbstractDiagramEditor_hAlignFirstSelectedAction_text) { //$NON-NLS-1$
-			public void run() {
-				horzAlignToFirstSelected();
-			}
-
-			public String getId() {
-				return ALIGN_HORZ_FIRST_SELECTED;
-			}
-		};
-		getActionRegistry().registerAction(hAlignFirstSelectedAction);
-
-		return hAlignFirstSelectedAction;
-	}
-	
-	/**
-	 * Register vertialAlignAverageAction action. 
-	 * vertialAlignAverageAction aligns selected editparts vertically w.r.t average.
-	 * 
-	 */
-	
-	public IAction registerVerticalAlignAverageAction() {
-		// align vertically to average x-value of all selected nodes
-		IAction vAlignAverageAction = new Action(
-				DiagramUIResources.AbstractDiagramEditor_vAlignAverageAction_text) { //$NON-NLS-1$
-			public void run() {
-				verticalAlignToAverageSelected();
-			}
-
-			public String getId() {
-				return ALIGN_VERT_AVERAGE;
-			}
-		};
-		getActionRegistry().registerAction(vAlignAverageAction);
-
-		return vAlignAverageAction;
-	}
-
-	/**
-	 * Register vertialAlignFirstSelectedAction action. 
-	 * vertialAlignFirstSelectedAction aligns selected editparts vertically w.r.t first selected.
-	 * 
-	 */
-
-	public IAction registerVerticalAlignFirstSelectedAction() {
-		// align vertically to x-value of first selected node
-		IAction vAlignFirstSelectedAction = new Action(
-				DiagramUIResources.AbstractDiagramEditor_vAlignFirstSelectedAction_text) { //$NON-NLS-1$
-			public void run() {
-				verticalAlignToFirstSelected();
-			}
-
-			public String getId() {
-				return ALIGN_VERT_FIRST_SELECTED;
-			}
-		};
-		getActionRegistry().registerAction(vAlignFirstSelectedAction);
-
-		return vAlignFirstSelectedAction;
-	}
-
-	// /////////////////////////////////////////////////////////////////////////////////////////////////
-	// action methods
-	// /////////////////////////////////////////////////////////////////////////////////////////////////
-	
-	/** 
-	 * Action implementation method for horizontalAlignFirsteSElectedAction.
-	 * 
-	 */
-	public void horzAlignToFirstSelected() {
-		List editParts = getGraphicalViewer().getSelectedEditParts();
-		AbstractGraphicalEditPart firstPart = null;
-		// loop through all selected items, remember the y-value of the
-		// first node,
-		// set the following nodes to the same y-value
-		for (int a = 0; a < editParts.size(); a++) {
-			if (editParts.get(a) instanceof NodeEditPart
-					|| editParts.get(a) instanceof NodeContainerEditPart) {
-				AbstractGraphicalEditPart ep = (AbstractGraphicalEditPart) editParts
-						.get(a);
-				// remember the first part we move
-				if (firstPart == null) {
-					firstPart = ep;
-				} else {
-					// calculate the offset for centerline alignment
-					Rectangle bounds = ep.getFigure().getBounds();
-					int offset = (int) ((double) (bounds.height - firstPart
-							.getFigure().getBounds().height) / 2.0);
-					// is this node in a container?
-					if (!(ep.getParent() instanceof DiagramEditPart)) {
-						// need to move the container, adjust the offset
-						ep = (AbstractGraphicalEditPart) ep.getParent();
-						Rectangle parentBounds = ep.getFigure().getBounds();
-						offset += bounds.y - parentBounds.y;
-						bounds = parentBounds;
-					}
-					// send the command to move the node
-					org.eclipse.gef.commands.Command c = new ChangeBoundsCommand(
-							(Node) ep.getModel(), new Point(bounds.x, firstPart
-									.getFigure().getBounds().y
-									- offset), bounds.width);
-					getCommandStack().execute(c);
-				}
-			}
-		}
-	}
-	
-	/** 
-	 * Action implementation method for horizontalAlignAverageAction.
-	 * 
-	 */
-	public void horizAlignToAverageSelected() {
-		List editParts = getGraphicalViewer().getSelectedEditParts();
-		AbstractGraphicalEditPart firstPart = null;
-		int total = 0;
-		int ysum = 0;
-		for (int a = 0; a < editParts.size(); a++) {
-			if (editParts.get(a) instanceof NodeEditPart
-					|| editParts.get(a) instanceof NodeContainerEditPart) {
-				AbstractGraphicalEditPart ep = (AbstractGraphicalEditPart) editParts
-						.get(a);
-				// remember the first part we move
-				if (firstPart == null) {
-					firstPart = ep;
-				}
-				ysum += ep.getFigure().getBounds().y;
-				total++;
-			}
-		}
-		// calculate the average y-value for all nodes
-		int yave = (int) ((double) ysum / (double) total);
-		// loop through all the nodes again and set them
-		for (int a = 0; a < editParts.size(); a++) {
-			if (editParts.get(a) instanceof NodeEditPart
-					|| editParts.get(a) instanceof NodeContainerEditPart) {
-				AbstractGraphicalEditPart ep = (AbstractGraphicalEditPart) editParts
-						.get(a);
-				// calculate the height difference, so that elements are aligned
-				// through the centerline
-				Rectangle bounds = ep.getFigure().getBounds();
-				int offset = (int) ((double) (bounds.height - firstPart
-						.getFigure().getBounds().height) / 2.0);
-				// is this node inside a container?
-				if (!(ep.getParent() instanceof DiagramEditPart)) {
-					// we need to move the container, adjust the offset
-					ep = (AbstractGraphicalEditPart) ep.getParent();
-					Rectangle parentBounds = ep.getFigure().getBounds();
-					offset += bounds.y - parentBounds.y;
-					bounds = parentBounds;
-				}
-				// send the command to move the node
-				org.eclipse.gef.commands.Command c = new ChangeBoundsCommand(
-						(Node) ep.getModel(),
-						new Point(bounds.x, yave - offset), bounds.width);
-				getCommandStack().execute(c);
-			}
-		}
-
-	}
-	/** 
-	 * Action implementation method for verticalAlignToAverageAction.
-	 * 
-	 */
-
-	public void verticalAlignToAverageSelected() {
-		List editParts = getGraphicalViewer().getSelectedEditParts();
-		AbstractGraphicalEditPart firstPart = null;
-		int total = 0;
-		int xsum = 0;
-		// loop through the selected parts
-		for (int a = 0; a < editParts.size(); a++) {
-			// we are only interested in nodes and containers
-			if (editParts.get(a) instanceof NodeEditPart
-					|| editParts.get(a) instanceof NodeContainerEditPart) {
-				AbstractGraphicalEditPart ep = (AbstractGraphicalEditPart) editParts
-						.get(a);
-				if (firstPart == null) {
-					firstPart = ep;
-				}
-				// sum the x coordinates of each element
-				xsum += ep.getFigure().getBounds().x;
-				// remember how many selected elements applied to this operation
-				total++;
-			}
-		}
-		// calculate the average x-value for all nodes
-		int xave = (int) ((double) xsum / (double) total);
-		// loop through all the nodes again and set them
-		for (int a = 0; a < editParts.size(); a++) {
-			if (editParts.get(a) instanceof NodeEditPart
-					|| editParts.get(a) instanceof NodeContainerEditPart) {
-				AbstractGraphicalEditPart ep = (AbstractGraphicalEditPart) editParts
-						.get(a);
-				// calculate the offset for centerline alignment
-				Rectangle bounds = ep.getFigure().getBounds();
-				int offset = (int) ((double) (bounds.width - firstPart
-						.getFigure().getBounds().width) / 2.0);
-				// are we inside a container?
-				if (!(ep.getParent() instanceof DiagramEditPart)) {
-					// adjust the offset since we have to move the container
-					ep = (AbstractGraphicalEditPart) ep.getParent();
-					Rectangle parentBounds = ep.getFigure().getBounds();
-					offset += bounds.x - parentBounds.x;
-					bounds = parentBounds;
-				}
-				// send the command to move the element
-				org.eclipse.gef.commands.Command c = new ChangeBoundsCommand(
-						(Node) ep.getModel(),
-						new Point(xave - offset, bounds.y), bounds.width);
-				getCommandStack().execute(c);
-			}
-		}
-
-	}
-	/** 
-	 * Action implementation method for verticalAlignToFirstSelectedAction.
-	 * 
-	 */
-
-	public void verticalAlignToFirstSelected() {
-		// get the selected items
-		List editParts = getGraphicalViewer().getSelectedEditParts();
-		AbstractGraphicalEditPart alignToPart = null;
-		// find the first diagram part we can align to
-		for (int a = 0; a < editParts.size(); a++) {
-			if (editParts.get(a) instanceof NodeEditPart
-					|| editParts.get(a) instanceof NodeContainerEditPart) {
-				AbstractGraphicalEditPart ep = (AbstractGraphicalEditPart) editParts
-						.get(a);
-				if (alignToPart == null) {
-					// remember it and stop
-					alignToPart = ep;
-					break;
-				}
-			}
-		}
-		// loop through the elements and set their new position
-		for (int a = 0; a < editParts.size(); a++) {
-			if (editParts.get(a) instanceof NodeEditPart
-					|| editParts.get(a) instanceof NodeContainerEditPart) {
-				AbstractGraphicalEditPart ep = (AbstractGraphicalEditPart) editParts
-						.get(a);
-				// we can skip the first one since this is an align-to
-				if (ep != alignToPart
-						&& !(alignToPart instanceof SynchBarNodeEditPart)) {
-					// calculate the offset for centerline alignment
-					if (!(ep instanceof SynchBarNodeEditPart)) {
-						Rectangle bounds = ep.getFigure().getBounds();
-						int offset = (int) ((double) (bounds.width - alignToPart
-								.getFigure().getBounds().width) / 2.0);
-						// is this inside a container?
-						if (!(ep.getParent() instanceof DiagramEditPart)) {
-							// adjust the offset since we are moving the
-							// container
-							ep = (AbstractGraphicalEditPart) ep.getParent();
-							Rectangle parentBounds = ep.getFigure().getBounds();
-							offset += bounds.x - parentBounds.x;
-							bounds = parentBounds;
-						}
-						// send the command to move the element
-						org.eclipse.gef.commands.Command c = new ChangeBoundsCommand(
-								(Node) ep.getModel(), new Point(alignToPart
-										.getFigure().getBounds().x
-										- offset, bounds.y), bounds.width);
-						getCommandStack().execute(c);
-						ep.getFigure().setLocation(
-								new Point(alignToPart.getFigure().getBounds().x
-										- offset, bounds.y));
-					} else {
-						Point tp = ep.getFigure().getBounds().getLocation();
-						boolean connected = false;
-						boolean source = false;
-						Point endPoint = null;
-						LinkEditPart lp = null;
-						// check target connections
-						List list = ((NodeEditPart) ep).getTargetConnections();
-						for (Iterator itor = list.iterator(); itor.hasNext();) {
-							lp = (LinkEditPart) itor.next();
-							if (lp.getSource().equals(alignToPart)) {
-								endPoint = ((Link) lp.getModel())
-										.getTargetEndPoint();
-								tp = tp.getTranslated(endPoint);
-								connected = true;
-								break;
-							}
-						}
-						// check source connections if not found in target connections
-						if (!connected) {
-							list = ((NodeEditPart) ep).getSourceConnections();
-							for (Iterator itor = list.iterator(); itor
-									.hasNext();) {
-								lp = (LinkEditPart) itor.next();
-								if (lp.getTarget().equals(alignToPart)) {
-									endPoint = ((Link) lp.getModel())
-											.getSourceEndPoint();
-									tp = tp.getTranslated(endPoint);
-									connected = true;
-									source = true;
-									break;
-								}
-							}
-						}
-						if (connected && (alignToPart instanceof NodeEditPart)) {
-									Point centerPoint = alignToPart.getFigure()
-											.getBounds().getCenter();
-									int delta = centerPoint.x - tp.x;
-							endPoint.x += delta;
-									ReconnectLinkCommand c = new ReconnectLinkCommand(
-									(Link) lp.getModel(), (Node) ep.getModel(),
-									source);
-							c.setEndPoint(endPoint);
-									getCommandStack().execute(c);
-						}
-
-					}
-				}
-				// If first selected edit part is syncbarnodeeditpart, need to
-				// handle differently
-				if (ep != alignToPart
-						&& (alignToPart instanceof SynchBarNodeEditPart)) {
-
-					Point sp = alignToPart.getFigure().getBounds()
-							.getLocation();
-					boolean connected = false;
-					// check if the part is connected via source connections
-					List list = ((NodeEditPart) alignToPart)
-							.getSourceConnections();
-					for (Iterator itor = list.iterator(); itor.hasNext();) {
-						LinkEditPart lp = (LinkEditPart) itor.next();
-						if (lp.getTarget().equals(ep)) {
-							Point sourceEndPoint = ((Link) lp.getModel())
-									.getSourceEndPoint();
-							sp = sp.getTranslated(sourceEndPoint);
-							connected = true;
-							break;
-						}
-					}
-					// if not found above, check if it is connected via target connections
-					if (!connected) {
-						list = ((NodeEditPart) alignToPart)
-								.getTargetConnections();
-						for (Iterator itor = list.iterator(); itor.hasNext();) {
-							LinkEditPart lp = (LinkEditPart) itor.next();
-							if (lp.getSource().equals(ep)) {
-								Point targetEndPoint = ((Link) lp.getModel())
-										.getTargetEndPoint();
-								sp = sp.getTranslated(targetEndPoint);
-								connected = true;
-								break;
-							}
-						}
-					}
-					if (ep instanceof SynchBarNodeEditPart) {
-						Point tp = ((Node) ep.getModel()).getLocation()
-								.getCopy();
-						Point alignToCenter = alignToPart.getFigure().getBounds().getCenter();
-						Point centerPoint = ep.getFigure().getBounds().getCenter();
-						int delta = alignToCenter.x - centerPoint.x;
-						tp.x = tp.x + delta;
-						org.eclipse.gef.commands.Command c = new ChangeBoundsCommand(
-								(Node) ep.getModel(), tp, ep.getFigure()
-										.getBounds().width);
-						getCommandStack().execute(c);
-						ep.getFigure().setLocation(new Point(tp.x, tp.y));
-					} else if (ep instanceof NodeEditPart) {
-						Point tp = ((Node) ep.getModel()).getLocation()
-								.getCopy();
-						Point centerPoint = ep.getFigure().getBounds()
-								.getCenter();
-						int delta = sp.x - centerPoint.x;
-						tp.x = tp.x + delta;
-						org.eclipse.gef.commands.Command c = new ChangeBoundsCommand(
-								(Node) ep.getModel(), tp, ep.getFigure()
-										.getBounds().width);
-						getCommandStack().execute(c);
-						ep.getFigure().setLocation(new Point(tp.x, tp.y));
-					}
-				}
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/DiagramEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/DiagramEditPart.java
deleted file mode 100755
index 04e741c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/DiagramEditPart.java
+++ /dev/null
@@ -1,241 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.authoring.gef.commands.ChangeBoundsCommand;
-import org.eclipse.epf.authoring.gef.edit.policies.DiagramLayoutEditPolicy;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.NodeContainer;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.editpolicies.RootComponentEditPolicy;
-
-/**
- * Provides EditPart for Diagram. Handles the basic layout mechanism
- * if the children location is not set in the diagram.  
- *   
- * @author Phong Nguyen Le
- * @author skannoor
- * @since 1.0
- */
-public class DiagramEditPart extends NodeContainerEditPart {
-
-	Point cachedPoint = new Point(-1, -1);
-
-	protected boolean debug;
-
-	private boolean markDirty = false;
-
-	static int cachedWidth = 10;
-
-	static int cachedHeight = 10;
-
-	public DiagramEditPart(Diagram model) {
-		super(model);
-		debug = AuthoringUIPlugin.getDefault().isDebugging();
-	}
-
-	protected IFigure createFigure() {
-		Figure f = new FreeformLayer() {
-			protected void layout() {
-				if (hasMisplacedChildren()) {
-					resetChildrenLocations();
-				}
-				super.layout();
-			}
-
-		};
-
-		f.setBorder(new MarginBorder(20));
-		f.setLayoutManager(new FreeformLayout());
-		return f;
-	}
-
-	protected void resetChildrenLocations() {
-		int y = 10;
-		final int spacing = 40;
-		int occupied = 0;
-		int xelements = 0;
-		int x = 10;
-		boolean locked = TngUtil.isLocked((EObject)((Diagram)getModel()).getObject());
-		for (Iterator iter = getChildren().iterator(); iter.hasNext();) {
-			Object child = iter.next();
-			if (child instanceof GraphicalEditPart) {
-				GraphicalEditPart part = (GraphicalEditPart) child;
-				int width = part.getRoot().getViewer().getControl().getBounds().width;
-				if (part.getModel() instanceof Node) {
-					Node node = (Node) part.getModel();
-					Point p = node.getLocation().getCopy();
-					if (p == null || p.x == -1) {
-						if (x + part.getFigure().getPreferredSize().width > width) {
-							y = cachedPoint.y + cachedHeight + spacing;
-							xelements = 0;
-							x = 10;
-							cachedPoint.x = -1;
-							occupied = 0;
-						}
-						if (cachedPoint.x != -1) {
-							x = cachedPoint.x + cachedWidth + spacing;
-						}
-						++xelements;
-						if (p == null) {
-							p = new Point(-1, -1);
-						}
-						p.x = x;
-						p.y = y;
-						//node.setLocation(p);
-						//On opening a AD diagram, editor should be marked dirty.
-						//If diagram is not saved, cannot be browsed. Forcing to save the diagram once.
-						if (!locked && ((Diagram) getModel()).isNew()
-								&& !((Diagram) getModel()).isReadOnly()
-								&& markDirty) {
-							ChangeBoundsCommand cbc = new ChangeBoundsCommand(node, p, part.getFigure()
-											.getPreferredSize().width);
-							getViewer().getEditDomain().getCommandStack()
-									.execute(cbc);
-						} else {
-							// If Plugin is Locked: Do auto-layout and donot
-							// save to model.
-							node.setLocation(p);
-						}
-						
-						cachedPoint = p;
-						cachedWidth = part.getFigure().getPreferredSize().width;
-						cachedHeight = part.getFigure().getPreferredSize().height;
-						if (debug) {
-							System.out
-									.println("Point : " + new Point(x, y).toString()); //$NON-NLS-1$
-							System.out
-									.println("Cached : width: " + cachedWidth + " Height : " + cachedHeight); //$NON-NLS-1$ //$NON-NLS-2$
-						}
-						occupied += x;
-					}
-				}
-			}
-		}
-	}
-
-	protected boolean hasMisplacedChildren() {
-		for (Iterator iter = getChildren().iterator(); iter.hasNext();) {
-			Object child = iter.next();
-			if (child instanceof EditPart) {
-				Object model = ((EditPart) child).getModel();
-				if (model instanceof Node) {
-					Node node = (Node) model;
-					Point p = node.getLocation();
-					if (p == null || p.x == -1){
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	protected void createEditPolicies() {
-		installEditPolicy(EditPolicy.COMPONENT_ROLE,
-				new RootComponentEditPolicy());
-		installEditPolicy(EditPolicy.CONTAINER_ROLE,
-				new DiagramLayoutEditPolicy());
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.NodeContainerEditPart#addPartToEdit(Collection,
-	 *      Object)
-	 */
-	protected void addPartToEdit(Collection partsToEdit, Object node) {
-		if (node instanceof NodeContainer) {
-			NodeContainerEditPart editPart = (NodeContainerEditPart) findChildByModel(node);
-			for (Iterator iter = ((NodeContainer) node).getNodes().iterator(); iter
-					.hasNext();) {
-				editPart.addPartToEdit(partsToEdit, iter.next());
-			}
-		} else {
-			super.addPartToEdit(partsToEdit, node);
-		}
-	}
-
-	/**
-	 * Moves complete diagram children to given delta. 
-	 * @param int  (X-axis delta)
-	 * @param int  (Y-axis delta)
-	 * 
-	 */
-	public void moveFigure(int moveX, int moveY) {
-		for (Iterator iter = this.getChildren().iterator(); iter.hasNext();) {
-			Object child = iter.next();
-			if (child instanceof GraphicalEditPart) {
-				GraphicalEditPart part = (GraphicalEditPart) child;
-				Rectangle bounds = part.getFigure().getBounds();
-				Rectangle r = new Rectangle(new Point(bounds.x + moveX,
-						bounds.y + moveY), bounds.getSize());
-
-				// also need to move the bend points
-				List list = part.getSourceConnections();
-				for (Iterator itor = list.iterator(); itor.hasNext();) {
-					LinkEditPart linkpart = (LinkEditPart) itor.next();
-					Link link = (Link) linkpart.getModel();
-					if (link.getBendpoints().size() > 0) {
-						PointList plist = ((PolylineConnection) linkpart
-								.getFigure()).getPoints();
-						List points = new ArrayList();
-						for (int i = 1; i < plist.size() - 1; i++) {
-							Point p = plist.getPoint(i);
-							p = p.translate(new Point(moveX, moveY));
-
-							org.eclipse.draw2d.AbsoluteBendpoint bp = new org.eclipse.draw2d.AbsoluteBendpoint(
-									p);
-							points.add(bp);
-						}
-
-						linkpart.getConnectionFigure().setRoutingConstraint(
-								points);
-					}
-				}
-
-				this.setLayoutConstraint(part, part.getFigure(), r);
-
-			} else {
-				// System.out.println("Part not moved: " + child); //$NON-NLS-1$
-			}
-		}
-
-	}
-	/**
-	 * On opening a diagram, editor should be marked dirty.
-	 * Invoker of DiagramEditPart should explicitly set the flag to mark editor dirty
-	 * or not. Withou handling this will cause browsing perspective in consistent.    
-	 * For defect: https://bugs.eclipse.org/bugs/show_bug.cgi?id=156029
-	 */
-	public void markDirty(boolean markDirty){
-		this.markDirty  = markDirty;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/DiagramUpdateService.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/DiagramUpdateService.java
deleted file mode 100755
index 9078a46..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/DiagramUpdateService.java
+++ /dev/null
@@ -1,607 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.epf.authoring.gef.commands.ChangeBoundsCommand;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-/**
- * Service class to allow updating diagram to a default layout. Most of the code
- * are moved from the Editor class.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class DiagramUpdateService {
-
-	private DefaultEditDomain editDomain;
-
-	private GraphicalViewer graphicalViewer;
-
-	private ActionRegistry actionRegistry;
-
-	public DiagramUpdateService(
-			GraphicalViewer graphicalViewer, DefaultEditDomain editDomain,
-			ActionRegistry actionRegistry) {
-		this.graphicalViewer = graphicalViewer;
-		this.editDomain = editDomain;
-		this.actionRegistry = actionRegistry;
-	}
-
-	private GraphicalViewer getGraphicalViewer() {
-		return graphicalViewer;
-	}
-
-	/**
-	 * Returns the command stack.
-	 * 
-	 * @return the command stack
-	 */
-	protected CommandStack getCommandStack() {
-		return getEditDomain().getCommandStack();
-	}
-
-	/**
-	 * Returns the edit domain.
-	 * 
-	 * @return the edit domain
-	 */
-	protected DefaultEditDomain getEditDomain() {
-		return editDomain;
-	}
-
-	/**
-	 * Lazily creates and returns the action registry.
-	 * 
-	 * @return the action registry
-	 */
-	protected ActionRegistry getActionRegistry() {
-		return actionRegistry;
-	}
-
-	/**
-	 * Method used only in ActivityDetailDiagram or any diagram need auto-layout.
-	 * Method will verify recently added editparts in the Activitydetaildiagram editpart
-	 * indirectly from WorkBreakdownStructure (means any descriptors created in wbs, corresponding
-	 * EditPart will get created in ActivityDetailDiagram Viewer) and does auto-layout
-	 * all the new added editparts and existing ones. 
-	 * 
-	 */
-	public void cleanUpDiagram() {
-		if (getGraphicalViewer().getContents() instanceof ActivityDetailDiagramEditPart) {
-			ActivityDetailDiagramEditPart dep = (ActivityDetailDiagramEditPart) getGraphicalViewer()
-					.getContents();
-			List children = dep.getRecentlyAddedParts();
-			if (!children.isEmpty()) {
-				Comparator comparator = new Comparator() {
-
-					public int compare(Object arg0, Object arg1) {
-						int rc = 0;
-						if (arg0 instanceof RoleTaskCompositeEditPart) {
-							if (!(arg1 instanceof RoleTaskCompositeEditPart))
-								rc = -1;
-						} else if (arg1 instanceof RoleTaskCompositeEditPart)
-							rc = 1;
-						return rc;
-					}
-
-				};
-
-				Object[] array = children.toArray();
-				Arrays.sort(array, comparator);
-				for (int a = 0; a < array.length; a++) {
-					AbstractGraphicalEditPart ep = (AbstractGraphicalEditPart) array[a];
-					adjustSize(ep);
-				}
-				for (int b = 0; b < array.length; b++) {
-					AbstractGraphicalEditPart ep = (AbstractGraphicalEditPart) array[b];
-					cleanUp(ep);
-				}
-				for (int c = 0; c < array.length; c++) {
-					AbstractGraphicalEditPart ep = (AbstractGraphicalEditPart) array[c];
-					reduceLinkLength(ep);
-				}
-//				for (int c = 0; c < array.length; c++) {
-//					AbstractGraphicalEditPart ep = (AbstractGraphicalEditPart) array[c];
-//					if(ep instanceof RoleTaskCompositeEditPart){
-//						resetSizes(ep, ep);
-//					}
-//				}
-				packDiagram();
-				dep.clearRecentlyAddedParts();
-				getGraphicalViewer().setSelection(new StructuredSelection());
-			}
-		}
-	}
-
-	/*
-	private void resetSizes(AbstractGraphicalEditPart ep, AbstractGraphicalEditPart parent) {
-		if (!(ep instanceof WorkProductCompositeEditPart)) {
-			List sourceLinks = ep.getSourceConnections();
-			if (sourceLinks.size() > 0) {
-				for (int b = 0; b < sourceLinks.size(); b++) {
-					LinkEditPart link = (LinkEditPart) sourceLinks.get(b);
-					AbstractGraphicalEditPart target = (AbstractGraphicalEditPart) link
-							.getTarget();
-					int w = target.getFigure().getBounds().width;
-					int ew = ep.getFigure().getPreferredSize().width;
-					if (w > ew) {
-						Point location = ep.getFigure().getBounds()
-						.getLocation();
-						location.x+=(w-ew)/2;
-						Command c = new ChangeBoundsCommand(((Node) ep
-								.getModel()), ep.getFigure().getBounds()
-								.getLocation(), w);
-						getCommandStack().execute(c);
-						int h = ep.getFigure().getPreferredSize().height;
-						ep.getFigure()
-								.setPreferredSize(new Dimension(w, h));
-						ep.getFigure().setSize(new Dimension(w, h));
-					}
-					getGraphicalViewer()
-							.setSelection(
-									new StructuredSelection(new Object[] { ep,
-											target }));
-					IAction valign = getActionRegistry().getAction(
-							DiagramActionService.ALIGN_VERT_FIRST_SELECTED);
-					valign.run();
-				}
-			}
-			List targetLinks = ep.getTargetConnections();
-			if (targetLinks.size() > 0) {
-				for (int b = 0; b < targetLinks.size(); b++) {
-					LinkEditPart link = (LinkEditPart) targetLinks.get(b);
-					AbstractGraphicalEditPart source = (AbstractGraphicalEditPart) link
-							.getSource();
-					int w = source.getFigure().getBounds().width;
-					int ew = ep.getFigure().getPreferredSize().width;
-					if (w > ew) {
-						Command c = new ChangeBoundsCommand(((Node) ep
-								.getModel()), ep.getFigure().getBounds()
-								.getLocation(), w);
-						getCommandStack().execute(c);
-						int h = ep.getFigure().getPreferredSize().height;
-						ep.getFigure()
-								.setPreferredSize(new Dimension(w, h));
-						ep.getFigure().setSize(new Dimension(w, h));
-					}
-					getGraphicalViewer()
-							.setSelection(
-									new StructuredSelection(new Object[] { ep,
-											source }));
-					IAction valign = getActionRegistry().getAction(
-							DiagramActionService.ALIGN_VERT_FIRST_SELECTED);
-					valign.run();
-				}
-			}
-			parent.getFigure().getLayoutManager().layout(parent.getFigure());
-			if (ep instanceof NodeContainerEditPart) {
-				List children = ep.getChildren();
-				for (int d = 0; d < children.size(); d++) {
-					AbstractGraphicalEditPart p = (AbstractGraphicalEditPart) children
-							.get(d);
-					resetSizes(p, ep);
-				}
-			}
-		}
-	}
-	*/
-
-	/**
-	 * This method does a vertical alignment of all nodes with links
-	 */
-	private void cleanUp(AbstractGraphicalEditPart ep) {
-		if (!(ep instanceof WorkProductCompositeEditPart)) {
-			List sourceLinks = ep.getSourceConnections();
-			if (sourceLinks.size() > 0) {
-				for (int b = 0; b < sourceLinks.size(); b++) {
-					LinkEditPart link = (LinkEditPart) sourceLinks.get(b);
-					AbstractGraphicalEditPart target = (AbstractGraphicalEditPart) link
-							.getTarget();
-					int w = target.getFigure().getBounds().width;
-					int ew = ep.getFigure().getPreferredSize().width;
-					if (w < ew) {
-						Command c = new ChangeBoundsCommand(((Node) ep
-								.getModel()), target.getFigure().getBounds()
-								.getLocation(), w);
-						getCommandStack().execute(c);
-						int h = target.getFigure().getPreferredSize().height;
-						target.getFigure()
-								.setPreferredSize(new Dimension(w, h));
-						target.getFigure().setSize(new Dimension(w, h));
-					}
-					getGraphicalViewer()
-							.setSelection(
-									new StructuredSelection(new Object[] { ep,
-											target }));
-					IAction valign = getActionRegistry().getAction(
-							DiagramActionService.ALIGN_VERT_FIRST_SELECTED);
-					valign.run();
-				}
-			}
-			List targetLinks = ep.getTargetConnections();
-			if (targetLinks.size() > 0) {
-				for (int b = 0; b < targetLinks.size(); b++) {
-					LinkEditPart link = (LinkEditPart) targetLinks.get(b);
-					AbstractGraphicalEditPart source = (AbstractGraphicalEditPart) link
-							.getSource();
-					int w = source.getFigure().getBounds().width;
-					int ew = ep.getFigure().getPreferredSize().width;
-					if (w < ew) {
-						Command c = new ChangeBoundsCommand(((Node) ep
-								.getModel()), source.getFigure().getBounds()
-								.getLocation(), w);
-						getCommandStack().execute(c);
-						int h = source.getFigure().getPreferredSize().height;
-						source.getFigure()
-								.setPreferredSize(new Dimension(w, h));
-						source.getFigure().setSize(new Dimension(w, h));
-					}
-					getGraphicalViewer()
-							.setSelection(
-									new StructuredSelection(new Object[] { ep,
-											source }));
-					IAction valign = getActionRegistry().getAction(
-							DiagramActionService.ALIGN_VERT_FIRST_SELECTED);
-					valign.run();
-				}
-			}
-			if (ep instanceof NodeContainerEditPart) {
-				List children = ep.getChildren();
-				for (int d = 0; d < children.size(); d++) {
-					AbstractGraphicalEditPart p = (AbstractGraphicalEditPart) children
-							.get(d);
-					cleanUp(p);
-				}
-			}
-		}
-	}
-
-	/**
-	 *  For auto-layout, need to adjust connection(or link) length, based on
-	 *  connecting editparts(figures).
-	 * 
-	 */
-	private boolean reduceLinkLength(AbstractGraphicalEditPart part) {
-		boolean moved = false;
-		// only move new WorkProductComposite elements
-		if (part instanceof WorkProductCompositeEditPart) {
-			AbstractGraphicalEditPart linkedPart = null;
-			int position = PositionConstants.CENTER;
-			// is this element linked to another item?
-			if (part.getTargetConnections().size() > 0) {
-				linkedPart = (AbstractGraphicalEditPart) ((LinkEditPart) part
-						.getTargetConnections().get(0)).getSource();
-				position = PositionConstants.NORTH;
-			} else if (part.getSourceConnections().size() > 0) {
-				linkedPart = (AbstractGraphicalEditPart) ((LinkEditPart) part
-						.getSourceConnections().get(0)).getTarget();
-				position = PositionConstants.SOUTH;
-			}
-			if (linkedPart != null) {
-				if (!(linkedPart.getParent() instanceof DiagramEditPart)) {
-					linkedPart = (AbstractGraphicalEditPart) linkedPart
-							.getParent();
-				}
-				// get the part's position
-				Rectangle partBounds = part.getFigure().getBounds();
-				// get the linked part's position
-				Rectangle linkedPartBounds = linkedPart.getFigure().getBounds();
-				// determine in which direction is the linked part
-				// int position = partBounds.getPosition(linkedPartBounds
-				// .getLocation());
-				// assume it is below us, so this part moves up
-				int direction = -1;
-				if ((position & PositionConstants.NORTH) == PositionConstants.NORTH
-						|| (position & PositionConstants.CENTER) == PositionConstants.CENTER) {
-					// above us, move down
-					direction = 1;
-				}
-				// set new bounds for the part so that it sites just outside of
-				// the linked part
-				Rectangle testBounds = partBounds.getCopy();
-				if (direction == 1) {
-					testBounds.y = linkedPartBounds.y + linkedPartBounds.height
-							+ VERT_PIX_PADDING;
-				} else {
-					testBounds.y = linkedPartBounds.y - VERT_PIX_PADDING
-							- partBounds.height;
-				}
-				// set the new location for the part in the model
-				Point np = new Point(testBounds.x, testBounds.y);
-				part.getFigure().setLocation(np);
-				Command c = new ChangeBoundsCommand((Node) part.getModel(), np,
-						partBounds.width);
-				getCommandStack().execute(c);
-			}
-		}
-		return moved;
-	}
-
-	/**
-	 * Method to adjust the size of editpart.  
-	 * 
-	 */
-	private void adjustSize(AbstractGraphicalEditPart ep) {
-		if (ep instanceof WorkProductCompositeEditPart) {
-			adjustSize((NodeContainerEditPart) ep, 1);
-		}
-		// Below Code generic NodeContainerEditPart modification.
-		else if (ep instanceof NodeContainerEditPart) {
-			// This is to allow user customizable 
-//			String count = AuthoringUIPlugin.getDefault().getPreferenceStore()
-//							.getString(TemplateConstants.ADD_ROLE_TASKS_COUNT);
-//			if(count != null || count != ""){
-//				int i = Integer.parseInt(count);
-//				if(i > 0){
-//					adjustSize((NodeContainerEditPart) ep, i);
-//				}
-//			}else{
-//				adjustSize((NodeContainerEditPart) ep, 50);
-//			}
-			adjustSize((NodeContainerEditPart) ep, 50);
-		}
-	}
-
-	protected final static int HORIZ_PIX_PADDING = 30;
-
-	protected final static int VERT_PIX_PADDING = 20;
-
-	/**
-	 * Adjusts the size of ContainerEditPart to accomodate number of editparts in a row,
-	 * push the remaining the editparts in two second row. 
-	 * This is useful for {@link ToolbarLayout}
-	 * 
-	 */
-	private void adjustSize(NodeContainerEditPart ep, int horizCount) {
-		int requiredWidth = 0;
-		int rowMaxHeight = 0;
-		int rows = 0;
-		int widthSum = 0;
-		int heightSum = 0;
-		int column = 0;
-		//int originalWidth = ep.getFigure().getSize().width;
-		List children = ep.getChildren();
-		for (int p = 0; p < children.size();) {
-			if (column == 0) {
-				rows++;
-			}
-			if (column < horizCount) {
-				AbstractGraphicalEditPart child = (AbstractGraphicalEditPart) children
-						.get(p);
-				Dimension d = child.getFigure().getPreferredSize();
-				widthSum += d.width;
-				if (d.height > rowMaxHeight) {
-					rowMaxHeight = d.height;
-				}
-				p++;
-				column++;
-			} else {
-				if (widthSum > requiredWidth) {
-					requiredWidth = widthSum;
-				}
-				heightSum += rowMaxHeight;
-				rowMaxHeight = 0;
-				widthSum = 0;
-				column = 0;
-			}
-		}
-		if (widthSum > requiredWidth) {
-			requiredWidth = widthSum;
-		}
-		heightSum += rowMaxHeight;
-		requiredWidth += HORIZ_PIX_PADDING
-				* Math.min(horizCount, children.size());
-		int requiredHeight = heightSum + (VERT_PIX_PADDING * rows);
-		Command cmd = new ChangeBoundsCommand(((Node) ep.getModel()), ep
-				.getFigure().getBounds().getLocation(), requiredWidth);
-		getCommandStack().execute(cmd);
-		ep.getFigure().setPreferredSize(
-				new Dimension(requiredWidth, requiredHeight));
-		((Node) ep.getModel()).setHeight(requiredHeight);
-		ep.getFigure().setSize(new Dimension(requiredWidth, requiredHeight));
-			ep.getFigure().getLayoutManager().layout(ep.getFigure());
-		// after layout, check the bottom-most child figure against the bottom
-		// of the container, adjust the bottom of the container is necessary
-		if (ep instanceof WorkProductCompositeEditPart && children.size() > 0) {
-			GraphicalEditPart last = (GraphicalEditPart) children.get(children
-					.size() - 1);
-			Point childBottom = last.getFigure().getBounds().getBottom();
-			Point parentBottom = ep.getFigure().getBounds().getBottom();
-			int delta = parentBottom.y - childBottom.y - (VERT_PIX_PADDING / 2);
-			ep.getFigure().setPreferredSize(
-					new Dimension(requiredWidth, requiredHeight - delta));
-			((Node) ep.getModel()).setHeight(requiredHeight - delta);
-			ep.getFigure().setSize(
-					new Dimension(requiredWidth, requiredHeight - delta));
-		}
-	}
-
-	protected void enumerateConnectedParts(AbstractGraphicalEditPart part,
-			List connected) {
-		// only add parts directly on the diagram surface
-		if (!connected.contains(part)) {
-			if (!(part.getParent() instanceof DiagramEditPart)) {
-				if (!connected.contains(part.getParent())) {
-					connected.add(part.getParent());
-				}
-			} else {
-				connected.add(part);
-			}
-			AbstractGraphicalEditPart linkedPart = null;
-			List children = part.getChildren();
-			for (int x = 0; x < children.size(); x++) {
-				AbstractGraphicalEditPart p = (AbstractGraphicalEditPart) children
-						.get(x);
-				enumerateConnectedParts(p, connected);
-			}
-			// is this element linked to another item?
-			for (int x = 0; x < part.getTargetConnections().size(); x++) {
-				linkedPart = (AbstractGraphicalEditPart) ((LinkEditPart) part
-						.getTargetConnections().get(x)).getSource();
-				enumerateConnectedParts(linkedPart, connected);
-			}
-			for (int x = 0; x < part.getSourceConnections().size(); x++) {
-				linkedPart = (AbstractGraphicalEditPart) ((LinkEditPart) part
-						.getSourceConnections().get(x)).getTarget();
-				enumerateConnectedParts(linkedPart, connected);
-			}
-		}
-	}
-
-	/**
-	 * This method finds single elements and groups of elements, and positions
-	 * them starting from the top of the diagram and continuously down the page.
-	 */
-	private void packDiagram() {
-		ActivityDetailDiagramEditPart diagram = (ActivityDetailDiagramEditPart) getGraphicalViewer()
-				.getContents();
-		// start at the top of the diagram
-		// Dimension diagramSize = diagram.getFigure().getSize();
-		// no new shapes can be moved above this y-axis value
-		int reserved = 0;
-		// these are elements without connections
-		List stragglers = new ArrayList();
-		// these are groups of elements connected with links
-		List groups = new ArrayList();
-		// these are top level parts on the diagram that have been added
-		List diagramParts = diagram.getRecentlyAddedParts();
-		for (int x = 0; x < diagramParts.size(); x++) {
-			AbstractGraphicalEditPart p = (AbstractGraphicalEditPart) diagramParts
-					.get(x);
-			boolean found = false;
-			for (int g = 0; g < groups.size() && found == false; g++) {
-				List group = (List) groups.get(g);
-				if (group.contains(p)) {
-					found = true;
-					break;
-				}
-			}
-			if (!found) {
-				List connected = new ArrayList();
-				enumerateConnectedParts(p, connected);
-				if (connected.size() == 1) {
-					stragglers.add(p);
-				} else {
-					groups.add(connected);
-				}
-			}
-		}
-		// process each group closest to the top (min y value)
-		while (groups.size() > 0) {
-			List top = (List) groups.get(0);
-			int topY = getVerticalMinPart(top).getFigure().getBounds().y;
-			for (int x = 0; x < groups.size(); x++) {
-				List g = (List) groups.get(x);
-				int y = getVerticalMinPart(g).getFigure().getBounds().y;
-				if (y < topY) {
-					top = g;
-					topY = y;
-				}
-			}
-			int limit = reserved + 1;
-			int verticalDelta = limit - topY;
-			int leftX = getHorizontalMinPart(top).getFigure().getBounds().x;
-			int horizontalDelta = HORIZ_PIX_PADDING - leftX;
-			for (int x = 0; x < top.size(); x++) {
-				AbstractGraphicalEditPart p = (AbstractGraphicalEditPart) top
-						.get(x);
-				Rectangle bounds = p.getFigure().getBounds();
-				ChangeBoundsCommand cbc = new ChangeBoundsCommand((Node) p
-						.getModel(), new Point(bounds.x + horizontalDelta,
-						bounds.y + verticalDelta), bounds.width);
-				getCommandStack().execute(cbc);
-				p.getFigure().setLocation(
-						new Point(bounds.x + horizontalDelta, bounds.y
-								+ verticalDelta));
-			}
-			int bottomY = getVerticalMaxPart(top).getFigure().getBounds()
-					.bottom();
-			reserved = bottomY + (VERT_PIX_PADDING * 2);
-			groups.remove(top);
-		}
-		int next = HORIZ_PIX_PADDING;
-		for (int x = 0; x < stragglers.size(); x++) {
-			int limit = reserved + 1;
-			AbstractGraphicalEditPart p = (AbstractGraphicalEditPart) stragglers
-					.get(x);
-			Rectangle bounds = p.getFigure().getBounds();
-			ChangeBoundsCommand cbc = new ChangeBoundsCommand((Node) p
-					.getModel(), new Point(next, limit), bounds.width);
-			getCommandStack().execute(cbc);
-			p.getFigure().setLocation(new Point(next, limit));
-			next += bounds.width + HORIZ_PIX_PADDING;
-		}
-	}
-
-	private AbstractGraphicalEditPart getVerticalMinPart(List parts) {
-		AbstractGraphicalEditPart rc = parts.size() > 0 ? (AbstractGraphicalEditPart) parts
-				.get(0)
-				: null;
-		for (int x = 0; x < parts.size(); x++) {
-			AbstractGraphicalEditPart p = (AbstractGraphicalEditPart) parts
-					.get(x);
-			if (p.getFigure().getBounds().y < rc.getFigure().getBounds().y) {
-				rc = p;
-			}
-		}
-		return rc;
-	}
-
-	private AbstractGraphicalEditPart getHorizontalMinPart(List parts) {
-		AbstractGraphicalEditPart rc = parts.size() > 0 ? (AbstractGraphicalEditPart) parts
-				.get(0)
-				: null;
-		for (int x = 0; x < parts.size(); x++) {
-			AbstractGraphicalEditPart p = (AbstractGraphicalEditPart) parts
-					.get(x);
-			if (p.getFigure().getBounds().x < rc.getFigure().getBounds().x) {
-				rc = p;
-			}
-		}
-		return rc;
-	}
-
-	private AbstractGraphicalEditPart getVerticalMaxPart(List parts) {
-		AbstractGraphicalEditPart rc = parts.size() > 0 ? (AbstractGraphicalEditPart) parts
-				.get(0)
-				: null;
-		for (int x = 0; x < parts.size(); x++) {
-			AbstractGraphicalEditPart p = (AbstractGraphicalEditPart) parts
-					.get(x);
-			if (p.getFigure().getBounds().bottom() > rc.getFigure().getBounds()
-					.bottom()) {
-				rc = p;
-			}
-		}
-		return rc;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/EndNodeEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/EndNodeEditPart.java
deleted file mode 100755
index 504bd95..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/EndNodeEditPart.java
+++ /dev/null
@@ -1,49 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.epf.authoring.gef.figures.EndNodeFigure;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-
-/**
- * EditPart for Final(or End) node 
- *
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class EndNodeEditPart extends NodeEditPart {
-
-	public EndNodeEditPart(TypedNode model) {
-		super(model);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.BaseEditPart#createDirectEditPolicy()
-	 */
-	protected DirectEditPolicy createDirectEditPolicy() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.BaseEditPart#createFigure()
-	 */
-	protected IFigure createFigure() {
-		EndNodeFigure f = new EndNodeFigure();
-		f.setBackgroundColor(ColorConstants.black);
-		f.setForegroundColor(ColorConstants.red);
-		f.setSize(24, 24);
-		return f;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/FreeTextCellEditorLocator.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/FreeTextCellEditorLocator.java
deleted file mode 100755
index b0a92e1..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/FreeTextCellEditorLocator.java
+++ /dev/null
@@ -1,76 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.epf.authoring.gef.figures.FreeTextFigure;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * 
- * Constraint for placing FreeText Cell Editor.
- * @author Shashidhar Kannoori
- *
- */
-public class FreeTextCellEditorLocator implements CellEditorLocator {
-
-	IFigure figure;
-	/*
-	 * Creates a new FreeTextCellEditorLocator 
-	 * 
-	 * @param label the Label
-	 */
-	public FreeTextCellEditorLocator(IFigure figure) {
-		setFigure(figure);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.tools.CellEditorLocator#relocate(org.eclipse.jface.viewers.CellEditor)
-	 */
-	public void relocate(CellEditor ce) {
-		// TODO Auto-generated method stub
-		FreeTextFigure fig = (FreeTextFigure)figure;
-		Text text = (Text) ce.getControl();
-		String n = (String) ce.getValue();
-		GC gc = new GC(text);
-		Point size = gc.textExtent(n);
-		gc.dispose();
-		if (size.x != 0)
-			size = text.computeSize(size.x, SWT.DEFAULT);
-		text.setSize(size.x, size.y);
-		Rectangle textBounds = new Rectangle(text.getClientArea().x, text
-				.getClientArea().y, text.getClientArea().width, text
-				.getClientArea().height);
-		Rectangle figBounds = fig.getClientArea();
-		fig.translateToAbsolute(figBounds);
-		int delta = (figBounds.width - textBounds.width) / 2;
-		int y = fig.getTextFlowPage().getLocation().y;
-		text.setLocation(figBounds.x + delta, y);
-
-	}
-	
-	public void setFigure(IFigure figure) {
-		this.figure = figure;
-	}
-	/**
-	 * @return Returns the figure.
-	 */
-	public IFigure getFigure() {
-		return figure;
-	}
-	
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/FreeTextDirectEditManager.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/FreeTextDirectEditManager.java
deleted file mode 100755
index aeb5ded..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/FreeTextDirectEditManager.java
+++ /dev/null
@@ -1,207 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.FigureUtilities;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.epf.authoring.gef.util.DiagramUIResources;
-import org.eclipse.epf.authoring.gef.util.TemplateConstants;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.WorkBreakdownElementNode;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.events.VerifyListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Manages the direct edit operation by creating and maintaining the 
- * {@link org.eclipse.jface.viewers.CellEditor} and executing the resulting command if 
- * the cell editor value has changed. Specifically for FreeText.
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class FreeTextDirectEditManager extends DirectEditManager {
-	
-	/*
-	 * 
-	 */
-	protected VerifyListener verifyListener;
-	private Font scaledFont;
-	protected IFigure figure;
-	
-	public FreeTextDirectEditManager(GraphicalEditPart source, Class editorType, CellEditorLocator locator, IFigure figure) {
-		super(source, editorType, locator);
-		this.figure = figure;
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
-	 */
-	protected void bringDown() {
-		bringDown(true);
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
-	 */
-	protected void bringDown(boolean check) {
-		// This method might be re-entered when super.bringDown() is called.
-		Font disposeFont = scaledFont;
-		scaledFont = null;
-		super.bringDown();
-		if (disposeFont != null)
-			disposeFont.dispose();
-		if (check) {
-			Node node = (Node) getEditPart().getModel();
-			String name = "";
-			// TODO: Remove this check 
-			if (node instanceof WorkBreakdownElementNode) {
-				Object wbelement = node.getObject();
-				if (wbelement instanceof Activity
-						&& ProcessUtil
-								.isExtendingOrLocallyContributing((BreakdownElement) wbelement)) {
-					name = ProcessUtil
-							.getPresentationName((BreakdownElement) wbelement);
-				}
-
-			}
-			if(node instanceof TypedNode && ((TypedNode)node).getType()==TypedNode.FREE_TEXT){
-				GraphNode gnode = ((Node) getEditPart().getModel()).getGraphNode();
-				name = ((Property) gnode.getProperty().get(0)).getValue();
-			}
-			if (name == null || name.trim().length() == 0) {
-				Display
-						.getCurrent()
-						.asyncExec(
-								new PromptEdit(
-										(NodeEditPart) getEditPart(),
-										DiagramUIResources.err_name_empty)); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#initCellEditor()
-	 */
-	protected void initCellEditor() {
-		TextCellEditor editor = (TextCellEditor) getCellEditor();
-		editor.setStyle(SWT.MULTI);
-		Text t = (Text) editor.getControl();
-		verifyListener = new VerifyListener() {
-			public void verifyText(VerifyEvent event) {
-				Text text = (Text) getCellEditor().getControl();
-				String oldText = text.getText();
-				String leftText = oldText.substring(0, event.start);
-				String rightText = oldText.substring(event.end, oldText
-						.length());
-				GC gc = new GC(text);
-				Point size = gc.textExtent(leftText + event.text + rightText);
-				gc.dispose();
-				if (size.x != 0)
-					size = text.computeSize(size.x, SWT.DEFAULT);
-				getCellEditor().getControl().setSize(size.x, size.y);
-			}
-		};
-		t.addVerifyListener(verifyListener);
-		String initialLabelText = ((NodeEditPart) this.getEditPart())
-				.getDirectEditText();
-		editor.setValue(initialLabelText);
-		Font f = figure.getFont();
-		FontMetrics fm = FigureUtilities.getFontMetrics(f);
-		int h = fm.getHeight();
-		int w = fm.getAverageCharWidth();
-		t.setSize(initialLabelText.length()*w+100, h+50);
-	
-		if(f != null)
-			t.setFont(f);
-		else
-			t.setFont(TemplateConstants.DEFAULT_FONT);
-		t.selectAll();
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#unhookListeners()
-	 */
-	protected void unhookListeners() {
-		super.unhookListeners();
-		if (getCellEditor() != null) {
-			Text text = (Text) getCellEditor().getControl();
-			if (verifyListener != null)
-				text.removeVerifyListener(verifyListener);
-			verifyListener = null;
-		}
-	}
-
-	/**
-	 * Checks if the given text is valid. Subclasses can override this method.
-	 * 
-	 * @param txt
-	 * @return null if the given text is valid, an error message otherwise
-	 */
-	protected String validate(String txt) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#commit()
-	 */
-	protected void commit() {
-		String msg = validate((String) getCellEditor().getValue());
-		if (msg != null) {
-			bringDown(false);
-			Display.getCurrent().asyncExec(
-					new PromptEdit((NodeEditPart) getEditPart(), msg));
-			return;
-		}
-		super.commit();
-	}
-
-	static class PromptEdit implements Runnable {
-
-		private NodeEditPart part;
-
-		private String msg;
-
-		PromptEdit(NodeEditPart part, String msg) {
-			this.part = part;
-			this.msg = msg;
-		}
-
-		/**
-		 * @see java.lang.Runnable#run()
-		 */
-		public void run() {
-			String title = DiagramUIResources.diagram_errorDialog_title_text0; //$NON-NLS-1$
-			MsgDialog dialog = AuthoringUIPlugin.getDefault().getMsgDialog();
-			dialog.displayError(title, msg); //$NON-NLS-1$
-			part.performDirectEdit();
-		}
-
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/FreeTextEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/FreeTextEditPart.java
deleted file mode 100755
index 221c05d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/FreeTextEditPart.java
+++ /dev/null
@@ -1,196 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.epf.authoring.gef.commands.ChangePropertyValueCommand;
-import org.eclipse.epf.authoring.gef.figures.SelectableLabel;
-import org.eclipse.epf.authoring.gef.util.TemplateConstants;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * Provides support for direct editing, free text properties changes like font, color and text.
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class FreeTextEditPart extends NodeEditPart {
-
-	private Font font;
-
-	private Color color;
-
-	private FontData fData;
-
-	private NodeEditPart part;
-
-	public FreeTextEditPart(Node model) {
-		super(model);
-		part = this;
-	}
-
-	protected IFigure createFigure() {
-		Label l = new SelectableLabel();
-		l.setLabelAlignment(PositionConstants.LEFT);
-		l.setTextPlacement(PositionConstants.SOUTH);
-		return l;
-
-	}
-
-	protected void createEditPolicies() {
-		super.createEditPolicies();
-		if (!((Node) getModel()).isReadOnly()) {
-			installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,
-					createDirectEditPolicy());
-		}
-	}
-
-	protected DirectEditPolicy createDirectEditPolicy() {
-		return new DirectEditPolicy() {
-			protected Command getDirectEditCommand(DirectEditRequest request) {
-				return new ChangePropertyValueCommand(part, (String) request
-						.getCellEditor().getValue());
-			}
-
-			protected void showCurrentEditValue(DirectEditRequest request) {
-				IFigure fig = getDirectEditFigure();
-				if (fig instanceof Label) {
-					((Label) fig).setText((String) request.getCellEditor()
-							.getValue());
-					fig.getUpdateManager().performUpdate();
-				}
-			}
-		};
-	}
-
-	protected void handlePropertyChanged(Notification msg) {
-		switch (msg.getFeatureID(Node.class)) {
-		case ModelPackage.TYPED_NODE__TYPE:
-			refreshVisuals();
-			return;
-		}
-		super.handlePropertyChanged(msg);
-	}
-
-	public void performRequest(Request request) {
-		if (request.getType() == RequestConstants.REQ_DIRECT_EDIT
-				&& !((Node) getModel()).isReadOnly()) {
-			performDirectEdit();
-		} else {
-			super.performRequest(request);
-		}
-	}
-
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		IFigure fig = getDirectEditFigure();
-		if (fig instanceof Label) {
-			Label l = (Label) fig;
-			List alist = ((Node) getModel()).getGraphNode().getProperty();
-			String fontName = TemplateConstants.DEFAULT_FONT_NAME;
-			int fontStyle = SWT.NORMAL;
-			int fontHeight = TemplateConstants.DEFAULT_FONT_SIZE;
-			int fontRed = SWT.COLOR_RED;
-			int fontBlue = SWT.COLOR_BLUE;
-			int fontGreen = SWT.COLOR_GREEN;
-
-			if (alist.size() > 0) {
-				for (Iterator ior = alist.iterator(); ior.hasNext();) {
-					Property prop = (Property) ior.next();
-					if (prop.getKey().equals(
-							GraphicalDataHelper.GRAPH_NODE_FREE_TEXT)) {
-						l.setText(prop.getValue());
-					} else if (prop.getKey().equals(
-							TemplateConstants.PROPERTY_FONT_NAME)) {
-						fontName = prop.getValue();
-					} else if (prop.getKey().equals(
-							TemplateConstants.PROPERTY_FONT_STYLE)) {
-						fontStyle = new Integer(prop.getValue()).intValue();
-					} else if (prop.getKey().equals(
-							TemplateConstants.PROPERTY_FONT_HEIGHT)) {
-						fontHeight = new Integer(prop.getValue()).intValue();
-					} else if (prop.getKey().equals(
-							TemplateConstants.PROPERTY_FONT_RED)) {
-						fontRed = new Integer(prop.getValue()).intValue();
-					} else if (prop.getKey().equals(
-							TemplateConstants.PROPERTY_FONT_BLUE)) {
-						fontBlue = new Integer(prop.getValue()).intValue();
-					} else if (prop.getKey().equals(
-							TemplateConstants.PROPERTY_FONT_GREEN)) {
-						fontGreen = new Integer(prop.getValue()).intValue();
-					}
-				}
-			} else {
-				l.setText(((Node) getModel()).getGraphNode().getName());
-			}
-			if (font != null && !font.isDisposed()) {
-				font.dispose();
-			}
-			if (color != null && !color.isDisposed()) {
-				color.dispose();
-			}
-			fData = new FontData(fontName, fontHeight, fontStyle);
-			font = new Font(PlatformUI.getWorkbench().getDisplay(), fData);
-			color = new Color(null, fontRed, fontGreen, fontBlue);
-			l.setFont(font);
-
-			l.setForegroundColor(color);
-		}
-	}
-
-	protected DirectEditManager createDirectEditManager() {
-		Label l = (Label) getFigure();
-		return new ValidatingFreeTextEditManager(this, TextCellEditor.class,
-				new LabelTextCellEditorLocator(l), l) {
-			protected String validate(String txt) {
-				return super.validate(txt);
-			}
-		};
-	}
-
-	IFigure getDirectEditFigure() {
-		return getFigure();
-	}
-
-	public void deactivate() {
-		if (font != null && !font.isDisposed()) {
-			font.dispose();
-		}
-		if (color != null && !color.isDisposed()) {
-			color.dispose();
-		}
-		super.deactivate();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/FreeTextNodeEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/FreeTextNodeEditPart.java
deleted file mode 100755
index 09257d1..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/FreeTextNodeEditPart.java
+++ /dev/null
@@ -1,206 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.epf.authoring.gef.commands.ChangePropertyValueCommand;
-import org.eclipse.epf.authoring.gef.figures.FreeTextFigure;
-import org.eclipse.epf.authoring.gef.util.TemplateConstants;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Provides support for direct editing, text font, color and size changes. 
- * @author Shashidhar Kannoori.
- */
-
-public class FreeTextNodeEditPart extends NodeEditPart {
-	private Font font;
-
-	private Color color;
-
-	private FontData fData;
-
-	private NodeEditPart part;
-
-	public FreeTextNodeEditPart(Node model) {
-		super(model);
-		part = this; 
-		// TODO Auto-generated constructor stub
-	}
-	protected IFigure createFigure() {
-		FreeTextFigure l = new FreeTextFigure();
-		return l;
-
-	}
-	protected void createEditPolicies() {
-		super.createEditPolicies();
-		if (!((Node) getModel()).isReadOnly()) {
-			installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,
-					createDirectEditPolicy());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.edit.BaseEditPart#createDirectEditPolicy()
-	 */
-	protected DirectEditPolicy createDirectEditPolicy() {
-		// TODO Auto-generated method stub
-		return new DirectEditPolicy() {
-			protected Command getDirectEditCommand(DirectEditRequest request) {
-				return new ChangePropertyValueCommand(part, (String) request
-						.getCellEditor().getValue());
-			}
-
-			protected void showCurrentEditValue(DirectEditRequest request) {
-				IFigure fig = getDirectEditFigure();
-				if (fig instanceof FreeTextFigure) {
-					((FreeTextFigure) fig).setText((String) request.getCellEditor()
-							.getValue());
-					fig.getUpdateManager().performUpdate();
-				}
-			}
-		};
-	}
-	
-	
-	protected void handlePropertyChanged(Notification msg) {
-		switch (msg.getFeatureID(Node.class)) {
-		case ModelPackage.TYPED_NODE__TYPE:
-			refreshVisuals();
-			return;
-		}
-		super.handlePropertyChanged(msg);
-	}
-
-	public void performRequest(Request request) {
-		if (request.getType() == RequestConstants.REQ_DIRECT_EDIT
-				&& !((Node) getModel()).isReadOnly()) {
-			performDirectEdit();
-		} else {
-			super.performRequest(request);
-		}
-	}
-
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		IFigure fig = getDirectEditFigure();
-		if (fig instanceof FreeTextFigure) {
-			FreeTextFigure l = (FreeTextFigure) fig;
-			List alist = ((Node) getModel()).getGraphNode().getProperty();
-			String fontName = TemplateConstants.DEFAULT_FONT_NAME;
-			int fontStyle = SWT.NORMAL;
-			int fontHeight = TemplateConstants.DEFAULT_FONT_SIZE;
-			int fontRed = SWT.COLOR_RED;
-			int fontBlue = SWT.COLOR_BLUE;
-			int fontGreen = SWT.COLOR_GREEN;
-
-			if (alist.size() > 0) {
-				for (Iterator ior = alist.iterator(); ior.hasNext();) {
-					Property prop = (Property) ior.next();
-					if (prop.getKey().equals(
-							GraphicalDataHelper.GRAPH_NODE_FREE_TEXT)) {
-						l.setText(prop.getValue());
-					} else if (prop.getKey().equals(
-							TemplateConstants.PROPERTY_FONT_NAME)) {
-						fontName = prop.getValue();
-					} else if (prop.getKey().equals(
-							TemplateConstants.PROPERTY_FONT_STYLE)) {
-						fontStyle = new Integer(prop.getValue()).intValue();
-					} else if (prop.getKey().equals(
-							TemplateConstants.PROPERTY_FONT_HEIGHT)) {
-						fontHeight = new Integer(prop.getValue()).intValue();
-					} else if (prop.getKey().equals(
-							TemplateConstants.PROPERTY_FONT_RED)) {
-						fontRed = new Integer(prop.getValue()).intValue();
-					} else if (prop.getKey().equals(
-							TemplateConstants.PROPERTY_FONT_BLUE)) {
-						fontBlue = new Integer(prop.getValue()).intValue();
-					} else if (prop.getKey().equals(
-							TemplateConstants.PROPERTY_FONT_GREEN)) {
-						fontGreen = new Integer(prop.getValue()).intValue();
-					}
-				}
-			} else {
-				l.setText(((Node) getModel()).getGraphNode().getName());
-			}
-			if (font != null && !font.isDisposed()) {
-				font.dispose();
-			}
-			if (color != null && !color.isDisposed()) {
-				color.dispose();
-			}
-			fData = new FontData(fontName, fontHeight, fontStyle);
-			font = new Font(PlatformUI.getWorkbench().getDisplay(), fData);
-			color = new Color(null, fontRed, fontGreen, fontBlue);
-			l.setFont(font);
-
-			l.setForegroundColor(color);
-		}
-	}
-
-	protected DirectEditManager createDirectEditManager() {
-		FreeTextFigure l = (FreeTextFigure) getFigure();
-		return new FreeTextDirectEditManager(this, TextCellEditor.class,
-				new FreeTextCellEditorLocator(l), l) {
-			protected String validate(String txt) {
-				return super.validate(txt);
-			}
-		};
-	}
-
-	IFigure getDirectEditFigure() {
-		return getFigure();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.edit.NodeEditPart#deactivate()
-	 */
-	public void deactivate() {
-		if (font != null && !font.isDisposed()) {
-			font.dispose();
-		}
-		if (color != null && !color.isDisposed()) {
-			color.dispose();
-		}
-		super.deactivate();
-	}
-	String getDirectEditText() {
-		// TODO Auto-generated method stub
-		//return super.getDirectEditText();
-		IFigure fig = getDirectEditFigure();
-		if (fig instanceof FreeTextFigure) {
-			return ((FreeTextFigure) fig).getText();
-		} 
-		return ""; 
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/LabelCellEditorLocator.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/LabelCellEditorLocator.java
deleted file mode 100755
index 9a98419..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/LabelCellEditorLocator.java
+++ /dev/null
@@ -1,88 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Constraint for Label placing. 
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-final public class LabelCellEditorLocator implements CellEditorLocator {
-
-	private IFigure fig;
-
-	private static int WIN_X_OFFSET = -4;
-
-	private static int WIN_W_OFFSET = 5;
-
-	private static int GTK_X_OFFSET = 0;
-
-	private static int GTK_W_OFFSET = 0;
-
-	private static int MAC_X_OFFSET = -3;
-
-	private static int MAC_W_OFFSET = 9;
-
-	private static int MAC_Y_OFFSET = -3;
-
-	private static int MAC_H_OFFSET = 6;
-
-	public LabelCellEditorLocator(IFigure figure) {
-		fig = figure;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.tools.CellEditorLocator#relocate(org.eclipse.jface.viewers.CellEditor)
-	 */
-
-	public void relocate(CellEditor celleditor) {
-		Text text = (Text) celleditor.getControl();
-
-		Rectangle rect = null;
-		if (fig instanceof Label)
-			rect = ((Label) fig).getTextBounds().intersect(fig.getClientArea());
-		else
-			rect = fig.getClientArea(Rectangle.SINGLETON);
-		fig.translateToAbsolute(rect);
-
-		int xOffset = 0;
-		int wOffset = 0;
-		int yOffset = 0;
-		int hOffset = 0;
-
-		if (SWT.getPlatform().equalsIgnoreCase("gtk")) { //$NON-NLS-1$
-			xOffset = GTK_X_OFFSET;
-			wOffset = GTK_W_OFFSET;
-		} else if (SWT.getPlatform().equalsIgnoreCase("carbon")) { //$NON-NLS-1$
-			xOffset = MAC_X_OFFSET;
-			wOffset = MAC_W_OFFSET;
-			yOffset = MAC_Y_OFFSET;
-			hOffset = MAC_H_OFFSET;
-		} else {
-			xOffset = WIN_X_OFFSET;
-			wOffset = WIN_W_OFFSET;
-		}
-
-		text.setBounds(rect.x + xOffset, rect.y + yOffset,
-				rect.width + wOffset, rect.height + hOffset);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/LabelDirectEditManager.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/LabelDirectEditManager.java
deleted file mode 100755
index ab0f929..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/LabelDirectEditManager.java
+++ /dev/null
@@ -1,102 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Manages the direct edit operation by creating and maintaining the 
- * {@link org.eclipse.jface.viewers.CellEditor} and executing the resulting command if 
- * the cell editor value has changed. For {@link Label}.
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class LabelDirectEditManager extends DirectEditManager {
-
-	Font scaledFont;
-
-	public LabelDirectEditManager(GraphicalEditPart source, Class editorType,
-			CellEditorLocator locator) {
-		super(source, editorType, locator);
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
-	 */
-	protected void bringDown() {
-		// This method might be re-entered when super.bringDown() is called.
-		Font disposeFont = scaledFont;
-		scaledFont = null;
-		super.bringDown();
-		if (disposeFont != null)
-			disposeFont.dispose();
-	}
-
-	protected void initCellEditor() {
-		Text text = (Text) getCellEditor().getControl();
-
-		getCellEditor().setValue(getInitialText());
-		IFigure figure = getEditPart().getFigure();
-		scaledFont = figure.getFont();
-		FontData data = scaledFont.getFontData()[0];
-		Dimension fontSize = new Dimension(0, data.getHeight());
-		getDirectEditFigure().translateToAbsolute(fontSize);
-		data.setHeight(fontSize.height);
-		scaledFont = new Font(null, data);
-
-		text.setFont(scaledFont);
-		text.selectAll();
-	}
-
-	/**
-	 * Creates the cell editor on the given composite. The cell editor is
-	 * created by instantiating the cell editor type passed into this
-	 * DirectEditManager's constuctor.
-	 * 
-	 * @param composite
-	 *            the composite to create the cell editor on
-	 * @return the newly created cell editor
-	 */
-	protected CellEditor createCellEditorOn(Composite composite) {
-		return new TextCellEditor(composite, SWT.MULTI | SWT.WRAP);
-	}
-
-	/**
-	 * @return the initial value of the text shown in the cell editor for
-	 *         direct-editing; cannot return <code>null</code>
-	 */
-	protected String getInitialText() {
-		return ((BaseEditPart) getEditPart()).getDirectEditText();
-	}
-
-	/**
-	 * Used to determine the initial text of the cell editor and to determine
-	 * the font size of the text.
-	 * 
-	 * @return the figure being edited
-	 */
-	protected IFigure getDirectEditFigure() {
-		return ((BaseEditPart) getEditPart()).getDirectEditFigure();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/LabelTextCellEditorLocator.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/LabelTextCellEditorLocator.java
deleted file mode 100755
index 3f1ed48..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/LabelTextCellEditorLocator.java
+++ /dev/null
@@ -1,69 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Constraint for Text placing. 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class LabelTextCellEditorLocator implements CellEditorLocator {
-
-	private Label label;
-
-	/**
-	 * Creates a new LabelTextCellEditorLocator for the given Label
-	 * 
-	 * @param label
-	 *            the Label
-	 */
-	public LabelTextCellEditorLocator(Label label) {
-		setLabel(label);
-	}
-
-	/**
-	 * @see CellEditorLocator#relocate(org.eclipse.jface.viewers.CellEditor)
-	 */
-	public void relocate(CellEditor celleditor) {
-		Text text = (Text) celleditor.getControl();
-		Point pref = text.computeSize(-1, -1);
-		Rectangle rect = label.getTextBounds().getCopy();
-		label.translateToAbsolute(rect);
-		text.setBounds(rect.x - 1, rect.y - 1, pref.x + 1, pref.y + 1);
-	}
-
-	/**
-	 * Returns the Label figure.
-	 * 
-	 * @return the Label
-	 */
-	protected Label getLabel() {
-		return label;
-	}
-
-	/**
-	 * Sets the label.
-	 * 
-	 * @param label
-	 *            The label to set
-	 */
-	protected void setLabel(Label label) {
-		this.label = label;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/LinkEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/LinkEditPart.java
deleted file mode 100755
index 16bcbdb..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/LinkEditPart.java
+++ /dev/null
@@ -1,122 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.epf.authoring.gef.commands.DeleteCommand;
-import org.eclipse.epf.authoring.gef.commands.DeleteLinkCommand;
-import org.eclipse.epf.authoring.gef.edit.policies.LinkBendpointEditPolicy;
-import org.eclipse.epf.authoring.gef.edit.policies.LinkEndpointEditPolicy;
-import org.eclipse.epf.authoring.gef.figures.Colors;
-import org.eclipse.epf.authoring.gef.util.Validation;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.gef.editpolicies.ConnectionEditPolicy;
-import org.eclipse.gef.requests.GroupRequest;
-
-/**
- * Provides support to update the appearance, and installs the editpolicies
- * specific the {@link Link} and listens to changes in the diagram model.
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class LinkEditPart extends AbstractConnectionEditPart {
-
-	protected Adapter modelListener = new AdapterImpl() {
-		public void notifyChanged(Notification msg) {
-			handlePropertyChanged(msg);
-		}
-	};
-
-	public LinkEditPart(Link conn) {
-		super();
-		setModel(conn);
-	}
-
-	public void activate() {
-		super.activate();
-		getLink().eAdapters().add(modelListener);
-	}
-
-	protected void createEditPolicies() {
-		installEditPolicy(EditPolicy.CONNECTION_ENDPOINTS_ROLE,
-				new LinkEndpointEditPolicy());
-		installEditPolicy(EditPolicy.CONNECTION_ROLE,
-				new ConnectionEditPolicy() {
-					protected Command getDeleteCommand(GroupRequest request) {
-						Boolean bool = (Boolean) request.getExtendedData().get(
-								DeleteCommand.KEY_PERM_DELETE);
-						boolean permDelete = bool == null ? false : bool
-								.booleanValue();
-						return new DeleteLinkCommand((Link) getHost()
-								.getModel(), permDelete);
-					}
-				});
-		installEditPolicy(EditPolicy.CONNECTION_BENDPOINTS_ROLE,
-				new LinkBendpointEditPolicy());
-	}
-
-	protected IFigure createFigure() {
-		PolylineConnection conn = new PolylineConnection();
-		conn.setTargetDecoration(new PolygonDecoration());
-		updateAppearance();
-		return conn;
-	}
-
-	private void updateAppearance() {
-		if (figure == null)
-			return;
-		Link link = (Link) getModel();
-		if (Validation.isReadOnly(link)) {
-			figure.setForegroundColor(Colors.INHERITED_ELEMENT_LABEL);
-		} else {
-			figure.setForegroundColor(ColorConstants.black);
-		}
-	}
-
-	public void deactivate() {
-		getLink().eAdapters().remove(modelListener);
-		super.deactivate();
-	}
-
-	protected Link getLink() {
-		return (Link) getModel();
-	}
-
-	protected void handlePropertyChanged(Notification msg) {
-		switch (msg.getFeatureID(Link.class)) {
-		case ModelPackage.LINK__BENDPOINTS:
-			refreshVisuals();
-			break;
-		case ModelPackage.LINK__TARGET_END_POINT:
-			refreshTargetAnchor();
-			break;
-		case ModelPackage.LINK__SOURCE_END_POINT:
-			refreshSourceAnchor();
-			break;
-		}
-	}
-
-	protected void refreshVisuals() {
-		updateAppearance();
-		getConnectionFigure().setRoutingConstraint(getLink().getBendpoints());
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/NamedNodeEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/NamedNodeEditPart.java
deleted file mode 100755
index b4d21cd..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/NamedNodeEditPart.java
+++ /dev/null
@@ -1,225 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.epf.authoring.gef.commands.ChangeNameCommand;
-import org.eclipse.epf.authoring.gef.figures.Colors;
-import org.eclipse.epf.authoring.gef.figures.SelectableLabel;
-import org.eclipse.epf.authoring.gef.figures.TextFigure;
-import org.eclipse.epf.authoring.gef.util.TemplateConstants;
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.TaskNode;
-import org.eclipse.epf.diagram.model.WorkBreakdownElementNode;
-import org.eclipse.epf.diagram.model.WorkProductDescriptorNode;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.swt.graphics.Image;
-
-import com.ibm.icu.text.BreakIterator;
-
-/**
- * Diagram children should extend this NamedNodeEditPart in order to support name for figure.
- * NamedNodeEditPart provides instructure to handle the name wrapping and color. Support direct 
- * editing feedback.   
- *  
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public abstract class NamedNodeEditPart extends NodeEditPart {
-
-	public NamedNodeEditPart(NamedNode model) {
-		super(model);
-	}
-
-	protected IFigure createFigure() {
-		Label l = new SelectableLabel();
-		l.setLabelAlignment(PositionConstants.LEFT);
-		if (getImage() != null) {
-			l.setIcon(getImage());
-		}
-		l.setTextPlacement(PositionConstants.SOUTH);
-		l.setFont(TemplateConstants.DEFAULT_FONT);
-		setLabelForegroundColor(l);
-		return l;
-	}
-
-	private void setLabelForegroundColor(Label l) {
-		NamedNode node = (NamedNode) getModel();
-		// Object e = node.getObject();
-		// boolean suppressed = isSuppressed(e);
-		boolean suppressed = node.isSuppressed();
-		if (node.isReadOnly()) {
-			if (!suppressed) {
-				l.setForegroundColor(Colors.INHERITED_ELEMENT_LABEL);
-			}
-		} else {
-			if (!suppressed) {
-				l.setForegroundColor(ColorConstants.black);
-			}
-		}
-		if (suppressed) {
-			l.setForegroundColor(Colors.SUPRESSED_ELEMENT_LABEL);
-		}
-	}
-
-	protected Image getImage() {
-		return null;
-	}
-
-	protected void createEditPolicies() {
-		super.createEditPolicies();
-		if (!((Node) getModel()).isReadOnly()) {
-			installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,
-					createDirectEditPolicy());
-		}
-	}
-
-	protected DirectEditPolicy createDirectEditPolicy() {
-		return new DirectEditPolicy() {
-			protected Command getDirectEditCommand(DirectEditRequest request) {
-				return new ChangeNameCommand((NamedNode) getModel(),
-						(String) request.getCellEditor().getValue());
-			}
-
-			protected void showCurrentEditValue(DirectEditRequest request) {
-				IFigure fig = getDirectEditFigure();
-				String s = (String) request.getCellEditor().getValue();
-				if (fig instanceof Label) {
-					((Label) fig).setText(s);
-				}
-				else if (fig instanceof TextFigure) {
-					((TextFigure) fig).setText(s);
-				}
-				fig.getUpdateManager().performUpdate();
-			}
-		};
-	}
-
-	protected void handlePropertyChanged(Notification msg) {
-		switch (msg.getFeatureID(NamedNode.class)) {
-		case ModelPackage.NAMED_NODE__NAME:
-			refreshVisuals();
-			return;
-		}
-		super.handlePropertyChanged(msg);
-	}
-
-	public void performRequest(Request request) {
-		if (request.getType() == RequestConstants.REQ_DIRECT_EDIT
-				&& !((Node) getModel()).isReadOnly()) {
-			performDirectEdit();
-		} else {
-			super.performRequest(request);
-		}
-	}
-
-	protected static final int WRAP_WIDTH = 12;
-
-	protected static final int WORK_PRODUCT_WRAP_WIDTH = 3;
-
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		IFigure fig = getDirectEditFigure();
-		if (fig instanceof Label) {
-			Label l = (Label) fig;
-			setLabelForegroundColor(l);
-			String text;
-			// Below check is required for Extended Activity presentation name
-			// should be used from base.
-			if (getModel() instanceof WorkBreakdownElementNode) {
-				WorkBreakdownElementNode node = (WorkBreakdownElementNode) getModel();
-				Object wbelement = node.getObject();
-				if (wbelement instanceof Activity
-						&& ProcessUtil
-								.isExtendingOrLocallyContributing((BreakdownElement) wbelement)) {
-					text = ProcessUtil
-							.getPresentationName((BreakdownElement) wbelement);
-				} else {
-					text = ((NamedNode) getModel()).getName();
-				}
-			} else {
-				text = ((NamedNode) getModel()).getName();
-			}
-			try {
-				if (getParent() instanceof ActivityDetailDiagramEditPart
-						|| getParent().getParent() instanceof ActivityDetailDiagramEditPart) {
-					int w = WRAP_WIDTH;
-					if (this.getModel() instanceof WorkProductDescriptorNode)
-						w = WORK_PRODUCT_WRAP_WIDTH;
-					
-					if(this.getModel() instanceof TaskNode && 
-							GraphicalDataHelper.isAutoLayout(
-							(ActivityDetailDiagram)getParent().getParent().getModel())){
-						// Used 16 as min length for taskname, else add spaces to it.
-						// TODO: find better solution for this.
-						if(text.length() < 16){
-							int gap = 16 - text.length();
-							for(int i=0; i<gap/2; i++){
-								text+=" ";
-							}
-							for(int i=0; i<gap/2; i++){
-								text = " "+text;
-							}
-						}
-					}
-					text = wrap(text, w);
-				}
-			} catch (NullPointerException npe) {
-			}
-			l.setText(text);
-		}
-	}
-
-	protected String wrap(String s, int wrapWidth) {
-		String wrapped = ""; //$NON-NLS-1$
-		BreakIterator bi = BreakIterator.getLineInstance();
-		String remaining = s;
-		while (true) {
-			if (remaining.length() <= wrapWidth) {
-				wrapped += remaining;
-				break;
-			} else {
-				bi.setText(remaining);
-				int pos = bi.following(wrapWidth);
-				if (pos == BreakIterator.DONE) {
-					wrapped += remaining;
-					break;
-				} else {
-					if (pos >= remaining.length()) {
-						wrapped += remaining;
-						break;
-					} else {
-						wrapped += remaining.substring(0, pos) + "\n"; //$NON-NLS-1$
-						remaining = remaining.substring(pos);
-					}
-				}
-			}
-		}
-		return wrapped;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/NodeContainerEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/NodeContainerEditPart.java
deleted file mode 100755
index 1021851..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/NodeContainerEditPart.java
+++ /dev/null
@@ -1,226 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.BendpointConnectionRouter;
-import org.eclipse.draw2d.ConnectionLayer;
-import org.eclipse.draw2d.FanRouter;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.authoring.gef.commands.DeleteCommand;
-import org.eclipse.epf.authoring.gef.edit.policies.NodeContainerEditPolicy;
-import org.eclipse.epf.authoring.gef.edit.policies.NodeContainerFlowLayoutEditPolicy;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.NodeContainer;
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.editpolicies.ComponentEditPolicy;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-
-/**
- * NodeContainerEditPart manages the child editparts in a {@link GraphicalViewer}.
- * Provides instructure to handle the notifications from model.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public abstract class NodeContainerEditPart extends AbstractGraphicalEditPart
-		implements LayerConstants {
-
-	private BendpointConnectionRouter cRouter;
-
-	protected Adapter modelListener = new AdapterImpl() {
-		public void notifyChanged(Notification msg) {
-			handlePropertyChanged(msg);
-		}
-	};
-
-	public NodeContainerEditPart(NodeContainer model) {
-		super();
-		setModel(model);
-	}
-
-	public void activate() {
-		super.activate();
-		NodeContainer model = (NodeContainer) ((EObject) getModel());
-		model.eAdapters().add(modelListener);
-		model.addConsumer(this);
-	}
-
-	protected void createEditPolicies() {
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ComponentEditPolicy() {
-			protected Command createDeleteCommand(GroupRequest deleteRequest) {
-				Boolean bool = (Boolean) deleteRequest.getExtendedData().get(
-						DeleteCommand.KEY_PERM_DELETE);
-				boolean permDelete = bool == null ? false : bool.booleanValue();
-				DeleteCommand cmd = new DeleteCommand(permDelete);
-				cmd.setPartToBeDeleted(getHost().getModel());
-				return cmd;
-			}
-		});
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, null);
-		installEditPolicy(EditPolicy.CONTAINER_ROLE,
-				new NodeContainerEditPolicy());
-		installEditPolicy(EditPolicy.NODE_ROLE, null);
-		installEditPolicy(EditPolicy.LAYOUT_ROLE,
-				new NodeContainerFlowLayoutEditPolicy());
-	}
-
-	public void deactivate() {
-		NodeContainer model = (NodeContainer) ((EObject) getModel());
-		model.eAdapters().remove(modelListener);
-		model.removeConsumer(this);
-
-		super.deactivate();
-	}
-
-	protected EditPart findChildByModel(Object model) {
-		for (Iterator iter = getChildren().iterator(); iter.hasNext();) {
-			EditPart child = (EditPart) iter.next();
-			if (child.getModel() == model) {
-				return child;
-			}
-		}
-		return null;
-	}
-
-	protected void addPartToEdit(Collection partsToEdit, Object node) {
-		if (node instanceof NamedNode) {
-			EditPart editPart = findChildByModel(node);
-			if (editPart instanceof BaseEditPart) {
-				DirectEditManager editManager = ((BaseEditPart) editPart)
-						.getDirectEditManager();
-				if (editManager instanceof ValidatingDirectEditManager
-						&& ((ValidatingDirectEditManager) editManager)
-								.validate(((NamedNode) node).getName()) != null) {
-					partsToEdit.add(editPart);
-				}
-			}
-		}
-	}
-
-	protected void handlePropertyChanged(Notification msg) {
-		switch (msg.getFeatureID(NodeContainer.class)) {
-		case ModelPackage.NODE__LOCATION:
-		case ModelPackage.NODE__WIDTH:
-			refreshVisuals();
-			break;
-		case ModelPackage.NODE__OUTGOING_CONNECTIONS:
-			refreshSourceConnections();
-			break;
-		case ModelPackage.NODE__INCOMING_CONNECTIONS:
-			refreshTargetConnections();
-			break;
-		case ModelPackage.NODE_CONTAINER__NODES:
-			refreshChildren();
-
-			List partsToEdit = new ArrayList();
-			switch (msg.getEventType()) {
-			case Notification.ADD:
-				addPartToEdit(partsToEdit, msg.getNewValue());
-				break;
-			case Notification.ADD_MANY:
-				for (Iterator iter = ((Collection) msg.getNewValue())
-						.iterator(); iter.hasNext();) {
-					addPartToEdit(partsToEdit, iter.next());
-				}
-				break;
-			}
-
-			if (getViewer().getControl().isFocusControl()) {
-				for (Iterator iter = partsToEdit.iterator(); iter.hasNext();) {
-					BaseEditPart editPart = (BaseEditPart) iter.next();
-					editPart.performDirectEdit();
-				}
-			}
-
-			break;
-		}
-	}
-
-	protected void refreshVisuals() {
-		Node node = (Node) getModel();
-		Dimension size = new Dimension(node.getWidth(), node.getHeight());
-		if (size == null) {
-			size = new Dimension(60, 100);
-		}
-		Point loc = node.getLocation();
-		if (loc == null) {
-			loc = new Point(10, 10);
-		}
-		Rectangle r = new Rectangle(loc, size);
-
-		((GraphicalEditPart) getParent()).setLayoutConstraint(this,
-				getFigure(), r);
-
-		if (cRouter == null) {
-			ConnectionLayer cLayer = (ConnectionLayer) getLayer(CONNECTION_LAYER);
-			FanRouter router = new FanRouter();
-			router.setSeparation(30);
-			cRouter = new BendpointConnectionRouter();
-			router.setNextRouter(cRouter);
-			cLayer.setConnectionRouter(router);
-		}
-	}
-
-	protected List getModelChildren() {
-		return ((NodeContainer) getModel()).getNodes();
-	}
-	
-	/**
-	 * Only useful in case of ADD. Placed here in order to invoke in sub classes.
-	 * TODO:  Move this method to utility class.
-	 */
-	protected void cleanUpDiagram(EditPart part) {
-		EditPart dep = (EditPart) part.getParent();
-		if(dep instanceof ActivityDetailDiagramEditPart ){
-			
-			ActivityDetailDiagramEditPart add = ((ActivityDetailDiagramEditPart)dep);
-			if(!((Diagram)add.getModel()).isReadOnly()){
-				add.getRecentlyAddedParts().addAll(dep.getChildren());
-		
-				// clean up the diagram
-				DefaultEditDomain editingDomain = new DefaultEditDomain(null);
-				ActionRegistry actionRegistry = new ActionRegistry();
-		
-				DiagramActionService actionService = new DiagramActionService(
-						(GraphicalViewer)getParent().getViewer(), editingDomain, actionRegistry);
-				actionService.registerVerticalAlignFirstSelectedAction();
-		
-				DiagramUpdateService service = new DiagramUpdateService(
-						(GraphicalViewer)getParent().getViewer(), editingDomain, actionRegistry);
-				service.cleanUpDiagram();
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/NodeEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/NodeEditPart.java
deleted file mode 100755
index 45987f5..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/NodeEditPart.java
+++ /dev/null
@@ -1,246 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.ChopboxAnchor;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.epf.authoring.gef.commands.CreateLinkCommand;
-import org.eclipse.epf.authoring.gef.commands.DeleteCommand;
-import org.eclipse.epf.authoring.gef.commands.ReconnectLinkCommand;
-import org.eclipse.epf.authoring.gef.util.ConnectionAnchorLocator;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.gef.ConnectionEditPart;
-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.editpolicies.ComponentEditPolicy;
-import org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gef.requests.ReconnectRequest;
-
-/**
- * Provides support for connections, and installs EditPolicy for (
- * {@link EditPolicy.COMPONENT_ROLE}, {@link EditPolicy.GRAPHICAL_NODE_ROLE},
- * {@linkEditPolicy.SELECTION_FEEDBACK_ROLE})
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public abstract class NodeEditPart extends BaseEditPart implements
-		org.eclipse.gef.NodeEditPart {
-
-	public NodeEditPart(Node model) {
-		super(model);
-	}
-
-	protected void createEditPolicies() {
-		super.createEditPolicies();
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ComponentEditPolicy() {
-			protected Command createDeleteCommand(GroupRequest deleteRequest) {
-				Boolean bool = (Boolean) deleteRequest.getExtendedData().get(
-						DeleteCommand.KEY_PERM_DELETE);
-				boolean permDelete = bool == null ? false : bool.booleanValue();
-				DeleteCommand cmd = new DeleteCommand(permDelete);
-				cmd.setPartToBeDeleted(getHost().getModel());
-				return cmd;
-			}
-		});
-
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new GraphicalNodeEditPolicy() {
-					protected Command getConnectionCompleteCommand(
-							CreateConnectionRequest request) {
-						CreateLinkCommand cmd = (CreateLinkCommand) request
-								.getStartCommand();
-						cmd.setTarget((Node) getHost().getModel());
-
-						if (request.getTargetEditPart() instanceof ConnectionAnchorLocator) {
-							if (request.getTargetEditPart().equals(
-									request.getSourceEditPart())) {
-
-							} else {
-								cmd
-										.setTargetEndPoint(((ConnectionAnchorLocator) request
-												.getTargetEditPart())
-												.getLocation(request
-														.getLocation()));
-							}
-						}
-
-						return cmd;
-					}
-
-					protected Command getConnectionCreateCommand(
-							CreateConnectionRequest request) {
-						CreateLinkCommand cmd = new CreateLinkCommand(
-								ModelFactory.eINSTANCE.createLink(),
-								(Node) getHost().getModel());
-						if (request.getTargetEditPart() instanceof ConnectionAnchorLocator) {
-							cmd
-									.setSourceEndPoint(((ConnectionAnchorLocator) request
-											.getTargetEditPart())
-											.getLocation(request.getLocation()));
-						} else {
-							cmd.setSourceEndPoint(request.getLocation());
-						}
-						request.setStartCommand(cmd);
-
-						return cmd;
-
-					}
-
-					protected Command getReconnectSourceCommand(
-							ReconnectRequest request) {
-						Link link = (Link) request.getConnectionEditPart()
-								.getModel();
-						ReconnectLinkCommand cmd = new ReconnectLinkCommand(
-								link, (Node) getHost().getModel(), true);
-						if (request.getTarget() instanceof ConnectionAnchorLocator) {
-							cmd.setEndPoint(((ConnectionAnchorLocator) request
-									.getTarget()).getLocation(request
-									.getLocation()));
-						}
-
-						return cmd;
-					}
-
-					protected Command getReconnectTargetCommand(
-							ReconnectRequest request) {
-						Link link = (Link) request.getConnectionEditPart()
-								.getModel();
-						ReconnectLinkCommand cmd = new ReconnectLinkCommand(
-								link, (Node) getHost().getModel(), false);
-						if (request.getTarget() instanceof ConnectionAnchorLocator) {
-							cmd.setEndPoint(((ConnectionAnchorLocator) request
-									.getTarget()).getLocation(request
-									.getLocation()));
-						}
-						return cmd;
-					}
-				});
-
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, null);
-		// By default, can't add anything to a node
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-
-			protected Command getDeleteDependantCommand(Request request) {
-				return null;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-		});
-	}
-
-	protected Node getNode() {
-		return (Node) getModel();
-	}
-
-	protected List getModelSourceConnections() {
-		return getNode().getOutgoingConnections();
-	}
-
-	protected List getModelTargetConnections() {
-		return getNode().getIncomingConnections();
-	}
-
-	public ConnectionAnchor getSourceConnectionAnchor(
-			ConnectionEditPart connection) {
-		return new ChopboxAnchor(getFigure());
-	}
-
-	public ConnectionAnchor getSourceConnectionAnchor(Request request) {
-		return new ChopboxAnchor(getFigure());
-	}
-
-	public ConnectionAnchor getTargetConnectionAnchor(
-			ConnectionEditPart connection) {
-		return new ChopboxAnchor(getFigure());
-	}
-
-	public ConnectionAnchor getTargetConnectionAnchor(Request request) {
-		return new ChopboxAnchor(getFigure());
-	}
-
-	protected void handlePropertyChanged(Notification msg) {
-		switch (msg.getFeatureID(Node.class)) {
-		case ModelPackage.NODE__LOCATION:
-		case ModelPackage.NODE__WIDTH:
-		case ModelPackage.NODE__HEIGHT:			
-			refreshVisuals();
-			break;
-		case ModelPackage.NODE__READ_ONLY:
-			refreshVisuals();
-			for (Iterator iter = getTargetConnections().iterator(); iter
-					.hasNext();) {
-				ConnectionEditPart conn = (ConnectionEditPart) iter.next();
-				conn.refresh();
-			}
-			break;
-
-		case ModelPackage.NODE__OUTGOING_CONNECTIONS:
-			refreshSourceConnections();
-			break;
-
-		case ModelPackage.NODE__INCOMING_CONNECTIONS:
-			refreshTargetConnections();
-			break;
-		}
-	}
-
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		Rectangle constraint = new Rectangle(0, 0, -1, -1);
-		if (getNode().getLocation() != null)
-			constraint.setLocation(getNode().getLocation());
-		constraint.width = getNode().getWidth();
-		((GraphicalEditPart) getParent()).setLayoutConstraint(this,
-				getFigure(), constraint);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.BaseEditPart#activate()
-	 */
-	public void activate() {
-		super.activate();
-		((Node) getModel()).addConsumer(this);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.BaseEditPart#deactivate()
-	 */
-	public void deactivate() {
-		((Node) getModel()).removeConsumer(this);
-		super.deactivate();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/RaisedMarginBorder.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/RaisedMarginBorder.java
deleted file mode 100755
index 442d0a5..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/RaisedMarginBorder.java
+++ /dev/null
@@ -1,72 +0,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
-//------------------------------------------------------------------------------
-package  org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- *  A border with a raised margin.
- *  
- * @author Kelvin Low
- * @since 1.0
- */
-public class RaisedMarginBorder extends MarginBorder {
-
-	private static final Insets DEFAULT_INSETS = new Insets(10, 10, 10, 10);
-
-	public RaisedMarginBorder() {
-		this(DEFAULT_INSETS);
-	}
-
-	public RaisedMarginBorder(Insets insets) {
-		super(insets);
-	}
-
-	public RaisedMarginBorder(int t, int l, int b, int r) {
-		super(t, l, b, r);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Border#getInsets(IFigure)
-	 */
-	public Insets getInsets(IFigure figure) {
-		return insets;
-	}
-	
-	/**
-	 * @see org.eclipse.draw2d.Border#isOpaque()
-	 */	
-	public boolean isOpaque() {
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Border#paint(IFigure, Graphics, Insets)
-	 */
-	public void paint(IFigure figure, Graphics g, Insets insets) {
-		g.setLineStyle(Graphics.LINE_SOLID);
-		g.setLineWidth(1);
-		g.setForegroundColor(ColorConstants.buttonLightest);
-		Rectangle r = getPaintRectangle(figure, insets);
-		r.resize(-1, -1);
-		g.drawLine(r.x, r.y, r.right(), r.y);
-		g.drawLine(r.x, r.y, r.x, r.bottom());
-		g.setForegroundColor(ColorConstants.buttonDarker);
-		g.drawLine(r.x, r.bottom(), r.right(), r.bottom());
-		g.drawLine(r.right(), r.y, r.right(), r.bottom());
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/RelativeXYAnchor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/RelativeXYAnchor.java
deleted file mode 100755
index 8dcb75c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/RelativeXYAnchor.java
+++ /dev/null
@@ -1,51 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-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/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/RoleTaskCompositeEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/RoleTaskCompositeEditPart.java
deleted file mode 100755
index 47b91d4..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/RoleTaskCompositeEditPart.java
+++ /dev/null
@@ -1,120 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FlowLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.epf.authoring.gef.edit.policies.RoleTaskFlowLayoutEditPolicy;
-import org.eclipse.epf.authoring.gef.util.TemplateConstants;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.NodeContainer;
-import org.eclipse.epf.diagram.model.RoleTaskComposite;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * RoleTaskCompositeEditPart is container with {@link FlowLayout}, and does not support adding/removing child editpart. 
- *  
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class RoleTaskCompositeEditPart extends NodeContainerEditPart {
-
-//	private static final Color BG_COLOR = new Color(Display.getCurrent(), 255,
-//			255, 156);
-	
-	private static  Color BG_COLOR;
-	public RoleTaskCompositeEditPart(RoleTaskComposite model) {
-		super(model);
-	}
-
-	protected IFigure createFigure() {
-		Figure figure = new Figure();
-		FlowLayout layout = new FlowLayout();
-		layout.setMinorSpacing(20);
-		figure.setLayoutManager(layout);
-		figure.setBorder(new RaisedMarginBorder());
-		figure.setBackgroundColor(getBackgroundColor());
-		figure.setOpaque(true);
-		return figure;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.NodeContainerEditPart#handlePropertyChanged(Notification)
-	 */
-	protected void handlePropertyChanged(Notification msg) {
-		switch (msg.getFeatureID(NodeContainer.class)) {
-		case ModelPackage.NODE_CONTAINER__NODES:
-			refreshChildren();
-
-			// refresh diagram's children
-			EditPart diagramEditPart = getParent();
-//			if (diagramEditPart instanceof ActivityDetailDiagramEditPart) {
-//				ActivityDetailDiagram diagram = (ActivityDetailDiagram) diagramEditPart
-//						.getModel();
-//
-//				if (!GraphicalDataHelper.isAutoLayout(diagram)) {
-//					((ActivityDetailDiagramEditPart) diagramEditPart)
-//							.getRecentlyAddedParts().addAll(
-//									diagramEditPart.getChildren());
-//					DefaultEditDomain ed = (DefaultEditDomain) diagramEditPart
-//							.getViewer().getEditDomain();
-//					IEditorPart editor = ed.getEditorPart();
-//					if (editor != null && editor instanceof ActivityDetailDiagramEditor) {
-//						((ActivityDetailDiagramEditor) editor).cleanUpDiagram();
-//					}
-//				} else {
-//					diagramEditPart.refresh();
-//				}
-//			}
-			diagramEditPart.refresh();
-			return;
-		}
-		super.handlePropertyChanged(msg);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.NodeContainerEditPart#createEditPolicies()
-	 */
-	protected void createEditPolicies() {
-		super.createEditPolicies();
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new RoleTaskFlowLayoutEditPolicy());
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, null);
-	}
-	protected Color getBackgroundColor(){
-		if(BG_COLOR != null) return BG_COLOR;
-		
-		if(BG_COLOR == null){
-			String colorString = AuthoringUIPlugin.getDefault().getPreferenceStore().getString(
-					TemplateConstants.ADD_ROLE_TASKS_BOX_BG_COLOR_RGB);
-			if(colorString != null && colorString.length() > 0){
-				StringTokenizer tokenizer = new StringTokenizer(colorString, ",");
-				int r = Integer.parseInt(tokenizer.nextToken());
-				int g = Integer.parseInt(tokenizer.nextToken());
-				int b = Integer.parseInt(tokenizer.nextToken());
-				BG_COLOR = new Color(null, r,g,b);
-				return BG_COLOR;
-			}
-		}
-		if(BG_COLOR == null){
-			BG_COLOR = new Color(Display.getCurrent(), 255,
-							255, 156);
-		}
-		return BG_COLOR;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/StartNodeEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/StartNodeEditPart.java
deleted file mode 100755
index 1aabcb3..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/StartNodeEditPart.java
+++ /dev/null
@@ -1,49 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Ellipse;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-
-/**
- * Provides support for creating figure for {@link TypedNode.START}
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class StartNodeEditPart extends NodeEditPart {
-
-	public StartNodeEditPart(TypedNode model) {
-		super(model);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.BaseEditPart#createDirectEditPolicy()
-	 */
-	protected DirectEditPolicy createDirectEditPolicy() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.BaseEditPart#createFigure()
-	 */
-	protected IFigure createFigure() {
-		Ellipse f = new Ellipse();
-		f.setBackgroundColor(ColorConstants.black);
-		f.setForegroundColor(ColorConstants.red);
-		f.setSize(20, 20);
-		return f;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/SynchBarNodeEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/SynchBarNodeEditPart.java
deleted file mode 100755
index c2fc003..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/SynchBarNodeEditPart.java
+++ /dev/null
@@ -1,134 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.epf.authoring.gef.util.ConnectionAnchorLocator;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.LocationRequest;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * Provides support for creating figure and creating relative anchors
- * for {@link TypedNode.SYNC_BAR}
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class SynchBarNodeEditPart extends NodeEditPart implements
-		ConnectionAnchorLocator {
-
-	private static final Color BG_COLOR = new Color(null, 51, 102, 102);
-
-	private Point recentTargetEndPoint;
-
-	private Point recentSourceEndPoint;
-
-	public SynchBarNodeEditPart(TypedNode model) {
-		super(model);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.BaseEditPart#createDirectEditPolicy()
-	 */
-	protected DirectEditPolicy createDirectEditPolicy() {
-		return null;
-	}
-
-	protected IFigure createFigure() {
-		RectangleFigure f = new RectangleFigure();
-		f.setBackgroundColor(BG_COLOR);
-		f.setSize(100, 5);
-		return f;
-	}
-
-	public ConnectionAnchor getSourceConnectionAnchor(
-			ConnectionEditPart connection) {
-		boolean isRelative = false;
-		Point sourceEndPoint = null;
-		if (recentSourceEndPoint == null) {
-			// get source end point from the model
-			Link link = (Link) connection.getModel();
-			sourceEndPoint = link.getSourceEndPoint();
-			isRelative = true;
-		} else {
-			sourceEndPoint = recentSourceEndPoint;
-		}
-		if (sourceEndPoint != null) {
-			return new RelativeXYAnchor(getFigure(), sourceEndPoint, isRelative);
-		}
-		return super.getSourceConnectionAnchor(connection);
-	}
-
-	public ConnectionAnchor getSourceConnectionAnchor(Request request) {
-		Point p = null;
-		if (request instanceof CreateConnectionRequest) {
-			CreateConnectionRequest req = (CreateConnectionRequest) request;
-			p = req.getLocation();
-		} else if (request instanceof LocationRequest) {
-			p = ((LocationRequest) request).getLocation();
-		}
-		if (p != null) {
-			recentSourceEndPoint = getLocation(p);
-			return new RelativeXYAnchor(getFigure(), recentSourceEndPoint, true);
-		}
-		return super.getSourceConnectionAnchor(request);
-	}
-
-	public ConnectionAnchor getTargetConnectionAnchor(
-			ConnectionEditPart connection) {
-		boolean isRelative = false;
-		Point targetEndPoint = null;
-		if (recentTargetEndPoint == null) {
-			Link link = (Link) connection.getModel();
-			targetEndPoint = link.getTargetEndPoint();
-			isRelative = true;
-		} else {
-			targetEndPoint = recentTargetEndPoint;
-		}
-		if (targetEndPoint != null) {
-			return new RelativeXYAnchor(getFigure(), targetEndPoint, isRelative);
-		}
-
-		return super.getTargetConnectionAnchor(connection);
-	}
-
-	public ConnectionAnchor getTargetConnectionAnchor(Request request) {
-		Point p = null;
-		if (request instanceof CreateConnectionRequest) {
-			CreateConnectionRequest req = (CreateConnectionRequest) request;
-			p = req.getLocation();
-		} else if (request instanceof LocationRequest) {
-			p = ((LocationRequest) request).getLocation();
-		}
-		if (p != null) {
-			recentTargetEndPoint = getLocation(p);
-			return new RelativeXYAnchor(getFigure(), recentTargetEndPoint, true);
-		}
-
-		return super.getTargetConnectionAnchor(request);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.util.ConnectionAnchorLocator#getLocation(Point)
-	 */
-	public Point getLocation(Point reference) {
-		return ClosestAnchor.getLocation(getFigure(), reference);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/TextFigureCellEditorLocator.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/TextFigureCellEditorLocator.java
deleted file mode 100755
index 465e7db..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/TextFigureCellEditorLocator.java
+++ /dev/null
@@ -1,74 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.epf.authoring.gef.figures.TextFigure;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Constraint for TextFlow placing.
- * @author James Thario
- * @since 1.0
- */
-public class TextFigureCellEditorLocator implements CellEditorLocator {
-
-	private TextFigure figure;
-
-
-	/**
-	 * Creates a new LabelTextCellEditorLocator for the given text figure
-	 * @param tf
-	 */
-	public TextFigureCellEditorLocator(TextFigure tf) {
-		setFigure(tf);
-	}
-
-	/**
-	 * @see CellEditorLocator#relocate(org.eclipse.jface.viewers.CellEditor)
-	 */
-	public void relocate(CellEditor celleditor) {
-		TextFigureCellEditorLocator.doLocate(celleditor, figure);
-	}
-
-	public static void doLocate(CellEditor ce, TextFigure fig) {
-		Text text = (Text) ce.getControl();
-		String n = (String) ce.getValue();
-		GC gc = new GC(text);
-		Point size = gc.textExtent(n);
-		gc.dispose();
-		if (size.x != 0)
-			size = text.computeSize(size.x, SWT.DEFAULT);
-		text.setSize(size.x, size.y);
-		Rectangle textBounds = new Rectangle(text.getClientArea().x, text
-				.getClientArea().y, text.getClientArea().width, text
-				.getClientArea().height);
-		Rectangle figBounds = fig.getClientArea();
-		fig.translateToAbsolute(figBounds);
-		int delta = (figBounds.width - textBounds.width) / 2;
-		int y = fig.getTextFlowPage().getLocation().y;
-		text.setLocation(figBounds.x + delta, y);
-	}
-
-	public TextFigure getFigure() {
-		return figure;
-	}
-
-	public void setFigure(TextFigure figure) {
-		this.figure = figure;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/TextFigureDirectEditManager.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/TextFigureDirectEditManager.java
deleted file mode 100755
index d939688..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/TextFigureDirectEditManager.java
+++ /dev/null
@@ -1,188 +0,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
-//------------------------------------------------------------------------------
-
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.epf.authoring.gef.figures.TextFigure;
-import org.eclipse.epf.authoring.gef.util.DiagramUIResources;
-import org.eclipse.epf.authoring.gef.util.TemplateConstants;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.WorkBreakdownElementNode;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.events.VerifyListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Manages direct editing and creating celleditor for {@link TextFigure}
- * 
- * @author James Thario
- * @since 1.0
- */
-public class TextFigureDirectEditManager extends DirectEditManager {
-
-	Font scaledFont;
-
-	protected VerifyListener verifyListener;
-
-	protected TextFigure figure = null;
-
-	public TextFigureDirectEditManager(GraphicalEditPart source,
-			Class editorType, CellEditorLocator locator, TextFigure figure) {
-		super(source, editorType, locator);
-		this.figure = figure;
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
-	 */
-	protected void bringDown() {
-		bringDown(true);
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
-	 */
-	protected void bringDown(boolean check) {
-		// This method might be re-entered when super.bringDown() is called.
-		Font disposeFont = scaledFont;
-		scaledFont = null;
-		super.bringDown();
-		if (disposeFont != null)
-			disposeFont.dispose();
-		if (check) {
-			NamedNode node = (NamedNode) getEditPart().getModel();
-			String name = node.getName();
-			if (node instanceof WorkBreakdownElementNode) {
-				Object wbelement = node.getObject();
-				if (wbelement instanceof Activity
-						&& ProcessUtil
-								.isExtendingOrLocallyContributing((BreakdownElement) wbelement)) {
-					name = ProcessUtil
-							.getPresentationName((BreakdownElement) wbelement);
-				}
-
-			}
-			if (name == null || name.trim().length() == 0) {
-				Display
-						.getCurrent()
-						.asyncExec(
-								new PromptEdit(
-										(NamedNodeEditPart) getEditPart(),
-										DiagramUIResources.err_name_empty)); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#initCellEditor()
-	 */
-	protected void initCellEditor() {
-		TextCellEditor editor = (TextCellEditor) getCellEditor();
-		editor.setStyle(SWT.MULTI);
-		Text t = (Text) editor.getControl();
-		verifyListener = new VerifyListener() {
-			public void verifyText(VerifyEvent event) {
-				Text text = (Text) getCellEditor().getControl();
-				String oldText = text.getText();
-				String leftText = oldText.substring(0, event.start);
-				String rightText = oldText.substring(event.end, oldText
-						.length());
-				GC gc = new GC(text);
-				Point size = gc.textExtent(leftText + event.text + rightText);
-				gc.dispose();
-				if (size.x != 0)
-					size = text.computeSize(size.x, SWT.DEFAULT);
-				getCellEditor().getControl().setSize(size.x, size.y);
-			}
-		};
-		t.addVerifyListener(verifyListener);
-		String initialLabelText = ((NamedNodeEditPart) this.getEditPart())
-				.getDirectEditText();
-		editor.setValue(initialLabelText);
-		t.setFont(TemplateConstants.DEFAULT_FONT);
-		t.selectAll();
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#unhookListeners()
-	 */
-	protected void unhookListeners() {
-		super.unhookListeners();
-		if (getCellEditor() != null) {
-			Text text = (Text) getCellEditor().getControl();
-			if (verifyListener != null)
-				text.removeVerifyListener(verifyListener);
-			verifyListener = null;
-		}
-	}
-
-	/**
-	 * Checks if the given text is valid. Subclasses can override this method.
-	 * 
-	 * @param txt
-	 * @return null if the given text is valid, an error message otherwise
-	 */
-	protected String validate(String txt) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#commit()
-	 */
-	protected void commit() {
-		String msg = validate((String) getCellEditor().getValue());
-		if (msg != null) {
-			bringDown(false);
-			Display.getCurrent().asyncExec(
-					new PromptEdit((NamedNodeEditPart) getEditPart(), msg));
-			return;
-		}
-		super.commit();
-	}
-
-	static class PromptEdit implements Runnable {
-
-		private NamedNodeEditPart part;
-
-		private String msg;
-
-		PromptEdit(NamedNodeEditPart part, String msg) {
-			this.part = part;
-			this.msg = msg;
-		}
-
-		/**
-		 * @see java.lang.Runnable#run()
-		 */
-		public void run() {
-			String title = DiagramUIResources.diagram_errorDialog_title_text0; //$NON-NLS-1$
-			MsgDialog dialog = AuthoringUIPlugin.getDefault().getMsgDialog();
-			dialog.displayError(title, msg); //$NON-NLS-1$
-			part.performDirectEdit();
-		}
-
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/TopAnchor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/TopAnchor.java
deleted file mode 100755
index 0f8282e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/TopAnchor.java
+++ /dev/null
@@ -1,45 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.AbstractConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * Connection anchor for top of the figure. 
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-class TopAnchor extends AbstractConnectionAnchor {
-
-	private int offset;
-
-	TopAnchor(IFigure source, int offset) {
-		super(source);
-		this.offset = offset;
-	}
-
-	public Point getLocation(Point reference) {
-		Rectangle r = getOwner().getBounds().getCopy();
-		getOwner().translateToAbsolute(r);
-		int off = offset;
-		if (off == -1)
-			off = r.width / 2;
-		if (r.contains(reference) || r.y < reference.y)
-			return r.getBottomLeft().translate(off, -1);
-		else
-			return r.getTopLeft().translate(off, 0);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ValidatingDirectEditManager.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ValidatingDirectEditManager.java
deleted file mode 100755
index a65a34a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ValidatingDirectEditManager.java
+++ /dev/null
@@ -1,204 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.epf.authoring.gef.util.DiagramUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.WorkBreakdownElementNode;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.events.VerifyListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Text;
-
-
-/**
- * Manages direct editing and creating cell editor for the {@link Label}
- * and validates the input. 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class ValidatingDirectEditManager extends DirectEditManager {
-
-	Font scaledFont;
-
-	protected VerifyListener verifyListener;
-
-	protected Label activityLabel;
-
-	/**
-	 * Creates a new ActivityDirectEditManager with the given attributes.
-	 * 
-	 * @param source
-	 *            the source EditPart
-	 * @param editorType
-	 *            type of editor
-	 * @param locator
-	 *            the CellEditorLocator
-	 */
-	public ValidatingDirectEditManager(GraphicalEditPart source,
-			Class editorType, CellEditorLocator locator, Label label) {
-		super(source, editorType, locator);
-		activityLabel = label;
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
-	 */
-	protected void bringDown() {
-		bringDown(true);
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
-	 */
-	protected void bringDown(boolean check) {
-		// This method might be re-entered when super.bringDown() is called.
-		Font disposeFont = scaledFont;
-		scaledFont = null;
-		super.bringDown();
-		if (disposeFont != null)
-			disposeFont.dispose();
-		if (check) {
-			NamedNode node = (NamedNode) getEditPart().getModel();
-			String name = node.getName();
-			if (node instanceof WorkBreakdownElementNode) {
-				Object wbelement = node.getObject();
-				if (wbelement instanceof Activity
-						&& ProcessUtil
-								.isExtendingOrLocallyContributing((BreakdownElement) wbelement)) {
-					name = ProcessUtil
-							.getPresentationName((BreakdownElement) wbelement);
-				}
-
-			}
-			if (name == null || name.trim().length() == 0) {
-				Display
-						.getCurrent()
-						.asyncExec(
-								new PromptEdit(
-										(NamedNodeEditPart) getEditPart(),
-										DiagramUIResources.err_name_empty)); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#initCellEditor()
-	 */
-	protected void initCellEditor() {
-		Text text = (Text) getCellEditor().getControl();
-		verifyListener = new VerifyListener() {
-			public void verifyText(VerifyEvent event) {
-				Text text = (Text) getCellEditor().getControl();
-				String oldText = text.getText();
-				String leftText = oldText.substring(0, event.start);
-				String rightText = oldText.substring(event.end, oldText
-						.length());
-				GC gc = new GC(text);
-				Point size = gc.textExtent(leftText + event.text + rightText);
-				gc.dispose();
-				if (size.x != 0)
-					size = text.computeSize(size.x, SWT.DEFAULT);
-				getCellEditor().getControl().setSize(size.x, size.y);
-			}
-		};
-		text.addVerifyListener(verifyListener);
-
-		String initialLabelText = activityLabel.getText();
-		getCellEditor().setValue(initialLabelText);
-		IFigure figure = ((GraphicalEditPart) getEditPart()).getFigure();
-		scaledFont = figure.getFont();
-		FontData data = scaledFont.getFontData()[0];
-		Dimension fontSize = new Dimension(0, data.getHeight());
-		activityLabel.translateToAbsolute(fontSize);
-		data.setHeight(fontSize.height);
-		scaledFont = new Font(null, data);
-
-		text.setFont(scaledFont);
-		text.selectAll();
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#unhookListeners()
-	 */
-	protected void unhookListeners() {
-		super.unhookListeners();
-		if (getCellEditor() != null) {
-			Text text = (Text) getCellEditor().getControl();
-			text.removeVerifyListener(verifyListener);
-			verifyListener = null;
-		}
-	}
-
-	/**
-	 * Checks if the given text is valid. Subclasses can override this method.
-	 * 
-	 * @param txt
-	 * @return null if the given text is valid, an error message otherwise
-	 */
-	protected String validate(String txt) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#commit()
-	 */
-	protected void commit() {
-		String msg = validate((String) getCellEditor().getValue());
-		if (msg != null) {
-			bringDown(false);
-			Display.getCurrent().asyncExec(
-					new PromptEdit((NamedNodeEditPart) getEditPart(), msg));
-			return;
-		}
-		super.commit();
-	}
-
-	static class PromptEdit implements Runnable {
-
-		private NamedNodeEditPart part;
-
-		private String msg;
-
-		PromptEdit(NamedNodeEditPart part, String msg) {
-			this.part = part;
-			this.msg = msg;
-		}
-
-		/**
-		 * @see java.lang.Runnable#run()
-		 */
-		public void run() {
-			String title = DiagramUIResources.diagram_errorDialog_title_text0; //$NON-NLS-1$
-			MsgDialog dialog = AuthoringUIPlugin.getDefault().getMsgDialog();
-			dialog.displayError(title, msg); //$NON-NLS-1$
-			part.performDirectEdit();
-		}
-
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ValidatingFreeTextEditManager.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ValidatingFreeTextEditManager.java
deleted file mode 100755
index 10860cc..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/ValidatingFreeTextEditManager.java
+++ /dev/null
@@ -1,196 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.epf.authoring.gef.util.DiagramUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.events.VerifyListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Text;
-
-
-/**
- * Manages direct editing and creating cell editor for the {@link Label}
- * and validates the input. 
- * 
- * @author Phong Nguyen Le
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class ValidatingFreeTextEditManager extends DirectEditManager {
-
-	Font scaledFont;
-
-	protected VerifyListener verifyListener;
-
-	protected Label activityLabel;
-
-	/**
-	 * Creates a new ActivityDirectEditManager with the given attributes.
-	 * 
-	 * @param source
-	 *            the source EditPart
-	 * @param editorType
-	 *            type of editor
-	 * @param locator
-	 *            the CellEditorLocator
-	 */
-	public ValidatingFreeTextEditManager(GraphicalEditPart source,
-			Class editorType, CellEditorLocator locator, Label label) {
-		super(source, editorType, locator);
-		activityLabel = label;
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
-	 */
-	protected void bringDown() {
-		bringDown(true);
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
-	 */
-	protected void bringDown(boolean check) {
-		// This method might be re-entered when super.bringDown() is called.
-		Font disposeFont = scaledFont;
-		scaledFont = null;
-		super.bringDown();
-		if (disposeFont != null)
-			disposeFont.dispose();
-		if (check) {
-			GraphNode node = ((Node) getEditPart().getModel()).getGraphNode();
-			String name = ((Property) node.getProperty().get(0)).getValue();
-			if (name == null || name.trim().length() == 0) {
-				Display
-						.getCurrent()
-						.asyncExec(
-								new PromptEdit(
-										(NodeEditPart) getEditPart(),
-										AuthoringUIResources.gef_validatingFreeTextEditManager_bringDownPrompt)); //$NON-NLS-1$ 
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#initCellEditor()
-	 */
-	protected void initCellEditor() {
-		Text text = (Text) getCellEditor().getControl();
-		verifyListener = new VerifyListener() {
-			public void verifyText(VerifyEvent event) {
-				Text text = (Text) getCellEditor().getControl();
-				String oldText = text.getText();
-				String leftText = oldText.substring(0, event.start);
-				String rightText = oldText.substring(event.end, oldText
-						.length());
-				GC gc = new GC(text);
-				Point size = gc.textExtent(leftText + event.text + rightText);
-				gc.dispose();
-				if (size.x != 0)
-					size = text.computeSize(size.x, SWT.DEFAULT);
-				getCellEditor().getControl().setSize(size.x, size.y);
-			}
-		};
-		text.addVerifyListener(verifyListener);
-
-		String initialLabelText = activityLabel.getText();
-		getCellEditor().setValue(initialLabelText);
-		text.selectAll();
-		IFigure figure = ((GraphicalEditPart) getEditPart()).getFigure();
-		scaledFont = figure.getFont();
-		FontData data = scaledFont.getFontData()[0];
-		Dimension fontSize = new Dimension(0, data.getHeight());
-		activityLabel.translateToAbsolute(fontSize);
-		data.setHeight(fontSize.height);
-		scaledFont = new Font(null, data);
-
-		text.setFont(scaledFont);
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#unhookListeners()
-	 */
-	protected void unhookListeners() {
-		super.unhookListeners();
-		if (getCellEditor() != null) {
-			Text text = (Text) getCellEditor().getControl();
-			text.removeVerifyListener(verifyListener);
-			verifyListener = null;
-		}
-	}
-
-	/**
-	 * Checks if the given text is valid. Subclasses can override this method.
-	 * 
-	 * @param txt
-	 * @return null if the given text is valid, an error message otherwise
-	 */
-	protected String validate(String txt) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#commit()
-	 */
-	protected void commit() {
-		String msg = validate((String) getCellEditor().getValue());
-		if (msg != null) {
-			bringDown(false);
-			Display.getCurrent().asyncExec(
-					new PromptEdit((NamedNodeEditPart) getEditPart(), msg));
-			return;
-		}
-		super.commit();
-	}
-
-	static class PromptEdit implements Runnable {
-
-		private NodeEditPart part;
-
-		private String msg;
-
-		PromptEdit(NodeEditPart part, String msg) {
-			this.part = part;
-			this.msg = msg;
-		}
-
-		/**
-		 * @see java.lang.Runnable#run()
-		 */
-		public void run() {
-			String title = DiagramUIResources.diagram_errorDialog_title_text0; //$NON-NLS-1$
-			String problem = DiagramUIResources.diagram_node_property_value_problem_msg; //$NON-NLS-1$
-			MsgDialog dialog = AuthoringUIPlugin.getDefault().getMsgDialog();
-			dialog.displayError(title, problem, msg); //$NON-NLS-1$
-			part.performDirectEdit();
-		}
-
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/WPDiagramEditPartFactory.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/WPDiagramEditPartFactory.java
deleted file mode 100755
index 0c477f3..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/WPDiagramEditPartFactory.java
+++ /dev/null
@@ -1,64 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.WorkProductNode;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-
-/**
- * Factory for Work Product Dependency Diagram. Support creation 
- * of child editpart in WorkPRoduct dependency diagram. 
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class WPDiagramEditPartFactory implements EditPartFactory {
-
-	public WPDiagramEditPartFactory() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPartFactory#createEditPart(EditPart, Object)
-	 */
-	public EditPart createEditPart(EditPart context, Object model) {
-		if (model instanceof Diagram) {
-			return new DiagramEditPart((Diagram) model);
-		} else if (model instanceof WorkProductNode) {
-			return new WorkProductNodeEditPart((NamedNode) model);
-		} else if (model instanceof Link) {
-			return new LinkEditPart((Link) model);
-		}
-		// typed node creation
-		if (model instanceof TypedNode) {
-			TypedNode node = (TypedNode) model;
-			switch (node.getType()) {
-			case TypedNode.START:
-				return new StartNodeEditPart(node);
-			case TypedNode.END:
-				return new EndNodeEditPart(node);
-			case TypedNode.DECISION:
-				return new DecisionNodeEditPart(node);
-			case TypedNode.SYNCH_BAR:
-				return new SynchBarNodeEditPart(node);
-			case TypedNode.FREE_TEXT:
-				return new FreeTextNodeEditPart(node);
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/WPNodeEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/WPNodeEditPart.java
deleted file mode 100755
index 9791ebf..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/WPNodeEditPart.java
+++ /dev/null
@@ -1,96 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.epf.authoring.gef.figures.Images;
-import org.eclipse.epf.authoring.gef.figures.SelectableLabel;
-import org.eclipse.epf.authoring.gef.figures.WPCompartmentFigure;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.WorkProductNode;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-
-/**
- * 
- * @author Shashidhar Kannoori
- * @author Phong Nguyen Le
- * @since 1.0
- * @deprecated 
- * @see WorkProductNodeEditPart
- */
-public class WPNodeEditPart extends NamedNodeEditPart {
-
-	int type = 1;
-
-	public WPNodeEditPart(NamedNode model) {
-		super(model);
-	}
-
-	protected IFigure createFigure() {
-		if (getModel() instanceof WorkProductNode) {
-			type = ((WorkProductNode) getModel()).getType();
-		}
-		Label l = new SelectableLabel();
-		l.setLabelAlignment(PositionConstants.LEFT);
-		l.setTextPlacement(PositionConstants.SOUTH);
-		l.setBackgroundColor(ColorConstants.white);
-		Font font = new Font(null, "Arial", 9, SWT.NORMAL); //$NON-NLS-1$
-		l.setFont(font);
-		if (type == 1)
-			l.setIcon(Images.ARTIFACT);
-		else if (type == 2)
-			l.setIcon(Images.DELIVERABLE);
-		else if (type == 3)
-			l.setIcon(Images.OUTCOME);
-		else
-			l.setIcon(Images.WORK_PRODUCT_DESCRIPTOR);
-		l.setIconTextGap(5);
-
-		WPCompartmentFigure wpfigure = new WPCompartmentFigure(l, type);
-		return wpfigure;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.BaseEditPart#createDirectEditManager()
-	 */
-	protected DirectEditManager createDirectEditManager() {
-		Label l = (Label) (((WPCompartmentFigure) getFigure()).getLabel());
-		return new ValidatingDirectEditManager(this, TextCellEditor.class,
-				new LabelTextCellEditorLocator(l), l) {
-			protected String validate(String txt) {
-				Object obj = getEditPart().getModel();
-				if (obj instanceof WorkProductNode) {
-					Node node = (Node) obj;
-					Object e = node.getObject();
-					Suppression suppression = node.getDiagram().getSuppression();
-					return TngUtil.checkWorkProductDescriptorPresentationName(
-							e, txt, suppression);
-				}
-
-				return super.validate(txt);
-			}
-		};
-	}
-
-	IFigure getDirectEditFigure() {
-		return (((WPCompartmentFigure) getFigure()).getLabel());
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/WorkBreakdownElementNodeEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/WorkBreakdownElementNodeEditPart.java
deleted file mode 100755
index b19be76..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/WorkBreakdownElementNodeEditPart.java
+++ /dev/null
@@ -1,169 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.epf.authoring.gef.figures.ActivityFigure;
-import org.eclipse.epf.authoring.gef.figures.Colors;
-import org.eclipse.epf.authoring.gef.figures.Images;
-import org.eclipse.epf.authoring.gef.figures.TextFigure;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.WorkBreakdownElementNode;
-import org.eclipse.epf.diagram.model.WorkProductDescriptorNode;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.Descriptor;
-import org.eclipse.epf.uma.Iteration;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.Phase;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Common editpart for different {@link Descriptor}
- * Provides support for word-wrap of editpart's object name. 
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class WorkBreakdownElementNodeEditPart extends NamedNodeEditPart {
-
-	public WorkBreakdownElementNodeEditPart(NamedNode model) {
-		super(model);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.NamedNodeEditPart#getImage()
-	 */
-	protected Image getImage() {
-		Image img = null;
-		Node node = (Node) getModel();
-		Object obj = node.getObject();
-		if (obj instanceof Phase) {
-			img = Images.PHASE;
-		}
-		else if (obj instanceof Iteration) {
-			img = Images.ITERATION;
-		}
-		else if (obj instanceof Activity) {
-			img = Images.ACTIVITY;
-		}
-		else if (obj instanceof TaskDescriptor) {
-			img = Images.TASK_DESCRIPTOR;
-		}
-		else if (obj instanceof Milestone) {
-			img = Images.MILESTONE;
-		}
-		return img;
-	}
-
-	protected IFigure createFigure() {
-		ActivityFigure figure = new ActivityFigure();
-		Image image = getImage();
-		if (image != null) {
-			figure.add(image);
-		}
-		return figure;
-	}
-
-	String getDirectEditText() {
-		TextFigure note = (TextFigure) getFigure();
-		return note.getText();
-	}
-
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		IFigure fig = getDirectEditFigure();
-		if (fig instanceof ActivityFigure) {
-			ActivityFigure l = (ActivityFigure) fig;
-			fig.setForegroundColor(getForegroundColor());
-			String text;
-			// Below check is required for Extended Activity presentation name
-			// should be used from base.
-			if (getModel() instanceof WorkBreakdownElementNode) {
-				WorkBreakdownElementNode node = (WorkBreakdownElementNode) getModel();
-				Object wbelement = node.getObject();
-				if (wbelement instanceof Activity
-						&& ProcessUtil
-								.isExtendingOrLocallyContributing((BreakdownElement) wbelement)) {
-					text = ProcessUtil
-							.getPresentationName((BreakdownElement) wbelement);
-				}
-				else {
-					text = ((NamedNode) getModel()).getName();
-				}
-			}
-			else {
-				text = ((NamedNode) getModel()).getName();
-			}
-			try {
-				if (getParent() instanceof ActivityDetailDiagramEditPart
-						|| getParent().getParent() instanceof ActivityDetailDiagramEditPart) {
-					int w = WRAP_WIDTH;
-					if (this.getModel() instanceof WorkProductDescriptorNode)
-						w = WORK_PRODUCT_WRAP_WIDTH;
-					text = wrap(text, w);
-				}
-			}
-			catch (NullPointerException npe) {
-			}
-			l.setText(text);
-		}
-	}
-
-	private Color getForegroundColor() {
-		NamedNode node = (NamedNode) getModel();
-		if (node.isSuppressed()) {
-			return Colors.SUPRESSED_ELEMENT_LABEL;
-		}
-		if (node.isReadOnly()) {
-			return Colors.INHERITED_ELEMENT_LABEL;
-		}
-		else {
-			return ColorConstants.black;
-		}
-	}
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.BaseEditPart#createDirectEditManager()
-	 */
-	protected DirectEditManager createDirectEditManager() {
-		return new TextFigureDirectEditManager((GraphicalEditPart) this,
-				TextCellEditor.class, new TextFigureCellEditorLocator(
-						(TextFigure) getFigure()), (TextFigure) getFigure()) {
-			protected String validate(String txt) {
-				Object obj = getEditPart().getModel();
-				if (obj instanceof WorkBreakdownElementNode) {
-					WorkBreakdownElementNode node = (WorkBreakdownElementNode) obj;
-					Object e = node.getObject();
-					if (e instanceof Activity) {
-						return TngUtil.checkWBSActivityPresentationName(e, txt, node.getDiagram().getSuppression());
-					}
-					else {
-						return TngUtil
-								.checkWorkBreakdownElementPresentationName(e,
-										txt, node.getDiagram().getSuppression());
-					}
-				}
-
-				return super.validate(txt);
-			}
-		};
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/WorkProductCompositeEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/WorkProductCompositeEditPart.java
deleted file mode 100755
index 98ac69d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/WorkProductCompositeEditPart.java
+++ /dev/null
@@ -1,246 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.ChopboxAnchor;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FlowLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.epf.authoring.gef.commands.CreateLinkCommand;
-import org.eclipse.epf.authoring.gef.commands.ReconnectLinkCommand;
-import org.eclipse.epf.authoring.gef.util.ConnectionAnchorLocator;
-import org.eclipse.epf.authoring.gef.util.TemplateConstants;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.NodeContainer;
-import org.eclipse.epf.diagram.model.WorkProductComposite;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.NodeEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * WorkProductCompositeEditPart is container with {@link FlowLayout}, and does not support adding/removing child editpart.
- * @author Phong Nguyen Le
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class WorkProductCompositeEditPart extends NodeContainerEditPart
-		implements NodeEditPart {
-
-	//private static final Color BG_COLOR = new Color(Display.getCurrent(), 255,
-	//		255, 205);
-	private static Color BG_COLOR;
-
-	/**
-	 * @param model
-	 */
-	public WorkProductCompositeEditPart(WorkProductComposite model) {
-		super(model);
-	}
-
-	protected IFigure createFigure() {
-		Figure figure = new Figure();
-		FlowLayout layout = new FlowLayout();
-		layout.setMinorSpacing(20);
-		figure.setLayoutManager(layout);
-		figure.setBorder(new RaisedMarginBorder());
-		figure.setBackgroundColor(getBackgroundColor());
-		figure.setOpaque(true);
-		return figure;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.NodeContainerEditPart#handlePropertyChanged(Notification)
-	 */
-	protected void handlePropertyChanged(Notification msg) {
-		switch (msg.getFeatureID(NodeContainer.class)) {
-		case ModelPackage.NODE_CONTAINER__NODES:
-			refreshChildren();
-			
-			adjustSize();
-			
-			// refresh diagram's children
-			EditPart diagramEditPart = getParent();
-			diagramEditPart.refresh();
-
-			return;
-		}
-		super.handlePropertyChanged(msg);
-	}
-
-	/**
-	 * 
-	 */
-	private void adjustSize() {
-		// TODO Auto-generated method stub
-		List list = getChildren();
-		int tHeight = 20;
-		int tWidth = 20;
-		for(Iterator iterator = list.iterator(); iterator.hasNext();){
-			GraphicalEditPart editpart = (GraphicalEditPart)iterator.next();
-			tHeight+=editpart.getFigure().getPreferredSize().height;
-			if(tWidth < editpart.getFigure().getPreferredSize().width){
-				tWidth = editpart.getFigure().getPreferredSize().width;
-			}
-		}
-		((Node) this.getModel()).setHeight(tHeight);
-		((Node) this.getModel()).setWidth(tWidth+20);
-	}
-
-	protected void createEditPolicies() {
-		super.createEditPolicies();
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new GraphicalNodeEditPolicy() {
-					protected Command getConnectionCompleteCommand(
-							CreateConnectionRequest request) {
-						CreateLinkCommand cmd = (CreateLinkCommand) request
-								.getStartCommand();
-						cmd.setTarget((Node) getHost().getModel());
-
-						if (request.getTargetEditPart() instanceof ConnectionAnchorLocator) {
-							if (request.getTargetEditPart().equals(
-									request.getSourceEditPart())) {
-
-							} else {
-								cmd
-										.setTargetEndPoint(((ConnectionAnchorLocator) request
-												.getTargetEditPart())
-												.getLocation(request
-														.getLocation()));
-							}
-						}
-
-						return cmd;
-					}
-
-					protected Command getConnectionCreateCommand(
-							CreateConnectionRequest request) {
-						CreateLinkCommand cmd = new CreateLinkCommand(
-								ModelFactory.eINSTANCE.createLink(),
-								(Node) getHost().getModel());
-						if (request.getTargetEditPart() instanceof ConnectionAnchorLocator) {
-							cmd
-									.setSourceEndPoint(((ConnectionAnchorLocator) request
-											.getTargetEditPart())
-											.getLocation(request.getLocation()));
-						} else {
-							cmd.setSourceEndPoint(request.getLocation());
-						}
-						request.setStartCommand(cmd);
-
-						return cmd;
-
-					}
-
-					protected Command getReconnectSourceCommand(
-							ReconnectRequest request) {
-						Link link = (Link) request.getConnectionEditPart()
-								.getModel();
-						ReconnectLinkCommand cmd = new ReconnectLinkCommand(
-								link, (Node) getHost().getModel(), true);
-						if (request.getTarget() instanceof ConnectionAnchorLocator) {
-							cmd.setEndPoint(((ConnectionAnchorLocator) request
-									.getTarget()).getLocation(request
-									.getLocation()));
-						}
-
-						return cmd;
-					}
-
-					protected Command getReconnectTargetCommand(
-							ReconnectRequest request) {
-						Link link = (Link) request.getConnectionEditPart()
-								.getModel();
-						ReconnectLinkCommand cmd = new ReconnectLinkCommand(
-								link, (Node) getHost().getModel(), false);
-						if (request.getTarget() instanceof ConnectionAnchorLocator) {
-							cmd.setEndPoint(((ConnectionAnchorLocator) request
-									.getTarget()).getLocation(request
-									.getLocation()));
-						}
-						return cmd;
-					}
-				});
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, null);
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, null);
-	}
-
-	public ConnectionAnchor getSourceConnectionAnchor(
-			ConnectionEditPart connection) {
-		return new ChopboxAnchor(getFigure());
-	}
-
-	public ConnectionAnchor getSourceConnectionAnchor(Request request) {
-		return new ChopboxAnchor(getFigure());
-	}
-
-	public ConnectionAnchor getTargetConnectionAnchor(
-			ConnectionEditPart connection) {
-		return new ChopboxAnchor(getFigure());
-	}
-
-	public ConnectionAnchor getTargetConnectionAnchor(Request request) {
-		return new ChopboxAnchor(getFigure());
-	}
-
-	protected List getModelSourceConnections() {
-		return getNode().getOutgoingConnections();
-	}
-
-	protected List getModelTargetConnections() {
-		return getNode().getIncomingConnections();
-	}
-
-	protected Node getNode() {
-		return (Node) getModel();
-	}
-	
-	protected Color getBackgroundColor(){
-		if(BG_COLOR != null) return BG_COLOR;
-		
-		if(BG_COLOR == null){
-			String colorString = AuthoringUIPlugin.getDefault().getPreferenceStore().getString(
-					TemplateConstants.ADD_WP_BOX_BG_COLOR_RGB);
-			if(colorString != null && colorString.length() > 0){
-				StringTokenizer tokenizer = new StringTokenizer(colorString, ",");
-				int r = Integer.parseInt(tokenizer.nextToken());
-				int g = Integer.parseInt(tokenizer.nextToken());
-				int b = Integer.parseInt(tokenizer.nextToken());
-				BG_COLOR = new Color(null, r,g,b);
-				return BG_COLOR;
-			}
-		}
-		if(BG_COLOR == null){
-			BG_COLOR = new Color(Display.getCurrent(), 255,
-							255, 205);
-		}
-		return BG_COLOR;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/WorkProductNodeEditPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/WorkProductNodeEditPart.java
deleted file mode 100755
index de78157..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/WorkProductNodeEditPart.java
+++ /dev/null
@@ -1,77 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.epf.authoring.gef.figures.Images;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.WorkProductNode;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Provides support for {@link WorkProductDescriptor}.
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class WorkProductNodeEditPart extends NamedNodeEditPart {
-
-	public WorkProductNodeEditPart(NamedNode model) {
-		super(model);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.NamedNodeEditPart#getImage()
-	 */
-	protected Image getImage() {
-		Object model = getModel();
-		if (model instanceof WorkProductNode) {
-			WorkProductNode node = (WorkProductNode) model;
-			switch (node.getType()) {
-			case WorkProductNode.ARTIFACT:
-				return Images.WORK_PRODUCT_DESCRIPTOR_16;
-			case WorkProductNode.DELIVERABLE:
-				return Images.DELIVERABLE;
-			case WorkProductNode.OUTCOME:
-				return Images.OUTCOME;
-			}
-			return Images.WORK_PRODUCT_DESCRIPTOR_16;
-		}
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.gef.edit.NamedNodeEditPart#createDirectEditPolicy()
-	 */
-	protected DirectEditManager createDirectEditManager() {
-		Label l = (Label) getFigure();
-		return new ValidatingDirectEditManager(this, TextCellEditor.class,
-				new LabelTextCellEditorLocator(l), l) {
-			protected String validate(String txt) {
-				Object obj = getEditPart().getModel();
-				if (obj instanceof WorkProductNode) {
-					Node node = (Node) obj;
-					Object e = node.getObject();
-					Suppression suppression = node.getDiagram().getSuppression();
-					return TngUtil.checkWorkProductDescriptorPresentationName(
-							e, txt, suppression);
-				}
-				return super.validate(txt);
-			}
-		};
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/package.html
deleted file mode 100755
index 311ff38..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides display and editing support for the activity diagrams.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/DiagramLayoutEditPolicy.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/DiagramLayoutEditPolicy.java
deleted file mode 100755
index c349dc8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/DiagramLayoutEditPolicy.java
+++ /dev/null
@@ -1,187 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit.policies;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.XYLayout;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.epf.authoring.gef.commands.ChangeBoundsCommand;
-import org.eclipse.epf.authoring.gef.commands.ChangeHeightCommand;
-import org.eclipse.epf.authoring.gef.commands.CreateNodeCommand;
-import org.eclipse.epf.authoring.gef.commands.MoveBendpointCommand;
-import org.eclipse.epf.authoring.gef.edit.ActivityDetailDiagramEditPart;
-import org.eclipse.epf.authoring.gef.edit.DiagramEditPart;
-import org.eclipse.epf.authoring.gef.edit.LinkEditPart;
-import org.eclipse.epf.authoring.gef.edit.RoleTaskCompositeEditPart;
-import org.eclipse.epf.authoring.gef.edit.WorkProductCompositeEditPart;
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-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.commands.CompoundCommand;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy;
-import org.eclipse.gef.editpolicies.ResizableEditPolicy;
-import org.eclipse.gef.editpolicies.XYLayoutEditPolicy;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.requests.CreateRequest;
-
-/**
- * An EditPolicy for use with <code>Figures</code> in {@link XYLayout} of diagram. The constraint for
- * XYLayout is a {@link org.eclipse.draw2d.geometry.Rectangle}. Implements the changeconstraint, delete,
- * resize commands of {@link ConstrainedLayoutEditPolicy}
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class DiagramLayoutEditPolicy extends XYLayoutEditPolicy {
-
-	protected Command createAddCommand(EditPart child, Object constraint) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	protected Command createChangeConstraintCommand(EditPart child,
-			Object constraint) {
-		return null;
-	}
-
-	protected Command createChangeConstraintCommand(
-			ChangeBoundsRequest request, EditPart child, Object constraint) {
-		
-		// special for ADD
-		EditPart parent = child.getParent();
-		if(parent instanceof ActivityDetailDiagramEditPart){
-			String autolayout = GraphicalDataHelper.getAutoLayoutFlag((ActivityDetailDiagram)(Node)parent.getModel());
-			if(autolayout != null){
-				GraphicalDataHelper.createProperty(((Node)parent.getModel()).getGraphNode(),
-					GraphicalDataHelper.PROP_AUTO_LAYOUT, 
-					GraphicalDataHelper.PROP_AUTO_LAYOUT_VALUE_FALSE);
-			}
-		}
-		
-		Node node = (Node) child.getModel();
-		int directions = request.getResizeDirection();
-		
-		if ((directions & PositionConstants.NORTH_SOUTH) 
-				== PositionConstants.SOUTH){
-			Point newLocation = node.getLocation().getTranslated(
-					request.getMoveDelta());
-			int newHeight = request.getSizeDelta().height;
-			if (newHeight != 0) {
-				newHeight += ((GraphicalEditPart) child).getFigure().getBounds().height;
-				if (newHeight < 10)
-					return UnexecutableCommand.INSTANCE;
-			} else
-				newHeight = ((GraphicalEditPart) child).getFigure().getBounds().height;
-			return new ChangeHeightCommand(node, newLocation, newHeight);
-		}
-		else{
-			// Other directions are EAST WEST. 
-			Point newLocation = node.getLocation().getTranslated(
-					request.getMoveDelta());
-			int newWidth = request.getSizeDelta().width;
-			if (newWidth != 0) {
-				newWidth += ((GraphicalEditPart) child).getFigure().getBounds().width;
-				if (newWidth < 10)
-					return UnexecutableCommand.INSTANCE;
-			} else
-				newWidth = ((GraphicalEditPart) child).getFigure().getBounds().width;
-			return new ChangeBoundsCommand(node, newLocation, newWidth);
-		} 
-	}
-
-	protected EditPolicy createChildEditPolicy(EditPart child) {
-		ResizableEditPolicy childPolicy = new ResizableEditPolicy();
-		if(child instanceof RoleTaskCompositeEditPart ||
-				child instanceof WorkProductCompositeEditPart){
-			childPolicy.setResizeDirections(PositionConstants.NSEW);
-		}else{
-			childPolicy.setResizeDirections(PositionConstants.EAST_WEST);
-		}
-		return childPolicy;
-	}
-
-	protected Command getCreateCommand(CreateRequest request) {
-		if (request.getNewObject() instanceof Node) {
-			Point loc = request.getLocation();
-			getHostFigure().translateToRelative(loc);
-			return new CreateNodeCommand((Node) request.getNewObject(),
-					(Diagram) getHost().getModel(), loc);
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	protected Command getDeleteDependantCommand(Request request) {
-		return null;
-	}
-
-	protected Command getResizeChildrenCommand(ChangeBoundsRequest request) {
-		CompoundCommand resize = new CompoundCommand();
-		Command c;
-		GraphicalEditPart child;
-		List children = request.getEditParts();
-
-		for (int i = 0; i < children.size(); i++) {
-			child = (GraphicalEditPart) children.get(i);
-			c = createChangeConstraintCommand(
-					request,
-					child,
-					translateToModelConstraint(getConstraintFor(request, child)));
-			resize.add(c);
-			if (!child.getSourceConnections().isEmpty()) {
-				List list = child.getSourceConnections();
-				for (Iterator itor = list.iterator(); itor.hasNext();) {
-					Object obj = itor.next();
-					if (obj instanceof LinkEditPart) {
-						EditPart rootedit = child.getParent();
-						List sel = new ArrayList();
-						if (rootedit instanceof DiagramEditPart) {
-							sel = ((DiagramEditPart) rootedit).getViewer()
-									.getSelectedEditParts();
-						}
-						EditPart part = ((LinkEditPart) obj).getTarget();
-						if (sel.contains(part)) {
-							Link link = (Link) ((LinkEditPart) obj).getModel();
-							((DiagramEditPart) rootedit).getViewer()
-									.appendSelection((LinkEditPart) obj);
-							List blist = link.getBendpoints();
-							for (int j = 0; j < blist.size(); j++) {
-								AbsoluteBendpoint abpoint = (AbsoluteBendpoint) blist
-										.get(j);
-								Point deltaPoint = request.getMoveDelta();
-								((LinkEditPart) obj).getFigure()
-										.translateToAbsolute(deltaPoint);
-								Point p = abpoint.getTranslated(request
-										.getMoveDelta());
-								Command bendcommand = new MoveBendpointCommand(
-										link, p, j);
-								resize.add(bendcommand);
-							}
-						}
-					}
-				}
-			}
-		}
-		return resize;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/LabelSelectionEditPolicy.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/LabelSelectionEditPolicy.java
deleted file mode 100755
index 06693c5..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/LabelSelectionEditPolicy.java
+++ /dev/null
@@ -1,70 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit.policies;
-
-import org.eclipse.epf.authoring.gef.figures.SelectableLabel;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-
-/**
- * Handles selection of activites. Primary selection is denoted by highlight and
- * a focus rectangle. Normal selection is denoted by highlight only.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class LabelSelectionEditPolicy extends NonResizableEditPolicy {
-
-	private SelectableLabel getLabel() {
-		GraphicalEditPart part = (GraphicalEditPart) getHost();
-		return ((SelectableLabel) part.getFigure());
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.NonResizableEditPolicy#hideFocus()
-	 */
-	protected void hideFocus() {
-		getLabel().setFocus(false);
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#hideSelection()
-	 */
-	protected void hideSelection() {
-		getLabel().setSelected(false);
-		getLabel().setFocus(false);
-
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.NonResizableEditPolicy#showFocus()
-	 */
-	protected void showFocus() {
-		getLabel().setFocus(true);
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#showSelection()
-	 */
-	protected void showPrimarySelection() {
-		getLabel().setSelected(true);
-		getLabel().setFocus(true);
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#showSelection()
-	 */
-	protected void showSelection() {
-		getLabel().setSelected(true);
-		getLabel().setFocus(false);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/LinkBendpointEditPolicy.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/LinkBendpointEditPolicy.java
deleted file mode 100755
index ebdbf85..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/LinkBendpointEditPolicy.java
+++ /dev/null
@@ -1,49 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit.policies;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.epf.authoring.gef.commands.CreateBendpointCommand;
-import org.eclipse.epf.authoring.gef.commands.DeleteBendpointCommand;
-import org.eclipse.epf.authoring.gef.commands.MoveBendpointCommand;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.BendpointEditPolicy;
-import org.eclipse.gef.requests.BendpointRequest;
-
-/**
- * A EditPolicy to handle the create, move and delete bendpoints activities of Link.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class LinkBendpointEditPolicy extends BendpointEditPolicy {
-
-	protected Command getCreateBendpointCommand(BendpointRequest request) {
-		Point loc = request.getLocation();
-		getConnection().translateToRelative(loc);
-		return new CreateBendpointCommand(
-				(Link) request.getSource().getModel(), loc, request.getIndex());
-	}
-
-	protected Command getDeleteBendpointCommand(BendpointRequest request) {
-		return new DeleteBendpointCommand((Link) getHost().getModel(), request
-				.getIndex());
-	}
-
-	protected Command getMoveBendpointCommand(BendpointRequest request) {
-		Point loc = request.getLocation();
-		getConnection().translateToRelative(loc);
-		return new MoveBendpointCommand((Link) request.getSource().getModel(),
-				loc, request.getIndex());
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/LinkEndpointEditPolicy.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/LinkEndpointEditPolicy.java
deleted file mode 100755
index 1905ad8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/LinkEndpointEditPolicy.java
+++ /dev/null
@@ -1,62 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit.policies;
-
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-
-/**
- * A EditPolicy to handle the selection handles for connection. 
- *  
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class LinkEndpointEditPolicy extends ConnectionEndpointEditPolicy {
-
-	private static Font BOLD_FONT;
-
-	protected void addSelectionHandles() {
-		super.addSelectionHandles();
-		getConnectionFigure().setLineWidth(2);
-	}
-
-	protected PolylineConnection getConnectionFigure() {
-		return (PolylineConnection) getHostFigure();
-	}
-
-	protected void hideSelection() {
-		super.hideSelection();
-		getHostFigure().setFont(null);
-		getHostFigure().invalidateTree();
-	}
-
-	protected void removeSelectionHandles() {
-		super.removeSelectionHandles();
-		getConnectionFigure().setLineWidth(0);
-	}
-
-	protected void showSelection() {
-		super.showSelection();
-		if (BOLD_FONT == null) {
-			FontData[] data = getConnectionFigure().getFont().getFontData();
-			for (int i = 0; i < data.length; i++)
-				if ((data[i].getStyle() & SWT.BOLD) == 0)
-					data[i].setStyle(data[i].getStyle() | SWT.BOLD);
-			BOLD_FONT = new Font(null, data);
-		}
-		getHostFigure().setFont(BOLD_FONT);
-		getHostFigure().invalidateTree();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/NodeContainerEditPolicy.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/NodeContainerEditPolicy.java
deleted file mode 100755
index 6ef05f5..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/NodeContainerEditPolicy.java
+++ /dev/null
@@ -1,32 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit.policies;
-
-import org.eclipse.epf.authoring.gef.edit.NodeContainerEditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ContainerEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-
-/**
- * A EditPolicy for {@link NodeContainerEditPart} for disabling direct child creation.
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class NodeContainerEditPolicy extends ContainerEditPolicy {
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.ContainerEditPolicy#getCreateCommand(CreateRequest)
-	 */
-	protected Command getCreateCommand(CreateRequest request) {
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/NodeContainerFlowLayoutEditPolicy.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/NodeContainerFlowLayoutEditPolicy.java
deleted file mode 100755
index fdf481d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/NodeContainerFlowLayoutEditPolicy.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.edit.policies;
-
-import org.eclipse.epf.authoring.gef.edit.NodeContainerEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.FlowLayoutEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-
-/**
- * A EditPolicy for {@link NodeContainerEditPart} to disable the all editing features.
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class NodeContainerFlowLayoutEditPolicy extends FlowLayoutEditPolicy {
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.OrderedLayoutEditPolicy#createAddCommand(EditPart,
-	 *      EditPart)
-	 */
-	protected Command createAddCommand(EditPart child, EditPart after) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.OrderedLayoutEditPolicy#createMoveChildCommand(EditPart,
-	 *      EditPart)
-	 */
-	protected Command createMoveChildCommand(EditPart child, EditPart after) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#getCreateCommand(CreateRequest)
-	 */
-	protected Command getCreateCommand(CreateRequest request) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#getDeleteDependantCommand(Request)
-	 */
-	protected Command getDeleteDependantCommand(Request request) {
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/RoleTaskFlowLayoutEditPolicy.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/RoleTaskFlowLayoutEditPolicy.java
deleted file mode 100755
index bdfe87e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/RoleTaskFlowLayoutEditPolicy.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * 
- */
-package org.eclipse.epf.authoring.gef.edit.policies;
-
-import org.eclipse.draw2d.FlowLayout;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.FlowLayoutEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-
-/**
- * EditPolicy to disable the editing feature in a {@link FlowLayout}
- * @author Shashidhar Kannoori
- *
- */
-public class RoleTaskFlowLayoutEditPolicy extends FlowLayoutEditPolicy {
-
-	/**
-	 * 
-	 */
-	public RoleTaskFlowLayoutEditPolicy() {
-		// TODO Auto-generated constructor stub
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.editpolicies.OrderedLayoutEditPolicy#createAddCommand(org.eclipse.gef.EditPart, org.eclipse.gef.EditPart)
-	 */
-	protected Command createAddCommand(EditPart child, EditPart after) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.editpolicies.OrderedLayoutEditPolicy#createMoveChildCommand(org.eclipse.gef.EditPart, org.eclipse.gef.EditPart)
-	 */
-	protected Command createMoveChildCommand(EditPart child, EditPart after) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#getCreateCommand(org.eclipse.gef.requests.CreateRequest)
-	 */
-	protected Command getCreateCommand(CreateRequest request) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/package.html
deleted file mode 100755
index a3d8549..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/edit/policies/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides graphical edit policies for the activity diagrams.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/ActivityFigure.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/ActivityFigure.java
deleted file mode 100755
index 12a4f7b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/ActivityFigure.java
+++ /dev/null
@@ -1,22 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-/**
- * @author James Thario
- * @since  1.0
- */
-public class ActivityFigure extends TextFigure {
-
-	public ActivityFigure() {
-		super();
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/CentredLabel.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/CentredLabel.java
deleted file mode 100755
index 5709f80..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/CentredLabel.java
+++ /dev/null
@@ -1,65 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Shashidhar Kannoori
- * @since 1.0
- * @deprecated
- */
-public class CentredLabel extends Label {
-
-	public CentredLabel() {
-		super();
-	}
-
-	public CentredLabel(String s) {
-		super(s);
-	}
-
-	public CentredLabel(Image i) {
-		super(i);
-	}
-
-	public CentredLabel(String s, Image i) {
-		super(s, i);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
-	 */
-	protected void paintFigure(Graphics graphics) {
-		if (isOpaque())
-			super.paintFigure(graphics);
-		Rectangle bounds = getBounds();
-		graphics.setForegroundColor(ColorConstants.yellow);
-		graphics.translate(bounds.x, bounds.y);
-		if (!isEnabled()) {
-			graphics.translate(1, 1);
-			graphics.setBackgroundColor(ColorConstants.yellow);
-			graphics.setForegroundColor(ColorConstants.buttonLightest);
-			graphics.drawText(getSubStringText(), getTextLocation());
-			graphics.translate(-1, -1);
-			graphics.setForegroundColor(ColorConstants.buttonDarker);
-		}
-		graphics.drawText(getSubStringText(), getTextLocation());
-		graphics.setBackgroundColor(ColorConstants.yellow);
-		graphics.translate(-bounds.x, -bounds.y);
-		graphics.setBackgroundColor(ColorConstants.blue);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/Colors.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/Colors.java
deleted file mode 100755
index 337e02d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/Colors.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * The color constants referenced by the diagram editors.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public final class Colors {
-
-	public static final Color INHERITED_ELEMENT_LABEL = ColorConstants.darkGreen;
-
-	public static final Color SUPRESSED_ELEMENT_LABEL = ColorConstants.gray;
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/CompositeFigure.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/CompositeFigure.java
deleted file mode 100755
index 812fccc..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/CompositeFigure.java
+++ /dev/null
@@ -1,66 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FlowLayout;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.epf.authoring.gef.edit.RaisedMarginBorder;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- * @deprecated
- */
-public class CompositeFigure extends Figure {
-
-	private static final Color BG_COLOR = new Color(Display.getCurrent(), 255,
-			255, 205);
-
-	private static final int DEFAULT_MAX_WIDTH = 50;
-
-	private static final int SPACING = 10;
-
-	private int maxWidth = DEFAULT_MAX_WIDTH;
-
-	/**
-	 * 
-	 */
-	public CompositeFigure() {
-		ToolbarLayout layout = new ToolbarLayout();
-		layout.setMinorAlignment(FlowLayout.ALIGN_CENTER);
-		layout.setStretchMinorAxis(false);
-		layout.setSpacing(SPACING);
-		layout.setObserveVisibility(true);
-		setLayoutManager(layout);
-		setBorder(new RaisedMarginBorder());
-		setBackgroundColor(BG_COLOR);
-		setOpaque(true);
-	}
-
-	public void setMaxWidth(int w) {
-		maxWidth = w;
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#getPreferredSize(int, int)
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		if (wHint > maxWidth) {
-			wHint = maxWidth;
-		}
-		return super.getPreferredSize(wHint, hHint);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/Diamond.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/Diamond.java
deleted file mode 100755
index 06fe4fd..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/Diamond.java
+++ /dev/null
@@ -1,67 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.Shape;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * A figure for diamond shape.  
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class Diamond extends Shape {
-
-	private PointList diamond = new PointList(4);
-
-	/**
-	 * @see Shape#fillShape(Graphics)
-	 */
-	protected void fillShape(Graphics g) {
-		g.fillPolygon(diamond);
-	}
-
-	/**
-	 * @see Shape#outlineShape(Graphics)
-	 */
-	protected void outlineShape(Graphics g) {
-		g.drawPolygon(diamond);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#validate()
-	 */
-	public void validate() {
-		Rectangle r = getBounds().getCopy();
-		r.crop(getInsets());
-		r.resize(-1, -1);
-		diamond.removeAllPoints();
-		diamond.addPoint(r.getTop());
-		diamond.addPoint(r.getRight());
-		diamond.addPoint(r.getBottom());
-		diamond.addPoint(r.getLeft());
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Polyline#primTranslate(int, int)
-	 */
-	public void primTranslate(int x, int y) {
-		super.primTranslate(x, y);
-		diamond.translate(x, y);
-	}
-
-	public PointList getPoints() {
-		return diamond;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/EndNodeFigure.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/EndNodeFigure.java
deleted file mode 100755
index ac01a05..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/EndNodeFigure.java
+++ /dev/null
@@ -1,53 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-import org.eclipse.draw2d.Ellipse;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.epf.diagram.model.TypedNode;
-
-/**
- * Figure for {@link TypedNode} end.
- * @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/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/FreeTextFigure.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/FreeTextFigure.java
deleted file mode 100755
index 36d8e52..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/FreeTextFigure.java
+++ /dev/null
@@ -1,74 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.RelativeLocator;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.draw2d.text.FlowPage;
-import org.eclipse.draw2d.text.ParagraphTextLayout;
-import org.eclipse.draw2d.text.TextFlow;
-import org.eclipse.epf.authoring.gef.util.TemplateConstants;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-/**
- * Figure to support free text in the diagram, without an image attached to it.
- * FreeTextFigure wrapper over {@link FlowPage} and {@link TextFlow}. 
- * 
- * @author Shashidhar kannoori
- *
- */
-public class FreeTextFigure extends Figure {
-
-	private FlowPage textFlowPage;
-
-	private TextFlow textFlow;
-
-	public FreeTextFigure() {
-		textFlowPage = new FlowPage();
-		textFlowPage.setHorizontalAligment(PositionConstants.CENTER);
-		setLayoutManager(new StackLayout());
-		add(textFlowPage, new RelativeLocator(textFlowPage,
-				PositionConstants.ALWAYS_LEFT));
-	}
-	public String getText() {
-		return textFlow.getText();
-	}
-
-	public void setText(String newText) {
-		textFlowPage.removeAll();
-		textFlow = new TextFlow();
-		textFlow.setFont(TemplateConstants.DEFAULT_FONT);
-		textFlow.setLayoutManager(new ParagraphTextLayout(textFlow,
-				ParagraphTextLayout.WORD_WRAP_TRUNCATE));
-		textFlow.setText(newText);
-		textFlowPage.add(textFlow);
-	}
-
-	public FlowPage getTextFlowPage() {
-		return textFlowPage;
-	}
-	public void setFont(Font f) {
-		// TODO Auto-generated method stub
-		super.setFont(f);
-		textFlow.setFont(f);
-	}
-	public void setForegroundColor(Color fg) {
-		// TODO Auto-generated method stub
-		super.setForegroundColor(fg);
-		textFlow.setForegroundColor(fg);
-	}
-
-	public TextFlow getTextFlow() {
-		return textFlow;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/Images.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/Images.java
deleted file mode 100755
index 9b4e01f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/Images.java
+++ /dev/null
@@ -1,68 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Image location constants referenced in diagram.
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public final class Images {
-
-	public static final Image ACTIVITY = AuthoringUIPlugin.getDefault()
-			.getImage("shape/activity.gif"); //$NON-NLS-1$
-
-	public static final Image ITERATION = AuthoringUIPlugin.getDefault()
-			.getImage("shape/iteration.gif"); //$NON-NLS-1$
-
-	public static final Image PHASE = AuthoringUIPlugin.getDefault().getImage(
-			"shape/phase.gif"); //$NON-NLS-1$
-
-	public static final Image MILESTONE = AuthoringUIPlugin.getDefault()
-			.getImage("shape/milestone.gif"); //$NON-NLS-1$
-
-	public static final Image ROLE = AuthoringUIPlugin.getDefault().getImage(
-			"shape/role.gif"); //$NON-NLS-1$
-
-	public static final Image TASK = AuthoringUIPlugin.getDefault().getImage(
-			"shape/task.gif"); //$NON-NLS-1$
-
-	public static final Image TASK_DESCRIPTOR = AuthoringUIPlugin.getDefault()
-			.getImage("shape/taskdescriptor.gif"); //$NON-NLS-1$
-
-	public static final Image WORK_PRODUCT_DESCRIPTOR = AuthoringUIPlugin
-			.getDefault().getImage("shape/workproductdescriptor.gif"); //$NON-NLS-1$
-
-	public static final Image ARTIFACT = AuthoringUIPlugin.getDefault()
-			.getImage("shape/artifact.gif"); //$NON-NLS-1$
-
-	public static final Image DELIVERABLE = AuthoringUIPlugin.getDefault()
-			.getImage("shape/deliverable.gif"); //$NON-NLS-1$
-
-	public static final Image OUTCOME = AuthoringUIPlugin.getDefault()
-			.getImage("shape/outcome.gif"); //$NON-NLS-1$
-
-	public static final Image WORK_PRODUCT = AuthoringUIPlugin.getDefault()
-			.getImage("WorkProductDescriptor.gif"); //$NON-NLS-1$
-
-	public static final Image TASK_DESCRIPTOR_16 = AuthoringUIPlugin
-			.getDefault().getImage("shape/taskdes_obj.gif"); //$NON-NLS-1$
-
-	public static final Image ROLE_DESCRIPTOR_16 = AuthoringUIPlugin
-			.getDefault().getImage("shape/roledes_obj.gif"); //$NON-NLS-1$
-
-	public static final Image WORK_PRODUCT_DESCRIPTOR_16 = AuthoringUIPlugin
-			.getDefault().getImage("shape/workdes_obj.gif"); //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/NoteFigure.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/NoteFigure.java
deleted file mode 100755
index a7ab1ea..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/NoteFigure.java
+++ /dev/null
@@ -1,68 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * 
- * @author James Thario
- * @since  1.0
- * @deprecated
- */
-public class NoteFigure
-        extends TextFigure {
-    private static final int CORNER_SIZE = 4;
-
-    public NoteFigure() {
-        setBackgroundColor(ColorConstants.tooltipBackground);
-        setForegroundColor(ColorConstants.black);
-
-        setBorder(new MarginBorder(CORNER_SIZE));
-    }
-
-    protected void paintFigure(Graphics graphics) {
-        Rectangle rect = getBounds().getCopy();
-
-        graphics.translate(getLocation());
-
-        // fill the note
-        PointList outline = new PointList();
-
-        outline.addPoint(0, 0);
-        outline.addPoint(rect.width - CORNER_SIZE, 0);
-        outline.addPoint(rect.width - 1, CORNER_SIZE);
-        outline.addPoint(rect.width - 1, rect.height - 1);
-        outline.addPoint(0, rect.height - 1);
-
-        graphics.fillPolygon(outline);
-
-        // draw the inner outline
-        PointList innerLine = new PointList();
-
-        innerLine.addPoint(rect.width - CORNER_SIZE - 1, 0);
-        innerLine.addPoint(rect.width - CORNER_SIZE - 1, CORNER_SIZE);
-        innerLine.addPoint(rect.width - 1, CORNER_SIZE);
-        innerLine.addPoint(rect.width - CORNER_SIZE - 1, 0);
-        innerLine.addPoint(0, 0);
-        innerLine.addPoint(0, rect.height - 1);
-        innerLine.addPoint(rect.width - 1, rect.height - 1);
-        innerLine.addPoint(rect.width - 1, CORNER_SIZE);
-
-        graphics.drawPolygon(innerLine);
-
-        graphics.translate(getLocation().getNegated());
-    }
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/RoleTaskCompositeFigure.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/RoleTaskCompositeFigure.java
deleted file mode 100755
index b9c8a5c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/RoleTaskCompositeFigure.java
+++ /dev/null
@@ -1,97 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FlowLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.epf.authoring.gef.edit.RaisedMarginBorder;
-import org.eclipse.epf.diagram.model.RoleTaskComposite;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Figure for {@link RoleTaskComposite}.
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class RoleTaskCompositeFigure extends Figure {
-
-	private static final Color BG_COLOR = new Color(Display.getCurrent(), 255,
-			255, 156);
-
-	private static final int MAX_WIDTH = 500;
-
-	private static final int MINOR_SPACING = 20;
-
-	private Figure tasksFigure;
-
-	/**
-	 * 
-	 */
-	public RoleTaskCompositeFigure() {
-		FlowLayout layout = new FlowLayout(true);
-		layout.setMinorAlignment(FlowLayout.ALIGN_CENTER);
-		layout.setMajorAlignment(FlowLayout.ALIGN_LEFTTOP);
-		layout.setStretchMinorAxis(false);
-		layout.setMinorSpacing(MINOR_SPACING);
-		layout.setObserveVisibility(true);
-
-		setLayoutManager(layout);
-		setBorder(new RaisedMarginBorder());
-		setBackgroundColor(BG_COLOR);
-		setOpaque(true);
-
-		tasksFigure = new Figure() {
-			/**
-			 * @see org.eclipse.draw2d.Figure#getPreferredSize(int, int)
-			 */
-			public Dimension getPreferredSize(int wHint, int hHint) {
-				IFigure firstChild = (IFigure) getChildren().get(0);
-				if (firstChild != this) {
-					int offset = firstChild.getSize().width; // firstChild.getSize().width
-					// +
-					// RoleTaskCompositeFigure.this.getInsets().getWidth()
-					// +
-					// MINOR_SPACING;
-					if (wHint < offset) {
-
-					}
-					wHint = wHint - offset;
-					if (wHint > MAX_WIDTH) {
-						wHint = MAX_WIDTH;
-					}
-				}
-				Dimension dim = super.getPreferredSize(wHint, hHint);
-				return dim;
-			}
-		};
-		FlowLayout flowLayout = new FlowLayout();
-		flowLayout.setMinorSpacing(10);
-		flowLayout.setMinorAlignment(FlowLayout.ALIGN_CENTER);
-		tasksFigure.setLayoutManager(flowLayout);
-		tasksFigure.setOpaque(true);
-		super.add(tasksFigure, null, -1);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#add(IFigure, Object, int)
-	 */
-	public void add(IFigure figure, Object constraint, int index) {
-		if (getChildren().size() == 1) {
-			super.add(figure, constraint, 0);
-		} else {
-			tasksFigure.add(figure, constraint);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/RoleTaskFlowLayout.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/RoleTaskFlowLayout.java
deleted file mode 100755
index fbd7862..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/RoleTaskFlowLayout.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * 
- */
-package org.eclipse.epf.authoring.gef.figures;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.FlowLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author skannoor
- * @deprecated
- */
-public class RoleTaskFlowLayout extends FlowLayout {
-
-	boolean adjust = false;
-	WorkingData data;
-	/**
-	 * 
-	 */
-	public RoleTaskFlowLayout() {
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param isHorizontal
-	 */
-	public RoleTaskFlowLayout(boolean isHorizontal) {
-		super(isHorizontal);
-		// TODO Auto-generated constructor stub
-	}
-	
-	public void layout(IFigure parent) {
-		// TODO Auto-generated method stub
-		if(adjust){
-			adjustLayout(parent);
-		}else
-			super.layout(parent);
-	}
-	class WorkingData {
-		int rowHeight, rowWidth, rowCount, rowX, rowY, maxWidth;
-		Rectangle bounds[], area;
-		IFigure row[];
-	}
-	/**
-	 * Initializes the state of row data, which is internal to the layout process. 
-	 */
-	private void initRow() {
-		data.rowX = 0;
-		data.rowHeight = 0;
-		data.rowWidth = 0;
-		data.rowCount = 0;
-	}
-
-	/**
-	 * Initializes state data for laying out children, based on the Figure given as input.
-	 *
-	 * @param parent the parent figure
-	 * @since 2.0 
-	 */
-	private void initVariables(IFigure parent) {
-		data.row = new IFigure[parent.getChildren().size()];
-		data.bounds = new Rectangle[data.row.length];
-		data.maxWidth = data.area.width;
-	}
-	private void adjustLayout(IFigure parent) {
-		// TODO Auto-generated method stub
-		data = new WorkingData();
-		Rectangle relativeArea = parent.getClientArea();
-		data.area = transposer.t(relativeArea);
-
-		Iterator iterator = parent.getChildren().iterator();
-		int dx;
-
-		//Calculate the hints to be passed to children
-		int wHint = -1;
-		int hHint = -1;
-		if (isHorizontal())
-			wHint = parent.getClientArea().width;
-		else
-			hHint = parent.getClientArea().height;
-
-		initVariables(parent);
-		initRow();
-		int i = 0; 
-		while (iterator.hasNext()) {
-			IFigure f = (IFigure)iterator.next();
-			Dimension pref = transposer.t(getChildSize(f, wHint, hHint));
-			Rectangle r = new Rectangle(0, 0, pref.width, pref.height);
-
-			if (data.rowCount > 0) {
-				if (data.rowWidth + pref.width > data.maxWidth)
-					layoutRow(parent);
-			}
-			r.x = data.rowX;
-			r.y = data.rowY;
-			dx = r.width + getMinorSpacing();
-			data.rowX += dx;
-			data.rowWidth += dx;
-			data.rowHeight = Math.max(data.rowHeight, r.height);
-			data.row [data.rowCount] = f;
-			data.bounds[data.rowCount] = r;
-			data.rowCount++;
-			i++;
-		}
-		if (data.rowCount != 0)
-			layoutRow(parent);
-		data = null;
-	}
-
-	public void setAdjust(boolean adjust) {
-		this.adjust = adjust;
-	}	
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/SelectableLabel.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/SelectableLabel.java
deleted file mode 100755
index e9925b9..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/SelectableLabel.java
+++ /dev/null
@@ -1,85 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * A customized Label for selection. Primary selection is denoted by highlight
- * and focus rectangle. Normal selection is denoted by highlight only.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class SelectableLabel extends Label {
-
-	private boolean selected;
-
-	private boolean hasFocus;
-
-	private Rectangle getSelectionRectangle() {
-		Rectangle bounds = getTextBounds();
-		bounds.expand(new Insets(2, 2, 0, 0));
-		translateToParent(bounds);
-		bounds.intersect(getBounds());
-		return bounds;
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Label#paintFigure(Graphics)
-	 */
-	protected void paintFigure(Graphics graphics) {
-		if (selected) {
-			graphics.pushState();
-			graphics.setBackgroundColor(ColorConstants.menuBackgroundSelected);
-			graphics.fillRectangle(getSelectionRectangle());
-			graphics.popState();
-			graphics.setForegroundColor(ColorConstants.white);
-		}
-		if (hasFocus) {
-			graphics.pushState();
-			graphics.setXORMode(true);
-			graphics.setForegroundColor(ColorConstants.menuBackgroundSelected);
-			graphics.setBackgroundColor(ColorConstants.white);
-			graphics.drawFocus(getSelectionRectangle().resize(-1, -1));
-			graphics.popState();
-		}
-		super.paintFigure(graphics);
-	}
-
-	/**
-	 * Sets the selection state of this SimpleActivityLabel
-	 * 
-	 * @param b
-	 *            true will cause the label to appear selected
-	 */
-	public void setSelected(boolean b) {
-		selected = b;
-		repaint();
-	}
-
-	/**
-	 * Sets the focus state of this SimpleActivityLabel
-	 * 
-	 * @param b
-	 *            true will cause a focus rectangle to be drawn around the text
-	 *            of the Label
-	 */
-	public void setFocus(boolean b) {
-		hasFocus = b;
-		repaint();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/TextFigure.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/TextFigure.java
deleted file mode 100755
index 09e1a8a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/TextFigure.java
+++ /dev/null
@@ -1,76 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.ImageFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.RelativeLocator;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.text.FlowPage;
-import org.eclipse.draw2d.text.ParagraphTextLayout;
-import org.eclipse.draw2d.text.TextFlow;
-import org.eclipse.epf.authoring.gef.util.TemplateConstants;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * TextFigure is customizable figure to allow word-wraping and with image. 
- * {@link Label} do not support word-wrap.  TextFigure is wrapper over {@link TextFlow}
- * and {@link FlowPage} to support word-wrap and image. 
- * @author James Thario
- * @since  1.0
- */
-public class TextFigure extends Figure {
-
-	private FlowPage textFlowPage;
-
-	private TextFlow textFlow;
-
-	private ImageFigure imageFigure;
-
-	public TextFigure() {
-		textFlowPage = new FlowPage();
-		textFlowPage.setHorizontalAligment(PositionConstants.CENTER);
-		setLayoutManager(new ToolbarLayout());
-		imageFigure = new ImageFigure();
-		add(imageFigure, new RelativeLocator(imageFigure,
-				PositionConstants.CENTER));
-		add(textFlowPage, new RelativeLocator(textFlowPage,
-				PositionConstants.ALWAYS_LEFT));
-	}
-
-	public void add(Image image) {
-		imageFigure.setImage(image);
-	}
-
-	public String getText() {
-		return textFlow.getText();
-	}
-
-	public void setText(String newText) {
-		textFlowPage.removeAll();
-		textFlow = new TextFlow();
-		textFlow.setFont(TemplateConstants.DEFAULT_FONT);
-		textFlow.setLayoutManager(new ParagraphTextLayout(textFlow,
-				ParagraphTextLayout.WORD_WRAP_HARD));
-		textFlow.setText(newText);
-		textFlowPage.add(textFlow);
-	}
-
-	public FlowPage getTextFlowPage() {
-		return textFlowPage;
-	}
-
-	public TextFlow getTextFlow() {
-		return textFlow;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/WPCompartmentFigure.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/WPCompartmentFigure.java
deleted file mode 100755
index e7b3916..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/WPCompartmentFigure.java
+++ /dev/null
@@ -1,80 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.epf.authoring.gef.edit.RaisedMarginBorder;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author Shashidhar Kannoori
- * @since 1.0
- * @deprecated
- */
-public class WPCompartmentFigure extends Figure {
-
-	public final static Color wpColor = new Color(Display.getCurrent(), 255,
-			255, 156);
-
-	public final static Color artifactColor = new Color(Display.getCurrent(),
-			255, 255, 156);
-
-	public final static Color deliverableColor = new Color(
-			Display.getCurrent(), 206, 255, 216);
-
-	public final static Color outcomeColor = new Color(Display.getCurrent(),
-			206, 255, 100);
-
-	public final static String newWPName = AuthoringUIResources.WPCompartmentFigure_0; //$NON-NLS-1$
-
-	public Label label;
-
-	WPFigure figure = null;
-
-	/**
-	 * WorkProduct Compartment - With background filled depending on Type of the
-	 * WorkProduct.
-	 */
-	public WPCompartmentFigure(Label name, int type) {
-		label = name;
-		ToolbarLayout layout = new ToolbarLayout();
-		setLayoutManager(layout);
-		setOpaque(true);
-		setBorder(new RaisedMarginBorder());
-		if (type == 1)
-			setBackgroundColor(artifactColor);
-		else if (type == 2)
-			setBackgroundColor(deliverableColor);
-		else if (type == 3)
-			setBackgroundColor(outcomeColor);
-		else
-			setBackgroundColor(wpColor);
-		label.setText(newWPName);
-		add(label);
-	}
-
-	public Label getLabel() {
-		return label;
-	}
-
-	public void setLabelName(String name) {
-		label.setText(name);
-	}
-
-	public void setLabel(Label label) {
-		this.label = label;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/WPFigure.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/WPFigure.java
deleted file mode 100755
index 42a10c0..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/WPFigure.java
+++ /dev/null
@@ -1,98 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-import org.eclipse.draw2d.AbstractBorder;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author Shashidhar Kannoori
- * @since 1.0
- * @deprecated
- */
-public class WPFigure extends Figure {
-
-	public Label label = new Label();
-
-	public WPFigure(Label l) {
-		super();
-		add(l);
-	}
-
-	protected void paintFigure(Graphics g) {
-		Rectangle clientArea = getClientArea();
-		Rectangle bar = clientArea.getCopy();
-		bar.crop(new Insets(0, 5, 5, 5));
-		g.setBackgroundColor(ColorConstants.gray);
-		g.fillRectangle(bar.getTranslated(6, 6));
-		g.setBackgroundColor(ColorConstants.yellow);
-		g.fillRectangle(bar);
-		g.setLineStyle(2);
-		g.setLineWidth(1);
-		super.paintFigure(g);
-	}
-
-	public Label getFigure() {
-		return label;
-	}
-
-	public void setLabelName(String name) {
-		label.setText(name);
-	}
-
-	public void setLabel(Label label) {
-		this.label = label;
-	}
-
-	class Box extends Figure {
-		public Box(Insets insets) {
-			setBorder(new BoxBorder(insets));
-			ToolbarLayout toolbarLayout = new ToolbarLayout();
-			toolbarLayout.setStretchMinorAxis(false);
-			setLayoutManager(toolbarLayout);
-			setBackgroundColor(ColorConstants.red);
-
-		}
-
-		private class BoxBorder extends AbstractBorder {
-
-			public Insets insets = new Insets(1, 0, 0, 0);
-
-			public BoxBorder(Insets insets) {
-				this.insets = insets;
-			}
-
-			/**
-			 * @see org.eclipse.draw2d.Border#getInsets(IFigure)
-			 */
-			public Insets getInsets(IFigure figure) {
-				return insets;
-			}
-
-			/**
-			 * @see org.eclipse.draw2d.Border#paint(IFigure, Graphics, Insets)
-			 */
-			public void paint(IFigure figure, Graphics graphics, Insets insets) {
-				Rectangle rect = getPaintRectangle(figure, insets);
-				graphics.drawLine(rect.getTopLeft(), rect.getTopRight());
-			}
-
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/WrapLabelnImage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/WrapLabelnImage.java
deleted file mode 100755
index cf80df7..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/WrapLabelnImage.java
+++ /dev/null
@@ -1,92 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.ImageFigure;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.text.FlowPage;
-import org.eclipse.draw2d.text.ParagraphTextLayout;
-import org.eclipse.draw2d.text.TextFlow;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Shashidhar Kannoori
- * @since 1.0
- * @deprecated
- */
-public class WrapLabelnImage extends Figure {
-
-	// The inner TextFlow
-	private TextFlow textFlow;
-
-	private Image image;
-
-	public WrapLabelnImage(Image image) {
-		setBorder(new MarginBorder(3));
-		ImageFigure fig = new ImageFigure();
-		this.image = image;
-		fig.setImage(image);
-		add(fig);
-		FlowPage flowPage = new FlowPage();
-
-		textFlow = new TextFlow();
-
-		textFlow.setLayoutManager(new ParagraphTextLayout(textFlow,
-				ParagraphTextLayout.WORD_WRAP_SOFT));
-		
-		flowPage.add(textFlow);
-		flowPage.setSize(40,40);
-
-		setLayoutManager(new ToolbarLayout());
-		add(flowPage);
-
-	}
-
-	/**
-	 * Returns the text inside the TextFlow.
-	 * 
-	 * @return the text flow inside the text.
-	 */
-	public String getText() {
-		return textFlow.getText();
-	}
-
-	/**
-	 * Sets the text of the TextFlow to the given value.
-	 * 
-	 * @param newText
-	 *            the new text value.
-	 */
-	public void setText(String newText) {
-		textFlow.setText(newText);
-	}
-
-	/**
-	 * @return Returns the image.
-	 */
-	public Image getImage() {
-		return image;
-	}
-
-	/**
-	 * @param image
-	 *            The image to set.
-	 */
-	public void setImage(Image image) {
-		this.image = image;
-	}
-	public TextFlow getTextFlow(){
-		return textFlow;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/WrappableLabel.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/WrappableLabel.java
deleted file mode 100755
index 15873c8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/WrappableLabel.java
+++ /dev/null
@@ -1,1089 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FigureUtilities;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.Image;
-
-import com.ibm.icu.text.BreakIterator;
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * Provides support for text wrap in a label.
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- * 
- */
-public class WrappableLabel extends Figure implements PositionConstants {
-
-	private static String ELLIPSIS = "..."; //$NON-NLS-1$
-
-	private Image icon;
-
-	private String text = ""; //$NON-NLS-1$
-
-	private String subStringText;
-
-	private Dimension textSize;
-
-	private Dimension subStringTextSize;
-
-	private Dimension iconSize = new Dimension(0, 0);
-
-	private Point iconLocation;
-
-	private Point textLocation;
-
-	private int textAlignment = CENTER;
-
-	private int iconAlignment = CENTER;
-
-	private int labelAlignment = CENTER;
-
-	private int textPlacement = SOUTH;
-
-	private int iconTextGap = 3;
-
-	private static final int FLAG_SELECTED = MAX_FLAG << 1,
-			FLAG_HASFOCUS = MAX_FLAG << 2, FLAG_WRAP = MAX_FLAG << 5,
-			FLAG_WRAP_ALIGN = MAX_FLAG << 6;
-
-	// The primary dimensions used to calculate text size.
-	private Dimension textDimension = new Dimension(-1, -1);
-
-	private Dimension prefSizeDimension = new Dimension(-1, -1);
-
-	private int wrapWidth;
-
-	public WrappableLabel() {
-		super();
-	}
-
-	/**
-	 * Construct a Label with passed String as its text.
-	 * 
-	 * @param s
-	 *            the label text
-	 * @since 2.0
-	 */
-	public WrappableLabel(String s) {
-		setText(s);
-	}
-
-	/**
-	 * Construct a WrappedLabel with passed Image as its icon.
-	 * 
-	 * @param i
-	 *            the WrappedLabel image
-	 * @since 2.0
-	 */
-	public WrappableLabel(Image i) {
-		setIcon(i);
-	}
-
-	/**
-	 * Construct a WrappedLabel with passed String as text and passed Image as
-	 * its icon.
-	 * 
-	 * @param s
-	 *            the WrappedLabel text
-	 * @param i
-	 *            the WrappedLabel image
-	 * @since 2.0
-	 */
-	public WrappableLabel(String s, Image i) {
-		setText(s);
-		setIcon(i);
-	}
-
-	private void alignOnHeight(Point loc, Dimension size, int alignment) {
-		Insets insets = getInsets();
-		switch (alignment) {
-		case TOP:
-			loc.y = insets.top;
-			break;
-		case BOTTOM:
-			loc.y = bounds.height - size.height - insets.bottom;
-			break;
-		default:
-			loc.y = (bounds.height - size.height) / 2;
-		}
-	}
-
-	private void alignOnWidth(Point loc, Dimension size, int alignment) {
-		Insets insets = getInsets();
-		switch (alignment) {
-		case LEFT:
-			loc.x = insets.left;
-			break;
-		case RIGHT:
-			loc.x = bounds.width - size.width - insets.right;
-			break;
-		default:
-			loc.x = (bounds.width - size.width) / 2;
-		}
-	}
-
-	private void calculateAlignment() {
-		switch (textPlacement) {
-		case EAST:
-		case WEST:
-			alignOnHeight(textLocation, getTextSize(), textAlignment);
-			alignOnHeight(iconLocation, iconSize, iconAlignment);
-			break;
-		case NORTH:
-		case SOUTH:
-			alignOnWidth(textLocation, getSubStringTextSize(), textAlignment);
-			alignOnWidth(iconLocation, iconSize, iconAlignment);
-			break;
-		}
-	}
-
-	/**
-	 * Calculates the size of the WrappedLabel using the passed Dimension as the
-	 * size of the WrappedLabel's text.
-	 * 
-	 * @param txtSize
-	 *            the precalculated size of the WrappedLabel's text
-	 * @return the WrappedLabel's size
-	 * @since 2.0
-	 */
-	protected Dimension calculateLabelSize(Dimension txtSize) {
-		int gap = iconTextGap;
-		if (getIcon() == null || getText().equals("")) //$NON-NLS-1$
-			gap = 0;
-		Dimension d = new Dimension(0, 0);
-		if (textPlacement == WEST || textPlacement == EAST) {
-			d.width = iconSize.width + gap + txtSize.width;
-			d.height = Math.max(iconSize.height, txtSize.height);
-		} else {
-			d.width = Math.max(iconSize.width, txtSize.width);
-			d.height = iconSize.height + gap + txtSize.height;
-		}
-		return d;
-	}
-
-	private void calculateLocations() {
-		textLocation = new Point();
-		iconLocation = new Point();
-
-		calculatePlacement();
-		calculateAlignment();
-		Dimension offset = getSize().getDifference(getPreferredSize());
-		offset.width += getTextSize().width - getSubStringTextSize().width;
-		switch (labelAlignment) {
-		case CENTER:
-			offset.scale(0.5f);
-			break;
-		case LEFT:
-			offset.scale(0.0f);
-			break;
-		case RIGHT:
-			offset.scale(1.0f);
-			break;
-		case TOP:
-			offset.height = 0;
-			offset.scale(0.5f);
-			break;
-		case BOTTOM:
-			offset.height = offset.height * 2;
-			offset.scale(0.5f);
-			break;
-		default:
-			offset.scale(0.5f);
-			break;
-		}
-
-		switch (textPlacement) {
-		case EAST:
-		case WEST:
-			offset.height = 0;
-			break;
-		case NORTH:
-		case SOUTH:
-			offset.width = 0;
-			break;
-		}
-
-		textLocation.translate(offset);
-		iconLocation.translate(offset);
-	}
-
-	private void calculatePlacement() {
-		int gap = iconTextGap;
-		if (icon == null || text.equals("")) //$NON-NLS-1$
-			gap = 0;
-		Insets insets = getInsets();
-
-		switch (textPlacement) {
-		case EAST:
-			iconLocation.x = insets.left;
-			textLocation.x = iconSize.width + gap + insets.left;
-			break;
-		case WEST:
-			textLocation.x = insets.left;
-			iconLocation.x = getSubStringTextSize().width + gap + insets.left;
-			break;
-		case NORTH:
-			textLocation.y = insets.top;
-			iconLocation.y = getTextSize().height + gap + insets.top;
-			break;
-		case SOUTH:
-			textLocation.y = iconSize.height + gap + insets.top;
-			iconLocation.y = insets.top;
-		}
-	}
-
-	/**
-	 * Calculates the size of the Label's text size. The text size calculated
-	 * takes into consideration if the Label's text is currently truncated. If
-	 * text size without considering current truncation is desired, use
-	 * {@link #calculateTextSize()}.
-	 * 
-	 * @return the size of the label's text, taking into account truncation
-	 * @since 2.0
-	 */
-	protected Dimension calculateSubStringTextSize() {
-		return FigureUtilities.getTextExtents(getSubStringText(), getFont());
-	}
-
-	/**
-	 * Calculates and returns the size of the Label's text. Note that this
-	 * Dimension is calculated using the Label's full text, regardless of
-	 * whether or not its text is currently truncated. If text size considering
-	 * current truncation is desired, use {@link #calculateSubStringTextSize()}.
-	 * 
-	 * @return the size of the label's text, ignoring truncation
-	 * @since 2.0
-	 */
-	protected Dimension calculateTextSize() {
-		// return FigureUtilities.getTextExtents(getText(), getFont());
-		return FigureUtilities.getTextExtents(getWrappedText(getSize().width,
-				getSize().height), getFont());
-
-	}
-
-	private void clearLocations() {
-		iconLocation = textLocation = null;
-	}
-
-	/**
-	 * Returns the Label's icon.
-	 * 
-	 * @return the label icon
-	 * @since 2.0
-	 */
-	public Image getIcon() {
-		return icon;
-	}
-
-	/**
-	 * Returns the current alignment of the Label's icon. The default is
-	 * {@link PositionConstants#CENTER}.
-	 * 
-	 * @return the icon alignment
-	 * @since 2.0
-	 */
-	public int getIconAlignment() {
-		return iconAlignment;
-	}
-
-	/**
-	 * Returns the bounds of the Label's icon.
-	 * 
-	 * @return the icon's bounds
-	 * @since 2.0
-	 */
-	public Rectangle getIconBounds() {
-		Rectangle bounds = getBounds();
-		return new Rectangle(bounds.getLocation().translate(getIconLocation()),
-				iconSize);
-	}
-
-	/**
-	 * Returns the location of the Label's icon relative to the Label.
-	 * 
-	 * @return the icon's location
-	 * @since 2.0
-	 */
-	protected Point getIconLocation() {
-		if (iconLocation == null)
-			calculateLocations();
-		return iconLocation;
-	}
-
-	/**
-	 * Returns the gap in pixels between the Label's icon and its text.
-	 * 
-	 * @return the gap
-	 * @since 2.0
-	 */
-	public int getIconTextGap() {
-		return iconTextGap;
-	}
-
-	/**
-	 * @see IFigure#getMinimumSize(int, int)
-	 */
-	public Dimension getMinimumSize(int w, int h) {
-		if (minSize != null)
-			return minSize;
-		minSize = new Dimension();
-		if (getLayoutManager() != null)
-			minSize.setSize(getLayoutManager().getMinimumSize(this, w, h));
-
-		Dimension labelSize = calculateLabelSize(FigureUtilities
-				.getTextExtents(ELLIPSIS, getFont()).intersect(
-						FigureUtilities.getTextExtents(getText(), getFont())));
-		Insets insets = getInsets();
-		labelSize.expand(insets.getWidth(), insets.getHeight());
-		minSize.union(labelSize);
-		return minSize;
-	}
-
-	/**
-	 * @see IFigure#getPreferredSize(int, int)
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		if (prefSize == null || wHint != prefSizeDimension.width
-				|| hHint != prefSizeDimension.height) {
-			prefSize = calculateLabelSize(getTextSize(wHint, hHint));
-			Insets insets = getInsets();
-			prefSize.expand(insets.getWidth(), insets.getHeight());
-			if (getLayoutManager() != null)
-				prefSize.union(getLayoutManager().getPreferredSize(this, wHint,
-						hHint));
-		}
-		if (wHint >= 0 && wHint < prefSize.width) {
-			Dimension minSize = getMinimumSize(wHint, hHint);
-			Dimension result = prefSize.getCopy();
-			result.width = Math.min(result.width, wHint);
-			result.width = Math.max(minSize.width, result.width);
-			prefSizeDimension.width = result.width;
-			prefSizeDimension.height = result.width;
-			return result;
-		}
-		return prefSize;
-	}
-
-	/**
-	 * Calculates the amount of the Label's current text will fit in the Label,
-	 * including an elipsis "..." if truncation is required.
-	 * 
-	 * @return the substring
-	 * @since 2.0
-	 */
-	public String getSubStringText() {
-		if (subStringText != null)
-			return subStringText;
-
-		subStringText = text;
-		Dimension shrink = getPreferredSize(getSize().width, getSize().height)
-				.getDifference(getSize());
-		Dimension effectiveSize = getTextSize().getExpanded(-shrink.width,
-				-shrink.height);
-		Font currentFont = getFont();
-		int fontHeight = FigureUtilities.getFontMetrics(currentFont)
-				.getHeight();
-		int maxLines = (int) (effectiveSize.height / (double) fontHeight);
-
-		StringBuffer accumlatedText = new StringBuffer();
-		StringBuffer remainingText = new StringBuffer(getText());
-		int i = 0, j = 0;
-
-		while (remainingText.length() > 0 && j++ < maxLines) {
-			i = getLineWrapPosition(remainingText.toString(), currentFont,
-					effectiveSize.width);
-
-			if (accumlatedText.length() > 0)
-				accumlatedText.append("\n"); //$NON-NLS-1$
-
-			if (i == 0 || (remainingText.length() > i && j == maxLines)) {
-				int dotsWidth = FigureUtilities.getTextExtents(ELLIPSIS,
-						currentFont).width;
-				i = getLargestSubstringConfinedTo(remainingText.toString(),
-						currentFont, Math.max(effectiveSize.width - dotsWidth,
-								0));
-				accumlatedText.append(remainingText.substring(0, i));
-				accumlatedText.append(ELLIPSIS);
-			} else
-				accumlatedText.append(remainingText.substring(0, i));
-			remainingText.delete(0, i);
-		}
-		return subStringText = accumlatedText.toString();
-	}
-
-	/**
-	 * Returns the size of the Label's current text. If the text is currently
-	 * truncated, the truncated text with its ellipsis is used to calculate the
-	 * size.
-	 * 
-	 * @return the size of this label's text, taking into account truncation
-	 * @since 2.0
-	 */
-	protected Dimension getSubStringTextSize() {
-		if (subStringTextSize == null)
-			subStringTextSize = calculateSubStringTextSize();
-		return subStringTextSize;
-	}
-
-	/**
-	 * Returns the text of the label. Note that this is the complete text of the
-	 * label, regardless of whether it is currently being truncated. Call
-	 * {@link #getSubStringText()} to return the label's current text contents
-	 * with truncation considered.
-	 * 
-	 * @return the complete text of this label
-	 * @since 2.0
-	 */
-	public String getText() {
-		return text;
-	}
-
-	/**
-	 * Returns the current alignment of the Label's text. The default text
-	 * alignment is {@link PositionConstants#CENTER}.
-	 * 
-	 * @return the text alignment
-	 */
-	public int getTextAlignment() {
-		return textAlignment;
-	}
-
-	/**
-	 * Returns the bounds of the label's text. Note that the bounds are
-	 * calculated using the label's complete text regardless of whether the
-	 * label's text is currently truncated.
-	 * 
-	 * @return the bounds of this label's complete text
-	 * @since 2.0
-	 */
-	public Rectangle getTextBounds() {
-		Rectangle bounds = getBounds();
-		return new Rectangle(bounds.getLocation().translate(getTextLocation()),
-				textSize);
-	}
-
-	/**
-	 * Returns the location of the label's text relative to the label.
-	 * 
-	 * @return the text location
-	 * @since 2.0
-	 */
-	protected Point getTextLocation() {
-		if (textLocation != null)
-			return textLocation;
-		calculateLocations();
-		return textLocation;
-	}
-
-	/**
-	 * Returns the current placement of the label's text relative to its icon.
-	 * The default text placement is {@link PositionConstants#EAST}.
-	 * 
-	 * @return the text placement
-	 * @since 2.0
-	 */
-	public int getTextPlacement() {
-		return textPlacement;
-	}
-
-	/**
-	 * Returns the size of the label's complete text. Note that the text used to
-	 * make this calculation is the label's full text, regardless of whether the
-	 * label's text is currently being truncated and is displaying an ellipsis.
-	 * If the size considering current truncation is desired, call
-	 * {@link #getSubStringTextSize()}.
-	 * 
-	 * @return the size of this label's complete text
-	 * @since 2.0
-	 */
-	protected Dimension getTextSize() {
-		if (textSize == null)
-			textSize = calculateTextSize();
-		return textSize;
-	}
-
-	/**
-	 * Returns the size of the label's complete text. Note that the text used to
-	 * make this calculation is the label's full text, regardless of whether the
-	 * label's text is currently being truncated and is displaying an ellipsis.
-	 * If the size considering current truncation is desired, call
-	 * {@link #getSubStringTextSize()}.
-	 * 
-	 * @return the size of this label's complete text
-	 * @since 2.0
-	 */
-	protected Dimension getTextSize(int width, int height) {
-		if (textSize == null) {
-			textSize = calculateTextSize(width, height);
-			textDimension.width = width;
-			textDimension.height = height;
-		}
-		return textSize;
-	}
-
-	/**
-	 * @see IFigure#invalidate()
-	 */
-	public void invalidate() {
-		prefSize = null;
-		minSize = null;
-		clearLocations();
-		textSize = null;
-		subStringTextSize = null;
-		subStringText = null;
-		super.invalidate();
-	}
-
-	/**
-	 * Returns <code>true</code> if the label's text is currently truncated
-	 * and is displaying an ellipsis, <code>false</code> otherwise.
-	 * 
-	 * @return <code>true</code> if the label's text is truncated
-	 * @since 2.0
-	 */
-	public boolean isTextTruncated() {
-		return !getSubStringTextSize().equals(getTextSize());
-	}
-
-	/**
-	 * @see Figure#paintFigure(Graphics)
-	 */
-	protected void paintFigure(Graphics graphics) {
-		if (isSelected()) {
-			graphics.pushState();
-			graphics.setBackgroundColor(ColorConstants.menuBackgroundSelected);
-			graphics.fillRectangle(getSelectionRectangle());
-			graphics.popState();
-			graphics.setForegroundColor(ColorConstants.white);
-		}
-		if (hasFocus()) {
-			graphics.pushState();
-			graphics.setXORMode(true);
-			graphics.setForegroundColor(ColorConstants.menuBackgroundSelected);
-			graphics.setBackgroundColor(ColorConstants.white);
-			graphics.drawFocus(getSelectionRectangle().resize(-1, -1));
-			graphics.popState();
-		}
-		if (isOpaque())
-			super.paintFigure(graphics);
-		Rectangle bounds = getBounds();
-		graphics.translate(bounds.x, bounds.y);
-		if (icon != null)
-			graphics.drawImage(icon, getIconLocation());
-
-		if (!isEnabled()) {
-			graphics.translate(1, 1);
-			graphics.setForegroundColor(ColorConstants.buttonLightest);
-			graphicsdrawText(graphics);
-			graphics.drawText(getSubStringText(), getTextLocation());
-			graphics.translate(-1, -1);
-			graphics.setForegroundColor(ColorConstants.buttonDarker);
-		}
-		graphicsdrawText(graphics);
-		graphics.translate(-bounds.x, -bounds.y);
-	}
-
-	/**
-	 * Sets the label's icon to the passed image.
-	 * 
-	 * @param image
-	 *            the new label image
-	 * @since 2.0
-	 */
-	public void setIcon(Image image) {
-		if (icon == image)
-			return;
-		icon = image;
-		// Call repaint, in case the image dimensions are the same.
-		repaint();
-		if (icon == null)
-			setIconDimension(new Dimension());
-		else
-			setIconDimension(new Dimension(image));
-	}
-
-	/**
-	 * This method sets the alignment of the icon within the icon dimension. The
-	 * dimension should be the same size as the Image itself, so calling this
-	 * method should have no affect.
-	 * 
-	 * @param align
-	 *            the icon alignment
-	 * @since 2.0
-	 */
-	public void setIconAlignment(int align) {
-		if (iconAlignment == align)
-			return;
-		iconAlignment = align;
-		clearLocations();
-		repaint();
-	}
-
-	/**
-	 * Sets the label's icon size to the passed Dimension.
-	 * 
-	 * @param d
-	 *            the new icon size
-	 * @since 2.0
-	 */
-	public void setIconDimension(Dimension d) {
-		if (d.equals(iconSize))
-			return;
-		iconSize = d;
-		revalidate();
-	}
-
-	/**
-	 * Sets the gap in pixels between the label's icon and text to the passed
-	 * value. The default is 4.
-	 * 
-	 * @param gap
-	 *            the gap
-	 * @since 2.0
-	 */
-	public void setIconTextGap(int gap) {
-		if (iconTextGap == gap)
-			return;
-		iconTextGap = gap;
-		repaint();
-		revalidate();
-	}
-
-	/**
-	 * Sets the alignment of the entire label (icon and text). If this figure's
-	 * bounds are larger than the size needed to display the label, the label
-	 * will be aligned accordingly. Valid values are:
-	 * <UL>
-	 * <LI><EM>{@link PositionConstants#CENTER}</EM>
-	 * <LI>{@link PositionConstants#TOP}
-	 * <LI>{@link PositionConstants#BOTTOM}
-	 * <LI>{@link PositionConstants#LEFT}
-	 * <LI>{@link PositionConstants#RIGHT}
-	 * </UL>
-	 * 
-	 * @param align
-	 *            label alignment
-	 */
-	public void setLabelAlignment(int align) {
-		if (labelAlignment == align)
-			return;
-		labelAlignment = align;
-		clearLocations();
-		repaint();
-	}
-
-	/**
-	 * Sets the label's text.
-	 * 
-	 * @param s
-	 *            the new label text
-	 * @since 2.0
-	 */
-	public void setText(String s) {
-		// "text" will never be null.
-		if (s == null)
-			s = ""; //$NON-NLS-1$
-		if (text.equals(s))
-			return;
-		text = s;
-		revalidate();
-		repaint();
-	}
-
-	/**
-	 * Sets the alignment of the Text relative to the icon. The text alignment
-	 * must be orthogonal to the text placement. For example, if the placement
-	 * is EAST, then the text can be aligned using TOP, CENTER, or BOTTOM. Valid
-	 * values are:
-	 * <UL>
-	 * <LI><EM>{@link PositionConstants#CENTER}</EM>
-	 * <LI>{@link PositionConstants#TOP}
-	 * <LI>{@link PositionConstants#BOTTOM}
-	 * <LI>{@link PositionConstants#LEFT}
-	 * <LI>{@link PositionConstants#RIGHT}
-	 * </UL>
-	 * 
-	 * @see #setLabelAlignment(int)
-	 * @param align
-	 *            the text alignment
-	 * @since 2.0
-	 */
-	public void setTextAlignment(int align) {
-		if (textAlignment == align)
-			return;
-		textAlignment = align;
-		clearLocations();
-		repaint();
-	}
-
-	/**
-	 * Sets the placement of text relative to the label's icon. Valid values
-	 * are:
-	 * <UL>
-	 * <LI><EM>{@link PositionConstants#EAST}</EM>
-	 * <LI>{@link PositionConstants#NORTH}
-	 * <LI>{@link PositionConstants#SOUTH}
-	 * <LI>{@link PositionConstants#WEST}
-	 * </UL>
-	 * 
-	 * @param where
-	 *            the text placement
-	 * @since 2.0
-	 */
-	public void setTextPlacement(int where) {
-		if (textPlacement == where)
-			return;
-		textPlacement = where;
-		revalidate();
-		repaint();
-	}
-
-	private Rectangle getSelectionRectangle() {
-		Rectangle bounds = getTextBounds();
-		bounds.expand(new Insets(2, 2, 0, 0));
-		translateToParent(bounds);
-		bounds.intersect(getBounds());
-		return bounds;
-	}
-
-	/**
-	 * Calculates and returns the size of the Label's text. Note that this
-	 * Dimension is calculated using the Label's full text, regardless of
-	 * whether or not its text is currently truncated. If text size considering
-	 * current truncation is desired, use {@link #calculateSubStringTextSize()}.
-	 * 
-	 * @return the size of the label's text, ignoring truncation
-	 * @since 2.0
-	 */
-	protected Dimension calculateTextSize(int width, int height) {
-		return FigureUtilities.getTextExtents(getWrappedText(width, height),
-				getFont());
-	}
-
-	// Code for the Text Wrap.
-	// Starts here.
-
-	private String getWrappedText(int width, int height) {
-		if (!isTextWrapped() || width == -1)
-			return getText();
-
-		if (isIconExist()) {
-			switch (textPlacement) {
-			case EAST:
-			case WEST:
-				width -= iconSize.width + getIconTextGap();
-				break;
-			case NORTH:
-			case SOUTH:
-				if (height != -1)
-					height -= iconSize.height + getIconTextGap();
-				break;
-			}
-		}
-
-		Font f = getFont();
-		int maxLines = Integer.MAX_VALUE;
-		if (height != -1) {
-			int fontHeight = FigureUtilities.getFontMetrics(f).getHeight();
-			maxLines = (int) (height / (double) fontHeight);
-		}
-
-		StringBuffer accumlatedText = new StringBuffer();
-		StringBuffer remainingText = new StringBuffer(getText());
-		int i = 0, j = 0;
-
-		while (remainingText.length() > 0 && j++ < maxLines) {
-			if ((i = getLineWrapPosition(remainingText.toString(), f, height)) == 0)
-				break;
-
-			if (accumlatedText.length() > 0)
-				accumlatedText.append("\n"); //$NON-NLS-1$
-			accumlatedText.append(remainingText.substring(0, i));
-			remainingText.delete(0, i);
-		}
-		return accumlatedText.toString();
-	}
-
-	private boolean isIconExist() {
-		return true;
-	}
-
-	private int getLineWrapPosition(String string, Font f, int width) {
-		BreakIterator iter = BreakIterator.getLineInstance();
-		iter.setText(string);
-		int start = iter.first();
-		int end = iter.next();
-
-		// if the first line segment does not fit in the width,
-		// determine the position within it where we need to cut
-		if (FigureUtilities.getTextExtents(string.substring(start, end), f).width > width) {
-			iter = BreakIterator.getCharacterInstance();
-			iter.setText(string);
-			start = iter.first();
-		}
-
-		// keep iterating as long as width permits
-		do
-			end = iter.next();
-		while (end != BreakIterator.DONE
-				&& FigureUtilities.getTextExtents(string.substring(start, end),
-						f).width <= width);
-		return (end == BreakIterator.DONE) ? iter.last() : iter.previous();
-	}
-
-	/**
-	 * Returns the largest substring of <i>s</i> in Font <i>f</i> that can be
-	 * confined to the number of pixels in <i>availableWidth<i>.
-	 * 
-	 * @param s
-	 *            the original string
-	 * @param f
-	 *            the font
-	 * @param availableWidth
-	 *            the available width
-	 * @return the largest substring that fits in the given width
-	 * @since 2.0 Copied from <class>FigureUtilities<class> Class, to avoid
-	 *        call of static.
-	 */
-	static int getLargestSubstringConfinedTo(String s, Font f,
-			int availableWidth) {
-		FontMetrics metrics = FigureUtilities.getFontMetrics(f);
-		int min, max;
-		float avg = metrics.getAverageCharWidth();
-		min = 0;
-		max = s.length() + 1;
-
-		// The size of the current guess
-		int guess = 0, guessSize = 0;
-		while ((max - min) > 1) {
-			// Pick a new guess size
-			// New guess is the last guess plus the missing width in pixels
-			// divided by the average character size in pixels
-			guess = guess + (int) ((availableWidth - guessSize) / avg);
-
-			if (guess >= max)
-				guess = max - 1;
-			if (guess <= min)
-				guess = min + 1;
-
-			// Measure the current guess
-			guessSize = FigureUtilities
-					.getTextExtents(s.substring(0, guess), f).width;
-
-			if (guessSize < availableWidth)
-				// We did not use the available width
-				min = guess;
-			else
-				// We exceeded the available width
-				max = guess;
-		}
-		return min;
-	}
-
-	/**
-	 * Sets to wrap text in Label.
-	 * 
-	 * @param b
-	 *            true/false
-	 */
-	public void setTextWrap(boolean b) {
-		if (isTextWrapped() == b)
-			return;
-		setFlag(FLAG_WRAP, b);
-		revalidate();
-		repaint();
-	}
-
-	/**
-	 * @return text wrap.
-	 */
-	public boolean isTextWrapped() {
-		return true;
-	}
-
-	/**
-	 * Set text wrap width.
-	 * 
-	 * @param i
-	 *            The label text wrap width
-	 */
-	public void setTextWrapWidth(int i) {
-		if (this.wrapWidth == i)
-			return;
-		this.wrapWidth = i;
-		revalidate();
-		repaint();
-
-	}
-
-	/**
-	 * Text Wrap Alignment, use only after using <method>setTextWrap(boolean)</method>
-	 * 
-	 * @param i
-	 *            The label text wrapping width
-	 */
-	public void setTextWrapAlignment(int i) {
-		if (getTextWrapAlignment() == i)
-			return;
-
-		setAlignmentFlags(i, FLAG_WRAP_ALIGN);
-		repaint();
-	}
-
-	/**
-	 * setAlignmentFlags
-	 * 
-	 * @param int
-	 *            align
-	 * @param int
-	 *            flagOffset
-	 * 
-	 * --- TODO - copied needs to modify
-	 */
-	private void setAlignmentFlags(int align, int flagOffset) {
-		flags &= ~(0x7 * flagOffset);
-		switch (align) {
-		case CENTER:
-			flags |= 0x1 * flagOffset;
-			break;
-		case TOP:
-			flags |= 0x2 * flagOffset;
-			break;
-		case LEFT:
-			flags |= 0x3 * flagOffset;
-			break;
-		case RIGHT:
-			flags |= 0x4 * flagOffset;
-			break;
-		case BOTTOM:
-			flags |= 0x5 * flagOffset;
-			break;
-		}
-	}
-
-	/**
-	 * 
-	 * @param wrapValue
-	 * @return PositionConstant representing the alignment
-	 */
-	private int getAlignment(int flagOffset) {
-		int wrapValue = flags & (0x7 * flagOffset);
-		if (wrapValue == 0x1 * flagOffset)
-			return CENTER;
-		else if (wrapValue == 0x2 * flagOffset)
-			return TOP;
-		else if (wrapValue == 0x3 * flagOffset)
-			return LEFT;
-		else if (wrapValue == 0x4 * flagOffset)
-			return RIGHT;
-		else if (wrapValue == 0x5 * flagOffset)
-			return BOTTOM;
-
-		return CENTER;
-	}
-
-	/**
-	 * @return the label text wrapping width
-	 */
-	public int getTextWrapAlignment() {
-		return getAlignment(FLAG_WRAP_ALIGN);
-	}
-
-	/**
-	 * @return the focus state of this label
-	 */
-	public boolean hasFocus() {
-		return (flags & FLAG_HASFOCUS) != 0;
-	}
-
-	/**
-	 * @return the selection state of this label
-	 */
-	public boolean isSelected() {
-		return (flags & FLAG_SELECTED) != 0;
-	}
-
-	private void graphicsdrawText(Graphics graphics) {
-		String subString = getSubStringText();
-		StringTokenizer tokenizer = new StringTokenizer(subString, "\n"); //$NON-NLS-1$
-
-		Font f = getFont();
-		int fontHeight = FigureUtilities.getFontMetrics(f).getHeight();
-		int textWidth = FigureUtilities.getTextExtents(subString, f).width;
-		int y = getTextLocation().y;
-
-		// If the font's leading area is 0 then we need to add an offset to
-		// avoid truncating at the top (e.g. Korean fonts)
-		if (0 == FigureUtilities.getFontMetrics(f).getLeading()) {
-			int offset = 2; // 2 is the leading area for default English
-			y += offset;
-		}
-
-		while (tokenizer.hasMoreTokens()) {
-			String token = tokenizer.nextToken();
-			System.out.println("Text added to draw" + token); //$NON-NLS-1$
-			int tokenWidth = FigureUtilities.getTextExtents(token, f).width;
-			int x = getTextLocation().x;
-			switch (getTextWrapAlignment()) {
-			case CENTER:
-				x += (textWidth - tokenWidth) / 2;
-				break;
-			case RIGHT:
-				x += textWidth - tokenWidth;
-				break;
-			}
-			graphics.drawText(token, x, y);
-			y += fontHeight;
-		}
-	}
-
-	/**
-	 * Sets the focus state of this label
-	 * 
-	 * @param b
-	 *            true will cause a focus rectangle to be drawn around the text
-	 *            of the Label
-	 */
-	public void setFocus(boolean b) {
-		if (hasFocus() == b)
-			return;
-		setFlag(FLAG_HASFOCUS, b);
-		repaint();
-	}
-
-	/**
-	 * Sets the selection state of this label
-	 * 
-	 * @param b
-	 *            true will cause the label to appear selected
-	 */
-	public void setSelected(boolean b) {
-		if (isSelected() == b)
-			return;
-		setFlag(FLAG_SELECTED, b);
-		repaint();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/package.html
deleted file mode 100755
index c908dd8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/figures/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides graphical figures for the activity diagrams.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/AnchorUtil.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/AnchorUtil.java
deleted file mode 100755
index 6b11dbe..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/AnchorUtil.java
+++ /dev/null
@@ -1,67 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.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/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/ConnectionAnchorLocator.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/ConnectionAnchorLocator.java
deleted file mode 100755
index b634ff7..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/ConnectionAnchorLocator.java
+++ /dev/null
@@ -1,30 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.util;
-
-import org.eclipse.draw2d.geometry.Point;
-
-/**
- * Constraint for placing anchor location.
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface ConnectionAnchorLocator {
-
-	/**
-	 * Gets relative location based on the given reference point
-	 * 
-	 * @param reference
-	 * @return absolute location
-	 */
-	Point getLocation(Point reference);
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/DiagramEditorUtil.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/DiagramEditorUtil.java
deleted file mode 100755
index f4e2583..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/DiagramEditorUtil.java
+++ /dev/null
@@ -1,92 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.epf.authoring.ui.util.UIHelper;
-import org.eclipse.epf.library.edit.ICommandListener;
-import org.eclipse.epf.library.edit.process.command.VaryActivityCommand;
-
-/**
- * Provides instructure to listens to actions like LocalContribution, Local Replace 
- * in WorkBreakdown Structure. Loads at time of plugin load.  
- * @see VaryActivityCommand
- *  
- * @author Shashidhar Kannoori
- * @author Shilpa Toraskar
- * @since  1.0
- */
-public final class DiagramEditorUtil {
-
-	
-	private static DiagramEditorUtil instance = null;
-
-	private List commandListeners;
-
-	private DiagramEditorUtil() {
-	}
-
-	public static DiagramEditorUtil getInstance() {
-		if (instance == null) {
-			synchronized (DiagramEditorUtil.class) {
-				if (instance == null) {
-					instance = new DiagramEditorUtil();
-				}
-			}
-		}
-		return instance;
-	}
-	public List getVaryCommandListeners() {
-		if (commandListeners == null) {
-			commandListeners = new ArrayList();
-		}
-
-		commandListeners.add(new ICommandListener() {
-			
-			public void notifyExecuted(Command command) {
-				// get contributor/replacer of the activity
-				//
-				Object wrapper = ((VaryActivityCommand)command).getWrapper();
-				UIHelper.closeDiagramEditors(wrapper, new ArrayList());
-				UIHelper.refreshOpenDiagramEditorsOfParent(wrapper, new ArrayList());
-			}
-
-			public Class getCommandType() {
-				return VaryActivityCommand.class;
-			}
-
-			public void preUndo(Command command) {
-				// get old contributor/replacer of the activity
-				//
-				Collection list = ((VaryActivityCommand)command).getResult();
-				
-				List listx = new ArrayList();
-				for(Iterator iterator = list.iterator(); iterator.hasNext();){
-					Object object = iterator.next();
-					UIHelper.closeDiagramEditors(object, listx);
-					UIHelper.refreshOpenDiagramEditorsOfParent(object, listx);
-					listx.clear();
-			}
-				
-		}
-
-			public void preExecute(Command command) {
-			}
-		});
-
-		return commandListeners;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/DiagramUIResources.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/DiagramUIResources.java
deleted file mode 100755
index f3df939..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/DiagramUIResources.java
+++ /dev/null
@@ -1,111 +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
- *******************************************************************************/
-package org.eclipse.epf.authoring.gef.util;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Resource Class for the Authoring Diagram (GEF) packages.
- * 
- */
-public final class DiagramUIResources extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.epf.authoring.gef.util.Resources";//$NON-NLS-1$
-
-	private DiagramUIResources() {
-		// Do not instantiate
-	}
-
-	public static String previous_name_null1;
-	public static String err_name_empty;
-	public static String moveAction_label;
-	public static String AbstractDiagram_Select_text;
-	public static String AbstractDiagram_Select_tooltip;
-	public static String AbstractDiagram_AddNode_title;
-	public static String AbstractDiagram_AddNode_err_msg;
-	public static String AbstractDiagram_Link_text;
-	public static String AbstractDiagram_Link_select;
-	public static String AbstractDiagram_Link_tooltip;
-	public static String ActivityDiagram_StartNode_text;
-	public static String ActivityDiagram_StartNode_tooltip;
-	public static String AbstractDiagram_FreeText_text;
-	public static String AbstractDiagram_FreeText_tooltip;
-	public static String ActivityDiagram_SyncBar_text;
-	public static String ActivityDiagram_SyncBar_tooltip;
-	public static String ActivityDiagram_DecisionNode_text;
-	public static String ActivityDiagram_DecisionNode_tooltip;
-	public static String ActivityDiagram_EndNode_text;
-	public static String ActivityDetailDiagram_prefix;
-	public static String ActivityDiagram_EndNode_tooltip;
-	public static String ActivityDiagram_Activity_text;
-	public static String ActivityDiagram_Activity_tooltip;
-	public static String ActivityDiagram_Iteration_text;
-	public static String ActivityDiagram_Iteration_tooltip;
-	public static String ActivityDiagram_Phase_text;
-	public static String ActivityDiagram_Phase_tooltip;
-	public static String AbstractDiagram_TaskDescriptor_text;
-	public static String AbstractDiagram_RoleDescriptor_text;
-	public static String WorkProductDependencyDiagram_prefix;
-	public static String AbstractDiagram_RoleDescriptor_tooltip;
-	public static String AbstractDiagram_TaskDescriptor_tooltip;
-	public static String ActvitivityDiagram_DeliveryProcess_text;
-	public static String ActvitivityDiagram_CapabilityPattern_text;
-	public static String ActvitivityDiagram_Phase_tex;
-	public static String ActvitivityDiagram_Iteration_text;
-	public static String ActvitivityDiagram_Activity_text;
-	public static String AbstractDiagram_WorkProductDescriptor_text;
-	public static String AbstractDiagram_WorkProductDescriptor_tooltip;
-	public static String AbstractDiagramEditor_alignMenu_text;
-	public static String AbstractDiagramEditor_refreshFromBaseActivity_text;
-	public static String AbstractDiagramEditor_formatTextBoxActivity_text;
-	public static String AbstractDiagramEditor_hAlignAverageAction_text;
-	public static String AbstractDiagramEditor_hAlignFirstSelectedAction_text;
-	public static String AbstractDiagramEditor_vAlignAverageAction_text;
-	public static String AbstractDiagramEditor_vAlignFirstSelectedAction_text;
-	public static String AbstractDiagramEditor_Save_text;
-	public static String AbstractDiagramEditor_Save_message;
-	public static String AbstractDiagramEditor_MoveNode_label;
-	public static String AbstractDiagramEditorrefreshfrombase;
-	public static String AbstractDiagram_BendPoint_create;
-	public static String ActivityDiagram_openActivityDetailDiagram_text;
-	public static String refreshAction_label;
-	public static String refreshFromBaseCmd_label;
-	public static String diagram_saveError;
-	public static String DeleteDiagram_text;
-	public static String DeleteDiagram_prompt;
-	public static String align_bend_point_text;
-	public static String ConfigurationEditorInput_configeditor0;
-	public static String diagram_node_property_value_problem_msg;
-	public static String diagram_errorDialog_title_text0;
-	public static String ActivityDetailDiagramEditor_ResetDiagramLayout_text;
-	public static String errorDialog_title;
-	public static String command_cannotEdit;
-	public static String AbstractDiagramEditor_ParentEditorClose_title;
-	public static String AbstractDiagramEditor_ParentEditorClose_text;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, DiagramUIResources.class);
-	}
-	
-	/**
-	 * Returns the localized string associated with a resource key and formatted
-	 * with a given object.
-	 * 
-	 * @param key
-	 *            A resource key.
-	 * @param data
-	 *            An object.
-	 * @return A formatted localized string.
-	 */
-	public static String bind(String key, Object data) {
-		return NLS.bind(key, new Object[] { data });
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/Resources.properties b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/Resources.properties
deleted file mode 100755
index 5cacf1f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/Resources.properties
+++ /dev/null
@@ -1,84 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-previous_name_null1=Undo name change is not allowed if previous name is null.
-err_name_empty=The name cannot be empty. Please specify a valid name.
-moveAction_label=Move
-
-AbstractDiagram_Select_text=Select
-AbstractDiagram_Select_tooltip=Select node or link
-AbstractDiagram_AddNode_title=Add Node
-AbstractDiagram_AddNode_err_msg=IXRD0002W: Adding a node to diagram failed
-AbstractDiagram_Link_text=Link
-AbstractDiagram_Link_select=Select Link
-AbstractDiagram_Link_tooltip=Create new link
-ActivityDiagram_StartNode_text=Start Node
-ActivityDiagram_StartNode_tooltip=Create new start node
-AbstractDiagram_FreeText_text=Free Text
-AbstractDiagram_FreeText_tooltip=Create new free text
-ActivityDiagram_SyncBar_text=Synchronization Bar
-ActivityDiagram_SyncBar_tooltip=Create new synchronization bar
-ActivityDiagram_DecisionNode_text=Decision Node
-ActivityDiagram_DecisionNode_tooltip=Create new decision node
-ActivityDiagram_EndNode_text=End Node
-ActivityDetailDiagram_prefix=Activity Detail:
-ActivityDiagram_EndNode_tooltip=Create new end node
-ActivityDiagram_Activity_text=Activity
-ActivityDiagram_Activity_tooltip=Create new activity
-ActivityDiagram_Iteration_text=Iteration
-ActivityDiagram_Iteration_tooltip=Create new iteration
-ActivityDiagram_Phase_text=Phase
-ActivityDiagram_Phase_tooltip=Create new phase
-AbstractDiagram_TaskDescriptor_text=Task Descriptor
-AbstractDiagram_RoleDescriptor_text=Role Descriptor
-WorkProductDependencyDiagram_prefix=Work Product Dependency Diagram:
-AbstractDiagram_RoleDescriptor_tooltip=Create new role descriptor
-AbstractDiagram_TaskDescriptor_tooltip=Create new task descriptor
-ActvitivityDiagram_DeliveryProcess_text=Delivery Process
-ActvitivityDiagram_CapabilityPattern_text=Capability Pattern
-ActvitivityDiagram_Phase_tex=Phase
-ActvitivityDiagram_Iteration_text=Iteration
-ActvitivityDiagram_Activity_text=Activity
-AbstractDiagram_WorkProductDescriptor_text=Work Product Descriptor
-AbstractDiagram_WorkProductDescriptor_tooltip=Create new work product descriptor
-
-AbstractDiagramEditor_alignMenu_text=Align
-AbstractDiagramEditor_refreshFromBaseActivity_text=Refresh from Base Activity
-AbstractDiagramEditor_formatTextBoxActivity_text=Format Text Box...
-AbstractDiagramEditor_hAlignAverageAction_text=Horizontally to Average
-AbstractDiagramEditor_hAlignFirstSelectedAction_text=Horizontally to First Selected
-AbstractDiagramEditor_vAlignAverageAction_text=Vertically to Average
-AbstractDiagramEditor_vAlignFirstSelectedAction_text=Vertically to First Selected
-AbstractDiagramEditor_Save_text=Save
-AbstractDiagramEditor_Save_message=Saving {0}
-AbstractDiagramEditor_MoveNode_label=Move Node
-AbstractDiagramEditorrefreshfrombase=Refresh From Base
-AbstractDiagram_BendPoint_create=Create Bendpoint
-
-ActivityDiagram_openActivityDetailDiagram_text=Open Activity Detail Diagram
-refreshAction_label=Refresh
-refreshFromBaseCmd_label=Refresh From Base
-diagram_saveError=IUPD0001W: Saving diagram failed
-
-DeleteDiagram_text=Delete Diagram
-DeleteDiagram_prompt=Are you sure you want to close and delete this diagram?\nThis change is permanent and cannot be undone.
-align_bend_point_text=Align Bend Point
-ConfigurationEditorInput_configeditor0=Configuration Editor
-diagram_node_property_value_problem_msg=Error in the node's property value.
-diagram_errorDialog_title_text0=Error
-
-ActivityDetailDiagramEditor_ResetDiagramLayout_text=Reset Diagram Layout
-errorDialog_title=Error
-command_cannotEdit=IUPD0003E: Cannot edit diagram
-
-AbstractDiagramEditor_ParentEditorClose_title=Parent Editor Closed
-AbstractDiagramEditor_ParentEditorClose_text={0} has closed. Would you also like to close {1}?
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/TemplateConstants.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/TemplateConstants.java
deleted file mode 100755
index e96db98..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/TemplateConstants.java
+++ /dev/null
@@ -1,93 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.util;
-
-import java.util.Locale;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.library.LibraryResources;
-import org.eclipse.swt.graphics.Font;
-
-/**
- * Constants used in authoring diagram
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public final class TemplateConstants {
-
-	public static final String ACTIVITY = "activity template"; //$NON-NLS-1$
-
-	public static final String ITERATION = "iteration template"; //$NON-NLS-1$
-
-	public static final String PHASE = "phase template"; //$NON-NLS-1$
-
-	public static final String SYNCH_BAR = "synchonization bar"; //$NON-NLS-1$
-
-	public static final String DECISION_NODE = "decision node"; //$NON-NLS-1$
-
-	public static final String START_NODE = "start node"; //$NON-NLS-1$
-
-	public static final String END_NODE = "end node"; //$NON-NLS-1$
-
-	public static final String WORK_PRODUCT = "work product template"; //$NON-NLS-1$
-
-	public static final String ROLE_DESCRIPTOR = "role descriptor template"; //$NON-NLS-1$
-
-	public static final String TASK_DESCRIPTOR = "task descriptor template"; //$NON-NLS-1$
-
-	public static final String WORK_PRODUCT_DESCRIPTOR = "work product descriptor template"; //$NON-NLS-1$
-
-	public static final String FREE_TEXT = "free text"; //$NON-NLS-1$
-
-	// TODO: move these constants to other file. This class define only template
-	// constants
-	//
-	public static final String PROPERTY_FONT_NAME = "property_font_name"; //$NON-NLS-1$
-
-	public static final String PROPERTY_FONT_STYLE = "property_font_style"; //$NON-NLS-1$
-
-	public static final String PROPERTY_FONT_HEIGHT = "property_font_height"; //$NON-NLS-1$
-
-	public static final String PROPERTY_FONT_RED = "property_font_red"; //$NON-NLS-1$
-
-	public static final String PROPERTY_FONT_BLUE = "property_font_blue"; //$NON-NLS-1$
-
-	public static final String PROPERTY_FONT_GREEN = "property_font_green"; //$NON-NLS-1$
-
-	// For default fonts.
-	public static final String DEFAULT_FONT_NAME = getFontName();
-
-	public static final int DEFAULT_FONT_SIZE = 8;
-
-	public static final Font DEFAULT_FONT = new Font(null, DEFAULT_FONT_NAME,
-			DEFAULT_FONT_SIZE, java.awt.Font.PLAIN);
-
-	public static final Font DEFAULT_FONT_ITALIC = new Font(null,
-			DEFAULT_FONT_NAME, DEFAULT_FONT_SIZE, java.awt.Font.ITALIC);
-
-	public static final String WIN_2K = "Windows 2000"; //$NON-NLS-1$
-
-	public static final String getFontName() {
-		String name = "Arial"; //$NON-NLS-1$
-
-		// Corrupted Japanese characters in Activity Diagrams
-		String currentLocale = Platform.getNL();
-		if (currentLocale != null
-				&& currentLocale.startsWith(Locale.JAPANESE.getLanguage())) {
-			if (WIN_2K.equalsIgnoreCase(System.getProperty("os.name"))) { //$NON-NLS-1$
-				name = LibraryResources.roleDiagramFont_name_win32;
-			}
-		}
-		return name;
-	}
-	public static final String ADD_ROLE_TASKS_BOX_BG_COLOR_RGB = "ADD_ROLE_TASKS_BOX_BG_COLOR_RGB";
-	public static final String ADD_WP_BOX_BG_COLOR_RGB = "ADD_WP_BOX_BG_COLOR_RGB";
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/Validation.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/Validation.java
deleted file mode 100755
index 0f298db..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/Validation.java
+++ /dev/null
@@ -1,530 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.AdapterFactoryTreeIterator;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.ActivityDiagram;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.RoleNode;
-import org.eclipse.epf.diagram.model.TaskNode;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.WorkBreakdownElementNode;
-import org.eclipse.epf.diagram.model.WorkProductDependencyDiagram;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.process.IBSItemProvider;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-
-
-/**
- * Validating routines for diagram editing
- * 
- * @author Phong Nguyen Le
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public final class Validation {
-
-	private static final String errMsg_CanNotConnect = AuthoringUIResources.DiagramValidation_err_cannot_connect_text; //$NON-NLS-1$
-
-	private static final String errMsg_SamePredAndSucc = AuthoringUIResources.DiagramValidation_err_samepredandsuc_text; //$NON-NLS-1$
-
-	private static final String errMsg_CanNotDelete = AuthoringUIResources.DiagramValidation_err_cannot_delete_text; //$NON-NLS-1$
-
-	/**
-	 * Checks if user can connect the given nodes.
-	 * 
-	 * @param source
-	 * @param target
-	 * @return null if connection is allowed, error message otherwise.
-	 */
-	public static String checkConnect(Node source, Node target) {
-		if (source.getDiagram() != target.getDiagram())
-			return AuthoringUIResources.DiagramValidation_err_cannot_connect_text;
-
-		if (source.getDiagram() instanceof ActivityDiagram) {
-			AdapterFactory adapterFactory = TngAdapterFactory.INSTANCE
-					.getWBS_ComposedAdapterFactory();
-			Object adapter = adapterFactory.adapt(source.getDiagram()
-					.getObject(), ITreeItemContentProvider.class);
-			Object proc = null;
-			if (adapter instanceof IBSItemProvider) {
-				proc = ((IBSItemProvider) adapter).getTopItem();
-			}
-			// get all breakdown elements in this process
-			//
-			List allElements = new ArrayList();
-			for (Iterator iter = new AdapterFactoryTreeIterator(adapterFactory,
-					proc); iter.hasNext();) {
-				Object obj = iter.next();
-				allElements.add(TngUtil.unwrap(obj));
-			}
-			if (proc != null) {
-				// If target is ReadOnly (means extends) and allow the link if
-				// its parent activity is a Contributor
-				
-				if (target.getDiagram().isReadOnly())
-					return errMsg_CanNotConnect;
-				if (source.getObject() instanceof WorkBreakdownElement) {
-					if (target.getObject() instanceof WorkBreakdownElement) {
-						if (ProcessUtil.checkCircular(
-								(WorkBreakdownElement) target.getObject(),
-								(WorkBreakdownElement) source.getObject(),
-								allElements)) {
-							return errMsg_SamePredAndSucc;
-						}
-						if(target.isReadOnly())
-							return errMsg_CanNotConnect;
-					} else if (target instanceof TypedNode) {
-						// should not allow incoming connection to start node
-						// and FreeText.
-						if (((TypedNode) target).getType() == TypedNode.START
-								|| ((TypedNode) target).getType() == TypedNode.FREE_TEXT) {
-							return errMsg_CanNotConnect;
-						}
-
-						Collection targetNodes = GraphicalDataHelper
-								.getTargetNodes((TypedNode) target,
-										WorkBreakdownElementNode.class);
-						WorkBreakdownElement pred = (WorkBreakdownElement) source
-								.getObject();
-						for (Iterator iter = targetNodes.iterator(); iter
-								.hasNext();) {
-							Node node = ((Node) iter.next());
-							if (node.isReadOnly())
-								return errMsg_CanNotConnect;
-							if (ProcessUtil.checkCircular(
-									(WorkBreakdownElement) node.getObject(),
-									pred, allElements)) {
-								return errMsg_SamePredAndSucc;
-							}
-						}
-					}
-				} else if (source instanceof TypedNode) {
-					if (target == source) {
-						return errMsg_CanNotConnect;
-					}
-					// should not allow outgoing connection from End Node and
-					// Free Text
-					if (((TypedNode) source).getType() == TypedNode.END
-							|| ((TypedNode) source).getType() == TypedNode.FREE_TEXT) {
-						return errMsg_CanNotConnect;
-					}
-
-					if (target instanceof TypedNode) {
-
-						/*
-						 * If source and target are TypedNodes, avoid circular
-						 * loop connection.
-						 */
-						if (checkSyncBarCircularLooop((TypedNode) source,
-								(TypedNode) target) != null) {
-							return errMsg_CanNotConnect;
-						}
-
-						// should not allow incoming connection to start node
-						// and FreeText.
-						if (((TypedNode) target).getType() == TypedNode.START
-								|| ((TypedNode) target).getType() == TypedNode.FREE_TEXT) {
-							return errMsg_CanNotConnect;
-						}
-
-						Collection srcNodes = GraphicalDataHelper
-								.getSourceNodes((TypedNode) source,
-										WorkBreakdownElementNode.class);
-						if (!srcNodes.isEmpty()) {
-							Collection targetNodes = GraphicalDataHelper
-									.getTargetNodes((TypedNode) target,
-											WorkBreakdownElementNode.class);
-							for (Iterator iter = targetNodes.iterator(); iter
-									.hasNext();) {
-								Node node = ((Node) iter.next());
-								if (node.isReadOnly())
-									return errMsg_CanNotConnect;
-								WorkBreakdownElement succ = (WorkBreakdownElement) node
-										.getObject();
-								for (Iterator iterator = srcNodes.iterator(); iterator
-										.hasNext();) {
-									WorkBreakdownElement pred = (WorkBreakdownElement) ((Node) iterator
-											.next()).getObject();
-									if (ProcessUtil.checkCircular(succ, pred,
-											allElements)) {
-										return errMsg_SamePredAndSucc;
-									}
-								}
-							}
-						}
-					} else if (target instanceof WorkBreakdownElementNode) {
-						
-						if(target.isReadOnly()) return errMsg_CanNotConnect;
-						
-						Collection srcNodes = GraphicalDataHelper
-								.getSourceNodes((TypedNode) source,
-										WorkBreakdownElementNode.class);
-						WorkBreakdownElement succ = (WorkBreakdownElement) ((Node) target)
-								.getObject();
-						for (Iterator iterator = srcNodes.iterator(); iterator
-								.hasNext();) {
-							WorkBreakdownElement pred = (WorkBreakdownElement) ((Node) iterator
-									.next()).getObject();
-							if (ProcessUtil.checkCircular(succ, pred,
-									allElements)) {
-								return errMsg_SamePredAndSucc;
-							}
-						}
-
-					}
-				}
-			}
-		} else if (source.getDiagram() instanceof ActivityDetailDiagram) {
-			if (source.isReadOnly() || target.isReadOnly()) {
-				return errMsg_CanNotConnect;
-			}
-
-			if ((source.getObject() instanceof RoleDescriptor || target
-					.getObject() instanceof RoleDescriptor)
-					|| (source.getObject() instanceof TaskDescriptor && target
-							.getObject() instanceof TaskDescriptor)
-					|| (source.getObject() instanceof WorkProductDescriptor && target
-							.getObject() instanceof WorkProductDescriptor)) {
-				return errMsg_CanNotConnect;
-			} else {
-				// check for duplicate connection
-				//
-				for (Iterator iter = source.getOutgoingConnections().iterator(); iter
-						.hasNext();) {
-					Link link = (Link) iter.next();
-					if (link.getTarget() == target) {
-						return errMsg_CanNotConnect;
-					}
-				}
-
-			}
-		} else if (source.getDiagram() instanceof WorkProductDependencyDiagram) {
-			if (source.isReadOnly() || target.isReadOnly()) {
-				return errMsg_CanNotConnect;
-			}
-		}
-
-		return null;
-	}
-
-	public static String checkDelete(Link link) {
-		
-//		if (link.getTarget() != null
-//				&& link.getTarget().getDiagram() instanceof ActivityDiagram) {
-//			if (link.getTarget().isReadOnly()){
-//				if(link.getSource() instanceof TypedNode){
-//					if(((TypedNode)link.getSource()).getType() == TypedNode.DECISION){
-//						return null;
-//					}
-//				}
-//				return errMsg_CanNotDelete;
-//			}
-//			if (link.getTarget() instanceof TypedNode) {
-//				
-//				TypedNode typednode = (TypedNode)link.getTarget();
-//				if(typednode.getType() == TypedNode.DECISION){
-//					return null;
-//				}
-//				if(link.getSource() instanceof TypedNode){
-//					typednode = (TypedNode)link.getSource();
-//					if(typednode.getType() == TypedNode.DECISION){
-//						return null;
-//					}
-//				}
-//				
-//				if (link.getSource().isReadOnly())
-//					return errMsg_CanNotDelete;
-//				
-//				if (link.getSource().getObject() instanceof WorkBreakdownElement
-//						|| (link.getSource() instanceof TypedNode && !GraphicalDataHelper
-//								.getSourceNodes((TypedNode) link.getSource(),
-//										WorkBreakdownElementNode.class)
-//								.isEmpty())) {
-//					
-//					Collection targetNodes = GraphicalDataHelper.getTargetNodes((TypedNode) link.getTarget(),
-//												WorkBreakdownElementNode.class);
-//					for (Iterator iter = targetNodes.iterator(); iter.hasNext();) {
-//						Node node = (Node) iter.next();
-//						if (node.isReadOnly()) {
-//							return errMsg_CanNotDelete;
-//						}
-//					}
-//				}
-//
-//			}
-//			if (link.getSource() instanceof TypedNode) {
-//				TypedNode typednode = (TypedNode)link.getSource();
-//				if(typednode.getType() == TypedNode.DECISION){
-//					return null;
-//				}
-//				if (link.getTarget().isReadOnly())
-//					return errMsg_CanNotDelete;
-//			}
-//		} else if ((link.getTarget() != null && link.getTarget().isReadOnly())
-//				|| (link.getSource() != null && link.getSource().isReadOnly())) {
-//			return errMsg_CanNotDelete;
-//		}
-		//return null;
-		
-		
-		Node source = link.getSource();
-		Node target = link.getTarget();
-		
-		// Special handle for Activity Detail Diagram links cannot be deleted.
-		if (target != null
-				&& target.getDiagram() instanceof ActivityDetailDiagram) {
-			return errMsg_CanNotDelete;
-		}
-		
-		
-		if (target != null
-				&& target.getDiagram() instanceof ActivityDiagram) {
-			
-			// Target = breakdownelement
-			if(target instanceof WorkBreakdownElementNode){
-				// Source = Breakdown element
-				if(source instanceof WorkBreakdownElementNode){
-					if(link.getTarget().isReadOnly())
-						return errMsg_CanNotDelete;
-					else
-						return null;
-				}
-				// Source = TypedNode
-				if(source instanceof TypedNode){
-					// Source = Decision Node
-					TypedNode sourceNode = (TypedNode)source;
-					if(!target.isReadOnly()){
-						return null;
-					}
-					else if(sourceNode.getType() == TypedNode.DECISION){
-						return null;
-					}
-					else if(sourceNode.getType() == TypedNode.SYNCH_BAR){
-						return checkSyncBarIncomingLinks(sourceNode);
-					}
-					else if(sourceNode.isReadOnly()){
-						return errMsg_CanNotDelete;
-					}
-				}
-			}// Target is TypedNode
-			else if(target instanceof TypedNode){
-				
-				TypedNode typedNode = (TypedNode)target;
-				// if Target is TypedNode and its a DecisionPoint - should be black.
-				if(typedNode.getType() == TypedNode.DECISION){
-					return null;
-				}
-				// If Target is TypedNode and and Source is WorkBreakdownElement and readonly
-				// Link should be green. 
-				if(source instanceof WorkBreakdownElementNode){
-					// Check Target - is having any indirect(outgoing connnection) contains decision points.
-					if(checkSyncBarOutgoingLinks((TypedNode)target) == null)
-						return null;
-					if(source.isReadOnly())
-						return errMsg_CanNotDelete;
-				}
-				if(source instanceof TypedNode){
-					TypedNode sourceTypedNode = (TypedNode)source;
-					// Source is Typed Node and its a decision point return null. 
-					if(sourceTypedNode.getType() == TypedNode.DECISION){
-						return null;
-					}
-					// if source is SyncBar and check all its incoming connections. 
-					if(sourceTypedNode.getType() == TypedNode.SYNCH_BAR){
-						return checkSyncBarIncomingLinks(sourceTypedNode);
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	public static String checkDelete(Node node) {
-		if (node.isReadOnly())
-			return errMsg_CanNotDelete;
-		Diagram diagram = node.getDiagram();
-		if (diagram instanceof ActivityDiagram) {
-			if (node instanceof TypedNode) {
-				Collection targetNodes = GraphicalDataHelper.getTargetNodes(
-						(TypedNode) node, WorkBreakdownElementNode.class);
-				for (Iterator iter = targetNodes.iterator(); iter.hasNext();) {
-					Node target = (Node) iter.next();
-					if (target.isReadOnly()) {
-						return errMsg_CanNotDelete;
-					}
-				}
-			}
-		} else if (diagram instanceof ActivityDetailDiagram) {
-			if (node instanceof RoleNode) {
-				return errMsg_CanNotDelete;
-			}
-		}
-		return null;
-	}
-
-	public static String checkReconnect(Node source, Node target, Link link) {
-		if (source.getDiagram() instanceof ActivityDiagram) {
-			if (link.getTarget() != null) {
-				if (link.getTarget().isReadOnly()) {
-					return errMsg_CanNotConnect;
-				} else {
-					if (link.getTarget() instanceof TypedNode) {
-						Collection targetNodes = GraphicalDataHelper
-								.getTargetNodes((TypedNode) link.getTarget(),
-										WorkBreakdownElementNode.class);
-						for (Iterator iter = targetNodes.iterator(); iter
-								.hasNext();) {
-							Node node = (Node) iter.next();
-							if (node.isReadOnly()) {
-								return errMsg_CanNotConnect;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return checkConnect(source, target, link);
-	}
-
-	/*
-	 * Method will not allow multiple link between two nodes. Needs to call
-	 * CreakLinkCommand and ReconnectLinkCommand. Any action on a Link should
-	 * call this checkConnect(Node source, Node target, Link link) before allow
-	 * to connect.
-	 */
-	public static String checkConnect(Node source, Node target, Link link) {
-
-		if (source == target && !(source.getObject() instanceof Activity)) {
-			return errMsg_CanNotConnect;
-		}
-
-		List links = source.getOutgoingConnections();
-		if (links != null) {
-			// This is need for reconnect to same target node.
-			if (links.contains(link)) {
-				if (link.getTarget().equals(target)) {
-					return null;
-				}
-			}
-		// This is need for new connect and reconnect to different target node.
-		for (Iterator iter = links.iterator(); iter.hasNext();) {
-			Link linkx = (Link) iter.next();
-			Object linkxtarget = linkx.getTarget();
-			if (linkxtarget != null && linkxtarget.equals(target)) {
-				return errMsg_CanNotConnect;
-				}
-			}
-		}
-		return checkConnect(source, target);
-	}
-
-	/*
-	 * To avoid circular looping between synchronization bars. If SycnBar1 ->
-	 * SyncBar2 (connected) then SyncBar2 -> SyncBar1 cannot connect. if
-	 * syncbar1 -> syncbar2->syncbar3 then syncbar3 -> syncbar1 disallowed.
-	 * 
-	 */
-	public static String checkSyncBarCircularLooop(TypedNode sNode,
-			TypedNode tNode) {
-		List list = tNode.getOutgoingConnections();
-		if (!list.isEmpty() && list.size() > 0) {
-			for (Iterator iterator = list.iterator(); iterator.hasNext();) {
-				Link link = (Link) iterator.next();
-				Node typednode = link.getTarget();
-				if (sNode.equals(typednode))
-					return errMsg_CanNotConnect;
-				if (typednode instanceof TypedNode) {
-					return checkSyncBarCircularLooop(sNode,
-							(TypedNode) typednode);
-				}
-			}
-		}
-		return null;
-	}
-	
-	/*
-	 * Method to Check if SyncBar inComming connections have 
-	 * any source is a readonly. 
-	 * @return
-	 */
-	public static String checkSyncBarIncomingLinks(TypedNode typedNode){
-		for (Iterator iter = typedNode.getIncomingConnections().iterator(); iter.hasNext();) {
-				Link link = (Link) iter.next();
-				Node source = link.getSource();
-				if(source instanceof WorkBreakdownElementNode){
-					if(source.isReadOnly())
-						return errMsg_CanNotDelete;
-				}else if(source instanceof TypedNode){
-					if(((TypedNode)source).getType() == TypedNode.SYNCH_BAR)
-						if(checkSyncBarIncomingLinks((TypedNode)source)!= null)
-							return errMsg_CanNotDelete;
-				}
-		}
-		return null;
-	}
-	/*
-	 *Method to check if synchronization bar outgoing connection
-	 *has any target is readonly.  
-	 */
-	public static String checkSyncBarOutgoingLinks(TypedNode typedNode){
-		for (Iterator iter = typedNode.getOutgoingConnections().iterator(); iter.hasNext();) {
-				Link link = (Link) iter.next();
-				Node target = link.getTarget();
-				if(target instanceof WorkBreakdownElementNode){
-					if(target.isReadOnly())
-						return errMsg_CanNotDelete;
-				}else if(target instanceof TypedNode){
-					if(((TypedNode)target).getType() == TypedNode.SYNCH_BAR)
-						if(checkSyncBarOutgoingLinks((TypedNode)target)!= null)
-							return errMsg_CanNotDelete;
-				}
-		}
-		return null;
-	}
-	
-	/**
-	 * Check to see link is readonly. 
-	 */
-	public static boolean isReadOnly(Link link) {
-		Node target = link.getTarget();
-		Node source = link.getSource();
-		if (target != null && target.getDiagram() instanceof ActivityDiagram) {
-			return checkDelete(link) != null;
-		} else if (target != null
-				&& target.getDiagram() instanceof ActivityDetailDiagram) {
-			if ((source != null && source instanceof TaskNode && source
-					.isReadOnly())
-					|| (target instanceof TaskNode && target.isReadOnly()))
-				return true;
-		}
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/package.html
deleted file mode 100755
index 2a98a6b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/util/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides implementation support for the activity diagrams.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/AbstractDiagramGraphicalViewer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/AbstractDiagramGraphicalViewer.java
deleted file mode 100755
index 94b03e8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/AbstractDiagramGraphicalViewer.java
+++ /dev/null
@@ -1,309 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.viewer;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.SWTGraphics;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.epf.authoring.gef.edit.DiagramEditPart;
-import org.eclipse.epf.authoring.gef.edit.NodeContainerEditPart;
-import org.eclipse.epf.authoring.gef.figures.SelectableLabel;
-import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.LinkedObject;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.layout.diagram.DiagramInfo;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.DiagramElement;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.LayerManager;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-
-
-/**
- * The abstract base class for a graphical viewer of the element diagram.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public abstract class AbstractDiagramGraphicalViewer {
-
-	protected Composite parent;
-
-	protected GraphicalViewer graphicalViewer;
-
-	protected Object wrapper;
-
-	public AbstractDiagramGraphicalViewer(Composite parent) {
-		this.parent = parent;
-		createGraphicalViewer();
-	}
-
-	public AbstractDiagramGraphicalViewer(Composite parent, Object wrapper) {
-		this.parent = parent;
-		this.wrapper = wrapper;
-		createGraphicalViewer();
-	}
-	/**
-	 * Creates the GraphicalViewer on the specified <code>Composite</code>
-	 * 
-	 */
-	protected void createGraphicalViewer() {
-		this.graphicalViewer = new ScrollingGraphicalViewer();
-		this.graphicalViewer.createControl(parent);
-		configureGraphicalViewer();
-	}
-
-	/**
-	 * Returns the graphical viewer.
-	 * 
-	 * @return the graphical viewer
-	 */
-	protected GraphicalViewer getGraphicalViewer() {
-		return graphicalViewer;
-	}
-
-	protected void configureGraphicalViewer() {
-		getGraphicalViewer().getControl().setBackground(
-				ColorConstants.listBackground);
-		ScrollingGraphicalViewer viewer = (ScrollingGraphicalViewer) getGraphicalViewer();
-
-		ScalableFreeformRootEditPart root = new ScalableFreeformRootEditPart();
-		viewer.setRootEditPart(root);
-		viewer.setEditPartFactory(createEditPartFactory());
-	}
-
-	protected IFigure getFigure() {
-		GraphicalViewer viewer = getGraphicalViewer();
-
-		// find the figure to be saved
-		LayerManager lm = (LayerManager) viewer.getEditPartRegistry().get(
-				LayerManager.ID);
-		IFigure figure = lm.getLayer(LayerConstants.PRINTABLE_LAYERS);
-		return figure;
-	}
-
-	protected void setSuppressionToDiagram(Diagram diagram) {
-		Object e = diagram.getObject();
-		if (e instanceof BreakdownElement) {
-			Process proc = TngUtil.getOwningProcess((BreakdownElement) e);
-			if (proc != null) {
-				diagram.setSuppression(Suppression.getSuppression(proc));
-			}
-		}
-	}
-
-	/**
-	 * Creates diagram for given object (only for {@link Activity} and packs the bounds.
-	 * 
-	 * @param wrapper 	{@link Object} 	
-	 * @param needReset boolean
-	 * @param filter 	{@link IFilter}
-	 * @param sup		{@link Suppression}
-	 */
-	public EditPart loadDiagram(Object wrapper, boolean needReset,
-			IFilter filter, Suppression sup) {
-		// initialize the viewer with the edit part
-		EditPart editPart = createEditPart(wrapper, filter, sup);
-		this.graphicalViewer.setContents(editPart);
-
-		// ask for immediate update of the control so that the diagram figure
-		// will be computed
-		parent.pack(true);
-
-		// This check is needed for browsing, in order to render activity contributing's
-		// children.  In processAuthoring we don't do realization, in order to displayed 
-		// realized elements, we have to cleanup ADD diagram and recreate. needtoReset or cleanupdiagram.
-		// Only for activity detail diagram.
-		Object o = TngUtil.unwrap(wrapper);
-		if(o instanceof VariabilityElement && getDiagramType() != null && 
-				getDiagramType().equalsIgnoreCase(ResourceHelper.DIAGRAM_TYPE_ACTIVITY_DETAIL)){
-			if(TngUtil.hasContributor((VariabilityElement)o)){
-				needReset = true;
-			}
-		}
-		
-		if (needReset) {
-			cleanUpDiagram();
-		}
-
-		IFigure figure = getFigure();
-		if (figure != null) {
-			Rectangle bounds = figure.getBounds();
-
-			//System.out.println("Before update: Diagram Bounds = " + bounds); //$NON-NLS-1$
-			if (bounds.x < 0 || bounds.y < 0) {
-				((DiagramEditPart) editPart).moveFigure(-bounds.x, -bounds.y);
-
-				parent.pack(true);
-
-				bounds = figure.getBounds();
-				//System.out.println("After update: Diagram Bounds = " + bounds); //$NON-NLS-1$
-			}
-		}
-		return editPart;
-	}
-
-	protected void loadDiagramInfo(GraphicalEditPart part, DiagramInfo diagramInfo) {
-		List children = part.getChildren();
-		for (Iterator it = children.iterator(); it.hasNext();) {
-			Object o = it.next();
-			if (o instanceof NodeContainerEditPart) {
-				loadDiagramInfo((GraphicalEditPart) o, diagramInfo);
-			} else if (o instanceof GraphicalEditPart) {
-				part = (GraphicalEditPart) o;
-				Object model = part.getModel();
-				Object e = model;
-				if (e instanceof LinkedObject) {
-					e = ((LinkedObject) e).getObject();
-				}
-
-				if (e instanceof DiagramElement) {
-					continue;
-				}
-
-				if (e instanceof MethodElement) {
-					boolean suppressed;
-					if (model instanceof NamedNode) {
-						suppressed = ((NamedNode) model).isSuppressed();
-					} else {
-						suppressed = ((MethodElement) e).getSuppressed()
-								.booleanValue();
-					}
-
-						IFigure f = part.getFigure();
-						Rectangle bounds = f.getBounds();
-
-						String altTag = null;
-						if (f instanceof SelectableLabel) {
-							altTag = ((SelectableLabel) f).getText();
-						}
-						diagramInfo.addArea((MethodElement) e, bounds.x,
-							bounds.y, bounds.width, bounds.height, altTag, suppressed);
-
-				}
-			} else {
-				// System.out.println("EditPart not handled: " + o);
-				// //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * returns {@link DiagramInfo}
-	 * 
-	 */
-	public DiagramInfo getDiagramInfo() {
-		DiagramInfo diagramInfo = null;
-
-		GraphicalEditPart part = (GraphicalEditPart) this.graphicalViewer
-				.getContents();
-		Object element = part.getModel();
-		if (element instanceof LinkedObject) {
-			element = ((LinkedObject) element).getObject();
-		}
-		if (element instanceof MethodElement) {
-			diagramInfo = new DiagramInfo(getDiagramType(),
-					(MethodElement) element);
-			loadDiagramInfo(part, diagramInfo);
-		}
-
-		return diagramInfo;
-	}
-
-	/**
-	 * Creates diagram image from figure created in loadDiagram method.
-	 * 
-	 */
-	public Image createDiagramImage() {
-		IFigure figure = getFigure();
-
-		SWTGraphics graphics = null;
-		GC gc = null;
-		Image image = null;
-
-		try {
-			Rectangle bounds = figure.getBounds();
-			int height = bounds.height;
-			int width = bounds.width;
-
-			// create a new image and repaint the graph
-			final Display display = Display.getDefault();
-			image = new Image(display, width, height);
-			gc = new GC(image);
-			graphics = new SWTGraphics(gc);
-			figure.paint(graphics);
-
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		} finally {
-			// release resources
-			if (graphics != null)
-				graphics.dispose();
-			if (gc != null)
-				gc.dispose();
-		}
-
-		return image;
-	}
-
-	public void dispose() {
-		try {
-			if (graphicalViewer != null) {
-				Control ctrl = graphicalViewer.getControl();
-				if (ctrl != null) {
-					ctrl.dispose();
-				}
-
-				graphicalViewer = null;
-			}
-		} catch (RuntimeException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	protected abstract EditPartFactory createEditPartFactory();
-
-	protected abstract EditPart createEditPart(Object e, IFilter filter,
-			Suppression sup);
-
-	protected abstract String getDiagramType();
-
-	protected void cleanUpDiagram() {
-		// default implementation does nothing
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/ActivityDetailDiagramViewer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/ActivityDetailDiagramViewer.java
deleted file mode 100755
index 170815d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/ActivityDetailDiagramViewer.java
+++ /dev/null
@@ -1,89 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.viewer;
-
-import org.eclipse.epf.authoring.gef.edit.ActivityDetailDiagramEditPart;
-import org.eclipse.epf.authoring.gef.edit.ActivityDetailDiagramEditPartFactory;
-import org.eclipse.epf.authoring.gef.edit.DiagramActionService;
-import org.eclipse.epf.authoring.gef.edit.DiagramUpdateService;
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * The graphical viewer for the ActivityDetail diagram.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ActivityDetailDiagramViewer extends AbstractDiagramGraphicalViewer {
-
-	public ActivityDetailDiagramViewer(Composite parent) {
-		super(parent);
-	}
-
-	protected EditPartFactory createEditPartFactory() {
-		return new ActivityDetailDiagramEditPartFactory();
-	}
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.viewer.AbstractDiagramGraphicalViewer#createEditPart(java.lang.Object, org.eclipse.epf.library.edit.IFilter, org.eclipse.epf.library.edit.util.Suppression)
-	 */
-
-	protected EditPart createEditPart(Object e, IFilter filter, Suppression sup) {
-		ActivityDetailDiagram diagram = ModelFactory.eINSTANCE
-				.createActivityDetailDiagram();//
-		diagram.setFilter(filter);
-		if (sup != null) {
-			diagram.setSuppression(sup);
-		}
-
-		diagram.setObject(e);
-		EditPart part = new ActivityDetailDiagramEditPart(
-				(ActivityDetailDiagram) diagram);
-		part.setModel(diagram);
-		return part;
-	}
-
-	protected String getDiagramType() {
-		return ResourceHelper.DIAGRAM_TYPE_ACTIVITY_DETAIL;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.viewer.AbstractDiagramGraphicalViewer#cleanUpDiagram()
-	 */
-	protected void cleanUpDiagram() {
-		ActivityDetailDiagramEditPart dep = (ActivityDetailDiagramEditPart) getGraphicalViewer()
-				.getContents();
-		dep.getRecentlyAddedParts().addAll(dep.getChildren());
-
-		// clean up the diagram
-		DefaultEditDomain editingDomain = new DefaultEditDomain(null);
-		ActionRegistry actionRegistry = new ActionRegistry();
-
-		DiagramActionService actionService = new DiagramActionService(
-				getGraphicalViewer(), editingDomain, actionRegistry);
-		actionService.registerVerticalAlignFirstSelectedAction();
-
-		DiagramUpdateService service = new DiagramUpdateService(
-				getGraphicalViewer(), editingDomain, actionRegistry);
-		service.cleanUpDiagram();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/ActivityDiagramService.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/ActivityDiagramService.java
deleted file mode 100755
index 042de86..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/ActivityDiagramService.java
+++ /dev/null
@@ -1,512 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.viewer;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.diagram.model.util.GraphicalDataManager;
-import org.eclipse.epf.diagramming.base.persistence.IDiagramService;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.configuration.ConfigurationHelper;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.VariabilityInfo;
-import org.eclipse.epf.library.edit.util.IDiagramManager;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.layout.ProcessAdapterFactoryFilter;
-import org.eclipse.epf.library.layout.diagram.DiagramInfo;
-import org.eclipse.epf.library.layout.diagram.IActivityDiagramService;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.ImageLoader;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Provides service methods for creating diagram images for activity elements
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ActivityDiagramService implements IActivityDiagramService {
-
-	private Composite parent = null;
-
-	private Composite holder = null;
-
-	private File pubDir;
-
-	private static Map typeMap = new HashMap();
-
-	private DiagramInfo diagramInfo = null;
-
-	private boolean publishUncreatedADD = true;
-	
-	private boolean publishADForActivityExtension = true;
-
-	static {
-		typeMap.put(ResourceHelper.DIAGRAM_TYPE_WORKFLOW, new Integer(
-				IDiagramManager.ACTIVITY_DIAGRAM));
-		typeMap.put(ResourceHelper.DIAGRAM_TYPE_ACTIVITY_DETAIL, new Integer(
-				IDiagramManager.ACTIVITY_DETAIL_DIAGRAM));
-		typeMap.put(ResourceHelper.DIAGRAM_TYPE_WP_DEPENDENCY, new Integer(
-				IDiagramManager.WORK_PRODUCT_DEPENDENCY_DIAGRAM));
-	}
-
-	public static int getIntType(String diagramType) {
-		Integer type = (Integer) typeMap.get(diagramType);
-		if (type != null) {
-			return type.intValue();
-		}
-
-		return -1;
-	}
-
-	Shell shell = null;
-
-	public ActivityDiagramService() {
-		this(null, new File(LibraryService.getInstance().getCurrentMethodLibraryPath()));
-	}
-
-	public ActivityDiagramService(File pubDir) {
-		this(null, pubDir);
-	}
-
-	public ActivityDiagramService(Composite parent, File pubDir) {
-		this.parent = parent;
-		this.pubDir = pubDir;
-	}
-
-	private AbstractDiagramGraphicalViewer getDiagramViewer(int diagramType) {
-		// if the shell window is distroyed, recreate it
-		if ((this.shell != null) && this.shell.isDisposed()) {
-			this.parent = null;
-			this.shell = null;
-		}
-
-		getViewerHolder(parent);
-
-		switch (diagramType) {
-		case IDiagramManager.ACTIVITY_DIAGRAM:
-			return new ActivityDiagramViewer(holder);
-
-		case IDiagramManager.ACTIVITY_DETAIL_DIAGRAM:
-			return new ActivityDetailDiagramViewer(holder);
-
-		case IDiagramManager.WORK_PRODUCT_DEPENDENCY_DIAGRAM:
-			return new WPDependencyDiagramViewer(holder);
-			
-		default:
-			return null;
-		}
-	}
-
-	private void getViewerHolder(Composite parent) {
-		if (parent == null) {
-			if (shell == null || shell.isDisposed()) {
-				shell = createShell();
-			}
-			shell.open();
-			parent = shell;
-		}
-
-		if (holder != null) {
-			holder.dispose();
-		}
-
-		holder = new Composite(parent, SWT.NONE);
-		holder.setLayoutData(new GridData(1, 1)); // size can't be 0,0
-		// otherwise the diagram
-		// will not be painted
-		holder.setLayout(new GridLayout());
-		holder.setVisible(false);
-	}
-
-	private Shell createShell() {
-		Shell shell = null;
-		Display d = Display.getDefault();
-		shell = new Shell(d);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		shell.setLayout(layout);
-		shell.setBounds(0, 0, 0, 0);
-		shell.setVisible(false);
-		return shell;
-	}
-
-	public void dispose() {
-		if ((shell != null) && (!shell.isDisposed())) {
-			shell.close();
-			shell.dispose();
-		}
-	}
-
-	/**
-	 * save the element diagram image and returns the image file url.
-	 * 
-	 * @param wrapper
-	 * @param imgPath
-	 * @param diagramType
-	 * @param filter
-	 *            IFilter
-	 * @param sup
-	 *            Suppression
-	 * @return String the image path relative to the publishing dir
-	 * 
-	 * @see org.eclipse.epf.library.layout.diagram.IActivityDiagramService#saveDiagram(java.lang.Object, java.lang.String, java.lang.String, org.eclipse.epf.library.edit.IFilter, org.eclipse.epf.library.edit.util.Suppression)
-	 */
-	public DiagramInfo saveDiagram(final Object wrapper, final String imgPath, 
-			final String diagramType, final IFilter filter,
-			final Suppression sup) {
-		// initialize the diagramInfo
-		diagramInfo = null;
-
-		// grab the UI thread to avoid thread access error
-		SafeUpdateController.syncExec(new Runnable() {
-			public void run() {
-				__internal_saveDiagram(wrapper, imgPath, diagramType, filter, sup);
-			}
-		});
-
-		return diagramInfo;
-	}
-
-	private boolean hasUserDefinedDiagram(Activity e, String imgPath, String diagramType) throws Exception
-	{		
-		// if there is a user defined diagram, use it
-		org.eclipse.epf.diagram.model.util.DiagramInfo info = new org.eclipse.epf.diagram.model.util.DiagramInfo((Activity)e);
-		switch (getIntType(diagramType))
-		{
-			case IDiagramManager.ACTIVITY_DIAGRAM:
-				if ( info.canPublishADImage() )
-				{
-					return (info.getActivityDiagram() != null) && info.canPublishADImage();
-				}
-				break;
-	
-			case IDiagramManager.ACTIVITY_DETAIL_DIAGRAM:
-				if ( info.canPublishADDImage() )
-				{
-					return (info.getActivityDetailDiagram() != null) && info.canPublishADDImage();
-				}
-				break;
-							
-			case IDiagramManager.WORK_PRODUCT_DEPENDENCY_DIAGRAM:
-				if ( info.canPublishWPDImage() )
-				{
-					return (info.getWPDDiagram() != null ) && info.canPublishWPDImage();
-				}
-				break;
-
-			default:
-				break;
-		}
-		
-		return false;
-	}
-	
-	private void __internal_saveDiagram(Object wrapper, final String imgPath, String diagramType,
-			IFilter filter, Suppression sup) {
-		
-		if ( sup.isSuppressed(wrapper) ) {
-			return;
-		}
-		
-		Object o = TngUtil.unwrap(wrapper);
-		if (!(o instanceof Activity)) {
-			return;
-		}
-
-		//MethodElement e = (MethodElement)o;
-		Activity e = (Activity)o;
-		// DiagramInfo diagramInfo = null;
-		Image image = null;
-		int type = getIntType(diagramType);
-		if (type < 0) {
-			return;
-		}
-
-		AbstractDiagramGraphicalViewer viewer = null;
-
-		// keep the dirty flag and reset back to avoid make the library dirty
-		boolean dirtyFlag = e.eResource().isModified();
-
-		try {
-			if ( hasUserDefinedDiagram((Activity)e, imgPath, diagramType) )
-			{
-				return;
-			}
-
-
-			// first check if we need to generate the diagram or not
-			// if the diagram is supressed, don't generate diagram
-			// don't create the diagram if it's not there,
-			// id the diagram does not exist, it's supressed
-			org.eclipse.epf.uma.Diagram d = GraphicalDataManager.getInstance()
-					.getUMADiagram((Activity) e, type, false);
-
-			// Allow the option to publish 'uncreated' diagrams
-			// by default, uncreated activity detail diagrams will be published,
-			// uncreated diagrams of other types will not be published
-			boolean exist = (d != null);
-			if (exist) {
-				if (d.getSuppressed().booleanValue() == true)
-					return;
-				
-				// If an extension has its own diagram. Base is replaced or contributed. 
-				// extension diagram shows realized element in undefined location. 
-				// In publishing don't display extension diagram even if it has its own
-				// diagram if realized elements are coming in through variability.
-				if(type == GraphicalDataHelper.ACTIVITY_DIAGRAM &&
-						checkVariability(e, filter,type) != null){
-					return;
-				}
-					
-			}else{
-				
-				if((type == GraphicalDataHelper.WORK_PRODUCT_DEPENDENCY_DIAGRAM))
-					return;
-
-				// For Activity Diagram un opened extension publish.
-				if(type == GraphicalDataHelper.ACTIVITY_DIAGRAM){
-					// If option is not checked, don't generate a diagram
-					if(!publishADForActivityExtension) return;
-					
-					//If extension is modified don't generate it.
-					if(!e.getBreakdownElements().isEmpty())
-						return;
-					VariabilityElement calculatedBase = checkVariability(e, filter, type);
-					if(calculatedBase == null) {
-						return;
-					}	
-					
-					wrapper = calculatedBase;
-					e = (Activity)calculatedBase;
-					exist = true;
-				}
-				
-				if (publishUncreatedADD == false && type == GraphicalDataHelper.ACTIVITY_DETAIL_DIAGRAM){
-					boolean contributorexist = false;
-					// This is need, if contributor has a ADD diagra, base don't 
-					// base should generate ADD in browsing.
-					MethodConfiguration config = null;
-					if (filter instanceof ProcessAdapterFactoryFilter) {
-						config = ((ProcessAdapterFactoryFilter) filter)
-								.getMethodConfiguration();
-					}
-					if (config == null)
-						return;
-
-					// Get immediate contributors first, and check immediate contributors
-					// have anything extra breakdown elements.
-					List list = ConfigurationHelper.getContributors(e, config);
-					if(e instanceof Activity){
-						Iterator iterator = list.iterator();
-						if(iterator != null){
-							while(iterator.hasNext()){
-								Object act = iterator.next();
-								if(act != null){
-									org.eclipse.epf.uma.Diagram dx = GraphicalDataManager.getInstance()
-									.getUMADiagram((Activity) act, type, false);
-									if(dx != null){   
-										contributorexist = true;
-										break;
-									}
-								}
-							}
-						}
-					}
-					if(!contributorexist)
-					return;
-				}
-			}
-			
-			try {
-				viewer = getDiagramViewer(type);
-				viewer.loadDiagram(wrapper, !exist, filter, sup);
-				diagramInfo = viewer.getDiagramInfo();
-				if (diagramInfo != null && !diagramInfo.isEmpty()) {
-					image = viewer.createDiagramImage();
-					if (image != null) {
-						// save the image
-						File f = new File(pubDir, imgPath);
-
-						// make sure the file is created otherwise exception
-						File parent = f.getParentFile();
-						if (!parent.exists()) {
-							parent.mkdirs();
-						}
-
-						if (!f.exists()) {
-							f.createNewFile();
-						}
-						OutputStream os = new FileOutputStream(f);
-						ImageLoader loader = new ImageLoader();
-						loader.data = new ImageData[] { image.getImageData() };
-						loader.save(os, SWT.IMAGE_JPEG);
-
-						diagramInfo.setImageFilePath(imgPath);
-					} else {
-						System.out.println("Unable to create diagram image"); //$NON-NLS-1$
-					}
-				}
-			} catch (RuntimeException e1) {
-				e1.printStackTrace();
-			}
-
-			// delete the newly created diagram from the library
-			if (!exist) {
-				d = GraphicalDataManager.getInstance().getUMADiagram(
-						(Activity) e, type, false);
-				if (d != null) {
-					EcoreUtil.remove(d);
-				}
-			}
-
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		} finally {
-			try {
-
-				// restore the dirty flag
-				e.eResource().setModified(dirtyFlag);
-
-				if (viewer != null) {
-					viewer.dispose();
-				}
-				if (image != null) {
-					image.dispose();
-				}
-			} catch (RuntimeException e1) {
-				e1.printStackTrace();
-			}
-		}
-
-	}
-
-
-	private VariabilityElement checkVariability(VariabilityElement e, IFilter filter,
-			int type) {
-
-		MethodConfiguration config = null;
-		if (filter instanceof ProcessAdapterFactoryFilter) {
-			config = ((ProcessAdapterFactoryFilter) filter)
-					.getMethodConfiguration();
-		}
-		if (config == null)
-			return null;
-
-		// Get immediate contributors first, and check immediate contributors
-		// have anything extra breakdown elements.
-		List list = ConfigurationHelper.getContributors(e, config);
-		for (Iterator iterator = list.iterator(); iterator.hasNext();) {
-			Object next = iterator.next();
-			if (next instanceof Activity) {
-				if (!((Activity) next).getBreakdownElements().isEmpty())
-					return null;
-			}
-		}
-
-		// Get all Contributors from parent chain and contributor chain for the
-		// element e.
-		VariabilityInfo eInfo = ((ProcessAdapterFactoryFilter) filter)
-				.getVariabilityInfo((VariabilityElement) e);
-		List contributors = eInfo.getContributors();
-
-		VariabilityElement ve = e.getVariabilityBasedOnElement();
-		if (ve == null) {
-			return null;
-		}
-		
-		Activity replacer = (Activity) ConfigurationHelper.getReplacer(ve,
-				config);
-		if (replacer != null) {
-			ve = replacer;
-			org.eclipse.epf.uma.Diagram replacerDiagram = GraphicalDataManager
-					.getInstance().getUMADiagram(replacer, type, false);
-			if (replacerDiagram != null) {
-				//anyReplacer.add(replacer);
-				return replacer;
-			} else {
-				return null;
-			}
-		} else {
-			org.eclipse.epf.uma.Diagram baseDiagram = GraphicalDataManager
-					.getInstance()
-					.getUMADiagram((Activity) ve, type, false);
-			if (baseDiagram != null) {
-				
-				// Check first if baseDiagram is suppressed.
-				if (baseDiagram.getSuppressed().booleanValue() == true)
-					return null;
-				
-				// Find the contributors of Base
-				VariabilityInfo veInfo = ((ProcessAdapterFactoryFilter) filter)
-						.getVariabilityInfo((VariabilityElement) ve);
-				List veContributors = veInfo.getContributors();
-				if (contributors.size() != veContributors.size()) {
-					for (Iterator iterator = contributors.iterator(); iterator
-							.hasNext();) {
-						Object next = iterator.next();
-						if (!veContributors.contains(next)) {
-							if (!((Activity) next).getBreakdownElements()
-									.isEmpty()) {
-								return null;
-							}
-						}
-					}
-				}
-				
-				return ve;
-				
-			}else{
-				// If no base diagram, check base of base had any diagram.
-				return checkVariability(ve, filter, type);
-			}
-		}
-		
-	}
-
-	/**
-	 * Set the window's preference attribute for Activity Detail Diagram.
-	 * 
-	 */
-	public void setPublishedUnCreatedADD(boolean flag) {
-		this.publishUncreatedADD = flag;
-	}
-	/**
-	 * Set the window's preference attribute for Acitivyt Diagram
-	 * 
-	 */
-	
-	public void setPublishADForActivityExtension(boolean flag){
-		this.publishADForActivityExtension = flag;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/ActivityDiagramViewer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/ActivityDiagramViewer.java
deleted file mode 100755
index 8fa15e8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/ActivityDiagramViewer.java
+++ /dev/null
@@ -1,58 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.viewer;
-
-import org.eclipse.epf.authoring.gef.edit.ActivityDiagramEditPart;
-import org.eclipse.epf.authoring.gef.edit.ActivityDiagramEditPartFactory;
-import org.eclipse.epf.diagram.model.ActivityDiagram;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * The graphical viewer for the Activity diagram.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ActivityDiagramViewer extends AbstractDiagramGraphicalViewer {
-
-	public ActivityDiagramViewer(Composite parent) {
-		super(parent);
-	}
-
-	protected EditPartFactory createEditPartFactory() {
-		return new ActivityDiagramEditPartFactory();
-	}
-
-	protected EditPart createEditPart(Object e, IFilter filter, Suppression sup) {
-		ActivityDiagram diagram = ModelFactory.eINSTANCE
-				.createActivityDiagram();
-		diagram.setFilter(filter);
-		if (sup != null) {
-			diagram.setSuppression(sup);
-		}
-
-		diagram.setObject(e);
-		EditPart part = new ActivityDiagramEditPart(diagram);
-		part.setModel(diagram);
-		return part;
-	}
-
-	protected String getDiagramType() {
-		return ResourceHelper.DIAGRAM_TYPE_WORKFLOW;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewAbstractDiagramGraphicalViewer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewAbstractDiagramGraphicalViewer.java
deleted file mode 100755
index c7c343d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewAbstractDiagramGraphicalViewer.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/**
- * 
- */
-package org.eclipse.epf.authoring.gef.viewer;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.DelegatingLayout;
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayeredPane;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.epf.authoring.gef.figures.SelectableLabel;
-import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.diagram.core.services.DiagramManager;
-import org.eclipse.epf.diagram.model.LinkedObject;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.NodeContainer;
-import org.eclipse.epf.diagramming.edit.parts.UMLEditPartFactory;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.layout.diagram.DiagramInfo;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.DiagramElement;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.image.ImageFileFormat;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.render.util.CopyToImageUtil;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * 
- * @author Shashidhar Kannoori
- */
-public abstract class NewAbstractDiagramGraphicalViewer extends
-		AbstractDiagramGraphicalViewer {
-
-	protected GraphicalEditPart part = null;
-	protected Diagram diagram;
-
-	public NewAbstractDiagramGraphicalViewer(Composite parent, Object wrapper) {
-		super(parent, wrapper);
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * Creates diagram for given object (only for {@link Activity} and packs the bounds.
-	 * 
-	 * @param wrapper 	{@link Object} 	
-	 * @param needReset boolean
-	 * @param filter 	{@link IFilter}
-	 * @param sup		{@link Suppression}
-	 */
-	public EditPart loadDiagram(Object wrapper, boolean needReset,
-			IFilter filter, Suppression sup) {
-		// initialize the viewer with the edit part
-		EditPart editPart = createEditPart(wrapper, filter, sup);
-		this.graphicalViewer.setContents(editPart);
-
-		// ask for immediate update of the control so that the diagram figure
-		// will be computed
-		parent.pack(true);
-
-		// This check is needed for browsing, in order to render activity contributing's
-		// children.  In processAuthoring we don't do realization, in order to displayed 
-		// realized elements, we have to cleanup ADD diagram and recreate. needtoReset or cleanupdiagram.
-		// Only for activity detail diagram.
-		Object o = TngUtil.unwrap(wrapper);
-		if(o instanceof VariabilityElement && getDiagramType() != null && 
-				getDiagramType().equalsIgnoreCase(ResourceHelper.DIAGRAM_TYPE_ACTIVITY_DETAIL)){
-			if(TngUtil.hasContributor((VariabilityElement)o)){
-				needReset = true;
-			}
-		}
-		
-		if (needReset) {
-			cleanUpDiagram();
-		}
-
-		return editPart;
-	}
-
-	
-	/**
-	 * returns {@link DiagramInfo}
-	 * 
-	 */
-	public DiagramInfo getDiagramInfo() {
-		DiagramInfo diagramInfo = null;
-
-		Object element = part.getModel();
-		if (element instanceof LinkedObject) {
-			element = ((LinkedObject) element).getObject();
-		}
-		if(element instanceof View){
-			 element = ((View)element).getElement();
-			if(element != null && element instanceof EModelElement){
-				element = BridgeHelper.getMethodElement((EModelElement)element);
-			}
-			if(element instanceof Node){
-				element = ((Node)element).getLinkedElement();
-			}
-		}
-
-		if (element instanceof MethodElement) {
-			diagramInfo = new DiagramInfo(getDiagramType(),
-					(MethodElement) element);
-			loadDiagramInfo(part, diagramInfo);
-		}
-
-		return diagramInfo;
-	}
-	
-	public void createDiagramImage(ImageFileFormat imageFileFormat){
-		CopyToImageUtil im = new CopyToImageUtil();
-		//im.copyToImage(part, destination, format, monitor)
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.viewer.AbstractDiagramGraphicalViewer#createEditPartFactory()
-	 */
-	@Override
-	protected EditPartFactory createEditPartFactory() {
-		return EditPartService.getInstance();
-	}
-	
-	/**
-	 * 
-	 */
-	protected void configureGraphicalViewer() {
-		getGraphicalViewer().getControl().setBackground(
-				ColorConstants.listBackground);
-		DiagramGraphicalViewer viewer = (DiagramGraphicalViewer) getGraphicalViewer();
-
-		DiagramRootEditPart root = (DiagramRootEditPart) EditPartService
-				.getInstance().createRootEditPart(getDiagram());
-		LayeredPane printableLayers = (LayeredPane) root
-				.getLayer(LayerConstants.PRINTABLE_LAYERS);
-		FreeformLayer extLabelsLayer = new FreeformLayer();
-		extLabelsLayer.setLayoutManager(new DelegatingLayout());
-		printableLayers.addLayerAfter(extLabelsLayer,
-				UMLEditPartFactory.EXTERNAL_NODE_LABELS_LAYER,
-				LayerConstants.PRIMARY_LAYER);
-		LayeredPane scalableLayers = (LayeredPane) root
-				.getLayer(LayerConstants.SCALABLE_LAYERS);
-		FreeformLayer scaledFeedbackLayer = new FreeformLayer();
-		scaledFeedbackLayer.setEnabled(false);
-		scalableLayers.addLayerAfter(scaledFeedbackLayer,
-				LayerConstants.SCALED_FEEDBACK_LAYER,
-				DiagramRootEditPart.DECORATION_UNPRINTABLE_LAYER);
-		viewer.setRootEditPart(root);
-		viewer.setEditPartFactory(createEditPartFactory());
-	}
-	
-	/*
-	 * 
-	 */
-	protected Diagram getDiagram(){
-		try{
-			if(diagram == null){
-				Activity act = (Activity)wrapper;
-				DiagramManager dmgr = DiagramManager.getInstance(TngUtil.getOwningProcess(act));	
-				List list = dmgr.getDiagrams(act, ActivityDiagramService.getIntType(getDiagramType()));
-				if(!list.isEmpty()){
-					diagram = (Diagram)list.get(0);
-				}else{
-					System.out.println("Diagram is empty for " + act);
-				}
-			}
-			return diagram;
-		}catch(Exception e){
-			e.printStackTrace();
-			return null;
-		}
-	}
-	
-	@Override
-	protected void createGraphicalViewer() {
-		this.graphicalViewer = new DiagramGraphicalViewer();
-		this.graphicalViewer.createControl(parent);
-		configureGraphicalViewer();
-	}
-	
-	protected void loadDiagramInfo(GraphicalEditPart part, DiagramInfo diagramInfo) {
-		List children = part.getChildren();
-		for (Iterator it = children.iterator(); it.hasNext();) {
-			Object o = it.next();
-			
-			if (o instanceof GraphicalEditPart) {
-				part = (GraphicalEditPart) o;
-				Object model = part.getModel();
-				Object e = model;
-				if (e instanceof LinkedObject) {
-					e = ((LinkedObject) e).getObject();
-				}
-				if(e instanceof View){
-					e = ((View)e).getElement();
-					if(e instanceof Node){
-						if(e instanceof NodeContainer){
-							loadDiagramInfo((GraphicalEditPart)o, diagramInfo);
-						}
-						e = ((Node)e).getLinkedElement();
-					}
-					if(e != null && e instanceof EModelElement){
-						e = BridgeHelper.getMethodElement((EModelElement)e);
-					}
-				}
-
-				if (e instanceof DiagramElement) {
-					continue;
-				}
-
-				if (e instanceof MethodElement) {
-					boolean suppressed;
-					if (model instanceof NamedNode) {
-						suppressed = ((NamedNode) model).isSuppressed();
-					} else {
-						suppressed = ((MethodElement) e).getSuppressed()
-								.booleanValue();
-					}
-
-						IFigure f = part.getFigure();
-						Rectangle bounds = f.getBounds();
-
-						String altTag = null;
-						if (f instanceof WrapLabel) {
-							altTag = ((WrapLabel) f).getText();
-						}
-						diagramInfo.addArea((MethodElement) e, bounds.x,
-							bounds.y, bounds.width, bounds.height, altTag, suppressed);
-
-				}
-			} else {
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDetailDiagramViewer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDetailDiagramViewer.java
deleted file mode 100755
index f9c384c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDetailDiagramViewer.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * 
- */
-package org.eclipse.epf.authoring.gef.viewer;
-
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * 
- * @author Shashidhar Kannoori
- */
-public class NewActivityDetailDiagramViewer extends
-		NewAbstractDiagramGraphicalViewer {
-
-	/**
-	 * @param parent
-	 * @param wrapper
-	 */
-	public NewActivityDetailDiagramViewer(Composite parent, Object wrapper) {
-		super(parent, wrapper);
-		// TODO Auto-generated constructor stub
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.viewer.AbstractDiagramGraphicalViewer#createEditPart(java.lang.Object, org.eclipse.epf.library.edit.IFilter, org.eclipse.epf.library.edit.util.Suppression)
-	 */
-	@Override
-	protected EditPart createEditPart(Object e, IFilter filter, Suppression sup) {
-		if(e instanceof Activity){
-			Diagram model =(Diagram)diagram.getElement();
-			model.setSuppression(sup);
-			DiagramEditDomain domain = new DiagramEditDomain(null);
-			((IDiagramGraphicalViewer)graphicalViewer).setEditDomain(domain);
-			part = EditPartService.getInstance().createGraphicEditPart(diagram);
-			return part;
-		}
-		if(part == null){
-			System.err.println("Editpart for "+ e +" is not created");
-		}
-		return part;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.viewer.AbstractDiagramGraphicalViewer#getDiagramType()
-	 */
-	@Override
-	protected String getDiagramType() {
-		return ResourceHelper.DIAGRAM_TYPE_ACTIVITY_DETAIL;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDiagramService.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDiagramService.java
deleted file mode 100755
index 7c29627..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDiagramService.java
+++ /dev/null
@@ -1,540 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.viewer;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.epf.diagram.core.services.DiagramManager;
-import org.eclipse.epf.diagram.model.util.GraphicalDataManager;
-import org.eclipse.epf.diagramming.base.persistence.IDiagramService;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.configuration.ConfigurationHelper;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.VariabilityInfo;
-import org.eclipse.epf.library.edit.util.IDiagramManager;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.layout.ProcessAdapterFactoryFilter;
-import org.eclipse.epf.library.layout.diagram.DiagramInfo;
-import org.eclipse.epf.library.layout.diagram.IActivityDiagramService;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.image.ImageFileFormat;
-import org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramGenerator;
-import org.eclipse.gmf.runtime.diagram.ui.render.util.CopyToImageUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.ImageLoader;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Provides service methods for creating diagram images for activity elements
- * 
- * @author Jinhua Xi
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class NewActivityDiagramService implements IActivityDiagramService {
-
-	private Composite parent = null;
-
-	private Composite holder = null;
-
-	private File pubDir;
-
-	private static Map<String, Integer> typeMap = new HashMap<String, Integer>();
-
-	private DiagramInfo diagramInfo = null;
-
-	private boolean publishUncreatedADD = true;
-	
-	private boolean publishADForActivityExtension = true;
-
-	static {
-		typeMap.put(ResourceHelper.DIAGRAM_TYPE_WORKFLOW, new Integer(
-				IDiagramManager.ACTIVITY_DIAGRAM));
-		typeMap.put(ResourceHelper.DIAGRAM_TYPE_ACTIVITY_DETAIL, new Integer(
-				IDiagramManager.ACTIVITY_DETAIL_DIAGRAM));
-		typeMap.put(ResourceHelper.DIAGRAM_TYPE_WP_DEPENDENCY, new Integer(
-				IDiagramManager.WORK_PRODUCT_DEPENDENCY_DIAGRAM));
-	}
-
-	public static int getIntType(String diagramType) {
-		Integer type = (Integer) typeMap.get(diagramType);
-		if (type != null) {
-			return type.intValue();
-		}
-
-		return -1;
-	}
-
-	Shell shell = null;
-
-	public NewActivityDiagramService() {
-		this(null, new File(LibraryService.getInstance().getCurrentMethodLibraryPath()));
-	}
-
-	public NewActivityDiagramService(File pubDir) {
-		this(null, pubDir);
-	}
-
-	public NewActivityDiagramService(Composite parent, File pubDir) {
-		this.parent = parent;
-		this.pubDir = pubDir;
-	}
-
-	private AbstractDiagramGraphicalViewer getDiagramViewer(int diagramType, Object wrapper) {
-		// if the shell window is distroyed, recreate it
-		if ((this.shell != null) && this.shell.isDisposed()) {
-			this.parent = null;
-			this.shell = null;
-		}
-
-		getViewerHolder(parent);
-
-		switch (diagramType) {
-		case IDiagramService.ACTIVITY_DIAGRAM:
-			return new NewActivityDiagramViewer(holder, wrapper);
-
-		case IDiagramService.ACTIVITY_DETAIL_DIAGRAM:
-			return new NewActivityDetailDiagramViewer(holder,wrapper);
-
-		case IDiagramService.WORK_PRODUCT_DEPENDENCY_DIAGRAM:
-			return new NewWPDependencyDiagramViewer(holder,wrapper);
-
-		default:
-			return null;
-		}
-	}
-
-	private void getViewerHolder(Composite parent) {
-		if (parent == null) {
-			if (shell == null || shell.isDisposed()) {
-				shell = createShell();
-			}
-			shell.open();
-			parent = shell;
-		}
-
-		if (holder != null) {
-			holder.dispose();
-		}
-
-		holder = new Composite(parent, SWT.NONE);
-		holder.setLayoutData(new GridData(1, 1)); // size can't be 0,0
-		// otherwise the diagram
-		// will not be painted
-		holder.setLayout(new GridLayout());
-		holder.setVisible(false);
-	}
-
-	private Shell createShell() {
-		Shell shell = null;
-		Display d = Display.getDefault();
-		shell = new Shell(d);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		shell.setLayout(layout);
-		shell.setBounds(0, 0, 0, 0);
-		shell.setVisible(false);
-		return shell;
-	}
-
-	public void dispose() {
-		if ((shell != null) && (!shell.isDisposed())) {
-			shell.close();
-			shell.dispose();
-		}
-	}
-
-	/**
-	 * save the element diagram image and returns the image file url.
-	 * 
-	 * @param wrapper
-	 * @param imgPath
-	 * @param diagramType
-	 * @param filter
-	 *            IFilter
-	 * @param sup
-	 *            Suppression
-	 * @return String the image path relative to the publishing dir
-	 * 
-	 * @see org.eclipse.epf.library.layout.diagram.IActivityDiagramService#saveDiagram(java.lang.Object, java.lang.String, java.lang.String, org.eclipse.epf.library.edit.IFilter, org.eclipse.epf.library.edit.util.Suppression)
-	 */
-	public DiagramInfo saveDiagram(final Object wrapper, final String imgPath, 
-			final String diagramType, final IFilter filter,
-			final Suppression sup) {
-		// initialize the diagramInfo
-		diagramInfo = null;
-
-		// grab the UI thread to avoid thread access error
-		SafeUpdateController.syncExec(new Runnable() {
-			public void run() {
-				__internal_saveDiagram(wrapper, imgPath, diagramType, filter, sup);
-			}
-		});
-
-		return diagramInfo;
-	}
-
-	private boolean hasUserDefinedDiagram(Activity e, String imgPath, String diagramType) throws Exception
-	{		
-		// if there is a user defined diagram, use it
-		org.eclipse.epf.diagram.model.util.DiagramInfo info = new org.eclipse.epf.diagram.model.util.DiagramInfo((Activity)e);
-		switch (getIntType(diagramType))
-		{
-			case IDiagramService.ACTIVITY_DIAGRAM:
-				if ( info.canPublishADImage() )
-				{
-					return (info.getActivityDiagram() != null) && info.canPublishADImage();
-				}
-				break;
-	
-			case IDiagramService.ACTIVITY_DETAIL_DIAGRAM:
-				if ( info.canPublishADDImage() )
-				{
-					return (info.getActivityDetailDiagram() != null) && info.canPublishADDImage();
-				}
-				break;
-							
-			case IDiagramService.WORK_PRODUCT_DEPENDENCY_DIAGRAM:
-				if ( info.canPublishWPDImage() )
-				{
-					return (info.getWPDDiagram() != null ) && info.canPublishWPDImage();
-				}
-				break;
-
-			default:
-				break;
-		}
-		
-		return false;
-	}
-	
-	private void __internal_saveDiagram(Object wrapper, final String imgPath, String diagramType,
-			IFilter filter, Suppression sup) {
-		
-		if ( sup.isSuppressed(wrapper) ) {
-			return;
-		}
-		
-		Object o = TngUtil.unwrap(wrapper);
-		if (!(o instanceof Activity)) {
-			return;
-		}
-
-		//MethodElement e = (MethodElement)o;
-		Activity e = (Activity)o;
-		// DiagramInfo diagramInfo = null;
-		Image image = null;
-		int type = getIntType(diagramType);
-		if (type < 0) {
-			return;
-		}
-
-		AbstractDiagramGraphicalViewer viewer = null;
-
-		// keep the dirty flag and reset back to avoid make the library dirty
-		boolean dirtyFlag = e.eResource().isModified();
-		
-		try {
-			if ( hasUserDefinedDiagram((Activity)e, imgPath, diagramType) )
-			{
-				return;
-			}
-
-
-			// Check diagram exists, don't generate for suppressed.
-			Diagram d = getDiagram(e, type);
-			
-			//Check publishing options.
-			boolean exist = (d != null);
-			if (exist) {
-				//TODO: Check for suppression.
-//				if (d.getSuppressed().booleanValue() == true)
-//					return;
-				
-				// If an extension has its own diagram. Base is replaced or contributed. 
-				// extension diagram shows realized element in undefined location. 
-				// In publishing don't display extension diagram even if it has its own
-				// diagram if realized elements are coming in through variability.
-				if(type == IDiagramManager.ACTIVITY_DIAGRAM &&
-						checkVariability(e, filter,type) != null){
-					return;
-				}
-					
-			}else{
-				
-				if((type == IDiagramManager.WORK_PRODUCT_DEPENDENCY_DIAGRAM))
-					return;
-
-				// For Activity Diagram un opened extension publish.
-				if(type == IDiagramManager.ACTIVITY_DIAGRAM){
-					// If option is not checked, don't generate a diagram
-					if(!publishADForActivityExtension) return;
-					
-					//If extension is modified don't generate it.
-					if(!e.getBreakdownElements().isEmpty())
-						return;
-					VariabilityElement calculatedBase = checkVariability(e, filter, type);
-					if(calculatedBase == null) {
-						return;
-					}	
-					
-					wrapper = calculatedBase;
-					e = (Activity)calculatedBase;
-					exist = true;
-				}
-				
-				if (publishUncreatedADD == false && type == IDiagramManager.ACTIVITY_DETAIL_DIAGRAM){
-					boolean contributorexist = false;
-					// This is need, if contributor has a ADD diagra, base don't 
-					// base should generate ADD in browsing.
-					MethodConfiguration config = null;
-					if (filter instanceof ProcessAdapterFactoryFilter) {
-						config = ((ProcessAdapterFactoryFilter) filter)
-								.getMethodConfiguration();
-					}
-					if (config == null)
-						return;
-
-					// Get immediate contributors first, and check immediate contributors
-					// have anything extra breakdown elements.
-					List list = ConfigurationHelper.getContributors(e, config);
-					if(e instanceof Activity){
-						Iterator iterator = list.iterator();
-						if(iterator != null){
-							while(iterator.hasNext()){
-								Object act = iterator.next();
-								if(act != null){
-									org.eclipse.epf.uma.Diagram dx = GraphicalDataManager.getInstance()
-									.getUMADiagram((Activity) act, type, false);
-									if(dx != null){   
-										contributorexist = true;
-										break;
-									}
-								}
-							}
-						}
-					}
-					if(!contributorexist)
-					return;
-				}
-			}
-			
-			try {
-				viewer = getDiagramViewer(type, wrapper);
-				viewer.loadDiagram(wrapper, !exist, filter, sup);
-				diagramInfo = viewer.getDiagramInfo();
-				if (diagramInfo != null && !diagramInfo.isEmpty()) {
-					image = viewer.createDiagramImage();
-					if (image != null) {
-						// save the image
-						File f = new File(pubDir, imgPath);
-
-						// make sure the file is created otherwise exception
-						File parent = f.getParentFile();
-						if (!parent.exists()) {
-							parent.mkdirs();
-						}
-
-						if (!f.exists()) {
-							f.createNewFile();
-						}
-						OutputStream os = new FileOutputStream(f);
-						ImageLoader loader = new ImageLoader();
-						loader.data = new ImageData[] { image.getImageData() };
-						loader.save(os, SWT.IMAGE_JPEG);
-
-						diagramInfo.setImageFilePath(imgPath);
-					} else {
-						System.out.println("Unable to create diagram image"); //$NON-NLS-1$
-					}
-				}
-			} catch (RuntimeException e1) {
-				e1.printStackTrace();
-			}
-
-			// delete the newly created diagram from the library
-			if (!exist) {
-				d = getDiagram(e, type);
-				if (d != null) {
-					EcoreUtil.remove(d);
-				}
-			}
-
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		} finally {
-			try {
-
-				// restore the dirty flag
-				e.eResource().setModified(dirtyFlag);
-
-				if (viewer != null) {
-					viewer.dispose();
-				}
-				if (image != null) {
-					image.dispose();
-				}
-			} catch (RuntimeException e1) {
-				e1.printStackTrace();
-			}
-		}
-
-	}
-
-
-	private VariabilityElement checkVariability(VariabilityElement e, IFilter filter,
-			int type) {
-
-		MethodConfiguration config = null;
-		if (filter instanceof ProcessAdapterFactoryFilter) {
-			config = ((ProcessAdapterFactoryFilter) filter)
-					.getMethodConfiguration();
-		}
-		if (config == null)
-			return null;
-
-		// Get immediate contributors first, and check immediate contributors
-		// have anything extra breakdown elements.
-		List list = ConfigurationHelper.getContributors(e, config);
-		for (Iterator iterator = list.iterator(); iterator.hasNext();) {
-			Object next = iterator.next();
-			if (next instanceof Activity) {
-				if (!((Activity) next).getBreakdownElements().isEmpty())
-					return null;
-			}
-		}
-
-		// Get all Contributors from parent chain and contributor chain for the
-		// element e.
-		VariabilityInfo eInfo = ((ProcessAdapterFactoryFilter) filter)
-				.getVariabilityInfo((VariabilityElement) e);
-		List contributors = eInfo.getContributors();
-
-		VariabilityElement ve = e.getVariabilityBasedOnElement();
-		if (ve == null) {
-			return null;
-		}
-		
-		Activity replacer = (Activity) ConfigurationHelper.getReplacer(ve,
-				config);
-		if (replacer != null) {
-			ve = replacer;
-			Diagram replacerDiagram = getDiagram(replacer, type);
-			if (replacerDiagram != null) {
-				return replacer;
-			} else {
-				return null;
-			}
-		} else {
-			Diagram baseDiagram = getDiagram((Activity) ve, type);
-			if (baseDiagram != null) {
-				
-				// Check first if baseDiagram is suppressed.
-				//TODO: Suppression work.
-//				if (baseDiagram.getSuppressed().booleanValue() == true)
-//					return null;
-				
-				// Find the contributors of Base
-				VariabilityInfo veInfo = ((ProcessAdapterFactoryFilter) filter)
-						.getVariabilityInfo((VariabilityElement) ve);
-				List veContributors = veInfo.getContributors();
-				if (contributors.size() != veContributors.size()) {
-					for (Iterator iterator = contributors.iterator(); iterator
-							.hasNext();) {
-						Object next = iterator.next();
-						if (!veContributors.contains(next)) {
-							if (!((Activity) next).getBreakdownElements()
-									.isEmpty()) {
-								return null;
-							}
-						}
-					}
-				}
-				
-				return ve;
-				
-			}else{
-				// If no base diagram, check base of base had any diagram.
-				return checkVariability(ve, filter, type);
-			}
-		}
-		
-	}
-
-	/**
-	 * Set the window's preference attribute for Activity Detail Diagram.
-	 * 
-	 */
-	public void setPublishedUnCreatedADD(boolean flag) {
-		this.publishUncreatedADD = flag;
-	}
-	/**
-	 * Set the window's preference attribute for Acitivyt Diagram
-	 * 
-	 */
-	
-	public void setPublishADForActivityExtension(boolean flag){
-		this.publishADForActivityExtension = flag;
-	}
-
-	public DiagramGenerator createDiagramImage(DiagramEditPart diagramEP, ImageFileFormat fileFormat)
-	throws CoreException {
-		CopyToImageUtil util = new CopyToImageUtil();
-		DiagramGenerator dGen = util.copyToImage(diagramEP, new Path(pubDir.getPath()), fileFormat, new NullProgressMonitor());
-		dGen.createAWTImageForDiagram();
-		return dGen;
-	}
-	
-	public Diagram getDiagram(Activity e, int type){
-		DiagramManager dMgr = DiagramManager.getInstance(TngUtil.getOwningProcess(e));
-		Diagram diagram = null;
-		try{
-			List list = dMgr.getDiagrams(e, type);
-			if(!list.isEmpty()){
-				diagram = (Diagram)list.get(0);
-			}
-		}catch(Exception ex){
-			//TODO : Logger.
-			System.out.println("Error in getDiagram()" + ex.getMessage());
-		}
-		finally{
-			if(dMgr != null){
-				dMgr.release();
-			}
-		}
-		return diagram;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDiagramViewer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDiagramViewer.java
deleted file mode 100755
index ac12a93..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewActivityDiagramViewer.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * 
- */
-package org.eclipse.epf.authoring.gef.viewer;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.DelegatingLayout;
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayeredPane;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.epf.diagram.core.bridge.ActivityDiagramAdapter;
-import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.diagramming.edit.parts.UMLEditPartFactory;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.layout.diagram.DiagramInfo;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class NewActivityDiagramViewer extends NewAbstractDiagramGraphicalViewer {
-
-
-
-	/**
-	 * @param parent
-	 */
-	public NewActivityDiagramViewer(Composite parent, Object act) {
-		super(parent,act);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.viewer.AbstractDiagramGraphicalViewer#createEditPart(java.lang.Object, org.eclipse.epf.library.edit.IFilter, org.eclipse.epf.library.edit.util.Suppression)
-	 */
-	@Override
-	protected EditPart createEditPart(Object e, IFilter filter, Suppression sup) {
-		if(e instanceof Activity){
-			try{
-			Activity act = (Activity)e;
-			ActivityDiagramAdapter adapter = new ActivityDiagramAdapter(act);
-			adapter.setView(diagram);
-			adapter.setSuppression(sup);
-			adapter.setFilter(filter);
-			adapter.setTarget(diagram.getElement());
-			adapter.setEditingDomain((InternalTransactionalEditingDomain)TransactionUtil.getEditingDomain(diagram.getElement()));
-			adapter.populateDiagram();
-			DiagramEditDomain domain = new DiagramEditDomain(null);
-			((IDiagramGraphicalViewer)graphicalViewer).setEditDomain(domain);
-			part = EditPartService.getInstance().createGraphicEditPart(diagram);
-			diagram.getElement().eAdapters().add(adapter);
-			return part;
-			
-			}catch(Exception ex){
-				ex.printStackTrace();
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.viewer.AbstractDiagramGraphicalViewer#getDiagramType()
-	 */
-	@Override
-	protected String getDiagramType() {
-		return ResourceHelper.DIAGRAM_TYPE_WORKFLOW;
-	}
-
-	/**
-	 * 
-	 */
-	protected void loadDiagramInfo(GraphicalEditPart part, DiagramInfo diagramInfo) {
-		List children = part.getChildren();
-		for (Iterator it = children.iterator(); it.hasNext();) {
-			Object o = it.next();
-			if (o instanceof GraphicalEditPart) {
-				part = (GraphicalEditPart) o;
-				Object model = part.getModel();
-				Object e = model;
-				
-				if(e instanceof View){
-					EModelElement ex = (EModelElement)((View)e).getElement();
-					if(ex != null){
-						e = BridgeHelper.getMethodElement(ex);
-					}
-				}
-				
-				if (e instanceof MethodElement) {
-					boolean suppressed;
-					if (model instanceof Node) {
-						suppressed = ((MethodElement)BridgeHelper.getMethodElement((EModelElement)((Node)model).getElement())).getSuppressed().booleanValue();
-					} else {
-						suppressed = ((MethodElement) e).getSuppressed()
-								.booleanValue();
-					}
-
-						IFigure f = part.getFigure();
-						Rectangle bounds = f.getBounds();
-
-						String altTag = null;
-						if (f instanceof WrapLabel) {
-							altTag = ((WrapLabel) f).getText();
-						}
-						diagramInfo.addArea((MethodElement) e, bounds.x,
-							bounds.y, bounds.width, bounds.height, altTag, suppressed);
-
-				}
-			} else {
-				// System.out.println("EditPart not handled: " + o);
-				// //$NON-NLS-1$
-			}
-		}
-	}
-	
-	@Override
-	protected void createGraphicalViewer() {
-		this.graphicalViewer = new DiagramGraphicalViewer();
-		this.graphicalViewer.createControl(parent);
-		configureGraphicalViewer();
-	}
-	
-	/**
-	 * 
-	 */
-	protected void configureGraphicalViewer() {
-		getGraphicalViewer().getControl().setBackground(
-				ColorConstants.listBackground);
-		DiagramGraphicalViewer viewer = (DiagramGraphicalViewer) getGraphicalViewer();
-
-		DiagramRootEditPart root = (DiagramRootEditPart) EditPartService
-				.getInstance().createRootEditPart(getDiagram());
-		LayeredPane printableLayers = (LayeredPane) root
-				.getLayer(LayerConstants.PRINTABLE_LAYERS);
-		FreeformLayer extLabelsLayer = new FreeformLayer();
-		extLabelsLayer.setLayoutManager(new DelegatingLayout());
-		printableLayers.addLayerAfter(extLabelsLayer,
-				UMLEditPartFactory.EXTERNAL_NODE_LABELS_LAYER,
-				LayerConstants.PRIMARY_LAYER);
-		LayeredPane scalableLayers = (LayeredPane) root
-				.getLayer(LayerConstants.SCALABLE_LAYERS);
-		FreeformLayer scaledFeedbackLayer = new FreeformLayer();
-		scaledFeedbackLayer.setEnabled(false);
-		scalableLayers.addLayerAfter(scaledFeedbackLayer,
-				LayerConstants.SCALED_FEEDBACK_LAYER,
-				DiagramRootEditPart.DECORATION_UNPRINTABLE_LAYER);
-		viewer.setRootEditPart(root);
-		viewer.setEditPartFactory(createEditPartFactory());
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewWPDependencyDiagramViewer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewWPDependencyDiagramViewer.java
deleted file mode 100755
index ec2c7a7..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/NewWPDependencyDiagramViewer.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 
- */
-package org.eclipse.epf.authoring.gef.viewer;
-
-import org.eclipse.draw2d.DelegatingLayout;
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.LayeredPane;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.wpdd.edit.parts.DiagramEditPartFactory;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * 
- * @author Shashidhar Kannoori
- */
-public class NewWPDependencyDiagramViewer extends
-		NewAbstractDiagramGraphicalViewer {
-
-	/**
-	 * @param parent
-	 * @param wrapper
-	 */
-	public NewWPDependencyDiagramViewer(Composite parent, Object wrapper) {
-		super(parent, wrapper);
-		// TODO Auto-generated constructor stub
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.viewer.AbstractDiagramGraphicalViewer#createEditPart(java.lang.Object, org.eclipse.epf.library.edit.IFilter, org.eclipse.epf.library.edit.util.Suppression)
-	 */
-	@Override
-	protected EditPart createEditPart(Object e, IFilter filter, Suppression sup) {
-		if(e instanceof Activity){
-			Diagram model =(Diagram)diagram.getElement();
-			model.setSuppression(sup);
-//			model.setObject(e);
-			DiagramEditDomain domain = new DiagramEditDomain(null);
-			((IDiagramGraphicalViewer)graphicalViewer).setEditDomain(domain);
-			part = EditPartService.getInstance().createGraphicEditPart(diagram);
-			return part;
-		}
-		if(part == null){
-			System.err.println("Editpart for "+ e +" is not created");
-		}
-		return part;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.gef.viewer.AbstractDiagramGraphicalViewer#getDiagramType()
-	 */
-	@Override
-	protected String getDiagramType() {
-		return ResourceHelper.DIAGRAM_TYPE_WP_DEPENDENCY;
-	}
-	@Override
-	protected void configureGraphicalViewer() {
-		DiagramGraphicalViewer viewer = (DiagramGraphicalViewer) getGraphicalViewer();
-		DiagramRootEditPart root = (DiagramRootEditPart) EditPartService
-		.getInstance().createRootEditPart(getDiagram());
-		LayeredPane printableLayers = (LayeredPane) root
-				.getLayer(LayerConstants.PRINTABLE_LAYERS);
-		FreeformLayer extLabelsLayer = new FreeformLayer();
-		extLabelsLayer.setLayoutManager(new DelegatingLayout());
-		printableLayers.addLayerAfter(extLabelsLayer,
-				DiagramEditPartFactory.EXTERNAL_NODE_LABELS_LAYER,
-				LayerConstants.PRIMARY_LAYER);
-		LayeredPane scalableLayers = (LayeredPane) root
-				.getLayer(LayerConstants.SCALABLE_LAYERS);
-		FreeformLayer scaledFeedbackLayer = new FreeformLayer();
-		scaledFeedbackLayer.setEnabled(false);
-		scalableLayers.addLayerAfter(scaledFeedbackLayer,
-				LayerConstants.SCALED_FEEDBACK_LAYER,
-				DiagramRootEditPart.DECORATION_UNPRINTABLE_LAYER);
-		viewer.setRootEditPart(root);
-		viewer.setEditPartFactory(createEditPartFactory());
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/WPDependencyDiagramViewer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/WPDependencyDiagramViewer.java
deleted file mode 100755
index 7d7a98a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/WPDependencyDiagramViewer.java
+++ /dev/null
@@ -1,59 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.gef.viewer;
-
-import org.eclipse.epf.authoring.gef.edit.DiagramEditPart;
-import org.eclipse.epf.authoring.gef.edit.WPDiagramEditPartFactory;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.WorkProductDependencyDiagram;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * The graphical viewer for the WP Dependency diagram.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class WPDependencyDiagramViewer extends AbstractDiagramGraphicalViewer {
-
-	public WPDependencyDiagramViewer(Composite parent) {
-		super(parent);
-
-	}
-
-	protected EditPartFactory createEditPartFactory() {
-		return new WPDiagramEditPartFactory();
-	}
-
-	protected EditPart createEditPart(Object e, IFilter filter, Suppression sup) {
-		WorkProductDependencyDiagram diagram = ModelFactory.eINSTANCE
-				.createWorkProductDependencyDiagram();
-		diagram.setFilter(filter);
-		if (sup != null) {
-			diagram.setSuppression(sup);
-		}
-
-		diagram.setObject(e);
-		EditPart part = new DiagramEditPart(diagram);
-		part.setModel(diagram);
-		return part;
-	}
-
-	protected String getDiagramType() {
-		return ResourceHelper.DIAGRAM_TYPE_WP_DEPENDENCY;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/package.html
deleted file mode 100755
index 4a2e324..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/gef/viewer/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides graphical viewers for the activity diagrams.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringPerspective.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringPerspective.java
deleted file mode 100755
index 3f73b26..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringPerspective.java
+++ /dev/null
@@ -1,77 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui;
-
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.authoring.ui.wizards.NewConfigurationWizard;
-import org.eclipse.epf.authoring.ui.wizards.NewLibraryWizard;
-import org.eclipse.epf.authoring.ui.wizards.NewMethodPluginWizard;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveDescriptor;
-import org.eclipse.ui.IPerspectiveFactory;
-import org.eclipse.ui.IPerspectiveRegistry;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The Method Authoring perspective.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class AuthoringPerspective implements IPerspectiveFactory {
-
-	/**
-	 * The Authoring perspective ID.
-	 */
-	public static final String PERSPECTIVE_ID = AuthoringPerspective.class
-			.getName();
-
-	/**
-	 * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(IPageLayout)
-	 */
-	public void createInitialLayout(IPageLayout layout) {
-		layout.setEditorAreaVisible(true);
-		String editorArea = layout.getEditorArea();
-		layout
-				.addView(LibraryView.VIEW_ID, IPageLayout.LEFT, 0.30f,
-						editorArea);
-		layout.addPlaceholder(IPageLayout.ID_PROP_SHEET, IPageLayout.BOTTOM,
-				0.65f, editorArea);
-		layout.addNewWizardShortcut(NewLibraryWizard.WIZARD_ID);
-		layout.addNewWizardShortcut(NewMethodPluginWizard.WIZARD_ID);
-		layout.addNewWizardShortcut(NewConfigurationWizard.WIZARD_ID);
-		PerspectiveListUtil.addPerspectiveShortList(layout);
-	}
-
-	/**
-	 * Opens the Authoring perspective.
-	 * 
-	 * @return the previously active perspective
-	 */
-	public static IPerspectiveDescriptor open() {
-		IWorkbenchPage activePage = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getActivePage();
-		if (activePage != null) {
-			IPerspectiveRegistry registry = PlatformUI.getWorkbench()
-					.getPerspectiveRegistry();
-			IPerspectiveDescriptor oldPerspective = activePage.getPerspective();
-			if (!oldPerspective.getId().equals(PERSPECTIVE_ID)) {
-				IPerspectiveDescriptor perspective = registry
-						.findPerspectiveWithId(PERSPECTIVE_ID);
-				activePage.setPerspective(perspective);
-			}
-			return oldPerspective;
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIHelpContexts.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIHelpContexts.java
deleted file mode 100755
index 1f43d4e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIHelpContexts.java
+++ /dev/null
@@ -1,70 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui;
-
-/**
- * Authoring UI help contexts
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- *
- */
-public class AuthoringUIHelpContexts {
-
-	private final static String ROOT_CONTEXT = AuthoringUIHelpContexts.class.getPackage().getName() + ".";  //$NON-NLS-1$
-	
-	public final static String  FILE_NEW_LIBRARY_CONTEXT = ROOT_CONTEXT +  "file_new_library_context"; //$NON-NLS-1$ 
-	public final static String	FILE_NEW_PLUGIN_CONTEXT = ROOT_CONTEXT +  "file_new_plugin_context"; //$NON-NLS-1$
-	public final static String	FILE_NEW_CONFIGURATION_CONTEXT = ROOT_CONTEXT +  "file_new_configuration_context"; //$NON-NLS-1$  
-	public final static String  FILE_OPEN_LIBRARY_CONTEXT = ROOT_CONTEXT +  "file_open_library_context"; //$NON-NLS-1$
-	public final static String  FILE_OPEN_CONFIGURATION_CONTEXT = ROOT_CONTEXT +  "file_open_configuration_context"; //$NON-NLS-1$
-	public final static String  FILE_IMPORT_CONTEXT = ROOT_CONTEXT + "file_import_context"; //$NON-NLS-1$
-	public final static String  FILE_EXPORT_CONTEXT = ROOT_CONTEXT + "file_export_context"; //$NON-NLS-1$
-	public final static String  LIBRARY_NAVIGATOR_VIEW_CONTEXT = ROOT_CONTEXT +  "library_navigator_view_context"; //$NON-NLS-1$  
-	public final static String  CONFIGURATION_VIEW_CONTEXT = ROOT_CONTEXT +  "configuration_view_context"; //$NON-NLS-1$  
-	public final static String  PLUGIN_EDITOR_DESCRIPTION_ALL_CONTEXT = ROOT_CONTEXT +  "plugin_editor_description_all_context"; //$NON-NLS-1$  
-	public final static String  CONFIGURATION_EDITOR_ALL_CONTEXT = ROOT_CONTEXT +  "configuration_editor_all_context"; //$NON-NLS-1$  
-	public final static String  CONTENT_PACKAGE_EDITOR_ALL_CONTEXT = ROOT_CONTEXT +  "content_package_editor_all_context"; //$NON-NLS-1$  
-	public final static String  EDITOR_ROLE_CONTEXT_HELP_ID = ROOT_CONTEXT +  "editor_role_context_help_ID"; //$NON-NLS-1$  
-	public final static String  EDITOR_TASK_CONTEXT_HELP_ID = ROOT_CONTEXT +  "editor_task_context_help_ID"; //$NON-NLS-1$  
-	public final static String  EDITOR_WORK_PRODUCT_CONTEXT_HELP_ID = ROOT_CONTEXT +  "editor_work_product_context_help_ID"; //$NON-NLS-1$  
-	public final static String  EDITOR_GUIDANCE_CONTEXT_HELP_ID = ROOT_CONTEXT +  "editor_guidance_context_help_ID"; //$NON-NLS-1$  
-	public final static String  EDITOR_DISCIPLINE_CONTEXT_HELP_ID = ROOT_CONTEXT +  "editor_discipline_context_help_ID"; //$NON-NLS-1$  
-	public final static String  EDITOR_DISCIPLINE_GROUPING_CONTEXT_HELP_ID = ROOT_CONTEXT +  "editor_discipline_grouping_context_help_ID"; //$NON-NLS-1$  
-	public final static String  EDITOR_DOMAIN_CONTEXT_HELP_ID = ROOT_CONTEXT +  "editor_domain_context_help_ID"; //$NON-NLS-1$  
-	public final static String  EDITOR_WORK_PRODUCT_TYPE_CONTEXT_HELP_ID = ROOT_CONTEXT +  "editor_work_product_type_context_help_ID"; //$NON-NLS-1$  
-	public final static String  EDITOR_ROLE_SET_CONTEXT_HELP_ID = ROOT_CONTEXT +  "editor_role_set_context_help_ID"; //$NON-NLS-1$  
-	public final static String  EDITOR_ROLSE_SET_GROUPING_CONTEXT_HELP_ID = ROOT_CONTEXT +  "editor_rolse_set_grouping_context_help_ID"; //$NON-NLS-1$  
-	public final static String  EDITOR_TOOL_CONTEXT_HELP_ID = ROOT_CONTEXT +  "editor_tool_context_help_ID"; //$NON-NLS-1$ 
-	public final static String  EDITOR_CUSTOM_CATEGORY_CONTEXT_HELP_ID = ROOT_CONTEXT +  "editor_custom_category_context_help_ID" ; //$NON-NLS-1$ 
-	public final static String  FORM_EDITOR_DESCRIPTION_GENERAL_CONTEXT = ROOT_CONTEXT +  "form_editor_description_general_context" ; //$NON-NLS-1$ 
-	public final static String  FORM_EDITOR_DESCRIPTION_DETAIL_CONTEXT = ROOT_CONTEXT +  "form_editor_description_detail_context"  ; //$NON-NLS-1$
-	public final static String  FORM_EDITOR_DESCRIPTION_NOTATION_CONTEXT = ROOT_CONTEXT +  "form_editor_description_notation_context"  ; //$NON-NLS-1$
-	public final static String  FORM_EDITOR_DESCRIPTION_TAILORING_CONTEXT = ROOT_CONTEXT +  "form_editor_description_tailoring_context" ; //$NON-NLS-1$ 
-	public final static String  FORM_EDITOR_DESCRIPTION_VERSION_CONTEXT = ROOT_CONTEXT +  "form_editor_description_version_context" ; //$NON-NLS-1$ 
-	public final static String  FORM_EDITOR_DESCRIPTION_ELEMENT_CONTEXT = ROOT_CONTEXT +  "form_editor_description_element_context" ; //$NON-NLS-1$ 
-	public final static String  FORM_EDITOR_DESCRIPTION_ICON_CONTEXT = ROOT_CONTEXT +  "form_editor_description_icon_context" ; //$NON-NLS-1$ 
-	public final static String  EDITOR_CP_DESCRIPTION_CONTEXT_HELP_ID = ROOT_CONTEXT +  "editor_cp_description_context_help_ID" ; //$NON-NLS-1$ 
-	public final static String  EDITOR_DP_DESCRIPTION_CONTEXT_HELP_ID = ROOT_CONTEXT +  "editor_dp_description_context_help_ID" ; //$NON-NLS-1$ 
-	public final static String  FORM_EDITOR_PROCESS_WBS_CONTEXT = ROOT_CONTEXT +  "form_editor_process_wbs_context"  ; //$NON-NLS-1$
-	public final static String  FORM_EDITOR_PROCESS_OBS_CONTEXT = ROOT_CONTEXT +  "form_editor_process_obs_context" ; //$NON-NLS-1$ 
-	public final static String  FORM_EDITOR_PROCESS_PBS_CONTEXT = ROOT_CONTEXT +  "form_editor_process_pbs_context"  ; //$NON-NLS-1$
-	public final static String  FORM_EDITOR_PROCESS_ALLBS_CONTEXT = ROOT_CONTEXT + "form_editor_process_allbs_context"; //$NON-NLS-1$
-	public final static String  CONFIGURATION_PUBLISH_WIZARD_ALL_PAGES_CONTEXT = ROOT_CONTEXT +  "configuration_publish_wizard_all_pages_context" ; //$NON-NLS-1$ 
-	public final static String  RICH_TEXT_EDITOR_CONTEXT_ID = ROOT_CONTEXT +  "rich_text_editor_context_ID"  ; //$NON-NLS-1$
-	public final static String  FORM_EDITOR_ACTIVITY_DIAGRAM_CONTEXT = ROOT_CONTEXT + "form_editor_activity_diagram_context"; //$NON-NLS-1$
-	public final static String  FORM_EDITOR_ACTIVITY_DETAIL_DIAGRAM_CONTEXT = ROOT_CONTEXT +"form_editor_activity_detail_diagram_context";//$NON-NLS-1$
-	public final static String  FORM_EDITOR_WP_DEPENDENCY_DIAGRAM_CONTEXT = ROOT_CONTEXT + "form_editor_wp_dependency_diagram_context";//$NON-NLS-1$
-	public final static String  LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED = ROOT_CONTEXT + "library_view_node_context_not_implemented"; //$NON-NLS-1$
-	public static final String  LAYOUT_FLAT_ACTION = ROOT_CONTEXT + "layout_flat_action"; 	 //$NON-NLS-1$
-	public static final String  LAYOUT_HIERARCHICAL_ACTION = ROOT_CONTEXT + "layout_hierarchical_action"; 	 //$NON-NLS-1$	
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIImages.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIImages.java
deleted file mode 100755
index bdbbb9f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIImages.java
+++ /dev/null
@@ -1,96 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Shared images used in the Authoring UI.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class AuthoringUIImages {
-
-	public static final String IMG_NAME_COLLAPSED = "full/obj16/Collapsed.gif"; //$NON-NLS-1$ 	
-
-	public static final String IMG_NAME_EXPANDED = "full/obj16/Expanded.gif"; //$NON-NLS-1$
-
-	public static final String IMG_NAME_REFRESH = "full/etool16/Refresh.gif"; //$NON-NLS-1$ 	
-
-	public static final String IMG_NAME_STOP = "full/etool16/Stop.gif"; //$NON-NLS-1$
-
-	public static final String IMG_NAME_PRINT = "full/etool16/Print.gif"; //$NON-NLS-1$
-	
-	public static final String IMG_NAME_OVR_ERROR = "full/ovr16/error_ovr.gif"; //$NON-NLS-1$
-	
-	public static final String IMG_NAME_LAYOUT_FLAT = "full/etool16/flatLayout.gif"; //$NON-NLS-1$
-
-	public static final String IMG_NAME_LAYOUT_HIERARCHICAL = "full/etool16/hierarchicalLayout.gif"; //$NON-NLS-1$
-
-	public static final ImageDescriptor IMG_DESC_COLLAPSED = AuthoringUIPlugin
-			.getDefault().getImageDescriptor(IMG_NAME_COLLAPSED);
-
-	public static final ImageDescriptor IMG_DESC_EXPANDED = AuthoringUIPlugin
-			.getDefault().getImageDescriptor(IMG_NAME_EXPANDED);
-
-	public static final ImageDescriptor IMG_DESC_REFRESH = AuthoringUIPlugin
-			.getDefault().getImageDescriptor(IMG_NAME_REFRESH);
-
-	public static final ImageDescriptor IMG_DESC_STOP = AuthoringUIPlugin
-			.getDefault().getImageDescriptor(IMG_NAME_STOP);
-
-	public static final ImageDescriptor IMG_DESC_PRINT = AuthoringUIPlugin
-			.getDefault().getImageDescriptor(IMG_NAME_PRINT);
-	
-	public static final ImageDescriptor IMG_DESC_OVR_ERROR = AuthoringUIPlugin
-			.getDefault().getImageDescriptor(IMG_NAME_OVR_ERROR);
-
-	public static final ImageDescriptor IMG_DESC_LAYOUT_FLAT = AuthoringUIPlugin
-			.getDefault().getImageDescriptor(IMG_NAME_LAYOUT_FLAT);
-	
-	public static final ImageDescriptor IMG_DESC_LAYOUT_HIERARCHICAL = AuthoringUIPlugin
-			.getDefault().getImageDescriptor(IMG_NAME_LAYOUT_HIERARCHICAL);
-
-	public static final Image IMG_BACK = PlatformUI.getWorkbench()
-			.getSharedImages().getImage(ISharedImages.IMG_TOOL_BACK);
-
-	public static final Image IMG_COLLAPSED = AuthoringUIPlugin.getDefault()
-			.getSharedImage(IMG_NAME_COLLAPSED);
-
-	public static final Image IMG_EXPANDED = AuthoringUIPlugin.getDefault()
-			.getSharedImage(IMG_NAME_EXPANDED);
-
-	public static final Image IMG_FORWARD = PlatformUI.getWorkbench()
-			.getSharedImages().getImage(ISharedImages.IMG_TOOL_FORWARD);
-
-	public static final Image IMG_REFRESH = AuthoringUIPlugin.getDefault()
-			.getSharedImage(IMG_NAME_REFRESH);
-
-	public static final Image IMG_STOP = AuthoringUIPlugin.getDefault()
-			.getSharedImage(IMG_NAME_STOP);
-
-	public static final Image IMG_PRINT = AuthoringUIPlugin.getDefault()
-			.getSharedImage(IMG_NAME_PRINT);
-	
-	public static final Image IMG_OVR_ERROR = AuthoringUIPlugin.getDefault()
-			.getSharedImage(IMG_NAME_OVR_ERROR);
-
-	public static final Image IMG_LAYOUT_FLAT = AuthoringUIPlugin.getDefault()
-			.getSharedImage(IMG_NAME_LAYOUT_FLAT);
-
-	public static final Image IMG_LAYOUT_HIERARCHICAL = AuthoringUIPlugin.getDefault()
-			.getSharedImage(IMG_NAME_LAYOUT_HIERARCHICAL);
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIPlugin.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIPlugin.java
deleted file mode 100755
index 83c9fdd..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIPlugin.java
+++ /dev/null
@@ -1,87 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui;
-
-import org.eclipse.epf.authoring.ui.internal.ImageDescriptorRegistry;
-import org.eclipse.epf.authoring.ui.internal.ProblemMarkerManager;
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The Authoring UI plug-in class.
- * 
- * @author Kelvin Low
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class AuthoringUIPlugin extends AbstractPlugin {
-
-	// The shared plug-in instance.
-	private static AuthoringUIPlugin plugin;
-
-	private ProblemMarkerManager fProblemMarkerManager;
-	private ImageDescriptorRegistry fImageDescriptorRegistry;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public AuthoringUIPlugin() {
-		super();
-		plugin = this;
-	}
-
-	
-	/**
-	 * @see org.eclipse.epf.common.plugin.AbstractPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		
-		// Initialize the Authoring UI service.
-		AuthoringUIService.getInstance().start();
-	}
-
-	/**
-	 * @see org.eclipse.epf.common.plugin.AbstractPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared plug-in instance.
-	 */
-	public static AuthoringUIPlugin getDefault() {
-		return plugin;
-	}
-	
-	public synchronized ProblemMarkerManager getProblemMarkerManager() {
-		if (fProblemMarkerManager == null)
-			fProblemMarkerManager= new ProblemMarkerManager();
-		return fProblemMarkerManager;
-	}
-	
-	public static ImageDescriptorRegistry getImageDescriptorRegistry() {
-		return getDefault().internalGetImageDescriptorRegistry();
-	}
-
-	private synchronized ImageDescriptorRegistry internalGetImageDescriptorRegistry() {
-		if (fImageDescriptorRegistry == null)
-			fImageDescriptorRegistry= new ImageDescriptorRegistry();
-		return fImageDescriptorRegistry;
-	}
-	
-	public static void log(Throwable t) {
-		getDefault().getLogger().logError(t);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIResources.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIResources.java
deleted file mode 100755
index 689a64a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIResources.java
+++ /dev/null
@@ -1,1911 +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.authoring.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Authoing UI resources
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public final class AuthoringUIResources extends NLS {
-
-	private static String BUNDLE_NAME = AuthoringUIResources.class.getPackage()
-			.getName()
-			+ ".Resources"; //$NON-NLS-1$
-
-	private AuthoringUIResources() {
-		// Do not instantiate.
-	}
-
-	public static String ConfigurationOrderDialog_description;
-
-	public static String ConfigurationOrderDialog_NavigationViews;
-
-	public static String editor_error_activated_outofsync_title;
-
-	public static String editor_error_activated_outofsync_message;
-
-	public static String assignPage_title;
-
-	public static String categoriesPage_title;
-
-	public static String deliverablePartsPage_title;
-
-	public static String descriptionPage_title;
-
-	public static String disciplinesPage_title;
-
-	public static String discardunresolvedref;
-
-	public static String guidancePage_title;
-
-	public static String previewPage_title;
-
-	public static String promptDeleteCustomCategoryBeforeRemoveLastRefToIt;
-
-	public static String referencesPage_title;
-
-	public static String reference_text;
-
-	public static String referenceWorkflowPage_title;
-
-	public static String rolesPage_title;
-
-	public static String roleSetsPage_title;
-
-	public static String stepsPage_title;
-
-	public static String tasksPage_title;
-
-	public static String toolMentorsPage_title;
-
-	public static String workProductsPage_title;
-
-	public static String checkItemsSection_name;
-
-	public static String checkItemsSection_desc;
-
-	public static String dependenciesSection_name;
-
-	public static String dependenciesSection_desc;
-
-	public static String detailSection_name;
-
-	public static String detailSection_desc;
-
-	public static String generalInfoSection_name;
-
-	public static String generalInfoSection_desc;
-
-	public static String iconSection_name;
-
-	public static String iconSection_desc;
-
-	public static String notationSection_name;
-
-	public static String notationSection_desc;
-
-	public static String referencedPluginsSection_name;
-
-	public static String referencedPluginsSection_desc;
-
-	public static String staffingSection_name;
-
-	public static String staffingSection_desc;
-
-	public static String stepsSection_name;
-
-	public static String stepsSection_desc;
-
-	public static String tailoringSection_name;
-
-	public static String tailoringSection_desc;
-
-	public static String variabilitySection_name;
-
-	public static String variabilitySection_desc;
-
-	public static String versionInfoSection_name;
-
-	public static String versionInfoSection_desc;
-
-	public static String additionalInfo_text;
-
-	public static String application_text;
-
-	public static String actionLabel_edit;
-
-	public static String actionLabel_findElementInLibNav;
-
-	public static String alternatives_text;
-
-	public static String assignmentApproaches_text;
-
-	public static String authors_text;
-
-	public static String background_text;
-
-	public static String baseElement_text;
-
-	public static String baseGuidance_text;
-
-	public static String briefDescription_text;
-
-	public static String description_text;
-
-	public static String backupbeforesave_text;
-
-	public static String briefOutline_text;
-
-	public static String changeDate_text;
-
-	public static String changeDescription_text;
-
-	public static String checkItems_text;
-
-	public static String contributes_text;
-
-	public static String localContributes_text;
-
-	public static String contributes_to_text;
-
-	public static String copyright_text;
-
-	public static String editor_text;
-
-	public static String extends_text;
-
-	public static String extend_text;
-
-	public static String externalDescription_text;
-
-	public static String externalId_text;
-
-	public static String goals_text;
-
-	public static String impactOfNotHaving_text;
-
-	public static String keyConsiderations_text;
-
-	public static String levelsOfAdoption_text;
-
-	public static String mainDescription_text;
-
-	public static String newElement_text;
-
-	public static String name_text;
-
-	public static String notApplicable_text;
-
-	public static String packagingGuidance_text;
-
-	public static String presentationName_text;
-
-	public static String promptforlibary_text;
-
-	public static String enableHealthCheck_text;
-
-	public static String problem_text;
-
-	public static String purpose_text;
-
-	public static String reasonForNotNeeding_text;
-
-	public static String replaces_text;
-
-	public static String localReplaces_text;
-
-	public static String extendsReplaces_text;
-
-	public static String representationOptions_text;
-
-	public static String attachedFile_text;
-
-	public static String skills_text;
-
-	public static String steps_text;
-
-	public static String steps_name_text;
-
-	public static String stop_text;
-
-	public static String print_text;
-
-	public static String synonyms_text;
-
-	public static String type_text;
-
-	public static String copy_text;
-
-	public static String deepCopy_text;
-
-	public static String back_text;
-
-	public static String new_plugin;
-
-	public static String move;
-
-	public static String uniqueId_text;
-
-	public static String variabilityType_text;
-
-	public static String version_text;
-
-	public static String addButton_text;
-
-	public static String attachButton_text;
-
-	public static String browseButton_text;
-
-	public static String changeTypeButton_text;
-
-	public static String clearButton_text;
-
-	public static String deleteButton_text;
-
-	public static String detachButton_text;
-
-	public static String diagram_saveError;
-
-	public static String downButton_text;
-
-	public static String directory_text;
-
-	public static String orderButton_text;
-
-	public static String editButton_text;
-
-	public static String removeButton_text;
-
-	public static String renameAction_text;
-
-	public static String remove_text;
-
-	public static String rename_text;
-
-	public static String SaveAs_text;
-
-	public static String selectButton_text;
-
-	public static String deselectButton_text;
-
-	public static String upButton_text;
-
-	public static String makeDefaultButton_text;
-
-	public static String viewHistoryButton_text;
-
-	public static String roleTasksPage_sectionName;
-
-	public static String roleTasksPage_sectionDescription;
-
-	public static String roleTasksPage_availableLabel;
-
-	public static String roleTasksPage_selectedLabel;
-
-	public static String roleTasksPage_selectedLabel2;
-
-	public static String roleTasksPage_multipleSelectDescription;
-
-	public static String roleWorkProductsPage_sectionName;
-
-	public static String roleWorkProductsPage_sectionDescription;
-
-	public static String roleWorkProductsPage_availableLabel;
-
-	public static String roleWorkProductsPage_selectedLabel;
-
-	public static String roleWorkProductsPage_selectedLabel2;
-
-	public static String roleWorkProductsPage_multipleSelectDescription;
-
-	public static String roleGuidancePage_sectionName;
-
-	public static String roleGuidancePage_sectionDescription;
-
-	public static String roleGuidancePage_availableLabel;
-
-	public static String roleGuidancePage_selectedLabel;
-
-	public static String roleGuidancePage_multipleSelectDescription;
-
-	public static String roleCategoriesPage_sectionName;
-
-	public static String roleCategoriesPage_sectionDescription;
-
-	public static String roleCategoriesPage_availableLabel;
-
-	public static String roleCategoriesPage_availableLabel2;
-
-	public static String roleCategoriesPage_selectedLabel;
-
-	public static String roleCategoriesPage_selectedLabel2;
-
-	public static String taskRolesPage_sectionName;
-
-	public static String taskRolesPage_sectionDescription;
-
-	public static String taskRolesPage_availableLabel;
-
-	public static String taskRolesPage_selectedLabel;
-
-	public static String taskRolesPage_selectedLabel2;
-
-	public static String taskRolesPage_multipleSelectDescription;
-
-	public static String taskRolesPage_primaryPerformer_modify_message;
-
-	public static String taskRolesPage_confirm_title;
-
-	public static String taskWorkProductsPage_sectionName;
-
-	public static String taskWorkProductsPage_sectionDescription;
-
-	public static String taskWorkProductsPage_availableLabel;
-
-	public static String taskWorkProductsPage_selectedLabel;
-
-	public static String taskWorkProductsPage_selectedLabel2;
-
-	public static String taskWorkProductsPage_selectedLabel3;
-
-	public static String taskWorkProductsPage_multipleSelectDescription;
-
-	public static String taskGuidancePage_sectionName;
-
-	public static String taskGuidancePage_sectionDescription;
-
-	public static String taskGuidancePage_availableLabel;
-
-	public static String taskGuidancePage_selectedLabel;
-
-	public static String taskGuidancePage_multipleSelectDescription;
-
-	public static String taskCategoriesPage_sectionName;
-
-	public static String taskCategoriesPage_sectionDescription;
-
-	public static String taskCategoriesPage_availableLabel;
-
-	public static String taskCategoriesPage_availableLabel2;
-
-	public static String taskCategoriesPage_selectedLabel;
-
-	public static String taskCategoriesPage_selectedLabel2;
-
-	public static String MarkerResolutionGenerator_removeUnresolvedReference;
-
-	public static String MarkerResolutionGenerator_showOwnerInLibraryView;
-
-	public static String WorkProduct_Tasks_SectionName;
-
-	public static String WorkProduct_Tasks_SectionDescription;
-
-	public static String WorkProduct_Tasks_AvailableLabel;
-
-	public static String WorkProduct_Tasks_SelectedLabel;
-
-	public static String WorkProduct_Tasks_SelectedLabel2;
-
-	public static String WorkProduct_Tasks_SelectedLabel3;
-
-	public static String WorkProduct_Tasks_MultipleSelectDescription;
-
-	public static String workProductRolesPage_sectionName;
-
-	public static String workProductRolesPage_sectionDescription;
-
-	public static String workProductRolesPage_availableLabel;
-
-	public static String workProductRolesPage_selectedLabel;
-
-	public static String workProductRolesPage_selectedLabel2;
-
-	public static String workProductRolesPage_multipleSelectDescription;
-
-	public static String workProductDeliverablePartsPage_sectionName;
-
-	public static String workProductDeliverablePartsPage_sectionDescription;
-
-	public static String workProductDeliverablePartsPage_availableLabel;
-
-	public static String workProductDeliverablePartsPage_selectedLabel;
-
-	public static String workProductDeliverablePartsPage_multipleSelectDescription;
-
-	public static String workProductGuidancePage_sectionName;
-
-	public static String workProductGuidancePage_sectionDescription;
-
-	public static String workProductGuidancePage_availableLabel;
-
-	public static String workProductGuidancePage_selectedLabel;
-
-	public static String workProductGuidancePage_multipleSelectDescription;
-
-	public static String workProductCategoriesPage_sectionName;
-
-	public static String workProductCategoriesPage_sectionDescription;
-
-	public static String workProductCategoriesPage_availableLabel;
-
-	public static String workProductCategoriesPage_availableLabel2;
-
-	public static String workProductCategoriesPage_availableLabel3;
-
-	public static String workProductCategoriesPage_selectedLabel;
-
-	public static String workProductCategoriesPage_selectedLabel2;
-
-	public static String workProductCategoriesPage_selectedLabel3;
-
-	public static String practiceReferencesPage_sectionName;
-
-	public static String practiceReferencesPage_sectionDescription;
-
-	public static String practiceReferencesPage_availableLabel;
-
-	public static String practiceReferencesPage_selectedLabel;
-
-	public static String practiceReferencesPage_multipleSelectDescription;
-
-	public static String categoryGuidancesPage_sectionName;
-
-	public static String categoryGuidancesPage_sectionDescription;
-
-	public static String categoryGuidancesPage_availableLabel;
-
-	public static String categoryGuidancesPage_selectedLabel;
-
-	public static String categoryGuidancesPage_multipleSelectDescription;
-
-	public static String disciplineGroupingDisciplinesPage_sectionName;
-
-	public static String disciplineGroupingDisciplinesPage_sectionDescription;
-
-	public static String disciplineGroupingDisciplinesPage_availableLabel;
-
-	public static String disciplineGroupingDisciplinesPage_selectedLabel;
-
-	public static String disciplineGroupingDisciplinesPage_multipleSelectDescription;
-
-	public static String AuthoringUIPlugin_AbstractNewLibraryPage_UseDefaultDirectoryButtonLabel;
-
-	public static String disciplineTasksPage_sectionName;
-
-	public static String disciplineTasksPage_sectionDescription;
-
-	public static String disciplineTasksPage_availableLabel;
-
-	public static String disciplineTasksPage_selectedLabel;
-
-	public static String disciplineTasksPage_multipleSelectDescription;
-
-	public static String disciplineReferenceWorkflowPage_sectionName;
-
-	public static String disciplineReferenceWorkflowPage_sectionDescription;
-
-	public static String disciplineReferenceWorkflowPage_availableLabel;
-
-	public static String disciplineReferenceWorkflowPage_selectedLabel;
-
-	public static String disciplineReferenceWorkflowPage_multipleSelectDescription;
-
-	public static String domainWorkProductsPage_sectionName;
-
-	public static String domainWorkProductsPage_sectionDescription;
-
-	public static String domainWorkProductsPage_availableLabel;
-
-	public static String domainWorkProductsPage_selectedLabel;
-
-	public static String domainWorkProductsPage_multipleSelectDescription;
-
-	public static String workProductTypeWorkProductsPage_sectionName;
-
-	public static String workProductTypeWorkProductsPage_sectionDescription;
-
-	public static String workProductTypeWorkProductsPage_availableLabel;
-
-	public static String workProductTypeWorkProductsPage_selectedLabel;
-
-	public static String workProductTypeWorkProductsPage_multipleSelectDescription;
-
-	public static String roleSetGroupingRoleSetsPage_sectionName;
-
-	public static String roleSetGroupingRoleSetsPage_sectionDescription;
-
-	public static String roleSetGroupingRoleSetsPage_availableLabel;
-
-	public static String roleSetGroupingRoleSetsPage_selectedLabel;
-
-	public static String roleSetGroupingRoleSetsPage_multipleSelectDescription;
-
-	public static String roleSetRolesPage_sectionName;
-
-	public static String roleSetRolesPage_sectionDescription;
-
-	public static String roleSetRolesPage_availableLabel;
-
-	public static String roleSetRolesPage_selectedLabel;
-
-	public static String roleSetRolesPage_multipleSelectDescription;
-
-	public static String toolToolMentorsPage_sectionName;
-
-	public static String toolToolMentorsPage_sectionDescription;
-
-	public static String toolToolMentorsPage_availableLabel;
-
-	public static String toolToolMentorsPage_selectedLabel;
-
-	public static String toolToolMentorsPage_multipleSelectDescription;
-
-	public static String customCategoryAssignPage_sectionName;
-
-	public static String customCategoryAssignPage_sectionDescription;
-
-	public static String customCategoryAssignPage_availableLabel;
-
-	public static String customCategoryAssignPage_selectedLabel;
-
-	public static String customCategoryAssignPage_multipleSelectDescription;
-
-	public static String newPluginWizard_title;
-
-	public static String newPluginWizardPage_title;
-
-	public static String newPluginWizardPage_text;
-
-	public static String newPluginError_msg;
-
-	public static String newPluginError_reason;
-
-	public static String createDialog_title;
-
-	public static String deleteDialog_title;
-
-	public static String editDialog_title;
-
-	public static String errorDialog_title;
-
-	public static String moveDialog_title;
-
-	public static String renameDialog_title;
-
-	public static String warningDialog_title;
-
-	public static String addConfigErrorDialog_title;
-
-	public static String setDefaultConfigErrorDialog_title;
-
-	public static String editProcessElementErrorDialog_title;
-
-	public static String openLibraryDialog_title;
-
-	public static String openLibraryDialog_text;
-
-	public static String saveLibraryDialog_title;
-
-	public static String saveLibraryDialog_text;
-
-	public static String upgradeLibraryDialog_title;
-
-	public static String deleteAssociationDialog_text;
-
-	public static String noOpenLibraryError_msg;
-
-	public static String emptyElementNameError_msg;
-
-	public static String duplicateElementNameError_msg;
-
-	public static String createConfigError_msg;
-
-	public static String deleteConfigError_msg;
-
-	public static String internalError_msg;
-
-	public static String invalidPresentationNameError_msg;
-
-	public static String invalidConfigError_msg;
-
-	public static String setDefaultConfigError_msg;
-
-	public static String openLibraryError_msg;
-
-	public static String saveLibraryError_msg;
-
-	public static String saveLibraryToError_msg;
-
-	public static String elementAlreadyDeletedError_msg;
-
-	public static String upgradeLibraryError_msg;
-
-	public static String error_reason;
-
-	public static String internalError_reason;
-
-	public static String upgradeLibraryError_reason;
-
-	public static String saveUpgradedLibraryError_reason;
-
-	public static String openingLibraryTask_name;
-
-	public static String savingLibraryTask_name;
-
-	public static String upgradingLibraryTask_name;
-
-	public static String loadingLibraryElementsTask_name;
-
-	public static String savingUpgradedElementsTask_name;
-
-	public static String savingTask_name;
-
-	public static String savingFilesTask_name;
-
-	public static String fixingContentDescriptionGUIDsTask_name;
-
-	public static String deletingInvalidReferencesTask_name;
-
-	public static String addEditorToPerspectiveWarning_msg;
-
-	public static String ChangeHistoryDialog_title;
-
-	public static String ChangeHistoryDialog_label;
-
-	public static String confirmDeleteDialog_title;
-
-	public static String confirmDeleteDialog_msg;
-
-	public static String confirmDeleteDialog_msgWithReference;
-
-	public static String errorDialog_message;
-
-	public static String errorDialog_error;
-
-	public static String err_noopenlibrary;
-
-	public static String err_loadinglibrary;
-
-	public static String msg_reloadLibrary;
-
-	public static String reloadDialog_message;
-
-	public static String reloadDialog_title;
-
-	public static String dialogs_MoveDialog_errorTitle;
-
-	public static String dialogs_MoveDialog_errorMessage;
-
-	public static String processFormEditorSaveDialog_title;
-
-	public static String processFormEditorSaveDialog_message1;
-
-	public static String processFormEditorSaveDialog_message2;
-
-	public static String configViewPageRemoveViewDialog_title;
-
-	public static String configViewPageRemoveViewDialog_message;
-
-	public static String configViewPageViewExistsDialog_title;
-
-	public static String configViewPage_configuration;
-
-	public static String configViewPage_configurationViews;
-
-	public static String configViewPage_views;
-
-	public static String columnselection_text;
-
-	public static String configViewPage_addViewButtonText;
-
-	public static String configViewPage_removeViewButtonText;
-
-	public static String configViewPage_makeDefaultButtonText;
-
-	public static String configViewPageViewExistsDialog_message;
-
-	public static String configViewPage_configurationViewSectionTitle;
-
-	public static String configViewPage_configurationViewSectionMessage;
-
-	public static String descriptionTabGuidanceWarningDialog_title;
-
-	public static String descriptionTabGuidanceWarningDialog_message1;
-
-	public static String descriptionTabGuidanceWarningDialog_message2;
-
-	public static String changeActivityTypeWarningDialog_title;
-
-	public static String AssociationFormPage_BriefDescriptionLabel;
-
-	public static String methodElementDescriptionEmptyNameDialog_title;
-
-	public static String methodElementDescriptionEmptyNameDialog_message;
-
-	public static String methodPluginDescriptionRemoveRefConfirm_message;
-
-	public static String methodPluginDescriptionPage_confirmRename;
-
-	public static String methodPluginDescriptionPage_confirmRename_title;
-
-	public static String methodPluginDescriptionPage_cannotRenamePluginFolder;
-
-	public static String methodPluginDescriptionPage_lockPluginLabel;
-
-	public static String methodPluginDescriptionPage_lockPlugin_message;
-
-	public static String processDescriptionNameChangeConfirm_title;
-
-	public static String processDescriptionNameChangeConfirm_message;
-
-	public static String processDescription_configurationDescription;
-
-	public static String processDescription_configurationSectionTitle;
-
-	public static String processDescription_configurationSectionMessage;
-
-	public static String processDescription_configurations;
-
-	public static String processDescription_default;
-
-	public static String ProcessDescription_selectConfiguration;
-
-	public static String ProcessDeleteAction_deletecofirm_text0;
-
-	public static String ProcessDeleteAction_selectDescriptorsToDelete;
-
-	public static String viewHelperHealthCheckDialog_title;
-
-	public static String viewHelper_performHealthCheck;
-
-	public static String viewHelperHealthCheckDialog_message;
-
-	public static String attachGuidanceFileDialog_title;
-
-	public static String createElementDialog_title;
-
-	public static String createNewElementError_msg;
-
-	public static String dlgTitle_reloadLibrary;
-
-	public static String createElementError_reason;
-
-	public static String deleteConfigError_reason;
-
-	public static String gef_changeBoundsCommand_label;
-
-	public static String gef_changeNameCommand_label;
-
-	public static String gef_changeNameCommand_undoMessage;
-
-	public static String gef_changePropertyValueCommand_label;
-
-	public static String gef_createBendpointCommand_label;
-
-	public static String gef_createLinkCommand_label;
-
-	public static String gef_createNodeCommand_label;
-
-	public static String gef_deleteBendpointCommand_label;
-
-	public static String gef_deleteCommand_label;
-
-	public static String gef_deleteLinkCommand_label;
-
-	public static String gef_moveBendpointCommand_label;
-
-	public static String gef_reconnectLinkCommand_label;
-
-	public static String gef_validatingDirectEditManager_bringDownPrompt;
-
-	public static String gef_validatingFreeTextEditManager_bringDownPrompt;
-
-	public static String gef_workProductNodeEditPart_validateMessage;
-
-	public static String actions_ElementsViewDeleteAction_message;
-
-	public static String actions_LibraryActionBarContributor_deleteErrorTitle;
-
-	public static String actions_LibraryActionBarContributor_deleteErrorMessage;
-
-	public static String actions_LibraryActionBarContributor_deleteErrorReason;
-
-	public static String editors_MethodElementEditor_saveErrorTitle;
-
-	public static String editors_MethodElementEditor_saveErrorMessage1;
-
-	public static String editors_MethodElementEditor_saveErrorMessage2;
-
-	public static String editors_MethodElementEditor_saveErrorReason1;
-
-	public static String editors_MethodElementEditor_saveErrorReason2;
-
-	public static String editors_MethodElementEditor_renameErrorTitle;
-
-	public static String editors_MethodElementEditor_invalidEditorMsg;
-
-	public static String editors_MethodElementEditor_invalidEditorTitle;
-
-	public static String editors_MethodElementEditor_renameErrorMessage1;
-
-	public static String renameError_title;
-
-	public static String renameError_msg;
-
-	public static String SelectElementDialog_selectelement_text;
-
-	public static String editors_EditorChooser_systemErrorDialog_title;
-
-	public static String AuthoringUIPlugin_AbstractNewLibraryPage_DescriptionLabel;
-
-	public static String AuthoringUIPlugin_SaveAllEditorsPage_SelectAllButtonLabel;
-
-	public static String OpenElementWorkbenchActionDelegate_edit_text0;
-
-	public static String editors_EditorChooser_systemErrorDialog_message;
-
-	public static String DescriptionFormPage_IconFileChooserDialog_title;
-
-	public static String AuthoringUIPlugin_AbstractNewLibraryPage_DefaultLibraryName;
-
-	public static String AuthoringUIPlugin_NewConfigurationMainPage_DescriptionLabel;
-
-	public static String AuthoringUIPlugin_OpenConfigurationMainPage_pageDescription;
-
-	public static String AuthoringUIPlugin_SaveAllEditorsPage_DeselectAllButtonLabel;
-
-	public static String ElementsView_migration_dir_dlg_description_text;
-
-	public static String editors_EditorChooser_systemErrorDialog_reason;
-
-	public static String forms_DescriptionFormPage_imageTooBigDialog_title;
-
-	public static String forms_DescriptionFormPage_imageTooBigDialog_template;
-
-	public static String forms_DescriptionFormPage_imageNotFoundDialog_title;
-
-	public static String forms_DescriptionFormPage_imageNotFoundDialog_template;
-
-	public static String DescriptionFormPage_ShapeIconPreview_SelectButtonLabel;
-
-	public static String AuthoringUIPlugin_AbstractNewLibraryPage_DefaultLibraryDescription;
-
-	public static String AuthoringUIPlugin_NewConfigurationMainPage_DefaultBriefDescription;
-
-	public static String AuthoringUIPlugin_SaveAllEditorsPage_saveAndClosePageDescription;
-
-	public static String forms_GuidanceWithAttachmentsDescriptionPage_alreadyAttached_msg;
-
-	public static String newLibraryError_msg;
-
-	public static String newLibraryInternlError_reason;
-
-	public static String newLibraryError_reason1;
-
-	public static String newLibraryError_reason2;
-
-	public static String newLibraryError_reason3;
-
-	public static String newLibraryError_advice;
-
-	public static String Process_ExternalID;
-
-	public static String Process_Purpose;
-
-	public static String Process_Scope;
-
-	public static String Process_UsageNotes;
-
-	public static String Process_Alternatives;
-
-	public static String Process_HowToStaff;
-
-	public static String Process_KeyConsideration;
-
-	public static String Process_Scale;
-
-	public static String Process_ProjectCharacteristics;
-
-	public static String Process_RiskLevel;
-
-	public static String Process_EstimatingTechnique;
-
-	public static String Process_ProjectMemberExpertise;
-
-	public static String Process_TypeOfContract;
-
-	public static String backButton_text;
-
-	public static String forwardButton_text;
-
-	public static String forward_text;
-
-	public static String stopButton_text;
-
-	public static String refreshButton_text;
-
-	public static String refresh_text;
-
-	public static String newname_text;
-
-	public static String printButton_text;
-
-	public static String _UI_RefreshViewer_menu_item;
-
-	public static String _UI_ShowPropertiesView_menu_item;
-
-	public static String _UI_MethodEditor_menu;
-
-	public static String _UI_CreateChild_menu_item;
-
-	public static String _UI_CreateSibling_menu_item;
-
-	public static String _UI_SelectionPage_label;
-
-	public static String _UI_ParentPage_label;
-
-	public static String _UI_ListPage_label;
-
-	public static String _UI_TreePage_label;
-
-	public static String _UI_TablePage_label;
-
-	public static String _UI_TableTreePage_label;
-
-	public static String _UI_ObjectColumn_label;
-
-	public static String _UI_SelfColumn_label;
-
-	public static String _UI_NoObjectSelected;
-
-	public static String _UI_SingleObjectSelected;
-
-	public static String _UI_MultiObjectSelected;
-
-	public static String _UI_OpenEditorError_label;
-
-	public static String _UI_Wizard_category;
-
-	public static String _UI_MethodModelWizard_label;
-
-	public static String _UI_MethodModelWizard_description;
-
-	public static String _UI_MethodEditor_label;
-
-	public static String _UI_MethodEditorFilenameDefaultBase;
-
-	public static String _UI_MethodEditorFilenameExtension;
-
-	public static String _UI_Wizard_label;
-
-	public static String _WARN_FilenameExtension;
-
-	public static String _UI_ModelObject;
-
-	public static String _UI_XMLEncoding;
-
-	public static String _UI_XMLEncodingChoices;
-
-	public static String _UI_Wizard_initial_object_description;
-
-	public static String _UI_FileConflict_label;
-
-	public static String _WARN_FileConflict;
-
-	public static String addLinkDialog_linkType;
-
-	public static String openLinkCheckbox_text;
-
-	public static String heightLabel_text;
-
-	public static String widthLabel_text;
-
-	public static String ElementsView_20;
-
-	public static String ElementsView_21;
-
-	public static String ElementsView_22;
-
-	public static String ElementsView_35;
-
-	public static String ElementsView_36;
-
-	public static String altTagLabel_text;
-
-	public static String imageSizeLabel_text;
-
-	public static String ProcessEditor;
-
-	public static String ProcessEditor_Name;
-
-	public static String ProcessEditor_PresentationName;
-
-	public static String ProcessEditor_Index;
-
-	public static String ProcessEditor_Predecessors;
-
-	// public static String ConfigurationPage_Selected;
-	public static String ChecklistOrder_description;
-
-	public static String ElementsView_renaming_text;
-
-	public static String ProcessEditor_ModelInfo;
-
-	public static String ProcessEditor_Prefix;
-
-	public static String MoveDialog_move_text;
-
-	public static String ChecklistOrder_title;
-
-	public static String ProcessEditor_Repetable;
-
-	public static String ProcessEditor_Ongoing;
-
-	public static String ProcessEditor_Action_Synchronization;
-
-	public static String ProcessEditor_EventDriven;
-
-	public static String ProcessEditor_Deliverable;
-
-	public static String ProcessEditor_Optional;
-
-	public static String FilterDialog_Type_text;
-
-	public static String FilterDialog_ExpandAll;
-
-	public static String MoveDialog_moving_text;
-
-	public static String DescriptionFormPage_LoadShapeIconWarning;
-
-	public static String DescriptionFormPage_LoadShapeIconError;
-
-	public static String AuthoringUIPlugin_AbstractNewLibraryPage_NameLabel;
-
-	public static String AuthoringUIPlugin_NewConfigurationMainPage_pageTitle;
-
-	public static String AuthoringUIPlugin_NewConfigurationMainPage_NameLabel;
-
-	public static String AuthoringUIPlugin_newConfigurationWizard_title;
-
-	public static String newLibraryWizard_title;
-
-	public static String newLibraryWizardMainPage_title;
-
-	public static String newLibraryWizardMainPage_description;
-
-	public static String newLibraryWizardMainPage_description_2;
-
-	public static String libraryPathLabel_text;
-
-	public static String libraryTypeLabel_text;
-
-	public static String AuthoringUIPlugin_SaveAllEditorsPage_saveTitle;
-
-	public static String AuthoringUIPlugin_SaveAllEditorsPage_saveDescription;
-
-	public static String AuthoringUIPlugin_OpenConfigurationMainPage_pageTitle;
-
-	public static String AuthoringUIPlugin_OpenConfigurationWizard_windowTitle;
-
-	public static String ElementsView_replaceingwithformat_text;
-
-	public static String DescriptionFormPage_LoadNodeIconWarning;
-
-	public static String MessageLabelProvider_unselectedpackages;
-
-	public static String DescriptionFormPage_LoadNodeIconError;
-
-	public static String StepsOrderDialog_steps;
-
-	public static String StepsOrderDialog_title;
-
-	public static String ProcessEditor_Planned;
-
-	public static String specifydirectory_text;
-
-	public static String ProcessEditor_MultipleOccurrences;
-
-	public static String ProcessEditor_EntryState;
-
-	public static String ProcessEditor_ExitState;
-
-	public static String selectColumnstoAdd_text;
-
-	public static String ProcessEditor_Type;
-
-	public static String ProcessEditor_Team;
-
-	public static String FilterDialog_title;
-
-	public static String ProcessEditor_Action_Add;
-
-	public static String FilterDialog_CollapseAll;
-
-	public static String OpenCheatsheetView_title;
-
-	public static String ProcessEditor_Action_RollUp;
-
-	public static String ProcessEditor_Action_RollDown;
-
-	public static String ProcessEditor_Action_MoveUp;
-
-	public static String ProcessEditor_Action_MoveDown;
-
-	public static String ProcessEditor_Action_Reveal;
-
-	public static String ProcessEditor_Action_Copy;
-
-	public static String FilterDialog_Pattern_text;
-
-	public static String MethodLibraryEditor_title;
-
-	// public static String MessageView_selected_text;
-	public static String MessageView_errmsg_text;
-
-	public static String ElementsView_err_saving;
-
-	public static String err_copying_file_title;
-
-	public static String err_copying_file_error;
-
-	public static String err_copying_file_reason;
-
-	public static String err_processing_file_title;
-
-	public static String editConfiguration_tooltip;
-
-	public static String editDialog_msgCannotEdit;
-
-	public static String SaveThisAction_saveobject;
-
-	public static String ElementsView_replace_text;
-
-	public static String ProcessEditor_Action_Extend;
-
-	public static String MoveDialog_destination_text;
-
-	public static String chooseDefaultDirectory_text;
-
-	public static String ProcessEditor_Action_Suppress;
-
-	public static String ProcessEditor_Action_Suppress2;
-
-	public static String ProcessEditor_Action_AssignUserDiagram;
-
-	public static String UserDefinedDiagramDialog_title;
-
-	public static String UserDefinedDiagramDialog_adImage;
-
-	public static String UserDefinedDiagramDialog_addImage;
-
-	public static String UserDefinedDiagramDialog_wpdImage;
-
-	public static String UserDefinedDiagramDialog_notaFile;
-
-	public static String UserDefinedDiagramDialog_assignButton;
-
-	public static String UserDefinedDiagramDialog_enteredImageNotFound;
-
-	public static String UserDefinedDiagramDialog_selectedImageNotFound;
-
-	public static String UserDefinedDiagramDialog_useADImage;
-
-	public static String UserDefinedDiagramDialog_useADDImage;
-
-	public static String UserDefinedDiagramDialog_useWPDImage;
-
-	public static String ProcessEditor_Action_Contribute;
-
-	public static String ProcessEditor_Action_Replace;
-
-	public static String ProcessEditor_Action_Diagrams;
-
-	public static String ProcessEditor_action_deepCopy;
-
-	public static String FilterDialog_BriefDescription;
-
-	public static String ConfigurationPage_hideToolTip;
-
-	public static String ConfigurationPage_Description;
-
-	public static String ProcessEditor_Action_SuppressAll;
-
-	public static String FilterDialog_Pattern_description;
-
-	public static String ConfigurationPage_TreeTitleLabel;
-
-	public static String ConfigurationPage_LoadingMessage;
-
-	public static String MoveDialog_validdestination_text;
-
-	public static String MoveDialog_cannotModifyDestination;
-
-	public static String ProcessEditor_Action_RevealAll;
-
-	public static String ProcessEditor_Action_OpenBaseActivity;
-
-	public static String ProcessFormEditor_expanAllActionLabel;
-
-	public static String ProcessFormEditor_collapseAllActionLabel;
-
-	public static String ProcessEditor_Action_OpenActivityDiagram;
-
-	public static String ProcessEditor_promptToDeleteBeforeReveal;
-
-	public static String ProcessEditorPreferencePage_SelectColumns;
-
-	public static String ProcessEditor_Action_OpenActivityDetailDiagram;
-
-	public static String ProcessEditorPreferencePage_ColumnSelection;
-
-	public static String ProcessEditorPreferencePage_switchConfiguration;
-
-	public static String ProcessEditorPreferencePage_suppressionGroupTitle;
-
-	public static String ProcessEditorPreferencePage_inheritSuppressionState;
-
-	public static String ProcessEditor_Action_OpenWorkProductDependencyDiagram;
-
-	public static String DescriptionFormPage_ShapeIconPreview_ClearButtonLabel;
-
-	public static String DescriptionFormPage_NodeIconPreview_SelectButtonLabel;
-
-	public static String ProcessEditor_Action_InsertNewPhase;
-
-	public static String ViewHelper_reloadLibOnRollbackError;
-
-	public static String ViewHelper_alreadydeleted_text;
-
-	public static String ViewHelper_alreadydeletedconfirm_text;
-
-	public static String ConfigurationPage_AddMissingToolTip;
-
-	public static String ConfigurationDescriptionDescription;
-
-	public static String ConfigurationDescriptionGeneralInfo;
-
-	public static String ProcessEditor_Action_ApplyPattern;
-
-	public static String MoveDialog_selectdestination_text;
-
-	public static String MoveDialog_nomove_destination_problem_msg;
-
-	public static String MethodLibraryEditor_troubleobject;
-
-	public static String MessageLabelProvider_errchildpkgs;
-
-	public static String ProcessEditor_SuppressDialog_Title;
-
-	public static String ProcessEditor_SuppressDialog_Message;
-
-	public static String ProcessEditor_Title;
-
-	public static String SaveAswithdots_text;
-
-	public static String ProcessEditor_WorkBreakdownStructure;
-
-	public static String ProcessEditor_TeamAllocation;
-
-	public static String ProcessEditor_WorkProductUsage;
-
-	public static String ProcessEditor_ConsolidatedView;
-
-	public static String ProcessEditor_confirmAutoSynch;
-
-	public static String ProcessEditor_defaultSynchronization;
-
-	public static String ConfigurationPage_Description1;
-
-	public static String ConfigurationPage_Description2;
-
-	public static String NewLibraryDialog_newlibrary_as;
-
-	public static String NewPluginDialog_newplugin_text;
-
-	public static String SelectElementDialog_title_text;
-
-	public static String OpenConfigDialognewconfig_text;
-
-	public static String processBreakdownStructureFormPage_BSEditor;
-
-	public static String AbstractDiagramEditor_alignMenu_text;
-
-	public static String AbstractDiagramEditor_refreshFromBaseActivity_text;
-
-	public static String AbstractDiagramEditor_formatTextBoxActivity_text;
-
-	public static String AbstractDiagramEditor_hAlignAverageAction_text;
-
-	public static String AbstractDiagramEditor_hAlignFirstSelectedAction_text;
-
-	public static String AbstractDiagramEditor_vAlignAverageAction_text;
-
-	public static String MethodLibraryDescriptionFormPage_section_title;
-
-	public static String MoveDialog_invalid_move_destination_problem_msg;
-
-	public static String MethodLibraryEditor_savemodellibrary;
-
-	public static String MethodLibraryEditor_error_dialog_title;
-
-	public static String MethodLibraryEditor_save_library_problem_msg;
-
-	public static String MethodElementDeleteAction_deleteconfirm_text;
-
-	public static String ContentElementsOrderDialog_ContentElement_text;
-
-	public static String AuthoringUIPlugin_AbstractNewLibraryPage_BrowseButtonLabel;
-
-	public static String AuthoringUIPlugin_NewConfigurationMainPage_pageDescription;
-
-	public static String AuthoringUIPlugin_SaveAllEditorsPage_saveAndClosePageTitle;
-
-	public static String AbstractDiagramEditor_vAlignFirstSelectedAction_text;
-
-	public static String AbstractDiagramEditor_Save_text;
-
-	public static String AttachmentDialogattachFile_text;
-
-	public static String ConfigurationPage_ConfigContent;
-
-	public static String OpenConfigDialogopenconfig_text;
-
-	public static String ElementsView_replaceAction_text;
-
-	public static String AbstractDiagramEditor_Save_message;
-
-	public static String ConfigurationPage_ShowErrorToolTip;
-
-	public static String ConfigurationDescriptionFormPrefix;
-
-	public static String ChecklistOrder_checklistitems_text;
-
-	public static String AbstractDiagramEditor_MoveNode_label;
-
-	public static String ConfigurationPage_MakeClosureToolTip;
-
-	public static String NewPluginDialog_referenceplugin_text;
-
-	public static String AbstractDiagramEditor_createFreeText_text;
-
-	public static String DescriptionFormPage_NodeIconPreview_Label;
-
-	public static String DiagramValidation_err_cannot_connect_text;
-
-	public static String DiagramValidation_err_samepredandsuc_text;
-
-	public static String EditorChooser_loaddErrorDlgTitle;
-
-	public static String EditorChooser_ResourcesError;
-
-	public static String ConfigurationPage_FormPrefix;
-
-	public static String ConfigurationDescriptionName;
-
-	public static String AttachmentDialogFileURL_text;
-
-	public static String StepsOrderDialog_description;
-
-	public static String MethodLibraryEditor_err_save;
-
-	public static String MessageView_errelement_text;
-
-	public static String MessageView_refelement_text;
-
-	public static String ActivityDiagramEditor_createStartNode_text;
-
-	public static String ConfigurationPage_ConfigContentDescription;
-
-	public static String ContentElementsOrderDialog_description_text;
-
-	public static String AuthoringUIPlugin_AbstractNewLibraryPage_DirectoryLabel;
-
-	public static String RootPrefPage_enableprocesscontribution_text;
-
-	public static String ConfigurationDescriptionDescription_text;
-
-	public static String ConfigurationDescriptionDescriptionLabel;
-
-	public static String ContributionSelection_filterdialog_title;
-
-	public static String ElementsView_openVariabilityDialogAction_text;
-
-	public static String VariabilitySelection_filterdialog_title;
-
-	public static String VariabilitySelection_filterdialog_viewerLabel;
-
-	public static String DescriptionFormPage_ShapeIconPreview_Label;
-
-	public static String DiagramValidation_err_cannot_delete_text;
-
-	public static String ActivityDiagramEditor_openActivityDetailDiagram_text;
-
-	public static String MethodLibraryDescriptionFormPage_section_description;
-
-	public static String DescriptionFormPage_NodeIconPreview_ClearButtonLabel;
-
-	public static String WPCompartmentFigure_0;
-
-	public static String promptfor_publish_unopen_activitydd_text;
-
-	public static String prompt_for_publish_extend_activity_diagram;
-
-	public static String ConfigProcessViewDialog_NamePattern;
-
-	public static String showInResourceNavigatorAction_label;
-
-	public static String ConfigProcessViewDialog_Pattern;
-
-	public static String err_processing_file_description;
-
-	public static String ConfigProcessViewDialog_CategoryType;
-
-	public static String ConfigProcessViewDialog_BriefDescription;
-
-	public static String ConfigProcessViewDialog_SelectCategories;
-
-	public static String cheatsheet_load_failure_log_msg;
-
-	public static String newConfigurationWirazd_createError;
-
-	public static String newPluginWizard_createError;
-
-	public static String errorDialog_moveError;
-
-	public static String renameDialog_renameError;
-
-	public static String errorDialog_createError;
-
-	public static String duplicatePluginNameError_msg;
-
-	public static String ProcessEditor_Action_AddADImage;
-
-	public static String ProcessEditor_refreshErrorTitle;
-
-	public static String ProcessEditor_refreshErrorMsg;
-
-	public static String ProcessEditor_Action_AddADDImage;
-
-	public static String ProcessEditor_Action_AddWPDImage;
-
-	public static String ProcessEditor_Action_UseADImageInPublishing;
-
-	public static String ProcessEditor_promptToDeleteBeforeSuppress;
-
-	public static String ProcessEditor_Action_UseADDImageInPublishing;
-
-	public static String ProcessEditor_Action_UseWPDImageInPublishing;
-
-	public static String ProcessEditor_DiagramImage_InputDialog_initialValue;
-
-	public static String ProcessEditor_Action_ShowLinkedElementinLibraryView;
-
-	public static String ProcessEditor_updateSuppressionFromBaseAction_label;
-
-	public static String ProcessEditor_ContextMenu_DiagramImages;
-
-	public static String synchronizationWizard_descriptionPage_title;
-
-	public static String synchronizationWizard_descriptionPage_text;
-
-	public static String synchronizationWizard_selectConfigPage_title;
-
-	public static String synchronizationWizard_selectConfigPage_text;
-
-	public static String synchronizationWizard_selectConfigPage_configLabel;
-
-	public static String synchronizationWizard_selectDetailsPage_title;
-
-	public static String synchronizationWizard_selectDetailsPage_properties_lable;
-
-	public static String synchronizationWizard_selectDetailsPage_name_lable;
-
-	public static String synchronizationWizard_selectDetailsPage_presentationName_lable;
-
-	public static String synchronizationWizard_selectDetailsPage_briefDesc_lable;
-
-	public static String synchronizationWizard_selectDetailsPage_optionalInouts_label;
-
-	public static String synchronizationWizard_selectDetailsPage_mandatoryInputs_lable;
-
-	public static String synchronizationWizard_selectDetailsPage_outputs_label;
-
-	public static String synchronizationWizard_selectDetailsPage_primaryPerformer_label;
-
-	public static String synchronizationWizard_selectDetailsPage_addnPerformers_lable;
-
-	public static String synchronizationWizard_selectDetailsPage_responsibleRoles_lable;
-
-	public static String synchronizationWizard_selectDetailsPage_contnArtifacts_label;
-
-	public static String synchronizationWizard_selectDetailsPage_dilvedParts_label;
-
-	public static String synchronizationWizard_selectDetailsPage_selSteps_label;
-
-	public static String synchronizationWizard_selectDetailsPage_text;
-
-	public static String synchronizationWizard_previewPage_title;
-
-	public static String synchronizationWizard_previewPage_text;
-
-	public static String selectEditorsToDiscardConflictChanges;
-
-	public static String synchronizationWizard_title_text;
-
-	public static String synchronizationWizard_descriptionPage_explainText;
-
-	public static String openRTE;
-
-	public static String closeRTE;
-
-	public static String ChangeHistoryDialog_delimiter;
-
-	public static String rolesets_guidancepage_sectiondescription;
-
-	public static String disciplines_guidancepage_sectiondescription;
-
-	public static String workproducttypes_guidancepage_sectiondescription;
-
-	public static String domains_guidancepage_sectiondescription;
-
-	public static String tools_guidancepage_sectiondescription;
-
-	public static String customcategory_guidancepage_sectiondescription;
-
-	public static String concept_guidancepage_sectiondescription;
-
-	public static String checklist_guidancepage_sectiondescription;
-
-	public static String example_guidancepage_sectiondescription;
-
-	public static String guideline_guidancepage_sectiondescription;
-
-	public static String roadmap_guidancepage_sectiondescription;
-
-	public static String reusableasset_guidancepage_sectiondescription;
-
-	public static String supportingmaterial_guidancepage_sectiondescription;
-
-	public static String report_guidancepage_sectiondescription;
-
-	public static String practice_guidancepage_sectiondescription;
-
-	public static String template_guidancepage_sectiondescription;
-
-	public static String termdefinition_guidancepage_sectiondescription;
-
-	public static String toolmentor_guidancepage_sectiondescription;
-
-	public static String whitepaper_guidancepage_sectiondescription;
-
-	public static String estimationconsideration_guidancepage_sectiondescription;
-
-	// New String Section Description
-	public static String role_detailSection_desc;
-
-	public static String role_generalInfoSection_desc;
-
-	public static String role_variabilitySection_desc;
-
-	public static String role_versionInfoSection_desc;
-
-	public static String task_detailSection_desc;
-
-	public static String task_generalInfoSection_desc;
-
-	public static String task_variabilitySection_desc;
-
-	public static String task_versionInfoSection_desc;
-
-	public static String artifact_detailSection_desc;
-
-	public static String artifact_generalInfoSection_desc;
-
-	public static String artifact_iconSection_desc;
-
-	public static String artifact_notationSection_desc;
-
-	public static String artifact_tailoringSection_desc;
-
-	public static String artifact_variabilitySection_desc;
-
-	public static String artifact_versionInfoSection_desc;
-
-	public static String outcome_detailSection_desc;
-
-	public static String outcome_generalInfoSection_desc;
-
-	public static String outcome_iconSection_desc;
-
-	public static String outcome_notationSection_desc;
-
-	public static String outcome_tailoringSection_desc;
-
-	public static String outcome_variabilitySection_desc;
-
-	public static String outcome_versionInfoSection_desc;
-
-	public static String deliverable_detailSection_desc;
-
-	public static String deliverable_generalInfoSection_desc;
-
-	public static String deliverable_iconSection_desc;
-
-	public static String deliverable_notationSection_desc;
-
-	public static String deliverable_tailoringSection_desc;
-
-	public static String deliverable_variabilitySection_desc;
-
-	public static String deliverable_versionInfoSection_desc;
-
-	public static String discipline_detailSection_desc;
-
-	public static String discipline_generalInfoSection_desc;
-
-	public static String discipline_variabilitySection_desc;
-
-	public static String discipline_versionInfoSection_desc;
-
-	public static String domain_detailSection_desc;
-
-	public static String domain_generalInfoSection_desc;
-
-	public static String domain_variabilitySection_desc;
-
-	public static String domain_versionInfoSection_desc;
-
-	public static String workproducttype_detailSection_desc;
-
-	public static String workproducttype_generalInfoSection_desc;
-
-	public static String workproducttype_variabilitySection_desc;
-
-	public static String workproducttype_versionInfoSection_desc;
-
-	public static String roleset_detailSection_desc;
-
-	public static String roleset_generalInfoSection_desc;
-
-	public static String roleset_variabilitySection_desc;
-
-	public static String roleset_versionInfoSection_desc;
-
-	public static String tool_detailSection_desc;
-
-	public static String tool_generalInfoSection_desc;
-
-	public static String tool_variabilitySection_desc;
-
-	public static String tool_versionInfoSection_desc;
-
-	public static String concept_detailSection_desc;
-
-	public static String concept_generalInfoSection_desc;
-
-	public static String concept_variabilitySection_desc;
-
-	public static String concept_versionInfoSection_desc;
-
-	public static String checklist_detailSection_desc;
-
-	public static String checklist_generalInfoSection_desc;
-
-	public static String checklist_variabilitySection_desc;
-
-	public static String checklist_versionInfoSection_desc;
-
-	public static String example_detailSection_desc;
-
-	public static String example_generalInfoSection_desc;
-
-	public static String example_variabilitySection_desc;
-
-	public static String example_versionInfoSection_desc;
-
-	public static String guideline_detailSection_desc;
-
-	public static String guideline_generalInfoSection_desc;
-
-	public static String guideline_variabilitySection_desc;
-
-	public static String guideline_versionInfoSection_desc;
-
-	public static String estimationconsideration_detailSection_desc;
-
-	public static String estimationconsideration_generalInfoSection_desc;
-
-	public static String estimationconsideration_variabilitySection_desc;
-
-	public static String estimationconsideration_versionInfoSection_desc;
-
-	public static String practice_detailSection_desc;
-
-	public static String practice_generalInfoSection_desc;
-
-	public static String practice_variabilitySection_desc;
-
-	public static String practice_versionInfoSection_desc;
-
-	public static String report_detailSection_desc;
-
-	public static String report_generalInfoSection_desc;
-
-	public static String report_variabilitySection_desc;
-
-	public static String report_versionInfoSection_desc;
-
-	public static String resuableasset_detailSection_desc;
-
-	public static String resuableasset_generalInfoSection_desc;
-
-	public static String resuableasset_variabilitySection_desc;
-
-	public static String resuableasset_versionInfoSection_desc;
-
-	public static String roadmap_detailSection_desc;
-
-	public static String roadmap_generalInfoSection_desc;
-
-	public static String roadmap_variabilitySection_desc;
-
-	public static String roadmap_versionInfoSection_desc;
-
-	public static String supportingmaterial_detailSection_desc;
-
-	public static String supportingmaterial_generalInfoSection_desc;
-
-	public static String supportingmaterial_variabilitySection_desc;
-
-	public static String supportingmaterial_versionInfoSection_desc;
-
-	public static String template_detailSection_desc;
-
-	public static String template_generalInfoSection_desc;
-
-	public static String template_variabilitySection_desc;
-
-	public static String template_versionInfoSection_desc;
-
-	public static String termdefinition_detailSection_desc;
-
-	public static String termdefinition_generalInfoSection_desc;
-
-	public static String termdefinition_variabilitySection_desc;
-
-	public static String termdefinition_versionInfoSection_desc;
-
-	public static String toolmentor_detailSection_desc;
-
-	public static String toolmentor_generalInfoSection_desc;
-
-	public static String toolmentor_variabilitySection_desc;
-
-	public static String toolmentor_versionInfoSection_desc;
-
-	public static String whitepaper_detailSection_desc;
-
-	public static String whitepaper_generalInfoSection_desc;
-
-	public static String whitepaper_variabilitySection_desc;
-
-	public static String whitepaper_versionInfoSection_desc;
-
-	public static String disciplinegrouping_detailSection_desc;
-
-	public static String disciplinegrouping_generalInfoSection_desc;
-
-	public static String disciplinegrouping_variabilitySection_desc;
-
-	public static String disciplinegrouping_versionInfoSection_desc;
-
-	public static String rolesetgrouping_detailSection_desc;
-
-	public static String rolesetgrouping_generalInfoSection_desc;
-
-	public static String rolesetgrouping_variabilitySection_desc;
-
-	public static String rolesetgrouping_versionInfoSection_desc;
-
-	public static String customcategory_detailSection_desc;
-
-	public static String customcategory_generalInfoSection_desc;
-
-	public static String customcategory_variabilitySection_desc;
-
-	public static String customcategory_versionInfoSection_desc;
-
-	public static String customcategory_IconSection_desc;
-
-	public static String concept_iconSection_desc;
-
-	public static String checklist_iconSection_desc;
-
-	public static String toolmentor_iconSection_desc;
-
-	public static String whitepaper_iconSection_desc;
-
-	public static String estimationconsideration_iconSection_desc;
-
-	public static String termdefinition_iconSection_desc;
-
-	public static String template_iconSection_desc;
-
-	public static String reusableasset_iconSection_desc;
-
-	public static String report_iconSection_desc;
-
-	public static String practice_iconSection_desc;
-
-	public static String example_iconSection_desc;
-
-	public static String guideline_iconSection_desc;
-
-	public static String roadmap_iconSection_desc;
-
-	public static String supportingmaterial_iconSection_desc;
-
-	public static String activity_variability_error_title;
-
-	public static String variability_error_title;
-
-	public static String circular_dependency_error_title;
-
-	public static String apply_pattern_error_msg;
-
-	public static String apply_pattern_error_title;
-
-	public static String editor_title_colon_with_spaces;
-
-	public static String publish_categories_text;
-
-	public static String default_list_length_label;
-	
-	public static String extend_semantics_button_text;
-	
-	public static String extend_semantics_text;
-	
-	public static String DescriptionFormPage_iconSection_fileNameConflict_title;
-	
-	public static String DescriptionFormPage_iconSection_fileNameConflict_msg;
-	
-	public static String DescriptionFormPage_iconSection_fileName_selectAction_label;
-	
-	public static String DescriptionFormPage_iconSection_fileName_destination;
-	
-	public static String DescriptionFormPage_iconSection_fileNameConflict_note;
-	
-	public static String DescriptionFormPage_iconSection_fileName_replace_msg;
-	
-	public static String DescriptionFormPage_iconSection_fileName_unique_msg; 
-
-	public static String ProcessEditor_Action_Preferences;
-	
-	public static String ProcessEditor_Action_Suppress_Task;
-	
-	public static String ProcessEditor_Action_Reveal_Task;
-	
-	public static String LayoutActionGroup_label;
-
-	public static String LayoutActionGroup_flatLayoutAction_label;
-
-	public static String LayoutActionGroup_hierarchicalLayoutAction_label;
-	
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, AuthoringUIResources.class);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIService.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIService.java
deleted file mode 100755
index fb171b0..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIService.java
+++ /dev/null
@@ -1,155 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.epf.authoring.gef.util.DiagramEditorUtil;
-import org.eclipse.epf.authoring.ui.editors.EditorChooser;
-import org.eclipse.epf.authoring.ui.providers.MethodEditorPageProvider;
-import org.eclipse.epf.authoring.ui.providers.ProcessEditorPageProvider;
-import org.eclipse.epf.diagram.model.util.GraphicalDataManager;
-import org.eclipse.epf.library.ILibraryServiceListener;
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.configuration.ConfigurationApplicator;
-import org.eclipse.epf.library.configuration.ConfigurationHelper;
-import org.eclipse.epf.library.configuration.DefaultElementRealizer;
-import org.eclipse.epf.library.configuration.ProcessAuthoringConfigurator;
-import org.eclipse.epf.library.configuration.ProcessConfigurator;
-import org.eclipse.epf.library.edit.ICommandListener;
-import org.eclipse.epf.library.edit.IConfigurationApplicator;
-import org.eclipse.epf.library.edit.IConfigurator;
-import org.eclipse.epf.library.edit.IConfiguratorFactory;
-import org.eclipse.epf.library.edit.Providers;
-import org.eclipse.epf.library.edit.command.MethodElementAddCommand;
-import org.eclipse.epf.library.util.CopyAttachmentsToNewLocation;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.ecore.util.OppositeFeature;
-
-/**
- * The Authoring UI service.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class AuthoringUIService {
-
-	// The shared instance.
-	private static AuthoringUIService instance = new AuthoringUIService();
-
-	// The status flag.
-	private boolean started = false;
-
-	/**
-	 * Creates a new instance.
-	 */
-	private AuthoringUIService() {
-		LibraryService.getInstance().addListener(new ILibraryServiceListener() {
-			public void libraryCreated(MethodLibrary library) {
-			}
-
-			public void libraryOpened(MethodLibrary library) {
-			}
-
-			public void libraryReopened(MethodLibrary library) {
-			}
-			
-			public void libraryClosed(MethodLibrary library) {
-			}			
-
-			public void librarySet(MethodLibrary library) {
-				if (library != null) {
-					start();
-				}
-			}
-			
-			public void configurationSet(MethodConfiguration config) {
-			}			
-		});		
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static AuthoringUIService getInstance() {
-		return instance;
-	}
-
-	/**
-	 * Starts the Authoring UI service.
-	 */
-	public synchronized void start() {
-		if (!started) {
-			// Initialize ProcessAuthoringConfigurator
-			ProcessAuthoringConfigurator.INSTANCE.getClass();
-
-			// Initialize the move/paste command.
-			MethodElementAddCommand
-					.setResourceManager(new CopyAttachmentsToNewLocation());
-
-			// Initialize the EditorChooser.
-			EditorChooser.getInstance();
-
-			// Load EditorPage Providers
-			MethodEditorPageProvider.getInstance().loadProviders();
-			ProcessEditorPageProvider.getInstance().loadProviders();
-
-			// Set providers for library edit.
-			Providers.setConfiguratorFactory(new IConfiguratorFactory() {
-				public IConfigurator createConfigurator(
-						MethodConfiguration config) {
-					return new ProcessConfigurator(config, null, true);
-				}
-			});
-
-			Providers
-					.setConfigurationApplicator(new ConfigurationApplicator());
-
-			Providers.setPreferenceStore(LibraryPlugin.getDefault()
-					.getPreferenceStore());
-
-			Providers.setAuthoringPlugin(AuthoringUIPlugin.getDefault());
-
-			List cmdListeners = GraphicalDataManager.getInstance()
-					.getCommandListeners();
-			cmdListeners.addAll(DiagramEditorUtil.getInstance()
-					.getVaryCommandListeners());
-			for (Iterator iter = cmdListeners.iterator(); iter.hasNext();) {
-				ICommandListener listener = (ICommandListener) iter.next();
-				Providers.registerCommandListener(listener);
-			}
-
-			RefreshJob.getInstance().start();
-			
-			started = true;
-		}
-	}
-
-	/**
-	 * Stops the Authoring UI service.
-	 */
-	public synchronized void stop() {
-		if (started) {
-			RefreshJob.getInstance().stop();			
-			started = false;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIText.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIText.java
deleted file mode 100755
index ff177b4..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIText.java
+++ /dev/null
@@ -1,240 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui;
-
-import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-
-/**
- * Defines and caches the commonly referenced text in the Authoring UI.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class AuthoringUIText {
-
-	/**
-	 * Editor form page titles.
-	 */
-	public static final String ASSIGN_PAGE_TITLE = AuthoringUIResources.assignPage_title; 
-
-	public static final String CATEGORIES_PAGE_TITLE = AuthoringUIResources.categoriesPage_title; 
-
-	public static final String DELIVERABLE_PARTS_PAGE_TITLE = AuthoringUIResources.deliverablePartsPage_title; 
-
-	public static final String DESCRIPTION_PAGE_TITLE = AuthoringUIResources.descriptionPage_title; 
-
-	public static final String DISCIPLINES_PAGE_TITLE = AuthoringUIResources.disciplinesPage_title; 
-
-	public static final String GUIDANCE_PAGE_TITLE = AuthoringUIResources.guidancePage_title; 
-
-	public static final String PREVIEW_PAGE_TITLE = AuthoringUIResources.previewPage_title; 
-
-	public static final String REFERENCES_PAGE_TITLE = AuthoringUIResources.referencesPage_title; 
-
-	public static final String REFERENCE_WORKFLOW_PAGE_TITLE = AuthoringUIResources.referenceWorkflowPage_title; 
-
-	public static final String ROLES_PAGE_TITLE = AuthoringUIResources.rolesPage_title; 
-
-	public static final String ROLE_SETS_PAGE_TITLE = AuthoringUIResources.roleSetsPage_title; 
-
-	public static final String STEPS_PAGE_TITLE = AuthoringUIResources.stepsPage_title; 
-
-	public static final String TASKS_PAGE_TITLE = AuthoringUIResources.tasksPage_title; 
-
-	public static final String TOOL_MENTORS_PAGE_TITLE = AuthoringUIResources.toolMentorsPage_title; 
-
-	public static final String WORK_PRODUCTS_PAGE_TITLE = AuthoringUIResources.workProductsPage_title; 
-
-	/**
-	 * Editor section names and description.
-	 */
-	public static final String CHECK_ITEMS_SECTION_NAME = AuthoringUIResources.checkItemsSection_name; 
-
-	public static final String CHECK_ITEMS_SECTION_DESC = AuthoringUIResources.checkItemsSection_desc; 
-
-	public static final String DEPENDENCIES_SECTION_NAME = AuthoringUIResources.dependenciesSection_name; 
-
-	public static final String DEPENDENCIES_SECTION_DESC = AuthoringUIResources.dependenciesSection_desc; 
-
-	public static final String DETAIL_SECTION_NAME = AuthoringUIResources.detailSection_name; 
-
-	public static final String DETAIL_SECTION_DESC = AuthoringUIResources.detailSection_desc; 
-
-	public static final String GENERAL_INFO_SECTION_NAME = AuthoringUIResources.generalInfoSection_name; 
-
-	public static final String GENERAL_INFO_SECTION_DESC = AuthoringUIResources.generalInfoSection_desc; 
-
-	public static final String ICON_SECTION_NAME = AuthoringUIResources.iconSection_name; 
-
-	public static final String ICON_SECTION_DESC = AuthoringUIResources.iconSection_desc; 
-
-	public static final String NOTATION_SECTION_NAME = AuthoringUIResources.notationSection_name; 
-
-	public static final String NOTATION_SECTION_DESC = AuthoringUIResources.notationSection_desc; 
-
-	public static final String REFERENCED_PLUGINS_SECTION_NAME = AuthoringUIResources.referencedPluginsSection_name; 
-
-	public static final String REFERENCED_PLUGINS_SECTION_DESC = AuthoringUIResources.referencedPluginsSection_desc; 
-
-	public static final String STAFFING_SECTION_NAME = AuthoringUIResources.staffingSection_name; 
-
-	public static final String STAFFING_SECTION_DESC = AuthoringUIResources.staffingSection_desc; 
-
-	public static final String STEPS_SECTION_NAME = AuthoringUIResources.stepsSection_name; 
-
-	public static final String STEPS_SECTION_DESC = AuthoringUIResources.stepsSection_desc; 
-
-	public static final String TAILORING_SECTION_NAME = AuthoringUIResources.tailoringSection_name; 
-
-	public static final String TAILORING_SECTION_DESC = AuthoringUIResources.tailoringSection_desc; 
-
-	public static final String VARIABILITY_SECTION_NAME = AuthoringUIResources.variabilitySection_name; 
-
-	public static final String VARIABILITY_SECTION_DESC = AuthoringUIResources.variabilitySection_desc; 
-
-	public static final String VERSION_INFO_SECTION_NAME = AuthoringUIResources.versionInfoSection_name; 
-
-	public static final String VERSION_INFO_SECTION_DESC = AuthoringUIResources.versionInfoSection_desc; 
-
-	/**
-	 * UI and element attribute labels.
-	 */
-	public static final String ADDITIONAL_INFO_TEXT = AuthoringUIResources.additionalInfo_text; 
-
-	public static final String APPLICATION_TEXT = AuthoringUIResources.application_text; 
-
-	public static final String ALTERNATIVES_TEXT = AuthoringUIResources.alternatives_text; 
-
-	public static final String ASSIGNMENT_APPROACHES_TEXT = AuthoringUIResources.assignmentApproaches_text; 
-
-	public static final String AUTHORS_TEXT = AuthoringUIResources.authors_text; 
-
-	public static final String BACKGROUND_TEXT = AuthoringUIResources.background_text; 
-
-	public static final String BASE_ELEMENT_TEXT = AuthoringUIResources.baseElement_text; 
-
-	public static final String BASE_GUIDANCE_TEXT = AuthoringUIResources.baseGuidance_text; 
-
-	public static final String BRIEF_DESCRIPTION_TEXT = AuthoringUIResources.briefDescription_text; 
-
-	public static final String BRIEF_OUTLINE_TEXT = AuthoringUIResources.briefOutline_text; 
-
-	public static final String CHANGE_DATE_TEXT = AuthoringUIResources.changeDate_text; 
-
-	public static final String CHANGE_DESCRIPTION_TEXT = AuthoringUIResources.changeDescription_text; 
-
-	public static final String CHECK_ITEMS_TEXT = AuthoringUIResources.checkItems_text; 
-
-	public static final String CONTRIBUTES_TEXT = AuthoringUIResources.contributes_text; 
-	
-	public static final String LOCAL_CONTRIBUTES_TEXT = AuthoringUIResources.localContributes_text;  
-
-	public static final String COPYRIGHT_TEXT = AuthoringUIResources.copyright_text; 
-
-	public static final String DESCRIPTION_TEXT = AuthoringUIResources.description_text; 
-
-	public static final String EDITOR_TEXT = AuthoringUIResources.editor_text; 
-
-	public static final String EXTENDS_TEXT = AuthoringUIResources.extends_text; 
-
-	public static final String EXTERNAL_DESCRIPTION_TEXT = AuthoringUIResources.externalDescription_text; 
-
-	public static final String EXTERNAL_ID_TEXT = AuthoringUIResources.externalId_text; 
-
-	public static final String GOALS_TEXT = AuthoringUIResources.goals_text; 
-
-	public static final String IMPACT_OF_NOT_HAVING_TEXT = AuthoringUIResources.impactOfNotHaving_text; 
-
-	public static final String KEY_CONSIDERATIONS_TEXT = AuthoringUIResources.keyConsiderations_text; 
-
-	public static final String LEVEL_OF_ADOPTION_TEXT = AuthoringUIResources.levelsOfAdoption_text; 
-
-	public static final String MAIN_DESCRIPTION_TEXT = AuthoringUIResources.mainDescription_text; 
-
-	public static final String NAME_TEXT = AuthoringUIResources.name_text; 
-
-	public static final String NEW_ELEMENT_TEXT = AuthoringUIResources.newElement_text; 
-
-	public static final String NOT_APPLICABLE_TEXT = AuthoringUIResources.notApplicable_text; 
-
-	public static final String PACKAGING_GUIDANCE_TEXT = AuthoringUIResources.packagingGuidance_text; 
-
-	public static final String PRESENTATION_NAME_TEXT = AuthoringUIResources.presentationName_text; 
-
-	public static final String PROBLEM_TEXT = AuthoringUIResources.problem_text; 
-
-	public static final String PURPOSE_TEXT = AuthoringUIResources.purpose_text; 
-
-	public static final String REASON_FOR_NOT_NEEDING_TEXT = AuthoringUIResources.reasonForNotNeeding_text; 
-
-	public static final String REPLACES_TEXT = AuthoringUIResources.replaces_text; 
-
-	public static final String REPRESENTATION_OPTIONS_TEXT = AuthoringUIResources.representationOptions_text; 
-
-	public static final String SKILLS_TEXT = AuthoringUIResources.skills_text; 
-
-	public static final String STEPS_TEXT = AuthoringUIResources.steps_text; 
-
-	public static final String STEP_NAME_TEXT = AuthoringUIResources.steps_name_text; 
-
-	public static final String SYNONYMS_TEXT = AuthoringUIResources.synonyms_text; 
-
-	public static final String ATTACHED_FILE_TEXT = AuthoringUIResources.attachedFile_text; 
-
-	public static final String TYPE_TEXT = AuthoringUIResources.type_text; 
-
-	public static final String UNIQUE_ID_TEXT = AuthoringUIResources.uniqueId_text; 
-
-	public static final String VARIABILITY_TYPE_TEXT = AuthoringUIResources.variabilityType_text; 
-
-	public static final String VERSION_TEXT = AuthoringUIResources.version_text; 
-
-	/**
-	 * Button labels.
-	 */
-	public static final String ADD_BUTTON_TEXT = AuthoringUIResources.addButton_text; 
-
-	public static final String ATTACH_BUTTON_TEXT = AuthoringUIResources.attachButton_text; 
-
-	public static final String BROWSE_BUTTON_TEXT = AuthoringUIResources.browseButton_text; 
-
-	public static final String CHANGE_TYPE_BUTTON_TEXT = AuthoringUIResources.changeTypeButton_text; 
-
-	public static final String CLEAR_BUTTON_TEXT = AuthoringUIResources.clearButton_text; 
-
-	public static final String DELETE_BUTTON_TEXT = AuthoringUIResources.deleteButton_text; 
-
-	public static final String DESELECT_BUTTON_TEXT = AuthoringUIResources.deselectButton_text; 
-
-	public static final String DETACH_BUTTON_TEXT = AuthoringUIResources.detachButton_text; 
-
-	public static final String DOWN_BUTTON_TEXT = AuthoringUIResources.downButton_text; 
-
-	public static final String ORDER_BUTTON_TEXT = AuthoringUIResources.orderButton_text; 
-
-	public static final String EDIT_BUTTON_TEXT = AuthoringUIResources.editButton_text; 
-	
-	public static final String REMOVE_BUTTON_TEXT = AuthoringUIResources.removeButton_text; 
-
-	public static final String SELECT_BUTTON_TEXT = AuthoringUIResources.selectButton_text; 
-
-	public static final String UP_BUTTON_TEXT = AuthoringUIResources.upButton_text; 
-
-	public static final String VIEW_HISTORY_BUTTON_TEXT = AuthoringUIResources.viewHistoryButton_text; 
-
-	public static final String ALWAYS_BUTTON_TEXT = MessageDialogWithToggle.ALWAYS;
-
-	public static final String NEVER_BUTTON_TEXT = MessageDialogWithToggle.NEVER;
-
-	public static final String PROMPT_BUTTON_TEXT = MessageDialogWithToggle.PROMPT;
-
-	public static final String PUBLISH_CATEGORIES_TEXT = AuthoringUIResources.publish_categories_text;
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/BrowsingPerspective.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/BrowsingPerspective.java
deleted file mode 100755
index 0d73962..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/BrowsingPerspective.java
+++ /dev/null
@@ -1,69 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui;
-
-import org.eclipse.epf.authoring.ui.views.ConfigurationView;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The Method Browsing perspective.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class BrowsingPerspective implements IPerspectiveFactory {
-
-	/**
-	 * The perspective ID.
-	 */
-	public static final String PERSPECTIVE_ID = BrowsingPerspective.class
-			.getName();
-
-	/**
-	 * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(IPageLayout)
-	 */
-	public void createInitialLayout(IPageLayout layout) {
-		layout.setEditorAreaVisible(false);
-		String editorArea = layout.getEditorArea();
-		layout.addView(ConfigurationView.VIEW_ID, IPageLayout.LEFT, 0.30f,
-				editorArea);
-		PerspectiveListUtil.addPerspectiveShortList(layout);
-	}
-
-	/**
-	 * Opens this perspective.
-	 */
-	public static void open() {
-		try {
-			IWorkbenchWindow window = PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow();
-			if (window == null) {
-				IWorkbenchWindow[] windows = PlatformUI.getWorkbench()
-						.getWorkbenchWindows();
-				if (windows != null && windows.length > 0) {
-					window = windows[0];
-				}
-			}
-
-			if (window != null) {
-				PlatformUI.getWorkbench().showPerspective(PERSPECTIVE_ID,
-						window);
-			}
-		} catch (Exception e) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(
-					"Failed to open browsing perspective", e); //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/PerspectiveListUtil.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/PerspectiveListUtil.java
deleted file mode 100755
index 0accd81..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/PerspectiveListUtil.java
+++ /dev/null
@@ -1,61 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui;
-
-import org.eclipse.epf.common.utils.PerspectiveUtil;
-import org.eclipse.ui.IPageLayout;
-
-/**
- * Helper class for the Authoring and Browsing perspectives.
- * 
- * @author Bingxue Xu
- * @since 1.0
- */
-public class PerspectiveListUtil {
-
-	/**
-	 * Add the Browsing and Authoring perspective shortcuts to the given page
-	 * layout.
-	 */
-	public static void addPerspectiveShortList(IPageLayout layout) {
-		layout.addPerspectiveShortcut(BrowsingPerspective.PERSPECTIVE_ID);
-		layout.addPerspectiveShortcut(AuthoringPerspective.PERSPECTIVE_ID);
-	}
-
-	/**
-	 * Returns <code>true</code> if the current perspective is the Authoring
-	 * perspective.
-	 */
-	public static boolean isAuthoringPerspective() {
-		String activePerspectiveId = PerspectiveUtil.getActivePerspectiveId();
-		if (activePerspectiveId == null) {
-			return false;
-		} else {
-			return activePerspectiveId
-					.equalsIgnoreCase(AuthoringPerspective.PERSPECTIVE_ID);
-		}
-	}
-
-	/**
-	 * Returns <code>true</code> if the current perspective is the Browsing
-	 * perspective.
-	 */
-	public static boolean isBrowsingPerspective() {
-		String activePerspectiveId = PerspectiveUtil.getActivePerspectiveId();
-		if (activePerspectiveId == null) {
-			return false;
-		} else {
-			return activePerspectiveId
-					.equalsIgnoreCase(BrowsingPerspective.PERSPECTIVE_ID);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/Resources.properties b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/Resources.properties
deleted file mode 100755
index 4d6b181..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/Resources.properties
+++ /dev/null
@@ -1,1204 +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
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Form Page Titles
-assignPage_title=Assign
-categoriesPage_title=Categories
-deliverablePartsPage_title=Deliverable Parts
-descriptionPage_title=Description
-disciplinesPage_title=Disciplines
-discardunresolvedref=Discard unresolved references
-guidancePage_title=Guidance
-previewPage_title=Preview
-referencesPage_title=References
-reference_text=References:
-referenceWorkflowPage_title=Reference Workflow
-rolesPage_title=Roles
-roleSetsPage_title=Role Sets
-stepsPage_title=Steps
-tasksPage_title=Tasks
-toolMentorsPage_title=Tool Mentors
-workProductsPage_title=Work Products
-
-# Section Names & Description
-checkItemsSection_name=Check Items
-checkItemsSection_desc=Specify the check items that constitute this checklist.
-dependenciesSection_name=Dependencies
-dependenciesSection_desc=This section displays dependencies of this content package to other content packages.
-detailSection_name=Detail Information
-detailSection_desc=Provide detailed information about this {0}.
-generalInfoSection_name=General Information
-generalInfoSection_desc=Provide general information about this {0}.
-iconSection_name=Icon
-iconSection_desc=Customize the icons for this {0}.
-notationSection_name=Delivery Information
-notationSection_desc=Provide delivery information about this {0}.
-referencedPluginsSection_name=Referenced Plug-ins:
-referencedPluginsSection_desc=This section displays plug-ins referenced by this method plug-in.
-staffingSection_name=Staffing Information
-staffingSection_desc=Provide staffing information about this role.
-stepsSection_name=Steps
-stepsSection_desc=Specify the steps to perform this task.
-tailoringSection_name=Tailoring
-tailoringSection_desc=Provide tailoring information about this {0}.
-variabilitySection_name=Content Variability
-variabilitySection_desc=Specify how this {0} relates to another {0}.
-versionInfoSection_name=Version Information
-versionInfoSection_desc=Provide version information about this {0}.
-
-# UI & Element Attribute Labels
-additionalInfo_text=Additional information:
-application_text=Application:
-actionLabel_edit=&Edit
-actionLabel_findElementInLibNav=&Show in Library View
-alternatives_text=Alternatives:
-assignmentApproaches_text=Assignment approaches:
-authors_text=Authors:
-background_text=Background:
-baseElement_text=Base:
-baseGuidance_text=Base guidance:
-briefDescription_text=Brief description:
-description_text=Description:
-backupbeforesave_text=Back up before save
-briefOutline_text=Brief outline:
-changeDate_text=Change date:
-changeDescription_text=Change description:
-checkItems_text=Check Items
-contributes_text=Contributes
-localContributes_text=LocalContributes
-contributes_to_text=Contributes to
-copyright_text=Copyright:
-editor_text=Editor
-extends_text=Extends
-extend_text=Extend
-externalDescription_text=External description:
-externalId_text=External ID:
-goals_text=Goals:
-impactOfNotHaving_text=Impact of not having:
-keyConsiderations_text=Key considerations:
-levelsOfAdoption_text=Level of adoption:
-mainDescription_text=Main description:
-newElement_text=New {0}
-name_text=Name:
-notApplicable_text=Not applicable
-packagingGuidance_text=Packaging guidance:
-presentationName_text=Presentation name:
-promptforlibary_text=Prompt for method library on startup
-enableHealthCheck_text=Enable internal debug tools
-problem_text=Problem:
-purpose_text=Purpose:
-reasonForNotNeeding_text=Reason for not needing:
-replaces_text=Replaces
-localReplaces_text=LocalReplaces
-extendsReplaces_text=ExtendsReplaces
-representationOptions_text=Representation options:
-attachedFile_text=Attached file(s):
-skills_text=Skills:
-steps_text=Steps:
-steps_name_text=Name:
-stop_text=Stop
-print_text=Print
-synonyms_text=Synonyms:
-type_text=Type:
-copy_text=Copy
-deepCopy_text=Deep Copy
-back_text=Back
-new_plugin=Ne&w Method Plug-in
-move=&Move...
-uniqueId_text=Unique ID:
-variabilityType_text=Variability type:
-version_text=Version:
-
-# Button Labels
-addButton_text=Add...
-attachButton_text=Attach...
-browseButton_text=Browse...
-changeTypeButton_text=Change Type...
-clearButton_text=Clear
-deleteButton_text=Delete
-detachButton_text=Detach
-diagram_saveError=Error saving diagram
-downButton_text=Down
-directory_text=Directory:
-orderButton_text=Order
-editButton_text=Edit...
-removeButton_text=Remove
-renameAction_text=Ren&ame...
-remove_text=Remove
-rename_text=Rename
-SaveAs_text=Save As
-selectButton_text=Select...
-deselectButton_text=Deselect
-upButton_text=Up
-makeDefaultButton_text=Make Default
-viewHistoryButton_text=View History...
-
-# Role Editor Tasks Page
-roleTasksPage_sectionName=Tasks
-roleTasksPage_sectionDescription=This role is the performer of the following tasks.
-roleTasksPage_availableLabel=Available tasks
-roleTasksPage_selectedLabel=Primary performer:
-roleTasksPage_selectedLabel2=Additional performer:
-roleTasksPage_multipleSelectDescription={0} tasks have been selected.
-
-# Role Editor Work Products Page
-roleWorkProductsPage_sectionName=Work Products:
-roleWorkProductsPage_sectionDescription=Specify work products that this role is responsible for.
-roleWorkProductsPage_availableLabel=Available work products:
-roleWorkProductsPage_selectedLabel=Responsible for:
-roleWorkProductsPage_selectedLabel2=Work products that are output of tasks that this role performs:
-roleWorkProductsPage_multipleSelectDescription={0} work products have been selected.
-
-# Role Editor Guidance Page
-roleGuidancePage_sectionName=Guidance
-roleGuidancePage_sectionDescription=Provide links to additional information in the form of guidance.
-roleGuidancePage_availableLabel=Available Guidance:
-roleGuidancePage_selectedLabel=Guidance:
-roleGuidancePage_multipleSelectDescription={0} guidance have been selected.
-
-# Role Editor Categories Page
-roleCategoriesPage_sectionName=Categories:
-roleCategoriesPage_sectionDescription=Manage the categories to which this role belongs.
-roleCategoriesPage_availableLabel=Role Sets:
-roleCategoriesPage_availableLabel2=Custom Categories:
-roleCategoriesPage_selectedLabel=Role sets:
-roleCategoriesPage_selectedLabel2=Custom categories:
-
-# Task Editor Roles Page
-taskRolesPage_sectionName=Roles
-taskRolesPage_sectionDescription=Assign the roles to perform this task.
-taskRolesPage_availableLabel=Available roles:
-taskRolesPage_selectedLabel=Primary performer:
-taskRolesPage_selectedLabel2=Additional performers:
-taskRolesPage_multipleSelectDescription={0} roles have been selected.
-taskRolesPage_primaryPerformer_modify_message=IUPA00045W: Do you want to change the primary performer to ''{0}''?
-taskRolesPage_confirm_title=Confirm primary role change
-
-# Task Editor Work Products Page
-taskWorkProductsPage_sectionName=Work Products
-taskWorkProductsPage_sectionDescription=Specify the input and output work products for this task.
-taskWorkProductsPage_availableLabel=Available Work Products
-taskWorkProductsPage_selectedLabel=Mandatory inputs:
-taskWorkProductsPage_selectedLabel2=Optional inputs:
-taskWorkProductsPage_selectedLabel3=Outputs:
-taskWorkProductsPage_multipleSelectDescription={0} work products have been selected.
-
-# Task Editor Guidance Page
-taskGuidancePage_sectionName=Guidance
-taskGuidancePage_sectionDescription=Provide links to addtional information in the form of guidance.
-taskGuidancePage_availableLabel=Available Guidance:
-taskGuidancePage_selectedLabel=Guidance:
-taskGuidancePage_multipleSelectDescription={0} guidances have been selected.
-
-# Task Editor Categories Page
-taskCategoriesPage_sectionName=Categories
-taskCategoriesPage_sectionDescription=Manage the categories to which this task belongs.
-taskCategoriesPage_availableLabel=Disciplines
-taskCategoriesPage_availableLabel2=Custom Categories
-taskCategoriesPage_selectedLabel=Disciplines:
-taskCategoriesPage_selectedLabel2=Custom categories:
-
-# Work Product Editor Tasks Page
-WorkProduct_Tasks_SectionName=Tasks
-WorkProduct_Tasks_SectionDescription=This work product is an input or output for the following tasks.
-WorkProduct_Tasks_AvailableLabel=Available tasks
-WorkProduct_Tasks_SelectedLabel=Mandatory input:
-WorkProduct_Tasks_SelectedLabel2=Optional input:
-WorkProduct_Tasks_SelectedLabel3=Output:
-WorkProduct_Tasks_MultipleSelectDescription={0} tasks have been selected.
-
-# Work Product Editor Roles Page
-workProductRolesPage_sectionName=Roles
-workProductRolesPage_sectionDescription=The following roles are responsible for or modify this work product.
-workProductRolesPage_availableLabel=Available roles
-workProductRolesPage_selectedLabel=Responsible role:
-workProductRolesPage_selectedLabel2=Modifying roles:
-workProductRolesPage_multipleSelectDescription={0} roles have been selected.
-
-## Work Product Editor Deliverable Parts Page
-workProductDeliverablePartsPage_sectionName=Deliverable Parts
-workProductDeliverablePartsPage_sectionDescription=Specify the work products that constitute this deliverable.
-workProductDeliverablePartsPage_availableLabel=Available work products as deliverable parts:
-workProductDeliverablePartsPage_selectedLabel=Work products as deliverable parts:
-workProductDeliverablePartsPage_multipleSelectDescription={0} work products have been selected.
-
-# Work Product Editor Guidance Page
-workProductGuidancePage_sectionName=Guidance
-workProductGuidancePage_sectionDescription=Provide links to addtional information in the form of guidance.
-workProductGuidancePage_availableLabel=Available Guidance:
-workProductGuidancePage_selectedLabel=Guidance:
-workProductGuidancePage_multipleSelectDescription={0} guidances have been selected.
-
-# Work Product Editor Categories Page
-workProductCategoriesPage_sectionName=Categories
-workProductCategoriesPage_sectionDescription=Manage the categories to which this work product belongs.
-workProductCategoriesPage_availableLabel=Domains
-workProductCategoriesPage_availableLabel2=Work Product Kinds:
-workProductCategoriesPage_availableLabel3=Custom Categories:
-workProductCategoriesPage_selectedLabel=Domain:
-workProductCategoriesPage_selectedLabel2=Work product kinds:
-workProductCategoriesPage_selectedLabel3=Custom categories:
-
-# Practice Editor References Page
-practiceReferencesPage_sectionName=Content Elements
-practiceReferencesPage_sectionDescription=Specify the content elements referenced by this practice.
-practiceReferencesPage_availableLabel=Available content elements:
-practiceReferencesPage_selectedLabel=Content elements:
-practiceReferencesPage_multipleSelectDescription={0} Content elements have been selected.
-
-# Category Editor Guidance Page
-categoryGuidancesPage_sectionName=Guidance
-categoryGuidancesPage_sectionDescription=Manage the guidance that belong to this {0}.
-categoryGuidancesPage_availableLabel=Available guidance:
-categoryGuidancesPage_selectedLabel=Guidance:
-categoryGuidancesPage_multipleSelectDescription={0} guidances have been selected.
-
-# Discipline Grouping Editor Disciplines Page
-disciplineGroupingDisciplinesPage_sectionName=Disciplines
-disciplineGroupingDisciplinesPage_sectionDescription=Manage the disciplines that belong to this discipline grouping.
-disciplineGroupingDisciplinesPage_availableLabel=Available Disciplines:
-disciplineGroupingDisciplinesPage_selectedLabel=Disciplines:
-disciplineGroupingDisciplinesPage_multipleSelectDescription={0} Disciplines have been selected.
-AuthoringUIPlugin_AbstractNewLibraryPage_UseDefaultDirectoryButtonLabel=Use default directory
-
-# Discipline Editor Tasks Page
-disciplineTasksPage_sectionName=Tasks
-disciplineTasksPage_sectionDescription=Manage the tasks that belong to this discipline.
-disciplineTasksPage_availableLabel=Available tasks:
-disciplineTasksPage_selectedLabel=Tasks:
-disciplineTasksPage_multipleSelectDescription={0} tasks have been selected.
-
-# Discipline Editor Reference Workflow Page
-disciplineReferenceWorkflowPage_sectionName=Reference Workflows
-disciplineReferenceWorkflowPage_sectionDescription=Manage the reference workflows that belong to this discipline.
-disciplineReferenceWorkflowPage_availableLabel=Available Reference Workflows:
-disciplineReferenceWorkflowPage_selectedLabel=Reference workflows:
-disciplineReferenceWorkflowPage_multipleSelectDescription={0} Reference workflows have been selected.
-
-# Domain Editor Work Products Page
-domainWorkProductsPage_sectionName=Work Products
-domainWorkProductsPage_sectionDescription=Manage the work products that belong to this domain.
-domainWorkProductsPage_availableLabel=Available work products:
-domainWorkProductsPage_selectedLabel=Work products:
-domainWorkProductsPage_multipleSelectDescription={0} work products have been selected.
-
-# Work Product Kind Editor Work Products Page
-workProductTypeWorkProductsPage_sectionName=Work Products
-workProductTypeWorkProductsPage_sectionDescription=Manage the work products that belong to this work product kind.
-workProductTypeWorkProductsPage_availableLabel=Available work products:
-workProductTypeWorkProductsPage_selectedLabel=Work products:
-workProductTypeWorkProductsPage_multipleSelectDescription={0} work products have been selected.
-
-# Role Set Grouping Editor Role Sets Page
-roleSetGroupingRoleSetsPage_sectionName=Role Sets
-roleSetGroupingRoleSetsPage_sectionDescription=Manage the role sets that belong to this role set grouping.
-roleSetGroupingRoleSetsPage_availableLabel=Available Role Sets:
-roleSetGroupingRoleSetsPage_selectedLabel=Role sets:
-roleSetGroupingRoleSetsPage_multipleSelectDescription={0} Role Sets have been selected.
-
-# Role Set Editor Roles Page
-roleSetRolesPage_sectionName=Roles
-roleSetRolesPage_sectionDescription=Manage the roles that belong to this role set.
-roleSetRolesPage_availableLabel=Available roles:
-roleSetRolesPage_selectedLabel=Roles:
-roleSetRolesPage_multipleSelectDescription={0} roles have been selected.
-
-# Tool Editor Tool Mentors Page
-toolToolMentorsPage_sectionName=Tool Mentors
-toolToolMentorsPage_sectionDescription=Manage the tool mentors that belong to this tool.
-toolToolMentorsPage_availableLabel=Available tool mentors:
-toolToolMentorsPage_selectedLabel=Tool mentors:
-toolToolMentorsPage_multipleSelectDescription={0} Tool Mentors have been selected.
-
-# Custom Category Editor Assign Page
-customCategoryAssignPage_sectionName=Content Elements
-customCategoryAssignPage_sectionDescription=Manage the content elements that constitute this custom category.
-customCategoryAssignPage_availableLabel=Available Content Elements:
-customCategoryAssignPage_selectedLabel=Content elements:
-customCategoryAssignPage_multipleSelectDescription={0} Content Elements have been selected.
-
-# New Method Plug-in Wizard
-newPluginWizard_title=New Method Plug-in
-newPluginWizardPage_title=Create a new method plug-in
-newPluginWizardPage_text=Specify a name and provide general information about the new method plug-in.
-newPluginError_msg=IUPA0021E: Failed to create the method plug-in.
-newPluginError_reason=Internal error.\n\nClick Details for more information.
-
-# Generic dialog titles
-createDialog_title=Create Element
-deleteDialog_title=Delete Element
-editDialog_title=Edit Element
-errorDialog_title=Error
-moveDialog_title=Move Element
-renameDialog_title=Rename Element
-warningDialog_title=Warning
-
-# Add Configuration to Process Error Dialog
-addConfigErrorDialog_title=Add Configuration to Process
-
-# Set Default Configuration Error Dialog
-setDefaultConfigErrorDialog_title=Set Default Configuration for Process
-
-# Edit Process Error Dialog
-editProcessElementErrorDialog_title=Edit Process Element
-
-# Open Library Dialog
-openLibraryDialog_title=Open Method Library
-openLibraryDialog_text=The current method library was not saved properly. Do you want to ignore the error and proceed to open another library?
-
-# Save Library Dialog
-saveLibraryDialog_title=Save Method Library
-saveLibraryDialog_text=The current method library has been modified. Do you want to save the changes?
-
-# Upgrade Library Dialog
-upgradeLibraryDialog_title=Upgrade Method Library
-
-# Delete Element Reference Dialog
-deleteAssociationDialog_text=The element ''{0}'' has already been deleted. Do you want to remove it from ''{1}''?
-
-# Error Messages
-noOpenLibraryError_msg=IUPA0000E: No open method library.\n\nA method library must be opened before a new method element can be added.\n\nCreate a new method library or open an existing one and try again.
-emptyElementNameError_msg=IUPA0001E: The {0} name is missing.\n\nAll method and process elements must have a name.\n\nClick OK and enter a valid name for the element.
-duplicateElementNameError_msg=IUPA0002E: The name ''{0}'' already exists.\n\nA method element must have a unique name.\n\nClick OK and enter a different name for the element.
-createConfigError_msg=IUPA0003E: The method configuration cannot be created.
-deleteConfigError_msg=IUPA0004W: The method configuration cannot be deleted.
-internalError_msg=IUPA0005E: An internal error has occurred.\n\nClick Details for more information.
-invalidPresentationNameError_msg=IUPA0006E: The specified presentation name is invalid.\n\nClick OK and enter a different name.
-invalidConfigError_msg=IUPA0007E: The selected method configuration ''{0}'' is not a subset of the process''s default configuration.\n\nIn order to maintain the integrity of a process, its default configuration must be a superset of all other configurations associated with the process.\n\nSelect another configuration or modify the default configuration to include the content of the selected configuration and try again.
-setDefaultConfigError_msg=IUPA0008E: The selected method configuration ''{0}'' is not a superset of the other configurations referenced by the process.\n\nIn order to maintain the integrity of a process, its default configuration must be a superset of all other configurations associated with the process.\n\nSelect another configuration or modify the content of the selected configuration and try again.
-openLibraryError_msg=IUPA0009E: The method library cannot be loaded.\n\nClick Details for more information.
-saveLibraryError_msg=IUPA0010E: The method library cannot be saved.
-saveLibraryToError_msg=IUPA0010E: The method library cannot be saved to ''{0}''.
-elementAlreadyDeletedError_msg=IUPA0011E: The element ''{0}'' has already been deleted.
-upgradeLibraryError_msg=IUPA0012E: The method library cannot be upgraded.
-
-# Error Reasons
-error_reason=IUPA0016E: An error has occurred.\n\nClick Details for more information.
-internalError_reason=IUPA0017E: An internal error has occurred.\n\nClick Details for more information.
-upgradeLibraryError_reason=IUPA0018E: An error has occurred while loading the method library elements.\n\nClick Details for more information.
-saveUpgradedLibraryError_reason=IUPA0019E: An error has occurred while saving the upgraded method library.\n\nClick Details for more information.
-
-# Progress Messages
-openingLibraryTask_name=Opening method library...
-savingLibraryTask_name=Saving method library ...
-upgradingLibraryTask_name=Upgrading method library...
-loadingLibraryElementsTask_name=Loading method library elements...
-savingUpgradedElementsTask_name=Saving method library elements in new file format...
-savingTask_name=Saving ''{0}''...
-savingFilesTask_name=Saving files...
-fixingContentDescriptionGUIDsTask_name=Fixing content description GUIDs...
-deletingInvalidReferencesTask_name=Deleting invalid references...
-
-
-# Add Editor To Browsing Perspective Warning Dialog
-addEditorToPerspectiveWarning_msg=IUPA0046W: This perspective has been specially designed to maximize your user experience of browsing the HTML representation of the method library elements. No editor can be added or displayed here.
-
-# Change History Dialog
-ChangeHistoryDialog_title=Change Description History
-ChangeHistoryDialog_label=Change history:
-
-# Method Element Delete Action
-confirmDeleteDialog_title=Confirm Deletion
-confirmDeleteDialog_msg=Are you sure you want to delete ''{0}''?
-confirmDeleteDialog_msgWithReference=Are you sure you want to delete ''{0}''?\n\nThe following element(s) contain references to the item(s) to be deleted: {1}
-
-# New Library Dialog
-errorDialog_message=IUPA0022E: The  method library ''{0}'' cannot be created.
-errorDialog_error=Cannot create a method library within another method library.
-err_noopenlibrary=IUPA0040E: No open method library.\n\nA method library must be opened before a new method plug-in can be added.\n\nCreate a new method library or open an existing one and try again.
-err_loadinglibrary=Error loading library
-msg_reloadLibrary=Error undoing the failed deletion. The current method library needs to be reloaded.
-
-# Reload Library Dialog
-reloadDialog_message=The library needs to be reloaded to restore its original state.
-reloadDialog_title=Reload Library
-dialogs_MoveDialog_errorTitle=Move Error
-dialogs_MoveDialog_errorMessage=Error during move
-
-# Process Form Editor
-processFormEditorSaveDialog_title=Save
-processFormEditorSaveDialog_message1=This change will affect all diagrams in your process. The editor will be saved after your change. Do you want to continue?
-processFormEditorSaveDialog_message2=The editor will be saved after your change. Do you want to continue?
-
-# Configuration View Page
-configViewPageRemoveViewDialog_title=Confirm Removing
-configViewPageRemoveViewDialog_message=Are you sure you want to remove view ''{0}''?
-configViewPageViewExistsDialog_title=Warning
-configViewPage_configuration=Configuration:
-configViewPage_configurationViews=Configuration Views
-configViewPage_views=Views
-columnselection_text=Column selection:
-configViewPage_addViewButtonText=Add View...
-configViewPage_removeViewButtonText=Remove View
-configViewPage_makeDefaultButtonText=Make Default
-configViewPageViewExistsDialog_message=IUPA0023W: View with name ''{0}'' already exists.
-configViewPage_configurationViewSectionTitle=Published Navigation Views
-configViewPage_configurationViewSectionMessage=Specify the views that will be included when this configuration is published. To create a view, click Add View to select any standard or custom category within the configuration.  The selected category will represent the view and the category's sub-categories and content elements will represent the view's tree elements.
-
-# Description Tab
-descriptionTabGuidanceWarningDialog_title=Convert Guidance
-descriptionTabGuidanceWarningDialog_message1=IUPA0040W:  Please save the editor first.
-descriptionTabGuidanceWarningDialog_message2=There are no compatible guidance for this type.
-
-changeActivityTypeWarningDialog_title=Convert Activity
-# Association Form Page
-AssociationFormPage_BriefDescriptionLabel=Brief description of selected element:
-
-# Method Element Description
-methodElementDescriptionEmptyNameDialog_title=Enter Element Name
-methodElementDescriptionEmptyNameDialog_message=The name field cannot be empty.
-
-# Method Plug-in Description
-methodPluginDescriptionRemoveRefConfirm_message=Deselecting the referenced plug-in(s) associated with plug-in ''{0}'' will produce invalid relationships that will be deleted.\n\nThis action cannot be undone. Do you want to proceed with this change?
-methodPluginDescriptionPage_confirmRename=You are about to change the name of this method plug-in from ''{0}'' to new name ''{1}''. This action will save this editor and renames the plug-in folder to the new name. Do you want to continue?
-methodPluginDescriptionPage_confirmRename_title=Rename Method Plug-in
-methodPluginDescriptionPage_cannotRenamePluginFolder=Could not rename plugin folder to new name
-methodPluginDescriptionPage_lockPluginLabel=Lock plug-in
-methodPluginDescriptionPage_lockPlugin_message=Lock plug-in change will save and close open editors of elements belong to plug-in ''{0}''. Do you want proceed with this change?
-
-# Process Description
-processDescriptionNameChangeConfirm_title=Rename
-processDescriptionNameChangeConfirm_message=You are about to change the name of this process. This will save this editor and rename the process folder to the new name. Do you want to continue?
-processDescription_configurationDescription=Description:
-processDescription_configurationSectionTitle=Configuration
-processDescription_configurationSectionMessage=Specify all the configurations valid for this process. Select one configuration as the default and it needs to be a super-set of all the other configurations.
-processDescription_configurations=Configurations:
-processDescription_default=(default)
-ProcessDescription_selectConfiguration=Select the configurations to add
-ProcessDeleteAction_deletecofirm_text0=This will save the current editor and the change will be permanent. Are you sure you want to delete ''{0}''?
-ProcessDeleteAction_selectDescriptorsToDelete=The following descriptors are not used anywhere after deletion of the selected elements.\nSelect descriptors you want to delete.
-
-# View Helper
-viewHelperHealthCheckDialog_title=Library Health Check
-viewHelper_performHealthCheck=Performing health check on library...
-viewHelperHealthCheckDialog_message=The health check on open library is successfully completed. See the report in the log file.
-
-# Attach Guidance File Dialog
-attachGuidanceFileDialog_title=Attach File
-
-# Create Element Error Dialog
-createElementDialog_title=Create New {0}
-createNewElementError_msg=Error creating new {0}.
-
-dlgTitle_reloadLibrary=Reload Library
-createElementError_reason=The {0} name cannot be empty.\n\nSpecify a valid name and try again.
-deleteConfigError_reason=The configuration is referenced by process ''{0}''
-
-# ChangeBoundsCommand
-gef_changeBoundsCommand_label=Change Bounds
-# ChangeNameCommand
-gef_changeNameCommand_label=Change Name
-gef_changeNameCommand_undoMessage=Cannot undo the name change.\n\nUndo name change is not allowed if previous name is null.
-# ChangePropertyValueCommand
-gef_changePropertyValueCommand_label=Change Property Value
-# CreateBendpointCommand
-gef_createBendpointCommand_label=Create Bendpoint
-# CreateLinkCommand
-gef_createLinkCommand_label=Link Creation
-# CreateNodeCommand
-gef_createNodeCommand_label=Create New Node
-# DeleteBendpointCommand
-gef_deleteBendpointCommand_label=Delete Bendpoint
-# DeleteCommand
-gef_deleteCommand_label=Delete
-# DeleteLinkCommand
-gef_deleteLinkCommand_label=Delete Connection
-# MoveBendpointCommand
-gef_moveBendpointCommand_label=Move Bendpoint
-# ReconnectLinkCommand
-gef_reconnectLinkCommand_label=Reconnect Link
-
-# ValidatingDirectEditManager
-gef_validatingDirectEditManager_bringDownPrompt=The name cannot be empty. Please specify a valid name.
-# ValidatingFreeTextEditManager
-gef_validatingFreeTextEditManager_bringDownPrompt=The name cannot be empty. Please specify a valid name.
-# WorkProductNodeEditPart
-gef_workProductNodeEditPart_validateMessage=The name cannot be empty. Please specify a valid name.
-
-# ElementsViewDeleteAction
-actions_ElementsViewDeleteAction_message=The configuration ''{0}'' cannot be deleted since it is still in use by process ''{1}''.
-
-# LibraryActionBarContributor
-actions_LibraryActionBarContributor_deleteErrorTitle=Delete Error
-actions_LibraryActionBarContributor_deleteErrorMessage=Unhandled exception
-actions_LibraryActionBarContributor_deleteErrorReason=See details
-
-# MethodElementEditor
-editors_MethodElementEditor_saveErrorTitle=Save Error
-editors_MethodElementEditor_saveErrorMessage1=IUPA0020E: Error saving file
-editors_MethodElementEditor_saveErrorMessage2=Commit Error
-editors_MethodElementEditor_saveErrorReason1=See log file for more details
-editors_MethodElementEditor_saveErrorReason2=See details
-editors_MethodElementEditor_renameErrorTitle=Rename Error
-editors_MethodElementEditor_invalidEditorMsg=One or many files of this editor have been removed. The editor is no longer valid and has to close.
-editors_MethodElementEditor_invalidEditorTitle=Invalid Editor
-editors_MethodElementEditor_renameErrorMessage1=Error renaming file(s) ''{0}''
-
-# DescriptionFormPage
-renameError_title=Rename Element
-renameError_msg=IUPA0013E: The rename operation cannot be completed.
-SelectElementDialog_selectelement_text=Select Element
-
-# EditorChooser
-editors_EditorChooser_systemErrorDialog_title=Open Method Editor
-AuthoringUIPlugin_AbstractNewLibraryPage_DescriptionLabel=Description:
-AuthoringUIPlugin_SaveAllEditorsPage_SelectAllButtonLabel=Select All
-OpenElementWorkbenchActionDelegate_edit_text0=Edit Element
-editors_EditorChooser_systemErrorDialog_message=IUPA0023E: Cannot open the editor associated with the selected Method element.
-DescriptionFormPage_IconFileChooserDialog_title=Select Image File
-AuthoringUIPlugin_AbstractNewLibraryPage_DefaultLibraryName=New Library
-AuthoringUIPlugin_NewConfigurationMainPage_DescriptionLabel=Description:
-AuthoringUIPlugin_OpenConfigurationMainPage_pageDescription=Select one or more method configurations and click Finish to open them.
-AuthoringUIPlugin_SaveAllEditorsPage_DeselectAllButtonLabel=Deselect All
-ElementsView_migration_dir_dlg_description_text=Specify the directory of newly migrated {0} to replace the selected {0}
-editors_EditorChooser_systemErrorDialog_reason=A system error has occurred. Click Details for more information.\n\nClose some of the opened editors and try again.
-
-# DescriptionFormPage
-forms_DescriptionFormPage_imageTooBigDialog_title=Image is invalid
-forms_DescriptionFormPage_imageTooBigDialog_template=IUPA0031E: The selected image ''{0}'' is larger than the allowed size ({1} by {2}). Please select another image.
-forms_DescriptionFormPage_imageNotFoundDialog_title=Image is invalid
-forms_DescriptionFormPage_imageNotFoundDialog_template=IUPA0032E: The selected file ''{0}'' does not exist. Please select another image.
-DescriptionFormPage_ShapeIconPreview_SelectButtonLabel=Select...
-AuthoringUIPlugin_AbstractNewLibraryPage_DefaultLibraryDescription=Method library description
-AuthoringUIPlugin_NewConfigurationMainPage_DefaultBriefDescription=Method configuration description
-AuthoringUIPlugin_SaveAllEditorsPage_saveAndClosePageDescription=All editors must be closed. Select the ones that need to be saved first, if applicable.
-
-# TemplateDescriptionPage
-forms_GuidanceWithAttachmentsDescriptionPage_alreadyAttached_msg=The selected file is already an attachment to this Guidance.
-
-# New Library Error Dialog
-newLibraryError_msg=IUPA0014E: Unable to create the method library.
-newLibraryInternlError_reason=An internal error has occurred.
-newLibraryError_reason1=The specified method library path ''{0}'' is invalid.
-newLibraryError_reason2=A method library already exists in ''{0}''.
-newLibraryError_reason3=The specified method library folder ''{0}'' cannot be created.
-newLibraryError_advice=Select OK to specify another method library name or location.
-
-#Process literals
-Process_ExternalID=External ID:
-Process_Purpose=Purpose:
-Process_Scope=Scope:
-Process_UsageNotes=Usage Notes:
-Process_Alternatives=Alternatives:
-Process_HowToStaff=How to Staff:
-Process_KeyConsideration=Key Considerations:
-Process_Scale=Scale:
-Process_ProjectCharacteristics=Project Characteristics:
-Process_RiskLevel=Risk Level:
-Process_EstimatingTechnique=Estimating Techniques:
-Process_ProjectMemberExpertise=Project Member Expertise:
-Process_TypeOfContract=Type Of Contract:
-
-# Editor Preview Navigation Buttons
-backButton_text=Back
-forwardButton_text=Forward
-forward_text=Forward
-stopButton_text=Stop
-refreshButton_text=Refresh
-refresh_text=Refresh
-newname_text=New name:
-printButton_text=Print
-
-# Context menus
-_UI_RefreshViewer_menu_item=&Refresh
-_UI_ShowPropertiesView_menu_item=&Show Properties
-
-_UI_MethodEditor_menu=&Method Editor
-_UI_CreateChild_menu_item=&New
-_UI_CreateSibling_menu_item=N&ew Sibling
-
-_UI_SelectionPage_label=Selection
-_UI_ParentPage_label=Parent
-_UI_ListPage_label=List
-_UI_TreePage_label=Tree
-_UI_TablePage_label=Table
-_UI_TableTreePage_label=TableTree
-_UI_ObjectColumn_label=Object
-_UI_SelfColumn_label=Self
-
-_UI_NoObjectSelected=Selected Nothing
-_UI_SingleObjectSelected=Selected Object: {0}
-_UI_MultiObjectSelected=Selected {0} Objects
-
-_UI_OpenEditorError_label=Open Editor
-
-_UI_Wizard_category=Example EMF Model Creation Wizards
-
-_UI_MethodModelWizard_label=Method Model
-_UI_MethodModelWizard_description=Create a new Method model
-
-_UI_MethodEditor_label=Method Model Editor
-
-_UI_MethodEditorFilenameDefaultBase=My
-_UI_MethodEditorFilenameExtension=method
-
-_UI_Wizard_label=New
-
-_WARN_FilenameExtension=The filename must end in ''.{0}''
-
-_UI_ModelObject=Model Object
-_UI_XMLEncoding=XML Encoding
-_UI_XMLEncodingChoices=UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
-_UI_Wizard_initial_object_description=Select a model object to create
-
-_UI_FileConflict_label=File Conflict
-_WARN_FileConflict=There are unsaved changes that conflict with changes made outside the editor. Do you wish to discard this editor's changes?
-
-# Add Link Dialog
-addLinkDialog_linkType=Type:
-openLinkCheckbox_text=Open link in a separate browser window
-
-# Add Image Dialog
-heightLabel_text=Height:
-widthLabel_text=Width:
-ElementsView_20=capability pattern
-ElementsView_21=delivery process
-ElementsView_22=process
-ElementsView_35={0} is read-only. Make it writable before continuing.
-ElementsView_36=Error loading library
-altTagLabel_text=ALT tag:
-imageSizeLabel_text=Height and width of image must be at least 10 and no more than 600. Invalid height and width will be converted to a suitable size.
-
-# Process Editor
-ProcessEditor=ProcessEditor
-ProcessEditor_Name=Name
-ProcessEditor_PresentationName=Presentation Name
-ProcessEditor_Index=Index
-ProcessEditor_Predecessors=Predecessors
-#ConfigurationPage_Selected=Selected: 
-ChecklistOrder_description=Select a check item and click Up or Down to change its order.
-ElementsView_renaming_text=Renaming...
-ProcessEditor_ModelInfo=Model Info
-ProcessEditor_Prefix=Prefix
-MoveDialog_move_text=Move
-ChecklistOrder_title=Order Check Items
-ProcessEditor_Repetable=Repeatable
-ProcessEditor_Ongoing=Ongoing
-ProcessEditor_Action_Synchronization=Synchronize...
-ProcessEditor_EventDriven=Event-Driven
-ProcessEditor_Deliverable=Deliverable
-ProcessEditor_Optional=Optional
-FilterDialog_Type_text=Method Element Type:
-FilterDialog_ExpandAll=Expand All
-MoveDialog_moving_text=Moving...
-DescriptionFormPage_LoadShapeIconWarning=IUPA0025W: Shape icon for {0} is not found in path: {1}
-DescriptionFormPage_LoadShapeIconError=IUPA0025E: Error: Shape icon section: {0}
-AuthoringUIPlugin_AbstractNewLibraryPage_NameLabel=Name:
-AuthoringUIPlugin_NewConfigurationMainPage_pageTitle=Create a new method configuration
-AuthoringUIPlugin_NewConfigurationMainPage_NameLabel=Name:
-AuthoringUIPlugin_newConfigurationWizard_title=New Method Configuration
-
-# New Method Library Wizard
-newLibraryWizard_title=New Method Library
-newLibraryWizardMainPage_title=Create a new method library.
-newLibraryWizardMainPage_description=Specify a path and description for the new method library.
-newLibraryWizardMainPage_description_1=Specify a name, description and storage type for the new method library.
-libraryPathLabel_text=Path:
-libraryTypeLabel_text=Type:
-
-AuthoringUIPlugin_SaveAllEditorsPage_saveTitle=Save changes
-AuthoringUIPlugin_SaveAllEditorsPage_saveDescription=One or more method elements have been modified. Select the ones that need to be saved.
-AuthoringUIPlugin_OpenConfigurationMainPage_pageTitle=Open Method Configurations
-AuthoringUIPlugin_OpenConfigurationWizard_windowTitle=Open Method Configurations
-ElementsView_replaceingwithformat_text=Replacing {0}...
-DescriptionFormPage_LoadNodeIconWarning=IUPA0026W: Node icon for {0} is not found in path: {1}
-MessageLabelProvider_unselectedpackages=''{0}'' contains elements that reference elements in unselected packages
-DescriptionFormPage_LoadNodeIconError=IUPA0026E: Error: Node icon section: {0}
-StepsOrderDialog_steps=Steps: 
-StepsOrderDialog_title=Order Task Steps
-ProcessEditor_Planned=Planned
-specifydirectory_text=Please specify a directory to save the method library to
-ProcessEditor_MultipleOccurrences=Multiple Occurrences
-ProcessEditor_EntryState=Entry State
-ProcessEditor_ExitState=Exit State
-selectColumnstoAdd_text=Select the columns to add
-ProcessEditor_Type=Type
-ProcessEditor_Team=Team
-FilterDialog_title=Select Dialog: 
-
-ProcessEditor_Action_Add=Add from &Method Content...
-FilterDialog_CollapseAll=Collapse All
-OpenCheatsheetView_title=Open CheatSheet View
-ProcessEditor_Action_RollUp=Roll &Up
-ProcessEditor_Action_RollDown=Roll Dow&n
-ProcessEditor_Action_MoveUp=M&ove Up
-ProcessEditor_Action_MoveDown=Move Do&wn
-ProcessEditor_Action_Reveal=Reve&al
-ProcessEditor_Action_Copy=&Copy...
-FilterDialog_Pattern_text=Name patterns (matching names will be shown): 
-ProcessEditor_Action_Preferences=Preferences...
-MethodLibraryEditor_title=Method Library: 
-#MessageView_selected_text=Selected: 
-MessageView_errmsg_text=Description
-ElementsView_err_saving=IUPA0027E: Error saving ''{0}''{1}
-
-err_copying_file_title=Error copying file
-err_copying_file_error=IUPA0028E: The icon could not be assigned. 
-err_copying_file_reason=An error occurred while copying the selected file. Click Details for more information.
-err_processing_file_title=Error processing file
-editConfiguration_tooltip=Edit configuration
-editDialog_msgCannotEdit=IUPA0015E: Cannot edit element
-SaveThisAction_saveobject=Save This Object...
-ElementsView_replace_text=Replace
-ProcessEditor_Action_Extend=&Extend...
-MoveDialog_destination_text=Choose destination for selected element(s):
-chooseDefaultDirectory_text=Choose a default directory for libraries:
-ProcessEditor_Action_Suppress=&Suppress
-ProcessEditor_Action_Suppress2=&Publishing Options...
-ProcessEditor_Action_AssignUserDiagram=&User Defined Diagrams...
-UserDefinedDiagramDialog_title=Assign user defined diagrams
-UserDefinedDiagramDialog_adImage=Activity Diagram:
-UserDefinedDiagramDialog_addImage=Activity Detail Diagram:
-UserDefinedDiagramDialog_wpdImage=Work Product Depenedency Diagram:
-UserDefinedDiagramDialog_notaFile=IUPA0004E: The specified path is not a file.
-UserDefinedDiagramDialog_assignButton=Select...
-UserDefinedDiagramDialog_enteredImageNotFound=IUPA0024E: The specified image does not exist in the library. Make sure you enter the path relative to the library's root directory.
-UserDefinedDiagramDialog_selectedImageNotFound=IUPA0030E: The image you selected is not in the library.
-UserDefinedDiagramDialog_useADImage=Use Activity diagram image for browsing and publishing
-UserDefinedDiagramDialog_useADDImage=Use Activity detail diagram image for browsing and publishing
-UserDefinedDiagramDialog_useWPDImage=Use Work product dependency diagram image for browsing and publishing
-ProcessEditor_Action_Contribute=Local Contr&ibution
-ProcessEditor_Action_Replace=Local Repl&acement
-ProcessEditor_Action_Diagrams=Dia&grams
-ProcessEditor_action_deepCopy=&Deep Copy...
-FilterDialog_BriefDescription=Brief Description:
-ConfigurationPage_hideToolTip=Show/Hide Unchecked Elements
-ConfigurationPage_Description=Description:
-ProcessEditor_Action_SuppressAll=Publish &None
-FilterDialog_Pattern_description=Patterns are separated by comma, where *=any string, ?=any character
-ConfigurationPage_TreeTitleLabel=Content:
-ConfigurationPage_LoadingMessage=Loading configuration, please wait ...
-MoveDialog_validdestination_text=The specified move destination is invalid.
-MoveDialog_cannotModifyDestination=IUPA0034E: The selected destination cannot be modified.
-ProcessEditor_Action_RevealAll=Publish &All
-ProcessEditor_Action_OpenBaseActivity=Open &Base Activity
-ProcessFormEditor_expanAllActionLabel=E&xpand All
-ProcessFormEditor_collapseAllActionLabel=Co&llapse All
-ProcessEditor_Action_OpenActivityDiagram=Open &Activity Diagram
-ProcessEditor_promptToDeleteBeforeReveal=The unsuppressed descriptors listed in Details must be deleted to avoid duplication after revealing the selected elements. Click OK if you want to delete them and continue.
-ProcessEditorPreferencePage_SelectColumns=Select the columns to add
-ProcessEditor_Action_OpenActivityDetailDiagram=Open Activity &Detail Diagram
-ProcessEditorPreferencePage_ColumnSelection=Column selection:
-ProcessEditorPreferencePage_switchConfiguration=Switch to the Process' default configuration when activating a Process editor
-ProcessEditorPreferencePage_suppressionGroupTitle=Suppression
-ProcessEditorPreferencePage_inheritSuppressionState=Inherit suppression states
-ProcessEditor_Action_OpenWorkProductDependencyDiagram=Open &Work Product Dependency Diagram
-DescriptionFormPage_ShapeIconPreview_ClearButtonLabel=Clear
-DescriptionFormPage_NodeIconPreview_SelectButtonLabel=Select...
-ProcessEditor_Action_InsertNewPhase=Insert New Phase
-ViewHelper_reloadLibOnRollbackError=Could not recover from a persistence error. The library needs to be reloaded to restore its original state.
-ViewHelper_alreadydeleted_text=The element ''{0}'' is already deleted.
-ViewHelper_alreadydeletedconfirm_text=The element ''{0}'' is already deleted. Do you want to remove it from ''{1}''?
-ConfigurationPage_AddMissingToolTip=Add Missing References
-ConfigurationDescriptionDescription=Description
-ConfigurationDescriptionGeneralInfo=General Information 
-ProcessEditor_Action_ApplyPattern=Apply Pa&ttern
-MoveDialog_selectdestination_text=Please select a destination.
-MoveDialog_nomove_destination_problem_msg=No move destination specified.
-MethodLibraryEditor_troubleobject=. Trouble object: 
-MessageLabelProvider_errchildpkgs=A child content package or process contains elements with missing references
-ProcessEditor_SuppressDialog_Title=Diagram Publishing Options
-ProcessEditor_SuppressDialog_Message=Please select the diagram(s) to publish or deselect to not publish
-ProcessEditor_Title=Process Editor: 
-SaveAswithdots_text=Save As...
-ProcessEditor_WorkBreakdownStructure=Work Breakdown Structure
-ProcessEditor_TeamAllocation=Team Allocation
-ProcessEditor_WorkProductUsage=Work Product Usage
-ProcessEditor_ConsolidatedView=Consolidated View
-ProcessEditor_confirmAutoSynch=This operation refreshes the selected descriptors or all descriptors below the selected activities that have been marked as "Synchronized with source" in the General tab of their Properties view.  It refreshes these descriptors with the original properties of the linked method content elements under the process' default configuration.  Note that it will not update any dynamically linked (green italic) descriptors.  Do you want to proceed?
-ProcessEditor_defaultSynchronization=Default Synchronization from method content
-ConfigurationPage_Description1=Configuration
-ConfigurationPage_Description2=Plug-in and Package Selection
-NewLibraryDialog_newlibrary_as=Create New Library As
-NewPluginDialog_newplugin_text=New Method Plug-in
-SelectElementDialog_title_text=Select the element or one of its contributors:
-OpenConfigDialognewconfig_text=New Configuration:
-processBreakdownStructureFormPage_BSEditor=Process Editor
-
-# AbstractDiagramEditor
-AbstractDiagramEditor_alignMenu_text=Align
-AbstractDiagramEditor_refreshFromBaseActivity_text=Refresh from Base Activity
-AbstractDiagramEditor_formatTextBoxActivity_text=Format Text Box...
-AbstractDiagramEditor_hAlignAverageAction_text=Horizontally to Average
-AbstractDiagramEditor_hAlignFirstSelectedAction_text=Horizontally to First Selected
-AbstractDiagramEditor_vAlignAverageAction_text=Vertically to Average
-MethodLibraryDescriptionFormPage_section_title=General Information
-MoveDialog_invalid_move_destination_problem_msg=IUPA0041E: The selected element(s) cannot be moved to the specified destination.
-MethodLibraryEditor_savemodellibrary=Saving model library ...
-MethodLibraryEditor_error_dialog_title=Error
-MethodLibraryEditor_save_library_problem_msg=IUPA0033E: Problem encountered in saving library.
-MethodElementDeleteAction_deleteconfirm_text=Are you sure you want to delete ''{0}''?
-ContentElementsOrderDialog_ContentElement_text=Content Elements: 
-AuthoringUIPlugin_AbstractNewLibraryPage_BrowseButtonLabel=Browse...
-AuthoringUIPlugin_NewConfigurationMainPage_pageDescription=Specify a name and description for the new method configuration.
-AuthoringUIPlugin_SaveAllEditorsPage_saveAndClosePageTitle=Save changes and close all editors
-AbstractDiagramEditor_vAlignFirstSelectedAction_text=Vertically to First Selected
-AbstractDiagramEditor_Save_text=Save
-AttachmentDialogattachFile_text=Attach File
-ConfigurationPage_ConfigContent=Configuration Content
-OpenConfigDialogopenconfig_text=Open Configuration
-ElementsView_replaceAction_text=Replace...
-AbstractDiagramEditor_Save_message=Saving {0}
-ConfigurationPage_ShowErrorToolTip=Show configuration warning log viewer
-ConfigurationDescriptionFormPrefix=Configuration: 
-ChecklistOrder_checklistitems_text=Check Items: 
-AbstractDiagramEditor_MoveNode_label=Move Node
-ConfigurationPage_MakeClosureToolTip=Make Closure by fixing errors
-ConfigurationOrderDialog_description=Order Navigation Views
-NewPluginDialog_referenceplugin_text=Reference Plug-ins:
-AbstractDiagramEditor_createFreeText_text=Create a Free Text
-DescriptionFormPage_NodeIconPreview_Label=Node Icon Preview:
-DiagramValidation_err_cannot_connect_text=IUPA0032W: Cannot connect
-DiagramValidation_err_samepredandsuc_text=IUPA0033W: Cannot have the same breakdown element as predecessor and successor
-
-# EditorChooser
-EditorChooser_loaddErrorDlgTitle=Open Editor
-EditorChooser_ResourcesError=This element has errors. It is recommended to fix these errors before continuing (see details).\n\nClick OK to continue without opening the editor. Close this dialog to open the editor.
-ConfigurationPage_FormPrefix=Configuration: 
-ConfigurationDescriptionName=Name:
-AttachmentDialogFileURL_text=File URL:
-StepsOrderDialog_description=Select a step and click Up or Down to change its order.
-MethodLibraryEditor_err_save=Error during saving
-MessageView_errelement_text=Referencing Element
-MessageView_refelement_text=Referenced Element
-
-#Activity Diagram
-ActivityDiagramEditor_createStartNode_text=Create a Start Node
-ConfigurationPage_ConfigContentDescription=Select the method plug-ins, content packages and processes that will be included in this configuration.
-ContentElementsOrderDialog_description_text=Custom Category's content elements order dialog
-AuthoringUIPlugin_AbstractNewLibraryPage_DirectoryLabel=Directory:
-RootPrefPage_enableprocesscontribution_text=Enable Process Contribution
-ConfigurationDescriptionDescription_text=Provide general information about this method configuration.
-ConfigurationDescriptionDescriptionLabel=Description:
-ConfigurationOrderDialog_NavigationViews=Navigation Views: 
-ContributionSelection_filterdialog_title=Choosing Contributors for ''{0}''
-ElementsView_openVariabilityDialogAction_text=&Open via variability elements
-VariabilitySelection_filterdialog_title=choosing variability elements for ''{0}''
-VariabilitySelection_filterdialog_viewerLabel=Variability elements for ''{0}''
-DescriptionFormPage_ShapeIconPreview_Label=Shape Icon Preview:
-DiagramValidation_err_cannot_delete_text=Cannot delete
-ActivityDiagramEditor_openActivityDetailDiagram_text=Open Activity Detail Diagram 
-MethodLibraryDescriptionFormPage_section_description=Provide general information about this method library.
-DescriptionFormPage_NodeIconPreview_ClearButtonLabel=Clear
-WPCompartmentFigure_0=New WorkProduct Descriptor
-promptfor_publish_unopen_activitydd_text=Publish or browse activity detail diagrams that have not been created in process editor
-prompt_for_publish_extend_activity_diagram=Publish or browse activity diagrams for unmodified activity extensions
-
-#ConfigProcessViewDialog
-ConfigProcessViewDialog_NamePattern=Name patterns (matching names will be shown):
-showInResourceNavigatorAction_label=&Show in Resource Navigator
-ConfigProcessViewDialog_Pattern=Patterns are separated by comma, where *=any string, ?=any character
-err_processing_file_description=IUPA0029E: An error occurred while processing the selected file. Click Details for more information.
-ConfigProcessViewDialog_CategoryType=Category Type :
-ConfigProcessViewDialog_BriefDescription=Brief Description:
-ConfigProcessViewDialog_SelectCategories=Select Categories
-
-#log messages
-cheatsheet_load_failure_log_msg=Failed to open the requested cheatsheet: 
-
-newConfigurationWirazd_createError=IUPA0035E: The configuration cannot be created successfully
-newPluginWizard_createError=IUPA0036E: The plug-in cannot be created successfully
-errorDialog_moveError=IUPA0037E: The element cannot be moved successfully
-renameDialog_renameError=IUPA0038E: The element cannot be renamed successfully
-errorDialog_createError=IUPA0039E: The element cannot be created successfully
-duplicatePluginNameError_msg=IUPA0101E: The name ''{0}'' already exists. Enter a different name and try again.
-
-#New Strings for ProcessEditor Context menu diagram images
-ProcessEditor_Action_AddADImage=Assign AD Image...
-ProcessEditor_refreshErrorTitle=Refresh Error
-ProcessEditor_refreshErrorMsg=Error refreshing editor
-ProcessEditor_Action_AddADDImage=Assign ADD Image...
-ProcessEditor_Action_AddWPDImage=Assign WPD Image...
-ProcessEditor_Action_UseADImageInPublishing=Use AD Image in Publishing
-ProcessEditor_promptToDeleteBeforeSuppress=The suppressed descriptors listed in Details must be deleted to avoid duplication after suppressing the selected elements. Click OK if you want to delete them and continue.
-ProcessEditor_Action_UseADDImageInPublishing=Use ADD Image in Publishing
-ProcessEditor_Action_UseWPDImageInPublishing=Use WPD Image in Publishing
-ProcessEditor_DiagramImage_InputDialog_initialValue=Image Path
-ProcessEditor_Action_ShowLinkedElementinLibraryView=S&how Linked Element in Library View
-ProcessEditor_updateSuppressionFromBaseAction_label=Update Suppression from &Base
-ProcessEditor_ContextMenu_DiagramImages=Diagram Images
-
-#Strings for synchronization wizard on process editor's BS
-synchronizationWizard_descriptionPage_title=Synchronization Description
-synchronizationWizard_descriptionPage_text=Read the information below \
-that explains what custom synchronization will accomplish.
-synchronizationWizard_selectConfigPage_title=Select Configuration
-synchronizationWizard_selectConfigPage_text=Select the configuration \
-that you want to use for the synchronization.  Your selection determines which contributions and replacements will be used for the synchronization.
-synchronizationWizard_selectConfigPage_configLabel=Configuration:
-synchronizationWizard_selectDetailsPage_title=Select Properties to Synchronize
-synchronizationWizard_selectDetailsPage_properties_lable=Properties
-synchronizationWizard_selectDetailsPage_name_lable=Name
-synchronizationWizard_selectDetailsPage_presentationName_lable=Presentation Name
-synchronizationWizard_selectDetailsPage_briefDesc_lable=Brief Description
-synchronizationWizard_selectDetailsPage_optionalInouts_label=Optional Inputs
-synchronizationWizard_selectDetailsPage_mandatoryInputs_lable=Mandatory Inputs
-synchronizationWizard_selectDetailsPage_outputs_label=Outputs
-synchronizationWizard_selectDetailsPage_primaryPerformer_label=Primary Performer
-synchronizationWizard_selectDetailsPage_addnPerformers_lable=Additional Performers
-synchronizationWizard_selectDetailsPage_responsibleRoles_lable=Responsible Roles
-synchronizationWizard_selectDetailsPage_contnArtifacts_label=Contained Artifacts
-synchronizationWizard_selectDetailsPage_dilvedParts_label=Deliverable Parts
-synchronizationWizard_selectDetailsPage_selSteps_label=Steps Selection
-synchronizationWizard_selectDetailsPage_text=Choose the properties of \
-the method content that you want to be considered for synchronization.
-synchronizationWizard_previewPage_title=Synchronization Preview
-synchronizationWizard_previewPage_text=Review the proposed synchronization details below.
-selectEditorsToDiscardConflictChanges=There are unsaved changes that conflict with changes made outside the editors.\nSelect the editors you wish to discard their changes.
-synchronizationWizard_title_text=Synchronization Wizard
-synchronizationWizard_descriptionPage_explainText=This wizard supports you in refreshing \
-the selected descriptors or all descriptors below the selected activities that have been marked as \
-"Synchronize with Source" in the General tab of their Properties view.  Only the properties that you \
-select in this wizard are refreshed in the descriptors.  You can also select any valid configuration \
-for your process to be used when computing the refresh.  Note that the wizard will not update any \
-dynamically linked (green italic) descriptors.
-
-openRTE=Open rich text editor
-closeRTE=Close rich text editor
-
-#New Strings
-rolesets_guidancepage_sectiondescription=Manage the guidance that belong to this role set.
-disciplines_guidancepage_sectiondescription=Manage the guidance that belong to this discipline.
-workproducttypes_guidancepage_sectiondescription=Manage the guidance that belong to this work product kind.
-domains_guidancepage_sectiondescription=Manage the guidance that belong to this domain.
-tools_guidancepage_sectiondescription=Manage the guidance that belong to this tool.
-customcategory_guidancepage_sectiondescription=Manage the guidance that belong to this custom category.
-
-concept_guidancepage_sectiondescription=Manage the guidance that belong to this concept.
-checklist_guidancepage_sectiondescription=Manage the guidance that belong to this checklist.
-example_guidancepage_sectiondescription=Manage the guidance that belong to this example.
-guideline_guidancepage_sectiondescription=Manage the guidance that belong to this guideline.
-roadmap_guidancepage_sectiondescription=Manage the guidance that belong to this roadmap.
-reusableasset_guidancepage_sectiondescription=Manage the guidance that belong to this reusable asset.
-supportingmaterial_guidancepage_sectiondescription=Manage the guidance that belong to this supporting material.
-report_guidancepage_sectiondescription=Manage the guidance that belong to this report.
-practice_guidancepage_sectiondescription=Manage the guidance that belong to this practice.
-template_guidancepage_sectiondescription=Manage the guidance that belong to this template.
-termdefinition_guidancepage_sectiondescription=Manage the guidance that belong to this term definition.
-toolmentor_guidancepage_sectiondescription=Manage the guidance that belong to this tool mentor.
-whitepaper_guidancepage_sectiondescription=Manage the guidance that belong to this whitepaper.
-estimationconsideration_guidancepage_sectiondescription=Manage the guidance that belong to this estimation consideration.
-
-
-#New String Section Description
-role_detailSection_desc=Provide detailed information about this role.
-role_generalInfoSection_desc=Provide general information about this role.
-role_variabilitySection_desc=Specify how this role relates to another role.
-role_versionInfoSection_desc=Provide version information about this role.
-
-task_detailSection_desc=Provide detailed information about this task.
-task_generalInfoSection_desc=Provide general information about this task.
-task_variabilitySection_desc=Specify how this task relates to another task.
-task_versionInfoSection_desc=Provide version information about this task.
-
-artifact_detailSection_desc=Provide detailed information about this artifact.
-artifact_generalInfoSection_desc=Provide general information about this artifact.
-artifact_iconSection_desc=Customize the icons for this artifact.
-artifact_notationSection_desc=Provide delivery information about this artifact.
-artifact_tailoringSection_desc=Provide tailoring information about this artifact.
-artifact_variabilitySection_desc=Specify how this artifact relates to another artifact.
-artifact_versionInfoSection_desc=Provide version information about this artifact.
-
-outcome_detailSection_desc=Provide detailed information about this outcome.
-outcome_generalInfoSection_desc=Provide general information about this outcome.
-outcome_iconSection_desc=Customize the icons for this outcome.
-outcome_notationSection_desc=Provide delivery information about this outcome.
-outcome_tailoringSection_desc=Provide tailoring information about this outcome.
-outcome_variabilitySection_desc=Specify how this outcome relates to another outcome.
-outcome_versionInfoSection_desc=Provide version information about this outcome.
-
-deliverable_detailSection_desc=Provide detailed information about this deliverable.
-deliverable_generalInfoSection_desc=Provide general information about this deliverable.
-deliverable_iconSection_desc=Customize the icons for this deliverable.
-deliverable_notationSection_desc=Provide delivery information about this deliverable.
-deliverable_tailoringSection_desc=Provide tailoring information about this deliverable.
-deliverable_variabilitySection_desc=Specify how this deliverable relates to another deliverable.
-deliverable_versionInfoSection_desc=Provide version information about this deliverable.
-
-discipline_detailSection_desc=Provide detailed information about this discipline.
-discipline_generalInfoSection_desc=Provide general information about this discipline.
-discipline_variabilitySection_desc=Specify how this discipline relates to another discipline.
-discipline_versionInfoSection_desc=Provide version information about this discipline.
-
-domain_detailSection_desc=Provide detailed information about this domain.
-domain_generalInfoSection_desc=Provide general information about this domain.
-domain_variabilitySection_desc=Specify how this domain relates to another domain.
-domain_versionInfoSection_desc=Provide version information about this domain.
-
-workproducttype_detailSection_desc=Provide detailed information about this work product kind.
-workproducttype_generalInfoSection_desc=Provide general information about this work product kind.
-workproducttype_variabilitySection_desc=Specify how this work product kind relates to another work product kind.
-workproducttype_versionInfoSection_desc=Provide version information about this work product kind.
-
-roleset_detailSection_desc=Provide detailed information about this role set.
-roleset_generalInfoSection_desc=Provide general information about this role set.
-roleset_variabilitySection_desc=Specify how this role set relates to another role set.
-roleset_versionInfoSection_desc=Provide version information about this role set.
-
-tool_detailSection_desc=Provide detailed information about this tool.
-tool_generalInfoSection_desc=Provide general information about this tool.
-tool_variabilitySection_desc=Specify how this tool relates to another tool.
-tool_versionInfoSection_desc=Provide version information about this tool.
-
-concept_detailSection_desc=Provide detailed information about this concept.
-concept_generalInfoSection_desc=Provide general information about this concept.
-concept_variabilitySection_desc=Specify how this concept relates to another concept.
-concept_versionInfoSection_desc=Provide version information about this concept.
-
-checklist_detailSection_desc=Provide detailed information about this checklist.
-checklist_generalInfoSection_desc=Provide general information about this checklist.
-checklist_variabilitySection_desc=Specify how this checklist relates to another checklist.
-checklist_versionInfoSection_desc=Provide version information about this checklist.
-
-example_detailSection_desc=Provide detailed information about this example.
-example_generalInfoSection_desc=Provide general information about this example.
-example_variabilitySection_desc=Specify how this example relates to another example.
-example_versionInfoSection_desc=Provide version information about this example.
-
-guideline_detailSection_desc=Provide detailed information about this guideline.
-guideline_generalInfoSection_desc=Provide general information about this guideline.
-guideline_variabilitySection_desc=Specify how this guideline relates to another guideline.
-guideline_versionInfoSection_desc=Provide version information about this guideline.
-
-estimationconsideration_detailSection_desc=Provide detailed information about this estimation consideration.
-estimationconsideration_generalInfoSection_desc=Provide general information about this estimation consideration.
-estimationconsideration_variabilitySection_desc=Specify how this estimation consideration relates to another estimation consideration.
-estimationconsideration_versionInfoSection_desc=Provide version information about this estimation consideration.
-
-practice_detailSection_desc=Provide detailed information about this practice.
-practice_generalInfoSection_desc=Provide general information about this practice.
-practice_variabilitySection_desc=Specify how this practice relates to another practice.
-practice_versionInfoSection_desc=Provide version information about this practice.
-
-report_detailSection_desc=Provide detailed information about this report.
-report_generalInfoSection_desc=Provide general information about this report.
-report_variabilitySection_desc=Specify how this report relates to another report.
-report_versionInfoSection_desc=Provide version information about this report.
-
-resuableasset_detailSection_desc=Provide detailed information about this resuable asset.
-resuableasset_generalInfoSection_desc=Provide general information about this resuable asset.
-resuableasset_variabilitySection_desc=Specify how this resuable asset relates to another resuable asset.
-resuableasset_versionInfoSection_desc=Provide version information about this resuable asset.
-
-roadmap_detailSection_desc=Provide detailed information about this roadmap.
-roadmap_generalInfoSection_desc=Provide general information about this roadmap.
-roadmap_variabilitySection_desc=Specify how this roadmap relates to another roadmap.
-roadmap_versionInfoSection_desc=Provide version information about this roadmap.
-
-supportingmaterial_detailSection_desc=Provide detailed information about this supporting material.
-supportingmaterial_generalInfoSection_desc=Provide general information about this supporting material.
-supportingmaterial_variabilitySection_desc=Specify how this supporting material relates to another supporting material.
-supportingmaterial_versionInfoSection_desc=Provide version information about this supporting material.
-
-template_detailSection_desc=Provide detailed information about this template.
-template_generalInfoSection_desc=Provide general information about this template.
-template_variabilitySection_desc=Specify how this template relates to another template.
-template_versionInfoSection_desc=Provide version information about this template.
-
-termdefinition_detailSection_desc=Provide detailed information about this term definition.
-termdefinition_generalInfoSection_desc=Provide general information about this term definition.
-termdefinition_variabilitySection_desc=Specify how this term definition relates to another term definition.
-termdefinition_versionInfoSection_desc=Provide version information about this term definition.
-
-toolmentor_detailSection_desc=Provide detailed information about this tool mentor.
-toolmentor_generalInfoSection_desc=Provide general information about this tool mentor.
-toolmentor_variabilitySection_desc=Specify how this tool mentor relates to another tool mentor.
-toolmentor_versionInfoSection_desc=Provide version information about this tool mentor.
-
-whitepaper_detailSection_desc=Provide detailed information about this whitepaper.
-whitepaper_generalInfoSection_desc=Provide general information about this whitepaper.
-whitepaper_variabilitySection_desc=Specify how this whitepaper relates to another whitepaper.
-whitepaper_versionInfoSection_desc=Provide version information about this whitepaper.
-
-disciplinegrouping_detailSection_desc=Provide detailed information about this discipline grouping.
-disciplinegrouping_generalInfoSection_desc=Provide general information about this discipline grouping.
-disciplinegrouping_variabilitySection_desc=Specify how this discipline grouping relates to another discipline grouping.
-disciplinegrouping_versionInfoSection_desc=Provide version information about this discipline grouping.
-
-rolesetgrouping_detailSection_desc=Provide detailed information about this roleset grouping.
-rolesetgrouping_generalInfoSection_desc=Provide general information about this roleset grouping.
-rolesetgrouping_variabilitySection_desc=Specify how this roleset grouping relates to another roleset grouping.
-rolesetgrouping_versionInfoSection_desc=Provide version information about this roleset grouping.
-
-customcategory_detailSection_desc=Provide detailed information about this custom category.
-customcategory_generalInfoSection_desc=Provide general information about this custom category.
-customcategory_variabilitySection_desc=Specify how this custom category relates to another custom category.
-customcategory_versionInfoSection_desc=Provide version information about this custom category.
-customcategory_IconSection_desc=Customize the icons for this custom category.
-
-concept_iconSection_desc=Customize the icons for this concept.
-checklist_iconSection_desc=Customize the icons for this checklist.
-toolmentor_iconSection_desc=Customize the icons for this tool mentor.
-whitepaper_iconSection_desc=Customize the icons for this whitepaper.
-estimationconsideration_iconSection_desc=Customize the icons for this estimation consideration.
-termdefinition_iconSection_desc=Customize the icons for this term definition.
-template_iconSection_desc=Customize the icons for this template.
-reusableasset_iconSection_desc=Customize the icons for this reusable asset.
-report_iconSection_desc=Customize the icons for this report.
-practice_iconSection_desc=Customize the icons for this practice.
-example_iconSection_desc=Customize the icons for this example.
-guideline_iconSection_desc=Customize the icons for this guideline.
-roadmap_iconSection_desc=Customize the icons for this roadmap.
-supportingmaterial_iconSection_desc=Customize the icons for this supporting material.
-
-publish_categories_text=Publish this category with the categorized method elements.
-editor_error_activated_outofsync_title=File Changed
-editor_error_activated_outofsync_message=The file has been changed on the file system. Do you want to load the changes?
-
-activity_variability_error_title=Activity Variability
-
-variability_error_title=Variability
-
-circular_dependency_error_title=Circular dependency
-
-apply_pattern_error_title=Apply Pattern
-apply_pattern_error_msg=Activity ''{0}'' cannot apply pattern with ''{1}'' since it will result in circular dependency.
-
-#set default history size
-default_list_length_label=Default History size:
-
-ProcessEditor_Action_Suppress_Task=Suppress Tasks
-ProcessEditor_Action_Reveal_Task=Reveal Tasks
-
-#Extend Semantics preference check
-extend_semantics_button_text=Use new &Extends semantics
-extend_semantics_text=Extending elements override to-many relationships instead of adding to the inherited elements.
-
-################################################
-# EPF 1.2 nl strings.
-###################################
-DescriptionFormPage_iconSection_fileNameConflict_title=File Name Conflict
-DescriptionFormPage_iconSection_fileNameConflict_msg=IUPA0047W: The image file ''{0}'' already exists in the method library resource folder ''{1}''.
-DescriptionFormPage_iconSection_fileNameConflict_note=Note: Another method element might reference this element.
-DescriptionFormPage_iconSection_fileName_replace_msg= Replace existing image with new image
-DescriptionFormPage_iconSection_fileName_unique_msg= Specify unique name for this image
-DescriptionFormPage_iconSection_fileName_selectAction_label=Select action:
-
-#Layout Action group
-LayoutActionGroup_label= &Plugin Presentation
-LayoutActionGroup_flatLayoutAction_label= &Flat
-LayoutActionGroup_hierarchicalLayoutAction_label= &Hierarchical
-
-################################################################################
-# THE FOLLOWING PROPERTIES SHOULD NOT BE TRANSLATED!!!
-################################################################################
-
-ChangeHistoryDialog_delimiter=|
-MarkerResolutionGenerator_showOwnerInLibraryView=Show owner of this unresolved reference in Library view
-MarkerResolutionGenerator_removeUnresolvedReference=Remove this unresolved reference
-promptDeleteCustomCategoryBeforeRemoveLastRefToIt=You are about to remove the last reference to {0} in the plug-in. The element(s) will be deleted. Do you want to continue?
-
-############################################################################
-#Below property "editor_title_colon_with_spaces" should not be translated
-#Don't delete a space after ": "
-#############################################################################
-editor_title_colon_with_spaces=: 
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/UIActionDispatcher.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/UIActionDispatcher.java
deleted file mode 100755
index 6a58381..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/UIActionDispatcher.java
+++ /dev/null
@@ -1,304 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.dialogs.ContributionSelection;
-import org.eclipse.epf.authoring.ui.editors.EditorChooser;
-import org.eclipse.epf.authoring.ui.views.ConfigurationView;
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.common.utils.PerspectiveUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IPerspectiveDescriptor;
-import org.eclipse.ui.IPerspectiveListener;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * Handles UI actions in the workbench.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class UIActionDispatcher implements ISelectionProvider {
-
-	private static UIActionDispatcher instance = null;
-
-	protected List selectionChangedListeners = new ArrayList();
-
-	protected List doubleClickListeners = new ArrayList();
-
-	private CurrentSelection currentSelection = new CurrentSelection();
-
-	private IDoubleClickListener doubleClickListener = null;
-
-	/**
-	 * Returns the singleton instance.
-	 */
-	public static UIActionDispatcher getInstance() {
-		if (instance == null) {
-			synchronized (UIActionDispatcher.class) {
-				if (instance == null) {
-					instance = new UIActionDispatcher();
-				}
-			}
-		}
-		return instance;
-	}
-
-	/**
-	 * Private default constructor.
-	 */
-	private UIActionDispatcher() {
-		this(null);
-	}
-
-	/**
-	 * create an action dispatcher of my own
-	 * 
-	 * @param owner
-	 */
-	public UIActionDispatcher(Object owner) {
-		// Create the double click listener used for launching the Method
-		// editors.
-		doubleClickListener = new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent e) {
-				ISelection selection = e.getSelection();
-				if (selection != null) {
-					IWorkbenchWindow window = PlatformUI.getWorkbench()
-							.getActiveWorkbenchWindow();
-					IWorkbenchPartSite site = window.getActivePage()
-							.getActivePart().getSite();
-
-					IStructuredSelection sel = (IStructuredSelection) selection;
-					Object[] selObjs = sel.toArray();
-					Object selectedObject = null;
-
-					if ((selObjs != null) && (selObjs.length > 0)) {
-						// Open the Authoring persepective.
-						UIActionDispatcher.openAuthoringPerspective();
-
-						// Locate the selected Method element.
-						Object obj = TngUtil.unwrap(selObjs[0]);
-
-						if (site.equals(ConfigurationView.getView().getSite())) {
-							// Double-click orginated from the Configuration
-							// view.
-							if (obj instanceof VariabilityElement) {
-								VariabilityElement element = (VariabilityElement) obj;
-								ContributionSelection contribSelection = new ContributionSelection();
-								selectedObject = contribSelection
-										.getSelectedContributor(element);
-							}
-						} else {
-							selectedObject = obj;
-						}
-
-						if (selectedObject != null) {
-							EditorChooser.getInstance().openEditor(
-									selectedObject);
-						}
-					}
-				}
-			}
-		};
-
-		// Add a perspective listener to enable/disable double-click listening.
-		IWorkbenchWindow activeWorkbenchWindow = AuthoringUIPlugin.getDefault()
-				.getWorkbench().getActiveWorkbenchWindow();
-		if (activeWorkbenchWindow != null) {
-			activeWorkbenchWindow
-					.addPerspectiveListener(new IPerspectiveListener() {
-						public void perspectiveActivated(IWorkbenchPage page,
-								IPerspectiveDescriptor desc) {
-							if (desc.getId().equals(
-									AuthoringPerspective.PERSPECTIVE_ID)) {
-								addDoubleClickListener(doubleClickListener);
-							} else {
-								removeDoubleClickListener(doubleClickListener);
-							}
-						}
-
-						public void perspectiveChanged(IWorkbenchPage page,
-								IPerspectiveDescriptor desc, String id) {
-						}
-					});
-		}
-
-		if (PerspectiveUtil
-				.isActivePerspective(AuthoringPerspective.PERSPECTIVE_ID)) {
-			addDoubleClickListener(doubleClickListener);
-		}
-	}
-
-	public static void editConfiguration(String configName) {
-	}
-
-	/**
-	 * Open library perspective
-	 *
-	 */
-	public static void openLibraryPerspective() {
-		PerspectiveUtil.openPerspective(BrowsingPerspective.PERSPECTIVE_ID);
-		IWorkbenchPage wkbPage = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getActivePage();
-		IViewPart viewPart = wkbPage.findView(LibraryView.VIEW_ID);
-		if (viewPart != null)
-			wkbPage.hideView(viewPart);
-		viewPart = wkbPage.findView(ConfigurationView.VIEW_ID);
-		wkbPage.activate(viewPart);
-	}
-
-	/**
-	 * Open authoring perspective
-	 *
-	 */
-	public static void openAuthoringPerspective() {
-		PerspectiveUtil.openPerspective(AuthoringPerspective.PERSPECTIVE_ID);
-		IWorkbenchPage wkbPage = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getActivePage();
-		IViewPart viewPart = wkbPage.findView(LibraryView.VIEW_ID);
-		wkbPage.activate(viewPart);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		if (!selectionChangedListeners.contains(listener)) {
-			selectionChangedListeners.add(listener);
-		}
-	}
-
-	
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void removeSelectionChangedListener(
-			ISelectionChangedListener listener) {
-		selectionChangedListeners.remove(listener);
-	}
-
-	/**
-	 * Return current selection
-	 */
-	public ISelection getSelection() {
-		return currentSelection.selection;
-	}
-
-	public ISelectionProvider getSelectionSource() {
-		return currentSelection.source;
-	}
-
-	/**
-	 * Sets current selection
-	 */
-	public void setSelection(ISelection selection) {
-		setSelection(this, selection);
-	}
-
-	/**
-	 * Sets current selection
-	 */
-	public void setSelection(ISelectionProvider source, ISelection selection) {
-		synchronized (this) {
-			currentSelection.selection = selection;
-			currentSelection.source = source;
-
-			SelectionChangedEvent event = new SelectionChangedEvent(source,
-					selection);
-
-			// Avoid concurrent error.
-			List processedItems = new ArrayList();
-			while (selectionChangedListeners.size() > 0) {
-				ISelectionChangedListener listener = (ISelectionChangedListener) selectionChangedListeners
-						.remove(0);
-				if (listener != null) {
-					try {
-						listener.selectionChanged(event);
-					} catch (Exception e) {
-						AuthoringUIPlugin.getDefault().getLogger().logError(e);
-					}
-					processedItems.add(listener);
-				}
-			}
-
-			selectionChangedListeners.addAll(processedItems);
-		}
-	}
-
-	/**
-	 * Add double click listener
-	 * 
-	 * @param listener
-	 */
-	public void addDoubleClickListener(IDoubleClickListener listener) {
-		if (!doubleClickListeners.contains(listener)) {
-			doubleClickListeners.add(listener);
-		}
-	}
-
-	/**
-	 * Remove double click listener
-	 * @param listener
-	 */
-	public void removeDoubleClickListener(IDoubleClickListener listener) {
-		doubleClickListeners.remove(listener);
-	}
-
-	/**
-	 * Handle double click event
-	 * 
-	 * @param event
-	 */
-	public void handleDoubleClickEvent(DoubleClickEvent event) {
-		synchronized (this) {
-			// Avoid concurrent error.
-			List processedItems = new ArrayList();
-			while (doubleClickListeners.size() > 0) {
-				IDoubleClickListener listener = (IDoubleClickListener) doubleClickListeners
-						.remove(0);
-				try {
-					listener.doubleClick(event);
-				} catch (Exception e) {
-					AuthoringUIPlugin.getDefault().getLogger().logError(e);
-				}
-				processedItems.add(listener);
-			}
-			doubleClickListeners.addAll(processedItems);
-		}
-	}
-
-	public class CurrentSelection {
-
-		public ISelectionProvider source = null;
-
-		public ISelection selection = StructuredSelection.EMPTY;
-
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ActivityDetailDiagramInfoAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ActivityDetailDiagramInfoAction.java
deleted file mode 100755
index 12c3107..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ActivityDetailDiagramInfoAction.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * 
- */
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.dialogs.ADDInfoDialog;
-import org.eclipse.epf.authoring.ui.editors.AbstractDiagramEditor;
-import org.eclipse.epf.authoring.ui.editors.ActivityDetailDiagramEditor;
-import org.eclipse.epf.authoring.ui.filters.DescriptorConfigurationFilter;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.diagram.model.util.GraphicalDataManager;
-import org.eclipse.epf.library.edit.IFilter;
-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.MethodConfiguration;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Action to show the ADDInfoDialog, to show the ActivityDetailDiagrams
- * in the process. Not in use.
- * @author Shashidhar Kannoori
- */
-public class ActivityDetailDiagramInfoAction extends Action {
-
-	protected Object selected;
-	
-	public ActivityDetailDiagramInfoAction() {
-		super("Activity Detail Diagram Info");
-	}
-	
-	public void run() {
-		
-		IFilter filter = new ADDFilter(null, null, null);
-		
-		ADDInfoDialog fd = new ADDInfoDialog(PlatformUI
-				.getWorkbench().getActiveWorkbenchWindow()
-				.getShell(), filter, getObject(), "Activity",
-				null);
-
-		fd.setBlockOnOpen(true);
-		fd.setTitle("Activity");
-		fd.open();
-		List list = fd.getSelectedItems();
-		
-		try {
-			IEditorPart parent = getPagex().getActiveEditor();
-			IEditorInput input = new ActivityDetailDiagramEditor.EditorInput(
-					list.get(0), Suppression.getSuppression((Process)getObject()));
-			IEditorPart part = getPagex().openEditor(input,
-					ActivityDetailDiagramEditor.class
-					.getName());
-			if (part instanceof AbstractDiagramEditor) {
-				AbstractDiagramEditor editor = (AbstractDiagramEditor) part;
-				editor.setParentEditor(parent);
-			}
-		} catch (PartInitException exception) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(
-					exception);
-		}
-		// open editor
-
-		super.run();
-	}
-	
-	public Object getObject(){
-		return selected;
-	}
-	
-	public IWorkbenchPage getPagex(){
-		return null;
-	}
-	
-	public boolean isEnabled() {
-		return super.isEnabled();
-	}
-	public class ADDFilter extends DescriptorConfigurationFilter {
-		public ADDFilter(MethodConfiguration methodConfig, Viewer viewer, String filterStr) {
-			super(methodConfig, viewer, filterStr);
-		}
-
-		public boolean accept(Object obj) {
-			// TODO Auto-generated method stub
-			if(obj instanceof CapabilityPattern) return true;
-			if(obj instanceof Activity){
-				org.eclipse.epf.uma.Diagram d = GraphicalDataManager.getInstance()
-				.getUMADiagram((Activity) obj, GraphicalDataHelper.ACTIVITY_DETAIL_DIAGRAM, false);
-				if(d != null ) return true;
-			}
-			return false;
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ConfigurationViewEditAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ConfigurationViewEditAction.java
deleted file mode 100755
index fd70eaf..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ConfigurationViewEditAction.java
+++ /dev/null
@@ -1,117 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.epf.authoring.ui.PerspectiveListUtil;
-import org.eclipse.epf.authoring.ui.UIActionDispatcher;
-import org.eclipse.epf.authoring.ui.dialogs.ContributionSelection;
-import org.eclipse.epf.authoring.ui.editors.EditorChooser;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Phase;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.actions.BaseSelectionListenerAction;
-
-
-/**
- * Edits an element in the Configuration view.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- */
-public class ConfigurationViewEditAction extends BaseSelectionListenerAction {
-
-	/**
-	 * The ID for this action.
-	 */
-	public static final String ACTION_ID = ConfigurationViewEditAction.class
-			.getName();
-
-	private IStructuredSelection selected;
-
-	private ContributionSelection contributorSelector;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ConfigurationViewEditAction(String text) {
-		super(text);
-		contributorSelector = new ContributionSelection();
-	}
-
-	/**
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		ArrayList elementList = new ArrayList();
-		for (Iterator objects = selected.iterator(); objects.hasNext();) {
-			Object element = TngUtil.unwrap(objects.next());
-			if (element instanceof VariabilityElement) {
-				Object obj = contributorSelector
-						.getSelectedContributor((VariabilityElement) element);
-				if (obj != null)
-					elementList.add(obj);
-			} else {
-				elementList.add(element);
-			}
-		}
-
-		if (elementList.size() < 1)
-			return;
-
-		if (PerspectiveListUtil.isBrowsingPerspective()) {
-			UIActionDispatcher.openAuthoringPerspective();
-		}
-
-		for (Iterator objects = elementList.iterator(); objects.hasNext();) {
-			Object element = objects.next();
-			EditorChooser.getInstance().openEditor(element);
-		}
-	}
-
-	/**
-	 * Updates this action in response to the given selection changes.
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-		selected = selection;
-
-		boolean enableTheMenu = true;
-
-		for (Iterator objects = selection.iterator(); objects.hasNext();) {
-			Object element = objects.next();
-			Object realObj = TngUtil.unwrap(element);
-			if (!(realObj instanceof MethodElement)) {
-				enableTheMenu = false;
-				break;
-			} else if ((realObj instanceof DeliveryProcess)
-					|| (realObj instanceof CapabilityPattern)) {
-				break;
-			} else if ((realObj instanceof Phase)
-					|| (realObj instanceof Activity)
-					|| (realObj instanceof ProcessPackage)) {
-				enableTheMenu = false;
-				break;
-			}
-		}
-
-		return enableTheMenu;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/CreateMethodElementCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/CreateMethodElementCommand.java
deleted file mode 100755
index 806d83c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/CreateMethodElementCommand.java
+++ /dev/null
@@ -1,142 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandWrapper;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.CommandActionDelegate;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.editors.IEditorKeeper;
-import org.eclipse.epf.authoring.ui.views.ViewHelper;
-import org.eclipse.epf.library.edit.command.CommandStatusChecker;
-import org.eclipse.epf.library.edit.command.MethodElementAddCommand;
-import org.eclipse.epf.library.edit.process.command.CreateProcessComponentCommand;
-import org.eclipse.epf.library.edit.util.TngUtil;
-
-/**
- * Creates a new Method element.
- * 
- * @author Phong Nguyen Le
- * @author Kelvin Low
- * @since 1.0
- */
-public class CreateMethodElementCommand extends CommandWrapper implements
-		CommandActionDelegate {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public CreateMethodElementCommand(Command command) {
-		super(command);
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.command.CommandWrapper#execute()
-	 */
-	public void execute() {
-		Command cmd = TngUtil.unwrap(this);
-
-		super.execute();
-
-		if (command instanceof CreateProcessComponentCommand) {
-			IStatus status = ((CreateProcessComponentCommand) command)
-					.getStatus();
-			if (status != null && !status.isOK()) {
-				if (CommandStatusChecker.hasRollbackError(status)) {
-					ViewHelper.reloadCurrentLibaryOnRollbackError(null);
-				} else if (!CommandStatusChecker.hasSaveError(status)) {
-					displayError(status);
-				}
-				return;
-			}
-		} else {
-			cmd = this;
-
-			while (cmd instanceof CommandWrapper
-					&& !(cmd instanceof MethodElementAddCommand)) {
-				cmd = ((CommandWrapper) cmd).getCommand();
-			}
-
-			if (cmd instanceof MethodElementAddCommand) {
-				MethodElementAddCommand addCmd = ((MethodElementAddCommand) cmd);
-				IStatus status = addCmd.getStatus();
-				if (status != null && !status.isOK()) {
-					if (CommandStatusChecker.hasRollbackError(status)) {
-						ViewHelper.reloadCurrentLibaryOnRollbackError(null);
-					} else if (!CommandStatusChecker.hasSaveError(status)) {
-						displayError(status);
-					}
-					return;
-				}
-			}
-		}
-
-		Collection result = getCommand().getResult();
-		for (Iterator iter = result.iterator(); iter.hasNext();) {
-			Object obj = TngUtil.unwrap(iter.next());
-			if (obj instanceof EObject && ((EObject) obj).eContainer() != null) {
-				// Open the editor for the newly created element.
-				IEditorKeeper.REFERENCE.getEditorKeeper().openEditor(obj);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.command.CommandWrapper#canUndo()
-	 */
-	public boolean canUndo() {
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.command.CommandActionDelegate#getImage()
-	 */
-	public Object getImage() {
-		CommandActionDelegate cmd = (CommandActionDelegate) getCommand();
-		return cmd.getImage();
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.command.CommandActionDelegate#getText()
-	 */
-	public String getText() {
-		CommandActionDelegate cmd = (CommandActionDelegate) getCommand();
-		return cmd.getText();
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.command.CommandActionDelegate#getToolTipText()
-	 */
-	public String getToolTipText() {
-		CommandActionDelegate cmd = (CommandActionDelegate) getCommand();
-		return cmd.getToolTipText();
-	}
-
-	/**
-	 * Display an error dialog.
-	 */
-	protected void displayError(IStatus status) {
-		int severity = status.getSeverity();
-		if (severity == IStatus.ERROR || severity == IStatus.WARNING) {
-			AuthoringUIPlugin.getDefault().getMsgDialog().display(
-					getLabel(),
-					AuthoringUIResources.errorDialog_createError
-					, status);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/DiagramPrintAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/DiagramPrintAction.java
deleted file mode 100755
index 8648d4f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/DiagramPrintAction.java
+++ /dev/null
@@ -1,73 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.print.PrintGraphicalViewerOperation;
-import org.eclipse.gef.ui.actions.PrintAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.printing.PrintDialog;
-import org.eclipse.swt.printing.Printer;
-import org.eclipse.swt.printing.PrinterData;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * 
- * Print diagram
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- *
- */
-public class DiagramPrintAction extends PrintAction {
-
-	GraphicalViewer viewer;
-	/**
-	 * @param part
-	 */
-	public DiagramPrintAction(IWorkbenchPart part, GraphicalViewer viewer) {
-		super(part);
-		this.viewer = viewer;
-	}
-	
-	/* 
-	 * @see org.eclipse.gef.ui.actions.PrintAction#run()
-	 */
-	public void run() {
-		//GraphicalViewer viewer;
-		PrintDialog dialog = new PrintDialog(viewer.getControl().getShell(), SWT.NULL);
-		PrinterData data = dialog.open();
-		
-		if (data != null) {
-			PrintGraphicalViewerOperation op = 
-						new PrintGraphicalViewerOperation(new Printer(data), viewer);
-			op.run(getWorkbenchPart().getTitle());
-		}
-		super.run();
-	}
-	
-	/**
-	 * Set graphical viewer
-	 * @param viewer
-	 */
-	public void setViewer(GraphicalViewer viewer) {
-		this.viewer = viewer;
-	}
-	
-	/**
-	 * Return graphical viewer
-	 * @return viewer
-	 */
-	public GraphicalViewer getViewer() {
-		return viewer;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ILibraryAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ILibraryAction.java
deleted file mode 100755
index 3a73fa1..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ILibraryAction.java
+++ /dev/null
@@ -1,31 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.epf.library.edit.command.IUserInteractionHandler;
-import org.eclipse.jface.action.IAction;
-
-/**
- * The interface for a Library action.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface ILibraryAction extends IAction {
-	static final IUserInteractionHandler DEFAULT_UI_HANDLER = new UserInteractionHandler();
-
-//	void notifyPropertyChange(String propertyName, Object oldValue,
-//			Object newValue);
-	
-	void setProgressMonitor(IProgressMonitor monitor);
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ILibraryActionBarContributor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ILibraryActionBarContributor.java
deleted file mode 100755
index d8da548..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ILibraryActionBarContributor.java
+++ /dev/null
@@ -1,42 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.part.IPage;
-
-/**
- * The interface for the Library view action bar contributor.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public interface ILibraryActionBarContributor extends
-		IEditorActionBarContributor {
-
-	public IViewPart getActiveView();
-
-	public void setActiveView(IViewPart part);
-
-	public void shareGlobalActions(IPage page, IActionBars actionBars);
-
-	public void menuAboutToShow(IMenuManager menuManager);
-
-	public void deactivate();
-
-	public void disableGlobalEditMenu();
-
-	public void enableGlobalEditMenu();
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/IWorkbenchPartAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/IWorkbenchPartAction.java
deleted file mode 100755
index a1cb02b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/IWorkbenchPartAction.java
+++ /dev/null
@@ -1,23 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Interface for workbench part
- * 
- * @author Phong Nguyen Le 
- * @since  1.0
- */
-public interface IWorkbenchPartAction {
-	void setActiveWorkbenchPart(IWorkbenchPart workbenchPart);
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LayoutActionGroup.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LayoutActionGroup.java
deleted file mode 100755
index 006f1f1..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LayoutActionGroup.java
+++ /dev/null
@@ -1,108 +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.authoring.ui.actions;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIImages;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.library.edit.PluginUIPackageContext;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * 
- * Code taken from org.eclipse.jdt.internal.ui.packageview.LayoutActionGroup
- *
- */
-public class LayoutActionGroup extends MultiActionGroup {
-
-	public LayoutActionGroup(LibraryView libView) {
-		super(createActions(libView), getSelectedState(libView));
-	}
-
-	/* (non-Javadoc)
-	 * @see ActionGroup#fillActionBars(IActionBars)
-	 */
-	public void fillActionBars(IActionBars actionBars) {
-		super.fillActionBars(actionBars);
-		contributeToViewMenu(actionBars.getMenuManager());
-	}
-	
-	private void contributeToViewMenu(IMenuManager viewMenu) {
-		viewMenu.add(new Separator());
-
-		// Create layout sub menu
-		
-		IMenuManager layoutSubMenu= new MenuManager(AuthoringUIResources.LayoutActionGroup_label); 
-		final String layoutGroupName= "layout"; //$NON-NLS-1$
-		Separator marker= new Separator(layoutGroupName);
-
-		viewMenu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-		viewMenu.add(marker);
-		viewMenu.appendToGroup(layoutGroupName, layoutSubMenu);
-		viewMenu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS+"-end"));//$NON-NLS-1$		
-		addActions(layoutSubMenu);
-	}
-
-	static int getSelectedState(LibraryView libView) {
-		if (PluginUIPackageContext.INSTANCE.isFlatLayout())
-			return 0;
-		else
-			return 1;
-	}
-	
-	static IAction[] createActions(LibraryView libView) {
-		IAction flatLayoutAction= new LayoutAction(libView, true);
-		flatLayoutAction.setText(AuthoringUIResources.LayoutActionGroup_flatLayoutAction_label); 
-		flatLayoutAction.setImageDescriptor(AuthoringUIImages.IMG_DESC_LAYOUT_FLAT);
-		IAction hierarchicalLayout= new LayoutAction(libView, false);
-		hierarchicalLayout.setText(AuthoringUIResources.LayoutActionGroup_hierarchicalLayoutAction_label);
-		hierarchicalLayout.setImageDescriptor(AuthoringUIImages.IMG_DESC_LAYOUT_HIERARCHICAL);
-		
-		return new IAction[]{flatLayoutAction, hierarchicalLayout};
-	}
-}
-
-class LayoutAction extends Action implements IAction {
-
-	private boolean fIsFlatLayout;
-	private LibraryView flibView;
-
-	public LayoutAction(LibraryView libView, boolean flat) {
-		super("", AS_RADIO_BUTTON); //$NON-NLS-1$
-
-		fIsFlatLayout= flat;
-		flibView= libView;
-		if (fIsFlatLayout)
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(this, AuthoringUIHelpContexts.LAYOUT_FLAT_ACTION);
-		else
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(this, AuthoringUIHelpContexts.LAYOUT_HIERARCHICAL_ACTION);
-	}
-
-	/*
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		if (PluginUIPackageContext.INSTANCE.isFlatLayout() != fIsFlatLayout)
-			PluginUIPackageContext.INSTANCE.toggleLayout();
-		flibView.getViewer().getControl().setRedraw(false);
-		flibView.getViewer().refresh();
-		flibView.getViewer().getControl().setRedraw(true);
-
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryActionBarContributor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryActionBarContributor.java
deleted file mode 100755
index 8d43f83..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryActionBarContributor.java
+++ /dev/null
@@ -1,618 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.action.CopyAction;
-import org.eclipse.emf.edit.ui.action.CutAction;
-import org.eclipse.emf.edit.ui.action.DeleteAction;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.action.PasteAction;
-import org.eclipse.emf.edit.ui.action.RedoAction;
-import org.eclipse.emf.edit.ui.action.UndoAction;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.editors.ProcessEditor;
-import org.eclipse.epf.validation.LibraryEValidator;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.action.SubContributionItem;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-
-/**
- * The Library view action bar contributor.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class LibraryActionBarContributor extends
-		EditingDomainActionBarContributor implements
-		ILibraryActionBarContributor, ISelectionChangedListener {
-
-	// Keep track of the active editor.
-	protected IViewPart activeViewPart;
-
-	// Keep track of the current selection provider.
-	protected ISelectionProvider selectionProvider;
-
-	protected IActionBars viewActionBars;
-
-	// Library view edit action
-	protected LibraryViewEditAction libraryViewEditAction;
-
-	// Configuration view edit action
-	protected ConfigurationViewEditAction configViewEditAction;
-
-	private EditingDomain editingDomain;
-	
-	/**
-	 * Displays the Properties view.
-	 */
-	protected IAction showPropertiesViewAction = new Action(
-			AuthoringUIResources._UI_ShowPropertiesView_menu_item) { //$NON-NLS-1$
-		public void run() {
-			try {
-				try {
-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
-				} catch (PartInitException exception) {
-					exception.printStackTrace();
-				}
-			} catch (RuntimeException e) {
-				AuthoringUIPlugin.getDefault().getLogger().logError(e);
-			}
-		}
-	};
-
-	/**
-	 * Refreshes the viewer of the current editor if the editor implements
-	 * {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
-	 */
-	protected IAction refreshViewerAction = new Action(
-			AuthoringUIResources._UI_RefreshViewer_menu_item) { //$NON-NLS-1$
-		public boolean isEnabled() {
-			return activeViewPart instanceof IViewerProvider;
-		}
-
-		public void run() {
-			if (activeViewPart instanceof IViewerProvider) {
-				Viewer viewer = ((IViewerProvider) activeViewPart).getViewer();
-				if (viewer != null) {
-					refreshViewer(viewer);
-				}
-			}
-		}
-	};
-
-	/**
-	 * This will contain one
-	 * {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to
-	 * each descriptor generated for the current selection by the item provider.
-	 */
-	protected Collection createChildActions;
-
-	/**
-	 * The menu manager into which menu contribution items should be added for
-	 * CreateChild actions.
-	 */
-	protected IMenuManager createChildMenuManager;
-
-	/**
-	 * This will contain one
-	 * {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding
-	 * to each descriptor generated for the current selection by the item
-	 * provider.
-	 */
-	protected Collection createSiblingActions;
-
-	/**
-	 * This is the menu manager into which menu contribution items should be
-	 * added for CreateSibling actions.
-	 */
-	protected IMenuManager createSiblingMenuManager;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public LibraryActionBarContributor(EditingDomain editingDomain) {
-		this.editingDomain = editingDomain;
-		
-		validateAction = new LibraryValidateAction();
-		((LibraryValidateAction)validateAction).putContextData(LibraryEValidator.CTX_ADAPTER_FACTORY_PROVIDER,
-				ProcessEditor.adapterFactoryProvider);
-	}
-
-	/**
-	 * @param viewer
-	 */
-	protected void refreshViewer(Viewer viewer) {
-		viewer.refresh();
-	}
-
-	/**
-	 * Adds Separators for editor additions to the tool bar.
-	 */
-	public void contributeToToolBar(IToolBarManager toolBarManager) {
-		toolBarManager.add(new Separator("method-settings")); //$NON-NLS-1$
-		toolBarManager.add(new Separator("method-additions")); //$NON-NLS-1$
-	}
-
-	/**
-	 * Adds to the menu bar a menu and some separators for editor
-	 * additions, as well as the sub-menus for object creation items.
-	 */
-	public void contributeToMenu(IMenuManager menuManager) {
-		super.contributeToMenu(menuManager);
-
-		IMenuManager submenuManager = new MenuManager(
-				AuthoringUIResources._UI_MethodEditor_menu, "com.ibm.methodMenuID"); //$NON-NLS-1$  //$NON-NLS-2$
-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
-
-		// Prepare for CreateChild item addition or removal.
-		createChildMenuManager = new MenuManager(
-				AuthoringUIResources._UI_CreateChild_menu_item); //$NON-NLS-1$
-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
-
-		// Prepare for CreateSibling item addition or removal.
-		createSiblingMenuManager = new MenuManager(
-				AuthoringUIResources._UI_CreateSibling_menu_item); //$NON-NLS-1$
-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
-
-		// Force an update because Eclipse hides empty menus now.
-		submenuManager.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager menuManager) {
-				menuManager.updateAll(true);
-			}
-		});
-
-		addGlobalActions(submenuManager);
-	}
-
-	public IViewPart getActiveView() {
-		return activeViewPart;
-	}
-
-	public void setActiveView(IViewPart part) {
-		// TODO - may need to check other method
-		if (part != null)
-			super.setActiveView(part);
-		if (part == activeViewPart)
-			return;
-		if (activeViewPart != null) {
-			deactivate();
-		}
-		if (part == null) {
-			selectionProvider = null;
-		}
-		if (!(part instanceof IEditingDomainProvider))
-			return;
-		activeViewPart = part;
-		editingDomain = ((IEditingDomainProvider) part).getEditingDomain();
-
-		// Switch to the new selection provider.
-		if (selectionProvider != null) {
-			selectionProvider.removeSelectionChangedListener(this);
-		} else {
-			selectionProvider = part.getSite().getSelectionProvider();
-			selectionProvider.addSelectionChangedListener(this);
-
-			// Fake a selection changed event to update the menus.
-			if (selectionProvider.getSelection() != null) {
-				selectionChanged(new SelectionChangedEvent(selectionProvider,
-						selectionProvider.getSelection()));
-			}
-		}
-
-		activate();
-
-	}
-
-	public void deactivate() {
-		activeViewPart.removePropertyListener(this);
-
-		deleteAction.setEditingDomain(null);
-		cutAction.setEditingDomain(null);
-		copyAction.setEditingDomain(null);
-		pasteAction.setEditingDomain(null);
-		undoAction.setEditingDomain(null);
-		redoAction.setEditingDomain(null);
-
-		if (loadResourceAction != null) {
-			loadResourceAction.setEditingDomain(null);
-		}
-
-		ISelectionProvider selectionProvider = activeViewPart instanceof ISelectionProvider ? (ISelectionProvider) activeViewPart
-				: activeViewPart.getSite().getSelectionProvider();
-		selectionProvider.removeSelectionChangedListener(deleteAction);
-		selectionProvider.removeSelectionChangedListener(libraryViewEditAction);
-		selectionProvider.removeSelectionChangedListener(cutAction);
-		selectionProvider.removeSelectionChangedListener(copyAction);
-		selectionProvider.removeSelectionChangedListener(pasteAction);
-	}
-
-	public void disableGlobalEditMenu() {
-		deleteAction.setEnabled(false);
-		if (libraryViewEditAction != null)
-			libraryViewEditAction.setEnabled(false);
-		if (configViewEditAction != null)
-			configViewEditAction.setEnabled(false);
-		cutAction.setEnabled(false);
-		copyAction.setEnabled(false);
-		pasteAction.setEnabled(false);
-		undoAction.setEnabled(false);
-		redoAction.setEnabled(false);
-	}
-
-	public void enableGlobalEditMenu() {
-		deleteAction.setEnabled(true);
-		if (libraryViewEditAction != null)
-			libraryViewEditAction.setEnabled(true);
-		if (configViewEditAction != null)
-			configViewEditAction.setEnabled(true);
-		cutAction.setEnabled(true);
-		copyAction.setEnabled(true);
-		pasteAction.setEnabled(true);
-		undoAction.setEnabled(true);
-		redoAction.setEnabled(true);
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor#activate()
-	 */
-	public void activate() {
-		activeViewPart.addPropertyListener(this);
-		
-		deleteAction.setEditingDomain(editingDomain);
-		cutAction.setEditingDomain(editingDomain);
-		copyAction.setEditingDomain(editingDomain);
-		pasteAction.setEditingDomain(editingDomain);
-		undoAction.setEditingDomain(editingDomain);
-		redoAction.setEditingDomain(editingDomain);
-
-		if (loadResourceAction != null) {
-			loadResourceAction.setEditingDomain(editingDomain);
-		}
-
-		ISelectionProvider selectionProvider = activeViewPart instanceof ISelectionProvider ? (ISelectionProvider) activeViewPart
-				: activeViewPart.getSite().getSelectionProvider();
-		selectionProvider.addSelectionChangedListener(deleteAction);
-		selectionProvider.addSelectionChangedListener(libraryViewEditAction);
-		selectionProvider.addSelectionChangedListener(cutAction);
-		selectionProvider.addSelectionChangedListener(copyAction);
-		selectionProvider.addSelectionChangedListener(pasteAction);
-		if (validateAction != null) {
-			selectionProvider.addSelectionChangedListener(validateAction);
-		}
-
-		if (controlAction != null) {
-			selectionProvider.addSelectionChangedListener(controlAction);
-		}      		
-
-		update();
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor#update()
-	 */
-	public void update() {
-		if (activeViewPart == null)
-			return;
-
-		ISelectionProvider selectionProvider = activeViewPart instanceof ISelectionProvider ? (ISelectionProvider) activeViewPart
-				: activeViewPart.getSite().getSelectionProvider();
-		ISelection selection = selectionProvider.getSelection();
-		IStructuredSelection structuredSelection = selection instanceof IStructuredSelection ? (IStructuredSelection) selection
-				: StructuredSelection.EMPTY;
-
-		deleteAction.updateSelection(structuredSelection);
-		libraryViewEditAction.updateSelection(structuredSelection);
-		cutAction.updateSelection(structuredSelection);
-		copyAction.updateSelection(structuredSelection);
-		pasteAction.updateSelection(structuredSelection);
-		undoAction.update();
-		redoAction.update();
-
-		if (loadResourceAction != null) {
-			loadResourceAction.update();
-		}
-
-		if (validateAction != null) {
-			validateAction.updateSelection(structuredSelection);
-		}
-	}
-
-	/**
-	 * This implements
-	 * {@link org.eclipse.jface.viewers.ISelectionChangedListener}, handling
-	 * {@link org.eclipse.jface.viewers.SelectionChangedEvent} by querying for
-	 * the children and siblings that can be added to the selected object and
-	 * updating the menus accordingly.
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		// Remove any menu items for old selection.
-		if (createChildMenuManager != null) {
-			depopulateManager(createChildMenuManager, createChildActions);
-		}
-		if (createSiblingMenuManager != null) {
-			depopulateManager(createSiblingMenuManager, createSiblingActions);
-		}
-
-		// Query the new selection for appropriate new child/sibling descriptors
-		Collection newChildDescriptors = null;
-
-		ISelection selection = event.getSelection();
-		if (selection instanceof IStructuredSelection
-				&& ((IStructuredSelection) selection).size() == 1) {
-			Object object = ((IStructuredSelection) selection)
-					.getFirstElement();
-
-			EditingDomain domain = ((IEditingDomainProvider) activeViewPart)
-					.getEditingDomain();
-
-			newChildDescriptors = domain.getNewChildDescriptors(object, null);
-		}
-
-		// Generate actions for selection; populate and redraw the menus.
-		createChildActions = generateCreateChildActions(newChildDescriptors,
-				selection);
-
-		if (createChildMenuManager != null) {
-			populateManager(createChildMenuManager, createChildActions, null);
-			createChildMenuManager.update(true);
-		}
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction}
-	 * for each object in <code>descriptors</code>, and returns the
-	 * collection of these actions.
-	 */
-	protected Collection generateCreateChildActions(Collection descriptors,
-			ISelection selection) {
-		Collection actions = new ArrayList();
-		if (descriptors != null) {
-			for (Iterator i = descriptors.iterator(); i.hasNext();) {
-				actions.add(new MethodCreateChildAction(editingDomain,
-						selection, i.next()));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This generates a
-	 * {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each
-	 * object in <code>descriptors</code>, and returns the collection of
-	 * these actions.
-	 */
-	protected Collection generateCreateSiblingActions(Collection descriptors,
-			ISelection selection) {
-		Collection actions = new ArrayList();
-		if (descriptors != null) {
-			for (Iterator i = descriptors.iterator(); i.hasNext();) {
-				actions.add(new MethodCreateSiblingAction(activeViewPart,
-						selection, i.next()));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This populates the specified <code>manager</code> with
-	 * {@link org.eclipse.jface.action.ActionContributionItem}s based on the
-	 * {@link org.eclipse.jface.action.IAction}s contained in the
-	 * <code>actions</code> collection, by inserting them before the specified
-	 * contribution item <code>contributionID</code>. If <code>ID</code> is
-	 * <code>null</code>, they are simply added.
-	 */
-	protected void populateManager(IContributionManager manager,
-			Collection actions, String contributionID) {
-		if (actions != null) {
-			for (Iterator i = actions.iterator(); i.hasNext();) {
-				IAction action = (IAction) i.next();
-				if (contributionID != null) {
-					manager.insertBefore(contributionID, action);
-				} else {
-					manager.add(action);
-				}
-			}
-		}
-	}
-
-	/**
-	 * This removes from the specified <code>manager</code> all
-	 * {@link org.eclipse.jface.action.ActionContributionItem}s based on the
-	 * {@link org.eclipse.jface.action.IAction}s contained in the
-	 * <code>actions</code> collection.
-	 */
-	protected void depopulateManager(IContributionManager manager,
-			Collection actions) {
-		if (actions != null) {
-			IContributionItem[] items = manager.getItems();
-			for (int i = 0; i < items.length; i++) {
-				// Look into SubContributionItems
-				IContributionItem contributionItem = items[i];
-				while (contributionItem instanceof SubContributionItem) {
-					contributionItem = ((SubContributionItem) contributionItem)
-							.getInnerItem();
-				}
-
-				// Delete the ActionContributionItems with matching action.
-				if (contributionItem instanceof ActionContributionItem) {
-					IAction action = ((ActionContributionItem) contributionItem)
-							.getAction();
-					if (actions.contains(action)) {
-						manager.remove(contributionItem);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This populates the pop-up menu before it appears.
-	 */
-	public void menuAboutToShow(IMenuManager menuManager) {
-		super.menuAboutToShow(menuManager);
-		MenuManager submenuManager = null;
-
-		submenuManager = new MenuManager(AuthoringUIResources._UI_CreateChild_menu_item); //$NON-NLS-1$
-		populateManager(submenuManager, createChildActions, null);
-		menuManager.insertBefore("additions", submenuManager); //$NON-NLS-1$
-	}
-
-	/**
-	 * Inserts global actions before the "additions-end" separator.
-	 */
-	protected void addGlobalActions(IMenuManager menuManager) {
-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
-
-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
-
-		menuManager.insertBefore("additions-end", new Separator()); //$NON-NLS-1$
-		
-	    String key = (style & ADDITIONS_LAST_STYLE) == 0 ? "additions-end" : "additions";
-	    if (validateAction != null)
-	    {
-	      menuManager.insertBefore(key, new ActionContributionItem(validateAction));
-	    }
-
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.EditorActionBarContributor#init(IActionBars,
-	 *      IWorkbenchPage)
-	 */
-	public void init(IActionBars actionBars, IWorkbenchPage page) {
-		super.init(actionBars, page);
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.EditorActionBarContributor#init(IActionBars)
-	 */
-	public void init(IActionBars actionBars) {
-		viewActionBars = actionBars;
-
-		ISharedImages sharedImages = PlatformUI.getWorkbench()
-				.getSharedImages();
-
-		libraryViewEditAction = new LibraryViewEditAction(AuthoringUIResources.actionLabel_edit); //$NON-NLS-1$
-		actionBars.setGlobalActionHandler(LibraryViewEditAction.ACTION_ID,
-				libraryViewEditAction);
-
-		cutAction = createCutAction();
-		cutAction.setImageDescriptor(sharedImages
-				.getImageDescriptor(ISharedImages.IMG_TOOL_CUT));
-		actionBars.setGlobalActionHandler(ActionFactory.CUT.getId(), cutAction);
-
-		copyAction = createCopyAction();
-		copyAction.setImageDescriptor(sharedImages
-				.getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
-		actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(),
-				copyAction);
-
-		pasteAction = createPasteAction();
-		pasteAction.setImageDescriptor(sharedImages
-				.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE));
-		actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(),
-				pasteAction);
-
-		deleteAction = createDeleteAction();
-		deleteAction.setImageDescriptor(sharedImages
-				.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
-		actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(),
-				deleteAction);
-		
-		undoAction = new UndoAction();
-		undoAction.setImageDescriptor(sharedImages
-				.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO));
-		actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(),
-				undoAction);
-
-		redoAction = new RedoAction();
-		redoAction.setImageDescriptor(sharedImages
-				.getImageDescriptor(ISharedImages.IMG_TOOL_REDO));
-		actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(),
-				redoAction);
-
-		libraryViewEditAction.setEnabled(false);
-	}
-
-	/**
-	 * Creates cut action
-	 * @return action
-	 */
-	protected CutAction createCutAction() {
-		return new CutAction();
-	}
-	
-	/**
-	 * Creates paste action
-	 * @return action
-	 */
-	protected PasteAction createPasteAction() {
-		return new PasteAction();
-	}
-	
-	/**
-	 * Creates copy action
-	 * @return action
-	 */
-	protected CopyAction createCopyAction() {
-		return new CopyAction();
-	}
-	
-	/**
-	 * Creates delete action
-	 * @return action
-	 */
-	protected DeleteAction createDeleteAction() {
-		return new DeleteAction();
-	}
-	
-	/**
-	 * @see org.eclipse.ui.part.EditorActionBarContributor#getActionBars()
-	 */
-	public IActionBars getActionBars() {
-		return viewActionBars;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryLockingOperationRunner.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryLockingOperationRunner.java
deleted file mode 100755
index da5b6ae..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryLockingOperationRunner.java
+++ /dev/null
@@ -1,139 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.persistence.util.LibrarySchedulingRule;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-/**
- * Runs operation that locks the library for the duration of its execution
- * 
- * @author Phong Nguyen Le
- * @since  1.0
- */
-public class LibraryLockingOperationRunner implements IRunnableContext {
-
-	private IProgressMonitor progressMonitor;
-	
-	public LibraryLockingOperationRunner() {
-	}	
-	
-	private void doRun(final IRunnableWithProgress runnable, final boolean workUnknown) throws InvocationTargetException,
-			InterruptedException {
-        final InvocationTargetException[] iteHolder = new InvocationTargetException[1];
-        try {
-            IWorkspaceRunnable workspaceRunnable = new IWorkspaceRunnable() {
-                public void run(IProgressMonitor pm) throws CoreException {
-                    try {
-                        if(workUnknown) {
-        					pm.beginTask("", 2); //$NON-NLS-1$
-        					pm.worked(1);
-        					try {
-        						runnable.run(pm);
-        						pm.worked(2);
-        					}
-        					finally {
-        						pm.done();
-        					}
-                        }
-                        else {
-                        	runnable.run(pm);
-                        }
-                    } catch (InvocationTargetException e) {
-                        // Pass it outside the workspace runnable
-                        iteHolder[0] = e;
-                    } catch (InterruptedException e) {
-                        // Re-throw as OperationCanceledException, which will be
-                        // caught and re-thrown as InterruptedException below.
-                        throw new OperationCanceledException(e.getMessage());
-                    }
-                    // CoreException and OperationCanceledException are propagated
-                }
-            };
-            ResourcesPlugin.getWorkspace().run(workspaceRunnable,
-            		new LibrarySchedulingRule(LibraryService.getInstance().getCurrentMethodLibrary()),
-            		IWorkspace.AVOID_UPDATE, getProgressMonitor());
-        } catch (CoreException e) {
-            throw new InvocationTargetException(e);
-        } catch (OperationCanceledException e) {
-            throw new InterruptedException(e.getMessage());
-        }
-        // Re-throw the InvocationTargetException, if any occurred
-        if (iteHolder[0] != null) {
-            throw iteHolder[0];
-        }
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.operation.IRunnableContext#run(boolean, boolean, org.eclipse.jface.operation.IRunnableWithProgress)
-	 */
-	public void run(boolean fork, boolean cancelable,
-			final IRunnableWithProgress runnable) throws InvocationTargetException,
-			InterruptedException {
-		doRun(runnable, false);
-	}
-
-	public void run(IRunnableWithProgress runnable) {
-		try {
-			doRun(runnable, true);
-		} catch (InvocationTargetException e) {
-			Throwable cause = e.getCause();
-			if(cause instanceof RuntimeException) {
-				throw (RuntimeException)cause;
-			}
-			else {
-				if(cause == null) {
-					cause = e;
-				}
-				AuthoringUIPlugin.getDefault().getLogger().logError(cause);
-				try {
-					String msg = cause.getMessage() != null ? cause.getMessage() : cause.toString(); 
-					AuthoringUIPlugin.getDefault().getMsgDialog().displayError(AuthoringUIResources.errorDialog_title, msg, cause);
-				}
-				catch(Exception ex) {
-					
-				}				
-			}
-		} catch (InterruptedException e) {
-			return;
-		}
-	}
-	
-	/**
-	 * @return
-	 */
-	public IProgressMonitor getProgressMonitor() {
-		if(progressMonitor == null) {
-			progressMonitor = new NullProgressMonitor();
-		}
-		return progressMonitor;
-	}
-
-	/**
-	 * @param progressMonitor the progressMonitor to set
-	 */
-	public void setProgressMonitor(IProgressMonitor progressMonitor) {
-		this.progressMonitor = progressMonitor;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryValidateAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryValidateAction.java
deleted file mode 100755
index 86dd719..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryValidateAction.java
+++ /dev/null
@@ -1,297 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.DiagnosticChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.Diagnostician;
-import org.eclipse.emf.ecore.util.EObjectValidator;
-import org.eclipse.emf.edit.ui.EMFEditUIPlugin;
-import org.eclipse.emf.edit.ui.action.ValidateAction;
-import org.eclipse.epf.authoring.ui.util.LibraryValidationMarkerHelper;
-import org.eclipse.epf.authoring.ui.views.ConfigurationView;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.edit.validation.DependencyValidationMgr;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.NamedElement;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.epf.validation.LibraryEValidator;
-import org.eclipse.epf.validation.constraints.LibraryTraversalStrategy;
-import org.eclipse.epf.validation.constraints.LibraryTraversalStrategy.LibraryIterator;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-/**
- * @author Phong Nguyen Le
- * @since  1.0
- */
-public class LibraryValidateAction extends ValidateAction {
-	private HashSet resources;
-	private boolean success;
-	private boolean showSuccess = true;
-	private Map contextData = new HashMap();
-
-	public LibraryValidateAction() {
-		super();
-		eclipseResourcesUtil = new LibraryValidationMarkerHelper();
-	}
-	
-	public LibraryValidateAction(boolean showSuccess) {
-		this();
-		this.showSuccess  = showSuccess;
-	}
-	
-	public void putContextData(Object key, Object value) {
-		contextData.put(key, value);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.ui.action.ValidateAction#validate(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected Diagnostic validate(final IProgressMonitor progressMonitor) {
-	    if(resources == null) {
-	    	resources = new HashSet();
-	    }
-	    else {
-	    	resources.clear();
-	    }
-	    boolean dependencyInfoMgrSet = false;
-		Collection eObjects = new ArrayList();
-		for (Iterator iter = selectedObjects.iterator(); iter.hasNext();) {
-			Object element = TngUtil.unwrap(iter.next());
-			if(element instanceof EObject) {
-				eObjects.add(element);
-				Resource resource = ((EObject)element).eResource();
-				if(resource != null) {
-					resources.add(resource);
-				}
-				if (! dependencyInfoMgrSet && element instanceof MethodElement) {
-					MethodLibrary lib = UmaUtil.getMethodLibrary((MethodElement) element);	
-					putContextData(LibraryEValidator.CTX_DEPENDENCY_VALIDATION_MGR, new DependencyValidationMgr(lib));
-					dependencyInfoMgrSet = true;
-				}
-			}
-		}
-		
-	    int count = eObjects.size();
-	    eObjects = LibraryTraversalStrategy.makeTargetsDisjoint(eObjects);
-		LibraryIterator libIter = new LibraryIterator(eObjects, true, LibraryTraversalStrategy.DEEP, true);
-		while(libIter.hasNext()) {
-			Object o = libIter.next();
-			count++;
-			if(o instanceof EObject) {
-				Resource resource = ((EObject)o).eResource();
-				if(resource != null) {
-					resources.add(resource);
-				}
-				
-				if(o instanceof NamedElement) {
-					NamedElement e = (NamedElement) o;
-					System.out.println(TngUtil.getTypeText(e) + ": '" + e.getName() + "'");
-				}
-			}
-		}
-		
-	    progressMonitor.beginTask("", count);
-
-//	    final AdapterFactory adapterFactory = 
-//	      domain instanceof AdapterFactoryEditingDomain ? ((AdapterFactoryEditingDomain)domain).getAdapterFactory() : null;
-
-	    Diagnostician diagnostician = 
-	      new Diagnostician()
-	      {
-	        public String getObjectLabel(EObject eObject)
-	        {
-//	          if (adapterFactory != null && !eObject.eIsProxy())
-//	          {
-//	            IItemLabelProvider itemLabelProvider = (IItemLabelProvider)adapterFactory.adapt(eObject, IItemLabelProvider.class);
-//	            if (itemLabelProvider != null)
-//	            {
-//	              return itemLabelProvider.getText(eObject);
-//	            }
-//	          }
-//	  
-//	          return super.getObjectLabel(eObject);
-	        	
-	        	return TngUtil.getLabelWithPath(eObject);
-	        }
-
-	        public boolean validate(EClass eClass, EObject eObject, DiagnosticChain diagnostics, Map context)
-	        {
-	          progressMonitor.worked(1);
-	          if(context == null) {
-	        	  context = contextData;	        	  
-	          }
-	          else {
-	        	  context.putAll(contextData);
-	          }
-	          return super.validate(eClass, eObject, diagnostics, context);
-	        }	        
-	        
-	      };
-	      List list = new ArrayList(eObjects);
-	      int max = list.size() - 1;
-	      StringBuffer strBuf = new StringBuffer();
-	      for (int i = 0; i < max; i++) {
-	    	  Object e = list.get(i);
-	    	  if(e instanceof NamedElement) {
-	    		  strBuf.append(((NamedElement)e).getName()).append(", "); //$NON-NLS-1$
-	    	  }
-	      }
-	      Object e = max < 0 ? null : list.get(max);
-	      if(e instanceof NamedElement) {
-    		  strBuf.append(((NamedElement)e).getName());
-    	  }
-	      BasicDiagnostic diagnostics = 
-	          new BasicDiagnostic
-	            (EObjectValidator.DIAGNOSTIC_SOURCE,
-	             0,
-	             EcorePlugin.INSTANCE.getString
-	               ("_UI_DiagnosticRoot_diagnostic", //$NON-NLS-1$ 
-	                new Object [] { strBuf.toString() }), //$NON-NLS-1$
-	             list.toArray());
-	      for (Iterator iter = eObjects.iterator(); iter.hasNext();) {
-	    	  EObject eObject = (EObject) iter.next();
-	    	  progressMonitor.setTaskName
-	    	  (EMFEditUIPlugin.INSTANCE.getString("_UI_Validating_message", new Object [] {diagnostician.getObjectLabel(eObject)}));
-	    	  diagnostician.validate(eObject, diagnostics);
-	      }
-	      success = diagnostics.getSeverity() == Diagnostic.OK;
-	      return diagnostics;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.ui.action.ValidateAction#handleDiagnostic(org.eclipse.emf.common.util.Diagnostic)
-	 */
-	protected void handleDiagnostic(Diagnostic diagnostic) {
-		if(diagnostic != null) {
-			if(showSuccess || !isSuccessful()) {
-				// save the reference to EclipseResourcesUtil and set eclipseResourcesUtil to null
-				// so super method will not try to deal with the markers
-				//
-				EclipseResourcesUtil savedRef = eclipseResourcesUtil;
-				eclipseResourcesUtil = null;
-				try {
-					super.handleDiagnostic(diagnostic);
-				}
-				finally {
-					eclipseResourcesUtil = savedRef;
-				}
-			}
-			
-			// dealing with markers
-			//
-			if (eclipseResourcesUtil != null)				
-			{
-				// delete old markers
-				//					
-				for (Iterator iter = resources.iterator(); iter.hasNext();) {
-					eclipseResourcesUtil.deleteMarkers((Resource) iter.next());
-				}
-				
-				Viewer viewer = null;
-				if (!diagnostic.getChildren().isEmpty())
-				{
-					Map diagnosticToResourceMap = new HashMap();
-					for (Iterator i = diagnostic.getChildren().iterator(); i.hasNext(); )
-					{
-						Diagnostic childDiagnostic = (Diagnostic)i.next();
-						List data = childDiagnostic.getData();
-						if (!data.isEmpty()) {
-							Object o = data.get(0);
-							if(o instanceof EObject) {
-								Resource resource = ((EObject)o).eResource();
-								if(resource != null) {
-									diagnosticToResourceMap.put(childDiagnostic, resource);
-								}
-							}
-						}
-					}
-										
-					// create markers
-					//
-					for (Iterator i = diagnosticToResourceMap.entrySet().iterator(); i.hasNext(); )
-					{
-						Map.Entry entry = (Entry) i.next();
-						Diagnostic childDiagnostic = (Diagnostic)entry.getKey();
-						Resource resource = (Resource) entry.getValue();
-						eclipseResourcesUtil.createMarkers(resource, childDiagnostic);
-					}
-					
-					// select the first object with problem in the viewer if possible
-					//
-					List data = ((Diagnostic)diagnostic.getChildren().get(0)).getData();
-					if (!data.isEmpty())
-					{
-						Object part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();						
-						Object e = data.get(0);
-						if (part instanceof ISetSelectionTarget)
-						{
-							((ISetSelectionTarget)part).selectReveal(new StructuredSelection(e));
-						}
-						else if (part instanceof IViewerProvider)
-						{
-							viewer = ((IViewerProvider)part).getViewer();
-							if (viewer != null)
-							{
-								viewer.setSelection(new StructuredSelection(data.get(0)), true);
-							}
-						}
-					}					
-				}
-				if(viewer == null) {
-					Object part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
-					if (part instanceof IViewerProvider)
-					{
-						viewer = ((IViewerProvider)part).getViewer();
-					}
-				}
-				if(viewer != null) {
-					viewer.refresh();
-				}
-				
-				try {
-					refreshViews();
-				}
-				catch(Exception e) {
-					
-				}
-			}
-		}
-	}
-	
-	protected void refreshViews() {
-		ConfigurationView.getView().getViewer().refresh();
-	}
-
-	public boolean isSuccessful() {
-		return success;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewCopyAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewCopyAction.java
deleted file mode 100755
index a5b21b3..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewCopyAction.java
+++ /dev/null
@@ -1,71 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.edit.ui.action.CopyAction;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.edit.domain.TraceableAdapterFactoryEditingDomain;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-
-/**
- * Copies an element in the Library view.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class LibraryViewCopyAction extends CopyAction {
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#run()
-	 */
-	public void run() {
-		if (command == null)
-			return;
-		else {
-			if (domain instanceof TraceableAdapterFactoryEditingDomain) {
-				((TraceableAdapterFactoryEditingDomain) domain).resetCopyMaps();
-			}
-			super.run();
-		}
-	}
-
-	
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-		if (selection == null || selection.isEmpty())
-			return false;
-
-		Collection collection = new ArrayList();
-		for (Iterator objects = selection.iterator(); objects.hasNext();) {
-			Object element = TngUtil.unwrap(objects.next());
-			if (element instanceof MethodElement
-					&& !(element instanceof MethodPlugin)
-					&& !TngUtil.isPredefined((MethodElement) element)) {
-				collection.add(element);
-			}
-
-		}
-
-		command = createCommand(collection);
-
-		return command.canExecute();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewCutAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewCutAction.java
deleted file mode 100755
index 72ccde2..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewCutAction.java
+++ /dev/null
@@ -1,41 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import org.eclipse.emf.edit.ui.action.CutAction;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-/**
- * Cuts an element in the Library view to the clipboard.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class LibraryViewCutAction extends CutAction {
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#run()
-	 */
-	public void run() {
-		if (command == null)
-			return;
-		else
-			super.run();
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-		return false;
-	}
-	
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewDeleteAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewDeleteAction.java
deleted file mode 100755
index ae0244d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewDeleteAction.java
+++ /dev/null
@@ -1,326 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.DelegatingWrapperItemProvider;
-import org.eclipse.emf.edit.provider.IWrapperItemProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.editors.IEditorKeeper;
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.edit.FeatureValueWrapperItemProvider;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.persistence.ILibraryResourceSet;
-import org.eclipse.epf.services.ILibraryPersister;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-
-/**
- * Deletes an element in the Library view.
- * 
- * @author Phong Nguyen Le
- * @author Kelvin Low
- * @since 1.0
- */
-public class LibraryViewDeleteAction extends MethodElementDeleteAction {
-	
-	/** 
-	 * Delets an element in library view
-	 * 
-	 */
-	public LibraryViewDeleteAction() {
-		this(true);
-	}
-	
-	/**
-	 * Deletes an element in library view after confirming with user
-	 * @param confirm
-	 */
-	public LibraryViewDeleteAction(boolean confirm) {
-		super();
-		this.confirm = confirm; 
-	}
-
-	/**
-	 * @see MethodElementDeleteAction#didDelete(Collection)
-	 */
-	protected void didDelete(Collection deletedElements) {
-		// Close all open editors associated with the deleted elements.
-		for (Iterator iter = deletedElements.iterator(); iter.hasNext();) {
-			Object element = TngUtil.unwrap(iter.next());
-			if (element instanceof MethodElement
-					&& ((MethodElement) element).eContainer() == null) {
-				IEditorKeeper.REFERENCE.getEditorKeeper()
-						.closeEditorsOnDeletion((MethodElement) element);
-			}
-		}
-	}
-	
-	private static CustomCategory getRootCustomCategory(Object object) {
-		for(; object instanceof IWrapperItemProvider; object = ((IWrapperItemProvider)object).getOwner());
-		object = TngUtil.unwrap(object);
-		return object instanceof CustomCategory && TngUtil.isRootCustomCategory((CustomCategory) object) ?
-			(CustomCategory) object : null;
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-		ArrayList filteredSelection = new ArrayList();
-
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object e = iter.next();
-			if(e instanceof CustomCategory) {
-				filteredSelection.add(e);
-				continue;
-			}
-			Object element = TngUtil.unwrap(e);
-			if (element instanceof ItemProviderAdapter
-					|| (element instanceof MethodElement && TngUtil
-							.isPredefined((MethodElement) element))) {
-				continue;
-			}
-			if (element instanceof CustomCategory) {
-				CustomCategory rootCustomCategory = getRootCustomCategory(e);
-				CustomCategory cc = (CustomCategory) element;
-				if (rootCustomCategory != null && 
-						UmaUtil.getMethodPlugin(rootCustomCategory) == UmaUtil.getMethodPlugin(cc)) {
-					// selected custome category is in the current plugin.
-					// add the element to the selection instead of its
-					// wrapper so the element
-					// will be deleted permanently from the library
-					//
-					filteredSelection.add(element);					
-				}
-			} else {				
-				if(e instanceof IWrapperItemProvider) {
-					IWrapperItemProvider wrapper = (IWrapperItemProvider) e;
-//					if(wrapper.getValue() instanceof IWrapperItemProvider &&
-//							!(TngUtil.unwrap(wrapper.getOwner()) instanceof CustomCategory)) {
-//						// disallow deleting element when its reference in
-//						// CustomCategory tree
-//						// that is not directly under a CustomCategory is
-//						// selected
-//						//
-//						continue;
-//					}
-					
-					if (TngUtil.isUnderCustomCategoryTree(wrapper)) {
-						// disallow deleting element under a custom category that is not a custom category
-						//
-						continue;
-					}
-					else if (wrapper.getFeature() == UmaPackage.Literals.DISCIPLINE_GROUPING__DISCIPLINES 
-							|| wrapper.getFeature() == UmaPackage.Literals.ROLE_SET_GROUPING__ROLE_SETS) 
-					{
-						Object owner = wrapper.getOwner();
-						if(owner instanceof EObject && element instanceof EObject && 
-								UmaUtil.getMethodPlugin((EObject) owner) == UmaUtil.getMethodPlugin((EObject) element)) {
-							// category grouping and category are in the same plugin
-							// add the element to the selection instead of its wrapper so the element 
-							// will be deleted permanently from the library
-							//
-							filteredSelection.add(element);
-							continue;
-						}
-					}
-				}
-				filteredSelection.add(e);
-			}
-		}
-
-		if (filteredSelection.isEmpty())
-			return false;
-
-		return super
-				.updateSelection(new StructuredSelection(filteredSelection));
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.actions.MethodElementDeleteAction#performDelete()
-	 */
-	protected void performDelete() {
-		HashSet configsToDelete = new HashSet();
-		HashSet modifiedResources = new HashSet();
-		ILibraryPersister persister = LibraryServiceUtil.getCurrentPersister();
-		if (selection != null && selection.size() > 0) {
-			for (Iterator iter = selection.iterator(); iter.hasNext();) {
-				Object object = TngUtil.unwrap(iter.next());
-				if (object instanceof MethodConfiguration) {
-					configsToDelete.add(object);
-				}
-				if (object instanceof EObject && !persister.hasOwnResourceWithoutReferrer(object)) {
-					EObject container = ((EObject) object).eContainer();
-					if (container != null && container.eResource() != null) {
-						modifiedResources.add(container.eResource());
-					}
-				}
-			}
-		}
-
-		// Avoid deleting the default configuration of a process.
-		if (!configsToDelete.isEmpty()) {
-			HashSet configGUIDsToDelete = new HashSet();
-			for (Iterator iter = configsToDelete.iterator(); iter.hasNext();) {
-				MethodConfiguration config = (MethodConfiguration) iter.next();
-				configGUIDsToDelete.add(config.getGuid());
-			}
-			ILibraryResourceSet resourceSet = (ILibraryResourceSet) LibraryService
-					.getInstance().getCurrentMethodLibrary().eResource()
-					.getResourceSet();
-			resourceSet
-					.loadOppositeFeatures(
-							Collections
-									.singletonList(AssociationHelper.MethodConfiguration_DependentProcesses),
-							configGUIDsToDelete);
-
-			for (Iterator iter = configsToDelete.iterator(); iter.hasNext();) {
-				MethodConfiguration config = (MethodConfiguration) iter.next();
-
-				List references = AssociationHelper
-						.getDependentProcesses(config);
-				if (references != null && references.size() > 0) {
-					String processName = ((org.eclipse.epf.uma.Process) references
-							.get(0)).getName();
-					AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayWarning(
-									AuthoringUIResources.deleteDialog_title, //$NON-NLS-1$
-									AuthoringUIResources.deleteConfigError_msg, //$NON-NLS-1$
-									AuthoringUIResources
-											.bind(
-													AuthoringUIResources.deleteConfigError_reason,
-													processName)); //$NON-NLS-1$
-					return;
-				}
-
-			}
-
-		}
-
-		IStatus status = UserInteractionHelper.checkModify(modifiedResources,
-				MsgBox.getDefaultShell());
-		if (!status.isOK()) {
-			AuthoringUIPlugin.getDefault().getMsgDialog().display(
-					AuthoringUIResources.deleteDialog_title, //$NON-NLS-1$
-					status);
-			return;
-		}
-
-		if (confirmDelete()) {
-			// Collect the information of Refreshable Objects
-			// ( Reference Objects should be refreshed in navigation tree) -
-			ArrayList refreshList = new ArrayList();
-			for (Iterator iter = selection.iterator(); iter.hasNext();) {
-				Object deletingObject = TngUtil.unwrap(iter.next());
-				if (deletingObject instanceof MethodElement) {
-					// check for variability
-					if (deletingObject instanceof VariabilityElement) {
-						for (Iterator iterator = TngUtil
-								.getGeneralizers((VariabilityElement) deletingObject); iterator
-								.hasNext();) {
-							Object aReference = iterator.next();
-							refreshList.add(aReference);
-						}
-					}
-				}
-			}
-
-			// execute actual delete command.
-			command.execute();
-
-			// Refresh the refreshlist objects in navigation tree.
-			if (refreshList.size() > 0) {
-				TreeViewer viewer = ((TreeViewer) (LibraryView.getView()
-						.getViewer()));
-				for (Iterator iter = refreshList.iterator(); iter.hasNext();) {
-					viewer.refresh(iter.next());
-				}
-			}
-		}
-	}
-
-	/**
-	 * Notify propery change with old and new value
-	 * 
-	 * @param propertyName
-	 * 			property name for which value is going to change
-	 * @param oldValue
-	 * 			Old value of the property
-	 * @param newValue
-	 * 			New value of the property
-	 */
-	public void notifyPropertyChange(String propertyName, Object oldValue,
-			Object newValue) {
-		super.firePropertyChange(propertyName, oldValue, newValue);
-	}
-
-	/**
-	 * Handle the special case of customcategory Copy/Delete action If parent of
-	 * customcategory selected, ignore the customcategory, otherwise compound
-	 * command creates a command for parent and a command for child,
-	 * CompoundCommand will execute both commands, command for parent will
-	 * remove parent itself and removes child too, next it try to execute
-	 * command for child, command will fail because child got remove in command
-	 * for parent. 
-	 * TODO: handle properly in RemoveCommand for this case instead here.
-	 */
-	public void filterCustomCategorySelection(Object e, List filteredSelection) {
-		if (e instanceof FeatureValueWrapperItemProvider) {
-			filteredSelection.add(e);
-		} else {
-			Object owner = ((DelegatingWrapperItemProvider) e).getOwner();
-			while (owner instanceof DelegatingWrapperItemProvider) {
-				if (owner instanceof FeatureValueWrapperItemProvider) {
-					if (!filteredSelection.contains(owner)) {
-						filteredSelection.add(e);
-					}
-					break;
-				} else {
-					if (filteredSelection.contains(owner))
-						break;
-					owner = ((DelegatingWrapperItemProvider) owner).getOwner();
-					if (!(owner instanceof FeatureValueWrapperItemProvider)) {
-						if (!filteredSelection.contains(owner)) {
-							filteredSelection.add(e);
-							break;
-						}
-					}
-				}
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewEditAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewEditAction.java
deleted file mode 100755
index fb60dd3..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewEditAction.java
+++ /dev/null
@@ -1,82 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.epf.authoring.ui.editors.EditorChooser;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.actions.BaseSelectionListenerAction;
-
-
-/**
- * Edits an element in the Library view.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- */
-public class LibraryViewEditAction extends BaseSelectionListenerAction {
-
-	/**
-	 * The ID for this action.
-	 */
-	public static final String ACTION_ID = LibraryViewEditAction.class.getName();
-	
-	private Collection selected;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public LibraryViewEditAction(String text) {
-		super(text);
-	}
-
-	/**
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		for (Iterator objects = selected.iterator(); objects.hasNext();) {
-			Object element = objects.next();
-			EditorChooser.getInstance().openEditor(element);
-		}
-	}
-
-	/**
-	 * Updates this action in response to the given selection changes.
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-		if (selection.isEmpty()) {
-			return false;
-		}
-
-		selected = new HashSet();
-
-		for (Iterator objects = selection.iterator(); objects.hasNext();) {
-			Object element = objects.next();
-			Object realObj = TngUtil.unwrap(element);
-			if (realObj instanceof MethodElement
-					&& !TngUtil.isPredefined((MethodElement) realObj)
-					&& !(realObj instanceof ProcessPackage && !(realObj instanceof ProcessComponent))) {
-				selected.add(realObj);
-			}
-		}
-
-		return !selected.isEmpty();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewFindElementAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewFindElementAction.java
deleted file mode 100755
index 78ca9a8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewFindElementAction.java
+++ /dev/null
@@ -1,69 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.actions.BaseSelectionListenerAction;
-
-/**
- * 
- * Finds an element in library view
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- *
- */
-public class LibraryViewFindElementAction extends BaseSelectionListenerAction {
-
-	/**
-	 * The ID for this action.
-	 */
-	public static final String ACTION_ID = LibraryViewFindElementAction.class
-			.getName();
-	
-	private LibraryView targetView;
-	private IStructuredSelection selected;
-
-	
-	public LibraryViewFindElementAction(String text) {
-		super(text);
-	}
-
-	/**
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		if (targetView == null)
-			targetView = LibraryView.getView();
-		// select currentSelection in Lib View
-		if (targetView != null && selected != null && !selected.isEmpty()) {
-			targetView.setSelectionToViewer(selected.getFirstElement());
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	protected boolean updateSelection(IStructuredSelection selection) {
-		selected = selection;
-		if (selection != null && !selection.isEmpty()) {
-			Object element = selection.getFirstElement();
-			Object realObj = TngUtil.unwrap(element);
-			if (realObj instanceof MethodElement) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewPasteAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewPasteAction.java
deleted file mode 100755
index 96d4862..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LibraryViewPasteAction.java
+++ /dev/null
@@ -1,134 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.PasteFromClipboardCommand;
-import org.eclipse.emf.edit.ui.action.PasteAction;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-
-/**
- * Pastes an element from the clipboard to the Library view.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class LibraryViewPasteAction extends PasteAction implements
-		ILibraryAction {
-
-	private IProgressMonitor progressMonitor;
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#run()
-	 */
-	public void run() {
-		LibraryLockingOperationRunner runner = new LibraryLockingOperationRunner();
-		runner.setProgressMonitor(getProgressMonitor());
-		runner.run(new IRunnableWithProgress() {
-
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				performPaste();
-			}
-			
-		});
-	}
-	
-	/**
-	 * Perform paste operation
-	 */
-	protected void performPaste() {
-		if(command instanceof PasteFromClipboardCommand) {
-			PasteFromClipboardCommand cmd = ((PasteFromClipboardCommand)command);
-			Object owner = cmd.getOwner();
-			if(owner instanceof Adapter) {
-				owner = ((Adapter)owner).getTarget();
-			}
-			
-			// check target for modifiable
-			//
-			if(owner instanceof EObject) {
-				IStatus status = UserInteractionHelper.checkModify((EObject) owner, MsgBox.getDefaultShell());
-				if (!status.isOK()) {
-					AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-							getText(), null, status);
-					return;
-				}
-			}			
-		}
-		
-		if (command == null)
-			return;
-		else
-			super.run();
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-		if (selection.size() < 1)
-			return false;
-		else {
-			Object[] objs = selection.toArray();
-			for (int i = 0; i < objs.length; i++) {
-				if (objs[i] instanceof MethodPlugin)
-					return false;
-			}
-		}
-
-		return super.updateSelection(selection);
-	}
-	
-	/**
-	 * Notify propery change with old and new value
-	 * 
-	 * @param propertyName
-	 * 			property name for which value is going to change
-	 * @param oldValue
-	 * 			Old value of the property
-	 * @param newValue
-	 * 			New value of the property
-	 */
-	public void notifyPropertyChange(String propertyName, Object oldValue,
-			Object newValue) {
-		super.firePropertyChange(propertyName, oldValue, newValue);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.actions.ILibraryAction#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void setProgressMonitor(IProgressMonitor monitor) {
-		progressMonitor = monitor;
-	}
-
-	/**
-	 * Returns progress monitor
-	 * @return the progressMonitor
-	 */
-	protected IProgressMonitor getProgressMonitor() {
-		if(progressMonitor == null) {
-			progressMonitor = new NullProgressMonitor();
-		}
-		return progressMonitor;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LinkWithEditor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LinkWithEditor.java
deleted file mode 100755
index 93b9c00..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/LinkWithEditor.java
+++ /dev/null
@@ -1,110 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import org.eclipse.epf.authoring.ui.editors.EditorChooser;
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Links editor with an element in library view
- * @author Jeff Hardy
- * @since 1.0
- *
- */
-public class LinkWithEditor implements IViewActionDelegate {
-
-	private LibraryView targetView;
-
-	private static boolean enabled = false;
-
-	private IPartListener editorPartListener = new IPartListener() {
-
-		public void partOpened(IWorkbenchPart part) {
-		}
-
-		public void partDeactivated(IWorkbenchPart part) {
-		}
-
-		public void partClosed(IWorkbenchPart part) {
-		}
-
-		public void partBroughtToTop(IWorkbenchPart part) {
-		}
-
-		public void partActivated(IWorkbenchPart part) {
-			if (part instanceof IEditorPart) {
-				// Select the method element associated with the currently
-				// selected editor.
-				Object[] objects = new Object[1];
-				objects[0] = EditorChooser.getInstance()
-						.getSelectedEditorInput();
-				if (objects[0] != null) {
-					// disable the selectionChanged method from firing from this selection change
-					enabled = false;
-					targetView.setSelectionToViewer(objects[0]);
-					enabled = true;
-				}
-			}
-
-		}
-	};
-
-	/**
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
-	public void init(IViewPart view) {
-		targetView = (LibraryView) view;
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		if (enabled) {
-			// remove listeners from editorpart
-			targetView.getSite().getPage().removePartListener(
-					editorPartListener);
-
-			enabled = false;
-		} else {
-			// select element of currently selected editor
-			Object[] objects = new Object[1];
-			objects[0] = EditorChooser.getInstance().getSelectedEditorInput();
-			if (objects[0] != null) {
-				targetView.setSelectionToViewer(objects[0]);
-			}
-
-			// add listeners to editorpart
-			targetView.getSite().getPage().addPartListener(editorPartListener);
-
-			enabled = true;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		// System.out.println("LinkWithEditor selection is " + selection);
-		if (enabled) {
-			IStructuredSelection sel = (IStructuredSelection) selection;
-			EditorChooser.getInstance().selectEditor(sel.getFirstElement());
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodAddImageAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodAddImageAction.java
deleted file mode 100755
index 65cd8d6..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodAddImageAction.java
+++ /dev/null
@@ -1,93 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.io.IOException;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.dialogs.MethodAddImageDialog;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextEditor;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.actions.RichTextAction;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-
-
-/**
- * Displays the Add Image dialog.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class MethodAddImageAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public MethodAddImageAction() {
-		setImage(RichTextImages.IMG_ADD_IMAGE);
-		setToolTipText(RichTextResources.addImageAction_toolTipText); //$NON-NLS-1$
-		setEnabled(true);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            A Rich Text control.
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null && richText instanceof IMethodRichText) {
-			MethodAddImageDialog dialog = new MethodAddImageDialog(Display
-					.getCurrent().getActiveShell(),
-					((IMethodRichText) richText).getMethodElement());
-			dialog.open();
-			if (dialog.getReturnCode() == Window.OK) {
-				String imageLink = dialog.getUrl();
-				if (imageLink.length() > 0) {
-					if (dialog.getFileToCopy() != null) {
-						// Copy the image to the resource folder if necessary.
-						try {
-							ResourceHelper.getURLForAttachment(dialog
-									.getFileToCopy(),
-									((IMethodRichText) richText)
-											.getMethodElement(), true);
-						} catch (IOException ex) {
-							AuthoringUIPlugin.getDefault().getLogger().logError(ex);
-						}
-					}
-					if (richText instanceof RichTextEditor) {
-						((RichTextEditor) richText).addImage(imageLink, "" + dialog.getHeight(), "" + dialog.getWidth(), dialog.getAltTag()); //$NON-NLS-1$ //$NON-NLS-2$
-					} else {
-						richText
-						.executeCommand(
-								RichTextCommand.ADD_IMAGE,
-								new String[] {
-										imageLink,
-										"" + dialog.getHeight(), "" + dialog.getWidth(), dialog.getAltTag() }); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-
-				}
-			}
-		}
-	}
-	
-	public boolean disableInSourceMode() {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodAddLinkAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodAddLinkAction.java
deleted file mode 100755
index 84d4ed9..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodAddLinkAction.java
+++ /dev/null
@@ -1,85 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.io.IOException;
-
-import org.eclipse.epf.authoring.ui.dialogs.MethodAddLinkDialog;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextEditor;
-import org.eclipse.epf.richtext.actions.AddLinkAction;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Adds a link to a Rich Text editor.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodAddLinkAction extends AddLinkAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public MethodAddLinkAction() {
-		super();
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            A Rich Text control.
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			if (richText instanceof IMethodRichText) {
-				MethodAddLinkDialog dialog = new MethodAddLinkDialog(Display
-						.getCurrent().getActiveShell(),
-						(IMethodRichText) richText);
-				dialog.open();
-				if (dialog.getReturnCode() == Window.OK) {
-					String linkURL = dialog.getLink().getURL();
-					if (linkURL.length() > 0) {
-						if (richText instanceof RichTextEditor) {
-							((RichTextEditor) richText).addHTML(linkURL);
-						} else {
-							richText.executeCommand(RichTextCommand.ADD_HTML,
-									linkURL);
-						}
-						if (dialog.getFileToCopy() != null) {
-							try {
-								ResourceHelper.getURLForAttachment(dialog
-										.getFileToCopy(),
-										((IMethodRichText) richText)
-												.getMethodElement(), true);
-							} catch (IOException ex) {
-								ex.printStackTrace();
-							}
-						}
-						// TODO: This will reset the RTE's modified flag to
-						// false and
-						// will prevent the newly added links from being saved.
-						// richText.setText(richText.getText());
-					}
-				}
-			} else {
-				super.execute(richText);
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodCreateChildAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodCreateChildAction.java
deleted file mode 100755
index 284eba1..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodCreateChildAction.java
+++ /dev/null
@@ -1,113 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.command.CreateChildCommand;
-import org.eclipse.emf.edit.command.CreateChildCommand.Helper;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.ui.action.StaticSelectionCommandAction;
-import org.eclipse.epf.library.edit.process.command.CreateProcessComponentCommand;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-
-
-/**
- * Method Create Child action.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public final class MethodCreateChildAction extends StaticSelectionCommandAction {
-	/**
-	 * This describes the child to be created.
-	 */
-	protected Object descriptor;
-
-	/**
-	 * This constructs an instance of an action that creates a child specified
-	 * by <code>descriptor</code> for the single object in the
-	 * <code>selection</code>.
-	 */
-	public MethodCreateChildAction(EditingDomain editingDomain,
-			ISelection selection, Object descriptor) {
-		super();
-		this.editingDomain = editingDomain;
-		this.descriptor = descriptor;
-		configureAction(selection);
-	}
-
-	/**
-	 * This creates the command for {@link
-	 * StaticSelectionCommandAction#createActionCommand}.
-	 */
-	protected Command createActionCommand(EditingDomain editingDomain,
-			Collection collection) {
-		if (collection.size() == 1) {
-			Object owner = collection.iterator().next();
-			Command cmd = null;
-
-			if (descriptor instanceof CommandParameter
-					&& ((CommandParameter) descriptor).getValue() instanceof ProcessComponent) {
-				CommandParameter newChildParameter = (CommandParameter) descriptor;
-				CreateChildCommand.Helper helper = (Helper) ((AdapterFactoryEditingDomain)editingDomain).getAdapterFactory().adapt(owner, IEditingDomainItemProvider.class);
-//				for (Iterator iter = ((EObject) owner).eAdapters().iterator(); iter
-//						.hasNext();) {
-//					Object o = iter.next();
-//					if (o instanceof ProcessPackageItemProvider) {
-//						helper = (ProcessPackageItemProvider) o;
-//						break;
-//					}
-//				}
-				cmd = new CreateProcessComponentCommand(editingDomain,
-						(EObject) owner, newChildParameter
-								.getEStructuralFeature(), newChildParameter
-								.getValue(), newChildParameter.getIndex(),
-						collection, helper) {
-				};
-			} else {
-				cmd = CreateChildCommand.create(editingDomain, owner,
-						descriptor, collection);
-			}
-
-			return new CreateMethodElementCommand(cmd);
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-	
-	private void superRun() {
-		super.run();
-	}
-	
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.StaticSelectionCommandAction#run()
-	 */
-	public void run() {
-		LibraryLockingOperationRunner runner = new LibraryLockingOperationRunner();
-		runner.run(new IRunnableWithProgress() {
-
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				superRun();
-			}
-			
-		});
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodCreateSiblingAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodCreateSiblingAction.java
deleted file mode 100755
index 4af4f29..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodCreateSiblingAction.java
+++ /dev/null
@@ -1,67 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.edit.command.CreateChildCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.action.StaticSelectionCommandAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IViewPart;
-
-/**
- * Method Create Sibiling action.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public final class MethodCreateSiblingAction extends
-		StaticSelectionCommandAction {
-
-	/**
-	 * This describes the sibling to be created.
-	 */
-	protected Object descriptor;
-
-	/**
-	 * This constructs an instance of an action that creates a sibling specified
-	 * by <code>descriptor</code>.
-	 */
-	public MethodCreateSiblingAction(IViewPart viewPart, ISelection selection,
-			Object descriptor) {
-		super();
-		if (viewPart instanceof IEditingDomainProvider) {
-			editingDomain = ((IEditingDomainProvider) viewPart)
-					.getEditingDomain();
-		}
-		this.descriptor = descriptor;
-		configureAction(selection);
-	}
-
-	/**
-	 * This creates the command for {@link
-	 * StaticSelectionCommandAction#createActionCommand}.
-	 */
-	protected Command createActionCommand(EditingDomain editingDomain,
-			Collection collection) {
-		if (collection.size() == 1) {
-			Command cmd = CreateChildCommand.create(editingDomain, null,
-					descriptor, collection);
-			return new CreateMethodElementCommand(cmd);
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodElementDeleteAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodElementDeleteAction.java
deleted file mode 100755
index 0ac62ea..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodElementDeleteAction.java
+++ /dev/null
@@ -1,207 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-import java.util.EventObject;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.ui.action.DeleteAction;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.command.DeleteMethodElementCommand;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.persistence.ILibraryResourceSet;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-
-/**
- * Action to delete method element
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MethodElementDeleteAction extends DeleteAction implements ILibraryAction {
-	protected Collection selection = null;
-
-	protected boolean confirm = true;
-
-	private IProgressMonitor progressMonitor;
-
-	/**
-	 * Deletes method element
-	 *
-	 */
-	public MethodElementDeleteAction() {
-		super();
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param domain
-	 */
-	public MethodElementDeleteAction(EditingDomain domain) {
-		super(domain);
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param domain
-	 * @param confirm
-	 *            flag indicates whether user confirmation is required. If
-	 *            <code>false</code>, executing this command will not
-	 *            interact with user and the default behavior will apply.
-	 */
-	public MethodElementDeleteAction(EditingDomain domain, boolean confirm) {
-		this(domain);
-		this.confirm = confirm;
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.DeleteAction#createCommand(java.util.Collection)
-	 */
-	public Command createCommand(Collection selection) {
-		this.selection = selection;
-
-		DeleteMethodElementCommand cmd = createMethodElementDeleteCommand();
-		cmd
-				.addCommandListener(new DeleteMethodElementCommand.CommandListener() {
-
-					public void notifyExecuted(EventObject eventObject) {
-						DeleteMethodElementCommand cmd = (DeleteMethodElementCommand) eventObject
-								.getSource();
-						didDelete(cmd.getResult());
-					}
-
-					public void notifyFailure(EventObject eventObject) {
-						deleteFailed();
-					}
-
-				});
-		return cmd;
-	}
-
-	protected void deleteFailed() {
-	}
-
-	/**
-	 * Create a command to delete method element
-	 * @return command
-	 */
-	public DeleteMethodElementCommand createMethodElementDeleteCommand() {
-		return new DeleteMethodElementCommand(super.createCommand(selection),
-				selection, confirm) {
-			protected void loadOppositeFeatures(List oppositeFeatures,
-					Set deletedGUIDs) {
-				ILibraryResourceSet resourceSet = (ILibraryResourceSet) LibraryService
-						.getInstance().getCurrentMethodLibrary().eResource()
-						.getResourceSet();
-				resourceSet
-						.loadOppositeFeatures(oppositeFeatures, deletedGUIDs);
-			}
-		};
-	}
-
-	protected void didDelete(Collection deletedElements) {
-
-	}
-
-	/**
-	 * Get confirmation message to delete
-	 * @return
-	 */
-	protected String getDeleteConfirmationMessage() {
-		return AuthoringUIResources.MethodElementDeleteAction_deleteconfirm_text; //$NON-NLS-1$
-	}
-
-	protected boolean confirmDelete() {
-		if (!confirm) {
-			return true;
-		}
-
-		if (selection == null || selection.isEmpty())
-			return false;
-
-		int i = 0;
-		StringBuffer elementStr = new StringBuffer();
-
-		for (Iterator it = selection.iterator(); it.hasNext();) {
-			Object obj = TngUtil.unwrap(it.next());
-			if (obj instanceof MethodElement) {
-				if (i > 0) {
-					elementStr.append(", "); //$NON-NLS-1$
-				}
-				elementStr.append(((MethodElement) obj).getName());
-
-				i++;
-			}
-		}
-
-		Object[] args = { elementStr.toString() };
-		String msg = AuthoringUIResources.bind(AuthoringUIResources.confirmDeleteDialog_msg, args); // NON-NLS-1$
-
-		String title = AuthoringUIResources.confirmDeleteDialog_title; //$NON-NLS-1$
-		boolean deleteOk = AuthoringUIPlugin.getDefault().getMsgDialog()
-				.displayConfirmation(title, msg);
-		return deleteOk;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.actions.ILibraryAction#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void setProgressMonitor(IProgressMonitor monitor) {
-		progressMonitor = monitor;
-	}
-
-	/**
-	 * @return the progressMonitor
-	 */
-	protected IProgressMonitor getProgressMonitor() {
-		if(progressMonitor == null) {
-			progressMonitor = new NullProgressMonitor();
-		}
-		return progressMonitor;
-	}
-	
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#run()
-	 */
-	public void run() {
-		LibraryLockingOperationRunner runner = new LibraryLockingOperationRunner();
-		runner.setProgressMonitor(getProgressMonitor());
-		runner.run(new IRunnableWithProgress() {
-
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				performDelete();
-			}
-			
-		});
-	}
-	
-	/**
-	 * Performs delete
-	 *
-	 */
-	protected void performDelete() {
-		super.run();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodLibraryActionBarContributor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodLibraryActionBarContributor.java
deleted file mode 100755
index 37a1b9e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MethodLibraryActionBarContributor.java
+++ /dev/null
@@ -1,501 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.action.CopyAction;
-import org.eclipse.emf.edit.ui.action.CreateChildAction;
-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
-import org.eclipse.emf.edit.ui.action.CutAction;
-import org.eclipse.emf.edit.ui.action.DeleteAction;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.action.LoadResourceAction;
-import org.eclipse.emf.edit.ui.action.PasteAction;
-import org.eclipse.emf.edit.ui.action.RedoAction;
-import org.eclipse.emf.edit.ui.action.UndoAction;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.action.SubContributionItem;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-
-/**
- * The contributor for a Method editor.
- *  
- * @author Phong Nguyen Le
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodLibraryActionBarContributor extends
-		EditingDomainActionBarContributor implements ISelectionChangedListener {
-	
-	// Keep track of the active editor.
-	protected IEditorPart activeEditorPart;
-
-	// Keep track of the current selection provider.
-	protected ISelectionProvider selectionProvider;
-
-	// Handle the Show Properties view action.
-	protected IAction showPropertiesViewAction = new Action(
-			getString("_UI_ShowPropertiesView_menu_item")) { //$NON-NLS-1$
-		public void run() {
-			try {
-				getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
-			} catch (PartInitException exception) {
-				AuthoringUIPlugin.getDefault().getLogger().logError(exception);
-			}
-		}
-	};
-
-	/**
-	 * This action refreshes the viewer of the current editor if the editor
-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
-	 */
-	protected IAction refreshViewerAction = new Action(
-			getString("_UI_RefreshViewer_menu_item")) { //$NON-NLS-1$
-		public boolean isEnabled() {
-			return activeEditorPart instanceof IViewerProvider;
-		}
-
-		public void run() {
-			doRefresh();
-		}
-	};
-
-	/**
-	 * This will contain one
-	 * {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to
-	 * each descriptor generated for the current selection by the item provider.
-	 */
-	protected Collection createChildActions;
-
-	/**
-	 * This is the menu manager into which menu contribution items should be
-	 * added for CreateChild actions.
-	 */
-	protected IMenuManager createChildMenuManager;
-
-	/**
-	 * This will contain one
-	 * {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding
-	 * to each descriptor generated for the current selection by the item
-	 * provider.
-	 */
-	protected Collection createSiblingActions;
-
-	/**
-	 * This is the menu manager into which menu contribution items should be
-	 * added for CreateSibling actions.
-	 */
-	protected IMenuManager createSiblingMenuManager;
-
-	private String name;
-
-	private boolean enabled;
-
-	/**
-	 * This creates an instance of the contributor.
-	 */
-	public MethodLibraryActionBarContributor(String name) {
-		loadResourceAction = new LoadResourceAction();
-		validateAction = new LibraryValidateAction();
-		this.name = name;
-	}
-
-	/**
-	 * Creates delete action
-	 * @return Action
-	 */
-	protected DeleteAction createDeleteAction() {
-		return new DeleteAction();
-	}
-
-	 /**
-	 * 
-	 * @see org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor#init(org.eclipse.ui.IActionBars)
-	 */
-	public void init(IActionBars actionBars) {
-		ISharedImages sharedImages = PlatformUI.getWorkbench()
-				.getSharedImages();
-
-		deleteAction = createDeleteAction();
-		deleteAction.setImageDescriptor(sharedImages
-				.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
-		actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(),
-				deleteAction);
-
-		cutAction = createCutAction();
-		cutAction.setImageDescriptor(sharedImages
-				.getImageDescriptor(ISharedImages.IMG_TOOL_CUT));
-		actionBars.setGlobalActionHandler(ActionFactory.CUT.getId(), cutAction);
-
-		copyAction = createCopyAction();
-		copyAction.setImageDescriptor(sharedImages
-				.getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
-		actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(),
-				copyAction);
-
-		pasteAction = createPasteAction();
-		pasteAction.setImageDescriptor(sharedImages
-				.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE));
-		actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(),
-				pasteAction);
-
-		undoAction = new UndoAction();
-		undoAction.setImageDescriptor(sharedImages
-				.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO));
-		actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(),
-				undoAction);
-
-		redoAction = new RedoAction();
-		redoAction.setImageDescriptor(sharedImages
-				.getImageDescriptor(ISharedImages.IMG_TOOL_REDO));
-		actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(),
-				redoAction);
-	}
-
-	/**
-	 * Creates copy action
-	 * @return Action
-	 */
-	protected CopyAction createCopyAction() {
-		return new CopyAction();
-	}
-
-	/**
-	 * Creates paste action
-	 * @return Action
-	 */
-	protected PasteAction createPasteAction() {
-		return new PasteAction();
-	}
-
-	/**
-	 * Creates cut action
-	 * @return Action
-	 */
-	protected CutAction createCutAction() {
-		return new CutAction();
-	}
-
-	/**
-	 * This adds Separators for editor additions to the tool bar.
-	 */
-	public void contributeToToolBar(IToolBarManager toolBarManager) {
-		toolBarManager.add(new Separator(name + "-settings")); //$NON-NLS-1$
-		toolBarManager.add(new Separator(name + "-additions")); //$NON-NLS-1$
-	}
-
-	/**
-	 * Sets enabled flag
-	 * @param enabled
-	 */
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
-	/**
-	 * This adds to the menu bar a menu and some separators for editor
-	 * additions, as well as the sub-menus for object creation items.
-	 */
-	public void contributeToMenu(IMenuManager menuManager) {
-		super.contributeToMenu(menuManager);
-		IMenuManager submenuManager = new MenuManager(
-				getString("_UI_" + name + "_menu"), "org.eclipse.epf.authoring." + name + "MenuID"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
-
-		// Prepare for CreateChild item addition or removal.
-		createChildMenuManager = new MenuManager(
-				getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
-
-		// Prepare for CreateSibling item addition or removal.
-		createSiblingMenuManager = new MenuManager(
-				getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
-
-		// Force an update because Eclipse hides empty menus now.
-		submenuManager.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager menuManager) {
-				menuManager.updateAll(true);
-			}
-		});
-
-		addGlobalActions(submenuManager);
-	}
-
-	/**
-	 * When the active editor changes, this remembers the change and registers
-	 * with it as a selection provider.
-	 */
-	public void setActiveEditor(IEditorPart part) {
-		super.setActiveEditor(part);
-		activeEditorPart = part;
-
-		// Switch to the new selection provider.
-		if (selectionProvider != null) {
-			selectionProvider.removeSelectionChangedListener(this);
-		}
-		if (part == null) {
-			selectionProvider = null;
-		} else {
-			selectionProvider = part.getSite().getSelectionProvider();
-			selectionProvider.addSelectionChangedListener(this);
-
-			// Fake a selection changed event to update the menus.
-			if (selectionProvider.getSelection() != null) {
-				selectionChanged(new SelectionChangedEvent(selectionProvider,
-						selectionProvider.getSelection()));
-			}
-		}
-	}
-
-	/**
-	 * This implements
-	 * {@link org.eclipse.jface.viewers.ISelectionChangedListener}, handling
-	 * {@link org.eclipse.jface.viewers.SelectionChangedEvent} by querying for
-	 * the children and siblings that can be added to the selected object and
-	 * updating the menus accordingly.
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		// Remove any menu items for old selection.
-		if (createChildMenuManager != null) {
-			depopulateManager(createChildMenuManager, createChildActions);
-		}
-		if (createSiblingMenuManager != null) {
-			depopulateManager(createSiblingMenuManager, createSiblingActions);
-		}
-
-		// Query the new selection for appropriate new child/sibling
-		// descriptors.
-		Collection newChildDescriptors = null;
-		Collection newSiblingDescriptors = null;
-
-		ISelection selection = event.getSelection();
-		if (selection instanceof IStructuredSelection
-				&& ((IStructuredSelection) selection).size() == 1) {
-			Object object = ((IStructuredSelection) selection)
-					.getFirstElement();
-
-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart)
-					.getEditingDomain();
-
-			newChildDescriptors = domain.getNewChildDescriptors(object, null);
-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
-		}
-
-		// Generate actions for selection; populate and redraw the menus.
-		createChildActions = generateCreateChildActions(newChildDescriptors,
-				selection);
-		createSiblingActions = generateCreateSiblingActions(
-				newSiblingDescriptors, selection);
-
-		if (createChildMenuManager != null) {
-			populateManager(createChildMenuManager, createChildActions, null);
-			createChildMenuManager.update(true);
-		}
-		if (createSiblingMenuManager != null) {
-			populateManager(createSiblingMenuManager, createSiblingActions,
-					null);
-			createSiblingMenuManager.update(true);
-		}
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction}
-	 * for each object in <code>descriptors</code>, and returns the
-	 * collection of these actions.
-	 */
-	protected Collection generateCreateChildActions(Collection descriptors,
-			ISelection selection) {
-		Collection actions = new ArrayList();
-		if (descriptors != null) {
-			for (Iterator i = descriptors.iterator(); i.hasNext();) {
-				actions.add(new CreateChildAction(activeEditorPart, selection,
-						i.next()));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This generates a
-	 * {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each
-	 * object in <code>descriptors</code>, and returns the collection of
-	 * these actions.
-	 */
-	protected Collection generateCreateSiblingActions(Collection descriptors,
-			ISelection selection) {
-		Collection actions = new ArrayList();
-		if (descriptors != null) {
-			for (Iterator i = descriptors.iterator(); i.hasNext();) {
-				actions.add(new CreateSiblingAction(activeEditorPart,
-						selection, i.next()));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This populates the specified <code>manager</code> with
-	 * {@link org.eclipse.jface.action.ActionContributionItem}s based on the
-	 * {@link org.eclipse.jface.action.IAction}s contained in the
-	 * <code>actions</code> collection, by inserting them before the specified
-	 * contribution item <code>contributionID</code>. If <code>ID</code> is
-	 * <code>null</code>, they are simply added.
-	 */
-	protected void populateManager(IContributionManager manager,
-			Collection actions, String contributionID) {
-		if (actions != null) {
-			for (Iterator i = actions.iterator(); i.hasNext();) {
-				IAction action = (IAction) i.next();
-				if (contributionID != null) {
-					manager.insertBefore(contributionID, action);
-				} else {
-					manager.add(action);
-				}
-			}
-		}
-	}
-
-	/**
-	 * This removes from the specified <code>manager</code> all
-	 * {@link org.eclipse.jface.action.ActionContributionItem}s based on the
-	 * {@link org.eclipse.jface.action.IAction}s contained in the
-	 * <code>actions</code> collection.
-	 */
-	protected void depopulateManager(IContributionManager manager,
-			Collection actions) {
-		if (actions != null) {
-			IContributionItem[] items = manager.getItems();
-			for (int i = 0; i < items.length; i++) {
-				// Look into SubContributionItems
-				IContributionItem contributionItem = items[i];
-				while (contributionItem instanceof SubContributionItem) {
-					contributionItem = ((SubContributionItem) contributionItem)
-							.getInnerItem();
-				}
-
-				// Delete the ActionContributionItems with matching action.
-				if (contributionItem instanceof ActionContributionItem) {
-					IAction action = ((ActionContributionItem) contributionItem)
-							.getAction();
-					if (actions.contains(action)) {
-						manager.remove(contributionItem);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This populates the pop-up menu before it appears.
-	 */
-	public void menuAboutToShow(IMenuManager menuManager) {
-		// Add our standard marker.
-		menuManager.add(new Separator("additions")); //$NON-NLS-1$
-		menuManager.add(new Separator("edit")); //$NON-NLS-1$
-
-		// Add the edit menu actions.
-		menuManager.add(new ActionContributionItem(undoAction));
-		menuManager.add(new ActionContributionItem(redoAction));
-		menuManager.add(new Separator());
-		// menuManager.add(new ActionContributionItem(cutAction));
-		menuManager.add(new ActionContributionItem(copyAction));
-		menuManager.add(new ActionContributionItem(pasteAction));
-		menuManager.add(new Separator());
-		menuManager.add(new ActionContributionItem(deleteAction));
-		menuManager.add(new Separator());
-
-		// Add our other standard marker.
-		menuManager.add(new Separator("additions-end")); //$NON-NLS-1$
-
-		addGlobalActions(menuManager);
-
-		if (enabled) {
-			MenuManager submenuManager = null;
-			submenuManager = new MenuManager(
-					getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
-			populateManager(submenuManager, createChildActions, null);
-			menuManager.insertBefore("additions", submenuManager); //$NON-NLS-1$
-
-			submenuManager = new MenuManager(
-					getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
-			populateManager(submenuManager, createSiblingActions, null);
-			menuManager.insertBefore("additions", submenuManager); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * This inserts global actions before the "additions-end" separator.
-	 */
-	protected void addGlobalActions(IMenuManager menuManager) {
-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
-
-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
-		
-	    String key = (style & ADDITIONS_LAST_STYLE) == 0 ? "additions-end" : "additions";
-	    if (validateAction != null)
-	    {
-	      menuManager.insertBefore(key, new ActionContributionItem(validateAction));
-	    }
-	}
-
-	protected String getString(String key) {
-		return AuthoringUIPlugin.getDefault().getString(key);
-	}
-
-	/**
-	 * Refresh the viewer
-	 *
-	 */
-	protected void doRefresh() {
-		if (activeEditorPart instanceof IViewerProvider) {
-			Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();
-			if (viewer != null) {
-				viewer.refresh();
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MultiActionGroup.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MultiActionGroup.java
deleted file mode 100755
index 880dadb..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/MultiActionGroup.java
+++ /dev/null
@@ -1,126 +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.authoring.ui.actions;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.jface.action.ContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.actions.ActionGroup;
-
-/**
- * A MultiActionGroup will display a list of IActions in a menu by transforming them
- * into MenuItems. The list of labels given will be what is displayed in the ViewMenu for 
- * the corresponding action (the action at the same position in the action array).
- * The actions are currently implemented as state based
- * so that after an action is executed the label will have a selection check.
- * 
- * Code taken from org.eclipse.jdt.internal.ui.actions.MultiActionGroup.class
- */
-public class MultiActionGroup extends ActionGroup {
-	
-	public IAction[] NO_ACTIONS = new IAction[0];
-	
-	private IAction[] fActions; 
-	
-	private int fCurrentSelection;
-	private MenuItem[] fItems;
-
-	/**
-	 * Creates a new action group with a given set of actions.
-	 * 
-	 * @param actions			the actions for this multi group
-	 * @param currentSelection	decides which action is selected in the menu on start up.
-	 * 							Denotes the location in the actions array of the current
-	 * 							selected state. It cannot be null.
-	 */
-	public MultiActionGroup(IAction[] actions, int currentSelection) {
-		super();
-		setActions(actions, currentSelection);
-	}
-	
-	/**
-	 * Creates a new action group. Clients using this constructor must set the actions
-	 * immediately after creating the multi action group by calling {@link #setActions(IAction[], int)}.
-	 */
-	protected MultiActionGroup() {
-		super();
-	}
-	
-	/**
-	 * Sets the given actions.
-	 * 
-	 * @param actions			the actions for this multi group, at least one
-	 * @param currentSelection	decides which action is selected in the menu on start up.
-	 * 							Denotes the location in the actions array of the current
-	 * 							selected state. It cannot be null.
-	 */
-	protected final void setActions(IAction[] actions, int currentSelection) {
-		fCurrentSelection= currentSelection;
-		fActions = actions;
-	}
-
-	/**
-	 * Adds the actions to the given menu manager.
-	 */
-	protected void addActions(IMenuManager viewMenu) {
-
-		viewMenu.add(new Separator());
-		fItems= new MenuItem[fActions.length];
-
-		for (int i= 0; i < fActions.length; i++) {
-			final int j= i;
-
-			viewMenu.add(new ContributionItem() {
-
-				public void fill(Menu menu, int index) {
-					
-					int style= SWT.CHECK;
-					if ((fActions[j].getStyle() & IAction.AS_RADIO_BUTTON) != 0)
-						style= SWT.RADIO;
-					
-					MenuItem mi= new MenuItem(menu, style, index);
-					ImageDescriptor d= fActions[j].getImageDescriptor();
-					mi.setImage(AuthoringUIPlugin.getImageDescriptorRegistry().get(d));
-					fItems[j]= mi;
-					mi.setText(fActions[j].getText());
-					mi.setSelection(fCurrentSelection == j);
-					mi.addSelectionListener(new SelectionAdapter() {
-
-						public void widgetSelected(SelectionEvent e) {
-							if (fCurrentSelection == j) {
-								fItems[fCurrentSelection].setSelection(true);
-								return;
-							}
-							fActions[j].run();
-
-							// Update checked state
-							fItems[fCurrentSelection].setSelection(false);
-							fCurrentSelection= j;
-							fItems[fCurrentSelection].setSelection(true);
-						}
-
-					});
-				}
-				public boolean isDynamic() {
-					return false;
-				}
-			});
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/NewPluginAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/NewPluginAction.java
deleted file mode 100755
index 476e848..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/NewPluginAction.java
+++ /dev/null
@@ -1,157 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.epf.authoring.ui.AuthoringPerspective;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.PerspectiveListUtil;
-import org.eclipse.epf.authoring.ui.wizards.NewMethodPluginWizard;
-import org.eclipse.epf.common.utils.PerspectiveUtil;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * Displays the New Method Plug-in wizard and creates a new plug-in when the
- * user selects the Finish button.
- * 
- * @author Kelvin Low
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class NewPluginAction extends Action implements
-		IWorkbenchWindowActionDelegate {
-
-	// The cached window object.
-	private IWorkbenchWindow window;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public NewPluginAction() {
-		super();
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	public NewPluginAction(String text) {
-		super(text);
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		run();
-	}
-
-	/**
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		MethodLibrary targetLib = LibraryService.getInstance().getCurrentMethodLibrary();
-		if (targetLib == null) {
-			AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-					AuthoringUIResources.newPluginWizard_title, //$NON-NLS-1$
-					AuthoringUIResources.noOpenLibraryError_msg); //$NON-NLS-1$
-			return;
-		}
-
-		Shell shell = Display.getCurrent().getActiveShell();
-		IStatus status = UserInteractionHelper.checkModify(targetLib, shell);
-		if (!status.isOK()) {
-			AuthoringUIPlugin
-					.getDefault()
-					.getMsgDialog()
-					.display(
-							AuthoringUIResources.newPluginWizard_title, //$NON-NLS-1$
-							AuthoringUIResources.newPluginWizard_createError, //$NON-NLS-1$
-							status);
-			return;
-		}
-
-		final IWorkbench workbench = window != null ? 
-				(window.getWorkbench() == null ?  PlatformUI.getWorkbench() : window.getWorkbench())
-				: PlatformUI.getWorkbench(); 
-		LibraryLockingOperationRunner runner = new LibraryLockingOperationRunner();
-		runner.run(new IRunnableWithProgress() {
-
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				execute(workbench, null);		
-			}
-			
-		});
-	}
-	
-	/**
-	 * @see IWorkbenchWindowActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param workbench
-	 *            The active workbench.
-	 * @param selection
-	 *            The active selection.
-	 */
-	public static void execute(IWorkbench workbench, ISelection selection) {
-		NewMethodPluginWizard wizard = new NewMethodPluginWizard();
-		if (selection instanceof IStructuredSelection || selection == null) {
-			wizard.init(workbench, (IStructuredSelection) selection);
-		}
-
-		WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
-		dialog.create();
-		dialog.open();
-
-		if (!PerspectiveListUtil.isAuthoringPerspective()) {
-			PerspectiveUtil
-					.openPerspective(AuthoringPerspective.PERSPECTIVE_ID);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenCheatsheetView.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenCheatsheetView.java
deleted file mode 100755
index 8b3181b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenCheatsheetView.java
+++ /dev/null
@@ -1,98 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.Properties;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.WorkbenchPage;
-import org.eclipse.ui.internal.cheatsheets.views.CheatSheetView;
-import org.eclipse.ui.intro.IIntroSite;
-import org.eclipse.ui.intro.config.IIntroAction;
-
-/**
- * Open cheat sheet view
- * 
- * @author Bingxue Xu
- * @since 1.0
- * 
- */
-public class OpenCheatsheetView extends Action implements IIntroAction {
-
-	/**
-	 * Create an instance
-	 *
-	 */
-	public OpenCheatsheetView() {
-		super(AuthoringUIResources.OpenCheatsheetView_title); //$NON-NLS-1$
-	}
-
-	/* 
-	 * @see org.eclipse.ui.intro.config.IIntroAction#run(org.eclipse.ui.intro.IIntroSite, java.util.Properties)
-	 */
-	public void run(IIntroSite site, Properties params) {
-		String cheatsheet_id = params.getProperty("input"); //$NON-NLS-1$
-		String toggle_str = params.getProperty("toggle"); //$NON-NLS-1$
-		// System.out.println("$$$ INFO: cheatsheet id = " + cheatsheet_id);
-
-		IWorkbenchWindow activeWindow = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow();
-
-		// de-maximaize the welcome, i.e. the intro view window
-		if (toggle_str != null && toggle_str.equalsIgnoreCase("true")) { //$NON-NLS-1$
-			toggleActiveView();
-		}
-
-		try {
-			// CheatSheetView obj = new CheatSheetView();
-			activeWindow.getActivePage().showView(
-					"org.eclipse.ui.cheatsheets.views.CheatSheetView"); //$NON-NLS-1$
-			CheatSheetView csView = (CheatSheetView) activeWindow
-					.getActivePage().getActivePart();
-			csView.setInput(cheatsheet_id);
-
-		} catch (PartInitException exp) {
-			// $$$ error handling here.
-		}
-
-	}
-
-	/**
-	 * Toggle active view
-	 *
-	 */
-	private void toggleActiveView() {
-		IWorkbenchWindow activeWindow = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow();
-
-		// de-maximaize the welcome, i.e. the intro view window or any active
-		// view
-		IWorkbenchPage page = activeWindow.getActivePage();
-		if (page != null) {
-			if (page instanceof WorkbenchPage) {
-				//WorkbenchPage realPage = (WorkbenchPage) page;
-
-				IWorkbenchPartReference partRef = page.getActivePartReference();
-
-				if (partRef != null) {
-					((WorkbenchPage) page).toggleZoom(partRef);
-				}
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenConfigurationAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenConfigurationAction.java
deleted file mode 100755
index bb74fd1..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenConfigurationAction.java
+++ /dev/null
@@ -1,125 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.PerspectiveListUtil;
-import org.eclipse.epf.authoring.ui.UIActionDispatcher;
-import org.eclipse.epf.authoring.ui.editors.EditorChooser;
-import org.eclipse.epf.authoring.ui.wizards.OpenConfigurationWizard;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * Opens Configuration editor
- * 
- * @author Jinhua Xi
- * @since 1.0
- * 
- */
-public class OpenConfigurationAction implements IWorkbenchWindowActionDelegate {
-	// private static String DEFAULT_PERSPECTIVE_ID = null;
-
-	// private IWorkbenchWindow window;
-
-	private IStructuredSelection selection;
-
-	private List configList = new ArrayList();
-
-	/**
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-		// this.window = window;
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		Display.getCurrent().asyncExec(new Runnable() {
-			public void run() {
-				configList.clear();
-				doWork();
-				if (configList.size() > 0) {
-					if (!PerspectiveListUtil.isAuthoringPerspective()) {
-						System.out
-								.println("$$$DEBUG: Need to switch to authoring perspective!"); //$NON-NLS-1$
-						UIActionDispatcher.openAuthoringPerspective();
-					}
-					for (int i = 0; i < configList.size(); i++) {
-						MethodConfiguration config = (MethodConfiguration) configList
-								.get(i);
-						// System.out.println("$$$DEBUG: config name = " +
-						// config.getName());
-						EditorChooser.getInstance().openEditor(config);
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	private void doWork() {
-		try {
-			IWorkbenchPage activePage = PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow().getActivePage();
-			if (activePage != null) {
-
-				OpenConfigurationWizard wizard = new OpenConfigurationWizard(
-						configList);
-				wizard.init(PlatformUI.getWorkbench(), selection); // probably
-				// no need for this line
-				// Instantiates the wizard container with the wizard and opens
-				// it
-				WizardDialog dialog = new WizardDialog(Display.getCurrent()
-						.getActiveShell(), wizard);
-				dialog.create();
-				dialog.open();
-
-				// for (int i=0; i<configList.size(); i++) {
-				// MethodConfiguration config =
-				// (MethodConfiguration)configList.get(i);
-				// System.out.println(config.getName());
-				// }
-
-			}
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenElementActionDelegate.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenElementActionDelegate.java
deleted file mode 100755
index a62b4ea..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenElementActionDelegate.java
+++ /dev/null
@@ -1,122 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.epf.authoring.ui.PerspectiveListUtil;
-import org.eclipse.epf.authoring.ui.UIActionDispatcher;
-import org.eclipse.epf.authoring.ui.dialogs.ContributionSelection;
-import org.eclipse.epf.authoring.ui.editors.EditorChooser;
-import org.eclipse.epf.authoring.ui.views.ConfigurationView;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.VariabilityElement;
-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;
-
-
-/**
- * Open a method element editor delegation action
- * 
- * @author BingXue Xu
- * @since 1.0
- */
-public class OpenElementActionDelegate implements IObjectActionDelegate {
-
-	private IWorkbenchPart targetPart;
-
-	private ISelection selection;
-
-	private ContributionSelection contributorSelector;
-
-	/**
-	 * Creates an instance
-	 *
-	 */
-	public OpenElementActionDelegate() {
-		super();
-		contributorSelector = new ContributionSelection();
-	}
-
-	/**
-	 * @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;
-	}
-
-	
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.selection = selection;
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		// System.out.println("$$$ Open element action!");
-
-		// System.out.println("$$$ 5: " + selection);
-		IStructuredSelection selected = (IStructuredSelection) selection;
-
-		ArrayList elementList = new ArrayList();
-
-		// System.out.println("$$$ targetPart = " + targetPart); //$NON-NLS-1$
-		if (targetPart instanceof ConfigurationView) {
-			for (Iterator objects = selected.iterator(); objects.hasNext();) {
-				Object element = TngUtil.unwrap(objects.next());
-				if (element instanceof VariabilityElement) {
-					Object obj = contributorSelector
-							.getSelectedContributor((VariabilityElement) element);
-					if (obj != null)
-						elementList.add(obj);
-				} else {
-					elementList.add(element);
-				}
-			}
-		} else {
-			for (Iterator objects = selected.iterator(); objects.hasNext();) {
-				Object element = TngUtil.unwrap(objects.next());
-				if (element instanceof MethodElement) {
-					elementList.add(element);
-				}
-			}
-		}
-
-		if (elementList.size() < 1)
-			return;
-
-		if (PerspectiveListUtil.isBrowsingPerspective()) {
-			UIActionDispatcher.openAuthoringPerspective();
-		}
-
-		for (Iterator objects = elementList.iterator(); objects.hasNext();) {
-			Object element = objects.next();
-			EditorChooser.getInstance().openEditor(element);
-		}
-
-	}
-
-	/**
-	 * Dispose 
-	 */
-	public void dispose() {
-
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenElementWorkbenchActionDelegate.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenElementWorkbenchActionDelegate.java
deleted file mode 100755
index d3fd8d0..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenElementWorkbenchActionDelegate.java
+++ /dev/null
@@ -1,121 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.PerspectiveListUtil;
-import org.eclipse.epf.authoring.ui.UIActionDispatcher;
-import org.eclipse.epf.authoring.ui.editors.EditorChooser;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.actions.BaseSelectionListenerAction;
-
-
-/**
- * Open method element editor delegation action 
- * 
- * @author BingXue Xu
- * @since 1.0
- */
-public class OpenElementWorkbenchActionDelegate extends
-		BaseSelectionListenerAction implements IWorkbenchWindowActionDelegate {
-
-	// private IWorkbenchWindow window;
-
-	private ISelection selection;
-
-	/**
-	 * Creates an instance
-	 *
-	 */
-	public OpenElementWorkbenchActionDelegate() {
-		this(
-				AuthoringUIResources.OpenElementWorkbenchActionDelegate_edit_text0); //$NON-NLS-1$
-	}
-
-	protected OpenElementWorkbenchActionDelegate(String text) {
-		super(text);
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-		// this.window = window;
-
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		// System.out.println("$$$ Open element action!");
-
-		// System.out.println("$$$ 5: " + selection);
-		IStructuredSelection selected = (IStructuredSelection) selection;
-
-		if (PerspectiveListUtil.isBrowsingPerspective()) {
-			UIActionDispatcher.openAuthoringPerspective();
-		}
-
-		for (Iterator objects = selected.iterator(); objects.hasNext();) {
-			Object element = TngUtil.unwrap(objects.next());
-			// System.out.println("$$$ 6: " + element);
-			if (element instanceof MethodElement) {
-				EditorChooser.getInstance().openEditor(element);
-			}
-		}
-
-		action.setEnabled(false);
-	}
-
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.selection = selection;
-
-		IStructuredSelection selected = (IStructuredSelection) selection;
-
-		// if (!PerspectiveListUitl.isAuthoringPerspective() ||
-		// selected.isEmpty()) {
-		if (selected.isEmpty()) {
-			action.setEnabled(false);
-			return;
-		}
-
-		boolean enableMenu = true;
-		for (Iterator objects = selected.iterator(); objects.hasNext();) {
-			Object element = TngUtil.unwrap(objects.next());
-			if (!(element instanceof MethodElement)) {
-				enableMenu = false;
-			}
-		}
-
-		action.setEnabled(enableMenu);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenLibraryAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenLibraryAction.java
deleted file mode 100755
index 90507fe..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenLibraryAction.java
+++ /dev/null
@@ -1,90 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import org.eclipse.epf.authoring.ui.views.ViewHelper;
-import org.eclipse.epf.library.ui.LibraryUIManager;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Implements the Open Library action.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class OpenLibraryAction implements IWorkbenchWindowActionDelegate {
-
-	/**
-	 * @see IWorkbenchWindowActionDelegate#init
-	 */
-	public void init(IWorkbenchWindow window) {
-	}
-
-	/**
-	 * @see IWorkbenchWindowActionDelegate#run
-	 */
-	public void run(IAction action) {
-		
-		int dirtyCount = 0;
-		IEditorReference[] list = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getActivePage()
-				.getEditorReferences();
-		for (int i = 0; i < list.length; i++) {
-			if (list[i].isDirty()) {
-				dirtyCount++;
-			}
-		}
-	
-		if (dirtyCount == 1) {
-			boolean rc = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-				.getActivePage().closeAllEditors(true);
-			if (!rc) {
-				return;
-			}
-		} else if (dirtyCount > 1){
-			switch(ViewHelper.promptSaveInt()) {
-			case SWT.YES:
-				PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-				.getActivePage().closeAllEditors(true);
-				break;
-			case SWT.NO:
-				PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-				.getActivePage().closeAllEditors(false);
-				break;
-			case SWT.CANCEL:
-				return;
-			}
-			
-		}
-		
-		LibraryUIManager.getInstance().openLibrary();
-
-	}
-
-	/**
-	 * @see IWorkbenchWindowActionDelegate#selectionChanged
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	/**
-	 * @see IWorkbenchWindowActionDelegate#dispose
-	 */
-	public void dispose() {
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenNewMethodPluginWizardAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenNewMethodPluginWizardAction.java
deleted file mode 100755
index 5962fdc..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/OpenNewMethodPluginWizardAction.java
+++ /dev/null
@@ -1,88 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.Properties;
-
-import org.eclipse.epf.authoring.ui.PerspectiveListUtil;
-import org.eclipse.epf.authoring.ui.UIActionDispatcher;
-import org.eclipse.epf.authoring.ui.wizards.NewMethodPluginWizard;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.WorkbenchPage;
-import org.eclipse.ui.intro.IIntroSite;
-import org.eclipse.ui.intro.config.IIntroAction;
-
-/**
- * New Method plugin UI wizard
- * 
- * @author Bingxue Xu
- * @since 1.0
- * 
- */
-public class OpenNewMethodPluginWizardAction extends Action implements
-		IIntroAction {
-
-	/**
-	 * 
-	 * @see org.eclipse.ui.intro.config.IIntroAction#run(org.eclipse.ui.intro.IIntroSite, java.util.Properties)
-	 */
-	public void run(IIntroSite site, Properties params) {
-
-		String toggle_str = params.getProperty("toggle"); //$NON-NLS-1$
-		// de-maximaize the welcome, i.e. the intro view window
-		if (toggle_str != null && toggle_str.equalsIgnoreCase("true")) { //$NON-NLS-1$
-			toggleActiveView();
-		}
-
-		if (!PerspectiveListUtil.isAuthoringPerspective()) {
-			// System.out.println("Need to switch to authoring perspective!");
-			UIActionDispatcher.openAuthoringPerspective();
-		}
-
-		NewMethodPluginWizard wizard = new NewMethodPluginWizard();
-		wizard.init(PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-				.getWorkbench(), (IStructuredSelection) null);
-
-		// Instantiates the wizard container with the wizard and opens it
-		WizardDialog dialog = new WizardDialog(Display.getCurrent()
-				.getActiveShell(), wizard);
-		dialog.create();
-		dialog.open();
-
-	}
-
-	private void toggleActiveView() {
-		IWorkbenchWindow activeWindow = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow();
-
-		// de-maximaize the welcome, i.e. the intro view window or any active
-		// view
-		IWorkbenchPage page = activeWindow.getActivePage();
-		if (page != null) {
-			if (page instanceof WorkbenchPage) {
-				// WorkbenchPage realPage = (WorkbenchPage) page;
-
-				IWorkbenchPartReference partRef = page.getActivePartReference();
-
-				if (partRef != null) {
-					((WorkbenchPage) page).toggleZoom(partRef);
-				}
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ProcessAutoSynchronizeAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ProcessAutoSynchronizeAction.java
deleted file mode 100755
index 7895cd0..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ProcessAutoSynchronizeAction.java
+++ /dev/null
@@ -1,207 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.action.CommandActionHandler;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditorInput;
-import org.eclipse.epf.library.edit.LibraryEditResources;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.command.SynchronizeCommand;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.Descriptor;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.TeamProfile;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-
-
-/**
- * Default Synchronize action for process elements.
- * Synchronization takes place from method to process elements.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class ProcessAutoSynchronizeAction extends CommandActionHandler 
-implements IWorkbenchPartAction
-{
-	protected IWorkbenchPart activeWorkbenchPart;
-	protected boolean canRun;
-
-	/**
-	 * Creates an instance
-	 */
-	public ProcessAutoSynchronizeAction() {
-		super(null, LibraryEditResources.AutoSynchronizeCommand_label); //$NON-NLS-1$
-	}
-
-	/**
-	 * Creates an instance with label text
-	 */
-	public ProcessAutoSynchronizeAction(String labelText) {
-		super(null, labelText); 
-	}
-	
-	/**
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.actions.IWorkbenchPartAction#setActiveWorkbenchPart(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActiveWorkbenchPart(IWorkbenchPart workbenchPart) {
-		activeWorkbenchPart = workbenchPart;
-		if (workbenchPart instanceof IEditingDomainProvider) {
-			domain = ((IEditingDomainProvider) workbenchPart)
-					.getEditingDomain();
-		}
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#createCommand(java.util.Collection)
-	 */
-	public Command createCommand(Collection selection) {
-		return new SynchronizeCommand(getText(), selection) {
-			/*
-			 * 
-			 * 
-			 * @see AutoSynchronizeCommand#delete(java.util.Collection)
-			 */
-			protected Command delete(List elements) {
-				try {
-					return ProcessDeleteAction.delete(elements);
-				}
-				catch(OperationCanceledException e) {
-					aborted = true;
-					return null;
-				}
-			}
-		};
-	}
-	
-	/**
-	 * Return the process 
-	 * @return
-	 */
-	protected Process getProcess() {
-		if(activeWorkbenchPart instanceof IEditorPart) {
-			IEditorInput input = ((IEditorPart)activeWorkbenchPart).getEditorInput();
-			if(input instanceof MethodElementEditorInput) {
-				MethodElement e = ((MethodElementEditorInput)input).getMethodElement();
-				if(e instanceof ProcessComponent) {
-					return ((ProcessComponent)e).getProcess();
-				}
-			}
-		}
-		return null;
-	}
-
-	/** 
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-		ArrayList selected = new ArrayList();
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			
-			if (element instanceof BreakdownElementWrapperItemProvider 
-					&& !((BreakdownElementWrapperItemProvider) element).isReadOnly()) {
-				element = TngUtil.unwrap(element);
-			}
-			
-			boolean valid = false;
-			if (element instanceof BreakdownElement) {
-				if(element instanceof Descriptor) {
-					Descriptor desc = (Descriptor) element;
-					
-					// descriptor must be linked and is not suppressed
-					//
-					valid = ProcessUtil.getAssociatedElement(desc) != null && !desc.getSuppressed().booleanValue();					
-				}
-				else {
-					// exclude breakdown element without a super activity like TeamProfile's own RoleDescriptor
-					//
-					if (((BreakdownElement)element).getSuperActivities() == null) 
-					{
-						if(element instanceof Process && ((Process)element).eContainer() instanceof ProcessComponent) {
-							valid = true;
-						}
-					}
-					else {
-						valid = element instanceof Activity || element instanceof TeamProfile;
-					}
-				}
-			}
-			if(valid) {
-				selected.add(element);
-			}
-		}
-		if (selected.isEmpty()) {
-			return false;
-		}
-		return super.updateSelection(new StructuredSelection(selected));
-	}
-
-
-   /**
-	 * 
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#run()
-	 */
-	public void run() {
-		IRunnableWithProgress runnable = new IRunnableWithProgress() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
-			 */
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException, InterruptedException {
-				canRun = ((SynchronizeCommand) command).initilize();
-			}
-		};
-		UserInteractionHelper.runWithProgress(runnable, LibraryEditResources.ProcessAutoSynchronizeAction_prepare); //$NON-NLS-1$
-
-		if (canRun) {
-			super.run();
-			// if(((AutoSynchronizeCommand)command).isSucessful()) {
-			// AuthoringUIPlugin.getDefault().getMsgDialog().displayInfo(getText(),
-			// "Synchronization has been completed successfully.");
-			//				
-			// }
-		} else {
-			AuthoringUIPlugin
-					.getDefault()
-					.getMsgDialog()
-					.displayInfo(
-							getText(),
-							LibraryEditResources.ProcessAutoSynchronizeAction_noDescriptorToSynch); //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ProcessDeleteAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ProcessDeleteAction.java
deleted file mode 100755
index 6c93a40..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ProcessDeleteAction.java
+++ /dev/null
@@ -1,332 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.DeleteMethodElementCommand;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.command.IResourceAwareCommand;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.command.DeleteRoleDescriptor;
-import org.eclipse.epf.library.edit.process.command.DeleteTaskDescriptor;
-import org.eclipse.epf.library.edit.process.command.DeleteTeamProfile;
-import org.eclipse.epf.library.edit.process.command.DeleteUnusedDescriptorsCommand;
-import org.eclipse.epf.library.edit.process.command.DeleteWorkProductDescriptor;
-import org.eclipse.epf.library.edit.process.command.ProcessElementDeleteCommand;
-import org.eclipse.epf.library.edit.process.command.RemoveUnusedDescriptorsCommand;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.TeamProfile;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-
-/**
- * Delete action for process element
- * 
- * @author Shilpa Toraskar
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class ProcessDeleteAction extends MethodElementDeleteAction {
-	private boolean deletionConfirmed = false;
-
-	private HashSet removedDescriptors;
-
-	/**
-	 * Creates an instance
-	 */
-	public ProcessDeleteAction() {
-		super();
-	}
-
-	/**
-	 * 
-	 * Creates an instance
-	 * 
-	 * @param domain
-	 */
-	public ProcessDeleteAction(EditingDomain domain) {
-		super(domain);
-	}
-
-	/**
-	 * Creates an instance
-	 * @param domain
-	 * @param confirm
-	 */
-	public ProcessDeleteAction(EditingDomain domain, boolean confirm) {
-		super(domain, confirm);
-	}
-
-	/**
-	 * 
-	 * @see MethodElementDeleteAction#createMethodElementDeleteCommand()
-	 */
-	public DeleteMethodElementCommand createMethodElementDeleteCommand() {
-		return new ProcessElementDeleteCommand(RemoveCommand.create(domain,
-				selection), selection);
-	}
-
-	/**
-	 * Removes content of the given activity from its resource
-	 * 
-	 * @param act
-	 * @param modifiedResources
-	 */
-	// private static void removeContentFromResource(Activity act,
-	// Set modifiedResources) {
-	// if (ContentDescriptionFactory.hasPresentation(act)) {
-	// ContentDescription content = act.getPresentation();
-	// Resource resource = content.eResource();
-	// if (resource != null) {
-	// resource.getContents().remove(content);
-	// modifiedResources.add(resource);
-	// }
-	// }
-	// }
-	/**
-	 * Run the delete action given the action manager
-	 * @param actionMgr
-	 */
-	public void run(IActionManager actionMgr) {
-		if (confirmDelete()) {
-			for (Iterator itor = selection.iterator(); itor.hasNext();) {
-				// remove references
-				removeReferences(actionMgr, itor.next());
-			}
-
-			// delete element
-			domain.getCommandStack().execute(command);
-		}
-	}
-
-	protected void saveCurrentEditor() {
-
-	}
-
-	/**
-	 * 
-	 * @see MethodElementDeleteAction#getDeleteConfirmationMessage()
-	 */
-	protected String getDeleteConfirmationMessage() {
-		return AuthoringUIResources.ProcessDeleteAction_deletecofirm_text0; //$NON-NLS-1$
-	}
-
-	/**
-	 * @see MethodElementDeleteAction#run()
-	 */
-	public void run() {
-		if (confirmDelete()) {			
-			// collection the related descriptors before the elements got deleted
-			//
-			Collection descriptors = new HashSet();
-			for (Iterator iter = selection.iterator(); iter.hasNext();) {
-				Object element = iter.next();
-				addRelatedDescriptors(descriptors, element);
-			}
-
-			
-			Command cmd = command;
-
-			// delete elements
-			//
-			cmd.execute();
-
-			// Check reference confirmation and if confirmed set
-			// deletionconfirmed to true
-			// If any deletion happens in sequence, will check for
-			// deletionconfirmed variable
-			// and proceeds remaining deletion sequence. (eg:
-			// AbstractDiagramEditor - DeleteAction()).
-			if (((DeleteMethodElementCommand) cmd).executed) {
-				deletionConfirmed = true;
-			
-				Collection deletedElements = cmd.getResult();
-				Command deleteUnusedDescriptorsCommand = new DeleteUnusedDescriptorsCommand(
-						descriptors, false, deletedElements) {
-					
-					protected Command delete(List elements) {
-						return ProcessDeleteAction.delete(elements);
-					}
-					
-//					protected void selectDescriptorsToDelete(List descriptorsToDelete) {
-//						String msg = AuthoringUIResources.ProcessDeleteAction_selectDescriptorsToDelete; 
-//						Object[] descriptors = ReferenceSelection.getReferences(descriptorsToDelete, msg);
-//						descriptorsToDelete.retainAll(Arrays.asList(descriptors));
-//					}
-				};
-				try {
-					deleteUnusedDescriptorsCommand.execute();
-				}
-				catch(OperationCanceledException e) {
-					//
-				}
-				finally {
-					deleteUnusedDescriptorsCommand.dispose();
-				}
-			}
-
-			// save the current editor
-			//
-			saveCurrentEditor();
-		}
-	}
-
-	private static void addRelatedDescriptors(Collection descriptors, Object element) {
-		if(element instanceof TaskDescriptor) {
-			TaskDescriptor taskDesc = (TaskDescriptor) element;
-			descriptors.addAll(taskDesc.getAdditionallyPerformedBy());
-			descriptors.addAll(taskDesc.getAssistedBy());
-			descriptors.add(taskDesc.getPerformedPrimarilyBy());
-			descriptors.addAll(taskDesc.getMandatoryInput());
-			descriptors.addAll(taskDesc.getExternalInput());
-			descriptors.addAll(taskDesc.getOptionalInput());
-			descriptors.addAll(taskDesc.getOutput());
-		}
-		else if(element instanceof RoleDescriptor) {
-			RoleDescriptor roleDesc = (RoleDescriptor) element;
-			descriptors.addAll(AssociationHelper.getAssistedTaskDescriptors(roleDesc));
-			descriptors.addAll(AssociationHelper.getAdditionalTaskDescriptors(roleDesc));
-			descriptors.addAll(AssociationHelper.getPrimaryTaskDescriptors(roleDesc));
-			descriptors.addAll(roleDesc.getResponsibleFor());
-		}
-	}
-
-	private void removeReferences(IActionManager actionMgr, Object obj) {
-		IResourceAwareCommand cmd = null;
-		boolean force = !confirm;
-		if (obj instanceof TaskDescriptor) {
-			cmd = new DeleteTaskDescriptor((TaskDescriptor) obj, force);
-		} else if (obj instanceof RoleDescriptor) {
-			cmd = new DeleteRoleDescriptor((RoleDescriptor) obj, force);
-		} else if (obj instanceof WorkProductDescriptor) {
-			cmd = new DeleteWorkProductDescriptor((WorkProductDescriptor) obj,
-					force);
-		} else if (obj instanceof TeamProfile) {
-			cmd = new DeleteTeamProfile((TeamProfile) obj);
-		}
-		if (cmd != null) {
-			if (actionMgr != null) {
-				actionMgr.execute(cmd);
-
-			} else {
-				cmd.execute();
-			}
-			if (cmd instanceof RemoveUnusedDescriptorsCommand) {
-				removedDescriptors
-						.addAll(((RemoveUnusedDescriptorsCommand) cmd)
-								.getRemovedDescriptors());
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-
-		boolean ret = super.updateSelection(filterSelection(selection));
-		return ret;
-	}
-
-	/**
-	 * Filter selection 
-	 * 
-	 * @param selection
-	 * @return
-	 * 			New Selection
-	 */
-	public static IStructuredSelection filterSelection(
-			IStructuredSelection selection) {
-		ArrayList list = new ArrayList();
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			if (element instanceof BreakdownElementWrapperItemProvider
-					&& ((BreakdownElementWrapperItemProvider) element)
-							.isReadOnly()) {
-				continue;
-			} else {
-				list.add(element);
-			}
-		}
-
-		return new StructuredSelection(list);
-	}
-
-	/**
-	 * if deletion confirmed, set confirmation and child process can use the
-	 * confirmation to proceed for the deletion of remaining.
-	 * 
-	 * @return boolean
-	 */
-	public boolean isDeletionConfirmed() {
-		return deletionConfirmed;
-	}
-
-	/**
-	 * Return command
-	 * @return cmd
-	 */
-	protected Command getCommand() {
-		return command;
-	}
-	
-	/**
-	 * Convenience method to delete process elements without UI action
-	 * 
-	 * @param elements
-	 * @return the executed delete command if some of the given elements have been successfully deleted, <code>null</code> otherwise
-	 * @exception OperationCanceledException if user canceled this deletion operation
-	 */
-	public static Command delete(Collection elements) {
-		ProcessDeleteAction deleteAction = new ProcessDeleteAction(
-				null, false) {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.epf.authoring.ui.actions.MethodElementDeleteAction#createCommand(java.util.Collection)
-			 */
-			public Command createCommand(Collection selection) {
-				domain = new AdapterFactoryEditingDomain(
-						TngAdapterFactory.INSTANCE
-								.getProcessComposedAdapterFactory(),
-						new BasicCommandStack());
-
-				return super.createCommand(selection);
-			}
-
-		};
-		if (deleteAction.updateSelection(new StructuredSelection(new ArrayList(elements)))) {
-			deleteAction.run();
-			if (!deleteAction.isDeletionConfirmed()) {
-				throw new OperationCanceledException();
-			}
-			return deleteAction.getCommand();
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/RefreshConfiguration.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/RefreshConfiguration.java
deleted file mode 100755
index c2aef1f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/RefreshConfiguration.java
+++ /dev/null
@@ -1,51 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import org.eclipse.epf.authoring.ui.views.ConfigurationView;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-
-/**
- * Refresh Configuration action
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- *
- */
-public class RefreshConfiguration implements IViewActionDelegate {
-
-	private ConfigurationView targetView;
-
-	/**
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
-	public void init(IViewPart view) {
-		targetView = (ConfigurationView) view;
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		targetView.getViewer().refresh();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		action.setEnabled(true);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/SaveThisAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/SaveThisAction.java
deleted file mode 100755
index fdcfb90..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/SaveThisAction.java
+++ /dev/null
@@ -1,85 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-
-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.impl.XMIResourceFactoryImpl;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-
-/**
- * Action for saving resources
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class SaveThisAction extends Action {
-
-	private ArrayList selectedObjects;
-
-	public SaveThisAction() {
-		super(AuthoringUIResources.SaveThisAction_saveobject); //$NON-NLS-1$
-	}
-
-	/**
-	 * Update selection
-	 * @param selection
-	 * 			Selection
-	 * @return 
-	 * 			boolean value to indicate whether update was done
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-		selectedObjects = new ArrayList();
-		for (Iterator objects = selection.iterator(); objects.hasNext();) {
-			selectedObjects.add(AdapterFactoryEditingDomain.unwrap(objects
-					.next()));
-		}
-
-		return selectedObjects.size() == 1
-				&& selectedObjects.get(0) instanceof EObject;
-	}
-
-	/**
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		if (selectedObjects == null || selectedObjects.isEmpty())
-			return;
-		FileDialog fd = new FileDialog(Display.getCurrent().getActiveShell(),
-				SWT.SAVE);
-		String path = fd.open();
-		if (path == null)
-			return;
-		URI fileURI = URI.createFileURI(path);
-		// Create the resource to persist the model.
-		Resource res = new XMIResourceFactoryImpl().createResource(fileURI);
-		Object obj = selectedObjects.get(0);
-		res.getContents().add(obj);
-		try {
-			res.save(Collections.EMPTY_MAP);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ShowPresentationNames.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ShowPresentationNames.java
deleted file mode 100755
index 9dcf517..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/ShowPresentationNames.java
+++ /dev/null
@@ -1,55 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.library.edit.PresentationContext;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-
-/**
- * Show Presentation names in library view
- * 
- * @author Jeff Hardy
- * @since 1.0
- *
- */
-public class ShowPresentationNames implements IViewActionDelegate {
-
-	private LibraryView targetView;
-
-	/**
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
-	public void init(IViewPart view) {
-		targetView = (LibraryView) view;
-
-	}
-
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		PresentationContext.INSTANCE.setShowPresentationNames(!PresentationContext.INSTANCE.isShowPresentationNames());
-		targetView.getViewer().refresh();
-	}
-
-	
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/SynchronizationAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/SynchronizationAction.java
deleted file mode 100755
index 1acabdb..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/SynchronizationAction.java
+++ /dev/null
@@ -1,137 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.epf.authoring.ui.wizards.SynchronizationChoices;
-import org.eclipse.epf.authoring.ui.wizards.SynchronizationWizard;
-import org.eclipse.epf.library.edit.LibraryEditResources;
-import org.eclipse.epf.library.edit.process.command.SynchronizeCommand;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Synchronizaiton action for process elements. Synchronization takes place from method
- * element to process elements
- * 
- * @author Phong Le
- * @since 1.0
- *
- */
-public class SynchronizationAction extends ProcessAutoSynchronizeAction 
-implements IWorkbenchPartAction
-{
-
-	private Process selectedProcess;
-	
-	/**
-	 * Creates an instance
-	 *
-	 */
-	public SynchronizationAction() {
-		super(LibraryEditResources.ManualSynchronizeCommand_label); 
-	}
-	
-	/*
-	 * Set Process
-	 */
-	public void setProcess(Process aProcess) {
-		this.selectedProcess = aProcess;
-	}
-	
-	private void superRun() {
-		super.run();
-	}
-	
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#run()
-	 */
-	public void run() {
-		LibraryLockingOperationRunner runner = new LibraryLockingOperationRunner();
-		runner.run(new IRunnableWithProgress() {
-
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				SynchronizationChoices choices = new SynchronizationChoices();
-				choices.setSelectedProcess(selectedProcess);
-				
-				// Instantiate and initialize the wizard.
-				SynchronizationWizard wizard = new SynchronizationWizard(choices);
-
-				// Instantiate the wizard container with the wizard and open it.
-				WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), 
-											wizard);
-				dialog.create();
-				dialog.open();	
-//				System.out.println("$$$ DEBUG: " + choices); //$NON-NLS-1$
-				
-				if (!choices.isFinishPressed())
-					return;
-				
-				// Set synchFeatures 'syncFeatureSet'
-				HashSet syncFeatureSet = new HashSet();
-				addChoicesToSet(syncFeatureSet, choices);
-				// Method config can be obtained by 'choices.getSelectedConfig()'
-				
-				SynchronizeCommand cmd = (SynchronizeCommand)command;
-				cmd.setMethodConfiguration(choices.getSelectedConfig());
-				cmd.setSynchronizationFeatures(syncFeatureSet);
-				
-				superRun();
-			}
-		});
-		
-	}
-
-	private void addChoicesToSet(HashSet syncSet, SynchronizationChoices choices) {
-		if (choices.getSyncName() == SynchronizationChoices.SYNC_FROM_CONETNT){
-			syncSet.add(UmaPackage.eINSTANCE.getNamedElement_Name());
-		}
-		if (choices.getSyncPresName() == SynchronizationChoices.SYNC_FROM_CONETNT){
-			syncSet.add(UmaPackage.eINSTANCE.getDescribableElement_PresentationName());
-		}
-		if (choices.getSyncBriefDesc() == SynchronizationChoices.SYNC_FROM_CONETNT){
-			syncSet.add(UmaPackage.eINSTANCE.getMethodElement_BriefDescription());
-		}
-		if (choices.getSyncOptInput() == SynchronizationChoices.SYNC_FROM_CONETNT){
-			syncSet.add(UmaPackage.eINSTANCE.getTask_OptionalInput());
-		}
-		if (choices.getSyncManInput() == SynchronizationChoices.SYNC_FROM_CONETNT){
-			syncSet.add(UmaPackage.eINSTANCE.getTask_MandatoryInput());
-		}
-		if (choices.getSyncOutput() == SynchronizationChoices.SYNC_FROM_CONETNT){
-			syncSet.add(UmaPackage.eINSTANCE.getTask_Output());
-		}
-		if (choices.getSyncPrimPerformer() == SynchronizationChoices.SYNC_FROM_CONETNT){
-			syncSet.add(UmaPackage.eINSTANCE.getTask_PerformedBy());
-		}
-		if (choices.getSyncAddnPerformer() == SynchronizationChoices.SYNC_FROM_CONETNT){
-			syncSet.add(UmaPackage.eINSTANCE.getTask_AdditionallyPerformedBy());
-		}
-		if (choices.getSyncRespRole() == SynchronizationChoices.SYNC_FROM_CONETNT){
-			syncSet.add(UmaPackage.eINSTANCE.getRole_ResponsibleFor());
-		}
-		if (choices.getSyncContArtifact() == SynchronizationChoices.SYNC_FROM_CONETNT){
-			syncSet.add(UmaPackage.eINSTANCE.getArtifact_ContainedArtifacts());
-		}
-		if (choices.getSyncDelivPart() == SynchronizationChoices.SYNC_FROM_CONETNT){
-			syncSet.add(UmaPackage.eINSTANCE.getDeliverable_DeliveredWorkProducts());
-		}
-		if (choices.getSyncSelStep() == SynchronizationChoices.SYNC_FROM_CONETNT){
-			syncSet.add(UmaPackage.eINSTANCE.getTask_Steps());
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/UpdateSuppressionFromBaseAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/UpdateSuppressionFromBaseAction.java
deleted file mode 100755
index 23f3c1e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/UpdateSuppressionFromBaseAction.java
+++ /dev/null
@@ -1,134 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.action.CommandActionHandler;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.editors.ProcessEditor;
-import org.eclipse.epf.library.edit.process.command.UpdateSuppressionFromBaseCommand;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Update suppression information from base elements
- * 
- * @author Phong Nguyen Le
- * @since  1.0
- */
-public class UpdateSuppressionFromBaseAction extends
-		CommandActionHandler implements IWorkbenchPartAction {
-
-	private ProcessEditor editor;
-
-	/**
-	 * Creates an instance
-	 * @param text
-	 */
-	public UpdateSuppressionFromBaseAction(String text) {
-		super(null, text);
-	}
-	
-	/**
-	 * Creates an instance
-	 *
-	 */
-	public UpdateSuppressionFromBaseAction() {
-		this(AuthoringUIResources.ProcessEditor_updateSuppressionFromBaseAction_label); //$NON-NLS-1$
-	}
-	
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-		ArrayList list = new ArrayList();
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			if(Suppression.isValid(element)) {
-				list.add(element);
-			}
-		}
-		if(list.isEmpty()) {
-			return false;
-		}
-		return super.updateSelection(new StructuredSelection(list));
-	}
-	
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#createCommand(java.util.Collection)
-	 */
-	public Command createCommand(Collection selection) {
-		return new UpdateSuppressionFromBaseCommand(getText(), selection, editor.getAdapterFactory(), editor.getSuppression()) {
-			/* (non-Javadoc)
-			 * @see org.eclipse.epf.library.edit.process.command.UpdateSuppressionFromBaseCommand#execute()
-			 */
-			public void execute() {
-				super.execute();
-				
-				if(!getAffectedObjects().isEmpty()) {
-					editor.refreshAllProcessEditors();
-				}
-			}
-			
-			/* (non-Javadoc)
-			 * @see org.eclipse.epf.library.edit.process.command.UpdateSuppressionFromBaseCommand#undo()
-			 */
-			public void undo() {
-				super.undo();
-				
-				if(!getAffectedObjects().isEmpty()) {
-					editor.refreshAllProcessEditors();
-				}
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.actions.IWorkbenchPartAction#setActiveWorkbenchPart(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActiveWorkbenchPart(IWorkbenchPart workbenchPart) {
-		if(workbenchPart instanceof IEditingDomainProvider) {
-			domain = ((IEditingDomainProvider)workbenchPart).getEditingDomain();
-		}
-		if(workbenchPart instanceof ProcessEditor) {
-			editor = (ProcessEditor) workbenchPart;
-		}		
-		else if(workbenchPart == null) {
-			editor = null;
-		}
-	}	
-	
-	private void superRun() {
-		super.run();
-	}
-	
-	/**
-	 * @see org.eclipse.emf.edit.ui.action.CommandActionHandler#run()
-	 */
-	public void run() {
-		BusyIndicator.showWhile(editor.getEditorSite()
-				.getShell().getDisplay(), new Runnable() {
-
-					public void run() {
-						superRun();
-					}
-			
-		});
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/UserInteractionHandler.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/UserInteractionHandler.java
deleted file mode 100755
index 119afcd..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/UserInteractionHandler.java
+++ /dev/null
@@ -1,374 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.actions;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.dialogs.UncancelableListSelectionDialog;
-import org.eclipse.epf.authoring.ui.dialogs.UserInputsDialog;
-import org.eclipse.epf.common.serviceability.ErrorDialogNoReason;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.library.edit.command.IUserInteractionHandler;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-
-/**
- * Implements handling of user interaction during command execution
- * @author Phong Nguyen Le
- * @since  1.0
- */
-public class UserInteractionHandler implements IUserInteractionHandler {
-	
-	private Shell shell;
-	private IMessenger messenger = new IMessenger() {
-
-
-		/* 
-		 * @see org.eclipse.epf.library.edit.command.IUserInteractionHandler.IMessenger#showWarning(java.lang.String, java.lang.String)
-		 */
-		public void showWarning(final String title, final String msg) {
-			if(Display.getCurrent() == null) {
-				// current thread is not a user-interface thread
-				//
-				Display.getDefault().syncExec(new Runnable() {
-
-					public void run() {
-						AuthoringUIPlugin.getDefault().getMsgDialog().displayWarning(title, msg);
-					}
-					
-				});
-			}
-			else {
-				AuthoringUIPlugin.getDefault().getMsgDialog().displayWarning(title, msg);
-			}
-		}
-
-		/*
-		 * @see org.eclipse.epf.library.edit.command.IUserInteractionHandler.IMessenger#showError(java.lang.String, java.lang.String, org.eclipse.core.runtime.IStatus)
-		 */
-		public void showError(final String title, final String msg, final IStatus status) {
-			if(status == null) {
-				showError(title, msg);
-			}
-			else {
-				if(Display.getCurrent() == null) {
-					// current thread is not a user-interface thread
-					//
-					Display.getDefault().syncExec(new Runnable() {
-
-						public void run() {
-							AuthoringUIPlugin.getDefault().getMsgDialog().displayError(title, msg, status);
-						}
-
-					});
-				}
-				else {
-					AuthoringUIPlugin.getDefault().getMsgDialog().displayError(title, msg, status);
-				}
-			}
-		}
-
-		/*
-		 * @see org.eclipse.epf.library.edit.command.IUserInteractionHandler.IMessenger#showError(java.lang.String, java.lang.String, java.lang.String, java.lang.Exception)
-		 */
-		public void showError(final String title, final String msg, final String reason, final Exception exception) {
-			if(Display.getCurrent() == null) {
-				// current thread is not a user-interface thread
-				//
-				Display.getDefault().syncExec(new Runnable() {
-
-					public void run() {
-						AuthoringUIPlugin.getDefault().getMsgDialog().displayError(title, msg, reason, exception);
-					}
-					
-				});
-			}
-			else {
-				AuthoringUIPlugin.getDefault().getMsgDialog().displayError(title, msg, reason, exception);
-			}
-		}
-
-		/* 
-		 * @see org.eclipse.epf.library.edit.command.IUserInteractionHandler.IMessenger#showWarning(java.lang.String, java.lang.String, java.lang.String)
-		 */
-		public void showWarning(final String title, final String msg, final String reason) {
-			if(Display.getCurrent() == null) {
-				// current thread is not a user-interface thread
-				//
-				Display.getDefault().syncExec(new Runnable() {
-
-					public void run() {
-						AuthoringUIPlugin.getDefault().getMsgDialog().displayWarning(title, msg, reason);
-					}
-					
-				});
-			}
-			else {
-				AuthoringUIPlugin.getDefault().getMsgDialog().displayWarning(title, msg, reason);
-			}
-		}
-
-		/* 
-		 * @see org.eclipse.epf.library.edit.command.IUserInteractionHandler.IMessenger#showError(java.lang.String, java.lang.String)
-		 */
-		public void showError(final String title, final String msg) {
-			if(Display.getCurrent() == null) {
-				// current thread is not a user-interface thread
-				//
-				Display.getDefault().syncExec(new Runnable() {
-
-					public void run() {
-						AuthoringUIPlugin.getDefault().getMsgDialog().displayError(title, msg);
-					}
-					
-				});
-			}
-			else {
-				AuthoringUIPlugin.getDefault().getMsgDialog().displayError(title, msg);
-			}
-		}
-
-		/* 
-		 * @see org.eclipse.epf.library.edit.command.IUserInteractionHandler.IMessenger#showInfo(java.lang.String, java.lang.String)
-		 */
-		public void showInfo(final String title, final String msg) {
-			if(Display.getCurrent() == null) {
-				// current thread is not a user-interface thread
-				//
-				Display.getDefault().syncExec(new Runnable() {
-
-					public void run() {
-						AuthoringUIPlugin.getDefault().getMsgDialog().displayInfo(title, msg);
-					}
-					
-				});
-			}
-			else {
-				AuthoringUIPlugin.getDefault().getMsgDialog().displayInfo(title, msg);
-			}
-		}
-
-		/*
-		 * @see org.eclipse.epf.library.edit.command.IUserInteractionHandler.IMessenger#showError(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Exception)
-		 */
-		public void showError(final String title, final String msg, final String reason, final String details, final Exception exception) {
-			if(Display.getCurrent() == null) {
-				// current thread is not a user-interface thread
-				//
-				Display.getDefault().syncExec(new Runnable() {
-
-					public void run() {
-						AuthoringUIPlugin.getDefault().getMsgDialog().displayError(title, msg, reason, details, exception);
-					}
-					
-				});
-			}
-			else {
-				AuthoringUIPlugin.getDefault().getMsgDialog().displayError(title, msg, reason, details, exception);
-			}
-		}
-		
-	};
-	
-	public UserInteractionHandler() {
-		
-	}
-	
-	/**
-	 * @param shell the shell to set
-	 */
-	public void setShell(Shell shell) {
-		this.shell = shell;
-	}
-
-	/* 
-	 * @see org.eclipse.epf.library.edit.command.IUserInteractionHandler#getUIContext()
-	 */
-	public Object getUIContext() {
-		if(shell == null) {
-			return MsgBox.getDefaultShell();
-		}
-		return shell;
-	}
-
-	/* 
-	 * @see org.eclipse.epf.library.edit.command.IUserInteractionHandler#select(java.util.List, org.eclipse.jface.viewers.ILabelProvider, boolean, java.util.List, java.lang.String, java.lang.String)
-	 */
-	public List select(List objectsToSelect,
-			ILabelProvider labelProvider, boolean multiple,
-			List intitialSelection, String title, String msg) {
-		if(multiple) {
-			IStructuredContentProvider contentProvider = new ArrayContentProvider();
-			UncancelableListSelectionDialog dlg = new UncancelableListSelectionDialog(shell, objectsToSelect,
-					contentProvider, labelProvider, msg);
-			dlg.setTitle(title);
-			dlg.setBlockOnOpen(true);
-			dlg.open();
-			Object objs[] = dlg.getResult();
-			if(objs == null) {
-				return null;
-			}
-			else {
-				if(objs.length == 0) {
-					return Collections.EMPTY_LIST;
-				}
-				return Arrays.asList(objs);
-			}
-		}
-		else {
-			ElementListSelectionDialog dlg = new ElementListSelectionDialog(shell, labelProvider);
-			
-			dlg.setBlockOnOpen(true);
-			dlg.setElements(objectsToSelect.toArray());
-			dlg.setMultipleSelection(false);
-			dlg.setMessage(msg); 
-			dlg.setTitle(title);
-			dlg.setFilter(null);
-			if(dlg.open() == Dialog.CANCEL) {
-				return null;
-			}
-			Object obj = dlg.getFirstResult();
-			return Collections.singletonList(obj);
-		}
-	}
-
-	/* 
-	 * @see org.eclipse.epf.library.edit.command.IUserInteractionHandler#selectOne(int[], java.lang.String, java.lang.String)
-	 */
-	public int selectOne(int[] actions, String title, String msg, IStatus status) {
-		final String[] buttonLabels = new String[actions.length];
-		for (int i = 0; i < actions.length; i++) {
-			buttonLabels[i] = getActionText(actions[i]);
-		}
-		Image image = null;
-		try {
-			shell = AuthoringUIPlugin.getDefault().getWorkbench().getDisplay()
-					.getActiveShell();
-			image = shell.getImage();
-		} catch (Exception e) {
-		}
-		if(status == null) {
-			MessageDialog msgDlg = new MessageDialog(shell, title, image, msg, MessageDialog.QUESTION, buttonLabels, 0);
-			int id = msgDlg.open();
-			return actions[id];
-		}
-		else {
-			ErrorDialogNoReason dlg = new ErrorDialogNoReason(shell, title, msg, status, IStatus.OK
-					| IStatus.INFO | IStatus.WARNING | IStatus.ERROR) {
-			
-				protected void createButtonsForButtonBar(Composite parent) {
-					// create OK and Details buttons
-			        for (int i = 0; i < buttonLabels.length; i++) {
-			            String label = buttonLabels[i];
-			            createButton(parent, i, label, i == 0);
-			        }
-					if (shouldShowDetailsButton()) {
-						detailsButton = createButton(parent, IDialogConstants.DETAILS_ID,
-								IDialogConstants.SHOW_DETAILS_LABEL, false);
-					}
-
-				}
-			
-				/* (non-Javadoc)
-				 * @see org.eclipse.epf.common.serviceability.ErrorDialogNoReason#buttonPressed(int)
-				 */
-				protected void buttonPressed(int id) {
-					if (id == IDialogConstants.DETAILS_ID) {
-						super.buttonPressed(id);
-					} else {
-				        setReturnCode(id);
-				        close();
-					}
-				}
-			};
-			int id = dlg.open();
-			return actions[id];
-		}
-	}
-
-	/**
-	 * Return action text
-	 * @param action
-	 * @return
-	 * 		Action text - either ABORT, CANCEL, OK, RETRY
-	 */
-	public static String getActionText(int action) {
-		switch (action) {
-		case IUserInteractionHandler.ACTION_ABORT:
-			return IDialogConstants.ABORT_LABEL;
-		case IUserInteractionHandler.ACTION_CANCEL:
-			return IDialogConstants.CANCEL_LABEL;
-		case IUserInteractionHandler.ACTION_OK:
-			return IDialogConstants.OK_LABEL;
-		case IUserInteractionHandler.ACTION_RETRY:
-			return IDialogConstants.RETRY_LABEL;
-		case IUserInteractionHandler.ACTION_YES:
-			return IDialogConstants.YES_LABEL;
-		case IUserInteractionHandler.ACTION_NO:
-			return IDialogConstants.NO_LABEL;
-		default:
-			break;
-		}
-		return null;
-	}
-
-	/* 
-	 * @see org.eclipse.epf.library.edit.command.IUserInteractionHandler#getMessenger()
-	 */
-	public IMessenger getMessenger() {
-		return messenger ;
-	}
-
-	/* 
-	 * @see org.eclipse.epf.library.edit.command.IUserInteractionHandler#requestInput(java.lang.String, java.lang.String, java.util.List)
-	 */
-	public boolean requestInput(String title, String msg, List userInputs) {
-
-		if (userInputs == null || userInputs.size() == 0)
-			return false;
-		UserInputsDialog dialog = new UserInputsDialog(PlatformUI.getWorkbench().getDisplay().getActiveShell(),
-					userInputs, title, msg);
-		dialog.setBlockOnOpen(true);
-		dialog.open();
-		return dialog.getResult();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.edit.command.IUserInteractionHandler#getRunnableContext()
-	 */
-	public IRunnableContext getRunnableContext() {
-		Shell shell;
-		Object uiCtx = getUIContext();
-		if(uiCtx instanceof Shell) {
-			shell = (Shell) uiCtx;
-		}
-		else {
-			shell = MsgBox.getDefaultShell();
-		}
-		return new ProgressMonitorDialog(shell);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/package.html
deleted file mode 100755
index 0417dd5..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides editing actions for the Authoring UI.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/celleditors/AbstractCheckBoxCellEditor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/celleditors/AbstractCheckBoxCellEditor.java
deleted file mode 100755
index e57bb28..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/celleditors/AbstractCheckBoxCellEditor.java
+++ /dev/null
@@ -1,120 +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.authoring.ui.celleditors;
-
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TreeEditor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-
-/**
- * An abstract class for check box cell editor
- * @author An Ming
- * @author Shilpa Toraskar
- * @since 1.2
- */
-public abstract class AbstractCheckBoxCellEditor {
-
-	// the cell modifier
-	private ICellModifier modifier = null;
-
-	// tree editor
-	private TreeEditor treeEditor = null;
-
-	// the tree
-	private Tree tree = null;
-
-	// the control editor
-	private Control control = null;
-
-	// the column index
-	private int columnIndex;
-
-	/**
-	 * Construct an instance
-	 * @param tree
-	 */
-	public AbstractCheckBoxCellEditor(Composite tree) {
-		this.tree = (Tree) tree;
-		this.treeEditor = new TreeEditor(this.tree);
-	}
-
-
-	/**
-	 * Set cell modifier
-	 * @param modifier
-	 */
-	public void setCellModifier(ICellModifier modifier) {
-		this.modifier = modifier;
-	}
-
-	/**
-	 * Get the cell modifier
-	 * 
-	 * @return
-	 * 		CellModifier
-	 */
-	protected ICellModifier getCellModifier() {
-		return this.modifier;
-	}
-
-	public abstract Image getImage(TreeItem item, String columnproperty);
-
-	public abstract void modify(TreeItem item, String columnproperty);
-
-	/*
-	 * =======in fact below codes are for the dynamic cell editor (real control
-	 * "button")=====
-	 */
-	public void setEditorTo(TreeItem item, String columnproperty) {
-		if (treeEditor.getItem() != null)
-			return;
-		if (control == null)
-			control = createControl(tree);
-		hookControl(control, item, columnproperty);
-
-		treeEditor.minimumWidth = control.getSize().x;
-		treeEditor.horizontalAlignment = SWT.CENTER;
-		treeEditor.setEditor(control, item, columnIndex);
-
-	}
-
-	public void deleteEditorFrom(TreeItem item, String columnproperty) {
-		control.setVisible(false);
-		treeEditor.setEditor(null, null, columnIndex);
-	}
-
-	protected abstract Control createControl(Tree parent);
-
-	protected abstract void hookControl(Control control, TreeItem item,
-			String columnproperty);
-
-	/**
-	 * Get column index
-	 * @return
-	 * 		index
-	 */
-	public int getColumnIndex() {
-		return columnIndex;
-	}
-
-	/**
-	 * Set index for column
-	 * @param columnIndex
-	 */
-	public void setColumnIndex(int columnIndex) {
-		this.columnIndex = columnIndex;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/celleditors/ProcessCheckBoxCellEditor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/celleditors/ProcessCheckBoxCellEditor.java
deleted file mode 100755
index a47b0c5..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/celleditors/ProcessCheckBoxCellEditor.java
+++ /dev/null
@@ -1,128 +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.authoring.ui.celleditors;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-
-/**
- * Check Box cell editor for process form page, WBS, TA, WPU
- * 
- * @author An Ming
- * @author Shilpa Toraskar
- * @since 1.2
- */
-public class ProcessCheckBoxCellEditor extends AbstractCheckBoxCellEditor {
-	
-	// checkbox images
-	private final Image checkImage = AuthoringUIPlugin.getDefault().getImage(
-			"full/obj16/Check.gif");
-
-	private final Image uncheckImage = AuthoringUIPlugin.getDefault().getImage(
-			"full/obj16/Uncheck.gif");
-
-	private final Image disableCheckImage = AuthoringUIPlugin.getDefault().getImage(
-		"full/obj16/DisableCheck.gif");
-	
-	private final Image disableUncheckImage = AuthoringUIPlugin.getDefault().getImage(
-		"full/obj16/DisableUnCheck.gif");
-
-	private SelectionListener listener;
-
-	/**
-	 * Constructor
-	 * @param tree
-	 */
-	public ProcessCheckBoxCellEditor(Composite tree) {
-		super(tree);
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.celleditors.AbstractCheckBoxCellEditor#getImage(org.eclipse.swt.widgets.TreeItem, java.lang.String)
-	 */
-	public Image getImage(TreeItem item, String columnproperty) {
-		final ICellModifier modifier = getCellModifier();
-		Object element = item.getData();
-		if (element == null)
-			return null;
-//		if (columnproperty == IBSItemProvider.COL_IS_ONGOING
-//				|| columnproperty == IBSItemProvider.COL_IS_REPEATABLE
-//				|| columnproperty == IBSItemProvider.COL_IS_EVENT_DRIVEN) {
-//			if (!(TngUtil.unwrap(element) instanceof WorkBreakdownElement)) {
-//				return null;
-//			}
-//		}
-		Object value = modifier.getValue(element, columnproperty);
-		if (value == null || !(value instanceof Boolean))
-			return null;
-		boolean canModify = modifier.canModify(element, columnproperty);
-
-		if (((Boolean) value).booleanValue()) {
-			return canModify ? checkImage : disableCheckImage;
-		} else {
-			return canModify ? uncheckImage : disableUncheckImage;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.celleditors.AbstractCheckBoxCellEditor#modify(org.eclipse.swt.widgets.TreeItem, java.lang.String)
-	 */
-	public void modify(TreeItem item, String columnproperty) {
-		final ICellModifier modifier = getCellModifier();
-		if (!modifier.canModify(item.getData(), columnproperty))
-			return;
-		modifier.modify(item, columnproperty, new Boolean(!((Boolean) modifier
-				.getValue(item.getData(), columnproperty)).booleanValue()));
-	}
-
-	/*
-	 * =======in fact below codes are for the dynamic cell editor (real control
-	 * "button")=====
-	 */
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.celleditors.AbstractCheckBoxCellEditor#createControl(org.eclipse.swt.widgets.Tree)
-	 */
-	protected Control createControl(Tree parent) {
-		Button button = new Button(parent, SWT.CHECK);
-		button.pack();
-		return button;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.celleditors.AbstractCheckBoxCellEditor#hookControl(org.eclipse.swt.widgets.Control, org.eclipse.swt.widgets.TreeItem, java.lang.String)
-	 */
-	protected void hookControl(Control control, TreeItem item,
-			final String columnproperty) {
-		final ICellModifier modifier = getCellModifier();
-		final Object element = item;
-		final Button checkbox = (Button) control;
-		if (listener != null)
-			checkbox.removeSelectionListener(listener);
-		listener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				modifier.modify(element, columnproperty, new Boolean(checkbox
-						.getSelection()));
-			}
-		};
-		checkbox.addSelectionListener(listener);
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/cheatsheets/actions/CheatsheetSwitchJob.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/cheatsheets/actions/CheatsheetSwitchJob.java
deleted file mode 100755
index 86198f6..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/cheatsheets/actions/CheatsheetSwitchJob.java
+++ /dev/null
@@ -1,51 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.cheatsheets.actions;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.cheatsheets.OpenCheatSheetAction;
-
-/**
- * Switchs cheat sheet and opens it.
- * 
- * @author BingXue Xu
- * @since 1.0
- *
- */
-public class CheatsheetSwitchJob extends Job {
-	private String cheatsheetId;
-
-	/**
-	 * Create an instance with cheat sheet name and Id
-	 * @param name
-	 * @param cheatsheetId
-	 */
-	public CheatsheetSwitchJob(String name, String cheatsheetId) {
-		super(name);
-		this.cheatsheetId = cheatsheetId;
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected IStatus run(IProgressMonitor monitor) {
-		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				new OpenCheatSheetAction(cheatsheetId).run();
-			}
-		});
-		return Status.OK_STATUS;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/cheatsheets/actions/CreatePluginAction.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/cheatsheets/actions/CreatePluginAction.java
deleted file mode 100755
index 767878a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/cheatsheets/actions/CreatePluginAction.java
+++ /dev/null
@@ -1,34 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.cheatsheets.actions;
-
-import org.eclipse.epf.authoring.ui.actions.NewPluginAction;
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.cheatsheets.ICheatSheetAction;
-import org.eclipse.ui.cheatsheets.ICheatSheetManager;
-
-/**
- * Create Method Plug-in cheat sheet action.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class CreatePluginAction extends Action implements ICheatSheetAction {
-
-	/**
-	 * @see ICheatSheetAction#run(String[], ICheatSheetManager)
-	 */
-	public void run(String[] params, ICheatSheetManager manager) {
-		NewPluginAction.execute(PlatformUI.getWorkbench(), null);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/cheatsheets/actions/SwitchCheatsheetTo.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/cheatsheets/actions/SwitchCheatsheetTo.java
deleted file mode 100755
index 24135eb..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/cheatsheets/actions/SwitchCheatsheetTo.java
+++ /dev/null
@@ -1,45 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.cheatsheets.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.cheatsheets.ICheatSheetAction;
-import org.eclipse.ui.cheatsheets.ICheatSheetManager;
-
-/**
- * Create switch cheat sheet action
- * 
- * @author BingXue Xu
- * @since 1.0
- *
- */
-public class SwitchCheatsheetTo extends Action implements ICheatSheetAction {
-
-	
-	/**
-	 * @see org.eclipse.ui.cheatsheets.ICheatSheetAction#run(java.lang.String[], org.eclipse.ui.cheatsheets.ICheatSheetManager)
-	 */
-	public void run(String[] params, ICheatSheetManager manager) {
-
-		if (params.length <= 0)
-			return;
-
-		String cs_id = params[0];
-
-		// System.out.println("$$$ DEBUG: in SwitchCheatsheetTo.run(...) cs_ID =
-		// " + cs_id); //$NON-NLS-1$
-
-		CheatsheetSwitchJob switchJob = new CheatsheetSwitchJob(
-				"Switch Cheatsheet", cs_id); //$NON-NLS-1$
-		switchJob.schedule(50);
-
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/cheatsheets/actions/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/cheatsheets/actions/package.html
deleted file mode 100755
index 72e9afa..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/cheatsheets/actions/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides actions for the Authoring cheatsheets.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ADDInfoDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ADDInfoDialog.java
deleted file mode 100755
index 94408c8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ADDInfoDialog.java
+++ /dev/null
@@ -1,740 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.editors.AbstractDiagramEditor;
-import org.eclipse.epf.authoring.ui.editors.ActivityDetailDiagramEditor;
-import org.eclipse.epf.authoring.ui.filters.DescriptorConfigurationFilter;
-import org.eclipse.epf.authoring.ui.filters.ExProcessAuthoringConfigurator;
-import org.eclipse.epf.authoring.ui.util.AuthoringAccessibleListener;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.FilterHelper;
-import org.eclipse.epf.library.edit.itemsfilter.ICategoryFilter;
-import org.eclipse.epf.library.edit.itemsfilter.IProcessFilter;
-import org.eclipse.epf.library.edit.process.BreakdownElementItemProvider;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.util.MethodElementUtil;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * Filter Dialog - allow the user to filter the content element, content
- * categories, custom categories, All types of contentelements based on location of the use of the filter
- * dialog.
- * 
- * @author Shashidhar Kannoori
- */
-public class ADDInfoDialog extends Dialog implements
-		ISelectionChangedListener, IDoubleClickListener {
-
-	protected Button okButton, cancelButton;
-
-	protected Text ctrl_brief_desc;
-
-	//private String pattern, filterTypeStr;
-
-	//protected Combo filterType;
-
-	private String dialogTitle, tabStr;
-
-	private Object contentElement;
-
-	private ArrayList selectedList = new ArrayList();
-
-	private boolean viewerSelectionSingle = false;
-	private String viewerLabel = null;
-	
-	/*
-	 * Treeviewer for ContentElements to display.
-	 */
-	private TreeViewer treeViewer;
-
-	protected IStructuredContentProvider contentProvider;
-
-	protected ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory()) {
-		public String getText(Object object) {
-			// return super.getText(object);
-			if (object instanceof VariabilityElement) {
-				return TngUtil.getLabel((VariabilityElement) object, "", true); //$NON-NLS-1$
-			} else {
-				return super.getText(object);
-			}
-		}
-	};
-
-	private AdapterFactory adapterFactory;
-	private ComposedAdapterFactory composedAdapterFactory;
-
-	/*
-	 * Dialog Attributes
-	 */
-	// private boolean anyChilds = true;
-	private List alreadySelectedList = new ArrayList();
-
-	private IFilter filter;
-
-	Pattern regexPattern;
-
-	// private MethodConfiguration methodConfiguration;
-	protected FilterHelper helper;
-
-	private Button expandButton;
-
-	private Button collapseButton;
-
-	private Object input;
-
-	//private String[] types;
-
-	/**
-	 * Constructs a new FilterDialog. This constructor will use filter based on
-	 * tabStr, filters out the list of elements based on already existing
-	 * selected element in the selected table. Initializes the ContentProvider
-	 * for the treeviewer.
-	 * 
-	 */
-	public ADDInfoDialog(Shell parentShell, Object contentElement,
-			String tabStr, List alreadyExists) {
-		super(parentShell);
-		this.contentElement = contentElement;
-		this.tabStr = tabStr;
-		this.filter = null;
-		this.alreadySelectedList = alreadyExists;
-		helper = new FilterHelper(contentElement, tabStr, null, null,
-				this.alreadySelectedList);
-		initProviderForTabs();
-	}
-
-	public ADDInfoDialog(Shell parentShell, IFilter filter, String tabStr,
-			List alreadyExists, Object input) {
-		this(parentShell, filter, null, tabStr, alreadyExists);
-		this.input = input;
-	}
-
-	/**
-	 * Constructs a new FilterDialog. This constructor will use passed filter.
-	 * tabStr is used for the searchtype only. Initializes the ContentProvider
-	 * for the treeviewer.
-	 * 
-	 */
-	public ADDInfoDialog(Shell parentShell, IFilter filter,
-			Object contentElement, String tabStr) {
-		super(parentShell);
-		this.filter = filter;
-		this.tabStr = tabStr;
-
-		helper = new FilterHelper(contentElement, tabStr, null, null, null);
-		initProviderForTabs();
-	}
-
-	/**
-	 * Constructs a new FilterDialog. This constructor will use passed filter.
-	 * tabStr is used for the searchtype only. Initializes the ContentProvider
-	 * for the treeviewer.
-	 * 
-	 */
-	public ADDInfoDialog(Shell parentShell, IFilter filter,
-			Object contentElement, String tabStr, List alreadyExists) {
-		super(parentShell);
-		this.filter = filter;
-		this.tabStr = tabStr;
-		this.alreadySelectedList = alreadyExists;
-		helper = new FilterHelper(contentElement, tabStr, null, null,
-				alreadyExists);
-		this.contentElement = contentElement;
-		initProviderForTabs();
-	}
-
-	/**
-	 * Constructs a new FilterDialog. Only for methodconfiguration. This
-	 * constructor will use passed filter. Initializes the ContentProvider for
-	 * the treeviewer.
-	 * 
-	 */
-	// public ItemsFilterDialog(Shell parentShell, Object contentElement,
-	// MethodConfiguration methodConfiguration, String tabStr) {
-	// super(parentShell);
-	// this.contentElement = contentElement;
-	// this.tabStr = tabStr;
-	// this.filter = null;
-	// this.methodConfiguration = methodConfiguration;
-	// helper = new FilterHelper(contentElement, tabStr, null, null, null);
-	// initProviderForTabs();
-	// }
-	/**
-	 * This constructor is very generic, in order to initialize filter, input
-	 * and contentprovider should be handled explicitly by calling below method.
-	 * setFilter(IFilter) setInput(Object)
-	 * setContentProvider(IStructuredProvider)
-	 * 
-	 */
-	public ADDInfoDialog(Shell parentShell) {
-		super(parentShell);
-		helper = new FilterHelper(null, null, null, null, null);
-	}
-
-	/**
-	 * This method is called if a button has been pressed.
-	 */
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.OK_ID)
-			saveValues();
-		super.buttonPressed(buttonId);
-		if(composedAdapterFactory != null){
-			composedAdapterFactory.dispose();
-		}
-		close();
-
-	}
-
-	public void saveValues(){
-		IStructuredSelection selection = (IStructuredSelection) treeViewer
-		.getSelection();
-		if (selection.size() > 0) {
-			Object[] objectArr = selection.toArray();
-			for (int i = 0; i < objectArr.length; i++) {
-				Object obj = LibraryUtil.unwrap(objectArr[i]);
-				if (obj instanceof Activity) {
-					selectedList.add(obj);
-				} 
-			}
-		}
-	}
-		
-	/**
-	 * Notifies that the cancel button of this dialog has been pressed.
-	 */
-	protected void cancelPressed() {
-		if(composedAdapterFactory != null){
-			composedAdapterFactory.dispose();
-		}
-		super.cancelPressed();
-	}
-
-	/**
-	 * Set title for dialog box eg: Select Dialog For Role, dialogTitle needs to
-	 * "Role"
-	 */
-	public void setTitle(String dialogTitle) {
-		this.dialogTitle = dialogTitle;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		if (dialogTitle == null)
-			dialogTitle = tabStr;
-		shell.setText("Activity Detail Diagram Info: " + dialogTitle); //$NON-NLS-1$
-	}
-
-	/**
-	 * (non-Javadoc) Adds buttons to this dialog's button bar.
-	 * 
-	 * @param parent
-	 *            the button bar composite
-	 * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		super.createButtonsForButtonBar(parent);
-	}
-
-	/**
-	 * Creates dialog area and controls and viewer.
-	 * 
-	 * @param the
-	 *            parent composite to contain the dialog area
-	 * @return the dialog area control
-	 */
-	protected Control createDialogArea(Composite parent) {
-
-		Composite composite = (Composite) super.createDialogArea(parent);
-		composite.setFont(parent.getFont());
-
-		GridLayout layout = (GridLayout) composite.getLayout();
-		layout.marginWidth = 10;
-		layout.marginHeight = 10;
-		//GridData gD = (GridData) composite.getLayoutData();
-		layout.numColumns = 3;
-
-		Label typeLabel = new Label(composite, SWT.NONE);
-		{
-			typeLabel.setText("Select the activity to modify ADD"); //$NON-NLS-1$
-			GridData gD1 = new GridData(GridData.BEGINNING);
-			typeLabel.setLayoutData(gD1);
-
-		}
-//		filterType = new Combo(composite, SWT.SINGLE | SWT.READ_ONLY);
-//		{
-//			GridData gD1 = new GridData(GridData.BEGINNING);
-//			gD1.horizontalSpan = 2;
-//			gD1.widthHint = 390;
-//			filterType.setLayoutData(gD1);
-//		}
-//
-//		if (types == null) {
-//			fillFilterTypeCombo();
-//		} else {
-//			filterType.setItems(types);
-//			if (helper != null) {
-//				filterTypeStr = filterType.getItem(0);
-//				helper.setFilterTypeStr(filterType.getItem(0));
-//				if (tabStr == null) {
-//					tabStr = filterTypeStr;
-//					helper.setTabStr(tabStr);
-//				}
-//			}
-//		}
-//		filterType.select(0);
-
-//		Label ctrl_patternLabel = new Label(composite, SWT.NONE);
-//		{
-//			ctrl_patternLabel.setText(AuthoringUIResources.FilterDialog_Pattern_text); //$NON-NLS-1$
-//			gD.horizontalSpan = 3;
-//			ctrl_patternLabel.setLayoutData(gD);
-//		}
-
-//		ctrl_pattern = new Text(composite, SWT.BORDER);
-//		{
-//			GridData gD1 = new GridData(GridData.FILL_HORIZONTAL);
-//			gD1.horizontalSpan = 3;
-//			ctrl_pattern.setLayoutData(gD1);
-//			ctrl_pattern.getAccessible().addAccessibleListener(
-//					new AuthoringAccessibleListener(
-//							AuthoringUIResources.FilterDialog_Pattern_text +  
-//							AuthoringUIResources.FilterDialog_Pattern_description));
-//		}
-//		Label ctrl_patternLabel1 = new Label(composite, SWT.NONE);
-//		{
-//			ctrl_patternLabel1.setText(AuthoringUIResources.FilterDialog_Pattern_description); //$NON-NLS-1$
-//			ctrl_patternLabel1.setLayoutData(gD);
-//		}
-		
-		Composite buttonsComposite = new Composite(composite, SWT.NONE);		
-		
-		GridData gd2 = new GridData(GridData.FILL_HORIZONTAL
-			| GridData.HORIZONTAL_ALIGN_END);
-		gd2.horizontalSpan = 2;
-		buttonsComposite.setLayoutData(gd2);
-		GridLayout buttonsLayout = new GridLayout();
-		buttonsLayout.numColumns = 2;
-		buttonsLayout.marginRight = 0;
-		buttonsComposite.setLayout(buttonsLayout);
-		
-		expandButton = new Button(buttonsComposite, SWT.BUTTON1);
-
-		expandButton.setImage(AuthoringUIPlugin.getDefault().getSharedImage(
-				"expandall.gif")); //$NON-NLS-1$
-		expandButton.setToolTipText(AuthoringUIResources.FilterDialog_ExpandAll); //$NON-NLS-1$
-		
-		expandButton.getAccessible().addAccessibleListener(new AuthoringAccessibleListener(
-						AuthoringUIResources.FilterDialog_ExpandAll));		
-
-		gd2 = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING
-				| GridData.GRAB_HORIZONTAL);
-
-		expandButton.setLayoutData(gd2);
-
-		collapseButton = new Button(buttonsComposite, SWT.PUSH);
-		collapseButton.setImage(AuthoringUIPlugin.getDefault().getSharedImage(
-				"collapseall.gif")); //$NON-NLS-1$
-
-		collapseButton.setToolTipText(AuthoringUIResources.FilterDialog_CollapseAll); //$NON-NLS-1$
-		collapseButton.getAccessible().addAccessibleListener(new AuthoringAccessibleListener(
-				AuthoringUIResources.FilterDialog_CollapseAll));
-		
-		gd2 = new GridData(GridData.HORIZONTAL_ALIGN_END);
-
-		collapseButton.setLayoutData(gd2);
-		
-		createLine(composite, 3);
-		createViewerLabel(composite);
-		// create a treeviewer area.
-		createViewer(composite);
-
-
-		new Label(composite, SWT.NONE).setText(AuthoringUIResources.FilterDialog_BriefDescription); //$NON-NLS-1$
-		ctrl_brief_desc = new Text(composite, SWT.BORDER | SWT.MULTI | SWT.WRAP
-				| SWT.V_SCROLL | SWT.READ_ONLY);
-		{
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 3;
-			gd.heightHint = 60;
-			ctrl_brief_desc.setLayoutData(gd);
-		}
-		// Restore the last state
-		createLine(composite, 3);
-
-		// Return results.
-		addListener();
-		// System.out.println("$$$ createDialogArea.filterTypeStr = " +
-		// filterTypeStr);
-		return composite;
-	}
-
-	/**
-	 * Create a new viewer in the parent.
-	 * 
-	 * @param parent
-	 *            the parent <code>Composite</code>.
-	 */
-	private void createViewer(Composite parent) {
-		if (viewerSelectionSingle) {
-			treeViewer = new TreeViewer(parent, SWT.SINGLE | SWT.H_SCROLL
-					| SWT.V_SCROLL | SWT.BORDER);
-		} else {
-			treeViewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL
-					| SWT.V_SCROLL | SWT.BORDER);
-		}
-		treeViewer.setLabelProvider(labelProvider);
-		treeViewer.setContentProvider(contentProvider);
-		treeViewer.setUseHashlookup(true);
-
-		if (input != null) {
-			treeViewer.setInput(input);
-		} else {
-			// Phong: this is too messy. If you relies on the contentElement to
-			// determine the input for the viewer
-			// then you should declare a input field instead and move this code
-			// to constructor
-			//
-			// sorter needs or not. TODO
-			if (contentElement != null) {
-				if (contentElement instanceof Activity) {
-					if (contentElement instanceof Process) {
-						if (((Process) contentElement).eContainer() instanceof ProcessComponent) {
-							if (tabStr.equals(FilterConstants.GUIDANCE)
-									|| tabStr.equals(FilterConstants.ROADMAP) 
-									|| tabStr.equals(FilterConstants.SUPPORTING_MATERIALS)) {
-								treeViewer
-										.setInput(UmaUtil
-												.getMethodLibrary((EObject) contentElement));
-							} else {
-								treeViewer.setInput(((Process) contentElement)
-										.eContainer());
-							}
-						} else
-							treeViewer.setInput(contentElement);
-					} else
-						treeViewer.setInput(UmaUtil
-								.getMethodLibrary((EObject) contentElement));
-				} else {
-					treeViewer.setInput(UmaUtil
-							.getMethodLibrary((EObject) contentElement));
-				}
-			} else {
-				treeViewer
-						.setInput(LibraryService.getInstance().getCurrentMethodLibrary());
-			}
-		}
-
-		treeViewer.addSelectionChangedListener(this);
-		treeViewer.addDoubleClickListener(this);
-		treeViewer.getTree().setFont(parent.getFont());
-
-		if (tabStr.equalsIgnoreCase(FilterConstants.ALL_ELEMENTS)) { //$NON-NLS-1$
-			treeViewer.setSorter(new FilterSorterForAll());
-		} else {
-			treeViewer.setSorter(new FilterSorter());
-		}
-
-		// treeViewer.expandToLevel(3);
-		// treeViewer.expandAll();
-
-		GridData spec = new GridData(GridData.FILL_BOTH);
-		{
-			spec.widthHint = 300;
-			spec.heightHint = 300;
-			spec.horizontalSpan = 3;
-			treeViewer.getControl().setLayoutData(spec);
-		}
-	}
-
-	private void createLine(Composite parent, int ncol) {
-		Label line = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL
-				| SWT.BOLD);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = ncol;
-		line.setLayoutData(gridData);
-	}
-
-	private void createViewerLabel(Composite parent) {
-   		if (viewerLabel != null) {
-   			Label label = new Label(parent, SWT.NONE);
-			label.setText(viewerLabel);
-   		}
-   	}
-	
-	public void setViewerSelectionSingle(boolean single) {
-		viewerSelectionSingle = single;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
-	 */
-	public void doubleClick(DoubleClickEvent event) {
-		IStructuredSelection s = (IStructuredSelection) event.getSelection();
-		Object element = s.getFirstElement();
-		element = LibraryUtil.unwrap(element);
-		if (element instanceof ContentElement || element instanceof Process) {
-			selectedList.add(element);
-		} else if (element instanceof ProcessComponent) {
-			selectedList.add(element);
-		} else if (element instanceof BreakdownElement) {
-			// if(!(element instanceof Activity))
-			selectedList.add(element);
-		} else if (element instanceof ProcessPackage) {
-			// if(!(element instanceof Activity))
-			selectedList.add(element);
-		}
-		close();
-		if(composedAdapterFactory != null){
-			composedAdapterFactory.dispose();
-		}
-	}
-
-	
-	public void traverseTree(TreeItem[] items, List list) {
-		for (int i = 0; i < items.length; i++) {
-			TreeItem[] itemsx = items[i].getItems();
-			if (itemsx.length > 1) {
-				list.add(items[i].getData());
-				traverseTree(itemsx, list);
-			} else {
-				list.add(items[i].getData());
-			}
-		}
-	}
-
-	
-
-
-	/**
-	 * Notifies that the selection has changed.
-	 * 
-	 * @param event
-	 *            event object describing the change
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		updateSelection(event);
-		updateButtons();
-	}
-
-	/**
-	 * Update the button enablement state.
-	 */
-	protected void updateButtons() {
-		// okButton.setEnabled(getSelection().length > 0);
-	}
-
-	public Object getParentObject(Object contentElement) {
-		return MethodElementUtil.getMethodModel(contentElement);
-	}
-
-	/**
-	 * Update the selection object.
-	 */
-	protected void updateSelection(SelectionChangedEvent event) {
-		// ArrayList descs = new ArrayList();
-		IStructuredSelection sel = (IStructuredSelection) event.getSelection();
-		Object selected = sel.getFirstElement();
-		if (selected instanceof BreakdownElementWrapperItemProvider ||
-				selected instanceof BreakdownElementItemProvider){
-			Object unwrap =  TngUtil.unwrap(selected);
-			setBriefDescription(unwrap);
-		}else {
-			setBriefDescription(selected);
-		}
-	}
-	/**
-	 * Set the brief description to control
-	 */
-	private void setBriefDescription(Object element) {
-		if (element instanceof MethodElement) {
-			String desc = ((MethodElement) element).getBriefDescription();
-			if (desc != null) {
-				ctrl_brief_desc.setText(desc);
-			}
-		}
-	}
-
-	
-
-	public void addListener() {
-
-		expandButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				treeViewer.expandAll();
-
-			}
-		});
-		collapseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				treeViewer.collapseAll();
-
-			}
-		});
-
-	}
-
-	public ArrayList getSelectedItems() {
-		return selectedList;
-	}
-
-	private void initProviderForTabs() {
-
-		if (filter != null) {
-			if (filter instanceof org.eclipse.epf.library.edit.itemsfilter.IFilter) {
-				if(filter instanceof ICategoryFilter){
-					// special handling for contentcategory.
-					// https://bugs.eclipse.org/bugs/show_bug.cgi?id=157452
-					helper.setContentCategoryTabStr(tabStr);
-				}
-				((org.eclipse.epf.library.edit.itemsfilter.IFilter) filter)
-						.setHelper(helper);
-			} else if (filter instanceof DescriptorConfigurationFilter) {
-				((DescriptorConfigurationFilter) filter).setHelper(helper);
-			}else if (filter instanceof ExProcessAuthoringConfigurator) {
-				((ExProcessAuthoringConfigurator) filter).setHelper(helper);
-			}
-		}
-		if (filter instanceof IProcessFilter) {
-			if (tabStr
-					.equalsIgnoreCase(FilterConstants.WORK_PRODUCT_DESCRIPTORS)) {
-				adapterFactory =TngAdapterFactory.INSTANCE.getPBSFilter_AdapterFactory(filter);
-				contentProvider = new AdapterFactoryContentProvider(
-						adapterFactory);
-				composedAdapterFactory = TngAdapterFactory.INSTANCE.getPBSFilter_ComposedAdapterFactory();
-				labelProvider = new AdapterFactoryLabelProvider(
-						TngAdapterFactory.INSTANCE
-								.getPBS_ComposedAdapterFactory());
-			} else if (tabStr
-					.equalsIgnoreCase(FilterConstants.ROLE_DESCRIPTORS)) {
-				adapterFactory = TngAdapterFactory.INSTANCE
-				.getOBSFilter_AdapterFactory(filter); 
-				contentProvider = new AdapterFactoryContentProvider(adapterFactory);
-				composedAdapterFactory = TngAdapterFactory.INSTANCE.getOBSFilter_ComposedAdapterFactory();
-				labelProvider = new AdapterFactoryLabelProvider(
-						TngAdapterFactory.INSTANCE
-								.getOBS_ComposedAdapterFactory());
-			}
-		} else {
-			adapterFactory = TngAdapterFactory.INSTANCE
-						.getItemsFilter_AdapterFactory(filter); 
-			contentProvider = new AdapterFactoryContentProvider(adapterFactory);
-			composedAdapterFactory = TngAdapterFactory.INSTANCE.getItemsFilter_ComposedAdapterFactory();
-		}
-	}
-
-	public void setExistingElements(List list) {
-		this.alreadySelectedList = list;
-		if (helper != null) {
-			helper.setAlreadySelectedList(list);
-		}
-	}
-
-	public FilterHelper getHelper() {
-		return this.helper;
-	}
-
-	public String[] getFilterTypeArray() {
-		return null;
-	}
-
-	/*
-	 * sets the ContentProvider used by TreeViewer.
-	 */
-	public void setContentProvider(IStructuredContentProvider contentProvider,
-			ComposedAdapterFactory composedAdapterFactory) {
-		this.contentProvider = contentProvider;
-		this.composedAdapterFactory = composedAdapterFactory;
-	}
-
-	/*
-	 * set the Filter.
-	 */
-	public void setFilter(IFilter filter) {
-		this.filter = filter;
-		if (helper != null) {
-			if (this.filter instanceof org.eclipse.epf.library.edit.itemsfilter.IFilter) {
-				((org.eclipse.epf.library.edit.itemsfilter.IFilter) this.filter)
-						.setHelper(helper);
-			} else if (this.filter instanceof DescriptorConfigurationFilter) {
-				((DescriptorConfigurationFilter) this.filter).setHelper(helper);
-			}
-		}
-	}
-
-	public void setInput(Object input) {
-		if (input != null) {
-			this.input = input;
-		}
-	}
-
-	public void setViewerLabel(String viewerLabel) {
-		this.viewerLabel = viewerLabel;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/AttachmentDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/AttachmentDialog.java
deleted file mode 100755
index 044df2a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/AttachmentDialog.java
+++ /dev/null
@@ -1,163 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.io.File;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Opens dialog to attach attachments
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class AttachmentDialog extends Dialog {
-
-	/**
-	 * The OK button.
-	 */
-	protected Button okButton;
-
-	/**
-	 * The Cancel button.
-	 */
-	protected Button cancelButton;
-
-	/**
-	 * @param parent
-	 */
-
-	private Text attachment;
-
-	/**
-	 * Creates an instance
-	 * @param parent
-	 */
-	public AttachmentDialog(Shell parent) {
-		super(parent);
-	}
-
-	/**
-	 * @see Dialog#createDialogArea(Composite parent)
-	 */
-	protected Control createDialogArea(Composite parent) {
-
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
-		GridLayout layout = (GridLayout) dialogArea.getLayout();
-		layout.marginWidth = 10;
-		layout.marginHeight = 10;
-		layout.numColumns = 2;
-		GridData gridData = (GridData) dialogArea.getLayoutData();
-		gridData.verticalIndent = 10;
-		layout.numColumns = 3;
-
-		Label urlLabel = new Label(dialogArea, SWT.NONE);
-		urlLabel.setText(AuthoringUIResources.AttachmentDialogFileURL_text); //$NON-NLS-1$
-		attachment = new Text(dialogArea, SWT.BORDER);
-		gridData.widthHint = 300;
-		attachment.setLayoutData(gridData);
-		attachment.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (okButton != null) {
-					okButton
-							.setEnabled(attachment.getText().trim().length() > 0);
-				}
-			}
-		});
-
-		Button browseButton = new Button(dialogArea, SWT.NONE);
-		browseButton.setText(AuthoringUIText.BROWSE_BUTTON_TEXT);
-		browseButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				FileDialog dialog = new FileDialog(Display.getCurrent()
-						.getActiveShell(), SWT.OPEN);
-				String imageFile = dialog.open();
-				if (imageFile != null && imageFile.length() > 0) {
-					File file = new File(imageFile);
-					try {
-						String url = file.toURL().toExternalForm();
-						attachment.setText(url);
-					} catch (Exception e) {
-					}
-				}
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		super
-				.getShell()
-				.setText(
-						AuthoringUIResources.AttachmentDialogattachFile_text); //$NON-NLS-1$
-
-		return dialogArea;
-
-	}
-
-	/**
-	 * Creates the dialog buttons.
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		// Create the OK button.
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
-				true);
-
-		// Create the Cancel button.
-		createButton(parent, IDialogConstants.CANCEL_ID,
-				IDialogConstants.CANCEL_LABEL, false);
-
-		// Set help context for the OK button.
-		okButton = super.getButton(IDialogConstants.OK_ID);
-
-		// Set help context for the Cancel button.
-		cancelButton = super.getButton(IDialogConstants.CANCEL_ID);
-
-		okButton.setEnabled(false);
-	}
-
-	/**
-	 * Called when the OK button is selected.
-	 */
-	protected void okPressed() {
-		// String url = attachment.getText();
-		// if (url != null && url.length() > 0) {
-		//			
-		// }
-		super.okPressed();
-	}
-
-	/**
-	 * Returns the File Name
-	 */
-	public String getAttachmentPath() {
-		return attachment.getText();
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ChangeHistoryDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ChangeHistoryDialog.java
deleted file mode 100755
index 76f958b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ChangeHistoryDialog.java
+++ /dev/null
@@ -1,162 +0,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
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-import com.ibm.icu.util.StringTokenizer;
-
-
-/**
- * Dialog to show change history of an element
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class ChangeHistoryDialog extends Dialog {
-
-	/**
-	 * The OK button.
-	 */
-	protected Button okButton;
-
-	/**
-	 * The Cancel button.
-	 */
-	protected Button cancelButton;
-
-	/**
-	 * @param parent
-	 */
-
-	private MethodElement element;
-
-	private Table table;
-
-	/**
-	 * Creates an instance
-	 * 
-	 * @param parent
-	 * @param element
-	 */
-	public ChangeHistoryDialog(Shell parent, MethodElement element) {
-		super(parent);
-
-		this.element = element;
-	}
-
-	/**
-	 * @see Dialog#createDialogArea(Composite parent)
-	 */
-	protected Control createDialogArea(Composite parent) {
-
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
-		GridLayout layout = (GridLayout) dialogArea.getLayout();
-		layout.marginWidth = 10;
-		layout.marginHeight = 10;
-		layout.numColumns = 1;
-		GridData gd = (GridData) dialogArea.getLayoutData();
-		gd.verticalIndent = 10;
-
-		Label label = new Label(dialogArea, SWT.NONE);
-		label.setText(AuthoringUIResources.ChangeHistoryDialog_label); //$NON-NLS-1$
-
-		table = new Table(dialogArea, SWT.BORDER | SWT.MULTI);
-		{
-			GridData gridData = new GridData(GridData.FILL_BOTH);
-			gridData.horizontalSpan = 2;
-			gridData.widthHint = 400;
-			gridData.heightHint = 300;
-			table.setLayoutData(gridData);
-			table.setLinesVisible(true);
-
-		}
-
-		initChangeHistoryTable();
-		super.getShell().setText(
-				AuthoringUIResources.ChangeHistoryDialog_title); //$NON-NLS-1$
-
-		return dialogArea;
-
-	}
-
-	private void initChangeHistoryTable() {
-		String changeDesc = null;
-		if (element instanceof ContentElement) {
-			ContentDescription contentDescription = ((ContentElement) element)
-					.getPresentation();
-			changeDesc = contentDescription.getChangeDescription();
-		}
-		if (element instanceof MethodPlugin) {
-			changeDesc = ((MethodPlugin) element).getChangeDescription();
-		}
-
-		if (changeDesc != null) {
-			StringTokenizer tok = new StringTokenizer(
-					changeDesc,
-					AuthoringUIResources.ChangeHistoryDialog_delimiter); //$NON-NLS-1$
-			List strList = new ArrayList();
-
-			while (tok.hasMoreTokens()) {
-				strList.add(tok.nextToken());
-			}
-
-			for (int i = strList.size() - 1; i >= 0; i--) {
-				TableItem item = new TableItem(table, SWT.NONE);
-				item.setText((String) strList.get(i));
-			}
-		}
-
-	}
-
-	/**
-	 * Creates the dialog buttons.
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		// Create the OK button.
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
-				true);
-
-		// Set help context for the OK button.
-		okButton = super.getButton(IDialogConstants.OK_ID);
-	}
-
-	/**
-	 * Called when the OK button is selected.
-	 */
-	protected void okPressed() {
-
-		super.okPressed();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ConfigurationAddViewsDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ConfigurationAddViewsDialog.java
deleted file mode 100755
index de294b4..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ConfigurationAddViewsDialog.java
+++ /dev/null
@@ -1,55 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Open an dialog to add views into configuration
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class ConfigurationAddViewsDialog extends ItemsFilterDialog {
-
-	/**
-	 * @param parentShell
-	 */
-	public ConfigurationAddViewsDialog(Shell parentShell) {
-		super(parentShell);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		labelProvider = new AdapterFactoryLabelProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public String getText(Object object) {
-				String presentationName = null;
-				if (object instanceof DescribableElement) {
-					presentationName = ((DescribableElement) object)
-							.getPresentationName();
-				}
-				if (presentationName == null || "".equals(presentationName)) {
-					presentationName = super.getText(object);
-				}
-				return presentationName;
-			}
-		};
-		helper.setShowPresentationName(true);
-		return super.createDialogArea(parent);
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ConfigurationOrderDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ConfigurationOrderDialog.java
deleted file mode 100755
index e0819f7..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ConfigurationOrderDialog.java
+++ /dev/null
@@ -1,301 +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.authoring.ui.dialogs;
-
-import java.util.ArrayList;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.providers.VariabilityElementLabelProvider;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.command.MoveInConfigurationCommand;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-
-/**
- * Open a dialog to order configuration views
- * @author Xiang Dong Hu
- * @since 1.2
- *  fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=173827
- */
-public class ConfigurationOrderDialog extends Dialog {
-
-	private Composite baseComposite;
-
-	private Button ctrl_up, ctrl_down;
-
-	private Table ctrl_views;
-
-	private TableViewer viewsTableViewer;
-
-//	private ContentElementOrderList allSteps;
-
-	private IStructuredContentProvider viewsViewerContentProvider;
-
-	private ILabelProvider viewsViewerLabelProvider;
-	
-	private MethodConfiguration config;
-
-	private IActionManager actionManager;
-	
-	private ArrayList commands = new ArrayList();
-	
-	public ConfigurationOrderDialog(Shell parent, 
-			MethodConfiguration config, IActionManager actionManager) {
-		super(parent);
-		this.config = config;
-		this.actionManager = actionManager;
-	}
-	
-	/**
-	 * @see Dialog#createDialogArea(Composite parent)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		baseComposite = (Composite) super.createDialogArea(parent);
-		final GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 4;
-		baseComposite.setLayout(gridLayout);
-		baseComposite.setLayoutData(new GridData());
-
-		// Empty line
-		createLabel(baseComposite, " ", 4); //$NON-NLS-1$
-
-		createLabel(baseComposite, " ", 1); //$NON-NLS-1$
-		createLabel(
-				baseComposite,
-				AuthoringUIResources.ConfigurationOrderDialog_NavigationViews, 3);
-
-		createLabel(baseComposite, " ", 1); //$NON-NLS-1$
-		ctrl_views = new Table(baseComposite, SWT.MULTI | SWT.BORDER);
-		{
-			GridData gridData = new GridData(GridData.FILL_BOTH);
-			gridData.horizontalSpan = 2;
-			gridData.widthHint = 300;
-			gridData.heightHint = 400;
-			ctrl_views.setLayoutData(gridData);
-		}
-
-		initProviders();
-
-		viewsTableViewer = new TableViewer(ctrl_views);
-		viewsTableViewer.setContentProvider(viewsViewerContentProvider);
-		viewsTableViewer.setLabelProvider(viewsViewerLabelProvider);
-
-		Composite orderButtonPane = new Composite(baseComposite, SWT.NULL);
-		{
-			GridData gridData = new GridData(GridData.VERTICAL_ALIGN_CENTER
-					| GridData.HORIZONTAL_ALIGN_CENTER);
-			gridData.horizontalSpan = 1;
-			orderButtonPane.setLayoutData(gridData);
-			orderButtonPane.setLayout(new GridLayout());
-		}
-
-		ctrl_up = createButton(orderButtonPane, AuthoringUIText.UP_BUTTON_TEXT);
-		ctrl_up.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		ctrl_down = createButton(orderButtonPane,
-				AuthoringUIText.DOWN_BUTTON_TEXT);
-		ctrl_down.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		ctrl_up.setEnabled(false);
-		ctrl_down.setEnabled(false);
-		// Empty line
-		createLabel(baseComposite, " ", 4); //$NON-NLS-1$
-
-		createLine(baseComposite, 4);
-
-		super
-				.getShell()
-				.setText(
-						AuthoringUIResources.ConfigurationOrderDialog_description);
-
-		addListeners();
-		loadData();
-
-		return baseComposite;
-	}
-	
-	private void createLine(Composite parent, int ncol) {
-		Label line = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL
-				| SWT.BOLD);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = ncol;
-		line.setLayoutData(gridData);
-	}
-	
-	private Label createLabel(Composite parent, String text, int nCol) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(text);
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-			gridData.horizontalSpan = nCol;
-			label.setLayoutData(gridData);
-		}
-
-		return label;
-	}
-
-	private Button createButton(Composite parent, String label) {
-		Button button = new Button(parent, SWT.NONE);
-		button.setText(label);
-		return button;
-	}
-	
-	private void initProviders() {
-		viewsViewerContentProvider = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return config.getProcessViews().toArray();
-			}
-		};
-
-		viewsViewerLabelProvider = new VariabilityElementLabelProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-
-			public boolean isExternal(Object element) {
-				return !config.getProcessViews().contains(element);
-			}
-
-		};
-	}
-	
-	public void addListeners() {
-		viewsTableViewer
-		.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection) viewsTableViewer
-						.getSelection();
-				if (selection.size() > 0) {
-					if (viewsTableViewer.getTable().getSelectionIndex() > 0
-							&& selection.size() == 1) {
-						ctrl_up.setEnabled(true);
-					} else
-						ctrl_up.setEnabled(false);
-
-					if (viewsTableViewer.getTable().getSelectionIndex() < viewsTableViewer
-							.getTable().getItemCount() - 1
-							&& selection.size() == 1) {
-						ctrl_down.setEnabled(true);
-					} else
-						ctrl_down.setEnabled(false);
-				}
-			}
-
-		});
-		
-		ctrl_up.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) viewsTableViewer
-						.getSelection();
-
-				ArrayList moveUpItems = new ArrayList();
-				moveUpItems.addAll(selection.toList());
-				EStructuralFeature feature = UmaPackage.eINSTANCE
-						.getMethodConfiguration_ProcessViews();
-				MoveInConfigurationCommand cmd = new MoveInConfigurationCommand(
-						config, moveUpItems, feature,1);
-				actionManager.execute(cmd);
-				commands.add(cmd);
-
-				viewsTableViewer.refresh();
-
-				if (viewsTableViewer.getTable().getSelectionIndex() > 0) {
-					ctrl_up.setEnabled(true);
-				} else
-					ctrl_up.setEnabled(false);
-				if (viewsTableViewer.getTable().getSelectionIndex() < viewsTableViewer
-						.getTable().getItemCount() - 1) {
-					ctrl_down.setEnabled(true);
-				} else
-					ctrl_down.setEnabled(false);
-			}
-		});
-		
-		ctrl_down.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) viewsTableViewer
-						.getSelection();
-				ArrayList moveDownItems = new ArrayList();
-				moveDownItems.addAll(selection.toList());
-				EStructuralFeature feature = UmaPackage.eINSTANCE
-						.getMethodConfiguration_ProcessViews();
-				MoveInConfigurationCommand cmd = new MoveInConfigurationCommand(
-						config, moveDownItems, feature,0);
-				actionManager.execute(cmd);
-				commands.add(cmd);
-
-				viewsTableViewer.refresh();
-
-				if (viewsTableViewer.getTable().getSelectionIndex() > 0) {
-					ctrl_up.setEnabled(true);
-				} else
-					ctrl_up.setEnabled(false);
-				if (viewsTableViewer.getTable().getSelectionIndex() < viewsTableViewer
-						.getTable().getItemCount() - 1) {
-					ctrl_down.setEnabled(true);
-				} else
-					ctrl_down.setEnabled(false);
-			}
-		});
-	}
-	
-	/**
-	 * Load initial data from model
-	 */
-	private void loadData() {
-		viewsTableViewer.setInput(config);
-	}
-	
-	/**
-	 * Called when the OK button is selected.
-	 */
-	protected void okPressed() {
-//		allSteps.apply();
-		super.okPressed();
-	}
-
-	protected void cancelPressed() {
-		if (!commands.isEmpty()) {
-			for (int i = commands.size() - 1; i > -1; i--) {
-				Object cmd = commands.get(i);
-				if (cmd instanceof MoveInConfigurationCommand) {
-					((MoveInConfigurationCommand) cmd).undo();
-				}
-			}
-		}
-		super.cancelPressed();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ContentElementsOrderDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ContentElementsOrderDialog.java
deleted file mode 100755
index 8ce8b48..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ContentElementsOrderDialog.java
+++ /dev/null
@@ -1,439 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.providers.VariabilityElementLabelProvider;
-import org.eclipse.epf.library.edit.LibraryEditResources;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.command.MoveInCategoryCommand;
-import org.eclipse.epf.library.edit.util.CategorySortHelper;
-import org.eclipse.epf.library.edit.util.ContentElementOrderList;
-import org.eclipse.epf.library.edit.util.ModelStructure;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodElementProperty;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-
-/**
- * Open an dialog to order content elements
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- *
- */
-public class ContentElementsOrderDialog extends Dialog {
-
-	private Composite baseComposite;
-
-	private Button ctrl_up, ctrl_down;
-
-	private Table ctrl_steps;
-
-	private TableViewer stepsTableViewer;
-
-	private ContentElementOrderList allSteps;
-
-	private IStructuredContentProvider stepsViewerContentProvider;
-
-	private ILabelProvider stepsViewerLabelProvider;
-
-	// private Task contentElement;
-	private ContentElement contentElement;
-
-	// the Element to use for sorting
-	private MethodElement sortElement;
-
-	private IActionManager actionManager;
-
-	private ArrayList commands = new ArrayList();
-	
-	protected ComboViewer viewer_sort;
-	
-	protected IStructuredContentProvider contentProviderSort = new AdapterFactoryContentProvider(
-			TngAdapterFactory.INSTANCE.getNavigatorView_ComposedAdapterFactory()) {
-		public Object[] getElements(Object object) {
-			List<String> sortTypesList = CategorySortHelper.getCategorySortTypes();
-			return sortTypesList.toArray();
-		}
-	};
-
-	protected ILabelProvider labelProviderSort = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory()) {
-		public String getText(Object object) {
-			if (object instanceof String) {
-				String str = ((String)object);
-				return CategorySortHelper.getSortTypeDisplayName(str);
-			}
-			return null;
-		}
-	};
-
-
-	/**
-	 * Creates a <code>AdvancedSearchDialog</code> giveb the parent control.
-	 * 
-	 * @param parent
-	 *            The parent control.
-	 */
-	public ContentElementsOrderDialog(Shell parent,
-			ContentElement contentElement, IActionManager actionManager) {
-		super(parent);
-		this.contentElement = contentElement;
-		if (TngUtil.isContributor(contentElement)) {
-			this.sortElement = contentElement.getVariabilityBasedOnElement();
-		} else {
-			this.sortElement = contentElement;
-		}
-		this.actionManager = actionManager;
-		allSteps = null;
-	}
-
-	/**
-	 * @see Dialog#createDialogArea(Composite parent)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		baseComposite = (Composite) super.createDialogArea(parent);
-		final GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 4;
-		baseComposite.setLayout(gridLayout);
-		baseComposite.setLayoutData(new GridData());
-
-		// Empty line
-		createLabel(baseComposite, " ", 4); //$NON-NLS-1$
-
-		createLabel(baseComposite, " ", 1); //$NON-NLS-1$
-		createLabel(
-				baseComposite,
-				AuthoringUIResources.ContentElementsOrderDialog_ContentElement_text, 3); //$NON-NLS-1$
-
-		createLabel(baseComposite, " ", 1); //$NON-NLS-1$
-		ctrl_steps = new Table(baseComposite, SWT.MULTI | SWT.BORDER);
-		{
-			GridData gridData = new GridData(GridData.FILL_BOTH);
-			gridData.horizontalSpan = 2;
-			gridData.widthHint = 300;
-			gridData.heightHint = 400;
-			ctrl_steps.setLayoutData(gridData);
-		}
-
-		initProviders();
-
-		stepsTableViewer = new TableViewer(ctrl_steps);
-		stepsTableViewer.setContentProvider(stepsViewerContentProvider);
-		stepsTableViewer.setLabelProvider(stepsViewerLabelProvider);
-
-		Composite orderButtonPane = new Composite(baseComposite, SWT.NULL);
-		{
-			GridData gridData = new GridData(GridData.VERTICAL_ALIGN_CENTER
-					| GridData.HORIZONTAL_ALIGN_CENTER);
-			gridData.horizontalSpan = 1;
-			orderButtonPane.setLayoutData(gridData);
-			orderButtonPane.setLayout(new GridLayout());
-		}
-
-		ctrl_up = createButton(orderButtonPane, AuthoringUIText.UP_BUTTON_TEXT);
-		ctrl_up.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		ctrl_down = createButton(orderButtonPane,
-				AuthoringUIText.DOWN_BUTTON_TEXT);
-		ctrl_down.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		ctrl_up.setEnabled(false);
-		ctrl_down.setEnabled(false);
-
-		createLabel(orderButtonPane, LibraryEditResources.SortType_Label, 1);
-		Combo ctrl_sort = new Combo(orderButtonPane, SWT.SINGLE | SWT.FLAT | SWT.READ_ONLY);
-		viewer_sort = new ComboViewer(ctrl_sort);
-		viewer_sort.setContentProvider(contentProviderSort);
-		viewer_sort.setLabelProvider(labelProviderSort);
-		viewer_sort.setInput(contentElement);
-		// set initial selection
-		String sortType = CategorySortHelper.getCategorySortValue(sortElement);
-		viewer_sort.setSelection(new StructuredSelection(sortType), true);
-
-		// Empty line
-		createLabel(baseComposite, " ", 4); //$NON-NLS-1$
-
-		createLine(baseComposite, 4);
-
-		super
-				.getShell()
-				.setText(
-						AuthoringUIResources.ContentElementsOrderDialog_description_text); //$NON-NLS-1$
-
-		addListeners();
-		loadData();
-
-		// contributors cannot change the sort type - the base element's sort is used
-		if (TngUtil.isContributor(contentElement)) {
-			viewer_sort.getCombo().setEnabled(false);
-		}
-		return baseComposite;
-	}
-
-	private void createLine(Composite parent, int ncol) {
-		Label line = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL
-				| SWT.BOLD);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = ncol;
-		line.setLayoutData(gridData);
-	}
-
-	private Label createLabel(Composite parent, String text, int nCol) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(text);
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-			gridData.horizontalSpan = nCol;
-			label.setLayoutData(gridData);
-		}
-
-		return label;
-	}
-
-	private Button createButton(Composite parent, String label) {
-		Button button = new Button(parent, SWT.NONE);
-		button.setText(label);
-		return button;
-	}
-
-	/**
-	 * Creates the dialog buttons.
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		// Create the OK button.
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
-				true);
-
-		// Create the Cancel button.
-		createButton(parent, IDialogConstants.CANCEL_ID,
-				IDialogConstants.CANCEL_LABEL, false);
-	}
-
-	private void initProviders() {
-		stepsViewerContentProvider = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				if (allSteps == null) {
-					allSteps = new ContentElementOrderList(
-							contentElement,
-							ContentElementOrderList.CONTENT_ELEMENTS__FOR_ELEMENT_AND_PARENTS);
-				}
-				List returnList = CategorySortHelper.sortCategoryElements(sortElement, allSteps.toArray());
-				return returnList.toArray();
-			}
-		};
-
-		stepsViewerLabelProvider = new VariabilityElementLabelProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-
-			public boolean isExternal(Object element) {
-				return !((CustomCategory) contentElement)
-						.getCategorizedElements().contains(element);
-			}
-
-		};
-	}
-
-	public void addListeners() {
-
-		stepsTableViewer
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-
-					public void selectionChanged(SelectionChangedEvent event) {
-						IStructuredSelection selection = (IStructuredSelection) stepsTableViewer
-								.getSelection();
-						if (selection.size() > 0
-								&& !TngUtil.isLocked(contentElement)) {
-							if (stepsTableViewer.getTable().getSelectionIndex() > 0
-									&& !TngUtil.isLocked(contentElement)
-									&& selection.size() == 1 &&
-									CategorySortHelper.isManualCategorySort(sortElement)) {
-								ctrl_up.setEnabled(true);
-							} else
-								ctrl_up.setEnabled(false);
-
-							if (stepsTableViewer.getTable().getSelectionIndex() < stepsTableViewer
-									.getTable().getItemCount() - 1
-									&& !TngUtil.isLocked(contentElement)
-									&& selection.size() == 1 &&
-									CategorySortHelper.isManualCategorySort(sortElement)) {
-								ctrl_down.setEnabled(true);
-							} else
-								ctrl_down.setEnabled(false);
-						}
-					}
-
-				});
-
-		ctrl_up.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) stepsTableViewer
-						.getSelection();
-
-				ArrayList moveUpItems = new ArrayList();
-				moveUpItems.addAll(selection.toList());
-				EStructuralFeature feature = UmaPackage.eINSTANCE
-						.getCustomCategory_CategorizedElements();
-				MoveInCategoryCommand cmd = new MoveInCategoryCommand(
-						(CustomCategory) contentElement, moveUpItems, allSteps,
-						feature, ModelStructure.DEFAULT.customCategoryPath, 1);
-				actionManager.execute(cmd);
-				commands.add(cmd);
-
-				refreshViewers();
-
-				if (stepsTableViewer.getTable().getSelectionIndex() > 0
-						&& !TngUtil.isLocked(contentElement) &&
-						CategorySortHelper.isManualCategorySort(sortElement)) {
-					ctrl_up.setEnabled(true);
-				} else
-					ctrl_up.setEnabled(false);
-				if (stepsTableViewer.getTable().getSelectionIndex() < stepsTableViewer
-						.getTable().getItemCount() - 1
-						&& !TngUtil.isLocked(contentElement) &&
-						CategorySortHelper.isManualCategorySort(sortElement)) {
-					ctrl_down.setEnabled(true);
-				} else
-					ctrl_down.setEnabled(false);
-			}
-		});
-
-		ctrl_down.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) stepsTableViewer
-						.getSelection();
-				ArrayList moveDownItems = new ArrayList();
-				moveDownItems.addAll(selection.toList());
-				EStructuralFeature feature = UmaPackage.eINSTANCE
-						.getCustomCategory_CategorizedElements();
-				MoveInCategoryCommand cmd = new MoveInCategoryCommand(
-						(CustomCategory) contentElement, moveDownItems, allSteps,
-						feature, ModelStructure.DEFAULT.customCategoryPath,	0);
-				actionManager.execute(cmd);
-				commands.add(cmd);
-
-				refreshViewers();
-
-				if (stepsTableViewer.getTable().getSelectionIndex() > 0
-						&& !TngUtil.isLocked(contentElement) &&
-						CategorySortHelper.isManualCategorySort(sortElement)) {
-					ctrl_up.setEnabled(true);
-				} else
-					ctrl_up.setEnabled(false);
-				if (stepsTableViewer.getTable().getSelectionIndex() < stepsTableViewer
-						.getTable().getItemCount() - 1
-						&& !TngUtil.isLocked(contentElement) &&
-						CategorySortHelper.isManualCategorySort(sortElement)) {
-					ctrl_down.setEnabled(true);
-				} else
-					ctrl_down.setEnabled(false);
-			}
-		});
-		
-		viewer_sort.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection) viewer_sort
-						.getSelection();
-				String sortType = (String)selection.getFirstElement();
-				MethodElementProperty prop = CategorySortHelper.getCategorySortProperty(contentElement);
-				
-				if (prop == null) {
-					prop = CategorySortHelper.createNewSortProperty(sortType);
-					actionManager
-					.doAction(
-							IActionManager.ADD,
-							contentElement,
-							UmaPackage.eINSTANCE
-									.getMethodElement_MethodElementProperty(),
-							prop, -1);
-				}
-				else {
-					actionManager.doAction(IActionManager.SET,
-						prop,
-						UmaPackage.eINSTANCE
-								.getMethodElementProperty_Value(),
-								sortType, -1);
-				}
-				refreshViewers();
-			}
-		});
-
-	}
-	
-	private void refreshViewers() {
-		stepsTableViewer.refresh();
-	}
-
-	/**
-	 * Load initial data from model
-	 */
-	private void loadData() {
-		stepsTableViewer.setInput(contentElement);
-	}
-
-	/**
-	 * Called when the OK button is selected.
-	 */
-	protected void okPressed() {
-		allSteps.apply();
-		super.okPressed();
-	}
-
-	protected void cancelPressed() {
-		if (!commands.isEmpty()) {
-			for (int i = commands.size() - 1; i > -1; i--) {
-				Object cmd = commands.get(i);
-				if (cmd instanceof MoveInCategoryCommand) {
-					((MoveInCategoryCommand) cmd).undo();
-				}
-			}
-		}
-		super.cancelPressed();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ContributionSelection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ContributionSelection.java
deleted file mode 100755
index ce2de39..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ContributionSelection.java
+++ /dev/null
@@ -1,321 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.filters.AllFilter;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.configuration.ConfigurationHelper;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.itemsfilter.CategorizedProcessesItemProvider;
-import org.eclipse.epf.library.edit.itemsfilter.ContentCategoriesGroupItemProvider;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.ProcessesItemProvider;
-import org.eclipse.epf.library.edit.util.MethodElementUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The dialog for selecting element to detetmine which element editor to open in
- * case of variability relationship. This will only take effect if user
- * double-clicks from configuration view.
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class ContributionSelection {
-
-	private HashSet filterElementList = new HashSet();
-
-	private class ContributionFilter extends AllFilter {
-		public boolean accept(Object obj) {
-			Object contentElement = helper.getContentElement();
-			if (contentElement != null) {
-				if (obj.equals(helper.getContentElement()))
-					return false;
-			}
-
-			if (helper.getAlreadySelectedList() != null) {
-				if (obj instanceof ProcessComponent) {
-					if (helper.getAlreadySelectedList().contains(
-							((ProcessComponent) obj).getProcess()))
-						return false;
-				} else {
-					if (helper.getAlreadySelectedList().contains(obj))
-						return false;
-				}
-			}
-
-			if (obj instanceof CustomCategory) {
-				if (TngUtil.isRootCustomCategory((CustomCategory) obj)) {
-					if (((CustomCategory) obj).getCategorizedElements()
-							.isEmpty())
-						return false;
-				}
-			}
-			if (!helper.matchPattern(obj))
-				return false;
-
-			// if(obj instanceof TermDefinition) return false;
-
-			if (obj instanceof MethodPlugin) {
-				if (obj instanceof MethodPlugin) {
-					if (contentElement != null) {
-						if (MethodElementUtil.getAllModels(contentElement)
-								.contains(obj))
-							return true;
-						else
-							return false;
-					} else {
-						return true;
-					}
-				}
-			}
-			if (obj instanceof ContentPackage)
-				return true;
-			if (obj instanceof ContentCategoriesGroupItemProvider) {
-				Collection list = ((ContentCategoriesGroupItemProvider) obj)
-						.getChildren(obj);
-				if (list.isEmpty())
-					return false;
-				else
-					return true;
-			}
-			if (obj instanceof ProcessesItemProvider) {
-				Collection list = ((ProcessesItemProvider) obj)
-						.getChildren(obj);
-				for (Iterator ior = list.iterator(); ior.hasNext();) {
-					Object object = ior.next();
-					if (((CategorizedProcessesItemProvider) object)
-							.getChildren(object).isEmpty())
-						ior.remove();
-				}
-				if (list.isEmpty())
-					return false;
-				else
-					return true;
-			}
-
-			if (childAccept(obj))
-				return true;
-			return false;
-		}
-
-		public boolean childAccept(Object obj) {
-			if (obj instanceof CustomCategory) {
-				return anyCategorizedElementAccepted((CustomCategory) obj,
-						filterElementList);
-			}
-			if ((obj instanceof ContentElement)
-					&& filterElementList.contains(obj)) {
-				return true;
-			}
-			if(obj instanceof Process){ 
-				if(filterElementList.contains(obj)){
-					return true;
-				}
-			}
-			if(obj instanceof ProcessPackage) {
-				return checkProcessPkg(obj);
-			}
-			if(obj instanceof Process) {
-				return checkProcessElements(obj);
-			}
-			return false;
-		}
-	};
-	
-	public boolean checkProcessPkg(Object obj){
-		
-		List list = new ArrayList();
-		if(obj instanceof ProcessPackage){
-			if(filterElementList.contains(obj))
-				return true;
-			if(obj instanceof ProcessComponent){
-				if(filterElementList.contains(((ProcessComponent)obj).getProcess()))
-					return true;
-				list = ((ProcessComponent)obj).getProcess().getBreakdownElements();
-			}else{
-				list = ((ProcessPackage)obj).getChildPackages();
-			}
-			
-		}
-		for(Iterator iterator = list.iterator(); iterator.hasNext();)
-		{
-			Object child = iterator.next();
-			if(child instanceof ProcessComponent){
-				if(checkProcessPkg(child)) return true;
-			}
-			if(child instanceof BreakdownElement){
-				if(filterElementList.contains(child)) return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Check any process elements
-	 * @param obj
-	 * @return
-	 * 			Boolean value 
-	 */
-	public boolean checkProcessElements(Object obj){
-		List list = ((Process)obj).getBreakdownElements();
-		for(Iterator iterator = list.iterator(); iterator.hasNext();)
-		{
-			Object child = iterator.next();
-			if(child instanceof BreakdownElement){
-				if(filterElementList.contains(((BreakdownElement)child)))
-						return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Checks whether any categorized elements to be accepted.
-	 * @param obj
-	 * @param list
-	 * @return
-	 * 		Boolean value which indicates whether any categoriezed elements to be accepted
-	 */
-	public boolean anyCategorizedElementAccepted(CustomCategory obj,
-			HashSet list) {
-		if (list.contains(obj))
-			return true;
-		List elements = obj.getCategorizedElements();
-		for (Iterator iterator = elements.iterator(); iterator.hasNext();) {
-			Object object = iterator.next();
-			if (object instanceof CustomCategory) {
-				if (list.contains(object))
-					return true;
-				anyCategorizedElementAccepted((CustomCategory) object, list);
-			}
-		}
-		return false;
-	}
-
-
-	/**
-	 * Display contribution selection dialog which lists elements and it's
-	 * contributors.
-	 */
-	public ContributionSelection() {
-	}
-
-	/**
-	 * It shows dialog box for all the contributors. User is expected to select
-	 * one.
-	 * 
-	 * @param element
-	 * 			Element for which contributor are shown
-	 * @return
-	 * 			Selected contributor
-	 */
-	public Object getSelectedContributor(VariabilityElement element) {
-		filterElementList = new HashSet();
-		// Get the current configuration.
-		MethodConfiguration config = LibraryService.getInstance()
-				.getCurrentMethodConfiguration();
-
-		// get list of contributors
-		List contributors = ConfigurationHelper
-				.getContributors(element, config);
-		if ((contributors != null) && (!contributors.isEmpty())) {
-			// clear the array
-			List elementList = new ArrayList();
-
-			// add element and it's contributors
-			elementList.add(element);
-			elementList.addAll(contributors);
-			filterElementList.addAll(elementList);
-			for (Iterator itor = elementList.iterator(); itor.hasNext();) {
-				Object e = itor.next();
-				List groupings = null;
-				if (e instanceof Discipline) {
-					groupings = AssociationHelper
-							.getDisciplineGroups((Discipline) e);
-
-				}
-				if (e instanceof RoleSet) {
-					groupings = AssociationHelper
-							.getRoleSetGroups((RoleSet) e);
-				}
-
-				if ((groupings != null) && (!groupings.isEmpty()))
-					filterElementList.addAll(groupings);
-
-			}
-
-			IFilter filter = new ContributionFilter();
-			// ItemsFilterDialog dlg = new ItemsFilterDialog(PlatformUI
-			// .getWorkbench().getActiveWorkbenchWindow().getShell(),
-			// filter, null, FilterConstants.CONFIG_CONTENT_ELEMENT);
-			// dlg.setViewerSelectionSingle(true);
-			String[] str = new String[] { FilterConstants.CONFIG_CONTENT_ELEMENT };
-			ConfigurationAddViewsDialog dlg = new ConfigurationAddViewsDialog(
-					PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-							.getShell());
-			dlg.setFilter(filter);
-			dlg.setTitle(FilterConstants.CONFIG_CONTENT_ELEMENT);
-			dlg.setViewerSelectionSingle(true);
-			dlg.setTypes(str);
-			dlg.setInput(UmaUtil.getMethodLibrary((EObject) element));
-			dlg.setContentProvider(new AdapterFactoryContentProvider(
-					TngAdapterFactory.INSTANCE
-							.getItemsFilter_AdapterFactory(filter)),
-					TngAdapterFactory.INSTANCE
-							.getItemsFilter_ComposedAdapterFactory());
-			dlg.setBlockOnOpen(true);
-
-			String title = MessageFormat
-					.format(
-							AuthoringUIResources.ContributionSelection_filterdialog_title, //$NON-NLS-1$
-							new String[] { element.getName() });
-
-			dlg.setTitle(title);
-			dlg.setBlockOnOpen(true);
-			dlg.open();
-
-			List result = dlg.getSelectedItems();
-			if ((result == null) || (result.isEmpty()))
-				return null;
-			else
-				return result.get(0);
-		}
-		return element;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/DialogHelper.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/DialogHelper.java
deleted file mode 100755
index 5cbe219..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/DialogHelper.java
+++ /dev/null
@@ -1,124 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.epf.authoring.ui.filters.ProcessActivityFilter;
-import org.eclipse.epf.authoring.ui.filters.ProcessRoleFilter;
-import org.eclipse.epf.authoring.ui.filters.VariabilityProcessRoleFilter;
-import org.eclipse.epf.authoring.ui.filters.VariabilityProcessTaskFilter;
-import org.eclipse.epf.authoring.ui.filters.VariabilityProcessWorkProductFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.TeamProfile;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * Helper class to collect input data from users using dialog boxes
- * 
- * @author Phong Nguyen Le
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class DialogHelper {
-
-	private static List selectElementsFor(BreakdownElement e, IFilter filter,
-			MethodConfiguration config, String tabName) {
-		ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getShell(), filter, tabName, null,
-				config);
-		fd.setBlockOnOpen(true);
-		fd.setViewerSelectionSingle(false);
-		fd.setTitle(tabName);
-		fd.open();
-		return fd.getSelectedItems();
-	}
-
-	public static List selectTasksFor(Activity act, MethodConfiguration config) {
-		String tabName = FilterConstants.TASKS;
-		IFilter filter = new VariabilityProcessTaskFilter(config, null,
-				FilterConstants.TASKS, act);
-
-		return selectElementsFor(act, filter, config, tabName);
-	}
-
-	public static List selectElementsFor(Object object,
-			MethodConfiguration config, AdapterFactory adapterFactory) {
-		if (object instanceof Activity) {
-			if (adapterFactory == TngAdapterFactory.INSTANCE
-					.getWBS_ComposedAdapterFactory()) {
-				return selectTasksFor((Activity) object, config);
-			} else if (adapterFactory == TngAdapterFactory.INSTANCE
-					.getOBS_ComposedAdapterFactory()) {
-				String tabName = FilterConstants.ROLES;
-				IFilter filter = new VariabilityProcessRoleFilter(config, null,
-						FilterConstants.ROLES, (Activity) object);
-				return selectElementsFor((BreakdownElement) object, filter,
-						config, tabName);
-			} else if (adapterFactory == TngAdapterFactory.INSTANCE
-					.getPBS_ComposedAdapterFactory()) {
-				String tabName = FilterConstants.WORKPRODUCTS;
-				IFilter filter = new VariabilityProcessWorkProductFilter(
-						config, null, FilterConstants.WORKPRODUCTS,
-						(Activity) object);
-				return selectElementsFor((BreakdownElement) object, filter,
-						config, tabName);
-			}
-		}
-		if (object instanceof TeamProfile) {
-			if (adapterFactory == TngAdapterFactory.INSTANCE
-					.getOBS_ComposedAdapterFactory()) {
-				String tabName = FilterConstants.ROLES;
-				IFilter filter = new ProcessRoleFilter(config, null,
-						FilterConstants.ROLES);
-				return selectElementsFor((BreakdownElement) object, filter,
-						config, tabName);
-			}
-		}
-
-		return Collections.EMPTY_LIST;
-	}
-
-	public static List selectActivitiesFor(Activity act,
-			MethodConfiguration config, int command) {
-		// return null;
-		String tabName = FilterConstants.PROCESSES;
-		IFilter filter = new ProcessActivityFilter(config, null,
-				FilterConstants.PROCESSES, act, command);
-		List selection = selectElementsFor(act, filter, config, tabName);
-		ArrayList activities = new ArrayList();
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			if (element instanceof Activity) {
-				activities.add(element);
-			} else if (element instanceof ProcessComponent) {
-				Process proc = ((ProcessComponent) element).getProcess();
-				if (proc != null) {
-					activities.add(proc);
-				}
-			}
-		}
-		return activities;
-	}
-	
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/FilterSorter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/FilterSorter.java
deleted file mode 100755
index 62213d7..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/FilterSorter.java
+++ /dev/null
@@ -1,108 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.text.Collator;
-import java.util.Arrays;
-import java.util.Comparator;
-
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.jface.viewers.ContentViewer;
-import org.eclipse.jface.viewers.IBaseLabelProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-
-
-
-/**
- * A {@link ItemsFilterDialog} dialog viewer sorter to order the display for certain element and packages.
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class FilterSorter extends ViewerSorter {
-
-	public FilterSorter() {
-		super();
-	}
-
-	public int category(Object element) {
-		if (element instanceof ContentPackage)
-			return 0;
-		else
-			return 1;
-	}
-
-	/**
-	 * @param collator
-	 */
-	public FilterSorter(Collator collator) {
-		super(collator);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-	 */
-	public int compare(Viewer viewer, Object e1, Object e2) {
-
-		if (!(e1 instanceof ContentPackage) || !(e2 instanceof ContentPackage)) {
-			int cat1 = category(e1);
-			int cat2 = category(e2);
-
-			if (cat1 != cat2)
-				return cat1 - cat2;
-		}
-
-		if (e1 instanceof MethodPlugin && e2 instanceof MethodPlugin) {
-			return 0;
-		}
-
-		String name1;
-		String name2;
-
-		if (viewer == null || !(viewer instanceof ContentViewer)) {
-			name1 = e1.toString();
-			name2 = e2.toString();
-		} else {
-			IBaseLabelProvider prov = ((ContentViewer) viewer)
-					.getLabelProvider();
-			if (prov instanceof ILabelProvider) {
-				ILabelProvider lprov = (ILabelProvider) prov;
-				name1 = lprov.getText(e1);
-				name2 = lprov.getText(e2);
-			} else {
-				name1 = e1.toString();
-				name2 = e2.toString();
-			}
-		}
-		if (name1 == null)
-			name1 = "";//$NON-NLS-1$
-		if (name2 == null)
-			name2 = "";//$NON-NLS-1$
-		return collator.compare(name1, name2);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ViewerComparator#sort(org.eclipse.jface.viewers.Viewer, java.lang.Object[])
-	 */
-	public void sort(final Viewer viewer, Object[] elements) {
-		Arrays.sort(elements, new Comparator() {
-			public int compare(Object a, Object b) {
-				return FilterSorter.this.compare(viewer, a, b);
-			}
-		});
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/FilterSorterForAll.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/FilterSorterForAll.java
deleted file mode 100755
index 94a2a69..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/FilterSorterForAll.java
+++ /dev/null
@@ -1,102 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.text.Collator;
-import java.util.Arrays;
-import java.util.Comparator;
-
-import org.eclipse.epf.authoring.ui.filters.AllFilter;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.jface.viewers.ContentViewer;
-import org.eclipse.jface.viewers.IBaseLabelProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-
-
-/**
- * A Filter sorter for {@link ItemsFilterDialog} using {@link AllFilter}
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class FilterSorterForAll extends ViewerSorter {
-
-	public FilterSorterForAll() {
-		super();
-	}
-
-	/**
-	 * @param collator
-	 */
-	public FilterSorterForAll(Collator collator) {
-		super(collator);
-	}
-
-	public int category(Object element) {
-		if (element instanceof ContentPackage)
-			return 0;
-		else
-			return 1;
-	}
-
-	public int compare(Viewer viewer, Object e1, Object e2) {
-
-		if (!(e1 instanceof ContentPackage) || !(e2 instanceof ContentPackage)) {
-			int cat1 = category(e1);
-			int cat2 = category(e2);
-
-			if (cat1 != cat2)
-				return cat1 - cat2;
-		}
-
-		if (e1 instanceof MethodPlugin && e2 instanceof MethodPlugin) {
-			return 0;
-		}
-		if (!(e1 instanceof ContentElement) || !(e2 instanceof ContentElement)) {
-			return 0;
-		}
-
-		String name1;
-		String name2;
-
-		if (viewer == null || !(viewer instanceof ContentViewer)) {
-			name1 = e1.toString();
-			name2 = e2.toString();
-		} else {
-			IBaseLabelProvider prov = ((ContentViewer) viewer)
-					.getLabelProvider();
-			if (prov instanceof ILabelProvider) {
-				ILabelProvider lprov = (ILabelProvider) prov;
-				name1 = lprov.getText(e1);
-				name2 = lprov.getText(e2);
-			} else {
-				name1 = e1.toString();
-				name2 = e2.toString();
-			}
-		}
-		if (name1 == null)
-			name1 = "";//$NON-NLS-1$
-		if (name2 == null)
-			name2 = "";//$NON-NLS-1$
-		return collator.compare(name1, name2);
-	}
-
-	public void sort(final Viewer viewer, Object[] elements) {
-		Arrays.sort(elements, new Comparator() {
-			public int compare(Object a, Object b) {
-				return FilterSorterForAll.this.compare(viewer, a, b);
-			}
-		});
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/InputType.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/InputType.java
deleted file mode 100755
index 28cccbe..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/InputType.java
+++ /dev/null
@@ -1,24 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-/**
- * @author skannoor
- *
- */
-public final class InputType {
-	
-	public static int TEXT = 0;
-	public static int COMBO = 1;
-	public static int LIST = 2;
-	public static int TREE = 3;
-	
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ItemsFilterDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ItemsFilterDialog.java
deleted file mode 100755
index f53dad2..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/ItemsFilterDialog.java
+++ /dev/null
@@ -1,989 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.filters.DescriptorConfigurationFilter;
-import org.eclipse.epf.authoring.ui.filters.ExProcessAuthoringConfigurator;
-import org.eclipse.epf.authoring.ui.util.AuthoringAccessibleListener;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.configuration.ConfigurationFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.FilterHelper;
-import org.eclipse.epf.library.edit.itemsfilter.ICategoryFilter;
-import org.eclipse.epf.library.edit.itemsfilter.IProcessFilter;
-import org.eclipse.epf.library.edit.navigator.MethodPluginItemProvider;
-import org.eclipse.epf.library.edit.process.BreakdownElementItemProvider;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.util.MethodElementUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.NamedElement;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.DialogSettings;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.search.internal.core.text.PatternConstructor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.TreeItem;
-
-/**
- * Filter Dialog - allow the user to filter the content element, content
- * categories, custom categories, All types of contentelements based on location of the use of the filter
- * dialog.
- * 
- * @author Shashidhar Kannoori
- */
-public class ItemsFilterDialog extends Dialog implements
-		ISelectionChangedListener, IDoubleClickListener {
-
-	protected Button okButton, cancelButton;
-
-	protected Text ctrl_pattern, ctrl_brief_desc;
-
-	private String pattern, filterTypeStr;
-
-	protected Combo filterType;
-
-	private String dialogTitle, tabStr;
-
-	private Object contentElement;
-
-	private ArrayList selectedList = new ArrayList();
-
-	private boolean viewerSelectionSingle = false;
-	private String viewerLabel = null;
-	
-	/*
-	 * Treeviewer for ContentElements to display.
-	 */
-	private TreeViewer treeViewer;
-
-	protected IStructuredContentProvider contentProvider;
-
-	protected ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory()) {
-		public String getText(Object object) {
-			// return super.getText(object);
-			if (object instanceof VariabilityElement) {
-				return TngUtil.getLabel((VariabilityElement) object, "", true); //$NON-NLS-1$
-			} else if (object instanceof MethodPlugin) {
-				MethodPluginItemProvider methodPluginItemProvider = (MethodPluginItemProvider)TngUtil.getAdapter((MethodPlugin)object, MethodPluginItemProvider.class);
-				if (methodPluginItemProvider != null) {
-					return methodPluginItemProvider.getFullName(object);
-				}
-			} 
-			return super.getText(object);
-		}
-	};
-
-	private AdapterFactory adapterFactory;
-	private ComposedAdapterFactory composedAdapterFactory;
-
-	/*
-	 * Dialog Attributes
-	 */
-	// private boolean anyChilds = true;
-	private List alreadySelectedList = new ArrayList();
-
-	private IFilter filter;
-
-	Pattern regexPattern;
-
-	// private MethodConfiguration methodConfiguration;
-	protected FilterHelper helper;
-
-	private String STORE_EXPANDED_LEVEL_ID = ".LEVEL_ID"; //$NON-NLS-1$
-	private String PATTERN_ID = ".Pattern"; //$NON-NLS-1$
-	private String TYPE_ID = ".Type"; //$NON-NLS-1$
-
-	private String DIALOG_NAME;
-
-	private Button expandButton;
-
-	private Button collapseButton;
-
-	private Object input;
-
-	private String[] types;
-
-	/**
-	 * Constructs a new FilterDialog. This constructor will use filter based on
-	 * tabStr, filters out the list of elements based on already existing
-	 * selected element in the selected table. Initializes the ContentProvider
-	 * for the treeviewer.
-	 * 
-	 */
-	public ItemsFilterDialog(Shell parentShell, Object contentElement,
-			String tabStr, List alreadyExists) {
-		super(parentShell);
-		this.contentElement = contentElement;
-		this.tabStr = tabStr;
-		this.filter = null;
-		this.alreadySelectedList = alreadyExists;
-		helper = new FilterHelper(contentElement, tabStr, null, null,
-				this.alreadySelectedList);
-		initProviderForTabs();
-	}
-
-	public ItemsFilterDialog(Shell parentShell, IFilter filter, String tabStr,
-			List alreadyExists, Object input) {
-		this(parentShell, filter, null, tabStr, alreadyExists);
-		this.input = input;
-	}
-
-	/**
-	 * Constructs a new FilterDialog. This constructor will use passed filter.
-	 * tabStr is used for the searchtype only. Initializes the ContentProvider
-	 * for the treeviewer.
-	 * 
-	 */
-	public ItemsFilterDialog(Shell parentShell, IFilter filter,
-			Object contentElement, String tabStr) {
-		super(parentShell);
-		this.filter = filter;
-		this.tabStr = tabStr;
-
-		helper = new FilterHelper(contentElement, tabStr, null, null, null);
-		initProviderForTabs();
-	}
-
-	/**
-	 * Constructs a new FilterDialog. This constructor will use passed filter.
-	 * tabStr is used for the searchtype only. Initializes the ContentProvider
-	 * for the treeviewer.
-	 * 
-	 */
-	public ItemsFilterDialog(Shell parentShell, IFilter filter,
-			Object contentElement, String tabStr, List alreadyExists) {
-		super(parentShell);
-		this.filter = filter;
-		this.tabStr = tabStr;
-		this.alreadySelectedList = alreadyExists;
-		helper = new FilterHelper(contentElement, tabStr, null, null,
-				alreadyExists);
-		this.contentElement = contentElement;
-		initProviderForTabs();
-	}
-
-	/**
-	 * Constructs a new FilterDialog. Only for methodconfiguration. This
-	 * constructor will use passed filter. Initializes the ContentProvider for
-	 * the treeviewer.
-	 * 
-	 */
-	// public ItemsFilterDialog(Shell parentShell, Object contentElement,
-	// MethodConfiguration methodConfiguration, String tabStr) {
-	// super(parentShell);
-	// this.contentElement = contentElement;
-	// this.tabStr = tabStr;
-	// this.filter = null;
-	// this.methodConfiguration = methodConfiguration;
-	// helper = new FilterHelper(contentElement, tabStr, null, null, null);
-	// initProviderForTabs();
-	// }
-	/**
-	 * This constructor is very generic, in order to initialize filter, input
-	 * and contentprovider should be handled explicitly by calling below method.
-	 * setFilter(IFilter) setInput(Object)
-	 * setContentProvider(IStructuredProvider)
-	 * 
-	 */
-	public ItemsFilterDialog(Shell parentShell) {
-		super(parentShell);
-		helper = new FilterHelper(null, null, null, null, null);
-	}
-
-	/**
-	 * This method is called if a button has been pressed.
-	 */
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.OK_ID)
-			saveValues();
-		super.buttonPressed(buttonId);
-		if(composedAdapterFactory != null){
-			composedAdapterFactory.dispose();
-		}
-
-	}
-
-	/**
-	 * Notifies that the cancel button of this dialog has been pressed.
-	 */
-	protected void cancelPressed() {
-		super.cancelPressed();
-		if(composedAdapterFactory != null){
-			composedAdapterFactory.dispose();
-		}
-	}
-
-	/**
-	 * Set title for dialog box eg: Select Dialog For Role, dialogTitle needs to
-	 * "Role"
-	 */
-	public void setTitle(String dialogTitle) {
-		this.dialogTitle = dialogTitle;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		if (dialogTitle == null)
-			dialogTitle = tabStr;
-		shell.setText(AuthoringUIResources.FilterDialog_title + dialogTitle); //$NON-NLS-1$
-	}
-
-	/**
-	 * (non-Javadoc) Adds buttons to this dialog's button bar.
-	 * 
-	 * @param parent
-	 *            the button bar composite
-	 * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		super.createButtonsForButtonBar(parent);
-	}
-
-	/**
-	 * Creates dialog area and controls and viewer.
-	 * 
-	 * @param the
-	 *            parent composite to contain the dialog area
-	 * @return the dialog area control
-	 */
-	protected Control createDialogArea(Composite parent) {
-
-		Composite composite = (Composite) super.createDialogArea(parent);
-		composite.setFont(parent.getFont());
-
-		GridLayout layout = (GridLayout) composite.getLayout();
-		layout.marginWidth = 10;
-		layout.marginHeight = 10;
-		GridData gD = (GridData) composite.getLayoutData();
-		layout.numColumns = 3;
-
-		Label typeLabel = new Label(composite, SWT.NONE);
-		{
-			typeLabel.setText(AuthoringUIResources.FilterDialog_Type_text); //$NON-NLS-1$
-			GridData gD1 = new GridData(GridData.BEGINNING);
-			typeLabel.setLayoutData(gD1);
-
-		}
-		filterType = new Combo(composite, SWT.SINGLE | SWT.READ_ONLY);
-		{
-			GridData gD1 = new GridData(GridData.BEGINNING);
-			gD1.horizontalSpan = 2;
-			gD1.widthHint = 390;
-			filterType.setLayoutData(gD1);
-		}
-
-		if (types == null) {
-			fillFilterTypeCombo();
-		} else {
-			filterType.setItems(types);
-			if (helper != null) {
-				filterTypeStr = filterType.getItem(0);
-				helper.setFilterTypeStr(filterType.getItem(0));
-				if (tabStr == null) {
-					tabStr = filterTypeStr;
-					helper.setTabStr(tabStr);
-				}
-			}
-		}
-		filterType.select(0);
-
-		Label ctrl_patternLabel = new Label(composite, SWT.NONE);
-		{
-			ctrl_patternLabel.setText(AuthoringUIResources.FilterDialog_Pattern_text); //$NON-NLS-1$
-			gD.horizontalSpan = 3;
-			ctrl_patternLabel.setLayoutData(gD);
-		}
-
-		ctrl_pattern = new Text(composite, SWT.BORDER);
-		{
-			GridData gD1 = new GridData(GridData.FILL_HORIZONTAL);
-			gD1.horizontalSpan = 3;
-			ctrl_pattern.setLayoutData(gD1);
-			ctrl_pattern.getAccessible().addAccessibleListener(
-					new AuthoringAccessibleListener(
-							AuthoringUIResources.FilterDialog_Pattern_text +  
-							AuthoringUIResources.FilterDialog_Pattern_description));
-		}
-		Label ctrl_patternLabel1 = new Label(composite, SWT.NONE);
-		{
-			ctrl_patternLabel1.setText(AuthoringUIResources.FilterDialog_Pattern_description); //$NON-NLS-1$
-			ctrl_patternLabel1.setLayoutData(gD);
-		}
-		
-		Composite buttonsComposite = new Composite(composite, SWT.NONE);		
-		
-		GridData gd2 = new GridData(GridData.FILL_HORIZONTAL
-			| GridData.HORIZONTAL_ALIGN_END);
-		gd2.horizontalSpan = 2;
-		buttonsComposite.setLayoutData(gd2);
-		GridLayout buttonsLayout = new GridLayout();
-		buttonsLayout.numColumns = 2;
-		buttonsLayout.marginRight = 0;
-		buttonsComposite.setLayout(buttonsLayout);
-		
-		expandButton = new Button(buttonsComposite, SWT.BUTTON1);
-
-		expandButton.setImage(AuthoringUIPlugin.getDefault().getSharedImage(
-				"expandall.gif")); //$NON-NLS-1$
-		expandButton.setToolTipText(AuthoringUIResources.FilterDialog_ExpandAll); //$NON-NLS-1$
-		
-		expandButton.getAccessible().addAccessibleListener(new AuthoringAccessibleListener(
-						AuthoringUIResources.FilterDialog_ExpandAll));		
-
-		gd2 = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING
-				| GridData.GRAB_HORIZONTAL);
-
-		expandButton.setLayoutData(gd2);
-
-		collapseButton = new Button(buttonsComposite, SWT.PUSH);
-		collapseButton.setImage(AuthoringUIPlugin.getDefault().getSharedImage(
-				"collapseall.gif")); //$NON-NLS-1$
-
-		collapseButton.setToolTipText(AuthoringUIResources.FilterDialog_CollapseAll); //$NON-NLS-1$
-		collapseButton.getAccessible().addAccessibleListener(new AuthoringAccessibleListener(
-				AuthoringUIResources.FilterDialog_CollapseAll));
-		
-		gd2 = new GridData(GridData.HORIZONTAL_ALIGN_END);
-
-		collapseButton.setLayoutData(gd2);
-		
-		createLine(composite, 3);
-		createViewerLabel(composite);
-		// create a treeviewer area.
-		createViewer(composite);
-
-		restoreLastSettings();
-
-		new Label(composite, SWT.NONE).setText(AuthoringUIResources.FilterDialog_BriefDescription); //$NON-NLS-1$
-		ctrl_brief_desc = new Text(composite, SWT.BORDER | SWT.MULTI | SWT.WRAP
-				| SWT.V_SCROLL | SWT.READ_ONLY);
-		{
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 3;
-			gd.heightHint = 60;
-			ctrl_brief_desc.setLayoutData(gd);
-		}
-		// Restore the last state
-		createLine(composite, 3);
-
-		// Return results.
-		addListener();
-		return composite;
-	}
-
-	/**
-	 * Create a new viewer in the parent.
-	 * 
-	 * @param parent
-	 *            the parent <code>Composite</code>.
-	 */
-	private void createViewer(Composite parent) {
-		if (viewerSelectionSingle) {
-			treeViewer = new TreeViewer(parent, SWT.SINGLE | SWT.H_SCROLL
-					| SWT.V_SCROLL | SWT.BORDER);
-		} else {
-			treeViewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL
-					| SWT.V_SCROLL | SWT.BORDER);
-		}
-		treeViewer.setLabelProvider(labelProvider);
-		treeViewer.setContentProvider(contentProvider);
-		treeViewer.setUseHashlookup(true);
-
-		// Set the input to treeViewer
-		treeViewer.setInput(getInput());
-
-		treeViewer.addSelectionChangedListener(this);
-		treeViewer.addDoubleClickListener(this);
-		treeViewer.getTree().setFont(parent.getFont());
-
-		if (tabStr.equalsIgnoreCase(FilterConstants.ALL_ELEMENTS)) { //$NON-NLS-1$
-			treeViewer.setSorter(new FilterSorterForAll());
-		} else {
-			treeViewer.setSorter(new FilterSorter());
-		}
-
-		GridData spec = new GridData(GridData.FILL_BOTH);
-		{
-			spec.widthHint = 300;
-			spec.heightHint = 300;
-			spec.horizontalSpan = 3;
-			treeViewer.getControl().setLayoutData(spec);
-		}
-	}
-
-	/**
-	 * Returns input if externally set by setInput invoker.
-	 * Else, calculates the input based on the Object set to the dialog.
-	 */
-	private Object getInput(){
-		if(input != null){
-			return input;
-		}else{
-			if (contentElement != null) {
-				if (contentElement instanceof Process) {
-						Process process = (Process)contentElement;
-						if (process.eContainer() instanceof ProcessComponent) {
-							if (!(tabStr.equals(FilterConstants.GUIDANCE)
-									|| tabStr.equals(FilterConstants.ROADMAP) 
-									|| tabStr.equals(FilterConstants.SUPPORTING_MATERIALS))) {
-							return process.eContainer();
-						} else
-							return process;
-						}
-				} 
-				return UmaUtil.getMethodLibrary((EObject) contentElement);
-			} 
-			return LibraryService.getInstance().getCurrentMethodLibrary();
-		}
-	}
-	
-	private void createLine(Composite parent, int ncol) {
-		Label line = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL
-				| SWT.BOLD);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = ncol;
-		line.setLayoutData(gridData);
-	}
-
-	private void createViewerLabel(Composite parent) {
-   		if (viewerLabel != null) {
-   			Label label = new Label(parent, SWT.NONE);
-			label.setText(viewerLabel);
-   		}
-   	}
-	
-	public void setViewerSelectionSingle(boolean single) {
-		viewerSelectionSingle = single;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
-	 */
-	public void doubleClick(DoubleClickEvent event) {
-		IStructuredSelection s = (IStructuredSelection) event.getSelection();
-		Object element = s.getFirstElement();
-		element = LibraryUtil.unwrap(element);
-		if (element instanceof ContentElement || element instanceof Process
-				|| element instanceof ProcessComponent
-				|| element instanceof BreakdownElement
-				|| element instanceof ProcessPackage) {
-			selectedList.add(element);
-		} 
-		saveLastSettings();
-		close();
-		if(composedAdapterFactory != null){
-			composedAdapterFactory.dispose();
-		}
-	}
-
-	/**
-	 * Return the dialog store to cache values into
-	 */
-	protected IDialogSettings getDialogSettings() {
-		DialogSettings dialogSettings = (DialogSettings) AuthoringUIPlugin
-				.getDefault().getDialogSettings();
-		DialogSettings section = (DialogSettings) dialogSettings
-				.getSection(DIALOG_NAME + STORE_EXPANDED_LEVEL_ID);
-		if (section == null)
-			section = (DialogSettings) dialogSettings.addNewSection(DIALOG_NAME
-					+ STORE_EXPANDED_LEVEL_ID);
-		return section;
-	}
-
-	/**
-	 * Use the dialog settings to restore widget values to the values that they
-	 * held last time this dialog was used to completion.
-	 */
-	protected void restoreLastSettings() {
-		DIALOG_NAME = tabStr;
-		DialogSettings dialogSettings = (DialogSettings) getDialogSettings();
-		String temp = dialogSettings.get(DIALOG_NAME + PATTERN_ID); 
-		if (temp != null && temp.length() > 0) { 
-			pattern = dialogSettings.get(DIALOG_NAME + PATTERN_ID); 
-			filterTypeStr = dialogSettings.get(DIALOG_NAME + TYPE_ID); 
-			filterType.setText(filterTypeStr);
-			regexPattern = getRegEx(pattern);
-			
-			//Trim "*" from pattern string before display. This action is just for display.
-//			if(pattern != null){
-//				if(pattern.lastIndexOf(FilterConstants.ANY_STRING) 
-//						== pattern.length()-1){
-//					pattern = pattern.substring(0, pattern.length()-1);
-//				}
-//			}
-			ctrl_pattern.setText(pattern);
-			
-			if (helper != null) {
-				helper.setPattern(pattern);
-				helper.setRegexPattern(regexPattern);
-				helper.setFilterTypeStr(filterTypeStr);
-			}
-			initProviderForTabs();
-
-		}
-		List elements = (List) FilterConstants.hashMap.get(DIALOG_NAME
-				+ STORE_EXPANDED_LEVEL_ID);
-		if (elements == null || elements.isEmpty()) {
-			treeViewer.expandAll();
-			return;
-		}
-
-		if (elements != null && !elements.isEmpty()) {
-			try {
-				treeViewer.setExpandedElements(elements.toArray());
-				treeViewer.refresh();
-			} catch (Exception e) {
-				treeViewer.expandAll();
-			}
-		}
-
-	}
-
-	public void traverseTree(TreeItem[] items, List list) {
-		for (int i = 0; i < items.length; i++) {
-			TreeItem[] itemsx = items[i].getItems();
-			if (itemsx.length > 1) {
-				list.add(items[i].getData());
-				traverseTree(itemsx, list);
-			} else {
-				list.add(items[i].getData());
-			}
-		}
-	}
-
-	/**
-	 * Since OK was pressed, write widget values to the dialog store so that
-	 * they will persist into the next invocation of this dialog
-	 */
-	protected void saveValues() {
-		IStructuredSelection selection = (IStructuredSelection) treeViewer
-				.getSelection();
-		if (selection.size() > 0) {
-			Object[] objectArr = selection.toArray();
-			for (int i = 0; i < objectArr.length; i++) {
-				Object obj = LibraryUtil.unwrap(objectArr[i]);
-				if (obj instanceof ContentElement 
-						|| obj instanceof Process 
-						|| obj instanceof ProcessComponent
-						|| obj instanceof BreakdownElement
-						|| obj instanceof ProcessPackage) {
-					selectedList.add(obj);
-				} 
-			}
-		}
-		saveLastSettings();
-	}
-
-	/**
-	 * Saves the last settings of dialog.
-	 */
-	public void saveLastSettings() {
-
-		// eclipse docs forIDialogSettings for understanding.
-		IDialogSettings settings = getDialogSettings();
-		DIALOG_NAME = tabStr;
-		Object[] expandedElements = treeViewer.getExpandedElements();
-		List expandList = new ArrayList();
-		// String[] expandedCategoryIds = new String[expandedElements.length];
-		for (int i = 0; i < expandedElements.length; i++) {
-			Object obj = expandedElements[i];
-			if (obj instanceof NamedElement) {
-				expandList.add(expandedElements[i]);
-			}
-		}
-		settings.put(DIALOG_NAME + PATTERN_ID, pattern);
-		settings.put(DIALOG_NAME + TYPE_ID, filterTypeStr);
-		FilterConstants.hashMap.put(DIALOG_NAME + STORE_EXPANDED_LEVEL_ID,
-				expandList);
-	}
-
-	/**
-	 * Notifies that the selection has changed.
-	 * 
-	 * @param event
-	 *            event object describing the change
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		updateSelection(event);
-		updateButtons();
-	}
-
-	/**
-	 * Update the button enablement state.
-	 */
-	protected void updateButtons() {
-		// okButton.setEnabled(getSelection().length > 0);
-	}
-
-	public Object getParentObject(Object contentElement) {
-		return MethodElementUtil.getMethodModel(contentElement);
-	}
-
-	/**
-	 * Update the selection object.
-	 */
-	protected void updateSelection(SelectionChangedEvent event) {
-		// ArrayList descs = new ArrayList();
-		IStructuredSelection sel = (IStructuredSelection) event.getSelection();
-		Object selected = sel.getFirstElement();
-		if (selected instanceof BreakdownElementWrapperItemProvider ||
-				selected instanceof BreakdownElementItemProvider){
-			Object unwrap =  TngUtil.unwrap(selected);
-			setBriefDescription(unwrap);
-		}else {
-			setBriefDescription(selected);
-		}
-	}
-	/**
-	 * Set the brief description to control
-	 */
-	private void setBriefDescription(Object element) {
-		if (element instanceof MethodElement) {
-			String desc = ((MethodElement) element).getBriefDescription();
-			if (desc != null) {
-				ctrl_brief_desc.setText(desc);
-			}
-		}
-	}
-
-	public void fillFilterTypeCombo() {
-		if (filter instanceof ConfigurationFilter) {
-			String[] str = new String[1];
-			str[0] = (String) tabStr;
-			filterType.setItems(str);
-			filterTypeStr = str[0];
-		} else if (FilterConstants.categoryStrs.contains(tabStr)) {
-			String[] str = new String[2];
-			str[0] = (String) tabStr;
-			str[1] = FilterConstants.METHO_PLUGINS;
-			filterType.setItems(str);
-			filterTypeStr = str[0];
-		} else if (FilterConstants.CUSTOM_CATEGORIES.equalsIgnoreCase(tabStr)) {
-			String[] str = new String[2];
-			str[0] = (String) tabStr;
-			str[1] = FilterConstants.METHO_PLUGINS;
-			filterType.setItems(str);
-			filterTypeStr = str[0];
-		} else if (FilterConstants.breakdownElements.contains(tabStr)) {
-			String[] str = new String[1];
-			str[0] = (String) tabStr;
-			filterType.setItems(str);
-			filterTypeStr = str[0];
-		} else if (FilterConstants.contentElementStrs.contains(tabStr)) {
-			String[] str = new String[3];
-			str[0] = tabStr;
-			str[1] = FilterConstants.CONTENT_PACKAGES;
-			str[2] = FilterConstants.METHO_PLUGINS;
-			filterType.setItems(str);
-			filterTypeStr = str[0];
-		} else if (FilterConstants.ALL_ELEMENTS.equals(tabStr)) {
-			String space = "-"; //$NON-NLS-1$
-			String[] str = new String[14];
-			int i = 0;
-			str[i++] = FilterConstants.ALL_ELEMENTS;
-			str[i++] = FilterConstants.CONTENT_PACKAGES;
-			str[i++] = space + FilterConstants.ROLES;
-			str[i++] = space + FilterConstants.TASKS;
-			str[i++] = space + FilterConstants.WORKPRODUCTS;
-			str[i++] = space + FilterConstants.GUIDANCE;
-			str[i++] = FilterConstants.DISCIPLINES;
-			str[i++] = FilterConstants.ROLESETS;
-			str[i++] = FilterConstants.WORKPRODUCTTYPES;
-			str[i++] = FilterConstants.DOMAINS;
-			str[i++] = FilterConstants.TOOLS;
-			str[i++] = FilterConstants.CUSTOM_CATEGORIES;
-			str[i++] = FilterConstants.PROCESSES;
-			str[i++] = FilterConstants.METHO_PLUGINS;
-			filterType.setItems(str);
-			filterTypeStr = str[0];
-		} else if (FilterConstants.CONFIG_CONTENT_ELEMENT.equals(tabStr)) {
-			String[] str = new String[1];
-			str[0] = (String) tabStr;
-			filterType.setItems(str);
-			filterTypeStr = str[0];
-		} else {
-			String[] str = new String[1];
-			str[0] = (String) tabStr;
-			filterType.setItems(str);
-			filterTypeStr = str[0];
-		}
-
-	}
-
-	public long timer = 3;
-	public long lasttimer = System.currentTimeMillis();
-	
-	public void addListener() {
-		ctrl_pattern.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				
-				// Set timer
-				long currenttimer = System.currentTimeMillis();
-				if(lasttimer+timer > currenttimer){
-					return;
-				}else{
-					lasttimer  = currenttimer;
-				}
-				
-				treeViewer.getTree().clearAll(true);
-				if (ctrl_pattern.getText() != null
-						&& ctrl_pattern.getText().trim().length() > 0) {
-					pattern = ctrl_pattern.getText().trim();
-//					if(pattern.indexOf(FilterConstants.ANY_STRING)> -1 
-//							|| pattern.indexOf(FilterConstants.ANY_CHARACTER) > -1){
-//						
-//					}else{
-//						pattern = pattern+FilterConstants.ANY_STRING;
-//					}
-				} else {
-					pattern = FilterConstants.ANY_STRING;
-					//return;
-				}
-				regexPattern = getRegEx(pattern);
-				if (helper != null) {
-					helper.setPattern(pattern);
-					helper.setRegexPattern(regexPattern);
-					helper.setFilterTypeStr(filterTypeStr);
-					helper.setTabStr(filterTypeStr);
-				}
-				refreshTreeViewer();
-			}
-		});
-
-		filterType.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				// updateFontList();
-				if (filterType.getSelectionIndex() > -1) {
-					filterTypeStr = filterType.getItem(filterType
-							.getSelectionIndex());
-				}
-				filterTypeStr.trim();
-				if (helper != null) {
-					helper.setPattern(pattern);
-					helper.setRegexPattern(regexPattern);
-					helper.setFilterTypeStr(filterTypeStr);
-					helper.setTabStr(filterTypeStr);
-				}
-				// initProviderForTabs();
-				refreshTreeViewer();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent selectionevent) {
-			}
-		});
-		expandButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {				
-				expandOrCollapse(true);
-			}
-		});
-		collapseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				expandOrCollapse(false);
-			}
-		});
-
-	}
-
-	public ArrayList getSelectedItems() {
-		return selectedList;
-	}
-
-	private void initProviderForTabs() {
-
-		if (filter != null) {
-			if (filter instanceof org.eclipse.epf.library.edit.itemsfilter.IFilter) {
-				if(filter instanceof ICategoryFilter){
-					// special handling for contentcategory.
-					// https://bugs.eclipse.org/bugs/show_bug.cgi?id=157452
-					helper.setContentCategoryTabStr(tabStr);
-				}
-				((org.eclipse.epf.library.edit.itemsfilter.IFilter) filter)
-						.setHelper(helper);
-			} else if (filter instanceof DescriptorConfigurationFilter) {
-				((DescriptorConfigurationFilter) filter).setHelper(helper);
-			}else if (filter instanceof ExProcessAuthoringConfigurator) {
-				((ExProcessAuthoringConfigurator) filter).setHelper(helper);
-			}
-		}
-		if (filter instanceof IProcessFilter) {
-			if (tabStr
-					.equalsIgnoreCase(FilterConstants.WORK_PRODUCT_DESCRIPTORS)) {
-				adapterFactory =TngAdapterFactory.INSTANCE.getPBSFilter_AdapterFactory(filter);
-				contentProvider = new AdapterFactoryContentProvider(
-						adapterFactory);
-				composedAdapterFactory = TngAdapterFactory.INSTANCE.getPBSFilter_ComposedAdapterFactory();
-				labelProvider = new AdapterFactoryLabelProvider(
-						TngAdapterFactory.INSTANCE
-								.getPBS_ComposedAdapterFactory());
-			} else if (tabStr
-					.equalsIgnoreCase(FilterConstants.ROLE_DESCRIPTORS)) {
-				adapterFactory = TngAdapterFactory.INSTANCE
-				.getOBSFilter_AdapterFactory(filter); 
-				contentProvider = new AdapterFactoryContentProvider(adapterFactory);
-				composedAdapterFactory = TngAdapterFactory.INSTANCE.getOBSFilter_ComposedAdapterFactory();
-				labelProvider = new AdapterFactoryLabelProvider(
-						TngAdapterFactory.INSTANCE
-								.getOBS_ComposedAdapterFactory());
-			}
-		} else {
-			adapterFactory = TngAdapterFactory.INSTANCE
-						.getItemsFilter_AdapterFactory(filter); 
-			contentProvider = new AdapterFactoryContentProvider(adapterFactory);
-			composedAdapterFactory = TngAdapterFactory.INSTANCE.getItemsFilter_ComposedAdapterFactory();
-		}
-	}
-
-	public void setExistingElements(List list) {
-		this.alreadySelectedList = list;
-		if (helper != null) {
-			helper.setAlreadySelectedList(list);
-		}
-	}
-
-	public FilterHelper getHelper() {
-		return this.helper;
-	}
-
-	public String[] getFilterTypeArray() {
-		return null;
-	}
-
-	/*
-	 * sets the ContentProvider used by TreeViewer.
-	 */
-	public void setContentProvider(IStructuredContentProvider contentProvider,
-			ComposedAdapterFactory composedAdapterFactory) {
-		this.contentProvider = contentProvider;
-		this.composedAdapterFactory = composedAdapterFactory;
-	}
-
-	/*
-	 * Passing String[] array fills the FilterType list in dropdown combo box.
-	 */
-	public void setTypes(String[] str) {
-		this.types = str;
-	}
-
-	/*
-	 * set the Filter.
-	 */
-	public void setFilter(IFilter filter) {
-		this.filter = filter;
-		if (helper != null) {
-			if (this.filter instanceof org.eclipse.epf.library.edit.itemsfilter.IFilter) {
-				((org.eclipse.epf.library.edit.itemsfilter.IFilter) this.filter)
-						.setHelper(helper);
-			} else if (this.filter instanceof DescriptorConfigurationFilter) {
-				((DescriptorConfigurationFilter) this.filter).setHelper(helper);
-			}
-		}
-	}
-
-	public void setInput(Object input) {
-		if (input != null) {
-			this.input = input;
-		}
-	}
-
-	public void setViewerLabel(String viewerLabel) {
-		this.viewerLabel = viewerLabel;
-	}
-	/*
-	 * 
-	 */
-	public void refreshTreeViewer(){
-		// To improve performance of filter, filter first and reset visible to
-		// true.This will avoid the flickering in UI at time of filtering
-		// elements in the tree structure
-		
-		treeViewer.getTree().clearAll(true);
-		treeViewer.getTree().setVisible(false);
-		treeViewer.refresh();
-		treeViewer.expandAll();
-		treeViewer.getTree().setVisible(true);
-	}
-	/*
-	 * 
-	 */
-	public void expandOrCollapse(boolean expand){
-		treeViewer.getTree().setVisible(false);
-		if(expand){
-			treeViewer.expandAll();
-		}else{
-			treeViewer.collapseAll();
-		}
-		treeViewer.getTree().setVisible(true);
-	}
-	
-	private Pattern getRegEx(String pattern){
-		try{
-			return PatternConstructor.createPattern(pattern, false, false);
-		}catch(Exception e){
-			return PatternConstructor.createPattern(FilterConstants.ANY_STRING, false, false); 
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/MethodAddImageDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/MethodAddImageDialog.java
deleted file mode 100755
index 4aeaf9f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/MethodAddImageDialog.java
+++ /dev/null
@@ -1,241 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.io.File;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.common.utils.NetUtil;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.richtext.dialogs.AddImageDialog;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-
-/**
- * Prompts the user to specify the image that will be used to create a HTML
- * <img> tag in the Rich Text Editor.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodAddImageDialog extends AddImageDialog {
-
-	private static final int MAX_HEIGHT = 600;
-
-	private static final int MAX_WIDTH = 600;
-
-	private static final int DEFAULT_HEIGHT = 200;
-
-	private static final int DEFAULT_WIDTH = 200;
-
-	private MethodElement methodElement;
-
-	private File fileToCopy;
-
-	private String url;
-
-	private int height = DEFAULT_HEIGHT;
-
-	private int width = DEFAULT_WIDTH;
-
-	private String altTag = ""; //$NON-NLS-1$
-
-	private Text heightText;
-
-	private Text widthText;
-
-	private Text altTagText;
-
-	private ModifyListener modifyListener = new ModifyListener() {
-		public void modifyText(ModifyEvent event) {
-			if (okButton != null) {
-				try {
-					url = urlText.getText().trim();
-					height = Integer.parseInt(heightText.getText().trim());
-					width = Integer.parseInt(widthText.getText().trim());
-					okButton.setEnabled(url.length() > 0 && height > 0
-							&& width > 0);
-				} catch (Exception e) {
-					okButton.setEnabled(false);
-				}
-			}
-		}
-	};
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param parent
-	 *            The parent shell.
-	 * @param methodElement
-	 *            A method element.
-	 */
-	public MethodAddImageDialog(Shell parent, MethodElement methodElement) {
-		super(parent);
-		this.methodElement = methodElement;
-	}
-
-	/**
-	 * @see org.eclipse.epf.richtext.dialogs.BaseDialog#createDialogArea(Composite
-	 *      parent)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite) super.createDialogArea(parent);
-
-		((GridLayout) composite.getLayout()).numColumns = 4;
-		((GridData) urlText.getLayoutData()).horizontalSpan = 2;
-
-		urlText.removeModifyListener(urlTextListener);
-		urlText.addModifyListener(modifyListener);
-
-		browseButton.removeSelectionListener(browseSelectionAdapter);
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				FileDialog dialog = new FileDialog(Display.getCurrent()
-						.getActiveShell(), SWT.OPEN);
-				dialog.setFilterPath(LibraryService.getInstance()
-						.getCurrentMethodLibraryPath()
-						+ File.separator
-						+ ResourceHelper.getElementPath(methodElement));
-				String attachFile = dialog.open();
-				if (attachFile != null && attachFile.length() > 0) {
-					try {
-						fileToCopy = new File(dialog.getFilterPath(), dialog
-								.getFileName());
-						url = "./" + ResourceHelper.getURLForAttachment(fileToCopy, methodElement, false); //$NON-NLS-1$
-						urlText.setText(url);
-
-						// Try to get the image info.
-						setImageInfo(fileToCopy.getAbsolutePath());
-					} catch (Exception e) {
-						logger.logError(e);
-					}
-				}
-			}
-		});
-
-		Label heightLabel = new Label(composite, SWT.NONE);
-		heightLabel.setText(AuthoringUIResources.heightLabel_text); //$NON-NLS-1$
-
-		heightText = new Text(composite, SWT.BORDER);
-		heightText.setLayoutData(new GridData());
-		heightText.setText("" + DEFAULT_HEIGHT); //$NON-NLS-1$
-		heightText.addModifyListener(modifyListener);
-
-		Label imageSizeLabel = new Label(composite, SWT.WRAP);
-		{
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.widthHint = 300;
-			gd.horizontalSpan = 2;
-			gd.verticalSpan = 2;
-			gd.horizontalIndent = 10;
-			imageSizeLabel.setLayoutData(gd);
-		}
-		imageSizeLabel.setText(AuthoringUIResources.imageSizeLabel_text); //$NON-NLS-1$
-
-		Label widthLabel = new Label(composite, SWT.NONE);
-		widthLabel.setText(AuthoringUIResources.widthLabel_text); //$NON-NLS-1$
-
-		widthText = new Text(composite, SWT.BORDER);
-		widthText.setLayoutData(new GridData());
-		widthText.setText("" + DEFAULT_WIDTH); //$NON-NLS-1$
-		widthText.addModifyListener(modifyListener);
-
-		Label altLabel = new Label(composite, SWT.NONE);
-		altLabel.setText(AuthoringUIResources.altTagLabel_text); //$NON-NLS-1$
-		altTagText = new Text(composite, SWT.BORDER);
-		{
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 3;
-			altTagText.setLayoutData(gd);
-		}
-		altTagText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent event) {
-				altTag = altTagText.getText().trim();
-			}
-		});
-
-		return composite;
-	}
-
-	/**
-	 * Returns the file to be copied to a resource folder.
-	 */
-	public File getFileToCopy() {
-		return fileToCopy;
-	}
-
-	private void setImageInfo(String imageName) {
-		File imageFile = new File(imageName);
-		if (imageFile.exists()) {
-			ImageData imageData = new ImageData(imageName);
-			heightText.setText(String.valueOf(imageData.height));
-			widthText.setText(String.valueOf(imageData.width));
-		} else {
-			heightText.setText(String.valueOf(DEFAULT_HEIGHT));
-			widthText.setText(String.valueOf(DEFAULT_WIDTH));
-		}
-	}
-
-	/**
-	 * Returns the image URL.
-	 */
-	public String getUrl() {
-		return url;
-	}
-
-	/**
-	 * Returns the image height.
-	 */
-	public int getHeight() {
-		return Math.min(MAX_HEIGHT, Math.max(10, height));
-	}
-
-	/**
-	 * Returns the image width.
-	 */
-	public int getWidth() {
-		return Math.min(MAX_WIDTH, Math.max(10, width));
-	}
-
-	/**
-	 * Returns the image ALT tag.
-	 */
-	public String getAltTag() {
-		return altTag;
-	}
-
-	/**
-	 * Called when the OK button is selected.
-	 */
-	protected void okPressed() {
-		url = NetUtil.encodeFileURL(url);
-		super.okPressed();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/MethodAddLinkDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/MethodAddLinkDialog.java
deleted file mode 100755
index be358be..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/MethodAddLinkDialog.java
+++ /dev/null
@@ -1,292 +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.authoring.ui.dialogs;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.AddLinkFilter;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.common.utils.NetUtil;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.richtext.RichTextEditor;
-import org.eclipse.epf.richtext.dialogs.AddLinkDialog;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Prompts the user to select a link type that will be used to create a HTML <a>
- * tag in the Rich Text Editor.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodAddLinkDialog extends AddLinkDialog {
-
-	private static final int LINK_URL = 0;
-
-	private static final int LINK_FILE = LINK_URL + 1;
-
-	// private static final int LINK_ELEMENT_LINK = LINK_URL + 2;
-
-	private static final int LINK_ELEMENT_LINK_WITH_TYPE = LINK_URL + 3;
-
-	private static final int LINK_ELEMENT_LINK_WITH_USER_TEXT = LINK_URL + 4;
-
-	private static final String[] ELEMENT_TYPE_LABELS = {
-			LibraryUIResources.linkToURL_name,
-			LibraryUIResources.linkToFile_name,
-			LibraryUIResources.elementLink_name,
-			LibraryUIResources.elementLinkWithType_name,
-			LibraryUIResources.elementLinkWithUserText_name };
-
-	private static final String OPEN_LINK_IN_NEW_WINDOW_ATTRIBUTE = "target=\"_blank\""; //$NON-NLS-1$
-
-	private IMethodRichText richText;
-
-	private MethodElement methodElement;
-
-	private Combo linkTypeCombo;
-
-	private Button browseButton;
-
-	private Button openLinkCheckbox;
-
-	private int linkType;
-
-	private boolean openLinkInNewWindow = true;
-
-	private File fileToCopy;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param parent
-	 *            The parent shell.
-	 * @param richText
-	 *            A rich text control.
-	 */
-	public MethodAddLinkDialog(Shell parent, IMethodRichText richText) {
-		super(parent, richText.getBasePath());
-		this.richText = richText;
-		this.methodElement = richText.getMethodElement();
-	}
-
-	/**
-	 * @see org.eclipse.epf.richtext.dialogs.BaseDialog#createDialogArea(Composite
-	 *      parent)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite) super.createDialogArea(parent);
-		GridLayout layout = (GridLayout) composite.getLayout();
-		layout.numColumns = 3;
-
-		Label linkTypeLabel = new Label(composite, SWT.NONE);
-		linkTypeLabel.setText(AuthoringUIResources.addLinkDialog_linkType);
-		linkTypeLabel.moveAbove(urlLabel);
-
-		linkTypeCombo = new Combo(composite, SWT.BORDER | SWT.READ_ONLY);
-		GridData comboGridData = new GridData(GridData.FILL_HORIZONTAL);
-		comboGridData.horizontalSpan = 2;
-		linkTypeCombo.setLayoutData(comboGridData);
-		linkTypeCombo.setItems(ELEMENT_TYPE_LABELS);
-		linkTypeCombo.setText(ELEMENT_TYPE_LABELS[0]);
-		linkTypeCombo.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				linkType = linkTypeCombo.getSelectionIndex();
-				browseButton.setEnabled(linkType != LINK_URL);
-				urlDisplayNameLabel.setEnabled(linkType == LINK_URL);
-				urlDisplayNameText.setEnabled(linkType == LINK_URL);
-				if (linkType == LINK_URL) {
-					urlDisplayNameText
-							.setText(richText.getSelected().getText());
-				} else {
-					urlDisplayNameText.setText(""); //$NON-NLS-1$
-				}
-				openLinkCheckbox.setEnabled(linkType == LINK_URL
-						|| linkType == LINK_FILE);
-				urlText.setText(""); //$NON-NLS-1$
-				if (linkType != LINK_FILE) {
-					fileToCopy = null;
-				}
-			}
-
-			public void widgetDefaultSelected(SelectionEvent event) {
-			}
-		});
-		linkTypeCombo.moveAbove(urlLabel);
-
-		browseButton = new Button(composite, SWT.PUSH);
-		browseButton.setLayoutData(new GridData());
-		browseButton.setText(AuthoringUIText.BROWSE_BUTTON_TEXT);
-		browseButton.setEnabled(false);
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				if (linkType == LINK_FILE) {
-					FileDialog dialog = new FileDialog(Display.getCurrent()
-							.getActiveShell(), SWT.OPEN);
-					dialog.setFilterPath(basePath);
-					String attachFile = dialog.open();
-					if (attachFile != null && attachFile.length() > 0) {
-						try {
-							fileToCopy = new File(dialog.getFilterPath(),
-									dialog.getFileName());
-							String path = ResourceHelper.getURLForAttachment(
-									fileToCopy, methodElement, false);
-							String url = "<a href=\""; //$NON-NLS-1$
-							if (Platform.getOS().equals(Platform.WS_WIN32)) {
-								url += NetUtil
-										.encodeFileURL(NetUtil.FILE_URI_PREFIX
-												+ path);
-							} else {
-								url += NetUtil.encodeFileURL("./" + path); //$NON-NLS-1$
-							}
-							url += "\"" + (openLinkInNewWindow ? " " + OPEN_LINK_IN_NEW_WINDOW_ATTRIBUTE : "") + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-									">" + fileToCopy.getName() + "</a>"; //$NON-NLS-1$ //$NON-NLS-2$
-							urlText.setText(url);
-						} catch (Exception e) {
-							logger.logError(e);
-						}
-					}
-				}
-				// MethodElement link
-				else {
-					IFilter filter = new AddLinkFilter() {
-						protected boolean childAccept(Object obj) {
-							if (obj instanceof MethodPlugin)
-								return true;
-							if (obj instanceof MethodConfiguration)
-								return false;
-							if(obj instanceof Milestone) return false;
-							return true;
-						}
-					};
-					ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-							.getWorkbench().getActiveWorkbenchWindow()
-							.getShell(), filter, methodElement,
-							FilterConstants.ALL_ELEMENTS);
-					fd.setBlockOnOpen(true);
-					fd.setTitle(FilterConstants.ALL_ELEMENTS);
-					fd.open();
-					ArrayList sel = fd.getSelectedItems();
-					if (sel.size() > 0) {
-						MethodElement selectedElement = (MethodElement) sel
-								.get(0);
-						String url = null;
-						String href = ResourceHelper.getUrl(selectedElement,
-								methodElement, "html"); //$NON-NLS-1$
-						if (linkType == LINK_ELEMENT_LINK_WITH_USER_TEXT) {
-							String linkName = ((RichTextEditor) richText)
-									.getSelected().getText();
-							if (linkName.trim().length() == 0)
-								linkName = selectedElement.getName();
-							url = ResourceHelper
-									.getElementLink(selectedElement, linkName,
-											"file://" + href); //$NON-NLS-1$
-						} else {
-							boolean withType = (linkType == LINK_ELEMENT_LINK_WITH_TYPE) ? true
-									: false;
-							url = ResourceHelper
-									.getElementLink(selectedElement, withType,
-											"file://" + href); //$NON-NLS-1$
-						}
-						urlText.setText(url);
-					}
-				}
-			}
-		});
-		browseButton.moveAbove(urlDisplayNameLabel);
-
-		openLinkCheckbox = new Button(composite, SWT.CHECK);
-		GridData checkBoxGridData = new GridData();
-		checkBoxGridData.horizontalSpan = 2;
-		openLinkCheckbox.setLayoutData(checkBoxGridData);
-		openLinkCheckbox.setText(AuthoringUIResources.openLinkCheckbox_text);
-		openLinkCheckbox.setSelection(true);
-		openLinkCheckbox.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				openLinkInNewWindow = openLinkCheckbox.getSelection();
-			}
-		});
-
-		urlDisplayNameText.setText(richText.getSelected().getText());
-
-		return composite;
-	}
-
-	/**
-	 * Returns the file to be copied to a resource folder.
-	 */
-	public File getFileToCopy() {
-		return fileToCopy;
-	}
-
-	/**
-	 * Returns <code>true</code> if the link should be opened in a new browser
-	 * window.
-	 */
-	public boolean getOpenLinkInNewWindow() {
-		return openLinkInNewWindow;
-	}
-
-	/**
-	 * Called when the OK button is selected.
-	 */
-	protected void okPressed() {
-		String url = urlText.getText();
-		if (url != null && url.length() > 0) {
-			if (linkType == LINK_URL) {
-				String urlDisplayName = urlDisplayNameText.getText();
-				if (urlDisplayName.trim().length() == 0) {
-					urlDisplayName = url;
-				}
-				String fullURL = "<a href=\"" + //$NON-NLS-1$
-						url
-						+ "\"" + //$NON-NLS-1$
-						(openLinkInNewWindow ? " " + OPEN_LINK_IN_NEW_WINDOW_ATTRIBUTE : "") + //$NON-NLS-1$ //$NON-NLS-2$
-						">" + urlDisplayName + "</a>"; //$NON-NLS-1$ //$NON-NLS-2$
-				link.setURL(fullURL);
-			} else {
-				link.setURL(url);
-			}
-		}
-
-		// Set widget text to blank so super.okPressed doesn't overwrite the
-		// above.
-		urlText.setText(""); //$NON-NLS-1$
-		super.okPressed();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/MoveDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/MoveDialog.java
deleted file mode 100755
index 7fea6d0..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/MoveDialog.java
+++ /dev/null
@@ -1,429 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.views.ViewHelper;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.TransientGroupItemProvider;
-import org.eclipse.epf.library.edit.category.StandardCategoriesItemProvider;
-import org.eclipse.epf.library.edit.command.MethodElementAddCommand.MoveOperation;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.edit.validation.DependencyChecker;
-import org.eclipse.epf.uma.Artifact;
-import org.eclipse.epf.uma.ContentCategory;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.wizard.ProgressMonitorPart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Dialog for moving MethodElement within MethodLibrary.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MoveDialog extends Dialog implements ISelectionChangedListener {
-
-	private TreeViewer treeViewer;
-
-	private Collection elements;
-
-	// private IStructuredSelection selection;
-
-	private boolean lockedUI = false;
-
-	// The progress monitor
-	private ProgressMonitorPart progressMonitorPart;
-
-	private EditingDomain editingDomain;
-
-	private Object destination;
-
-	private Cursor waitCursor;
-
-	private boolean moving;
-
-	public MoveDialog(Shell parentShell, Collection elementsToMove,
-			EditingDomain editingDomain) {
-		super(parentShell);
-		this.editingDomain = editingDomain;
-
-		// filter out the predefined elements to prevent them from getting moved
-		//
-		elements = new ArrayList();
-		for (Iterator iter = elementsToMove.iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			Object e = TngUtil.unwrap(element);
-			if (e instanceof MethodElement
-					&& TngUtil.isPredefined((MethodElement) e)) {
-				continue;
-			}
-			elements.add(element);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite) super.createDialogArea(parent);
-
-		GridLayout layout = (GridLayout) composite.getLayout();
-		layout.marginWidth = 10;
-		layout.marginHeight = 10;
-
-		Label label = new Label(composite, SWT.NONE);
-		label.setText(AuthoringUIResources.MoveDialog_destination_text); //$NON-NLS-1$
-		GridData layoutData = new GridData(SWT.BEGINNING);
-		label.setLayoutData(layoutData);
-
-		treeViewer = new TreeViewer(composite, SWT.SINGLE | SWT.H_SCROLL
-				| SWT.V_SCROLL | SWT.BORDER);
-		AdapterFactory adapterFactory = TngAdapterFactory.INSTANCE
-				.getNavigatorView_ComposedAdapterFactory();
-		treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(
-				adapterFactory));
-		treeViewer.setContentProvider(new AdapterFactoryContentProvider(
-				adapterFactory));
-		treeViewer.addSelectionChangedListener(this);
-		// treeViewer.addDoubleClickListener(this);
-
-		GridData spec = new GridData(GridData.FILL_BOTH);
-		{
-			spec.widthHint = 300;
-			spec.heightHint = 300;
-			treeViewer.getControl().setLayoutData(spec);
-		}
-
-		treeViewer.setInput(LibraryService.getInstance().getCurrentMethodLibrary());
-
-		// Insert a progress monitor
-		GridLayout pmlayout = new GridLayout();
-		pmlayout.numColumns = 1;
-		progressMonitorPart = createProgressMonitorPart(composite, pmlayout);
-		progressMonitorPart
-				.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		progressMonitorPart.setVisible(false);
-
-		waitCursor = parent.getShell().getDisplay().getSystemCursor(
-				SWT.CURSOR_WAIT);
-
-		return composite;
-	}
-
-	protected ProgressMonitorPart createProgressMonitorPart(
-			Composite composite, GridLayout pmlayout) {
-		return new ProgressMonitorPart(composite, pmlayout, SWT.DEFAULT) {
-			String currentTask = null;
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.wizard.ProgressMonitorPart#setBlocked(org.eclipse.core.runtime.IStatus)
-			 */
-			public void setBlocked(IStatus reason) {
-				super.setBlocked(reason);
-				if (!lockedUI)// Do not show blocked if we are locking the UI
-					getBlockedHandler().showBlocked(getShell(), this, reason,
-							currentTask);
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.wizard.ProgressMonitorPart#clearBlocked()
-			 */
-			public void clearBlocked() {
-				super.clearBlocked();
-				if (!lockedUI)// Do not vlear if we never set it
-					getBlockedHandler().clearBlocked();
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.wizard.ProgressMonitorPart#beginTask(java.lang.String,
-			 *      int)
-			 */
-			public void beginTask(String name, int totalWork) {
-				super.beginTask(name, totalWork);
-				currentTask = name;
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.wizard.ProgressMonitorPart#setTaskName(java.lang.String)
-			 */
-			public void setTaskName(String name) {
-				super.setTaskName(name);
-				currentTask = name;
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.wizard.ProgressMonitorPart#subTask(java.lang.String)
-			 */
-			public void subTask(String name) {
-				super.subTask(name);
-				// If we haven't got anything yet use this value for more
-				// context
-				if (currentTask == null)
-					currentTask = name;
-			}
-		};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.setText(AuthoringUIResources.MoveDialog_move_text); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		destination = TngUtil.unwrap(((IStructuredSelection) event
-				.getSelection()).getFirstElement());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		if (doMove()) {
-			super.okPressed();
-		}
-	}
-
-	private boolean isValidDestination() {
-		// preventing moving elements to category
-		//
-		if (destination instanceof ContentCategory) {
-			return false;
-		}
-
-		// do not allow moving into Standard Categories
-		if (destination instanceof StandardCategoriesItemProvider) {
-			return false;
-		}
-
-		// check containers for compatible types will not work if we want to move a sub-artifact
-		// to a content package
-		//
-		
-//		// do not allow move if destination is not the same type as every
-//		// elements' eContainer
-//		Object realDest = destination;
-//		if (destination instanceof TransientContentPackageItemProvider) {
-//			realDest = ((TransientContentPackageItemProvider) destination)
-//					.getTarget();
-//		}
-//		if (destination instanceof TransientGroupItemProvider) {
-//			realDest = ((TransientGroupItemProvider) destination).getTarget();
-//		}		
-//		try {
-//			for (Iterator iter = elements.iterator(); iter.hasNext();) {
-//				Object e = iter.next();
-//				if (e instanceof EObject) {
-//					if (!realDest.getClass().isInstance(
-//							((EObject) e).eContainer()))
-//						return false;
-//				}
-//			}
-//		} catch (Exception ex) {
-//			AuthoringUIPlugin.getDefault().getLogger().logError(ex);
-//			return false;
-//		}
-
-		if (DependencyChecker.newCheck) {
-			if (destination instanceof VariabilityElement) {
-				if (! DependencyChecker.checkCircularForMovingVariabilityElement
-						((VariabilityElement) destination, elements)) {
-					return false;
-				}
-			}			
-		}
-		// Sub Artifact circular check code
-		else if(destination instanceof Artifact){
-			return DependencyChecker.checkCircularForArtifacts((Artifact)destination, 
-					elements);
-		}		
-		
-		Command addCommand = AddCommand.create(editingDomain, destination,
-				null, elements);
-		boolean result;
-		try {
-			result = addCommand.canExecute();
-		}
-		finally {
-			addCommand.dispose();
-		}
-		if (!result) {
-			return false;
-		}
-
-		if (destination instanceof TransientGroupItemProvider) {
-			destination = ((TransientGroupItemProvider) destination)
-					.getTarget();
-		}
-
-		// IStatus status = UserInteractionHelper.checkModify((EObject)
-		// destination, getShell());
-		// if (status.isOK()) {
-		// return true;
-		// }
-		// else {
-		// AuthoringUIPlugin.getDefault().getMsgDialog().display(
-		// AuthoringUIResources.getString("AuthoringUIPlugin.moveDialog.title"),
-		// //$NON-NLS-1$
-		// status);
-		// return false;
-		// }
-
-		return true;
-	}
-
-	/**
-	 * @return
-	 */
-	private boolean doMove() {
-		if (destination == null) {
-			String title = AuthoringUIResources.errorDialog_title; //$NON-NLS-1$
-			String problem = AuthoringUIResources.MoveDialog_nomove_destination_problem_msg; //$NON-NLS-1$
-			String msg = AuthoringUIResources.MoveDialog_selectdestination_text; //$NON-NLS-1$
-			MsgDialog dialog = AuthoringUIPlugin.getDefault().getMsgDialog();
-			dialog.displayError(title, problem, msg); //$NON-NLS-1$
-			return false;
-		}
-		if (!isValidDestination()) {
-			String title = AuthoringUIResources.errorDialog_title; //$NON-NLS-1$
-			String problem = AuthoringUIResources.MoveDialog_invalid_move_destination_problem_msg; //$NON-NLS-1$
-			String msg = AuthoringUIResources.MoveDialog_validdestination_text; //$NON-NLS-1$
-			MsgDialog dialog = AuthoringUIPlugin.getDefault().getMsgDialog();
-			dialog.displayError(title, problem, msg); //$NON-NLS-1$
-			return false;
-		} else {
-			IStatus status = UserInteractionHelper.checkModify(
-					(EObject) destination, getShell());
-			if (!status.isOK()) {
-				String title = AuthoringUIResources.errorDialog_title; //$NON-NLS-1$
-				String msg = AuthoringUIResources.MoveDialog_cannotModifyDestination; //$NON-NLS-1$
-				MsgDialog dialog = AuthoringUIPlugin.getDefault()
-						.getMsgDialog();
-				dialog.displayError(title, msg, status); //$NON-NLS-1$
-				return false;
-			}
-		}
-
-		moving = true;
-		final Shell shell = getShell();
-		shell.setCursor(waitCursor);
-
-		getButton(IDialogConstants.OK_ID).setEnabled(false);
-		getButton(IDialogConstants.CANCEL_ID).setEnabled(false);
-		treeViewer.getControl().setEnabled(false);
-
-		progressMonitorPart.setVisible(true);
-		progressMonitorPart
-				.beginTask(
-						AuthoringUIResources.MoveDialog_moving_text, IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-		MoveOperation moveOp = null;
-		try {
-			// create command
-			//
-			Command command = AddCommand.create(editingDomain, destination,
-					null, elements);
-
-			moveOp = new MoveOperation(command, progressMonitorPart, shell);
-			moveOp.run();
-		} finally {
-			moving = false;
-			progressMonitorPart.done();
-
-			// clear cursor
-			if (shell != null && !shell.isDisposed()) {
-				shell.setCursor(null);
-			}
-		}
-
-		if (moveOp != null) {
-			IStatus status = moveOp.getStatus();
-			if (!status.isOK()) {
-				String title = AuthoringUIResources.dialogs_MoveDialog_errorTitle; //$NON-NLS-1$
-				String message = AuthoringUIResources.dialogs_MoveDialog_errorMessage; //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-						title, message, status);
-				if (moveOp.reloadNeeded()) {
-					ViewHelper.reloadCurrentLibrary(shell, null);
-				}
-			}
-		}
-
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#close()
-	 */
-	public boolean close() {
-		if (moving)
-			return false;
-		return super.close();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/OpenConfigDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/OpenConfigDialog.java
deleted file mode 100755
index 6ba04fe..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/OpenConfigDialog.java
+++ /dev/null
@@ -1,130 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Jinhua Xi
- * @since 1.0
- * @deprecated
- */
-public class OpenConfigDialog extends Dialog {
-	private static final String NEW_CONFIG_TEXT = AuthoringUIResources.OpenConfigDialognewconfig_text; //$NON-NLS-1$
-
-	// Combo combo_configs;
-	String seelctedName;
-
-	Button[] ctrl_configs = null;
-
-	Text ctrl_new_config = null;
-
-	public OpenConfigDialog(Shell parent) {
-		super(parent);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite area = (Composite) super.createDialogArea(parent);
-		final GridLayout gridLayout = new GridLayout();
-		area.setLayout(gridLayout);
-		{
-			Group g = new Group(area, SWT.NONE);
-			{
-				GridData gridData = new GridData(GridData.FILL_BOTH);
-				g.setLayoutData(gridData);
-				GridLayout layout = new GridLayout();
-				g.setLayout(layout);
-			}
-
-			String[] names = LibraryServiceUtil.getMethodConfigurationNames(
-					LibraryService.getInstance().getCurrentMethodLibrary());
-			if (names != null) {
-				ctrl_configs = new Button[names.length + 1];
-				for (int i = 0; i < ctrl_configs.length; i++) {
-					String name = NEW_CONFIG_TEXT;
-					if (i < names.length) {
-						name = names[i];
-					}
-					ctrl_configs[i] = new Button(g, SWT.RADIO);
-					ctrl_configs[i].setText(name);
-					{
-						GridData gridData = new GridData(
-								GridData.FILL_HORIZONTAL);
-						ctrl_configs[i].setLayoutData(gridData);
-					}
-				}
-			}
-
-			ctrl_new_config = new Text(g, SWT.BORDER);
-			{
-				GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-				gridData.horizontalIndent = 10;
-				ctrl_new_config.setLayoutData(gridData);
-			}
-
-			// set image and title
-			super
-					.getShell()
-					.setText(
-							AuthoringUIResources.OpenConfigDialogopenconfig_text); //$NON-NLS-1$
-		}
-
-		return area;
-	}
-
-	/**
-	 * Called when the OK button is selected.
-	 */
-	protected void okPressed() {
-		seelctedName = null;
-		for (int i = 0; i < ctrl_configs.length; i++) {
-			if (ctrl_configs[i].getSelection()) {
-				seelctedName = ctrl_configs[i].getText();
-				break;
-			}
-		}
-
-		if (seelctedName == null) {
-			return;
-		}
-
-		if (seelctedName.equals(NEW_CONFIG_TEXT)) {
-			seelctedName = ctrl_new_config.getText();
-		}
-
-		if (seelctedName == null || seelctedName.equals("")) { //$NON-NLS-1$
-			return;
-		}
-
-		super.okPressed();
-	}
-
-	public String getSelection() {
-		if (super.open() == Dialog.OK) {
-			return seelctedName;
-		} else {
-			return null;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/RenameFileConflictDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/RenameFileConflictDialog.java
deleted file mode 100755
index 2fa91fc..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/RenameFileConflictDialog.java
+++ /dev/null
@@ -1,281 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.io.File;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Opens dialog to attach ctrl_filepaths
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class RenameFileConflictDialog extends Dialog {
-
-	/**
-	 * The OK button.
-	 */
-	protected Button okButton;
-
-	/**
-	 * The Cancel button.
-	 */
-	protected Button cancelButton;
-
-	/**
-	 * The overwrite button
-	 */
-	protected Button overWriteButton;
-	/**
-	 * @param parent
-	 */
-
-	private Text ctrl_fileName;
-
-	private int OVER_WRITE_ID = 22;
-	private String messageStr;
-	private String fileName;
-	private Button button_replace;
-	private Button button_unique;
-	
-	private String destination;
-	/**
-	 * Creates an instance
-	 * @param parent
-	 */
-	public RenameFileConflictDialog(Shell parent) {
-		super(parent);
-	}
-
-	/**
-	 * @see Dialog#createDialogArea(Composite parent)
-	 */
-	protected Control createDialogArea(Composite parent) {
-
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
-		GridLayout layout = (GridLayout) dialogArea.getLayout();
-		layout.marginWidth = 10;
-		layout.marginHeight = 10;
-		GridData gridData = (GridData) dialogArea.getLayoutData();
-		gridData.verticalIndent = 10;
-		gridData.widthHint = 450;
-		layout.numColumns = 3;
-		
-		// Create message area.
-						
-		Image image = Display.getCurrent().getSystemImage(SWT.ICON_WARNING);
-		if (image != null) {
-            Label imageLabel = new Label(dialogArea, SWT.NULL);
-            image.setBackground(imageLabel.getBackground());
-            imageLabel.setImage(image);
-            imageLabel.setLayoutData(new GridData(
-                    GridData.HORIZONTAL_ALIGN_CENTER
-                            | GridData.VERTICAL_ALIGN_BEGINNING));
-        }
-		
-		Label message = new Label(dialogArea, SWT.WRAP);
-		if(messageStr != null){
-			message.setText(messageStr);
-		}
-		GridData data1 = new GridData(GridData.FILL_HORIZONTAL);
-		data1.horizontalSpan = 2;
-		message.setLayoutData(data1);
-		
-		Label empty = new Label(dialogArea, SWT.NONE); empty.setText("");
-		Label note = new Label(dialogArea, SWT.NONE);
-		note.setText(AuthoringUIResources.DescriptionFormPage_iconSection_fileNameConflict_note);
-		GridData data2 = new GridData(GridData.FILL_HORIZONTAL);
-		data2.horizontalSpan = 2;
-		note.setLayoutData(data2);
-		
-		empty = new Label(dialogArea, SWT.NONE); empty.setText("");
-		GridData data3 = new GridData(GridData.FILL_HORIZONTAL);
-		data3.horizontalSpan = 3;
-		data3.heightHint = 10;
-		empty.setLayoutData(data3);
-		
-		empty = new Label(dialogArea, SWT.NONE); empty.setText("");
-		Label selectAction = new Label(dialogArea, SWT.NONE);
-		selectAction.setText(AuthoringUIResources.DescriptionFormPage_iconSection_fileName_selectAction_label);
-		GridData data4 = new GridData(GridData.FILL_HORIZONTAL);
-		data4.horizontalSpan = 2;
-		selectAction.setLayoutData(data4);
-		
-		empty = new Label(dialogArea, SWT.NONE); empty.setText("");
-		button_replace = new Button(dialogArea, SWT.RADIO);
-		Label replace_label = new Label(dialogArea, SWT.NONE);
-		replace_label.setText(AuthoringUIResources.DescriptionFormPage_iconSection_fileName_replace_msg);
-		button_replace.setSelection(true);
-
-		empty = new Label(dialogArea, SWT.NONE);empty.setText("");
-		button_unique = new Button(dialogArea, SWT.RADIO);
-		Label uniqueLabel = new Label(dialogArea, SWT.NONE);
-		uniqueLabel.setText(AuthoringUIResources.DescriptionFormPage_iconSection_fileName_unique_msg);
-		button_unique.setSelection(false);
-		
-		//Create label area. -- TODO: find different way instead of empty labels.
-		empty = new Label(dialogArea, SWT.NONE);empty.setText("");
-		empty = new Label(dialogArea, SWT.NONE);empty.setText("");
-		ctrl_fileName = new Text(dialogArea, SWT.BORDER);
-		GridData gridData1 = new GridData(GridData.BEGINNING);
-		gridData1.widthHint = 200;
-		gridData1.verticalAlignment= GridData.VERTICAL_ALIGN_CENTER;
-		ctrl_fileName.setLayoutData(gridData1);
-		if(fileName != null){
-			ctrl_fileName.setText(fileName);
-			ctrl_fileName.setEnabled(false);
-		}
-		ctrl_fileName.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (okButton != null) {
-					okButton
-							.setEnabled(ctrl_fileName.getText().trim().length() > 0);
-				}
-				fileName = ctrl_fileName.getText();
-				File file = new File(destination+File.separator+fileName);
-				if(file.exists()){
-					okButton.setEnabled(false);
-				}else{
-					okButton.setEnabled(true);
-				}
-			}
-		});
-		
-		button_replace.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				ctrl_fileName.setEnabled(false);
-				okButton.setEnabled(true);
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		button_unique.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				ctrl_fileName.setEnabled(true);
-				fileName = ctrl_fileName.getText();
-				File file = new File(destination+File.separator+fileName);
-				if(file.exists()){
-					okButton.setEnabled(false);
-				}else{
-					okButton.setEnabled(true);
-				}
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		super
-				.getShell()
-				.setText(
-						AuthoringUIResources.DescriptionFormPage_iconSection_fileNameConflict_title); //$NON-NLS-1$
-
-		return dialogArea;
-
-	}
-
-	/**
-	 * Creates the dialog buttons.
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		// Create the OK button.
-//		createButton(parent, OVER_WRITE_ID, 
-//				AuthoringUIResources.DescriptionFormPage_iconSection_fileName_overWrite, true);
-		
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
-				true);
-
-		// Create the Cancel button.
-		createButton(parent, IDialogConstants.CANCEL_ID,
-				IDialogConstants.CANCEL_LABEL, false);
-
-		// Set help context for the OK button.
-		okButton = super.getButton(IDialogConstants.OK_ID);
-
-		// Set help context for the Cancel button.
-		cancelButton = super.getButton(IDialogConstants.CANCEL_ID);
-
-		//Set help context for the overwrite button
-//		overWriteButton = super.getButton(OVER_WRITE_ID);
-		
-//		okButton.setEnabled(false);
-	}
-
-	/**
-	 * Called when the OK button is selected.
-	 */
-	protected void okPressed() {
-		super.okPressed();
-	}
-
-	/**
-	 * Returns the File Name
-	 */
-	public String getFilePath() {
-		return fileName;
-	}
-	
-	public void setFilePath(String fileName){
-		this.fileName=fileName;
-	}
-	
-	@Override
-	protected Control createButtonBar(Composite parent) {
-		return super.createButtonBar(parent);
-	}
-	@Override
-	protected void buttonPressed(int buttonId) {
-		if(buttonId == OVER_WRITE_ID){
-			overWritePressed();
-		}
-		super.buttonPressed(buttonId);
-	}
-
-	private void overWritePressed() {
-		setReturnCode(OVER_WRITE_ID);
-		close();
-	}
-	@Override
-	protected void cancelPressed() {
-		fileName = null;
-		super.cancelPressed();
-	}
-
-	public String getMessageStr() {
-		return messageStr;
-	}
-
-	public void setMessageStr(String messageStr) {
-		this.messageStr = messageStr;
-	}
-	public void setDestiation(String destination){
-		this.destination = destination;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/SectionsOrderDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/SectionsOrderDialog.java
deleted file mode 100755
index 9f4d604..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/SectionsOrderDialog.java
+++ /dev/null
@@ -1,336 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.util.ArrayList;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.providers.VariabilityElementLabelProvider;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.command.MoveInSectionListCommand;
-import org.eclipse.epf.library.edit.util.SectionList;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.Step;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-
-
-/**
- * Dialog to order the {@link Step}s.
- * 
- */
-public class SectionsOrderDialog extends Dialog {
-
-	private Composite baseComposite;
-
-	private Button ctrl_up, ctrl_down;
-
-	private Table ctrl_steps;
-
-	private TableViewer stepsTableViewer;
-
-	private SectionList allSections;
-
-	private IStructuredContentProvider stepsViewerContentProvider;
-
-	private ILabelProvider stepsViewerLabelProvider;
-
-	// private Task contentElement;
-	private ContentElement contentElement;
-
-	private IActionManager actionManager;
-
-	private String title;
-
-	private String message;
-
-	private String label;
-
-	private ArrayList commands = new ArrayList();
-
-	/**
-	 * Creates a <code>AdvancedSearchDialog</code> giveb the parent control.
-	 * 
-	 * @param parent
-	 *            The parent control.
-	 */
-	public SectionsOrderDialog(Shell parent, ContentElement contentElement,
-			IActionManager actionManager, String title, String message,
-			String label) {
-		super(parent);
-		this.contentElement = contentElement;
-		this.actionManager = actionManager;
-		this.title = title;
-		this.message = message;
-		this.label = label;
-		allSections = null;
-	}
-
-	/**
-	 * @see Dialog#createDialogArea(Composite parent)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		baseComposite = (Composite) super.createDialogArea(parent);
-		final GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 4;
-		baseComposite.setLayout(gridLayout);
-		baseComposite.setLayoutData(new GridData());
-
-		createLabel(baseComposite, message, 4);
-
-		// Empty line
-		createLabel(baseComposite, " ", 4); //$NON-NLS-1$
-
-		createLabel(baseComposite, " ", 1); //$NON-NLS-1$
-		createLabel(baseComposite, label, 3);
-
-		createLabel(baseComposite, " ", 1); //$NON-NLS-1$
-		ctrl_steps = new Table(baseComposite, SWT.BORDER | SWT.MULTI);
-		{
-			GridData gridData = new GridData(GridData.FILL_BOTH);
-			gridData.horizontalSpan = 2;
-			gridData.widthHint = 300;
-			gridData.heightHint = 400;
-			ctrl_steps.setLayoutData(gridData);
-		}
-
-		initProviders();
-
-		stepsTableViewer = new TableViewer(ctrl_steps);
-		stepsTableViewer.setContentProvider(stepsViewerContentProvider);
-		stepsTableViewer.setLabelProvider(stepsViewerLabelProvider);
-
-		Composite orderButtonPane = new Composite(baseComposite, SWT.NULL);
-		{
-			GridData gridData = new GridData(GridData.VERTICAL_ALIGN_CENTER
-					| GridData.HORIZONTAL_ALIGN_CENTER);
-			gridData.horizontalSpan = 1;
-			orderButtonPane.setLayoutData(gridData);
-			orderButtonPane.setLayout(new GridLayout());
-		}
-
-		ctrl_up = createButton(orderButtonPane, AuthoringUIText.UP_BUTTON_TEXT);
-		ctrl_up.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		ctrl_down = createButton(orderButtonPane,
-				AuthoringUIText.DOWN_BUTTON_TEXT);
-		ctrl_down.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		ctrl_up.setEnabled(false);
-		ctrl_down.setEnabled(false);
-
-		// Empty line
-		createLabel(baseComposite, " ", 4); //$NON-NLS-1$
-
-		createLine(baseComposite, 4);
-
-		super.getShell().setText(title);
-
-		addListeners();
-		loadData();
-
-		return baseComposite;
-	}
-
-	private void createLine(Composite parent, int ncol) {
-		Label line = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL
-				| SWT.BOLD);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = ncol;
-		line.setLayoutData(gridData);
-	}
-
-	private Label createLabel(Composite parent, String text, int nCol) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(text);
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-			gridData.horizontalSpan = nCol;
-			label.setLayoutData(gridData);
-		}
-
-		return label;
-	}
-
-	private Button createButton(Composite parent, String label) {
-		Button button = new Button(parent, SWT.NONE);
-		button.setText(label);
-		return button;
-	}
-
-	/**
-	 * Creates the dialog buttons.
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		// Create the OK button.
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
-				true);
-
-		// Create the Cancel button.
-		createButton(parent, IDialogConstants.CANCEL_ID,
-				IDialogConstants.CANCEL_LABEL, false);
-	}
-
-	private void initProviders() {
-		stepsViewerContentProvider = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				if (allSections == null) {
-					allSections = new SectionList(contentElement,
-							SectionList.STEPS_FOR_ELEMENT_AND_PARENTS);
-				}
-				return allSections.toArray();
-			}
-		};
-
-		stepsViewerLabelProvider = new VariabilityElementLabelProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-
-			public boolean isExternal(Object element) {
-				return !contentElement.getPresentation().getSections()
-						.contains(element);
-			}
-
-		};
-	}
-
-	public void addListeners() {
-		stepsTableViewer
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-
-					public void selectionChanged(SelectionChangedEvent event) {
-						IStructuredSelection selection = (IStructuredSelection) stepsTableViewer
-								.getSelection();
-						if (selection.size() > 0
-								&& !TngUtil.isLocked(contentElement)) {
-							if (stepsTableViewer.getTable().getSelectionIndex() > 0
-									&& !TngUtil.isLocked(contentElement)
-									&& selection.size() == 1) {
-								ctrl_up.setEnabled(true);
-							} else
-								ctrl_up.setEnabled(false);
-
-							if (stepsTableViewer.getTable().getSelectionIndex() < stepsTableViewer
-									.getTable().getItemCount() - 1
-									&& !TngUtil.isLocked(contentElement)
-									&& selection.size() == 1) {
-								ctrl_down.setEnabled(true);
-							} else
-								ctrl_down.setEnabled(false);
-						}
-					}
-				});
-
-		ctrl_up.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) stepsTableViewer
-						.getSelection();
-
-				ArrayList moveUpItems = new ArrayList();
-				moveUpItems.addAll(selection.toList());
-				MoveInSectionListCommand cmd = new MoveInSectionListCommand(
-						contentElement, moveUpItems, allSections, 1);
-				actionManager.execute(cmd);
-				commands.add(cmd);
-
-				stepsTableViewer.refresh();
-
-				if (stepsTableViewer.getTable().getSelectionIndex() > 0
-						&& !TngUtil.isLocked(contentElement)) {
-					ctrl_up.setEnabled(true);
-				} else
-					ctrl_up.setEnabled(false);
-				if (stepsTableViewer.getTable().getSelectionIndex() < stepsTableViewer
-						.getTable().getItemCount() - 1
-						&& !TngUtil.isLocked(contentElement)) {
-					ctrl_down.setEnabled(true);
-				} else
-					ctrl_down.setEnabled(false);
-			}
-		});
-
-		ctrl_down.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) stepsTableViewer
-						.getSelection();
-				ArrayList moveDownItems = new ArrayList();
-				moveDownItems.addAll(selection.toList());
-				MoveInSectionListCommand cmd = new MoveInSectionListCommand(
-						contentElement, moveDownItems, allSections, 0);
-				actionManager.execute(cmd);
-				commands.add(cmd);
-
-				stepsTableViewer.refresh();
-
-				if (stepsTableViewer.getTable().getSelectionIndex() > 0
-						&& !TngUtil.isLocked(contentElement)) {
-					ctrl_up.setEnabled(true);
-				} else
-					ctrl_up.setEnabled(false);
-				if (stepsTableViewer.getTable().getSelectionIndex() < stepsTableViewer
-						.getTable().getItemCount() - 1
-						&& !TngUtil.isLocked(contentElement)) {
-					ctrl_down.setEnabled(true);
-				} else
-					ctrl_down.setEnabled(false);
-			}
-		});
-	}
-
-	/**
-	 * Load initial data from model
-	 */
-	private void loadData() {
-		stepsTableViewer.setInput(contentElement);
-	}
-
-	/**
-	 * Called when the OK button is selected.
-	 */
-	protected void okPressed() {
-		allSections.apply();
-		super.okPressed();
-	}
-
-	protected void cancelPressed() {
-		if (!commands.isEmpty()) {
-			for (int i = commands.size() - 1; i > -1; i--) {
-				Object cmd = commands.get(i);
-				if (cmd instanceof MoveInSectionListCommand) {
-					((MoveInSectionListCommand) cmd).undo();
-				}
-			}
-		}
-		super.cancelPressed();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/UncancelableListSelectionDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/UncancelableListSelectionDialog.java
deleted file mode 100755
index b499dc3..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/UncancelableListSelectionDialog.java
+++ /dev/null
@@ -1,34 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2004, 2005 IBM Corporation.  All Rights Reserved.
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-
-/**
- * This dialog extends jface ListSelectionDialog and removes cancel button
-  * 
- * @author Phong Nguyen Le
- * @since 1.1
- *
- */
-public class UncancelableListSelectionDialog extends ListSelectionDialog {
-
-	public UncancelableListSelectionDialog(Shell parentShell, Object input,
-            IStructuredContentProvider contentProvider,
-            ILabelProvider labelProvider, String message)
-	{
-		super(parentShell, input, contentProvider, labelProvider, message);
-	}
-	
-	protected void createButtonsForButtonBar(Composite parent) {
-        createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
-                true);
-       
-    }
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/UserDefinedDiagramDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/UserDefinedDiagramDialog.java
deleted file mode 100755
index 8fbeba4..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/UserDefinedDiagramDialog.java
+++ /dev/null
@@ -1,490 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditorInput;
-import org.eclipse.epf.authoring.ui.editors.ProcessEditor;
-import org.eclipse.epf.authoring.ui.filters.ProcessGuidanceFilter;
-import org.eclipse.epf.diagram.model.util.DiagramInfo;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.configuration.GuidanceItemProvider;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * Dialog to assign user defined diagram to process elements
- * 
- * @author Shilpa Toraskar
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class UserDefinedDiagramDialog extends Dialog {
-
-	private Button assignADImageButton, assignADDImageButton,
-			assignWPDImageButton;
-
-	private Button clearADImageButton, clearADDImageButton,
-			clearWPDImageButton;
-
-	private Button useADImageButton, useADDImageButton, useWPDImageButton;
-
-	private Text adImageText, addImageText, wpdImageText;
-
-	private IEditorPart editor;
-
-	private Activity activity;
-
-	private Composite area;
-
-	private final String tabName = FilterConstants.GUIDANCE;
-
-	private IFilter filter;
-
-	private SupportingMaterial activityDiagram, activityDetailDiagram,
-			wpdDiagram;
-
-	private static final int buttonWidthHint = 60;
-	
-	private Set existingList;
-	
-	private boolean isWrapped = false;
-
-	/**
-	 * Creates an instance
-	 * @param parent
-	 * @param editor
-	 * @param activity
-	 * @param config
-	 * @param isWrapped
-	 */
-	public UserDefinedDiagramDialog(Shell parent, IEditorPart editor,
-			Activity activity, MethodConfiguration config, boolean isWrapped) {
-		super(parent);
-
-		this.editor = editor;
-		this.isWrapped = isWrapped;
-		
-		this.activity = activity;
-		this.filter = new ProcessGuidanceFilter(config, null, tabName) {
-			public boolean childAccept(Object obj) {
-				if (super.childAccept(obj))
-					return true;
-				if (obj instanceof GuidanceItemProvider) {
-					String name = ((GuidanceItemProvider) obj).getText(obj);
-					if (name
-							.equalsIgnoreCase(FilterConstants.SUPPORTING_MATERIALS)
-							&& //$NON-NLS-1$
-							!((GuidanceItemProvider) obj).getChildren(obj)
-									.isEmpty())
-						return true;
-					else
-						return false;
-				}
-				if ((obj instanceof SupportingMaterial))
-					return true;
-				return false;
-			}
-		};
-		
-		existingList = new HashSet();
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		area = (Composite) super.createDialogArea(parent);
-		final GridLayout gridLayout = new GridLayout(4, false);
-		area.setLayout(gridLayout);
-
-		// Use AD Image for publishing
-		Label blankLabel = new Label(area, SWT.NONE);
-		blankLabel.setText(""); //$NON-NLS-1$
-
-		useADImageButton = new Button(area, SWT.CHECK);
-		useADImageButton.setText(AuthoringUIResources.UserDefinedDiagramDialog_useADImage); //$NON-NLS-1$
-		GridData buttonGD = new GridData(GridData.BEGINNING);
-		buttonGD.horizontalSpan = 3;
-		useADImageButton.setLayoutData(buttonGD);
-
-		// Assign activity diagram image
-		Label aLabel = new Label(area, SWT.NONE);
-		aLabel.setText(AuthoringUIResources.UserDefinedDiagramDialog_adImage); //$NON-NLS-1$
-
-		adImageText = new Text(area, SWT.BORDER | SWT.READ_ONLY);
-		GridData gd = new GridData(GridData.BEGINNING
-				| GridData.FILL_HORIZONTAL);
-		gd.widthHint = 300;
-		adImageText.setLayoutData(gd);
-
-		assignADImageButton = new Button(area, SWT.NONE);
-		assignADImageButton
-				.setText(AuthoringUIResources.UserDefinedDiagramDialog_assignButton); //$NON-NLS-1$
-		GridData buttonGridData = new GridData(GridData.BEGINNING
-				| GridData.FILL_HORIZONTAL);
-		buttonGridData.widthHint = buttonWidthHint;
-		assignADImageButton.setLayoutData(buttonGridData);
-
-		clearADImageButton = new Button(area, SWT.NONE);
-		clearADImageButton.setText(AuthoringUIResources.clearButton_text); //$NON-NLS-1$
-		clearADImageButton.setLayoutData(buttonGridData);
-
-		// Use ADD Image for publishing
-		blankLabel = new Label(area, SWT.NONE);
-		blankLabel.setText(""); //$NON-NLS-1$
-
-		useADDImageButton = new Button(area, SWT.CHECK);
-		useADDImageButton.setText(AuthoringUIResources.UserDefinedDiagramDialog_useADDImage); //$NON-NLS-1$
-		buttonGD = new GridData(GridData.BEGINNING);
-		buttonGD.horizontalSpan = 3;
-		useADDImageButton.setLayoutData(buttonGD);
-
-		// Assign activity detail diagram image
-		aLabel = new Label(area, SWT.NONE);
-		aLabel.setText(AuthoringUIResources.UserDefinedDiagramDialog_addImage); //$NON-NLS-1$
-
-		addImageText = new Text(area, SWT.BORDER | SWT.READ_ONLY);
-		addImageText.setLayoutData(gd);
-
-		assignADDImageButton = new Button(area, SWT.NONE);
-		assignADDImageButton
-				.setText(AuthoringUIResources.UserDefinedDiagramDialog_assignButton); //$NON-NLS-1$
-		assignADDImageButton.setLayoutData(buttonGridData);
-
-		clearADDImageButton = new Button(area, SWT.NONE);
-		clearADDImageButton.setText(AuthoringUIResources.clearButton_text); //$NON-NLS-1$
-		clearADDImageButton.setLayoutData(buttonGridData);
-
-		// Use WPD Image for publishing
-		blankLabel = new Label(area, SWT.NONE);
-		blankLabel.setText(""); //$NON-NLS-1$
-
-		useWPDImageButton = new Button(area, SWT.CHECK);
-		useWPDImageButton.setText(AuthoringUIResources.UserDefinedDiagramDialog_useWPDImage); //$NON-NLS-1$
-		buttonGD = new GridData(GridData.BEGINNING );
-		buttonGD.horizontalSpan = 3;
-		useWPDImageButton.setLayoutData(buttonGD);
-
-		// Assign work product dependency diagram image
-		aLabel = new Label(area, SWT.NONE);
-		aLabel.setText(AuthoringUIResources.UserDefinedDiagramDialog_wpdImage); //$NON-NLS-1$
-
-		wpdImageText = new Text(area, SWT.BORDER | SWT.READ_ONLY);
-		wpdImageText.setLayoutData(gd);
-
-		assignWPDImageButton = new Button(area, SWT.NONE);
-		assignWPDImageButton
-				.setText(AuthoringUIResources.UserDefinedDiagramDialog_assignButton); //$NON-NLS-1$
-		assignWPDImageButton.setLayoutData(buttonGridData);
-
-		clearWPDImageButton = new Button(area, SWT.NONE);
-		clearWPDImageButton.setText(AuthoringUIResources.clearButton_text); //$NON-NLS-1$
-		clearWPDImageButton.setLayoutData(buttonGridData);
-
-		// loadData
-		loadData();
-		
-		// disableControls
-		if (TngUtil.isLocked(activity) || isWrapped){
-			disableControls();
-		}
-
-		// add listeners
-		addListeners();
-
-		// set image and title
-		super
-				.getShell()
-				.setText(
-						AuthoringUIResources.UserDefinedDiagramDialog_title); //$NON-NLS-1$
-
-		return area;
-	}
-
-	/**
-	 * Disable controls
-	 *
-	 */
-	private void disableControls()
-	{
-		useADImageButton.setEnabled(false);
-		useADDImageButton.setEnabled(false);
-		useWPDImageButton.setEnabled(false);
-		
-		assignADImageButton.setEnabled(false);
-		assignADDImageButton.setEnabled(false);
-		assignWPDImageButton.setEnabled(false);
-		
-		clearADImageButton.setEnabled(false);
-		clearADDImageButton.setEnabled(false);
-		clearWPDImageButton.setEnabled(false);
-	}
-	
-	/**
-	 * Loads initial data
-	 *
-	 */
-	private void loadData() {		
-		//	 load existing supporting materials list
-		existingList.addAll(activity.getSupportingMaterials());
-
-		
-		DiagramInfo info = new DiagramInfo(activity);
-		if (info.getActivityDiagram() != null) {
-			adImageText.setText(TngUtil.getLabelWithPath(info
-					.getActivityDiagram()));
-			activityDiagram = info.getActivityDiagram();
-			
-			existingList.add(activityDiagram);
-		}
-		if (info.getActivityDetailDiagram() != null) {
-			addImageText.setText(TngUtil.getLabelWithPath(info
-					.getActivityDetailDiagram()));
-			activityDetailDiagram = info.getActivityDetailDiagram();
-			
-			existingList.add(activityDetailDiagram);
-		}
-		if (info.getWPDDiagram() != null) {
-			wpdImageText
-					.setText(TngUtil.getLabelWithPath(info.getWPDDiagram()));
-			wpdDiagram = info.getWPDDiagram();
-			
-			existingList.add(wpdDiagram);
-		}
-
-		useADImageButton.setSelection(info.canPublishADImage());
-		useADDImageButton.setSelection(info.canPublishADDImage());
-		useWPDImageButton.setSelection(info.canPublishWPDImage());
-	}
-
-	/**
-	 * Add listeners
-	 */
-	private void addListeners() {
-		assignADImageButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				try {
-					SupportingMaterial sm = openFilterDialog();
-					if (sm != null) {
-						activityDiagram = sm;
-						adImageText.setText(TngUtil.getLabelWithPath(sm));
-						existingList.add(activityDiagram);
-					}
-				} catch (Exception ex) {
-					ex.printStackTrace();
-				}
-			}
-		});
-
-		assignADDImageButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				try {
-					SupportingMaterial sm = openFilterDialog();
-					if (sm != null) {
-						activityDetailDiagram = sm;
-						addImageText.setText(TngUtil.getLabelWithPath(sm));
-						existingList.add(activityDetailDiagram);
-					}
-				} catch (Exception ex) {
-					ex.printStackTrace();
-				}
-			}
-		});
-
-		assignWPDImageButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				try {
-					SupportingMaterial sm = openFilterDialog();
-					if (sm != null) {
-						wpdDiagram = sm;
-						wpdImageText.setText(TngUtil.getLabelWithPath(sm));
-						existingList.add(wpdDiagram);
-					}
-				} catch (Exception ex) {
-					ex.printStackTrace();
-				}
-			}
-		});
-
-		clearADImageButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				existingList.remove(activityDiagram);
-				adImageText.setText("");
-				activityDiagram = null;
-			}
-		});
-
-		clearADDImageButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				existingList.remove(activityDetailDiagram);
-				addImageText.setText("");
-				activityDetailDiagram = null;
-			}
-		});
-
-		clearWPDImageButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				existingList.remove(wpdDiagram);
-				wpdImageText.setText("");
-				wpdDiagram = null;
-			}
-		});
-	}
-
-	/**
-	 * Open a filter dialog
-	 */
-	private SupportingMaterial openFilterDialog() {
-	
-		ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getShell(), filter, activity,
-				FilterConstants.SUPPORTING_MATERIALS, Arrays.asList(existingList.toArray()));
-		
-		fd.setTitle(FilterConstants.SUPPORTING_MATERIALS);
-		fd.setViewerSelectionSingle(true);
-		fd.setInput(UmaUtil.getMethodLibrary((EObject) activity));
-		fd.setBlockOnOpen(true);
-		fd.open();
-
-		List list = fd.getSelectedItems();
-		if ((list != null) && (!list.isEmpty())) {
-			Object obj = list.get(0);
-			if (obj instanceof SupportingMaterial) {
-				return (SupportingMaterial) obj;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Called when the OK button is selected.
-	 */
-	protected void okPressed() {
-		if (TngUtil.isLocked(activity) || isWrapped){
-			// then don't need to do anything.. just return
-			super.okPressed();
-		}
-		boolean editorDirty = false;
-		DiagramInfo info = new DiagramInfo(activity);
-
-		// set activity diagram
-		if (activityDiagram != info.getActivityDiagram()) {
-			editorDirty = true;
-		}
-		info.setActivityDiagram(activityDiagram);
-
-		// set activity detail diagram
-		if (!editorDirty) {
-			if (activityDetailDiagram != info.getActivityDetailDiagram())
-				editorDirty = true;
-		}
-		info.setActivityDetailDiagram(activityDetailDiagram);
-
-		// set work product dependency diagram
-		if (!editorDirty) {
-			if (wpdDiagram != info.getWPDDiagram())
-				editorDirty = true;
-		}
-		info.setWPDDiagram(wpdDiagram);
-
-		// set can publish flag for activity diagram
-		boolean oldCanPublishFlag = info.canPublishADImage();
-		boolean newCanPublishFlag = useADImageButton.getSelection();
-		if ((!editorDirty) && (oldCanPublishFlag != newCanPublishFlag))
-			editorDirty = true;
-		info.setPublishADImage(useADImageButton.getSelection());
-
-		// set can publish flag for activity detail diagram
-		oldCanPublishFlag = info.canPublishADDImage();
-		newCanPublishFlag = useADDImageButton.getSelection();
-		if ((!editorDirty) && (oldCanPublishFlag != newCanPublishFlag))
-			editorDirty = true;
-		info.setPublishADDImage(useADDImageButton.getSelection());
-
-		// set can publish flag for work product dependency diagram
-		oldCanPublishFlag = info.canPublishWPDImage();
-		newCanPublishFlag = useWPDImageButton.getSelection();
-		if ((!editorDirty) && (oldCanPublishFlag != newCanPublishFlag))
-			editorDirty = true;
-		info.setPublishWPDImage(useWPDImageButton.getSelection());
-
-		// System.out.println("EDitor dirty=" + editorDirty);
-		if (editorDirty) {
-
-			if (!promptSaveActiveEditor()) {
-				return;
-			}
-		}
-
-		saveActiveEditor();
-		super.okPressed();
-	}
-
-	private boolean promptSaveActiveEditor() {
-		String title = AuthoringUIResources.processFormEditorSaveDialog_title; //$NON-NLS-1$
-		String message = AuthoringUIResources.processFormEditorSaveDialog_message2; //$NON-NLS-1$
-		// if (editor.isDirty()) {
-		return AuthoringUIPlugin.getDefault().getMsgDialog()
-				.displayConfirmation(title, message);
-		// }
-		// return true;
-	}
-
-	private void saveActiveEditor() {
-		// save the editor
-		BusyIndicator.showWhile(editor.getEditorSite().getShell().getDisplay(),
-				new Runnable() {
-
-					public void run() {
-						((ProcessEditor) editor).resourcesToSave
-								.add(((ProcessComponent) ((MethodElementEditorInput) editor
-										.getEditorInput()).getMethodElement())
-										.getProcess().eResource());
-						// System.out.println("saving..."); //$NON-NLS-1$
-						editor.doSave(new NullProgressMonitor());
-						// System.out.println("saving done"); //$NON-NLS-1$
-					}
-
-				});
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/UserInputsDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/UserInputsDialog.java
deleted file mode 100755
index 10103fb..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/UserInputsDialog.java
+++ /dev/null
@@ -1,459 +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.authoring.ui.dialogs;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.epf.library.edit.command.UserInput;
-import org.eclipse.epf.library.edit.validation.IValidator;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * This dialog acts as a input dialog during command execution based on user
- * input and inputType dialog behaviour changes.
- * 
- * @author Shashidhar Kannoori
- * @author Shilpa Toraskar
- * @since 1.2
- * 
- */
-public class UserInputsDialog extends Dialog {
-
-	IStructuredContentProvider contentProvider;
-
-	ILabelProvider labelProvider;
-
-	private String title;
-
-	private String globalErrorTxt = "";
-	
-	private String message;
-
-	private List userInputs;
-
-	private boolean result = false;
-
-	Label messageArea;
-
-	Label errorArea;
-
-	HashMap oldInfoForCancel;
-	
-	public UserInputsDialog(Shell parentShell, List userInputs, String title,
-			String message) {
-		super(parentShell);
-		this.title = title;
-		this.message = message;
-		this.userInputs = userInputs;
-		oldInfoForCancel = new HashMap();
-	}
-
-	/**
-	 * 
-	 * @param title
-	 */
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	/**
-	 * 
-	 * @param msg
-	 */
-	public void setMessage(String message) {
-		this.message = message;
-	}
-
-	/**
-	 * Create a Tree Viewer.
-	 * 
-	 */
-	protected void createTreeViewer(Composite parent, UserInput userInput) {
-		TreeViewer viewer;
-		if (!userInput.isMultiple()) {
-			viewer = new TreeViewer(parent, SWT.SINGLE | SWT.H_SCROLL
-					| SWT.V_SCROLL | SWT.BORDER);
-		} else {
-			viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL
-					| SWT.V_SCROLL | SWT.BORDER);
-		}
-
-		GridData spec = new GridData(GridData.FILL_BOTH);
-		{
-			spec.widthHint = 200;
-			spec.heightHint = 200;
-			spec.horizontalSpan = 3;
-			viewer.getControl().setLayoutData(spec);
-		}
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			public void selectionChanged(SelectionChangedEvent event) {
-				
-			}
-
-		});
-
-		if (viewer != null) {
-			viewer.setLabelProvider(labelProvider);
-			if (contentProvider != null) {
-				viewer.setContentProvider(contentProvider);
-			} else {
-				viewer.setContentProvider(new ArrayContentProvider());
-			}
-			viewer.setUseHashlookup(true);
-
-			viewer.setInput(userInput.getChoices());
-			viewer.getControl().setFont(parent.getFont());
-			// TODO: treeViewer Sorter and Expand/Collapse
-		}
-	}
-
-	/**
-	 * Creates a TableViewer
-	 * 
-	 */
-	protected void createTableViewer(Composite parent, UserInput userInput) {
-		TableViewer viewer = new TableViewer(parent);
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			public void selectionChanged(SelectionChangedEvent event) {
-				
-			}
-		});
-	}
-
-	/**
-	 * Creates a Text control
-	 * 
-	 * @param parent
-	 * @param userInput
-	 */
-	protected void createText(Composite parent, UserInput userInput) {
-		final UserInput localinput = userInput;
-		final IValidator validator = userInput.getValidator();
-		final Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
-		text.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		text.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				getButton(OK).setEnabled(true);
-				errorArea.setText("");
-			}
-		});
-
-		text.addFocusListener(new FocusAdapter() {
-			public void focusLost(FocusEvent e) {
-				String errorTxt = "";
-				if (validator != null) {
-					errorTxt = validator.isValid(text.getText());
-					if (errorTxt != null && errorTxt.length() > 0) {
-						errorArea.setText(errorTxt);
-						getButton(OK).setEnabled(false);					
-					} else {
-						errorArea.setText("");
-					}
-					globalErrorTxt = errorTxt;
-				}
-				if (errorTxt == null || errorTxt.length() <= 0) {
-					localinput.setInput(text.getText());
-				}
-			}
-		});
-		if (userInput.getInput() != null) {
-			text.setText((String) userInput.getInput());
-		}
-	}
-
-	/**
-	 * Method to setInput, subclass can override it.
-	 * 
-	 */
-	protected void setInput(UserInput input, Object obj) {
-		input.setInput(obj);
-	}
-
-	/**
-	 * Creates a Comboviewer.
-	 * 
-	 * @param composite
-	 * @param userInput
-	 */
-	protected void createComboViewer(Composite composite, UserInput userInput) {
-		final UserInput localInput = userInput;
-		final IValidator validator = userInput.getValidator();
-		final ComboViewer viewer = new ComboViewer(composite);
-		viewer.getCombo().setLayoutData(
-				new GridData(SWT.FILL, SWT.FILL, true, true));
-		viewer.setContentProvider(new ArrayContentProvider());
-		if (userInput.getLabelProvider() != null) {
-			viewer.setLabelProvider(userInput.getLabelProvider());
-		}
-		List choices = userInput.getChoices();
-		viewer.setInput(choices);
-		if (choices != null && choices.size() > 0) {
-			viewer.setSelection(new StructuredSelection(choices.get(0)));
-			localInput.setInput(choices.get(0));
-		}
-		viewer.getCombo().addFocusListener(new FocusAdapter() {
-			public void focusLost(FocusEvent e) {
-				String errorTxt = "";
-				IStructuredSelection selected = (IStructuredSelection) viewer
-						.getSelection();
-				IStatus status = validator.isValid(selected.getFirstElement());
-				if (status.getSeverity() == IStatus.ERROR) {
-					errorTxt = status.getMessage();
-				}
-				if (errorTxt != null && errorTxt.length() > 0) {
-					errorArea.setText(errorTxt);
-					getButton(OK).setEnabled(false);
-				} if (globalErrorTxt != null && globalErrorTxt.length() > 0) {
-					errorArea.setText(globalErrorTxt);
-					getButton(OK).setEnabled(false);
-				}
-				else
-					errorArea.setText("");
-			}
-		});
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			public void selectionChanged(SelectionChangedEvent event) {
-				getButton(OK).setEnabled(true);
-				errorArea.setText("");
-
-				IStructuredSelection selection = (IStructuredSelection) event
-						.getSelection();
-				Object obj = selection.getFirstElement();
-				String errorTxt = "";
-				if (validator != null) {
-					IStatus status = validator.isValid(obj);
-					if (status.getCode() == IStatus.ERROR) {
-						errorTxt = status.getMessage();
-					}
-					if (errorTxt != null && errorTxt.length() > 0) {
-						errorArea.setText(errorTxt);
-					}
-					else if (globalErrorTxt != null && globalErrorTxt.length() > 0) {
-						errorArea.setText(globalErrorTxt);
-						getButton(OK).setEnabled(false);
-					}
-					else
-						errorArea.setText("");
-				}
-				if (errorTxt == null || errorTxt.length() <= 0) {
-					localInput.setInput(obj);
-				}
-			}
-		});	
-	}
-
-	/**
-	 * Create a Label and Text for message area.
-	 * 
-	 * @param composite
-	 * @return
-	 */
-	protected Label createMessageArea(Composite composite) {
-		messageArea = new Label(composite, SWT.WRAP);
-		if (message != null) {
-			messageArea.setText(message);
-		}
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		gd.heightHint = 25;
-		messageArea.setLayoutData(gd);
-		applyDialogFont(messageArea);
-		Label separator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
-		GridData gd1 = new GridData(GridData.FILL_HORIZONTAL);
-		gd1.horizontalSpan = 2;
-		separator.setLayoutData(gd1);
-		return messageArea;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite) super.createDialogArea(parent);
-		composite.setFont(parent.getFont());
-
-		GridLayout layout = (GridLayout) composite.getLayout();
-		layout.marginWidth = 10;
-		layout.marginHeight = 10;
-		layout.numColumns = 2;
-
-		createMessageArea(composite);
-
-		// Create controls based on UserInputs
-		if (userInputs != null && userInputs.size() > 0) {
-			for (Iterator iterator = userInputs.iterator(); iterator.hasNext();) {
-				Object object = iterator.next();
-				if (object instanceof UserInput) {
-					UserInput userInput = (UserInput) object;
-
-					// Store the userInput in the hashmap for cancel action.
-					oldInfoForCancel.put(userInput, userInput.getInput());
-
-					Label label = new Label(composite, SWT.NONE);
-					label.setText(userInput.getLabel());
-					GridData gridData = new GridData(GridData.BEGINNING);
-					label.setLayoutData(gridData);
-
-					if (userInput.getType() == UserInput.TEXT) {
-						createText(composite, userInput);
-					} else if (userInput.getType() == UserInput.SELECTION) {
-						createComboViewer(composite, userInput);
-					}
-					// createEmptyLabel(composite, 2);
-				}
-			}
-		}
-		createErrorArea(composite);
-		return composite;
-	}
-
-	/**
-	 * Creates a Error Area.
-	 * 
-	 * @param composite
-	 */
-	private void createErrorArea(Composite composite) {
-		// create blank label
-		new Label(composite, SWT.WRAP);
-
-		errorArea = new Label(composite, SWT.WRAP);
-		errorArea.setForeground(ColorConstants.red);
-		// if(errorTxt != null && errorTxt.length() >0){
-		// errorArea.setText(errorTxt);
-		// }
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		gd.heightHint = 25;
-		errorArea.setLayoutData(gd);
-		applyDialogFont(errorArea);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		if (this.title != null) {
-			newShell.setText(this.title);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		result = true;		
-		super.okPressed();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#cancelPressed()
-	 */
-	protected void cancelPressed() {
-		if (userInputs != null && userInputs.size() > 0) {
-			for (Iterator iterator = userInputs.iterator(); iterator.hasNext();) {
-				Object object = iterator.next();
-				if (object instanceof UserInput) {
-					UserInput userInput = (UserInput) object;
-					userInput.setInput(oldInfoForCancel.get(userInput));
-				}
-			}
-		}
-		super.cancelPressed();
-	}
-
-	/**
-	 * Returns the results.
-	 * 
-	 * @return
-	 */
-	public boolean getResult() {
-		return result;
-	}
-
-	/**
-	 * Create a empty label.
-	 * 
-	 * @param composite
-	 * @param span
-	 */
-	// private void createEmptyLabel(Composite composite, int span){
-	// Label emptyLabel = new Label(composite, SWT.NONE);
-	// emptyLabel.setBackground(Colors.INHERITED_ELEMENT_LABEL);
-	// GridData emptyData = new GridData(GridData.FILL_HORIZONTAL);
-	// emptyLabel.setText("");
-	// emptyData = new GridData(GridData.FILL_HORIZONTAL);
-	// emptyData.horizontalSpan =span;
-	// emptyData.heightHint = 3;
-	// emptyLabel.setLayoutData(emptyData);
-	// }
-	/**
-	 * validates the input with given Validator in UserInput.
-	 */
-	// private boolean validate() {
-	// for (Iterator iter = userInputs.iterator(); iter.hasNext();) {
-	// UserInput element = (UserInput) iter.next();
-	// IValidator validator = element.getValidator();
-	// if (validator != null) {
-	// if (element.getType() == UserInput.TEXT) {
-	// errorTxt += validator
-	// .isValid(element.getInput().toString());
-	// } else {
-	// errorTxt += validator.isValid(element.getInput());
-	// }
-	// }
-	// }
-	// errorTxt = "System out testing";
-	// if (errorTxt != null && errorTxt.length() > 0) {
-	// errorArea.setText(errorTxt);
-	// errorArea.setForeground(ColorConstants.red);
-	// return false;
-	// }
-	// return true;
-	// }
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/UserInteractionDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/UserInteractionDialog.java
deleted file mode 100755
index 0c058f5..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/UserInteractionDialog.java
+++ /dev/null
@@ -1,374 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * This dialog acts as a input dialog during command execution  
- * based on user input and inputType dialog behaviour changes. 
- * @author skannoor
- *
- */
-public class UserInteractionDialog extends Dialog implements
-		ISelectionChangedListener, IDoubleClickListener {
-
-	ILabelProvider labelProvider;
-	IStructuredContentProvider contentProvider;
-	List objectsToSelect;
-	List initialSelection;
-	private String title;
-	private String msg;
-	List selected;
-	private boolean multiple = false;
-	private StructuredViewer viewer;
-	private Object input;
-	private int inputType = InputType.TEXT;
-	private Text text;
-	private String inputLabel;
-	
-	/**
-	 * Constructor
-	 * @param parentShell
-	 * @param objectsToSelect
-	 * @param labelProvider
-	 * @param multiple
-	 * @param title
-	 * @param msg
-	 */
-	public UserInteractionDialog(Shell parentShell, List objectsToSelect,
-			ILabelProvider labelProvider, boolean multiple,
-			String title, String msg){
-		super(parentShell);
-		this.labelProvider = labelProvider;
-		this.objectsToSelect = objectsToSelect;
-		this.title = title;
-		this.msg = msg;
-		this.multiple  = multiple;
-	}
-	
-	/**
-	 * Constructor
-	 * @param parentShell
-	 * @param objectsToSelect
-	 */
-	public UserInteractionDialog(Shell parentShell, List objectsToSelect){
-		super(parentShell);
-		this.objectsToSelect = objectsToSelect;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
-	 */
-	public void doubleClick(DoubleClickEvent event) {
-		// TODO Auto-generated method stub
-		IStructuredSelection s = (IStructuredSelection) event.getSelection();
-		Object element = s.getFirstElement();
-		if(selected != null){
-			selected.add(element);
-		}
-		close();
-	}
-	
-	/**
-	 * Saves the selection in inputdialog 
-     */
-    public void saveSelection(){
-    	if(viewer != null){
-	    	IStructuredSelection selection = (IStructuredSelection) viewer
-					.getSelection();
-			if (selection.size() > 0) {
-				Object[] objectArr = selection.toArray();
-				for (int i = 0; i < objectArr.length; i++) {
-					Object obj = objectArr[i];
-					//if(obj instanceof MethodElement){
-						if(selected != null){
-							selected.add(obj);
-						}
-					//}
-				}
-			}
-    	}else{
-    		selected.add(text.getText());
-    	}
-		// Persist the dialog settings.
-		// saveLastSettings();
-		//getShell().get
-    }
-	/**
-	 * 
-	 * @param initialSelection
-	 */
-	public void setInitialSelection(List initialSelection){
-		this.initialSelection = initialSelection;
-	}
-	/**
-	 * 
-	 * @return
-	 */
-	public List getResult(){
-		return this.selected;
-	}
-	/**
-	 * 
-	 * @param labelProvider
-	 */
-	public void  setLabelProvider(ILabelProvider labelProvider){
-		this.labelProvider = labelProvider;
-	}
-	/**
-	 * 
-	 * @param title
-	 */
-	public void setTitle(String title){
-		this.title = title;
-	}
-	/**
-	 * 
-	 * @param msg
-	 */
-	public void setMessage(String msg){
-		this.msg = msg;
-	}
-	
-	/**
-	 * 
-	 * @param multiple
-	 */
-	public void setIsMultiple(boolean multiple){
-		this.multiple = multiple;
-	}
-	/**
-	 * 
-	 */
-	protected void createTreeViewer(Composite parent){
-		if (!multiple) {
-			viewer = new TreeViewer(parent, SWT.SINGLE | SWT.H_SCROLL
-					| SWT.V_SCROLL | SWT.BORDER);
-		} else {
-			viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL
-					| SWT.V_SCROLL | SWT.BORDER);
-		}
-		
-		GridData spec = new GridData(GridData.FILL_BOTH);
-		{
-			spec.widthHint = 200;
-			spec.heightHint = 200;
-			spec.horizontalSpan = 3;
-			viewer.getControl().setLayoutData(spec);
-		}
-	}
-	
-	protected void createTableViewer(Composite parent){
-		viewer = new TableViewer(parent);
-	}
-	
-	protected void createText(Composite parent){
-		 text = new Text(parent, SWT.SINGLE | SWT.BORDER);
-	        text.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
-	                | GridData.HORIZONTAL_ALIGN_FILL));
-	        text.addModifyListener(new ModifyListener() {
-	            public void modifyText(ModifyEvent e) {
-	                // TODO: check inpute
-	            }
-	        });
-	}
-	
-	protected void setSelection(Viewer viewer) {
-		if (initialSelection != null && initialSelection.size() > 0) {
-			StructuredSelection selection = new StructuredSelection(
-					initialSelection.toArray());
-			viewer.setSelection(selection, true);
-		}
-
-	}
-
-	/*
-	 * 
-	 */
-	protected Label createMessageArea(Composite composite) {
-		Label label = new Label(composite,SWT.WRAP);
-		if(msg != null){
-			label.setText(msg);
-		}
-		GridData gd= new GridData(GridData.FILL_HORIZONTAL);
-		label.setLayoutData(gd);
-		applyDialogFont(label);
-		return label;
-	}
-	
-	protected void createComboViewer(Composite composite) {
-			// TODO Auto-generated method stub
-		viewer = new ComboViewer(composite);
-	}
-	
-	protected Control createDialogArea(Composite parent) {
-		// TODO Auto-generated method stub
-		Composite composite = (Composite) super.createDialogArea(parent);
-		composite.setFont(parent.getFont());
-
-		GridLayout layout = (GridLayout) composite.getLayout();
-		layout.marginWidth = 10;
-		layout.marginHeight = 10;
-		GridData gD = (GridData) composite.getLayoutData();
-		layout.numColumns = 2;
-		//gD.grabExcessHorizontalSpace = true;
-		gD.widthHint = 150;
-		gD.heightHint = 150;
-		
-		createMessageArea(composite);
-		Label emptylabel = new Label(composite, SWT.NONE);
-		emptylabel.setText("");
-		
-		if(inputLabel != null || inputLabel != ""){
-			Label label = new Label(composite, SWT.WRAP);
-			label.setText(inputLabel);
-			GridData data = new GridData(GridData.FILL_BOTH |GridData.FILL_HORIZONTAL);
-			label.setLayoutData(data);
-		}
-		
-		if(inputType == InputType.TREE){
-			createTreeViewer(composite);
-		}else if(inputType == InputType.LIST){
-			createTableViewer(composite);
-		}else if (inputType == InputType.COMBO){
-			createComboViewer(composite);
-		}else if(inputType == InputType.TEXT){
-			createText(composite);
-		}
-		//
-		if(viewer != null){
-			viewer.setLabelProvider(labelProvider);
-			if(contentProvider != null){
-				viewer.setContentProvider(contentProvider);
-			}else{
-				viewer.setContentProvider(new ArrayContentProvider());
-			}
-			viewer.setUseHashlookup(true);
-	
-			if (input != null) {
-				viewer.setInput(input);
-			}else{
-				viewer.setInput(objectsToSelect);
-			}
-			viewer.addSelectionChangedListener(this);
-			viewer.addDoubleClickListener(this);
-			viewer.getControl().setFont(parent.getFont());
-			setSelection(viewer);
-			// TODO: treeViewer Sorter and Expand/Collapse
-		}
-		return composite;
-		
-	}
-	
-	/*
-     * Update OK button based on selection
-     *
-     */
-    protected void updateOkButton() {
-        Button okButton = getButton(IDialogConstants.OK_ID);
-        if (okButton != null) {
-			okButton.setEnabled(getResult().size() > 0);
-		}
-    }
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-     */
-    protected void configureShell(Shell newShell) {
-    	// TODO Auto-generated method stub
-    	super.configureShell(newShell);
-    	if (this.title != null) {
-			newShell.setText(this.title);
-		}
-    }
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-     */
-    protected void okPressed() {
-    	selected = new ArrayList();
-    	saveSelection();
-    	super.okPressed();
-    }
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.jface.dialogs.Dialog#cancelPressed()
-     */
-    protected void cancelPressed() {
-    	selected = null;
-    	super.cancelPressed();
-    }
-    
-   
-   
-	public void setInputType(int inputType) {
-		this.inputType = inputType;
-	}
-
-	/**
-	 * @return the input
-	 */
-	public Object getInput() {
-		return input;
-	}
-
-	/**
-	 * @param input the input to set
-	 */
-	public void setInput(Object input) {
-		this.input = input;
-	}
-
-	/**
-	 * @param inputLabel the inputLabel to set
-	 */
-	public void setInputLabel(String inputLabel) {
-		this.inputLabel = inputLabel;
-	}
-    
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/VariabilitySelection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/VariabilitySelection.java
deleted file mode 100755
index 7623e63..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/VariabilitySelection.java
+++ /dev/null
@@ -1,267 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dialogs;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.filters.AllFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.PresentationContext;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.itemsfilter.CategorizedProcessesItemProvider;
-import org.eclipse.epf.library.edit.itemsfilter.ContentCategoriesGroupItemProvider;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.ProcessesItemProvider;
-import org.eclipse.epf.library.edit.util.MethodElementUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * The dialog for showing and possibly selecting any variability related to the
- * given element.
- * 
- * @author Jeff Hardy
- * @since 1.1
- */
-public class VariabilitySelection {
-
-	private HashSet filterElementList = new HashSet();
-
-	private class VariabilityFilter extends AllFilter {
-		public boolean accept(Object obj) {
-			Object contentElement = helper.getContentElement();
-			if (contentElement != null) {
-				if (obj.equals(helper.getContentElement()))
-					return false;
-			}
-
-			if (helper.getAlreadySelectedList() != null) {
-				if (obj instanceof ProcessComponent) {
-					if (helper.getAlreadySelectedList().contains(
-							((ProcessComponent) obj).getProcess()))
-						return false;
-				} else {
-					if (helper.getAlreadySelectedList().contains(obj))
-						return false;
-				}
-			}
-
-			if (obj instanceof CustomCategory) {
-				if (TngUtil.isRootCustomCategory((CustomCategory) obj)) {
-					if (((CustomCategory) obj).getCategorizedElements()
-							.isEmpty())
-						return false;
-				}
-			}
-			if (!helper.matchPattern(obj))
-				return false;
-
-			if (obj instanceof MethodPlugin) {
-				if (obj instanceof MethodPlugin) {
-					if (contentElement != null) {
-						if (MethodElementUtil.getAllModels(contentElement)
-								.contains(obj))
-							return true;
-						else
-							return false;
-					} else {
-						return true;
-					}
-				}
-			}
-			if (obj instanceof ContentPackage)
-				return true;
-			if (obj instanceof ContentCategoriesGroupItemProvider) {
-				Collection list = ((ContentCategoriesGroupItemProvider) obj)
-						.getChildren(obj);
-				if (list.isEmpty())
-					return false;
-				else
-					return true;
-			}
-			if (obj instanceof ProcessesItemProvider) {
-				Collection list = ((ProcessesItemProvider) obj)
-						.getChildren(obj);
-				for (Iterator ior = list.iterator(); ior.hasNext();) {
-					Object object = ior.next();
-					if (((CategorizedProcessesItemProvider) object)
-							.getChildren(object).isEmpty())
-						ior.remove();
-				}
-				if (list.isEmpty())
-					return false;
-				else
-					return true;
-			}
-
-			if (childAccept(obj))
-				return true;
-			return false;
-		}
-
-		public boolean childAccept(Object obj) {
-			if ((obj instanceof ContentElement)
-					&& filterElementList.contains(obj)) {
-				return true;
-			}
-			return false;
-		}
-	};
-
-	/**
-	 * Display variability selection dialog which lists elements and it's
-	 * variabilities.
-	 * 
-	 */
-	public VariabilitySelection() {
-	}
-
-	/**
-	 * It shows dialog box for all the contributors. User is expected to select
-	 * one.
-	 * 
-	 * @param element
-	 * @return
-	 * 		Object selected by user
-	 */
-	public Object getSelectedVariability(VariabilityElement element) {
-		Set elementSet = new HashSet();
-		elementSet.add(element);
-		elementSet = AssociationHelper.getVariabilityElements(elementSet, true, true);
-
-		filterElementList.addAll(elementSet);
-		if (!elementSet.isEmpty()) {
-
-			for (Iterator itor = elementSet.iterator(); itor.hasNext();) {
-				ContentElement contentElement = (ContentElement) itor.next();
-				List groupings = null;
-				if (contentElement instanceof Discipline) {
-					groupings = AssociationHelper
-							.getDisciplineGroups((Discipline) contentElement);
-
-				}
-				if (contentElement instanceof RoleSet) {
-					groupings = AssociationHelper
-							.getRoleSetGroups((RoleSet) contentElement);
-				}
-				
-				if (contentElement instanceof CustomCategory) {
-					groupings = getAncestors((CustomCategory)contentElement);
-				}
-
-				if ((groupings != null) && (!groupings.isEmpty()))
-					filterElementList.addAll(groupings);
-
-			}
-
-			IFilter filter = new VariabilityFilter();
-			String[] str = new String[] { FilterConstants.CONFIG_CONTENT_ELEMENT };
-			ItemsFilterDialog dlg = new ItemsFilterDialog(PlatformUI
-					.getWorkbench().getActiveWorkbenchWindow().getShell());
-			dlg.setFilter(filter);
-			dlg.setTitle(FilterConstants.CONFIG_CONTENT_ELEMENT);
-			dlg.setViewerSelectionSingle(true);
-			dlg.setTypes(str);
-			dlg.setInput(UmaUtil.getMethodLibrary((EObject) element));
-			dlg.setContentProvider(new AdapterFactoryContentProvider(
-					TngAdapterFactory.INSTANCE
-							.getItemsFilter_AdapterFactory(filter)),
-							TngAdapterFactory.INSTANCE.getItemsFilter_ComposedAdapterFactory());
-			dlg.setBlockOnOpen(true);
-
-			String elementName = element.getName();
-			if (element instanceof DescribableElement
-					&& PresentationContext.INSTANCE.isShowPresentationNames()) {
-				if (((DescribableElement) element).getPresentationName().trim()
-						.length() > 0)
-					elementName = ((DescribableElement) element)
-							.getPresentationName();
-			}
-			dlg
-					.setViewerLabel(AuthoringUIResources.bind(AuthoringUIResources.VariabilitySelection_filterdialog_viewerLabel, (new String[] { elementName })));
-
-			String title = MessageFormat
-					.format(
-							AuthoringUIResources.VariabilitySelection_filterdialog_title, //$NON-NLS-1$
-							new String[] { elementName });
-
-			dlg.setTitle(title);
-			dlg.setBlockOnOpen(true);
-			dlg.open();
-
-			List result = dlg.getSelectedItems();
-			if ((result == null) || (result.isEmpty()))
-				return null;
-			else
-				return result.get(0);
-		}
-		return element;
-	}
-
-	/**
-	 * Returns the ancestors for the given Custom Category.
-	 * taken from authoring.ui.CustomCategoryAssignPage
-	 */
-	private List getAncestors(CustomCategory methodObject) {
-		List ancestorList = new ArrayList();
-		List objList = new ArrayList();
-		objList.add(methodObject);
-		getAncestors(ancestorList, objList);
-		return ancestorList;
-	}
-
-	private List getAncestors(List ancestorList, List methodObjectList) {
-		if (methodObjectList.isEmpty())
-			return ancestorList;
-
-		List allParentCustCats = new ArrayList();
-
-		for (Iterator iter = methodObjectList.iterator(); iter.hasNext();) {
-			CustomCategory element = (CustomCategory) iter.next();
-			List parentList = AssociationHelper.getCustomCategories(element);
-			allParentCustCats.addAll(parentList);
-		}
-
-		ancestorList.addAll(methodObjectList);
-		List nextCheckList = new ArrayList();
-		for (Iterator iter = allParentCustCats.iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			if (!ancestorList.contains(element)) {
-				nextCheckList.add(element);
-			}
-		}
-
-		return getAncestors(ancestorList, nextCheckList);
-	}
-
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/package.html
deleted file mode 100755
index c437119..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides dialogs for the Authoring UI.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dnd/EditingDomainTableTreeViewerDropAdapter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dnd/EditingDomainTableTreeViewerDropAdapter.java
deleted file mode 100755
index c314910..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dnd/EditingDomainTableTreeViewerDropAdapter.java
+++ /dev/null
@@ -1,217 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dnd;
-
-import org.eclipse.emf.edit.command.DragAndDropCommand;
-import org.eclipse.emf.edit.command.DragAndDropFeedback;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
-import org.eclipse.jface.viewers.TableTreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Widget;
-
-/**
- * Drop adapter for drag and drop
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class EditingDomainTableTreeViewerDropAdapter extends
-		EditingDomainViewerDropAdapter {
-
-	public EditingDomainTableTreeViewerDropAdapter(EditingDomain domain,
-			Viewer viewer) {
-		super(domain, viewer);
-	}
-
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter#dragEnter(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragEnter(DropTargetEvent event) {
-		if (event.detail == DND.DROP_NONE) {
-			event.detail = DND.DROP_COPY;
-		}
-		super.dragEnter(event);
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter#dragOver(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragOver(DropTargetEvent event) {
-		if (event.detail == DND.DROP_NONE) {
-			event.detail = DND.DROP_COPY;
-		}
-
-		super.dragOver(event);
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter#dropAccept(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dropAccept(DropTargetEvent event) {
-		if (event.detail == DND.DROP_NONE) {
-			event.detail = DND.DROP_COPY;
-		}
-
-		super.dropAccept(event);
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter#helper(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	protected void helper(DropTargetEvent event) {
-		Table table = null;
-		TableItem item = null;
-		if (viewer instanceof TableTreeViewer) {
-			table = ((TableTreeViewer) viewer).getTableTree().getTable();
-			item = table.getItem(table.toControl(event.x, event.y));
-			event.item = item;
-		}
-
-		superHelper(event);
-
-		if (item != null && (event.feedback & DND.FEEDBACK_SELECT) != 0) {
-			table.setSelection(new TableItem[] { item });
-		}
-	}
-
-	/**
-	 * Get drop target
-	 * 
-	 * @param item
-	 * @return drop target object
-	 */
-	protected Object getDropTarget(Widget item) {
-		return EditingDomainTableTreeViewerDropAdapter.extractDropTarget(item);
-	}
-
-	/**
-	 * This is called to indicate that the drop action should be invoked.
-	 * @see org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter#drop(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void drop(DropTargetEvent event) {
-		// A command was created if the source was available early, and the
-		// information used to create it was cached...
-		if (dragAndDropCommandInformation != null) {
-			// Recreate the command.
-			command = dragAndDropCommandInformation.createCommand();
-		} else {
-			// Otherwise, the source should be available now as event.data, and
-			// we can create the command.
-			source = extractDragSource(event.data);
-			Object target = getDropTarget(event.item);
-			command = DragAndDropCommand.create(domain, target,
-					getLocation(event), event.operations, originalOperation,
-					source);
-		}
-
-		// If the command can execute...
-		if (command.canExecute()) {
-			// Execute it.
-			domain.getCommandStack().execute(command);
-		} else {
-			// Otherwise, let's call the whole thing off.
-			event.detail = DND.DROP_NONE;
-			command.dispose();
-		}
-
-		// Clean up the state.
-		command = null;
-		commandTarget = null;
-		source = null;
-	}
-
-	/**
-	 * This method is called the same way for each of the
-	 * {@link org.eclipse.swt.dnd.DropTargetListener} methods, except for leave
-	 * and drop. If the source is available early, it creates or revalidates the
-	 * {@link DragAndDropCommand}, and updates the event's detail (operation)
-	 * and feedback (drag under effect), appropriately.
-	 */
-	protected void superHelper(DropTargetEvent event) {
-		// If we can't do anything else, we'll provide the default select
-		// feedback and enable auto-scroll and auto-expand effects.
-		event.feedback = DND.FEEDBACK_SELECT | getAutoFeedback();
-
-		// If we don't already have it, try to get the source early. We can't
-		// give feedback if it's not available yet (this is platform-dependent).
-		if (source == null) {
-			source = getDragSource(event);
-			if (source == null)
-				return;
-		}
-
-		// Get the target object from the item widget and the mouse location in
-		// it.
-		Object target = getDropTarget(event.item);
-		float location = getLocation(event);
-
-		// Determine if we can create a valid command at the current location.
-		boolean valid = false;
-
-		// If we don't have a previous cached command...
-		if (command == null) {
-			// We'll need to keep track of the information we use to create the
-			// command, so that we can recreate it in drop.
-			dragAndDropCommandInformation = new DragAndDropCommandInformation(
-					domain, target, location, event.operations,
-					originalOperation, source);
-
-			// Remember the target; create the command and test if it is
-			// executable.
-			commandTarget = target;
-			command = dragAndDropCommandInformation.createCommand();
-			valid = command.canExecute();
-		} else {
-			// Check if the cached command can provide DND
-			// feedback/revalidation.
-			if (target == commandTarget
-					&& command instanceof DragAndDropFeedback) {
-				// If so, revalidate the command.
-				valid = ((DragAndDropFeedback) command).validate(target,
-						location, event.operations, originalOperation, source);
-
-				// Keep track of any changes to the command information.
-				dragAndDropCommandInformation = new DragAndDropCommandInformation(
-						domain, target, location, event.operations,
-						originalOperation, source);
-			} else {
-				// If not, dispose the current command and create a new one.
-				dragAndDropCommandInformation = new DragAndDropCommandInformation(
-						domain, target, location, event.operations,
-						originalOperation, source);
-				commandTarget = target;
-				command.dispose();
-				command = dragAndDropCommandInformation.createCommand();
-				valid = command.canExecute();
-			}
-		}
-
-		// If this command can provide detailed drag and drop feedback...
-		if (command instanceof DragAndDropFeedback) {
-			// Use it for the operation and drag under effect.
-			DragAndDropFeedback dragAndDropFeedback = (DragAndDropFeedback) command;
-			event.detail = dragAndDropFeedback.getOperation();
-			event.feedback = dragAndDropFeedback.getFeedback()
-					| getAutoFeedback();
-		} else if (!valid) {
-			// There is no executable command, so we'd better nix the whole
-			// deal.
-			event.detail = DND.DROP_NONE;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dnd/LibraryViewerDragAdapter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dnd/LibraryViewerDragAdapter.java
deleted file mode 100755
index 4e61768..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dnd/LibraryViewerDragAdapter.java
+++ /dev/null
@@ -1,122 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.dnd;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditorInput;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.HTMLTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The drag adapter for the Library Viewer.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class LibraryViewerDragAdapter extends ViewerDragAdapter {
-
-	/**
-	 * Creates a new <code>EditorDragAdapter</code>.
-	 */
-	public LibraryViewerDragAdapter(Viewer viewer) {
-		super(viewer);
-	}
-
-	/**
-	 * Called when dragging is initiated.
-	 */
-	public void dragStart(DragSourceEvent event) {
-		super.dragStart(event);
-		event.doit = !viewer.getSelection().isEmpty();
-	}
-
-	/**
-	 * Called to transfer the data.
-	 */
-	public void dragSetData(DragSourceEvent event) {
-		if (HTMLTransfer.getInstance().isSupportedType(event.dataType)) {
-			IStructuredSelection selection = (IStructuredSelection) viewer
-					.getSelection();
-			Object[] selectedElements = selection.toList().toArray(
-					new Object[selection.size()]);
-			if (selectedElements != null && selectedElements.length > 0) {
-				Object selectedElement = TngUtil.unwrap(selectedElements[0]);
-				if (selectedElement instanceof MethodElement) {
-					String linkText = getHyperlink((MethodElement) selectedElement);					
-					if (Platform.getOS().equals(Platform.WS_WIN32)) {
-						event.data = new String(StrUtil.getUTF8Bytes(linkText));						
-					}
-					else {
-						event.data = linkText;
-					}
-				}
-			}
-		} 
-		if (TextTransfer.getInstance().isSupportedType(event.dataType)) {
-			IStructuredSelection selection = (IStructuredSelection) viewer
-					.getSelection();
-			Object[] selectedElements = selection.toList().toArray(
-					new Object[selection.size()]);
-			if (selectedElements != null && selectedElements.length > 0) {
-				Object selectedElement = TngUtil.unwrap(selectedElements[0]);
-				if (selectedElement instanceof MethodElement) {
-					String linkText = getHyperlink((MethodElement) selectedElement);					
-					if (Platform.getOS().equals(Platform.WS_WIN32)) {
-						event.data = new String(StrUtil.getUTF8Bytes(linkText));						
-					}
-					else {
-						event.data = linkText;
-					}
-				}
-			}
-		}
-		super.dragSetData(event);
-	}
-
-	/**
-	 * Returns the hyperlink for the given Method element.
-	 */
-	protected String getHyperlink(MethodElement dragElement) {
-		MethodElement dropElement = null;
-		IWorkbenchPage activePage = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getActivePage();
-		IEditorPart activeEditor = activePage.getActiveEditor();
-		if (activeEditor != null) {
-			IEditorInput editorInput = activeEditor.getEditorInput();
-			if (editorInput instanceof MethodElementEditorInput) {
-				dropElement = ((MethodElementEditorInput) editorInput)
-						.getMethodElement();
-			}
-		}
-		
-		if(dragElement instanceof ProcessComponent){
-			dragElement = ((ProcessComponent)dragElement).getProcess();
-		}
-
-		String href = ResourceHelper.getUrl(dragElement, dropElement, ".html"); //$NON-NLS-1$
-		return ResourceHelper.getElementLink(dragElement, true,
-				"file://" + href); //$NON-NLS-1$
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dnd/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dnd/package.html
deleted file mode 100755
index 3857f58..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dnd/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides drag and drop support for the Authoring UI.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/AbstractBaseFormEditor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/AbstractBaseFormEditor.java
deleted file mode 100755
index 142591d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/AbstractBaseFormEditor.java
+++ /dev/null
@@ -1,107 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-/**
- * The abstract base class for all method editors.
- * 
- * @author Jinhua Xi
- * @author Phong Nguyen Le
- * @author Kelvin Low
- * @since 1.0
- */
-public abstract class AbstractBaseFormEditor extends FormEditor {
-
-	// Global map used to record which editor modifies the shared resource
-	// first.
-	// This enables the appropriate editors to be flagged as dirty.
-	protected static final Map SHARED_RESOURCE_TO_EDITORS_MAP = new HashMap();
-
-	// If true, debug tracing is enabled.
-	protected static final boolean DEBUG = AuthoringUIPlugin.getDefault()
-			.isDebugging();
-
-	// Collection of resources associated with the model data being edited by
-	// this editor.
-	protected Collection resources;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public AbstractBaseFormEditor() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormEditor#addPages()
-	 */
-	protected abstract void addPages();
-
-	/**
-	 * @see org.eclipse.ui.ISaveablePart#doSave(IProgressMonitor)
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		try {
-			LibraryService.getInstance().saveCurrentMethodLibrary();
-		} catch (Exception e) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(
-					"Error saving library:", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.ISaveablePart#doSaveAs()
-	 */
-	public void doSaveAs() {
-	}
-
-	/**
-	 * @see org.eclipse.ui.ISaveablePart#isSaveAsAllowed()
-	 */
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.MultiPageEditorPart#isDirty()
-	 */
-	public boolean isDirty() {
-		ILibraryManager manager = (ILibraryManager) LibraryService
-				.getInstance().getCurrentLibraryManager();
-		return manager != null ? manager.isMethodLibraryModified() : false;
-	}
-
-	/**
-	 * Disposes the operating system resources allocated by this editor.
-	 */
-	public void dispose() {
-		super.dispose();
-	}
-
-	/**
-	 * Updates the editor's dirty state by adding a "*" to the editor tab and
-	 * enabling the Save button.
-	 */
-	public void updateDirtyStatus() {
-		super.editorDirtyStateChanged();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/AbstractDiagramEditor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/AbstractDiagramEditor.java
deleted file mode 100755
index 26c11f8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/AbstractDiagramEditor.java
+++ /dev/null
@@ -1,2310 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.epf.authoring.gef.commands.ChangeBoundsCommand;
-import org.eclipse.epf.authoring.gef.commands.CreateBendpointCommand;
-import org.eclipse.epf.authoring.gef.commands.CreateLinkCommand;
-import org.eclipse.epf.authoring.gef.commands.CreateNodeCommand;
-import org.eclipse.epf.authoring.gef.commands.MoveBendpointCommand;
-import org.eclipse.epf.authoring.gef.edit.DecisionNodeEditPart;
-import org.eclipse.epf.authoring.gef.edit.DiagramActionService;
-import org.eclipse.epf.authoring.gef.edit.FreeTextNodeEditPart;
-import org.eclipse.epf.authoring.gef.edit.LinkEditPart;
-import org.eclipse.epf.authoring.gef.edit.NodeContainerEditPart;
-import org.eclipse.epf.authoring.gef.edit.NodeEditPart;
-import org.eclipse.epf.authoring.gef.edit.SynchBarNodeEditPart;
-import org.eclipse.epf.authoring.gef.figures.FreeTextFigure;
-import org.eclipse.epf.authoring.gef.util.DiagramUIResources;
-import org.eclipse.epf.authoring.gef.util.TemplateConstants;
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.actions.DiagramPrintAction;
-import org.eclipse.epf.authoring.ui.actions.ProcessDeleteAction;
-import org.eclipse.epf.authoring.ui.views.ViewHelper;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.ILibraryServiceListener;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.configuration.ProcessAuthoringConfigurator;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.events.ILibraryChangeListener;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.services.ILibraryPersister;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.KeyHandler;
-import org.eclipse.gef.KeyStroke;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CommandStackEvent;
-import org.eclipse.gef.commands.CommandStackEventListener;
-import org.eclipse.gef.dnd.TemplateTransferDragSourceListener;
-import org.eclipse.gef.dnd.TemplateTransferDropTargetListener;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteEntry;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.actions.CopyTemplateAction;
-import org.eclipse.gef.ui.actions.DeleteAction;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-import org.eclipse.gef.ui.palette.PaletteViewer;
-import org.eclipse.gef.ui.palette.PaletteViewerProvider;
-import org.eclipse.gef.ui.palette.FlyoutPaletteComposite.FlyoutPreferences;
-import org.eclipse.gef.ui.parts.GraphicalEditorWithFlyoutPalette;
-import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.util.TransferDropTargetListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.FontDialog;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-
-/**
- * Abstract base class for all diagram editors
- * 
- * @author Phong Nguyen Le
- * @author Jim Thario
- * @author Jinhua Xi
- * @since 1.0
- */
-public abstract class AbstractDiagramEditor extends
-		GraphicalEditorWithFlyoutPalette {
-
-	private static final String REFRESH_FROM_BASE_ACTIVITY = "refresh_from_base_activity"; //$NON-NLS-1$
-	// protected static final String ALIGN_HORZ_AVERAGE =
-	// "align_horizontal_to_average"; //$NON-NLS-1$
-	// protected static final String ALIGN_HORZ_FIRST_SELECTED =
-	// "align_horizontal_to_first_selection"; //$NON-NLS-1$
-	// protected static final String ALIGN_VERT_AVERAGE =
-	// "align_vertical_to_average"; //$NON-NLS-1$
-	// protected static final String ALIGN_VERT_FIRST_SELECTED =
-	// "align_vertical_to_first_selection"; //$NON-NLS-1$
-
-	private static final String FONT_DIALOG = "font_dialog"; //$NON-NLS-1$
-
-	private static final String CREATE_LINK = "create_link"; //$NON-NLS-1$
-
-	private static final String SELECT_LINK = "select_link"; //$NON-NLS-1$
-
-	private static final String CREATE_BEND_POINT = "create_bend_point"; //$NON-NLS-1$	
-
-	protected static final String CREATE_FREE_TEXT = "create_free_text"; //$NON-NLS-1$
-
-	public static final String MOVE = "move"; //$NON-NLS-1$
-
-	protected static final String REFRESH = "refresh"; //$NON-NLS-1$
-
-	protected static final String ALIGN_BEND_POINT = "align_bend_point"; //$NON-NLS-1$
-
-	protected static final String PALETTE_DOCK_LOCATION = "Dock location"; //$NON-NLS-1$
-
-	protected static final String PALETTE_SIZE = "Palette Size"; //$NON-NLS-1$
-
-	protected static final String PALETTE_STATE = "Palette state"; //$NON-NLS-1$
-
-	protected static final int DEFAULT_PALETTE_SIZE = 130;
-
-	protected static final String DELETE_DIAGRAM = "delete_actvity_detail_diagram"; //$NON-NLS-1$
-
-	private KeyHandler sharedKeyHandler;
-
-	private PaletteRoot paletteRoot;
-
-	protected EditPart editPart;
-
-	private CommandStackEventListener cmdStackEventListener;
-
-	protected CreationFactory freeTxtNodeCreationFactory;
-
-	protected DiagramActionService actionService = null;
-	
-
-	/**
-	 * The parent is the editor from where the user opened this editor.
-	 */
-	protected IEditorPart parentEditor = null;
-
-	/**
-	 * This is used to listen for our parent editor and our own closing. When it
-	 * does, we ask the user if they want to close this diagram as well.
-	 */
-	protected IPartListener partListener = new IPartListener() {
-		IEditorPart me = AbstractDiagramEditor.this;
-
-		public void partOpened(IWorkbenchPart part) {
-		}
-
-		public void partDeactivated(IWorkbenchPart part) {
-		}
-
-		public void partClosed(IWorkbenchPart part) {
-			// check if the editor closed as a result of user action or the
-			// workbench closing
-			// IWorkbench wb = PlatformUI.getWorkbench();
-			if (part == me) {
-				setParentEditor(null);
-				IWorkbenchPage page = getSite().getPage();
-				page.removePartListener(partListener);
-				// remove this diagram if it is new
-				Diagram diagram = (Diagram) ((EditPart) getGraphicalViewer()
-						.getContents()).getModel();
-				// make sure we remove the UMA diagram from the model if it is
-				// new (never saved)
-				if (diagram.isNew()) {
-					if (diagram.getUMADiagram() != null) {
-					EcoreUtil.remove(diagram.getUMADiagram());
-					}
-					if(isResourceChangedByOther()) {
-					doSave(new NullProgressMonitor());
-					}
-				}
-			}
-			// else if (!wb.isClosing()) {
-			// // are we being notified about our parent editor object?
-			// if (getParentEditor() != null) {
-			// if (part == getParentEditor()) {
-			// IWorkbenchPage page = getSite().getPage();
-			// // yes, ask the user if they want to close this
-			// // editor
-			// if (AuthoringUIPlugin
-			// .getDefault()
-			// .getMsgDialog()
-			// .displayPrompt(
-			// DiagramUIResources
-			// .getString("DiagramUI.AbstractDiagramEditor.ParentEditorClose.title"),
-			// //$NON-NLS-1$
-			// DiagramUIResources
-			// .formatString(
-			// "DiagramUI.AbstractDiagramEditor.ParentEditorClose.text",
-			// getParentEditor().getTitle(), me.getTitle()))) { //$NON-NLS-1$
-			// // yes, close this diagram, ask to save changes
-			// page.closeEditor(me, true);
-			// }
-			// // either way, our parent is closed and we can stop
-			// // listening
-			// page.removePartListener(partListener);
-			// }
-			// }
-			// }
-		}
-
-		public void partBroughtToTop(IWorkbenchPart part) {
-		}
-
-		public void partActivated(IWorkbenchPart part) {
-		}
-	};
-
-	private Font font;
-
-	private Color color;
-
-	private Command refreshFromBaseCommand = new Command(DiagramUIResources.AbstractDiagramEditorrefreshfrombase) { //$NON-NLS-1$
-		private ArrayList oldContent = new ArrayList();
-
-		public void execute() {
-			Diagram diagram = (Diagram) editPart.getModel();
-
-			// back up old diagram content
-			//
-			oldContent.clear();
-			oldContent.addAll(diagram.getUMADiagram().getContained());
-
-			GraphicalDataHelper.refreshFromBase(diagram.getUMADiagram());
-			if (editPart.isActive()) {
-				editPart.deactivate();
-			}
-			diagram.removeConsumer(this);
-			createEditPart();
-			getGraphicalViewer().setContents(editPart);
-		}
-
-		public void undo() {
-			Diagram diagram = (Diagram) editPart.getModel();
-			diagram.getUMADiagram().getContained().clear();
-			diagram.getUMADiagram().getContained().addAll(oldContent);
-			if (editPart.isActive()) {
-				editPart.deactivate();
-			}
-			diagram.removeConsumer(this);
-			createEditPart();
-			getGraphicalViewer().setContents(editPart);
-		}
-	};
-
-	protected Map templateNameToCreationFactoryMap;
-	/**
-	 * Records time when the model first has been changed by this editor. This will be used later
-	 * to determine if save is needed to reverse the changes.
-	 */
-	protected long changeTime = -1;
-	protected MethodConfiguration currentConfig;
-
-	class DiagramContextMenuProvider extends ContextMenuProvider {
-
-		private ActionRegistry actionRegistry;
-
-		/**
-		 * Creates a new WorkflowContextMenuProvider assoicated with the given
-		 * viewer and action registry.
-		 * 
-		 * @param viewer
-		 *            the viewer
-		 * @param registry
-		 *            the action registry
-		 */
-		public DiagramContextMenuProvider(EditPartViewer viewer,
-				ActionRegistry registry) {
-			super(viewer);
-			setActionRegistry(registry);
-		}
-
-		/**
-		 * @see ContextMenuProvider#buildContextMenu(org.eclipse.jface.action.IMenuManager)
-		 */
-		public void buildContextMenu(IMenuManager menu) {
-			GEFActionConstants.addStandardActionGroups(menu);
-
-			IAction action;
-			action = getActionRegistry().getAction(ActionFactory.UNDO.getId());
-			menu.appendToGroup(GEFActionConstants.GROUP_UNDO, action);
-
-			action = getActionRegistry().getAction(ActionFactory.REDO.getId());
-			menu.appendToGroup(GEFActionConstants.GROUP_UNDO, action);
-
-			boolean canModify = !isReadOnly();
-
-			action = getActionRegistry()
-					.getAction(ActionFactory.DELETE.getId());
-			if (action.isEnabled() && canModify) {
-				if (!TngUtil.isLocked(getMethodElementFromInput())) {
-					menu.appendToGroup(GEFActionConstants.GROUP_EDIT, action);
-				}
-			}
-
-			action = getActionRegistry().getAction(REFRESH);
-			menu.appendToGroup(GEFActionConstants.GROUP_VIEW, action);
-
-			action = getActionRegistry().getAction(FONT_DIALOG);
-			if (action.isEnabled() && canModify) {
-				menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
-			}
-
-			IAction createFreeTextAction = getActionRegistry().getAction(
-					CREATE_FREE_TEXT);
-			if (createFreeTextAction.isEnabled() && canModify) {
-				menu.appendToGroup(GEFActionConstants.MB_ADDITIONS,
-						createFreeTextAction);
-			}
-
-			// IAction moveAction = getActionRegistry().getAction(MOVE);
-			// if(moveAction.isEnabled()){
-			// menu.appendToGroup(GEFActionConstants.MB_ADDITIONS,moveAction);
-			// }
-			IAction linkAction = getActionRegistry().getAction(CREATE_LINK);
-			if (linkAction.isEnabled() && canModify) {
-				menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, linkAction);
-			}
-			IAction selectlinkAction = getActionRegistry().getAction(
-					SELECT_LINK);
-			if (selectlinkAction.isEnabled()) {
-				menu.appendToGroup(GEFActionConstants.MB_ADDITIONS,
-						selectlinkAction);
-			}
-			IAction bendpointAction = getActionRegistry().getAction(
-					CREATE_BEND_POINT);
-			if (bendpointAction.isEnabled() && canModify) {
-				menu.appendToGroup(GEFActionConstants.MB_ADDITIONS,
-						bendpointAction);
-			}
-			IAction alignbendpointaction = getActionRegistry().getAction(
-					ALIGN_BEND_POINT);
-			if (alignbendpointaction.isEnabled() && canModify) {
-				menu.appendToGroup(GEFActionConstants.MB_ADDITIONS,
-						alignbendpointaction);
-			}
-			
-			//Print Action for diagram through Context Menu.
-			// Enable this code when print required for diagram.
-//			action = getActionRegistry().getAction(ActionFactory.PRINT.getId());
-//			if(action.isEnabled()){
-//				menu.appendToGroup(GEFActionConstants.GROUP_PRINT, action);
-//			}
-			
-			contributeToContextMenu(menu);
-		}
-
-		private ActionRegistry getActionRegistry() {
-			return actionRegistry;
-		}
-
-		/**
-		 * Sets the action registry
-		 * 
-		 * @param registry
-		 *            the action registry
-		 */
-		public void setActionRegistry(ActionRegistry registry) {
-			actionRegistry = registry;
-		}
-
-	}
-
-	/**
-	 * Creates an instance
-	 *
-	 */
-	public AbstractDiagramEditor() {
-		super();
-		setEditDomain(new DefaultEditDomain(this));
-		getEditDomain().setCommandStack(new CommandStack() {
-			public boolean isDirty() {
-				Command cmd = getUndoCommand();
-				if (cmd != null && !cmd.canUndo()) {
-					return false;
-				}
-				return super.isDirty();
-			}
-			
-			/* (non-Javadoc)
-			 * @see org.eclipse.gef.commands.CommandStack#execute(org.eclipse.gef.commands.Command)
-			 */
-			public void execute(Command command) {
-				if(command == null || !command.canExecute()) {
-					return;
-				}
-				if(changeTime == -1) {
-					changeTime = System.currentTimeMillis();
-				}
-				super.execute(command);
-			}
-		});
-
-		// add CommandStackEventListener
-		//
-		cmdStackEventListener = new CommandStackEventListener() {
-
-			public void stackChanged(CommandStackEvent event) {
-				if (event.getDetail() == CommandStack.POST_EXECUTE) {
-					firePropertyChange(PROP_DIRTY);
-				}
-			}
-
-		};
-		getEditDomain().getCommandStack().addCommandStackEventListener(
-				cmdStackEventListener);
-		// add our part listener if either parent or this closes
-		IWorkbench wb = PlatformUI.getWorkbench();
-		IWorkbenchWindow win = wb.getActiveWorkbenchWindow();
-		IWorkbenchPage page = win.getActivePage();
-		page.addPartListener(partListener);
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.gef.ui.parts.GraphicalEditor#dispose()
-	 */
-	public void dispose() {
-		getCommandStack()
-				.removeCommandStackEventListener(cmdStackEventListener);
-
-		if (isDirty()) {
-			// changes discarded, reverse to saved
-			//
-			reverseToSaved();
-		}
-
-		if (editPart != null) {
-			Diagram diagram = (Diagram) editPart.getModel();
-			if (diagram != null) {
-				diagram.removeConsumer(this);
-			}
-		}
-
-		if (font != null && !font.isDisposed()) {
-			font.dispose();
-		}
-		if (color != null && !color.isDisposed()) {
-			color.dispose();
-		}
-		
-		ILibraryManager manager = LibraryService.getInstance().getCurrentLibraryManager();
-		if (manager != null) {
-			manager.removeListener(libraryListener);
-		}
-		LibraryService.getInstance().removeListener(libSvcListener);
-		
-		super.dispose();
-	}
-	
-	private boolean isResourceChangedByOther() {
-		Resource resource = getMethodElementFromInput().eResource();
-		if(resource != null && resource.getURI().isFile()){
-			File file = new File(resource.getURI().toFileString());
-			return file.lastModified() > changeTime;
-		}
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	private void reverseToSaved() {
-		// save the undone changes only if the resource has been changed outside this editor
-		//
-		boolean saveNeeded = getCommandStack().isDirty() && isResourceChangedByOther();
-		changeTime = -1;
-		while (getCommandStack().isDirty()) {
-			getCommandStack().undo();
-		}
-		if (saveNeeded) {
-			ILibraryPersister.FailSafeMethodLibraryPersister persister = LibraryServiceUtil.getCurrentPersister().getFailSafePersister();
-			try {
-				persister.save(getMethodElementFromInput().eResource());
-				persister.commit();
-			} catch (Exception e) {
-				CommonPlugin.INSTANCE.log(e);
-				try {
-					persister.rollback();
-				} catch (Exception ex) {
-					ViewHelper.reloadCurrentLibrary(getSite().getShell(), null);
-				}
-			}
-		}
-	}
-
-	protected void contributeToContextMenu(IMenuManager menu) {
-		boolean canModify = !isReadOnly();
-		IAction action = getActionRegistry().getAction(
-				REFRESH_FROM_BASE_ACTIVITY);
-		if (action.isEnabled() && canModify) {
-			menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
-		}
-		// the align menu is a cascading menu
-		IContributionItem ci = createAlignMenu();
-		if (ci.isEnabled() && canModify) {
-			menu
-					.appendToGroup(GEFActionConstants.MB_ADDITIONS,
-							new Separator());
-			menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, ci);
-			menu
-					.appendToGroup(GEFActionConstants.MB_ADDITIONS,
-							new Separator());
-		}
-		action = getActionRegistry().getAction(DELETE_DIAGRAM);
-		if (action.isEnabled() && canModify) {
-			menu
-					.appendToGroup(GEFActionConstants.MB_ADDITIONS,
-							new Separator());
-			menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
-			menu
-					.appendToGroup(GEFActionConstants.MB_ADDITIONS,
-							new Separator());
-		}
-	}
-
-	protected IContributionItem createAlignMenu() {
-		// create a new menu manager for the cascading menu
-		MenuManager alignMenuManager = new MenuManager(DiagramUIResources.AbstractDiagramEditor_alignMenu_text) { //$NON-NLS-1$
-
-			public boolean isEnabled() {
-				int total = 0;
-				// enable the menu only if 2 or more nodes or node containers
-				// are selected
-				List editParts = getGraphicalViewer().getSelectedEditParts();
-				// need at least two things selected to align
-				if (editParts.size() > 1) {
-					for (int a = 0; a < editParts.size(); a++) {
-						EditPart editPart = (EditPart) editParts.get(a);
-						// we can align nodes and containers
-						if (editPart instanceof NodeEditPart
-								|| editPart instanceof NodeContainerEditPart) {
-							// add up the elements we need, there may be more
-							// elements selected (links, etc.)
-							total++;
-							if (total > 1) {
-								// we only need to know there is more than 1, so
-								// we can stop here
-								break;
-							}
-						}
-					}
-				}
-				return total > 1;
-			}
-		};
-		// add the actions to this menu
-		alignMenuManager.add(getActionRegistry().getAction(
-				DiagramActionService.ALIGN_HORZ_AVERAGE));
-		alignMenuManager.add(getActionRegistry().getAction(
-				DiagramActionService.ALIGN_HORZ_FIRST_SELECTED));
-		alignMenuManager.add(getActionRegistry().getAction(
-				DiagramActionService.ALIGN_VERT_AVERAGE));
-		alignMenuManager.add(getActionRegistry().getAction(
-				DiagramActionService.ALIGN_VERT_FIRST_SELECTED));
-		return alignMenuManager;
-	}
-
-	protected void refreshFromBase() {
-		getCommandStack().execute(refreshFromBaseCommand);
-
-		// Diagram diagram = (Diagram) editPart.getModel();
-		// GraphicalDataHelper.refreshFromBase(diagram.getUMADiagram());
-		// Object act = diagram.getObject();
-		// if(editPart.isActive()) {
-		// editPart.deactivate();
-		// }
-		// diagram.removeConsumer(this);
-		// editPart = createEditPart(act);
-		// getGraphicalViewer().setContents(editPart);
-	}
-
-	protected void createActions() {
-		super.createActions();
-
-		ActionRegistry registry = getActionRegistry();
-		IAction action;
-
-		// replace default delete action with a custom one
-		//
-		action = registry.getAction(ActionFactory.DELETE.getId());
-		if (action != null) {
-			registry.removeAction(action);
-			getSelectionActions().remove(action);
-		}
-		action = new DeleteAction((IWorkbenchPart) this) {
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.gef.ui.actions.WorkbenchPartAction#isEnabled()
-			 */
-			public boolean isEnabled() {
-				return super.isEnabled();
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.gef.ui.actions.DeleteAction#calculateEnabled()
-			 */
-			// protected boolean calculateEnabled() {
-			// for (Iterator iter = getSelectedObjects().iterator();
-			// iter.hasNext();) {
-			// Object editPart = iter.next();
-			// if(editPart instanceof EditPart) {
-			// Object obj = ((EditPart)editPart).getModel();
-			// if(obj instanceof NamedNode) {
-			// Object element = ((NamedNode)obj).getObject();
-			// if(element instanceof BreakdownElement) {
-			// return false;
-			// }
-			// }
-			// }
-			// }
-			// return super.calculateEnabled();
-			// }
-			// TODO: uncomment this code if we are ready to test deleting
-			// BreakdownElement node
-			//
-			// /* (non-Javadoc)
-			// * @see org.eclipse.gef.ui.actions.DeleteAction#run()
-			// */
-			public void run() {
-				List elements = new ArrayList();
-				for (Iterator iter = getSelectedObjects().iterator(); iter
-						.hasNext();) {
-					Object editPart = iter.next();
-					if (editPart instanceof EditPart) {
-						Object obj = ((EditPart) editPart).getModel();
-						if (obj instanceof NamedNode) {
-							Object element = ((NamedNode) obj).getObject();
-							if (element instanceof BreakdownElement) {
-								elements.add(element);
-							}
-						}
-					}
-				}
-				if (!elements.isEmpty()) {
-					ProcessDeleteAction deleteAction = new ProcessDeleteAction() {
-						/*
-						 * (non-Javadoc)
-						 * 
-						 * @see org.eclipse.epf.authoring.ui.actions.MethodElementDeleteAction#createCommand(java.util.Collection)
-						 */
-						public org.eclipse.emf.common.command.Command createCommand(
-								Collection selection) {
-							domain = null;
-							for (Iterator iter = selection.iterator(); iter
-									.hasNext();) {
-								Object element = iter.next();
-								if (element instanceof WorkProductDescriptor) {
-									domain = new AdapterFactoryEditingDomain(
-											TngAdapterFactory.INSTANCE
-													.getPBS_ComposedAdapterFactory(),
-											new BasicCommandStack());
-									break;
-								}
-							}
-							if (domain == null) {
-								domain = new AdapterFactoryEditingDomain(
-										TngAdapterFactory.INSTANCE
-												.getWBS_ComposedAdapterFactory(),
-										new BasicCommandStack());
-							}
-							return super.createCommand(selection);
-						}
-
-					};
-					deleteAction.updateSelection(new StructuredSelection(
-							elements));
-					deleteAction.run();
-					if (deleteAction.isDeletionConfirmed()) {
-						super.run();
-
-						// save the editor
-						// 
-						BusyIndicator.showWhile(getEditorSite().getShell()
-								.getDisplay(), new Runnable() {
-
-							public void run() {
-								doSave(new NullProgressMonitor());
-							}
-						});
-					}
-
-				} else {
-					super.run();
-				}
-			}
-		};
-		registry.registerAction(action);
-		getSelectionActions().add(action.getId());
-
-		action = new CopyTemplateAction(this);
-		registry.registerAction(action);
-
-		// refresh diagram from base action
-		//
-		action = new Action(
-				DiagramUIResources.AbstractDiagramEditor_refreshFromBaseActivity_text) { //$NON-NLS-1$
-			public String getId() {
-				return REFRESH_FROM_BASE_ACTIVITY;
-			}
-
-			public void run() {
-				refreshFromBase();
-			}
-
-			public boolean isEnabled() {
-				Activity act = (Activity) getMethodElementFromInput();
-				return act.getVariabilityBasedOnElement() != null;
-			}
-		};
-		registry.registerAction(action);
-
-		// action = new MatchWidthAction(this);
-		// registry.registerAction(action);
-		// getSelectionActions().add(action.getId());
-
-		// action = new MatchHeightAction(this);
-		// registry.registerAction(action);
-		// getSelectionActions().add(action.getId());
-
-		// action = new LogicPasteTemplateAction(this);
-		// registry.registerAction(action);
-		// getSelectionActions().add(action.getId());
-
-		// action = new IncrementDecrementAction(this, true);
-		// registry.registerAction(action);
-		// getSelectionActions().add(action.getId());
-		//
-		// action = new IncrementDecrementAction(this, false);
-		// registry.registerAction(action);
-		// getSelectionActions().add(action.getId());
-		//
-		// action = new DirectEditAction((IWorkbenchPart)this);
-		// registry.registerAction(action);
-		// getSelectionActions().add(action.getId());
-		//
-		// action = new AlignmentAction((IWorkbenchPart)this,
-		// PositionConstants.LEFT);
-		// registry.registerAction(action);
-		// getSelectionActions().add(action.getId());
-		//
-		// action = new AlignmentAction((IWorkbenchPart)this,
-		// PositionConstants.RIGHT);
-		// registry.registerAction(action);
-		// getSelectionActions().add(action.getId());
-		//
-		// action = new AlignmentAction((IWorkbenchPart)this,
-		// PositionConstants.TOP);
-		// registry.registerAction(action);
-		// getSelectionActions().add(action.getId());
-		//
-		// action = new AlignmentAction((IWorkbenchPart)this,
-		// PositionConstants.BOTTOM);
-		// registry.registerAction(action);
-		// getSelectionActions().add(action.getId());
-		//
-		// action = new AlignmentAction((IWorkbenchPart)this,
-		// PositionConstants.CENTER);
-		// registry.registerAction(action);
-		// getSelectionActions().add(action.getId());
-		//
-		// action = new AlignmentAction((IWorkbenchPart)this,
-		// PositionConstants.MIDDLE);
-		// registry.registerAction(action);
-		// getSelectionActions().add(action.getId());
-
-		IAction action1 = new Action(
-				DiagramUIResources.AbstractDiagramEditor_formatTextBoxActivity_text) { //$NON-NLS-1$
-			public String getId() {
-				return FONT_DIALOG;
-			}
-
-			public void run() {
-				try {
-					try {
-						EditPart selectedEditPart = (EditPart) getGraphicalViewer()
-								.getSelectedEditParts().get(0);
-						
-						FontDialog fd = new FontDialog(PlatformUI
-								.getWorkbench().getActiveWorkbenchWindow()
-								.getShell());
-						// Restoring old values.
-						if(selectedEditPart != null){
-							restoreFontData(selectedEditPart, fd);
-						}
-						
-						fd.open();
-						if (selectedEditPart instanceof FreeTextNodeEditPart) {
-							if (fd.getFontList() != null) {
-								FontData fData = fd.getFontList()[0];
-								if (fData != null) {
-									if (font != null && !font.isDisposed()) {
-										font.dispose();
-									}
-									// if(color != null && !font.isDisposed()){
-									// color.dispose();
-									// }
-									font = new Font(PlatformUI.getWorkbench()
-											.getDisplay(), fData);
-									
-									if(fd.getRGB() != null)
-									color = new Color(null, fd.getRGB());
-									
-									((FreeTextFigure) ((FreeTextNodeEditPart) selectedEditPart)
-											.getFigure()).setFont(font);
-									
-									if(color != null)
-									((FreeTextFigure) ((FreeTextNodeEditPart) selectedEditPart)
-											.getFigure())
-											.setForegroundColor(color);
-
-									GraphNode graphNode = ((Node) selectedEditPart
-											.getModel()).getGraphNode();
-									List list = graphNode
-											.getList(UmaPackage.GRAPH_NODE__PROPERTY);
-
-									String text = ((FreeTextFigure) ((FreeTextNodeEditPart) selectedEditPart)
-											.getFigure()).getText();
-									Property property = getPropertyByKey(
-											list,
-											GraphicalDataHelper.GRAPH_NODE_FREE_TEXT);
-									if (property != null) {
-										property.setValue(text);
-										list.add(property);
-									}
-									setProperty(
-											list,
-											TemplateConstants.PROPERTY_FONT_NAME,
-											fData.getName());
-									setProperty(
-											list,
-											TemplateConstants.PROPERTY_FONT_STYLE,
-											new Integer(fData.getStyle())
-													.toString());
-									setProperty(
-											list,
-											TemplateConstants.PROPERTY_FONT_HEIGHT,
-											new Integer(fData.getHeight())
-													.toString());
-									if(fd.getRGB() != null){
-									setProperty(
-											list,
-											TemplateConstants.PROPERTY_FONT_RED,
-											new Integer(fd.getRGB().red)
-													.toString());
-									setProperty(
-											list,
-											TemplateConstants.PROPERTY_FONT_BLUE,
-											new Integer(fd.getRGB().blue)
-													.toString());
-									setProperty(
-											list,
-											TemplateConstants.PROPERTY_FONT_GREEN,
-											new Integer(fd.getRGB().green)
-													.toString());
-									}
-									selectedEditPart.refresh();
-								}
-							}
-						}
-
-					} catch (Exception exception) {
-						exception.printStackTrace();
-					}
-				} catch (RuntimeException e) {
-					e.printStackTrace();
-				}
-
-			}
-
-			public boolean isEnabled() {
-				List editParts = getGraphicalViewer().getSelectedEditParts();
-				if (editParts.size() != 1)
-					return false;
-				EditPart editPart = (EditPart) editParts.get(0);
-				if (editPart.getModel() instanceof TypedNode) {
-					return (((TypedNode) editPart.getModel()).getType() == TypedNode.FREE_TEXT);
-				}
-				return false;
-			}
-
-			public Property getPropertyByKey(List list, String key) {
-				if (!list.isEmpty()) {
-					for (Iterator iror = list.iterator(); iror.hasNext();) {
-						Property property = (Property) iror.next();
-						if (property != null) {
-							if (property.getKey().equals(key)) {
-								return property;
-							} 
-						}
-					}
-				}
-				return null;
-			}
-
-			public void setProperty(List list, String key, String value) {
-
-				Property property = getPropertyByKey(list, key);
-				if (property != null) {
-					property.setValue(value);
-
-				} else {
-					property = UmaFactory.eINSTANCE.createProperty();
-					property.setKey(key);
-					property.setValue(value);
-				}
-				list.add(property);
-			}
-			public void restoreFontData(EditPart selectedEditPart, FontDialog fd){
-				GraphNode graphNode = ((Node) selectedEditPart
-						.getModel()).getGraphNode();
-					List list = graphNode
-						.getList(UmaPackage.GRAPH_NODE__PROPERTY);
-					if(list != null && !list.isEmpty()){
-						Property property = null;
-						String fontname = null, fontStyle = null, fontHeight = null, red = null, blue = null, green = null;
-
-						property = getPropertyByKey(list, TemplateConstants.PROPERTY_FONT_NAME);
-						if(property != null ){
-							fontname = property.getValue();
-						}else{
-							return;
-						}
-						
-						property = getPropertyByKey(list, TemplateConstants.PROPERTY_FONT_STYLE);
-						if(property != null ){
-							fontStyle = property.getValue();
-						}
-						property = getPropertyByKey(list, TemplateConstants.PROPERTY_FONT_HEIGHT);
-						if(property != null){
-							fontHeight = property.getValue();
-						}
-						property = getPropertyByKey(list, TemplateConstants.PROPERTY_FONT_RED);
-						if(property != null){
-							red = property.getValue();
-						}
-						property = getPropertyByKey(list, TemplateConstants.PROPERTY_FONT_BLUE);
-						if(property != null){
-							blue = property.getValue();
-						}
-						property = getPropertyByKey(list, TemplateConstants.PROPERTY_FONT_GREEN);
-						if(property != null){
-							green = property.getValue();
-						}
-						
-						FontData fData = new FontData();
-						fData.setName(fontname);
-						fData.setHeight((new Integer(fontHeight)).intValue());
-						fData.setStyle((new Integer(fontStyle)).intValue());
-						
-						//, (new Integer(fontStyle)).intValue(), (new Integer(fontHeight)).intValue());
-						if( red != null && blue != null && green != null){
-							RGB rgb = new RGB(new Integer(red).intValue(),
-									new Integer(green).intValue(),
-									 new Integer(blue).intValue()
-									 );
-							fd.setRGB(rgb);
-//							if(rgb != null){
-//								rgb.red = new Integer(red).intValue();
-//								rgb.blue = new Integer(blue).intValue();
-//								rgb.green = new Integer(green).intValue();
-//							}
-						}
-						fd.setFontList(new FontData[]{fData});
-					}
-			}
-		};
-		getActionRegistry().registerAction(action1);
-
-		// Jinhua Xi
-		// added this to consolidate common actions into a service class
-		actionService = new DiagramActionService(getGraphicalViewer(),
-				getEditDomain(), registry);
-		actionService.registerHorizontalAlignAverageAction();
-		actionService.registerHorizontalAlignFirstSelectedAction();
-		actionService.registerVerticalAlignAverageAction();
-		actionService.registerVerticalAlignFirstSelectedAction();
-
-		// // align horizontally to average y-value of all nodes
-		// IAction hAlignAverageAction = new Action(
-		// DiagramUIResources
-		// .getString("DiagramUI.AbstractDiagramEditor.hAlignAverageAction.text"))
-		// { //$NON-NLS-1$
-		// public void run() {
-		// horizAlignToAverageSelected();
-		// }
-		//
-		// public String getId() {
-		// return ALIGN_HORZ_AVERAGE;
-		// }
-		// };
-		// getActionRegistry().registerAction(hAlignAverageAction);
-		//
-		// // align horizontally to y-value of first selected node
-		// IAction hAlignFirstSelectedAction = new Action(
-		// DiagramUIResources
-		// .getString("DiagramUI.AbstractDiagramEditor.hAlignFirstSelectedAction.text"))
-		// { //$NON-NLS-1$
-		// public void run() {
-		// horzAlignToFirstSelected();
-		// }
-		//
-		// public String getId() {
-		// return ALIGN_HORZ_FIRST_SELECTED;
-		// }
-		// };
-		// getActionRegistry().registerAction(hAlignFirstSelectedAction);
-		//
-		// // align vertically to average x-value of all selected nodes
-		// IAction vAlignAverageAction = new Action(
-		// DiagramUIResources
-		// .getString("DiagramUI.AbstractDiagramEditor.vAlignAverageAction.text"))
-		// { //$NON-NLS-1$
-		// public void run() {
-		// verticalAlignToAverageSelected();
-		// }
-		//
-		// public String getId() {
-		// return ALIGN_VERT_AVERAGE;
-		// }
-		// };
-		// getActionRegistry().registerAction(vAlignAverageAction);
-		//
-		// // align vertically to x-value of first selected node
-		// IAction vAlignFirstSelectedAction = new Action(
-		// DiagramUIResources
-		// .getString("DiagramUI.AbstractDiagramEditor.vAlignFirstSelectedAction.text"))
-		// { //$NON-NLS-1$
-		// public void run() {
-		// verticalAlignToFirstSelected();
-		// }
-		//
-		// public String getId() {
-		// return ALIGN_VERT_FIRST_SELECTED;
-		// }
-		// };
-		// getActionRegistry().registerAction(vAlignFirstSelectedAction);
-
-		action = createAnAction(
-				DiagramUIResources.AbstractDiagram_FreeText_text, freeTxtNodeCreationFactory, //$NON-NLS-1$
-				CREATE_FREE_TEXT,
-				DiagramUIResources.AbstractDiagram_FreeText_tooltip, //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"freetext_pal16.gif")); //$NON-NLS-1$
-		getActionRegistry().registerAction(action);
-
-		action = new Action(DiagramUIResources.moveAction_label) { //$NON-NLS-1$
-
-			public void setImageDescriptor(ImageDescriptor newImage) {
-				super.setImageDescriptor(newImage);
-			}
-
-			public void runWithEvent(Event event) {
-				super.runWithEvent(event);
-
-			}
-
-			public void run() {
-				super.run();
-			}
-
-			public boolean isEnabled() {
-				List editParts = getGraphicalViewer().getSelectedEditParts();
-				if (editParts.size() > 0)
-					return true;
-				return false;
-			}
-
-			public String getId() {
-				return MOVE;
-			}
-
-		};
-		getActionRegistry().registerAction(action);
-
-		IAction linkAction = new Action(DiagramUIResources.AbstractDiagram_Link_text) { //$NON-NLS-1$
-			public void run() {
-				List editParts = getGraphicalViewer().getSelectedEditParts();
-				if (editParts.size() == 2) {
-					EditPart sourceEditPart = (EditPart) editParts.get(0);
-					EditPart targetEditPart = (EditPart) editParts.get(1);
-					List targetList = new ArrayList();
-					if (sourceEditPart instanceof FreeTextNodeEditPart
-							|| targetEditPart instanceof FreeTextNodeEditPart)
-						return;
-					if (sourceEditPart instanceof NodeEditPart) {
-						targetList = ((NodeEditPart) sourceEditPart)
-								.getSourceConnections();
-						if (!targetList.isEmpty()) {
-							for (Iterator itor = targetList.iterator(); itor
-									.hasNext();) {
-								LinkEditPart obj = (LinkEditPart) itor.next();
-								if (targetEditPart.equals(obj.getSource()))
-									return;
-								if (targetEditPart.equals(obj.getTarget()))
-									return;
-							}
-						}
-						targetList = ((NodeEditPart) sourceEditPart)
-								.getTargetConnections();
-						if (!targetList.isEmpty()) {
-							for (Iterator itor = targetList.iterator(); itor
-									.hasNext();) {
-								LinkEditPart obj = (LinkEditPart) itor.next();
-								if (targetEditPart.equals(obj.getSource()))
-									return;
-								if (targetEditPart.equals(obj.getTarget()))
-									return;
-							}
-						}
-					}
-					Link link = ModelFactory.eINSTANCE.createLink();
-					if (sourceEditPart.getModel() instanceof Node)
-						link.setSource((Node) sourceEditPart.getModel());
-					if (targetEditPart.getModel() instanceof Node)
-						link.setTarget((Node) targetEditPart.getModel());
-					org.eclipse.gef.commands.Command c = new CreateLinkCommand(
-							link, (Node) sourceEditPart.getModel());
-					getCommandStack().execute(c);
-				}
-			}
-
-			public boolean isEnabled() {
-				List editParts = getGraphicalViewer().getSelectedEditParts();
-				for (Iterator itor = editParts.iterator(); itor.hasNext();) {
-					Object part = itor.next();
-					if (part instanceof FreeTextNodeEditPart)
-						return false;
-				}
-				if (editParts.size() == 2)
-					return true;
-				return false;
-			}
-
-			public String getId() {
-				return CREATE_LINK;
-			}
-		};
-		getActionRegistry().registerAction(linkAction);
-
-		IAction selectLinkAction = new Action(DiagramUIResources.AbstractDiagram_Link_select) { //$NON-NLS-1$
-
-			public void run() {
-				List editParts = getGraphicalViewer().getSelectedEditParts();
-				if (editParts.size() == 1) {
-					EditPart part = (EditPart) editParts.get(0);
-					if (part instanceof NodeEditPart) {
-						List list = ((NodeEditPart) part)
-								.getSourceConnections();
-						if (list != null && !list.isEmpty()) {
-							LinkEditPart linkpart = (LinkEditPart) list.get(0);
-							linkpart.setSelected(1);
-							getGraphicalViewer().select(linkpart);
-							// part.setSelected(0);
-						}
-					}
-				}
-			}
-
-			public boolean isEnabled() {
-				List editParts = getGraphicalViewer().getSelectedEditParts();
-				if (editParts.size() == 1) {
-					return true;
-				}
-				return false;
-			}
-
-			public String getId() {
-				return SELECT_LINK;
-			}
-
-		};
-		getActionRegistry().registerAction(selectLinkAction);
-
-		IAction createBendPointAction = new Action(DiagramUIResources.AbstractDiagram_BendPoint_create) { //$NON-NLS-1$
-
-			public void run() {
-				List editParts = getGraphicalViewer().getSelectedEditParts();
-				if (editParts.size() == 1) {
-					EditPart part = (EditPart) editParts.get(0);
-					if (part instanceof LinkEditPart) {
-						// return true;
-						Link link = (Link) ((LinkEditPart) part).getModel();
-						List bendpoints = link.getBendpoints();
-						if (bendpoints == null || bendpoints.size() < 1) {
-							Point sp = link.getSourceEndPoint();
-							Point tp = link.getTargetEndPoint();
-							if (sp == null) {
-								if (link.getSource() == null) {
-									sp = ((Node) link.eContainer())
-											.getLocation();
-								} else {
-									sp = link.getSource().getLocation();
-								}
-							}
-							if (tp == null) {
-								tp = link.getTarget().getLocation();
-							}
-							Point bPoint = new Point();
-							bPoint.x = (sp.x + tp.x) / 2;
-							bPoint.y = (sp.y + tp.y) / 2;
-							org.eclipse.gef.commands.Command c = new CreateBendpointCommand(
-									link, bPoint, 0);
-							getCommandStack().execute(c);
-
-						}
-					}
-				}
-			}
-
-			public boolean isEnabled() {
-				List editParts = getGraphicalViewer().getSelectedEditParts();
-				if (editParts.size() == 1) {
-					EditPart part = (EditPart) editParts.get(0);
-					if (part instanceof LinkEditPart) {
-						return true;
-					}
-				}
-				return false;
-			}
-
-			public String getId() {
-				return CREATE_BEND_POINT;
-			}
-		};
-		getActionRegistry().registerAction(createBendPointAction);
-
-		IAction refreshAction = new Action(DiagramUIResources.refreshAction_label) { //$NON-NLS-1$
-			public void run() {
-				Diagram diagram = (Diagram) editPart.getModel();
-				if (editPart.isActive()) {
-					editPart.deactivate();
-				}
-				diagram.removeConsumer(AbstractDiagramEditor.this);
-				createEditPart();
-				getGraphicalViewer().setContents(editPart);
-			}
-
-			public String getId() {
-				return REFRESH;
-			}
-		};
-		getActionRegistry().registerAction(refreshAction);
-		IAction deleteDiagramAction = new Action(DiagramUIResources.DeleteDiagram_text) { //$NON-NLS-1$
-
-			public void run() {
-				if (AuthoringUIPlugin
-						.getDefault()
-						.getMsgDialog()
-						.displayPrompt(
-								DiagramUIResources.DeleteDiagram_text, //$NON-NLS-1$
-								DiagramUIResources.DeleteDiagram_prompt)) { //$NON-NLS-1$
-					Diagram diagram = (Diagram) ((EditPart) getGraphicalViewer()
-							.getContents()).getModel();
-					EcoreUtil.remove(diagram.getUMADiagram());
-					doSave(new NullProgressMonitor());
-					getSite().getPage().closeEditor(
-							getSite().getPage().getActiveEditor(), false);
-				}
-			}
-
-			public boolean isEnabled() {
-				return getGraphicalViewer().getSelectedEditParts().size() == 0;
-			}
-
-			public String getId() {
-				return DELETE_DIAGRAM;
-			}
-
-		};
-		getActionRegistry().registerAction(deleteDiagramAction);
-		IAction alignBendPointAction = new Action(DiagramUIResources.align_bend_point_text) { //$NON-NLS-1$
-
-			public void run() {
-				EditPart part = (EditPart) getGraphicalViewer()
-						.getSelectedEditParts().get(0);
-				if (part instanceof LinkEditPart) {
-					LinkEditPart linkpart = ((LinkEditPart) part);
-					Link link = (Link) linkpart.getModel();
-					if (link.getBendpoints().size() > 0) {
-
-						GraphicalEditPart spart = ((GraphicalEditPart) linkpart
-								.getSource());
-						GraphicalEditPart tpart = ((GraphicalEditPart) linkpart
-								.getTarget());
-
-						Point sp = spart.getFigure().getBounds().getCenter();
-						Point tp = tpart.getFigure().getBounds().getCenter();
-
-						if (spart instanceof DecisionNodeEditPart
-								|| spart instanceof SynchBarNodeEditPart) {
-							sp = ((TypedNode) spart.getModel()).getLocation();
-							List list = ((NodeEditPart) spart)
-									.getSourceConnections();
-							for (Iterator itor = list.iterator(); itor
-									.hasNext();) {
-								LinkEditPart lp = (LinkEditPart) itor.next();
-								if (lp.getTarget().equals(tpart)) {
-									Point sourceEndPoint = ((Link) lp
-											.getModel()).getSourceEndPoint();
-									sp = sp.getTranslated(sourceEndPoint);
-								}
-							}
-						}
-
-						if (tpart instanceof DecisionNodeEditPart
-								|| tpart instanceof SynchBarNodeEditPart) {
-							tp = ((TypedNode) tpart.getModel()).getLocation();
-							List list = ((NodeEditPart) tpart)
-									.getTargetConnections();
-							for (Iterator itor = list.iterator(); itor
-									.hasNext();) {
-								LinkEditPart lp = (LinkEditPart) itor.next();
-								if (lp.getSource().equals(spart)) {
-									Point targetEndPoint = ((Link) lp
-											.getModel()).getTargetEndPoint();
-									tp = tp.getTranslated(targetEndPoint);
-								}
-							}
-						}
-						for (int i = 0; i < link.getBendpoints().size(); i++) {
-							AbsoluteBendpoint oldbp = (AbsoluteBendpoint) link
-									.getBendpoints().get(i);
-							AbsoluteBendpoint bp = new AbsoluteBendpoint(
-									new Point(-1, -1));
-							AbsoluteBendpoint previousbp = null;
-							int delta = 40;
-							int position = 0;
-
-							if (i == 0) {
-								position = sp.getPosition(oldbp);
-							} else {
-								previousbp = (AbsoluteBendpoint) link
-										.getBendpoints().get(i - 1);
-								position = previousbp.getPosition(oldbp);
-							}
-
-							if (position == PositionConstants.SOUTH
-									|| position == PositionConstants.NORTH) {
-								if (i == 0) {
-									if (sp.x - delta < oldbp.x
-											&& sp.x + delta > oldbp.x
-											&& !(sp.x == oldbp.x)) {
-										bp.x = sp.x;
-									}
-								} else {
-									if (previousbp.x - delta < oldbp.x
-											&& previousbp.x + delta > oldbp.x
-											&& !(previousbp.x == oldbp.x)) {
-										bp.x = previousbp.x;
-									}
-								}
-								if (link.getBendpoints().size() - 1 == i) {
-									if (tp.y - delta < oldbp.y
-											&& tp.y + delta > oldbp.y
-											&& !(tp.y == oldbp.y)) {
-										bp.y = tp.y;
-									}
-								} else {
-									bp.y = oldbp.y;
-								}
-							}
-							if (position == PositionConstants.EAST
-									|| position == PositionConstants.WEST) {
-
-								if (i == 0) {
-									if (sp.y - delta < oldbp.y
-											&& sp.y + delta > oldbp.y
-											&& !(sp.y == oldbp.y)) {
-										bp.y = sp.y;
-									}
-								} else {
-									if (previousbp.y - delta < oldbp.y
-											&& previousbp.y + delta > oldbp.y
-											&& !(previousbp.y == oldbp.y)) {
-										bp.y = previousbp.y;
-									}
-								}
-								if (link.getBendpoints().size() - 1 == i) {
-									if (tp.x - delta < oldbp.x
-											&& tp.x + delta > oldbp.x
-											&& !(tp.x == oldbp.x)) {
-										bp.x = tp.x;
-									}
-								} else {
-									bp.x = oldbp.x;
-								}
-							}
-							if (bp.x == -1 && bp.y != -1) {
-								org.eclipse.gef.commands.Command c = new MoveBendpointCommand(
-										link, new Point(oldbp.x, bp.y), i);
-								// ((RootEditPart)getRoot()).getViewer().getEditDomain().getCommandStack().execute(c);
-								getCommandStack().execute(c);
-							}
-							if (bp.x != -1 && bp.y == -1) {
-								org.eclipse.gef.commands.Command c = new MoveBendpointCommand(
-										link, new Point(bp.x, oldbp.y), i);
-								getCommandStack().execute(c);
-							}
-							if (bp.x != -1 && bp.y != -1) {
-								org.eclipse.gef.commands.Command c = new MoveBendpointCommand(
-										link, new Point(bp.x, bp.y), i);
-								getCommandStack().execute(c);
-							}
-						}
-					}
-				}
-			}
-
-			public boolean isEnabled() {
-				List list = getGraphicalViewer().getSelectedEditParts();
-				if (list.size() == 1) {
-					if (list.get(0) instanceof LinkEditPart) {
-						LinkEditPart part = (LinkEditPart) list.get(0);
-						Link link = (Link) part.getModel();
-						if (link.getBendpoints().size() > 0)
-							return true;
-					}
-				}
-				return false;
-			}
-
-			public String getId() {
-				return ALIGN_BEND_POINT;
-			}
-
-		};
-		
-		// Viewer Print Action
-		action = new DiagramPrintAction(this, getGraphicalViewer());
-		registry.registerAction(action);
-		getActionRegistry().registerAction(alignBendPointAction);
-	}
-
-	protected IAction createAnAction(String actionName,
-			CreationFactory creationFactory, String actionId,
-			String tooltipString, ImageDescriptor imagedesc) {
-		final CreationFactory factory = creationFactory;
-		final String id = actionId;
-		final String tooltip = tooltipString;
-		final ImageDescriptor imagedescriptor = imagedesc;
-		return new Action(actionName) { //$NON-NLS-1$
-
-			public void run() {
-				CreateRequest request = new CreateRequest();
-				// CreationFactory factory = getFactory(template);
-				if (factory == null)
-					return;
-				request.setFactory(factory);
-				request.setLocation(new Point(10, 10));
-
-				if (request.getNewObject() instanceof Node) {
-					Point loc = request.getLocation();
-					Diagram parent = (Diagram) editPart.getModel();
-					org.eclipse.gef.commands.Command c = new CreateNodeCommand(
-							(Node) request.getNewObject(), parent, loc);
-					getCommandStack().execute(c);
-				}
-			}
-
-			public String getId() {
-				return id;
-			}
-
-			public boolean isEnabled() {
-				if (TngUtil.isLocked(getMethodElementFromInput())) {
-					return false;
-				} else
-					return true;
-			}
-
-			public String getToolTipText() {
-				return tooltip;
-			}
-
-			public void setImageDescriptor(
-					org.eclipse.jface.resource.ImageDescriptor newImage) {
-				super.setImageDescriptor(imagedescriptor);
-			}
-
-			public ImageDescriptor getImageDescriptor() {
-				return imagedescriptor;
-			}
-		};
-	}
-
-	protected PaletteViewerProvider createPaletteViewerProvider() {
-		return new PaletteViewerProvider(getEditDomain()) {
-			private IMenuListener menuListener;
-
-			protected void configurePaletteViewer(PaletteViewer viewer) {
-				super.configurePaletteViewer(viewer);
-				// TODO viewer.setCustomizer(new LogicPaletteCustomizer());
-				viewer
-						.addDragSourceListener(new TemplateTransferDragSourceListener(
-								viewer));
-			}
-
-			protected void hookPaletteViewer(PaletteViewer viewer) {
-				super.hookPaletteViewer(viewer);
-				final CopyTemplateAction copy = (CopyTemplateAction) getActionRegistry()
-						.getAction(ActionFactory.COPY.getId());
-				viewer.addSelectionChangedListener(copy);
-				if (menuListener == null)
-					menuListener = new IMenuListener() {
-						public void menuAboutToShow(IMenuManager manager) {
-							manager.appendToGroup(
-									GEFActionConstants.GROUP_COPY, copy);
-						}
-					};
-				viewer.getContextMenu().addMenuListener(menuListener);
-			}
-		};
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.gef.ui.parts.GraphicalEditorWithFlyoutPalette#getPalettePreferences()
-	 */
-	protected FlyoutPreferences getPalettePreferences() {
-		return new FlyoutPreferences() {
-			public int getDockLocation() {
-				return AuthoringUIPlugin.getDefault().getPreferenceStore()
-						.getInt(PALETTE_DOCK_LOCATION);
-			}
-
-			public int getPaletteState() {
-				return AuthoringUIPlugin.getDefault().getPreferenceStore()
-						.getInt(PALETTE_STATE);
-			}
-
-			public int getPaletteWidth() {
-				return AuthoringUIPlugin.getDefault().getPreferenceStore()
-						.getInt(PALETTE_SIZE);
-			}
-
-			public void setDockLocation(int location) {
-				AuthoringUIPlugin.getDefault().getPreferenceStore().setValue(
-						PALETTE_DOCK_LOCATION, location);
-			}
-
-			public void setPaletteState(int state) {
-				AuthoringUIPlugin.getDefault().getPreferenceStore().setValue(
-						PALETTE_STATE, state);
-			}
-
-			public void setPaletteWidth(int width) {
-				AuthoringUIPlugin.getDefault().getPreferenceStore().setValue(
-						PALETTE_SIZE, width);
-			}
-		};
-	}
-
-	protected KeyHandler getCommonKeyHandler() {
-		if (sharedKeyHandler == null) {
-			sharedKeyHandler = new KeyHandler() {
-
-				public boolean keyPressed(KeyEvent event) {
-					if ((event.stateMask == SWT.CTRL)
-							&& (event.keyCode == SWT.ARROW_RIGHT)) {
-						move(1);
-					}
-					if ((event.stateMask == SWT.CTRL)
-							&& (event.keyCode == SWT.ARROW_DOWN)) {
-						move(2);
-
-					}
-					if ((event.stateMask == SWT.CTRL)
-							&& (event.keyCode == SWT.ARROW_UP)) {
-						move(3);
-					}
-					if ((event.stateMask == SWT.CTRL)
-							&& (event.keyCode == SWT.ARROW_LEFT)) {
-						move(4);
-					}
-
-					return super.keyPressed(event);
-				}
-
-				public boolean move(int direction) {
-					List list = getGraphicalViewer().getSelectedEditParts();
-					GraphicalEditPart part = (GraphicalEditPart) list.get(0);
-					if (part.getModel() instanceof Node) {
-						Node node = (Node) part.getModel();
-						Point point = node.getLocation();
-						int newx = point.x;
-						int newy = point.y;
-						int presslength = 1;
-						switch (direction) {
-						case 1:
-							// node.setLocation(new Point(point.x+10,point.y));
-							newx = point.x + presslength;
-							break;
-						case 2:
-							// node.setLocation(new Point(point.x,point.y+10));
-							newy += presslength;
-							break;
-						case 3:
-							// node.setLocation(new Point(point.x,point.y-10));
-							newy -= presslength;
-							break;
-						case 4:
-							// node.setLocation(new Point(point.x-10,point.y));
-							newx -= presslength;
-							break;
-						default:
-							break;
-						}
-						org.eclipse.gef.commands.Command c = new ChangeBoundsCommand(
-								node, new Point(newx, newy), node.getWidth());
-						getCommandStack().execute(c);
-						return true;
-					}
-					// TODO- check adding more bendpoint, capture bendpoint
-					// index on fly
-					if (part.getModel() instanceof Link) {
-						Link link = (Link) part.getModel();
-						List blist = link.getBendpoints();
-						int index = 0;
-						if (blist != null && blist.size() > 0) {
-							AbsoluteBendpoint point = (AbsoluteBendpoint) blist
-									.get(index);
-							int newx = point.x;
-							int newy = point.y;
-							int presslength = 5;
-							switch (direction) {
-							case 1:
-								// node.setLocation(new
-								// Point(point.x+10,point.y));
-								newx = point.x + presslength;
-								break;
-							case 2:
-								// node.setLocation(new
-								// Point(point.x,point.y+10));
-								newy += presslength;
-								break;
-							case 3:
-								// node.setLocation(new
-								// Point(point.x,point.y-10));
-								newy -= presslength;
-								break;
-							case 4:
-								// node.setLocation(new
-								// Point(point.x-10,point.y));
-								newx -= presslength;
-								break;
-							default:
-								break;
-							}
-							org.eclipse.gef.commands.Command c = new MoveBendpointCommand(
-									link, new Point(newx, newy), index);
-							getCommandStack().execute(c);
-						}
-					}
-					return true;
-				}
-
-			};
-			sharedKeyHandler
-					.put(KeyStroke.getPressed(SWT.DEL, 127, 0),
-							getActionRegistry().getAction(
-									ActionFactory.DELETE.getId()));
-			sharedKeyHandler.put(KeyStroke.getPressed(SWT.F2, 0),
-					getActionRegistry().getAction(
-							GEFActionConstants.DIRECT_EDIT));
-
-		}
-		return sharedKeyHandler;
-	}
-
-	/**
-	 * Sets the graphicalViewer for this EditorPart.
-	 * 
-	 * @param viewer
-	 *            the graphical viewer
-	 */
-	protected void setGraphicalViewer(GraphicalViewer viewer) {
-		super.setGraphicalViewer(viewer);
-		if (actionService != null) {
-			actionService.setGraphicalViewer(viewer);
-		}
-	}
-
-	protected void configureGraphicalViewer() {
-		super.configureGraphicalViewer();
-		ScrollingGraphicalViewer viewer = (ScrollingGraphicalViewer) getGraphicalViewer();
-
-		ScalableFreeformRootEditPart root = new ScalableFreeformRootEditPart();
-
-		// List zoomLevels = new ArrayList(3);
-		// zoomLevels.add(ZoomManager.FIT_ALL);
-		// zoomLevels.add(ZoomManager.FIT_WIDTH);
-		// zoomLevels.add(ZoomManager.FIT_HEIGHT);
-		// root.getZoomManager().setZoomLevelContributions(zoomLevels);
-		//
-		// IAction zoomIn = new ZoomInAction(root.getZoomManager());
-		// IAction zoomOut = new ZoomOutAction(root.getZoomManager());
-		// getActionRegistry().registerAction(zoomIn);
-		// getActionRegistry().registerAction(zoomOut);
-		// getSite().getKeyBindingService().registerAction(zoomIn);
-		// getSite().getKeyBindingService().registerAction(zoomOut);
-
-		viewer.setRootEditPart(root);
-
-		// viewer.setEditPartFactory(new MethodElementEditPartFactory());
-		viewer.setEditPartFactory(createEditPartFactory());
-
-		ContextMenuProvider provider = new DiagramContextMenuProvider(
-				getGraphicalViewer(), getActionRegistry());
-		getGraphicalViewer().setContextMenu(provider);
-		getSite().registerContextMenu(
-				"org.eclipse.epf.authoring.ui.editors.workflow.contextmenu", //$NON-NLS-1$
-				provider, getGraphicalViewer());
-
-		viewer.setKeyHandler(new GraphicalViewerKeyHandler(viewer)
-				.setParent(getCommonKeyHandler()));
-
-		// loadProperties();
-
-		// Actions
-		// IAction showRulers = new
-		// ToggleRulerVisibilityAction(getGraphicalViewer());
-		// getActionRegistry().registerAction(showRulers);
-		//    	
-		// IAction snapAction = new
-		// ToggleSnapToGeometryAction(getGraphicalViewer());
-		// getActionRegistry().registerAction(snapAction);
-		//
-		// IAction showGrid = new ToggleGridAction(getGraphicalViewer());
-		// getActionRegistry().registerAction(showGrid);
-
-		Listener listener = new Listener() {
-			public void handleEvent(Event event) {
-				handleActivationChanged(event);
-			}
-		};
-
-		getGraphicalControl().addListener(SWT.Activate, listener);
-		getGraphicalControl().addListener(SWT.Deactivate, listener);
-
-		getGraphicalControl().addListener(SWT.MouseDoubleClick, new Listener() {
-
-			public void handleEvent(Event event) {
-				handleDoubleClick(event);
-			}
-
-		});
-		if (getDiagramType().equalsIgnoreCase(
-				ResourceHelper.DIAGRAM_TYPE_ACTIVITY_DETAIL))
-			PlatformUI
-					.getWorkbench()
-					.getHelpSystem()
-					.setHelp(
-							getGraphicalControl(),
-							AuthoringUIHelpContexts.FORM_EDITOR_ACTIVITY_DETAIL_DIAGRAM_CONTEXT);
-		else if (getDiagramType().equalsIgnoreCase(
-				ResourceHelper.DIAGRAM_TYPE_WORKFLOW))
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(
-					getGraphicalControl(), AuthoringUIHelpContexts.FORM_EDITOR_ACTIVITY_DIAGRAM_CONTEXT); 
-		else if (getDiagramType().equalsIgnoreCase(
-				ResourceHelper.DIAGRAM_TYPE_WP_DEPENDENCY))
-			PlatformUI
-					.getWorkbench()
-					.getHelpSystem()
-					.setHelp(getGraphicalControl(), AuthoringUIHelpContexts.FORM_EDITOR_WP_DEPENDENCY_DIAGRAM_CONTEXT);
-
-		Display display = getGraphicalControl().getDisplay();
-		if (!(display == null || display.isDisposed())) {
-			display.asyncExec(new Runnable() {
-				public void run() {
-					if (getPaletteRoot() != null) {
-						Object obj = getMethodElementFromInput();
-						if (TngUtil.isLocked((EObject) obj)) {
-							List list = getPaletteRoot().getChildren();
-							for (Iterator itor = list.iterator(); itor
-									.hasNext();) {
-								PaletteEntry entry = (PaletteEntry) itor.next();
-								entry.setVisible(false);
-							}
-
-						} else {
-							List list = getPaletteRoot().getChildren();
-							for (Iterator itor = list.iterator(); itor
-									.hasNext();) {
-								PaletteEntry entry = (PaletteEntry) itor.next();
-								entry.setVisible(true);
-							}
-						}
-					}
-				}
-			});
-		}
-		
-		currentConfig = LibraryService.getInstance().getCurrentMethodConfiguration();
-		
-		// listen to change for current selection of MethodConfiguration or changes in 
-		// current configuration.
-		//
-		LibraryService.getInstance().addListener(libSvcListener);
-		ILibraryManager manager = LibraryService.getInstance().getCurrentLibraryManager();
-		if (manager != null) {
-			manager.addListener(libraryListener);
-		}
-		
-		IAction action = getActionRegistry().getAction(ActionFactory.PRINT.getId());
-		if(action instanceof DiagramPrintAction){
-			((DiagramPrintAction)action).setViewer(viewer);
-		}
-
-	}
-
-	/**
-	 * @return
-	 */
-	protected abstract EditPartFactory createEditPartFactory();
-
-	/**
-	 * @param event
-	 */
-	protected void handleDoubleClick(Event event) {
-	}
-
-	protected void initializeGraphicalViewer() {
-		super.initializeGraphicalViewer();
-		getGraphicalViewer().setContents(editPart);
-
-		TransferDropTargetListener listener = createDropTargetListener();
-		if (listener != null) {
-			getGraphicalViewer().addDropTargetListener(listener);
-		}
-
-		// AbstractEditPartViewer
-		// getGraphicalViewer().addDropTargetListener(
-		// new TextTransferDropTargetListener(getGraphicalViewer(),
-		// TextTransfer.getInstance()));
-	}
-
-	protected void initializeCreationFactories() {
-		templateNameToCreationFactoryMap = new HashMap();
-
-		if (freeTxtNodeCreationFactory == null)
-			freeTxtNodeCreationFactory = new CreationFactory() {
-
-				public Object getNewObject() {
-					TypedNode node = ModelFactory.eINSTANCE.createTypedNode();
-					node.setType(TypedNode.FREE_TEXT);
-					node.setObject(GraphicalDataHelper
-							.newTypedGraphNode(TypedNode.FREE_TEXT));
-					return node;
-				}
-
-				public Object getObjectType() {
-					return TemplateConstants.FREE_TEXT;
-				}
-
-			};
-		CreationFactory creationFactory = freeTxtNodeCreationFactory;
-		templateNameToCreationFactoryMap.put(creationFactory.getObjectType(),
-				creationFactory);
-
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.editors.AbstractDiagramEditor#createDropTargetListener()
-	 */
-	protected TransferDropTargetListener createDropTargetListener() {
-		return new TemplateTransferDropTargetListener(getGraphicalViewer()) {
-
-			protected CreationFactory getFactory(Object template) {
-				return (CreationFactory) templateNameToCreationFactoryMap
-						.get(template);
-			}
-
-		};
-	}
-
-	protected void handleActivationChanged(Event event) {
-		IAction copy = null;
-		if (event.type == SWT.Deactivate)
-			copy = getActionRegistry().getAction(ActionFactory.COPY.getId());
-		if (getEditorSite().getActionBars().getGlobalActionHandler(
-				ActionFactory.COPY.getId()) != copy) {
-			getEditorSite().getActionBars().setGlobalActionHandler(
-					ActionFactory.COPY.getId(), copy);
-			getEditorSite().getActionBars().updateActionBars();
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gef.ui.parts.GraphicalEditorWithFlyoutPalette#getPaletteRoot()
-	 */
-	protected PaletteRoot getPaletteRoot() {
-		if (paletteRoot == null) {
-			createPaletteRoot();
-		}
-		return paletteRoot;
-	}
-
-	/**
-	 * 
-	 */
-	private void createPaletteRoot() {
-		paletteRoot = new PaletteRoot();
-		paletteRoot.addAll(createCategories(paletteRoot));
-	}
-
-	private List createCategories(PaletteRoot root) {
-		List categories = new ArrayList();
-
-		PaletteContainer paletteContainer = createControlGroup(root);
-		if (paletteContainer != null) {
-			categories.add(paletteContainer);
-		}
-
-		return categories;
-	}
-
-	protected PaletteContainer createControlGroup(PaletteRoot root) {
-		return null;
-	}
-
-	protected MethodElement getMethodElementFromInput() {
-		IEditorInput input = getEditorInput();
-		if (input instanceof MethodElementEditorInput) {
-			return ((MethodElementEditorInput) input).getMethodElement();
-		}
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void doSave(final IProgressMonitor monitor) {
-
-		// saveDiagram();
-		// saveScreen();
-
-		final MethodElement e = getMethodElementFromInput();
-		if (e == null)
-			return;
-		SafeRunnable.run(new SafeRunnable() {
-
-			public void run() throws Exception {
-				try {
-					monitor
-							.beginTask(
-									DiagramUIResources.AbstractDiagramEditor_Save_text, IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-					monitor
-							.setTaskName(DiagramUIResources.bind(DiagramUIResources.AbstractDiagramEditor_Save_message
-									, e.eResource().getURI().isFile() ? e.eResource().getURI().toFileString() : e.getName())); 
-					ILibraryPersister.FailSafeMethodLibraryPersister persister = LibraryServiceUtil.getCurrentPersister().getFailSafePersister();
-					try {
-						persister.save(e.eResource());
-						persister.commit();
-						Diagram diagram = (Diagram) ((EditPart) getGraphicalViewer()
-								.getContents()).getModel();
-						diagram.setNew(false);
-					} catch (Exception e) {
-						AuthoringUIPlugin.getDefault().getLogger().logError(e);
-						try {
-							persister.rollback();
-						} catch (Exception ex) {
-							AuthoringUIPlugin.getDefault().getLogger()
-									.logError(ex);
-							ViewHelper
-									.reloadCurrentLibaryOnRollbackError(getSite()
-											.getShell());
-							return;
-						}
-						AuthoringUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayWarning(
-										getSite().getShell().getText(),
-										DiagramUIResources.diagram_saveError
-										, e.getMessage(), e);
-						return;
-					}
-
-					// Refresh the necessary state.
-					//
-					//getEditDomain().getCommandStack().markSaveLocation();
-					getEditDomain().getCommandStack().flush();
-					changeTime = -1;
-					firePropertyChange(IEditorPart.PROP_DIRTY);
-
-				} finally {
-					monitor.done();
-				}
-			}
-
-		});
-	}
-
-	/** 
-	 * @see org.eclipse.ui.ISaveablePart#doSaveAs()
-	 */
-	public void doSaveAs() {
-	}
-
-	/**
-	 * @see org.eclipse.ui.ISaveablePart#isDirty()
-	 */
-	public boolean isDirty() {
-		return getEditDomain().getCommandStack().isDirty();
-	}
-
-	/** 
-	 * @see org.eclipse.ui.ISaveablePart#isSaveAsAllowed()
-	 */
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-
-	protected boolean isReadOnly() {
-		if (editPart != null) {
-			Diagram diagram = (Diagram) editPart.getModel();
-			return diagram != null && diagram.isReadOnly();
-		}
-		return false;
-	}
-
-	private void createEditPart() {
-		BreakdownElementEditorInput editorInput = (BreakdownElementEditorInput) getEditorInput();
-		Object object;
-		if (editorInput.getWrapper() != null) {
-			object = editorInput.getWrapper();
-		} else {
-			object = editorInput.getMethodElement();
-		}
-		
-		changeTime = System.currentTimeMillis();
-		editPart = createDiagramEditPart();
-		Diagram diagram = (Diagram) editPart.getModel();
-		// pass along the Suppression instance from input to diagram model
-		//
-		diagram.setSuppression(editorInput.getSuppression());
-		diagram.setObject(object);
-		diagram.addConsumer(this);
-		
-		if(!diagram.isNew()) {
-			changeTime = -1;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.EditorPart#setInput(org.eclipse.ui.IEditorInput)
-	 */
-	protected void setInput(IEditorInput input) {
-		super.setInput(input);
-
-		MethodElement e = getMethodElementFromInput();
-		if (e != null) {
-			createEditPart();
-
-			BreakdownElementEditorInput editorInput = (BreakdownElementEditorInput) getEditorInput();
-			setPartName(getPartNamePrefix()
-					+ e.getName()
-					+ ", " + editorInput.getSuppression().getProcess().getName()); //$NON-NLS-1$
-			// setTitleImage(getTypeImage(e));
-		}
-	}
-
-	protected abstract EditPart createDiagramEditPart();
-
-	protected abstract String getPartNamePrefix();
-
-	protected abstract String getDiagramType();
-
-	/**
-	 * Get parent editor
-	 * @return editor
-	 */
-	public IEditorPart getParentEditor() {
-		return parentEditor;
-	}
-
-	public void setParentEditor(IEditorPart parentEditor) {
-		this.parentEditor = parentEditor;
-	}
-	
-	//Adding librarychnaged listener, if configuration got changed diagram needs to refresh
-	private ILibraryChangeListener libraryListener = new ILibraryChangeListener() {
-		public void libraryChanged(int option, Collection collection) {
-			switch (option) {
-			case ILibraryChangeListener.OPTION_CHANGED: {
-				if (collection != null && collection.contains(currentConfig)) {
-					MethodConfiguration config = ProcessAuthoringConfigurator.INSTANCE.getMethodConfiguration();
-					try {
-						ProcessAuthoringConfigurator.INSTANCE.setMethodConfiguration(currentConfig);					
-						IAction action = getActionRegistry().getAction(REFRESH);
-						action.run();
-					}
-					finally {
-						ProcessAuthoringConfigurator.INSTANCE.setMethodConfiguration(config);
-					}
-				}		
-				break;
-			}
-			// handled by libSvcListener
-			//
-//			case ILibraryChangeListener.OPTION_CONFIGURATION_SELECTED: {
-//				configChanged();
-//				break;
-//			}
-			}
-		}
-	};
-	
-	private ILibraryServiceListener libSvcListener = new ILibraryServiceListener() {
-
-		public void configurationSet(MethodConfiguration config) {
-			configChanged();
-		}
-
-		public void libraryClosed(MethodLibrary library) {
-		}
-
-		public void libraryCreated(MethodLibrary library) {
-		}
-
-		public void libraryOpened(MethodLibrary library) {
-		}
-
-		public void libraryReopened(MethodLibrary library) {
-		}
-
-		public void librarySet(MethodLibrary library) {
-		}		
-	};
-	
-	private void configChanged() {
-		MethodConfiguration config = LibraryService.getInstance().getCurrentMethodConfiguration();
-		if(currentConfig != config) {
-			// refresh only if the active part is this diagram editor or process editor of the process
-			// that owns this diagram
-			//
-			IWorkbenchPart activePart = getSite().getWorkbenchWindow().getPartService().getActivePart();
-			boolean refresh =  activePart == this;
-			if(!refresh) {
-				if(activePart instanceof ProcessEditor) {
-					MethodElementEditorInput input = (MethodElementEditorInput) ((ProcessEditor)activePart).getEditorInput();
-					Object procComp = input.getMethodElement();
-					EObject diagram = ((Diagram)editPart.getModel()).getUMADiagram();
-					refresh = UmaUtil.isContainedBy(diagram, procComp);
-				}
-			}
-			if(refresh) {
-				currentConfig = config;
-				IAction action = getActionRegistry().getAction(REFRESH);
-				action.run();
-			}
-		}
-	}
-	
-	/**
-	 * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 * override to donot allow any node selection in Activity Detail Diagram 
-	 * if activity is extends.
-	 */
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		// TODO Auto-generated method stub
-		super.selectionChanged(part, selection);
-		if(editPart != null){
-			Diagram diagram = (Diagram)editPart.getModel();
-			if(diagram.isReadOnly() || TngUtil.isLocked(getMethodElementFromInput())){
-				getGraphicalViewer().select(editPart);
-			}
-		}
-	}
-	
-	public void refreshDiagram(){
-		getActionRegistry().getAction(REFRESH).run();
-	}
-	
-//	/*
-//	 * Method sets the context menu contributing items state.
-//	 * This is efficient way instead of doing at each action. 
-//	 * Uncomment this code, once all the place isEnabled Code is removed.
-//	 */
-//	public void setStateMenuContributeItems(){
-//		
-//		List editParts = getGraphicalViewer().getSelectedEditParts();
-//		if(editParts.size() == 0){
-//			getActionRegistry().getAction(DELETE_DIAGRAM).setEnabled(true);
-//		}
-//		if(editParts.size() == 1){
-//			EditPart editPart = (EditPart)editParts.get(0);
-//			getActionRegistry().getAction(SELECT_LINK).setEnabled(true);
-//			if (editPart.getModel() instanceof TypedNode) {
-//				if(((TypedNode) editPart.getModel()).getType() == TypedNode.FREE_TEXT)
-//				getActionRegistry().getAction(FONT_DIALOG).setEnabled(true);
-//				getActionRegistry().getAction(SELECT_LINK).setEnabled(false);
-//			}
-//			if(editPart instanceof LinkEditPart){
-//				getActionRegistry().getAction(CREATE_BEND_POINT).setEnabled(true);
-//				Link link = (Link)editPart.getModel();
-//				if(link.getBendpoints().size() > 0){
-//					getActionRegistry().getAction(ALIGN_BEND_POINT).setEnabled(true);
-//				}
-//			}
-//			
-//		}
-//		if(editParts.size() == 2){
-//			getActionRegistry().getAction(CREATE_LINK).setEnabled(true); 
-//			for (Iterator itor = editParts.iterator(); itor.hasNext();) {
-//				Object part = itor.next();
-//				if (part instanceof FreeTextEditPart)
-//					getActionRegistry().getAction(CREATE_LINK).setEnabled(false);
-//			}
-//		}
-//	}
-	
-//	public void setFocus() {
-//		// TODO Auto-generated method stub
-//		super.setFocus();
-//		// Refresh is expensive operation.
-//		// TODO - find process solution for notification between 
-//		// base diagram and extend diagram.     
-//		MethodElement element = getMethodElementFromInput();
-//		if(((Diagram)editPart.getModel()).isReadOnly()){
-//			getActionRegistry().getAction(REFRESH).run();
-//		}
-//		else if(element instanceof VariabilityElement){
-//			if(((VariabilityElement)element).getVariabilityType() != null){
-//				if(!((VariabilityElement)element).getVariabilityType().equals(VariabilityType.NA_LITERAL)){
-//					getActionRegistry().getAction(REFRESH).run();
-//				}
-//			}
-//				
-//		}
-//	}
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ActivityDetailDiagramEditor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ActivityDetailDiagramEditor.java
deleted file mode 100755
index 61f87e5..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ActivityDetailDiagramEditor.java
+++ /dev/null
@@ -1,503 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.epf.authoring.gef.edit.ActivityDetailDiagramEditPart;
-import org.eclipse.epf.authoring.gef.edit.ActivityDetailDiagramEditPartFactory;
-import org.eclipse.epf.authoring.gef.edit.DiagramUpdateService;
-import org.eclipse.epf.authoring.gef.edit.FreeTextNodeEditPart;
-import org.eclipse.epf.authoring.gef.util.DiagramUIResources;
-import org.eclipse.epf.authoring.gef.util.TemplateConstants;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.RoleTaskComposite;
-import org.eclipse.epf.diagram.model.util.IAdapterFactoryFilter;
-import org.eclipse.epf.library.configuration.ProcessConfigurator;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.util.ConfigurableComposedAdapterFactory;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.palette.CombinedTemplateCreationEntry;
-import org.eclipse.gef.palette.MarqueeToolEntry;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteGroup;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.PanningSelectionToolEntry;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-
-
-/**
- * An editor for activity detail diagram
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class ActivityDetailDiagramEditor extends AbstractDiagramEditor {
-
-
-	private static final String RESET_DIAGRAM_LAYOUT = "reset_diagram_layout"; //$NON-NLS-1$
-
-	private CreationFactory roleNodeCreationFactory;
-
-	private CreationFactory taskNodeCreationFactory;
-
-	private CreationFactory wpdNodeCreationFactory;
-
-	private boolean initialCleanUp = false;
-	private BreakdownAdapterFactory factory = null;
-
-	// a hack
-	/**
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.editors.AbstractDiagramEditor#createEditPartFactory()
-	 */
-	protected EditPartFactory createEditPartFactory() {
-		return new ActivityDetailDiagramEditPartFactory();
-		// return new EditPartFactory() {
-		//
-		// public EditPart createEditPart(EditPart context, Object model) {
-		// if(model instanceof ActivityDetailDiagram) {
-		// return new ActivityDetailDiagramEditPart((ActivityDetailDiagram)
-		// model);
-		// }
-		// else if(model instanceof RoleTaskComposite) {
-		// return new RoleTaskCompositeEditPart((RoleTaskComposite) model);
-		// }
-		// else if(model instanceof WorkProductComposite){
-		// return new WorkProductCompositeEditPart((WorkProductComposite)
-		// model);
-		// }
-		// else if(model instanceof RoleNode
-		// || model instanceof TaskNode
-		// || model instanceof WorkProductDescriptorNode
-		// )
-		// {
-		// return new DescriptorNodeEditPart((NamedNode) model);
-		// }
-		// else if(model instanceof Link) {
-		// return new LinkEditPart((Link) model);
-		// }
-		// if(model instanceof TypedNode) {
-		// TypedNode node = (TypedNode) model;
-		// switch(node.getType()) {
-		// case TypedNode.START: return new StartNodeEditPart(node);
-		// case TypedNode.END: return new EndNodeEditPart(node);
-		// case TypedNode.DECISION: return new DecisionNodeEditPart(node);
-		// case TypedNode.SYNCH_BAR: return new SynchBarNodeEditPart(node);
-		// case TypedNode.FREE_TEXT: return new FreeTextEditPart(node);
-		// }
-		// }
-		// return null;
-		// }
-		//			
-		// };
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.AbstractDiagramEditor#createDiagramEditPart()
-	 */
-	protected EditPart createDiagramEditPart() {
-		return new ActivityDetailDiagramEditPart(ModelFactory.eINSTANCE
-				.createActivityDetailDiagram());
-	}
-
-//	/*
-//	 * (non-Javadoc)
-//	 * 
-//	 * @see org.eclipse.epf.authoring.ui.editors.AbstractDiagramEditor#createEditPart(java.lang.Object)
-//	 */
-//	protected EditPart createEditPart(Object e) {
-//		ActivityDetailDiagram diagram = ModelFactory.eINSTANCE
-//				.createActivityDetailDiagram();
-//		diagram.setObject(e);
-//		EditPart part = new ActivityDetailDiagramEditPart(diagram);
-//		part.setModel(diagram);
-//		diagram.addConsumer(this);
-//		return part;
-//	}
-		
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.AbstractDiagramEditor#getPartNamePrefix()
-	 */
-	protected String getPartNamePrefix() {
-		return DiagramUIResources.ActivityDetailDiagram_prefix; //$NON-NLS-1$
-	}
-
-	protected PaletteContainer createControlGroup(PaletteRoot root) {
-		initializeCreationFactories();
-
-		PaletteGroup controlGroup = new PaletteGroup("Control Group"); //$NON-NLS-1$
-
-		List entries = new ArrayList();
-
-		ToolEntry tool = new PanningSelectionToolEntry(DiagramUIResources.AbstractDiagram_Select_text, //$NON-NLS-1$
-				DiagramUIResources.AbstractDiagram_Select_tooltip
-		);
-		tool.setSmallIcon(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"select_pal16.gif"));
-		tool.setLargeIcon(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"select_pal24.gif"));
-		entries.add(tool);
-		root.setDefaultEntry(tool);
-
-		tool = new MarqueeToolEntry();
-		tool.setSmallIcon(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"marq_pal16.gif"));
-		tool.setLargeIcon(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"marq_pal24.gif"));
-		entries.add(tool);
-
-		CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry(
-				DiagramUIResources.AbstractDiagram_FreeText_text, //$NON-NLS-1$
-				DiagramUIResources.AbstractDiagram_FreeText_tooltip, //$NON-NLS-1$
-				TemplateConstants.FREE_TEXT, freeTxtNodeCreationFactory,
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"freetext_pal16.gif"), //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"freetext_pal24.gif")//$NON-NLS-1$
-		);
-		entries.add(combined);
-
-		controlGroup.addAll(entries);
-		return controlGroup;
-	}
-
-	protected void initializeCreationFactories() {
-		super.initializeCreationFactories();
-
-		if (roleNodeCreationFactory == null) {
-			roleNodeCreationFactory = new CreationFactory() {
-
-				public Object getNewObject() {
-					RoleTaskComposite node = ModelFactory.eINSTANCE
-							.createRoleTaskComposite();
-					Diagram diagram = (Diagram) editPart.getModel();
-					node.setUMADiagram(diagram.getUMADiagram());
-					node.setObject(UmaFactory.eINSTANCE.createRoleDescriptor());
-					return node;
-				}
-
-				public Object getObjectType() {
-					return TemplateConstants.ROLE_DESCRIPTOR;
-				}
-
-			};
-		}
-		CreationFactory creationFactory = roleNodeCreationFactory;
-		templateNameToCreationFactoryMap.put(creationFactory.getObjectType(),
-				creationFactory);
-
-		if (taskNodeCreationFactory == null) {
-			taskNodeCreationFactory = new CreationFactory() {
-
-				public Object getNewObject() {
-					NamedNode node = ModelFactory.eINSTANCE.createTaskNode();
-					Diagram diagram = (Diagram) editPart.getModel();
-					node.setUMADiagram(diagram.getUMADiagram());
-					node.setObject(UmaFactory.eINSTANCE.createTaskDescriptor());
-					return node;
-				}
-
-				public Object getObjectType() {
-					return TemplateConstants.TASK_DESCRIPTOR;
-				}
-
-			};
-		}
-		creationFactory = taskNodeCreationFactory;
-		templateNameToCreationFactoryMap.put(creationFactory.getObjectType(),
-				creationFactory);
-
-		if (wpdNodeCreationFactory == null) {
-			wpdNodeCreationFactory = new CreationFactory() {
-
-				public Object getNewObject() {
-					NamedNode node = ModelFactory.eINSTANCE
-							.createWorkProductDescriptorNode();
-					Diagram diagram = (Diagram) editPart.getModel();
-					node.setUMADiagram(diagram.getUMADiagram());
-					node.setObject(UmaFactory.eINSTANCE
-							.createWorkProductDescriptor());
-					return node;
-				}
-
-				public Object getObjectType() {
-					return TemplateConstants.TASK_DESCRIPTOR;
-				}
-
-			};
-		}
-		creationFactory = wpdNodeCreationFactory;
-		templateNameToCreationFactoryMap.put(creationFactory.getObjectType(),
-				creationFactory);
-	}
-
-	/**
-	 * Editor Input
-	 *
-	 */
-	public static class EditorInput extends BreakdownElementEditorInput {
-
-		/**
-		 * @param e
-		 */
-		public EditorInput(Object e, Suppression suppression) {
-			super(e, suppression);
-		}
-
-	}
-
-	/**
-	 * Set focus on the editor
-	 * @see org.eclipse.gef.ui.parts.GraphicalEditor#setFocus()
-	 */
-	public void setFocus() {
-		super.setFocus();
-		getGraphicalViewer().getContents().refresh();
-		if (!initialCleanUp) {
-			cleanUpDiagram();
-			initialCleanUp = true;
-			// Locked Plugin case: Display generated ADD diagram, Permission denied to save,  
-			// and No dirty flag on editor. 
-			if(TngUtil.isLocked(getMethodElementFromInput())){
-				// Flush all commands, means will not save.
-				getCommandStack().flush();
-				// Fire dirty flag property change, no dirty flag on editor.
-				firePropertyChange(PROP_DIRTY);
-			}
-		}
-	}
-
-	protected String getDiagramType() {
-		return ResourceHelper.DIAGRAM_TYPE_ACTIVITY_DETAIL;
-	}
-
-	/**
-	 * Clean diagram
-	 *
-	 */
-	public void cleanUpDiagram() {
-//		MethodElement obj = ((MethodElementEditorInput) getEditorInput())
-//				.getMethodElement();
-		DiagramUpdateService service = new DiagramUpdateService(
-				getGraphicalViewer(), getEditDomain(), getActionRegistry());
-		service.cleanUpDiagram();
-		// if (TngUtil.isGeneralizer(obj,
-		// getExtendAndContributeVariabilityTypes())
-		// && !initialCleanUp) {
-		// initialCleanUp = true;
-		// IAction reset = getActionRegistry().getAction(
-		// ActivityDetailDiagramEditor.RESET_DIAGRAM_LAYOUT);
-		// reset.run();
-		// doSave(new NullProgressMonitor());
-		// }
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.AbstractDiagramEditor#contributeToContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	protected void contributeToContextMenu(IMenuManager menu) {
-		super.contributeToContextMenu(menu);
-
-		boolean canModify = !isReadOnly();
-
-		IAction action = getActionRegistry().getAction(RESET_DIAGRAM_LAYOUT);
-		if (action.isEnabled() && canModify) {
-			menu.insertBefore(DELETE_DIAGRAM, action);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.AbstractDiagramEditor#createActions()
-	 */
-	protected void createActions() {
-		super.createActions();
-		Action resetLayoutAction = new Action(
-				DiagramUIResources.ActivityDetailDiagramEditor_ResetDiagramLayout_text) { //$NON-NLS-1$
-
-			public void run() {
-				getActionRegistry().getAction(REFRESH).run();
-				if (getGraphicalViewer().getContents() instanceof ActivityDetailDiagramEditPart) {
-					ActivityDetailDiagramEditPart dep = (ActivityDetailDiagramEditPart) getGraphicalViewer()
-							.getContents();
-					List local = new ArrayList();
-					if(dep.getChildren() != null && !dep.getChildren().isEmpty()){
-						for(Iterator iterator = dep.getChildren().iterator(); iterator.hasNext();){
-							Object next = iterator.next();
-							if(!(next instanceof FreeTextNodeEditPart)){
-								local.add(next);
-							}
-						}
-					}
-					dep.getRecentlyAddedParts().addAll(local);
-					cleanUpDiagram();
-				}
-			}
-
-			public boolean isEnabled() {
-				return getGraphicalViewer().getSelectedEditParts().size() == 0;
-			}
-
-			public String getId() {
-				return RESET_DIAGRAM_LAYOUT;
-			}
-
-		};
-		getActionRegistry().registerAction(resetLayoutAction);
-	}
-
-//	private static Collection extendAndContributeVariabilityTypes = null;
-
-//	private static Collection getExtendAndContributeVariabilityTypes() {
-//		if (extendAndContributeVariabilityTypes == null) {
-//			extendAndContributeVariabilityTypes = new ArrayList();
-//			extendAndContributeVariabilityTypes
-//					.add(VariabilityType.EXTENDS_LITERAL);
-//			extendAndContributeVariabilityTypes
-//					.add(VariabilityType.CONTRIBUTES_LITERAL);
-//		}
-//		return extendAndContributeVariabilityTypes;
-//	}
-	
-	/**
-	 * Break down adapter factory class
-	 */
-	public class BreakdownAdapterFactory
-	{
-		public ConfigurableComposedAdapterFactory wbsAdapterFactory = null;
-		public ConfigurableComposedAdapterFactory tbsAdapterFactory = null;
-		public ConfigurableComposedAdapterFactory wpbsAdapterFactory = null;
-		public ConfigurableComposedAdapterFactory cbsAdapterFactory = null;
-
-		public BreakdownAdapterFactory(MethodConfiguration methodConfig)
-		{
-			// create adapt factories
-			wbsAdapterFactory = (ConfigurableComposedAdapterFactory) TngAdapterFactory.INSTANCE
-					.createWBSComposedAdapterFactory();
-			tbsAdapterFactory = (ConfigurableComposedAdapterFactory) TngAdapterFactory.INSTANCE
-					.createTBSComposedAdapterFactory();
-			wpbsAdapterFactory = (ConfigurableComposedAdapterFactory) TngAdapterFactory.INSTANCE
-					.createWPBSComposedAdapterFactory();
-			cbsAdapterFactory = (ConfigurableComposedAdapterFactory) TngAdapterFactory.INSTANCE
-					.createProcessComposedAdapterFactory();
-
-			// set configuration filter
-			DiagramAdapterFactoryFilter configurator = new DiagramAdapterFactoryFilter(
-					methodConfig, this);
-
-			wbsAdapterFactory.setFilter(configurator);
-			tbsAdapterFactory.setFilter(configurator);
-			wpbsAdapterFactory.setFilter(configurator);
-			cbsAdapterFactory.setFilter(configurator);		}
-		
-		public void clear()
-		{
-			if (wbsAdapterFactory != null) {
-				wbsAdapterFactory.dispose();
-				wbsAdapterFactory = null;
-			}
-
-			if (tbsAdapterFactory != null) {
-				tbsAdapterFactory.dispose();
-				tbsAdapterFactory = null;
-			}
-
-			if (wpbsAdapterFactory != null) {
-				wpbsAdapterFactory.dispose();
-				wpbsAdapterFactory = null;
-			}
-
-			if (cbsAdapterFactory != null) {
-				cbsAdapterFactory.dispose();
-				cbsAdapterFactory = null;
-			}
-		}
-	}
-	
-	/**
-	 * Diagram Adapter factory filter
-	 *
-	 */
-	public class DiagramAdapterFactoryFilter extends ProcessConfigurator
-			implements IAdapterFactoryFilter {
-
-		private ActivityDetailDiagramEditor.BreakdownAdapterFactory factory;
-
-		/*
-		 * Create an instance
-		 */
-		public DiagramAdapterFactoryFilter(MethodConfiguration methodConfig,
-				ActivityDetailDiagramEditor.BreakdownAdapterFactory factory) {
-			super(methodConfig, null);
-			this.factory = factory;
-		}
-
-		/**
-		 * Return WBS Adapter Factory
-		 */
-		public AdapterFactory getWBSAdapterFactory() {
-			return factory.wbsAdapterFactory;
-		}
-
-		/**
-		 * Return Team Allocation Adapter Factory
-		 */
-		public AdapterFactory getTBSAdapterFactory() {
-			return factory.tbsAdapterFactory;
-		}
-
-		/**
-		 * Return WP Usage Adapter Factory
-		 */
-		public AdapterFactory getWPBSAdapterFactory() {
-			return factory.wpbsAdapterFactory;
-		}
-
-		/**
-		 * Return consolidated view adapter factory
-		 */
-		public AdapterFactory getCBSAdapterFactory() {
-			return factory.cbsAdapterFactory;
-		}
-
-		public boolean accept(Object obj) {
-			return super.accept(obj);
-		}
-	}
-	
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.AbstractDiagramEditor#dispose()
-	 */
-	public void dispose() {
-		if(factory != null){
-			factory.clear();
-		}
-		super.dispose();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/BreakdownElementEditorInput.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/BreakdownElementEditorInput.java
deleted file mode 100755
index a63012c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/BreakdownElementEditorInput.java
+++ /dev/null
@@ -1,71 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.MethodElement;
-
-
-/**
- * Breakdown Element input for an editor
- * 
- * @author Phong Nguyen Le - Oct 7, 2005
- * @since 1.0
- */
-public class BreakdownElementEditorInput extends MethodElementEditorInput {
-
-	private Suppression suppression;
-
-	private BreakdownElementWrapperItemProvider wrapper;
-
-	/**
-	 * Creates an instance
-	 * @param object
-	 */
-	public BreakdownElementEditorInput(Object object, Suppression suppression) {
-		super((MethodElement) TngUtil.unwrap(object));
-		if (object instanceof BreakdownElementWrapperItemProvider) {
-			wrapper = (BreakdownElementWrapperItemProvider) object;
-		}
-		this.suppression = suppression;
-	}
-
-	/**
-	 * @return Returns the suppression.
-	 */
-	public Suppression getSuppression() {
-		return suppression;
-	}
-
-	/**
-	 * @return Returns the wrapper.
-	 */
-	public BreakdownElementWrapperItemProvider getWrapper() {
-		return wrapper;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.MethodElementEditorInput#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (getClass().isInstance(obj)) {
-			BreakdownElementEditorInput other = (BreakdownElementEditorInput) obj;
-			return getMethodElement() == other.getMethodElement()
-					&& suppression.getProcess() == other.getSuppression()
-							.getProcess();
-		}
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ColumnDescriptor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ColumnDescriptor.java
deleted file mode 100755
index d0b32c3..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ColumnDescriptor.java
+++ /dev/null
@@ -1,98 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import java.io.Serializable;
-
-import org.eclipse.swt.SWT;
-
-/**
- * Column descriptors used for process editors
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class ColumnDescriptor implements Serializable {
-
-	private static final long serialVersionUID = 3256718476985970997L;
-
-	public static final int CELL_EDITOR_TYPE_NONE = 0;
-
-	public static final int CELL_EDITOR_TYPE_TEXT = 1;
-
-	public static final int CELL_EDITOR_TYPE_COMBO_BOOLEAN = 2;
-
-	public static final int CELL_EDITOR_TYPE_CHECK_BOOLEAN = 3;
-
-	public String id;
-
-	public String label;
-
-	public int width;
-
-	public boolean resizable;
-
-	public int cellEditorType;
-
-	public int weight;
-
-	public int alignment;
-
-	/**
-	 * 
-	 * @param id
-	 * 			ID of the column
-	 * @param label
-	 * 			Column Name
-	 * @param weight
-	 * 			Column weight
-	 * @param width
-	 * 			Column Width
-	 * @param resizable
-	 * 			Flag to indicate whether column is resizable or not
-	 * @param cellEditorType
-	 * 			Column cell editor type
-	 */
-	public ColumnDescriptor(String id, String label, int weight, int width,
-			boolean resizable, int cellEditorType) {
-		this(id, label, weight, width, resizable, cellEditorType, SWT.LEFT);
-	}
-
-	/**
-	 * Creates an instance
-	 * 
-	 * @param id
-	 * 			ID of the column
-	 * @param label
-	 * 			Column Name
-	 * @param weight
-	 * 			Column weight
-	 * @param width
-	 * 			Column Width
-	 * @param resiable
-	 * 			Flag to indicate whether column is resizable or not
-	 * @param cellEditorType
-	 * 			Column cell editor type
-	 * @param alignment
-	 * 			Column alignment
-	 */
-	public ColumnDescriptor(String id, String label, int weight, int width,
-			boolean resiable, int cellEditorType, int alignment) {
-		this.id = id;
-		this.label = label;
-		this.resizable = resiable;
-		this.weight = weight;
-		this.width = width;
-		this.cellEditorType = cellEditorType;
-		this.alignment = alignment;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ConfigurationEditor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ConfigurationEditor.java
deleted file mode 100755
index 85df164..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ConfigurationEditor.java
+++ /dev/null
@@ -1,121 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.forms.ConfigViewPage;
-import org.eclipse.epf.authoring.ui.forms.ConfigurationDescription;
-import org.eclipse.epf.authoring.ui.forms.ConfigurationPage;
-import org.eclipse.epf.library.configuration.ConfigurationClosure;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PartInitException;
-
-
-/**
- * The Method Configuration editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class ConfigurationEditor extends MethodElementEditor {
-
-	/**
-	 * The editor ID.
-	 */
-	public static final String EDITOR_ID = ConfigurationEditor.class.getName();
-
-	ConfigurationPage configPage = null;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ConfigurationEditor() {
-		super();
-	}
-
-	/**
-	 * Returns the method configuration associated with this editor.
-	 */
-	public MethodConfiguration getConfiguration() {
-		return ((ConfigurationEditorInput) super.getEditorInput())
-				.getConfiguration();
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormEditor#addPages()
-	 */
-	protected void addPages() {
-		try {
-			addPage(new ConfigurationDescription(this));
-			configPage = new ConfigurationPage(this);
-			addPage(configPage);
-			addPage(new ConfigViewPage(this));
-		} catch (PartInitException e) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(e);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.MethodElementEditor#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-	}
-
-	/**
-	 * Returns closure for this configuration
-	 * @return closure
-	 */
-	public ConfigurationClosure getClosure() {
-		return configPage.getClosure();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.MethodElementEditor#createInput(org.eclipse.epf.uma.MethodElement)
-	 */
-	protected MethodElementEditorInput createInput(MethodElement e) {
-		if(e instanceof MethodConfiguration) {
-			return new ConfigurationEditorInput((MethodConfiguration) e);
-		}
-		return null;
-	}
-	
-	private List setFocusListeners = new ArrayList();
-	
-	
-	/**
-	 * Add given listener to list of focus listeners
-	 * @param lis
-	 */
-	public void addToSetFocusLiseners(Listener lis) {
-		setFocusListeners.add(lis);
-	}
-	
-    /**
-     * @see org.eclipse.ui.part.MultiPageEditorPart#setFocus()
-     */
-    public void setFocus() {    	
-    	Event e = new Event();
-    	e.data = getActivePageInstance();   	
-    	for (int i=0; i<setFocusListeners.size(); i++) {
-    		Listener lis = (Listener) setFocusListeners.get(i);
-    		lis.handleEvent(e);
-    	}
-    }
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ConfigurationEditorInput.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ConfigurationEditorInput.java
deleted file mode 100755
index dc9a032..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ConfigurationEditorInput.java
+++ /dev/null
@@ -1,50 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import org.eclipse.epf.authoring.gef.util.DiagramUIResources;
-import org.eclipse.epf.uma.MethodConfiguration;
-
-
-/**
- * An editor input for the configuration editor
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class ConfigurationEditorInput extends MethodElementEditorInput {
-
-	/**
-	 * Creates an instance
-	 * @param config
-	 */
-	public ConfigurationEditorInput(MethodConfiguration config) {
-		// methodConfiguration = config;
-		super(config);
-	}
-
-	/**
-	 * Returns method configuration
-	 */
-	public MethodConfiguration getConfiguration() {
-		// return methodConfiguration;
-		return (MethodConfiguration) super.getMethodElement();
-	}
-
-
-	/**
-	 * 
-	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
-	 */
-	public String getToolTipText() {
-		return DiagramUIResources.ConfigurationEditorInput_configeditor0; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/EditorChooser.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/EditorChooser.java
deleted file mode 100755
index a85d6ed..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/EditorChooser.java
+++ /dev/null
@@ -1,388 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.views.ViewHelper;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductType;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Launches a Method editor that is appropriate for a given method element.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class EditorChooser implements IEditorKeeper {
-
-	private static EditorChooser singleton = null;
-
-	/**
-	 * Returns a singleton instance
-	 * 
-	 */
-	public static EditorChooser getInstance() {
-		if (singleton == null) {
-			synchronized (EditorChooser.class) {
-				if (singleton == null) {
-					singleton = new EditorChooser();
-					IEditorKeeper.REFERENCE.setEditorKeeper(singleton);
-				}
-			}
-		}
-		return singleton;
-	}
-
-	/**
-	 * Opens the respective editor depending on the given Method element object.
-	 * 
-	 * @param obj
-	 *            A Method element.
-	 */
-	public void openEditor(Object obj) {
-		try {
-			obj = ViewHelper.handleDangling(obj);
-			if (obj == null)
-				return;
-
-			obj = LibraryUtil.unwrap(obj);
-
-			ArrayList errors = new ArrayList();
-			if (obj instanceof EObject) {
-				Resource res = ((EObject) obj).eResource();
-				if (res != null && !res.getErrors().isEmpty()) {
-					errors.addAll(res.getErrors());
-				}
-				if (obj instanceof DescribableElement) {
-					Resource presRes = ((DescribableElement) obj)
-							.getPresentation().eResource();
-					if (presRes != null && !presRes.getErrors().isEmpty()) {
-						errors.addAll(presRes.getErrors());
-					}
-				}
-				if (!errors.isEmpty()) {
-					final MultiStatus multiStatus = new MultiStatus(
-							AuthoringUIPlugin.getDefault().getId(),
-							0,
-							AuthoringUIResources.EditorChooser_ResourcesError, null); //$NON-NLS-1$
-					for (Iterator iter = errors.iterator(); iter.hasNext();) {
-						Diagnostic e = (Diagnostic) iter.next();
-						IStatus status = new Status(IStatus.WARNING,
-								LibraryPlugin.getDefault().getId(), 0, e
-										.getMessage(), null);
-						multiStatus.add(status);
-					}
-					try {
-						if (AuthoringUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayConfirmation(
-										AuthoringUIResources.EditorChooser_loaddErrorDlgTitle, //$NON-NLS-1$
-										AuthoringUIResources.EditorChooser_ResourcesError, //$NON-NLS-1$
-										multiStatus) == Dialog.CANCEL) {
-							return;
-						}
-
-					} catch (Exception e) {
-						AuthoringUIPlugin.getDefault().getLogger().logError(e);
-					}
-				}
-			}
-
-			if ((obj instanceof MethodPlugin)
-					|| (obj instanceof ContentPackage) || (obj instanceof Role)
-					|| (obj instanceof Task) || (obj instanceof WorkProduct)
-					|| (obj instanceof Guidance) || (obj instanceof Discipline)
-					|| (obj instanceof DisciplineGrouping)
-					|| (obj instanceof Domain)
-					|| (obj instanceof WorkProductType)
-					|| (obj instanceof RoleSet) || (obj instanceof Tool)
-					|| (obj instanceof RoleSetGrouping)
-					|| (obj instanceof MethodLibrary)) {
-				openEditor((MethodElement) obj, MethodElementEditor.EDITOR_ID);
-			} else if (obj instanceof CustomCategory) {
-				CustomCategory custCat = (CustomCategory) obj;
-				if(TngUtil.isRootCustomCategory(custCat)) {
-					return;
-				}
-				openEditor((MethodElement) obj, MethodElementEditor.EDITOR_ID);
-			} else if (obj instanceof ProcessComponent) {
-				openEditor((MethodElement) obj, ProcessEditor.EDITOR_ID);
-
-				// open properties view by default when we open Process Editor
-				try {
-					PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-							.getActivePage().showView(
-									"org.eclipse.ui.views.PropertySheet", null, IWorkbenchPage.VIEW_VISIBLE); //$NON-NLS-1$
-				} catch (PartInitException exception) {
-					AuthoringUIPlugin.getDefault().getLogger().logError(
-							exception);
-				}
-			} else if (obj instanceof Process) {
-				Object container = ((Process) obj).eContainer();
-				if (container instanceof ProcessComponent) {
-					openEditor((MethodElement) container,
-							ProcessEditor.EDITOR_ID);
-				}
-			}else if (obj instanceof MethodConfiguration) {
-				openEditor((MethodConfiguration) obj,
-						ConfigurationEditor.EDITOR_ID);
-			}else if(obj instanceof BreakdownElement){
-				Process process = TngUtil.getOwningProcess((BreakdownElement)obj);
-				Object container = process.eContainer();
-				if (container instanceof ProcessComponent) {
-					openEditor((MethodElement) container,
-							ProcessEditor.EDITOR_ID);
-				}
-			}
-		} catch (Throwable t) {
-			t.printStackTrace();
-			String title = AuthoringUIResources.editors_EditorChooser_systemErrorDialog_title; //$NON-NLS-1$
-			String message = AuthoringUIResources.editors_EditorChooser_systemErrorDialog_message; //$NON-NLS-1$
-			String reason = AuthoringUIResources.editors_EditorChooser_systemErrorDialog_reason; //$NON-NLS-1$
-			MsgDialog dialog = AuthoringUIPlugin.getDefault().getMsgDialog();
-			dialog.displayError(title, message, reason, t);
-		}
-	}
-
-	/**
-	 * Opens the Configuration editor.
-	 * 
-	 * @param config
-	 * @param editorId
-	 */
-	private void openEditor(MethodConfiguration config, String editorId)
-			throws PartInitException {
-		ConfigurationEditorInput editorInput = new ConfigurationEditorInput(
-				config);
-		AuthoringUIPlugin.getDefault().getWorkbench()
-				.getActiveWorkbenchWindow().getActivePage().openEditor(
-						editorInput, editorId);
-	}
-
-	/**
-	 * Opens the Method editor for the given method element.
-	 * 
-	 * @param element
-	 *            A Method element.
-	 * @param editorId
-	 *            The editor ID.
-	 */
-	private void openEditor(MethodElement element, String editorId)
-			throws PartInitException {
-		MethodElementEditorInput editorInput = new MethodElementEditorInput(
-				element);
-		AuthoringUIPlugin.getDefault().getWorkbench()
-				.getActiveWorkbenchWindow().getActivePage().openEditor(
-						editorInput, editorId);
-	}
-
-	/**
-	 * Selects (brings to front, but does not give focus) the Method editor for
-	 * the given object. If there is no open editor for the object, does
-	 * nothing.
-	 * 
-	 * @param obj
-	 */
-	public void selectEditor(Object obj) {
-		try {
-			obj = ViewHelper.handleDangling(obj);
-			if (obj == null)
-				return;
-			obj = LibraryUtil.unwrap(obj);
-		} catch (Throwable t) {
-			t.printStackTrace();
-		}
-		IEditorInput editorInput = null;
-		if (obj instanceof MethodConfiguration)
-			editorInput = new ConfigurationEditorInput(
-					(MethodConfiguration) obj);
-		else if (obj instanceof MethodElement)
-			editorInput = new MethodElementEditorInput((MethodElement) obj);
-		if (editorInput != null) {
-			IWorkbenchPage page = AuthoringUIPlugin.getDefault().getWorkbench()
-					.getActiveWorkbenchWindow().getActivePage();
-			IEditorPart editorPart = page.findEditor(editorInput);
-			if (editorPart != null)
-				page.bringToTop(editorPart);
-		}
-	}
-
-	/**
-	 * 
-	 * Returns selected editor input
-	 * @return The object which the currently selected editor is editing (or
-	 *         null).
-	 */
-	public Object getSelectedEditorInput() {
-		IEditorPart editorPart = AuthoringUIPlugin.getDefault().getWorkbench()
-				.getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		if (editorPart != null) {
-			IEditorInput editorInput = editorPart.getEditorInput();
-			if (editorInput instanceof ConfigurationEditorInput)
-				return ((ConfigurationEditorInput) editorInput)
-						.getConfiguration();
-			if (editorInput instanceof MethodElementEditorInput)
-				return ((MethodElementEditorInput) editorInput)
-						.getMethodElement();
-		}
-		return null;
-	}
-
-	/**
-	 * Closes the Method editor for the given Method element.
-	 * 
-	 * @param obj
-	 *            A Method element.
-	 */
-	public void closeEditor(Object obj) {
-		try {
-			MethodElementEditorInput editorInput = new MethodElementEditorInput(
-					(MethodElement) obj);
-			IEditorPart editor = AuthoringUIPlugin.getDefault().getWorkbench()
-					.getActiveWorkbenchWindow().getActivePage().findEditor(
-							editorInput);
-			if (editor != null) {
-				AuthoringUIPlugin.getDefault().getWorkbench()
-						.getActiveWorkbenchWindow().getActivePage()
-						.closeEditor(editor, false);
-			}
-		} catch (RuntimeException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Returns list of dirty editors for the given elements
-	 * @param elements
-	 * @return	List of dirty editor
-	 */
-	public Collection getElementsWithDirtyEditor(Collection elements) {
-		ArrayList result = new ArrayList();
-
-		IWorkbenchPage workbenchPage = AuthoringUIPlugin.getDefault()
-				.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		IEditorReference[] editorReferences = workbenchPage
-				.getEditorReferences();
-		// ArrayList closeEditorRefs = new ArrayList();
-		for (int i = 0; i < editorReferences.length; i++) {
-			IEditorReference reference = editorReferences[i];
-			IEditorPart editor = reference.getEditor(true);
-			if (editor != null && editor.isDirty()) {
-				IEditorInput input = editor.getEditorInput();
-				MethodElement element = null;
-				if (input instanceof MethodElementEditorInput) {
-					element = ((MethodElementEditorInput) input)
-							.getMethodElement();
-				} else if (input instanceof ConfigurationEditorInput) {
-					element = ((ConfigurationEditorInput) input)
-							.getConfiguration();
-				}
-				if (element != null) {
-					for (Iterator iter = elements.iterator(); iter.hasNext();) {
-						Object e = iter.next();
-						if (e == element || UmaUtil.isContainedBy(element, e)) {
-							result.add(element);
-							iter.remove();
-						}
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Closes the all open Method editors ofor the given (deleted) element and
-	 * all of its children and grand children.
-	 * 
-	 * @param e
-	 *            the deleted MethodElement
-	 */
-	public void closeEditorsOnDeletion(Object e) {
-		IWorkbenchPage workbenchPage = AuthoringUIPlugin.getDefault()
-				.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		IEditorReference[] editorReferences = workbenchPage
-				.getEditorReferences();
-		ArrayList closeEditorRefs = new ArrayList();
-		for (int i = 0; i < editorReferences.length; i++) {
-			IEditorReference reference = editorReferences[i];
-			IEditorPart editor = reference.getEditor(true);
-			if (editor != null) {
-				IEditorInput input = editor.getEditorInput();
-				MethodElement element = null;
-				if (input instanceof MethodElementEditorInput) {
-					element = ((MethodElementEditorInput) input)
-							.getMethodElement();
-				} else if (input instanceof ConfigurationEditorInput) {
-					element = ((ConfigurationEditorInput) input)
-							.getConfiguration();
-				}
-				if (element != null
-						&& (element.eContainer() == null || UmaUtil
-								.isContainedBy(element, e))) {
-					closeEditorRefs.add(reference);
-				}
-			}
-		}
-		int size = closeEditorRefs.size();
-		IEditorReference[] references = new IEditorReference[size];
-		for (int i = 0; i < size; i++) {
-			references[i] = (IEditorReference) closeEditorRefs.get(i);
-		}
-		workbenchPage.closeEditors(references, false);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/GraphicalWPDependencyEditor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/GraphicalWPDependencyEditor.java
deleted file mode 100755
index dd66de8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/GraphicalWPDependencyEditor.java
+++ /dev/null
@@ -1,329 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.authoring.gef.edit.DiagramEditPart;
-import org.eclipse.epf.authoring.gef.edit.WPDiagramEditPartFactory;
-import org.eclipse.epf.authoring.gef.util.DiagramUIResources;
-import org.eclipse.epf.authoring.gef.util.TemplateConstants;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.WorkProductNode;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.palette.CombinedTemplateCreationEntry;
-import org.eclipse.gef.palette.ConnectionCreationToolEntry;
-import org.eclipse.gef.palette.MarqueeToolEntry;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteEntry;
-import org.eclipse.gef.palette.PaletteGroup;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.PaletteSeparator;
-import org.eclipse.gef.palette.PanningSelectionToolEntry;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-
-
-/**
- * An editor for graphical work product depenedency diagram
- * @author Phong Nguyen Le
- * @author Shashidhar Kannoori
- * @since 1.0 
- */
-public class GraphicalWPDependencyEditor extends AbstractDiagramEditor {
-
-	private CreationFactory wpNodeCreationFactory;
-
-//	private IPropertySheetEntry rootEntry;
-
-	private static final String CREATE_WP_NODE = "create_workproduct_descriptor_node"; //$NON-NLS-1$
-
-	/*
-	 * Create an instance
-	 */
-	public GraphicalWPDependencyEditor() {
-		super();
-	}
-
-	protected void initializeCreationFactories() {
-		super.initializeCreationFactories();
-
-		if (wpNodeCreationFactory == null) {
-			wpNodeCreationFactory = new CreationFactory() {
-				public Object getNewObject() {
-					WorkProductNode node = ModelFactory.eINSTANCE
-							.createWorkProductNode();
-					Diagram diagram = (Diagram) editPart.getModel();
-					node.setUMADiagram(diagram.getUMADiagram());
-					WorkProductDescriptor wpd = UmaFactory.eINSTANCE
-							.createWorkProductDescriptor();
-					node.setDiagram(diagram);
-					node.setObject(wpd);
-					return node;
-				}
-
-				public Object getObjectType() {
-
-					return TemplateConstants.WORK_PRODUCT;
-				}
-			};
-		}
-		CreationFactory creationFactory = wpNodeCreationFactory;
-		templateNameToCreationFactoryMap.put(creationFactory.getObjectType(),
-				creationFactory);
-
-	}
-
-	/**
-	 * 
-	 */
-	protected void contributeToContextMenu(IMenuManager menu) {
-		super.contributeToContextMenu(menu);
-
-		boolean canModify = !isReadOnly();
-
-		// IAction action = getActionRegistry().getAction(PROPERTIES_PAGE);
-		// if(action.isEnabled()) {
-		// menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
-		// }
-		IAction action = getActionRegistry().getAction(CREATE_WP_NODE);
-		if (action.isEnabled() && canModify) {
-			menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
-		}
-	}
-
-	protected void createActions() {
-		super.createActions();
-		// ActionRegistry registry = getActionRegistry();
-		// IAction action;
-		//
-		// action = new Action("Show &Properties View") {
-		// public String getId() {
-		// return PROPERTIES_PAGE;
-		// }
-		// public void run() {
-		// try {
-		//
-		// getSite().getPage().showView(
-		// "org.eclipse.ui.views.PropertySheet");
-		// // setId("Show_Properties");
-		// }
-		// catch (PartInitException exception) {
-		// //AuthoringPlugin.getDefault().getLogger().logError(exception);
-		// }
-		// }
-		// public boolean isEnabled() {
-		// List editParts = getGraphicalViewer().getSelectedEditParts();
-		// return (editParts.size() == 1 && editParts.get(0) instanceof
-		// EditPart);
-		// }
-		// };
-		//		
-		// registry.registerAction(action);
-
-		IAction action = createAnAction(
-				DiagramUIResources.AbstractDiagram_WorkProductDescriptor_text, wpNodeCreationFactory, //$NON-NLS-1$
-				CREATE_WP_NODE,
-				DiagramUIResources.AbstractDiagram_WorkProductDescriptor_tooltip, //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"full/obj16/WorkProductDescriptor.gif")); //$NON-NLS-1$
-		getActionRegistry().registerAction(action);
-
-	}
-
-	protected PaletteContainer createControlGroup(PaletteRoot root) {
-		initializeCreationFactories();
-		PaletteGroup controlGroup = new PaletteGroup("Control Group"); //$NON-NLS-1$
-
-		List entries = new ArrayList();
-
-		ToolEntry tool = new PanningSelectionToolEntry(DiagramUIResources.AbstractDiagram_Select_text, //$NON-NLS-1$
-				DiagramUIResources.AbstractDiagram_Select_tooltip
-		);
-		tool.setSmallIcon(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"select_pal16.gif"));
-		tool.setLargeIcon(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"select_pal24.gif"));
-		entries.add(tool);
-		root.setDefaultEntry(tool);
-
-		tool = new MarqueeToolEntry();
-		tool.setSmallIcon(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"marq_pal16.gif"));
-		tool.setLargeIcon(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"marq_pal24.gif"));
-		entries.add(tool);
-
-		tool = new ConnectionCreationToolEntry(
-				DiagramUIResources.AbstractDiagram_Link_text, DiagramUIResources.AbstractDiagram_Link_tooltip, 
-				null, AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"link_pal16.gif"), //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"link_pal24.gif")//$NON-NLS-1$
-		);
-		entries.add(tool);
-		CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry(
-				DiagramUIResources.AbstractDiagram_FreeText_text, //$NON-NLS-1$
-				DiagramUIResources.AbstractDiagram_FreeText_tooltip, //$NON-NLS-1$
-				TemplateConstants.FREE_TEXT, freeTxtNodeCreationFactory,
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"freetext_pal16.gif"), //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"freetext_pal24.gif")//$NON-NLS-1$
-		);
-		entries.add(combined);
-
-		PaletteSeparator sep = new PaletteSeparator(
-				GraphicalWPDependencyEditor.class.getName() + "sep1"); //$NON-NLS-1$
-		sep
-				.setUserModificationPermission(PaletteEntry.PERMISSION_NO_MODIFICATION);
-		entries.add(sep); //$NON-NLS-1$
-
-		combined = new CombinedTemplateCreationEntry(
-				DiagramUIResources.AbstractDiagram_WorkProductDescriptor_text, //$NON-NLS-1$
-				DiagramUIResources.AbstractDiagram_WorkProductDescriptor_tooltip, //$NON-NLS-1$
-				TemplateConstants.WORK_PRODUCT, wpNodeCreationFactory,
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"full/obj16/WorkProductDescriptor.gif"), //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"full/obj16/WorkProductDescriptor.gif")//$NON-NLS-1$
-		);
-		entries.add(combined);
-		controlGroup.addAll(entries);
-		return controlGroup;
-	}
-
-	protected EditPartFactory createEditPartFactory() {
-		return new WPDiagramEditPartFactory();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.editors.AbstractDiagramEditor#createDiagramEditPart()
-	 */
-	protected EditPart createDiagramEditPart() {
-		 DiagramEditPart editPart = new DiagramEditPart(ModelFactory.eINSTANCE
-				.createWorkProductDependencyDiagram());
-		 editPart.markDirty(true);
-		 return editPart;
-	}
-	
-//	protected EditPart createEditPart(Object e) {
-//		WorkProductDependencyDiagram diagram = ModelFactory.eINSTANCE
-//				.createWorkProductDependencyDiagram();
-//		diagram.setObject(e);
-//		EditPart part = new DiagramEditPart(diagram);
-//		part.setModel(diagram);
-//		diagram.addConsumer(this);
-//		return part;
-//	}
-
-	protected String getPartNamePrefix() {
-		return DiagramUIResources.WorkProductDependencyDiagram_prefix; //$NON-NLS-1$
-	}
-
-	/**
-	 * An editor input 
-	 *
-	 *
-	 */
-	/**
-	 * @author shilpat
-	 *
-	 */
-	public class EditorInput implements IEditorInput {
-
-		/**
-		 * @param e
-		 */
-		public EditorInput(MethodElement e) {
-		}
-
-		/**
-		 * @see org.eclipse.ui.IEditorInput#exists()
-		 */
-		public boolean exists() {
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
-		 */
-		public ImageDescriptor getImageDescriptor() {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.ui.IEditorInput#getName()
-		 */
-		public String getName() {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.ui.IEditorInput#getPersistable()
-		 */
-		public IPersistableElement getPersistable() {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.ui.IEditorInput#getToolTipText()
-		 */
-		public String getToolTipText() {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-		 */
-		public Object getAdapter(Class type) {
-			// if (type.equals(IPropertySheetPage.class)) {
-			// return getPropertySheetPage();
-			// }else
-			return null;
-		}
-
-//		private Object getPropertySheetPage() {
-//
-//			if (rootEntry == null) {
-//				// create a new root
-//				PropertySheetEntry root = new PropertySheetEntry();
-//				rootEntry = root;
-//			}
-//			if (rootEntry instanceof PropertySheetEntry) {
-//				// = wpEditPart.getViewer();
-//				// ISelectionProvider provider = new
-//				// AdapterFactoryContentProvider(WP);
-//				// ((PropertySheetEntry) rootEntry).setPropertySourceProvider();
-//			}
-//			return rootEntry;
-//		}
-	}
-
-	protected String getDiagramType() {
-		return ResourceHelper.DIAGRAM_TYPE_WP_DEPENDENCY;
-	}
-	
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/GraphicalWorkflowEditor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/GraphicalWorkflowEditor.java
deleted file mode 100755
index c81b3d9..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/GraphicalWorkflowEditor.java
+++ /dev/null
@@ -1,871 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.authoring.gef.edit.ActivityDiagramEditPart;
-import org.eclipse.epf.authoring.gef.edit.ActivityDiagramEditPartFactory;
-import org.eclipse.epf.authoring.gef.util.DiagramUIResources;
-import org.eclipse.epf.authoring.gef.util.TemplateConstants;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.LinkedObject;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.WorkBreakdownElementNode;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.Iteration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Phase;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.palette.CombinedTemplateCreationEntry;
-import org.eclipse.gef.palette.ConnectionCreationToolEntry;
-import org.eclipse.gef.palette.MarqueeToolEntry;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteEntry;
-import org.eclipse.gef.palette.PaletteGroup;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.PaletteSeparator;
-import org.eclipse.gef.palette.PanningSelectionToolEntry;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-
-
-/**
- * An editor for graphical workflow
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class GraphicalWorkflowEditor extends AbstractDiagramEditor {
-
-	private static final String OPEN_WORKFLOW_DETAIL_DIAGRAM = "open_workflow_detail_diagram"; //$NON-NLS-1$
-
-	private static final String CREATE_START_NODE = "create_start_node"; //$NON-NLS-1$
-
-	private static final String CREATE_END_NODE = "create_end_node"; //$NON-NLS-1$
-
-	private static final String CREATE_SYNC_BAR = "create_sync_bar"; //$NON-NLS-1$
-
-	private static final String CREATE_DECISION_BAR = "create_decision_bar"; //$NON-NLS-1$
-
-	private static final String CREATE_ACTIVITY = "create_activity"; //$NON-NLS-1$
-
-	private static final String CREATE_PHASE = "create_phase"; //$NON-NLS-1$
-
-	private static final String CREATE_ITERATION = "create_iteration"; //$NON-NLS-1$
-
-	private static final String CREATE_TASK_DESCRIPTOR = "create_task_descriptor"; //$NON-NLS-1$
-
-	private CreationFactory activityNodeCreationFactory;
-
-	private CreationFactory phaseNodeCreationFactory;
-
-	private CreationFactory iterationNodeCreationFactory;
-
-	private CreationFactory synchBarCreationFactory;
-
-	private CreationFactory decisionNodeCreationFactory;
-
-	private CreationFactory startNodeCreationFactory;
-
-	private CreationFactory endNodeCreationFactory;
-
-	private CreationFactory taskDescriptorNodeCreationFactory;
-
-	/**
-	 * Create an instance
-	 */
-	public GraphicalWorkflowEditor() {
-		super();
-	}
-
-	protected void initializeCreationFactories() {
-		super.initializeCreationFactories();
-
-		if (activityNodeCreationFactory == null)
-			activityNodeCreationFactory = new CreationFactory() {
-
-				public Object getNewObject() {
-					// ActivityNode node =
-					// ModelFactory.eINSTANCE.createActivityNode();
-					WorkBreakdownElementNode node = ModelFactory.eINSTANCE
-							.createWorkBreakdownElementNode();
-					Diagram diagram = (Diagram) editPart.getModel();
-					node.setUMADiagram(diagram.getUMADiagram());
-					node.setDiagram(diagram);
-					node.setObject(UmaFactory.eINSTANCE.createActivity());
-					return node;
-				}
-
-				public Object getObjectType() {
-					return TemplateConstants.ACTIVITY;
-				}
-
-			};
-		CreationFactory creationFactory = activityNodeCreationFactory;
-		templateNameToCreationFactoryMap.put(creationFactory.getObjectType(),
-				creationFactory);
-
-		if (phaseNodeCreationFactory == null)
-			phaseNodeCreationFactory = new CreationFactory() {
-
-				public Object getNewObject() {
-					// ActivityNode node =
-					// ModelFactory.eINSTANCE.createActivityNode();
-					WorkBreakdownElementNode node = ModelFactory.eINSTANCE
-							.createWorkBreakdownElementNode();
-					Diagram diagram = (Diagram) editPart.getModel();
-					node.setUMADiagram(diagram.getUMADiagram());
-					node.setDiagram(diagram);
-					node.setObject(UmaFactory.eINSTANCE.createPhase());
-					return node;
-				}
-
-				public Object getObjectType() {
-					return TemplateConstants.PHASE;
-				}
-
-			};
-		creationFactory = phaseNodeCreationFactory;
-		templateNameToCreationFactoryMap.put(creationFactory.getObjectType(),
-				creationFactory);
-
-		if (iterationNodeCreationFactory == null)
-			iterationNodeCreationFactory = new CreationFactory() {
-
-				public Object getNewObject() {
-					// ActivityNode node =
-					// ModelFactory.eINSTANCE.createActivityNode();
-					WorkBreakdownElementNode node = ModelFactory.eINSTANCE
-							.createWorkBreakdownElementNode();
-					Diagram diagram = (Diagram) editPart.getModel();
-					node.setUMADiagram(diagram.getUMADiagram());
-					node.setDiagram(diagram);
-					node.setObject(UmaFactory.eINSTANCE.createIteration());
-					return node;
-				}
-
-				public Object getObjectType() {
-					return TemplateConstants.ITERATION;
-				}
-
-			};
-		creationFactory = iterationNodeCreationFactory;
-		templateNameToCreationFactoryMap.put(creationFactory.getObjectType(),
-				creationFactory);
-
-		if (synchBarCreationFactory == null)
-			synchBarCreationFactory = new CreationFactory() {
-
-				public Object getNewObject() {
-					TypedNode node = ModelFactory.eINSTANCE.createTypedNode();
-					node.setType(TypedNode.SYNCH_BAR);
-					node.setObject(GraphicalDataHelper
-							.newTypedGraphNode(TypedNode.SYNCH_BAR));
-					return node;
-				}
-
-				public Object getObjectType() {
-					return TemplateConstants.SYNCH_BAR;
-				}
-
-			};
-		creationFactory = synchBarCreationFactory;
-		templateNameToCreationFactoryMap.put(creationFactory.getObjectType(),
-				creationFactory);
-
-		if (decisionNodeCreationFactory == null)
-			decisionNodeCreationFactory = new CreationFactory() {
-
-				public Object getNewObject() {
-					TypedNode node = ModelFactory.eINSTANCE.createTypedNode();
-					node.setType(TypedNode.DECISION);
-					node.setObject(GraphicalDataHelper
-							.newTypedGraphNode(TypedNode.DECISION));
-					return node;
-				}
-
-				public Object getObjectType() {
-					return TemplateConstants.DECISION_NODE;
-				}
-
-			};
-		creationFactory = decisionNodeCreationFactory;
-		templateNameToCreationFactoryMap.put(creationFactory.getObjectType(),
-				creationFactory);
-
-		if (startNodeCreationFactory == null)
-			startNodeCreationFactory = new CreationFactory() {
-
-				public Object getNewObject() {
-					TypedNode node = ModelFactory.eINSTANCE.createTypedNode();
-					node.setType(TypedNode.START);
-					node.setObject(GraphicalDataHelper
-							.newTypedGraphNode(TypedNode.START));
-					return node;
-				}
-
-				public Object getObjectType() {
-					return TemplateConstants.START_NODE;
-				}
-
-			};
-		creationFactory = startNodeCreationFactory;
-		templateNameToCreationFactoryMap.put(creationFactory.getObjectType(),
-				creationFactory);
-
-		if (endNodeCreationFactory == null)
-			endNodeCreationFactory = new CreationFactory() {
-
-				public Object getNewObject() {
-					TypedNode node = ModelFactory.eINSTANCE.createTypedNode();
-					node.setType(TypedNode.END);
-					node.setObject(GraphicalDataHelper
-							.newTypedGraphNode(TypedNode.END));
-					return node;
-				}
-
-				public Object getObjectType() {
-					return TemplateConstants.END_NODE;
-				}
-
-			};
-		creationFactory = endNodeCreationFactory;
-		templateNameToCreationFactoryMap.put(creationFactory.getObjectType(),
-				creationFactory);
-
-		if (taskDescriptorNodeCreationFactory == null)
-			taskDescriptorNodeCreationFactory = new CreationFactory() {
-
-				public Object getNewObject() {
-					WorkBreakdownElementNode node = ModelFactory.eINSTANCE
-							.createWorkBreakdownElementNode();
-					Diagram diagram = (Diagram) editPart.getModel();
-					node.setUMADiagram(diagram.getUMADiagram());
-					node.setDiagram(diagram);
-					node.setObject(UmaFactory.eINSTANCE.createTaskDescriptor());
-					return node;
-				}
-
-				public Object getObjectType() {
-					return TemplateConstants.TASK_DESCRIPTOR;
-				}
-
-			};
-		creationFactory = taskDescriptorNodeCreationFactory;
-		templateNameToCreationFactoryMap.put(creationFactory.getObjectType(),
-				creationFactory);
-	}
-
-	protected void contributeToContextMenu(IMenuManager menu) {
-		super.contributeToContextMenu(menu);
-
-		boolean canModify = !isReadOnly();
-
-		menu.insertAfter(GEFActionConstants.MB_ADDITIONS, new Separator(
-				GEFActionConstants.MB_ADDITIONS));
-
-		IAction action = getActionRegistry().getAction(
-				OPEN_WORKFLOW_DETAIL_DIAGRAM);
-		if (action.isEnabled()) {
-			menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
-		}
-		menu.insertAfter(GEFActionConstants.MB_ADDITIONS, new Separator(
-				GEFActionConstants.MB_ADDITIONS));
-
-		action = getActionRegistry().getAction(CREATE_START_NODE);
-		if (action.isEnabled() && canModify) {
-			menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
-		}
-
-		// action = getActionRegistry().getAction(CREATE_FREE_TEXT);
-		// if(action.isEnabled()) {
-		// menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
-		// }
-
-		action = getActionRegistry().getAction(CREATE_SYNC_BAR);
-		if (action.isEnabled() && canModify) {
-			menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
-		}
-
-		action = getActionRegistry().getAction(CREATE_DECISION_BAR);
-		if (action.isEnabled() && canModify) {
-			menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
-		}
-
-		action = getActionRegistry().getAction(CREATE_END_NODE);
-		if (action.isEnabled() && canModify) {
-			menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
-		}
-		menu.insertAfter(GEFActionConstants.MB_ADDITIONS, new Separator(
-				GEFActionConstants.MB_ADDITIONS));
-
-		action = getActionRegistry().getAction(CREATE_ACTIVITY);
-		if (action.isEnabled() && canModify) {
-			menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
-		}
-		action = getActionRegistry().getAction(CREATE_ITERATION);
-		if (action.isEnabled() && canModify) {
-			menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
-		}
-
-		action = getActionRegistry().getAction(CREATE_PHASE);
-		if (action.isEnabled() && canModify) {
-			menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
-		}
-
-		action = getActionRegistry().getAction(CREATE_TASK_DESCRIPTOR);
-		if (action.isEnabled() && canModify) {
-			menu.appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
-		}
-	}
-
-	protected void createActions() {
-		super.createActions();
-
-		// Open workflow detail action
-		//
-		IAction action = new Action(
-				DiagramUIResources.ActivityDiagram_openActivityDetailDiagram_text) { //$NON-NLS-1$
-			public String getId() {
-				return OPEN_WORKFLOW_DETAIL_DIAGRAM;
-			}
-
-			public void run() {
-				try {
-					try {
-						EditPart selectedEditPart = (EditPart) getGraphicalViewer()
-								.getSelectedEditParts().get(0);
-						IEditorPart parent = getSite().getPage()
-								.getActiveEditor();
-						IEditorInput input = new ActivityDetailDiagramEditor.EditorInput(
-								(MethodElement) ((Node) selectedEditPart
-										.getModel()).getObject(),
-								((Diagram) editPart.getModel())
-										.getSuppression());
-						IEditorPart part = getSite()
-								.getPage()
-								.openEditor(
-										input,
-										ProcessEditor.ACTIVITY_DETAIL_DIAGRAM_EDITOR_ID);
-						if (part instanceof AbstractDiagramEditor) {
-							AbstractDiagramEditor editor = (AbstractDiagramEditor) part;
-							editor.setParentEditor(parent);
-						}
-					} catch (PartInitException exception) {
-						exception.printStackTrace();
-					}
-				} catch (RuntimeException e) {
-					e.printStackTrace();
-				}
-			}
-
-			public boolean isEnabled() {
-				List editParts = getGraphicalViewer().getSelectedEditParts();
-				if (editParts.size() != 1)
-					return false;
-				EditPart editPart = (EditPart) editParts.get(0);
-				return (editPart.getModel() instanceof WorkBreakdownElementNode && ((LinkedObject) editPart
-						.getModel()).getObject() instanceof Activity);
-			}
-		};
-		getActionRegistry().registerAction(action);
-
-		// IAction startNodeAction = new Action(DiagramUIResources.
-		// getString("DiagramUI.ActivityDiagram.StartNode.text")){ //$NON-NLS-1$
-		//			
-		// public void run(){
-		// CreateRequest request = new CreateRequest();
-		// //CreationFactory factory = getFactory(template);
-		// if (startNodeCreationFactory == null)
-		// return;
-		// request.setFactory(startNodeCreationFactory);
-		// request.setLocation(new Point(10,10));
-		//				
-		// if (request.getNewObject() instanceof Node) {
-		// Point loc = request.getLocation();
-		// //((GraphicalEditPart)getHost()).getFigure().translateToRelative(loc);
-		// Diagram parent = (Diagram)editPart.getModel();
-		// org.eclipse.gef.commands.Command c = new
-		// CreateNodeCommand((Node)request.getNewObject(),
-		// parent, loc);
-		// getCommandStack().execute(c);
-		// }
-		// }
-		// public String getId(){
-		// return CREATE_START_NODE;
-		// }
-		// public boolean isEnabled(){
-		// return true;
-		// }
-		// public String getToolTipText() {
-		// return
-		// DiagramUIResources.getString("DiagramUI.ActivityDiagram.StartNode.tooltip");
-		// }
-		//			
-		// };
-		// getActionRegistry().registerAction(startNodeAction);
-		//		
-		//		
-		// IAction endNodeAction = new Action(DiagramUIResources.
-		// getString("DiagramUI.ActivityDiagram.EndNode.text")){ //$NON-NLS-1$
-		//			
-		// public void run(){
-		// CreateRequest request = new CreateRequest();
-		// if (endNodeCreationFactory == null)
-		// return;
-		// request.setFactory(endNodeCreationFactory);
-		// request.setLocation(new Point(10,10));
-		//				
-		// if (request.getNewObject() instanceof Node) {
-		// Point loc = request.getLocation();
-		// Diagram parent = (Diagram)editPart.getModel();
-		// org.eclipse.gef.commands.Command c = new
-		// CreateNodeCommand((Node)request.getNewObject(),
-		// parent, loc);
-		// getCommandStack().execute(c);
-		// }
-		// }
-		// public String getId(){
-		// return CREATE_END_NODE;
-		// }
-		// public boolean isEnabled(){
-		// return true;
-		// }
-		// public String getToolTipText() {
-		// return
-		// DiagramUIResources.getString("DiagramUI.ActivityDiagram.EndNode.tooltip");
-		// }
-		// };
-		// getActionRegistry().registerAction(endNodeAction);
-		//		
-		// IAction syncBarAction = new Action(DiagramUIResources.
-		// getString("DiagramUI.ActivityDiagram.SyncBar.text")){ //$NON-NLS-1$
-		//			
-		// public void run(){
-		// CreateRequest request = new CreateRequest();
-		// //CreationFactory factory = getFactory(template);
-		// if (synchBarCreationFactory == null)
-		// return;
-		// request.setFactory(synchBarCreationFactory);
-		// request.setLocation(new Point(10,10));
-		//				
-		// if (request.getNewObject() instanceof Node) {
-		// Point loc = request.getLocation();
-		// //((GraphicalEditPart)getHost()).getFigure().translateToRelative(loc);
-		// Diagram parent = (Diagram)editPart.getModel();
-		// org.eclipse.gef.commands.Command c = new
-		// CreateNodeCommand((Node)request.getNewObject(),
-		// parent, loc);
-		// getCommandStack().execute(c);
-		// }
-		// }
-		// public String getId(){
-		// return CREATE_SYNC_BAR;
-		// }
-		// public boolean isEnabled(){
-		// return true;
-		// }
-		// public String getToolTipText() {
-		// return
-		// DiagramUIResources.getString("DiagramUI.ActivityDiagram.SyncBar.tooltip");
-		// }
-		//			
-		// };
-		// getActionRegistry().registerAction(syncBarAction);
-		//		
-		//		
-		// IAction decisionBarAction = new Action(DiagramUIResources.
-		// getString("DiagramUI.ActivityDiagram.DecisionBar.text")){
-		// //$NON-NLS-1$
-		//			
-		// public void run(){
-		// CreateRequest request = new CreateRequest();
-		// //CreationFactory factory = getFactory(template);
-		// if (decisionNodeCreationFactory == null)
-		// return;
-		// request.setFactory(decisionNodeCreationFactory);
-		// request.setLocation(new Point(10,10));
-		//				
-		// if (request.getNewObject() instanceof Node) {
-		// Point loc = request.getLocation();
-		// //((GraphicalEditPart)getHost()).getFigure().translateToRelative(loc);
-		// Diagram parent = (Diagram)editPart.getModel();
-		// org.eclipse.gef.commands.Command c = new
-		// CreateNodeCommand((Node)request.getNewObject(),
-		// parent, loc);
-		// getCommandStack().execute(c);
-		// }
-		// }
-		// public String getId(){
-		// return CREATE_DECISION_BAR;
-		// }
-		// public boolean isEnabled(){
-		// return true;
-		// }
-		// public String getToolTipText() {
-		// return
-		// DiagramUIResources.getString("DiagramUI.ActivityDiagram.DecisionBar.tooltip");
-		// }
-		//			
-		// };
-		// getActionRegistry().registerAction(decisionBarAction);
-
-		action = createAnAction(
-				DiagramUIResources.ActivityDiagram_StartNode_text, startNodeCreationFactory, //$NON-NLS-1$
-				CREATE_START_NODE,
-				DiagramUIResources.ActivityDiagram_StartNode_tooltip, //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"stnode_pal16.gif")); //$NON-NLS-1$
-		getActionRegistry().registerAction(action);
-
-		action = createAnAction(
-				DiagramUIResources.AbstractDiagram_FreeText_text, freeTxtNodeCreationFactory, //$NON-NLS-1$
-				CREATE_FREE_TEXT,
-				DiagramUIResources.AbstractDiagram_FreeText_tooltip, //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"freetext_pal16.gif")); //$NON-NLS-1$
-		getActionRegistry().registerAction(action);
-
-		action = createAnAction(
-				DiagramUIResources.ActivityDiagram_SyncBar_text, synchBarCreationFactory, //$NON-NLS-1$
-				CREATE_SYNC_BAR, DiagramUIResources.ActivityDiagram_SyncBar_tooltip
-				, AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"syncbar_pal16.gif")); //$NON-NLS-1$
-		getActionRegistry().registerAction(action);
-
-		action = createAnAction(
-				DiagramUIResources.ActivityDiagram_DecisionNode_text, decisionNodeCreationFactory, //$NON-NLS-1$
-				CREATE_DECISION_BAR,
-				DiagramUIResources.ActivityDiagram_DecisionNode_tooltip
-				, AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"decnode_pal16.gif")); //$NON-NLS-1$
-		getActionRegistry().registerAction(action);
-
-		action = createAnAction(
-				DiagramUIResources.ActivityDiagram_EndNode_text, endNodeCreationFactory, //$NON-NLS-1$
-				CREATE_END_NODE, DiagramUIResources.ActivityDiagram_EndNode_tooltip
-				, AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"endnode_pal16.gif")); //$NON-NLS-1$
-		getActionRegistry().registerAction(action);
-
-		action = createAnAction(
-				DiagramUIResources.ActivityDiagram_Activity_text, activityNodeCreationFactory, //$NON-NLS-1$
-				CREATE_ACTIVITY,
-				DiagramUIResources.ActivityDiagram_Activity_tooltip
-				, AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"activity16.gif")); //$NON-NLS-1$
-		getActionRegistry().registerAction(action);
-
-		action = createAnAction(
-				DiagramUIResources.ActivityDiagram_Iteration_text, iterationNodeCreationFactory, //$NON-NLS-1$
-				CREATE_ITERATION,
-				DiagramUIResources.ActivityDiagram_Iteration_tooltip
-				, AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"Iteration16.gif")); //$NON-NLS-1$
-		getActionRegistry().registerAction(action);
-
-		action = createAnAction(
-				DiagramUIResources.ActivityDiagram_Phase_text, phaseNodeCreationFactory, //$NON-NLS-1$
-				CREATE_PHASE, DiagramUIResources.ActivityDiagram_Phase_tooltip
-				, AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"Phase16.gif")); //$NON-NLS-1$
-		getActionRegistry().registerAction(action);
-
-		action = createAnAction(
-				DiagramUIResources.AbstractDiagram_TaskDescriptor_text, taskDescriptorNodeCreationFactory, //$NON-NLS-1$
-				CREATE_TASK_DESCRIPTOR,
-				DiagramUIResources.AbstractDiagram_TaskDescriptor_tooltip
-				, AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"TaskDescriptor.gif")); //$NON-NLS-1$
-		getActionRegistry().registerAction(action);
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void handleDoubleClick(Event event) {
-		List editParts = getGraphicalViewer().getSelectedEditParts();
-
-		// do nothing if 0 or more than 1 edit parts are selected
-		//
-		if (editParts.size() != 1)
-			return;
-
-		EditPart editPart = (EditPart) editParts.get(0);
-		WorkBreakdownElementNode node = null;
-		if (editPart.getModel() instanceof WorkBreakdownElementNode
-				&& (node = (WorkBreakdownElementNode) editPart.getModel()).getObject() instanceof Activity) {
-			// open activity diagram of the selected activity in a new editor
-			//
-			try {
-				try {
-					BreakdownElementEditorInput editorInput = (BreakdownElementEditorInput) getEditorInput();
-					Object object = node.isReadOnly() ? node.getWrapper() : node.getObject();
-					IEditorInput input = new EditorInput(object, editorInput.getSuppression());
-					IEditorPart parent = getSite().getPage().getActiveEditor();
-					IEditorPart part = getSite().getPage().openEditor(input,
-							ProcessEditor.WORKFLOW_EDITOR_ID);
-					if (part instanceof AbstractDiagramEditor) {
-						AbstractDiagramEditor editor = (AbstractDiagramEditor) part;
-						editor.setParentEditor(parent);
-					}
-				} catch (PartInitException exception) {
-					exception.printStackTrace();
-				}
-			} catch (RuntimeException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-
-	protected PaletteContainer createControlGroup(PaletteRoot root) {
-		initializeCreationFactories();
-
-		PaletteGroup controlGroup = new PaletteGroup("Control Group"); //$NON-NLS-1$
-
-		List entries = new ArrayList();
-
-		ToolEntry tool = new PanningSelectionToolEntry(DiagramUIResources.AbstractDiagram_Select_text, //$NON-NLS-1$
-				DiagramUIResources.AbstractDiagram_Select_tooltip
-		);
-		tool.setSmallIcon(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"select_pal16.gif"));
-		tool.setLargeIcon(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"select_pal24.gif"));
-		entries.add(tool);
-		root.setDefaultEntry(tool);
-
-		tool = new MarqueeToolEntry();
-		tool.setSmallIcon(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"marq_pal16.gif"));
-		tool.setLargeIcon(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"marq_pal24.gif"));
-		entries.add(tool);
-
-		tool = new ConnectionCreationToolEntry(DiagramUIResources.AbstractDiagram_Link_text, //$NON-NLS-1$
-				DiagramUIResources.AbstractDiagram_Link_tooltip, //$NON-NLS-1$
-				null, AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"link_pal16.gif"), //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"link_pal24.gif")//$NON-NLS-1$
-		);
-		entries.add(tool);
-
-		CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry(
-				DiagramUIResources.ActivityDiagram_StartNode_text, //$NON-NLS-1$
-				DiagramUIResources.ActivityDiagram_StartNode_tooltip, //$NON-NLS-1$
-				TemplateConstants.START_NODE, startNodeCreationFactory,
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"stnode_pal16.gif"), //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"stnode_pal24.gif")//$NON-NLS-1$
-		);
-		entries.add(combined);
-
-		combined = new CombinedTemplateCreationEntry(
-				DiagramUIResources.AbstractDiagram_FreeText_text, //$NON-NLS-1$
-				DiagramUIResources.AbstractDiagram_FreeText_tooltip, //$NON-NLS-1$
-				TemplateConstants.FREE_TEXT, freeTxtNodeCreationFactory,
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"freetext_pal16.gif"), //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"freetext_pal24.gif")//$NON-NLS-1$
-		);
-		entries.add(combined);
-
-		combined = new CombinedTemplateCreationEntry(
-				DiagramUIResources.ActivityDiagram_SyncBar_text, //$NON-NLS-1$
-				DiagramUIResources.ActivityDiagram_SyncBar_tooltip, //$NON-NLS-1$
-				TemplateConstants.SYNCH_BAR, synchBarCreationFactory,
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"syncbar_pal16.gif"), //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"syncbar_pal24.gif")//$NON-NLS-1$
-		);
-		entries.add(combined);
-
-		combined = new CombinedTemplateCreationEntry(
-				DiagramUIResources.ActivityDiagram_DecisionNode_text, //$NON-NLS-1$
-				DiagramUIResources.ActivityDiagram_DecisionNode_tooltip, //$NON-NLS-1$
-				TemplateConstants.DECISION_NODE, decisionNodeCreationFactory,
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"decnode_pal16.gif"), //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"decnode_pal24.gif")//$NON-NLS-1$
-		);
-		entries.add(combined);
-
-		combined = new CombinedTemplateCreationEntry(
-				DiagramUIResources.ActivityDiagram_EndNode_text, //$NON-NLS-1$
-				DiagramUIResources.ActivityDiagram_EndNode_tooltip, //$NON-NLS-1$
-				TemplateConstants.END_NODE, endNodeCreationFactory,
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"endnode_pal16.gif"), //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"endnode_pal24.gif")//$NON-NLS-1$
-		);
-		entries.add(combined);
-
-		PaletteSeparator sep = new PaletteSeparator(
-				GraphicalWorkflowEditor.class.getName() + "sep1"); //$NON-NLS-1$
-		sep
-				.setUserModificationPermission(PaletteEntry.PERMISSION_NO_MODIFICATION);
-		entries.add(sep); //$NON-NLS-1$
-
-		combined = new CombinedTemplateCreationEntry(
-				DiagramUIResources.ActivityDiagram_Activity_text, //$NON-NLS-1$
-				DiagramUIResources.ActivityDiagram_Activity_tooltip, //$NON-NLS-1$
-				TemplateConstants.ACTIVITY, activityNodeCreationFactory,
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"activity16.gif"), //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"activity24.gif")//$NON-NLS-1$
-		);
-		entries.add(combined);
-
-		combined = new CombinedTemplateCreationEntry(
-				DiagramUIResources.ActivityDiagram_Iteration_text, //$NON-NLS-1$
-				DiagramUIResources.ActivityDiagram_Iteration_tooltip, //$NON-NLS-1$
-				TemplateConstants.ITERATION, iterationNodeCreationFactory,
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"Iteration16.gif"), //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"activity24.gif")//$NON-NLS-1$
-		);
-		entries.add(combined);
-
-		combined = new CombinedTemplateCreationEntry(DiagramUIResources.ActivityDiagram_Phase_text, //$NON-NLS-1$
-				DiagramUIResources.ActivityDiagram_Phase_tooltip, //$NON-NLS-1$
-				TemplateConstants.PHASE, phaseNodeCreationFactory,
-				AuthoringUIPlugin.getDefault()
-						.getImageDescriptor("Phase16.gif"), //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"activity24.gif")//$NON-NLS-1$
-		);
-		entries.add(combined);
-
-		combined = new CombinedTemplateCreationEntry(
-				DiagramUIResources.AbstractDiagram_TaskDescriptor_text, //$NON-NLS-1$
-				DiagramUIResources.AbstractDiagram_TaskDescriptor_tooltip, //$NON-NLS-1$
-				TemplateConstants.TASK_DESCRIPTOR,
-				taskDescriptorNodeCreationFactory, AuthoringUIPlugin
-						.getDefault().getImageDescriptor("TaskDescriptor.gif"), //$NON-NLS-1$
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"activity24.gif")//$NON-NLS-1$
-		);
-		entries.add(combined);
-
-		controlGroup.addAll(entries);
-		return controlGroup;
-	}
-
-	protected String getPartNamePrefix() {
-		MethodElement e = ((MethodElementEditorInput) getEditorInput())
-				.getMethodElement();
-		if (e instanceof Activity) {
-			return getTypeName((Activity) e) + ": "; //$NON-NLS-1$
-		}
-		return ""; //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.editors.AbstractDiagramEditor#createDiagramEditPart()
-	 */
-	protected EditPart createDiagramEditPart() {
-		ActivityDiagramEditPart adEditPart = new ActivityDiagramEditPart(ModelFactory.eINSTANCE
-				.createActivityDiagram());
-		adEditPart.markDirty(true);
-		return adEditPart;
-	}
-
-//	protected EditPart createEditPart(Object e) {
-//		ActivityDiagram diagram = ModelFactory.eINSTANCE
-//				.createActivityDiagram();
-//		diagram.setObject(e);
-//		EditPart part = new ActivityDiagramEditPart(diagram);
-//		part.setModel(diagram);
-//		diagram.addConsumer(this);
-//		return part;
-//	}
-
-	private static String getTypeName(Activity act) {
-		if (act instanceof DeliveryProcess) {
-			return DiagramUIResources.ActvitivityDiagram_DeliveryProcess_text; //$NON-NLS-1$
-		} else if (act instanceof CapabilityPattern) {
-			return DiagramUIResources.ActvitivityDiagram_CapabilityPattern_text; //$NON-NLS-1$
-		} else if (act instanceof Phase) {
-			return DiagramUIResources.ActvitivityDiagram_Phase_tex; //$NON-NLS-1$
-		} else if (act instanceof Iteration) {
-			return DiagramUIResources.ActvitivityDiagram_Iteration_text; //$NON-NLS-1$
-		}
-		return DiagramUIResources.ActvitivityDiagram_Activity_text; //$NON-NLS-1$
-	}
-
-//	private static Image getTypeImage(Object object) {
-//		IItemLabelProvider adapter = (IItemLabelProvider) TngAdapterFactory.INSTANCE
-//				.getWBS_ComposedAdapterFactory().adapt(object,
-//						IItemLabelProvider.class);
-//		if (adapter != null) {
-//			// return new Image(Display.getCurrent(),
-//			// ((URL)adapter.getImage(object)).getContent());
-//		}
-//		return null;
-//	}
-
-	/**
-	 * An editor input for grahical workflow editor
-	 */
-	public static class EditorInput extends BreakdownElementEditorInput {
-
-		/**
-		 * @param e
-		 */
-		public EditorInput(Object e, Suppression suppression) {
-			super(e, suppression);
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.editors.AbstractDiagramEditor#createEditPartFactory()
-	 */
-	protected EditPartFactory createEditPartFactory() {
-		return new ActivityDiagramEditPartFactory();
-	}
-
-	protected String getDiagramType() {
-		return ResourceHelper.DIAGRAM_TYPE_WORKFLOW;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/IEditorKeeper.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/IEditorKeeper.java
deleted file mode 100755
index 4697685..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/IEditorKeeper.java
+++ /dev/null
@@ -1,55 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-/**
- * An interface which manages opening/closing of an editor
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface IEditorKeeper {
-
-	/**
-	 * Reference class for editor keeper
-	 *
-	 */
-	public static class Reference {
-		private IEditorKeeper editorKeeper;
-
-		private Reference() {
-
-		}
-
-		public void setEditorKeeper(IEditorKeeper editorKeeper) {
-			this.editorKeeper = editorKeeper;
-		}
-
-		public IEditorKeeper getEditorKeeper() {
-			return editorKeeper;
-		}
-	}
-
-	public static final Reference REFERENCE = new Reference();
-
-	/**
-	 * Open an editor for the given element
-	 * @param object
-	 */
-	void openEditor(Object object);
-
-	/**
-	 * Closes an open editor if element is deleted
-	 * @param object
-	 */
-	void closeEditorsOnDeletion(Object object);
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodElementEditor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodElementEditor.java
deleted file mode 100755
index 08bae79..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodElementEditor.java
+++ /dev/null
@@ -1,1964 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.actions.LibraryValidateAction;
-import org.eclipse.epf.authoring.ui.forms.ChecklistItemsPage;
-import org.eclipse.epf.authoring.ui.forms.ContentElementGuidancePage;
-import org.eclipse.epf.authoring.ui.forms.ContentPackageDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.CustomCategoryAssignPage;
-import org.eclipse.epf.authoring.ui.forms.CustomCategoryDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.DisciplineDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.DisciplineGroupingDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.DisciplineGroupingDisciplinesPage;
-import org.eclipse.epf.authoring.ui.forms.DisciplineReferenceWorkflowPage;
-import org.eclipse.epf.authoring.ui.forms.DisciplineTasksPage;
-import org.eclipse.epf.authoring.ui.forms.DomainDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.DomainWorkProductsPage;
-import org.eclipse.epf.authoring.ui.forms.GuidanceDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.GuidanceWithAttachmentsDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.IExtensionFormPage;
-import org.eclipse.epf.authoring.ui.forms.IRefreshable;
-import org.eclipse.epf.authoring.ui.forms.MethodLibraryDescriptionFormPage;
-import org.eclipse.epf.authoring.ui.forms.MethodPluginDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.PracticeDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.PracticeReferencesPage;
-import org.eclipse.epf.authoring.ui.forms.RoleCategoriesPage;
-import org.eclipse.epf.authoring.ui.forms.RoleDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.RoleSetDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.RoleSetGroupingDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.RoleSetGroupingRoleSets;
-import org.eclipse.epf.authoring.ui.forms.RoleSetRolesPage;
-import org.eclipse.epf.authoring.ui.forms.RoleWorkProductsPage;
-import org.eclipse.epf.authoring.ui.forms.TaskCategoriesPage;
-import org.eclipse.epf.authoring.ui.forms.TaskDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.TaskRolesPage;
-import org.eclipse.epf.authoring.ui.forms.TaskStepsPage;
-import org.eclipse.epf.authoring.ui.forms.TaskWorkProductsPage;
-import org.eclipse.epf.authoring.ui.forms.ToolDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.ToolToolMentorsPage;
-import org.eclipse.epf.authoring.ui.forms.WorkProductCategoriesPage;
-import org.eclipse.epf.authoring.ui.forms.WorkProductDeliverablePartsPage;
-import org.eclipse.epf.authoring.ui.forms.WorkProductDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.WorkProductTypeDescriptionPage;
-import org.eclipse.epf.authoring.ui.forms.WorkProductTypeWorkProductsPage;
-import org.eclipse.epf.authoring.ui.internal.MethodElementEditorErrorTickUpdater;
-import org.eclipse.epf.authoring.ui.providers.MethodEditorPageProvider;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.util.LibraryValidationMarkerHelper;
-import org.eclipse.epf.authoring.ui.views.ElementHTMLViewer;
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.authoring.ui.views.ViewHelper;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.edit.LibraryEditResources;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.ActionManager;
-import org.eclipse.epf.library.edit.command.FullyRevertibleCommandStack;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.command.IResourceAwareCommand;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.persistence.ILibraryResource;
-import org.eclipse.epf.library.persistence.ILibraryResourceSet;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.library.util.ResourceUtil;
-import org.eclipse.epf.library.xmi.XMILibraryUtil;
-import org.eclipse.epf.persistence.FileManager;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.persistence.MultiFileXMIResourceImpl;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.services.ILibraryPersister;
-import org.eclipse.epf.services.Services;
-import org.eclipse.epf.services.ILibraryPersister.FailSafeMethodLibraryPersister;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Deliverable;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductType;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IPartService;
-import org.eclipse.ui.IWindowListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The Method Element editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MethodElementEditor extends AbstractBaseFormEditor implements
-		ISelectionProvider {
-
-	/**
-	 * The editor ID.
-	 */
-	public static final String EDITOR_ID = MethodElementEditor.class.getName();
-
-	protected int preview_page_index = -1;
-
-	protected ElementHTMLViewer previewer = null;
-
-	protected MethodElement elementObj = null;
-
-	// The rich text control or editor whose content was last modified before
-	// the Save or Save All button key is selected.
-	protected IMethodRichText modifiedRichText = null;
-
-	protected Adapter nameChangedListener = new AdapterImpl() {
-		public void notifyChanged(org.eclipse.emf.common.notify.Notification msg) {
-			switch (msg.getFeatureID(MethodElement.class)) {
-			case UmaPackage.METHOD_ELEMENT__NAME:
-				nameChanged();
-				break;
-			}
-		}
-	};
-
-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
-
-	protected ISelection currentSelection = StructuredSelection.EMPTY;
-
-	protected ActionManager actionMgr;
-
-	private boolean dirty;
-
-	private FailSafeMethodLibraryPersister persister;
-
-	private Collection<Resource> resourcesToAdjustLocation = new HashSet<Resource>();
-
-	private Collection<Object> widgetsToRestoreValue = new HashSet<Object>();
-
-	private long changeTime = -1;
-
-	public Object widgetToCheck;
-
-	private Object currentFeatureEditor;
-
-	private EStructuralFeature currentEditedFeature;
-
-	protected ArrayList<Resource> removedResources = new ArrayList<Resource>();
-
-	protected ArrayList<Resource> changedResources = new ArrayList<Resource>();
-	
-	protected MethodElementEditorErrorTickUpdater fMethodElementEditorErrorTickUpdater;
-	
-	/**
-	 * Listens for workspace changes.
-	 */
-	protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() {
-		public void resourceChanged(IResourceChangeEvent event) {
-			System.out
-					.println("MethodElementEditor.resourceChanged(): event = " + event); //$NON-NLS-1$
-
-			if (elementObj.eIsProxy()) {
-				return;
-			}
-
-			IResourceDelta delta = event.getDelta();
-			try {
-				class ResourceDeltaVisitor implements IResourceDeltaVisitor {
-					protected Map URIToUsedResourceMap = getURIToUsedResourceMap();
-
-					protected Collection<Resource> changedResources = new ArrayList<Resource>();
-
-					protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-					public boolean visit(IResourceDelta delta) {
-						if (delta.getFlags() != IResourceDelta.MARKERS
-								&& delta.getResource().getType() == IResource.FILE) {
-							if ((delta.getKind() & (IResourceDelta.CHANGED | IResourceDelta.REMOVED)) != 0) {
-								Resource resource = (Resource) URIToUsedResourceMap
-										.get(URI.createFileURI(delta
-												.getResource().getLocation()
-												.toString()));
-								if (resource != null) {
-									if ((delta.getKind() & IResourceDelta.REMOVED) != 0) {
-										removedResources.add(resource);
-									} else {
-										changedResources.add(resource);
-									}
-								}
-							}
-						}
-
-						return true;
-					}
-
-					public Collection<Resource> getChangedResources() {
-						return changedResources;
-					}
-
-					public Collection<Resource> getRemovedResources() {
-						return removedResources;
-					}
-				}
-
-				ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
-				delta.accept(visitor);
-
-				removedResources.addAll(visitor.getRemovedResources());
-				if (!visitor.getRemovedResources().isEmpty() && !isDirty()) {
-					getSite().getShell().getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							MethodElementEditor.this.dispose();
-						}
-					});
-				}
-
-				changedResources.addAll(visitor.getChangedResources());
-			} catch (CoreException e) {
-				AuthoringUIPlugin.getDefault().getLogger().logError(e);
-			}
-		}
-	};
-
-	class ActivationListener implements IPartListener, IWindowListener {
-
-		/** Cache of the active workbench part. */
-		private IWorkbenchPart fActivePart;
-
-		/** Indicates whether activation handling is currently be done. */
-		private boolean fIsHandlingActivation = false;
-
-		/**
-		 * The part service.
-		 * 
-		 * @since 3.1
-		 */
-		private IPartService fPartService;
-
-		/**
-		 * Creates this activation listener.
-		 * 
-		 * @param partService
-		 *            the part service on which to add the part listener
-		 * @since 3.1
-		 */
-		public ActivationListener(IPartService partService) {
-			fPartService = partService;
-			fPartService.addPartListener(this);
-			PlatformUI.getWorkbench().addWindowListener(this);
-		}
-
-		/**
-		 * Disposes this activation listener.
-		 * 
-		 * @since 3.1
-		 */
-		public void dispose() {
-			fPartService.removePartListener(this);
-			PlatformUI.getWorkbench().removeWindowListener(this);
-			fPartService = null;
-		}
-
-		/*
-		 * @see IPartListener#partActivated(org.eclipse.ui.IWorkbenchPart)
-		 */
-		public void partActivated(IWorkbenchPart part) {
-			fActivePart = part;
-			handleActivation();
-		}
-
-		/*
-		 * @see IPartListener#partBroughtToTop(org.eclipse.ui.IWorkbenchPart)
-		 */
-		public void partBroughtToTop(IWorkbenchPart part) {
-		}
-
-		/*
-		 * @see IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart)
-		 */
-		public void partClosed(IWorkbenchPart part) {
-		}
-
-		/*
-		 * @see IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart)
-		 */
-		public void partDeactivated(IWorkbenchPart part) {
-			fActivePart = null;
-		}
-
-		/*
-		 * @see IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart)
-		 */
-		public void partOpened(IWorkbenchPart part) {
-			if (part == MethodElementEditor.this) {
-				if (!isInputValid()) {
-					AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayInfo(
-									AuthoringUIResources.editors_MethodElementEditor_invalidEditorTitle, 
-									AuthoringUIResources.editors_MethodElementEditor_invalidEditorMsg); 
-					MethodElementEditor.this.close(false);
-					return;
-				}
-				Collection usedResources = getUsedResources();
-				if (ResourceUtil.hasOutOfSynch(usedResources)) {
-					handleFileChanged(usedResources);
-					return;
-				}
-				updateTimeStamps(usedResources);
-			}
-		}
-
-		/**
-		 * Handles the activation triggering a element state check in the
-		 * editor.
-		 */
-		private void handleActivation() {
-			if (fIsHandlingActivation || MethodElementEditor.this.disposed)
-				return;
-
-			if (fActivePart == MethodElementEditor.this) {
-				fIsHandlingActivation = true;
-				try {
-					handleActivate(fActivePart);
-				} finally {
-					fIsHandlingActivation = false;
-				}
-			}
-		}
-
-		/*
-		 * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow)
-		 * @since 3.1
-		 */
-		public void windowActivated(IWorkbenchWindow window) {
-			if (window == getEditorSite().getWorkbenchWindow()) {
-				/*
-				 * Workaround for problem described in
-				 * http://dev.eclipse.org/bugs/show_bug.cgi?id=11731 Will be
-				 * removed when SWT has solved the problem.
-				 */
-				window.getShell().getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						handleActivation();
-					}
-				});
-			}
-		}
-
-		/*
-		 * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow)
-		 * @since 3.1
-		 */
-		public void windowDeactivated(IWorkbenchWindow window) {
-		}
-
-		/*
-		 * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow)
-		 * @since 3.1
-		 */
-		public void windowClosed(IWorkbenchWindow window) {
-		}
-
-		/*
-		 * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow)
-		 * @since 3.1
-		 */
-		public void windowOpened(IWorkbenchWindow window) {
-		}
-	}
-
-	private ActivationListener activationListener;
-
-	private HashMap<Resource, Long> modificationTimeStampMap;
-
-	private boolean checkFileChangedRequired = false;
-
-	protected HashSet<Resource> lastUsedResources;
-
-	private boolean disposed;
-
-	private HashMap<Resource, Long> loadTimeStampMap;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public MethodElementEditor() {
-		super();
-		
-		fMethodElementEditorErrorTickUpdater= new MethodElementEditorErrorTickUpdater(this);
-
-		actionMgr = new ActionManager() {
-
-			protected FullyRevertibleCommandStack createCommandStack() {
-				return new FullyRevertibleCommandStack(this) {
-					public boolean doExecute(Command command) {
-						// Check modify first.
-						if (command instanceof IResourceAwareCommand) {
-							Collection modifiedResources = ((IResourceAwareCommand) command)
-									.getModifiedResources();
-							if (modifiedResources != null
-									&& !(modifiedResources.isEmpty())) {
-								IStatus status = UserInteractionHelper
-										.checkModify(modifiedResources,
-												getSite().getShell());
-								if (!status.isOK()) {
-									MethodElementEditor.this
-											.handleError(status);
-									return false;
-								}
-							}
-						} else {
-							EObject owner = TngUtil.getOwner(command);
-							if (owner != null) {
-								IStatus status = TngUtil.checkEdit(owner,
-										getSite().getShell());
-								if (!status.isOK()) {
-									AuthoringUIPlugin
-											.getDefault()
-											.getMsgDialog()
-											.display(
-													AuthoringUIResources.errorDialog_title, 
-													AuthoringUIResources.editDialog_msgCannotEdit, 
-													status);
-									return false;
-								}
-							}
-						}
-
-						if (changeTime == -1) {
-							changeTime = System.currentTimeMillis();
-						}
-						boolean ret = super.doExecute(command);
-						if (!ret && changeTime != -1) {
-							changeTime = -1;
-						}
-						return ret;
-					}
-
-				};
-			}
-
-			public boolean doAction(int actionType, EObject object,
-					org.eclipse.emf.ecore.EStructuralFeature feature,
-					Object value, int index) {
-				IStatus status = TngUtil
-						.checkEdit(object, getSite().getShell());
-				if (status.isOK()) {
-					return super.doAction(actionType, object, feature, value,
-							index);
-				} else {
-					AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-							AuthoringUIResources.editDialog_title, 
-							AuthoringUIResources.editDialog_msgCannotEdit, 
-							status);
-					return false;
-				}
-			}
-
-			protected void save(Resource resource) {
-				// don't save resource that is changed outside of this editor
-				//
-				if (changedResources.contains(resource)) {
-					return;
-				}
-				
-				boolean canSave;
-				if(resource.getURI().isFile()) {
-					File file = new File(resource.getURI().toFileString());
-					canSave = file.lastModified() > changeTime;
-				}
-				else {
-					canSave = true;
-				}				
-				try {
-					if(canSave) {
-						ILibraryPersister.FailSafeMethodLibraryPersister persister = getPersister();
-						try {
-							persister.save(resource);
-							persister.commit();
-						} catch (Exception e) {
-							AuthoringUIPlugin.getDefault().getLogger()
-							.logError(e);
-							try {
-								persister.rollback();
-							} catch (Exception ex) {
-								ViewHelper
-								.reloadCurrentLibaryOnRollbackError(getEditorSite()
-										.getShell());
-							}
-						}
-					}
-				} finally {
-					changeTime = -1;
-				}
-			}
-		};
-
-		actionMgr.getCommandStack().addCommandStackListener(
-				new CommandStackListener() {
-					public void commandStackChanged(EventObject event) {
-						firePropertyChange(IEditorPart.PROP_DIRTY);
-					}
-				});
-
-		ILibraryManager manager = (ILibraryManager) LibraryService
-				.getInstance().getCurrentLibraryManager();
-		if (manager != null) {
-			manager.startListeningTo(actionMgr.getCommandStack());
-		}
-	}
-
-	private void nameChanged() {
-		SafeUpdateController.asyncExec(new Runnable() {
-
-			public void run() {
-				setPartName();
-				if (pages != null) {
-					for (Iterator iter = pages.iterator(); iter.hasNext();) {
-						Object page = iter.next();
-
-						if (page instanceof IRefreshable) {
-							((IRefreshable) page).refreshName(elementObj
-									.getName());
-						}
-					}
-				}
-			}
-			
-		});
-	}
-	
-	public IActionManager getActionManager() {
-		return actionMgr;
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormEditor#init(IEditorSite,
-	 *      IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input)
-			throws PartInitException {
-		setSite(site);
-		setInput(input);
-		site.setSelectionProvider(this);
-		activationListener = new ActivationListener(site.getWorkbenchWindow()
-				.getPartService());
-
-		ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory());
-		Image titleImage = labelProvider.getImage(elementObj);
-		labelProvider.dispose();
-		setTitleImage(titleImage);
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.ui.part.EditorPart#setInput(org.eclipse.ui.IEditorInput)
-	 */
-	protected void setInput(IEditorInput input) {
-		super.setInput(input);
-
-		// Get method element object from Editor input.
-		//
-		MethodElementEditorInput methodElementInput = (MethodElementEditorInput) input;
-		elementObj = methodElementInput.getMethodElement();
-
-		setPartName();
-		elementObj.eAdapters().add(nameChangedListener);
-		
-		if (fMethodElementEditorErrorTickUpdater != null)
-			fMethodElementEditorErrorTickUpdater.updateEditorImage(elementObj);
-
-	}
-
-	private void updateTimeStamps(Collection usedResources) {
-		updateModificationTimeStampMap(usedResources);
-		updateLoadTimeStampMap(usedResources);
-	}
-
-	private void updateModificationTimeStampMap(Collection usedResources) {
-		if (modificationTimeStampMap == null) {
-			modificationTimeStampMap = new HashMap<Resource, Long>();
-		} else {
-			modificationTimeStampMap.clear();
-		}
-		for (Iterator iter = usedResources.iterator(); iter.hasNext();) {
-			Resource resource = (Resource) iter.next();
-			if(resource.getURI().isFile()) {
-				modificationTimeStampMap.put(resource, new Long(new File(resource
-						.getURI().toFileString()).lastModified()));
-			}
-		}
-		checkFileChangedRequired = true;
-	}
-
-	private void updateLoadTimeStampMap(Collection usedResources) {
-		if (loadTimeStampMap == null) {
-			loadTimeStampMap = new HashMap<Resource, Long>();
-		} else {
-			loadTimeStampMap.clear();
-		}
-		for (Iterator iter = usedResources.iterator(); iter.hasNext();) {
-			Resource resource = (Resource) iter.next();
-			if(resource instanceof ILibraryResource) {
-				loadTimeStampMap.put(resource, new Long(((ILibraryResource)resource)
-						.getLoadStamp()));
-			}
-		}
-	}
-
-	/**
-	 * Checks if there is any resource in the given <code>usedResources</code>
-	 * that has been reloaded since last update of load time stamps by this
-	 * editor
-	 * 
-	 * @param usedResource
-	 * @return
-	 */
-	private boolean checkReloaded(Collection usedResources) {
-		ResourceSet resourceSet = getResourceSet(usedResources);
-		boolean xmi = resourceSet instanceof ILibraryResourceSet 
-			&& ((ILibraryResourceSet)resourceSet).getPersistenceType().equals(Services.XMI_PERSISTENCE_TYPE);
-		for (Iterator iter = usedResources.iterator(); iter.hasNext();) {
-			Resource resource = (Resource) iter.next();
-			if(resource instanceof ILibraryResource) {
-				Long oldTime = (Long) loadTimeStampMap.get(resource);
-				long currentTime = ((ILibraryResource)resource).getLoadStamp();
-				if (oldTime != null && oldTime.longValue() != currentTime) {
-					if(xmi) {
-						IResource wsRes = FileManager.getResourceForLocation(resource
-								.getURI().toFileString());
-						if (wsRes != null) {
-							return true;
-						}
-					}
-					else {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-	
-	private static ResourceSet getResourceSet(Collection resources) {
-		ResourceSet resourceSet = null;
-		for (Iterator iter = resources.iterator(); iter.hasNext();) {
-			Resource resource = (Resource) iter.next();
-			resourceSet = resource.getResourceSet();
-			if (resourceSet != null) {
-				break;
-			}
-		}
-		return resourceSet;
-	}
-
-	private boolean checkFileChanged(Collection usedResources) {
-		// check resource set type and continue to check for changed file if the
-		// type is XMI
-		//
-		ResourceSet resourceSet = getResourceSet(usedResources);
-		if (resourceSet instanceof ILibraryResourceSet
-				&& ((ILibraryResourceSet) resourceSet).getPersistenceType().equals(Services.XMI_PERSISTENCE_TYPE)) {
-			for (Iterator iter = usedResources.iterator(); iter.hasNext();) {
-				Resource resource = (Resource) iter.next();
-				String filePath = FileManager.toFileString(resource.getURI(), resourceSet.getURIConverter());
-				Long oldTime = (Long) modificationTimeStampMap.get(resource);
-				boolean checkForSynch = false;
-				if (oldTime == null) {
-					// editor is being open or new saved file
-					//
-					checkForSynch = MultiFileSaveUtil
-							.checkSynchronized(resource) != 1;
-				} else {
-					File file = new File(filePath);
-					if (!file.exists()) {
-						return true;
-					}
-					long currentTime = file.lastModified();
-					if (MultiFileSaveUtil
-							.same(currentTime, oldTime.longValue())) {
-						// some team providers changed the timestamp of last
-						// file
-						// modification by removing second fraction
-						// even the file was not changed
-						//
-						modificationTimeStampMap.put(resource, new Long(
-								currentTime));
-					} else {
-						checkForSynch = oldTime.longValue() != currentTime;
-					}
-				}
-
-				if (checkForSynch) {
-					IResource wsRes = FileManager
-							.getResourceForLocation(filePath);
-					if (wsRes != null
-							&& !wsRes.isSynchronized(IResource.DEPTH_ZERO)) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	protected boolean promptReloadFiles() {
-		String title = AuthoringUIResources.editor_error_activated_outofsync_title;
-		String msg = AuthoringUIResources.editor_error_activated_outofsync_message;
-		return AuthoringUIPlugin.getDefault().getMsgDialog().displayPrompt(
-				title, msg);
-	}
-
-	private boolean handleFileChanged(final Collection usedResources) {
-		boolean ret = promptReloadFiles();
-		if (ret) {
-			IRunnableWithProgress runnable = new IRunnableWithProgress() {
-
-				public void run(IProgressMonitor monitor)
-						throws InvocationTargetException, InterruptedException {
-					monitor.beginTask("", 10); //$NON-NLS-1$
-					monitor.subTask(AuthoringUIResources.refresh_text); 
-					monitor.worked(1);
-					try {
-
-						Collection<Resource> removedResources = new ArrayList<Resource>();
-						for (Iterator iter = usedResources.iterator(); iter
-								.hasNext();) {
-							Resource resource = (Resource) iter.next();
-							if (!new File(resource.getURI().toFileString())
-									.exists()) {
-								removedResources.add(resource);
-							}
-						}
-						Collection changedResources = ResourceUtil
-								.getOutOfSynchResources(usedResources);
-						monitor.worked(2);
-
-						// unload the removed resources
-						//
-						for (Iterator iter = removedResources.iterator(); iter
-								.hasNext();) {
-							MultiFileXMIResourceImpl resource = (MultiFileXMIResourceImpl) iter
-									.next();
-							try {
-								resource.unloadWithoutRemove();
-							} catch (Exception e) {
-								CommonPlugin.INSTANCE.log(e);
-							}
-						}
-						monitor.worked(2);
-
-						// Reload the changed resources.
-						ILibraryManager manager = (ILibraryManager) LibraryService
-								.getInstance().getCurrentLibraryManager();
-						if (manager != null) {
-							Collection<Resource> reloadedResources = manager
-									.reloadResources(changedResources);
-							if (!reloadedResources.isEmpty()) {
-								RefreshJob.getInstance()
-										.getReloadedBeforeRefreshResources()
-										.addAll(reloadedResources);
-							}
-
-							if (!removedResources.isEmpty()
-									|| !reloadedResources.isEmpty()) {
-								// save changed resources before refresh so
-								// action
-								// manager will not try to save these changed
-								// resources
-								//
-								MethodElementEditor.this.changedResources
-										.addAll(reloadedResources);
-								MethodElementEditor.this.lastUsedResources
-										.removeAll(removedResources);
-								refresh(true);
-								MethodElementEditor.this.changedResources
-										.clear();
-							}
-						}
-						monitor.worked(4);
-
-						// refresh out-of-synch resources
-						//
-						for (Iterator iter = changedResources.iterator(); iter
-								.hasNext();) {
-							FileManager.getInstance().refresh(
-									(Resource) iter.next());
-						}
-						monitor.worked(1);
-					} finally {
-						monitor.done();
-					}
-				}
-
-			};
-
-			try {
-				getSite()
-						.getWorkbenchWindow()
-						.getWorkbench()
-						.getProgressService()
-						.runInUI(
-								new ProgressMonitorDialog(getSite().getShell()),
-								runnable, null);
-			} catch (Exception e) {
-				AuthoringUIPlugin.getDefault().getLogger().logError(e);
-				String title = AuthoringUIResources.ProcessEditor_refreshErrorTitle; 
-				AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-						title, e.toString(), e);
-			}
-		} else {
-			checkFileChangedRequired = false;
-		}
-		return ret;
-	}
-
-	public void setPartName() {
-		String partName = elementObj.getName();
-		if (partName == null) {
-			partName = ""; //$NON-NLS-1$
-		}
-		setPartName(partName);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.add(listener);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void removeSelectionChangedListener(
-			ISelectionChangedListener listener) {
-		selectionChangedListeners.remove(listener);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
-	 */
-	public ISelection getSelection() {
-		return currentSelection;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
-	 */
-	public void setSelection(ISelection selection) {
-		currentSelection = selection;
-
-		for (Iterator listeners = new ArrayList<ISelectionChangedListener>(selectionChangedListeners)
-				.iterator(); listeners.hasNext();) {
-			ISelectionChangedListener listener = (ISelectionChangedListener) listeners
-					.next();
-			listener
-					.selectionChanged(new SelectionChangedEvent(this, selection));
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormEditor#addPages()
-	 */
-	protected void addPages() {
-		try {
-			if (elementObj instanceof MethodLibrary) {
-				addPage(new MethodLibraryDescriptionFormPage(this));
-			} else if (elementObj instanceof MethodPlugin) {
-				addPage(new MethodPluginDescriptionPage(this));
-			} else if (elementObj instanceof ContentPackage) {
-				addPage(new ContentPackageDescriptionPage(this));
-			} else if (elementObj instanceof Role) {
-				addPage(new RoleDescriptionPage(this));
-				addPage(new RoleWorkProductsPage(this));
-				addPage(new ContentElementGuidancePage(this));
-				addPage(new RoleCategoriesPage(this));
-			} else if (elementObj instanceof Task) {
-				addPage(new TaskDescriptionPage(this));
-				addPage(new TaskStepsPage(this));
-				addPage(new TaskRolesPage(this));
-				addPage(new TaskWorkProductsPage(this));
-				addPage(new ContentElementGuidancePage(this));
-				addPage(new TaskCategoriesPage(this));
-			} else if (elementObj instanceof WorkProduct) {
-				addPage(new WorkProductDescriptionPage(this));
-				if (elementObj instanceof Deliverable) {
-					addPage(new WorkProductDeliverablePartsPage(this));
-				}
-				addPage(new ContentElementGuidancePage(this));
-				addPage(new WorkProductCategoriesPage(this));
-			} else if (elementObj instanceof Guidance) {
-				if (TngUtil.isAllowedAttachments(elementObj)) {
-					addPage(new GuidanceWithAttachmentsDescriptionPage(this));
-				} else if (elementObj instanceof Practice) {
-					addPage(new PracticeDescriptionPage(this));
-					addPage(new PracticeReferencesPage(this));
-				} else if (elementObj instanceof Checklist) {
-					addPage(new GuidanceDescriptionPage(this));
-					addPage(new ChecklistItemsPage(this));
-				} else {
-					addPage(new GuidanceDescriptionPage(this));
-				}
-				if (!(elementObj instanceof Practice))
-					addPage(new ContentElementGuidancePage(this));
-			} else if (elementObj instanceof Discipline) {
-				addPage(new DisciplineDescriptionPage(this));
-				addPage(new DisciplineTasksPage(this));
-				addPage(new DisciplineReferenceWorkflowPage(this));
-				addPage(new ContentElementGuidancePage(this));
-			} else if (elementObj instanceof DisciplineGrouping) {
-				addPage(new DisciplineGroupingDescriptionPage(this));
-				addPage(new DisciplineGroupingDisciplinesPage(this));
-			} else if (elementObj instanceof Domain) {
-				addPage(new DomainDescriptionPage(this));
-				addPage(new DomainWorkProductsPage(this));
-				addPage(new ContentElementGuidancePage(this));
-			} else if (elementObj instanceof WorkProductType) {
-				addPage(new WorkProductTypeDescriptionPage(this));
-				addPage(new WorkProductTypeWorkProductsPage(this));
-				addPage(new ContentElementGuidancePage(this));
-			} else if (elementObj instanceof RoleSet) {
-				addPage(new RoleSetDescriptionPage(this));
-				addPage(new RoleSetRolesPage(this));
-				addPage(new ContentElementGuidancePage(this));
-			} else if (elementObj instanceof RoleSetGrouping) {
-				addPage(new RoleSetGroupingDescriptionPage(this));
-				addPage(new RoleSetGroupingRoleSets(this));
-			} else if (elementObj instanceof Tool) {
-				addPage(new ToolDescriptionPage(this));
-				addPage(new ToolToolMentorsPage(this));
-				addPage(new ContentElementGuidancePage(this));
-			} else if (elementObj instanceof CustomCategory) {
-				addPage(new CustomCategoryDescriptionPage(this));
-				addPage(new CustomCategoryAssignPage(this));
-			}
-
-			setPartName(elementObj.getName());
-
-			if (!(elementObj instanceof ContentPackage || elementObj instanceof MethodPlugin))
-				createPreviewPage();
-
-			if (elementObj instanceof Task) {
-				// check for extenstion point and add the page if there
-				List pageProviders = MethodEditorPageProvider.getInstance()
-						.getPageProviders();
-
-				if (pageProviders != null && pageProviders.size() > 0) {
-					try {
-						for (int i = 0; i < pageProviders.size(); i++) {
-							Object page = pageProviders.get(i);
-							if (page instanceof IExtensionFormPage) {
-								IExtensionFormPage formPage = (IExtensionFormPage) page;
-								formPage.setEditor(this);
-							}
-						}
-					} catch (Exception e) {
-						e.printStackTrace();
-					}
-				}
-			}
-		} catch (Throwable t) {
-			t.printStackTrace();
-			dispose();
-			throw (SWTError) t;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.AbstractBaseFormEditor#dispose()
-	 */
-	public void dispose() {
-		try {
-			// ResourcesPlugin.getWorkspace().removeResourceChangeListener(
-			// resourceChangeListener);
-
-			if (activationListener != null) {
-				activationListener.dispose();
-			}
-
-			modifiedRichText = null;
-
-			if (fMethodElementEditorErrorTickUpdater != null) {
-				fMethodElementEditorErrorTickUpdater.dispose();
-				fMethodElementEditorErrorTickUpdater= null;
-			}
-			
-			ILibraryManager manager = (ILibraryManager) LibraryService
-					.getInstance().getCurrentLibraryManager();
-			if (manager != null) {
-				manager.stopListeningTo(actionMgr.getCommandStack());
-			}
-
-			if (isDirty()) {
-				actionMgr.undoAll();
-			}
-			actionMgr.dispose();
-			elementObj.eAdapters().remove(nameChangedListener);
-		} finally {
-			super.dispose();
-			disposed = true;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.AbstractBaseFormEditor#isDirty()
-	 */
-	public boolean isDirty() {
-		if (dirty)
-			return true;
-		dirty = actionMgr.isSaveNeeded();
-		return dirty;
-	}
-
-	public FailSafeMethodLibraryPersister getPersister() {
-		if (persister == null) {
-			persister = LibraryServiceUtil.getCurrentPersister().getFailSafePersister();
-		}
-		return persister;
-	}
-
-	protected Collection<Resource> getModifiedResources() {
-		return actionMgr.getModifiedResources();
-	}
-
-	/**
-	 * Set modified rich text field
-	 * @param modifiedRichText
-	 */
-	public void setModifiedRichText(IMethodRichText modifiedRichText) {
-		this.modifiedRichText = modifiedRichText;
-	}
-
-	/**
-	 * Save modified rich text 
-	 * @param richText
-	 */
-	public void saveModifiedRichText(IMethodRichText richText) {
-		if (richText != null && !richText.isDisposed()
-				&& richText.getModified()) {
-			EObject modalObject = richText.getModalObject();
-			EStructuralFeature modalObjectFeature = richText
-					.getModalObjectFeature();
-			if (modalObject != null && modalObjectFeature != null) {
-				Object oldContent = modalObject.eGet(modalObjectFeature);
-				if (!mustRestoreValue(richText, oldContent)) {
-					Object newContent = richText.getText();
-					if (!newContent.equals(oldContent)) {
-						actionMgr.doAction(IActionManager.SET, modalObject,
-								modalObjectFeature, newContent, -1);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Save last modified rich text 
-	 */
-	public void saveModifiedRichText() {
-		saveModifiedRichText(modifiedRichText);
-	}
-	
-	protected LibraryValidateAction createValidateResourceAction() {
-		return new LibraryValidateAction(false) {
-			/* (non-Javadoc)
-			 * @see org.eclipse.epf.authoring.ui.actions.LibraryValidateAction#refreshViews()
-			 */
-			protected void refreshViews() {
-				LibraryView.getView().refreshViews();
-			}
-		};
-	}
-	
-	public boolean validateResources(Collection modifiedResources) {
-		ArrayList<EObject> elements = new ArrayList<EObject>();
-		for (Iterator iter = modifiedResources.iterator(); iter.hasNext();) {
-			Resource resource = (Resource) iter.next();
-			elements.addAll(resource.getContents());
-		}
-		LibraryValidateAction validateAction = createValidateResourceAction();
-		validateAction.updateSelection(new StructuredSelection(elements));
-		validateAction.run();
-		return validateAction.isSuccessful();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.AbstractBaseFormEditor#doSave(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		if (DEBUG) {
-			System.out
-					.println("MethodElementEditor.doSave: saving changes to method library"); //$NON-NLS-1$
-		}
-
-		saveModifiedRichText(modifiedRichText);
-
-		getPersister();
-		try {
-			// check for modifiable
-			//
-			Collection<Resource> modifiedResources = getModifiedResources();
-
-			// update version info in library resource if needed by adding
-			// library resource to collection
-			// of modified resources
-			//
-			HashSet<Resource> resourcesToUpdateVersionInfo = new HashSet<Resource>();
-			if (!modifiedResources.isEmpty()) {
-				for (Iterator iter = modifiedResources.iterator(); iter
-						.hasNext();) {
-					Resource resource = (Resource) iter.next();
-					MethodElement me = PersistenceUtil
-							.getMethodElement(resource);
-					if (me != null) {
-						MethodLibrary lib = UmaUtil.getMethodLibrary(me);
-						if (lib != null) {
-							Resource libResource = lib.eResource();
-							if (libResource != null
-									&& !modifiedResources.contains(libResource)
-									&& !resourcesToUpdateVersionInfo
-											.contains(libResource)
-									&& PersistenceUtil
-											.checkToolVersion(libResource) != 0) {
-								resourcesToUpdateVersionInfo.add(libResource);
-							}
-						}
-					}
-				}
-				modifiedResources.addAll(resourcesToUpdateVersionInfo);
-			}
-
-			IStatus status = UserInteractionHelper.checkModify(
-					modifiedResources, getSite().getShell());
-			if (!status.isOK()) {
-				handleError(status);
-				return;
-			}
-
-			// check for out-of-synch
-			//
-			if (checkFileChanged(modifiedResources)) {
-				String title = LibraryEditResources.update_outofsynch_title;
-				String msg = LibraryEditResources.update_outofsynch_msg;
-				if (!AuthoringUIPlugin.getDefault().getMsgDialog()
-						.displayPrompt(title, msg)) {
-					return;
-				}
-			}
-
-			// flag the resources to update version info as modified so they
-			// will be saved
-			//
-			if (!resourcesToUpdateVersionInfo.isEmpty()) {
-				for (Iterator iter = resourcesToUpdateVersionInfo.iterator(); iter
-						.hasNext();) {
-					Resource resource = (Resource) iter.next();
-					resource.setModified(true);
-				}
-			}
-			
-			if(isValidateResourcesBeforeSaveRequired()) {
-				// validate
-				//
-				if(!validateResources(modifiedResources)) {
-					return;
-				}
-			}
-			else {
-				// no validation before save
-				// remove all validation errors markers associated with current method element
-				//
-				LibraryValidationMarkerHelper.INSTANCE.deleteMarkers(elementObj);
-			}
-
-			// Save.
-			//
-			for (Iterator iter = modifiedResources.iterator(); iter.hasNext();) {
-				Resource resource = (Resource) iter.next();
-				try {
-					persister.save(resource);
-				} catch (Exception e) {
-					String title = AuthoringUIResources.editors_MethodElementEditor_saveErrorTitle; 
-					String msg = AuthoringUIResources.editors_MethodElementEditor_saveErrorMessage1; 
-					String reason = e.getMessage() == null ? AuthoringUIResources.editors_MethodElementEditor_saveErrorReason1
-							: e.getMessage(); 
-					AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-							title, msg, reason, e);
-					throw e;
-				}
-			}
-
-			try {
-				persister.commit();
-				dirty = false;
-				actionMgr.saveIsDone();
-				changeTime = -1;
-
-				updateTimeStamps(getUsedResources());
-			} catch (Exception e) {
-				String reason = e.getMessage();
-				if (StrUtil.isBlank(reason)) {
-					reason = AuthoringUIResources.editors_MethodElementEditor_saveErrorReason2; 
-				}
-				StringWriter details = new StringWriter();
-				e.printStackTrace(new PrintWriter(details));
-				String title = AuthoringUIResources.editors_MethodElementEditor_saveErrorTitle; 
-				String message = AuthoringUIResources.editors_MethodElementEditor_saveErrorMessage2; 
-				AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-						title, message, reason, details.toString(), e);
-				throw e;
-			}
-
-			// Rename.
-			if (!resourcesToAdjustLocation.isEmpty()) {
-				try {
-					persister.adjustLocation(resourcesToAdjustLocation);
-				} catch (Exception e) {
-					String title = AuthoringUIResources.editors_MethodElementEditor_renameErrorTitle; 
-					String template = AuthoringUIResources.editors_MethodElementEditor_renameErrorMessage1; 
-					StringBuffer fileList = new StringBuffer();
-					for (Iterator iter = resourcesToAdjustLocation.iterator(); iter
-							.hasNext();) {
-						Resource resource = (Resource) iter.next();
-						Object obj = FileManager.toFileString(resource.getURI());
-						if(obj == null) {
-							obj = resource;
-						}
-						fileList.append(obj).append(", "); //$NON-NLS-1$
-					}
-					String msg = MessageFormat.format(template,
-							new Object[] { fileList });
-					String reason = e.getMessage() == null ? AuthoringUIResources.editors_MethodElementEditor_saveErrorReason1
-							: e.getMessage(); 
-					AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-							title, msg, reason, e);
-					throw e;
-				}
-
-				try {
-					persister.commit();
-				} catch (Exception e) {
-					String reason = e.getMessage();
-					if (StrUtil.isBlank(reason)) {
-						reason = AuthoringUIResources.editors_MethodElementEditor_saveErrorReason2; 
-					}
-					StringWriter details = new StringWriter();
-					e.printStackTrace(new PrintWriter(details));
-					String title = AuthoringUIResources.editors_MethodElementEditor_renameErrorTitle; 
-					String message = AuthoringUIResources.editors_MethodElementEditor_saveErrorMessage2; 
-					AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-							title, message, reason, details.toString(), e);
-					throw e;
-				}
-
-				resourcesToAdjustLocation.clear();
-			}
-		} catch (Exception e) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(e);
-			try {
-				persister.rollback();
-			} catch (Exception ex) {
-				AuthoringUIPlugin.getDefault().getLogger().logError(ex);
-				ViewHelper.reloadCurrentLibaryOnRollbackError(getSite()
-						.getShell());
-			}
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	protected boolean isValidateResourcesBeforeSaveRequired() {
-		return false;
-	}
-
-	protected void saveResource(Resource resource) {
-		if (resource != null && resource.isModified()) {
-			try {
-				getPersister().save(resource);
-			} catch (Exception e) {
-				String title = AuthoringUIResources.editors_MethodElementEditor_saveErrorTitle; 
-				String template = AuthoringUIResources.editors_MethodElementEditor_saveErrorMessage1; 
-				String msg = MessageFormat.format(template,
-						new Object[] { resource.getURI().toFileString() });
-				String reason = e.getMessage() == null ? AuthoringUIResources.editors_MethodElementEditor_saveErrorReason1
-						: e.getMessage(); 
-				AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-						title, msg, reason, e);
-			}
-		}
-	}
-
-	protected void createPreviewPage() {
-		Composite parent = getContainer();
-		Composite previewComposite = new Composite(parent, SWT.NONE);
-		previewComposite.setLayout(new GridLayout());
-
-		PreviewPage page = new PreviewPage(previewComposite);
-		previewer = page.getPreviewViewer();
-
-		preview_page_index = addPage(previewComposite);
-		setPageText(preview_page_index, AuthoringUIResources.previewPage_title); 
-	}
-
-	/**
-	 * Override this method to listen to the tab change.
-	 */
-	protected void pageChange(int newPageIndex) {
-		super.pageChange(newPageIndex);
-
-		if (preview_page_index == newPageIndex && previewer != null) {
-			// Use the default layout manager.
-			previewer.setLayoutManager(null);
-			previewer.showElementContent(elementObj);
-		}
-	}
-
-	private void setDirty() {
-		dirty = true;
-		firePropertyChange(PROP_DIRTY);
-	}
-
-	/**
-	 * Restore value of the control
-	 * @param control
-	 * @param value
-	 * @return
-	 * 		boolean value to indicate whether control was restored or not
-	 */
-	public boolean mustRestoreValue(Object control, Object value) {
-		if (widgetToCheck == control) {
-			// the control is currently being checked for editable, but there is
-			// still focus lost
-			// event is being sent out even the check is not completed yet.
-			// return true so the focusLost() will not make any change to the
-			// control.
-			//
-			return true;
-		}
-
-		Object editControl = control;
-		if (editControl instanceof MethodRichTextEditor) {
-			editControl = ((MethodRichTextEditor) control).getRichTextControl();
-		}
-		boolean restore = widgetsToRestoreValue.contains(editControl);
-		if (!restore) {
-			synchronized (widgetsToRestoreValue) {
-				restore = widgetsToRestoreValue.contains(editControl);
-			}
-		}
-		if (restore) {
-			if (editControl instanceof Text) {
-				Text text = ((Text) editControl);
-				text.setText((String) value);
-			} else if (editControl instanceof IMethodRichText) {
-				IMethodRichText richText = (IMethodRichText) editControl;
-				richText.setText((String) value);
-			}
-			widgetsToRestoreValue.remove(editControl);
-		}
-		return restore;
-	}
-
-	/**
-	 * Modify Listener 
-	 *
-	 */
-	public class ModifyListener implements
-			org.eclipse.swt.events.ModifyListener {
-
-		private EObject element;
-
-		private boolean checkContainerResource;
-
-		private boolean disabled = false;
-
-		/**
-		 * Creates a new instance.
-		 */
-		public ModifyListener(EObject element, boolean checkContainer) {
-			super();
-			checkContainerResource = checkContainer;
-			this.element = element;
-		}
-
-		private void restoreText(Object control, String txt) {
-			boolean old = disabled;
-			try {
-				disabled = true;
-				Object editControl = control;
-				if (editControl instanceof MethodRichTextEditor) {
-					editControl = ((MethodRichTextEditor) control)
-							.getRichTextControl();
-				}
-				if (editControl instanceof Text) {
-					Text text = ((Text) editControl);
-					text.setText(txt);
-				} else if (editControl instanceof IMethodRichText) {
-					IMethodRichText richText = (IMethodRichText) editControl;
-					richText.setText(txt);
-				}
-			} finally {
-				disabled = old;
-			}
-		}
-
-		private boolean checkEdit(EObject element, Object control,
-				boolean checkContainerResource) {
-			// keep a reference to the current widget so mustRestoreValue() can
-			// use it to check
-			// whether a focus lost event is triggered during a checkEdit.
-			// mustRestoreValue() then
-			// returns true so focusLost() will not try to make change to the
-			// value bound to the widget
-			//
-			widgetToCheck = control;
-			try {
-				if (DEBUG) {
-					System.out
-							.println("MethodElementEditor.checkEdit: enter, control=" + control); //$NON-NLS-1$
-				}
-				IStatus status = null;
-				if (widgetsToRestoreValue.contains(control)) {
-					if (DEBUG) {
-						System.out
-								.println("MethodElementEditor.checkEdit: widget found in widgetsToRestoreValue, exit"); //$NON-NLS-1$
-					}
-					return false;
-				}
-
-				synchronized (widgetsToRestoreValue) {
-					if (widgetsToRestoreValue.contains(control)) {
-						if (DEBUG) {
-							System.out
-									.println("MethodElementEditor.checkEdit: widget found in widgetsToRestoreValue, exit"); //$NON-NLS-1$
-						}
-						return false;
-					}
-
-					status = TngUtil.checkEdit(element, getSite().getShell());
-
-					if (!status.isOK()) {
-						if (control instanceof IRichText) {
-							((IRichText) control).restoreText();
-						} else {
-							if (control == currentFeatureEditor) {
-								restoreText(control, (String) element
-										.eGet(currentEditedFeature));
-							} else {
-								// Add the control to the list of widgets whose
-								// value needs
-								// to be restored to the original one..
-								widgetsToRestoreValue.add(control);
-								if (DEBUG) {
-									System.out
-											.println("MethodElementEditor.checkEdit: added widget to widgetsToRestoreValue"); //$NON-NLS-1$
-								}
-							}
-						}
-					} else if (checkContainerResource) {
-						if (element.eContainer() != null
-								&& element.eContainer().eResource() != element
-										.eResource()) {
-							status = TngUtil.checkEdit(element.eContainer(),
-									getSite().getShell());
-							if (!status.isOK()) {
-								// // Add the control to the list of widgets
-								// whose value
-								// // needs to be restored to the original one.
-								// if (debug) {
-								// System.out
-								// .println("MethodElementEditor.checkEdit:
-								// added widget to widgetsToRestoreValue");
-								// //$NON-NLS-1$
-								// }
-								if (control instanceof IRichText) {
-									((IRichText) control).restoreText();
-								} else {
-									if (control == currentFeatureEditor) {
-										restoreText(control, (String) element
-												.eGet(currentEditedFeature));
-									} else {
-										widgetsToRestoreValue.add(control);
-									}
-								}
-							}
-						}
-					}
-				}
-
-				if (status != null && !status.isOK()) {
-					AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-							AuthoringUIResources.editDialog_title, 
-							AuthoringUIResources.editDialog_msgCannotEdit, 
-							status);
-					return false;
-				}
-
-				return true;
-			} finally {
-				// clear the reference when the check is done
-				//
-				widgetToCheck = null;
-			}
-		}
-
-		/**
-		 * @see org.eclipse.swt.events.ModifyListener#modifyText(ModifyEvent)
-		 */
-		public void modifyText(ModifyEvent e) {
-			if (DEBUG) {
-				System.out
-						.println("MethodElementEditor.ModifyListener.modifyText: enter, disabled=" + disabled); //$NON-NLS-1$
-			}
-			if (!disabled && element != null) {
-				if (e.widget == null) {
-					return;
-				}
-
-				Object widget = e.widget;
-				if (widget instanceof Browser) {
-					widget = ((Browser) widget)
-							.getData(IMethodRichText.PROPERTY_NAME);
-					if (widget == null) {
-						widget = e.widget;
-					}
-				}
-				if (DEBUG) {
-					System.out
-							.println("MethodElementEditor.ModifyListener.modifyText: widget=" + widget); //$NON-NLS-1$
-				}
-
-				if (widgetsToRestoreValue.contains(widget)) {
-					if (DEBUG) {
-						System.out
-								.println("MethodElementEditor.ModifyListener.modifyText: widget found in widgetsToRestoreValue, exit"); //$NON-NLS-1$
-					}
-					return;
-				}
-
-				if (!checkEdit(element, widget, checkContainerResource)) {
-					if (DEBUG) {
-						System.out
-								.println("MethodElementEditor.ModifyListener.modifyText: checkEdit failed, exit"); //$NON-NLS-1$
-					}
-					return;
-				}
-
-				if (widget instanceof IMethodRichText) {
-					IMethodRichText richText = (IMethodRichText) widget;
-					setModifiedRichText(richText);
-					if (DEBUG) {
-						System.out
-								.println("MethodElementEditor.ModifyListener.modifyText: adding to modifiedRichTexts list"); //$NON-NLS-1$
-					}
-				}
-
-				if (DEBUG) {
-					System.out
-							.println("MethodElementEditor.ModifyListener.modifyText: marking editor as dirty"); //$NON-NLS-1$
-				}
-				setDirty();
-			}
-
-			if (DEBUG) {
-				System.out
-						.println("MethodElementEditor.ModifyListener.modifyText: exit"); //$NON-NLS-1$
-			}
-		}
-
-		/**
-		 * Sets the underlying model element.
-		 * 
-		 * @param element
-		 *            A method element.
-		 */
-		public void setElement(EObject element) {
-			this.element = element;
-		}
-
-		/**
-		 * Sets the disable flag.
-		 * 
-		 * @param disabled
-		 *            If <code>true</code>, ignore the modify events.
-		 */
-		public void setDisable(boolean disabled) {
-			this.disabled = disabled;
-		}
-	}
-
-	/**
-	 * Creates an new instance of ModifyListener that supports team and CM
-	 * integration Any control in the editor, if it needs a ModifyListener, must
-	 * use one created by this method
-	 * 
-	 * @param eObj
-	 * 
-	 * @return
-	 */
-	public ModifyListener createModifyListener(EObject eObj) {
-		return createModifyListener(eObj, false);
-	}
-
-	/**
-	 * Creates an new instance of ModifyListener that supports team and CM
-	 * integration Any control in the editor, if it needs a ModifyListener, must
-	 * use one created by this method
-	 * 
-	 * @param eObj
-	 * @param checkContainer
-	 *            if true will check the container of the given object for
-	 *            editable as well when checking the given object for editable
-	 * 
-	 * @return
-	 * 		Modify Listener
-	 */
-	public ModifyListener createModifyListener(EObject eObj,
-			boolean checkContainer) {
-		return new ModifyListener(eObj, checkContainer);
-	}
-
-	/**
-	 * Sets the specified control to be the current editor of the specified
-	 * feature.
-	 * 
-	 * @param control
-	 * @param feature
-	 */
-	public void setCurrentFeatureEditor(Object control,
-			EStructuralFeature feature) {
-		currentFeatureEditor = control;
-		currentEditedFeature = feature;
-	}
-
-	protected void monitorChange() {
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint point = registry
-				.getExtensionPoint("org.eclipse.core.resources.refreshProviders"); //$NON-NLS-1$
-		if (point == null)
-			return;
-		IExtension[] extensions = point.getExtensions();
-		for (int i = 0; i < extensions.length; i++) {
-			IExtension extension = extensions[i];
-			if (DEBUG) {
-				System.out
-						.println("extension: UID=" + extension.getUniqueIdentifier() + ", " + extension); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-	}
-
-	/**
-	 * Add resource to adjust location
-	 * @param resource
-	 */
-	public void addResourceToAdjustLocation(Resource resource) {
-		resourcesToAdjustLocation.add(resource);
-	}
-
-	protected List getUsedFeatures() {
-		return elementObj.eClass().getEAllStructuralFeatures();
-	}
-
-	/**
-	 * Gets resources that are currently being used by this editors
-	 * 
-	 * @return
-	 * 		list of used resources
-	 */
-	public Collection getUsedResources() {
-		HashSet<Resource> resources = new HashSet<Resource>();
-		Resource resource = elementObj.eResource();
-		if (resource != null) {
-			resources.add(resource);
-		}
-		List allFeatures = getUsedFeatures();
-		for (int i = allFeatures.size() - 1; i > -1; i--) {
-			EStructuralFeature feature = (EStructuralFeature) allFeatures
-					.get(i);
-			if (feature.isMany()) {
-				List values = (List) elementObj.eGet(feature);
-				for (int j = values.size() - 1; j > -1; j--) {
-					EObject value = (EObject) values.get(j);
-					if (value.eResource() != null) {
-						resources.add(value.eResource());
-					}
-				}
-			} else {
-				Object value = elementObj.eGet(feature);
-				if (value instanceof EObject
-						&& (resource = ((EObject) value).eResource()) != null) {
-					resources.add(resource);
-				}
-			}
-		}
-		lastUsedResources = resources;
-		return resources;
-	}
-
-	private Map getURIToUsedResourceMap() {
-		HashMap<URI, Resource> map = new HashMap<URI, Resource>();
-		for (Iterator iter = getUsedResources().iterator(); iter.hasNext();) {
-			Resource resource = (Resource) iter.next();
-			map.put(resource.getURI(), resource);
-		}
-		return map;
-	}
-
-	protected void handleError(IStatus status) {
-		AuthoringUIPlugin.getDefault().getMsgDialog().display(
-				AuthoringUIResources.errorDialog_title, 
-				AuthoringUIResources.editDialog_msgCannotEdit, 
-				status);
-	}
-
-	/**
-	 * Handles the activation of this view.
-	 */
-	protected void handleActivate(IWorkbenchPart part) {
-		// TODO: Review implementation.
-		// Make sure that the method library open is not closed.
-		XMILibraryUtil.openMethodLibraryProject(LibraryService.getInstance()
-				.getCurrentMethodLibrary(), getEditorSite().getActionBars()
-				.getStatusLineManager().getProgressMonitor());
-
-		if (checkFileChangedRequired) {
-			Collection usedResources = getUsedResources();
-			if (checkFileChanged(usedResources)) {
-				handleFileChanged(usedResources);
-			}
-		}
-	}
-
-	/**
-	 * Displays a dialog that asks if conflicting changes should be discarded.
-	 */
-	protected boolean handleDirtyConflict() {
-		String title = AuthoringUIResources._UI_FileConflict_label;
-		String msg = AuthoringUIResources._WARN_FileConflict;
-		return AuthoringUIPlugin.getDefault().getMsgDialog().displayPrompt(
-				title, msg);
-	}
-
-	/**
-	 * Handles changed resources when this view is activated.
-	 */
-	protected void handleChangedResources() {
-		if ((elementObj.eIsProxy() || !changedResources.isEmpty())
-				&& (!isDirty() || handleDirtyConflict())) {
-			// editingDomain.getCommandStack().flush();
-
-			// for (Iterator i = changedResources.iterator(); i.hasNext();) {
-			// Resource resource = (Resource) i.next();
-			// if (resource.isLoaded()) {
-			// if(resource instanceof MultiFileXMIResourceImpl) {
-			// try {
-			// ((MultiFileXMIResourceImpl)resource).reload(null);
-			// } catch (IOException e) {
-			// AuthoringUIPlugin.getDefault().getLogger().logError(e);
-			// }
-			// }
-			// else {
-			// resource.unload();
-			// try {
-			// resource.load(Collections.EMPTY_MAP);
-			// } catch (IOException e) {
-			// AuthoringUIPlugin.getDefault().getLogger().logError(e);
-			// }
-			// }
-			// }
-			// }
-		}
-	}
-
-	/**
-	 * Checks whether input is valid or not
-	 * @return boolean value
-	 */
-	public boolean isInputValid() {
-		if (elementObj != null && elementObj.eIsProxy()) {
-			EObject e = RefreshJob.getInstance().resolve(elementObj);
-			return (e instanceof MethodElement && !e.eIsProxy() && UmaUtil
-					.getMethodLibrary(e) == LibraryService.getInstance()
-					.getCurrentMethodLibrary());
-		}
-		return true;
-	}
-
-	protected void updatePages() {
-		while (getPageCount() > 0) {
-			removePage(0);
-		}
-		addPages();
-	}
-
-	protected MethodElementEditorInput createInput(MethodElement e) {
-		return new MethodElementEditorInput(e);
-	}
-
-	public synchronized void refresh(final boolean force) {
-		BusyIndicator.showWhile(getSite().getShell().getDisplay(),
-				new Runnable() {
-
-					public void run() {
-						Collection usedResources = lastUsedResources;
-						if (!force && !elementObj.eIsProxy()
-								&& !checkReloaded(usedResources)) {
-							// no resource reloaded, no need to refresh
-							//
-							return;
-						}
-						int activePageIndex = getActivePage();
-						modifiedRichText = null;
-						if (isDirty()) {
-							actionMgr.undoAll();
-							dirty = false;
-						}
-						if (elementObj.eIsProxy()) {
-							elementObj.eAdapters().remove(nameChangedListener);
-							EObject e = RefreshJob.getInstance().resolve(
-									elementObj);
-							if (e instanceof MethodElement
-									&& !e.eIsProxy()
-									&& UmaUtil.getMethodLibrary(e) == LibraryService
-											.getInstance()
-											.getCurrentMethodLibrary()) {
-								setInput(createInput((MethodElement) e));
-							} else {
-								// input element is invalid, close the editor
-								//
-								close(false);
-								return;
-							}
-						}
-						updateTimeStamps(usedResources);
-						updatePages();
-						if (activePageIndex != -1) {
-							setActivePage(activePageIndex);
-						}
-						firePropertyChange(IEditorPart.PROP_DIRTY);
-					}
-
-				});
-
-	}
-
-	/**
-	 * Refreshes the editor
-	 */
-	public void refresh() {
-		// save changed resources before refresh so action manager will not try
-		// to save these changed resources
-		//
-		changedResources.addAll(RefreshJob.getInstance().getChangedResources());
-		refresh(false);
-		changedResources.clear();
-	}
-
-
-	/**
-	 * Public method to refresh editor title image on certain action.
-	 * e.g. If methodPlugin is locked, editor title image should be grey-ed out.
-	 * 
-	 * @param methodElement
-	 */
-	public void refreshTitleImage() {
-		if (fMethodElementEditorErrorTickUpdater != null)
-			fMethodElementEditorErrorTickUpdater.updateEditorImage(elementObj);
-	}
-
-	public void updatedTitleImage(Image image) {
-		setTitleImage(image);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodElementEditorInput.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodElementEditorInput.java
deleted file mode 100755
index 3519e52..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodElementEditorInput.java
+++ /dev/null
@@ -1,95 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import org.eclipse.epf.library.ui.IMethodElementProvider;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-
-
-/**
- * An editor input for method element editor
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MethodElementEditorInput implements IEditorInput, IMethodElementProvider {
-
-	private MethodElement methodElement;
-
-	private ImageDescriptor imageDescriptor = null;
-
-	public MethodElementEditorInput(MethodElement e) {
-		methodElement = e;
-	}
-
-	public MethodElement getMethodElement() {
-		return methodElement;
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.ui.IEditorInput#exists()
-	 */
-	public boolean exists() {
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		return imageDescriptor;
-	}
-
-	/**
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	public String getName() {
-		return methodElement.getName();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IEditorInput#getPersistable()
-	 */
-	public IPersistableElement getPersistable() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
-	 */
-	public String getToolTipText() {
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		return null;
-	}
-
-	/**
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (getClass().isInstance(obj)) {
-			return methodElement == ((MethodElementEditorInput) obj)
-					.getMethodElement();
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodLibraryEditor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodLibraryEditor.java
deleted file mode 100755
index d995008..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodLibraryEditor.java
+++ /dev/null
@@ -1,126 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.forms.MethodLibraryDescriptionFormPage;
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.persistence.MultiFileIOException;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-
-/**
- * The method library editor.
- * 
- * @author Phong Nguyen Le
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodLibraryEditor extends MethodElementEditor {
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.MethodElementEditor#setPartName()
-	 */
-	public void setPartName() {
-		String partName = AuthoringUIResources.MethodLibraryEditor_title; //$NON-NLS-1$
-		if (elementObj.getName() != null) {
-			partName += elementObj.getName();
-			;
-		}
-		setPartName(partName);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.MethodElementEditor#addPages()
-	 */
-	protected void addPages() {
-		try {
-			addPage(new MethodLibraryDescriptionFormPage(this));
-			createPreviewPage();
-		} catch (PartInitException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.MethodElementEditor#dispose()
-	 */
-	public void dispose() {
-		// Close all the editors.
-		getSite().getPage().closeAllEditors(false);
-
-		// Clear the Library View.
-		LibraryView.getView().setInputForViewer(null);
-
-		try {
-			// Close the current method library.
-			LibraryService.getInstance().closeCurrentMethodLibrary();
-		} catch (Exception e) {
-		}
-
-		super.dispose();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.MethodElementEditor#doSave(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		if (monitor != null) {
-			monitor
-					.beginTask(
-							AuthoringUIResources.MethodLibraryEditor_savemodellibrary, IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-
-			try {
-				LibraryService.getInstance().saveCurrentMethodLibrary();
-				firePropertyChange(IEditorPart.PROP_DIRTY);
-			} catch (Exception ex) {
-				ex.printStackTrace();
-				String errMsg = AuthoringUIResources.MethodLibraryEditor_err_save; //$NON-NLS-1$
-				String errDetails = ""; //$NON-NLS-1$
-				if (ex.getMessage() != null) {
-					errDetails = ex.getMessage(); //$NON-NLS-1$
-				}
-				if (ex instanceof MultiFileIOException) {
-					Object troubleObj = ((MultiFileIOException) ex)
-							.getTroubleObject();
-					if (troubleObj instanceof MethodElement) {
-						errDetails = AuthoringUIResources.MethodLibraryEditor_troubleobject + MultiFileSaveUtil.getPath((MethodElement) troubleObj); //$NON-NLS-1$
-					}
-				}
-
-				String title = AuthoringUIResources.MethodLibraryEditor_error_dialog_title; //$NON-NLS-1$
-				String problem = AuthoringUIResources.MethodLibraryEditor_save_library_problem_msg; //$NON-NLS-1$
-				MsgDialog dialog = AuthoringUIPlugin.getDefault()
-						.getMsgDialog();
-				dialog.displayError(title, problem, errMsg, errDetails); //$NON-NLS-1$
-			} finally {
-				monitor.done();
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.MethodElementEditor#isDirty()
-	 */
-	public boolean isDirty() {
-		ILibraryManager manager = (ILibraryManager) LibraryService
-				.getInstance().getCurrentLibraryManager();
-		return manager != null ? manager.isMethodLibraryModified() : false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodRichText.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodRichText.java
deleted file mode 100755
index f2ff136..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodRichText.java
+++ /dev/null
@@ -1,294 +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.authoring.ui.editors;
-
-import java.io.UnsupportedEncodingException;
-import java.util.regex.Matcher;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.epf.authoring.ui.providers.MethodElementLightweightLabelDecorator;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.richtext.RichTextContentValidator;
-import org.eclipse.epf.authoring.ui.util.MethodRichTextMarkerHelper;
-import org.eclipse.epf.common.html.HTMLFormatter;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.richtext.RichText;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.jface.fieldassist.DecoratedField;
-import org.eclipse.jface.fieldassist.FieldDecoration;
-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A Method Editor Rich Text control.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class MethodRichText extends RichText implements IMethodRichText {
-
-	// The method element associated with this rich text control.
-	private MethodElement methodElement;
-	
-	// the MethodElement's ContentDescription
-	private ContentDescription contentDescription;
-
-	// The modal object associated with this rich text control.
-	private EObject modalObject;
-
-	// The modal object feature associated with this rich text control.
-	private EStructuralFeature modalObjectFeature;
-
-	// The resource being edited       
-	protected Resource resource;
-	
-	// the decoratedField label
-	protected DecoratedField label;
-	
-	protected final FieldDecoration errorFieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_ERROR);
-                                      
-	// Field name being edited
-	protected String fieldName = ""; //$NON-NLS-1$
-
-	// Field name being edited with the trailing : removed     
-	protected String fieldNameTrim;
-	
-	// marker helper
-	protected MethodRichTextMarkerHelper markerHelper;
-
-//	// marker attribute
-//	private static String METHOD_FIELDNAME = "MethodFieldName";
-
-//	// marker ID
-//	protected static final String MARKER_ID = "org.eclipse.epf.authoring.ui.methodRichText"; //$NON-NLS-1$
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param parent
-	 *            The parent control.
-	 * @param style
-	 *            The initial style for the editor.
-	 * @param basePath
-	 *            The base path used for resolving hrefs.
-	 */
-	public MethodRichText(Composite parent, int style, String basePath) {
-		super(parent, style, basePath);
-	}
-
-	/**
-	 * Updates the presentation names of all element links.
-	 * 
-	 * @param text
-	 *            Rich text encoded in HTML format.
-	 */
-	@Override
-	protected String tidyText(String text) {
-		return ResourceHelper.validateRichTextContent(methodElement, text,
-				new RichTextContentValidator());
-	}
-
-	/**
-	 * Sets the method element associated with this rich text control.
-	 * 
-	 * @param methodElement
-	 */
-	public void setMethodElement(MethodElement methodElement) {
-		this.methodElement = methodElement;
-		if (this.methodElement instanceof ProcessComponent) {
-			this.methodElement = ((ProcessComponent) this.methodElement).getProcess();
-		}
-		if (this.methodElement instanceof DescribableElement &&
-				((DescribableElement)this.methodElement).getPresentation() != null) { 
-			this.contentDescription = ((DescribableElement)this.methodElement).getPresentation();
-		}
-	}
-
-	/**
-	 * Returns the method element associated with this rich text control.
-	 */
-	public MethodElement getMethodElement() {
-		return methodElement;
-	}
-
-	/**
-	 * Returns the modal object associated with this rich text control.
-	 */
-	public EObject getModalObject() {
-		return modalObject;
-	}
-
-	/**
-	 * Sets the modal object associated with this rich text control.
-	 */
-	public void setModalObject(EObject modalObject) {
-		this.modalObject = modalObject;
-	}
-
-	/**
-	 * Returns modal object feature associated with this rich text control.
-	 */
-	public EStructuralFeature getModalObjectFeature() {
-		return modalObjectFeature;
-	}
-
-	/**
-	 * Sets the modal object feature associated with this rich text control.
-	 */
-	public void setModalObjectFeature(EStructuralFeature modalObjectFeature) {
-		this.modalObjectFeature = modalObjectFeature;
-	}
-
-	public String getFieldName() {
-		return fieldName;
-	}
-
-	public void setDecoratedFieldLabel(DecoratedField label) {
-		this.label = label;
-		if (label != null) {
-			label.addFieldDecoration(errorFieldDecoration,
-					SWT.LEFT | SWT.BOTTOM, false);
-			label.hideDecoration(errorFieldDecoration);
-			updateFieldNameFromLabel(label);
-		}
-	}
-
-	private boolean updateFieldNameFromLabel(DecoratedField label) {
-		String fieldName = ((Label)label.getControl()).getText();
-		if (!this.fieldName.equals(fieldName)) {
-			this.fieldName = fieldName;
-			int colonIndex = fieldName.indexOf(':');
-			if (colonIndex == -1)
-				colonIndex = fieldName.length();
-			this.fieldNameTrim = fieldName.substring(0, colonIndex).trim();
-			return true;
-		} else {
-			return false;
-		}
-	}
-	
-	public void init(MethodElement element, DecoratedField label) {
-		setMethodElement(element);
-		setDecoratedFieldLabel(label);
-		markerHelper = MethodRichTextMarkerHelper.INSTANCE;
-	}
-	
-	@Override
-	protected String formatHTML(String text, boolean ignoreErrors) {
-		String formattedText;
-		try {
-			// clear markers
-			if (!ignoreErrors)
-				clearMarkers();
-			// Call JTidy to format the source to XHTML.
-			formattedText = htmlFormatter.formatHTML(text);
-			if (!ignoreErrors && htmlFormatter.getLastErrorStr() != null) {
-				String errorString = htmlFormatter.getLastErrorStr();
-//				logger.logError(errorString);
-				// create markers
-				try {
-					createMarker(errorString);
-				} catch (CoreException cex) {
-					logger.logError(cex);
-				}
-			}
-			return formattedText;
-		} catch (UnsupportedEncodingException e) {
-			logger.logError(e);
-		} finally {
-			if (!ignoreErrors)
-				refreshDecorators();
-		}
-		return text;
-	}
-	
-	protected void clearMarkers() {
-		markerHelper.deleteMarkers(contentDescription, fieldNameTrim);
-        errorFieldDecoration.setDescription(""); //$NON-NLS-1$
-		hideErrorDecoration();
-	}
-	
-	protected void refreshDecorators() {
-		// refresh
-		PlatformUI.getWorkbench().getDecoratorManager().update(MethodElementLightweightLabelDecorator.DECORATOR_ID);
-	}
-	
-	
-	/*
-	 * TODO:
-	 * had to undo change in DescribableElementImpl to set presentation on any new obj
-	 * so editor will need to assign presentation when field is edited so that the marker
-	 * can be added to the presentation's resource
-	 */
-	
-	
-	protected void createMarker(String fullErrMsg) throws CoreException {
-		Matcher m = HTMLFormatter.jTidyErrorParser.matcher(fullErrMsg);                                                                          
-		if (m.find()) {                                                                                                                          
-			String location = m.group(1);
-			String errorMsg = m.group(4);
-			BasicDiagnostic diagnostics = 
-		          new BasicDiagnostic
-		            (HTMLFormatter.DIAGNOSTIC_SOURCE,
-		             0, fieldName,
-		                new Object[] { contentDescription, fieldNameTrim });
-
-			diagnostics.add( 
-				new BasicDiagnostic(Diagnostic.ERROR,
-					location, 0, errorMsg,
-					new Object[] { contentDescription, fieldNameTrim }));
-
-	        markerHelper.createMarkers(diagnostics);
-	        errorFieldDecoration.setDescription(errorMsg);
-	        showErrorDecoration();
-		}
-	}
-
-	@Override
-	public void dispose() {
-		super.dispose();
-		clearMarkers();
-		refreshDecorators();
-	}
-	
-	public void showErrorDecoration() {
-        if (label != null) {
-        	label.showDecoration(errorFieldDecoration);
-        }
-	}
-
-	public void hideErrorDecoration() {
-        if (label != null) {
-        	label.hideDecoration(errorFieldDecoration);
-        }
-	}
-	
-	@Override
-	public void setText(String text) {
-		// check if label text was changed (this happens when RTE is expanded)
-		// this is called when RTE is toggled in editor - read new fieldName
-		if (updateFieldNameFromLabel(label))
-			hideErrorDecoration();
-		super.setText(text);
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodRichTextEditor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodRichTextEditor.java
deleted file mode 100755
index 4847166..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodRichTextEditor.java
+++ /dev/null
@@ -1,172 +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.authoring.ui.editors;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.epf.authoring.ui.actions.MethodAddImageAction;
-import org.eclipse.epf.authoring.ui.actions.MethodAddLinkAction;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichTextEditor;
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.IRichTextToolBar;
-import org.eclipse.epf.richtext.RichTextEditor;
-import org.eclipse.epf.richtext.actions.AddOrderedListAction;
-import org.eclipse.epf.richtext.actions.AddTableAction;
-import org.eclipse.epf.richtext.actions.AddUnorderedListAction;
-import org.eclipse.epf.richtext.actions.BoldAction;
-import org.eclipse.epf.richtext.actions.ClearContentAction;
-import org.eclipse.epf.richtext.actions.CopyAction;
-import org.eclipse.epf.richtext.actions.CutAction;
-import org.eclipse.epf.richtext.actions.FontNameAction;
-import org.eclipse.epf.richtext.actions.FontSizeAction;
-import org.eclipse.epf.richtext.actions.FontStyleAction;
-import org.eclipse.epf.richtext.actions.IndentAction;
-import org.eclipse.epf.richtext.actions.ItalicAction;
-import org.eclipse.epf.richtext.actions.OutdentAction;
-import org.eclipse.epf.richtext.actions.PasteAction;
-import org.eclipse.epf.richtext.actions.SubscriptAction;
-import org.eclipse.epf.richtext.actions.SuperscriptAction;
-import org.eclipse.epf.richtext.actions.UnderlineAction;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.jface.fieldassist.DecoratedField;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * A Rich Text editor with added extensions to support Method browsing and
- * authoring. Includes a tool bar and an integrated HTML source editor.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class MethodRichTextEditor extends RichTextEditor implements
-		IMethodRichTextEditor {
-
-	// The method element associated with this rich text control.
-	private MethodElement methodElement;
-
-	// The modal object associated with this rich text control.
-	private EObject modalObject;
-
-	// The modal object feature associated with this rich text control.
-	private EStructuralFeature modalObjectFeature;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param parent
-	 *            The parent control.
-	 * @param style
-	 *            The initial style for the editor.
-	 * @param basePath
-	 *            The base path used for resolving hrefs.
-	 */
-	public MethodRichTextEditor(Composite parent, int style, String basePath,
-			MethodElement methodElement, DecoratedField label) {
-		super(parent, style, basePath);
-		this.methodElement = methodElement;
-		init(methodElement, label);
-	}
-
-	/**
-	 * Creates the underlying rich text control.
-	 * 
-	 * @param parent
-	 *            The parent composite.
-	 * @param style
-	 *            The style for this control.
-	 * @param basePath
-	 *            The path used for resolving links.
-	 */
-	protected IRichText createRichTextControl(Composite parent, int style,
-			String basePath) {
-		return new MethodRichText(parent, style, basePath);
-	}
-
-	/**
-	 * Fills the Rich Text editor tool bar with action items.
-	 * 
-	 * @param toolBar
-	 *            The Rich text editor tool bar.
-	 */
-	public void fillToolBar(IRichTextToolBar toolBar) {
-		toolBar.addAction(new FontStyleAction(richText));
-		toolBar.addAction(new FontNameAction(richText));
-		toolBar.addAction(new FontSizeAction(richText));
-		toolBar.addSeparator();		
-		toolBar.addAction(new CutAction());
-		toolBar.addAction(new CopyAction());
-		toolBar.addAction(new PasteAction());
-		toolBar.addSeparator();
-		toolBar.addAction(new ClearContentAction());
-		toolBar.addSeparator();
-		toolBar.addAction(new BoldAction(richText));
-		toolBar.addAction(new ItalicAction(richText));
-		toolBar.addAction(new UnderlineAction(richText));
-		toolBar.addSeparator();
-		toolBar.addAction(new SubscriptAction(richText));
-		toolBar.addAction(new SuperscriptAction(richText));
-		toolBar.addSeparator();
-		toolBar.addAction(new AddOrderedListAction());
-		toolBar.addAction(new AddUnorderedListAction());
-		toolBar.addSeparator();
-		toolBar.addAction(new OutdentAction());
-		toolBar.addAction(new IndentAction());
-		toolBar.addSeparator();
-		if (richText.getFindReplaceAction() != null)
-			toolBar.addAction(richText.getFindReplaceAction());
-		toolBar.addSeparator();
-		toolBar.addAction(new MethodAddLinkAction());
-		toolBar.addAction(new MethodAddImageAction());
-		toolBar.addAction(new AddTableAction());
-	}
-
-	/**
-	 * Returns the method element associated with this rich text control.
-	 */
-	public MethodElement getMethodElement() {
-		return methodElement;
-	}
-
-	/**
-	 * Returns the modal object associated with this rich text control.
-	 */
-	public EObject getModalObject() {
-		return modalObject;
-	}
-
-	/**
-	 * Sets the modal object associated with this rich text control.
-	 */
-	public void setModalObject(EObject modalObject) {
-		this.modalObject = modalObject;
-	}
-
-	/**
-	 * Returns modal object feature associated with this rich text control.
-	 */
-	public EStructuralFeature getModalObjectFeature() {
-		return modalObjectFeature;
-	}
-
-	/**
-	 * Sets the modal object feature associated with this rich text control.
-	 */
-	public void setModalObjectFeature(EStructuralFeature modalObjectFeature) {
-		this.modalObjectFeature = modalObjectFeature;
-	}
-
-	public void init(MethodElement element, DecoratedField label) {
-		if (richText instanceof IMethodRichText)
-			((IMethodRichText)richText).init(methodElement, label);
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/PreviewPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/PreviewPage.java
deleted file mode 100755
index 61f2375..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/PreviewPage.java
+++ /dev/null
@@ -1,171 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIImages;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.views.ElementHTMLViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-
-/**
- * The Preview page in the Method Editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class PreviewPage {
-
-	private ElementHTMLViewer previewer = null;
-
-	/**
-	 * Create an instance
-	 * 
-	 * @param composite
-	 */
-	public PreviewPage(Composite composite) {
-		// Use the ViewForm control to give it the Eclipse Workbench window
-		// look & feel.
-		ViewForm viewForm = new ViewForm(composite, SWT.DEFAULT);
-		viewForm.marginHeight = 0;
-		viewForm.marginWidth = 0;
-		viewForm.setLayout(new GridLayout());
-		viewForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// Set toolbar
-		Control toolbar = createToolbar(viewForm);
-		viewForm.setTopRight(toolbar);
-
-		// Set content
-		Control content = createContent(viewForm);
-		viewForm.setContent(content);
-	}
-
-	/**
-	 * Create preview content
-	 * 
-	 * @param parent
-	 * @return
-	 */
-	private Control createContent(ViewForm parent) {
-		Composite content = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		layout.horizontalSpacing = 0;
-		layout.verticalSpacing = 0;
-		content.setLayout(layout);
-		GridData gridData = new GridData(GridData.FILL_BOTH);
-		content.setLayoutData(gridData);
-
-		previewer = new ElementHTMLViewer(content);
-		return (Control) content;
-	}
-
-	/**
-	 * Return ElementViewer
-	 * 
-	 * @return
-	 * 			Viewer
-	 */
-	public ElementHTMLViewer getPreviewViewer() {
-		return previewer;
-	}
-
-	/**
-	 * Create Toolbar It has Go back, Go forward, Stop and refresh buttons
-	 * 
-	 * @param ViewForm
-	 *            parent
-	 * @return Toolbar
-	 */
-	private ToolBar createToolbar(ViewForm parent) {
-		// Create the browser navigation toolbar.
-		ToolBar toolbar = new ToolBar(parent, SWT.FLAT);
-
-		// Add the Back button.
-		ToolItem backButton = new ToolItem(toolbar, SWT.NONE);
-		backButton.setImage(AuthoringUIImages.IMG_BACK);
-		backButton.setToolTipText(AuthoringUIResources.backButton_text); //$NON-NLS-1$
-		backButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				Browser browser = previewer.getBrowser();
-				if (browser != null) {
-					browser.back();
-				}
-			};
-		});
-
-		// Add the Foward button.
-		ToolItem forwardButton = new ToolItem(toolbar, SWT.NONE);
-		forwardButton.setImage(AuthoringUIImages.IMG_FORWARD);
-		forwardButton.setToolTipText(AuthoringUIResources.forwardButton_text); //$NON-NLS-1$	
-		forwardButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				Browser browser = previewer.getBrowser();
-				if (browser != null) {
-					browser.forward();
-				}
-			};
-		});
-
-		// Add the Stop button.
-		ToolItem stopButton = new ToolItem(toolbar, SWT.NONE);
-		stopButton.setImage(AuthoringUIImages.IMG_STOP);
-		stopButton.setToolTipText(AuthoringUIResources.stopButton_text); //$NON-NLS-1$	
-		stopButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				Browser browser = previewer.getBrowser();
-				if (browser != null) {
-					browser.stop();
-				}
-			};
-		});
-
-		// Add the Refresh button.
-		ToolItem refreshButton = new ToolItem(toolbar, SWT.NONE);
-		refreshButton.setImage(AuthoringUIImages.IMG_REFRESH);
-		refreshButton.setToolTipText(AuthoringUIResources.refreshButton_text); //$NON-NLS-1$	
-		refreshButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				// Browser browser = previewer.getBrowser();
-				// if (browser != null) {
-				// browser.refresh();
-				// }
-
-				previewer.refresh();
-			};
-		});
-
-		// Add the Print button.
-		ToolItem printButton = new ToolItem(toolbar, SWT.NONE);
-		printButton.setImage(AuthoringUIImages.IMG_PRINT);
-		printButton.setToolTipText(AuthoringUIResources.printButton_text); //$NON-NLS-1$	
-		printButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				previewer.print();
-			};
-		});
-
-		return toolbar;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ProcessEditor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ProcessEditor.java
deleted file mode 100755
index 56e9d4c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ProcessEditor.java
+++ /dev/null
@@ -1,4501 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.command.CreateChildCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.provider.AdapterFactoryTreeIterator;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.DelegatingWrapperItemProvider;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.action.CommandActionHandler;
-import org.eclipse.emf.edit.ui.action.CopyAction;
-import org.eclipse.emf.edit.ui.action.CutAction;
-import org.eclipse.emf.edit.ui.action.DeleteAction;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.action.PasteAction;
-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.actions.IWorkbenchPartAction;
-import org.eclipse.epf.authoring.ui.actions.LibraryLockingOperationRunner;
-import org.eclipse.epf.authoring.ui.actions.LibraryValidateAction;
-import org.eclipse.epf.authoring.ui.actions.MethodLibraryActionBarContributor;
-import org.eclipse.epf.authoring.ui.actions.ProcessAutoSynchronizeAction;
-import org.eclipse.epf.authoring.ui.actions.ProcessDeleteAction;
-import org.eclipse.epf.authoring.ui.actions.SynchronizationAction;
-import org.eclipse.epf.authoring.ui.actions.UpdateSuppressionFromBaseAction;
-import org.eclipse.epf.authoring.ui.dialogs.DialogHelper;
-import org.eclipse.epf.authoring.ui.dialogs.UserDefinedDiagramDialog;
-import org.eclipse.epf.authoring.ui.dnd.EditingDomainTableTreeViewerDropAdapter;
-import org.eclipse.epf.authoring.ui.forms.DeliveryProcessDescription;
-import org.eclipse.epf.authoring.ui.forms.IExtensionFormPage;
-import org.eclipse.epf.authoring.ui.forms.ProcessBreakdownStructureFormPage;
-import org.eclipse.epf.authoring.ui.forms.ProcessDescription;
-import org.eclipse.epf.authoring.ui.preferences.ApplicationPreferenceConstants;
-import org.eclipse.epf.authoring.ui.properties.EPFPropertySheetPage;
-import org.eclipse.epf.authoring.ui.providers.ProcessEditorPageProvider;
-import org.eclipse.epf.authoring.ui.util.UIHelper;
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.authoring.ui.views.ProcessViewer;
-import org.eclipse.epf.authoring.ui.views.ViewHelper;
-import org.eclipse.epf.diagram.add.part.ActivityDetailDiagramEditorPlugin;
-import org.eclipse.epf.diagram.core.part.DiagramEditorInput;
-import org.eclipse.epf.diagram.core.part.util.DiagramEditorUtil;
-import org.eclipse.epf.diagram.core.services.DiagramHelper;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.diagram.model.util.GraphicalDataManager;
-import org.eclipse.epf.diagram.wpdd.part.WPDDiagramEditorPlugin;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.ILibraryServiceListener;
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.configuration.ProcessAuthoringConfigurator;
-import org.eclipse.epf.library.edit.IAdapterFactoryProvider;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.LibraryEditResources;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.CommandStackChangedEvent;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.command.IResourceAwareCommand;
-import org.eclipse.epf.library.edit.command.ResourceAwarePasteFromClipboardCommand;
-import org.eclipse.epf.library.edit.process.ActivityWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.IBSItemProvider;
-import org.eclipse.epf.library.edit.process.command.ActivityDropCommand;
-import org.eclipse.epf.library.edit.process.command.ContributeToActivityCommand;
-import org.eclipse.epf.library.edit.process.command.LocallyReplaceAndDeepCopyCommand;
-import org.eclipse.epf.library.edit.process.command.ReplaceActivityCommand;
-import org.eclipse.epf.library.edit.ui.IActionTypeProvider;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.library.edit.util.ConfigurableComposedAdapterFactory;
-import org.eclipse.epf.library.edit.util.EditingDomainComposedAdapterFactory;
-import org.eclipse.epf.library.edit.util.ExposedAdapterFactory;
-import org.eclipse.epf.library.edit.util.IDiagramManager;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.edit.util.Suppression.SuppressionCommand;
-import org.eclipse.epf.library.edit.validation.DependencyChecker;
-import org.eclipse.epf.library.events.ILibraryChangeListener;
-import org.eclipse.epf.library.prefs.PreferenceUtil;
-import org.eclipse.epf.library.ui.LibraryUIImages;
-import org.eclipse.epf.library.util.ResourceUtil;
-import org.eclipse.epf.persistence.FileManager;
-import org.eclipse.epf.persistence.MultiFileXMIResourceImpl;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-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.Descriptor;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.epf.uma.edit.domain.TraceableAdapterFactoryEditingDomain;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.epf.validation.LibraryEValidator;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.BaseSelectionListenerAction;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.PropertySheet;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * Editor for process authoring.
- * 
- * @author Phong Nguyen Le
- * @author Shilpa Toraskar
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ProcessEditor extends MethodElementEditor implements
-		IEditingDomainProvider, IMenuListener, ISelectionProvider,
-		IViewerProvider, ITabbedPropertySheetPageContributor {
-
-	/**
-	 * The editor ID.
-	 */
-	public static final String EDITOR_ID = ProcessEditor.class.getName();
-
-	public static final String WORKFLOW_EDITOR_ID = GraphicalWorkflowEditor.class
-			.getName();
-
-	public static final String ACTIVITY_DETAIL_DIAGRAM_EDITOR_ID = ActivityDetailDiagramEditor.class
-			.getName();
-
-	public static final String WPDEPENDENCY_EDITOR_ID = GraphicalWPDependencyEditor.class
-			.getName();
-
-	/** Column descriptor constants */
-	public static final ColumnDescriptor COL_DESC_NAME = new ColumnDescriptor(
-			IBSItemProvider.COL_NAME, ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_NAME),
-			3, 200, true, ColumnDescriptor.CELL_EDITOR_TYPE_TEXT);
-
-	public static final ColumnDescriptor COL_DESC_ID = new ColumnDescriptor(
-			IBSItemProvider.COL_ID, ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_ID),
-			0, 40, true, ColumnDescriptor.CELL_EDITOR_TYPE_NONE);
-
-	public static final ColumnDescriptor COL_DESC_PREFIX = new ColumnDescriptor(
-			IBSItemProvider.COL_PREFIX,
-			ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_PREFIX), 0, 80, true,
-			ColumnDescriptor.CELL_EDITOR_TYPE_TEXT);
-
-	public static final ColumnDescriptor COL_DESC_MODEL_INFO = new ColumnDescriptor(
-			IBSItemProvider.COL_MODEL_INFO,
-			ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_MODEL_INFO), 0, 120, true,
-			ColumnDescriptor.CELL_EDITOR_TYPE_NONE); 
-
-	public static final ColumnDescriptor COL_DESC_TYPE = new ColumnDescriptor(
-			IBSItemProvider.COL_TYPE, ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_TYPE),
-			0, 80, true, ColumnDescriptor.CELL_EDITOR_TYPE_NONE);
-
-	public static final ColumnDescriptor COL_DESC_PREDECESSORS = new ColumnDescriptor(
-			IBSItemProvider.COL_PREDECESSORS,
-			ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_PREDECESSORS), 2, 100, true,
-			ColumnDescriptor.CELL_EDITOR_TYPE_TEXT); 
-
-	public static final ColumnDescriptor COL_DESC_IS_REPEATABLE = new ColumnDescriptor(
-			IBSItemProvider.COL_IS_REPEATABLE,
-			ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_IS_REPEATABLE), 1, 60, true,
-			ColumnDescriptor.CELL_EDITOR_TYPE_CHECK_BOOLEAN); 
-
-	public static final ColumnDescriptor COL_DESC_IS_ONGOING = new ColumnDescriptor(
-			IBSItemProvider.COL_IS_ONGOING,
-			ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_IS_ONGOING), 1, 60, true,
-			ColumnDescriptor.CELL_EDITOR_TYPE_CHECK_BOOLEAN);
-
-	public static final ColumnDescriptor COL_DESC_IS_EVENT_DRIVEN = new ColumnDescriptor(
-			IBSItemProvider.COL_IS_EVENT_DRIVEN,
-			ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_IS_EVENT_DRIVEN), 1, 60, true,
-			ColumnDescriptor.CELL_EDITOR_TYPE_CHECK_BOOLEAN); 
-
-	public static final ColumnDescriptor COL_DESC_TEAM = new ColumnDescriptor(
-			IBSItemProvider.COL_TEAMS, ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_TEAMS),
-			1, 100, true, ColumnDescriptor.CELL_EDITOR_TYPE_TEXT);
-
-	public static final ColumnDescriptor COL_DESC_ENTRY_STATE = new ColumnDescriptor(
-			IBSItemProvider.COL_ENTRY_STATE,
-			ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_ENTRY_STATE), 1, 60, true,
-			ColumnDescriptor.CELL_EDITOR_TYPE_TEXT); 
-
-	public static final ColumnDescriptor COL_DESC_EXIT_STATE = new ColumnDescriptor(
-			IBSItemProvider.COL_EXIT_STATE,
-			ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_EXIT_STATE), 1, 60, true,
-			ColumnDescriptor.CELL_EDITOR_TYPE_TEXT); 
-
-	public static final ColumnDescriptor COL_DESC_PRESENTATION_NAME = new ColumnDescriptor(
-			IBSItemProvider.COL_PRESENTATION_NAME,
-			ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_PRESENTATION_NAME), 3, 200, true,
-			ColumnDescriptor.CELL_EDITOR_TYPE_TEXT); 
-
-	public static final ColumnDescriptor COL_DESC_DELIVERABLE = new ColumnDescriptor(
-			IBSItemProvider.COL_DELIVERABLE,
-			ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_DELIVERABLE), 1, 100, true,
-			ColumnDescriptor.CELL_EDITOR_TYPE_TEXT); 
-
-	public static final ColumnDescriptor COL_DESC_IS_OPTIONAL = new ColumnDescriptor(
-			IBSItemProvider.COL_IS_OPTIONAL,
-			ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_IS_OPTIONAL), 1, 60, true,
-			ColumnDescriptor.CELL_EDITOR_TYPE_CHECK_BOOLEAN); 
-
-	public static final ColumnDescriptor COL_DESC_IS_PLANNED = new ColumnDescriptor(
-			IBSItemProvider.COL_IS_PLANNED,
-			ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_IS_PLANNED), 1, 60, true,
-			ColumnDescriptor.CELL_EDITOR_TYPE_CHECK_BOOLEAN);
-
-	public static final ColumnDescriptor COL_DESC_HAS_MULTIPLE_OCCURRENCES = new ColumnDescriptor(
-			IBSItemProvider.COL_HAS_MULTIPLE_OCCURRENCES,
-			ProcessUtil.getColumnDisplayName(IBSItemProvider.COL_HAS_MULTIPLE_OCCURRENCES), 1, 60,
-			true, ColumnDescriptor.CELL_EDITOR_TYPE_CHECK_BOOLEAN); 
-
-	public static final String WBS_FORM_ID = "wbs"; //$NON-NLS-1$
-
-	public static final String TA_FORM_ID = "tbs"; //$NON-NLS-1$
-
-	public static final String WPBS_FORM_ID = "wpbs"; //$NON-NLS-1$
-
-	public static final String CONSOLIDATED_FORM_ID = "consolidated"; //$NON-NLS-1$
-
-	// change the default order based on 152867 - Publish option and prefrences
-	/* WBS: Presentation Name, Index, Predecessors, Model Info, Type, Planned,
-			Repeatable, Multiple Occurrences, Ongoing, Event-driven, Optional
-		TA: Presentation Name, Model Info, Team, Type, Planned, Multiple
-			Occurrences, Optional
-		Work Product Usage: Presentation Name, Model Info, Entry State, Exit State, 
-			Deliverable, Type, Planned, Multiple Occurrences, Optional
-	*/
-	// Jinhua Xi, 08/21/2006
-	
-	// the default list must be available in the library plugin as well.
-	// duplicate definition for now, will need to merge together later
-	// see PreferenceConstants.org.eclipse.epf.library.prefs
-	
-	public static final List DEFAULT_TBS_COLUMNS = Arrays
-			.asList(new ColumnDescriptor[] {
-					COL_DESC_PRESENTATION_NAME,
-					// COL_DESC_ID,
-					//COL_DESC_PREFIX, 
-					COL_DESC_MODEL_INFO, COL_DESC_TEAM, COL_DESC_TYPE,
-					COL_DESC_IS_PLANNED,
-					COL_DESC_HAS_MULTIPLE_OCCURRENCES, COL_DESC_IS_OPTIONAL });
-
-	public static final List DEFAULT_WPBS_COLUMNS = Arrays
-			.asList(new ColumnDescriptor[] {
-					COL_DESC_PRESENTATION_NAME,
-					// COL_DESC_ID,
-					//COL_DESC_PREFIX, 
-					COL_DESC_MODEL_INFO, COL_DESC_ENTRY_STATE,
-					COL_DESC_EXIT_STATE, 
-					COL_DESC_DELIVERABLE, COL_DESC_TYPE, 
-					COL_DESC_IS_PLANNED, COL_DESC_HAS_MULTIPLE_OCCURRENCES, COL_DESC_IS_OPTIONAL });
-
-	public static final List DEFAULT_WBS_COLUMNS = Arrays
-			.asList(new ColumnDescriptor[] { COL_DESC_PRESENTATION_NAME,
-					COL_DESC_ID, 
-					//COL_DESC_PREFIX, 
-					COL_DESC_PREDECESSORS, COL_DESC_MODEL_INFO,
-					COL_DESC_TYPE, COL_DESC_IS_PLANNED, 
-					COL_DESC_IS_REPEATABLE, COL_DESC_HAS_MULTIPLE_OCCURRENCES, COL_DESC_IS_ONGOING,
-					COL_DESC_IS_EVENT_DRIVEN, COL_DESC_IS_OPTIONAL
-					 });
-
-	 
-	public static final List ALL_WBS_COLUMNS = new ArrayList(
-			DEFAULT_WBS_COLUMNS);
-
-	public static final List ALL_TBS_COLUMNS = new ArrayList(
-			DEFAULT_TBS_COLUMNS);
-
-	public static final List ALL_WPBS_COLUMNS = new ArrayList(
-			DEFAULT_WPBS_COLUMNS);
-
-	public static final Map idToColumnDescriptorMap = new HashMap();
-	static {
-		ALL_WBS_COLUMNS.add(COL_DESC_PREFIX);
-		ALL_TBS_COLUMNS.add(COL_DESC_PREFIX);
-		ALL_WPBS_COLUMNS.add(COL_DESC_PREFIX);
-		
-		ProcessEditor.idToColumnDescriptorMap.put(COL_DESC_NAME.id,
-				COL_DESC_NAME);
-		ProcessEditor.idToColumnDescriptorMap.put(COL_DESC_ID.id, COL_DESC_ID);
-		ProcessEditor.idToColumnDescriptorMap.put(COL_DESC_PREFIX.id,
-				COL_DESC_PREFIX);
-		ProcessEditor.idToColumnDescriptorMap.put(COL_DESC_MODEL_INFO.id,
-				COL_DESC_MODEL_INFO);
-		ProcessEditor.idToColumnDescriptorMap.put(COL_DESC_TYPE.id,
-				COL_DESC_TYPE);
-		ProcessEditor.idToColumnDescriptorMap.put(COL_DESC_PREDECESSORS.id,
-				COL_DESC_PREDECESSORS);
-		ProcessEditor.idToColumnDescriptorMap.put(COL_DESC_IS_REPEATABLE.id,
-				COL_DESC_IS_REPEATABLE);
-		ProcessEditor.idToColumnDescriptorMap.put(COL_DESC_IS_ONGOING.id,
-				COL_DESC_IS_ONGOING);
-		ProcessEditor.idToColumnDescriptorMap.put(COL_DESC_IS_EVENT_DRIVEN.id,
-				COL_DESC_IS_EVENT_DRIVEN);
-		ProcessEditor.idToColumnDescriptorMap.put(COL_DESC_TEAM.id,
-				COL_DESC_TEAM);
-		ProcessEditor.idToColumnDescriptorMap.put(COL_DESC_ENTRY_STATE.id,
-				COL_DESC_ENTRY_STATE);
-		ProcessEditor.idToColumnDescriptorMap.put(COL_DESC_EXIT_STATE.id,
-				COL_DESC_EXIT_STATE);
-		ProcessEditor.idToColumnDescriptorMap.put(
-				COL_DESC_PRESENTATION_NAME.id, COL_DESC_PRESENTATION_NAME);
-		ProcessEditor.idToColumnDescriptorMap.put(COL_DESC_DELIVERABLE.id,
-				COL_DESC_DELIVERABLE);
-		ProcessEditor.idToColumnDescriptorMap.put(COL_DESC_IS_OPTIONAL.id,
-				COL_DESC_IS_OPTIONAL);
-		ProcessEditor.idToColumnDescriptorMap.put(COL_DESC_IS_PLANNED.id,
-				COL_DESC_IS_PLANNED);
-		ProcessEditor.idToColumnDescriptorMap.put(
-				COL_DESC_HAS_MULTIPLE_OCCURRENCES.id,
-				COL_DESC_HAS_MULTIPLE_OCCURRENCES);
-
-		ALL_WBS_COLUMNS.add(COL_DESC_NAME);
-		ALL_TBS_COLUMNS.add(COL_DESC_NAME);
-		ALL_WPBS_COLUMNS.add(COL_DESC_NAME);
-	}
-
-	private static boolean addAdapterFactoryListeners = false;
-
-	/**
-	 * Action bar contribtutor for process editor
-	 * 
-	 *
-	 */
-	public static class BSActionBarContributor extends
-			MethodLibraryActionBarContributor {
-		private Collection registeredActions = new ArrayList();
-
-		private boolean locked;
-
-		private IAction rollupAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_RollUp) { 
-
-			public void run() {
-				boolean wasRolledUp = bsItemProvider.isRolledUp();
-				bsItemProvider.setRolledUp(!bsItemProvider.isRolledUp());
-				((IChangeNotifier) bsItemProvider)
-						.fireNotifyChanged(new ViewerNotification(
-								new ENotificationImpl(
-										(InternalEObject) selectedActivity,
-										Notification.ADD, null, null, null,
-										false), selectedActivity, true, false));
-				
-				if (bsItemProvider instanceof DelegatingWrapperItemProvider) {
-					// Refreshing for green activities during rollup
-					DelegatingWrapperItemProvider provider = (DelegatingWrapperItemProvider) bsItemProvider;
-					provider.fireNotifyChanged(new ViewerNotification(
-						new NotificationImpl(Notification.SET, provider,
-								provider), provider, true, false));
-				}
-				if (wasRolledUp) {
-					ProcessViewer viewer = (ProcessViewer) ((ProcessEditor) activeEditor).currentViewer;
-					viewer.expandToLevel(selectedActivity,
-							AbstractTreeViewer.ALL_LEVELS);
-
-					// eventhough we switched off creating new activities in
-					// WBS,
-					// user can still create thru AD. Hence we need to update
-					// IDs
-					// afterwards
-					doRefresh();
-				}
-			}
-
-		};
-
-		private IAction moveUpAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_MoveUp,
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"full/etool16/move_up.gif")) { //$NON-NLS-1$   
-			public void run() {	
-				bsItemProvider.moveUp(selectedBreakdownElement,
-						getActionManager());
-				refreshMoveButtonActions();
-			}
-		};
-
-		private IAction moveDownAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_MoveDown,
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"full/etool16/move_down.gif")) { //$NON-NLS-1$   
-			public void run() {
-				bsItemProvider.moveDown(selectedBreakdownElement,
-						getActionManager());
-				refreshMoveButtonActions();
-			}
-		};
-		
-		private IAction preferenceAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_Preferences) {
-			public void run() {
-				// open process preference page
-				org.eclipse.ui.dialogs.PreferencesUtil
-						.createPreferenceDialogOn(
-								getActiveEditor().getEditorSite().getShell(),
-								"org.eclipse.epf.authoring.ui.preferences.ProcessEditorPreferencePage",   //$NON-NLS-1$
-								null, null).open();
-			}
-		};
-		
-
-		private IAction openBaseActivity = new Action(
-				AuthoringUIResources.ProcessEditor_Action_OpenBaseActivity) { 
-			public void run() {
-				VariabilityElement base = selectedActivity
-						.getVariabilityBasedOnElement();
-				Process proc = TngUtil
-						.getOwningProcess((BreakdownElement) base);
-				try {
-					int id = ((ProcessEditor) activeEditor).getActivePage();
-					ISelection selection = new StructuredSelection(base);
-
-					// ProcessEditorInput input = new ProcessEditorInput(
-					// (MethodElement) proc.eContainer());
-					// input.setInitialSelection(selection);
-					// input.setActivePage(id);
-					//					
-					// ProcessEditor editor = (ProcessEditor)
-					// getPage().findEditor(input);
-					// if(editor != null) {
-					// // select the base activity after the editor is opened
-					// //
-					// Viewer viewer = editor.bsPages[id].getViewer();
-					// getPage().activate(editor);
-					// editor.setActivePage(id);
-					// viewer.setSelection(selection, true);
-					// }
-					// else {
-					// editor = (ProcessEditor) getPage().openEditor(input,
-					// EDITOR_ID);
-					// }
-
-					IEditorInput input = new MethodElementEditorInput(
-							(MethodElement) proc.eContainer());
-					ProcessEditor editor = (ProcessEditor) getPage()
-							.openEditor(input, EDITOR_ID);
-					editor.setActivePage(id);
-					editor.bsPages[id - 1].getViewer().setSelection(selection,
-							true);
-				} catch (PartInitException e) {
-					AuthoringUIPlugin.getDefault().getLogger().logError(e);
-				}
-			}
-		};
-
-		private IAction openWorkflowEditorAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_OpenActivityDiagram) { 
-			public void run() {
-				try {
-					try {
-						IEditorPart parent = getPage().getActiveEditor();
-						IEditorInput input = new GraphicalWorkflowEditor.EditorInput(
-								selectedObject, getSuppression());
-						IEditorPart part = getPage().openEditor(input,
-								WORKFLOW_EDITOR_ID);
-						if (part instanceof AbstractDiagramEditor) {
-							AbstractDiagramEditor editor = (AbstractDiagramEditor) part;
-							editor.setParentEditor(parent);
-						}
-					} catch (PartInitException exception) {
-						AuthoringUIPlugin.getDefault().getLogger().logError(
-								exception);
-					}
-				} catch (RuntimeException e) {
-					AuthoringUIPlugin.getDefault().getLogger().logError(e);
-				}
-			}
-		};
-		private IAction newActivityDiagramEditor = new Action(AuthoringUIResources.
-				ProcessEditor_Action_OpenActivityDiagram
-				) { 
-			public void run() {
-				openDiagram(IDiagramManager.ACTIVITY_DIAGRAM);
-			}			
-		};
-
-		private IAction newActivityDetailDiagramEditor = new Action(
-				AuthoringUIResources.ProcessEditor_Action_OpenActivityDetailDiagram) { 
-			public void run() {
-				openDiagram(IDiagramManager.ACTIVITY_DETAIL_DIAGRAM);
-			}
-		};
-		
-		private IAction newWPDiagramEditor = new Action(
-				AuthoringUIResources.ProcessEditor_Action_OpenWorkProductDependencyDiagram) { 
-			public void run() {
-				openDiagram(IDiagramManager.WORK_PRODUCT_DEPENDENCY_DIAGRAM);
-			}
-		};
-
-		// Open workflow detail action
-		//
-		private IAction openWorkflowDetailEditorAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_OpenActivityDetailDiagram) { 
-			public void run() {
-				try {
-					try {
-						IEditorPart parent = getPage().getActiveEditor();
-						IEditorInput input = new ActivityDetailDiagramEditor.EditorInput(
-								selectedObject, getSuppression());
-						IEditorPart part = getPage().openEditor(input,
-								ACTIVITY_DETAIL_DIAGRAM_EDITOR_ID);
-						if (part instanceof AbstractDiagramEditor) {
-							AbstractDiagramEditor editor = (AbstractDiagramEditor) part;
-							editor.setParentEditor(parent);
-						}
-					} catch (PartInitException exception) {
-						exception.printStackTrace();
-					}
-				} catch (RuntimeException e) {
-					e.printStackTrace();
-				}
-
-			}
-		};
-
-		private IAction openWPDependencyEditorAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_OpenWorkProductDependencyDiagram) { 
-			public void run() {
-				try {
-					try {
-						IEditorPart parent = getPage().getActiveEditor();
-						MethodElementEditorInput input = new BreakdownElementEditorInput(
-								selectedObject, getSuppression()) {
-						};
-						IEditorPart part = getPage().openEditor(input,
-								WPDEPENDENCY_EDITOR_ID);
-						if (part instanceof AbstractDiagramEditor) {
-							AbstractDiagramEditor editor = (AbstractDiagramEditor) part;
-							editor.setParentEditor(parent);
-						}
-					} catch (PartInitException exception) {
-						exception.printStackTrace();
-					}
-				} catch (RuntimeException e) {
-					e.printStackTrace();
-				}
-			}
-		};
-
-		private IAction replaceAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_Replace) { 
-			public void run() {
-				IResourceAwareCommand cmd = null;
-				try {
-					cmd = new ReplaceActivityCommand(
-							(BreakdownElementWrapperItemProvider) bsItemProvider);
-					getActionManager().execute(cmd);
-				} catch (Exception e) {
-					AuthoringUIPlugin.getDefault().getLogger().logError(e);
-				} finally {
-					if (cmd != null) {
-						try {
-							cmd.dispose();
-						} catch (Exception e) {
-							AuthoringUIPlugin.getDefault().getLogger()
-									.logError(e);
-						}
-					}
-				}
-			}
-		};
-
-		private IAction localReplacementAndDeepCopy = new Action(
-				LibraryEditResources.localReplacementAndDeepCopy_text) {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.action.Action#run()
-			 */
-			public void run() {
-				Runnable runnable = new Runnable() {
-
-					public void run() {
-						IResourceAwareCommand cmd = null;
-						try {
-							cmd = new LocallyReplaceAndDeepCopyCommand(
-									(BreakdownElementWrapperItemProvider) bsItemProvider);
-							getActionManager().execute(cmd);
-						} catch (Exception e) {
-							AuthoringUIPlugin.getDefault().getLogger()
-									.logError(e);
-						} finally {
-							if (cmd != null) {
-								try {
-									cmd.dispose();
-								} catch (Exception e) {
-									AuthoringUIPlugin.getDefault().getLogger()
-											.logError(e);
-								}
-							}
-						}
-					}
-
-				};
-
-				UserInteractionHelper.runInUI(runnable, getText());
-			}
-		};
-
-		private IAction contributeAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_Contribute) { 
-			public void run() {
-				IResourceAwareCommand cmd = null;
-				try {
-					cmd = new ContributeToActivityCommand(
-							(BreakdownElementWrapperItemProvider) bsItemProvider);
-					getActionManager().execute(cmd);
-					// ProcessUtil.contributeToActivity((BreakdownElementWrapperItemProvider)bsItemProvider,
-					// ((ProcessFormEditor)activeEditor).editingDomain.getAdapterFactory());
-				} catch (Exception e) {
-					AuthoringUIPlugin.getDefault().getLogger().logError(e);
-				} finally {
-					if (cmd != null) {
-						try {
-							cmd.dispose();
-						} catch (Exception e) {
-							AuthoringUIPlugin.getDefault().getLogger()
-									.logError(e);
-						}
-					}
-				}
-			}
-		};
-
-		private class EditorSuppressionCommand extends SuppressionCommand {
-			EditorSuppressionCommand(Suppression suppression, List selection,
-					boolean suppressed) {
-				super(suppression, selection, suppressed);
-			}
-
-			private void refresh() {
-				if (!getResult().isEmpty()) {
-					ProcessEditor editor = (ProcessEditor) getActiveEditor();
-					if (isReadOnlyElementAffected()) {
-						if (hasInherited(selection)) {
-							editor.refreshAllProcessEditors();
-						} else {
-							editor.doRefreshAll(false);
-						}
-					}
-					editor.firePropertyChange(PROP_DIRTY);
-					
-					// Do Diagram Editors refresh
-					List list = new ArrayList();
-					for (Iterator iter = selection.iterator(); iter.hasNext();) {
-						Object element = iter.next();
-						UIHelper.closeDiagramEditors(element, list);
-						UIHelper.refreshOpenDiagramEditorsOfParent(element, list);
-						list.clear();
-					}
-				}
-			}
-
-			/**
-			 * @see org.eclipse.epf.library.edit.util.Suppression.SuppressionCommand#didExecute()
-			 */
-			protected void didExecute() {
-				refresh();
-			}
-
-			/**
-			 * @see org.eclipse.epf.library.edit.util.Suppression.SuppressionCommand#didUndo()
-			 */
-			protected void didUndo() {
-				refresh();
-			}
-
-		}
-
-		private IAction suppressTaskAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_Suppress_Task) { 
-
-			public void run() {
-				// check if suppressing the selected elements will cause
-				// duplicate descriptors.
-				// If so, prompt user to delete the duplicates before
-				// continuing.
-				//
-				
-				final List taskDescriptors = ProcessUtil.getTaskDescriptors(selection);
-				Collection duplicates = ProcessUtil
-						.getDuplicateDescriptorsAfterSuppress(taskDescriptors);
-				if (!duplicates.isEmpty()) {
-					MultiStatus status = new MultiStatus(AuthoringUIPlugin
-							.getDefault().getId(), 0, "", null); //$NON-NLS-1$
-					for (Iterator iter = duplicates.iterator(); iter.hasNext();) {
-						Descriptor desc = (Descriptor) iter.next();
-						String descTxt = TngUtil.getTypeText(desc)
-								+ ": " + desc.getPresentationName(); //$NON-NLS-1$
-						status.add(new Status(IStatus.INFO, AuthoringUIPlugin
-								.getDefault().getId(), 0, descTxt, null));
-					}
-					if (AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayConfirmation(
-									getText(),
-									AuthoringUIResources.ProcessEditor_promptToDeleteBeforeSuppress, 
-									status) == Dialog.CANCEL) {
-						return;
-					}
-
-					// delete duplicate descriptors
-					Command cmd = null;
-					try {
-						cmd = ProcessDeleteAction.delete(duplicates);
-					} catch (OperationCanceledException e) {
-						return;
-					}
-					finally {
-						if(cmd != null)
-							try { cmd.dispose(); } catch(Exception e) {}
-					}
-				}
-
-				BusyIndicator.showWhile(getActiveEditor().getEditorSite()
-						.getShell().getDisplay(), new Runnable() {
-
-					public void run() {
-						EditorSuppressionCommand cmd = new EditorSuppressionCommand(
-								getSuppression(), taskDescriptors, true);
-						cmd.setLabel(getText());
-						getActionManager().execute(cmd);
-					}
-				});
-
-				boolean show = true;
-				// update context bar menu after performing suppress
-				if (getAdapterFactory() == TngAdapterFactory.INSTANCE
-						.getWBS_ComposedAdapterFactory()) {
-					for (int i = 0; i < selection.size(); i++) {
-						if (!(selection.get(i) instanceof Activity || selection
-								.get(i) instanceof ActivityWrapperItemProvider))
-							show = false;
-					}
-				} else
-					show = false;
-				
-				revealTaskAction.setEnabled(show);
-				suppressTaskAction.setEnabled(show);
-
-				// enable synchronize actions correctly
-				autoSynchronize.setEnabled(autoSynchronize
-						.updateSelection(new StructuredSelection(selection
-								.toArray())));
-				manualSynchronizeAction.setEnabled(manualSynchronizeAction
-						.updateSelection(new StructuredSelection(selection
-								.toArray())));
-			}
-		};
-
-		private IAction suppressAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_Suppress) { 
-
-			public void run() {
-				// check if suppressing the selected elements will cause
-				// duplicate descriptors.
-				// If so, prompt user to delete the duplicates before
-				// continuing.
-				//
-				Collection duplicates = ProcessUtil
-						.getDuplicateDescriptorsAfterSuppress(selection);
-				if (!duplicates.isEmpty()) {
-					MultiStatus status = new MultiStatus(AuthoringUIPlugin
-							.getDefault().getId(), 0, "", null); //$NON-NLS-1$
-					for (Iterator iter = duplicates.iterator(); iter.hasNext();) {
-						Descriptor desc = (Descriptor) iter.next();
-						String descTxt = TngUtil.getTypeText(desc)
-								+ ": " + desc.getPresentationName(); //$NON-NLS-1$
-						status.add(new Status(IStatus.INFO, AuthoringUIPlugin
-								.getDefault().getId(), 0, descTxt, null));
-					}
-					if (AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayConfirmation(
-									getText(),
-									AuthoringUIResources.ProcessEditor_promptToDeleteBeforeSuppress, 
-									status) == Dialog.CANCEL) {
-						return;
-					}
-
-					// delete duplicate descriptors
-					Command cmd = null;
-					try {
-						cmd = ProcessDeleteAction.delete(duplicates);
-					} catch (OperationCanceledException e) {
-						return;
-					}
-					finally {
-						if(cmd != null)
-							try { cmd.dispose(); } catch(Exception e) {}
-					}
-				}
-
-				// final ProcessEditor editor = (ProcessEditor)
-				// getActiveEditor();
-
-				BusyIndicator.showWhile(getActiveEditor().getEditorSite()
-						.getShell().getDisplay(), new Runnable() {
-
-					public void run() {
-						// if (getSuppression().suppress(selection)) {
-						// if (hasInherited(selection)) {
-						// editor.refreshAllProcessEditors();
-						// } else {
-						// editor.doRefreshAll(false);
-						// }
-						// }
-						// editor.firePropertyChange(PROP_DIRTY);
-
-						EditorSuppressionCommand cmd = new EditorSuppressionCommand(
-								getSuppression(), selection, true);
-						cmd.setLabel(getText());
-						getActionManager().execute(cmd);
-					}
-
-				});
-
-				// update context bar menu after performing suppress
-				revealAction.setEnabled(getSuppression().canReveal(selection));
-				suppressAction.setEnabled(getSuppression().canSuppress(
-						selection));
-
-				// enable synchronize actions correctly
-				autoSynchronize.setEnabled(autoSynchronize
-						.updateSelection(new StructuredSelection(selection
-								.toArray())));
-				manualSynchronizeAction.setEnabled(manualSynchronizeAction
-						.updateSelection(new StructuredSelection(selection
-								.toArray())));
-			}
-		};
-		
-		private UpdateSuppressionFromBaseAction updateSuppressionFromBaseAction = new UpdateSuppressionFromBaseAction();
-
-		private IAction revealAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_Reveal) { 
-
-			public void run() {
-				if (canReveal(selection, getAdapterFactory(), getSuppression())) {
-					// final ProcessEditor editor = (ProcessEditor)
-					// getActiveEditor();
-
-					BusyIndicator.showWhile(getActiveEditor().getEditorSite()
-							.getShell().getDisplay(), new Runnable() {
-
-						public void run() {
-							// if (getSuppression().reveal(selection)) {
-							// if (hasInherited(selection)) {
-							// editor.refreshAllProcessEditors();
-							// } else {
-							// editor.doRefreshAll(false);
-							// }
-							// }
-							// editor.firePropertyChange(PROP_DIRTY);
-
-							EditorSuppressionCommand cmd = new EditorSuppressionCommand(
-									getSuppression(), selection, false);
-							cmd.setLabel(getText());
-							getActionManager().execute(cmd);
-						}
-
-					});
-					// update context bar menu after performing reveal
-					revealAction.setEnabled(getSuppression().canReveal(
-							selection));
-					suppressAction.setEnabled(getSuppression().canSuppress(
-							selection));
-					// enable synchronize actions correctly
-					autoSynchronize.setEnabled(autoSynchronize
-							.updateSelection(new StructuredSelection(selection
-									.toArray())));
-					manualSynchronizeAction.setEnabled(manualSynchronizeAction
-							.updateSelection(new StructuredSelection(selection
-									.toArray())));
-				}
-			}
-		};
-		
-		private IAction revealTaskAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_Reveal_Task) { 
-
-			public void run() {
-				final List taskDescriptors = ProcessUtil.getTaskDescriptors(selection);
-				if (canReveal(taskDescriptors, getAdapterFactory(), getSuppression())) {
-					
-					BusyIndicator.showWhile(getActiveEditor().getEditorSite()
-							.getShell().getDisplay(), new Runnable() {
-
-						public void run() {
-							EditorSuppressionCommand cmd = new EditorSuppressionCommand(
-									getSuppression(), taskDescriptors, false);
-							cmd.setLabel(getText());
-							getActionManager().execute(cmd);
-						}
-
-					});
-					
-					// enable synchronize actions correctly
-					autoSynchronize.setEnabled(autoSynchronize
-							.updateSelection(new StructuredSelection(selection
-									.toArray())));
-					manualSynchronizeAction.setEnabled(manualSynchronizeAction
-							.updateSelection(new StructuredSelection(selection
-									.toArray())));
-				}
-			}
-		};
-
-		private IBSItemProvider bsItemProvider = null;
-
-		private Object selectedElement = null;
-
-		private Activity selectedActivity = null;
-
-		private BreakdownElement selectedBreakdownElement = null;
-
-		private List selection;
-
-		private IAction suppressDiagramAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_Suppress2) { 
-			public boolean isEnabled() {
-				if (!super.isEnabled()) {
-					return false;
-				}
-				return !(bsItemProvider instanceof BreakdownElementWrapperItemProvider && ((BreakdownElementWrapperItemProvider) bsItemProvider)
-						.isReadOnly());
-			}
-
-			public void run() {
-				if (!promptSaveActiveEditor()) {
-					return;
-				}
-
-				IStructuredContentProvider contentProvider = new ArrayContentProvider();
-
-				ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-						TngUtil.umaItemProviderAdapterFactory) {
-					public String getColumnText(Object object, int columnIndex) {
-						return GraphicalDataHelper
-								.getDiagramTypeText((Diagram) object);
-					}
-				};
-
-				Collection diagrams = GraphicalDataHelper
-						.getDiagrams(selectedActivity);
-				ArrayList unsuppressedDiagrams = new ArrayList();
-				for (Iterator iter = diagrams.iterator(); iter.hasNext();) {
-					Diagram diagram = (Diagram) iter.next();
-					if (!diagram.getSuppressed().booleanValue()) {
-						unsuppressedDiagrams.add(diagram);
-					}
-				}
-
-				ListSelectionDialog dlg = new ListSelectionDialog(
-						activeEditor.getEditorSite().getShell(),
-						diagrams,
-						contentProvider,
-						labelProvider,
-						AuthoringUIResources.ProcessEditor_SuppressDialog_Message); 
-				dlg.setInitialElementSelections(unsuppressedDiagrams);
-				dlg
-						.setTitle(AuthoringUIResources.ProcessEditor_SuppressDialog_Title); 
-				dlg.setBlockOnOpen(true);
-				dlg.open();
-
-				Object[] diagramsToReveal = dlg.getResult();
-
-				if (diagramsToReveal == null) {
-					return;
-				}
-
-				boolean changed = true;
-
-				// check if there is really any change
-				//
-				if (diagramsToReveal.length == unsuppressedDiagrams.size()) {
-					for (int i = 0; i < diagramsToReveal.length; i++) {
-						if (!unsuppressedDiagrams.contains(diagramsToReveal[i])) {
-							changed = false;
-							break;
-						}
-					}
-				}
-
-				if (changed) {
-					for (Iterator iter = diagrams.iterator(); iter.hasNext();) {
-						Diagram diagram = (Diagram) iter.next();
-						diagram.setSuppressed(Boolean.TRUE);
-					}
-
-					for (int i = 0; i < diagramsToReveal.length; i++) {
-						Diagram diagram = (Diagram) diagramsToReveal[i];
-						diagram.setSuppressed(Boolean.FALSE);
-					}
-
-					// save the editor
-					//
-					saveActiveEditor();
-				}
-			}
-		};
-		
-		
-		
-		private IAction newSuppressDiagramAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_Suppress2) { 
-			public boolean isEnabled() {
-				if (!super.isEnabled()) {
-					return false;
-				}
-				return !(bsItemProvider instanceof BreakdownElementWrapperItemProvider && ((BreakdownElementWrapperItemProvider) bsItemProvider)
-						.isReadOnly());
-			}
-
-			public void run() {
-				if (!promptSaveActiveEditor()) {
-					return;
-				}
-
-				IStructuredContentProvider contentProvider = new ArrayContentProvider();
-
-				ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-						TngUtil.umaItemProviderAdapterFactory) {
-					public String getColumnText(Object object, int columnIndex) {
-						//TODO: Change to exact string.
-						return DiagramHelper.getDiagramTypeString((org.eclipse.gmf.runtime.notation.Diagram)object);
-					}
-				};
-
-				Collection diagrams = DiagramHelper.getDiagrams(selectedActivity);
-				ArrayList unsuppressedDiagrams = new ArrayList();
-				for (Iterator iter = diagrams.iterator(); iter.hasNext();) {
-					org.eclipse.gmf.runtime.notation.Diagram diagram = (org.eclipse.gmf.runtime.notation.Diagram) iter.next();
-					
-					//TODO: do get Unsuppressed list.
-					
-//					if (!diagram.getSuppressed().booleanValue()) {
-//						unsuppressedDiagrams.add(diagram);
-//					}
-				}
-
-				ListSelectionDialog dlg = new ListSelectionDialog(
-						activeEditor.getEditorSite().getShell(),
-						diagrams,
-						contentProvider,
-						labelProvider,
-						AuthoringUIResources.ProcessEditor_SuppressDialog_Message); 
-				dlg.setInitialElementSelections(unsuppressedDiagrams);
-				dlg
-						.setTitle(AuthoringUIResources.ProcessEditor_SuppressDialog_Title); 
-				dlg.setBlockOnOpen(true);
-				dlg.open();
-
-				Object[] diagramsToReveal = dlg.getResult();
-
-				if (diagramsToReveal == null) {
-					return;
-				}
-
-				boolean changed = true;
-
-				// check if there is really any change
-				//
-				if (diagramsToReveal.length == unsuppressedDiagrams.size()) {
-					for (int i = 0; i < diagramsToReveal.length; i++) {
-						if (!unsuppressedDiagrams.contains(diagramsToReveal[i])) {
-							changed = false;
-							break;
-						}
-					}
-				}
-
-				if (changed) {
-					for (Iterator iter = diagrams.iterator(); iter.hasNext();) {
-						org.eclipse.gmf.runtime.notation.Diagram diagram = (org.eclipse.gmf.runtime.notation.Diagram) iter.next();
-						//TODO: set Suppression.
-						//diagram.setSuppressed(Boolean.TRUE);
-					}
-
-					for (int i = 0; i < diagramsToReveal.length; i++) {
-						org.eclipse.gmf.runtime.notation.Diagram diagram = (org.eclipse.gmf.runtime.notation.Diagram) diagramsToReveal[i];
-						//TODO: set Suppression.
-						//diagram.setSuppressed(Boolean.FALSE);
-					}
-
-					// save the editor
-					//
-					saveActiveEditor();
-				}
-			}
-		};
-		
-		
-		private IAction newAssignUserDiagram = new Action(
-				AuthoringUIResources.ProcessEditor_Action_AssignUserDiagram) { 
-			/**
-			 * @see org.eclipse.jface.action.Action#run()
-			 */
-			public void run() {
-				//TODO: necessary changes UserDefinedDiagramDialog's DiagramInfo.
-				UserDefinedDiagramDialog dialog = new UserDefinedDiagramDialog(
-						Display.getCurrent().getActiveShell(), activeEditor,
-						selectedActivity, getProcess().getDefaultContext(), TngUtil.isWrapped(selectedObject));
-				dialog.open();
-			}
-		};
-		
-		private IAction newSuppressAllDiagrams = new Action(
-				AuthoringUIResources.ProcessEditor_Action_SuppressAll) { 
-			public void run() {
-				newSetAllDiagramSuppressed(true);
-			}
-		};
-
-		private IAction newRevealAllDiagrams = new Action(
-				AuthoringUIResources.ProcessEditor_Action_RevealAll) { 
-			public void run() {
-				newSetAllDiagramSuppressed(false);
-			}
-		};
-		
-		
-
-		private IAction suppressAllDiagrams = new Action(
-				AuthoringUIResources.ProcessEditor_Action_SuppressAll) { 
-			public void run() {
-				setAllDiagramSuppressed(true);
-			}
-		};
-
-		private IAction revealAllDiagrams = new Action(
-				AuthoringUIResources.ProcessEditor_Action_RevealAll) { 
-			public void run() {
-				setAllDiagramSuppressed(false);
-			}
-		};
-
-		private IAction addAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_Add) { 
-			public void run() {
-				LibraryLockingOperationRunner runner = new LibraryLockingOperationRunner();
-				runner.run(new IRunnableWithProgress() {
-
-					public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-						AdapterFactory adapterFactory = getAdapterFactory();
-						if (adapterFactory != null) {
-							MethodConfiguration config = LibraryService.getInstance()
-									.getCurrentMethodConfiguration();
-							if (config == null) {
-								config = TngUtil.getOwningProcess(
-										selectedBreakdownElement).getDefaultContext();
-							}
-							List selection = DialogHelper.selectElementsFor(
-									selectedBreakdownElement, config, adapterFactory);
-
-							if (selection == null || selection.isEmpty()) {
-								return;
-							}
-
-							Object adapter = adapterFactory.adapt(
-									selectedBreakdownElement,
-									IEditingDomainItemProvider.class);
-							if (adapter instanceof IBSItemProvider) {
-								IResourceAwareCommand cmd = ((IBSItemProvider) adapter)
-										.createDropCommand(selectedBreakdownElement,
-												selection);
-								getActionManager().execute(cmd);
-							}
-						}
-					}
-					
-				});
-
-			}
-		};
-
-		private IAction copyActivityAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_Copy) { 
-			public void run() {
-				MethodConfiguration config = LibraryService.getInstance()
-						.getCurrentMethodConfiguration();
-				if (config == null) {
-					config = TngUtil.getOwningProcess(selectedActivity)
-							.getDefaultContext();
-				}
-				List selection = DialogHelper.selectActivitiesFor(
-						selectedActivity, config, IActionTypeProvider.COPY);
-
-				if (selection == null || selection.isEmpty()) {
-					return;
-				} else {
-					for (Iterator itor=selection.iterator(); itor.hasNext();) {
-						Object o = itor.next();
-					
-						if (o instanceof Activity) {
-							Activity act = (Activity) o;
-				
-//							Process proc = TngUtil.getOwningProcess(selectedBreakdownElement);
-//							if (DependencyChecker.hasCyclicDependency(act, proc)) {
-//								Object[] args = { selectedActivity.getName(),
-//										act.getName() };
-//								String message = AuthoringUIResources
-//										.bind(
-//												AuthoringUIResources.apply_pattern_error_msg,
-//												args);
-//	
-//								String title = AuthoringUIResources.apply_pattern_error_title;
-//								AuthoringUIPlugin.getDefault().getMsgDialog()
-//										.displayError(title, message, ""); //$NON-NLS-1$
-//								itor.remove();
-//							}
-//							else if (ProcessUtil.hasContributorOrReplacer(act)) {
-//								Object[] args = { selectedActivity.getName(),
-//										act.getName() };
-//								String message = AuthoringUIResources
-//										.bind(
-//												AuthoringUIResources.activity_variability_error_msg,
-//												args);
-//	
-//								String title = AuthoringUIResources.activity_variability_error_title;
-//								AuthoringUIPlugin.getDefault().getMsgDialog()
-//										.displayError(title, message, ""); //$NON-NLS-1$
-//
-//								itor.remove();
-//								return;
-//							}
-							
-							IStatus status = DependencyChecker.checkCircularDependency(act, selectedActivity);
-							if(!status.isOK()) {
-								String title = AuthoringUIResources.activity_variability_error_title;
-								AuthoringUIPlugin.getDefault().getMsgDialog()
-										.displayError(title, status.getMessage());
-								itor.remove();
-							}
-						}	
-						if(selection.isEmpty()) {
-							return;
-						}
-					}
-				}
-
-				ActivityDropCommand cmd = new ActivityDropCommand(
-						selectedActivity, selection, null, getAdapterFactory());
-				IStatus status = cmd.checkCopy();
-				if(!status.isOK()) {
-					String title = AuthoringUIResources.activity_variability_error_title;
-					AuthoringUIPlugin.getDefault().getMsgDialog()
-							.displayError(title, status.getMessage());
-					return;
-				}
-				cmd.setType(IActionTypeProvider.COPY);
-				getActionManager().execute(cmd);
-			}
-		};
-
-		private IAction extendActivityAction = new Action(
-				AuthoringUIResources.ProcessEditor_Action_Extend) { 
-			public void run() {
-				MethodConfiguration config = LibraryService.getInstance()
-						.getCurrentMethodConfiguration();
-				if (config == null) {
-					config = TngUtil.getOwningProcess(selectedActivity)
-							.getDefaultContext();
-				}
-				List selection = DialogHelper.selectActivitiesFor(
-						selectedActivity, config, IActionTypeProvider.EXTEND);
-
-				if (selection == null || selection.isEmpty()) {
-					return;
-				} 
-				else {					
-					for (Iterator itor=selection.iterator(); itor.hasNext();) {
-						Object o = itor.next();
-					
-						if (o instanceof Activity) {
-							Activity act = (Activity) o;
-				
-//							Process proc = TngUtil.getOwningProcess(selectedBreakdownElement);
-//							if (DependencyChecker.hasCyclicDependency(act, proc)) {
-//								Object[] args = { selectedActivity.getName(),
-//										act.getName() };
-//								String message = AuthoringUIResources
-//										.bind(
-//												AuthoringUIResources.apply_pattern_error_msg,
-//												args);
-//	
-//								String title = AuthoringUIResources.apply_pattern_error_title;
-//								AuthoringUIPlugin.getDefault().getMsgDialog()
-//										.displayError(title, message, ""); //$NON-NLS-1$
-//								itor.remove();
-//							}
-//							else if (ProcessUtil.hasContributorOrReplacer(act)) {
-//								Object[] args = { selectedActivity.getName(),
-//										act.getName() };
-//								String message = AuthoringUIResources
-//										.bind(
-//												AuthoringUIResources.activity_variability_error_msg,
-//												args);
-//	
-//								String title = AuthoringUIResources.activity_variability_error_title;
-//								AuthoringUIPlugin.getDefault().getMsgDialog()
-//										.displayError(title, message, ""); //$NON-NLS-1$
-//
-//								itor.remove();
-//								return;
-//							}
-							
-							IStatus status = DependencyChecker.newCheckAct ? 
-									DependencyChecker.checkCircularDependencyAfterFilterSelection
-											(act, selectedActivity, VariabilityType.EXTENDS_LITERAL)
-									: DependencyChecker.checkCircularDependency(act, selectedActivity);
-							if(!status.isOK()) {
-								String title = AuthoringUIResources.activity_variability_error_title;
-								AuthoringUIPlugin.getDefault().getMsgDialog()
-										.displayError(title, status);
-								itor.remove();
-							}
-						}
-						if(selection.isEmpty()) {
-							return;
-						}
-					}
-				}
-				ActivityDropCommand cmd = new ActivityDropCommand(
-						selectedActivity, selection, null, getAdapterFactory());
-				IStatus status = cmd.checkExtend();
-				if(!status.isOK()) {
-					String title = AuthoringUIResources.activity_variability_error_title;
-					AuthoringUIPlugin.getDefault().getMsgDialog()
-							.displayError(title, status.getMessage());
-					return;
-				}
-				cmd.setType(IActionTypeProvider.EXTEND);
-				getActionManager().execute(cmd);
-			}
-		};
-
-		private IAction deepCopyActivityAction = new Action(
-				AuthoringUIResources.ProcessEditor_action_deepCopy) { 
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.action.Action#run()
-			 */
-			public void run() {
-				LibraryLockingOperationRunner runner = new LibraryLockingOperationRunner();
-				runner.run(new IRunnableWithProgress() {
-
-					public void run(IProgressMonitor monitor)
-							throws InvocationTargetException,
-							InterruptedException {
-						MethodConfiguration config = LibraryService
-								.getInstance().getCurrentMethodConfiguration();
-						if (config == null) {
-							config = TngUtil.getOwningProcess(selectedActivity)
-									.getDefaultContext();
-						}
-						List selection = DialogHelper.selectActivitiesFor(
-								selectedActivity, config,
-								IActionTypeProvider.DEEP_COPY);
-
-						if (selection == null || selection.isEmpty()) {
-							return;
-						} 
-						else {					
-							for (Iterator itor=selection.iterator(); itor.hasNext();) {
-								Object o = itor.next();
-							
-								if (o instanceof Activity) {
-									Activity act = (Activity) o;
-									
-//									Process proc = TngUtil.getOwningProcess(selectedBreakdownElement);
-//									if (ProcessUtil.hasCyclicDependency(act, proc)) {
-//										Object[] args = { selectedActivity.getName(),
-//												act.getName() };
-//										String message = AuthoringUIResources
-//												.bind(
-//														AuthoringUIResources.apply_pattern_error_msg,
-//														args);
-//			
-//										String title = AuthoringUIResources.apply_pattern_error_title;
-//										AuthoringUIPlugin.getDefault().getMsgDialog()
-//												.displayError(title, message, ""); //$NON-NLS-1$
-//										itor.remove();
-//									}
-									
-									IStatus status = DependencyChecker.checkCircularDependency(act, selectedActivity);
-									if(!status.isOK()) {
-										String title = AuthoringUIResources.activity_variability_error_title;
-										AuthoringUIPlugin.getDefault().getMsgDialog()
-												.displayError(title, status.getMessage());
-										itor.remove();
-									}
-								}
-								if(selection.isEmpty()) {
-									return;
-								}
-							}
-						}
-
-						ActivityDropCommand cmd = new ActivityDropCommand(
-								selectedActivity, selection, null,
-								getAdapterFactory());
-						cmd.setType(IActionTypeProvider.DEEP_COPY);
-						getActionManager().execute(cmd);
-
-					}
-				});				
-			}
-		};
-
-		private Object selectedObject;
-
-		private IAction expandAllAction = new Action(
-				AuthoringUIResources.ProcessFormEditor_expanAllActionLabel) { 
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.action.Action#run()
-			 */
-			public void run() {
-				Viewer viewer = ((ProcessEditor) activeEditor).currentViewer;
-				if (viewer instanceof TreeViewer) {
-					((TreeViewer) viewer).expandToLevel(selectedObject,
-							AbstractTreeViewer.ALL_LEVELS);
-				}
-			}
-		};
-
-		private IAction collapseAllAction = new Action(
-				AuthoringUIResources.ProcessFormEditor_collapseAllActionLabel) { 
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.action.Action#run()
-			 */
-			public void run() {
-				Viewer viewer = ((ProcessEditor) activeEditor).currentViewer;
-				if (viewer instanceof TreeViewer) {
-					((TreeViewer) viewer).collapseToLevel(selectedObject,
-							AbstractTreeViewer.ALL_LEVELS);
-				}
-			}
-		};
-
-		private SynchronizationAction manualSynchronizeAction = new SynchronizationAction() {
-			public void run() {
-				super.run();
-
-				// refresh properties view after synch
-				EPFPropertySheetPage page = (EPFPropertySheetPage) ((ProcessEditor) activeEditor)
-						.getPropertySheetPage();
-				if (page != null) {
-					page.refresh();
-				}
-			}
-		};
-
-		private ProcessAutoSynchronizeAction autoSynchronize = new ProcessAutoSynchronizeAction() {
-			private void superRun() {
-				super.run();
-			}
-			
-			/**
-			 * @see org.eclipse.epf.authoring.ui.actions.ProcessAutoSynchronizeAction#run()
-			 */
-			public void run() {
-				LibraryLockingOperationRunner runner = new LibraryLockingOperationRunner();
-				runner.run(new IRunnableWithProgress() {
-
-					public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-						if (!AuthoringUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayConfirmation(
-										AuthoringUIResources.ProcessEditor_defaultSynchronization,
-										AuthoringUIResources.ProcessEditor_confirmAutoSynch)) { 
-							return;
-						}
-						// ((SynchronizeCommand)command).setUIContext(getActiveEditor().getSite().getShell());
-						superRun();
-						
-						// refresh properties view after synch
-						EPFPropertySheetPage page = (EPFPropertySheetPage)((ProcessEditor) activeEditor).getPropertySheetPage();
-						if (page != null) {
-							page.refresh();
-						}
-					}
-				});
-				
-			}
-		};
-
-		private IAction showInLibraryView = new Action(
-				AuthoringUIResources.ProcessEditor_Action_ShowLinkedElementinLibraryView,
-				AuthoringUIPlugin.getDefault().getImageDescriptor(
-						"full/etool16/show_linked_element.gif")) { //$NON-NLS-1$   //) 
-
-			public void run() {
-				final Object linkedElement = ProcessUtil
-						.getAssociatedElement((Descriptor) selectedBreakdownElement);
-				if (linkedElement != null) {
-					Display.getCurrent().asyncExec(new Runnable() {
-
-						public void run() {
-							LibraryView.getView().setSelectionToViewer(
-									linkedElement);
-						}
-
-					});
-				}
-			}
-
-		};
-
-		private IAction assignUserDiagram = new Action(
-				AuthoringUIResources.ProcessEditor_Action_AssignUserDiagram) { 
-			/**
-			 * @see org.eclipse.jface.action.Action#run()
-			 */
-			public void run() {
-				UserDefinedDiagramDialog dialog = new UserDefinedDiagramDialog(
-						Display.getCurrent().getActiveShell(), activeEditor,
-						selectedActivity, getProcess().getDefaultContext(), TngUtil.isWrapped(selectedObject));
-
-				dialog.open();
-			}
-		};
-		
-//		private IAction activityDetailDiagramInfo =  new ActivityDetailDiagramInfoAction(){
-//			public Object getObject() {
-//				return selectedActivity;
-//			}
-//			public IWorkbenchPage getPagex() {
-//				// TODO Auto-generated method stub
-//				return getPage();
-//			}
-//		};
-
-		private boolean oldLocked;
-
-		public BSActionBarContributor() {
-			super(AuthoringUIResources.ProcessEditor);
-			
-			// don't show validate action
-			//
-			validateAction = null;
-
-			// set disabled image descriptors
-			moveUpAction.setDisabledImageDescriptor(AuthoringUIPlugin
-					.getDefault().getImageDescriptor(
-							"full/etool16/move_up_disabled.gif")); //$NON-NLS-1$
-			moveDownAction.setDisabledImageDescriptor(AuthoringUIPlugin
-					.getDefault().getImageDescriptor(
-							"full/etool16/move_down_disabled.gif")); //$NON-NLS-1$
-			showInLibraryView.setDisabledImageDescriptor(AuthoringUIPlugin
-					.getDefault().getImageDescriptor(
-							"full/etool16/show_linked_element_disabled.gif")); //$NON-NLS-1$
-		}
-		
-		private static PreferencesHint getDiagramPreferencesHint(int diagramType) {
-			switch(diagramType) {
-			case IDiagramManager.ACTIVITY_DIAGRAM:
-				return EPFDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;
-			case IDiagramManager.ACTIVITY_DETAIL_DIAGRAM:
-				return ActivityDetailDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;
-			case IDiagramManager.WORK_PRODUCT_DEPENDENCY_DIAGRAM:
-				return WPDDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;
-			}
-			return null;
-		}
-		
-		protected void openDiagram(int diagramType) {
-			try {
-				DiagramEditorInput input = new org.eclipse.epf.diagram.core.part.DiagramEditorInput(
-						selectedObject, getSuppression(), diagramType);
-				DiagramEditorUtil.openDiagramEditor(getPage(), input, getDiagramPreferencesHint(diagramType), new NullProgressMonitor());					
-			} catch (RuntimeException e) {
-				AuthoringUIPlugin.getDefault().getLogger().logError(e);
-			}
-		}
-
-		protected void registerAction(IAction action) {
-			if (action != null && !registeredActions.contains(action)) {
-				registeredActions.add(action);
-			}
-		}
-
-		private void registerActions() {
-			registerAction(autoSynchronize);
-			registerAction(manualSynchronizeAction);
-			registerAction(updateSuppressionFromBaseAction);
-		}
-
-		/**
-		 * @see org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor#update()
-		 */
-		public void update() {
-			super.update();
-
-			ISelectionProvider selectionProvider = activeEditor instanceof ISelectionProvider ? (ISelectionProvider) activeEditor
-					: activeEditor.getEditorSite().getSelectionProvider();
-			ISelection selection = selectionProvider.getSelection();
-			IStructuredSelection structuredSelection = selection instanceof IStructuredSelection ? (IStructuredSelection) selection
-					: StructuredSelection.EMPTY;
-
-			for (Iterator iter = registeredActions.iterator(); iter.hasNext();) {
-				Object action = (Object) iter.next();
-				if (action instanceof CommandActionHandler) {
-					((CommandActionHandler) action)
-							.updateSelection(structuredSelection);
-				}
-			}
-		}
-
-		/**
-		 * @see org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor#activate()
-		 */
-		public void activate() {
-			manualSynchronizeAction.setProcess(getProcess());
-			ISelectionProvider selectionProvider = activeEditor instanceof ISelectionProvider ? (ISelectionProvider) activeEditor
-					: activeEditor.getEditorSite().getSelectionProvider();
-			for (Iterator iter = registeredActions.iterator(); iter.hasNext();) {
-				Object action = (Object) iter.next();
-				if (action instanceof IWorkbenchPartAction) {
-					((IWorkbenchPartAction) action)
-							.setActiveWorkbenchPart(activeEditor);
-				}
-				if (action instanceof ISelectionChangedListener) {
-					selectionProvider
-							.addSelectionChangedListener((ISelectionChangedListener) action);
-				}
-			}
-			super.activate();
-
-			// call set Active page explicitly in order to get correct action
-			// bars
-			setActivePage(activeEditor);
-		}
-
-		/**
-		 * @see org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor#deactivate()
-		 */
-		public void deactivate() {
-			super.deactivate();
-
-			ISelectionProvider selectionProvider = activeEditor instanceof ISelectionProvider ? (ISelectionProvider) activeEditor
-					: activeEditor.getEditorSite().getSelectionProvider();
-
-			for (Iterator iter = registeredActions.iterator(); iter.hasNext();) {
-				Object action = (Object) iter.next();
-				if (action instanceof IWorkbenchPartAction) {
-					((IWorkbenchPartAction) action)
-							.setActiveWorkbenchPart(null);
-				}
-				if (action instanceof ISelectionChangedListener) {
-					selectionProvider
-							.removeSelectionChangedListener((ISelectionChangedListener) action);
-				}
-			}
-		}
-
-		/**
-		 * @see org.eclipse.epf.authoring.ui.actions.MethodLibraryActionBarContributor#init(org.eclipse.ui.IActionBars)
-		 */
-		public void init(IActionBars actionBars) {
-			super.init(actionBars);
-			registerActions();
-			contributeToToolBar(actionBars.getToolBarManager());
-		}
-
-		private IActionManager getActionManager() {
-			return ((MethodElementEditor) activeEditor).getActionManager();
-		}
-
-		private AdapterFactory getAdapterFactory() {
-			return ((ProcessEditor) activeEditor).getAdapterFactory();
-		}
-
-		private void setAllDiagramSuppressed(final boolean suppressed) {
-			String title = AuthoringUIResources.processFormEditorSaveDialog_title; 
-			String message = AuthoringUIResources.processFormEditorSaveDialog_message1; 
-
-			if (!AuthoringUIPlugin.getDefault().getMsgDialog()
-					.displayConfirmation(title, message)) {
-				return;
-			}
-
-			BusyIndicator.showWhile(activeEditor.getEditorSite().getShell()
-					.getDisplay(), new Runnable() {
-
-				public void run() {
-					GraphicalDataHelper.setAllDiagramSuppressed(getProcess(),
-							suppressed);
-					doSaveActiveEditor();
-				}
-
-			});
-		}
-		
-		private void newSetAllDiagramSuppressed(final boolean suppressed) {
-			String title = AuthoringUIResources.processFormEditorSaveDialog_title; 
-			String message = AuthoringUIResources.processFormEditorSaveDialog_message1; 
-
-			if (!AuthoringUIPlugin.getDefault().getMsgDialog()
-					.displayConfirmation(title, message)) {
-				return;
-			}
-
-			BusyIndicator.showWhile(activeEditor.getEditorSite().getShell()
-					.getDisplay(), new Runnable() {
-
-				public void run() {
-					DiagramHelper.setAllDiagramSuppressed(getProcess(),
-							suppressed);
-					doSaveActiveEditor();
-				}
-
-			});
-		}
-		
-
-		private boolean promptSaveActiveEditor() {
-			String title = AuthoringUIResources.processFormEditorSaveDialog_title; 
-			String message = AuthoringUIResources.processFormEditorSaveDialog_message2; 
-			if (activeEditor.isDirty()) {
-				return AuthoringUIPlugin.getDefault().getMsgDialog()
-						.displayConfirmation(title, message);
-			}
-			return true;
-		}
-
-		private void saveActiveEditor() {
-			// save the editor
-			//
-			BusyIndicator.showWhile(activeEditor.getEditorSite().getShell()
-					.getDisplay(), new Runnable() {
-
-				public void run() {
-					doSaveActiveEditor();
-				}
-
-			});
-		}
-
-		private void doSaveActiveEditor() {
-			((ProcessEditor) activeEditor).resourcesToSave.add(getProcess()
-					.eResource());
-			activeEditor.doSave(new NullProgressMonitor());
-		}
-
-		protected DeleteAction createDeleteAction() {
-			return new ProcessDeleteAction() {
-				protected void saveCurrentEditor() {
-					if (activeEditor.isDirty()) {
-						BusyIndicator.showWhile(activeEditor.getEditorSite()
-								.getShell().getDisplay(), new Runnable() {
-
-							public void run() {
-								activeEditor.doSave(new NullProgressMonitor());
-							}
-
-						});
-					}
-				}
-				
-				public void run() {	
-					IFormPage activePage = ((ProcessEditor) activeEditor)
-							.getActivePageInstance();
-					if (activePage != null) {
-						String id = activePage.getId();
-						if (id == ProcessEditor.WBS_FORM_ID
-								|| id == ProcessEditor.TA_FORM_ID
-								|| id == ProcessEditor.WPBS_FORM_ID
-								|| id == ProcessEditor.CONSOLIDATED_FORM_ID) {
-							// for all other pages, disable DELETE 
-							super.run();
-						}
-					} 
-				}
-			};
-		}
-
-		protected CutAction createCutAction() {
-			return new CutAction() {
-				public boolean updateSelection(IStructuredSelection selection) {
-					return super.updateSelection(ProcessDeleteAction
-							.filterSelection(selection));
-				}
-			};
-		}
-
-		protected PasteAction createPasteAction() {
-			return new PasteAction() {
-				public boolean updateSelection(IStructuredSelection selection) {
-					return super.updateSelection(ProcessDeleteAction
-							.filterSelection(selection));
-				}
-				
-				/**
-				 * Overrided to use ResourceAwarePasteFromClipboardCommand
-				 * 
-				 * @see org.eclipse.emf.edit.ui.action.PasteAction#createCommand(java.util.Collection)
-				 * @see org.eclipse.epf.library.edit.command.ResourceAwarePasteFromClipboardCommand
-				 */
-				public Command createCommand(Collection selection) {
-				    if (selection.size() == 1)
-				    {
-				    	return new ResourceAwarePasteFromClipboardCommand(domain, selection.iterator().next(), null, CommandParameter.NO_INDEX);
-				    }
-				    else
-				    {
-				      return UnexecutableCommand.INSTANCE;
-				    }
-				}
-			};
-		}
-
-		protected CopyAction createCopyAction() {
-			return new CopyAction() {
-
-				public void run() {
-					if (domain instanceof TraceableAdapterFactoryEditingDomain) {
-						((TraceableAdapterFactoryEditingDomain) domain)
-								.resetCopyMaps();
-					}
-					super.run();
-				}
-
-				public boolean updateSelection(IStructuredSelection selection) {
-					// // disallow copying multiple elements for now until we
-					// find a right way
-					// // to keep the copy to original map
-					// //
-					// if(selection.size() > 1) {
-					// return false;
-					// }
-
-					return super.updateSelection(selection);
-				}
-			};
-		}
-
-		/**
-		 * @see org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor#addGlobalActions(org.eclipse.jface.action.IMenuManager)
-		 */
-		protected void addGlobalActions(IMenuManager menuManager) {
-			super.addGlobalActions(menuManager);
-			menuManager.insertAfter(
-					"additions", new Separator("fixed-additions")); //$NON-NLS-1$ //$NON-NLS-2$
-			// menuManager.insertBefore("fixed-additions",
-			// insertNewPhaseAction);
-		}
-
-		public void contributeToToolBar(IToolBarManager toolBarManager) {
-			super.contributeToToolBar(toolBarManager);
-
-			moveUpAction
-					.setToolTipText(AuthoringUIResources.ProcessEditor_Action_MoveUp); 
-			moveDownAction
-					.setToolTipText(AuthoringUIResources.ProcessEditor_Action_MoveDown); 
-			showInLibraryView
-					.setToolTipText(AuthoringUIResources.ProcessEditor_Action_ShowLinkedElementinLibraryView); 
-			toolBarManager.add(moveUpAction);
-			toolBarManager.add(moveDownAction);
-			toolBarManager.add(showInLibraryView);
-		}				
-
-		/** 
-		 * @see org.eclipse.jface.action.IMenuListener#menuAboutToShow(org.eclipse.jface.action.IMenuManager)
-		 */
-		public void menuAboutToShow(IMenuManager menuManager) {
-			IFormPage activePage = ((ProcessEditor) activeEditor)
-					.getActivePageInstance();
-			if (activePage instanceof ProcessBreakdownStructureFormPage
-					&& ((ProcessBreakdownStructureFormPage) activePage)
-							.basicIsReadOnly()) {
-				menuManager.add(new Separator(
-						IWorkbenchActionConstants.MB_ADDITIONS));								
-				menuManager.add(showInLibraryView);
-				if (bsItemProvider != null
-				// && ((ITreeItemContentProvider)
-				// bsItemProvider).hasChildren(selectedObject)
-				) {
-					menuManager.add(expandAllAction); 
-					menuManager.add(collapseAllAction); 
-				}
-				menuManager.add(new Separator());
-				refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
-				menuManager.add(refreshViewerAction);
-				menuManager.add(showPropertiesViewAction);
-				return;
-			}
-
-			ISelectionProvider selectionProvider = (ISelectionProvider) activeEditor;
-
-			if (selectedActivity == null
-					&& (selectionProvider.getSelection() == null || selectionProvider
-							.getSelection().isEmpty())) {
-				// fake a selection change event with the process selected if no
-				// element is selected yet.
-				//
-				selectionChanged(new SelectionChangedEvent(selectionProvider,
-						new StructuredSelection(getProcess())));
-			}
-			// disable all new action if it's rolled up
-			boolean isRolledUP = bsItemProvider != null
-					&& bsItemProvider.isRolledUp();
-			super.setEnabled(!isRolledUP);
-			super.menuAboutToShow(menuManager);
-
-			// add markers
-			//
-			menuManager.insertAfter("fixed-additions", new Separator("preference")); //$NON-NLS-1$ //$NON-NLS-2$	
-			menuManager.appendToGroup("preference", preferenceAction); //$NON-NLS-1$
-			
-			menuManager.insertAfter("fixed-additions", new Separator("open")); //$NON-NLS-1$ //$NON-NLS-2$
-
-			if (bsItemProvider instanceof BreakdownElementWrapperItemProvider
-					&& TngUtil.unwrap(bsItemProvider) instanceof Activity) {
-				menuManager.insertBefore(IWorkbenchActionConstants.MB_ADDITIONS, contributeAction); 
-				menuManager.insertBefore(IWorkbenchActionConstants.MB_ADDITIONS, replaceAction); 
-				menuManager.insertBefore(
-						IWorkbenchActionConstants.MB_ADDITIONS, localReplacementAndDeepCopy); 
-			}
-
-			if (!isRolledUP) {
-				if (createChildActions != null && !createChildActions.isEmpty()) {
-					menuManager.insertBefore(IWorkbenchActionConstants.MB_ADDITIONS, addAction); 
-				}
-			}
-
-			if (revealAction.isEnabled()) {
-				menuManager.insertBefore("fixed-additions", revealAction); //$NON-NLS-1$
-			}
-			if (revealTaskAction.isEnabled()) {
-				menuManager.insertBefore("fixed-additions", revealTaskAction); //$NON-NLS-1$
-			}
-			if (suppressAction.isEnabled()) {
-				menuManager.insertBefore("fixed-additions", suppressAction); //$NON-NLS-1$
-			}
-			if (suppressTaskAction.isEnabled()) {
-				menuManager.insertBefore("fixed-additions", suppressTaskAction); //$NON-NLS-1$
-			}		
-			if (updateSuppressionFromBaseAction.isEnabled()) {
-				menuManager.insertBefore(
-						"fixed-additions", updateSuppressionFromBaseAction); //$NON-NLS-1$
-			}
-
-			if ((selectedBreakdownElement != null) && (bsItemProvider != null)) {
-				if (moveUpAction.isEnabled()) {
-					menuManager.insertBefore("fixed-additions", moveUpAction); //$NON-NLS-1$
-				}
-				if (moveDownAction.isEnabled()) {
-					menuManager.insertBefore("fixed-additions", moveDownAction); //$NON-NLS-1$
-				}
-			}
-
-			menuManager.appendToGroup("open", showInLibraryView); //$NON-NLS-1$
-
-			if ((selectedActivity != null) && (bsItemProvider != null)) {
-				if (bsItemProvider.isRolledUp()) {
-					rollupAction
-							.setText(AuthoringUIResources.ProcessEditor_Action_RollDown); 
-				} else {
-					rollupAction
-							.setText(AuthoringUIResources.ProcessEditor_Action_RollUp); 
-				}
-				menuManager.appendToGroup("open", rollupAction); //$NON-NLS-1$				
-			}
-
-			if (selectedObject instanceof Activity) {
-				// "Reuse" menu
-				//
-				MenuManager reuseSubMenu = new MenuManager(
-						AuthoringUIResources.ProcessEditor_Action_ApplyPattern); 
-				reuseSubMenu.add(copyActivityAction);
-				reuseSubMenu.add(extendActivityAction);
-				reuseSubMenu.add(deepCopyActivityAction);
-
-				menuManager.insertBefore(IWorkbenchActionConstants.MB_ADDITIONS, reuseSubMenu); 
-			}
-
-			if (autoSynchronize.isEnabled()) {
-				menuManager.insertBefore(IWorkbenchActionConstants.MB_ADDITIONS, autoSynchronize); 
-			}
-			if (manualSynchronizeAction.isEnabled()) {
-				menuManager.insertBefore(IWorkbenchActionConstants.MB_ADDITIONS, manualSynchronizeAction); 
-			}
-
-			if (!(selectedElement instanceof Milestone)) {
-				MenuManager diagramSubMenu = new MenuManager(
-						AuthoringUIResources.ProcessEditor_Action_Diagrams); 
-				if (selectedActivity != null) {
-					if (selectedActivity.getVariabilityBasedOnElement() != null) {
-						menuManager.appendToGroup("open", openBaseActivity); //$NON-NLS-1$
-					}
-
-					diagramSubMenu.add(openWorkflowEditorAction);
-					diagramSubMenu.add(openWorkflowDetailEditorAction);
-					diagramSubMenu.add(openWPDependencyEditorAction);
-					diagramSubMenu.add(suppressDiagramAction);
-					diagramSubMenu.add(assignUserDiagram);
-				}
-				if (selectedActivity == getProcess()) {
-					diagramSubMenu.add(suppressAllDiagrams);
-					diagramSubMenu.add(revealAllDiagrams);
-				}
-				// Enable this code if ActivityDetailDiagramInfoDialog is need.
-//				if(selectedActivity != null){
-//					diagramSubMenu.add(new Separator());
-//					diagramSubMenu.add(activityDetailDiagramInfo);
-//				}
-				menuManager.appendToGroup("open", diagramSubMenu); //$NON-NLS-1$
-				
-				MenuManager newDiagramSubMenu = new MenuManager(
-						"New Diagrams"); //$NON-NLS-1$
-				if(selectedActivity != null){
-					newDiagramSubMenu.add(newActivityDiagramEditor);
-					newDiagramSubMenu.add(newActivityDetailDiagramEditor);
-					newDiagramSubMenu.add(newWPDiagramEditor);
-					newDiagramSubMenu.add(newSuppressDiagramAction);
-					newDiagramSubMenu.add(newAssignUserDiagram);
-
-				}
-				
-				if (selectedActivity == getProcess()) {
-					newDiagramSubMenu.add(newSuppressAllDiagrams);
-					newDiagramSubMenu.add(newRevealAllDiagrams);
-				}
-				menuManager.appendToGroup("open", newDiagramSubMenu); //$NON-NLS-1$
-			}
-
-			if (bsItemProvider != null
-			// this is an expensive check, removed it
-			//
-			// && ((ITreeItemContentProvider)
-			// bsItemProvider).hasChildren(selectedObject)
-			) {
-				menuManager.appendToGroup("open", expandAllAction); //$NON-NLS-1$
-				menuManager.appendToGroup("open", collapseAllAction); //$NON-NLS-1$
-			}
-		}
-
-		/**
-		 * @return
-		 */
-		private Process getProcess() {
-			return ((ProcessComponent) ((MethodElementEditorInput) activeEditor
-					.getEditorInput()).getMethodElement()).getProcess();
-		}
-
-		private Suppression getSuppression() {
-			return ((ProcessEditor) activeEditor).suppression;
-		}
-
-		private void depopulateDynamicMenuItems() {
-			// Remove any menu items for old selection.
-			//
-			if (createChildMenuManager != null) {
-				depopulateManager(createChildMenuManager, createChildActions);
-			}
-			if (createSiblingMenuManager != null) {
-				depopulateManager(createSiblingMenuManager,
-						createSiblingActions);
-			}
-			createChildActions = null;
-			createSiblingActions = null;
-		}
-
-		/**
-		 * Set action state to enabled or disabled
-		 * 
-		 * @param locked
-		 */
-		private void setActionState() {
-			if (locked) {
-				// disable modifying actions
-				pasteAction.setEnabled(false);
-				cutAction.setEnabled(false);
-				deleteAction.setEnabled(false);
-				autoSynchronize.setEnabled(false);
-				manualSynchronizeAction.setEnabled(false);
-				updateSuppressionFromBaseAction.setEnabled(false);
-			} else if (!oldLocked) {
-				// update state of modifying actions
-				//
-				IStructuredSelection selection = (IStructuredSelection) selectionProvider
-						.getSelection();
-				cutAction.setEnabled(cutAction.updateSelection(selection));
-				pasteAction.setEnabled(pasteAction.updateSelection(selection));
-				deleteAction
-						.setEnabled(deleteAction.updateSelection(selection));
-				autoSynchronize.setEnabled(autoSynchronize
-						.updateSelection(selection));
-				manualSynchronizeAction.setEnabled(manualSynchronizeAction
-						.updateSelection(selection));
-				updateSuppressionFromBaseAction
-						.setEnabled(updateSuppressionFromBaseAction
-								.updateSelection(selection));
-			}
-
-			boolean enabled = !locked;
-
-			addAction.setEnabled(enabled);
-			contributeAction.setEnabled(enabled);
-
-			// state of these actions is set in updateActions()
-			//
-			// moveDownAction.setEnabled(enabled);
-			// moveUpAction.setEnabled(enabled);
-			// revealAction.setEnabled(enabled);
-			// suppressAction.setEnabled(enabled);
-			replaceAction.setEnabled(enabled);
-			localReplacementAndDeepCopy.setEnabled(enabled);
-			revealAllDiagrams.setEnabled(enabled);
-			suppressAllDiagrams.setEnabled(enabled);
-			suppressDiagramAction.setEnabled(enabled);
-			copyActivityAction.setEnabled(enabled);
-			extendActivityAction.setEnabled(enabled);
-			deepCopyActivityAction.setEnabled(enabled);
-		}
-
-		protected Collection generateCreateChildActions(Collection descriptors,
-				ISelection selection) {
-			if (locked) {
-				return null;
-			}
-			return super.generateCreateChildActions(descriptors, selection);
-		}
-
-		protected Collection generateCreateSiblingActions(
-				Collection descriptors, ISelection selection) {
-			if (locked) {
-				return null;
-			}
-			return super.generateCreateSiblingActions(descriptors, selection);
-		}
-
-		
-		/**
-		 * @see org.eclipse.epf.authoring.ui.actions.MethodLibraryActionBarContributor#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-		 */
-		public void selectionChanged(SelectionChangedEvent event) {
-			ISelection sel = event.getSelection();
-			if (sel instanceof IStructuredSelection) {
-				IStructuredSelection structuredSelection = (IStructuredSelection) sel;
-				oldLocked = locked;
-				locked = ViewHelper.isLocked(structuredSelection);
-
-				selection = ((IStructuredSelection) sel).toList();
-				if (selection.size() == 1) {
-					selectedObject = ((IStructuredSelection) sel)
-							.getFirstElement();
-					Object obj = TngUtil.unwrap(selectedObject);
-					super.selectionChanged(event);
-					selectedElement = obj;
-					if (obj instanceof Activity) {
-						selectedActivity = (Activity) obj;
-					} else {
-						// depopulateDynamicMenuItems();
-						// bsItemProvider = null;
-						selectedActivity = null;
-					}
-					AdapterFactoryEditingDomain domain = (AdapterFactoryEditingDomain) ((IEditingDomainProvider) activeEditorPart)
-							.getEditingDomain();
-					Object providerObj = domain.getAdapterFactory().adapt(
-							selectedObject, ITreeItemContentProvider.class);
-					if (providerObj instanceof IBSItemProvider)
-						bsItemProvider = (IBSItemProvider) providerObj;
-
-					if (obj instanceof BreakdownElement) {
-						selectedBreakdownElement = (BreakdownElement) obj;
-					} else {
-						selectedBreakdownElement = null;
-					}
-				} else {
-					depopulateDynamicMenuItems();
-					bsItemProvider = null;
-					selectedElement = null;
-					selectedActivity = null;
-					selectedBreakdownElement = null;
-					selectedObject = null;
-				}
-
-				updateActions();
-
-			} else {
-				depopulateDynamicMenuItems();
-				bsItemProvider = null;
-				selectedElement = null;
-				selectedActivity = null;
-				selectedBreakdownElement = null;
-			}
-
-			// // test code
-			// //
-			// if(selectedActivity != null) {
-			// for (Iterator iter =
-			// selectedActivity.eClass().getEAllAttributes().iterator();
-			// iter.hasNext();) {
-			// EAttribute attrib = (EAttribute) iter.next();
-			// if(String.class.isAssignableFrom(attrib.getEAttributeType().getInstanceClass()))
-			// {
-			// List values =
-			// ConfigurationHelper.getStringAttribute(selectedActivity, attrib);
-			// System.out.println();
-			// System.out.println(attrib.getName() + ": " + values);
-			// }
-			// }
-			// }
-		}
-
-		/**
-		 * Updates actions including enabling/disabling them based on selection
-		 */
-		private void updateActions() {
-			showInLibraryView
-					.setEnabled(selectedBreakdownElement instanceof Descriptor
-							&& ProcessUtil
-									.getAssociatedElement((Descriptor) selectedBreakdownElement) != null);
-
-			if (!locked && selection != null && !selection.isEmpty()) {
-				if (selection.size() == 1) {
-					if (getSuppression().canReveal(selection)) {
-						revealAction.setEnabled(true);
-						suppressAction.setEnabled(false);
-					} else if (getSuppression().canSuppress(selection)) {
-						suppressAction.setEnabled(true);
-						revealAction.setEnabled(false);
-					} else {
-						revealAction.setEnabled(false);
-						suppressAction.setEnabled(false);
-					}
-				} else {
-					revealAction.setEnabled(getSuppression().canReveal(
-							selection));
-					suppressAction.setEnabled(getSuppression().canSuppress(
-							selection));
-				}
-				
-				// Action Enable/Disable for Suppress Task/Reveal Task context menu
-				boolean show = true;
-				for (int i = 0; i < selection.size(); i++) {
-					if (getAdapterFactory() == TngAdapterFactory.INSTANCE
-							.getWBS_ComposedAdapterFactory()) {
-						if (!(selection.get(i) instanceof Activity || selection
-								.get(i) instanceof ActivityWrapperItemProvider)) {
-							show = false;
-							break;
-						}
-					} else
-						show = false;
-				}
-				if (show) {
-					List taskDescriptors = ProcessUtil.getTaskDescriptors(selection);
-					suppressTaskAction.setEnabled(getSuppression().canSuppress(taskDescriptors));
-					revealTaskAction.setEnabled(getSuppression().canReveal(taskDescriptors));
-				}
-				else {
-					suppressTaskAction.setEnabled(false);
-					revealTaskAction.setEnabled(false);
-				}
-
-				// boolean hasInherited = false;
-				// for (Iterator iter = selection.iterator(); iter.hasNext();) {
-				// Object item = iter.next();
-				// if (item instanceof BreakdownElementWrapperItemProvider
-				// && ((BreakdownElementWrapperItemProvider) item)
-				// .isReadOnly()) {
-				// hasInherited = true;
-				// break;
-				// }
-				// }
-				// updateSuppressionFromBaseAction.setEnabled(hasInherited);
-			} else {
-				revealAction.setEnabled(false);
-				suppressAction.setEnabled(false);
-				suppressTaskAction.setEnabled(false);
-				revealTaskAction.setEnabled(false);
-			}
-
-			if (!locked) {
-				refreshMoveButtonActions();
-			} else {
-				moveUpAction.setEnabled(false);
-				moveDownAction.setEnabled(false);
-			}
-
-			// Set Activity Detail Diagram Action enable state.
-			if (selectedObject instanceof Activity
-					|| selectedObject instanceof ActivityWrapperItemProvider)
-				setActionStateForADD();
-
-			// change action state for locked plugin
-			setActionState();
-		}
-
-		public void setActivePage(IEditorPart part) {
-			if (this.activeEditor != null) {
-				int page = ((ProcessEditor) this.activeEditor).getActivePage();
-				IActionBars actionBars = this.activeEditor.getEditorSite()
-						.getActionBars();
-
-				if (page == 0) {
-					actionBars.setGlobalActionHandler(ActionFactory.DELETE
-							.getId(), null);
-					actionBars.setGlobalActionHandler(
-							ActionFactory.CUT.getId(), null);
-					actionBars.setGlobalActionHandler(ActionFactory.COPY
-							.getId(), null);
-					actionBars.setGlobalActionHandler(ActionFactory.PASTE
-							.getId(), null);
-					actionBars.setGlobalActionHandler(ActionFactory.UNDO
-							.getId(), null);
-					actionBars.setGlobalActionHandler(ActionFactory.REDO
-							.getId(), null);
-				} else {
-					actionBars.setGlobalActionHandler(ActionFactory.DELETE
-							.getId(), deleteAction);
-					actionBars.setGlobalActionHandler(
-							ActionFactory.CUT.getId(), cutAction);
-					actionBars.setGlobalActionHandler(ActionFactory.COPY
-							.getId(), copyAction);
-					actionBars.setGlobalActionHandler(ActionFactory.PASTE
-							.getId(), pasteAction);
-					actionBars.setGlobalActionHandler(ActionFactory.UNDO
-							.getId(), undoAction);
-					actionBars.setGlobalActionHandler(ActionFactory.REDO
-							.getId(), redoAction);
-				}
-				actionBars.updateActionBars();
-			}
-		}
-
-		protected void doRefresh() {
-			// update IDs
-			//
-			AdapterFactory adapterFactory = getAdapterFactory();
-			if (adapterFactory == TngAdapterFactory.INSTANCE
-					.getWBS_ComposedAdapterFactory()
-					|| adapterFactory == TngAdapterFactory.INSTANCE
-							.getProcessComposedAdapterFactory()) {
-				Process proc = getProcess();
-				ProcessUtil.updateIDs(adapterFactory, proc);
-				ProcessUtil.refreshPredeccessorLists(adapterFactory, proc);
-			}
-
-			super.doRefresh();
-		}
-
-		private void refreshMoveButtonActions() {
-			if ((selectedBreakdownElement != null) && (bsItemProvider != null)) {
-				moveUpAction.setEnabled(!bsItemProvider.isFirstElement(selectedBreakdownElement));
-				moveDownAction.setEnabled(!bsItemProvider.isLastElement(selectedBreakdownElement));
-			}
-		}
-
-		/*
-		 * Set Action state for Activity Detail Diagram in Context Menu on
-		 * selection of Activity. If an Activity consist atleast one
-		 * taskdescriptor and its primary performer in current configuration,
-		 * then state is enabled else state is disabled in context menu (process
-		 * editor).
-		 */
-		private void setActionStateForADD() {
-
-			// set ADD Action state false
-			openWorkflowDetailEditorAction.setEnabled(false);
-
-			// set AD Action state true always
-			openWorkflowEditorAction.setEnabled(true);
-
-			// set WPD Diagram Menu Action state tru always
-			openWPDependencyEditorAction.setEnabled(true);
-
-			if (selectedObject != null) {
-
-				if (getSuppression().isSuppressed(selectedObject)) {
-					openWorkflowDetailEditorAction.setEnabled(false);
-					openWorkflowEditorAction.setEnabled(false);
-					openWPDependencyEditorAction.setEnabled(false);
-					return;
-				}
-
-				Activity activity = null;
-				List list = new ArrayList();
-
-				if (selectedObject instanceof Activity) {
-					activity = selectedActivity;
-				} else if (selectedObject instanceof ActivityWrapperItemProvider) {
-					activity = (Activity) ((ActivityWrapperItemProvider) selectedObject)
-							.getValue();
-				}
-				if (activity == null)
-					return;
-
-				while (!activity.getVariabilityType().equals(
-						VariabilityType.NA_LITERAL)) {
-
-					VariabilityElement ve = activity
-							.getVariabilityBasedOnElement();
-					// If Activity is set to local contribution,
-					// need to get breakdown elements of local contributed
-					// activity + base activity. And base activity breakdown
-					// elements
-					// are collected after while loop ends)
-					// if (VariabilityType.CONTRIBUTES_LITERAL.equals(activity
-					// .getVariabilityType())) {
-					// list.addAll(activity.getBreakdownElements());
-					// }
-					list.addAll(activity.getBreakdownElements());
-
-					if ((ve != null) && (ve instanceof Activity)) {
-						activity = (Activity) ve;
-					} else {
-						break;
-					}
-				}
-
-				// For AD diagram menu option, if Base Activity donot have any
-				// AD diagram, donot show AD diagram option in context menu for
-				// readonly activity.
-				Diagram diagram = GraphicalDataManager.getInstance()
-						.getUMADiagram(activity,
-								GraphicalDataHelper.ACTIVITY_DIAGRAM, false);
-				if (diagram == null
-						&& selectedObject instanceof ActivityWrapperItemProvider) {
-					openWorkflowEditorAction.setEnabled(false);
-				}
-
-				// For WPD diagram menu option, if Base Activity donot have any
-				// WPD diagram, donot show WPD diagram option in context menu
-				// for readonly activity.
-				diagram = GraphicalDataManager.getInstance().getUMADiagram(
-						activity,
-						GraphicalDataHelper.WORK_PRODUCT_DEPENDENCY_DIAGRAM,
-						false);
-				if (diagram == null
-						&& selectedObject instanceof ActivityWrapperItemProvider) {
-					openWPDependencyEditorAction.setEnabled(false);
-				}
-
-				// Collect the breakdown elements to verifty taskdescriptors are
-				// not.
-				list.addAll(activity.getBreakdownElements());
-
-				// For ADD diagram menu option, if Base Activity donot have any
-				// ADD diagram, donot show ADD diagram option in context menu
-				// for
-				// readonly activity.
-				diagram = GraphicalDataManager.getInstance().getUMADiagram(
-						activity, GraphicalDataHelper.ACTIVITY_DETAIL_DIAGRAM,
-						false);
-				if (diagram == null
-						&& selectedObject instanceof ActivityWrapperItemProvider) {
-					openWorkflowDetailEditorAction.setEnabled(false);
-				} else {
-					// Iterate through the List, to find taskdescriptor and has
-					// primary role within current configuration.
-					// then enable the action.
-					for (Iterator iterator = list.iterator(); iterator
-							.hasNext();) {
-						Object obj = iterator.next();
-						if (obj instanceof TaskDescriptor) {
-							if (!getSuppression().isSuppressed(obj)) {
-								Object e = ((TaskDescriptor) obj)
-										.getPerformedPrimarilyBy();
-								AdapterFactoryEditingDomain domain = (AdapterFactoryEditingDomain) ((IEditingDomainProvider) activeEditorPart)
-										.getEditingDomain();
-								AdapterFactory factory = domain
-										.getAdapterFactory();
-								if (factory instanceof ExposedAdapterFactory) {
-									IFilter filter = ((ExposedAdapterFactory) factory)
-											.getFilter();
-									if (filter != null
-											&& filter.accept(e)
-											&& !getSuppression()
-													.isSuppressed(e)) {
-										openWorkflowDetailEditorAction
-												.setEnabled(true);
-										break;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private class ProcessEditorDropAdapter extends
-			EditingDomainTableTreeViewerDropAdapter {
-
-		/**
-		 * @param domain
-		 * @param viewer
-		 */
-		public ProcessEditorDropAdapter(EditingDomain domain, Viewer viewer) {
-			super(domain, viewer);
-		}
-
-		/** 
-		 * @see org.eclipse.epf.authoring.ui.dnd.EditingDomainTableTreeViewerDropAdapter#getDropTarget(org.eclipse.swt.widgets.Widget)
-		 */
-		protected Object getDropTarget(Widget item) {
-			Object target = super.getDropTarget(item);
-			if (target == null && selectedProcessComponent != null) {
-				target = selectedProcessComponent.getProcess();
-			}
-			return target;
-		}
-
-		/**
-		 * @see org.eclipse.epf.authoring.ui.dnd.EditingDomainTableTreeViewerDropAdapter#drop(org.eclipse.swt.dnd.DropTargetEvent)
-		 */
-		public void drop(DropTargetEvent event) {
-			if (currentViewer instanceof IActionTypeProvider) {
-				((IActionTypeProvider) currentViewer).setInputData(new Point(
-						event.x, event.y));
-			}
-			super.drop(event);
-		}
-	}
-
-	private ComposedAdapterFactory adapterFactory;
-
-	private AdapterFactoryEditingDomain editingDomain;
-
-	private Viewer currentViewer;
-
-	private ISelectionChangedListener selectionChangedListener;
-
-	private Collection selectionChangedListeners = new ArrayList();
-
-	private ISelection viewSelection;
-
-	private ProcessComponent selectedProcessComponent;
-
-	private Process selectedProcess;
-
-	private Adapter processComponentListener = new AdapterImpl() {
-		/**
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification msg) {
-			switch (msg.getFeatureID(ProcessComponent.class)) {
-			case UmaPackage.PROCESS_COMPONENT__NAME:
-				String name = msg.getNewStringValue();
-				if (name == null)
-					name = ""; //$NON-NLS-1$
-				setPartName(name);
-
-				if (pages != null) {
-					for (Iterator iter = pages.iterator(); iter.hasNext();) {
-						Object page = iter.next();
-						if (page instanceof ProcessDescription) {
-							((ProcessDescription) page)
-									.refreshElementName(name);
-						}
-
-					}
-				}
-
-				break;
-			}
-		}
-	};
-
-	private AdapterFactoryContentProvider propContentProvider;
-
-	private MethodConfiguration currentConfig;
-
-	private ILibraryChangeListener libraryListener = new ILibraryChangeListener() {
-
-		public void libraryChanged(int option, Collection collection) {
-			switch (option) {
-			// case ILibraryChangeListener.OPTION_LOADED:
-			// // close all open diagram editors
-			// //
-			// IEditorReference[] editorRefs =
-			// getSite().getPage().getEditorReferences();
-			// for (int i = 0; i < editorRefs.length; i++) {
-			// IEditorPart editorPart = editorRefs[i].getEditor(false);
-			// if(editorPart instanceof GraphicalWorkflowEditor
-			// || editorPart instanceof ProcessFormEditor) {
-			// getSite().getPage().closeEditor(editorPart, true);
-			// }
-			// }
-			// getSite().getPage().closeEditor(ProcessFormEditor.this, true);
-			case ILibraryChangeListener.OPTION_CHANGED: {
-				if (collection != null && collection.contains(currentConfig)) {
-					MethodConfiguration config = ProcessAuthoringConfigurator.INSTANCE
-							.getMethodConfiguration();
-					try {
-						ProcessAuthoringConfigurator.INSTANCE
-								.setMethodConfiguration(currentConfig);
-						refreshAll();
-					} finally {
-						ProcessAuthoringConfigurator.INSTANCE
-								.setMethodConfiguration(config);
-					}
-				}
-				break;
-			}
-				// handled by libSvcListener
-				// case ILibraryChangeListener.OPTION_CONFIGURATION_SELECTED: {
-				// configChanged();
-				// break;
-				// }
-
-			}
-
-		}
-
-	};
-
-	private ILibraryServiceListener libSvcListener = new ILibraryServiceListener() {
-
-		public void configurationSet(MethodConfiguration config) {
-			configChanged();
-		}
-
-		public void libraryClosed(MethodLibrary library) {
-		}
-
-		public void libraryCreated(MethodLibrary library) {
-		}
-
-		public void libraryOpened(MethodLibrary library) {
-		}
-
-		public void libraryReopened(MethodLibrary library) {
-		}
-
-		public void librarySet(MethodLibrary library) {
-		}
-
-	};
-
-	private ProcessBreakdownStructureFormPage WBSTab;
-
-	private ProcessBreakdownStructureFormPage OBSTab;
-
-	private ProcessBreakdownStructureFormPage PBSTab;
-
-	private ProcessBreakdownStructureFormPage procTab;
-
-	private ProcessBreakdownStructureFormPage[] extensionTabs = null;
-
-	private ProcessBreakdownStructureFormPage[] bsPages;
-
-	private EPFPropertySheetPage propertySheetPage;
-
-	public Collection resourcesToSave = new ArrayList();
-
-	// private boolean firstExpanded = false;
-
-	/**
-	 * a listener that is interested in part activation events.
-	 */
-	private IPartListener partActivationListener = new IPartListener() {
-
-		public void partActivated(IWorkbenchPart part) {
-			if (part instanceof PropertySheet) {
-				removePropertiesDropDownMenu(part);
-			}
-		}
-
-		public void partBroughtToTop(IWorkbenchPart part) {
-			// if(!firstExpanded) {
-			// synchronized(ProcessFormEditor.this) {
-			// if(firstExpanded) {
-			// ((AbstractTreeViewer) WBSTab.getViewer()).expandAll();
-			// ((AbstractTreeViewer) OBSTab.getViewer()).expandAll();
-			// ((AbstractTreeViewer) PBSTab.getViewer()).expandAll();
-			// firstExpanded = true;
-			// }
-			// }
-			// }
-		}
-
-		public void partClosed(IWorkbenchPart part) {
-			if (part instanceof PropertySheet) {
-				propertySheetPage = null;
-			}
-		}
-
-		public void partDeactivated(IWorkbenchPart part) {
-		}
-
-		public void partOpened(IWorkbenchPart part) {
-			if (part instanceof PropertySheet) {
-				removePropertiesDropDownMenu(part);
-			}
-		}
-	};
-
-	private IPropertyChangeListener prefStoreListener;
-
-	// private ProcessConfigurator configurator;
-
-	private Suppression suppression;
-
-	private boolean synchronizingSelection;
-
-	private boolean inputChanged;
-
-	public static final IAdapterFactoryProvider adapterFactoryProvider = new IAdapterFactoryProvider() {
-
-		public AdapterFactory getCBSAdapterFactory() {
-			return TngAdapterFactory.INSTANCE.getProcessComposedAdapterFactory();
-		}
-
-		public AdapterFactory getTBSAdapterFactory() {
-			return TngAdapterFactory.INSTANCE.getOBS_ComposedAdapterFactory();
-		}
-
-		public AdapterFactory getWBSAdapterFactory() {
-			return TngAdapterFactory.INSTANCE.getWBS_ComposedAdapterFactory();
-		}
-
-		public AdapterFactory getWPBSAdapterFactory() {
-			return TngAdapterFactory.INSTANCE.getPBS_ComposedAdapterFactory();
-		}
-	};
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.editors.MethodElementEditor#isValidateResourcesBeforeSaveRequired()
-	 */
-	protected boolean isValidateResourcesBeforeSaveRequired() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.editors.MethodElementEditor#createValidateResourceAction()
-	 */
-	protected LibraryValidateAction createValidateResourceAction() {
-		LibraryValidateAction validateAction = super.createValidateResourceAction();
-		validateAction.putContextData(LibraryEValidator.CTX_ADAPTER_FACTORY_PROVIDER,
-				adapterFactoryProvider);
-		return validateAction;
-	}
-	
-	protected void inputChanged(Object newInput) {
-		inputChanged = false;
-		if (!(newInput instanceof MethodElementEditorInput))
-			return;
-		MethodElementEditorInput methodElementInput = (MethodElementEditorInput) newInput;
-
-		Object obj = methodElementInput.getMethodElement();
-		if (obj instanceof ProcessComponent) {
-			selectedProcessComponent = (ProcessComponent) obj;
-			selectedProcess = (Process) ProcessUtil
-					.getTopBreakdownElement(selectedProcessComponent);
-			suppression = Suppression.getSuppression(selectedProcess);
-
-			// for (Iterator iter = pages.iterator(); iter.hasNext();) {
-			// Object page = iter.next();
-			// if(page instanceof ProcessBreakdownStructureFormPage) {
-			// ((ProcessBreakdownStructureFormPage)page).setProcess(proc);
-			// }
-			// }
-
-			WBSTab.setProcess(selectedProcess);
-			OBSTab.setProcess(selectedProcess);
-			PBSTab.setProcess(selectedProcess);
-			procTab.setProcess(selectedProcess);
-			if (extensionTabs != null) {
-				for (int i = 0; i < extensionTabs.length; i++) {
-					if (extensionTabs[i] != null) {
-						extensionTabs[i].setProcess(selectedProcess);
-					}
-				}
-			}
-
-		}
-	}
-
-	// private String getTitlePrefix() {
-	// IEditorInput input = getEditorInput();
-	// if (input instanceof MethodElementEditorInput) {
-	// Object obj = ((MethodElementEditorInput) input).getMethodElement();
-	// if (obj instanceof ProcessComponent) {
-	// ProcessComponent pc = (ProcessComponent) obj;
-	// Process proc = pc.getProcess();
-	// if (proc instanceof CapabilityPattern) {
-	// return LibraryUIText.TEXT_CAPABILITY_PATTERN;
-	// } else if (proc instanceof DeliveryProcess) {
-	// return LibraryUIText.TEXT_DELIVERY_PROCESS;
-	// } else if (proc instanceof ProcessContribution) {
-	// return LibraryUIText.TEXT_PROCESS_CONTRIBUTION;
-	// }
-	// }
-	// }
-	// return AuthoringUIResources
-	// .getString("AuthoringUI.ProcessEditor.Title"); //$NON-NLS-1$
-	// }
-
-	private Image getProcTitleImage() {
-		IEditorInput input = getEditorInput();
-		if (input instanceof MethodElementEditorInput) {
-			Object obj = ((MethodElementEditorInput) input).getMethodElement();
-			if (obj instanceof ProcessComponent) {
-				ProcessComponent pc = (ProcessComponent) obj;
-				Process proc = pc.getProcess();
-				if (proc instanceof CapabilityPattern) {
-					return LibraryUIImages.IMG_CAPABILITY_PATTERN;
-				} else if (proc instanceof DeliveryProcess) {
-					return LibraryUIImages.IMG_DELIVERY_PROCESS;
-				}
-			}
-		}
-		return LibraryUIImages.IMG_PROCESS;
-	}
-
-	/**
-	 * Remove Properties view drop down menu
-	 * 
-	 * @param part
-	 */
-	private void removePropertiesDropDownMenu(IWorkbenchPart part) {
-		if (part instanceof PropertySheet) {
-			IViewSite view = ((PropertySheet) part).getViewSite();
-
-			IMenuManager menuMgr = view.getActionBars().getMenuManager();
-			// IContributionItem[] items = menuMgr.getItems();
-			// for (int i=0; i < items.length; i++)
-			// {
-			// System.out.println("Id =" + i + " " + items[i].getId() + "$");
-			// }
-			menuMgr.removeAll();
-			menuMgr.updateAll(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormEditor#init(org.eclipse.ui.IEditorSite,
-	 *      org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input)
-			throws PartInitException {
-		super.init(site, input);
-
-		// TODO: need revisit
-		// site.setSelectionProvider(new FormEditorSelectionProvider(this));
-		// actionManager = getActionManager();
-
-		List factories = new ArrayList();
-		factories.add(new ResourceItemProviderAdapterFactory());
-		factories.add(new ReflectiveItemProviderAdapterFactory());
-
-		adapterFactory = new ComposedAdapterFactory(factories);
-
-		// Create the command stack that will notify this editor as commands are
-		// executed.
-		//
-		CommandStack commandStack = actionMgr.getCommandStack(); // new
-		// BasicCommandStack();
-
-		// Add a listener to set the most recent command's affected objects to
-		// be the selection of the viewer with focus.
-		//
-		commandStack.addCommandStackListener(new CommandStackListener() {
-			public void commandStackChanged(final EventObject event) {
-				boolean run = false;
-				if (event instanceof CommandStackChangedEvent) {
-					switch (((CommandStackChangedEvent) event).getType()) {
-					case CommandStackChangedEvent.EXECUTED:
-					case CommandStackChangedEvent.UNDO:
-						run = true;
-						break;
-					}
-				} else {
-					run = true;
-				}
-				if (run) {
-					Display.getCurrent().asyncExec(new Runnable() {
-						public void run() {
-							firePropertyChange(IEditorPart.PROP_DIRTY);
-
-							// Try to select the affected objects.
-							//
-							Command mostRecentCommand = ((CommandStack) event
-									.getSource()).getMostRecentCommand();
-							if (mostRecentCommand != null) {
-								if (mostRecentCommand instanceof CreateChildCommand
-										&& currentViewer instanceof ProcessViewer) {
-									Object[] arr = mostRecentCommand
-											.getAffectedObjects().toArray();
-									if (arr.length == 1) {
-										ProcessViewer viewer = (ProcessViewer) currentViewer;
-										viewer.editElement(arr[0], 0);
-									}
-								} else {
-									if (!(TngUtil.unwrap(mostRecentCommand) instanceof SetCommand)) {
-										setSelectionToViewer(mostRecentCommand
-												.getAffectedObjects());
-									}
-
-								}
-							}
-							// if (propertySheetPage != null) {
-							// propertySheetPage.refresh();
-							// }
-						}
-					});
-				}
-			}
-		});
-
-		// Create the editing domain with a special command stack.
-		editingDomain = new TraceableAdapterFactoryEditingDomain(
-				adapterFactory, commandStack);
-
-		LibraryService.getInstance().addListener(libSvcListener);
-		ILibraryManager manager = (ILibraryManager) LibraryService
-				.getInstance().getCurrentLibraryManager();
-		if (manager != null) {
-			manager.addListener(libraryListener);
-			manager.startListeningTo(actionMgr.getCommandStack());
-
-			// TODO: need to revisit this code
-			if (!addAdapterFactoryListeners) {
-				addAdapterFactoryListeners = true;
-				manager.startListeningTo(TngAdapterFactory.INSTANCE
-						.getWBS_ComposedAdapterFactory());
-				manager.startListeningTo(TngAdapterFactory.INSTANCE
-						.getOBS_ComposedAdapterFactory());
-				manager.startListeningTo(TngAdapterFactory.INSTANCE
-						.getPBS_ComposedAdapterFactory());
-			}
-		}
-
-		setPartName(input.getName());
-		setTitleImage(getProcTitleImage());
-
-		// get method element object from Editor input
-		MethodElementEditorInput methodElementInput = (MethodElementEditorInput) input;
-		elementObj = methodElementInput.getMethodElement();
-
-		if (elementObj instanceof ProcessComponent) {
-			selectedProcessComponent = ((ProcessComponent) elementObj);
-			selectedProcess = selectedProcessComponent.getProcess();
-		}
-
-		if (selectedProcessComponent != null) {
-			selectedProcessComponent.eAdapters().add(processComponentListener);
-		}
-
-		// listen to resource change to update dirty flag
-		//
-		// addResourceChangedListener();
-
-		// add part listener to listen to propertySheet close event
-		getSite().getWorkbenchWindow().getPartService().addPartListener(
-				partActivationListener);
-
-		// inputChanged(input);
-
-		// listen to the change of column list in preference store
-		//
-		if (prefStoreListener == null) {
-			prefStoreListener = new IPropertyChangeListener() {
-
-				public void propertyChange(PropertyChangeEvent event) {
-					ProcessBreakdownStructureFormPage page = null;
-					if (event.getProperty().equals(
-							ApplicationPreferenceConstants.PREF_WBS_COLUMNS)) {
-						page = WBSTab;
-					} else if (event.getProperty().equals(
-							ApplicationPreferenceConstants.PREF_TBS_COLUMNS)) {
-						page = OBSTab;
-					} else if (event.getProperty().equals(
-							ApplicationPreferenceConstants.PREF_WPBS_COLUMNS)) {
-						page = PBSTab;
-					}
-					if (page != null) {
-						ColumnDescriptor[] cols = toColumnDescriptors(getPreferenceStore().getString(
-										event.getProperty()));
-						page.updateColumns(cols);
-						if (page == WBSTab || page == OBSTab) {
-							// update consolidated view as well
-							//
-							// get WBS columns
-							List list = toColumnDescriptorList(getPreferenceStore()
-									.getString(ApplicationPreferenceConstants.PREF_WBS_COLUMNS));
-
-							// get TBS columns 
-							ColumnDescriptor[] teamColumnDescriptors = toColumnDescriptors(getPreferenceStore()
-									.getString(ApplicationPreferenceConstants.PREF_TBS_COLUMNS));
-
-							// if TBS columns has TEAM column then add to consolidated view
-							for (int i = 0; i < teamColumnDescriptors.length; i++) {
-								ColumnDescriptor colDesc = teamColumnDescriptors[i];
-								if (colDesc == COL_DESC_TEAM) {
-									list.add(colDesc);
-									break;
-								}
-							}
-							
-							ColumnDescriptor[] columns = new ColumnDescriptor[list.size()];
-							list.toArray(columns);
-							procTab.updateColumns(columns);
-						}
-					}
-				}
-
-			};
-		}
-
-		getPreferenceStore()
-				.addPropertyChangeListener(prefStoreListener);
-
-	}
-
-	/**
-	 * This sets the selection into whichever viewer is active. 
-	 * 
-	 */
-	public void setSelectionToViewer(Collection collection) {
-		// System.out.println(getClass().getName() + ".setSelectionToViewer:
-		// selection="+collection);
-		final Collection theSelection = collection;
-		// Make sure it's okay.
-		//
-		if (theSelection != null && !theSelection.isEmpty()) {
-			// I don't know if this should be run this deferred
-			// because we might have to give the editor a chance to process the
-			// viewer update events
-			// and hence to update the views first.
-			//
-			//
-			Runnable runnable = new Runnable() {
-				public void run() {
-					// Try to select the items in the current content viewer of
-					// the editor.
-					//
-					if (currentViewer != null) {
-						currentViewer.setSelection(new StructuredSelection(
-								theSelection.toArray()), true);
-
-					}
-				}
-			};
-			runnable.run();
-		}
-	}
-
-	public EditingDomainActionBarContributor getActionBarContributor() {
-		return (EditingDomainActionBarContributor) getEditorSite()
-				.getActionBarContributor();
-	}
-
-	public void dispose() {
-		getPreferenceStore()
-				.removePropertyChangeListener(prefStoreListener);
-
-		// ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
-		//
-		// getSite().getPage().removePartListener(partListener);
-
-		adapterFactory.dispose();
-
-		if (getActionBarContributor().getActiveEditor() == this) {
-			getActionBarContributor().setActiveEditor(null);
-		}
-
-		if (propertySheetPage != null) {
-			propertySheetPage.dispose();
-		}
-
-		ILibraryManager manager = LibraryService.getInstance()
-				.getCurrentLibraryManager();
-		if (manager != null) {
-			manager.removeListener(libraryListener);
-			manager.stopListeningTo(editingDomain.getCommandStack());
-		}
-		LibraryService.getInstance().removeListener(libSvcListener);
-
-		if (selectedProcessComponent != null) {
-			selectedProcessComponent.eAdapters().remove(
-					processComponentListener);
-		}
-
-		// removeResourceChangedListener();
-
-		getSite().getWorkbenchWindow().getPartService().removePartListener(
-				partActivationListener);
-
-		boolean saveNeeded = isDirty();
-
-		super.dispose();
-
-		// call this to set modified flag of suppression to false
-		//
-		suppression.saveIsDone();
-
-		if (saveNeeded) {
-			// user discarded all the changes, save the resources after changes
-			// are undone.
-			// TODO: reload the process component resource instead since it is
-			// not shared.
-			//
-			// for (Iterator iter = resources.iterator(); iter.hasNext();) {
-			// Resource resource = (Resource) iter.next();
-			// saveResource(resource);
-			// }
-		}
-	}
-
-	private void addDescriptionPage() throws PartInitException {
-		if (selectedProcess instanceof DeliveryProcess) {
-			// Delivery Process
-			addPage(0, new DeliveryProcessDescription(this));
-		} else {
-			// Capability Pattern
-			// Process Contribution
-			addPage(0, new ProcessDescription(this));
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormEditor#addPages()
-	 */
-	protected void addPages() {
-		try {
-			addDescriptionPage();
-
-			AdapterFactory adapterFactory;
-
-			// create DND transfer objects
-			// int dndOperations = DND.DROP_COPY | DND.DROP_LINK;
-			// Transfer[] transfers = new Transfer[]
-			// {LocalTransfer.getInstance() };
-
-			// preference is managed by library plugin,
-			// since this preferences is also used for browsing and publishing
-			// Jinhua Xi 08/21/2006
-			// IPreferenceStore store = AuthoringUIPlugin.getDefault()
-			// .getPreferenceStore();
-			PreferenceUtil.validatePreferences();
-			IPreferenceStore store = getPreferenceStore();
-			
-			List pages = new ArrayList();
-
-			// WBS tab
-			WBSTab = new ProcessBreakdownStructureFormPage(this, WBS_FORM_ID,
-					AuthoringUIResources.ProcessEditor_WorkBreakdownStructure); //$NON-NLS-1$ 
-			ColumnDescriptor[] columnDescriptors = toColumnDescriptors(store
-					.getString(ApplicationPreferenceConstants.PREF_WBS_COLUMNS));
-			adapterFactory = TngAdapterFactory.INSTANCE
-					.getWBS_ComposedAdapterFactory();
-			currentConfig = LibraryService.getInstance()
-					.getCurrentMethodConfiguration();
-			ProcessAuthoringConfigurator.INSTANCE
-					.setMethodConfiguration(currentConfig);
-			if (adapterFactory instanceof ConfigurableComposedAdapterFactory) {
-				((ConfigurableComposedAdapterFactory) adapterFactory)
-						.setFilter(ProcessAuthoringConfigurator.INSTANCE);
-			}
-			WBSTab.setAdapterFactory(adapterFactory);
-			WBSTab.setColumnDescriptors(columnDescriptors);
-			int id = addPage(WBSTab.createControl(getContainer()));
-			setPageText(id, WBSTab.getTitle());
-			WBSTab.setTabIndex(id);
-			StructuredViewer viewer = (StructuredViewer) WBSTab.getViewer();
-			createContextMenuFor(viewer);
-			pages.add(WBSTab);
-			// viewer.addDropSupport(dndOperations, transfers, new
-			// ProcessEditorDropAdapter(editingDomain, viewer));
-			// viewer.addDoubleClickListener(new IDoubleClickListener()
-			// {
-			// public void doubleClick(DoubleClickEvent event)
-			// {
-			// UIActionDispatcher.getInstance().handleDoubleClickEvent(event);
-			// // System.out.println("double clicked ...");
-			// //
-			// // StructuredSelection selection = (StructuredSelection)
-			// event.getSelection();
-			// // System.out.println("sel"+selection.getFirstElement());
-			// //
-			// ProductEditorView.getView().getProductViewer().setInput(selection.getFirstElement());
-			// }
-			// });
-			// addPage(WBSTab);
-
-			// OBS tab
-			OBSTab = new ProcessBreakdownStructureFormPage(this, TA_FORM_ID,
-					AuthoringUIResources.ProcessEditor_TeamAllocation); //$NON-NLS-1$ 
-			columnDescriptors = toColumnDescriptors(store
-					.getString(ApplicationPreferenceConstants.PREF_TBS_COLUMNS));
-			// setColumnIndexToNameMap(TngAdapterFactory.INSTANCE.getOBS_AdapterFactories(),
-			// columnDescriptors);
-			adapterFactory = TngAdapterFactory.INSTANCE
-					.getOBS_ComposedAdapterFactory();
-			if (adapterFactory instanceof ConfigurableComposedAdapterFactory) {
-				((ConfigurableComposedAdapterFactory) adapterFactory)
-						.setFilter(ProcessAuthoringConfigurator.INSTANCE);
-			}
-			OBSTab.setAdapterFactory(adapterFactory);
-			OBSTab.setColumnDescriptors(columnDescriptors);
-			id = addPage(OBSTab.createControl(getContainer()));
-			setPageText(id, OBSTab.getTitle());
-			OBSTab.setTabIndex(id);
-			viewer = (StructuredViewer) OBSTab.getViewer();
-			createContextMenuFor(viewer);
-			pages.add(OBSTab);
-			// viewer.addDropSupport(dndOperations, transfers, new
-			// ProcessEditorDropAdapter(editingDomain, viewer));
-			// addPage(OBSTab);
-
-			// PBS tab
-			PBSTab = new ProcessBreakdownStructureFormPage(this, WPBS_FORM_ID,
-					AuthoringUIResources.ProcessEditor_WorkProductUsage); //$NON-NLS-1$ 
-			columnDescriptors = toColumnDescriptors(store
-					.getString(ApplicationPreferenceConstants.PREF_WPBS_COLUMNS));
-			// setColumnIndexToNameMap(TngAdapterFactory.INSTANCE.getPBS_AdapterFactories(),
-			// columnDescriptors);
-			adapterFactory = TngAdapterFactory.INSTANCE
-					.getPBS_ComposedAdapterFactory();
-			if (adapterFactory instanceof ConfigurableComposedAdapterFactory) {
-				((ConfigurableComposedAdapterFactory) adapterFactory)
-						.setFilter(ProcessAuthoringConfigurator.INSTANCE);
-			}
-			PBSTab.setAdapterFactory(adapterFactory);
-			PBSTab.setColumnDescriptors(columnDescriptors);
-			id = addPage(PBSTab.createControl(getContainer()));
-			setPageText(id, PBSTab.getTitle());
-			PBSTab.setTabIndex(id);
-			viewer = (StructuredViewer) PBSTab.getViewer();
-			createContextMenuFor(viewer);
-			pages.add(PBSTab);
-			// viewer.addDropSupport(dndOperations, transfers, new
-			// ProcessEditorDropAdapter(editingDomain, viewer));
-			// addPage(PBSTab);
-
-			// consolidated tab
-			procTab = new ProcessBreakdownStructureFormPage(this,
-					CONSOLIDATED_FORM_ID,
-					AuthoringUIResources.ProcessEditor_ConsolidatedView); //$NON-NLS-1$ 
-			procTab.setReadOnly(true);
-			adapterFactory = TngAdapterFactory.INSTANCE
-					.getProcessComposedAdapterFactory();
-			if (adapterFactory instanceof ConfigurableComposedAdapterFactory) {
-				((ConfigurableComposedAdapterFactory) adapterFactory)
-						.setFilter(ProcessAuthoringConfigurator.INSTANCE);
-			}
-			procTab.setAdapterFactory(adapterFactory);
-//			columnDescriptors = toColumnDescriptors(store
-//					.getString(ApplicationPreferenceConstants.PREF_WBS_COLUMNS));
-//			
-			// get WBS columns
-			List list = toColumnDescriptorList(store
-					.getString(ApplicationPreferenceConstants.PREF_WBS_COLUMNS));
-
-			// get TBS columns 
-			ColumnDescriptor[] teamColumnDescriptors = toColumnDescriptors(store
-					.getString(ApplicationPreferenceConstants.PREF_TBS_COLUMNS));
-
-			// if TBS columns has TEAM column then add to consolidated view
-			for (int i = 0; i < teamColumnDescriptors.length; i++) {
-				ColumnDescriptor colDesc = teamColumnDescriptors[i];
-				if (colDesc == COL_DESC_TEAM) {
-					list.add(colDesc);
-					break;
-				}
-			}
-
-			ColumnDescriptor[] columns = new ColumnDescriptor[list.size()];
-			list.toArray(columns);
-			procTab.setColumnDescriptors(columns);
-			
-			id = addPage(procTab.createControl(getContainer()));
-			setPageText(id, procTab.getTitle());
-			procTab.setTabIndex(id);
-			viewer = (StructuredViewer) procTab.getViewer();
-			createContextMenuFor(viewer);
-			pages.add(procTab);
-
-			// check for extenstion point and add the page if there
-			List pageProviders = ProcessEditorPageProvider.getInstance()
-					.getPageProviders();
-
-			if (pageProviders != null && pageProviders.size() > 0) {
-				try {
-					extensionTabs = new ProcessBreakdownStructureFormPage[pageProviders
-							.size()];
-					for (int i = 0; i < pageProviders.size(); i++) {
-						Object page = pageProviders.get(i);
-						if (page instanceof IExtensionFormPage) {
-
-							IExtensionFormPage formPage = (IExtensionFormPage) page;
-							IFormPage control = formPage.setEditor(this);
-							formPage.setInput(selectedProcess);
-							ProcessBreakdownStructureFormPage extendedPage = null;
-							if (control instanceof ProcessBreakdownStructureFormPage) {
-								extendedPage = (ProcessBreakdownStructureFormPage) control;
-								extensionTabs[i] = extendedPage;
-							}
-
-							id = addPage(extendedPage
-									.createControl(getContainer()));
-							setPageText(id, extendedPage.getTitle());
-							extendedPage.setTabIndex(id);
-							viewer = (StructuredViewer) extendedPage
-									.getViewer();
-							createContextMenuFor(viewer);
-
-							pages.add(extendedPage);
-						}
-					}
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-
-			bsPages = new ProcessBreakdownStructureFormPage[pages.size()];
-			for (int i = 0; i < pages.size(); i++) {
-				bsPages[i] = (ProcessBreakdownStructureFormPage) pages.get(i);
-			}
-
-			// bsPages = new ProcessBreakdownStructureFormPage[] { WBSTab,
-			// OBSTab,
-			// PBSTab, procTab };
-
-			// if(getEditorInput() instanceof ProcessEditorInput) {
-			// int pageId =
-			// ((ProcessEditorInput)getEditorInput()).getActivePage();
-			// if(pageId != -1) {
-			// setActivePage(0);
-			// setActivePage(pageId);
-			// }
-			// }
-
-			inputChanged(getEditorInput());
-		} catch (PartInitException e) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(e);
-			e.printStackTrace();
-		}
-	}
-
-	protected void setActivePage(int pageIndex) {
-		super.setActivePage(pageIndex);
-
-		// work around for active page that is not a form page. Super method
-		// does not call pageChange() in this case
-		//
-		handlePageChange();
-		if (pageIndex > 0 && bsPages.length <= pageIndex) {
-			Viewer viewer = bsPages[pageIndex].getViewer();
-			ISelection selection = viewer.getSelection();
-			if (selection == null || selection.isEmpty()) {
-				ISelection initialSelection = null;
-				if (getEditorInput() instanceof ProcessEditorInput) {
-					initialSelection = ((ProcessEditorInput) getEditorInput())
-							.getInitialSelection();
-				}
-				if (initialSelection == null) {
-					selection = new StructuredSelection(selectedProcess);
-				} else {
-					selection = initialSelection;
-				}
-				viewer.setSelection(selection, true);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.editor.FormEditor#setActivePage(java.lang.String)
-	 */
-	public IFormPage setActivePage(String pageId) {
-		int id = -1;
-		IFormPage activePage = null;
-		for (int i = 0; i < pages.size(); i++) {
-			Object page = pages.get(i);
-			if (page instanceof IFormPage) {
-				IFormPage fpage = (IFormPage) page;
-				if (fpage.getId().equals(pageId)) {
-					id = i;
-					activePage = fpage;
-					break;
-				}
-			}
-		}
-		if(id == -1) {
-			for (int i = 0; i < bsPages.length; i++) {
-				ProcessBreakdownStructureFormPage page = bsPages[i];
-				if (page.getId().equals(pageId)) {
-					id = page.getTabIndex();
-					activePage = page;
-					break;
-				}
-			}
-		}
-		if(id == -1 && extensionTabs != null) {
-			for (int i = 0; i < extensionTabs.length; i++) {
-				ProcessBreakdownStructureFormPage page = extensionTabs[i];
-				if (page.getId().equals(pageId)) {
-					id = page.getTabIndex();
-					activePage = page;
-					break;
-				}
-			}
-		}
-
-		if(activePage != null) {
-			setActivePage(id);
-			return activePage;
-		}
-		return null;
-	}
-	
-	private void handlePageChange() {
-		int id = getActivePage();
-		if (id != -1) {
-			Object page = pages.get(id);
-			if (page instanceof ProcessDescription) {
-				((ProcessDescription) page).setFormText();
-			}
-			if (id == WBSTab.getTabIndex()) {
-				setCurrentViewer(WBSTab.getViewer());
-			} else if (id == OBSTab.getTabIndex()) {
-				setCurrentViewer(OBSTab.getViewer());
-			} else if (id == PBSTab.getTabIndex()) {
-				setCurrentViewer(PBSTab.getViewer());
-			} else if (id == procTab.getTabIndex()) {
-				setCurrentViewer(procTab.getViewer());
-			} else if (extensionTabs != null) {
-				for (int i = 0; i < extensionTabs.length; i++) {
-					if (extensionTabs[i] != null && id == extensionTabs[i].getTabIndex())
-						setCurrentViewer(extensionTabs[i].getViewer());
-				}
-			} else {
-				setCurrentViewer(null);
-			}
-
-			if (propertySheetPage != null) {
-				propertySheetPage.refresh();
-			}
-		}
-	}
-
-	protected void pageChange(int newPageIndex) {
-		super.pageChange(newPageIndex);
-		handlePageChange();
-	}
-
-	/**
-	 * Create context menu for the give viewer
-	 * @param viewer
-	 */
-	public void createContextMenuFor(final StructuredViewer viewer) {
-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
-		contextMenu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-		contextMenu.setRemoveAllWhenShown(true);
-		contextMenu.addMenuListener(this);
-		Menu menu = contextMenu.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(contextMenu, viewer);
-
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection sel = (IStructuredSelection) event
-						.getSelection();
-				setSelection(sel);
-			}
-		});
-
-		int dndOperations = DND.DROP_LINK | DND.DROP_COPY;
-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };
-		viewer.addDropSupport(dndOperations, transfers,
-				new ProcessEditorDropAdapter(editingDomain, viewer));
-	}
-
-	private void setCurrentViewer(Viewer viewer) {
-		// If it is changing...
-		//
-		if (currentViewer != viewer) {
-			if (selectionChangedListener == null) {
-				// Create the listener on demand.
-				//
-				selectionChangedListener = new ISelectionChangedListener() {
-					// This just notifies those things that are affected by the
-					// section.
-					//
-					public void selectionChanged(
-							SelectionChangedEvent selectionChangedEvent) {
-						setSelection(selectionChangedEvent.getSelection());
-					}
-				};
-			}
-
-			// Stop listening to the old one.
-			//
-			if (currentViewer != null) {
-				currentViewer
-						.removeSelectionChangedListener(selectionChangedListener);
-			}
-
-			// Start listening to the new one.
-			//
-			if (viewer != null) {
-				viewer.addSelectionChangedListener(selectionChangedListener);
-			}
-
-			// Remember it.
-			//
-			currentViewer = viewer;
-
-			// Set adapter factory of editingDomain to that of the current view
-			//
-			if (currentViewer instanceof ProcessViewer) {
-				IContentProvider contentProvider = ((ProcessViewer) currentViewer)
-						.getContentProvider();
-				if (contentProvider instanceof AdapterFactoryContentProvider) {
-					AdapterFactoryContentProvider adapterFactoryContentProvider = ((AdapterFactoryContentProvider) contentProvider);
-					AdapterFactory adapterFactory = adapterFactoryContentProvider
-							.getAdapterFactory();
-					if (adapterFactory instanceof EditingDomainComposedAdapterFactory) {
-						((EditingDomainComposedAdapterFactory) adapterFactory)
-								.setEditingDomain(editingDomain);
-					} else {
-						editingDomain.setAdapterFactory(adapterFactory);
-					}
-
-					if (propContentProvider != null) {
-						propContentProvider.setAdapterFactory(adapterFactory);
-					}
-				}
-			}
-
-			// Set the editors selection based on the current viewer's
-			// selection.
-			//
-			setSelection(currentViewer == null ? StructuredSelection.EMPTY
-					: currentViewer.getSelection());
-
-		}
-	}
-
-	private static Activity getParentActivity(BreakdownElement e,
-			AdapterFactory adapterFactory) {
-		Activity act = UmaUtil.getParentActivity(e);
-		if (act != null) {
-			return act;
-		}
-
-		// TODO: handle element that does not directly belong to an activity
-		// (like deliverable part of a deliverable descriptor)
-		//
-
-		return null;
-	}
-
-	private static AdapterFactory getAdapterFactory(StructuredViewer viewer) {
-		return ((AdapterFactoryContentProvider) viewer.getContentProvider())
-				.getAdapterFactory();
-	}
-
-	private static void setSelectionToViewer(Viewer viewer,
-			IStructuredSelection otherSel, boolean alternateSelection) {
-		if (alternateSelection) {
-			IStructuredSelection sel = (IStructuredSelection) viewer
-					.getSelection();
-			Object currentSelection = null;
-			if (sel.size() == 1) {
-				currentSelection = sel.getFirstElement();
-				if (currentSelection instanceof BreakdownElement) {
-					Activity act = getParentActivity(
-							(BreakdownElement) currentSelection,
-							getAdapterFactory((StructuredViewer) viewer));
-					if (act != otherSel.getFirstElement()) {
-						viewer.setSelection(otherSel, true);
-					}
-				}
-			} else {
-				viewer.setSelection(otherSel, true);
-			}
-		} else {
-			viewer.setSelection(otherSel, true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
-	 */
-	public void setSelection(ISelection selection) {
-		if (synchronizingSelection) {
-			return;
-		}
-
-		// // check if the resources of selected objects are out of synch or any
-		// of the selected objects
-		// // became proxy then refresh them if needed
-		// //
-		// if(refreshOutOfSynch(selection)) {
-		// return;
-		// }
-
-		viewSelection = selection;
-		ArrayList listenerList = new ArrayList(selectionChangedListeners);
-
-		for (int i = 0; i < listenerList.size(); i++) {
-			ISelectionChangedListener listener = (ISelectionChangedListener) listenerList
-					.get(i);
-			listener
-					.selectionChanged(new SelectionChangedEvent(this, selection));
-		}
-
-		// synchronize selection in all BS views if only one element is selected
-		//
-		synchronizeSelection(selection, currentViewer);
-	}
-
-	/**
-	 * @param selection
-	 * @return
-	 */
-	private boolean refreshOutOfSynch(ISelection selection) {
-		if (currentViewer != null && selection instanceof IStructuredSelection) {
-			boolean refreshRequired = false;
-			IStructuredSelection sel = (IStructuredSelection) selection;
-			HashSet resources = new HashSet();
-			for (Iterator iter = sel.iterator(); iter.hasNext();) {
-				Object e = TngUtil.unwrap(iter.next());
-				if (e instanceof EObject) {
-					EObject eObject = ((EObject) e);
-					if (eObject.eIsProxy()) {
-						eObject = RefreshJob.getInstance().resolve(eObject);
-						refreshRequired = true;
-					}
-					Resource resource = eObject.eResource();
-					if (resource != null) {
-						resources.add(resource);
-					}
-				}
-			}
-			if (!resources.isEmpty()) {
-				ArrayList removedResources = new ArrayList();
-				ArrayList changedResources = new ArrayList();
-				ResourceUtil.checkOutOfSynchResources(resources,
-						removedResources, changedResources);
-				if (!removedResources.isEmpty() || !changedResources.isEmpty()) {
-					boolean ret = promptReloadFiles();
-					if (ret) {
-						// unload the removed resources
-						//
-						if (!removedResources.isEmpty()) {
-							for (Iterator iter = removedResources.iterator(); iter
-									.hasNext();) {
-								MultiFileXMIResourceImpl resource = (MultiFileXMIResourceImpl) iter
-										.next();
-								try {
-									resource.unloadWithoutRemove();
-								} catch (Exception e) {
-									CommonPlugin.INSTANCE.log(e);
-								}
-							}
-						}
-
-						Collection reloadedResources = null;
-						if (!changedResources.isEmpty()) {
-							// Reload the changed resources.
-							ILibraryManager manager = (ILibraryManager) LibraryService
-									.getInstance().getCurrentLibraryManager();
-							if (manager != null) {
-								reloadedResources = manager
-										.reloadResources(changedResources);
-							}
-						}
-
-						if (!removedResources.isEmpty()
-								|| reloadedResources != null) {
-							refreshRequired = true;
-						}
-
-						// refresh out-of-synch resources
-						//
-						for (Iterator iter = changedResources.iterator(); iter
-								.hasNext();) {
-							FileManager.getInstance().refresh(
-									(Resource) iter.next());
-						}
-					}
-				}
-			}
-			if (refreshRequired) {
-				currentViewer.refresh();
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param selection
-	 */
-	private void synchronizeSelection(ISelection selection, Viewer currentViewer) {
-		try {
-			synchronizingSelection = true;
-			if (currentViewer != null
-					&& selection instanceof IStructuredSelection) {
-				IStructuredSelection sel = (IStructuredSelection) selection;
-				if (sel.size() == 1) {
-					Object selected = sel.getFirstElement();
-					IStructuredSelection otherSel = null;
-					boolean alternateSelection = false;
-					ArrayList selectedPath = null;
-					AdapterFactory adapterFactory = getAdapterFactory((StructuredViewer) currentViewer);
-					if (selected instanceof BreakdownElementWrapperItemProvider) {
-						if (((BreakdownElementWrapperItemProvider) selected)
-								.isReadOnly()) {
-							if (adapterFactory != null) {
-								// get path
-								//
-								Object e = TngUtil.unwrap(selected);
-								selectedPath = new ArrayList();
-								ITreeItemContentProvider adapter = (ITreeItemContentProvider) selected;
-								do {
-									selectedPath.add(0, e);
-									Object parent = adapter.getParent(e);
-									if (parent == null) {
-										break;
-									}
-									if (parent instanceof BreakdownElementWrapperItemProvider) {
-										adapter = (ITreeItemContentProvider) parent;
-										e = TngUtil.unwrap(parent);
-									} else {
-										adapter = (ITreeItemContentProvider) adapterFactory
-												.adapt(
-														parent,
-														ITreeItemContentProvider.class);
-										e = parent;
-									}
-								} while (true);
-							}
-						} else if (procTab.getViewer() == currentViewer) {
-							selected = TngUtil.unwrap(selected);
-							selection = new StructuredSelection(selected);
-						} else if (extensionTabs != null) {
-							for (int i = 0; i < extensionTabs.length; i++) {
-								if (extensionTabs[i].getViewer() == currentViewer) {
-									selected = TngUtil.unwrap(selected);
-									selection = new StructuredSelection(
-											selected);
-
-								}
-							}
-						}
-					}
-					if (selected instanceof BreakdownElement) {
-						if (procTab.getViewer() != currentViewer) {
-							procTab.getViewer().setSelection(selection, false);
-						}
-						if (extensionTabs != null) {
-							for (int i = 0; i < extensionTabs.length; i++) {
-								if (extensionTabs[i].getViewer() != currentViewer)
-									extensionTabs[i].getViewer().setSelection(
-											selection, false);
-							}
-						}
-
-						if (selected instanceof Activity
-								|| selected instanceof Milestone) {
-							otherSel = (IStructuredSelection) selection;
-						} else {
-							Activity act = getParentActivity(
-									(BreakdownElement) selected, adapterFactory);
-							if (act != null) {
-								otherSel = new StructuredSelection(act);
-								alternateSelection = true;
-							}
-						}
-					}
-					if (otherSel != null) {
-						// own element is selected
-						//
-						Viewer viewer = WBSTab.getViewer();
-						if (viewer != currentViewer) {
-							if (selected instanceof WorkBreakdownElement) {
-								viewer.setSelection(selection, false);
-							} else {
-								setSelectionToViewer(viewer, otherSel,
-										alternateSelection);
-							}
-						}
-						viewer = OBSTab.getViewer();
-						if (viewer != currentViewer) {
-							if (selected instanceof RoleDescriptor) {
-								viewer.setSelection(selection, false);
-							} else {
-								setSelectionToViewer(viewer, otherSel,
-										alternateSelection);
-							}
-						}
-						viewer = PBSTab.getViewer();
-						if (viewer != currentViewer) {
-							if (selected instanceof WorkProductDescriptor) {
-								viewer.setSelection(selection, false);
-							} else {
-								setSelectionToViewer(viewer, otherSel,
-										alternateSelection);
-							}
-						}
-					} else if (selectedPath != null) {
-						// inherited element is selected
-						//
-						Viewer viewer = WBSTab.getViewer();
-						if (viewer != currentViewer) {
-							selection = new StructuredSelection(findSelection(
-									selectedPath, WBSTab.getAdapterFactory()));
-							viewer.setSelection(selection, false);
-						}
-						viewer = OBSTab.getViewer();
-						if (viewer != currentViewer) {
-							selection = new StructuredSelection(findSelection(
-									selectedPath, OBSTab.getAdapterFactory()));
-							viewer.setSelection(selection, false);
-						}
-						viewer = PBSTab.getViewer();
-						if (viewer != currentViewer) {
-							selection = new StructuredSelection(findSelection(
-									selectedPath, PBSTab.getAdapterFactory()));
-							viewer.setSelection(selection, false);
-						}
-						viewer = procTab.getViewer();
-						if (viewer != currentViewer) {
-							selection = new StructuredSelection(findSelection(
-									selectedPath, procTab.getAdapterFactory()));
-							viewer.setSelection(selection, false);
-						}
-
-						if (extensionTabs != null) {
-							for (int i = 0; i < extensionTabs.length; i++) {
-								viewer = extensionTabs[i].getViewer();
-								if (viewer != currentViewer) {
-									selection = new StructuredSelection(
-											findSelection(
-													selectedPath,
-													extensionTabs[i]
-															.getAdapterFactory()));
-									viewer.setSelection(selection, false);
-								}
-							}
-						}
-					}
-				}
-			}
-		} finally {
-			synchronizingSelection = false;
-		}
-	}
-
-	private static Object findSelection(List selectedPath,
-			AdapterFactory adapterFactory) {
-		int size = selectedPath.size();
-		if (size == 0) {
-			return null;
-		}
-		Object e = selectedPath.get(0);
-		Object selection = e;
-		ITreeItemContentProvider adapter = (ITreeItemContentProvider) adapterFactory
-				.adapt(e, ITreeItemContentProvider.class);
-		Collection children = adapter.getChildren(e);
-		find_selection: for (int i = 1; i < size; i++) {
-			e = selectedPath.get(i);
-			for (Iterator iter = children.iterator(); iter.hasNext();) {
-				Object child = iter.next();
-				Object element = TngUtil.unwrap(child);
-				if (element == e) {
-					selection = child;
-					adapter = (ITreeItemContentProvider) adapterFactory.adapt(
-							child, ITreeItemContentProvider.class);
-					children = adapter.getChildren(e);
-					continue find_selection;
-				}
-			}
-			break find_selection;
-		}
-		return selection;
-	}
-
-	// Implements ISelectionProvider
-	//
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.add(listener);
-	}
-
-	public void removeSelectionChangedListener(
-			ISelectionChangedListener listener) {
-		selectionChangedListeners.remove(listener);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
-	 */
-	public ISelection getSelection() {
-		return viewSelection;
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.domain.IEditingDomainProvider#getEditingDomain()
-	 */
-	public EditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.ui.viewer.IViewerProvider#getViewer()
-	 */
-	public Viewer getViewer() {
-		return currentViewer;
-	}
-
-	/**
-	 * Gets the adapter factory of the current page if there is any
-	 * 
-	 * @return
-	 * 		Adapter Factory of the current page of the editor
-	 */
-	public AdapterFactory getAdapterFactory() {
-		IFormPage page = getActivePageInstance();
-		if (page instanceof ProcessBreakdownStructureFormPage) {
-			return ((ProcessBreakdownStructureFormPage) page)
-					.getAdapterFactory();
-		}
-
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jface.action.IMenuListener#menuAboutToShow(org.eclipse.jface.action.IMenuManager)
-	 */
-	public void menuAboutToShow(IMenuManager menuManager) {
-		((IMenuListener) getEditorSite().getActionBarContributor())
-				.menuAboutToShow(menuManager);
-		
-		// populate contributed menu items
-		//
-		IFormPage activePage = getActivePageInstance();
-		if(activePage instanceof ProcessBreakdownStructureFormPage) {
-			IAction[] actions = ((ProcessBreakdownStructureFormPage)activePage).getAdditionalActions();
-			if(actions != null && actions.length > 0) {
-				menuManager.insertAfter(IWorkbenchActionConstants.MB_ADDITIONS, new Separator());
-				for (int i = 0; i < actions.length; i++) {
-					IAction action = actions[i];
-					ISelection selection = getSelection();
-					if(selection instanceof IStructuredSelection && action instanceof BaseSelectionListenerAction) {
-						((BaseSelectionListenerAction)action).selectionChanged((IStructuredSelection) selection);
-					}
-					if (action instanceof IWorkbenchPartAction) {
-						((IWorkbenchPartAction) action)
-								.setActiveWorkbenchPart(this);
-					}
-					menuManager.insertAfter(IWorkbenchActionConstants.MB_ADDITIONS, action);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Return property sheet page
-	 * @return
-	 * 			PropertySheet Page
-	 */
-	public IPropertySheetPage getPropertySheetPage() {
-		if (propertySheetPage == null) {
-			propertySheetPage = new EPFPropertySheetPage(this);
-			// {
-			// public void makeContributions(IMenuManager menuManager,
-			// IToolBarManager toolBarManager, IStatusLineManager
-			// statusLineManager) {
-			// super.makeContributions(menuManager, toolBarManager,
-			// statusLineManager);
-			// }
-			//
-			// public void setActionBars(IActionBars actionBars) {
-			// super.setActionBars(actionBars);
-			// getActionBarContributor().shareGlobalActions(this, actionBars);
-			// }
-			// };
-			// System.out.println("Setting provider ");
-			if (currentViewer != null) {
-				AdapterFactoryContentProvider contentProvider = (AdapterFactoryContentProvider) ((ProcessViewer) currentViewer)
-						.getContentProvider();
-				propContentProvider = new AdapterFactoryContentProvider(
-						contentProvider.getAdapterFactory());
-				propertySheetPage
-						.setPropertySourceProvider(propContentProvider);
-			}
-		}
-		return propertySheetPage;
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.MultiPageEditorPart#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class key) {
-		if (key.equals(IPropertySheetPage.class)) {
-			return getPropertySheetPage();
-		} else if (key.equals(IGotoMarker.class)) {
-			return this;
-		} else {
-			return super.getAdapter(key);
-		}
-	}
-
-
-	/**
-	 * @see org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor#getContributorId()
-	 */
-	public String getContributorId() {
-		return getSite().getId();
-	}
-
-	
-	/**
-	 * Return column descriptor list for given string
-	 * @param str
-	 * @return
-	 * 			list of column descriptors
-	 */
-	public static EList toColumnDescriptorList(String str) {
-		EList columnDescriptors = new BasicEList();
-		StringTokenizer tokens = new StringTokenizer(str, ","); //$NON-NLS-1$
-		while (tokens.hasMoreTokens()) {
-			String token = tokens.nextToken();
-			Object columnDescriptor = ProcessEditor.idToColumnDescriptorMap
-					.get(token);
-			if (columnDescriptor != null) {
-				columnDescriptors.add(columnDescriptor);
-			}
-		}
-		return columnDescriptors;
-	}
-
-	/**
-	 * Return array of column descriptors for the given string
-	 * @param str
-	 * @return
-	 * 			list of column descriptors
-	 */
-	public static ColumnDescriptor[] toColumnDescriptors(String str) {
-		List list = toColumnDescriptorList(str);
-		ColumnDescriptor[] columns = new ColumnDescriptor[list.size()];
-		list.toArray(columns);
-		return columns;
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormEditor#getCurrentPage()
-	 */
-	public int getCurrentPage() {
-		return super.getCurrentPage();
-	}
-
-	/**
-	 * Return suppression info
-	 */
-	public Suppression getSuppression() {
-		return suppression;
-	}
-
-	private void configChanged() {
-		MethodConfiguration config = LibraryService.getInstance()
-				.getCurrentMethodConfiguration();
-		if (config != currentConfig) {
-			// refresh only if the active part is this editor or diagram editor
-			// of any activity in this process
-			//
-			IWorkbenchPart activePart = getSite().getWorkbenchWindow()
-					.getPartService().getActivePart();
-			boolean refresh = activePart == this;
-			if (!refresh) {
-				if (activePart instanceof AbstractDiagramEditor) {
-					BreakdownElementEditorInput input = (BreakdownElementEditorInput) ((IEditorPart) activePart)
-							.getEditorInput();
-					refresh = input.getSuppression().getProcess() == selectedProcess;
-				}
-			}
-			if (refresh) {
-				currentConfig = config;
-				refreshAll();
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.MethodElementEditor#setInput(org.eclipse.ui.IEditorInput)
-	 */
-	protected void setInput(IEditorInput input) {
-		if (input != getEditorInput()) {
-			inputChanged = true;
-		}
-		super.setInput(input);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.MethodElementEditor#updatePages()
-	 */
-	protected void updatePages() {
-		// remove and add description page if the model.xmi or content.xmi of
-		// the process have been changed
-		//
-		Resource modelResource = selectedProcess.eResource();
-		Resource contentResource = selectedProcess.getPresentation()
-				.eResource();
-		if (changedResources.contains(modelResource)
-				|| (contentResource != null && changedResources
-						.contains(contentResource))) {
-			removePage(0);
-			try {
-				addDescriptionPage();
-			} catch (PartInitException e) {
-				AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-						AuthoringUIResources.ProcessEditor_refreshErrorTitle, //$NON-NLS-1$
-						AuthoringUIResources.ProcessEditor_refreshErrorMsg, e); //$NON-NLS-1$
-			}
-		}
-		if (inputChanged) {
-			inputChanged(getEditorInput());
-			if (propertySheetPage != null) {
-				propertySheetPage.refresh();
-			}
-		} else {
-			refreshAll();
-		}
-	}
-
-	private void refreshAll() {
-		BusyIndicator.showWhile(getSite().getShell().getDisplay(),
-				new Runnable() {
-
-					public void run() {
-						doRefreshAll(true);
-					}
-
-				});
-	}
-
-	/**
-	 * Refresh all viewers 
-	 * @param updateIDs
-	 * 			if true, then refresh all index in viewers
-	 */
-	public void doRefreshAll(boolean updateIDs) {
-		if (updateIDs) {
-			AdapterFactory adapterFactory = TngAdapterFactory.INSTANCE
-					.getWBS_ComposedAdapterFactory();
-			ProcessUtil.updateIDs(adapterFactory, selectedProcess);
-			ProcessUtil.refreshPredeccessorLists(adapterFactory,
-					selectedProcess);
-
-			adapterFactory = TngAdapterFactory.INSTANCE
-					.getProcessComposedAdapterFactory();
-			ProcessUtil.updateIDs(adapterFactory, selectedProcess);
-		}
-
-		WBSTab.getViewer().refresh();
-		OBSTab.getViewer().refresh();
-		PBSTab.getViewer().refresh();
-		procTab.getViewer().refresh();
-
-		if (extensionTabs != null) {
-			for (int i = 0; i < extensionTabs.length; i++) {
-				extensionTabs[i].getViewer().refresh();
-			}
-		}
-
-		if (propertySheetPage != null) {
-			propertySheetPage.refresh();
-		}
-	}
-	
-
-	/**
-	 * Refresh all open process editors
-	 */
-	public void refreshAllProcessEditors() {
-		IEditorReference[] editorReferences = getSite().getPage()
-				.getEditorReferences();
-		for (int i = 0; i < editorReferences.length; i++) {
-			IEditorReference reference = editorReferences[i];
-			IEditorPart editor = reference.getEditor(true);
-			if (editor instanceof ProcessEditor) {
-				((ProcessEditor) editor).doRefreshAll(false);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormEditor#getActivePageInstance()
-	 */
-	public IFormPage getActivePageInstance() {
-		int index = getActivePage();
-		if (index == -1) {
-			return null;
-		}
-		if (index == 0) {
-			return super.getActivePageInstance();
-		}
-		return bsPages[index - 1];
-	}
-
-	protected Collection getModifiedResources() {
-		Collection modifiedResources = super.getModifiedResources();
-		if (suppression.isSaveNeeded()
-				&& !modifiedResources.contains(selectedProcessComponent
-						.eResource())) {
-			modifiedResources.add(selectedProcessComponent.eResource());
-		}
-		modifiedResources.addAll(resourcesToSave);
-
-		return modifiedResources;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.MethodElementEditor#doSave(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		suppression.saveToModel();
-		super.doSave(monitor);
-		suppression.saveIsDone();
-		resourcesToSave.clear();
-		firePropertyChange(PROP_DIRTY);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.MethodElementEditor#isDirty()
-	 */
-	public boolean isDirty() {
-		if (suppression.isSaveNeeded()) {
-			return true;
-		}
-		return super.isDirty();
-	}
-
-	
-	/**
-	 * @see org.eclipse.ui.part.WorkbenchPart#firePropertyChange(int)
-	 */
-	public void firePropertyChange(int propertyId) {
-		super.firePropertyChange(propertyId);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.editors.MethodElementEditor#getUsedResources()
-	 */
-	public Collection getUsedResources() {
-		HashSet usedResources = new HashSet();
-
-		// model.xmi
-		//
-		Resource resource = elementObj.eResource();
-		if (resource != null) {
-			usedResources.add(resource);
-		}
-
-		// content.xmi
-		//
-		resource = selectedProcess.getPresentation().eResource();
-		if (resource != null) {
-			usedResources.add(resource);
-		}
-
-		// configuration.xmi
-		//
-		MethodConfiguration config = selectedProcess.getDefaultContext();
-		if (config != null) {
-			resource = config.eResource();
-			if (resource != null) {
-				usedResources.add(resource);
-			}
-		}
-
-		// resources of other processes that this process is depending on
-		//
-		AdapterFactory adapterFactory = WBSTab.getAdapterFactory();
-		for (Iterator iter = new AdapterFactoryTreeIterator(adapterFactory,
-				selectedProcess); iter.hasNext();) {
-			Object obj = TngUtil.unwrap(iter.next());
-			if (obj instanceof EObject) {
-				resource = ((EObject) obj).eResource();
-				if (resource != null) {
-					usedResources.add(resource);
-				}
-			}
-		}
-
-		lastUsedResources = usedResources;
-
-		return usedResources;
-	}
-
-	/**
-	 * Check whether selected objects can be revealed or not and retuns result
-	 * 
-	 * @param selection
-	 * 			List of objects
-	 * @param adapterFactory
-	 * 			Adapter factory of the selected objects
-	 * @param suppression
-	 * 			Suppression information
-	 * @return
-	 * 		Boolean value to indicate whether selected objects can be revealed
-	 */
-	public static boolean canReveal(Collection selection,
-			AdapterFactory adapterFactory, Suppression suppression) {
-		// check if revealing the selected elements will cause name duplication
-		//
-		String msg = suppression.checkDuplicateNameAfterReveal(selection,
-				adapterFactory);
-		if (msg != null) {
-			AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-					AuthoringUIResources.ProcessEditor_Action_Reveal, //$NON-NLS-1$ 
-					msg);
-			return false;
-		}
-
-		// check if revealing the selected elements will cause duplicate
-		// descriptors.
-		// If so, prompt user to delete the duplicates before continuing.
-		//
-		Collection duplicates = ProcessUtil
-				.getDuplicateDescriptorsAfterReveal(selection);
-		if (!duplicates.isEmpty()) {
-			MultiStatus status = new MultiStatus(AuthoringUIPlugin.getDefault()
-					.getId(), 0, "", null); //$NON-NLS-1$
-			for (Iterator iter = duplicates.iterator(); iter.hasNext();) {
-				Descriptor desc = (Descriptor) iter.next();
-				String descTxt = TngUtil.getTypeText(desc)
-						+ ": " + desc.getPresentationName(); //$NON-NLS-1$
-				status.add(new Status(IStatus.INFO, AuthoringUIPlugin
-						.getDefault().getId(), 0, descTxt, null));
-			}
-			if (AuthoringUIPlugin
-					.getDefault()
-					.getMsgDialog()
-					.displayConfirmation(
-							AuthoringUIResources.ProcessEditor_Action_Reveal, //$NON-NLS-1$ 
-							AuthoringUIResources.ProcessEditor_promptToDeleteBeforeReveal, //$NON-NLS-1$
-							status) == Dialog.CANCEL) {
-				return false;
-			}
-
-			// delete duplicate descriptors
-			try {
-				ProcessDeleteAction.delete(duplicates);
-			} catch (OperationCanceledException e) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	private static boolean hasInherited(Collection selection) {
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			if (ProcessUtil.isInherited(element)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private IPreferenceStore getPreferenceStore() {
-		// preference is managed by library plugin,
-		// since this preferences is also used for browsing and publishing
-		// Jinhua Xi 08/21/2006
-		// IPreferenceStore store = AuthoringUIPlugin.getDefault()
-		// .getPreferenceStore();
-		IPreferenceStore store = LibraryPlugin.getDefault()
-				.getPreferenceStore();
-
-		return store;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ProcessEditorInput.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ProcessEditorInput.java
deleted file mode 100755
index 59c578b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/ProcessEditorInput.java
+++ /dev/null
@@ -1,60 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.editors;
-
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.jface.viewers.ISelection;
-
-/**
- * An editor input for process editor
- * 
- * @author Phong Nguyen Le
- */
-public class ProcessEditorInput extends MethodElementEditorInput {
-	private ISelection initialSelection;
-	private int activePage = -1;
-
-	public ProcessEditorInput(MethodElement e) {
-		super(e);
-	}
-
-	/**
-	 * Return active page of the editor
-	 */
-	public int getActivePage() {
-		return activePage;
-	}
-
-	/**
-	 * Set active page for the editor
-	 * @param activePage
-	 */
-	public void setActivePage(int activePage) {
-		this.activePage = activePage;
-	}
-
-	/**
-	 * Return initial selection
-	 * @return
-	 * 			Selection
-	 */
-	public ISelection getInitialSelection() {
-		return initialSelection;
-	}
-
-	/**
-	 * Set initial selection 
-	 * @param initialSelection
-	 */
-	public void setInitialSelection(ISelection initialSelection) {
-		this.initialSelection = initialSelection;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/package.html
deleted file mode 100755
index bc27256..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides method, process and activity diagram editors.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/AbstractBaseFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/AbstractBaseFilter.java
deleted file mode 100755
index 59b234f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/AbstractBaseFilter.java
+++ /dev/null
@@ -1,68 +0,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
-//------------------------------------------------------------------------------
-
-package org.eclipse.epf.authoring.ui.filters;
-
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.itemsfilter.FilterHelper;
-
-/**
- * The base class for UI filters. Supports multiple filters.
- * Support filtering the element based on the pattern and type. 
- * 
- * @author Jinhua Xi
- * @since 1.0
- * 
- */
-public class AbstractBaseFilter {
-
-	protected FilterHelper helper;
-
-	protected IFilter[] additionalFilters = null;
-
-	/**
-	 * added for futher filtering. For example, we may set a filer to prevent
-	 * generalizers as base element to avoid circular dependency
-	 * 
-	 * @param additionalFilters
-	 */
-	public void setAdditionalFilters(IFilter[] additionalFilters) {
-		this.additionalFilters = additionalFilters;
-	}
-
-	public FilterHelper getHelper() {
-		return helper;
-	}
-
-	public void setHelper(FilterHelper helper) {
-		this.helper = helper;
-	}
-
-	/*
-	 * subclass method should call this before returning true.
-	 */
-	public boolean accept(Object obj) {
-
-		// Jinhua Xi, added for futher filtering.
-		// For example, we may set a filer to prevent generalizers as base
-		// element to avoid circular dependency
-		if (additionalFilters != null && additionalFilters.length > 0) {
-			for (int i = 0; i < additionalFilters.length; i++) {
-				if (additionalFilters[i].accept(obj) == false) {
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ActivityVariabilityFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ActivityVariabilityFilter.java
deleted file mode 100755
index 277d562..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ActivityVariabilityFilter.java
+++ /dev/null
@@ -1,121 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.configuration.CategorizedProcessesItemProvider;
-import org.eclipse.epf.library.edit.configuration.ProcessesItemProvider;
-import org.eclipse.epf.library.edit.itemsfilter.FilterUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-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.MethodConfiguration;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.jface.viewers.TableViewer;
-
-/**
- * Activity variability filter
- * 
- * @author Shilpa Toraskar
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class ActivityVariabilityFilter extends ExProcessAuthoringConfigurator {
-
-	private Activity activity = null;
-	
-	private List treeList = new ArrayList();
-	private List generalizers = new ArrayList();
-	private List baseelements = new ArrayList();
-	private List badelements = new ArrayList();
-
-	public ActivityVariabilityFilter(MethodConfiguration config,
-			TableViewer viewer, String tabName, Activity activity) {
-		super(config, viewer);
-		this.activity = activity;
-		
-		// load the parentlist
-		AdapterFactory adapter = TngAdapterFactory.INSTANCE.getWBS_ComposedAdapterFactory();
-		FilterUtil.getSubTree(adapter, activity, treeList);
-		FilterUtil.getGeneralizers(treeList, generalizers);
-		FilterUtil.getVariabilityBase(treeList, baseelements);
-		
-		FilterUtil.getSubTree(adapter, generalizers, badelements);
-		FilterUtil.getSubTree(adapter, baseelements, badelements);
-	}
-	
-	public boolean accept(Object obj) {
-		// TODO Auto-generated method stub
-		if (super.accept(obj)) return true;
-		return childAccept(obj);
-	}
-
-	public boolean childAccept(Object obj) {
-		if (obj instanceof ProcessesItemProvider) {
-			return true;
-		}
-		if (obj instanceof CategorizedProcessesItemProvider) {
-			return true;
-
-		}
-		if ((obj instanceof Activity) || obj instanceof ProcessPackage) {
-			if ((obj instanceof Activity)){
-				if(this.activity.equals((Activity) obj)) 
-					return false;
-				VariabilityElement e = ((Activity)obj).getVariabilityBasedOnElement();
-				if(e != null && activity.equals(e))
-					return false;
-			}
-			if (obj instanceof BreakdownElement) {
-				Process srcProc = TngUtil
-						.getOwningProcess((BreakdownElement) obj);
-				Process targetProc = TngUtil
-						.getOwningProcess((BreakdownElement) this.activity);
-				if (srcProc instanceof DeliveryProcess
-						&& targetProc instanceof CapabilityPattern) {
-					return false;
-				}
-			}
-			if(obj instanceof Activity){
-				if(TngUtil.contains(generalizers, obj) 
-						|| TngUtil.contains(baseelements, obj)
-						||TngUtil.contains(badelements, obj)){
-					return false;
-				}
-			}
-			
-//			if (obj instanceof Process) {
-//				Process proc = (Process) obj;
-//				if (proc.equals(TngUtil.getOwningProcess(this.activity)))
-//					return false;
-//			}
-//			if(obj instanceof Activity){
-//				if(TngUtil.contains(contributors, obj)) return false;
-//				if(TngUtil.contains(variabilitybases, obj)) return false;
-//				if(obj.equals(FilterUtil.getParentActivity(TngAdapterFactory.INSTANCE.getWBS_ComposedAdapterFactory(), 
-//						activity))) return false;
-//			}
-			
-			return true;
-		} else
-			return false;
-	}
-	
-	
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/AddLinkFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/AddLinkFilter.java
deleted file mode 100755
index 0cfd5a1..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/AddLinkFilter.java
+++ /dev/null
@@ -1,285 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.epf.library.edit.LibraryEditPlugin;
-import org.eclipse.epf.library.edit.itemsfilter.CategorizedProcessesItemProvider;
-import org.eclipse.epf.library.edit.itemsfilter.ContentCategoriesGroupItemProvider;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.IAllFilter;
-import org.eclipse.epf.library.edit.itemsfilter.ProcessesItemProvider;
-import org.eclipse.epf.library.edit.navigator.PluginUIPackagesItemProvider;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductType;
-
-/**
- * Filter for AddLink in RichTextEditor.
- * 
- */
-
-public class AddLinkFilter extends AbstractBaseFilter implements IAllFilter {
-
-	public boolean accept(Object obj) {
-		
-		// if can't be accdepted by super, return.
-		if(obj == null )return false;
-		
-		if (!super.accept(obj)) {
-			return false;
-		}
-
-		String filterTypeString = helper.getFilterTypeStr();
-		Object contentElement = helper.getContentElement();
-
-		if (helper.getAlreadySelectedList() != null) {
-			if (obj instanceof ProcessComponent) {
-				if (helper.getAlreadySelectedList().contains(
-						((ProcessComponent) obj).getProcess()))
-					return false;
-			} else {
-				if (helper.getAlreadySelectedList().contains(obj))
-					return false;
-			}
-		}
-
-		if (contentElement != null
-				&& !(obj instanceof ProcessComponent || obj instanceof Process)) {
-			if (obj.equals(helper.getContentElement()))
-				return false;
-		}
-
-		if (filterTypeString == null
-				|| filterTypeString.equals(FilterConstants.ALL_ELEMENTS)
-				|| filterTypeString.equals(FilterConstants.METHO_PLUGINS)) {
-
-			if (obj instanceof CustomCategory) {
-				if (TngUtil.isRootCustomCategory((CustomCategory) obj)) {
-					if (((CustomCategory) obj).getCategorizedElements()
-							.isEmpty())
-						return false;
-				}
-			}
-			if (!helper.matchPattern(obj))
-				return false;
-
-			if (obj instanceof ContentPackage)
-				return true;
-			if (obj instanceof ContentCategoriesGroupItemProvider) {
-				Collection list = ((ContentCategoriesGroupItemProvider) obj)
-						.getChildren(obj);
-				if (list.isEmpty())
-					return false;
-				else
-					return true;
-			}
-			if (obj instanceof ProcessesItemProvider) {
-				Collection list = ((ProcessesItemProvider) obj)
-						.getChildren(obj);
-				for (Iterator ior = list.iterator(); ior.hasNext();) {
-					Object object = ior.next();
-					if (((CategorizedProcessesItemProvider) object)
-							.getChildren(object).isEmpty())
-						ior.remove();
-				}
-				if (list.isEmpty())
-					return false;
-				else
-					return true;
-			}
-			if (obj instanceof PluginUIPackagesItemProvider) {
-				return true;
-			}
-			if (childAccept(obj))
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.DISCIPLINES)) {
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			if (obj instanceof ContentCategoriesGroupItemProvider) {
-				return acceptCategoriesGroup(obj, LibraryEditPlugin.INSTANCE
-						.getString("_UI_Disciplines_group")); //$NON-NLS-1$
-			}
-			if (obj instanceof DisciplineGrouping) {
-				return !((DisciplineGrouping) obj).getDisciplines().isEmpty();
-			}
-			if (obj instanceof Discipline) {
-				return true;// AssociationHelper.getDisciplineGroups((Discipline)obj).isEmpty();
-			}
-		} else if (filterTypeString.equals(FilterConstants.ROLESETS)) {
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			if (obj instanceof ContentCategoriesGroupItemProvider) {
-				return acceptCategoriesGroup(obj, LibraryEditPlugin.INSTANCE
-						.getString("_UI_Role_Sets_group"));
-			}
-			if (obj instanceof RoleSetGrouping) {
-				return !((RoleSetGrouping) obj).getRoleSets().isEmpty();
-			}
-			if (obj instanceof RoleSet) {
-				return true;// AssociationHelper.getRoleSetGroups((RoleSet)obj).isEmpty();
-			}
-		} else if (filterTypeString.equals(FilterConstants.WORKPRODUCTTYPES)) {
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			if (obj instanceof ContentCategoriesGroupItemProvider) {
-				
-				return acceptCategoriesGroup(obj, LibraryEditPlugin.INSTANCE
-						.getString("_UI_WorkProductTypes_group"));
-			}
-			if (obj instanceof WorkProductType)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.DOMAINS)) {
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			if (obj instanceof ContentCategoriesGroupItemProvider) {
-				return acceptCategoriesGroup(obj, LibraryEditPlugin.INSTANCE
-						.getString("_UI_Domains_group")); //$NON-NLS-1$
-			}
-			if (obj instanceof Domain)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.TOOLS)) {
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			if (obj instanceof ContentCategoriesGroupItemProvider) {
-				return acceptCategoriesGroup(obj, LibraryEditPlugin.INSTANCE
-						.getString("_UI_Tools_group")); //$NON-NLS-1$
-			}
-			if (obj instanceof Tool)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.ROLES)) { //$NON-NLS-1$
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			if (obj instanceof ContentPackage)
-				return true;
-			if (obj instanceof Role)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.TASKS)) { //$NON-NLS-1$
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			if (obj instanceof ContentPackage)
-				return true;
-			if (obj instanceof Task)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.WORKPRODUCTS)) { //$NON-NLS-1$
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			if (obj instanceof ContentPackage)
-				return true;
-			if (obj instanceof WorkProduct)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.GUIDANCE)) { //$NON-NLS-1$
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			if (obj instanceof ContentPackage)
-				return true;
-			if (obj instanceof Guidance)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.CONTENT_PACKAGES)) {
-
-			if (!helper.matchPattern(obj))
-				return false;
-			if (obj instanceof ContentPackage)
-				return true;
-			if (obj instanceof CustomCategory)
-				return false;
-			if (obj instanceof Role || obj instanceof Task
-					|| obj instanceof WorkProduct || obj instanceof Guidance)
-				return true;
-			// if(obj instanceof Guidance) return true;
-		} else if (filterTypeString.equals(FilterConstants.CUSTOM_CATEGORIES)) {
-
-			if (!helper.matchPattern(obj))
-				return false;
-			if (obj instanceof CustomCategory)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.PROCESSES)) {
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			if (obj instanceof CustomCategory)
-				return false;
-			if (obj instanceof ProcessesItemProvider) {
-				Collection list = ((ProcessesItemProvider) obj)
-						.getChildren(obj);
-				for (Iterator ior = list.iterator(); ior.hasNext();) {
-					Object object = ior.next();
-					if (((CategorizedProcessesItemProvider) object)
-							.getChildren(object).isEmpty())
-						ior.remove();
-				}
-				if (list.isEmpty())
-					return false;
-				else
-					return true;
-			}
-			if (obj instanceof ProcessPackage)
-				return true;
-			if (obj instanceof BreakdownElement)
-				return true;
-		}
-		if (obj instanceof MethodPlugin) {
-			return true;
-		}
-		return false;
-	}
-
-	protected boolean childAccept(Object obj) {
-		if (obj instanceof MethodConfiguration)
-			return false;
-		return true;
-	}
-
-	public boolean acceptCategoriesGroup(Object obj, String type) {
-		if (obj instanceof ContentCategoriesGroupItemProvider) {
-			Collection list = ((ContentCategoriesGroupItemProvider) obj)
-					.getChildren(obj);
-			if (list.isEmpty())
-				return false;
-			if (((ContentCategoriesGroupItemProvider) obj).getText(obj).equals(
-					type))
-				return true;
-		}
-		return false;
-	}
-
-	public Object getObject() {
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/AllFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/AllFilter.java
deleted file mode 100755
index 1d97b2e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/AllFilter.java
+++ /dev/null
@@ -1,421 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.forms.CustomCategoryAssignPage;
-import org.eclipse.epf.library.edit.LibraryEditPlugin;
-import org.eclipse.epf.library.edit.itemsfilter.CategorizedProcessesItemProvider;
-import org.eclipse.epf.library.edit.itemsfilter.ContentCategoriesGroupItemProvider;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.IAllFilter;
-import org.eclipse.epf.library.edit.itemsfilter.ProcessesItemProvider;
-import org.eclipse.epf.library.edit.util.MethodElementUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductType;
-import org.eclipse.epf.uma.util.AssociationHelper;
-
-
-/**
- * Filter for all elements eg: used in {@link CustomCategoryAssignPage} 
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class AllFilter extends AbstractBaseFilter implements IAllFilter {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.itemsfilter.IAllFilter#getObject()
-	 */
-	public Object getObject() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.IFilter#accept(java.lang.Object)
-	 */
-	public boolean accept(Object obj) {
-		if(obj == null)
-			return false;
-		// if can't be accdepted by super, return.
-		if (!super.accept(obj)) {
-			return false;
-		}
-
-		String filterTypeString = helper.getFilterTypeStr();
-		Object contentElement = helper.getContentElement();
-
-		if (helper.getAlreadySelectedList() != null) {
-			if (obj instanceof ProcessComponent) {
-				if (helper.getAlreadySelectedList().contains(
-						((ProcessComponent) obj).getProcess()))
-					return false;
-			} else {
-				if (helper.getAlreadySelectedList().contains(obj))
-					return false;
-			}
-		}
-
-		if (contentElement != null
-				&& !(obj instanceof ProcessComponent || obj instanceof Process)) {
-			if(obj == null){
-				System.out.println("null");
-			}
-			if (obj.equals(helper.getContentElement()))
-				return false;
-		}
-
-		if (filterTypeString == null
-				|| filterTypeString.equals(FilterConstants.ALL_ELEMENTS)
-				|| filterTypeString.equals(FilterConstants.METHO_PLUGINS)
-				|| filterTypeString
-						.equals(FilterConstants.ONLY_CONTENT_ELEMENTS)) {
-
-			if (obj instanceof CustomCategory) {
-				if (TngUtil.isRootCustomCategory((CustomCategory) obj)) {
-					if (((CustomCategory) obj).getCategorizedElements()
-							.isEmpty())
-						return false;
-				}
-			}
-			if (!helper.matchPattern(obj))
-				return false;
-
-			// if(obj instanceof TermDefinition) return false;
-
-			if (obj instanceof MethodPlugin) {
-				if (obj instanceof MethodPlugin) {
-					if (contentElement != null) {
-						if (MethodElementUtil.getAllModels(contentElement)
-								.contains(obj))
-							return true;
-						else
-							return false;
-					} else {
-						return true;
-					}
-				}
-			}
-			if (obj instanceof ContentPackage)
-				return true;
-			if (obj instanceof ContentCategoriesGroupItemProvider) {
-				Collection list = ((ContentCategoriesGroupItemProvider) obj)
-						.getChildren(obj);
-				if (list.isEmpty())
-					return false;
-				else
-					return true;
-			}
-			if (obj instanceof ProcessesItemProvider) {
-				Collection list = ((ProcessesItemProvider) obj)
-						.getChildren(obj);
-				for (Iterator ior = list.iterator(); ior.hasNext();) {
-					Object object = ior.next();
-					if (((CategorizedProcessesItemProvider) object)
-							.getChildren(object).isEmpty())
-						ior.remove();
-				}
-				if (list.isEmpty())
-					return false;
-				else
-					return true;
-			}
-
-			if (childAccept(obj))
-				return true;
-			//		
-		} else if (filterTypeString.equals(FilterConstants.DISCIPLINES)) {
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			// if(obj instanceof Discipline) return true;
-			if (obj instanceof MethodPlugin) {
-				return acceptMethodPlugin(obj, contentElement);
-			}
-			if (obj instanceof ContentCategoriesGroupItemProvider) {
-				return acceptCategoriesGroup(obj, LibraryEditPlugin.INSTANCE
-						.getString("_UI_Disciplines_group")); //$NON-NLS-1$
-			}
-			if (obj instanceof DisciplineGrouping) {
-				return !((DisciplineGrouping) obj).getDisciplines().isEmpty();
-			}
-			if (obj instanceof Discipline) {
-				return true;// AssociationHelper.getDisciplineGroups((Discipline)obj).isEmpty();
-			}
-		} else if (filterTypeString.equals(FilterConstants.ROLESETS)) {
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			// if(obj instanceof Discipline) return true;
-			if (obj instanceof MethodPlugin) {
-				return acceptMethodPlugin(obj, contentElement);
-			}
-			if (obj instanceof ContentCategoriesGroupItemProvider) {
-				return acceptCategoriesGroup(obj, LibraryEditPlugin.INSTANCE
-						.getString("_UI_Role_Sets_group"));
-			}
-			if (obj instanceof RoleSetGrouping) {
-				return !((RoleSetGrouping) obj).getRoleSets().isEmpty();
-			}
-			if (obj instanceof RoleSet) {
-				return true;// AssociationHelper.getRoleSetGroups((RoleSet)obj).isEmpty();
-			}
-		} else if (filterTypeString.equals(FilterConstants.WORKPRODUCTTYPES)) {
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			// if(obj instanceof Discipline) return true;
-			if (obj instanceof MethodPlugin) {
-				return acceptMethodPlugin(obj, contentElement);
-			}
-			if (obj instanceof ContentCategoriesGroupItemProvider) {
-				return acceptCategoriesGroup(obj, LibraryEditPlugin.INSTANCE
-						.getString("_UI_WorkProductTypes_group"));
-			}
-			if (obj instanceof WorkProductType)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.DOMAINS)) {
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			// if(obj instanceof Discipline) return true;
-			if (obj instanceof MethodPlugin) {
-				return acceptMethodPlugin(obj, contentElement);
-			}
-			if (obj instanceof ContentCategoriesGroupItemProvider) {
-				return acceptCategoriesGroup(obj, LibraryEditPlugin.INSTANCE
-						.getString("_UI_Domains_group")); //$NON-NLS-1$
-			}
-			if (obj instanceof Domain)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.TOOLS)) {
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			// if(obj instanceof Discipline) return true;
-			if (obj instanceof MethodPlugin) {
-				return acceptMethodPlugin(obj, contentElement);
-			}
-			if (obj instanceof ContentCategoriesGroupItemProvider) {
-				return acceptCategoriesGroup(obj, LibraryEditPlugin.INSTANCE
-						.getString("_UI_Tools_group")); //$NON-NLS-1$
-			}
-			if (obj instanceof Tool)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.ROLES)) { //$NON-NLS-1$
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			// if(obj instanceof Discipline) return true;
-			if (obj instanceof MethodPlugin) {
-				return acceptMethodPlugin(obj, contentElement);
-			}
-			if (obj instanceof ContentPackage)
-				return true;
-			if (obj instanceof Role)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.TASKS)) { //$NON-NLS-1$
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			// if(obj instanceof Discipline) return true;
-			if (obj instanceof MethodPlugin) {
-				return acceptMethodPlugin(obj, contentElement);
-			}
-			if (obj instanceof ContentPackage)
-				return true;
-			if (obj instanceof Task)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.WORKPRODUCTS)) { //$NON-NLS-1$
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			// if(obj instanceof Discipline) return true;
-			if (obj instanceof MethodPlugin) {
-				return acceptMethodPlugin(obj, contentElement);
-			}
-			if (obj instanceof ContentPackage)
-				return true;
-			if (obj instanceof WorkProduct)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.GUIDANCE)) { //$NON-NLS-1$
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			// if(obj instanceof Discipline) return true;
-			if (obj instanceof MethodPlugin) {
-				return acceptMethodPlugin(obj, contentElement);
-			}
-			if (obj instanceof ContentPackage)
-				return true;
-			if (obj instanceof Guidance)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.CONTENT_PACKAGES)) {
-
-			if (!helper.matchPattern(obj))
-				return false;
-			// if(obj instanceof Discipline) return true;
-			if (obj instanceof MethodPlugin) {
-				return acceptMethodPlugin(obj, contentElement);
-			}
-			if (obj instanceof ContentPackage)
-				return true;
-			if (obj instanceof CustomCategory)
-				return false;
-			if (obj instanceof Role || obj instanceof Task
-					|| obj instanceof WorkProduct || obj instanceof Guidance)
-				return true;
-			// if(obj instanceof Guidance) return true;
-		} else if (filterTypeString.equals(FilterConstants.CUSTOM_CATEGORIES)) {
-
-			if (!helper.matchPattern(obj))
-				return false;
-			// if(obj instanceof Discipline) return true;
-			if (obj instanceof MethodPlugin) {
-				return acceptMethodPlugin(obj, contentElement);
-			}
-			if (obj instanceof CustomCategory)
-				return true;
-		} else if (filterTypeString.equals(FilterConstants.PROCESSES)) {
-
-			if (!helper.matchPatternBasedOnType(obj))
-				return false;
-			// if(obj instanceof Discipline) return true;
-			if (obj instanceof MethodPlugin) {
-				return acceptMethodPlugin(obj, contentElement);
-			}
-			if (obj instanceof CustomCategory)
-				return false;
-			if (obj instanceof ProcessesItemProvider) {
-				Collection list = ((ProcessesItemProvider) obj)
-						.getChildren(obj);
-				for (Iterator ior = list.iterator(); ior.hasNext();) {
-					Object object = ior.next();
-					if (((CategorizedProcessesItemProvider) object)
-							.getChildren(object).isEmpty())
-						ior.remove();
-				}
-				if (list.isEmpty())
-					return false;
-				else
-					return true;
-			}
-			if (obj instanceof ProcessPackage)
-				return true;
-			if (obj instanceof BreakdownElement)
-				//return true;
-				return childAccept(obj);
-		}
-		return false;
-	}
-
-	protected boolean childAccept(Object obj) {
-		if (obj instanceof MethodConfiguration)
-			return false;
-		if(obj instanceof Milestone) return false;
-		return true;
-	}
-
-	// public FilterHelper getHelper() {
-	// return helper;
-	// }
-	//
-	//	
-	// public void setHelper(FilterHelper helper) {
-	// this.helper = helper;
-	// }
-	protected List getAncestors(CustomCategory methodObject) {
-		List ancestorList = new ArrayList();
-
-		List objList = new ArrayList();
-		objList.add(methodObject);
-
-		getAncestors(ancestorList, objList);
-
-		return ancestorList;
-	}
-
-	protected List getAncestors(List ancestorList, List methodObjectList) {
-		if (methodObjectList.isEmpty())
-			return ancestorList;
-
-		List allParentCustCats = new ArrayList();
-
-		for (Iterator iter = methodObjectList.iterator(); iter.hasNext();) {
-			CustomCategory element = (CustomCategory) iter.next();
-			List parentList = AssociationHelper.getCustomCategories(element);
-			allParentCustCats.addAll(parentList);
-
-		}
-
-		ancestorList.addAll(methodObjectList);
-		List nextCheckList = new ArrayList();
-		for (Iterator iter = allParentCustCats.iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			if (!ancestorList.contains(element))
-				nextCheckList.add(element);
-		}
-
-		return getAncestors(ancestorList, nextCheckList);
-	}
-
-	public boolean acceptMethodPlugin(Object obj, Object contentElement) {
-		if (contentElement != null) {
-			if (MethodElementUtil.getAllModels(contentElement).contains(obj))
-				return true;
-			else
-				return false;
-		} else {
-			return true;
-		}
-	}
-
-	public boolean acceptCategoriesGroup(Object obj, String type) {
-		if (obj instanceof ContentCategoriesGroupItemProvider) {
-			Collection list = ((ContentCategoriesGroupItemProvider) obj)
-					.getChildren(obj);
-			if (list.isEmpty())
-				return false;
-			if (((ContentCategoriesGroupItemProvider) obj).getText(obj).equals(
-					type))
-				return true;
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/CategoryFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/CategoryFilter.java
deleted file mode 100755
index dcf8ca0..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/CategoryFilter.java
+++ /dev/null
@@ -1,74 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import org.eclipse.epf.library.edit.itemsfilter.ICategoryFilter;
-import org.eclipse.epf.uma.ContentCategory;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.MethodPlugin;
-
-
-/**
- * Filter for {@link ContentCategory}
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class CategoryFilter extends AbstractBaseFilter implements
-		ICategoryFilter {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.itemsfilter.ICategoryFilter#getCategoryPackagePath()
-	 */
-	public String[] getCategoryPackagePath() {
-		return helper.getPathBasedOnTabString(helper.getContentCategoryTabStr());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.itemsfilter.ICategoryFilter#getObject()
-	 */
-	public Object getObject() {
-		return helper.getContentElement();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.IFilter#accept(java.lang.Object)
-	 */
-	public boolean accept(Object obj) {
-		// if can't be accdepted by super, return.
-		if (!super.accept(obj)) {
-			return false;
-		}
-
-		if (!helper.checkObjectAccepted(obj))
-			return false;
-
-		if (obj instanceof MethodPlugin) {
-			return helper.acceptMethodPlugin(obj);
-		}
-		if (childAccept(obj))
-			return true;
-		return false;
-	}
-
-	protected boolean childAccept(Object obj) {
-		if (obj instanceof ContentElement)
-			return true;
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ContentFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ContentFilter.java
deleted file mode 100755
index a469046..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ContentFilter.java
+++ /dev/null
@@ -1,78 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import org.eclipse.epf.library.edit.itemsfilter.IContentFilter;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-
-
-/**
- * Filter implements {@link IContentFilter}. Filter content element in content package. 
- * 
- * @author Shashidhar Kannoori
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ContentFilter extends AbstractBaseFilter implements IContentFilter {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.itemsfilter.IContentFilter#getContentPackagePath()
-	 */
-	public String[] getContentPackagePath() {
-		return helper.getPathBasedOnTabString(helper.getTabStr());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.itemsfilter.IContentFilter#getObject()
-	 */
-	public Object getObject() {
-		return helper.getContentElement();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.IFilter#accept(java.lang.Object)
-	 */
-	public boolean accept(Object obj) {
-		// if can't be accdepted by super, return.
-		if (!super.accept(obj)) {
-			return false;
-		}
-
-		// further filtering
-		if (!helper.checkObjectAccepted(obj))
-			return false;
-
-		if (obj instanceof MethodPlugin) {
-			return helper.acceptMethodPlugin(obj);
-		}
-
-		if (childAccept(obj))
-			return true;
-
-		if (obj instanceof ContentPackage) {
-			return helper.acceptContentPackage(obj);
-		}
-
-		return false;
-	}
-
-	protected boolean childAccept(Object obj) {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/CustomCategoryFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/CustomCategoryFilter.java
deleted file mode 100755
index a8540d8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/CustomCategoryFilter.java
+++ /dev/null
@@ -1,83 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import org.eclipse.epf.library.edit.itemsfilter.ICustomFilter;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.MethodPlugin;
-
-
-/**
- * Filter specific for {@link CustomCategory} elements. 
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class CustomCategoryFilter extends AbstractBaseFilter implements
-		ICustomFilter {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.itemsfilter.ICustomFilter#getContentPackagePath()
-	 */
-	public String[] getContentPackagePath() {
-		return helper.getPathBasedOnTabString(helper.getTabStr());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.itemsfilter.ICustomFilter#getObject()
-	 */
-	public Object getObject() {
-		return helper.getContentElement();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.itemsfilter.ICustomFilter#getString()
-	 */
-	public String getString() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.IFilter#accept(java.lang.Object)
-	 */
-	public boolean accept(Object obj) {
-		// if can't be accdepted by super, return.
-		if (!super.accept(obj)) {
-			return false;
-		}
-
-		if (!helper.checkObjectAccepted(obj))
-			return false;
-
-		if (obj instanceof MethodPlugin) {
-			return helper.acceptMethodPlugin(obj);
-		}
-
-		if (childAccept(obj))
-			return true;
-		return false;
-	}
-
-	private boolean childAccept(Object obj) {
-		if (obj instanceof CustomCategory)
-			return true;
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/DescriptorConfigurationFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/DescriptorConfigurationFilter.java
deleted file mode 100755
index 4f803f3..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/DescriptorConfigurationFilter.java
+++ /dev/null
@@ -1,109 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-
-import org.eclipse.epf.library.configuration.ConfigurationFilter;
-import org.eclipse.epf.library.edit.itemsfilter.FilterHelper;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.viewers.Viewer;
-
-
-/**
- *  Method configuration specific filter for filtering elements based on filter pattern
- *  and type after elements are realized within the specified configuraiton.
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class DescriptorConfigurationFilter extends ConfigurationFilter {
-
-	String filterStr;
-
-	MethodConfiguration methodConfiguration;
-
-	protected FilterHelper helper;
-
-	/**
-	 * @param methodConfig
-	 * @param viewer
-	 */
-	public DescriptorConfigurationFilter(MethodConfiguration methodConfig,
-			Viewer viewer, String filterStr) {
-		super(methodConfig, viewer);
-		this.filterStr = filterStr;
-		this.methodConfiguration = methodConfig;
-	}
-
-	public boolean accept(Object obj) {
-
-		if (obj instanceof MethodConfiguration) {
-			return methodConfiguration.equals(obj);
-		}
-
-		if (!super.accept(obj))
-			return false;
-		if(helper != null) {
-			if (helper.isShowPresentationName()) {
-				if (!helper.matchPatternOnPresentationName(obj))
-					return false;
-			} else {
-				if (!helper.matchPattern(obj))
-					return false;
-			}
-			if (!helper.isObjectInSelectedItems(obj))
-				return false;
-		}
-		if (childAccept(obj))
-			return true;
-		return false;
-
-	}
-
-	public java.util.Collection getChildren(Object obj,
-			org.eclipse.emf.ecore.EStructuralFeature childFeature) {
-		// return super.getChildren(obj, childFeature);
-		// Modified code to handle the filtering
-		// to check if the variability of parent is not N/A, filter out already
-		// exisitng
-		// element from children list.
-		Collection col = super.getChildren(obj, childFeature);
-		if(col != null){
-		for (Iterator itor = col.iterator(); itor.hasNext();) {
-			Object element = itor.next();
-			if (!accept(element))
-				itor.remove();
-		}
-		}else{
-			col = Collections.EMPTY_LIST;
-		}
-
-		return col;
-	}
-
-	public boolean childAccept(Object obj) {
-		return false;
-	}
-
-	public void setHelper(FilterHelper helper) {
-		this.helper = helper;
-	}
-	
-	public void setMethodConfiguration(MethodConfiguration config)
-	{
-		super.setMethodConfiguration(config);
-		this.methodConfiguration = config;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/DescriptorProcessFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/DescriptorProcessFilter.java
deleted file mode 100755
index 3bc63db..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/DescriptorProcessFilter.java
+++ /dev/null
@@ -1,122 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.epf.library.configuration.ProcessConfigurator;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.itemsfilter.IProcessFilter;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-
-
-/**
- * {@link Process} filter for filtering {@link Process} elements. 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class DescriptorProcessFilter extends AbstractBaseFilter implements
-		IProcessFilter {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.itemsfilter.IFilter#getObject()
-	 */
-	public Object getObject() {
-		return helper.getContentElement();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.IFilter#accept(java.lang.Object)
-	 */
-	public boolean accept(Object obj) {
-		// if can't be accdepted by super, return.
-		if (!super.accept(obj)) {
-			return false;
-		}
-
-		if (!helper.isObjectInSelectedItems(obj))
-			return false;
-		if (!matchPattern(obj))
-			return false;
-		if (obj instanceof ProcessComponent)
-			return true;
-		if (obj instanceof Process)
-			return true;
-		if (childAccept(obj))
-			return true;
-
-		return false;
-	}
-
-	protected boolean childAccept(Object obj) {
-		return false;
-	}
-
-	public boolean matchPattern(Object obj) {
-		// if no valid filter type or pattern, always return true
-		String filterTypeStr = helper.getFilterTypeStr();
-		// String pattern = helper.getPattern();
-		String tabStr = helper.getTabStr();
-		Pattern regexPattern = helper.getRegexPattern();
-		if (helper.getFilterTypeStr() == null || helper.getPattern() == null
-				|| helper.getPattern().equalsIgnoreCase("")) //$NON-NLS-1$
-			return true;
-
-		if (filterTypeStr.equalsIgnoreCase(tabStr)) {
-			if (obj instanceof BreakdownElement) {
-				if (obj instanceof Activity)
-					return true;
-				Matcher m = regexPattern.matcher(((BreakdownElement) obj)
-						.getName());
-				boolean found = m.matches();
-				if (found)
-					return true;
-				else {
-					return false;
-				}
-			} else {
-				// else for all other types of elements
-				return true;
-			}
-		} else
-			// the All case
-			return true;
-	}
-
-	protected void getActivitiesInScope(AdapterFactory adapterFactory,
-			BreakdownElement element, List activityList) {
-		ItemProviderAdapter adapter = (ItemProviderAdapter) adapterFactory
-				.adapt(element, ITreeItemContentProvider.class);
-		Object parent = adapter.getParent(element);
-		if (parent instanceof Activity) {
-			activityList.add(parent);
-			getActivitiesInScope(adapterFactory, (BreakdownElement) parent,
-					activityList);
-		}
-	}
-	public DescriptorProcessFilter(MethodConfiguration config) {
-		setAdditionalFilters(new IFilter[] { new ProcessConfigurator(config, null) });
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ExProcessAuthoringConfigurator.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ExProcessAuthoringConfigurator.java
deleted file mode 100755
index e180631..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ExProcessAuthoringConfigurator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * 
- */
-package org.eclipse.epf.authoring.ui.filters;
-
-import org.eclipse.epf.library.configuration.ProcessAuthoringConfigurator;
-import org.eclipse.epf.library.edit.itemsfilter.FilterHelper;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * Configuration filter that still shows certain elements during process authoring that
- * ProcessConfigurator does not show. Filter elements based on search pattern and type.
- * @author skannoor
- *
- */
-public class ExProcessAuthoringConfigurator extends
-		ProcessAuthoringConfigurator {
-
-	String filterStr;
-
-	MethodConfiguration methodConfiguration;
-
-	protected FilterHelper helper;
-	/**
-	 * @param methodConfig
-	 * @param viewer
-	 */
-	public ExProcessAuthoringConfigurator(MethodConfiguration methodConfig,
-			Viewer viewer) {
-		super(methodConfig, viewer);
-		//this.filterStr = filterStr;
-		this.methodConfiguration = methodConfig;
-		// TODO Auto-generated constructor stub
-	}
-
-	public boolean accept(Object obj) {
-
-		if(obj == null) return false;
-		
-		if (obj instanceof MethodConfiguration) {
-			return methodConfiguration.equals(obj);
-		}
-
-//		if (!super.accept(obj))
-//			return false;
-		if (methodConfig == null)
-			return true;
-
-		obj = LibraryUtil.unwrap(obj);
-
-//		if (obj instanceof MethodPackage) {
-//			return methodConfig.getMethodPackageSelection().contains(obj);
-//		} else if (obj instanceof ItemProviderAdapter) {
-//			return true;
-//		} else {
-//			if(Log.DEBUG) {
-//				System.out.println("Object filtered: " + (obj == null ? null : obj.toString())); //$NON-NLS-1$
-//			}
-//		}
-		if (helper.isShowPresentationName()) {
-			if (!helper.matchPatternOnPresentationName(obj))
-				return false;
-		} else {
-			if (!helper.matchPattern(obj))
-				return false;
-		}
-		if (!helper.isObjectInSelectedItems(obj))
-			return false;
-		if (childAccept(obj))
-			return true;
-		return false;
-
-	}
-
-	public boolean childAccept(Object obj) {
-		return false;
-	}
-
-	public void setHelper(FilterHelper helper) {
-		this.helper = helper;
-	}
-	
-	public void setMethodConfiguration(MethodConfiguration config)
-	{
-		super.setMethodConfiguration(config);
-		this.methodConfiguration = config;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/GuidanceFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/GuidanceFilter.java
deleted file mode 100755
index 343d8bb..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/GuidanceFilter.java
+++ /dev/null
@@ -1,70 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import org.eclipse.epf.library.edit.itemsfilter.FilterInitializer;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.EstimationConsiderations;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.Report;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.Template;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.WorkProduct;
-
-
-/**
- * Filter for {@link Guidance} type elements.
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class GuidanceFilter extends ContentFilter {
-
-	protected boolean childAccept(Object obj) {
-//		 When type is selected allow those Class types to display.
-		Class cls = FilterInitializer.getInstance().
-						getClassForType(helper.getFilterTypeStr());
-		if(cls != null){
-			if(cls.isInstance(obj)){
-				return true;
-			}else{
-				return false;
-			}
-		}
-		// For all ContentElement - these guidances are associated
-		if (obj instanceof Checklist || obj instanceof Concept
-				|| obj instanceof Example || obj instanceof SupportingMaterial
-				|| obj instanceof Guideline || obj instanceof ReusableAsset)	
-			return true;
-		
-		// For task extra guidances
-		if(helper.getContentElement() instanceof Task){
-			if(obj instanceof ToolMentor 
-					|| obj instanceof EstimationConsiderations)
-				return true;
-		}
-		// For workProduct Extra guidances.
-		if(helper.getContentElement() instanceof WorkProduct){
-			if(obj instanceof Report || obj instanceof Template
-					|| obj instanceof ToolMentor 
-					|| obj instanceof EstimationConsiderations)
-				return true;
-		}
-		
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessActivityFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessActivityFilter.java
deleted file mode 100755
index be51571..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessActivityFilter.java
+++ /dev/null
@@ -1,154 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import org.eclipse.epf.library.edit.configuration.CategorizedProcessesItemProvider;
-import org.eclipse.epf.library.edit.configuration.ProcessesItemProvider;
-import org.eclipse.epf.library.edit.itemsfilter.FilterHelper;
-import org.eclipse.epf.library.edit.ui.IActionTypeProvider;
-import org.eclipse.epf.library.edit.util.TngUtil;
-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.MethodConfiguration;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.jface.viewers.TableViewer;
-
-
-/**
- * Activity Filter for doing Process copy/extend
- * 
- * @author Shashidhar Kannoori
- * @author Shilpa Toraskar
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class ProcessActivityFilter extends DescriptorConfigurationFilter {
-
-	private Activity activity = null;
-
-	private int command = 0;
-
-	private ActivityVariabilityFilter delegateFilter;
-
-	public ProcessActivityFilter(MethodConfiguration config,
-			TableViewer viewer, String tabName, Activity activity, int command) {
-		super(config, viewer, tabName);
-		this.activity = activity;
-		this.command = command;
-		delegateFilter = new ActivityVariabilityFilter(config, viewer, tabName, activity);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.filters.DescriptorConfigurationFilter#setHelper(org.eclipse.epf.library.edit.itemsfilter.FilterHelper)
-	 */
-	public void setHelper(FilterHelper helper) {
-		super.setHelper(helper);
-		delegateFilter.setHelper(helper);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.filters.DescriptorConfigurationFilter#accept(java.lang.Object)
-	 */
-	public boolean accept(Object obj) {
-		// any activity can be deep-copied
-		//
-		if(command == IActionTypeProvider.DEEP_COPY && 
-				(obj instanceof Activity || obj instanceof ProcessComponent)) {
-			return true;
-		}
-		return super.accept(obj);
-	}
-
-	public boolean childAccept(Object obj) {
-		if (obj instanceof ProcessesItemProvider) {
-			return true;
-		}
-		if (obj instanceof CategorizedProcessesItemProvider) {
-			return true;
-
-		}
-		
-//		if ((obj instanceof Activity) || obj instanceof ProcessPackage) {
-//			if (obj instanceof ProcessComponent) {
-//				// if source and taget is same process, block it
-//				Process proc = ((ProcessComponent) obj).getProcess();
-//				if (!(this.command == IActionTypeProvider.COPY)) {
-//					if (proc.equals(this.activity))
-//						return false;
-//				}
-//			}
-//			if (obj instanceof Process) {
-//				// if source and taget is same process, block it
-//				Process proc = (Process) obj;
-//				if (!(this.command == IActionTypeProvider.COPY)) {
-//					if (proc.equals(this.activity))
-//						return false;
-//				}
-//			}
-//
-//			if (obj instanceof BreakdownElement) {
-//				Process srcProc = TngUtil
-//						.getOwningProcess((BreakdownElement) obj);
-//				Process targetProc = TngUtil
-//						.getOwningProcess((BreakdownElement) this.activity);
-//				if (srcProc instanceof DeliveryProcess
-//						&& targetProc instanceof CapabilityPattern) {
-//					return false;
-//				}
-//			}
-//			if (obj instanceof Process) {
-//				Process proc = (Process) obj;
-//				if (proc.equals(this.activity))
-//					return false;
-//			}
-//
-//			return true;
-//		} else
-//			return false;
-		
-		if(obj instanceof Activity || obj instanceof ProcessPackage) {
-			switch(command) {
-				case IActionTypeProvider.EXTEND:
-					return delegateFilter.accept(obj);
-				case IActionTypeProvider.COPY:
-					// disallow copying from delivery process to capability pattern
-					//
-					Process srcProc = null;
-					if (obj instanceof ProcessComponent) {
-						// if source and taget is same process, block it
-						srcProc = ((ProcessComponent) obj).getProcess();
-					}
-					else if (obj instanceof BreakdownElement) {
-						BreakdownElement be = (BreakdownElement) obj;
-						srcProc = TngUtil.getOwningProcess(be);
-					}
-					if(srcProc != null) {
-						Process targetProc = TngUtil.getOwningProcess(this.activity);
-						if (srcProc instanceof DeliveryProcess
-								&& targetProc instanceof CapabilityPattern) {
-							return false;
-						}
-						else {
-							return true;
-						}
-					}
-				default:
-					return true;
-			}
-		}
-		
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessGuidanceFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessGuidanceFilter.java
deleted file mode 100755
index fed4e59..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessGuidanceFilter.java
+++ /dev/null
@@ -1,50 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import java.util.Collection;
-
-import org.eclipse.epf.library.edit.configuration.GuidanceGroupingItemProvider;
-import org.eclipse.epf.library.edit.configuration.GuidanceItemProvider;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.viewers.TableViewer;
-
-
-/**
- * Guidance Filter for Work breakdown structure. 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class ProcessGuidanceFilter extends DescriptorConfigurationFilter {
-
-	public ProcessGuidanceFilter(MethodConfiguration config,
-			TableViewer viewer, String tabName) {
-		super(config, viewer, tabName);
-	}
-
-	public boolean accept(Object obj) {
-		return super.accept(obj);
-	}
-
-	public boolean childAccept(Object obj) {
-		if (obj instanceof GuidanceGroupingItemProvider)
-			return true;
-		if ((obj instanceof GuidanceItemProvider)) {
-			Collection col = ((GuidanceItemProvider) obj).getChildren(obj);
-			if (col.isEmpty())
-				return false;
-			else
-				return true;
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessRoleFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessRoleFilter.java
deleted file mode 100755
index 4cbeca5..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessRoleFilter.java
+++ /dev/null
@@ -1,72 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import java.util.Iterator;
-
-import org.eclipse.epf.library.edit.LibraryEditPlugin;
-import org.eclipse.epf.library.edit.configuration.CategoriesItemProvider;
-import org.eclipse.epf.library.edit.configuration.UncategorizedItemProvider;
-import org.eclipse.epf.library.edit.element.RoleItemProvider;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.jface.viewers.TableViewer;
-
-
-/**
- * Filters {@link RoleSet}, {@link RoleSetGrouping} in specific {@link MethodConfiguration}
- * based on search pattern. 
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class ProcessRoleFilter extends DescriptorConfigurationFilter {
-
-	public ProcessRoleFilter(MethodConfiguration config, TableViewer viewer,
-			String tabName) {
-		super(config, viewer, tabName);
-	}
-
-	public boolean childAccept(Object obj) {
-		if (obj instanceof CategoriesItemProvider) {
-			if (((CategoriesItemProvider) obj).getText(obj).equalsIgnoreCase(
-					LibraryEditPlugin.INSTANCE.getString("_UI_Role_Sets_group"))) //$NON-NLS-1$
-				return true;
-		}
-		if ((obj instanceof RoleItemProvider) || (obj instanceof Role)
-				|| (obj instanceof UncategorizedItemProvider))
-			return true;
-		
-		if(obj instanceof RoleSetGrouping){
-			Iterator iter = (TngUtil.getContributors((VariabilityElement)obj));
-			if(iter != null){
-				while(iter.hasNext()){
-					RoleSetGrouping grouping = (RoleSetGrouping)iter.next();
-					// TODO : Check for (recursive)RoleSets is empty, 
-					// if roleset's roles are empty donot show Discipline grouping 
-					if(!grouping.getRoleSets().isEmpty()) return true;
-				}
-			}
-			// TODO : Check for (recursive)RoleSets is empty, 
-			// if roleset's roles are empty donot show Discipline grouping 
-			return !((RoleSetGrouping)obj).getRoleSets().isEmpty();
-		}
-		if(obj instanceof RoleSet){
-			return !((RoleSet)obj).getRoles().isEmpty();
-		}
-		else
-			return false;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessSpecificWorkProductFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessSpecificWorkProductFilter.java
deleted file mode 100755
index 495b978..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessSpecificWorkProductFilter.java
+++ /dev/null
@@ -1,55 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductType;
-import org.eclipse.jface.viewers.TableViewer;
-
-
-/**
- * Filters {@link WorkProduct}s based on {@link MethodConfiguration} and search pattern.
- * and {@link WorkProductType}  
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class ProcessSpecificWorkProductFilter extends ProcessWorkProductFilter {
-
-	Class workProductType = null;
-
-	public ProcessSpecificWorkProductFilter(MethodConfiguration config,
-			TableViewer viewer, String tabName, Class type) {
-		super(config, viewer, tabName);
-		this.workProductType = type;
-	}
-
-	public boolean childAccept(Object obj) {
-		if (super.childAccept(obj)) {
-			if (obj instanceof WorkProduct) {
-				if (workProductType == null)
-					return true;
-				else if (obj.getClass().equals(this.workProductType)) {
-					return true;
-				} else {
-					return false;
-				}
-
-			} else {
-				return true;
-			}
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessTaskFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessTaskFilter.java
deleted file mode 100755
index bba7b50..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessTaskFilter.java
+++ /dev/null
@@ -1,71 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import java.util.Iterator;
-
-import org.eclipse.epf.library.edit.LibraryEditPlugin;
-import org.eclipse.epf.library.edit.configuration.CategoriesItemProvider;
-import org.eclipse.epf.library.edit.configuration.UncategorizedItemProvider;
-import org.eclipse.epf.library.edit.element.TaskItemProvider;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.jface.viewers.TableViewer;
-
-
-/**
- * Filters {@link Task}s in {@link MethodConfiguration} based on search pattern.
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class ProcessTaskFilter extends DescriptorConfigurationFilter {
-
-	public ProcessTaskFilter(MethodConfiguration config, TableViewer viewer,
-			String tabName) {
-		super(config, viewer, tabName);
-	}
-
-	public boolean childAccept(Object obj) {
-		if (obj instanceof CategoriesItemProvider) {
-			if (((CategoriesItemProvider) obj).getText(obj).equalsIgnoreCase(
-					LibraryEditPlugin.INSTANCE
-							.getString("_UI_Disciplines_group"))) //$NON-NLS-1$
-				return true;
-		}
-		if ((obj instanceof TaskItemProvider) || (obj instanceof Task)
-				|| (obj instanceof UncategorizedItemProvider))
-			return true;
-		if(obj instanceof DisciplineGrouping){
-			Iterator iter = (TngUtil.getContributors((VariabilityElement)obj));
-			if(iter != null){
-				while(iter.hasNext()){
-					DisciplineGrouping grouping = (DisciplineGrouping)iter.next();
-					// TODO : Check for (recursive)Discipline is empty, 
-					// if discipline's tasks are empty donot show Discipline grouping 
-					if(!grouping.getDisciplines().isEmpty()) return true;
-				}
-			}
-			// TODO : Check for (recursive)Discipline is empty, 
-			// if discipline's tasks are empty donot show Discipline grouping 
-			return !((DisciplineGrouping)obj).getDisciplines().isEmpty();
-		}
-		if(obj instanceof Discipline){
-			return !((Discipline)obj).getTasks().isEmpty();
-		}
-			return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessViewFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessViewFilter.java
deleted file mode 100755
index d846522..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessViewFilter.java
+++ /dev/null
@@ -1,71 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import org.eclipse.epf.authoring.ui.dialogs.ItemsFilterDialog;
-import org.eclipse.epf.library.edit.configuration.CategoriesItemProvider;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.WorkProductType;
-import org.eclipse.jface.viewers.Viewer;
-
-
-/**
- * Filter {@link Process}es within {@link MethodConfiguration} used in
- * {@link ItemsFilterDialog}.
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class ProcessViewFilter extends DescriptorConfigurationFilter {
-
-	public ProcessViewFilter(MethodConfiguration methodConfig, Viewer viewer,
-			String filterStr) {
-		super(methodConfig, viewer, filterStr);
-	}
-
-	public boolean childAccept(Object obj) {
-		String filterType = helper.getFilterTypeStr();
-		if (obj instanceof CategoriesItemProvider) {
-			return true;
-		}
-		if (filterType.equalsIgnoreCase(FilterConstants.ROLESETS)) {
-			return (obj instanceof RoleSet || obj instanceof RoleSetGrouping);
-		} else if (filterType.equalsIgnoreCase(FilterConstants.DISCIPLINES)) {
-			return (obj instanceof Discipline || obj instanceof DisciplineGrouping);
-		} else if (filterType.equalsIgnoreCase(FilterConstants.DOMAINS)) {
-			return (obj instanceof Domain);
-		} else if (filterType
-				.equalsIgnoreCase(FilterConstants.WORKPRODUCTTYPES)) {
-			return (obj instanceof WorkProductType);
-		} else if (filterType.equalsIgnoreCase(FilterConstants.TOOLS)) {
-			return (obj instanceof Tool);
-		} else if (filterType
-				.equalsIgnoreCase(FilterConstants.CUSTOM_CATEGORIES)) {
-			return obj instanceof CustomCategory;
-		} else if (filterType.equalsIgnoreCase(FilterConstants.ALL_ELEMENTS)) {
-			return obj instanceof RoleSet || obj instanceof Discipline
-					|| obj instanceof Domain || obj instanceof WorkProductType
-					|| obj instanceof Tool || obj instanceof CustomCategory
-					|| obj instanceof DisciplineGrouping
-					|| obj instanceof RoleSetGrouping;
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessWorkProductFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessWorkProductFilter.java
deleted file mode 100755
index c3ff30f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ProcessWorkProductFilter.java
+++ /dev/null
@@ -1,60 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import org.eclipse.epf.library.edit.LibraryEditPlugin;
-import org.eclipse.epf.library.edit.configuration.CategoriesItemProvider;
-import org.eclipse.epf.library.edit.configuration.DomainItemProvider;
-import org.eclipse.epf.library.edit.configuration.UncategorizedItemProvider;
-import org.eclipse.epf.library.edit.element.WorkProductItemProvider;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductType;
-import org.eclipse.jface.viewers.TableViewer;
-
-
-/**
- * Filters {@link WorkProduct}s with in {@link MethodConfiguration}. 
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class ProcessWorkProductFilter extends DescriptorConfigurationFilter {
-
-	public ProcessWorkProductFilter(MethodConfiguration config,
-			TableViewer viewer, String tabName) {
-		super(config, viewer, tabName);
-	}
-
-	public boolean childAccept(Object obj) {
-		if (obj instanceof CategoriesItemProvider) {
-			if (((CategoriesItemProvider) obj).getText(obj).equalsIgnoreCase(
-					LibraryEditPlugin.INSTANCE
-							.getString("_UI_WorkProductTypes_group"))) //$NON-NLS-1$
-				return true;
-		}
-		if (obj instanceof CategoriesItemProvider) {
-			if (((CategoriesItemProvider) obj).getText(obj).equalsIgnoreCase(
-					LibraryEditPlugin.INSTANCE.getString("_UI_Domains_group"))) //$NON-NLS-1$
-				return true;
-		}
-		if ((obj instanceof WorkProductItemProvider)
-				|| (obj instanceof WorkProduct)
-				|| (obj instanceof UncategorizedItemProvider)
-				|| (obj instanceof Domain)
-				|| (obj instanceof DomainItemProvider)
-				|| (obj instanceof WorkProductType))
-			return true;
-		else
-			return false;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ReferenceWorkFlowFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ReferenceWorkFlowFilter.java
deleted file mode 100755
index 0ba01db..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/ReferenceWorkFlowFilter.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.epf.library.edit.itemsfilter.CategorizedProcessesItemProvider;
-import org.eclipse.epf.library.edit.itemsfilter.IAllFilter;
-import org.eclipse.epf.library.edit.itemsfilter.ProcessesItemProvider;
-import org.eclipse.epf.library.edit.util.MethodElementUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessPackage;
-
-
-/**
- * Filters the {@link Process}s for reference workflows of {@link Discipline}. 
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class ReferenceWorkFlowFilter extends AbstractBaseFilter implements
-		IAllFilter {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.itemsfilter.IAllFilter#getObject()
-	 */
-	public Object getObject() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.library.edit.IFilter#accept(java.lang.Object)
-	 */
-	public boolean accept(Object obj) {
-		// if can't be accdepted by super, return.
-		if (!super.accept(obj)) {
-			return false;
-		}
-
-		Object contentElement = helper.getContentElement();
-		if (contentElement != null) {
-			if (obj.equals(helper.getContentElement()))
-				return false;
-		}
-
-		if (helper.getAlreadySelectedList() != null) {
-			if (obj instanceof ProcessComponent) {
-				if (helper.getAlreadySelectedList().contains(
-						((ProcessComponent) obj).getProcess()))
-					return false;
-			}
-			if(helper.getAlreadySelectedList().contains(obj))
-				return false;
-		}
-		if (!helper.matchPattern(obj))
-			return false;
-
-		if (obj instanceof MethodPlugin) {
-			if (contentElement != null) {
-				if (MethodElementUtil.getAllModels(contentElement)
-						.contains(obj))
-					return true;
-				else
-					return false;
-			} else {
-				return true;
-			}
-		}
-		if (obj instanceof ProcessesItemProvider) {
-			Collection list = ((ProcessesItemProvider) obj).getChildren(obj);
-			for (Iterator ior = list.iterator(); ior.hasNext();) {
-				Object object = ior.next();
-				if (((CategorizedProcessesItemProvider) object).getChildren(
-						object).isEmpty())
-					ior.remove();
-			}
-			if (list.isEmpty())
-				return false;
-			else
-				return true;
-		}
-		if (obj instanceof Activity)
-			return true;
-		if (obj instanceof ProcessPackage) {
-			if (!(obj instanceof ProcessComponent)) {
-				if (((ProcessPackage) obj).getProcessElements().isEmpty()
-						&& ((ProcessPackage) obj).getChildPackages().isEmpty())
-					return false;
-				else
-					return true;
-			} else {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/RoleFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/RoleFilter.java
deleted file mode 100755
index 99cc43b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/RoleFilter.java
+++ /dev/null
@@ -1,59 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import org.eclipse.epf.library.edit.util.MethodElementUtil;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Role;
-
-
-/**
- * Filters {@link Role} 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class RoleFilter extends AllFilter {
-
-	public boolean accept(Object obj) {
-		Object contentElement = getHelper().getContentElement();
-		if (contentElement != null) {
-			if (obj.equals(contentElement))
-				return false;
-		}
-
-		if (getHelper().getAlreadySelectedList() != null) {
-			if (getHelper().getAlreadySelectedList().contains(obj))
-				return false;
-		}
-		if (!getHelper().matchPattern(obj))
-			return false;
-		if (obj instanceof MethodPlugin) {
-			if (obj instanceof MethodPlugin) {
-				if (contentElement != null) {
-					if (MethodElementUtil.getAllModels(contentElement)
-							.contains(obj))
-						return true;
-					else
-						return false;
-				} else {
-					return true;
-				}
-			}
-		}
-		if (obj instanceof ContentPackage)
-			return true;
-		if (obj instanceof Role)
-			return true;
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/VariabilityProcessRoleFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/VariabilityProcessRoleFilter.java
deleted file mode 100755
index 30d0e93..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/VariabilityProcessRoleFilter.java
+++ /dev/null
@@ -1,50 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.process.command.ProcessCommandUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.jface.viewers.TableViewer;
-
-
-/**
- * Filters {@link Process}'s {@link Role} within {@link MethodConfiguration}
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class VariabilityProcessRoleFilter extends ProcessRoleFilter {
-
-	Activity activity = null;
-
-	public VariabilityProcessRoleFilter(MethodConfiguration config,
-			TableViewer viewer, String tabName, Activity activity) {
-		super(config, viewer, tabName);
-		this.activity = activity;
-	}
-
-	public boolean childAccept(Object obj) {
-		if (super.childAccept(obj)) {
-//			if (ProcessUtil.getVariabilityElement(this.activity).contains(obj)) {
-//				return false;
-//			} else
-//				return true;
-			return ProcessCommandUtil.getValidDescriptor(obj, activity, TngAdapterFactory.INSTANCE.getOBS_ComposedAdapterFactory()) == null;
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/VariabilityProcessTaskFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/VariabilityProcessTaskFilter.java
deleted file mode 100755
index 808c692..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/VariabilityProcessTaskFilter.java
+++ /dev/null
@@ -1,49 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.process.command.ProcessCommandUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.jface.viewers.TableViewer;
-
-
-/**
- * Filters {@link Process}'s {@link Task} within {@link MethodConfiguration}
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class VariabilityProcessTaskFilter extends ProcessTaskFilter {
-
-	Activity activity = null;
-
-	public VariabilityProcessTaskFilter(MethodConfiguration config,
-			TableViewer viewer, String tabName, Activity activity) {
-		super(config, viewer, tabName);
-		this.activity = activity;
-	}
-
-	public boolean childAccept(Object obj) {
-		if (super.childAccept(obj)) {
-//			if (ProcessUtil.getVariabilityElement(this.activity).contains(obj)) {
-//				return false;
-//			} else
-//				return true;
-			return ProcessCommandUtil.getValidDescriptor(obj, activity, TngAdapterFactory.INSTANCE.getWBS_ComposedAdapterFactory()) == null;
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/VariabilityProcessWorkProductFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/VariabilityProcessWorkProductFilter.java
deleted file mode 100755
index e42c2bb..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/VariabilityProcessWorkProductFilter.java
+++ /dev/null
@@ -1,50 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.process.command.ProcessCommandUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.jface.viewers.TableViewer;
-
-
-/**
- * Filters {@link Process}'s {@link WorkProduct} within {@link MethodConfiguration}
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class VariabilityProcessWorkProductFilter extends
-		ProcessWorkProductFilter {
-
-	Activity activity = null;
-
-	public VariabilityProcessWorkProductFilter(MethodConfiguration config,
-			TableViewer viewer, String tabName, Activity activity) {
-		super(config, viewer, tabName);
-		this.activity = activity;
-	}
-
-	public boolean childAccept(Object obj) {
-		if (super.childAccept(obj)) {
-//			if (ProcessUtil.getVariabilityElement(this.activity).contains(obj)) {
-//				return false;
-//			} else
-//				return true;
-			return ProcessCommandUtil.getValidDescriptor(obj, activity, TngAdapterFactory.INSTANCE.getPBS_ComposedAdapterFactory()) == null;
-		} else {
-			return false;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/WorkProductFilter.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/WorkProductFilter.java
deleted file mode 100755
index fd62136..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/WorkProductFilter.java
+++ /dev/null
@@ -1,29 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.filters;
-
-import org.eclipse.epf.uma.WorkProduct;
-
-/**
- * Filters {@link WorkProduct} based on search pattern
- * @author Shashidhar Kannoori
- * @since 1.0
- */
-public class WorkProductFilter extends ContentFilter {
-
-	protected boolean childAccept(Object obj) {
-		if (obj instanceof WorkProduct) {
-			return true;
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/package.html
deleted file mode 100755
index a98d475..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/filters/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides filters for the method and process elements.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/AssociationFormPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/AssociationFormPage.java
deleted file mode 100755
index dcb6187..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/AssociationFormPage.java
+++ /dev/null
@@ -1,1390 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.actions.LibraryViewFindElementAction;
-import org.eclipse.epf.authoring.ui.dialogs.ContentElementsOrderDialog;
-import org.eclipse.epf.authoring.ui.dialogs.ItemsFilterDialog;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.util.EditorsContextHelper;
-import org.eclipse.epf.authoring.ui.util.UIHelper;
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.LibraryEditResources;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.util.CategorySortHelper;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.library.util.LibraryManager;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodElementProperty;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-
-
-/**
- * The base class for all Association type form pages in the Method editors.
- * 
- * @author Jeff Hardy
- * @author Shashidhar Kannoori
- * @author Kelvin Low
- * @since 1.0
- */
-public class AssociationFormPage extends BaseFormPage implements IMenuListener {
-
-	protected static final String PACKAGE_PREFIX = "AuthoringUI."; //$NON-NLS-1$	
-
-	protected IStructuredContentProvider contentProviderSelected;
-
-	protected ILabelProvider labelProviderSelected = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory()) {
-		public String getColumnText(Object object, int columnIndex) {
-			return TngUtil.getLabelWithPath(object);
-		}
-	};
-
-	protected IStructuredContentProvider contentProviderSelected2;
-
-	protected ILabelProvider labelProviderSelected2 = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory()) {
-		public String getColumnText(Object object, int columnIndex) {
-			return TngUtil.getLabelWithPath(object);
-		}
-	};
-
-	protected IStructuredContentProvider contentProviderSelected3;
-
-	protected ILabelProvider labelProviderSelected3 = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory()) {
-		public String getColumnText(Object object, int columnIndex) {
-			return TngUtil.getLabelWithPath(object);
-		}
-	};
-
-	protected Section aSection;
-
-	protected Composite aComposite;
-
-	protected TableViewer viewer_selected, viewer_selected2, viewer_selected3;
-
-	protected Table ctrl_selected, ctrl_selected2, ctrl_selected3;
-
-	protected Button ctrl_add, ctrl_remove, ctrl_add2, ctrl_remove2, ctrl_add3,
-			ctrl_remove3;
-
-	protected Button ctrl_up1, ctrl_down1, ctrl_up2, ctrl_down2, ctrl_up3,
-			ctrl_down3;
-
-	protected Text ctrl_briefDesc;
-
-	protected Button ctrl_select, ctrl_clear;
-
-	protected ArrayList usedCategories = new ArrayList();
-
-	protected Label label_Category, label_Category2, label_Category3;
-
-	private boolean useCategory1 = true;
-
-	private boolean useCategory2 = true;
-
-	private boolean useCategory3 = true;
-
-	private boolean allowChange1 = true;
-
-	private boolean allowChange2 = true;
-
-	private boolean allowChange3 = true;
-
-	private boolean isUpAndDownButtonsRequired1 = false;
-
-	private boolean isUpAndDownButtonsRequired2 = false;
-
-	private boolean isUpAndDownButtonsRequired3 = false;
-
-	private boolean categoryIsSingleSelection1 = false;
-
-	private boolean categoryIsSingleSelection2 = false;
-
-	private boolean categoryIsSingleSelection3 = false;
-
-	private LibraryViewFindElementAction libraryViewFindElementAction;
-	// strings used in the form
-	protected String formNamePrefix = "Form prefix"; //$NON-NLS-1$
-
-	protected String sectionName = "Section name"; //$NON-NLS-1$
-
-	protected String sectionDesc = "Section description"; //$NON-NLS-1$
-
-	protected String selectedLabel = "Selected Label 1"; //$NON-NLS-1$
-
-	protected String selectedLabel2 = "Selected Label 2"; //$NON-NLS-1$
-
-	protected String selectedLabel3 = "Selected Label 3"; //$NON-NLS-1$
-
-	// Data model methods.
-	protected void addItemsToModel1(ArrayList newItems) {
-	}
-
-	protected void addItemsToModel2(ArrayList newItems) {
-	}
-
-	protected void addItemsToModel3(ArrayList newItems) {
-	}
-
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-	}
-
-	protected void removeItemsFromModel2(ArrayList rmItems) {
-	}
-
-	protected void removeItemsFromModel3(ArrayList rmItems) {
-	}
-
-	protected void moveUpItemsInSelectedItems1(ArrayList moveUpItems) {
-	}
-
-	protected void moveDownItemsInSelectedItems1(ArrayList moveDownItems) {
-	}
-	
-	// Viewer methods.
-	protected void initContentProviderSelected() {
-	}
-
-	protected void initContentProviderSelected2() {
-	}
-
-	protected void initContentProviderSelected3() {
-	}
-
-	protected Object getContentElement() {
-		return null;
-	}
-
-	protected String getTabString() {
-		return "contentelement";} //$NON-NLS-1$
-
-	protected String getTabString2() {
-		return getTabString();
-	}
-
-	protected String getTabString3() {
-		return getTabString();
-	}
-
-	/*
-	 * getFilterTypes should be override to pass types.
-	 */
-	protected String[] getFilterTypes(){
-		return null;
-	}
-	/*
-	 * getFilterTypes should be override to pass types.
-	 */
-	protected String[] getFilterTypes2(){
-		return null;
-	}
-	/*
-	 * getFilterTypes should be override to pass types.
-	 */
-	protected String[] getFilterTypes3(){
-		return null;
-	}
-
-	protected MethodElementEditor editor = (MethodElementEditor) getEditor();
-
-	// Filter info.
-	protected IFilter filter, filter2, filter3;
-
-	protected IFilter getFilter() {
-		return filter;
-	}
-
-	protected IFilter getFilter2() {
-		return filter;
-	}
-
-	protected IFilter getFilter3() {
-		return filter;
-	}
-
-	// Ordering of contributed categorized elements in custom
-	// categories
-	protected Button ctrl_ordering;
-
-	protected ComboViewer viewer_sort1;
-	
-	protected IStructuredContentProvider contentProviderSort = new AdapterFactoryContentProvider(
-			TngAdapterFactory.INSTANCE.getNavigatorView_ComposedAdapterFactory()) {
-		public Object[] getElements(Object object) {
-			List<String> sortTypesList = CategorySortHelper.getCategorySortTypes();
-			return sortTypesList.toArray();
-		}
-	};
-
-	protected ILabelProvider labelProviderSort = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory()) {
-		public String getText(Object object) {
-			if (object instanceof String) {
-				String str = ((String)object);
-				return CategorySortHelper.getSortTypeDisplayName(str);
-			}
-			return null;
-		}
-	};
-	
-	/**
-	 * Creates a new instance.
-	 */
-	public AssociationFormPage(FormEditor editor, String id, String name) {
-		super(editor, id, name);
-		this.editorTabName = name;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.BaseFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.createFormContent(IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-
-		UIHelper.setFormText(form, contentElement);
-		
-		// Create a section.
-		aSection = toolkit.createSection(form.getBody(), Section.TITLE_BAR
-				| Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		aSection.setLayoutData(td);
-		aSection.setText(getSectionName());
-		aSection.setDescription(getSectionDescription());
-		aSection.setLayout(new GridLayout());
-
-		aComposite = toolkit.createComposite(aSection);
-		aComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		aComposite.setLayout(new GridLayout(2, false));
-		aSection.setClient(aComposite);
-
-		int numTablesUsed = 0;
-
-		if (useCategory1)
-			numTablesUsed++;
-		if (useCategory2)
-			numTablesUsed++;
-		if (useCategory3)
-			numTablesUsed++;
-
-		if (useCategory1) {
-			Composite pane1 = createComposite(toolkit, aComposite, 1);
-			label_Category = createLabel(toolkit, pane1, getSelectedLabel());
-
-			if (categoryIsSingleSelection1)
-				ctrl_selected = createTable(toolkit, pane1, SINGLE_ROW);
-			else {
-				if (numTablesUsed == 1)
-					ctrl_selected = createTable(toolkit, pane1, LARGE_SIZE);
-				else if (numTablesUsed == 2)
-					ctrl_selected = createTable(toolkit, pane1, MEDIUM_SIZE);
-				else
-					ctrl_selected = createTable(toolkit, pane1, SMALL_SIZE);
-			}
-
-			libraryViewFindElementAction = new LibraryViewFindElementAction(AuthoringUIResources.actionLabel_findElementInLibNav); 
-			viewer_selected = new TableViewer(ctrl_selected);
-			viewer_selected.setLabelProvider(labelProviderSelected);
-			initContentProviderSelected();
-			viewer_selected.setInput(contentElement);
-			if (!isUpAndDownButtonsRequired1)
-				viewer_selected.setSorter(new ViewerSorter());
-
-			createContextMenuFor(viewer_selected);
-			toolkit.paintBordersFor(pane1);
-
-			Composite pane2 = createCompositeForButtons(toolkit, aComposite);
-			if (allowChange1) {
-				ctrl_add = createButton(toolkit, pane2,
-						(categoryIsSingleSelection1) ? SELECT_BUTTON
-								: ADD_BUTTON);
-				ctrl_remove = createButton(toolkit, pane2,
-						(categoryIsSingleSelection1) ? CLEAR_BUTTON
-								: REMOVE_BUTTON);
-
-				if (isUpAndDownButtonsRequired1) {
-					ctrl_up1 = createButton(toolkit, pane2, UP_BUTTON);
-					ctrl_down1 = createButton(toolkit, pane2, DOWN_BUTTON);
-					ctrl_ordering = createButton(toolkit, pane2, ORDER_BUTTON);
-					Combo ctrl_sort1 = createComboWithLabel(toolkit, pane2, LibraryEditResources.SortType_Label);
-					viewer_sort1 = new ComboViewer(ctrl_sort1);
-					viewer_sort1.setContentProvider(contentProviderSort);
-					viewer_sort1.setLabelProvider(labelProviderSort);
-					viewer_sort1.setInput(contentElement);
-					// set initial selection
-					String sortType = CategorySortHelper.getCategorySortValue(contentElement);
-					viewer_sort1.setSelection(new StructuredSelection(sortType), true);
-
-					// ctrl_ordering.setLayoutData(new
-					// GridData(GridData.FILL_HORIZONTAL));
-
-				}
-			}
-			toolkit.paintBordersFor(pane2);
-		}
-
-		if (useCategory2) {
-			Composite pane3 = createComposite(toolkit, aComposite, 1);
-			label_Category2 = createLabel(toolkit, pane3, getSelectedLabel2());
-			if (categoryIsSingleSelection2)
-				ctrl_selected2 = createTable(toolkit, pane3, SINGLE_ROW);
-			else {
-				if (numTablesUsed == 1)
-					ctrl_selected2 = createTable(toolkit, pane3, LARGE_SIZE);
-				else if (numTablesUsed == 2)
-					ctrl_selected2 = createTable(toolkit, pane3, MEDIUM_SIZE);
-				else
-					ctrl_selected2 = createTable(toolkit, pane3, SMALL_SIZE);
-			}
-			viewer_selected2 = new TableViewer(ctrl_selected2);
-			viewer_selected2.setLabelProvider(labelProviderSelected2);
-			initContentProviderSelected2();
-			viewer_selected2.setInput(contentElement);
-			viewer_selected2.setSorter(new ViewerSorter());
-			createContextMenuFor(viewer_selected2);
-
-			toolkit.paintBordersFor(pane3);
-
-			Composite pane4 = createCompositeForButtons(toolkit, aComposite);
-			if (allowChange2) {
-				ctrl_add2 = createButton(toolkit, pane4, ADD_BUTTON);
-				ctrl_remove2 = createButton(toolkit, pane4, REMOVE_BUTTON);
-
-				if (isUpAndDownButtonsRequired2) {
-					ctrl_up2 = createButton(toolkit, pane4, UP_BUTTON);
-					ctrl_down2 = createButton(toolkit, pane4, DOWN_BUTTON);
-				}
-			}
-			toolkit.paintBordersFor(pane4);
-		}
-
-		if (useCategory3) {
-			Composite pane5 = createComposite(toolkit, aComposite, 1);
-			label_Category3 = createLabel(toolkit, pane5, getSelectedLabel3());
-			if (categoryIsSingleSelection3)
-				ctrl_selected3 = createTable(toolkit, pane5, SINGLE_ROW);
-			else {
-				if (numTablesUsed == 1)
-					ctrl_selected3 = createTable(toolkit, pane5, LARGE_SIZE);
-				else if (numTablesUsed == 2)
-					ctrl_selected3 = createTable(toolkit, pane5, MEDIUM_SIZE);
-				else
-					ctrl_selected3 = createTable(toolkit, pane5, SMALL_SIZE);
-			}
-			viewer_selected3 = new TableViewer(ctrl_selected3);
-			viewer_selected3.setLabelProvider(labelProviderSelected3);
-			initContentProviderSelected3();
-			viewer_selected3.setInput(contentElement);
-			viewer_selected3.setSorter(new ViewerSorter());
-			createContextMenuFor(viewer_selected3);
-
-			toolkit.paintBordersFor(pane5);
-
-			Composite pane6 = createCompositeForButtons(toolkit, aComposite);
-			if (allowChange3) {
-				ctrl_add3 = createButton(toolkit, pane6, ADD_BUTTON);
-				ctrl_remove3 = createButton(toolkit, pane6, REMOVE_BUTTON);
-
-				if (isUpAndDownButtonsRequired3) {
-					ctrl_up3 = createButton(toolkit, pane6, UP_BUTTON);
-					ctrl_down3 = createButton(toolkit, pane6, DOWN_BUTTON);
-				}
-			}
-			toolkit.paintBordersFor(pane6);
-		}
-
-		setEnabledAddButtons(true);
-
-		setWidgetWidths();
-		Composite pane7 = createComposite(toolkit, aComposite,
-				GridData.FILL_BOTH, 1, 1, 1);
-		ctrl_briefDesc = createTextEditWithLabelLarge(
-				toolkit,
-				pane7,
-				AuthoringUIResources.AssociationFormPage_BriefDescriptionLabel); //$NON-NLS-1$
-		ctrl_briefDesc.setEditable(false);
-		toolkit.paintBordersFor(pane7);
-		toolkit.paintBordersFor(aComposite);
-
-		addListeners();
-
-		setContextHelp();
-
-	}
-
-	protected void setEnabledAddButtons(boolean value) {
-		if (allowChange1)
-			ctrl_add.setEnabled(value);
-		if (useCategory2 && allowChange2)
-			ctrl_add2.setEnabled(value);
-		if (useCategory3 && allowChange3)
-			ctrl_add3.setEnabled(value);
-	}
-
-	protected void setEnabledRemoveButtons(boolean value) {
-		if (allowChange1)
-			ctrl_remove.setEnabled(value);
-		if (useCategory2 && allowChange2)
-			ctrl_remove2.setEnabled(value);
-		if (useCategory3 && allowChange3)
-			ctrl_remove3.setEnabled(value);
-	}
-
-	protected void disableButtonsAndDeselectTables() {
-		// setEnabledAddButtons(false);
-		setEnabledRemoveButtons(false);
-		viewer_selected.setSelection(null, true);
-		if (useCategory2)
-			viewer_selected2.setSelection(null, true);
-		if (useCategory3)
-			viewer_selected3.setSelection(null, true);
-		ctrl_briefDesc.setText(""); //$NON-NLS-1$
-	}
-
-	protected void refreshViewers() {
-
-		viewer_selected.refresh();
-		// Check if existing element is contributor/contributes for standard
-		// categories
-		// should not shown in the tableviewer.
-		// Commented below to allow contributors to display in the list box
-		// if(contentElement instanceof ContentCategory){
-		// if(!(contentElement instanceof CustomCategory)){
-		// Object[] elements =
-		// contentProviderSelected.getElements(contentElement);
-		// for(int i=0; i<elements.length; i++){
-		// Object element = elements[i];
-		// if(element instanceof ContentElement){
-		// if(UIHelper.isContributor((ContentElement)element)){
-		// viewer_selected.remove(element);
-		// }
-		// }
-		// }
-		// }
-		// }
-
-		if (useCategory2) {
-			viewer_selected2.refresh();
-			// if(contentElement instanceof ContentCategory){
-			// Object[] elements =
-			// contentProviderSelected2.getElements(contentElement);
-			// for(int i=0; i<elements.length; i++){
-			// Object element = elements[i];
-			// if(element instanceof ContentElement){
-			// if(UIHelper.isContributor((ContentElement)element)){
-			// viewer_selected2.remove(element);
-			// }
-			// }
-			// }
-			// }
-
-		}
-		if (useCategory3) {
-			viewer_selected3.refresh();
-			// if(contentElement instanceof ContentCategory){
-			// Object[] elements =
-			// contentProviderSelected3.getElements(contentElement);
-			// for(int i=0; i<elements.length; i++){
-			// Object element = elements[i];
-			// if(element instanceof ContentElement){
-			// if(UIHelper.isContributor((ContentElement)element)){
-			// viewer_selected3.remove(element);
-			// }
-			// }
-			// }
-			// }
-		}
-		ctrl_briefDesc.setText(""); //$NON-NLS-1$
-
-	}
-
-	/**
-	 * Add listeners
-	 * 
-	 */
-	private void addListeners() {
-		form.addListener(SWT.Activate, new Listener() {
-			public void handleEvent(Event e) {
-				if (form != null && !form.isDisposed()) {
-					UIHelper.setFormText(form, contentElement);
-				}
-				refreshViewers();
-				if (TngUtil.isLocked(contentElement)) {
-					enableControls(false);
-				} else {
-					enableControls(true);
-				}
-			}
-		});
-
-		if (useCategory1) {
-			// Add focus listener on primary tasks list
-			ctrl_selected.addFocusListener(new FocusAdapter() {
-				public void focusGained(FocusEvent e) {
-					disableButtonsAndDeselectTables();
-
-					IStructuredSelection selection = (IStructuredSelection) viewer_selected
-							.getSelection();
-					if (allowChange1 && selection.size() > 0
-							&& !TngUtil.isLocked(contentElement)) {
-						ctrl_remove.setEnabled(true);
-					}
-				}
-			});
-
-			viewer_selected
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) viewer_selected
-									.getSelection();
-							libraryViewFindElementAction.selectionChanged(event);
-							if (allowChange1 && selection.size() > 0
-									&& !TngUtil.isLocked(contentElement)) {
-								ctrl_remove.setEnabled(true);
-							}
-							if (isUpAndDownButtonsRequired1
-									&& selection.size() > 0
-									&& !TngUtil.isLocked(contentElement)) {
-								if (viewer_selected.getTable()
-										.getSelectionIndex() > 0
-										&& !TngUtil.isLocked(contentElement)
-										&& selection.size() == 1 &&
-										CategorySortHelper.isManualCategorySort(contentElement)) {
-									ctrl_up1.setEnabled(true);
-								} else
-									ctrl_up1.setEnabled(false);
-
-								if (viewer_selected.getTable()
-										.getSelectionIndex() < viewer_selected
-										.getTable().getItemCount() - 1
-										&& !TngUtil.isLocked(contentElement)
-										&& selection.size() == 1 &&
-										CategorySortHelper.isManualCategorySort(contentElement)) {
-									ctrl_down1.setEnabled(true);
-								} else
-									ctrl_down1.setEnabled(false);
-							}
-
-							if (selection.size() == 1) {
-								String desc = ((MethodElement) selection
-										.getFirstElement())
-										.getBriefDescription();
-								if (desc == null) {
-									desc = ""; //$NON-NLS-1$
-								}
-								ctrl_briefDesc.setText(desc);
-							} else if (selection.size() > 1) {
-								ctrl_briefDesc
-										.setText(getMultipleSelectDescription(selection
-												.size()));
-							}
-						}
-
-					});
-
-			if (allowChange1) {
-				ctrl_add.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						TableItem[] items = viewer_selected.getTable()
-								.getItems();
-						List selectedList = new ArrayList();
-						for (int i = 0; i < items.length; i++) {
-							selectedList.add(items[i].getData());
-						}
-
-						if (getFilter() != null) {
-							ItemsFilterDialog fd = new ItemsFilterDialog(
-									PlatformUI.getWorkbench()
-											.getActiveWorkbenchWindow()
-											.getShell(), getFilter(),
-									getContentElement(), getTabString());
-							fd.setBlockOnOpen(true);
-							fd.setTitle(getTabString());
-							if(categoryIsSingleSelection1){
-								fd.setViewerSelectionSingle(true);
-							}
-							fd.setExistingElements(selectedList);
-							if(getFilterTypes() != null){
-								fd.setTypes(getFilterTypes());
-							}
-							fd.open();
-							addItemsToModel1(fd.getSelectedItems());
-						}
-						// viewer_selected.refresh();
-						refreshViewers();
-
-					}
-				});
-
-				ctrl_remove.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						IStructuredSelection selection = (IStructuredSelection) viewer_selected
-								.getSelection();
-						if (selection.size() > 0) {
-							// update the model
-							ArrayList rmItems = new ArrayList();
-							rmItems.addAll(selection.toList());
-							removeItemsFromModel1(rmItems);
-							// viewer_selected.refresh();
-							refreshViewers();
-							// clear the selection
-							viewer_selected.setSelection(null, true);
-							ctrl_briefDesc.setText(""); //$NON-NLS-1$
-						}
-						ctrl_remove.setEnabled(false);
-					}
-				});
-			}
-		}
-
-		if (useCategory2) {
-			// Add focus listener on primary tasks list
-			ctrl_selected2.addFocusListener(new FocusAdapter() {
-				public void focusGained(FocusEvent e) {
-					disableButtonsAndDeselectTables();
-
-					IStructuredSelection selection = (IStructuredSelection) viewer_selected2
-							.getSelection();
-					if (allowChange2 && selection.size() > 0
-							&& !TngUtil.isLocked(contentElement)) {
-						ctrl_remove2.setEnabled(true);
-					}
-				}
-			});
-
-			viewer_selected2
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) viewer_selected2
-									.getSelection();
-							libraryViewFindElementAction.selectionChanged(event);
-							if (allowChange2 && selection.size() > 0
-									&& !TngUtil.isLocked(contentElement)) {
-								ctrl_remove2.setEnabled(true);
-							}
-							if (selection.size() == 1) {
-								String desc = ((MethodElement) selection
-										.getFirstElement())
-										.getBriefDescription();
-								if (desc == null) {
-									desc = ""; //$NON-NLS-1$
-								}
-								ctrl_briefDesc.setText(desc);
-							} else if (selection.size() > 1) {
-								ctrl_briefDesc
-										.setText(getMultipleSelectDescription(selection
-												.size()));
-							}
-						}
-
-					});
-
-			if (allowChange2) {
-				ctrl_add2.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						TableItem[] items = viewer_selected2.getTable()
-								.getItems();
-						List selectedList = new ArrayList();
-						for (int i = 0; i < items.length; i++) {
-							selectedList.add(items[i].getData());
-						}
-						if (getFilter2() != null) {
-							ItemsFilterDialog fd = new ItemsFilterDialog(
-									PlatformUI.getWorkbench()
-											.getActiveWorkbenchWindow()
-											.getShell(), getFilter2(),
-									getContentElement(), getTabString2());
-							fd.setBlockOnOpen(true);
-							fd.setTitle(getTabString2());
-							fd.setExistingElements(selectedList);
-							fd.open();
-							addItemsToModel2(fd.getSelectedItems());
-						}
-						viewer_selected2.refresh();
-					}
-				});
-
-				ctrl_remove2.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						IStructuredSelection selection = (IStructuredSelection) viewer_selected2
-								.getSelection();
-						if (selection.size() > 0) {
-							// update the model
-							ArrayList rmItems = new ArrayList();
-							rmItems.addAll(selection.toList());
-							removeItemsFromModel2(rmItems);
-							viewer_selected2.refresh();
-
-							// clear the selection
-							viewer_selected2.setSelection(null, true);
-							ctrl_briefDesc.setText(""); //$NON-NLS-1$
-						}
-						ctrl_remove2.setEnabled(false);
-					}
-				});
-			}
-		}
-		if (useCategory3) {
-			// Add focus listener on primary tasks list
-			ctrl_selected3.addFocusListener(new FocusAdapter() {
-				public void focusGained(FocusEvent e) {
-					disableButtonsAndDeselectTables();
-
-					IStructuredSelection selection = (IStructuredSelection) viewer_selected3
-							.getSelection();
-					if (allowChange3 && selection.size() > 0
-							&& !TngUtil.isLocked(contentElement)) {
-						ctrl_remove3.setEnabled(true);
-					}
-				}
-			});
-
-			viewer_selected3
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) viewer_selected3
-									.getSelection();
-							libraryViewFindElementAction.selectionChanged(event);
-							if (allowChange3 && selection.size() > 0
-									&& !TngUtil.isLocked(contentElement)) {
-								ctrl_remove3.setEnabled(true);
-							}
-							if (selection.size() == 1) {
-								String desc = ((MethodElement) selection
-										.getFirstElement())
-										.getBriefDescription();
-								if (desc == null) {
-									desc = ""; //$NON-NLS-1$
-								}
-								ctrl_briefDesc.setText(desc);
-							} else if (selection.size() > 1) {
-								ctrl_briefDesc
-										.setText(getMultipleSelectDescription(selection
-												.size()));
-							}
-						}
-
-					});
-
-			if (allowChange3) {
-				ctrl_add3.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						TableItem[] items = viewer_selected3.getTable()
-								.getItems();
-						List selectedList = new ArrayList();
-						for (int i = 0; i < items.length; i++) {
-							selectedList.add(items[i].getData());
-						}
-						if (getFilter3() != null) {
-							ItemsFilterDialog fd = new ItemsFilterDialog(
-									PlatformUI.getWorkbench()
-											.getActiveWorkbenchWindow()
-											.getShell(), getFilter3(),
-									getContentElement(), getTabString3());
-							fd.setBlockOnOpen(true);
-							fd.setTitle(getTabString3());
-							fd.setExistingElements(selectedList);
-							fd.open();
-							addItemsToModel3(fd.getSelectedItems());
-						}
-						viewer_selected3.refresh();
-
-					}
-				});
-
-				ctrl_remove3.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						IStructuredSelection selection = (IStructuredSelection) viewer_selected3
-								.getSelection();
-						if (selection.size() > 0) {
-							// update the model
-							ArrayList rmItems = new ArrayList();
-							rmItems.addAll(selection.toList());
-							removeItemsFromModel3(rmItems);
-							viewer_selected3.refresh();
-
-							// clear the selection
-							viewer_selected3.setSelection(null, true);
-							ctrl_briefDesc.setText(""); //$NON-NLS-1$
-						}
-						ctrl_remove3.setEnabled(false);
-					}
-				});
-			}
-		}
-
-		if (allowChange1 && isUpAndDownButtonsRequired1) {
-			ctrl_up1.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					IStructuredSelection selection = (IStructuredSelection) viewer_selected
-							.getSelection();
-					if (selection.size() > 0) {
-						ArrayList moveUpItems = new ArrayList();
-						moveUpItems.addAll(selection.toList());
-						moveUpItemsInSelectedItems1(moveUpItems);
-					}
-					// viewer_selected.refresh();
-					refreshViewers();
-					if (viewer_selected.getTable().getSelectionIndex() > 0
-							&& !TngUtil.isLocked(contentElement) &&
-							CategorySortHelper.isManualCategorySort(contentElement)) {
-						ctrl_up1.setEnabled(true);
-					} else
-						ctrl_up1.setEnabled(false);
-					if (viewer_selected.getTable().getSelectionIndex() < viewer_selected
-							.getTable().getItemCount() - 1
-							&& !TngUtil.isLocked(contentElement) &&
-							CategorySortHelper.isManualCategorySort(contentElement)) {
-						ctrl_down1.setEnabled(true);
-					} else
-						ctrl_down1.setEnabled(false);
-				}
-			});
-
-			ctrl_down1.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					IStructuredSelection selection = (IStructuredSelection) viewer_selected
-							.getSelection();
-					if (selection.size() > 0) {
-						ArrayList moveDownItems = new ArrayList();
-						moveDownItems.addAll(selection.toList());
-						moveDownItemsInSelectedItems1(moveDownItems);
-					}
-					// viewer_selected.refresh();
-					refreshViewers();
-					if (viewer_selected.getTable().getSelectionIndex() > 0
-							&& !TngUtil.isLocked(contentElement) &&
-							CategorySortHelper.isManualCategorySort(contentElement)) {
-						ctrl_up1.setEnabled(true);
-					} else
-						ctrl_up1.setEnabled(false);
-					if (viewer_selected.getTable().getSelectionIndex() < viewer_selected
-							.getTable().getItemCount() - 1
-							&& !TngUtil.isLocked(contentElement) &&
-							CategorySortHelper.isManualCategorySort(contentElement)) {
-						ctrl_down1.setEnabled(true);
-					} else
-						ctrl_down1.setEnabled(false);
-				}
-			});
-
-			ctrl_ordering.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					ContentElementsOrderDialog dlg = new ContentElementsOrderDialog(
-							Display.getCurrent().getActiveShell(),
-							contentElement, getActionManager());
-					dlg.open();
-					if (allowChange1 && isUpAndDownButtonsRequired1) {
-						String sortType = CategorySortHelper.getCategorySortValue(contentElement);
-						viewer_sort1.setSelection(new StructuredSelection(sortType), true);
-						viewer_sort1.refresh();
-					}
-				}
-			});
-			
-			viewer_sort1.addSelectionChangedListener(new ISelectionChangedListener() {
-				public void selectionChanged(SelectionChangedEvent event) {
-					IStructuredSelection selection = (IStructuredSelection) viewer_sort1
-							.getSelection();
-					String sortType = (String)selection.getFirstElement();
-					MethodElementProperty prop = CategorySortHelper.getCategorySortProperty(contentElement);
-					
-					if (prop == null) {			
-						prop = CategorySortHelper.createNewSortProperty(sortType);
-						getActionManager()
-						.doAction(
-								IActionManager.ADD,
-								contentElement,
-								UmaPackage.eINSTANCE
-										.getMethodElement_MethodElementProperty(),
-								prop, -1);
-					}
-					else {
-						getActionManager().doAction(IActionManager.SET,
-							prop,
-							UmaPackage.eINSTANCE
-									.getMethodElementProperty_Value(),
-									sortType, -1);
-					}
-					LibraryView.getView().refreshViews();
-
-					if (viewer_selected.getTable().getSelectionIndex() > 0
-							&& !TngUtil.isLocked(contentElement) &&
-							CategorySortHelper.isManualCategorySort(contentElement)) {
-						ctrl_up1.setEnabled(true);
-					} else
-						ctrl_up1.setEnabled(false);
-					if (viewer_selected.getTable().getSelectionIndex() < viewer_selected
-							.getTable().getItemCount() - 1
-							&& !TngUtil.isLocked(contentElement) &&
-							CategorySortHelper.isManualCategorySort(contentElement)) {
-						ctrl_down1.setEnabled(true);
-					} else
-						ctrl_down1.setEnabled(false);
-					refreshViewers();
-				}
-			});
-		}
-	}
-
-	protected void enableControls(boolean editable) {
-		if (useCategory1) {
-			if (allowChange1) {
-				ctrl_add.setEnabled(editable);
-				IStructuredSelection selection = (IStructuredSelection) viewer_selected
-						.getSelection();
-				if (allowChange1 && selection.size() > 0
-						&& !TngUtil.isLocked(contentElement)) {
-					ctrl_remove.setEnabled(true);
-				} else {
-					ctrl_remove.setEnabled(false);
-
-				}
-			}
-		}
-
-		if (useCategory2) {
-			if (allowChange2) {
-				ctrl_add2.setEnabled(editable);
-				IStructuredSelection selection = (IStructuredSelection) viewer_selected2
-						.getSelection();
-				if (allowChange2 && selection.size() > 0
-						&& !TngUtil.isLocked(contentElement)) {
-					ctrl_remove2.setEnabled(true);
-				} else {
-					ctrl_remove2.setEnabled(false);
-
-				}
-			}
-		}
-		if (useCategory3) {
-			if (allowChange3) {
-				ctrl_add3.setEnabled(editable);
-				IStructuredSelection selection = (IStructuredSelection) viewer_selected3
-						.getSelection();
-				if (allowChange3 && selection.size() > 0
-						&& !TngUtil.isLocked(contentElement)) {
-					ctrl_remove3.setEnabled(true);
-				} else {
-					ctrl_remove3.setEnabled(false);
-
-				}
-			}
-		}
-		IStructuredSelection selection = (IStructuredSelection) viewer_selected
-				.getSelection();
-		if (isUpAndDownButtonsRequired1 && selection.size() > 0
-				&& !TngUtil.isLocked(contentElement)) {
-			if (viewer_selected.getTable().getSelectionIndex() > 0
-					&& !TngUtil.isLocked(contentElement) &&
-					CategorySortHelper.isManualCategorySort(contentElement)) {
-				ctrl_up1.setEnabled(true);
-			} else
-				ctrl_up1.setEnabled(false);
-
-			if (viewer_selected.getTable().getSelectionIndex() < viewer_selected
-					.getTable().getItemCount() - 1
-					&& !TngUtil.isLocked(contentElement) &&
-					CategorySortHelper.isManualCategorySort(contentElement)) {
-				ctrl_down1.setEnabled(true);
-			} else
-				ctrl_down1.setEnabled(false);
-		} else if (isUpAndDownButtonsRequired1 && selection.size() > 0) {
-			// it's locked
-			ctrl_up1.setEnabled(false);
-			ctrl_down1.setEnabled(false);
-			ctrl_ordering.setEnabled(true);
-			viewer_sort1.getCombo().setEnabled(false);
-		} else if (isUpAndDownButtonsRequired1 && !TngUtil.isLocked(contentElement)) {
-			// no selection
-			ctrl_up1.setEnabled(false);
-			ctrl_down1.setEnabled(false);
-			ctrl_ordering.setEnabled(true);
-			viewer_sort1.getCombo().setEnabled(true);
-		}
-	}
-
-	void setDirty(boolean b) {
-		// Phong (03/07/2005): the dirty state of the editor is already taken
-		// care in MethodElementEditor, transparent from user
-		// interaction. No firePropertyChange(PROP_DIRTY) should be called
-		// somewhere else.
-		// NOTE: unnecessary calls to firePropertyChange(PROP_DIRTY) will cause
-		// performance problem.
-		// firePropertyChange(PROP_DIRTY);
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#dispose()
-	 */
-	public void dispose() {
-		if (usedCategories.size() > 0)
-			LibraryManager.getInstance().releaseCategories(contentElement,
-					usedCategories);
-
-		if (labelProviderSelected != null) {
-			labelProviderSelected.dispose();
-		}
-		if (labelProviderSelected2 != null) {
-			labelProviderSelected2.dispose();
-		}
-		if (labelProviderSelected3 != null) {
-			labelProviderSelected3.dispose();
-		}
-		super.dispose();
-	}
-
-	/**
-	 * Returns the section name.
-	 */
-	protected String getSectionName() {
-		return null;
-	}
-
-	/**
-	 * Returns the section description.
-	 */
-	protected String getSectionDescription() {
-		// TVT issue single quote 
-		// Format should be done only for CategoryGuidancePage, AuthoringUI.categoryGuidancesPage.sectionDescription key 
-		// have has replacement variable in its value. For more information check NLS_MESSAGEFORMAT_VAR
-	   /* 
-	    * NLS_MESSAGEFORMAT_VAR
-	    Strings which contain replacement variables are processed by the  
-	    MessageFormat class (single quote must be coded as 2 consecutive single  
-	    quotes ''). Strings which do NOT contain replacement variables are NOT   
-	    processed by the MessageFormat class (single quote must be coded as 1
-		single quote ').*/
-		
-		if (methodElement instanceof ContentElement
-				&& "categoryGuidancesPage".equalsIgnoreCase(getId())) { //$NON-NLS-1$
-			return NLS.bind(PACKAGE_PREFIX + getId() + ".sectionDescription", LibraryUIText.getUITextLower(methodElement)); //$NON-NLS-1$
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the first selected lable.
-	 */
-	protected String getSelectedLabel() {
-		// if (methodElement instanceof ContentCategory) {
-		// return AuthoringUIResources.formatString(PACKAGE_PREFIX + getId() +
-		// ".selectedLabel", LibraryUIText.getUIText(methodElement));
-		// //$NON-NLS-1$
-		// }
-		return null;
-	}
-
-	/**
-	 * Returns the second selected lable.
-	 */
-	protected String getSelectedLabel2() {
-		return null;
-	}
-
-	/**
-	 * Returns the third selected lable.
-	 */
-	protected String getSelectedLabel3() {
-		return null;
-	}
-
-	/**
-	 * Returns the multiple section description.
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return getMultipleSelectDescription(count, PACKAGE_PREFIX + getId() + ".multipleSelectDescription");
-	}
-
-	/**
-	 * Returns the multiple section description.
-	 */
-	protected String getMultipleSelectDescription(int count, String key) {
-		return AuthoringUIResources.bind(key, new Integer(count));
-	}
-
-	/**
-	 * Set description for section
-	 * @param sectionDesc
-	 * 			Description
-	 */
-	public void setSectionDesc(String sectionDesc) {
-		this.sectionDesc = sectionDesc;
-	}
-
-	/**
-	 * Set first label
-	 * @param selectedLabel1
-	 */
-	public void setSelectedLabel(String selectedLabel1) {
-		this.selectedLabel = selectedLabel1;
-	}
-
-	/**
-	 * Set second label
-	 * @param selectedLabel2
-	 */
-	public void setSelectedLabel2(String selectedLabel2) {
-		this.selectedLabel2 = selectedLabel2;
-	}
-
-	/**
-	 * Set third label
-	 * @param selectedLabel3
-	 */
-	public void setSelectedLabel3(String selectedLabel3) {
-		this.selectedLabel3 = selectedLabel3;
-	}
-
-	/**
-	 * Set an option for the first category to be either single selection or multiple selection
-	 * @param categoryIsSingleSelection1
-	 */
-	public void setCategoryIsSingleSelection1(boolean categoryIsSingleSelection1) {
-		this.categoryIsSingleSelection1 = categoryIsSingleSelection1;
-	}
-
-	/**
-	 * Set an option for the second category to be either single selection or multiple selection
-	 * @param categoryIsSingleSelection2
-	 */
-	public void setCategoryIsSingleSelection2(boolean categoryIsSingleSelection2) {
-		this.categoryIsSingleSelection2 = categoryIsSingleSelection2;
-	}
-
-	/**
-	 * Set an option for the third category to be either single selection or multiple selection
-	 * @param categoryIsSingleSelection3
-	 */
-	public void setCategoryIsSingleSelection3(boolean categoryIsSingleSelection3) {
-		this.categoryIsSingleSelection3 = categoryIsSingleSelection3;
-	}
-
-	/**
-	 * Set an option to use first category
-	 * @param useCategory1
-	 */
-	public void setUseCategory1(boolean useCategory1) {
-		this.useCategory1 = useCategory1;
-	}
-
-	/**
-	 * Set an option to use second category
-	 * @param useCategory2
-	 */
-	public void setUseCategory2(boolean useCategory2) {
-		this.useCategory2 = useCategory2;
-	}
-
-	
-	/**
-	 * Set an option to use third category
-	 * @param useCategory3
-	 */
-	public void setUseCategory3(boolean useCategory3) {
-		this.useCategory3 = useCategory3;
-	}
-
-	/**
-	 * Set an option to allow changes for first table in UI
-	 * @param allowChange1
-	 */
-	public void setAllowChange1(boolean allowChange1) {
-		this.allowChange1 = allowChange1;
-	}
-
-	/**
-	 * Set an option to allow changes for the second table in UI
-	 * @param allowChange2
-	 */
-	public void setAllowChange2(boolean allowChange2) {
-		this.allowChange2 = allowChange2;
-	}
-
-	/**
-	 * Set an option to allow changes for third table.
-	 * @param allowChange3
-	 */
-	public void setAllowChange3(boolean allowChange3) {
-		this.allowChange3 = allowChange3;
-	}
-
-	/**
-	 * Set an option to show first set of up/down buttons
-	 * @param isUpAndDownButtonsRequired1
-	 */
-	public void setIsUpAndDownButtonsRequired1(
-			boolean isUpAndDownButtonsRequired1) {
-		this.isUpAndDownButtonsRequired1 = isUpAndDownButtonsRequired1;
-	}
-
-	/**
-	 * Set an option to show second set of up/down buttons
-	 * @param isUpAndDownButtonsRequired2
-	 */
-	public void setIsUpAndDownButtonsRequired2(
-			boolean isUpAndDownButtonsRequired2) {
-		this.isUpAndDownButtonsRequired2 = isUpAndDownButtonsRequired2;
-	}
-
-	/**
-	 * Set an option to show third set of up/down buttons.
-	 * @param isUpAndDownButtonsRequired3
-	 */
-	public void setIsUpAndDownButtonsRequired3(
-			boolean isUpAndDownButtonsRequired3) {
-		this.isUpAndDownButtonsRequired3 = isUpAndDownButtonsRequired3;
-	}
-
-	// calculate widths for labels and tables, based on width of labels
-	protected void setWidgetWidths() {
-		int allCategoriesWidth = 0, categoryWidth = 0, category2Width = 0, category3Width = 0;
-		int largestWidth = 0;
-		// if (useCategory1) allCategoriesWidth =
-		// label_allCategories.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
-		if (useCategory1)
-			categoryWidth = label_Category
-					.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
-		if (useCategory2)
-			category2Width = label_Category2.computeSize(SWT.DEFAULT,
-					SWT.DEFAULT).x;
-		if (useCategory3)
-			category3Width = label_Category3.computeSize(SWT.DEFAULT,
-					SWT.DEFAULT).x;
-
-		if (useCategory1)
-			largestWidth = Math.max(allCategoriesWidth, categoryWidth);
-		if (useCategory2)
-			largestWidth = Math.max(largestWidth, category2Width);
-		if (useCategory3)
-			largestWidth = Math.max(largestWidth, category3Width);
-
-		if (useCategory1) {
-			// ((GridData)label_allCategories.getLayoutData()).widthHint =
-			// largestWidth;
-			// ((GridData)ctrl_allAvailable.getLayoutData()).widthHint =
-			// largestWidth;
-			((GridData) label_Category.getLayoutData()).widthHint = largestWidth;
-			((GridData) ctrl_selected.getLayoutData()).widthHint = largestWidth;
-		}
-		if (useCategory2) {
-			((GridData) label_Category2.getLayoutData()).widthHint = largestWidth;
-			((GridData) ctrl_selected2.getLayoutData()).widthHint = largestWidth;
-		}
-		if (useCategory3) {
-			((GridData) label_Category3.getLayoutData()).widthHint = largestWidth;
-			((GridData) ctrl_selected3.getLayoutData()).widthHint = largestWidth;
-		}
-	}
-
-	protected IActionManager getActionManager() {
-		FormEditor editor = getEditor();
-		if (editor instanceof MethodElementEditor) {
-			return ((MethodElementEditor) editor).getActionManager();
-		}
-		return null;
-	}
-
-	private void setContextHelp() {
-		// in the future, we should check the subclass type to set up a
-		// different
-		// context page for ech type of associations
-		EditorsContextHelper.setHelp(getPartControl(), getContentElement());
-	}
-	
-	/**
-	 * Create context menu for the given viewer
-	 * @param viewer
-	 */
-	public void createContextMenuFor(final StructuredViewer viewer) {
-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
-		contextMenu.add(new Separator(org.eclipse.ui.IWorkbenchActionConstants.MB_ADDITIONS));
-		contextMenu.setRemoveAllWhenShown(true);
-		contextMenu.addMenuListener(this);
-		Menu menu = contextMenu.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(contextMenu, viewer);
-	}
-
-	/**
-	 * @see org.eclipse.jface.action.IMenuListener#menuAboutToShow(org.eclipse.jface.action.IMenuManager)
-	 */
-	public void menuAboutToShow(IMenuManager menuManager) {
-		menuManager.add(new Separator(org.eclipse.ui.IWorkbenchActionConstants.MB_ADDITIONS));
-		menuManager.add(new ActionContributionItem(libraryViewFindElementAction));
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/BaseFormPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/BaseFormPage.java
deleted file mode 100755
index f4ee489..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/BaseFormPage.java
+++ /dev/null
@@ -1,1161 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIImages;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditorInput;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichTextEditor;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.richtext.RichTextToolBar;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.jface.fieldassist.DecoratedField;
-import org.eclipse.jface.fieldassist.IControlCreator;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-
-/**
- * The base class for all Method editor form pages.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @author Shashidhar Kannoori
- * @since 1.0
- * fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=176382
- */
-public class BaseFormPage extends FormPage {
-
-	/**
-	 * Button types.
-	 */
-	public static final int ADD_BUTTON = 0;
-
-	public static final int REMOVE_BUTTON = 1;
-
-	public static final int UP_BUTTON = 2;
-
-	public static final int DOWN_BUTTON = 3;
-
-	protected static final int ORDER_BUTTON = 4;
-
-	protected static final int SELECT_BUTTON = 5;
-
-	protected static final int CLEAR_BUTTON = 6;
-
-	protected static final int ATTACH_BUTTON = 7;
-
-	protected static final int DETACH_BUTTON = 8;
-
-	/**
-	 * Table types.
-	 */
-	public static final int SMALL_SIZE = 0;
-
-	public static final int MEDIUM_SIZE = 1;
-
-	public static final int LARGE_SIZE = 2;
-
-	public static final int SINGLE_ROW = 3;
-
-	protected boolean debug;
-
-	protected ScrolledForm form;
-
-	protected FormToolkit toolkit;
-
-	protected String editorTabName;
-
-	protected String editorName;
-
-	protected MethodElement methodElement;
-
-	protected ContentElement contentElement = null;
-
-	protected String contentElementPath;
-
-	private int SECTION_ID;
-	
-	private static class DecoratedLabelCreator implements IControlCreator {
-		public Control createControl(Composite parent, int style) {
-			return new Label(parent, style);
-		}
-	}
-
-	protected static DecoratedLabelCreator decoratedLabelCreator = new DecoratedLabelCreator();
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param editor
-	 *            The parent form editor.
-	 * @param id
-	 *            The unique ID for the form page.
-	 * @param title
-	 *            The title for the form page.
-	 */
-	public BaseFormPage(FormEditor editor, String id, String title) {
-		super(editor, id, title);
-		debug = AuthoringUIPlugin.getDefault().isDebugging();
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		setSite(site);
-		setInput(input);
-
-		// Retrieve the ContentElement object from the editor input.
-		MethodElementEditorInput methodElementInput = (MethodElementEditorInput) input;
-		String libPath = LibraryService.getInstance().getCurrentMethodLibraryPath();
-		methodElement = methodElementInput.getMethodElement();
-		if (methodElement instanceof ProcessComponent) {
-			Object obj = ((ProcessComponent) methodElement).getProcess();
-			contentElementPath = libPath + File.separator
-					+ ResourceHelper.getElementPath((MethodElement) obj);
-		} else {
-			if (methodElement instanceof MethodPlugin) {
-				contentElementPath = libPath + File.separator
-						+ ResourceHelper.getElementPath(methodElement);
-			} else {
-				contentElement = (ContentElement) methodElement;
-				contentElementPath = libPath + File.separator
-						+ ResourceHelper.getElementPath(methodElement);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.createFormContent(IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		form = managedForm.getForm();
-		toolkit = managedForm.getToolkit();
-		form.getBody().setLayout(new TableWrapLayout());
-	}
-
-	/**
-	 * Called when the expand/collapse button is selected.
-	 * 
-	 * @param event
-	 *            The associated event.
-	 */
-	protected void toggle(HyperlinkEvent event) {
-	}
-
-	/**
-	 * Called when the expand/collapse button is selected.
-	 * 
-	 * @param event
-	 *            The associated event.
-	 * @param o
-	 *            ???
-	 */
-	protected void toggle(HyperlinkEvent event, int o) {
-	}
-
-	/**
-	 * Sets the name for the editor.
-	 * 
-	 * @param editorName
-	 *            The name of the editor.
-	 */
-	public void setEditorName(String editorName) {
-		this.editorName = editorName;
-	}
-
-	/**
-	 * Returns a list of Method elements.
-	 * 
-	 * @param viewer
-	 *            A TableViewer.
-	 * @return A list of Method elements.
-	 */
-	public List retrieveTableViewerContents(TableViewer viewer) {
-		Object[] elements = ((IStructuredContentProvider) viewer
-				.getContentProvider()).getElements(viewer.getInput());
-		List elementList = new ArrayList();
-		for (int i = 0; i < elements.length; i++)
-			elementList.add(elements[i]);
-		return elementList;
-	}
-
-	/**
-	 * Creates a section on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param name
-	 *            The section name.
-	 * @param description
-	 *            The section description.
-	 * @return A new <code>Section</code>.
-	 */
-	protected Section createSection(FormToolkit toolkit, Composite parent,
-			String title, String description) {
-		Section section = toolkit.createSection(parent, Section.DESCRIPTION
-				| Section.TWISTIE | Section.EXPANDED | Section.TITLE_BAR);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		section.setLayoutData(td);
-		section.setText(title);
-//		String text = MessageFormat.format(description,
-//				new String[] { LibraryUIText.getUITextLower(methodElement) });
-//		section.setDescription(text);
-		section.setDescription(description);
-		section.setLayout(new GridLayout());
-		return section;
-	}
-
-	/**
-	 * Creates a label on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param text
-	 *            The text for the label.
-	 * @param gridDataStyle
-	 *            The GridData style.
-	 * @param horizontalSpan
-	 *            The number of column cells taken up by the Label.
-	 * @return A new <code>Label</code>.
-	 */
-	protected static Label createLabel(FormToolkit toolkit, Composite parent,
-			String text, int gridDataStyle, int horizontalSpan) {
-		Label label = toolkit.createLabel(parent, text, SWT.WRAP
-				| SWT.LEFT_TO_RIGHT);
-		GridData gridData = new GridData(gridDataStyle);
-		gridData.horizontalSpan = horizontalSpan;
-		gridData.verticalAlignment = SWT.TOP;
-		gridData.widthHint = (horizontalSpan == 2) ? 115 : 100;
-		label.setLayoutData(gridData);
-		return label;
-	}
-	
-	/**
-	 * Creates a label on a form page without wrap and no widthHint.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param text
-	 *            The text for the label.
-	 * @param gridDataStyle
-	 *            The GridData style.
-	 * @param horizontalSpan
-	 *            The number of column cells taken up by the Label.
-	 * @return A new <code>Label</code>.
-	 */
-	public static Label createLabelWithNoWrap(FormToolkit toolkit, Composite parent,
-			String text, int gridDataStyle, int horizontalSpan) {
-		Label label = toolkit.createLabel(parent, text, SWT.LEFT_TO_RIGHT);
-		GridData gridData = new GridData(gridDataStyle);
-		gridData.horizontalSpan = horizontalSpan;
-		gridData.verticalAlignment = SWT.TOP;
-		//gridData.widthHint = (horizontalSpan == 2) ? 115 : 100;
-		label.setLayoutData(gridData);
-		return label;
-	}
-
-	/**
-	 * Creates a label on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param text
-	 *            The text for the label.
-	 * @return A new <code>Label</code>.
-	 */
-	protected static Label createLabel(FormToolkit toolkit, Composite parent,
-			String text) {
-		return createLabel(toolkit, parent, text, GridData.BEGINNING, 1);
-	}
-
-	/**
-	 * Creates a label on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param text
-	 *            The text for the label.
-	 * @param horizontalSpan
-	 *            The number of column cells taken up by the Label.
-	 * @return A new <code>Label</code>.
-	 */
-	protected static Label createLabel(FormToolkit toolkit, Composite parent,
-			String text, int horizontalSpan) {
-		return createLabel(toolkit, parent, text, GridData.BEGINNING,
-				horizontalSpan);
-	}
-
-	/**
-	 * Creates a blank label on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param horizontalSpan
-	 *            The number of column cells taken up by the Label.
-	 * @return A new <code>Label</code>.
-	 */
-	protected static Label createBlankLabel(FormToolkit toolkit,
-			Composite parent, int horizontalSpan) {
-		return createLabel(toolkit, parent,
-				"", GridData.FILL_HORIZONTAL, horizontalSpan); //$NON-NLS-1$
-	}
-
-	/**
-	 * Creates a text control on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param style
-	 *            The Text style.
-	 * @param gridDataStyle
-	 *            The GridData style.
-	 * @param heigth
-	 *            The height of the control.
-	 * @param width
-	 *            The width of the text control.
-	 * @param horizontalSpan
-	 *            The number of column cells taken up by the Text control.
-	 * @return A new <code>Text</code> control.
-	 */
-	protected static Text createTextEdit(FormToolkit toolkit, Composite parent,
-			int style, int gridDataStyle, int height, int width,
-			int horizontalSpan) {
-		Text control = toolkit.createText(parent, "", style); //$NON-NLS-1$
-		GridData gridData = new GridData(gridDataStyle);
-		gridData.heightHint = height;
-		gridData.widthHint = width;
-		gridData.horizontalSpan = horizontalSpan;
-		control.setLayoutData(gridData);
-		return control;
-	}
-
-	/**
-	 * Creates a single-line text control on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @return A new <code>Text</code> control.
-	 */
-	protected static Text createTextEdit(FormToolkit toolkit, Composite parent) {
-		return createTextEdit(toolkit, parent, SWT.SINGLE | SWT.WRAP,
-				GridData.FILL_HORIZONTAL, SWT.DEFAULT, 100, 1);
-	}
-
-	/**
-	 * Creates a text control with a label on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param textStyle
-	 *            The Text style.
-	 * @param gridDataStyle
-	 *            The GridData style.
-	 * @param height
-	 *            The height of the control.
-	 * @param width
-	 *            The width of the text control.
-	 * @param horizontalSpan
-	 *            The number of column cells taken up by the Text control.
-	 * @param labelText
-	 *            the text for the label.
-	 * @return A new <code>Text</code> control.
-	 */
-	protected static Text createTextEditWithLabel(FormToolkit toolkit,
-			Composite parent, int textStyle, int gridDataStyle, int height,
-			int width, int horizontalSpan, String textLabel) {
-		createLabel(toolkit, parent, textLabel);
-		return createTextEdit(toolkit, parent, textStyle, gridDataStyle,
-				height, width, horizontalSpan);
-	}
-
-	/**
-	 * Creates a single-line text control with a label on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param labelText
-	 *            the text for the label.
-	 * @return A new <code>Text</code> control.
-	 */
-	protected static Text createTextEditWithLabel(FormToolkit toolkit,
-			Composite parent, String labelText) {
-		createLabel(toolkit, parent, labelText, 2);
-		return createTextEdit(toolkit, parent);
-	}
-
-	/**
-	 * Creates a double-line text control with a label on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param labelText
-	 *            the text for the label.
-	 * @return A new <code>Text</code> control.
-	 */
-	protected static Text createTextEditWithLabel2(FormToolkit toolkit,
-			Composite parent, String labelText) {
-		createLabel(toolkit, parent, labelText, 2);
-		return createTextEdit(toolkit, parent, SWT.MULTI | SWT.WRAP
-				| SWT.V_SCROLL, GridData.FILL_HORIZONTAL
-				| GridData.GRAB_HORIZONTAL, 40, 300, 1);
-	}
-
-	/**
-	 * Creates a single or multi-line text control with a label on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param labelText
-	 *            the text for the label.
-	 * @return A new <code>Text</code> control.
-	 */
-	protected static Text createTextEditWithLabel3(FormToolkit toolkit,
-			Composite parent, String labelText, int height, int singleOrMulti) {
-		createLabel(toolkit, parent, labelText, 2);
-		return createTextEdit(toolkit, parent, singleOrMulti | SWT.WRAP
-				| SWT.V_SCROLL | SWT.TRAVERSE_TAB_NEXT,
-				GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL, height,
-				300, 2);
-	}
-
-	/**
-	 * Creates a single or multi-line text control with a label in a composite.
-	 * 
-	 * @author hopeshared
-	 */
-	protected static Text createTextEditWithLabel4(FormToolkit toolkit,
-			Composite parent, String labelText, int height, int singleOrMulti, String fillText) {
-		createLabelInComposite(toolkit, parent, labelText, 2);
-		return createTextEdit2(toolkit, parent, singleOrMulti | SWT.WRAP
-				| SWT.V_SCROLL | SWT.TRAVERSE_TAB_NEXT,
-				GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL, height, fillText);
-	}
-	
-	/**
-	 * Creates a combobox control with a label in a composite.
-	 * @author hopeshared
-	 */
-	protected Combo createComboWithLabel2(FormToolkit toolkit, Composite parent,
-			String labelText) {
-		createLabelInComposite(toolkit, parent, labelText, 2);
-		Composite textPane = createCompositeEqual(toolkit,
-				parent, GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL, 1, 2, 4);
-		Combo control = new Combo(textPane, SWT.SINGLE | SWT.FLAT | SWT.READ_ONLY);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = 4;
-		gridData.heightHint = 24;
-		control.setLayoutData(gridData);
-		return control;
-	}
-	
-	/**
-	 * Creates a label in a composite.
-	 * 
-	 * @author hopeshared
-	 */
-	protected static Label createLabelInComposite(FormToolkit toolkit, Composite parent,
-			String text, int horizontalSpan) {
-		Composite textPane = createComposite(toolkit,
-				parent, GridData.BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING, 1, horizontalSpan, 1);
-		return createLabel(toolkit, textPane, text, GridData.BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING,
-				1);
-	}
-	
-	/**
-	 * Creates a text control in a composite.
-	 * 
-	 * @author hopeshared
-	 */
-	protected static Text createTextEdit2(FormToolkit toolkit, Composite parent,
-			int style, int gridDataStyle, int height, String fillText) {
-		Composite textPane = createCompositeEqual(toolkit,
-				parent, gridDataStyle, 1, 2, 4);
-		toolkit.paintBordersFor(textPane);
-		
-		int horizontalSpan = calculateSpan(fillText);
-		
-		Text control = toolkit.createText(textPane, "", style); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(gridDataStyle);
-			gridData.heightHint = height;
-			gridData.horizontalSpan = horizontalSpan;
-			control.setLayoutData(gridData);
-		}
-		for(int i=horizontalSpan; i<4; i++){
-			createBlankLabel(toolkit, textPane, 1);
-		}
-
-		return control;
-	}
-	
-	/**
-	 * Calculate the text's horizontal span.
-	 * 
-	 * @author hopeshared
-	 */
-	protected static int calculateSpan(String fillText){
-		int length = fillText.length();
-
-		if(length < 70)
-			return 2;
-		else if(length < 105)
-			return 3;
-		return 4;
-	}
-	
-	/**
-	 * Creates a composite using GridLayout and each column in same width.
-	 * 
-	 * @author hopeshared
-	 */
-	protected static Composite createCompositeEqual(FormToolkit toolkit,
-			Composite parent, int gridDataStyle, int verticalSpan,
-			int horizontalSpan, int numColumns) {
-		Composite composite = toolkit.createComposite(parent, SWT.NONE);
-		GridData gridData = new GridData(gridDataStyle);
-		gridData.verticalSpan = verticalSpan;
-		gridData.horizontalSpan = horizontalSpan;
-		composite.setLayoutData(gridData);
-		composite.setLayout(new GridLayout(numColumns, true));
-		return composite;
-	}
-
-
-	/**
-	 * Creates a large text control with a label on a form page.
-	 * <p>
-	 * Used for the Brief Description box.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param labelText
-	 *            the text for the label.
-	 * @return A new <code>Text</code> control.
-	 */
-	protected static Text createTextEditWithLabelLarge(FormToolkit toolkit,
-			Composite parent, String labelText) {
-		Label label = createLabel(toolkit, parent, labelText);
-		((GridData) label.getLayoutData()).widthHint = SWT.DEFAULT;
-		return createTextEdit(toolkit, parent, SWT.MULTI | SWT.WRAP
-				| SWT.V_SCROLL, GridData.FILL_HORIZONTAL
-				| GridData.GRAB_HORIZONTAL, 80, SWT.DEFAULT, 3);
-	}
-
-	/**
-	 * Creates an image hyperlink on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param text
-	 *            The text for the hyperlink.
-	 * @param image
-	 *            The hyperlink image.
-	 * @return A new <code>ImageHyperlink</code>.
-	 */
-	protected ImageHyperlink createImageHyperlink(FormToolkit toolkit,
-			Composite parent, String text, Image image) {
-		ImageHyperlink link = toolkit.createImageHyperlink(parent, SWT.LEFT
-				| SWT.TOP);
-		GridData gridData = new GridData(GridData.BEGINNING);
-		gridData.verticalAlignment = SWT.TOP;
-		link.setLayoutData(gridData);
-		link.setImage(image);
-		if (text != null)
-			link.setText(text);
-		return link;
-	}
-
-	/**
-	 * Creates an image hyperlink on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param sectionId
-	 *            The sction ID.
-	 * @return A new <code>ImageHyperlink</code>.
-	 */
-	protected ImageHyperlink createHyperLink(FormToolkit toolkit,
-			Composite expandedComposite, int sectionID) {
-		SECTION_ID = sectionID;
-		ImageHyperlink expandLink = toolkit.createImageHyperlink(
-				expandedComposite, SWT.NONE);
-		expandLink.setImage(AuthoringUIImages.IMG_EXPANDED);
-		expandLink.setUnderlined(false);
-		expandLink.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				toggle(e, SECTION_ID);
-			}
-		});
-		return expandLink;
-	}
-
-	/**
-	 * Creates a rich text control on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param style
-	 *            The rich text style.
-	 * @param height
-	 *            The height of the control.
-	 * @param width
-	 *            The width of the text control.
-	 * @param horizontalSpan
-	 *            The number of column cells taken up by the Text control.
-	 * @return A new <code>IMethodRichText</code>.
-	 */
-	protected IMethodRichText createRichTextEdit(FormToolkit toolkit,
-			Composite parent, int style, int gridDataStyle, int height,
-			int width, int horizontalSpan, DecoratedField label) {
-		IMethodRichText richText = MethodFormToolkit.createRichText(toolkit,
-				parent, "", style, contentElementPath, methodElement, label); //$NON-NLS-1$
-		GridData gridData = new GridData(gridDataStyle);
-		gridData.heightHint = height;
-		gridData.widthHint = width;
-		gridData.horizontalSpan = horizontalSpan;
-		richText.setLayoutData(gridData);
-		return richText;
-	}
-
-	/**
-	 * Creates a rich text control on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @return A new <code>IMethodRichText</code>.
-	 */
-	protected IMethodRichText createRichTextEdit(FormToolkit toolkit,
-			Composite parent) {
-		return createRichTextEdit(toolkit, parent, SWT.MULTI | SWT.WRAP
-				| SWT.V_SCROLL, GridData.FILL_HORIZONTAL, SWT.DEFAULT,
-				SWT.DEFAULT, 1, null);
-	}
-	
-	public static DecoratedField createDecoratedLabel(FormToolkit toolkit, Composite parent,
-			String text) {
-		return createDecoratedLabel(toolkit, parent, text, GridData.BEGINNING, 1);
-	}
-	
-	protected static DecoratedField createDecoratedLabel(FormToolkit toolkit, Composite parent,
-			String text, int gridDataStyle, int horizontalSpan) {
-		DecoratedField decoratedLabel = new DecoratedField(parent, SWT.WRAP | SWT.LEFT_TO_RIGHT, decoratedLabelCreator);
-		decoratedLabel.setUseMaximumDecorationWidth(false);
-		Label label = (Label)decoratedLabel.getControl();
-		// set colors, etc
-		toolkit.adapt(label, false, false);
-		toolkit.adapt(decoratedLabel.getLayoutControl(), false, false);
-		// set label text
-		label.setText(text);
-		// set layout data
-		GridData gridData = new GridData(gridDataStyle);
-		gridData.horizontalSpan = horizontalSpan;
-		gridData.verticalAlignment = SWT.TOP;
-		gridData.widthHint = (horizontalSpan == 2) ? 115 : 100;
-		decoratedLabel.getLayoutControl().setLayoutData(gridData);
-		return decoratedLabel;
-	}
-
-	/**
-	 * Creates a rich text control with a image hyperLink and label on a form
-	 * page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param labelText
-	 *            The text for the label.
-	 * @param sectionId
-	 *            The section ID.
-	 * @return A new <code>IRichMethodText</code>.
-	 */
-	protected IMethodRichText createRichTextEditWithLink(
-			FormToolkit toolkit, Composite parent, String labelText,
-			int height, int width, int horizontalSpan) {
-		ImageHyperlink link = createImageHyperlink(toolkit, parent, null,
-				AuthoringUIImages.IMG_COLLAPSED);
-		link.setToolTipText(AuthoringUIResources.openRTE);
-		// create DecoratedField here for markers
-		DecoratedField decoratedLabel = createDecoratedLabel(toolkit, parent, labelText);
-
-		IMethodRichText control = createRichTextEdit(toolkit, parent, SWT.MULTI
-				| SWT.WRAP | SWT.V_SCROLL, GridData.FILL_HORIZONTAL, height,
-				width, horizontalSpan, decoratedLabel);
-
-		link.setHref(control);
-		link.setData("Title", labelText); //$NON-NLS-1$
-		link.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				toggle(e);
-			}
-		});
-
-		return control;
-	}
-
-
-	/**
-	 * Creates a rich text control with a image hyperLink and label on a form
-	 * page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param labelText
-	 *            The text for the label.
-	 * @param sectionId
-	 *            The section ID.
-	 * @return A new <code>IRichMethodText</code>.
-	 */
-	protected IMethodRichText createRichTextEditWithLinkForSection(
-			FormToolkit toolkit, Composite parent, String labelText,
-			int height, int width, int sectionID) {
-		final int SECTION_ID = sectionID;
-		ImageHyperlink link = createImageHyperlink(toolkit, parent, null,
-				AuthoringUIImages.IMG_COLLAPSED);
-		link.setToolTipText(AuthoringUIResources.openRTE);
-		// create DecoratedField here for markers
-		DecoratedField decoratedLabel = createDecoratedLabel(toolkit, parent, labelText);
-
-		IMethodRichText control = createRichTextEdit(toolkit, parent, SWT.MULTI
-				| SWT.WRAP | SWT.V_SCROLL, GridData.FILL_HORIZONTAL, height,
-				width, 1, decoratedLabel);
-
-		link.setHref(control);
-		link.setData("Title", labelText); //$NON-NLS-1$
-		link.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				toggle(e, SECTION_ID);
-			}
-		});
-
-		return control;
-	}
-
-	/**
-	 * Creates a rich text editor on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param style
-	 *            The rich text style.
-	 * @param height
-	 *            The height of the control.
-	 * @param width
-	 *            The width of the text control.
-	 * @param horizontalSpan
-	 *            The number of column cells taken up by the Text control.
-	 * @return The new <code>IMethodRichTextEditor</code>.
-	 */
-	protected IMethodRichTextEditor createRichTextEditor(FormToolkit toolkit,
-			Composite parent, int style, int gridDataStyle, int height,
-			int width, int horizontalSpan, DecoratedField label) {
-		IMethodRichTextEditor editor = MethodFormToolkit.createRichTextEditor(
-				toolkit, parent, "", style, contentElementPath, methodElement, label); //$NON-NLS-1$
-		GridData gridData = new GridData(gridDataStyle);
-		gridData.heightHint = height;
-		gridData.widthHint = width;
-		gridData.horizontalSpan = horizontalSpan;
-		editor.setLayoutData(gridData);
-		return editor;
-	}
-
-	/**
-	 * Creates a combobox control on a form page.
-	 * 
-	 * @param parent
-	 *            The parent composite.
-	 * @param style
-	 *            The Combobox style.
-	 * @param gridDataStyle
-	 *            The GridData style.
-	 * @return A new <code>Combobox</code>.
-	 */
-	protected Combo createCombo(Composite parent, int style, int gridDataStyle) {
-		Combo control = new Combo(parent, style);
-		return control;
-	}
-
-	/**
-	 * Creates a combobox control on a form page.
-	 * 
-	 * @param parent
-	 *            The parent composite.
-	 * @return A new <code>Combobox</code>.
-	 */
-	protected Combo createCombo(Composite parent) {
-		return createCombo(parent, SWT.SINGLE | SWT.FLAT | SWT.READ_ONLY,
-				GridData.FILL_HORIZONTAL);
-	}
-
-	/**
-	 * Creates a combobox control with a label on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param labelText
-	 *            The text for the Label.
-	 * @param style
-	 *            The Combobox style.
-	 * @param gridDataStyle
-	 *            The GridData style.
-	 * @return A new <code>Combobox</code>.
-	 */
-	protected Combo createCComboWithLabel(FormToolkit toolkit,
-			Composite parent, String textLabel, int style, int gridDataStyle) {
-		createLabel(toolkit, parent, textLabel);
-		return createCombo(parent, style, gridDataStyle);
-	}
-
-	/**
-	 * Creates a combobox control with a label on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param labelText
-	 *            The text for the Label.
-	 * @return A new <code>Combobox</code>.
-	 */
-	protected Combo createComboWithLabel(FormToolkit toolkit, Composite parent,
-			String labelText) {
-		createLabel(toolkit, parent, labelText);
-		return createCombo(parent, SWT.SINGLE | SWT.FLAT | SWT.READ_ONLY,
-				GridData.FILL_HORIZONTAL);
-	}
-
-	/**
-	 * Creates a composite on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param section
-	 *            The parent section.
-	 * @return A new <code>Composite</code>.
-	 */
-
-	protected Composite createComposite(FormToolkit toolkit, Section section) {
-		Composite composite = toolkit.createComposite(section);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		composite.setLayout(new GridLayout(3, false));
-		section.setClient(composite);
-		return composite;
-	}
-
-	/**
-	 * Creates a composite on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param gridDataStyle
-	 *            The GridData style.
-	 * @param verticalSpan
-	 *            The number of row cells taken up by the Composite.
-	 * @param horizontalSpan
-	 *            The number of column cells taken up by the Composite.
-	 * @param numColumns
-	 *            The number of columns in the grid.
-	 * @return A new <code>Composite</code>.
-	 */
-	protected static Composite createComposite(FormToolkit toolkit,
-			Composite parent, int gridDataStyle, int verticalSpan,
-			int horizontalSpan, int numColumns) {
-		Composite composite = toolkit.createComposite(parent, SWT.NONE);
-		GridData gridData = new GridData(gridDataStyle);
-		gridData.verticalSpan = verticalSpan;
-		gridData.horizontalSpan = horizontalSpan;
-		composite.setLayoutData(gridData);
-		composite.setLayout(new GridLayout(numColumns, false));
-		return composite;
-	}
-
-	/**
-	 * Creates a composite on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param verticalSpan
-	 *            The number of row cells taken up by the Composite.
-	 * @return A new <code>Composite</code>.
-	 */
-	protected static Composite createComposite(FormToolkit toolkit,
-			Composite parent, int verticalSpan) {
-		return createComposite(toolkit, parent, GridData.FILL_BOTH,
-				verticalSpan, 1, 1);
-	}
-
-	/**
-	 * Creates a composite for displaying buttons on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param type
-	 *            The Composite type.
-	 * @return A new <code>Composite</code>.
-	 */
-	protected static Composite createCompositeForButtons(FormToolkit toolkit,
-			Composite parent) {
-		return createComposite(toolkit, parent, GridData.VERTICAL_ALIGN_CENTER
-				| GridData.HORIZONTAL_ALIGN_CENTER, SWT.DEFAULT, SWT.DEFAULT, 1);
-	}
-
-	/**
-	 * Creates a expanded composite in the form
-	 * <p>
-	 * Used to hold an expanded rich text editor.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @return A new <code>Composite</code>.
-	 */
-	protected Composite createExpandedComposite(FormToolkit toolkit,
-			Composite parent) {
-		Composite expandedComposite = toolkit.createComposite(parent, SWT.NONE);
-		expandedComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		expandedComposite.setLayout(new GridLayout(2, false));
-		expandedComposite.setVisible(false);
-		return expandedComposite;
-	}
-
-	/**
-	 * Creates a table on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param style
-	 *            The Table style.
-	 * @param gridDataStyle
-	 *            The GridData style.
-	 * @param height
-	 *            The height of the Table.
-	 * @param width
-	 *            The width of the Table.
-	 * @param verticalSpan
-	 *            The number of row cells taken up by the Table.
-	 * @param horizontalSpan
-	 *            The number of column cells taken up by the Table.
-	 * @return A new <code>Table</code>.
-	 */
-	protected static Table createTable(FormToolkit toolkit, Composite parent,
-			int style, int gridDataStyle, int height, int width,
-			int verticalSpan, int horizontalSpan) {
-		Table table = toolkit.createTable(parent, style);
-		GridData gridData = new GridData(gridDataStyle);
-		gridData.heightHint = height;
-		gridData.widthHint = width;
-		gridData.verticalSpan = verticalSpan;
-		gridData.horizontalSpan = horizontalSpan;
-		table.setLayoutData(gridData);
-		return table;
-	}
-
-	/**
-	 * Creates a table on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param type
-	 *            The table table.
-	 * @return A new <code>Table</code>.
-	 */
-	protected static Table createTable(FormToolkit toolkit, Composite parent,
-			int type) {
-		switch (type) {
-		case SMALL_SIZE:
-			return createTable(toolkit, parent, SWT.MULTI, GridData.FILL_BOTH,
-					56, 200, 1, 1);
-		case MEDIUM_SIZE:
-			return createTable(toolkit, parent, SWT.MULTI, GridData.FILL_BOTH,
-					112, 200, 1, 1);
-		case LARGE_SIZE:
-			return createTable(toolkit, parent, SWT.MULTI, GridData.FILL_BOTH,
-					200, 200, 1, 1);
-		case SINGLE_ROW:
-			return createTable(toolkit, parent, SWT.MULTI,
-					GridData.FILL_HORIZONTAL, 20, 200, 1, 1);
-		default:
-			throw new IllegalArgumentException();
-		}
-	}
-
-	/**
-	 * Creates a button on a form page.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 * @param parent
-	 *            The parent composite.
-	 * @param type
-	 *            The button type.
-	 * @return A new <code>Button</code>.
-	 */
-	protected static Button createButton(FormToolkit toolkit, Composite parent,
-			int type) {
-		Button button;
-		switch (type) {
-		case ADD_BUTTON:
-			button = toolkit.createButton(parent,
-					AuthoringUIText.ADD_BUTTON_TEXT, SWT.NONE);
-			break;
-		case REMOVE_BUTTON:
-			button = toolkit.createButton(parent,
-					AuthoringUIText.REMOVE_BUTTON_TEXT, SWT.NONE);
-			break;
-		case UP_BUTTON:
-			button = toolkit.createButton(parent,
-					AuthoringUIText.UP_BUTTON_TEXT, SWT.NONE);
-			break;
-		case DOWN_BUTTON:
-			button = toolkit.createButton(parent,
-					AuthoringUIText.DOWN_BUTTON_TEXT, SWT.NONE);
-			break;
-		case ORDER_BUTTON:
-			button = toolkit.createButton(parent,
-					AuthoringUIText.ORDER_BUTTON_TEXT, SWT.NONE);
-			break;
-		case SELECT_BUTTON:
-			button = toolkit.createButton(parent,
-					AuthoringUIText.SELECT_BUTTON_TEXT, SWT.NONE);
-			break;
-		case CLEAR_BUTTON:
-			button = toolkit.createButton(parent,
-					AuthoringUIText.CLEAR_BUTTON_TEXT, SWT.NONE);
-			break;
-		case ATTACH_BUTTON:
-			button = toolkit.createButton(parent,
-					AuthoringUIText.ATTACH_BUTTON_TEXT, SWT.NONE);
-			break;
-		case DETACH_BUTTON:
-			button = toolkit.createButton(parent,
-					AuthoringUIText.DETACH_BUTTON_TEXT, SWT.NONE);
-			break;
-		default:
-			throw new IllegalArgumentException();
-		}
-		button.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		button.setEnabled(false);
-		return button;
-	}
-	
-	/**
-	 * Get height of the rich text control
-	 * @return
-	 * 		Height of the rich text control
-	 */
-	public int getRichTextEditorHeight() {
-		return form.getBounds().height - 3 * 32;
-	}
-
-	/**
-	 * Get width of the rich text control
-	 * @return
-	 * 		Width of the rich text control
-	 */
-	public int getRichTextEditorWidth() {
-		int width = 840;
-		int lastWidth = RichTextToolBar.getLastWidth();
-		if (lastWidth != -1) {
-			width = lastWidth;
-		}
-		return Math.max(width, form.getBounds().width - 2 * 32);
-	}
-
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/CategoryGuidancePage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/CategoryGuidancePage.java
deleted file mode 100755
index be99f0b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/CategoryGuidancePage.java
+++ /dev/null
@@ -1,253 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.GuidanceFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.util.MethodElementUtil;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Guidance page in the content element editor.
- * 
- * @author Shashidhar Kannoori
- * @author Kelvin Low
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- * TODO - change name of class to ContentElementGuidancePage
- */
-public class CategoryGuidancePage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "categoryGuidancesPage"; //$NON-NLS-1$
-
-	/**
-	 * Creates a new instance.
-	 */
-	public CategoryGuidancePage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.GUIDANCE_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		setAllowChange1(true);
-		setAllowChange2(true);
-		setUseCategory2(false);
-		setUseCategory3(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				List list = MethodElementUtil
-						.getSelectedGuidances(contentElement);
-				List local = new ArrayList();
-				for (Iterator it = list.iterator(); it.hasNext();) {
-					Object obj = it.next();
-					if (!(obj instanceof Practice
-							|| (obj instanceof ToolMentor && contentElement instanceof Tool) || obj
-							.equals(contentElement
-									.getVariabilityBasedOnElement()))) {
-						local.add(obj);
-					}
-				}
-				return local.toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			for (Iterator it = addItems.iterator(); it.hasNext();) {
-				Guidance item = (Guidance) it.next();
-
-				// Guidance for content element.
-				if (item instanceof Checklist) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.ADD,
-									contentElement,
-									UmaPackage.eINSTANCE
-											.getContentElement_Checklists(),
-									(Checklist) item, -1);
-				} else if (item instanceof Concept) {
-					editor.getActionManager().doAction(
-							IActionManager.ADD,
-							contentElement,
-							UmaPackage.eINSTANCE
-									.getContentElement_ConceptsAndPapers(),
-							(Concept) item, -1);
-				} else if (item instanceof Example) {
-					editor.getActionManager().doAction(IActionManager.ADD,
-							contentElement,
-							UmaPackage.eINSTANCE.getContentElement_Examples(),
-							(Example) item, -1);
-				} else if (item instanceof SupportingMaterial) {
-					editor.getActionManager().doAction(
-							IActionManager.ADD,
-							contentElement,
-							UmaPackage.eINSTANCE
-									.getContentElement_SupportingMaterials(),
-							(SupportingMaterial) item, -1);
-				} else if (item instanceof Guideline) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.ADD,
-									contentElement,
-									UmaPackage.eINSTANCE
-											.getContentElement_Guidelines(),
-									(Guideline) item, -1);
-				} else if (item instanceof ReusableAsset) {
-					editor.getActionManager().doAction(IActionManager.ADD,
-							contentElement,
-							UmaPackage.eINSTANCE.getContentElement_Assets(),
-							(ReusableAsset) item, -1);
-				} else {
-					AuthoringUIPlugin
-							.getDefault()
-							.getLogger()
-							.logError(
-									"Unable to add guidance " + item.getType().getName() + ":" + item.getName() + //$NON-NLS-1$ //$NON-NLS-2$
-											"to "
-											+ contentElement.getType()
-													.getName()
-											+ ":" + contentElement.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				Guidance item = (Guidance) it.next();
-
-				// Guidance for the method element.
-				if (item instanceof Checklist) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.REMOVE,
-									contentElement,
-									UmaPackage.eINSTANCE
-											.getContentElement_Checklists(),
-									item, -1);
-				} else if (item instanceof Concept) {
-					editor.getActionManager().doAction(
-							IActionManager.REMOVE,
-							contentElement,
-							UmaPackage.eINSTANCE
-									.getContentElement_ConceptsAndPapers(),
-							(Concept) item, -1);
-				} else if (item instanceof Example) {
-					editor.getActionManager().doAction(IActionManager.REMOVE,
-							contentElement,
-							UmaPackage.eINSTANCE.getContentElement_Examples(),
-							(Example) item, -1);
-				} else if (item instanceof SupportingMaterial) {
-					editor.getActionManager().doAction(
-							IActionManager.REMOVE,
-							contentElement,
-							UmaPackage.eINSTANCE
-									.getContentElement_SupportingMaterials(),
-							(SupportingMaterial) item, -1);
-				} else if (item instanceof Guideline) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.REMOVE,
-									contentElement,
-									UmaPackage.eINSTANCE
-											.getContentElement_Guidelines(),
-									(Guideline) item, -1);
-				} else if (item instanceof ReusableAsset) {
-					editor.getActionManager().doAction(IActionManager.REMOVE,
-							contentElement,
-							UmaPackage.eINSTANCE.getContentElement_Assets(),
-							(ReusableAsset) item, -1);
-				} else {
-					AuthoringUIPlugin
-							.getDefault()
-							.getLogger()
-							.logError(
-									"Unable to remove guidance " + item.getType().getName() + ":" + item.getName() + //$NON-NLS-1$ //$NON-NLS-2$
-											"from "
-											+ contentElement.getType()
-													.getName()
-											+ ":" + contentElement.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return contentElement;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.GUIDANCE;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new GuidanceFilter();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ChecklistItemsPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ChecklistItemsPage.java
deleted file mode 100755
index e065c3c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ChecklistItemsPage.java
+++ /dev/null
@@ -1,767 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIImages;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.dialogs.SectionsOrderDialog;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditorInput;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor.ModifyListener;
-import org.eclipse.epf.authoring.ui.providers.VariabilityElementLabelProvider;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichTextEditor;
-import org.eclipse.epf.authoring.ui.util.EditorsContextHelper;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.AddToSectionListCommand;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.command.MoveInSectionListCommand;
-import org.eclipse.epf.library.edit.command.RemoveFromSectionList;
-import org.eclipse.epf.library.edit.util.SectionList;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.events.ILibraryChangeListener;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.richtext.RichTextListener;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.jface.fieldassist.DecoratedField;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-
-/**
- * The Check Item page in the Checklist editor.
- * 
- * @author Shashidhar Kannoori
- * @author Kelvin Low
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class ChecklistItemsPage extends BaseFormPage {
-
-	private static final String FORM_PAGE_ID = "checklistCheckItemsPage"; //$NON-NLS-1$
-
-	private Text ctrl_name;
-
-	private Button ctrl_add, ctrl_delete, ctrl_up, ctrl_down, ctrl_order;
-
-	private Table ctrl_checkItems;
-
-	private TableViewer checkItemsTableViewer;
-
-	private SectionList allcheckItems;
-
-	private IMethodRichText activeControl;
-
-	private boolean descExpandFlag = false;
-
-	private IMethodRichTextEditor ctrl_expanded;
-
-	private ImageHyperlink expandLink;
-
-	private DecoratedField expandLabel;
-
-	protected Section formSection;
-	private Section generalSection;
-
-	protected Composite sectionComposite;
-	private Composite generalComposite;
-
-	private Composite expandedComposite;
-
-	private IMethodRichText ctrl_maindesc;
-
-	private IStructuredContentProvider checkItemsViewerContentProvider;
-
-	private ILabelProvider checkItemsViewerLabelProvider;
-
-	private Checklist checklist;
-
-	private org.eclipse.epf.uma.Section currentItem;
-
-	private ILibraryChangeListener libListener = null;
-
-	private ModifyListener contentModifyListener;
-
-	private IActionManager actionMgr;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ChecklistItemsPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.CHECK_ITEMS_TEXT);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.BaseFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		MethodElementEditorInput methodElementInput = (MethodElementEditorInput) input;
-		checklist = (Checklist) methodElementInput.getMethodElement();
-	}
-
-	/**
-	 * Create form content
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-
-		String elementLabel = LibraryUIText.getUIText(methodElement);
-		form.setText(LibraryUIText.TEXT_GUIDANCE
-				+ " (" + elementLabel + "): " + methodElement.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		formSection = toolkit.createSection(form.getBody(), Section.NO_TITLE);
-		{
-			TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-			formSection.setLayoutData(td);
-			formSection.setLayout(new TableWrapLayout());
-		}
-		// Create the composite for the sections.
-		sectionComposite = toolkit.createComposite(formSection, SWT.NONE);
-		sectionComposite.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		sectionComposite.setLayout(new TableWrapLayout());
-		formSection.setClient(sectionComposite);
-
-		// Create the General Information section.
-		generalSection = toolkit.createSection(sectionComposite,
-				Section.TITLE_BAR | Section.DESCRIPTION | Section.TWISTIE
-						| Section.EXPANDED);
-		generalSection
-				.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		generalSection.setText(AuthoringUIText.CHECK_ITEMS_SECTION_NAME);
-		generalSection.setDescription(AuthoringUIText.CHECK_ITEMS_SECTION_DESC);
-		generalSection.setLayout(new GridLayout());
-
-		generalComposite = toolkit.createComposite(generalSection);
-		generalComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		generalComposite.setLayout(new GridLayout(4, false));
-		generalSection.setClient(generalComposite);
-
-		EditorsContextHelper.setHelp(generalComposite.getParent(), checklist);
-
-		Composite pane1 = toolkit.createComposite(generalComposite);
-		{
-			GridData gridData = new GridData(GridData.FILL_BOTH);
-			gridData.verticalSpan = 1;
-			gridData.horizontalSpan = 3;
-			pane1.setLayoutData(gridData);
-			pane1.setLayout(new GridLayout());
-		}
-
-		Label l_name = toolkit.createLabel(pane1,
-				AuthoringUIText.CHECK_ITEMS_TEXT);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			gridData.horizontalSpan = 3;
-			l_name.setLayoutData(gridData);
-		}
-
-		ctrl_checkItems = toolkit.createTable(pane1, SWT.MULTI);
-		{
-			GridData gridData = new GridData(GridData.FILL_BOTH);
-			gridData.horizontalSpan = 3;
-			gridData.heightHint = 150;
-			ctrl_checkItems.setLayoutData(gridData);
-		}
-
-		initProviders();
-
-		checkItemsTableViewer = new TableViewer(ctrl_checkItems);
-		checkItemsTableViewer
-				.setContentProvider(checkItemsViewerContentProvider);
-		checkItemsTableViewer.setLabelProvider(checkItemsViewerLabelProvider);
-
-		Composite pane2 = toolkit.createComposite(generalComposite);
-		pane2.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_CENTER
-				| GridData.HORIZONTAL_ALIGN_CENTER));
-		pane2.setLayout(new GridLayout());
-
-		ctrl_add = toolkit.createButton(pane2, AuthoringUIText.ADD_BUTTON_TEXT,
-				SWT.NONE);
-		ctrl_add.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		ctrl_delete = toolkit.createButton(pane2,
-				AuthoringUIText.DELETE_BUTTON_TEXT, SWT.NONE);
-		ctrl_delete.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		ctrl_delete.setEnabled(false);
-
-		ctrl_up = toolkit.createButton(pane2, AuthoringUIText.UP_BUTTON_TEXT,
-				SWT.NONE);
-		ctrl_up.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		ctrl_up.setEnabled(false);
-
-		ctrl_down = toolkit.createButton(pane2,
-				AuthoringUIText.DOWN_BUTTON_TEXT, SWT.NONE);
-		ctrl_down.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		ctrl_down.setEnabled(false);
-
-		ctrl_order = toolkit.createButton(pane2,
-				AuthoringUIText.ORDER_BUTTON_TEXT, SWT.NONE);
-		ctrl_order.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		// name
-		Label nameLabel = toolkit.createLabel(generalComposite,
-				AuthoringUIText.NAME_TEXT);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			gridData.horizontalSpan = 4;
-			nameLabel.setLayoutData(gridData);
-		}
-		ctrl_name = toolkit.createText(generalComposite, "", SWT.SINGLE); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-			gridData.horizontalSpan = 4;
-			ctrl_name.setLayoutData(gridData);
-		}
-
-		createBlankLabel(toolkit, generalComposite, 4);
-		
-		ctrl_maindesc = createRichTextEditWithLink(
-				toolkit, generalComposite, AuthoringUIText.DESCRIPTION_TEXT,
-				250, 300, 4);
-
-		createRichTextEditorSection();
-
-		toolkit.paintBordersFor(pane1);
-		toolkit.paintBordersFor(pane2);
-		toolkit.paintBordersFor(generalComposite);
-		toolkit.paintBordersFor(expandedComposite);
-
-		actionMgr = ((MethodElementEditor) getEditor()).getActionManager();
-
-		addListeners();
-		loadData();
-		enableControls();
-	}
-
-	/**
-	 * Add library and selection listener
-	 */
-	public void addListeners() {
-		final MethodElementEditor editor = (MethodElementEditor) getEditor();
-		contentModifyListener = editor.createModifyListener(currentItem);
-		ctrl_name.addModifyListener(contentModifyListener);
-		((MethodElementEditor.ModifyListener) contentModifyListener)
-				.setDisable(true);
-
-		form.addListener(SWT.Activate, new Listener() {
-			public void handleEvent(Event e) {
-//				IStatus status = TngUtil.checkEdit((EObject) checklist,
-//						getSite().getShell());
-//				if (status.isOK()) {
-//					loadData();
-//				}
-				loadData();
-				if (TngUtil.isLocked(contentElement)) {
-					enableControls(false);
-				} else {
-					ctrl_add.setEnabled(true);
-					checkSelection();
-				}
-			}
-		});
-
-		form.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				deactivate();
-			}
-		});
-
-		form.addControlListener(new ControlListener() {
-			public void controlResized(ControlEvent e) {
-				if (ctrl_expanded != null) {
-					((GridData) ctrl_expanded.getLayoutData()).heightHint = getRichTextEditorHeight();
-					((GridData) ctrl_expanded.getLayoutData()).widthHint = getRichTextEditorWidth();
-				}
-				formSection.layout(true, true);
-			}
-
-			public void controlMoved(ControlEvent e) {
-			}
-		});
-
-		ctrl_name.addModifyListener(contentModifyListener);
-		ctrl_name.addFocusListener(new FocusAdapter() {
-			public void focusLost(FocusEvent e) {
-				if (currentItem != null) {
-					String oldName = currentItem.getName();
-					String newName = ctrl_name.getText();
-					//newName = StrUtil.makeValidFileName(newName);
-					if (ctrl_name.getText() == null
-							|| ctrl_name.getText().length() == 0) {
-						String title = AuthoringUIResources.bind(AuthoringUIResources.renameDialog_title, LibraryUIText.TEXT_CHECK_ITEM); //$NON-NLS-1$
-						String msg = AuthoringUIResources.bind(AuthoringUIResources.emptyElementNameError_msg, StrUtil.toLower(LibraryUIText.TEXT_CHECK_ITEM)); //$NON-NLS-1$
-						if (oldName != null && oldName.length() > 0) {
-							AuthoringUIPlugin.getDefault().getMsgDialog()
-									.displayError(title, msg);
-						} else {
-							getEditorSite()
-									.getActionBars()
-									.getStatusLineManager()
-									.setErrorMessage(
-											PlatformUI
-													.getWorkbench()
-													.getSharedImages()
-													.getImage(
-															ISharedImages.IMG_OBJS_ERROR_TSK),
-											msg);
-						}
-					} else if (!oldName.equals(newName)) {
-						editor.getActionManager().doAction(IActionManager.SET,
-								currentItem,
-								UmaPackage.eINSTANCE.getNamedElement_Name(),
-								newName, -1);
-					}
-				}
-			}
-		});
-
-		ctrl_maindesc.addModifyListener(contentModifyListener);
-		ctrl_maindesc.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				saveMainDescription();
-			}
-		});
-
-		checkItemsTableViewer
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-					public void selectionChanged(SelectionChangedEvent event) {
-						checkSelection();
-					}
-				});
-
-		ctrl_add.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				org.eclipse.epf.uma.Section child = UmaFactory.eINSTANCE
-						.createSection();
-				String newName = MessageFormat.format(
-						AuthoringUIText.NEW_ELEMENT_TEXT,
-						new String[] { LibraryUIText.TEXT_CHECK_ITEM });
-				child.setName(newName);
-				AddToSectionListCommand cmd = new AddToSectionListCommand(
-						checklist, child, allcheckItems);
-				getActionManager().execute(cmd);
-				checkItemsTableViewer.refresh();
-				checkItemsTableViewer.setSelection(new StructuredSelection(
-						child));
-				ctrl_name.setFocus();
-				ctrl_name.setSelection(0, newName.length());
-				getEditorSite().getActionBars().getStatusLineManager()
-						.setErrorMessage("");
-			}
-		});
-
-		ctrl_delete.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				getEditorSite().getActionBars().getStatusLineManager()
-						.setErrorMessage("");
-				IStructuredSelection selection = (IStructuredSelection) checkItemsTableViewer
-						.getSelection();
-				for (Iterator iter = selection.toList().iterator(); iter
-						.hasNext();) {
-					Object o = iter.next();
-					if (o instanceof org.eclipse.epf.uma.Section) {
-						RemoveFromSectionList cmd = new RemoveFromSectionList(
-								checklist, (org.eclipse.epf.uma.Section) o,
-								allcheckItems);
-						getActionManager().execute(cmd);
-					}
-				}
-				checkItemsTableViewer.refresh();
-				editItem(null);
-			}
-		});
-
-		ctrl_up.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) checkItemsTableViewer
-						.getSelection();
-
-				ArrayList moveUpItems = new ArrayList();
-				moveUpItems.addAll(selection.toList());
-				MoveInSectionListCommand cmd = new MoveInSectionListCommand(
-						checklist, moveUpItems, allcheckItems, 1);
-				getActionManager().execute(cmd);
-
-				checkItemsTableViewer.refresh();
-
-				if (checkItemsTableViewer.getTable().getSelectionIndex() > 0
-						&& !TngUtil.isLocked(checklist)) {
-					ctrl_up.setEnabled(true);
-				} else {
-					ctrl_up.setEnabled(false);
-				}
-				if (checkItemsTableViewer.getTable().getSelectionIndex() < checkItemsTableViewer
-						.getTable().getItemCount() - 1
-						&& !TngUtil.isLocked(checklist)) {
-					ctrl_down.setEnabled(true);
-				} else {
-					ctrl_down.setEnabled(false);
-				}
-			}
-		});
-
-		ctrl_down.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) checkItemsTableViewer
-						.getSelection();
-				ArrayList moveDownItems = new ArrayList();
-				moveDownItems.addAll(selection.toList());
-				MoveInSectionListCommand cmd = new MoveInSectionListCommand(
-						checklist, moveDownItems, allcheckItems, 0);
-				getActionManager().execute(cmd);
-
-				checkItemsTableViewer.refresh();
-
-				if (checkItemsTableViewer.getTable().getSelectionIndex() > 0
-						&& !TngUtil.isLocked(checklist)) {
-					ctrl_up.setEnabled(true);
-				} else {
-					ctrl_up.setEnabled(false);
-				}
-				if (checkItemsTableViewer.getTable().getSelectionIndex() < checkItemsTableViewer
-						.getTable().getItemCount() - 1
-						&& !TngUtil.isLocked(checklist)) {
-					ctrl_down.setEnabled(true);
-				} else {
-					ctrl_down.setEnabled(false);
-				}
-			}
-		});
-
-		ctrl_order.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				SectionsOrderDialog dlg = new SectionsOrderDialog(
-						Display.getCurrent().getActiveShell(),
-						checklist,
-						getActionManager(),
-						AuthoringUIResources.ChecklistOrder_title, //$NON-NLS-1$
-						AuthoringUIResources.ChecklistOrder_description, //$NON-NLS-1$
-						AuthoringUIResources.ChecklistOrder_checklistitems_text); //$NON-NLS-1$
-				dlg.open();
-			}
-		});
-	}
-
-	protected void enableControls(boolean editable) {
-		ctrl_name.setEditable(editable);
-		ctrl_maindesc.setEditable(editable);
-		ctrl_add.setEnabled(editable);
-		ctrl_delete.setEnabled(editable);
-		ctrl_up.setEnabled(editable);
-		ctrl_down.setEnabled(editable);
-		ctrl_order.setEnabled(true);
-		if (ctrl_expanded != null) {
-			ctrl_expanded.setEditable(editable);
-		}
-	}
-
-
-	protected void deactivate() {
-		// Save the Item order.
-		if (allcheckItems != null) {
-			allcheckItems.apply();
-		}
-	}
-
-	/**
-	 * Initializes the controls with data from the model.
-	 */
-	private void loadData() {
-		allcheckItems = null;
-		checkItemsTableViewer.setInput(checklist);
-		checkItemsTableViewer.refresh();
-		editItem(currentItem);
-	}
-
-	/**
-	 * Edit current Item.
-	 */
-	private void editItem(org.eclipse.epf.uma.Section item) {
-		((MethodElementEditor.ModifyListener) contentModifyListener)
-				.setDisable(true);
-
-		if (ctrl_maindesc.getModified()) {
-			saveMainDescription();
-		}
-
-		currentItem = item;
-		String name = ""; //$NON-NLS-1$
-		String desc = ""; //$NON-NLS-1$
-		if (currentItem != null) {
-			name = currentItem.getName();
-			desc = currentItem.getSectionDescription();
-			ctrl_name.setFocus();
-			getEditorSite().getActionBars().getStatusLineManager()
-					.setErrorMessage("");
-		}
-		ctrl_name.setText(name == null ? "" : name); //$NON-NLS-1$
-		ctrl_maindesc.setText(desc == null ? "" : desc); //$NON-NLS-1$
-		ctrl_maindesc.setModalObject(currentItem);
-		ctrl_maindesc.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getSection_SectionDescription());
-		if (item == null) {
-			// close any Find/Replace dialog open in the RTE
-			ctrl_maindesc.getFindReplaceAction().dispose();
-		}
-
-		((MethodElementEditor.ModifyListener) contentModifyListener)
-				.setElement(currentItem);
-		((MethodElementEditor.ModifyListener) contentModifyListener)
-				.setDisable(currentItem == null);
-
-		enableControls();
-	}
-
-	/**
-	 * Enable name and description controls
-	 */
-	private void enableControls() {
-		if (checklist.getPresentation().getSections().contains(currentItem)) {
-			if (!TngUtil.isLocked(contentElement)) {
-				ctrl_name.setEditable(true);
-				ctrl_maindesc.setEditable(true);
-			}
-		} else {
-			ctrl_name.setEditable(false);
-			ctrl_maindesc.setEditable(false);
-		}
-	}
-
-	/**
-	 * Dispose listener
-	 * @see org.eclipse.ui.forms.editor.FormPage#dispose()
-	 */
-	public void dispose() {
-		if (libListener != null) {
-			ILibraryManager manager = LibraryService.getInstance().getCurrentLibraryManager();
-			if (manager != null) {
-				manager.removeListener(libListener);
-			}
-			libListener = null;
-		}
-	}
-
-	private void createRichTextEditorSection() {
-		expandedComposite = toolkit.createComposite(formSection, SWT.NONE);
-		expandedComposite.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		expandedComposite.setLayout(new GridLayout(2, false));
-		expandedComposite.setVisible(false);
-
-		// Hyperlink desc
-		expandLink = toolkit.createImageHyperlink(expandedComposite, SWT.NONE);
-		expandLink.setImage(AuthoringUIImages.IMG_EXPANDED);
-		expandLink.setToolTipText(AuthoringUIResources.closeRTE); //$NON-NLS-1$
-		expandLink.setUnderlined(false);
-		expandLink.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				toggle(e);
-			}
-		});
-
-		expandLabel = createDecoratedLabel(toolkit, expandedComposite, ""); //$NON-NLS-1$
-	}
-
-	/**
-	 * Toggle Description control to expand and control state
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.forms.BaseFormPage#toggle(org.eclipse.ui.forms.events.HyperlinkEvent)
-	 */
-	protected void toggle(HyperlinkEvent e) {
-		if (currentItem == null)
-			return;
-		if (ctrl_expanded == null) {
-			ctrl_expanded = createRichTextEditor(toolkit, expandedComposite,
-					SWT.MULTI | SWT.WRAP | SWT.V_SCROLL, GridData.FILL_BOTH,
-					getRichTextEditorHeight(), getRichTextEditorWidth(), 2, expandLabel);
-			ctrl_expanded.addModifyListener(contentModifyListener);
-		}
-
-		if (descExpandFlag) {
-			sectionComposite.setVisible(true);
-			expandedComposite.setVisible(false);
-			formSection.setClient(sectionComposite);
-			IMethodRichText richText = getActiveRichTextControl();
-			richText.setText(ctrl_expanded.getText());
-			for (Iterator i = richText.getListeners(); i.hasNext();) {
-				RichTextListener listener = (RichTextListener) i.next();
-				ctrl_expanded.removeListener(listener.getEventType(), listener
-						.getListener());
-			}
-			if (ctrl_expanded.getModified()) {
-				((MethodElementEditor) getEditor())
-						.saveModifiedRichText(ctrl_expanded);
-			}
-			richText.setFocus();
-		} else {
-			sectionComposite.setVisible(false);
-			expandedComposite.setVisible(true);
-			formSection.setClient(expandedComposite);
-			((Label)expandLabel.getControl()).setText(currentItem.getName() +
-					" - " + (String) ((ImageHyperlink) e.getSource()).getData("Title")); //$NON-NLS-1$ //$NON-NLS-2$
-			IMethodRichText richText = (IMethodRichText) e.getHref();
-			ctrl_expanded.setText(richText.getText());
-			ctrl_expanded.setModalObject(richText.getModalObject());
-			ctrl_expanded.setModalObjectFeature(richText
-					.getModalObjectFeature());
-			ctrl_expanded.setFindReplaceAction(richText.getFindReplaceAction());
-			for (Iterator i = richText.getListeners(); i.hasNext();) {
-				RichTextListener listener = (RichTextListener) i.next();
-				ctrl_expanded.addListener(listener.getEventType(), listener
-						.getListener());
-			}
-			boolean editable = !TngUtil.isLocked(contentElement);
-			ctrl_expanded.setEditable(editable);
-			if (editable) {
-				ctrl_expanded.setFocus();
-			}
-			setActiveRichTextControl(richText);
-		}
-
-		form.getBody().layout(true, true);
-		descExpandFlag = !descExpandFlag;
-	}
-
-	private void setActiveRichTextControl(IMethodRichText editor) {
-		activeControl = editor;
-	}
-
-	private IMethodRichText getActiveRichTextControl() {
-		return activeControl;
-	}
-
-	private void initProviders() {
-		checkItemsViewerContentProvider = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				if (object != checklist)
-					return super.getElements(object);
-				if (allcheckItems == null) {
-					allcheckItems = new SectionList(checklist,
-							SectionList.STEPS_FOR_ELEMENT_ONLY);
-				}
-				return allcheckItems.toArray();
-			}
-		};
-
-		checkItemsViewerLabelProvider = new VariabilityElementLabelProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public boolean isExternal(Object element) {
-				return !checklist.getPresentation().getSections().contains(
-						element);
-			}
-		};
-	}
-
-	private void saveMainDescription() {
-		if (currentItem != null) {
-			IMethodRichText control = descExpandFlag ? ctrl_expanded
-					: ctrl_maindesc;
-			if (!control.getModified()) {
-				return;
-			}
-			String oldContent = currentItem.getSectionDescription();
-			if (((MethodElementEditor) getEditor()).mustRestoreValue(control,
-					oldContent)) {
-				return;
-			}
-			String newContent = control.getText();
-			if (!newContent.equals(oldContent)) {
-				actionMgr.doAction(IActionManager.SET, currentItem,
-						UmaPackage.eINSTANCE.getSection_SectionDescription(),
-						newContent, -1);
-			}
-		}
-	}
-
-	protected IActionManager getActionManager() {
-		FormEditor editor = getEditor();
-		if (editor instanceof MethodElementEditor) {
-			return ((MethodElementEditor) editor).getActionManager();
-		}
-		return null;
-	}
-
-	private void checkSelection() {
-		IStructuredSelection selection = (IStructuredSelection) checkItemsTableViewer
-				.getSelection();
-		if (selection.size() > 0 && !TngUtil.isLocked(checklist)) {
-			ctrl_delete.setEnabled(true);
-
-			if (checkItemsTableViewer.getTable().getSelectionIndex() > 0
-					&& !TngUtil.isLocked(checklist) && selection.size() == 1) {
-				ctrl_up.setEnabled(true);
-			} else {
-				ctrl_up.setEnabled(false);
-			}
-
-			if (checkItemsTableViewer.getTable().getSelectionIndex() < checkItemsTableViewer
-					.getTable().getItemCount() - 1
-					&& !TngUtil.isLocked(checklist) && selection.size() == 1) {
-				ctrl_down.setEnabled(true);
-			} else {
-				ctrl_down.setEnabled(false);
-			}
-		}
-		if (selection.size() == 1) {
-			editItem((org.eclipse.epf.uma.Section) selection.getFirstElement());
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ConfigViewPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ConfigViewPage.java
deleted file mode 100755
index bf1472f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ConfigViewPage.java
+++ /dev/null
@@ -1,573 +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.authoring.ui.forms;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.dialogs.ConfigurationAddViewsDialog;
-import org.eclipse.epf.authoring.ui.dialogs.ConfigurationOrderDialog;
-import org.eclipse.epf.authoring.ui.editors.ConfigurationEditor;
-import org.eclipse.epf.authoring.ui.editors.ConfigurationEditorInput;
-import org.eclipse.epf.authoring.ui.filters.ProcessViewFilter;
-import org.eclipse.epf.authoring.ui.providers.ConfigurationLabelProvider;
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.epf.library.configuration.ConfigurationFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.uma.ContentCategory;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.FormColors;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-
-
-/**
- * Page for customizing publishing views
- * 
- * @author Shilpa Toraskar
- * @author Jinhua Xi
- * @since 1.0
- * fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=173827
- * fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=174260
- */
-public class ConfigViewPage extends FormPage {
-
-	private MethodConfiguration config = null;
-
-	private String formPrefix = AuthoringUIResources.configViewPage_configuration; //$NON-NLS-1$
-
-	private FormToolkit toolkit;
-
-	private CTabFolder tabFolder;
-	private CTabItem tabDefaultviewItem;
-
-	private Button removeButton, makeDefaultButton, orderButton;
-
-	private Object selectedItem = null;
-
-	private IActionManager actionMgr = null;
-
-	private Logger logger = null;
-
-	/**
-	 * Creates an instance
-	 * @param editor
-	 */
-	public ConfigViewPage(FormEditor editor) {
-		super(
-				editor,
-				AuthoringUIResources.configViewPage_configurationViews, AuthoringUIResources.configViewPage_views); 
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		setSite(site);
-		setInput(input);
-
-		ConfigurationEditorInput configInput = (ConfigurationEditorInput) input;
-		config = configInput.getConfiguration();
-
-		actionMgr = ((ConfigurationEditor) getEditor()).getActionManager();
-
-		// get plugin logger
-		logger = AuthoringUIPlugin.getDefault().getLogger();
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		ScrolledForm form = managedForm.getForm();
-		form.setText(formPrefix + config.getName());
-		toolkit = managedForm.getToolkit();
-		form.getBody().setLayout(new GridLayout());
-
-		// Create the view section.
-		Section viewSection = toolkit.createSection(form.getBody(),
-				Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED
-						| Section.TITLE_BAR);
-		GridData td = new GridData(GridData.FILL_BOTH);
-		viewSection.setLayoutData(td);
-		viewSection
-				.setText(AuthoringUIResources.configViewPage_configurationViewSectionTitle); //$NON-NLS-1$
-		viewSection
-				.setDescription(AuthoringUIResources.configViewPage_configurationViewSectionMessage); //$NON-NLS-1$
-		viewSection.setLayout(new GridLayout());
-
-		Composite parent = toolkit.createComposite(viewSection);
-		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-		parent.setLayout(new GridLayout());
-		viewSection.setClient(parent);
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent.getParent(),
-				AuthoringUIHelpContexts.CONFIGURATION_EDITOR_ALL_CONTEXT);
-
-		// create button pane
-		createButtonPane(parent);
-
-		// create tabfolder pane
-		createTabPane(parent);
-
-		toolkit.paintBordersFor(parent);
-		loadData();
-	}
-
-	/**
-	 * 
-	 * @param parent
-	 */
-	private void createTabPane(Composite parent) {
-		tabFolder = new CTabFolder(parent, SWT.FLAT | SWT.TOP | SWT.BORDER);
-		tabFolder.setLayout(new GridLayout());
-		tabFolder.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// set tabfolder background color
-		Color selectedColor = toolkit.getColors().getColor(FormColors.TB_BG);
-		tabFolder.setSelectionBackground(new Color[] { selectedColor, toolkit.getColors().getBackground() }, new int[] { 50 });
-		
-		toolkit.paintBordersFor(tabFolder);
-
-	}
-
-	/**
-	 * 
-	 * @param parent
-	 */
-	private void createButtonPane(Composite parent) {
-		Composite buttonPane = toolkit.createComposite(parent);
-		buttonPane.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		buttonPane.setLayout(new GridLayout(4, false));
-
-		Button addButton = toolkit
-				.createButton(
-						buttonPane,
-						AuthoringUIResources.configViewPage_addViewButtonText, SWT.NONE); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			addButton.setLayoutData(gridData);
-		}
-		addButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				// ConfigProcessViewDialog fd = new
-				// ConfigProcessViewDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-				// config);
-				// ConfigProcessViewDialog.setDefaultImage(Display.getCurrent().getActiveShell().getImage());
-				IFilter filter = new ProcessViewFilter(config, null,
-						FilterConstants.ALL_ELEMENTS);
-				ConfigurationAddViewsDialog fd = new ConfigurationAddViewsDialog(
-						PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-								.getShell());
-				fd.setTypes(getTypes());
-				fd
-						.setTitle(AuthoringUIResources.ConfigProcessViewDialog_SelectCategories); //$NON-NLS-1$
-				fd.setInput(config);
-				fd.setFilter(filter);
-				fd.setExistingElements(config.getProcessViews());
-				fd.setContentProvider(new AdapterFactoryContentProvider(
-						TngAdapterFactory.INSTANCE
-								.getItemsFilter_AdapterFactory(filter)),
-								TngAdapterFactory.INSTANCE.getItemsFilter_ComposedAdapterFactory());
-				fd.setBlockOnOpen(true);
-				fd.open();
-				List views = fd.getSelectedItems();
-
-				// add view to configuration
-				for (Iterator itor = views.iterator(); itor.hasNext();) {
-					Object obj = itor.next();
-					if (obj instanceof ContentCategory) {
-
-						if (config.getProcessViews().contains(
-								(ContentCategory) obj)) {
-							String name = ((ContentCategory) obj).getName();
-							String title = AuthoringUIResources.configViewPageViewExistsDialog_title; //$NON-NLS-1$
-							String message = AuthoringUIResources.bind(AuthoringUIResources.configViewPageViewExistsDialog_message, name);
-							AuthoringUIPlugin.getDefault().getMsgDialog()
-									.displayWarning(title, message);
-						} else {
-							boolean status = actionMgr
-							.doAction(
-									IActionManager.ADD,
-									config,
-									UmaPackage.eINSTANCE
-											.getMethodConfiguration_ProcessViews(),
-									(ContentCategory) obj, -1);
-							if(status){
-								addView((ContentCategory) obj);
-							}
-						}
-					}
-				}
-			}
-		});
-
-		// remove button
-		removeButton = toolkit
-				.createButton(
-						buttonPane,
-						AuthoringUIResources.configViewPage_removeViewButtonText, SWT.NONE); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			removeButton.setLayoutData(gridData);
-		}
-		removeButton.setEnabled(false);
-		removeButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				removeView();
-			}
-		});
-
-		// make default button
-		makeDefaultButton = toolkit
-				.createButton(
-						buttonPane,
-						AuthoringUIResources.configViewPage_makeDefaultButtonText, SWT.NONE); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			makeDefaultButton.setLayoutData(gridData);
-		}
-		makeDefaultButton.setEnabled(false);
-		makeDefaultButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				makeDefaultView();
-			}
-		});
-		
-		orderButton = toolkit.createButton(
-				buttonPane,
-				AuthoringUIResources.orderButton_text, SWT.NONE); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			removeButton.setLayoutData(gridData);
-		}
-		orderButton.addSelectionListener(new SelectionAdapter(){
-			public void widgetSelected(SelectionEvent e) {
-				ConfigurationOrderDialog dlg = new ConfigurationOrderDialog(
-						Display.getCurrent().getActiveShell(),
-						config,
-						getActionManager());
-				int ret = dlg.open();
-				if(ret == Window.OK) refresh();
-			}
-		});
-
-		toolkit.paintBordersFor(buttonPane);
-	}
-
-	/**
-	 * Remove the selected view
-	 * 
-	 */
-	private void removeView() {
-		CTabItem item = tabFolder.getSelection();
-		if (item == null)
-			return;
-		
-		// don't change default view if the view is not removed.
-		// 155025 - error when removing the view in configuration
-		String itemText = item.getText();		
-		String title = AuthoringUIResources.configViewPageRemoveViewDialog_title; //$NON-NLS-1$
-		String message = AuthoringUIResources.bind(AuthoringUIResources.configViewPageRemoveViewDialog_message, item //$NON-NLS-1$
-		.getText());
-		boolean ret = AuthoringUIPlugin.getDefault().getMsgDialog()
-				.displayConfirmation(title, message);
-
-		if (!ret) {
-			return;
-		}
-		
-		boolean removeDefault = false;
-		if (tabDefaultviewItem != null && item == tabDefaultviewItem) {
-			removeDefault = true;
-		}
-
-			List views = config.getProcessViews();
-			// if there is a default view tab, and it's the one slected to be removed
-			if (removeDefault) {
-				String defaultText = " " //$NON-NLS-1$
-					+ AuthoringUIResources.processDescription_default; //$NON-NLS-1$
-				int idx = itemText.lastIndexOf(defaultText);
-				if (idx > 0) {
-					itemText = itemText.substring(0,idx);
-				}
-			}
-			
-			for (Iterator itor = views.iterator(); itor.hasNext();) {
-				ContentCategory category = (ContentCategory) itor.next();
-				
-				if (category.getName().equals(itemText)) {
-					// remove it from views
-					actionMgr.doAction(IActionManager.REMOVE, config,
-							UmaPackage.eINSTANCE
-									.getMethodConfiguration_ProcessViews(),
-							category, -1);
-
-					ContentCategory defaultView = config.getDefaultView();
-
-					if ((defaultView != null) && (defaultView.equals(category))) {
-						if (views.size() > 0) {
-							actionMgr
-									.doAction(
-											IActionManager.SET,
-											config,
-											UmaPackage.eINSTANCE
-													.getMethodConfiguration_DefaultView(),
-											(ContentCategory) views.get(0), -1);
-						} else {
-							actionMgr
-									.doAction(
-											IActionManager.SET,
-											config,
-											UmaPackage.eINSTANCE
-													.getMethodConfiguration_DefaultView(),
-											null, -1);
-						}
-					}
-					// remove tab item
-					item.dispose();
-					break;
-				}
-			}
-
-		views = config.getProcessViews();
-		if ((views == null) || (views.size() <= 0)) {
-			removeButton.setEnabled(false);
-			makeDefaultButton.setEnabled(false);
-		}
-		
-		// make the 1st tab as the default view if the default one is removed
-		if (removeDefault) {
-			Control[] tabList = tabFolder.getTabList();
-			if (tabList != null && tabList.length > 0) {
-				tabFolder.setSelection(0);
-				makeDefaultView();
-			}
-		}
-	}
-
-	/**
-	 * Add view
-	 * 
-	 * @param obj
-	 */
-	private void addView(ContentCategory obj) {
-		selectedItem = obj;
-		Composite composite = new Composite(tabFolder, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		TreeViewer treeViewer = new TreeViewer(composite, SWT.H_SCROLL
-				| SWT.V_SCROLL | SWT.BORDER);
-		treeViewer.getTree().setLayout(new GridLayout());
-		treeViewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		IFilter configFilter = new ConfigurationFilter(config, treeViewer);
-		AdapterFactory adapterFactory = TngAdapterFactory.INSTANCE
-				.getConfigurationView_AdapterFactory(configFilter);
-
-		AdapterFactoryContentProvider contentProvider = new AdapterFactoryContentProvider(
-				adapterFactory) {
-			public Object[] getElements(Object object) {
-				// Get the adapter from the factory.
-				ITreeItemContentProvider itemProvider = (ITreeItemContentProvider) adapterFactory
-						.adapt(selectedItem, ITreeItemContentProvider.class);
-
-				return itemProvider.getChildren(selectedItem).toArray();
-				// return itemProvider.getElements(selectedItem).toArray();
-			}
-		};
-
-		treeViewer.setContentProvider(contentProvider);
-		treeViewer.setLabelProvider(new ConfigurationLabelProvider(config,
-				adapterFactory));
-		try {
-			treeViewer.setInput(config);
-		} catch (Exception ex) {
-			logger.logError("Error creating treeviewer for config", ex); //$NON-NLS-1$
-		}
-
-		CTabItem item = new CTabItem(tabFolder, SWT.TOP);
-		item.setText(((ContentCategory) obj).getName());
-		item.setControl(composite);
-
-		// make all buttons enabled
-		removeButton.setEnabled(true);
-		makeDefaultButton.setEnabled(true);
-
-		toolkit.paintBordersFor(composite);
-		tabFolder.setSelection(item);
-	}
-
-	/**
-	 * Make selected as default view
-	 * 
-	 */
-	private void makeDefaultView() {
-		CTabItem item = tabFolder.getSelection();
-		List views = config.getProcessViews();
-		for (Iterator itor = views.iterator(); itor.hasNext();) {
-			ContentCategory category = (ContentCategory) itor.next();
-			if (category.getName().equals(item.getText())) {
-				clearDefaultViewIndicator();
-				// make that view default
-				actionMgr.doAction(IActionManager.SET, config,
-						UmaPackage.eINSTANCE
-								.getMethodConfiguration_DefaultView(),
-						category, -1);
-				setDefaultViewIndicator(item);
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Load initial data
-	 * 
-	 */
-	private void loadData() {
-		// get process views
-		List views = config.getProcessViews();
-		for (Iterator itor = views.iterator(); itor.hasNext();) {
-			// create view in UI
-			addView((ContentCategory) itor.next());
-		}
-
-		// get default view
-		ContentCategory defaultView = config.getDefaultView();
-		int cnt = tabFolder.getItemCount();
-		if (defaultView != null) {
-			// if default view is defined, select that view
-			CTabItem[] items = tabFolder.getItems();
-			for (int i = 0; i < items.length; i++) {
-				String name = items[i].getText();
-				if (name.equals(defaultView.getName())) {
-					tabFolder.setSelection(items[i]);
-					setDefaultViewIndicator(items[i]);
-					break;
-				}
-			}
-		} else if (cnt > 0) {
-			// else select first view
-			tabFolder.setSelection(0);
-		}
-	}
-	
-	private void refresh(){
-		ContentCategory defaultView = config.getDefaultView();
-		String defaultViewName = "";
-		if(defaultView!=null) {
-			defaultViewName = defaultView.getName();
-			clearDefaultViewIndicator();
-		}
-		String selectedView = tabFolder.getSelection().getText();
-		Map origViews = new HashMap();
-		for(int i=0;i<tabFolder.getItemCount();i++){
-			CTabItem item = tabFolder.getItem(i);
-			origViews.put(item.getText(), item.getControl());
-		}
-		List views = config.getProcessViews();
-		int index = 0;
-		int selectedIndex = 0;
-		for (Iterator itor = views.iterator(); itor.hasNext() && index<tabFolder.getItemCount();) {
-			String view = ((ContentCategory)itor.next()).getName();
-			CTabItem item = tabFolder.getItem(index++);
-			item.setText(view);
-			item.setControl((Control)origViews.get(view));
-			if(view.equals(defaultViewName)) setDefaultViewIndicator(item);
-			if(view.equals(selectedView)) selectedIndex = index-1;
-		}
-		tabFolder.setSelection(selectedIndex);
-	}
-
-	/**
-	 * This method removes the appended "(default)" from the tab for the default
-	 * view. This method must be called before changing the default view!
-	 */
-	private void clearDefaultViewIndicator() {
-		ContentCategory defaultView = config.getDefaultView();
-		if (defaultView != null) {
-			String defaultViewTabName = defaultView.getName()
-					+ " " //$NON-NLS-1$
-					+ AuthoringUIResources.processDescription_default; //$NON-NLS-1$
-			CTabItem[] items = tabFolder.getItems();
-			for (int i = 0; i < items.length; i++) {
-				String name = items[i].getText();
-				if (name.equals(defaultViewTabName)) {
-					items[i].setText(defaultView.getName());
-				}
-			}
-		}
-	}
-	
-	/**
-	 * This method appends "(default)" to the tab of the default view.
-	 */
-	private void setDefaultViewIndicator(CTabItem item) {
-		tabDefaultviewItem = item;
-		
-		String name = item.getText()
-				+ " " //$NON-NLS-1$
-				+ AuthoringUIResources.processDescription_default; //$NON-NLS-1$
-		item.setText(name);
-	}
-
-	private String[] getTypes() {
-		String[] Categories = new String[] { FilterConstants.CUSTOM_CATEGORIES,
-				FilterConstants.ALL_ELEMENTS, FilterConstants.DISCIPLINES,
-				FilterConstants.DOMAINS, FilterConstants.ROLESETS,
-				FilterConstants.WORKPRODUCTTYPES, FilterConstants.TOOLS };
-		return Categories;
-	}
-	
-	protected IActionManager getActionManager() {
-		return actionMgr;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ConfigurationDescription.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ConfigurationDescription.java
deleted file mode 100755
index 257194c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ConfigurationDescription.java
+++ /dev/null
@@ -1,305 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.editors.ConfigurationEditor;
-import org.eclipse.epf.authoring.ui.editors.ConfigurationEditorInput;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.validation.IValidator;
-import org.eclipse.epf.library.edit.validation.IValidatorFactory;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-
-/**
- * The Description page in the Configuration editor.
- * 
- * @author Shashidhar Kannoori
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class ConfigurationDescription extends FormPage implements IRefreshable {
-
-	private static final String FORM_PREFIX = AuthoringUIResources.ConfigurationDescriptionFormPrefix; //$NON-NLS-1$
-
-	private MethodConfiguration config = null;
-
-	private ScrolledForm form = null;
-
-	private Text nameText;
-
-	private Text despText;
-
-	private ModifyListener modelModifyListener;
-
-	private IActionManager actionMgr;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ConfigurationDescription(FormEditor editor) {
-		super(
-				editor,
-				AuthoringUIResources.ConfigurationDescriptionDescription, AuthoringUIResources.ConfigurationDescriptionDescription); 
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		setSite(site);
-		setInput(input);
-		ConfigurationEditorInput configInput = (ConfigurationEditorInput) input;
-		config = configInput.getConfiguration();
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.createFormContent(IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		form = managedForm.getForm();
-		form.setText(FORM_PREFIX + config.getName());
-		FormToolkit toolkit = managedForm.getToolkit();
-
-		TableWrapLayout layout = new TableWrapLayout();
-		form.getBody().setLayout(layout);
-
-		Section genSection = toolkit.createSection(form.getBody(),
-				Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED
-						| Section.TITLE_BAR);
-		createGeneralContent(toolkit, genSection);
-
-		addListeners();
-	}
-
-	/**
-	 * Create general content for the description page
-	 * @param toolkit
-	 * @param section
-	 */
-	public void createGeneralContent(FormToolkit toolkit, Section section) {
-		section.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		section.setText(AuthoringUIResources.ConfigurationDescriptionGeneralInfo); //$NON-NLS-1$
-		section
-				.setDescription(AuthoringUIResources.ConfigurationDescriptionDescription_text); //$NON-NLS-1$
-
-		Composite sectionClient = toolkit.createComposite(section);
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.numColumns = 2;
-		sectionClient.setLayout(layout);
-
-		toolkit
-				.createLabel(
-						sectionClient,
-						AuthoringUIResources.ConfigurationDescriptionName, SWT.NONE); //$NON-NLS-1$
-		nameText = toolkit.createText(sectionClient, "", SWT.NONE); //$NON-NLS-1$
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		nameText.setLayoutData(td);
-		nameText.setText(config.getName());
-
-		Label despLabel = toolkit
-				.createLabel(
-						sectionClient,
-						AuthoringUIResources.ConfigurationDescriptionDescriptionLabel, SWT.NONE); //$NON-NLS-1$
-		TableWrapData twd0 = new TableWrapData();
-		despLabel.setLayoutData(twd0);
-
-		despText = toolkit.createText(sectionClient,
-				"", SWT.NONE | SWT.MULTI | SWT.V_SCROLL | SWT.WRAP); //$NON-NLS-1$
-		TableWrapData twd = new TableWrapData(TableWrapData.FILL_GRAB);
-		twd.heightHint = 50;
-		despText.setLayoutData(twd);
-		despText.setText(config.getBriefDescription());
-
-		section.setClient(sectionClient);
-		toolkit.paintBordersFor(sectionClient);
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(
-				sectionClient.getParent(), AuthoringUIHelpContexts.CONFIGURATION_EDITOR_ALL_CONTEXT); 
-
-		Display display = form.getBody().getDisplay();
-		if (!(display == null || display.isDisposed())) {
-			display.asyncExec(new Runnable() {
-				public void run() {
-					nameText.setFocus();
-					nameText.setSelection(0, nameText.getText().length());
-				}
-			});
-		}
-	}
-
-	private void addListeners() {
-		final ConfigurationEditor editor = (ConfigurationEditor) getEditor();
-		modelModifyListener = editor.createModifyListener(config);
-
-		actionMgr = ((ConfigurationEditor) getEditor()).getActionManager();
-
-		nameText.addModifyListener(modelModifyListener);
-		nameText.addFocusListener(new FocusAdapter() {
-			/* (non-Javadoc)
-			 * @see org.eclipse.swt.events.FocusAdapter#focusGained(org.eclipse.swt.events.FocusEvent)
-			 */
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getNamedElement_Name());
-			}
-			
-			public void focusLost(FocusEvent e) {
-				String oldContent = config.getName();
-				final MethodConfiguration iConfig = config;
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				if (isTextNonEmpty(nameText)) {
-					String name = nameText.getText();
-					IValidator validator = IValidatorFactory.INSTANCE.createNameValidator(config.eContainer(), config);
-					String msg = validator.isValid(name);
-					if (msg != null) {
-						AuthoringUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayError(
-										AuthoringUIResources.renameDialog_title, //$NON-NLS-1$
-										msg);
-						nameText.getDisplay().asyncExec(new Runnable() {
-							public void run() {
-								nameText.setText(iConfig.getName());
-								nameText.selectAll();
-								nameText.setFocus();
-							}
-						});
-						return;
-					}
-					name = name.trim();			//166755
-					
-					if (!name.equals(config.getName())) {
-						boolean status = actionMgr.doAction(IActionManager.SET,
-								config, UmaPackage.eINSTANCE
-										.getNamedElement_Name(), name, -1);
-						if (status) {
-							Resource resource = config.eResource();
-							if(resource != null && resource != config.eContainer().eResource()) {
-								editor.addResourceToAdjustLocation(config.eResource());
-							}
-							form.setText(FORM_PREFIX + config.getName());
-							nameText.setText(name);
-						}
-					}
-				} else {
-					AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayError(
-									AuthoringUIResources.renameDialog_title, //$NON-NLS-1$
-									AuthoringUIResources.bind(AuthoringUIResources.emptyElementNameError_msg, StrUtil.toLower(LibraryUIText.TEXT_METHOD_CONFIGURATON))); //$NON-NLS-1$	
-					nameText.setText(config.getName());
-					nameText.getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							nameText.setFocus();
-							nameText.setSelection(0, nameText.getText()
-									.length());
-						}
-					});
-				}
-			}
-
-		});
-
-		despText.addModifyListener(modelModifyListener);
-		despText.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getMethodElement_BriefDescription());
-			}
-
-			public void focusLost(FocusEvent e) {
-				String oldContent = config.getBriefDescription();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				String desc1 = despText.getText();
-				if (!desc1.equals(config.getBriefDescription())) {
-					actionMgr.doAction(IActionManager.SET, config,
-							UmaPackage.eINSTANCE
-									.getMethodElement_BriefDescription(),
-							desc1, -1);
-				}
-			}
-		});
-	}
-
-	/**
-	 * Returns <code>true</code> if the given Text control contain characters
-	 * other than spaces.
-	 * 
-	 * @param text
-	 *            The Text control.
-	 * @return <code>true</code> if the given Text control contain characters
-	 *         other than spaces.
-	 */
-	private static boolean isTextNonEmpty(Text t) {
-		String s = t.getText();
-		if ((s != null) && (s.trim().length() > 0))
-			return true;
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.IRefreshable#refreshName(java.lang.String)
-	 */
-	public void refreshName(String newName) {
-		if (newName != null) {
-			if ((nameText != null) && !(nameText.isDisposed())) {
-				nameText.removeModifyListener(modelModifyListener);
-				nameText.setText(newName);
-				nameText.addModifyListener(modelModifyListener);
-				form.setText(FORM_PREFIX + config.getName());
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ConfigurationPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ConfigurationPage.java
deleted file mode 100755
index 9dee31d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ConfigurationPage.java
+++ /dev/null
@@ -1,1583 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IViewerNotification;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.editors.ConfigurationEditor;
-import org.eclipse.epf.authoring.ui.editors.ConfigurationEditorInput;
-import org.eclipse.epf.authoring.ui.views.ConfigurationViewer;
-import org.eclipse.epf.authoring.ui.views.MessageView;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.configuration.ConfigurationClosure;
-import org.eclipse.epf.library.configuration.ElementDependencyError;
-import org.eclipse.epf.library.configuration.ErrorInfo;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.navigator.ContentItemProvider;
-import org.eclipse.epf.library.edit.navigator.MethodPackagesItemProvider;
-import org.eclipse.epf.library.edit.navigator.PluginUIPackagesItemProvider;
-import org.eclipse.epf.library.edit.navigator.ProcessesItemProvider;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.events.ILibraryChangeListener;
-import org.eclipse.epf.library.services.ElementReference;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.ITreeViewerListener;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeExpansionEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-/**
- * The Configuration page in the Method Configuration editor.
- * 
- * @author Shashidhar Kannoori
- * @author Jinhua Xi
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class ConfigurationPage extends FormPage implements ISelectionProvider {
-	MethodConfiguration config = null;
-
-	ConfigurationClosure closure = null;
-
-	ConfigurationViewer treeViewer;
-
-	ConfigPackageContentProvider contProvider;
-
-	ISelectionChangedListener selectionChangedListener = null;
-
-	ScrolledForm form = null;
-
-	boolean isDirty = false;
-	
-	private boolean needUpdate = false;
-
-	private String formPrefix = AuthoringUIResources.ConfigurationPage_FormPrefix; //$NON-NLS-1$
-
-	// private EObject currentRootNode;
-	private ArrayList expandedElements = new ArrayList();
-
-	// private Text ctrl_name;
-
-	// private Text ctrl_brief_desc;
-
-	private List modifiedElements = new ArrayList();
-
-	private Button closureButton;
-
-	private Button fixWarningButton;
-
-	private Button errorButton;
-
-	// private Button dependentButton;
-
-	private Button hideButton;
-
-	// private Text despText;
-
-	private Text elemDespContentText;
-
-	// private Text nameText;
-
-	protected Collection selectionChangedListeners = new ArrayList();
-
-	// private ISelectionChangedListener parentSelectionChangedListener = null;
-
-	protected ISelection currentSelection = StructuredSelection.EMPTY;
-
-	private MessageView msgView;
-
-	ISelectionChangedListener msgViewListener = null;
-
-	private ConfigTreeFilter configFilter;
-
-	private IActionManager actionMgr;
-
-	private ILibraryChangeListener libListener = null;
-
-	protected Adapter configurationChangedListener = null;
-
-	/**
-	 * Creates an instance
-	 * @param editor
-	 */
-	public ConfigurationPage(FormEditor editor) {
-		super(
-				editor,
-				AuthoringUIResources.ConfigurationPage_Description1, AuthoringUIResources.ConfigurationPage_Description2); 
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		setSite(site);
-		setInput(input);
-
-		ConfigurationEditorInput configInput = (ConfigurationEditorInput) input;
-		config = configInput.getConfiguration();
-
-		
-		configurationChangedListener = new AdapterImpl() {
-			public void notifyChanged(
-					org.eclipse.emf.common.notify.Notification msg) {
-				// System.out.println("$$$ catched modify config notification =
-				// " + msg);
-				int type = msg.getEventType();
-				if (	type == org.eclipse.emf.common.notify.Notification.ADD
-						|| type == org.eclipse.emf.common.notify.Notification.ADD_MANY
-						|| type == org.eclipse.emf.common.notify.Notification.REMOVE
-						||   type == org.eclipse.emf.common.notify.Notification.REMOVE_MANY) {					
-					needUpdate = true;
-					
-//					This was done to refresh configuration plugin-package section page. But its not perfect
-//					solution. Doesnt cover all the scenarios. So commenting it out.
-//					Will have to think of alternate way to refresh plugin/package configuration page.
-//					Low Priority
-//						|| type == org.eclipse.emf.common.notify.Notification.REMOVE
-//						|| type == org.eclipse.emf.common.notify.Notification.REMOVE_MANY ) {
-//					
-					
-//					if (treeViewer != null)	{
-//						treeViewer.refresh();
-//						updateCheckStates();
-//						showErrors();
-//					}
-				}
-			}
-		};
-		config.eAdapters().add(configurationChangedListener);
-
-	}
-
-	private void reInitializeConfigFactory() {
-		// the following may not be the most efficient way
-		// need a fast way to update the closure
-//		System.out.println("$$$ reInit closure for config add notification!");
-
-		createConfigurationClosure();
-
-		configFilter = new ConfigTreeFilter(closure);
-	}
-
-	/**
-	 * Set input for connfiguration viewer
-	 * @param input
-	 */
-	public void setInput(Object input) {
-		treeViewer.setInput(input);
-
-		// initially expand the whole tree before updating the tree
-		// this is a workaround for the content provider to build the child -
-		// parent lookup map
-		treeViewer.expandAll();
-
-		// update the tree with the default closure selection
-		updateCheckStates();
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		// create form toolkit
-		form = managedForm.getForm();
-		form.setText(formPrefix + config.getName());
-		FormToolkit toolkit = managedForm.getToolkit();
-
-		TableWrapLayout layout = new TableWrapLayout();
-		form.getBody().setLayout(layout);
-
-		Section treeSection = toolkit.createSection(form.getBody(),
-				Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED
-						| Section.TITLE_BAR);
-		createTreeContent(toolkit, treeSection);
-
-		addListeners();
-
-		// finally set the input.
-		// RootContent inputNode = new RootContent(closure
-		// .getConfigurationFactory().getMethodPlugins());
-		setInput(LibraryService.getInstance().getCurrentMethodLibrary());
-	}
-
-	/**
-	 * Create tree content
-	 * @param toolkit
-	 * @param section
-	 */
-	public void createTreeContent(FormToolkit toolkit, Section section) {
-		section.setText(AuthoringUIResources.ConfigurationPage_ConfigContent); //$NON-NLS-1$
-		section
-				.setDescription(AuthoringUIResources.ConfigurationPage_ConfigContentDescription); //$NON-NLS-1$
-		section.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-
-		Composite sectionClient = toolkit.createComposite(section);
-		section.setClient(sectionClient);
-		GridLayout gl = new GridLayout();
-		sectionClient.setLayout(gl);
-		gl.numColumns = 6;
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(
-				sectionClient.getParent(),
-				AuthoringUIHelpContexts.CONFIGURATION_EDITOR_ALL_CONTEXT);
-
-		Composite buttonComposite = toolkit.createComposite(sectionClient);
-		{
-			GridLayout gridLayout = new GridLayout();
-			gridLayout.numColumns = 6;
-			buttonComposite.setLayout(gridLayout);
-			GridData gridData = new GridData(GridData.FILL_BOTH);
-			gridData.horizontalSpan = 6;
-			gridData.horizontalAlignment = 3;
-			buttonComposite.setLayoutData(gridData);
-
-		}
-
-		hideButton = toolkit.createButton(buttonComposite, "", SWT.PUSH //$NON-NLS-1$
-				| GridData.HORIZONTAL_ALIGN_END);
-		hideButton.setImage(AuthoringUIPlugin.getDefault().getSharedImage(
-				"hideUncheckedElem.gif")); //$NON-NLS-1$
-		hideButton.setToolTipText(AuthoringUIResources.ConfigurationPage_hideToolTip); //$NON-NLS-1$
-		hideButton.setLayoutData(new GridData(GridData.END));
-
-		fixWarningButton = toolkit.createButton(buttonComposite, "", SWT.PUSH); //$NON-NLS-1$
-		fixWarningButton.setImage(AuthoringUIPlugin.getDefault()
-				.getSharedImage("addref_co.gif")); //$NON-NLS-1$
-		fixWarningButton.setToolTipText(AuthoringUIResources.ConfigurationPage_AddMissingToolTip); //$NON-NLS-1$
-		fixWarningButton.setLayoutData(new GridData(GridData.END));
-
-		// Add the closure button.
-		closureButton = toolkit.createButton(buttonComposite, "", SWT.PUSH); //$NON-NLS-1$
-		closureButton.setImage(AuthoringUIPlugin.getDefault().getSharedImage(
-				"closure_co.gif")); //$NON-NLS-1$
-		closureButton.setToolTipText(AuthoringUIResources.ConfigurationPage_MakeClosureToolTip); //$NON-NLS-1$
-		closureButton.setLayoutData(new GridData(GridData.END));
-		// closureButton.setText("");
-
-		errorButton = toolkit.createButton(buttonComposite, "", SWT.PUSH); //$NON-NLS-1$
-		errorButton.setImage(AuthoringUIPlugin.getDefault().getSharedImage(
-				"showConfigError.gif")); //$NON-NLS-1$
-		errorButton.setToolTipText(AuthoringUIResources.ConfigurationPage_ShowErrorToolTip); //$NON-NLS-1$
-		{
-			GridData gd = new GridData(GridData.END
-					| GridData.HORIZONTAL_ALIGN_END);
-			gd.horizontalAlignment = 3;
-			gd.horizontalSpan = 1;
-			errorButton.setLayoutData(gd);
-		}
-
-		Label treeTitleLabel = toolkit
-				.createLabel(
-						sectionClient,
-						AuthoringUIResources.ConfigurationPage_TreeTitleLabel); //$NON-NLS-1$
-		{
-			GridData gd = new GridData(GridData.BEGINNING
-					| GridData.VERTICAL_ALIGN_END);
-			treeTitleLabel.setLayoutData(gd);
-			gd.horizontalSpan = 6;
-		}
-
-		// Create Viewer and Handle Listener for the viewer.
-		createViewer(sectionClient);
-
-		Label elemDespLabel = toolkit
-				.createLabel(sectionClient, AuthoringUIResources.ConfigurationPage_Description); //$NON-NLS-1$
-		GridData gd1 = new GridData();
-		gd1.horizontalSpan = 6;
-		elemDespLabel.setLayoutData(gd1);
-
-		elemDespContentText = toolkit.createText(sectionClient, "", SWT.NONE //$NON-NLS-1$
-				| SWT.MULTI | SWT.READ_ONLY | SWT.WRAP);
-		GridData gd2 = new GridData(GridData.FILL_BOTH);
-		gd2.grabExcessHorizontalSpace = true;
-		gd2.horizontalSpan = 6;
-		gd2.heightHint = 50;
-
-		toolkit.paintBordersFor(sectionClient);
-		toolkit.paintBordersFor(buttonComposite);
-		elemDespContentText.setLayoutData(gd2);
-
-		hideButton.setEnabled(true);
-		hideButton.setVisible(true);
-		errorButton.setEnabled(true);
-		errorButton.setVisible(true);
-		fixWarningButton.setEnabled(true);
-		fixWarningButton.setVisible(true);
-		closureButton.setEnabled(true);
-		closureButton.setVisible(true);
-	}
-	
-	private void createConfigurationClosure() {
-		// refresh configuration from editor
-		//
-		FormEditor editor = getEditor();
-		if(editor != null) {
-			IEditorInput input = editor.getEditorInput();
-			if(input instanceof ConfigurationEditorInput) {
-				config = ((ConfigurationEditorInput)input).getConfiguration();
-			}
-		}
-		
-		closure = new ConfigurationClosure(config);
-	}
-
-	/**
-	 * Initialize configuration factory
-	 */
-	public void initializeConfigFactory() {
-		// loading the configuration closure might be slow,
-		// display a progress bar
-		IRunnableWithProgress runnable = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException, InterruptedException {
-				createConfigurationClosure();
-			}
-
-		};
-
-		UserInteractionHelper.runWithProgress(runnable, AuthoringUIResources.ConfigurationPage_LoadingMessage); //$NON-NLS-1$
-
-		AdapterFactory adapterFactory = TngAdapterFactory.INSTANCE
-				.getNavigatorView_ComposedAdapterFactory();
-		// AdapterFactory adapterFactory = configFactory.getAdapterFactory();
-		contProvider = new ConfigPackageContentProvider(//configFactory,
-				adapterFactory);
-		treeViewer.setContentProvider(contProvider);
-		treeViewer
-				.setLabelProvider(new ConfigPackageLabelProvider(contProvider));
-
-		configFilter = new ConfigTreeFilter(closure);
-		treeViewer.addFilter(configFilter);
-
-		// show the message view if there is error
-		updateMessage();
-	}
-
-	private void createViewer(Composite sectionClient) {
-
-		sectionClient.setLayoutData(new GridData(GridData.FILL_BOTH));
-		GridLayout layout = new GridLayout();
-		sectionClient.setLayout(layout);
-		// create the library tree viewer
-		treeViewer = new ConfigurationViewer(sectionClient);
-		// treeViewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
-		{
-			GridData gridData = new GridData(GridData.FILL_BOTH
-					| GridData.GRAB_HORIZONTAL);
-			gridData.heightHint = 200;
-			treeViewer.getTree().setLayoutData(gridData);
-		}
-
-		initializeConfigFactory();
-	}
-
-	private void addListeners() {
-		addEditorSetFocusLiseners();		
-		
-		actionMgr = ((ConfigurationEditor) getEditor()).getActionManager();
-		// nameText.addFocusListener(new FocusAdapter() {
-		// public void focusLost(FocusEvent e) {
-		// if (isTextNonEmpty(nameText)) {
-		// String name = StrUtil.makeValidFileName(nameText.getText());
-		// if (!name.equals(config.getName())) {
-		// actionMgr.doAction(IActionManager.SET, config,
-		// UmaPackage.eINSTANCE.getNamedElement_Name(),
-		// name, -1);
-		// form.setText(formPrefix + config.getName());
-		// nameText.setText(name);
-		// }
-		// } else {
-		// // Display a warning dialog for empty Name.
-		// nameText.setText(config.getName());
-		// MessageDialog.openWarning(PlatformUI.getWorkbench()
-		// .getActiveWorkbenchWindow().getShell(),
-		// "Enter Configuration Name",
-		// "Name field cannot be empty!");
-		// }
-		// // config.setName(StrUtil.makeValidFileName(nameText.getText()));
-		// // form.setText(formPrefix + config.getName());
-		// }
-		// });
-		// despText.addFocusListener(new FocusAdapter() {
-		// public void focusLost(FocusEvent e) {
-		// // config.setBriefDescription(StrUtil.getPlainText(despText
-		// // .getText()));
-		// String desc1 = despText.getText();
-		// if (!desc1.equals(config.getBriefDescription())) {
-		// actionMgr.doAction(IActionManager.SET, config,
-		// UmaPackage.eINSTANCE
-		// .getMethodElement_BriefDescription(),
-		// desc1, -1);
-		// }
-		// }
-		// });
-		closureButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				makeClosure();
-			};
-		});
-		fixWarningButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				fixWarning();
-			};
-		});
-		errorButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				showErrors();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-		hideButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				showHideElements();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-		treeViewer.addTreeListener(new ITreeViewerListener() {
-			public void treeCollapsed(TreeExpansionEvent event) {
-				Object element = event.getElement();
-				expandedElements.remove(element);
-			}
-
-			public void treeExpanded(TreeExpansionEvent event) {
-				Object element = event.getElement();
-				expandedElements.add(element);
-
-				// // this is a quick dirty fix for check state initialize issue
-				// // better solution later. jxi 07/01/05
-				// updateTree();
-				//				
-				// // restore the check state of the UI elements
-				// Object obj = event.getElement();
-				// boolean parentState = treeViewer.getChecked(obj);
-				//				
-				// ConfigPackageContentProvider cp =
-				// (ConfigPackageContentProvider)treeViewer.getContentProvider();
-				// Object[] children = cp.getChildren(obj);
-				// if ( children != null )
-				// {
-				// for ( int i = 0; i < children.length; i++)
-				// {
-				// boolean check = false;
-				// // if the folder is a UI folder, keep the check state
-				// if ( children[i] instanceof MethodPlugin )
-				// {
-				// check =
-				// config.getMethodPluginSelection().contains(children[i]);
-				// }
-				// else if ( children[i] instanceof MethodPackage )
-				// {
-				// check =
-				// config.getMethodPackageSelection().contains(children[i]);
-				// }
-				// else
-				// {
-				// check = parentState;
-				// }
-				//						
-				// boolean ret = treeViewer.setChecked(children[i], check);
-				// if ( ret == false)
-				// {
-				// System.out.println("Can't set state");
-				// }
-				//
-				// }
-				// }
-			}
-		});
-
-		// listen to the selection change of the current tree viewer
-		if (selectionChangedListener == null) {
-			// Create the listener
-			selectionChangedListener = new ISelectionChangedListener() {
-				// This just notifies those things that are affected by the
-				// section.
-				//
-				public void selectionChanged(SelectionChangedEvent event) {
-//					System.out
-//							.println(AuthoringUIResources.ConfigurationPage_Selected + event.getSelection()); //$NON-NLS-1$
-					setSelection(event.getSelection());
-				}
-			};
-
-			treeViewer.addSelectionChangedListener(selectionChangedListener);
-		}
-
-		// add a check state change listener
-		treeViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				modifiedElements = new ArrayList();
-				boolean checked = event.getChecked();
-				updateCheckStates(event.getElement(), checked);
-
-				/*
-				 * // save the previous invalid elements List invalid =
-				 * closure.getInvalidElements();
-				 * 
-				 * closure.setSelections(treeViewer.getCheckedElements());
-				 * 
-				 * if ( configFilter.isHiding() ) { treeViewer.refresh(); } else { //
-				 * get the new error elements, add to the previous error
-				 * elements, // and update them to update the error/warning
-				 * images invalid.addAll(closure.getInvalidElements()); // also
-				 * add the UI folders ConfigPackageContentProvider cp =
-				 * (ConfigPackageContentProvider)treeViewer.getContentProvider();
-				 * invalid.addAll(cp.getUIElements());
-				 * 
-				 * treeViewer.update(invalid.toArray(), null); }
-				 */
-
-				showErrors();
-				if (!saveConfiguration()) {
-					updateCheckStates(event.getElement(), false);
-
-					for (int i = 0; i < modifiedElements.size(); i++) {
-						treeViewer.setChecked(modifiedElements.get(i), false);
-					}
-
-				}
-			}
-		});
-
-		// treeViewer.addTreeListener(new ITreeViewerListener(){
-		//
-		// public void treeCollapsed(TreeExpansionEvent event) {
-		//				
-		// }
-		//
-		// public void treeExpanded(TreeExpansionEvent event) {
-		// //updateConfigSelection();
-		//
-		// // restore the check state of the UI elements
-		// Object obj = event.getElement();
-		// boolean parentState = treeViewer.getChecked(obj);
-		//				
-		// ConfigPackageContentProvider cp =
-		// (ConfigPackageContentProvider)treeViewer.getContentProvider();
-		// Object[] children = cp.getChildren(obj);
-		// if ( children != null )
-		// {
-		// for ( int i = 0; i < children.length; i++)
-		// {
-		// boolean check = false;
-		// // if the folder is a UI folder, keep the check state
-		// if ( children[i] instanceof MethodPlugin )
-		// {
-		// check = config.getMethodPluginSelection().contains(children[i]);
-		// }
-		// else if ( children[i] instanceof MethodPackage )
-		// {
-		// check = config.getMethodPackageSelection().contains(children[i]);
-		// }
-		// else
-		// {
-		// check = parentState;
-		// }
-		//						
-		// boolean ret = treeViewer.setChecked(children[i], check);
-		// if ( ret == false)
-		// {
-		// System.out.println("Can't set state");
-		// }
-		//
-		// }
-		// }
-		//				
-		// }});
-
-		// listen to the library changes and automatically update the
-		// configuration view
-		libListener = new ILibraryChangeListener() {
-			public void libraryChanged(int option, Collection changedItems) {
-				// for performance reason, we should not response to every
-				// library change
-				// only cover package and plugin changes
-				if (option == ILibraryChangeListener.OPTION_DELETED
-						|| option == ILibraryChangeListener.OPTION_NEWCHILD
-						|| option == ILibraryChangeListener.OPTION_NEWCHILD) {
-					if (changedItems != null && changedItems.size() > 0) {
-						Object o = changedItems.toArray()[0];
-						if (o instanceof MethodPlugin
-								|| o instanceof ProcessComponent
-								|| o instanceof MethodPackage) {
-							if (o instanceof ProcessComponent) {
-								reInitializeConfigFactory();
-							}
-							treeViewer.refresh();
-							updateCheckStates();
-							showErrors();
-						}
-					}
-				}
-			}
-		};
-
-		ILibraryManager manager = LibraryService.getInstance().getCurrentLibraryManager();
-		if (manager != null) {
-			manager.addListener(libListener);
-		}
-	}
-
-	protected void showHideElements() {
-		configFilter.setHide();
-		updateCheckStates(); // neded to have this to update the check status
-	}
-
-	/**
-	 * the UI selections contains UI folders, need to convert to the
-	 * corresponding method element selections
-	 * 
-	 * @return Object[] the converted selections
-	 */
-	protected Object[] getConvertedSelections() {
-		List items = new ArrayList();
-		Object[] sels = treeViewer.getCheckedElements();
-
-		ConfigPackageContentProvider cp = (ConfigPackageContentProvider) treeViewer
-				.getContentProvider();
-		for (int i = 0; i < sels.length; i++) {
-			Object sel = cp.getUITargetElement(sels[i]);
-			if (sel != null && !items.contains(sel)) {
-				items.add(sel);
-			}
-		}
-
-		return items.toArray();
-	}
-
-	protected void showErrors() {
-		// ConfigurationClosure c = closure;
-		// c.setSelections(treeViewer.getCheckedElements());
-
-		// save the previous invalid elements
-		List invalid = closure.getInvalidElements();
-
-		// convert selections to method plugins and method packages
-		closure.setSelections(getConvertedSelections());
-
-		if (configFilter.isHiding()) {
-			treeViewer.refresh();
-		} else {
-			// get the new error elements, add to the previous error elements,
-			// and update them to update the error/warning images
-			invalid.addAll(closure.getInvalidElements());
-
-			// also add the UI folders
-			ConfigPackageContentProvider cp = (ConfigPackageContentProvider) treeViewer
-					.getContentProvider();
-			invalid.addAll(cp.getUIElements());
-
-			treeViewer.update(invalid.toArray(), null);
-		}
-
-		updateMessage();
-
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.add(listener);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void removeSelectionChangedListener(
-			ISelectionChangedListener listener) {
-		selectionChangedListeners.remove(listener);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
-	 */
-	public ISelection getSelection() {
-		return currentSelection;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
-	 */
-	public void setSelection(ISelection selection) {
-		currentSelection = selection;
-
-		for (Iterator listeners = selectionChangedListeners.iterator(); listeners
-				.hasNext();) {
-			ISelectionChangedListener listener = (ISelectionChangedListener) listeners
-					.next();
-			listener
-					.selectionChanged(new SelectionChangedEvent(this, selection));
-		}
-
-		// notify the message view
-		IStructuredSelection sel = (IStructuredSelection) selection;
-		Object[] selObjs = sel.toArray();
-		if ((selObjs != null) && (selObjs.length > 0)) {
-			Object node = selObjs[0];
-			if (closure.getError(node) != null) {
-				getMessageView().showError(node);
-			}
-		}
-
-		// update the description field
-		Object o = sel.getFirstElement();
-		if (o instanceof MethodElement) {
-			String briefDesc = ((MethodElement) o).getBriefDescription();
-			elemDespContentText.setText(briefDesc != null ? briefDesc : ""); //$NON-NLS-1$
-		}
-
-	}
-
-	/**
-	 * Make configuration closure
-	 *
-	 */
-	protected void makeClosure() {
-		// set the selections to the closure
-		ConfigurationClosure c = closure;
-		// c.setSelections(treeViewer.getCheckedElements());
-		c.makeClosure();
-
-		treeViewer.refresh();
-
-		updateCheckStates();
-
-		saveConfiguration();
-
-		updateMessage();
-
-	}
-
-	/**
-	 * Fix all warnings 
-	 */
-	protected void fixWarning() {
-		ConfigurationClosure c = closure;
-		// c.setSelections(treeViewer.getCheckedElements());
-
-		c.fixProblems();
-
-		treeViewer.refresh();
-		updateCheckStates();
-
-		saveConfiguration();
-
-		updateMessage();
-
-	}
-
-	private void updateCheckStates(Object element, boolean checked) {
-
-		// Object element = event.getElement();
-
-		if (checked == true) {
-			ITreeContentProvider cp = (ITreeContentProvider) treeViewer
-					.getContentProvider();
-			checkParent(cp, element);
-			// treeViewer.setChecked(element, true);
-		} else
-			treeViewer.setChecked(element, false);
-
-		selectionChildren(element, checked);
-
-	}
-
-	/**
-	 * Select/unselect all the children for the given element
-	 * @param element
-	 * @param checked
-	 */
-	public void selectionChildren(Object element, boolean checked) {
-		ITreeContentProvider cp = (ITreeContentProvider) treeViewer
-				.getContentProvider();
-		Object[] childs = cp.getChildren(element);
-		for (int i = 0; i < childs.length; i++) {
-			treeViewer.setChecked(childs[i], checked);
-			selectionChildren(childs[i], checked);
-		}
-	}
-
-	private void updateCheckStates() {
-		treeViewer.getTree().setVisible(false);
-		// treeViewer.expandAll();
-
-		try {
-			Object content = treeViewer.getInput();
-			if (content instanceof MethodLibrary) {
-
-				// set the selection since the colsure may changed with make
-				// closure or fix error
-				// treeViewer.setCheckedElements(closure
-				// .getSelection());
-				Object[] selectionList = closure.getSelection();
-				ConfigPackageContentProvider cp = (ConfigPackageContentProvider) treeViewer
-						.getContentProvider();
-
-				for (int i = 0; i < selectionList.length; i++) {
-					Object element = selectionList[i];
-
-					checkParent(cp, element);
-					treeViewer.setChecked(element, true);
-				}
-
-				// also set the UI folders if the corresponding package is
-				// selected
-				for (Iterator it = new ArrayList(cp.getUIElements()).iterator(); it
-						.hasNext();) {
-					Object element = it.next();
-					Object o = cp.getUITargetElement(element);
-					if (o != null && closure.isSelected(o)) {
-						checkParent(cp, element);
-						treeViewer.setChecked(element, true);
-					}
-				}
-
-				// restore the expand state
-				treeViewer.setExpandedElements(expandedElements.toArray());
-
-			}
-
-		} finally {
-			treeViewer.getTree().setVisible(true);
-		}
-
-	}
-
-	private void checkParent(ITreeContentProvider cp, Object element) {
-		if (element == null || element instanceof MethodLibrary /*
-																 * || element ==
-																 * currentRootNode
-																 */) {
-			return;
-		}
-		modifiedElements.add(element);
-		Object parent = LibraryUtil.unwrap(cp.getParent(element));
-		if (parent != null) {
-			treeViewer.setChecked(parent, true);
-			// configFactory.getCurrentConfiguration().add((EObject)parent,
-			// false);
-			checkParent(cp, parent);
-		}
-
-	}
-
-	/**
-	 * Get all parents
-	 * @param list
-	 * @param pkg
-	 */
-	public void getAllParents(List list, MethodPackage pkg) {
-		MethodPackage parentPkg = ((MethodPackage) pkg).getParentPackage();
-		if (parentPkg != null) {
-			list.add(parentPkg);
-			getAllParents(list, parentPkg);
-		}
-	}
-
-	/**
-	 * Check parents for the given element
-	 * @param element
-	 */
-	public boolean setParentsChecked(Object element) {
-		Widget widget = treeViewer.testFindItem(element);
-		if (widget instanceof TreeItem) {
-			TreeItem item = (TreeItem) widget;
-			item = item.getParentItem();
-			while (item != null) {
-				item.setChecked(true);
-				item = item.getParentItem();
-			}
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#isDirty()
-	 */
-	public boolean isDirty() {
-		return false;
-		// return isDirty;
-	}
-
-	/**
-	 * Set dirty flag
-	 * @param dirty
-	 */
-	public void setDirty(boolean dirty) {
-		isDirty = dirty;
-	}
-
-	/**
-	 * Content provider for configuration packages
-	 */
-	public class ConfigPackageContentProvider extends
-			AdapterFactoryContentProvider {
-		//private ConfigurationFactory configFactory;
-
-		// private boolean showMethodModelOnly = false;
-
-		// there is a problem in the passed in AdapterFactory
-		// it can't find the correct parent from the child
-		// need to build a map of child to it's parent if the child is a UI
-		// folder
-		// clear the map when the input is set
-		Map childUIParentMap = new HashMap();
-
-		List uiFolders = new ArrayList();
-
-		public List getUIElements() {
-			return uiFolders;
-		}
-
-		/**
-		 * Create an instance
-		 * @param adapterFactory
-		 */
-		public ConfigPackageContentProvider(//ConfigurationFactory configFactory,
-				AdapterFactory adapterFactory/* , boolean showMethodModelOnly */) {
-			super(adapterFactory);
-			// this.showMethodModelOnly = showMethodModelOnly;
-		}
-
-		/*
-		public ConfigurationFactory getConfigFactory() {
-			return configFactory;
-		}
-		*/
-
-		// public void setShowMethodModelOnly(boolean showOnly) {
-		// showMethodModelOnly = showOnly;
-		// }
-
-		/**
-		 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider#getChildren(java.lang.Object)
-		 */
-		public Object[] getChildren(Object parentElement) {
-			// if (parentElement instanceof RootContent) {
-			// return ((RootContent) parentElement).getChildren();
-			// } else {
-			// if (showMethodModelOnly) {
-			// return null;
-			// } else {
-			Object[] items = getValidItems(parentElement, super
-					.getChildren(parentElement));
-			return items;
-			// }
-			// }
-		}
-
-		/**
-		 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider#getElements(java.lang.Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			// if (inputElement instanceof RootContent) {
-			// return ((RootContent) inputElement).getChildren();
-			// } else {
-
-			Object[] items = getValidItems(inputElement, super
-					.getElements(inputElement));
-
-			// if (showMethodModelOnly && items != null) {
-			// List elements = new ArrayList();
-			// for (int i = 0; i < items.length; i++) {
-			// if (items[i] instanceof MethodPlugin) {
-			// elements.add(items[i]);
-			// }
-			// }
-			// return elements.toArray();
-			//
-			// } else {
-			return items;
-			// }
-			// }
-		}
-
-		private boolean isUIFolder(Object e) {
-			return (e instanceof ContentItemProvider
-					|| e instanceof ProcessesItemProvider || e instanceof MethodPackagesItemProvider ||
-					e instanceof PluginUIPackagesItemProvider
-			/*
-			 * || e instanceof StandardCategoriesItemProvider || e instanceof
-			 * DisciplineCategoriesItemProvider || e instanceof
-			 * DomainsItemProvider || e instanceof WorkProductTypesItemProvider ||
-			 * e instanceof RoleSetsItemProvider || e instanceof
-			 * ToolsItemProvider || (e instanceof CustomCategory) &&
-			 * TngUtil.isRootCustomCategory((CustomCategory)e)
-			 */
-			);
-		}
-
-		public Object getUITargetElement(Object e) {
-			if (e instanceof CustomCategory) {
-				return ((CustomCategory) e).eContainer();
-			} else if (e instanceof MethodElement) {
-				return e;
-			} else if (e instanceof ContentItemProvider) {
-				return ((ContentItemProvider) e).getParent(null);
-			} else if (e instanceof ProcessesItemProvider) {
-				return ((ProcessesItemProvider) e).getParent(null);
-			} else if (e instanceof ItemProviderAdapter) {
-				Object target = ((ItemProviderAdapter) e).getTarget();
-				if (target != null && target instanceof MethodElement) {
-					return target;
-				}
-			}
-
-			return null;
-		}
-
-		private Object[] getValidItems(Object parent, Object[] elements) {
-			if (elements == null || elements.length == 0) {
-				return elements;
-			}
-
-			List pkgs = new ArrayList();
-			for (int i = 0; i < elements.length; i++) {
-				Object e = LibraryUtil.unwrap(elements[i]);
-				boolean uiFolder = isUIFolder(e);
-				if (uiFolder || e instanceof MethodPackage
-						|| e instanceof MethodPlugin) {
-					pkgs.add(e);
-
-					if (uiFolder) {
-						uiFolders.add(e);
-					}
-
-					// if the parent is a UI folder, map the child to the parent
-					// so that we can get the parent later
-					// if ( !(parent instanceof MethodElement) )
-					{
-						childUIParentMap.put(e, parent);
-					}
-				} else {
-					; // System.out.println("Ignored: " + e);
-				}
-			}
-
-			return pkgs.toArray();
-		}
-
-		/**
-		 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider#getParent(java.lang.Object)
-		 */
-		public Object getParent(Object element) {
-			// if (element instanceof RootContent) {
-			// return null;
-			// } else
-			if (childUIParentMap.containsKey(element)) {
-				return childUIParentMap.get(element);
-			} else {
-				return super.getParent(element);
-			}
-		}
-
-		/**
-		 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider#hasChildren(java.lang.Object)
-		 */
-		public boolean hasChildren(Object element) {
-			// if (element instanceof RootContent) {
-			// return true;
-			// } else
-			// if (showMethodModelOnly) {
-			// return false;
-			// } else {
-			Object[] children = getChildren(element);
-			return (children != null && children.length > 0);
-
-			// return treeNodeProvider.hasChildren(element);
-			// return super.hasChildren(element);
-			// }
-		}
-
-		/**
-		 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			super.inputChanged(viewer, oldInput, newInput);
-			childUIParentMap.clear();
-		}
-
-		/**
-		 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification notification) {
-			super.notifyChanged(notification);
-
-			if ((notification instanceof IViewerNotification)) {
-				final IViewerNotification vnt = (IViewerNotification) notification;
-				final Object element = vnt.getElement();
-				final ConfigurationViewer ctrl = ((ConfigurationViewer) super.viewer);
-				if (element != null && (vnt.getEventType() == Notification.ADD
-						|| vnt.getEventType() == Notification.SET)) {
-
-					SafeUpdateController.syncExec(new Runnable() {
-						public void run() {
-							ctrl.setChecked(element, true);
-						}
-					});
-				}
-			}
-		}
-
-		/**
-		 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider#dispose()
-		 */
-		public void dispose() {
-			super.dispose();
-			uiFolders.clear();
-			childUIParentMap.clear();
-			//configFactory = null;
-		}
-	}
-
-	/**
-	 * Label provider for configuration packages
-	 */
-	public class ConfigPackageLabelProvider extends LabelProvider {
-		ConfigPackageContentProvider contentProvider;
-
-		//ConfigurationFactory configFactory;
-
-		AdapterFactoryLabelProvider afProvider;
-
-		/**
-		 * Creates an instance
-		 * @param contentProvider
-		 */
-		public ConfigPackageLabelProvider(
-				ConfigPackageContentProvider contentProvider) {
-			this.contentProvider = contentProvider;
-			afProvider = new AdapterFactoryLabelProvider(contentProvider
-					.getAdapterFactory());
-			//this.configFactory = contentProvider.getConfigFactory();
-		}
-
-		private ElementDependencyError getFirstChildError(Object e) {
-			ElementDependencyError error = null;
-			Object[] children = contentProvider.getChildren(e);
-			if (children == null || children.length == 0) {
-				return null;
-			}
-
-			for (int i = 0; i < children.length; i++) {
-				Object object = children[i];
-				if (object instanceof ItemProviderAdapter) {
-					return getFirstChildError(object);
-				} else {
-					error = closure.getError(object);
-					if (error != null) {
-						return error;
-					}
-				}
-			}
-
-			return error;
-		}
-
-		/**
-		 * This implements {@link ILabelProvider}.getImage by forwarding it to
-		 * an object that implements
-		 * {@link IItemLabelProvider#getImage IItemLabelProvider.getImage}
-		 */
-		public Image getImage(Object object) {
-			// disable for now till it works
-			ConfigurationClosure config1 = closure;
-			if (config1 != null) {
-				// no, this will show the error mark even if the child has no
-				// error, not good
-				// show the error if there is child error
-				// while ( object instanceof ItemProviderAdapter)
-				// {
-				// object = contentProvider.getParent(object);
-				// }
-
-				ElementDependencyError error = null;
-				if (object instanceof ItemProviderAdapter) {
-					error = getFirstChildError(object);
-				} else {
-					error = closure.getError(object);
-				}
-
-				if (error != null) {
-					if (error.isError() || error.isChildError()) {
-						return PlatformUI.getWorkbench().getSharedImages()
-								.getImage(ISharedImages.IMG_OBJS_WARN_TSK); // ISharedImages.IMG_OBJS_ERROR_TSK
-						// show
-						// warning
-						// as
-						// well
-					} else if (error.isWarning() || error.isChildWarning()) {
-						return PlatformUI.getWorkbench().getSharedImages()
-								.getImage(ISharedImages.IMG_OBJS_WARN_TSK);
-					}
-				}
-			}
-
-			return afProvider.getImage(object);
-		}
-
-		protected Image getImageFromObject(Object object) {
-			return ExtendedImageRegistry.getInstance().getImage(object);
-		}
-
-		/**
-		 * This implements {@link ILabelProvider}.getText by forwarding it to
-		 * an object that implements
-		 * {@link IItemLabelProvider#getText IItemLabelProvider.getText}
-		 */
-		public String getText(Object object) {
-			if (object instanceof ProcessComponent) {
-				// return
-				// ((ProcessComponent)object).getProcess().getPresentationName();
-				Process proc = (Process) ((ProcessComponent) object)
-						.getProcess();
-				if (proc != null)
-					return proc.getPresentationName();
-				else
-					// if process is null, return processcomponent name
-					return ((ProcessComponent) object).getName();
-			} else
-				return afProvider.getText(object);
-		}
-
-		/**
-		 * @see org.eclipse.jface.viewers.LabelProvider#dispose()
-		 */
-		public void dispose() {
-			super.dispose();
-
-			contentProvider = null;
-			afProvider = null;
-			//configFactory = null;
-		}
-	}
-
-	/**
-	 * Filter for configuration
-	 * 
-	 *
-	 */
-	public class ConfigTreeFilter extends ViewerFilter {
-		boolean hideUncheckedNodes = false;
-
-		CheckboxTreeViewer checkTree = null;
-
-		ConfigurationClosure closure = null;
-
-		ConfigPackageContentProvider cp = null;
-
-		public ConfigTreeFilter(ConfigurationClosure closure) {
-			this.closure = closure;
-		}
-
-		public void setHide() {
-			hideUncheckedNodes = hideUncheckedNodes == true ? false : true;
-			checkTree.refresh();
-		}
-
-		public boolean select(Viewer viewer, Object parentElement,
-				Object element) {
-			if (checkTree == null) {
-				checkTree = (CheckboxTreeViewer) viewer;
-				cp = (ConfigPackageContentProvider) checkTree
-						.getContentProvider();
-			}
-
-			if (hideUncheckedNodes) {
-				Object o = cp.getUITargetElement(element);
-				return closure.isSelected(o);
-			}
-			return true;
-		}
-
-		public boolean isHiding() {
-			return hideUncheckedNodes;
-		}
-
-		public void dispose() {
-			checkTree = null;
-			cp = null;
-			closure = null;
-		}
-	}
-
-	/**
-	 * Save configuration
-	 * @return
-	 * 		True if configuration is save successfully, false otherwise
-	 */
-	public boolean saveConfiguration() {
-
-		boolean oldNotify = config.eDeliver();
-	    try
-	    {
-	    	//config.eSetDeliver(false);
-	    	
-			// remove the old entries
-			List pkgList = config.getMethodPackageSelection();
-			List plgList = config.getMethodPluginSelection();
-	
-			actionMgr = ((ConfigurationEditor) getEditor()).getActionManager();
-			if (!plgList.isEmpty()) {
-				if (actionMgr.doAction(IActionManager.REMOVE_MANY, config,
-						UmaPackage.eINSTANCE
-								.getMethodConfiguration_MethodPluginSelection(),
-						plgList, -1) == false) {
-					return false;
-				}
-			}
-			if (!pkgList.isEmpty()) {
-				if (actionMgr.doAction(IActionManager.REMOVE_MANY, config,
-						UmaPackage.eINSTANCE
-								.getMethodConfiguration_MethodPackageSelection(),
-						pkgList, -1) == false) {
-					return false;
-				}
-			}
-	
-			// add the new entries
-			pkgList = new ArrayList();
-			plgList = new ArrayList();
-	
-			// always get selection from closure
-			// Object[] objs = treeViewer.getCheckedElements();
-			// //modifiedList.toArray();
-			Object[] objs = closure.getSelection();
-	
-			for (int i = 0; i < objs.length; i++) {
-				if ( (objs[i] instanceof MethodPlugin) && !plgList.contains(objs[i]) ) {				
-					plgList.add(objs[i]);
-					
-					// add all system packages into the package selection
-					List pkgs = TngUtil.getAllSystemPackages((MethodPlugin)objs[i]);
-					for (Iterator it = pkgs.iterator(); it.hasNext();) {
-						Object pkg = it.next();
-						if (!pkgList.contains(pkg)) {
-							pkgList.add(pkg);
-						}
-					}
-				}
-				else if ( (objs[i] instanceof MethodPackage) && !pkgList.contains(objs[i]) ) {
-					pkgList.add(objs[i]);
-				}
-			}
-			
-			actionMgr = ((ConfigurationEditor) getEditor()).getActionManager();
-			if (!plgList.isEmpty()) {
-				if (actionMgr.doAction(IActionManager.ADD_MANY, config,
-						UmaPackage.eINSTANCE
-								.getMethodConfiguration_MethodPluginSelection(),
-						plgList, -1) == false) {
-					return false;
-				}
-			}
-			if (!pkgList.isEmpty()) {
-				if (actionMgr.doAction(IActionManager.ADD_MANY, config,
-						UmaPackage.eINSTANCE
-								.getMethodConfiguration_MethodPackageSelection(),
-						pkgList, -1) == false) {
-					return false;
-				}
-			}
-	
-			return true;
-		
-		} finally {
-			config.eSetDeliver(oldNotify);
-		}
-	}
-
-	public void dispose() {
-		super.dispose();
-
-		if (libListener != null) {
-			ILibraryManager manager = LibraryService.getInstance().getCurrentLibraryManager();
-			if (manager != null) {
-				manager.removeListener(libListener);
-			}
-		}
-
-		if (msgView != null && msgViewListener != null) {
-			msgView.removeSelectionChangedListener(msgViewListener);
-		}
-
-		if (configFilter != null) {
-			configFilter.dispose();
-		}
-
-		if (closure != null) {
-			closure.dispose();
-			closure = null;
-		}
-
-		config.eAdapters().remove(configurationChangedListener);
-	}
-
-	private MessageView getMessageView() {
-		if (msgView == null || msgView.isDisposed()) {
-			// add a listener for message selection changes
-			msgView = MessageView.getView();
-			msgView.configurationFactoryChanged(closure);
-
-			msgViewListener = new ISelectionChangedListener() {
-				public void selectionChanged(SelectionChangedEvent event) {
-					IStructuredSelection sel = (IStructuredSelection) event
-							.getSelection();
-					Object[] selObjs = sel.toArray();
-					if ((selObjs != null) && (selObjs.length > 0)) {
-						EObject node = null;
-						if (selObjs[0] instanceof ElementDependencyError) {
-							node = (EObject) ((ElementDependencyError) selObjs[0])
-									.getErrorElement();
-						} else if (selObjs[0] instanceof ErrorInfo) {
-							ErrorInfo info = (ErrorInfo) selObjs[0];
-							// node = (EObject) info.getOwnerElement();
-
-							// show the cause element
-							node = (EObject) info.getCauseElement();
-
-						}
-
-						else if (selObjs[0] instanceof ElementReference) {
-							node = (EObject) ((ElementReference) selObjs[0])
-									.getRefElement();
-							if (node != null) {
-								node = node.eContainer();
-							}
-						}
-
-						if (node != null) {
-							treeViewer.setSelection(LibraryUtil
-									.getSelectable(node));
-						}
-					}
-				}
-			};
-
-			msgView.addSelectionChangedListener(msgViewListener);
-		}
-
-		return msgView;
-	}
-
-	private void updateMessage() {
-		// if nothing to show, don't show the message view
-		if (closure.hasProblem()
-				|| ((msgView != null) && !msgView.isDisposed())) {
-			getMessageView().updateMessage();
-		}
-	}
-
-	/**
-	 * Get configuration closure
-	 */
-	public ConfigurationClosure getClosure() {
-		return closure;
-	}
-	
-	private void addEditorSetFocusLiseners() {
-		if (getEditor() instanceof ConfigurationEditor) {
-			Listener lis = new Listener() {
-				public void handleEvent (Event event) {
-					if (event.data == ConfigurationPage.this && needUpdate && treeViewer != null)	{
-						reInitializeConfigFactory();
-						treeViewer.refresh();
-						updateCheckStates();
-						showErrors();
-						needUpdate = false;
-					}
-				}
-			};
-			((ConfigurationEditor) getEditor()).addToSetFocusLiseners(lis);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ContentElementGuidancePage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ContentElementGuidancePage.java
deleted file mode 100755
index ecf24a8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ContentElementGuidancePage.java
+++ /dev/null
@@ -1,523 +0,0 @@
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.GuidanceFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.util.MethodElementUtil;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.EstimationConsiderations;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.Report;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.Roadmap;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.Template;
-import org.eclipse.epf.uma.TermDefinition;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.Whitepaper;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductType;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-/**
- * Class for Guidance tab page in the content element editor.
- * Class ContentElementGuidancePage replaces CategoryGuidancePage and handles
- * all contentelement's guidance tab feature.  
- * 
- * @author Shashidhar Kannoori
- * @author Kelvin Low
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class ContentElementGuidancePage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "categoryGuidancesPage"; //$NON-NLS-1$
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ContentElementGuidancePage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.GUIDANCE_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		setAllowChange1(true);
-		setAllowChange2(true);
-		setUseCategory2(false);
-		setUseCategory3(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				List list = MethodElementUtil
-						.getSelectedGuidances(contentElement);
-				List local = new ArrayList();
-				for (Iterator it = list.iterator(); it.hasNext();) {
-					Object obj = it.next();
-					if (!(obj instanceof Practice
-							|| (obj instanceof ToolMentor && contentElement instanceof Tool) || obj
-							.equals(contentElement
-									.getVariabilityBasedOnElement()))) {
-						local.add(obj);
-					}
-				}
-				return local.toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		IActionManager actionMgr = editor.getActionManager();
-		if (!addItems.isEmpty()) {
-			for (Iterator it = addItems.iterator(); it.hasNext();) {
-				Guidance item = (Guidance) it.next();
-
-				// Consolidating the separate form page code
-				// to accomodate better filtering.
-				if (contentElement instanceof Task) {
-//					if (item instanceof Estimate) {
-//						editor.getActionManager().doAction(IActionManager.SET,
-//								contentElement,
-//								UmaPackage.eINSTANCE.getTask_Estimate(),
-//								(Estimate) item, -1);
-//					} else 
-					if (item instanceof ToolMentor) {
-						editor.getActionManager().doAction(IActionManager.ADD,
-								contentElement,
-								UmaPackage.eINSTANCE.getTask_ToolMentors(),
-								(ToolMentor) item, -1);
-					}else if (item instanceof EstimationConsiderations) {
-						actionMgr.doAction(IActionManager.ADD, contentElement,
-								UmaPackage.eINSTANCE.getTask_EstimationConsiderations(),
-								item, -1);
-					}
-				}
-				// In case of WorkProduct, WorkProduct is associated to ToolMentor,
-				// Estimate, Report and Template guidance
-				if (contentElement instanceof WorkProduct) {
-					if (item instanceof Template) {
-						actionMgr
-								.doAction(IActionManager.ADD, contentElement,
-										UmaPackage.eINSTANCE
-												.getWorkProduct_Templates(),
-										item, -1);
-					} else if (item instanceof ToolMentor) {
-						actionMgr
-								.doAction(IActionManager.ADD, contentElement,
-										UmaPackage.eINSTANCE
-												.getWorkProduct_ToolMentors(),
-										item, -1);
-					} else if (item instanceof Report) {
-						actionMgr.doAction(IActionManager.ADD, contentElement,
-								UmaPackage.eINSTANCE.getWorkProduct_Reports(),
-								item, -1);
-					} 
-//					else if (item instanceof Estimate) {
-//						actionMgr.doAction(IActionManager.SET, contentElement,
-//								UmaPackage.eINSTANCE.getWorkProduct_Estimate(),
-//								item, -1);
-//					}
-					else if (item instanceof EstimationConsiderations) {
-						actionMgr.doAction(IActionManager.ADD, contentElement,
-								UmaPackage.eINSTANCE.getWorkProduct_EstimationConsiderations(),
-								item, -1);
-					}
-				}
-
-				// Guidance for content element.
-				if (item instanceof Checklist) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.ADD,
-									contentElement,
-									UmaPackage.eINSTANCE
-											.getContentElement_Checklists(),
-									(Checklist) item, -1);
-				} else if (item instanceof Concept) {
-					editor.getActionManager().doAction(
-							IActionManager.ADD,
-							contentElement,
-							UmaPackage.eINSTANCE
-									.getContentElement_ConceptsAndPapers(),
-							(Concept) item, -1);
-				} else if (item instanceof Example) {
-					editor.getActionManager().doAction(IActionManager.ADD,
-							contentElement,
-							UmaPackage.eINSTANCE.getContentElement_Examples(),
-							(Example) item, -1);
-				} else if (item instanceof SupportingMaterial) {
-					editor.getActionManager().doAction(
-							IActionManager.ADD,
-							contentElement,
-							UmaPackage.eINSTANCE
-									.getContentElement_SupportingMaterials(),
-							(SupportingMaterial) item, -1);
-				} else if (item instanceof Guideline) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.ADD,
-									contentElement,
-									UmaPackage.eINSTANCE
-											.getContentElement_Guidelines(),
-									(Guideline) item, -1);
-				} else if (item instanceof ReusableAsset) {
-					editor.getActionManager().doAction(IActionManager.ADD,
-							contentElement,
-							UmaPackage.eINSTANCE.getContentElement_Assets(),
-							(ReusableAsset) item, -1);
-				} else {
-					AuthoringUIPlugin
-							.getDefault()
-							.getLogger()
-							.logError(
-									"Unable to add guidance " + item.getType().getName() + ":" + item.getName() + //$NON-NLS-1$ //$NON-NLS-2$
-											"to " //$NON-NLS-1$
-											+ contentElement.getType()
-													.getName()
-											+ ":" + contentElement.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		IActionManager actionMgr = editor.getActionManager();
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				Guidance item = (Guidance) it.next();
-
-				// In case of Task, Task is associated to ToolMentor and
-				// Estimate guidance
-				if (contentElement instanceof Task) {
-					if (item instanceof ToolMentor) {
-						editor.getActionManager().doAction(
-								IActionManager.REMOVE, contentElement,
-								UmaPackage.eINSTANCE.getTask_ToolMentors(),
-								item, -1);
-					} 
-//					else if (item instanceof Estimate) {
-//						editor.getActionManager().doAction(IActionManager.SET,
-//								contentElement,
-//								UmaPackage.eINSTANCE.getTask_Estimate(), null,
-//								-1);
-//					}
-					else if (item instanceof EstimationConsiderations) {
-						editor.getActionManager().doAction(IActionManager.REMOVE,
-								contentElement,
-								UmaPackage.eINSTANCE.getTask_EstimationConsiderations(), item,
-								-1);
-					}
-				}
-				// In case of WorkProduct, WorkProduct is associated to ToolMentor,
-				// Estimate, Report and Template guidance
-				if (contentElement instanceof WorkProduct) {
-					if (item instanceof Report) {
-						actionMgr.doAction(IActionManager.REMOVE,
-								contentElement, UmaPackage.eINSTANCE
-										.getWorkProduct_Reports(), item, -1);
-					} else if (item instanceof Template) {
-						actionMgr.doAction(IActionManager.REMOVE,
-								contentElement, UmaPackage.eINSTANCE
-										.getWorkProduct_Templates(), item, -1);
-					} else if (item instanceof ToolMentor) {
-						actionMgr
-								.doAction(IActionManager.REMOVE,
-										contentElement, UmaPackage.eINSTANCE
-												.getWorkProduct_ToolMentors(),
-										item, -1);
-					} 
-//					else if (item instanceof Estimate) {
-//						actionMgr.doAction(IActionManager.SET, contentElement,
-//								UmaPackage.eINSTANCE.getWorkProduct_Estimate(),
-//								null, -1);
-//					}
-					else if (item instanceof EstimationConsiderations) {
-						editor.getActionManager().doAction(IActionManager.REMOVE,
-								contentElement,
-								UmaPackage.eINSTANCE.getWorkProduct_EstimationConsiderations(), item,
-								-1);
-					}
-				}
-				// Guidance for the method element.
-				if (item instanceof Checklist) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.REMOVE,
-									contentElement,
-									UmaPackage.eINSTANCE
-											.getContentElement_Checklists(),
-									item, -1);
-				} else if (item instanceof Concept) {
-					editor.getActionManager().doAction(
-							IActionManager.REMOVE,
-							contentElement,
-							UmaPackage.eINSTANCE
-									.getContentElement_ConceptsAndPapers(),
-							(Concept) item, -1);
-				} else if (item instanceof Example) {
-					editor.getActionManager().doAction(IActionManager.REMOVE,
-							contentElement,
-							UmaPackage.eINSTANCE.getContentElement_Examples(),
-							(Example) item, -1);
-				} else if (item instanceof SupportingMaterial) {
-					editor.getActionManager().doAction(
-							IActionManager.REMOVE,
-							contentElement,
-							UmaPackage.eINSTANCE
-									.getContentElement_SupportingMaterials(),
-							(SupportingMaterial) item, -1);
-				} else if (item instanceof Guideline) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.REMOVE,
-									contentElement,
-									UmaPackage.eINSTANCE
-											.getContentElement_Guidelines(),
-									(Guideline) item, -1);
-				} else if (item instanceof ReusableAsset) {
-					editor.getActionManager().doAction(IActionManager.REMOVE,
-							contentElement,
-							UmaPackage.eINSTANCE.getContentElement_Assets(),
-							(ReusableAsset) item, -1);
-				} else {
-					AuthoringUIPlugin
-							.getDefault()
-							.getLogger()
-							.logError(
-									"Unable to remove guidance " + item.getType().getName() + ":" + item.getName() + //$NON-NLS-1$ //$NON-NLS-2$
-											"from " //$NON-NLS-1$
-											+ contentElement.getType()
-													.getName()
-											+ ":" + contentElement.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return contentElement;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.GUIDANCE;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new GuidanceFilter();
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getFilterTypes()
-	 *      Types are returned in order to display in the filter dialog for
-	 *      search based on type.
-	 */
-	protected String[] getFilterTypes() {
-		
-		String[] str;
-		if (contentElement instanceof Task) {
-			str = new String[11];
-		} else if (contentElement instanceof WorkProduct) {
-			str = new String[13];
-		} else
-			str = new String[9];
-		int i = 0;
-		str[i++] = FilterConstants.GUIDANCE;
-		str[i++] = FilterConstants.space + FilterConstants.CHECKLISTS;
-		str[i++] = FilterConstants.space + FilterConstants.CONCEPTS;
-		str[i++] = FilterConstants.space + FilterConstants.EXAMPLES;
-		str[i++] = FilterConstants.space + FilterConstants.GUIDELINES;
-		str[i++] = FilterConstants.space + FilterConstants.REUSABLE_ASSETS;
-		str[i++] = FilterConstants.space + FilterConstants.SUPPORTING_MATERIALS;
-		if (contentElement instanceof Task) {
-			str[i++] = FilterConstants.space + FilterConstants.TOOL_MENTORS;
-			str[i++] = FilterConstants.space + FilterConstants.ESTIMATE_CONSIDERATIONS;
-			// TODO Estimate contentelement
-		} else if (contentElement instanceof WorkProduct) {
-			str[i++] = FilterConstants.space + FilterConstants.REPORTS;
-			str[i++] = FilterConstants.space + FilterConstants.TEMPLATES;
-			str[i++] = FilterConstants.space + FilterConstants.TOOL_MENTORS;
-			str[i++] = FilterConstants.space + FilterConstants.ESTIMATE_CONSIDERATIONS;
-			// TODO Estimate contentelement
-		}
-		str[i++] = FilterConstants.CONTENT_PACKAGES;
-		str[i++] = FilterConstants.METHO_PLUGINS;
-		return str;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.categoryGuidancesPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		
-		if(contentElement instanceof RoleSet){
-			return AuthoringUIResources.rolesets_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof Discipline){
-			return AuthoringUIResources.disciplines_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof WorkProductType){
-			return AuthoringUIResources.workproducttypes_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof Domain){
-			return AuthoringUIResources.domains_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof Tool){
-			return AuthoringUIResources.tools_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof Role){
-			return AuthoringUIResources.roleGuidancePage_sectionDescription;
-		}
-		if(contentElement instanceof Task){
-			return AuthoringUIResources.taskGuidancePage_sectionDescription;
-		}
-		if(contentElement instanceof WorkProduct){
-			return AuthoringUIResources.workProductGuidancePage_sectionDescription;
-		}
-		if(contentElement instanceof Tool){
-			return AuthoringUIResources.tools_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof Whitepaper){
-			return AuthoringUIResources.whitepaper_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof Concept){
-			return AuthoringUIResources.concept_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof Checklist){
-			return AuthoringUIResources.checklist_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof Example){
-			return AuthoringUIResources.example_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof Guideline){
-			return AuthoringUIResources.guideline_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof SupportingMaterial){
-			return AuthoringUIResources.supportingmaterial_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof Roadmap){
-			return AuthoringUIResources.roadmap_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof Practice){
-			return AuthoringUIResources.practice_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof Report){
-			return AuthoringUIResources.report_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof ReusableAsset){
-			return AuthoringUIResources.reusableasset_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof Template){
-			return AuthoringUIResources.template_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof TermDefinition){
-			return AuthoringUIResources.termdefinition_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof EstimationConsiderations){
-			return AuthoringUIResources.estimationconsideration_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof ToolMentor){
-			return AuthoringUIResources.toolmentor_guidancepage_sectiondescription;
-		}
-		if(contentElement instanceof CustomCategory){
-			return AuthoringUIResources.customcategory_guidancepage_sectiondescription;
-		}
-		
-		if(contentElement != null)
-			return AuthoringUIResources.bind(AuthoringUIResources.categoryGuidancesPage_sectionDescription, contentElement.getType().getName().toLowerCase());
-		
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.categoryGuidancesPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.categoryGuidancesPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.categoryGuidancesPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel3()
-	 */
-	protected String getSelectedLabel3() {
-		return AuthoringUIResources.categoryGuidancesPage_selectedLabel;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ContentPackageDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ContentPackageDescriptionPage.java
deleted file mode 100755
index 7bbfa13..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ContentPackageDescriptionPage.java
+++ /dev/null
@@ -1,492 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditorInput;
-import org.eclipse.epf.authoring.ui.util.UIHelper;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.util.MethodElementUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-
-/**
- * The description page for the Content Package editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class ContentPackageDescriptionPage extends FormPage implements IRefreshable {
-
-	private static final String FORM_PREFIX = LibraryUIText.TEXT_CONTENT_PACKAGE
-			+ ": "; //$NON-NLS-1$
-
-	private Text ctrl_name;
-
-	private Text ctrl_brief_desc;
-
-	private CheckboxTableViewer ctrl_dependency;
-
-	private ScrolledForm form;
-
-	private ContentPackage contentPackage;
-
-	private Hashtable aPackageMap = new Hashtable();
-	private org.eclipse.epf.authoring.ui.editors.MethodElementEditor.ModifyListener modelModifyListener;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ContentPackageDescriptionPage(FormEditor editor) {
-		super(editor, AuthoringUIText.DESCRIPTION_PAGE_TITLE,
-				AuthoringUIText.DESCRIPTION_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-
-		// Retrieve the ContentPackage object from the Editor input.
-		MethodElementEditorInput methodElementInput = (MethodElementEditorInput) input;
-		Object obj = methodElementInput.getMethodElement();
-		contentPackage = (ContentPackage) obj;
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.createFormContent(IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		// Create the form toolkit.
-		form = managedForm.getForm();
-		FormToolkit toolkit = managedForm.getToolkit();
-		form.setText(FORM_PREFIX + contentPackage.getName());
-		TableWrapLayout layout = new TableWrapLayout();
-		form.getBody().setLayout(layout);
-
-		// Create the General Informaiton section.
-		Section generalSection = toolkit.createSection(form.getBody(),
-				Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED
-						| Section.TITLE_BAR);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		generalSection.setLayoutData(td);
-		generalSection.setText(AuthoringUIText.GENERAL_INFO_SECTION_NAME);
-		generalSection.setDescription(MessageFormat.format(
-				AuthoringUIText.GENERAL_INFO_SECTION_DESC,
-				new String[] { LibraryUIText.getUITextLower(contentPackage) }));
-		generalSection.setLayout(new GridLayout());
-
-		Composite generalComposite = toolkit.createComposite(generalSection);
-		generalComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		generalComposite.setLayout(new GridLayout(2, false));
-		generalSection.setClient(generalComposite);
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(
-				generalComposite.getParent().getParent(),
-				AuthoringUIHelpContexts.CONTENT_PACKAGE_EDITOR_ALL_CONTEXT); 
-
-		// name
-		Label l_name = toolkit.createLabel(generalComposite,
-				AuthoringUIText.NAME_TEXT);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			l_name.setLayoutData(gridData);
-		}
-
-		ctrl_name = toolkit.createText(generalComposite, ""); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-					| GridData.GRAB_HORIZONTAL);
-			ctrl_name.setLayoutData(gridData);
-		}
-
-		// brief desc
-		Label l_brief_desc = toolkit.createLabel(generalComposite,
-				AuthoringUIText.BRIEF_DESCRIPTION_TEXT);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			l_brief_desc.setLayoutData(gridData);
-		}
-
-		ctrl_brief_desc = toolkit.createText(generalComposite,
-				"", SWT.MULTI | SWT.WRAP | SWT.V_SCROLL); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-			gridData.heightHint = 40;
-			gridData.widthHint = 300;
-			ctrl_brief_desc.setLayoutData(gridData);
-		}
-
-		Section dependencySection = toolkit.createSection(form.getBody(),
-				Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED
-						| Section.TITLE_BAR);
-		TableWrapData td1 = new TableWrapData(TableWrapData.FILL_GRAB);
-		dependencySection.setLayoutData(td1);
-		dependencySection.setText(AuthoringUIText.DEPENDENCIES_SECTION_NAME);
-		dependencySection
-				.setDescription(AuthoringUIText.DEPENDENCIES_SECTION_DESC);
-		dependencySection.setLayout(new GridLayout());
-
-		Composite dependencyComposite = toolkit
-				.createComposite(dependencySection);
-		dependencyComposite
-				.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		dependencyComposite.setLayout(new GridLayout(2, false));
-		dependencySection.setClient(dependencyComposite);
-
-		Table ctrl_table = new Table(dependencyComposite, SWT.V_SCROLL
-				| SWT.CHECK | SWT.READ_ONLY | SWT.COLOR_BLUE);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING
-					| GridData.FILL_BOTH);
-			gridData.heightHint = 100;
-			ctrl_table.setLayoutData(gridData);
-		}
-
-		ctrl_dependency = new CheckboxTableViewer(ctrl_table);
-
-		ILabelProvider labelProvider = new LabelProvider() {
-			public String getText(Object element) {
-				return element.toString();
-			}
-		};
-		ctrl_dependency.setLabelProvider(labelProvider);
-
-		Hashtable aMap = getDependenciesPackages(contentPackage);
-
-		if (aMap != null) {
-			Iterator it = aMap.keySet().iterator();
-			while (it.hasNext()) {
-				String key = (String) it.next();
-				ctrl_dependency.add(key);
-			}
-		}
-		ctrl_dependency.setAllChecked(true);
-		ctrl_dependency.setAllGrayed(true);
-
-		toolkit.paintBordersFor(generalComposite);
-		toolkit.paintBordersFor(dependencyComposite);
-
-		// load data
-		loadData();
-		addListeners();
-
-		// set focus on the name attribute
-		Display display = form.getBody().getDisplay();
-		if (!(display == null || display.isDisposed())) {
-			display.asyncExec(new Runnable() {
-				public void run() {
-					ctrl_name.setFocus();
-					ctrl_name.setSelection(0, ctrl_name.getText().length());
-				}
-			});
-		}
-	}
-
-	/**
-	 * Add listeners
-	 * 
-	 */
-	private void addListeners() {
-		final MethodElementEditor editor = (MethodElementEditor) getEditor();
-		modelModifyListener = editor.createModifyListener(contentPackage);
-
-		form.addListener(SWT.Activate, new Listener() {
-			public void handleEvent(Event e) {
-				// refreshViewers();
-				ctrl_dependency.refresh();
-				Hashtable aMap = getDependenciesPackages(contentPackage);
-
-				if (aMap != null) {
-					Iterator it = aMap.keySet().iterator();
-					while (it.hasNext()) {
-						String key = (String) it.next();
-						ctrl_dependency.add(key);
-					}
-				}
-				ctrl_dependency.setAllChecked(true);
-				ctrl_dependency.setAllGrayed(true);
-				if (TngUtil.isLocked(contentPackage)) {
-					enableControls(false);
-				} else {
-					enableControls(true);
-				}
-			}
-		});
-
-		ctrl_name.addModifyListener(modelModifyListener);
-		ctrl_name.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getNamedElement_Name());
-			}
-
-			public void focusLost(FocusEvent e) {
-				final Collection eClasses = Collections
-						.singleton(UmaPackage.eINSTANCE.getMethodPackage());
-				String oldContent = contentPackage.getName();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				String newName = ctrl_name.getText();
-				if(newName != null)
-					newName = newName.trim();
-				String msg = TngUtil.checkName(contentPackage, newName, eClasses);
-				if (msg == null) {
-					if (!newName.equals(contentPackage.getName())) {
-						ctrl_name.setText(newName);
-						editor.getActionManager().doAction(IActionManager.SET,
-								contentPackage,
-								UmaPackage.eINSTANCE.getNamedElement_Name(),
-								newName, -1);
-					}
-				} else {
-					AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayError(
-									AuthoringUIResources.renameDialog_title, msg); //$NON-NLS-1$
-					ctrl_name.setText(contentPackage.getName());
-					ctrl_name.getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							ctrl_name.setFocus();
-							ctrl_name.selectAll();
-						}
-					});
-				}
-			}
-		});
-
-		ctrl_brief_desc.addModifyListener(modelModifyListener);
-		ctrl_brief_desc.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getMethodElement_BriefDescription());
-			}
-
-			public void focusLost(FocusEvent e) {
-				String oldContent = contentPackage.getBriefDescription();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				String newName = ctrl_brief_desc.getText();
-				if (!newName.equals(contentPackage.getBriefDescription())) {
-					boolean success = editor.getActionManager().doAction(
-							IActionManager.SET,
-							contentPackage,
-							UmaPackage.eINSTANCE
-									.getMethodElement_BriefDescription(),
-							newName, -1);
-					if (success) {
-						ctrl_brief_desc.setText(newName);
-					}
-				}
-			}
-		});
-
-		ctrl_dependency.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				Object obj = event.getSource();
-				((CheckboxTableViewer) obj).setAllChecked(true);
-			}
-		});
-
-	}
-
-	protected void enableControls(boolean editable) {
-		ctrl_name.setEditable(editable);
-		ctrl_brief_desc.setEditable(editable);
-	}
-
-	/**
-	 * Loads initial data from model
-	 */
-	private void loadData() {
-		String name = contentPackage.getName();
-		String desc = contentPackage.getBriefDescription();
-
-		List dependencies = contentPackage.getReusedPackages();
-
-		ctrl_name.setText(name == null ? "" : name); //$NON-NLS-1$
-		ctrl_brief_desc.setText(desc == null ? "" : desc); //$NON-NLS-1$
-
-		for (int i = 0; i < dependencies.size(); i++) {
-			Iterator it = aPackageMap.entrySet().iterator();
-			while (it.hasNext()) {
-				Map.Entry entry = (Map.Entry) it.next();
-				if (dependencies.get(i) == entry.getValue()) {
-					ctrl_dependency.setChecked(entry.getKey(), true);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get dependency packages for the given content package
-	 * @return
-	 * 		List of dependency packages
-	 */
-	public Hashtable getDependenciesPackages(ContentPackage contentPackage) {
-
-		List elements = new ArrayList();
-		for (Iterator iter = contentPackage.getContentElements().iterator(); iter
-				.hasNext();) {
-			ContentElement contentElement = (ContentElement) iter.next();
-			if (contentElement.getVariabilityBasedOnElement() != null) {
-				elements.add((ContentElement) contentElement
-						.getVariabilityBasedOnElement());
-			}
-			elements.addAll(MethodElementUtil
-					.getSelectedGuidances(contentElement));
-
-			if (contentElement instanceof Role) {
-				if (AssociationHelper
-						.getModifiedWorkProducts((Role) contentElement) != null) {
-					elements.addAll(AssociationHelper
-							.getModifiedWorkProducts((Role) contentElement));
-				}
-				if (AssociationHelper.getPrimaryTasks((Role) contentElement) != null) {
-					elements.addAll(AssociationHelper
-							.getPrimaryTasks((Role) contentElement));
-				}
-				if (AssociationHelper.getSecondaryTasks((Role) contentElement) != null) {
-					elements.addAll(AssociationHelper
-							.getSecondaryTasks((Role) contentElement));
-				}
-			}
-			if (contentElement instanceof Task) {
-				if (((Task) contentElement).getPerformedBy() != null) {
-					elements.add(((Task) contentElement).getPerformedBy());
-				}
-				if (((Task) contentElement).getAdditionallyPerformedBy() != null) {
-					elements.addAll(((Task) contentElement)
-							.getAdditionallyPerformedBy());
-				}
-				if (((Task) contentElement).getMandatoryInput() != null) {
-					elements
-							.addAll(((Task) contentElement).getMandatoryInput());
-				}
-				if (((Task) contentElement).getOptionalInput() != null) {
-					elements.addAll(((Task) contentElement).getOptionalInput());
-				}
-				if (((Task) contentElement).getOutput() != null) {
-					elements.addAll(((Task) contentElement).getOutput());
-				}
-			}
-			if (contentElement instanceof WorkProduct) {
-				if (AssociationHelper
-						.getModifiedBy((WorkProduct) contentElement) != null) {
-					elements.addAll(AssociationHelper
-							.getModifiedBy((WorkProduct) contentElement));
-				}
-				if (AssociationHelper
-						.getMandatoryInputToTasks((WorkProduct) contentElement) != null) {
-					elements
-							.addAll(AssociationHelper
-									.getMandatoryInputToTasks((WorkProduct) contentElement));
-				}
-				if (AssociationHelper
-						.getOutputtingTasks((WorkProduct) contentElement) != null) {
-					elements.addAll(AssociationHelper
-							.getOutputtingTasks((WorkProduct) contentElement));
-				}
-				List list = AssociationHelper.getResponsibleRoles((WorkProduct) contentElement);
-				if (list != null) {
-					elements.addAll(list);
-				}
-			}
-
-		}
-
-		for (int i = 0; i < elements.size(); i++) {
-			Object object = ((ContentElement) elements.get(i)).eContainer();
-			// Object object = elements.get(i);
-			// System.out.println("Type
-			// "+((ContentPackage)object).getType().getName());
-			if (object instanceof ContentPackage) {
-				if (!contentPackage.equals(object)) {
-					aPackageMap.put(((ContentPackage) object).getName(),
-							(ContentPackage) object);
-				}
-			}
-
-		}
-		return aPackageMap;
-	}	
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.IRefreshable#refreshName(java.lang.String)
-	 */
-	public void refreshName(String newName) {
-		if (newName != null) {
-			if ((ctrl_name != null) && !(ctrl_name.isDisposed())) {
-				ctrl_name.removeModifyListener(modelModifyListener);
-				ctrl_name.setText(newName);
-				ctrl_name.addModifyListener(modelModifyListener);
-				UIHelper.setFormText(form, contentPackage);
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/CustomCategoryAssignPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/CustomCategoryAssignPage.java
deleted file mode 100755
index cc668a1..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/CustomCategoryAssignPage.java
+++ /dev/null
@@ -1,406 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.actions.LibraryViewDeleteAction;
-import org.eclipse.epf.authoring.ui.filters.AllFilter;
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.LibraryEditResources;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.MoveInCategoryCommand;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.util.CategorySortHelper;
-import org.eclipse.epf.library.edit.util.Comparators;
-import org.eclipse.epf.library.edit.util.ContentElementOrderList;
-import org.eclipse.epf.library.edit.util.ModelStructure;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.edit.validation.DependencyChecker;
-import org.eclipse.epf.library.ui.LibraryUIManager;
-import org.eclipse.epf.library.util.LibraryManager;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.TermDefinition;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.epf.uma.util.MessageException;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Assign page in the Custom Category editor.
- * 
- * @author Shashidhar Kannoori
- * @author Kelvin Low
- * @since 1.0
- */
-public class CustomCategoryAssignPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "customCategoryAssignPage"; //$NON-NLS-1$
-
-	private CustomCategory category;
-
-	private ContentElementOrderList allSteps;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public CustomCategoryAssignPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.ASSIGN_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		category = (CustomCategory) contentElement;
-		setUseCategory2(false);
-		setUseCategory3(false);
-		setAllowChange1(true);
-		setIsUpAndDownButtonsRequired1(true);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				if (allSteps == null) {
-					allSteps = new ContentElementOrderList(
-							contentElement,
-							ContentElementOrderList.CONTENT_ELEMENTS__FOR_ELEMENT_ONLY);
-				}
-				List returnList = CategorySortHelper.sortCategoryElements(contentElement, allSteps.toArray());
-				return returnList.toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		boolean ok = DependencyChecker.checkCircularForMovingVariabilityElement(category, addItems);
-		if(! ok) {
-			String title = AuthoringUIResources.circular_dependency_error_title;
-			AuthoringUIPlugin.getDefault().getMsgDialog().displayError(title, LibraryEditResources.circular_dependency_error_msg);						
-			return;
-		}
-		
-		List ancestors = getAncestors(category);
-		if (!addItems.isEmpty()) {
-			for (Iterator it = addItems.iterator(); it.hasNext();) {
-				MethodElement customCategory = (MethodElement) it.next();
-				if (customCategory instanceof CustomCategory
-						&& TngUtil
-								.isRootCustomCategory((CustomCategory) customCategory)) {
-				} else if (ancestors.contains(customCategory)) {
-				} else {
-					if (customCategory instanceof ProcessComponent) {
-						MethodElement object = ((ProcessComponent) customCategory)
-								.getProcess();
-						LibraryManager.getInstance().addToCustomCategory(
-								getActionManager(), category, object);
-					} else {
-						LibraryManager.getInstance().addToCustomCategory(
-								getActionManager(), category, customCategory);
-					}
-				}
-			}
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		if (!rmItems.isEmpty()) {
-			ArrayList customCategoriesToDelete = new ArrayList();
-			MethodPlugin currentPlugin = UmaUtil.getMethodPlugin(category);
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				MethodElement e = (MethodElement) it.next();
-				if (e instanceof CustomCategory) {
-//					Adapter adapter = TngAdapterFactory.INSTANCE
-//							.getNavigatorView_ComposedAdapterFactory().adapt(
-//									category, ITreeItemContentProvider.class);
-//					if (adapter != null
-//							&& adapter instanceof ItemProviderAdapter) {
-//						for (Iterator iter = ((ItemProviderAdapter) adapter)
-//								.getChildren(category).iterator(); iter
-//								.hasNext();) {
-//							Object o = iter.next();
-//							if (TngUtil.unwrap(o) == e) {
-//								customCategoriesToDelete.add(o);
-//							}
-//						}
-//					}
-					
-					// will delete e if it is in the current plugin and
-					// the last super custom category of e in the current plugin
-					//
-					if(TngUtil.isInPluginWithLessThanOneSuperCustomCategory((CustomCategory) e, currentPlugin)) {
-						customCategoriesToDelete.add(e);
-						continue;
-					}
-				}				
-				LibraryManager.getInstance().removeFromCustomCategory(
-						getActionManager(), category, e);
-			}
-
-			if (customCategoriesToDelete.size() > 0) {
-				int i = 0;
-				StringBuffer elementStr = new StringBuffer();
-				for (Iterator it = customCategoriesToDelete.iterator(); it.hasNext();) {
-					Object obj = TngUtil.unwrap(it.next());
-					if (obj instanceof MethodElement) {
-						if (i > 0) {
-							elementStr.append(", "); //$NON-NLS-1$
-						}
-						elementStr.append(((MethodElement) obj).getName());
-
-						i++;
-					}
-				}
-				
-				if(!AuthoringUIPlugin.getDefault().getMsgDialog().displayConfirmation(AuthoringUIResources.remove_text,
-						NLS.bind(AuthoringUIResources.promptDeleteCustomCategoryBeforeRemoveLastRefToIt, elementStr))) {
-					return;
-				}
-				LibraryViewDeleteAction deleteAction = new LibraryViewDeleteAction() {
-					public void run() {
-						String title = AuthoringUIResources.actions_LibraryActionBarContributor_deleteErrorTitle; //$NON-NLS-1$
-						confirm = false;
-						try {
-							super.run();
-						} catch (MessageException e) {
-							AuthoringUIPlugin.getDefault().getMsgDialog()
-									.displayError(title, e.getMessage());
-						} catch (Exception e) {
-							String details = TngUtil.toStackTraceString(e);
-							String message = AuthoringUIResources.actions_LibraryActionBarContributor_deleteErrorMessage; //$NON-NLS-1$		
-							String reason = AuthoringUIResources.actions_LibraryActionBarContributor_deleteErrorReason; //$NON-NLS-1$
-							AuthoringUIPlugin.getDefault().getMsgDialog()
-									.displayError(title, message, reason,
-											details, e);
-						}
-					}
-
-					protected void deleteFailed() {
-						// library need to be reloaded
-						//
-						String libDir = LibraryService.getInstance()
-								.getCurrentMethodLibraryPath();
-						LibraryUIManager.getInstance().openLibrary(libDir);
-					}
-					
-				};
-				deleteAction.setEditingDomain(LibraryView.getView()
-						.getEditingDomain());
-				deleteAction.selectionChanged(new StructuredSelection(
-						customCategoriesToDelete));
-				deleteAction.run();
-			}
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#moveUpItemsInSelectedItems1(ArrayList)
-	 */
-	protected void moveUpItemsInSelectedItems1(ArrayList moveUpItems) {
-		if (!moveUpItems.isEmpty()) {
-			EStructuralFeature feature = UmaPackage.eINSTANCE
-			.getCustomCategory_CategorizedElements();
-			MoveInCategoryCommand cmd = new MoveInCategoryCommand(
-					(CustomCategory) contentElement, moveUpItems, allSteps,
-					feature, ModelStructure.DEFAULT.customCategoryPath, 1);
-			getActionManager().execute(cmd);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#moveDownItemsInSelectedItems1(ArrayList)
-	 */
-	protected void moveDownItemsInSelectedItems1(ArrayList moveDownItems) {
-		if (!moveDownItems.isEmpty()) {
-			EStructuralFeature feature = UmaPackage.eINSTANCE
-			.getCustomCategory_CategorizedElements();
-			MoveInCategoryCommand cmd = new MoveInCategoryCommand(
-					(CustomCategory) contentElement, moveDownItems, allSteps,
-					feature, ModelStructure.DEFAULT.customCategoryPath, 0);
-			getActionManager().execute(cmd);
-		}
-	}
-
-	/**
-	 * Returns the ancestors for the given Custom Category.
-	 */
-	private List getAncestors(CustomCategory methodObject) {
-		List ancestorList = new ArrayList();
-		List objList = new ArrayList();
-		objList.add(methodObject);
-		getAncestors(ancestorList, objList);
-		return ancestorList;
-	}
-
-	private List getAncestors(List ancestorList, List methodObjectList) {
-		if (methodObjectList.isEmpty())
-			return ancestorList;
-
-		List allParentCustCats = new ArrayList();
-
-		for (Iterator iter = methodObjectList.iterator(); iter.hasNext();) {
-			CustomCategory element = (CustomCategory) iter.next();
-			List parentList = AssociationHelper.getCustomCategories(element);
-			allParentCustCats.addAll(parentList);
-		}
-
-		ancestorList.addAll(methodObjectList);
-		List nextCheckList = new ArrayList();
-		for (Iterator iter = allParentCustCats.iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			if (!ancestorList.contains(element)) {
-				nextCheckList.add(element);
-			}
-		}
-
-		return getAncestors(ancestorList, nextCheckList);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return category;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.ALL_ELEMENTS;
-	}
-
-	private class CustomCategoryAssignFilter extends AllFilter {
-		protected boolean childAccept(Object obj) {
-			if (obj instanceof ProcessPackage)
-				return true;
-			if (obj instanceof Process)
-				return true;
-			if(obj instanceof Milestone){
-				return true;
-			}
-			if(obj instanceof Activity){
-				return true;
-			}
-			if (obj instanceof CustomCategory) {
-				if (TngUtil.isRootCustomCategory((CustomCategory) obj)) {
-					return !(((CustomCategory) obj).getCategorizedElements()
-							.isEmpty());
-				}
-			}
-			if (obj instanceof TermDefinition)
-				return false;
-			if (obj instanceof ContentElement) {
-				// if (obj instanceof Discipline){
-				// return
-				// AssociationHelper.getDisciplineGroups((Discipline)obj).isEmpty();
-				// }
-				// if (obj instanceof RoleSet){
-				// return
-				// AssociationHelper.getRoleSetGroups((RoleSet)obj).isEmpty();
-				// }
-				return !(getHelper().isContributor((ContentElement) obj));
-			}
-			return false;
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new CustomCategoryAssignFilter();
-	}
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.customCategoryAssignPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.customCategoryAssignPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.customCategoryAssignPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.customCategoryAssignPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return null;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel3()
-	 */
-	protected String getSelectedLabel3() {
-		return null;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/CustomCategoryDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/CustomCategoryDescriptionPage.java
deleted file mode 100755
index af25809..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/CustomCategoryDescriptionPage.java
+++ /dev/null
@@ -1,94 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.CustomCategoryFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.VariabilityBaseElementFilter;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Description page for the Domain editor.
- * 
- * @author Kelvin Low
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class CustomCategoryDescriptionPage extends DescriptionFormPage {
-
-	private static final String FORM_PAGE_ID = "customCategoryDescriptionPage"; //$NON-NLS-1$
-
-	private CustomCategory category;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public CustomCategoryDescriptionPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.DESCRIPTION_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		category = (CustomCategory) contentElement;
-		publishCategoryOn = true;
-		setIconSectionOn(true);
-		
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return category;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.CUSTOM_CATEGORIES;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		filter = new CustomCategoryFilter();
-		// set additional filter for variability base element checking
-		((CustomCategoryFilter) filter)
-				.setAdditionalFilters(new IFilter[] { new VariabilityBaseElementFilter(
-						category) });
-		return filter;
-	}
-	
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadSectionDescription()
-	 */
-	public void loadSectionDescription() {
-		this.generalSectionDescription = AuthoringUIResources.customcategory_generalInfoSection_desc;
-		this.detailSectionDescription = AuthoringUIResources.customcategory_detailSection_desc;
-		this.variabilitySectionDescription = AuthoringUIResources.customcategory_variabilitySection_desc;
-		this.versionSectionDescription = AuthoringUIResources.customcategory_versionInfoSection_desc;
-		this.iconSectionDescription =  AuthoringUIResources.customcategory_IconSection_desc;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DeliveryProcessDescription.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DeliveryProcessDescription.java
deleted file mode 100755
index 93c5489..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DeliveryProcessDescription.java
+++ /dev/null
@@ -1,330 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * Description page for delivery process
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class DeliveryProcessDescription extends ProcessDescription {
-
-	private IMethodRichText ctrl_scale, ctrl_project_characteristics;
-
-	private IMethodRichText ctrl_risk_level, ctrl_estimating_techniques;
-
-	private IMethodRichText ctrl_project_member_expertise,
-			ctrl_type_of_contract;
-
-	private DeliveryProcess deliveryProcess;
-
-	/**
-	 * Creates an instance
-	 * @param editor
-	 */
-	public DeliveryProcessDescription(FormEditor editor) {
-		super(editor);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.ProcessFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		deliveryProcess = (DeliveryProcess) process;
-
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.ProcessDescription#createDetailSection()
-	 */
-	protected void createDetailSection() {
-		super.createDetailSection();
-
-		// scale
-		ctrl_scale = createRichTextEditWithLinkForSection(toolkit,
-				detailComposite, AuthoringUIResources.Process_Scale, 40, 400, DETAIL_SECTION_ID); //$NON-NLS-1$
-
-		// project characteristics
-		ctrl_project_characteristics = createRichTextEditWithLinkForSection(
-				toolkit,
-				detailComposite,
-				AuthoringUIResources.Process_ProjectCharacteristics, 40, 400, DETAIL_SECTION_ID); //$NON-NLS-1$
-
-		// risk level
-		ctrl_risk_level = createRichTextEditWithLinkForSection(
-				toolkit,
-				detailComposite,
-				AuthoringUIResources.Process_RiskLevel, 40, 400, DETAIL_SECTION_ID); 
-
-		// Estimating technique
-		ctrl_estimating_techniques = createRichTextEditWithLinkForSection(
-				toolkit,
-				detailComposite,
-				AuthoringUIResources.Process_EstimatingTechnique, 40, 400, DETAIL_SECTION_ID); 
-
-		// Project Member expertise
-		ctrl_project_member_expertise = createRichTextEditWithLinkForSection(
-				toolkit,
-				detailComposite,
-				AuthoringUIResources.Process_ProjectMemberExpertise, 40, 400, DETAIL_SECTION_ID); //$NON-NLS-1$
-
-		// Type of contract
-		ctrl_type_of_contract = createRichTextEditWithLinkForSection(
-				toolkit,
-				detailComposite,
-				AuthoringUIResources.Process_TypeOfContract, 40, 400, DETAIL_SECTION_ID); 
-
-	}
-
-	/**
-	 * Loads initial data from model
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.forms.ProcessDescription#loadData()
-	 */
-	protected void loadData() {
-		super.loadData();
-
-		org.eclipse.epf.uma.DeliveryProcessDescription content = (org.eclipse.epf.uma.DeliveryProcessDescription) deliveryProcess
-				.getPresentation();
-		String scale = content.getScale();
-		String projectChar = content.getProjectCharacteristics();
-		String estimatingTechnique = content.getEstimatingTechnique();
-		String riskLevel = content.getRiskLevel();
-		String projectMemberExpertiese = content.getProjectMemberExpertise();
-		String typeOfContract = content.getTypeOfContract();
-
-		ctrl_scale.setText(scale == null ? "" : scale); //$NON-NLS-1$
-		ctrl_project_characteristics
-				.setText(projectChar == null ? "" : projectChar); //$NON-NLS-1$
-		ctrl_estimating_techniques
-				.setText(estimatingTechnique == null ? "" : estimatingTechnique); //$NON-NLS-1$
-		ctrl_risk_level.setText(riskLevel == null ? "" : riskLevel); //$NON-NLS-1$
-		ctrl_project_member_expertise
-				.setText(projectMemberExpertiese == null ? "" : projectMemberExpertiese); //$NON-NLS-1$
-		ctrl_type_of_contract
-				.setText(typeOfContract == null ? "" : typeOfContract); //$NON-NLS-1$
-	}
-
-	/**
-	 * Add listeners
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.forms.ProcessDescription#addListeners()
-	 */
-	protected void addListeners() {
-		super.addListeners();
-		MethodElementEditor editor = ((MethodElementEditor) getEditor());
-		final IActionManager actionMgr = editor.getActionManager();
-		final org.eclipse.epf.uma.DeliveryProcessDescription content = (org.eclipse.epf.uma.DeliveryProcessDescription) deliveryProcess
-				.getPresentation();
-
-		ctrl_scale.setModalObject(deliveryProcess.getPresentation());
-		ctrl_scale.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getDeliveryProcessDescription_Scale());
-		ctrl_scale.addModifyListener(contentModifyListener);
-		ctrl_scale.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_scale;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = content.getScale();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					actionMgr.doAction(IActionManager.SET, deliveryProcess
-							.getPresentation(), UmaPackage.eINSTANCE
-							.getDeliveryProcessDescription_Scale(), newContent,
-							-1);
-				}
-			}
-		});
-
-		ctrl_project_characteristics.setModalObject(deliveryProcess
-				.getPresentation());
-		ctrl_project_characteristics.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getDeliveryProcessDescription_ProjectCharacteristics());
-		ctrl_project_characteristics.addModifyListener(contentModifyListener);
-		ctrl_project_characteristics.addListener(SWT.Deactivate,
-				new Listener() {
-					public void handleEvent(Event e) {
-						IMethodRichText control = descExpandFlag ? ctrl_expanded
-								: ctrl_project_characteristics;
-						if (!control.getModified()) {
-							return;
-						}
-						String oldContent = content.getProjectCharacteristics();
-						if (((MethodElementEditor) getEditor())
-								.mustRestoreValue(control, oldContent)) {
-							return;
-						}
-						String newContent = control.getText();
-						if (!newContent.equals(oldContent)) {
-							actionMgr
-									.doAction(
-											IActionManager.SET,
-											deliveryProcess.getPresentation(),
-											UmaPackage.eINSTANCE
-													.getDeliveryProcessDescription_ProjectCharacteristics(),
-											newContent, -1);
-						}
-					}
-				});
-
-		ctrl_risk_level.setModalObject(deliveryProcess.getPresentation());
-		ctrl_risk_level.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getDeliveryProcessDescription_RiskLevel());
-		ctrl_risk_level.addModifyListener(contentModifyListener);
-		ctrl_risk_level.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_risk_level;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = content.getRiskLevel();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					actionMgr.doAction(IActionManager.SET, deliveryProcess
-							.getPresentation(), UmaPackage.eINSTANCE
-							.getDeliveryProcessDescription_RiskLevel(),
-							newContent, -1);
-				}
-			}
-		});
-
-		ctrl_estimating_techniques.setModalObject(deliveryProcess
-				.getPresentation());
-		ctrl_estimating_techniques.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getDeliveryProcessDescription_EstimatingTechnique());
-		ctrl_estimating_techniques.addModifyListener(contentModifyListener);
-		ctrl_estimating_techniques.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_estimating_techniques;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = content.getEstimatingTechnique();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					actionMgr
-							.doAction(
-									IActionManager.SET,
-									deliveryProcess.getPresentation(),
-									UmaPackage.eINSTANCE
-											.getDeliveryProcessDescription_EstimatingTechnique(),
-									newContent, -1);
-				}
-			}
-		});
-
-		ctrl_project_member_expertise.setModalObject(deliveryProcess
-				.getPresentation());
-		ctrl_project_member_expertise
-				.setModalObjectFeature(UmaPackage.eINSTANCE
-						.getDeliveryProcessDescription_ProjectMemberExpertise());
-		ctrl_project_member_expertise.addModifyListener(contentModifyListener);
-		ctrl_project_member_expertise.addListener(SWT.Deactivate,
-				new Listener() {
-					public void handleEvent(Event e) {
-						IMethodRichText control = descExpandFlag ? ctrl_expanded
-								: ctrl_project_member_expertise;
-						if (!control.getModified()) {
-							return;
-						}
-						String oldContent = content.getProjectMemberExpertise();
-						if (((MethodElementEditor) getEditor())
-								.mustRestoreValue(control, oldContent)) {
-							return;
-						}
-						String newContent = control.getText();
-						if (!newContent.equals(oldContent)) {
-							actionMgr
-									.doAction(
-											IActionManager.SET,
-											deliveryProcess.getPresentation(),
-											UmaPackage.eINSTANCE
-													.getDeliveryProcessDescription_ProjectMemberExpertise(),
-											newContent, -1);
-						}
-					}
-				});
-
-		ctrl_type_of_contract.setModalObject(deliveryProcess.getPresentation());
-		ctrl_type_of_contract.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getDeliveryProcessDescription_TypeOfContract());
-		ctrl_type_of_contract.addModifyListener(contentModifyListener);
-		ctrl_type_of_contract.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_type_of_contract;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = content.getTypeOfContract();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					actionMgr.doAction(IActionManager.SET, deliveryProcess
-							.getPresentation(), UmaPackage.eINSTANCE
-							.getDeliveryProcessDescription_TypeOfContract(),
-							newContent, -1);
-				}
-			}
-		});
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.ProcessDescription#refresh(boolean)
-	 */
-	protected void refresh(boolean editable) {
-		super.refresh(editable);
-		ctrl_estimating_techniques.setEditable(editable);
-		ctrl_project_characteristics.setEditable(editable);
-		ctrl_project_member_expertise.setEditable(editable);
-		ctrl_risk_level.setEditable(editable);
-		ctrl_scale.setEditable(editable);
-		ctrl_type_of_contract.setEditable(editable);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DescriptionFormPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DescriptionFormPage.java
deleted file mode 100755
index 3dd882c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DescriptionFormPage.java
+++ /dev/null
@@ -1,2883 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIImages;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.actions.MethodElementDeleteAction;
-import org.eclipse.epf.authoring.ui.dialogs.ChangeHistoryDialog;
-import org.eclipse.epf.authoring.ui.dialogs.ItemsFilterDialog;
-import org.eclipse.epf.authoring.ui.dialogs.RenameFileConflictDialog;
-import org.eclipse.epf.authoring.ui.editors.EditorChooser;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.filters.ContentFilter;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichTextEditor;
-import org.eclipse.epf.authoring.ui.util.EditorsContextHelper;
-import org.eclipse.epf.authoring.ui.util.UIHelper;
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.common.utils.NetUtil;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.DeleteMethodElementCommand;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.edit.validation.DependencyChecker;
-import org.eclipse.epf.library.edit.validation.IValidator;
-import org.eclipse.epf.library.edit.validation.IValidatorFactory;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.library.util.ConvertGuidanceType;
-import org.eclipse.epf.persistence.MethodLibraryPersister;
-import org.eclipse.epf.richtext.RichTextListener;
-import org.eclipse.epf.uma.ContentCategory;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodElementProperty;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.epf.uma.util.ContentDescriptionFactory;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.fieldassist.DecoratedField;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-import com.ibm.icu.text.DateFormat;
-
-
-/**
- * The base class for all Description pages in the Method editors.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @author Shashidhar Kannoori
- * @author Shilpa Toraskar
- * @since 1.0
- * fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=176382
- */
-public abstract class DescriptionFormPage extends BaseFormPage implements IRefreshable {
-
-	protected static final String NOT_APPLICABLE_TEXT = AuthoringUIResources.notApplicable_text; 
-	
-	protected static final String CONTRIBUTES_TEXT = AuthoringUIResources.contributes_text; 
-	
-	private static final String LOCAL_CONTRIBUTES_TEXT = AuthoringUIResources.localContributes_text;  
-
-	protected static final String EXTENDS_TEXT = AuthoringUIResources.extends_text; 
-
-	protected static final String REPLACES_TEXT = AuthoringUIResources.replaces_text; 
-	
-	protected static final String LOCAL_REPLACES_TEXT = AuthoringUIResources.localReplaces_text; 
-	
-	protected static final String EXTENDS_REPLACES_TEXT = AuthoringUIResources.extendsReplaces_text;
-
-	protected static final ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-			TngUtil.umaItemProviderAdapterFactory);
-
-	// Composites and sections.
-	protected Section formSection;
-
-	protected Composite sectionComposite;
-
-	protected Composite expandedComposite;
-
-	protected Section generalSection;
-
-	protected Section variabilitySection;
-
-	protected Composite generalComposite;
-
-	protected Composite variabilityComposite;
-
-	protected Section versionSection;
-
-	protected Composite versionComposite;
-
-	protected Section iconSection;
-
-	protected Composite iconComposite;
-
-	private Canvas pane1;
-
-	private Canvas pane3;
-
-	protected Section detailSection;
-
-	protected Composite detailComposite;
-
-	protected Section notationSection;
-
-	protected Composite notationComposite;
-
-	protected Section tailoringSection;
-
-	protected Composite tailoringComposite;
-
-	// Edit controls.
-	protected Text ctrl_name;
-
-	protected Text ctrl_presentation_name;
-
-	protected Label ctrl_type_label;
-
-	protected Button ctrl_type_button;
-
-	protected Text ctrl_brief_desc;
-
-	protected IMethodRichText ctrl_full_desc;
-
-	protected IMethodRichText ctrl_key;
-
-	protected IMethodRichTextEditor ctrl_expanded;
-
-	protected ComboViewer viewer_variability;
-
-	protected Combo ctrl_variability;
-
-	protected Label label_base;
-
-	protected TableViewer base_viewer;
-
-	protected Table ctrl_base;
-
-	protected Button ctrl_base_button;
-
-	private IMethodRichText activeControl;
-
-	private Text ctrl_authors;
-
-	private Text ctrl_change_date;
-
-	private Text ctrl_change_desc;
-
-	private Button view_history_button;
-
-	private Text ctrl_version;
-
-	protected Label label_copyright;
-
-	protected TableViewer copyright_viewer;
-
-	protected Table ctrl_copyright;
-
-	private Button copyright_button;
-
-	private Button copyright_button_deselect;
-
-	protected ImageHyperlink expandDetailLink;
-
-	protected Label expandDetailLabel;
-
-	protected ImageHyperlink expandNotationLink;
-
-	protected Label expandNotationLabel;
-
-	protected ImageHyperlink expandTailoringLink;
-
-	protected Label expandTailoringLabel;
-
-	protected IMethodRichText ctrl_purpose;
-
-	protected Text ctrl_external_id;
-
-	private Image shapeImage;
-
-	private Image nodeImage;
-
-	protected Button ctrl_select_shapeIcon_button;
-
-	protected Button ctrl_clear_shapeIcon_button;
-
-	protected Button ctrl_select_nodeIcon_button;
-
-	protected Button ctrl_clear_nodeIcon_button;
-	
-	protected Button ctrl_publish_categories_button;
-
-	protected ImageHyperlink expandVersionLink;
-
-	protected Label expandVersionLabel;
-
-	protected ImageHyperlink expandLink;
-
-	protected DecoratedField expandLabel;
-
-	private String lastChangeHistory = "";
-
-	protected IStructuredContentProvider contentProviderVariability;
-
-	protected IStructuredContentProvider contentProviderBase;
-	
-	protected ILabelProvider labelProviderVariability = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory()) {
-		public String getText(Object object) {
-			VariabilityType varObject = (VariabilityType) object;
-			if (varObject == VariabilityType.NA_LITERAL)
-				return NOT_APPLICABLE_TEXT;
-			if (varObject == VariabilityType.CONTRIBUTES_LITERAL)
-				return CONTRIBUTES_TEXT;
-			if (varObject == VariabilityType.LOCAL_CONTRIBUTION_LITERAL)
-				return LOCAL_CONTRIBUTES_TEXT;
-			if (varObject == VariabilityType.EXTENDS_LITERAL)
-				return EXTENDS_TEXT;
-			if (varObject == VariabilityType.REPLACES_LITERAL)
-				return REPLACES_TEXT;
-			if (varObject == VariabilityType.LOCAL_REPLACEMENT_LITERAL)
-				return LOCAL_REPLACES_TEXT;
-			if (varObject == VariabilityType.EXTENDS_REPLACES_LITERAL)
-				return EXTENDS_REPLACES_TEXT;
-			
-			return null;
-		}
-	};
-
-	protected ILabelProvider labelProviderBase = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory()) {
-		public String getColumnText(Object object, int columnIndex) {
-			return TngUtil.getLabelWithPath(object);
-		}
-	};
-
-	protected IActionManager actionMgr;
-
-	protected IStructuredContentProvider copyrightContentProvider;
-
-	private ILabelProvider copyrightLabelProviderBase = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory());
-
-	protected ModifyListener modelModifyListener;
-
-	protected ModifyListener contentModifyListener;
-
-	// Editing and display flags.
-	protected boolean descExpandFlag = false;
-
-	protected boolean generalSectionExpandFlag = false;
-
-	protected boolean detailSectionExpandFlag = false;
-
-	protected boolean notationSectionExpandFlag = false;
-
-	protected boolean tailoringSectionExpandFlag = false;
-
-	protected boolean versionSectionExpandFlag = false;
-
-	protected boolean elementSectionExpandFlag = false;
-
-	protected boolean iconSectionExpandFlag = false;
-
-	protected boolean fullDescOn = true;
-
-	protected boolean keyConsiderationOn = true;
-
-	protected boolean briefDescOn = true;
-
-	protected boolean elementTypeOn = false;
-
-	protected boolean contentFieldOn = false;
-
-	protected boolean versionSectionOn = true;
-
-	protected boolean anyAttributeModified = false;
-
-	protected boolean generalSectionOn = true;
-
-	protected boolean notationSectionOn = false;
-
-	protected boolean detailSectionOn = true;
-
-	protected boolean tailoringSectionOn = false;
-
-	protected boolean variabilitySectionOn = true;
-
-	protected boolean purposeOn = false;
-
-	protected boolean externalIdOn = false;
-
-	protected boolean iconSectionOn = false;
-	
-	protected boolean publishCategoryOn = false;
-
-	// commented because these variables are not in use
-	// protected String variabilityTypeNone = NOT_APPLICABLE_TEXT;
-	// protected String variabilityTypeContributes = CONTRIBUTES_TEXT;
-	// protected String variabilityTypeExtends = EXTENDS_TEXT;
-	// protected String variabilityTypeReplaces = REPLACES_TEXT;
-
-	// Internal IDs for the sections.
-	protected static final int GENERAL_SECTION_ID = 1;
-
-	protected static final int DETAIL_SECTION_ID = 2;
-
-	protected static final int VERSION_SECTION_ID = 3;
-
-	protected static final int NOTATION_SECTION_ID = 4;
-
-	protected static final int TAILORING_SECTION_ID = 5;
-
-	private int warningCount = 1;
-
-	private int SECTIONS = 0;
-
-	private static int SHAPEICON_WIDTH_MAX = 32;
-
-	private static int SHAPEICON_HEIGHT_MAX = 32;
-
-	private static int NODEICON_WIDTH_MAX = 16;
-
-	private static int NODEICON_HEIGHT_MAX = 16;
-
-	protected IFilter filter;
-
-	private boolean disposed;
-
-	// To handle the i118n properly and avoid string concatenation.
-	public String generalSectionDescription;
-	public String detailSectionDescription;
-	public String tailoringSectionDescription;
-	public String notationSectionDescription;
-	public String variabilitySectionDescription;
-	public String iconSectionDescription;
-	public String versionSectionDescription;
-
-	private Label nodeIconPath;
-
-	private Label shapeIconPath;
-	
-	private String[] imageTypes = new String[] { "*.gif; *.jpg; *.png; *.ico; *.bmp" };
-	private String[] imageNames = new String[] { "Image"+ " (gif, jpeg, png, ico, bmp)" };
-
-	/**
-	 * Returns the Content filter associated with this page.
-	 */
-	protected IFilter getFilter() {
-		return filter;
-	}
-
-	/**
-	 * Returns the Content element associated with this page.
-	 */
-	protected Object getContentElement() {
-		return null;
-	}
-
-	protected void initContentProviderBase() {
-		contentProviderBase = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				ArrayList base_selected_list = new ArrayList();
-				if (contentElement.getVariabilityBasedOnElement() != null)
-					base_selected_list.add(contentElement
-							.getVariabilityBasedOnElement());
-				return base_selected_list.toArray();
-			}
-
-			public void notifyChanged(Notification notification) {
-				switch (notification.getFeatureID(VariabilityElement.class)) {
-				case UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-					super.notifyChanged(notification);
-				}
-			}
-		};
-		base_viewer.setContentProvider(contentProviderBase);
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param editor
-	 *            The parent form editor.
-	 * @param id
-	 *            The unique ID for the form page.
-	 * @param title
-	 *            The title for the form page.
-	 */
-	public DescriptionFormPage(FormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.BaseFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-
-		if (contentElement instanceof ContentCategory) {
-			contentProviderVariability = new AdapterFactoryContentProvider(
-					TngAdapterFactory.INSTANCE
-							.getNavigatorView_ComposedAdapterFactory()) {
-				public Object[] getElements(Object object) {
-					List variabilityTypesList = new ArrayList();
-					variabilityTypesList.add(VariabilityType.NA_LITERAL);
-					variabilityTypesList
-							.add(VariabilityType.CONTRIBUTES_LITERAL);
-					variabilityTypesList.add(VariabilityType.REPLACES_LITERAL);
-					return variabilityTypesList.toArray();
-				}
-			};
-		} else {
-			contentProviderVariability = new AdapterFactoryContentProvider(
-					TngAdapterFactory.INSTANCE
-							.getNavigatorView_ComposedAdapterFactory()) {
-				public Object[] getElements(Object object) {
-					List variabilityTypesList = new ArrayList();
-					variabilityTypesList.add(VariabilityType.NA_LITERAL);
-					variabilityTypesList
-							.add(VariabilityType.CONTRIBUTES_LITERAL);
-					variabilityTypesList.add(VariabilityType.EXTENDS_LITERAL);
-					variabilityTypesList.add(VariabilityType.REPLACES_LITERAL);
-					variabilityTypesList.add(VariabilityType.EXTENDS_REPLACES_LITERAL);
-					return variabilityTypesList.toArray();
-				}
-			};
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.createFormContent(IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		createEditorContent(toolkit);
-		setContextHelp();
-		setFormTextWithVariableInfo();
-		loadData();
-		addListeners();
-	}
-
-	private void setFormTextWithVariableInfo() {
-		UIHelper.setFormText(form, contentElement);
-	}
-
-	/**
-	 * @deprecated
-	 * @see TngUtil#getLabel Code moved to TngUtil.getLabel(below more specific
-	 *      method)returns label with variabilityInfo
-	 *      <code>TngUtil.getLabel(VariabilityElement object, String alternativeLabel, boolean preferBase)</code>
-	 * 
-	 */
-	public String getLabel(VariabilityElement object, String alternativeLabel,
-			boolean preferBase) {
-		String label = TngUtil.getLabel(object, alternativeLabel);
-		if (preferBase && object.getVariabilityBasedOnElement() != null) {
-			VariabilityType type = object.getVariabilityType();
-			String variabilityTxt = null;
-			if (type == VariabilityType.CONTRIBUTES_LITERAL) {
-				variabilityTxt = AuthoringUIResources
-						.contributes_to_text; 
-			} else if (type == VariabilityType.LOCAL_CONTRIBUTION_LITERAL) {
-				variabilityTxt = AuthoringUIResources
-					.localContributes_text; 			
-			} else if (type == VariabilityType.EXTENDS_LITERAL) {					
-				variabilityTxt = AuthoringUIResources
-						.extends_text;
-			} else if (type == VariabilityType.REPLACES_LITERAL) {
-				variabilityTxt = AuthoringUIResources
-						.replaces_text; 
-			} else if (type == VariabilityType.LOCAL_REPLACEMENT_LITERAL) {
-				variabilityTxt = AuthoringUIResources
-						.localReplaces_text; 
-			} else if (type == VariabilityType.EXTENDS_REPLACES_LITERAL) {
-				variabilityTxt = AuthoringUIResources
-				.extendsReplaces_text; 
-			}
-			if (variabilityTxt != null) {
-				StringBuffer strBuf = new StringBuffer(label)
-						.append(" (").append(variabilityTxt).append(" '") //$NON-NLS-1$ //$NON-NLS-2$
-						.append(
-								TngUtil.getLabel(object
-										.getVariabilityBasedOnElement(),
-										alternativeLabel)).append("'"); //$NON-NLS-1$
-				MethodPlugin basePlugin = UmaUtil.getMethodPlugin(object
-						.getVariabilityBasedOnElement());
-				if (basePlugin != null) {
-					strBuf
-							.append(" in '").append(basePlugin.getName()).append("')"); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-				label = strBuf.toString();
-			}
-		}
-
-		return label;
-	}
-
-	/**
-	 * Creates the editor tab content
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 */
-	protected void createEditorContent(FormToolkit toolkit) {
-		createFormComposites(toolkit);
-		loadSectionDescription();
-		// Create the General section.
-		if (generalSectionOn) {
-			createGeneralSection(toolkit);
-			SECTIONS++;
-		}
-
-		// Create the Detail section.
-		if (detailSectionOn) {
-			createDetailSection(toolkit);
-			SECTIONS++;
-		}
-
-		// Create the Notation section.
-		if (notationSectionOn) {
-			createNotationSection(toolkit);
-			SECTIONS++;
-		}
-
-		// Create the Tailoring Section.
-		if (tailoringSectionOn) {
-			createTailoringSection(toolkit);
-			SECTIONS++;
-		}
-
-		// Create the Version section.
-		if (versionSectionOn) {
-			createVersionSection(toolkit);
-			createVersionSectionContent();
-			SECTIONS++;
-		}
-
-		if (variabilitySectionOn) {
-			createVariabilitySection(toolkit);
-			SECTIONS++;
-		}
-
-		// Icon Section
-		if (iconSectionOn) {
-			createIconSection(toolkit);
-			createIconSectionContent();
-			SECTIONS++;
-		}
-
-		toolkit.paintBordersFor(variabilityComposite);
-		toolkit.paintBordersFor(expandedComposite);
-		toolkit.paintBordersFor(generalComposite);
-		toolkit.paintBordersFor(versionComposite);
-	}
-
-	private void createFormComposites(FormToolkit toolkit) {
-		// Create the main section (used for swapping display of
-		// sectionComposite and expandedComposite).
-		formSection = toolkit.createSection(form.getBody(), Section.NO_TITLE);
-		{
-			TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-			formSection.setLayoutData(td);
-			formSection.setLayout(new TableWrapLayout());
-		}
-
-		// Create the composite for the sections.
-		sectionComposite = toolkit.createComposite(formSection, SWT.NONE);
-		sectionComposite.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		sectionComposite.setLayout(new TableWrapLayout());
-		formSection.setClient(sectionComposite);
-
-		// Create the composite for the RichTextEditor.
-		expandedComposite = toolkit.createComposite(formSection, SWT.NONE);
-		{
-			TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-			expandedComposite.setLayoutData(td);
-			expandedComposite.setLayout(new GridLayout(2, false));
-			expandedComposite.setVisible(false);
-		}
-
-		// Add the expand/collapse hyperlink image.
-		expandLink = toolkit.createImageHyperlink(expandedComposite, SWT.NONE);
-		expandLink.setImage(AuthoringUIImages.IMG_EXPANDED);
-		expandLink.setToolTipText(AuthoringUIResources.closeRTE);
-		expandLink.setUnderlined(false);
-		expandLink.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				toggle(e);
-			}
-		});
-
-		// Add the expand/collapse hyperlink text.
-		expandLabel = createDecoratedLabel(toolkit, expandedComposite, ""); //$NON-NLS-1$
-	}
-
-	/**
-	 * Creates the General section.
-	 */
-	protected void createGeneralSection(FormToolkit toolkit) {
-		generalSection = createSection(toolkit, sectionComposite,
-				AuthoringUIText.GENERAL_INFO_SECTION_NAME,
-				getGeneralSectionDescription());
-		generalComposite = createComposite(toolkit, generalSection);
-		((GridLayout) generalComposite.getLayout()).numColumns = 4;
-		createGeneralSectionContent();
-	}
-
-	/**
-	 * Creates the General section content.
-	 */
-	private void createGeneralSectionContent() {
-		// Add the Name label and text control.
-		ctrl_name = createTextEditWithLabel3(toolkit, generalComposite,
-				AuthoringUIText.NAME_TEXT, SWT.DEFAULT, SWT.SINGLE);
-
-		// Add the Presentation name label and text control.
-		ctrl_presentation_name = createTextEditWithLabel3(toolkit,
-				generalComposite, AuthoringUIText.PRESENTATION_NAME_TEXT,
-				SWT.DEFAULT, SWT.SINGLE);
-
-		if (elementTypeOn) {
-			createLabel(toolkit, generalComposite, AuthoringUIText.TYPE_TEXT, 2);
-			ctrl_type_label = createLabel(toolkit, generalComposite, ""); //$NON-NLS-1$
-			{
-				GridData gridData = new GridData(GridData.BEGINNING);
-				gridData.horizontalSpan = 1;
-				ctrl_type_label.setBackground(Display.getCurrent()
-						.getSystemColor(19));
-				ctrl_type_label.setLayoutData(gridData);
-			}
-			if (contentElement instanceof Guidance) {
-				ctrl_type_button = toolkit.createButton(generalComposite,
-						AuthoringUIText.CHANGE_TYPE_BUTTON_TEXT, SWT.PUSH);
-				{
-					GridData gridData = new GridData(GridData.BEGINNING);
-					gridData.horizontalSpan = 1;
-					ctrl_type_button.setLayoutData(gridData);
-				}
-				if (ConvertGuidanceType
-						.getValidNewGuidanceTypes((Guidance) contentElement) == null) {
-					ctrl_type_button.setVisible(false);
-				}
-			}
-		}
-
-		if (externalIdOn) {
-			ctrl_external_id = createTextEditWithLabel3(toolkit,
-					generalComposite, AuthoringUIText.UNIQUE_ID_TEXT,
-					SWT.DEFAULT, SWT.SINGLE);
-		}
-
-		if (briefDescOn) {
-			ctrl_brief_desc = createTextEditWithLabel3(toolkit,
-					generalComposite, AuthoringUIText.BRIEF_DESCRIPTION_TEXT,
-					40, SWT.MULTI | SWT.TRAVERSE_TAB_NEXT);
-		}		
-
-		if (publishCategoryOn) {
-			ctrl_publish_categories_button = toolkit
-			.createButton(
-					generalComposite,
-					AuthoringUIText.PUBLISH_CATEGORIES_TEXT, SWT.CHECK); 
-			GridData data = new GridData();
-			data.horizontalSpan = 3;
-			ctrl_publish_categories_button.setLayoutData(data);
-		}
-	}
-
-	/**
-	 * Creates the Content Variability section.
-	 */
-	protected void createVariabilitySection(FormToolkit toolkit) {
-		variabilitySection = createSection(toolkit, sectionComposite,
-				AuthoringUIText.VARIABILITY_SECTION_NAME,
-				getVariabilitySectionDescription());
-		variabilityComposite = toolkit.createComposite(variabilitySection, SWT.NONE);
-		variabilityComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		variabilityComposite.setLayout(new GridLayout(4, false));
-		variabilitySection.setClient(variabilityComposite);
-		
-		{
-			createLabelInComposite(toolkit, variabilityComposite, AuthoringUIText.VARIABILITY_TYPE_TEXT, 2);
-			Composite textPane = createCompositeEqual(toolkit,
-					variabilityComposite, GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL, 1, 2, 4);
-			toolkit.paintBordersFor(textPane);
-			ctrl_variability = new Combo(textPane, SWT.SINGLE | SWT.FLAT | SWT.READ_ONLY);
-			viewer_variability = new ComboViewer(ctrl_variability);
-			{
-				GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-				gridData.horizontalSpan = 3;
-				gridData.heightHint = 24;
-				viewer_variability.getCombo().setLayoutData(gridData);
-			}
-			
-			createBlankLabel(toolkit, textPane, 1);
-		}
-		viewer_variability.setContentProvider(contentProviderVariability);
-		viewer_variability.setLabelProvider(labelProviderVariability);
-		viewer_variability.setInput(contentElement);
-		
-		label_base = createLabelInComposite(toolkit, variabilityComposite,
-				AuthoringUIText.BASE_ELEMENT_TEXT, 2);
-		{
-			Composite textPane = createCompositeEqual(toolkit,
-					variabilityComposite, GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL, 1, 2, 4);
-			toolkit.paintBordersFor(textPane);
-			ctrl_base = toolkit.createTable(textPane, SWT.SINGLE | SWT.READ_ONLY);
-			base_viewer = new TableViewer(ctrl_base);
-			{
-				GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-				gridData.verticalSpan = 2;
-				gridData.horizontalSpan = 3;
-				base_viewer.getTable().setLayoutData(gridData);
-			}
-			initContentProviderBase();
-			base_viewer.setLabelProvider(labelProviderBase);
-			base_viewer.setInput(contentElement);
-	
-			ctrl_base_button = toolkit.createButton(textPane,
-					AuthoringUIText.SELECT_BUTTON_TEXT, SWT.SIMPLE);
-			{
-				GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-				gridData.verticalSpan = 1;
-				gridData.horizontalSpan = 1;
-				ctrl_base_button.setLayoutData(gridData);
-			}
-			
-			createBlankLabel(toolkit, textPane, 1);
-		}
-
-		// Set focus on the Name text control.
-		Display display = form.getBody().getDisplay();
-		if (!(display == null || display.isDisposed())) {
-			display.asyncExec(new Runnable() {
-				public void run() {
-					if(ctrl_name.isDisposed()) return;
-					
-					ctrl_name.setFocus();
-					ContentDescription contentDescription = contentElement
-							.getPresentation();
-					if (contentDescription.getChangeDate() == null)
-						ctrl_name.setSelection(0, ctrl_name.getText().length());
-				}
-			});
-		}
-	}
-
-	protected void refresh(boolean editable) {
-		ctrl_name.setEditable(editable);
-		ctrl_presentation_name.setEditable(editable);
-
-		if (briefDescOn) {
-			ctrl_brief_desc.setEditable(editable);
-		}
-		if (purposeOn) {
-			ctrl_purpose.setEditable(editable);
-		}
-		if (fullDescOn) {
-			ctrl_full_desc.setEditable(editable);
-		}
-		if (keyConsiderationOn) {
-			ctrl_key.setEditable(editable);
-		}
-		if (externalIdOn) {
-			ctrl_external_id.setEditable(editable);
-		}
-		if (elementTypeOn) {
-			ctrl_type_button.setEnabled(editable);
-		}
-		if (variabilitySectionOn) {
-			ctrl_variability.setEnabled(editable);
-			ctrl_base_button.setEnabled(editable);
-			if (((IStructuredSelection) viewer_variability.getSelection())
-					.getFirstElement() == VariabilityType.NA_LITERAL) {
-				ctrl_base_button.setEnabled(false);
-			}
-		}
-		if (versionSectionOn) {
-			ctrl_change_date.setEditable(false);
-			ctrl_change_desc.setEditable(editable);
-			ctrl_authors.setEditable(editable);
-			ctrl_version.setEditable(editable);
-			copyright_button.setEnabled(editable);
-			setCopyrightButtonDeselect();
-		}
-		if (iconSectionOn) {
-			ctrl_select_shapeIcon_button.setEnabled(editable);
-			ctrl_clear_shapeIcon_button.setEnabled(editable
-					&& contentElement.getShapeicon() != null);
-			ctrl_select_nodeIcon_button.setEnabled(editable);
-			ctrl_clear_nodeIcon_button.setEnabled(editable
-					&& contentElement.getNodeicon() != null);
-		}
-		if (ctrl_expanded != null) {
-			ctrl_expanded.setEditable(editable);
-		}
-	}
-
-	/**
-	 * Create the Detail section.
-	 */
-	protected void createDetailSection(FormToolkit toolkit) {
-		detailSection = createSection(toolkit, sectionComposite,
-				AuthoringUIText.DETAIL_SECTION_NAME,
-				getDetailSectionDescription());
-		detailComposite = createComposite(toolkit, detailSection);
-		createDetailSectionContent();
-		toolkit.paintBordersFor(detailComposite);
-	}
-
-	/**
-	 * Creates the Detail section content.
-	 */
-	private void createDetailSectionContent() {
-		if (purposeOn) {
-			ctrl_purpose = createRichTextEditWithLinkForSection(toolkit,
-					detailComposite, AuthoringUIText.PURPOSE_TEXT, 40, 400,
-					DETAIL_SECTION_ID);
-		}
-
-		if (fullDescOn) {
-			ctrl_full_desc = createRichTextEditWithLinkForSection(toolkit,
-					detailComposite, AuthoringUIText.MAIN_DESCRIPTION_TEXT,
-					100, 400, DETAIL_SECTION_ID);
-
-		}
-
-		if (keyConsiderationOn) {
-			ctrl_key = createRichTextEditWithLinkForSection(toolkit,
-					detailComposite, AuthoringUIText.KEY_CONSIDERATIONS_TEXT,
-					40, 400, DETAIL_SECTION_ID);
-		}
-	}
-
-	/**
-	 * Creates the Notation section.
-	 */
-	protected void createNotationSection(FormToolkit toolkit) {
-		notationSection = createSection(toolkit, sectionComposite,
-				AuthoringUIText.NOTATION_SECTION_NAME,
-				getNotationSectionDescription());
-		notationComposite = createComposite(toolkit, notationSection);
-		createNotationSectionContent();
-		toolkit.paintBordersFor(notationComposite);
-	}
-
-	/**
-	 * Creates the Notation section content.
-	 */
-	protected void createNotationSectionContent() {
-	}
-
-	/**
-	 * Creates the Tailoring section.
-	 */
-	protected void createTailoringSection(FormToolkit toolkit) {
-		tailoringSection = createSection(toolkit, sectionComposite,
-				AuthoringUIText.TAILORING_SECTION_NAME,
-				getTailoringSectionDescription());
-		tailoringComposite = createComposite(toolkit, tailoringSection);
-		createTailoringSectionContent();
-		toolkit.paintBordersFor(tailoringComposite);
-
-	}
-
-	protected void createTailoringSectionContent() {
-	}
-
-	/**
-	 * Add listeners to monitor focus and modification changes in the edit
-	 * controls.
-	 */
-	protected void addListeners() {
-		final MethodElementEditor editor = (MethodElementEditor) getEditor();
-
-		modelModifyListener = editor.createModifyListener(contentElement);
-		contentModifyListener = editor.createModifyListener(contentElement
-				.getPresentation());
-		actionMgr = editor.getActionManager();
-
-		form.addControlListener(new ControlListener() {
-			public void controlResized(ControlEvent e) {
-				if (ctrl_expanded != null) {
-					((GridData) ctrl_expanded.getLayoutData()).heightHint = getRichTextEditorHeight();
-					((GridData) ctrl_expanded.getLayoutData()).widthHint = getRichTextEditorWidth();
-				}
-				formSection.layout(true, true);
-			}
-
-			public void controlMoved(ControlEvent e) {
-			}
-		});
-
-		form.getParent().addListener(SWT.Activate, new Listener() {
-			public void handleEvent(Event event) {
-				if(disposed) {
-					return;
-				}
-				
-				refresh(!TngUtil.isLocked(contentElement));
-				setFormTextWithVariableInfo();
-				
-				// do refresh variability and copyright viewer
-				if(variabilitySectionOn)
-					base_viewer.refresh();
-				if(versionSectionOn)
-					copyright_viewer.refresh();
-			}
-		});
-
-		if (generalSectionOn) {
-			addGeneralSectionListeners();
-		}
-
-		if (detailSectionOn) {
-			addDetailSectionListeners();
-		}
-
-		if (versionSectionOn) {
-			addVersionSectionListeners();
-		}
-
-		if (iconSectionOn) {
-			addIconSectionListeners();
-		}
-
-		viewer_variability
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-					public void selectionChanged(SelectionChangedEvent event) {
-						IStructuredSelection selection = (IStructuredSelection) viewer_variability
-								.getSelection();
-
-						if (contentElement.getVariabilityBasedOnElement() != null) {
-							boolean status = editor
-									.getActionManager()
-									.doAction(
-											IActionManager.SET,
-											contentElement,
-											UmaPackage.eINSTANCE
-													.getVariabilityElement_VariabilityType(),
-											(VariabilityType) selection
-													.getFirstElement(), -1);
-							if (!status) {
-								return;
-							}
-						}
-						if (selection.getFirstElement() == VariabilityType.NA_LITERAL) {
-							if (contentElement.getVariabilityBasedOnElement() != null) {
-								boolean status = editor
-										.getActionManager()
-										.doAction(
-												IActionManager.SET,
-												contentElement,
-												UmaPackage.eINSTANCE
-														.getVariabilityElement_VariabilityBasedOnElement(),
-												null, -1);
-								if (!status) {
-									return;
-								}
-							}
-							ctrl_base_button.setEnabled(false);
-							base_viewer.refresh();
-						} else {
-							List selectionBaseList = new ArrayList();
-							VariabilityElement base = contentElement
-									.getVariabilityBasedOnElement();
-							selectionBaseList.add(base);
-							ctrl_base_button.setEnabled(true);
-							base_viewer.refresh();
-						}
-						setFormTextWithVariableInfo();
-					}
-				});
-
-		ctrl_base_button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				filter = getFilter();
-				if (filter != null) {
-					ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-							.getWorkbench().getActiveWorkbenchWindow()
-							.getShell(), filter, getContentElement(),
-							LibraryUIText.getUIText(contentElement, true));
-					fd.setViewerSelectionSingle(true);
-					fd.setBlockOnOpen(true);
-					fd.setTitle(LibraryUIText.getUIText(contentElement, true));
-					fd.open();
-					fd.getSelectedItems();
-					if (fd.getSelectedItems().size() > 0) {
-						IStatus istatus = DependencyChecker.checkCircularDependencyAfterFilterSelection(
-								contentElement, (VariabilityElement) fd.getSelectedItems().get(0));
-						if(!istatus.isOK()) {
-							String title = AuthoringUIResources.variability_error_title;
-							AuthoringUIPlugin.getDefault().getMsgDialog().displayError(title, istatus.getMessage());						
-							return;
-						}
-						boolean status = editor
-								.getActionManager()
-								.doAction(
-										IActionManager.SET,
-										contentElement,
-										UmaPackage.eINSTANCE
-												.getVariabilityElement_VariabilityBasedOnElement(),
-										(VariabilityElement) fd
-												.getSelectedItems().get(0), -1);
-						if (!status) {
-							return;
-						}
-						status = editor
-								.getActionManager()
-								.doAction(
-										IActionManager.SET,
-										contentElement,
-										UmaPackage.eINSTANCE
-												.getVariabilityElement_VariabilityType(),
-										(VariabilityType) ((IStructuredSelection) viewer_variability
-												.getSelection())
-												.getFirstElement(), -1);
-					}
-				}
-				setFormTextWithVariableInfo();
-				if ((ctrl_base != null) && (!(ctrl_base.isDisposed())))
-					ctrl_base.redraw();
-				if ((base_viewer != null)
-						&& (!(base_viewer.getControl().isDisposed())))
-					base_viewer.refresh();
-			}
-		});
-	}
-
-	private void addGeneralSectionListeners() {
-		ctrl_name.addModifyListener(modelModifyListener);
-		ctrl_name.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getNamedElement_Name());
-			}
-
-			public void focusLost(FocusEvent e) {
-				String name = ctrl_name.getText().trim();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, contentElement.getName())) {
-					return;
-				}
-				if (name.equals(contentElement.getName()))
-					return;
-				IValidator validator = IValidatorFactory.INSTANCE
-						.createNameValidator(
-								contentElement,
-								TngAdapterFactory.INSTANCE
-										.getNavigatorView_ComposedAdapterFactory());
-				String msg = validator.isValid(name);
-				if (msg == null) {
-					name = StrUtil.makeValidFileName(ctrl_name.getText());
-					if (!name.equals(contentElement.getName())) {
-						boolean success = actionMgr.doAction(
-								IActionManager.SET, contentElement,
-								UmaPackage.eINSTANCE.getNamedElement_Name(),
-								name, -1);
-						if (!success) {
-							return;
-						}
-						if (ContentDescriptionFactory
-								.hasPresentation(contentElement)) {
-							Resource contentResource = contentElement
-									.getPresentation().eResource();
-							if (contentResource != null) {
-								((MethodElementEditor) getEditor())
-										.addResourceToAdjustLocation(contentResource);
-							}
-						}
-						setFormTextWithVariableInfo();
-						ctrl_name.setText(name);
-					}
-				} else {
-					AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayError(
-									AuthoringUIResources.renameError_title, //$NON-NLS-1$
-									msg);
-					ctrl_name.setText(contentElement.getName());
-					ctrl_name.getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							ctrl_name.setFocus();
-							ctrl_name.selectAll();
-						}
-					});
-				}
-			}
-		});
-
-		ctrl_presentation_name.addModifyListener(modelModifyListener);
-		ctrl_presentation_name.addFocusListener(new FocusAdapter() {
-			public void focusLost(FocusEvent e) {
-				String oldContent = contentElement.getPresentationName();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				String newContent = StrUtil.getPlainText(ctrl_presentation_name
-						.getText());
-				if (!newContent.equals(oldContent)) {
-					boolean success = actionMgr.doAction(IActionManager.SET,
-							contentElement, UmaPackage.eINSTANCE
-									.getDescribableElement_PresentationName(),
-							newContent, -1);
-					if (success) {
-						ctrl_presentation_name.setText(newContent);
-					}
-				}
-			}
-			
-			/* (non-Javadoc)
-			 * @see org.eclipse.swt.events.FocusAdapter#focusGained(org.eclipse.swt.events.FocusEvent)
-			 */
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget, UmaPackage.eINSTANCE.getDescribableElement_PresentationName());
-			}
-		});
-
-		if (briefDescOn) {
-			ctrl_brief_desc.addModifyListener(modelModifyListener);
-			ctrl_brief_desc.addFocusListener(new FocusAdapter() {
-				public void focusGained(FocusEvent e) {
-					((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-							UmaPackage.eINSTANCE.getMethodElement_BriefDescription());
-				}
-
-				/* (non-Javadoc)
-				 * @see org.eclipse.swt.events.FocusAdapter#focusLost(org.eclipse.swt.events.FocusEvent)
-				 */
-				public void focusLost(FocusEvent e) {
-					String oldContent = contentElement.getBriefDescription();
-					if (((MethodElementEditor) getEditor()).mustRestoreValue(
-							e.widget, oldContent)) {
-						return;
-					}
-					String newContent = StrUtil.getPlainText(ctrl_brief_desc
-							.getText());
-					if (!newContent.equals(oldContent)) {
-						boolean success = actionMgr.doAction(
-								IActionManager.SET, contentElement,
-								UmaPackage.eINSTANCE
-										.getMethodElement_BriefDescription(),
-								newContent, -1);
-						if (success) {
-							ctrl_brief_desc.setText(newContent);
-						}
-					}
-				}
-			});
-		}
-
-		if (elementTypeOn) {
-			if (contentElement instanceof Guidance) {
-				ctrl_type_button.addListener(SWT.Selection, new Listener() {
-					public void handleEvent(Event event) {
-						final MethodElementEditor editor = (MethodElementEditor) getEditor();
-						if (editor.isDirty()) {
-							String title = AuthoringUIResources.descriptionTabGuidanceWarningDialog_title; //$NON-NLS-1$
-							String message = AuthoringUIResources.descriptionTabGuidanceWarningDialog_message1; //$NON-NLS-1$
-							AuthoringUIPlugin.getDefault().getMsgDialog()
-									.displayWarning(title, message);
-						} else if (contentElement instanceof Guidance) {
-							MethodElementDeleteAction deleteAction = new MethodElementDeleteAction();
-							deleteAction.setEditingDomain(LibraryView.getView()
-									.getEditingDomain());
-							deleteAction
-									.selectionChanged(new StructuredSelection(
-											contentElement));
-							Command cmd = deleteAction
-									.createCommand(Collections
-											.singleton(contentElement));
-							if (cmd instanceof DeleteMethodElementCommand) {
-								Guidance newGuidance;
-								try {
-									newGuidance = ConvertGuidanceType
-										.convertGuidance(
-												(Guidance) contentElement,
-												null,
-												(DeleteMethodElementCommand) cmd);
-								}
-								finally {
-									try { cmd.dispose(); } catch(Exception e) {}
-								}
-								if (newGuidance != null) {
-									EditorChooser.getInstance().closeEditor(
-											contentElement);
-									EditorChooser.getInstance().openEditor(
-											newGuidance);
-								}
-							}
-						} else if (editor.isDirty()) {
-							String title = AuthoringUIResources.descriptionTabGuidanceWarningDialog_title; //$NON-NLS-1$
-							String message = AuthoringUIResources.descriptionTabGuidanceWarningDialog_message2; //$NON-NLS-1$
-							AuthoringUIPlugin.getDefault().getMsgDialog()
-									.displayWarning(title, message);
-						}
-					}
-				});
-			}
-		}
-		
-		if (publishCategoryOn)	{
-			ctrl_publish_categories_button.addSelectionListener(new SelectionAdapter() {			
-				public void widgetSelected(SelectionEvent e) {				
-					String val = new Boolean(ctrl_publish_categories_button.getSelection()).toString();				
-					MethodElementProperty prop = TngUtil.getPublishCategoryProperty(contentElement);
-										
-					if (prop == null) {			
-						prop = UmaFactory.eINSTANCE
-							.createMethodElementProperty();
-						prop.setName(TngUtil.PUBLISH_CATEGORY_PROPERTY);
-						prop.setValue(val);
-								
-						actionMgr
-						.doAction(
-								IActionManager.ADD,
-								contentElement,
-								UmaPackage.eINSTANCE
-										.getMethodElement_MethodElementProperty(),
-								prop, -1);
-					}
-					else {
-						actionMgr.doAction(IActionManager.SET,
-							prop,
-							UmaPackage.eINSTANCE
-									.getMethodElementProperty_Value(),
-							val, -1);
-					}
-				}
-			});
-		}
-	}
-
-	private void addDetailSectionListeners() {
-		if (fullDescOn) {
-			ctrl_full_desc.setModalObject(contentElement.getPresentation());
-			ctrl_full_desc.setModalObjectFeature(UmaPackage.eINSTANCE
-					.getContentDescription_MainDescription());
-			ctrl_full_desc.addModifyListener(contentModifyListener);
-			ctrl_full_desc.addListener(SWT.Deactivate, new Listener() {
-				public void handleEvent(Event e) {
-					IMethodRichText control = descExpandFlag ? ctrl_expanded
-							: ctrl_full_desc;
-					if (debug) {
-						System.out
-								.println("DescriptionFormPage.ctrl_full_desc.deactivateListener: control=" + control); //$NON-NLS-1$
-					}
-					if (!control.getModified()) {
-						if (debug) {
-							System.out
-									.println("DescriptionFormPage.ctrl_full_desc.deactivateListener: content not modified, exit"); //$NON-NLS-1$
-						}
-						return;
-					}
-					String oldContent = contentElement.getPresentation()
-							.getMainDescription();
-					if (((MethodElementEditor) getEditor()).mustRestoreValue(
-							control, oldContent)) {
-						if (debug) {
-							System.out
-									.println("DescriptionFormPage.ctrl_full_desc.deactivateListener: restored old content, exit"); //$NON-NLS-1$
-						}
-						return;
-					}
-					String newContent = control.getText();
-					if (!newContent.equals(oldContent)) {
-						if (debug) {
-							System.out
-									.println("DescriptionFormPage.ctrl_full_desc.deactivateListener: saving modified content"); //$NON-NLS-1$
-						}
-						boolean success = actionMgr
-								.doAction(
-										IActionManager.SET,
-										contentElement.getPresentation(),
-										UmaPackage.eINSTANCE
-												.getContentDescription_MainDescription(),
-										newContent, -1);
-						if (debug) {
-							System.out
-									.println("DescriptionFormPage.ctrl_full_desc.deactivateListener: saved status=" + success); //$NON-NLS-1$
-						}
-						if (success && isVersionSectionOn()) {
-							updateChangeDate();
-						}
-					}
-					if (debug) {
-						System.out
-								.println("DescriptionFormPage.ctrl_full_desc.deactivateListener: exit"); //$NON-NLS-1$
-					}
-				}
-			});
-		}
-
-		if (keyConsiderationOn) {
-			ctrl_key.setModalObject(contentElement.getPresentation());
-			ctrl_key.setModalObjectFeature(UmaPackage.eINSTANCE
-					.getContentDescription_KeyConsiderations());
-			ctrl_key.addModifyListener(contentModifyListener);
-			ctrl_key.addListener(SWT.Deactivate, new Listener() {
-				public void handleEvent(Event e) {
-					IMethodRichText control = descExpandFlag ? ctrl_expanded
-							: ctrl_key;
-					if (debug) {
-						System.out
-								.println("DescriptionFormPage.ctrl_key.deactivateListener: control=" + control); //$NON-NLS-1$
-					}
-					if (!control.getModified()) {
-						if (debug) {
-							System.out
-									.println("DescriptionFormPage.ctrl_key.deactivateListener: content not modified, exit"); //$NON-NLS-1$
-						}
-						return;
-					}
-					String oldContent = contentElement.getPresentation()
-							.getKeyConsiderations();
-					if (((MethodElementEditor) getEditor()).mustRestoreValue(
-							control, oldContent)) {
-						if (debug) {
-							System.out
-									.println("DescriptionFormPage.ctrl_key.deactivateListener: restored old content, exit"); //$NON-NLS-1$
-						}
-						return;
-					}
-					String newContent = control.getText();
-					if (!newContent.equals(oldContent)) {
-						boolean success = actionMgr
-								.doAction(
-										IActionManager.SET,
-										contentElement.getPresentation(),
-										UmaPackage.eINSTANCE
-												.getContentDescription_KeyConsiderations(),
-										newContent, -1);
-						if (debug) {
-							System.out
-									.println("DescriptionFormPage.ctrl_key.deactivateListener: saved status=" + success); //$NON-NLS-1$
-						}
-						if (success && isVersionSectionOn()) {
-							updateChangeDate();
-						}
-					}
-					if (debug) {
-						System.out
-								.println("DescriptionFormPage.ctrl_key.deactivateListener: exit"); //$NON-NLS-1$
-					}
-				}
-			});
-		}
-	}
-
-	/**
-	 * Initializes the controls with data from the model.
-	 */
-	protected void loadData() {
-		if (generalSectionOn) {
-			loadGeneralSectionData();
-		}
-		if (detailSectionOn) {
-			loadDetailSectionData();
-		}
-		if (notationSectionOn) {
-			loadNotationSectionData();
-		}
-		if (tailoringSectionOn) {
-			loadTailoringSectionData();
-		}
-		if (versionSectionOn) {
-			loadVersionSectionData();
-		}
-		if (iconSectionOn) {
-			loadIconSectionData();
-		}
-		if (variabilitySectionOn) {
-			variabilitySectionData();
-		}
-		form.getBody().layout(true, true);
-	}
-
-	private void loadGeneralSectionData() {
-		String name = contentElement.getName();
-		String presentationName = (contentElement).getPresentationName();
-		ctrl_name.setText(name == null ? "" : name); //$NON-NLS-1$
-		ctrl_presentation_name
-				.setText(presentationName == null ? "" : presentationName); //$NON-NLS-1$
-
-		if (elementTypeOn) {
-			// String type = contentElement.getType().getName();
-			String type = LibraryUIText.getUIText(contentElement);
-			ctrl_type_label.setText(type == null ? "" : type); //$NON-NLS-1$
-		}
-		if (briefDescOn) {
-			String brief_desc = contentElement.getBriefDescription();
-			ctrl_brief_desc.setText(brief_desc == null ? "" : brief_desc); //$NON-NLS-1$
-		}
-		
-		if (publishCategoryOn) {
-			MethodElementProperty prop = TngUtil.getPublishCategoryProperty(contentElement);
-			if (prop != null) {
-				String val = prop.getValue();
-				ctrl_publish_categories_button.setSelection((new Boolean(val)).booleanValue());
-			}
-		}
-	}
-
-	private void loadDetailSectionData() {
-		if (fullDescOn) {
-			String full_desc = (contentElement.getPresentation())
-					.getMainDescription();
-			ctrl_full_desc.setText(full_desc == null ? "" : full_desc); //$NON-NLS-1$
-		}
-		if (keyConsiderationOn) {
-			String keyConsiderations = (contentElement.getPresentation())
-					.getKeyConsiderations();
-			ctrl_key
-					.setText(keyConsiderations == null ? "" : keyConsiderations); //$NON-NLS-1$
-		}
-	}
-	
-	
-
-	private void loadTailoringSectionData() {
-	}
-
-	private void loadNotationSectionData() {
-	}
-
-	private void variabilitySectionData() {
-		VariabilityType variabilityType = contentElement.getVariabilityType();
-		List selectionVariabilityList = new ArrayList();
-		selectionVariabilityList.add(variabilityType);
-		IStructuredSelection newVariabilitySelection = new StructuredSelection(
-				selectionVariabilityList);
-		viewer_variability.setSelection(newVariabilitySelection, true);
-	}
-
-	/**
-	 * Toggle Description control to expand and control state.
-	 */
-	protected void toggle(HyperlinkEvent e) {
-		if (ctrl_expanded == null) {
-			ctrl_expanded = createRichTextEditor(toolkit, expandedComposite,
-					SWT.MULTI | SWT.WRAP | SWT.V_SCROLL, GridData.FILL_BOTH,
-					getRichTextEditorHeight(), getRichTextEditorWidth(), 2,
-					expandLabel);
-			ctrl_expanded.addModifyListener(contentModifyListener);
-		}
-
-		if (descExpandFlag) {
-			expandedComposite.setVisible(false);
-			sectionComposite.setVisible(true);
-			formSection.setClient(sectionComposite);
-			enableSections(true);
-			IMethodRichText richText = getActiveRichTextControl();
-			richText.setText(ctrl_expanded.getText());
-			richText.setFindReplaceAction(ctrl_expanded.getFindReplaceAction());
-			for (Iterator i = richText.getListeners(); i.hasNext();) {
-				RichTextListener listener = (RichTextListener) i.next();
-				ctrl_expanded.removeListener(listener.getEventType(), listener
-						.getListener());
-			}
-			if (ctrl_expanded.getModified()) {
-				((MethodElementEditor) getEditor())
-						.saveModifiedRichText(ctrl_expanded);
-			}
-			richText.setFocus();
-		} else {
-			sectionComposite.setVisible(false);
-			expandedComposite.setVisible(true);
-			formSection.setClient(expandedComposite);
-			enableSections(false);
-			((Label)expandLabel.getControl()).setText((String) ((ImageHyperlink) e.getSource())
-					.getData("Title")); //$NON-NLS-1$
-			IMethodRichText richText = (IMethodRichText) e.getHref();
-			ctrl_expanded.setText(richText.getText());
-			ctrl_expanded.setModalObject(richText.getModalObject());
-			ctrl_expanded.setModalObjectFeature(richText
-					.getModalObjectFeature());
-			ctrl_expanded.setFindReplaceAction(richText.getFindReplaceAction());
-			for (Iterator i = richText.getListeners(); i.hasNext();) {
-				RichTextListener listener = (RichTextListener) i.next();
-				ctrl_expanded.addListener(listener.getEventType(), listener
-						.getListener());
-			}
-			boolean editable = !TngUtil.isLocked(contentElement);
-			ctrl_expanded.setEditable(editable);
-			if (editable) {
-				ctrl_expanded.setFocus();
-			}
-			setActiveRichTextControl(richText);
-		}
-		form.getBody().layout(true, true);
-		descExpandFlag = !descExpandFlag;
-	}
-
-	/**
-	 * Set the active rich text control.
-	 */
-	private void setActiveRichTextControl(IMethodRichText ctrl) {
-		activeControl = ctrl;
-	}
-
-	/**
-	 * Returns the active rich text control.
-	 */
-	private IMethodRichText getActiveRichTextControl() {
-		return activeControl;
-	}
-
-	public void setBriefDescOn(boolean briefDescOn) {
-		this.briefDescOn = briefDescOn;
-	}
-
-	public void setFullDescOn(boolean fullDescOn) {
-		this.fullDescOn = fullDescOn;
-	}
-
-	public void setKeyConsiderationOn(boolean keyConsiderationOn) {
-		this.keyConsiderationOn = keyConsiderationOn;
-	}
-
-	/**
-	 * @param elementTypeOn
-	 *            The elementTypeOn to set.
-	 */
-	public void setElementTypeOn(boolean elementTypeOn) {
-		this.elementTypeOn = elementTypeOn;
-	}
-
-	/**
-	 * @return Returns the anyAttributeModified.
-	 */
-	public boolean isAnyAttributeModified() {
-		return anyAttributeModified;
-	}
-
-	/**
-	 * Set this if any attribute is modified. This is required for the change
-	 * date field in version section.
-	 * 
-	 * @param anyAttributeModified
-	 *            The anyAttributeModified to set.
-	 */
-	public void setAnyAttributeModified(boolean anyAttributeModified) {
-		this.anyAttributeModified = anyAttributeModified;
-	}
-
-	/**
-	 * @return Returns the versionSectionOn.
-	 */
-	public boolean isVersionSectionOn() {
-		return versionSectionOn;
-	}
-
-	/**
-	 * @param versionSectionOn
-	 *            The versionSectionOn to set.
-	 */
-	public void setVersionSectionOn(boolean versionSectionOn) {
-		this.versionSectionOn = versionSectionOn;
-	}
-
-	/**
-	 * Creates the Version Information section.
-	 */
-	private void createVersionSection(FormToolkit toolkit) {
-		versionSection = toolkit.createSection(sectionComposite,
-				Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED
-						| Section.TITLE_BAR);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		versionSection.setLayoutData(td);
-		versionSection.setText(AuthoringUIText.VERSION_INFO_SECTION_NAME);
-		versionSection.setDescription(getVersionSectionDescription());
-		versionSection.setLayout(new GridLayout());
-
-		versionComposite = toolkit.createComposite(versionSection);
-		versionComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		versionComposite.setLayout(new GridLayout(4, false));
-		versionSection.setClient(versionComposite);
-	}
-
-	/**
-	 * Create the Version section content.
-	 */
-	private void createVersionSectionContent() {
-		ContentDescription contentDescription = contentElement.getPresentation();
-		String fillText = (contentDescription.getVersion() == null ? "" : contentDescription.getVersion());
-		ctrl_version = createTextEditWithLabel4(toolkit, versionComposite,
-				AuthoringUIText.VERSION_TEXT, SWT.DEFAULT, SWT.SINGLE, fillText);
-		
-		fillText = contentDescription.getChangeDate() == null ? "" //$NON-NLS-1$
-				: DateFormat.getDateInstance(DateFormat.FULL).format(
-						contentDescription.getChangeDate());
-		ctrl_change_date = createTextEditWithLabel4(toolkit, versionComposite,
-				AuthoringUIText.CHANGE_DATE_TEXT, SWT.DEFAULT, SWT.SINGLE, fillText);
-		ctrl_change_date.setEditable(false);
-
-		{
-			createLabelInComposite(toolkit, versionComposite, AuthoringUIText.CHANGE_DESCRIPTION_TEXT, 2);
-			Composite textPane = createCompositeEqual(toolkit,
-					versionComposite, GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL, 1, 2, 4);
-			toolkit.paintBordersFor(textPane);
-			
-			ctrl_change_desc = toolkit.createText(textPane, "", SWT.MULTI | SWT.WRAP | SWT.V_SCROLL); //$NON-NLS-1$
-			{
-				GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL);
-				gridData.heightHint = 40;
-				gridData.horizontalSpan = 3;
-				gridData.verticalSpan = 2;
-				ctrl_change_desc.setLayoutData(gridData);
-			}
-
-			view_history_button = toolkit.createButton(textPane, AuthoringUIText.VIEW_HISTORY_BUTTON_TEXT, SWT.PUSH);
-			{
-				GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL);
-				gridData.horizontalSpan = 1;
-				view_history_button.setLayoutData(gridData);
-			}
-			
-			createBlankLabel(toolkit, textPane, 1);
-		}
-
-		{
-			createLabelInComposite(toolkit, versionComposite, AuthoringUIText.AUTHORS_TEXT, 2);
-			Composite textPane = createCompositeEqual(toolkit,
-					versionComposite, GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL, 1, 2, 4);
-			toolkit.paintBordersFor(textPane);
-			
-			ctrl_authors = toolkit.createText(textPane, "", SWT.MULTI); //$NON-NLS-1$
-			{
-				GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL);
-				gridData.heightHint = 40;
-				gridData.horizontalSpan = 4;
-				gridData.verticalSpan = 2;
-				ctrl_authors.setLayoutData(gridData);
-			}
-		}
-
-		{
-			label_copyright = createLabelInComposite(toolkit, versionComposite,
-					AuthoringUIText.COPYRIGHT_TEXT, 2);
-			{
-				Composite textPane = createCompositeEqual(toolkit,
-						versionComposite, GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL, 1, 2, 4);
-				toolkit.paintBordersFor(textPane);
-				ctrl_copyright = createTable(toolkit, textPane, SWT.SINGLE
-						| SWT.READ_ONLY, GridData.FILL_HORIZONTAL | GridData.BEGINNING,
-						5, 400, 1, 1);
-				{
-					GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-							| GridData.BEGINNING);
-					gridData.heightHint = 24;
-					gridData.horizontalSpan = 3;
-					gridData.verticalSpan = 2;
-					ctrl_copyright.setLayoutData(gridData);
-				}
-		
-				copyright_viewer = new TableViewer(ctrl_copyright);
-				initContentProviderCopyright();
-				copyright_viewer.setLabelProvider(copyrightLabelProviderBase);
-				copyright_viewer.setInput(contentElement);
-				copyright_button = toolkit.createButton(textPane,
-						AuthoringUIText.SELECT_BUTTON_TEXT, SWT.SIMPLE);
-				{
-					GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL);
-					gridData.horizontalSpan = 1;
-					copyright_button.setLayoutData(gridData);
-				}
-				copyright_button_deselect = toolkit.createButton(textPane,
-						AuthoringUIText.DESELECT_BUTTON_TEXT, SWT.SIMPLE);
-				{
-					GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL);
-					gridData.horizontalSpan = 1;
-					copyright_button_deselect.setLayoutData(gridData);
-				}
-			}
-	
-			setCopyrightButtonDeselect();
-		}
-
-		// Create the expanded composite.
-		toolkit.paintBordersFor(versionComposite);
-	}
-
-	private void initContentProviderCopyright() {
-		copyrightContentProvider = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				List list = new ArrayList();
-				if (contentElement.getPresentation().getCopyrightStatement() != null) {
-					list.add(contentElement.getPresentation()
-							.getCopyrightStatement());
-				}
-				return list.toArray();
-			}
-
-			public void notifyChanged(Notification notification) {
-			}
-		};
-		copyright_viewer.setContentProvider(copyrightContentProvider);
-	}
-
-	protected void addVersionSectionListeners() {
-		ctrl_version.addModifyListener(contentModifyListener);
-		ctrl_version.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getMethodUnit_Version());
-			}
-
-			public void focusLost(FocusEvent e) {
-				String oldContent = contentElement.getPresentation()
-						.getVersion();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				String newContent = StrUtil
-						.getPlainText(ctrl_version.getText());
-				if (!newContent.equals(oldContent)) {
-					boolean status = actionMgr.doAction(IActionManager.SET,
-							contentElement.getPresentation(),
-							UmaPackage.eINSTANCE.getMethodUnit_Version(),
-							newContent, -1);
-					if (status) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-
-		ctrl_authors.addModifyListener(contentModifyListener);
-		ctrl_authors.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getMethodUnit_Authors());
-			}
-
-			public void focusLost(FocusEvent e) {
-				String oldContent = contentElement.getPresentation()
-						.getAuthors();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				String newContent = StrUtil
-						.getPlainText(ctrl_authors.getText());
-				if (!newContent.equals(oldContent)) {
-					boolean status = actionMgr.doAction(IActionManager.SET,
-							contentElement.getPresentation(),
-							UmaPackage.eINSTANCE.getMethodUnit_Authors(),
-							newContent, -1);
-					if (status) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-
-		copyright_button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IFilter filter = new ContentFilter() {
-					protected boolean childAccept(Object obj) {
-						if (obj instanceof Guidance) {
-							return (obj instanceof SupportingMaterial);
-						}
-						return false;
-					}
-				};
-				List alreadyExsting = new ArrayList();
-				if (ctrl_copyright.getItemCount() > 0) {
-					TableItem item = ctrl_copyright.getItems()[0];
-					if (item.getData() != null)
-						alreadyExsting.add(item.getData());
-				}
-				ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-						.getWorkbench().getActiveWorkbenchWindow().getShell(),
-						filter, contentElement,
-						FilterConstants.SUPPORTING_MATERIALS, alreadyExsting);
-				fd.setViewerSelectionSingle(true);
-				fd.setBlockOnOpen(true);
-				fd.setTitle(FilterConstants.SUPPORTING_MATERIALS);
-				fd.open();
-				fd.getSelectedItems();
-				if (fd.getSelectedItems().size() > 0) {
-					boolean status = actionMgr.doAction(IActionManager.SET,
-							contentElement.getPresentation(),
-							UmaPackage.eINSTANCE
-									.getMethodUnit_CopyrightStatement(),
-							(SupportingMaterial) fd.getSelectedItems().get(0),
-							-1);
-					if (!status) {
-						return;
-					}
-				}
-				copyright_viewer.refresh();
-				setCopyrightButtonDeselect();
-			}
-		});
-
-		ctrl_change_desc.addModifyListener(contentModifyListener);
-		ctrl_change_desc.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getMethodUnit_ChangeDescription());
-			}
-
-			public void focusLost(FocusEvent e) {
-				String oldContent = contentElement.getPresentation()
-						.getChangeDescription();
-				char delimiter = AuthoringUIResources.ChangeHistoryDialog_delimiter.charAt(0); //$NON-NLS-1$
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				String newContent = ctrl_change_desc.getText();
-
-				newContent = newContent.replace(delimiter, ' '); //$NON-NLS-1$ //$NON-NLS-2$
-
-				if (!newContent.equals(lastChangeHistory)) {
-					lastChangeHistory = newContent;
-					if ((oldContent != null)
-							&& (!(StrUtil.isBlank(oldContent)))) {
-						newContent = oldContent + delimiter + newContent;
-					}
-
-					actionMgr.doAction(IActionManager.SET, contentElement
-							.getPresentation(), UmaPackage.eINSTANCE
-							.getMethodUnit_ChangeDescription(), newContent, -1);
-				}
-			}
-		});
-
-		view_history_button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-
-				ChangeHistoryDialog dlg = new ChangeHistoryDialog(PlatformUI
-						.getWorkbench().getActiveWorkbenchWindow().getShell(),
-						contentElement);
-				dlg.open();
-			}
-		});
-
-		copyright_button_deselect.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean status = actionMgr.doAction(IActionManager.SET,
-						contentElement.getPresentation(), UmaPackage.eINSTANCE
-								.getMethodUnit_CopyrightStatement(), null, -1);
-				if (status) {
-					copyright_viewer.refresh();
-					setCopyrightButtonDeselect();
-				}
-			}
-		});
-	}
-
-	/*
-	 * update the change date if any attribute is modified.
-	 */
-	protected void updateChangeDate() {
-
-		Date changeDate = contentElement.getPresentation().getChangeDate();
-		DateFormat df = DateFormat.getDateInstance(DateFormat.FULL);
-
-		String oldContent = ""; //$NON-NLS-1$
-		if (changeDate != null) {
-			oldContent = df.format(changeDate);
-		}
-
-		Date currentDate = new Date();
-		String newContent = df.format(currentDate);
-		if (!newContent.equals(oldContent)) {
-			boolean status = actionMgr.doAction(IActionManager.SET,
-					contentElement.getPresentation(), UmaPackage.eINSTANCE
-							.getMethodUnit_ChangeDate(), currentDate, -1);
-			if (!status) {
-				return;
-			} else {
-				ctrl_change_date.setText(newContent);
-			}
-		}
-	}
-
-	protected void loadVersionSectionData() {
-
-		ContentDescription contentDescription = contentElement
-				.getPresentation();
-		ctrl_version
-				.setText(contentDescription.getVersion() == null ? "" : contentDescription.getVersion()); //$NON-NLS-1$
-		ctrl_authors
-				.setText(contentDescription.getAuthors() == null ? "" : contentDescription.getAuthors()); //$NON-NLS-1$
-		ctrl_change_desc.setText(""); //$NON-NLS-1$
-		ctrl_change_date
-				.setText(contentDescription.getChangeDate() == null ? "" //$NON-NLS-1$
-						: DateFormat.getDateInstance(DateFormat.FULL).format(
-								contentDescription.getChangeDate()));
-	}
-
-	/**
-	 * Toggle Description control to expand and control state
-	 */
-	protected void toggle(HyperlinkEvent e, int id) {
-		// TODO- we should combine these methods into one. One way to do it,
-		// dispoing
-		// ctrl_expanded every time it collapses and creating it when we expand.
-		// At present, there is no method to dispose
-		toggle(e);
-	}
-
-	/**
-	 * @return Returns the iconSectionOn.
-	 */
-	public boolean isIconSectionOn() {
-		return iconSectionOn;
-	}
-
-	/**
-	 * @param iconSectionOn
-	 *            The iconSectionOn to set.
-	 */
-	public void setIconSectionOn(boolean iconSectionOn) {
-		this.iconSectionOn = iconSectionOn;
-	}
-
-	/**
-	 * Creates the Icon section.
-	 */
-	protected void createIconSection(FormToolkit toolkit) {
-		iconSection = toolkit.createSection(sectionComposite,
-				Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED
-						| Section.TITLE_BAR);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		iconSection.setLayoutData(td);
-		iconSection.setText(AuthoringUIText.ICON_SECTION_NAME);
-		iconSection.setDescription(getIconSectionDescription());
-		iconSection.setLayout(new GridLayout());
-
-		iconComposite = toolkit.createComposite(iconSection);
-		iconComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		iconComposite.setLayout(new GridLayout(3, true));
-		iconSection.setClient(iconComposite);
-	}
-	private void createIconSectionContent() {
-		Composite shapeIconComposite = createComposite(toolkit, iconComposite,
-				1);
-		shapeIconComposite.setLayoutData(new GridData());
-		shapeIconComposite.setLayout(new GridLayout(2, true));
-//		createLabel(
-//				toolkit,
-//				shapeIconComposite,
-//				AuthoringUIResources.DescriptionFormPage_ShapeIconPreview_Label, 2); //$NON-NLS-1$
-		// No wrap needed
-		createLabelWithNoWrap(
-				toolkit,
-				shapeIconComposite,
-				AuthoringUIResources.DescriptionFormPage_ShapeIconPreview_Label,
-				GridData.BEGINNING,
-				2); 
-		
-		pane1 = new Canvas(shapeIconComposite, SWT.BORDER);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-
-			gridData.heightHint = 60;
-			gridData.widthHint = 60;
-			gridData.verticalSpan = 1;
-			gridData.horizontalSpan = 1;
-			pane1.setLayoutData(gridData);
-			pane1.setBackground(ColorConstants.lightGray);
-		}
-		// pane1.setSize(30,30);
-		Composite pane2 = createCompositeForButtons(toolkit, shapeIconComposite);
-		ctrl_select_shapeIcon_button = toolkit
-				.createButton(
-						pane2,
-						AuthoringUIResources.DescriptionFormPage_ShapeIconPreview_SelectButtonLabel, SWT.NONE); //$NON-NLS-1$
-		ctrl_clear_shapeIcon_button = toolkit
-				.createButton(
-						pane2,
-						AuthoringUIResources.DescriptionFormPage_ShapeIconPreview_ClearButtonLabel, SWT.NONE); //$NON-NLS-1$
-		if (contentElement.getShapeicon() == null)
-			ctrl_clear_shapeIcon_button.setEnabled(false);
-		else
-			ctrl_clear_shapeIcon_button.setEnabled(true);
-
-		Composite nodeIconComposite = createComposite(toolkit, iconComposite, 1);
-		nodeIconComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		nodeIconComposite.setLayout(new GridLayout(2, false));
-//		createLabel(
-//				toolkit,
-//				nodeIconComposite,
-//				AuthoringUIResources.DescriptionFormPage_NodeIconPreview_Label, 2); //$NON-NLS-1$
-		// No wrap need for 
-		createLabelWithNoWrap(
-				toolkit,
-				nodeIconComposite,
-				AuthoringUIResources.DescriptionFormPage_NodeIconPreview_Label,
-				GridData.BEGINNING,
-				2); 
-		pane3 = new Canvas(nodeIconComposite, SWT.BORDER);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-
-			gridData.heightHint = 40;
-			gridData.widthHint = 40;
-			gridData.verticalSpan = 1;
-			gridData.horizontalSpan = 1;
-			pane3.setLayoutData(gridData);
-			pane3.setBackground(ColorConstants.lightGray);
-		}
-		Composite pane4 = createCompositeForButtons(toolkit, nodeIconComposite);
-		ctrl_select_nodeIcon_button = toolkit
-				.createButton(
-						pane4,
-						AuthoringUIResources.DescriptionFormPage_NodeIconPreview_SelectButtonLabel, SWT.NONE); //$NON-NLS-1$
-		ctrl_clear_nodeIcon_button = toolkit
-				.createButton(
-						pane4,
-						AuthoringUIResources.DescriptionFormPage_NodeIconPreview_ClearButtonLabel, SWT.NONE); //$NON-NLS-1$
-		if (contentElement.getNodeicon() == null)
-			ctrl_clear_nodeIcon_button.setEnabled(false);
-		else
-			ctrl_clear_nodeIcon_button.setEnabled(true);
-		
-		new Label(iconComposite, SWT.NONE);
-		shapeIconPath = createLabelWithNoWrap(toolkit,
-				iconComposite, "", GridData.BEGINNING, 1);
-		nodeIconPath = createLabelWithNoWrap(toolkit,
-				iconComposite, "", GridData.BEGINNING, 2);
-//			new Label(nodeIconComposite, SWT.NONE);
-//		GridData data = new GridData(GridData.BEGINNING);
-//		data.horizontalSpan =2;
-//		nodeIconPath.setLayoutData(data);
-
-		toolkit.paintBordersFor(pane1);
-		toolkit.paintBordersFor(pane2);
-		toolkit.paintBordersFor(pane3);
-		toolkit.paintBordersFor(pane4);
-	}
-
-	protected void addIconSectionListeners() {
-
-		ctrl_select_shapeIcon_button
-				.addSelectionListener(new SelectionAdapter() {
-//					File libDirFile = new File(LibraryService.getInstance()
-//							.getCurrentMethodLibraryPath());
-
-					public void widgetSelected(SelectionEvent e) {
-						java.net.URI shapeIconUri = null;
-						FileDialog fileChooser = new FileDialog(Display
-								.getCurrent().getActiveShell(), SWT.OPEN);
-						fileChooser.setText(AuthoringUIResources.DescriptionFormPage_IconFileChooserDialog_title); //$NON-NLS-1$
-						fileChooser.setFilterExtensions(imageTypes); //$NON-NLS-1$
-						fileChooser.setFilterNames(imageNames); //$NON-NLS-1$
-						String imageFile = null;
-						String filename = null;
-						while (true) {
-							imageFile = fileChooser.open();
-							filename = fileChooser.getFileName();
-							if (imageFile != null) {
-								if (new File(imageFile).exists()) {
-//									ImageData imageData = new ImageData(
-//											imageFile);
-//									if (imageData.width > SHAPEICON_WIDTH_MAX
-//											|| imageData.height > SHAPEICON_HEIGHT_MAX) {
-//										// msg user - image too big
-//										AuthoringUIPlugin
-//												.getDefault()
-//												.getMsgDialog()
-//												.displayError(
-//														AuthoringUIResources.forms_DescriptionFormPage_imageTooBigDialog_title, //$NON-NLS-1$ 
-//														MessageFormat
-//																.format(
-//																		AuthoringUIResources.forms_DescriptionFormPage_imageTooBigDialog_template, //$NON-NLS-1$
-//																		new Object[] {
-//																				imageFile,
-//																				new Integer(
-//																						SHAPEICON_WIDTH_MAX),
-//																				new Integer(
-//																						SHAPEICON_HEIGHT_MAX) }));
-//									} else {
-//										break;
-//									}
-									break;
-								} else {
-									// msg user - file doesn't exist
-									AuthoringUIPlugin
-											.getDefault()
-											.getMsgDialog()
-											.displayError(
-													AuthoringUIResources.forms_DescriptionFormPage_imageNotFoundDialog_title, //$NON-NLS-1$ 
-													MessageFormat
-															.format(
-																	AuthoringUIResources.forms_DescriptionFormPage_imageNotFoundDialog_template, //$NON-NLS-1$ 
-																	new Object[] { imageFile }));
-								}
-							} else {
-								return;
-							}
-						}
-						if (imageFile != null && imageFile.length() > 0) {
-							try {
-								String url = copyResourceToLib(filename,
-										fileChooser.getFilterPath(),
-										contentElement);
-								if (url != null) {
-									File file = new File(url);
-									shapeIconUri = new URI(NetUtil
-											.encodeFileURL(FileUtil
-													.getRelativePath(file,
-															new File(getPluginPath(contentElement)))));
-									if (shapeIconUri != null) {
-										boolean status = actionMgr
-												.doAction(
-														IActionManager.SET,
-														contentElement,
-														UmaPackage.eINSTANCE
-																.getDescribableElement_Shapeicon(),
-														shapeIconUri, -1);
-										if (!status)
-											return;
-									}
-									shapeImage = new Image(
-											Display.getCurrent(), file
-													.getAbsolutePath());
-									shapeIconPath.setText(shapeIconUri.getPath());
-								}
-							} catch (Exception ex) {
-								shapeIconUri = null;
-								shapeImage = null;
-								AuthoringUIPlugin.getDefault().getLogger()
-										.logError(ex);
-								if (ex instanceof IOException) {
-									AuthoringUIPlugin
-											.getDefault()
-											.getMsgDialog()
-											.displayError(
-													AuthoringUIResources.err_copying_file_title, //$NON-NLS-1$
-													AuthoringUIResources.err_copying_file_error, //$NON-NLS-1$
-													AuthoringUIResources.err_copying_file_reason, //$NON-NLS-1$
-													ex.getMessage());
-								} else {
-									AuthoringUIPlugin
-											.getDefault()
-											.getMsgDialog()
-											.displayError(
-													AuthoringUIResources.err_processing_file_title, //$NON-NLS-1$
-													AuthoringUIResources.err_processing_file_description, ex); //$NON-NLS-1$
-								}
-							}
-						}
-						if (shapeImage != null) {
-							pane1.redraw();
-							ctrl_clear_shapeIcon_button.setEnabled(true);
-						} else {
-							ctrl_clear_shapeIcon_button.setEnabled(false);
-						}
-
-					}
-				});
-
-		ctrl_clear_shapeIcon_button
-				.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						boolean status = actionMgr.doAction(IActionManager.SET,
-								contentElement, UmaPackage.eINSTANCE
-										.getDescribableElement_Shapeicon(),
-								null, -1);
-						if (!status)
-							return;
-						pane1.redraw();
-						ctrl_clear_shapeIcon_button.setEnabled(false);
-						shapeIconPath.setText("");
-					}
-				});
-
-		ctrl_select_nodeIcon_button
-				.addSelectionListener(new SelectionAdapter() {
-//					File libDirFile = new File(LibraryService.getInstance()
-//							.getCurrentMethodLibraryPath());
-
-					public void widgetSelected(SelectionEvent e) {
-						java.net.URI nodeIconUri = null;
-						FileDialog fileChooser = new FileDialog(Display
-								.getCurrent().getActiveShell(), SWT.OPEN);
-						fileChooser.setText(AuthoringUIResources.DescriptionFormPage_IconFileChooserDialog_title); //$NON-NLS-1$
-						fileChooser.setFilterExtensions(imageTypes); //$NON-NLS-1$
-						fileChooser.setFilterNames(imageNames); //$NON-NLS-1$
-						String imageFile = null;
-						String filename = null;
-						while (true) {
-							imageFile = fileChooser.open();
-							filename = fileChooser.getFileName();
-							if (imageFile != null) {
-								if (new File(imageFile).exists()) {
-									ImageData imageData = new ImageData(
-											imageFile);
-									if (imageData.width > NODEICON_WIDTH_MAX
-											|| imageData.height > NODEICON_HEIGHT_MAX) {
-										// msg user - image too big
-										AuthoringUIPlugin
-												.getDefault()
-												.getMsgDialog()
-												.displayError(
-														AuthoringUIResources.forms_DescriptionFormPage_imageTooBigDialog_title, //$NON-NLS-1$ 
-														MessageFormat
-																.format(
-																		AuthoringUIResources.forms_DescriptionFormPage_imageTooBigDialog_template, //$NON-NLS-1$
-																		new Object[] {
-																				imageFile,
-																				new Integer(
-																						NODEICON_WIDTH_MAX),
-																				new Integer(
-																						NODEICON_HEIGHT_MAX) }));
-									} else {
-										break;
-									}
-								} else {
-									// msg user - file doesn't exist
-									AuthoringUIPlugin
-											.getDefault()
-											.getMsgDialog()
-											.displayError(
-													AuthoringUIResources.forms_DescriptionFormPage_imageNotFoundDialog_title, //$NON-NLS-1$
-													MessageFormat
-															.format(
-																	AuthoringUIResources.forms_DescriptionFormPage_imageNotFoundDialog_template, //$NON-NLS-1$
-																	new Object[] { imageFile }));
-								}
-							} else {
-								return;
-							}
-						}
-						if (imageFile != null && imageFile.length() > 0) {
-							try {
-								String url = copyResourceToLib(filename,
-										fileChooser.getFilterPath(),
-										contentElement);
-								if (url != null) {
-									File file = new File(url);
-									nodeIconUri = new URI(NetUtil
-											.encodeFileURL(FileUtil
-													.getRelativePath(file,
-															new File(getPluginPath(contentElement)))));
-									if (nodeIconUri != null) {
-										boolean status = actionMgr
-												.doAction(
-														IActionManager.SET,
-														contentElement,
-														UmaPackage.eINSTANCE
-																.getDescribableElement_Nodeicon(),
-														nodeIconUri, -1);
-										if (!status)
-											return;
-									}
-									nodeImage = new Image(Display.getCurrent(),
-											file.getAbsolutePath());
-									nodeIconPath.setText(nodeIconUri.getPath());
-								}
-							} catch (Exception ex) {
-								nodeIconUri = null;
-								nodeImage = null;
-								AuthoringUIPlugin.getDefault().getLogger()
-										.logError(ex);
-								if (ex instanceof IOException) {
-									AuthoringUIPlugin
-											.getDefault()
-											.getMsgDialog()
-											.displayError(
-													AuthoringUIResources.err_copying_file_title, //$NON-NLS-1$
-													AuthoringUIResources.err_copying_file_error, //$NON-NLS-1$
-													AuthoringUIResources.err_copying_file_reason, //$NON-NLS-1$
-													ex.getMessage());
-
-								} else {
-									AuthoringUIPlugin
-											.getDefault()
-											.getMsgDialog()
-											.displayError(
-													AuthoringUIResources.err_processing_file_title, //$NON-NLS-1$
-													AuthoringUIResources.err_processing_file_description, ex); //$NON-NLS-1$
-								}
-							}
-						}
-						if (nodeImage != null) {
-							pane3.redraw();
-							ctrl_clear_nodeIcon_button.setEnabled(true);
-						} else {
-							ctrl_clear_nodeIcon_button.setEnabled(false);
-						}
-					}
-				});
-
-		ctrl_clear_nodeIcon_button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean status = actionMgr.doAction(IActionManager.SET,
-						contentElement, UmaPackage.eINSTANCE
-								.getDescribableElement_Nodeicon(), null, -1);
-				if (!status)
-					return;
-				pane3.redraw();
-				ctrl_clear_nodeIcon_button.setEnabled(false);
-				nodeIconPath.setText("");
-			}
-		});
-	}
-
-	/**
-	 * Copies the selected shapeNodeIcon and nodeIcon to resources folder of
-	 * content element. Prompts to overwrite if file already exists.
-	 * @param sFileName
-	 * @param sFilePath
-	 * @param methodElement
-	 * @return
-	 * @throws IOException
-	 */
-	protected String copyResourceToLib(String sFileName, String sFilePath,
-			MethodElement methodElement) throws IOException {
-		File libDirs = new File(LibraryService.getInstance().getCurrentMethodLibraryPath());
-		String resourceLoc = libDirs.getAbsolutePath() + File.separator
-				+ MethodLibraryPersister.getResourcePath(methodElement);
-
-		File sFile = new File(sFilePath + File.separator + sFileName);
-		StringBuffer resourceFile = new StringBuffer(resourceLoc).append(
-				File.separator).append(sFileName);
-		File formatFile = new File(resourceFile.toString());
-		
-		if (formatFile.exists()) {
-			RenameFileConflictDialog dialog = new RenameFileConflictDialog(
-					ctrl_select_nodeIcon_button.getShell());
-			dialog
-					.setMessageStr(MessageFormat
-							.format(
-									AuthoringUIResources.DescriptionFormPage_iconSection_fileNameConflict_msg, //$NON-NLS-1$
-									new Object[] { sFileName, resourceLoc }));
-			dialog.setDestiation(resourceLoc);
-			dialog.setFilePath(sFileName);
-			dialog.open();
-
-			if(dialog.getReturnCode() == IDialogConstants.CANCEL_ID){
-				return null;
-			}else{
-				sFileName = dialog.getFilePath();
-				formatFile = new File(resourceLoc+File.separator+sFileName);
-			}
-		}
-
-		FileUtil.copyfile(sFile, formatFile);
-
-		return formatFile.getAbsolutePath();
-	}
-
-	protected void loadIconSectionData() {
-		pane1.addPaintListener(new PaintListener() {
-			public void paintControl(PaintEvent e) {
-				// paint the grey background
-				Rectangle clientRect = pane1.getClientArea();
-				e.gc.setClipping(clientRect);
-				e.gc.setBackground(Display.getCurrent().getSystemColor(15));
-				e.gc.fillRectangle(clientRect);
-
-				java.net.URI uri = contentElement.getShapeicon();
-				if (uri != null) {
-					String path = contentElement.getShapeicon().getPath();
-					if (path != null) {
-						try {
-							File file = new File(path);
-							if (file.exists()) {
-							} else {
-								if (!file.isAbsolute()) {
-									// Check for the uri contains the relative to library.
-									MethodPlugin plugin = UmaUtil.getMethodPlugin(contentElement);
-									if(path.indexOf(plugin.getName()) > -1){
-										path = LibraryService.getInstance()
-										.getCurrentMethodLibraryPath()
-										+ File.separator + path;	
-									}else{
-										path = getPluginPath(contentElement)
-										+ File.separator + path;
-									}
-									
-								}
-								file = new File(path);
-							}
-							if (file.exists()) {
-								if (shapeImage == null) {
-									shapeImage = new Image(
-											Display.getCurrent(), path);
-								}
-								if(contentElement.getShapeicon() != null){
-									shapeIconPath.setText(contentElement.getShapeicon().getPath());
-								}
-								clientRect = pane1.getClientArea();
-								e.gc.setClipping(clientRect);
-								e.gc.setBackground(Display.getCurrent()
-										.getSystemColor(15));
-								e.gc.fillRectangle(clientRect);
-								e.gc.drawImage(shapeImage, shapeImage
-										.getBounds().x,
-										shapeImage.getBounds().y, shapeImage
-												.getBounds().width, shapeImage
-												.getBounds().height, pane1
-												.getClientArea().x, pane1
-												.getClientArea().y, pane1
-												.getClientArea().width, pane1
-												.getClientArea().height);
-							} else {
-								if (warningCount == 1) {
-									warningCount++;
-									String msg = AuthoringUIResources.bind(AuthoringUIResources.DescriptionFormPage_LoadShapeIconWarning, (new Object[] { contentElement.getName(), path })); //$NON-NLS-1$
-									MsgBox.showWarning(msg);
-								}
-
-							}
-						} catch (Exception ex) {
-							AuthoringUIPlugin
-									.getDefault()
-									.getLogger()
-									.logError(
-											AuthoringUIResources.bind(AuthoringUIResources.DescriptionFormPage_LoadShapeIconError, (new Object[] { ex.getMessage() }))); //$NON-NLS-1$
-						}
-					}
-				}
-			}
-
-		});
-		pane1.redraw();
-		if(contentElement.getShapeicon() != null){
-			shapeIconPath.setText(contentElement.getShapeicon().getPath());
-		}
-		
-		pane3.addPaintListener(new PaintListener() {
-			public void paintControl(PaintEvent e) {
-				// paint the grey background
-				Rectangle clientRect = pane3.getClientArea();
-				e.gc.setClipping(clientRect);
-				e.gc.setBackground(Display.getCurrent().getSystemColor(15));
-				e.gc.fillRectangle(clientRect);
-
-				java.net.URI uri = contentElement.getNodeicon();
-				if (uri != null) {
-					String path = contentElement.getNodeicon().getPath();
-					if (path != null) {
-						try {
-							File file = new File(path);
-							if (file.exists()) {
-							} else {
-								if (!file.isAbsolute()) {
-									MethodPlugin plugin = UmaUtil.getMethodPlugin(contentElement);
-									if(path.indexOf(plugin.getName()) > -1){
-										path = LibraryService.getInstance()
-										.getCurrentMethodLibraryPath()
-										+ File.separator + path;	
-									}else{
-										path = getPluginPath(contentElement)
-										+ File.separator + path;
-									}
-								}
-								file = new File(path);
-							}
-							if (file.exists()) {
-								if (nodeImage == null) {
-									nodeImage = new Image(Display.getCurrent(),
-											path);
-								}
-								if(contentElement.getNodeicon() != null){
-									nodeIconPath.setText(contentElement.getNodeicon().getPath());
-								}
-								clientRect = pane3.getClientArea();
-								e.gc.setClipping(clientRect);
-								e.gc.setBackground(Display.getCurrent()
-										.getSystemColor(15));
-								e.gc.fillRectangle(clientRect);
-								e.gc.drawImage(nodeImage,
-										nodeImage.getBounds().x, nodeImage
-												.getBounds().y, nodeImage
-												.getBounds().width, nodeImage
-												.getBounds().height, pane3
-												.getClientArea().x, pane3
-												.getClientArea().y, pane3
-												.getClientArea().width, pane3
-												.getClientArea().height);
-							} else {
-								if (warningCount == 1) {
-									warningCount++;
-									String msg = AuthoringUIResources.bind(AuthoringUIResources.DescriptionFormPage_LoadNodeIconWarning, (new Object[] { contentElement.getName(), path })); //$NON-NLS-1$
-									MsgBox.showWarning(msg);
-								}
-
-							}
-						} catch (Exception ex) {
-							AuthoringUIPlugin
-									.getDefault()
-									.getLogger()
-									.logError(
-											AuthoringUIResources.bind(AuthoringUIResources.DescriptionFormPage_LoadNodeIconError, (new Object[] { ex.getMessage() }))); //$NON-NLS-1$
-						}
-					}
-				}
-			}
-
-		});
-		pane3.redraw();
-		if(contentElement.getNodeicon() != null){
-			nodeIconPath.setText(contentElement.getNodeicon().getPath());
-		}
-	}
-
-	
-	protected void enableSections(boolean enable) {
-		if (generalSectionOn) {
-			generalSection.setVisible(enable);
-			if (enable) {
-				generalSection.setExpanded(generalSectionExpandFlag);
-			} else {
-				generalSectionExpandFlag = generalSection.isExpanded();
-				generalSection.setExpanded(enable);
-			}
-		}
-
-		if (detailSectionOn) {
-			detailSection.setVisible(enable);
-			if (enable) {
-				detailSection.setExpanded(detailSectionExpandFlag);
-			} else {
-				detailSectionExpandFlag = detailSection.isExpanded();
-				detailSection.setExpanded(enable);
-			}
-		}
-		if (notationSectionOn) {
-			notationSection.setVisible(enable);
-			if (enable) {
-				notationSection.setExpanded(notationSectionExpandFlag);
-			} else {
-				notationSectionExpandFlag = notationSection.isExpanded();
-				notationSection.setExpanded(enable);
-			}
-		}
-		if (tailoringSectionOn) {
-			tailoringSection.setVisible(enable);
-			if (enable) {
-				tailoringSection.setExpanded(tailoringSectionExpandFlag);
-			} else {
-				tailoringSectionExpandFlag = tailoringSection.isExpanded();
-				tailoringSection.setExpanded(enable);
-			}
-		}
-		if (versionSectionOn) {
-			versionSection.setVisible(enable);
-			if (enable) {
-				versionSection.setExpanded(versionSectionExpandFlag);
-			} else {
-				versionSectionExpandFlag = versionSection.isExpanded();
-				versionSection.setExpanded(enable);
-			}
-		}
-		if (iconSectionOn) {
-			iconSection.setVisible(enable);
-			if (enable) {
-				iconSection.setExpanded(iconSectionExpandFlag);
-			} else {
-				iconSectionExpandFlag = iconSection.isExpanded();
-				iconSection.setExpanded(enable);
-			}
-		}
-		if (variabilitySectionOn) {
-			variabilitySection.setVisible(enable);
-			if (enable) {
-				variabilitySection.setExpanded(elementSectionExpandFlag);
-			} else {
-				elementSectionExpandFlag = variabilitySection.isExpanded();
-				variabilitySection.setExpanded(enable);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#dispose()
-	 */
-	public void dispose() {
-		if (shapeImage != null) {
-			shapeImage.dispose();
-		}
-		if (nodeImage != null) {
-			nodeImage.dispose();
-		}
-		if (labelProviderVariability != null) {
-			labelProviderVariability.dispose();
-		}
-		if (contentProviderVariability != null) {
-			contentProviderVariability.dispose();
-		}
-		if (labelProviderBase != null) {
-			labelProviderBase.dispose();
-		}
-		if (copyrightLabelProviderBase != null) {
-			copyrightLabelProviderBase.dispose();
-		}
-		super.dispose();
-		
-		disposed = true;
-	}		
-
-	private void setCopyrightButtonDeselect() {
-		if (contentElement.getPresentation().getCopyrightStatement() != null) {
-			copyright_button_deselect
-					.setEnabled((contentElement.getPresentation()
-							.getCopyrightStatement().getName() == null) ? false
-							: true);
-		} else
-			copyright_button_deselect.setEnabled(false);
-		if (TngUtil.isLocked(contentElement))
-			copyright_button_deselect.setEnabled(false);
-	}
-
-	private void setContextHelp() {
-		if (sectionComposite != null) {
-			EditorsContextHelper.setHelp(sectionComposite.getParent(),
-					getContentElement());
-		}
-		if (expandedComposite != null) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(
-					expandedComposite,
-					AuthoringUIHelpContexts.RICH_TEXT_EDITOR_CONTEXT_ID);
-		}
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.forms.IRefreshable#refreshName(java.lang.String)
-	 */
-	public void refreshName(String newName) {
-		if (newName != null) {
-			if ((ctrl_name != null) && !(ctrl_name.isDisposed())) {
-				ctrl_name.removeModifyListener(modelModifyListener);
-				ctrl_name.setText(newName);
-				ctrl_name.addModifyListener(modelModifyListener);
-				setFormTextWithVariableInfo();
-			}
-		}
-	}
-	
-	public void loadSectionDescription(){
-		
-	}
-	protected String getDetailSectionDescription(){
-		if(detailSectionDescription != null){
-			return detailSectionDescription;
-		}
-		return AuthoringUIText.DETAIL_SECTION_DESC;
-	}
-	protected String getGeneralSectionDescription(){
-		if(generalSectionDescription!= null){
-			return generalSectionDescription;
-		}
-		return AuthoringUIText.GENERAL_INFO_SECTION_DESC;
-	}
-	protected String getTailoringSectionDescription(){
-		if(tailoringSectionDescription != null){
-			return tailoringSectionDescription;
-		}
-		return AuthoringUIText.TAILORING_SECTION_DESC;
-	}
-	protected String getNotationSectionDescription(){
-		if(notationSectionDescription != null){
-			return notationSectionDescription;
-		}
-		return AuthoringUIText.NOTATION_SECTION_DESC;
-	}
-	protected String getVariabilitySectionDescription(){
-		if(variabilitySectionDescription != null){
-			return variabilitySectionDescription;
-		}
-		return AuthoringUIText.VARIABILITY_SECTION_DESC;
-	}
-	
-	private String getIconSectionDescription() {
-		// TODO Auto-generated method stubs
-		if(iconSectionDescription != null){
-			return iconSectionDescription;
-		}
-		return AuthoringUIText.ICON_SECTION_DESC;
-	}
-	private String getVersionSectionDescription() {
-		// TODO Auto-generated method stub
-		if(versionSectionDescription != null){
-			return versionSectionDescription;
-		}
-		return AuthoringUIText.VERSION_INFO_SECTION_DESC;
-	}
-
-	/** 
-	 * Following methods below exposed public in order to allow 
-	 * test automation to access the form objects through test objects
-	 * of any automation tools.
-	 */
-	
-	/**
-	 * Get brief description
-	 * @return Returns the ctrl_brief_desc.
-	 */
-	public Text getCtrl_brief_desc() {
-		return ctrl_brief_desc;
-	}
-
-	/**
-	 * Set brief description
-	 * @param ctrl_brief_desc The ctrl_brief_desc to set.
-	 */
-	public void setCtrl_brief_desc(Text ctrl_brief_desc) {
-		this.ctrl_brief_desc = ctrl_brief_desc;
-	}
-
-	/**
-	 * Get main description
-	 * @return Returns the ctrl_full_desc.
-	 */
-	public IMethodRichText getCtrl_full_desc() {
-		return ctrl_full_desc;
-	}
-
-	/**
-	 * Set main description
-	 * @param ctrl_full_desc The ctrl_full_desc to set.
-	 */
-	public void setCtrl_full_desc(IMethodRichText ctrl_full_desc) {
-		this.ctrl_full_desc = ctrl_full_desc;
-	}
-
-	/**
-	 * Get presentation name
-	 * @return Returns the ctrl_presentation_name.
-	 */
-	public Text getCtrl_presentation_name() {
-		return ctrl_presentation_name;
-	}
-
-	/**
-	 * Set presentation name
-	 * @param ctrl_presentation_name The ctrl_presentation_name to set.
-	 */
-	public void setCtrl_presentation_name(Text ctrl_presentation_name) {
-		this.ctrl_presentation_name = ctrl_presentation_name;
-	}
-
-	/**
-	 * Get expanded rich text control
-	 * @return Returns the ctrl_expanded.
-	 */
-	public IMethodRichTextEditor getCtrl_expanded() {
-		return ctrl_expanded;
-	}
-
-	/**
-	 * Set expanded rich text control
-	 * @param ctrl_expanded The ctrl_expanded to set.
-	 */
-	public void setCtrl_expanded(IMethodRichTextEditor ctrl_expanded) {
-		this.ctrl_expanded = ctrl_expanded;
-	}
-
-	/**
-	 * Get rich text control
-	 * @return Returns the ctrl_key.
-	 */
-	public IMethodRichText getCtrl_key() {
-		return ctrl_key;
-	}
-
-	/**
-	 * Set rich text control
-	 * @param ctrl_key The ctrl_key to set.
-	 */
-	public void setCtrl_key(IMethodRichText ctrl_key) {
-		this.ctrl_key = ctrl_key;
-	}
-	
-	public String getPluginPath(MethodElement e){
-		MethodPlugin plugin = UmaUtil.getMethodPlugin(e);
-		if(plugin != null){
-			File libDirs = new File(LibraryService.getInstance().getCurrentMethodLibraryPath());
-			String resourceLoc = libDirs.getAbsolutePath() + File.separator
-					+ MethodLibraryPersister.getElementPath(plugin);
-			return resourceLoc;
-		}
-		
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DisciplineDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DisciplineDescriptionPage.java
deleted file mode 100755
index c9c6cd2..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DisciplineDescriptionPage.java
+++ /dev/null
@@ -1,91 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.CategoryFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.VariabilityBaseElementFilter;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Description page for the Domain editor.
- * 
- * @author Kelvin Low
- * @author Bingxue Xu
- * @since 1.0
- */
-public class DisciplineDescriptionPage extends DescriptionFormPage {
-
-	private static final String FORM_PAGE_ID = "disciplineDescriptionPage"; //$NON-NLS-1$
-
-	private Discipline discipline;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public DisciplineDescriptionPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.DESCRIPTION_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		discipline = (Discipline) contentElement;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return discipline;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		filter = new CategoryFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof Discipline);
-			}
-		};
-
-		// set additional filter for variability base element checking
-		((CategoryFilter) filter)
-				.setAdditionalFilters(new IFilter[] { new VariabilityBaseElementFilter(
-						discipline) });
-		return filter;
-	}
-
-	protected String getTabString() {
-		return FilterConstants.DISCIPLINES;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadSectionDescription()
-	 */
-	public void loadSectionDescription() {
-		this.generalSectionDescription = AuthoringUIResources.discipline_generalInfoSection_desc;
-		this.detailSectionDescription = AuthoringUIResources.discipline_detailSection_desc;
-		this.variabilitySectionDescription = AuthoringUIResources.discipline_variabilitySection_desc;
-		this.versionSectionDescription = AuthoringUIResources.discipline_versionInfoSection_desc;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DisciplineGroupingDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DisciplineGroupingDescriptionPage.java
deleted file mode 100755
index c2500ec..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DisciplineGroupingDescriptionPage.java
+++ /dev/null
@@ -1,94 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.CategoryFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.VariabilityBaseElementFilter;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Description page for the Discipline Grouping editor.
- * 
- * @author Kelvin Low
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class DisciplineGroupingDescriptionPage extends DescriptionFormPage {
-
-	private static final String FORM_PAGE_ID = "disciplineGroupingDescriptionPage"; //$NON-NLS-1$
-
-	private DisciplineGrouping disciplineGrouping;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public DisciplineGroupingDescriptionPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.DESCRIPTION_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		disciplineGrouping = (DisciplineGrouping) contentElement;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return disciplineGrouping;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.DISCIPLINES;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		filter = new CategoryFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof DisciplineGrouping);
-			}
-		};
-
-		// Set additional filter for variability base element checking.
-		((CategoryFilter) filter)
-				.setAdditionalFilters(new IFilter[] { new VariabilityBaseElementFilter(
-						disciplineGrouping) });
-		return filter;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadSectionDescription()
-	 */
-	public void loadSectionDescription() {
-		this.generalSectionDescription = AuthoringUIResources.disciplinegrouping_generalInfoSection_desc;
-		this.detailSectionDescription = AuthoringUIResources.disciplinegrouping_detailSection_desc;
-		this.variabilitySectionDescription = AuthoringUIResources.disciplinegrouping_variabilitySection_desc;
-		this.versionSectionDescription = AuthoringUIResources.disciplinegrouping_versionInfoSection_desc;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DisciplineGroupingDisciplinesPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DisciplineGroupingDisciplinesPage.java
deleted file mode 100755
index cefabfe..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DisciplineGroupingDisciplinesPage.java
+++ /dev/null
@@ -1,170 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.CategoryFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Disciplines page in the Discipline Grouping editor.
- * 
- * @author Shashidhar Kannoori
- * @author Kelvin Low
- * @since 1.0
- */
-public class DisciplineGroupingDisciplinesPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "disciplineGroupingDisciplinesPage"; //$NON-NLS-1$	
-
-	private DisciplineGrouping disciplineGrouping;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public DisciplineGroupingDisciplinesPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.DISCIPLINES_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		disciplineGrouping = (DisciplineGrouping) contentElement;
-		setUseCategory2(false);
-		setUseCategory3(false);
-		setAllowChange1(true);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return ((DisciplineGrouping) object).getDisciplines().toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			editor.getActionManager().doAction(IActionManager.ADD_MANY,
-					disciplineGrouping,
-					UmaPackage.eINSTANCE.getDisciplineGrouping_Disciplines(),
-					addItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			editor.getActionManager().doAction(IActionManager.REMOVE_MANY,
-					disciplineGrouping,
-					UmaPackage.eINSTANCE.getDisciplineGrouping_Disciplines(),
-					rmItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return disciplineGrouping;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.DISCIPLINES;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new CategoryFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof Discipline);
-			}
-		};
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.disciplineGroupingDisciplinesPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.disciplineGroupingDisciplinesPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.disciplineGroupingDisciplinesPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.disciplineGroupingDisciplinesPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.disciplineGroupingDisciplinesPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel3()
-	 */
-	protected String getSelectedLabel3() {
-		return AuthoringUIResources.disciplineGroupingDisciplinesPage_selectedLabel;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DisciplineReferenceWorkflowPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DisciplineReferenceWorkflowPage.java
deleted file mode 100755
index e5f3f50..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DisciplineReferenceWorkflowPage.java
+++ /dev/null
@@ -1,195 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.ReferenceWorkFlowFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Reference Workflow page in the Discipline editor.
- * 
- * @author Shashidhar Kannoori
- * @author Kelvin Low
- * @since 1.0
- */
-public class DisciplineReferenceWorkflowPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "disciplineReferenceWorkflowPage"; //$NON-NLS-1$
-
-	private Discipline discipline;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public DisciplineReferenceWorkflowPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID,
-				AuthoringUIText.REFERENCE_WORKFLOW_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		discipline = (Discipline) contentElement;
-		setAllowChange1(true);
-		setAllowChange2(true);
-		setUseCategory2(false);
-		setUseCategory3(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return discipline.getReferenceWorkflows().toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		for (Iterator itor = addItems.iterator(); itor.hasNext();) {
-			// Object object = itor.next();
-			// if (object instanceof ProcessComponent) {
-			// Process process =
-			// (Process)((ProcessComponent)object).getProcess();
-			// if (process != null) {
-			// editor.getActionManager().doAction(IActionManager.ADD,
-			// discipline,
-			// UmaPackage.eINSTANCE.getDiscipline_ReferenceWorkflows(), process,
-			// -1);
-			// }
-			// }
-			// else {
-			// editor.getActionManager().doAction(IActionManager.ADD,
-			// discipline,
-			// UmaPackage.eINSTANCE.getDiscipline_ReferenceWorkflows(), object,
-			// -1);
-			// }
-			MethodElement object = (MethodElement) itor.next();
-			if (object instanceof ProcessComponent) {
-				object = ((ProcessComponent) object).getProcess();
-			}
-			if (object != null) {
-				EStructuralFeature feature = UmaPackage.eINSTANCE
-						.getDiscipline_ReferenceWorkflows();
-				if (UserInteractionHelper.checkModifyOpposite(discipline,
-						feature, object)) {
-					editor.getActionManager().doAction(IActionManager.ADD,
-							discipline, feature, object, -1);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			editor.getActionManager().doAction(IActionManager.REMOVE_MANY,
-					discipline,
-					UmaPackage.eINSTANCE.getDiscipline_ReferenceWorkflows(),
-					rmItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return discipline;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.PROCESSES;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new ReferenceWorkFlowFilter();
-	}
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.disciplineReferenceWorkflowPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.disciplineReferenceWorkflowPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.disciplineReferenceWorkflowPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.disciplineReferenceWorkflowPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.disciplineReferenceWorkflowPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel3()
-	 */
-	protected String getSelectedLabel3() {
-		return AuthoringUIResources.disciplineReferenceWorkflowPage_selectedLabel;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DisciplineTasksPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DisciplineTasksPage.java
deleted file mode 100755
index bdfb8e6..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DisciplineTasksPage.java
+++ /dev/null
@@ -1,199 +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.authoring.ui.forms;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.ContentFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.LibraryEditResources;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.util.Messenger;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.util.LibraryManager;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Tasks page in the Discipline editor.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- */
-public class DisciplineTasksPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "disciplineTasksPage"; //$NON-NLS-1$	
-
-	private Discipline discipline;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public DisciplineTasksPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.TASKS_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		discipline = (Discipline) contentElement;
-		setUseCategory2(false);
-		setUseCategory3(false);
-		setAllowChange1(true);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return ((Discipline) object).getTasks().toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			for (Iterator it = addItems.iterator(); it.hasNext();) {
-				Task task = (Task) it.next();
-				
-				//	check to maintain many-to-one rule for domain-workproduct
-//				List disciplines = AssociationHelper.getDisciplines(task);
-//				if (disciplines != null && disciplines.size() > 0)	{
-//					Object associatedDiscipline = disciplines.get(0);
-//					String msg = MessageFormat
-//					.format(
-//							LibraryEditResources.UserInteractionHelper_errRelationshipExists,
-//							new Object[] {
-//									task.getName(),
-//									TngUtil
-//											.getLabelWithPath(associatedDiscipline),
-//									discipline.getName() });
-//					Messenger.INSTANCE.showWarning(
-//							LibraryEditResources.errorDialog_title, msg);
-//					return;
-//				}
-				
-				LibraryManager.getInstance().addToDiscipline(
-						getActionManager(), discipline, task);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				Task task = (Task) it.next();
-				LibraryManager.getInstance().removeFromDiscipline(
-						getActionManager(), discipline, task);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return discipline;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.TASKS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new ContentFilter() {
-			protected boolean childAccept(Object obj) {
-				if (obj instanceof ContentElement) {
-					if (getHelper().isContributor((ContentElement) obj))
-						return false;
-				}
-				return (obj instanceof Task);
-			}
-		};
-	}
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.disciplineTasksPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.disciplineTasksPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.disciplineTasksPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.disciplineTasksPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.disciplineTasksPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel3()
-	 */
-	protected String getSelectedLabel3() {
-		return AuthoringUIResources.disciplineTasksPage_selectedLabel;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DomainDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DomainDescriptionPage.java
deleted file mode 100755
index e58ff4d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DomainDescriptionPage.java
+++ /dev/null
@@ -1,91 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.CategoryFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.VariabilityBaseElementFilter;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Description page for the Domain editor.
- * 
- * @author Kelvin Low
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class DomainDescriptionPage extends DescriptionFormPage {
-
-	private static final String FORM_PAGE_ID = "domainDescriptionPage"; //$NON-NLS-1$
-
-	private Domain domain;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public DomainDescriptionPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.DESCRIPTION_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		domain = (Domain) contentElement;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return domain;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		filter = new CategoryFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof Domain);
-			}
-		};
-
-		// set additional filter for variability base element checking
-		((CategoryFilter) filter)
-				.setAdditionalFilters(new IFilter[] { new VariabilityBaseElementFilter(
-						domain) });
-		return filter;
-	}
-
-	protected String getTabString() {
-		return FilterConstants.DOMAINS;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadSectionDescription()
-	 */
-	public void loadSectionDescription() {
-		this.generalSectionDescription = AuthoringUIResources.domain_generalInfoSection_desc;
-		this.detailSectionDescription = AuthoringUIResources.domain_detailSection_desc;
-		this.variabilitySectionDescription = AuthoringUIResources.domain_variabilitySection_desc;
-		this.versionSectionDescription = AuthoringUIResources.domain_versionInfoSection_desc;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DomainWorkProductsPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DomainWorkProductsPage.java
deleted file mode 100755
index bc6e1ef..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DomainWorkProductsPage.java
+++ /dev/null
@@ -1,210 +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.authoring.ui.forms;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.filters.WorkProductFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.LibraryEditResources;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.util.Messenger;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Work Products page in the Domain editor.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- */
-public class DomainWorkProductsPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "domainWorkProductsPage"; //$NON-NLS-1$
-
-	private Domain domain;
-
-	private IActionManager actionMgr;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public DomainWorkProductsPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.WORK_PRODUCTS_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		domain = (Domain) contentElement;
-		actionMgr = ((MethodElementEditor) getEditor()).getActionManager();
-		setUseCategory2(false);
-		setUseCategory3(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return ((Domain) object).getWorkProducts().toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Uupdate the model.
-		if (!addItems.isEmpty()) {
-				// check to maintain many-to-one rule for domain-workproduct
-			for (Iterator iter = addItems.iterator(); iter.hasNext();) {
-				MethodElement element = (MethodElement) iter.next();
-				List domains = AssociationHelper.getDomains((WorkProduct) element);
-				if (domains != null && domains.size() > 0)	{
-					Object associatedDomain = domains.get(0);
-					String msg = MessageFormat
-					.format(
-							LibraryEditResources.UserInteractionHelper_errRelationshipExists,
-							new Object[] {
-									element.getName(),
-									TngUtil
-											.getLabelWithPath(associatedDomain),
-									domain.getName() });
-					Messenger.INSTANCE.showWarning(
-							LibraryEditResources.errorDialog_title, msg);
-					return;
-				}
-				// check if this operation will modify the element in opposite
-				// feature value
-				//	
-//				if (!UserInteractionHelper.checkModifyOpposite(domain,
-//						UmaPackage.eINSTANCE.getDomain_WorkProducts(), element)) {
-//					return;
-//				}
-			}
-
-			actionMgr
-					.doAction(IActionManager.ADD_MANY, domain,
-							UmaPackage.eINSTANCE.getDomain_WorkProducts(),
-							addItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			actionMgr.doAction(IActionManager.REMOVE_MANY, domain,
-					UmaPackage.eINSTANCE.getDomain_WorkProducts(), rmItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return domain;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.WORKPRODUCTS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new WorkProductFilter() {
-			protected boolean childAccept(Object obj) {
-				if (obj instanceof ContentElement) {
-					if (getHelper().isContributor((ContentElement) obj))
-						return false;
-				}
-				return (obj instanceof WorkProduct);
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.domainWorkProductsPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.domainWorkProductsPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.domainWorkProductsPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.domainWorkProductsPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.domainWorkProductsPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel3()
-	 */
-	protected String getSelectedLabel3() {
-		return AuthoringUIResources.domainWorkProductsPage_selectedLabel;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/GuidanceDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/GuidanceDescriptionPage.java
deleted file mode 100755
index 31af4c5..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/GuidanceDescriptionPage.java
+++ /dev/null
@@ -1,327 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.filters.ContentFilter;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.VariabilityBaseElementFilter;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.EstimationConsiderations;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.Report;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.Roadmap;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.Template;
-import org.eclipse.epf.uma.TermDefinition;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.Whitepaper;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-
-/**
- * The Description page in a Guidance editor.
- * 
- * @author Kelvin Low
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class GuidanceDescriptionPage extends DescriptionFormPage {
-
-	private static final String FORM_PAGE_ID = "guidanceDescriptionPage"; //$NON-NLS-1$
-
-	protected Guidance guidance;
-
-	private String elementLabel;
-
-	private IMethodRichText ctrl_content;
-
-	private int contentFieldHeight = 400;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public GuidanceDescriptionPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.DESCRIPTION_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		guidance = (Guidance) contentElement;
-		elementLabel = LibraryUIText.getUIText(guidance);
-		setElementTypeOn(true);
-		if (guidance instanceof TermDefinition)
-			setBriefDescOn(false);
-		setFullDescOn(false);
-		setKeyConsiderationOn(false);
-		setIconSectionOn(true);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFormPrefix()
-	 */
-	protected String getFormPrefix() {
-		return new StringBuffer(LibraryUIText.TEXT_GUIDANCE)
-				.append(" (").append(elementLabel).append("): ").toString(); //$NON-NLS-1$ //$NON-NLS-2$	
-	}
-
-	/**
-	 * Creates the editor tab content
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 */
-	protected void createEditorContent(FormToolkit toolkit) {
-		super.createEditorContent(toolkit);
-		ctrl_content = createRichTextEditWithLinkForSection(toolkit,
-				detailComposite, AuthoringUIText.MAIN_DESCRIPTION_TEXT,
-				contentFieldHeight, 400, DETAIL_SECTION_ID);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#addListeners()
-	 */
-	protected void addListeners() {
-		super.addListeners();
-
-		final MethodElementEditor editor = (MethodElementEditor) getEditor();
-
-		ctrl_content.setModalObject(contentElement.getPresentation());
-		ctrl_content.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getContentDescription_MainDescription());
-		ctrl_content.addModifyListener(contentModifyListener);
-		ctrl_content.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_content;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = guidance.getPresentation()
-						.getMainDescription();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = editor.getActionManager().doAction(
-							IActionManager.SET,
-							contentElement.getPresentation(),
-							UmaPackage.eINSTANCE
-									.getContentDescription_MainDescription(),
-							newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#refresh(boolean)
-	 */
-	protected void refresh(boolean editable) {
-		super.refresh(editable);
-		ctrl_content.setEditable(editable);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadData()
-	 */
-	protected void loadData() {
-		super.loadData();
-		if (guidance != null) {
-			String content = null;
-			if (guidance.getPresentation() != null) {
-				content = guidance.getPresentation().getMainDescription();
-			}
-			ctrl_content.setText(content == null ? "" : content); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return guidance;
-	}
-
-	/**
-	 * Returns the height of the Main Description text box.
-	 */
-	public int getContentFieldHeight() {
-		return contentFieldHeight;
-	}
-
-	/**
-	 * Sets the height of the Main Description text box.
-	 */
-	public void setContentFieldHeight(int contentFieldHeight) {
-		this.contentFieldHeight = contentFieldHeight;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.GUIDANCE;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		filter = new ContentFilter() {
-			protected boolean childAccept(Object obj) {
-				if (obj instanceof Guidance) {
-					return (((ContentElement) obj).getType()
-							.equals(((Guidance) contentElement).getType()));
-				}
-				return false;
-			}
-		};
-
-		// Set additional filter for variability base element checking.
-		((ContentFilter) filter)
-				.setAdditionalFilters(new IFilter[] { new VariabilityBaseElementFilter(
-						guidance) });
-		return filter;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadSectionDescription()
-	 */
-	public void loadSectionDescription() {
-		if(contentElement instanceof Whitepaper){
-			this.generalSectionDescription = AuthoringUIResources.whitepaper_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.whitepaper_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.whitepaper_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.whitepaper_versionInfoSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.whitepaper_iconSection_desc;
-		}
-		else if(contentElement instanceof Concept){
-			this.generalSectionDescription = AuthoringUIResources.concept_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.concept_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.concept_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.concept_versionInfoSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.concept_iconSection_desc;
-		}
-		else if(contentElement instanceof Checklist){
-			this.generalSectionDescription = AuthoringUIResources.checklist_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.checklist_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.checklist_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.checklist_versionInfoSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.checklist_iconSection_desc;
-		}
-		else if(contentElement instanceof Example){
-			this.generalSectionDescription = AuthoringUIResources.example_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.example_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.example_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.example_versionInfoSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.example_iconSection_desc;
-		}
-		else if(contentElement instanceof Guideline){
-			this.generalSectionDescription = AuthoringUIResources.guideline_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.guideline_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.guideline_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.guideline_versionInfoSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.guideline_iconSection_desc;
-		}
-		else if(contentElement instanceof EstimationConsiderations){
-			this.generalSectionDescription = AuthoringUIResources.estimationconsideration_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.estimationconsideration_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.estimationconsideration_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.estimationconsideration_versionInfoSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.estimationconsideration_iconSection_desc;
-		}
-		else if(contentElement instanceof Practice){
-			this.generalSectionDescription = AuthoringUIResources.practice_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.practice_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.practice_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.practice_versionInfoSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.practice_iconSection_desc;
-		}
-		else if(contentElement instanceof SupportingMaterial){
-			this.generalSectionDescription = AuthoringUIResources.supportingmaterial_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.supportingmaterial_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.supportingmaterial_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.supportingmaterial_versionInfoSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.supportingmaterial_iconSection_desc;
-		}
-		else if(contentElement instanceof Report){
-			this.generalSectionDescription = AuthoringUIResources.report_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.report_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.report_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.report_versionInfoSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.report_iconSection_desc;
-		}
-		else if(contentElement instanceof Roadmap){
-			this.generalSectionDescription = AuthoringUIResources.roadmap_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.roadmap_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.roadmap_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.roadmap_versionInfoSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.roadmap_iconSection_desc;
-		}
-		else if(contentElement instanceof Template){
-			this.generalSectionDescription = AuthoringUIResources.template_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.template_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.template_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.template_versionInfoSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.template_iconSection_desc;
-		}
-		else if(contentElement instanceof TermDefinition){
-			this.generalSectionDescription = AuthoringUIResources.termdefinition_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.termdefinition_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.termdefinition_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.termdefinition_versionInfoSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.termdefinition_iconSection_desc;
-		}
-		else if(contentElement instanceof ReusableAsset){
-			this.generalSectionDescription = AuthoringUIResources.resuableasset_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.resuableasset_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.resuableasset_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.resuableasset_versionInfoSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.reusableasset_iconSection_desc;
-		}
-		else if(contentElement instanceof ToolMentor){
-			this.generalSectionDescription = AuthoringUIResources.toolmentor_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.toolmentor_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.toolmentor_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.toolmentor_versionInfoSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.toolmentor_iconSection_desc;
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/GuidanceWithAttachmentsDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/GuidanceWithAttachmentsDescriptionPage.java
deleted file mode 100755
index d1475cd..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/GuidanceWithAttachmentsDescriptionPage.java
+++ /dev/null
@@ -1,264 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-
-/**
- * The Description page in a Guidance (with attachments) editor.
- * 
- * @author Shashidhar Kannoori
- * @author Kelvin Low
- * @since 1.0
- */
-public class GuidanceWithAttachmentsDescriptionPage extends GuidanceDescriptionPage {
-
-	private Button ctrl_attach, ctrl_detach; // , ctrl_remove;
-
-	private List ctrl_attached_files;
-
-	private static final String GUIDANCE_ATTACHMENT_LAST_DIRECTORY_BROWSED_PREF = "guidance_attachment_last_dir_browsed"; //$NON-NLS-1$
-
-	/**
-	 * Creates a new instance.
-	 */
-	public GuidanceWithAttachmentsDescriptionPage(FormEditor editor) {
-		super(editor);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.GuidanceDescriptionPage#createEditorContent(org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	protected void createEditorContent(FormToolkit toolkit) {
-		super.createEditorContent(toolkit);
-
-		createLabel(toolkit, generalComposite,
-				AuthoringUIText.ATTACHED_FILE_TEXT, 2);
-		ctrl_attached_files = new List(generalComposite, SWT.SINGLE
-				| SWT.V_SCROLL | SWT.H_SCROLL);
-		GridData listGridData = new GridData(SWT.BEGINNING, SWT.BEGINNING,
-				true, true);
-		listGridData.heightHint = 30;
-		listGridData.widthHint = 300;
-		ctrl_attached_files.setLayoutData(listGridData);
-
-		ctrl_attached_files.setData(FormToolkit.KEY_DRAW_BORDER,
-				FormToolkit.TEXT_BORDER);
-
-		Composite buttonComposite = createComposite(toolkit, generalComposite,
-				1);
-		GridData gridData = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		gridData.verticalSpan = 1;
-		gridData.horizontalSpan = 3;
-		buttonComposite.setLayoutData(gridData);
-		buttonComposite.setLayout(new GridLayout(3, false));
-
-		ctrl_attach = createButton(toolkit, buttonComposite, ATTACH_BUTTON);
-		ctrl_detach = createButton(toolkit, buttonComposite, DETACH_BUTTON);
-		// ctrl_remove = createButton(toolkit, buttonComposite, REMOVE_BUTTON);
-
-		label_base.setText(AuthoringUIText.BASE_ELEMENT_TEXT);
-
-	}
-
-	/**
-	 * Add listeners
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.forms.GuidanceDescriptionPage#addListeners()
-	 */
-	protected void addListeners() {
-		super.addListeners();
-
-		final IActionManager actionMgr = ((MethodElementEditor) getEditor())
-				.getActionManager();
-
-		ctrl_attach.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				FileDialog dialog = new FileDialog(PlatformUI.getWorkbench()
-						.getActiveWorkbenchWindow().getShell());
-				dialog
-						.setText(AuthoringUIResources.attachGuidanceFileDialog_title); 
-				String lastDir = AuthoringUIPlugin
-						.getDefault()
-						.getPreferenceStore()
-						.getString(
-								GUIDANCE_ATTACHMENT_LAST_DIRECTORY_BROWSED_PREF);
-				if (lastDir != null && lastDir.trim().length() > 0) {
-					dialog.setFilterPath(lastDir);
-				} else {
-					dialog.setFilterPath(LibraryService.getInstance()
-							.getCurrentMethodLibraryPath()
-							+ File.separator
-							+ ResourceHelper.getElementPath(guidance));
-				}
-				dialog.open();
-				if (dialog.getFileName() != null && dialog.getFileName() != "") { //$NON-NLS-1$
-					try {
-						File fileToAttach = new File(dialog.getFilterPath(),
-								dialog.getFileName());
-						String fileUrl = ResourceHelper.getURLForAttachment(
-								fileToAttach, guidance, true);
-						if (ctrl_attached_files.indexOf(fileUrl) != -1) {
-							// file is already an attachment
-							AuthoringUIPlugin
-									.getDefault()
-									.getMsgDialog()
-									.displayInfo(
-											AuthoringUIResources.AttachmentDialogattachFile_text, 
-											AuthoringUIResources.forms_GuidanceWithAttachmentsDescriptionPage_alreadyAttached_msg); 
-							return;
-						}
-						ctrl_attached_files.add(fileUrl);
-						boolean status = actionMgr.doAction(IActionManager.SET,
-								guidance.getPresentation(),
-								UmaPackage.eINSTANCE
-										.getGuidanceDescription_Attachments(),
-								getFilesFromListCtrl(), -1);
-						if (!status) {
-							return;
-						} else {
-							AuthoringUIPlugin
-									.getDefault()
-									.getPreferenceStore()
-									.setValue(
-											GUIDANCE_ATTACHMENT_LAST_DIRECTORY_BROWSED_PREF,
-											dialog.getFilterPath());
-						}
-					} catch (IOException ex) {
-						// TODO: Display an error dialog.
-						ex.printStackTrace();
-					}
-				}
-			}
-		});
-
-		ctrl_detach.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				ctrl_attached_files.remove(ctrl_attached_files
-						.getSelectionIndex());
-				boolean status = actionMgr.doAction(IActionManager.SET,
-						guidance.getPresentation(), UmaPackage.eINSTANCE
-								.getGuidanceDescription_Attachments(),
-						getFilesFromListCtrl(), -1);
-
-				if (!status) {
-					// ctrl_attached_files.setText(oldContent);
-					return;
-				}
-			}
-		});
-
-		// ctrl_remove.addSelectionListener(new SelectionAdapter(){
-		// public void widgetSelected(SelectionEvent e) {
-		// //ctrl_attached_files.setText(""); //$NON-NLS-1$
-		// String oldContent =
-		// ((GuidanceDescription)guidance.getPresentation()).getAttachments();
-		// ctrl_attached_files.setText(""); //$NON-NLS-1$
-		// boolean status = actionMgr.doAction(IActionManager.SET,
-		// guidance.getPresentation(),
-		// UmaPackage.eINSTANCE.getGuidanceDescription_Attachments(),
-		// ctrl_attached_files.getText(), -1);
-		// if(!status){
-		// //ctrl_attached_files.setText(oldContent);
-		// return;
-		// }
-		// }
-		// });
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.GuidanceDescriptionPage#refresh(boolean)
-	 */
-	protected void refresh(boolean editable) {
-		super.refresh(editable);
-		ctrl_attach.setEnabled(editable);
-		ctrl_detach.setEnabled(editable);
-		// ctrl_remove.setEnabled(editable);
-	}
-
-	/**
-	 * Load initial data from model
-	 *
-	 * @see org.eclipse.epf.authoring.ui.forms.GuidanceDescriptionPage#loadData()
-	 */
-	protected void loadData() {
-		super.loadData();
-		if (guidance != null) {
-			ContentDescription content = (ContentDescription) guidance
-					.getPresentation();
-			String thirdpartyformat = ((org.eclipse.epf.uma.GuidanceDescription) content)
-					.getAttachments();
-			setFilesToListCtrl(thirdpartyformat);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.GuidanceDescriptionPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return contentElement;
-	}
-
-	/**
-	 * Given a string of files, add the files to the List control
-	 * 
-	 * @param files
-	 */
-	private void setFilesToListCtrl(String fileString) {
-		java.util.List attachmentList = TngUtil
-				.convertGuidanceAttachmentsToList(fileString);
-		ctrl_attached_files.removeAll();
-
-		for (Iterator iter = attachmentList.iterator(); iter.hasNext();) {
-			String attachment = (String) iter.next();
-			ctrl_attached_files.add(attachment);
-
-		}
-	}
-
-	/**
-	 * returns the list of files as a string
-	 * 
-	 * @return
-	 */
-	private String getFilesFromListCtrl() {
-		String files[] = ctrl_attached_files.getItems();
-		return TngUtil.convertGuidanceAttachmentsToString(Arrays.asList(files));
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/IExtensionFormPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/IExtensionFormPage.java
deleted file mode 100755
index a19f535..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/IExtensionFormPage.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.IFormPage;
-
-/**
- * Interface to be used for all pages added through extension points
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public interface IExtensionFormPage   {
-
-	/**
-	 * Set editor for form page
-	 * @param editor
-	 */
-	public IFormPage setEditor(FormEditor editor) ;
-	
-	/**
-	 * Set input for form page
-	 * @param input
-	 */
-	public void setInput(Object input);
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/IRefreshable.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/IRefreshable.java
deleted file mode 100755
index 1aa6a46..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/IRefreshable.java
+++ /dev/null
@@ -1,26 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-/**
- * Interface used to refresh a form that implements this in case of model change outside of the form
- * 
- * @author Phong Nguyen Le 
- * @since  1.0
- */
-public interface IRefreshable {
-	
-	/**
-	 * Refresh name of the form
-	 * @param newName
-	 */
-	void refreshName(String newName);
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/MethodFormToolkit.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/MethodFormToolkit.java
deleted file mode 100755
index 8e60807..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/MethodFormToolkit.java
+++ /dev/null
@@ -1,85 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.editors.MethodRichText;
-import org.eclipse.epf.authoring.ui.editors.MethodRichTextEditor;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichTextEditor;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.jface.fieldassist.DecoratedField;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-
-/**
- * A help class for creating UI widgets adapted adapted to work in Eclipse
- * forms.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodFormToolkit {
-
-	/**
-	 * Creates a Rich Text control and adapts it to be used in a form.
-	 * 
-	 * @param parent
-	 *            The parent control.
-	 * @param text
-	 *            The initial text for the viewer.
-	 * @param style
-	 *            The initial style for the viewer.
-	 * @param basePath
-	 *            The base path used for resolving hrefs.
-	 * @return A new <code>IMethodRichText</code> instance.
-	 */
-	public static IMethodRichText createRichText(FormToolkit toolkit,
-			Composite parent, String text, int style, String basePath,
-			MethodElement methodElement, DecoratedField label) {
-		IMethodRichText richText = new MethodRichText(parent, style, basePath);
-		richText.init(methodElement, label);
-		richText.getControl().setData(FormToolkit.KEY_DRAW_BORDER,
-				FormToolkit.TEXT_BORDER);
-		if (text != null) {
-			richText.setText(text);
-		}
-		return richText;
-	}
-
-	/**
-	 * Creates a Rich Text editor and adapts it to be used in a form.
-	 * 
-	 * @param parent
-	 *            The parent control.
-	 * @param text
-	 *            The initial text for the viewer.
-	 * @param style
-	 *            The initial style for the viewer.
-	 * @param basePath
-	 *            The base path used for resolving hrefs.
-	 * @return A new <code>IMethodRichTextEditor</code> instance.
-	 */
-	public static IMethodRichTextEditor createRichTextEditor(
-			FormToolkit toolkit, Composite parent, String text, int style,
-			String basePath, MethodElement methodElement, DecoratedField label) {
-		IMethodRichTextEditor editor = new MethodRichTextEditor(parent, style,
-				basePath, methodElement, label);
-		editor.getControl().setData(FormToolkit.KEY_DRAW_BORDER,
-				FormToolkit.TEXT_BORDER);
-		if (text != null) {
-			editor.setText(text);
-		}
-		return editor;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/MethodLibraryDescriptionFormPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/MethodLibraryDescriptionFormPage.java
deleted file mode 100755
index a1f1feb..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/MethodLibraryDescriptionFormPage.java
+++ /dev/null
@@ -1,347 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditorInput;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-
-/**
- * Description page for method library
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MethodLibraryDescriptionFormPage extends FormPage {
-	private static final int DEFAULT_VERTICAL_INDENT = 2;
-
-	private Text ctrl_name;
-
-	private Text ctrl_brief_desc;
-
-	private Section generalSection;
-
-	private Composite generalComposite;
-
-	private MethodLibrary library;
-
-	private Text textAuthors;
-
-	private Text ctrl_change_date;
-
-	private Text ctrl_change_desc;
-
-	private Text ctrl_version;
-
-	private Text ctrl_copyright;
-
-	/**
-	 * Creates an instance
-	 * @param editor
-	 */
-	public MethodLibraryDescriptionFormPage(FormEditor editor) {
-		super(
-				editor,
-				AuthoringUIResources.descriptionPage_title, AuthoringUIResources.descriptionPage_title); 
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-
-		// get MethodLibrary object from Editor input
-		MethodElementEditorInput methodElementInput = (MethodElementEditorInput) input;
-
-		Object obj = methodElementInput.getMethodElement();
-		if (obj instanceof MethodLibrary) {
-			library = (MethodLibrary) obj;
-		}
-	}
-
-	/**
-	 * Creates the form content.
-	 * 
-	 * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		// create form toolkit
-		ScrolledForm form = managedForm.getForm();
-		FormToolkit toolkit = managedForm.getToolkit();
-		form.setText(getEditor().getPartName());
-
-		TableWrapLayout layout = new TableWrapLayout();
-		form.getBody().setLayout(layout);
-
-		// Create editor content
-		createEditorContent(toolkit, form.getBody());
-	}
-
-	/**
-	 * Create editor tab content
-	 * 
-	 * @param toolkit
-	 * @param editorComposite
-	 */
-	private void createEditorContent(FormToolkit toolkit,
-			Composite editorComposite) {
-		// Create General Information section
-		generalSection = toolkit.createSection(editorComposite,
-				Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED
-						| Section.TITLE_BAR);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		generalSection.setLayoutData(td);
-		generalSection
-				.setText(AuthoringUIResources.MethodLibraryDescriptionFormPage_section_title); //$NON-NLS-1$
-		generalSection
-				.setDescription(AuthoringUIResources.MethodLibraryDescriptionFormPage_section_description); //$NON-NLS-1$
-		generalSection.setLayout(new GridLayout());
-
-		generalComposite = toolkit.createComposite(generalSection);
-		generalComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		generalComposite.setLayout(new GridLayout(2, false));
-		generalSection.setClient(generalComposite);
-
-		// name
-		Label l_name = toolkit.createLabel(generalComposite,
-				AuthoringUIResources.name_text); 
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			l_name.setLayoutData(gridData);
-		}
-
-		ctrl_name = toolkit.createText(generalComposite, "", SWT.SINGLE); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-					| GridData.GRAB_HORIZONTAL);
-			gridData.widthHint = 400;
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			ctrl_name.setLayoutData(gridData);
-		}
-
-		// brief desc
-		Label l_brief_desc = toolkit.createLabel(generalComposite,
-				AuthoringUIResources.description_text); 
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			l_brief_desc.setLayoutData(gridData);
-		}
-
-		ctrl_brief_desc = toolkit.createText(generalComposite,
-				"", SWT.MULTI | SWT.WRAP); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-					| GridData.GRAB_HORIZONTAL);
-			gridData.heightHint = 40;
-			gridData.widthHint = 400;
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			ctrl_brief_desc.setLayoutData(gridData);
-		}
-
-		// Authors
-		Label label = toolkit.createLabel(generalComposite,
-				AuthoringUIResources.authors_text); 
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			label.setLayoutData(gridData);
-		}
-
-		textAuthors = toolkit.createText(generalComposite,
-				"", SWT.MULTI | SWT.WRAP); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-					| GridData.GRAB_HORIZONTAL);
-			gridData.heightHint = 40;
-			gridData.widthHint = 400;
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			textAuthors.setLayoutData(gridData);
-		}
-
-		// Change Date
-		Label l_changedate = toolkit.createLabel(generalComposite, ""); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			l_changedate.setLayoutData(gridData);
-		}
-
-		ctrl_change_date = toolkit.createText(generalComposite,
-				"", SWT.READ_ONLY); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-					| GridData.GRAB_HORIZONTAL);
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			ctrl_change_date.setLayoutData(gridData);
-		}
-
-		// Authors
-		Label l_change_desc = toolkit.createLabel(generalComposite,
-				AuthoringUIText.CHANGE_DESCRIPTION_TEXT);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			l_change_desc.setLayoutData(gridData);
-		}
-
-		ctrl_change_desc = toolkit.createText(generalComposite, "", SWT.MULTI); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-					| GridData.GRAB_HORIZONTAL);
-			gridData.heightHint = 40;
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			ctrl_change_desc.setLayoutData(gridData);
-		}
-
-		// Version
-		Label l_version = toolkit.createLabel(generalComposite,
-				AuthoringUIText.VERSION_TEXT);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			l_version.setLayoutData(gridData);
-		}
-
-		ctrl_version = toolkit.createText(generalComposite, "", SWT.MULTI); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-					| GridData.GRAB_HORIZONTAL);
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			ctrl_version.setLayoutData(gridData);
-		}
-		Label l_copyright = toolkit.createLabel(generalComposite,
-				AuthoringUIResources.copyright_text); 
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			l_copyright.setLayoutData(gridData);
-		}
-		ctrl_copyright = toolkit.createText(generalComposite, ""); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-					| GridData.GRAB_HORIZONTAL);
-			gridData.heightHint = 40;
-			gridData.widthHint = 400;
-			gridData.horizontalSpan = 1;
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			ctrl_copyright.setLayoutData(gridData);
-		}
-
-		toolkit.paintBordersFor(generalComposite);
-
-		addListeners();
-		loadData();
-
-		// Set focus on the name attribute
-		Display display = editorComposite.getDisplay();
-		if (!(display == null || display.isDisposed())) {
-			display.asyncExec(new Runnable() {
-				public void run() {
-					ctrl_name.setFocus();
-				}
-			});
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-	}
-
-	/**
-	 * Loads initial data from model
-	 */
-	private void loadData() {
-		String name = library.getName();
-		String brief_desc = library.getBriefDescription();
-
-		ctrl_name.setText(TngUtil.checkNull(name));
-		ctrl_brief_desc.setText(TngUtil.checkNull(brief_desc));
-		textAuthors.setText(TngUtil.checkNull(library.getAuthors()));
-		if (library.getChangeDate() != null) {
-			ctrl_change_date.setText(TngUtil.checkNull(library.getChangeDate()
-					.toLocaleString()));
-		}
-		ctrl_change_desc.setText(TngUtil.checkNull(library
-				.getChangeDescription()));
-		ctrl_version.setText(TngUtil.checkNull(library.getVersion()));
-	}
-
-	/**
-	 * Add focus listeners
-	 * 
-	 */
-	private void addListeners() {
-		ctrl_name.addFocusListener(new FocusAdapter() {
-			public void focusLost(FocusEvent e) {
-				library.setName(ctrl_name.getText());
-			}
-		});
-
-		ctrl_brief_desc.addFocusListener(new FocusAdapter() {
-			public void focusLost(FocusEvent e) {
-				library.setBriefDescription(ctrl_brief_desc.getText());
-			}
-		});
-
-		textAuthors.addFocusListener(new FocusAdapter() {
-			public void focusLost(FocusEvent e) {
-				library.setAuthors(textAuthors.getText());
-			}
-		});
-
-		ctrl_change_desc.addFocusListener(new FocusAdapter() {
-			public void focusLost(FocusEvent e) {
-				library.setChangeDescription(ctrl_change_desc.getText());
-			}
-		});
-
-		ctrl_version.addFocusListener(new FocusAdapter() {
-			public void focusLost(FocusEvent e) {
-				library.setVersion(ctrl_version.getText());
-			}
-		});
-
-		ctrl_copyright.addFocusListener(new FocusAdapter() {
-			public void focusLost(FocusEvent e) {
-			}
-		});
-
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/MethodPluginDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/MethodPluginDescriptionPage.java
deleted file mode 100755
index aa36ecc..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/MethodPluginDescriptionPage.java
+++ /dev/null
@@ -1,1217 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIImages;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.dialogs.ChangeHistoryDialog;
-import org.eclipse.epf.authoring.ui.dialogs.ItemsFilterDialog;
-import org.eclipse.epf.authoring.ui.editors.ConfigurationEditorInput;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditorInput;
-import org.eclipse.epf.authoring.ui.filters.ContentFilter;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichTextEditor;
-import org.eclipse.epf.authoring.ui.views.ViewHelper;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.command.RemoveReferencesCommand;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.library.util.PluginReferenceChecker;
-import org.eclipse.epf.richtext.RichTextListener;
-import org.eclipse.epf.services.ILibraryPersister;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.fieldassist.DecoratedField;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-
-import com.ibm.icu.text.DateFormat;
-
-/**
- * Description page for method plugin
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @author Phong Nguyen Le
- * @since 1.0
- * fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=176382
- */
-public class MethodPluginDescriptionPage extends BaseFormPage implements IRefreshable {
-
-	private static final String FORM_PREFIX = LibraryUIText.TEXT_METHOD_PLUGIN
-			+ ": "; //$NON-NLS-1$
-
-	private Text ctrl_name;
-
-	private Text ctrl_brief_desc, ctrl_r_brief_desc;
-
-	private CheckboxTableViewer ctrl_refModel;
-
-	private Section generalSection, refModelSection;
-
-	private Composite generalComposite, refModelComposite;
-
-	private boolean descExpandFlag = false;
-
-	private MethodPlugin plugin;
-
-	private IActionManager actionMgr;
-
-	protected Section versionSection;
-
-	protected Composite versionComposite;
-
-	private Text ctrl_authors;
-
-	private Text ctrl_change_date;
-
-	private Text ctrl_change_desc;
-
-	private Text ctrl_version;
-
-	protected boolean versionSectionOn = true;
-
-	protected boolean anyAttributeModified = false;
-
-	protected static final int VERSION_SECTION_ID = 3;
-
-	protected IMethodRichTextEditor ctrl_version_expanded;
-
-	protected ImageHyperlink expandVersionLink;
-
-	protected DecoratedField expandVersionLabel;
-
-	protected Composite expandedVersionComposite;
-
-	protected ModifyListener modelModifyListener;
-
-	protected ModifyListener contentModifyListener;
-
-	protected static final int GENERAL_SECTION_ID = 1;
-
-	private IMethodRichText activeControl;
-
-	protected Label label_copyright;
-
-	protected TableViewer copyright_viewer;
-
-	protected Table ctrl_copyright;
-
-	protected IStructuredContentProvider copyrightContentProvider;
-
-	private ILabelProvider labelProviderBase = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory());;
-
-	private Button copyright_button;
-
-	private Button copyright_button_deselect;
-
-	private Button ctrl_changeable;
-
-	private Button view_history_button;
-
-	public boolean notificationEnabled = true;
-
-	protected Adapter userChangeableAdapter;
-
-	private ModifyListener nameModifyListener;
-
-	private String lastChangeHistory = ""; //$NON-NLS-1$
-
-	/**
-	 * Creates a new instance.
-	 */
-	public MethodPluginDescriptionPage(FormEditor editor) {
-		super(editor, AuthoringUIText.DESCRIPTION_PAGE_TITLE,
-				AuthoringUIText.DESCRIPTION_PAGE_TITLE);
-
-		actionMgr = ((MethodElementEditor) editor).getActionManager();
-		userChangeableAdapter = new UserChangeableAdapter();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.BaseFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		MethodElementEditorInput methodElementInput = (MethodElementEditorInput) input;
-		Object obj = methodElementInput.getMethodElement();
-		plugin = (MethodPlugin) obj;
-		if (userChangeableAdapter != null) {
-			plugin.eAdapters().add(userChangeableAdapter);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.createFormContent(IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		createEditorContent(toolkit);
-		createReferenceContent(toolkit);
-		setContextHelp();
-		loadData();
-		addListeners();
-	}
-
-	private void setContextHelp() {
-		if (generalComposite != null) {
-			PlatformUI
-					.getWorkbench()
-					.getHelpSystem()
-					.setHelp(
-							generalComposite.getParent().getParent(),
-							AuthoringUIHelpContexts.PLUGIN_EDITOR_DESCRIPTION_ALL_CONTEXT);
-		}
-	}
-
-	/**
-	 * Creates the editor page content.
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 */
-	protected void createEditorContent(FormToolkit toolkit) {
-		form.setText(FORM_PREFIX + plugin.getName());
-
-		// Create the General section.
-		generalSection = toolkit.createSection(form.getBody(),
-				Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED
-						| Section.TITLE_BAR);
-
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		generalSection.setLayoutData(td);
-		generalSection.setText(AuthoringUIText.GENERAL_INFO_SECTION_NAME);
-		generalSection.setDescription(MessageFormat.format(
-				AuthoringUIText.GENERAL_INFO_SECTION_DESC,
-				new String[] { LibraryUIText.getUITextLower(methodElement) }));
-		generalSection.setLayout(new GridLayout());
-
-		generalComposite = toolkit.createComposite(generalSection);
-		generalComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		generalComposite.setLayout(new GridLayout(3, false));
-		generalSection.setClient(generalComposite);
-
-		// name
-		ctrl_name = createTextEditWithLabel(toolkit, generalComposite,
-				AuthoringUIText.NAME_TEXT);
-
-		// brief desc
-		ctrl_brief_desc = createTextEditWithLabel2(toolkit, generalComposite,
-				AuthoringUIText.BRIEF_DESCRIPTION_TEXT);
-
-		if (versionSectionOn) {
-			createVersionSection(toolkit);
-			createVersionSectionContent();
-		}
-
-		toolkit.paintBordersFor(generalComposite);
-
-		// set focus on the name attribute
-		Display display = form.getBody().getDisplay();
-		if (!(display == null || display.isDisposed())) {
-			display.asyncExec(new Runnable() {
-				public void run() {
-					ctrl_name.setFocus();
-				}
-			});
-		}
-	}
-
-	private void createReferenceContent(FormToolkit toolkit) {
-		// Ref Model Section
-		refModelSection = toolkit.createSection(form.getBody(),
-				Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED
-						| Section.TITLE_BAR);
-		TableWrapData td1 = new TableWrapData(TableWrapData.FILL_GRAB);
-		refModelSection.setLayoutData(td1);
-		refModelSection
-				.setText(AuthoringUIText.REFERENCED_PLUGINS_SECTION_NAME);
-		refModelSection
-				.setDescription(AuthoringUIText.REFERENCED_PLUGINS_SECTION_DESC);
-		refModelSection.setLayout(new GridLayout());
-
-		refModelComposite = toolkit.createComposite(refModelSection);
-		refModelComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		refModelComposite.setLayout(new GridLayout(2, false));
-		refModelSection.setClient(refModelComposite);
-
-		Table ctrl_table = toolkit.createTable(refModelComposite, SWT.CHECK);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING
-					| GridData.FILL_BOTH);
-			gridData.heightHint = 100;
-			ctrl_table.setLayoutData(gridData);
-		}
-
-		ctrl_refModel = new CheckboxTableViewer(ctrl_table);
-		ILabelProvider labelProvider = new LabelProvider() {
-			public String getText(Object element) {
-				MethodPlugin plugin = (MethodPlugin) element;
-				return plugin.getName();
-			}
-		};
-		ctrl_refModel.setLabelProvider(labelProvider);
-
-		Label l_r_brief_desc = toolkit.createLabel(refModelComposite,
-				AuthoringUIText.BRIEF_DESCRIPTION_TEXT);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			gridData.horizontalSpan = 3;
-			l_r_brief_desc.setLayoutData(gridData);
-		}
-
-		ctrl_r_brief_desc = toolkit.createText(refModelComposite,
-				"", SWT.MULTI | SWT.WRAP | SWT.V_SCROLL | SWT.READ_ONLY); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-					| GridData.GRAB_HORIZONTAL);
-			gridData.heightHint = 80;
-			ctrl_r_brief_desc.setLayoutData(gridData);
-		}
-
-		toolkit.paintBordersFor(refModelComposite);
-	}
-
-	private void setCheckboxForCurrentBase(List currentBaseList) {
-		ctrl_refModel.setAllChecked(false);
-		for (int i = 0; i < currentBaseList.size(); i++) {
-			MethodPlugin model = (MethodPlugin) currentBaseList.get(i);
-			ctrl_refModel.setChecked(model, true);
-		}
-	}
-
-	/**
-	 * Add listeners
-	 * 
-	 */
-	private void addListeners() {
-		MethodElementEditor editor = (MethodElementEditor) getEditor();
-
-		form.addListener(SWT.Activate, new Listener() {
-			public void handleEvent(Event e) {
-				// Clear the old items and add the newly allowable items.
-				ctrl_refModel.getTable().clearAll();
-				ctrl_refModel.refresh();
-
-				List allowableList = PluginReferenceChecker
-						.getApplicableBasePlugins(plugin);
-				ctrl_refModel.add(allowableList.toArray());
-
-				List currentBaseList = plugin.getBases();
-				setCheckboxForCurrentBase(currentBaseList);
-
-				if (!plugin.getUserChangeable().booleanValue()) {
-					enableControls(false);
-				} else {
-					enableControls(true);
-				}
-				copyright_viewer.refresh();
-			}
-		});
-
-		final ModifyListener modifyListener = editor
-				.createModifyListener(plugin);
-
-		nameModifyListener = editor.createModifyListener(plugin, true);
-		ctrl_name.addModifyListener(nameModifyListener);
-		ctrl_name.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				String oldContent = plugin.getName();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				if (ctrl_name.getText().equals(plugin.getName())) {
-					return;
-				}
-
-				// Check invalid characters first.
-				String msg = LibraryUtil.checkPluginName(null, ctrl_name
-						.getText());
-				String validName = StrUtil.makeValidFileName(ctrl_name
-						.getText());
-				if (msg == null) {
-					// Check duplicate plug-in name.
-					msg = LibraryUtil.checkPluginName(plugin, validName);
-				}
-				if (msg == null) {
-					if (!validName.equals(plugin.getName())) {
-						Shell shell = getSite().getShell();
-						msg = AuthoringUIResources.bind(AuthoringUIResources.methodPluginDescriptionPage_confirmRename, (new Object[] { plugin.getName(), ctrl_name.getText() })); //$NON-NLS-1$
-						String title = AuthoringUIResources.methodPluginDescriptionPage_confirmRename_title; //$NON-NLS-1$
-						if (!MessageDialog.openConfirm(shell, title, msg)) {
-							ctrl_name.setText(plugin.getName());
-							return;
-						}
-
-						e.doit = true;
-						ctrl_name.setText(validName);
-						boolean status = actionMgr.doAction(IActionManager.SET,
-								plugin, UmaPackage.eINSTANCE
-										.getNamedElement_Name(), validName, -1);
-
-						if (!status) {
-							return;
-						}
-						form.setText(FORM_PREFIX + plugin.getName());
-						updateChangeDate();
-
-						// adjust plugin location and save the editor
-						//
-						BusyIndicator.showWhile(getSite().getShell()
-								.getDisplay(), new Runnable() {
-							public void run() {
-								MethodElementEditor editor = (MethodElementEditor) getEditor();
-								editor.doSave(new NullProgressMonitor());
-								ILibraryPersister.FailSafeMethodLibraryPersister persister = editor
-										.getPersister();
-								try {
-									persister
-											.adjustLocation(plugin.eResource());
-									persister.commit();
-								} catch (RuntimeException e) {
-									AuthoringUIPlugin.getDefault().getLogger()
-											.logError(e);
-									try {
-										persister.rollback();
-									} catch (Exception ex) {
-										AuthoringUIPlugin.getDefault()
-												.getLogger().logError(ex);
-										ViewHelper
-												.reloadCurrentLibaryOnRollbackError(getSite()
-														.getShell());
-										return;
-									}
-									AuthoringUIPlugin
-											.getDefault()
-											.getMsgDialog()
-											.displayWarning(
-													getSite().getShell()
-															.getText(),
-													AuthoringUIResources.methodPluginDescriptionPage_cannotRenamePluginFolder
-													, e.getMessage(), e);
-								}
-							}
-						});
-					}
-				} else {
-					ctrl_name.setText(plugin.getName());
-					Shell shell = getSite().getShell();
-					AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-							shell.getText(), msg);
-					e.doit = false;
-					ctrl_name.getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							ctrl_name.setFocus();
-							ctrl_name.selectAll();
-						}
-					});
-				}
-			}
-		});
-		ctrl_name.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getNamedElement_Name());
-			}
-		});
-
-		ctrl_brief_desc.addModifyListener(modifyListener);
-		ctrl_brief_desc.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getMethodElement_BriefDescription());
-			}
-
-			public void focusLost(FocusEvent e) {
-				String oldContent = plugin.getBriefDescription();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				String newContent = ctrl_brief_desc.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean status = actionMgr.doAction(IActionManager.SET,
-							plugin, UmaPackage.eINSTANCE
-									.getMethodElement_BriefDescription(),
-							newContent, -1);
-					if (status) {
-						ctrl_brief_desc.setText(newContent);
-					}
-				}
-			}
-		});
-
-		ctrl_refModel
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-					public void selectionChanged(SelectionChangedEvent event) {
-						StructuredSelection selectedList = (StructuredSelection) event
-								.getSelection();
-						MethodPlugin selectedObj = (MethodPlugin) selectedList
-								.getFirstElement();
-						if (selectedObj == null)
-							return;
-						ctrl_r_brief_desc.setText(selectedObj
-								.getBriefDescription());
-					}
-
-				});
-
-		ctrl_refModel.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				Object obj = event.getElement();
-
-				ctrl_r_brief_desc.setText(((MethodPlugin) obj)
-						.getBriefDescription());
-
-				if (TngUtil.isLocked(plugin)) {
-					ctrl_refModel.setChecked(obj, !event.getChecked());
-					return;
-				}
-
-				if (event.getChecked()) {
-					// TODO: Change this to be not un-doable due to the circular
-					// dependency check.
-					actionMgr.doAction(IActionManager.ADD, plugin,
-							UmaPackage.eINSTANCE.getMethodPlugin_Bases(),
-							(MethodPlugin) obj, -1);
-				} else {
-					final MethodPlugin base = (MethodPlugin) obj;
-
-					// Checks if the plugin has any reference that is a element
-					// of the removed base
-					//
-					if (UmaUtil.hasReference(plugin, base)) {
-						String message = AuthoringUIResources.bind(AuthoringUIResources.methodPluginDescriptionRemoveRefConfirm_message, plugin.getName());
-						Shell shell = getSite().getShell();
-						if (AuthoringUIPlugin.getDefault().getMsgDialog()
-								.displayConfirmation(shell.getText(), message)) {
-							// remove all references that are element of the
-							// removed base
-							//
-							actionMgr.execute(new RemoveReferencesCommand(
-									plugin, base));
-							ctrl_refModel.setChecked(base, false);
-						} else {
-							// restore the checked state of the
-							Display.getCurrent().asyncExec(new Runnable() {
-
-								public void run() {
-									ctrl_refModel.setChecked(base, true);
-								}
-
-							});
-
-							return;
-						}
-					}
-
-					// change this to be not un-doable due to the circular
-					// dependency check
-					// plugin.getBases().remove(obj);
-					actionMgr.doAction(IActionManager.REMOVE, plugin,
-							UmaPackage.eINSTANCE.getMethodPlugin_Bases(),
-							(MethodPlugin) obj, -1);
-				}
-
-				// double check circular dependency, not necessary here
-				PluginReferenceChecker.hasCircularConflictWithPlugin(plugin);
-
-				updateChangeDate();
-			}
-
-		});
-
-		if (versionSectionOn) {
-			addVersionSectionListeners();
-		}
-	}
-
-	protected void enableControls(boolean editable) {
-		ctrl_name.setEditable(editable);
-		ctrl_authors.setEditable(editable);
-		ctrl_brief_desc.setEditable(editable);
-		ctrl_version.setEditable(editable);
-		ctrl_change_desc.setEditable(editable);
-		copyright_button.setEnabled(editable);
-		copyright_button_deselect.setEnabled(editable);
-		ctrl_r_brief_desc.setEditable(false);
-	}
-
-	/**
-	 * Loads initial data from model
-	 */
-	private void loadData() {
-		String name = plugin.getName();
-		String desc = plugin.getBriefDescription();
-		ctrl_name.setText(name == null ? "" : name); //$NON-NLS-1$
-		ctrl_brief_desc.setText(desc == null ? "" : desc); //$NON-NLS-1$
-
-		if (versionSectionOn) {
-			loadVersionSectionData();
-		}
-	}
-
-	/**
-	 * Check to see whether version section is visible or not
-	 * @return Returns the versionSectionOn.
-	 */
-	public boolean isVersionSectionOn() {
-		return versionSectionOn;
-	}
-
-	/**
-	 * Set version section to be visible or not
-	 * @param versionSectionOn
-	 *            The versionSectionOn to set.
-	 */
-	public void setVersionSectionOn(boolean versionSectionOn) {
-		this.versionSectionOn = versionSectionOn;
-	}
-
-	private void createVersionSection(FormToolkit toolkit) {
-		versionSection = toolkit.createSection(form.getBody(),
-				Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED
-						| Section.TITLE_BAR);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		versionSection.setLayoutData(td);
-		versionSection.setText(AuthoringUIText.VERSION_INFO_SECTION_NAME);
-		versionSection.setDescription(MessageFormat.format(
-				AuthoringUIText.VERSION_INFO_SECTION_DESC,
-				new String[] { LibraryUIText.getUITextLower(methodElement) }));
-		versionSection.setLayout(new GridLayout());
-
-		versionComposite = toolkit.createComposite(versionSection);
-		versionComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		versionComposite.setLayout(new GridLayout(4, false));
-		versionSection.setClient(versionComposite);
-	}
-
-	/**
-	 * Create the Version section content.
-	 */
-	private void createVersionSectionContent() {
-		String fillText = (plugin.getVersion() == null ? "" : plugin.getVersion());
-		ctrl_version = createTextEditWithLabel4(toolkit, versionComposite,
-				AuthoringUIText.VERSION_TEXT, SWT.DEFAULT, SWT.SINGLE, fillText);
-		
-		fillText = plugin.getChangeDate() == null ? "" : //$NON-NLS-1$
-			DateFormat.getDateInstance(DateFormat.FULL).format(
-					plugin.getChangeDate());
-
-		ctrl_change_date = createTextEditWithLabel4(toolkit, versionComposite,
-				AuthoringUIText.CHANGE_DATE_TEXT, SWT.DEFAULT, SWT.SINGLE, fillText);
-		ctrl_change_date.setEditable(false);
-		
-		{
-			createLabelInComposite(toolkit, versionComposite, AuthoringUIText.CHANGE_DESCRIPTION_TEXT, 2);
-			Composite textPane = createCompositeEqual(toolkit,
-					versionComposite, GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL, 1, 2, 4);
-			
-			ctrl_change_desc = toolkit.createText(textPane, "", SWT.MULTI | SWT.WRAP | SWT.V_SCROLL); //$NON-NLS-1$
-			{
-				GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL);
-				gridData.heightHint = 40;
-				gridData.horizontalSpan = 3;
-				gridData.verticalSpan = 2;
-				ctrl_change_desc.setLayoutData(gridData);
-			}
-
-			view_history_button = toolkit.createButton(textPane, AuthoringUIText.VIEW_HISTORY_BUTTON_TEXT, SWT.PUSH);
-			{
-				GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL);
-				gridData.horizontalSpan = 1;
-				view_history_button.setLayoutData(gridData);
-			}
-			
-			createBlankLabel(toolkit, textPane, 1);
-		}
-
-		{
-			createLabelInComposite(toolkit, versionComposite, AuthoringUIText.AUTHORS_TEXT, 2);
-			Composite textPane = createCompositeEqual(toolkit,
-					versionComposite, GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL, 1, 2, 4);
-			
-			fillText = plugin.getAuthors() == null ? "" : plugin.getAuthors();
-			ctrl_authors = toolkit.createText(textPane, "", SWT.MULTI); //$NON-NLS-1$
-			{
-				GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL);
-				gridData.heightHint = 40;
-				gridData.horizontalSpan = 4;
-				gridData.verticalSpan = 2;
-				ctrl_authors.setLayoutData(gridData);
-			}
-		}
-
-		{
-			label_copyright = createLabelInComposite(toolkit, versionComposite,
-					AuthoringUIText.COPYRIGHT_TEXT, 2);
-			{
-				Composite textPane = createCompositeEqual(toolkit,
-						versionComposite, GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL, 1, 2, 4);
-				ctrl_copyright = toolkit.createTable(textPane, SWT.SINGLE | SWT.READ_ONLY);
-				
-				copyright_viewer = new TableViewer(ctrl_copyright);
-				{
-					GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL
-							| GridData.BEGINNING);
-					gridData.horizontalSpan = 3;
-					gridData.verticalSpan = 2;
-					copyright_viewer.getTable().setLayoutData(gridData);
-				}
-				initContentProviderCopyright();
-				copyright_viewer.setLabelProvider(labelProviderBase);
-				copyright_viewer.setInput(plugin);
-				copyright_button = toolkit.createButton(textPane,
-						AuthoringUIResources.selectButton_text, SWT.SIMPLE);
-				{
-					GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL);
-					gridData.horizontalSpan = 1;
-					copyright_button.setLayoutData(gridData);
-				}
-				copyright_button_deselect = toolkit.createButton(textPane,
-						AuthoringUIResources.deselectButton_text, SWT.SIMPLE);
-				{
-					GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.BEGINNING |GridData.GRAB_HORIZONTAL);
-					gridData.horizontalSpan = 1;
-					copyright_button_deselect.setLayoutData(gridData);
-				}
-			}
-		}
-		
-
-		ctrl_changeable = toolkit
-				.createButton(
-						versionComposite,
-						AuthoringUIResources.methodPluginDescriptionPage_lockPluginLabel, SWT.CHECK); //$NON-NLS-1$
-
-		// Create the expanded composite.
-		expandedVersionComposite = toolkit.createComposite(versionSection,
-				SWT.NONE);
-		expandedVersionComposite.setLayoutData(new GridData(
-				GridData.FILL_HORIZONTAL));
-		expandedVersionComposite.setLayout(new GridLayout(2, false));
-		expandedVersionComposite.setVisible(false);
-
-		// Add the expand/collapse hyperlink image.
-		expandVersionLink = toolkit.createImageHyperlink(
-				expandedVersionComposite, SWT.NONE);
-		expandVersionLink.setImage(AuthoringUIImages.IMG_EXPANDED);
-		expandVersionLink.setUnderlined(false);
-		expandVersionLink.setToolTipText(AuthoringUIResources.closeRTE); //$NON-NLS-1$
-		expandVersionLink.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				toggle(e, VERSION_SECTION_ID);
-			}
-		});
-
-		// Add the expand/collapse hyperlink text.
-		expandVersionLabel = createDecoratedLabel(toolkit, expandedVersionComposite, ""); //$NON-NLS-1$
-		toolkit.paintBordersFor(expandedVersionComposite);
-		toolkit.paintBordersFor(versionComposite);
-	}
-
-	private void initContentProviderCopyright() {
-		copyrightContentProvider = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				List list = new ArrayList();
-				if (plugin.getCopyrightStatement() != null) {
-					list.add(plugin.getCopyrightStatement());
-				}
-				return list.toArray();
-			}
-		};
-		copyright_viewer.setContentProvider(copyrightContentProvider);
-	}
-
-	protected void addVersionSectionListeners() {
-
-		final MethodElementEditor editor = (MethodElementEditor) getEditor();
-
-		modelModifyListener = editor.createModifyListener(plugin);
-		contentModifyListener = editor.createModifyListener(plugin);
-
-		ctrl_version.addModifyListener(contentModifyListener);
-		ctrl_version.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getMethodUnit_Version());
-			}
-
-			public void focusLost(FocusEvent e) {
-				String oldContent = plugin.getVersion();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				String newContent = StrUtil
-						.getPlainText(ctrl_version.getText());
-				if (!newContent.equals(oldContent)) {
-					actionMgr.doAction(IActionManager.SET, plugin,
-							UmaPackage.eINSTANCE.getMethodUnit_Version(),
-							newContent, -1);
-					updateChangeDate();
-				}
-			}
-		});
-
-		ctrl_authors.addModifyListener(contentModifyListener);
-		ctrl_authors.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getMethodUnit_Authors());
-			}
-
-			public void focusLost(FocusEvent e) {
-				String oldContent = plugin.getAuthors();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				String newContent = StrUtil
-						.getPlainText(ctrl_authors.getText());
-				if (!newContent.equals(oldContent)) {
-					actionMgr.doAction(IActionManager.SET, plugin,
-							UmaPackage.eINSTANCE.getMethodUnit_Authors(),
-							newContent, -1);
-					updateChangeDate();
-				}
-			}
-		});
-
-		copyright_button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IFilter filter = new ContentFilter() {
-					protected boolean childAccept(Object obj) {
-						if (obj instanceof Guidance) {
-							return (obj instanceof SupportingMaterial);
-						}
-						return false;
-					}
-				};
-				List alreadyExsting = new ArrayList();
-				if (ctrl_copyright.getItemCount() > 0) {
-					TableItem item = ctrl_copyright.getItems()[0];
-					if (item.getData() != null)
-						alreadyExsting.add(item.getData());
-				}
-				ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-						.getWorkbench().getActiveWorkbenchWindow().getShell(),
-						filter, plugin, FilterConstants.SUPPORTING_MATERIALS,
-						alreadyExsting);
-				fd.setViewerSelectionSingle(true);
-				fd.setBlockOnOpen(true);
-				fd.setTitle(FilterConstants.SUPPORTING_MATERIALS);
-				fd.open();
-				fd.getSelectedItems();
-				if (fd.getSelectedItems().size() > 0) {
-					editor.getActionManager().doAction(
-							IActionManager.SET,
-							plugin,
-							UmaPackage.eINSTANCE
-									.getMethodUnit_CopyrightStatement(),
-							(SupportingMaterial) fd.getSelectedItems().get(0),
-							-1);
-				}
-				copyright_viewer.refresh();
-
-			}
-		});
-
-		ctrl_change_desc.addModifyListener(contentModifyListener);
-		ctrl_change_desc.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getMethodUnit_ChangeDescription());
-			}
-
-			public void focusLost(FocusEvent e) {
-				String oldContent = plugin.getChangeDescription();
-				char delimiter = AuthoringUIResources.ChangeHistoryDialog_delimiter.charAt(0); //$NON-NLS-1$
-
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				String newContent = ctrl_change_desc.getText();
-
-				newContent = newContent.replace(delimiter, ' '); //$NON-NLS-1$ //$NON-NLS-2$
-
-				if (!newContent.equals(lastChangeHistory)) {
-					lastChangeHistory = newContent;
-					if ((oldContent != null)
-							&& (!(StrUtil.isBlank(oldContent)))) {
-						newContent = oldContent + delimiter + newContent; //$NON-NLS-1$
-					}
-
-					actionMgr.doAction(IActionManager.SET, plugin,
-							UmaPackage.eINSTANCE
-									.getMethodUnit_ChangeDescription(),
-							newContent, -1);
-
-					updateChangeDate();
-				}
-
-			}
-
-		});
-
-		view_history_button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-
-				ChangeHistoryDialog dlg = new ChangeHistoryDialog(PlatformUI
-						.getWorkbench().getActiveWorkbenchWindow().getShell(),
-						plugin);
-				dlg.open();
-			}
-		});
-
-		copyright_button_deselect.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				actionMgr
-						.doAction(IActionManager.SET, plugin,
-								UmaPackage.eINSTANCE
-										.getMethodUnit_CopyrightStatement(),
-								null, -1);
-				copyright_viewer.refresh();
-			}
-		});
-
-		ctrl_changeable.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				notificationEnabled = true;
-
-				
-				IStatus status = TngUtil.checkEdit(plugin, getSite().getShell());
-				if (status.isOK()) {
-					
-					String message = AuthoringUIResources
-							.bind(
-									AuthoringUIResources.methodPluginDescriptionPage_lockPlugin_message,
-									plugin.getName());
-					Shell shell = getSite().getShell();
-					if (AuthoringUIPlugin.getDefault().getMsgDialog()
-							.displayConfirmation(shell.getText(), message)) {
-						// close editors on any change in ctrl_changeable
-						// if (ctrl_changeable.getSelection()) {
-						getDirtyEditors(null);
-						boolean ret = actionMgr.doAction(IActionManager.SET,
-								plugin, UmaPackage.eINSTANCE
-										.getMethodPlugin_UserChangeable(),
-								new Boolean(!ctrl_changeable.getSelection()),
-								-1);
-						// in case of readonly file, roll back changes.
-						if (!ret) {
-							ctrl_changeable.setSelection(!ctrl_changeable
-									.getSelection());
-							return;
-						}
-
-						// }
-						enableControls(!ctrl_changeable.getSelection());
-					} else {
-						// actionMgr.undo();
-						ctrl_changeable.setSelection(!ctrl_changeable
-								.getSelection());
-						enableControls(!ctrl_changeable.getSelection());
-						// return;
-					}
-				} else {
-					AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-							AuthoringUIResources.editDialog_title,
-							AuthoringUIResources.editDialog_msgCannotEdit,
-							status);
-					return;
-				}
-				copyright_viewer.refresh();
-				
-				// refresh editor title image. 
-				((MethodElementEditor)getEditor()).refreshTitleImage();
-			}
-
-			/**
-			 * Return a list of dirty editors associated with the given Plugin.
-			 * editors from MethodElementEditor.
-			 * 
-			 * @return List the dirty editors
-			 */
-			List getDirtyEditors(MethodPlugin methodplugin) {
-				IWorkbenchPage workbenchPage = AuthoringUIPlugin.getDefault()
-						.getWorkbench().getActiveWorkbenchWindow()
-						.getActivePage();
-				IEditorReference[] editorReferences = workbenchPage
-						.getEditorReferences();
-				ArrayList closeEditorRefs = new ArrayList();
-				for (int i = 0; i < editorReferences.length; i++) {
-					IEditorReference reference = editorReferences[i];
-					IEditorPart editor = reference.getEditor(true);
-					if (editor != null) {
-						IEditorInput input = editor.getEditorInput();
-						MethodElement element = null;
-						if (input instanceof MethodElementEditorInput) {
-							element = ((MethodElementEditorInput) input)
-									.getMethodElement();
-						} else if (input instanceof ConfigurationEditorInput) {
-							element = ((ConfigurationEditorInput) input)
-									.getConfiguration();
-						}
-						if (element != null
-								&& (element.eContainer() == null || UmaUtil
-										.isContainedBy(element, plugin))) {
-							if (!element.equals(plugin))
-								closeEditorRefs.add(reference);
-						}
-					}
-				}
-				int size = closeEditorRefs.size();
-				IEditorReference[] references = new IEditorReference[size];
-				for (int i = 0; i < size; i++) {
-					references[i] = (IEditorReference) closeEditorRefs.get(i);
-				}
-				workbenchPage.closeEditors(references, true);
-				return null;
-			}
-		});
-	}
-
-	/*
-	 * update the change date if any attribute is modified.
-	 */
-	protected void updateChangeDate() {
-
-		Date changeDate = plugin.getChangeDate();
-		DateFormat df = DateFormat.getDateInstance(DateFormat.FULL);
-
-		String oldContent = ""; //$NON-NLS-1$
-		if (changeDate != null) {
-			oldContent = df.format(changeDate);
-		}
-
-		Date currentDate = new Date();
-		String newContent = df.format(currentDate);
-		if (!newContent.equals(oldContent)) {
-			actionMgr.doAction(IActionManager.SET, plugin, UmaPackage.eINSTANCE
-					.getMethodUnit_ChangeDate(), currentDate, -1);
-			ctrl_change_date.setText(newContent);
-		}
-	}
-
-	protected void loadVersionSectionData() {
-		ctrl_version
-				.setText(plugin.getVersion() == null ? "" : plugin.getVersion()); //$NON-NLS-1$
-		ctrl_authors
-				.setText(plugin.getAuthors() == null ? "" : plugin.getAuthors()); //$NON-NLS-1$
-		ctrl_change_desc.setText(""); //$NON-NLS-1$
-		ctrl_change_date.setText(plugin.getChangeDate() == null ? "" : //$NON-NLS-1$
-				DateFormat.getDateInstance(DateFormat.FULL).format(
-						plugin.getChangeDate())); //$NON-NLS-1$
-		ctrl_changeable
-				.setSelection(!plugin.getUserChangeable().booleanValue());
-	}
-
-	/**
-	 * Toggle Description control to expand and control state
-	 * 
-	 */
-	protected void toggle(HyperlinkEvent e, int id) {
-		// TODO: We should combine these methods into one. One way to do it,
-		// dispoing
-		// ctrl_expanded every time it collapses and creating it when we expand.
-		// At present, there is no method to dispose
-		if (id == GENERAL_SECTION_ID) {
-			toggle(e);
-		}
-		if (id == VERSION_SECTION_ID) {
-			toggleVersionSection(e);
-		}
-	}
-
-	private void toggleVersionSection(HyperlinkEvent e) {
-		if (ctrl_version_expanded == null) {
-			ctrl_version_expanded = createRichTextEditor(toolkit,
-					expandedVersionComposite, SWT.MULTI | SWT.WRAP
-							| SWT.V_SCROLL, GridData.FILL_BOTH, getRichTextEditorHeight(), getRichTextEditorWidth(), 2,
-							expandVersionLabel); //$NON-NLS-1$
-			ctrl_version_expanded.addModifyListener(contentModifyListener);
-		}
-
-		if (descExpandFlag) {
-			versionComposite.setVisible(true);
-			expandedVersionComposite.setVisible(false);
-			versionSection.setClient(versionComposite);
-			refModelSection.setExpanded(true);
-			generalSection.setExpanded(true);
-			IMethodRichText richText = getActiveRichTextControl();
-			richText.setText(ctrl_version_expanded.getText());
-			for (Iterator i = richText.getListeners(); i.hasNext();) {
-				RichTextListener listener = (RichTextListener) i.next();
-				ctrl_version_expanded.removeListener(listener.getEventType(),
-						listener.getListener());
-			}
-			if (ctrl_version_expanded.getModified()) {
-				((MethodElementEditor) getEditor())
-						.saveModifiedRichText(ctrl_version_expanded);
-			}
-			richText.setFocus();
-		} else {
-			versionComposite.setVisible(false);
-			expandedVersionComposite.setVisible(true);
-			versionSection.setClient(expandedVersionComposite);
-			refModelSection.setExpanded(false);
-			generalSection.setExpanded(false);
-			((Label)expandVersionLabel.getControl())
-					.setText((String) ((ImageHyperlink) e.getSource())
-							.getData("Title")); //$NON-NLS-1$    		
-			IMethodRichText richText = (IMethodRichText) e.getHref();
-			ctrl_version_expanded.setText(richText.getText());
-			ctrl_version_expanded.setModalObject(richText.getModalObject());
-			ctrl_version_expanded.setModalObjectFeature(richText
-					.getModalObjectFeature());
-			for (Iterator i = richText.getListeners(); i.hasNext();) {
-				RichTextListener listener = (RichTextListener) i.next();
-				ctrl_version_expanded.addListener(listener.getEventType(),
-						listener.getListener());
-			}
-			ctrl_version_expanded.setFocus();
-			setActiveRichTextControl(richText);
-		}
-
-		versionSection.layout(true);
-		descExpandFlag = !descExpandFlag;
-	}
-
-	/**
-	 * Set active rich text control
-	 */
-	private void setActiveRichTextControl(IMethodRichText ctrl) {
-		activeControl = ctrl;
-	}
-
-	/**
-	 * Get Active Rich text control.
-	 */
-	private IMethodRichText getActiveRichTextControl() {
-		return activeControl;
-	}
-
-	protected class UserChangeableAdapter extends AdapterImpl {
-		public void notifyChanged(Notification msg) {
-			switch (msg.getFeatureID(MethodPlugin.class)) {
-			case UmaPackage.METHOD_PLUGIN__USER_CHANGEABLE:
-				Boolean b = (Boolean) msg.getNewValue();
-				setUserChangeable(b.booleanValue());
-				return;
-			}
-		}
-	}
-
-	public void setUserChangeable(boolean userChangeable) {
-		if (!notificationEnabled)
-			return;
-		notificationEnabled = false;
-		plugin.setUserChangeable(Boolean.valueOf(userChangeable));
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#dispose()
-	 */
-	public void dispose() {
-		plugin.eAdapters().remove(userChangeableAdapter);
-		super.dispose();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.IRefreshable#refreshName(java.lang.String)
-	 */
-	public void refreshName(String newName) {
-		if (newName != null) {
-			if ((ctrl_name != null) && !(ctrl_name.isDisposed())) {
-				ctrl_name.removeModifyListener(nameModifyListener);
-				ctrl_name.setText(newName);
-				ctrl_name.addModifyListener(nameModifyListener);
-				form.setText(FORM_PREFIX + plugin.getName());
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/PracticeDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/PracticeDescriptionPage.java
deleted file mode 100755
index 67eb05e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/PracticeDescriptionPage.java
+++ /dev/null
@@ -1,348 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-
-/**
- * The Description page in a Practice editor.
- * 
- * @author Shashidhar Kannoori
- * @author Kelvin Low
- * @since 1.0
- */
-public class PracticeDescriptionPage extends GuidanceDescriptionPage {
-
-	private IMethodRichText ctrl_additional_info, ctrl_problem,
-			ctrl_background;
-
-	private IMethodRichText ctrl_goals, ctrl_application, ctrl_levels_adoption;
-
-	private Practice guidance;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PracticeDescriptionPage(FormEditor editor) {
-		super(editor);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.GuidanceDescriptionPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		guidance = (Practice) contentElement;
-		setContentFieldHeight(200);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.GuidanceDescriptionPage#createEditorContent(org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	protected void createEditorContent(FormToolkit toolkit) {
-		super.createEditorContent(toolkit);
-
-		ctrl_additional_info = createRichTextEditWithLinkForSection(toolkit,
-				detailComposite, AuthoringUIText.ADDITIONAL_INFO_TEXT, 40, 400,
-				DETAIL_SECTION_ID);
-		ctrl_goals = createRichTextEditWithLinkForSection(toolkit,
-				detailComposite, AuthoringUIText.GOALS_TEXT, 40, 400,
-				DETAIL_SECTION_ID);
-		ctrl_application = createRichTextEditWithLinkForSection(toolkit,
-				detailComposite, AuthoringUIText.APPLICATION_TEXT, 40, 400,
-				DETAIL_SECTION_ID);
-		ctrl_problem = createRichTextEditWithLinkForSection(toolkit,
-				detailComposite, AuthoringUIText.PROBLEM_TEXT, 40, 400,
-				DETAIL_SECTION_ID);
-		ctrl_background = createRichTextEditWithLinkForSection(toolkit,
-				detailComposite, AuthoringUIText.BACKGROUND_TEXT, 40, 400,
-				DETAIL_SECTION_ID);
-		ctrl_levels_adoption = createRichTextEditWithLinkForSection(toolkit,
-				detailComposite, AuthoringUIText.LEVEL_OF_ADOPTION_TEXT, 40,
-				400, DETAIL_SECTION_ID);
-
-		label_base.setText(AuthoringUIText.BASE_ELEMENT_TEXT);
-	}
-
-	/**
-	 * Add listeners
-	 *
-	 * @see org.eclipse.epf.authoring.ui.forms.GuidanceDescriptionPage#addListeners()
-	 */
-	protected void addListeners() {
-		super.addListeners();
-		final MethodElementEditor editor = (MethodElementEditor) getEditor();
-
-		final ModifyListener contentModifyListener = editor
-				.createModifyListener(guidance.getPresentation());
-
-		ctrl_additional_info
-				.setModalObject((org.eclipse.epf.uma.PracticeDescription) guidance
-						.getPresentation());
-		ctrl_additional_info.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getPracticeDescription_AdditionalInfo());
-		ctrl_additional_info.addModifyListener(contentModifyListener);
-		ctrl_additional_info.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_additional_info;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = ((org.eclipse.epf.uma.PracticeDescription) guidance
-						.getPresentation()).getAdditionalInfo();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = editor.getActionManager().doAction(
-							IActionManager.SET,
-							(org.eclipse.epf.uma.PracticeDescription) guidance
-									.getPresentation(),
-							UmaPackage.eINSTANCE
-									.getPracticeDescription_AdditionalInfo(),
-							newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-
-		ctrl_application
-				.setModalObject((org.eclipse.epf.uma.PracticeDescription) guidance
-						.getPresentation());
-		ctrl_application.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getPracticeDescription_Application());
-		ctrl_application.addModifyListener(contentModifyListener);
-		ctrl_application.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_application;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = ((org.eclipse.epf.uma.PracticeDescription) guidance
-						.getPresentation()).getApplication();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = editor.getActionManager().doAction(
-							IActionManager.SET,
-							(org.eclipse.epf.uma.PracticeDescription) guidance
-									.getPresentation(),
-							UmaPackage.eINSTANCE
-									.getPracticeDescription_Application(),
-							newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-
-		ctrl_goals.setModalObject((org.eclipse.epf.uma.PracticeDescription) guidance
-				.getPresentation());
-		ctrl_goals.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getPracticeDescription_Goals());
-		ctrl_goals.addModifyListener(contentModifyListener);
-		ctrl_goals.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_goals;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = ((org.eclipse.epf.uma.PracticeDescription) guidance
-						.getPresentation()).getGoals();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = editor.getActionManager()
-							.doAction(
-									IActionManager.SET,
-									(org.eclipse.epf.uma.PracticeDescription) guidance
-											.getPresentation(),
-									UmaPackage.eINSTANCE
-											.getPracticeDescription_Goals(),
-									newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-
-		ctrl_problem.setModalObject((org.eclipse.epf.uma.PracticeDescription) guidance
-				.getPresentation());
-		ctrl_problem.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getPracticeDescription_Problem());
-		ctrl_problem.addModifyListener(contentModifyListener);
-		ctrl_problem.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_problem;
-				String oldContent = ((org.eclipse.epf.uma.PracticeDescription) guidance
-						.getPresentation()).getProblem();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = editor.getActionManager().doAction(
-							IActionManager.SET,
-							(org.eclipse.epf.uma.PracticeDescription) guidance
-									.getPresentation(),
-							UmaPackage.eINSTANCE
-									.getPracticeDescription_Problem(),
-							newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-
-		ctrl_background
-				.setModalObject((org.eclipse.epf.uma.PracticeDescription) guidance
-						.getPresentation());
-		ctrl_background.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getPracticeDescription_Background());
-		ctrl_background.addModifyListener(contentModifyListener);
-		ctrl_background.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_background;
-				String oldContent = ((org.eclipse.epf.uma.PracticeDescription) guidance
-						.getPresentation()).getBackground();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = editor.getActionManager().doAction(
-							IActionManager.SET,
-							(org.eclipse.epf.uma.PracticeDescription) guidance
-									.getPresentation(),
-							UmaPackage.eINSTANCE
-									.getPracticeDescription_Background(),
-							newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-
-		ctrl_levels_adoption
-				.setModalObject((org.eclipse.epf.uma.PracticeDescription) guidance
-						.getPresentation());
-		ctrl_levels_adoption.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getPracticeDescription_LevelsOfAdoption());
-		ctrl_levels_adoption.addModifyListener(contentModifyListener);
-		ctrl_levels_adoption.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_levels_adoption;
-				String oldContent = ((org.eclipse.epf.uma.PracticeDescription) guidance
-						.getPresentation()).getLevelsOfAdoption();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = descExpandFlag ? ctrl_expanded.getText()
-						: ctrl_levels_adoption.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = editor.getActionManager().doAction(
-							IActionManager.SET,
-							(org.eclipse.epf.uma.PracticeDescription) guidance
-									.getPresentation(),
-							UmaPackage.eINSTANCE
-									.getPracticeDescription_LevelsOfAdoption(),
-							newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.GuidanceDescriptionPage#refresh(boolean)
-	 */
-	protected void refresh(boolean editable) {
-		super.refresh(editable);
-		ctrl_additional_info.setEditable(editable);
-		ctrl_application.setEditable(editable);
-		ctrl_goals.setEditable(editable);
-		ctrl_problem.setEditable(editable);
-		ctrl_levels_adoption.setEditable(editable);
-		ctrl_background.setEditable(editable);
-	}
-
-	/**
-	 * Load initial data from model
-	 *
-	 * @see org.eclipse.epf.authoring.ui.forms.GuidanceDescriptionPage#loadData()
-	 */
-	protected void loadData() {
-		super.loadData();
-		if (guidance != null) {
-			org.eclipse.epf.uma.PracticeDescription guidanceDescription = (org.eclipse.epf.uma.PracticeDescription) guidance
-					.getPresentation();
-			ctrl_additional_info
-					.setText(guidanceDescription.getAdditionalInfo() == null ? "" : guidanceDescription.getAdditionalInfo()); //$NON-NLS-1$
-			ctrl_problem
-					.setText(guidanceDescription.getProblem() == null ? "" : guidanceDescription.getProblem()); //$NON-NLS-1$
-			ctrl_background
-					.setText(guidanceDescription.getBackground() == null ? "" : guidanceDescription.getBackground()); //$NON-NLS-1$
-			ctrl_application
-					.setText(guidanceDescription.getApplication() == null ? "" : guidanceDescription.getApplication()); //$NON-NLS-1$
-			ctrl_goals
-					.setText(guidanceDescription.getGoals() == null ? "" : guidanceDescription.getGoals()); //$NON-NLS-1$
-			ctrl_levels_adoption
-					.setText(guidanceDescription.getLevelsOfAdoption() == null ? "" : guidanceDescription.getLevelsOfAdoption()); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.GuidanceDescriptionPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return guidance;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/PracticeReferencesPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/PracticeReferencesPage.java
deleted file mode 100755
index b374174..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/PracticeReferencesPage.java
+++ /dev/null
@@ -1,230 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.filters.AllFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The References page in the Practice editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class PracticeReferencesPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "practiceReferencesPage"; //$NON-NLS-1$
-
-	private Practice practice;
-
-	private IActionManager actionMgr;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PracticeReferencesPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.REFERENCES_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		practice = (Practice) contentElement;
-		actionMgr = ((MethodElementEditor) getEditor()).getActionManager();
-		setUseCategory2(false);
-		setUseCategory3(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				List list = new ArrayList();
-				list.addAll(practice.getContentReferences());
-				list.addAll(practice.getActivityReferences());
-				return list.toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			for (Iterator it = addItems.iterator(); it.hasNext();) {
-				Object item = it.next();
-				if (item instanceof ContentElement) {
-					actionMgr.doAction(IActionManager.ADD, practice,
-							UmaPackage.eINSTANCE
-									.getPractice_ContentReferences(), item, -1);
-				} else if (item instanceof Activity) {
-					actionMgr
-							.doAction(IActionManager.ADD, practice,
-									UmaPackage.eINSTANCE
-											.getPractice_ActivityReferences(),
-									item, -1);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				Object item = it.next();
-				if (item instanceof ContentElement) {
-					actionMgr.doAction(IActionManager.REMOVE, practice,
-							UmaPackage.eINSTANCE
-									.getPractice_ContentReferences(), item, -1);
-				} else if (item instanceof Activity) {
-					actionMgr
-							.doAction(IActionManager.REMOVE, practice,
-									UmaPackage.eINSTANCE
-											.getPractice_ActivityReferences(),
-									item, -1);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return practice;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.ONLY_CONTENT_ELEMENTS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new AllFilter() {
-			protected boolean childAccept(Object obj) {
-				if(obj instanceof Milestone) return false;
-				if(obj instanceof ContentElement
-					|| obj instanceof BreakdownElement
-					|| obj instanceof ProcessPackage) 
-					return true;
-				return false;
-			}
-		};
-	}
-	/**
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getFilterTypes()
-	 */
-	protected String[] getFilterTypes() {
-		String[] str = new String[14];
-		int i = 0;
-		str[i++] = FilterConstants.ALL_ELEMENTS;
-		str[i++] = FilterConstants.space + FilterConstants.ROLES;
-		str[i++] = FilterConstants.space + FilterConstants.TASKS;
-		str[i++] = FilterConstants.space + FilterConstants.WORKPRODUCTS;
-		str[i++] = FilterConstants.space + FilterConstants.GUIDANCE;
-		str[i++] = FilterConstants.DISCIPLINES;
-		str[i++] = FilterConstants.ROLESETS;
-		str[i++] = FilterConstants.WORKPRODUCTTYPES;
-		str[i++] = FilterConstants.DOMAINS;
-		str[i++] = FilterConstants.TOOLS;
-		str[i++] = FilterConstants.CUSTOM_CATEGORIES;
-		str[i++] = FilterConstants.PROCESSES;
-		str[i++] = FilterConstants.CONTENT_PACKAGES;
-		str[i++] = FilterConstants.METHO_PLUGINS;
-		return str;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.practiceReferencesPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.practiceReferencesPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.practiceReferencesPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.practiceReferencesPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.practiceReferencesPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel3()
-	 */
-	protected String getSelectedLabel3() {
-		return AuthoringUIResources.practiceReferencesPage_selectedLabel;
-	}
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ProcessBreakdownStructureFormPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ProcessBreakdownStructureFormPage.java
deleted file mode 100755
index 670e7ca..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ProcessBreakdownStructureFormPage.java
+++ /dev/null
@@ -1,1063 +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.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.gef.figures.Colors;
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.celleditors.AbstractCheckBoxCellEditor;
-import org.eclipse.epf.authoring.ui.celleditors.ProcessCheckBoxCellEditor;
-import org.eclipse.epf.authoring.ui.editors.ColumnDescriptor;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.editors.ProcessEditor;
-import org.eclipse.epf.authoring.ui.providers.ExposedAdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.providers.VariabilityElementLabelProvider;
-import org.eclipse.epf.authoring.ui.views.ProcessViewer;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.IBSItemProvider;
-import org.eclipse.epf.library.edit.process.IColumnAware;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkOrderType;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckboxCellEditor;
-import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-
-/**
- * Breadown structure editor
- * 
- * @author Phong Nguyen Le
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class ProcessBreakdownStructureFormPage extends ProcessFormPage
-		implements IViewerProvider {
-
-	private static final String TXT_TRUE = "true"; //$NON-NLS-1$
-
-	private static final String TXT_FALSE = "false"; //$NON-NLS-1$
-
-	protected static final Collection ECLASSES;
-	
-	private int tabIndex = 0;
-	
-	static {
-		ECLASSES = new ArrayList();
-		ECLASSES.add(UmaPackage.eINSTANCE.getMethodPackage());
-	}
-	
-	private class ProcessAdapterFactoryLabelProvider extends
-			VariabilityElementLabelProvider implements IColorProvider {
-
-		private DecoratingLabelProvider decoratingLabelProvider;
-		
-		/**
-		 * @param adapterFactory
-		 */
-		public ProcessAdapterFactoryLabelProvider(AdapterFactory adapterFactory) {
-			super(adapterFactory);
-			decoratingLabelProvider = new DecoratingLabelProvider(
-					new AdapterFactoryLabelProvider(adapterFactory),
-					PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator());
-		}
-		
-		public void addListener(ILabelProviderListener listener) {
-			super.addListener(listener);
-			decoratingLabelProvider.addListener(listener);
-		}
-		
-		public void removeListener(ILabelProviderListener listener) {			
-			super.removeListener(listener);
-			decoratingLabelProvider.removeListener(listener);
-		}
-				
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider#getColumnImage(java.lang.Object, int)
-		 */
-		public Image getColumnImage(Object object, int columnIndex) {
-			if(columnIndex == 0) {
-				return getImage(object);
-			}
-			return super.getColumnImage(object, columnIndex);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider#getImage(java.lang.Object)
-		 */
-		public Image getImage(Object object) {
-			return decoratingLabelProvider.getImage(object);
-		}
-
-		/**
-		 * 
-		 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
-		 */
-		public Color getForeground(Object element) {
-			if (isSuppressed(element)) {
-				return Colors.SUPRESSED_ELEMENT_LABEL;
-			}
-			else if (isExternal(element)) {
-				return Colors.INHERITED_ELEMENT_LABEL;
-			}
-			return ColorConstants.listForeground;
-		}
-
-		private boolean isSuppressed(Object element) {
-			if (element instanceof BreakdownElement) {
-				return getSuppression()
-						.isSuppressed((BreakdownElement) element);
-			} else if (element instanceof BreakdownElementWrapperItemProvider) {
-				return getSuppression().isSuppressed(
-						(BreakdownElementWrapperItemProvider) element);
-			}
-			return false;
-		}
-
-		private Suppression getSuppression() {
-			return ((ProcessEditor) ProcessBreakdownStructureFormPage.this
-					.getEditor()).getSuppression();
-		}
-
-		/**
-		 * 
-		 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
-		 */
-		public Color getBackground(Object element) {
-			// let OS take control over tree widget background
-			// rather than sending one fixed background.
-			return null;//ColorConstants.listBackground;
-		}
-
-		/**
-		 * 
-		 * @see com.ibm.library.edit.util.VariabilityElementLabelProvider#isExternal(java.lang.Object)
-		 */
-		public boolean isExternal(Object element) {
-			return ProcessUtil.isInherited(element);
-		}
-
-		/**
-		 * @see com.ibm.library.edit.util.VariabilityElementLabelProvider#getFont(java.lang.Object)
-		 */
-		public Font getFont(Object element) {
-			if (isExternal(element)) {
-				return italicFont;
-			}
-			return regularFont;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.epf.authoring.ui.providers.VariabilityElementLabelProvider#dispose()
-		 */
-		public void dispose() {
-			decoratingLabelProvider.dispose();
-			decoratingLabelProvider = null;
-			super.dispose();
-		}
-	}
-
-	private class ValidatingTextCellEditor extends TextCellEditor {
-		protected Object lastInvalidElement;
-
-		private int columnIndex;
-
-		/**
-		 * @param parent
-		 */
-		public ValidatingTextCellEditor(Composite parent) {
-			super(parent);
-		}
-
-		void setColumnIndex(int columnIndex) {
-			this.columnIndex = columnIndex;
-		}
-
-		public int getColumnIndex() {
-			return columnIndex;
-		}
-
-		public Object getLastInvalidElement() {
-			return lastInvalidElement;
-		}
-
-		String isValid(String txt) {
-			IStructuredSelection selection = (IStructuredSelection) viewer
-					.getSelection();
-			if (selection.size() == 1) {
-				Object e = selection.getFirstElement();
-				String msg = isValid(e, txt);
-				if (msg != null) {
-					lastInvalidElement = e;
-				} else {
-					lastInvalidElement = null;
-				}
-				return msg;
-			}
-			return null;
-		}
-
-		protected String isValid(Object e, String txt) {
-			return null;
-		}
-	}
-
-	private static class CellEditorValidator implements ICellEditorValidator {
-
-		private ValidatingTextCellEditor cellEditor;
-
-		/**
-		 * 
-		 */
-		public CellEditorValidator(ValidatingTextCellEditor cellEditor) {
-			this.cellEditor = cellEditor;
-		}
-
-		/**
-		 * @see org.eclipse.jface.viewers.ICellEditorValidator#isValid(java.lang.Object)
-		 */
-		public String isValid(Object value) {
-			return cellEditor.isValid((String) value);
-		}
-
-	}
-
-	private class ValidatingDeactivateListener implements Listener {
-		private ValidatingTextCellEditor cellEditor;
-
-		ValidatingDeactivateListener(ValidatingTextCellEditor cellEditor) {
-			this.cellEditor = cellEditor;
-		}
-
-		public void handleEvent(Event e) {
-			Display.getCurrent().asyncExec(new Runnable() {
-				public void run() {
-					if (cellEditor.getLastInvalidElement() != null) {
-						AuthoringUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayError(
-										AuthoringUIResources.editProcessElementErrorDialog_title, //$NON-NLS-1$
-										cellEditor.getErrorMessage());
-						viewer.editElement(cellEditor.getLastInvalidElement(),
-								cellEditor.getColumnIndex());
-					}
-				}
-
-			});
-		}
-	}
-
-	// private class ValidatingFocusAdapter extends FocusAdapter {
-	// private ValidatingTextCellEditor cellEditor;
-	//
-	// ValidatingFocusAdapter(ValidatingTextCellEditor cellEditor) {
-	// this.cellEditor = cellEditor;
-	// }
-	//
-	// public void focusLost(FocusEvent e) {
-	// Display.getCurrent().asyncExec(new Runnable() {
-	//
-	// public void run() {
-	// if (cellEditor.getLastInvalidElement() != null) {
-	// AuthoringUIPlugin
-	// .getDefault()
-	// .getMsgDialog()
-	// .displayError(
-	// AuthoringUIResources
-	// .getString("AuthoringUI.editProcessElementErrorDialog.title"),
-	// //$NON-NLS-1$
-	// cellEditor.getErrorMessage());
-	// viewer.editElement(cellEditor.getLastInvalidElement(),
-	// cellEditor.getColumnIndex());
-	// }
-	// }
-	//
-	// });
-	// }
-	// }
-
-	// private Composite parent = null;
-
-	private ColumnDescriptor[] columnDescriptors;
-
-	// private boolean validNamePrompted = false;
-	// private int promptCount = 0;
-
-	// private MethodElement promptedElement;
-
-	// private TableTreeViewer tableTreeViewer;
-
-	private AdapterFactory adapterFactory;
-
-	// private int tabIndex;
-
-	// private Object tabFolder;
-
-	protected ProcessViewer viewer;
-
-	private TextCellEditor textCellEditor;
-
-	private ValidatingTextCellEditor nameCellEditor;
-
-	private ValidatingTextCellEditor predListCellEditor;
-
-	private ComboBoxCellEditor comboBoxCellEditor;
-
-	private CheckboxCellEditor checkBoxCellEditor;
-
-	private ValidatingTextCellEditor presentationNameCellEditor;
-
-	// private HashMap columnIndexToNameMap;
-	private boolean isReadOnly;
-
-	/**
-	 * Creates an instance
-	 * @param editor
-	 * @param id
-	 * @param title
-	 */
-	public ProcessBreakdownStructureFormPage(FormEditor editor, String id,
-			String title) {
-		super(editor, id, title);
-	}
-
-	/**
-	 * If returns true, editing is disabled or not available for the process 
-	 * breakdown structure.
-	 * 
-	 */
-	public boolean isReadOnly() {
-		if (isReadOnly) {
-			return isReadOnly;
-		}
-		return TngUtil.isLocked(process);
-	}
-	
-	/**
-	 * If returns true, editing is disabled or not available for the process 
-	 * breakdown structure.
-	 * 
-	 */
-	public boolean basicIsReadOnly() {
-		return isReadOnly;
-	}
-
-	/**
-	 * Enables/disable modifying process breakdown structure
-	 * 
-	 * @param isReadOnly
-	 */
-	public void setReadOnly(boolean isReadOnly) {
-		this.isReadOnly = isReadOnly;
-	}
-
-	/**
-	 * Sets adapter factory to create item provider for each element in 
-	 * the breakdown structure
-	 *
-	 * @param adapterFactory
-	 */
-	public void setAdapterFactory(AdapterFactory adapterFactory) {
-		this.adapterFactory = adapterFactory;
-	}
-
-	/**
-	 * Sets column descriptors to define the columns of the tree.
-	 * 
-	 * @param columnDescriptors
-	 */
-	public void setColumnDescriptors(ColumnDescriptor[] columnDescriptors) {
-		this.columnDescriptors = columnDescriptors;
-
-		if (adapterFactory instanceof IColumnAware) {
-			Map columnIndexToNameMap = new HashMap();
-			for (int i = 0; i < columnDescriptors.length; i++) {
-				columnIndexToNameMap.put(new Integer(i),
-						columnDescriptors[i].id);
-			}
-			((IColumnAware) adapterFactory)
-					.setColumnIndexToNameMap(columnIndexToNameMap);
-		}
-	}
-
-	private void setText(BreakdownElement e, String prop, String txt) {
-		IActionManager actionMgr = ((MethodElementEditor) getEditor())
-				.getActionManager();
-		if (prop == IBSItemProvider.COL_PREDECESSORS) {
-			List predecessors = new ArrayList();
-			WorkBreakdownElement wbe = (WorkBreakdownElement) e;
-			if (ProcessUtil.checkPredecessorList(wbe, txt, adapterFactory,
-					process, predecessors) == null) {
-				WorkOrder wo = null;
-				int size = wbe.getLinkToPredecessor().size();
-				
-				// remove WorkOrders for predecessors that are not in predecessor list and accepted by the filter
-				//
-				List predToBeDeleted = new ArrayList();
-				IFilter filter = ProcessUtil.getFilter(adapterFactory);
-				boolean nullFilter = filter == null;
-				for (Iterator iter = wbe.getLinkToPredecessor().iterator(); iter
-						.hasNext();) {
-					wo = (WorkOrder) iter.next();
-					int id = predecessors.indexOf(wo.getPred());
-					if (id == -1 && (nullFilter || filter.accept(wo.getPred()))) {
-						predToBeDeleted.add(wo);
-					}
-				}
-				for (Iterator iter = predToBeDeleted.iterator(); iter.hasNext();)
-				{
-					WorkOrder w = (WorkOrder) iter.next();
-					actionMgr.doAction(
-							IActionManager.REMOVE,
-							wbe,
-							UmaPackage.eINSTANCE
-									.getWorkBreakdownElement_LinkToPredecessor(),
-							w, -1);
-				}
-
-				size = predecessors.size();
-				for (int i = 0; i < size; i++) {
-					WorkBreakdownElement element = (WorkBreakdownElement) predecessors
-							.get(i);
-					boolean found = false;
-					find_pred: for (Iterator iterator = wbe
-							.getLinkToPredecessor().iterator(); iterator
-							.hasNext();) {
-						wo = (WorkOrder) iterator.next();
-						if (wo.getPred() == element) {
-							found = true;
-							break find_pred;
-						}
-					}
-					if (!found) {
-						wo = UmaFactory.eINSTANCE.createWorkOrder();
-						wo.setPred(element);
-						// wo.setSucc(e);
-						wo.setLinkType(WorkOrderType.FINISH_TO_FINISH_LITERAL);
-
-						// // try to add the new WorkOrder to the right place so
-						// the order of WorkOrder list can be preserved.
-						// //
-						// if(prev != null) {
-						// int id = e.getLinkToPredecessor().indexOf(prev) + 1;
-						// if(id >= e.getLinkToPredecessor().size()) {
-						// e.getLinkToPredecessor().add(wo);
-						// }
-						// else {
-						// e.getLinkToPredecessor().add(id, wo);
-						// }
-						// }
-						actionMgr
-								.doAction(
-										IActionManager.ADD,
-										wbe,
-										UmaPackage.eINSTANCE
-												.getWorkBreakdownElement_LinkToPredecessor(),
-										wo, -1);
-						// wbe.getLinkToPredecessor().add(wo);
-					}
-				}
-			}
-			return;
-		}
-		// IBSItemProvider adapter = (IBSItemProvider) adapterFactory.adapt(e,
-		// ITreeItemContentProvider.class);
-		// adapter.setAttribute(e, prop, txt);
-
-		ProcessUtil.setAttribute(actionMgr, e, prop, txt);
-	}
-
-	private String getText(BreakdownElement e, String prop) {
-		// handle editing presentation name of extending/contributing activity
-		// specially
-		//
-		if (prop == IBSItemProvider.COL_PRESENTATION_NAME
-				&& ProcessUtil.isExtendingOrLocallyContributing(e)) {
-			return ((DescribableElement) e).getPresentationName();
-		}
-
-		IBSItemProvider adapter = (IBSItemProvider) adapterFactory.adapt(e,
-				ITreeItemContentProvider.class);
-		return adapter.getAttribute(e, prop);
-	}
-
-	/**
-	 * Set tab index for the form page
-	 * @param id
-	 */
-	public void setTabIndex(int id) {
-		 tabIndex = id;
-	}
-	
-	/**
-	 * Return tab index for the form page
-	 */
-	public int getTabIndex() {
-		return tabIndex;
-	}
-
-	/**
-	 * Set tab folder
-	 * @param tabFolder
-	 */
-	public void setTabFolder(CTabFolder tabFolder) {
-		// this.tabFolder = tabFolder;
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		// create form toolkit
-		ScrolledForm form = managedForm.getForm();
-		FormToolkit toolkit = managedForm.getToolkit();
-		form.setText(getEditor().getPartName());
-
-		TableWrapLayout layout = new TableWrapLayout();
-		form.getBody().setLayout(layout);
-
-		Section section = toolkit.createSection(form.getBody(),
-				Section.EXPANDED | Section.TITLE_BAR);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB,
-				TableWrapData.FILL_GRAB);
-		section.setLayoutData(td);
-		section
-				.setText(getTitle()
-						+ " " + AuthoringUIResources.processBreakdownStructureFormPage_BSEditor); 
-		section.setLayout(new GridLayout());
-
-		Composite composite = toolkit.createComposite(section);
-		// composite.setLayout(new GridLayout(1, false));
-		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		composite.setLayout(new GridLayout());
-		section.setClient(composite);
-		Control control = createControl(composite);
-		toolkit.adapt(control, true, true);
-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData.verticalIndent = 10;
-		gridData.heightHint = 600;
-		control.setLayoutData(gridData);
-
-		ProcessEditor editor = (ProcessEditor) getEditor();
-		// editor.createContextMenuFor(tableTreeViewer);
-		editor.createContextMenuFor(viewer);
-
-		setInput(process);
-	}
-
-
-	/**
-	 * Create control
-	 * @param parent
-	 * @return
-	 * 			Control
-	 */
-	public Control createControl(Composite parent) {
-		// this.parent = parent;
-		// This is the page for the table tree viewer.
-		//
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		comp.setLayout(layout);
-		GridData gd = new GridData(GridData.BEGINNING | GridData.FILL_BOTH);
-		comp.setLayoutData(gd);
-		
-		viewer = new ProcessViewer(comp, SWT.MULTI | SWT.H_SCROLL
-				| SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);
-		viewer.getControl().setLayoutData(gd);
-		viewer.setupColumns(columnDescriptors);
-		viewer.setContentProvider(new ExposedAdapterFactoryContentProvider(
-				adapterFactory));
-		viewer.setLabelProvider(new ProcessAdapterFactoryLabelProvider(adapterFactory));
-
-
-		viewer.setActionManager(((MethodElementEditor) getEditor())
-			.getActionManager());
-
-		textCellEditor = new TextCellEditor(viewer.getCellEditorParent());
-		comboBoxCellEditor = new ComboBoxCellEditor(viewer
-				.getCellEditorParent(), new String[] { TXT_TRUE, TXT_FALSE });
-		checkBoxCellEditor = new CheckboxCellEditor(viewer
-				.getCellEditorParent());
-
-		//set all editors and modifiers
-		setAllEditorsAndModifiers();
-		
-		viewer.setAutoExpandLevel(3);
-		viewer.setInput(process);
-
-		// int dndOperations = DND.DROP_COPY | DND.DROP_MOVE ;
-		// Transfer[] transfers = new Transfer[] { TNGObjTransfer.getInstance()
-		// };
-		// tableTreeViewer.addDropSupport(DND.DROP_MOVE, transfers, new
-		// BSTabDropAdapter(tableTreeViewer));
-
-		// BSEditorView.getView().createContextMenuFor(tableTreeViewer);
-		// return tableTreeViewer.getControl();
-
-		setContextHelp(viewer.getControl());
-
-		return comp;
-
-	}
-
-	
-	/**
-	 * Set all editors and modifiers for the viewer
-	 */
-	private void setAllEditorsAndModifiers()
-	{
-		setCellEditors();
-		setCheckBoxCellEditors();
-
-		// Set the cell modifier
-		viewer.setCellModifier(new ICellModifier() {
-			/**
-			 * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object, java.lang.String)
-			 */
-			public boolean canModify(Object element, String property) {
-				// System.out.println("canModify: element="+element+",
-				// property="+property);
-
-				if (isReadOnly() ||
-						(element instanceof BreakdownElementWrapperItemProvider && ((BreakdownElementWrapperItemProvider) element).isReadOnly())) {
-					return false;
-				}
-
-//				if (!(element instanceof BreakdownElement)
-//						&& !(element instanceof BreakdownElementWrapperItemProvider && !((BreakdownElementWrapperItemProvider) element)
-//								.isReadOnly())) {
-//					Collection types = new ArrayList();
-//					types.add(VariabilityType.EXTENDS_LITERAL);
-//					if (TngUtil
-//							.isGeneralizer(
-//									(VariabilityElement) ((BreakdownElementWrapperItemProvider) element)
-//											.getOwner(), types))
-//						return false;
-//				}
-				
-				if (property == IBSItemProvider.COL_ID
-						|| property == IBSItemProvider.COL_TYPE
-						|| property == IBSItemProvider.COL_MODEL_INFO
-						|| property == IBSItemProvider.COL_DELIVERABLE) {
-					return false;
-				}
-
-				element = TngUtil.unwrap(element);
-				if (!(element instanceof WorkProductDescriptor)
-						&& (property == IBSItemProvider.COL_ENTRY_STATE || property == IBSItemProvider.COL_EXIT_STATE)) {
-					return false;
-				}
-				if (!(element instanceof WorkBreakdownElement)
-						&& (property == IBSItemProvider.COL_PREDECESSORS)) {
-					return false;
-				}
-
-				return true;
-			}
-
-			/**
-			 * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object, java.lang.String)
-			 */
-			public Object getValue(Object element, String property) {
-				// System.out.println("getValue: element="+element+",
-				// property="+property);
-				BreakdownElement e = (BreakdownElement) TngUtil.unwrap(element);
-				String val = getText(e, property);
-				switch (getCellEditorType(property)) {
-				case ColumnDescriptor.CELL_EDITOR_TYPE_COMBO_BOOLEAN:
-					if (TXT_TRUE.equalsIgnoreCase(val)) {
-						return new Integer(0);
-					} else {
-						return new Integer(1);
-					}
-				case ColumnDescriptor.CELL_EDITOR_TYPE_TEXT:
-					return val;
-				case ColumnDescriptor.CELL_EDITOR_TYPE_CHECK_BOOLEAN:
-					return Boolean.valueOf(val);
-				default:
-					return val;
-				}
-			}
-
-			/**
-			 * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object, java.lang.String, java.lang.Object)
-			 */
-			public void modify(final Object element, String property,
-					Object value) {
-				// System.out.println("modify: element="+element+",
-				// property="+property+", value="+value);
-				Widget item = (Widget) element;
-				BreakdownElement be = (BreakdownElement) TngUtil.unwrap(item
-						.getData());
-
-				final int columnIndex = getColumnIndex(property);
-				CellEditor cellEditor = viewer.getCellEditors()[columnIndex];
-				String errMsg = cellEditor.getErrorMessage();
-				if (errMsg != null) {
-					return;
-				}
-
-				String txt;
-				switch (getCellEditorType(property)) {
-				case ColumnDescriptor.CELL_EDITOR_TYPE_TEXT:
-					txt = (String) value;
-					break;
-				case ColumnDescriptor.CELL_EDITOR_TYPE_COMBO_BOOLEAN:
-					int index = ((Number) value).intValue();
-					if (index == 0) {
-						txt = TXT_TRUE;
-					} else {
-						txt = TXT_FALSE;
-					}
-					break;
-				case ColumnDescriptor.CELL_EDITOR_TYPE_CHECK_BOOLEAN:
-					txt = value.toString();
-					break;
-				default:
-					txt = TngUtil.checkNull(value.toString());
-				}
-				setText(be, property, txt);
-				if (property == IBSItemProvider.COL_PRESENTATION_NAME
-						&& StrUtil.isBlank(be.getName())) {
-					be.setName(txt);
-				}
-				
-				viewer.refresh();
-			}
-		});
-	}
-	
-	
-	/**
-	 * Get cell editor for the given column
-	 * @param columnID
-	 * @param columnIndex
-	 * @return
-	 * 			Cell Editor
-	 */
-	public CellEditor getCellEditor(String columnID, int columnIndex) {
-		if (columnID == IBSItemProvider.COL_PRESENTATION_NAME) {
-			if (presentationNameCellEditor == null) {
-				presentationNameCellEditor = new ValidatingTextCellEditor(
-						viewer.getCellEditorParent()) {
-					protected String isValid(Object e, String txt) {
-						e = TngUtil.unwrap(e);
-						Suppression suppression = ((ProcessEditor)getEditor()).getSuppression();
-						boolean ignoreSuppressed = true;
-						return ProcessUtil
-								.checkBreakdownElementPresentationName(
-										adapterFactory, (BreakdownElement) e,
-										txt, suppression, ignoreSuppressed);
-					}
-				};
-
-				presentationNameCellEditor
-						.setValidator(new CellEditorValidator(
-								presentationNameCellEditor));
-				// presentationNameCellEditor.getControl().addFocusListener(new
-				// ValidatingFocusAdapter(presentationNameCellEditor));
-				presentationNameCellEditor.getControl().addListener(
-						SWT.Deactivate,
-						new ValidatingDeactivateListener(
-								presentationNameCellEditor));
-			}
-			presentationNameCellEditor.setColumnIndex(columnIndex);
-
-			return presentationNameCellEditor;
-		} else if (columnID == IBSItemProvider.COL_NAME) {
-			if (nameCellEditor == null) {
-				nameCellEditor = new ValidatingTextCellEditor(viewer
-						.getCellEditorParent()) {
-					protected String isValid(Object e, String txt) {
-						e = TngUtil.unwrap(e);
-						Suppression suppression = ((ProcessEditor)getEditor()).getSuppression();
-						return TngUtil
-								.checkActivityName(adapterFactory, e, txt, suppression);
-					}
-				};
-				nameCellEditor.setValidator(new CellEditorValidator(
-						nameCellEditor));
-				// nameCellEditor.getControl().addFocusListener(new
-				// ValidatingFocusAdapter(nameCellEditor));
-				nameCellEditor.getControl().addListener(SWT.Deactivate,
-						new ValidatingDeactivateListener(nameCellEditor));
-			}
-			nameCellEditor.setColumnIndex(columnIndex);
-
-			return nameCellEditor;
-		} else if (columnID == IBSItemProvider.COL_PREDECESSORS) {
-			if (predListCellEditor == null) {
-				predListCellEditor = new ValidatingTextCellEditor(viewer
-						.getCellEditorParent()) {
-					protected String isValid(Object e, String txt) {
-						e = TngUtil.unwrap(e);
-						return ProcessUtil.checkPredecessorList(
-								(WorkBreakdownElement) e, txt, adapterFactory,
-								process, null);
-					}
-				};
-				predListCellEditor.setValidator(new CellEditorValidator(
-						predListCellEditor));
-				// predListCellEditor.getControl().addFocusListener(new
-				// ValidatingFocusAdapter(predListCellEditor));
-				predListCellEditor.getControl().addListener(SWT.Deactivate,
-						new ValidatingDeactivateListener(predListCellEditor));
-			}
-			predListCellEditor.setColumnIndex(columnIndex);
-
-			return predListCellEditor;
-		}
-		return null;
-	}
-
-	/**
-	 * Set cell editors for all columns 
-	 */
-	public void setCellEditors() {
-		CellEditor[] cellEditors = new CellEditor[columnDescriptors.length];
-		for (int i = 0; i < columnDescriptors.length; i++) {
-			CellEditor cellEditor = getCellEditor(columnDescriptors[i].id, i);
-			if (cellEditor != null) {
-				cellEditors[i] = cellEditor;
-			} else {
-				switch (columnDescriptors[i].cellEditorType) {
-				case ColumnDescriptor.CELL_EDITOR_TYPE_COMBO_BOOLEAN:
-					cellEditors[i] = comboBoxCellEditor;
-					break;
-				case ColumnDescriptor.CELL_EDITOR_TYPE_TEXT:
-					cellEditors[i] = textCellEditor;
-					break;
-				case ColumnDescriptor.CELL_EDITOR_TYPE_CHECK_BOOLEAN:
-					cellEditors[i] = checkBoxCellEditor;
-					break;
-				default:
-					cellEditors[i] = null;
-				}
-			}
-		}
-		viewer.setCellEditors(cellEditors);
-	}
-	
-	
-	
-
-	/**
-	 * Set input for viewer
-	 * @param newInput
-	 */
-	public void setInput(Object newInput) {
-		if (newInput instanceof Process) {
-			process = (Process) newInput;
-			if (process.eContainer() instanceof ProcessComponent) {
-				viewer.setInput(process.eContainer());
-				// viewer.expandAll();
-//				viewer.reveal(process);
-				return;
-			}
-		}
-		viewer.setInput(null);
-	}
-
-	private int getColumnIndex(String property) {
-		Object[] colProps = viewer.getColumnProperties();
-		for (int i = 0; i < colProps.length; i++) {
-			if (colProps[i] == property)
-				return i;
-		}
-		return -1;
-	}
-
-	private int getCellEditorType(String property) {
-		for (int i = 0; i < columnDescriptors.length; i++) {
-			ColumnDescriptor desc = columnDescriptors[i];
-			if (desc.id == property) {
-				return desc.cellEditorType;
-			}
-		}
-		return ColumnDescriptor.CELL_EDITOR_TYPE_NONE;
-	}
-
-	/**
-	 * Return viewer
-	 */
-	public Viewer getViewer() {
-		return viewer;
-	}
-
-	/**
-	 * Set process as input
-	 * @param proc
-	 */
-	public void setProcess(Process proc) {
-		if (process != proc) {
-			setInput(proc);
-		}
-	}
-
-	/**
-	 * Returns the adapterFactory.
-	 */
-	public AdapterFactory getAdapterFactory() {
-		return adapterFactory;
-	}
-
-	/**
-	 * Update columns with new column descriptors
-	 * @param newColumnDescriptors
-	 */
-	public void updateColumns(ColumnDescriptor[] newColumnDescriptors) {
-		setColumnDescriptors(newColumnDescriptors);
-		viewer.setupColumns(newColumnDescriptors);	
-		setAllEditorsAndModifiers();
-		viewer.refresh();
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#dispose()
-	 */
-	public void dispose() {
-		// if(adapterFactory instanceof ComposeableAdapterFactory) {
-		// ((ComposedAdapterFactory)adapterFactory).dispose();
-		// }
-
-		if (viewer.getContentProvider() != null) {
-			viewer.getContentProvider().dispose();
-		}
-
-		if (viewer.getLabelProvider() != null) {
-			viewer.getLabelProvider().dispose();
-		}
-
-		super.dispose();
-	}
-
-	private void setContextHelp(Control control) {
-		AdapterFactory adapterFac = getAdapterFactory();
-		AdapterFactory allFac = TngAdapterFactory.INSTANCE
-				.getProcessComposedAdapterFactory();
-		AdapterFactory wbsFac = TngAdapterFactory.INSTANCE
-				.getWBS_ComposedAdapterFactory();
-		AdapterFactory obsFac = TngAdapterFactory.INSTANCE
-				.getOBS_ComposedAdapterFactory();
-		AdapterFactory pbsFac = TngAdapterFactory.INSTANCE
-				.getPBS_ComposedAdapterFactory();
-
-		// System.out.println("$$$ DEBUG: current dadpter fac = " + adapterFac);
-		// System.out.println("$$$ DEBUG: all dadpter fac = " + allFac);
-		// System.out.println("$$$ DEBUG: wbs dadpter fac = " + wbsFac);
-		// System.out.println("$$$ DEBUG: obs dadpter fac = " + obsFac);
-		// System.out.println("$$$ DEBUG: pbs dadpter fac = " + pbsFac);
-
-		if (adapterFac == wbsFac)
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(control,
-					AuthoringUIHelpContexts.FORM_EDITOR_PROCESS_WBS_CONTEXT);
-		else if (adapterFac == obsFac)
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(control,
-					AuthoringUIHelpContexts.FORM_EDITOR_PROCESS_OBS_CONTEXT);
-		else if (adapterFac == pbsFac)
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(control,
-					AuthoringUIHelpContexts.FORM_EDITOR_PROCESS_PBS_CONTEXT);
-		else if (adapterFac == allFac)
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(control,
-					AuthoringUIHelpContexts.FORM_EDITOR_PROCESS_ALLBS_CONTEXT);
-	}
-	
-	/**
-	 * Gets additional actions to contribute to the context menu.
-	 * 
-	 * @return
-	 * 			Actions
-	 */
-	public IAction[] getAdditionalActions() {
-		return null;
-	}
-	
-	/**
-	 * Set check box cell editors
-	 */
-	public void setCheckBoxCellEditors() {
-		AbstractCheckBoxCellEditor[] cellEditors = new AbstractCheckBoxCellEditor[columnDescriptors.length];
-		for (int i = 0; i < columnDescriptors.length; i++) {
-			switch (columnDescriptors[i].cellEditorType) {
-				case ColumnDescriptor.CELL_EDITOR_TYPE_CHECK_BOOLEAN:
-					cellEditors[i] = new ProcessCheckBoxCellEditor(viewer
-							.getCellEditorParent());
-					break;
-				default:
-					cellEditors[i] = null;
-			}
-		}
-		((ProcessViewer) viewer).setCheckBoxCellEditors(cellEditors);
-	}
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ProcessDescription.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ProcessDescription.java
deleted file mode 100755
index 11bab1f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ProcessDescription.java
+++ /dev/null
@@ -1,1502 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.text.MessageFormat;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIImages;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichTextEditor;
-import org.eclipse.epf.authoring.ui.util.EditorsContextHelper;
-import org.eclipse.epf.authoring.ui.util.UIHelper;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.navigator.ConfigurationsItemProvider;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.edit.validation.IValidator;
-import org.eclipse.epf.library.edit.validation.IValidatorFactory;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.richtext.RichTextListener;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.fieldassist.DecoratedField;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-
-/**
- * The Description page for the process description.
- * 
- * @author Shilpa Toraskar
- * @author Phong Nguyen Le
- * @author Kelvin Low
- * @since 1.0
- * 
- * TODO: Rename this class to ProcessDescriptionPage
- */
-public class ProcessDescription extends ProcessFormPage {
-
-	private static final String FORM_PAGE_ID = "processDescriptionPage"; //$NON-NLS-1$
-
-	private static final int DEFAULT_VERTICAL_INDENT = 2;
-
-	protected static final int GENERAL_SECTION_ID = 1;
-
-	protected static final int DETAIL_SECTION_ID = 2;
-
-	private IStructuredContentProvider contentProvider = new AdapterFactoryContentProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory()) {
-	};
-
-	private ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory());
-
-	protected Section formSection;
-
-	protected Composite sectionComposite;
-
-	private Composite expandedComposite;
-
-	private Text ctrl_name;
-
-	private Text ctrl_presentation_name;
-
-	private Text ctrl_brief_desc, ctrl_external_id;
-
-	private IMethodRichText ctrl_purpose;
-
-	private IMethodRichText ctrl_full_desc;
-
-	private IMethodRichText ctrl_scope, ctrl_usage_notes;
-
-	private IMethodRichText ctrl_alternatives, ctrl_how_to_staff,
-			ctrl_key_consideration;
-
-	private IMethodRichText activeControl;
-
-	private Section generalSection, detailSection, configSection;
-
-	protected Composite generalComposite, detailComposite, configComposite;
-
-	protected boolean descExpandFlag = false;
-
-	protected boolean generalSectionExpandFlag = false;
-
-	protected boolean detailSectionExpandFlag = false;
-
-	protected boolean configSectionExpandFlag = false;
-
-	protected IMethodRichTextEditor ctrl_expanded;
-
-	private ImageHyperlink expandLink;
-
-	private DecoratedField expandLabel;
-
-	// private String[] variabilityTypes = new String[] {"N/A", "Contributes",
-	// "Extends", "Replaces"};
-	// private HashMap variabilityElementMap = new HashMap();
-
-	private org.eclipse.swt.widgets.List list_configurations;
-
-	private ListViewer configListViewer;
-
-	private Button buttonAdd;
-
-	private Button buttonRemove;
-
-	// private Button buttonEdit;
-	private Button buttonMakeDefault;
-
-	private Text textConfigDescription;
-
-	private ItemProviderAdapter configListAdapter;
-
-	protected ModifyListener modifyListener;
-
-	protected ModifyListener contentModifyListener;
-
-//	private Adapter processListener;
-
-	private String processType;
-
-	private MethodElementEditor editor;
-
-	private ModifyListener nameModifyListener;
-
-	private boolean disposed;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ProcessDescription(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIResources.descriptionPage_title); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.createFormContent(IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		// create form toolkit
-		super.createFormContent(managedForm);
-
-		processType = LibraryUIText.getUITextLower(process);
-		setFormText();
-
-		// create editor content
-		createEditorContent(toolkit);
-
-//		// add listener to listen to change in process's data
-//		if (processListener == null) {
-//			processListener = new AdapterImpl() {
-//				public void notifyChanged(Notification msg) {
-//					switch (msg.getFeatureID(Process.class)) {
-//					case UmaPackage.PROCESS__NAME:
-//						refreshElementName(msg.getNewStringValue());
-//						break;
-//					}
-//				}
-//			};
-//		}
-//		process.eAdapters().add(processListener);
-
-		loadData();
-		addListeners();
-
-		EditorsContextHelper.setHelp(getPartControl(), processType);
-	}
-
-	/**
-	 * Creates the editor tab content
-	 * 
-	 * @param toolkit
-	 *            The form toolkit.
-	 */
-	protected void createEditorContent(FormToolkit toolkit) {
-		createFormComposites();
-		createGeneralSection();
-		createDetailSection();
-		createConfigurationSection();
-
-		toolkit.paintBordersFor(generalComposite);
-		toolkit.paintBordersFor(detailComposite);
-		toolkit.paintBordersFor(configComposite);
-		toolkit.paintBordersFor(expandedComposite);
-	}
-
-	private void createFormComposites() {
-		formSection = toolkit.createSection(form.getBody(), Section.NO_TITLE);
-		{
-			TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-			formSection.setLayoutData(td);
-			formSection.setLayout(new TableWrapLayout());
-		}
-
-		// create the composite for the sections
-		sectionComposite = toolkit.createComposite(formSection, SWT.NONE);
-		sectionComposite.setLayoutData(new TableWrapData());
-		sectionComposite.setLayout(new TableWrapLayout());
-		formSection.setClient(sectionComposite);
-
-		expandedComposite = toolkit.createComposite(formSection, SWT.NONE);
-		{
-			TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-			expandedComposite.setLayoutData(td);
-			expandedComposite.setLayout(new GridLayout(2, false));
-			expandedComposite.setVisible(false);
-		}
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(expandedComposite,
-				AuthoringUIHelpContexts.RICH_TEXT_EDITOR_CONTEXT_ID);
-
-		// Add the expand/collapse hyperlink image.
-		expandLink = toolkit.createImageHyperlink(expandedComposite, SWT.NONE);
-		expandLink.setImage(AuthoringUIImages.IMG_EXPANDED);
-		expandLink.setToolTipText(AuthoringUIResources.closeRTE);
-		expandLink.setUnderlined(false);
-		expandLink.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				toggle(e);
-			}
-		});
-
-		// Add the expand/collapse hyperlink text.
-		expandLabel = createDecoratedLabel(toolkit, expandedComposite, ""); //$NON-NLS-1$
-
-	}
-
-	/**
-	 * Create general section
-	 */
-	protected void createGeneralSection() {
-		// create General Information section
-		generalSection = toolkit.createSection(form.getBody(),
-				Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED
-						| Section.TITLE_BAR);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		generalSection.setLayoutData(td);
-		generalSection.setText(AuthoringUIText.GENERAL_INFO_SECTION_NAME);
-		generalSection.setDescription(MessageFormat.format(
-				AuthoringUIText.GENERAL_INFO_SECTION_DESC,
-				new String[] { processType }));
-		generalSection.setLayout(new GridLayout());
-
-		generalComposite = toolkit.createComposite(generalSection);
-		generalComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		generalComposite.setLayout(new GridLayout(3, false));
-		generalSection.setClient(generalComposite);
-
-		// name
-		ctrl_name = createTextEditWithLabel(toolkit, generalComposite,
-				AuthoringUIText.NAME_TEXT);
-
-		// Presentation name
-		ctrl_presentation_name = createTextEditWithLabel(toolkit,
-				generalComposite, AuthoringUIText.PRESENTATION_NAME_TEXT);
-
-		// brief desc
-		ctrl_brief_desc = createTextEditWithLabel2(toolkit, generalComposite,
-				AuthoringUIText.BRIEF_DESCRIPTION_TEXT);
-
-		// External Id
-		ctrl_external_id = createTextEditWithLabel(toolkit, generalComposite,
-				AuthoringUIResources.Process_ExternalID); 
-
-		// Purpose
-		ctrl_purpose = createRichTextEditWithLinkForSection(
-				toolkit,
-				generalComposite,
-				AuthoringUIResources.Process_Purpose, 40, 400, GENERAL_SECTION_ID); 
-
-		// // create expanded composite
-		// expandGeneralComposite = toolkit.createComposite(generalSection);
-		// expandGeneralComposite.setLayoutData(new
-		// GridData(GridData.FILL_HORIZONTAL));
-		// expandGeneralComposite.setLayout(new GridLayout(2, false));
-		// expandGeneralComposite.setVisible(false);
-		//		
-		// // Hyperlink desc
-		// expandGeneralLink =
-		// toolkit.createImageHyperlink(expandGeneralComposite, SWT.NONE);
-		// expandGeneralLink.setImage(AuthoringUIImages.IMG_EXPANDED);
-		// expandGeneralLink.setUnderlined(false);
-		// expandGeneralLink.addHyperlinkListener(new HyperlinkAdapter()
-		// {
-		// public void linkActivated(HyperlinkEvent e)
-		// {
-		// toggle(e, GENERAL_SECTION_ID);
-		// }
-		// });
-		//		
-		// expandGeneralLabel = createLabel(toolkit, expandGeneralComposite,
-		// "");
-
-		// set focus on the name attribute
-		Display display = form.getBody().getDisplay();
-		if (!(display == null || display.isDisposed())) {
-			display.asyncExec(new Runnable() {
-				public void run() {
-					ctrl_name.setFocus();
-				}
-			});
-		}
-
-	}
-
-	/**
-	 * Create detail section
-	 *
-	 */
-	protected void createDetailSection() {
-		// create detail section
-		detailSection = toolkit.createSection(form.getBody(),
-				Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED
-						| Section.TITLE_BAR);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		detailSection.setLayoutData(td);
-		detailSection.setText(AuthoringUIText.DETAIL_SECTION_NAME);
-		detailSection.setDescription(MessageFormat.format(
-				AuthoringUIText.DETAIL_SECTION_DESC,
-				new String[] { processType }));
-		detailSection.setLayout(new GridLayout());
-
-		detailComposite = toolkit.createComposite(detailSection);
-		detailComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		detailComposite.setLayout(new GridLayout(3, false));
-		detailSection.setClient(detailComposite);
-
-		// full description
-		ctrl_full_desc = createRichTextEditWithLinkForSection(toolkit,
-				detailComposite, AuthoringUIText.MAIN_DESCRIPTION_TEXT, 100,
-				400, DETAIL_SECTION_ID);
-
-		// scope
-		ctrl_scope = createRichTextEditWithLinkForSection(toolkit,
-				detailComposite, AuthoringUIResources.Process_Scope, 40, 400, DETAIL_SECTION_ID); //$NON-NLS-1$
-
-		// usage notes
-		ctrl_usage_notes = createRichTextEditWithLinkForSection(
-				toolkit,
-				detailComposite,
-				AuthoringUIResources.Process_UsageNotes, 40, 400, DETAIL_SECTION_ID); 
-
-		// alternatives
-		ctrl_alternatives = createRichTextEditWithLinkForSection(
-				toolkit,
-				detailComposite,
-				AuthoringUIResources.Process_Alternatives, 40, 400, DETAIL_SECTION_ID); 
-
-		// how to staff
-		ctrl_how_to_staff = createRichTextEditWithLinkForSection(
-				toolkit,
-				detailComposite,
-				AuthoringUIResources.Process_HowToStaff, 40, 400, DETAIL_SECTION_ID); 
-
-		// key consideration
-		ctrl_key_consideration = createRichTextEditWithLinkForSection(
-				toolkit,
-				detailComposite,
-				AuthoringUIResources.Process_KeyConsideration, 40, 400, DETAIL_SECTION_ID); 
-
-		// // create expanded composite
-		// expandDetailComposite = toolkit.createComposite(detailSection);
-		// expandDetailComposite.setLayoutData(new
-		// GridData(GridData.FILL_HORIZONTAL));
-		// expandDetailComposite.setLayout(new GridLayout(2, false));
-		// expandDetailComposite.setVisible(false);
-		//		
-		// // Hyperlink desc
-		// expandDetailLink =
-		// toolkit.createImageHyperlink(expandDetailComposite, SWT.NONE);
-		// expandDetailLink.setImage(AuthoringUIImages.IMG_EXPANDED);
-		// expandDetailLink.setUnderlined(false);
-		// expandDetailLink.addHyperlinkListener(new HyperlinkAdapter()
-		// {
-		// public void linkActivated(HyperlinkEvent e)
-		// {
-		// toggle(e, DETAIL_SECTION_ID);
-		// }
-		// });
-		//		
-		// expandDetailLabel = createLabel(toolkit, expandDetailComposite, "");
-
-	}
-
-	/**
-	 * Create configuration section
-	 */
-	protected void createConfigurationSection() {
-		// create Configuration section
-		configSection = toolkit.createSection(form.getBody(),
-				Section.DESCRIPTION | Section.TWISTIE | Section.EXPANDED
-						| Section.TITLE_BAR);
-		TableWrapData td1 = new TableWrapData(TableWrapData.FILL_GRAB);
-		configSection.setLayoutData(td1);
-		configSection
-				.setText(AuthoringUIResources.processDescription_configurationSectionTitle); //$NON-NLS-1$
-		configSection
-				.setDescription(AuthoringUIResources.processDescription_configurationSectionMessage); //$NON-NLS-1$
-		configSection.setLayout(new GridLayout());
-
-		configComposite = toolkit.createComposite(configSection);
-		configComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		configComposite.setLayout(new GridLayout(2, false));
-		configSection.setClient(configComposite);
-
-		Label l_element = toolkit
-				.createLabel(
-						configComposite,
-						AuthoringUIResources.processDescription_configurations); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(SWT.BEGINNING, SWT.END, true,
-					true, 2, 1);
-			l_element.setLayoutData(gridData);
-		}
-
-		list_configurations = UIHelper.createList(toolkit, configComposite,
-				SWT.SINGLE | SWT.BORDER);
-		{
-			GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			gridData.heightHint = 80;
-			gridData.widthHint = 200;
-			list_configurations.setLayoutData(gridData);
-		}
-		configListViewer = new ListViewer(list_configurations);
-		configListViewer.setContentProvider(contentProvider);
-		configListViewer.setLabelProvider(new LabelProvider() {
-			public org.eclipse.swt.graphics.Image getImage(Object element) {
-				if (element == process.getDefaultContext()) {
-					return AuthoringUIPlugin.getDefault().getImage(
-							"icons/checked.gif"); //$NON-NLS-1$
-				}
-				return null;
-			}
-
-			public String getText(Object element) {
-				String txt = labelProvider.getText(element);
-				if (element == process.getDefaultContext()) {
-					txt = txt
-							+ " " + AuthoringUIResources.processDescription_default; 
-				}
-				return txt;
-			}
-		});
-
-		Composite buttonPanel = toolkit.createComposite(configComposite);
-		{
-			GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, false,
-					false);
-			// gridData.widthHint = 80;
-			gridData.horizontalIndent = 4;
-			buttonPanel.setLayoutData(gridData);
-			buttonPanel.setLayout(new GridLayout());
-
-		}
-		// Add button
-		Button button = toolkit.createButton(buttonPanel, AuthoringUIResources.addButton_text, SWT.NONE); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-			button.setLayoutData(gridData);
-		}
-		buttonAdd = button;
-
-		// Remove button
-		button = toolkit.createButton(buttonPanel, AuthoringUIResources.removeButton_text, SWT.NONE); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-			button.setLayoutData(gridData);
-		}
-		buttonRemove = button;
-
-		// // Edit button
-		// button = toolkit.createButton(buttonPanel, "Edit...", SWT.NONE);
-		// {
-		// GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		// gridData.verticalIndent = DEFAULT_VERTICAL_INDENT * 6;
-		// button.setLayoutData(gridData);
-		// }
-		// buttonEdit = button;
-		//		
-		//		
-		// Make Default button
-		button = toolkit.createButton(buttonPanel, AuthoringUIResources.makeDefaultButton_text, SWT.NONE); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-			button.setLayoutData(gridData);
-		}
-		buttonMakeDefault = button;
-
-		// configuration description
-		Label label = toolkit
-				.createLabel(
-						configComposite,
-						AuthoringUIResources.processDescription_configurationDescription); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(SWT.BEGINNING, SWT.END, true,
-					false, 2, 1);
-			label.setLayoutData(gridData);
-		}
-
-		textConfigDescription = toolkit.createText(configComposite, ""); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-			gridData.verticalIndent = DEFAULT_VERTICAL_INDENT;
-			gridData.heightHint = 80;
-			gridData.widthHint = 400;
-			textConfigDescription.setLayoutData(gridData);
-		}
-		textConfigDescription.setEditable(false);
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.FormPage#dispose()
-	 */
-	public void dispose() {
-//		if (processListener != null) {
-//			process.eAdapters().remove(processListener);
-//		}
-
-		if (configListAdapter != null) {
-			configListAdapter.dispose();
-		}
-
-		super.dispose();
-
-		if (contentProvider != null) {
-			contentProvider.dispose();
-		}
-		if (labelProvider != null) {
-			labelProvider.dispose();
-		}
-		
-		disposed = true;
-	}
-
-	/**
-	 * Content provider for configurations
-	 *
-	 */
-	class ConfigListItemProvider extends ItemProviderAdapter implements
-			IStructuredItemContentProvider {
-		
-		/**
-		 * Creates an instance
-		 * @param adapterFactory
-		 */
-		public ConfigListItemProvider(AdapterFactory adapterFactory) {
-			super(adapterFactory);
-			process.eAdapters().add(this);
-		}
-
-		/**
-		 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren(java.lang.Object)
-		 */
-		public java.util.Collection getChildren(Object object) {
-			MethodConfiguration defaultConfig = process.getDefaultContext();
-
-			if (defaultConfig != null
-					&& !process.getValidContext().contains(defaultConfig)) {
-				process.getValidContext().add(0, defaultConfig);
-			}
-			return process.getValidContext();
-		}
-
-		/**
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(org.eclipse.emf.common.notify.Notification msg) {
-			boolean refresh = false;
-			switch (msg.getFeatureID(Process.class)) {
-			case UmaPackage.PROCESS__VALID_CONTEXT:
-				switch (msg.getEventType()) {
-				case Notification.ADD:
-				case Notification.ADD_MANY:
-				case Notification.REMOVE:
-				case Notification.REMOVE_MANY:
-					refresh = true;
-				}
-				break;
-			case UmaPackage.PROCESS__DEFAULT_CONTEXT:
-				refresh = true;
-				break;
-			}
-			if (refresh)
-				configListViewer.refresh();
-		}
-	};
-
-	private void updateModelControls() {
-		if ((ctrl_name != null) && (!ctrl_name.isDisposed())) {
-			String str = TngUtil.checkNull(process.getName());
-			if (!str.equals(ctrl_name.getText())) {
-				ctrl_name.setText(str);
-			}
-		}
-		if ((ctrl_brief_desc != null) && (!ctrl_brief_desc.isDisposed())) {
-			ctrl_brief_desc.setText(TngUtil.checkNull(process
-					.getBriefDescription()));
-		}
-		if ((ctrl_presentation_name != null)
-				&& (!ctrl_presentation_name.isDisposed()))
-			ctrl_presentation_name.setText(TngUtil.checkNull(process
-					.getPresentationName()));
-	}
-
-	/**
-	 * Loads initial data from model
-	 * 
-	 */
-	protected void loadData() {
-		org.eclipse.epf.uma.ProcessDescription content = (org.eclipse.epf.uma.ProcessDescription) process
-				.getPresentation();
-
-		String externalID = content.getExternalId();
-		String purpose = content.getPurpose();
-		String fullDesc = content.getMainDescription();
-		String scope = content.getScope();
-		String usageNotes = content.getUsageNotes();
-		String alternatives = content.getAlternatives();
-		String howToStaff = content.getHowtoStaff();
-		String keyConsideration = content.getKeyConsiderations();
-
-		updateModelControls();
-
-		ctrl_external_id.setText(TngUtil.checkNull(externalID));
-		ctrl_purpose.setText(TngUtil.checkNull(purpose));
-		ctrl_full_desc.setText(TngUtil.checkNull(fullDesc));
-		ctrl_scope.setText(TngUtil.checkNull(scope));
-		ctrl_usage_notes.setText(TngUtil.checkNull(usageNotes));
-		ctrl_alternatives.setText(TngUtil.checkNull(alternatives));
-		ctrl_how_to_staff.setText(TngUtil.checkNull(howToStaff));
-		ctrl_key_consideration.setText(TngUtil.checkNull(keyConsideration));
-
-		if (configListAdapter == null) {
-			configListAdapter = new ConfigListItemProvider(
-					TngAdapterFactory.INSTANCE
-							.getNavigatorView_ComposedAdapterFactory());
-		}
-
-		configListViewer.setInput(configListAdapter);
-	}
-
-	/**
-	 * Add listeners
-	 * 
-	 */
-	protected void addListeners() {
-		this.editor = ((MethodElementEditor) getEditor());
-		final IActionManager actionMgr = editor.getActionManager();
-		final org.eclipse.epf.uma.ProcessDescription content = (org.eclipse.epf.uma.ProcessDescription) process
-				.getPresentation();
-		modifyListener = editor.createModifyListener(process);
-		contentModifyListener = editor.createModifyListener(process
-				.getPresentation());
-
-		form.addControlListener(new ControlListener() {
-			public void controlResized(ControlEvent e) {
-				if (!descExpandFlag)
-					return;
-				if (ctrl_expanded != null) {
-					((GridData) ctrl_expanded.getLayoutData()).heightHint = getRichTextEditorHeight();
-					((GridData) ctrl_expanded.getLayoutData()).widthHint = getRichTextEditorWidth();
-				}
-				formSection.layout(true, true);
-			}
-
-			public void controlMoved(ControlEvent e) {
-			}
-		});
-		form.getParent().addListener(SWT.Activate, new Listener() {
-
-			public void handleEvent(Event event) {
-				if(disposed) {
-					return;
-				}
-
-				// save last modified rich text
-				editor.saveModifiedRichText();			
-				
-				// Synch up data between description tab and properties window
-				ctrl_presentation_name.removeModifyListener(modifyListener);
-				ctrl_presentation_name.setText(process.getPresentationName());
-				ctrl_presentation_name.addModifyListener(modifyListener);
-				
-				ctrl_brief_desc.removeModifyListener(modifyListener);
-				ctrl_brief_desc.setText(process.getBriefDescription());
-				ctrl_brief_desc.addModifyListener(modifyListener);
-				
-				ctrl_purpose.removeModifyListener(contentModifyListener);
-				ctrl_purpose.setText(content.getPurpose());
-				ctrl_purpose.addModifyListener(contentModifyListener);
-				
-				ctrl_full_desc.removeModifyListener(contentModifyListener);			
-				ctrl_full_desc.setText(content.getMainDescription());
-				ctrl_full_desc.addModifyListener(contentModifyListener);
-				
-				ctrl_key_consideration.removeModifyListener(contentModifyListener);
-				ctrl_key_consideration.setText(content.getKeyConsiderations());
-				ctrl_key_consideration.addModifyListener(contentModifyListener);
-				
-				ctrl_alternatives.removeModifyListener(contentModifyListener);
-				ctrl_alternatives.setText(content.getAlternatives());
-				ctrl_alternatives.addModifyListener(contentModifyListener);
-				
-				ctrl_how_to_staff.removeModifyListener(contentModifyListener);
-				ctrl_how_to_staff.setText(content.getHowtoStaff());
-				ctrl_how_to_staff.addModifyListener(contentModifyListener);
-				
-				
-				if (TngUtil.isLocked(process)) {
-					refresh(false);
-				} else {
-					refresh(true);
-				}
-			}
-		});
-
-		nameModifyListener = editor.createModifyListener(process.eContainer(),
-				true);
-		ctrl_name.addModifyListener(nameModifyListener);
-		ctrl_name.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				String oldContent = process.getName();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				String newName = ctrl_name.getText().trim();
-				if (newName.equals(process.getName())) {
-					return;
-				}
-
-				ProcessComponent procComp = (ProcessComponent) process
-						.eContainer();
-				IValidator validator = IValidatorFactory.INSTANCE
-						.createNameValidator(
-								procComp,
-								TngAdapterFactory.INSTANCE
-										.getNavigatorView_ComposedAdapterFactory());
-				String msg = validator.isValid(newName);
-				if (msg == null) {
-					String title = AuthoringUIResources.processDescriptionNameChangeConfirm_title; //$NON-NLS-1$
-					String message = AuthoringUIResources.processDescriptionNameChangeConfirm_message; //$NON-NLS-1$
-					if (AuthoringUIPlugin.getDefault().getMsgDialog()
-							.displayConfirmation(title, message)) {
-						e.doit = true;
-
-						boolean status = actionMgr.doAction(IActionManager.SET,
-								process, UmaPackage.eINSTANCE
-										.getNamedElement_Name(), ctrl_name
-										.getText(), -1);
-						if (!status) {
-							ctrl_name.setText(process.getName());
-							return;
-						}
-						actionMgr.doAction(IActionManager.SET, procComp,
-								UmaPackage.eINSTANCE.getNamedElement_Name(),
-								ctrl_name.getText(), -1);
-
-						setFormText();
-
-						// adjust plugin location and save the editor
-						//
-						BusyIndicator.showWhile(getSite().getShell()
-								.getDisplay(), new Runnable() {
-							public void run() {
-								MethodElementEditor editor = (MethodElementEditor) getEditor();
-								editor.addResourceToAdjustLocation(process
-										.eResource());
-								editor.doSave(new NullProgressMonitor());
-							}
-
-						});
-					} else {
-						ctrl_name.setText(process.getName());
-						return;
-					}
-				} else {
-					AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayError(
-									AuthoringUIResources.renameDialog_title, msg); //$NON-NLS-1$
-					ctrl_name.setText(process.getName());
-					e.doit = false;
-					ctrl_name.getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							ctrl_name.setFocus();
-							ctrl_name.selectAll();
-						}
-					});
-				}
-			}
-		});
-		ctrl_name.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getNamedElement_Name());
-			}
-		});
-		
-		ctrl_presentation_name.addModifyListener(modifyListener);
-		ctrl_presentation_name.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				String oldContent = process.getPresentationName();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				if ((ctrl_presentation_name.getText() != null)
-						&& (!ctrl_presentation_name.getText().equals(""))) //$NON-NLS-1$
-				{
-					e.doit = true;
-					if (!ctrl_presentation_name.getText().equals(oldContent)) {
-
-						boolean status = actionMgr
-								.doAction(
-										IActionManager.SET,
-										process,
-										UmaPackage.eINSTANCE
-												.getDescribableElement_PresentationName(),
-										ctrl_presentation_name.getText(), -1);
-						if (!status) {
-							ctrl_presentation_name.setText(oldContent);
-							return;
-						}
-//						LibraryView elementsView = LibraryView.getView();
-//						if (elementsView != null)
-//							elementsView.getViewer().refresh();
-					}
-				} else {
-					// restore the old name first, then present the error
-					// message box
-					ctrl_presentation_name.setText(process
-							.getPresentationName());
-					AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayError(
-									AuthoringUIResources.editDialog_title, //$NON-NLS-1$
-									AuthoringUIResources.invalidPresentationNameError_msg); //$NON-NLS-1$
-					e.doit = false;
-					ctrl_presentation_name.getDisplay().asyncExec(
-							new Runnable() {
-								public void run() {
-									ctrl_presentation_name.setFocus();
-								}
-							});
-				}
-			}
-		});
-		ctrl_presentation_name.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getDescribableElement_PresentationName());
-			}
-		});
-
-		ctrl_brief_desc.addModifyListener(modifyListener);
-		ctrl_brief_desc.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getMethodElement_BriefDescription());
-			}
-
-			public void focusLost(FocusEvent e) {
-				String oldContent = process.getBriefDescription();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						e.widget, oldContent)) {
-					return;
-				}
-				String newContent = ctrl_brief_desc.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = actionMgr.doAction(IActionManager.SET,
-							process, UmaPackage.eINSTANCE
-									.getMethodElement_BriefDescription(),
-							newContent, -1);
-					if (success) {
-						ctrl_brief_desc.setText(newContent);
-					}
-				}
-			}
-		});
-
-		ctrl_external_id.addModifyListener(contentModifyListener);
-		ctrl_external_id.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getProcessDescription_ExternalId());
-			}
-
-			public void focusLost(FocusEvent e) {
-				String oldContent = content.getExternalId();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						ctrl_external_id, oldContent)) {
-					return;
-				}
-				String newContent = ctrl_external_id.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = actionMgr.doAction(IActionManager.SET,
-							process.getPresentation(), UmaPackage.eINSTANCE
-									.getProcessDescription_ExternalId(),
-							newContent, -1);
-					if (success) {
-						ctrl_external_id.setText(newContent);
-					}
-				}
-			}
-
-		});
-
-		ctrl_purpose.setModalObject(process.getPresentation());
-		ctrl_purpose.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getActivityDescription_Purpose());
-		ctrl_purpose.addModifyListener(contentModifyListener);
-		ctrl_purpose.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_purpose;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = content.getPurpose();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						ctrl_purpose, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					actionMgr.doAction(IActionManager.SET, process
-							.getPresentation(), UmaPackage.eINSTANCE
-							.getActivityDescription_Purpose(), newContent, -1);
-				}
-			}
-		});
-
-		ctrl_full_desc.setModalObject(process.getPresentation());
-		ctrl_full_desc.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getContentDescription_MainDescription());
-		ctrl_full_desc.addModifyListener(contentModifyListener);
-		ctrl_full_desc.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_full_desc;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = content.getMainDescription();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						ctrl_full_desc, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					actionMgr.doAction(IActionManager.SET, process
-							.getPresentation(), UmaPackage.eINSTANCE
-							.getContentDescription_MainDescription(),
-							newContent, -1);
-				}
-			}
-		});
-
-		ctrl_scope.setModalObject(process.getPresentation());
-		ctrl_scope.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getProcessDescription_Scope());
-		ctrl_scope.addModifyListener(contentModifyListener);
-		ctrl_scope.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_scope;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = content.getScope();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						ctrl_scope, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					actionMgr.doAction(IActionManager.SET, process
-							.getPresentation(), UmaPackage.eINSTANCE
-							.getProcessDescription_Scope(), newContent, -1);
-				}
-			}
-		});
-
-		ctrl_usage_notes.setModalObject(process.getPresentation());
-		ctrl_usage_notes.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getProcessDescription_UsageNotes());
-		ctrl_usage_notes.addModifyListener(contentModifyListener);
-		ctrl_usage_notes.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_usage_notes;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = content.getUsageNotes();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						ctrl_usage_notes, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					actionMgr
-							.doAction(IActionManager.SET, process
-									.getPresentation(), UmaPackage.eINSTANCE
-									.getProcessDescription_UsageNotes(),
-									newContent, -1);
-				}
-			}
-		});
-
-		ctrl_alternatives.setModalObject(process.getPresentation());
-		ctrl_alternatives.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getActivityDescription_Alternatives());
-		ctrl_alternatives.addModifyListener(contentModifyListener);
-		ctrl_alternatives.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_alternatives;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = content.getAlternatives();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						ctrl_alternatives, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					actionMgr.doAction(IActionManager.SET, process
-							.getPresentation(), UmaPackage.eINSTANCE
-							.getActivityDescription_Alternatives(), newContent,
-							-1);
-				}
-			}
-		});
-
-		ctrl_how_to_staff.setModalObject(process.getPresentation());
-		ctrl_how_to_staff.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getActivityDescription_HowtoStaff());
-		ctrl_how_to_staff.addModifyListener(contentModifyListener);
-		ctrl_how_to_staff.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_how_to_staff;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = content.getHowtoStaff();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						ctrl_how_to_staff, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					actionMgr.doAction(IActionManager.SET, process
-							.getPresentation(), UmaPackage.eINSTANCE
-							.getActivityDescription_HowtoStaff(), newContent,
-							-1);
-				}
-			}
-		});
-
-		ctrl_key_consideration.setModalObject(process.getPresentation());
-		ctrl_key_consideration.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getContentDescription_KeyConsiderations());
-		ctrl_key_consideration.addModifyListener(contentModifyListener);
-		ctrl_key_consideration.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_key_consideration;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = content.getKeyConsiderations();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						ctrl_key_consideration, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					actionMgr.doAction(IActionManager.SET, process
-							.getPresentation(), UmaPackage.eINSTANCE
-							.getContentDescription_KeyConsiderations(),
-							newContent, -1);
-				}
-			}
-		});
-
-		configListViewer
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-					public void selectionChanged(SelectionChangedEvent event) {
-						IStructuredSelection selection = (IStructuredSelection) configListViewer
-								.getSelection();
-						if (selection.size() == 1) {
-							MethodConfiguration config = ((MethodConfiguration) selection
-									.getFirstElement());
-							if (config == process.getDefaultContext()) {
-								buttonRemove.setEnabled(false);
-							} else {
-								buttonRemove.setEnabled(true);
-							}
-							String desc = config.getBriefDescription();
-							if (desc == null) {
-								desc = ""; //$NON-NLS-1$
-							}
-							textConfigDescription.setText(desc);
-						}
-					}
-				});
-
-		buttonAdd.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
-				MethodLibrary lib = UmaUtil.getMethodLibrary(process);
-
-				final ConfigurationsItemProvider input = new ConfigurationsItemProvider(
-						TngAdapterFactory.INSTANCE
-								.getNavigatorView_ComposedAdapterFactory(),
-						lib, ""); //$NON-NLS-1$
-
-				ListSelectionDialog dlg = new ListSelectionDialog(
-						Display.getCurrent().getActiveShell(),
-						input,
-						contentProvider,
-						labelProvider,
-						AuthoringUIResources.ProcessDescription_selectConfiguration) { //$NON-NLS-1$
-					protected Control createDialogArea(Composite parent) {
-						Control control = super.createDialogArea(parent);
-						getViewer().addFilter(new ViewerFilter() {
-
-							public boolean select(Viewer viewer,
-									Object parentElement, Object element) {
-								// int count =
-								// configListViewer.getList().getItemCount();
-								// for(int i = 0; i < count; i++) {
-								// if(element ==
-								// configListViewer.getElementAt(i)) return
-								// false;
-								// }
-								// return true;
-								return !process.getValidContext().contains(
-										element);
-							}
-
-						});
-						return control;
-					}
-
-					public boolean close() {
-						input.dispose();
-						return super.close();
-					}
-				};
-				if (dlg.open() == Window.OK) {
-					Object obs[] = dlg.getResult();
-					MethodConfiguration config;
-					// get default configuration
-//					MethodConfiguration defaultConfig = process
-//							.getDefaultContext();
-					for (int i = 0; i < obs.length; i++) {
-						config = (MethodConfiguration) obs[i];
-						if (config != null) {
-//								|| checkValidityForSuperSet(defaultConfig,
-//										config)) {
-							actionMgr.doAction(IActionManager.ADD, process,
-									UmaPackage.eINSTANCE
-											.getProcess_ValidContext(), config,
-									-1);
-						} else {
-							AuthoringUIPlugin
-									.getDefault()
-									.getMsgDialog()
-									.displayError(
-											AuthoringUIResources.addConfigErrorDialog_title, //$NON-NLS-1$
-											AuthoringUIResources.bind(AuthoringUIResources.invalidConfigError_msg, config.getName())); //$NON-NLS-1$
-						}
-					}
-				}
-			}
-		});
-
-		buttonRemove.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) configListViewer
-						.getSelection();
-				actionMgr.doAction(IActionManager.REMOVE_MANY, process,
-						UmaPackage.eINSTANCE.getProcess_ValidContext(),
-						selection.toList(), -1);
-			}
-		});
-
-		buttonMakeDefault.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) configListViewer
-						.getSelection();
-				if (selection.size() == 1) {
-					MethodConfiguration currentConfig = process
-							.getDefaultContext();
-
-					if (currentConfig != selection.getFirstElement()) {
-						boolean isValid = true;
-						List validContext = process.getValidContext();
-						for (Iterator itor = validContext.iterator(); itor
-								.hasNext();) {
-							MethodConfiguration config = (MethodConfiguration) itor
-									.next();
-							if (!(checkValidityForSuperSet(
-									(MethodConfiguration) selection
-											.getFirstElement(), config))) {
-								isValid = false;
-								break;
-							}
-						}
-						if (isValid) {
-							boolean status = actionMgr.doAction(
-									IActionManager.SET, process,
-									UmaPackage.eINSTANCE
-											.getProcess_DefaultContext(),
-									selection.getFirstElement(), -1);
-							if (!status)
-								return;
-							buttonRemove.setEnabled(false);
-						} else {
-							String selectedConfigName = ((MethodConfiguration) selection
-									.getFirstElement()).getName();
-							AuthoringUIPlugin
-									.getDefault()
-									.getMsgDialog()
-									.displayError(
-											AuthoringUIResources.setDefaultConfigErrorDialog_title, //$NON-NLS-1$
-											AuthoringUIResources.bind(AuthoringUIResources.setDefaultConfigError_msg, selectedConfigName)); //$NON-NLS-1$
-						}
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * Refresh all the controls
-	 * 
-	 * @param editable
-	 */
-	protected void refresh(boolean editable) {
-		ctrl_name.setEditable(editable);
-		ctrl_presentation_name.setEditable(editable);
-		ctrl_brief_desc.setEditable(editable);
-		ctrl_purpose.setEditable(editable);
-		ctrl_full_desc.setEditable(editable);
-		ctrl_alternatives.setEditable(editable);
-		ctrl_external_id.setEditable(editable);
-		ctrl_key_consideration.setEditable(editable);
-		ctrl_how_to_staff.setEditable(editable);
-		ctrl_scope.setEditable(editable);
-		ctrl_usage_notes.setEditable(editable);
-		if (ctrl_expanded != null) {
-			ctrl_expanded.setEditable(editable);
-		}
-		buttonAdd.setEnabled(editable);
-		buttonMakeDefault.setEnabled(editable);
-		buttonRemove.setEnabled(editable);
-	}
-
-	/**
-	 * Toggle Description control to expand and control state
-	 * 
-	 */
-	protected void toggle(HyperlinkEvent e, int id) {
-		// TODO- we should combine these methods into one. One way to do it,
-		// dispoing
-		// ctrl_expanded every time it collapses and creating it when we expand.
-		// At present, there is no method to dispose
-		toggle(e);
-		// if (id == GENERAL_SECTION_ID)
-		// {
-		// toggleGeneralSection(e);
-		// }
-		// if (id == DETAIL_SECTION_ID)
-		// {
-		// toggleDetailSection(e);
-		// }
-	}
-
-	protected void toggle(HyperlinkEvent e) {
-		if (ctrl_expanded == null) {
-			ctrl_expanded = createRichTextEditor(toolkit, expandedComposite,
-					SWT.MULTI | SWT.WRAP | SWT.V_SCROLL,
-					GridData.FILL_VERTICAL, getRichTextEditorHeight(),
-					getRichTextEditorWidth(), 2,
-					expandLabel);
-			ctrl_expanded.addModifyListener(contentModifyListener);
-		}
-
-		if (descExpandFlag) {
-			expandedComposite.setVisible(false);
-			sectionComposite.setVisible(true);
-			formSection.setClient(sectionComposite);
-			enableSections(true);
-			IMethodRichText richText = getActiveRichTextControl();
-			richText.setText(ctrl_expanded.getText());
-			for (Iterator i = richText.getListeners(); i.hasNext();) {
-				RichTextListener listener = (RichTextListener) i.next();
-				ctrl_expanded.removeListener(listener.getEventType(), listener
-						.getListener());
-			}
-			if (ctrl_expanded.getModified()) {
-				((MethodElementEditor) getEditor())
-						.saveModifiedRichText(ctrl_expanded);
-			}
-			editor.setFocus();
-		} else {
-			sectionComposite.setVisible(false);
-			expandedComposite.setVisible(true);
-			formSection.setClient(expandedComposite);
-			enableSections(false);
-			((Label)expandLabel.getControl()).setText((String) ((ImageHyperlink) e.getSource())
-					.getData("Title")); //$NON-NLS-1$
-			IMethodRichText richText = (IMethodRichText) e.getHref();
-			ctrl_expanded.setText(richText.getText());
-			ctrl_expanded.setModalObject(richText.getModalObject());
-			ctrl_expanded.setModalObjectFeature(richText
-					.getModalObjectFeature());
-			ctrl_expanded.setFindReplaceAction(richText.getFindReplaceAction());
-			for (Iterator i = richText.getListeners(); i.hasNext();) {
-				RichTextListener listener = (RichTextListener) i.next();
-				ctrl_expanded.addListener(listener.getEventType(), listener
-						.getListener());
-			}
-			boolean editable = !TngUtil.isLocked(process);
-			ctrl_expanded.setEditable(editable);
-			if (editable) {
-				ctrl_expanded.setFocus();
-			}
-			setActiveRichTextControl(richText);
-		}
-		form.getBody().layout(true, true);
-		descExpandFlag = !descExpandFlag;
-	}
-
-	/**
-	 * Checks whether default configuration is superset of selected
-	 * configuration or not
-	 * 
-	 * @param config
-	 * @return
-	 */
-	private boolean checkValidityForSuperSet(MethodConfiguration defaultConfig,
-			MethodConfiguration config) {
-		// get default plugins and packages
-		List defaultPlugins = defaultConfig.getMethodPluginSelection();
-		List defaultPackages = defaultConfig.getMethodPackageSelection();
-
-		// get confiugration plugins and pacakges
-		List packages = config.getMethodPackageSelection();
-		List plugins = config.getMethodPluginSelection();
-		boolean pluginContains = false;
-		boolean packageContains = false;
-		if ((plugins != null) && (!(plugins.isEmpty()))) {
-			pluginContains = defaultPlugins.containsAll(plugins);
-		}
-		if ((packages != null) && (!(packages.isEmpty()))) {
-			packageContains = defaultPackages.containsAll(packages);
-		}
-
-		return (pluginContains) && (packageContains);
-	}
-
-	/**
-	 * Set active rich text control
-	 * 
-	 * @param ctrl
-	 */
-	private void setActiveRichTextControl(IMethodRichText ctrl) {
-		activeControl = ctrl;
-	}
-
-	/**
-	 * Get Active Rich text control
-	 * 
-	 * @return
-	 * 		Rich text control
-	 */
-	private IMethodRichText getActiveRichTextControl() {
-		return activeControl;
-	}
-
-	protected void enableSections(boolean enable) {
-		generalSection.setVisible(enable);
-		if (enable) {
-			generalSection.setExpanded(generalSectionExpandFlag);
-		} else {
-			generalSectionExpandFlag = generalSection.isExpanded();
-			generalSection.setExpanded(enable);
-		}
-
-		detailSection.setVisible(enable);
-		if (enable) {
-			detailSection.setExpanded(detailSectionExpandFlag);
-		} else {
-			detailSectionExpandFlag = detailSection.isExpanded();
-			detailSection.setExpanded(enable);
-		}
-		configSection.setVisible(enable);
-		if (enable) {
-			configSection.setExpanded(configSectionExpandFlag);
-		} else {
-			configSectionExpandFlag = configSection.isExpanded();
-			configSection.setExpanded(enable);
-		}
-	}
-
-	/**
-	 * Set name for the form
-	 */
-	public void setFormText() {
-
-		form.setText(LibraryUIText.getUIText(process)
-				+ ": " + methodElement.getName()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Refresh form name
-	 * @param newName
-	 */
-	public void refreshElementName(String newName) {
-		if (newName != null) {
-			if ((ctrl_name != null) && !(ctrl_name.isDisposed())) {
-				ctrl_name.removeModifyListener(nameModifyListener);
-				ctrl_name.setText(newName);
-				ctrl_name.addModifyListener(nameModifyListener);
-				setFormText();
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ProcessFormPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ProcessFormPage.java
deleted file mode 100755
index 2ead5b2..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ProcessFormPage.java
+++ /dev/null
@@ -1,61 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditorInput;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The base class for all Process form pages.
- * 
- * @author Phong Nguyen Le
- * @author Kelvin Low
- * @since 1.0
- */
-public class ProcessFormPage extends BaseFormPage {
-
-	protected Process process;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param editor
-	 *            The parent form editor.
-	 * @param id
-	 *            The unique ID for the form page.
-	 * @param title
-	 *            The title for the form page.
-	 */
-	public ProcessFormPage(FormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.BaseFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-
-		// Get the Process object from the editor input.
-		MethodElementEditorInput methodElementInput = (MethodElementEditorInput) input;
-
-		Object obj = methodElementInput.getMethodElement();
-		if (obj instanceof ProcessComponent) {
-			process = ((ProcessComponent) obj).getProcess();
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ProcessFormUtil.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ProcessFormUtil.java
deleted file mode 100755
index 500d1c2..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ProcessFormUtil.java
+++ /dev/null
@@ -1,63 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.epf.authoring.ui.editors.ColumnDescriptor;
-import org.eclipse.epf.authoring.ui.editors.ProcessEditor;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * Helper class for the Process editor form pages.
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class ProcessFormUtil {
-
-	/**
-	 * Converts string representation into column descriptors list
-	 * @param str
-	 * @return
-	 * 		List of column descriptors
-	 */
-	public static EList toColumnDescriptorList(String str) {
-		EList columnDescriptors = new BasicEList();
-		StringTokenizer tokens = new StringTokenizer(str, ","); //$NON-NLS-1$
-		while (tokens.hasMoreTokens()) {
-			String token = tokens.nextToken();
-			Object columnDescriptor = ProcessEditor.idToColumnDescriptorMap
-					.get(token);
-			if (columnDescriptor != null) {
-				columnDescriptors.add(columnDescriptor);
-			}
-		}
-		return columnDescriptors;
-	}
-
-	/**
-	 * Converts string representation into column descriptors array list
-	 * @param str
-	 * @return
-	 * 		Array ist of column descriptors
-	 */
-	public static ColumnDescriptor[] toColumnDescriptors(String str) {
-		List list = toColumnDescriptorList(str);
-		ColumnDescriptor[] columns = new ColumnDescriptor[list.size()];
-		list.toArray(columns);
-		return columns;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleCategoriesPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleCategoriesPage.java
deleted file mode 100755
index 7eeae7d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleCategoriesPage.java
+++ /dev/null
@@ -1,238 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.CategoryFilter;
-import org.eclipse.epf.authoring.ui.filters.CustomCategoryFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.util.LibraryManager;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Categories page in the Role editor.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @since 1.0
- */
-public class RoleCategoriesPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "roleCategoriesPage"; //$NON-NLS-1$
-
-	private Role role;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public RoleCategoriesPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.CATEGORIES_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		role = (Role) contentElement;
-		setAllowChange1(true);
-		setAllowChange2(true);
-		setUseCategory3(false);
-		setCategoryIsSingleSelection1(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return AssociationHelper.getRoleSets((Role) object).toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			for (Iterator it = addItems.iterator(); it.hasNext();) {
-				RoleSet roleSet = (RoleSet) it.next();
-				// TODO: Test on-the-fly creation of category contributor
-				LibraryManager.getInstance().addToRoleSet(getActionManager(),
-						roleSet, role);
-				if (usedCategories.contains(roleSet)) {
-					usedCategories.remove(roleSet);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				RoleSet roleSet = (RoleSet) it.next();
-				// TODO: Test on-the-fly creation of category contributor
-				LibraryManager.getInstance().removeFromRoleSet(
-						getActionManager(), roleSet, role);
-				if (!usedCategories.contains(roleSet)) {
-					usedCategories.add(roleSet);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected2()
-	 */
-	protected void initContentProviderSelected2() {
-		contentProviderSelected2 = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return AssociationHelper.getCustomCategories((Role) object)
-						.toArray();
-			}
-		};
-		viewer_selected2.setContentProvider(contentProviderSelected2);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel2()
-	 */
-	protected void addItemsToModel2(ArrayList addItems) {
-		if (!addItems.isEmpty()) {
-			for (Iterator it = addItems.iterator(); it.hasNext();) {
-				CustomCategory customCategory = (CustomCategory) it.next();
-				LibraryManager.getInstance().addToCustomCategory(
-						getActionManager(), customCategory, role);
-				if (usedCategories.contains(customCategory)) {
-					usedCategories.remove(customCategory);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel2()
-	 */
-	protected void removeItemsFromModel2(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				CustomCategory customCategory = (CustomCategory) it.next();
-				LibraryManager.getInstance().removeFromCustomCategory(
-						getActionManager(), customCategory, role);
-				if (!usedCategories.contains(customCategory)) {
-					usedCategories.add(customCategory);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return role;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.ROLESETS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString2()
-	 */
-	protected String getTabString2() {
-		return FilterConstants.CUSTOM_CATEGORIES;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new CategoryFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof RoleSet);
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter2()
-	 */
-	protected IFilter getFilter2() {
-		return filter = new CustomCategoryFilter();
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.roleCategoriesPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.roleCategoriesPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.roleCategoriesPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.roleCategoriesPage_selectedLabel2;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel3()
-	 */
-	protected String getSelectedLabel3() {
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleDescriptionPage.java
deleted file mode 100755
index 7a95455..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleDescriptionPage.java
+++ /dev/null
@@ -1,269 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.filters.ContentFilter;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.VariabilityBaseElementFilter;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-
-/**
- * The Description page for the Role editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class RoleDescriptionPage extends DescriptionFormPage {
-
-	private static final String FORM_PAGE_ID = "roleDescriptionPage"; //$NON-NLS-1$
-
-	private static final String BASE_ROLE = AuthoringUIText.BASE_ELEMENT_TEXT;
-
-	private IMethodRichText ctrl_skills;
-
-	private IMethodRichText ctrl_assign;
-
-	private IMethodRichText ctrl_synonyms;
-
-	private Role role;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public RoleDescriptionPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.DESCRIPTION_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		role = (Role) contentElement;
-		notationSectionOn = true;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#createEditorContent(FormToolkit)
-	 */
-	protected void createEditorContent(FormToolkit toolkit) {
-		super.createEditorContent(toolkit);
-		label_base.setText(BASE_ROLE);
-	}
-
-	/**
-	 * Creates the Staffing section.
-	 */
-	protected void createNotationSectionContent() {
-		super.createNotationSectionContent();
-		notationSection.setText(AuthoringUIText.STAFFING_SECTION_NAME);
-		notationSection.setDescription(AuthoringUIText.STAFFING_SECTION_DESC);
-		ctrl_skills = createRichTextEditWithLinkForSection(toolkit,
-				notationComposite, AuthoringUIText.SKILLS_TEXT, 40, 400,
-				NOTATION_SECTION_ID);
-		ctrl_assign = createRichTextEditWithLinkForSection(toolkit,
-				notationComposite, AuthoringUIText.ASSIGNMENT_APPROACHES_TEXT,
-				40, 400, NOTATION_SECTION_ID);
-		ctrl_synonyms = createRichTextEditWithLinkForSection(toolkit,
-				notationComposite, AuthoringUIText.SYNONYMS_TEXT, 40, 400,
-				NOTATION_SECTION_ID);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#addListeners()
-	 */
-	protected void addListeners() {
-		super.addListeners();
-
-		final MethodElementEditor editor = (MethodElementEditor) getEditor();
-
-		ctrl_skills.setModalObject(contentElement.getPresentation());
-		ctrl_skills.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getRoleDescription_Skills());
-		ctrl_skills.addModifyListener(contentModifyListener);
-		ctrl_skills.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_skills;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = ((org.eclipse.epf.uma.RoleDescription) role
-						.getPresentation()).getSkills();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = editor.getActionManager().doAction(
-							IActionManager.SET,
-							contentElement.getPresentation(),
-							UmaPackage.eINSTANCE.getRoleDescription_Skills(),
-							newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-
-		ctrl_assign.setModalObject(contentElement.getPresentation());
-		ctrl_assign.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getRoleDescription_AssignmentApproaches());
-		ctrl_assign.addModifyListener(contentModifyListener);
-		ctrl_assign.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_assign;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = ((org.eclipse.epf.uma.RoleDescription) role
-						.getPresentation()).getAssignmentApproaches();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = editor.getActionManager().doAction(
-							IActionManager.SET,
-							contentElement.getPresentation(),
-							UmaPackage.eINSTANCE
-									.getRoleDescription_AssignmentApproaches(),
-							newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-
-		ctrl_synonyms.setModalObject(contentElement.getPresentation());
-		ctrl_synonyms.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getRoleDescription_Synonyms());
-		ctrl_synonyms.addModifyListener(contentModifyListener);
-		ctrl_synonyms.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_synonyms;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = ((org.eclipse.epf.uma.RoleDescription) role
-						.getPresentation()).getSynonyms();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = editor.getActionManager().doAction(
-							IActionManager.SET,
-							contentElement.getPresentation(),
-							UmaPackage.eINSTANCE.getRoleDescription_Synonyms(),
-							newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#refresh(boolean)
-	 */
-	protected void refresh(boolean editable) {
-		super.refresh(editable);
-		ctrl_skills.setEditable(editable);
-		ctrl_assign.setEditable(editable);
-		ctrl_synonyms.setEditable(editable);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadData()
-	 */
-	protected void loadData() {
-		super.loadData();
-
-		String skills = ((org.eclipse.epf.uma.RoleDescription) role.getPresentation())
-				.getSkills();
-		String assign = ((org.eclipse.epf.uma.RoleDescription) role.getPresentation())
-				.getAssignmentApproaches();
-		String synonyms = ((org.eclipse.epf.uma.RoleDescription) role.getPresentation())
-				.getSynonyms();
-
-		ctrl_skills.setText(skills == null ? "" : skills); //$NON-NLS-1$
-		ctrl_assign.setText(assign == null ? "" : assign); //$NON-NLS-1$
-		ctrl_synonyms.setText(synonyms == null ? "" : synonyms); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return role;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.ROLES;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		filter = new ContentFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof Role);
-			}
-		};
-
-		// Set additional filter for variability base element checking.
-		((ContentFilter) filter)
-				.setAdditionalFilters(new IFilter[] { new VariabilityBaseElementFilter(
-						role) });
-		return filter;
-	}
-	
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadSectionDescription()
-	 */
-	public void loadSectionDescription() {
-		this.generalSectionDescription = AuthoringUIResources.role_generalInfoSection_desc;
-		this.detailSectionDescription = AuthoringUIResources.role_detailSection_desc;
-		this.variabilitySectionDescription = AuthoringUIResources.role_variabilitySection_desc;
-		this.versionSectionDescription = AuthoringUIResources.role_versionInfoSection_desc;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleGuidancePage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleGuidancePage.java
deleted file mode 100755
index cf729b7..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleGuidancePage.java
+++ /dev/null
@@ -1,247 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.GuidanceFilter;
-import org.eclipse.epf.authoring.ui.util.UIHelper;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Guidance page in the Role editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class RoleGuidancePage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "roleGuidancePage"; //$NON-NLS-1$
-
-	private Role role;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public RoleGuidancePage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.GUIDANCE_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		role = (Role) contentElement;
-		setAllowChange1(true);
-		setAllowChange2(true);
-		setUseCategory2(false);
-		setUseCategory3(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return UIHelper.getSelectedGuidances(role);
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			for (Iterator it = addItems.iterator(); it.hasNext();) {
-				Guidance item = (Guidance) it.next();
-
-				// Guidance for the content element.
-				if (item instanceof Checklist) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.ADD,
-									role,
-									UmaPackage.eINSTANCE
-											.getContentElement_Checklists(),
-									(Checklist) item, -1);
-				} else if (item instanceof Concept) {
-					editor.getActionManager().doAction(
-							IActionManager.ADD,
-							role,
-							UmaPackage.eINSTANCE
-									.getContentElement_ConceptsAndPapers(),
-							(Concept) item, -1);
-				} else if (item instanceof Example) {
-					editor.getActionManager().doAction(IActionManager.ADD,
-							role,
-							UmaPackage.eINSTANCE.getContentElement_Examples(),
-							(Example) item, -1);
-				} else if (item instanceof Practice) {
-					editor.getActionManager().doAction(
-							IActionManager.ADD,
-							(Practice) item,
-							UmaPackage.eINSTANCE
-									.getPractice_ContentReferences(), role, -1);
-				} else if (item instanceof SupportingMaterial) {
-					editor.getActionManager().doAction(
-							IActionManager.ADD,
-							role,
-							UmaPackage.eINSTANCE
-									.getContentElement_SupportingMaterials(),
-							(SupportingMaterial) item, -1);
-				} else if (item instanceof Guideline) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.ADD,
-									role,
-									UmaPackage.eINSTANCE
-											.getContentElement_Guidelines(),
-									(Guideline) item, -1);
-				} else if (item instanceof ReusableAsset) {
-					editor.getActionManager().doAction(IActionManager.ADD,
-							role,
-							UmaPackage.eINSTANCE.getContentElement_Assets(),
-							(ReusableAsset) item, -1);
-				} else {
-					AuthoringUIPlugin
-							.getDefault()
-							.getLogger()
-							.logError(
-									"Unable to add guidance " + item.getType().getName() + ":" + item.getName() + //$NON-NLS-1$ //$NON-NLS-2$
-											"to " + role.getType().getName()
-											+ ":" + role.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				Guidance item = (Guidance) it.next();
-
-				// Guidance for the method element.
-				if (item instanceof Checklist) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.REMOVE,
-									role,
-									UmaPackage.eINSTANCE
-											.getContentElement_Checklists(),
-									(Checklist) item, -1);
-				} else if (item instanceof Concept) {
-					editor.getActionManager().doAction(
-							IActionManager.REMOVE,
-							role,
-							UmaPackage.eINSTANCE
-									.getContentElement_ConceptsAndPapers(),
-							(Concept) item, -1);
-				} else if (item instanceof Example) {
-					editor.getActionManager().doAction(IActionManager.REMOVE,
-							role,
-							UmaPackage.eINSTANCE.getContentElement_Examples(),
-							(Example) item, -1);
-				} else if (item instanceof Practice) {
-					editor.getActionManager().doAction(
-							IActionManager.REMOVE,
-							(Practice) item,
-							UmaPackage.eINSTANCE
-									.getPractice_ContentReferences(), role, -1);
-				} else if (item instanceof SupportingMaterial) {
-					editor.getActionManager().doAction(
-							IActionManager.REMOVE,
-							role,
-							UmaPackage.eINSTANCE
-									.getContentElement_SupportingMaterials(),
-							(SupportingMaterial) item, -1);
-				} else if (item instanceof Guideline) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.REMOVE,
-									role,
-									UmaPackage.eINSTANCE
-											.getContentElement_Guidelines(),
-									(Guideline) item, -1);
-				} else if (item instanceof ReusableAsset) {
-					editor.getActionManager().doAction(IActionManager.REMOVE,
-							role,
-							UmaPackage.eINSTANCE.getContentElement_Assets(),
-							(ReusableAsset) item, -1);
-				} else {
-					AuthoringUIPlugin
-							.getDefault()
-							.getLogger()
-							.logError(
-									"Unable to remove guidance " + item.getType().getName() + ":" + item.getName() + //$NON-NLS-1$ //$NON-NLS-2$
-											"from " + role.getType().getName()
-											+ ":" + role.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return role;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.GUIDANCE;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new GuidanceFilter();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleSetDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleSetDescriptionPage.java
deleted file mode 100755
index 6b255e6..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleSetDescriptionPage.java
+++ /dev/null
@@ -1,92 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.CategoryFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.VariabilityBaseElementFilter;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Description page for the Domain editor.
- * 
- * @author Kelvin Low
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class RoleSetDescriptionPage extends DescriptionFormPage {
-
-	private static final String FORM_PAGE_ID = "roleSetDescriptionPage"; //$NON-NLS-1$
-
-	private RoleSet roleSet;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public RoleSetDescriptionPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.DESCRIPTION_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		roleSet = (RoleSet) contentElement;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return roleSet;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		filter = new CategoryFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof RoleSet);
-			}
-		};
-
-		// set additional filter for variability base element checking
-		((CategoryFilter) filter)
-				.setAdditionalFilters(new IFilter[] { new VariabilityBaseElementFilter(
-						roleSet) });
-		return filter;
-	}
-
-	protected String getTabString() {
-		return FilterConstants.ROLESETS;
-	}
-	
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadSectionDescription()
-	 */
-	public void loadSectionDescription() {
-		this.generalSectionDescription = AuthoringUIResources.roleset_generalInfoSection_desc;
-		this.detailSectionDescription = AuthoringUIResources.roleset_detailSection_desc;
-		this.variabilitySectionDescription = AuthoringUIResources.roleset_variabilitySection_desc;
-		this.versionSectionDescription = AuthoringUIResources.roleset_versionInfoSection_desc;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleSetGroupingDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleSetGroupingDescriptionPage.java
deleted file mode 100755
index 649dd7d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleSetGroupingDescriptionPage.java
+++ /dev/null
@@ -1,95 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.CategoryFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.VariabilityBaseElementFilter;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Description page for the Domain editor.
- * 
- * @author Kelvin Low
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class RoleSetGroupingDescriptionPage extends DescriptionFormPage {
-
-	private static final String FORM_PAGE_ID = "roleSetGroupingDescriptionPage"; //$NON-NLS-1$
-
-	private RoleSetGrouping roleSetGrouping;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public RoleSetGroupingDescriptionPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.DESCRIPTION_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		roleSetGrouping = (RoleSetGrouping) contentElement;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return roleSetGrouping;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.ROLESETS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		filter = new CategoryFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof RoleSetGrouping);
-			}
-		};
-
-		// set additional filter for variability base element checking
-		((CategoryFilter) filter)
-				.setAdditionalFilters(new IFilter[] { new VariabilityBaseElementFilter(
-						roleSetGrouping) });
-		return filter;
-	}
-	
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadSectionDescription()
-	 */
-	public void loadSectionDescription() {
-		this.generalSectionDescription = AuthoringUIResources.rolesetgrouping_generalInfoSection_desc;
-		this.detailSectionDescription = AuthoringUIResources.rolesetgrouping_detailSection_desc;
-		this.variabilitySectionDescription = AuthoringUIResources.rolesetgrouping_variabilitySection_desc;
-		this.versionSectionDescription = AuthoringUIResources.rolesetgrouping_versionInfoSection_desc;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleSetGroupingRoleSets.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleSetGroupingRoleSets.java
deleted file mode 100755
index 3b2f284..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleSetGroupingRoleSets.java
+++ /dev/null
@@ -1,170 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.CategoryFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Role Sets page in the Role Set Grouping editor.
- * 
- * @author Shashidhar Kannoori
- * @author Kelvin Low
- * @since 1.0
- * 
- * TODO: Rename this class to RoleSetGroupingRoleSetsPage and move it to the
- * om.ibm.rmc.authoring.ui.util.forms package
- */
-public class RoleSetGroupingRoleSets extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "roleSetGroupingRoleSetsPage"; //$NON-NLS-1$
-
-	private RoleSetGrouping roleSetGrouping;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public RoleSetGroupingRoleSets(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.ROLE_SETS_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		roleSetGrouping = (RoleSetGrouping) contentElement;
-		setUseCategory2(false);
-		setUseCategory3(false);
-		setAllowChange1(true);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return ((RoleSetGrouping) object).getRoleSets().toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			editor.getActionManager().doAction(IActionManager.ADD_MANY,
-					roleSetGrouping,
-					UmaPackage.eINSTANCE.getRoleSetGrouping_RoleSets(),
-					addItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			editor.getActionManager().doAction(IActionManager.REMOVE_MANY,
-					roleSetGrouping,
-					UmaPackage.eINSTANCE.getRoleSetGrouping_RoleSets(),
-					rmItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return roleSetGrouping;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.ROLESETS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new CategoryFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof RoleSet);
-			}
-		};
-	}
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.roleSetGroupingRoleSetsPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.roleSetGroupingRoleSetsPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.roleSetGroupingRoleSetsPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.roleSetGroupingRoleSetsPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.roleSetGroupingRoleSetsPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel3()
-	 */
-	protected String getSelectedLabel3() {
-		return AuthoringUIResources.roleSetGroupingRoleSetsPage_selectedLabel;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleSetRolesPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleSetRolesPage.java
deleted file mode 100755
index 4003d86..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleSetRolesPage.java
+++ /dev/null
@@ -1,171 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.ContentFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Roles page in the Role Set editor.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- */
-public class RoleSetRolesPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "roleSetRolesPage"; //$NON-NLS-1$
-
-	private RoleSet roleSet;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public RoleSetRolesPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.ROLES_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		roleSet = (RoleSet) contentElement;
-		setUseCategory2(false);
-		setUseCategory3(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return ((RoleSet) object).getRoles().toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			editor.getActionManager().doAction(IActionManager.ADD_MANY,
-					roleSet, UmaPackage.eINSTANCE.getRoleSet_Roles(), addItems,
-					-1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			editor.getActionManager().doAction(IActionManager.REMOVE_MANY,
-					roleSet, UmaPackage.eINSTANCE.getRoleSet_Roles(), rmItems,
-					-1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return roleSet;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.ROLES;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new ContentFilter() {
-			protected boolean childAccept(Object obj) {
-				if (obj instanceof ContentElement) {
-					if (getHelper().isContributor((ContentElement) obj))
-						return false;
-				}
-				return (obj instanceof Role);
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.roleSetRolesPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.roleSetRolesPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.roleSetRolesPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.roleSetRolesPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.roleSetRolesPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel3()
-	 */
-	protected String getSelectedLabel3() {
-		return AuthoringUIResources.roleSetRolesPage_selectedLabel;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleTasksPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleTasksPage.java
deleted file mode 100755
index 3dd805e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleTasksPage.java
+++ /dev/null
@@ -1,217 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.ContentFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Tasks page in the Role editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class RoleTasksPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "roleTasksPage"; //$NON-NLS-1$
-
-	private Role role;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public RoleTasksPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.TASKS_PAGE_TITLE); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		role = (Role) contentElement;
-		setUseCategory3(false);
-		setAllowChange1(false);
-		setAllowChange2(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return AssociationHelper.getPrimaryTasks((Role) object)
-						.toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			List elementList = retrieveTableViewerContents(viewer_selected2);
-			for (java.util.Iterator it = addItems.iterator(); it.hasNext();) {
-				Task task = (Task) it.next();
-				if (!elementList.contains(task)) {
-					editor.getActionManager().doAction(IActionManager.SET,
-							task, UmaPackage.eINSTANCE.getTask_PerformedBy(),
-							role, -1);
-				}
-			}
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (java.util.Iterator it = rmItems.iterator(); it.hasNext();) {
-				Task task = (Task) it.next();
-				task.setPerformedBy(null);
-			}
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected2()
-	 */
-	protected void initContentProviderSelected2() {
-		contentProviderSelected2 = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return AssociationHelper.getSecondaryTasks((Role) object)
-						.toArray();
-			}
-		};
-		viewer_selected2.setContentProvider(contentProviderSelected2);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel2(ArrayList)
-	 */
-	protected void addItemsToModel2(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			List elementList = retrieveTableViewerContents(viewer_selected);
-			for (java.util.Iterator it = addItems.iterator(); it.hasNext();) {
-				Task task = (Task) it.next();
-				if (!elementList.contains(task)) {
-					task.getAdditionallyPerformedBy().add(role);
-				}
-			}
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel2(ArrayList)
-	 */
-	protected void removeItemsFromModel2(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (java.util.Iterator it = rmItems.iterator(); it.hasNext();) {
-				Task task = (Task) it.next();
-				task.getAdditionallyPerformedBy().remove(role);
-			}
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return role;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.TASKS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new ContentFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof Task);
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.roleTasksPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.roleTasksPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.roleTasksPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.roleTasksPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.roleTasksPage_selectedLabel2;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleWorkProductsPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleWorkProductsPage.java
deleted file mode 100755
index c1210bc..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/RoleWorkProductsPage.java
+++ /dev/null
@@ -1,189 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.WorkProductFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Work Products page in the Role editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class RoleWorkProductsPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "roleWorkProductsPage"; //$NON-NLS-1$
-
-	private Role role;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public RoleWorkProductsPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.WORK_PRODUCTS_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		role = (Role) contentElement;
-		setUseCategory3(false);
-		setAllowChange1(true);
-		setAllowChange2(true);
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.createFormContent(IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ctrl_add2.setVisible(false);
-		ctrl_remove2.setVisible(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return ((Role) object).getResponsibleFor().toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if(!addItems.isEmpty()) {
-			getActionManager().doAction(IActionManager.ADD_MANY, role, UmaPackage.eINSTANCE.getRole_ResponsibleFor(), addItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-//			for (int i = 0; i < rmItems.size(); i++) {
-//				LibraryManager.getInstance().setResponsibleRole(
-//						getActionManager(), (WorkProduct) rmItems.get(i), null);
-//			}
-			
-			getActionManager().doAction(IActionManager.REMOVE_MANY, role, UmaPackage.eINSTANCE.getRole_ResponsibleFor(), rmItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected2()
-	 */
-	protected void initContentProviderSelected2() {
-		contentProviderSelected2 = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return AssociationHelper.getModifiedWorkProducts((Role) object)
-						.toArray();
-			}
-		};
-		viewer_selected2.setContentProvider(contentProviderSelected2);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return role;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.WORKPRODUCTS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new WorkProductFilter();
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.roleWorkProductsPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.roleWorkProductsPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.roleWorkProductsPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.roleWorkProductsPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.roleWorkProductsPage_selectedLabel2;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel3()
-	 */
-	protected String getSelectedLabel3() {
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskCategoriesPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskCategoriesPage.java
deleted file mode 100755
index 790e783..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskCategoriesPage.java
+++ /dev/null
@@ -1,256 +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.authoring.ui.forms;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.CategoryFilter;
-import org.eclipse.epf.authoring.ui.filters.CustomCategoryFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.LibraryEditResources;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.util.Messenger;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.util.LibraryManager;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Categories page in the Task editor.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @since 1.0
- */
-public class TaskCategoriesPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "taskCategoriesPage"; //$NON-NLS-1$
-
-	private Task task;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public TaskCategoriesPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.CATEGORIES_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		task = (Task) contentElement;
-//		setCategoryIsSingleSelection1(true);
-		setAllowChange1(true);
-		setAllowChange2(true);
-		setUseCategory3(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return AssociationHelper.getDisciplines((Task) object).toArray();				
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			for(Iterator iterator = addItems.iterator(); iterator.hasNext();){
-				Object discipline = iterator.next();
-				if(discipline instanceof Discipline){
-//					List disciplines = AssociationHelper.getDisciplines(task);
-//					if (disciplines != null && disciplines.size() > 0)	{
-//						Object associatedDiscipline = disciplines.get(0);
-//						String msg = MessageFormat
-//						.format(
-//								LibraryEditResources.UserInteractionHelper_errRelationshipExists,
-//								new Object[] {
-//										task.getName(),
-//										TngUtil
-//												.getLabelWithPath(associatedDiscipline),
-//										((Discipline) discipline).getName() });
-//						Messenger.INSTANCE.showWarning(
-//								LibraryEditResources.errorDialog_title, msg);
-//						return;
-//					}
-
-					
-					LibraryManager.getInstance().addToDiscipline(getActionManager(),
-						(Discipline) discipline, task);
-					if (usedCategories.contains(discipline)) {
-						usedCategories.remove(discipline);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				Discipline discipline = (Discipline) it.next();
-				LibraryManager.getInstance().removeFromDiscipline(
-						getActionManager(), discipline, task);
-				if (!usedCategories.contains(discipline)) {
-					usedCategories.add(discipline);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected2()
-	 */
-	protected void initContentProviderSelected2() {
-		contentProviderSelected2 = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return AssociationHelper.getCustomCategories((Task) object)
-						.toArray();
-			}
-		};
-		viewer_selected2.setContentProvider(contentProviderSelected2);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel2()
-	 */
-	protected void addItemsToModel2(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			for (Iterator it = addItems.iterator(); it.hasNext();) {
-				CustomCategory customCategory = (CustomCategory) it.next();
-				LibraryManager.getInstance().addToCustomCategory(
-						getActionManager(), customCategory, task);
-				if (usedCategories.contains(customCategory)) {
-					usedCategories.remove(customCategory);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel2()
-	 */
-	protected void removeItemsFromModel2(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				CustomCategory customCategory = (CustomCategory) it.next();
-				LibraryManager.getInstance().removeFromCustomCategory(
-						getActionManager(), customCategory, task);
-				if (!usedCategories.contains(customCategory)) {
-					usedCategories.add(customCategory);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return task;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.DISCIPLINES;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString2()
-	 */
-	protected String getTabString2() {
-		return FilterConstants.CUSTOM_CATEGORIES;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new CategoryFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof Discipline);
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter2() {
-		return filter2 = new CustomCategoryFilter();
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.taskCategoriesPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.taskCategoriesPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.taskCategoriesPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.taskCategoriesPage_selectedLabel2;
-	}
-	
-
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskDescriptionPage.java
deleted file mode 100755
index 34f5a63..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskDescriptionPage.java
+++ /dev/null
@@ -1,210 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.filters.ContentFilter;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.VariabilityBaseElementFilter;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-
-/**
- * The Description page for the Task editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class TaskDescriptionPage extends DescriptionFormPage {
-
-	private static final String FORM_PAGE_ID = "taskDescriptionPage"; //$NON-NLS-1$		
-
-	private static final String BASE_TASK = AuthoringUIText.BASE_ELEMENT_TEXT;
-
-	private IMethodRichText ctrl_alternatives;
-
-	private Task task;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public TaskDescriptionPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.DESCRIPTION_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		task = (Task) contentElement;
-		purposeOn = true;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#createEditorContent(FormToolkit)
-	 */
-	protected void createEditorContent(FormToolkit toolkit) {
-		super.createEditorContent(toolkit);
-		ctrl_alternatives = createRichTextEditWithLinkForSection(toolkit,
-				detailComposite, AuthoringUIText.ALTERNATIVES_TEXT, 40, 400,
-				DETAIL_SECTION_ID);
-		label_base.setText(BASE_TASK);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadData()
-	 */
-	protected void loadData() {
-		super.loadData();
-		String purpose = ((org.eclipse.epf.uma.TaskDescription) task.getPresentation())
-				.getPurpose();
-		String alternatives = ((org.eclipse.epf.uma.TaskDescription) task
-				.getPresentation()).getAlternatives();
-		ctrl_purpose.setText(purpose == null ? "" : purpose); //$NON-NLS-1$	
-		ctrl_alternatives.setText(alternatives == null ? "" : alternatives); //$NON-NLS-1$	
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#addListeners()
-	 */
-	protected void addListeners() {
-		super.addListeners();
-		final MethodElementEditor editor = (MethodElementEditor) getEditor();
-
-		ctrl_purpose.setModalObject(contentElement.getPresentation());
-		ctrl_purpose.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getTaskDescription_Purpose());
-		ctrl_purpose.addModifyListener(contentModifyListener);
-		ctrl_purpose.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_purpose;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = ((org.eclipse.epf.uma.TaskDescription) task
-						.getPresentation()).getPurpose();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = editor.getActionManager().doAction(
-							IActionManager.SET,
-							contentElement.getPresentation(),
-							UmaPackage.eINSTANCE.getTaskDescription_Purpose(),
-							newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-
-		ctrl_alternatives.setModalObject(contentElement.getPresentation());
-		ctrl_alternatives.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getTaskDescription_Alternatives());
-		ctrl_alternatives.addModifyListener(contentModifyListener);
-		ctrl_alternatives.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_alternatives;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = ((org.eclipse.epf.uma.TaskDescription) task
-						.getPresentation()).getAlternatives();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = editor.getActionManager().doAction(
-							IActionManager.SET,
-							contentElement.getPresentation(),
-							UmaPackage.eINSTANCE
-									.getTaskDescription_Alternatives(),
-							newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#refresh(boolean)
-	 */
-	protected void refresh(boolean editable) {
-		super.refresh(editable);
-		ctrl_alternatives.setEditable(editable);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return task;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.TASKS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		filter = new ContentFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof Task);
-			}
-		};
-
-		// Set additional filter for variability base element checking.
-		((ContentFilter) filter)
-				.setAdditionalFilters(new IFilter[] { new VariabilityBaseElementFilter(
-						task) });
-		return filter;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadSectionDescription()
-	 */
-	public void loadSectionDescription() {
-		this.generalSectionDescription = AuthoringUIResources.task_generalInfoSection_desc;
-		this.detailSectionDescription = AuthoringUIResources.task_detailSection_desc;
-		this.variabilitySectionDescription = AuthoringUIResources.task_variabilitySection_desc;
-		this.versionSectionDescription = AuthoringUIResources.task_versionInfoSection_desc;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskGuidancePage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskGuidancePage.java
deleted file mode 100755
index e47571f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskGuidancePage.java
+++ /dev/null
@@ -1,269 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.GuidanceFilter;
-import org.eclipse.epf.authoring.ui.util.UIHelper;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Guidance page in the Task editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class TaskGuidancePage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "taskGuidancePage"; //$NON-NLS-1$
-
-	private Task task;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public TaskGuidancePage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.GUIDANCE_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		task = (Task) contentElement;
-		setUseCategory2(false);
-		setUseCategory3(false);
-		setAllowChange1(true);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return UIHelper.getSelectedGuidances(task);
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			for (Iterator it = addItems.iterator(); it.hasNext();) {
-				Guidance item = (Guidance) it.next();
-
-				// Guidances for content element.
-				if (item instanceof Checklist) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.ADD,
-									task,
-									UmaPackage.eINSTANCE
-											.getContentElement_Checklists(),
-									(Checklist) item, -1);
-				} else if (item instanceof Concept) {
-					editor.getActionManager().doAction(
-							IActionManager.ADD,
-							task,
-							UmaPackage.eINSTANCE
-									.getContentElement_ConceptsAndPapers(),
-							(Concept) item, -1);
-				} 
-				else if (item instanceof Example) {
-					editor.getActionManager().doAction(IActionManager.ADD,
-							task,
-							UmaPackage.eINSTANCE.getContentElement_Examples(),
-							(Example) item, -1);
-				} else if (item instanceof Practice) {
-					editor.getActionManager().doAction(
-							IActionManager.ADD,
-							(Practice) item,
-							UmaPackage.eINSTANCE
-									.getPractice_ContentReferences(), task, -1);
-				} else if (item instanceof SupportingMaterial) {
-					editor.getActionManager().doAction(
-							IActionManager.ADD,
-							task,
-							UmaPackage.eINSTANCE
-									.getContentElement_SupportingMaterials(),
-							(SupportingMaterial) item, -1);
-				} else if (item instanceof Guideline) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.ADD,
-									task,
-									UmaPackage.eINSTANCE
-											.getContentElement_Guidelines(),
-									(Guideline) item, -1);
-				} else if (item instanceof ToolMentor) {
-					editor.getActionManager().doAction(IActionManager.ADD,
-							task, UmaPackage.eINSTANCE.getTask_ToolMentors(),
-							(ToolMentor) item, -1);
-				} else if (item instanceof ReusableAsset) {
-					editor.getActionManager().doAction(IActionManager.ADD,
-							task,
-							UmaPackage.eINSTANCE.getContentElement_Assets(),
-							(ReusableAsset) item, -1);
-				} 
-				else {
-					AuthoringUIPlugin
-							.getDefault()
-							.getLogger()
-							.logError(
-									"Unable to add guidance " + item.getType().getName() + ":" + item.getName() + //$NON-NLS-1$ //$NON-NLS-2$
-											"to " + task.getType().getName()
-											+ ":" + task.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				Guidance item = (Guidance) it.next();
-
-				// Guidance for the method element.
-				if (item instanceof Checklist) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.REMOVE,
-									task,
-									UmaPackage.eINSTANCE
-											.getContentElement_Checklists(),
-									(Checklist) item, -1);
-				} else if (item instanceof Concept) {
-					editor.getActionManager().doAction(
-							IActionManager.REMOVE,
-							task,
-							UmaPackage.eINSTANCE
-									.getContentElement_ConceptsAndPapers(),
-							(Concept) item, -1);
-				} else if (item instanceof Example) {
-					editor.getActionManager().doAction(IActionManager.REMOVE,
-							task,
-							UmaPackage.eINSTANCE.getContentElement_Examples(),
-							(Example) item, -1);
-				} else if (item instanceof Practice) {
-					editor.getActionManager().doAction(
-							IActionManager.REMOVE,
-							(Practice) item,
-							UmaPackage.eINSTANCE
-									.getPractice_ContentReferences(), task, -1);
-				} else if (item instanceof SupportingMaterial) {
-					editor.getActionManager().doAction(
-							IActionManager.REMOVE,
-							task,
-							UmaPackage.eINSTANCE
-									.getContentElement_SupportingMaterials(),
-							(SupportingMaterial) item, -1);
-				} else if (item instanceof Guideline) {
-					editor.getActionManager()
-							.doAction(
-									IActionManager.REMOVE,
-									task,
-									UmaPackage.eINSTANCE
-											.getContentElement_Guidelines(),
-									(Guideline) item, -1);
-				} else if (item instanceof ToolMentor) {
-					editor.getActionManager().doAction(IActionManager.REMOVE,
-							task, UmaPackage.eINSTANCE.getTask_ToolMentors(),
-							item, -1);
-				} else if (item instanceof ReusableAsset) {
-					editor.getActionManager().doAction(IActionManager.REMOVE,
-							task,
-							UmaPackage.eINSTANCE.getContentElement_Assets(),
-							(ReusableAsset) item, -1);
-				} 
-//				else if (item instanceof Estimate) {
-//					editor.getActionManager().doAction(IActionManager.SET,
-//							task, UmaPackage.eINSTANCE.getTask_Estimate(),
-//							null, -1);
-//				} 
-				else {
-					AuthoringUIPlugin
-							.getDefault()
-							.getLogger()
-							.logError(
-									"Unable to remove guidance " + item.getType().getName() + ":" + item.getName() + //$NON-NLS-1$ //$NON-NLS-2$
-											"from " + task.getType().getName()
-											+ ":" + task.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return task;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.GUIDANCE;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new GuidanceFilter() {
-			protected boolean childAccept(Object obj) {
-				if (super.childAccept(obj))
-					return true;
-				return (obj instanceof ToolMentor);
-			}
-		};
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskRolesPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskRolesPage.java
deleted file mode 100755
index 61774e4..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskRolesPage.java
+++ /dev/null
@@ -1,296 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.filters.ContentFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Roles page in the Task editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class TaskRolesPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "taskRolesPage"; //$NON-NLS-1$
-
-	private Task task;
-
-	private IActionManager actionMgr;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public TaskRolesPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.ROLES_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		task = (Task) contentElement;
-		actionMgr = ((MethodElementEditor) getEditor()).getActionManager();
-		setCategoryIsSingleSelection1(true);
-		setUseCategory3(false);
-		setAllowChange1(true);
-		setAllowChange2(true);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				List list = new ArrayList();
-				Role role = ((Task) object).getPerformedBy();
-				if (role != null)
-					list.add(role);
-				return list.toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			// Below line is needed to disallowed primary performer as a additional performer.
-			List elementList = retrieveTableViewerContents(viewer_selected2);
-			// Below line is needed to warn before changing primary performer.
-			List elementList1 = retrieveTableViewerContents(viewer_selected);
-			boolean ok = true;
-			if(!elementList1.isEmpty()){
-				String newPrimaryPerfomer = ((Role)addItems.get(0)).getName();
-				String message = AuthoringUIResources.bind(AuthoringUIResources.taskRolesPage_primaryPerformer_modify_message, (new String[]{newPrimaryPerfomer})); //$NON-NLS-1$
-				String warning = AuthoringUIResources.taskRolesPage_confirm_title;
-				ok = AuthoringUIPlugin.getDefault().getMsgDialog()
-				.displayConfirmation(warning, message);
-			}
-			if (!elementList.contains(((Role) addItems.get(0))) && ok) {
-				actionMgr.doAction(IActionManager.SET, task,
-						UmaPackage.eINSTANCE.getTask_PerformedBy(),
-						(Role) addItems.get(0), -1);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			actionMgr.doAction(IActionManager.SET, task, UmaPackage.eINSTANCE
-					.getTask_PerformedBy(), null, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected2()
-	 */
-	protected void initContentProviderSelected2() {
-		contentProviderSelected2 = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return ((Task) object).getAdditionallyPerformedBy().toArray();
-			}
-		};
-		viewer_selected2.setContentProvider(contentProviderSelected2);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel2(ArrayList)
-	 */
-	protected void addItemsToModel2(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			List elementList = retrieveTableViewerContents(viewer_selected);
-			List addItemsFiltered = new ArrayList();
-			for (int i = 0; i < addItems.size(); i++) {
-				if (!elementList.contains(((Role) addItems.get(i)))) {
-					addItemsFiltered.add(addItems.get(i));
-				}
-			}
-			if (addItems.size() > 0) {
-				actionMgr.doAction(IActionManager.ADD_MANY, task,
-						UmaPackage.eINSTANCE.getTask_AdditionallyPerformedBy(),
-						addItemsFiltered, -1);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel2(ArrayList)
-	 */
-	protected void removeItemsFromModel2(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			actionMgr.doAction(IActionManager.REMOVE_MANY, task,
-					UmaPackage.eINSTANCE.getTask_AdditionallyPerformedBy(),
-					rmItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return task;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.ROLES;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter =	new ContentFilter (){
-			protected boolean childAccept(Object obj) {
-				if(task.getAdditionallyPerformedBy() != null){
-					List list = task.getAdditionallyPerformedBy();
-					for(Iterator it = list.iterator(); it.hasNext();){
-						Object next = it.next();
-						if(next instanceof Role){
-							if(obj == next) return false;
-							if(!checkContribution((VariabilityElement)next, obj))
-								return false;
-						}
-					}
-				}
-				return (obj instanceof Role);
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter2()
-	 */
-	protected IFilter getFilter2() {
-		return filter = new ContentFilter (){
-			protected boolean childAccept(Object obj) {
-				if(task.getPerformedBy() != null){
-					Role role = task.getPerformedBy();
-					if(obj == role) return false;
-					if(!checkContribution(role, obj))
-						return false;
-				}
-				return (obj instanceof Role);
-			}
-		};
-	}
-
-	/**
-	 * Role filter
-	 *
-	 */
-	public class RoleFilter extends ContentFilter {
-		protected boolean childAccept(Object obj) {
-			if(task.getPerformedBy() != null){
-				Role role = task.getPerformedBy();
-				if(obj == role) return false;
-				if(!checkContribution(role, obj))
-					return false;
-			}
-			return (obj instanceof Role);
-		}
-	};
-
-	/**
-	 * Check contribution
-	 * @param contributor
-	 * @param obj
-	 */
-	public boolean checkContribution(VariabilityElement contributor, Object obj){
-		if(TngUtil.isContributor(contributor) && obj instanceof Role){
-			VariabilityElement e = contributor.getVariabilityBasedOnElement();
-			if(e != null){
-				if(e.equals(obj)) return false;
-				if(TngUtil.isContributor(e))
-					return checkContribution(e, obj);
-			}
-		}
-		return true;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.taskRolesPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.taskRolesPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.taskRolesPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.taskRolesPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.taskRolesPage_selectedLabel2;
-	}
-	
-	
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskStepsPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskStepsPage.java
deleted file mode 100755
index 5e6ea2b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskStepsPage.java
+++ /dev/null
@@ -1,717 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIImages;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.dialogs.SectionsOrderDialog;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditorInput;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor.ModifyListener;
-import org.eclipse.epf.authoring.ui.providers.VariabilityElementLabelProvider;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichTextEditor;
-import org.eclipse.epf.authoring.ui.util.EditorsContextHelper;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.AddToSectionListCommand;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.command.MoveInSectionListCommand;
-import org.eclipse.epf.library.edit.command.RemoveFromSectionList;
-import org.eclipse.epf.library.edit.util.SectionList;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.richtext.RichTextListener;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.jface.fieldassist.DecoratedField;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-
-/**
- * The Steps page in the Task editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class TaskStepsPage extends BaseFormPage {
-
-	private static final String FORM_PAGE_ID = "taskStepsPage"; //$NON-NLS-1$
-
-	private Text ctrl_name;
-
-	private Button ctrl_add, ctrl_delete, ctrl_up, ctrl_down, ctrl_ordering;
-
-	private Table ctrl_steps;
-
-	private TableViewer stepsTableViewer;
-
-	private SectionList allSteps;
-
-	protected IMethodRichText activeControl;
-
-	protected boolean descExpandFlag = false;
-
-	protected IMethodRichTextEditor ctrl_expanded;
-
-	protected ImageHyperlink expandLink;
-
-	protected DecoratedField expandLabel;
-
-	protected Section formSection;
-
-	protected Section generalSection;
-
-	protected Composite sectionComposite;
-	
-	protected Composite generalComposite;
-
-	protected Composite expandedComposite;
-
-	protected IMethodRichText ctrl_maindesc;
-
-	private IStructuredContentProvider stepsViewerContentProvider;
-
-	private ILabelProvider stepsViewerLabelProvider;
-
-	private Task task;
-
-	private org.eclipse.epf.uma.Section currentStep;
-
-	private ModifyListener contentModifyListener;
-
-	private IActionManager actionMgr;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public TaskStepsPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.STEPS_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.BaseFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		MethodElementEditorInput methodElementInput = (MethodElementEditorInput) input;
-		task = (Task) methodElementInput.getMethodElement();
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.createFormContent(IManagedForm
-	 *      managedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-
-		form.setText(LibraryUIText.getUIText(task) + ": " + task.getName()); //$NON-NLS-1$
-
-		formSection = toolkit.createSection(form.getBody(), Section.NO_TITLE);
-		{
-			TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-			formSection.setLayoutData(td);
-			formSection.setLayout(new TableWrapLayout());
-		}
-		// Create the composite for the sections.
-		sectionComposite = toolkit.createComposite(formSection, SWT.NONE);
-		sectionComposite.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		sectionComposite.setLayout(new TableWrapLayout());
-		formSection.setClient(sectionComposite);
-
-		// Create the General Information section.
-		generalSection = toolkit.createSection(sectionComposite,
-				Section.TITLE_BAR | Section.DESCRIPTION | Section.TWISTIE
-						| Section.EXPANDED);
-		generalSection
-				.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		generalSection.setText(AuthoringUIText.STEPS_SECTION_NAME);
-		generalSection.setDescription(AuthoringUIText.STEPS_SECTION_DESC);
-		generalSection.setLayout(new GridLayout());
-
-		generalComposite = toolkit.createComposite(generalSection);
-		generalComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		generalComposite.setLayout(new GridLayout(4, false));
-		generalSection.setClient(generalComposite);
-
-		EditorsContextHelper.setHelp(generalComposite.getParent(), task);
-
-		Composite pane1 = toolkit.createComposite(generalComposite);
-		{
-			GridData gridData = new GridData(GridData.FILL_BOTH);
-			gridData.verticalSpan = 1;
-			gridData.horizontalSpan = 3;
-			pane1.setLayoutData(gridData);
-			pane1.setLayout(new GridLayout());
-		}
-
-		Label l_name = toolkit.createLabel(pane1, AuthoringUIText.STEPS_TEXT);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			gridData.horizontalSpan = 3;
-			l_name.setLayoutData(gridData);
-		}
-
-		ctrl_steps = toolkit.createTable(pane1, SWT.MULTI);
-		{
-			GridData gridData = new GridData(GridData.FILL_BOTH);
-			gridData.horizontalSpan = 3;
-			gridData.heightHint = 150;
-			ctrl_steps.setLayoutData(gridData);
-		}
-
-		initProviders();
-
-		stepsTableViewer = new TableViewer(ctrl_steps);
-		stepsTableViewer.setContentProvider(stepsViewerContentProvider);
-		stepsTableViewer.setLabelProvider(stepsViewerLabelProvider);
-
-		Composite pane2 = toolkit.createComposite(generalComposite);
-		pane2.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_CENTER
-				| GridData.HORIZONTAL_ALIGN_CENTER));
-		pane2.setLayout(new GridLayout());
-
-		ctrl_add = toolkit.createButton(pane2, AuthoringUIText.ADD_BUTTON_TEXT,
-				SWT.NONE);
-		ctrl_add.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		ctrl_delete = toolkit.createButton(pane2,
-				AuthoringUIText.DELETE_BUTTON_TEXT, SWT.NONE);
-		ctrl_delete.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		ctrl_delete.setEnabled(false);
-
-		ctrl_up = toolkit.createButton(pane2, AuthoringUIText.UP_BUTTON_TEXT,
-				SWT.NONE);
-		ctrl_up.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		ctrl_up.setEnabled(false);
-
-		ctrl_down = toolkit.createButton(pane2,
-				AuthoringUIText.DOWN_BUTTON_TEXT, SWT.NONE);
-		ctrl_down.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		ctrl_down.setEnabled(false);
-
-		ctrl_ordering = toolkit.createButton(pane2,
-				AuthoringUIText.ORDER_BUTTON_TEXT, SWT.NONE);
-		ctrl_ordering.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		// name
-		Label nameLabel = toolkit.createLabel(generalComposite,
-				AuthoringUIText.STEP_NAME_TEXT);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			gridData.horizontalSpan = 4;
-			nameLabel.setLayoutData(gridData);
-		}
-		ctrl_name = toolkit.createText(generalComposite, "", SWT.SINGLE); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-			gridData.horizontalSpan = 4;
-			ctrl_name.setLayoutData(gridData);
-		}
-
-		createBlankLabel(toolkit, generalComposite, 4);
-
-		ctrl_maindesc = createRichTextEditWithLink(
-				toolkit, generalComposite, AuthoringUIText.DESCRIPTION_TEXT,
-				250, 300, 4);
-
-		createRichTextEditorSection();
-
-		toolkit.paintBordersFor(pane1);
-		toolkit.paintBordersFor(pane2);
-		toolkit.paintBordersFor(generalComposite);
-		toolkit.paintBordersFor(expandedComposite);
-
-		actionMgr = ((MethodElementEditor) getEditor()).getActionManager();
-
-		addListeners();
-		loadData();
-		enableControls();
-	}
-
-	/**
-	 * Add listeners to monitor focus and modification changes in the edit
-	 * controls.
-	 */
-	public void addListeners() {
-		final MethodElementEditor editor = (MethodElementEditor) getEditor();
-		contentModifyListener = editor.createModifyListener(currentStep);
-		ctrl_name.addModifyListener(contentModifyListener);
-		((MethodElementEditor.ModifyListener) contentModifyListener)
-				.setDisable(true);
-
-		form.addListener(SWT.Activate, new Listener() {
-			public void handleEvent(Event e) {
-//				IStatus status = TngUtil.checkEdit((EObject) task, getSite()
-//						.getShell());
-//				if (status.isOK()) {
-//					loadData();
-//				}
-				loadData();
-				if (TngUtil.isLocked(contentElement)) {
-					enableControls(false);
-				} else {
-					ctrl_add.setEnabled(true);
-					checkSelection();
-				}
-			}
-		});
-
-		form.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				deactivate();
-			}
-		});
-
-		form.addControlListener(new ControlListener() {
-			public void controlResized(ControlEvent e) {
-				if (ctrl_expanded != null) {
-					((GridData) ctrl_expanded.getLayoutData()).heightHint = getRichTextEditorHeight();
-					((GridData) ctrl_expanded.getLayoutData()).widthHint = getRichTextEditorWidth();
-				}
-				formSection.layout(true, true);
-			}
-
-			public void controlMoved(ControlEvent e) {
-			}
-		});
-
-		ctrl_name.addModifyListener(contentModifyListener);
-		ctrl_name.addFocusListener(new FocusAdapter() {
-			public void focusLost(FocusEvent e) {
-				if (currentStep != null) {
-					String oldContent = currentStep.getName();
-					String newContent = ctrl_name.getText();
-					if (ctrl_name.getText() == null
-							|| ctrl_name.getText().length() == 0) {
-						String title = AuthoringUIResources.bind(AuthoringUIResources.renameDialog_title, LibraryUIText.TEXT_STEP); //$NON-NLS-1$
-						String msg = AuthoringUIResources.bind(AuthoringUIResources.emptyElementNameError_msg, StrUtil.toLower(LibraryUIText.TEXT_STEP)); //$NON-NLS-1$
-						AuthoringUIPlugin.getDefault().getMsgDialog()
-								.displayError(title, msg);
-						ctrl_name.setSelection(0, oldContent.length());
-					} else if (!newContent.equals(oldContent)) {
-						actionMgr.doAction(IActionManager.SET, currentStep,
-								UmaPackage.eINSTANCE.getNamedElement_Name(),
-								newContent, -1);
-					}
-				}
-			}
-		});
-
-		ctrl_maindesc.addModifyListener(contentModifyListener);
-		ctrl_maindesc.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				saveMainDescription();
-			}
-		});
-
-		stepsTableViewer
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-					public void selectionChanged(SelectionChangedEvent event) {
-						checkSelection();
-					}
-				});
-
-		ctrl_add.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				org.eclipse.epf.uma.Section child = UmaFactory.eINSTANCE
-						.createSection();
-				String newName = MessageFormat.format(
-						AuthoringUIText.NEW_ELEMENT_TEXT,
-						new String[] { LibraryUIText.TEXT_STEP });
-				child.setName(newName);
-				AddToSectionListCommand cmd = new AddToSectionListCommand(task,
-						child, allSteps);
-				getActionManager().execute(cmd);
-				stepsTableViewer.refresh();
-				stepsTableViewer.setSelection(new StructuredSelection(child));
-				ctrl_name.setFocus();
-				ctrl_name.setSelection(0, newName.length());
-			}
-		});
-
-		ctrl_delete.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) stepsTableViewer
-						.getSelection();
-				for (Iterator iter = selection.toList().iterator(); iter
-						.hasNext();) {
-					Object o = iter.next();
-					if (o instanceof org.eclipse.epf.uma.Section) {
-						RemoveFromSectionList cmd = new RemoveFromSectionList(
-								task, (org.eclipse.epf.uma.Section) o, allSteps);
-						getActionManager().execute(cmd);
-					}
-				}
-				stepsTableViewer.refresh();
-				editStep(null);
-			}
-		});
-
-		ctrl_up.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) stepsTableViewer
-						.getSelection();
-
-				ArrayList moveUpItems = new ArrayList();
-				moveUpItems.addAll(selection.toList());
-				MoveInSectionListCommand cmd = new MoveInSectionListCommand(
-						task, moveUpItems, allSteps, 1);
-				getActionManager().execute(cmd);
-
-				stepsTableViewer.refresh();
-
-				if (stepsTableViewer.getTable().getSelectionIndex() > 0
-						&& !TngUtil.isLocked(task)) {
-					ctrl_up.setEnabled(true);
-				} else {
-					ctrl_up.setEnabled(false);
-				}
-				if (stepsTableViewer.getTable().getSelectionIndex() < stepsTableViewer
-						.getTable().getItemCount() - 1
-						&& !TngUtil.isLocked(task)) {
-					ctrl_down.setEnabled(true);
-				} else {
-					ctrl_down.setEnabled(false);
-				}
-			}
-		});
-
-		ctrl_down.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) stepsTableViewer
-						.getSelection();
-				ArrayList moveDownItems = new ArrayList();
-				moveDownItems.addAll(selection.toList());
-				MoveInSectionListCommand cmd = new MoveInSectionListCommand(
-						task, moveDownItems, allSteps, 0);
-				getActionManager().execute(cmd);
-
-				stepsTableViewer.refresh();
-
-				if (stepsTableViewer.getTable().getSelectionIndex() > 0
-						&& !TngUtil.isLocked(task)) {
-					ctrl_up.setEnabled(true);
-				} else {
-					ctrl_up.setEnabled(false);
-				}
-				if (stepsTableViewer.getTable().getSelectionIndex() < stepsTableViewer
-						.getTable().getItemCount() - 1
-						&& !TngUtil.isLocked(task)) {
-					ctrl_down.setEnabled(true);
-				} else {
-					ctrl_down.setEnabled(false);
-				}
-			}
-		});
-
-		ctrl_ordering.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				SectionsOrderDialog dlg = new SectionsOrderDialog(
-						Display.getCurrent().getActiveShell(),
-						task,
-						getActionManager(),
-						AuthoringUIResources.StepsOrderDialog_title, //$NON-NLS-1$
-						AuthoringUIResources.StepsOrderDialog_description, //$NON-NLS-1$
-						AuthoringUIResources.steps_text); //$NON-NLS-1$
-				dlg.open();
-			}
-		});
-	}
-
-	protected void enableControls(boolean editable) {
-		ctrl_name.setEditable(editable);
-		ctrl_maindesc.setEditable(editable);
-		ctrl_add.setEnabled(editable);
-		ctrl_delete.setEnabled(editable);
-		ctrl_up.setEnabled(editable);
-		ctrl_down.setEnabled(editable);
-		ctrl_ordering.setEnabled(true);
-		if (ctrl_expanded != null) {
-			ctrl_expanded.setEditable(editable);
-		}
-	}
-
-	protected void deactivate() {
-		// Save the step order.
-		if (allSteps != null) {
-			allSteps.apply();
-		}
-	}
-
-	/**
-	 * Initializes the controls with data from the model.
-	 */
-	private void loadData() {
-		allSteps = null;
-		stepsTableViewer.setInput(task);
-		stepsTableViewer.refresh();
-		editStep(currentStep);
-	}
-
-	/**
-	 * Edit current step.
-	 */
-	private void editStep(org.eclipse.epf.uma.Section step) {
-		((MethodElementEditor.ModifyListener) contentModifyListener)
-				.setDisable(true);
-
-		if (ctrl_maindesc.getModified()) {
-			saveMainDescription();
-		}
-
-		currentStep = step;
-		String name = ""; //$NON-NLS-1$
-		String desc = ""; //$NON-NLS-1$
-		if (currentStep != null) {
-			name = currentStep.getName();
-			desc = currentStep.getSectionDescription();
-			ctrl_name.setFocus();
-		}
-		ctrl_name.setText(name == null ? "" : name); //$NON-NLS-1$
-		ctrl_maindesc.setText(desc == null ? "" : desc); //$NON-NLS-1$
-		ctrl_maindesc.setModalObject(currentStep);
-		ctrl_maindesc.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getSection_SectionDescription());
-		if (step == null) {
-			// close any Find/Replace dialog open in the RTE
-			ctrl_maindesc.getFindReplaceAction().dispose();
-		}
-
-		((MethodElementEditor.ModifyListener) contentModifyListener)
-				.setElement(currentStep);
-		((MethodElementEditor.ModifyListener) contentModifyListener)
-				.setDisable(currentStep == null);
-
-		enableControls();
-	}
-
-	/**
-	 * Enable name and description controls
-	 */
-	private void enableControls() {
-		if (task.getPresentation().getSections().contains(currentStep)) {
-			if (!TngUtil.isLocked(contentElement)) {
-				ctrl_name.setEditable(true);
-				ctrl_maindesc.setEditable(true);
-			}
-		} else {
-			ctrl_name.setEditable(false);
-			ctrl_maindesc.setEditable(false);
-		}
-	}
-
-	/**
-	 * Dispose listener
-	 * 
-	 * @see org.eclipse.ui.forms.editor.FormPage#dispose()
-	 */
-	public void dispose() {
-	}
-
-	private void createRichTextEditorSection() {
-		expandedComposite = toolkit.createComposite(formSection, SWT.NONE);
-		expandedComposite.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		expandedComposite.setLayout(new GridLayout(2, false));
-		expandedComposite.setVisible(false);
-
-
-		// Hyperlink desc
-		expandLink = toolkit.createImageHyperlink(expandedComposite, SWT.NONE);
-		expandLink.setImage(AuthoringUIImages.IMG_EXPANDED);
-		expandLink.setToolTipText(AuthoringUIResources.closeRTE); //$NON-NLS-1$
-		expandLink.setUnderlined(false);
-		expandLink.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				toggle(e);
-			}
-		});
-
-		expandLabel = createDecoratedLabel(toolkit, expandedComposite, ""); //$NON-NLS-1$
-	}
-
-	/**
-	 * Toggle Description control to expand and control state.
-	 */
-	protected void toggle(HyperlinkEvent e) {
-		if (currentStep == null)
-			return;
-		if (ctrl_expanded == null) {
-			ctrl_expanded = createRichTextEditor(toolkit, expandedComposite,
-					SWT.MULTI | SWT.WRAP | SWT.V_SCROLL, GridData.FILL_BOTH,
-					getRichTextEditorHeight(), getRichTextEditorWidth(), 2, expandLabel);
-			ctrl_expanded.addModifyListener(contentModifyListener);
-		}
-
-		if (descExpandFlag) {
-			sectionComposite.setVisible(true);
-			expandedComposite.setVisible(false);
-			formSection.setClient(sectionComposite);
-			IMethodRichText richText = activeControl;
-			richText.setText(ctrl_expanded.getText());
-			for (Iterator i = richText.getListeners(); i.hasNext();) {
-				RichTextListener listener = (RichTextListener) i.next();
-				ctrl_expanded.removeListener(listener.getEventType(), listener
-						.getListener());
-			}
-			if (ctrl_expanded.getModified()) {
-				((MethodElementEditor) getEditor())
-						.saveModifiedRichText(ctrl_expanded);
-			}
-			richText.setFocus();
-		} else {
-			sectionComposite.setVisible(false);
-			expandedComposite.setVisible(true);
-			formSection.setClient(expandedComposite);
-			((Label)expandLabel.getControl()).setText(currentStep.getName() +
-					" - " + (String) ((ImageHyperlink) e.getSource()).getData("Title")); //$NON-NLS-1$ //$NON-NLS-2$
-			IMethodRichText richText = (IMethodRichText) e.getHref();
-			ctrl_expanded.setText(richText.getText());
-			ctrl_expanded.setModalObject(richText.getModalObject());
-			ctrl_expanded.setModalObjectFeature(richText
-					.getModalObjectFeature());
-			ctrl_expanded.setFindReplaceAction(richText.getFindReplaceAction());
-			for (Iterator i = richText.getListeners(); i.hasNext();) {
-				RichTextListener listener = (RichTextListener) i.next();
-				ctrl_expanded.addListener(listener.getEventType(), listener
-						.getListener());
-			}
-			boolean editable = !TngUtil.isLocked(contentElement);
-			ctrl_expanded.setEditable(editable);
-			if (editable) {
-				ctrl_expanded.setFocus();
-			}
-			activeControl = richText;
-		}
-
-		form.getBody().layout(true, true);
-		descExpandFlag = !descExpandFlag;
-	}
-
-	private void initProviders() {
-		stepsViewerContentProvider = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				if (allSteps == null) {
-					allSteps = new SectionList(task,
-							SectionList.STEPS_FOR_ELEMENT_ONLY);
-				}
-				return allSteps.toArray();
-			}
-		};
-
-		stepsViewerLabelProvider = new VariabilityElementLabelProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public boolean isExternal(Object element) {
-				return !task.getPresentation().getSections().contains(element);
-			}
-		};
-	}
-
-	private void saveMainDescription() {
-		if (currentStep != null) {
-			IMethodRichText control = descExpandFlag ? ctrl_expanded
-					: ctrl_maindesc;
-			if (!control.getModified()) {
-				return;
-			}
-			String oldContent = currentStep.getSectionDescription();
-			if (((MethodElementEditor) getEditor()).mustRestoreValue(control,
-					oldContent)) {
-				return;
-			}
-			String newContent = control.getText();
-			if (!newContent.equals(oldContent)) {
-				actionMgr.doAction(IActionManager.SET, currentStep,
-						UmaPackage.eINSTANCE.getSection_SectionDescription(),
-						newContent, -1);
-			}
-		}
-	}
-
-	protected IActionManager getActionManager() {
-		FormEditor editor = getEditor();
-		if (editor instanceof MethodElementEditor) {
-			return ((MethodElementEditor) editor).getActionManager();
-		}
-		return null;
-	}
-
-	private void checkSelection() {
-		IStructuredSelection selection = (IStructuredSelection) stepsTableViewer
-				.getSelection();
-		if (selection.size() > 0 && !TngUtil.isLocked(task)) {
-			ctrl_delete.setEnabled(true);
-
-			if (stepsTableViewer.getTable().getSelectionIndex() > 0
-					&& !TngUtil.isLocked(task) && selection.size() == 1) {
-				ctrl_up.setEnabled(true);
-			} else {
-				ctrl_up.setEnabled(false);
-			}
-
-			if (stepsTableViewer.getTable().getSelectionIndex() < stepsTableViewer
-					.getTable().getItemCount() - 1
-					&& !TngUtil.isLocked(task) && selection.size() == 1) {
-				ctrl_down.setEnabled(true);
-			} else {
-				ctrl_down.setEnabled(false);
-			}
-		}
-		if (selection.size() == 1) {
-			editStep((org.eclipse.epf.uma.Section) selection.getFirstElement());
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskWorkProductsPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskWorkProductsPage.java
deleted file mode 100755
index 99ed5c4..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/TaskWorkProductsPage.java
+++ /dev/null
@@ -1,266 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.filters.WorkProductFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Work Products page in the Task editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class TaskWorkProductsPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "taskWorkProductsPage"; //$NON-NLS-1$	
-
-	private Task task;
-
-	private IActionManager actionMgr;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public TaskWorkProductsPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.WORK_PRODUCTS_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		task = (Task) contentElement;
-		actionMgr = ((MethodElementEditor) getEditor()).getActionManager();
-		setAllowChange1(true);
-		setAllowChange2(true);
-		setAllowChange3(true);
-	}
-
-	/**
-	 * @see org.eclipse.ui.forms.editor.createFormContent(IManagedForm)
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return ((Task) object).getMandatoryInput().toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			List elementList = retrieveTableViewerContents(viewer_selected2);
-			List addItemsFiltered = new ArrayList();
-			for (int i = 0; i < addItems.size(); i++) {
-				if (!elementList.contains(((WorkProduct) addItems.get(i)))) {
-					addItemsFiltered.add(addItems.get(i));
-				}
-			}
-			if (addItems.size() > 0) {
-				actionMgr.doAction(IActionManager.ADD_MANY, task,
-						UmaPackage.eINSTANCE.getTask_MandatoryInput(),
-						addItemsFiltered, -1);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			actionMgr.doAction(IActionManager.REMOVE_MANY, task,
-					UmaPackage.eINSTANCE.getTask_MandatoryInput(), rmItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected2()
-	 */
-	protected void initContentProviderSelected2() {
-		contentProviderSelected2 = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return ((Task) object).getOptionalInput().toArray();
-			}
-		};
-		viewer_selected2.setContentProvider(contentProviderSelected2);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel2(ArrayList)
-	 */
-	protected void addItemsToModel2(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			List elementList = retrieveTableViewerContents(viewer_selected);
-			List addItemsFiltered = new ArrayList();
-			for (int i = 0; i < addItems.size(); i++) {
-				if (!elementList.contains(((WorkProduct) addItems.get(i)))) {
-					addItemsFiltered.add(addItems.get(i));
-				}
-			}
-			if (addItems.size() > 0) {
-				actionMgr.doAction(IActionManager.ADD_MANY, task,
-						UmaPackage.eINSTANCE.getTask_OptionalInput(),
-						addItemsFiltered, -1);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel2(ArrayList)
-	 */
-	protected void removeItemsFromModel2(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			actionMgr.doAction(IActionManager.REMOVE_MANY, task,
-					UmaPackage.eINSTANCE.getTask_OptionalInput(), rmItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected3()
-	 */
-	protected void initContentProviderSelected3() {
-		contentProviderSelected3 = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return ((Task) object).getOutput().toArray();
-			}
-		};
-		viewer_selected3.setContentProvider(contentProviderSelected3);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel2(ArrayList)
-	 */
-	protected void addItemsToModel3(ArrayList addItems) {
-		actionMgr.doAction(IActionManager.ADD_MANY, task, UmaPackage.eINSTANCE
-				.getTask_Output(), addItems, -1);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel2(ArrayList)
-	 */
-	protected void removeItemsFromModel3(ArrayList rmItems) {
-		actionMgr.doAction(IActionManager.REMOVE_MANY, task,
-				UmaPackage.eINSTANCE.getTask_Output(), rmItems, -1);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return task;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.WORKPRODUCTS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new WorkProductFilter();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter2()
-	 */
-	protected IFilter getFilter2() {
-		return filter = new WorkProductFilter();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter3()
-	 */
-	protected IFilter getFilter3() {
-		return filter = new WorkProductFilter();
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.taskWorkProductsPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.taskWorkProductsPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.taskWorkProductsPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.taskWorkProductsPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.taskWorkProductsPage_selectedLabel2;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel3()
-	 */
-	protected String getSelectedLabel3() {
-		return AuthoringUIResources.taskWorkProductsPage_selectedLabel3;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ToolDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ToolDescriptionPage.java
deleted file mode 100755
index b88db07..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ToolDescriptionPage.java
+++ /dev/null
@@ -1,93 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.CategoryFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.VariabilityBaseElementFilter;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Description page for the Domain editor.
- * 
- * @author Kelvin Low
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class ToolDescriptionPage extends DescriptionFormPage {
-
-	private static final String FORM_PAGE_ID = "toolDescriptionPage"; //$NON-NLS-1$	
-
-	private Tool tool;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ToolDescriptionPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.DESCRIPTION_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		tool = (Tool) contentElement;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return tool;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		filter = new CategoryFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof Tool);
-			}
-		};
-
-		// set additional filter for variability base element checking
-		((CategoryFilter) filter)
-				.setAdditionalFilters(new IFilter[] { new VariabilityBaseElementFilter(
-						tool) });
-		return filter;
-
-	}
-
-	protected String getTabString() {
-		return FilterConstants.TOOLS;
-	}
-	
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadSectionDescription()
-	 */
-	public void loadSectionDescription() {
-		this.generalSectionDescription = AuthoringUIResources.tool_generalInfoSection_desc;
-		this.detailSectionDescription = AuthoringUIResources.tool_detailSection_desc;
-		this.variabilitySectionDescription = AuthoringUIResources.tool_variabilitySection_desc;
-		this.versionSectionDescription = AuthoringUIResources.tool_versionInfoSection_desc;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ToolToolMentorsPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ToolToolMentorsPage.java
deleted file mode 100755
index dc7d30e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/ToolToolMentorsPage.java
+++ /dev/null
@@ -1,167 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.filters.GuidanceFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Tool Mentors page in the Tool editor.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- */
-public class ToolToolMentorsPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "toolToolMentorsPage"; //$NON-NLS-1$
-
-	private Tool tool;
-
-	private IActionManager actionMgr;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ToolToolMentorsPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.TOOL_MENTORS_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		tool = (Tool) contentElement;
-		actionMgr = ((MethodElementEditor) getEditor()).getActionManager();
-		setUseCategory2(false);
-		setUseCategory3(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return tool.getToolMentors().toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			// check if this operation will modify the element in opposite
-			// feature value
-			//
-			for (Iterator iter = addItems.iterator(); iter.hasNext();) {
-				MethodElement element = (MethodElement) iter.next();
-				if (!UserInteractionHelper.checkModifyOpposite(tool,
-						UmaPackage.eINSTANCE.getTool_ToolMentors(), element)) {
-					return;
-				}
-			}
-			actionMgr.doAction(IActionManager.ADD_MANY, tool,
-					UmaPackage.eINSTANCE.getTool_ToolMentors(), addItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			actionMgr.doAction(IActionManager.REMOVE_MANY, tool,
-					UmaPackage.eINSTANCE.getTool_ToolMentors(), rmItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return tool;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.TOOL_MENTORS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new GuidanceFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof ToolMentor);
-			}
-		};
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.toolToolMentorsPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.toolToolMentorsPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.toolToolMentorsPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.toolToolMentorsPage_selectedLabel;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductCategoriesPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductCategoriesPage.java
deleted file mode 100755
index 3c1bb62..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductCategoriesPage.java
+++ /dev/null
@@ -1,328 +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.authoring.ui.forms;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.CategoryFilter;
-import org.eclipse.epf.authoring.ui.filters.CustomCategoryFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.LibraryEditResources;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.util.Messenger;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.util.LibraryManager;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductType;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Categories page in the Work Product editor.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @since 1.0
- */
-public class WorkProductCategoriesPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "workProductCategoriesPage"; //$NON-NLS-1$
-
-	private WorkProduct workProduct;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public WorkProductCategoriesPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.CATEGORIES_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		workProduct = (WorkProduct) contentElement;
-		setUseCategory3(true);
-		setCategoryIsSingleSelection1(true);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return AssociationHelper.getDomains((WorkProduct) object).toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			Object domain = addItems.get(0);
-			List domains = AssociationHelper.getDomains(workProduct);
-			if (domains != null && domains.size() > 0)	{
-				Object associatedDomain = domains.get(0);
-				String msg = MessageFormat
-				.format(
-						LibraryEditResources.UserInteractionHelper_errRelationshipExists,
-						new Object[] {
-								workProduct.getName(),
-								TngUtil
-										.getLabelWithPath(associatedDomain),
-								((Domain) domain).getName() });
-				Messenger.INSTANCE.showWarning(
-						LibraryEditResources.errorDialog_title, msg);
-				return;
-			}
-			
-			LibraryManager.getInstance().addToDomain(getActionManager(),
-					(Domain) domain, workProduct);
-			// Standard Categories: contributing standard
-			// category is not deleted when it is empty
-			if (usedCategories.contains(domain)) {
-				usedCategories.remove(domain);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				Domain domain = (Domain) it.next();
-				LibraryManager.getInstance().removeFromDomain(
-						getActionManager(), domain, workProduct);
-				// Standard Categories: contributing standard
-				// category is not deleted when it is empty
-				if (!usedCategories.contains(domain)) {
-					usedCategories.add(domain);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected2()
-	 */
-	protected void initContentProviderSelected2() {
-		contentProviderSelected2 = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return AssociationHelper.getWorkProductTypes(
-						(WorkProduct) object).toArray();
-			}
-		};
-		viewer_selected2.setContentProvider(contentProviderSelected2);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel2()
-	 */
-	protected void addItemsToModel2(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			for (java.util.Iterator it = addItems.iterator(); it.hasNext();) {
-				WorkProductType wpType = (WorkProductType) it.next();
-				LibraryManager.getInstance().addToWorkProductType(
-						getActionManager(), wpType, workProduct);
-				// Standard Categories: contributing standard
-				// category is not deleted when it is empty
-				if (usedCategories.contains(wpType)) {
-					usedCategories.remove(wpType);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel2()
-	 */
-	protected void removeItemsFromModel2(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				WorkProductType wpType = (WorkProductType) it.next();
-				LibraryManager.getInstance().removeFromWorkProductType(
-						getActionManager(), wpType, workProduct);
-				if (!usedCategories.contains(wpType)) {
-					usedCategories.add(wpType);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected3()
-	 */
-	protected void initContentProviderSelected3() {
-		contentProviderSelected3 = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return AssociationHelper.getCustomCategories(
-						(WorkProduct) object).toArray();
-			}
-		};
-		viewer_selected3.setContentProvider(contentProviderSelected3);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel3(ArrayList)
-	 */
-	protected void addItemsToModel3(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			for (java.util.Iterator it = addItems.iterator(); it.hasNext();) {
-				CustomCategory customCategory = (CustomCategory) it.next();
-				LibraryManager.getInstance().addToCustomCategory(
-						getActionManager(), customCategory, workProduct);
-				if (usedCategories.contains(customCategory)) {
-					usedCategories.remove(customCategory);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel3(ArrayList)
-	 */
-	protected void removeItemsFromModel3(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (java.util.Iterator it = rmItems.iterator(); it.hasNext();) {
-				CustomCategory customCategory = (CustomCategory) it.next();
-				LibraryManager.getInstance().removeFromCustomCategory(
-						getActionManager(), customCategory, workProduct);
-				if (!usedCategories.contains(customCategory)) {
-					usedCategories.add(customCategory);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return workProduct;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.DOMAINS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString2()
-	 */
-	protected String getTabString2() {
-		return FilterConstants.WORKPRODUCTTYPES;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString3()
-	 */
-	protected String getTabString3() {
-		return FilterConstants.CUSTOM_CATEGORIES;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new CategoryFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof Domain);
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter2()
-	 */
-	protected IFilter getFilter2() {
-		return filter2 = new CategoryFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof WorkProductType);
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter3()
-	 */
-	protected IFilter getFilter3() {
-		return filter3 = new CustomCategoryFilter();
-	}
-	
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.workProductCategoriesPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.workProductCategoriesPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.workProductCategoriesPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.workProductCategoriesPage_selectedLabel2;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel3()
-	 */
-	protected String getSelectedLabel3() {
-		return AuthoringUIResources.workProductCategoriesPage_selectedLabel3;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductDeliverablePartsPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductDeliverablePartsPage.java
deleted file mode 100755
index 78eed6d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductDeliverablePartsPage.java
+++ /dev/null
@@ -1,336 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.filters.WorkProductFilter;
-import org.eclipse.epf.authoring.ui.util.UIHelper;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Deliverable;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Deliverable Parts page in the Work Product editor.
- * 
- * @author Shashidhar Kannoori
- * @author Kelvin Low
- * @since 1.0
- */
-public class WorkProductDeliverablePartsPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "workProductDeliverablePartsPage"; //$NON-NLS-1$
-
-	private WorkProduct workProduct;
-
-	private IActionManager actionMgr;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public WorkProductDeliverablePartsPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID,
-				AuthoringUIText.DELIVERABLE_PARTS_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		workProduct = (WorkProduct) contentElement;
-		actionMgr = ((MethodElementEditor) getEditor()).getActionManager();
-		setUseCategory2(false);
-		setUseCategory3(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				Deliverable wp = (Deliverable) workProduct;
-				return wp.getDeliveredWorkProducts().toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			for (Iterator it = addItems.iterator(); it.hasNext();) {
-				WorkProduct item = (WorkProduct) it.next();
-				actionMgr.doAction(IActionManager.ADD, workProduct,
-						UmaPackage.eINSTANCE
-								.getDeliverable_DeliveredWorkProducts(), item,
-						-1);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				WorkProduct item = (WorkProduct) it.next();
-				actionMgr.doAction(IActionManager.REMOVE, workProduct,
-						UmaPackage.eINSTANCE
-								.getDeliverable_DeliveredWorkProducts(), item,
-						-1);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return workProduct;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.WORKPRODUCTS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		filter = new WorkProductFilter() {
-			/*
-			 * ArrayList(badlist) is used to store all
-			 * generalizer/basevariability for subparts of
-			 * generalizer/basevariability can be rejected. Deliverable cannot
-			 * hold information to who itself is acting as deliverable part.
-			 */
-			List badlist = new ArrayList();
-
-			protected boolean childAccept(Object obj) {
-				// TODO Auto-generated method stub
-				if (obj instanceof WorkProduct) {
-					/* 
-					 * Check Deliverable and DeliverableParts association
-					 * circular dependency.
-					*/
-					if (obj instanceof Deliverable
-							&& workProduct instanceof Deliverable) {
-						/*
-						 * Check passed object's chained deliverable parts
-						 * (tree) contain workProduct (editor object).
-						 */
-						if (!UIHelper.checkCircularDeliverables(
-								(Deliverable) obj, (Deliverable) workProduct)) {
-							badlist.add(obj);
-							return false;
-						}
-						if (!checkVariability((Deliverable) obj, badlist)) {
-							badlist.add(obj);
-							return false;
-						}
-						// browse through badlist and its deliverable parts.
-						List templist = new ArrayList();
-						for (Iterator iterator = badlist.iterator(); iterator
-								.hasNext();) {
-							Object bad = iterator.next();
-							UIHelper.deliverablePartsChain((Deliverable) bad, templist);
-						}
-						if (templist.contains(obj))
-							return false;
-					}
-					/*
-					 * return true if above condition are successful
-					 */
-					return true;
-				}
-				return false;
-			}
-		};
-		return filter;
-	}
-
-	public boolean checkVariability(Deliverable e, List badlist) {
-
-		/*
-		 * Check editor object's variability base object is child in
-		 * Deliverable(e) tree. then Deliverable(e)shouldnot be accepted. D1 ->
-		 * D2 -> D3 ( -> indicates deliverable part relationship) D6 contributes
-		 * D3. D6 cannot select D1,D2 as deliverable part.
-		 */
-		if (workProduct.getVariabilityBasedOnElement() != null) {
-			Object obj = workProduct.getVariabilityBasedOnElement();
-			if (!UIHelper.checkCircularDeliverables(e, (Deliverable) obj))
-				return false;
-		}
-
-		/*
-		 * Check editor Deliverable's generalizer, if generalizer's subparts
-		 * (tree) contains passed deliverable. Return false.
-		 */
-
-		Iterator it = TngUtil.getGeneralizers(workProduct);
-		while (it.hasNext()) {
-			VariabilityElement ve = (VariabilityElement) it.next();
-			if (ve != null) {
-				/*
-				 * generalizer is added to badlist, because if variability base
-				 * is filtered before coming to childAccept(object) method, this
-				 * will prevents any subparts of generalizer to be added as a
-				 * deliverable part of Deliverable (Editor object or local
-				 * defined variable"workProduct").
-				 * 
-				 * eg: D1 -> D2 -> D3. (-> indicates deliverable part). D1
-				 * contributes D5. and D5's deliverable parts assign filter
-				 * shouldnot show D2 and D3.
-				 * 
-				 */
-				badlist.add(ve);
-				if (ve.equals(e))
-					return false;
-				if (!UIHelper.checkCircularDeliverables(e, (Deliverable) ve))
-					return false;
-			}
-
-		}
-		/*
-		 * 
-		 */
-		if (e.getVariabilityBasedOnElement() != null) {
-			Object obj = e.getVariabilityBasedOnElement();
-			if (!UIHelper.checkCircularDeliverables((Deliverable) obj,
-					(Deliverable) workProduct))
-				return false;
-		}
-		/*
-		 * Check passed object's generalizer's deliverable parts list donot have
-		 * workProduct.
-		 */
-		Iterator it1 = TngUtil.getGeneralizers(e);
-		while (it1.hasNext()) {
-			VariabilityElement ve = (VariabilityElement) it1.next();
-			if (ve != null) {
-				if (ve.equals(e))
-					return false;
-				if (!UIHelper.checkCircularDeliverables((Deliverable) ve,
-						(Deliverable) workProduct))
-					return false;
-			}
-
-		}
-
-		/*
-		 * Check workProduct object (editor object)'s variability and its
-		 * deliverables should not contain passed object.
-		 */
-		List list = new ArrayList();
-		deliverablePartsVariability((Deliverable) workProduct, list);
-		if (list.contains(e))
-			return false;
-
-		/*
-		 * Check passed object variability and its deliverables should not
-		 * contain workproduct(deliverable or editor object). If it contains,
-		 * passed object shouldnot be accepted.
-		 */
-		deliverablePartsVariability((Deliverable) e, list);
-		if (list.contains(workProduct))
-			return false;
-		return true;
-	}
-
-	private void deliverablePartsVariability(Deliverable e, List roots) {
-		List list = ((Deliverable) e).getDeliveredWorkProducts();
-		if (list != null && list.size() > 0) {
-			for (Iterator iterator = list.iterator(); iterator.hasNext();) {
-				Object obj = iterator.next();
-				if (obj instanceof Deliverable) {
-					if (((Deliverable) obj).getVariabilityBasedOnElement() != null) {
-						roots.add(((Deliverable) obj)
-								.getVariabilityBasedOnElement());
-					} else {
-						Iterator it1 = TngUtil.getGeneralizers(e);
-						while (it1.hasNext()) {
-							VariabilityElement ve = (VariabilityElement) it1
-									.next();
-							UIHelper.deliverablePartsChain((Deliverable) ve, roots);
-						}
-					}
-					deliverablePartsVariability((Deliverable) obj, roots);
-				}
-			}
-		}
-		if (e instanceof Deliverable) {
-			Iterator it1 = TngUtil.getGeneralizers(e);
-			while (it1.hasNext()) {
-				VariabilityElement ve = (VariabilityElement) it1.next();
-				UIHelper.deliverablePartsChain((Deliverable) ve, roots);
-			}
-		}
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.workProductDeliverablePartsPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.workProductDeliverablePartsPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.workProductDeliverablePartsPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.workProductDeliverablePartsPage_selectedLabel;
-	}
-	
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductDescriptionPage.java
deleted file mode 100755
index 56d0931..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductDescriptionPage.java
+++ /dev/null
@@ -1,596 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.filters.ContentFilter;
-import org.eclipse.epf.authoring.ui.filters.WorkProductFilter;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.util.UIHelper;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.VariabilityBaseElementFilter;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Artifact;
-import org.eclipse.epf.uma.ArtifactDescription;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.Deliverable;
-import org.eclipse.epf.uma.DeliverableDescription;
-import org.eclipse.epf.uma.Outcome;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Description page in a Work Product (Artifact, Deliverable and Outcome)
- * editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class WorkProductDescriptionPage extends DescriptionFormPage {
-
-	private static final String FORM_PAGE_ID = "workProductDescriptionPage"; //$NON-NLS-1$	
-
-	private IMethodRichText ctrl_impact;
-
-	private IMethodRichText ctrl_reason;
-
-	// For Artifact
-	private IMethodRichText ctrl_brief_outline;
-
-	private IMethodRichText ctrl_representation_options;
-
-	// For Deliverable
-	private IMethodRichText ctrl_external_desc, ctrl_packaging_guidance;
-
-	private WorkProduct workProduct;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public WorkProductDescriptionPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.DESCRIPTION_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		workProduct = (WorkProduct) contentElement;
-		purposeOn = true;
-		externalIdOn = true;
-		if (!(contentElement instanceof Outcome)) {
-			notationSectionOn = true;
-		}
-		tailoringSectionOn = true;
-		iconSectionOn = true;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#createNotationSectionContent()
-	 */
-	protected void createNotationSectionContent() {
-		super.createNotationSectionContent();
-		if (workProduct instanceof Artifact) {
-			ctrl_brief_outline = createRichTextEditWithLinkForSection(toolkit,
-					notationComposite, AuthoringUIText.BRIEF_OUTLINE_TEXT, 40,
-					400, NOTATION_SECTION_ID);
-			ctrl_representation_options = createRichTextEditWithLinkForSection(
-					toolkit, notationComposite,
-					AuthoringUIText.REPRESENTATION_OPTIONS_TEXT, 40, 400,
-					NOTATION_SECTION_ID);
-		} else if (workProduct instanceof Deliverable) {
-			ctrl_external_desc = createRichTextEditWithLinkForSection(toolkit,
-					notationComposite,
-					AuthoringUIText.EXTERNAL_DESCRIPTION_TEXT, 40, 400,
-					NOTATION_SECTION_ID);
-			ctrl_packaging_guidance = createRichTextEditWithLinkForSection(
-					toolkit, notationComposite,
-					AuthoringUIText.PACKAGING_GUIDANCE_TEXT, 40, 400,
-					NOTATION_SECTION_ID);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#createTailoringSectionContent()
-	 */
-	protected void createTailoringSectionContent() {
-		super.createTailoringSectionContent();
-		ctrl_impact = createRichTextEditWithLinkForSection(toolkit,
-				tailoringComposite, AuthoringUIText.IMPACT_OF_NOT_HAVING_TEXT,
-				40, 400, TAILORING_SECTION_ID);
-		ctrl_reason = createRichTextEditWithLinkForSection(toolkit,
-				tailoringComposite,
-				AuthoringUIText.REASON_FOR_NOT_NEEDING_TEXT, 40, 400,
-				TAILORING_SECTION_ID);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#addListeners()
-	 */
-	protected void addListeners() {
-		final IActionManager actionMgr = ((MethodElementEditor) getEditor())
-				.getActionManager();
-
-		super.addListeners();
-
-		ctrl_purpose.setModalObject(contentElement.getPresentation());
-		ctrl_purpose.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getWorkProductDescription_Purpose());
-		ctrl_purpose.addModifyListener(contentModifyListener);
-		ctrl_purpose.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_purpose;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = ((org.eclipse.epf.uma.WorkProductDescription) workProduct
-						.getPresentation()).getPurpose();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = actionMgr.doAction(IActionManager.SET,
-							contentElement.getPresentation(),
-							UmaPackage.eINSTANCE
-									.getWorkProductDescription_Purpose(),
-							newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-
-		ctrl_external_id.addModifyListener(contentModifyListener);
-		ctrl_external_id.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getWorkProductDescription_ExternalId());
-			}
-
-			public void focusLost(FocusEvent e) {
-				String oldContent = ((org.eclipse.epf.uma.WorkProductDescription) workProduct
-						.getPresentation()).getExternalId();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						ctrl_external_id, oldContent)) {
-					return;
-				}
-				String newContent = ctrl_external_id.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = actionMgr.doAction(IActionManager.SET,
-							contentElement.getPresentation(),
-							UmaPackage.eINSTANCE
-									.getWorkProductDescription_ExternalId(),
-							newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-
-		ctrl_impact.setModalObject(contentElement.getPresentation());
-		ctrl_impact.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getWorkProductDescription_ImpactOfNotHaving());
-		ctrl_impact.addModifyListener(contentModifyListener);
-		ctrl_impact.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_impact;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = ((org.eclipse.epf.uma.WorkProductDescription) workProduct
-						.getPresentation()).getImpactOfNotHaving();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = actionMgr
-							.doAction(
-									IActionManager.SET,
-									contentElement.getPresentation(),
-									UmaPackage.eINSTANCE
-											.getWorkProductDescription_ImpactOfNotHaving(),
-									newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-
-		ctrl_reason.setModalObject(contentElement.getPresentation());
-		ctrl_reason.setModalObjectFeature(UmaPackage.eINSTANCE
-				.getWorkProductDescription_ReasonsForNotNeeding());
-		ctrl_reason.addModifyListener(contentModifyListener);
-		ctrl_reason.addListener(SWT.Deactivate, new Listener() {
-			public void handleEvent(Event e) {
-				IMethodRichText control = descExpandFlag ? ctrl_expanded
-						: ctrl_reason;
-				if (!control.getModified()) {
-					return;
-				}
-				String oldContent = ((org.eclipse.epf.uma.WorkProductDescription) workProduct
-						.getPresentation()).getReasonsForNotNeeding();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						control, oldContent)) {
-					return;
-				}
-				String newContent = control.getText();
-				if (!newContent.equals(oldContent)) {
-					boolean success = actionMgr
-							.doAction(
-									IActionManager.SET,
-									contentElement.getPresentation(),
-									UmaPackage.eINSTANCE
-											.getWorkProductDescription_ReasonsForNotNeeding(),
-									newContent, -1);
-					if (success && isVersionSectionOn()) {
-						updateChangeDate();
-					}
-				}
-			}
-		});
-
-		if (workProduct instanceof Artifact) {
-			ctrl_brief_outline.setModalObject(contentElement.getPresentation());
-			ctrl_brief_outline.setModalObjectFeature(UmaPackage.eINSTANCE
-					.getArtifactDescription_BriefOutline());
-			ctrl_brief_outline.addModifyListener(contentModifyListener);
-			ctrl_brief_outline.addListener(SWT.Deactivate, new Listener() {
-				public void handleEvent(Event e) {
-					IMethodRichText control = descExpandFlag ? ctrl_expanded
-							: ctrl_brief_outline;
-					if (!control.getModified()) {
-						return;
-					}
-					String oldContent = ((org.eclipse.epf.uma.ArtifactDescription) workProduct
-							.getPresentation()).getBriefOutline();
-					if (((MethodElementEditor) getEditor()).mustRestoreValue(
-							control, oldContent)) {
-						return;
-					}
-					String newContent = descExpandFlag ? ctrl_expanded
-							.getText() : ctrl_brief_outline.getText();
-					if (!newContent.equals(oldContent)) {
-						boolean success = actionMgr.doAction(
-								IActionManager.SET, contentElement
-										.getPresentation(),
-								UmaPackage.eINSTANCE
-										.getArtifactDescription_BriefOutline(),
-								newContent, -1);
-						if (success && isVersionSectionOn()) {
-							updateChangeDate();
-						}
-					}
-				}
-			});
-
-			ctrl_representation_options.setModalObject(contentElement
-					.getPresentation());
-			ctrl_representation_options
-					.setModalObjectFeature(UmaPackage.eINSTANCE
-							.getArtifactDescription_RepresentationOptions());
-			ctrl_representation_options
-					.addModifyListener(contentModifyListener);
-			ctrl_representation_options.addListener(SWT.Deactivate,
-					new Listener() {
-						public void handleEvent(Event e) {
-							IMethodRichText control = descExpandFlag ? ctrl_expanded
-									: ctrl_representation_options;
-							if (!control.getModified()) {
-								return;
-							}
-							String oldContent = ((org.eclipse.epf.uma.ArtifactDescription) workProduct
-									.getPresentation())
-									.getRepresentationOptions();
-							if (((MethodElementEditor) getEditor())
-									.mustRestoreValue(control, oldContent)) {
-								return;
-							}
-							String newContent = control.getText();
-							if (!newContent.equals(oldContent)) {
-								boolean success = actionMgr
-										.doAction(
-												IActionManager.SET,
-												contentElement
-														.getPresentation(),
-												UmaPackage.eINSTANCE
-														.getArtifactDescription_RepresentationOptions(),
-												newContent, -1);
-								if (success && isVersionSectionOn()) {
-									updateChangeDate();
-								}
-							}
-						}
-					});
-		}
-
-		if (workProduct instanceof Deliverable) {
-			ctrl_external_desc.setModalObject(contentElement.getPresentation());
-			ctrl_external_desc.setModalObjectFeature(UmaPackage.eINSTANCE
-					.getDeliverableDescription_ExternalDescription());
-			ctrl_external_desc.addModifyListener(contentModifyListener);
-			ctrl_external_desc.addListener(SWT.Deactivate, new Listener() {
-				public void handleEvent(Event e) {
-					IMethodRichText control = descExpandFlag ? ctrl_expanded
-							: ctrl_external_desc;
-					if (!control.getModified()) {
-						return;
-					}
-					String oldContent = ((org.eclipse.epf.uma.DeliverableDescription) workProduct
-							.getPresentation()).getExternalDescription();
-					if (((MethodElementEditor) getEditor()).mustRestoreValue(
-							control, oldContent)) {
-						return;
-					}
-					String newContent = control.getText();
-					if (!newContent.equals(oldContent)) {
-						boolean success = actionMgr
-								.doAction(
-										IActionManager.SET,
-										contentElement.getPresentation(),
-										UmaPackage.eINSTANCE
-												.getDeliverableDescription_ExternalDescription(),
-										newContent, -1);
-						if (success && isVersionSectionOn()) {
-							updateChangeDate();
-						}
-					}
-				}
-			});
-
-			ctrl_packaging_guidance.setModalObject(contentElement
-					.getPresentation());
-			ctrl_packaging_guidance.setModalObjectFeature(UmaPackage.eINSTANCE
-					.getDeliverableDescription_PackagingGuidance());
-			ctrl_packaging_guidance.addModifyListener(contentModifyListener);
-			ctrl_packaging_guidance.addListener(SWT.Deactivate, new Listener() {
-				public void handleEvent(Event e) {
-					IMethodRichText control = descExpandFlag ? ctrl_expanded
-							: ctrl_packaging_guidance;
-					if (!control.getModified()) {
-						return;
-					}
-					String oldContent = ((org.eclipse.epf.uma.DeliverableDescription) workProduct
-							.getPresentation()).getPackagingGuidance();
-					if (((MethodElementEditor) getEditor()).mustRestoreValue(
-							control, oldContent)) {
-						return;
-					}
-					String newContent = control.getText();
-					if (!newContent.equals(oldContent)) {
-						boolean success = actionMgr
-								.doAction(
-										IActionManager.SET,
-										contentElement.getPresentation(),
-										UmaPackage.eINSTANCE
-												.getDeliverableDescription_PackagingGuidance(),
-										newContent, -1);
-						if (success && isVersionSectionOn()) {
-							updateChangeDate();
-						}
-					}
-				}
-			});
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#refresh(boolean)
-	 */
-	protected void refresh(boolean editable) {
-		super.refresh(editable);
-		ctrl_impact.setEditable(editable);
-		ctrl_reason.setEditable(editable);
-		if (workProduct instanceof Artifact) {
-			ctrl_brief_outline.setEditable(editable);
-			ctrl_representation_options.setEditable(editable);
-		}
-		if (workProduct instanceof Deliverable) {
-			ctrl_external_desc.setEditable(editable);
-			ctrl_packaging_guidance.setEditable(editable);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadData()
-	 */
-	protected void loadData() {
-		super.loadData();
-
-		org.eclipse.epf.uma.WorkProductDescription content = ((org.eclipse.epf.uma.WorkProductDescription) workProduct
-				.getPresentation());
-		String purpose = content.getPurpose();
-		String impact = content.getImpactOfNotHaving();
-		String reason = content.getReasonsForNotNeeding();
-
-		ctrl_purpose.setText(purpose == null ? "" : purpose); //$NON-NLS-1$	
-		ctrl_impact.setText(impact == null ? "" : impact); //$NON-NLS-1$	
-		ctrl_reason.setText(reason == null ? "" : reason); //$NON-NLS-1$
-
-		if (externalIdOn) {
-			String external_id = content.getExternalId();
-			ctrl_external_id.setText(external_id == null ? "" : external_id); //$NON-NLS-1$
-		}
-
-		if (workProduct instanceof Artifact) {
-			ctrl_brief_outline
-					.setText(((ArtifactDescription) content).getBriefOutline() == null ? "" : ((ArtifactDescription) content).getBriefOutline()); //$NON-NLS-1$
-			ctrl_representation_options
-					.setText(((ArtifactDescription) content)
-							.getRepresentationOptions() == null ? "" : ((ArtifactDescription) content).getRepresentationOptions()); //$NON-NLS-1$
-		} else if (workProduct instanceof Deliverable) {
-			ctrl_external_desc
-					.setText(((DeliverableDescription) content)
-							.getExternalDescription() == null ? "" : ((DeliverableDescription) content).getExternalDescription()); //$NON-NLS-1$
-			ctrl_packaging_guidance
-					.setText(((DeliverableDescription) content)
-							.getPackagingGuidance() == null ? "" : ((DeliverableDescription) content).getPackagingGuidance()); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return workProduct;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.WORKPRODUCTS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		filter = new WorkProductFilter() {
-			List badlist = new ArrayList();
-
-			protected boolean childAccept(Object obj) {
-				if (super.childAccept(obj)) {
-					if (obj instanceof ContentElement) {
-						if (obj instanceof WorkProduct
-								&& ((ContentElement) getHelper()
-										.getContentElement()).getType().equals(
-										((ContentElement) obj).getType())) {
-							// prevent circular dependency from deliverable
-							// parts and variability
-							if (obj instanceof Deliverable
-									&& workProduct instanceof Deliverable) {
-								if (!UIHelper.checkCircularDeliverables(
-										(Deliverable) obj,
-										(Deliverable) workProduct)) {
-									badlist.add(obj);
-									return false;
-								}
-								if (((Deliverable) obj)
-										.getVariabilityBasedOnElement() != null) {
-									if (!UIHelper
-											.checkCircularDeliverables(
-													(Deliverable) ((Deliverable) obj)
-															.getVariabilityBasedOnElement(),
-													(Deliverable) workProduct)) {
-										badlist.add(obj);
-										return false;
-									}
-								}
-								Iterator it1 = TngUtil
-										.getGeneralizers((Deliverable) obj);
-								while (it1.hasNext()) {
-									VariabilityElement ve = (VariabilityElement) it1
-											.next();
-									if (ve != null) {
-										if (ve.equals(obj))
-											return false;
-										if (!UIHelper
-												.checkCircularDeliverables(
-														(Deliverable) ve,
-														(Deliverable) workProduct)) {
-											badlist.add(obj);
-											return false;
-										}
-									}
-
-								}
-								// browse through badlist and its deliverable
-								// parts.
-								List templist = new ArrayList();
-								for (Iterator iterator = badlist.iterator(); iterator
-										.hasNext();) {
-									Object bad = iterator.next();
-									UIHelper.deliverablePartsChain(
-											(Deliverable) bad, templist);
-								}
-								if (templist.contains(obj))
-									return false;
-							}
-
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		};
-
-		// set additional filter for variability base element checking
-		((ContentFilter) filter)
-				.setAdditionalFilters(new IFilter[] { new VariabilityBaseElementFilter(
-						workProduct) });
-		return filter;
-	}
-	
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadSectionDescription()
-	 */
-	public void loadSectionDescription() {
-		if(contentElement instanceof Artifact){
-			this.generalSectionDescription = AuthoringUIResources.artifact_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.artifact_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.artifact_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.artifact_versionInfoSection_desc;
-			this.notationSectionDescription = AuthoringUIResources.artifact_notationSection_desc;
-			this.tailoringSectionDescription = AuthoringUIResources.artifact_tailoringSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.artifact_iconSection_desc;
-		}
-		if(contentElement instanceof Outcome){
-			this.generalSectionDescription = AuthoringUIResources.outcome_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.outcome_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.outcome_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.outcome_versionInfoSection_desc;
-			this.notationSectionDescription = AuthoringUIResources.outcome_notationSection_desc;
-			this.tailoringSectionDescription = AuthoringUIResources.outcome_tailoringSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.outcome_iconSection_desc;
-		}
-		if(contentElement instanceof Deliverable){
-			this.generalSectionDescription = AuthoringUIResources.deliverable_generalInfoSection_desc;
-			this.detailSectionDescription = AuthoringUIResources.deliverable_detailSection_desc;
-			this.variabilitySectionDescription = AuthoringUIResources.deliverable_variabilitySection_desc;
-			this.versionSectionDescription = AuthoringUIResources.deliverable_versionInfoSection_desc;
-			this.notationSectionDescription = AuthoringUIResources.deliverable_notationSection_desc;
-			this.tailoringSectionDescription = AuthoringUIResources.deliverable_tailoringSection_desc;
-			this.iconSectionDescription = AuthoringUIResources.deliverable_iconSection_desc;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductGuidancePage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductGuidancePage.java
deleted file mode 100755
index 98bc630..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductGuidancePage.java
+++ /dev/null
@@ -1,266 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.filters.GuidanceFilter;
-import org.eclipse.epf.authoring.ui.util.UIHelper;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.Report;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.Template;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Guidance page in the Work Product editor.
- * 
- * @author Shashidhar Kannoori
- * @author Kelvin Low
- * @since 1.0
- */
-public class WorkProductGuidancePage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "workProductGuidancePage"; //$NON-NLS-1$
-
-	private WorkProduct workProduct;
-
-	private IActionManager actionMgr;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public WorkProductGuidancePage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.GUIDANCE_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		workProduct = (WorkProduct) contentElement;
-		actionMgr = ((MethodElementEditor) getEditor()).getActionManager();
-		setUseCategory2(false);
-		setUseCategory3(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return UIHelper.getSelectedGuidances(workProduct);
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			for (Iterator it = addItems.iterator(); it.hasNext();) {
-				Guidance item = (Guidance) it.next();
-
-				// The guidance for the content element.
-				if (item instanceof Checklist) {
-					actionMgr
-							.doAction(IActionManager.ADD, workProduct,
-									UmaPackage.eINSTANCE
-											.getContentElement_Checklists(),
-									(Checklist) item, -1);
-				} else if (item instanceof Concept) {
-					actionMgr.doAction(IActionManager.ADD, workProduct,
-							UmaPackage.eINSTANCE
-									.getContentElement_ConceptsAndPapers(),
-							item, -1);
-				} else if (item instanceof Example) {
-					actionMgr.doAction(IActionManager.ADD, workProduct,
-							UmaPackage.eINSTANCE.getContentElement_Examples(),
-							item, -1);
-				} else if (item instanceof Guideline) {
-					actionMgr
-							.doAction(IActionManager.ADD, workProduct,
-									UmaPackage.eINSTANCE
-											.getContentElement_Guidelines(),
-									item, -1);
-				} else if (item instanceof Practice) {
-					actionMgr.doAction(IActionManager.ADD, (Practice) item,
-							UmaPackage.eINSTANCE
-									.getPractice_ContentReferences(),
-							workProduct, -1);
-				} else if (item instanceof Report) {
-					actionMgr.doAction(IActionManager.ADD, workProduct,
-							UmaPackage.eINSTANCE.getWorkProduct_Reports(),
-							item, -1);
-				} else if (item instanceof ReusableAsset) {
-					actionMgr.doAction(IActionManager.ADD, workProduct,
-							UmaPackage.eINSTANCE.getContentElement_Assets(),
-							item, -1);
-				} else if (item instanceof SupportingMaterial) {
-					actionMgr.doAction(IActionManager.ADD, workProduct,
-							UmaPackage.eINSTANCE
-									.getContentElement_SupportingMaterials(),
-							item, -1);
-				} else if (item instanceof Template) {
-					actionMgr.doAction(IActionManager.ADD, workProduct,
-							UmaPackage.eINSTANCE.getWorkProduct_Templates(),
-							item, -1);
-				} else if (item instanceof ToolMentor) {
-					actionMgr.doAction(IActionManager.ADD, workProduct,
-							UmaPackage.eINSTANCE.getWorkProduct_ToolMentors(),
-							item, -1);
-				} else {
-					AuthoringUIPlugin
-							.getDefault()
-							.getLogger()
-							.logError(
-									"Unable to add guidance " + item.getType().getName() + ":" + item.getName() + //$NON-NLS-1$ //$NON-NLS-2$
-											"to "
-											+ workProduct.getType().getName()
-											+ ":" + workProduct.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				Guidance item = (Guidance) it.next();
-
-				// The guidance for the content element.
-				if (item instanceof Checklist) {
-					actionMgr
-							.doAction(IActionManager.REMOVE, workProduct,
-									UmaPackage.eINSTANCE
-											.getContentElement_Checklists(),
-									item, -1);
-				} else if (item instanceof Concept) {
-					actionMgr.doAction(IActionManager.REMOVE, workProduct,
-							UmaPackage.eINSTANCE
-									.getContentElement_ConceptsAndPapers(),
-							item, -1);
-				} else if (item instanceof Example) {
-					actionMgr.doAction(IActionManager.REMOVE, workProduct,
-							UmaPackage.eINSTANCE.getContentElement_Examples(),
-							item, -1);
-				} else if (item instanceof Guideline) {
-					actionMgr
-							.doAction(IActionManager.REMOVE, workProduct,
-									UmaPackage.eINSTANCE
-											.getContentElement_Guidelines(),
-									item, -1);
-				} else if (item instanceof Practice) {
-					actionMgr.doAction(IActionManager.REMOVE, (Practice) item,
-							UmaPackage.eINSTANCE
-									.getPractice_ContentReferences(),
-							workProduct, -1);
-				} else if (item instanceof Report) {
-					actionMgr.doAction(IActionManager.REMOVE, workProduct,
-							UmaPackage.eINSTANCE.getWorkProduct_Reports(),
-							item, -1);
-				} else if (item instanceof ReusableAsset) {
-					actionMgr.doAction(IActionManager.REMOVE, workProduct,
-							UmaPackage.eINSTANCE.getContentElement_Assets(),
-							item, -1);
-				} else if (item instanceof SupportingMaterial) {
-					actionMgr.doAction(IActionManager.REMOVE, workProduct,
-							UmaPackage.eINSTANCE
-									.getContentElement_SupportingMaterials(),
-							item, -1);
-				} else if (item instanceof Template) {
-					actionMgr.doAction(IActionManager.REMOVE, workProduct,
-							UmaPackage.eINSTANCE.getWorkProduct_Templates(),
-							item, -1);
-				} else if (item instanceof ToolMentor) {
-					actionMgr.doAction(IActionManager.REMOVE, workProduct,
-							UmaPackage.eINSTANCE.getWorkProduct_ToolMentors(),
-							item, -1);
-				} else {
-					AuthoringUIPlugin
-							.getDefault()
-							.getLogger()
-							.logError(
-									"Unable to remove guidance " + item.getType().getName() + ":" + item.getName() + //$NON-NLS-1$ //$NON-NLS-2$
-											"from "
-											+ workProduct.getType().getName()
-											+ ":" + workProduct.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return workProduct;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.GUIDANCE;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new GuidanceFilter() {
-			protected boolean childAccept(Object obj) {
-				if (super.childAccept(obj))
-					return true;
-				if (obj instanceof Template)
-					return true;
-				if (obj instanceof Report)
-					return true;
-				if (obj instanceof ToolMentor)
-					return true;
-				return false;
-			}
-		};
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductRolesPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductRolesPage.java
deleted file mode 100755
index 9419562..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductRolesPage.java
+++ /dev/null
@@ -1,166 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Roles page in the Work Product editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- * 
- * TODO: Rename this class to WorkProductRolesFormPage
- */
-public class WorkProductRolesPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "workProductRolesPage"; //$NON-NLS-1$
-
-	private WorkProduct workProduct;
-
-	private IActionManager actionMgr;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public WorkProductRolesPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.ROLES_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		workProduct = (WorkProduct) contentElement;
-		actionMgr = ((MethodElementEditor) getEditor()).getActionManager();
-		setUseCategory3(false);
-		setCategoryIsSingleSelection1(true);
-		setAllowChange1(false);
-		setAllowChange2(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return AssociationHelper.getResponsibleRoles((WorkProduct) object).toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			Role role = (Role) addItems.get(0);
-			if (UserInteractionHelper.checkModifyOpposite(role,
-					UmaPackage.eINSTANCE.getRole_ResponsibleFor(), workProduct)) {
-				actionMgr.doAction(IActionManager.ADD, role,
-						UmaPackage.eINSTANCE.getRole_ResponsibleFor(),
-						workProduct, -1);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-//			LibraryManager.getInstance().setResponsibleRole(getActionManager(),
-//					workProduct, null);
-			
-			for (Iterator iter = rmItems.iterator(); iter.hasNext();) {
-				Role role = (Role) iter.next();
-				getActionManager().doAction(IActionManager.REMOVE, role, UmaPackage.eINSTANCE.getRole_ResponsibleFor(), workProduct, -1);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected2()
-	 */
-	protected void initContentProviderSelected2() {
-		contentProviderSelected2 = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return AssociationHelper.getModifiedBy((WorkProduct) object)
-						.toArray();
-			}
-		};
-		viewer_selected2.setContentProvider(contentProviderSelected2);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.workProductRolesPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.workProductRolesPage_sectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.workProductRolesPage_sectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.workProductRolesPage_selectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.workProductRolesPage_selectedLabel2;
-	}
-	
-	
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductTasksPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductTasksPage.java
deleted file mode 100755
index 3965980..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductTasksPage.java
+++ /dev/null
@@ -1,256 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.util.LibraryManager;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Tasks page in the Work Product editor.
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class WorkProductTasksPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "workProductTasksPage"; //$NON-NLS-1$
-
-	private WorkProduct workProduct;
-
-	private IActionManager actionMgr;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public WorkProductTasksPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.TASKS_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		workProduct = (WorkProduct) contentElement;
-		actionMgr = ((MethodElementEditor) getEditor()).getActionManager();
-		setAllowChange1(false);
-		setAllowChange2(false);
-		setAllowChange3(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return AssociationHelper.getMandatoryInputToTasks(
-						(WorkProduct) object).toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			List elementList = retrieveTableViewerContents(viewer_selected2);
-			for (Iterator it = addItems.iterator(); it.hasNext();) {
-				Task task = (Task) it.next();
-				if (!elementList.contains(task)) {
-					actionMgr.doAction(IActionManager.ADD, task,
-							UmaPackage.eINSTANCE.getTask_MandatoryInput(),
-							workProduct, -1);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				Task task = (Task) it.next();
-				actionMgr.doAction(IActionManager.REMOVE, task,
-						UmaPackage.eINSTANCE.getTask_MandatoryInput(),
-						workProduct, -1);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected2()
-	 */
-	protected void initContentProviderSelected2() {
-		contentProviderSelected2 = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				List selectedTasks = new ArrayList();
-				List availableTasksList = LibraryManager.getInstance()
-						.getAvailableTasks(workProduct);
-				if (availableTasksList != null && availableTasksList.size() > 0) {
-					for (java.util.Iterator it = availableTasksList.iterator(); it
-							.hasNext();) {
-						Task task = (Task) it.next();
-						if (task.getOptionalInput().contains(workProduct))
-							selectedTasks.add(task);
-					}
-				}
-				return selectedTasks.toArray();
-			}
-		};
-		viewer_selected2.setContentProvider(contentProviderSelected2);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel2(ArrayList)
-	 */
-	protected void addItemsToModel2(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			List elementList = retrieveTableViewerContents(viewer_selected);
-			for (Iterator it = addItems.iterator(); it.hasNext();) {
-				Task task = (Task) it.next();
-				if (!elementList.contains(task)) {
-					actionMgr.doAction(IActionManager.ADD, task,
-							UmaPackage.eINSTANCE.getTask_OptionalInput(),
-							workProduct, -1);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel2(ArrayList)
-	 */
-	protected void removeItemsFromModel2(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				Task task = (Task) it.next();
-				actionMgr.doAction(IActionManager.REMOVE, task,
-						UmaPackage.eINSTANCE.getTask_OptionalInput(),
-						workProduct, -1);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected3()
-	 */
-	protected void initContentProviderSelected3() {
-		contentProviderSelected3 = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return AssociationHelper.getOutputtingTasks(
-						(WorkProduct) object).toArray();
-			}
-		};
-		viewer_selected3.setContentProvider(contentProviderSelected3);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel3(ArrayList)
-	 */
-	protected void addItemsToModel3(ArrayList addItems) {
-		// Update the model.
-		if (!addItems.isEmpty()) {
-			for (Iterator it = addItems.iterator(); it.hasNext();) {
-				Task task = (Task) it.next();
-				actionMgr.doAction(IActionManager.ADD, task,
-						UmaPackage.eINSTANCE.getTask_Output(), workProduct, -1);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel3(ArrayList)
-	 */
-	protected void removeItemsFromModel3(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				Task task = (Task) it.next();
-				actionMgr.doAction(IActionManager.REMOVE, task,
-						UmaPackage.eINSTANCE.getTask_Output(), workProduct, -1);
-			}
-		}
-	}
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.WorkProduct_Tasks_MultipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.WorkProduct_Tasks_SectionDescription;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.WorkProduct_Tasks_SectionName;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel()
-	 */
-	protected String getSelectedLabel() {
-		return AuthoringUIResources.WorkProduct_Tasks_SelectedLabel;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel2()
-	 */
-	protected String getSelectedLabel2() {
-		return AuthoringUIResources.WorkProduct_Tasks_SelectedLabel2;
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSelectedLabel3()
-	 */
-	protected String getSelectedLabel3() {
-		return AuthoringUIResources.WorkProduct_Tasks_SelectedLabel3;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductTypeDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductTypeDescriptionPage.java
deleted file mode 100755
index 0929f04..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductTypeDescriptionPage.java
+++ /dev/null
@@ -1,90 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.filters.CategoryFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.VariabilityBaseElementFilter;
-import org.eclipse.epf.uma.WorkProductType;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Description page for the Work product Type editor.
- * 
- * @author Kelvin Low
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class WorkProductTypeDescriptionPage extends DescriptionFormPage {
-
-	private static final String FORM_PAGE_ID = "workProductTypeDescriptionPage"; //$NON-NLS-1$
-
-	private WorkProductType workProductType;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public WorkProductTypeDescriptionPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.DESCRIPTION_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		workProductType = (WorkProductType) contentElement;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return workProductType;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		filter = new CategoryFilter() {
-			protected boolean childAccept(Object obj) {
-				return (obj instanceof WorkProductType);
-			}
-		};
-
-		// set additional filter for variability base element checking
-		((CategoryFilter) filter)
-				.setAdditionalFilters(new IFilter[] { new VariabilityBaseElementFilter(
-						workProductType) });
-		return filter;
-	}
-
-	protected String getTabString() {
-		return FilterConstants.WORKPRODUCTTYPES;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#loadSectionDescription()
-	 */
-	public void loadSectionDescription() {
-		this.generalSectionDescription = AuthoringUIResources.workproducttype_generalInfoSection_desc;
-		this.detailSectionDescription = AuthoringUIResources.workproducttype_detailSection_desc;
-		this.variabilitySectionDescription = AuthoringUIResources.workproducttype_variabilitySection_desc;
-		this.versionSectionDescription = AuthoringUIResources.workproducttype_versionInfoSection_desc;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductTypeWorkProductsPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductTypeWorkProductsPage.java
deleted file mode 100755
index 32e6d84..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/WorkProductTypeWorkProductsPage.java
+++ /dev/null
@@ -1,154 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.forms;
-
-import java.util.ArrayList;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.filters.WorkProductFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductType;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-
-/**
- * The Work Products page in the Work Product Type editor.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- */
-public class WorkProductTypeWorkProductsPage extends AssociationFormPage {
-
-	private static final String FORM_PAGE_ID = "workProductTypeWorkProductsPage"; //$NON-NLS-1$
-
-	private WorkProductType workProductType;
-
-	private IActionManager actionMgr;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public WorkProductTypeWorkProductsPage(FormEditor editor) {
-		super(editor, FORM_PAGE_ID, AuthoringUIText.WORK_PRODUCTS_PAGE_TITLE);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) {
-		super.init(site, input);
-		workProductType = (WorkProductType) contentElement;
-		actionMgr = ((MethodElementEditor) getEditor()).getActionManager();
-		setUseCategory2(false);
-		setUseCategory3(false);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#initContentProviderSelected()
-	 */
-	protected void initContentProviderSelected() {
-		contentProviderSelected = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return ((WorkProductType) object).getWorkProducts().toArray();
-			}
-		};
-		viewer_selected.setContentProvider(contentProviderSelected);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#addItemsToModel1(ArrayList)
-	 */
-	protected void addItemsToModel1(ArrayList addItems) {
-		if (!addItems.isEmpty()) {
-			actionMgr.doAction(IActionManager.ADD_MANY, workProductType,
-					UmaPackage.eINSTANCE.getWorkProductType_WorkProducts(),
-					addItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#removeItemsFromModel1(ArrayList)
-	 */
-	protected void removeItemsFromModel1(ArrayList rmItems) {
-		// Update the model.
-		if (!rmItems.isEmpty()) {
-			actionMgr.doAction(IActionManager.REMOVE_MANY, workProductType,
-					UmaPackage.eINSTANCE.getWorkProductType_WorkProducts(),
-					rmItems, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getContentElement()
-	 */
-	protected Object getContentElement() {
-		return workProductType;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getTabString()
-	 */
-	protected String getTabString() {
-		return FilterConstants.WORKPRODUCTS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.DescriptionFormPage#getFilter()
-	 */
-	protected IFilter getFilter() {
-		return filter = new WorkProductFilter() {
-			protected boolean childAccept(Object obj) {
-				if (obj instanceof ContentElement) {
-					if (getHelper().isContributor((ContentElement) obj))
-						return false;
-				}
-				return (obj instanceof WorkProduct);
-			}
-		};
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getMultipleSelectDescription(int)
-	 */
-	protected String getMultipleSelectDescription(int count) {
-		return super.getMultipleSelectDescription(count, AuthoringUIResources.workProductTypeWorkProductsPage_multipleSelectDescription);
-	}
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionDescription()
-	 */
-	protected String getSectionDescription() {
-		return AuthoringUIResources.workProductTypeWorkProductsPage_sectionDescription;
-	}
-	
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.forms.AssociationFormPage#getSectionName()
-	 */
-	protected String getSectionName() {
-		return AuthoringUIResources.workProductTypeWorkProductsPage_sectionName;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/package.html
deleted file mode 100755
index 3b73713..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides form pages for the method and process editors.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/IProblemChangedListener.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/IProblemChangedListener.java
deleted file mode 100755
index edc8e93..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/IProblemChangedListener.java
+++ /dev/null
@@ -1,32 +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.authoring.ui.internal;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * 
- * Code taken from org.eclipse.jdt.internal.ui.viewsupport.IProblemChangedListener
- *
- */
-public interface IProblemChangedListener {
-	
-	/**
-	 * Called when problems changed. This call is posted in an aynch exec, therefore passed
-	 * resources must not exist.
-	 * @param changedResources  A set with elements of type <code>IResource</code> that
-	 * describe the resources that had an problem change.
-	 * @param isMarkerChange If set to <code>true</code>, the change was a marker change, if
-	 * <code>false</code>, the change came from an annotation model modification.
-	 */
-	void problemsChanged(IResource[] changedResources, boolean isMarkerChange);
-	
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/ImageDescriptorRegistry.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/ImageDescriptorRegistry.java
deleted file mode 100755
index 3638529..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/ImageDescriptorRegistry.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.authoring.ui.internal;
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * 
- * Code taken from org.eclipse.jdt.internal.ui.viewsupport.ImageDescriptorRegistry
- *
- */
-public class ImageDescriptorRegistry {
-
-	private HashMap<ImageDescriptor, Image> fRegistry= new HashMap<ImageDescriptor, Image>(10);
-	private Display fDisplay;
-	
-	/**
-	 * Creates a new image descriptor registry for the current or default display,
-	 * respectively.
-	 */
-	public ImageDescriptorRegistry() {
-		this(AuthoringUIPlugin.getStandardDisplay());
-	}
-	
-	/**
-	 * Creates a new image descriptor registry for the given display. All images
-	 * managed by this registry will be disposed when the display gets disposed.
-	 * 
-	 * @param display the display the images managed by this registry are allocated for 
-	 */
-	public ImageDescriptorRegistry(Display display) {
-		fDisplay= display;
-		Assert.isNotNull(fDisplay);
-		hookDisplay();
-	}
-	
-	/**
-	 * Returns the image associated with the given image descriptor.
-	 * 
-	 * @param descriptor the image descriptor for which the registry manages an image
-	 * @return the image associated with the image descriptor or <code>null</code>
-	 *  if the image descriptor can't create the requested image.
-	 */
-	public Image get(ImageDescriptor descriptor) {
-		if (descriptor == null)
-			descriptor= ImageDescriptor.getMissingImageDescriptor();
-			
-		Image result= (Image)fRegistry.get(descriptor);
-		if (result != null)
-			return result;
-	
-		Assert.isTrue(fDisplay == AuthoringUIPlugin.getStandardDisplay(), "Allocating image for wrong display."); //$NON-NLS-1$
-		result= descriptor.createImage();
-		if (result != null)
-			fRegistry.put(descriptor, result);
-		return result;
-	}
-
-	/**
-	 * Disposes all images managed by this registry.
-	 */	
-	public void dispose() {
-		for (Iterator iter= fRegistry.values().iterator(); iter.hasNext(); ) {
-			Image image= (Image)iter.next();
-			image.dispose();
-		}
-		fRegistry.clear();
-	}
-	
-	private void hookDisplay() {
-		fDisplay.disposeExec(new Runnable() {
-			public void run() {
-				dispose();
-			}	
-		});
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/ImageImageDescriptor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/ImageImageDescriptor.java
deleted file mode 100755
index 27864dc..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/ImageImageDescriptor.java
+++ /dev/null
@@ -1,54 +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.authoring.ui.internal;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-
-/**
- * Code taken from org.eclipse.jdt.internal.ui.viewsupport.ImageImageDescriptor
- *
- */
-public class ImageImageDescriptor extends ImageDescriptor {
-
-	private Image fImage;
-
-	/**
-	 * Constructor for ImagImageDescriptor.
-	 */
-	public ImageImageDescriptor(Image image) {
-		super();
-		fImage= image;
-	}
-
-	/* (non-Javadoc)
-	 * @see ImageDescriptor#getImageData()
-	 */
-	public ImageData getImageData() {
-		return fImage.getImageData();
-	}
-
-	/* (non-Javadoc)
-	 * @see Object#equals(Object)
-	 */
-	public boolean equals(Object obj) {
-		return (obj != null) && getClass().equals(obj.getClass()) && fImage.equals(((ImageImageDescriptor)obj).fImage);
-	}
-
-	/* (non-Javadoc)
-	 * @see Object#hashCode()
-	 */
-	public int hashCode() {
-		return fImage.hashCode();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/MethodElementEditorErrorTickUpdater.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/MethodElementEditorErrorTickUpdater.java
deleted file mode 100755
index 70e781a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/MethodElementEditorErrorTickUpdater.java
+++ /dev/null
@@ -1,99 +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.authoring.ui.internal;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditorInput;
-import org.eclipse.epf.authoring.ui.providers.MethodElementUILabelProvider;
-import org.eclipse.epf.authoring.ui.providers.ProblemsLabelDecorator;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.jface.text.Assert;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-
-/**
- * Code taken from org.eclipse.jdt.internal.ui.javaeditor.JavaEditorErrorTickUpdater
- *
- */
-public class MethodElementEditorErrorTickUpdater implements IProblemChangedListener {
-
-	private MethodElementEditor fMethodElementEditor;
-	private MethodElementUILabelProvider fLabelProvider;
-
-	public MethodElementEditorErrorTickUpdater(MethodElementEditor editor) {
-		Assert.isNotNull(editor);
-		fMethodElementEditor= editor;
-		fLabelProvider= new MethodElementUILabelProvider();
-		fLabelProvider.addLabelDecorator(new ProblemsLabelDecorator(null));
-		AuthoringUIPlugin.getDefault().getProblemMarkerManager().addListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see IProblemChangedListener#problemsChanged(IResource[], boolean)
-	 */
-	public void problemsChanged(IResource[] changedResources, boolean isMarkerChange) {
-		if (!isMarkerChange)
-			return;
-
-		IEditorInput input= fMethodElementEditor.getEditorInput();
-		if (input instanceof MethodElementEditorInput) { // might run async, tests needed
-			MethodElement melement = ((MethodElementEditorInput)input).getMethodElement();
-			if (melement instanceof ProcessComponent) {
-				melement = ((ProcessComponent) melement).getProcess();
-			}
-			if (melement != null) {
-				IResource resource= PersistenceUtil.getWorkspaceResource(melement);
-				for (int i = 0; i < changedResources.length; i++) {
-					if (changedResources[i].equals(resource)) {
-						updateEditorImage(melement);
-					}
-				}
-			}
-		}
-	}
-
-	public void updateEditorImage(MethodElement melement) {
-		Image titleImage= fMethodElementEditor.getTitleImage();
-		if (titleImage == null) {
-			return;
-		}
-		Image newImage;
-		newImage= fLabelProvider.getImage(melement);
-		if (titleImage != newImage) {
-			postImageChange(newImage);
-		}
-	}
-
-	private void postImageChange(final Image newImage) {
-		Shell shell= fMethodElementEditor.getEditorSite().getShell();
-		if (shell != null && !shell.isDisposed()) {
-			shell.getDisplay().syncExec(new Runnable() {
-				public void run() {
-					fMethodElementEditor.updatedTitleImage(newImage);
-				}
-			});
-		}
-	}
-
-	public void dispose() {
-		fLabelProvider.dispose();
-		AuthoringUIPlugin.getDefault().getProblemMarkerManager().removeListener(this);
-	}
-
-
-}
-
-
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/MethodElementImageDescriptor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/MethodElementImageDescriptor.java
deleted file mode 100755
index 888222d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/MethodElementImageDescriptor.java
+++ /dev/null
@@ -1,161 +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.authoring.ui.internal;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIImages;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-/**
- * Code taken from org.eclipse.jdt.ui.JavaElementImageDescriptor
- *
- */
-public class MethodElementImageDescriptor extends CompositeImageDescriptor {
-	
-	/** Flag to render the error adornment. */
-	public final static int ERROR=			0x040;
-
-	private ImageDescriptor fBaseImage;
-	private int fFlags;
-	private Point fSize;
-
-	/**
-	 * Creates a new MethodElementImageDescriptor.
-	 * 
-	 * @param baseImage an image descriptor used as the base image
-	 * @param flags flags indicating which adornments are to be rendered. See <code>setAdornments</code>
-	 * 	for valid values.
-	 * @param size the size of the resulting image
-	 * @see #setAdornments(int)
-	 */
-	public MethodElementImageDescriptor(ImageDescriptor baseImage, int flags, Point size) {
-		fBaseImage= baseImage;
-		Assert.isNotNull(fBaseImage);
-		fFlags= flags;
-		Assert.isTrue(fFlags >= 0);
-		fSize= size;
-		Assert.isNotNull(fSize);
-	}
-	
-	/**
-	 * Sets the descriptors adornments. Valid values are: <code>ABSTRACT</code>, <code>FINAL</code>,
-	 * <code>SYNCHRONIZED</code>, </code>STATIC<code>, </code>RUNNABLE<code>, </code>WARNING<code>, 
-	 * </code>ERROR<code>, </code>OVERRIDDES<code>, <code>IMPLEMENTS</code>, <code>CONSTRUCTOR</code>,
-	 * <code>DEPRECATED</code>,  or any combination of those.
-	 * 
-	 * @param adornments the image descriptors adornments
-	 */
-	public void setAdornments(int adornments) {
-		Assert.isTrue(adornments >= 0);
-		fFlags= adornments;
-	}
-
-	/**
-	 * Returns the current adornments.
-	 * 
-	 * @return the current adornments
-	 */
-	public int getAdronments() {
-		return fFlags;
-	}
-
-	/**
-	 * Sets the size of the image created by calling <code>createImage()</code>.
-	 * 
-	 * @param size the size of the image returned from calling <code>createImage()</code>
-	 * @see ImageDescriptor#createImage()
-	 */
-	public void setImageSize(Point size) {
-		Assert.isNotNull(size);
-		Assert.isTrue(size.x >= 0 && size.y >= 0);
-		fSize= size;
-	}
-	
-	/**
-	 * Returns the size of the image created by calling <code>createImage()</code>.
-	 * 
-	 * @return the size of the image created by calling <code>createImage()</code>
-	 * @see ImageDescriptor#createImage()
-	 */
-	public Point getImageSize() {
-		return new Point(fSize.x, fSize.y);
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared in CompositeImageDescriptor
-	 */
-	protected Point getSize() {
-		return fSize;
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on Object.
-	 */
-	public boolean equals(Object object) {
-		if (object == null || !MethodElementImageDescriptor.class.equals(object.getClass()))
-			return false;
-			
-		MethodElementImageDescriptor other= (MethodElementImageDescriptor)object;
-		return (fBaseImage.equals(other.fBaseImage) && fFlags == other.fFlags && fSize.equals(other.fSize));
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on Object.
-	 */
-	public int hashCode() {
-		return fBaseImage.hashCode() | fFlags | fSize.hashCode();
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared in CompositeImageDescriptor
-	 */
-	protected void drawCompositeImage(int width, int height) {
-		ImageData bg= getImageData(fBaseImage);
-			
-		
-		drawImage(bg, 0, 0);
-				
-		drawTopRight();
-		drawBottomRight();
-		drawBottomLeft();
-		
-
-	}
-	
-	private ImageData getImageData(ImageDescriptor descriptor) {
-		ImageData data= descriptor.getImageData(); // see bug 51965: getImageData can return null
-		if (data == null) {
-			data= DEFAULT_IMAGE_DATA;
-			AuthoringUIPlugin.getDefault().getLogger().logError("Image data not available: " + descriptor.toString()); //$NON-NLS-1$
-		}
-		return data;
-	}
-	
-	
-	private void drawTopRight() {		
-	}		
-	
-	private void drawBottomRight() {
-	}		
-	
-	private void drawBottomLeft() {
-		Point size= getSize();
-		int x= 0;
-		if ((fFlags & ERROR) != 0) {
-			ImageData data= getImageData(AuthoringUIImages.IMG_DESC_OVR_ERROR);
-			drawImage(data, x, size.y - data.height);
-			x+= data.width;
-		}
-	}		
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/ProblemMarkerManager.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/ProblemMarkerManager.java
deleted file mode 100755
index 7f22304..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/internal/ProblemMarkerManager.java
+++ /dev/null
@@ -1,161 +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.authoring.ui.internal;
-
-import java.util.HashSet;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IMarkerDelta;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Listens to resource deltas and filters for marker changes of type IMarker.PROBLEM
- * Viewers showing error ticks should register as listener to
- * this type.
- * 
- * Code taken from org.eclipse.jdt.internal.ui.viewsupport.ProblemMarkerManager
- */
-public class ProblemMarkerManager implements IResourceChangeListener {
-
-	/**
-	 * Visitors used to look if the element change delta contains a marker change.
-	 */
-	private static class ProjectErrorVisitor implements IResourceDeltaVisitor {
-
-		private HashSet<IResource> fChangedElements; 
-		
-		public ProjectErrorVisitor(HashSet<IResource> changedElements) {
-			fChangedElements= changedElements;
-		}
-			
-		public boolean visit(IResourceDelta delta) throws CoreException {
-			IResource res= delta.getResource();
-			if (res instanceof IProject && delta.getKind() == IResourceDelta.CHANGED) {
-				IProject project= (IProject) res;
-				if (!project.isAccessible()) {
-					// only track open Java projects
-					return false;
-				}
-			}
-			checkInvalidate(delta, res);
-			return true;
-		}
-		
-		private void checkInvalidate(IResourceDelta delta, IResource resource) {
-			int kind= delta.getKind();
-			if (kind == IResourceDelta.REMOVED || kind == IResourceDelta.ADDED || (kind == IResourceDelta.CHANGED && isErrorDelta(delta))) {
-				// invalidate the resource and all parents
-				while (resource.getType() != IResource.ROOT && fChangedElements.add(resource)) {
-					resource= resource.getParent();
-				}
-			} 
-		}	
-		
-		private boolean isErrorDelta(IResourceDelta delta) {	
-			if ((delta.getFlags() & IResourceDelta.MARKERS) != 0) {
-				IMarkerDelta[] markerDeltas= delta.getMarkerDeltas();
-				for (int i= 0; i < markerDeltas.length; i++) {
-					if (markerDeltas[i].isSubtypeOf(IMarker.PROBLEM)) {
-						int kind= markerDeltas[i].getKind();
-						if (kind == IResourceDelta.ADDED || kind == IResourceDelta.REMOVED)
-							return true;
-						int severity= markerDeltas[i].getAttribute(IMarker.SEVERITY, -1);
-						int newSeverity= markerDeltas[i].getMarker().getAttribute(IMarker.SEVERITY, -1);
-						if (newSeverity != severity)
-							return true; 
-					}
-				}
-			}
-			return false;
-		}
-	}
-
-	private ListenerList fListeners;
-	
-	
-	public ProblemMarkerManager() {
-		fListeners= new ListenerList();
-	}
-
-	/*
-	 * @see IResourceChangeListener#resourceChanged
-	 */	
-	public void resourceChanged(IResourceChangeEvent event) {
-		HashSet<IResource> changedElements= new HashSet<IResource>();
-		
-		try {
-			IResourceDelta delta= event.getDelta();
-			if (delta != null)
-				delta.accept(new ProjectErrorVisitor(changedElements));
-		} catch (CoreException e) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(e);
-		}
-
-		if (!changedElements.isEmpty()) {
-			IResource[] changes= (IResource[]) changedElements.toArray(new IResource[changedElements.size()]);
-			fireChanges(changes, true);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see IAnnotationModelListener#modelChanged(IAnnotationModel)
-	 */
-	public void modelChanged(IAnnotationModel model) {
-		// no action
-	}	
-	
-	/**
-	 * Adds a listener for problem marker changes.
-	 */
-	public void addListener(IProblemChangedListener listener) {
-		if (fListeners.isEmpty()) { 
-			ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
-		}
-		fListeners.add(listener);
-	}
-
-	/**
-	 * Removes a <code>IProblemChangedListener</code>.
-	 */	
-	public void removeListener(IProblemChangedListener listener) {
-		fListeners.remove(listener);
-		if (fListeners.isEmpty()) {
-			ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		}
-	}
-	
-	private void fireChanges(final IResource[] changes, final boolean isMarkerChange) {
-		Display display= Display.getCurrent();
-		if (display != null && !display.isDisposed()) {
-			display.asyncExec(new Runnable() {
-				public void run() {		
-					Object[] listeners= fListeners.getListeners();
-					for (int i= 0; i < listeners.length; i++) {
-						IProblemChangedListener curr= (IProblemChangedListener) listeners[i];
-						curr.problemsChanged(changes, isMarkerChange);
-					}	
-				}
-			});
-		}	
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/package.html
deleted file mode 100755
index baebb00..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides UI services for the Authoring and Browsing perspectives.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/ApplicationPreferenceConstants.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/ApplicationPreferenceConstants.java
deleted file mode 100755
index 741591e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/ApplicationPreferenceConstants.java
+++ /dev/null
@@ -1,34 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.preferences;
-
-import org.eclipse.epf.library.edit.util.LibraryEditConstants;
-import org.eclipse.epf.library.prefs.PreferenceConstants;
-
-/**
- * 
- * Preference constants for application
- * 
- * @author Phong Nguyen Le
- * @author Shilpa Toraskar
- * @author Jinhua Xi
- * @since 1.0
- * 
- */
-public class ApplicationPreferenceConstants implements PreferenceConstants {
-	
-	public static final String PREF_ENABLE_PROCESS_CONTRIBUTION = LibraryEditConstants.PREF_ENABLE_PROCESS_CONTRIBUTION;
-
-	public static final String PREF_ENABLE_HEALTH_CHECK = LibraryEditConstants.PREF_ENABLE_HEALTH_CHECK;
-
-	public static final String PREF_INHERIT_SUPPRESSION_STATE = LibraryEditConstants.PREF_INHERIT_SUPPRESSION_STATE;
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/AuthoringPreferenceInitializer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/AuthoringPreferenceInitializer.java
deleted file mode 100755
index e2a7e2e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/AuthoringPreferenceInitializer.java
+++ /dev/null
@@ -1,51 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.editors.ProcessEditor;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-
-/**
- * PreferenceInitializer for AuthoringPlugin.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class AuthoringPreferenceInitializer extends
-		AbstractPreferenceInitializer {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = AuthoringUIPlugin.getDefault()
-				.getPreferenceStore();
-
-		store.setDefault(ApplicationPreferenceConstants.PREF_WBS_COLUMNS,
-				ProcessEditorPreferencePage
-						.toString(ProcessEditor.DEFAULT_WBS_COLUMNS));
-		store.setDefault(ApplicationPreferenceConstants.PREF_TBS_COLUMNS,
-				ProcessEditorPreferencePage
-						.toString(ProcessEditor.DEFAULT_TBS_COLUMNS));
-		store.setDefault(ApplicationPreferenceConstants.PREF_WPBS_COLUMNS,
-				ProcessEditorPreferencePage
-						.toString(ProcessEditor.DEFAULT_WPBS_COLUMNS));
-		store.setDefault(
-				ApplicationPreferenceConstants.PREF_INHERIT_SUPPRESSION_STATE,
-				true);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/CommonPrefPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/CommonPrefPage.java
deleted file mode 100755
index 040846b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/CommonPrefPage.java
+++ /dev/null
@@ -1,130 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.preferences;
-
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Preference page for common options
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- *
- */
-public class CommonPrefPage extends PreferencePage {
-
-	/**
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		// do nothing in this common preference page
-		return null;
-	}
-
-	protected Composite createGridComposite(Composite parent, int numColumns) {
-
-		Composite composite = new Composite(parent, SWT.NULL);
-
-		// GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		composite.setLayout(layout);
-
-		// GridData
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		composite.setLayoutData(data);
-
-		return composite;
-	}
-
-	protected void openDirectoryDialog(Composite parent, Text path_ctr) {
-		try {
-			DirectoryDialog dd = new DirectoryDialog(parent.getShell(),
-					SWT.NONE);
-
-			String destination = dd.open();
-			if (destination != null) {
-				path_ctr.setText(destination);
-			}
-
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-	}
-
-	/**
-	 * Method to create a Label
-	 * @param parent parent composite of the Label
-	 * @param text Label text
-	 * @param span horizontal span
-	 * @return the newly created Label
-	 */
-	protected Label createLabel(Composite parent, String text, int span) {
-		Label label = new Label(parent, SWT.LEFT);
-		label.setText(text);
-		GridData data = new GridData();
-		data.horizontalSpan = span;
-		data.horizontalAlignment = GridData.FILL;
-		label.setLayoutData(data);
-		return label;
-	}
-
-	/**
-	 * Method to create a radio button
-	 * @param parent parent composite of the button
-	 * @param label the button label
-	 * @return the newly created Radio Button
-	 */
-	protected Button createRadioButton(Composite parent, String label) {
-		Button button = new Button(parent, SWT.RADIO | SWT.LEFT);
-		button.setText(label);
-		GridData data = new GridData();
-		button.setLayoutData(data);
-		return button;
-	}
-
-	/**
-	 * Method to create a line
-	 * @param parent parent composite of the line
-	 * @param ncol horizontal span
-	 */
-	protected void createLine(Composite parent, int ncol) {
-		Label line = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL
-				| SWT.BOLD);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = ncol;
-		line.setLayoutData(gridData);
-	}
-
-	/**
-	 * return the preference store
-	 */
-	protected IPreferenceStore doGetPreferenceStore() {
-
-		return LibraryPlugin.getDefault().getPreferenceStore();
-		// return PlatformUI.getWorkbench().getPreferenceStore();
-
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/DebugPrefPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/DebugPrefPage.java
deleted file mode 100755
index a7ff8af..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/DebugPrefPage.java
+++ /dev/null
@@ -1,154 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.preferences;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-/**
- * Preference page for debug options
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class DebugPrefPage extends CommonPrefPage implements
-		IWorkbenchPreferencePage {
-
-	int NUM_COLUMN = 3;
-
-	private Composite composite_tab;
-
-	// private IWorkbench workbench;
-
-	private Button enableHealthCheck;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-
-		// composite_tab << parent
-		composite_tab = createComposite(parent, NUM_COLUMN);
-
-		createLabel(composite_tab, " ", NUM_COLUMN); //$NON-NLS-1$
-
-		enableHealthCheck = new Button(composite_tab, SWT.CHECK);
-		enableHealthCheck.setText(AuthoringUIResources.enableHealthCheck_text); 
-
-		createLabel(composite_tab, " ", NUM_COLUMN); //$NON-NLS-1$
-		createLine(composite_tab, NUM_COLUMN);
-
-		initializeValues();
-
-		return composite_tab;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-		// this.workbench = workbench;
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on PreferencePage
-	 */
-	protected void performDefaults() {
-		super.performDefaults();
-		initializeDefaults();
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on PreferencePage
-	 */
-	public boolean performOk() {
-		storeValues();
-		LibraryPlugin.getDefault().savePluginPreferences();
-
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.preferences.CommonPrefPage#doGetPreferenceStore()
-	 */
-	protected IPreferenceStore doGetPreferenceStore() {
-
-		return LibraryPlugin.getDefault().getPreferenceStore();
-
-	}
-
-	/**
-	 * Stores the values of the controls back to the preference store.
-	 */
-	private void storeValues() {
-		IPreferenceStore store = getPreferenceStore();
-
-		store.setValue(ApplicationPreferenceConstants.PREF_ENABLE_HEALTH_CHECK,
-				enableHealthCheck.getSelection());
-	}
-
-	/**
-	 * Initializes states of the controls using default values in the preference
-	 * store.
-	 */
-	private void initializeDefaults() {
-		IPreferenceStore store = getPreferenceStore();
-
-		enableHealthCheck
-				.setSelection(store
-						.getDefaultBoolean(ApplicationPreferenceConstants.PREF_ENABLE_HEALTH_CHECK));
-	}
-
-	/**
-	 * Initializes states of the controls from the preference store.
-	 */
-	private void initializeValues() {
-		IPreferenceStore store = getPreferenceStore();
-		enableHealthCheck
-				.setSelection(store
-						.getBoolean(ApplicationPreferenceConstants.PREF_ENABLE_HEALTH_CHECK));
-	}
-
-	private Composite createComposite(Composite parent, int numColumns) {
-
-		Composite composite = new Composite(parent, SWT.NULL);
-
-		// GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		layout.marginHeight = layout.marginWidth = 0;
-		composite.setLayout(layout);
-
-		// GridData
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		composite.setLayoutData(data);
-
-		return composite;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/DiagramPrefPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/DiagramPrefPage.java
deleted file mode 100755
index 0fcd1a2..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/DiagramPrefPage.java
+++ /dev/null
@@ -1,147 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.preferences;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-/**
- * Preference page for diagram options
- * 
- * @author Phong Le
- * @since 1.0
- * 
- */
-public class DiagramPrefPage extends CommonPrefPage implements
-		IWorkbenchPreferencePage, SelectionListener {
-
-	Composite composite;
-
-	int NUM_COLUMN = 3;
-
-	private Button ctrl_publish_unopen_activitydd;
-
-	private Button ctrl_publish_ad_for_activity_extension;
-	
-	public DiagramPrefPage() {
-		super();
-	}
-
-	protected Control createContents(Composite parent) {
-
-		composite = createGridComposite(parent, NUM_COLUMN);
-
-		createLabel(composite, " ", NUM_COLUMN); //$NON-NLS-1$
-
-		ctrl_publish_unopen_activitydd = new Button(composite, SWT.CHECK);
-		ctrl_publish_unopen_activitydd
-				.setText(AuthoringUIResources.promptfor_publish_unopen_activitydd_text); 
-
-		GridData data = new GridData();
-		data.horizontalSpan = 3;
-		data.horizontalAlignment = GridData.FILL;
-		ctrl_publish_unopen_activitydd.setLayoutData(data);
-		
-		ctrl_publish_ad_for_activity_extension = new Button(composite, SWT.CHECK);
-		ctrl_publish_ad_for_activity_extension
-				.setText(AuthoringUIResources.prompt_for_publish_extend_activity_diagram); 
-				
-		createLabel(composite, " ", NUM_COLUMN); //$NON-NLS-1$
-		createLine(composite, NUM_COLUMN);
-
-		initializeValues();
-
-		return composite;
-	}
-
-	public void init(IWorkbench workbench) {
-
-	}
-
-	public void widgetSelected(SelectionEvent e) {
-
-	}
-
-	public void widgetDefaultSelected(SelectionEvent e) {
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on PreferencePage
-	 */
-	protected void performDefaults() {
-		super.performDefaults();
-		initializeDefaults();
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on PreferencePage
-	 */
-	public boolean performOk() {
-		storeValues();
-		LibraryUIPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-
-	/**
-	 * Stores the values of the controls back to the preference store.
-	 */
-	private void storeValues() {
-		// IPreferenceStore store = getPreferenceStore();
-		// store.setValue(LibraryPreferenceConstants.PREF_PROMPT_FOR_LIBRARY_AT_STARTUP,
-		// ctrl_publish_unopen_activitydd.getSelection());
-		LibraryUIPreferences
-				.setPublishUnopenActivitydd(ctrl_publish_unopen_activitydd
-						.getSelection());
-		LibraryUIPreferences
-				.setPublishADForActivityExtension(ctrl_publish_ad_for_activity_extension
-						.getSelection());
-	}
-
-	private void initializeDefaults() {
-		// IPreferenceStore store = getPreferenceStore();
-		ctrl_publish_unopen_activitydd.setSelection(false);
-		ctrl_publish_ad_for_activity_extension.setSelection(true);
-	}
-
-	/**
-	 * Initializes states of the controls from the preference store.
-	 */
-	private void initializeValues() {
-		// IPreferenceStore store = getPreferenceStore();
-		// ctrl_publish_unopen_activitydd.setSelection(store.getBoolean(LibraryPreferenceConstants.PREF_PROMPT_FOR_LIBRARY_AT_STARTUP));
-		ctrl_publish_unopen_activitydd.setSelection(LibraryUIPreferences
-				.getPublishUnopenActivitydd());
-		ctrl_publish_ad_for_activity_extension
-				.setSelection(LibraryUIPreferences
-						.getPublishADForActivityExtension());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.preferences.CommonPrefPage#doGetPreferenceStore()
-	 */
-	protected IPreferenceStore doGetPreferenceStore() {
-		return LibraryUIPlugin.getDefault().getPreferenceStore();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/LibraryLocationData.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/LibraryLocationData.java
deleted file mode 100755
index 50e8642..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/LibraryLocationData.java
+++ /dev/null
@@ -1,213 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.preferences;
-
-import java.io.File;
-
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.epf.library.prefs.LibraryPreferenceConstants;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-
-/**
- * Location Data for library 
- * 
- * @author BingXue Xu
- * @since 1.0
- * fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=157401
- */
-public class LibraryLocationData {
-
-	private String parentFolder;
-
-	private String libName;
-
-	private String libBriefDescription;
-
-	private boolean isSingleLibFile;
-
-	private String defaultLibDir;
-
-	private boolean defLibDirChecked;
-
-	protected static final String libraryFile = "library.xmi"; //$NON-NLS-1$
-
-	/**
-	 * @return Returns the isOkPressed.
-	 */
-	public boolean isOkPressed() {
-		return isOkPressed;
-	}
-
-	/**
-	 * @param isOkPressed
-	 *            The isOkPressed to set.
-	 */
-	public void setOkPressed(boolean isOkPressed) {
-		this.isOkPressed = isOkPressed;
-	}
-
-	private boolean isOkPressed;
-
-	/**
-	 * @return Returns the isSingleLibFile.
-	 */
-	public boolean isSingleLibFile() {
-		return isSingleLibFile;
-	}
-
-	/**
-	 * @param isSingleLibFile
-	 *            The isSingleLibFile to set.
-	 */
-	public void setSingleLibFile(boolean isSingleLibFile) {
-		this.isSingleLibFile = isSingleLibFile;
-	}
-
-	/**
-	 * @return Returns the libName.
-	 */
-	public String getLibName() {
-		return libName;
-	}
-
-	/**
-	 * 
-	 * @return Full path of library.xmi
-	 */
-	public String getLibraryFile() {
-		return getParentFolder() + File.separator + libraryFile;
-	}
-
-	/**
-	 * @param libName
-	 *            The libName to set.
-	 */
-	public void setLibName(String libName) {
-		this.libName = libName;
-	}
-
-	/**
-	 * @return Returns the parentFolder.
-	 */
-	public String getParentFolder() {
-		return parentFolder;
-	}
-
-	/**
-	 * @param parentFolder
-	 *            The parentFolder to set.
-	 */
-	public void setParentFolder(String parentFolder) {
-		this.parentFolder = parentFolder;
-	}
-
-	/**
-	 * @return Returns the libBriefDescription.
-	 */
-	public String getLibBriefDescription() {
-		return libBriefDescription;
-	}
-
-	/**
-	 * @param libBriefDescription
-	 *            The libBriefDescription to set.
-	 */
-	public void setLibBriefDescription(String libBriefDescription) {
-		this.libBriefDescription = libBriefDescription;
-	}
-
-	/**
-	 * @return Returns the defLibDirChecked.
-	 */
-	public boolean isDefLibDirChecked() {
-		return defLibDirChecked;
-	}
-
-	/**
-	 * @param defLibDirChecked
-	 *            The defLibDirChecked to set.
-	 */
-	public void setDefLibDirChecked(boolean defLibDirChecked) {
-		this.defLibDirChecked = defLibDirChecked;
-	}
-
-	/**
-	 * @return Returns the defaultLibDir.
-	 */
-	public String getDefaultLibDir() {
-		return defaultLibDir;
-	}
-
-	/**
-	 * @param defaultLibDir
-	 *            The defaultLibDir to set.
-	 */
-	public void setDefaultLibDir(String defaultLibDir) {
-		this.defaultLibDir = defaultLibDir;
-	}
-
-	/**
-	 * Loads preferences from the store
-	 *
-	 */
-	public void loadFromPreferenceStore() {
-		IPreferenceStore store = LibraryPlugin.getDefault()
-				.getPreferenceStore();
-
-		String lastDir = store
-				.getString(LibraryPreferenceConstants.PREF_LAST_LIBRARY_PARENT_DIRECTORY);
-		this.setParentFolder(lastDir);
-		// System.out.println("DEBUG: last_dir= " + lastDir);
-
-		boolean lastChecked = store
-				.getBoolean(LibraryPreferenceConstants.PREF_LAST_DEFAULT_DIRECTORY_CHECKED);
-		// the contains method does not seem to work so use last dir as an
-		// approximation
-		// if
-		// (store.contains(LibaryPreferenceConstants.PREF_LAST_DEFAULT_DIRECTORY_CHECKED))
-		if (lastDir == null || lastDir.trim().length() == 0)
-			this.setDefLibDirChecked(true);
-		else
-			this.setDefLibDirChecked(lastChecked);
-		// System.out.println("DEBUG: last_checked = " + lastChecked);
-
-		String defLibPPath = store
-				.getString(LibraryPreferenceConstants.PREF_DEFAULT_LIBRARY_PARENT_DIRECTORY);
-		if (defLibPPath == null || defLibPPath.length() == 0)
-			defLibPPath = System.getProperty("user.home") + //$NON-NLS-1$
-					FileUtil.FILE_SEP + LibraryUIPreferences.getApplicationShortName() + 
-					FileUtil.FILE_SEP + "Method Libraries"; //$NON-NLS-1$
-		this.setDefaultLibDir(defLibPPath);
-	}
-
-	/**
-	 * Saves dialog choices to the preference store
-	 *
-	 */
-	public void saveToPreferenceStore() {
-		IPreferenceStore store = LibraryPlugin.getDefault()
-				.getPreferenceStore();
-		File file = new File(this.getParentFolder());
-		LibraryUIPreferences.setSavedLibraryPath(file.getAbsolutePath());
-		store.setValue(
-				LibraryPreferenceConstants.PREF_LAST_LIBRARY_PARENT_DIRECTORY,
-				file.getParent());
-		store.setValue(
-				LibraryPreferenceConstants.PREF_LAST_DEFAULT_DIRECTORY_CHECKED,
-				this.isDefLibDirChecked());
-
-		LibraryPlugin.getDefault().savePluginPreferences();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/LibraryPrefPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/LibraryPrefPage.java
deleted file mode 100755
index cb52e04..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/LibraryPrefPage.java
+++ /dev/null
@@ -1,414 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.preferences;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.epf.library.prefs.LibraryPreferenceConstants;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-/**
- * Library options preference page
- * 
- * @author BingXue Xu
- * @since 1.0
- */
-public class LibraryPrefPage extends PreferencePage implements
-		IWorkbenchPreferencePage, SelectionListener, ModifyListener {
-
-	Composite composite_tab;
-
-	Text ctrl_libParentPath;
-
-	Button ctrl_browseButton;
-
-	String defLibPPath = "/"; //$NON-NLS-1$
-
-	private Button bakCheckbox;
-
-	private Button discardUnresolvedRefCheckBox;
-	
-	Text ctrl_defaultListLength;
-	
-	private final String DEFAULT_LIST_LENGTH = "10";
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-
-		// composite_tab << parent
-		composite_tab = createComposite(parent, 3);
-
-		// createLabel(composite_tab, "Choose a library save option:");
-		//
-		// radio button composite << tab composite
-		// Composite composite_radioButton = createComposite(composite_tab, 1);
-		// radioButton1 = createRadioButton(composite_radioButton, "Save as
-		// multiple folders");
-		// radioButton2 = createRadioButton(composite_radioButton, "Save as a
-		// single file");
-
-		createLabel(composite_tab, " ", 3); //$NON-NLS-1$
-		createLabel(composite_tab, AuthoringUIResources.chooseDefaultDirectory_text, 3); 
-
-		// Directory Path
-		createLabel(composite_tab, AuthoringUIResources.directory_text, 1); 
-
-		ctrl_libParentPath = new Text(composite_tab, SWT.BORDER);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING
-					| GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-			gridData.widthHint = 400;
-			ctrl_libParentPath.setLayoutData(gridData);
-		}
-
-		ctrl_libParentPath.setText(defLibPPath);
-
-		ctrl_browseButton = new Button(composite_tab, SWT.NONE);
-		ctrl_browseButton.setText(AuthoringUIText.BROWSE_BUTTON_TEXT);
-		{
-			GridData gridData = new GridData(GridData.END
-					| GridData.GRAB_HORIZONTAL);
-			ctrl_browseButton.setLayoutData(gridData);
-		}
-
-		createLabel(composite_tab, " ", 3); //$NON-NLS-1$
-
-		createLine(composite_tab, 3);
-		createLabel(composite_tab, " ", 3); //$NON-NLS-1$
-		// backup before save check box
-		//
-		createLabel(composite_tab, " ", 1); //$NON-NLS-1$
-		bakCheckbox = new Button(composite_tab, SWT.CHECK);
-		bakCheckbox.setText(AuthoringUIResources.backupbeforesave_text); 
-		createLabel(composite_tab, " ", 1); //$NON-NLS-1$
-
-		// 'discard unresolved references' check box
-		createLabel(composite_tab, " ", 1); //$NON-NLS-1$
-		discardUnresolvedRefCheckBox = new Button(composite_tab, SWT.CHECK);
-		discardUnresolvedRefCheckBox.setText(AuthoringUIResources.discardunresolvedref); 
-		createLabel(composite_tab, " ", 1); //$NON-NLS-1$
-
-		createLabel(composite_tab, " ", 3); //$NON-NLS-1$
-		createLine(composite_tab, 3);
-		
-		Composite composite_tab_size = createComposite(composite_tab, 3);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING
-					| GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-			gridData.horizontalSpan=3;
-			composite_tab_size.setLayoutData(gridData);
-		}
-		createLabel(composite_tab_size, AuthoringUIResources.default_list_length_label, 1); 
-		ctrl_defaultListLength = new Text(composite_tab_size, SWT.BORDER);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING
-					| GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-			gridData.horizontalSpan=2;
-			ctrl_defaultListLength.setLayoutData(gridData);
-		}
-		createLine(composite_tab, 3);
-
-		initializeValues();
-
-		ctrl_browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				openDirectoryDialog();
-			}
-		});
-
-		// font = null;
-		return new Composite(parent, SWT.NULL);
-	}
-
-	private void openDirectoryDialog() {
-		try {
-			DirectoryDialog dd = new DirectoryDialog(composite_tab.getShell(),
-					SWT.NONE);
-
-			String destination = dd.open();
-			if (destination != null) {
-				ctrl_libParentPath.setText(destination);
-			}
-
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-	}
-
-	private Composite createComposite(Composite parent, int numColumns) {
-
-		Composite composite = new Composite(parent, SWT.NULL);
-
-		// GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		composite.setLayout(layout);
-
-		// GridData
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		composite.setLayoutData(data);
-
-		return composite;
-	}
-
-	private Label createLabel(Composite parent, String text, int span) {
-		Label label = new Label(parent, SWT.LEFT);
-		label.setText(text);
-		GridData data = new GridData();
-		data.horizontalSpan = span;
-		data.horizontalAlignment = GridData.FILL;
-		label.setLayoutData(data);
-		return label;
-	}
-
-	// private Button createRadioButton(Composite parent, String label) {
-	// Button button = new Button(parent, SWT.RADIO | SWT.LEFT);
-	// button.setText(label);
-	// button.addSelectionListener(this);
-	// GridData data = new GridData();
-	// button.setLayoutData(data);
-	// return button;
-	// }
-
-	private void createLine(Composite parent, int ncol) {
-		Label line = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL
-				| SWT.BOLD);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = ncol;
-		line.setLayoutData(gridData);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore()
-	 */
-	protected IPreferenceStore doGetPreferenceStore() {
-
-		return LibraryPlugin.getDefault().getPreferenceStore();
-		// return PlatformUI.getWorkbench().getPreferenceStore();
-
-	}
-
-	/**
-	 * Initializes states of the controls using default values in the preference
-	 * store.
-	 */
-	private void initializeDefaults() {
-		IPreferenceStore store = getPreferenceStore();
-
-		defLibPPath = store
-				.getDefaultString(LibraryPreferenceConstants.PREF_DEFAULT_LIBRARY_PARENT_DIRECTORY);
-		if (defLibPPath == null || defLibPPath.length() == 0)
-			defLibPPath = System.getProperty("user.home") + //$NON-NLS-1$
-//					FileUtil.FILE_SEP + LibraryUIManager.getAppName() + //$NON-NLS-1$
-					FileUtil.FILE_SEP + LibraryUIPreferences.getApplicationShortName() + 
-					FileUtil.FILE_SEP + "Method Libraries"; //$NON-NLS-1$
-		// System.out.println("DEBUG: default defLibPPath = " +
-		// defLibPPath);
-		ctrl_libParentPath.setText(defLibPPath);
-
-		// radioButton1.setSelection(false);
-		// radioButton2.setSelection(false);
-		// int choice =
-		// store.getDefaultInt(LibaryPreferenceConstants.PRE_RADIO_SAVE_CHOICE);
-		// switch (choice) {
-		// case 1:
-		// radioButton1.setSelection(true);
-		// break;
-		// case 2:
-		// radioButton2.setSelection(true);
-		// break;
-		// default:
-		// radioButton1.setSelection(true);
-		// break;
-		// }
-
-		bakCheckbox
-				.setSelection(store
-						.getDefaultBoolean(LibraryPreferenceConstants.PREF_BACK_UP_BEFORE_SAVE));
-		discardUnresolvedRefCheckBox
-				.setSelection(store
-						.getDefaultBoolean(LibraryPreferenceConstants.PREF_DISCARD_UNRESOLVED_REFERENCES));
-		
-		String listLength = store
-		.getString(LibraryPreferenceConstants.PREF_DEFAULT_HISTORY_SIZE);
-		if(listLength==null || listLength.length()<=0)
-			listLength = DEFAULT_LIST_LENGTH;
-		
-		ctrl_defaultListLength.setText(listLength);
-	}
-	
-	private boolean isDigitStr(String str){
-	     Pattern pattern = Pattern.compile("[0-9]+"); 
-	     Matcher matcher = pattern.matcher((CharSequence)str); 
-	     return matcher.matches(); 
-
-	}
-
-	/**
-	 * Initializes states of the controls from the preference store.
-	 */
-	private void initializeValues() {
-		IPreferenceStore store = getPreferenceStore();
-		defLibPPath = store
-				.getString(LibraryPreferenceConstants.PREF_DEFAULT_LIBRARY_PARENT_DIRECTORY);
-		if (defLibPPath == null || defLibPPath.length() == 0)
-			defLibPPath = System.getProperty("user.home") + //$NON-NLS-1$
-//					FileUtil.FILE_SEP + LibraryUIManager.getAppName() + //$NON-NLS-1$
-					FileUtil.FILE_SEP + LibraryUIPreferences.getApplicationShortName() + 
-					FileUtil.FILE_SEP + "Method Libraries"; //$NON-NLS-1$ 
-		// System.out.println("DEBUG: read defLibPPath = " + defLibPPath);
-		ctrl_libParentPath.setText(defLibPPath);
-
-		// int choice =
-		// store.getInt(LibaryPreferenceConstants.PRE_RADIO_SAVE_CHOICE);
-		// switch (choice) {
-		// case 1:
-		// radioButton1.setSelection(true);
-		// break;
-		// case 2:
-		// radioButton2.setSelection(true);
-		// break;
-		// default:
-		// radioButton1.setSelection(true);
-		// break;
-		// }
-
-		bakCheckbox
-				.setSelection(store
-						.getBoolean(LibraryPreferenceConstants.PREF_BACK_UP_BEFORE_SAVE));
-		discardUnresolvedRefCheckBox
-				.setSelection(store
-						.getBoolean(LibraryPreferenceConstants.PREF_DISCARD_UNRESOLVED_REFERENCES));
-		
-		String listLength = store
-		.getString(LibraryPreferenceConstants.PREF_DEFAULT_HISTORY_SIZE);
-		if(listLength==null || listLength.length()<=0)
-			listLength = DEFAULT_LIST_LENGTH;
-		ctrl_defaultListLength.setText(listLength);
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on PreferencePage
-	 */
-	protected void performDefaults() {
-		super.performDefaults();
-		initializeDefaults();
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on PreferencePage
-	 */
-	public boolean performOk() {
-		storeValues();
-		LibraryPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-
-	/**
-	 * Stores the values of the controls back to the preference store.
-	 */
-	private void storeValues() {
-		IPreferenceStore store = getPreferenceStore();
-
-		defLibPPath = ctrl_libParentPath.getText().trim();
-		System.out.println("DEBUG: defLibPPath = " + defLibPPath); //$NON-NLS-1$
-		store
-				.setValue(
-						LibraryPreferenceConstants.PREF_DEFAULT_LIBRARY_PARENT_DIRECTORY,
-						defLibPPath);
-		// int choice = 1;
-		// if (radioButton2.getSelection())
-		// choice = 2;
-		//
-		// store.setValue(LibaryPreferenceConstants.PRE_RADIO_SAVE_CHOICE,
-		// choice);
-
-		store.setValue(LibraryPreferenceConstants.PREF_BACK_UP_BEFORE_SAVE,
-				bakCheckbox.getSelection());
-		store.setValue(
-				LibraryPreferenceConstants.PREF_DISCARD_UNRESOLVED_REFERENCES,
-				discardUnresolvedRefCheckBox.getSelection());
-		
-		String listLength = ctrl_defaultListLength.getText();
-		if(!isDigitStr(listLength))
-			listLength = DEFAULT_LIST_LENGTH;
-		else{
-			if(Integer.parseInt(listLength)<=0)
-				listLength = DEFAULT_LIST_LENGTH;
-		}
-		store.setValue(
-				LibraryPreferenceConstants.PREF_DEFAULT_HISTORY_SIZE, listLength);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-	public void widgetSelected(SelectionEvent e) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-	public void widgetDefaultSelected(SelectionEvent e) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-	 */
-	public void modifyText(ModifyEvent e) {
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/LibraryPreferenceConstants.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/LibraryPreferenceConstants.java
deleted file mode 100755
index 23f1c28..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/LibraryPreferenceConstants.java
+++ /dev/null
@@ -1,22 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.preferences;
-
-import org.eclipse.epf.library.prefs.PreferenceConstants;
-
-/**
- * Preference Constants for library
- * @author BingXue Xu
- * @since 1.0
- */
-public interface LibraryPreferenceConstants extends PreferenceConstants {
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/LibraryPreferenceInitializer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/LibraryPreferenceInitializer.java
deleted file mode 100755
index 395679b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/LibraryPreferenceInitializer.java
+++ /dev/null
@@ -1,43 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.epf.library.prefs.LibraryPreferenceConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-
-/**
- * Initializer for library preferences
- * 
- * @author BingXue Xu
- * @since 1.0
- */
-public class LibraryPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/**
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		// These settings will show up when the Library preference page
-		// is shown for the first time.
-
-		IPreferenceStore store = LibraryPlugin.getDefault()
-				.getPreferenceStore();
-		// IPreferenceStore store =
-		// PlatformUI.getWorkbench().getPreferenceStore();
-		store.setDefault(LibraryPreferenceConstants.PREF_RADIO_SAVE_CHOICE, 1);
-		store.setDefault(LibraryPreferenceConstants.PREF_BACK_UP_BEFORE_SAVE,
-				false);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/ModelingOptionsPrefPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/ModelingOptionsPrefPage.java
deleted file mode 100755
index 0ec4d75..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/ModelingOptionsPrefPage.java
+++ /dev/null
@@ -1,164 +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.authoring.ui.preferences;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.epf.library.configuration.ElementRealizer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-/**
- * Preference page for modeling options
- * 
- * @author Shilpa Toraskar
- * @since 1.2
- * 
- */
-public class ModelingOptionsPrefPage extends CommonPrefPage implements
-		IWorkbenchPreferencePage {
-
-	int NUM_COLUMN = 1;
-
-	private Composite composite_tab;
-
-	private Button extendSemanticsCheck;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-
-		// composite_tab << parent
-		composite_tab = createComposite(parent, NUM_COLUMN);
-
-		createLabel(composite_tab, " ", NUM_COLUMN); //$NON-NLS-1$
-
-		extendSemanticsCheck = new Button(composite_tab, SWT.CHECK);
-		extendSemanticsCheck.setText(AuthoringUIResources.extend_semantics_button_text);
-
-		
-		Label label = new Label(composite_tab, SWT.LEFT| SWT.WRAP);
-		label.setText(AuthoringUIResources.extend_semantics_text);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		label.setLayoutData(data);
-
-		createLabel(composite_tab, " ", NUM_COLUMN); //$NON-NLS-1$
-		createLine(composite_tab, NUM_COLUMN);
-
-		initializeValues();
-
-		return composite_tab;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-		// this.workbench = workbench;
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on PreferencePage
-	 */
-	protected void performDefaults() {
-		super.performDefaults();
-		initializeDefaults();
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on PreferencePage
-	 */
-	public boolean performOk() {
-		storeValues();
-		LibraryPlugin.getDefault().savePluginPreferences();
-
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.preferences.CommonPrefPage#doGetPreferenceStore()
-	 */
-	protected IPreferenceStore doGetPreferenceStore() {
-
-		return LibraryPlugin.getDefault().getPreferenceStore();
-
-	}
-
-	/**
-	 * Stores the values of the controls back to the preference store.
-	 */
-	private void storeValues() {
-		IPreferenceStore store = getPreferenceStore();
-
-		boolean value = extendSemanticsCheck.getSelection();
-		store.setValue(LibraryPreferenceConstants.PREF_EXTEND_SEMANTICS_CHECK,
-				value);
-		
-		// set this as well
-		ElementRealizer.setIgnoreBaseToManyAssociations(value);
-	}
-
-	/**
-	 * Initializes states of the controls using default values in the preference
-	 * store.
-	 */
-	private void initializeDefaults() {
-		IPreferenceStore store = getPreferenceStore();
-
-		extendSemanticsCheck
-				.setSelection(store
-						.getDefaultBoolean(LibraryPreferenceConstants.PREF_EXTEND_SEMANTICS_CHECK));
-	}
-
-	/**
-	 * Initializes states of the controls from the preference store.
-	 */
-	private void initializeValues() {
-		IPreferenceStore store = getPreferenceStore();
-		extendSemanticsCheck
-				.setSelection(store
-						.getBoolean(LibraryPreferenceConstants.PREF_EXTEND_SEMANTICS_CHECK));
-	}
-
-	private Composite createComposite(Composite parent, int numColumns) {
-
-		Composite composite = new Composite(parent, SWT.NULL);
-
-		// GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		layout.marginHeight = layout.marginWidth = 0;
-		composite.setLayout(layout);
-
-		// GridData
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		composite.setLayoutData(data);
-
-		return composite;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/ProcessEditorPreferencePage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/ProcessEditorPreferencePage.java
deleted file mode 100755
index 0f4a2ea..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/ProcessEditorPreferencePage.java
+++ /dev/null
@@ -1,675 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.preferences;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.editors.ColumnDescriptor;
-import org.eclipse.epf.authoring.ui.editors.ProcessEditor;
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-
-/**
- * Preference page for ProcessEditor
- * 
- * @author Phong Nguyen Le
- * @author Shilpa Toraskar
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ProcessEditorPreferencePage extends PreferencePage implements
-		IWorkbenchPreferencePage, SelectionListener, ModifyListener {
-
-	// private Text lineWidthText;
-	// private Button indentCheckbox;
-	// private Text indentSizeText;
-	// private Combo bsCombo;
-	private static final String WBS_TXT = AuthoringUIResources.ProcessEditor_WorkBreakdownStructure; 
-
-	private static final String TBS_TXT = AuthoringUIResources.ProcessEditor_TeamAllocation; 
-
-	private static final String WPBS_TXT = AuthoringUIResources.ProcessEditor_WorkProductUsage; 
-
-	private ListViewer selectedColumnListViewer;
-
-	// private ListViewer tbsSelectedColList;
-	// private ListViewer wpbsSelectedColList;
-	private java.util.List wbsColumnDescriptors;
-
-	private java.util.List tbsColumnDescriptors;
-
-	private java.util.List wpbsColumnDescriptors;
-
-	private Button addButton;
-
-	private Button removeButton;
-
-	private Button downButton;
-
-	private Button upButton;
-
-	private static final String[] BS_NAMES = new String[] { WBS_TXT, TBS_TXT,
-			WPBS_TXT };
-
-	private List[] columnDescriptorLists;
-
-	private static final List[] ALL_COLUMN_DESCRIPTOR_LISTS = new List[] {
-			ProcessEditor.ALL_WBS_COLUMNS, ProcessEditor.ALL_TBS_COLUMNS,
-			ProcessEditor.ALL_WPBS_COLUMNS };
-
-	// configuration switching preference
-	private Button configSwitchAlwaysButton;
-
-	private Button configSwitchNeverButton;
-
-	private Button configSwitchPromptButton;
-
-	private Button inheritSuppressionButton;
-
-	private static class ColumnDescriptorProvider implements
-			ITreeContentProvider, ILabelProvider {
-
-		public ColumnDescriptorProvider() {
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-		 */
-		public Object[] getChildren(Object parentElement) {
-			return null;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-		 */
-		public Object getParent(Object element) {
-			return null;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-		 */
-		public boolean hasChildren(Object element) {
-			return false;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			return ((java.util.List) inputElement).toArray();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-		 */
-		public void dispose() {
-
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
-		 *      java.lang.Object, java.lang.Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-		 */
-		public Image getImage(Object element) {
-			return null;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-		 */
-		public String getText(Object element) {
-			return ((ColumnDescriptor) element).label;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-		 */
-		public void addListener(ILabelProviderListener listener) {
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
-		 *      java.lang.String)
-		 */
-		public boolean isLabelProperty(Object element, String property) {
-			return false;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-		 */
-		public void removeListener(ILabelProviderListener listener) {
-		}
-
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore()
-	 */
-	protected IPreferenceStore doGetPreferenceStore() {
-		return AuthoringUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		initData();
-
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(1, false));
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Composite columnsComposite = new Composite(composite, SWT.NONE);
-		columnsComposite.setLayout(new GridLayout(1, false));
-		columnsComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label label = new Label(columnsComposite, SWT.NONE);
-		label.setText(AuthoringUIResources.columnselection_text); 
-
-		final Combo bsCombo = new Combo(columnsComposite, SWT.READ_ONLY
-				| SWT.BORDER);
-		bsCombo.setItems(BS_NAMES);
-		bsCombo.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				Combo combo = (Combo) e.getSource();
-				int id = combo.getSelectionIndex();
-				if (id != -1) {
-					selectedColumnListViewer
-							.setInput(columnDescriptorLists[id]);
-				}
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-
-			}
-
-		});
-		bsCombo.select(0);
-
-		// CTabFolder tabFolder = new CTabFolder(columnsComposite, SWT.TOP |
-		// SWT.BORDER);
-		Composite listComposite = new Composite(composite, SWT.NONE);
-		listComposite.setLayout(new GridLayout(2, false));
-		listComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		selectedColumnListViewer = new ListViewer(listComposite, SWT.MULTI
-				| SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-		final ColumnDescriptorProvider itemProvider = new ColumnDescriptorProvider();
-		selectedColumnListViewer.setContentProvider(itemProvider);
-		selectedColumnListViewer.setLabelProvider(itemProvider);
-		selectedColumnListViewer.setInput(wbsColumnDescriptors);
-		selectedColumnListViewer.addSelectionChangedListener(new ISelectionChangedListener(){
-
-			public void selectionChanged(SelectionChangedEvent event) {
-				List removeList = ((IStructuredSelection) selectedColumnListViewer
-						.getSelection()).toList();
-				if (removeList.contains(ProcessEditor.COL_DESC_ID)
-						|| removeList
-								.contains(ProcessEditor.COL_DESC_PRESENTATION_NAME)) {
-					// if present name or id selected, 
-					// disable "remove","up" and "down" button
-					//
-					if(removeButton.isEnabled()) removeButton.setEnabled(false);
-					if(upButton.isEnabled()) upButton.setEnabled(false);
-					if(downButton.isEnabled()) downButton.setEnabled(false);
-				} else {
-					if(!removeButton.isEnabled()) removeButton.setEnabled(true);
-					if(!upButton.isEnabled()) upButton.setEnabled(true);
-					if(!downButton.isEnabled()) downButton.setEnabled(true);
-				}
-			}
-			
-		});
-
-		// wbsSelectedColumnsTable.setItems(new String[] {
-		// IBSItemProvider.COL_ID,
-		// IBSItemProvider.COL_IS_EVENT_DRIVEN,
-		// IBSItemProvider.COL_IS_ONGOING,
-		// IBSItemProvider.COL_IS_REPEATABLE,
-		// IBSItemProvider.COL_MODEL_INFO,
-		// IBSItemProvider.COL_NAME,
-		// IBSItemProvider.COL_PREDECESSORS,
-		// IBSItemProvider.COL_PREFIX,
-		// IBSItemProvider.COL_TYPE,
-		// });
-
-		// CTabItem tabItem = new CTabItem(tabFolder, SWT.NONE);
-		// tabItem.setText("Work Breakdown Structure");
-		// tabItem.setControl(wbsSelectedColumnsTable.getControl());
-
-		// tbsSelectedColList = new ListViewer(columnsComposite, SWT.CHECK |
-		// SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-		// tbsSelectedColList.setContentProvider(itemProvider);
-		// tbsSelectedColList.setLabelProvider(itemProvider);
-		// tbsSelectedColList.setInput(tbsColumnDescriptors);
-		// tbsSelectedColList.setItems(new String[] {
-		// IBSItemProvider.COL_ID,
-		// IBSItemProvider.COL_MODEL_INFO,
-		// IBSItemProvider.COL_NAME,
-		// IBSItemProvider.COL_PREFIX,
-		// IBSItemProvider.COL_TYPE,
-		// });
-		// tabItem = new CTabItem(tabFolder, SWT.NONE);
-		// tabItem.setText("Team Breakdown Structure");
-		// tabItem.setControl(tbsSelectedColList.getControl());
-
-		// wpbsSelectedColList = new ListViewer(columnsComposite, SWT.CHECK |
-		// SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-		// wpbsSelectedColList.setContentProvider(itemProvider);
-		// wpbsSelectedColList.setLabelProvider(itemProvider);
-		// wpbsSelectedColList.setInput(wpbsColumnDescriptors);
-		// tabItem = new CTabItem(tabFolder, SWT.NONE);
-		// tabItem.setText("Work Product Breakdown Structure");
-		// tabItem.setControl(wpbsSelectedColList.getControl());
-
-		Composite buttonsComposite = new Composite(listComposite, SWT.NONE);
-		GridLayout layout = new GridLayout(1, false);
-		// layout.marginLeft = 4;
-		// layout.marginRight = 4;
-		buttonsComposite.setLayout(layout);
-		GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, false, false);
-		gridData.widthHint = 80;
-		buttonsComposite.setLayoutData(gridData);
-
-		GridData layoutData = new GridData(GridData.FILL_HORIZONTAL);
-
-		addButton = new Button(buttonsComposite, SWT.NONE);
-		addButton.setText(AuthoringUIText.ADD_BUTTON_TEXT);
-		addButton.setLayoutData(layoutData);
-		addButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				int id = bsCombo.getSelectionIndex();
-				Object input = ALL_COLUMN_DESCRIPTOR_LISTS[id];
-				final List selectedColumns = columnDescriptorLists[id];
-				ListSelectionDialog dlg = new ListSelectionDialog(
-						Display.getCurrent().getActiveShell(),
-						input,
-						itemProvider,
-						itemProvider,
-						AuthoringUIResources.selectColumnstoAdd_text) { 
-					protected Control createDialogArea(Composite parent) {
-						Control control = super.createDialogArea(parent);
-						getViewer().addFilter(new ViewerFilter() {
-
-							public boolean select(Viewer viewer,
-									Object parentElement, Object element) {
-								return !selectedColumns.contains(element);
-							}
-
-						});
-						return control;
-					}
-
-				};
-				if (dlg.open() == Window.OK) {
-					selectedColumns.addAll(Arrays.asList(dlg.getResult()));
-					selectedColumnListViewer.refresh();
-				}
-
-			}
-		});
-
-		removeButton = new Button(buttonsComposite, SWT.NONE);
-		removeButton.setText(AuthoringUIResources.removeButton_text); 
-		removeButton.setLayoutData(layoutData);
-		removeButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				java.util.List columns = (java.util.List) selectedColumnListViewer
-						.getInput();
-				List removeList = ((IStructuredSelection) selectedColumnListViewer
-						.getSelection()).toList();
-				if (removeList.contains(ProcessEditor.COL_DESC_ID)
-						|| removeList
-								.contains(ProcessEditor.COL_DESC_PRESENTATION_NAME)) {
-					// cannot remove name or ID column
-					//
-					return;
-				}
-				columns.removeAll(removeList);
-				selectedColumnListViewer.refresh();
-			}
-
-		});
-
-		upButton = new Button(buttonsComposite, SWT.NONE);
-		upButton.setText(AuthoringUIText.UP_BUTTON_TEXT);
-		upButton.setLayoutData(layoutData);
-		upButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) selectedColumnListViewer
-						.getSelection();
-				if (selection.size() > 1)
-					return;
-				EList columns = (EList) selectedColumnListViewer.getInput();
-				Object selected = selection.getFirstElement();
-				int id = columns.indexOf(selected);
-				if (bsCombo.getSelectionIndex() == 0 && id < 3)
-					return;
-				if (bsCombo.getSelectionIndex() > 0 && id < 2)
-					return;
-				columns.move(id - 1, id);
-				selectedColumnListViewer.refresh();
-				selectedColumnListViewer.setSelection(new StructuredSelection(
-						selected), true);
-			}
-
-		});
-
-		downButton = new Button(buttonsComposite, SWT.NONE);
-		downButton.setText(AuthoringUIText.DOWN_BUTTON_TEXT);
-		downButton.setLayoutData(layoutData);
-		downButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) selectedColumnListViewer
-						.getSelection();
-				if (selection.size() > 1)
-					return;
-				EList columns = (EList) selectedColumnListViewer.getInput();
-				Object selected = selection.getFirstElement();
-				int id = columns.indexOf(selected);
-				
-				if (id == columns.size() - 1 || (bsCombo.getSelectionIndex() == 0 && id < 2))
-					return;
-				if (id == columns.size() - 1 || (bsCombo.getSelectionIndex() > 0 && id < 1))
-					return;
-				columns.move(id + 1, id);
-				selectedColumnListViewer.refresh();
-				selectedColumnListViewer.setSelection(new StructuredSelection(
-						selected), true);
-			}
-
-		});
-
-		Group configSwitchGroup = new Group(composite, SWT.SHADOW_OUT);
-		configSwitchGroup.setLayout(new GridLayout(3, false));
-		configSwitchGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		configSwitchGroup
-				.setText(AuthoringUIResources.ProcessEditorPreferencePage_switchConfiguration); 
-
-		configSwitchAlwaysButton = new Button(configSwitchGroup, SWT.RADIO);
-		configSwitchAlwaysButton.setText(LibraryUIResources.alwaysButton_text);
-		configSwitchNeverButton = new Button(configSwitchGroup, SWT.RADIO);
-		configSwitchNeverButton.setText(LibraryUIResources.neverButton_text);
-		configSwitchPromptButton = new Button(configSwitchGroup, SWT.RADIO);
-		configSwitchPromptButton.setText(LibraryUIResources.promptButton_text);
-
-		setSwitchConfigButton(LibraryUIPreferences.getSwitchConfig());
-
-		// inherit suppression states
-		Group suppressionGroup = new Group(composite, SWT.SHADOW_OUT);
-		suppressionGroup.setLayout(new GridLayout());
-		suppressionGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		suppressionGroup
-				.setText(AuthoringUIResources.ProcessEditorPreferencePage_suppressionGroupTitle); 
-
-		inheritSuppressionButton = new Button(suppressionGroup, SWT.CHECK);
-		inheritSuppressionButton
-				.setText(AuthoringUIResources.ProcessEditorPreferencePage_inheritSuppressionState); 
-
-		inheritSuppressionButton.setSelection(getPreferenceStore().getBoolean(
-				ApplicationPreferenceConstants.PREF_INHERIT_SUPPRESSION_STATE));
-		return composite;
-	}
-
-	/**
-	 * Loads data from preference store
-	 */
-	private void initData() {
-		IPreferenceStore store = getPreferenceStore();
-
-		String str = store
-				.getString(ApplicationPreferenceConstants.PREF_WBS_COLUMNS);
-		if (str == null) {
-			str = store
-					.getDefaultString(ApplicationPreferenceConstants.PREF_WBS_COLUMNS);
-		}
-		wbsColumnDescriptors = ProcessEditor.toColumnDescriptorList(str);
-
-		str = store.getString(ApplicationPreferenceConstants.PREF_TBS_COLUMNS);
-		if (str == null) {
-			str = store
-					.getDefaultString(ApplicationPreferenceConstants.PREF_TBS_COLUMNS);
-		}
-		tbsColumnDescriptors = ProcessEditor.toColumnDescriptorList(str);
-
-		str = store.getString(ApplicationPreferenceConstants.PREF_WPBS_COLUMNS);
-		if (str == null) {
-			str = store
-					.getDefaultString(ApplicationPreferenceConstants.PREF_WPBS_COLUMNS);
-		}
-		wpbsColumnDescriptors = ProcessEditor.toColumnDescriptorList(str);
-
-		// load and set to the default if nothing in the store
-		// 154758 - Processes: WBS is blank as default preference is not set for the first time
-		if ( wbsColumnDescriptors.size() == 0 ) {
-			wbsColumnDescriptors.addAll(ProcessEditor.DEFAULT_WBS_COLUMNS);
-			store.setValue(ApplicationPreferenceConstants.PREF_WBS_COLUMNS,
-					toString(wbsColumnDescriptors));
-		
-		}
-		
-		if ( tbsColumnDescriptors.size() == 0 ) {
-			tbsColumnDescriptors.addAll(ProcessEditor.DEFAULT_TBS_COLUMNS);
-			store.setValue(ApplicationPreferenceConstants.PREF_TBS_COLUMNS,
-					toString(tbsColumnDescriptors));
-		}
-		
-		if ( wpbsColumnDescriptors.size() == 0 ) {
-			wpbsColumnDescriptors.addAll(ProcessEditor.DEFAULT_WPBS_COLUMNS);
-			store.setValue(ApplicationPreferenceConstants.PREF_WPBS_COLUMNS,
-					toString(wpbsColumnDescriptors));
-		}
-		
-		columnDescriptorLists = new List[] { wbsColumnDescriptors,
-				tbsColumnDescriptors, wpbsColumnDescriptors };
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.PreferencePage.performDefaults
-	 */
-	protected void performDefaults() {
-		super.performDefaults();
-
-		wbsColumnDescriptors.clear();
-		wbsColumnDescriptors.addAll(ProcessEditor.DEFAULT_WBS_COLUMNS);
-
-		tbsColumnDescriptors.clear();
-		tbsColumnDescriptors.addAll(ProcessEditor.DEFAULT_TBS_COLUMNS);
-
-		wpbsColumnDescriptors.clear();
-		wpbsColumnDescriptors.addAll(ProcessEditor.DEFAULT_WPBS_COLUMNS);
-
-		inheritSuppressionButton
-				.setSelection(getPreferenceStore()
-						.getDefaultBoolean(
-								ApplicationPreferenceConstants.PREF_INHERIT_SUPPRESSION_STATE));
-
-		setSwitchConfigButton(MessageDialogWithToggle.PROMPT);
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.PreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		IPreferenceStore store = getPreferenceStore();
-
-		store.setValue(ApplicationPreferenceConstants.PREF_WBS_COLUMNS,
-				toString(wbsColumnDescriptors));
-		store.setValue(ApplicationPreferenceConstants.PREF_TBS_COLUMNS,
-				toString(tbsColumnDescriptors));
-		store.setValue(ApplicationPreferenceConstants.PREF_WPBS_COLUMNS,
-				toString(wpbsColumnDescriptors));
-		store.setValue(
-				ApplicationPreferenceConstants.PREF_INHERIT_SUPPRESSION_STATE,
-				inheritSuppressionButton.getSelection());
-		// switch config preference is in library.ui
-		LibraryUIPreferences.setSwitchConfig(getSwitchConfigValue());
-
-		return true;
-	}
-
-	/**
-	 * Converts given list into string representation
-	 * @param columnDescriptors
-	 * @return 
-	 * 			String representation of the given list
-	 */
-	public static String toString(java.util.List columnDescriptors) {
-		StringBuffer strBuf = new StringBuffer();
-		int max = columnDescriptors.size() - 1;
-		for (int i = 0; i < max; i++) {
-			strBuf.append(((ColumnDescriptor) columnDescriptors.get(i)).id)
-					.append(',');
-		}
-		strBuf.append(((ColumnDescriptor) columnDescriptors.get(max)).id);
-		return strBuf.toString();
-	}
-
-	/**
-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-	 */
-	public void widgetSelected(SelectionEvent e) {
-	}
-
-	/**
-	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
-	 */
-	public void widgetDefaultSelected(SelectionEvent e) {
-	}
-
-	/**
-	 * @see org.eclipse.swt.events.ModifyListener#modifyText(ModifyEvent)
-	 */
-	public void modifyText(ModifyEvent e) {
-	}
-
-	private String getSwitchConfigValue() {
-		if (configSwitchAlwaysButton.getSelection())
-			return MessageDialogWithToggle.ALWAYS;
-		if (configSwitchNeverButton.getSelection())
-			return MessageDialogWithToggle.NEVER;
-		if (configSwitchPromptButton.getSelection())
-			return MessageDialogWithToggle.PROMPT;
-
-		// return Prompt value as a default
-		return MessageDialogWithToggle.PROMPT;
-	}
-
-	private void setSwitchConfigButton(String value) {
-		if (MessageDialogWithToggle.ALWAYS.equals(value)) {
-			configSwitchAlwaysButton.setSelection(true);
-			configSwitchNeverButton.setSelection(false);
-			configSwitchPromptButton.setSelection(false);
-		} else if (MessageDialogWithToggle.NEVER.equals(value)) {
-			configSwitchAlwaysButton.setSelection(false);
-			configSwitchNeverButton.setSelection(true);
-			configSwitchPromptButton.setSelection(false);
-		} else { // MessageDialogWithToggle.PROMPT
-			configSwitchAlwaysButton.setSelection(false);
-			configSwitchNeverButton.setSelection(false);
-			configSwitchPromptButton.setSelection(true);
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#getPreferenceStore()
-	 */
-	public IPreferenceStore getPreferenceStore() {
-		
-		// change to use LibraryPlugin store
-		// we need to share the preference in Library browsing and publishing
-		// Jinhua Xi 08/19/2006
-		return LibraryPlugin.getDefault().getPreferenceStore();
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/RootPrefPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/RootPrefPage.java
deleted file mode 100755
index b569994..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/RootPrefPage.java
+++ /dev/null
@@ -1,143 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.preferences;
-
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-/**
- * Root preference page
- * 
- * @author Bingxue Xu
- * @since 1.0
- */
-public class RootPrefPage extends PreferencePage implements
-		IWorkbenchPreferencePage {
-
-	private Composite composite_tab;
-
-	// private IWorkbench workbench;
-
-	// Disableing enable process contribution preference for now.
-	// private Button enableProcessContribution;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-
-		// composite_tab << parent
-		composite_tab = createComposite(parent, 3);
-
-		// enableProcessContribution = new Button(composite_tab, SWT.CHECK);
-		// enableProcessContribution.setText(AuthoringUIResources.getString("AuthoringUI.RootPrefPage.enableprocesscontribution.text"));
-		// //$NON-NLS-1$
-
-		initializeValues();
-
-		// font = null;
-		return composite_tab;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-		// this.workbench = workbench;
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on PreferencePage
-	 */
-	protected void performDefaults() {
-		super.performDefaults();
-		initializeDefaults();
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on PreferencePage
-	 */
-	public boolean performOk() {
-		storeValues();
-		LibraryPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore()
-	 */
-	protected IPreferenceStore doGetPreferenceStore() {
-		return LibraryPlugin.getDefault().getPreferenceStore();
-	}
-
-	/**
-	 * Stores the values of the controls back to the preference store.
-	 */
-	private void storeValues() {
-	}
-
-	/**
-	 * Initializes states of the controls using default values in the preference
-	 * store.
-	 */
-	private void initializeDefaults() {
-	}
-
-	/**
-	 * Initializes states of the controls from the preference store.
-	 */
-	private void initializeValues() {
-	}
-
-	private Composite createComposite(Composite parent, int numColumns) {
-
-		Composite composite = new Composite(parent, SWT.NULL);
-
-		// GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		layout.marginHeight = layout.marginWidth = 0;
-		composite.setLayout(layout);
-
-		// GridData
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		composite.setLayoutData(data);
-
-		return composite;
-	}
-
-	// private Label createLabel(Composite parent, String text, int span) {
-	// Label label = new Label(parent, SWT.LEFT);
-	// label.setText(text);
-	// GridData data = new GridData();
-	// data.horizontalSpan = span;
-	// data.horizontalAlignment = GridData.FILL;
-	// label.setLayoutData(data);
-	// return label;
-	// }
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/StartupPrefPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/StartupPrefPage.java
deleted file mode 100755
index deed176..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/StartupPrefPage.java
+++ /dev/null
@@ -1,126 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.preferences;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-/**
- * Startup preference page
- * 
- * @author Bingxue Xu
- * @since 1.0
- * 
- */
-public class StartupPrefPage extends CommonPrefPage implements
-		IWorkbenchPreferencePage, SelectionListener, ModifyListener {
-
-	Composite composite_tab;
-
-	int ncol = 3;
-
-	private Button ctrl_startupPrompt;
-
-	protected Control createContents(Composite parent) {
-
-		composite_tab = createGridComposite(parent, ncol);
-
-		createLabel(composite_tab, " ", ncol); //$NON-NLS-1$
-
-		ctrl_startupPrompt = new Button(composite_tab, SWT.CHECK);
-		ctrl_startupPrompt.setText(AuthoringUIResources.promptforlibary_text); 
-
-		createLabel(composite_tab, " ", ncol); //$NON-NLS-1$
-		createLine(composite_tab, ncol);
-
-		initializeValues();
-
-		return composite_tab;
-	}
-
-	public void init(IWorkbench workbench) {
-	}
-
-	public void widgetSelected(SelectionEvent e) {
-	}
-
-	public void widgetDefaultSelected(SelectionEvent e) {
-	}
-
-	public void modifyText(ModifyEvent e) {
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on PreferencePage
-	 */
-	protected void performDefaults() {
-		super.performDefaults();
-		initializeDefaults();
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on PreferencePage
-	 */
-	public boolean performOk() {
-		storeValues();
-		LibraryUIPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-
-	/**
-	 * Stores the values of the controls back to the preference store.
-	 */
-	private void storeValues() {
-		// IPreferenceStore store = getPreferenceStore();
-		// store.setValue(LibraryPreferenceConstants.PREF_PROMPT_FOR_LIBRARY_AT_STARTUP,
-		// ctrl_startupPrompt.getSelection());
-		LibraryUIPreferences
-				.setPromptForMethodLibraryAtStartup(ctrl_startupPrompt
-						.getSelection());
-	}
-
-	private void initializeDefaults() {
-		// IPreferenceStore store = getPreferenceStore();
-		ctrl_startupPrompt.setSelection(true);
-	}
-
-	/**
-	 * Initializes states of the controls from the preference store.
-	 */
-	private void initializeValues() {
-		// IPreferenceStore store = getPreferenceStore();
-		// ctrl_startupPrompt.setSelection(store.getBoolean(LibraryPreferenceConstants.PREF_PROMPT_FOR_LIBRARY_AT_STARTUP));
-		ctrl_startupPrompt.setSelection(LibraryUIPreferences
-				.getPromptForMethodLibraryAtStartup());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.preferences.CommonPrefPage#doGetPreferenceStore()
-	 */
-	protected IPreferenceStore doGetPreferenceStore() {
-		return LibraryUIPlugin.getDefault().getPreferenceStore();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/package.html
deleted file mode 100755
index 48b5390..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/preferences/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides preference support for the Authoring UI.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/AbstractSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/AbstractSection.java
deleted file mode 100755
index 14ebc2a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/AbstractSection.java
+++ /dev/null
@@ -1,354 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.editors.ProcessEditor;
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.configuration.ProcessAuthoringConfigurator;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.IBSItemProvider;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.events.ILibraryChangeListener;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.internal.views.properties.tabbed.view.Tab;
-import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;
-import org.eclipse.ui.views.properties.tabbed.ISection;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-/**
- * Base class for a section in a tab in the properties view.
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class AbstractSection extends AbstractPropertySection implements
-		PropertyChangeListener {
-
-	private BreakdownElement element;
-
-	protected boolean editable = false;
-
-	protected TabbedPropertySheetPage page;
-
-	protected ProcessAuthoringConfigurator configurator = new ProcessAuthoringConfigurator(
-			LibraryService.getInstance().getCurrentMethodConfiguration(),
-			null);
-
-	protected Logger logger;
-
-	/*
-	 * Create an instance
-	 */
-	public AbstractSection() {
-		super();
-
-		// listen to change for current selection of MethodConfiguration
-		ILibraryManager manager = LibraryService.getInstance().getCurrentLibraryManager();
-		if (manager != null) {
-			manager.addListener(libraryListener);
-		}
-
-		// get logger
-		logger = AuthoringUIPlugin.getDefault().getLogger();
-	}
-
-	/**
-	 * @see org.eclipse.ui.views.properties.tabbed.AbstractPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite comp, TabbedPropertySheetPage page) {
-		super.createControls(comp, page);
-		this.page = page;
-	}
-
-	private ILibraryChangeListener libraryListener = new ILibraryChangeListener() {
-
-		public void libraryChanged(int option, Collection collection) {
-			switch (option) {
-			case ILibraryChangeListener.OPTION_CHANGED: {
-				sectionRefresh();
-			}
-			}
-		}
-	};
-
-	/**
-	 * Refresh the current section
-	 * 
-	 */
-	private void sectionRefresh() {
-		if (page != null) {
-			Tab tab = page.getCurrentTab();
-			if (tab != null) {
-				ISection section = tab.getSectionAtIndex(0);
-
-				if ((section != null)
-						&& (section instanceof BreakdownElementGeneralSection)) {
-					section.refresh();
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.views.properties.tabbed.AbstractPropertySection#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		if (libraryListener != null) {
-			ILibraryManager manager = LibraryService.getInstance().getCurrentLibraryManager();
-			if (manager != null) {
-				manager.removeListener(libraryListener);
-			}
-		}
-	}
-
-
-	/**
-	 * @see org.eclipse.ui.views.properties.tabbed.AbstractPropertySection#setInput(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void setInput(IWorkbenchPart part, ISelection selection) {
-		super.setInput(part, selection);
-		// System.out.println("SetInput::selection - "+selection);
-		Assert.isTrue(selection instanceof IStructuredSelection);
-		Object input = ((IStructuredSelection) selection).getFirstElement();
-
-		initElementData(input);
-
-	}
-
-	private void initElementData(Object input) {
-
-		if (input instanceof BreakdownElement) {
-			this.element = (BreakdownElement) input;
-			if (TngUtil.isLocked(this.element))
-				this.editable = false;
-			else {
-				this.editable = true;
-
-				if (element instanceof RoleDescriptor) {
-					RoleDescriptor roleDesc = (RoleDescriptor) element;
-					if ((roleDesc.getSuperActivities() == null)
-							|| (roleDesc.getSuperActivities() == null))
-						this.editable = false;
-					else
-						this.editable = true;
-				}
-			}
-		} else if (input instanceof BreakdownElementWrapperItemProvider) {
-			this.element = (BreakdownElement) LibraryUtil.unwrap(input);
-			this.editable = false;
-		}
-
-	}
-
-	/**
-	 * Return selection
-	 */
-	public ISelection getSelection() {
-		return EPFPropertySheetPage.getSelection();
-	}
-
-	/**
-	 * Return first element from selection
-	 */
-	public Object getInput() {
-		ISelection selection = getSelection();
-		if (selection instanceof IStructuredSelection) {
-			Object input = ((IStructuredSelection) selection).getFirstElement();
-			return input;
-		}
-		return null;
-	}
-
-	/**
-	 * Return process editor
-	 * 
-	 * @return
-	 * 		process editor
-	 */
-	public ProcessEditor getEditor() {
-		return EPFPropertySheetPage.getEditor();
-	}
-
-	/**
-	 * Return ItemProvider
-	 * 
-	 * @return
-	 * 			adapter
-	 */
-	public ItemProviderAdapter getAdapter() {
-		try {
-			AdapterFactory factory = EPFPropertySheetPage.getAdapterFactory();
-			ItemProviderAdapter provider = (ItemProviderAdapter) factory.adapt(
-					element, ITreeItemContentProvider.class);
-			return provider;
-		} catch (Exception ex) {
-			return null;
-		}
-	}
-
-	/**
-	 * Return Adapter factory
-	 * 
-	 * @return
-	 * 			adapter factory
-	 */
-	public AdapterFactory getAdapterFactory() {
-		AdapterFactory adapterFactory = EPFPropertySheetPage
-				.getAdapterFactory();
-		return adapterFactory;
-	}
-
-	/**
-	 * Get the element.
-	 * 
-	 * @return the element.
-	 */
-	public BreakdownElement getElement() {
-		ISelection selection = getSelection();
-		if (selection instanceof IStructuredSelection) {
-			Object input = ((IStructuredSelection) selection).getFirstElement();
-			// System.out.println("getElement::selection - "+selection);
-			try {
-				initElementData(input);
-			} catch (Exception e) {
-				logger
-						.logError(
-								"Error getting element from the selection " + element, e); //$NON-NLS-1$
-				return null;
-			}
-			return element;
-		}
-		return null;
-	}
-
-	/**
-	 * Return property sheet page
-	 * @return
-	 * 			property sheet page
-	 */
-	public TabbedPropertySheetPage getPropertySheetPage() {
-		return this.page;
-	}
-
-	/**
-	 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
-	 */
-	public void propertyChange(PropertyChangeEvent evt) {
-		// System.out.println("ProeprtyChangeEvent" + evt);
-		refresh();
-	}
-
-	/**
-	 * Return filter list of elements. Filter is based on current method configuration
-	 * @param list
-	 * 			Original list
-	 * @return
-	 * 			filtered list
-	 */
-	public List getFilteredList(List list) {
-		List newList = new ArrayList();
-		for (Iterator itor = list.iterator(); itor.hasNext();) {
-			if (configurator != null) {
-				Object obj = (Object) itor.next();
-				configurator.setMethodConfiguration(LibraryService
-						.getInstance().getCurrentMethodConfiguration());
-				if (configurator.accept(obj)) {
-					newList.add(obj);
-				}
-			}
-		}
-		return newList;
-	}
-
-	/**
-	 * Get default method configuration
-	 * 
-	 * @return 
-	 * 			default method configuration
-	 */
-	protected MethodConfiguration getDefaultConfiguration() {
-		ItemProviderAdapter adapter = (ItemProviderAdapter) getAdapter();
-		Object parent = null;
-		if (adapter instanceof IBSItemProvider) {
-			IBSItemProvider bsItemProvider = (IBSItemProvider) adapter;
-			parent = bsItemProvider.getTopItem();
-			MethodConfiguration config = ((org.eclipse.epf.uma.Process) parent)
-					.getDefaultContext();
-			return config;
-		} else {
-			logger
-					.logError("AbstractSection::getDefaultConfiguration - IBSItemProvider is null"); //$NON-NLS-1$
-			return null;
-		}
-	}
-
-	/**
-	 * Return current method configuration
-	 * 
-	 * @return
-	 * 			current method configuration
-	 */
-	protected MethodConfiguration getConfiguration() {
-		MethodConfiguration config = LibraryService.getInstance()
-				.getCurrentMethodConfiguration();
-		if (config == null) {
-			// if configuration is not selected, use default configuration
-			return getDefaultConfiguration();
-		}
-
-		return config;
-	}
-
-
-	// public void updateTitle(Object obj)
-	// {
-	// String name = getNamePrefix() + ((BreakdownElement)obj).getName();
-	// TabbedPropertyComposite comp = (TabbedPropertyComposite)
-	// page.getControl();
-	// TabbedPropertyTitle title = comp.getTitle();
-	// if (titleImage == null)
-	// {
-	// titleImage = Display.getCurrent().getActiveShell().getImage();
-	// }
-	// title.setTitle(name, titleImage);
-	// }
-	
-	
-	
-	/**
-	 * Get name prefix for the element
-	 */
-	public String getNamePrefix() {
-		return "ProcessElement: "; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityDocumentSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityDocumentSection.java
deleted file mode 100755
index 19b2863..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityDocumentSection.java
+++ /dev/null
@@ -1,323 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.util.RichTextImageLinkContainer;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.ActivityDescription;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-
-
-/**
- * The document tab for Activity
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class ActivityDocumentSection extends BreakdownElementDocumentSection {
-
-	protected Activity element;
-
-	protected IMethodRichText mainDescText;
-
-	protected IMethodRichText purposeText;
-
-	protected IMethodRichText alternativesText;
-
-	protected IMethodRichText howToStaffText;
-
-	private Listener purposeListener = new Listener() {
-		public void handleEvent(Event e) {
-			element = (Activity) getElement();
-			IMethodRichText control = expandFlag ? ctrl_document_expanded
-					: purposeText;
-			if (!control.getModified()) {
-				return;
-			}
-			String oldContent = ((ActivityDescription) element
-					.getPresentation()).getPurpose();
-			if (((MethodElementEditor) getEditor()).mustRestoreValue(
-					purposeText, oldContent)) {
-				return;
-			}
-			String newContent = control.getText();
-			if (!newContent.equals(oldContent)) {
-				actionMgr.doAction(IActionManager.SET, element
-						.getPresentation(), UmaPackage.eINSTANCE
-						.getActivityDescription_Purpose(), newContent, -1);
-			}
-		}
-	};
-
-	private Listener mainDescListener = new Listener() {
-		public void handleEvent(Event e) {
-			element = (Activity) getElement();
-			IMethodRichText control = expandFlag ? ctrl_document_expanded
-					: mainDescText;
-			if (!control.getModified()) {
-				return;
-			}
-			String oldContent = ((ActivityDescription) element
-					.getPresentation()).getMainDescription();
-			if (((MethodElementEditor) getEditor()).mustRestoreValue(
-					mainDescText, oldContent)) {
-				return;
-			}
-			String newContent = control.getText();
-			if (!newContent.equals(oldContent)) {
-				actionMgr.doAction(IActionManager.SET, element
-						.getPresentation(), UmaPackage.eINSTANCE
-						.getContentDescription_MainDescription(), newContent,
-						-1);
-			}
-		}
-	};
-
-	private Listener alternativesListener = new Listener() {
-		public void handleEvent(Event e) {
-			element = (Activity) getElement();
-			IMethodRichText control = expandFlag ? ctrl_document_expanded
-					: alternativesText;
-			if (!control.getModified()) {
-				return;
-			}
-			String oldContent = ((ActivityDescription) element
-					.getPresentation()).getAlternatives();
-			if (((MethodElementEditor) getEditor()).mustRestoreValue(
-					alternativesText, oldContent)) {
-				return;
-			}
-			String newContent = control.getText();
-			if (!newContent.equals(oldContent)) {
-				actionMgr.doAction(IActionManager.SET, element
-						.getPresentation(), UmaPackage.eINSTANCE
-						.getActivityDescription_Alternatives(), newContent, -1);
-			}
-		}
-	};
-
-	private Listener howToStaffListener = new Listener() {
-		public void handleEvent(Event e) {
-			element = (Activity) getElement();
-			IMethodRichText control = expandFlag ? ctrl_document_expanded
-					: howToStaffText;
-			if (!control.getModified()) {
-				return;
-			}
-			String oldContent = ((ActivityDescription) element
-					.getPresentation()).getHowtoStaff();
-			if (((MethodElementEditor) getEditor()).mustRestoreValue(
-					howToStaffText, oldContent)) {
-				return;
-			}
-			String newContent = control.getText();
-			if (!newContent.equals(oldContent)) {
-				actionMgr.doAction(IActionManager.SET, element
-						.getPresentation(), UmaPackage.eINSTANCE
-						.getActivityDescription_HowtoStaff(), newContent, -1);
-			}
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementDocumentSection#init()
-	 */
-	protected void init() {
-		super.init();
-		element = (Activity) getElement();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementDocumentSection#createDocumentSection(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createDocumentSection(Composite composite) {
-		int mainDescheightHint = 100;
-
-		super.createDocumentSection(composite);
-
-		// main description
-		RichTextImageLinkContainer mainDescContainer = FormUI.createRichTextWithLink(toolkit,
-				documentComposite, mainDescheightHint, contentElementPath, element,
-				PropertiesResources.Process_mainDescription);
-		addHyperLinkListener(mainDescContainer.link);
-		mainDescText = mainDescContainer.richText;
-
-		// purpose
-		RichTextImageLinkContainer purposeContainer = FormUI.createRichTextWithLink(toolkit,
-				documentComposite, heightHint, contentElementPath, element,
-				PropertiesResources.Process_purpose);
-		addHyperLinkListener(purposeContainer.link);
-		purposeText = purposeContainer.richText;
-
-		// create alternatives
-		RichTextImageLinkContainer alternativesContainer = FormUI.createRichTextWithLink(toolkit,
-				documentComposite, heightHint, contentElementPath, element,
-				PropertiesResources.Activity_alternatives);
-		addHyperLinkListener(alternativesContainer.link);
-		alternativesText = alternativesContainer.richText;
-		
-		// create howtoStaff
-		RichTextImageLinkContainer howToStaffContainer = FormUI.createRichTextWithLink(toolkit,
-				documentComposite, heightHint, contentElementPath, element,
-				PropertiesResources.Activity_howToStaff);
-		addHyperLinkListener(howToStaffContainer.link);
-		howToStaffText = howToStaffContainer.richText;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementDocumentSection#addListeners()
-	 */
-	protected void addListeners() {
-		super.addListeners();
-		
-		BreakdownElement element = getElement();
-		
-		purposeText.setModalObject(element);
-		purposeText.setModalObjectFeature(UmaPackage.eINSTANCE
-						.getActivityDescription_Purpose());
-		purposeText.addListener(SWT.Deactivate, purposeListener);
-		
-		mainDescText.setModalObject(element);
-		mainDescText.setModalObjectFeature(UmaPackage.eINSTANCE.getContentDescription_MainDescription());
-		mainDescText.addListener(SWT.Deactivate, mainDescListener);
-				
-		alternativesText.setModalObject(element);
-		alternativesText.setModalObjectFeature(UmaPackage.eINSTANCE.getActivityDescription_Alternatives());
-		alternativesText.addListener(SWT.Deactivate, alternativesListener);
-		
-		howToStaffText.setModalObject(element);
-		howToStaffText.setModalObjectFeature(UmaPackage.eINSTANCE.getActivityDescription_HowtoStaff());
-		howToStaffText.addListener(SWT.Deactivate, howToStaffListener);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementDocumentSection#updateControls()
-	 */
-	protected void updateControls() {
-		super.updateControls();
-		purposeText.setEditable(editable);
-		mainDescText.setEditable(editable);
-		alternativesText.setEditable(editable);
-		howToStaffText.setEditable(editable);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementDocumentSection#refresh()
-	 */
-	public void refresh() {
-		try {
-			if (getElement() instanceof Activity) {
-				((MethodElementEditor) getEditor()).saveModifiedRichText();
-
-				element = (Activity) getElement();
-				ActivityDescription content = (ActivityDescription) element
-						.getPresentation();
-
-				super.refresh();
-
-				if (contentModifyListener != null) {
-					mainDescText.removeModifyListener(contentModifyListener);
-					purposeText.removeModifyListener(contentModifyListener);
-					alternativesText
-							.removeModifyListener(contentModifyListener);
-					howToStaffText.removeModifyListener(contentModifyListener);
-
-					if (contentModifyListener instanceof MethodElementEditor.ModifyListener) {
-						((MethodElementEditor.ModifyListener) contentModifyListener)
-								.setElement(element.getPresentation());
-						((MethodElementEditor.ModifyListener) contentModifyListener)
-								.setDisable(true);
-					}
-				}
-
-				mainDescText.setText(content.getMainDescription());
-				purposeText.setText(content.getPurpose());
-				alternativesText.setText(content.getAlternatives());
-				howToStaffText.setText(content.getHowtoStaff());
-
-				if (expandFlag) {
-					if (((Label)expandDocumentLabel.getControl()).getText().equals(
-							PropertiesResources.Process_mainDescription)) { //$NON-NLS-1$
-						ctrl_document_expanded.setText(content
-								.getMainDescription());
-						ctrl_document_expanded.setSelection(0);
-						ctrl_document_expanded.setModalObject(content);
-						ctrl_document_expanded
-								.setModalObjectFeature(UmaPackage.eINSTANCE
-										.getContentDescription_MainDescription());
-
-					} else if (((Label)expandDocumentLabel.getControl()).getText().equals(
-							PropertiesResources.Process_purpose)) { 
-						ctrl_document_expanded.setText(content.getPurpose());
-						ctrl_document_expanded.setModalObject(content);
-						ctrl_document_expanded
-								.setModalObjectFeature(UmaPackage.eINSTANCE
-										.getActivityDescription_Purpose());
-					} else if (((Label)expandDocumentLabel.getControl()).getText().equals(
-							PropertiesResources.Activity_alternatives)) { //$NON-NLS-1$
-						ctrl_document_expanded.setText(content
-								.getAlternatives());
-						ctrl_document_expanded.setModalObject(content);
-						ctrl_document_expanded
-								.setModalObjectFeature(UmaPackage.eINSTANCE
-										.getActivityDescription_Alternatives());
-					} else if (((Label)expandDocumentLabel.getControl()).getText().equals(
-							PropertiesResources.Activity_howToStaff)) { //$NON-NLS-1$
-						ctrl_document_expanded.setText(content.getHowtoStaff());
-						ctrl_document_expanded.setModalObject(content);
-						ctrl_document_expanded
-								.setModalObjectFeature(UmaPackage.eINSTANCE
-										.getActivityDescription_HowtoStaff());
-					}
-				}
-
-				if (contentModifyListener instanceof MethodElementEditor.ModifyListener) {
-					((MethodElementEditor.ModifyListener) contentModifyListener)
-							.setDisable(false);
-				}
-
-				mainDescText.setModalObject(content);
-				mainDescText.setModalObjectFeature(UmaPackage.eINSTANCE
-						.getContentDescription_MainDescription());
-				mainDescText.addModifyListener(contentModifyListener);
-
-				purposeText.setModalObject(content);
-				purposeText.setModalObjectFeature(UmaPackage.eINSTANCE
-						.getActivityDescription_Purpose());
-				purposeText.addModifyListener(contentModifyListener);
-
-				alternativesText.setModalObject(content);
-				alternativesText.setModalObjectFeature(UmaPackage.eINSTANCE
-						.getActivityDescription_Alternatives());
-				alternativesText.addModifyListener(contentModifyListener);
-
-				howToStaffText.setModalObject(content);
-				howToStaffText.setModalObjectFeature(UmaPackage.eINSTANCE
-						.getActivityDescription_HowtoStaff());
-				howToStaffText.addModifyListener(contentModifyListener);
-			}
-		} catch (Exception ex) {
-			logger.logError(
-					"Error refreshing activity documentation section :", ex); //$NON-NLS-1$
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityGeneralSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityGeneralSection.java
deleted file mode 100755
index 6acca7e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityGeneralSection.java
+++ /dev/null
@@ -1,581 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.dialogs.ItemsFilterDialog;
-import org.eclipse.epf.authoring.ui.editors.ProcessEditor;
-import org.eclipse.epf.authoring.ui.filters.ActivityVariabilityFilter;
-import org.eclipse.epf.authoring.ui.forms.ProcessBreakdownStructureFormPage;
-import org.eclipse.epf.authoring.ui.views.ProcessViewer;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.configuration.ProcessVariabilityConfigurator;
-import org.eclipse.epf.library.edit.IConfigurator;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.process.IBSItemProvider;
-import org.eclipse.epf.library.edit.process.command.ActivityVariabilityCommand;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.edit.validation.DependencyChecker;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.library.ui.dialogs.ConvertActivityDialog;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.Iteration;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.Phase;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The general tab section for Activity
- * 
- * @author Shilpa Toraskar
- * @author Phong Nguyen Le
- * @since 1.0
- * 
- */
-public class ActivityGeneralSection extends WorkBreakdownElementGeneralSection {
-	protected Activity element;
-
-	private static final String NOT_APPLICABLE_TEXT = AuthoringUIResources.notApplicable_text; //$NON-NLS-1$
-
-	private static final String CONTRIBUTES_TEXT = AuthoringUIResources.contributes_text; //$NON-NLS-1$
-
-	private static final String EXTENDS_TEXT = AuthoringUIResources.extends_text; //$NON-NLS-1$
-
-	private static final String REPLACES_TEXT = AuthoringUIResources.replaces_text; //$NON-NLS-1$
-
-	private Text modelInfoText;
-
-	private Label activityTypeLabel;
-
-	private Text ctrl_type_text;
-
-	private Button ctrl_type_button;
-
-	private Combo ctrl_variability;
-
-	private ComboViewer viewer_variability;
-
-	private Text baseText;
-
-	private Button selectButton;
-
-	protected ILabelProvider variabilityLabelProvider = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory()) {
-		public String getText(Object object) {
-			VariabilityType varObject = (VariabilityType) object;
-			if (varObject == VariabilityType.NA_LITERAL)
-				return NOT_APPLICABLE_TEXT;
-			if (varObject == VariabilityType.CONTRIBUTES_LITERAL)
-				return CONTRIBUTES_TEXT;
-			if (varObject == VariabilityType.EXTENDS_LITERAL)
-				return EXTENDS_TEXT;
-			if (varObject == VariabilityType.REPLACES_LITERAL)
-				return REPLACES_TEXT;
-			return null;
-		}
-	};
-
-	private IContentProvider variabilityContentProvider = new AdapterFactoryContentProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory()) {
-		public Object[] getElements(Object object) {
-			List variabilityTypesList = new ArrayList();
-			variabilityTypesList.add(VariabilityType.NA_LITERAL);
-			variabilityTypesList.add(VariabilityType.CONTRIBUTES_LITERAL);
-			variabilityTypesList.add(VariabilityType.EXTENDS_LITERAL);
-			variabilityTypesList.add(VariabilityType.REPLACES_LITERAL);
-			return variabilityTypesList.toArray();
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.WorkBreakdownElementGeneralSection#init()
-	 */
-	protected void init() {
-		super.init();
-		// get activity object
-		element = (Activity) getElement();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.WorkBreakdownElementGeneralSection#createGeneralSection(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createGeneralSection(Composite composite) {
-		super.createGeneralSection(composite);
-
-		// Model Info
-		FormUI.createLabel(toolkit, generalComposite,
-				PropertiesResources.Activity_ModelInfo); //$NON-NLS-1$
-
-		modelInfoText = FormUI.createText(toolkit, generalComposite,
-				SWT.DEFAULT, horizontalSpan);
-		modelInfoText.setEnabled(false);
-		modelInfoText.setText(getModelInfo());
-
-		// Type of an Activity
-		activityTypeLabel = FormUI.createLabel(toolkit, generalComposite,
-				PropertiesResources.Activity_Type);
-		
-		ctrl_type_text = toolkit.createText(generalComposite, "", SWT.READ_ONLY); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.BEGINNING | GridData.FILL_HORIZONTAL);
-			gridData.horizontalSpan = 1;
-			ctrl_type_text.setLayoutData(gridData);
-		}
-		ctrl_type_button = toolkit.createButton(generalComposite,
-				AuthoringUIText.CHANGE_TYPE_BUTTON_TEXT, SWT.PUSH);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			gridData.horizontalSpan = 1;
-			ctrl_type_button.setLayoutData(gridData);
-		}
-		if (ConvertActivityDialog.getValidNewActivityTypes(element) == null) {
-			ctrl_type_button.setVisible(false);
-		}
-
-		FormUI.createLabel(toolkit, generalComposite, ""); //$NON-NLS-1$
-
-		// Variability Type
-		FormUI.createLabel(toolkit, generalComposite,
-				AuthoringUIText.VARIABILITY_TYPE_TEXT);
-
-		ctrl_variability = FormUI.createCombo(toolkit, generalComposite, 2);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			gridData.horizontalSpan = 1;
-			ctrl_variability.setLayoutData(gridData);
-		}
-
-		viewer_variability = new ComboViewer(ctrl_variability);
-		viewer_variability.getCombo().setLayoutData(new GridData(1));
-		viewer_variability.setContentProvider(variabilityContentProvider);
-		viewer_variability.setLabelProvider(variabilityLabelProvider);
-		viewer_variability.setInput(element);
-
-		Label blankLabel = FormUI.createLabel(toolkit, generalComposite, ""); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.BEGINNING);
-			gridData.horizontalSpan = 2;
-			blankLabel.setLayoutData(gridData);
-		}
-
-		// Base elements
-		FormUI.createLabel(toolkit, generalComposite,
-				AuthoringUIText.BASE_ELEMENT_TEXT);
-
-		baseText = FormUI.createText(toolkit, generalComposite);
-		{
-			GridData gd = new GridData(GridData.BEGINNING
-					| GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			baseText.setLayoutData(gd);
-		}
-		baseText.setEnabled(false);
-
-		// Button to select
-		selectButton = FormUI.createButton(toolkit, generalComposite,
-				AuthoringUIText.SELECT_BUTTON_TEXT);
-	}
-
-	/**
-	 * add listeners
-	 */
-	protected void addListeners() {
-		super.addListeners();
-		ctrl_type_button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				final ProcessEditor editor = (ProcessEditor) getEditor();
-				if (editor.isDirty()) {
-					String title = AuthoringUIResources.changeActivityTypeWarningDialog_title; //$NON-NLS-1$
-					String message = AuthoringUIResources.descriptionTabGuidanceWarningDialog_message1; //$NON-NLS-1$
-					AuthoringUIPlugin.getDefault().getMsgDialog()
-							.displayWarning(title, message);
-				} else  {
-					nameText.removeListener(SWT.Deactivate,
-							nameDeactivateListener);
-					presentationNameText.removeListener(SWT.Deactivate,
-							presentationNameDeactivateListener);
-
-					Activity newActivity = ConvertActivityDialog
-					.queryUserAndConvert((Activity) element, null, null);
-					if (newActivity != null) {
-						IStructuredSelection sel = new StructuredSelection(
-								newActivity);
-						// deal with property sheet directly.
-						getPropertySheetPage().selectionChanged(getPart(),
-								sel);
-						// getEditor().setSelection(sel);
-						refresh();
-						((ProcessViewer) ((ProcessBreakdownStructureFormPage) getEditor()
-								.getActivePageInstance()).getViewer())
-								.expandToLevel(newActivity, 3);
-					}
-					nameText.addListener(SWT.Deactivate,
-							nameDeactivateListener);
-					presentationNameText.addListener(SWT.Deactivate,
-							presentationNameDeactivateListener);
-
-				}
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		ctrl_variability.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				IStructuredSelection selection = (IStructuredSelection) viewer_variability
-						.getSelection();
-
-				VariabilityElement ve = element.getVariabilityBasedOnElement();
-				VariabilityType type = (VariabilityType) selection
-						.getFirstElement();
-
-				if (ve != null & ve instanceof Activity) {
-//					if(type.equals(VariabilityType.REPLACES_LITERAL)
-//							&& ve instanceof Process){
-//						Object[] args = { element.getName() };
-//						String message = AuthoringUIResources
-//						.bind(
-//								AuthoringUIResources.activity_variability_error_msg1,
-//								args);
-//
-//						String title = AuthoringUIResources.activity_variability_error_title;
-//						AuthoringUIPlugin.getDefault().getMsgDialog()
-//							.displayError(title, message, ""); //$NON-NLS-1$
-//						VariabilityType vtype = element.getVariabilityType();
-//						if(vtype != null){
-//							IStructuredSelection sel = new StructuredSelection(vtype);
-//							viewer_variability.setSelection(sel);
-//						}
-//						return;
-//					}
-//					if (ProcessUtil.hasContributorOrReplacer((Activity) ve)
-//							&& type.equals(VariabilityType.EXTENDS_LITERAL)) {
-//						Object[] args = { element.getName(),
-//								((Activity) ve).getName() };
-//						String message = AuthoringUIResources
-//								.bind(
-//										AuthoringUIResources.activity_variability_error_msg,
-//										args);
-//
-//						String title = AuthoringUIResources.activity_variability_error_title;
-//						AuthoringUIPlugin.getDefault().getMsgDialog()
-//								.displayError(title, message, ""); //$NON-NLS-1$
-//
-//						VariabilityType variabilityType = element
-//								.getVariabilityType();
-//						IStructuredSelection newVariabilitySelection = new StructuredSelection(
-//								variabilityType);
-//						viewer_variability.setSelection(
-//								newVariabilitySelection, true);
-//
-//						return;
-//					}
-					
-					if(type != VariabilityType.NA_LITERAL) {
-						IStatus state = DependencyChecker.checkCircularDependencyAfterFilterSelection(element, (Activity) ve, type);
-						if(!state.isOK()) {
-							String title = AuthoringUIResources.activity_variability_error_title;
-							AuthoringUIPlugin.getDefault().getMsgDialog().displayError(title, state.getMessage());
-							
-							// set variability to back whatever it was for UI
-							VariabilityType variabilityType = element.getVariabilityType();
-							IStructuredSelection newVariabilitySelection = new StructuredSelection(
-									variabilityType);
-							viewer_variability.setSelection(newVariabilitySelection, true);
-							return;
-						}
-					}
-					boolean status = actionMgr.doAction(IActionManager.SET,
-							element, UmaPackage.eINSTANCE
-									.getVariabilityElement_VariabilityType(),
-							type, -1);
-					if (!status) {
-						if (element.getPresentationName() == null
-								|| element.getPresentationName().equals("")) {
-							if (type.equals(VariabilityType.NA_LITERAL))
-								element.setPresentationName(element.getName());
-						}
-						return;
-					}
-					if (element.getPresentationName() == null
-							|| element.getPresentationName().equals("")) {
-						if (type.equals(VariabilityType.CONTRIBUTES_LITERAL)
-								|| type
-										.equals(VariabilityType.REPLACES_LITERAL))
-							element.setPresentationName(element.getName());
-					}
-				}
-
-				if (type == VariabilityType.NA_LITERAL) {
-					if (ve != null) {
-						boolean status = actionMgr
-								.doAction(
-										IActionManager.SET,
-										element,
-										UmaPackage.eINSTANCE
-												.getVariabilityElement_VariabilityBasedOnElement(),
-										null, -1);
-
-						if (!status) {
-							return;
-						}
-					}
-					selectButton.setEnabled(false);
-					baseText.setText(""); //$NON-NLS-1$
-				} else {
-					List selectionBaseList = new ArrayList();
-					VariabilityElement base = element
-							.getVariabilityBasedOnElement();
-					selectionBaseList.add(base);
-					selectButton.setEnabled(true);
-
-				}
-				// setFormTextWithVariableInfo();
-			}
-		});
-
-		selectButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				MethodConfiguration config = getConfiguration();
-				String tabName = FilterConstants.PROCESSES;
-
-				VariabilityType type = (VariabilityType) ((IStructuredSelection) viewer_variability
-						.getSelection()).getFirstElement();
-
-				IFilter filter = new ActivityVariabilityFilter(config, null,
-						tabName, element);
-
-				ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-						.getWorkbench().getActiveWorkbenchWindow().getShell(),
-						filter, tabName, null, config);
-				fd.setBlockOnOpen(true);
-				fd.setViewerSelectionSingle(true);
-				fd.setTitle(tabName);
-				fd.open();
-
-				List selectedItems = fd.getSelectedItems();
-
-				if (selectedItems != null && !selectedItems.isEmpty()) {
-					Object o = selectedItems.get(0);
-					if (o instanceof Activity) {
-//						Activity act = (Activity) o;
-//						if (isDirectParent(act)
-//								|| ((act instanceof Process) && type.equals(VariabilityType.REPLACES_LITERAL)
-//										&& !(element instanceof Process))) 
-//						{
-//							Object[] args = { element.getName() };
-//							String message = AuthoringUIResources
-//									.bind(
-//											AuthoringUIResources.activity_variability_error_msg1,
-//											args);
-//
-//							String title = AuthoringUIResources.activity_variability_error_title;
-//							AuthoringUIPlugin.getDefault().getMsgDialog()
-//									.displayError(title, message, ""); //$NON-NLS-1$
-//
-//							return;
-//						}
-//						if (isCircularDependency(act)) {
-//							Object[] args = { element.getName(), act.getName() };
-//							String message = AuthoringUIResources
-//									.bind(
-//											AuthoringUIResources.activity_variability_error_msg2,
-//											args);
-//
-//							String title = AuthoringUIResources.activity_variability_error_title;
-//							AuthoringUIPlugin.getDefault().getMsgDialog()
-//									.displayError(title, message, ""); //$NON-NLS-1$
-//
-//							return;
-//						}
-//						// block for children
-//						if (ProcessUtil.hasContributorOrReplacer(act)
-//								&& type.equals(VariabilityType.EXTENDS_LITERAL)) {
-//							Object[] args = { element.getName(), act.getName() };
-//							String message = AuthoringUIResources
-//									.bind(
-//											AuthoringUIResources.activity_variability_error_msg,
-//											args);
-//
-//							String title = AuthoringUIResources.activity_variability_error_title;
-//							AuthoringUIPlugin.getDefault().getMsgDialog()
-//									.displayError(title, message, ""); //$NON-NLS-1$
-//
-//							return;
-//						}
-						
-						IStatus status = DependencyChecker.checkCircularDependencyAfterFilterSelection(element, (Activity) o, type);
-						if(!status.isOK()) {
-							String title = AuthoringUIResources.activity_variability_error_title;
-							AuthoringUIPlugin.getDefault().getMsgDialog().displayError(title, status.getMessage());						
-							return;
-						}
-					}
-					if (o instanceof VariabilityElement) {
-						VariabilityElement ve = (VariabilityElement) o;
-
-						IConfigurator configurator = new ProcessVariabilityConfigurator(
-								getDefaultConfiguration(), null);
-						ActivityVariabilityCommand cmd = new ActivityVariabilityCommand(
-								element, ve, type, configurator);
-						boolean status = actionMgr.execute(cmd);
-
-						if (!status) {
-							return;
-						}
-
-						baseText.setText(TngUtil.getLabelWithPath(ve));
-					}
-				}
-			}
-		});
-
-	}
-
-	/**
-	 * Get model information for the activity
-	 * @return
-	 * 			model info string
-	 */
-	private String getModelInfo() {
-		String info = null;
-
-		try {
-			Object o = getAdapter();
-			if (o instanceof IBSItemProvider) {
-				IBSItemProvider adapter = (IBSItemProvider) o;
-				info = adapter.getAttribute(element,
-						IBSItemProvider.COL_MODEL_INFO);
-			}
-		} catch (Exception e) {
-			// print exception
-		}
-		if (!(StrUtil.isBlank(info)))
-			return info;
-		else
-			return PropertiesResources.Process_None;
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.WorkBreakdownElementGeneralSection#updateControls()
-	 */
-	protected void updateControls() {
-		super.updateControls();
-
-		ctrl_type_button.setEnabled(editable);
-		ctrl_variability.setEnabled(editable);
-		selectButton.setEnabled(editable);
-
-		ctrl_variability.setEnabled(editable);
-		if (((IStructuredSelection) viewer_variability.getSelection())
-				.getFirstElement() == VariabilityType.NA_LITERAL) {
-			selectButton.setEnabled(false);
-		}
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.WorkBreakdownElementGeneralSection#refresh()
-	 */
-	public void refresh() {
-		try {
-			if (getElement() instanceof Activity) {
-				super.refresh();
-
-				element = (Activity) getElement();
-
-				modelInfoText.setText(getModelInfo());
-
-				ctrl_type_text.setText(PropertiesUtil.getType(element));
-
-				// hide/show combo
-				if ((element instanceof org.eclipse.epf.uma.Process)
-						&& (element.getSuperActivities() == null || element
-								.getSuperActivities() == null)) {
-					activityTypeLabel.setVisible(false);
-					ctrl_type_text.setVisible(false);
-					ctrl_type_button.setVisible(false);
-				} else {
-					activityTypeLabel.setVisible(true);
-					ctrl_type_text.setVisible(true);
-					ctrl_type_button.setVisible(true);
-				}
-
-				VariabilityType variabilityType = element.getVariabilityType();
-				IStructuredSelection newVariabilitySelection = new StructuredSelection(
-						variabilityType);
-				viewer_variability.setSelection(newVariabilitySelection, true);
-
-				if (element.getVariabilityBasedOnElement() != null)
-					baseText.setText(TngUtil.getLabelWithPath(element
-							.getVariabilityBasedOnElement()));
-				else
-					baseText.setText(""); //$NON-NLS-1$
-			}
-		} catch (Exception ex) {
-			logger
-					.logError(
-							"Error refreshing Activity general section : " + element, ex); //$NON-NLS-1$
-		}
-	}
-
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.WorkBreakdownElementGeneralSection#getNamePrefix()
-	 */
-	public String getNamePrefix() {
-		if (element instanceof CapabilityPattern) {
-			return LibraryUIText.TEXT_CAPABILITY_PATTERN + ": "; //$NON-NLS-1$
-		} else if (element instanceof DeliveryProcess) {
-			return LibraryUIText.TEXT_DELIVERY_PROCESS + ": "; //$NON-NLS-1$
-		} else if (element instanceof Phase) {
-			return LibraryUIText.TEXT_PHASE + ": "; //$NON-NLS-1$
-		} else if (element instanceof Iteration) {
-			return LibraryUIText.TEXT_ITERATION + ": "; //$NON-NLS-1$
-		} else
-			return LibraryUIText.TEXT_ACTIVITY + ": "; //$NON-NLS-1$
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityGuidanceSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityGuidanceSection.java
deleted file mode 100755
index 1874a21..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityGuidanceSection.java
+++ /dev/null
@@ -1,978 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.dialogs.ItemsFilterDialog;
-import org.eclipse.epf.authoring.ui.filters.ProcessGuidanceFilter;
-import org.eclipse.epf.diagram.model.util.DiagramInfo;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.LibraryEditPlugin;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.configuration.GuidanceGroupingItemProvider;
-import org.eclipse.epf.library.edit.configuration.GuidanceItemProvider;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.FilterInitializer;
-import org.eclipse.epf.library.edit.process.IBSItemProvider;
-import org.eclipse.epf.library.edit.process.command.AddGuidanceToActivityCommand;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.Roadmap;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-/**
- * The activity guidance section. It list all avaiable guidances of an activity
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class ActivityGuidanceSection extends AbstractSection {
-	protected ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory());
-
-	private FormToolkit toolkit;
-
-	private Button ctrl_add_1, ctrl_remove_1, ctrl_add_2, ctrl_remove_2;
-
-	private Button ctrl_add_3, ctrl_remove_3, ctrl_add_4, ctrl_remove_4;
-
-	private Table ctrl_table_1, ctrl_table_2, ctrl_table_3, ctrl_table_4;
-
-	private Section communicationMaterialSection, educationMaterialSection;
-
-	private TableViewer viewer_1, viewer_2, viewer_3, viewer_4;
-
-	// element
-	private Activity element;
-
-	// action manager
-	private IActionManager actionMgr;
-
-	public final String tabName = FilterConstants.GUIDANCE;
-
-	private IFilter roadMapFilter = null;
-
-	private IFilter generalGuidanceFilter = null;
-
-	private IFilter supportingMaterialFilter = null;
-
-	/**
-	 * Get road map guidance filter
-	 */
-	public IFilter getRoadMapFilter() {
-		if (roadMapFilter == null) {
-			roadMapFilter = new ProcessGuidanceFilter(getConfiguration(), null,
-					tabName) {
-				public boolean childAccept(Object obj) {
-					if (obj instanceof GuidanceGroupingItemProvider)
-						return true;
-					if (obj instanceof GuidanceItemProvider) {
-						String name = ((GuidanceItemProvider) obj).getText(obj);
-						if (name.equalsIgnoreCase(LibraryEditPlugin.INSTANCE
-								.getString("_UI_Guidances_Roadmap")) && //$NON-NLS-1$
-								!((GuidanceItemProvider) obj).getChildren(obj)
-										.isEmpty())
-							return true;
-						else
-							return false;
-					}
-					if ((obj instanceof Roadmap))
-						return true;
-					return false;
-				}
-			};
-		} else {
-			((ProcessGuidanceFilter) roadMapFilter).setMethodConfiguration(getConfiguration());
-		}
-
-		return roadMapFilter;
-	}
-
-	/**
-	 * Get General guidance filter
-	 * 
-	 */
-	public IFilter getGeneralGuidanceFilter() {
-		if (generalGuidanceFilter == null) {
-			generalGuidanceFilter = new ProcessGuidanceFilter(
-					getConfiguration(), null, tabName) {
-				public boolean childAccept(Object obj) {
-					if (super.childAccept(obj))
-						return true;
-					if (obj instanceof GuidanceItemProvider) {
-						if (((GuidanceItemProvider) obj).getChildren(obj)
-								.isEmpty())
-							return false;
-						else
-							return true;
-					}
-					Class cls = FilterInitializer.getInstance()
-							.getClassForType(helper.getFilterTypeStr());
-					if (cls != null) {
-						if (cls.isInstance(obj)) {
-							return true;
-						} else {
-							return false;
-						}
-					}
-					if ((obj instanceof Checklist) || (obj instanceof Concept)
-							|| (obj instanceof Example)
-							|| (obj instanceof Guideline)
-							|| (obj instanceof ReusableAsset)
-							|| (obj instanceof SupportingMaterial))
-						return true;
-
-					return false;
-
-				}
-			};
-		}else {
-			((ProcessGuidanceFilter) generalGuidanceFilter).setMethodConfiguration(getConfiguration());
-		}
-		return generalGuidanceFilter;
-	}
-
-	/**
-	 * Get Supporting materical guidance filter
-	 * 
-	 */
-	public IFilter getSupportingMaterialFilter() {
-		if (supportingMaterialFilter == null) {
-			supportingMaterialFilter = new ProcessGuidanceFilter(
-					getConfiguration(), null, tabName) {
-				public boolean childAccept(Object obj) {
-					if (super.childAccept(obj))
-						return true;
-					if ((obj instanceof GuidanceItemProvider)
-							|| (obj instanceof SupportingMaterial))
-						return true;
-					return false;
-				}
-			};
-		} else {
-			((ProcessGuidanceFilter) supportingMaterialFilter).setMethodConfiguration(getConfiguration());
-		}
-		return supportingMaterialFilter;
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.AbstractSection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-
-		super.createControls(parent, tabbedPropertySheetPage);
-		init();
-
-		parent.setLayout(new GridLayout());
-		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// create guidance section
-		createGuidanceSection(parent);
-
-		// add listeners
-		addListeners();
-
-		// update controls
-		updateControls();
-
-	}
-
-	/**
-	 * Initialize
-	 */
-	private void init() {
-		// get activity object
-		element = (Activity) getElement();
-
-		// get toolkit
-		toolkit = getWidgetFactory();
-
-		// get action manager
-		actionMgr = EPFPropertySheetPage.getActionManager();
-	}
-
-	private void toggleSection() {
-		if (!(element instanceof DeliveryProcess)) {
-			if (communicationMaterialSection.isExpanded())
-				communicationMaterialSection.setExpanded(false);
-			if (educationMaterialSection.isExpanded())
-				educationMaterialSection.setExpanded(false);
-
-			if (communicationMaterialSection.isVisible())
-				communicationMaterialSection.setVisible(false);
-			if (educationMaterialSection.isVisible())
-				educationMaterialSection.setVisible(false);
-		} else {
-			if (!communicationMaterialSection.isExpanded())
-				communicationMaterialSection.setExpanded(true);
-			if (!educationMaterialSection.isExpanded())
-				educationMaterialSection.setExpanded(true);
-
-			if (!communicationMaterialSection.isVisible())
-				communicationMaterialSection.setVisible(true);
-			if (!educationMaterialSection.isVisible())
-				educationMaterialSection.setVisible(true);
-		}
-
-	}
-
-	/**
-	 *  Update controls based on editable flag. Controls can become editable or un-editable
-	 */
-	public void updateControls() {
-		ctrl_add_1.setEnabled(editable);
-		ctrl_add_2.setEnabled(editable);
-		ctrl_add_3.setEnabled(editable);
-		ctrl_add_4.setEnabled(editable);
-
-		IStructuredSelection selection = (IStructuredSelection) viewer_1
-				.getSelection();
-		if (selection.size() > 0 && editable) {
-			ctrl_remove_1.setEnabled(true);
-		} else {
-			ctrl_remove_1.setEnabled(false);
-		}
-
-		selection = (IStructuredSelection) viewer_2.getSelection();
-		if (selection.size() > 0 && editable) {
-			ctrl_remove_2.setEnabled(true);
-		} else {
-			ctrl_remove_2.setEnabled(false);
-		}
-
-		selection = (IStructuredSelection) viewer_3.getSelection();
-		if (selection.size() > 0 && editable) {
-			ctrl_remove_3.setEnabled(true);
-		} else {
-			ctrl_remove_3.setEnabled(false);
-		}
-
-		selection = (IStructuredSelection) viewer_4.getSelection();
-		if (selection.size() > 0 && editable) {
-			ctrl_remove_4.setEnabled(true);
-		} else {
-			ctrl_remove_4.setEnabled(false);
-		}
-	}
-
-
-	/**
-	 * @see org.eclipse.ui.views.properties.tabbed.AbstractPropertySection#refresh()
-	 */
-	public void refresh() {
-		try {
-			if (getElement() instanceof Activity) {
-				element = (Activity) getElement();
-
-				viewer_1.refresh();
-				viewer_2.refresh();
-				viewer_3.refresh();
-				viewer_4.refresh();
-
-				// hide/show certain sections.
-				toggleSection();
-
-				// hide/show controls
-				updateControls();
-			}
-
-		} catch (Exception ex) {
-			logger.logError("Error refreshing activity guidance section: ", ex); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.AbstractSection#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-
-		if (labelProvider != null) {
-			labelProvider.dispose();
-		}
-	}
-
-	/**
-	 * Create guidance section on the given composite
-	 * @param composite
-	 */
-	private void createGuidanceSection(Composite composite) {
-		int tableHeight = 50;
-		String sectionTitle = null;
-		String sectionDesc = null;
-		String tableTitle = null;
-		// Label tableLabel = null;
-
-		// ROADMAP
-		{
-			sectionTitle = PropertiesResources.Activity_RoadmapTitle; //$NON-NLS-1$
-			sectionDesc = PropertiesResources.Activity_RoadmapDescription; //$NON-NLS-1$
-			tableTitle = PropertiesResources.Activity_Selected_Roadmap; //$NON-NLS-1$
-
-			Section section = FormUI.createSection(toolkit, composite,
-					sectionTitle, sectionDesc);
-
-			// create composite
-			Composite sectionComposite = FormUI.createComposite(toolkit,
-					section, 2, false);
-
-			Composite pane1 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.FILL_BOTH);
-			FormUI.createLabel(toolkit, pane1, tableTitle);
-
-			ctrl_table_1 = FormUI.createTable(toolkit, pane1, tableHeight);
-			viewer_1 = new TableViewer(ctrl_table_1);
-			IStructuredContentProvider contentProvider = new AdapterFactoryContentProvider(
-					getAdapterFactory()) {
-				public Object[] getElements(Object object) {
-					return getFilteredList(element.getRoadmaps()).toArray();
-				}
-			};
-
-			viewer_1.setContentProvider(contentProvider);
-			viewer_1.setLabelProvider(labelProvider);
-			viewer_1.setInput(element);
-
-			// create buttons for table1
-			Composite pane2 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.VERTICAL_ALIGN_CENTER
-							| GridData.HORIZONTAL_ALIGN_CENTER);
-
-			ctrl_add_1 = FormUI.createButton(toolkit, pane2,
-					PropertiesResources.Process_Add);
-			ctrl_remove_1 = FormUI.createButton(toolkit, pane2,
-					PropertiesResources.Process_Remove);
-
-			toolkit.paintBordersFor(pane1);
-		}
-
-		// GENERAL GUIDANCE
-		{
-			sectionTitle = PropertiesResources.Activity_GeneralGuidanceTitle; //$NON-NLS-1$
-			sectionDesc = PropertiesResources.Activity_GeneralGuidanceDescription; //$NON-NLS-1$
-			tableTitle = PropertiesResources.Activity_Selected_GeneralGuidance; //$NON-NLS-1$
-
-			Section section = FormUI.createSection(toolkit, composite,
-					sectionTitle, sectionDesc);
-
-			// create composite
-			Composite sectionComposite = FormUI.createComposite(toolkit,
-					section, 2, false);
-
-			Composite pane1 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.FILL_BOTH);
-			FormUI.createLabel(toolkit, pane1, tableTitle);
-
-			ctrl_table_2 = FormUI.createTable(toolkit, pane1, tableHeight);
-			viewer_2 = new TableViewer(ctrl_table_2);
-			IStructuredContentProvider contentProvider = new AdapterFactoryContentProvider(
-					getAdapterFactory()) {
-				public Object[] getElements(Object object) {
-					return getFilteredList(getSelectedGuidances()).toArray();
-				}
-			};
-
-			viewer_2.setContentProvider(contentProvider);
-			viewer_2.setLabelProvider(labelProvider);
-			viewer_2.setInput(element);
-
-			// create buttons for table2
-			Composite pane2 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.VERTICAL_ALIGN_CENTER
-							| GridData.HORIZONTAL_ALIGN_CENTER);
-
-			ctrl_add_2 = FormUI.createButton(toolkit, pane2,
-					PropertiesResources.Process_Add);
-			ctrl_remove_2 = FormUI.createButton(toolkit, pane2,
-					PropertiesResources.Process_Remove);
-
-			toolkit.paintBordersFor(pane1);
-		}
-
-		// COMMUNICATION MATERIAL
-		{
-			sectionTitle = PropertiesResources.Activity_CommunicationMaterialTitle; //$NON-NLS-1$
-			sectionDesc = PropertiesResources.Activity_CommunicationMaterialDescription; //$NON-NLS-1$
-			tableTitle = PropertiesResources.Activity_Selected_CommunicationMaterial; //$NON-NLS-1$
-
-			Section section = FormUI.createSection(toolkit, composite,
-					sectionTitle, sectionDesc);
-
-			// create composite
-			Composite sectionComposite = FormUI.createComposite(toolkit,
-					section, 2, false);
-
-			Composite pane1 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.FILL_BOTH);
-			FormUI.createLabel(toolkit, pane1, tableTitle);
-
-			ctrl_table_3 = FormUI.createTable(toolkit, pane1, tableHeight);
-			viewer_3 = new TableViewer(ctrl_table_3);
-			IStructuredContentProvider contentProvider = new AdapterFactoryContentProvider(
-					getAdapterFactory()) {
-				public Object[] getElements(Object object) {
-					if (element instanceof DeliveryProcess) {
-						return getFilteredList(
-								((DeliveryProcess) element)
-										.getCommunicationsMaterials())
-								.toArray();
-					} else
-						return Collections.EMPTY_LIST.toArray();
-				}
-			};
-
-			viewer_3.setContentProvider(contentProvider);
-			viewer_3.setLabelProvider(labelProvider);
-			viewer_3.setInput(element);
-
-			// create buttons for table2
-			Composite pane2 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.VERTICAL_ALIGN_CENTER
-							| GridData.HORIZONTAL_ALIGN_CENTER);
-
-			ctrl_add_3 = FormUI.createButton(toolkit, pane2,
-					PropertiesResources.Process_Add);
-			ctrl_remove_3 = FormUI.createButton(toolkit, pane2,
-					PropertiesResources.Process_Remove);
-
-			toolkit.paintBordersFor(pane1);
-
-			communicationMaterialSection = section;
-
-		}
-
-		// EDUCATION MATERIAL
-		{
-			sectionTitle = PropertiesResources.Activity_EducationMaterialTitle; //$NON-NLS-1$
-			sectionDesc = PropertiesResources.Activity_EducationMaterialDescription; //$NON-NLS-1$
-			tableTitle = PropertiesResources.Activity_Selected_EducationMaterial; //$NON-NLS-1$
-
-			Section section = FormUI.createSection(toolkit, composite,
-					sectionTitle, sectionDesc);
-
-			// create composite
-			Composite sectionComposite = FormUI.createComposite(toolkit,
-					section, 2, false);
-
-			Composite pane1 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.FILL_BOTH);
-			FormUI.createLabel(toolkit, pane1, tableTitle);
-
-			ctrl_table_4 = FormUI.createTable(toolkit, pane1, tableHeight);
-			viewer_4 = new TableViewer(ctrl_table_4);
-			IStructuredContentProvider contentProvider = new AdapterFactoryContentProvider(
-					getAdapterFactory()) {
-				public Object[] getElements(Object object) {
-					if (element instanceof DeliveryProcess) {
-						return getFilteredList(
-								((DeliveryProcess) element)
-										.getEducationMaterials()).toArray();
-					} else
-						return Collections.EMPTY_LIST.toArray();
-				}
-			};
-
-			viewer_4.setContentProvider(contentProvider);
-			viewer_4.setLabelProvider(labelProvider);
-			viewer_4.setInput(element);
-
-			// create buttons for table2
-			Composite pane2 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.VERTICAL_ALIGN_CENTER
-							| GridData.HORIZONTAL_ALIGN_CENTER);
-
-			ctrl_add_4 = FormUI.createButton(toolkit, pane2,
-					PropertiesResources.Process_Add);
-			ctrl_remove_4 = FormUI.createButton(toolkit, pane2,
-					PropertiesResources.Process_Remove);
-
-			toolkit.paintBordersFor(pane1);
-
-			educationMaterialSection = section;
-
-		}
-
-		// hide/show certain sections
-		toggleSection();
-	}
-
-	/**
-	 * Add listeners
-	 * 
-	 */
-	private void addListeners() {
-		ItemProviderAdapter adapter = (ItemProviderAdapter) getAdapter();
-		Object parent = null;
-		if (adapter instanceof IBSItemProvider) {
-			IBSItemProvider bsItemProvider = (IBSItemProvider) adapter;
-			parent = bsItemProvider.getTopItem();
-		} else {
-			logger
-					.logError("ActivityGuidanceSection::addListeners - IBSItemProvider is null"); //$NON-NLS-1$
-			return;
-		}
-
-		{
-			ctrl_table_1.addFocusListener(new FocusAdapter() {
-				public void focusGained(FocusEvent e) {
-					IStructuredSelection selection = (IStructuredSelection) viewer_1
-							.getSelection();
-					if ((selection.size() > 0) && editable)
-						ctrl_remove_1.setEnabled(true);
-				}
-			});
-
-			viewer_1
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) viewer_1
-									.getSelection();
-							if ((selection.size() > 0) && editable)
-								ctrl_remove_1.setEnabled(true);
-						}
-					});
-
-			ctrl_add_1.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					IFilter filter = getRoadMapFilter();
-					ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-							.getWorkbench().getActiveWorkbenchWindow()
-							.getShell(), filter, element,
-							FilterConstants.ROADMAP, element.getRoadmaps());
-
-					fd.setTitle(FilterConstants.ROADMAP);
-					fd.setInput(UmaUtil.getMethodLibrary((EObject) element));
-					fd.setBlockOnOpen(true);
-					fd.open();
-					addGuidances(fd.getSelectedItems());
-					viewer_1.refresh();
-				}
-			});
-
-			ctrl_remove_1.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					IStructuredSelection selection = (IStructuredSelection) viewer_1
-							.getSelection();
-					if (selection.size() > 0) {
-						// update the model
-						ArrayList rmItems = new ArrayList();
-						rmItems.addAll(selection.toList());
-						removeGuidances(rmItems);
-						viewer_1.refresh();
-
-						// clear the selection
-						viewer_1.setSelection(null, true);
-					}
-					ctrl_remove_1.setEnabled(false);
-				}
-			});
-		}
-
-		{
-			ctrl_table_2.addFocusListener(new FocusAdapter() {
-				public void focusGained(FocusEvent e) {
-					IStructuredSelection selection = (IStructuredSelection) viewer_2
-							.getSelection();
-					if ((selection.size() > 0) && editable)
-						ctrl_remove_2.setEnabled(true);
-				}
-			});
-
-			viewer_2
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) viewer_2
-									.getSelection();
-							if ((selection.size() > 0) && editable)
-								ctrl_remove_2.setEnabled(true);
-						}
-					});
-
-			ctrl_add_2.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					IFilter filter = getGeneralGuidanceFilter();
-					ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-							.getWorkbench().getActiveWorkbenchWindow()
-							.getShell(), filter, element,
-							FilterConstants.GUIDANCE, getExistingElements()); //$NON-NLS-1$
-
-					fd.setTitle(FilterConstants.GUIDANCE);
-					fd.setInput(UmaUtil.getMethodLibrary((EObject) element));
-					fd.setBlockOnOpen(true);
-					fd.setTypes(getFilterTypes());
-					fd.open();
-					addGuidances(fd.getSelectedItems());
-					viewer_2.refresh();
-				}
-			});
-
-			ctrl_remove_2.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					IStructuredSelection selection = (IStructuredSelection) viewer_2
-							.getSelection();
-					if (selection.size() > 0) {
-						// update the model
-						ArrayList rmItems = new ArrayList();
-						rmItems.addAll(selection.toList());
-						removeGuidances(rmItems);
-						viewer_2.refresh();
-
-						// clear the selection
-						viewer_2.setSelection(null, true);
-					}
-					ctrl_remove_2.setEnabled(false);
-				}
-			});
-		}
-
-		{
-			ctrl_table_3.addFocusListener(new FocusAdapter() {
-				public void focusGained(FocusEvent e) {
-					IStructuredSelection selection = (IStructuredSelection) viewer_3
-							.getSelection();
-					if ((selection.size() > 0) && editable)
-						ctrl_remove_3.setEnabled(true);
-				}
-			});
-
-			viewer_3
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) viewer_3
-									.getSelection();
-							if ((selection.size() > 0) && editable)
-								ctrl_remove_3.setEnabled(true);
-						}
-					});
-
-			ctrl_add_3.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					if (element instanceof DeliveryProcess) {
-						DeliveryProcess proc = (DeliveryProcess) element;
-
-						IFilter filter = getSupportingMaterialFilter();
-						ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-								.getWorkbench().getActiveWorkbenchWindow()
-								.getShell(), filter, proc,
-								FilterConstants.SUPPORTING_MATERIALS, proc
-										.getCommunicationsMaterials());
-
-						fd.setTitle(FilterConstants.GUIDANCE);
-						fd
-								.setInput(UmaUtil
-										.getMethodLibrary((EObject) element));
-						fd.setBlockOnOpen(true);
-						fd.open();
-
-						actionMgr
-								.doAction(
-										IActionManager.ADD_MANY,
-										proc,
-										UmaPackage.eINSTANCE
-												.getDeliveryProcess_CommunicationsMaterials(),
-										fd.getSelectedItems(), -1);
-					}
-
-					viewer_3.refresh();
-				}
-			});
-
-			ctrl_remove_3.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					IStructuredSelection selection = (IStructuredSelection) viewer_3
-							.getSelection();
-					if (selection.size() > 0) {
-						// update the model
-						ArrayList rmItems = new ArrayList();
-						rmItems.addAll(selection.toList());
-
-						if (element instanceof DeliveryProcess) {
-							DeliveryProcess proc = (DeliveryProcess) element;
-							actionMgr
-									.doAction(
-											IActionManager.REMOVE_MANY,
-											proc,
-											UmaPackage.eINSTANCE
-													.getDeliveryProcess_CommunicationsMaterials(),
-											rmItems, -1);
-						}
-						viewer_3.refresh();
-
-						// clear the selection
-						viewer_3.setSelection(null, true);
-					}
-					ctrl_remove_3.setEnabled(false);
-				}
-			});
-		}
-
-		{
-			ctrl_table_4.addFocusListener(new FocusAdapter() {
-				public void focusGained(FocusEvent e) {
-					IStructuredSelection selection = (IStructuredSelection) viewer_4
-							.getSelection();
-					if ((selection.size() > 0) && editable)
-						ctrl_remove_4.setEnabled(true);
-				}
-			});
-
-			viewer_4
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) viewer_4
-									.getSelection();
-							if ((selection.size() > 0) && editable)
-								ctrl_remove_4.setEnabled(true);
-						}
-					});
-
-			ctrl_add_4.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					if (element instanceof DeliveryProcess) {
-						DeliveryProcess proc = (DeliveryProcess) element;
-
-						IFilter filter = getSupportingMaterialFilter();
-						ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-								.getWorkbench().getActiveWorkbenchWindow()
-								.getShell(), filter, proc,
-								FilterConstants.SUPPORTING_MATERIALS, proc
-										.getEducationMaterials());
-
-						fd.setTitle(FilterConstants.GUIDANCE);
-						fd
-								.setInput(UmaUtil
-										.getMethodLibrary((EObject) element));
-						fd.setBlockOnOpen(true);
-						fd.open();
-
-						actionMgr
-								.doAction(
-										IActionManager.ADD_MANY,
-										proc,
-										UmaPackage.eINSTANCE
-												.getDeliveryProcess_EducationMaterials(),
-										fd.getSelectedItems(), -1);
-
-						viewer_4.refresh();
-					}
-				}
-			});
-
-			ctrl_remove_4.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					IStructuredSelection selection = (IStructuredSelection) viewer_4
-							.getSelection();
-					if (selection.size() > 0) {
-						// update the model
-						ArrayList rmItems = new ArrayList();
-						rmItems.addAll(selection.toList());
-						if (element instanceof DeliveryProcess) {
-							DeliveryProcess proc = (DeliveryProcess) element;
-							actionMgr
-									.doAction(
-											IActionManager.REMOVE_MANY,
-											proc,
-											UmaPackage.eINSTANCE
-													.getDeliveryProcess_EducationMaterials(),
-											rmItems, -1);
-						}
-						viewer_4.refresh();
-
-						// clear the selection
-						viewer_4.setSelection(null, true);
-
-					}
-					ctrl_remove_4.setEnabled(false);
-				}
-			});
-		}
-
-	}
-
-	/**
-	 * Add guidances to the element
-	 * @param addItems
-	 * 				list of guidances to add
-	 */
-	private void addGuidances(ArrayList addItems) {
-		// update the model
-
-		AddGuidanceToActivityCommand command = new AddGuidanceToActivityCommand(
-				element, addItems);
-		actionMgr.execute(command);
-	}
-
-	/**
-	 * Remove guidances from the element
-	 * @param rmItems
-	 * 				list of guidances to remove
-	 */
-	private void removeGuidances(ArrayList rmItems) {
-		// update the model
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				Guidance item = (Guidance) it.next();
-
-				// guidances for activity
-				if (item instanceof Checklist) {
-					actionMgr.doAction(IActionManager.REMOVE, element,
-							UmaPackage.eINSTANCE.getActivity_Checklists(),
-							item, -1);
-				} else if (item instanceof Concept) {
-					actionMgr.doAction(IActionManager.REMOVE, element,
-							UmaPackage.eINSTANCE.getActivity_Concepts(), item,
-							-1);
-				} else if (item instanceof Example) {
-					actionMgr.doAction(IActionManager.REMOVE, element,
-							UmaPackage.eINSTANCE.getActivity_Examples(), item,
-							-1);
-				} else if (item instanceof SupportingMaterial) {
-					actionMgr.doAction(IActionManager.REMOVE, element,
-							UmaPackage.eINSTANCE
-									.getActivity_SupportingMaterials(), item,
-							-1);
-				} else if (item instanceof Guideline) {
-					actionMgr.doAction(IActionManager.REMOVE, element,
-							UmaPackage.eINSTANCE.getActivity_Guidelines(),
-							item, -1);
-				} else if (item instanceof ReusableAsset) {
-					actionMgr.doAction(IActionManager.REMOVE, element,
-							UmaPackage.eINSTANCE.getActivity_ReusableAssets(),
-							item, -1);
-				} else if (item instanceof Roadmap) {
-					actionMgr.doAction(IActionManager.REMOVE, element,
-							UmaPackage.eINSTANCE.getActivity_Roadmaps(), item,
-							-1);
-				} else {
-					logger
-							.logError("Can't remove Guidance: " + item.getType().getName() + ":" + item.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get existing guidances of the element
-	 * @return
-	 * 			list of existing guidances.
-	 */
-	private List getExistingElements() {
-
-		List itemList = new ArrayList();
-
-		itemList.addAll(element.getChecklists());
-		itemList.addAll(element.getConcepts());
-		itemList.addAll(element.getExamples());
-		itemList.addAll(element.getGuidelines());
-		itemList.addAll(element.getReusableAssets());
-		itemList.addAll(element.getSupportingMaterials());
-
-		DiagramInfo info = new DiagramInfo((Activity) element);
-		if (info.getActivityDiagram() != null)
-			itemList.add(info.getActivityDiagram());
-		if (info.getActivityDetailDiagram() != null)
-			itemList.add(info.getActivityDetailDiagram());
-		if (info.getWPDDiagram() != null)
-			itemList.add(info.getWPDDiagram());
-
-		return itemList;
-	}
-
-	/**
-	 * Get selected guidances
-	 * @return
-	 * 			list of selected guidances
-	 */
-	private List getSelectedGuidances() {
-		List itemList = new ArrayList();
-
-		itemList.addAll(element.getChecklists());
-		itemList.addAll(element.getConcepts());
-		itemList.addAll(element.getExamples());
-		itemList.addAll(element.getGuidelines());
-		itemList.addAll(element.getReusableAssets());
-		List supportingMaterials = element.getSupportingMaterials();
-		DiagramInfo info = new DiagramInfo((Activity) element);
-		for (Iterator itor = supportingMaterials.iterator(); itor.hasNext();) {
-			Object obj = itor.next();
-			if (obj instanceof SupportingMaterial)
-				if (!info.isDiagram((SupportingMaterial) obj)) {
-					itemList.add(obj);
-				}
-		}
-
-		return itemList;
-	}
-
-	/**
-	 * Return list of filter types
-	 */
-	protected String[] getFilterTypes() {
-		String[] str = new String[14];
-		int i = 0;
-		str[i++] = FilterConstants.GUIDANCE;
-		str[i++] = FilterConstants.space + FilterConstants.CHECKLISTS;
-		str[i++] = FilterConstants.space + FilterConstants.CONCEPTS;
-		str[i++] = FilterConstants.space
-				+ FilterConstants.ESTIMATE_CONSIDERATIONS;
-		str[i++] = FilterConstants.space + FilterConstants.EXAMPLES;
-		str[i++] = FilterConstants.space + FilterConstants.GUIDELINES;
-		str[i++] = FilterConstants.space + FilterConstants.PRACTICES;
-		str[i++] = FilterConstants.space + FilterConstants.REPORTS;
-		str[i++] = FilterConstants.space + FilterConstants.REUSABLE_ASSETS;
-		str[i++] = FilterConstants.space + FilterConstants.SUPPORTING_MATERIALS;
-		str[i++] = FilterConstants.space + FilterConstants.TEMPLATES;
-		str[i++] = FilterConstants.space + FilterConstants.TOOL_MENTORS;
-		str[i++] = FilterConstants.space + FilterConstants.WHITE_PAPERS;
-		str[i++] = FilterConstants.space + FilterConstants.TERM_DEFINITIONS;
-		return str;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityRollupSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityRollupSection.java
deleted file mode 100755
index 7395f9e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityRollupSection.java
+++ /dev/null
@@ -1,219 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.editors.ColumnDescriptor;
-import org.eclipse.epf.authoring.ui.providers.ExposedAdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.views.ProcessViewer;
-import org.eclipse.epf.library.edit.process.IBSItemProvider;
-import org.eclipse.epf.library.edit.process.IColumnAware;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-
-/**
- * The rollup section for activity
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public abstract class ActivityRollupSection extends AbstractSection {
-	// controls
-	private FormToolkit toolkit;
-
-	protected Section section;
-
-	private Composite rollupComposite;
-
-	private ProcessViewer viewer;
-
-	// private TabbedPropertySheetPage tabbedPropertySheetPage;
-
-	// element
-	private Activity element;
-
-	// action manager
-	// protected IActionManager actionMgr;
-
-	protected IPreferenceStore store;
-
-	protected ColumnDescriptor[] columnDescriptors;
-
-	protected ComposedAdapterFactory adapterFactory;
-
-	private ILabelProvider labelProvider;
-
-	private IContentProvider contentProvider;
-
-	/**
-	 * Initialize
-	 * 
-	 */
-	private void init() {
-		// get Activity object
-		element = (Activity) getElement();
-
-		// get toolkit
-		toolkit = getWidgetFactory();
-
-		// get action manager
-		// actionMgr = EPFPropertySheetPage.getActionManager();
-
-		// get preference store
-		store = AuthoringUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.AbstractSection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-		super.createControls(parent, tabbedPropertySheetPage);
-		init();
-
-		// this.tabbedPropertySheetPage = tabbedPropertySheetPage;
-
-		parent.setLayout(new GridLayout());
-		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// create rollup section
-		createRollupSection(parent);
-
-		// addListeners();
-
-	}
-
-	/**
-	 * Create rollup section on the composite
-	 * @param composite
-	 */
-	private void createRollupSection(Composite composite) {
-		// create section
-		section = FormUI
-				.createSection(toolkit, composite, PropertiesResources.Activity_WorkRollup, //$NON-NLS-1$
-						PropertiesResources.Activity_WorkRollupDescription); //$NON-NLS-1$
-
-		// create rollup composite
-		rollupComposite = FormUI.createComposite(toolkit, section, 2, false);
-
-		// set section labels
-		setSectionLabels();
-
-		// create viewer
-		viewer = new ProcessViewer(rollupComposite, SWT.MULTI | SWT.H_SCROLL
-				| SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);
-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData.verticalIndent = 10;
-		// gridData.heightHint = 600;
-		viewer.getControl().setLayoutData(gridData);
-
-		// initAdapterFactory
-		initAdapterFactory();
-
-		// set up columns
-		viewer.setupColumns(columnDescriptors);
-		setColumnIndexToNameMap(adapterFactory, columnDescriptors);
-
-		// set up providers
-		viewer.setContentProvider(new ExposedAdapterFactoryContentProvider(
-				adapterFactory));
-		viewer
-				.setLabelProvider(new AdapterFactoryLabelProvider(
-						adapterFactory));
-
-		// do roll up
-		rollUp();
-
-	}
-
-	private void rollUp() {
-		// set up columns
-		viewer.setInput(element);
-		IBSItemProvider adapter = (IBSItemProvider) adapterFactory.adapt(
-				element, ITreeItemContentProvider.class);
-		adapter.setRolledUp(true);
-		viewer.refresh();
-	}
-
-	private static void setColumnIndexToNameMap(AdapterFactory factory,
-			ColumnDescriptor[] columnDescriptors) {
-		Map columnIndexToNameMap = new HashMap();
-		for (int i = 0; i < columnDescriptors.length; i++) {
-			columnIndexToNameMap.put(new Integer(i), columnDescriptors[i].id);
-		}
-		((IColumnAware) factory).setColumnIndexToNameMap(columnIndexToNameMap);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.AbstractSection#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		if (adapterFactory != null) {
-			adapterFactory.dispose();
-		}
-		if (labelProvider != null) {
-			labelProvider.dispose();
-		}
-		if (contentProvider != null) {
-			contentProvider.dispose();
-		}
-	}
-
-
-	/**
-	 * @see org.eclipse.ui.views.properties.tabbed.AbstractPropertySection#refresh()
-	 */
-	public void refresh() {
-		try {
-			// get Activity object
-			if (getElement() instanceof Activity) {
-				element = (Activity) getElement();
-
-				rollUp();
-			}
-		} catch (Exception ex) {
-			logger.logError(
-					"Error refreshing activity work roll up section", ex); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Initialize adapter factory
-	 *
-	 */
-	protected abstract void initAdapterFactory();
-
-	/**
-	 * Set label for the section
-	 *
-	 */
-	protected abstract void setSectionLabels();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityTeamRollupSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityTeamRollupSection.java
deleted file mode 100755
index 5087694..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityTeamRollupSection.java
+++ /dev/null
@@ -1,53 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import org.eclipse.epf.authoring.ui.forms.ProcessFormUtil;
-import org.eclipse.epf.authoring.ui.preferences.ApplicationPreferenceConstants;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.util.ConfigurableComposedAdapterFactory;
-
-
-/**
- * The team rollup section for activity
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class ActivityTeamRollupSection extends ActivityRollupSection {
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.ActivityRollupSection#initAdapterFactory()
-	 */
-	protected void initAdapterFactory() {
-		// get column descriptors
-		columnDescriptors = ProcessFormUtil.toColumnDescriptors(store
-				.getString(ApplicationPreferenceConstants.PREF_TBS_COLUMNS));
-
-		// create adapter factory
-		adapterFactory = TngAdapterFactory.INSTANCE
-				.createTBSComposedAdapterFactory();
-		if (adapterFactory instanceof ConfigurableComposedAdapterFactory) {
-			((ConfigurableComposedAdapterFactory) adapterFactory)
-					.setFilter(configurator);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.ActivityRollupSection#setSectionLabels()
-	 */
-	protected void setSectionLabels() {
-		section.setText(PropertiesResources.Activity_TeamRollup); 
-		section.setDescription(PropertiesResources.Activity_TeamRollupDescription); //$NON-NLS-1$
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityWorkProductsRollupSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityWorkProductsRollupSection.java
deleted file mode 100755
index 143641d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityWorkProductsRollupSection.java
+++ /dev/null
@@ -1,53 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import org.eclipse.epf.authoring.ui.forms.ProcessFormUtil;
-import org.eclipse.epf.authoring.ui.preferences.ApplicationPreferenceConstants;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.util.ConfigurableComposedAdapterFactory;
-
-
-/**
- * The work products rollup section for activity
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class ActivityWorkProductsRollupSection extends ActivityRollupSection {
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.ActivityRollupSection#initAdapterFactory()
-	 */
-	protected void initAdapterFactory() {
-		// get column descriptors
-		columnDescriptors = ProcessFormUtil.toColumnDescriptors(store
-				.getString(ApplicationPreferenceConstants.PREF_WPBS_COLUMNS));
-
-		// create adapter factory
-		adapterFactory = TngAdapterFactory.INSTANCE
-				.createWPBSComposedAdapterFactory();
-		if (adapterFactory instanceof ConfigurableComposedAdapterFactory) {
-			((ConfigurableComposedAdapterFactory) adapterFactory)
-					.setFilter(configurator);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.ActivityRollupSection#setSectionLabels()
-	 */
-	protected void setSectionLabels() {
-		section.setText(PropertiesResources.Activity_WorkProductsRollup); //$NON-NLS-1$
-		section.setDescription(PropertiesResources.Activity_WorkProductsRollupDescription); //$NON-NLS-1$
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityWorkRollupSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityWorkRollupSection.java
deleted file mode 100755
index 22ee348..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ActivityWorkRollupSection.java
+++ /dev/null
@@ -1,98 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.epf.authoring.ui.editors.ColumnDescriptor;
-import org.eclipse.epf.authoring.ui.editors.ProcessEditor;
-import org.eclipse.epf.authoring.ui.preferences.ApplicationPreferenceConstants;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.util.ConfigurableComposedAdapterFactory;
-
-import com.ibm.icu.util.StringTokenizer;
-
-
-/**
- * The work rollup section for activity
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class ActivityWorkRollupSection extends ActivityRollupSection {
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.ActivityRollupSection#initAdapterFactory()
-	 */
-	protected void initAdapterFactory() {
-		// get column descriptors
-		columnDescriptors = toColumnDescriptors(store
-				.getString(ApplicationPreferenceConstants.PREF_WBS_COLUMNS));
-
-		// create adapter factory
-		adapterFactory = TngAdapterFactory.INSTANCE
-				.createWBSComposedAdapterFactory();
-
-		if (adapterFactory instanceof ConfigurableComposedAdapterFactory) {
-			((ConfigurableComposedAdapterFactory) adapterFactory)
-					.setFilter(configurator);
-		}
-
-	}
-
-	/**
-	 * Convert string into colum descriptor list
-	 * @param str
-	 * @return
-	 * 		List of column descriptors
-	 */
-	public static EList toColumnDescriptorList(String str) {
-		EList columnDescriptors = new BasicEList();
-		StringTokenizer tokens = new StringTokenizer(str, ","); //$NON-NLS-1$
-		while (tokens.hasMoreTokens()) {
-			String token = tokens.nextToken();
-			// DON"T PUT INDEX COLUMN
-			if (!(token.equals(ProcessEditor.COL_DESC_ID.id))) {
-				Object columnDescriptor = ProcessEditor.idToColumnDescriptorMap
-						.get(token);
-				if (columnDescriptor != null) {
-					columnDescriptors.add(columnDescriptor);
-				}
-			}
-		}
-		return columnDescriptors;
-	}
-
-	/**
-	 * Convert string into column descriptors
-	 * @param str
-	 * @return
-	 * 		list of column descriptors
-	 */
-	public static ColumnDescriptor[] toColumnDescriptors(String str) {
-		List list = toColumnDescriptorList(str);
-		ColumnDescriptor[] columns = new ColumnDescriptor[list.size()];
-		list.toArray(columns);
-		return columns;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.ActivityRollupSection#setSectionLabels()
-	 */
-	protected void setSectionLabels() {
-		section.setText(PropertiesResources.Activity_WorkRollup); 
-		section.setDescription(PropertiesResources.Activity_WorkRollupDescription); //$NON-NLS-1$
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/BreakdownElementDocumentSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/BreakdownElementDocumentSection.java
deleted file mode 100755
index cd594db..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/BreakdownElementDocumentSection.java
+++ /dev/null
@@ -1,539 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.io.File;
-import java.util.Iterator;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIImages;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.forms.BaseFormPage;
-import org.eclipse.epf.authoring.ui.forms.MethodFormToolkit;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichTextEditor;
-import org.eclipse.epf.authoring.ui.util.RichTextImageLinkContainer;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.richtext.RichTextListener;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.BreakdownElementDescription;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.jface.fieldassist.DecoratedField;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-
-/**
- * The breakdown element documentation section
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class BreakdownElementDocumentSection extends AbstractSection {
-
-	// controls
-	protected Text prefixText;
-
-	protected Text briefDescText;
-
-	protected FormToolkit toolkit;
-
-	protected Section documentSection;
-
-	protected Composite documentComposite;
-
-	protected Composite expandDocumentComposite;
-
-	protected IMethodRichTextEditor ctrl_document_expanded;
-
-	protected IMethodRichText usageGuidance;
-
-	protected IMethodRichText keyConsiderations;
-
-	protected Text ctrl_document_expanded_Text;
-
-	protected ImageHyperlink expandDocumentLink;
-
-	protected DecoratedField expandDocumentLabel;
-
-	protected boolean expandFlag = false;
-
-	protected boolean expandFlagText = false;
-
-	protected IMethodRichText activeControl;
-
-	protected Text activeControlText;
-
-	// element
-	protected BreakdownElement element;
-
-	// action manager
-	protected IActionManager actionMgr;
-
-	// modify listener
-	protected ModifyListener modelModifyListener;
-
-	protected ModifyListener contentModifyListener;
-
-	protected String contentElementPath;
-
-	protected String type = ""; //$NON-NLS-1$
-
-	protected String contentElementName = ""; //$NON-NLS-1$
-
-	protected int heightHint = 40;
-	
-	private Listener usageGuidanceListener = new Listener() {
-		public void handleEvent(Event e) {
-			element = (BreakdownElement) getElement();
-			IMethodRichText control = expandFlag ? ctrl_document_expanded
-					: usageGuidance;
-			if (!control.getModified()) {
-				return;
-			}
-			String oldContent = ((BreakdownElementDescription) element
-					.getPresentation()).getUsageGuidance();
-			if (((MethodElementEditor) getEditor()).mustRestoreValue(
-					usageGuidance, oldContent)) {
-				return;
-			}
-			String newContent = control.getText();
-			if (!newContent.equals(oldContent)) {
-				actionMgr.doAction(IActionManager.SET, element
-						.getPresentation(), UmaPackage.eINSTANCE
-						.getBreakdownElementDescription_UsageGuidance(),
-						newContent, -1);
-			}
-		}
-	};
-
-	private Listener keyConsiderationsListener = new Listener() {
-		public void handleEvent(Event e) {
-			element = (BreakdownElement) getElement();
-			IMethodRichText control = expandFlag ? ctrl_document_expanded
-					: keyConsiderations;
-			if (!control.getModified()) {
-				return;
-			}
-			String oldContent = ((ContentDescription) element.getPresentation())
-					.getKeyConsiderations();
-			if (((MethodElementEditor) getEditor()).mustRestoreValue(
-					keyConsiderations, oldContent)) {
-				return;
-			}
-			String newContent = control.getText();
-			if (!newContent.equals(oldContent)) {
-				actionMgr.doAction(IActionManager.SET, element
-						.getPresentation(), UmaPackage.eINSTANCE
-						.getContentDescription_KeyConsiderations(), newContent,
-						-1);
-			}
-		}
-	};
-
-	/**
-	 * Initialize
-	 */
-	protected void init() {
-		// get BreakdownElement object
-		element = (BreakdownElement) getElement();
-
-		// get toolkit
-		toolkit = getWidgetFactory();
-
-		// get action manager
-		actionMgr = EPFPropertySheetPage.getActionManager();
-
-		// set content element path
-		String libPath = LibraryService.getInstance().getCurrentMethodLibraryPath();
-		contentElementPath = libPath + File.separator
-				+ ResourceHelper.getElementPath(element);
-
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.AbstractSection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-		super.createControls(parent, tabbedPropertySheetPage);
-		init();
-
-		parent.setLayout(new GridLayout());
-		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// create Docment section
-		createDocumentSection(parent);
-
-		// add listeners
-		addListeners();
-
-		// update controls
-		updateControls();
-	}
-
-	/**
-	 * Add listeners
-	 */
-	protected void addListeners() {
-
-		prefixText.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getBreakdownElement_Prefix());
-			}
-
-			public void focusLost(FocusEvent e) {
-				element = (BreakdownElement) getElement();
-				String oldContent = element.getPrefix();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						prefixText, oldContent)) {
-					return;
-				}
-				String newContent = StrUtil.getPlainText(prefixText.getText());
-				if (!newContent.equals(oldContent)) {
-					boolean status = actionMgr.doAction(IActionManager.SET,
-							element, UmaPackage.eINSTANCE
-									.getBreakdownElement_Prefix(), newContent,
-							-1);
-					if (status) {
-						prefixText.setText(newContent);
-					}
-				}
-			}
-		});
-
-		briefDescText.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getMethodElement_BriefDescription());
-			}
-
-			public void focusLost(FocusEvent e) {
-				element = (BreakdownElement) getElement();
-				String oldContent = element.getBriefDescription();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						briefDescText, oldContent)) {
-					return;
-				}
-				String newContent = StrUtil.getPlainText(briefDescText
-						.getText());
-				if (!newContent.equals(oldContent)) {
-					boolean status = actionMgr.doAction(IActionManager.SET,
-							element, UmaPackage.eINSTANCE
-									.getMethodElement_BriefDescription(),
-							newContent, -1);
-					if (status) {
-						briefDescText.setText(newContent);
-					}
-				}
-			}
-		});
-
-		BreakdownElement element = getElement();
-		
-		usageGuidance.setModalObject(element);
-		usageGuidance.setModalObjectFeature(UmaPackage.eINSTANCE.getBreakdownElementDescription_UsageGuidance());
-		usageGuidance.addListener(SWT.Deactivate, usageGuidanceListener);
-		
-		keyConsiderations.setModalObject(element);
-		keyConsiderations.setModalObjectFeature(UmaPackage.eINSTANCE.getContentDescription_KeyConsiderations());
-		keyConsiderations
-				.addListener(SWT.Deactivate, keyConsiderationsListener);
-	}
-
-	/**
-	 * Add documentation section on the given composite
-	 * @param composite
-	 */
-	protected void createDocumentSection(Composite composite) {
-		int horizontalSpan = 2;
-
-		// create document section
-		documentSection = FormUI
-				.createSection(
-						toolkit,
-						composite,
-						PropertiesResources.Process_DocumentInformationTitle, //$NON-NLS-1$
-						PropertiesResources.bind(PropertiesResources.Process_documentInformationDescription, PropertiesUtil.getTypeLower(element))); 
-
-		// create document composite
-		documentComposite = FormUI.createComposite(toolkit, documentSection, 3,
-				false);
-
-		// prefix
-		FormUI.createLabel(toolkit, documentComposite, PropertiesResources.Process_prefix, horizontalSpan); //$NON-NLS-1$
-		prefixText = FormUI.createText(toolkit, documentComposite, heightHint);
-
-		// brief description
-		FormUI.createLabel(toolkit, documentComposite, PropertiesResources.Process_briefDescription, horizontalSpan); //$NON-NLS-1$
-		briefDescText = FormUI.createText(toolkit, documentComposite,
-				heightHint);
-
-		// create usage guidance
-		RichTextImageLinkContainer usageGuidanceContainer = FormUI.createRichTextWithLink(toolkit,
-				documentComposite, heightHint, contentElementPath, element,
-				PropertiesResources.Process_usageGuidance);
-		addHyperLinkListener(usageGuidanceContainer.link);
-		usageGuidance = usageGuidanceContainer.richText;
-
-		// create key considerations
-		RichTextImageLinkContainer keyConsiderationsContainer = FormUI.createRichTextWithLink(toolkit,
-				documentComposite, heightHint, contentElementPath, element,
-				PropertiesResources.BreakdownElement_keyConsiderations);
-		addHyperLinkListener(keyConsiderationsContainer.link);
-		keyConsiderations = keyConsiderationsContainer.richText;
-
-		// create expanded composite
-		expandDocumentComposite = FormUI.createComposite(toolkit,
-				documentSection, 2, true);
-
-		// Hyperlink desc
-		expandDocumentLink = FormUI.createImageHyperLink(toolkit,
-				expandDocumentComposite, AuthoringUIImages.IMG_EXPANDED,
-				AuthoringUIResources.closeRTE); 
-		addHyperLinkListener(expandDocumentLink);
-
-		// expand label
-		expandDocumentLabel = BaseFormPage.createDecoratedLabel(toolkit, expandDocumentComposite, ""); //$NON-NLS-1$
-	}
-
-	protected void addHyperLinkListener(ImageHyperlink link) {
-		link.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				toggle(e);
-			}
-		});
-	}
-
-	protected IMethodRichTextEditor toggle(HyperlinkEvent e) {
-		IMethodRichText ctrl = (IMethodRichText) e.getHref();
-		if (ctrl_document_expanded == null) {
-			ctrl_document_expanded = MethodFormToolkit.createRichTextEditor(
-					toolkit, expandDocumentComposite,
-					"", SWT.MULTI | SWT.WRAP, contentElementPath, element, expandDocumentLabel); //$NON-NLS-1$
-			{
-				GridData gridData = new GridData(GridData.FILL_BOTH);
-				gridData.heightHint = 400;
-				gridData.horizontalSpan = 2;
-				ctrl_document_expanded.setLayoutData(gridData);
-			}
-
-			ctrl_document_expanded.addModifyListener(contentModifyListener);
-		}
-
-		if (expandFlag) {
-			documentComposite.setVisible(true);
-			documentSection.setClient(documentComposite);
-
-			expandDocumentComposite.setVisible(false);
-
-			ctrl = getActiveRichTextControl();
-			ctrl.setText(ctrl_document_expanded.getText());
-
-			for (Iterator i = ctrl.getListeners(); i.hasNext();) {
-				RichTextListener listener = (RichTextListener) i.next();
-				ctrl_document_expanded.removeListener(listener.getEventType(),
-						listener.getListener());
-			}
-
-			if (ctrl_document_expanded.getModified()) {
-				((MethodElementEditor) getEditor())
-						.saveModifiedRichText(ctrl_document_expanded);
-			}
-
-			ctrl.setFocus();
-		} else {
-			// expanded
-			documentComposite.setVisible(false);
-			documentSection.setClient(expandDocumentComposite);
-
-			expandDocumentComposite.setVisible(true);
-
-			((Label)expandDocumentLabel.getControl()).setText((String) ((ImageHyperlink) e
-					.getSource()).getData("Title")); //$NON-NLS-1$
-			setActiveRichTextControl(ctrl);
-			ctrl_document_expanded.setText(ctrl.getText());
-			ctrl_document_expanded.setModalObject(ctrl.getModalObject());
-			ctrl_document_expanded.setModalObjectFeature(ctrl
-					.getModalObjectFeature());
-			ctrl_document_expanded.setFindReplaceAction(ctrl.getFindReplaceAction());
-
-			for (Iterator i = ctrl.getListeners(); i.hasNext();) {
-				RichTextListener listener = (RichTextListener) i.next();
-				ctrl_document_expanded.addListener(listener.getEventType(),
-						listener.getListener());
-			}
-
-		}
-
-		documentSection.layout(true);
-
-		// set editable
-		if (ctrl_document_expanded != null)
-			ctrl_document_expanded.setEditable(editable);
-
-		expandFlag = !expandFlag;
-		return ctrl_document_expanded;
-	}
-
-
-	/**
-	 * @see org.eclipse.ui.views.properties.tabbed.AbstractPropertySection#refresh()
-	 */
-	public void refresh() {
-		try {
-			if (getElement() instanceof BreakdownElement) {
-				((MethodElementEditor) getEditor()).saveModifiedRichText();
-
-				element = (BreakdownElement) getElement();
-				BreakdownElementDescription content = (BreakdownElementDescription) element
-						.getPresentation();
-
-				// update section name
-				documentSection
-						.setDescription(PropertiesResources.bind(PropertiesResources.Process_documentInformationDescription, PropertiesUtil.getTypeLower(element))); 
-
-				if (modelModifyListener != null) {
-					prefixText.removeModifyListener(modelModifyListener);
-					briefDescText.removeModifyListener(modelModifyListener);
-				}
-
-				if (contentModifyListener != null) {
-					usageGuidance.removeModifyListener(contentModifyListener);
-					keyConsiderations
-							.removeModifyListener(contentModifyListener);
-				}
-
-				modelModifyListener = getEditor().createModifyListener(element);
-				contentModifyListener = getEditor().createModifyListener(
-						element.getPresentation());
-
-				if (modelModifyListener != null
-						&& modelModifyListener instanceof MethodElementEditor.ModifyListener) {
-					((MethodElementEditor.ModifyListener) modelModifyListener)
-							.setElement(element);
-					((MethodElementEditor.ModifyListener) modelModifyListener)
-							.setDisable(true);
-				}
-
-				if (contentModifyListener != null
-						&& contentModifyListener instanceof MethodElementEditor.ModifyListener) {
-					((MethodElementEditor.ModifyListener) contentModifyListener)
-							.setElement(element.getPresentation());
-					((MethodElementEditor.ModifyListener) contentModifyListener)
-							.setDisable(true);
-				}
-
-				prefixText.setText(element.getPrefix());
-				briefDescText.setText(element.getBriefDescription());
-
-				usageGuidance.setText(content.getUsageGuidance());
-				keyConsiderations.setText(content.getKeyConsiderations());
-
-				if (expandFlag) {
-					if (((Label)expandDocumentLabel.getControl()).getText().equals(
-							PropertiesResources.Process_usageGuidance)) //$NON-NLS-1$
-					{
-						ctrl_document_expanded.setText(content
-								.getUsageGuidance());
-						ctrl_document_expanded.setSelection(0);
-						ctrl_document_expanded.setModalObject(content);
-						ctrl_document_expanded
-								.setModalObjectFeature(UmaPackage.eINSTANCE
-										.getBreakdownElementDescription_UsageGuidance());
-					} else if (((Label)expandDocumentLabel.getControl())
-							.getText()
-							.equals(
-									PropertiesResources.BreakdownElement_keyConsiderations)) //$NON-NLS-1$
-					{
-						ctrl_document_expanded.setText(content
-								.getKeyConsiderations());
-						ctrl_document_expanded.setModalObject(content);
-						ctrl_document_expanded
-								.setModalObjectFeature(UmaPackage.eINSTANCE
-										.getContentDescription_KeyConsiderations());
-					}
-				}
-
-				updateControls();
-
-				if (modelModifyListener instanceof MethodElementEditor.ModifyListener) {
-					((MethodElementEditor.ModifyListener) modelModifyListener)
-							.setDisable(false);
-				}
-				if (contentModifyListener instanceof MethodElementEditor.ModifyListener) {
-					((MethodElementEditor.ModifyListener) contentModifyListener)
-							.setDisable(false);
-				}
-
-				prefixText.addModifyListener(modelModifyListener);
-				briefDescText.addModifyListener(modelModifyListener);
-
-				usageGuidance.setModalObject(content);
-				usageGuidance.setModalObjectFeature(UmaPackage.eINSTANCE
-						.getBreakdownElementDescription_UsageGuidance());
-				usageGuidance.addModifyListener(contentModifyListener);
-
-				keyConsiderations.setModalObject(content);
-				keyConsiderations.setModalObjectFeature(UmaPackage.eINSTANCE
-						.getContentDescription_KeyConsiderations());
-				keyConsiderations.addModifyListener(contentModifyListener);
-			}
-		} catch (Exception ex) {
-			logger
-					.logError(
-							"Error refreshing breakdown element documentation section", ex); //$NON-NLS-1$
-		}
-	}
-
-	protected void updateControls() {
-		prefixText.setEditable(editable);
-		briefDescText.setEditable(editable);
-		usageGuidance.setEditable(editable);
-		keyConsiderations.setEditable(editable);
-	}
-
-	/**
-	 * Sets the active "unexpanded" rich text control.
-	 */
-	private void setActiveRichTextControl(IMethodRichText ctrl) {
-		activeControl = ctrl;
-	}
-
-	/**
-	 * Returns the active "unexpanded" rich text control.
-	 */
-	private IMethodRichText getActiveRichTextControl() {
-		return activeControl;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/BreakdownElementGeneralSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/BreakdownElementGeneralSection.java
deleted file mode 100755
index 226250d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/BreakdownElementGeneralSection.java
+++ /dev/null
@@ -1,686 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.util.Arrays;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.editors.ProcessEditor;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.edit.validation.IValidator;
-import org.eclipse.epf.library.edit.validation.IValidatorFactory;
-import org.eclipse.epf.services.ILibraryPersister;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.internal.views.properties.tabbed.view.TabbedPropertyComposite;
-import org.eclipse.ui.internal.views.properties.tabbed.view.TabbedPropertyTitle;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-
-/**
- * The general tab section for breakdownElement
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class BreakdownElementGeneralSection extends AbstractSection {
-	// controls
-	protected FormToolkit toolkit;
-
-	protected Section generalSection;
-
-	protected Composite generalComposite, checkBoxComposite;
-
-	protected Text nameText;
-
-	protected Text presentationNameText;
-
-	private Button multipleButton, optionalButton;
-
-	private Button plannedButton, supressedButton;
-
-	protected int numOfColumns = 4;
-
-	protected int horizontalSpan = 3;
-
-	// private TabbedPropertySheetPage tabbedPropertySheetPage;
-
-	// element
-	protected BreakdownElement element;
-
-	// action manager
-	protected IActionManager actionMgr;
-
-	// modify listener
-	protected ModifyListener modelModifyListener;
-
-	protected ModifyListener nameModifyListener;
-
-	private ILabelProvider labelProvider;
-
-	final boolean ignoreSuppressed = true;
-
-	protected Listener nameDeactivateListener = new Listener() {
-		public void handleEvent(Event e) {
-			AdapterFactory adapterFactory = EPFPropertySheetPage
-					.getAdapterFactory();
-
-			element = (BreakdownElement) getElement();
-			String oldContent = element.getName();
-			if (((MethodElementEditor) getEditor()).mustRestoreValue(
-					nameText, oldContent)) {
-				return;
-			}
-
-			String message = null;
-			if (!StrUtil.isBlank(element.getName())) {
-				Suppression suppression = EPFPropertySheetPage.getEditor()
-						.getSuppression();
-				message = ProcessUtil.checkBreakdownElementName(
-						adapterFactory, element, nameText.getText(),
-						suppression, ignoreSuppressed);
-			}
-			if (message == null) {
-				if (!nameText.getText().equals(oldContent)) {
-					if ((element instanceof Activity)
-							&& (element.eContainer() instanceof ProcessComponent)) {
-						ProcessComponent procComp = (ProcessComponent) element
-								.eContainer();
-						IValidator validator = IValidatorFactory.INSTANCE
-								.createNameValidator(
-										procComp,
-										TngAdapterFactory.INSTANCE
-												.getNavigatorView_ComposedAdapterFactory());
-						String msg = validator.isValid(nameText.getText());
-
-						if (msg == null) {
-							msg = PropertiesResources.Process_Rename_Message; //$NON-NLS-1$
-
-							if (AuthoringUIPlugin
-									.getDefault()
-									.getMsgDialog()
-									.displayConfirmation(
-											PropertiesResources.Process_Rename_Title, msg)) { //$NON-NLS-1$
-								e.doit = true;
-								boolean status = actionMgr.doAction(
-										IActionManager.SET, element,
-										UmaPackage.eINSTANCE
-												.getNamedElement_Name(),
-										nameText.getText(), -1);
-								if (!status) {
-									return;
-									// nameText.setText(element.getName());
-
-								}
-								actionMgr.doAction(IActionManager.SET,
-										procComp, UmaPackage.eINSTANCE
-												.getNamedElement_Name(),
-										nameText.getText(), -1);
-								getEditor().setPartName();
-
-								// adjust plugin location and save the
-								// editor
-								//
-								BusyIndicator.showWhile(Display
-										.getDefault(), new Runnable() {
-
-									public void run() {
-										MethodElementEditor editor = (MethodElementEditor) getEditor();
-										editor
-												.doSave(new NullProgressMonitor());
-										ILibraryPersister.FailSafeMethodLibraryPersister persister = editor
-												.getPersister();
-										try {
-											persister
-													.adjustLocation(element
-															.eResource());
-											persister.commit();
-										} catch (RuntimeException e) {
-											persister.rollback();
-											throw e;
-										}
-									}
-
-								});
-							} else {
-								// replace with existing name
-								nameText.setText(oldContent);
-								return;
-							}
-						} else {
-							// restore the old name first, then present the
-							// error message box
-							nameText.setText(oldContent);
-							AuthoringUIPlugin
-									.getDefault()
-									.getMsgDialog()
-									.displayError(
-											PropertiesResources.Process_InvalidNameTitle, msg); //$NON-NLS-1$
-							e.doit = false;
-							nameText.getDisplay().asyncExec(new Runnable() {
-								public void run() {
-									nameText.setFocus();
-									nameText.selectAll();
-								}
-							});
-						}
-					} else {
-						e.doit = true;
-						boolean status = actionMgr
-								.doAction(IActionManager.SET, element,
-										UmaPackage.eINSTANCE
-												.getNamedElement_Name(),
-										nameText.getText(), -1);
-						if (!status) {
-							return;
-						}
-					}
-				}
-			} else {
-				// restore the old name first, then present the error
-				// message box
-				nameText.setText(oldContent);
-				AuthoringUIPlugin
-						.getDefault()
-						.getMsgDialog()
-						.displayError(
-								PropertiesResources.Process_InvalidNameTitle, message); //$NON-NLS-1$
-				e.doit = false;
-				nameText.getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						nameText.setFocus();
-						nameText.selectAll();
-					}
-				});
-
-			}
-		}
-	};
-
-	protected Listener presentationNameDeactivateListener = new Listener() {
-		public void handleEvent(Event e) {
-			AdapterFactory adapterFactory = EPFPropertySheetPage
-					.getAdapterFactory();
-
-			element = (BreakdownElement) getElement();
-			String oldContent = element.getPresentationName();
-			if (((MethodElementEditor) getEditor()).mustRestoreValue(
-					presentationNameText, oldContent)) {
-				return;
-			}
-
-			String message = null;
-			
-			// you can have blank presentation name for activity that extends 
-			if (StrUtil.isBlank(presentationNameText.getText())
-					&& element instanceof VariabilityElement) {
-				VariabilityElement ve = (VariabilityElement) element;
-				if (ve.getVariabilityBasedOnElement() != null
-						&& ve.getVariabilityType().equals(
-								VariabilityType.EXTENDS_LITERAL)) {
-					
-					e.doit = true;
-					if (!presentationNameText.getText().equals(oldContent)) {
-						boolean status = actionMgr
-								.doAction(
-										IActionManager.SET,
-										element,
-										UmaPackage.eINSTANCE
-												.getDescribableElement_PresentationName(),
-										presentationNameText.getText(), -1);
-						if (!status) {
-							return;
-						}
-					}
-				}
-			}
-			
-			if (!StrUtil.isBlank(element.getPresentationName())) {
-				Suppression suppression = EPFPropertySheetPage.getEditor()
-						.getSuppression();
-				message = ProcessUtil
-						.checkBreakdownElementPresentationName(
-								adapterFactory, element,
-								presentationNameText.getText(), suppression, ignoreSuppressed);
-			}
-
-			if (message == null) {
-				e.doit = true;
-				if (!presentationNameText.getText().equals(oldContent)) {
-					boolean status = actionMgr
-							.doAction(
-									IActionManager.SET,
-									element,
-									UmaPackage.eINSTANCE
-											.getDescribableElement_PresentationName(),
-									presentationNameText.getText(), -1);
-					if (!status) {
-						return;
-					}
-				}
-			} else {
-				// restore the old name first, then present the error
-				// message box
-				presentationNameText.setText(element.getPresentationName());
-
-				AuthoringUIPlugin
-						.getDefault()
-						.getMsgDialog()
-						.displayError(
-								PropertiesResources.Process_InvalidNameTitle, message); //$NON-NLS-1$
-				e.doit = false;
-				presentationNameText.getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						presentationNameText.setFocus();
-					}
-				});
-			}
-		}
-	};
-	protected void init() {
-		// get BreakdownElement object
-		element = (BreakdownElement) getElement();
-
-		// get toolkit
-		toolkit = getWidgetFactory();
-
-		// get action manager
-		actionMgr = EPFPropertySheetPage.getActionManager();
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.AbstractSection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-		super.createControls(parent, tabbedPropertySheetPage);
-		init();
-		// this.tabbedPropertySheetPage = tabbedPropertySheetPage;
-
-		parent.setLayout(new GridLayout());
-		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// create general section
-		createGeneralSection(parent);
-
-		// addListeners
-		addListeners();
-
-		// update controls
-		updateControls();
-
-	}
-
-	/**
-	 *  Add listeners
-	 */
-	protected void addListeners() {
-		nameText.addListener(SWT.Activate, new Listener() {
-
-			public void handleEvent(Event event) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(event.widget,
-						UmaPackage.eINSTANCE.getNamedElement_Name());
-			}
-			
-		});
-		nameText.addListener(SWT.Deactivate, nameDeactivateListener);
-
-		presentationNameText.addListener(SWT.Activate, new Listener() {
-
-			public void handleEvent(Event event) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(event.widget,
-						UmaPackage.eINSTANCE.getDescribableElement_PresentationName());
-			}
-			
-		});		
-		presentationNameText.addListener(SWT.Deactivate, presentationNameDeactivateListener);
-
-		multipleButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				element = (BreakdownElement) getElement();
-
-				boolean status = actionMgr.doAction(IActionManager.SET,
-						element, UmaPackage.eINSTANCE
-								.getBreakdownElement_HasMultipleOccurrences(),
-						Boolean.valueOf(multipleButton.getSelection()), -1);
-				if (!status)
-					multipleButton.setSelection(element
-							.getHasMultipleOccurrences().booleanValue());
-
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		optionalButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				element = (BreakdownElement) getElement();
-				boolean status = actionMgr.doAction(IActionManager.SET,
-						element, UmaPackage.eINSTANCE
-								.getBreakdownElement_IsOptional(), Boolean
-								.valueOf(optionalButton.getSelection()), -1);
-				if (!status)
-					optionalButton.setSelection(element.getIsOptional()
-							.booleanValue());
-
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		plannedButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				element = (BreakdownElement) getElement();
-				boolean status = actionMgr.doAction(IActionManager.SET,
-						element, UmaPackage.eINSTANCE
-								.getBreakdownElement_IsPlanned(), Boolean
-								.valueOf(plannedButton.getSelection()), -1);
-				if (!status)
-					plannedButton.setSelection(element.getIsPlanned()
-							.booleanValue());
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		supressedButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				element = (BreakdownElement) getElement();
-				if (element.getSuppressed().booleanValue()) {
-					// revealing
-					ProcessEditor editor = getEditor();
-					Suppression suppression = editor.getSuppression();
-					boolean canReveal = ProcessEditor.canReveal(
-							Arrays.asList(new Object[] { element }),
-							EPFPropertySheetPage.getAdapterFactory(),
-							suppression);
-				
-					if (!canReveal)					
-						supressedButton.setSelection(true);	
-					else
-						supressedButton.setSelection(false);
-				}
-				boolean status = actionMgr.doAction(IActionManager.SET,
-						element, UmaPackage.eINSTANCE
-								.getMethodElement_Suppressed(), Boolean
-								.valueOf(supressedButton.getSelection()), -1);
-				if (!status)
-					supressedButton.setSelection(element.getSuppressed()
-							.booleanValue());
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-	}
-
-	/**
-	 * Create general section on the given composite
-	 * @param composite
-	 */
-	protected void createGeneralSection(Composite composite) {
-		// create general section
-		generalSection = FormUI
-				.createSection(
-						toolkit,
-						composite,
-						PropertiesResources.Process_generalInformationTitle, //$NON-NLS-1$
-						PropertiesResources.bind(PropertiesResources.Process_generalInformationDescription, PropertiesUtil.getTypeLower(element))); 
-
-		// create general composite
-		generalComposite = FormUI.createComposite(toolkit, generalSection,
-				numOfColumns, false);
-
-		// name
-		FormUI.createLabel(toolkit, generalComposite, PropertiesResources.Process_name); //$NON-NLS-1$
-		nameText = FormUI.createText(toolkit, generalComposite, SWT.DEFAULT,
-				horizontalSpan);
-
-		// presentation name
-		FormUI.createLabel(toolkit, generalComposite, PropertiesResources.Activity_presentationName); //$NON-NLS-1$
-		presentationNameText = FormUI.createText(toolkit, generalComposite,
-				SWT.DEFAULT, horizontalSpan);
-
-		// create composite for checkbox
-		checkBoxComposite = FormUI.createComposite(toolkit, generalComposite,
-				GridData.FILL_HORIZONTAL, numOfColumns, true);
-
-		// optional
-		optionalButton = FormUI.createCheckButton(toolkit, checkBoxComposite,
-				1);
-		optionalButton.setText(PropertiesResources.BreakdownElement_Option_Optional); //$NON-NLS-1$
-
-		// Multiple Ocurrances
-		multipleButton = FormUI.createCheckButton(toolkit, checkBoxComposite,
-				1);
-		multipleButton.setText(PropertiesResources.BreakdownElement_Option_MultipleOcurrance); //$NON-NLS-1$
-
-		// planned
-		plannedButton = FormUI.createCheckButton(toolkit, checkBoxComposite,
-				1);
-		plannedButton.setText(PropertiesResources.BreakdownElement_Option_Planned); //$NON-NLS-1$
-
-		// supressed
-		supressedButton = FormUI.createCheckButton(toolkit, checkBoxComposite,
-				1);
-		supressedButton.setText(PropertiesResources.BreakdownElement_Option_Supressed); //$NON-NLS-1$
-		supressedButton.setEnabled(false);
-
-		toolkit.paintBordersFor(generalComposite);
-		toolkit.paintBordersFor(checkBoxComposite);
-
-	}
-
-	/**
-	 * Modify listner for name and presentation name
-	 *
-	 */
-	public class NameModifyListener extends MethodElementEditor.ModifyListener {
-		/**
-		 * Creates a new instance.
-		 */
-
-		public NameModifyListener(EObject element, boolean checkContainer) {
-
-			getEditor().super(element, checkContainer);
-		}
-
-		public void modifyText(ModifyEvent e) {
-			super.modifyText(e);
-
-			updateTitle(nameText.getText());
-		}
-	}
-
-	/**
-	 * Create name modify listener for the given object
-	 * @param eObj
-	 * @return
-	 * 			listener
-	 */
-	public ModifyListener createNameModifyListener(EObject eObj) {
-		return createNameModifyListener(eObj, false);
-	}
-
-	public ModifyListener createNameModifyListener(EObject eObj,
-			boolean checkContainer) {
-		return new NameModifyListener(eObj, checkContainer);
-	}
-
-	/**
-	 * Update title of the properties page
-	 * @param txt
-	 * 			new title
-	 */
-	public void updateTitle(String txt) {
-		String name = getNamePrefix() + txt;
-		TabbedPropertyComposite comp = (TabbedPropertyComposite) page
-				.getControl();
-		TabbedPropertyTitle title = comp.getTitle();
-
-		title.setTitle(name, getImage(element));
-	}
-
-	private Image getImage(Object obj) {
-		if (labelProvider == null) {
-			labelProvider = new AdapterFactoryLabelProvider(
-					TngUtil.umaItemProviderAdapterFactory);
-		}
-		Image titleImage = labelProvider.getImage(obj);
-		return titleImage;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.AbstractSection#dispose()
-	 */
-	public void dispose() {
-		if (labelProvider != null) {
-			labelProvider.dispose();
-		}
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-		try {
-			if (getElement() instanceof BreakdownElement) {
-				// get BreakdownElement object
-				element = (BreakdownElement) getElement();
-
-				// update section name
-				generalSection
-						.setDescription(PropertiesResources.bind(PropertiesResources.Process_generalInformationDescription, PropertiesUtil.getTypeLower(element))); 
-
-				// Model Modify listener for presentation name
-				if (modelModifyListener != null) {
-					presentationNameText
-							.removeModifyListener(modelModifyListener);
-				}
-				modelModifyListener = getEditor().createModifyListener(element);
-
-				// Modify listener for name
-				if (nameModifyListener != null)
-					nameText.removeModifyListener(nameModifyListener);
-
-				if (element instanceof Process) {
-					nameModifyListener = createNameModifyListener(
-							((Process) element).eContainer(), true);
-				} else {
-					nameModifyListener = createNameModifyListener(element);
-				}
-
-				if (modelModifyListener instanceof MethodElementEditor.ModifyListener) {
-					((MethodElementEditor.ModifyListener) modelModifyListener)
-							.setElement(element);
-					((MethodElementEditor.ModifyListener) modelModifyListener)
-							.setDisable(true);
-				}
-				if (nameModifyListener instanceof MethodElementEditor.ModifyListener) {
-					((MethodElementEditor.ModifyListener) nameModifyListener)
-							.setDisable(true);
-				}
-
-				nameText.setText(element.getName());
-				presentationNameText.setText(element.getPresentationName());
-
-				if (modelModifyListener instanceof MethodElementEditor.ModifyListener) {
-					((MethodElementEditor.ModifyListener) modelModifyListener)
-							.setDisable(false);
-				}
-				if (nameModifyListener instanceof MethodElementEditor.ModifyListener) {
-					((MethodElementEditor.ModifyListener) nameModifyListener)
-							.setDisable(false);
-				}
-
-				nameText.addModifyListener(nameModifyListener);
-				presentationNameText.addModifyListener(modelModifyListener);
-
-				multipleButton.setSelection(element.getHasMultipleOccurrences()
-						.booleanValue());
-				optionalButton.setSelection(element.getIsOptional()
-						.booleanValue());
-				plannedButton.setSelection(element.getIsPlanned()
-						.booleanValue());
-				// get selected original input object
-				Object input = getInput();
-				if (input instanceof BreakdownElementWrapperItemProvider) {
-					if (getEditor().getSuppression().isInSuppressedList(
-							(BreakdownElementWrapperItemProvider) input)) {
-						supressedButton.setSelection(true);
-					} else {
-						supressedButton.setSelection(false);
-					}
-				} else
-				supressedButton.setSelection(element.getSuppressed()
-						.booleanValue());
-
-				updateControls();
-			}
-		} catch (Exception ex) {
-			logger
-					.logError(
-							"Error refreshing breakdown element general section" + element, ex); //$NON-NLS-1$
-		}
-	}
-
-	protected void updateControls() {
-		nameText.setEditable(editable);
-		presentationNameText.setEditable(editable);
-		nameText.setEnabled(editable);
-		presentationNameText.setEnabled(editable);
-
-		multipleButton.setEnabled(editable);
-		optionalButton.setEnabled(editable);
-		plannedButton.setEnabled(editable);
-//		supressedButton.setEnabled(editable);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/CompositeRoleRoleSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/CompositeRoleRoleSection.java
deleted file mode 100755
index 24c3cdd..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/CompositeRoleRoleSection.java
+++ /dev/null
@@ -1,248 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.dialogs.ItemsFilterDialog;
-import org.eclipse.epf.authoring.ui.filters.DescriptorProcessFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.CompositeRole;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-
-/**
- * The composite role - role section
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class CompositeRoleRoleSection extends OBSRelationSection {
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-		super.createControls(parent, tabbedPropertySheetPage);
-	}
-
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#initContentProvider()
-	 */
-	protected void initContentProvider() {
-		contentProvider = new AdapterFactoryContentProvider(getAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				element = getElement();
-				return getFilteredList(
-						((CompositeRole) element).getAggregatedRoles())
-						.toArray();
-			}
-		};
-
-		viewer.setContentProvider(contentProvider);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#init()
-	 */
-	protected void init() {
-		super.init();
-		element = (CompositeRole) element;
-
-		String title = PropertiesResources.CompositeRole_Role_SectionTitle;
-		String desc = PropertiesResources.CompositeRole_Role_SectionDescription;
-		String table1 = PropertiesResources.CompositeRole_Role_Table1;
-		setTabData(title, desc, table1); //$NON-NLS-1$ //$NON-NLS-2$
-		showAddFromProcessButton = true;
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#refresh()
-	 */
-	public void refresh() {
-		try {
-			if (getElement() instanceof CompositeRole) {
-				super.refresh();
-
-				element = (CompositeRole) getElement();
-				viewer.refresh();
-			}
-		} catch (Exception ex) {
-			logger.logError(
-					"Error refreshing Composite role - role sectin ", ex); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Add composite roles 
-	 * @param items
-	 * 		List of roles
-	 */
-	private void add(List items) {
-		// update the model
-		if (items != null) {
-			for (Iterator itor = items.iterator(); itor.hasNext();) {
-				Object obj = itor.next();
-				if (obj instanceof Role) {
-					actionMgr.doAction(IActionManager.ADD,
-							(CompositeRole) element, UmaPackage.eINSTANCE
-									.getCompositeRole_AggregatedRoles(),
-							(Role) obj, -1);
-				} else if (obj instanceof RoleDescriptor) {
-					Role role = ((RoleDescriptor) obj).getRole();
-					if (role != null)
-						actionMgr.doAction(IActionManager.ADD,
-								(CompositeRole) element, UmaPackage.eINSTANCE
-										.getCompositeRole_AggregatedRoles(),
-								role, -1);
-					else {
-						MessageFormat mf = new MessageFormat(
-								PropertiesResources.Process_CompositeRoleAssignError); //$NON-NLS-1$
-						Object[] args = { ((RoleDescriptor) obj).getName(),
-								((CompositeRole) element).getName() };
-						AuthoringUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayInfo(
-										PropertiesResources.Process_AssignmentInfoTitle, mf.format(args)); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#remove(java.util.ArrayList)
-	 */
-	protected void remove(ArrayList rmItems) {
-		// update the model
-		if (!rmItems.isEmpty()) {
-			for (Iterator itor = rmItems.iterator(); itor.hasNext();) {
-				Role role = (Role) itor.next();
-				actionMgr.doAction(IActionManager.REMOVE,
-						(CompositeRole) element, UmaPackage.eINSTANCE
-								.getCompositeRole_AggregatedRoles(), role, -1);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#openAddDialog()
-	 */
-	protected void openAddDialog() {
-		List existingElements = ((CompositeRole) element).getAggregatedRoles();
-		ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getShell(), getFilter(), element,
-				FilterConstants.ROLES, existingElements);
-
-		fd.setBlockOnOpen(true);
-		fd.setTitle(FilterConstants.ROLES);
-		fd.open();
-		add(fd.getSelectedItems());
-
-	}
-
-	private List getExistingElements() {
-		return null;
-	}
-
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#openAddFromProcessDialog()
-	 */
-	protected void openAddFromProcessDialog() {
-		String tabName = FilterConstants.ROLE_DESCRIPTORS;
-		List existingElements = getExistingElements();
-		Process process = (Process) getProcess(element);
-		IFilter descriptorFilter = getDescriptorFilter();
-		if (descriptorFilter != null && process != null) {
-			ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-					.getWorkbench().getActiveWorkbenchWindow().getShell(),
-					descriptorFilter, process, tabName, existingElements);
-			fd.setBlockOnOpen(true);
-			fd.setTitle(FilterConstants.ROLE_DESCRIPTORS);
-			fd.open();
-			add(fd.getSelectedItems());
-		}
-	}
-
-	/**
-	 * Get parent Find parent until it's activity.
-	 * 
-	 * @param element
-	 * @return
-	 * 		process object
-	 */
-	protected Object getProcess(BreakdownElement element) {
-		AdapterFactory aFactory = TngAdapterFactory.INSTANCE
-				.getOBS_ComposedAdapterFactory();
-		ItemProviderAdapter adapter = (ItemProviderAdapter) aFactory.adapt(
-				element, ITreeItemContentProvider.class);
-		Object parent = adapter.getParent(element);
-		if (parent instanceof Process) {
-			return parent;
-
-		} else {
-			return getProcess((BreakdownElement) parent);
-		}
-	}
-
-	/**
-	 * Return descriptor process filter
-	 */
-	protected IFilter getDescriptorFilter() {
-		return new DescriptorProcessFilter(getConfiguration()) {
-			protected boolean childAccept(Object obj) {
-				if (obj instanceof Activity) {
-					// List list = ((Activity)obj).getBreakdownElements();
-					List list = new ArrayList();
-					getActivitiesInScope(TngAdapterFactory.INSTANCE
-							.getOBS_ComposedAdapterFactory(), element, list);
-					if (list.contains(obj))
-						return true;
-					else
-						return false;
-				}
-				if (obj instanceof CompositeRole) {
-					if (obj.equals(element))
-						return false;
-				}
-				if (obj instanceof RoleDescriptor)
-					return true;
-				return false;
-			}
-		};
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/DescriptorDocumentSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/DescriptorDocumentSection.java
deleted file mode 100755
index 04f2933..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/DescriptorDocumentSection.java
+++ /dev/null
@@ -1,166 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.util.RichTextImageLinkContainer;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.uma.Descriptor;
-import org.eclipse.epf.uma.DescriptorDescription;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-
-
-/**
- * The document tab section for Descriptor
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class DescriptorDocumentSection extends BreakdownElementDocumentSection {
-
-	protected Descriptor element;
-
-	private IMethodRichText refinedDesc;
-
-	private Listener listener = new Listener() {
-		public void handleEvent(Event e) {
-			element = (Descriptor) getElement();
-			IMethodRichText control = expandFlag ? ctrl_document_expanded
-					: refinedDesc;
-			if (!control.getModified()) {
-				return;
-			}
-			String oldContent = ((DescriptorDescription) element
-					.getPresentation()).getRefinedDescription();
-			if (((MethodElementEditor) getEditor()).mustRestoreValue(
-					refinedDesc, oldContent)) {
-				return;
-			}
-			String newContent = control.getText();
-			if (!newContent.equals(oldContent)) {
-				actionMgr.doAction(IActionManager.SET, element
-						.getPresentation(), UmaPackage.eINSTANCE
-						.getDescriptorDescription_RefinedDescription(),
-						newContent, -1);
-			}
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementDocumentSection#init()
-	 */
-	protected void init() {
-		super.init();
-		element = (Descriptor) getElement();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementDocumentSection#createDocumentSection(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createDocumentSection(Composite composite) {
-		super.createDocumentSection(composite);
-		int heightHint = 200;
-
-		// refined description
-		RichTextImageLinkContainer refinedContainer = FormUI.createRichTextWithLink(toolkit,
-				documentComposite, heightHint, contentElementPath, element,
-				PropertiesResources.Descriptor_RefinedDescription);
-		addHyperLinkListener(refinedContainer.link);
-		refinedDesc = refinedContainer.richText;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementDocumentSection#addListeners()
-	 */
-	protected void addListeners() {
-		super.addListeners();
-		refinedDesc.setModalObject(getElement());
-		refinedDesc.setModalObjectFeature(UmaPackage.eINSTANCE
-						.getDescriptorDescription_RefinedDescription());
-		refinedDesc.addListener(SWT.Deactivate, listener);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementDocumentSection#updateControls()
-	 */
-	protected void updateControls() {
-		super.updateControls();
-		refinedDesc.setEditable(editable);
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementDocumentSection#refresh()
-	 */
-	public void refresh() {
-		try {
-			if (getElement() instanceof Descriptor) {
-				((MethodElementEditor) getEditor()).saveModifiedRichText();
-
-				element = (Descriptor) getElement();
-				DescriptorDescription content = (DescriptorDescription) element
-						.getPresentation();
-
-				super.refresh();
-
-				if (contentModifyListener != null) {
-					refinedDesc.removeModifyListener(contentModifyListener);
-
-					if (contentModifyListener instanceof MethodElementEditor.ModifyListener) {
-						((MethodElementEditor.ModifyListener) contentModifyListener)
-								.setElement(element.getPresentation());
-						((MethodElementEditor.ModifyListener) contentModifyListener)
-								.setDisable(true);
-					}
-				}
-
-				refinedDesc.setText(content.getRefinedDescription());
-
-				if (expandFlag) {
-					if (((Label)expandDocumentLabel.getControl())
-							.getText()
-							.equals(
-									PropertiesResources.Descriptor_RefinedDescription)) { //$NON-NLS-1$
-						ctrl_document_expanded.setText(content
-								.getRefinedDescription());
-						ctrl_document_expanded.setSelection(0);
-						ctrl_document_expanded.setModalObject(content);
-						ctrl_document_expanded
-								.setModalObjectFeature(UmaPackage.eINSTANCE
-										.getDescriptorDescription_RefinedDescription());
-					}
-				}
-
-				if (contentModifyListener instanceof MethodElementEditor.ModifyListener) {
-					((MethodElementEditor.ModifyListener) contentModifyListener)
-							.setDisable(false);
-				}
-
-				refinedDesc.setModalObject(content);
-				refinedDesc.setModalObjectFeature(UmaPackage.eINSTANCE
-						.getDescriptorDescription_RefinedDescription());
-				refinedDesc.addModifyListener(contentModifyListener);
-			}
-		} catch (Exception ex) {
-			logger
-					.logError(
-							"Error while refreshing descriptor documentation section :", ex); //$NON-NLS-1$
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/DescriptorGeneralSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/DescriptorGeneralSection.java
deleted file mode 100755
index a8c462b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/DescriptorGeneralSection.java
+++ /dev/null
@@ -1,118 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.uma.Descriptor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-
-
-/**
- * The general tab section for Descriptor
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class DescriptorGeneralSection extends BreakdownElementGeneralSection {
-	protected Descriptor element;
-
-	private Button synchronizedButton;
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementGeneralSection#init()
-	 */
-	protected void init() {
-		super.init();
-
-		// get Descriptor object
-		element = (Descriptor) getElement();
-
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementGeneralSection#createGeneralSection(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createGeneralSection(Composite composite) {
-		super.createGeneralSection(composite);
-
-		// create composite for checkbox
-		checkBoxComposite = FormUI.createComposite(toolkit, generalComposite,
-				GridData.FILL_HORIZONTAL, numOfColumns, true);
-
-		synchronizedButton = FormUI.createCheckButton(toolkit, checkBoxComposite,
-				1);
-		synchronizedButton.setText(PropertiesResources.BreakdownElement_Option_Synchronized); //$NON-NLS-1$		
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementGeneralSection#addListeners()
-	 */
-	protected void addListeners() {
-		super.addListeners();
-
-		synchronizedButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				actionMgr.doAction(IActionManager.SET, element,
-						UmaPackage.eINSTANCE
-								.getDescriptor_IsSynchronizedWithSource(),
-						Boolean.valueOf(synchronizedButton.getSelection()), -1);
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementGeneralSection#updateControls()
-	 */
-	protected void updateControls() {
-		super.updateControls();
-		synchronizedButton.setEnabled(editable);
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementGeneralSection#refresh()
-	 */
-	public void refresh() {
-		try {
-			if (getElement() instanceof Descriptor) {
-				super.refresh();
-
-				element = (Descriptor) getElement();
-
-				synchronizedButton.setSelection(element
-						.getIsSynchronizedWithSource().booleanValue());
-			}
-
-		} catch (Exception ex) {
-			logger
-					.logError(
-							"Error refreshing Descriptor general section: ", ex); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.AbstractSection#getNamePrefix()
-	 */
-	public String getNamePrefix() {
-		return LibraryUIText.TEXT_DESCRIPTOR + ": "; //$NON-NLS-1$
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/EPFPropertySheetPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/EPFPropertySheetPage.java
deleted file mode 100755
index 7853998..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/EPFPropertySheetPage.java
+++ /dev/null
@@ -1,204 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.epf.authoring.ui.editors.ProcessEditor;
-import org.eclipse.epf.authoring.ui.forms.ProcessBreakdownStructureFormPage;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.views.properties.IPropertySheetEntry;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-import org.eclipse.ui.views.properties.PropertySheetEntry;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-/**
- * This class represents property sheet page for process elements
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class EPFPropertySheetPage extends TabbedPropertySheetPage {
-	// private TabbedPropertyViewer viewer;
-
-	private IPropertySheetEntry rootEntry;
-
-	private static IPropertySourceProvider sourceProvider;
-
-	private static ISelection selection = null;
-
-	private static IActionManager actionMgr;
-
-	private static ProcessEditor processEditor;
-
-	public static String formPageID = null;
-	
-	private static ProcessBreakdownStructureFormPage formPage = null;
-
-	// public static int currentPage=0;
-
-	public EPFPropertySheetPage(ProcessEditor editor) {
-		super((ITabbedPropertySheetPageContributor) editor);
-
-		actionMgr = ((ProcessEditor) editor).getActionManager();
-		processEditor = editor;
-
-	}
-
-	/**
-	 * Get action manager
-	 * @return
-	 * 			Action Manager
-	 */
-	public static IActionManager getActionManager() {
-		return actionMgr;
-	}
-
-	/**
-	 * Get editor associated with property sheet page
-	 * @return
-	 * 			Process Editor
-	 */
-	public static ProcessEditor getEditor() {
-		return processEditor;
-	}
-
-	/**
-	 * Sets the given property source provider as the property source provider.
-	 * <p>
-	 * Calling this method is only valid if you are using this page's default
-	 * root entry.
-	 * </p>
-	 * 
-	 * @param newProvider
-	 *            the property source provider
-	 */
-	public void setPropertySourceProvider(IPropertySourceProvider newProvider) {
-		sourceProvider = newProvider;
-		if (rootEntry == null) {
-			// create a new root
-			PropertySheetEntry root = new PropertySheetEntry();
-
-			rootEntry = root;
-		}
-		if (sourceProvider != null) {
-			// set the property source provider for root entry
-			if (rootEntry instanceof PropertySheetEntry) {
-				((PropertySheetEntry) rootEntry)
-						.setPropertySourceProvider(sourceProvider);
-			}
-		}
-	}
-
-	/**
-	 * Return property source provider
-	 */
-	public static IPropertySourceProvider getPropertySourceProvider() {
-		return sourceProvider;
-	}
-
-	/**
-	 * Return selection of the object from breakdown structure of the process editor
-	 */
-	public static ISelection getSelection() {
-		return selection;
-	}
-
-
-	/**
-	 * @see org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IWorkbenchPart part, ISelection sel) {
-		selection = sel;
-
-		if (part instanceof ProcessEditor) {
-			processEditor = (ProcessEditor) part;
-			// currentPage = processFormEditor.getCurrentPage();
-			actionMgr = processEditor.getActionManager();
-			IFormPage activePage = processEditor.getActivePageInstance();
-			if (activePage instanceof ProcessBreakdownStructureFormPage)
-				formPage = (ProcessBreakdownStructureFormPage) activePage;
-			formPageID = activePage != null ? activePage.getId() : null;
-		}
-
-		super.selectionChanged(part, selection);
-	}
-
-	/**
-	 * @see org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage#handlePartActivated(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void handlePartActivated(IWorkbenchPart part) {
-		if (part instanceof ProcessEditor) {
-			processEditor = (ProcessEditor) part;
-			selection = processEditor.getSelection();
-			actionMgr = processEditor.getActionManager();
-			IFormPage activePage = processEditor.getActivePageInstance();
-			if (activePage instanceof ProcessBreakdownStructureFormPage)
-				formPage = (ProcessBreakdownStructureFormPage) activePage;
-			formPageID = activePage != null ? activePage.getId() : null;
-		}
-
-		super.handlePartActivated(part);
-	}
-
-	/**
-	 * Get current adapter factory of editor
-	 * @return
-	 * 			Adapter Factory
-	 */
-	public static AdapterFactory getAdapterFactory() {
-		return formPage.getAdapterFactory();
-//		if (formPageID.equals(ProcessEditor.WBS_FORM_ID)) {
-//			return TngAdapterFactory.INSTANCE.getWBS_ComposedAdapterFactory();
-//		} else if (formPageID.equals(ProcessEditor.TA_FORM_ID)) {
-//			return TngAdapterFactory.INSTANCE.getOBS_ComposedAdapterFactory();
-//		} else if (formPageID.equals(ProcessEditor.WPBS_FORM_ID)) {
-//			return TngAdapterFactory.INSTANCE.getPBS_ComposedAdapterFactory();
-//		} else if (formPageID.equals(ProcessEditor.CONSOLIDATED_FORM_ID)) {
-//			return TngAdapterFactory.INSTANCE
-//					.getProcessComposedAdapterFactory();
-//		}
-
-//		return null;
-	}
-
-	/**
-	 * @see org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage#refresh()
-	 */
-	public void refresh() {
-
-		// will see if this works..
-		try
-		{
-			super.refresh();
-		}
-		catch (Exception e)
-		{
-			
-		}
-		
-//		 TODO - get rid of internal APIs.
-//		if (this.getCurrentTab() != null) {
-//			this.getCurrentTab().refresh();
-//
-//			// also refresh section
-//			ISection section = this.getCurrentTab().getSectionAtIndex(0);
-//			if (section != null) {
-//				section.refresh();
-//			}
-//		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ElementLabelProvider.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ElementLabelProvider.java
deleted file mode 100755
index 1c83d56..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ElementLabelProvider.java
+++ /dev/null
@@ -1,165 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.ui.LibraryUIImages;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.views.properties.tabbed.ITypeMapper;
-
-
-/**
- * Label provider for the title bar for the tabbed property sheet page.
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class ElementLabelProvider extends LabelProvider {
-
-	private ITypeMapper typeMapper;
-
-	private ILabelProvider labelProvider = null;
-
-	/**
-	 * Create an instance
-	 */
-	public ElementLabelProvider() {
-		super();
-		typeMapper = new ElementTypeMapper();
-	}
-
-	
-	/**
-	 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object objects) {
-		if (objects == null || objects.equals(StructuredSelection.EMPTY)) {
-			return null;
-		}
-		Image image = LibraryUIImages.IMG_PROCESS;
-		final boolean multiple[] = { false };
-		final Object object = getObject(objects, multiple);
-		if (object == null || ((IStructuredSelection) objects).size() > 1) {
-			return image;
-		} else {
-			Object obj = LibraryUtil.unwrap(object);
-			if (labelProvider == null) {
-				labelProvider = new AdapterFactoryLabelProvider(TngUtil.umaItemProviderAdapterFactory);
-			}
-			Image titleImage = labelProvider.getImage(obj);
-
-			return titleImage;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.LabelProvider#dispose()
-	 */
-	public void dispose() {
-		labelProvider.dispose();
-	}
-
-
-	/**
-	 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object objects) {
-		if (objects == null || objects.equals(StructuredSelection.EMPTY)) {
-			return PropertiesResources.Process_NoItems; 
-		}
-		final boolean multiple[] = { false };
-		final Object object = getObject(objects, multiple);
-		if (object == null || ((IStructuredSelection) objects).size() > 1) {
-			Object size = new Integer(((IStructuredSelection) objects).size());
-			String msg = PropertiesResources.bind(PropertiesResources.Process_ItemsSelected, (new Object[] { size })); 
-			return msg;
-		} else {
-
-			Object obj = LibraryUtil.unwrap(object);
-			return getName(obj);
-		}
-	}
-
-	private String getName(Object obj) {
-		String name = null;
-
-		String prefix = PropertiesUtil.getType(obj);
-
-		if (obj instanceof BreakdownElement) {
-			name = prefix + " : " + ((BreakdownElement) obj).getName(); //$NON-NLS-1$
-		} else {
-			name = PropertiesResources.Process_NoPropertiesAvailable; //$NON-NLS-1$
-		}
-
-		return name;
-	}
-
-	/**
-	 * Determine if a multiple object selection has been passed to the label
-	 * provider. If the objects is a IStructuredSelection, see if all the
-	 * objects in the selection are the same and if so, we want to provide
-	 * labels for the common selected element.
-	 * 
-	 * @param objects
-	 *            a single object or a IStructuredSelection.
-	 * @param multiple
-	 *            first element in the array is true if there is multiple
-	 *            unequal selected elements in a IStructuredSelection.
-	 * @return the object to get labels for.
-	 */
-	private Object getObject(Object objects, boolean multiple[]) {
-		Assert.isNotNull(objects);
-		Object object = null;
-		if (objects instanceof IStructuredSelection) {
-			IStructuredSelection selection = (IStructuredSelection) objects;
-			object = selection.getFirstElement();
-			if (selection.size() == 1) {
-				// one element selected
-				multiple[0] = false;
-				return object;
-			}
-			// multiple elements selected
-			multiple[0] = true;
-//			Class firstClass = typeMapper.mapType(object, object.getClass());
-			Class firstClass = typeMapper.mapType(object);
-			// determine if all the objects in the selection are the same type
-			if (selection.size() > 1) {
-				for (Iterator i = selection.iterator(); i.hasNext();) {
-					Object next = i.next();
-//					Class nextClass = typeMapper.mapType(next, next
-//							.getClass());
-					Class nextClass = typeMapper.mapType(next);
-					if (!nextClass.equals(firstClass)) {
-						// two elements not equal == multiple selected unequal
-						multiple[0] = false;
-						object = null;
-						break;
-					}
-				}
-			}
-		} else {
-			multiple[0] = false;
-			object = objects;
-		}
-		return object;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ElementTypeMapper.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ElementTypeMapper.java
deleted file mode 100755
index a8ec057..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/ElementTypeMapper.java
+++ /dev/null
@@ -1,44 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.ui.views.properties.tabbed.ITypeMapper;
-
-
-/**
- * Type mapper for the logic example. We want to get the GEF model object from
- * the selected element in the outline view and the diagram. We can then filter
- * on the model object type.
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class ElementTypeMapper implements ITypeMapper {
-
-
-	/**
-	 * @see org.eclipse.ui.views.properties.tabbed.ITypeMapper#mapType(java.lang.Object)
-	 */
-	public Class mapType(Object object) {
-//		Class type = effectiveType;
-		Class type = null;
-		if (object != null) {
-			type = object.getClass();
-			if (object instanceof BreakdownElement) {
-				type = ((BreakdownElement) object).getClass();
-			}
-		}
-	
-		return type;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/FormUI.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/FormUI.java
deleted file mode 100755
index 5456dc8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/FormUI.java
+++ /dev/null
@@ -1,280 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIImages;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.forms.BaseFormPage;
-import org.eclipse.epf.authoring.ui.forms.MethodFormToolkit;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.util.RichTextImageLinkContainer;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.jface.fieldassist.DecoratedField;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.Section;
-
-
-/**
- * The UI util class tailored for properties view for process authoring
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class FormUI {
-
-	private static final int DEFAULT_WIDTH = 300;
-
-	private static Label _createLabel(FormToolkit toolkit, Composite parent,
-			String str, int gridDataStyle, int horizontalSpan) {
-		Label label = toolkit.createLabel(parent, str);
-		GridData gridData = new GridData(gridDataStyle);
-		gridData.horizontalSpan = horizontalSpan;
-		label.setLayoutData(gridData);
-		return label;
-	}
-
-	public static Label createLabel(FormToolkit toolkit, Composite parent,
-			String str) {
-		// make horizonatalSpan 1
-		return _createLabel(toolkit, parent, str, GridData.BEGINNING, 1);
-	}
-
-	public static Label createLabel(FormToolkit toolkit, Composite parent,
-			String str, int horizontalSpan) {
-		// make horizonatalSpan 2
-		return _createLabel(toolkit, parent, str, GridData.BEGINNING,
-				horizontalSpan);
-	}
-
-	private static Text _createText(FormToolkit toolkit, Composite parent,
-			int textStyle, int gridDataStyle, int height, int width,
-			int horizontalSpan) {
-		Text control = toolkit.createText(parent, "", textStyle); //$NON-NLS-1$
-		GridData gridData = new GridData(gridDataStyle);
-		gridData.heightHint = height;
-		gridData.widthHint = width;
-		gridData.horizontalSpan = horizontalSpan;
-		control.setLayoutData(gridData);
-		return control;
-	}
-
-	public static Text createText(FormToolkit toolkit, Composite parent) {
-		return _createText(toolkit, parent, SWT.SINGLE | SWT.WRAP,
-				GridData.FILL_HORIZONTAL, SWT.DEFAULT, DEFAULT_WIDTH,
-				SWT.DEFAULT);
-	}
-
-	public static Text createText(FormToolkit toolkit, Composite parent,
-			int height) {
-		return _createText(toolkit, parent, SWT.MULTI | SWT.WRAP,
-				GridData.FILL_HORIZONTAL, height, DEFAULT_WIDTH, SWT.DEFAULT);
-	}
-
-	public static Text createText(FormToolkit toolkit, Composite parent,
-			int height, int horizontalSpan) {
-		return _createText(toolkit, parent, SWT.SINGLE | SWT.WRAP,
-				GridData.FILL_HORIZONTAL, height, DEFAULT_WIDTH, horizontalSpan);
-	}
-
-	private static IMethodRichText _createRichText(FormToolkit toolkit,
-			Composite parent, int height, int width, String path,
-			MethodElement methodElement, DecoratedField label) {
-		IMethodRichText control = MethodFormToolkit.createRichText(toolkit,
-				parent,
-				"", SWT.MULTI | SWT.WRAP | SWT.V_SCROLL, path, methodElement, label); //$NON-NLS-1$
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-				| GridData.FILL_VERTICAL);
-		gridData.heightHint = height;
-		gridData.widthHint = width;
-		control.setLayoutData(gridData);
-		return control;
-	}
-
-	public static RichTextImageLinkContainer createRichTextWithLink(FormToolkit toolkit,
-			Composite parent, int height, String path,
-			MethodElement methodElement, String labelText) {
-		ImageHyperlink link = createImageHyperLink(toolkit, parent, AuthoringUIImages.IMG_COLLAPSED,
-				AuthoringUIResources.openRTE);
-		link.setData("Title", labelText); //$NON-NLS-1$
-		DecoratedField decoratedLabel = BaseFormPage.createDecoratedLabel(toolkit, parent, labelText);
-		((GridData)decoratedLabel.getLayoutControl().getLayoutData()).verticalAlignment = SWT.CENTER;
-
-		IMethodRichText control = _createRichText(toolkit, parent, height, DEFAULT_WIDTH, path,
-				methodElement, decoratedLabel);
-		link.setHref(control);
-
-		return new RichTextImageLinkContainer(control, link);
-	}
-
-	public static ImageHyperlink createImageHyperLink(FormToolkit toolkit,
-			Composite parent, Image image, String toolTip) {
-		ImageHyperlink link = toolkit.createImageHyperlink(parent, SWT.LEFT
-				| SWT.TOP);
-		GridData gridData = new GridData(GridData.BEGINNING);
-		link.setLayoutData(gridData);
-		link.setImage(image);
-		link.setToolTipText(toolTip);
-		return link;
-	}
-
-	public static Section createSection(FormToolkit toolkit, Composite parent,
-			String title, String description) {
-		Section section = toolkit.createSection(parent, Section.DESCRIPTION
-				| Section.TWISTIE | Section.EXPANDED);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		section.setLayoutData(gd);
-		section.setText(title);
-		section.setDescription(description);
-		toolkit.createCompositeSeparator(section);
-		section.setLayout(new GridLayout());
-		return section;
-	}
-	
-	public static Section createSection(FormToolkit toolkit, Composite parent,
-			String title, String description, int gdStyle) {
-		Section section = toolkit.createSection(parent, Section.DESCRIPTION
-				| Section.TWISTIE | Section.EXPANDED);
-		GridData gd = new GridData(gdStyle);
-		section.setLayoutData(gd);
-		section.setText(title);
-		section.setDescription(description);
-		toolkit.createCompositeSeparator(section);
-		section.setLayout(new GridLayout());
-		return section;
-	}
-
-	public static Composite createComposite(FormToolkit toolkit,
-			Section section, int numOfColumns, boolean expanded) {
-		Composite composite = toolkit.createComposite(section);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		composite.setLayout(new GridLayout(numOfColumns, false));
-		if (!expanded)
-			section.setClient(composite);
-		else
-			composite.setVisible(false);
-		return composite;
-	}
-	
-	public static Composite createComposite(FormToolkit toolkit,
-			Composite parent, int gridStyle) {
-		Composite pane = toolkit.createComposite(parent, SWT.NONE);
-		GridData gridData = new GridData(gridStyle);
-		pane.setLayoutData(gridData);
-		pane.setLayout(new GridLayout());
-		return pane;
-	}
-
-	public static Composite createComposite(FormToolkit toolkit,
-			Composite parent, int gridStyle, int numOfColumns,
-			boolean equalSizeColumn) {
-		Composite pane = toolkit.createComposite(parent, SWT.NONE);
-		GridData gridData = new GridData(gridStyle);
-		gridData.horizontalSpan = numOfColumns;
-		pane.setLayoutData(gridData);
-		GridLayout layout = new GridLayout(numOfColumns, equalSizeColumn);
-		layout.marginBottom = 0;
-		layout.marginHeight = 0;
-		layout.marginLeft = 0;
-		layout.marginRight = 0;
-		layout.marginWidth = 0;
-		pane.setLayout(layout);
-		return pane;
-	}
-
-	private static Button _createButton(FormToolkit toolkit, Composite parent,
-			String buttonStr, int style, int horizontalSpan) {
-		Button control = toolkit.createButton(parent, buttonStr, style);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = horizontalSpan;
-		control.setLayoutData(gridData);
-		return control;
-	}
-
-	private static Button _createButton(FormToolkit toolkit, Composite parent,
-			String buttonStr, int style) {
-		Button control = toolkit.createButton(parent, buttonStr, style);
-		control.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		return control;
-	}
-	
-	
-
-	private static Combo _createCombo(FormToolkit toolkit, Composite parent,
-			int style, int horizontalSpan) {
-		Combo combo = new Combo(parent, style);
-		GridData gridData = new GridData(GridData.BEGINNING);
-		gridData.horizontalSpan = horizontalSpan;
-		combo.setLayoutData(gridData);
-		return combo;
-	}
-
-	public static Combo createCombo(FormToolkit toolkit, Composite parent,
-			int horizontalSpan) {
-		return _createCombo(toolkit, parent, SWT.SINGLE | SWT.FLAT
-				| SWT.READ_ONLY, horizontalSpan);
-	}
-	
-	public static Button createButton(FormToolkit toolkit, Composite parent,
-			String buttonStr) {
-		return _createButton(toolkit, parent, buttonStr, SWT.NONE);
-	}
-
-
-	public static Button createButton(FormToolkit toolkit, Composite parent,
-			int style, int horizontalSpan) {
-		return _createButton(toolkit, parent, "", style, horizontalSpan); //$NON-NLS-1$
-	}
-	
-	public static Button createCheckButton(FormToolkit toolkit, Composite parent, int horizontalSpan)
-	{
-		Button control = toolkit.createButton(parent, "", SWT.CHECK);		//$NON-NLS-1$
-		GridData gridData = new GridData(GridData.GRAB_HORIZONTAL);
-		gridData.horizontalSpan = horizontalSpan;
-		control.setLayoutData(gridData);
-		return control;
-	}
-
-	private static Table _createTable(FormToolkit toolkit, Composite parent,
-			int tableStyle, int gridStyle, int height, int width,
-			int verticalSpan, int horizontalSpan) {
-		Table table = toolkit.createTable(parent, tableStyle);
-		GridData gridData = new GridData(gridStyle);
-		gridData.heightHint = height;
-		gridData.widthHint = width;
-		gridData.verticalSpan = verticalSpan;
-		gridData.horizontalSpan = horizontalSpan;
-		table.setLayoutData(gridData);
-		return table;
-	}
-
-	public static Table createTable(FormToolkit toolkit, Composite parent) {
-		return _createTable(toolkit, parent, SWT.MULTI, GridData.FILL_BOTH,
-				200, 200, 1, 1);
-	}
-
-	public static Table createTable(FormToolkit toolkit, Composite parent,
-			int height) {
-		return _createTable(toolkit, parent, SWT.MULTI, GridData.FILL_BOTH,
-				height, 200, 1, 1);
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/MilestoneDocumentSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/MilestoneDocumentSection.java
deleted file mode 100755
index c02a593..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/MilestoneDocumentSection.java
+++ /dev/null
@@ -1,168 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.epf.authoring.ui.util.RichTextImageLinkContainer;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-
-
-/**
- * The document tab section for Milestone
- * 
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class MilestoneDocumentSection extends BreakdownElementDocumentSection {
-
-	protected BreakdownElement element;
-
-	private IMethodRichText mainDesc;
-
-	private Listener listener = new Listener() {
-		public void handleEvent(Event e) {
-			element = (BreakdownElement) getElement();
-			IMethodRichText control = expandFlag ? ctrl_document_expanded
-					: mainDesc;
-			if (!control.getModified()) {
-				return;
-			}
-			String oldContent = ((ContentDescription) element.getPresentation())
-					.getMainDescription();
-			if (((MethodElementEditor) getEditor()).mustRestoreValue(mainDesc,
-					oldContent)) {
-				return;
-			}
-			String newContent = control.getText();
-			if (!newContent.equals(oldContent)) {
-				actionMgr.doAction(IActionManager.SET, element
-						.getPresentation(), UmaPackage.eINSTANCE
-						.getContentDescription_MainDescription(), newContent,
-						-1);
-			}
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementDocumentSection#init()
-	 */
-	protected void init() {
-		super.init();
-		element = (BreakdownElement) getElement();
-
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementDocumentSection#createDocumentSection(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createDocumentSection(Composite composite) {
-		super.createDocumentSection(composite);
-		int heightHint = 200;
-
-		// main description
-		RichTextImageLinkContainer mainDescContainer = FormUI.createRichTextWithLink(toolkit,
-				documentComposite, heightHint, contentElementPath, element,
-				PropertiesResources.Process_mainDescription);
-		addHyperLinkListener(mainDescContainer.link);
-		mainDesc = mainDescContainer.richText;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementDocumentSection#addListeners()
-	 */
-	protected void addListeners() {
-		super.addListeners();
-		mainDesc.setModalObject(getElement());
-		mainDesc.setModalObjectFeature(UmaPackage.eINSTANCE
-						.getContentDescription_MainDescription());
-		mainDesc.addListener(SWT.Deactivate, listener);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementDocumentSection#updateControls()
-	 */
-	protected void updateControls() {
-		super.updateControls();
-		mainDesc.setEditable(editable);
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementDocumentSection#refresh()
-	 */
-	public void refresh() {
-		try {
-			super.refresh();
-
-			if (getElement() instanceof BreakdownElement) {
-				((MethodElementEditor) getEditor()).saveModifiedRichText();
-
-				element = (BreakdownElement) getElement();
-				ContentDescription content = (ContentDescription) element
-						.getPresentation();
-
-				super.refresh();
-
-				if (contentModifyListener != null) {
-					mainDesc.removeModifyListener(contentModifyListener);
-
-					if (contentModifyListener instanceof MethodElementEditor.ModifyListener) {
-						((MethodElementEditor.ModifyListener) contentModifyListener)
-								.setElement(element.getPresentation());
-						((MethodElementEditor.ModifyListener) contentModifyListener)
-								.setDisable(true);
-					}
-				}
-
-				mainDesc.setText(content.getMainDescription());
-
-				if (expandFlag) {
-					if (((Label)expandDocumentLabel.getControl()).getText().equals(
-							PropertiesResources.Process_mainDescription)) //$NON-NLS-1$
-					{
-						ctrl_document_expanded.setText(content
-								.getMainDescription());
-						ctrl_document_expanded.setSelection(0);
-						ctrl_document_expanded.setModalObject(content);
-						ctrl_document_expanded
-								.setModalObjectFeature(UmaPackage.eINSTANCE
-										.getContentDescription_MainDescription());
-					}
-				}
-
-				if (contentModifyListener instanceof MethodElementEditor.ModifyListener) {
-					((MethodElementEditor.ModifyListener) contentModifyListener)
-							.setDisable(false);
-				}
-
-				mainDesc.setModalObject(content);
-				mainDesc.setModalObjectFeature(UmaPackage.eINSTANCE
-						.getContentDescription_MainDescription());
-				mainDesc.addModifyListener(contentModifyListener);
-			}
-		} catch (Exception ex) {
-			logger
-					.logError(
-							"Error while refreshing milestone documentation section :", ex); //$NON-NLS-1$
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/OBSRelationSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/OBSRelationSection.java
deleted file mode 100755
index 574beeb..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/OBSRelationSection.java
+++ /dev/null
@@ -1,347 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.util.ArrayList;
-
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.filters.ProcessRoleFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.process.IBSItemProvider;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-
-/**
- * The base OBS relation section
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class OBSRelationSection extends AbstractSection {
-	protected IStructuredContentProvider contentProvider = null;
-
-	protected ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE.getOBS_ComposedAdapterFactory());
-
-	private FormToolkit toolkit;
-
-	private Button ctrl_add_1, ctrl_add_2, ctrl_remove;
-
-	private Table ctrl_selected;
-
-	protected TableViewer viewer;
-
-	private String title;
-	
-	private String desc;
-	
-	private String table1;
-
-	// element
-	protected BreakdownElement element;
-
-	// action manager
-	protected IActionManager actionMgr;
-
-	// by default this button is false
-	protected boolean showAddFromProcessButton = false;
-
-	// filter
-	private IFilter filter = null;
-
-	public IFilter getFilter() {
-		if (filter == null) {
-			filter = new ProcessRoleFilter(getConfiguration(), null,
-					FilterConstants.ROLES);
-		}
-		return filter;
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.AbstractSection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-
-		super.createControls(parent, tabbedPropertySheetPage);
-		init();
-
-		parent.setLayout(new GridLayout());
-		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// create section
-		createSection(parent);
-
-		// add listeners
-		addListeners();
-
-		// update controls
-		updateControls();
-
-	}
-
-	/**
-	 * Initialize
-	 */
-	protected void init() {
-		// get breakdownelement object
-		element = (BreakdownElement) getElement();
-
-		// get toolkit
-		toolkit = getWidgetFactory();
-
-		// get action manager
-		actionMgr = EPFPropertySheetPage.getActionManager();
-	}
-
-	protected void setTabData(String title, String desc, String table1) {
-		this.title = title;
-		this.desc = desc;
-		this.table1 = table1;
-	}
-
-	private void createSection(Composite parent) {
-		// create section
-		Section aSection = FormUI.createSection(toolkit, parent,
-				title, desc);
-
-		// create general composite
-		Composite composite = FormUI.createComposite(toolkit, aSection, 2,
-				false);
-
-		// create table composite
-		Composite pane1 = FormUI.createComposite(toolkit, composite,
-				GridData.FILL_BOTH);
-		FormUI.createLabel(toolkit, pane1, table1);
-
-		ctrl_selected = FormUI.createTable(toolkit, pane1);
-		viewer = new TableViewer(ctrl_selected);
-
-		initContentProvider();
-
-		viewer.setLabelProvider(labelProvider);
-		viewer.setInput(element);
-
-		// create button composite
-		Composite pane2 = FormUI.createComposite(toolkit, composite,
-				GridData.VERTICAL_ALIGN_CENTER
-						| GridData.HORIZONTAL_ALIGN_CENTER);
-
-		// create buttons
-		ctrl_add_1 = FormUI.createButton(toolkit, pane2, PropertiesResources.Process_Add); //$NON-NLS-1$
-		if (showAddFromProcessButton) {
-			ctrl_add_2 = FormUI.createButton(toolkit, pane2,
-					PropertiesResources.Process_AddFromProcess); 
-		}
-		ctrl_remove = FormUI.createButton(toolkit, pane2, PropertiesResources.Process_Remove); //$NON-NLS-1$
-
-		toolkit.paintBordersFor(composite);
-		toolkit.paintBordersFor(pane1);
-		toolkit.paintBordersFor(pane2);
-
-	}
-
-	/**
-	 * Get Default configuration
-	 * 
-	 * @return MethodConfiguration
-	 */
-	protected MethodConfiguration getDefaultConfiguration() {
-		ItemProviderAdapter adapter = (ItemProviderAdapter) getAdapter();
-		Object parent = null;
-		if (adapter instanceof IBSItemProvider) {
-			IBSItemProvider bsItemProvider = (IBSItemProvider) adapter;
-			parent = bsItemProvider.getTopItem();
-			MethodConfiguration config = ((org.eclipse.epf.uma.Process) parent)
-					.getDefaultContext();
-			return config;
-		} else {
-			logger
-					.logError("OBSRelationSection::getDefaultConfiguration - IBSItemProvider is null"); //$NON-NLS-1$
-			return null;
-		}
-	}
-
-	/**
-	 * Add listeners
-	 * 
-	 */
-	private void addListeners() {
-		// Add focus listener on primary tasks list
-		ctrl_selected.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) viewer
-						.getSelection();
-				if ((selection.size() > 0) && editable)
-					ctrl_remove.setEnabled(true);
-			}
-		});
-
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection) viewer
-						.getSelection();
-				if ((selection.size() > 0) && editable)
-					ctrl_remove.setEnabled(true);
-			}
-		});
-
-		ctrl_add_1.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				openAddDialog();
-				viewer.refresh();
-			}
-		});
-
-		if (showAddFromProcessButton) {
-			ctrl_add_2.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					openAddFromProcessDialog();
-					viewer.refresh();
-				}
-			});
-		}
-
-		ctrl_remove.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) viewer
-						.getSelection();
-				if (selection.size() > 0) {
-					// update the model
-					ArrayList rmItems = new ArrayList();
-					rmItems.addAll(selection.toList());
-					remove(rmItems);
-					viewer.refresh();
-
-					// clear the selection
-					viewer.setSelection(null, true);
-				}
-				ctrl_remove.setEnabled(false);
-			}
-		});
-	}
-
-	public void updateControls() {
-		// System.out.println("Element "+element.getName() +
-		// "Editable-"+editable);
-		if (ctrl_add_1 != null)
-			ctrl_add_1.setEnabled(editable);
-		if (ctrl_add_2 != null)
-			ctrl_add_2.setEnabled(editable);
-
-		IStructuredSelection selection = (IStructuredSelection) viewer
-				.getSelection();
-		if (selection.size() > 0 && editable) {
-			if (ctrl_remove != null)
-			ctrl_remove.setEnabled(true);
-		} else {
-			if (ctrl_remove != null)
-			ctrl_remove.setEnabled(false);
-		}
-
-	}
-
-	/**
-	 * @see org.eclipse.ui.views.properties.tabbed.AbstractPropertySection#refresh()
-	 */
-	public void refresh() {
-		updateControls();
-
-		super.refresh();
-	}
-
-	/**
-	 * Get parent activity
-	 * 
-	 * @param element
-	 * @return
-	 */
-	// protected Activity getParentActivity(BreakdownElement element)
-	// {
-	// Activity activity = null;
-	// AdapterFactory aFactory =
-	// TngAdapterFactory.INSTANCE.getOBS_ComposedAdapterFactory();
-	// ItemProviderAdapter adapter = (ItemProviderAdapter)
-	// aFactory.adapt(element, ITreeItemContentProvider.class);
-	// Object parent = adapter.getParent(element);
-	// if (parent instanceof Activity)
-	// {
-	// activity = (Activity) parent;
-	// }
-	//		
-	// return activity;
-	// }
-	
-	/**
-	 * Initialize content provider
-	 */
-	protected void initContentProvider() {
-	}
-
-	/**
-	 * Open UI Dialog to add method elements
-	 *
-	 */
-	protected void openAddDialog() {
-	}
-
-	/**
-	 * Open UI Dialog to add descriptor elements
-	 *
-	 */
-	protected void openAddFromProcessDialog() {
-	}
-
-	// protected void add(Object[] items) {}
-	protected void remove(ArrayList rmItems) {
-	}
-
-	/**
-	 * Dispose
-	 *
-	 */
-	public void disose() {
-		super.dispose();
-		if (labelProvider != null) {
-			labelProvider.dispose();
-		}
-		if (contentProvider != null) {
-			contentProvider.dispose();
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/PredecessorDialog.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/PredecessorDialog.java
deleted file mode 100755
index 79a69b8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/PredecessorDialog.java
+++ /dev/null
@@ -1,436 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.AdapterFactoryTreeIterator;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.process.IBSItemProvider;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkOrderType;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-
-/**
- * Dialog for adding predecessor dependency
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class PredecessorDialog extends Dialog {
-
-	private Text predIdText;
-
-	private Text presentationName;
-
-	private Combo dependency;
-
-	/** Dependency Literals * */
-	private static final String FINISH_TO_START = PropertiesResources.WorkOrderType_FINISH_TO_START; //$NON-NLS-1$
-
-	private static final String FINISH_TO_FINISH = PropertiesResources.WorkOrderType_FINISH_TO_FINISH; //$NON-NLS-1$
-
-	private static final String START_TO_START = PropertiesResources.WorkOrderType_START_TO_START; //$NON-NLS-1$
-
-	private static final String START_TO_FINISH = PropertiesResources.WorkOrderType_START_TO_FINISH; //$NON-NLS-1$
-
-	private String[] dependencyList = new String[] { FINISH_TO_START,
-			FINISH_TO_FINISH, START_TO_START, START_TO_FINISH };
-
-	private WorkBreakdownElement element;
-
-	private Object process;
-
-	private AdapterFactory adapterFactory;
-
-	private List predecessors = new ArrayList();
-
-	private List predMapList;
-
-	private IActionManager actionMgr;
-
-	private PredecessorMap predMap;
-
-	/**
-	 * Dialog for setting predecessor for the element
-	 * @param parentShell
-	 * 			The parent shell
-	 * @param element
-	 * 			Work Break down Element
-	 * @param process
-	 * 			Process of the workbreakdown element
-	 * @param adapterFactory
-	 * 			Adapter Factory 
-	 * @param predMap
-	 * 			Predecessor Map
-	 * @param predMapList
-	 * 			Predecessor Map list
-	 * @param actionMgr
-	 * 			Action Manager
-	 */
-	public PredecessorDialog(Shell parentShell, WorkBreakdownElement element,
-			Object process, AdapterFactory adapterFactory,
-			PredecessorMap predMap, List predMapList, IActionManager actionMgr) {
-		super(parentShell);
-
-		this.element = element;
-		this.process = process;
-		this.adapterFactory = adapterFactory;
-		this.predMap = predMap;
-		this.predMapList = predMapList;
-		this.actionMgr = actionMgr;
-
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite) super.createDialogArea(parent);
-
-		GridLayout layout = (GridLayout) composite.getLayout();
-		layout.numColumns = 2;
-		GridData gridData = new GridData(GridData.FILL_BOTH);
-		composite.setLayoutData(gridData);
-
-		// dialog header
-		Label label = new Label(composite, SWT.NONE);
-		label.setText(PropertiesResources.PredecessorDialog_HeaderMessage); //$NON-NLS-1$
-		gridData = new GridData(GridData.BEGINNING);
-		gridData.horizontalSpan = 2;
-		label.setLayoutData(gridData);
-
-		// blank label
-		label = new Label(composite, SWT.NONE);
-		label.setText(""); //$NON-NLS-1$
-		gridData = new GridData(GridData.BEGINNING);
-		gridData.horizontalSpan = 2;
-		label.setLayoutData(gridData);
-
-		// Predecessor ID index
-		label = new Label(composite, SWT.NONE);
-		label.setText(PropertiesResources.PredecessorDialog_Index); 
-		gridData = new GridData(GridData.BEGINNING);
-		label.setLayoutData(gridData);
-
-		predIdText = new Text(composite, SWT.BORDER);
-		gridData = new GridData(GridData.GRAB_HORIZONTAL);
-		gridData.widthHint = 100;
-		predIdText.setLayoutData(gridData);
-		predIdText.setText(new Integer(predMap.getId()).toString());
-		// predIdText.setEditable(false);
-
-		// Presentaion Name
-		label = new Label(composite, SWT.NONE);
-		label.setText(PropertiesResources.PredecessorDialog_PresentationName); //$NON-NLS-1$
-		gridData = new GridData(GridData.BEGINNING);
-		label.setLayoutData(gridData);
-
-		presentationName = new Text(composite, SWT.BORDER);
-		gridData = new GridData(GridData.GRAB_HORIZONTAL);
-		gridData.widthHint = 400;
-		presentationName.setEditable(false);
-		presentationName.setLayoutData(gridData);
-
-		WorkOrder wo = predMap.getWorkOrder();
-		presentationName.setText(ProcessUtil.getPresentationName(wo.getPred()));
-
-		// Dependency
-		label = new Label(composite, SWT.NONE);
-		label.setText(PropertiesResources.PredecessorDialog_Dependency); //$NON-NLS-1$
-		gridData = new GridData(GridData.BEGINNING);
-		label.setLayoutData(gridData);
-
-		dependency = new Combo(composite, SWT.SINGLE | SWT.READ_ONLY);
-		gridData = new GridData(GridData.BEGINNING);
-		dependency.setLayoutData(gridData);
-		dependency.setItems(dependencyList);
-
-		String depedencyName = wo.getLinkType().getName();
-		if (wo.getLinkType().getValue() == WorkOrderType.FINISH_TO_FINISH) {
-			depedencyName = FINISH_TO_FINISH;
-		} else if (wo.getLinkType().getValue() == WorkOrderType.FINISH_TO_START) {
-			depedencyName = FINISH_TO_START;
-		} else if (wo.getLinkType().getValue() == WorkOrderType.START_TO_FINISH) {
-			depedencyName = START_TO_FINISH;
-		} else if (wo.getLinkType().getValue() == WorkOrderType.START_TO_START) {
-			depedencyName = START_TO_START;
-		}
-		dependency.setText(depedencyName);
-
-		Label line = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL
-				| SWT.BOLD);
-		gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = 2;
-		line.setLayoutData(gridData);
-
-		predIdText.addFocusListener(new FocusAdapter() {
-			public void focusLost(FocusEvent event) {
-				int newId;
-				try {
-					newId = new Integer(predIdText.getText()).intValue();
-					if (newId < 0)
-						throw new Exception();
-				} catch (Exception e) {
-					AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayWarning(
-									PropertiesResources.Process_predecessors_validNumberTitle, //$NON-NLS-1$
-									PropertiesResources.Process_predecessors_validNumberMessage); //$NON-NLS-1$
-
-					predIdText.setText(new Integer(predMap.getId()).toString());
-					predIdText.setFocus();
-					predIdText.selectAll();
-					return;
-				}
-
-				if (alreadyExists(newId)) {
-					predIdText.setText(new Integer(predMap.getId()).toString());
-
-					predIdText.selectAll();
-					return;
-				}
-
-				String predIDList = getPredId(newId);
-				if (predIDList == null)
-					return;
-
-				String str = ProcessUtil.checkPredecessorList(element,
-						predIDList, adapterFactory, process, predecessors);
-				if (str != null) {
-					AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayError(
-									PropertiesResources.PredecessorDialog_PredecessorErrorDialogTitle, str); //$NON-NLS-1$
-					predIdText.setText(new Integer(predMap.getId()).toString());
-					return;
-				}
-				presentationName.setText(getName(newId));
-			}
-		});
-
-		return composite;
-	}
-
-	/**
-	 * Get presentation name/name for this predecessor id
-	 * 
-	 * @param newId
-	 * @return
-	 */
-	private String getName(int newId) {
-		String name = null;
-		for (Iterator iter = new AdapterFactoryTreeIterator(adapterFactory,
-				process); iter.hasNext();) {
-			Object obj = iter.next();
-			IBSItemProvider itemProvider = (IBSItemProvider) adapterFactory
-					.adapt(obj, ITreeItemContentProvider.class);
-			Integer id = new Integer(itemProvider.getId());
-			obj = TngUtil.unwrap(obj);
-
-			if (newId == id.intValue()) {
-				name = ((BreakdownElement) obj).getPresentationName();
-				if (StrUtil.isBlank(name)) {
-					name = ((BreakdownElement) obj).getName();
-				}
-			}
-		}
-		return name;
-	}
-
-	/**
-	 * Check to see whether predecessor Id already exists
-	 * 
-	 * @param newId
-	 * @return
-	 */
-	private boolean alreadyExists(int newId) {
-		for (Iterator itor = predMapList.iterator(); itor.hasNext();) {
-			PredecessorMap map = (PredecessorMap) itor.next();
-			if ((map.getId() == newId) && (predMap.getId() != newId)) {
-				AuthoringUIPlugin
-						.getDefault()
-						.getMsgDialog()
-						.displayError(
-								PropertiesResources.PredecessorDialog_PredecessorErrorDialogTitle, //$NON-NLS-1$
-								PropertiesResources.PredecessorDialog_PredecessorErrorMessage); //$NON-NLS-1$
-
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Get command separated list of all predecessor
-	 * 
-	 * @param newId
-	 * @return
-	 */
-	private String getPredId(int newId) {
-		StringBuffer buf = new StringBuffer();
-
-		for (Iterator itor = predMapList.iterator(); itor.hasNext();) {
-			PredecessorMap map = (PredecessorMap) itor.next();
-			if (predMap.getId() == map.getId()) {
-				buf.append(newId);
-			} else {
-				buf.append(map.getId());
-			}
-
-			buf.append(","); //$NON-NLS-1$
-		}
-		return buf.toString();
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void configureShell(Shell parent) {
-		super.configureShell(parent);
-		parent
-				.setText(PropertiesResources.PredecessorDialog_Title); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		// new id
-		int newId = new Integer(predIdText.getText()).intValue();
-		// ne link type
-		WorkOrderType workOrderType = getWorkOrderType();
-
-		if ((newId != predMap.getId())
-				|| (!workOrderType.equals(predMap.getWorkOrder().getLinkType()))) {
-			String predIDList = getPredId(newId);
-			if (predIDList == null)
-				return;
-
-			String str = ProcessUtil.checkPredecessorList(element, predIDList,
-					adapterFactory, process, predecessors);
-			if (str != null) {
-				AuthoringUIPlugin
-						.getDefault()
-						.getMsgDialog()
-						.displayError(
-								PropertiesResources.PredecessorDialog_PredecessorErrorDialogTitle, str); //$NON-NLS-1$
-				predIdText.setText(new Integer(predMap.getId()).toString());
-			}
-
-			// remove it
-			boolean status = actionMgr.doAction(IActionManager.REMOVE, element,
-					UmaPackage.eINSTANCE
-							.getWorkBreakdownElement_LinkToPredecessor(),
-					predMap.getWorkOrder(), -1);
-			if (!status) {
-				close();
-				return;
-			}
-			predMapList.remove(predMap);
-
-			int size = predecessors.size();
-
-			for (int i = 0; i < size; i++) {
-				WorkBreakdownElement e = (WorkBreakdownElement) predecessors
-						.get(i);
-
-				boolean found = false;
-				find_pred: for (Iterator iterator = element
-						.getLinkToPredecessor().iterator(); iterator.hasNext();) {
-					WorkOrder wo = (WorkOrder) iterator.next();
-					if (wo.getPred() == e) {
-						found = true;
-						break find_pred;
-					}
-				}
-				if (!found) {
-					WorkOrder wo = UmaFactory.eINSTANCE.createWorkOrder();
-					wo.setPred(e);
-					wo.setLinkType(workOrderType);
-					boolean stat = actionMgr
-							.doAction(
-									IActionManager.ADD,
-									element,
-									UmaPackage.eINSTANCE
-											.getWorkBreakdownElement_LinkToPredecessor(),
-									wo, -1);
-					if (!stat)
-						return;
-
-					predMap.setId(newId);
-					predMap.setWorkOrder(wo);
-					predMapList.add(predMap);
-				}
-			}
-		}
-
-		super.okPressed();
-	}
-
-	/**
-	 * Get work order link type from UI
-	 * 
-	 * @return 
-	 * 			Work Order type
-	 */
-	private WorkOrderType getWorkOrderType() {
-		int index = dependency.getSelectionIndex();
-		WorkOrderType type;
-		if (index == 0) {
-			type = WorkOrderType.FINISH_TO_START_LITERAL;
-		} else if (index == 1) {
-			type = WorkOrderType.FINISH_TO_FINISH_LITERAL;
-		} else if (index == 2) {
-			type = WorkOrderType.START_TO_START_LITERAL;
-		} else {
-			type = WorkOrderType.START_TO_FINISH_LITERAL;
-		}
-
-		return type;
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#close()
-	 */
-	public boolean close() {
-
-		return super.close();
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/PredecessorMap.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/PredecessorMap.java
deleted file mode 100755
index 85d502f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/PredecessorMap.java
+++ /dev/null
@@ -1,73 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import org.eclipse.epf.uma.WorkOrder;
-
-/**
- * Map of predecessor ID and corresponding work order
- * @author Shilpa Toraskar
- * @since 1.0
- *
- */
-public class PredecessorMap {
-	private int id;
-
-	private WorkOrder wo;
-
-	/**
-	 * 
-	 * @param id
-	 * 		Predecessor ID
-	 * @param wo
-	 * 		WorkOrder object
-	 */
-	public PredecessorMap(int id, WorkOrder wo) {
-		this.id = id;
-		this.wo = wo;
-	}
-
-	/**
-	 * Get predecessor ID
-	 * @return
-	 * 			Predecessor ID
-	 */
-	public int getId() {
-		return this.id;
-	}
-
-	/**
-	 * Set Predecessor ID
-	 * @param id
-	 * 			Predecessor ID
-	 */
-	public void setId(int id) {
-		this.id = id;
-	}
-	
-	/**
-	 * Get work order
-	 * @return
-	 * 		Work Order
-	 */
-	public WorkOrder getWorkOrder() {
-		return this.wo;
-	}
-
-	/**
-	 * Set Work Order
-	 * @param wo
-	 * 			Work Order
-	 */
-	public void setWorkOrder(WorkOrder wo) {
-		this.wo = wo;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/PropertiesResources.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/PropertiesResources.java
deleted file mode 100755
index 0339b5f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/PropertiesResources.java
+++ /dev/null
@@ -1,212 +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
- *******************************************************************************/
-package org.eclipse.epf.authoring.ui.properties;
-
-import org.eclipse.osgi.util.NLS;
-/**
- * Properties resources
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public final class PropertiesResources extends NLS {
-
-	private static final String BUNDLE_NAME = PropertiesResources.class.getPackage().getName()
-								+ ".Resources"; //$NON-NLS-1$
-	
-	private PropertiesResources() {
-		// Do not instantiate
-	}
-
-	public static String Process_generalInformationTitle;
-	public static String Process_DocumentInformationTitle;
-	public static String Activity_guidanceInformationTitle;
-	public static String BreakdownElement_optionInformationTitle;
-	public static String TaskDescriptor_stepInformationTitle;
-	public static String Process_generalInformationDescription;
-	public static String Process_documentInformationDescription;
-	public static String Descriptor_generalInformationDescription;
-	public static String Descriptor_detailInformationDescription;
-	public static String Milestone_generalInformationDescription;
-	public static String Milestone_detailInformationDescription;
-	public static String TaskDescriptor_stepInformationDescription;
-	public static String BreakdownElement_generalInformationDescription;
-	public static String WorkBreakdownElement_generalInformationDescription;
-	public static String Descriptor_generalInformationDescripton;
-	public static String Activity_generalInformationDescription;
-	public static String BreakdownElement_DocumentInformationDescription;
-	public static String Activity_DocumentInformationDescription;
-	public static String Descriptor_documentInformationDescription;
-	public static String Process_None;
-	public static String Process_name;
-	public static String Process_PresentationName;
-	public static String Process_briefDescription;
-	public static String Process_mainDescription;
-	public static String Process_purpose;
-	public static String Process_prefix;
-	public static String BreakdownElement_Type_Name;
-	public static String Process_Type_Task;
-	public static String Process_Type_Role;
-	public static String Process_Type_WorkProduct;
-	public static String WorkProduct_Type;
-	public static String Activity_ModelInfo;
-	public static String Activity_Type;
-	public static String Activity_presentationName;
-	public static String Activity_alternatives;
-	public static String Activity_howToStaff;
-	public static String BreakdownElement_keyConsiderations;
-	public static String Process_usageGuidance;
-	public static String Activity_RoadmapTitle;
-	public static String Activity_RoadmapDescription;
-	public static String Activity_GeneralGuidanceTitle;
-	public static String Activity_GeneralGuidanceDescription;
-	public static String Activity_CommunicationMaterialTitle;
-	public static String Activity_CommunicationMaterialDescription;
-	public static String Activity_EducationMaterialTitle;
-	public static String Activity_EducationMaterialDescription;
-	public static String Activity_Selected_Roadmap;
-	public static String Activity_Selected_GeneralGuidance;
-	public static String Activity_Selected_CommunicationMaterial;
-	public static String Activity_Selected_EducationMaterial;
-	public static String Activity_DiagramTitle;
-	public static String Activity_DiagramDescription;
-	public static String Activity_ADImage;
-	public static String Activity_ADDImage;
-	public static String Activity_WPDImage;
-	public static String Activity_UseADImage;
-	public static String Activity_UseADDImage;
-	public static String Activity_UseWPDImage;
-	public static String Activity_Assign;
-	
-	public static String Activity_WorkRollup;
-	public static String Activity_TeamRollup;
-	public static String Activity_WorkProductsRollup;
-	public static String Activity_WorkRollupDescription;
-	public static String Activity_TeamRollupDescription;
-	public static String Activity_WorkProductsRollupDescription;
-	public static String BreakdownElement_Option_MultipleOcurrance;
-	public static String BreakdownElement_Option_Optional;
-	public static String BreakdownElement_Option_Planned;
-	public static String BreakdownElement_Option_Supressed;
-	public static String WorkBreakdownElement_EventDriven;
-	public static String WorkBreakdownElement_Ongoing;
-	public static String WorkBreakdownElement_Repeatable;
-	public static String WorkBreakdownElement_Predecessors;
-	public static String WorkBreakdownElement_Dependency;
-	public static String WorkBreakdownElement_Dependency_COL_ID_TEXT;
-	public static String WorkBreakdownElement_Dependency_COL_PRESENTATION_NAME_TEXT;
-	public static String WorkBreakdownElement_Dependency_COL_DEPENDENCY_TEXT;
-	public static String WorkBreakdownElement_Dependency_Add;
-	public static String WorkBreakdownElement_Dependency_Edit;
-	public static String WorkBreakdownElement_Dependency_Remove;
-	public static String WorkOrderType_FINISH_TO_START;
-	public static String WorkOrderType_FINISH_TO_FINISH;
-	public static String WorkOrderType_START_TO_FINISH;
-	public static String WorkOrderType_START_TO_START;
-	public static String BreakdownElement_Option_Synchronized;
-	public static String Descriptor_RefinedDescription;
-	public static String TaskDescriptor_Roles_SectionTitle;
-	public static String TaskDescriptor_Roles_SectionDescription;
-	public static String TaskDescriptor_Roles_Table1;
-	public static String TaskDescriptor_Roles_Table2;
-	public static String TaskDescriptor_Roles_Table3;
-	public static String TaskDescriptor_Selected_Steps;
-	public static String TaskDescriptor_StepDialogTitle;
-	public static String TaskDescriptor_StepDialogMessage;
-	public static String TaskDescriptor_WorkProducts_SectionTitle;
-	public static String TaskDescriptor_WorkProducts_SectionDescription;
-	public static String TaskDescriptor_WorkProducts_Table1;
-	public static String TaskDescriptor_WorkProducts_Table2;
-	public static String TaskDescriptor_WorkProducts_Table3;
-	public static String TaskDescriptor_WorkProducts_Table4;
-	public static String RoleDescriptor_Tasks_SectionTitle;
-	public static String RoleDescriptor_Tasks_SectionDescription;
-	public static String RoleDescriptor_Tasks_Table1;
-	public static String RoleDescriptor_Tasks_Table2;
-	public static String RoleDescriptor_Tasks_Table3;
-	public static String RoleDescriptor_WorkProducts_SectionTitle;
-	public static String RoleDescriptor_WorkProducts_SectionDescription;
-	public static String RoleDescriptor_WorkProducts_Table1;
-	public static String RoleDescriptor_WorkProducts_Table2;
-	public static String WorkProductDescriptor_Roles_SectionTitle;
-	public static String WorkProductDescriptor_Roles_SectionDescription;
-	public static String WorkProductDescriptor_Roles_Table1;
-	public static String WorkProductDescriptor_Roles_Table2;
-	public static String WorkProductDescriptor_Type;
-	public static String WorkProductDescriptor_ActivityEntryState;
-	public static String WorkProductDescriptor_ActivityExitState;
-	public static String WPDescriptor_DeliverablePart_SectionTitle;
-	public static String WPDescriptor_DeliverablePart_SectionDescription;
-	public static String WPDescriptor_DeliverablePart_Table1;
-	public static String RoleDescriptor_Team_SectionTitle;
-	public static String RoleDescriptor_Team_SectionDescription;
-	public static String RoleDescriptor_Team_Table1;
-	public static String CompositeRole_Role_SectionTitle;
-	public static String CompositeRole_Role_SectionDescription;
-	public static String CompositeRole_Role_Table1;
-	public static String TeamProfile_Role_SectionTitle;
-	public static String TeamProfile_Role_SectionDescription;
-	public static String TeamProfile_Role_Table1;
-	public static String Process_RichText_CollapseImage;
-	public static String Process_RichText_ExpandImage;
-	public static String Process_Add;
-	public static String Process_AddFromProcess;
-	public static String Process_Rename_Message;
-	public static String Process_Remove;
-	public static String Process_Up;
-	public static String Process_Down;
-	public static String Process_MultipleSelection;
-	public static String Process_Button_LinkMethodElement;
-	public static String Process_InvalidNameTitle;
-	public static String Process_InvalidName;
-	public static String Process_Rename_Title;
-	public static String Process_InvalidPresentationName;
-	public static String Process_LinkMethodElementTitle;
-	public static String Process_InvalidLinkMethodElement;
-	public static String Process_AssignmentInfoTitle;
-	public static String Process_TeamAssignError;
-	public static String Process_TeamDialogMessage;
-	public static String Process_TeamDialogTitle;
-	public static String Process_DeliverableAssignError;
-	public static String Process_CompositeRoleAssignError;
-	public static String Process_predecessors_validNumberMessage;
-	public static String Process_predecessors_validNumberTitle;
-	public static String Process_NoItems;
-	public static String Process_ItemsSelected;
-	public static String Process_NoPropertiesAvailable;
-	public static String PredecessorDialog_Title;
-	public static String PredecessorDialog_HeaderMessage;
-	public static String PredecessorDialog_Index;
-	public static String PredecessorDialog_PresentationName;
-	public static String PredecessorDialog_Dependency;
-	public static String PredecessorDialog_PredecessorErrorDialogTitle;
-	public static String PredecessorDialog_PredecessorErrorMessage;
-	public static String ProcessEditorFormProperties_textEditCell_problem_msg;
-	public static String ProcessEditorFormProperties_cellEditor_invalidPredcessor_problem_msg;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, PropertiesResources.class);
-	}
-	
-	/**
-	 * Returns the localized string associated with a resource key and formatted
-	 * with a given object.
-	 * 
-	 * @param key
-	 *            A resource key.
-	 * @param data
-	 *            An object.
-	 * @return A formatted localized string.
-	 */
-	public static String bind(String key, Object data) {
-		return NLS.bind(key, new Object[] { data });
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/PropertiesUtil.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/PropertiesUtil.java
deleted file mode 100755
index 4a0e451..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/PropertiesUtil.java
+++ /dev/null
@@ -1,85 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.Iteration;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.Phase;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.TeamProfile;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-
-
-/**
- * Utility class for properties 
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class PropertiesUtil {
-
-	/**
-	 * Returns type of the object
-	 * 
-	 * @param obj
-	 * @return
-	 * 		Type
-	 */
-	public static String getType(Object obj) {
-		String prefix = PropertiesResources.BreakdownElement_Type_Name; //$NON-NLS-1$
-
-		if (obj instanceof CapabilityPattern) {
-			prefix = LibraryUIText.TEXT_CAPABILITY_PATTERN;
-		} else if (obj instanceof DeliveryProcess) {
-			prefix = LibraryUIText.TEXT_DELIVERY_PROCESS;
-		} else if (obj instanceof Process) {
-			prefix = LibraryUIText.TEXT_PROCESS;
-		} else if (obj instanceof Phase) {
-			prefix = LibraryUIText.TEXT_PHASE;
-		} else if (obj instanceof Iteration) {
-			prefix = LibraryUIText.TEXT_ITERATION;
-		} else if (obj instanceof Activity) {
-			prefix = LibraryUIText.TEXT_ACTIVITY;
-		} else if (obj instanceof TaskDescriptor) {
-			prefix = LibraryUIText.TEXT_TASK_DESCRIPTOR;
-		} else if (obj instanceof RoleDescriptor) {
-			prefix = LibraryUIText.TEXT_ROLE_DESCRIPTOR;
-		} else if (obj instanceof WorkProductDescriptor) {
-			prefix = LibraryUIText.TEXT_WORK_PRODUCT_DESCRIPTOR;
-		} else if (obj instanceof Milestone) {
-			prefix = LibraryUIText.TEXT_MILESTONE;
-		} else if (obj instanceof TeamProfile) {
-			prefix = LibraryUIText.TEXT_TEAM_PROFILE;
-		}
-
-		return prefix;
-	}
-	
-	/**
-	 * Return type of the object in lower case
-	 * @param obj
-	 * @return
-	 * 		Type
-	 */
-	public static String getTypeLower(Object obj) {
-		String type = getType(obj);
-		
-		return StrUtil.toLower(type);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/PropertiesViewConstants.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/PropertiesViewConstants.java
deleted file mode 100755
index c867505..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/PropertiesViewConstants.java
+++ /dev/null
@@ -1,30 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-/**
- * Constants for properties view
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- * 
- */
-public class PropertiesViewConstants {
-
-	public static final String ROLE_DESCRIPTOR = "RoleDescriptor"; //$NON-NLS-1$
-
-	public static final String WORKPRODUCTS = "WorkProducts"; //$NON-NLS-1$
-
-	public static final String TASK_DESCRIPTOR = "TaskDescriptor"; //$NON-NLS-1$
-
-	public static final String ROLES = "Roles"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/RelationSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/RelationSection.java
deleted file mode 100755
index 3026af4..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/RelationSection.java
+++ /dev/null
@@ -1,899 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.dialogs.ItemsFilterDialog;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.uma.Descriptor;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-
-/**
- * The base class used to display relationships between descriptors
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class RelationSection extends AbstractSection {
-	protected ILabelProvider labelProvider = null;
-
-	protected IStructuredContentProvider contentProvider = null;
-
-	// element
-	protected Descriptor element;
-
-	// action manager
-	protected IActionManager actionMgr;
-
-	private FormToolkit toolkit;
-
-	private Button ctrl_add_1, ctrl_add_2, ctrl_add_3, ctrl_add_4;
-
-	private Button ctrl_remove_1, ctrl_remove_2, ctrl_remove_3, ctrl_remove_4;
-
-	private Button ctrl_add_proc_1, ctrl_add_proc_2, ctrl_add_proc_3,
-			ctrl_add_proc_4;;
-
-	private Table ctrl_table_1, ctrl_table_2, ctrl_table_3, ctrl_table_4;
-
-	protected TableViewer tableViewer1, tableViewer2, tableViewer3,
-			tableViewer4;
-
-	private Text ctrl_brief_desc;
-
-	private String tabString;
-	
-	private String title, desc, table1, table2, table3, table4;
-
-	private int tableCount;
-
-	private boolean[] changesAllowed;
-
-	Process process;
-
-	IFilter descriptorProcessfilter;
-
-	protected Process getProcess() {
-		return process;
-	}
-
-	protected IFilter getFilterForDescriptors() {
-		return descriptorProcessfilter;
-	}
-
-	protected String getDescriptorTabName() {
-		return null;
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.AbstractSection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-
-		super.createControls(parent, tabbedPropertySheetPage);
-		init();
-
-		parent.setLayout(new GridLayout());
-		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// create section
-		createSection(parent);
-
-		// add listeners
-		addListeners();
-
-		// update controls
-		updateControls();
-
-	}
-
-	protected void setTabData(String title, String desc, String table1, String table2, String table3, String table4, String tabString) {
-		this.title = title;
-		this.desc = desc;
-		this.table1 = table1;
-		this.table2 = table2;
-		this.table3 = table3;
-		this.table4 = table4;
-		
-		this.tabString = tabString;
-	}
-
-	protected void setTableData(int tableCount, boolean[] changesAllowed) {
-		this.tableCount = tableCount;
-		this.changesAllowed = changesAllowed;
-	}
-
-	protected void init() {
-		// get descriptor object
-		element = (Descriptor) getElement();
-
-		// get toolkit
-		toolkit = getWidgetFactory();
-
-		// get action manager
-		actionMgr = EPFPropertySheetPage.getActionManager();
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.views.properties.tabbed.AbstractPropertySection#refresh()
-	 */
-	public void refresh() {
-		try {
-			if (getElement() instanceof Descriptor) {
-				element = (Descriptor) getElement();
-
-				initContentProvider1();
-				initContentProvider2();
-				initContentProvider3();
-				initContentProvider4();
-
-				// hide/show controls based on editable
-				updateControls();
-			}
-		} catch (Exception ex) {
-			logger
-					.logError(
-							"Error refreshing descriptor relation section: " + element, ex); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Update controls based on editable boolean value. Controls could be
-	 * editable or read-only after this.
-	 */
-	public void updateControls() {
-		// System.out.println("Element "+element.getName() +
-		// "Editable-"+editable);
-		if (ctrl_add_1 != null)
-			ctrl_add_1.setEnabled(editable);
-		if (ctrl_add_2 != null)
-			ctrl_add_2.setEnabled(editable);
-		if (ctrl_add_3 != null)
-			ctrl_add_3.setEnabled(editable);
-		if (ctrl_add_4 != null)
-			ctrl_add_4.setEnabled(editable);
-
-		if (ctrl_add_proc_1 != null)
-			ctrl_add_proc_1.setEnabled(editable);
-		if (ctrl_add_proc_2 != null)
-			ctrl_add_proc_2.setEnabled(editable);
-		if (ctrl_add_proc_3 != null)
-			ctrl_add_proc_3.setEnabled(editable);
-		if (ctrl_add_proc_4 != null)
-			ctrl_add_proc_4.setEnabled(editable);
-
-		IStructuredSelection selection = (IStructuredSelection) tableViewer1
-				.getSelection();
-		if (selection.size() > 0 && editable) {
-			ctrl_remove_1.setEnabled(true);
-		} else {
-			ctrl_remove_1.setEnabled(false);
-		}
-
-		if (tableViewer2 != null) {
-			selection = (IStructuredSelection) tableViewer2.getSelection();
-			if (selection.size() > 0 && editable) {
-					if (ctrl_remove_2 != null)
-				ctrl_remove_2.setEnabled(true);
-			} else {
-					if (ctrl_remove_2 != null)
-				ctrl_remove_2.setEnabled(false);
-			}
-		}
-
-		if (tableViewer3 != null) {
-			selection = (IStructuredSelection) tableViewer3.getSelection();
-			if (selection.size() > 0 && editable) {
-				ctrl_remove_3.setEnabled(true);
-			} else {
-				ctrl_remove_3.setEnabled(false);
-			}
-		}
-
-		if (tableViewer4 != null) {
-			selection = (IStructuredSelection) tableViewer4.getSelection();
-			if (selection.size() > 0 && editable) {
-				ctrl_remove_4.setEnabled(true);
-			} else {
-				ctrl_remove_4.setEnabled(false);
-			}
-		}
-	}
-
-	/**
-	 * Dispose all label and content providers
-	 */
-	public void dispose() {
-		super.dispose();
-		if (labelProvider != null) {
-			labelProvider.dispose();
-		}
-		if (contentProvider != null) {
-			contentProvider.dispose();
-		}
-	}
-
-	/**
-	 * Initialize content provider for the first table in properties view
-	 *
-	 */
-	protected void initContentProvider1() {
-	}
-
-	/**
-	 * Initialize content provider for the second table in properties view
-	 *
-	 */
-	protected void initContentProvider2() {
-	}
-
-	/**
-	 * Initialize content provider for the third table in properties view
-	 *
-	 */
-	protected void initContentProvider3() {
-	}
-
-	/**
-	 * Initialize content provider for the fourth table in properties view
-	 *
-	 */
-	protected void initContentProvider4() {
-	}
-
-	/**
-	 * Get list of descriptors from the process
-	 * @return
-	 * 			List of descriptors
-	 */
-	protected List getDescriptorsFromProcess() {
-		return null;
-	}
-
-	/**
-	 * Returns filter which allows filtering element based on method configuration 
-	 * @return
-	 * 		Filter
-	 */
-	protected IFilter getFilter() {
-		return null;
-	}
-
-	protected void createSection(Composite composite) {
-		int tableHeight = 80;
-
-		// create section
-		Section aSection = FormUI.createSection(toolkit, composite,
-				title, desc);
-
-		// create composite
-		Composite sectionComposite = FormUI.createComposite(toolkit, aSection,
-				2, false);
-
-		// create table 1
-		int count = 0;
-		{
-			Composite pane1 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.FILL_BOTH);
-			FormUI.createLabel(toolkit, pane1, table1);
-
-			ctrl_table_1 = FormUI.createTable(toolkit, pane1, tableHeight);
-			tableViewer1 = new TableViewer(ctrl_table_1);
-			initContentProvider1();
-
-			tableViewer1.setLabelProvider(labelProvider);
-			tableViewer1.setInput(element);
-
-			// create buttons for table1
-			Composite pane2 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.VERTICAL_ALIGN_CENTER
-							| GridData.HORIZONTAL_ALIGN_CENTER);
-
-			if (changesAllowed[count]) {
-				ctrl_add_1 = FormUI.createButton(toolkit, pane2,
-						PropertiesResources.Process_Add); 
-				ctrl_add_proc_1 = FormUI
-						.createButton(toolkit, pane2, PropertiesResources.Process_AddFromProcess); //$NON-NLS-1$
-				ctrl_remove_1 = FormUI.createButton(toolkit, pane2,
-						PropertiesResources.Process_Remove); 
-				ctrl_remove_1.setEnabled(false);
-			}
-			toolkit.paintBordersFor(pane1);
-		}
-		count++;
-
-		// create table2
-		if (count < tableCount) {
-			Composite pane3 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.FILL_BOTH);
-			FormUI.createLabel(toolkit, pane3, table2);
-
-			ctrl_table_2 = FormUI.createTable(toolkit, pane3, tableHeight);
-			tableViewer2 = new TableViewer(ctrl_table_2);
-			initContentProvider2();
-
-			tableViewer2.setLabelProvider(labelProvider);
-			tableViewer2.setInput(element);
-
-			// create buttons for table2
-			Composite pane4 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.VERTICAL_ALIGN_CENTER
-							| GridData.HORIZONTAL_ALIGN_CENTER);
-			if (changesAllowed[count]) {
-				ctrl_add_2 = FormUI.createButton(toolkit, pane4,
-						PropertiesResources.Process_Add); 
-				ctrl_add_proc_2 = FormUI
-						.createButton(toolkit, pane4, PropertiesResources.Process_AddFromProcess); //$NON-NLS-1$
-				ctrl_remove_2 = FormUI.createButton(toolkit, pane4,
-						PropertiesResources.Process_Remove); 
-				ctrl_remove_2.setEnabled(false);
-			}
-			toolkit.paintBordersFor(pane3);
-		}
-
-		count++;
-
-		// Create table3
-		if (count < tableCount) {
-			Composite pane5 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.FILL_BOTH);
-			FormUI.createLabel(toolkit, pane5, table3);
-
-			ctrl_table_3 = FormUI.createTable(toolkit, pane5, tableHeight);
-			tableViewer3 = new TableViewer(ctrl_table_3);
-			initContentProvider3();
-
-			tableViewer3.setLabelProvider(labelProvider);
-			tableViewer3.setInput(element);
-
-			// create buttons for table2
-			Composite pane6 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.VERTICAL_ALIGN_CENTER
-							| GridData.HORIZONTAL_ALIGN_CENTER);
-			if ((new Boolean(changesAllowed[count])).booleanValue()) {
-				ctrl_add_3 = FormUI.createButton(toolkit, pane6,
-						PropertiesResources.Process_Add); 
-				ctrl_add_proc_3 = FormUI
-						.createButton(toolkit, pane6, PropertiesResources.Process_AddFromProcess); //$NON-NLS-1$
-				ctrl_remove_3 = FormUI.createButton(toolkit, pane6,
-						PropertiesResources.Process_Remove); 
-				ctrl_remove_3.setEnabled(false);
-			}
-			toolkit.paintBordersFor(pane5);
-		}
-		count++;
-
-		if (count < tableCount) {
-			Composite pane7 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.FILL_BOTH);
-			FormUI.createLabel(toolkit, pane7, table4);
-
-			ctrl_table_4 = FormUI.createTable(toolkit, pane7, tableHeight);
-			tableViewer4 = new TableViewer(ctrl_table_4);
-			initContentProvider4();
-
-			tableViewer4.setLabelProvider(labelProvider);
-			tableViewer4.setInput(element);
-
-			// create buttons for table4
-			Composite pane8 = FormUI.createComposite(toolkit, sectionComposite,
-					GridData.VERTICAL_ALIGN_CENTER
-							| GridData.HORIZONTAL_ALIGN_CENTER);
-			if ((new Boolean(changesAllowed[count])).booleanValue()) {
-				ctrl_add_4 = FormUI.createButton(toolkit, pane8,
-						PropertiesResources.Process_Add); 
-				ctrl_add_proc_4 = FormUI
-						.createButton(toolkit, pane8, PropertiesResources.Process_AddFromProcess); //$NON-NLS-1$
-				ctrl_remove_4 = FormUI.createButton(toolkit, pane8,
-						PropertiesResources.Process_Remove); 
-				ctrl_remove_4.setEnabled(false);
-			}
-			toolkit.paintBordersFor(pane8);
-
-		}
-
-		// create brief description
-		int heightHint = 40;
-		// int horizontalSpan = 2;
-		FormUI.createLabel(toolkit, sectionComposite, PropertiesResources.Process_briefDescription, heightHint); //$NON-NLS-1$
-		ctrl_brief_desc = FormUI.createText(toolkit, sectionComposite,
-				heightHint, heightHint);
-		ctrl_brief_desc.setEditable(false);
-
-		toolkit.paintBordersFor(sectionComposite);
-	}
-
-	/**
-	 * addListerers
-	 * 
-	 */
-	protected void addListeners() {
-		/**
-		 * First set of listeners
-		 */
-		int count = 0;
-		if (count < tableCount) {
-			ctrl_table_1.addFocusListener(new FocusAdapter() {
-				public void focusGained(FocusEvent e) {
-					IStructuredSelection selection = (IStructuredSelection) tableViewer1
-							.getSelection();
-					if ((selection.size() > 0) && editable)
-						ctrl_remove_1.setEnabled(true);
-				}
-			});
-
-			tableViewer1
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) tableViewer1
-									.getSelection();
-							if ((selection.size() > 0) & editable)
-								ctrl_remove_1.setEnabled(true);
-							if (selection.size() == 1) {
-								String desc = ((MethodElement) selection
-										.getFirstElement())
-										.getBriefDescription();
-								if (desc == null) {
-									desc = ""; //$NON-NLS-1$
-								}
-								ctrl_brief_desc.setText(desc);
-							} else if (selection.size() > 1) {
-								ctrl_brief_desc
-										.setText(PropertiesResources.Process_MultipleSelection + " - " + selection.size()); //$NON-NLS-1$ //$NON-NLS-2$
-							}
-						}
-					});
-
-			if (changesAllowed[count]) {
-				ctrl_add_1.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						IFilter filter = getFilter();
-						List existingElements = ProcessUtil
-								.getAssociatedElementList(getExistingElements1());
-
-						ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-								.getWorkbench().getActiveWorkbenchWindow()
-								.getShell(), filter, element, tabString,
-								existingElements);
-
-						fd.setBlockOnOpen(true);
-						fd.setTitle(tabString);
-						fd.open();
-						addItems1(fd.getSelectedItems());
-						tableViewer1.refresh();
-
-					}
-				});
-
-				ctrl_add_proc_1.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						descriptorProcessfilter = getFilterForDescriptors();
-						process = getProcess();
-						if (descriptorProcessfilter != null && process != null) {
-							List existingElements = getExistingElements1();
-							ItemsFilterDialog fd = new ItemsFilterDialog(
-									PlatformUI.getWorkbench()
-											.getActiveWorkbenchWindow()
-											.getShell(),
-									descriptorProcessfilter, process,
-									getDescriptorTabName(), existingElements);
-
-							fd.setBlockOnOpen(true);
-							fd.open();
-							addFromProcessItems1(fd.getSelectedItems());
-							tableViewer1.refresh();
-						}
-
-					}
-				});
-
-				ctrl_remove_1.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						IStructuredSelection selection = (IStructuredSelection) tableViewer1
-								.getSelection();
-						if (selection.size() > 0) {
-							// update the model
-							ArrayList rmItems = new ArrayList();
-							rmItems.addAll(selection.toList());
-							removeItems1(rmItems);
-							tableViewer1.refresh();
-
-							// clear the selection
-							tableViewer1.setSelection(null, true);
-							ctrl_brief_desc.setText(""); //$NON-NLS-1$
-						}
-						ctrl_remove_1.setEnabled(false);
-					}
-				});
-			}
-		}
-		count++;
-
-		/**
-		 * Second set of listeners
-		 */
-		if (count < tableCount) {
-			ctrl_table_2.addFocusListener(new FocusAdapter() {
-				public void focusGained(FocusEvent e) {
-					IStructuredSelection selection = (IStructuredSelection) tableViewer2
-							.getSelection();
-					if ((selection.size() > 0) && editable) {
-						if (ctrl_remove_2 != null)
-							ctrl_remove_2.setEnabled(true);
-					}
-				}
-			});
-
-			tableViewer2
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) tableViewer2
-									.getSelection();
-							if ((selection.size() > 0) && editable) {
-								if (ctrl_remove_2 != null)
-									ctrl_remove_2.setEnabled(true);
-							}
-							if (selection.size() == 1) {
-								String desc = ((MethodElement) selection
-										.getFirstElement())
-										.getBriefDescription();
-								if (desc == null) {
-									desc = ""; //$NON-NLS-1$
-								}
-								ctrl_brief_desc.setText(desc);
-							} else if (selection.size() > 1) {
-								ctrl_brief_desc
-										.setText(PropertiesResources.Process_MultipleSelection + " - " + selection.size()); //$NON-NLS-1$ //$NON-NLS-2$
-							}
-						}
-					});
-
-			if (changesAllowed[count]) {
-				ctrl_add_2.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						IFilter filter = getFilter();
-						List existingElements = ProcessUtil
-								.getAssociatedElementList(getExistingElements2());
-						ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-								.getWorkbench().getActiveWorkbenchWindow()
-								.getShell(), filter, element, tabString,
-								existingElements);
-
-						fd.setBlockOnOpen(true);
-						fd.setTitle(tabString);
-						fd.open();
-						addItems2(fd.getSelectedItems());
-						tableViewer2.refresh();
-					}
-				});
-
-				ctrl_add_proc_2.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						descriptorProcessfilter = getFilterForDescriptors();
-						process = getProcess();
-						if (descriptorProcessfilter != null && process != null) {
-							List existingElements = getExistingElements2();
-							ItemsFilterDialog fd = new ItemsFilterDialog(
-									PlatformUI.getWorkbench()
-											.getActiveWorkbenchWindow()
-											.getShell(),
-									descriptorProcessfilter, process,
-									getDescriptorTabName(), existingElements);
-
-							fd.setBlockOnOpen(true);
-							fd.open();
-							addFromProcessItems2(fd.getSelectedItems());
-							tableViewer2.refresh();
-						}
-					}
-				});
-
-				ctrl_remove_2.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						IStructuredSelection selection = (IStructuredSelection) tableViewer2
-								.getSelection();
-						if (selection.size() > 0) {
-							// update the model
-							ArrayList rmItems = new ArrayList();
-							rmItems.addAll(selection.toList());
-							removeItems2(rmItems);
-							tableViewer2.refresh();
-
-							// clear the selection
-							tableViewer2.setSelection(null, true);
-							ctrl_brief_desc.setText(""); //$NON-NLS-1$
-						}
-						ctrl_remove_2.setEnabled(false);
-					}
-				});
-			}
-		}
-		count++;
-
-		/**
-		 * Third set of listeners
-		 */
-		if (count < tableCount) {
-			ctrl_table_3.addFocusListener(new FocusAdapter() {
-				public void focusGained(FocusEvent e) {
-					IStructuredSelection selection = (IStructuredSelection) tableViewer3
-							.getSelection();
-					if ((selection.size() > 0) && editable)
-						ctrl_remove_3.setEnabled(true);
-				}
-			});
-
-			tableViewer3
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) tableViewer3
-									.getSelection();
-							if ((selection.size() > 0) && editable)
-								ctrl_remove_3.setEnabled(true);
-							if (selection.size() == 1) {
-								String desc = ((MethodElement) selection
-										.getFirstElement())
-										.getBriefDescription();
-								if (desc == null) {
-									desc = ""; //$NON-NLS-1$
-								}
-								ctrl_brief_desc.setText(desc);
-							} else if (selection.size() > 1) {
-								ctrl_brief_desc
-										.setText(PropertiesResources.Process_MultipleSelection + " - " + selection.size()); //$NON-NLS-1$ //$NON-NLS-2$
-							}
-						}
-					});
-
-			if ((new Boolean(changesAllowed[count])).booleanValue()) {
-				ctrl_add_3.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						IFilter filter = getFilter();
-						List existingElements = ProcessUtil
-								.getAssociatedElementList(getExistingElements3());
-						ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-								.getWorkbench().getActiveWorkbenchWindow()
-								.getShell(), filter, element, tabString,
-								existingElements);
-
-						fd.setBlockOnOpen(true);
-						fd.setTitle(tabString);
-						fd.open();
-						addItems3(fd.getSelectedItems());
-						tableViewer3.refresh();
-
-					}
-				});
-
-				ctrl_add_proc_3.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						descriptorProcessfilter = getFilterForDescriptors();
-						process = getProcess();
-						if (descriptorProcessfilter != null && process != null) {
-							List existingElements = getExistingElements3();
-							ItemsFilterDialog fd = new ItemsFilterDialog(
-									PlatformUI.getWorkbench()
-											.getActiveWorkbenchWindow()
-											.getShell(),
-									descriptorProcessfilter, process,
-									getDescriptorTabName(), existingElements);
-
-							fd.setBlockOnOpen(true);
-							fd.open();
-							addFromProcessItems3(fd.getSelectedItems());
-							tableViewer3.refresh();
-						}
-
-					}
-				});
-
-				ctrl_remove_3.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						IStructuredSelection selection = (IStructuredSelection) tableViewer3
-								.getSelection();
-						if (selection.size() > 0) {
-							// update the model
-							ArrayList rmItems = new ArrayList();
-							rmItems.addAll(selection.toList());
-							removeItems3(rmItems);
-							tableViewer3.refresh();
-
-							// clear the selection
-							tableViewer3.setSelection(null, true);
-							ctrl_brief_desc.setText(""); //$NON-NLS-1$
-						}
-						ctrl_remove_3.setEnabled(false);
-					}
-				});
-			}
-		}
-		count++;
-
-		/**
-		 * Fouth set of listeners
-		 */
-		if (count < tableCount) {
-			ctrl_table_4.addFocusListener(new FocusAdapter() {
-				public void focusGained(FocusEvent e) {
-					IStructuredSelection selection = (IStructuredSelection) tableViewer4
-							.getSelection();
-					if ((selection.size() > 0) && editable)
-						ctrl_remove_4.setEnabled(true);
-				}
-			});
-
-			tableViewer4
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) tableViewer4
-									.getSelection();
-							if ((selection.size() > 0) && editable)
-								ctrl_remove_4.setEnabled(true);
-							if (selection.size() == 1) {
-								String desc = ((MethodElement) selection
-										.getFirstElement())
-										.getBriefDescription();
-								if (desc == null) {
-									desc = ""; //$NON-NLS-1$
-								}
-								ctrl_brief_desc.setText(desc);
-							} else if (selection.size() > 1) {
-								ctrl_brief_desc
-										.setText(PropertiesResources.Process_MultipleSelection + " - " + selection.size()); //$NON-NLS-1$ //$NON-NLS-2$
-							}
-						}
-					});
-
-			if ((new Boolean(changesAllowed[count])).booleanValue()) {
-				ctrl_add_4.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						IFilter filter = getFilter();
-						List existingElements = ProcessUtil
-								.getAssociatedElementList(getExistingElements4());
-						ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-								.getWorkbench().getActiveWorkbenchWindow()
-								.getShell(), filter, element, tabString,
-								existingElements);
-
-						fd.setBlockOnOpen(true);
-						fd.setTitle(tabString);
-						fd.open();
-						addItems4(fd.getSelectedItems());
-						tableViewer4.refresh();
-					}
-				});
-
-				ctrl_add_proc_4.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						descriptorProcessfilter = getFilterForDescriptors();
-						process = getProcess();
-						if (descriptorProcessfilter != null && process != null) {
-							List existingElements = getExistingElements4();
-							ItemsFilterDialog fd = new ItemsFilterDialog(
-									PlatformUI.getWorkbench()
-											.getActiveWorkbenchWindow()
-											.getShell(),
-									descriptorProcessfilter, process,
-									getDescriptorTabName(), existingElements);
-
-							fd.setBlockOnOpen(true);
-							fd.open();
-							addFromProcessItems4(fd.getSelectedItems());
-							tableViewer4.refresh();
-						}
-					}
-				});
-
-				ctrl_remove_4.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						IStructuredSelection selection = (IStructuredSelection) tableViewer4
-								.getSelection();
-						if (selection.size() > 0) {
-							// update the model
-							ArrayList rmItems = new ArrayList();
-							rmItems.addAll(selection.toList());
-							removeItems4(rmItems);
-							tableViewer4.refresh();
-
-							// clear the selection
-							tableViewer4.setSelection(null, true);
-							ctrl_brief_desc.setText(""); //$NON-NLS-1$
-						}
-						ctrl_remove_4.setEnabled(false);
-					}
-				});
-			}
-		}
-	}
-
-	protected void addItems1(List list) {
-	};
-
-	protected void addItems2(List list) {
-	};
-
-	protected void addItems3(List list) {
-	};
-
-	protected void addItems4(List list) {
-	};
-
-	protected void addFromProcessItems1(List list) {
-	};
-
-	protected void addFromProcessItems2(List list) {
-	};
-
-	protected void addFromProcessItems3(List list) {
-	};
-
-	protected void addFromProcessItems4(List list) {
-	};
-
-	protected void removeItems1(List list) {
-	};
-
-	protected void removeItems2(List list) {
-	};
-
-	protected void removeItems3(List list) {
-	};
-
-	protected void removeItems4(List list) {
-	};
-
-	protected List getExistingElements1() {
-		return null;
-	};
-
-	protected List getExistingElements2() {
-		return null;
-	};
-
-	protected List getExistingElements3() {
-		return null;
-	};
-
-	protected List getExistingElements4() {
-		return null;
-	};
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/RemoveDescriptorCommand.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/RemoveDescriptorCommand.java
deleted file mode 100755
index 2b0856e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/RemoveDescriptorCommand.java
+++ /dev/null
@@ -1,252 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.epf.authoring.ui.actions.ProcessDeleteAction;
-import org.eclipse.epf.library.edit.command.IResourceAwareCommand;
-import org.eclipse.epf.library.edit.process.command.DeleteUnusedDescriptorsCommand;
-import org.eclipse.epf.library.edit.ui.ReferenceSelection;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Descriptor;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.epf.uma.util.UmaUtil;
-
-
-/**
- * Command to remove descriptors
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class RemoveDescriptorCommand extends AbstractCommand implements
-		IResourceAwareCommand {
-
-	private List elements;
-
-	private Descriptor desc;
-
-	private Collection modifiedResources;
-
-	private Command deleteUnusedDescriptorsCommand = null;
-
-	private int featureID;
-
-	private List references;
-
-	/**
-	 * Remove relationships
-	 */
-	public RemoveDescriptorCommand(Descriptor desc, List elements, int featureID) {
-
-		super();
-
-		this.elements = elements;
-		this.desc = desc;
-		this.featureID = featureID;
-
-		this.modifiedResources = new HashSet();
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.command.Command#execute()
-	 */
-	public void execute() {
-		
-		List notUsedReferences = new ArrayList();
-		for (int i = 0; i < elements.size(); i++) {
-			Descriptor o = (Descriptor) elements.get(i);
-
-			boolean checkRef;
-			if (o instanceof WorkProductDescriptor)
-			{
-				checkRef = ProcessUtil.checkWorkProductDescriptorReferences(Collections
-				.singleton(desc), (WorkProductDescriptor) o, true, featureID);
-			}
-			else
-				checkRef = ProcessUtil.checkDescriptorReferences(desc, o);
-			
-			if (!checkRef) {
-				Activity act = UmaUtil.getParentActivity(desc);
-				if (act.getBreakdownElements().contains(o))
-					notUsedReferences.add(o);
-			}
-		}
-		if (!(notUsedReferences.isEmpty())) {
-			Object[] refToBeDeleted = ReferenceSelection
-					.getReferences(notUsedReferences);
-			references = Arrays.asList(refToBeDeleted);
-		}
-		
-		redo();
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.command.Command#redo()
-	 */
-	public void redo() {
-
-		if (desc instanceof TaskDescriptor)
-		{
-			switch (featureID) {
-			case UmaPackage.TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY:
-				((TaskDescriptor) desc).setPerformedPrimarilyBy(null);
-				break;
-			case UmaPackage.TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY:
-				((TaskDescriptor) desc).getAdditionallyPerformedBy().removeAll(
-						elements);
-				break;
-			case UmaPackage.TASK_DESCRIPTOR__ASSISTED_BY:
-				((TaskDescriptor) desc).getAssistedBy().removeAll(elements);
-				break;
-			case UmaPackage.TASK_DESCRIPTOR__MANDATORY_INPUT:
-				((TaskDescriptor) desc).getMandatoryInput().removeAll(elements);
-				break;
-			case UmaPackage.TASK_DESCRIPTOR__EXTERNAL_INPUT:
-				((TaskDescriptor) desc).getExternalInput().removeAll(elements);
-				break;
-			case UmaPackage.TASK_DESCRIPTOR__OPTIONAL_INPUT:
-				((TaskDescriptor) desc).getOptionalInput().removeAll(elements);
-				break;
-			case UmaPackage.TASK_DESCRIPTOR__OUTPUT:
-				((TaskDescriptor) desc).getOutput().removeAll(elements);
-				break;
-			}
-		}
-		else if (desc instanceof RoleDescriptor)
-		{
-			switch (featureID){
-			case UmaPackage.ROLE_DESCRIPTOR__RESPONSIBLE_FOR:
-				((RoleDescriptor) desc).getResponsibleFor().removeAll(elements);
-				break;
-			}
-		}
-
-		if (references != null && !references.isEmpty()) {
-			if (deleteUnusedDescriptorsCommand == null) {
-				deleteUnusedDescriptorsCommand = new DeleteUnusedDescriptorsCommand(
-						references, false, Collections.EMPTY_LIST) {
-
-					protected Command delete(List elements) {
-						return ProcessDeleteAction.delete(elements);
-					}
-				};
-			}
-			deleteUnusedDescriptorsCommand.execute();
-		}
-
-		if (!elements.isEmpty()) {
-			
-			if (desc.eResource() != null) {
-				modifiedResources.add(desc.eResource());
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.command.AbstractCommand#undo()
-	 */
-	public void undo() {
-
-		// basically remove from configuration if anything was added
-
-		if (desc instanceof TaskDescriptor)
-		{
-			switch (featureID) {
-			case UmaPackage.TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY:
-				Object o = elements.get(0);
-				if (o instanceof RoleDescriptor)
-					((TaskDescriptor) desc).setPerformedPrimarilyBy((RoleDescriptor)o);
-				break;
-			case UmaPackage.TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY:
-				((TaskDescriptor) desc).getAdditionallyPerformedBy().addAll(
-						elements);
-				break;
-			case UmaPackage.TASK_DESCRIPTOR__ASSISTED_BY:
-				((TaskDescriptor) desc).getAssistedBy().addAll(elements);
-				break;
-			case UmaPackage.TASK_DESCRIPTOR__MANDATORY_INPUT:
-				((TaskDescriptor) desc).getMandatoryInput().addAll(elements);
-				break;
-			case UmaPackage.TASK_DESCRIPTOR__EXTERNAL_INPUT:
-				((TaskDescriptor) desc).getExternalInput().addAll(elements);
-				break;
-			case UmaPackage.TASK_DESCRIPTOR__OPTIONAL_INPUT:
-				((TaskDescriptor) desc).getOptionalInput().addAll(elements);
-				break;
-			case UmaPackage.TASK_DESCRIPTOR__OUTPUT:
-				((TaskDescriptor) desc).getOutput().addAll(elements);
-				break;
-			}
-		}
-		else if (desc instanceof RoleDescriptor)
-		{
-			switch (featureID) {
-			case UmaPackage.ROLE_DESCRIPTOR__RESPONSIBLE_FOR:
-				((RoleDescriptor) desc).getResponsibleFor().addAll(elements);
-				break;
-			}
-		}
-
-		if (references != null && !references.isEmpty()) {
-			try {
-				if (deleteUnusedDescriptorsCommand != null)
-					deleteUnusedDescriptorsCommand.undo();
-			} catch (RuntimeException exception) {
-			
-			}
-		}
-		
-	}
-	
-	/**
-	 * @see org.eclipse.emf.common.command.AbstractCommand#dispose()
-	 */
-	public void dispose()
-	{
-		if (deleteUnusedDescriptorsCommand != null)
-			deleteUnusedDescriptorsCommand.dispose();
-		if(references != null) {
-			references.clear();
-		}
-		if(modifiedResources != null) {
-			modifiedResources.clear();
-		}
-		
-		super.dispose();
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.command.AbstractCommand#prepare()
-	 */
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.edit.command.IResourceAwareCommand#getModifiedResources()
-	 */
-	public Collection getModifiedResources() {
-		return modifiedResources;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/Resources.properties b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/Resources.properties
deleted file mode 100755
index 387f666..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/Resources.properties
+++ /dev/null
@@ -1,210 +0,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.
-#------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-Process_generalInformationTitle=General Information
-Process_DocumentInformationTitle=Documentation Information
-Activity_guidanceInformationTitle=Guidance
-BreakdownElement_optionInformationTitle=Breakdown Options
-TaskDescriptor_stepInformationTitle=Steps
-
-TaskDescriptor_stepInformationDescription=Specify the steps to perform this task descriptor.
-
-Process_generalInformationDescription=Provide general information about this {0}.
-Process_documentInformationDescription=Provide documentation information about this {0}.
-
-Descriptor_generalInformationDescription=Provide general information about this descriptor.
-Descriptor_detailInformationDescription=Provide detailed information about this descriptor.
-Milestone_generalInformationDescription=Provide general information about this milestone.
-Milestone_detailInformationDescription=Provide detailed information about this milestone.
-
-BreakdownElement_generalInformationDescription=Provide general information about this breakdown element.
-WorkBreakdownElement_generalInformationDescription=Provide general information about this work breakdown element.
-Descriptor_generalInformationDescripton=Provide general information about this descriptor.
-Activity_generalInformationDescription=Provide general information about this activity.
-
-BreakdownElement_DocumentInformationDescription=Provide documentation information about this breakdown element.
-Activity_DocumentInformationDescription=Provide documentation information about this activity.
-Descriptor_documentInformationDescription=Provide documentation information about this descriptor.
-Process_None=<< NONE >>
-Process_name=Name:
-Process_PresentationName=Presentation name:
-Process_briefDescription=Brief description:
-Process_mainDescription= Main description:
-Process_purpose=Purpose:
-Process_prefix=Prefix:
-
-BreakdownElement_Type_Name=Breakdown Element
-
-Process_Type_Task=Method task:
-Process_Type_Role=Method role:
-Process_Type_WorkProduct=Method work product:
-
-WorkProduct_Type=Work Product Type:
-
-Activity_ModelInfo=Model information:
-Activity_Type=Activity Type:
-Activity_presentationName=Presentation name:
-Activity_alternatives=Alternatives:
-Activity_howToStaff=How to staff:
-BreakdownElement_keyConsiderations=Key considerations:
-Process_usageGuidance=Usage guidance:
-
-Activity_RoadmapTitle=Roadmaps
-Activity_RoadmapDescription=Provide links to additional information in the form of roadmaps.
-Activity_GeneralGuidanceTitle=General Guidance
-Activity_GeneralGuidanceDescription=Provide links to additional information in the form of guidance.
-Activity_CommunicationMaterialTitle=Communication Materials
-Activity_CommunicationMaterialDescription=Provide links to additional information in the form of communication materials.
-Activity_EducationMaterialTitle=Education Materials
-Activity_EducationMaterialDescription=Provide links to additional information in the form of education materials.
-
-Activity_Selected_Roadmap=Roadmaps:
-Activity_Selected_GeneralGuidance=Guidance:
-Activity_Selected_CommunicationMaterial=Communication Materials:
-Activity_Selected_EducationMaterial=Education Materials:
-
-Activity_DiagramTitle=Diagram
-Activity_DiagramDescription = Provide diagram images for this {0}.
-Activity_ADImage=Activity Diagram
-Activity_ADDImage=Activity Detail Diagram
-Activity_WPDImage=Work Product Dependency Diagram
-Activity_UseADImage=Use Activity Diagram for publishing
-Activity_UseADDImage=Use Activity Detail Diagram for publishing
-Activity_UseWPDImage=Use Work Product Dependency Diagram for publishing
-Activity_Assign=Assign...
-
-TaskDescriptor_Selected_Steps=Steps:
-TaskDescriptor_StepDialogTitle=Steps
-TaskDescriptor_StepDialogMessage=Select steps
-
-Activity_WorkRollup=Work Rollup
-Activity_TeamRollup=Team Rollup
-Activity_WorkProductsRollup=Work Products Rollup
-Activity_WorkRollupDescription=Review the work roll-up for this activity in this section.
-Activity_TeamRollupDescription=Review the team roll-up for this activity in this section.
-Activity_WorkProductsRollupDescription=Review the work product roll-up for this activity in this section.
-BreakdownElement_Option_MultipleOcurrance=Multiple Occurrences
-BreakdownElement_Option_Optional=Optional
-BreakdownElement_Option_Planned=Planned
-BreakdownElement_Option_Supressed=Suppressed
-
-WorkBreakdownElement_EventDriven=Event Driven
-WorkBreakdownElement_Ongoing=Ongoing
-WorkBreakdownElement_Repeatable=Repeatable
-WorkBreakdownElement_Predecessors=Predecessors:
-WorkBreakdownElement_Dependency=Dependency:
-WorkBreakdownElement_Dependency_COL_ID_TEXT=Index
-WorkBreakdownElement_Dependency_COL_PRESENTATION_NAME_TEXT=Presentation Name
-WorkBreakdownElement_Dependency_COL_DEPENDENCY_TEXT=Dependency
-WorkBreakdownElement_Dependency_Add=Add
-WorkBreakdownElement_Dependency_Edit=Edit
-WorkBreakdownElement_Dependency_Remove=Remove
-
-WorkOrderType_FINISH_TO_START=Finish To Start
-WorkOrderType_FINISH_TO_FINISH=Finish To Finish
-WorkOrderType_START_TO_FINISH=Start To Finish
-WorkOrderType_START_TO_START=Start To Start
-
-BreakdownElement_Option_Synchronized=Synchronized with source
-
-Descriptor_RefinedDescription=Refined description:
-
-TaskDescriptor_Roles_SectionTitle=Roles
-TaskDescriptor_Roles_SectionDescription=Assign the role descriptors to perform this task descriptor.
-TaskDescriptor_Roles_Table1=Primary Performer:
-TaskDescriptor_Roles_Table2=Additional Performers:
-TaskDescriptor_Roles_Table3=Assisted By:
-
-TaskDescriptor_WorkProducts_SectionTitle=Work Products
-TaskDescriptor_WorkProducts_SectionDescription=Specify the input and output work product descriptors for this task descriptor.
-TaskDescriptor_WorkProducts_Table1=Mandatory Input:
-TaskDescriptor_WorkProducts_Table2=Optional Input:
-TaskDescriptor_WorkProducts_Table3=External Input:
-TaskDescriptor_WorkProducts_Table4=Output:
-
-RoleDescriptor_Tasks_SectionTitle=Tasks
-RoleDescriptor_Tasks_SectionDescription=This role descriptor is performer of following task descriptors.
-RoleDescriptor_Tasks_Table1=Primary Performer:
-RoleDescriptor_Tasks_Table2=Additional Performers:
-RoleDescriptor_Tasks_Table3=Assisted By:
-
-RoleDescriptor_WorkProducts_SectionTitle=Work Products
-RoleDescriptor_WorkProducts_SectionDescription=This role descriptor is responsible for and modifies following work product descriptors.
-RoleDescriptor_WorkProducts_Table1=Responsible for:
-RoleDescriptor_WorkProducts_Table2=Modifies:
-
-WorkProductDescriptor_Roles_SectionTitle=Roles
-WorkProductDescriptor_Roles_SectionDescription=The following role descriptors are responsible for and modifies this work product descriptor.
-WorkProductDescriptor_Roles_Table1=Responsible for:
-WorkProductDescriptor_Roles_Table2=Modified by:
-WorkProductDescriptor_Type=Type:
-WorkProductDescriptor_ActivityEntryState=Activity Entry State:
-WorkProductDescriptor_ActivityExitState=Activity Exit State:
-
-WPDescriptor_DeliverablePart_SectionTitle=Deliverable Parts
-WPDescriptor_DeliverablePart_SectionDescription=The deliverable has following deliverable parts.
-WPDescriptor_DeliverablePart_Table1=Deliverable Parts
-
-RoleDescriptor_Team_SectionTitle=Teams
-RoleDescriptor_Team_SectionDescription=This role descriptor refers to following teams.
-RoleDescriptor_Team_Table1=Teams:
-
-CompositeRole_Role_SectionTitle=Roles
-CompositeRole_Role_SectionDescription=This composite role has following aggregated roles.
-CompositeRole_Role_Table1=Aggregated Roles:
-
-TeamProfile_Role_SectionTitle=Roles
-TeamProfile_Role_SectionDescription=Add or remove roles to/from the team profile.
-TeamProfile_Role_Table1=Roles:
-
-Process_RichText_CollapseImage=collapsed.gif
-Process_RichText_ExpandImage=expanded.gif
-Process_Add=Add...
-Process_AddFromProcess=Add from Process...
-Process_Rename_Message=You are about to change the name of this process. This will save this editor and rename the process folder to the new name. Do you want to continue?
-Process_Remove=Remove
-Process_Up=Up
-Process_Down=Down
-Process_MultipleSelection=Multiple Selection
-Process_Button_LinkMethodElement=Link Method Element...
-
-## Error/Warning
-Process_InvalidNameTitle=Invalid name
-Process_InvalidName=IUPA0081E: The name cannot be empty. Please specify a valid name.
-Process_Rename_Title=Rename
-Process_InvalidPresentationName=IUPA0082E: The presentation name cannot be empty. Please specify a valid presentation name.
-Process_LinkMethodElementTitle=Link Method Element
-Process_InvalidLinkMethodElement=IUPA0083E: Cannot link to ''{0}'' since this MethodElement is already being used for another descriptor under the same parent.
-Process_AssignmentInfoTitle=Information
-Process_TeamAssignError=IUPA0084E: Cannot add ''{0}'' to the team ''{1}'' \n\nRole descriptor(s) must have method element role associated with it to be assigned to team.\n\n Fix the assocation first and try again.
-Process_TeamDialogMessage=Select teams
-Process_TeamDialogTitle=Teams
-
-Process_DeliverableAssignError=IUPA0085E: Cannot add ''{0}'' to the deliverable ''{1}'' since it does not have method element workproduct associated with it.
-Process_CompositeRoleAssignError=IUPA0086E: Cannot add  ''{0}'' to the Composite role ''{1}'' since it does not have method element role associated with it.
-Process_predecessors_validNumberMessage=IUPA0087W: Please enter valid number for predecessors.
-Process_predecessors_validNumberTitle=Invalid Predecessor Id
-
-Process_NoItems=No items selected
-Process_ItemsSelected={0} items selected
-Process_NoPropertiesAvailable=No Properties available
-
-PredecessorDialog_Title=Predecessor Dependency
-PredecessorDialog_HeaderMessage=Enter dependency type for predecessor:
-PredecessorDialog_Index=Index:
-PredecessorDialog_PresentationName=Presentation Name:
-PredecessorDialog_Dependency=Dependency:
-PredecessorDialog_PredecessorErrorDialogTitle=Predecessor
-PredecessorDialog_PredecessorErrorMessage=IUPA0088E: Predecessor with that Id already exists for this work breakdown element.
-
-ProcessEditorFormProperties_textEditCell_problem_msg=IUPA0090E: There was an error editing a property.
-ProcessEditorFormProperties_cellEditor_invalidPredcessor_problem_msg=IUPA0089W: Invalid predecessor list
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/RoleDescriptorGeneralSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/RoleDescriptorGeneralSection.java
deleted file mode 100755
index 1b022db..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/RoleDescriptorGeneralSection.java
+++ /dev/null
@@ -1,241 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.dialogs.ItemsFilterDialog;
-import org.eclipse.epf.authoring.ui.filters.ProcessRoleFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.process.command.LinkMethodElementCommand;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.uma.CompositeRole;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * The general tab section for Role Descriptor
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class RoleDescriptorGeneralSection extends DescriptorGeneralSection {
-	protected RoleDescriptor element;
-
-	private Label ctrl_method_element_label;
-
-	private Text ctrl_method_element;
-
-	private Button linkButton;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.properties.DescriptorGeneralSection#init()
-	 */
-	protected void init() {
-		super.init();
-		// get RoleDescriptor object
-		element = (RoleDescriptor) getElement();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.properties.DescriptorGeneralSection#createGeneralSection(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createGeneralSection(Composite composite) {
-		super.createGeneralSection(composite);
-
-		// method element
-		ctrl_method_element_label = FormUI.createLabel(toolkit,
-				generalComposite, PropertiesResources.Process_Type_Role); //$NON-NLS-1$
-
-		ctrl_method_element = FormUI.createText(toolkit, generalComposite,
-				SWT.DEFAULT, 1);
-		ctrl_method_element.setText(getMethodElementName(element));
-		ctrl_method_element.setEnabled(false);
-
-		linkButton = FormUI
-				.createButton(toolkit, generalComposite, SWT.PUSH, 1);
-		linkButton.setText(PropertiesResources.Process_Button_LinkMethodElement); //$NON-NLS-1$
-
-		// show/hide method role
-		toggleMethodRole();
-	}
-
-	private void toggleMethodRole() {
-		if (element instanceof CompositeRole) {
-			ctrl_method_element_label.setVisible(false);
-			ctrl_method_element.setVisible(false);
-			linkButton.setVisible(false);
-		} else {
-			ctrl_method_element_label.setVisible(true);
-			ctrl_method_element.setVisible(true);
-			linkButton.setVisible(true);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.properties.DescriptorGeneralSection#addListeners()
-	 */
-	protected void addListeners() {
-		super.addListeners();
-
-		linkButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IFilter filter = new ProcessRoleFilter(
-						getConfiguration(), null, FilterConstants.ROLES);
-				List existingElements = new ArrayList();
-				if (element.getRole() != null) {
-					existingElements.add(element.getRole());
-				}
-				ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-						.getWorkbench().getActiveWorkbenchWindow().getShell(),
-						filter, element, FilterConstants.ROLES,
-						existingElements);
-
-				fd.setBlockOnOpen(true);
-				fd.setViewerSelectionSingle(true);
-				fd.setTitle(FilterConstants.ROLES);
-				fd.open();
-				setMethodElement(fd.getSelectedItems());
-
-				// update method element control
-				ctrl_method_element.setText(getMethodElementName(element));
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e1) {
-			}
-		});
-	}
-
-	private void setMethodElement(List items) {
-		if ((items != null) && (items.size() >= 1)) {
-			if (items.get(0) instanceof Role) {
-				Role role = (Role) items.get(0);
-
-				List list = ProcessUtil
-						.getSiblings(TngAdapterFactory.INSTANCE
-								.getOBS_ComposedAdapterFactory(), getAdapter(),
-								element);
-				boolean canAssign = true;
-				for (Iterator itor = list.iterator(); itor.hasNext();) {
-					Object obj = itor.next();
-					if (obj instanceof RoleDescriptor) {
-						RoleDescriptor roleDesc = (RoleDescriptor) obj;
-						if ((!roleDesc.equals(element))
-								&& (!roleDesc.getSuppressed().booleanValue())) {
-							Role exisingRole = roleDesc.getRole();
-							if (role.equals(exisingRole)) {
-								canAssign = false;
-								break;
-							}
-						}
-					}
-				}
-				if (canAssign) {
-					LinkMethodElementCommand cmd = new LinkMethodElementCommand(
-							element, role, UmaPackage.ROLE_DESCRIPTOR__ROLE);
-					actionMgr.execute(cmd);
-
-					// set selection to same element to enable correct actions
-					getEditor().setSelection(getSelection());
-				} else {
-					MessageFormat mf = new MessageFormat(PropertiesResources.Process_InvalidLinkMethodElement); //$NON-NLS-1$
-					Object[] args = { role.getName() };
-					AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayInfo(
-									PropertiesResources.Process_LinkMethodElementTitle, mf.format(args)); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	private String getMethodElementName(RoleDescriptor element) {
-		String str = PropertiesResources.Process_None; 
-		if (element.getRole() != null) {
-			str = element.getRole().getName();
-		}
-
-		return str;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.properties.DescriptorGeneralSection#updateControls()
-	 */
-	protected void updateControls() {
-		super.updateControls();
-
-		linkButton.setEnabled(editable);
-		Object obj = getElement();
-		if (obj instanceof RoleDescriptor) {
-			RoleDescriptor roleDesc = (RoleDescriptor) obj;
-			if ((roleDesc.getSuperActivities() == null)
-					|| (roleDesc.getSuperActivities() == null)) {
-				nameText.setEditable(true);
-				presentationNameText.setEditable(true);
-			} else {
-				nameText.setEditable(editable);
-				presentationNameText.setEditable(editable);
-			}
-		}
-
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.properties.DescriptorGeneralSection#refresh()
-	 */
-	public void refresh() {
-		try {
-			super.refresh();
-
-			if (getElement() instanceof RoleDescriptor) {
-				element = (RoleDescriptor) getElement();
-				ctrl_method_element.setText(getMethodElementName(element));
-
-				// show/hide method role
-				toggleMethodRole();
-
-			}
-		} catch (Exception ex) {
-			logger.logError(
-					"Error refreshing RoleDescriptor general section: ", ex); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.properties.DescriptorGeneralSection#getNamePrefix()
-	 */
-	public String getNamePrefix() {
-		if (getElement() instanceof CompositeRole) {
-			return LibraryUIText.TEXT_COMPOSITE_ROLE + ": "; //$NON-NLS-1$
-		}
-		return LibraryUIText.TEXT_ROLE_DESCRIPTOR + ": "; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/RoleDescriptorTeamSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/RoleDescriptorTeamSection.java
deleted file mode 100755
index 693ef64..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/RoleDescriptorTeamSection.java
+++ /dev/null
@@ -1,310 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.process.RoleDescriptorWrapperItemProvider;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.CompositeRole;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.TeamProfile;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-
-/**
- * The Role descriptor - team profile section
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class RoleDescriptorTeamSection extends OBSRelationSection {
-	private Image titleImage = null;
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-		super.createControls(parent, tabbedPropertySheetPage);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#initContentProvider()
-	 */
-	protected void initContentProvider() {
-		contentProvider = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return getSelectedTeams(element).toArray();
-			}
-		};
-
-		viewer.setContentProvider(contentProvider);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#init()
-	 */
-	protected void init() {
-		super.init();
-		element = (RoleDescriptor) element;
-
-		
-		setTabData(PropertiesResources.RoleDescriptor_Team_SectionTitle, 
-				PropertiesResources.RoleDescriptor_Team_SectionDescription,
-				PropertiesResources.RoleDescriptor_Team_Table1); 
-	}
-
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#refresh()
-	 */
-	public void refresh() {
-		try {
-			if (getElement() instanceof RoleDescriptor) {
-				super.refresh();
-
-				element = (RoleDescriptor) getElement();
-				viewer.refresh();
-			}
-		} catch (Exception ex) {
-			logger.logError(
-					"Error refreshing Role Descriptor team section ", ex); //$NON-NLS-1$
-		}
-	}
-
-	private void add(Object[] items) {
-		// update the model
-		if (items != null) {
-			for (int i = 0; i < items.length; i++) {
-				TeamProfile team = (TeamProfile) items[i];
-				if (element instanceof CompositeRole) {
-					CompositeRole compRole = ProcessUtil
-							.createCompositeRole((CompositeRole) element);
-					actionMgr.doAction(IActionManager.ADD, team,
-							UmaPackage.eINSTANCE.getTeamProfile_TeamRoles(),
-							compRole, -1);
-				} else if (element instanceof RoleDescriptor) {
-					Role role = ((RoleDescriptor) element).getRole();
-					if (role != null) {
-						if (!isPartOfTeam(role, team)) {
-							RoleDescriptor roleDesc = ProcessUtil
-									.createRoleDescriptor(role);
-							actionMgr.doAction(IActionManager.ADD, team,
-									UmaPackage.eINSTANCE
-											.getTeamProfile_TeamRoles(),
-									roleDesc, -1);
-						}
-					} else {
-						MessageFormat mf = new MessageFormat(
-								PropertiesResources.Process_TeamAssignError); //$NON-NLS-1$
-						Object[] args = { element.getName(), team.getName() };
-						String message = mf.format(args);
-						String title = getEditor().getTitle();
-						MsgDialog dialog = AuthoringUIPlugin.getDefault()
-								.getMsgDialog();
-						dialog.displayError(title, message, ""); //$NON-NLS-1$
-						return;
-					}
-				}
-				actionMgr.doAction(IActionManager.ADD, team,
-						UmaPackage.eINSTANCE.getTeamProfile_TeamRoles(),
-						element, -1);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#remove(java.util.ArrayList)
-	 */
-	protected void remove(ArrayList rmItems) {
-		// update the model
-		if (!rmItems.isEmpty()) {
-			for (Iterator itor = rmItems.iterator(); itor.hasNext();) {
-				TeamProfile team = (TeamProfile) itor.next();
-				Role role = ((RoleDescriptor) element).getRole();
-				actionMgr.doAction(IActionManager.REMOVE, team,
-						UmaPackage.eINSTANCE.getTeamProfile_TeamRoles(),
-						element, -1);
-
-				// Get the list of roleDescriptors from team profile which
-				// has same role original role descriptor
-				List teamRoles = team.getTeamRoles();
-				List roleDescList = new ArrayList();
-				for (int i = 0; i < teamRoles.size(); i++) {
-					RoleDescriptor roleDesc = (RoleDescriptor) teamRoles.get(i);
-
-					if (roleDesc.getRole().equals(role))
-					{
-						roleDescList.add(roleDesc);
-					}
-				}
-
-				// if roleDescripor just has one element, delete that one too.
-				// since that would be the last one
-				if (roleDescList.size() == 1) {
-					actionMgr.doAction(IActionManager.REMOVE, team,
-							UmaPackage.eINSTANCE.getTeamProfile_TeamRoles(),
-							(RoleDescriptor) roleDescList.get(0), -1);
-				}
-			}
-		}
-	}
-	
-	
-	private boolean isPartOfTeam(Role role, TeamProfile team) {
-		List teamRoles = team.getTeamRoles();
-		List roles = new ArrayList();
-		for (Iterator itor = teamRoles.iterator(); itor.hasNext();) {
-			RoleDescriptor roleDesc = (RoleDescriptor) itor.next();
-			roles.add(roleDesc.getRole());
-		}
-
-		if (roles.contains(role))
-			return true;
-
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#openAddDialog()
-	 */
-	protected void openAddDialog() {
-		IStructuredContentProvider teamContentProvider = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				List items = getTeams();
-				items.removeAll(getSelectedTeams(element));
-				return items.toArray();
-			}
-		};
-
-		ILabelProvider teamLabelProvider = new AdapterFactoryLabelProvider(
-				TngAdapterFactory.INSTANCE.getOBS_ComposedAdapterFactory());
-
-		ListSelectionDialog dlg = new ListSelectionDialog(PlatformUI
-				.getWorkbench().getActiveWorkbenchWindow().getShell(), element,
-				teamContentProvider, teamLabelProvider, PropertiesResources.Process_TeamDialogMessage); //$NON-NLS-1$
-		titleImage = Display.getCurrent().getActiveShell().getImage();
-		ListSelectionDialog.setDefaultImage(titleImage);
-
-		dlg.setTitle(PropertiesResources.Process_TeamDialogTitle); 
-		dlg.setBlockOnOpen(true);
-		dlg.open();
-		add(dlg.getResult());
-	}
-
-	public void dispose() {
-		super.dispose();
-
-		if (contentProvider != null) {
-			contentProvider.dispose();
-		}
-	}
-
-	/**
-	 * Get parent
-	 * 
-	 * @param element
-	 * @return
-	 * 		Parent of the element
-	 */
-	protected Object getParent(BreakdownElement element) {
-		AdapterFactory aFactory = TngAdapterFactory.INSTANCE
-				.getOBS_ComposedAdapterFactory();
-		ItemProviderAdapter adapter = (ItemProviderAdapter) aFactory.adapt(
-				element, ITreeItemContentProvider.class);
-		Object parent = adapter.getParent(element);
-
-		return parent;
-	}
-
-	/**
-	 * Get Teams from parent
-	 * 
-	 * @return
-	 * 			List of teams
-	 */
-	private List getTeams() {
-		ArrayList items = new ArrayList();
-		Object parent = getParent(element);
-		while (parent != null) {
-			if (parent instanceof Activity) {
-				Activity act = (Activity) parent;
-				List breakdownElements = act.getBreakdownElements();
-				for (Iterator it = breakdownElements.iterator(); it.hasNext();) {
-					BreakdownElement element = (BreakdownElement) it.next();
-					if (element instanceof TeamProfile) {
-						TeamProfile team = (TeamProfile) element;
-						items.add(team);
-						// add any sub teams if there
-						List subTeams = team.getSubTeam();
-						items.addAll(subTeams);
-
-					}
-				}
-			}
-
-			parent = getParent((BreakdownElement) parent);
-		}
-
-		return items;
-	}
-
-	/**
-	 * Get selected teams for that role descriptor
-	 * 
-	 * @param object
-	 * @return
-	 * 		List of selected team 
-	 */
-	private List getSelectedTeams(EObject object) {
-		Object input = getInput();
-		
-		if (input instanceof RoleDescriptorWrapperItemProvider) {
-			return ProcessUtil
-					.getTeamProfiles((RoleDescriptorWrapperItemProvider) input);
-		} else {
-			RoleDescriptor roleDesc = (RoleDescriptor) object;
-			return ProcessUtil.getTeamProfiles(roleDesc, getAdapterFactory());
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/RoleDescriptorWorkProductSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/RoleDescriptorWorkProductSection.java
deleted file mode 100755
index 415fea5..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/RoleDescriptorWorkProductSection.java
+++ /dev/null
@@ -1,244 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.filters.DescriptorProcessFilter;
-import org.eclipse.epf.authoring.ui.filters.ProcessWorkProductFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.process.command.AssignWPToRoleDescriptor;
-import org.eclipse.epf.library.edit.process.command.IActionTypeConstants;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-
-/**
- * Role Descriptor - work product section
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class RoleDescriptorWorkProductSection extends RelationSection {
-	private IFilter filter = null;
-
-	/**
-	 * Get process work product filter
-	 */
-	public IFilter getFilter() {
-		if (filter == null) {
-			filter = new ProcessWorkProductFilter(getConfiguration(),
-					null, FilterConstants.WORKPRODUCTS);
-		}
-		return filter;
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-
-		super.createControls(parent, tabbedPropertySheetPage);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#initContentProvider1()
-	 */
-	protected void initContentProvider1() {
-		contentProvider = new AdapterFactoryContentProvider(getAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return getFilteredList(
-						((RoleDescriptor) element).getResponsibleFor())
-						.toArray();
-			}
-		};
-		tableViewer1.setContentProvider(contentProvider);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#initContentProvider2()
-	 */
-	protected void initContentProvider2() {
-		contentProvider = new AdapterFactoryContentProvider(getAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return getFilteredList(((RoleDescriptor) element).getModifies())
-						.toArray();
-			}
-		};
-		tableViewer2.setContentProvider(contentProvider);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#init()
-	 */
-	protected void init() {
-		super.init();
-
-		labelProvider = new AdapterFactoryLabelProvider(
-				TngAdapterFactory.INSTANCE.getWBS_ComposedAdapterFactory());
-
-		int numOfTables = 2;
-		
-		setTabData(PropertiesResources.RoleDescriptor_WorkProducts_SectionTitle,
-				PropertiesResources.RoleDescriptor_WorkProducts_SectionDescription,
-				PropertiesResources.RoleDescriptor_WorkProducts_Table1,
-				PropertiesResources.RoleDescriptor_WorkProducts_Table2,
-				null,
-				null,
-				FilterConstants.WORKPRODUCTS); 
-
-		boolean[] changesAllowed = { true, false };
-		setTableData(numOfTables, changesAllowed);
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#refresh()
-	 */
-	public void refresh() {
-		if (getElement() instanceof RoleDescriptor) {
-			element = (RoleDescriptor) getElement();
-		}
-		super.refresh();
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getDescriptorsFromProcess()
-	 */
-	protected List getDescriptorsFromProcess() {
-		List items = new ArrayList();
-		return ProcessUtil.getElementsInScope(getAdapterFactory(), element,
-				WorkProductDescriptor.class, items);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addItems1(java.util.List)
-	 */
-	protected void addItems1(List items) {
-		if (!items.isEmpty()) {
-			AssignWPToRoleDescriptor cmd = new AssignWPToRoleDescriptor(
-					(RoleDescriptor) element, items,
-					IActionTypeConstants.ADD_RESPONSIBLE_FOR, getConfiguration());
-			actionMgr.execute(cmd);
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#removeItems1(java.util.List)
-	 */
-	protected void removeItems1(List items) {
-		if (!items.isEmpty()) {
-			RemoveDescriptorCommand cmd = new RemoveDescriptorCommand(element,
-					items, UmaPackage.ROLE_DESCRIPTOR__RESPONSIBLE_FOR);
-			actionMgr.execute(cmd);
-		}
-	};
-
-	private List getWorkProducts(List items) {
-		List wpList = new ArrayList();
-		if (!items.isEmpty()) {
-			for (int i = 0; i < items.size(); i++) {
-				wpList.add(((WorkProductDescriptor) items.get(i))
-						.getWorkProduct());
-			}
-		}
-
-		return wpList;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getExistingElements1()
-	 */
-	protected List getExistingElements1() {
-		return getWorkProducts(((RoleDescriptor) element).getResponsibleFor());
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getProcess()
-	 */
-	protected Process getProcess() {
-		AdapterFactory aFactory = TngAdapterFactory.INSTANCE
-				.getOBS_ComposedAdapterFactory();
-		ItemProviderAdapter adapter = (ItemProviderAdapter) aFactory.adapt(
-				element, ITreeItemContentProvider.class);
-		Object obj = ProcessUtil.getRootProcess(aFactory, adapter, element);
-		return (Process) obj;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getFilterForDescriptors()
-	 */
-	protected IFilter getFilterForDescriptors() {
-		return new DescriptorProcessFilter(getConfiguration()) {
-			protected boolean childAccept(Object obj) {
-				if (obj instanceof Activity) {
-					List list = new ArrayList();
-					getActivitiesInScope(TngAdapterFactory.INSTANCE
-							.getOBS_ComposedAdapterFactory(), element, list);
-					if (list.contains(obj))
-						return true;
-					else
-						return false;
-				}
-				// Uncomment to show extended activity's workproducts
-				// if(obj instanceof WorkProductDescriptorWrapperItemProvider){
-				// Object object =
-				// ((BreakdownElementWrapperItemProvider)obj).getParent(obj);
-				// List list = new ArrayList();
-				// getActivitiesInScope(
-				// TngAdapterFactory.INSTANCE.getOBS_ComposedAdapterFactory(),
-				// element, list);
-				// if(list.contains(object)) return true;
-				// }
-				if (obj instanceof WorkProductDescriptor)
-					return true;
-				return false;
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getDescriptorTabName()
-	 */
-	protected String getDescriptorTabName() {
-		return FilterConstants.WORK_PRODUCT_DESCRIPTORS;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addFromProcessItems1(java.util.List)
-	 */
-	protected void addFromProcessItems1(List items) {
-		if (!items.isEmpty()) {
-			actionMgr.doAction(IActionManager.ADD_MANY, element,
-					UmaPackage.eINSTANCE.getRoleDescriptor_ResponsibleFor(),
-					items, -1);
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/TaskDescriptorGeneralSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/TaskDescriptorGeneralSection.java
deleted file mode 100755
index efcc333..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/TaskDescriptorGeneralSection.java
+++ /dev/null
@@ -1,233 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.dialogs.ItemsFilterDialog;
-import org.eclipse.epf.authoring.ui.filters.ProcessTaskFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.process.command.LinkMethodElementCommand;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * The general tab section for Task Descriptor
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class TaskDescriptorGeneralSection extends
-		WorkBreakdownElementGeneralSection {
-	protected TaskDescriptor element;
-
-	private Button synchronizedButton;
-
-	private Text ctrl_method_element;
-
-	private Button linkButton;
-
-	// private SelectionListener synchronizedButtonSelectionListener;
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.WorkBreakdownElementGeneralSection#init()
-	 */
-	protected void init() {
-		super.init();
-		// get TaskDescriptor object
-		element = (TaskDescriptor) getElement();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.WorkBreakdownElementGeneralSection#createGeneralSection(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createGeneralSection(Composite composite) {
-		super.createGeneralSection(composite);
-
-		// create composite for checkbox
-		checkBoxComposite = FormUI.createComposite(toolkit, generalComposite,
-				GridData.FILL_HORIZONTAL, numOfColumns, true);
-
-		// synchronized with source
-		synchronizedButton = FormUI.createCheckButton(toolkit, checkBoxComposite,
-				1);
-		synchronizedButton.setText(PropertiesResources.BreakdownElement_Option_Synchronized); //$NON-NLS-1$
-
-		// method element
-		FormUI.createLabel(toolkit, generalComposite, PropertiesResources.Process_Type_Task); //$NON-NLS-1$
-		ctrl_method_element = FormUI.createText(toolkit, generalComposite,
-				SWT.DEFAULT, 1);
-
-		ctrl_method_element.setText(getMethodElementName(element));
-		ctrl_method_element.setEnabled(false);
-
-		linkButton = FormUI
-				.createButton(toolkit, generalComposite, SWT.PUSH, 1);
-		linkButton.setText(PropertiesResources.Process_Button_LinkMethodElement); //$NON-NLS-1$
-
-	}
-
-	private void setMethodElement(List items) {
-		if ((items != null) && (items.size() >= 1)) {
-			if (items.get(0) instanceof Task) {
-				Task task = (Task) items.get(0);
-
-				List list = ProcessUtil
-						.getSiblings(TngAdapterFactory.INSTANCE
-								.getWBS_ComposedAdapterFactory(), getAdapter(),
-								element);
-				boolean canAssign = true;
-				for (Iterator itor = list.iterator(); itor.hasNext();) {
-					Object obj = itor.next();
-					if (obj instanceof TaskDescriptor) {
-						TaskDescriptor taskDesc = (TaskDescriptor) obj;
-						if ((!taskDesc.equals(element))
-								&& (!taskDesc.getSuppressed().booleanValue())) {
-							Task exisingTask = taskDesc.getTask();
-							if (task.equals(exisingTask)) {
-								canAssign = false;
-								break;
-							}
-						}
-					}
-				}
-				if (canAssign) {
-					LinkMethodElementCommand cmd = new LinkMethodElementCommand(
-							element, task, UmaPackage.TASK_DESCRIPTOR__TASK);
-					actionMgr.execute(cmd);
-
-					// set selection to same element to enable correct actions
-					getEditor().setSelection(getSelection());
-				} else {
-					MessageFormat mf = new MessageFormat(PropertiesResources.Process_InvalidLinkMethodElement); //$NON-NLS-1$
-					Object[] args = { task.getName() };
-					AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayInfo(
-									PropertiesResources.Process_LinkMethodElementTitle, mf.format(args)); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	private String getMethodElementName(TaskDescriptor element) {
-		String str = PropertiesResources.Process_None; 
-		if (element.getTask() != null) {
-			str = element.getTask().getName();
-		}
-
-		return str;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.WorkBreakdownElementGeneralSection#addListeners()
-	 */
-	protected void addListeners() {
-		super.addListeners();
-
-		synchronizedButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				actionMgr.doAction(IActionManager.SET, element,
-						UmaPackage.eINSTANCE
-								.getDescriptor_IsSynchronizedWithSource(),
-						Boolean.valueOf(synchronizedButton.getSelection()), -1);
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		linkButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IFilter filter = new ProcessTaskFilter(
-						getConfiguration(), null, FilterConstants.TASKS);
-				List existingElements = new ArrayList();
-				if (element.getTask() != null) {
-					existingElements.add(element.getTask());
-				}
-				ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-						.getWorkbench().getActiveWorkbenchWindow().getShell(),
-						filter, element, FilterConstants.TASKS,
-						existingElements);
-
-				fd.setBlockOnOpen(true);
-				fd.setViewerSelectionSingle(true);
-				fd.setTitle(FilterConstants.TASKS);
-				fd.open();
-				setMethodElement(fd.getSelectedItems());
-
-				// update method element control
-				ctrl_method_element.setText(getMethodElementName(element));
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e1) {
-			}
-		});
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.WorkBreakdownElementGeneralSection#updateControls()
-	 */
-	protected void updateControls() {
-		super.updateControls();
-		synchronizedButton.setEnabled(editable);
-		linkButton.setEnabled(editable);
-	}
-
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.WorkBreakdownElementGeneralSection#refresh()
-	 */
-	public void refresh() {
-		try {
-			if (getElement() instanceof TaskDescriptor) {
-				super.refresh();
-
-				element = (TaskDescriptor) getElement();
-				synchronizedButton.setSelection(element
-						.getIsSynchronizedWithSource().booleanValue());
-				ctrl_method_element.setText(getMethodElementName(element));
-			}
-		} catch (Exception ex) {
-			logger
-					.logError(
-							"Error refreshing TaskDescriptor general section: " + element, ex); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.WorkBreakdownElementGeneralSection#getNamePrefix()
-	 */
-	public String getNamePrefix() {
-		return LibraryUIText.TEXT_TASK_DESCRIPTOR + ": "; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/TaskDescriptorRoleSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/TaskDescriptorRoleSection.java
deleted file mode 100755
index ce377a6..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/TaskDescriptorRoleSection.java
+++ /dev/null
@@ -1,410 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.filters.DescriptorProcessFilter;
-import org.eclipse.epf.authoring.ui.filters.ProcessRoleFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.process.command.AssignPrimaryPerformerToTaskDescriptor;
-import org.eclipse.epf.library.edit.process.command.AssignRoleToTaskDescriptor;
-import org.eclipse.epf.library.edit.process.command.IActionTypeConstants;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-
-/**
- * The Task descriptor - role tab section
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class TaskDescriptorRoleSection extends RelationSection {
-	private IFilter roleFilter = null;
-
-	/**
-	 * Get process roledescriptor filter
-	 */
-	public IFilter getFilter() {
-		if (roleFilter == null) {
-			roleFilter = new ProcessRoleFilter(getConfiguration(), null,
-					FilterConstants.ROLES);
-		}
-		return roleFilter;
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-
-		super.createControls(parent, tabbedPropertySheetPage);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#initContentProvider1()
-	 */
-	protected void initContentProvider1() {
-		contentProvider = new AdapterFactoryContentProvider(getAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				List list = new ArrayList();
-				RoleDescriptor role = ((TaskDescriptor) element)
-						.getPerformedPrimarilyBy();
-				if (role != null)
-					list.add(role);
-				return getFilteredList(list).toArray();
-			}
-		};
-		tableViewer1.setContentProvider(contentProvider);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#initContentProvider2()
-	 */
-	protected void initContentProvider2() {
-		contentProvider = new AdapterFactoryContentProvider(getAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return getFilteredList(
-						((TaskDescriptor) element).getAdditionallyPerformedBy())
-						.toArray();
-			}
-		};
-		tableViewer2.setContentProvider(contentProvider);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#initContentProvider3()
-	 */
-	protected void initContentProvider3() {
-		contentProvider = new AdapterFactoryContentProvider(getAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return getFilteredList(
-						((TaskDescriptor) element).getAssistedBy()).toArray();
-			}
-		};
-		tableViewer3.setContentProvider(contentProvider);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#init()
-	 */
-	protected void init() {
-		super.init();
-
-		labelProvider = new AdapterFactoryLabelProvider(
-				TngAdapterFactory.INSTANCE.getOBS_ComposedAdapterFactory());
-
-		int numOfTables = 3;
-		
-		setTabData(PropertiesResources.TaskDescriptor_Roles_SectionTitle,
-				PropertiesResources.TaskDescriptor_Roles_SectionDescription,
-				PropertiesResources.TaskDescriptor_Roles_Table1,
-				PropertiesResources.TaskDescriptor_Roles_Table2,
-				PropertiesResources.TaskDescriptor_Roles_Table3,
-				null,
-				FilterConstants.ROLES);
-		
-		boolean[] changesAllowed = { true, true, true };
-		setTableData(numOfTables, changesAllowed);
-
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#refresh()
-	 */
-	public void refresh() {
-		// System.out.println("Refreshing TaskDescriptor ROLES Section");
-		if (getElement() instanceof TaskDescriptor) {
-			element = (TaskDescriptor) getElement();
-		}
-		super.refresh();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getDescriptorsFromProcess()
-	 */
-	protected List getDescriptorsFromProcess() {
-		List items = new ArrayList();
-		return ProcessUtil.getElementsInScope(getAdapterFactory(), element,
-				RoleDescriptor.class, items);
-
-	}
-
-	private List getRoles(List items) {
-		List roleList = new ArrayList();
-		if (!items.isEmpty()) {
-			for (int i = 0; i < items.size(); i++) {
-				roleList.add(((RoleDescriptor) items.get(i)).getRole());
-			}
-		}
-
-		return roleList;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addItems1(java.util.List)
-	 */
-	protected void addItems1(List items) {
-		if (!items.isEmpty()) {
-			List elementList = getRoles(((TaskDescriptor) element)
-					.getAdditionallyPerformedBy());
-			elementList.addAll(getRoles(((TaskDescriptor) element)
-					.getAssistedBy()));
-
-			List newList = new ArrayList();
-			for (int i = 0; i < items.size(); i++) {
-				Object obj = items.get(i);
-				if (obj instanceof Role) {
-					Role role = (Role) obj;
-					if (!elementList.contains(role))
-						newList.add(role);
-				}
-			}
-			if (newList.size() > 0) {
-				AssignPrimaryPerformerToTaskDescriptor cmd = new AssignPrimaryPerformerToTaskDescriptor(
-						(TaskDescriptor) element, (Role) newList.get(0), getConfiguration());
-				actionMgr.execute(cmd);
-			}
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addItems2(java.util.List)
-	 */
-	protected void addItems2(List items) {
-		if (!items.isEmpty()) {
-			RoleDescriptor roleDesc = ((TaskDescriptor) element)
-					.getPerformedPrimarilyBy();
-			List elementList = getRoles(((TaskDescriptor) element)
-					.getAssistedBy());
-			if (roleDesc != null)
-				elementList.add(roleDesc.getRole());
-
-			List newList = new ArrayList();
-			for (int i = 0; i < items.size(); i++) {
-				Object obj = items.get(i);
-				if (obj instanceof Role) {
-					Role role = (Role) obj;
-					if (!elementList.contains(role))
-						newList.add(role);
-				}
-			}
-			if (newList.size() > 0) {
-				AssignRoleToTaskDescriptor cmd = new AssignRoleToTaskDescriptor(
-						(TaskDescriptor) element, newList,
-						IActionTypeConstants.ADD_ADDITIONAL_PERFORMER, getConfiguration());
-				actionMgr.execute(cmd);
-			}
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addItems3(java.util.List)
-	 */
-	protected void addItems3(List items) {
-		if (!items.isEmpty()) {
-			RoleDescriptor roleDesc = ((TaskDescriptor) element)
-					.getPerformedPrimarilyBy();
-			List elementList = getRoles(((TaskDescriptor) element)
-					.getAdditionallyPerformedBy());
-			if (roleDesc != null)
-				elementList.add(roleDesc.getRole());
-
-			List newList = new ArrayList();
-			for (int i = 0; i < items.size(); i++) {
-				Object obj = items.get(i);
-				if (obj instanceof Role) {
-					Role role = (Role) obj;
-					if (!elementList.contains(role))
-						newList.add(role);
-				}
-			}
-			if (newList.size() > 0) {
-				AssignRoleToTaskDescriptor cmd = new AssignRoleToTaskDescriptor(
-						(TaskDescriptor) element, newList,
-						IActionTypeConstants.ADD_ASSISTED_BY, getConfiguration());
-				actionMgr.execute(cmd);
-			}
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addFromProcessItems1(java.util.List)
-	 */
-	protected void addFromProcessItems1(List items) {
-		if (!items.isEmpty()) {
-			items.removeAll(((TaskDescriptor) element)
-					.getAdditionallyPerformedBy());
-			items.removeAll(((TaskDescriptor) element).getAssistedBy());
-
-			if (items.size() > 0) {
-				actionMgr.doAction(IActionManager.SET, element,
-						UmaPackage.eINSTANCE
-								.getTaskDescriptor_PerformedPrimarilyBy(),
-						items.get(0), -1);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addFromProcessItems2(java.util.List)
-	 */
-	protected void addFromProcessItems2(List items) {
-		if (!items.isEmpty()) {
-			items.removeAll(((TaskDescriptor) element).getAssistedBy());
-			items.remove(((TaskDescriptor) element).getPerformedPrimarilyBy());
-
-			actionMgr.doAction(IActionManager.ADD_MANY, element,
-					UmaPackage.eINSTANCE
-							.getTaskDescriptor_AdditionallyPerformedBy(),
-					items, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addFromProcessItems3(java.util.List)
-	 */
-	protected void addFromProcessItems3(List items) {
-		if (!items.isEmpty()) {
-			items.removeAll(((TaskDescriptor) element)
-					.getAdditionallyPerformedBy());
-			items.remove(((TaskDescriptor) element).getPerformedPrimarilyBy());
-
-			actionMgr.doAction(IActionManager.ADD_MANY, element,
-					UmaPackage.eINSTANCE.getTaskDescriptor_AssistedBy(), items,
-					-1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#removeItems1(java.util.List)
-	 */
-	protected void removeItems1(List items) {
-		if (!items.isEmpty()) {
-			RemoveDescriptorCommand cmd = new RemoveDescriptorCommand(element,
-					items, UmaPackage.TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY);
-			actionMgr.execute(cmd);
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#removeItems2(java.util.List)
-	 */
-	protected void removeItems2(List items) {
-		if (!items.isEmpty()) {
-			RemoveDescriptorCommand cmd = new RemoveDescriptorCommand(element,
-					items,
-					UmaPackage.TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY);
-			actionMgr.execute(cmd);
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#removeItems3(java.util.List)
-	 */
-	protected void removeItems3(List items) {
-		if (!items.isEmpty()) {
-			RemoveDescriptorCommand cmd = new RemoveDescriptorCommand(element,
-					items, UmaPackage.TASK_DESCRIPTOR__ASSISTED_BY);
-			actionMgr.execute(cmd);
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getExistingElements1()
-	 */
-	protected List getExistingElements1() {
-		List list = new ArrayList();
-		RoleDescriptor roleDesc = ((TaskDescriptor) element)
-				.getPerformedPrimarilyBy();
-		if (roleDesc != null)
-			list.add(roleDesc);
-
-		return list;
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getExistingElements2()
-	 */
-	protected List getExistingElements2() {
-		return ((TaskDescriptor) element).getAdditionallyPerformedBy();
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getExistingElements3()
-	 */
-	protected List getExistingElements3() {
-		return ((TaskDescriptor) element).getAssistedBy();
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getFilterForDescriptors()
-	 */
-	protected IFilter getFilterForDescriptors() {
-		return new DescriptorProcessFilter(getConfiguration()) {
-			protected boolean childAccept(Object obj) {
-				if (obj instanceof Activity) {
-					List list = new ArrayList();
-					getActivitiesInScope(TngAdapterFactory.INSTANCE
-							.getWBS_ComposedAdapterFactory(), element, list);
-					if (list.contains(obj))
-						return true;
-					else
-						return false;
-				}
-				if (obj instanceof RoleDescriptor)
-					return true;
-				return false;
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getProcess()
-	 */
-	protected Process getProcess() {
-		AdapterFactory aFactory = TngAdapterFactory.INSTANCE
-				.getWBS_ComposedAdapterFactory();
-		ItemProviderAdapter adapter = (ItemProviderAdapter) aFactory.adapt(
-				element, ITreeItemContentProvider.class);
-		Object obj = ProcessUtil.getRootProcess(aFactory, adapter, element);
-		return (Process) obj;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getDescriptorTabName()
-	 */
-	protected String getDescriptorTabName() {
-		return FilterConstants.ROLE_DESCRIPTORS;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/TaskDescriptorStepSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/TaskDescriptorStepSection.java
deleted file mode 100755
index 39fac7f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/TaskDescriptorStepSection.java
+++ /dev/null
@@ -1,539 +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.authoring.ui.properties;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.providers.VariabilityElementLabelProvider;
-import org.eclipse.epf.library.edit.IConfigurationApplicator;
-import org.eclipse.epf.library.edit.Providers;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-
-/**
- * The task descriptor - step section
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class TaskDescriptorStepSection extends AbstractSection {
-
-	protected ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory());
-
-	private TaskDescriptor element;
-
-	private IActionManager actionMgr;
-
-	private FormToolkit toolkit;
-
-	private Button ctrl_add, ctrl_remove, ctrl_up, ctrl_down;
-
-	private Table ctrl_selected;
-
-	private TableViewer viewer;
-
-	// private Text ctrl_brief_desc;
-	private Image titleImage;
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.properties.AbstractSection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-
-		super.createControls(parent, tabbedPropertySheetPage);
-		init();
-
-		parent.setLayout(new GridLayout());
-		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// create steps section
-		createStepSection(parent);
-
-		addListeners();
-
-	}
-
-	/**
-	 * Initialize
-	 *
-	 */
-	private void init() {
-		// get activity object
-		element = (TaskDescriptor) getElement();
-
-		// get toolkit
-		toolkit = getWidgetFactory();
-
-		// get action manager
-		actionMgr = EPFPropertySheetPage.getActionManager();
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.views.properties.tabbed.AbstractPropertySection#refresh()
-	 */
-	public void refresh() {
-		try {
-			if (getElement() instanceof TaskDescriptor) {
-				element = (TaskDescriptor) getElement();
-				viewer.refresh();
-
-				// hide/refresh controls
-				updateControls();
-			}
-		} catch (Exception ex) {
-			logger.logError("Error refreshing TaskDescriptor step section" + element, ex);  //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.properties.AbstractSection#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-
-		if (labelProvider != null) {
-			labelProvider.dispose();
-		}
-	}
-
-	/**
-	 * Update controls based on editable flag. Controls will be either editable 
-	 * or read-only after updating this.
-	 */
-	public void updateControls() {
-		ctrl_add.setEnabled(editable);
-		if (element.getTask() == null)
-			ctrl_add.setEnabled(false);
-		else {
-			List steps = getSteps();
-			if (steps != null && steps.size() > 0) 
-				ctrl_add.setEnabled(true);
-			else 
-				ctrl_add.setEnabled(false);
-		}
-		
-		IStructuredSelection selection = (IStructuredSelection) viewer
-				.getSelection();
-		if (selection.size() > 0 && editable) {
-			ctrl_remove.setEnabled(editable);
-			ctrl_up.setEnabled(editable);
-			ctrl_down.setEnabled(editable);
-		} else {
-			ctrl_remove.setEnabled(false);
-			ctrl_up.setEnabled(false);
-			ctrl_down.setEnabled(false);
-
-		}
-	}
-
-	/**
-	 * Create Step section on the given composite
-	 * @param composite
-	 */
-	private void createStepSection(Composite composite) {
-		// create step section
-		Section stepSection = FormUI
-				.createSection(
-						toolkit,
-						composite,
-						PropertiesResources.TaskDescriptor_stepInformationTitle, 
-						PropertiesResources.TaskDescriptor_stepInformationDescription); 
-
-		// create step composite
-		Composite stepComposite = FormUI.createComposite(toolkit, stepSection,
-				2, false);
-
-		// create table composite
-		Composite pane1 = FormUI.createComposite(toolkit, stepComposite,
-				GridData.FILL_BOTH);
-		FormUI.createLabel(toolkit, pane1, PropertiesResources.TaskDescriptor_Selected_Steps); 
-
-		ctrl_selected = FormUI.createTable(toolkit, pane1);
-		viewer = new TableViewer(ctrl_selected);
-
-		IStructuredContentProvider contentProvider = new AdapterFactoryContentProvider(
-				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return element.getSelectedSteps().toArray();
-			}
-		};
-
-		viewer.setContentProvider(contentProvider);
-		viewer.setLabelProvider(labelProvider);
-		viewer.setInput(element);
-
-		// create button composite
-		Composite pane2 = FormUI.createComposite(toolkit, stepComposite,
-				GridData.VERTICAL_ALIGN_CENTER
-						| GridData.HORIZONTAL_ALIGN_CENTER);
-
-		// create buttons
-		ctrl_add = FormUI.createButton(toolkit, pane2, PropertiesResources.Process_Add);
-		ctrl_add.setEnabled(false);
-		ctrl_remove = FormUI.createButton(toolkit, pane2, PropertiesResources.Process_Remove); 
-		ctrl_remove.setEnabled(false);
-		ctrl_up = FormUI.createButton(toolkit, pane2, PropertiesResources.Process_Up); 
-		ctrl_down = FormUI.createButton(toolkit, pane2, PropertiesResources.Process_Down); 
-
-		if (element.getTask() != null) {
-			List steps = getSteps();
-			if (steps != null && steps.size() > 0) {
-				ctrl_add.setEnabled(true);
-			}
-		}
-		// create brief description
-		// int heightHint = 40;
-		// int horizontalSpan = 2;
-		// Label label = FormUI.createLabel(toolkit, stepComposite,
-		// PropertiesResources.getString("Process.briefDescription"),
-		// heightHint);
-		// ctrl_brief_desc = FormUI.createText(toolkit, stepComposite,
-		// heightHint, heightHint);
-		// ctrl_brief_desc.setEditable(false);
-		//		
-		toolkit.paintBordersFor(stepComposite);
-		toolkit.paintBordersFor(pane1);
-
-	}
-
-	/**
-	 * Add listeners
-	 */
-	private void addListeners() {
-		// Add focus listener on primary tasks list
-		ctrl_selected.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) viewer
-						.getSelection();
-				if ((selection.size() > 0) && editable) {
-					ctrl_remove.setEnabled(editable);
-					ctrl_up.setEnabled(editable);
-					ctrl_down.setEnabled(editable);
-				}
-			}
-		});
-
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection) viewer
-						.getSelection();
-				if ((selection.size() > 0) && editable) {
-					ctrl_remove.setEnabled(true);
-
-					if (viewer.getTable().getSelectionIndex() > 0
-							&& selection.size() == 1) {
-						ctrl_up.setEnabled(true);
-					} else
-						ctrl_up.setEnabled(false);
-
-					if (viewer.getTable().getSelectionIndex() < viewer
-							.getTable().getItemCount() - 1
-							&& selection.size() == 1) {
-						ctrl_down.setEnabled(true);
-					} else
-						ctrl_down.setEnabled(false);
-
-				}
-
-				if (selection.size() == 1) {
-					String desc = ((MethodElement) selection.getFirstElement())
-							.getBriefDescription();
-					if (desc == null) {
-						desc = ""; //$NON-NLS-1$
-					}
-					// ctrl_brief_desc.setText(desc);
-				} else if (selection.size() > 1) {
-					// ctrl_brief_desc.setText(PropertiesResources.getString("Process.MultipleSelection")
-					// + " - " + selection.size());
-				}
-			}
-		});
-
-		ctrl_add.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredContentProvider stepContentProvider = new AdapterFactoryContentProvider(
-						TngAdapterFactory.INSTANCE
-								.getNavigatorView_ComposedAdapterFactory()) {
-					public Object[] getElements(Object object) {
-
-						return getSteps().toArray();
-//						// get all steps
-//						IConfigurationApplicator configApplicator = Providers
-//								.getConfigurationApplicator();
-//						MethodConfiguration config = TngUtil.getOwningProcess(
-//								element).getDefaultContext();
-//						List steps = (List) configApplicator.getReference(
-//								element.getTask(), UmaPackage.eINSTANCE
-//										.getTask_Steps(), config);
-//
-//						// remove already existing steps
-//						steps.removeAll(element.getSelectedSteps());
-//						return steps.toArray();
-					}
-				};
-
-				ILabelProvider stepLabelProvider = new VariabilityElementLabelProvider(
-						TngAdapterFactory.INSTANCE
-								.getNavigatorView_ComposedAdapterFactory()) {
-
-					public boolean isExternal(Object obj) {
-
-						boolean flag = !element.getTask().getPresentation()
-								.getSections().contains(obj);
-						return flag;
-					}
-				};
-
-				ListSelectionDialog dlg = new ListSelectionDialog(PlatformUI
-						.getWorkbench().getActiveWorkbenchWindow().getShell(),
-						element.getTask(), stepContentProvider,
-						stepLabelProvider, PropertiesResources.TaskDescriptor_StepDialogMessage); 
-				titleImage = Display.getCurrent().getActiveShell().getImage();
-				ListSelectionDialog.setDefaultImage(titleImage);
-				dlg.setTitle(PropertiesResources.TaskDescriptor_StepDialogTitle);
-				dlg.setBlockOnOpen(true);
-				dlg.open();
-
-				addSteps(dlg.getResult());
-				
-				// enable/disable add button
-				List steps = getSteps();
-				if (steps != null && steps.size() > 0) 
-					ctrl_add.setEnabled(true);
-				else 
-					ctrl_add.setEnabled(false);
-				
-				viewer.refresh();
-			}
-		});
-
-		ctrl_remove.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) viewer
-						.getSelection();
-				if (selection.size() > 0) {
-					// update the model
-					ArrayList rmItems = new ArrayList();
-					rmItems.addAll(selection.toList());
-					removeSteps(rmItems);
-					viewer.refresh();
-
-					// clear the selection
-					viewer.setSelection(null, true);
-					// ctrl_brief_desc.setText("");
-				}
-				// ctrl_remove.setEnabled(false);
-				
-				// enable/disable add button
-				List steps = getSteps();
-				if (steps != null && steps.size() > 0) 
-					ctrl_add.setEnabled(true);
-				else 
-					ctrl_add.setEnabled(false);
-			}
-		});
-
-		ctrl_up.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				ArrayList steps = new ArrayList();
-				IStructuredSelection selection = (IStructuredSelection) viewer
-						.getSelection();
-				if (selection.size() > 0) {
-					ArrayList items = new ArrayList();
-					items.addAll(selection.toList());
-					BasicEList stepList = (BasicEList) element
-							.getSelectedSteps();
-
-					for (Iterator it = items.iterator(); it.hasNext();) {
-						Object object = it.next();
-						int index = stepList.indexOf(object);
-						if (index > 0)
-							stepList.move(index - 1, object);
-
-					}
-					steps.addAll(stepList);
-					// TODO - write a command. 
-					// activate dirty flag
-					actionMgr.doAction(IActionManager.REMOVE_MANY, element,
-							UmaPackage.eINSTANCE
-									.getTaskDescriptor_SelectedSteps(),
-							stepList, -1);
-					actionMgr.doAction(IActionManager.ADD_MANY, element,
-							UmaPackage.eINSTANCE
-									.getTaskDescriptor_SelectedSteps(), steps,
-							-1);
-
-					viewer.refresh();
-				}
-
-				if (viewer.getTable().getSelectionIndex() > 0 && editable)
-					ctrl_up.setEnabled(true);
-				else
-					ctrl_up.setEnabled(false);
-
-				if (viewer.getTable().getSelectionIndex() < viewer.getTable()
-						.getItemCount() - 1
-						&& editable)
-					ctrl_down.setEnabled(true);
-				else
-					ctrl_down.setEnabled(false);
-			}
-
-		});
-
-		ctrl_down.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				ArrayList steps = new ArrayList();
-				IStructuredSelection selection = (IStructuredSelection) viewer
-						.getSelection();
-				if (selection.size() > 0) {
-					ArrayList items = new ArrayList();
-					items.addAll(selection.toList());
-					BasicEList stepList = (BasicEList) element
-							.getSelectedSteps();
-
-					for (Iterator it = items.iterator(); it.hasNext();) {
-						Object object = it.next();
-						int index = stepList.indexOf(object);
-
-						if (index < stepList.size() - 1)
-							stepList.move(index + items.size(), object);
-
-					}
-					steps.addAll(stepList);
-
-					// TODO - write a cmmand. Hacking it for now to activate
-					// dirty flag
-					actionMgr.doAction(IActionManager.REMOVE_MANY, element,
-							UmaPackage.eINSTANCE
-									.getTaskDescriptor_SelectedSteps(),
-							stepList, -1);
-					actionMgr.doAction(IActionManager.ADD_MANY, element,
-							UmaPackage.eINSTANCE
-									.getTaskDescriptor_SelectedSteps(), steps,
-							-1);
-
-					viewer.refresh();
-				}
-
-				if (viewer.getTable().getSelectionIndex() > 0 && editable)
-					ctrl_up.setEnabled(true);
-				else
-					ctrl_up.setEnabled(false);
-
-				if (viewer.getTable().getSelectionIndex() < viewer.getTable()
-						.getItemCount() - 1
-						&& editable)
-					ctrl_down.setEnabled(true);
-				else
-					ctrl_down.setEnabled(false);
-
-			}
-
-		});
-	}
-
-	/**
-	 * Assign Steps to task descriptor
-	 * @param addItems
-	 * 			List of steps
-	 */
-	private void addSteps(Object[] addItems) {
-		// update the model
-		if (addItems != null) {
-			for (int i = 0; i < addItems.length; i++) {
-				org.eclipse.epf.uma.Section item = (org.eclipse.epf.uma.Section) addItems[i];
-
-				actionMgr.doAction(IActionManager.ADD, element,
-						UmaPackage.eINSTANCE.getTaskDescriptor_SelectedSteps(),
-						item, -1);
-			}
-		}
-	}
-
-	/**
-	 * Remove assigned steps for the task descriptor
-	 * @param rmItems
-	 * 			List of steps 
-	 */
-	private void removeSteps(List rmItems) {
-		// update the model
-		if (!rmItems.isEmpty()) {
-			for (Iterator it = rmItems.iterator(); it.hasNext();) {
-				org.eclipse.epf.uma.Section item = (org.eclipse.epf.uma.Section) it.next();
-
-				actionMgr.doAction(IActionManager.REMOVE, element,
-						UmaPackage.eINSTANCE.getTaskDescriptor_SelectedSteps(),
-						item, -1);
-			}
-		}
-	}
-	
-	/**
-	 * Get steps that could be assigned to this task descriptor
-	 * @return
-	 */
-	private List getSteps(){
-		//	get all steps
-		IConfigurationApplicator configApplicator = Providers
-				.getConfigurationApplicator();
-		MethodConfiguration config = TngUtil.getOwningProcess(
-				element).getDefaultContext();
-		List steps = (List) configApplicator.getReference(
-				element.getTask(), UmaPackage.eINSTANCE
-						.getTask_Steps(), config);
-
-		// remove already existing steps
-		steps.removeAll(element.getSelectedSteps());
-		return steps;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/TaskDescriptorWorkProductSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/TaskDescriptorWorkProductSection.java
deleted file mode 100755
index c8c1b1c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/TaskDescriptorWorkProductSection.java
+++ /dev/null
@@ -1,444 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.filters.DescriptorProcessFilter;
-import org.eclipse.epf.authoring.ui.filters.ProcessWorkProductFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.process.command.AssignWPToTaskDescriptor;
-import org.eclipse.epf.library.edit.process.command.IActionTypeConstants;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-
-/**
- * The task descriptor - work product section
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class TaskDescriptorWorkProductSection extends RelationSection {
-	private IFilter filter = null;
-
-	/**
-	 * Get process work product filter
-	 */
-	public IFilter getFilter() {
-		if (filter == null) {
-			filter = new ProcessWorkProductFilter(getConfiguration(), null,
-					FilterConstants.WORKPRODUCTS);
-		}
-		return filter;
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-
-		super.createControls(parent, tabbedPropertySheetPage);
-
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#initContentProvider1()
-	 */
-	protected void initContentProvider1() {
-		contentProvider = new AdapterFactoryContentProvider(getAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return getFilteredList(
-						((TaskDescriptor) element).getMandatoryInput())
-						.toArray();
-			}
-		};
-		tableViewer1.setContentProvider(contentProvider);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#initContentProvider2()
-	 */
-	protected void initContentProvider2() {
-		contentProvider = new AdapterFactoryContentProvider(getAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return getFilteredList(
-						((TaskDescriptor) element).getOptionalInput())
-						.toArray();
-			}
-		};
-		tableViewer2.setContentProvider(contentProvider);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#initContentProvider3()
-	 */
-	protected void initContentProvider3() {
-		contentProvider = new AdapterFactoryContentProvider(getAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return getFilteredList(
-						((TaskDescriptor) element).getExternalInput())
-						.toArray();
-			}
-		};
-		tableViewer3.setContentProvider(contentProvider);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#initContentProvider4()
-	 */
-	protected void initContentProvider4() {
-		contentProvider = new AdapterFactoryContentProvider(getAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				return getFilteredList(((TaskDescriptor) element).getOutput())
-						.toArray();
-			}
-		};
-		tableViewer4.setContentProvider(contentProvider);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#init()
-	 */
-	protected void init() {
-		super.init();
-
-		labelProvider = new AdapterFactoryLabelProvider(
-				TngAdapterFactory.INSTANCE.getPBS_ComposedAdapterFactory());
-
-		int numOfTables = 4;
-		setTabData(PropertiesResources.TaskDescriptor_WorkProducts_SectionTitle,
-				PropertiesResources.TaskDescriptor_WorkProducts_SectionDescription,
-				PropertiesResources.TaskDescriptor_WorkProducts_Table1,
-				PropertiesResources.TaskDescriptor_WorkProducts_Table2,
-				PropertiesResources.TaskDescriptor_WorkProducts_Table3,
-				PropertiesResources.TaskDescriptor_WorkProducts_Table4,
-				FilterConstants.WORKPRODUCTS);
-		
-		boolean[] changesAllowed = { true, true, true, true };
-		setTableData(numOfTables, changesAllowed);
-
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#refresh()
-	 */
-	public void refresh() {
-		if (getElement() instanceof TaskDescriptor) {
-			element = (TaskDescriptor) getElement();
-		}
-		super.refresh();
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getDescriptorsFromProcess()
-	 */
-	protected List getDescriptorsFromProcess() {
-		List items = new ArrayList();
-		return ProcessUtil.getElementsInScope(getAdapterFactory(), element,
-				WorkProductDescriptor.class, items);
-	}
-
-	private List getWorkProducts(List items) {
-		List wpList = new ArrayList();
-		if (!items.isEmpty()) {
-			for (int i = 0; i < items.size(); i++) {
-				wpList.add(((WorkProductDescriptor) items.get(i))
-						.getWorkProduct());
-			}
-		}
-
-		return wpList;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addItems1(java.util.List)
-	 */
-	protected void addItems1(List items) {
-		if (!items.isEmpty()) {
-			List elementList = getWorkProducts(((TaskDescriptor) element)
-					.getOptionalInput());
-			elementList.addAll(getWorkProducts(((TaskDescriptor) element)
-					.getExternalInput()));
-			List newList = new ArrayList();
-			for (int i = 0; i < items.size(); i++) {
-				Object obj = items.get(i);
-				if (obj instanceof WorkProduct) {
-					WorkProduct wp = (WorkProduct) obj;
-					if (!elementList.contains(wp))
-						newList.add(wp);
-				}
-			}
-			if (newList.size() > 0) {
-				AssignWPToTaskDescriptor cmd = new AssignWPToTaskDescriptor(
-						(TaskDescriptor) element, newList,
-						IActionTypeConstants.ADD_MANDATORY_INPUT,
-						getConfiguration());
-				actionMgr.execute(cmd);
-			}
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addItems2(java.util.List)
-	 */
-	protected void addItems2(List items) {
-		if (!items.isEmpty()) {
-			List elementList = getWorkProducts(((TaskDescriptor) element)
-					.getMandatoryInput());
-			elementList.addAll(getWorkProducts(((TaskDescriptor) element)
-					.getExternalInput()));
-
-			List newList = new ArrayList();
-			for (int i = 0; i < items.size(); i++) {
-				Object obj = items.get(i);
-				if (obj instanceof WorkProduct) {
-					WorkProduct wp = (WorkProduct) obj;
-					if (!elementList.contains(wp))
-						newList.add(wp);
-				}
-			}
-
-			if (newList.size() > 0) {
-				AssignWPToTaskDescriptor cmd = new AssignWPToTaskDescriptor(
-						(TaskDescriptor) element, newList,
-						IActionTypeConstants.ADD_OPTIONAL_INPUT,
-						getConfiguration());
-				actionMgr.execute(cmd);
-			}
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addItems3(java.util.List)
-	 */
-	protected void addItems3(List items) {
-		if (!items.isEmpty()) {
-			List elementList = getWorkProducts(((TaskDescriptor) element)
-					.getMandatoryInput());
-			elementList.addAll(getWorkProducts(((TaskDescriptor) element)
-					.getOptionalInput()));
-
-			List newList = new ArrayList();
-			for (int i = 0; i < items.size(); i++) {
-				Object obj = items.get(i);
-				if (obj instanceof WorkProduct) {
-					WorkProduct wp = (WorkProduct) obj;
-					if (!elementList.contains(wp))
-						newList.add(wp);
-				}
-			}
-			if (newList.size() > 0) {
-				AssignWPToTaskDescriptor cmd = new AssignWPToTaskDescriptor(
-						(TaskDescriptor) element, newList,
-						IActionTypeConstants.ADD_EXTERNAL_INPUT,
-						getConfiguration());
-				actionMgr.execute(cmd);
-			}
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addItems4(java.util.List)
-	 */
-	protected void addItems4(List items) {
-		if (!items.isEmpty()) {
-			AssignWPToTaskDescriptor cmd = new AssignWPToTaskDescriptor(
-					(TaskDescriptor) element, items,
-					IActionTypeConstants.ADD_OUTPUT, getConfiguration());
-			actionMgr.execute(cmd);
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#removeItems1(java.util.List)
-	 */
-	protected void removeItems1(List items) {
-		if (!items.isEmpty()) {
-			RemoveDescriptorCommand cmd = new RemoveDescriptorCommand(element,
-					items, UmaPackage.TASK_DESCRIPTOR__MANDATORY_INPUT);
-			actionMgr.execute(cmd);
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#removeItems2(java.util.List)
-	 */
-	protected void removeItems2(List items) {
-		if (!items.isEmpty()) {
-			RemoveDescriptorCommand cmd = new RemoveDescriptorCommand(element,
-					items, UmaPackage.TASK_DESCRIPTOR__OPTIONAL_INPUT);
-			actionMgr.execute(cmd);
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#removeItems3(java.util.List)
-	 */
-	protected void removeItems3(List items) {
-		if (!items.isEmpty()) {
-			RemoveDescriptorCommand cmd = new RemoveDescriptorCommand(element,
-					items, UmaPackage.TASK_DESCRIPTOR__EXTERNAL_INPUT);
-			actionMgr.execute(cmd);
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#removeItems4(java.util.List)
-	 */
-	protected void removeItems4(List items) {
-		if (!items.isEmpty()) {
-			RemoveDescriptorCommand cmd = new RemoveDescriptorCommand(element,
-					items, UmaPackage.TASK_DESCRIPTOR__OUTPUT);
-			actionMgr.execute(cmd);
-		}
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getExistingElements1()
-	 */
-	protected List getExistingElements1() {
-		return ((TaskDescriptor) element).getMandatoryInput();
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getExistingElements2()
-	 */
-	protected List getExistingElements2() {
-		return ((TaskDescriptor) element).getOptionalInput();
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getExistingElements3()
-	 */
-	protected List getExistingElements3() {
-		return ((TaskDescriptor) element).getExternalInput();
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getExistingElements4()
-	 */
-	protected List getExistingElements4() {
-		return ((TaskDescriptor) element).getOutput();
-	};
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getProcess()
-	 */
-	protected Process getProcess() {
-		AdapterFactory aFactory = TngAdapterFactory.INSTANCE
-				.getWBS_ComposedAdapterFactory();
-		ItemProviderAdapter adapter = (ItemProviderAdapter) aFactory.adapt(
-				element, ITreeItemContentProvider.class);
-		Object obj = ProcessUtil.getRootProcess(aFactory, adapter, element);
-		return (Process) obj;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getFilterForDescriptors()
-	 */
-	protected IFilter getFilterForDescriptors() {
-		return new DescriptorProcessFilter(getConfiguration()) {
-			protected boolean childAccept(Object obj) {
-				if (obj instanceof Activity) {
-					List list1 = new ArrayList();
-					getActivitiesInScope(TngAdapterFactory.INSTANCE
-							.getWBS_ComposedAdapterFactory(), element, list1);
-					if (list1.contains(obj))
-						return true;
-					else
-						return false;
-				}
-				if (obj instanceof WorkProductDescriptor)
-					return true;
-				return false;
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addFromProcessItems1(java.util.List)
-	 */
-	protected void addFromProcessItems1(List items) {
-		if (!items.isEmpty()) {
-			items.removeAll(((TaskDescriptor) element).getOptionalInput());
-			items.removeAll(((TaskDescriptor) element).getExternalInput());
-			actionMgr.doAction(IActionManager.ADD_MANY, element,
-					UmaPackage.eINSTANCE.getTaskDescriptor_MandatoryInput(),
-					items, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addFromProcessItems2(java.util.List)
-	 */
-	protected void addFromProcessItems2(List items) {
-		if (!items.isEmpty()) {
-			items.removeAll(((TaskDescriptor) element).getMandatoryInput());
-			items.removeAll(((TaskDescriptor) element).getExternalInput());
-			actionMgr.doAction(IActionManager.ADD_MANY, element,
-					UmaPackage.eINSTANCE.getTaskDescriptor_OptionalInput(),
-					items, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addFromProcessItems3(java.util.List)
-	 */
-	protected void addFromProcessItems3(List items) {
-		if (!items.isEmpty()) {
-			items.removeAll(((TaskDescriptor) element).getMandatoryInput());
-			items.removeAll(((TaskDescriptor) element).getOptionalInput());
-			actionMgr.doAction(IActionManager.ADD_MANY, element,
-					UmaPackage.eINSTANCE.getTaskDescriptor_ExternalInput(),
-					items, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#addFromProcessItems4(java.util.List)
-	 */
-	protected void addFromProcessItems4(List items) {
-		if (!items.isEmpty()) {
-			actionMgr.doAction(IActionManager.ADD_MANY, element,
-					UmaPackage.eINSTANCE.getTaskDescriptor_Output(), items, -1);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.RelationSection#getDescriptorTabName()
-	 */
-	protected String getDescriptorTabName() {
-		return FilterConstants.WORK_PRODUCT_DESCRIPTORS;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/TeamProfileRoleSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/TeamProfileRoleSection.java
deleted file mode 100755
index 9ece1e3..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/TeamProfileRoleSection.java
+++ /dev/null
@@ -1,567 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.emf.edit.provider.WrapperItemProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.dialogs.ItemsFilterDialog;
-import org.eclipse.epf.authoring.ui.filters.DescriptorProcessFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.itemsfilter.FilterHelper;
-import org.eclipse.epf.library.edit.process.ActivityWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.CompositeRoleWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.RoleDescriptorWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.command.AddRoleToTeamCommand;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.CompositeRole;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.TeamProfile;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-
-/**
- * The team profile - role/composite role section
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class TeamProfileRoleSection extends OBSRelationSection {
-
-	List roleList = null;
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-		super.createControls(parent, tabbedPropertySheetPage);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#initContentProvider()
-	 */
-	protected void initContentProvider() {
-		contentProvider = new AdapterFactoryContentProvider(getAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				List newList = new ArrayList();
-				List teamRoles = ((TeamProfile) element).getTeamRoles();
-				for (Iterator itor = teamRoles.iterator(); itor.hasNext();) {
-					RoleDescriptor roleDesc = (RoleDescriptor) itor.next();
-					if ((roleDesc.getSuperActivities() == null)
-							|| (roleDesc.getSuperActivities() == null))
-						newList.add(roleDesc);
-				}
-
-				// return ((TeamProfile)element).getTeamRoles().toArray();
-				return getFilteredList(newList).toArray();
-			}
-		};
-
-		viewer.setContentProvider(contentProvider);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#init()
-	 */
-	protected void init() {
-		super.init();
-		element = (TeamProfile) element;
-
-		setTabData(PropertiesResources.TeamProfile_Role_SectionTitle, 
-				PropertiesResources.TeamProfile_Role_SectionDescription,
-				PropertiesResources.TeamProfile_Role_Table1); 
-		showAddFromProcessButton = true;
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#refresh()
-	 */
-	public void refresh() {
-		try {
-			if (getElement() instanceof TeamProfile) {
-				super.refresh();
-				element = (TeamProfile) getElement();
-				viewer.refresh();
-			}
-		} catch (Exception ex) {
-			logger.logError("Error refreshing Team Profile role section ", ex); //$NON-NLS-1$
-		}
-	}
-
-	private boolean isPartOfTeam(Role role, TeamProfile team) {
-		List teamRoles = team.getTeamRoles();
-		List roles = new ArrayList();
-		for (Iterator itor = teamRoles.iterator(); itor.hasNext();) {
-			RoleDescriptor roleDesc = (RoleDescriptor) itor.next();
-			roles.add(roleDesc.getRole());
-		}
-
-		if (roles.contains(role))
-			return true;
-
-		return false;
-	}
-
-	private void add(List items) {
-		if (items != null) {
-			List roles = new ArrayList();
-
-			for (Iterator itor = items.iterator(); itor.hasNext();) {
-				Object obj = itor.next();
-				if ((obj instanceof Role)
-						&& (!isPartOfTeam((Role) obj, (TeamProfile) element))) {
-					roles.add((Role) obj);
-				}
-			}
-
-			if (!roles.isEmpty()) {
-				AddRoleToTeamCommand cmd = new AddRoleToTeamCommand(
-						(TeamProfile) element, roles);
-				actionMgr.execute(cmd);
-			}
-		}
-	}
-
-	private void addFromProcess(List items) {
-		// update the model
-		if (items != null) {
-			for (Iterator itor = items.iterator(); itor.hasNext();) {
-				Object obj = itor.next();
-				if (obj instanceof CompositeRole) {
-					CompositeRole compRole = ProcessUtil
-							.createCompositeRole((CompositeRole) obj);
-					actionMgr.doAction(IActionManager.ADD, element,
-							UmaPackage.eINSTANCE.getTeamProfile_TeamRoles(),
-							compRole, -1);
-					actionMgr.doAction(IActionManager.ADD, element,
-							UmaPackage.eINSTANCE.getTeamProfile_TeamRoles(),
-							obj, -1);
-				} else if (obj instanceof RoleDescriptor) {
-					Role role = ((RoleDescriptor) obj).getRole();
-					if (role != null) {
-						if (!isPartOfTeam(role, (TeamProfile) element)) {
-							RoleDescriptor roleDesc = ProcessUtil
-									.createRoleDescriptor(role);
-							actionMgr.doAction(IActionManager.ADD, element,
-									UmaPackage.eINSTANCE
-											.getTeamProfile_TeamRoles(),
-									roleDesc, -1);
-						}
-						actionMgr
-								.doAction(IActionManager.ADD, element,
-										UmaPackage.eINSTANCE
-												.getTeamProfile_TeamRoles(),
-										obj, -1);
-
-						// fire Notification
-						AdapterFactory adapterFactory = TngAdapterFactory.INSTANCE
-								.getOBS_ComposedAdapterFactory();
-						Activity parent = (Activity) getParentActivity(element);
-						ItemProviderAdapter adapter = (ItemProviderAdapter) adapterFactory
-								.adapt(parent, ITreeItemContentProvider.class);
-						Collection children = adapter.getChildren(parent);
-
-						fireNotification(children, (RoleDescriptor) obj);
-
-					} else {
-						MessageFormat mf = new MessageFormat(
-								PropertiesResources.Process_TeamAssignError); //$NON-NLS-1$
-						Object[] args = { ((RoleDescriptor) obj).getName(),
-								((TeamProfile) element).getName() };
-						AuthoringUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayInfo(
-										PropertiesResources.Process_AssignmentInfoTitle, mf.format(args)); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-	}
-
-	private void fireNotification(Collection children, RoleDescriptor roleDesc) {
-		for (Iterator itor = children.iterator(); itor.hasNext();) {
-			Object obj = itor.next();
-			if (obj instanceof Activity) {
-				AdapterFactory adapterFactory = TngAdapterFactory.INSTANCE
-						.getOBS_ComposedAdapterFactory();
-				ItemProviderAdapter adapter = (ItemProviderAdapter) adapterFactory
-						.adapt((Activity) obj, ITreeItemContentProvider.class);
-				children = adapter.getChildren((Activity) obj);
-				fireNotification(children, roleDesc);
-			}
-			if (obj instanceof ActivityWrapperItemProvider) {
-				Object o1 = ((WrapperItemProvider) obj).getValue();
-				ActivityWrapperItemProvider activityAdapter = (ActivityWrapperItemProvider) obj;
-				fireNotification(activityAdapter.getChildren(o1), roleDesc);
-			}
-			if (obj instanceof RoleDescriptorWrapperItemProvider) {
-				RoleDescriptorWrapperItemProvider provider = (RoleDescriptorWrapperItemProvider) obj;
-				if (((RoleDescriptor) provider.getValue()).getRole().equals(
-						roleDesc.getRole())) {
-					provider.fireNotifyChanged(new ViewerNotification(
-							new NotificationImpl(Notification.SET, provider,
-									provider), provider, false, true));
-				}
-			}
-		}
-	}
-	
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#remove(java.util.ArrayList)
-	 */
-	protected void remove(ArrayList rmItems) {
-		// update the model
-		if (!rmItems.isEmpty()) {
-			for (Iterator itor = rmItems.iterator(); itor.hasNext();) {
-				Object obj = (Object) itor.next();
-				if (obj instanceof RoleDescriptor) {
-					actionMgr.doAction(IActionManager.REMOVE, element,
-							UmaPackage.eINSTANCE.getTeamProfile_TeamRoles(),
-							(RoleDescriptor) obj, -1);
-				}
-
-				// find matching roleDescriptor in team roles
-				List roleDescList = findRoleDescriptor((Object) obj);
-				for (Iterator roleDescItor = roleDescList.iterator(); roleDescItor
-						.hasNext();) {
-					RoleDescriptor roleDesc = (RoleDescriptor) roleDescItor
-							.next();
-				actionMgr.doAction(IActionManager.REMOVE, element,
-						UmaPackage.eINSTANCE.getTeamProfile_TeamRoles(),
-						roleDesc, -1);
-				}
-			}
-		}
-	}
-
-	private List findRoleDescriptor(Object obj) {
-		List teamRoles = ((TeamProfile) element).getTeamRoles();
-		List roleDescList = new ArrayList();
-		for (Iterator itor = teamRoles.iterator(); itor.hasNext();) {
-			Object itorObject = itor.next();
-			if (obj instanceof CompositeRole) {
-				if (itorObject instanceof CompositeRole) {
-					List firstObjectAggRoles = ((CompositeRole) obj)
-							.getAggregatedRoles();
-					List secondObjectAggRoles = ((CompositeRole) itorObject)
-							.getAggregatedRoles();
-					if (firstObjectAggRoles.equals(secondObjectAggRoles)) {
-						roleDescList.add(itorObject);
-					}
-				}
-			} else if (obj instanceof RoleDescriptor) {
-				if ((itorObject instanceof RoleDescriptor)
-						&& (!(itorObject instanceof CompositeRole))) {
-					Object objRole = ((RoleDescriptor) obj).getRole();
-					Object itorObjRole = ((RoleDescriptor) itorObject)
-							.getRole();
-					if (objRole.equals(itorObjRole)) {
-						roleDescList.add(itorObject);
-					}
-				}
-			}
-		}
-
-		return roleDescList;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#openAddDialog()
-	 */
-	protected void openAddDialog() {
-		List existingElements = ProcessUtil
-				.getAssociatedElementList(((TeamProfile) element)
-						.getTeamRoles());
-		ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getShell(), getFilter(), element,
-				FilterConstants.ROLE_DESCRIPTORS, existingElements);
-		fd.setBlockOnOpen(true);
-		fd.setTitle(FilterConstants.ROLES);
-		String[] str = new String[]{FilterConstants.ROLES};
-		fd.setTypes(str);
-		fd.open();
-		add(fd.getSelectedItems());
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.OBSRelationSection#openAddFromProcessDialog()
-	 */
-	protected void openAddFromProcessDialog() {
-		List existingElements = ((TeamProfile) element).getTeamRoles();
-		Process process = (Process) getProcess(element);
-		IFilter descriptorFilter = getDescriptorFilter();
-
-		if (descriptorFilter != null && process != null) {
-			ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-					.getWorkbench().getActiveWorkbenchWindow().getShell(),
-					descriptorFilter, process,
-					FilterConstants.ROLE_DESCRIPTORS, existingElements);
-			fd.setBlockOnOpen(true);
-			fd.setTitle(FilterConstants.ROLE_DESCRIPTORS);
-			fd.open();
-			addFromProcess(fd.getSelectedItems());
-		}
-	}
-
-	/**
-	 * Get parent Find parent until it's activity.
-	 * 
-	 * @param element
-	 * @return
-	 * 			Process
-	 */
-	protected Object getProcess(BreakdownElement element) {
-		AdapterFactory aFactory = TngAdapterFactory.INSTANCE
-				.getOBS_ComposedAdapterFactory();
-		ItemProviderAdapter adapter = (ItemProviderAdapter) aFactory.adapt(
-				element, ITreeItemContentProvider.class);
-		Object parent = adapter.getParent(element);
-		if (parent instanceof Process) {
-			return parent;
-
-		} else {
-			return getProcess((BreakdownElement) parent);
-		}
-	}
-
-	/**
-	 * Get descriptor filter
-	 */
-	protected IFilter getDescriptorFilter() {
-		return new DescriptorProcessFilter(getConfiguration()) {
-			protected boolean childAccept(Object obj) {
-				if (obj instanceof Activity) {
-					AdapterFactory adapterFactory = TngAdapterFactory.INSTANCE
-							.getOBS_ComposedAdapterFactory();
-					List parentsList = new ArrayList();
-					getActivitiesInScope(adapterFactory, element, parentsList);
-					if (parentsList.contains(obj))
-						return true;
-					if (obj.equals(getParentActivity(element)))
-						return true;
-					List childList = ((Activity) obj).getBreakdownElements();
-					if (childList.contains(getParentActivity(element)))
-						return true;
-					List list = getAllowableActivities();
-					if (list.contains(obj)){
-						List belements = ((Activity)obj).getBreakdownElements();
-						if(!belements.isEmpty()){
-							if(containsType(belements, RoleDescriptor.class,
-											getHelper()))
-							return true;
-						}
-					}
-				}
-				if (obj instanceof RoleDescriptor) {
-					Object parentActivity = getParentActivity((BreakdownElement) obj);
-					Object parent = getParentActivity(element);
-					if (parent.equals(parentActivity))
-						return true;
-
-					if (parentActivity instanceof Activity) {
-						if (getBaseActivities((Activity) parent).contains(
-								parentActivity))
-							return true;
-						if (getAllowableActivities().contains(parentActivity))
-							return true;
-					}
-				}
-				if (obj instanceof RoleDescriptorWrapperItemProvider
-						|| obj instanceof CompositeRoleWrapperItemProvider) {
-					Object object = ((BreakdownElementWrapperItemProvider) obj)
-							.getParent(obj);
-					if (getParentActivity(element).equals(object))
-						return true;
-					if (object instanceof Activity
-							|| object instanceof ActivityWrapperItemProvider) {
-						if (object instanceof ActivityWrapperItemProvider) {
-							object = ((ActivityWrapperItemProvider) object)
-									.getValue();
-						}
-						if (getAllowableActivities().contains(object))
-							return true;
-					}
-				}
-				if (obj instanceof ActivityWrapperItemProvider) {
-					Object parent = ((BreakdownElementWrapperItemProvider) obj)
-							.getParent(obj);
-					if (getParentActivity(element).equals(parent))
-						return true;
-					Object object = ((BreakdownElementWrapperItemProvider) obj)
-							.getValue();
-					if (object instanceof Activity) {
-						List list = getAllowableActivities();
-						if (list.contains(object)){
-							//return true;
-							List belements = ((Activity)obj).getBreakdownElements();
-							if(!belements.isEmpty()){
-								if(containsType(belements, RoleDescriptor.class,getHelper()))
-								return true;
-							}
-						}
-					}
-				}
-				return false;
-			}
-		};
-	}
-	
-	
-	private List getBaseActivities(Activity activity) {
-		List list = new ArrayList();
-		while (!activity.getVariabilityType()
-				.equals(VariabilityType.NA_LITERAL)) {
-			VariabilityElement ve = activity.getVariabilityBasedOnElement();
-
-			if ((ve != null) && (ve instanceof Activity)) {
-
-				list.add(ve);
-
-				activity = (Activity) ve;
-			} else {
-				break;
-			}
-		}
-		return list;
-	}
-
-	/**
-	 * Get parent activity for breakdownelement
-	 * 
-	 * @param brElement
-	 * @return
-	 * 			Parent activity
-	 */
-	private Object getParentActivity(BreakdownElement brElement) {
-		AdapterFactory adapterFactory = TngAdapterFactory.INSTANCE
-				.getOBS_ComposedAdapterFactory();
-		ItemProviderAdapter adapter = (ItemProviderAdapter) adapterFactory
-				.adapt(brElement, ITreeItemContentProvider.class);
-		Object parent = adapter.getParent(brElement);
-		while (!(parent instanceof Activity)) {
-			brElement = (BreakdownElement) parent;
-			adapter = (ItemProviderAdapter) adapterFactory.adapt(brElement,
-					ITreeItemContentProvider.class);
-			parent = adapter.getParent(brElement);
-		}
-
-		return parent;
-	}
-
-	/**
-	 * Get all children of the activity parent recursively.
-	 * 
-	 * @param adapterFactory
-	 * @param parent
-	 * @param activityList
-	 */
-	private void getChildActivitiesInScope(AdapterFactory adapterFactory,
-			Activity parent, List activityList) {
-		ItemProviderAdapter adapter = (ItemProviderAdapter) adapterFactory
-				.adapt(parent, ITreeItemContentProvider.class);
-
-		Object o = adapter.getChildren(parent);
-		if (o instanceof List) {
-			List children = (List) o;
-		for (Iterator itor = children.iterator(); itor.hasNext();) {
-			Object obj = itor.next();
-			if (obj instanceof Activity) {
-				activityList.add(obj);
-				getChildActivitiesInScope(adapterFactory, (Activity) obj,
-						activityList);
-				}
-				if (obj instanceof ActivityWrapperItemProvider) {
-					Object o1 = ((WrapperItemProvider) obj).getValue();
-					activityList.add(o1);
-					getChildActivitiesInScope(adapterFactory, (Activity) o1,
-							activityList);
-				}
-			}
-		}
-	}
-
-	private boolean containsType(List list, Class class1, FilterHelper helper) {
-		for(Iterator iterator = list.iterator(); iterator.hasNext();){
-			Object obj = iterator.next();
-			if(obj instanceof MethodElement 
-					&& class1.isInstance(obj)
-					&& helper.matcher(obj)) 
-				return true;
-			if(obj instanceof Activity){
-				return containsType(((Activity)obj).getBreakdownElements(),
-						class1, helper);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Get all activities in scope
-	 * 
-	 * @return
-	 * 		List of activities in scope
-	 */
-	private List getAllowableActivities() {
-		List list = new ArrayList();
-		// parent activity
-		Object object = getParentActivity(element);
-		if (object instanceof Activity) {
-			AdapterFactory adapterFactory = TngAdapterFactory.INSTANCE
-					.getOBS_ComposedAdapterFactory();
-			// get all child activities in scope
-			getChildActivitiesInScope(adapterFactory, (Activity) object, list);
-		}
-		// get base activities for all activities in scope
-		HashSet baseActivties = new HashSet();
-		for (Iterator itor = list.iterator(); itor.hasNext();) {
-			Object obj = itor.next();
-			if (obj instanceof Activity) {
-				baseActivties.addAll(getBaseActivities((Activity) obj));
-			}
-		}
-
-		// return complete list of child activities and it's base activities
-		list.addAll(baseActivties);
-		return list;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/WorkBreakdownElementGeneralSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/WorkBreakdownElementGeneralSection.java
deleted file mode 100755
index a3e29f3..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/WorkBreakdownElementGeneralSection.java
+++ /dev/null
@@ -1,1167 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.WrapperItemProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.editors.ColumnDescriptor;
-import org.eclipse.epf.authoring.ui.editors.ProcessEditor;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.edit.command.IActionManager;
-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.TngUtil;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.TeamProfile;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkOrderType;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * The general tab section for WorkBreakdownElement
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class WorkBreakdownElementGeneralSection extends
-		BreakdownElementGeneralSection {
-	protected WorkBreakdownElement element;
-
-	protected Button eventDrivenButton, ongoingButton, repeatableButton;
-
-	// protected Text predecessorText;
-	protected Button addButton, editButton, removeButton;
-
-	// private SelectionListener eventDrivenButtonSelectionListener;
-	// private SelectionListener ongoingButtonSelectionListener;
-	// private SelectionListener repeatableButtonSelectionListener;
-
-	// private Listener predecessorsListener;
-
-	// private ComposedAdapterFactory adapterFactory;
-
-	private TableViewer viewer;
-
-	// private Table table;
-	private TextCellEditor textCellEditor;
-
-	private ValidatingTextCellEditor idCellEditor;
-
-	private ComboBoxCellEditor comboBoxCellEditor;
-
-	// predecessor map list
-	private List predMapList = new ArrayList();
-
-	private class ValidatingTextCellEditor extends TextCellEditor {
-		protected Object lastInvalidElement;
-
-		private int columnIndex;
-
-		/**
-		 * @param parent
-		 */
-		public ValidatingTextCellEditor(Composite parent) {
-			super(parent);
-		}
-
-		void setColumnIndex(int columnIndex) {
-			this.columnIndex = columnIndex;
-		}
-
-		public int getColumnIndex() {
-			return columnIndex;
-		}
-
-		public Object getLastInvalidElement() {
-			return lastInvalidElement;
-		}
-
-		String isValid(String txt) {
-			IStructuredSelection selection = (IStructuredSelection) viewer
-					.getSelection();
-			if (selection.size() == 1) {
-				Object e = selection.getFirstElement();
-				String msg = isValid(e, txt);
-				if (msg != null) {
-					lastInvalidElement = e;
-				} else {
-					lastInvalidElement = null;
-				}
-				return msg;
-			}
-			return null;
-		}
-
-		protected String isValid(Object e, String txt) {
-			return null;
-		}
-	}
-
-	/** Dependency Literals * */
-	private static final String FINISH_TO_START = PropertiesResources.WorkOrderType_FINISH_TO_START; //$NON-NLS-1$
-
-	private static final String FINISH_TO_FINISH = PropertiesResources.WorkOrderType_FINISH_TO_FINISH; //$NON-NLS-1$
-
-	private static final String START_TO_START = PropertiesResources.WorkOrderType_START_TO_START; //$NON-NLS-1$
-
-	private static final String START_TO_FINISH = PropertiesResources.WorkOrderType_START_TO_FINISH; //$NON-NLS-1$
-
-	/** Column ids * */
-	private static final String COL_ID = IBSItemProvider.COL_ID;
-
-	private static final String COL_PRESENTATION_NAME = IBSItemProvider.COL_PRESENTATION_NAME;
-
-	private static final String COL_DEPENDENCY = "dependency"; //$NON-NLS-1$
-
-	/** Column descriptor constants */
-	public static final ColumnDescriptor COL_DESC_ID = new ColumnDescriptor(
-			COL_ID,
-			PropertiesResources.WorkBreakdownElement_Dependency_COL_ID_TEXT, 0, 100, true, ColumnDescriptor.CELL_EDITOR_TYPE_TEXT, SWT.CENTER); //$NON-NLS-1$
-
-	public static final ColumnDescriptor COL_DESC_PRESENTATION_NAME = new ColumnDescriptor(
-			COL_PRESENTATION_NAME,
-			PropertiesResources.WorkBreakdownElement_Dependency_COL_PRESENTATION_NAME_TEXT, 1, 250, true, ColumnDescriptor.CELL_EDITOR_TYPE_NONE); //$NON-NLS-1$
-
-	public static final ColumnDescriptor COL_DESC_DEPENDENCY = new ColumnDescriptor(
-			COL_DEPENDENCY,
-			PropertiesResources.WorkBreakdownElement_Dependency_COL_DEPENDENCY_TEXT, 2, 100, true, ColumnDescriptor.CELL_EDITOR_TYPE_COMBO_BOOLEAN); //$NON-NLS-1$
-
-	ColumnDescriptor[] columnDescriptors = new ColumnDescriptor[] {
-			COL_DESC_ID, COL_DESC_PRESENTATION_NAME, COL_DESC_DEPENDENCY };
-
-	private static class CellEditorValidator implements ICellEditorValidator {
-
-		private ValidatingTextCellEditor cellEditor;
-
-		/**
-		 * 
-		 */
-		public CellEditorValidator(ValidatingTextCellEditor cellEditor) {
-			this.cellEditor = cellEditor;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ICellEditorValidator#isValid(java.lang.Object)
-		 */
-		public String isValid(Object value) {
-			return cellEditor.isValid((String) value);
-		}
-
-	}
-
-	private class ValidatingDeactivateListener implements Listener {
-		private ValidatingTextCellEditor cellEditor;
-
-		ValidatingDeactivateListener(ValidatingTextCellEditor cellEditor) {
-			this.cellEditor = cellEditor;
-		}
-
-		public void handleEvent(Event e) {
-			Display.getCurrent().asyncExec(new Runnable() {
-				public void run() {
-					// System.out.println("ValidatDeactivatee::run");
-					if (cellEditor.getLastInvalidElement() != null) {
-						String message = cellEditor.getErrorMessage();
-						String title = getEditor().getTitle();
-						String problem = PropertiesResources.ProcessEditorFormProperties_textEditCell_problem_msg; //$NON-NLS-1$
-						MsgDialog dialog = AuthoringUIPlugin.getDefault()
-								.getMsgDialog();
-						dialog.displayError(title, problem, message); //$NON-NLS-1$
-						viewer.editElement(cellEditor.getLastInvalidElement(),
-								cellEditor.getColumnIndex());
-					}
-				}
-
-			});
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementGeneralSection#init()
-	 */
-	protected void init() {
-		super.init();
-
-		// get workbreakdownelement object
-		element = (WorkBreakdownElement) getElement();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementGeneralSection#createGeneralSection(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createGeneralSection(Composite composite) {
-		super.createGeneralSection(composite);
-
-		// Event Driven
-		eventDrivenButton = FormUI.createCheckButton(toolkit, checkBoxComposite,
-				1);
-		eventDrivenButton.setText(PropertiesResources.WorkBreakdownElement_EventDriven); //$NON-NLS-1$
-
-		// Ongoing
-		ongoingButton = FormUI.createCheckButton(toolkit, checkBoxComposite,
-				1);
-		ongoingButton.setText(PropertiesResources.WorkBreakdownElement_Ongoing); //$NON-NLS-1$
-
-		// repeatable
-		repeatableButton = FormUI.createCheckButton(toolkit, checkBoxComposite,
-				2);
-		repeatableButton.setText(PropertiesResources.WorkBreakdownElement_Repeatable); //$NON-NLS-1$
-
-		// predecessors
-		// FormUI.createLabel(toolkit, generalComposite,
-		// PropertiesResources.getString("WorkBreakdownElement.Predecessors"));
-		// predecessorText = FormUI.createText(toolkit, generalComposite,
-		// SWT.DEFAULT, horizontalSpan);
-		// predecessorText.setText(getPredecessorsList());
-
-		// depenency type
-
-		FormUI.createLabel(toolkit, generalComposite, PropertiesResources.WorkBreakdownElement_Dependency); //$NON-NLS-1$
-
-		try {
-			// create viewer
-			createViewer(generalComposite, 2);
-		} catch (Exception ex) {
-			logger
-					.logError(
-							"Error creating viewer for workbreakdown element general section: ", ex); //$NON-NLS-1$
-		}
-
-		// create button pane
-		Composite buttonPane = toolkit.createComposite(generalComposite);
-		buttonPane.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-		buttonPane.setLayout(new GridLayout());
-
-		FormUI.createLabel(toolkit, buttonPane, ""); //$NON-NLS-1$
-		addButton = FormUI.createButton(toolkit, buttonPane,
-				PropertiesResources.WorkBreakdownElement_Dependency_Add); //$NON-NLS-1$
-		editButton = FormUI.createButton(toolkit, buttonPane,
-				PropertiesResources.WorkBreakdownElement_Dependency_Edit); //$NON-NLS-1$
-		removeButton = FormUI.createButton(toolkit, buttonPane,
-				PropertiesResources.WorkBreakdownElement_Dependency_Remove); //$NON-NLS-1$
-		editButton.setEnabled(false);
-		removeButton.setEnabled(false);
-	}
-
-	protected void addListeners() {
-		super.addListeners();
-
-		eventDrivenButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				element = (WorkBreakdownElement) getElement();
-				boolean status = actionMgr.doAction(IActionManager.SET,
-						element, UmaPackage.eINSTANCE
-								.getWorkBreakdownElement_IsEventDriven(),
-						Boolean.valueOf(eventDrivenButton.getSelection()), -1);
-				if (!status)
-					eventDrivenButton.setSelection(element.getIsEventDriven()
-							.booleanValue());
-
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		ongoingButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				element = (WorkBreakdownElement) getElement();
-				boolean status = actionMgr.doAction(IActionManager.SET,
-						element, UmaPackage.eINSTANCE
-								.getWorkBreakdownElement_IsOngoing(), Boolean
-								.valueOf(ongoingButton.getSelection()), -1);
-				if (!status)
-					ongoingButton.setSelection(element.getIsOngoing()
-							.booleanValue());
-
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		repeatableButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				element = (WorkBreakdownElement) getElement();
-				boolean status = actionMgr.doAction(IActionManager.SET,
-						element, UmaPackage.eINSTANCE
-								.getWorkBreakdownElement_IsRepeatable(),
-						Boolean.valueOf(repeatableButton.getSelection()), -1);
-				if (!status)
-					repeatableButton.setSelection(element.getIsRepeatable()
-							.booleanValue());
-
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		addButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				// List predList = element.getLinkToPredecessor();
-				WorkOrder o = UmaFactory.eINSTANCE.createWorkOrder();
-				o.setLinkType(WorkOrderType.FINISH_TO_START_LITERAL);
-
-				// predList.add(o);
-
-				PredecessorMap map = new PredecessorMap(-1, (WorkOrder) o);
-				predMapList.add(map);
-
-				viewer.refresh();
-				viewer.editElement(map, 0);
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		editButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				// get selection
-				IStructuredSelection selection = (IStructuredSelection) viewer
-						.getSelection();
-				if (selection.size() > 0) {
-					PredecessorMap predMap = (PredecessorMap) selection
-							.getFirstElement();
-					IBSItemProvider adapter = (IBSItemProvider) getBSAdapter();
-					Object process = adapter.getTopItem();
-
-					PredecessorDialog dlg = new PredecessorDialog(PlatformUI
-							.getWorkbench().getActiveWorkbenchWindow()
-							.getShell(), element, process, getAdapterFactory(),
-							predMap, predMapList, actionMgr);
-					dlg.open();
-
-					viewer.refresh();
-
-				}
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		removeButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) viewer
-						.getSelection();
-				if (selection.size() > 0) {
-					PredecessorMap map = (PredecessorMap) selection
-							.getFirstElement();
-					predMapList.remove(map);
-
-					WorkOrder wo = map.getWorkOrder();
-					WorkBreakdownElement wbe = (WorkBreakdownElement) getElement();
-					actionMgr
-							.doAction(
-									IActionManager.REMOVE,
-									wbe,
-									UmaPackage.eINSTANCE
-											.getWorkBreakdownElement_LinkToPredecessor(),
-									wo, -1);
-					viewer.refresh();
-
-				}
-
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection) viewer
-						.getSelection();
-				if (selection.size() == 1 && editable) {
-					removeButton.setEnabled(true);
-					editButton.setEnabled(true);
-				}
-			}
-		});
-
-	}
-
-	/**
-	 * Returns comma separated list of predecessors
-	 * 
-	 * @return
-	 */
-	// private String getPredecessorsList()
-	// {
-	// IBSItemProvider adapter = (IBSItemProvider) getBSAdapter();
-	// return adapter.getAttribute(element, IBSItemProvider.COL_PREDECESSORS);
-	// }
-	// protected void addListeners()
-	// {
-	// super.addListeners();
-	//		
-	// eventDrivenButton.addSelectionListener(eventDrivenButtonSelectionListener);
-	// ongoingButton.addSelectionListener(ongoingButtonSelectionListener);
-	// repeatableButton.addSelectionListener(repeatableButtonSelectionListener);
-	// //predecessorText.addListener(SWT.Deactivate, predecessorsListener);
-	// }
-	//	
-	// protected void removeListeners()
-	// {
-	// super.removeListeners();
-	//			
-	// eventDrivenButton.removeSelectionListener(eventDrivenButtonSelectionListener);
-	// ongoingButton.removeSelectionListener(ongoingButtonSelectionListener);
-	// repeatableButton.removeSelectionListener(repeatableButtonSelectionListener);
-	// //predecessorText.removeListener(SWT.Deactivate, predecessorsListener);
-	// }
-	protected void updateControls() {
-		super.updateControls();
-		eventDrivenButton.setEnabled(editable);
-		ongoingButton.setEnabled(editable);
-		repeatableButton.setEnabled(editable);
-		viewer.getTable().setEnabled(editable);
-		addButton.setEnabled(editable);
-
-		IStructuredSelection selection = (IStructuredSelection) viewer
-				.getSelection();
-		if (selection.size() == 1 && editable) {
-			removeButton.setEnabled(editable);
-			editButton.setEnabled(editable);
-		} else {
-			removeButton.setEnabled(false);
-			editButton.setEnabled(false);
-		}
-
-//		if ((EPFPropertySheetPage.formPageID
-//				.equals(ProcessEditor.TA_FORM_ID))
-//				|| (EPFPropertySheetPage.formPageID
-//						.equals(ProcessEditor.WPBS_FORM_ID))) {
-		if (!(EPFPropertySheetPage.formPageID.equals(ProcessEditor.WBS_FORM_ID) || EPFPropertySheetPage.formPageID
-				.equals(ProcessEditor.CONSOLIDATED_FORM_ID))) {
-			addButton.setEnabled(false);
-			removeButton.setEnabled(false);
-			editButton.setEnabled(false);
-			viewer.getTable().setEnabled(false);
-		}
-	}
-
-	
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementGeneralSection#refresh()
-	 */
-	public void refresh() {
-		try {
-			if (getElement() instanceof WorkBreakdownElement) {
-				super.refresh();
-				element = (WorkBreakdownElement) getElement();
-
-				eventDrivenButton.setSelection(element.getIsEventDriven()
-						.booleanValue());
-				ongoingButton.setSelection(element.getIsOngoing()
-						.booleanValue());
-				repeatableButton.setSelection(element.getIsRepeatable()
-						.booleanValue());
-				// predecessorText.setText(getPredecessorsList());
-
-				// re-initialize predList
-				predMapList = new ArrayList();
-				initializePredList();
-				viewer.refresh();
-			}
-
-		} catch (Exception ex) {
-			logger
-					.logError(
-							"Error refreshing Workbreakdown element general section:", ex); //$NON-NLS-1$
-		}
-	}
-
-	private void createViewer(Composite parent, int horizontalSpan) {
-		// create process viewer
-		viewer = new TableViewer(parent, SWT.SINGLE | SWT.H_SCROLL
-				| SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);
-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData.verticalIndent = 10;
-		gridData.heightHint = 50;
-		gridData.horizontalSpan = horizontalSpan;
-		viewer.getControl().setLayoutData(gridData);
-
-		// set up columns
-		String[] colProps = new String[columnDescriptors.length];
-		for (int i = 0; i < columnDescriptors.length; i++) {
-			colProps[i] = columnDescriptors[i].id;
-			TableColumn column = new TableColumn(viewer.getTable(),
-					columnDescriptors[i].alignment);
-			column.setText(columnDescriptors[i].label);
-			column.setResizable(columnDescriptors[i].resizable);
-			column.setWidth(columnDescriptors[i].width);
-
-		}
-		viewer.getTable().setHeaderVisible(true);
-		viewer.setColumnProperties(colProps);
-
-		// table = viewer.getTable();
-
-		// final TableCursor cursor = new TableCursor(table, SWT.NONE);
-		// final ControlEditor editor = new ControlEditor(cursor);
-		// editor.grabHorizontal = true;
-		// editor.grabVertical = true;
-
-		// final TableCursor cursor = new TableCursor(table, SWT.NONE);
-		// // create an editor to edit the cell when the user hits "ENTER"
-		// // while over a cell in the table
-		// final ControlEditor editor = new ControlEditor(cursor);
-		// editor.grabHorizontal = true;
-		// editor.grabVertical = true;
-		//
-		// cursor.addSelectionListener(new SelectionAdapter() {
-		// // when the TableEditor is over a cell, select the corresponding row
-		// in
-		// // the table
-		// public void widgetSelected(SelectionEvent e) {
-		// table.setSelection(new TableItem[] { cursor.getRow()});
-		// }
-		// // when the user hits "ENTER" in the TableCursor, pop up a text
-		// editor so that
-		// // they can change the text of the cell
-		// public void widgetDefaultSelected(SelectionEvent e) {
-		// final Text text = new Text(cursor, SWT.NONE);
-		// TableItem row = cursor.getRow();
-		// int column = cursor.getColumn();
-		// text.setText(row.getText(column));
-		// text.addKeyListener(new KeyAdapter() {
-		// public void keyPressed(KeyEvent e) {
-		// // close the text editor and copy the data over
-		// // when the user hits "ENTER"
-		// if (e.character == SWT.CR) {
-		// TableItem row = cursor.getRow();
-		// int column = cursor.getColumn();
-		// if (column == 1) return;
-		// row.setText(column, text.getText());
-		// text.dispose();
-		// }
-		// // close the text editor when the user hits "ESC"
-		// if (e.character == SWT.ESC) {
-		// text.dispose();
-		// }
-		// }
-		// });
-		// editor.setEditor(text);
-		// text.setFocus();
-		// }
-		// });
-		// // Hide the TableCursor when the user hits the "CTRL" or "SHIFT" key.
-		// // This alows the user to select multiple items in the table.
-		// cursor.addKeyListener(new KeyAdapter() {
-		// public void keyPressed(KeyEvent e) {
-		// if (e.keyCode == SWT.CTRL
-		// || e.keyCode == SWT.SHIFT
-		// || (e.stateMask & SWT.CONTROL) != 0
-		// || (e.stateMask & SWT.SHIFT) != 0) {
-		// cursor.setVisible(false);
-		// }
-		// }
-		// });
-		// // Show the TableCursor when the user releases the "SHIFT" or "CTRL"
-		// key.
-		// // This signals the end of the multiple selection task.
-		// table.addKeyListener(new KeyAdapter() {
-		// public void keyReleased(KeyEvent e) {
-		// if (e.keyCode == SWT.CONTROL && (e.stateMask & SWT.SHIFT) != 0)
-		// return;
-		// if (e.keyCode == SWT.SHIFT && (e.stateMask & SWT.CONTROL) != 0)
-		// return;
-		// if (e.keyCode != SWT.CONTROL
-		// && (e.stateMask & SWT.CONTROL) != 0)
-		// return;
-		// if (e.keyCode != SWT.SHIFT && (e.stateMask & SWT.SHIFT) != 0)
-		// return;
-		//
-		// TableItem[] selection = table.getSelection();
-		// TableItem row = (selection.length == 0) ?
-		// table.getItem(table.getTopIndex()) : selection[0];
-		// table.showItem(row);
-		// cursor.setSelection(row, 0);
-		// cursor.setVisible(true);
-		// cursor.setFocus();
-		// }
-		// });
-
-		IStructuredContentProvider contentProvider = new AdapterFactoryContentProvider(
-				getAdapterFactory()) {
-			public Object[] getElements(Object obj) {
-				// System.out.println("PredMapList::"+predMapList);
-				if (obj instanceof List) {
-					return ((List) predMapList).toArray();
-				}
-				return null;
-			}
-		};
-
-		viewer.setContentProvider(contentProvider);
-		ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-				getAdapterFactory()) {
-			public String getColumnText(Object obj, int i) {
-				// System.out.println("WorkBreakdownElementGeneralSection::labelProvider
-				// Object- " + obj);
-				if (obj instanceof PredecessorMap) {
-					int id = ((PredecessorMap) obj).getId();
-					WorkOrder wo = ((PredecessorMap) obj).getWorkOrder();
-
-					if (i == 0) {
-						return String.valueOf(id);
-					}
-					if (i == 1) {
-						String name = ""; //$NON-NLS-1$
-						if (wo.getPred() != null) {
-							name = wo.getPred().getPresentationName();
-							if (StrUtil.isBlank(name)) {
-								return wo.getPred().getName();
-							}
-						}
-						return name;
-					}
-					if (i == 2) {
-						if (wo.getLinkType().getValue() == WorkOrderType.FINISH_TO_FINISH)
-							return FINISH_TO_FINISH;
-						else if (wo.getLinkType().getValue() == WorkOrderType.FINISH_TO_START)
-							return FINISH_TO_START;
-						else if (wo.getLinkType().getValue() == WorkOrderType.START_TO_START)
-							return START_TO_START;
-						else if (wo.getLinkType().getValue() == WorkOrderType.START_TO_FINISH)
-							return START_TO_FINISH;
-						return wo.getLinkType().getName();
-					}
-				}
-				return ""; //$NON-NLS-1$
-			}
-		};
-
-		viewer.setLabelProvider(labelProvider);
-
-		textCellEditor = new TextCellEditor(viewer.getTable());
-		comboBoxCellEditor = new ComboBoxCellEditor(viewer.getTable(),
-				new String[] { FINISH_TO_START, FINISH_TO_FINISH,
-						START_TO_START, START_TO_FINISH });
-
-		setCellEditors();
-		setCellModifiers();
-
-		initializePredList();
-		viewer.setInput(predMapList);
-		viewer.refresh();
-
-	}
-
-	private int getCellEditorType(String property) {
-		for (int i = 0; i < columnDescriptors.length; i++) {
-			ColumnDescriptor desc = columnDescriptors[i];
-			if (desc.id == property) {
-				return desc.cellEditorType;
-			}
-		}
-		return ColumnDescriptor.CELL_EDITOR_TYPE_NONE;
-	}
-
-	public CellEditor getCellEditor(String columnID, int columnIndex) {
-		if (columnID == COL_ID) {
-			if (idCellEditor == null) {
-				idCellEditor = new ValidatingTextCellEditor(viewer.getTable()) {
-					protected String isValid(Object e, String txt) {
-						// System.out.println("ValidatingTextCellEditor::isValid");
-						e = TngUtil.unwrap(e);
-
-						IBSItemProvider adapter = (IBSItemProvider) getBSAdapter();
-						Object process = adapter.getTopItem();
-
-						List predecessors = new ArrayList();
-						WorkBreakdownElement wbe = (WorkBreakdownElement) getElement();
-						String str = getPredId();
-						String result = ProcessUtil
-								.checkPredecessorList(wbe, str,
-										getAdapterFactory(), process,
-										predecessors);
-
-						return result;
-					}
-				};
-
-				idCellEditor
-						.setValidator(new CellEditorValidator(idCellEditor));
-				idCellEditor.getControl().addListener(SWT.Deactivate,
-						new ValidatingDeactivateListener(idCellEditor));
-			}
-			idCellEditor.setColumnIndex(columnIndex);
-
-			return idCellEditor;
-		}
-
-		return null;
-	}
-
-	private void setCellEditors() {
-		CellEditor[] cellEditors = new CellEditor[columnDescriptors.length];
-		for (int i = 0; i < columnDescriptors.length; i++) {
-			CellEditor cellEditor = getCellEditor(columnDescriptors[i].id, i);
-			if (cellEditor != null) {
-				cellEditors[i] = cellEditor;
-			} else {
-				switch (columnDescriptors[i].cellEditorType) {
-				case ColumnDescriptor.CELL_EDITOR_TYPE_TEXT:
-					cellEditors[i] = textCellEditor;
-					break;
-				case ColumnDescriptor.CELL_EDITOR_TYPE_COMBO_BOOLEAN:
-					cellEditors[i] = comboBoxCellEditor;
-					break;
-				default:
-					cellEditors[i] = null;
-				}
-			}
-		}
-		viewer.setCellEditors(cellEditors);
-	}
-
-	private void setCellModifiers() {
-		// Set the cell modifier
-		viewer.setCellModifier(new ICellModifier() {
-			public boolean canModify(Object element, String property) {
-				// System.out.println("canModify: element="+element+",
-				// property="+property);
-				if (!(element instanceof PredecessorMap))
-					return false;
-				if (property == COL_PRESENTATION_NAME) {
-					return false;
-				}
-
-				return true;
-			}
-
-			public Object getValue(Object element, String property) {
-				// System.out.println("getValue: element="+element+",
-				// property="+property);
-
-				String val = null;
-				switch (getCellEditorType(property)) {
-				case ColumnDescriptor.CELL_EDITOR_TYPE_TEXT:
-					val = new Integer(((PredecessorMap) element).getId())
-							.toString();
-					return val;
-				case ColumnDescriptor.CELL_EDITOR_TYPE_COMBO_BOOLEAN:
-					int value = (((PredecessorMap) element).getWorkOrder())
-							.getLinkType().getValue();
-					if (WorkOrderType.FINISH_TO_START == value) {
-						return new Integer(0);
-					} else if (WorkOrderType.FINISH_TO_FINISH == value) {
-						return new Integer(1);
-					} else if (WorkOrderType.START_TO_START == value) {
-						return new Integer(2);
-					} else
-						return new Integer(3);
-
-				default:
-					return ""; //$NON-NLS-1$
-				}
-			}
-
-			public void modify(final Object element, String property,
-					Object value) {
-				// System.out.println("modify: element="+element+",
-				// property="+property+", value="+value);
-				TableItem item = (TableItem) element;
-				PredecessorMap predMap = (PredecessorMap) item.getData();
-				WorkOrder wo = predMap.getWorkOrder();
-
-				if (property.equals(COL_ID)) {
-					item.setText(0, value.toString());
-
-					int predId;
-					try {
-						predId = new Integer(value.toString()).intValue();
-						if (predId < 0)
-							throw new Exception();
-					} catch (Exception e) {
-						AuthoringUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayWarning(
-										PropertiesResources.Process_predecessors_validNumberTitle, //$NON-NLS-1$
-										PropertiesResources.Process_predecessors_validNumberMessage); //$NON-NLS-1$
-						predMapList.remove(predMap);
-						viewer.refresh();
-						return;
-					}
-					predMap.setId(predId);
-				}
-
-				final int columnIndex = getColumnIndex(property);
-				CellEditor cellEditor = viewer.getCellEditors()[columnIndex];
-				String errMsg = cellEditor.getErrorMessage();
-				if (errMsg != null) {
-					return;
-				}
-
-				WorkOrderType type;
-				switch (getCellEditorType(property)) {
-				case ColumnDescriptor.CELL_EDITOR_TYPE_TEXT:
-
-					IBSItemProvider adapter = (IBSItemProvider) getBSAdapter();
-					Object process = adapter.getTopItem();
-
-					List predecessors = new ArrayList();
-					WorkBreakdownElement wbe = (WorkBreakdownElement) getElement();
-					String str = getPredId();
-					String result = ProcessUtil.checkPredecessorList(wbe, str,
-							getAdapterFactory(), process, predecessors);
-
-					if (result == null) {
-						WorkOrder o = null;
-						int size = wbe.getLinkToPredecessor().size();
-						for (Iterator iter = wbe.getLinkToPredecessor()
-								.iterator(); iter.hasNext();) {
-							o = (WorkOrder) iter.next();
-							int id = predecessors.indexOf(o.getPred());
-							if (id == -1) {
-								iter.remove();
-							}
-						}
-
-						size = predecessors.size();
-						for (int i = 0; i < size; i++) {
-							WorkBreakdownElement e = (WorkBreakdownElement) predecessors
-									.get(i);
-							boolean found = false;
-							find_pred: for (Iterator iterator = wbe
-									.getLinkToPredecessor().iterator(); iterator
-									.hasNext();) {
-								o = (WorkOrder) iterator.next();
-								if (o.getPred() == e) {
-									found = true;
-									break find_pred;
-								}
-							}
-							if (!found) {
-								o = UmaFactory.eINSTANCE.createWorkOrder();
-								o.setPred(e);
-								o
-										.setLinkType(WorkOrderType.FINISH_TO_START_LITERAL);
-								boolean status = actionMgr
-										.doAction(
-												IActionManager.ADD,
-												wbe,
-												UmaPackage.eINSTANCE
-														.getWorkBreakdownElement_LinkToPredecessor(),
-												o, -1);
-								if (status) {
-									predMap.setWorkOrder(o);
-
-								} else {
-									predMapList.remove(predMap);
-								}
-							}
-						}
-					} else {
-						// show error message box
-						String title = getEditor().getTitle();
-						String problem = PropertiesResources.ProcessEditorFormProperties_cellEditor_invalidPredcessor_problem_msg; //$NON-NLS-1$
-						MsgDialog dialog = AuthoringUIPlugin.getDefault()
-								.getMsgDialog();
-						dialog.displayWarning(title, problem, result); //$NON-NLS-1$
-						predMapList.remove(predMap);
-					}
-
-					break;
-				case ColumnDescriptor.CELL_EDITOR_TYPE_COMBO_BOOLEAN:
-					int index = ((Number) value).intValue();
-					if (index == 0) {
-						type = WorkOrderType.FINISH_TO_START_LITERAL;
-					} else if (index == 1) {
-						type = WorkOrderType.FINISH_TO_FINISH_LITERAL;
-					} else if (index == 2) {
-						type = WorkOrderType.START_TO_START_LITERAL;
-					} else {
-						type = WorkOrderType.START_TO_FINISH_LITERAL;
-					}
-
-					// set workproduct type
-					// System.out.println("type -"+type);
-					actionMgr.doAction(IActionManager.SET, wo,
-							UmaPackage.eINSTANCE.getWorkOrder_LinkType(), type,
-							-1);
-					break;
-
-				default:
-					type = WorkOrderType.FINISH_TO_FINISH_LITERAL;
-				}
-
-				viewer.refresh();
-			}
-		});
-
-	}
-
-	/**
-	 * This method returns list of item providers for predecessors
-	 * 
-	 * @return
-	 */
-	// private Object getPredItemProviders()
-	// {
-	// IBSItemProvider adapter = (IBSItemProvider) getBSAdapter();
-	// if (adapter != null)
-	// return adapter.getPredecessors();
-	//    	
-	// return null;
-	// }
-	private ItemProviderAdapter getBSAdapter() {
-		try {
-			AdapterFactory factory = getAdapterFactory();// TngAdapterFactory.INSTANCE.getProcessComposedAdapterFactory();
-
-			element = (WorkBreakdownElement) getElement();
-
-			ItemProviderAdapter provider = (ItemProviderAdapter) factory.adapt(
-					element, ITreeItemContentProvider.class);
-			return provider;
-		} catch (Exception ex) {
-			return null;
-		}
-
-	}
-
-	/**
-	 * Return column index for property
-	 * 
-	 * @param property
-	 * @return
-	 */
-	private int getColumnIndex(String property) {
-		Object[] colProps = viewer.getColumnProperties();
-		for (int i = 0; i < colProps.length; i++) {
-			if (colProps[i] == property)
-				return i;
-		}
-		return -1;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.AbstractSection#getNamePrefix()
-	 */
-	public String getNamePrefix() {
-		if (element instanceof TeamProfile) {
-			return LibraryUIText.TEXT_TEAM_PROFILE + ": "; //$NON-NLS-1$
-		} else if (element instanceof Milestone) {
-			return LibraryUIText.TEXT_MILESTONE + ": "; //$NON-NLS-1$
-		}
-		return LibraryUIText.TEXT_WORK_PRODUCT_ELEMENT + ": "; //$NON-NLS-1$
-	}
-
-	private String getPredId() {
-		StringBuffer buf = new StringBuffer();
-
-		for (Iterator itor = predMapList.iterator(); itor.hasNext();) {
-			PredecessorMap map = (PredecessorMap) itor.next();
-			buf.append(map.getId());
-			buf.append(","); //$NON-NLS-1$
-		}
-		return buf.toString();
-	}
-
-	/**
-	 * Initialize pred list
-	 * 
-	 */
-	private void initializePredList() {
-		try {
-			List predProviders = null;
-
-			// get work breakdown element
-			element = (WorkBreakdownElement) getElement();
-
-			// get predecessor item providers
-			AdapterFactory factory = getAdapterFactory();
-
-			if (factory != null) {
-				ItemProviderAdapter provider = (ItemProviderAdapter) factory
-						.adapt(element, ITreeItemContentProvider.class);
-				if (provider instanceof IBSItemProvider) {
-					predProviders = ((IBSItemProvider) provider)
-							.getPredecessors();
-				}
-			}
-
-			// need following for special case (WrapperItemProviders).
-			ISelection selection = getSelection();
-			if (selection instanceof IStructuredSelection) {
-				Object input = ((IStructuredSelection) selection)
-						.getFirstElement();
-				if (input instanceof BreakdownElementWrapperItemProvider) {
-					predProviders = ((BreakdownElementWrapperItemProvider) input)
-							.getPredecessors();
-				}
-			}
-
-			// get link to predecessors
-			if ((element != null) && (predProviders != null)) {
-				List predList = element.getLinkToPredecessor();
-				for (Iterator itemIterator = predProviders.iterator(); itemIterator
-						.hasNext();) {
-					boolean found = false;
-					Object itemObj = (Object) itemIterator.next();
-					Object targetObj = null;
-					if (itemObj instanceof WrapperItemProvider) {
-						targetObj = ((WrapperItemProvider) itemObj).getValue();
-					}
-					if (itemObj instanceof ItemProviderAdapter) {
-						targetObj = ((ItemProviderAdapter) itemObj).getTarget();
-					}
-					if (targetObj != null) {
-						int id = ((IBSItemProvider) itemObj).getId();
-						found = addPredecessor(predList, id, targetObj);
-
-						if ((!found)
-								&& (targetObj instanceof VariabilityElement)) {
-							VariabilityElement ve = (VariabilityElement) targetObj;
-							if (ve.getVariabilityBasedOnElement() != null) {
-								VariabilityElement el = ve
-										.getVariabilityBasedOnElement();
-								targetObj = el;
-
-								// add base variability object
-								addPredecessor(predList, id, targetObj);
-							}
-						}
-					}
-				}
-
-				// for (Iterator itor=predList.iterator(); itor.hasNext();)
-				// {
-				// boolean found = false;
-				// Object o = (Object) itor.next();
-				// if (o instanceof WorkOrder)
-				// {
-				// //System.out.println("getElement::WorkOrder = "+ ((WorkOrder)
-				// o).getPred());
-				// WorkBreakdownElement wbe = ((WorkOrder) o).getPred();
-				// if (wbe != null)
-				// {
-				// for (Iterator itemIterator=predProviders.iterator();
-				// itemIterator.hasNext();)
-				// {
-				// Object itemObj = (Object) itemIterator.next();
-				// Object targetObj = null;
-				// if (itemObj instanceof WrapperItemProvider)
-				// {
-				// targetObj = ((WrapperItemProvider) itemObj).getValue();
-				// }
-				// if (itemObj instanceof ItemProviderAdapter)
-				// {
-				// targetObj = ((ItemProviderAdapter)itemObj).getTarget();
-				// }
-				// if (targetObj != null)
-				// {
-				// if (targetObj.equals(wbe))
-				// {
-				// // create mapObjectList
-				// int id = ((IBSItemProvider) itemObj).getId();
-				// PredecessorMap map = new PredecessorMap(id, (WorkOrder) o);
-				// predMapList.add(map);
-				//		
-				// found=true;
-				// break;
-				// }
-				// }
-				// }
-				// if (!found)
-				// {
-				// // if provider is not found, then add with id=0
-				// // do it only for TeamAllocation and WorkProductUsage view
-				// // if
-				// ((EPFPropertySheetPage.formPageID.equals(ProcessFormEditor.TA_FORM_ID))
-				// ||
-				// //
-				// (EPFPropertySheetPage.formPageID.equals(ProcessFormEditor.WPBS_FORM_ID)))
-				// {
-				// PredecessorMap map = new PredecessorMap(0, (WorkOrder) o);
-				// predMapList.add(map);
-				// }
-				// }
-				// }
-				// }
-				// }
-			}
-		} catch (Exception e) {
-			logger.logError("Initializing Predecessor List", e); //$NON-NLS-1$
-		}
-	}
-
-	private boolean addPredecessor(List predList, int id, Object targetObj) {
-		for (Iterator itor = predList.iterator(); itor.hasNext();) {
-			Object o = (Object) itor.next();
-			if (o instanceof WorkOrder) {
-				// System.out.println("getElement::WorkOrder = "+ ((WorkOrder)
-				// o).getPred());
-				WorkBreakdownElement wbe = ((WorkOrder) o).getPred();
-
-				if (targetObj.equals(wbe)) {
-					// create mapObjectList
-					PredecessorMap map = new PredecessorMap(id, (WorkOrder) o);
-					predMapList.add(map);
-
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/WorkProductDescriptorGeneralSection.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/WorkProductDescriptorGeneralSection.java
deleted file mode 100755
index 0a4956f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/WorkProductDescriptorGeneralSection.java
+++ /dev/null
@@ -1,856 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.properties;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.dialogs.ItemsFilterDialog;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor.ModifyListener;
-import org.eclipse.epf.authoring.ui.filters.DescriptorProcessFilter;
-import org.eclipse.epf.authoring.ui.filters.ProcessSpecificWorkProductFilter;
-import org.eclipse.epf.authoring.ui.filters.ProcessWorkProductFilter;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.command.AssignWPToDeliverable;
-import org.eclipse.epf.library.edit.process.command.LinkMethodElementCommand;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Artifact;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.Deliverable;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-
-/**
- * The general tab section for Work Product Descriptor
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- * 
- */
-public class WorkProductDescriptorGeneralSection extends
-		DescriptorGeneralSection {
-	protected WorkProductDescriptor element;
-
-	private Text ctrl_method_element;
-
-	private Text ctrl_workProduct_type;
-
-	private Text activityEntryState, activityExitState;
-
-	private Button linkButton;
-
-
-	private Table ctrl_table_1;
-
-	private TableViewer viewer_1;
-
-	private Button ctrl_add_1, ctrl_add_proc_1, ctrl_remove_1;
-
-	private Section deliverableSection;
-
-	private ModifyListener wpModelModifyListener;
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.DescriptorGeneralSection#init()
-	 */
-	protected void init() {
-		super.init();
-		// get WorkProductDescriptor object
-		element = (WorkProductDescriptor) getElement();
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementGeneralSection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-		super.createControls(parent, tabbedPropertySheetPage);
-
-	}
-
-	private void toggleSection() {
-		if (!(element.getWorkProduct() instanceof Deliverable)) {
-			if (deliverableSection.isExpanded())
-				deliverableSection.setExpanded(false);
-			if (deliverableSection.isVisible())
-				deliverableSection.setVisible(false);
-		} else {
-			if (!deliverableSection.isExpanded())
-				deliverableSection.setExpanded(true);
-			if (!deliverableSection.isVisible())
-				deliverableSection.setVisible(true);
-		}
-	}
-
-	private void createDeliverableSection(Composite composite) {
-		String sectionTitle = PropertiesResources.WPDescriptor_DeliverablePart_SectionTitle; //$NON-NLS-1$
-		String sectionDesc = PropertiesResources.WPDescriptor_DeliverablePart_SectionDescription; //$NON-NLS-1$
-		String tableTitle = PropertiesResources.WPDescriptor_DeliverablePart_Table1; //$NON-NLS-1$
-
-		Section section = FormUI.createSection(toolkit, composite,
-				sectionTitle, sectionDesc);
-
-		// create composite
-		Composite sectionComposite = FormUI.createComposite(toolkit, section,
-				2, false);
-
-		Composite pane1 = FormUI.createComposite(toolkit, sectionComposite,
-				GridData.FILL_BOTH);
-		FormUI.createLabel(toolkit, pane1, tableTitle);
-
-		int tableHeight = 80;
-		ctrl_table_1 = FormUI.createTable(toolkit, pane1, tableHeight);
-		viewer_1 = new TableViewer(ctrl_table_1);
-		IStructuredContentProvider contentProvider = new AdapterFactoryContentProvider(
-				getAdapterFactory()) {
-			public Object[] getElements(Object object) {
-				List newList = new ArrayList();
-				List deliverableParts = element.getDeliverableParts();
-				for (Iterator itor = deliverableParts.iterator(); itor
-						.hasNext();) {
-					WorkProductDescriptor wpDesc = (WorkProductDescriptor) itor
-							.next();
-					if (wpDesc.getSuperActivities() == null
-							|| wpDesc.getSuperActivities() == null)
-						newList.add(wpDesc);
-				}
-				return getFilteredList(newList).toArray();
-			}
-		};
-
-		ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-				TngAdapterFactory.INSTANCE.getPBS_ComposedAdapterFactory());
-		viewer_1.setContentProvider(contentProvider);
-		viewer_1.setLabelProvider(labelProvider);
-		viewer_1.setInput(element);
-
-		// create buttons for table2
-		Composite pane2 = FormUI.createComposite(toolkit, sectionComposite,
-				GridData.VERTICAL_ALIGN_CENTER
-						| GridData.HORIZONTAL_ALIGN_CENTER);
-
-		ctrl_add_1 = FormUI.createButton(toolkit, pane2, PropertiesResources.Process_Add); //$NON-NLS-1$
-		ctrl_add_proc_1 = FormUI.createButton(toolkit, pane2,
-				PropertiesResources.Process_AddFromProcess); 
-		ctrl_remove_1 = FormUI.createButton(toolkit, pane2, PropertiesResources.Process_Remove); //$NON-NLS-1$
-
-		toolkit.paintBordersFor(pane1);
-
-		deliverableSection = section;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.BreakdownElementGeneralSection#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-
-		// if (labelProvider != null)
-		// {
-		// labelProvider.dispose();
-		// }
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.DescriptorGeneralSection#createGeneralSection(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createGeneralSection(Composite composite) {
-		super.createGeneralSection(composite);
-
-		// method element
-		FormUI.createLabel(toolkit, generalComposite, PropertiesResources.Process_Type_WorkProduct); //$NON-NLS-1$
-		ctrl_method_element = FormUI.createText(toolkit, generalComposite,
-				SWT.DEFAULT, 1);
-		ctrl_method_element.setText(getMethodElementName(element));
-		ctrl_method_element.setEnabled(false);
-
-		linkButton = FormUI
-				.createButton(toolkit, generalComposite, SWT.PUSH, 1);
-		linkButton.setText(PropertiesResources.Process_Button_LinkMethodElement); //$NON-NLS-1$
-
-		FormUI.createLabel(toolkit, generalComposite, "", 1); //$NON-NLS-1$
-
-		// type
-		FormUI.createLabel(toolkit, generalComposite, PropertiesResources.WorkProduct_Type); //$NON-NLS-1$
-		ctrl_workProduct_type = FormUI.createText(toolkit, generalComposite,
-				SWT.DEFAULT, horizontalSpan);
-		ctrl_workProduct_type.setText(getMethodElementType(element));
-		ctrl_workProduct_type.setEnabled(false);
-
-		// activityEntrystate
-		FormUI.createLabel(toolkit, generalComposite, PropertiesResources.WorkProductDescriptor_ActivityEntryState); //$NON-NLS-1$
-		activityEntryState = FormUI.createText(toolkit, generalComposite,
-				SWT.DEFAULT, horizontalSpan);
-
-		// activityExitstate
-		FormUI.createLabel(toolkit, generalComposite, PropertiesResources.WorkProductDescriptor_ActivityExitState); //$NON-NLS-1$
-		activityExitState = FormUI.createText(toolkit, generalComposite,
-				SWT.DEFAULT, horizontalSpan);
-
-		// CREATE DELIVERABLE SECTION
-		createDeliverableSection(composite);
-		toggleSection();
-
-	}
-
-	private String getMethodElementName(WorkProductDescriptor element) {
-		String str = PropertiesResources.Process_None; 
-		if (element.getWorkProduct() != null) {
-			str = element.getWorkProduct().getName();
-		}
-
-		return str;
-	}
-
-	private String getMethodElementType(WorkProductDescriptor element) {
-		String str = PropertiesResources.Process_None; 
-		if (element.getWorkProduct() != null) {
-			str = element.getWorkProduct().getType().getName();
-		}
-
-		return str;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.DescriptorGeneralSection#addListeners()
-	 */
-	protected void addListeners() {
-		super.addListeners();
-
-		activityEntryState.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getWorkProductDescriptor_ActivityEntryState());
-			}
-		
-			public void focusLost(FocusEvent e) {
-				WorkProductDescriptor element = (WorkProductDescriptor) getElement();
-				String oldContent = element.getActivityEntryState();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						activityEntryState, oldContent)) {
-					return;
-				}
-				String newContent = StrUtil.getPlainText(activityEntryState
-						.getText());
-				if (!newContent.equals(oldContent)) {
-					boolean status = actionMgr
-							.doAction(
-									IActionManager.SET,
-									element,
-									UmaPackage.eINSTANCE
-											.getWorkProductDescriptor_ActivityEntryState(),
-									newContent, -1);
-					if (status) {
-						activityEntryState.setText(newContent);
-					}
-				}
-			}
-		});
-
-		activityExitState.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				((MethodElementEditor) getEditor()).setCurrentFeatureEditor(e.widget,
-						UmaPackage.eINSTANCE.getWorkProductDescriptor_ActivityExitState());
-			}
-			
-			public void focusLost(FocusEvent e) {
-				WorkProductDescriptor element = (WorkProductDescriptor) getElement();
-				String oldContent = element.getActivityExitState();
-				if (((MethodElementEditor) getEditor()).mustRestoreValue(
-						activityExitState, oldContent)) {
-					return;
-				}
-				String newContent = StrUtil.getPlainText(activityExitState
-						.getText());
-				if (!newContent.equals(oldContent)) {
-					boolean status = actionMgr
-							.doAction(
-									IActionManager.SET,
-									element,
-									UmaPackage.eINSTANCE
-											.getWorkProductDescriptor_ActivityExitState(),
-									newContent, -1);
-					if (status) {
-						activityExitState.setText(newContent);
-					}
-				}
-			}
-		});
-
-		ctrl_table_1.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) viewer_1
-						.getSelection();
-				if (selection.size() > 0)
-					ctrl_remove_1.setEnabled(true);
-			}
-		});
-
-		ctrl_add_1.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IFilter filter = new ProcessWorkProductFilter(
-						getConfiguration(), null, FilterConstants.WORKPRODUCTS); //$NON-NLS-1$
-				// block it's deliverable parts
-				List existingElements = new ArrayList();
-				existingElements
-						.addAll(ProcessUtil
-								.getAssociatedElementList(((WorkProductDescriptor) element)
-										.getDeliverableParts()));
-				// block itself
-				existingElements.add(ProcessUtil
-						.getAssociatedElement((WorkProductDescriptor) element));
-				// also block it's parent work products, if any
-				existingElements
-						.addAll((Collection) getParentWorkProducts((WorkProductDescriptor) element));
-
-				ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-						.getWorkbench().getActiveWorkbenchWindow().getShell(),
-						filter, element, FilterConstants.WORKPRODUCTS,
-						existingElements);
-				fd.setBlockOnOpen(true);
-				fd.setTitle(FilterConstants.WORKPRODUCTS);
-				fd.open();
-				addItems(fd.getSelectedItems());
-				viewer_1.refresh();
-
-			}
-		});
-
-		ctrl_add_proc_1.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				String tabName = FilterConstants.WORK_PRODUCT_DESCRIPTORS;
-				List existingElements = new ArrayList();
-				existingElements.addAll(((WorkProductDescriptor) element)
-						.getDeliverableParts());
-				existingElements.add(element);
-
-				existingElements
-						.addAll(getParentDeliverables((WorkProductDescriptor) element));
-				Process process = TngUtil.getOwningProcess(element);
-
-				IFilter descriptorFilter = getDescriptorFilter();
-				if (descriptorFilter != null && process != null) {
-					ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-							.getWorkbench().getActiveWorkbenchWindow()
-							.getShell(), descriptorFilter, process, tabName,
-							existingElements);
-					fd.setBlockOnOpen(true);
-					fd.setTitle(tabName);
-					fd.open();
-					addFromProcessItems(fd.getSelectedItems());
-					viewer_1.refresh();
-				}
-			}
-		});
-
-		ctrl_remove_1.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection selection = (IStructuredSelection) viewer_1
-						.getSelection();
-				if (selection.size() > 0) {
-					// update the model
-					ArrayList rmItems = new ArrayList();
-					rmItems.addAll(selection.toList());
-					removeItems(rmItems);
-					viewer_1.refresh();
-
-					// clear the selection
-					viewer_1.setSelection(null, true);
-
-				}
-			}
-		});
-
-		linkButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				String tabName = FilterConstants.WORKPRODUCTS; //$NON-NLS-1$
-				Class workProductType = null;
-				if (element.getWorkProduct() != null) {
-					workProductType = element.getWorkProduct().getClass();
-				}
-				List existingElements = new ArrayList();
-				if (element.getWorkProduct() != null) {
-					WorkProduct wp = element.getWorkProduct();
-					existingElements.add(wp);
-					if (wp instanceof Artifact) {
-						List subArtifacts = new ArrayList();
-						getAllSubArtifacts((Artifact) wp, subArtifacts,
-								((Artifact) wp).getContainedArtifacts());
-						existingElements.addAll(subArtifacts);
-					}
-				}
-
-				List list = ProcessUtil
-						.getSiblings(TngAdapterFactory.INSTANCE
-								.getPBS_ComposedAdapterFactory(), getAdapter(),
-								element);
-
-				for (Iterator itor = list.iterator(); itor.hasNext();) {
-					Object obj = itor.next();
-					if (obj instanceof WorkProductDescriptor) {
-						WorkProductDescriptor wpDesc = (WorkProductDescriptor) obj;
-						if ((!wpDesc.equals(element))
-								&& (!wpDesc.getSuppressed().booleanValue())) {
-							WorkProduct wp = wpDesc.getWorkProduct();
-
-							if (wp != null) {
-								existingElements.add(wp);
-
-								if (wp instanceof Artifact) {
-									List subArtifacts = new ArrayList();
-									getAllSubArtifacts((Artifact) wp,
-											subArtifacts, ((Artifact) wp)
-													.getContainedArtifacts());
-									existingElements.addAll(subArtifacts);
-								}
-							}
-						}
-					}
-				}
-				IFilter filter = new ProcessSpecificWorkProductFilter(
-						getConfiguration(), null, tabName, workProductType);
-
-				ItemsFilterDialog fd = new ItemsFilterDialog(PlatformUI
-						.getWorkbench().getActiveWorkbenchWindow().getShell(),
-						filter, element, tabName, existingElements);
-
-				fd.setBlockOnOpen(true);
-				fd.setViewerSelectionSingle(true);
-				fd.setTitle(tabName);
-				fd.open();
-				setMethodElement(fd.getSelectedItems());
-
-				// update method element control
-				ctrl_method_element.setText(getMethodElementName(element));
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e1) {
-			}
-		});
-	}
-
-	private void getAllSubArtifacts(Artifact artifact, List subArtifacts,
-			List containedArtifacts) {
-		for (Iterator itor = containedArtifacts.iterator(); itor.hasNext();) {
-			Object obj = (Object) itor.next();
-			if (obj instanceof Artifact) {
-				if (!subArtifacts.contains(obj))
-					subArtifacts.add(obj);
-				getAllSubArtifacts((Artifact) obj, subArtifacts,
-						((Artifact) obj).getContainedArtifacts());
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.DescriptorGeneralSection#updateControls()
-	 */
-	protected void updateControls() {
-		super.updateControls();
-		activityEntryState.setEditable(editable);
-		activityExitState.setEditable(editable);
-		linkButton.setEnabled(editable);
-		activityEntryState.setEnabled(editable);
-		activityExitState.setEnabled(editable);
-
-		if (ctrl_add_1 != null)
-			ctrl_add_1.setEnabled(editable);
-		if (ctrl_add_proc_1 != null)
-			ctrl_add_proc_1.setEnabled(editable);
-		if (ctrl_remove_1 != null)
-			ctrl_remove_1.setEnabled(editable);
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.DescriptorGeneralSection#refresh()
-	 */
-	public void refresh() {
-		try {
-			if (getElement() instanceof WorkProductDescriptor) {
-				element = (WorkProductDescriptor) getElement();
-
-				super.refresh();
-
-				// Model Modify listener for activity entry state and activity
-				// exit state
-				if (wpModelModifyListener != null) {
-					activityEntryState
-							.removeModifyListener(wpModelModifyListener);
-					activityExitState
-							.removeModifyListener(wpModelModifyListener);
-
-				}
-
-				wpModelModifyListener = getEditor().createModifyListener(
-						(WorkProductDescriptor) element);
-
-				if (wpModelModifyListener instanceof MethodElementEditor.ModifyListener) {
-					((MethodElementEditor.ModifyListener) wpModelModifyListener)
-							.setElement(element);
-					((MethodElementEditor.ModifyListener) wpModelModifyListener)
-							.setDisable(true);
-				}
-
-				ctrl_method_element.setText(getMethodElementName(element));
-				ctrl_workProduct_type.setText(getMethodElementType(element));
-				activityEntryState.setText(element.getActivityEntryState());
-				activityExitState.setText(element.getActivityExitState());
-
-				if (wpModelModifyListener instanceof MethodElementEditor.ModifyListener) {
-					((MethodElementEditor.ModifyListener) wpModelModifyListener)
-							.setDisable(false);
-				}
-
-				activityEntryState.addModifyListener(wpModelModifyListener);
-				activityExitState.addModifyListener(wpModelModifyListener);
-
-				if (viewer_1 != null) {
-					viewer_1.refresh();
-				}
-
-				// hide/show certain sections.
-				toggleSection();
-
-			}
-
-		} catch (Exception ex) {
-			logger
-					.logError(
-							"Error refreshing WorkProductDescriptor general section : " + element, ex); //$NON-NLS-1$
-		}
-	}
-
-	private void addItems(List items) {
-		if (items != null) {
-			List wps = new ArrayList();
-
-			for (Iterator itor = items.iterator(); itor.hasNext();) {
-				Object obj = itor.next();
-				if ((obj instanceof WorkProduct)
-						&& (!isPartOfDeliverable((WorkProduct) obj,
-								(WorkProductDescriptor) element))) {
-					wps.add((WorkProduct) obj);
-
-				}
-			}
-			if (!wps.isEmpty()) {
-				AssignWPToDeliverable cmd = new AssignWPToDeliverable(
-						(WorkProductDescriptor) element, wps);
-				actionMgr.execute(cmd);
-			}
-		}
-		viewer_1.refresh();
-	}
-
-	protected IFilter getDescriptorFilter() {
-
-		return new DescriptorProcessFilter(getConfiguration()) {
-			protected boolean childAccept(Object obj) {
-				if (obj instanceof Activity) {
-					List list = new ArrayList();
-					getActivitiesInScope(TngAdapterFactory.INSTANCE
-							.getPBS_ComposedAdapterFactory(), element, list);
-					if (list.contains(obj))
-						return true;
-					else
-						return false;
-				}
-				if (obj instanceof WorkProductDescriptor)
-					return true;
-				return false;
-			}
-		};
-	}
-
-	private void addFromProcessItems(List items) {
-		if (items != null) {
-			for (Iterator itor = items.iterator(); itor.hasNext();) {
-				Object obj = itor.next();
-				if (obj instanceof WorkProductDescriptor) {
-					WorkProduct wp = ((WorkProductDescriptor) obj)
-							.getWorkProduct();
-					if (wp != null) {
-						if (!isPartOfDeliverable(wp,
-								(WorkProductDescriptor) element)) {
-							WorkProductDescriptor wpDesc = ProcessUtil
-									.createWorkProductDescriptor(wp);
-							actionMgr
-									.doAction(
-											IActionManager.ADD,
-											element,
-											UmaPackage.eINSTANCE
-													.getWorkProductDescriptor_DeliverableParts(),
-											wpDesc, -1);
-						}
-						actionMgr
-								.doAction(
-										IActionManager.ADD,
-										element,
-										UmaPackage.eINSTANCE
-												.getWorkProductDescriptor_DeliverableParts(),
-										obj, -1);
-						
-					} else {
-						MessageFormat mf = new MessageFormat(
-								PropertiesResources.Process_DeliverableAssignError); //$NON-NLS-1$
-						Object[] args = {
-								((WorkProductDescriptor) obj).getName(),
-								((WorkProductDescriptor) element).getName() };
-						AuthoringUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayInfo(
-										PropertiesResources.Process_AssignmentInfoTitle, mf.format(args)); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-
-	}
-
-	private void removeItems(List items) {
-		if (!items.isEmpty()) {
-			for (Iterator itor = items.iterator(); itor.hasNext();) {
-				Object obj = (Object) itor.next();
-				if (obj instanceof WorkProductDescriptor) {
-					actionMgr
-							.doAction(
-									IActionManager.REMOVE,
-									element,
-									UmaPackage.eINSTANCE
-											.getWorkProductDescriptor_DeliverableParts(),
-									(WorkProductDescriptor) obj, -1);
-				}
-
-				// find matching deliverable parts
-				Object wpDesc = findDeliverableParts((Object) obj);
-				actionMgr.doAction(IActionManager.REMOVE, element,
-						UmaPackage.eINSTANCE
-								.getWorkProductDescriptor_DeliverableParts(),
-						wpDesc, -1);
-			}
-		}
-	}
-
-	private Object findDeliverableParts(Object obj) {
-		List parts = ((WorkProductDescriptor) element).getDeliverableParts();
-
-		for (Iterator itor = parts.iterator(); itor.hasNext();) {
-			Object itorObject = itor.next();
-			if (obj instanceof WorkProductDescriptor) {
-				if (itorObject instanceof WorkProductDescriptor) {
-					Object objWP = ((WorkProductDescriptor) obj)
-							.getWorkProduct();
-					Object itorWP = ((WorkProductDescriptor) itorObject)
-							.getWorkProduct();
-					if (objWP.equals(itorWP)) {
-						return itorObject;
-					}
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Find parent process
-	 * 
-	 * @param element
-	 * @return
-	 */
-	protected Object getProcess(BreakdownElement brElement) {
-		AdapterFactory aFactory = TngAdapterFactory.INSTANCE
-				.getPBS_ComposedAdapterFactory();
-		ItemProviderAdapter adapter = (ItemProviderAdapter) aFactory.adapt(
-				brElement, ITreeItemContentProvider.class);
-		Object parent = adapter.getParent(brElement);
-		while (!(parent instanceof Process)) {
-			brElement = (BreakdownElement) parent;
-			adapter = (ItemProviderAdapter) aFactory.adapt(brElement,
-					ITreeItemContentProvider.class);
-			parent = adapter.getParent(brElement);
-		}
-		return parent;
-	}
-
-	/**
-	 * Get parent deliverables
-	 * 
-	 * @param brElement
-	 * @return
-	 */
-	private List getParentDeliverables(BreakdownElement brElement) {
-		List parentDeliverables = new ArrayList();
-		AdapterFactory aFactory = TngAdapterFactory.INSTANCE
-				.getPBS_ComposedAdapterFactory();
-		ItemProviderAdapter adapter = (ItemProviderAdapter) aFactory.adapt(
-				brElement, ITreeItemContentProvider.class);
-		Object parent = adapter.getParent(brElement);
-		while (!(parent instanceof Activity)) {
-			brElement = (BreakdownElement) parent;
-			if (parent instanceof WorkProductDescriptor) {
-				WorkProductDescriptor wpdesc = (WorkProductDescriptor) parent;
-				if (wpdesc.getWorkProduct() instanceof Deliverable) {
-					parentDeliverables.add(wpdesc);
-				}
-			}
-			adapter = (ItemProviderAdapter) aFactory.adapt(brElement,
-					ITreeItemContentProvider.class);
-			parent = adapter.getParent(brElement);
-		}
-		return parentDeliverables;
-	}
-	/**
-	 * Find all sibling work products
-	 * 
-	 * @param element
-	 * @return
-	 */
-	private Object getParentWorkProducts(BreakdownElement brElement) {
-		HashSet workProducts = new HashSet();
-
-		AdapterFactory aFactory = TngAdapterFactory.INSTANCE
-				.getPBS_ComposedAdapterFactory();
-		ItemProviderAdapter adapter = (ItemProviderAdapter) aFactory.adapt(
-				brElement, ITreeItemContentProvider.class);
-		Object parent = adapter.getParent(brElement);
-		while (!(parent instanceof Activity)) {
-			brElement = (BreakdownElement) parent;
-			if (parent instanceof WorkProductDescriptor) {
-				WorkProductDescriptor wpdesc = (WorkProductDescriptor) parent;
-				if (wpdesc.getWorkProduct() instanceof Deliverable) {
-					workProducts.add(wpdesc.getWorkProduct());
-				}
-			}
-			adapter = (ItemProviderAdapter) aFactory.adapt(brElement,
-					ITreeItemContentProvider.class);
-			parent = adapter.getParent(brElement);
-		}
-
-		if (parent instanceof Activity) {
-			List brElements = ((Activity) parent).getBreakdownElements();
-			for (Iterator itor = brElements.iterator(); itor.hasNext();) {
-				Object obj = (Object) itor.next();
-				if (obj instanceof WorkProductDescriptor) {
-					WorkProduct wp = ((WorkProductDescriptor) obj)
-							.getWorkProduct();
-					if (wp != null)
-						workProducts.add(wp);
-				}
-			}
-		}
-		return workProducts;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.properties.DescriptorGeneralSection#getNamePrefix()
-	 */
-	public String getNamePrefix() {
-		return LibraryUIText.TEXT_WORK_PRODUCT_DESCRIPTOR + ": "; //$NON-NLS-1$
-	}
-
-	private void setMethodElement(List items) {
-		if ((items != null) && (items.size() >= 1)) {
-			if (items.get(0) instanceof WorkProduct) {
-				WorkProduct wp = (WorkProduct) items.get(0);
-
-				List list = ProcessUtil
-						.getSiblings(TngAdapterFactory.INSTANCE
-								.getPBS_ComposedAdapterFactory(), getAdapter(),
-								element);
-				boolean canAssign = true;
-				for (Iterator itor = list.iterator(); itor.hasNext();) {
-					Object obj = itor.next();
-					if (obj instanceof WorkProductDescriptor) {
-						WorkProductDescriptor wpDesc = (WorkProductDescriptor) obj;
-						if ((!wpDesc.equals(element))
-								&& (!wpDesc.getSuppressed().booleanValue())) {
-							WorkProduct exisingWP = wpDesc.getWorkProduct();
-							if (wp.equals(exisingWP)) {
-								canAssign = false;
-								break;
-							}
-						}
-					}
-				}
-				if (canAssign) {
-					LinkMethodElementCommand cmd = new LinkMethodElementCommand(
-							element, wp,
-							UmaPackage.WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT);
-					actionMgr.execute(cmd);
-
-					// set selection to same element to enable correct actions
-					getEditor().setSelection(getSelection());
-				} else {
-					MessageFormat mf = new MessageFormat(PropertiesResources.Process_InvalidLinkMethodElement); //$NON-NLS-1$
-					Object[] args = { wp.getName() };
-					AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayInfo(
-									PropertiesResources.Process_LinkMethodElementTitle, mf.format(args)); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	private boolean isPartOfDeliverable(WorkProduct wp,
-			WorkProductDescriptor deliverable) {
-
-		List deliverableParts = ProcessUtil
-				.getAssociatedElementList(deliverable.getDeliverableParts());
-		if (deliverableParts.contains(wp))
-			return true;
-
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/package.html
deleted file mode 100755
index 47aa7c7..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/properties/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides tabbed pages for the breakdown elements Properties view.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/ConfigurationLabelProvider.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/ConfigurationLabelProvider.java
deleted file mode 100755
index 369fd06..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/ConfigurationLabelProvider.java
+++ /dev/null
@@ -1,171 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.providers;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IWrapperItemProvider;
-import org.eclipse.epf.authoring.gef.figures.Colors;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.configuration.ConfigurationHelper;
-import org.eclipse.epf.library.edit.FeatureValueWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The label provider for the Configuration view tree,
- * 
- * @author Jinhua Xi
- * @author Shilpa Toraskar
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class ConfigurationLabelProvider extends VariabilityElementLabelProvider implements IColorProvider {
-	MethodConfiguration config = null;
-
-	public ConfigurationLabelProvider(MethodConfiguration config,
-			AdapterFactory adapterFactory) {
-		super(adapterFactory);
-		this.config = config;
-	}
-
-	/**
-	 * This implements {@link ILabelProvider}.getImage by forwarding it to an
-	 * object that implements
-	 * {@link IItemLabelProvider#getImage IItemLabelProvider.getImage}
-	 */
-	public Image getImage(Object object) {
-		// by default, return the default image
-		return super.getImage(object);
-	}
-
-	/**
-	 * This implements {@link ILabelProvider}.getText by forwarding it to an
-	 * object that implements
-	 * {@link IItemLabelProvider#getText IItemLabelProvider.getText}
-	 */
-	public String getText(Object object) {
-		String name = null;
-		if (object instanceof MethodElement) {
-			MethodElement element = ConfigurationHelper.getCalculatedElement(
-					(MethodElement) object, config);
-			if (element instanceof BreakdownElement) {
-				name = ProcessUtil
-						.getPresentationName((BreakdownElement) element);
-			} else {
-				name = TngUtil.getPresentationName(element);
-			}
-			if (StrUtil.isBlank(name)) {
-				// try to get name on the object itself.
-				name = TngUtil.getPresentationName((MethodElement) object);
-			}
-			// name = ConfigurationHelper.getName((MethodElement)object,
-			// config);
-		}
-		if (object instanceof FeatureValueWrapperItemProvider) {
-			MethodElement element = (MethodElement) ((FeatureValueWrapperItemProvider) object)
-					.getValue();
-			name = TngUtil.getPresentationName(element);
-			if (StrUtil.isBlank(name)) {
-				name = TngUtil.getPresentationName(object);
-			}
-
-		}
-		if(object instanceof IWrapperItemProvider){
-			name = TngUtil.getPresentationName(TngUtil.unwrap(object));
-		}
-		if (name == null) {
-			name = super.getText(object);
-		}
-
-		return name;
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider#dispose()
-	 */
-	public void dispose() {
-		config = null;
-		super.dispose();
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
-	 */
-	public Color getForeground(Object element) {
-		if (isSuppressed(element)) {
-			return Colors.SUPRESSED_ELEMENT_LABEL;
-		}
-		else if (isExternal(element)) {
-			return Colors.INHERITED_ELEMENT_LABEL;
-		}
-		return ColorConstants.listForeground;
-	}
-
-	private boolean isSuppressed(Object element) {
-		if (element instanceof BreakdownElement) {
-			org.eclipse.epf.uma.Process proc = TngUtil.getOwningProcess((BreakdownElement) element);
-			if(proc != null) {
-				return Suppression.getSuppression(proc).isSuppressed(element);
-			}
-		} else if (element instanceof BreakdownElementWrapperItemProvider) {
-			Object top = ((BreakdownElementWrapperItemProvider)element).getTopItem();
-			if(top instanceof org.eclipse.epf.uma.Process) {
-				return Suppression.getSuppression((Process) top).isSuppressed(element);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
-	 */
-	public Color getBackground(Object element) {
-		// let OS take control over tree widget background
-		// rather than sending one fixed background.
-		return null;//ColorConstants.listBackground;
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.library.edit.util.VariabilityElementLabelProvider#isExternal(java.lang.Object)
-	 */
-	public boolean isExternal(Object element) {
-		return ProcessUtil.isInherited(element) || ProcessUtil.isContributed(element);
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.library.edit.util.VariabilityElementLabelProvider#getFont(java.lang.Object)
-	 */
-	public Font getFont(Object element) {
-		if (ProcessUtil.isInherited(element)) {
-			return italicFont;
-		}
-		else if(ProcessUtil.isContributed(element)) {
-			return boldItalicFont;
-		}
-		return regularFont;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/EditorPageElement.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/EditorPageElement.java
deleted file mode 100755
index bf21f53..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/EditorPageElement.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2004, 2006 IBM Corporation.  All Rights Reserved.
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.providers;
-
-import org.osgi.framework.Bundle;
-
-
-/**
- * Models a <editorPage> element in the "org.eclipse.epf.authoring.ui.EditorPageProvider"
- * extension point.
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class EditorPageElement {
-
-	// plugin bundle
-	Bundle bundle;
-	
-	// The page ID.
-	private String id;
-	
-	// The page name.
-	private String name;
-
-	// The contributor class for the page.
-	private String contributorClass;
-	
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param bundle
-	 * 			  Installed Bundle
-	 * @param id
-	 *            The page ID.
-	 * @param name
-	 *            The page name.            
-	 * @param contributorClass
-	 *            The page contributor class.
-	 */
-	public EditorPageElement(Bundle bundle, String id, String name, String contributorClass) {
-		this.bundle = bundle;
-		this.id = id;
-		this.name = name;
-		this.contributorClass = contributorClass;
-	}
-
-	/**
-	 * Returns the page ID.
-	 * 
-	 * @return The page ID.
-	 */
-	public String getId() {
-		return id;
-	}
-	
-	/**
-	 * Returns the page name.
-	 * 
-	 * @return The page name.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Returns the page contributor class.
-	 * 
-	 * @return The page contributor class.
-	 */
-	public Object getContributorClass() throws Exception {
-		
-		Class clazz = bundle.loadClass(contributorClass);
-		return clazz.newInstance();	
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/ExposedAdapterFactoryContentProvider.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/ExposedAdapterFactoryContentProvider.java
deleted file mode 100755
index 2c01647..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/ExposedAdapterFactoryContentProvider.java
+++ /dev/null
@@ -1,36 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.providers;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class ExposedAdapterFactoryContentProvider extends
-		AdapterFactoryContentProvider implements IViewerProvider {
-
-	/**
-	 * @param adapterFactory
-	 */
-	public ExposedAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	public Viewer getViewer() {
-		return viewer;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/MethodEditorPageProvider.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/MethodEditorPageProvider.java
deleted file mode 100755
index 77c024a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/MethodEditorPageProvider.java
+++ /dev/null
@@ -1,136 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.providers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.osgi.framework.Bundle;
-
-/**
- * Manages the <editorPage> elements defined via the
- * "org.eclipse.epf.authoring.ui.EditorPageProvider" extension point.
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class MethodEditorPageProvider {
-
-	/**
-	 * The extension namespace.
-	 */
-	public static final String PAGE_PROVIDERS_EXTENSION_NAMESPACE = "org.eclipse.epf.authoring.ui"; //$NON-NLS-1$
-
-	/**
-	 * The extension name.
-	 */
-	public static final String PAGE_PROVIDERS_EXTENSION_NAME = "TaskEditorPageProvider"; //$NON-NLS-1$
-
-	/**
-	 * The extension Attributes
-	 */
-	public static final String PAGE_PROVIDER_EXTENSION_ATTR_ID = "id";
-
-	public static final String PAGE_PROVIDER_EXTENSION_ATTR_NAME = "name";
-
-	public static final String PAGE_PROVIDER_EXTENSION_ATTR_CLASS = "class";
-
-	// Contains the editor page providers loaded via the
-	// "org.eclipse.epf.authoring.ui.MethodEditorPageProvider" extension point.
-	private ArrayList pageProviders = new ArrayList();
-
-	//	 The shared instance.
-	private static MethodEditorPageProvider instance = null;
-	
-	public static MethodEditorPageProvider getInstance() {
-		if (instance == null) {
-			synchronized (MethodEditorPageProvider.class) {
-				if (instance == null) {
-					instance = new MethodEditorPageProvider();
-				}
-			}
-		}
-		return instance;
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	private MethodEditorPageProvider() {
-
-	}
-
-	/**
-	 * Returns all the page providers
-	 * 
-	 * @return all the page providers.
-	 */
-	public List getPageProviders() {
-		List pages = new ArrayList();
-		for (int i = 0; i < pageProviders.size(); i++) {
-			EditorPageElement pageElement = (EditorPageElement) pageProviders
-					.get(i);
-			Object contributorClass = null;
-			try {
-				contributorClass = pageElement.getContributorClass();
-			} catch (Exception e) {
-			}
-			pages.add(contributorClass);
-		}
-		return pages;
-	}
-
-	/**
-	 * Loads the configuration providers specified via the
-	 * "com.ibm.process.pageProviders" extension point.
-	 */
-	public void loadProviders() {
-		IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(
-				PAGE_PROVIDERS_EXTENSION_NAMESPACE,
-				PAGE_PROVIDERS_EXTENSION_NAME);
-		if (extensionPoint != null) {
-			IExtension[] extensions = extensionPoint.getExtensions();
-			for (int i = 0; i < extensions.length; i++) {
-				IExtension extension = extensions[i];
-				String pluginId = extension.getNamespaceIdentifier();
-				Bundle bundle = Platform.getBundle(pluginId);
-
-				IConfigurationElement[] configElements = extension.getConfigurationElements();
-				for (int j = 0; j < configElements.length; j++) {
-					IConfigurationElement configElement = configElements[j];
-					try {
-						String id = configElement
-								.getAttribute(PAGE_PROVIDER_EXTENSION_ATTR_ID);
-						String name = configElement
-								.getAttribute(PAGE_PROVIDER_EXTENSION_ATTR_NAME);
-						String contributorClass = configElement
-								.getAttribute(PAGE_PROVIDER_EXTENSION_ATTR_CLASS); //$NON-NLS-1$
-
-						EditorPageElement pageElement = new EditorPageElement(
-								bundle, id, name, contributorClass);
-						pageProviders.add(pageElement);
-						
-					} catch (Exception e) {
-						AuthoringUIPlugin.getDefault().getLogger().logError(
-								"Failed to load Editor Page Provider", e); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/MethodElementLabelDecorator.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/MethodElementLabelDecorator.java
deleted file mode 100755
index f14faf4..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/MethodElementLabelDecorator.java
+++ /dev/null
@@ -1,101 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.providers;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Label decorator for method element
- * 
- * @author Phong Nguyen Le
- * @since  1.0
- */
-public class MethodElementLabelDecorator implements ILabelDecorator {
-	private static ILabelDecorator delegateDecorator;
-	
-	private static ILabelDecorator getDelegateDecorator() {
-		if (delegateDecorator == null) {
-			delegateDecorator = PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator();
-		}
-		return delegateDecorator;
-	}
-	
-	private static IResource getWorkspaceResource(Object element) {
-		element = TngUtil.unwrap(element);
-		// don't decorate icon of predefined elements in library view b/c some of them are shown as UI folder
-		//
-		if(element instanceof MethodElement && TngUtil.isPredefined((MethodElement) element)) {
-			return null;
-		}
-		return PersistenceUtil.getWorkspaceResource(element);
-	}
-	
-	public MethodElementLabelDecorator() {
-		
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, java.lang.Object)
-	 */
-	public Image decorateImage(Image image, Object element) {		
-		IResource wsRes = getWorkspaceResource(element);
-		if(wsRes != null) {
-			image = getDelegateDecorator().decorateImage(image, element);
-		}
-		return getDelegateDecorator().decorateImage(image, element);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ILabelDecorator#decorateText(java.lang.String, java.lang.Object)
-	 */
-	public String decorateText(String text, Object element) {
-		return text;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener) {
-		getDelegateDecorator().addListener(listener);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		IResource wsRes = getWorkspaceResource(element);
-		if(wsRes != null) {
-			return getDelegateDecorator().isLabelProperty(wsRes, property);
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-		getDelegateDecorator().removeListener(listener);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/MethodElementLightweightLabelDecorator.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/MethodElementLightweightLabelDecorator.java
deleted file mode 100755
index 6118df0..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/MethodElementLightweightLabelDecorator.java
+++ /dev/null
@@ -1,88 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.providers;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.util.LibraryValidationMarkerHelper;
-import org.eclipse.epf.authoring.ui.util.MethodRichTextMarkerHelper;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-
-/**
- * @author Phong Nguyen Le
- * @since  1.1
- */
-public class MethodElementLightweightLabelDecorator implements
-		ILightweightLabelDecorator {
-	private static ImageDescriptor overlay = null;
-	
-
-	public static final String DECORATOR_ID = "org.eclipse.epf.authoring.ui.providers.MethodElementLightweightLabelDecorator";
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ILightweightLabelDecorator#decorate(java.lang.Object,
-	 *      org.eclipse.jface.viewers.IDecoration)
-	 */
-	public void decorate(Object element, IDecoration decoration) {
-//		if(LibraryValidationMarkerHelper.INSTANCE.hasMarkers(element)) {
-		if(LibraryValidationMarkerHelper.isInvalid(element) ||
-				MethodRichTextMarkerHelper.isInvalid(element)) {
-			decoration.addOverlay(getErrorOverlay());
-		}
-	}	
-
-	/**
-	 * @return
-	 */
-	private static ImageDescriptor getErrorOverlay() {
-		if(overlay == null) {
-			overlay = AuthoringUIPlugin.getDefault().getImageDescriptor("full/ovr16/error_ovr.gif");
-		}
-		return overlay;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-		// TODO Auto-generated method stub
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/MethodElementUILabelProvider.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/MethodElementUILabelProvider.java
deleted file mode 100755
index 27dbe42..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/MethodElementUILabelProvider.java
+++ /dev/null
@@ -1,174 +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.authoring.ui.providers;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Code taken from org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider
- * 
- */
-public class MethodElementUILabelProvider implements ILabelProvider {
-	
-	protected ListenerList fListeners = new ListenerList();
-	
-	ILabelProvider fLabelProvider = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-			.getNavigatorView_ComposedAdapterFactory());
-	
-	private ArrayList<ILabelDecorator> fLabelDecorators;
-
-	/**
-	 * Creates a new label provider with default flags.
-	 */
-	public MethodElementUILabelProvider() {
-		fLabelDecorators= null; 
-	}
-	
-	/**
-	 * Adds a decorator to the label provider
-	 */
-	public void addLabelDecorator(ILabelDecorator decorator) {
-		if (fLabelDecorators == null) {
-			fLabelDecorators= new ArrayList<ILabelDecorator>(2);
-		}
-		fLabelDecorators.add(decorator);
-	}
-	
-	protected Image decorateImage(Image image, Object element) {
-		if (fLabelDecorators != null && image != null) {
-			for (int i= 0; i < fLabelDecorators.size(); i++) {
-				ILabelDecorator decorator= (ILabelDecorator) fLabelDecorators.get(i);
-				image= decorator.decorateImage(image, element);
-			}
-		}
-		return image;
-	}
-
-	/* (non-Javadoc)
-	 * @see ILabelProvider#getImage
-	 */
-	public Image getImage(Object element) {
-		Image result= fLabelProvider.getImage(element);
-		return decorateImage(result, element);
-	}
-
-	protected String decorateText(String text, Object element) {
-		if (fLabelDecorators != null && text.length() > 0) {
-			for (int i= 0; i < fLabelDecorators.size(); i++) {
-				ILabelDecorator decorator= (ILabelDecorator) fLabelDecorators.get(i);
-				text= decorator.decorateText(text, element);
-			}
-		}	
-		return text;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see ILabelProvider#getText
-	 */
-	public String getText(Object element) {
-		String result= fLabelProvider.getText(element);
-		return decorateText(result, element);
-	}
-
-	/* (non-Javadoc)
-	 * @see IBaseLabelProvider#dispose
-	 */
-	public void dispose() {
-		if (fLabelDecorators != null) {
-			for (int i= 0; i < fLabelDecorators.size(); i++) {
-				ILabelDecorator decorator= (ILabelDecorator) fLabelDecorators.get(i);
-				decorator.dispose();
-			}
-			fLabelDecorators= null;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see IBaseLabelProvider#addListener(ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener) {
-		if (fLabelDecorators != null) {
-			for (int i= 0; i < fLabelDecorators.size(); i++) {
-				ILabelDecorator decorator= (ILabelDecorator) fLabelDecorators.get(i);
-				decorator.addListener(listener);
-			}
-		}
-		fListeners.add(listener);	
-	}
-
-	/* (non-Javadoc)
-	 * @see IBaseLabelProvider#isLabelProperty(Object, String)
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		return true;	
-	}
-
-	/* (non-Javadoc)
-	 * @see IBaseLabelProvider#removeListener(ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-		if (fLabelDecorators != null) {
-			for (int i= 0; i < fLabelDecorators.size(); i++) {
-				ILabelDecorator decorator= (ILabelDecorator) fLabelDecorators.get(i);
-				decorator.removeListener(listener);
-			}
-		}
-		fListeners.remove(listener);	
-	}
-	
-	public static ILabelDecorator[] getDecorators(boolean errortick, ILabelDecorator extra) {
-		if (errortick) {
-			if (extra == null) {
-				return new ILabelDecorator[] {};
-			} else {
-				return new ILabelDecorator[] { extra };
-			}
-		}
-		if (extra != null) {
-			return new ILabelDecorator[] { extra };
-		}
-		return null;
-	}
-	
-    /**
-     * Fires a label provider changed event to all registered listeners
-     * Only listeners registered at the time this method is called are notified.
-     *
-     * @param event a label provider changed event
-     *
-     * @see ILabelProviderListener#labelProviderChanged
-     */
-    protected void fireLabelProviderChanged(final LabelProviderChangedEvent event) {
-        Object[] listeners = fListeners.getListeners();
-        for (int i = 0; i < listeners.length; ++i) {
-            final ILabelProviderListener l = (ILabelProviderListener) listeners[i];
-            SafeRunner.run(new SafeRunnable() {
-                public void run() {
-                    l.labelProviderChanged(event);
-                }
-            });
-        }
-    }
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/ProblemsLabelDecorator.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/ProblemsLabelDecorator.java
deleted file mode 100755
index 356ea94..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/ProblemsLabelDecorator.java
+++ /dev/null
@@ -1,252 +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.authoring.ui.providers;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.epf.authoring.ui.AuthoringUIImages;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.internal.IProblemChangedListener;
-import org.eclipse.epf.authoring.ui.internal.ImageDescriptorRegistry;
-import org.eclipse.epf.authoring.ui.internal.ImageImageDescriptor;
-import org.eclipse.epf.authoring.ui.internal.MethodElementImageDescriptor;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IBaseLabelProvider;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-
-/**
- * Code taken from org.eclipse.jdt.ui.ProblemsLabelDecorator 
- *
- */
-public class ProblemsLabelDecorator implements ILabelDecorator, ILightweightLabelDecorator {
-	
-	/**
-	 * This is a special <code>LabelProviderChangedEvent</code> carrying additional 
-	 * information whether the event origins from a maker change.
-	 * <p>
-	 * <code>ProblemsLabelChangedEvent</code>s are only generated by <code>
-	 * ProblemsLabelDecorator</code>s.
-	 * </p>
-	 */
-	public static class ProblemsLabelChangedEvent extends LabelProviderChangedEvent {
-
-		private static final long serialVersionUID= 1L;
-		
-		private boolean fMarkerChange;
-
-		/**
-		 * Note: This constructor is for internal use only. Clients should not call this constructor.
-		 * 
-		 * @param eventSource the base label provider
-		 * @param changedResource the changed resources
-		 * @param isMarkerChange <code>true<code> if the change is a marker change; otherwise
-		 *  <code>false</code> 
-		 */
-		public ProblemsLabelChangedEvent(IBaseLabelProvider eventSource, IResource[] changedResource, boolean isMarkerChange) {
-			super(eventSource, changedResource);
-			fMarkerChange= isMarkerChange;
-		}
-		
-		/**
-		 * Returns whether this event origins from marker changes. If <code>false</code> an annotation 
-		 * model change is the origin. In this case viewers not displaying working copies can ignore these 
-		 * events.
-		 * 
-		 * @return if this event origins from a marker change.
-		 */
-		public boolean isMarkerChange() {
-			return fMarkerChange;
-		}
-
-	}
-
-	private static final int ERRORTICK_ERROR= MethodElementImageDescriptor.ERROR;	
-
-	private ImageDescriptorRegistry fRegistry;
-	private boolean fUseNewRegistry= false;
-	private IProblemChangedListener fProblemChangedListener;
-	
-	private ListenerList fListeners;
-
-	/**
-	 * Creates a new <code>ProblemsLabelDecorator</code>.
-	 */
-	public ProblemsLabelDecorator() {
-		this(null);
-		fUseNewRegistry= true;
-	}
-	
-	/**
-	 * Note: This constructor is for internal use only. Clients should not call this constructor.
-	 * 
-	 * @param registry The registry to use or <code>null</code> to use the Java plugin's
-	 *  image registry
-	 */
-	public ProblemsLabelDecorator(ImageDescriptorRegistry registry) {
-		fRegistry= registry;
-		fProblemChangedListener= null;
-	}
-	
-	private ImageDescriptorRegistry getRegistry() {
-		if (fRegistry == null) {
-			fRegistry= fUseNewRegistry ? new ImageDescriptorRegistry() : AuthoringUIPlugin.getImageDescriptorRegistry();
-		}
-		return fRegistry;
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see ILabelDecorator#decorateText(String, Object)
-	 */
-	public String decorateText(String text, Object element) {
-		return text;
-	}	
-
-	/* (non-Javadoc)
-	 * @see ILabelDecorator#decorateImage(Image, Object)
-	 */
-	public Image decorateImage(Image image, Object obj) {
-		int adornmentFlags= computeAdornmentFlags(obj);
-		if (adornmentFlags != 0) {
-			ImageDescriptor baseImage= new ImageImageDescriptor(image);
-			Rectangle bounds= image.getBounds();
-			return getRegistry().get(new MethodElementImageDescriptor(baseImage, adornmentFlags, new Point(bounds.width, bounds.height)));
-		}
-		return image;
-	}
-
-	/**
-	 * Note: This method is for internal use only. Clients should not call this method.
-	 * 
-	 * @param obj the element to compute the flags for
-	 * 
-	 * @return the adornment flags
-	 */
-	protected int computeAdornmentFlags(Object obj) {
-		try {
-			if (obj instanceof MethodElement) {
-				return getErrorTicksFromMarkers(PersistenceUtil.getWorkspaceResource(obj), IResource.DEPTH_INFINITE);
-			} else if (obj instanceof IResource) {
-				return getErrorTicksFromMarkers((IResource) obj, IResource.DEPTH_INFINITE);
-			}
-		} catch (CoreException e) {
-			if (e.getStatus().getCode() == IResourceStatus.MARKER_NOT_FOUND) {
-				return 0;
-			}
-			
-			AuthoringUIPlugin.log(e);
-		}
-		return 0;
-	}
-
-	private int getErrorTicksFromMarkers(IResource res, int depth) throws CoreException {
-		if (res == null || !res.isAccessible()) {
-			return 0;
-		}
-		int info= 0;
-		
-		IMarker[] markers= res.findMarkers(IMarker.PROBLEM, true, depth);
-		if (markers != null) {
-			for (int i= 0; i < markers.length && (info != ERRORTICK_ERROR); i++) {
-				IMarker curr= markers[i];
-				int priority= curr.getAttribute(IMarker.SEVERITY, -1);
-				if (priority == IMarker.SEVERITY_ERROR) {
-					info= ERRORTICK_ERROR;
-				}
-			}			
-		}
-		return info;
-	}
-	
-	/* (non-Javadoc)
-	 * @see IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-		if (fProblemChangedListener != null) {
-			AuthoringUIPlugin.getDefault().getProblemMarkerManager().removeListener(fProblemChangedListener);
-			fProblemChangedListener= null;
-		}
-		if (fRegistry != null && fUseNewRegistry) {
-			fRegistry.dispose();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see IBaseLabelProvider#isLabelProperty(Object, String)
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see IBaseLabelProvider#addListener(ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener) {
-		if (fListeners == null) {
-			fListeners= new ListenerList();
-		}
-		fListeners.add(listener);
-		if (fProblemChangedListener == null) {
-			fProblemChangedListener= new IProblemChangedListener() {
-				public void problemsChanged(IResource[] changedResources, boolean isMarkerChange) {
-					fireProblemsChanged(changedResources, isMarkerChange);
-				}
-			};
-			AuthoringUIPlugin.getDefault().getProblemMarkerManager().addListener(fProblemChangedListener);
-		}
-	}	
-
-	/* (non-Javadoc)
-	 * @see IBaseLabelProvider#removeListener(ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-		if (fListeners != null) {
-			fListeners.remove(listener);
-			if (fListeners.isEmpty() && fProblemChangedListener != null) {
-				AuthoringUIPlugin.getDefault().getProblemMarkerManager().removeListener(fProblemChangedListener);
-				fProblemChangedListener= null;
-			}
-		}
-	}
-	
-	private void fireProblemsChanged(IResource[] changedResources, boolean isMarkerChange) {
-		if (fListeners != null && !fListeners.isEmpty()) {
-			LabelProviderChangedEvent event= new ProblemsLabelChangedEvent(this, changedResources, isMarkerChange);
-			Object[] listeners= fListeners.getListeners();
-			for (int i= 0; i < listeners.length; i++) {
-				((ILabelProviderListener) listeners[i]).labelProviderChanged(event);
-			}
-		}
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILightweightLabelDecorator#decorate(java.lang.Object, org.eclipse.jface.viewers.IDecoration)
-	 */
-	public void decorate(Object element, IDecoration decoration) { 
-		int adornmentFlags= computeAdornmentFlags(element);
-		if (adornmentFlags == ERRORTICK_ERROR) {
-			decoration.addOverlay(AuthoringUIImages.IMG_DESC_OVR_ERROR);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/ProcessEditorPageProvider.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/ProcessEditorPageProvider.java
deleted file mode 100755
index f504f8a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/ProcessEditorPageProvider.java
+++ /dev/null
@@ -1,135 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.providers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.osgi.framework.Bundle;
-
-/**
- * Manages the <editorPage> elements defined via the
- * "org.eclipse.epf.authoring.ui.EditorPageProvider" extension point.
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class ProcessEditorPageProvider {
-
-	/**
-	 * The extension namespace.
-	 */
-	public static final String PAGE_PROVIDERS_EXTENSION_NAMESPACE = "org.eclipse.epf.authoring.ui"; //$NON-NLS-1$
-
-	/**
-	 * The extension name.
-	 */
-	public static final String PAGE_PROVIDERS_EXTENSION_NAME = "ProcessEditorPageProvider"; //$NON-NLS-1$
-
-	/**
-	 * The extension Attributes
-	 */
-	public static final String PAGE_PROVIDER_EXTENSION_ATTR_ID = "id";
-
-	public static final String PAGE_PROVIDER_EXTENSION_ATTR_NAME = "name";
-
-	public static final String PAGE_PROVIDER_EXTENSION_ATTR_CLASS = "class";
-
-	// Contains the editor page providers loaded via the
-	// "org.eclipse.epf.authoring.ui.ProcessEditorPageProvider" extension point.
-	private ArrayList pageProviders = new ArrayList();
-
-	//	 The shared instance.
-	private static ProcessEditorPageProvider instance = null;
-	
-	public static ProcessEditorPageProvider getInstance() {
-		if (instance == null) {
-			synchronized (ProcessEditorPageProvider.class) {
-				if (instance == null) {
-					instance = new ProcessEditorPageProvider();
-				}
-			}
-		}
-		return instance;
-	}
-
-	
-	/**
-	 * Creates a new instance.
-	 */
-	private ProcessEditorPageProvider() {
-
-	}
-
-	/**
-	 * Returns all the page providers
-	 * 
-	 * @return all the page providers.
-	 */
-	public List getPageProviders() {
-		List pages = new ArrayList();
-		for (int i = 0; i < pageProviders.size(); i++) {
-			EditorPageElement pageElement = (EditorPageElement) pageProviders
-					.get(i);
-			Object contributorClass = null;
-			try {
-				contributorClass = pageElement.getContributorClass();
-			} catch (Exception e) {
-			}
-			pages.add(contributorClass);
-		}
-		return pages;
-	}
-	
-	/**
-	 * Loads the configuration providers specified via the
-	 * "com.ibm.process.pageProviders" extension point.
-	 */
-	public void loadProviders() {
-		IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(
-				PAGE_PROVIDERS_EXTENSION_NAMESPACE,
-				PAGE_PROVIDERS_EXTENSION_NAME);
-		if (extensionPoint != null) {
-			IExtension[] extensions = extensionPoint.getExtensions();
-			for (int i = 0; i < extensions.length; i++) {
-				IExtension extension = extensions[i];
-				String pluginId = extension.getNamespaceIdentifier();
-				Bundle bundle = Platform.getBundle(pluginId);
-				
-				IConfigurationElement[] configElements = extension.getConfigurationElements();
-				for (int j = 0; j < configElements.length; j++) {
-					IConfigurationElement configElement = configElements[j];
-					try {
-						String id = configElement
-								.getAttribute(PAGE_PROVIDER_EXTENSION_ATTR_ID);
-						String name = configElement
-								.getAttribute(PAGE_PROVIDER_EXTENSION_ATTR_NAME);
-						String contributorClass = configElement
-								.getAttribute(PAGE_PROVIDER_EXTENSION_ATTR_CLASS); //$NON-NLS-1$
-						EditorPageElement pageElement = new EditorPageElement(bundle,
-								id, name, contributorClass);
-						pageProviders.add(pageElement);
-					} catch (Exception e) {
-						AuthoringUIPlugin.getDefault().getLogger().logError(
-								"Failed to load Editor Page Provider", e); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/VariabilityElementLabelProvider.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/VariabilityElementLabelProvider.java
deleted file mode 100755
index e5727cd..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/VariabilityElementLabelProvider.java
+++ /dev/null
@@ -1,85 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.providers;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.IFontProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public abstract class VariabilityElementLabelProvider extends
-		AdapterFactoryLabelProvider implements IFontProvider {
-
-	protected static Font regularFont;
-
-	protected static Font boldFont;
-
-	protected static Font italicFont;
-	
-	protected static Font boldItalicFont;
-
-	protected static Font strikeoutFont;	
-
-	static {
-		Font defaultFont = JFaceResources.getDefaultFont();
-		regularFont = defaultFont;
-		FontData[] fds = JFaceResources.getDefaultFont().getFontData();
-		if (fds.length > 0) {
-			FontData fd = fds[0];
-			int h = fd.getHeight();
-			Display display = Display.getDefault();
-			boldFont = new Font(display, fd.getName(), h, fd.getStyle()
-					| SWT.BOLD);
-			italicFont = new Font(display, fd.getName(), h, fd.getStyle()
-					| SWT.ITALIC);
-			boldItalicFont = new Font(display, fd.getName(), h, fd.getStyle()
-					| SWT.BOLD | SWT.ITALIC);
-		}
-	}
-
-	public static final Font getItalicFont() {
-		return italicFont;
-	}
-
-	public static final Font getDefaultFont() {
-		return regularFont;
-	}
-
-	/**
-	 * @param adapterFactory
-	 */
-	public VariabilityElementLabelProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-
-	}
-
-	public void dispose() {
-		super.dispose();
-	}
-
-	public Font getFont(Object element) {
-		if (isExternal(element)) {
-			return italicFont;
-		}
-		return boldFont;
-	}
-
-	public abstract boolean isExternal(Object element);
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/package.html
deleted file mode 100755
index 326f3e7..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/providers/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides extension point management for the Authoring UI.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/richtext/IMethodRichText.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/richtext/IMethodRichText.java
deleted file mode 100755
index cab1e85..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/richtext/IMethodRichText.java
+++ /dev/null
@@ -1,60 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.richtext;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.jface.fieldassist.DecoratedField;
-
-
-/**
- * The interface for a Rich Text control used in the Method editors.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public interface IMethodRichText extends IRichText {
-
-	/**
-	 * Returns the method element associated with this rich text control.
-	 */
-	public MethodElement getMethodElement();
-
-	/**
-	 * Returns the modal object associated with this rich text control.
-	 */
-	public EObject getModalObject();
-
-	/**
-	 * Sets the modal object associated with this rich text control.
-	 */
-	public void setModalObject(EObject modalObject);
-
-	/**
-	 * Returns modal object feature associated with this rich text control.
-	 */
-	public EStructuralFeature getModalObjectFeature();
-
-	/**
-	 * Sets the modal object feature associated with this rich text control.
-	 */
-	public void setModalObjectFeature(EStructuralFeature modalObjectFeature);
-
-	/**
-	 * Initialize the MethodRichText with the edited MethodElemnt and name of the field
-	 * @param element
-	 * @param fieldName
-	 */
-	public void init(MethodElement element, DecoratedField label);
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/richtext/IMethodRichTextEditor.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/richtext/IMethodRichTextEditor.java
deleted file mode 100755
index a9f539d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/richtext/IMethodRichTextEditor.java
+++ /dev/null
@@ -1,40 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.richtext;
-
-import org.eclipse.epf.richtext.IRichTextEditor;
-import org.eclipse.epf.richtext.IRichTextToolBar;
-
-/**
- * The interface for a Rich Text editor used in the Method editors.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public interface IMethodRichTextEditor extends IMethodRichText, IRichTextEditor {
-
-	/**
-	 * Fills the Rich Text editor tool bar with action items.
-	 * 
-	 * @param toolBar
-	 *            The Rich text editor tool bar.
-	 */
-	public void fillToolBar(IRichTextToolBar toolBar);
-	
-	/**
-	 * Selects the Rich Text or HTML tab.
-	 * 
-	 * @param index
-	 *            0 for the Rich Text tab, 1 for the HTML tab.
-	 */
-	public void setSelection(int index);	
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/richtext/RichTextContentValidator.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/richtext/RichTextContentValidator.java
deleted file mode 100755
index dc94d34..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/richtext/RichTextContentValidator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.epf.authoring.ui.richtext;
-
-import java.io.UnsupportedEncodingException;
-
-import org.eclipse.epf.library.layout.DefaultContentValidator;
-import org.eclipse.epf.library.layout.LinkInfo;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-
-/**
- * Special content validator for the Rich Text Editor
- * @author Jeff Hardy
- *
- */
-public class RichTextContentValidator extends DefaultContentValidator {
-
-	/**
-	 * validates a URL without decoding it
-	 */
-	public LinkInfo validateLink(MethodElement owner, String attributes,
-			String text, MethodConfiguration config) {
-
-		LinkInfo info = new LinkInfo(owner, this, pubDir) {
-			protected String decode(String str) throws UnsupportedEncodingException {
-				return str;
-			}
-		};
-		info.validateLink(attributes, text, config);
-
-		return info;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/richtext/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/richtext/package.html
deleted file mode 100755
index 6d8eff9..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/richtext/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides rich text editing support for the editors and Properties view.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/AuthoringAccessibleListener.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/AuthoringAccessibleListener.java
deleted file mode 100755
index bf4bcfe..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/AuthoringAccessibleListener.java
+++ /dev/null
@@ -1,82 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.util;
-
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.accessibility.AccessibleListener;
-
-/**
- * Accessible listener while authoring the content
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- *
- */
-public class AuthoringAccessibleListener implements AccessibleListener {
-	
-	private String description;
-	private String name;
-	
-	/**
-	 * Creates an instance
-	 * @param name
-	 */
-	public AuthoringAccessibleListener(String name){
-		this.name = name;
-	}
-	
-	/**
-	 * Create an instance
-	 * @param name
-	 * @param description
-	 */
-	public AuthoringAccessibleListener(String name, String description){
-		this.name = name;
-		this.description = description;
-	}
-	
-	/**
-	 * @see org.eclipse.swt.accessibility.AccessibleListener#getDescription(org.eclipse.swt.accessibility.AccessibleEvent)
-	 */
-	public void getDescription(AccessibleEvent e) {
-		e.result = this.description;
-	}
-
-	/**
-	 * @see org.eclipse.swt.accessibility.AccessibleListener#getHelp(org.eclipse.swt.accessibility.AccessibleEvent)
-	 */
-	public void getHelp(AccessibleEvent e) {
-
-	}
-
-	/**
-	 * @see org.eclipse.swt.accessibility.AccessibleListener#getKeyboardShortcut(org.eclipse.swt.accessibility.AccessibleEvent)
-	 */
-	public void getKeyboardShortcut(AccessibleEvent e) {
-	
-	}
-
-	/**
-	 * @see org.eclipse.swt.accessibility.AccessibleListener#getName(org.eclipse.swt.accessibility.AccessibleEvent)
-	 */
-	public void getName(AccessibleEvent e) {		
-		e.result = this.name;
-	}
-	
-	
-	/**
-	 * Set name for the listener
-	 * @param name
-	 */
-	public void setName(String name){
-		this.name = name;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/EditorsContextHelper.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/EditorsContextHelper.java
deleted file mode 100755
index 571d74c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/EditorsContextHelper.java
+++ /dev/null
@@ -1,164 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.util;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductType;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Editors context helper
- * 
- * @author BingXue Xu
- * @since 1.0
- *
- */
-public class EditorsContextHelper {
-
-	/**
-	 * Set context help for method element
-	 * @param uiComposite
-	 * @param obj
-	 */
-	public static void setHelp(Control uiComposite, Object obj) {
-		if (obj == null)
-			return;
-
-		obj = LibraryUtil.unwrap(obj);
-
-		if ((obj instanceof Role)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.EDITOR_ROLE_CONTEXT_HELP_ID);
-			return;
-		}
-		if ((obj instanceof Task)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.EDITOR_TASK_CONTEXT_HELP_ID);
-			return;
-		}
-		if ((obj instanceof WorkProduct)) {
-			PlatformUI
-					.getWorkbench()
-					.getHelpSystem()
-					.setHelp(
-							uiComposite,
-							AuthoringUIHelpContexts.EDITOR_WORK_PRODUCT_CONTEXT_HELP_ID);
-			return;
-		}
-		if ((obj instanceof Guidance)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.EDITOR_GUIDANCE_CONTEXT_HELP_ID);
-			return;
-		}
-		if ((obj instanceof Discipline)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.EDITOR_DISCIPLINE_CONTEXT_HELP_ID);
-			return;
-		}
-		if ((obj instanceof DisciplineGrouping)) {
-			PlatformUI
-					.getWorkbench()
-					.getHelpSystem()
-					.setHelp(
-							uiComposite,
-							AuthoringUIHelpContexts.EDITOR_DISCIPLINE_GROUPING_CONTEXT_HELP_ID);
-			return;
-		}
-		if ((obj instanceof Domain)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.EDITOR_DOMAIN_CONTEXT_HELP_ID);
-			return;
-		}
-		if ((obj instanceof WorkProductType)) {
-			PlatformUI
-					.getWorkbench()
-					.getHelpSystem()
-					.setHelp(
-							uiComposite,
-							AuthoringUIHelpContexts.EDITOR_WORK_PRODUCT_TYPE_CONTEXT_HELP_ID);
-			return;
-		}
-		if ((obj instanceof RoleSet)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.EDITOR_ROLE_SET_CONTEXT_HELP_ID);
-			return;
-		}
-		if ((obj instanceof RoleSetGrouping)) {
-			PlatformUI
-					.getWorkbench()
-					.getHelpSystem()
-					.setHelp(
-							uiComposite,
-							AuthoringUIHelpContexts.EDITOR_ROLSE_SET_GROUPING_CONTEXT_HELP_ID);
-			return;
-		}
-		if ((obj instanceof Tool)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.EDITOR_TOOL_CONTEXT_HELP_ID);
-			return;
-		}
-		if (obj instanceof CustomCategory) {
-			PlatformUI
-					.getWorkbench()
-					.getHelpSystem()
-					.setHelp(
-							uiComposite,
-							AuthoringUIHelpContexts.EDITOR_CUSTOM_CATEGORY_CONTEXT_HELP_ID);
-			return;
-		}
-	}
-
-	/**
-	 * Set context help for process type
-	 * 
-	 * @param uiComposite
-	 * @param procType
-	 */
-	public static void setHelp(Control uiComposite, String procType) {
-		if ((procType != null && procType
-				.equalsIgnoreCase("capability pattern"))) { //$NON-NLS-1$
-			PlatformUI
-					.getWorkbench()
-					.getHelpSystem()
-					.setHelp(
-							uiComposite,
-							AuthoringUIHelpContexts.EDITOR_CP_DESCRIPTION_CONTEXT_HELP_ID);
-			return;
-		}
-
-		if ((procType != null && procType.equalsIgnoreCase("delivery process"))) { //$NON-NLS-1$
-			PlatformUI
-					.getWorkbench()
-					.getHelpSystem()
-					.setHelp(
-							uiComposite,
-							AuthoringUIHelpContexts.EDITOR_DP_DESCRIPTION_CONTEXT_HELP_ID);
-			return;
-		}
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-				AuthoringUIHelpContexts.EDITOR_DP_DESCRIPTION_CONTEXT_HELP_ID);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/LibraryValidationMarkerHelper.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/LibraryValidationMarkerHelper.java
deleted file mode 100755
index 3679ca8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/LibraryValidationMarkerHelper.java
+++ /dev/null
@@ -1,279 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.util;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.ui.action.ValidateAction.EclipseResourcesUtil;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceListener;
-import org.eclipse.epf.library.edit.LibraryEditResources;
-import org.eclipse.epf.library.edit.element.TransientContentPackageItemProvider;
-import org.eclipse.epf.library.edit.navigator.ContentItemProvider;
-import org.eclipse.epf.library.edit.navigator.MethodPackagesItemProvider;
-import org.eclipse.epf.library.edit.navigator.ProcessesItemProvider;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.project.MethodLibraryProject;
-import org.eclipse.epf.persistence.FileManager;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-
-/**
- * @author Phong Nguyen Le
- * @since  1.1
- */
-public class LibraryValidationMarkerHelper extends EclipseResourcesUtil {	
-	public static final LibraryValidationMarkerHelper INSTANCE = new LibraryValidationMarkerHelper();
-	public static final String GUID = "guid";
-	
-	private static class ContainerSet extends HashSet {
-		/**
-		 * 
-		 */
-		private static final long serialVersionUID = 1L;
-
-		public ContainerSet() {
-			super();
-			init();
-			LibraryService.getInstance().addListener(new LibraryServiceListener() {
-				public void libraryOpened(MethodLibrary library) {
-					init();
-				}
-				
-				public void libraryClosed(MethodLibrary library) {
-					clear();
-				}
-				
-				public void libraryReopened(MethodLibrary library) {
-					init();
-				}				
-			});
-		}
-		
-		private void init() {
-			clear();
-			
-			// fill this set with containers of marked objects
-			//
-			MethodLibrary lib = LibraryService.getInstance().getCurrentMethodLibrary();
-			if(lib != null) {
-				IProject prj = MethodLibraryProject.findProject(lib);
-				if(prj != null) {
-					try {
-						IMarker[] markers = prj.findMarkers(INSTANCE.getMarkerID(), false, IResource.DEPTH_INFINITE);
-						for (int i = 0; i < markers.length; i++) {
-							IMarker marker = markers[i];
-							String guid = (String) marker.getAttribute(GUID);
-							MethodElement e = LibraryService.getInstance().getCurrentLibraryManager().getMethodElement(guid);
-							if(e != null) {
-								// remove its containers from containersOfMarkedObjects
-								//
-								markContainers(e);
-							}
-						}
-					} catch (CoreException e) {
-					}
-				}
-			}
-		}
-		
-		private void markContainers(MethodElement e) {
-			for(EObject container = e.eContainer(); container != null; container = container.eContainer()) {
-				add(container);
-			}
-		}
-
-		private void unmarkContainers(MethodElement e) {
-			for(EObject container = e.eContainer(); container != null; container = container.eContainer()) {
-				remove(container);
-			}
-		}
-	}
-	
-	private static ContainerSet containersOfMarkedObjects = new ContainerSet();	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.ui.MarkerHelper#getFile(org.eclipse.emf.common.util.URI)
-	 */
-	protected IFile getFile(URI uri) {
-		if(uri.isFile()) {
-			return (IFile) FileManager.getResourceForLocation(uri.toFileString());
-		}
-		return super.getFile(uri);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.ui.util.EditUIMarkerHelper#adjustMarker(org.eclipse.core.resources.IMarker, org.eclipse.emf.common.util.Diagnostic)
-	 */
-	protected boolean adjustMarker(IMarker marker, Diagnostic diagnostic) throws CoreException {
-		boolean ret = super.adjustMarker(marker, diagnostic);
-		if(!diagnostic.getData().isEmpty()) {
-			Object o = diagnostic.getData().get(0);
-			if(o instanceof MethodElement) {
-				marker.setAttribute(GUID, ((MethodElement)o).getGuid());
-				marker.setAttribute(IMarker.LOCATION, TngUtil.getLabelWithPath(o));
-			}
-		}
-		return ret;
-	}
-	
-	public static boolean isInvalid(Object object) {
-		if(object instanceof ProcessesItemProvider) {
-			// this is an UI object: Processes
-			//
-			ProcessesItemProvider ip = (ProcessesItemProvider) object;
-			Object o;
-			return ((o = ip.getCapabilityPatternPackage()) != null && containersOfMarkedObjects.contains(o))
-				|| ((o = ip.getDeliveryProcessPackage()) != null && containersOfMarkedObjects.contains(o));
-		}
-		else if(object instanceof MethodPackagesItemProvider
-				|| object instanceof ContentItemProvider) {
-			// this is an UI object
-			//
-			object = ((ItemProviderAdapter)object).getTarget();
-		}
-		else if(object instanceof TransientContentPackageItemProvider) {
-			// this is an UI object: either Tasks, Roles, Work Products, or Guidance
-			//
-			Collection children = ((TransientContentPackageItemProvider)object).getChildren(object);
-			for (Iterator iter = children.iterator(); iter.hasNext();) {
-				if(INSTANCE.hasMarkers(iter.next())) {
-					return true;
-				}				
-			}
-			return false;
-		}
-		return containersOfMarkedObjects.contains(object) || INSTANCE.hasMarkers(object);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.ui.MarkerHelper#hasMarkers(java.lang.Object)
-	 */
-	public boolean hasMarkers(Object object) {
-		if(object instanceof MethodElement) {
-			IResource resource = getFile(object);
-			if (resource != null && resource.exists())
-			{
-				try
-				{
-					String guid = ((MethodElement)object).getGuid();
-					IMarker[] markers = resource.findMarkers(getMarkerID(), false, IResource.DEPTH_ZERO);
-					for (int i = 0; i < markers.length; i++) {
-						IMarker marker = markers[i];
-						if(guid.equals(marker.getAttribute(GUID))) {
-							return true;
-						}
-					}
-				}
-				catch (CoreException e)
-				{
-				}
-			}
-			return false;
-		}
-
-		return super.hasMarkers(object);
-	}
-	
-	public void deleteMarkers(Object object) {
-		if(object instanceof MethodElement) {
-			IResource resource = getFile(object);
-			if (resource != null && resource.exists())
-			{
-				try
-				{
-					String guid = ((MethodElement)object).getGuid();
-					IMarker[] markers = resource.findMarkers(getMarkerID(), false, IResource.DEPTH_ZERO);
-					for (int i = 0; i < markers.length; i++) {
-						IMarker marker = markers[i];
-						if(guid.equals(marker.getAttribute(GUID))) {
-							marker.delete();
-						}
-					}
-				}
-				catch (CoreException e)
-				{
-				}
-			}
-			return;
-		}
-		
-		super.deleteMarkers(object);
-	}
-
-	protected void deleteMarkers(IResource resource, boolean includeSubtypes, int depth) {
-		if (resource != null && resource.exists()) {
-			try {				
-				IMarker[] markers = resource.findMarkers(getMarkerID(), false, IResource.DEPTH_ZERO);
-				for (int i = 0; i < markers.length; i++) {
-					IMarker marker = markers[i];
-					String guid = (String) marker.getAttribute(GUID);
-					MethodElement e = LibraryService.getInstance().getCurrentLibraryManager().getMethodElement(guid);
-					if(e != null) {
-						// remove its containers from containersOfMarkedObjects
-						//
-						containersOfMarkedObjects.unmarkContainers(e);
-					}
-				}
-
-			} catch (CoreException e) {
-				
-			}			
-		}
-			
-		super.deleteMarkers(resource, includeSubtypes, depth);
-	}
-	
-	protected void createMarkers(IResource resource, Diagnostic diagnostic, Diagnostic parentDiagnostic) throws CoreException {
-		super.createMarkers(resource, diagnostic, parentDiagnostic);
-		
-		if (resource != null && resource.exists()) {
-			try {				
-				IMarker[] markers = resource.findMarkers(getMarkerID(), false, IResource.DEPTH_ZERO);
-				for (int i = 0; i < markers.length; i++) {
-					IMarker marker = markers[i];
-					String guid = (String) marker.getAttribute(GUID);
-					MethodElement e = LibraryService.getInstance().getCurrentLibraryManager().getMethodElement(guid);
-					if(e != null) {
-						// remove its containers from containersOfMarkedObjects
-						//
-						containersOfMarkedObjects.markContainers(e);
-					}
-				}
-
-			} catch (CoreException e) {
-				
-			}			
-		}
-	}
-	
-	//Override to seperate error message in error dialog and problems view (bug 174351)
-	//Note: better fix is to extend BasicDiagnostic to encapsulate both types of msgs -> to do later
-	protected String composeMessage(Diagnostic diagnostic, Diagnostic parentDiagnostic) {
-		int ix = diagnostic.getMessage().indexOf(LibraryEditResources.duplicateElementNameError_msg2);
-		if (ix > 0) {
-			return diagnostic.getMessage().substring(0, ix);
-		}
-		return super.composeMessage(diagnostic, parentDiagnostic);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/MarkerResolutionGenerator.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/MarkerResolutionGenerator.java
deleted file mode 100755
index b0ad58c..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/MarkerResolutionGenerator.java
+++ /dev/null
@@ -1,222 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.persistence.util.UnresolvedProxyMarkerManager;
-import org.eclipse.epf.services.ILibraryPersister;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator;
-
-/**
- * Create resoultions for the given marker
- * 
- * @author Phong Nguyen Le
- * @since  1.0
- */
-public class MarkerResolutionGenerator implements IMarkerResolutionGenerator {
-	private static final IMarkerResolution[] EMPTY_RESOLUTIONS = new IMarkerResolution[0];
-	
-	private static class ShowOwnerInLibraryView implements IMarkerResolution {
-
-		private Object owner;
-
-		/**
-		 * @param owner
-		 */
-		private ShowOwnerInLibraryView(Object owner) {
-			super();
-			this.owner = owner;
-		}
-
-		/**
-		 * @see org.eclipse.ui.IMarkerResolution#getLabel()
-		 */
-		public String getLabel() {
-			return AuthoringUIResources.MarkerResolutionGenerator_showOwnerInLibraryView;
-		}
-
-		/**
-		 * @see org.eclipse.ui.IMarkerResolution#run(org.eclipse.core.resources.IMarker)
-		 */
-		public void run(IMarker marker) {
-			LibraryView.getView().setSelectionToViewer(owner);
-		}
-		
-	}
-	
-	private static class MarkerResolution implements IMarkerResolution {
-		private EObject owner;
-		private EReference reference;
-		private int index;
-				
-		private MarkerResolution(EObject owner, EReference ref, int index) {
-			super();
-			this.owner = owner;
-			this.reference = ref;
-			this.index = index;
-		}
-
-		/**
-		 * @see org.eclipse.ui.IMarkerResolution#getLabel()
-		 */
-		public String getLabel() {
-			return AuthoringUIResources.MarkerResolutionGenerator_removeUnresolvedReference;
-		}
-
-		/**
-		 * @see org.eclipse.ui.IMarkerResolution#run(org.eclipse.core.resources.IMarker)
-		 */
-		public void run(IMarker marker) {
-			if(reference.isMany()) {
-				((List)owner.eGet(reference)).remove(index);
-			}
-			else {
-				owner.eSet(reference, null);
-			}
-			ILibraryPersister.FailSafeMethodLibraryPersister persister = LibraryServiceUtil.getCurrentPersister().getFailSafePersister();
-			try {
-				persister.save(owner.eResource());
-				persister.commit();
-			}
-			catch(Exception e) {
-				AuthoringUIPlugin.getDefault().getLogger().logError(e);
-				persister.rollback();
-			}
-		}
-		
-	}
-
-	/**
-	 * @see org.eclipse.ui.IMarkerResolutionGenerator#getResolutions(org.eclipse.core.resources.IMarker)
-	 */
-	public IMarkerResolution[] getResolutions(IMarker marker) {
-		// The only resolution we provide right now is removing the unresolving proxy
-		//
-		try {
-			String proxyURI = (String) marker.getAttribute(UnresolvedProxyMarkerManager.PROXY_URI);
-			String ownerGUID = (String) marker.getAttribute(UnresolvedProxyMarkerManager.OWNER_GUID);
-			if(proxyURI != null && ownerGUID != null) {
-				Resource resource = RefreshJob.getInstance().getResource(marker.getResource());
-				if(resource != null) {
-					EObject owner = resource.getEObject(ownerGUID);
-					if(owner != null) {
-						URI uri = URI.createURI(proxyURI);
-						// find the proxy
-						//
-						int index = -1;
-						EReference reference = null;
-						find_proxy_loop:
-						for (Iterator iter = owner.eClass().getEAllReferences().iterator(); iter
-								.hasNext();) {
-							EReference ref = (EReference) iter.next();
-							if(ref.isChangeable() && !ref.isDerived()) {
-								if(ref.isMany()) {
-									InternalEList list = (InternalEList) owner.eGet(ref);
-									int id = 0;
-									for (Iterator iterator = list.basicIterator(); iterator
-											.hasNext();) {
-										InternalEObject o = (InternalEObject) iterator.next();
-										if(o.eIsProxy() && uri.equals(o.eProxyURI())) {
-											index = id;
-											reference = ref;
-											break find_proxy_loop;
-										}
-										id++;
-									}
-								}
-								else {
-									InternalEObject o = (InternalEObject) owner.eGet(ref, false);
-									if(o != null && o.eIsProxy() && uri.equals(o.eProxyURI())) {
-										reference = ref;
-										break find_proxy_loop;
-									}
-								}
-							}
-						}
-						if(reference != null) {
-							Object selectableOwner = getSelectableObject(owner);
-							if(selectableOwner != null) {
-								return new IMarkerResolution[] {
-										new MarkerResolution(owner, reference, index),
-										new ShowOwnerInLibraryView(selectableOwner)
-								};
-							}
-							else {
-								return new IMarkerResolution[] {
-										new MarkerResolution(owner, reference, index),
-								};
-							}
-						}
-					}
-				}
-			}
-		} catch (Exception e) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(e);
-		}
-		return EMPTY_RESOLUTIONS;
-	}
-
-	/**
-	 * Get selectable object 
-	 * @param owner
-	 * @return
-	 * 			object itself
-	 */
-	private static Object getSelectableObject(EObject owner) {
-		if(owner instanceof MethodPlugin || owner instanceof ContentElement || owner instanceof ContentPackage 
-				|| owner instanceof ProcessComponent) {
-			return owner;
-		}
-		if(owner instanceof MethodElement) {
-			ProcessComponent procComp = UmaUtil.getProcessComponent((MethodElement) owner);
-			if(procComp != null) {
-				return procComp;
-			}
-		}
-		if(owner instanceof ProcessPackage) {
-			return owner;
-		}
-		if(owner instanceof ContentDescription && owner.eContainer() instanceof ContentElement) {
-			return owner.eContainer(); 
-		}
-		Resource resource = owner.eResource();
-		MethodElement e = PersistenceUtil.getMethodElement(resource);
-		if(e != owner) {
-			return getSelectableObject(e);
-		}
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/MethodRichTextMarkerHelper.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/MethodRichTextMarkerHelper.java
deleted file mode 100755
index bf8a8a0..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/MethodRichTextMarkerHelper.java
+++ /dev/null
@@ -1,340 +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.authoring.ui.util;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.ui.action.ValidateAction.EclipseResourcesUtil;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceListener;
-import org.eclipse.epf.library.edit.element.TransientContentPackageItemProvider;
-import org.eclipse.epf.library.edit.navigator.ContentItemProvider;
-import org.eclipse.epf.library.edit.navigator.MethodPackagesItemProvider;
-import org.eclipse.epf.library.edit.navigator.ProcessesItemProvider;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.project.MethodLibraryProject;
-import org.eclipse.epf.persistence.FileManager;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-
-/**
- * based on org.eclipse.epf.authoring.ui.util.LibraryValidationMarkerHelper 
- * @author Jeff Hardy
- *
- */
-public class MethodRichTextMarkerHelper extends EclipseResourcesUtil {	
-	public static final MethodRichTextMarkerHelper INSTANCE = new MethodRichTextMarkerHelper();
-	public static final String GUID = "guid";
-
-	// marker ID
-	public static final String MARKER_ID = "org.eclipse.epf.authoring.ui.methodRichText"; //$NON-NLS-1$
-	
-	// marker attribute
-	private static String METHOD_FIELDNAME = "MethodFieldName";
-
-	// private constructor
-	private MethodRichTextMarkerHelper() {
-	}
-	
-	private static class ContainerMap extends HashMap<Object, Integer> {
-		/**
-		 * 
-		 */
-		private static final long serialVersionUID = 1L;
-
-		public ContainerMap() {
-			super();
-			initMap();
-			LibraryService.getInstance().addListener(new LibraryServiceListener() {
-				public void libraryOpened(MethodLibrary library) {
-					initMap();
-				}
-				
-				public void libraryClosed(MethodLibrary library) {
-					clear();
-				}
-				
-				public void libraryReopened(MethodLibrary library) {
-					initMap();
-				}				
-			});
-		}
-		
-		private void initMap() {
-			clear();
-			
-			// fill this set with containers of marked objects
-			//
-			MethodLibrary lib = LibraryService.getInstance().getCurrentMethodLibrary();
-			if(lib != null) {
-				IProject prj = MethodLibraryProject.findProject(lib);
-				if(prj != null) {
-					try {
-						IMarker[] markers = prj.findMarkers(INSTANCE.getMarkerID(), false, IResource.DEPTH_INFINITE);
-						for (int i = 0; i < markers.length; i++) {
-							IMarker marker = markers[i];
-							String guid = (String) marker.getAttribute(GUID);
-							MethodElement e = LibraryService.getInstance().getCurrentLibraryManager().getMethodElement(guid);
-							if(e != null) {
-								// remove its containers from containersOfMarkedObjects
-								//
-								markContainers(e);
-							}
-						}
-					} catch (CoreException e) {
-					}
-				}
-			}
-		}
-		
-		private void increment(Object object) {
-			Integer count;
-			if (containsKey(object)) {
-				count = get(object);
-			} else {
-				count = new Integer(0);
-			}
-			count++;
-			put(object, count);
-		}
-
-		private void decrement(Object object) {
-			if (containsKey(object)) {
-				Integer count = get(object);
-				if (count == 1) {
-					// remove object
-					remove(object);
-				} else {
-					count--;
-					put(object, count);
-				}
-			}
-		}
-		
-		private void markContainers(MethodElement e) {
-			for(EObject container = e.eContainer(); container != null; container = container.eContainer()) {
-				increment(container);
-			}
-		}
-
-		private void unmarkContainers(MethodElement e) {
-			for(EObject container = e.eContainer(); container != null; container = container.eContainer()) {
-				decrement(container);
-			}
-		}
-	}
-	
-	private static ContainerMap containersOfMarkedObjects = new ContainerMap();	
-	
-	
-	protected String getMarkerID() {
-		return MARKER_ID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.ui.MarkerHelper#getFile(org.eclipse.emf.common.util.URI)
-	 */
-	protected IFile getFile(URI uri) {
-		if(uri.isFile()) {
-			return (IFile) FileManager.getResourceForLocation(uri.toFileString());
-		}
-		return super.getFile(uri);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.edit.ui.util.EditUIMarkerHelper#adjustMarker(org.eclipse.core.resources.IMarker, org.eclipse.emf.common.util.Diagnostic)
-	 */
-	protected boolean adjustMarker(IMarker marker, Diagnostic diagnostic) throws CoreException {
-		boolean ret = super.adjustMarker(marker, diagnostic);
-		if(!diagnostic.getData().isEmpty()) {
-			Object o = diagnostic.getData().get(0);
-			Object str = diagnostic.getData().get(1);
-			if(o instanceof MethodElement) {
-				marker.setAttribute(GUID, ((MethodElement)o).getGuid());
-				marker.setAttribute(IMarker.LOCATION, TngUtil.getLabelWithPath(o));
-			}
-			if (str instanceof String) {
-				marker.setAttribute(METHOD_FIELDNAME, (String)str);
-			}
-
-		}
-		return ret;
-	}
-	
-	public static boolean isInvalid(Object object) {
-		if(object instanceof ProcessesItemProvider) {
-			// this is an UI object: Processes
-			//
-			ProcessesItemProvider ip = (ProcessesItemProvider) object;
-			Object o;
-			return ((o = ip.getCapabilityPatternPackage()) != null && containersOfMarkedObjects.containsKey(o))
-				|| ((o = ip.getDeliveryProcessPackage()) != null && containersOfMarkedObjects.containsKey(o));
-		}
-		else if(object instanceof MethodPackagesItemProvider
-				|| object instanceof ContentItemProvider) {
-			// this is an UI object
-			//
-			object = ((ItemProviderAdapter)object).getTarget();
-		}
-		else if(object instanceof TransientContentPackageItemProvider) {
-			// this is an UI object: either Tasks, Roles, Work Products, or Guidance
-			//
-			Collection children = ((TransientContentPackageItemProvider)object).getChildren(object);
-			for (Iterator iter = children.iterator(); iter.hasNext();) {
-				Object obj = iter.next();
-				if(containersOfMarkedObjects.containsKey(obj) || INSTANCE.hasMarkers(obj)) {
-					return true;
-				}				
-			}
-			return false;
-		}
-		return containersOfMarkedObjects.containsKey(object) || INSTANCE.hasMarkers(object);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.ui.MarkerHelper#hasMarkers(java.lang.Object)
-	 */
-	public boolean hasMarkers(Object object) {
-		if(object instanceof MethodElement) {
-			IResource resource = getFile(object);
-			if (resource != null && resource.exists())
-			{
-				try
-				{
-					String guid = ((MethodElement)object).getGuid();
-					IMarker[] markers = resource.findMarkers(getMarkerID(), false, IResource.DEPTH_ZERO);
-					for (int i = 0; i < markers.length; i++) {
-						IMarker marker = markers[i];
-						if(guid.equals(marker.getAttribute(GUID))) {
-							return true;
-						}
-					}
-				}
-				catch (CoreException e)
-				{
-				}
-			}
-			return false;
-		}
-
-		return super.hasMarkers(object);
-	}
-	
-	public void deleteMarkers(Object object, String fieldName) {
-		if(object instanceof MethodElement) {
-			IResource resource = getFile(object);
-			if (resource != null)
-			{
-				try
-				{
-					String guid = ((MethodElement)object).getGuid();
-					IMarker[] markers = resource.findMarkers(getMarkerID(), false, IResource.DEPTH_ZERO);
-					for (int i = 0; i < markers.length; i++) {
-						IMarker marker = markers[i];
-						if(guid.equals(marker.getAttribute(GUID)) && (fieldName == null ||
-								fieldName.equals(marker.getAttribute(METHOD_FIELDNAME)))) {
-							marker.delete();
-							MethodElement e = LibraryService.getInstance().getCurrentLibraryManager().getMethodElement(guid);
-							if(e != null) {
-								// remove its containers from containersOfMarkedObjects
-								//
-								containersOfMarkedObjects.unmarkContainers(e);
-							}
-						}
-					}
-				}
-				catch (CoreException e)
-				{
-				}
-			}
-			return;
-		}
-		
-		super.deleteMarkers(object);
-	}
-
-	protected void deleteMarkers(IResource resource, boolean includeSubtypes, int depth) {
-		if (resource != null) {
-			try {				
-				IMarker[] markers = resource.findMarkers(getMarkerID(), false, IResource.DEPTH_ZERO);
-				for (int i = 0; i < markers.length; i++) {
-					IMarker marker = markers[i];
-					String guid = (String) marker.getAttribute(GUID);
-					MethodElement e = LibraryService.getInstance().getCurrentLibraryManager().getMethodElement(guid);
-					if(e != null) {
-						// remove its containers from containersOfMarkedObjects
-						//
-						containersOfMarkedObjects.unmarkContainers(e);
-					}
-				}
-
-			} catch (CoreException e) {
-				
-			}			
-		}
-			
-		super.deleteMarkers(resource, includeSubtypes, depth);
-	}
-	
-	protected void createMarkers(IResource resource, Diagnostic diagnostic, Diagnostic parentDiagnostic) throws CoreException {
-		super.createMarkers(resource, diagnostic, parentDiagnostic);
-		String fieldName = null;
-		if(!diagnostic.getData().isEmpty() && diagnostic.getData().size() > 1) {
-			fieldName = (String)diagnostic.getData().get(1);
-		}
-		if (resource != null && fieldName != null) {
-			try {				
-				IMarker[] markers = resource.findMarkers(getMarkerID(), false, IResource.DEPTH_ZERO);
-				for (int i = 0; i < markers.length; i++) {
-					IMarker marker = markers[i];
-					String guid = (String) marker.getAttribute(GUID);
-					if(fieldName.equals(marker.getAttribute(METHOD_FIELDNAME))) {
-						MethodElement e = LibraryService.getInstance().getCurrentLibraryManager().getMethodElement(guid);
-						if(e != null) {
-							// add its containers to containersOfMarkedObjects
-							//
-							containersOfMarkedObjects.markContainers(e);
-						}
-					}
-				}
-
-			} catch (CoreException e) {
-				
-			}			
-		}
-
-	}
-	
-    protected String composeMessage(Diagnostic diagnostic, Diagnostic parentDiagnostic)
-    {
-      String message = diagnostic.getMessage();
-      if (parentDiagnostic != null)
-      {
-        String parentMessage = parentDiagnostic.getMessage();
-        if (parentMessage != null)
-        {
-          message = message != null ? parentMessage + " " + message : parentMessage;
-        }
-      }
-      return message;
-    }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/RefreshHandler.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/RefreshHandler.java
deleted file mode 100755
index 4d38ddb..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/RefreshHandler.java
+++ /dev/null
@@ -1,270 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.views.ConfigurationView;
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.persistence.refresh.IRefreshHandler;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-
-/**
- * Notify changes in resources to refresh
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class RefreshHandler implements IRefreshHandler {
-
-	private LibraryView libView;
-
-	/**
-	 * Creates an instance
-	 */
-	public RefreshHandler() {
-		super();
-	}
-
-	
-	/**
-	 * @see org.eclipse.epf.persistence.refresh.IRefreshHandler#refresh(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void refresh(final IProgressMonitor monitor) {
-		libView = LibraryView.getView();
-		Viewer viewer = libView != null ? libView.getViewer() : null;
-		Control ctrl = viewer.getControl();
-		if (ctrl == null || ctrl.isDisposed())
-			return;
-
-		if (ctrl.getDisplay().getThread() == Thread.currentThread()) {
-			doRefresh(monitor);
-		} else {
-			ctrl.getDisplay().asyncExec(new Runnable() {
-
-				public void run() {
-					doRefresh(monitor);
-				}
-
-			});
-		}
-	}
-
-	private void doRefresh(IProgressMonitor monitor) {
-		if (!RefreshJob.getInstance().getRemovedResources().isEmpty()) {
-			ArrayList removedResources = new ArrayList(RefreshJob.getInstance()
-					.getRemovedResources());
-			handleRemovedResources(removedResources);
-			RefreshJob.getInstance().getRemovedResources().removeAll(
-					removedResources);
-		}
-		if (!RefreshJob.getInstance().getChangedResources().isEmpty()) {
-			ArrayList changedResources = new ArrayList(RefreshJob.getInstance()
-					.getChangedResources());
-			handleChangedResources(changedResources);
-			RefreshJob.getInstance().getChangedResources().removeAll(
-					changedResources);
-		}
-	}
-
-	/**
-	 * Handle remove resources
-	 * @param removedResources2
-	 */
-	private Collection handleRemovedResources(Collection removedResources) {
-		return removedResources;
-	}
-
-	/**
-	 * Handle changed resources
-	 * 
-	 * @param changedResources
-	 * @return resources that have been reloaded
-	 */
-	private Collection handleChangedResources(Collection changedResources) {
-		Control ctrl = libView.getViewer().getControl();
-		if (ctrl == null || ctrl.isDisposed())
-			return Collections.EMPTY_LIST;
-		IWorkbenchPage workbenchPage = libView.getSite().getPage();
-		Shell shell = AuthoringUIPlugin.getDefault().getWorkbench()
-				.getDisplay().getActiveShell();
-		IEditorReference[] editorReferences = workbenchPage
-				.getEditorReferences();
-		ArrayList dirtyEditorsWithConflict = new ArrayList();
-		ArrayList changedResourceList = new ArrayList(changedResources);
-		// find all editor with dirty conflict
-		//
-		for (int i = 0; i < editorReferences.length; i++) {
-			IEditorReference reference = editorReferences[i];
-			IEditorPart editor = reference.getEditor(true);
-			if (editor instanceof MethodElementEditor && editor.isDirty()) {
-				Collection usedResources = ((MethodElementEditor) editor)
-						.getUsedResources();
-				check_resource: for (int j = 0; j < changedResourceList.size(); j++) {
-					Resource resource = (Resource) changedResourceList.get(j);
-					if (usedResources.contains(resource)) {
-						dirtyEditorsWithConflict.add(editor);
-						break check_resource;
-					}
-				}
-			}
-		}
-		final ArrayList editorsToRefresh = new ArrayList();
-		if (!dirtyEditorsWithConflict.isEmpty()) {
-			// prompt user to discard changes in editors that conflict with
-			// outside change
-			//
-			IStructuredContentProvider contentProvider = new IStructuredContentProvider() {
-				List fContents;
-
-				public Object[] getElements(Object inputElement) {
-					if (fContents != null && fContents == inputElement)
-						return fContents.toArray();
-					return new Object[0];
-				}
-
-				public void dispose() {
-				}
-
-				public void inputChanged(Viewer viewer, Object oldInput,
-						Object newInput) {
-					if (newInput instanceof List)
-						fContents = (List) newInput;
-					else
-						fContents = null;
-
-				}
-
-			};
-			ILabelProvider labelProvider = new LabelProvider() {
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
-				 */
-				public String getText(Object element) {
-					if (element instanceof IEditorPart) {
-						return ((IEditorPart) element).getTitle();
-					}
-					return super.getText(element);
-				}
-
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
-				 */
-				public Image getImage(Object element) {
-					if (element instanceof IEditorPart) {
-						return ((IEditorPart) element).getTitleImage();
-					}
-					return super.getImage(element);
-				}
-			};
-			String title = AuthoringUIResources._UI_FileConflict_label; //$NON-NLS-1$
-			String msg = AuthoringUIResources._WARN_FileConflict; 
-			ListSelectionDialog dlg = new ListSelectionDialog(shell,
-					dirtyEditorsWithConflict, contentProvider, labelProvider,
-					msg);
-			dlg.setTitle(title);
-			dlg.setBlockOnOpen(true);
-			dlg.open();
-			Object[] result = dlg.getResult();
-			for (int i = 0; i < result.length; i++) {
-				Object editor = result[i];
-				editorsToRefresh.add(editor);
-				dirtyEditorsWithConflict.remove(editor);
-			}
-			// remove all resources used by dirty editors with conflict from the
-			// collection of changed resources
-			//
-			for (int i = 0; i < dirtyEditorsWithConflict.size(); i++) {
-				MethodElementEditor editor = (MethodElementEditor) dirtyEditorsWithConflict
-						.get(i);
-				Collection usedResources = editor.getUsedResources();
-				changedResourceList.removeAll(usedResources);
-			}
-		}
-
-		if (!changedResourceList.isEmpty()) {
-			for (int i = 0; i < editorReferences.length; i++) {
-				IEditorReference reference = editorReferences[i];
-				IEditorPart editor = reference.getEditor(true);
-				if (editor instanceof MethodElementEditor && !editor.isDirty()) {
-					Collection usedResources = ((MethodElementEditor) editor)
-							.getUsedResources();
-					check_resource: for (int j = 0; j < changedResourceList
-							.size(); j++) {
-						Resource resource = (Resource) changedResourceList
-								.get(j);
-						if (usedResources.contains(resource)) {
-							editorsToRefresh.add(editor);
-							break check_resource;
-						}
-					}
-				}
-			}
-
-			// Reload the selected changed resources.
-			ILibraryManager manager = (ILibraryManager) LibraryService
-					.getInstance().getCurrentLibraryManager();
-			if (manager != null) {
-				manager.reloadResources(changedResourceList);
-			}
-
-			libView.getViewer().refresh();
-			ConfigurationView configView = ConfigurationView.getView();
-			if (configView != null) {
-				ctrl = configView.getViewer().getControl();
-				if (ctrl != null && !ctrl.isDisposed()) {
-					configView.getViewer().refresh();
-				}
-			}
-		}
-		if (!editorsToRefresh.isEmpty()) {
-			shell.getDisplay().asyncExec(new Runnable() {
-
-				public void run() {
-					for (int i = 0; i < editorsToRefresh.size(); i++) {
-						MethodElementEditor editor = (MethodElementEditor) editorsToRefresh
-								.get(i);
-						editor.refresh();
-					}
-				}
-
-			});
-		}
-
-		return changedResourceList;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/RichTextImageLinkContainer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/RichTextImageLinkContainer.java
deleted file mode 100755
index 6cbd80e..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/RichTextImageLinkContainer.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.authoring.ui.util;
-
-import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-
-/**
- * Simple container class used as a return value for FormUI convenience methods
- * @author Jeff Hardy
- *
- */
-public class RichTextImageLinkContainer {
-	public IMethodRichText richText;
-	public ImageHyperlink link;
-	
-	public RichTextImageLinkContainer(IMethodRichText richText, ImageHyperlink link) {
-		this.richText = richText;
-		this.link = link;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/UIHelper.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/UIHelper.java
deleted file mode 100755
index b79adeb..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/UIHelper.java
+++ /dev/null
@@ -1,513 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.editors.AbstractDiagramEditor;
-import org.eclipse.epf.authoring.ui.editors.BreakdownElementEditorInput;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.edit.LibraryEditResources;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.util.MethodElementUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.edit.validation.DependencyChecker;
-import org.eclipse.epf.library.edit.validation.IValidator;
-import org.eclipse.epf.library.edit.validation.internal.ContentElementNameValidator;
-import org.eclipse.epf.library.edit.validation.internal.ValidatorFactory;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.Deliverable;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-
-
-/**
- * Helper Utility class for UI
- * 
- * @author Shilpa Toraskar
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class UIHelper {
-
-	/**
-	 * Setting items in a table
-	 * 
-	 * @param table
-	 * @param items
-	 */
-	public static void setItems(Table table, ArrayList items) {
-		table.removeAll();
-		for (int i = 0; i < items.size(); i++) {
-			TableItem item = new TableItem(table, SWT.NONE);
-			item.setText((String) items.get(i));
-		}
-	}
-
-	/**
-	 * Create list on the given composite with given style
-	 * @param toolkit
-	 * @param parent
-	 * @param style
-	 */
-	public static List createList(FormToolkit toolkit, Composite parent,
-			int style) {
-		List list = new List(parent, style | SWT.NULL);
-		toolkit.adapt(list, true, true);
-		return list;
-	}
-
-	/*
-	 * Method will return Object[] of guidance excluding Practice.
-	 * MethodElementUtil#getSelectedGuidances(EObject) calculates all guidance.
-	 */
-	public static Object[] getSelectedGuidances(ContentElement contentElement) {
-		java.util.List list = MethodElementUtil
-				.getSelectedGuidances(contentElement);
-		for (Iterator it = list.iterator(); it.hasNext();) {
-			Object obj = it.next();
-			if (obj instanceof Practice)
-				it.remove();
-		}
-		return list.toArray();
-	}
-
-	private static String getFormPageTitlePrefixFor(MethodElement methodElement) {
-		String elementLabel = LibraryUIText.getUIText(methodElement);
-		if (methodElement instanceof WorkProduct) {
-			return LibraryUIText.TEXT_WORK_PRODUCT + " (" + elementLabel + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-		} else if (methodElement instanceof Guidance) {
-			return LibraryUIText.TEXT_GUIDANCE + " (" + elementLabel + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-		} else {
-			return elementLabel;
-		}
-	}
-
-	/**
-	 * Sets text for the given form based on the given element, including variable information of the element
-	 * if there is any.
-	 * 
-	 * @param form
-	 * @param element
-	 */
-	public static void setFormText(ScrolledForm form, MethodElement element) {
-		if (form != null && !form.isDisposed()) {
-			StringBuffer str = new StringBuffer();
-			str.append(getFormPageTitlePrefixFor(element));
-			str.append(AuthoringUIResources.editor_title_colon_with_spaces);
-			
-			if(element instanceof VariabilityElement) {
-				str.append(TngUtil.getLabel((VariabilityElement) element,
-						"", true)); //$NON-NLS-1$
-			}
-			else if(element.getName() != null){
-				str.append(element.getName());
-			}
-			form.setText(str.toString());
-		}
-	}
-
-	/**
-	 * Check whether given deliverables leads to circular dependency
-	 * @param toBePart
-	 * @param deliverable
-	 * @return
-	 * 			Boolean value to indicate whether cicular dependency is detected
-	 * @deprecated moved to {@link DependencyChecker#checkCircularDeliverables(Deliverable, Deliverable)}
-	 */
-	public static boolean checkCircularDeliverables(Deliverable toBePart,
-			Deliverable deliverable) {
-		return DependencyChecker.checkCircularDeliverables(toBePart, deliverable);
-	}
-
-	/**
-	 * Check whether deliverable parts are in chain
-	 * 
-	 * @param e
-	 * @param roots
-	 */
-	public static void deliverablePartsChain(Deliverable e, java.util.List roots) {
-		java.util.List list = e.getDeliveredWorkProducts();
-		if (list != null && list.size() > 0) {
-			for (Iterator iterator = list.iterator(); iterator.hasNext();) {
-				Object obj = iterator.next();
-				if (obj instanceof Deliverable) {
-					roots.add(obj);
-					deliverablePartsChain((Deliverable) obj, roots);
-				}
-			}
-		}
-	}
-	
-
-	/**
-	 * Resolve content element name conflicts
-	 * @param container
-	 * @param element
-	 * @param reference
-	 */
-	public static String resolveContentElementNameConflict(EObject container, MethodElement element, EReference
-			reference) {
-
-		final IValidator validator = new ContentElementNameValidator(container
-				, reference,
-				(ContentElement) element, new ValidatorFactory.TypeFilter(element));
-		
-		String msg = validator.isValid(element.getName());
-		
-		if (msg != null) {
-			String featureTxt = TngUtil.getFeatureText(UmaPackage.eINSTANCE
-					.getNamedElement_Name());
-			String title = LibraryEditResources.resolveNameConflictDialog_title; //$NON-NLS-1$			
-			String dlgMsg = NLS.bind(
-					LibraryEditResources.resolveNameConflictDialog_text,
-					StrUtil.toLower(featureTxt), element.getName());
-			String currentValue = (String) element.eGet(UmaPackage.eINSTANCE
-					.getNamedElement_Name());
-
-			IInputValidator inputValidator = new IInputValidator() {
-				public String isValid(String newText) {
-					return validator.isValid(newText);
-				}
-			};
-
-			InputDialog inputDlg = new InputDialog(
-					MsgBox.getDefaultShell(), title, dlgMsg, currentValue,
-					inputValidator);
-			if (inputDlg.open() == Window.CANCEL) {
-				throw new OperationCanceledException();
-			}
-			return inputDlg.getValue();
-		}
-		return null;
-	}
-	
-	
-	/**
-	 * Diagram editors of object itself will be closed. And Parent diagram editors 
-	 * will be refreshed.  
-	 * 
-	 */
-	public static void refreshOpenDiagramEditorsOfParent(Object refreshElement, java.util.List openEditorRefs) {
-		openEditorRefs = new ArrayList();
-		// Now refresh object's parent's diagrams.
-		IWorkbenchPage workbenchPage = AuthoringUIPlugin.getDefault()
-				.getWorkbench().getActiveWorkbenchWindow()
-				.getActivePage();
-		IEditorReference[] editorReferences = workbenchPage
-				.getEditorReferences();
-		for (int i = 0; i < editorReferences.length; i++) {
-			IEditorReference reference = editorReferences[i];
-			IEditorPart editor = reference.getEditor(true);
-			if (editor != null) {
-				IEditorInput input = editor.getEditorInput();
-				Object element = null;
-				if (input instanceof BreakdownElementEditorInput) {
-					BreakdownElementEditorInput binput = (BreakdownElementEditorInput)input;
-					if (binput.getWrapper() != null) {
-						element = binput.getWrapper();
-						if(element instanceof BreakdownElementWrapperItemProvider){
-							Object parent = ((BreakdownElementWrapperItemProvider)element).getParent(null);
-							if(parent instanceof BreakdownElementWrapperItemProvider){
-								if(element.equals(refreshElement))
-									refreshOpenDiagramEditorsOfParent(parent, openEditorRefs);
-							}
-						}
-					} else {
-						element = binput.getMethodElement();
-					}
-				} 
-				if (element != null)
-				{
-					if(element instanceof Activity){
-						if(((Activity)element).getBreakdownElements().contains(refreshElement))
-							openEditorRefs.add(reference);
-						else if(refreshElement instanceof BreakdownElementWrapperItemProvider){
-							Object localRefreshElement = refreshElement;
-							while((localRefreshElement instanceof BreakdownElementWrapperItemProvider)
-									&& ((BreakdownElementWrapperItemProvider)localRefreshElement).getOwner()!= null){
-								if(((BreakdownElementWrapperItemProvider)localRefreshElement).getOwner()
-										.equals(element)){
-									openEditorRefs.add(reference);
-								}
-								localRefreshElement = ((BreakdownElementWrapperItemProvider)localRefreshElement).getOwner();
-							}
-						}
-					}else if(element instanceof BreakdownElementWrapperItemProvider){
-						Collection c = ((BreakdownElementWrapperItemProvider)element).getChildren(element);
-						if(c != null && c.contains(refreshElement)){
-							openEditorRefs.add(reference);
-						}
-					}
-					
-				}
-			}
-		}
-		int size = openEditorRefs.size();
-		//IEditorReference[] references = new IEditorReference[size];
-		for (int i = 0; i < size; i++) {
-			IEditorReference reference = (IEditorReference) openEditorRefs.get(i);
-			IEditorPart editor = reference.getEditor(true);
-			if(editor instanceof AbstractDiagramEditor ){
-				((AbstractDiagramEditor)editor).refreshDiagram();
-			}
-		}
-	}
-	
-	/**
-	 * Close diagram editors including parent editors
-	 * @param closeElement
-	 * @param closeEditorRefs
-	 */
-	public static void closeDiagramEditorsIncludingParent(Object closeElement, java.util.List closeEditorRefs) {
-		closeEditorRefs = new ArrayList();
-		IWorkbenchPage workbenchPage = AuthoringUIPlugin.getDefault()
-				.getWorkbench().getActiveWorkbenchWindow()
-				.getActivePage();
-		IEditorReference[] editorReferences = workbenchPage
-				.getEditorReferences();
-		for (int i = 0; i < editorReferences.length; i++) {
-			IEditorReference reference = editorReferences[i];
-			IEditorPart editor = reference.getEditor(true);
-			if (editor != null) {
-				IEditorInput input = editor.getEditorInput();
-				Object element = null;
-				if (input instanceof BreakdownElementEditorInput) {
-					BreakdownElementEditorInput binput = (BreakdownElementEditorInput)input;
-					if (binput.getWrapper() != null) {
-						element = binput.getWrapper();
-						if(element instanceof BreakdownElementWrapperItemProvider){
-							Object parent = ((BreakdownElementWrapperItemProvider)element).getParent(null);
-							if(parent instanceof BreakdownElementWrapperItemProvider){
-								if(element.equals(closeElement))
-									closeDiagramEditorsIncludingParent(parent, closeEditorRefs);
-							}
-						}
-					} else {
-						element = binput.getMethodElement();
-					}
-				} 
-				if (element != null)
-				{
-						//closeEditorRefs.add(reference);
-					if(element instanceof Activity){
-						if(element.equals(closeElement))
-							closeEditorRefs.add(reference);
-						
-						if(((Activity)element).getBreakdownElements().contains(closeElement))
-							closeEditorRefs.add(reference);
-						else if(closeElement instanceof BreakdownElementWrapperItemProvider){
-							if(((BreakdownElementWrapperItemProvider)closeElement).getOwner()
-									!= null)
-								if(((BreakdownElementWrapperItemProvider)closeElement).getOwner()
-									.equals(element)){
-									closeEditorRefs.add(reference);
-								if(((BreakdownElementWrapperItemProvider)closeElement).getOwner()
-									instanceof BreakdownElementWrapperItemProvider){
-									if(((BreakdownElementWrapperItemProvider)((BreakdownElementWrapperItemProvider)
-											closeElement).getOwner()).getOwner().equals(element))
-										closeEditorRefs.add(reference);
-								}
-							}
-						}
-					}else if(element instanceof BreakdownElementWrapperItemProvider){
-						Collection c = ((BreakdownElementWrapperItemProvider)element).getChildren(element);
-						if(c != null && c.contains(closeElement)){
-							closeEditorRefs.add(reference);
-						}
-					}
-				}
-			}
-		}
-		int size = closeEditorRefs.size();
-		IEditorReference[] references = new IEditorReference[size];
-		for (int i = 0; i < size; i++) {
-			references[i] = (IEditorReference) closeEditorRefs.get(i);
-		}
-		workbenchPage.closeEditors(references, false);
-	}
-	
-	/**
-	 * Get base activity for the given activity
-	 * @param activity
-	 * @return
-	 * 			Base activity
-	 */
-	public static VariabilityElement getBaseActivity(Activity activity){
-		while (!activity.getVariabilityType().equals(
-				VariabilityType.NA_LITERAL)) {
-
-			VariabilityElement ve = activity
-					.getVariabilityBasedOnElement();
-			if ((ve != null) && (ve instanceof Activity)) {
-				activity = (Activity) ve;
-			} else {
-				break;
-			}
-		}
-		return activity;
-	}
-	
-	/**
-	 * Close diagram editors
-	 * 
-	 * @param closeElement
-	 * @param closeEditorRefs
-	 */
-	public static void closeDiagramEditors(Object closeElement, java.util.List closeEditorRefs) {
-		closeEditorRefs = new ArrayList();
-		IWorkbenchPage workbenchPage = AuthoringUIPlugin.getDefault()
-				.getWorkbench().getActiveWorkbenchWindow()
-				.getActivePage();
-		IEditorReference[] editorReferences = workbenchPage
-				.getEditorReferences();
-		for (int i = 0; i < editorReferences.length; i++) {
-			IEditorReference reference = editorReferences[i];
-			IEditorPart editor = reference.getEditor(true);
-			if (editor != null) {
-				IEditorInput input = editor.getEditorInput();
-				Object element = null;
-				if (input instanceof BreakdownElementEditorInput) {
-					BreakdownElementEditorInput binput = (BreakdownElementEditorInput)input;
-					if (binput.getWrapper() != null) {
-						element = binput.getWrapper();
-						if(element instanceof BreakdownElementWrapperItemProvider){
-							Object parent = ((BreakdownElementWrapperItemProvider)element).getParent(element);
-							if(parent instanceof BreakdownElementWrapperItemProvider){
-								if(element.equals(closeElement))
-									closeDiagramEditors(parent, closeEditorRefs);
-							}
-						}
-					} else {
-						element = binput.getMethodElement();
-					}
-				} 
-				if (element != null && element.equals(closeElement))
-				{
-						closeEditorRefs.add(reference);
-				}
-			}
-		}
-		int size = closeEditorRefs.size();
-		IEditorReference[] references = new IEditorReference[size];
-		for (int i = 0; i < size; i++) {
-			references[i] = (IEditorReference) closeEditorRefs.get(i);
-		}
-		workbenchPage.closeEditors(references, false);
-		references = null;
-	}
-	
-	/**
-	 * Diagram editors of object itself will be closed. And Parent diagram editors 
-	 * will be refreshed.  code not tested use refreshOpenDiagramEditors method.
-	 * @param object
-	 */
-	public static void syncDiagramEditors(Object object) {
-		java.util.List closeEditors = new ArrayList();
-		java.util.List refreshEditors = new ArrayList();
-		
-		IWorkbenchPage workbenchPage = AuthoringUIPlugin.getDefault()
-				.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		IEditorReference[] editorReferences = workbenchPage
-				.getEditorReferences();
-		for (int i = 0; i < editorReferences.length; i++) {
-			IEditorReference reference = editorReferences[i];
-			IEditorPart editor = reference.getEditor(true);
-			if (editor != null) {
-				IEditorInput input = editor.getEditorInput();
-				Object editorElement = null;
-				if (input instanceof BreakdownElementEditorInput) {
-					BreakdownElementEditorInput binput = (BreakdownElementEditorInput)input;
-					if(binput.getWrapper() != null){
-						editorElement = binput.getWrapper();
-					}else{
-						editorElement = binput.getMethodElement();
-					}
-				}
-				if(editorElement != null){
-					if(editorElement.equals(object)){
-						closeEditors.add(reference);
-					}else{
-						if(editorElement instanceof Activity){
-							if(((Activity)editorElement).getBreakdownElements().contains(object))
-								refreshEditors.add(reference);
-							else if(object instanceof BreakdownElementWrapperItemProvider){
-								Object local = object;
-								while((local instanceof BreakdownElementWrapperItemProvider)
-										&& ((BreakdownElementWrapperItemProvider)local).getOwner()!= null){
-									if(((BreakdownElementWrapperItemProvider)local).getOwner()
-											.equals(editorElement)){
-										refreshEditors.add(reference);
-									}
-									local = ((BreakdownElementWrapperItemProvider)local).getOwner();
-								}
-							}
-						}else if(editorElement instanceof BreakdownElementWrapperItemProvider){
-							Collection c = ((BreakdownElementWrapperItemProvider)editorElement).getChildren(editorElement);
-							if(c != null && c.contains(object)){
-								refreshEditors.add(reference);
-							}
-						}
-					}
-				}
-			}
-		}
-		// Close editor references and refresh editors.
-		int size = closeEditors.size();
-		IEditorReference[] references = new IEditorReference[size];
-		for (int i = 0; i < size; i++) {
-			references[i] = (IEditorReference) closeEditors.get(i);
-		}
-		workbenchPage.closeEditors(references, false);
-		references = null;
-		
-		size = refreshEditors.size();
-		//IEditorReference[] references = new IEditorReference[size];
-		for (int i = 0; i < size; i++) {
-			IEditorReference reference = (IEditorReference) refreshEditors.get(i);
-			IEditorPart editor = reference.getEditor(true);
-			if(editor instanceof AbstractDiagramEditor ){
-				((AbstractDiagramEditor)editor).refreshDiagram();
-			}
-		}
-		
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/UILayoutHelper.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/UILayoutHelper.java
deleted file mode 100755
index e5fe0c8..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/UILayoutHelper.java
+++ /dev/null
@@ -1,109 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.util;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.FormColors;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-
-/**
- * Layout Helper for UI. 
- * 
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class UILayoutHelper {
-
-	private static Composite editorComposite, previewComposite;
-
-	private static CTabFolder tabFolder;
-
-	/**
-	 * Create tabs in form 
-	 * @param form
-	 * @param toolkit
-	 */
-	public static void createTabs(ScrolledForm form, FormToolkit toolkit) {
-		// create tabfolder
-		tabFolder = new CTabFolder(form.getBody(), SWT.FLAT | SWT.TOP);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		tabFolder.setLayoutData(td);
-
-		// set tabfolder background color
-		Color selectedColor = toolkit.getColors()
-				.getColor(FormColors.SEPARATOR);
-		tabFolder.setSelectionBackground(new Color[] { selectedColor,
-				toolkit.getColors().getBackground() }, new int[] { 50 });
-
-		// create editor tab item and the corresponding composite
-		CTabItem editorItem = new CTabItem(tabFolder, SWT.NULL);
-		editorItem.setText(AuthoringUIText.EDITOR_TEXT);
-		editorComposite = createComposite(toolkit);
-		editorItem.setControl(editorComposite);
-
-		// create preview tab item and the corresponding composite
-		CTabItem previewItem = new CTabItem(tabFolder, SWT.NULL);
-		previewItem.setText(AuthoringUIText.PREVIEW_PAGE_TITLE);
-		previewComposite = createComposite(toolkit);
-		previewItem.setControl(previewComposite);
-
-		toolkit.paintBordersFor(tabFolder);
-
-		toolkit.adapt(tabFolder, true, true);
-
-		tabFolder.setSelection(0);
-	}
-
-	/**
-	 * Create composite on the form
-	 * 
-	 * @param toolkit
-	 * @return
-	 * 			UI composite
-	 */
-	private static Composite createComposite(FormToolkit toolkit) {
-		Composite composite = toolkit.createComposite(tabFolder);
-		composite.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		composite.setLayout(new TableWrapLayout());
-
-		return composite;
-	}
-
-	/**
-	 * Return editor composite
-	 * 
-	 * @return
-	 * 		UI Composite
-	 */
-	public static Composite getEditorComposite() {
-		return editorComposite;
-	}
-
-	/**
-	 * Return preview composite
-	 * 
-	 * @return
-	 * 		Preview composite
-	 */
-	public static Composite getPreviewComposite() {
-		return previewComposite;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/package.html
deleted file mode 100755
index 9645657..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/util/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides implementation support for the Authoring UI.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/AbstractBaseView.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/AbstractBaseView.java
deleted file mode 100755
index 8b890a1..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/AbstractBaseView.java
+++ /dev/null
@@ -1,459 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.views;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EValidator;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.UIActionDispatcher;
-import org.eclipse.epf.authoring.ui.actions.ILibraryActionBarContributor;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.ILibraryServiceListener;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.ui.LibraryUIUtil;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-
-/**
- * The abstract base class for all Method Library views.
- * 
- * @author Phong Nguyen Le
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public abstract class AbstractBaseView extends SaveableLibraryViewPart
-		implements IEditingDomainProvider, ISelectionProvider,
-		ILibraryServiceListener, IMenuListener, IViewerProvider, IGotoMarker {
-
-	protected AdapterFactoryEditingDomain editingDomain;
-
-	protected PropertySheetPage propertySheetPage;
-
-	protected UIActionDispatcher actionDispatcher = null;
-
-	protected AdapterFactory adapterFactory;
-
-	protected ILibraryActionBarContributor actionBarContributor;
-
-	protected ISelectionChangedListener selectionChangedListener;
-
-	protected IPartListener partListener = new IPartListener() {
-		public void partActivated(IWorkbenchPart part) {
-			if (part == AbstractBaseView.this) {
-				handleActivate(part);
-			}
-		}
-
-		public void partBroughtToTop(IWorkbenchPart part) {
-		}
-
-		public void partClosed(IWorkbenchPart part) {
-		}
-
-		public void partDeactivated(IWorkbenchPart part) {
-		}
-
-		public void partOpened(IWorkbenchPart part) {
-		}
-	};
-
-	/**
-	 * Handles the activation of this view.
-	 */
-	protected void handleActivate(IWorkbenchPart part) {
-		// Set the right adapter factory for the editing domain.
-		editingDomain.setAdapterFactory(adapterFactory);
-
-		// Recompute the read only state.
-		if (editingDomain.getResourceToReadOnlyMap() != null) {
-			editingDomain.getResourceToReadOnlyMap().clear();
-
-			// Refresh any actions that may become enabled or disabled.
-			setSelection(getSelection());
-		}
-	}
-
-	/**
-	 * Displays a dialog that asks if conflicting changes should be discarded.
-	 */
-	protected boolean handleDirtyConflict() {
-		String title = AuthoringUIResources._UI_FileConflict_label; 
-		String msg = AuthoringUIResources._WARN_FileConflict; 
-		return AuthoringUIPlugin.getDefault().getMsgDialog().displayPrompt(
-				title, msg);
-	}
-
-	/**
-	 * Handles changed resources when this view is activated.
-	 */
-	protected void handleChangedResources() {
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		init();
-
-		actionDispatcher = new UIActionDispatcher(this);
-
-		// Create the viewer.
-		createViewer(parent);
-
-		// Create and initialize the action bar contributor.
-		try {
-			actionBarContributor = createActionBarContributor();
-			actionBarContributor.init(getViewSite().getActionBars(), getSite()
-					.getPage());
-		} catch (Exception e) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(e);
-		}
-
-		// Add a selection change listener for the viewer.
-		Viewer viewer = getViewer();
-		if (viewer != null) {
-			if (selectionChangedListener == null) {
-				selectionChangedListener = new ISelectionChangedListener() {
-					public void selectionChanged(
-							SelectionChangedEvent selectionChangedEvent) {
-						setSelection(selectionChangedEvent.getSelection());
-					}
-				};
-			}
-			viewer.addSelectionChangedListener(selectionChangedListener);
-		}
-
-		// Add a library service listener.
-		LibraryService.getInstance().addListener(this);
-
-		Object library = LibraryService.getInstance().getCurrentMethodLibrary();
-		if (library != null) {
-			setInputForViewer(library);
-			LibraryUIUtil.updateShellTitle();
-		}
-	}
-
-	private void init() {
-		ILibraryManager manager = (ILibraryManager) LibraryService
-				.getInstance().getCurrentLibraryManager();
-		if (manager != null) {
-			editingDomain = manager.getEditingDomain();
-			adapterFactory = (ComposedAdapterFactory) editingDomain
-					.getAdapterFactory();
-		}
-
-		IViewSite site = (IViewSite) this.getSite();
-		site.setSelectionProvider(this);
-		site.getPage().addPartListener(partListener);
-	}
-
-	/**
-	 * creates a context menu for the viewer
-	 * @param viewer
-	 */
-	public void createContextMenuFor(final StructuredViewer viewer) {
-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
-		contextMenu.setRemoveAllWhenShown(true);
-		contextMenu.addMenuListener(this);
-		Menu menu = contextMenu.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(contextMenu, viewer);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuListener#menuAboutToShow(org.eclipse.jface.action.IMenuManager)
-	 */
-	public void menuAboutToShow(IMenuManager menuManager) {
-		try {
-			actionBarContributor.setActiveView(this);
-			actionBarContributor.menuAboutToShow(menuManager);
-		} catch (RuntimeException e) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(e);
-			throw e;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.domain.IEditingDomainProvider#getEditingDomain()
-	 */
-	public EditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		actionDispatcher.addSelectionChangedListener(listener);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void removeSelectionChangedListener(
-			ISelectionChangedListener listener) {
-		actionDispatcher.removeSelectionChangedListener(listener);
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.WorkbenchPart#getAdapter(Class)
-	 */
-	public Object getAdapter(Class key) {
-		if (key.equals(IGotoMarker.class)) {
-			return this;
-		} else {
-			return super.getAdapter(key);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
-	 */
-	public ISelection getSelection() {
-		return actionDispatcher.getSelection();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
-	 */
-	public void setSelection(ISelection selection) {
-		setSelection(this, selection);
-	}
-
-	private void setSelection(ISelectionProvider source, ISelection selection) {
-		actionDispatcher.setSelection(source, selection);
-		UIActionDispatcher.getInstance().setSelection(source, selection);
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.ILibraryServiceListener#libraryCreated(MethodLibrary)
-	 */
-	public void libraryCreated(MethodLibrary library) {
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.ILibraryServiceListener#libraryOpened(MethodLibrary)
-	 */
-	public void libraryOpened(MethodLibrary library) {
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.ILibraryServiceListener#libraryReopened(MethodLibrary)
-	 */
-	public void libraryReopened(MethodLibrary library) {
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.ILibraryServiceListener#libraryClosed(MethodLibrary)
-	 */
-	public void libraryClosed(MethodLibrary library) {
-		setInputForViewer(null);
-		if (adapterFactory instanceof ComposedAdapterFactory) {
-			((ComposedAdapterFactory) adapterFactory).dispose();
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.ILibraryServiceListener#librarySet(MethodLibrary)
-	 */
-	public void librarySet(MethodLibrary library) {
-		setInputForViewer(library);
-		if (library != null) {
-			actionBarContributor.setActiveView(AbstractBaseView.this);
-			LibraryUIUtil.updateShellTitle();
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.ILibraryServiceListener#configurationSet(MethodConfiguration)
-	 */
-	public void configurationSet(MethodConfiguration config) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		// ResourcesPlugin.getWorkspace().removeResourceChangeListener(
-		// resourceChangeListener);
-
-		getSite().getPage().removePartListener(partListener);
-
-		if (adapterFactory instanceof ComposedAdapterFactory) {
-			((ComposedAdapterFactory) adapterFactory).dispose();
-		}
-
-		if (actionBarContributor.getActiveView() == this) {
-			actionBarContributor.setActiveView(null);
-		}
-
-		if (propertySheetPage != null) {
-			propertySheetPage.dispose();
-		}
-
-		LibraryService.getInstance().removeListener(this);
-
-		super.dispose();
-	}
-
-	/**
-	 * This accesses a cached version of the property sheet.
-	 */
-	public IPropertySheetPage getPropertySheetPage() {
-		if (propertySheetPage == null) {
-			propertySheetPage = new PropertySheetPage() {
-				public void makeContributions(IMenuManager menuManager,
-						IToolBarManager toolBarManager,
-						IStatusLineManager statusLineManager) {
-					super.makeContributions(menuManager, toolBarManager,
-							statusLineManager);
-				}
-
-				public void setActionBars(IActionBars actionBars) {
-					super.setActionBars(actionBars);
-					if (actionBarContributor != null) {
-						actionBarContributor.shareGlobalActions(this,
-								actionBars);
-					}
-				}
-			};
-			propertySheetPage
-					.setPropertySourceProvider(new AdapterFactoryContentProvider(
-							adapterFactory));
-		}
-		return propertySheetPage;
-	}
-
-	/**
-	 * @see org.eclipse.ui.ide.IGotoMarker#gotoMarker(IMarker)
-	 */
-	public void gotoMarker(IMarker marker) {
-		try {
-			if (marker.getType().equals(EValidator.MARKER)) {
-				String uriAttribute = marker.getAttribute(
-						EValidator.URI_ATTRIBUTE, null);
-				if (uriAttribute != null) {
-					URI uri = URI.createURI(uriAttribute);
-					EObject eObject = editingDomain.getResourceSet()
-							.getEObject(uri, true);
-					if (eObject != null) {
-						setSelectionToViewer(Collections
-								.singleton(editingDomain.getWrapper(eObject)));
-					}
-				}
-			}
-		} catch (CoreException e) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(e);
-		}
-	}
-
-	/**
-	 * This sets the selection into whichever viewer is active.
-	 */
-	public void setSelectionToViewer(Collection collection) {
-		final Collection theSelection = collection;
-		if (theSelection != null && !theSelection.isEmpty()) {
-			Runnable runnable = new Runnable() {
-				public void run() {
-					// Try to select the items in the current content viewer of
-					// the editor.
-					Viewer viewer = getViewer();
-					if (viewer != null) {
-						viewer.setSelection(new StructuredSelection(
-								theSelection.toArray()), true);
-					}
-				}
-			};
-			runnable.run();
-		}
-	}
-
-	/**
-	 * @return a new AdapterFactoryContentProvider
-	 */
-	public AdapterFactoryContentProvider getContentProvider() {
-		return new AdapterFactoryContentProvider(adapterFactory);
-	}
-
-	/**
-	 * @return the viewer
-	 */
-	public abstract Viewer getViewer();
-
-	/**
-	 * Creates the viewer in the given parent
-	 * @param parent
-	 */
-	public abstract void createViewer(Composite parent);
-
-	/**
-	 * @return a new actionBarContributer
-	 */
-	public abstract ILibraryActionBarContributor createActionBarContributor();
-
-	/**
-	 * Sets the input for the viewer
-	 * @param model new input for the viewer
-	 */
-	public abstract void setInputForViewer(Object model);
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ConfigurationView.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ConfigurationView.java
deleted file mode 100755
index 4a50331..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ConfigurationView.java
+++ /dev/null
@@ -1,549 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.views;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.PerspectiveListUtil;
-import org.eclipse.epf.authoring.ui.UIActionDispatcher;
-import org.eclipse.epf.authoring.ui.actions.ConfigurationViewEditAction;
-import org.eclipse.epf.authoring.ui.actions.ILibraryActionBarContributor;
-import org.eclipse.epf.authoring.ui.actions.LibraryActionBarContributor;
-import org.eclipse.epf.authoring.ui.actions.LibraryViewFindElementAction;
-import org.eclipse.epf.authoring.ui.dnd.LibraryViewerDragAdapter;
-import org.eclipse.epf.authoring.ui.providers.ConfigurationLabelProvider;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.configuration.ConfigurationFilter;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.events.ILibraryChangeListener;
-import org.eclipse.epf.library.ui.LibraryUIManager;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IBaseLabelProvider;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.HTMLTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Displays the content of the current method configuration.
- * <p>
- * The current configuration is set via the Configuration combobox in the system
- * toolbar.
- * 
- * @author Jinhua Xi
- * @author Phong Nguyen Le
- * @author Kelvin Low
- * @since 1.0
- */
-public class ConfigurationView extends AbstractBaseView implements
-		ILibraryChangeListener {
-
-	/**
-	 * The view ID.
-	 */
-	public static final String VIEW_ID = ConfigurationView.class.getName();
-
-	private String configName;
-
-	private TreeViewer treeViewer;
-
-	private IDoubleClickListener doubleClickListener;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ConfigurationView() {
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.ViewPart#init(IViewSite)
-	 */
-	public void init(IViewSite site) throws PartInitException {
-		super.init(site);
-		createActions(site);
-		LibraryUIManager.getInstance().addConfigurationContribution();
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		super.createPartControl(parent);
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,
-				AuthoringUIHelpContexts.CONFIGURATION_VIEW_CONTEXT);
-
-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
-				new BasicCommandStack());
-		adapterFactory = (ComposedAdapterFactory) editingDomain
-				.getAdapterFactory();
-
-		// Open the current configuration.
-		setConfiguration(null);
-
-		// Add a library change listener.
-		ILibraryManager manager = LibraryService.getInstance().getCurrentLibraryManager();
-		if (manager != null) {
-			manager.addListener(this);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.ILibraryServiceListener#libraryCreated(MethodLibrary)
-	 */
-	public void libraryCreated(MethodLibrary library) {
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.ILibraryServiceListener#libraryOpened(MethodLibrary)
-	 */
-	public void libraryOpened(MethodLibrary library) {
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.ILibraryServiceListener#libraryClosed(MethodLibrary)
-	 */
-	public void libraryClosed(MethodLibrary library) {
-		setInputForViewer(null);
-		if (adapterFactory instanceof ComposedAdapterFactory) {
-			((ComposedAdapterFactory) adapterFactory).dispose();
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.ILibraryServiceListener#librarySet(MethodLibrary)
-	 */
-	public void librarySet(MethodLibrary library) {
-		setMethodConfiguration(null);
-	}
-
-	/**
-	 * @see  org.eclipse.epf.library.events.ILibraryChangeListener#libraryChanged(int, Collection)
-	 */	
-	public void libraryChanged(int option, Collection changedItems) {
-		switch (option) {
-		case ILibraryChangeListener.OPTION_DELETED:
-			if (changedItems != null) {
-				for (Iterator it = changedItems.iterator(); it.hasNext();) {
-					Object element = it.next();
-					if (element instanceof MethodConfiguration) {
-						if (((MethodConfiguration) element).getName().equals(
-								getCurrentConfig())) {
-							setMethodConfiguration(null);
-						}
-					}
-				}
-			}
-			break;
-		// Bugzilla defect 164739
-		case ILibraryChangeListener.OPTION_CHANGED:
-			if (changedItems != null) {
-				for (Iterator it = changedItems.iterator(); it.hasNext();) {
-					Object element = it.next();
-					if (element instanceof MethodConfiguration) {
-						if (((MethodConfiguration) element)
-								.equals(LibraryService.getInstance()
-										.getCurrentMethodConfiguration())) {
-							setContentDescription(((MethodConfiguration) element)
-									.getName());
-						}
-					}
-				}
-			}
-			break;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.ILibraryServiceListener#configurationSet(MethodConfiguration)
-	 */
-	public void configurationSet(MethodConfiguration config) {
-		setMethodConfiguration(config);
-	}
-
-	/**
-	 * @return the name of the currently viewed configuration
-	 */
-	public String getCurrentConfig() {
-		return configName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.views.AbstractBaseView#setFocus()
-	 */
-	public void setFocus() {
-		actionBarContributor.setActiveView(this);
-
-		IStructuredSelection selected = (IStructuredSelection) getSelection();
-		if (selected.isEmpty())
-			actionBarContributor.disableGlobalEditMenu();
-		else
-			actionBarContributor.enableGlobalEditMenu();
-
-		if (treeViewer != null) {
-			treeViewer.getControl().setFocus();
-		}
-	}
-
-	/**
-	 * Creates the viewer.
-	 */
-	public void createViewer(Composite parent) {
-		// Create the controls.
-		Composite content = new Composite(parent, SWT.NONE);
-		content.setLayoutData(new GridData(GridData.FILL_BOTH));
-		GridLayout layout = new GridLayout();
-		content.setLayout(layout);
-
-		treeViewer = new TreeViewer(content);
-		treeViewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// Add drag-and-drop support.
-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE;
-		Transfer[] transfers = new Transfer[] { HTMLTransfer.getInstance(),
-				LocalTransfer.getInstance() };
-		treeViewer.addDragSupport(dndOperations, transfers,
-				new LibraryViewerDragAdapter(treeViewer));
-
-		// Add a double click listener.
-		doubleClickListener = new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				UIActionDispatcher.getInstance().handleDoubleClickEvent(event);
-			}
-		};
-		treeViewer.addDoubleClickListener(doubleClickListener);
-
-		createContextMenuFor(treeViewer);
-	}
-
-	/**
-	 * Creates the actions.
-	 */
-	public void createActions(IViewSite viewSite) {
-		IAction editAction = new Action(AuthoringUIResources.actionLabel_edit) { 
-			public void run() {
-				UIActionDispatcher.editConfiguration(configName);
-			}
-		};
-		editAction.setToolTipText(AuthoringUIResources.editConfiguration_tooltip); 
-	}
-
-	private void reset() {
-		// Prevent memory leak.
-		configName = null;
-		if (adapterFactory != null) {
-			if (adapterFactory instanceof IDisposable) {
-				((IDisposable) adapterFactory).dispose();
-			}
-			adapterFactory = null;
-		}
-		editingDomain.setAdapterFactory(null);
-		IContentProvider contentProvider = treeViewer.getContentProvider();
-		if (contentProvider != null) {
-			contentProvider.dispose();
-		}
-		IBaseLabelProvider labelProvider = treeViewer.getLabelProvider();
-		if (labelProvider != null) {
-			labelProvider.dispose();
-		}
-		StructuredSelection emptySelection = new StructuredSelection();
-		actionDispatcher.setSelection(emptySelection);
-		UIActionDispatcher.getInstance().setSelection(emptySelection);
-	}
-
-	/**
-	 * Sets the given Method Configuration as this viewer's input
-	 * @param config
-	 */
-	public void setMethodConfiguration(MethodConfiguration config) {
-		Control ctrl = this.getViewer().getControl();
-		if (ctrl == null || ctrl.isDisposed()) {
-			return;
-		}
-
-		if (treeViewer.getInput() == config)
-			return;
-		String title = ""; //$NON-NLS-1$
-
-		if (config != null) {
-			this.configName = config.getName();
-			IFilter configFilter = new ConfigurationFilter(config, treeViewer);
-			adapterFactory = TngAdapterFactory.INSTANCE
-					.getConfigurationView_AdapterFactory(configFilter);
-			editingDomain.setAdapterFactory(adapterFactory);
-			treeViewer.setContentProvider(new AdapterFactoryContentProvider(
-					adapterFactory));
-			treeViewer.setLabelProvider(new ConfigurationLabelProvider(config,
-					adapterFactory));
-			title = config.getName();
-		} else {
-			// Prevent memory leak.
-			configName = null;
-			if (adapterFactory != null) {
-				if (adapterFactory instanceof IDisposable) {
-					((IDisposable) adapterFactory).dispose();
-				}
-				adapterFactory = null;
-			}
-			editingDomain.setAdapterFactory(null);
-			IContentProvider contentProvider = treeViewer.getContentProvider();
-			if (contentProvider != null) {
-				contentProvider.dispose();
-			}
-			IBaseLabelProvider labelProvider = treeViewer.getLabelProvider();
-			if (labelProvider != null) {
-				labelProvider.dispose();
-			}
-			StructuredSelection emptySelection = new StructuredSelection();
-			actionDispatcher.setSelection(emptySelection);
-			UIActionDispatcher.getInstance().setSelection(emptySelection);
-		}
-
-		treeViewer.setInput(config);
-		setContentDescription(title);
-	}
-
-	/**
-	 * Sets this viewer's input to the Method Configuration
-	 * with the given name 
-	 * @param name
-	 */
-	public void setConfiguration(String name) {
-		configName = name;
-
-		if (name == null) {
-			MethodConfiguration config = LibraryService.getInstance()
-					.getCurrentMethodConfiguration();
-			if (config != null) {
-				configName = config.getName();
-			}
-		}
-
-		if (configName != null) {
-			MethodConfiguration config = LibraryServiceUtil
-					.getMethodConfiguration(LibraryService.getInstance()
-							.getCurrentMethodLibrary(), configName);
-			if (config != null) {
-				setMethodConfiguration(config);
-				return;
-			}
-		}
-
-		this.configName = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.authoring.ui.views.AbstractBaseView#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		if (doubleClickListener != null) {
-			treeViewer.removeDoubleClickListener(doubleClickListener);
-		}
-	}
-
-	/**
-	 * @return the ConfigurationView object
-	 */
-	public static ConfigurationView getView() {
-		try {
-			IWorkbenchPage activePage = PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow().getActivePage();
-			if (activePage != null) {
-				IViewPart view = activePage.findView(VIEW_ID);
-				if (view == null) {
-					view = activePage.showView(VIEW_ID);
-				}
-				return (ConfigurationView) view;
-			}
-
-		} catch (Exception e) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(e);
-		}
-
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.views.AbstractBaseView#getViewer()
-	 */
-	public Viewer getViewer() {
-		return treeViewer;
-	}
-
-	private class ConfigurationViewActionBarContributor extends
-			LibraryActionBarContributor {
-
-		private LibraryViewFindElementAction libraryViewFindElementAction;
-
-		public ConfigurationViewActionBarContributor(EditingDomain editingDomain) {
-			super(editingDomain);
-		}
-
-		/**
-		 * @see org.eclipse.epf.authoring.ui.actions.LibraryActionBarContributor#init(IActionBars)
-		 */
-		public void init(IActionBars actionBars) {
-			viewActionBars = actionBars;
-			configViewEditAction = new ConfigurationViewEditAction(
-					AuthoringUIResources.actionLabel_edit); 
-			actionBars.setGlobalActionHandler(
-					"org.eclipse.epf.authoring.ui.actions.openElement", //$NON-NLS-1$
-					configViewEditAction);
-			libraryViewFindElementAction = new LibraryViewFindElementAction(
-					AuthoringUIResources.actionLabel_findElementInLibNav); 
-			actionBars.setGlobalActionHandler(
-					LibraryViewFindElementAction.ACTION_ID, 
-					libraryViewFindElementAction);
-		}
-
-		/**
-		 * @see org.eclipse.epf.authoring.ui.actions.LibraryActionBarContributor#activate()
-		 */
-		public void activate() {
-			activeViewPart.addPropertyListener(this);
-			ISelectionProvider selectionProvider = activeViewPart instanceof ISelectionProvider ? (ISelectionProvider) activeViewPart
-					: activeViewPart.getSite().getSelectionProvider();
-			selectionProvider.addSelectionChangedListener(configViewEditAction);
-			selectionProvider
-					.addSelectionChangedListener(libraryViewFindElementAction);
-			update();
-		}
-
-		/**
-		 * @see LibraryActionBarContributor#deactivate()
-		 */
-		public void deactivate() {
-			activeViewPart.removePropertyListener(this);
-			ISelectionProvider selectionProvider = activeViewPart instanceof ISelectionProvider ? (ISelectionProvider) activeViewPart
-					: activeViewPart.getSite().getSelectionProvider();
-			selectionProvider
-					.removeSelectionChangedListener(configViewEditAction);
-			selectionProvider
-					.removeSelectionChangedListener(libraryViewFindElementAction);
-		}
-
-		/**
-		 * @see LibraryActionBarContributor#update()
-		 */
-		public void update() {
-			ISelectionProvider selectionProvider = activeViewPart instanceof ISelectionProvider ? (ISelectionProvider) activeViewPart
-					: activeViewPart.getSite().getSelectionProvider();
-			ISelection selection = selectionProvider.getSelection();
-			IStructuredSelection structuredSelection = selection instanceof IStructuredSelection ? (IStructuredSelection) selection
-					: StructuredSelection.EMPTY;
-			configViewEditAction.selectionChanged(structuredSelection);
-			libraryViewFindElementAction.selectionChanged(structuredSelection);
-		}
-
-		/**
-		 * @see LibraryActionBarContributor#selectionChanged(SelectionChangedEvent)
-		 */
-		public void selectionChanged(SelectionChangedEvent event) {
-		}
-
-		/**
-		 * @see LibraryActionBarContributor#disableGlobalEditMenu()
-		 */
-		public void disableGlobalEditMenu() {
-			configViewEditAction.setEnabled(false);
-		}
-
-		/**
-		 * @see LibraryActionBarContributor#enableGlobalEditMenu()
-		 */
-		public void enableGlobalEditMenu() {
-			configViewEditAction.setEnabled(true);
-		}
-
-		/**
-		 * @see LibraryActionBarContributor#menuAboutToShow(IMenuManager)
-		 */
-		public void menuAboutToShow(IMenuManager menuManager) {
-			// Add our standard markers.
-			menuManager.add(new Separator("additions")); //$NON-NLS-1$
-			menuManager.add(new Separator("edit")); //$NON-NLS-1$
-
-			// Add our other standard marker.
-			menuManager.add(new Separator("additions-end")); //$NON-NLS-1$
-
-			addGlobalActions(menuManager);
-
-			menuManager.add(new Separator());
-			menuManager.add(new ActionContributionItem(configViewEditAction));
-			if (PerspectiveListUtil.isAuthoringPerspective()) {
-				menuManager.add(new ActionContributionItem(
-						libraryViewFindElementAction));
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.views.AbstractBaseView#createActionBarContributor()
-	 */
-	public ILibraryActionBarContributor createActionBarContributor() {
-		return new ConfigurationViewActionBarContributor(editingDomain);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.views.AbstractBaseView#setInputForViewer(Object)
-	 */
-	public void setInputForViewer(Object model) {
-		if ((model == null) || (model instanceof MethodConfiguration)) {
-			setMethodConfiguration((MethodConfiguration) model);
-		} else {
-			reset();
-		}
-	}
-	
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ConfigurationViewer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ConfigurationViewer.java
deleted file mode 100755
index bbf98e4..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ConfigurationViewer.java
+++ /dev/null
@@ -1,67 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.views;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Widget;
-
-/**
- * Displays the selectable plug-ins and packages of a method configuration in a
- * tree viewer.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class ConfigurationViewer extends CheckboxTreeViewer {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ConfigurationViewer(Composite parent) {
-		super(parent);
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ConfigurationViewer(Composite parent, int style) {
-		super(parent, style);
-	}
-
-	/**
-	 * Selects the given element in the tree.
-	 */
-	public void setSelection(Object element) {
-		super.expandToLevel(element, 0);
-		Widget ctrl = super.findItem(element);
-		if (ctrl != null) {
-			List items = new ArrayList();
-			items.add(ctrl);
-			super.setSelection(items);
-			this.getTree().setFocus();
-		}
-	}
-
-	/**
-	 * Refreshes the content of the viewer.
-	 */
-	public void refresh(final Object element, final boolean updateLabels) {
-		Object[] checked = this.getCheckedElements();
-		super.refresh(element, updateLabels);
-		this.setCheckedElements(checked);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ContentView.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ContentView.java
deleted file mode 100755
index 8f0e726..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ContentView.java
+++ /dev/null
@@ -1,504 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.views;
-
-import java.io.File;
-import java.util.Collection;
-
-import org.eclipse.epf.authoring.gef.viewer.ActivityDiagramService;
-import org.eclipse.epf.authoring.gef.viewer.NewActivityDiagramService;
-import org.eclipse.epf.authoring.ui.AuthoringUIImages;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.BrowsingPerspective;
-import org.eclipse.epf.authoring.ui.UIActionDispatcher;
-import org.eclipse.epf.common.utils.PerspectiveUtil;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.ILibraryServiceListener;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.events.ILibraryChangeListener;
-import org.eclipse.epf.library.layout.ElementLayoutManager;
-import org.eclipse.epf.library.layout.HtmlBuilder;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IPerspectiveDescriptor;
-import org.eclipse.ui.IPerspectiveListener;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- * The Content view.
- * <p>
- * Displays the HTML representation of a Method element.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class ContentView extends ViewPart {
-
-	/**
-	 * The view ID.
-	 */
-	public static final String VIEW_ID = ContentView.class.getName();
-
-	private ElementHTMLViewer contentViewer;
-
-	private Object displayedElement;
-
-	private IPartListener partListener = new IPartListener() {
-		public void partActivated(IWorkbenchPart part) {
-			handleSelection(UIActionDispatcher.getInstance()
-					.getSelectionSource(), UIActionDispatcher.getInstance()
-					.getSelection());
-		}
-
-		public void partBroughtToTop(IWorkbenchPart part) {
-		}
-
-		public void partClosed(IWorkbenchPart part) {
-		}
-
-		public void partDeactivated(IWorkbenchPart part) {
-		}
-
-		public void partOpened(IWorkbenchPart part) {
-		}
-	};
-
-	private ISelectionChangedListener selectionChangeListener = new ISelectionChangedListener() {
-		public void selectionChanged(SelectionChangedEvent event) {
-			handleSelection(event.getSource(), event.getSelection());
-		}
-	};
-
-	private ILibraryChangeListener libraryChangeListener = new ILibraryChangeListener() {
-		public void libraryChanged(int option, Collection changedItems) {
-//			if (option == ILibraryChangeListener.OPTION_LOADED
-//					|| option == ILibraryChangeListener.OPTION_CREATED) {
-//				if (contentViewer != null) {
-//					contentViewer.setHtmlBuilder(new HtmlBuilder());
-//					contentViewer.getBrowser().redraw();
-//				}
-//			}
-
-			if (changedItems != null && displayedElement != null) {
-				if (changedItems.contains(displayedElement)) {
-					displayedElement = null;
-				}
-			}
-		}
-	};
-
-	private ILibraryServiceListener libSvcListener = new ILibraryServiceListener() {
-
-		public void configurationSet(MethodConfiguration config) {
-			// System.out.println("configuration set: " + LibraryUtil.getTypeName(config));
-			contentViewer.getBrowser().setUrl("about:blank"); //$NON-NLS-1$
-			displayedElement = null;
-		}
-
-		public void libraryClosed(MethodLibrary library) {
-			// System.out.println("Library closed: " + LibraryUtil.getTypeName(library));
-		}
-
-		public void libraryCreated(MethodLibrary library) {
-			// System.out.println("Library created: " + LibraryUtil.getTypeName(library));
-			cleanup();
-		}
-
-		public void libraryOpened(MethodLibrary library) {
-			// System.out.println("Library opened: " + LibraryUtil.getTypeName(library));
-			cleanup();
-		}
-
-		public void libraryReopened(MethodLibrary library) {
-			// System.out.println("Library reopened: " + LibraryUtil.getTypeName(library));
-			cleanup();
-		}
-
-		public void librarySet(MethodLibrary library) {
-			// System.out.println("Library set: " + LibraryUtil.getTypeName(library));
-		}
-		
-		private void cleanup() {
-			if (contentViewer != null) {
-				contentViewer.setHtmlBuilder(new HtmlBuilder());
-				contentViewer.getBrowser().redraw();
-			}
-		}
-	};
-	
-	// Page navigation actions.
-	private Action backAction;
-
-	private Action forwardAction;
-
-	private Action stopAction;
-
-	private Action refreshAction;
-
-	private Action printAction;
-
-	// A hidden composite to hold the diagram viewer for diagram image
-	// generation.
-	private Composite diagramViewerHolder;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ContentView() {
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		try {
-			GridLayout layout = new GridLayout();
-			layout.marginWidth = 0;
-			layout.marginHeight = 0;
-			layout.horizontalSpacing = 0;
-			layout.verticalSpacing = 0;
-			parent.setLayout(layout);
-			parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			contentViewer = new ElementHTMLViewer(parent);
-			diagramViewerHolder = new Composite(parent, SWT.NONE);
-			diagramViewerHolder.setLayoutData(new GridData(1, 1)); // size
-			// can't be
-			// 0,0
-			// otherwise
-			// the
-			// diagram
-			// will not
-			// be
-			// painted
-			diagramViewerHolder.setLayout(new GridLayout());
-			diagramViewerHolder.setVisible(false);
-
-			// Create the page navigation tool buttons.
-			createActions();
-
-			// Add a part listener to monitor part activation and update this
-			// view
-			// as and when needed.
-			getSite().getWorkbenchWindow().getPartService().addPartListener(
-					partListener);
-
-			getSite().getWorkbenchWindow().addPerspectiveListener(
-					new IPerspectiveListener() {
-						public void perspectiveActivated(IWorkbenchPage page,
-								IPerspectiveDescriptor desc) {
-						}
-
-						public void perspectiveChanged(IWorkbenchPage page,
-								IPerspectiveDescriptor desc, String id) {
-							if (desc.getId().equals(
-									BrowsingPerspective.PERSPECTIVE_ID)) {
-								if (id
-										.equals(IWorkbenchPage.CHANGE_EDITOR_AREA_SHOW)) {
-									page.setEditorAreaVisible(false);
-									AuthoringUIPlugin
-											.getDefault()
-											.getMsgDialog()
-											.displayWarning(
-													AuthoringUIResources.warningDialog_title, 
-													AuthoringUIResources.addEditorToPerspectiveWarning_msg); 
-								}
-							}
-						}
-					});
-
-			// Add selection change listener to update this view as and when
-			// needed.
-			UIActionDispatcher.getInstance().addSelectionChangedListener(
-					selectionChangeListener);
-
-			LibraryService.getInstance().addListener(libSvcListener);
-
-			ILibraryManager manager = LibraryService.getInstance().getCurrentLibraryManager();
-			if (manager != null) {
-				manager.addListener(libraryChangeListener);
-			}
-		} catch (Exception e) {
-			// TODO: Display an error dialog.
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus
-	 */
-	public void setFocus() {
-		contentViewer.setFocus();
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.WorkbenchPart#dispose
-	 */
-	public void dispose() {
-		LibraryService.getInstance().removeListener(libSvcListener);
-
-		ILibraryManager manager = LibraryService.getInstance().getCurrentLibraryManager();
-		if (manager != null) {
-			manager.removeListener(libraryChangeListener);
-		}
-		UIActionDispatcher.getInstance().removeSelectionChangedListener(
-				selectionChangeListener);
-		getSite().getWorkbenchWindow().getPartService().removePartListener(
-				partListener);
-	}
-
-	/**
-	 * Creates the actions for this view.
-	 */
-	protected void createActions() {
-		backAction = new Action() {
-			public void run() {
-				Browser browser = contentViewer.getBrowser();
-				if (browser != null) {
-					browser.back();
-				}
-			}
-		};
-		backAction.setText(AuthoringUIResources.back_text); 
-		backAction.setToolTipText(AuthoringUIResources.back_text); 
-		backAction.setImageDescriptor(PlatformUI.getWorkbench()
-				.getSharedImages().getImageDescriptor(
-						ISharedImages.IMG_TOOL_BACK));
-
-		forwardAction = new Action() {
-			public void run() {
-				Browser browser = contentViewer.getBrowser();
-				if (browser != null) {
-					browser.forward();
-				}
-			}
-		};
-		forwardAction.setText(AuthoringUIResources.forward_text); 
-		forwardAction.setToolTipText(AuthoringUIResources.forward_text); 
-		forwardAction.setImageDescriptor(PlatformUI.getWorkbench()
-				.getSharedImages().getImageDescriptor(
-						ISharedImages.IMG_TOOL_FORWARD));
-
-		stopAction = new Action() {
-			public void run() {
-				Browser browser = contentViewer.getBrowser();
-				if (browser != null) {
-					browser.stop();
-				}
-			}
-		};
-		stopAction.setText(AuthoringUIResources.stop_text); 
-		stopAction.setToolTipText(AuthoringUIResources.stop_text); 
-		stopAction.setImageDescriptor(AuthoringUIImages.IMG_DESC_STOP);
-
-		refreshAction = new Action() {
-			public void run() {
-				// Browser browser = contentViewer.getBrowser();
-				// if (browser != null) {
-				// browser.refresh();
-				// }
-
-				// need to regenerate the content
-				contentViewer.refresh();
-			}
-		};
-		refreshAction.setText(AuthoringUIResources.refresh_text); 
-		refreshAction.setToolTipText(AuthoringUIResources.refresh_text); 
-		refreshAction.setImageDescriptor(AuthoringUIImages.IMG_DESC_REFRESH);
-
-		printAction = new Action() {
-			public void run() {
-				contentViewer.print();
-			}
-		};
-		printAction.setText(AuthoringUIResources.print_text); 
-		printAction.setToolTipText(AuthoringUIResources.print_text); 
-		printAction.setImageDescriptor(AuthoringUIImages.IMG_DESC_PRINT);
-
-		IActionBars bars = getViewSite().getActionBars();
-		IToolBarManager manager = bars.getToolBarManager();
-		manager.add(backAction);
-		manager.add(forwardAction);
-		manager.add(stopAction);
-		manager.add(refreshAction);
-		manager.add(printAction);
-	}
-
-	/**
-	 * Handles the given selection.
-	 * 
-	 * @param source
-	 *            The Library or Configuration view.
-	 * @param selection
-	 *            The selection in the Library or Configuration view.
-	 */
-	protected void handleSelection(Object source, ISelection selection) {
-		if (selection == null) {
-			return;
-		}
-
-		IWorkbenchPage activePage = getSite().getWorkbenchWindow()
-				.getActivePage();
-		if (activePage == null) {
-			return;
-		}
-
-		IViewPart view = activePage.findView(VIEW_ID);
-		if (view == null) {
-			return;
-		}
-
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection sel = (IStructuredSelection) selection;
-			Object[] selectedElements = sel.toArray();
-			if (selectedElements != null && selectedElements.length > 0) {
-				Object element = selectedElements[0];
-				
-				// don't unwrap the object. 
-				// For activity, we need to wrapped item provider to get the suppress status.
-				// Object element = LibraryUtil.unwrap(selectedElement);
-				if (displayedElement != null && displayedElement == element) {
-					displayedElement = null;
-					return;
-				}
-				if (displayContentPage(source, element)) {
-					displayedElement = element;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Displays the content page for the given ContentElement.
-	 * 
-	 * @param source
-	 *            The Library or Configuration view.
-	 * @param element
-	 *            The selected Method element.
-	 * @return <code>true</code> if the content page is displayed
-	 *         successfully.
-	 */
-	protected boolean displayContentPage(Object source, Object raw_element) {
-		Object element = LibraryUtil.unwrap(raw_element);
-		element = ViewHelper.handleDangling(element);
-		if (element == null) {
-			return false;
-		}
-
-		ElementLayoutManager layoutMgr = null;
-		boolean isBrowsing = PerspectiveUtil
-				.isActivePerspective(BrowsingPerspective.PERSPECTIVE_ID);
-		boolean isConfigSource = (source != null)
-				&& (source instanceof ConfigurationView);
-
-		// if in browsing but the source is not from configruation view
-		// ignore it
-		if (isBrowsing && !isConfigSource) {
-			return false;
-		}
-
-		if (isConfigSource) {
-			// Get the Element Layout Manager for the current configuration.
-			layoutMgr = LibraryService.getInstance()
-					.getCurrentConfigurationManager().getElementLayoutManager();
-
-			// Add the activity diagram service to generate diagram images.
-			
-			String newDiagrams = AuthoringUIPlugin.getDefault().getPreferenceStore().getString("PUBLISH_NEW_DIAGRAM");
-			Boolean newDiagram = new Boolean(newDiagrams);
-			if(newDiagram.booleanValue()){
-				NewActivityDiagramService diagramService = (NewActivityDiagramService) layoutMgr
-					.getActivityDiagramService();
-				if (diagramService == null) {
-					diagramService = new NewActivityDiagramService(
-						diagramViewerHolder,
-						new File(layoutMgr.getPublishDir()));
-					layoutMgr.setActivityDiagramService(diagramService);
-				}
-//				 For Activity Detail Diagram 
-				boolean option = LibraryUIPreferences.getPublishUnopenActivitydd();
-				diagramService.setPublishedUnCreatedADD(option);
-				
-				// For Activity Diagram 
-				option = LibraryUIPreferences.getPublishADForActivityExtension();
-				diagramService.setPublishADForActivityExtension(option);
-			}else{
-//				 Add the activity diagram service to generate diagram images.
-				ActivityDiagramService diagramService = (ActivityDiagramService) layoutMgr
-						.getActivityDiagramService();
-				if (diagramService == null) {
-					diagramService = new ActivityDiagramService(
-							diagramViewerHolder,
-							new File(layoutMgr.getPublishDir()));
-					layoutMgr.setActivityDiagramService(diagramService);
-				}
-				
-				// For Activity Detail Diagram 
-				boolean option = LibraryUIPreferences.getPublishUnopenActivitydd();
-				diagramService.setPublishedUnCreatedADD(option);
-				
-				// For Activity Diagram 
-				option = LibraryUIPreferences.getPublishADForActivityExtension();
-				diagramService.setPublishADForActivityExtension(option);
-			}
-			
-			
-			
-		}
-
-		contentViewer.setLayoutManager(layoutMgr);
-		contentViewer.showElementContent(raw_element);
-
-		return true;
-	}
-
-	/**
-	 * Displays the HTML content page for a Method element.
-	 * 
-	 * @param element
-	 *            A Method element.
-	 * @return <code>true</code> if the HTML content page is displayed
-	 *         successfully.
-	 */
-	public boolean displayHTMLContentPage(Object element) {
-		element = LibraryUtil.unwrap(element);
-		element = ViewHelper.handleDangling(element);
-		if (element != null) {
-			contentViewer.setLayoutManager(null);
-			contentViewer.showElementContent(element);
-			return true;
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ElementHTMLViewer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ElementHTMLViewer.java
deleted file mode 100755
index 0109e28..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ElementHTMLViewer.java
+++ /dev/null
@@ -1,456 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.views;
-
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.library.edit.process.ActivityWrapperItemProvider;
-import org.eclipse.epf.library.layout.ElementLayoutManager;
-import org.eclipse.epf.library.layout.HtmlBuilder;
-import org.eclipse.epf.library.layout.IElementLayout;
-import org.eclipse.epf.library.layout.elements.AbstractProcessElementLayout;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.browser.LocationAdapter;
-import org.eclipse.swt.browser.LocationEvent;
-import org.eclipse.swt.browser.OpenWindowListener;
-import org.eclipse.swt.browser.StatusTextEvent;
-import org.eclipse.swt.browser.StatusTextListener;
-import org.eclipse.swt.browser.WindowEvent;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Displays the HTML representation of a Method element in a SWT Browser.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class ElementHTMLViewer {
-
-//	// The default HTML wrappers for disabling the "Display Tree Browser" link
-//	// in the HTML content pages.
-//	private static final String DEFAULT_CONTENT_WRAPPER_START = "<html><head> <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head><title>Rational Unfied Process</title>" //$NON-NLS-1$
-//			+ "<script language=\"javascript\">function init() { parent.ory_toc=\"disable\"; parent.contentframe.location=\""; //$NON-NLS-1$
-//
-//	private static final String DEFAULT_CONTENT_WRAPPER_END = "\"; }</script></head>" //$NON-NLS-1$
-//			+ "<frameset rows=\"100%,*\" frameborder=\"no\" border=\"0\" framespacing=\"0\" id=\"contentframeset\" name=\"contentframeset\">" //$NON-NLS-1$
-//			+ "<frame src=\"about:blank\" id=\"contentframe\" name=\"contentframe\" scrolling=\"auto\"/>" //$NON-NLS-1$
-//			+ "<frame src=\"about:blank\" id=\"blankframe\" name=\"blankframe\" onload=\"init()\"/>" //$NON-NLS-1$
-//			+ "</frameset></html>"; //$NON-NLS-1$
-
-//	// The default HTML wrappers for printing the process content pages.
-//	private static final String DEFAULT_PRINT_WRAPPER_START = DEFAULT_CONTENT_WRAPPER_START
-//			+ "print();"; //$NON-NLS-1$
-//
-//	private static final String DEFAULT_PRINT_WRAPPER_END = DEFAULT_CONTENT_WRAPPER_END;
-//
-//	private static final String PRINT_FILE = "print.html"; //$NON-NLS-1$
-
-	// The HTML wrappers for disabling the "Display Tree Browser" link in the
-	// HTML content pages.
-//	private String contentWrapperSart;
-//
-//	private String contentWrapperEnd;
-
-//	// The HTML wrappers for printing the HTML content pages.
-//	private String printWrapperSart;
-//
-//	private String printWrapperEnd;
-//
-//	// The built-in browser for printing the HTML pages.
-//	// don't use a second 
-//	private Browser printBrowser;
-
-	protected Browser browser = null;
-
-	protected Composite parent;
-
-	private String currentLocation = null;
-
-	// save the current text from the status listener
-	// we need this to open browser with this url 
-	// since under linux browser can't be opened automatically, which is really bad
-	private String currentText = null;
-	private HtmlBuilder htmlBuilder;
-
-	private Cursor waitCursor = null;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ElementHTMLViewer(Composite parent) {
-		this.parent = parent;
-		htmlBuilder = new HtmlBuilder();
-		createControl();
-	}
-
-	/**
-	 * Creates the SWT browser controls for viewing and printing the HTML
-	 * content pages.
-	 */
-	private void createControl() {
-		try {
-			browser = new Browser(parent, SWT.NONE);
-			browser.setLayoutData(new GridData(GridData.FILL_BOTH|GridData.GRAB_VERTICAL));
-			browser.addLocationListener(new LocationAdapter() {
-				public void changed(LocationEvent e) {
-					//System.out.println("location changed");
-				}
-
-				public void changing(LocationEvent e) {
-					//System.out.println("location changing...");
-					// Get the current location.
-					String location = getElementUrl(e.location);
-					if ( location == null || location.startsWith(ResourceHelper.URL_STR_JAVASCRIPT))
-					{
-						return;
-					}
-					if (isLocationChanged(location)) {
-						// Save the current location for printing purposes.
-						currentLocation = location;
-						generateHtml(currentLocation);
-					}
-				}
-			});
-
-			browser.addStatusTextListener(new StatusTextListener()
-			{
-				public void changed(StatusTextEvent event)
-				{
-					// Get the current text.
-					String text = event.text;
-					if (text != null && text.length() > 0)
-					{
-						// Save the current text for application launching purposes.
-						currentText = text;
-						//System.out.println("Status changed: " + text);
-					}
-				}
-			});
-			
-			browser.addOpenWindowListener(new OpenWindowListener(){
-
-				public void open(WindowEvent event) {
-					// handle open window.
-					// with mozilla in linux, open window does not work
-					//System.out.println("Open window event: " + event);
-					
-					// windows can launch the browser without problem
-					// linux needs more care
-					if (SWT.getPlatform().equals("win32")) //$NON-NLS-1$
-					{
-						return;
-					}
-					
-					Display.getCurrent().asyncExec(new Runnable()
-					{
-					    public void run()
-						{
-							try
-							{
-//								// if the url is a resource with relative path, find the absolute path
-//								if ( currentText.startsWith("file:") )
-//								{
-//									// get the file path from the 
-//								}
-																
-//								// open another swt browser since we have no (simple) way of creating a system default browser
-//								// the Eclipse guys hide all the good apis as internal
-								Shell shell = new Shell();
-								GridLayout layout = new GridLayout();
-								layout.marginHeight = 0;
-								layout.marginWidth = 0;
-								shell.setLayout(layout);
-								Browser popup_browser = new Browser(shell, SWT.NONE);
-								popup_browser.setLayoutData(new GridData(GridData.FILL_BOTH|GridData.GRAB_HORIZONTAL|GridData.GRAB_VERTICAL));
-								popup_browser.setUrl(currentText);
-																
-								shell.open();
-
-							}
-							catch (Exception e)
-							{
-								e.printStackTrace();
-							}
-						}
-					});
-				}});
-			
-//			// don't use a seperate browser for printing since this will lose the 
-//			// states of the current page, for example, the expanded sections, etc.
-//			// Jinhua Xi,  3/5/2007
-//			// Create the hidden browser used for printing the HTML content
-//			// pages.
-//			printBrowser = new Browser(parent, SWT.NONE);
-//			printBrowser.setSize(1, 1);
-//			printBrowser.setVisible(false);
-//
-//			// Linux: There is unused space in preview/browsing, which is in grey.
-//			// this is needed for linux
-//			GridData gd = new GridData();
-//			gd.heightHint = 1;
-//			printBrowser.setLayoutData(gd);
-			
-			
-			// Read the HTML wrappers for disabling the "Display Tree Browser"
-			// link in the HTML content pages.
-//			contentWrapperSart = HTMLWrappers
-//					.getString("CONTENT_WRAPPER_START"); //$NON-NLS-1$
-//			if (contentWrapperSart == null) {
-//				contentWrapperSart = DEFAULT_CONTENT_WRAPPER_START;
-//			}
-//			contentWrapperEnd = HTMLWrappers.getString("CONTENT_WRAPPER_END"); //$NON-NLS-1$
-//			if (contentWrapperEnd == null) {
-//				contentWrapperEnd = DEFAULT_CONTENT_WRAPPER_START;
-//			}
-
-//			// Read the HTML wrappers for printing the HTML content pages.
-//			printWrapperSart = HTMLWrappers.getString("PRINT_WRAPPER_START"); //$NON-NLS-1$
-//			if (printWrapperSart == null) {
-//				printWrapperSart = DEFAULT_PRINT_WRAPPER_START;
-//			}
-//			printWrapperEnd = HTMLWrappers.getString("PRINT_WRAPPER_END"); //$NON-NLS-1$
-//			if (printWrapperEnd == null) {
-//				printWrapperEnd = DEFAULT_PRINT_WRAPPER_END;
-//			}
-
-			waitCursor = parent.getShell().getDisplay().getSystemCursor(
-					SWT.CURSOR_WAIT);
-		} catch (Exception e) {
-			browser = null;
-			AuthoringUIPlugin.getDefault().getLogger().logError(e);
-		}
-	}
-
-	private boolean isLocationChanged(String location) {
-		if (location == null || currentLocation == null) {
-			return false;
-		}
-
-		if (File.separatorChar != '/') {
-			location = location.replace(File.separatorChar, '/');
-			String oldLocation = currentLocation.replace(File.separatorChar,
-					'/');
-
-			// Some times the corrent URL is a full path, so just compare the
-			// end.
-			return !location.endsWith(oldLocation)
-					&& !oldLocation.endsWith(location);
-		} else {
-			return !location.endsWith(currentLocation)
-					&& !currentLocation.endsWith(location);
-		}
-
-	}
-
-	/**
-	 * Returns the SWT browser that displays the HTML content pages.
-	 */
-	public Browser getBrowser() {
-		return browser;
-	}
-
-	/**
-	 * Sets focus to this control.
-	 */
-	public void setFocus() {
-		if (browser != null) {
-			browser.setFocus();
-		}
-	}
-
-	/**
-	 * Returns the HTML Builder.
-	 */
-	public HtmlBuilder getHtmlBuilder() {
-		return htmlBuilder;
-	}
-
-	/**
-	 * Sets the HTML Builder.
-	 */
-	public void setHtmlBuilder(HtmlBuilder builder) {
-		this.htmlBuilder = builder;
-	}
-
-	/**
-	 * Sets the Element Layout Manager.
-	 */
-	public void setLayoutManager(ElementLayoutManager layoutMgr) {
-		htmlBuilder.setLayoutManager(layoutMgr);
-	}
-
-
-	
-	/**
-	 * Displays the HTML representation for a Method element.
-	 */
-	public void showElementContent(Object raw_element) {
-
-		startWait();
-
-		try {
-			String file_url = "about:blank"; //$NON-NLS-1$
-			Object element = LibraryUtil.unwrap(raw_element);
-			if ( raw_element instanceof ActivityWrapperItemProvider ) {
-				ActivityWrapperItemProvider wrapper = (ActivityWrapperItemProvider)raw_element;
-				Object proc = wrapper.getTopItem();
-				if ( element instanceof MethodElement && proc instanceof org.eclipse.epf.uma.Process ) {
-					String path = AbstractProcessElementLayout.getPath(wrapper);
-					//System.out.println(topItem);
-					IElementLayout layout = htmlBuilder.getLayoutManager()
-						.createLayout((MethodElement)element, 
-								(org.eclipse.epf.uma.Process)proc, path);
-					file_url = htmlBuilder.generateHtml(layout);
-				}
-			} else if (element instanceof MethodElement) {
-					file_url = htmlBuilder.generateHtml((MethodElement)element);
-			}
-			
-			if ( file_url == null ) {
-				file_url = "about:blank"; //$NON-NLS-1$
-			}
-			// on linux, the file path need to be specified as file, otherwise it will be treated as url
-			// and casuign encoding/decoding issue
-			// Linux: Configuration names containing accented characters cannot be browsed.
-			else if (!SWT.getPlatform().equals("win32") && !file_url.startsWith("file://") && //$NON-NLS-1$ //$NON-NLS-2$
-					!file_url.equals("about:blank")) //$NON-NLS-1$
-			{
-				file_url = "file://" + file_url; //$NON-NLS-1$
-			}
-		
-			// Set the current location to avoid re-generating the HTML file in
-			// respond to a location change.
-			currentLocation = file_url;
-			browser.setUrl(file_url);
-		} catch (RuntimeException e) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(e);
-		}
-
-		endWait();
-	}
-
-	private void generateHtml(String url) {
-		startWait();
-		try {
-			htmlBuilder.generateHtml(url);
-		} catch (RuntimeException e) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(e);
-		}
-
-		endWait();
-	}
-
-	/**
-	 * Returns the element URL.
-	 */
-	private String getElementUrl(String location) {
-		if (location == null || location.length() == 0
-				|| location.equals("about:blank")  //$NON-NLS-1$
-				|| location.toLowerCase().startsWith(ResourceHelper.URL_STR_JAVASCRIPT)) {
-			return null;
-		}
-
-		location = getUrl(location);
-		if (location.indexOf(ResourceHelper.MISSING_PAGES_FOLDER) >= 0) {
-			return null;
-		}
-
-		// make sure the url is an element url, check the guid
-		if ( ResourceHelper.getGuidFromFileName(location) == null )
-		{
-			return null;
-		}
-		return location;
-	}
-
-	/**
-	 * Returns the URL for the given location.
-	 */
-	private String getUrl(String location) {
-		String publish_dir = htmlBuilder.getPublishDir();
-		String url = fixPath(location);
-		int index = url.toLowerCase().indexOf(
-				fixPath(publish_dir).toLowerCase());
-		if (index >= 0) {
-			url = url.substring(index + publish_dir.length());
-		}
-		index = url.indexOf("#"); //$NON-NLS-1$
-		if (index > 0) {
-			url = url.substring(0, index);
-		}
-		return url;
-	}
-
-	private String fixPath(String path) {
-		try {
-			path = URLDecoder.decode(path, "utf-8"); //$NON-NLS-1$
-			if (File.separatorChar != '/') {
-				return path.replace(File.separatorChar, '/');
-			}
-			return path;
-		} catch (UnsupportedEncodingException e) {
-			return ""; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Prints the current HTML page.
-	 */
-	public void print() {
-		boolean b = this.browser.execute("window.print();");
-//		if ( !b ) {
-//			final String printFile = htmlBuilder.getPublishDir() + PRINT_FILE;
-//			if (currentLocation != null) {
-//				StringBuffer wrapperHTML = new StringBuffer();
-//				wrapperHTML.append(printWrapperSart).append(currentLocation)
-//						.append(printWrapperEnd);
-//				String htmlText = wrapperHTML.toString();
-//				if (FileUtil.writeUTF8File(printFile, htmlText)) {
-//					printBrowser.setUrl(printFile);
-//				}
-//			}
-//		}
-	}
-
-	private void startWait() {
-		parent.getShell().setCursor(waitCursor);
-	}
-
-	private void endWait() {
-		parent.getShell().setCursor(null);
-	}
-
-	/**
-	 * Refreshes the content.
-	 * <p>
-	 * Regenerates the content before refreshing the browser.
-	 * 
-	 */
-	public void refresh() {
-		generateHtml(currentLocation);
-		browser.refresh();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ElementsViewContextHelp.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ElementsViewContextHelp.java
deleted file mode 100755
index bab2059..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ElementsViewContextHelp.java
+++ /dev/null
@@ -1,172 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.views;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductType;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * 
- * Context Help for element
- * 
- * @author BingXue Xu
- * @since 1.0
- *
- */
-public class ElementsViewContextHelp {
-
-	/**
-	 * Sets the help of the given selection
-	 * @param selection
-	 * @param uiComposite
-	 */
-	public static void setHelp(ISelection selection, Composite uiComposite) {
-		IStructuredSelection selected = (IStructuredSelection) selection;
-		// if multiple items selected, only the first item's context help will
-		// be displayed
-		Object obj = selected.getFirstElement();
-		// System.out.println("$$$ Setting help for the selection obj = " +
-		// obj);
-		setHelp(obj, uiComposite);
-	}
-
-	/**
-	 * Sets the help of the object
-	 * @param obj
-	 * @param uiComposite
-	 */
-	public static void setHelp(Object obj, Composite uiComposite) {
-		if (obj == null)
-			return;
-
-		obj = LibraryUtil.unwrap(obj);
-
-		if ((obj instanceof MethodPlugin)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-		if ((obj instanceof ContentPackage)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-		if ((obj instanceof Role)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-		if ((obj instanceof Task)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-		if ((obj instanceof WorkProduct)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-		if ((obj instanceof Guidance)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-		if ((obj instanceof Discipline)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-		if ((obj instanceof DisciplineGrouping)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(
-					uiComposite,
-					AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-		if ((obj instanceof Domain)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-		if ((obj instanceof WorkProductType)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-		if ((obj instanceof RoleSet)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-		if ((obj instanceof Tool)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-		if ((obj instanceof RoleSetGrouping)) {
-			PlatformUI
-					.getWorkbench()
-					.getHelpSystem()
-					.setHelp(
-							uiComposite,
-							AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-
-		if (obj instanceof CustomCategory) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-
-		if (obj instanceof ProcessComponent) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-
-		if (obj instanceof Process) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(uiComposite,
-					AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-
-		if (obj instanceof MethodConfiguration) {
-			PlatformUI
-					.getWorkbench()
-					.getHelpSystem()
-					.setHelp(
-							uiComposite,
-							AuthoringUIHelpContexts.LIBRARY_VIEW_NODE_CONTEXT_NOT_IMPLEMENTED);
-			return;
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/HTMLWrappers.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/HTMLWrappers.java
deleted file mode 100755
index e32c99d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/HTMLWrappers.java
+++ /dev/null
@@ -1,63 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.views;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * The resource bundle for the HTML wrappers.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class HTMLWrappers {
-
-	private final static ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(HTMLWrappers.class.getName());
-
-	/**
-	 * Default private constructor to prevent this class form being
-	 * instantiated.
-	 */
-	private HTMLWrappers() {
-	}
-
-	/**
-	 * Returns the localized string given the resource key.
-	 * 
-	 * @param key
-	 *            The resource key.
-	 * @return The localized string.
-	 */
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Returns the localized formatted message for the given resource key.
-	 * 
-	 * @param key
-	 *            The resource key.
-	 * @param args
-	 *            The message arguments.
-	 * @return The localized formatted message.
-	 */
-	public static String format(String key, Object[] args) {
-		return MessageFormat.format(getString(key), args);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/HTMLWrappers.properties b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/HTMLWrappers.properties
deleted file mode 100755
index 9e58ca5..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/HTMLWrappers.properties
+++ /dev/null
@@ -1,46 +0,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.
-#-------------------------------------------------------------------------------
-
-CONTENT_WRAPPER_START=\
-  <html>\
-  <head>\
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\
-  </head>\
-  <script language="javascript">\
-  function init() { parent.ory_toc="disable"; parent.contentframe.location="
-  
-CONTENT_WRAPPER_END=\
-  "; }\
-  </script>\
-  </head>\
-  <frameset rows="100%,*" frameborder="no" border="0" framespacing="0" id="contentframeset" name="contentframeset">\
-  <frame src="about:blank" id="contentframe" name="contentframe" scrolling="auto"/>\
-  <frame src="about:blank" id="blankframe" name="blankframe" onload="init()"/>\
-  </frameset>\
-  </html>
-
-PRINT_WRAPPER_START=\
-  <html>\
-  <head>\
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\
-  </head>\
-  <script language="javascript">\
-  function init() { parent.ory_toc="disable"; }\
-  </script>\
-  </head>\
-  <frameset rows="100%,*" frameborder="no" border="0" framespacing="0" id="printframeset" name="printframeset" onload="javascript:print()">\
-  <frame src="about:blank" id="blankframe" name="blankframe" onload="init()"/>\
-  <frame src="
-
-PRINT_WRAPPER_END=\
-  " id="printframe" name="printframe" scrolling="auto" onload="javascript:parent.printframe.focus()"/>\
-  </frameset>\
-  <html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/LibraryView.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/LibraryView.java
deleted file mode 100755
index 087325b..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/LibraryView.java
+++ /dev/null
@@ -1,2287 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.views;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EventObject;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-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.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.ui.action.CopyAction;
-import org.eclipse.emf.edit.ui.action.CutAction;
-import org.eclipse.emf.edit.ui.action.DeleteAction;
-import org.eclipse.emf.edit.ui.action.PasteAction;
-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.UIActionDispatcher;
-import org.eclipse.epf.authoring.ui.actions.ILibraryActionBarContributor;
-import org.eclipse.epf.authoring.ui.actions.LayoutActionGroup;
-import org.eclipse.epf.authoring.ui.actions.LibraryActionBarContributor;
-import org.eclipse.epf.authoring.ui.actions.LibraryLockingOperationRunner;
-import org.eclipse.epf.authoring.ui.actions.LibraryViewCopyAction;
-import org.eclipse.epf.authoring.ui.actions.LibraryViewCutAction;
-import org.eclipse.epf.authoring.ui.actions.LibraryViewDeleteAction;
-import org.eclipse.epf.authoring.ui.actions.LibraryViewPasteAction;
-import org.eclipse.epf.authoring.ui.actions.NewPluginAction;
-import org.eclipse.epf.authoring.ui.dialogs.MoveDialog;
-import org.eclipse.epf.authoring.ui.dialogs.VariabilitySelection;
-import org.eclipse.epf.authoring.ui.dnd.LibraryViewerDragAdapter;
-import org.eclipse.epf.authoring.ui.editors.AbstractDiagramEditor;
-import org.eclipse.epf.authoring.ui.editors.BreakdownElementEditorInput;
-import org.eclipse.epf.authoring.ui.editors.EditorChooser;
-import org.eclipse.epf.authoring.ui.editors.IEditorKeeper;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
-import org.eclipse.epf.authoring.ui.editors.MethodElementEditorInput;
-import org.eclipse.epf.authoring.ui.editors.ProcessEditor;
-import org.eclipse.epf.authoring.ui.providers.MethodElementLabelDecorator;
-import org.eclipse.epf.authoring.ui.util.LibraryValidationMarkerHelper;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceException;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.edit.FeatureValueWrapperItemProvider;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.category.CustomCategoryItemProvider;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.edit.validation.IValidator;
-import org.eclipse.epf.library.edit.validation.IValidatorFactory;
-import org.eclipse.epf.library.persistence.ILibraryResource;
-import org.eclipse.epf.library.persistence.ILibraryResourceSet;
-import org.eclipse.epf.library.persistence.PersistenceService;
-import org.eclipse.epf.library.project.MethodLibraryProjectNature;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.library.ui.LibraryUIManager;
-import org.eclipse.epf.library.ui.dialogs.SwitchConfigDialog;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.epf.library.util.ImportExportUtil;
-import org.eclipse.epf.library.xmi.XMILibraryUtil;
-import org.eclipse.epf.persistence.FileManager;
-import org.eclipse.epf.persistence.MultiFileResourceSetImpl;
-import org.eclipse.epf.persistence.refresh.IRefreshEvent;
-import org.eclipse.epf.persistence.refresh.IRefreshHandler;
-import org.eclipse.epf.persistence.refresh.IRefreshListener;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-import org.eclipse.epf.persistence.util.LibrarySchedulingRule;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.services.ILibraryPersister;
-import org.eclipse.epf.services.Services;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.ContentCategory;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.NamedElement;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessElement;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.TeamProfile;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.epf.uma.edit.domain.TraceableAdapterFactoryEditingDomain;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.epf.uma.util.ContentDescriptionFactory;
-import org.eclipse.epf.uma.util.MessageException;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.HTMLTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IPropertyListener;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-import org.eclipse.ui.part.IShowInTarget;
-import org.eclipse.ui.part.ShowInContext;
-import org.eclipse.ui.views.markers.internal.MarkerAdapter;
-import org.eclipse.ui.views.navigator.ResourceNavigator;
-
-/**
- * The Library view.
- * <p>
- * Displays the physical representation of a Method Library.
- * 
- * @author Phong Nguyen Le
- * @author Shilpa Toraskar
- * @author Kelvin Low
- * @since 1.0
- */
-public class LibraryView extends AbstractBaseView implements IRefreshHandler,
-		IShowInTarget {
-
-	/**
-	 * The view ID.
-	 */
-	public static final String VIEW_ID = LibraryView.class.getName();
-
-	private static boolean DEBUG = AuthoringUIPlugin.getDefault().isDebugging();
-
-	protected TreeViewer treeViewer;
-
-	protected IDoubleClickListener doubleClickListener = null;
-
-	private ISelection selection;
-	
-	private LayoutActionGroup fLayoutActionSet;
-
-	// Listen to process editor activation and prompt the user to load the
-	// the process's default Configuration into the Configuration view.
-	private IPartListener editorPartListener = new IPartListener() {
-
-		public void partOpened(IWorkbenchPart part) {
-		}
-
-		public void partDeactivated(IWorkbenchPart part) {
-		}
-
-		public void partClosed(IWorkbenchPart part) {
-		}
-
-		public void partBroughtToTop(IWorkbenchPart part) {
-		}
-
-		public void partActivated(IWorkbenchPart part) {
-			if (part instanceof IEditorPart) {
-				Object obj = null;
-				if (part instanceof AbstractDiagramEditor) {
-					BreakdownElementEditorInput input = (BreakdownElementEditorInput) ((IEditorPart) part)
-							.getEditorInput();
-					if (input.getSuppression().getProcess() != null) {
-						obj = input.getSuppression().getProcess().eContainer();
-					}
-				} else {
-					obj = EditorChooser.getInstance().getSelectedEditorInput();
-				}
-				if (obj != null && obj instanceof ProcessComponent) {
-					SwitchConfigDialog dialog = new SwitchConfigDialog(Display
-							.getCurrent().getActiveShell(),
-							((ProcessComponent) obj).getProcess()
-									.getDefaultContext());
-					dialog.execute();
-				}
-			}
-		}
-
-	};
-
-	private long lastRefreshTimeStamp;
-
-	private IResourceChangeListener markerListener = new IResourceChangeListener() {
-		public void resourceChanged(IResourceChangeEvent event) {
-			if (LibraryService.getInstance().getCurrentLibraryManager() == null
-					|| LibraryService.getInstance().getCurrentLibraryManager()
-							.getEditingDomain() == null
-					|| LibraryService.getInstance().getCurrentLibraryManager()
-							.getEditingDomain().getResourceSet() == null)
-				return;
-			IResourceDelta delta = event.getDelta();
-			if (delta == null)
-				return;
-			try {
-				class ResourceDeltaVisitor implements IResourceDeltaVisitor {
-					public boolean visit(IResourceDelta delta)
-							throws CoreException {
-						if ((delta.getFlags() & IResourceDelta.MARKERS) == IResourceDelta.MARKERS) {
-							switch (delta.getKind()) {
-							case IResourceDelta.ADDED:
-							case IResourceDelta.CHANGED:
-								// show Problems View
-								ILibraryResourceSet resourceSet = ((ILibraryResourceSet) LibraryService
-										.getInstance()
-										.getCurrentLibraryManager()
-										.getEditingDomain().getResourceSet());
-								if (resourceSet.hasUnresolvedProxy()) {
-									SafeUpdateController
-											.asyncExec(new Runnable() {
-												public void run() {
-													try {
-														PlatformUI
-																.getWorkbench()
-																.getActiveWorkbenchWindow()
-																.getActivePage()
-																.showView(
-																		"org.eclipse.ui.views.ProblemView", null, IWorkbenchPage.VIEW_VISIBLE); //$NON-NLS-1$
-													} catch (Exception e) {
-														// couldn't open the
-														// problem view, too
-														// bad..
-													}
-												}
-											});
-								}
-								return false;
-							}
-						}
-						return true;
-					}
-				}
-				;
-
-				ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
-				delta.accept(visitor);
-
-			} catch (CoreException e) {
-				CommonPlugin.INSTANCE.log(e);
-			}
-
-		}
-
-	};
-
-	private IRefreshListener refreshListener = new IRefreshListener() {
-
-		public void notifyRefreshed(IRefreshEvent event) {
-			if (event.getRefreshedObjects() != null
-					&& !event.getRefreshedObjects().isEmpty()) {
-				Control ctrl = getViewer().getControl();
-				if (ctrl == null || ctrl.isDisposed())
-					return;
-
-				if (ctrl.getDisplay().getThread() == Thread.currentThread()) {
-					doRefresh(getSite().getShell());
-				} else {
-					ctrl.getDisplay().syncExec(new Runnable() {
-
-						public void run() {
-							doRefresh(null);
-						}
-
-					});
-				}
-			}
-		}
-
-	};
-
-	/**
-	 * Creates a new instance.
-	 */
-	public LibraryView() {
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		super.createPartControl(parent);
-		
-		makeActions();
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,
-				AuthoringUIHelpContexts.LIBRARY_NAVIGATOR_VIEW_CONTEXT);
-
-		RefreshJob.getInstance().setRefreshHandler(this);
-	}
-	
-	private void makeActions() {
-		fLayoutActionSet= new LayoutActionGroup(this);
-		IActionBars actionBars= getViewSite().getActionBars();
-		fLayoutActionSet.fillActionBars(actionBars);
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		// This is required to make the global edit action work the first time.
-		actionBarContributor.setActiveView(this);
-
-		IStructuredSelection selected = (IStructuredSelection) getSelection();
-		if (selected.isEmpty())
-			actionBarContributor.disableGlobalEditMenu();
-		else
-			actionBarContributor.enableGlobalEditMenu();
-
-		if (treeViewer != null) {
-			treeViewer.getControl().setFocus();
-		}
-	}
-
-	/**
-	 * Returns the underlying tree viewer.
-	 */
-	public Viewer getViewer() {
-		return treeViewer;
-	}
-
-	/**
-	 * Creates the underlying tree viewer.
-	 */
-	public void createViewer(Composite parent) {
-		treeViewer = new TreeViewer(parent) {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.viewers.StructuredViewer#handleLabelProviderChanged(org.eclipse.jface.viewers.LabelProviderChangedEvent)
-			 */
-			protected void handleLabelProviderChanged(
-					LabelProviderChangedEvent event) {
-				if (event.getElement() instanceof IResource
-						&& event.getSource() instanceof ILabelDecorator) {
-					this.refresh();
-					return;
-				}
-				super.handleLabelProviderChanged(event);
-			}
-		};
-
-		adapterFactory = TngAdapterFactory.INSTANCE
-				.getNavigatorView_ComposedAdapterFactory();
-
-		// Create the command stack that will notify this editor as commands are
-		// executed.
-		BasicCommandStack commandStack = new BasicCommandStack();
-
-		// Add a listener to set the most recent command's affected objects to
-		// be the selection of the viewer with focus.
-		commandStack.addCommandStackListener(new CommandStackListener() {
-			public void commandStackChanged(final EventObject event) {
-				Runnable runnable = new Runnable() {
-					public void run() {
-						firePropertyChange(IEditorPart.PROP_DIRTY);
-
-						// Try to select the affected objects.
-						Command mostRecentCommand = ((CommandStack) event
-								.getSource()).getMostRecentCommand();
-						if (mostRecentCommand != null) {
-							setSelectionToViewer(mostRecentCommand
-									.getAffectedObjects());
-						}
-						if (propertySheetPage != null
-								&& propertySheetPage.getControl() != null
-								&& !propertySheetPage.getControl().isDisposed()
-								&& propertySheetPage.getControl().isVisible()) {
-							propertySheetPage.refresh();
-						}
-					}
-				};
-				if (Display.getCurrent() != null) {
-					Display.getCurrent().asyncExec(runnable);
-				} else {
-					runnable.run();
-				}
-			}
-		});
-
-		// Create the editing domain with a special command stack.
-		ResourceSet resourceSet = PersistenceService.INSTANCE
-				.createResourceSet(Services.getDefaultLibraryPersistenceType());
-
-		editingDomain = new TraceableAdapterFactoryEditingDomain(
-				adapterFactory, commandStack, resourceSet);
-
-		ILibraryManager manager = (ILibraryManager) LibraryService
-				.getInstance().getCurrentLibraryManager();
-		if (manager != null) {
-			manager.registerEditingDomain(editingDomain);
-
-			manager.addPropertyListener(new IPropertyListener() {
-				public void propertyChanged(Object source, int propId) {
-					// TODO: Replace hardcoded constant with variable.
-					if (propId == 1) {
-						firePropertyChange(PROP_DIRTY);
-					}
-				}
-			});
-		}
-
-		treeViewer.setContentProvider(new AdapterFactoryContentProvider(
-				adapterFactory));
-
-		// treeViewer.setLabelProvider(new
-		// AdapterFactoryLabelProvider(adapterFactory));
-		treeViewer.setLabelProvider(new DecoratingLabelProvider(
-				new AdapterFactoryLabelProvider(adapterFactory),
-				new MethodElementLabelDecorator()));
-
-		// Add a double click listener for launching the Method editors.
-		doubleClickListener = new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				UIActionDispatcher.getInstance().handleDoubleClickEvent(event);
-			}
-		};
-		treeViewer.addDoubleClickListener(doubleClickListener);
-
-		getSite().getPage().addPartListener(editorPartListener);
-
-		ResourcesPlugin.getWorkspace()
-				.addResourceChangeListener(markerListener);
-
-		createContextMenuFor(treeViewer);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.views.AbstractBaseView#setInputForViewer(Object)
-	 */
-	public void setInputForViewer(Object model) {
-		Control ctrl = this.getViewer().getControl();
-		if (ctrl.isDisposed()) {
-			return;
-		}
-		if (model == null || model instanceof MethodLibrary) {
-			// Prevent memory leak.
-			StructuredSelection emptySelection = new StructuredSelection();
-			actionDispatcher.setSelection(emptySelection);
-			UIActionDispatcher.getInstance().setSelection(emptySelection);
-
-			getViewer().setInput(model);
-			updateLastRefreshTimestamp();
-		} else {
-			AuthoringUIPlugin
-					.getDefault()
-					.getLogger()
-					.logError(
-							"Library viewer input is not a MethodLibrary object: " + model); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void updateLastRefreshTimestamp() {
-		lastRefreshTimeStamp = System.currentTimeMillis();
-	}
-
-	/**
-	 * Returns this view.
-	 */
-	public static LibraryView getView() {
-		return (LibraryView) ViewHelper.openView(VIEW_ID);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.views.AbstractBaseView#setSelection(ISelection)
-	 */
-	public void setSelection(ISelection selection) {
-		((LibraryViewActionBarContributor) actionBarContributor)
-				.updateSelection(selection);
-
-		super.setSelection(selection);
-		this.selection = selection;
-
-		// if only one element is selected, show path to its file in status line
-		//
-		IStatusLineManager statusLineManager = getViewSite().getActionBars()
-				.getStatusLineManager();
-		if (statusLineManager != null) {
-			String path = ""; //$NON-NLS-1$
-			if (selection instanceof IStructuredSelection) {
-				IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-				if (structuredSelection.size() == 1) {
-					Object o = TngUtil.unwrap(structuredSelection
-							.getFirstElement());
-					if (o instanceof EObject) {
-						Resource resource = ((EObject) o).eResource();
-						if (resource != null) {
-							URI uri = resource.getURI();
-							if (uri != null && uri.isFile()) {
-								path = uri.toFileString();
-								if (o instanceof ContentElement) {
-									ContentDescription content = ((ContentElement) o)
-											.getPresentation();
-									if (content != null) {
-										resource = content.eResource();
-										if (resource != null) {
-											URI contentURI = resource.getURI();
-											if (contentURI != null) {
-												path = path
-														+ ",." + File.separatorChar + contentURI.deresolve(uri).toFileString(); //$NON-NLS-1$
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			statusLineManager.setMessage(path);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.ILibraryServiceListener#libraryReopened(MethodLibrary)
-	 */
-	public void libraryReopened(MethodLibrary library) {
-		refreshViews();
-	}
-
-	/**
-	 * The action bar for the library view
-	 */
-	class LibraryViewActionBarContributor extends LibraryActionBarContributor {
-
-		private IAction newPluginAction = new NewPluginAction(
-				AuthoringUIResources.new_plugin);
-
-		private IAction moveAction = new Action(AuthoringUIResources.move) {
-
-			private void doMove() {
-				Collection elementsToMove = new ArrayList();
-				IStructuredSelection selection = (IStructuredSelection) LibraryView.this.selection;
-				for (Iterator iter = selection.iterator(); iter.hasNext();) {
-					Object element = iter.next();
-					if (element instanceof MethodElement
-							|| (element = TngUtil.unwrap(element)) instanceof CustomCategory) {
-						// Handle CustomCategory specially.
-						EObject container = ((EObject) element).eContainer();
-						IStatus status = UserInteractionHelper.checkModify(
-								container, getSite().getShell());
-						if (container != null && !status.isOK()) {
-							AuthoringUIPlugin
-									.getDefault()
-									.getMsgDialog()
-									.displayError(
-											AuthoringUIResources.errorDialog_title,
-											AuthoringUIResources.errorDialog_moveError,
-											status);
-							return;
-						}
-						elementsToMove.add(element);
-					}
-				}
-
-				// TODO: Prompt the user the save editing changes for
-				// elements that will be moved.
-
-				// Remove elements from the move list if their containers are
-				// already in the move list.
-				for (Iterator iterator = elementsToMove.iterator(); iterator
-						.hasNext();) {
-					EObject element = (EObject) iterator.next();
-					boolean isContained = false;
-					check_contained: for (Iterator iter = elementsToMove
-							.iterator(); iter.hasNext();) {
-						Object e = (Object) iter.next();
-						if (UmaUtil.isContainedBy(element, e)) {
-							isContained = true;
-							break check_contained;
-						}
-					}
-					if (isContained) {
-						iterator.remove();
-					}
-				}
-
-				MoveDialog dlg = new MoveDialog(getSite().getShell(),
-						elementsToMove, editingDomain);
-				dlg.open();
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.action.Action#run()
-			 */
-			public void run() {
-				LibraryLockingOperationRunner runner = new LibraryLockingOperationRunner();
-				runner.setProgressMonitor(getActionBars()
-						.getStatusLineManager().getProgressMonitor());
-				runner.run(new IRunnableWithProgress() {
-
-					public void run(IProgressMonitor monitor)
-							throws InvocationTargetException,
-							InterruptedException {
-						doMove();
-					}
-
-				});
-			}
-		};
-
-		private IAction renameAction = new Action(
-				AuthoringUIResources.renameAction_text) {
-
-			public void run() {
-				final NamedElement e = (NamedElement) TngUtil
-						.unwrap(((IStructuredSelection) selection)
-								.getFirstElement());
-
-				IStatus status = UserInteractionHelper.checkModify(e, getSite()
-						.getShell());
-				if (!status.isOK()) {
-					AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-							AuthoringUIResources.renameDialog_title,
-							AuthoringUIResources.renameDialog_renameError,
-							status);
-					return;
-				}
-
-				if (e.eContainer() != null
-						&& e.eContainer().eResource() != e.eResource()) {
-					status = UserInteractionHelper.checkModify(e.eContainer(),
-							getSite().getShell());
-					if (!status.isOK()) {
-						AuthoringUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayError(
-										AuthoringUIResources.renameDialog_title,
-										AuthoringUIResources.renameDialog_renameError,
-										status);
-						return;
-					}
-				}
-
-				final IValidator validator = IValidatorFactory.INSTANCE
-						.createNameValidator(e, adapterFactory);
-				IInputValidator inputValidator = new IInputValidator() {
-					public String isValid(String newText) {
-						if (validator != null) {
-							return UserInteractionHelper
-									.getSimpleErrorMessage(validator
-											.isValid(newText));
-						}
-						return null;
-					}
-				};
-
-				boolean getInput = true;
-				InputDialog inputDlg = new InputDialog(Display.getCurrent()
-						.getActiveShell(), AuthoringUIResources.rename_text,
-						AuthoringUIResources.newname_text, e.getName(),
-						inputValidator);
-				while (getInput) {
-					getInput = false;
-					if (inputDlg.open() == Window.OK) {
-						final String newName = inputDlg.getValue().trim();
-						if (!newName.equals(e.getName())) {
-							if (e instanceof MethodConfiguration) {
-								String[] configNames = LibraryServiceUtil
-										.getMethodConfigurationNames(LibraryService
-												.getInstance()
-												.getCurrentMethodLibrary());
-								for (int i = 0; i < configNames.length; i++) {
-									if (newName.equals(configNames[i])) {
-										AuthoringUIPlugin
-												.getDefault()
-												.getMsgDialog()
-												.displayError(
-														AuthoringUIResources.renameDialog_title,
-														AuthoringUIResources
-																.bind(
-																		AuthoringUIResources.duplicateElementNameError_msg,
-																		newName));
-										getInput = true;
-										break;
-									}
-								}
-							}
-							if (getInput == true) {
-								inputDlg = new InputDialog(Display.getCurrent()
-										.getActiveShell(),
-										AuthoringUIResources.rename_text,
-										AuthoringUIResources.newname_text, e
-												.getName(), inputValidator);
-								continue;
-							}
-							doRename(e, newName);
-						}
-					}
-				}
-			}
-		};
-
-		private IAction replaceAction = new Action(
-				AuthoringUIResources.ElementsView_replaceAction_text) {
-
-			public void run() {
-				if (!getPage().closeAllEditors(true)) {
-					return;
-				}
-
-				final ProcessComponent procComp = (ProcessComponent) ((IStructuredSelection) selection)
-						.getFirstElement();
-				Process proc = procComp.getProcess();
-				final String typeStr;
-				if (proc instanceof CapabilityPattern) {
-					typeStr = AuthoringUIResources.ElementsView_20;
-				} else if (proc instanceof DeliveryProcess) {
-					typeStr = AuthoringUIResources.ElementsView_21;
-				} else {
-					typeStr = AuthoringUIResources.ElementsView_22;
-				}
-				DirectoryDialog dirDlg = new DirectoryDialog(getSite()
-						.getShell());
-				dirDlg.setText(AuthoringUIResources.ElementsView_replace_text);
-				dirDlg
-						.setMessage(MessageFormat
-								.format(
-										AuthoringUIResources.ElementsView_migration_dir_dlg_description_text,
-										new Object[] { typeStr }));
-				final String dir = dirDlg.open();
-				if (dir == null) {
-					return;
-				}
-
-				boolean ret = UserInteractionHelper
-						.runWithProgress(
-								new IRunnableWithProgress() {
-
-									public void run(IProgressMonitor monitor)
-											throws InvocationTargetException,
-											InterruptedException {
-										try {
-											ImportExportUtil.replace(procComp,
-													dir);
-										} catch (Exception e) {
-											throw new WrappedException(e);
-										}
-									}
-								},
-								MessageFormat
-										.format(
-												AuthoringUIResources.ElementsView_replaceingwithformat_text,
-												new Object[] { typeStr }));
-
-				if (ret) {
-					// Reopen the library.
-					LibraryUIManager.getInstance().openLibrary(
-							LibraryService.getInstance()
-									.getCurrentMethodLibraryPath());
-				}
-			}
-		};
-
-		private IAction openVariabilityDialogAction = new Action(
-				AuthoringUIResources.ElementsView_openVariabilityDialogAction_text) {
-			public void run() {
-				Object obj = TngUtil.unwrap(((IStructuredSelection) selection)
-						.getFirstElement());
-				if (obj instanceof VariabilityElement) {
-					VariabilityElement element = (VariabilityElement) obj;
-					VariabilitySelection variabilitySelection = new VariabilitySelection();
-					Object selectedObject = variabilitySelection
-							.getSelectedVariability(element);
-					if (selectedObject != null) {
-						EditorChooser.getInstance().openEditor(selectedObject);
-					}
-				}
-			}
-		};
-
-		private boolean locked;
-
-		private boolean canRename;
-
-		private boolean canMove;
-
-		private IAction showInResourceNavigatorAction = new Action(
-				AuthoringUIResources.showInResourceNavigatorAction_label) {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.action.Action#run()
-			 */
-			public void run() {
-				ResourceNavigator navigator;
-				try {
-					navigator = (ResourceNavigator) getPage().showView(
-							"org.eclipse.ui.views.ResourceNavigator"); //$NON-NLS-1$
-					Object obj = TngUtil
-							.unwrap(((IStructuredSelection) selection)
-									.getFirstElement());
-					IResource wsRes = PersistenceUtil.getWorkspaceResource(obj);
-					if (wsRes != null) {
-						navigator.getViewer().setSelection(
-								new StructuredSelection(wsRes), true);
-					}
-				} catch (PartInitException e) {
-					AuthoringUIPlugin.getDefault().getLogger().logError(e);
-				}
-			}
-		};
-
-		/**
-		 * Creates a new instance.
-		 */
-		public LibraryViewActionBarContributor(EditingDomain editingDomain) {
-			super(editingDomain);
-		}
-
-		/**
-		 * @see org.eclipse.epf.authoring.ui.actions.LibraryActionBarContributor#createDeleteAction()
-		 */
-		protected DeleteAction createDeleteAction() {
-			LibraryViewDeleteAction action = new LibraryViewDeleteAction() {
-				/**
-				 * @see org.eclipse.epf.authoring.ui.actions.ElementsViewPasteAction#updateSelection(IStructuredSelection)
-				 */
-				public boolean updateSelection(IStructuredSelection selection) {
-					if (locked) {
-						return false;
-					}
-					return super.updateSelection(selection);
-				}
-
-				public void run() {
-					String title = AuthoringUIResources.actions_LibraryActionBarContributor_deleteErrorTitle;
-					try {
-						super.run();
-					} catch (MessageException e) {
-						AuthoringUIPlugin.getDefault().getMsgDialog()
-								.displayError(title, e.getMessage());
-					} catch (Exception e) {
-						String details = TngUtil.toStackTraceString(e);
-						String message = AuthoringUIResources.actions_LibraryActionBarContributor_deleteErrorMessage;
-						String reason = AuthoringUIResources.actions_LibraryActionBarContributor_deleteErrorReason;
-						AuthoringUIPlugin.getDefault().getMsgDialog()
-								.displayError(title, message, reason, details,
-										e);
-					}
-				}
-
-				protected void deleteFailed() {
-					AuthoringUIPlugin.getDefault().getMsgDialog().displayInfo(
-							AuthoringUIResources.dlgTitle_reloadLibrary,
-							AuthoringUIResources.msg_reloadLibrary);
-
-					// Library need to be reloaded.
-					String libDir = LibraryService.getInstance()
-							.getCurrentMethodLibraryPath();
-					LibraryUIManager.getInstance().openLibrary(libDir);
-
-					// User tried to select the old selection.
-					if (activeViewPart instanceof IViewerProvider) {
-						final ArrayList elements = new ArrayList();
-						for (Iterator iter = selection.iterator(); iter
-								.hasNext();) {
-							Object e = iter.next();
-							if (e instanceof MethodElement) {
-								String guid = ((MethodElement) e).getGuid();
-								ILibraryManager manager = LibraryService
-										.getInstance()
-										.getCurrentLibraryManager();
-								if (manager != null) {
-									MethodElement element = manager
-											.getMethodElement(guid);
-									if (element != null) {
-										elements.add(element);
-									}
-								}
-							}
-						}
-						if (!elements.isEmpty()) {
-							Viewer viewer = ((IViewerProvider) activeViewPart)
-									.getViewer();
-							viewer.setSelection(new StructuredSelection(
-									elements), true);
-						}
-					}
-				}
-			};
-			action.setProgressMonitor(getActionBars().getStatusLineManager()
-					.getProgressMonitor());
-			return action;
-		}
-
-		/**
-		 * @see org.eclipse.epf.authoring.ui.actions.LibraryActionBarContributor#createCutAction()
-		 */
-		protected CutAction createCutAction() {
-			return new LibraryViewCutAction() {
-				/**
-				 * @see org.eclipse.epf.authoring.ui.actions.ElementsViewPasteAction#updateSelection(IStructuredSelection)
-				 */
-				public boolean updateSelection(IStructuredSelection selection) {
-					if (locked) {
-						return false;
-					}
-					return super.updateSelection(selection);
-				}
-			};
-		}
-
-		/**
-		 * @see org.eclipse.epf.authoring.ui.actions.LibraryActionBarContributor#createCopyAction()
-		 */
-		protected CopyAction createCopyAction() {
-			return new LibraryViewCopyAction();
-		}
-
-		/**
-		 * @see org.eclipse.epf.authoring.ui.actions.LibraryActionBarContributor#createPasteAction()
-		 */
-		protected PasteAction createPasteAction() {
-			LibraryViewPasteAction action = new LibraryViewPasteAction() {
-				/**
-				 * @see org.eclipse.epf.authoring.ui.actions.ElementsViewPasteAction#updateSelection(IStructuredSelection)
-				 */
-				public boolean updateSelection(IStructuredSelection selection) {
-					if (locked) {
-						return false;
-					}
-					return super.updateSelection(selection);
-				}
-			};
-			action.setProgressMonitor(getActionBars().getStatusLineManager()
-					.getProgressMonitor());
-			return action;
-		}
-
-		private void checkLocked() {
-			if (selection instanceof IStructuredSelection) {
-				boolean wasLocked = locked;
-				locked = ViewHelper.isLocked((IStructuredSelection) selection);
-				if (wasLocked != locked) {
-					deleteAction.setEnabled(deleteAction
-							.updateSelection((IStructuredSelection) selection));
-					cutAction.setEnabled(cutAction
-							.updateSelection((IStructuredSelection) selection));
-					pasteAction.setEnabled(pasteAction
-							.updateSelection((IStructuredSelection) selection));
-					boolean enabled = !locked;
-					renameAction.setEnabled(enabled);
-					moveAction.setEnabled(enabled);
-				}
-			}
-		}
-
-		void updateSelection(ISelection selection) {
-			IStructuredSelection sel = (IStructuredSelection) selection;
-
-			locked = ViewHelper.isLocked(sel);
-
-			boolean enabled = !locked;
-			renameAction.setEnabled(enabled);
-			moveAction.setEnabled(enabled);
-
-			canRename = canRename(sel);
-			canMove = canMove(sel);
-
-			if (!locked && sel.size() == 1
-					&& sel.getFirstElement() instanceof ProcessComponent) {
-				replaceAction.setEnabled(true);
-			} else {
-				replaceAction.setEnabled(false);
-			}
-
-			if (sel.size() == 1) {
-				Object obj = TngUtil.unwrap(((IStructuredSelection) selection)
-						.getFirstElement());
-				openVariabilityDialogAction
-						.setEnabled(obj instanceof VariabilityElement
-								&& !TngUtil.isPredefined((MethodElement) obj));
-				showInResourceNavigatorAction
-						.setEnabled(obj instanceof MethodElement);
-			}
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.epf.authoring.ui.actions.LibraryActionBarContributor#enableGlobalEditMenu()
-		 */
-		public void enableGlobalEditMenu() {
-		}
-
-		/**
-		 * @see org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor#addGlobalActions(IMenuManager)
-		 */
-		protected void addGlobalActions(IMenuManager menuManager) {
-			super.addGlobalActions(menuManager);
-			menuManager.insertAfter("fixed-additions", newPluginAction); //$NON-NLS-1$
-		}
-
-		private boolean canMove(IStructuredSelection selection) {
-			for (Iterator iter = selection.iterator(); iter.hasNext();) {
-				Object element = iter.next();
-				if ((element instanceof MethodElement)
-						&& !(element instanceof ContentCategory)
-						&& !(element instanceof MethodPlugin)
-						&& !(element instanceof MethodConfiguration)
-						&& !TngUtil.isPredefined((MethodElement) element)) {
-					return true;
-				}
-			}
-			return false;
-		}
-
-		/**
-		 * @see LibraryActionBarContributor#menuAboutToShow(IMenuManager)
-		 */
-		public void menuAboutToShow(IMenuManager menuManager) {
-			checkLocked();
-
-			// Add our standard marker.
-			menuManager.add(new Separator("fixed-additions")); //$NON-NLS-1$
-			menuManager.add(new Separator("fixed-additions-end")); //$NON-NLS-1$
-			menuManager.add(new Separator("edit")); //$NON-NLS-1$
-
-			// Add the edit menu actions.
-			menuManager.add(new ActionContributionItem(libraryViewEditAction));
-			menuManager.add(new ActionContributionItem(copyAction));
-			menuManager.add(new ActionContributionItem(pasteAction));
-			menuManager.add(new Separator());
-			menuManager.add(new ActionContributionItem(deleteAction));
-			if (canRename) {
-				menuManager.add(new ActionContributionItem(renameAction));
-			}
-			if (canMove) {
-				menuManager.add(new ActionContributionItem(moveAction));
-			}
-
-			menuManager.add(new Separator("view")); //$NON-NLS-1$
-			if (openVariabilityDialogAction.isEnabled()) {
-				menuManager.add(new ActionContributionItem(
-						openVariabilityDialogAction));
-			}
-			if (showInResourceNavigatorAction.isEnabled()) {
-				menuManager.add(new ActionContributionItem(
-						showInResourceNavigatorAction));
-			}
-			menuManager.add(new Separator());
-
-			// Add our other standard marker where other plugins will contribute
-			// menu
-			//
-			menuManager.add(new Separator("additions")); //$NON-NLS-1$
-			menuManager.add(new Separator("additions-end")); //$NON-NLS-1$
-
-			addGlobalActions(menuManager);
-
-			if (!locked) {
-				MenuManager submenuManager = null;
-				submenuManager = new MenuManager(
-						AuthoringUIResources._UI_CreateChild_menu_item);
-				populateManager(submenuManager, createChildActions, null);
-				menuManager.insertBefore("fixed-additions", submenuManager); //$NON-NLS-1$
-			}
-
-			// menuManager.add(new Action("Reload") {
-			// /*
-			// * (non-Javadoc)
-			// *
-			// * @see org.eclipse.jface.action.Action#run()
-			// */
-			// public void run() {
-			// ISelection selection = getSelection();
-			// if (selection instanceof IStructuredSelection) {
-			// Object object = ((IStructuredSelection) selection)
-			// .getFirstElement();
-			// object = TngUtil.unwrap(object);
-			// if (object instanceof InternalEObject) {
-			// InternalEObject e = ((InternalEObject) object);
-			// ILibraryResourceSet resourceSet = (ILibraryResourceSet) e
-			// .eResource().getResourceSet();
-			// resourceSet.unload(e);
-			// URI uri = e.eProxyURI();
-			// EObject newObject = resourceSet.getEObject(e, uri,
-			// true);
-			// refreshViews();
-			// }
-			// }
-			// }
-			// });
-		}
-
-		/**
-		 * Returns <code>true</code> if the selected method elements can be
-		 * renamed.
-		 */
-		private boolean canRename(IStructuredSelection selection) {
-			if (selection.size() > 1)
-				return false;
-			Object element = TngUtil.unwrap(selection.getFirstElement());
-			if (element instanceof NamedElement
-					&& !TngUtil.isPredefined((MethodElement) element)) {
-				return true;
-			}
-			return false;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.epf.authoring.ui.actions.LibraryActionBarContributor#refreshViewer(org.eclipse.jface.viewers.Viewer)
-		 */
-		protected void refreshViewer(final Viewer viewer) {
-			if (viewer == LibraryView.this.getViewer()) {
-				IRunnableWithProgress runnable = new IRunnableWithProgress() {
-
-					public void run(IProgressMonitor monitor)
-							throws InvocationTargetException,
-							InterruptedException {
-						monitor.beginTask("", 3); //$NON-NLS-1$
-						monitor
-								.subTask(AuthoringUIResources._UI_RefreshViewer_menu_item);
-						monitor.worked(1);
-						try {
-							// Refresh all loaded resources.
-							ILibraryManager manager = (ILibraryManager) LibraryService
-									.getInstance().getCurrentLibraryManager();
-							if (manager != null) {
-								ResourceSet resourceSet = manager
-										.getEditingDomain().getResourceSet();
-								if (resourceSet instanceof ILibraryResourceSet
-										&& ((ILibraryResourceSet) resourceSet)
-												.getPersistenceType()
-												.equals(
-														Services.XMI_PERSISTENCE_TYPE)) {
-									List removedResources = new ArrayList();
-									List changedResources = new ArrayList();
-									for (Iterator iter = new ArrayList(
-											resourceSet.getResources())
-											.iterator(); iter.hasNext();) {
-										Resource resource = (Resource) iter
-												.next();
-										String loc = resource.getURI()
-												.toFileString();
-										IResource wsRes = FileManager
-												.getResourceForLocation(loc);
-										if (wsRes == null) {
-											removedResources.add(resource);
-										} else if (!wsRes
-												.isSynchronized(IResource.DEPTH_ZERO)) {
-											changedResources.add(resource);
-										}
-									}
-									monitor.worked(2);
-									if (removedResources.isEmpty()
-											&& changedResources.isEmpty()) {
-										viewer.refresh();
-									} else {
-										doRefresh(removedResources,
-												changedResources, null, false);
-									}
-								} else {
-									viewer.refresh();
-								}
-							}
-						} finally {
-							monitor.done();
-						}
-					}
-
-				};
-				IRunnableContext context = new ProgressMonitorDialog(getSite()
-						.getShell());
-				try {
-					getSite().getWorkbenchWindow().getWorkbench()
-							.getProgressService().runInUI(context, runnable,
-									null);
-				} catch (Exception e) {
-					AuthoringUIPlugin.getDefault().getLogger().logError(e);
-					String title = AuthoringUIResources.ProcessEditor_refreshErrorTitle;
-					AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-							title, e.toString(), e);
-				}
-				return;
-			}
-			super.refreshViewer(viewer);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.views.AbstractBaseView#createActionBarContributor()
-	 */
-	public ILibraryActionBarContributor createActionBarContributor() {
-		ILibraryActionBarContributor actionBar = new LibraryViewActionBarContributor(
-				editingDomain);
-		return actionBar;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.views.AbstractBaseView#createContextMenuFor(org.eclipse.jface.viewers.StructuredViewer)
-	 */
-	public void createContextMenuFor(final StructuredViewer viewer) {
-		super.createContextMenuFor(viewer);
-		int dndOperations = DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_LINK;
-		Transfer[] transfers = new Transfer[] { HTMLTransfer.getInstance(),
-				TextTransfer.getInstance(), LocalTransfer.getInstance() };
-		viewer.addDragSupport(dndOperations, transfers,
-				new LibraryViewerDragAdapter(viewer));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.views.AbstractBaseView#menuAboutToShow(org.eclipse.jface.action.IMenuManager)
-	 */
-	public void menuAboutToShow(IMenuManager menuManager) {
-		super.menuAboutToShow(menuManager);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.ViewPart#init(org.eclipse.ui.IViewSite)
-	 */
-	public void init(IViewSite site) throws PartInitException {
-		super.init(site);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.views.AbstractBaseView#dispose()
-	 */
-	public void dispose() {
-		RefreshJob.getInstance().setRefreshHandler(null);
-
-		if (fLayoutActionSet != null)	
-			fLayoutActionSet.dispose();
-
-		super.dispose();
-		if (doubleClickListener != null) {
-			treeViewer.removeDoubleClickListener(doubleClickListener);
-		}
-	}
-
-	/**
-	 * @param obj
-	 *            ItemProvider
-	 * @return ProcessComponent associated with the given obj
-	 */
-	public ProcessComponent getProcessComponent(Object obj) {
-		Object parent;
-		for (parent = obj; (parent != null && !(parent instanceof ProcessComponent));) {
-			ItemProviderAdapter adapter = (ItemProviderAdapter) adapterFactory
-					.adapt(parent, ITreeItemContentProvider.class);
-			parent = adapter.getParent(parent);
-		}
-		return (ProcessComponent) parent;
-	}
-
-	private static abstract class StatusWorkspaceModifyOperation extends
-			WorkspaceModifyOperation {
-
-		protected String errMsg;
-
-		public String getErrorMessage() {
-			return errMsg;
-		}
-	}
-
-	/**
-	 * opens a Method Library
-	 * 
-	 * @param path
-	 *            path to the library
-	 */
-	public void openLibrary(final String path) {
-		// Do the work within an operation because this is a long running
-		// activity that modifies the workbench.
-		StatusWorkspaceModifyOperation operation = new StatusWorkspaceModifyOperation() {
-
-			// This is the method that gets invoked when the operation runs.
-			public void execute(IProgressMonitor monitor) {
-				monitor.beginTask(AuthoringUIResources.openingLibraryTask_name,
-						2);
-				try {
-					monitor.worked(1);
-					LibraryService.getInstance().closeCurrentMethodLibrary();
-					MethodLibrary library = XMILibraryUtil
-							.openMethodLibrary(path);
-					LibraryService.getInstance().setCurrentMethodLibrary(
-							library);
-					LibraryUIPreferences.setSavedLibraryPath(path);
-				} catch (Exception ex) {
-					if (ex instanceof IOException) {
-						String message = ex.getMessage();
-						if (message.startsWith("###")) { //$NON-NLS-1$
-							String projectFileName = message.substring(3);
-							String prompt = AuthoringUIResources.bind(
-									AuthoringUIResources.ElementsView_35,
-									(new Object[] { projectFileName }));
-							if (MsgBox.prompt(prompt, SWT.RETRY | SWT.CANCEL) == SWT.RETRY) {
-								openLibrary(path);
-							}
-						}
-					} else {
-						AuthoringUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayError(
-										AuthoringUIResources.errorDialog_title,
-										AuthoringUIResources.openLibraryError_msg,
-										ex);
-					}
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-
-		try {
-			// This runs the options, and shows progress.
-			new ProgressMonitorDialog(getSite().getShell()).run(true, false,
-					operation);
-			if (operation.getErrorMessage() == null) {
-				getSite().getPage().closeAllEditors(false);
-			}
-		} catch (Exception e) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(e);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.views.AbstractBaseView#handleActivate(org.eclipse.ui.IWorkbenchPart)
-	 */
-	protected void handleActivate(IWorkbenchPart part) {
-		super.handleActivate(part);
-
-		// TODO: Review implementation.
-		// Make sure that the method library open is not closed.
-		XMILibraryUtil.openMethodLibraryProject(LibraryService.getInstance()
-				.getCurrentMethodLibrary(), getViewSite().getActionBars()
-				.getStatusLineManager().getProgressMonitor());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.authoring.ui.views.SaveableLibraryViewPart#isSaveAsAllowed()
-	 */
-	public boolean isSaveAsAllowed() {
-		// This view should not participate in all the save commands.
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.views.SaveableLibraryViewPart#doSaveAs()
-	 */
-	public void doSaveAs() {
-	}
-	
-	private static FeatureValueWrapperItemProvider getWrapper(List listeners, Object value) {
-		for (Iterator iter = listeners.iterator(); iter.hasNext();) {
-			Object listener = (Object) iter.next();
-			if(listener instanceof FeatureValueWrapperItemProvider
-					&& TngUtil.unwrap(listener) == value) {
-				return (FeatureValueWrapperItemProvider) listener;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Used by org.eclipse.epf.authoring.ui.actions.LinkWithEditor Given an
-	 * object that is a MethodElement, selects that object in the Lib Nav
-	 * 
-	 * @param o
-	 */
-	public void setSelectionToViewer(Object object) {
-		Object o = TngUtil.unwrap(object);
-		if (!(o instanceof MethodElement))
-			return;
-		if (o instanceof MethodConfiguration) {
-			super.setSelectionToViewer(Arrays.asList(new Object[] { o }));
-			return;
-		}
-		try {
-			MethodPlugin plugin = UmaUtil.getMethodPlugin((MethodElement) o);
-			treeViewer.setExpandedState(plugin, true);
-
-			ITreeItemContentProvider pluginAdapter = (ITreeItemContentProvider) TngUtil
-					.getAdapter(plugin, ITreeItemContentProvider.class);
-
-			if (o instanceof BreakdownElement) {				
-				Process proc = TngUtil.getOwningProcess((BreakdownElement)o);
-				if(proc != null) {
-					o = proc.eContainer();
-				}
-			}
-			if (o instanceof ProcessComponent || o instanceof ProcessPackage) {
-
-				treeViewer.setExpandedState(pluginAdapter.getChildren(plugin)
-						.toArray()[1], true);
-				// Expand the process packages.
-				expandTreeViewerPackages(((MethodElement) o).eContainer());
-
-			} else {
-				ITreeItemContentProvider methodContentPkg = (ITreeItemContentProvider) pluginAdapter
-						.getChildren(plugin).toArray()[0];
-				treeViewer.setExpandedState(methodContentPkg, true);
-
-				if (o instanceof CustomCategory) {					
-					CustomCategory rootCC = TngUtil
-							.getRootCustomCategory(plugin);
-										
-					// find the tree path to the custom category from the root custom category
-					//
-					final List treePath = new ArrayList();
-					for(CustomCategory cc = (CustomCategory) o; cc != rootCC;) {
-						treePath.add(0, cc);
-						cc = (CustomCategory) AssociationHelper.getCustomCategories(cc).get(0);						 
-					}
-					Object parent = rootCC;
-					int size = treePath.size();
-					for (int i = 0; i < size; i++) {
-						Object e = treePath.get(i);
-						treeViewer.setExpandedState(parent, true);
-						// get wrapper
-						//
-						CustomCategoryItemProvider adapter = (CustomCategoryItemProvider) adapterFactory.adapt(e, ITreeItemContentProvider.class);
-						find_wrapper:
-						for (Iterator iterator = adapter.getNotifyChangedListeners().iterator(); iterator.hasNext();) {
-							Object listener = iterator.next();
-							if(listener instanceof FeatureValueWrapperItemProvider
-									&& TngUtil.unwrap(listener) == e) {
-								FeatureValueWrapperItemProvider wrapper = (FeatureValueWrapperItemProvider) listener;
-								for(;wrapper != null && wrapper.getOwner() != parent; 
-									wrapper = getWrapper(wrapper.getNotifyChangedListeners(), e)) {									
-								}
-								if(wrapper != null) {
-									parent = wrapper;
-									break find_wrapper;
-								}
-							}
-						}
-					}
-					o = parent;
-				} else if (o instanceof ContentCategory) {
-					Object stdCats = methodContentPkg.getChildren(o).toArray()[1];
-					treeViewer.setExpandedState(stdCats, true);
-
-				} else {
-					Object coreContent = methodContentPkg.getChildren(o)
-							.toArray()[0];
-					treeViewer.setExpandedState(coreContent, true);
-
-					// Expand the content packages.
-					expandTreeViewerPackages(((MethodElement) o).eContainer());
-				}
-			}
-		} catch (Exception ex) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(ex);
-		}
-
-		super.setSelectionToViewer(Arrays.asList(new Object[] { o }));
-
-		if(o instanceof ProcessComponent && object instanceof BreakdownElement) {
-			// open the process in its editor and select the breakdown element
-			//
-			IEditorKeeper.REFERENCE.getEditorKeeper().openEditor(o);
-			IEditorPart editor = getSite().getPage().findEditor(new MethodElementEditorInput((MethodElement) o));
-			if(editor instanceof ProcessEditor) {
-				ProcessEditor procEditor = ((ProcessEditor)editor);
-				String pageId;
-				if(object instanceof RoleDescriptor || object instanceof TeamProfile) {
-					pageId = ProcessEditor.TA_FORM_ID;
-				}
-				else if(object instanceof WorkProductDescriptor) {
-					pageId = ProcessEditor.WPBS_FORM_ID;
-				}
-				else {
-					pageId = ProcessEditor.WBS_FORM_ID;
-				}
-				procEditor.setActivePage(pageId);
-				procEditor.setSelectionToViewer(Collections.singletonList(object));
-			}
-		}
-	}
-
-	private void expandTreeViewerPackages(EObject e) {
-		if (e == null)
-			return;
-		if (e instanceof ContentPackage || e instanceof ProcessPackage) {
-			expandTreeViewerPackages(e.eContainer());
-			treeViewer.setExpandedState(e, true);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.persistence.util.IRefreshHandler#refresh(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void refresh(final IProgressMonitor monitor) {
-		Control ctrl = getViewer().getControl();
-		if (ctrl == null || ctrl.isDisposed())
-			return;
-
-		if (ctrl.getDisplay().getThread() == Thread.currentThread()) {
-			doRefresh(getSite().getShell());
-		} else {
-			ctrl.getDisplay().syncExec(new Runnable() {
-
-				public void run() {
-					doRefresh(null);
-				}
-
-			});
-		}
-
-	}
-
-	private void blockingRefresh(final ArrayList removedResources,
-			final ArrayList changedResources,
-			final Collection addedWorkspaceResources,
-			final boolean refreshViews, Shell shell) {
-		final IRunnableWithProgress runnable = new IRunnableWithProgress() {
-
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException, InterruptedException {
-				monitor.beginTask("", IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-				monitor
-						.subTask(AuthoringUIResources._UI_RefreshViewer_menu_item);
-				monitor.worked(1);
-				try {
-					// monitor.worked(1);
-					doRefresh(removedResources, changedResources,
-							addedWorkspaceResources, refreshViews);
-				} finally {
-					monitor.done();
-				}
-			}
-
-		};
-
-		IRunnableContext context = new ProgressMonitorDialog(shell);
-		try {
-			getSite().getWorkbenchWindow().getWorkbench().getProgressService()
-					.runInUI(
-							context,
-							runnable,
-							new LibrarySchedulingRule(LibraryService
-									.getInstance().getCurrentMethodLibrary()));
-		} catch (Exception e) {
-			AuthoringUIPlugin.getDefault().getLogger().logError(e);
-			String title = AuthoringUIResources.ProcessEditor_refreshErrorTitle;
-			AuthoringUIPlugin.getDefault().getMsgDialog().displayError(title,
-					e.toString(), e);
-		}
-	}
-
-	/**
-	 * Must be synchronized to avoid stepping on each other in reloading
-	 * resources/refreshing UI
-	 * 
-	 * @param removedResources
-	 * @param changedResources
-	 * @param addedWorkspaceResources
-	 *            collection of IResource objects that are just newly added to
-	 *            the library
-	 * @param refreshViews
-	 */
-	private synchronized void doRefresh(Collection removedResources,
-			Collection changedResources, Collection addedWorkspaceResources,
-			boolean refreshViews) {
-		HashSet editorsToRefresh = new HashSet();
-		if (!removedResources.isEmpty()) {
-			handleRemovedResources(removedResources, editorsToRefresh);
-			refreshViews = true;
-		}
-		if (!changedResources.isEmpty()) {
-			handleChangedResources(changedResources, editorsToRefresh,
-					refreshViews);
-		} else {
-			if (refreshViews) {
-				refreshViews();
-			}
-
-			if (!editorsToRefresh.isEmpty()) {
-				// refresh the editors that handleRemovedResources requested
-				//
-				for (Iterator iter = editorsToRefresh.iterator(); iter
-						.hasNext();) {
-					Object editor = iter.next();
-					if (editor instanceof MethodElementEditor) {
-						((MethodElementEditor) editor).refresh();
-					}
-				}
-			}
-		}
-		if (addedWorkspaceResources != null
-				&& !addedWorkspaceResources.isEmpty()) {
-			ILibraryManager mgr = LibraryService.getInstance()
-					.getCurrentLibraryManager();
-			if (mgr != null) {
-				ResourceSet resourceSet = mgr.getEditingDomain()
-						.getResourceSet();
-				if (resourceSet instanceof MultiFileResourceSetImpl) {
-					((MultiFileResourceSetImpl) resourceSet)
-							.loadNewResources(addedWorkspaceResources);
-				}
-			}
-		}
-	}
-
-	private boolean isViewObject(Object o) {
-		return o instanceof MethodElement
-				&& !(o instanceof ContentDescription
-						|| o instanceof ProcessElement || (o instanceof ProcessPackage && UmaUtil
-						.getProcessComponent((MethodElement) o) == null));
-	}
-
-	private void doRefresh(IRefreshEvent event, Shell shell) {
-		if (DEBUG) {
-			System.out
-					.println("Refreshed objects: " + event.getRefreshedObjects()); //$NON-NLS-1$
-		}
-		boolean refresh = false;
-		for (Iterator iter = event.getRefreshedObjects().iterator(); iter
-				.hasNext();) {
-			Object e = iter.next();
-			if (isViewObject(e)) {
-				refresh = true;
-				break;
-			}
-		}
-		if (refresh) {
-			refreshViews();
-		}
-	}
-
-	/**
-	 * Refreshes the Library View
-	 * 
-	 * @param shell
-	 */
-	private void doRefresh(Shell shell) {
-		ArrayList movedResources = new ArrayList(RefreshJob.getInstance().getMovedResources());
-		if (!movedResources.isEmpty()) {
-			for (Iterator iter = movedResources.iterator();iter.hasNext();) {
-				Object o = iter.next();
-				if (o instanceof IProject) {
-					try {
-						if (((IProject)o).hasNature(MethodLibraryProjectNature.NATURE_ID)) {
-							// TODO: safe to assume XMI library?
-							XMILibraryUtil.openMethodLibrary(((IProject)o).getLocation().toString());
-							return;
-						}
-					} catch (LibraryServiceException e) {
-						AuthoringUIPlugin.getDefault().getLogger().logError(e);
-					} catch (CoreException e) { 
-						AuthoringUIPlugin.getDefault().getLogger().logError(e);
-					}
-				}
-			}
-		}
-		final boolean refreshViews = !RefreshJob.getInstance()
-				.getReloadedBeforeRefreshResources().isEmpty()
-				|| !RefreshJob.getInstance().getAddedResources().isEmpty();
-		ArrayList removedResources = new ArrayList(RefreshJob.getInstance()
-				.getRemovedResources());
-		ArrayList changedResources = new ArrayList(RefreshJob.getInstance()
-				.getChangedResources());
-		ArrayList addedWsResources = new ArrayList(RefreshJob.getInstance()
-				.getAddedWorkspaceResources());
-
-		if (!removedResources.isEmpty() || !changedResources.isEmpty()
-				|| !addedWsResources.isEmpty() || refreshViews) {
-			blockingRefresh(removedResources, changedResources,
-					addedWsResources, refreshViews, shell);
-		}
-
-		if (!removedResources.isEmpty()) {
-			RefreshJob.getInstance().getRemovedResources().removeAll(
-					removedResources);
-		}
-		if (!changedResources.isEmpty()) {
-			RefreshJob.getInstance().getChangedResources().removeAll(
-					changedResources);
-		}
-		if (!addedWsResources.isEmpty()) {
-			RefreshJob.getInstance().getAddedWorkspaceResources().removeAll(
-					addedWsResources);
-		}
-		if (refreshViews) {
-			RefreshJob.getInstance().getReloadedBeforeRefreshResources()
-					.clear();
-			RefreshJob.getInstance().getAddedResources().clear();
-		}
-	}
-
-	/**
-	 * @param removedResources2
-	 */
-	private Collection handleRemovedResources(Collection removedResources,
-			Collection editorsToRefresh) {
-		IWorkbenchPage workbenchPage = getSite().getPage();
-		IEditorReference[] editorReferences = workbenchPage
-				.getEditorReferences();
-		ArrayList dirtyEditorsWithConflict = new ArrayList();
-		ArrayList removedResourceList = new ArrayList(removedResources);
-		if (editorsToRefresh == null) {
-			editorsToRefresh = new ArrayList();
-		}
-		// find all editor with dirty conflict
-		//
-		for (int i = 0; i < editorReferences.length; i++) {
-			IEditorReference reference = editorReferences[i];
-			IEditorPart editor = reference.getEditor(true);
-			if (editor instanceof MethodElementEditor && editor.isDirty()) {
-				MethodElementEditorInput input = (MethodElementEditorInput) editor
-						.getEditorInput();
-				Resource resource = input.getMethodElement() != null ? input
-						.getMethodElement().eResource() : null;
-				if (!removedResources.contains(resource)) {
-					Collection usedResources = ((MethodElementEditor) editor)
-							.getUsedResources();
-					check_resource: for (int j = 0; j < removedResourceList
-							.size(); j++) {
-						resource = (Resource) removedResourceList.get(j);
-						if (usedResources.contains(resource)) {
-							dirtyEditorsWithConflict.add(editor);
-							break check_resource;
-						}
-					}
-				} else {
-					editorsToRefresh.add(editor);
-				}
-			}
-		}
-
-		if (!dirtyEditorsWithConflict.isEmpty()) {
-			Object[] selected = selectDirtyEditors(dirtyEditorsWithConflict);
-			for (int i = 0; i < selected.length; i++) {
-				editorsToRefresh.add(selected[i]);
-			}
-		}
-
-		// Unload the removed resources.
-		for (Iterator iter = removedResources.iterator(); iter.hasNext();) {
-			Resource resource = (Resource) iter.next();
-			ILibraryResourceSet resourceSet = (ILibraryResourceSet) resource
-					.getResourceSet();
-			try {
-				resourceSet.unload(resource, Collections.EMPTY_MAP);
-			} catch (Exception e) {
-				CommonPlugin.INSTANCE.log(e);
-			}
-		}
-
-		ILibraryManager manager = (ILibraryManager) LibraryService
-				.getInstance().getCurrentLibraryManager();
-		if (manager != null) {
-			ResourceSet resourceSet = manager.getEditingDomain()
-					.getResourceSet();
-			if (resourceSet != null) {
-				resourceSet.getResources().removeAll(removedResources);
-			}
-		}
-
-		for (int i = 0; i < editorReferences.length; i++) {
-			IEditorReference reference = editorReferences[i];
-			IEditorPart editor = reference.getEditor(true);
-			if (editor instanceof MethodElementEditor && !editor.isDirty()) {
-				Collection usedResources = ((MethodElementEditor) editor)
-						.getUsedResources();
-				check_resource: for (int j = 0; j < removedResourceList.size(); j++) {
-					Resource resource = (Resource) removedResourceList.get(j);
-					if (usedResources.contains(resource)) {
-						editorsToRefresh.add(editor);
-						break check_resource;
-					}
-				}
-			}
-		}
-
-		return removedResources;
-	}
-
-	/**
-	 * 
-	 * @param changedResources
-	 * @return resources that have been reloaded
-	 */
-	private Collection handleChangedResources(Collection changedResources,
-			Collection editorsToRefresh, boolean forceRefreshViews) {
-		if (!forceRefreshViews) {
-			for (Iterator iter = changedResources.iterator(); iter.hasNext();) {
-				Resource resource = (Resource) iter.next();
-				if (resource instanceof ILibraryResource
-						&& ((ILibraryResource) resource).getLoadStamp() > lastRefreshTimeStamp) {
-					forceRefreshViews = true;
-					break;
-				}
-			}
-		}
-		return handleChangedResources(changedResources, null,
-				forceRefreshViews, editorsToRefresh);
-	}
-
-	/**
-	 * updates Library View when resources change
-	 * 
-	 * @param changedResources
-	 * @param editorsNotToRefresh
-	 * @param forceRefreshViews
-	 * @param editorsToRefresh
-	 * @return List of changed resources
-	 */
-	public Collection handleChangedResources(Collection changedResources,
-			Collection editorsNotToRefresh, boolean forceRefreshViews,
-			Collection editorsToRefresh) {
-		Control ctrl = getViewer().getControl();
-		if (ctrl == null || ctrl.isDisposed())
-			return Collections.EMPTY_LIST;
-
-		IWorkbenchPage workbenchPage = getSite().getPage();
-		IEditorReference[] editorReferences = workbenchPage
-				.getEditorReferences();
-		ArrayList dirtyEditorsWithConflict = new ArrayList();
-		ArrayList changedResourceList = new ArrayList(changedResources);
-		// find all editor with dirty conflict
-		//
-		for (int i = 0; i < editorReferences.length; i++) {
-			IEditorReference reference = editorReferences[i];
-			IEditorPart editor = reference.getEditor(true);
-			if (editor instanceof MethodElementEditor && editor.isDirty()) {
-				Collection usedResources = ((MethodElementEditor) editor)
-						.getUsedResources();
-				check_resource: for (int j = 0; j < changedResourceList.size(); j++) {
-					Resource resource = (Resource) changedResourceList.get(j);
-					if (usedResources.contains(resource)) {
-						dirtyEditorsWithConflict.add(editor);
-						break check_resource;
-					}
-				}
-			}
-		}
-		final ArrayList editorListToRefresh = new ArrayList();
-		if (editorsToRefresh != null) {
-			editorListToRefresh.addAll(editorsToRefresh);
-		}
-		if (!dirtyEditorsWithConflict.isEmpty()) {
-			Object[] result = selectDirtyEditors(dirtyEditorsWithConflict);
-			for (int i = 0; i < result.length; i++) {
-				Object editor = result[i];
-				if ((editorsNotToRefresh == null || !editorsNotToRefresh
-						.contains(editor))
-						&& (editorsToRefresh == null || !editorsToRefresh
-								.contains(editor))) {
-					editorListToRefresh.add(editor);
-					dirtyEditorsWithConflict.remove(editor);
-				}
-			}
-			// remove all resources used by dirty editors with conflict from the
-			// collection of changed resources
-			//
-			for (int i = 0; i < dirtyEditorsWithConflict.size(); i++) {
-				MethodElementEditor editor = (MethodElementEditor) dirtyEditorsWithConflict
-						.get(i);
-				Collection usedResources = editor.getUsedResources();
-				changedResourceList.removeAll(usedResources);
-			}
-		}
-
-		boolean refreshViews = false;
-		if (!changedResourceList.isEmpty()) {
-			for (int i = 0; i < editorReferences.length; i++) {
-				IEditorReference reference = editorReferences[i];
-				IEditorPart editor = reference.getEditor(true);
-				if (editor instanceof MethodElementEditor && !editor.isDirty()) {
-					Collection usedResources = ((MethodElementEditor) editor)
-							.getUsedResources();
-					check_resource: for (int j = 0; j < changedResourceList
-							.size(); j++) {
-						Resource resource = (Resource) changedResourceList
-								.get(j);
-						if (usedResources.contains(resource)) {
-							editorListToRefresh.add(editor);
-							break check_resource;
-						}
-					}
-				}
-			}
-
-			// Reload the selected changed resources.
-			ILibraryManager manager = (ILibraryManager) LibraryService
-					.getInstance().getCurrentLibraryManager();
-			if (manager != null) {
-				Collection reloadedResources = manager
-						.reloadResources(changedResourceList);
-
-				refreshViews = !reloadedResources.isEmpty();
-			}
-		}
-		if (forceRefreshViews || refreshViews) {
-			refreshViews();
-		}
-		if (!editorListToRefresh.isEmpty()) {
-			for (int i = 0; i < editorListToRefresh.size(); i++) {
-				MethodElementEditor editor = (MethodElementEditor) editorListToRefresh
-						.get(i);
-				try {
-					editor.refresh();
-				} catch (Exception e) {
-					AuthoringUIPlugin.getDefault().getLogger().logError(e);
-				}
-			}
-		}
-		return changedResourceList;
-	}
-
-	/**
-	 * Refreshes Library and Configuration views if necessary
-	 * 
-	 */
-	public synchronized void refreshViews() {
-		EObject input = (EObject) getViewer().getInput();
-		if (input != null) {
-			if (input.eIsProxy()) {
-				setInputForViewer(RefreshJob.getInstance().resolve(input));
-			} else {
-				ISelection selection = getViewer().getSelection();
-				getViewer().refresh();
-				updateLastRefreshTimestamp();
-				if (selection instanceof IStructuredSelection) {
-					IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-					Object o = null;
-					if (structuredSelection.size() == 1
-							&& (o = structuredSelection.getFirstElement()) instanceof EObject
-							&& ((EObject) o).eIsProxy()) {
-						o = RefreshJob.getInstance().resolve((EObject) o);
-						try {
-							setSelectionToViewer(o);
-						} catch (Exception e) {
-							AuthoringUIPlugin.getDefault().getLogger()
-									.logError(e);
-						}
-					} else {
-						restoreSelection(getViewer(), selection);
-					}
-				}
-			}
-		}
-
-		ConfigurationView configView = ConfigurationView.getView();
-		if (configView != null) {
-			Control ctrl = configView.getViewer().getControl();
-			if (ctrl != null && !ctrl.isDisposed()) {
-				input = (EObject) configView.getViewer().getInput();
-				if (input != null) {
-					if (input.eIsProxy()) {
-						configView.setInputForViewer(RefreshJob.getInstance()
-								.resolve(input));
-					} else {
-						ISelection selection = configView.getViewer()
-								.getSelection();
-						configView.getViewer().refresh();
-						restoreSelection(configView.getViewer(), selection);
-					}
-				}
-			}
-		}
-	}
-
-	private Object[] selectDirtyEditors(List dirtyEditors) {
-		String title = AuthoringUIResources._UI_FileConflict_label;
-		String msg = AuthoringUIResources.selectEditorsToDiscardConflictChanges;
-		return selectEditors(dirtyEditors, title, msg);
-	}
-
-	private Object[] selectEditors(List editors, String title, String msg) {
-		// prompt user to discard changes in editors that conflict with outside
-		// change
-		//
-		IStructuredContentProvider contentProvider = new IStructuredContentProvider() {
-			List fContents;
-
-			public Object[] getElements(Object inputElement) {
-				if (fContents != null && fContents == inputElement)
-					return fContents.toArray();
-				return new Object[0];
-			}
-
-			public void dispose() {
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput,
-					Object newInput) {
-				if (newInput instanceof List)
-					fContents = (List) newInput;
-				else
-					fContents = null;
-
-			}
-
-		};
-		ILabelProvider labelProvider = new LabelProvider() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
-			 */
-			public String getText(Object element) {
-				if (element instanceof IEditorPart) {
-					return ((IEditorPart) element).getTitle();
-				}
-				return super.getText(element);
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
-			 */
-			public Image getImage(Object element) {
-				if (element instanceof IEditorPart) {
-					return ((IEditorPart) element).getTitleImage();
-				}
-				return super.getImage(element);
-			}
-		};
-		ListSelectionDialog dlg = new ListSelectionDialog(getSite().getShell(),
-				editors, contentProvider, labelProvider, msg);
-		dlg.setTitle(title);
-		dlg.setBlockOnOpen(true);
-		dlg.open();
-		return dlg.getResult();
-	}
-
-	private static void restoreSelection(Viewer viewer, ISelection selection) {
-		if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-			boolean restore = false;
-			ArrayList resolvedList = new ArrayList();
-			for (Iterator iter = structuredSelection.iterator(); iter.hasNext();) {
-				Object object = iter.next();
-				if (object instanceof EObject) {
-					EObject eObj = (EObject) object;
-					if (eObj.eIsProxy()) {
-						eObj = RefreshJob.getInstance().resolve(eObj);
-						restore = true;
-					}
-					if (!eObj.eIsProxy()) {
-						resolvedList.add(eObj);
-					}
-				}
-			}
-			if (restore) {
-				viewer
-						.setSelection(new StructuredSelection(resolvedList),
-								true);
-			}
-		}
-	}
-
-	/**
-	 * rename an element
-	 * 
-	 * @param e
-	 *            element to rename
-	 * @param newName
-	 *            the new name
-	 */
-	public static void runRename(final NamedElement e, final String newName) {
-		Display.getDefault().syncExec(new Runnable() {
-			public void run() {
-				doRename(e, newName);
-			}
-		});
-	}
-
-	private static void doRename(final NamedElement e, final String newName) {
-		String oldName = e.getName();
-
-		if (false) {
-			System.out.println("LD> oldName: " + oldName); //$NON-NLS-1$
-			System.out.println("LD> newName: " + newName); //$NON-NLS-1$
-			System.out.println(""); //$NON-NLS-1$
-		}
-
-		e.setName(newName);
-
-		// Special handling for ProcessComponent to keep its
-		// name and the name of its process in sync.
-		if (e instanceof ProcessComponent) {
-			Process proc = ((ProcessComponent) e).getProcess();
-			proc.setName(newName);
-		}
-
-		Runnable runnable = new Runnable() {
-
-			public void run() {
-				// Save the modified file(s).
-				ILibraryPersister.FailSafeMethodLibraryPersister persister = LibraryServiceUtil
-						.getCurrentPersister().getFailSafePersister();
-				try {
-					persister.save(e.eResource());
-					persister.commit();
-
-					Collection renamedResources = new ArrayList();
-					if (e instanceof ContentElement
-							&& ContentDescriptionFactory
-									.hasPresentation((MethodElement) e)) {
-						renamedResources.add(((ContentElement) e)
-								.getPresentation().eResource());
-					}
-					renamedResources.add(e.eResource());
-
-					persister.adjustLocation(renamedResources);
-				} catch (Exception e1) {
-					AuthoringUIPlugin.getDefault().getLogger().logError(e1);
-
-					persister.rollback();
-
-					String details = e1.getMessage() != null ? MessageFormat
-							.format(": {0}", new Object[] { e1.getMessage() }) : ""; //$NON-NLS-1$ //$NON-NLS-2$
-					String msg = MessageFormat.format(
-							AuthoringUIResources.ElementsView_err_saving,
-							new Object[] {
-									e.eResource().getURI().toFileString(),
-									details });
-					throw new MessageException(msg);
-				}
-			}
-
-		};
-
-		if (!UserInteractionHelper.runWithProgress(runnable,
-				AuthoringUIResources.ElementsView_renaming_text)) {
-			// restore old name
-			e.setName(oldName);
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.IShowInTarget#show(org.eclipse.ui.part.ShowInContext)
-	 */
-	public boolean show(ShowInContext context) {
-		if (context.getInput() instanceof MarkerAdapter) {
-			IViewPart view = getViewSite().getPage().findView(
-					"org.eclipse.ui.views.ProblemView"); //$NON-NLS-1$
-			ISelectionProvider selectionProvider = view.getViewSite()
-					.getSelectionProvider();
-			StructuredSelection selection = (StructuredSelection) selectionProvider
-					.getSelection();
-			Object o = selection.getFirstElement();
-			if (o instanceof IMarker) {
-				IMarker marker = (IMarker) o;
-				try {
-					String guid = (String) marker
-							.getAttribute(LibraryValidationMarkerHelper.GUID);
-					if (guid != null) {
-						IResource wsRes = marker.getResource();
-						ILibraryManager libMgr = LibraryService.getInstance().getCurrentLibraryManager();						
-						Resource resource = libMgr.getEditingDomain().getResourceSet()
-								.getResource(
-										URI.createFileURI(wsRes.getLocation()
-												.toString()), false);
-						Object element;
-						if(resource != null) {
-							element = resource.getEObject(guid);
-						}
-						else {
-							element = libMgr.getMethodElement(guid);
-						}
-						if(element != null) {
-							setSelectionToViewer(element);
-							return true;
-						}
-					}
-				} catch (CoreException e) {
-					AuthoringUIPlugin.getDefault().getLogger().logError(e);
-				}
-			}
-		} else if (context.getSelection() instanceof TreeSelection) {
-			// from search results view
-			TreeSelection sel = (TreeSelection)context.getSelection();
-			setSelectionToViewer(sel.getFirstElement());
-		}
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/MessageContentProvider.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/MessageContentProvider.java
deleted file mode 100755
index 8edc230..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/MessageContentProvider.java
+++ /dev/null
@@ -1,162 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.views;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.library.configuration.ConfigurationClosure;
-import org.eclipse.epf.library.configuration.ElementDependencyError;
-import org.eclipse.epf.library.configuration.ErrorInfo;
-import org.eclipse.epf.library.services.ElementReference;
-import org.eclipse.epf.library.services.PackageDependency;
-import org.eclipse.epf.library.services.PackageReference;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * The content provider for a Configuration error or warning message.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class MessageContentProvider implements ITreeContentProvider {
-
-	private ConfigurationClosure closure;
-
-	public MessageContentProvider(ConfigurationClosure closure) {
-		this.closure = closure;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		if (closure == null) {
-			return new Object[0];
-		}
-
-		if (inputElement instanceof ConfigurationClosure) {
-			return ((ConfigurationClosure) inputElement).getDependencyErrors();
-		} else if (inputElement instanceof ElementDependencyError) {
-			List errors = ((ElementDependencyError) inputElement).getAll();
-			if (errors != null) {
-				return errors.toArray();
-			}
-			return null;
-		} else if (inputElement instanceof ErrorInfo) {
-			ErrorInfo info = (ErrorInfo) inputElement;
-			int relation = info.getRelation();
-			MethodElement ownerElement = (MethodElement) info.getOwnerElement();
-			MethodElement causeElement = (MethodElement) info.getCauseElement();
-			PackageDependency dep;
-			PackageReference pkgRef = null;
-
-			if (relation == ErrorInfo.REFERENCE_TO) {
-				dep = closure.getConfigurationManager().getDependencyManager()
-						.getDependency(ownerElement);
-				pkgRef = dep.getReference(causeElement, false);
-			} else if (relation == ErrorInfo.REFERENCED_BY) {
-				dep = closure.getConfigurationManager().getDependencyManager()
-						.getDependency(causeElement);
-				pkgRef = dep.getReference(ownerElement, false);
-			}
-
-			if (pkgRef != null) {
-				List refErrors = new ArrayList();
-				for (Iterator it = pkgRef.getReferences().iterator(); it
-						.hasNext();) {
-					ElementReference ref = (ElementReference) it.next();
-
-					// Don't show the entry if the reference can be ignored.
-					if (ref.canIgnore()) {
-						continue;
-					}
-					ErrorInfo elementError;
-					if (relation == ErrorInfo.REFERENCE_TO) {
-						elementError = new ErrorInfo(
-								info.getErrorType(),
-								"", ref.getElement(), ref.getRefElement(), relation); //$NON-NLS-1$
-					} else {
-						elementError = new ErrorInfo(
-								info.getErrorType(),
-								"", ref.getRefElement(), ref.getElement(), relation); //$NON-NLS-1$
-					}
-
-					refErrors.add(elementError);
-				}
-
-				return refErrors.toArray();
-			}
-
-		}
-
-		return new Object[] {};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
-	public void dispose() {
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		return getElements(parentElement);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object element) {
-		if (element instanceof ConfigurationClosure) {
-			return null;
-		} else if (element instanceof ErrorInfo) {
-			return this.closure;
-		} else {
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object element) {
-		if (element instanceof ConfigurationClosure) {
-			return true;
-		} else if (element instanceof ElementDependencyError) {
-			return ((ElementDependencyError) element).size() > 0;
-		} else if (element instanceof ErrorInfo) {
-			if (((ErrorInfo) element).getErrorMessage().length() > 0) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/MessageLabelProvider.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/MessageLabelProvider.java
deleted file mode 100755
index 2fa6165..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/MessageLabelProvider.java
+++ /dev/null
@@ -1,202 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.views;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.library.configuration.ElementDependencyError;
-import org.eclipse.epf.library.configuration.ErrorInfo;
-import org.eclipse.epf.library.services.ElementReference;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * The label provider for a Configuration error or warning message.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class MessageLabelProvider extends AdapterFactoryLabelProvider {
-
-	public MessageLabelProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object object) {
-		boolean is_error = false;
-		boolean is_warning = false;
-		if (object instanceof ElementDependencyError) {
-			ElementDependencyError error = (ElementDependencyError) object;
-			is_error = error.isError() || error.isChildError();
-			is_warning = error.isWarning() || error.isChildWarning();
-		} else if ((object instanceof ErrorInfo)) {
-			ErrorInfo error = (ErrorInfo) object;
-			String msg = error.getErrorMessage();
-			if (msg != null && msg.length() > 0) {
-				is_error = error.isError() || error.isChildError();
-				is_warning = error.isWarning() || error.isChildWarning();
-			}
-		}
-
-		if (is_error) {
-			return PlatformUI.getWorkbench().getSharedImages().getImage(
-					ISharedImages.IMG_OBJS_WARN_TSK);
-		} else if (is_warning) {
-			return PlatformUI.getWorkbench().getSharedImages().getImage(
-					ISharedImages.IMG_OBJS_WARN_TSK);
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider#getImageFromObject(java.lang.Object)
-	 */
-	protected Image getImageFromObject(Object object) {
-		return ExtendedImageRegistry.getInstance().getImage(object);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider#getColumnImage(java.lang.Object, int)
-	 */
-	public Image getColumnImage(Object object, int columnIndex) {
-		if (columnIndex == 0) {
-			return this.getImage(object);
-		}
-		return null;
-	}
-
-	private String getString(Object element) {
-		if (element instanceof MethodElement) {
-			return getName((MethodElement) element);
-		}
-
-		String text = element.toString();
-		int index = text.indexOf("("); //$NON-NLS-1$
-		int index2 = text.lastIndexOf(")"); //$NON-NLS-1$
-		if (index >= 0 && index2 > 0) {
-			return text.substring(index, index2 + 1);
-		} else {
-			return text;
-		}
-	}
-
-	private String getName(MethodElement e) {
-		return (e == null) ? "" : e.getName(); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider#getColumnText(java.lang.Object, int)
-	 */
-	public String getColumnText(Object object, int columnIndex) {
-		String text = ""; //$NON-NLS-1$
-		MethodElement element = null;
-
-		if (object instanceof ElementDependencyError) {
-			ElementDependencyError error = (ElementDependencyError) object;
-			Object e = error.getErrorElement();
-			Object[] refs = error.getCauseElements();
-			if (columnIndex == MessageView.ERROR_ELEMENT_COLUMN) {
-				text = getString(e);
-
-			} else if (columnIndex == MessageView.CAUSE_ELEMENT_COLUMN) {
-				if (refs != null) {
-					StringBuffer b = new StringBuffer();
-					for (int i = 0; i < refs.length; i++) {
-						if (i > 0)
-							b.append(", "); //$NON-NLS-1$
-						b.append(getString(refs[i]));
-					}
-					text = b.toString();
-				}
-			} else {
-				if (error.isError() || error.isWarning()) {
-					text = AuthoringUIResources.bind(AuthoringUIResources.MessageLabelProvider_unselectedpackages, (new String[] { getString(e) }));
-				} else if (error.isChildError() || error.isChildWarning()) {
-					text = AuthoringUIResources.MessageLabelProvider_errchildpkgs; 
-				}
-			}
-		}
-
-		if (object instanceof ErrorInfo) {
-			ErrorInfo error = (ErrorInfo) object;
-			if (columnIndex == MessageView.ERROR_ELEMENT_COLUMN) {
-				element = (MethodElement) error.getOwnerElement();
-
-			} else if (columnIndex == MessageView.CAUSE_ELEMENT_COLUMN) {
-				element = (MethodElement) error.getCauseElement();
-			}
-
-			if (element != null) {
-				text = getName(element);
-				if (columnIndex != MessageView.ERROR_MESSAGE_COLUMN
-						&& !LibraryUtil.selectable(element)) {
-					text = "      " + text; //$NON-NLS-1$
-				}
-			} else {
-				text = error.getErrorMessage();
-			}
-		}
-
-		else if (object instanceof ElementReference) {
-			ElementReference ref = (ElementReference) object;
-			if (columnIndex == MessageView.ERROR_ELEMENT_COLUMN) {
-				element = (MethodElement) ref.getElement();
-				text = "      " + getName(element); //$NON-NLS-1$
-			} else if (columnIndex == MessageView.CAUSE_ELEMENT_COLUMN) {
-				element = (MethodElement) ref.getRefElement();
-				text = "      " + getName(element); //$NON-NLS-1$
-			}
-
-		}
-
-		if (text == null) {
-			text = ""; //$NON-NLS-1$
-		}
-
-		return text;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object object) {
-		return this.getColumnText(object, 0);
-	}
-
-	/**
-	 * Since we won't ever generate these notifications, we can just ignore
-	 * this.
-	 */
-	public void addListener(ILabelProviderListener listener) {
-	}
-
-	/**
-	 * Since we won't ever add listeners, we can just ignore this.
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/MessageView.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/MessageView.java
deleted file mode 100755
index 1831219..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/MessageView.java
+++ /dev/null
@@ -1,345 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.views;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.editors.ConfigurationEditor;
-import org.eclipse.epf.library.configuration.ConfigurationClosure;
-import org.eclipse.epf.library.configuration.ElementDependencyError;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.ViewPart;
-
-
-/**
- * The Message view.
- * <p>
- * Displays the Method Library error and warning messages
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class MessageView extends ViewPart implements ISelectionProvider,
-		IPartListener {
-
-	/**
-	 * The view ID.
-	 */
-	public static final String VIEW_ID = MessageView.class.getName();
-
-	public static final int ERROR_MESSAGE_COLUMN = 0;
-
-	public static final int ERROR_ELEMENT_COLUMN = 1;
-
-	public static final int CAUSE_ELEMENT_COLUMN = 2;
-
-	protected MessageViewer tableViewer;
-
-	protected Collection selectionChangedListeners = new ArrayList();
-
-	private ISelectionChangedListener selectionChangedListener = null;
-
-	protected ISelection currentSelection = StructuredSelection.EMPTY;
-
-	private ConfigurationClosure closure = null;
-
-	public MessageView() {
-	}
-
-	/**
-	 * updates View when configurationFactory changes
-	 * @param closure
-	 */
-	public void configurationFactoryChanged(ConfigurationClosure closure) {
-		this.closure = closure;
-
-		ComposedAdapterFactory adapterFactory = null;
-		if (closure != null) {
-			adapterFactory = (ComposedAdapterFactory) closure
-					.getConfigurationManager().getAdapterFactory();
-			tableViewer.setLabelProvider(new MessageLabelProvider(
-					adapterFactory));
-		}
-		tableViewer.setContentProvider(new MessageContentProvider(closure));
-
-		updateMessage();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.add(listener);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void removeSelectionChangedListener(
-			ISelectionChangedListener listener) {
-		selectionChangedListeners.remove(listener);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
-	 */
-	public ISelection getSelection() {
-		return currentSelection;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
-	 */
-	public void setSelection(ISelection selection) {
-		currentSelection = selection;
-
-		for (Iterator listeners = new ArrayList(selectionChangedListeners)
-				.iterator(); listeners.hasNext();) {
-			ISelectionChangedListener listener = (ISelectionChangedListener) listeners
-					.next();
-			listener
-					.selectionChanged(new SelectionChangedEvent(this, selection));
-		}
-	}
-
-	private void createViewer(Composite composite) {
-		tableViewer = new MessageViewer(composite);
-
-		IViewSite site = (IViewSite) this.getSite();
-		site.setSelectionProvider(this);
-
-		if (selectionChangedListener == null) {
-			// Create the listener
-			selectionChangedListener = new ISelectionChangedListener() {
-				// This just notifies those things that are affected by the
-				// section.
-				public void selectionChanged(SelectionChangedEvent event) {
-//					System.out
-//							.println(AuthoringUIResources.MessageView_selected_text + event.getSelection()); //$NON-NLS-1$
-					setSelection(event.getSelection());
-				}
-			};
-
-			tableViewer.addSelectionChangedListener(selectionChangedListener);
-		}
-
-		// Set column info.
-		setColumns();
-	}
-
-	private void setColumns() {
-		Tree table = tableViewer.getTree();
-		table.setHeaderVisible(true);
-		table.setLinesVisible(true);
-
-		TreeColumn column;
-
-		column = new TreeColumn(table, SWT.NONE, ERROR_MESSAGE_COLUMN);
-		column.setText(AuthoringUIResources.MessageView_errmsg_text); 
-		column.setWidth(450);
-
-		column = new TreeColumn(table, SWT.NONE, ERROR_ELEMENT_COLUMN);
-		column.setText(AuthoringUIResources.MessageView_errelement_text); 
-		column.setWidth(200);
-
-		column = new TreeColumn(table, SWT.NONE, CAUSE_ELEMENT_COLUMN);
-		column.setText(AuthoringUIResources.MessageView_refelement_text); 
-		column.setWidth(200);
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		createViewer(parent);
-
-		IWorkbenchWindow workbenchWindow = getSite().getWorkbenchWindow();
-		workbenchWindow.getPartService().addPartListener(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-	}
-
-	/**
-	 * @return the MessageView object
-	 */
-	public static MessageView getView() {
-		try {
-			IWorkbenchPage activePage = PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow().getActivePage();
-			if (activePage != null) {
-				IViewPart view = activePage.findView(VIEW_ID);
-				if (view == null) {
-					view = activePage.showView(VIEW_ID);
-				}
-				return (MessageView) view;
-			}
-
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-
-		return null;
-	}
-
-	/**
-	 * update Message View according to the configuration closure state
-	 *
-	 */
-	public void updateMessage() {
-		if (closure != null) {
-			tableViewer.setInput(closure);
-		} else {
-			tableViewer.setInput(new Object());
-		}
-	}
-
-	/**
-	 * @return if viewer has input
-	 */
-	public boolean isDisposed() {
-		return (closure == null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-
-		IWorkbenchWindow workbenchWindow = getSite().getWorkbenchWindow();
-		workbenchWindow.getPartService().removePartListener(this);
-
-		selectionChangedListeners.clear();
-		closure = null;
-	}
-
-	/**
-	 * Show the error for the element.
-	 */
-	public void showError(Object e) {
-		ElementDependencyError error = closure.getError(e);
-		if (error != null) {
-			tableViewer.setSelection(error);
-		}
-	}
-
-	/**
-	 * The Viewer class underlying this view 
-	 *
-	 */
-	public class MessageViewer extends TreeViewer {
-
-		public MessageViewer(Composite parent) {
-			this(parent, SWT.FULL_SELECTION);
-		}
-
-		public MessageViewer(Composite parent, int style) {
-			super(parent, style);
-
-			Tree tree = getTree();
-			tree.setHeaderVisible(true);
-			tree.setLinesVisible(true);
-
-		}
-
-		public void setSelection(Object element) {
-			super.expandToLevel(element, 1);
-			Widget ctrl = super.findItem(element);
-			if (ctrl != null) {
-				List items = new ArrayList();
-				items.add(ctrl);
-				super.setSelection(items);
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IPartListener#partActivated(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partActivated(IWorkbenchPart part) {
-		if (part instanceof ConfigurationEditor) {
-			ConfigurationClosure c = ((ConfigurationEditor) part).getClosure();
-			if (c != closure) {
-				configurationFactoryChanged(c);
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IPartListener#partBroughtToTop(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partBroughtToTop(IWorkbenchPart part) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partClosed(IWorkbenchPart part) {
-		if (part instanceof ConfigurationEditor) {
-			ConfigurationClosure c = ((ConfigurationEditor) part).getClosure();
-			if (c == closure) {
-				configurationFactoryChanged(null);
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partDeactivated(IWorkbenchPart part) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partOpened(IWorkbenchPart part) {
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ProcessTreeViewer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ProcessTreeViewer.java
deleted file mode 100755
index b10bc01..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ProcessTreeViewer.java
+++ /dev/null
@@ -1,396 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.views;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.editors.ColumnDescriptor;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.command.IResourceAwareCommand;
-import org.eclipse.epf.library.edit.process.IBSItemProvider;
-import org.eclipse.epf.library.edit.process.command.ActivityDropCommand;
-import org.eclipse.epf.library.edit.ui.IActionTypeProvider;
-import org.eclipse.jface.util.IOpenEventListener;
-import org.eclipse.jface.util.OpenStrategy;
-import org.eclipse.jface.viewers.ITreeViewerListener;
-import org.eclipse.jface.viewers.TreeExpansionEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TreeEvent;
-import org.eclipse.swt.events.TreeListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.swt.widgets.Widget;
-
-
-/**
- * Displays the Process elements in a tree table viewer.
- * 
- * @author Phong Nguyen Le
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class ProcessTreeViewer extends TreeViewer implements
-		IActionTypeProvider {
-	private static final String COPY_TXT = AuthoringUIResources.copy_text; 
-	private static final String EXTEND_TXT = AuthoringUIResources.extend_text; 
-	private static final String DEEP_COPY_TXT = AuthoringUIResources.deepCopy_text; 
-
-	private int actionType = IActionTypeProvider.COPY;
-
-	private Menu actionTypePopup;
-
-	private Point actionTypePopupLocation;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ProcessTreeViewer(Composite parent, int style) {
-		super(parent, style);
-
-		Tree tree = getTree();
-		tree.setHeaderVisible(true);
-		tree.setLinesVisible(true);
-
-		addTreeListener(new ITreeViewerListener() {
-
-			public void treeCollapsed(TreeExpansionEvent event) {
-				setItemProviderExpanded(event.getElement(), false);
-			}
-
-			public void treeExpanded(TreeExpansionEvent event) {
-				setItemProviderExpanded(event.getElement(), true);
-			}
-
-		});
-	}
-
-	/**
-	 * Set up colunms according to the given array of descriptors
-	 * @param columnDescriptors
-	 */
-	public void setupColumns(ColumnDescriptor[] columnDescriptors) {
-		// Remove all old TreeColumns.
-		TreeColumn[] cols = getTree().getColumns();
-		int size = cols.length;
-		for (int i = 0; i < size; i++) {
-			cols[i].dispose();
-		}
-
-		String[] colProps = new String[columnDescriptors.length];
-		for (int i = 0; i < columnDescriptors.length; i++) {
-			colProps[i] = columnDescriptors[i].id;
-			TreeColumn column = new TreeColumn(getTree(),
-					columnDescriptors[i].alignment);
-			column.setText(columnDescriptors[i].label);
-			column.setResizable(columnDescriptors[i].resizable);
-			column.setWidth(columnDescriptors[i].width);
-		}
-
-		setColumnProperties(colProps);
-
-	}
-
-	private void setItemProviderExpanded(Object element, boolean expand) {
-		Object adapter = getAdapterFactory().adapt(element,
-				ITreeItemContentProvider.class);
-		if (adapter instanceof IBSItemProvider) {
-			((IBSItemProvider) adapter).setExpanded(Boolean.valueOf(expand));
-		}
-	}
-
-	/**
-	 * @return the AdapterFactory
-	 */
-	public AdapterFactory getAdapterFactory() {
-		return getContentProvider() == null ? null
-				: ((AdapterFactoryContentProvider) getContentProvider())
-						.getAdapterFactory();
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.TableTreeViewer#setExpanded(Item, boolean)
-	 */
-	protected void setExpanded(Item node, boolean expand) {
-		super.setExpanded(node, expand);
-		Object adapter = getAdapterFactory().adapt(node.getData(),
-				ITreeItemContentProvider.class);
-		if (adapter instanceof IBSItemProvider) {
-			IBSItemProvider bsItemProvider = ((IBSItemProvider) adapter);
-			if (bsItemProvider.isExpanded() == null) {
-				bsItemProvider.setExpanded((Boolean.valueOf(expand)));
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.AbstractTreeViewer#createTreeItem(Widget,
-	 *      Object, int)
-	 */
-	protected void createTreeItem(Widget parent, Object element, int index) {
-		super.createTreeItem(parent, element, index);
-		Object adapter = getAdapterFactory().adapt(element,
-				ITreeItemContentProvider.class);
-		if (adapter instanceof IBSItemProvider) {
-			Boolean expand = ((IBSItemProvider) adapter).isExpanded();
-			if (expand != null) {
-				setExpandedState(element, expand.booleanValue());
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.TableTreeViewer#doUpdateItem(Item, Object)
-	 */
-	protected void doUpdateItem(Item item, Object element) {
-		super.doUpdateItem(item, element);
-		setExpanded(item, element);
-	}
-
-	private void setExpanded(Item item, Object element) {
-		ITreeItemContentProvider adapter = (ITreeItemContentProvider) getAdapterFactory().adapt(element,
-				ITreeItemContentProvider.class);
-		if(adapter.hasChildren(element)) {
-			if (adapter instanceof IBSItemProvider) {
-				Boolean expand = ((IBSItemProvider) adapter).isExpanded();
-				if (expand != null) {
-					setExpandedState(item, expand.booleanValue());
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.AbstractTreeViewer#internalRefresh(Widget,
-	 *      Object, boolean, boolean)
-	 */
-	protected void internalRefresh(Widget widget, Object element,
-			boolean doStruct, boolean updateLabels) {
-		super.internalRefresh(widget, element, doStruct, updateLabels);
-
-		if (doStruct) {
-			if (widget instanceof Item) {
-				setExpanded((Item) widget, element);
-			} else {
-				Item[] children = getChildren(widget);
-				for (int i = 0; i < children.length; i++) {
-					Item child = children[i];
-					if (child instanceof Item) {
-						Item item = (Item) child;
-						setExpanded(item, item.getData());
-					}
-				}
-			}
-		}
-	}
-
-	private Command command;
-
-	private IActionManager actionManager;
-
-	/**
-	 * @see org.eclipse.epf.library.edit.ui.IActionTypeProvider#getActionType()
-	 */
-//	public int getActionType() {
-//		if (actionTypePopup == null) {
-//			createActionTypePopup();
-//		}
-//
-//		Display.getCurrent().syncExec(new Runnable() {
-//
-//			public void run() {
-//				actionType = 0;
-//				actionTypePopup.setLocation(actionTypePopupLocation);
-//				actionTypePopup.setVisible(true);
-//			}
-//
-//		});
-//
-//		return actionType;
-//	}
-
-	private void createActionTypePopup(boolean canExtend) {
-		actionTypePopup = new Menu(getControl());
-		SelectionListener selectionListener = new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				MenuItem item = ((MenuItem) e.getSource());
-				String text = item.getText();
-				if (text == COPY_TXT) {
-					ProcessTreeViewer.this.actionType = IActionTypeProvider.COPY;
-				} else if (text == EXTEND_TXT) {
-					ProcessTreeViewer.this.actionType = IActionTypeProvider.EXTEND;
-				} else if (text == DEEP_COPY_TXT) {
-					ProcessTreeViewer.this.actionType = DEEP_COPY;
-				}
-
-				if (command instanceof ActivityDropCommand) {
-					ActivityDropCommand cmd = ((ActivityDropCommand) command);
-					cmd.setType(ProcessTreeViewer.this.actionType);
-					cmd.setLabel(text);
-				}
-
-				if (actionManager != null
-						&& command instanceof IResourceAwareCommand) {
-					actionManager.execute((IResourceAwareCommand) command);
-				} else {
-					command.execute();
-				}
-
-				actionTypePopup.setVisible(false);
-			}
-
-		};
-		MenuItem menuItem;
-		if (canExtend)	{
-			menuItem = new MenuItem(actionTypePopup, SWT.CASCADE);
-			menuItem.setText(COPY_TXT);
-			menuItem.addSelectionListener(selectionListener);
-			menuItem = new MenuItem(actionTypePopup, SWT.CASCADE);
-			menuItem.setText(EXTEND_TXT);
-			menuItem.addSelectionListener(selectionListener);
-		}
-		menuItem = new MenuItem(actionTypePopup, SWT.CASCADE);
-		menuItem.setText(DEEP_COPY_TXT);
-		menuItem.addSelectionListener(selectionListener);
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.edit.ui.IActionTypeProvider#setInputData(Object)
-	 */
-	public void setInputData(Object object) {
-		actionTypePopupLocation = (Point) object;
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.edit.ui.IActionTypeProvider#execute(org.eclipse.emf.common.command.Command, boolean)
-	 */
-	public void execute(Command cmd, boolean canExtend) {
-//		if (actionTypePopup == null) {
-			createActionTypePopup(canExtend);
-//		}
-
-		this.command = cmd;
-		actionTypePopup.setLocation(actionTypePopupLocation);
-		actionTypePopup.setVisible(true);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.TreeViewer#hookControl(Control)
-	 */
-	protected void hookControl(Control control) {
-		// From ContentViewer.
-		control.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent event) {
-				handleDispose(event);
-			}
-		});
-
-		// From StructuredViewer.
-		OpenStrategy handler = new OpenStrategy(control);
-		handler.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				handleSelect(e);
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				handleDoubleSelect(e);
-			}
-		});
-		handler.addPostSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handlePostSelect(e);
-			}
-		});
-		handler.addOpenListener(new IOpenEventListener() {
-			public void handleOpen(SelectionEvent e) {
-				ProcessTreeViewer.this.handleOpen(e);
-			}
-		});
-
-		// From AbstractTreeViewer.
-		addTreeListener(control, new TreeListener() {
-			public void treeExpanded(TreeEvent event) {
-				handleTreeExpand(event);
-			}
-
-			public void treeCollapsed(TreeEvent event) {
-				handleTreeCollapse(event);
-			}
-		});
-
-		getTree().addListener(SWT.MouseDoubleClick, new Listener() {
-
-			public void handleEvent(Event event) {
-				TreeItem[] treeItems = getTree().getSelection();
-
-				// Don't edit if more than one items are selected.
-				if (treeItems == null || treeItems.length != 1)
-					return;
-
-				// Find the edit column.
-				TreeItem treeItem = treeItems[0];
-				if (treeItem == null || treeItem.isDisposed()) {
-					// Item no longer exists.
-					return;
-				}
-				int columnToEdit;
-				int columns = getTree().getColumnCount();
-				if (columns == 0) {
-					// If no TableColumn, Table acts as if it has a single
-					// column which takes the whole width.
-					columnToEdit = 0;
-				} else {
-					columnToEdit = -1;
-					for (int i = 0; i < columns; i++) {
-						Rectangle bounds = treeItem.getBounds(i);
-						if (bounds.contains(event.x, event.y)) {
-							columnToEdit = i;
-							break;
-						}
-					}
-					if (columnToEdit == -1) {
-						return;
-					}
-				}
-
-				editElement(treeItem.getData(), columnToEdit);
-			}
-
-		});
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.edit.ui.IActionTypeProvider#setActionManager(IActionManager)
-	 */
-	public void setActionManager(IActionManager actionMgr) {
-		actionManager = actionMgr;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ProcessViewer.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ProcessViewer.java
deleted file mode 100755
index db705d3..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ProcessViewer.java
+++ /dev/null
@@ -1,196 +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.authoring.ui.views;
-
-import org.eclipse.epf.authoring.ui.celleditors.AbstractCheckBoxCellEditor;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.swt.widgets.TreeItem;
-
-/**
- * Displays the Process elements in a tree table viewer.
- * 
- * @author Phong Nguyen Le
- * @author Shilpa Toraskar
- * @since 1.0
- */
-public class ProcessViewer extends ProcessTreeViewer {
-
-	private String[] columnProperties;
-
-	private AbstractCheckBoxCellEditor[] checkBoxCellEditors = null;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ProcessViewer(Composite parent, int style) {
-		super(parent, style);
-	}
-
-	/**
-	 * Return parent - underlying tree
-	 * 
-	 * @return parent
-	 */
-	public Composite getCellEditorParent() {
-		return getTree();
-	}
-
-	/**
-	 * Set check box cell editors
-	 * 
-	 * @param checkBoxCellEditors
-	 */
-	public void setCheckBoxCellEditors(
-			AbstractCheckBoxCellEditor[] checkBoxCellEditors) {
-		this.checkBoxCellEditors = checkBoxCellEditors;
-		for (int i = 0; i < checkBoxCellEditors.length; i++) {
-			AbstractCheckBoxCellEditor editor = checkBoxCellEditors[i];
-			if (editor == null)
-				continue;
-			editor.setColumnIndex(i);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.views.ProcessTreeViewer#hookControl(org.eclipse.swt.widgets.Control)
-	 */
-	protected void hookControl(Control control) {
-		super.hookControl(control);
-		getTree().addMouseListener(new MouseAdapter() {
-			public void mouseDown(MouseEvent e) {
-				modifyItem(e);
-			}
-		});
-		// getTree().addMouseMoveListener(new MouseMoveListener(){
-		// public void mouseMove(MouseEvent e){
-		// setUnsetEditor(e);
-		// }
-		// });
-		Listener paintListener = new Listener() {
-			public void handleEvent(Event event) {
-				switch (event.type) {
-				case SWT.PaintItem: {
-					// System.out.println("event.index = "+ event.index);
-					Image image = getCheckBoxCellEditorImage(event);
-					if (image == null)
-						return;
-					TreeColumn col = getTree().getColumn(event.index);
-					int x = event.x + col.getWidth() / 2;
-					Rectangle rect = image.getBounds();
-					int offset = Math.max(0, (event.height - rect.height) / 2);
-					event.gc.drawImage(image, x - rect.width / 2, event.y
-							+ offset);
-					break;
-				}
-				}
-			}
-		};
-		getTree().addListener(SWT.PaintItem, paintListener);
-	}
-
-	/**
-	 * @see org.eclipse.epf.authoring.ui.views.ProcessTreeViewer#doUpdateItem(org.eclipse.swt.widgets.Item,
-	 *      java.lang.Object)
-	 */
-	protected void doUpdateItem(Item item, Object element) {
-		super.doUpdateItem(item, element);
-
-		if (checkBoxCellEditors != null && columnProperties != null
-				&& columnProperties.length > 0) {
-			for (int i = 0; i < checkBoxCellEditors.length; i++) {
-				AbstractCheckBoxCellEditor editor = checkBoxCellEditors[i];
-				if (editor == null)
-					continue;
-				((TreeItem) item).setText(i, "");
-
-			}
-		}
-
-	}
-
-	private Image getCheckBoxCellEditorImage(Event event) {
-		return getCheckBoxCellEditorImage(event.index, (TreeItem) event.item);
-	}
-
-	private Image getCheckBoxCellEditorImage(int columnIndex, TreeItem item) {
-		if (checkBoxCellEditors == null
-				|| checkBoxCellEditors[columnIndex] == null)
-			return null;
-		return checkBoxCellEditors[columnIndex].getImage(item,
-				columnProperties[columnIndex]);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.TreeViewer#setCellModifier(org.eclipse.jface.viewers.ICellModifier)
-	 */
-	public void setCellModifier(ICellModifier modifier) {
-		super.setCellModifier(modifier);
-
-		if (checkBoxCellEditors != null) {
-			for (int i = 0; i < checkBoxCellEditors.length; i++) {
-				AbstractCheckBoxCellEditor editor = checkBoxCellEditors[i];
-				if (editor == null)
-					continue;
-				editor.setCellModifier(modifier);
-			}
-		}
-	}
-
-	/**
-	 * This method is used for mouse down listener
-	 * 
-	 * @param event
-	 */
-	private void modifyItem(MouseEvent event) {
-		Point pt = new Point(event.x, event.y);
-		TreeItem item = getTree().getItem(pt);
-		if (item == null)
-			return;
-
-		for (int i = 0; i < getTree().getColumnCount(); i++) {
-			Rectangle rect = item.getBounds(i);
-			if (rect.contains(pt)) {
-				Image image = getCheckBoxCellEditorImage(i, item);
-				if (image == null)
-					return;
-				Rectangle imgRect = image.getBounds();
-				int offset = Math.max(0, (rect.height - imgRect.height) / 2);
-				int x = rect.x + rect.width / 2 - imgRect.width / 2;
-				int y = rect.y + offset;
-				imgRect = new Rectangle(x, y, imgRect.width, imgRect.height);
-				if (imgRect.contains(pt)) {
-					checkBoxCellEditors[i].modify(item, columnProperties[i]);
-					return;
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.TreeViewer#setColumnProperties(java.lang.String[])
-	 */
-	public void setColumnProperties(String[] columnProperties) {
-		super.setColumnProperties(columnProperties);
-		this.columnProperties = columnProperties;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/SaveableLibraryViewPart.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/SaveableLibraryViewPart.java
deleted file mode 100755
index 1520b4d..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/SaveableLibraryViewPart.java
+++ /dev/null
@@ -1,87 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.views;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISaveablePart;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- * The abstract class for all views that requires the support of saving a Method
- * Library via the Save action.
- * 
- * @author Phong Le
- * @author Kelvin Low
- * @since 1.0
- */
-public abstract class SaveableLibraryViewPart extends ViewPart implements
-		ISaveablePart {
-
-	/**
-	 * @see org.eclipse.ui.ISaveablePart#doSave(IProgressMonitor)
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		if (monitor != null) {
-			monitor
-					.beginTask(
-							AuthoringUIResources.savingLibraryTask_name, IProgressMonitor.UNKNOWN); 
-			String libPath = LibraryService.getInstance()
-					.getCurrentMethodLibraryPath();
-			try {
-				LibraryService.getInstance().saveCurrentMethodLibrary();
-				firePropertyChange(IEditorPart.PROP_DIRTY);
-			} catch (Exception e) {
-				AuthoringUIPlugin
-						.getDefault()
-						.getMsgDialog()
-						.displayError(
-								AuthoringUIResources.saveLibraryDialog_title, 
-								AuthoringUIResources.bind(AuthoringUIResources.saveLibraryToError_msg, libPath), 
-								AuthoringUIResources.error_reason, 
-								e);
-			} finally {
-				monitor.done();
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.ISaveablePart#doSaveAs()
-	 */
-	public void doSaveAs() {
-	}
-
-	/**
-	 * @see org.eclipse.ui.ISaveablePart#isDirty()
-	 */
-	public boolean isDirty() {
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.ui.ISaveablePart#isSaveAsAllowed()
-	 */
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.ui.ISaveablePart#isSaveOnCloseNeeded()
-	 */
-	public boolean isSaveOnCloseNeeded() {
-		return true;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ViewHelper.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ViewHelper.java
deleted file mode 100755
index 26da044..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/ViewHelper.java
+++ /dev/null
@@ -1,714 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.views;
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.edit.FeatureValueWrapperItemProvider;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.library.edit.util.Misc;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.ui.LibraryUIManager;
-import org.eclipse.epf.services.ILibraryPersister;
-import org.eclipse.epf.uma.BreakdownElementDescription;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.NamedElement;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A helper class for managing the views and editors in the Authoring
- * perspective.
- * 
- * @author Phong Nguyen Le
- * @author Kelvin Low
- * @since 1.0
- */
-public final class ViewHelper {
-
-	/**
-	 * Prompts the user to save the open library if it has been modified.
-	 * 
-	 * @return <code>true<code> if the user saved or discarded the change,
-	 * 		   <code>false</code> if the user cancelled the action that
-	 *         triggered this call.
-	 */
-	public static boolean promptSave() {
-		ILibraryManager manager = (ILibraryManager) LibraryService
-				.getInstance().getCurrentLibraryManager();
-		if (manager != null && manager.isMethodLibraryModified()) {
-			int ret = MsgBox.prompt(AuthoringUIResources.saveLibraryDialog_title, 
-					AuthoringUIResources.saveLibraryDialog_text, 
-					SWT.YES | SWT.NO | SWT.CANCEL);
-			switch (ret) {
-			case SWT.YES:
-				try {
-					LibraryService.getInstance().saveCurrentMethodLibrary();
-				} catch (Exception e) {
-					MsgDialog dialog = AuthoringUIPlugin.getDefault()
-							.getMsgDialog();
-					dialog
-							.displayError(
-									AuthoringUIResources.saveLibraryDialog_title, 
-									AuthoringUIResources.saveLibraryError_msg, 
-									AuthoringUIResources.error_reason, e); 
-
-					return dialog
-							.displayPrompt(
-									AuthoringUIResources.openLibraryDialog_title, 
-									AuthoringUIResources.openLibraryDialog_text); 
-				}
-				break;
-			case SWT.NO:
-				// Discard all changes by resetting all resources as unchanged.
-				manager.discardMethodLibraryChanges();
-				break;
-			case SWT.CANCEL:
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Prompts the user to save the open library if it has been modified.
-	 * 
-	 * @return the choice the user made when prompted to save - one of SWT.YES, SWT.NO, SWT.CANCEL
-	 */
-	public static int promptSaveInt() {
-		ILibraryManager manager = (ILibraryManager) LibraryService
-				.getInstance().getCurrentLibraryManager();
-		if (manager != null && manager.isMethodLibraryModified()) {
-			int ret = MsgBox.prompt(AuthoringUIResources.saveLibraryDialog_title, 
-					AuthoringUIResources.saveLibraryDialog_text, 
-					SWT.YES | SWT.NO | SWT.CANCEL);
-			switch (ret) {
-			case SWT.YES:
-				try {
-					LibraryService.getInstance().saveCurrentMethodLibrary();
-				} catch (Exception e) {
-					MsgDialog dialog = AuthoringUIPlugin.getDefault()
-							.getMsgDialog();
-					dialog
-							.displayError(
-									AuthoringUIResources.saveLibraryDialog_title, 
-									AuthoringUIResources.saveLibraryError_msg, 
-									AuthoringUIResources.error_reason, e); 
-				}
-				return SWT.YES;
-			case SWT.NO:
-				// Discard all changes by resetting all resources as unchanged.
-				manager.discardMethodLibraryChanges();
-				return SWT.NO;
-			case SWT.CANCEL:
-				return SWT.CANCEL;
-			}
-		}
-
-		return SWT.CANCEL;
-	}
-
-	/**
-	 * closes all editors on the active page
-	 *
-	 */
-	public static void closeAllEditors() {
-		PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-				.closeAllEditors(true);
-	}
-
-	/**
-	 * closes the MessageView (error view)
-	 *
-	 */
-	public static void closeMessageView() {
-		PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-				.hideView(MessageView.getView());
-	}
-
-	/**
-	 * handles a dangling object
-	 * @param object
-	 * @return
-	 * 			Object
-	 */
-	public static Object handleDangling(Object object) {
-		if (object instanceof MethodElement
-				&& ((EObject) object).eResource() == null) {
-			AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-					AuthoringUIResources.errorDialog_title, 
-					AuthoringUIResources.bind(AuthoringUIResources.elementAlreadyDeletedError_msg, ((MethodElement) object).getName()));
-			return null;
-		} else if (object instanceof FeatureValueWrapperItemProvider) {
-			FeatureValueWrapperItemProvider adapter = (FeatureValueWrapperItemProvider) object;
-			Object value = adapter.getValue();
-			if (value instanceof MethodElement
-					&& ((EObject) value).eResource() == null) {
-				Object owner = TngUtil.unwrap(adapter.getParent(value));
-				if (owner instanceof ItemProviderAdapter) {
-					// This is a UI item provider.
-					owner = ((ItemProviderAdapter) owner).getTarget();
-				}
-				String ownerName = ((MethodElement) owner).getName();
-				EStructuralFeature feature = adapter.getFeature();
-				if (feature != null) {
-					if (AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayPrompt(
-									AuthoringUIResources.deleteDialog_title, 
-									AuthoringUIResources.bind(AuthoringUIResources.ViewHelper_alreadydeletedconfirm_text, ((MethodElement) value)
-									.getName(), ownerName))) { 
-						// Remove the association.
-						if (feature.isMany()) {
-							((Collection) ((EObject) owner).eGet(feature))
-									.remove(value);
-						}
-					}
-				} else {
-					AuthoringUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayError(
-									AuthoringUIResources.errorDialog_title, 
-									AuthoringUIResources.bind(AuthoringUIResources.elementAlreadyDeletedError_msg, ((MethodElement) value)
-									.getName()));
-				}
-				return null;
-			}
-		}
-		return object;
-	}
-
-	/* TODO: Is this still needed?
-	public static void loadAllAndSaveAll() {
-		final MethodLibrary lib = LibraryService.getInstance()
-				.getCurrentMethodLibrary();
-		if (lib == null)
-			return;
-
-		// Do the work within an operation because this is a long running
-		// activity that modifies the workbench.
-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
-			// This is the method that gets invoked when the operation runs.
-			public void execute(IProgressMonitor monitor) {
-				monitor.beginTask(AuthoringUIResources
-						.getString("AuthoringUI.upgradingLibraryTask.name"), 3); //$NON-NLS-1$
-				try {
-					try {
-						monitor.worked(1);
-						monitor
-								.setTaskName(AuthoringUIResources
-										.getString("AuthoringUI.loadingLibraryElementsTask.name")); //$NON-NLS-1$
-						ModelStorage.loadAllProxies(lib);
-					} catch (Exception e) {
-						AuthoringUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayError(
-										AuthoringUIResources
-												.getString("AuthoringUI.upgradeLibraryDialog.title"), //$NON-NLS-1$
-										AuthoringUIResources
-												.getString("AuthoringUI.upgradeLibraryError.msg"), //$NON-NLS-1$
-										AuthoringUIResources
-												.getString("AuthoringUI.upgradeLibraryError.reason"), //$NON-NLS-1$
-										e);
-						return;
-					}
-					try {
-						monitor.worked(1);
-						monitor
-								.setTaskName(AuthoringUIResources
-										.getString("AuthoringUI.savingUpgradedElementsTask.name")); //$NON-NLS-1$
-						MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) lib
-								.eResource().getResourceSet();
-						resourceSet.save(LibraryProcessor.getInstance()
-								.getSaveOptions(), true);
-					} catch (Exception e) {
-						AuthoringUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayError(
-										AuthoringUIResources
-												.getString("AuthoringUI.upgradeLibraryDialog.title"), //$NON-NLS-1$
-										AuthoringUIResources
-												.getString("AuthoringUI.upgradeLibraryError.msg"), //$NON-NLS-1$
-										AuthoringUIResources
-												.getString("AuthoringUI.saveUpgradedLibraryError.reason"), //$NON-NLS-1$
-										e);
-					}
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-
-		try {
-			// Run the operation and display the progress.
-			new ProgressMonitorDialog(Display.getDefault().getActiveShell())
-					.run(true, false, operation);
-		} catch (Exception e) {
-			AuthoringUIPlugin
-					.getDefault()
-					.getMsgDialog()
-					.displayError(
-							AuthoringUIResources
-									.getString("AuthoringUI.upgradeLibraryDialog.title"), //$NON-NLS-1$
-							AuthoringUIResources
-									.getString("AuthoringUI.upgradeLibraryError.msg"), //$NON-NLS-1$
-							AuthoringUIResources
-									.getString("AuthoringUI.internalError.reason"), //$NON-NLS-1$
-							e);
-		}
-	}
-	*/
-
-	/**
-	 * Checks if the current selection is locked.
-	 */
-	public static boolean isLocked(IStructuredSelection selection) {
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			while (element instanceof ITreeItemContentProvider) {
-				element = ((ITreeItemContentProvider) element).getParent(null);
-			}
-			element = TngUtil.unwrap(element);
-			if (element instanceof EObject
-					&& TngUtil.isLocked((EObject) element)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Fixes the content description GUIDs.
-	 */
-	public static void fixContentDescriptionGUIDs() {
-		final MethodLibrary lib = LibraryService.getInstance()
-				.getCurrentMethodLibrary();
-		if (lib == null)
-			return;
-
-		IRunnableWithProgress runnable = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException, InterruptedException {
-				HashSet modifiedResources = new HashSet();
-				for (Iterator iter = lib.eAllContents(); iter.hasNext();) {
-					InternalEObject element = (InternalEObject) iter.next();
-					if (element.eProxyURI() == null) {
-						if (element instanceof ContentDescription) {
-							ContentDescription content = (ContentDescription) element;
-							DescribableElement container = (DescribableElement) element
-									.eContainer();
-							if (container != null) {
-								String guid = UmaUtil.generateGUID(container
-										.getGuid());
-								if (!guid.equals(content.getGuid())) {
-									content.setGuid(guid);
-									modifiedResources.add(content.eResource());
-									modifiedResources
-											.add(container.eResource());
-								}
-							}
-						}
-					} else {
-						AuthoringUIPlugin
-								.getDefault()
-								.getLogger()
-								.logError(
-										"Unresolved proxy in '" + element.eResource().getURI().toFileString() + "': " + element); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				}
-
-				monitor.subTask(AuthoringUIResources.savingFilesTask_name);
-				ILibraryPersister.FailSafeMethodLibraryPersister persister = LibraryServiceUtil.getCurrentPersister().getFailSafePersister();
-				try {
-					for (Iterator iter = modifiedResources.iterator(); iter
-							.hasNext();) {
-						Resource resource = (Resource) iter.next();
-						monitor.subTask(AuthoringUIResources.bind(AuthoringUIResources.savingTask_name, resource.getURI().toFileString()));
-						persister.save(resource);
-					}
-					persister.commit();
-				} catch (Exception e) {
-					persister.rollback();
-					throw new WrappedException(e);
-				}
-			}
-
-		};
-		UserInteractionHelper
-				.runWithProgress(
-						runnable,
-						AuthoringUIResources.fixingContentDescriptionGUIDsTask_name); 
-	}
-
-	private static String checkProxy(InternalEObject element, EReference ref,
-			Object value) {
-		if (value instanceof InternalEObject) {
-			InternalEObject eObj = (InternalEObject) value;
-			if (eObj.eIsProxy()) {
-				EObject resolved = element.eResolveProxy(eObj);
-				String errMsg = null;
-				if (resolved == eObj) {
-					errMsg = "Unresolved proxy"; //$NON-NLS-1$
-				} else if (!ref.getEType().isInstance(resolved)) {
-					errMsg = "Invalid data"; //$NON-NLS-1$
-				}
-				if (errMsg != null) {
-					String path;
-					if (element instanceof NamedElement) {
-						path = ref.getEType().getName()
-								+ "(" + Misc.getPathRelativeToLibrary((NamedElement) element) + ")." + ref.getName() + " = "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					} else {
-						path = ""; //$NON-NLS-1$
-					}
-					return errMsg
-							+ " in '" + element.eResource().getURI().toFileString() + "': " + path + resolved; //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Library health check
-	 *
-	 */
-	public static void checkLibraryHealth() {
-		final MethodLibrary lib = LibraryService.getInstance()
-				.getCurrentMethodLibrary();
-		if (lib == null)
-			return;
-
-		IRunnableWithProgress runnable = new IRunnableWithProgress() {
-
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException, InterruptedException {
-				AuthoringUIPlugin.getDefault().getLogger().logInfo(
-						"++++ LIBRARY HEALTH CHECK REPORT - START +++"); //$NON-NLS-1$
-				StringWriter strWriter = new StringWriter();
-				PrintWriter printWriter = new PrintWriter(strWriter);
-				printWriter.println();
-				printWriter
-						.println("UNRESOLVED/INVALID PROXIES IN X-REFERENCES"); //$NON-NLS-1$
-				printWriter
-						.println("------------------------------------------"); //$NON-NLS-1$
-				for (Iterator iter = lib.eAllContents(); iter.hasNext();) {
-					InternalEObject element = (InternalEObject) iter.next();
-					if (element.eProxyURI() == null) {
-						if (element instanceof ContentDescription) {
-							ContentDescription content = (ContentDescription) element;
-							DescribableElement container = (DescribableElement) element
-									.eContainer();
-							if (container != null) {
-								String guid = UmaUtil.generateGUID(container
-										.getGuid());
-								if (!guid.equals(content.getGuid())) {
-									AuthoringUIPlugin
-											.getDefault()
-											.getLogger()
-											.logError(
-													"ContentDescription with invalid GUID: " + content.getGuid() + " in '" + content.eResource().getURI().toFileString() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-								}
-							} else {
-								AuthoringUIPlugin
-										.getDefault()
-										.getLogger()
-										.logError(
-												"ContentDescription without a container: " + content); //$NON-NLS-1$
-							}
-
-							if (content instanceof BreakdownElementDescription) {
-								// check if the content.xmi of the process is in
-								// the right place
-								ProcessComponent procComp = UmaUtil
-										.getProcessComponent(content);
-								if (procComp != null) {
-									String modelPath = procComp.eResource()
-											.getURI().toFileString();
-									File dir = new File(modelPath)
-											.getParentFile();
-									String contentPath = content.eResource()
-											.getURI().toFileString();
-
-									// System.out.println("model path: " +
-									// modelPath);
-									// System.out.println("content path: " +
-									// contentPath);
-									// System.out.println();
-
-									File contentDir = new File(contentPath)
-											.getParentFile();
-									if (!dir.equals(contentDir)) {
-										AuthoringUIPlugin
-												.getDefault()
-												.getLogger()
-												.logError(
-														"Content file of " + container.eClass().getName() + " '" + container.getName() + "' in '" + modelPath + " is misplaced: " + contentPath); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-									}
-								}
-							}
-						}
-
-						// check for unresolved proxies in cross references
-						ArrayList xReferences = new ArrayList(element.eClass()
-								.getEAllReferences());
-						xReferences.removeAll(element.eClass()
-								.getEAllContainments());
-						for (Iterator iterator = xReferences.iterator(); iterator
-								.hasNext();) {
-							EReference ref = (EReference) iterator.next();
-							Object value = element.eGet(ref, false);
-							if (ref.isMany()) {
-								if (value instanceof InternalEList) {
-									InternalEList list = (InternalEList) value;
-									for (Iterator iter1 = list.basicIterator(); iter1
-											.hasNext();) {
-										String msg = checkProxy(element, ref,
-												iter1.next());
-										if (msg != null) {
-											printWriter.println(msg);
-										}
-									}
-								}
-							} else {
-								String msg = checkProxy(element, ref, value);
-								if (msg != null) {
-									printWriter.println(msg);
-								}
-							}
-						}
-					} else {
-						AuthoringUIPlugin
-								.getDefault()
-								.getLogger()
-								.logError(
-										"Unresolved proxy in '" + element.eResource().getURI().toFileString() + "': " + element); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-
-				}
-				AuthoringUIPlugin.getDefault().getLogger().logError(
-						strWriter.toString());
-				AuthoringUIPlugin.getDefault().getLogger().logInfo(
-						"++++ LIBRARY HEALTH CHECK REPORT - END +++"); //$NON-NLS-1$
-			}
-
-		};
-		if (UserInteractionHelper
-				.runWithProgress(runnable, AuthoringUIResources.viewHelper_performHealthCheck)) { 
-			String title = AuthoringUIResources.viewHelperHealthCheckDialog_title; 
-			String message = AuthoringUIResources.viewHelperHealthCheckDialog_message; 
-			AuthoringUIPlugin.getDefault().getMsgDialog().displayInfo(title,
-					message);
-		}
-	}
-
-	/**
-	 * removes invalid reference in the open library
-	 *
-	 */
-	public static void removeInvalidReferences() {
-		final MethodLibrary lib = LibraryService.getInstance()
-				.getCurrentMethodLibrary();
-		if (lib == null)
-			return;
-
-		IRunnableWithProgress runnable = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException, InterruptedException {
-				HashSet modifiedResources = new HashSet();
-				for (Iterator iter = lib.eAllContents(); iter.hasNext();) {
-					InternalEObject element = (InternalEObject) iter.next();
-					if (element.eProxyURI() == null) {
-						ArrayList xReferences = new ArrayList(element.eClass()
-								.getEAllReferences());
-						xReferences.removeAll(element.eClass()
-								.getEAllContainments());
-						for (Iterator iterator = xReferences.iterator(); iterator
-								.hasNext();) {
-							EReference ref = (EReference) iterator.next();
-							Object value = element.eGet(ref, false);
-							if (ref.isMany()) {
-								if (value instanceof InternalEList) {
-									InternalEList list = (InternalEList) value;
-									ArrayList invalidProxies = new ArrayList();
-									for (Iterator iter1 = list.basicIterator(); iter1
-											.hasNext();) {
-										Object v = iter1.next();
-										if (isInvalidReference(element, ref, v)) {
-											invalidProxies.add(v);
-										}
-									}
-									if (!invalidProxies.isEmpty()) {
-										removeInvalidReferences(element, list,
-												invalidProxies);
-										modifiedResources.add(element
-												.eResource());
-									}
-								}
-							} else {
-								if (isInvalidReference(element, ref, value)) {
-									element.eSet(ref, null);
-									modifiedResources.add(element.eResource());
-								}
-							}
-						}
-					} else {
-						AuthoringUIPlugin
-								.getDefault()
-								.getLogger()
-								.logError(
-										"Unresolved proxy in '" + element.eResource().getURI().toFileString() + "': " + element); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				}
-
-				monitor.subTask(AuthoringUIResources.savingFilesTask_name); //$NON-NLS-1$
-				ILibraryPersister.FailSafeMethodLibraryPersister persister = LibraryServiceUtil.getCurrentPersister().getFailSafePersister();
-				try {
-					for (Iterator iter = modifiedResources.iterator(); iter
-							.hasNext();) {
-						Resource resource = (Resource) iter.next();
-						monitor.subTask(AuthoringUIResources.bind(AuthoringUIResources.savingTask_name, resource.getURI().toFileString()));
-						persister.save(resource);
-					}
-					persister.commit();
-				} catch (Exception e) {
-					persister.rollback();
-					throw new WrappedException(e);
-				}
-			}
-
-			private boolean isInvalidReference(InternalEObject element,
-					EReference ref, Object value) {
-				if (value instanceof InternalEObject) {
-					InternalEObject eObj = (InternalEObject) value;
-					if (eObj.eIsProxy()) {
-						EObject resolved = element.eResolveProxy(eObj);
-						if (!ref.getEType().isInstance(resolved)) {
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-
-			private void removeInvalidReferences(InternalEObject element,
-					InternalEList values, Collection invalidProxies) {
-				ArrayList list = new ArrayList(values.basicList());
-				list.removeAll(invalidProxies);
-				values.clear();
-				int max = list.size() - 1;
-				for (int i = max; i > -1; i--) {
-					list.set(i, element.eResolveProxy((InternalEObject) list
-							.get(i)));
-				}
-				values.addAll(list);
-			}
-
-		};
-		UserInteractionHelper.runWithProgress(runnable, AuthoringUIResources.deletingInvalidReferencesTask_name); 
-
-	}
-
-	/**
-	 * reloads the current library.  Used on a rollback error
-	 * @param shell
-	 */
-	public static void reloadCurrentLibaryOnRollbackError(Shell shell) {
-		reloadCurrentLibrary(shell, AuthoringUIResources.ViewHelper_reloadLibOnRollbackError); 
-	}
-
-	/**
-	 * displays the message and reloads the current library 
-	 * @param shell
-	 * @param message
-	 */
-	public static void reloadCurrentLibrary(Shell shell, String message) {
-		if (shell == null) {
-			MsgBox.getDefaultShell();
-		}
-		String title = AuthoringUIResources.reloadDialog_title; 
-		if (message == null) {
-			message = AuthoringUIResources.reloadDialog_message; 
-		}
-		AuthoringUIPlugin.getDefault().getMsgDialog().displayInfo(title,
-				message);
-
-		// The library needs to be reloaded.
-		String libDir = LibraryService.getInstance()
-				.getCurrentMethodLibraryPath();
-		LibraryUIManager.getInstance().openLibrary(libDir);
-	}
-
-	/**
-	 * opens the given viewId
-	 * @param viewId
-	 * @return
-	 * 			View
-	 */
-	public static IViewPart openView(String viewId) {
-		try {
-			IWorkbenchPage activePage = PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow().getActivePage();
-			if (activePage != null) {
-				IViewPart view = activePage.findView(viewId);
-				if (view == null) {
-					view = activePage.showView(viewId);
-				}
-				return view;
-			}
-		} catch (Exception e) {
-			AuthoringUIPlugin.getDefault().getMsgDialog().displayError(
-					AuthoringUIResources.errorDialog_title, 
-					AuthoringUIResources.internalError_msg, 
-					e);
-		}
-		return null;
-
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/package.html
deleted file mode 100755
index 9339bc9..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides views for the Authoring and Browsing perspectives.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/ConfigurationTableLabelProvider.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/ConfigurationTableLabelProvider.java
deleted file mode 100755
index f1a8dd3..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/ConfigurationTableLabelProvider.java
+++ /dev/null
@@ -1,44 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.wizards;
-
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * The label provider for the Configuration table in the Open Configuration
- * wizard.
- * 
- * @author Bingxue Xu
- * @since 1.0
- */
-public class ConfigurationTableLabelProvider extends LabelProvider implements
-		ITableLabelProvider {
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
-	 */
-	public Image getColumnImage(Object element, int index) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
-	 */
-	public String getColumnText(Object element, int index) {
-		MethodConfiguration config = (MethodConfiguration) element;
-		return config.getName();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewConfigurationMainPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewConfigurationMainPage.java
deleted file mode 100755
index 11a3063..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewConfigurationMainPage.java
+++ /dev/null
@@ -1,172 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.wizards;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A wizard page that prompts the user to enter a name and description for a new
- * Method Configuration.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- */
-public class NewConfigurationMainPage extends WizardPage {
-
-	/**
-	 * The wizard page name.
-	 */
-	public static final String PAGE_NAME = NewConfigurationMainPage.class
-			.getName();
-
-	private Text nameText, briefDescText;
-
-	private boolean noOpenLibrary;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public NewConfigurationMainPage() {
-		super(PAGE_NAME);
-		setTitle(AuthoringUIResources.AuthoringUIPlugin_NewConfigurationMainPage_pageTitle); //$NON-NLS-1$);
-		setDescription(AuthoringUIResources.AuthoringUIPlugin_NewConfigurationMainPage_pageDescription); //$NON-NLS-1$
-		setImageDescriptor(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"full/wizban/New.gif")); //$NON-NLS-1$		
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		GridData labelGridData = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
-
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(3, false));
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label nameLabel = new Label(composite, SWT.NONE);
-		nameLabel.setText(AuthoringUIText.NAME_TEXT);
-		nameLabel.setLayoutData(labelGridData);
-
-		nameText = new Text(composite, SWT.BORDER);
-		nameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		((GridData) nameText.getLayoutData()).horizontalSpan = 2;
-
-		Label briefDescLabel = new Label(composite, SWT.NONE);
-		briefDescLabel.setText(AuthoringUIText.DESCRIPTION_TEXT);
-		briefDescLabel.setLayoutData(labelGridData);
-
-		briefDescText = new Text(composite, SWT.BORDER | SWT.MULTI | SWT.WRAP
-				| SWT.V_SCROLL);
-		briefDescText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		((GridData) briefDescText.getLayoutData()).horizontalSpan = 2;
-		((GridData) briefDescText.getLayoutData()).heightHint = 70;
-		((GridData) briefDescText.getLayoutData()).widthHint = 480;
-		briefDescText
-				.setText(AuthoringUIResources.AuthoringUIPlugin_NewConfigurationMainPage_DefaultBriefDescription);
-
-		addListeners();
-
-		noOpenLibrary = LibraryService.getInstance().getCurrentMethodLibrary() == null;
-		if (noOpenLibrary) {
-			// FIXME! Externalize string.
-			setErrorMessage(AuthoringUIResources.noOpenLibraryError_msg);
-		}
-
-		setControl(composite);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		if (noOpenLibrary) {
-			return false;
-		}
-
-		String configName = getConfigurationName();
-		if (configName.length() == 0) {
-			return false;
-		}
-
-		if (configurationExists(configName)) {
-			String errMsg = AuthoringUIResources.bind(
-					AuthoringUIResources.duplicateElementNameError_msg,
-					configName);
-			setErrorMessage(errMsg);
-		} else {
-			setErrorMessage(null);
-		}
-
-		return getErrorMessage() == null;
-	}
-
-	/**
-	 * Adds listeners to the wizard controls.
-	 */
-	private void addListeners() {
-		nameText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setPageComplete(isPageComplete());
-				getWizard().getContainer().updateButtons();
-			}
-		});
-	}
-
-	/**
-	 * Adds listeners to the wizard controls.
-	 */
-	private boolean configurationExists(String configName) {
-		String[] configNames = LibraryServiceUtil
-				.getMethodConfigurationNames(LibraryService.getInstance()
-						.getCurrentMethodLibrary());
-		for (int i = 0; i < configNames.length; i++) {
-			if (configName.equalsIgnoreCase(configNames[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Returns the method configuration name.
-	 * 
-	 * @return the user specified name for the new method configuraiton
-	 */
-	public String getConfigurationName() {
-		return nameText.getText().trim();
-	}
-
-	/**
-	 * Returns the method configuration brief decription.
-	 * 
-	 * @return the user specified brief decription for the new method
-	 *         configuraiton
-	 */
-	public String getConfigurationBriefDescription() {
-		return briefDescText.getText().trim();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewConfigurationWizard.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewConfigurationWizard.java
deleted file mode 100755
index 0ca6924..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewConfigurationWizard.java
+++ /dev/null
@@ -1,113 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.wizards;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * A wizard that guides the user to create a new Method Configuration.
- * 
- * @author Kelvin Low
- * @author Bingxue Xu
- * @since 1.0
- */
-public class NewConfigurationWizard extends Wizard implements INewWizard {
-
-	/**
-	 * The wizard ID.
-	 */
-	public static final String WIZARD_ID = NewConfigurationWizard.class
-			.getName();
-
-	private NewConfigurationMainPage mainPage;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public NewConfigurationWizard() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
-	 *      IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		setWindowTitle(AuthoringUIResources.AuthoringUIPlugin_newConfigurationWizard_title); //$NON-NLS-1$		
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		mainPage = new NewConfigurationMainPage();
-		addPage(mainPage);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#createPageControls(Composite)
-	 */
-	public void createPageControls(Composite pageContainer) {
-		super.createPageControls(pageContainer);
-		pageContainer.getShell().setImage(
-				AuthoringUIPlugin.getDefault().getSharedImage(
-						"full/obj16/MethodConfiguration.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#canFinish()
-	 */
-	public boolean canFinish() {
-		if (LibraryService.getInstance().getCurrentMethodLibrary() == null) {
-			return false;
-		}
-		return super.canFinish();
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		String configName = mainPage.getConfigurationName();
-		if (configName != null) {
-			try {
-				MethodConfiguration config = LibraryService.getInstance()
-						.createMethodConfiguration(
-								configName,
-								LibraryService.getInstance()
-										.getCurrentMethodLibrary());
-				String briefDescription = mainPage
-						.getConfigurationBriefDescription();
-				if (briefDescription != null) {
-					config.setBriefDescription(briefDescription);
-				}
-			} catch (Exception e) {
-				AuthoringUIPlugin
-						.getDefault()
-						.getMsgDialog()
-						.displayError(
-								AuthoringUIResources.AuthoringUIPlugin_newConfigurationWizard_title,
-								AuthoringUIResources.internalError_msg, e);
-			}
-		}
-
-		return true;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryMainPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryMainPage.java
deleted file mode 100755
index 45fe10f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryMainPage.java
+++ /dev/null
@@ -1,192 +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.authoring.ui.wizards;
-
-import java.io.File;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.library.LibraryManagerFactory;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A wizard page that prompts the user to enter the name, brief description and
- * type for a new method library.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class NewLibraryMainPage extends BaseWizardPage {
-
-	/**
-	 * The wizard page name.
-	 */
-	public static final String PAGE_NAME = NewLibraryMainPage.class.getName();
-
-	private Shell shell;
-
-	private Combo libraryPathCombo;
-
-	private Button browseButton;
-
-	private Text briefDescText;
-
-	private String libraryType;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public NewLibraryMainPage() {
-		super(PAGE_NAME);
-		setTitle(AuthoringUIResources.newLibraryWizardMainPage_title);
-		setDescription(AuthoringUIResources.newLibraryWizardMainPage_description);
-		setImageDescriptor(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"full/wizban/New.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		shell = parent.getShell();
-
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(3, false));
-
-		createLabel(composite, AuthoringUIResources.libraryPathLabel_text);
-
-		libraryPathCombo = createCombobox(composite);
-
-		browseButton = createButton(composite,
-				AuthoringUIText.BROWSE_BUTTON_TEXT);
-
-		Label briefDescLabel = createLabel(composite,
-				AuthoringUIText.DESCRIPTION_TEXT);
-		briefDescLabel.setLayoutData(new GridData(
-				GridData.VERTICAL_ALIGN_BEGINNING));
-
-		briefDescText = createEditableText(composite, "", 480, 70, 1); //$NON-NLS-1$
-
-		Map types = LibraryManagerFactory.getInstance().getLibraryTypes();
-		for (Iterator it = types.keySet().iterator(); it.hasNext();) {
-			libraryType = (String) it.next();
-			break;
-		}
-
-		initControls();
-
-		addListeners();
-
-		setControl(composite);
-	}
-
-	/**
-	 * Initializes the wizard page controls with data.
-	 */
-	protected void initControls() {
-		String[] newLibraryPaths = LibraryUIPreferences.getNewLibraryPaths();
-		libraryPathCombo.setItems(newLibraryPaths);
-		if (newLibraryPaths.length > 0) {
-			libraryPathCombo.setText(newLibraryPaths[0]);
-		}
-	}
-
-	/**
-	 * Adds event listeners to the wizard page controls.
-	 */
-	protected void addListeners() {
-		libraryPathCombo.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setPageComplete(isPageComplete());
-				getWizard().getContainer().updateButtons();
-			}
-		});
-
-		libraryPathCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				setPageComplete(isPageComplete());
-				getWizard().getContainer().updateButtons();
-			}
-		});
-
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				DirectoryDialog dialog = new DirectoryDialog(shell, SWT.NONE);
-				dialog.setFilterPath(getLibraryPath());
-				String selectedDir = dialog.open();
-				if (selectedDir != null) {
-					libraryPathCombo.add(selectedDir, 0);
-					libraryPathCombo.setText(selectedDir);
-				}
-			}
-		});
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isCompleted()
-	 */
-	public boolean isPageComplete() {
-		return getLibraryName().length() > 0;
-	}
-
-	/**
-	 * Gets the library name.
-	 */
-	public String getLibraryName() {
-		String libPath = getLibraryPath();
-		String libName = new File(libPath).getName();
-		if (!libPath.equals(libName)) {
-			return libName;
-		} else {
-			return ""; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Gets the user specified library path.
-	 */
-	public String getLibraryPath() {
-		return libraryPathCombo.getText().trim();
-	}
-
-	/**
-	 * Gets the user specified method library description.
-	 */
-	public String getLibraryDescription() {
-		return briefDescText.getText().trim();
-	}
-
-	/**
-	 * Gets the user specified method library type.
-	 */
-	public String getLibraryType() {
-		return libraryType;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryMainPage2.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryMainPage2.java
deleted file mode 100755
index fe1c6a5..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryMainPage2.java
+++ /dev/null
@@ -1,181 +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.authoring.ui.wizards;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.library.LibraryManagerFactory;
-import org.eclipse.epf.library.ui.wizards.NewLibraryWizardPage;
-import org.eclipse.epf.library.ui.wizards.NewLibraryWizardPageFactory;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A wizard page that prompts the user to enter the name, brief description and
- * type for a new method library.
- * 
- * @author Kelvin Low
- * @since 1.2
- */
-public class NewLibraryMainPage2 extends WizardPage {
-
-	/**
-	 * The wizard page name.
-	 */
-	public static final String PAGE_NAME = NewLibraryMainPage2.class
-			.getName();
-
-	private static final String TYPE_ID = "typeId"; //$NON-NLS-1$	
-
-	private Text nameText;
-
-	private Text briefDescText;
-
-	private Button[] radioButtons;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public NewLibraryMainPage2() {
-		super(PAGE_NAME);
-		setTitle(AuthoringUIResources.newLibraryWizardMainPage_title);
-		setDescription(AuthoringUIResources.newLibraryWizardMainPage_description);
-		setImageDescriptor(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"full/wizban/New.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(3, false));
-
-		Label nameLabel = new Label(composite, SWT.NORMAL);
-		nameLabel.setText(AuthoringUIText.NAME_TEXT);
-
-		nameText = new Text(composite, SWT.BORDER);
-		nameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		((GridData) nameText.getLayoutData()).horizontalSpan = 2;
-
-		Label briefDescLabel = new Label(composite, SWT.NORMAL);
-		briefDescLabel.setText(AuthoringUIText.DESCRIPTION_TEXT);
-
-		briefDescText = new Text(composite, SWT.BORDER | SWT.MULTI | SWT.WRAP
-				| SWT.V_SCROLL);
-		briefDescText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		((GridData) briefDescText.getLayoutData()).horizontalSpan = 2;
-		((GridData) briefDescText.getLayoutData()).heightHint = 70;
-		((GridData) briefDescText.getLayoutData()).widthHint = 480;
-
-		Label libraryTypeLabel = new Label(composite, SWT.NORMAL);
-		libraryTypeLabel.setText(AuthoringUIResources.libraryTypeLabel_text);
-
-		Composite typeComposite = new Composite(composite, SWT.NORMAL);
-		typeComposite.setLayout(new GridLayout(2, false));
-		typeComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Map types = LibraryManagerFactory.getInstance().getLibraryTypes();
-		radioButtons = new Button[types.size()];
-		int radioButtonIndex = 0;
-		for (Iterator it = types.keySet().iterator(); it.hasNext();) {
-			String typeId = (String) it.next();
-			String typeName = (String) types.get(typeId);
-			Button radioButton = new Button(typeComposite, SWT.RADIO);
-			radioButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent event) {
-					setPageComplete(isPageComplete());
-					getWizard().getContainer().updateButtons();
-				}
-			});
-			radioButton.setText(typeName);
-			radioButton.setData(TYPE_ID, typeId);
-			radioButtons[radioButtonIndex++] = radioButton;
-		}
-
-		if (radioButtons.length > 0) {
-			radioButtons[0].setSelection(true);
-		}
-
-		addListeners();
-
-		setPageComplete(isPageComplete());
-
-		setControl(composite);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		NewLibraryWizardPage wizardPage = NewLibraryWizardPageFactory
-				.getInstance().getWizardPage(getLibraryType());
-		if (wizardPage != null) {
-			wizardPage.onEnterPage(getLibraryName());
-		}
-		return wizardPage;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isCompleted()
-	 */
-	public boolean isPageComplete() {
-		return getLibraryName().length() > 0;
-	}
-
-	/**
-	 * Adds listeners to the wizard controls.
-	 */
-	private void addListeners() {
-		nameText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setPageComplete(isPageComplete());
-				getWizard().getContainer().updateButtons();
-			}
-		});
-	}
-
-	/**
-	 * Returns the library name.
-	 */
-	public String getLibraryName() {
-		return nameText.getText().trim();
-	}
-
-	/**
-	 * Returns the library type selected by the user.
-	 */
-	public String getLibraryType() {
-		for (int i = 0; i < radioButtons.length; i++) {
-			Button radioButton = radioButtons[i];
-			if (radioButton.getSelection()) {
-				return (String) radioButton.getData(TYPE_ID);
-			}
-		}
-		return (String) radioButtons[0].getData(TYPE_ID);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryWizard.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryWizard.java
deleted file mode 100755
index b73fbfe..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryWizard.java
+++ /dev/null
@@ -1,133 +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.authoring.ui.wizards;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.epf.authoring.ui.AuthoringPerspective;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.common.utils.PerspectiveUtil;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.epf.library.xmi.XMILibraryManager;
-import org.eclipse.epf.library.xmi.XMILibraryUtil;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * A wizard that guides the user to create a new method library.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class NewLibraryWizard extends Wizard implements INewWizard {
-
-	/**
-	 * The wizard ID.
-	 */
-	public static final String WIZARD_ID = NewLibraryWizard.class.getName();
-
-	// The main wizard page.
-	private NewLibraryMainPage mainPage;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public NewLibraryWizard() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
-	 *      IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		setWindowTitle(AuthoringUIResources.newLibraryWizard_title);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		SaveAllEditorsPage.addPageIfNeeded(this, true, null, null, null);
-		mainPage = new NewLibraryMainPage();
-		addPage(mainPage);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#createPageControls(Composite)
-	 */
-	public void createPageControls(Composite pageContainer) {
-		super.createPageControls(pageContainer);
-		pageContainer.getShell().setImage(
-				AuthoringUIPlugin.getDefault().getSharedImage(
-						"full/obj16/MethodLibrary.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		try {
-			String name = mainPage.getLibraryName();
-			String desc = mainPage.getLibraryDescription();
-			String type = mainPage.getLibraryType();
-			Map options = new HashMap();
-			File libraryPath = new File(mainPage.getLibraryPath());
-			options.put(XMILibraryManager.ARG_LIBRARY_PATH, libraryPath
-					.getAbsolutePath());
-			
-			if (XMILibraryUtil
-				.containsPluginOrConfigSpecExportFile(libraryPath.getAbsolutePath())) {
-				throw new Exception(LibraryUIResources.openLibraryError_reason4);
-			}
-			
-			MethodLibrary library = LibraryService.getInstance()
-					.createMethodLibrary(name, type, options);
-			if (library != null) {
-				if (desc.length() > 0) {
-					library.setBriefDescription(desc);
-				}
-				LibraryUIPreferences.addNewLibraryPath(libraryPath
-						.getAbsolutePath());
-				PerspectiveUtil
-						.openPerspective(AuthoringPerspective.PERSPECTIVE_ID);
-				return true;
-			}
-		} catch (Exception e) {
-			String reason = e.getMessage();
-			if (reason == null) {
-				reason = AuthoringUIResources.newLibraryInternlError_reason;
-			}
-			reason += "\n\n" + AuthoringUIResources.newLibraryError_advice;  //$NON-NLS-1$
-			if (e.getMessage() != null) {
-				LibraryUIPlugin.getDefault().getMsgDialog().displayError(
-						AuthoringUIResources.newLibraryWizard_title,
-						AuthoringUIResources.newLibraryError_msg, reason);
-			} else {
-				LibraryUIPlugin.getDefault().getMsgDialog().displayError(
-						AuthoringUIResources.newLibraryWizard_title,
-						AuthoringUIResources.newLibraryError_msg, reason, e);
-			}
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryWizard2.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryWizard2.java
deleted file mode 100755
index b21f715..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryWizard2.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.authoring.ui.wizards;
-
-import java.util.Iterator;
-
-import org.eclipse.epf.authoring.ui.AuthoringPerspective;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.common.utils.PerspectiveUtil;
-import org.eclipse.epf.library.LibraryManagerFactory;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.epf.library.ui.wizards.NewLibraryWizardPage;
-import org.eclipse.epf.library.ui.wizards.NewLibraryWizardPageFactory;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * A wizard that guides the user to create a new method library.
- * 
- * @author Kelvin Low
- * @since 1.2
- */
-public class NewLibraryWizard2 extends Wizard implements INewWizard {
-
-	/**
-	 * The wizard ID.
-	 */
-	public static final String WIZARD_ID = NewLibraryWizard2.class.getName();
-
-	// The main wizard page.
-	private NewLibraryMainPage mainPage;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public NewLibraryWizard2() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
-	 *      IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		setWindowTitle(AuthoringUIResources.newLibraryWizard_title);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		SaveAllEditorsPage.addPageIfNeeded(this, true, null, null, null);
-		mainPage = new NewLibraryMainPage();
-		addPage(mainPage);
-
-		for (Iterator it = LibraryManagerFactory.getInstance()
-				.getLibraryTypes().keySet().iterator(); it.hasNext();) {
-			String persistenceId = (String) it.next();
-			String pageId = persistenceId + "Page"; //$NON-NLS-1$
-			NewLibraryWizardPage page = NewLibraryWizardPageFactory
-					.getInstance().createWizardPage(pageId, persistenceId);
-			if (page != null) {
-				page.setImageDescriptor(AuthoringUIPlugin.getDefault()
-						.getImageDescriptor("full/wizban/New.gif")); //$NON-NLS-1$					
-				addPage(page);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#createPageControls(Composite)
-	 */
-	public void createPageControls(Composite pageContainer) {
-		super.createPageControls(pageContainer);
-		pageContainer.getShell().setImage(
-				AuthoringUIPlugin.getDefault().getSharedImage(
-						"full/obj16/MethodLibrary.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#canFinish()
-	 */
-	public boolean canFinish() {
-		IWizardPage[] pages = getPages();
-		for (int i = 1; i < pages.length; i++) {
-			if (!pages[i].isPageComplete()) {
-				return false;
-			}
-		}
-		return getContainer().getCurrentPage() != mainPage;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		String name = mainPage.getLibraryName();
-		String type = mainPage.getLibraryType();
-		NewLibraryWizardPage page = NewLibraryWizardPageFactory.getInstance()
-				.getWizardPage(type);
-		try {
-			MethodLibrary library = LibraryService.getInstance()
-					.createMethodLibrary(name, type, page.getSelections());
-			if (library != null) {
-				addRecentlyOpenedLibrary(library);
-				PerspectiveUtil
-						.openPerspective(AuthoringPerspective.PERSPECTIVE_ID);
-				return true;
-			}
-		} catch (Exception e) {
-			String reason = e.getMessage();
-			if (reason == null) {
-				reason = AuthoringUIResources.newLibraryInternlError_reason;
-			}
-			reason += "\n\n" + AuthoringUIResources.newLibraryError_advice;  //$NON-NLS-1$
-			if (e.getMessage() != null) {
-				LibraryUIPlugin.getDefault().getMsgDialog().displayError(
-						AuthoringUIResources.newLibraryWizard_title,
-						AuthoringUIResources.newLibraryError_msg, reason);
-			} else {
-				LibraryUIPlugin.getDefault().getMsgDialog().displayError(
-						AuthoringUIResources.newLibraryWizard_title,
-						AuthoringUIResources.newLibraryError_msg, reason, e);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Adds the newly opened or created method library to the recently opened
-	 * method libraries preference.
-	 * 
-	 * @param library
-	 *            a method library
-	 */
-	protected void addRecentlyOpenedLibrary(MethodLibrary library) {
-		if (library != null) {
-			String libraryURI = LibraryService.getInstance().getLibraryManager(
-					library).getMethodLibraryURI().toString();
-			LibraryUIPreferences.addOpenLibraryURI(libraryURI);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewMethodPluginWizard.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewMethodPluginWizard.java
deleted file mode 100755
index 9e49cfd..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewMethodPluginWizard.java
+++ /dev/null
@@ -1,151 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.wizards;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.editors.EditorChooser;
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.util.ModelStorage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * A wizard that guides the user to create a new Method Plug-in.
- * 
- * @author Shashidhar Kannoori
- * @author Kelvin Low
- * @since 1.0
- */
-public class NewMethodPluginWizard extends Wizard implements INewWizard {
-
-	/**
-	 * The wizard ID.
-	 */
-	public static final String WIZARD_ID = NewMethodPluginWizard.class
-			.getName();
-
-	private NewMethodPluginWizardPage mainPage;
-
-	private MethodPlugin newPlugin;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public NewMethodPluginWizard() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
-	 *      IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		setWindowTitle(AuthoringUIResources.newPluginWizard_title); //$NON-NLS-1$
-	}
-
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		mainPage = new NewMethodPluginWizardPage();
-		addPage(mainPage);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#createPageControls(Composite)
-	 */
-	public void createPageControls(Composite pageContainer) {
-		super.createPageControls(pageContainer);
-		pageContainer.getShell().setImage(
-				AuthoringUIPlugin.getDefault().getSharedImage(
-						"full/obj16/MethodPlugin.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#canFinish()
-	 */
-	public boolean canFinish() {
-		if (LibraryService.getInstance().getCurrentMethodLibrary() == null) {
-			return false;
-		}
-		return super.canFinish();
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		String pluginName = mainPage.getPluginName();
-		if (pluginName != null && pluginName.length() > 0) {
-			try {
-				// Create the method plug-in and add it to the current method
-				// library.
-				newPlugin = UmaFactory.eINSTANCE.createMethodPlugin();
-				newPlugin.setName(StrUtil.makeValidFileName(pluginName));
-				newPlugin.setBriefDescription(mainPage.getBriefDescription());
-				newPlugin.setAuthors(mainPage.getAuthors());
-				Object[] referencedPlugins = mainPage.getReferencedPlugins();
-				for (int i = 0; i < referencedPlugins.length; i++) {
-					MethodPlugin plugin = (MethodPlugin) referencedPlugins[i];
-					if (plugin != null) {
-						newPlugin.getBases().add(plugin);
-					}
-				}
-
-				ILibraryManager manager = (ILibraryManager) LibraryService
-						.getInstance().getCurrentLibraryManager();
-				if (manager != null) {
-					manager.addMethodPlugin(ModelStorage.initialize(newPlugin));
-				}
-
-				Display.getCurrent().asyncExec(new Runnable() {
-					public void run() {
-						// Select the new Method Plug-in in the Library view.
-						List selection = new ArrayList();
-						selection.add(newPlugin);
-						LibraryView.getView().setSelectionToViewer(selection);
-
-						// Open the editor for newly created plug-in.
-						EditorChooser.getInstance().openEditor(newPlugin);
-					}
-				});
-
-				return true;
-			} catch (Exception e) {
-				String reason = e.getMessage() != null ? e.getMessage() : AuthoringUIResources.newPluginError_reason;
-				AuthoringUIPlugin
-						.getDefault()
-						.getMsgDialog()
-						.displayError(
-						AuthoringUIResources.newPluginWizard_title, //$NON-NLS-1$
-						AuthoringUIResources.newPluginError_msg, //$NON-NLS-1$
-								reason,
-						e);
-			}
-		}
-		return false;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewMethodPluginWizardPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewMethodPluginWizardPage.java
deleted file mode 100755
index ead6f4f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewMethodPluginWizardPage.java
+++ /dev/null
@@ -1,258 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.wizards;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.library.ui.LibraryUIImages;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.library.util.ModelStorage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-
-/**
- * A wizard page that prompts the user to enter a name and description for a new
- * Method Plug-in.
- * 
- * @author Shashidhar Kannoori
- * @author Kelvin Low
- * @since 1.0
- */
-public class NewMethodPluginWizardPage extends WizardPage implements Listener {
-
-	/**
-	 * The wizard page name.
-	 */
-	public static final String PAGE_NAME = NewMethodPluginWizardPage.class
-			.getName();
-
-	private Text nameText;
-
-	private Text briefDescText;
-
-	private Text authorsText;
-
-	private CheckboxTableViewer referencedPluginsViewer;
-
-	private List plugins;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public NewMethodPluginWizardPage() {
-		super(PAGE_NAME);
-		setTitle(AuthoringUIResources.newPluginWizardPage_title); //$NON-NLS-1$
-		setDescription(AuthoringUIResources.newPluginWizardPage_text); //$NON-NLS-1$
-		setImageDescriptor(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"full/wizban/New.gif")); //$NON-NLS-1$		
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		GridData labelGridData = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
-
-		Composite composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout(2, false));
-		composite.setLayoutData(gridData);
-
-		Label nameLabel = new Label(composite, SWT.NONE);
-		nameLabel.setText(AuthoringUIText.NAME_TEXT);
-		nameText = new Text(composite, SWT.BORDER);
-		// TODO: Provide a unique default plug-in name.
-		nameText.setText("new_plug-in"); //$NON-NLS-1$
-		nameText.setLayoutData(gridData);
-
-		Label briefDescLabel = new Label(composite, SWT.NONE);
-		briefDescLabel.setText(AuthoringUIText.BRIEF_DESCRIPTION_TEXT);
-		briefDescLabel.setLayoutData(labelGridData);
-		briefDescText = new Text(composite, SWT.BORDER | SWT.MULTI | SWT.WRAP
-				| SWT.V_SCROLL);
-		GridData briefDescGridData = new GridData(GridData.FILL_HORIZONTAL);
-		briefDescGridData.heightHint = 70;
-		briefDescText.setLayoutData(briefDescGridData);
-
-		Label authorsLabel = new Label(composite, SWT.NONE);
-		authorsLabel.setText(AuthoringUIText.AUTHORS_TEXT);
-		authorsLabel.setLayoutData(labelGridData);
-		authorsText = new Text(composite, SWT.BORDER | SWT.MULTI | SWT.WRAP
-				| SWT.V_SCROLL);
-		GridData authorsGridData = new GridData(GridData.FILL_HORIZONTAL);
-		authorsGridData.heightHint = 35;
-		authorsText.setLayoutData(authorsGridData);
-
-		Label referencedPluginsLabel = new Label(composite, SWT.NONE);
-		referencedPluginsLabel
-				.setText(AuthoringUIText.REFERENCED_PLUGINS_SECTION_NAME);
-		referencedPluginsLabel.setLayoutData(labelGridData);
-		plugins = ModelStorage.getBaseModels();
-		String[] items = new String[plugins.size()];
-		for (int i = 0; i < plugins.size(); i++) {
-			MethodPlugin model = (MethodPlugin) plugins.get(i);
-			items[i] = model.getName();
-		}
-		referencedPluginsViewer = CheckboxTableViewer.newCheckList(composite,
-				SWT.BORDER | SWT.FILL | SWT.HORIZONTAL);
-		GridData referencedPluginsGridData = new GridData(
-				GridData.FILL_HORIZONTAL);
-		referencedPluginsGridData.heightHint = 150;
-		referencedPluginsViewer.getTable().setLayoutData(
-				referencedPluginsGridData);
-
-		ILabelProvider labelProvider = new LabelProvider() {
-
-			public Image getImage(Object element) {
-				return LibraryUIImages.IMG_METHOD_PLUGIN;
-			}
-
-			public String getText(Object element) {
-				if (element instanceof MethodPlugin) {
-					return ((MethodPlugin) element).getName();
-				} else {
-					return element.toString();
-				}
-			}
-
-		};
-
-		referencedPluginsViewer.setLabelProvider(labelProvider);
-
-		if (plugins != null) {
-			Iterator it = plugins.iterator();
-			while (it.hasNext()) {
-				referencedPluginsViewer.add(it.next());
-			}
-		}
-
-		setControl(composite);
-
-		// Get the parent shell.
-		Shell shell = parent.getShell();
-
-		nameText.addListener(SWT.Modify, this);
-		nameText.addListener(SWT.FocusOut, this);
-
-		Display display = shell.getDisplay();
-		if (display != null && !display.isDisposed()) {
-			display.asyncExec(new Runnable() {
-				public void run() {
-					nameText.setFocus();
-					nameText.setSelection(0, nameText.getText().length());
-				}
-			});
-		}
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(Event)
-	 */
-	public void handleEvent(Event event) {
-		if (event.widget == nameText) {
-			validateName();
-		}
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	/**
-	 * Validate the plug-in name.
-	 */
-	public boolean validateName() {
-		boolean answer;
-
-		String msg = LibraryUtil.checkPluginName(null, getPluginName());
-		if (msg == null) {
-			answer = true;
-			setErrorMessage(null);
-			setMessage(AuthoringUIResources.newPluginWizardPage_text); //$NON-NLS-1$
-		} else {
-			answer = false;
-			int idx = msg.indexOf("'."); //$NON-NLS-1$
-			if (idx >= 0)
-				msg = msg.substring(idx + 3);
-			// Check for IUPL0101E in the msg, in order to display error msg,
-			// Which fits in error message area of the wizard. 
-			int i = msg.indexOf("IUPL0101E"); //$NON-NLS-1$
-			if(i>=0){
-				msg = AuthoringUIResources.bind(AuthoringUIResources.duplicatePluginNameError_msg, getPluginName()); //$NON-NLS-1$
-			}
-			setErrorMessage(msg);
-			setMessage(null);
-		}
-
-		return answer;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		return isTextNonEmpty(nameText) && getErrorMessage() == null;
-	}
-
-	/**
-	 * Returns true if the given Text control contains a vlaid text.
-	 */
-	private static boolean isTextNonEmpty(Text t) {
-		String text = t.getText();
-		return text != null && text.trim().length() > 0;
-	}
-
-	/**
-	 * Returns the name for the plug-in.
-	 */
-	public String getPluginName() {
-		return nameText.getText() != null ? nameText.getText().trim() : null;
-	}
-
-	/**
-	 * Returns the brief description.
-	 */
-	public String getBriefDescription() {
-		return briefDescText.getText();
-	}
-
-	/**
-	 * Returns the authors.
-	 */
-	public String getAuthors() {
-		return authorsText.getText();
-	}
-
-	/**
-	 * Returns the referenced plug-ins.
-	 */
-	public Object[] getReferencedPlugins() {
-		return referencedPluginsViewer.getCheckedElements();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/OpenConfigurationMainPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/OpenConfigurationMainPage.java
deleted file mode 100755
index 796531f..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/OpenConfigurationMainPage.java
+++ /dev/null
@@ -1,148 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.wizards;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-
-/**
- * A wizard page that prompts the user to select a Method Configuration to open.
- * 
- * @author Bingxue Xu
- * @since 1.0
- */
-public class OpenConfigurationMainPage extends WizardPage implements
-		ICheckStateListener, Listener {
-
-	/**
-	 * The wizard page name.
-	 */
-	public static final String PAGE_NAME = OpenConfigurationMainPage.class
-			.getName();
-
-	private CheckboxTableViewer tableViewer;
-
-	private Table table;
-
-	private int checkedCount = 0;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public OpenConfigurationMainPage(String pageName, String title,
-			ImageDescriptor titleImage) {
-		super(pageName, title, titleImage);
-		setTitle(AuthoringUIResources.AuthoringUIPlugin_OpenConfigurationMainPage_pageTitle); //$NON-NLS-1$
-		setDescription(AuthoringUIResources.AuthoringUIPlugin_OpenConfigurationMainPage_pageDescription); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(CheckStateChangedEvent)
-	 */
-	public void checkStateChanged(CheckStateChangedEvent event) {
-		Object obj = event.getElement();
-
-		OpenConfigurationWizard wizard = (OpenConfigurationWizard) getWizard();
-		if (event.getChecked()) {
-			checkedCount++;
-			wizard.configurations.add(obj);
-		} else {
-			checkedCount--;
-			wizard.configurations.remove(obj);
-		}
-
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(Event)
-	 */
-	public void handleEvent(Event event) {
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		OpenConfigurationWizard wizard = (OpenConfigurationWizard) getWizard();
-
-		if (checkedCount > 0) {
-			wizard.okToComplete = true;
-			return true;
-		}
-
-		wizard.okToComplete = false;
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		// Create the composite to hold the widgets.
-		Composite composite = new Composite(parent, SWT.NULL);
-
-		// Create the desired layout for this wizard page.
-		composite.setLayout(new GridLayout(3, false));
-
-		// Add an empty line first.
-		Label emptyLine = new Label(composite, SWT.NONE);
-		emptyLine.setText("   "); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.BEGINNING
-					| GridData.FILL_BOTH);
-			gridData.horizontalSpan = 3;
-			emptyLine.setLayoutData(gridData);
-		}
-
-		new Label(composite, SWT.NONE).setText("   "); //$NON-NLS-1$
-
-		table = new Table(composite, SWT.CHECK);
-		{
-			GridData gridData = new GridData(GridData.BEGINNING
-					| GridData.FILL_BOTH);
-			gridData.heightHint = 300;
-			table.setLayoutData(gridData);
-		}
-		tableViewer = new CheckboxTableViewer(table);
-		tableViewer.setLabelProvider(new ConfigurationTableLabelProvider());
-		tableViewer.setContentProvider(new ArrayContentProvider());
-		MethodConfiguration[] configs = LibraryServiceUtil
-				.getMethodConfigurations(LibraryService.getInstance()
-						.getCurrentMethodLibrary());
-		tableViewer.setInput(configs);
-
-		tableViewer.addCheckStateListener(this);
-
-		// Set the composite as the control for this page.
-		setControl(composite);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/OpenConfigurationWizard.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/OpenConfigurationWizard.java
deleted file mode 100755
index 46392af..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/OpenConfigurationWizard.java
+++ /dev/null
@@ -1,91 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.wizards;
-
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-
-/**
- * A wizard that guides the user to open a Method Configuration.
- * 
- * @author Bingxue Xu
- * @since 1.0
- */
-public class OpenConfigurationWizard extends Wizard implements INewWizard {
-
-	protected OpenConfigurationMainPage mainPage;
-
-	protected boolean okToComplete = false;
-
-	protected List configurations = null;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public OpenConfigurationWizard(List configurations) {
-		super();
-		this.configurations = configurations;
-		setWindowTitle(AuthoringUIResources.AuthoringUIPlugin_OpenConfigurationWizard_windowTitle); //$NON-NLS-1$
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	public OpenConfigurationWizard() {
-		this(null);
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
-	 *      IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		mainPage = new OpenConfigurationMainPage(
-				OpenConfigurationMainPage.PAGE_NAME, null, null); //$NON-NLS-1$
-		addPage(mainPage);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#canFinish()
-	 */
-	public boolean canFinish() {
-		return okToComplete;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performCancel()
-	 */
-	public boolean performCancel() {
-		if (configurations != null)
-			configurations.clear();
-		return true;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SaveAllEditorsPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SaveAllEditorsPage.java
deleted file mode 100755
index ffe61f9..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SaveAllEditorsPage.java
+++ /dev/null
@@ -1,292 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.wizards;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.jface.dialogs.IPageChangedListener;
-import org.eclipse.jface.dialogs.PageChangedEvent;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A wizard page that lists the currently open editors and prompts the user to
- * save them before performing an import or export operation.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @since 1.0
- */
-public class SaveAllEditorsPage extends BaseWizardPage {
-
-	private static final String SAVE_AND_CLOSE_PAGE_TITLE = AuthoringUIResources.AuthoringUIPlugin_SaveAllEditorsPage_saveAndClosePageTitle;
-
-	private static final String SAVE_AND_CLOSE_PAGE_DESC = AuthoringUIResources.AuthoringUIPlugin_SaveAllEditorsPage_saveAndClosePageDescription;
-
-	private static final String SAVE_PAGE_TITLE = AuthoringUIResources.AuthoringUIPlugin_SaveAllEditorsPage_saveTitle;
-
-	private static final String SAVE_PAGE_DESC = AuthoringUIResources.AuthoringUIPlugin_SaveAllEditorsPage_saveDescription;
-
-	private boolean doClose;
-
-	private CheckboxTableViewer ctrl_chkboxTableViewer;
-
-	private Button selectAll;
-
-	private Button deselectAll;
-
-	/**
-	 * Adds this wizard page to a wizard only when necessary.
-	 * 
-	 * @param wizard
-	 *            The wizard which this page might be added.
-	 * @param doClose
-	 *            If <code>true</code>, this page will be added iff there are
-	 *            open editors. If <code>false</code>, this page will be
-	 *            added iff there are dirty editors.
-	 * @return <code>true</code> if the page will be added to the wizard.
-	 */
-	public static boolean addPageIfNeeded(Wizard wizard, boolean doClose) {
-		if (isUnsavedEditor(doClose)) {
-			wizard.addPage(new SaveAllEditorsPage(doClose));
-			return true;
-		} else
-			return false;
-
-	}
-
-	/**
-	 * Adds this wizard page to a wizard only when necessary.
-	 * 
-	 * @param wizard
-	 *            The wizard which this page might be added.
-	 * @param doClose
-	 *            If <code>true</code>, this page will be added iff there are
-	 *            open editors. If <code>false</code>, this page will be
-	 *            added iff there are dirty editors.
-	 * @return <code>true</code> if the page will be added to the wizard.
-	 */
-	public static boolean addPageIfNeeded(Wizard wizard, boolean doClose,
-			String title, String description, ImageDescriptor image) {
-
-		if (isUnsavedEditor(doClose)) {
-			SaveAllEditorsPage page = new SaveAllEditorsPage(doClose);
-			if (title != null) {
-				page.setTitle(title);
-			}
-			if (description != null) {
-				page.setDescription(description);
-			}
-			if (image != null) {
-				page.setImageDescriptor(image);
-			}
-			wizard.addPage(page);
-			return true;
-		} else
-			return false;
-	}
-
-	/**
-	 * Creates a new intance.
-	 */
-	public SaveAllEditorsPage(boolean close) {
-		super(SAVE_PAGE_TITLE);
-		this.doClose = close;
-		if (doClose) {
-			setTitle(SAVE_AND_CLOSE_PAGE_TITLE);
-			setDescription(SAVE_AND_CLOSE_PAGE_DESC);
-		} else {
-			setTitle(SAVE_PAGE_TITLE);
-			setDescription(SAVE_PAGE_DESC);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout(2, false));
-
-		ctrl_chkboxTableViewer = CheckboxTableViewer.newCheckList(container,
-				SWT.BORDER | SWT.FILL | SWT.HORIZONTAL);
-		ctrl_chkboxTableViewer.getTable().setLayoutData(
-				new GridData(SWT.FILL, SWT.FILL, true, true));
-
-		ctrl_chkboxTableViewer.setLabelProvider(new LabelProvider() {
-			public String getText(Object element) {
-				IEditorReference ref = (IEditorReference) element;
-				return ref.getEditor(false).getTitle();
-			}
-
-			public Image getImage(Object element) {
-				IEditorReference ref = (IEditorReference) element;
-				return ref.getEditor(false).getTitleImage();
-			}
-		});
-		ctrl_chkboxTableViewer.setContentProvider(new ArrayContentProvider());
-		ctrl_chkboxTableViewer.setInput(PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getActivePage()
-				.getEditorReferences());
-		ctrl_chkboxTableViewer.addFilter(new ViewerFilter() {
-			public boolean select(Viewer viewer, Object parentElement, Object element) {
-				if (element instanceof IEditorReference) {
-					if (((IEditorReference)element).isDirty())
-						return true;
-				}
-				return false;
-			}
-		});
-		ctrl_chkboxTableViewer.setAllChecked(true);
-
-		Composite buttonContainer = new Composite(container, SWT.NONE);
-		buttonContainer.setLayout(new GridLayout(1, true));
-		buttonContainer.setLayoutData(new GridData(SWT.DEFAULT, SWT.BEGINNING,
-				false, true));
-
-		selectAll = new Button(buttonContainer, SWT.PUSH);
-		selectAll
-				.setText(AuthoringUIResources.AuthoringUIPlugin_SaveAllEditorsPage_SelectAllButtonLabel);
-		selectAll.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, false,
-				true));
-
-		deselectAll = new Button(buttonContainer, SWT.PUSH);
-		deselectAll
-				.setText(AuthoringUIResources.AuthoringUIPlugin_SaveAllEditorsPage_DeselectAllButtonLabel);
-		deselectAll.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, false,
-				true));
-
-		addListeners();
-
-		setControl(container);
-		setPageComplete(true);
-	}
-
-	private void refresh () {
-		if (ctrl_chkboxTableViewer != null) {
-			ctrl_chkboxTableViewer.refresh();
-			if (ctrl_chkboxTableViewer.getTable() != null) {
-				if (ctrl_chkboxTableViewer.getTable().getItems() != null) {
-					if (ctrl_chkboxTableViewer.getTable().getItems().length == 0) {
-						if (ctrl_chkboxTableViewer.getControl() != null)
-							ctrl_chkboxTableViewer.getControl().setEnabled(false);
-						selectAll.setEnabled(false);
-						deselectAll.setEnabled(false);
-					}
-				}
-			}
-		}
-	}
-	
-	private void addListeners() {
-		if (getWizard() != null) {
-			IWizardContainer container = getWizard().getContainer();
-			if (container instanceof WizardDialog) {
-				((WizardDialog)container).addPageChangedListener(new IPageChangedListener() {
-					public void pageChanged(PageChangedEvent event) {
-						refresh();
-					}
-				});
-			}
-		}
-		selectAll.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				ctrl_chkboxTableViewer.setAllChecked(true);
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-
-		});
-
-		deselectAll.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				ctrl_chkboxTableViewer.setAllChecked(false);
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-
-		});
-	}
-	
-	public boolean canFlipToNextPage() {
-		return true;
-	}
-
-	/**
-	 * Perform our save (and possibly close) operation
-	 */
-	public IWizardPage getNextPage() {
-		Object[] checkedArray = ctrl_chkboxTableViewer.getCheckedElements();
-		for (int i = 0; i < checkedArray.length; i++) {
-			PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-					.getActivePage().saveEditor(
-							((IEditorReference) checkedArray[i])
-									.getEditor(false), false);
-		}
-		if (doClose)
-			PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-					.getActivePage().closeAllEditors(false);
-
-		return super.getNextPage();
-	}
-
-	/**
-	 * Checked whether there is any unsaved editor open
-	 * 
-	 * @param doClose
-	 * @return true if there is an unsaved editor open
-	 * 	true if doClose is true and there is an open editor
-	 *  false otherwise
-	 */
-	private static boolean isUnsavedEditor(boolean doClose) {
-		boolean anEditorIsDirty = false;
-		IEditorReference[] list = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getActivePage()
-				.getEditorReferences();
-		for (int i = 0; i < list.length; i++) {
-			if (list[i].isDirty()) {
-				anEditorIsDirty = true;
-				break;
-			}
-		}
-		return (anEditorIsDirty || doClose && list.length > 0);
-	}
-	
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		return !isUnsavedEditor(doClose);
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationChoices.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationChoices.java
deleted file mode 100755
index ed53a2a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationChoices.java
+++ /dev/null
@@ -1,281 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.wizards;
-
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.Process;
-
-/**
- * It stores and manages all choices for synchronization
- * 
- * @author BingXue Xu
- * @since 1.0
- *
- */
-public class SynchronizationChoices {
-
-	public static int SYNC_NONE = 0;
-	public static int SYNC_FROM_CONETNT = 1;
-	public static int SYNC_FROM_PROCESS = 2;
-	
-	private Process selectedProcess;
-	private MethodConfiguration selectedConfig;
-	private int syncName= SYNC_FROM_CONETNT;
-	private int syncPresName= SYNC_FROM_CONETNT;
-	private int syncBriefDesc= SYNC_FROM_CONETNT;
-	private int syncOptInput= SYNC_FROM_CONETNT;
-	private int syncManInput= SYNC_FROM_CONETNT;
-	private int syncOutput= SYNC_FROM_CONETNT;
-	private int syncPrimPerformer= SYNC_FROM_CONETNT;
-	private int syncAddnPerformer= SYNC_FROM_CONETNT;
-	private int syncRespRole= SYNC_FROM_CONETNT;
-	private int syncContArtifact= SYNC_FROM_CONETNT;
-	private int syncDelivPart= SYNC_FROM_CONETNT;
-	private int syncSelStep= SYNC_FROM_CONETNT;
-	
-	public boolean isFinishPressed;
-
-	/**
-	 * Get selected process
-	 */
-	public Process getSelectedProcess() {
-		return selectedProcess;
-	}
-
-	/**
-	 * Set selected process
-	 * @param selectedProcess
-	 */
-	public void setSelectedProcess(Process selectedProcess) {
-		this.selectedProcess = selectedProcess;
-	}
-
-	/**
-	 * Get selected method configuration
-	 */
-	public MethodConfiguration getSelectedConfig() {
-		return selectedConfig;
-	}
-
-	/**
-	 * Set selected method configuration
-	 * @param selectedConfig
-	 */
-	public void setSelectedConfig(MethodConfiguration selectedConfig) {
-		this.selectedConfig = selectedConfig;
-	}
-
-	/**
-	 * Get option of synchronizing contained artifacts
-	 */
-	public int getSyncContArtifact() {
-		return syncContArtifact;
-	}
-
-	/**
-	 * Set option for synchronizing contained artifacts
-	 */
-	public void setSyncContArtifact(int syncContArtifact) {
-		this.syncContArtifact = syncContArtifact;
-	}
-
-	/**
-	 * Get option of synchronizing deliverable parts
-	 */
-	public int getSyncDelivPart() {
-		return syncDelivPart;
-	}
-
-	/**
-	 * Set option for synchronizing deliverable parts
-	 */
-	public void setSyncDelivPart(int syncDelivPart) {
-		this.syncDelivPart = syncDelivPart;
-	}
-
-	/**
-	 * Get option of synchronizing mandatory input
-	 */
-	public int getSyncManInput() {
-		return syncManInput;
-	}
-
-	/**
-	 * Set option for synchronizing mandatory input
-	 */
-	public void setSyncManInput(int syncManInput) {
-		this.syncManInput = syncManInput;
-	}
-
-	/**
-	 * Get option of synchronizing optional input
-	 */
-	public int getSyncOptInput() {
-		return syncOptInput;
-	}
-
-	/**
-	 * Set option for synchronizing optional input
-	 */
-	public void setSyncOptInput(int syncOptInput) {
-		this.syncOptInput = syncOptInput;
-	}
-
-	/**
-	 * Get option of synchronizing output
-	 */
-	public int getSyncOutput() {
-		return syncOutput;
-	}
-
-	/**
-	 * Set option for synchronizing output
-	 */
-	public void setSyncOutput(int syncOutput) {
-		this.syncOutput = syncOutput;
-	}
-
-	/**
-	 * Get option of synchronizing presentation name
-	 */
-	public int getSyncPresName() {
-		return syncPresName;
-	}
-
-	/**
-	 * Set option for synchronizing presetnation name
-	 */
-	public void setSyncPresName(int syncPresName) {
-		this.syncPresName = syncPresName;
-	}
-
-	/**
-	 * Get option of synchronizing responsible role
-	 */
-	public int getSyncRespRole() {
-		return syncRespRole;
-	}
-
-	/**
-	 * Set option for synchronizing responsible role
-	 */
-	public void setSyncRespRole(int syncRespRole) {
-		this.syncRespRole = syncRespRole;
-	}
-
-	/**
-	 * Get option of synchronizing steps
-	 */
-	public int getSyncSelStep() {
-		return syncSelStep;
-	}
-
-	/**
-	 * Set option for synchronizing steps
-	 */
-	public void setSyncSelStep(int syncSelStep) {
-		this.syncSelStep = syncSelStep;
-	}
-
-	/**
-	 * Returns boolean value based on wizard is completed or not
-	 */
-	public boolean isFinishPressed() {
-		return isFinishPressed;
-	}
-
-	/**
-	 * Set option based on wizard in completed or not
-	 */
-	public void setFinishPressed(boolean isFinishPressed) {
-		this.isFinishPressed = isFinishPressed;
-	}
-
-	/**
-	 * Get option of synchronizing additional performer
-	 */
-	public int getSyncAddnPerformer() {
-		return syncAddnPerformer;
-	}
-
-	/**
-	 * Set option for synchronizing additional performer
-	 */
-	public void setSyncAddnPerformer(int syncAddnPerformer) {
-		this.syncAddnPerformer = syncAddnPerformer;
-	}
-
-	/**
-	 * Get option of synchronizing primary performer
-	 */
-	public int getSyncPrimPerformer() {
-		return syncPrimPerformer;
-	}
-
-	/**
-	 * Set option for synchronizing primary performer
-	 */
-	public void setSyncPrimPerformer(int syncPrimPerformer) {
-		this.syncPrimPerformer = syncPrimPerformer;
-	}
-
-	/**
-	 * Displays all synchronization options/choices
-	 */
-	public String toString() {
-		
-		StringBuffer sbuf = new StringBuffer();
-		sbuf.append("[Process:" + ((selectedProcess != null)?selectedProcess.getName():"null") + ";"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		sbuf.append("Configuration:" + ((selectedConfig != null)?selectedConfig.getName():"null") + ";"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		sbuf.append("Name:" + syncName + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-		sbuf.append("PresName:" + syncPresName + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-		sbuf.append("BreifDesc:" + syncBriefDesc + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-		sbuf.append("OptInput:" + syncOptInput + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-		sbuf.append("ManInput:" + syncManInput + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-		sbuf.append("Output:" + syncOutput + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-		sbuf.append("PrimPerformer:" + syncPrimPerformer + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-		sbuf.append("AddnPerformers:" + syncAddnPerformer + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-		sbuf.append("RespRole:" + syncRespRole + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-		sbuf.append("ContArtifact:" + syncContArtifact + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-		sbuf.append("DelivPart:" + syncDelivPart + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-		sbuf.append("SelStep:" + syncSelStep + "]"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		return sbuf.toString();
-	}
-
-	/**
-	 * Get option of synchronizing brief description
-	 */
-	public int getSyncBriefDesc() {
-		return syncBriefDesc;
-	}
-
-	/**
-	 * Set option for synchronizing brief description
-	 */
-	public void setSyncBriefDesc(int syncBriefDesc) {
-		this.syncBriefDesc = syncBriefDesc;
-	}
-
-	/**
-	 * Get option of synchronizing name
-	 */
-	public int getSyncName() {
-		return syncName;
-	}
-
-	/**
-	 * Set option for synchronizing name
-	 */
-	public void setSyncName(int syncName) {
-		this.syncName = syncName;
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationDescriptionPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationDescriptionPage.java
deleted file mode 100755
index 088c4c2..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationDescriptionPage.java
+++ /dev/null
@@ -1,60 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.wizards;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * The wizard page which describes custom synchronization.
- * 
- * @author BingXue Xu
- * @since 1.0
- *
- */
-public class SynchronizationDescriptionPage extends BaseWizardPage {
-
-	private SynchronizationChoices syncChoices = null;
-	
-	private Text ctrl_explainText;
-	
-	/**
-	 * Creates a new instance.
-	 */
-	public SynchronizationDescriptionPage(String pageName,
-			SynchronizationChoices choices) {
-		super(pageName);
-		setTitle(AuthoringUIResources.synchronizationWizard_descriptionPage_title); 
-		setDescription(AuthoringUIResources.synchronizationWizard_descriptionPage_text); 
-		this.syncChoices = choices;
-	}
-	
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		// Create the composite to hold the widgets.
-		Composite composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout(1, false));
-		
-		String explainText = AuthoringUIResources.synchronizationWizard_descriptionPage_explainText; 
-		ctrl_explainText = createTextMulti(composite, " ", 400, 240, 1); //$NON-NLS-1$
-		ctrl_explainText.setText(explainText);
-		
-		setControl(composite);
-
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationOperation.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationOperation.java
deleted file mode 100755
index 45a40ed..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationOperation.java
+++ /dev/null
@@ -1,55 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-/**
- * Runs synchonization operation
- * 
- * @author BingXue Xu
- * @since 1.0
- *
- */
-public class SynchronizationOperation implements IRunnableWithProgress {
-
-	private SynchronizationChoices synchChoices;
-	private Collection elements;
-	
-	/**
-	 * Creates an instance
-	 * @param elements
-	 * 			List of elements to be synchronized
-	 * @param choices
-	 * 			Synchronization options
-	 */
-	public SynchronizationOperation(Collection elements, SynchronizationChoices choices) {
-		this.synchChoices = choices;
-		this.elements = elements;
-	}
-	
-	/**
-	 * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void run(IProgressMonitor monitor) throws InvocationTargetException,
-			InterruptedException {
-		for (int i = 0; i < 5; i++) {
-			try {
-				Thread.sleep(1000);
-			} catch (Exception e) {}
-			System.out.println("$$$ woke up after 1 second sleep, #" + (i+1)); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationPreviewPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationPreviewPage.java
deleted file mode 100755
index 3cc8cf4..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationPreviewPage.java
+++ /dev/null
@@ -1,61 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.wizards;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * The wizard page which lets you preview elements to be synchonized
- * and also any additional information.
- * 
- * @author BingXue Xu
- * @since 1.0
- *
- */
-public class SynchronizationPreviewPage extends BaseWizardPage {
-
-	private SynchronizationChoices syncChoices = null;
-	
-	private Text ctrl_previewText;
-	
-	/**
-	 * Creates a new instance.
-	 */
-	public SynchronizationPreviewPage(String pageName,
-			SynchronizationChoices choices) {
-		super(pageName);
-		setTitle(AuthoringUIResources.synchronizationWizard_previewPage_title); 
-		setDescription(AuthoringUIResources.synchronizationWizard_previewPage_text); 
-		this.syncChoices = choices;
-	}
-	
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		// Create the composite to hold the widgets.
-		Composite composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout(1, false));
-		
-		String explainText = "Preview text coming here.\n\n" +								//$NON-NLS-1$
-				"\tThis has to be coming from some underlyin API call. This may be cut off if there is not enoug time."; //$NON-NLS-1$
-		ctrl_previewText = createTextMulti(composite, " ", 400, 240, 1); //$NON-NLS-1$
-		ctrl_previewText.setText(explainText);
-		
-		setControl(composite);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationSelectConfigPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationSelectConfigPage.java
deleted file mode 100755
index 3a138a2..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationSelectConfigPage.java
+++ /dev/null
@@ -1,126 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.wizards;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * The wizard page which let user select method configuration during
- * synchronization
- * 
- * @author BingXue Xu
- * @since 1.0
- *
- */
-public class SynchronizationSelectConfigPage extends BaseWizardPage implements ISelectionChangedListener {
-
-	private SynchronizationChoices syncChoices = null;
-	
-	private ComboViewer configComboViewer;
-	private MethodConfiguration[] validConfigurations;
-	
-	/**
-	 * Creates a new instance.
-	 */
-	public SynchronizationSelectConfigPage(String pageName,
-			SynchronizationChoices choices) {
-		super(pageName);
-		setTitle(AuthoringUIResources.synchronizationWizard_selectConfigPage_title); 
-		setDescription(AuthoringUIResources.synchronizationWizard_selectConfigPage_text); 
-		this.syncChoices = choices;
-	}
-	
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		// Create the composite to hold the widgets.
-		Composite composite = new Composite(parent, SWT.NULL);
-		{
-			GridLayout layout = new GridLayout(2, false);
-			layout.marginWidth = 0;
-			layout.marginHeight = 0;
-			composite.setLayout(layout);
-		}
-		
-		// add an empty line
-		createLabel(composite, " ", 2); //$NON-NLS-1$
-		
-		createLabel(composite, AuthoringUIResources.synchronizationWizard_selectConfigPage_configLabel); 
-		
-		configComboViewer = new ComboViewer(composite, SWT.BORDER | SWT.READ_ONLY);
-		configComboViewer.getCombo().setLayoutData(
-				new GridData(GridData.BEGINNING | GridData.FILL_HORIZONTAL));
-		
-		ILabelProvider labelProvider = new LabelProvider() {
-			public String getText(Object element) {
-				if (element instanceof MethodElement) {
-					return ((MethodElement) element).getName();
-				} else {
-					return element.toString();
-				}
-			}
-		};
-		configComboViewer.setLabelProvider(labelProvider);
-		
-		// get all valid configurations, and default one, and select and show the default one
-		Process selectedProcess = syncChoices.getSelectedProcess();
-		validConfigurations = (MethodConfiguration[])selectedProcess.getValidContext().toArray();
-		configComboViewer.add(validConfigurations);
-		MethodConfiguration defaultConfig = selectedProcess.getDefaultContext();
-		syncChoices.setSelectedConfig(defaultConfig);
-		StructuredSelection defaultSelection = new StructuredSelection(defaultConfig);
-		configComboViewer.setSelection(defaultSelection, true);
-		
-		addListeners(composite);
-		
-		setControl(composite);
-		
-//		System.out.println("$$$ init config =" + syncChoices.toString());
-	}
-
-	/**
-	 * Adds the listeners for the controls on this page.
-	 */
-	private void addListeners(final Composite composite) {
-		configComboViewer.addSelectionChangedListener(this);
-	}
-	
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		StructuredSelection selection = (StructuredSelection) event
-				.getSelection();
-		if (!selection.isEmpty()) {
-			Object[] config = selection.toArray();
-			syncChoices.setSelectedConfig((MethodConfiguration)config[0]);
-		} 
-		
-//		System.out.println("$$$ config =" + syncChoices.toString());
-	}
-
-}
-
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationSelectDetailsPage.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationSelectDetailsPage.java
deleted file mode 100755
index cb17751..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationSelectDetailsPage.java
+++ /dev/null
@@ -1,454 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.wizards;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * The wizard page which let user select properties of method content to 
- * be considered for synchonization. 
- * 
- * @author BingXue Xu
- * @since 1.0
- *
- */
-public class SynchronizationSelectDetailsPage extends BaseWizardPage implements Listener {
-
-	private SynchronizationChoices syncChoices = null;
-	
-	private Button bc_name;
-	private Button bc_presName;
-	private Button bc_briefDesc;
-	private Button bc_optInput;
-	private Button bc_manInput;
-	private Button bc_output;
-	private Button bc_primPerformer;
-	private Button bc_addnPerformer;
-	private Button bc_respRole;
-	private Button bc_contArtifact;
-	private Button bc_delivPart;
-	private Button bc_selStep;
-	
-//	private Button[] br_presName = new Button[2];
-//	private Button[] br_optInput = new Button[2];
-//	private Button[] br_manInput = new Button[2];
-//	private Button[] br_output = new Button[2];
-//	private Button[] br_respRole = new Button[2];
-//	private Button[] br_contArtifact = new Button[2];
-//	private Button[] br_delivPart = new Button[2];
-//	private Button[] br_selStep = new Button[2];
-	
-	/**
-	 * Creates a new instance.
-	 */
-	public SynchronizationSelectDetailsPage(String pageName,
-			SynchronizationChoices choices) {
-		super(pageName);
-		setTitle(AuthoringUIResources.synchronizationWizard_selectDetailsPage_title); 
-		setDescription(AuthoringUIResources.synchronizationWizard_selectDetailsPage_text); 
-		this.syncChoices = choices;
-	}
-	
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		// Create the composite to hold the widgets.
-		Composite composite = new Composite(parent, SWT.NULL);
-		{
-//			GridLayout layout = new GridLayout(3, false);
-			GridLayout layout = new GridLayout(1, false);
-			layout.marginWidth = 0;
-			layout.marginHeight = 0;
-			composite.setLayout(layout);
-		}
-	
-		createLabel(composite, AuthoringUIResources.synchronizationWizard_selectDetailsPage_properties_lable); 
-//		createLabel(composite, "Conetnt To Process  ");
-//		createLabel(composite, "  Process To Content");
-		
-		bc_name = createCheckbox(composite, AuthoringUIResources.synchronizationWizard_selectDetailsPage_name_lable); 
-		
-		bc_presName = createCheckbox(composite, AuthoringUIResources.synchronizationWizard_selectDetailsPage_presentationName_lable); 
-//		createTwoRadioGroup(composite, br_presName);
-		
-		bc_briefDesc = createCheckbox(composite, AuthoringUIResources.synchronizationWizard_selectDetailsPage_briefDesc_lable); 
-		
-		bc_optInput = createCheckbox(composite, AuthoringUIResources.synchronizationWizard_selectDetailsPage_optionalInouts_label); 
-//		createTwoRadioGroup(composite, br_optInput);
-		
-		bc_manInput = createCheckbox(composite, AuthoringUIResources.synchronizationWizard_selectDetailsPage_mandatoryInputs_lable); 
-//		createTwoRadioGroup(composite, br_manInput);
-		
-		bc_output = createCheckbox(composite, AuthoringUIResources.synchronizationWizard_selectDetailsPage_outputs_label); 
-//		createTwoRadioGroup(composite, br_output);
-		
-		bc_primPerformer = createCheckbox(composite, AuthoringUIResources.synchronizationWizard_selectDetailsPage_primaryPerformer_label); 
-		bc_addnPerformer = createCheckbox(composite, AuthoringUIResources.synchronizationWizard_selectDetailsPage_addnPerformers_lable); 
-		
-		bc_respRole = createCheckbox(composite, AuthoringUIResources.synchronizationWizard_selectDetailsPage_responsibleRoles_lable); 
-//		createTwoRadioGroup(composite, br_respRole);
-		
-		bc_contArtifact = createCheckbox(composite, AuthoringUIResources.synchronizationWizard_selectDetailsPage_contnArtifacts_label); 
-//		createTwoRadioGroup(composite, br_contArtifact);
-		
-		bc_delivPart = createCheckbox(composite, AuthoringUIResources.synchronizationWizard_selectDetailsPage_dilvedParts_label); 
-//		createTwoRadioGroup(composite, br_delivPart);
-		
-		bc_selStep = createCheckbox(composite, AuthoringUIResources.synchronizationWizard_selectDetailsPage_selSteps_label); 
-//		createTwoRadioGroup(composite, br_selStep);
-		
-		addListeners(composite);
-		setAllChecked();
-		
-		setControl(composite);
-		
-//		System.out.println("$$$ init detail =" + syncChoices.toString());
-	}
-	
-	private void setAllChecked() {
-		bc_name.setSelection(true);
-		bc_presName.setSelection(true);
-		bc_briefDesc.setSelection(true);
-		bc_optInput.setSelection(true);
-		bc_manInput.setSelection(true);
-		bc_output.setSelection(true);
-		bc_primPerformer.setSelection(true);
-		bc_addnPerformer.setSelection(true);
-		bc_respRole.setSelection(true);
-		bc_contArtifact.setSelection(true);
-		bc_delivPart.setSelection(true);
-		bc_selStep.setSelection(true);	
-	}
-	
-	/**
-	 * Adds the listeners for the controls on this page.
-	 */
-	private void addListeners(final Composite composite) {
-		bc_name.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (bc_name.getSelection()) {
-						syncChoices.setSyncName(SynchronizationChoices.SYNC_FROM_CONETNT);
-				} else {
-					syncChoices.setSyncName(SynchronizationChoices.SYNC_NONE);
-				}
-				setPageComplete(isPageComplete());
-			}
-		});
-		bc_presName.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (bc_presName.getSelection()) {
-//					br_presName[0].setEnabled(true);
-//					br_presName[1].setEnabled(true);
-//					if (br_presName[0].getSelection())
-						syncChoices.setSyncPresName(SynchronizationChoices.SYNC_FROM_CONETNT);
-//					else
-//						syncChoices.setSyncPresName(SynchronizationChoices.SYNC_FROM_PROCESS);
-				} else {
-//					br_presName[0].setEnabled(false);
-//					br_presName[1].setEnabled(false);
-					syncChoices.setSyncPresName(SynchronizationChoices.SYNC_NONE);
-				}
-//				System.out.println("$$$ " + syncChoices.toString());
-				setPageComplete(isPageComplete());
-			}
-		});
-		bc_briefDesc.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (bc_briefDesc.getSelection()) {
-						syncChoices.setSyncBriefDesc(SynchronizationChoices.SYNC_FROM_CONETNT);
-				} else {
-					syncChoices.setSyncBriefDesc(SynchronizationChoices.SYNC_NONE);
-				}
-				setPageComplete(isPageComplete());
-			}
-		});
-		bc_optInput.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (bc_optInput.getSelection()) {
-//					br_optInput[0].setEnabled(true);
-//					br_optInput[1].setEnabled(true);
-//					if (br_optInput[0].getSelection())
-						syncChoices.setSyncOptInput(SynchronizationChoices.SYNC_FROM_CONETNT);
-//					else
-//						syncChoices.setSyncOptInput(SynchronizationChoices.SYNC_FROM_PROCESS);
-				} else {
-//					br_optInput[0].setEnabled(false);
-//					br_optInput[1].setEnabled(false);
-					syncChoices.setSyncOptInput(SynchronizationChoices.SYNC_NONE);
-				}
-//				System.out.println("$$$ " + syncChoices.toString());
-				setPageComplete(isPageComplete());
-			}
-		});
-		
-		bc_manInput.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (bc_manInput.getSelection()) {
-//					br_manInput[0].setEnabled(true);
-//					br_manInput[1].setEnabled(true);
-//					if (br_manInput[0].getSelection())
-						syncChoices.setSyncManInput(SynchronizationChoices.SYNC_FROM_CONETNT);
-//					else
-//						syncChoices.setSyncManInput(SynchronizationChoices.SYNC_FROM_PROCESS);
-//					
-				} else {
-//					br_manInput[0].setEnabled(false);
-//					br_manInput[1].setEnabled(false);
-					syncChoices.setSyncManInput(SynchronizationChoices.SYNC_NONE);
-				}
-//				System.out.println("$$$ " + syncChoices.toString());
-				setPageComplete(isPageComplete());
-			}
-		});
-		
-		bc_output.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (bc_output.getSelection()) {
-//					br_output[0].setEnabled(true);
-//					br_output[1].setEnabled(true);
-//					if (br_output[0].getSelection())
-						syncChoices.setSyncOutput(SynchronizationChoices.SYNC_FROM_CONETNT);
-//					else
-//						syncChoices.setSyncOutput(SynchronizationChoices.SYNC_FROM_PROCESS);
-				} else {
-//					br_output[0].setEnabled(false);
-//					br_output[1].setEnabled(false);
-					syncChoices.setSyncOutput(SynchronizationChoices.SYNC_NONE);
-				}
-//				System.out.println("$$$ " + syncChoices.toString());
-				setPageComplete(isPageComplete());
-			}
-		});
-		
-		bc_primPerformer.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (bc_primPerformer.getSelection()) {
-					syncChoices.setSyncPrimPerformer(SynchronizationChoices.SYNC_FROM_CONETNT);
-				} else {
-					syncChoices.setSyncPrimPerformer(SynchronizationChoices.SYNC_NONE);
-				}
-				setPageComplete(isPageComplete());
-			}
-		});
-		
-		bc_addnPerformer.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-					if (bc_addnPerformer.getSelection()) {
-						syncChoices.setSyncAddnPerformer(SynchronizationChoices.SYNC_FROM_CONETNT);
-					} else {
-						syncChoices.setSyncAddnPerformer(SynchronizationChoices.SYNC_NONE);
-					}
-					setPageComplete(isPageComplete());
-				}
-		});
-		
-		bc_respRole.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (bc_respRole.getSelection()) {
-//					br_respRole[0].setEnabled(true);
-//					br_respRole[1].setEnabled(true);
-//					if (br_respRole[0].getSelection())
-						syncChoices.setSyncRespRole(SynchronizationChoices.SYNC_FROM_CONETNT);
-//					else
-//						syncChoices.setSyncRespRole(SynchronizationChoices.SYNC_FROM_PROCESS);
-				} else {
-//					br_respRole[0].setEnabled(false);
-//					br_respRole[1].setEnabled(false);
-					syncChoices.setSyncRespRole(SynchronizationChoices.SYNC_NONE);
-				}
-//				System.out.println("$$$ " + syncChoices.toString());
-				setPageComplete(isPageComplete());
-			}
-		});
-		
-		bc_contArtifact.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (bc_contArtifact.getSelection()) {
-//					br_contArtifact[0].setEnabled(true);
-//					br_contArtifact[1].setEnabled(true);
-//					if (br_contArtifact[0].getSelection())
-						syncChoices.setSyncContArtifact(SynchronizationChoices.SYNC_FROM_CONETNT);
-//					else
-//						syncChoices.setSyncContArtifact(SynchronizationChoices.SYNC_FROM_PROCESS);
-				} else {
-//					br_contArtifact[0].setEnabled(false);
-//					br_contArtifact[1].setEnabled(false);
-					syncChoices.setSyncContArtifact(SynchronizationChoices.SYNC_NONE);
-				}
-//				System.out.println("$$$ " + syncChoices.toString());
-				setPageComplete(isPageComplete());
-			}
-		});
-		
-		bc_delivPart.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (bc_delivPart.getSelection()) {
-//					br_delivPart[0].setEnabled(true);
-//					br_delivPart[1].setEnabled(true);
-//					if (br_delivPart[0].getSelection())
-						syncChoices.setSyncDelivPart(SynchronizationChoices.SYNC_FROM_CONETNT);
-//					else
-//						syncChoices.setSyncDelivPart(SynchronizationChoices.SYNC_FROM_PROCESS);
-				} else {
-//					br_delivPart[0].setEnabled(false);
-//					br_delivPart[1].setEnabled(false);
-					syncChoices.setSyncDelivPart(SynchronizationChoices.SYNC_NONE);
-				}
-//				System.out.println("$$$ " + syncChoices.toString());
-				setPageComplete(isPageComplete());
-			}
-		});
-		
-		bc_selStep.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (bc_selStep.getSelection()) {
-//					br_selStep[0].setEnabled(true);
-//					br_selStep[1].setEnabled(true);
-//					if (br_selStep[0].getSelection())
-						syncChoices.setSyncSelStep(SynchronizationChoices.SYNC_FROM_CONETNT);
-//					else
-//						syncChoices.setSyncSelStep(SynchronizationChoices.SYNC_FROM_PROCESS);
-				} else {
-//					br_selStep[0].setEnabled(false);
-//					br_selStep[1].setEnabled(false);
-					syncChoices.setSyncSelStep(SynchronizationChoices.SYNC_NONE);
-				}
-//				System.out.println("$$$ " + syncChoices.toString());
-				setPageComplete(isPageComplete());
-			}
-		});
-
-//		br_presName[0].addListener(SWT.Selection, this);
-//		br_optInput[0].addListener(SWT.Selection, this);
-//		br_manInput[0].addListener(SWT.Selection, this);
-//		br_output[0].addListener(SWT.Selection, this);
-//		br_respRole[0].addListener(SWT.Selection, this);
-//		br_contArtifact[0].addListener(SWT.Selection, this);
-//		br_delivPart[0].addListener(SWT.Selection, this);
-//		br_selStep[0].addListener(SWT.Selection, this);
-//		
-//		br_presName[1].addListener(SWT.Selection, this);
-//		br_optInput[1].addListener(SWT.Selection, this);
-//		br_manInput[1].addListener(SWT.Selection, this);
-//		br_output[1].addListener(SWT.Selection, this);
-//		br_respRole[1].addListener(SWT.Selection, this);
-//		br_contArtifact[1].addListener(SWT.Selection, this);
-//		br_delivPart[1].addListener(SWT.Selection, this);
-//		br_selStep[1].addListener(SWT.Selection, this);
-	}
-	
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		
-//		if (event.widget == br_presName[0] && br_presName[0].getSelection()) { 
-//			syncChoices.setSyncPresName(SynchronizationChoices.SYNC_FROM_CONETNT);
-//		}
-//		if (event.widget == br_optInput[0] && br_optInput[0].getSelection()) { 
-//			syncChoices.setSyncOptInput(SynchronizationChoices.SYNC_FROM_CONETNT);
-//		}
-//		if (event.widget == br_manInput[0] && br_manInput[0].getSelection()) { 
-//			syncChoices.setSyncManInput(SynchronizationChoices.SYNC_FROM_CONETNT);
-//		}
-//		if (event.widget == br_output[0] && br_output[0].getSelection()) { 
-//			syncChoices.setSyncOutput(SynchronizationChoices.SYNC_FROM_CONETNT);
-//		}
-//		if (event.widget == br_respRole[0] && br_respRole[0].getSelection()) { 
-//			syncChoices.setSyncRespRole(SynchronizationChoices.SYNC_FROM_CONETNT);
-//		}
-//		if (event.widget == br_contArtifact[0] && br_contArtifact[0].getSelection()) {
-//			syncChoices.setSyncContArtifact(SynchronizationChoices.SYNC_FROM_CONETNT);
-//		}
-//		if (event.widget == br_delivPart[0] && br_delivPart[0].getSelection()) { 
-//			syncChoices.setSyncDelivPart(SynchronizationChoices.SYNC_FROM_CONETNT);
-//		}
-//		if (event.widget == br_selStep[0] && br_selStep[0].getSelection()){ 
-//			syncChoices.setSyncSelStep(SynchronizationChoices.SYNC_FROM_CONETNT);
-//		}
-//
-//		if (event.widget == br_presName[1] && br_presName[1].getSelection()){ 
-//			syncChoices.setSyncPresName(SynchronizationChoices.SYNC_FROM_PROCESS);
-//		}
-//		if (event.widget == br_optInput[1] && br_optInput[1].getSelection()){ 
-//			syncChoices.setSyncOptInput(SynchronizationChoices.SYNC_FROM_PROCESS);
-//		}
-//		if (event.widget == br_manInput[1] && br_manInput[1].getSelection()){ 
-//			syncChoices.setSyncManInput(SynchronizationChoices.SYNC_FROM_PROCESS);
-//		}
-//		if (event.widget == br_output[1] && br_output[1].getSelection()){ 
-//			syncChoices.setSyncOutput(SynchronizationChoices.SYNC_FROM_PROCESS);
-//		}
-//		if (event.widget == br_respRole[1] && br_respRole[1].getSelection()){ 
-//			syncChoices.setSyncRespRole(SynchronizationChoices.SYNC_FROM_PROCESS);
-//		}
-//		if (event.widget == br_contArtifact[1] && br_contArtifact[1].getSelection()){
-//			syncChoices.setSyncContArtifact(SynchronizationChoices.SYNC_FROM_PROCESS);
-//		}
-//		if (event.widget == br_delivPart[1] && br_delivPart[1].getSelection()){ 
-//			syncChoices.setSyncDelivPart(SynchronizationChoices.SYNC_FROM_PROCESS);
-//		}
-//		if (event.widget == br_selStep[1] && br_selStep[1].getSelection()){
-//			syncChoices.setSyncSelStep(SynchronizationChoices.SYNC_FROM_PROCESS);
-//		}
-////		System.out.println("$$$ " + syncChoices.toString());
-	}
-	
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-//		System.out.println("$$$ DEBUG: " + syncChoices.toString());
-		if (syncChoices.getSyncName() > 0 ||
-			syncChoices.getSyncPresName() > 0 ||
-			syncChoices.getSyncBriefDesc() > 0 ||
-			syncChoices.getSyncOptInput() > 0 ||
-			syncChoices.getSyncManInput() > 0 ||
-			syncChoices.getSyncOutput() > 0 ||
-			syncChoices.getSyncPrimPerformer() > 0 ||
-			syncChoices.getSyncAddnPerformer() > 0 ||
-			syncChoices.getSyncRespRole() > 0 ||
-			syncChoices.getSyncContArtifact() > 0 ||
-			syncChoices.getSyncDelivPart() > 0 ||
-			syncChoices.getSyncSelStep() > 0) {
-			return true;
-		} else {
-			return false;
-		}
-		
-	}
-	
-//	private void createTwoRadioGroup(Composite parent, Button[] rbs) {
-//		Composite aGroup = new Composite(parent, SWT.NULL);
-//		
-//		GridLayout layout = new GridLayout(2, false);
-//		aGroup.setLayout(layout);
-//		
-//		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-//		gd.horizontalSpan = 2;
-//		aGroup.setLayoutData(gd);
-//		
-//		rbs[0] = createRadioButton(aGroup, "", 1, true); //$NON-NLS-1$
-//		rbs[1] = createRadioButton(aGroup, "", 1, false); //$NON-NLS-1$
-//		
-//		rbs[0].setEnabled(false);
-//		rbs[1].setEnabled(false);
-//	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationWizard.java b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationWizard.java
deleted file mode 100755
index d23c3ea..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/SynchronizationWizard.java
+++ /dev/null
@@ -1,107 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.authoring.ui.wizards;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-
-/**
- * The wizard that guides user to do custom synchronization for process
- * descriptors from method elements.
- * 
- * @author BingXue Xu
- * @since 1.0
- *
- */
-public class SynchronizationWizard extends Wizard implements INewWizard {
-
-	private SynchronizationDescriptionPage descPage;
-	private SynchronizationSelectConfigPage selectConfigPage;
-	private SynchronizationSelectDetailsPage selectDetailsPage;
-//	private SynchronizationPreviewPage previewPage;
-	
-	private SynchronizationChoices syncChoices = null;
-	
-	/**
-	 * Creates a new instance.
-	 */
-	public SynchronizationWizard(SynchronizationChoices choices) {
-		super();
-		this.syncChoices = choices;
-		setWindowTitle(AuthoringUIResources.synchronizationWizard_title_text); 
-	}
-	
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		ImageDescriptor imageDescriptor = AuthoringUIPlugin.getDefault()
-				.getImageDescriptor("full/wizban/synchronization.gif"); //$NON-NLS-1$
-
-		descPage = new SynchronizationDescriptionPage(
-				"SynchronizationDescriptionPage", syncChoices); //$NON-NLS-1$
-		descPage.setImageDescriptor(imageDescriptor);
-		addPage(descPage);
-
-		selectConfigPage = new SynchronizationSelectConfigPage(
-				"SynchronizationSelectConfigPage", syncChoices); //$NON-NLS-1$
-		selectConfigPage.setImageDescriptor(imageDescriptor);
-		addPage(selectConfigPage);
-		
-		selectDetailsPage = new SynchronizationSelectDetailsPage(
-				"SynchronizationSelectDetailsPage", syncChoices); //$NON-NLS-1$
-		selectDetailsPage.setImageDescriptor(imageDescriptor);
-		addPage(selectDetailsPage);
-		
-//		previewPage = new SynchronizationPreviewPage(
-//				"SynchronizationPreviewPage", syncChoices); //$NON-NLS-1$
-//		previewPage.setImageDescriptor(imageDescriptor);
-//		addPage(previewPage);
-	}
-	
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#canFinish()
-	 */
-	public boolean canFinish() {
-		return (selectDetailsPage.isPageComplete());
-	}
-	
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		syncChoices.setFinishPressed(true);
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performCancel()
-	 */
-	public boolean performCancel() {
-		syncChoices.setFinishPressed(false);
-		return true;
-	}
-	
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/package.html b/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/package.html
deleted file mode 100755
index 1c5600a..0000000
--- a/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides wizards for authoring method content and processes.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.base.feature/.project b/plugins/org.eclipse.epf.base.feature/.project
deleted file mode 100755
index ca797ad..0000000
--- a/plugins/org.eclipse.epf.base.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.base.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.epf.base.feature/build.properties b/plugins/org.eclipse.epf.base.feature/build.properties
deleted file mode 100755
index 9e3a819..0000000
--- a/plugins/org.eclipse.epf.base.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               en_license.html,\
-               feature.properties,\
-               eclipse_update_120.jpg,\
-               license_en.html
diff --git a/plugins/org.eclipse.epf.base.feature/eclipse_update_120.jpg b/plugins/org.eclipse.epf.base.feature/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708..0000000
--- a/plugins/org.eclipse.epf.base.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.base.feature/feature.properties b/plugins/org.eclipse.epf.base.feature/feature.properties
deleted file mode 100755
index 35ca051..0000000
--- a/plugins/org.eclipse.epf.base.feature/feature.properties
+++ /dev/null
@@ -1,19 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-featureName=EPF Base Feature
-providerName=Eclipse.org
-description=EPF Base Feature.
-updateSiteName=EPF Feature Updates
-copyright=(c) Copyright Eclipse contributors and others 2004, 2007.  All Rights Reserved.
-licenseURL=license_en.html
-licenseText=Use of this feature is subject to the same terms and conditions which govern the use of the Product which included this feature.
diff --git a/plugins/org.eclipse.epf.base.feature/feature.xml b/plugins/org.eclipse.epf.base.feature/feature.xml
deleted file mode 100755
index 88c3e35..0000000
--- a/plugins/org.eclipse.epf.base.feature/feature.xml
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.epf.base"
-      label="%featureName"
-      version="1.2.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.epf.base"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %licenseText
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.draw2d"/>
-      <import plugin="org.eclipse.gef"/>
-      <import plugin="org.eclipse.ui.cheatsheets"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.ui.intro"/>
-      <import plugin="org.eclipse.ui.views.properties.tabbed"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.team.cvs.ui"/>
-      <import plugin="com.ibm.icu"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.apache.ant"/>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipse.emf.edit.ui"/>
-      <import plugin="org.eclipse.emf.common.ui"/>
-      <import plugin="org.eclipse.emf.mapping.ecore2ecore"/>
-      <import plugin="org.eclipse.emf.mapping.ecore2xml"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.eclipse.help.base"/>
-      <import plugin="org.apache.lucene"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.emf.ecore.sdo"/>
-      <import plugin="org.eclipse.emf.edit"/>
-      <import plugin="org.eclipse.emf.validation"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.epf.base"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.authoring.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.epf.common.win32.win32.x86"
-         os="win32"
-         ws="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.dataexchange"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.diagram"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.export"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.export.msp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-         
-   <plugin
-         id="org.eclipse.epf.export.msp.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.epf.export.xml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.import"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.import.xml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.library"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.epf.library.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.library.persistence"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.library.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.library.ui.xmi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.library.xmi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.msproject"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.publisher"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.publishing"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.epf.publishing.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.richtext"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.epf.search"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.search.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.services"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.ui.intro"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.epf.uma"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.uma.ecore"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.uma.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.epf.validation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.xml.uma"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.diagramming"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.diagram.add"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.diagram.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.diagram.wpdd"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epf.diagram.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/plugins/org.eclipse.epf.base.feature/license_en.html b/plugins/org.eclipse.epf.base.feature/license_en.html
deleted file mode 100755
index c6af966..0000000
--- a/plugins/org.eclipse.epf.base.feature/license_en.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.base/.project b/plugins/org.eclipse.epf.base/.project
deleted file mode 100755
index d1be095..0000000
--- a/plugins/org.eclipse.epf.base/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.base</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<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>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.epf.base/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.base/META-INF/MANIFEST.MF
deleted file mode 100755
index ac09ca3..0000000
--- a/plugins/org.eclipse.epf.base/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %featurePluginName
-Bundle-SymbolicName: org.eclipse.epf.base; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.epf.base/about.html b/plugins/org.eclipse.epf.base/about.html
deleted file mode 100755
index 4c99086..0000000
--- a/plugins/org.eclipse.epf.base/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.base/about.ini b/plugins/org.eclipse.epf.base/about.ini
deleted file mode 100755
index 604f4fa..0000000
--- a/plugins/org.eclipse.epf.base/about.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright (c) 2004, 2005 IBM Corporation.  All Rights Reserved.
-#-------------------------------------------------------------------------------
-
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%featureText
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=application_32.gif
-
-# Property "appName" contains name of the application (translated)
-appName=%featureName
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-welcomePage=$nl$/welcome.xml
diff --git a/plugins/org.eclipse.epf.base/about.mappings b/plugins/org.eclipse.epf.base/about.mappings
deleted file mode 100755
index aca952e..0000000
--- a/plugins/org.eclipse.epf.base/about.mappings
+++ /dev/null
@@ -1,8 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-# Usually generated at build time.
-
-0=@buildId@
-1=1.2.0
diff --git a/plugins/org.eclipse.epf.base/about.properties b/plugins/org.eclipse.epf.base/about.properties
deleted file mode 100755
index 91984a0..0000000
--- a/plugins/org.eclipse.epf.base/about.properties
+++ /dev/null
@@ -1,39 +0,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
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-featureName=EPF Base
-
-featureText=EPF Base\n\
-\n\
-Version: {1} \n\
-Build Label: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2004, 2007.  All Rights Reserved.\n\
-\n\
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.epf.base/application_32.gif b/plugins/org.eclipse.epf.base/application_32.gif
deleted file mode 100755
index e6ad7cc..0000000
--- a/plugins/org.eclipse.epf.base/application_32.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.base/build.properties b/plugins/org.eclipse.epf.base/build.properties
deleted file mode 100755
index 5ccec53..0000000
--- a/plugins/org.eclipse.epf.base/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = .,\
-               META-INF/,\
-               about.html,\
-               about.ini,\
-               about.properties,\
-               application_32.gif,\
-               welcome.xml,\
-               plugin.properties,\
-               about.mappings
diff --git a/plugins/org.eclipse.epf.base/plugin.properties b/plugins/org.eclipse.epf.base/plugin.properties
deleted file mode 100755
index 60e7afa..0000000
--- a/plugins/org.eclipse.epf.base/plugin.properties
+++ /dev/null
@@ -1,16 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-featurePluginName=EPF Base Feature
-featurePluginNameNL=EPF Base Feature (NL1)
-providerName=Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.base/welcome.xml b/plugins/org.eclipse.epf.base/welcome.xml
deleted file mode 100755
index b640d04..0000000
--- a/plugins/org.eclipse.epf.base/welcome.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
-    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
--->
-<welcomePage 
-	title="Eclipse Process Framework">
-
-<intro>Welcome to Eclipse Process Framework
-</intro>
-
-<item><b>What is Eclipse Process Framework?</b>
-	
-</item>
-
-<item><b>Learn More</b>
-
-</item>
-
-</welcomePage>
diff --git a/plugins/org.eclipse.epf.common.win32.win32.x86/.classpath b/plugins/org.eclipse.epf.common.win32.win32.x86/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/plugins/org.eclipse.epf.common.win32.win32.x86/.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/plugins/org.eclipse.epf.common.win32.win32.x86/.project b/plugins/org.eclipse.epf.common.win32.win32.x86/.project
deleted file mode 100755
index bf9a437..0000000
--- a/plugins/org.eclipse.epf.common.win32.win32.x86/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.common.win32.win32.x86</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/plugins/org.eclipse.epf.common.win32.win32.x86/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.common.win32.win32.x86/META-INF/MANIFEST.MF
deleted file mode 100755
index 986e5dc..0000000
--- a/plugins/org.eclipse.epf.common.win32.win32.x86/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.common.win32.win32.x86
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.swt
-Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.epf.common.win32.win32.x86/build.properties b/plugins/org.eclipse.epf.common.win32.win32.x86/build.properties
deleted file mode 100755
index aa1a008..0000000
--- a/plugins/org.eclipse.epf.common.win32.win32.x86/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties
diff --git a/plugins/org.eclipse.epf.common.win32.win32.x86/plugin.properties b/plugins/org.eclipse.epf.common.win32.win32.x86/plugin.properties
deleted file mode 100755
index 30147ce..0000000
--- a/plugins/org.eclipse.epf.common.win32.win32.x86/plugin.properties
+++ /dev/null
@@ -1,15 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Win32 Common
-providerName=Eclipse.org
diff --git a/plugins/org.eclipse.epf.common.win32.win32.x86/src/org/eclipse/epf/common/win32/Win32HTMLTransfer.java b/plugins/org.eclipse.epf.common.win32.win32.x86/src/org/eclipse/epf/common/win32/Win32HTMLTransfer.java
deleted file mode 100755
index 926d8d7..0000000
--- a/plugins/org.eclipse.epf.common.win32.win32.x86/src/org/eclipse/epf/common/win32/Win32HTMLTransfer.java
+++ /dev/null
@@ -1,218 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.win32;
-
-import org.eclipse.swt.dnd.ByteArrayTransfer;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.internal.ole.win32.COM;
-import org.eclipse.swt.internal.ole.win32.FORMATETC;
-import org.eclipse.swt.internal.ole.win32.IDataObject;
-import org.eclipse.swt.internal.ole.win32.STGMEDIUM;
-import org.eclipse.swt.internal.win32.OS;
-
-/**
- * The class <code>HTMLTransfer</code> provides a platform specific mechanism
- * for converting text in HTML format represented as a java <code>String</code>
- * to a platform specific representation of the data and vice versa. See
- * <code>Transfer</code> for additional information.
- * 
- * <p>
- * An example of a java <code>String</code> containing HTML text is shown
- * below:
- * </p>
- * 
- * <code><pre>
- *       String htmlData = &quot;
- * <p>
- *  This is a paragraph of text.
- * </p>
- *  &quot;;
- * </code></pre>
- */
-public class Win32HTMLTransfer extends ByteArrayTransfer {
-
-	static Win32HTMLTransfer _instance = new Win32HTMLTransfer();
-
-	static final String HTML_FORMAT = "HTML Format"; //$NON-NLS-1$
-
-	static final int HTML_FORMATID = registerType(HTML_FORMAT);
-
-	static final String NUMBER = "00000000"; //$NON-NLS-1$
-
-	static final String HEADER = "Version:0.9\r\nStartHTML:" + NUMBER
-			+ "\r\nEndHTML:" + NUMBER + "\r\nStartFragment:" + NUMBER
-			+ "\r\nEndFragment:" + NUMBER + "\r\n";
-
-	static final String PREFIX = "<html><body><!--StartFragment-->"; //$NON-NLS-1$
-
-	static final String SUFFIX = "<!--EndFragment--></body></html>"; //$NON-NLS-1$
-
-	static final String StartFragment = "StartFragment:"; //$NON-NLS-1$
-
-	static final String EndFragment = "EndFragment:"; //$NON-NLS-1$
-
-	public Win32HTMLTransfer() {
-	}
-
-	/**
-	 * Returns the singleton instance of the HTMLTransfer class.
-	 * 
-	 * @return the singleton instance of the HTMLTransfer class
-	 */
-	public static Win32HTMLTransfer getInstance() {
-		return _instance;
-	}
-
-	/**
-	 * This implementation of <code>javaToNative</code> converts
-	 * HTML-formatted text represented by a java <code>String</code> to a
-	 * platform specific representation. For additional information see
-	 * <code>Transfer#javaToNative</code>.
-	 * 
-	 * @param object
-	 *            a java <code>String</code> containing HTML text
-	 * @param transferData
-	 *            an empty <code>TransferData</code> object; this object will
-	 *            be filled in on return with the platform specific format of
-	 *            the data
-	 */
-	public void javaToNative(Object object, TransferData transferData) {
-		if (!checkHTML(object) || !isSupportedType(transferData)) {
-			DND.error(DND.ERROR_INVALID_DATA);
-		}
-		String string = (String) object;
-		int count = string.length();
-		char[] chars = new char[count + 1];
-		string.getChars(0, count, chars, 0);
-		int codePage = OS.GetACP();
-		int cchMultiByte = OS.WideCharToMultiByte(codePage, 0, chars, -1, null,
-				0, null, null);
-		if (cchMultiByte == 0) {
-			transferData.stgmedium = new STGMEDIUM();
-			transferData.result = COM.DV_E_STGMEDIUM;
-			return;
-		}
-		int startHTML = HEADER.length();
-		int startFragment = startHTML + PREFIX.length();
-		int endFragment = startFragment + cchMultiByte - 1;
-		int endHTML = endFragment + SUFFIX.length();
-
-		StringBuffer buffer = new StringBuffer(HEADER);
-		int maxLength = NUMBER.length();
-		// startHTML
-		int start = buffer.toString().indexOf(NUMBER);
-		String temp = Integer.toString(startHTML);
-		buffer.replace(start + maxLength - temp.length(), start + maxLength,
-				temp);
-		// endHTML
-		start = buffer.toString().indexOf(NUMBER, start);
-		temp = Integer.toString(endHTML);
-		buffer.replace(start + maxLength - temp.length(), start + maxLength,
-				temp);
-		// startFragment
-		start = buffer.toString().indexOf(NUMBER, start);
-		temp = Integer.toString(startFragment);
-		buffer.replace(start + maxLength - temp.length(), start + maxLength,
-				temp);
-		// endFragment
-		start = buffer.toString().indexOf(NUMBER, start);
-		temp = Integer.toString(endFragment);
-		buffer.replace(start + maxLength - temp.length(), start + maxLength,
-				temp);
-
-		buffer.append(PREFIX);
-		buffer.append(string);
-		buffer.append(SUFFIX);
-
-		count = buffer.length();
-		chars = new char[count + 1];
-		buffer.getChars(0, count, chars, 0);
-		cchMultiByte = OS.WideCharToMultiByte(codePage, 0, chars, -1, null, 0,
-				null, null);
-		int lpMultiByteStr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT,
-				cchMultiByte);
-		OS.WideCharToMultiByte(codePage, 0, chars, -1, lpMultiByteStr,
-				cchMultiByte, null, null);
-		transferData.stgmedium = new STGMEDIUM();
-		transferData.stgmedium.tymed = COM.TYMED_HGLOBAL;
-		transferData.stgmedium.unionField = lpMultiByteStr;
-		transferData.stgmedium.pUnkForRelease = 0;
-		transferData.result = COM.S_OK;
-		return;
-	}
-
-	/**
-	 * This implementation of <code>nativeToJava</code> converts a platform
-	 * specific representation of HTML text to a java <code>String</code>.
-	 * For additional information see <code>Transfer#nativeToJava</code>.
-	 * 
-	 * @param transferData
-	 *            the platform specific representation of the data to be been
-	 *            converted
-	 * @return a java <code>String</code> containing HTML text if the
-	 *         conversion was successful; otherwise null
-	 */
-	public Object nativeToJava(TransferData transferData) {
-		if (!isSupportedType(transferData) || transferData.pIDataObject == 0)
-			return null;
-		IDataObject data = new IDataObject(transferData.pIDataObject);
-		data.AddRef();
-		STGMEDIUM stgmedium = new STGMEDIUM();
-		FORMATETC formatetc = transferData.formatetc;
-		stgmedium.tymed = COM.TYMED_HGLOBAL;
-		transferData.result = data.GetData(formatetc, stgmedium);
-		data.Release();
-		if (transferData.result != COM.S_OK)
-			return null;
-		int hMem = stgmedium.unionField;
-
-		try {
-			int lpMultiByteStr = OS.GlobalLock(hMem);
-			if (lpMultiByteStr == 0)
-				return null;
-			try {
-				int codePage = OS.GetACP();
-				int cchWideChar = OS.MultiByteToWideChar(codePage,
-						OS.MB_PRECOMPOSED, lpMultiByteStr, -1, null, 0);
-				if (cchWideChar == 0)
-					return null;
-				char[] lpWideCharStr = new char[cchWideChar - 1];
-				OS
-						.MultiByteToWideChar(codePage, OS.MB_PRECOMPOSED,
-								lpMultiByteStr, -1, lpWideCharStr,
-								lpWideCharStr.length);
-				return new String(lpWideCharStr);
-			} finally {
-				OS.GlobalUnlock(hMem);
-			}
-		} finally {
-			OS.GlobalFree(hMem);
-		}
-	}
-
-	protected int[] getTypeIds() {
-		return new int[] { HTML_FORMATID };
-	}
-
-	protected String[] getTypeNames() {
-		return new String[] { HTML_FORMAT };
-	}
-
-	boolean checkHTML(Object object) {
-		return (object != null && object instanceof String && ((String) object)
-				.length() > 0);
-	}
-
-	protected boolean validate(Object object) {
-		return checkHTML(object);
-	}
-}
diff --git a/plugins/org.eclipse.epf.common.win32.win32.x86/src/org/eclipse/epf/common/win32/package.html b/plugins/org.eclipse.epf.common.win32.win32.x86/src/org/eclipse/epf/common/win32/package.html
deleted file mode 100755
index 9c54e77..0000000
--- a/plugins/org.eclipse.epf.common.win32.win32.x86/src/org/eclipse/epf/common/win32/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides windows-specific clipboard transfer services.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/.cdtproject b/plugins/org.eclipse.epf.common/.cdtproject
deleted file mode 100755
index 31dce0c..0000000
--- a/plugins/org.eclipse.epf.common/.cdtproject
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse-cdt version="2.0"?>
-
-<cdtproject>
-<data/>
-</cdtproject>
diff --git a/plugins/org.eclipse.epf.common/.classpath b/plugins/org.eclipse.epf.common/.classpath
deleted file mode 100755
index f32778b..0000000
--- a/plugins/org.eclipse.epf.common/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/jtidy-8.0-20060801.131059-3.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.common/.cvsignore b/plugins/org.eclipse.epf.common/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.common/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.common/.options b/plugins/org.eclipse.epf.common/.options
deleted file mode 100755
index 59f15f0..0000000
--- a/plugins/org.eclipse.epf.common/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-# Turn on debug trace for the Common plug-in
-org.eclipse.epf.common/debug=true
diff --git a/plugins/org.eclipse.epf.common/.project b/plugins/org.eclipse.epf.common/.project
deleted file mode 100755
index 1f5dd59..0000000
--- a/plugins/org.eclipse.epf.common/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.common</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/plugins/org.eclipse.epf.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.common/META-INF/MANIFEST.MF
deleted file mode 100755
index f820d1b..0000000
--- a/plugins/org.eclipse.epf.common/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.common;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-ClassPath: common.jar, lib/jtidy-8.0-20060801.131059-3.jar
-Bundle-Activator: org.eclipse.epf.common.CommonPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: com.ibm.icu;visibility:=reexport,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.core.runtime;visibility:=reexport,
- org.eclipse.ui;visibility:=reexport
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.common,
- org.eclipse.epf.common.html,
- org.eclipse.epf.common.plugin,
- org.eclipse.epf.common.serviceability,
- org.eclipse.epf.common.utils,
- org.eclipse.epf.common.xml
-
diff --git a/plugins/org.eclipse.epf.common/about.html b/plugins/org.eclipse.epf.common/about.html
deleted file mode 100755
index 1b41bf4..0000000
--- a/plugins/org.eclipse.epf.common/about.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<title>Plug-in License Agreement</title>
-</head>
-
-<body>
-
-<h3>Plug-in License Agreement</h3>
-
-<p>Use of this Plug-in is subject to the same terms and conditions which govern the use of the Product which included this Plug-in.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/build.properties b/plugins/org.eclipse.epf.common/build.properties
deleted file mode 100755
index fd82750..0000000
--- a/plugins/org.eclipse.epf.common/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.common.jar = src/
-output.common.jar = bin/
-bin.includes = common.jar,\
-               lib/,\
-               plugin.properties,\
-               META-INF/,\
-               about.html,\
-               plugin.xml
diff --git a/plugins/org.eclipse.epf.common/lib/jtidy-8.0-20060801.131059-3.jar b/plugins/org.eclipse.epf.common/lib/jtidy-8.0-20060801.131059-3.jar
deleted file mode 100755
index 37fc970..0000000
--- a/plugins/org.eclipse.epf.common/lib/jtidy-8.0-20060801.131059-3.jar
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.common/plugin.properties b/plugins/org.eclipse.epf.common/plugin.properties
deleted file mode 100755
index bf34fdc..0000000
--- a/plugins/org.eclipse.epf.common/plugin.properties
+++ /dev/null
@@ -1,15 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Common
-providerName=Eclipse.org
diff --git a/plugins/org.eclipse.epf.common/plugin.xml b/plugins/org.eclipse.epf.common/plugin.xml
deleted file mode 100755
index 74fb1eb..0000000
--- a/plugins/org.eclipse.epf.common/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="version" name="Version" schema="schema/org.eclipse.epf.common.version.exsd"/>
-   <extension
-         id="epf"
-         point="org.eclipse.epf.common.version">
-         <versions
-         	class="org.eclipse.epf.common.serviceability.EPFVersions"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.epf.common/schema/org.eclipse.epf.common.version.exsd b/plugins/org.eclipse.epf.common/schema/org.eclipse.epf.common.version.exsd
deleted file mode 100755
index a5e25a9..0000000
--- a/plugins/org.eclipse.epf.common/schema/org.eclipse.epf.common.version.exsd
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.epf.common">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.epf.common" id="org.eclipse.epf.common.version" name="Version"/>
-      </appInfo>
-      <documentation>
-         Define schema/tool versions
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="versions" minOccurs="0" maxOccurs="1"/>
-            <element ref="libraryExtensionVersionCheck" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="versions">
-      <complexType>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.epf.common.serviceability.Versions"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="libraryExtensionVersionCheck">
-      <complexType>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.epf.common.serviceability.ILibraryExtensionVersionCheck"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/CommonPlugin.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/CommonPlugin.java
deleted file mode 100755
index 01452b1..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/CommonPlugin.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common;
-
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The Common plug-in activator.
- */
-public class CommonPlugin extends AbstractPlugin {
-
-	// The shared plug-in instance.
-	private static CommonPlugin plugin;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public CommonPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * @see org.eclipse.epf.common.plugin.AbstractPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * @see org.eclipse.epf.common.plugin.AbstractPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Gets the shared instance.
-	 * 
-	 * @return the shared plug-in instance
-	 */
-	public static CommonPlugin getDefault() {
-		return plugin;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/html/HTMLFormatter.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/html/HTMLFormatter.java
deleted file mode 100755
index dca1e91..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/html/HTMLFormatter.java
+++ /dev/null
@@ -1,269 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.html;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.regex.Pattern;
-
-import org.eclipse.epf.common.utils.FileUtil;
-import org.w3c.tidy.Tidy;
-
-/**
- * Pretty-formats HTML source and makes it XHTML compliant.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class HTMLFormatter {
-
-	private static final String HTML_BODY_START_TAG = "<body>"; //$NON-NLS-1$
-
-	private static final String HTML_BODY_END_TAG = "</body>"; //$NON-NLS-1$
-
-	private static final int HTML_BODY_START_TAG_LENGTH = HTML_BODY_START_TAG
-			.length();
-
-	private static final String HTML_COPY = "&copy;";//$NON-NLS-1$
-
-	private static final String HTML_EURO = "&euro;";//$NON-NLS-1$ 	
-
-	private static final String HTML_REG = "&reg;";//$NON-NLS-1$ 
-
-	private static final String HTML_TRADEMARK = "&trade;";//$NON-NLS-1$
-
-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.epf.common.HTMLFormatter";
-	
-	private int lineWidth;
-
-	private boolean indent;
-
-	private int indentSize;
-	
-	private String lastErrorStr;
-
-	/* 		String location = m.group(1);
-			String lineStr = m.group(2);
-			String columnStr = m.group(3);
-			String errorMsg = m.group(4);
-	 */
-	public static final Pattern jTidyErrorParser = Pattern.compile("(line\\s+(\\d+)\\s+column\\s+(\\d+))\\s+-\\s+(.+)", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
-	/**
-	 * Creates a new instance.
-	 */
-	public HTMLFormatter() {
-		this(132, true, 4);
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	public HTMLFormatter(int lineWidth, boolean indent, int indentSize) {
-		this.lineWidth = lineWidth;
-		this.indent = indent;
-		this.indentSize = indentSize;
-	}
-
-	/**
-	 * Sets the maximum character width of a line.
-	 * 
-	 * @param lineWidth
-	 *            The line width (in number of characters).
-	 */
-	public void setLineWidth(int lineWidth) {
-		this.lineWidth = lineWidth;
-	}
-
-	/**
-	 * Enables or disables tags indent.
-	 * 
-	 * @param indent
-	 *            If true, ident the tags.
-	 */
-	public void setIndent(boolean indent) {
-		this.indent = indent;
-	}
-
-	/**
-	 * Sets the indent size.
-	 * 
-	 * @param indentSize
-	 *            The indent size (in number of characters).
-	 */
-	public void setIndentSize(int indentSize) {
-		this.indentSize = indentSize;
-	}
-
-	/**
-	 * Formats the given HTML source.
-	 * 
-	 * @param html
-	 *            The HTML source.
-	 * @return The pretty-formatted HTML source.
-	 */
-	public String formatHTML(String html) throws UnsupportedEncodingException {
-		if (html == null || html.length() == 0) {
-			return html;
-		}
-
-		lastErrorStr = null;
-		
-		Tidy tidy = new Tidy();
-		tidy.setXHTML(true);
-		tidy.setDropEmptyParas(false);
-		tidy.setDropFontTags(false);
-		tidy.setQuiet(true);
-		tidy.setShowWarnings(false);
-		tidy.setSmartIndent(false);
-		tidy.setTidyMark(false);
-		tidy.setWraplen(lineWidth);
-		tidy.setIndentAttributes(false);
-		tidy.setIndentContent(indent);
-		tidy.setSpaces(indentSize);
-		tidy.setInputEncoding("UTF-8"); //$NON-NLS-1$
-		tidy.setOutputEncoding("UTF-8"); //$NON-NLS-1$
-		tidy.setForceOutput(true);
-
-		ByteArrayInputStream input = new ByteArrayInputStream(html
-				.getBytes("UTF-8")); //$NON-NLS-1$	
-		ByteArrayOutputStream output = new ByteArrayOutputStream();
-
-		StringWriter sw = new StringWriter();
-		PrintWriter pw = new PrintWriter(sw);
-		tidy.setErrout(pw);
-		tidy.parse(input, output);
-		String error = sw.getBuffer().toString();
-		if (error != null && error.length() > 0
-				&& error.startsWith("line") && error.indexOf("column") > 0) { //$NON-NLS-1$ //$NON-NLS-2$
-			lastErrorStr = error;
-		}
-
-		String formattedHTML = new String(output.toByteArray(), "UTF-8"); //$NON-NLS-1$
-		formattedHTML = escapeHTML(formattedHTML);
-
-		if (!html.startsWith("<!DOCTYPE") && !html.startsWith("<html")) { //$NON-NLS-1$ //$NON-NLS-2$
-			int start = formattedHTML.indexOf(HTML_BODY_START_TAG);
-			int end = formattedHTML.indexOf(HTML_BODY_END_TAG);
-			if (start == -1 || end == -1) {
-				return ""; //$NON-NLS-1$
-			}
-			start += HTML_BODY_START_TAG_LENGTH;
-			if (start >= end) {
-				return ""; //$NON-NLS-1$
-			}
-			start += FileUtil.LINE_SEP_LENGTH;
-			end -= FileUtil.LINE_SEP_LENGTH;
-			if (indent && indentSize > 0) {
-				end -= indentSize;
-			}
-			if (start >= end) {
-				return ""; //$NON-NLS-1$
-			}
-			String result = formattedHTML.substring(start, end);
-			if (indent && indentSize > 0) {
-				String indentStr = getIndentStr(indentSize * 2);
-				result = fixIndentation(result, indentStr);
-				return result;
-			}
-		}
-		return formattedHTML;
-	}
-
-	/**
-	 * Returns the indent string.
-	 */
-	private static String getIndentStr(int indentLength) {
-		if (indentLength == 0) {
-			return ""; //$NON-NLS-1$
-		}
-		StringBuffer indentStr = new StringBuffer();
-		for (int i = 0; i < indentLength; i++) {
-			indentStr.append(' ');
-		}
-		return indentStr.toString();
-	}
-
-	/**
-	 * Escapes HTML special characters that are not handled correctly by JTidy.
-	 * 
-	 * @param html
-	 *            The HTML source.
-	 * @return The HTML source with HTML special characters preserved in escaped
-	 *         form.
-	 */
-	private static String escapeHTML(String html) {
-		if (html == null || html.length() == 0)
-			return ""; //$NON-NLS-1$
-		StringBuffer sb = new StringBuffer();
-		int len = html.length();
-		for (int i = 0; i < len; i++) {
-			char ch = html.charAt(i);
-			switch (ch) {
-			case '\u00a9':
-				sb.append(HTML_COPY);
-				break;
-			case '\u00ae':
-				sb.append(HTML_REG);
-				break;
-			case '\u20ac':
-				sb.append(HTML_EURO);
-				break;
-			case '\u2122':
-				sb.append(HTML_TRADEMARK);
-				break;
-			default:
-				sb.append(ch);
-				break;
-			}
-		}
-		return sb.toString();
-	}
-
-	public static final String PRE_TAG_START = "<pre>"; //$NON-NLS-1$
-	public static final String PRE_TAG_END = "</pre>"; //$NON-NLS-1$
-	public static final int PRE_TAG_END_LENGTH = PRE_TAG_END.length();
-	/**
-	 * Undo the JTidy indent, but ignore &lt;pre&gt; tags
-	 * @param html
-	 * @param indentStr
-	 * @return
-	 */
-	private static String fixIndentation(String html, String indentStr) {
-		if (html.startsWith(indentStr)) {
-			html = html.substring(indentStr.length());
-		}
-		StringBuffer strBuf = new StringBuffer();
-		int pre_index = -1;
-		int last_pre_end_index = -1;
-		while ((pre_index = html.indexOf(PRE_TAG_START, last_pre_end_index)) != -1) {
-			strBuf.append(html.substring(last_pre_end_index < 0 ? 0 : last_pre_end_index + PRE_TAG_END_LENGTH, pre_index).replaceAll("\r\n" + indentStr, "\r\n"));
-			last_pre_end_index = html.indexOf(PRE_TAG_END, pre_index);
-			if (last_pre_end_index != -1) {
-				strBuf.append(html.substring(pre_index, last_pre_end_index + PRE_TAG_END_LENGTH));
-			}
-			else {
-				// found <pre>, but no ending </pre> - shouldn't ever get here
-				// append rest of string and return it
-				strBuf.append(html.substring(pre_index));
-				return strBuf.toString();
-			}
-		}
-		strBuf.append(html.substring(last_pre_end_index < 0 ? 0 : last_pre_end_index + PRE_TAG_END_LENGTH).replaceAll("\r\n" + indentStr, "\r\n"));
-		return strBuf.toString();
-	}
-
-	public String getLastErrorStr() {
-		return lastErrorStr;
-	}
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/html/HTMLParser.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/html/HTMLParser.java
deleted file mode 100755
index 9e72489..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/html/HTMLParser.java
+++ /dev/null
@@ -1,209 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.html;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Properties;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.tidy.Tidy;
-
-/**
- * Extracts the title, meta tags and text from a HTML file or source.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class HTMLParser {
-
-	private static final int BUFFER_SIZE = 4096;
-
-	private static final String HTML_SCRIPT_TAG = "script"; //$NON-NLS-1$	
-
-	private static final String HTML_TITLE_TAG = "title"; //$NON-NLS-1$
-
-	private static final String HTML_META_TAG = "meta"; //$NON-NLS-1$
-
-	private Tidy tidy;
-
-	private String title;
-
-	private String summary;
-
-	private String text;
-
-	private Properties metaTags;
-
-	private StringBuffer htmlText;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public HTMLParser() {
-		try {
-			tidy = new Tidy();
-			tidy.setXHTML(true);
-			tidy.setDropEmptyParas(true);
-			tidy.setDropFontTags(true);
-			tidy.setQuiet(true);
-			tidy.setShowWarnings(false);
-			tidy.setSmartIndent(false);
-			tidy.setTidyMark(false);
-			tidy.setWraplen(132);
-			tidy.setIndentAttributes(false);
-			tidy.setIndentContent(false);
-			tidy.setSpaces(2);
-			tidy.setInputEncoding("UTF-8"); //$NON-NLS-1$
-			tidy.setOutputEncoding("UTF-8"); //$NON-NLS-1$
-		} catch (Exception e) {
-			tidy = null;
-		}
-	}
-
-	/**
-	 * Parses the given HTML file.
-	 */
-	public void parse(File file) throws Exception {
-		if (tidy == null || !file.exists() || !file.canRead()) {
-			return;
-		}
-
-		FileInputStream fis = new FileInputStream(file);
-		InputStreamReader isr = new InputStreamReader(fis, "UTF-8"); //$NON-NLS-1$
-		BufferedReader br = new BufferedReader(isr);
-
-		StringBuffer textBuffer = new StringBuffer(BUFFER_SIZE);
-		char[] buffer = new char[BUFFER_SIZE];
-		int charsRead;
-		while ((charsRead = br.read(buffer, 0, BUFFER_SIZE)) > 0) {
-			textBuffer.append(buffer, 0, charsRead);
-		}
-
-		parse(textBuffer.toString());
-
-		if (br != null) {
-			try {
-				br.close();
-			} catch (IOException e) {
-			}
-		}
-	}
-
-	/**
-	 * Parses the given HTML source.
-	 */
-	protected void parse(String htmlSource) throws Exception {
-		title = ""; //$NON-NLS-1$
-		summary = ""; //$NON-NLS-1$
-		text = ""; //$NON-NLS-1$
-		metaTags = new Properties();
-
-		Document doc = getDocument(htmlSource);
-		if (doc != null) {
-			htmlText = new StringBuffer(1024);
-			extract(doc.getChildNodes());
-			text = htmlText.toString();
-		}
-	}
-
-	/**
-	 * Returns the title text.
-	 */
-	public String getTitle() {
-		return title;
-	}
-
-	/**
-	 * Returns the HTML meta tags.
-	 */
-	public Properties getMetaTags() {
-		return metaTags;
-	}
-
-	/**
-	 * Returns the summary.
-	 */
-	public String getSummary() {
-		return summary;
-	}
-
-	/**
-	 * Returns the body text.
-	 */
-	public String getText() {
-		return text;
-	}
-
-	/**
-	 * Returns the DOM document for the given HTML source.
-	 */
-	protected Document getDocument(String html) throws Exception {
-		if (html == null || html.length() == 0) {
-			return null;
-		}
-
-		ByteArrayInputStream input = new ByteArrayInputStream(html
-				.getBytes("UTF-8")); //$NON-NLS-1$	
-		ByteArrayOutputStream output = new ByteArrayOutputStream();
-
-		StringWriter sw = new StringWriter();
-		PrintWriter pw = new PrintWriter(sw);
-		tidy.setErrout(pw);
-
-		return tidy.parseDOM(input, output);
-	}
-
-	/**
-	 * Extracts the title, meta tags and body text from the given nodes.
-	 */
-	protected void extract(NodeList nodes) {
-		for (int i = 0; i < nodes.getLength(); i++) {
-			Node node = nodes.item(i);
-			String nodeName = node.getNodeName();
-			switch (node.getNodeType()) {
-			case Node.ELEMENT_NODE:
-				if (!nodeName.equals(HTML_SCRIPT_TAG)) {
-					NamedNodeMap attrs = node.getAttributes();
-					for (int j = 0; j < attrs.getLength(); j++) {
-						Node attrNode = attrs.item(j);
-						String attrNodeName = attrNode.getNodeName();
-						String attrNodeValue = attrNode.getNodeValue();
-						if (attrNodeName.equals(HTML_TITLE_TAG)) {
-							title = attrNodeValue;
-						} else if (attrNodeName.equals(HTML_META_TAG)) {
-							metaTags.put(attrNodeName, attrNodeValue);
-						}
-					}
-					NodeList childNodes = node.getChildNodes();
-					if (childNodes != null && childNodes.getLength() > 0) {
-						extract(childNodes);
-					}
-				}
-				break;
-			case Node.TEXT_NODE:
-				htmlText.append(node.getNodeValue()).append(' ');
-				break;
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/html/package.html b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/html/package.html
deleted file mode 100755
index fc52bba..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/html/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides common HTML parsing and pretty-formating services.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/package.html b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/package.html
deleted file mode 100755
index 21f893e..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the activator for managing the Common plug-in's life cycle.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/plugin/AbstractPlugin.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/plugin/AbstractPlugin.java
deleted file mode 100755
index a57f96b..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/plugin/AbstractPlugin.java
+++ /dev/null
@@ -1,562 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.plugin;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.Properties;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.common.utils.I18nUtil;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The abstract base class for all EPF plug-ins.
- * 
- * @author Kelvin Low
- * @author Jinhua Xi
- * @since 1.0
- */
-public abstract class AbstractPlugin extends AbstractUIPlugin {
-
-	// The relative path to the icons.
-	private static final String ICON_PATH = "icons/"; //$NON-NLS-1$;
-
-	// The resource bundle for this plug-in.
-	private ResourceBundle resourceBundle;
-
-	// This plug-in ID.
-	private String pluginId;
-
-	// The plug-in install URL.
-	private URL installURL;
-
-	// The plug-in install path.
-	private String installPath;
-
-	// The plug-in icon URL.
-	private URL iconURL;
-
-	// The logger hash map.
-	private static Map<String, Logger> loggers = new HashMap<String, Logger>();
-
-	// The message dialog hash map.
-	private static Map<String, MsgDialog> msgDialogs = new HashMap<String, MsgDialog>();
-
-	// The shared image hash map.
-	private static Map<String, Image> sharedImages = new HashMap<String, Image>();
-
-	/**
-	 * Default constructor.
-	 */
-	public AbstractPlugin() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-
-		init(context);
-
-		if (isDebugging()) {
-			getLogger().logInfo("Started " + pluginId); //$NON-NLS-1$			
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		// Free the shared images.
-		for (Iterator images = sharedImages.values().iterator(); images
-				.hasNext();) {
-			Image image = (Image) images.next();
-			if (image != null && !image.isDisposed()) {
-				image.dispose();
-			}
-		}
-
-		super.stop(context);
-
-		if (isDebugging()) {
-			getLogger().logInfo("Stopped " + pluginId); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Initializes this plug-in.
-	 * 
-	 * @param context
-	 *            The bundle context.
-	 */
-	protected void init(BundleContext context) throws Exception {
-		// Get the bundle for this plug-in.
-		Bundle bundle = getBundle();
-
-		// Get the resouce bundle for this plug-in.
-		resourceBundle = Platform.getResourceBundle(bundle);
-
-		// Get the ID for this plug-in.
-		pluginId = bundle.getSymbolicName();
-
-		if (isDebugging()) {
-			getLogger().logInfo("Initializing " + pluginId); //$NON-NLS-1$		
-		}
-
-		// Get the install path of this plug-in.
-		installURL = bundle.getEntry("/"); //$NON-NLS-1$
-
-		try {
-			installPath = FileLocator.resolve(installURL).getPath();
-		} catch (IOException e) {
-			installPath = Platform.getInstallLocation().getURL().getPath();
-		}
-
-		try {
-			iconURL = new URL(installURL, ICON_PATH);
-		} catch (IOException e) {
-		}
-
-		if (isDebugging()) {
-			getLogger().logInfo(
-					"Initialized " + pluginId + ", installPath=" + installPath); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * Returns the ID of this plug-in.
-	 * 
-	 * @return The ID of this plug-in.
-	 */
-	public String getId() {
-		return pluginId;
-	}
-
-	/**
-	 * Returns the install URL of this plug-in.
-	 * 
-	 * @param The
-	 *            install URL of this plug-in.
-	 */
-	public URL getInstallURL() {
-		return installURL;
-	}
-
-	/**
-	 * Returns the install path of this plug-in.
-	 * 
-	 * @param The
-	 *            install path of this plug-in.
-	 */
-	public String getInstallPath() {
-		return installPath;
-	}
-
-	/**
-	 * Loads and returns the localized properties of a Java properties file.
-	 * <p>
-	 * 
-	 * @param path
-	 *            The properties file path relative to the plug-in root.
-	 * @return A <code>Properties</code> object.
-	 */
-	public Properties getProperties(String path) throws IOException {
-		Properties props = new Properties();
-		if (path == null) {
-			return props;
-		}
-		
-		String filePath = getLocalizedFile(path, true);
-		
-//		String filePath = null;
-//		String fileName = FileUtil.getFileName(path);
-//		int index = path.lastIndexOf(fileName);
-//		String pathName = path.substring(0, index);
-//
-//		Locale locale = Locale.getDefault();
-//		Bundle bundle = getBundle();
-//		Bundle[] bundles = Platform.getFragments(bundle);
-//		if (bundles != null) {
-//			for (int i = 0; i < bundles.length; i++) {
-//				URL entry = bundles[i].getEntry(pathName);
-//				if (entry != null) {
-//					URL url = Platform.resolve(entry);
-//					filePath = I18nUtil.getLocalizedFile(url.getPath() + fileName, locale); //$NON-NLS-1$
-//					if (filePath != null) {
-//						break;
-//					}
-//				}
-//			}
-//		}
-//
-//		if (filePath == null) {
-//			URL entry = bundle.getEntry(path);
-//			if (entry != null) {
-//				URL url = Platform.resolve(entry);
-//				filePath = I18nUtil.getLocalizedFile(url.getPath(), locale);
-//				if (filePath == null) {
-//					filePath = url.getPath();
-//				}
-//			}
-//		}
-
-		if (filePath != null) {
-			props.load(new FileInputStream(filePath));
-		}
-
-		return props;
-	}
-
-	/**
-	 * get the locale specific absolute file path name of the given file in the plugin.
-	 * @param path The properties file path relative to the plug-in root.
-	 * @return String the locale specific absolute file path name of the given file.
-	 * @throws IOException
-	 */
-	public String getLocalizedFile(String path, boolean useDefault) throws IOException
-	{
-		String filePath = null;
-		String fileName = FileUtil.getFileName(path);
-		int index = path.lastIndexOf(fileName);
-		String pathName = path.substring(0, index);
-
-		Locale locale = Locale.getDefault();
-		
-		Bundle bundle = getBundle();
-		Bundle[] bundles = Platform.getFragments(bundle);
-		if (bundles != null) {
-			for (int i = 0; i < bundles.length; i++) {
-				URL entry = bundles[i].getEntry(pathName);
-				if (entry != null) {
-					URL url = FileLocator.resolve(entry);
-					filePath = I18nUtil.getLocalizedFile(url.getPath() + fileName, locale); //$NON-NLS-1$
-					if (filePath != null) {
-						break;
-					}
-				}
-			}
-		}
-
-		if (filePath == null) {
-			URL entry = bundle.getEntry(path);
-			if (entry != null) {
-				URL url = FileLocator.resolve(entry);
-				filePath = I18nUtil.getLocalizedFile(url.getPath(), locale);
-				if (filePath == null && useDefault) {
-					filePath = url.getPath();
-				}
-			}
-		}
-
-		return filePath;
-	}
-	
-//	/**
-//	 * get the localized files for the files in the specified folder. The folder is a relative path to the plugin.
-//	 * returns a map of the files (in ralitive path to the plugin) to their localized files in absolute path.
-//	 * @param folder String path relative to the current plugin
-//	 * @param recursive boolean if true recurisely get all files in sub folders
-//	 * @return Map a map of the files (in ralitive path to the plugin) to their localized files in absolute path.
-//	 * @throws IOException
-//	 */
-//	public Map getLocalizedFiles(String folder, boolean recursive) throws IOException
-//	{
-//		Map fileMap = new HashMap();
-//		
-//		String pluginPath = getInstallPath();
-//		
-//		List files = new ArrayList();
-//		File f = new File(pluginPath, folder);
-//		FileUtil.getAllFiles(f, files, true);
-//
-//		// for each file found in the specified folder, get the localized file
-//		// put an antry of the original file and the localized file
-//		URI pluginUri = new File(pluginPath).toURI();
-//		
-//		for ( Iterator it = files.iterator(); it.hasNext(); )
-//		{
-//			File src = (File)it.next();
-//			String relPath = pluginUri.relativize(src.toURI()).getPath();
-//			
-//			// only get the locale specific file, don't include the default one
-//			String localizedFile = getLocalizedFile(relPath, false);
-//			if ( localizedFile != null )
-//			{
-//				fileMap.put(relPath, localizedFile);
-//			}
-//		}
-//		
-//		return fileMap;
-//	}
-	
-	/**
-	 * for the given path in the plugin, find the localized files form the nl fragemenets 
-	 * and copy the localized files to the destination folder
-	 * @param path String a relative path to the plugin root. 
-	 * The files in this folder will be iterated and their localized files will be copied over
-	 * @param toDir FIle the destination folder 
-	 * @param recursive boolean recurively looking for files int the specified folder
-	 * @param useLocaleFileName boolean if true the locale specific file names will be used in the copied destination, 
-	 * otherwise, the locale specific file name will be renamed to the default one in the destination folder
-	 * @throws IOException
-	 */
-	public void copyLocalizedFiles(String path, File toDir, boolean recursive, boolean useLocaleFileName) throws IOException
-	{
-		String pluginPath = getInstallPath();
-		URI pluginUri = new File(pluginPath).toURI();
-	    URI pathUri = new File(pluginPath, path).toURI();
-
-		List files = new ArrayList();
-		File f = new File(pluginPath, path);
-		FileUtil.getAllFiles(f, files, recursive);
-
-		// for each file found in the specified folder, get the localized file
-		for ( Iterator it = files.iterator(); it.hasNext(); )
-		{
-			URI srcUri = ((File)it.next()).toURI();
-			
-			// get the relative path of the file to the plugin root, then find the localized file
-			String relPath = pluginUri.relativize(srcUri).getPath();
-			
-			// only get the locale specific file, don't include the default one
-			String localizedFile = getLocalizedFile(relPath, false);
-			if ( localizedFile == null )
-			{
-				continue;
-			}
-						
-    		// need to change the target file path to relative to the path instead of the plugin root
-    		relPath = pathUri.relativize(srcUri).getPath();
-    		File srcFile = new File(localizedFile);
-    		File targetFile = new File(toDir, relPath);
-    		File targetParent = targetFile.getParentFile();
-    		
-			// copy the file to the desitination
-			// if useLocaleFileName is true, the destination file name should also use the locale specific file name
-    		if ( useLocaleFileName )
-    		{
-    			String fileName = srcFile.getName();
-    			targetFile = new File(targetParent, fileName);
-    		}
-    		
-    		if (isDebugging()) {
-	    		System.out.println("Copying localized file: "); //$NON-NLS-1$
-	    		System.out.println("Source: " + srcFile); //$NON-NLS-1$
-	    		System.out.println("Target: " + targetFile); //$NON-NLS-1$
-	    		System.out.println(""); //$NON-NLS-1$
-    		}
-    		
-    		try {
-    			if ( !targetParent.exists() )
-    			{
-    				targetParent.mkdirs();
-    			}
-    			
-    			if ( !targetFile.exists() )
-    			{
-    				targetFile.createNewFile();
-    			}
-    			
-				FileUtil.copyFile(srcFile, targetFile);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		
-	}
-	
-	
-	/**
-	 * Returns the localized resource.
-	 * 
-	 * @param key
-	 *            The resource key.
-	 * @return The localized resource.
-	 */
-	public String getString(String key) {
-		if (resourceBundle != null) {
-			try {
-				return resourceBundle.getString(key);
-			} catch (MissingResourceException e) {
-			}
-		}
-		return '[' + key + ']';
-	}
-
-	/**
-	 * Returns the formatted localized message given the resource key and the
-	 * message argument.
-	 * 
-	 * @param key
-	 *            The resource key.
-	 * @param argument
-	 *            The message argument.
-	 * @return The formatted localized message.
-	 */
-	public String formatMessage(String key, Object argument) {
-		if (resourceBundle != null) {
-			try {
-				String msg = resourceBundle.getString(key);
-				Object[] arguments = { argument };
-				return MessageFormat.format(msg, arguments);
-			} catch (MissingResourceException e) {
-			}
-		}
-		return '[' + key + ']';
-	}
-
-	/**
-	 * Returns the image URL given the relative path.
-	 * 
-	 * @param relativePath
-	 *            The image's path relative to the plug-in's root.
-	 * @return The image URL.
-	 */
-	public URL getImageURL(String relativePath) {
-		try {
-			URL url = new URL(iconURL, relativePath);
-			return FileLocator.resolve(url);
-		} catch (Exception e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Returns the image descriptor given the relative path.
-	 * 
-	 * @param relativePath
-	 *            The image's path relative to the plug-in's root.
-	 * @return The image descriptor.
-	 */
-	public ImageDescriptor getImageDescriptor(String relativePath) {
-		try {
-			URL url = new URL(iconURL, relativePath);
-			return ImageDescriptor.createFromURL(url);
-		} catch (MalformedURLException e) {
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
-
-	/**
-	 * Returns the image given the relative path.
-	 * <p>
-	 * Note: The returned image need to be freed by the caller.
-	 * 
-	 * @param relativePath
-	 *            The image's path relative to the plug-in's root.
-	 * @return The image.
-	 */
-	public Image getImage(String relativePath) {
-		Image image = null;
-
-		ImageDescriptor imageDescriptor = getImageDescriptor(relativePath);
-		if (imageDescriptor != null) {
-			image = imageDescriptor.createImage(false);
-		}
-
-		return image;
-	}
-
-	/**
-	 * Returns the shared image given the relative path.
-	 * <p>
-	 * Note: The returned image will be automatically freed when the plug-in
-	 * shuts down.
-	 * 
-	 * @param relativePath
-	 *            The image's path relative to the plug-in's root.
-	 * @return The image.
-	 */
-	public Image getSharedImage(String relativePath) {
-		Image image = (Image) sharedImages.get(relativePath);
-		if (image != null) {
-			return image;
-		}
-
-		ImageDescriptor imageDescriptor = getImageDescriptor(relativePath);
-		if (imageDescriptor != null) {
-			image = imageDescriptor.createImage(false);
-			if (image != null) {
-				sharedImages.put(relativePath, image);
-			}
-		}
-
-		return image;
-	}
-
-	/**
-	 * Returns the logger given the plug-in ID.
-	 * 
-	 * @return The new or cached logger.
-	 */
-	public Logger getLogger() {
-		Logger logger = (Logger) loggers.get(pluginId);
-		if (logger == null) {
-			logger = new Logger(this);
-			loggers.put(pluginId, logger);
-		}
-		return logger;
-	}
-
-	/**
-	 * Returns the message dialog given the plug-in ID.
-	 * 
-	 * @return The new or cached message dialog.
-	 */
-	public MsgDialog getMsgDialog() {
-		MsgDialog msgDialog = (MsgDialog) msgDialogs.get(pluginId);
-		if (msgDialog == null) {
-			msgDialog = new MsgDialog(this);
-			msgDialogs.put(pluginId, msgDialog);
-		}
-		return msgDialog;
-	}
-	
-	/**
-	 * Returns the standard display to be used. The method first checks, if
-	 * the thread calling this method has an associated disaply. If so, this
-	 * display is returned. Otherwise the method returns the default display.
-	 */
-	public static Display getStandardDisplay() {
-		Display display;
-		display= Display.getCurrent();
-		if (display == null)
-			display= Display.getDefault();
-		return display;		
-	}
-
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/plugin/package.html b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/plugin/package.html
deleted file mode 100755
index 6212269..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/plugin/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides common services for accessing a plug-in's install path, images, logger and resources.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/DebugTrace.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/DebugTrace.java
deleted file mode 100755
index 670ba87..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/DebugTrace.java
+++ /dev/null
@@ -1,104 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.serviceability;
-
-/**
- * Helper utility for printing debug traces to the console.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class DebugTrace {
-
-	/**
-	 * Prints a debug trace to the console.
-	 * 
-	 * @param instance
-	 *            a class instance
-	 * @param method
-	 *            a method name
-	 * @param msg
-	 *            a debug message
-	 * @param th
-	 *            a <code>Throwable</code> object
-	 */
-	public static void print(Object instance, String method, String msg,
-			Throwable th) {
-		StringBuffer debugMsg = new StringBuffer();
-		if (instance != null) {
-			debugMsg.append(instance.getClass().getName());
-			if (method != null) {
-				debugMsg.append('.').append(method);
-			}
-			debugMsg.append(": ");
-		}
-		if (msg != null && msg.length() > 0) {
-			debugMsg.append(msg); //$NON-NLS-1$
-		}
-		System.out.println(debugMsg);
-		if (th != null) {
-			th.printStackTrace();
-		}
-	}
-
-	/**
-	 * Prints a debug trace to the console.
-	 * 
-	 * @param instance
-	 *            a class instance
-	 * @param method
-	 *            a method name
-	 * @param th
-	 *            a <code>Throwable</code> object
-	 */
-	public static void print(Object instance, String method, Throwable th) {
-		print(instance, method, null, th);
-	}
-
-	/**
-	 * Prints a debug trace to the console.
-	 * 
-	 * @param instance
-	 *            a class instance
-	 * @param method
-	 *            a method name
-	 * @param msg
-	 *            a debug message
-	 */
-	public static void print(Object instance, String method, String msg) {
-		print(instance, method, msg, null);
-	}
-
-	/**
-	 * Prints a debug trace to the console.
-	 * 
-	 * @param instance
-	 *            a class instance
-	 * @param method
-	 *            a method name
-	 */
-	public static void print(Object instance, String method) {
-		print(instance, method, null, null);
-	}
-
-	/**
-	 * Prints a debug trace to the console.
-	 * 
-	 * @param th
-	 *            a <code>Throwable</code> object
-	 */
-	public static void print(Throwable th) {
-		if (th != null) {
-			th.printStackTrace();
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/EPFVersion.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/EPFVersion.java
deleted file mode 100755
index ed7d026..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/EPFVersion.java
+++ /dev/null
@@ -1,140 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.serviceability;
-
-import org.osgi.framework.Version;
-
-/**
- * This class represents a single version of EPF Composer.
- * It contains all the versions of the sub-components of EPF.
- * 
- * @author Jeff Hardy
- * @sicne 1.0
- */
-public class EPFVersion {
-
-	// the tool version
-	protected Version toolVersion;
-	
-	// the library version
-	protected Version libraryVersion;
-	
-	// the schema version
-	protected Version xmlSchemaVersion;
-	
-	
-	public EPFVersion() {
-		this.toolVersion = Version.emptyVersion;
-		this.libraryVersion = Version.emptyVersion;
-		this.xmlSchemaVersion = Version.emptyVersion;
-	};
-	
-	public EPFVersion(String toolVersion, String libraryVersion, String xmlSchemaVersion) {
-		this.toolVersion = new Version(toolVersion);
-		this.libraryVersion = new Version(libraryVersion);
-		this.xmlSchemaVersion = new Version(xmlSchemaVersion);
-	}
-
-	/**
-	 * @return the tool version
-	 */
-	public Version getToolVersion() {
-		return toolVersion;
-	}
-
-	/**
-	 * @return the library version
-	 */
-	public Version getLibraryVersion() {
-		return libraryVersion;
-	}
-
-	/**
-	 * @return the XML schema version
-	 */
-	public Version getXMLSchemaVersion() {
-		return xmlSchemaVersion;
-	}
-	
-	/**
-	 * Compares the given tool version to this one
-	 * 
-	 * @see org.osgi.framework.Version#compareTo()
-	 * 
-	 * @param schemaVersion The schema version to be compared.
-	 * @return A negative integer if this tool version is less than the given one<br />
-	 * Zero if the this tool version is the same as the given one<br />
-	 * A positive integer if this tool version is greater than the given one<br />
-	 * 
-	 */
-	public int compareToolVersionTo(Version toolVersion) {
-		if (!VersionUtil.isVersionCheckingDisabled())
-			return getToolVersion().compareTo(toolVersion);
-		else 
-			return 0;
-	}
-	
-	/**
-	 * Compares the given library version to this one
-	 * 
-	 * @see org.osgi.framework.Version#compareTo()
-	 * 
-	 * @param schemaVersion The schema version to be compared.
-	 * @return A negative integer if this library version is less than the given one<br />
-	 * Zero if the this library version is the same as the given one<br />
-	 * A positive integer if this library version is greater than the given one<br />
-	 * 
-	 */
-	public int compareLibraryVersionTo(Version libraryVersion) {
-		if (!VersionUtil.isVersionCheckingDisabled())
-			return getLibraryVersion().compareTo(libraryVersion);
-		else 
-			return 0;
-	}
-
-	/**
-	 * Compares the given XML Schema version to this one
-	 * 
-	 * @see org.osgi.framework.Version#compareTo()
-	 * 
-	 * @param schemaVersion The schema version to be compared.
-	 * @return A negative integer if this XML Schema version is less than the given one<br />
-	 * Zero if the this XML Schema version is the same as the given one<br />
-	 * A positive integer if this XML Schema version is greater than the given one<br />
-	 * 
-	 */
-	public int compareXMLSchemaVersionTo(Version XMLSchemaVersion) {
-		if (!VersionUtil.isVersionCheckingDisabled())
-			return getXMLSchemaVersion().compareTo(XMLSchemaVersion);
-		else 
-			return 0;
-	}
-	
-	public String toString() {
-		return getToolVersion().toString() + "," + //$NON-NLS-1$
-		getLibraryVersion().toString() + "," + //$NON-NLS-1$
-		getXMLSchemaVersion().toString();
-	}
-	
-	public boolean equals(Object object) {
-		if (object == this) { // quicktest
-			return true;
-		}
-
-		if (!(object instanceof EPFVersion)) {
-			return false;
-		}
-
-		EPFVersion other = (EPFVersion) object;
-		return (getToolVersion().equals(other.getToolVersion())) && (getLibraryVersion().equals(other.getLibraryVersion()))
-				&& (getXMLSchemaVersion().equals(other.getXMLSchemaVersion()));
-	}
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/EPFVersions.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/EPFVersions.java
deleted file mode 100755
index 43adcda..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/EPFVersions.java
+++ /dev/null
@@ -1,127 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.serviceability;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.osgi.framework.Version;
-
-/**
- * This class stores all of the version information for the known EPF versions.
- * 
- * @author Jeff Hardy
- * @since 1.0
- */
-public class EPFVersions {
-	
-	public static final String TOOL_ID = "epf"; //$NON-NLS-1$
-	
-	//the name space URI string for the TOOL_ID
-	private static String nsUri = "http://www.eclipse.org/epf"; //$NON-NLS-1$
-
-	// EPF 1.0
-	private static EPFVersion EPF_10 = 
-		new EPFVersion("1.0", //$NON-NLS-1$  tool version
-				"1.0.3.0", //$NON-NLS-1$  library version
-				"1.0.0"); //$NON-NLS-1$  xml schema version
-
-	// EPF 1.1 - This is EPF 1.2 Iteration 1
-	private static EPFVersion EPF_11 = 
-	new EPFVersion("1.1", //$NON-NLS-1$  tool version
-			"1.0.4.0", //$NON-NLS-1$  library version
-			"1.0.0"); //$NON-NLS-1$  xml schema version
-	
-	private static EPFVersion currentVersion = EPF_11;
-	
-	public EPFVersion getCurrentVersion() {
-		return currentVersion;
-	}
-	
-	public EPFVersion getVersion(String toolVersion) {
-		if (toolVersion != null) {
-			for (Iterator iter = getAllVersions().iterator();iter.hasNext();) {
-				EPFVersion ver = (EPFVersion)iter.next();
-				if (ver.getToolVersion().equals(new Version(toolVersion))) {
-					return ver;
-				}
-			}
-		}
-		return null;
-	}
-	
-	public Collection getAllVersions() {
-		List versions = new ArrayList();
-		versions.add(EPF_10);
-		versions.add(EPF_11);
-		return versions;
-	}
-	
-
-	/**
-	 * 
-	 * @param libraryVersion
-	 * @return the minimum tool version that uses the specified library version
-	 */
-	public EPFVersion getMinToolVersionForLibraryVersion(Version libraryVersion) {
-		for (Iterator iter = getAllVersions().iterator();iter.hasNext();) {
-			EPFVersion versionInfo = (EPFVersion)iter.next();
-			if (versionInfo.getLibraryVersion().compareTo(libraryVersion) == 0) {
-				return versionInfo;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * 
-	 * @return the minimum tool version that uses the current library version
-	 */
-	public EPFVersion getMinToolVersionForCurrentLibraryVersion() {
-		Version libraryVersion = getCurrentVersion().getLibraryVersion();
-		return getMinToolVersionForLibraryVersion(libraryVersion);
-	}
-
-	/**
-	 * 
-	 * @param xmlSchemaVersion
-	 * @return the minimum tool version that uses the specified XML Schema version
-	 */
-	public EPFVersion getMinToolVersionForXMLSchemaVersion(Version xmlSchemaVersion) {
-		for (Iterator iter = getAllVersions().iterator();iter.hasNext();) {
-			EPFVersion versionInfo = (EPFVersion)iter.next();
-			if (versionInfo.getXMLSchemaVersion().compareTo(xmlSchemaVersion) == 0) {
-				return versionInfo;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * 
-	 * @return the minimum tool version that uses the current XML Schema version
-	 */
-	public EPFVersion getMinToolVersionForCurrentXMLSchemaVersion() {
-		Version xmlSchemaVersion = getCurrentVersion().getXMLSchemaVersion();
-		return getMinToolVersionForXMLSchemaVersion(xmlSchemaVersion);
-	}
-	
-	/**
-	 * 
-	 * @return the name space URI string for the TOOL_ID
-	 */
-	public String getNsURI() {
-		return nsUri;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/ErrorDialogNoReason.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/ErrorDialogNoReason.java
deleted file mode 100755
index e661960..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/ErrorDialogNoReason.java
+++ /dev/null
@@ -1,598 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.serviceability;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IconAndMessageDialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Displays an error dialog without the Details button.
- * 
- * @author Bingxue Xu
- * @since 1.0
- */
-public class ErrorDialogNoReason extends IconAndMessageDialog {
-
-	/**
-	 * Static to prevent opening of error dialogs for automated testing.
-	 */
-	public static final boolean AUTOMATED_MODE = false;
-
-	/**
-	 * Reserve room for this many list items.
-	 */
-	private static final int LIST_ITEM_COUNT = 7;
-
-	/**
-	 * The nesting indent.
-	 */
-	private static final String NESTING_INDENT = "  "; //$NON-NLS-1$
-
-	/**
-	 * The Details button.
-	 */
-	protected Button detailsButton;
-
-	/**
-	 * The title of the dialog.
-	 */
-	private String title;
-
-	/**
-	 * The SWT list control that displays the error details.
-	 */
-	private List list;
-
-	/**
-	 * Indicates whether the error details viewer is currently created.
-	 */
-	private boolean listCreated = false;
-
-	/**
-	 * Filter mask for determining which status items to display.
-	 */
-	private int displayMask = 0xFFFF;
-
-	/**
-	 * The main status object.
-	 */
-	private IStatus status;
-
-	/**
-	 * The current clipboard. To be disposed when closing the dialog.
-	 */
-	private Clipboard clipboard;
-
-	private boolean shouldIncludeTopLevelErrorInDetails = false;
-
-	/**
-	 * Creates an error dialog. Note that the dialog will have no visual
-	 * representation (no widgets) until it is told to open.
-	 * <p>
-	 * Normally one should use <code>openError</code> to create and open one
-	 * of these. This constructor is useful only if the error object being
-	 * displayed contains child items <it>and </it> you need to specify a mask
-	 * which will be used to filter the displaying of these children.
-	 * </p>
-	 * 
-	 * @param parentShell
-	 *            the shell under which to create this dialog
-	 * @param dialogTitle
-	 *            the title to use for this dialog, or <code>null</code> to
-	 *            indicate that the default title should be used
-	 * @param message
-	 *            the message to show in this dialog, or <code>null</code> to
-	 *            indicate that the error's message should be shown as the
-	 *            primary message
-	 * @param status
-	 *            the error to show to the user
-	 * @param displayMask
-	 *            the mask to use to filter the displaying of child items, as
-	 *            per <code>IStatus.matches</code>
-	 * @see org.eclipse.core.runtime.IStatus#matches(int)
-	 */
-	public ErrorDialogNoReason(Shell parentShell, String dialogTitle,
-			String message, IStatus status, int displayMask) {
-		super(parentShell);
-		this.title = dialogTitle == null ? JFaceResources
-				.getString("Problem_Occurred") : //$NON-NLS-1$
-				dialogTitle;
-		this.message = message == null ? status.getMessage() : message; //$NON-NLS-1$
-		this.status = status;
-		this.displayMask = displayMask;
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on Dialog. Handles the pressing of the Ok
-	 * or Details button in this dialog. If the Ok button was pressed then close
-	 * this dialog. If the Details button was pressed then toggle the displaying
-	 * of the error details area. Note that the Details button will only be
-	 * visible if the error being displayed specifies child details.
-	 */
-	protected void buttonPressed(int id) {
-		if (id == IDialogConstants.DETAILS_ID) {
-			// was the details button pressed?
-			toggleDetailsArea();
-		} else {
-			super.buttonPressed(id);
-		}
-	}
-
-	/*
-	 * (non-Javadoc) Method declared in Window.
-	 */
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		shell.setText(title);
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on Dialog.
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		// create OK and Details buttons
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
-				true);
-		createButton(parent, IDialogConstants.CANCEL_ID,
-				IDialogConstants.CANCEL_LABEL, false);
-		if (shouldShowDetailsButton()) {
-			detailsButton = createButton(parent, IDialogConstants.DETAILS_ID,
-					IDialogConstants.SHOW_DETAILS_LABEL, false);
-		}
-	}
-
-	/**
-	 * This implementation of the <code>Dialog</code> framework method creates
-	 * and lays out a composite and calls <code>createMessageArea</code> and
-	 * <code>createCustomArea</code> to populate it. Subclasses should
-	 * override <code>createCustomArea</code> to add contents below the
-	 * message.
-	 */
-	protected Control createDialogArea(Composite parent) {
-		createMessageArea(parent);
-		// create a composite with standard margins and spacing
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-		layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
-		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
-		layout.numColumns = 2;
-		composite.setLayout(layout);
-		GridData childData = new GridData(GridData.FILL_BOTH);
-		childData.horizontalSpan = 2;
-		composite.setLayoutData(childData);
-		composite.setFont(parent.getFont());
-		return composite;
-	}
-
-	/*
-	 * @see IconAndMessageDialog#createDialogAndButtonArea(Composite)
-	 */
-	protected void createDialogAndButtonArea(Composite parent) {
-		super.createDialogAndButtonArea(parent);
-		if (this.dialogArea instanceof Composite) {
-			// Create a label if there are no children to force a smaller layout
-			Composite dialogComposite = (Composite) dialogArea;
-			if (dialogComposite.getChildren().length == 0)
-				new Label(dialogComposite, SWT.NULL);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.IconAndMessageDialog#getImage()
-	 */
-	protected Image getImage() {
-		if (status != null) {
-			if (status.getSeverity() == IStatus.WARNING)
-				return getWarningImage();
-			if (status.getSeverity() == IStatus.INFO)
-				return getInfoImage();
-		}
-		// If it was not a warning or an error then return the error image
-		return getErrorImage();
-	}
-
-	/**
-	 * Create this dialog's drop-down list component.
-	 * 
-	 * @param parent
-	 *            the parent composite
-	 * @return the drop-down list component
-	 */
-	protected List createDropDownList(Composite parent) {
-		// create the list
-		list = new List(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL
-				| SWT.MULTI);
-		// fill the list
-		populateList(list);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL
-				| GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL
-				| GridData.GRAB_VERTICAL);
-		data.heightHint = list.getItemHeight() * LIST_ITEM_COUNT;
-		data.horizontalSpan = 2;
-		list.setLayoutData(data);
-		list.setFont(parent.getFont());
-		Menu copyMenu = new Menu(list);
-		MenuItem copyItem = new MenuItem(copyMenu, SWT.NONE);
-		copyItem.addSelectionListener(new SelectionListener() {
-			/*
-			 * @see SelectionListener.widgetSelected (SelectionEvent)
-			 */
-			public void widgetSelected(SelectionEvent e) {
-				copyToClipboard();
-			}
-
-			/*
-			 * @see SelectionListener.widgetDefaultSelected(SelectionEvent)
-			 */
-			public void widgetDefaultSelected(SelectionEvent e) {
-				copyToClipboard();
-			}
-		});
-		copyItem.setText(JFaceResources.getString("copy")); //$NON-NLS-1$
-		list.setMenu(copyMenu);
-		listCreated = true;
-		return list;
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on Window.
-	 */
-	/**
-	 * Extends <code>Window.open()</code>. Opens an error dialog to display
-	 * the error. If you specified a mask to filter the displaying of these
-	 * children, the error dialog will only be displayed if there is at least
-	 * one child status matching the mask.
-	 */
-	public int open() {
-		if (!AUTOMATED_MODE && shouldDisplay(status, displayMask)) {
-			return super.open();
-		}
-		setReturnCode(OK);
-		return OK;
-	}
-
-	/**
-	 * Opens an error dialog to display the given error. Use this method if the
-	 * error object being displayed does not contain child items, or if you wish
-	 * to display all such items without filtering.
-	 * 
-	 * @param parent
-	 *            the parent shell of the dialog, or <code>null</code> if none
-	 * @param dialogTitle
-	 *            the title to use for this dialog, or <code>null</code> to
-	 *            indicate that the default title should be used
-	 * @param message
-	 *            the message to show in this dialog, or <code>null</code> to
-	 *            indicate that the error's message should be shown as the
-	 *            primary message
-	 * @param status
-	 *            the error to show to the user
-	 * @return the code of the button that was pressed that resulted in this
-	 *         dialog closing. This will be <code>Dialog.OK</code> if the OK
-	 *         button was pressed, or <code>Dialog.CANCEL</code> if this
-	 *         dialog's close window decoration or the ESC key was used.
-	 */
-	public static int openError(Shell parent, String dialogTitle,
-			String message, IStatus status) {
-		return openError(parent, dialogTitle, message, status, IStatus.OK
-				| IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
-	}
-
-	/**
-	 * Opens an error dialog to display the given error. Use this method if the
-	 * error object being displayed contains child items <it>and </it> you wish
-	 * to specify a mask which will be used to filter the displaying of these
-	 * children. The error dialog will only be displayed if there is at least
-	 * one child status matching the mask.
-	 * 
-	 * @param parentShell
-	 *            the parent shell of the dialog, or <code>null</code> if none
-	 * @param title
-	 *            the title to use for this dialog, or <code>null</code> to
-	 *            indicate that the default title should be used
-	 * @param message
-	 *            the message to show in this dialog, or <code>null</code> to
-	 *            indicate that the error's message should be shown as the
-	 *            primary message
-	 * @param status
-	 *            the error to show to the user
-	 * @param displayMask
-	 *            the mask to use to filter the displaying of child items, as
-	 *            per <code>IStatus.matches</code>
-	 * @return the code of the button that was pressed that resulted in this
-	 *         dialog closing. This will be <code>Dialog.OK</code> if the OK
-	 *         button was pressed, or <code>Dialog.CANCEL</code> if this
-	 *         dialog's close window decoration or the ESC key was used.
-	 * @see org.eclipse.core.runtime.IStatus#matches(int)
-	 */
-	public static int openError(Shell parentShell, String title,
-			String message, IStatus status, int displayMask) {
-		ErrorDialogNoReason dialog = new ErrorDialogNoReason(parentShell,
-				title, message, status, displayMask);
-		return dialog.open();
-	}
-
-	/**
-	 * Populates the list using this error dialog's status object. This walks
-	 * the child static of the status object and displays them in a list. The
-	 * format for each entry is status_path : status_message If the status's
-	 * path was null then it (and the colon) are omitted.
-	 * 
-	 * @param listToPopulate
-	 *            The list to fill.
-	 */
-	private void populateList(List listToPopulate) {
-		populateList(listToPopulate, status, 0,
-				shouldIncludeTopLevelErrorInDetails);
-	}
-
-	/**
-	 * Populate the list with the messages from the given status. Traverse the
-	 * children of the status deeply and also traverse CoreExceptions that
-	 * appear in the status.
-	 * 
-	 * @param listToPopulate
-	 *            the list to populate
-	 * @param buildingStatus
-	 *            the status being displayed
-	 * @param nesting
-	 *            the nesting level (increases one level for each level of
-	 *            children)
-	 * @param includeStatus
-	 *            whether to include the buildingStatus in the display or just
-	 *            its children
-	 */
-	private void populateList(List listToPopulate, IStatus buildingStatus,
-			int nesting, boolean includeStatus) {
-
-		if (!buildingStatus.matches(displayMask)) {
-			return;
-		}
-
-		Throwable t = buildingStatus.getException();
-		boolean isCoreException = t instanceof CoreException;
-		boolean incrementNesting = false;
-
-		if (includeStatus) {
-			StringBuffer sb = new StringBuffer();
-			for (int i = 0; i < nesting; i++) {
-				sb.append(NESTING_INDENT); //$NON-NLS-1$
-			}
-			String message = buildingStatus.getMessage();
-			sb.append(message);
-			listToPopulate.add(sb.toString());
-			incrementNesting = true;
-		}
-
-		if (!isCoreException && t != null) {
-			// Include low-level exception message
-			StringBuffer sb = new StringBuffer();
-			for (int i = 0; i < nesting; i++) {
-				sb.append(NESTING_INDENT); //$NON-NLS-1$
-			}
-			String message = t.getLocalizedMessage();
-			if (message == null)
-				message = t.toString();
-
-			sb.append(message);
-			listToPopulate.add(sb.toString());
-			incrementNesting = true;
-		}
-
-		if (incrementNesting)
-			nesting++;
-
-		// Look for a nested core exception
-		if (isCoreException) {
-			CoreException ce = (CoreException) t;
-			IStatus eStatus = ce.getStatus();
-			// Only print the exception message if it is not contained in the
-			// parent message
-			if (message == null || message.indexOf(eStatus.getMessage()) == -1) {
-				populateList(listToPopulate, eStatus, nesting, true);
-			}
-		}
-
-		// Look for child status
-		IStatus[] children = buildingStatus.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			populateList(listToPopulate, children[i], nesting, true);
-		}
-	}
-
-	/**
-	 * Returns whether the given status object should be displayed.
-	 * 
-	 * @param status
-	 *            a status object
-	 * @param mask
-	 *            a mask as per <code>IStatus.matches</code>
-	 * @return <code>true</code> if the given status should be displayed, and
-	 *         <code>false</code> otherwise
-	 * @see org.eclipse.core.runtime.IStatus#matches(int)
-	 */
-	protected static boolean shouldDisplay(IStatus status, int mask) {
-		IStatus[] children = status.getChildren();
-		if (children == null || children.length == 0) {
-			return status.matches(mask);
-		}
-		for (int i = 0; i < children.length; i++) {
-			if (children[i].matches(mask))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Toggles the unfolding of the details area. This is triggered by the user
-	 * pressing the details button.
-	 */
-	private void toggleDetailsArea() {
-		Point windowSize = getShell().getSize();
-		Point oldSize = getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-		if (listCreated) {
-			list.dispose();
-			listCreated = false;
-			detailsButton.setText(IDialogConstants.SHOW_DETAILS_LABEL);
-		} else {
-			list = createDropDownList((Composite) getContents());
-			detailsButton.setText(IDialogConstants.HIDE_DETAILS_LABEL);
-		}
-		Point newSize = getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-		getShell()
-				.setSize(
-						new Point(windowSize.x, windowSize.y
-								+ (newSize.y - oldSize.y)));
-	}
-
-	/**
-	 * Put the details of the status of the error onto the stream.
-	 * 
-	 * @param buildingStatus
-	 * @param buffer
-	 * @param nesting
-	 */
-	private void populateCopyBuffer(IStatus buildingStatus,
-			StringBuffer buffer, int nesting) {
-		if (!buildingStatus.matches(displayMask)) {
-			return;
-		}
-		for (int i = 0; i < nesting; i++) {
-			buffer.append(NESTING_INDENT); //$NON-NLS-1$
-		}
-		buffer.append(buildingStatus.getMessage());
-		buffer.append("\n"); //$NON-NLS-1$
-
-		// Look for a nested core exception
-		Throwable t = buildingStatus.getException();
-		if (t instanceof CoreException) {
-			CoreException ce = (CoreException) t;
-			populateCopyBuffer(ce.getStatus(), buffer, nesting + 1);
-		}
-
-		IStatus[] children = buildingStatus.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			populateCopyBuffer(children[i], buffer, nesting + 1);
-		}
-	}
-
-	/**
-	 * Copy the contents of the statuses to the clipboard.
-	 */
-	private void copyToClipboard() {
-		if (clipboard != null)
-			clipboard.dispose();
-		StringBuffer statusBuffer = new StringBuffer();
-		populateCopyBuffer(status, statusBuffer, 0);
-		clipboard = new Clipboard(list.getDisplay());
-		clipboard.setContents(new Object[] { statusBuffer.toString() },
-				new Transfer[] { TextTransfer.getInstance() });
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.window.Window#close()
-	 */
-	public boolean close() {
-		if (clipboard != null)
-			clipboard.dispose();
-		return super.close();
-	}
-
-	/**
-	 * Show the details portion of the dialog if it is not already visible. This
-	 * method will only work when it is invoked after the control of the dialog
-	 * has been set. In other words, after the <code>createContents</code>
-	 * method has been invoked and has returned the control for the content area
-	 * of the dialog. Invoking the method before the content area has been set
-	 * or after the dialog has been disposed will have no effect.
-	 * 
-	 * @since 3.1
-	 */
-	protected final void showDetailsArea() {
-		if (!listCreated) {
-			Control control = getContents();
-			if (control != null && !control.isDisposed())
-				toggleDetailsArea();
-		}
-	}
-
-	/**
-	 * Return whether the Details button should be included. This method is
-	 * invoked once when the dialog is built. By default, the Details button is
-	 * only included if the status used when creating the dialog was a
-	 * multi-status or if the status contains an exception. Subclasses may
-	 * override.
-	 * 
-	 * @return whether the Details button should be included
-	 * @since 3.1
-	 */
-	protected boolean shouldShowDetailsButton() {
-		return status.isMultiStatus() || status.getException() != null;
-	}
-
-	/**
-	 * Set the status displayed by this error dialog to the given status. This
-	 * only affects the status displayed by the Details list. The message, image
-	 * and title should be updated by the subclass, if desired.
-	 * 
-	 * @param status
-	 *            the status to be displayed in the details list
-	 * @since 3.1
-	 */
-	protected final void setStatus(IStatus status) {
-		if (this.status != status) {
-			this.status = status;
-		}
-		shouldIncludeTopLevelErrorInDetails = true;
-		if (listCreated) {
-			repopulateList();
-		}
-	}
-
-	/**
-	 * Repopulate the supplied list widget.
-	 */
-	private void repopulateList() {
-		if (list != null && !list.isDisposed()) {
-			list.removeAll();
-			populateList(list);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/ILibraryExtensionVersionCheck.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/ILibraryExtensionVersionCheck.java
deleted file mode 100755
index e8283ff..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/ILibraryExtensionVersionCheck.java
+++ /dev/null
@@ -1,37 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.serviceability;
-
-import java.io.File;
-
-import org.eclipse.epf.common.serviceability.VersionUtil.VersionCheckInfo;
-
-/**
- * The interface for performing method library version check.
- * 
- * @author Jeff Hardy
- * @since 1.0
- */
-public interface ILibraryExtensionVersionCheck {
-
-	/**
-	 * Checks and returns the version information associated with a method
-	 * library.
-	 * 
-	 * @param file
-	 *            a method library XMI file
-	 * @return <code>null</code> if the library XMI file does not contain the
-	 *         version information of the tool that created it; or
-	 *         <code>VersionCheckInfo</code> object
-	 */
-	public VersionCheckInfo checkLibraryVersion(File libPath);
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/Logger.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/Logger.java
deleted file mode 100755
index 3038f86..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/Logger.java
+++ /dev/null
@@ -1,132 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.serviceability;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-
-/**
- * Generic logger used for logging status messages, warning messages, error
- * messages, and exception stack traces.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class Logger {
-
-	// The plug-in instance.
-	private AbstractPlugin plugin;
-
-	// The plug-in ID.
-	private String pluginId;
-
-	/**
-	 * Create a new <code>Logger</code> given the plug-in instance.
-	 * 
-	 * @param plugin
-	 *            The plugin instance.
-	 */
-	public Logger(AbstractPlugin plugin) {
-		this.plugin = plugin;
-		this.pluginId = plugin.getId();
-	}
-
-	/**
-	 * Logs the given error message.
-	 * 
-	 * @param msg
-	 *            The error message.
-	 */
-	public void logError(String msg) {
-		logMsg(IStatus.ERROR, msg, null);
-	}
-
-	/**
-	 * Logs the given exception.
-	 * 
-	 * @param ex
-	 *            The exception.
-	 */
-	public void logError(Throwable ex) {
-		logMsg(IStatus.ERROR, null, ex);
-	}
-
-	/**
-	 * Logs the given error message and exception.
-	 * 
-	 * @param msg
-	 *            The error message.
-	 * @param ex
-	 *            The exception.
-	 */
-	public void logError(String msg, Throwable ex) {
-		logMsg(IStatus.ERROR, msg, ex);
-	}
-
-	/**
-	 * Logs the given warning message.
-	 * 
-	 * @param msg
-	 *            The warning message.
-	 */
-	public void logWarning(String msg) {
-		logMsg(IStatus.WARNING, msg, null);
-	}
-
-	/**
-	 * Logs the given warning message and exception.
-	 * 
-	 * @param msg
-	 *            The warning message.
-	 * @param ex
-	 *            The exception.
-	 */
-	public void logWarning(String msg, Throwable ex) {
-		logMsg(IStatus.WARNING, msg, ex);
-	}
-
-	/**
-	 * Logs the given status message and exception.
-	 * 
-	 * @param msg
-	 *            The status message.
-	 */
-	public void logInfo(String msg) {
-		logMsg(IStatus.INFO, msg, null);
-	}
-
-	/**
-	 * Logs the given message and exception.
-	 * 
-	 * @param severity
-	 *            The severity.
-	 * @param msg
-	 *            The message.
-	 * @param ex
-	 *            The exception.
-	 */
-	public synchronized void logMsg(int severity, String msg, Throwable ex) {
-		if (msg == null && ex != null) {
-			msg = ex.getMessage(); //$NON-NLS-1$
-		}
-
-		if (msg == null) {
-			msg = ""; //$NON-NLS-1$
-		}
-
-		Status status = new Status(severity, pluginId, IStatus.OK, msg, ex);
-
-		// Call the Eclipse Logger.
-		plugin.getLog().log(status);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/MsgBox.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/MsgBox.java
deleted file mode 100755
index 1fc1529..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/MsgBox.java
+++ /dev/null
@@ -1,123 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.serviceability;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Helper class to display a message box.
- * 
- * @author Phong Nguyen Le
- * @author Kelvin Low
- * @since 1.0
- */
-public final class MsgBox {
-	/**
-	 * Use this method to show error message if you don't want long path to be
-	 * cut off.
-	 * 
-	 * @param msg
-	 */
-	public static final void nativeShowError(Shell shell, String msg) {
-		if (shell == null) {
-			shell = getDefaultShell();
-			if (shell == null) {
-				return;
-			}
-		}
-		MessageBox msgBox = new MessageBox(shell, SWT.OK | SWT.ICON_ERROR);
-		msgBox.setMessage(msg);
-		msgBox.setText(shell.getText());
-		msgBox.open();
-	}
-
-	public static final void showError(String msg) {
-		showError(getDefaultShell(), msg);
-	}
-
-	public static final void showError(Shell shell, String msg) {
-		WrappedMessageDialog.openError(shell, shell == null ? null : shell
-				.getText(), msg);
-	}
-
-	public static final void showWarning(String msg) {
-		showWarning(getDefaultShell(), msg);
-	}
-
-	public static final void showWarning(Shell shell, String msg) {
-		WrappedMessageDialog.openWarning(shell, shell == null ? null : shell
-				.getText(), msg);
-	}
-
-	public static final Shell getDefaultShell() {
-		try {
-			Display d = Display.getCurrent();
-			if (d == null) {
-				d = Display.getDefault();
-			}
-
-			Shell s = null;
-			if (d != null) {
-				s = d.getActiveShell();
-			}
-
-			return s;
-		} catch (RuntimeException e) {
-			return null;
-		}
-	}
-
-	public static final Display getDisplay() {
-		try {
-			Display d = Display.getCurrent();
-			if (d == null) {
-				d = Display.getDefault();
-			}
-
-			return d;
-		} catch (RuntimeException e) {
-			return null;
-		}
-	}
-
-	public static final int prompt(String msg) {
-		return prompt(getDefaultShell(), msg);
-	}
-
-	public static final int prompt(Shell shell, String msg) {
-		return prompt(shell, null, msg, SWT.YES | SWT.NO | SWT.CANCEL);
-	}
-
-	public static final int prompt(String msg, int buttons) {
-		return prompt(getDefaultShell(), null, msg, buttons);
-	}
-
-	public static final int prompt(String title, String msg, int buttons) {
-		return prompt(getDefaultShell(), title, msg, buttons);
-	}
-
-	public static final int prompt(Shell shell, String msg, int buttons) {
-		return prompt(shell, null, msg, buttons);
-	}
-
-	public static final int prompt(Shell shell, String title, String msg,
-			int buttons) {
-		MessageBox msgBox = new MessageBox(shell, buttons | SWT.ICON_QUESTION);
-		msgBox.setText(title != null && title.length() > 0 ? title : shell
-				.getText());
-		msgBox.setMessage(msg);
-		return msgBox.open();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/MsgDialog.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/MsgDialog.java
deleted file mode 100755
index 6ebd56c..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/MsgDialog.java
+++ /dev/null
@@ -1,614 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.serviceability;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A message dialog used for displaying error, warning, confirmation or
- * informational messages.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class MsgDialog {
-
-	// The plug-in instance.
-	private AbstractPlugin plugin;
-
-	// The plug-in ID.
-	private String pluginId;
-
-	// The plug-in logger.
-	private Logger logger;
-
-	/**
-	 * Create a new instance given the plug-in instance.
-	 * 
-	 * @param plugin
-	 *            The plugin instance.
-	 */
-	public MsgDialog(AbstractPlugin plugin) {
-		this.plugin = plugin;
-		this.pluginId = plugin.getId();
-		this.logger = plugin.getLogger();
-	}
-
-	/**
-	 * Displays the given error message in an error dialog without the error
-	 * reason and Details button.
-	 * <p>
-	 * Note: The error message will be written to the log file.
-	 * 
-	 * @param title
-	 *            The title for the error dialog.
-	 * @param msg
-	 *            The error message.
-	 */
-	public void displayError(String title, String msg) {
-		display(IStatus.ERROR, title, msg, null, null, null);
-	}
-
-	/**
-	 * Displays the given error message in an error dialog without the error
-	 * reason and Details button.
-	 * <p>
-	 * Note: The error message and the exception stack trace will be written to
-	 * the log file.
-	 * 
-	 * @param title
-	 *            The title for the error dialog.
-	 * @param msg
-	 *            The error message.
-	 * @param ex
-	 *            The exception associated with the error.
-	 */
-	public void displayError(String title, String msg, Throwable ex) {
-		display(IStatus.ERROR, title, msg, null, null, ex);
-	}
-
-	/**
-	 * Displays the given error message in an error dialog without the Details
-	 * button.
-	 * <p>
-	 * Note: The error message will be written to the log file.
-	 * 
-	 * @param title
-	 *            The title for the error dialog.
-	 * @param msg
-	 *            The error message.
-	 * @param reason
-	 *            The reason for the error.
-	 */
-	public void displayError(String title, String msg, String reason) {
-		display(IStatus.ERROR, title, msg, reason, null, null);
-	}
-
-	/**
-	 * Displays the given error message in an error dialog without the Details
-	 * button.
-	 * <p>
-	 * Note: The error message and the exception stack trace will be written to
-	 * the log file.
-	 * 
-	 * @param title
-	 *            The title for the error dialog.
-	 * @param msg
-	 *            The error message.
-	 * @param reason
-	 *            The reason for the error.
-	 * @param ex
-	 *            The exception associated with the error.
-	 */
-	public void displayError(String title, String msg, String reason,
-			Throwable ex) {
-		display(IStatus.ERROR, title, msg, reason, null, ex);
-	}
-
-	/**
-	 * Displays the given error message in an error dialog. The Details button
-	 * will be displayed if the <code>details</code> parameter it not null or
-	 * empty.
-	 * <p>
-	 * Note: The error message will be written to the log file.
-	 * 
-	 * @param title
-	 *            The title for the error dialog.
-	 * @param msg
-	 *            The error message.
-	 * @param reason
-	 *            The reason for the error.
-	 * @param details
-	 *            The error details.
-	 */
-	public void displayError(String title, String msg, String reason,
-			String details) {
-		display(IStatus.ERROR, title, msg, reason, details, null);
-	}
-
-	/**
-	 * Displays the given error message in an error dialog. The Details button
-	 * will be displayed if the <code>details</code> parameter it not null or
-	 * empty.
-	 * <p>
-	 * Note: The error message and the exception stack trace will be written to
-	 * the log file.
-	 * 
-	 * @param title
-	 *            The title for the error dialog.
-	 * @param msg
-	 *            The error message.
-	 * @param reason
-	 *            The reason for the error.
-	 * @param details
-	 *            The error details.
-	 * @param ex
-	 *            The exception associated with the error.
-	 */
-	public void displayError(String title, String msg, String reason,
-			String details, Throwable ex) {
-		display(IStatus.ERROR, title, msg, reason, details, ex);
-	}
-
-	/**
-	 * Displays the given error status in an error dialog.
-	 * <p>
-	 * Note: The error message and the exception stack trace will be written to
-	 * the log file.
-	 * 
-	 * @param title
-	 *            The title for the error dialog.
-	 * @param status
-	 *            The error status.
-	 */
-	public int displayError(String title, IStatus status) {
-		return display(title, null, status);
-	}
-
-	/**
-	 * Displays the given error status in an error dialog.
-	 * <p>
-	 * Note: The error message and the exception stack trace will be written to
-	 * the log file.
-	 * 
-	 * @param title
-	 *            The title for the error dialog.
-	 * @param msg
-	 *            The error message.
-	 * @param status
-	 *            The error status.
-	 */
-	public int displayError(String title, String msg, IStatus status) {
-		return display(title, msg, status);
-	}
-
-	/**
-	 * Displays the given warning message in a warning dialog without the
-	 * warning reason and Details button.
-	 * <p>
-	 * Note: The waning message will be written to the log file.
-	 * 
-	 * @param title
-	 *            The title for the warning dialog.
-	 * @param msg
-	 *            The warning message.
-	 */
-	public void displayWarning(String title, String msg) {
-		display(IStatus.WARNING, title, msg, null, null, null);
-	}
-
-	/**
-	 * Displays the given warning message in a warning dialog without the
-	 * warning reason and Details button.
-	 * <p>
-	 * Note: The warning message and the exception stack trace will be written
-	 * to the log file.
-	 * 
-	 * @param title
-	 *            The title for the warning dialog.
-	 * @param msg
-	 *            The warning message.
-	 * @param ex
-	 *            The exception associated with the warning.
-	 */
-	public void displayWarning(String title, String msg, Throwable ex) {
-		display(IStatus.WARNING, title, msg, null, null, ex);
-	}
-
-	/**
-	 * Displays the given warning message in a warning dialog without the
-	 * warning reason and Details button.
-	 * <p>
-	 * Note: The waning message will be written to the log file.
-	 * 
-	 * @param title
-	 *            The title for the warning dialog.
-	 * @param msg
-	 *            The warning message.
-	 * @param reason
-	 *            The reason for the warning.
-	 */
-	public void displayWarning(String title, String msg, String reason) {
-		display(IStatus.WARNING, title, msg, reason, null, null);
-	}
-
-	/**
-	 * Displays the given warning message in a warning dialog without the
-	 * warning reason and Details button.
-	 * <p>
-	 * Note: The warning message and the exception stack trace will be written
-	 * to the log file.
-	 * 
-	 * @param title
-	 *            The title for the warning dialog.
-	 * @param msg
-	 *            The warning message.
-	 * @param reason
-	 *            The reason for the warning.
-	 * @param ex
-	 *            The exception associated with the warning.
-	 */
-	public void displayWarning(String title, String msg, String reason,
-			Throwable ex) {
-		display(IStatus.WARNING, title, msg, reason, null, ex);
-	}
-
-	/**
-	 * Displays the given warning message in a warning dialog. The Details
-	 * button will be displayed if the <code>details</code> parameter it not
-	 * null or empty.
-	 * <p>
-	 * Note: The waning message will be written to the log file.
-	 * 
-	 * @param title
-	 *            The title for the error dialog.
-	 * @param msg
-	 *            The warning message.
-	 * @param reason
-	 *            The reason for the warning.
-	 * @param details
-	 *            The warning details.
-	 */
-	public void displayWarning(String title, String msg, String reason,
-			String details) {
-		display(IStatus.WARNING, title, msg, reason, details, null);
-	}
-
-	/**
-	 * Displays the given warning message in a warning dialog. The Details
-	 * button will be displayed if the <code>details</code> parameter it not
-	 * null or empty.
-	 * <p>
-	 * Note: The warning message and the exception stack trace will be written
-	 * to the log file.
-	 * 
-	 * @param title
-	 *            The title for the error dialog.
-	 * @param msg
-	 *            The warning message.
-	 * @param reason
-	 *            The reason for the warning.
-	 * @param details
-	 *            The warning details.
-	 * @param ex
-	 *            The exception associated with the warning.
-	 */
-	public void displayWarning(String title, String msg, String reason,
-			String details, Throwable ex) {
-		display(IStatus.WARNING, title, msg, reason, details, ex);
-	}
-
-	/**
-	 * Displays the given warning status in an error dialog.
-	 * <p>
-	 * Note: The warning message and the exception stack trace will be written
-	 * to the log file.
-	 * 
-	 * @param title
-	 *            The title for the error dialog.
-	 * @param status
-	 *            The error status.
-	 */
-	public void displayWarning(String title, IStatus status) {
-		display(title, null, status);
-	}
-
-	/**
-	 * Displays the given warning status in an error dialog.
-	 * <p>
-	 * Note: The warning message and the exception stack trace will be written
-	 * to the log file.
-	 * 
-	 * @param title
-	 *            The title for the error dialog.
-	 * @param msg
-	 *            The error message.
-	 * @param status
-	 *            The error status.
-	 */
-	public void displayWarning(String title, String msg, IStatus status) {
-		display(title, msg, status);
-	}
-
-	/**
-	 * Displays the given error or warning message in an error or warning
-	 * dialog. The Details button will be displayed if the <code>details</code>
-	 * parameter it not null or empty.
-	 * 
-	 * @param severity
-	 *            The severity, either IStatus.ERROR or IStatus.WARNING.
-	 * @param title
-	 *            The title for the error dialog.
-	 * @param msg
-	 *            The error message.
-	 * @param reason
-	 *            The reason for the error.
-	 * @param details
-	 *            The error details.
-	 * @param ex
-	 *            The exception associated with the error.
-	 */
-	public synchronized void display(int severity, String title, String msg,
-			String reason, String details, Throwable ex) {
-		if (msg == null && ex != null) {
-			msg = ex.getMessage();
-		}
-
-		if (msg == null) {
-			msg = ""; //$NON-NLS-1$
-		}
-
-		if (severity == IStatus.ERROR || severity == IStatus.WARNING) {
-			logger.logMsg(severity, msg, ex);
-		} else {
-			throw new IllegalArgumentException(
-					"severity argument must be IStatus.ERROR or IStatus.WARNING"); //$NON-NLS-1$
-		}
-
-		Image oldImage = org.eclipse.jface.dialogs.ErrorDialog
-				.getDefaultImage();
-		Image shellImage = getShellImage();
-		if (shellImage != null) {
-			ErrorDialog.setDefaultImage(shellImage);
-		}
-
-		Shell shell = plugin.getWorkbench().getDisplay().getActiveShell();
-
-		if (details != null && details.length() > 0) {
-			MultiStatus mStatus = new MultiStatus(pluginId, IStatus.OK, reason,
-					ex);
-			Status status = new Status(severity, pluginId, IStatus.OK, details,
-					ex);
-			mStatus.add(status);
-			org.eclipse.jface.dialogs.ErrorDialog.openError(shell, title, msg,
-					mStatus);
-		} else if (reason != null && reason.length() > 0) {
-			Status status = new Status(severity, pluginId, IStatus.OK, reason,
-					ex);
-			org.eclipse.jface.dialogs.ErrorDialog.openError(shell, title, msg,
-					status);
-		} else {
-			if (severity == IStatus.ERROR) {
-				WrappedMessageDialog.openError(shell, title, msg);
-			} else if (severity == IStatus.WARNING) {
-				WrappedMessageDialog.openWarning(shell, title, msg);
-			}
-		}
-
-		if (shellImage != null) {
-			ErrorDialog.setDefaultImage(oldImage);
-		}
-	}
-
-	/**
-	 * Displays the given error or warning message in an error or warning
-	 * dialog. The Details button will be displayed if the <code>details</code>
-	 * parameter it not null or empty.
-	 * 
-	 * @param title
-	 *            The title for the error dialog.
-	 * @param status
-	 *            The error status.
-	 */
-	public synchronized int display(String title, IStatus status) {
-		return display(title, null, status);
-	}
-
-	/**
-	 * Displays the given error or warning message in an error or warning
-	 * dialog. The Details button will be displayed if the <code>details</code>
-	 * parameter it not null or empty.
-	 * 
-	 * @param title
-	 *            The title for the error dialog.
-	 * @param msg
-	 *            The error message.
-	 * @param status
-	 *            The error status.
-	 */
-	public synchronized int display(String title, String msg, IStatus status) {
-		if (status == null) {
-			throw new IllegalArgumentException("status argument cannot be null"); //$NON-NLS-1$
-		}
-
-		if (msg == null) {
-			msg = status.getMessage();
-		}
-		if (msg == null) {
-			msg = ""; //$NON-NLS-1$
-		}
-
-		int severity = status.getSeverity();
-		if (severity == IStatus.ERROR || severity == IStatus.WARNING) {
-			logger.logMsg(severity, msg, status.getException());
-		}
-
-		Image oldImage = org.eclipse.jface.dialogs.ErrorDialog
-				.getDefaultImage();
-		Image shellImage = getShellImage();
-		if (shellImage != null) {
-			ErrorDialog.setDefaultImage(shellImage);
-		}
-
-		Shell shell = plugin.getWorkbench().getDisplay().getActiveShell();
-
-		int rc = org.eclipse.jface.dialogs.ErrorDialog.openError(shell, title,
-				msg, status);
-
-		if (shellImage != null) {
-			ErrorDialog.setDefaultImage(oldImage);
-		}
-
-		return rc;
-	}
-
-	/**
-	 * Displays the given message in a informational dialog with an "OK" button.
-	 * 
-	 * @param title
-	 *            The title for the information dialog.
-	 * @param msg
-	 *            The message to display.
-	 */
-	public void displayInfo(String title, String msg) {
-		if (msg == null) {
-			msg = ""; //$NON-NLS-1$
-		}
-
-		Image oldImage = WrappedMessageDialog.getDefaultImage();
-		Image shellImage = getShellImage();
-		if (shellImage != null) {
-			WrappedMessageDialog.setDefaultImage(shellImage);
-		}
-
-		Shell shell = plugin.getWorkbench().getDisplay().getActiveShell();
-		WrappedMessageDialog.openInformation(shell, title, msg);
-
-		if (shellImage != null) {
-			WrappedMessageDialog.setDefaultImage(oldImage);
-		}
-	}
-
-	/**
-	 * Displays the given message in a question dialog with a "Yes" and "No"
-	 * button.
-	 * 
-	 * @param title
-	 *            The title for the information dialog.
-	 * @param msg
-	 *            The message to display.
-	 */
-	public boolean displayPrompt(String title, String msg) {
-		if (msg == null) {
-			msg = ""; //$NON-NLS-1$
-		}
-
-		Image oldImage = WrappedMessageDialog.getDefaultImage();
-		Image shellImage = getShellImage();
-		if (shellImage != null) {
-			WrappedMessageDialog.setDefaultImage(shellImage);
-		}
-
-		Shell shell = plugin.getWorkbench().getDisplay().getActiveShell();
-		boolean result = WrappedMessageDialog.openQuestion(shell, title, msg);
-
-		if (shellImage != null) {
-			WrappedMessageDialog.setDefaultImage(oldImage);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Displays the given message in a confirmation dialog with a "Yes" and
-	 * "Cancel" button.
-	 * 
-	 * @param title
-	 *            The title for the information dialog.
-	 * @param msg
-	 *            The message to display.
-	 */
-	public boolean displayConfirmation(String title, String msg) {
-		if (msg == null) {
-			msg = ""; //$NON-NLS-1$
-		}
-
-		Image oldImage = WrappedMessageDialog.getDefaultImage();
-		Image shellImage = getShellImage();
-		if (shellImage != null) {
-			WrappedMessageDialog.setDefaultImage(shellImage);
-		}
-
-		Shell shell = plugin.getWorkbench().getDisplay().getActiveShell();
-		boolean result = WrappedMessageDialog.openConfirm(shell, title, msg);
-
-		if (shellImage != null) {
-			WrappedMessageDialog.setDefaultImage(oldImage);
-		}
-
-		return result;
-	}
-
-	public int displayConfirmation(String title, String msg, IStatus status) {
-		if (status == null) {
-			throw new IllegalArgumentException("status argument cannot be null"); //$NON-NLS-1$
-		}
-
-		if (msg == null) {
-			msg = status.getMessage();
-		}
-		if (msg == null) {
-			msg = ""; //$NON-NLS-1$
-		}
-
-		Image shellImage = getShellImage();
-		if (shellImage != null) {
-			ErrorDialogNoReason.setDefaultImage(shellImage);
-		}
-
-		Shell shell = plugin.getWorkbench().getDisplay().getActiveShell();
-
-		int rc = ErrorDialogNoReason.openError(shell, title, msg, status);
-
-		return rc;
-
-	}
-
-	/**
-	 * Returns the image for the current shell.
-	 * 
-	 * @return The current shell image.
-	 */
-	private Image getShellImage() {
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		if (workbench != null) {
-			IWorkbenchWindow workbenchWindow = workbench
-					.getActiveWorkbenchWindow();
-			if (workbenchWindow != null) {
-				Shell shell = workbenchWindow.getShell();
-				if (shell != null) {
-					return shell.getImage();
-				}
-			}
-		}
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/VersionMismatchException.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/VersionMismatchException.java
deleted file mode 100755
index a773412..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/VersionMismatchException.java
+++ /dev/null
@@ -1,47 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.serviceability;
-
-import org.osgi.framework.Version;
-
-/**
- * Signals that the current version of the tool is not compatible with the
- * method library it is trying to open.
- * 
- * @author Jeff Hardy
- * @since 1.0
- */
-public class VersionMismatchException extends RuntimeException {
-
-	private static final long serialVersionUID = 1L;
-
-	private Version expected;
-
-	private Version actual;
-
-	public VersionMismatchException(Version expected, String actual) {
-		super();
-		this.expected = expected;
-		if (actual == null) {
-			this.actual = Version.emptyVersion;
-		} else {
-			this.actual = new Version(actual);
-		}
-	}
-
-	public Version getActual() {
-		return actual;
-	}
-
-	public Version getExpected() {
-		return expected;
-	}
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/VersionUtil.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/VersionUtil.java
deleted file mode 100755
index 8d6e428..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/VersionUtil.java
+++ /dev/null
@@ -1,473 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.serviceability;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.common.CommonPlugin;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Version;
-
-/**
- * Provides utilities to query a method library schema and the version of the
- * tool that created it.
- * 
- * @author Jeff Hardy
- * @since 1.0
- */
-public class VersionUtil {
-
-	public static class VersionCheckInfo {
-		public VersionCheckInfo(String id, String toolVersion,
-				String currentMinToolVersion, int result) {
-			this.toolID = id;
-			this.toolVersion = toolVersion;
-			this.currentMinToolVersion = currentMinToolVersion;
-			this.result = result;
-		}
-
-		public String toolID;
-
-		public String toolVersion;
-
-		public String currentMinToolVersion;
-
-		/**
-		 * < 0: fileToolVersion is older than currentMinToolVersion <br/> == 0:
-		 * match <br/> > 0 : fileToolVersion is newer than currentMinToolVersion
-		 * <br/>
-		 */
-		public int result;
-	}
-
-	/**
-	 * The extension point namespace.
-	 */
-	public static final String EXTENSION_POINT_NAMESPACE = CommonPlugin.class
-			.getPackage().getName();
-
-	/**
-	 * The extension point name.
-	 */
-	public static final String EXTENSION_POINT_NAME = "version"; //$NON-NLS-1$
-
-	public static final String EXTENSION_VERSIONS_INFO = "versions"; //$NON-NLS-1$
-
-	public static final String EXTENSION_LIB_EXTENSION_CHECK = "libraryExtensionVersionCheck"; //$NON-NLS-1$
-
-	private static final String DISABLE_VERSION_CHECKING_PREF = "disable_version_checking"; //$NON-NLS-1$
-
-	public static Map versions = new LinkedHashMap();
-
-	public static Map libExtCheckers = new LinkedHashMap();
-
-	protected static boolean versionCheckingDisabled = false;
-
-	/**
-	 * List of toolIDs to check, in order
-	 */
-	private static List toolIDsCheckList = new ArrayList();
-
-	static {
-		toolIDsCheckList.add(EPFVersions.TOOL_ID);
-
-		// read properties file
-		try {
-			String valueStr = CommonPlugin.getDefault().getPreferenceStore()
-					.getString(DISABLE_VERSION_CHECKING_PREF);
-			versionCheckingDisabled = Boolean.valueOf(valueStr).booleanValue();
-		} catch (MissingResourceException e) {
-			versionCheckingDisabled = false;
-		}
-
-		// Process the "org.eclipse.epf.common.version" extension point
-		// contributors.
-		IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(
-				EXTENSION_POINT_NAMESPACE, EXTENSION_POINT_NAME);
-		if (extensionPoint != null) {
-			IExtension[] extensions = extensionPoint.getExtensions();
-			for (int i = 0; i < extensions.length; i++) {
-				IExtension extension = extensions[i];
-				initExtension(extension);
-			}
-		}
-
-	}
-
-	protected static void initExtension(IExtension extension) {
-		String extensionID = extension.getSimpleIdentifier();
-		String pluginId = extension.getNamespaceIdentifier();
-		Bundle bundle = Platform.getBundle(pluginId);
-		IConfigurationElement[] configElements = extension
-				.getConfigurationElements();
-		for (int j = 0; j < configElements.length; j++) {
-			IConfigurationElement configElement = configElements[j];
-			try {
-				if (EXTENSION_VERSIONS_INFO.equals(configElement.getName())) {
-					String className = configElement.getAttribute("class"); //$NON-NLS-1$
-					if (className != null) {
-						versions.put(extensionID, (EPFVersions) bundle
-								.loadClass(className).newInstance());
-						break;
-					}
-				}
-				if (EXTENSION_LIB_EXTENSION_CHECK.equals(configElement
-						.getName())) {
-					String className = configElement.getAttribute("class"); //$NON-NLS-1$
-					if (className != null) {
-						libExtCheckers.put(extensionID,
-								(ILibraryExtensionVersionCheck) bundle
-										.loadClass(className).newInstance());
-						break;
-					}
-				}
-			} catch (Exception e) {
-				CommonPlugin.getDefault().getLogger().logError(e);
-			}
-		}
-	}
-
-	/**
-	 * 
-	 * @return the map of Tool IDs-to-Versions class
-	 */
-	public static Map getVersionsMap() {
-		return Collections.unmodifiableMap(versions);
-	}
-
-	/**
-	 * 
-	 * @return a Set of all known Tool IDs
-	 */
-	public static Set getAllToolIDs() {
-		return Collections.unmodifiableSet(versions.keySet());
-	}
-
-	/**
-	 * 
-	 * @param toolID
-	 * @return The Versions class for the given Tool ID
-	 */
-	public static EPFVersions getVersions(String toolID) {
-		return (EPFVersions) versions.get(toolID);
-	}
-
-	/**
-	 * 
-	 * @return true iff version checking is disabled
-	 */
-	public static boolean isVersionCheckingDisabled() {
-		return versionCheckingDisabled;
-	}
-
-	public static final Pattern p_XMIVersionPattern = Pattern.compile(
-			"(\\w+?):version=\"(.+?)\"", Pattern.DOTALL); //$NON-NLS-1$
-
-	public static final Pattern p_XMLVersionAttributePattern = Pattern.compile(
-			"tool=\"(.*?)\"", Pattern.DOTALL); //$NON-NLS-1$
-
-	public static final Pattern p_XMI_ELEMENT_START_TAG = Pattern
-			.compile("<?xml version=\".+?\" encoding=\".+?\"?>"); //$NON-NLS-1$
-
-	public static final String XML_ELEMENT_END_TAG = ">"; //$NON-NLS-1$
-
-	public static final String XMI_ATTRIBUTE_TAG = "xmi"; //$NON-NLS-1$
-
-	public static final String XML_ELEMENT_START_TAG = "<uma:MethodLibrary"; //$NON-NLS-1$
-
-	public static final String XML_VERSIONS_SEPARATOR = ";"; //$NON-NLS-1$
-
-	public static final String XML_TOOL_VERSION_SEPARATOR = "="; //$NON-NLS-1$
-
-	/**
-	 * Given an XML file, will read the tool="foo=a.b.c.d;bar=w.x.y.z"
-	 * attributes and return a map of the id-to-versions.
-	 * 
-	 * @param xmlFile
-	 *            file to process
-	 * @return null if no versions found; a map of the id-to-versions otherwise
-	 */
-	protected static Map readVersionsFromXMLFile(File xmlFile) {
-		Map versions = new LinkedHashMap();
-		StringBuffer buf = null;
-		try {
-			buf = FileUtil.readFile(xmlFile, FileUtil.ENCODING_UTF_8);
-		} catch (Exception ex) {
-			CommonPlugin.getDefault().getLogger().logError(ex);
-		}
-		if (buf != null) {
-			int xmiElementStartIdx = buf.indexOf(XML_ELEMENT_START_TAG);
-			if (xmiElementStartIdx != -1) {
-				int xmiElementEndIdx = buf.indexOf(XML_ELEMENT_END_TAG,
-						xmiElementStartIdx + XML_ELEMENT_START_TAG.length());
-				if (xmiElementEndIdx != -1) {
-					String rootElement = buf.substring(xmiElementStartIdx,
-							xmiElementEndIdx);
-					Matcher mAttribute = p_XMLVersionAttributePattern
-							.matcher(rootElement);
-					if (mAttribute.find()) {
-						String toolsAttribute = mAttribute.group(1);
-						if (toolsAttribute != null
-								&& toolsAttribute.length() > 0) {
-							String[] versionsArray = StrUtil.split(
-									toolsAttribute, XML_VERSIONS_SEPARATOR);
-							for (int i = 0; i < versionsArray.length; i++) {
-								if (versionsArray[i] != null
-										&& versionsArray[i].length() > 0) {
-									String[] versionInfoArray = StrUtil.split(
-											versionsArray[i],
-											XML_TOOL_VERSION_SEPARATOR);
-									if (versionInfoArray.length != 2)
-										continue;
-									String toolID = versionInfoArray[0];
-									String toolVersion = versionInfoArray[1];
-									if (toolID != null
-											&& toolID.trim().length() > 0
-											&& toolVersion != null
-											&& toolVersion.trim().length() > 0)
-										versions.put(toolID, toolVersion);
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		if (versions.size() == 0) {
-			return null;
-		} else {
-			return versions;
-		}
-	}
-
-	/**
-	 * Given an XMI file, will read the foo:version="x.x.x" attributes and
-	 * return a map of the id-to-versions.
-	 * 
-	 * @param xmlFile
-	 *            file to process
-	 * @return null if no versions found; a map of the id-to-versions otherwise
-	 */
-	protected static Map readVersionsFromXMIFile(File xmiFile) {
-		Map versions = new LinkedHashMap();
-		StringBuffer buf = null;
-		try {
-			buf = FileUtil.readFile(xmiFile, FileUtil.ENCODING_UTF_8);
-		} catch (Exception ex) {
-			CommonPlugin.getDefault().getLogger().logError(ex);
-		}
-		if (buf != null) {
-			Matcher docStartMatcher = p_XMI_ELEMENT_START_TAG.matcher(buf);
-			if (docStartMatcher.find()) {
-				int docHeaderEndIdx = docStartMatcher.end();
-				int xmiElementEndIdx = buf.indexOf(XML_ELEMENT_END_TAG,
-						docHeaderEndIdx);
-				if (xmiElementEndIdx != -1) {
-					String rootElement = buf.substring(docHeaderEndIdx,
-							xmiElementEndIdx + 1);
-					Matcher m = p_XMIVersionPattern.matcher(rootElement);
-					while (m.find()) {
-						String toolID = m.group(1);
-						if (toolID.equals(XMI_ATTRIBUTE_TAG))
-							continue;
-						String toolVersion = m.group(2);
-						if (toolID != null && toolID.trim().length() > 0
-								&& toolVersion != null
-								&& toolVersion.trim().length() > 0)
-							versions.put(toolID, toolVersion);
-					}
-				}
-			}
-		}
-		if (versions.size() == 0) {
-			return null;
-		} else {
-			return versions;
-		}
-	}
-
-	/**
-	 * Given a file, will read version information and return a map of the
-	 * id-to-versions.
-	 * 
-	 * @param file
-	 *            file to process
-	 * @return null if no versions found; a map of the id-to-versions otherwise
-	 */
-	public static Map readVersionsFromFile(File file) {
-		if (file.getName().toUpperCase().endsWith("XMI")) { //$NON-NLS-1$
-			return readVersionsFromXMIFile(file);
-		} else if (file.getName().toUpperCase().endsWith("XML")) { //$NON-NLS-1$
-			return readVersionsFromXMLFile(file);
-		} else {
-			Map versions = readVersionsFromXMIFile(file);
-			if (versions != null)
-				return versions;
-			versions = readVersionsFromXMLFile(file);
-			if (versions != null)
-				return versions;
-		}
-		return null;
-	}
-
-	/**
-	 * Given a file, will compare with current XML Schema version.
-	 * 
-	 * @param file
-	 * @return null if file tool version can not be found; a VersionCheckInfo
-	 *         object otherwise
-	 */
-	public static VersionCheckInfo checkXMLVersion(File file) {
-		Map versionMap = VersionUtil.readVersionsFromFile(file);
-		if (versionMap == null) {
-			return null;
-		} else {
-			VersionCheckInfo vci = null;
-			for (Iterator iter = toolIDsCheckList.iterator(); iter.hasNext();) {
-				String toolID = (String) iter.next();
-				if (versionMap.get(toolID) != null) {
-					String toolVersion = (String) versionMap.get(toolID);
-					vci = _checkXMLVersion(toolID, toolVersion);
-					if (vci != null)
-						return vci;
-				}
-			}
-		}
-		return null;
-	}
-
-	private static VersionCheckInfo _checkXMLVersion(String toolID,
-			String toolVersion) {
-		// get the class that stores all the version info for this tool ID
-		EPFVersions versions = getVersions(toolID);
-		if (versions != null) {
-			EPFVersion minCurrVersion = versions
-					.getMinToolVersionForCurrentXMLSchemaVersion();
-			int result = minCurrVersion.compareToolVersionTo(new Version(
-					toolVersion));
-			String currentMinToolVersion = minCurrVersion.getToolVersion()
-					.toString();
-			return new VersionCheckInfo(toolID, toolVersion,
-					currentMinToolVersion, -result);
-		}
-		return null;
-	}
-
-	/**
-	 * Given a file, compares with current library schema version
-	 * 
-	 * @param file
-	 * @return null if file tool version can not be found; a VersionCheckInfo
-	 *         object otherwise
-	 */
-	public static VersionCheckInfo checkLibraryVersion(File file) {
-		if (file.getName().equals("library.xmi")) { //$NON-NLS-1$
-			// check library extensions first
-			for (Iterator iter = toolIDsCheckList.iterator(); iter.hasNext();) {
-				String toolID = (String) iter.next();
-				if (libExtCheckers.get(toolID) != null) {
-					VersionCheckInfo vci = null;
-					ILibraryExtensionVersionCheck extCheck = (ILibraryExtensionVersionCheck) libExtCheckers
-							.get(toolID);
-					vci = extCheck.checkLibraryVersion(file.getParentFile());
-					if (vci != null)
-						return vci;
-				}
-			}
-		}
-		Map versionMap = VersionUtil.readVersionsFromFile(file);
-		if (versionMap == null) {
-			return null;
-		} else {
-			VersionCheckInfo vci = null;
-			for (Iterator iter = toolIDsCheckList.iterator(); iter.hasNext();) {
-				String toolID = (String) iter.next();
-				if (versionMap.get(toolID) != null) {
-					String toolVersion = (String) versionMap.get(toolID);
-					vci = _checkLibVersion(toolID, toolVersion);
-					if (vci != null)
-						return vci;
-				}
-			}
-		}
-		return null;
-	}
-
-	private static VersionCheckInfo _checkLibVersion(String toolID,
-			String toolVersion) {
-		// get the class that stores all the version info for this tool ID
-		EPFVersions versions = getVersions(toolID);
-		if (versions != null) {
-			EPFVersion minCurrVersion = versions
-					.getMinToolVersionForCurrentLibraryVersion();
-			int result = minCurrVersion.compareToolVersionTo(new Version(
-					toolVersion));
-			String currentMinToolVersion = minCurrVersion.getToolVersion()
-					.toString();
-			return new VersionCheckInfo(toolID, toolVersion,
-					currentMinToolVersion, -result);
-		}
-		return null;
-	}
-
-	/**
-	 * 
-	 * @return the first toolID that is checked. In most cases, the ID of the
-	 *         currently running application
-	 */
-	public static String getPrimaryToolID() {
-		return (String) toolIDsCheckList.get(0);
-	}
-
-	/**
-	 * Adds a tool ID to the order of tools to check.
-	 * 
-	 * @param toolID
-	 *            toolID to add
-	 * @param toolIDfollowing
-	 *            if null, adds toolID to front of list. otherwise, adds toolID
-	 *            before the specified ID
-	 * @return false iff toolIDfollowing is not null and could not be found in
-	 *         list; true otherwise
-	 */
-	public static boolean addToolID(String toolID, String toolIDfollowing) {
-		if (toolIDfollowing != null) {
-			int idx = toolIDsCheckList.indexOf(toolIDfollowing);
-			if (idx != -1) {
-				toolIDsCheckList.add(idx, toolID);
-				return true;
-			} else {
-				return false;
-			}
-		}
-		toolIDsCheckList.add(0, toolID);
-		return true;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/VersionUtil.properties b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/VersionUtil.properties
deleted file mode 100755
index a4f26e7..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/VersionUtil.properties
+++ /dev/null
@@ -1,12 +0,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
-//------------------------------------------------------------------------------
-
-versionCheckingEnabled=true
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/WrappedMessageDialog.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/WrappedMessageDialog.java
deleted file mode 100755
index 1c23202..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/WrappedMessageDialog.java
+++ /dev/null
@@ -1,150 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.serviceability;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Displays a message dialog that displays wrapped text.
- * 
- * @author Bingxue Xu
- * @since 1.0
- */
-public class WrappedMessageDialog extends MessageDialog {
-
-	public WrappedMessageDialog(Shell parentShell, String dialogTitle,
-			Image dialogTitleImage, String dialogMessage, int dialogImageType,
-			String[] dialogButtonLabels, int defaultIndex) {
-		super(parentShell, dialogTitle, dialogTitleImage, dialogMessage,
-				dialogImageType, dialogButtonLabels, defaultIndex);
-	}
-
-	protected Control createMessageArea(Composite composite) {
-
-		Control rComposite = super.createMessageArea(composite);
-
-		int minWidth = IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH;// + 300;
-		// TO-DO: need to revist the # of dialog display units and margin
-		// when in other languages
-		int charsPerLine = minWidth / 4 - 15;
-		GridData gd = (GridData) messageLabel.getLayoutData();
-		gd.minimumWidth = minWidth;
-		messageLabel.setText(addLineBreaks(message, charsPerLine));
-
-		return rComposite;
-	}
-
-	String addLineBreaks(String msg, int maxChars) {
-		// System.out.println("$$$ DEBUG: original message = " + msg);
-
-		if (msg == null)
-			return null;
-
-		StringBuffer strBuf = new StringBuffer();
-		int count = 0;
-		for (int i = 0; i < msg.length(); i++) {
-			strBuf.append(msg.charAt(i));
-			if (Character.isWhitespace(msg.charAt(i)))
-				count = 0;
-			else
-				count++;
-
-			if (count >= maxChars) {
-				if (!Character.isWhitespace(msg.charAt(i))) {
-					strBuf.append("\n"); //$NON-NLS-1$
-				}
-				count = 0;
-			}
-		}
-
-		// System.out.println("$$$ DEBUG: broken message = " +
-		// strBuf.toString());
-		return strBuf.toString();
-	}
-
-	public static boolean openConfirm(Shell parent, String title, String message) {
-		WrappedMessageDialog dialog = new WrappedMessageDialog(parent, title,
-				null, // accept
-				// the
-				// default
-				// window
-				// icon
-				message, QUESTION, new String[] { IDialogConstants.OK_LABEL,
-						IDialogConstants.CANCEL_LABEL }, 0); // OK is the
-		// default
-		return dialog.open() == 0;
-	}
-
-	public static void openError(Shell parent, String title, String message) {
-		WrappedMessageDialog dialog = new WrappedMessageDialog(parent, title,
-				null, // accept
-				// the
-				// default
-				// window
-				// icon
-				message, ERROR, new String[] { IDialogConstants.OK_LABEL }, 0); // ok
-		// is
-		// the
-		// default
-		dialog.open();
-		return;
-	}
-
-	public static void openInformation(Shell parent, String title,
-			String message) {
-		WrappedMessageDialog dialog = new WrappedMessageDialog(parent, title,
-				null, // accept
-				// the
-				// default
-				// window
-				// icon
-				message, INFORMATION,
-				new String[] { IDialogConstants.OK_LABEL }, 0);
-		// ok is the default
-		dialog.open();
-		return;
-	}
-
-	public static boolean openQuestion(Shell parent, String title,
-			String message) {
-		WrappedMessageDialog dialog = new WrappedMessageDialog(parent, title,
-				null, // accept
-				// the
-				// default
-				// window
-				// icon
-				message, QUESTION, new String[] { IDialogConstants.YES_LABEL,
-						IDialogConstants.NO_LABEL }, 0); // yes is the
-		// default
-		return dialog.open() == 0;
-	}
-
-	public static void openWarning(Shell parent, String title, String message) {
-		WrappedMessageDialog dialog = new WrappedMessageDialog(parent, title,
-				null, // accept
-				// the
-				// default
-				// window
-				// icon
-				message, WARNING, new String[] { IDialogConstants.OK_LABEL }, 0); // ok
-		// is
-		// the
-		// default
-		dialog.open();
-		return;
-	}
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/package.html b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/package.html
deleted file mode 100755
index 613347b..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides common error handling, logging and versioning services.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ClipboardUtil.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ClipboardUtil.java
deleted file mode 100755
index 65406cb..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ClipboardUtil.java
+++ /dev/null
@@ -1,77 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Display;
-import org.osgi.framework.Bundle;
-
-/**
- * Utility class for retrieving data from the clipboard.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ClipboardUtil {
-
-	private static final String SOURCE_URL = "SourceURL:"; //$NON-NLS-1$
-
-	private static Transfer htmlTransfer = null;
-
-	static {
-		if (SWT.getPlatform().equals("win32")) { //$NON-NLS-1$
-			try {
-				Bundle bundle = Platform
-						.getBundle("org.eclipse.epf.common.win32.win32.x86"); //$NON-NLS-1$
-				Class c = bundle
-						.loadClass("org.eclipse.epf.common.win32.Win32HTMLTransfer"); //$NON-NLS-1$
-				if (c != null) {
-					htmlTransfer = (Transfer) c.newInstance();
-				}
-			} catch (Exception e) {
-				htmlTransfer = null;
-			}
-		}
-	}
-
-	/**
-	 * Gets the HTML source URL from the current clipboard.
-	 * 
-	 * @return the HTML source URL or <code>null</code>
-	 */
-	public static String getHTMLSourceURL() {
-		if (htmlTransfer == null) {
-			return null;
-		}
-
-		Clipboard clipboard = new Clipboard(Display.getCurrent());
-		try {
-			String sourceURL = null;
-			String htmlContent = (String) clipboard.getContents(htmlTransfer);
-			if (htmlContent != null && htmlContent.length() > 0) {
-				int index = htmlContent.indexOf(SOURCE_URL);
-				if (index > 0) {
-					sourceURL = htmlContent.substring(index
-							+ SOURCE_URL.length());
-					sourceURL = sourceURL.substring(0, sourceURL
-							.indexOf(FileUtil.LINE_SEP));
-				}
-			}
-			return sourceURL;
-		} finally {
-			clipboard.dispose();
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/FileUtil.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/FileUtil.java
deleted file mode 100755
index 603728f..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/FileUtil.java
+++ /dev/null
@@ -1,972 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.nio.CharBuffer;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.nio.channels.OverlappingFileLockException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import org.eclipse.epf.common.CommonPlugin;
-
-/**
- * Utility class for managing directories and files.
- * 
- * @author Kelvin Low
- * @author Jinhua Xi
- * @since 1.0
- */
-public class FileUtil {
-
-	/**
-	 * Platform-specific line separator.
-	 */
-	public static final String LINE_SEP = System.getProperty("line.separator"); //$NON-NLS-1$
-
-	/**
-	 * Platform-specific file separator.
-	 */
-	public static final String FILE_SEP = System.getProperty("file.separator"); //$NON-NLS-1$
-
-	/**
-	 * Platform-specific line separator length.
-	 */
-	public static final int LINE_SEP_LENGTH = LINE_SEP.length();
-
-	/**
-	 * UNC path prefix.
-	 */
-	public static final String UNC_PATH_PREFIX = "\\\\"; //$NON-NLS-1$
-
-	/**
-	 * UNC path prefix length.
-	 */
-	public static final int UNC_PATH_PREFIX_LENGTH = UNC_PATH_PREFIX.length();
-
-	/**
-	 * ISO-8859-1 encoding.
-	 */
-	public static final String ENCODING_ISO_8859_1 = "ISO-8859-1"; //$NON-NLS-1$
-
-	/**
-	 * UTF-8 encoding.
-	 */
-	public static final String ENCODING_UTF_8 = "UTF-8";//$NON-NLS-1$
-
-	/**
-	 * Private constructor to prevent this class from being instantiated. All
-	 * methods in this class should be static.
-	 */
-	private FileUtil() {
-	}
-
-	/**
-	 * Returns the absolute path for the given file or directory.
-	 * 
-	 * @param file
-	 *            The given file or directory.
-	 * @return The absolute path of the given file or directory.
-	 */
-	public static String getAbsolutePath(File file) {
-		return file.getAbsolutePath().replace('\\', '/');
-	}
-
-	/**
-	 * Returns the absolute path for the given file or directory.
-	 * 
-	 * @param file
-	 *            The given file or directory name.
-	 * @return The absolute path of the given file or directory.
-	 */
-	public static String getAbsolutePath(String file) {
-		return getAbsolutePath(new File(file));
-	}
-
-	/**
-	 * Returns the absolute path for the given URL.
-	 * 
-	 * @param url
-	 *            The given URL.
-	 * @return The absolute path of the given URL.
-	 */
-	public static String getAbsolutePath(URL url) {
-		String pathName = url.getFile().substring(1);
-		String result = NetUtil.decodeUrl(pathName, null);
-		return result;
-	}
-
-	/**
-	 * Returns the parent directory of the given path.
-	 * 
-	 * @param path
-	 *            The path name.
-	 * @return The name of the parent directory.
-	 */
-	public static String getParentDirectory(String path) {
-		return (new File(path)).getParent();
-	}
-
-	/**
-	 * Returns the file name and extension from the given path.
-	 * 
-	 * @param path
-	 *            The path name.
-	 * @return The file name and the file extension.
-	 */
-	public static String getFileName(String path) {
-		return getFileName(path, true);
-	}
-
-	/**
-	 * Returns the file name from the given path, with or without the file
-	 * extension.
-	 * 
-	 * @param path
-	 *            The path name.
-	 * @param withExtension
-	 *            If true, include the file extension in the result.
-	 * @return The file name with or without the file extension.
-	 */
-	public static String getFileName(String path, boolean withExtension) {
-		String normalizedPath = path.replace('\\', '/');
-
-		int prefixLength = 0;
-		if (normalizedPath.startsWith(NetUtil.FILE_URI_PREFIX)) {
-			prefixLength = NetUtil.FILE_URI_PREFIX_LENGTH;
-		} else if (normalizedPath.startsWith(NetUtil.HTTP_URI_PREFIX)) {
-			prefixLength = NetUtil.HTTP_URI_PREFIX_LENGTH;
-		}
-
-		String fileName;
-		int index = normalizedPath.lastIndexOf("/"); //$NON-NLS-1$
-		if (index < prefixLength) {
-			fileName = normalizedPath.substring(prefixLength);
-		} else {
-			fileName = path.substring(index + 1);
-		}
-
-		if (withExtension) {
-			return fileName;
-		}
-
-		index = fileName.indexOf("."); //$NON-NLS-1$
-		return (index > 0) ? fileName.substring(0, index) : fileName;
-	}
-
-	/**
-	 * Returns the relative path for the target path from the base path.
-	 * 
-	 * @param path
-	 *            The target path.
-	 * @param basePath
-	 *            The base path.
-	 * @return The relative path.
-	 */
-	public static String getRelativePathToBase(File path, File basePath) {
-		try {
-			String dir = path.toURL().toExternalForm();
-			String baseDir = basePath.toURL().toExternalForm();
-			StringBuffer result = new StringBuffer();
-			if (dir.indexOf(baseDir) == 0) {
-				String delta = dir.substring(baseDir.length());
-				for (int i = 0; i < delta.length(); i++) {
-					if (delta.charAt(i) == '/') {
-						result.append("../"); //$NON-NLS-1$
-					}
-				}
-			}
-			return result.toString();
-		} catch (Exception e) {
-			return ""; //$NON-NLS-1$
-		}
-	}
-
-	public static String getRelativePath(File path, File basePath) {
-		try {
-			String dir = path.toURL().toExternalForm();
-			String baseDir = appendSeparator(basePath.toURL().toExternalForm(),
-					"/"); //$NON-NLS-1$
-			StringBuffer result = new StringBuffer();
-			while (dir.indexOf(baseDir) == -1) {
-				basePath = basePath.getParentFile();
-				baseDir = appendSeparator(basePath.toURL().toExternalForm(),
-						"/"); //$NON-NLS-1$
-				result.append("../"); //$NON-NLS-1$
-			}
-			if (dir.indexOf(baseDir) == 0) {
-				String delta = dir.substring(baseDir.length());
-				result.append(delta);
-			}
-			return result.toString();
-		} catch (Exception e) {
-			return ""; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Appends the platform specific path separator to the end of the given
-	 * path.
-	 * 
-	 * @param path
-	 *            The path name.
-	 * @return The path name appended with the platform specific path separator.
-	 */
-	public static String appendSeparator(String path) {
-		return appendSeparator(path, File.separator);
-	}
-
-	/**
-	 * Appends the given path separator to the end of the given path.
-	 * 
-	 * @param path
-	 *            The path name.
-	 * @param separator
-	 *            The path separator.
-	 * @return The path name appended with the given separator.
-	 */
-	public static String appendSeparator(String path, String separator) {
-		return path.endsWith(separator) ? path : path + separator;
-	}
-
-	/**
-	 * Removes the ending path separator from the given path.
-	 * 
-	 * @param path
-	 *            The path name.
-	 * @return The path name minus the platform specific path separator.
-	 */
-	public static String removeSeparator(String path) {
-		return path.endsWith(File.separator) ? path.substring(0,
-				path.length() - 1) : path;
-	}
-
-	/**
-	 * Removes the ending path separator from the given path.
-	 * 
-	 * @param path
-	 *            The path name.
-	 * @return The path name minus the path separator "\\" or "/".
-	 */
-	public static String removeAllSeparator(String path) {
-		return path.endsWith("/") || path.endsWith("\\") ? path.substring(0, path.length() - 1) : path; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * Removes the ending path separator from the given path.
-	 * 
-	 * @param path
-	 *            The path name.
-	 * @param separator
-	 *            The path separator.
-	 * @return The path name minus the separator.
-	 */
-	public static String removeSeparator(String path, String separator) {
-		return path.endsWith(separator) ? path.substring(0, path.length() - 1)
-				: path;
-	}
-
-	/**
-	 * Replaces the file name with another in the given path.
-	 * 
-	 * @param path
-	 *            The path name.
-	 * @param oldFileName
-	 *            The old file name.
-	 * @param newFileName
-	 *            The new file name.
-	 * @return The new path name with the new file name.
-	 */
-	public static String replaceFileName(String path, String oldFileName,
-			String newFileName) {
-		int index = path.lastIndexOf(oldFileName);
-		return path.substring(0, index) + newFileName;
-	}
-
-	/**
-	 * Replaces the file extension with another in the given path.
-	 * 
-	 * @param path
-	 *            The path name.
-	 * @param oldFileExt
-	 *            The old file extension.
-	 * @param newFileExt
-	 *            The new file extension.
-	 * @return The new path with the new file extension.
-	 */
-	public static String replaceExtension(String path, String oldExt,
-			String newExt) {
-		int index = path.lastIndexOf(oldExt);
-		return path.substring(0, index) + newExt;
-	}
-
-	/**
-	 * Returns the locale-specific path of a base path.
-	 * 
-	 * @param path
-	 *            The base path name.
-	 * @param localeStr
-	 *            The locale string.
-	 * @return The locale-specific path.
-	 */
-	public static String getLocalePath(String path, String localeStr) {
-		if (StrUtil.isBlank(localeStr)) {
-			return path;
-		}
-		String fileName = getFileName(path);
-		return replaceFileName(path, fileName, localeStr + "/" + fileName); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns the locale-specific path of a base path.
-	 * 
-	 * @param path
-	 *            The base path name.
-	 * @param locale
-	 *            The locale object.
-	 * @return The locale-specific path.
-	 */
-	public static String getLocalePath(String path, Locale locale) {
-		return locale == null ? path : getLocalePath(path, locale.toString());
-	}
-
-	/**
-	 * Writes the given text to a text file.
-	 * 
-	 * @param fileName
-	 *            The target file name.
-	 * @param text
-	 *            The text to write.
-	 * @return true if the given text is written successfully to file.
-	 */
-	public static boolean writeFile(String filename, String text) {
-		FileWriter writer = null;
-		try {
-			writer = new FileWriter(filename);
-			writer.write(text);
-			writer.flush();
-		} catch (IOException e) {
-		} finally {
-			if (writer != null) {
-				try {
-					writer.close();
-					return true;
-				} catch (Exception e) {
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Write the given text to a file with UTF-8 encoding.
-	 * 
-	 * @param fileName
-	 *            The target file name.
-	 * @param text
-	 *            The text to write.
-	 * @param append ture to append to the end of the file, false to override the file
-	 * @return true if the given text is written successfully to file.
-	 */
-	public static boolean writeUTF8File(String filename, String text) {
-		return writeUTF8File(filename, text, false);
-	}
-
-	/**
-	 * Write the given text to a file with UTF-8 encoding.
-	 * 
-	 * @param fileName
-	 *            The target file name.
-	 * @param text
-	 *            The text to write.
-	 * @param append ture to append to the end of the file, false to override the file
-	 * @return true if the given text is written successfully to file.
-	 */
-	public static boolean writeUTF8File(String filename, String text, boolean append) {
-		OutputStreamWriter writer = null;
-		FileOutputStream fileOut = null;
-		try {
-			fileOut = new FileOutputStream(filename, append);
-			writer = new OutputStreamWriter(fileOut, ENCODING_UTF_8);
-			writer.write(text);
-			writer.flush();
-			fileOut.flush();
-		} catch (IOException e) {
-			e.printStackTrace();
-		} finally {
-			if (writer != null) {
-				try {
-					writer.close();
-					return true;
-				} catch (Exception e) {
-				}
-			}
-			if (fileOut != null) {
-				try {
-					fileOut.close();
-					return true;
-				} catch (Exception e) {
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Write the content of the given URI to the given output stream.
-	 * 
-	 * @param uri
-	 *            The source URI.
-	 * @param output
-	 *            The output stream.
-	 */
-	public static void writeFile(String uri, OutputStream output)
-			throws IOException {
-		if (uri == null) {
-			return;
-		}
-
-		InputStream input = null;
-		try {
-			input = NetUtil.getInputStream(uri);
-			int bytesRead;
-			byte[] buf = new byte[4096];
-			while ((bytesRead = input.read(buf, 0, 4096)) > 0) {
-				output.write(buf, 0, bytesRead);
-			}
-			output.flush();
-		} finally {
-			if (input != null) {
-				try {
-					input.close();
-				} catch (Exception e) {
-				}
-			}
-		}
-	}
-
-	/**
-	 * Write the content of the given URI to the given PrintWriter.
-	 * 
-	 * @param uri
-	 *            The source URI.
-	 * @param writer
-	 *            The PrintWriter obejct.
-	 */
-	public static void writeFile(String uri, PrintWriter pw) throws IOException {
-		if (uri == null) {
-			return;
-		}
-
-		InputStreamReader input = null;
-		try {
-			input = new InputStreamReader(NetUtil.getInputStream(uri));
-			int charsRead;
-			char[] buf = new char[4096];
-			while ((charsRead = input.read(buf, 0, 4096)) > 0) {
-				pw.write(buf, 0, charsRead);
-			}
-			pw.flush();
-		} finally {
-			if (input != null) {
-				try {
-					input.close();
-				} catch (Exception e) {
-				}
-			}
-		}
-	}
-
-	/**
-	 * Recursively delete all sub-directories and files in the given directory.
-	 * Does not delete the given directory.
-	 * 
-	 * @param dir
-	 *            The directory containing the sub-directories and files.
-	 * @return boolean true if delete successful
-	 */
-	public static boolean deleteAllFiles(String dir) {
-		boolean ret = true;
-		File targetDir = new File(dir);
-		File[] files = targetDir.listFiles();
-		if (files != null) {
-			for (int i = 0; i < files.length; i++) {
-				if (files[i].isDirectory()) {
-					ret = ret && deleteAllFiles(files[i].getAbsolutePath());
-				}
-				ret = ret && files[i].delete();
-			}
-		}
-
-		return ret;
-	}
-
-	/**
-	 * Copies the content of the source file to the target file.
-	 * 
-	 * @param srcFile
-	 *            The source file or path.
-	 * @param tgtFile
-	 *            The target file or path.
-	 */
-	public static void copyFile(File srcFile, File tgtFile) throws IOException {
-		if (srcFile.equals(tgtFile))
-			return;
-
-		if (!srcFile.exists() || !srcFile.canRead()) {
-			return;
-		}
-
-		if (tgtFile.exists() && !tgtFile.canWrite()) {
-			return;
-		}
-
-		if (!srcFile.isFile()) {
-			File[] files = srcFile.listFiles();
-			if (files != null) {
-				for (int i = 0; i < files.length; i++) {
-					copyFile(files[i], tgtFile);
-				}
-			}
-			return;
-		}	
-
-		FileInputStream src = null;
-		FileOutputStream tgt = null;
-		try {
-			src = new FileInputStream(srcFile);
-			if (tgtFile.isFile()) {
-				tgt = new FileOutputStream(tgtFile);
-			} else {
-				String srcPath = srcFile.toURL().toString();
-				int index = srcPath.lastIndexOf("/"); //$NON-NLS-1$
-				String srcFileName = srcPath.substring(index + 1);
-				String srcCanonicalPath = srcFile.getCanonicalPath();
-				String tgtCanonicalPath = new File(tgtFile, srcFileName).getCanonicalPath();
-				if (srcCanonicalPath.equals(tgtCanonicalPath)) {
-					return;
-				}
-				tgt = new FileOutputStream(new File(tgtFile, srcFileName));
-			}
-			byte[] buffer = new byte[4096];
-			int bytes_read;
-			while ((bytes_read = src.read(buffer)) != -1) {
-				tgt.write(buffer, 0, bytes_read);
-			}
-		} finally {
-			if (src != null) {
-				try {
-					src.close();
-				} catch (Exception e) {
-				}
-			}
-			if (tgt != null) {
-				try {
-					tgt.close();
-				} catch (Exception e) {
-				}
-			}
-			tgtFile.setLastModified(srcFile.lastModified());
-		}
-	}
-
-	/**
-	 * Copies the content of the source file to the target file.
-	 * 
-	 * @param srcFileName
-	 *            The source file name.
-	 * @param tgtFileName
-	 *            The target file name.
-	 */
-	public static void copyFile(String srcFileName, String tgtFileName)
-			throws IOException {
-		copyFile(new File(srcFileName), new File(tgtFileName));
-	}
-
-	/**
-	 * Copies the content of a directory to another directory.
-	 * 
-	 * @param srcDirName
-	 *            The source directory name.
-	 * @param tgtDirName
-	 *            The target directory name.
-	 */
-	public static void copyDir(String srcDirName, String tgtDirName)
-			throws IOException {
-		copyFile(new File(srcDirName), new File(tgtDirName));
-	}
-
-	/**
-	 * Copies one file to another - operates ONLY on files, not on directories.
-	 * 
-	 * @param source
-	 * @param dest
-	 * @throws IOException
-	 */
-	public static void copyfile(File source, File dest) throws IOException {
-		if (source.equals(dest))
-			return;
-
-		FileInputStream input = null;
-		FileOutputStream output = null;
-
-		try {
-			input = new FileInputStream(source);
-			FileChannel in = input.getChannel();
-			if (!dest.exists()) {
-				dest.getParentFile().mkdirs();
-			}
-			output = new FileOutputStream(dest);
-			FileChannel out = output.getChannel();
-			out.transferFrom(in, 0, source.length());
-		} finally {
-			if (input != null) {
-				try {
-					input.close();
-				} catch (IOException e) {
-				}
-			}
-			if (output != null) {
-				try {
-					output.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-	}
-
-	public static void copydirectory(File sourceDir, File destDir)
-			throws IOException {
-		if (!sourceDir.exists() || !destDir.exists()) {
-			return;
-		}
-
-		if (!sourceDir.isDirectory() || !destDir.isDirectory()) {
-			return;
-		}
-
-		File[] files = sourceDir.listFiles();
-		if (files != null) {
-			for (int i = 0; i < files.length; i++) {
-				// calc destination name
-				String destName = destDir
-						+ File.separator
-						+ files[i].getAbsolutePath().substring(
-								sourceDir.getAbsolutePath().length() + 1);
-				if (files[i].isFile()) {
-					// copy the file
-					copyfile(files[i], new File(destName));
-				} else if (files[i].isDirectory()) {
-					// copy directory recursively
-					File destFile = new File(destName);
-					destFile.mkdirs();
-					copydirectory(files[i], destFile);
-				}
-			}
-		}
-
-	}
-
-	// for some reason, this guy locks the file, if you try to update the file,
-	// got the following exception
-	// java.io.FileNotFoundException:
-	// (The requested operation cannot be performed on a file with a user-mapped
-	// section open)
-	// need to handle later
-	public static CharBuffer readFile(File file) throws IOException {
-		FileInputStream input = null;
-		CharBuffer charBuffer = null;
-		try {
-			input = new FileInputStream(file);
-			FileChannel inChannel = input.getChannel();
-			int length = (int) inChannel.size();
-			MappedByteBuffer byteBuffer = inChannel.map(
-					FileChannel.MapMode.READ_ONLY, 0, length);
-			Charset charset = Charset.forName(ENCODING_ISO_8859_1);
-			CharsetDecoder decoder = charset.newDecoder();
-			charBuffer = decoder.decode(byteBuffer);
-		} finally {
-			if (input != null) {
-				try {
-					input.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-		return charBuffer;
-	}
-
-	public static StringBuffer readFile(File file, String encoding)
-			throws IOException {
-
-		StringBuffer result = new StringBuffer();
-		FileInputStream fis = null;
-		InputStreamReader reader = null;
-		try {
-			char[] buffer = new char[1024];
-			fis = new FileInputStream(file);
-			reader = new InputStreamReader(fis, encoding);
-			int size;
-			while ((size = reader.read(buffer, 0, 1024)) > 0) {
-				result.append(buffer, 0, size);
-			}
-		} finally {
-			if (fis != null) {
-				fis.close();
-			}
-
-			if (reader != null) {
-				reader.close();
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Uses Java 1.4's FileLock class to test for a file lock
-	 * 
-	 * @param file
-	 * @return
-	 */
-	public static boolean isFileLocked(File file) {
-		boolean isLocked = false;
-		FileOutputStream input = null;
-		FileLock lock = null;
-
-		if (!file.exists()) {
-			return false;
-		}
-		try {
-			input = new FileOutputStream(file);
-			FileChannel fileChannel = input.getChannel();
-
-			lock = fileChannel.tryLock();
-
-			if (lock == null)
-				isLocked = true;
-			else
-				lock.release();
-		} catch (Exception e) {
-			if (e instanceof SecurityException)
-				// Can't write to file.
-				isLocked = true;
-			else if (e instanceof FileNotFoundException)
-				isLocked = false;
-			else if (e instanceof IOException)
-				isLocked = true;
-			// OverlappingFileLockException means that this JVM has it locked
-			// therefore it is not locked to us
-			else if (e instanceof OverlappingFileLockException)
-				isLocked = false;
-			// Could not get a lock for some other reason.
-			else
-				isLocked = true;
-		} finally {
-			if (input != null) {
-				try {
-					input.close();
-				} catch (Exception ex) {
-				}
-			}
-		}
-		return isLocked;
-	}
-
-	/**
-	 * Locks a file for the current JVM. Will create the file if it does not
-	 * exist
-	 * 
-	 * @param file
-	 * @return a FileLock object, or null if file could not be locked
-	 */
-	public static FileLock lockFile(File file) {
-		FileOutputStream input = null;
-		FileLock lock = null;
-		try {
-			input = new FileOutputStream(file);
-			FileChannel fileChannel = input.getChannel();
-			lock = fileChannel.tryLock();
-
-			if (lock.isValid())
-				return lock;
-		} catch (Exception e) {
-			// Could not get a lock for some reason.
-			return null;
-		} finally {
-			try {
-				if (input != null && (lock == null || !lock.isValid())) {
-					input.close();
-				}
-			} catch (Exception ex) {
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * get all files in the specified path
-	 * @param path, absolute path of a folder
-	 * @param fileList List the list to collect the Files
-	 * @param recursive boolean, if true find the files in sub folders as well
-	 */
-	public static void getAllFiles(File path, List fileList, boolean recursive)
-	{
-		// get all files in the specified folder
-		if (path.isDirectory()) 
-		{		
-			File[] files = path.listFiles();
-			if (files != null) 
-			{
-				for (int i = 0; i < files.length; i++) 
-				{	
-					if ( files[i].isFile() )
-					{
-						fileList.add(files[i]);
-					}
-					else if (recursive)
-					{
-						getAllFiles(files[i], fileList, recursive);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * given a directory and extension, returns all files (recursively) whose
-	 * extension startsWith the given extension
-	 * 
-	 * @param f
-	 * @param extension
-	 * @return
-	 */
-	public static List fileList(File f, String extension) {
-		extension = extension.toUpperCase();
-		List returnList = new ArrayList();
-		try {
-			if (f.isDirectory()) { // if dir then recurse
-				String[] flist = f.list();
-				for (int i = 0; i < flist.length; ++i) {
-					File fc = new File(f.getPath(), flist[i]);
-					returnList.addAll(fileList(fc, extension));
-				}
-			} else { // ordinary file
-				if (extension != null) {
-					String name = f.getName().toUpperCase();
-					if (name.lastIndexOf(".") != -1) //$NON-NLS-1$
-						if (name
-								.substring(name.lastIndexOf(".") + 1).startsWith(extension)) { //$NON-NLS-1$
-							returnList.add(f);
-						}
-				} else
-					returnList.add(f);
-			}
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-		return returnList;
-	}
-
-	/**
-	 * given a directory and extension, returns all files (recursively)whose
-	 * extension does not startsWith the given extension
-	 * 
-	 * @param f
-	 * @param extension
-	 * @return
-	 */
-	public static List fileListExcludeExt(File f, String extension) {
-		List returnList = new ArrayList();
-		try {
-			if (f.isDirectory()) { // if dir then recurse
-				String[] flist = f.list();
-				for (int i = 0; i < flist.length; ++i) {
-					File fc = new File(f.getPath(), flist[i]);
-					returnList.addAll(fileListExcludeExt(fc, extension));
-				}
-			} else { // ordinary file
-				if (extension != null) {
-					String name = f.getName();
-					if (name.lastIndexOf(".") != -1) //$NON-NLS-1$
-						if (!(name.substring(name.lastIndexOf(".") + 1).startsWith(extension))) { //$NON-NLS-1$
-							returnList.add(f);
-						}
-				} else
-					returnList.add(f);
-			}
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-		return returnList;
-	}
-	
-	/**
-	 * get all file paths in the specified path
-	 * @param path, absolute path of a folder
-	 * @param recursive boolean, if true find the files in sub folders as well
-	 */
-	public static ArrayList getAllFileAbsolutePaths(File path, boolean recursive) {	
-		ArrayList files = new ArrayList();
-		getAllFiles(path, files, recursive);
-		ArrayList paths = new ArrayList();
-		for (int i=0; i<files.size(); i++) {
-			String absPath = ((File) files.get(i)).getAbsolutePath();
-			paths.add(absPath);
-		}
-		return paths;
-	}
-	
-	/**
-	 * Moves a file
-	 * 
-	 * Attempts to rename the file first.  If that fails,
-	 * will copy the sourceFile to destFile and delete the sourceFile.
-	 * @param sourceFile
-	 * @param destFile
-	 * @return
-	 */
-	public static boolean moveFile(File sourceFile, File destFile) {
-		try {
-			// first try the renameTo method
-			if (sourceFile.renameTo(destFile)) {
-				return true;
-			}
-			else {
-				// try to copy file, delete original
-				copyfile(sourceFile, destFile);
-				sourceFile.delete();
-				return true;
-			}
-		} catch (Exception t) {
-			CommonPlugin.getDefault().getLogger().logError(t);
-			return false;
-		}
-	}
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/I18nUtil.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/I18nUtil.java
deleted file mode 100755
index faf66b8..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/I18nUtil.java
+++ /dev/null
@@ -1,219 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * Helper utiltiies for handling internationalization.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class I18nUtil {
-
-	/**
-	 * Private constructor to prevent this class from being instantiated. All
-	 * methods in this class should be static.
-	 */
-	private I18nUtil() {
-	}
-
-	/**
-	 * Returns the localized string associated with a resource key.
-	 * 
-	 * @param resourceBundle
-	 *            A resource bundle.
-	 * @param key
-	 *            A resource key.
-	 * @return A localized string.
-	 */
-	public static String getString(ResourceBundle resourceBundle, String key) {
-		if (resourceBundle != null) {
-			try {
-				return resourceBundle.getString(key);
-			} catch (MissingResourceException e) {
-			}
-		}
-		return '[' + key + ']';
-	}
-
-	/**
-	 * Returns the localized string associated with a resource key and formatted
-	 * with a given string.
-	 * 
-	 * @param resourceBundle
-	 *            A resource bundle.
-	 * @param key
-	 *            A resource key.
-	 * @param data
-	 *            An object.
-	 * @return A formatted localized string.
-	 */
-	public static String formatString(ResourceBundle resourceBundle,
-			String key, Object data) {
-		if (resourceBundle != null) {
-			try {
-				String localizedStr = resourceBundle.getString(key);
-				return MessageFormat
-						.format(localizedStr, new Object[] { data });
-			} catch (MissingResourceException e) {
-			}
-		}
-		return '[' + key + ']';
-	}
-
-	/**
-	 * Returns the localized string associated with a resource key and formatted
-	 * with two given string.
-	 * 
-	 * @param resourceBundle
-	 *            A resource bundle.
-	 * @param key
-	 *            A resource key.
-	 * @param data1
-	 *            An object.
-	 * @param data2
-	 *            An object.
-	 * @return A formatted localized string.
-	 */
-	public static String formatString(ResourceBundle resourceBundle,
-			String key, Object data1, Object data2) {
-		if (resourceBundle != null) {
-			try {
-				String localizedStr = resourceBundle.getString(key);
-				return MessageFormat.format(localizedStr, new Object[] { data1,
-						data2 });
-			} catch (MissingResourceException e) {
-			}
-		}
-		return '[' + key + ']';
-	}
-
-	/**
-	 * Returns the localized string associated with a resource key and formatted
-	 * with a given string.
-	 * 
-	 * @param resourceBundle
-	 *            A resource bundle.
-	 * @param key
-	 *            A resource key.
-	 * @param data
-	 *            An array of objects.
-	 * @return A formatted localized string.
-	 */
-	public static String formatString(ResourceBundle resourceBundle,
-			String key, Object[] data) {
-		if (resourceBundle != null) {
-			try {
-				String localizedStr = resourceBundle.getString(key);
-				return MessageFormat.format(localizedStr, data);
-			} catch (MissingResourceException e) {
-			}
-		}
-		return '[' + key + ']';
-	}
-
-	/**
-	 * Returns the localized integer value associated with a resource key.
-	 * 
-	 * @param resourceBundle
-	 *            A resource bundle.
-	 * @param key
-	 *            A resource key.
-	 * @param defaultValue
-	 *            The default value to return if the resource key cannot be
-	 *            located.
-	 * @return A localized interger value.
-	 */
-	public static int getInt(String intString,
-			int defaultValue) {
-		try {
-			if (intString != null) {
-				return Integer.parseInt(intString);
-			}
-		} catch (Exception e) {
-		}
-		return defaultValue;
-	}
-
-	/**
-	 * Returns the localized version of a US English resource file.
-	 * 
-	 * @param path
-	 *            The absolute path to a resource file.
-	 * @param locale
-	 *            A locale.
-	 * @return The localized resource file. If none exists, return null.
-	 */
-	public static String getLocalizedFile(String path, Locale locale) {
-		if (locale.equals(Locale.US) || path == null) {
-			return null;
-		}
-
-		// Build the locale string array. This is used to construct the
-		// localized file names.
-		String language = locale.getLanguage();
-		String country = locale.getCountry();
-		String variant = locale.getVariant();
-
-		String[] localeStrs = new String[3];
-		if (variant != null && variant.length() > 0) {
-			localeStrs[0] = locale.toString();
-		}
-		if (country != null && country.length() > 0) {
-			localeStrs[1] = language + "_" + country; //$NON-NLS-1$
-		}
-		if (language != null) {
-			localeStrs[2] = language;
-		}
-
-		String dir = path.replace('\\', '/');
-		String fileName;
-
-		int pathIndex = dir.lastIndexOf("/"); //$NON-NLS-1$
-		if (pathIndex > 0) {
-			dir = path.substring(0, pathIndex + 1);
-			fileName = path.substring(pathIndex + 1);
-		} else {
-			fileName = dir;
-			dir = ""; //$NON-NLS-1$
-		}
-
-		String fileExt = ""; //$NON-NLS-1$		
-		int extIndex = fileName.lastIndexOf("."); //$NON-NLS-1$
-		if (extIndex > 0) {
-			fileExt = fileName.substring(extIndex);
-			fileName = fileName.substring(0, extIndex);
-		}
-
-		fileName = dir + fileName + "_"; //$NON-NLS-1$
-
-		// Look for the localized file.
-		for (int i = 0; i < 3; i++) {
-			if (localeStrs[i] != null) {
-				// Gets the localized path name.
-				String fname = fileName + localeStrs[i] + fileExt;
-				File file = new File(fname);
-				if (file.exists()) {
-					return fname;
-				}
-			}
-		}
-
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ImageUtil.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ImageUtil.java
deleted file mode 100755
index b88e5ec..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ImageUtil.java
+++ /dev/null
@@ -1,170 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.MediaTracker;
-import java.awt.font.FontRenderContext;
-import java.awt.font.LineBreakMeasurer;
-import java.awt.font.TextAttribute;
-import java.awt.font.TextLayout;
-import java.awt.geom.Point2D;
-import java.awt.image.BufferedImage;
-import java.text.AttributedCharacterIterator;
-import java.text.AttributedString;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Utility class for managing image files.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ImageUtil {
-
-	// The default maximum lines of wrapped text.
-	private static final int MAX_WRAP_LINE = 3;
-
-	// The BufferedImage cache.
-	private static HashMap imageCache = new HashMap();
-
-	/**
-	 * Private constructor to prevent this class from being instantiated. All
-	 * methods in this class should be static.
-	 */
-	private ImageUtil() {
-	}
-
-	/**
-	 * Creates a <code>BufferedImage</code> from the given image file.
-	 */
-	public static BufferedImage getBufferedImage(String imageFile, Component c) {
-		if (imageFile == null || c == null) {
-			return null;
-		}
-
-		BufferedImage bufferedImage = (BufferedImage) imageCache.get(imageFile);
-		if (bufferedImage != null) {
-			return bufferedImage;
-		}
-
-		Image image = c.getToolkit().getImage(imageFile);
-		MediaTracker tracker = new MediaTracker(c);
-		tracker.addImage(image, 0);
-		try {
-			tracker.waitForAll();
-		} catch (InterruptedException e) {
-		}
-
-		bufferedImage = new BufferedImage(image.getWidth(c),
-				image.getHeight(c), BufferedImage.TYPE_INT_ARGB);
-
-		Graphics2D g2d = bufferedImage.createGraphics();
-		g2d.drawImage(image, 0, 0, c);
-		imageCache.put(imageFile, bufferedImage);
-
-		return bufferedImage;
-	}
-
-	/**
-	 * Returns true if the given image is loaded successfully.
-	 */
-	public static boolean waitForImage(Image image, Component c) {
-		MediaTracker tracker = new MediaTracker(c);
-		tracker.addImage(image, 0);
-		try {
-			tracker.waitForAll();
-		} catch (InterruptedException ie) {
-		}
-		return (!tracker.isErrorAny());
-	}
-
-	/**
-	 * Draws the given text.
-	 * 
-	 * @param g2d
-	 *            The <code>Graphics2D</code> context.
-	 * @param text
-	 *            The text to be rendered.
-	 * @param font
-	 *            The font used for rendering the text.
-	 * @param color
-	 *            The color used for rendering the text.
-	 * @param x
-	 *            The horizontal coordinate used for rendering the text.
-	 * @param y
-	 *            The verticalcoordinate used for rendering the text.
-	 */
-	public static void drawText(Graphics2D g2d, String text, Font font,
-			Color color, int x, int y) {
-		if (text == null || text.length() == 0) {
-			return;
-		}
-		g2d.setColor(color);
-		FontRenderContext frc = g2d.getFontRenderContext();
-		TextLayout textlayout = new TextLayout(text, font, frc);
-		textlayout.draw(g2d, x, y);
-	}
-
-	/**
-	 * Draws the given text and wraps it based on the given width.
-	 * 
-	 * @param g2d
-	 *            The <code>Graphics2D</code> context.
-	 * @param text
-	 *            The text to be rendered.
-	 * @param font
-	 *            The font used for rendering the text.
-	 * @param color
-	 *            The color used for rendering the text.
-	 * @param x
-	 *            The horizontal coordinate used for rendering the text.
-	 * @param y
-	 *            The verticalcoordinate used for rendering the text.
-	 * @param width
-	 *            The maximum width of the wrapped text.
-	 */
-	public static void drawText(Graphics2D g2d, String text, Font font,
-			Color color, int x, int y, float width) {
-		if (text == null || text.length() == 0) {
-			return;
-		}
-		float maxWrapWidth = width - 10;
-		g2d.setColor(color);
-		Point2D.Float pen = new Point2D.Float(x, y);
-		Map attributes = new HashMap();
-		attributes.put(TextAttribute.FONT, font);
-		AttributedCharacterIterator textIterator = new AttributedString(text,
-				attributes).getIterator();
-		FontRenderContext frc = g2d.getFontRenderContext();
-		LineBreakMeasurer measurer = new LineBreakMeasurer(textIterator, frc);
-		int line = 1;
-		while (line <= MAX_WRAP_LINE) {
-			TextLayout layout = measurer.nextLayout(maxWrapWidth);
-			if (layout == null)
-				break;
-			pen.y += layout.getAscent();
-			float dx = 0;
-			if (layout.isLeftToRight()) {
-				dx = (width - layout.getAdvance());
-			}
-			layout.draw(g2d, pen.x + dx / 2, pen.y);
-			pen.y += layout.getDescent() + layout.getLeading() - 1;
-			line++;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/MathUtil.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/MathUtil.java
deleted file mode 100755
index 0c074ff..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/MathUtil.java
+++ /dev/null
@@ -1,25 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-/**
- * Utility class for performing math operations.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MathUtil {
-
-	public static final long ceil1000(long l) {
-		return (l - (l & 7));
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/MenuUtil.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/MenuUtil.java
deleted file mode 100755
index 85ea141..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/MenuUtil.java
+++ /dev/null
@@ -1,47 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import org.eclipse.swt.widgets.MenuItem;
-
-/**
- * A helper class for retrieving Eclipse menus.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class MenuUtil {
-
-	/**
-	 * Searches an array of menu items and returns the menu item that matches
-	 * the given menu text.
-	 * 
-	 * @param menuItems
-	 *            An array of menu items.
-	 * @param text
-	 *            The text to look for.
-	 * @return The menu item if found, <code>null</code> otherwise.
-	 */
-	public static MenuItem getMenuItem(MenuItem[] menuItems, String text) {
-		if (menuItems == null || text == null || text.length() == 0) {
-			return null;
-		}
-
-		for (int i = 0; i < menuItems.length; i++) {
-			if (menuItems[i].getText().startsWith(text)) {
-				return menuItems[i];
-			}
-		}
-
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/NetUtil.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/NetUtil.java
deleted file mode 100755
index 313baee..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/NetUtil.java
+++ /dev/null
@@ -1,377 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLDecoder;
-
-/**
- * Implements a utility class for managing URLs and URIs.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class NetUtil {
-
-	/**
-	 * FILE scheme.
-	 */
-	public final static String FILE_SCHEME = "file"; //$NON-NLS-1$
-
-	/**
-	 * File URI prefix.
-	 */
-	public final static String FILE_URI_PREFIX = FILE_SCHEME + ":/"; //$NON-NLS-1$
-
-	/**
-	 * File URI prefix size.
-	 */
-	public final static int FILE_URI_PREFIX_LENGTH = FILE_URI_PREFIX.length();
-
-	/**
-	 * HTTP scheme.
-	 */
-	public final static String HTTP_SCHEME = "http"; //$NON-NLS-1$
-
-	/**
-	 * HTTP URI prefix.
-	 */
-	public final static String HTTP_URI_PREFIX = HTTP_SCHEME + "://"; //$NON-NLS-1$
-
-	/**
-	 * HTTP URI prefix size.
-	 */
-	public final static int HTTP_URI_PREFIX_LENGTH = HTTP_URI_PREFIX.length();
-
-	/**
-	 * A table of hex values.
-	 */
-	private final static String[] HEX_VALUES = {
-			"%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%08", "%09", "%0A", "%0B", "%0C", "%0D", "%0E", "%0F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%18", "%19", "%1A", "%1B", "%1C", "%1D", "%1E", "%1F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%28", "%29", "%2A", "%2B", "%2C", "%2D", "%2E", "%2F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%30", "%31", "%32", "%33", "%34", "%35", "%36", "%37", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%38", "%39", "%3A", "%3B", "%3C", "%3D", "%3E", "%3F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%40", "%41", "%42", "%43", "%44", "%45", "%46", "%47", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%48", "%49", "%4A", "%4B", "%4C", "%4D", "%4E", "%4F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%50", "%51", "%52", "%53", "%54", "%55", "%56", "%57", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%58", "%59", "%5A", "%5B", "%5C", "%5D", "%5E", "%5F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%68", "%69", "%6A", "%6B", "%6C", "%6D", "%6E", "%6F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%70", "%71", "%72", "%73", "%74", "%75", "%76", "%77", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%78", "%79", "%7A", "%7B", "%7C", "%7D", "%7E", "%7F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%88", "%89", "%8A", "%8B", "%8C", "%8D", "%8E", "%8F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%98", "%99", "%9A", "%9B", "%9C", "%9D", "%9E", "%9F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%A0", "%A1", "%A2", "%A3", "%A4", "%A5", "%A6", "%A7", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%A8", "%A9", "%AA", "%AB", "%AC", "%AD", "%AE", "%AF", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%B0", "%B1", "%B2", "%B3", "%B4", "%B5", "%B6", "%B7", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%B8", "%B9", "%BA", "%BB", "%BC", "%BD", "%BE", "%BF", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%C0", "%C1", "%C2", "%C3", "%C4", "%C5", "%C6", "%C7", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%C8", "%C9", "%CA", "%CB", "%CC", "%CD", "%CE", "%CF", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%D0", "%D1", "%D2", "%D3", "%D4", "%D5", "%D6", "%D7", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%D8", "%D9", "%DA", "%DB", "%DC", "%DD", "%DE", "%DF", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%E0", "%E1", "%E2", "%E3", "%E4", "%E5", "%E6", "%E7", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%E8", "%E9", "%EA", "%EB", "%EC", "%ED", "%EE", "%EF", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%F0", "%F1", "%F2", "%F3", "%F4", "%F5", "%F6", "%F7", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"%F8", "%F9", "%FA", "%FB", "%FC", "%FD", "%FE", "%FF" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-	};
-
-	/**
-	 * Private constructor to prevent this class from being instantiated. All
-	 * methods in this class should be static.
-	 */
-	private NetUtil() {
-	}
-
-	/**
-	 * Returns the URI for the given file.
-	 * 
-	 * @param file
-	 *            The input file.
-	 * @return The URI for the given file.
-	 * @throws MalformedURLException
-	 *             if an error occur while constructing the URI for the given
-	 *             file.
-	 */
-	public static String getUri(File file) throws MalformedURLException {
-		String url = file.toURL().toExternalForm();
-		StringBuffer strBuf = new StringBuffer();
-		int urlLength = url.length();
-		for (int i = 0; i < urlLength; i++) {
-			char ch = url.charAt(i);
-			switch (ch) {
-			case ' ':
-				strBuf.append("%20"); //$NON-NLS-1$
-				break;
-			default:
-				strBuf.append(ch);
-				break;
-			}
-		}
-		return strBuf.toString();
-	}
-
-	/**
-	 * Resolves the given URI using the given the base URI.
-	 * 
-	 * @param uri
-	 *            The URI to resolve.
-	 * @param baseUri
-	 *            The base URI.
-	 * @return A fully formed URI.
-	 */
-	public static String resolveUri(String uri, String baseUri) {
-		if (uri == null) {
-			return null;
-		}
-
-		if (uri.startsWith("../")) { //$NON-NLS-1$
-			if (baseUri.endsWith("/")) { //$NON-NLS-1$
-				baseUri = baseUri.substring(0, baseUri.length() - 1);
-			}
-			while (uri.startsWith("../")) { //$NON-NLS-1$
-				uri = uri.substring(3);
-				int index = baseUri.lastIndexOf('/');
-				if (index > 0) {
-					baseUri = baseUri.substring(0, index);
-				}
-			}
-			uri = "/" + uri; //$NON-NLS-1$
-		}
-
-		if (uri.startsWith("/")) { //$NON-NLS-1$
-			return baseUri.endsWith("/") //$NON-NLS-1$
-					? baseUri + uri.substring(1) : baseUri + uri;
-		}
-
-		if (uri.startsWith(FILE_URI_PREFIX) || uri.startsWith(HTTP_URI_PREFIX)) {
-			return uri;
-		}
-
-		return baseUri.endsWith("/") ? baseUri + uri : baseUri + '/' + uri; //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns the input stream for the given URI.
-	 * 
-	 * @param uri
-	 *            The source URI.
-	 * @return The input stream for the given URI.
-	 * @throw MalformedURLException if a given XML document URI is invalid.
-	 * @throw IOException if an I/O error occur while accessing the URI.
-	 */
-	public static InputStream getInputStream(String uri)
-			throws MalformedURLException, IOException {
-		if (uri == null) {
-			return null;
-		}
-
-		if (uri.startsWith(HTTP_URI_PREFIX)) {
-			URL url = new URL(uri);
-			return url.openStream();
-		} else if (uri.startsWith(FILE_URI_PREFIX)) {
-			uri = uri.substring(FILE_URI_PREFIX_LENGTH);
-		}
-
-		return new FileInputStream(NetUtil.decodeUrl(uri, null));
-	}
-
-	/**
-	 * Returns the Java string represention (encoded in UTF-16) of the given URL
-	 * (encoded in the given encoding and ASCII-escaped).
-	 * 
-	 * @param url
-	 *            The URL to decode.
-	 * @param encoding
-	 *            The encoding of the URL.
-	 * @return The Java UTF-16 string respresentation.
-	 * @throws IllegalArgumentException
-	 *             if the given URL contain improperly escaped characters.
-	 */
-	public static String decodeUrl(String url, String encoding) {
-		if (url == null) {
-			return url;
-		}
-		
-		int len = url.length();
-		if (len == 0) {
-			return url;
-		}
-
-		// Unescape the url.
-		StringBuffer strBuf = new StringBuffer();
-		for (int i = 0; i < len; i++) {
-			char ch = url.charAt(i);
-			switch (ch) {
-			case '+':
-				strBuf.append(' ');
-				break;
-			case '%':
-				try {
-					strBuf.append((char) Integer.parseInt(url.substring(i + 1,
-							i + 3), 16));
-				} catch (NumberFormatException e) {
-					throw new IllegalArgumentException();
-				}
-				i += 2;
-				break;
-			default:
-				strBuf.append(ch);
-				break;
-			}
-		}
-
-		// Convert the un-escaped byte values to Java UTF-16 string.
-		String result = strBuf.toString();
-		if (encoding != null) {
-			try {
-				byte[] bytes = result.getBytes("8859_1"); //$NON-NLS-1$
-				result = new String(bytes, encoding);
-			} catch (UnsupportedEncodingException e) {
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Returns the ASCII-escaped representation (encoded in the specified
-	 * encoding) of the given URL (encoded in UTF-16).
-	 * 
-	 * @param url
-	 *            The URL to encode.
-	 * @param encoding
-	 *            The encoding of the URL.
-	 * @return the ASCII-escaped respresentation.
-	 * @throws IllegalArgumentException
-	 *             if the given URL contain improperly escaped characters.
-	 * @throws UnsupportedEncodingException
-	 *             if the given coding is unsupport.
-	 */
-	public static String encodeUrl(String url, String encoding)
-			throws UnsupportedEncodingException {
-		if (url == null) {
-			return url;
-		}		
-		int len = url.length();
-		if (len == 0) {
-			return url;
-		}
-
-		StringBuffer result = new StringBuffer();
-
-		byte[] bytes = url.getBytes(encoding);
-		for (int i = 0; i < bytes.length; i++) {
-			char ch = (char) bytes[i];
-
-			if (ch >= 'a' && ch <= 'z') {
-				result.append(ch);
-			} else if (ch >= 'A' && ch <= 'Z') {
-				result.append(ch);
-			} else if (ch >= '0' && ch <= '9') {
-				result.append(ch);
-			} else {
-				switch (ch) {
-				case '-':
-				case '_':
-				case '.':
-				case '!':
-				case '~':
-				case '*':
-				case '\'':
-				case '(':
-				case ')':
-					result.append(ch);
-					break;
-				default:
-					result.append(HEX_VALUES[ch & 0xFF]);
-					break;
-				}
-			}
-		}
-
-		return result.toString();
-	}
-
-	/**
-	 * Returns the ASCII-escaped representation of the given file URL.
-	 * 
-	 * @param fileURL
-	 *            The file URL to encode.
-	 * @return the ASCII-escaped respresentation.
-	 */
-	public static String encodeFileURL(String fileURL) {
-		String url = fileURL;
-		StringBuffer strBuf = new StringBuffer();
-		int urlLength = url.length();
-		for (int i = 0; i < urlLength; i++) {
-			char ch = url.charAt(i);
-			switch (ch) {
-			case ' ':
-				strBuf.append("%20"); //$NON-NLS-1$
-				break;
-			default:
-				strBuf.append(ch);
-				break;
-			}
-		}
-		return strBuf.toString();
-	}
-
-	/**
-	 * Returns the ASCII-escaped representation of the given file URL.
-	 * 
-	 * @param fileURL
-	 *            The file URL to encode.
-	 * @return the ASCII-escaped respresentation.
-	 */
-	public static String decodedFileUrl(String fileURL) {
-		String url = fileURL;
-		StringBuffer strBuf = new StringBuffer();
-		int urlLength = url.length();
-		for (int i = 0; i < urlLength; i++) {
-			char ch = url.charAt(i);
-			switch (ch) {
-			case '%':
-				try {
-					strBuf.append((char) Integer.parseInt(url.substring(i + 1,
-							i + 3), 16));
-				} catch (NumberFormatException e) {
-					throw new IllegalArgumentException();
-				}
-				i += 2;
-				break;
-			default:
-				strBuf.append(ch);
-				break;
-			}
-		}
-		return strBuf.toString();
-	}
-	
-	public static String decodeURL (String url) throws UnsupportedEncodingException {
-//		url = url.replaceAll("\\+", "%2B"); //$NON-NLS-1$
-		url = URLDecoder.decode(url, "UTF-8"); //$NON-NLS-1$
-		return url;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/PerspectiveUtil.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/PerspectiveUtil.java
deleted file mode 100755
index 065cd25..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/PerspectiveUtil.java
+++ /dev/null
@@ -1,122 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import org.eclipse.ui.IPerspectiveDescriptor;
-import org.eclipse.ui.IPerspectiveRegistry;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.WorkbenchException;
-
-/**
- * Utility class for accessing perspectives.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class PerspectiveUtil {
-
-	/**
-	 * Private constructor to prevent this class from being instantiated. All
-	 * methods in this class should be static.
-	 */
-	private PerspectiveUtil() {
-	}
-
-	/**
-	 * Returns the ID of the active perspective.
-	 * 
-	 * @return The active perspective ID.
-	 */
-	public static String getActivePerspectiveId() {
-		IWorkbenchPage activePage = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getActivePage();
-		if (activePage != null) {
-			IPerspectiveDescriptor activePerspective = activePage
-					.getPerspective();
-			return activePerspective.getId();
-		}
-		return null;
-	}
-
-	/**
-	 * Opens a perspective.
-	 * 
-	 * @param perspectiveId
-	 *            The perspective ID.
-	 * @return The previously active perspective.
-	 */
-	public static IPerspectiveDescriptor openPerspective(String perspectiveId) {
-		IWorkbenchPage activePage = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getActivePage();
-		if (activePage != null) {
-			IPerspectiveRegistry registry = PlatformUI.getWorkbench()
-					.getPerspectiveRegistry();
-			IPerspectiveDescriptor oldPerspective = activePage.getPerspective();
-			if (!oldPerspective.getId().equals(perspectiveId)) {
-				IPerspectiveDescriptor perspective = registry
-						.findPerspectiveWithId(perspectiveId);
-				activePage.setPerspective(perspective);
-			}
-			return oldPerspective;
-		} else {
-			IWorkbenchWindow activeWindow = PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow();
-			try {
-				PlatformUI.getWorkbench().showPerspective(
-						perspectiveId, activeWindow);
-			} catch (WorkbenchException e) {
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns true if the given perspective is already active.
-	 * 
-	 * @param perspectiveId
-	 *            The perspective ID.
-	 * @return
-	 */
-	public static boolean isActivePerspective(String perspectiveId) {
-		String activePerspectiveId = PerspectiveUtil.getActivePerspectiveId();
-		if (perspectiveId == null || activePerspectiveId == null) {
-			return false;
-		}
-		return activePerspectiveId.equalsIgnoreCase(perspectiveId);
-	}
-
-	/**
-	 * Returns the view part with the given view ID.
-	 * 
-	 * @param viewId
-	 *            The view ID.
-	 * @return The view part.
-	 */
-	public static IViewPart getView(String viewId) {
-		try {
-			IWorkbenchPage activePage = PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow().getActivePage();
-			if (activePage != null) {
-				IViewPart view = activePage.findView(viewId);
-				if (view == null) {
-					view = activePage.showView(viewId);
-				}
-				return view;
-			}
-		} catch (Exception e) {
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/PreferenceUtil.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/PreferenceUtil.java
deleted file mode 100755
index 4b8a839..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/PreferenceUtil.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.common.utils;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * Utility class for accessing preferences.
- * 
- * @author Kelvin Low
- * @since 1.2
- */
-public class PreferenceUtil {
-
-	// The multi-string preference delimiter.
-	private static final String PREFERENCE_DELIMITER = ";"; //$NON-NLS-1$
-
-	// private static final Object[] EMPTY_LIST = new Object[0];
-
-	/**
-	 * Gets a list containing string values associated with a named preference.
-	 * 
-	 * @param prefStore
-	 *            a preference store
-	 * @param name
-	 *            the preference name
-	 * @return a list of string values
-	 */
-	public static List getList(IPreferenceStore prefStore, String name) {
-		List values = new ArrayList();
-		if (prefStore != null && name != null) {
-			String value = prefStore.getString(name);
-			StringTokenizer tokenizer = new StringTokenizer(value,
-					PREFERENCE_DELIMITER);
-			int tokenCount = tokenizer.countTokens();
-			for (int i = 0; i < tokenCount; i++) {
-				values.add(tokenizer.nextToken());
-			}
-		}
-		return values;
-	}
-
-	/**
-	 * Gets the string values associated with a named preference.
-	 * 
-	 * @param prefStore
-	 *            a preference store
-	 * @param name
-	 *            the preference name
-	 * @return a list of string preference values
-	 */
-	public static String[] getStringValues(IPreferenceStore prefStore,
-			String name) {
-		List list = getList(prefStore, name);
-		String[] values = new String[list.size()];
-		list.toArray(values);
-		return values;
-	}
-
-	/**
-	 * Saves a list containing string values associated with a named preference.
-	 * 
-	 * @param prefStore
-	 *            a preference store
-	 * @param name
-	 *            the preference name
-	 * @param values
-	 *            a list of string values
-	 */
-	public static void setList(IPreferenceStore prefStore, String name,
-			List values) {
-		if (prefStore != null && name != null && values != null) {
-			StringBuffer buffer = new StringBuffer();
-			for (Iterator it = values.iterator(); it.hasNext();) {
-				String value = (String) it.next();
-				buffer.append(value);
-				buffer.append(PREFERENCE_DELIMITER);
-			}
-			prefStore.setValue(name, buffer.toString());
-		}
-	}
-
-	/**
-	 * Adds a string value to a list containing string values associated with a
-	 * named preference.
-	 * 
-	 * @param prefStore
-	 *            a preference store
-	 * @param name
-	 *            the preference name
-	 * @param value
-	 *            a string value
-	 */
-	public static void addToList(IPreferenceStore prefStore, String name,
-			String value) {
-		if (prefStore != null && name != null && value != null) {
-			List list = getList(prefStore, name);
-			list.remove(value);
-			list.add(0, value);
-			// FIXME! Read from global preference.
-			if (list.size() > 10) {
-				list = list.subList(0, 10);
-			}
-			setList(prefStore, name, list);
-		}
-	}
-
-	/**
-	 * Saves an array of string values associated with a named preference.
-	 * 
-	 * @param prefStore
-	 *            a preference store
-	 * @param name
-	 *            the preference name
-	 * @param values
-	 *            an array of string values
-	 */
-	public static void setStringValues(IPreferenceStore prefStore, String name,
-			String[] values) {
-		if (prefStore != null && name != null && values != null) {
-			StringBuffer buffer = new StringBuffer();
-			for (int i = 0; i < values.length; i++) {
-				buffer.append(values[i]);
-				buffer.append(PREFERENCE_DELIMITER);
-			}
-			prefStore.setValue(name, buffer.toString());
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ProfilingUtil.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ProfilingUtil.java
deleted file mode 100755
index 43d403e..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ProfilingUtil.java
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-package org.eclipse.epf.common.utils;
-
-/**
- * Utility class for profiling
- * 
- * @author Weiping Lu
- * @since 1.0
- */
-public class ProfilingUtil {
-
-	public static void fullGC() {
-		Runtime rt = Runtime.getRuntime();
-		long isFree = rt.freeMemory();
-		long wasFree;
-		do {
-			wasFree = isFree;
-			rt.runFinalization();
-			rt.gc();
-			isFree = rt.freeMemory();
-		} while (isFree > wasFree);
-	}
-	
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/StrUtil.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/StrUtil.java
deleted file mode 100755
index cf213a7..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/StrUtil.java
+++ /dev/null
@@ -1,433 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.Platform;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * A helper class for manuipulating strings.
- * 
- * @author Kelvin Low
- * @author Jinhua Xi
- * @since 1.0
- */
-public class StrUtil {
-
-	public static final String LINE_BREAK = "\r\n"; //$NON-NLS-1$
-	public static final String TAB = "\t"; //$NON-NLS-1$
-	
-	private static final String REGEXP_ANY_SPECIAL_CHARS = "(`|~|!|@|#|\\$|%|\\^|&|\\*|\\(|\\)|\\+|=|\\[|\\]|\\||\\:|\"|<|>|\\?|/|'|\\s|\\\\)+"; //$NON-NLS-1$
-	
-	private static final String REGEXP_INVALID_PUBLISHED_PATH_CHARS = "(\\[|#|\\*|\\?|\"|<|>|\\||!|%|/|\\])+"; //$NON-NLS-1$
-
-	private static final String REGEXP_INVALID_PUBLISHED_PATH_CHARS_LINUX = "(\\[|#|\\*|\\?|\"|<|>|\\||!|%|\\])+"; //$NON-NLS-1$
-
-	private static final String REGEXP_INVALID_FILENAME_CHARS = "(\\[|#|/|\\\\|\\:|\\*|\\?|\"|<|>|\\||\\]|\\s)+"; //$NON-NLS-1$
-
-	private static final char[] HEX_DIGITS = { '0', '1', '2', '3', '4', '5',
-			'6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-
-	/**
-	 * Private constructor to prevent this class from being instantiated. All
-	 * methods in this class should be static.
-	 */
-	private StrUtil() {
-	}
-
-	/**
-	 * Tests for null string.
-	 * <p>
-	 * A null string is defined as one that has an empty reference or has zero
-	 * length.
-	 * 
-	 * @param str
-	 *            A string.
-	 * @return <code>true</code> if the given string is a null string.
-	 */
-	public static boolean isNull(String str) {
-		return str == null || str.length() == 0;
-	}
-
-	/**
-	 * Tests for blank string.
-	 * <p>
-	 * A blank string is defined as one that has an empty reference or has zero
-	 * length after the leading and trailing space characters are trimmed.
-	 * 
-	 * @param str
-	 *            A string.
-	 * @return <code>true</code> if the given string is a blank string.
-	 */
-	public static boolean isBlank(String str) {
-		return str == null || str.trim().length() == 0;
-	}
-
-	/**
-	 * Removes the leading and trailing space characters from a string.
-	 * 
-	 * @param str
-	 *            A string.
-	 * @return A string with no leading and trailing space characters.
-	 */
-	public static String trim(String str) {
-		return str == null ? null : str.trim();
-	}
-
-	/**
-	 * Removes whitespace characters (TAB, CR, LF and SPACE) from a string.
-	 * 
-	 * @param str
-	 *            A string.
-	 * @return A string with whitespace characters removed.
-	 */
-	public static String removeWhiteSpaceChars(String str) {
-		int len = (str == null) ? 0 : str.length();
-		for (int i = 0; i < len; i++) {
-			switch (str.charAt(i)) {
-			case '\t':
-			case '\r':
-			case '\n':
-			case ' ':
-				break;
-			default:
-				return str;
-			}
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Splits a string into an array of string tokens.
-	 * 
-	 * @param str
-	 *            A string.
-	 * @param sep
-	 *            A string containing the string separators.
-	 * @param count
-	 *            The desired number of string tokens.
-	 * @return An array of string tokens.
-	 */
-	public static String[] split(String str, String sep, int count) {
-		if (str == null || count == 0 || count < -1) {
-			return null;
-		}
-
-		StringTokenizer tokenizer = new StringTokenizer(str, sep,
-				count == -1 ? false : true);
-
-		if (count == -1) {
-			count = tokenizer.countTokens();
-		}
-
-		String[] result = new String[count];
-		int i = 0;
-		while (tokenizer.hasMoreTokens()) {
-			String t = tokenizer.nextToken();
-			if (i < count) {
-				if ((t.length() == 1) && (sep.indexOf(t) != -1)) {
-					continue;
-				}
-				result[i++] = t;
-			} else {
-				result[count - 1] += t;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Splits a string into an array of string tokens.
-	 * 
-	 * @param str
-	 *            A string.
-	 * @param sep
-	 *            A string containing the string separators.
-	 * @return An array of string tokens.
-	 */
-	public static String[] split(String str, String sep) {
-		return split(str, sep, -1);
-	}
-
-	/**
-	 * Replaces a substring within a string with another substring.
-	 * <p>
-	 * Note: Only the first occurrence of the substring will be replaced.
-	 * 
-	 * @param str
-	 *            A string.
-	 * @param src
-	 *            The substring to replace.
-	 * @param tgt
-	 *            The substring to use for the replacement.
-	 * @return A string with the first substring replaced.
-	 * 
-	 * TODO: Review implementation. Call String.replaceFirst() instead?
-	 */
-	public static String replace(String str, String src, String tgt) {
-		if ((str == null || str.length() == 0)
-				|| (src == null || src.length() == 0)) {
-			return str;
-		}
-
-		String tmpStr = str;
-		int index;
-		while ((index = tmpStr.indexOf(src)) != -1) {
-			tmpStr = tmpStr.substring(0, index) + tgt
-					+ tmpStr.substring(index + src.length());
-		}
-		return tmpStr;
-	}
-
-	/**
-	 * Returns the integer value of a string.
-	 * 
-	 * @param str
-	 *            A string.
-	 * @param defaultValue
-	 *            A default integer value for the string.
-	 * @param The
-	 *            integer value of the given string.
-	 */
-	public static int getIntValue(String str, int defaultValue) {
-		if (StrUtil.isBlank(str)) {
-			return defaultValue;
-		}
-
-		try {
-			return Integer.parseInt(str);
-		} catch (NumberFormatException e) {
-			return defaultValue;
-		}
-	}
-
-	/**
-	 * Returns an array of bytes representing the UTF-8 encoding of a string.
-	 * 
-	 * @param str
-	 *            A string.
-	 * @return A byte array containing the UTF-8 encoding of the given string.
-	 */
-	public static byte[] getUTF8Bytes(String str) {
-		char[] c = str.toCharArray();
-		int len = c.length;
-		int count = 0;
-		for (int i = 0; i < len; i++) {
-			int ch = c[i];
-			if (ch <= 0x7f) {
-				count++;
-			} else if (ch <= 0x7ff) {
-				count += 2;
-			} else {
-				count += 3;
-			}
-		}
-
-		byte[] b = new byte[count];
-		int off = 0;
-		for (int i = 0; i < len; i++) {
-			int ch = c[i];
-			if (ch <= 0x7f) {
-				b[off++] = (byte) ch;
-			} else if (ch <= 0x7ff) {
-				b[off++] = (byte) ((ch >> 6) | 0xc0);
-				b[off++] = (byte) ((ch & 0x3f) | 0x80);
-			} else {
-				b[off++] = (byte) ((ch >> 12) | 0xe0);
-				b[off++] = (byte) (((ch >> 6) & 0x3f) | 0x80);
-				b[off++] = (byte) ((ch & 0x3f) | 0x80);
-			}
-		}
-		return b;
-	}
-
-	/**
-	 * Returns the hexidecimal character representation for an integer.
-	 * 
-	 * @param value
-	 *            An integer.
-	 * @return The hexidecimal representation.
-	 */
-	private static char toHex(int value) {
-		return HEX_DIGITS[(value & 0xF)];
-	}
-
-	/**
-	 * Returns the escaped Unicode representation of a string.
-	 * 
-	 * @param str
-	 *            A string.
-	 * @param skipASCII
-	 *            If true, avoid escaping the ASCII characters.
-	 * @return The escaped Unicode representation of the given string.
-	 */
-	public static String toEscapedUnicode(String str, boolean skipASCII) {
-		int len = str.length();
-		StringBuffer result = new StringBuffer(len * 2);
-
-		for (int i = 0; i < len; i++) {
-			char ch = str.charAt(i);
-
-			if (skipASCII && ch < 0x007E) {
-				result.append(ch);
-			} else {
-				result.append("\\u"); //$NON-NLS-1$
-				result.append(toHex((ch >> 12) & 0xF));
-				result.append(toHex((ch >> 8) & 0xF));
-				result.append(toHex((ch >> 4) & 0xF));
-				result.append(toHex(ch & 0xF));
-			}
-		}
-
-		return result.toString();
-	}
-
-	/**
-	 * Returns the plain text from HTML text.
-	 * <p>
-	 * Note: All HTML tags will be stripped.
-	 * 
-	 * @param html
-	 *            The HTML text.
-	 * @return The plain text representation of the given HTML text.
-	 */
-	public static String getPlainText(String html) {
-		if (html == null) {
-			return ""; //$NON-NLS-1$
-		}
-
-		final Pattern p_plaintext_filter = Pattern.compile(
-				"<[^>]*?>", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
-		final Pattern p_plaintext_filter2 = Pattern.compile(
-				"&.{1,5}[^;];", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
-		final Pattern p_plaintext_filter3 = Pattern.compile(
-				"\\s+", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
-
-		String result = html.replaceAll(p_plaintext_filter.pattern(), " ") //$NON-NLS-1$
-				.replaceAll(p_plaintext_filter2.pattern(), " ") //$NON-NLS-1$
-				.replaceAll(p_plaintext_filter3.pattern(), " "); //$NON-NLS-1$
-		return result;
-	}
-
-	/**
-	 * Converts a string into a valid file name.
-	 * 
-	 * @param str
-	 *            A string.
-	 * @return A valid file name dervied from the given string.
-	 */
-	public static String makeValidFileName(String str) {
-		if (str == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getPlainText(str).replaceAll(REGEXP_INVALID_FILENAME_CHARS, " ").trim(); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public static String removeSpecialCharacters(String str) {
-		if (str == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getPlainText(str).replaceAll(REGEXP_ANY_SPECIAL_CHARS, " ").trim(); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * Returns true if the path does not contain any invalid filename
-	 * characters.
-	 * 
-	 * @param path
-	 *            The file path.
-	 * @return <code>true</code> if the given path contains only valid
-	 *         filename characters.
-	 */
-	public static boolean isValidPublishPath(String path) {
-		// return path.replaceAll(invalidPublishPathCharsRegExp,
-		// "").equals(path);
-
-		if (Platform.getOS().equals(Platform.WS_WIN32)) {
-			return path
-					.replaceAll(REGEXP_INVALID_PUBLISHED_PATH_CHARS, "").equals(path); //$NON-NLS-1$
-		}
-
-		// else default to Linux
-		return path
-				.replaceAll(REGEXP_INVALID_PUBLISHED_PATH_CHARS_LINUX, "").equals(path); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns the lower-case of str unless the current locale is German
-	 * 
-	 * @param str
-	 * @return
-	 */
-	public static String toLower(String str) {
-		if (Platform.getNL().startsWith("de")) { //$NON-NLS-1$
-			return str;
-		}
-		return str.toLowerCase();
-	}
-
-	/**
-	 * escape the " and '
-	 * 
-	 * @param str
-	 * @return
-	 */
-	public static String escape(String str) {
-		return str.replaceAll("'", "\\\\\'").replaceAll("\"", "\\\\\"");
-	}
-	
-	/**
-	 * Converts a <code>List</code> to an String array.
-	 * 
-	 * @param list a <code>List</code>
-	 * @return a String array
-	 */
-	public static String[] convertListToStrArray(List list) {
-		if (list != null) {
-			int cnt = list.size();
-			String[] strArray = new String[cnt];
-
-			for (int i = 0; i < cnt; i++) {
-				String str = (String) list.get(i);
-				strArray[i] = new String(str);
-			}
-			return strArray;
-		} else {
-			return null;
-		}
-	}
-	
-	public static boolean isValidName(String name) {
-		return name.replaceAll(REGEXP_ANY_SPECIAL_CHARS, "").equals(name); //$NON-NLS-1$		
-	}
-	
-	/**
-	 * added some test code
-	 * 
-	 * @param args
-	 */
-	public static void main(String[] args) {
-
-		String text = "A&%      `&#           $~!@#$%^&*()_-+={}[\"]:|\\:;\"'<,>.?/ \t\r\nZ";
-		
-		System.out.println("[" + text + "] <== text");
-		System.out.println("[" + text.replaceAll(REGEXP_ANY_SPECIAL_CHARS, " ") + "] <== All");
-		System.out.println("[" + text.replaceAll(REGEXP_INVALID_FILENAME_CHARS, " ") + "] <== File Name");
-		System.out.println("[" + text.replaceAll(REGEXP_INVALID_PUBLISHED_PATH_CHARS, " ") + "] <== path");
-		System.out.println("[" + text.replaceAll(REGEXP_INVALID_PUBLISHED_PATH_CHARS_LINUX, " ") + "] <== path, Linux");
-		
-		System.out.println("");
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ThreadUtil.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ThreadUtil.java
deleted file mode 100755
index a5b423a..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ThreadUtil.java
+++ /dev/null
@@ -1,41 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-/**
- * Utility class for handling threads.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ThreadUtil {
-
-	/**
-	 * Private constructor to prevent this class from being instantiated. All
-	 * methods in this class should be static.
-	 */
-	private ThreadUtil() {
-	}
-
-	/**
-	 * Puts the current thread to sleep for a given duration.
-	 * 
-	 * @param time
-	 *            The duration in milliseconds.
-	 */
-	public static void pause(long time) {
-		try {
-			Thread.sleep(time);
-		} catch (InterruptedException e) {
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/Timer.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/Timer.java
deleted file mode 100755
index 89f298a..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/Timer.java
+++ /dev/null
@@ -1,49 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-import com.ibm.icu.util.Calendar;
-
-/**
- * A simple timer for tracking time.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class Timer {
-
-	private long initTime;
-
-	private long startTime;
-
-	private long endTime;
-
-	public Timer() {
-		start();
-		initTime = startTime;
-	}
-
-	public void start() {
-		startTime = Calendar.getInstance().getTimeInMillis();
-	}
-
-	public void stop() {
-		endTime = Calendar.getInstance().getTimeInMillis();
-	}
-
-	public int getTime() {
-		return (int) (endTime - startTime);
-	}
-
-	public int getTotalTime() {
-		return (int) (endTime - initTime);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/XMLUtil.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/XMLUtil.java
deleted file mode 100755
index 72eaf63..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/XMLUtil.java
+++ /dev/null
@@ -1,608 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXParseException;
-
-/**
- * Utility class for processing XML documents.
- * 
- * @author Kelvin Low
- * @author Jinhua Xi
- * @since 1.0
- */
-public class XMLUtil {
-
-	/**
-	 * XML declaration.
-	 */
-	public final static String XML_DECLARATION = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"; //$NON-NLS-1$
-
-	/**
-	 * XML Escape characters.
-	 */
-	public final static String XML_AMP = "&amp;"; //$NON-NLS-1$
-	
-	public final static String XML_BACKSLASH = "&#92;"; //$NON-NLS-1$	
-
-	public final static String XML_APOS = "&apos;"; //$NON-NLS-1$
-
-	public final static String XML_CR = "&#13;"; //$NON-NLS-1$
-
-	public final static String XML_GT = "&gt;"; //$NON-NLS-1$
-
-	public final static String XML_LT = "&lt;"; //$NON-NLS-1$
-
-	public final static String XML_LF = "&#10;"; //$NON-NLS-1$	
-
-	public final static String XML_QUOT = "&quot;"; //$NON-NLS-1$
-
-	public final static String XML_TAB = "&#9;"; //$NON-NLS-1$
-
-	private static final String CRLF = "\r\n"; //$NON-NLS-1$
-
-	private static final byte[] CRLF_BYTES = CRLF.getBytes();
-	
-	/**
-	 * Private constructor to prevent this class from being instantiated. All
-	 * methods in this class should be static.
-	 */
-	private XMLUtil() {
-	}
-
-	/**
-	 * Clones the given DOM node into the given DOM document.
-	 * 
-	 * @param node
-	 *            The DOM node to clone.
-	 * @param doc
-	 *            The target DOM document.
-	 * @return The cloned node in the target DOM document.
-	 */
-	public static Node cloneNode(Node node, Document doc) {
-		Node clone = null;
-		switch (node.getNodeType()) {
-		case Node.ELEMENT_NODE:
-			clone = doc.createElement(node.getNodeName());
-			NamedNodeMap attrs = node.getAttributes();
-			for (int i = 0; i < attrs.getLength(); i++) {
-				Node attrNode = attrs.item(i);
-				Attr attrClone = doc.createAttribute(attrNode.getNodeName());
-				attrClone.setNodeValue(attrNode.getNodeValue());
-				((Element) clone).setAttributeNode(attrClone);
-			}
-
-			// Iterate through each child nodes.
-			NodeList childNodes = node.getChildNodes();
-			if (childNodes != null) {
-				for (int i = 0; i < childNodes.getLength(); i++) {
-					Node childNode = childNodes.item(i);
-					Node childClone = cloneNode(childNode, doc);
-					clone.appendChild(childClone);
-				}
-			}
-			break;
-
-		case Node.TEXT_NODE:
-		case Node.CDATA_SECTION_NODE:
-			clone = doc.createTextNode(node.getNodeName());
-			clone.setNodeValue(node.getNodeValue());
-			break;
-		}
-		return clone;
-	}
-	
-	/**
-	 * Escapes a XML attribute to make it XML parser friendly.
-	 * 
-	 * @param str
-	 *            The XML attribute string.
-	 * @return The escaped string.
-	 */
-	public static String escapeAttr(String str) {
-		if (str == null || str.length() == 0)
-			return ""; //$NON-NLS-1$
-		StringBuffer sb = new StringBuffer();
-		int len = str.length();
-		for (int i = 0; i < len; i++) {
-			char ch = str.charAt(i);
-			switch (ch) {
-			case '<':
-				sb.append(XML_LT);
-				break;
-			case '&':
-				sb.append(XML_AMP);
-				break;
-			case '"':
-				sb.append(XML_QUOT);
-				break;
-			default:
-				sb.append(ch);
-				break;
-			}
-		}
-		return sb.toString();
-	}	
-
-	/**
-	 * Escapes the given string to make it XML parser friendly.
-	 * 
-	 * @param str
-	 *            The source string.
-	 * @return The escaped string.
-	 */
-	public static String escape(String str) {
-		if (str == null || str.length() == 0)
-			return ""; //$NON-NLS-1$
-		StringBuffer sb = new StringBuffer();
-		int len = str.length();
-		for (int i = 0; i < len; i++) {
-			char ch = str.charAt(i);
-			switch (ch) {
-			case '<':
-				sb.append(XML_LT);
-				break;
-			case '>':
-				sb.append(XML_GT);
-				break;
-			case '&':
-				sb.append(XML_AMP);
-				break;
-			case '"':
-				sb.append(XML_QUOT);
-				break;
-			case '\'':
-				sb.append(XML_APOS);
-				break;
-			case '\r':
-				sb.append(XML_CR);
-				break;
-			case '\n':
-				sb.append(XML_LF);
-				break;
-			case '\\':
-				sb.append(XML_BACKSLASH);
-				break;
-			default:
-				sb.append(ch);
-				break;
-			}
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * Escapes the given string to make it XML parser friendly.
-	 * 
-	 * @param str
-	 *            The source string.
-	 * @param ignoreCRLF
-	 *            If true, do not escape the CR and LF characters.
-	 * @return The escaped string.
-	 */
-	public static String escape(String str, boolean ignoreCRLF) {
-		if (str == null || str.length() == 0)
-			return ""; //$NON-NLS-1$
-		StringBuffer sb = new StringBuffer();
-		int len = str.length();
-		for (int i = 0; i < len; i++) {
-			char ch = str.charAt(i);
-			switch (ch) {
-			case '<':
-				sb.append(XML_LT);
-				break;
-			case '>':
-				sb.append(XML_GT);
-				break;
-			case '&':
-				sb.append(XML_AMP);
-				break;
-			case '"':
-				sb.append(XML_QUOT);
-				break;
-			case '\'':
-				sb.append(XML_APOS);
-				break;
-			case '\r':
-				if (ignoreCRLF)
-					sb.append(ch);
-				else
-					sb.append(XML_CR);
-				break;
-			case '\n':
-				if (ignoreCRLF)
-					sb.append(ch);
-				else
-					sb.append(XML_LF);
-				break;
-			default:
-				sb.append(ch);
-				break;
-			}
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * Unescapes the given XML string.
-	 * 
-	 * @param str
-	 *            The source string.
-	 * @return The escaped string.
-	 */
-	public static String unescape(String str) {
-		if (str == null || str.length() == 0)
-			return ""; //$NON-NLS-1$
-		StringBuffer sb = new StringBuffer();
-		int len = str.length();
-		for (int i = 0; i < len; i++) {
-			char ch = str.charAt(i);
-			switch (ch) {
-			case '&':
-				if (str.startsWith(XML_LT, i)) {
-					sb.append('<');
-					i += 3;
-				} else if (str.startsWith(XML_GT, i)) {
-					sb.append('>');
-					i += 3;
-				} else if (str.startsWith(XML_AMP, i)) {
-					sb.append('&');
-					i += 4;
-				} else if (str.startsWith(XML_QUOT, i)) {
-					sb.append('"');
-					i += 5;
-				} else if (str.startsWith(XML_APOS, i)) {
-					sb.append("\'"); //$NON-NLS-1$
-					i += 5;
-				} else if (str.startsWith(XML_CR, i)) {
-					sb.append('\r');
-					i += 4;
-				} else if (str.startsWith(XML_LF, i)) {
-					sb.append('\n');
-					i += 4;
-				} else {
-					sb.append(ch);
-				}
-				break;
-			default:
-				sb.append(ch);
-				break;
-			}
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * Writes the content of the given DOM document to the output stream.
-	 * 
-	 * @param xmlDoc
-	 *            The DOM document.
-	 * @param output
-	 *            The output stream.
-	 * @throws IOException
-	 *             if an I/O error occur while accessing the output stream.
-	 */
-	public static void writeDocument(Document xmlDoc, OutputStream output)
-			throws IOException {
-		DataOutputStream out = new DataOutputStream(output);
-		writeNode(xmlDoc, "", out); //$NON-NLS-1$
-		out.flush();
-	}
-
-	/**
-	 * Writes the content of the given DOM document to the PrintWriter.
-	 * 
-	 * @param xmlDoc
-	 *            The DOM document.
-	 * @param pw
-	 *            The PrintWriter object.
-	 * @throws IOException
-	 *             if an I/O error occur while accessing the output stream.
-	 */
-	public static void writeDocument(Document xmlDoc, PrintWriter pw)
-			throws IOException {
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		DataOutputStream out = new DataOutputStream(os);
-		writeNode(xmlDoc, "", out); //$NON-NLS-1$
-		out.flush();
-		// FIXME! Need to specify encoding?
-		String s = os.toString();
-		pw.write(s);
-		pw.flush();
-	}
-
-	/**
-	 * Saves the content of the given DOM document to file.
-	 * 
-	 * @param xmlDoc
-	 *            The DOM document.
-	 * @param xmlFile
-	 *            The XML file.
-	 * @throws IOException
-	 *             if an I/O error occur while accessing the output stream.
-	 */
-	public static void saveDocument(Document xmlDoc, String xmlFile)
-			throws IOException {
-		DataOutputStream out = new DataOutputStream(new FileOutputStream(
-				xmlFile));
-		writeNode(xmlDoc, "", out); //$NON-NLS-1$
-		out.flush();
-		out.close();
-	}
-
-	/**
-	 * Saves the given XML string to the given file.
-	 * 
-	 * @param xmlStr
-	 *            The XML string.
-	 * @param xmlFile
-	 *            The XML file.
-	 * @throws IOException
-	 *             if an I/O error occur while accessing the output stream.
-	 */
-	public static void saveDocument(String xmlStr, String xmlFile)
-			throws IOException {
-		DataOutputStream out = new DataOutputStream(new FileOutputStream(
-				xmlFile));
-		out.write(xmlStr.getBytes());
-		out.flush();
-		out.close();
-	}
-
-	/**
-	 * Writes the given DOM tree node to the given output stream.
-	 * 
-	 * @param node
-	 *            The DOM node.
-	 * @param indent
-	 *            The string indentation (containing space characters).
-	 * @param out
-	 *            The output stream.
-	 * @throws IOException
-	 *             if an I/O error occur while accessing the output stream.
-	 */
-	private static void writeNode(Node node, String indent, DataOutputStream out)
-			throws IOException {
-		String text;
-
-		switch (node.getNodeType()) {
-		case Node.DOCUMENT_NODE:
-			// Write the XML file signature.
-			out.write(StrUtil.getUTF8Bytes(XML_DECLARATION));
-			out.write(CRLF_BYTES);
-
-			// Iterate through each child nodes.
-			NodeList nodes = node.getChildNodes();
-			if (nodes != null) {
-				for (int i = 0; i < nodes.getLength(); i++) {
-					writeNode(nodes.item(i), "", out); //$NON-NLS-1$
-				}
-			}
-			break;
-
-		case Node.ELEMENT_NODE:
-			String name = node.getNodeName();
-			out.write(StrUtil.getUTF8Bytes(indent + "<" + name)); //$NON-NLS-1$
-			NamedNodeMap attrs = node.getAttributes();
-			for (int i = 0; i < attrs.getLength(); i++) {
-				Node attrNode = attrs.item(i);
-				out.write(StrUtil.getUTF8Bytes(" " + attrNode.getNodeName() //$NON-NLS-1$
-						+ "=\"" + escape(attrNode.getNodeValue()) + "\"")); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			out.write(StrUtil.getUTF8Bytes(">")); //$NON-NLS-1$
-			out.write(CRLF_BYTES);
-
-			// Iterate through each child nodes.
-			NodeList childNodes = node.getChildNodes();
-			if (childNodes != null) {
-				for (int i = 0; i < childNodes.getLength(); i++) {
-					writeNode(childNodes.item(i), indent, out);
-				}
-			}
-			out.write(StrUtil.getUTF8Bytes(indent + "</" + name + ">")); //$NON-NLS-1$ //$NON-NLS-2$
-			out.write(CRLF_BYTES);
-
-			break;
-
-		case Node.TEXT_NODE:
-			text = StrUtil.removeWhiteSpaceChars(node.getNodeValue());
-			if (text.length() > 0) {
-				out.write(StrUtil.getUTF8Bytes(escape(text)));
-			}
-			break;
-
-		case Node.CDATA_SECTION_NODE:
-			text = StrUtil.removeWhiteSpaceChars(node.getNodeValue());
-			if (text.length() > 0) {
-				out.write(StrUtil.getUTF8Bytes("<![CDATA[")); //$NON-NLS-1$
-				out.write(StrUtil.getUTF8Bytes(text));
-				out.write(StrUtil.getUTF8Bytes("]]>")); //$NON-NLS-1$
-				out.write(CRLF_BYTES);
-			}
-			break;
-
-		case Node.PROCESSING_INSTRUCTION_NODE:
-			out.write(StrUtil.getUTF8Bytes("<?" + node.getNodeName() //$NON-NLS-1$
-					+ " " + node.getNodeValue() + "?>")); //$NON-NLS-1$ //$NON-NLS-2$
-			out.write(CRLF_BYTES);
-			break;
-
-		case Node.ENTITY_REFERENCE_NODE:
-			out.write(StrUtil.getUTF8Bytes("&" + node.getNodeName() + ";")); //$NON-NLS-1$ //$NON-NLS-2$
-			break;
-		}
-	}
-
-	/**
-	 * Returns the file location where the given SAX exception occurred.
-	 * 
-	 * @param e
-	 *            The SAX parse exception.
-	 * @return A string containing the file location where the exception
-	 *         occurred.
-	 */
-	public static String getLocationOfException(SAXParseException e) {
-		StringBuffer sb = new StringBuffer();
-		sb.append("row "); //$NON-NLS-1$
-		sb.append(e.getLineNumber());
-		sb.append(", col "); //$NON-NLS-1$
-		sb.append(e.getColumnNumber());
-
-		String systemId = e.getSystemId();
-		if (systemId != null) {
-			int index = systemId.lastIndexOf('/');
-			if (index != -1) {
-				systemId = systemId.substring(index + 1);
-			}
-			sb.append(" of XML document "); //$NON-NLS-1$
-			sb.append(systemId);
-		}
-
-		return sb.toString();
-	}
-
-	public static Document loadXml(File file) throws Exception {
-		DocumentBuilderFactory builderFactory = DocumentBuilderFactory
-				.newInstance();
-		DocumentBuilder builder = builderFactory.newDocumentBuilder();
-
-		return builder.parse(file);
-	}
-
-	public static Document createDocument() throws Exception {
-		DocumentBuilderFactory builderFactory = DocumentBuilderFactory
-				.newInstance();
-		DocumentBuilder builder = builderFactory.newDocumentBuilder();
-		return builder.newDocument();
-	}
-
-	/**
-	 * text of a leaf node, without child element
-	 * 
-	 * @param tag
-	 * @return String
-	 */
-	public static String getNodeText(Element tag) {
-		String text = tag.toString();
-		int i = text.indexOf(">"); //$NON-NLS-1$
-		int j = text.lastIndexOf("</"); //$NON-NLS-1$
-		if (i < 0 || j < 0 || j < i) {
-			return ""; //$NON-NLS-1$
-		}
-
-		return text.substring(i + 1, j);
-	}
-
-	public static String getChildText(Element tag, String childTagName) {
-		Element child = getFirstChild(tag, childTagName);
-		if (child != null) {
-			return getNodeText(child);
-		}
-
-		return ""; //$NON-NLS-1$
-	}
-
-	public static Element getFirstChild(Element tag, String childTagName) {
-		NodeList nodes = tag.getElementsByTagName(childTagName);
-		if (nodes == null || nodes.getLength() == 0) {
-			return null;
-		}
-
-		return (Element) nodes.item(0);
-	}
-
-	/**
-	 * iterator of all the children of the element
-	 * 
-	 * @param tag
-	 * @return Iterator
-	 */
-	public static Iterator childIterator(Element tag) {
-		NodeList nodes = tag.getChildNodes();
-
-		// NodeList contains no Element nodes such as text nodes, ignore those
-		List elements = new ArrayList();
-		if (nodes != null) {
-			int size = nodes.getLength();
-			for (int i = 0; i < size; i++) {
-				Node node = nodes.item(i);
-				if (node instanceof Element) {
-					elements.add(node);
-				}
-			}
-		}
-
-		return elements.iterator();
-	}
-
-	private static class NodeIterator implements Iterator {
-		int currentIndex = -1;
-
-		int size = 0;
-
-		NodeList nodes = null;
-
-		public NodeIterator(NodeList nodes) {
-			this.nodes = nodes;
-			if (nodes != null)
-				size = nodes.getLength();
-		}
-
-		public void remove() {
-			// Do nothing, this is a readonly iterator.
-		}
-
-		public boolean hasNext() {
-			return currentIndex + 1 < size;
-		}
-
-		public Object next() {
-			if (hasNext()) {
-				return nodes.item(++currentIndex);
-			}
-
-			return null;
-		}
-	}
-	
-	/**
-	 * iterator of all the children of the element
-	 * 
-	 * @param tag
-	 * @return Iterator
-	 */
-	public static Iterator childIterator(Element tag, String childTagName) {
-		NodeList nodes = tag.getElementsByTagName(childTagName);
-		return new NodeIterator(nodes);
-	}
-
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ZipUtil.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ZipUtil.java
deleted file mode 100755
index e8b730d..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ZipUtil.java
+++ /dev/null
@@ -1,106 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * Utility class for reading and writing zip files.
- * 
- * @author Kelvin Low
- * @since 1.2
- */
-public class ZipUtil {
-
-	/**
-	 * Creates a zip file.
-	 * 
-	 * @param zipFilePath
-	 *            an absolute path to the target zip file
-	 * @param contentPath
-	 *            an absolute path to a directory containing the files and sub
-	 *            directories to be zipped
-	 * @param monitor
-	 *            a progress monitor
-	 * @throws IOException
-	 *             if an error occurs while creating the zip file
-	 */
-	public static void createZipFile(String zipFilePath, String contentPath,
-			IProgressMonitor monitor) throws IOException {
-		ZipOutputStream out = null;
-		try {
-			out = new ZipOutputStream(new FileOutputStream(
-					zipFilePath));
-			File contentDir = new File(contentPath);
-			populateZipFile(out, contentDir.getAbsolutePath(), contentDir,
-					monitor);
-		} catch (IOException e) {
-			throw e;
-		} catch (Exception e) {
-			throw new IOException(e.getMessage());
-		}
-		finally {
-			if (out != null) {
-				try {
-					out.close();
-				}
-				catch (Exception e) {
-				}
-			}
-		}
-	}
-
-	/**
-	 * Populates a zip file with directories and files.
-	 * 
-	 * @param out
-	 *            a zip file output stream
-	 * @param rootPath
-	 *            a root path that is used to compute the relative paths of the
-	 *            zip content
-	 * @param file
-	 *            a file or directory
-	 * @param monitor
-	 *            a progress monitor
-	 */
-	public static void populateZipFile(ZipOutputStream out, String rootPath,
-			File file, IProgressMonitor monitor) throws IOException {
-		File[] files = file.listFiles();
-		if (files != null) {
-			for (int i = 0; i < files.length; i++) {
-				if (files[i].isDirectory()) {
-					populateZipFile(out, rootPath, files[i], monitor);
-				} else {
-					String filePath = files[i].getAbsolutePath();
-					FileInputStream in = new FileInputStream(filePath);
-					String relativePath = filePath
-							.substring(rootPath.length() + 1);
-					out.putNextEntry(new ZipEntry(relativePath));
-					byte[] buffer = new byte[1024];
-					int len;
-					while ((len = in.read(buffer)) > 0) {
-						out.write(buffer, 0, len);
-					}
-					out.closeEntry();
-					in.close();
-				}
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/package.html b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/package.html
deleted file mode 100755
index 7216baa9..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides common clipboard, file, I18N, image, networking, string manipulation and threading services.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/AbstractSAXParser.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/AbstractSAXParser.java
deleted file mode 100755
index 4c91a1d..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/AbstractSAXParser.java
+++ /dev/null
@@ -1,216 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.xml;
-
-import java.io.File;
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.epf.common.utils.NetUtil;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.common.utils.XMLUtil;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * An abstract SAX parser that can be used to parse a single XML file or a
- * directory of XML files.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public abstract class AbstractSAXParser extends DefaultHandler {
-
-	/**
-	 * The logger used for logging warnings, errors and exceptions.
-	 */
-	protected Logger logger;
-
-	/**
-	 * The name of the current XML file being parsed.
-	 */
-	protected String xmlFile;
-
-	/**
-	 * The String buffer for accumulating text.
-	 */
-	protected StringBuffer strBuf;
-
-	/**
-	 * The XML validating flag.
-	 */
-	private boolean validating;
-
-	/**
-	 * Creates a new <code>AbstractSaxParser</code> given the validating flag.
-	 * 
-	 * @param logger
-	 *            The logger for logging warnings and errors.
-	 * @param validating
-	 *            If true, validate the XML document.
-	 */
-	public AbstractSAXParser(Logger logger, boolean validating) {
-		this.logger = logger;
-		this.validating = validating;
-	}
-
-	/**
-	 * Parses the given XML directory or file.
-	 * 
-	 * @param xmlPath
-	 *            The XML directory or file.
-	 */
-	public void parse(String xmlPath) {
-		String pathName = StrUtil.replace(xmlPath, "%20", " "); //$NON-NLS-1$ //$NON-NLS-2$
-		File path = new File(pathName);
-		File[] files = path.isFile() ? new File[] { path } : path.listFiles();
-		if (files != null) {
-			for (int i = 0; i < files.length; i++) {
-				if (!files[i].isDirectory()) {
-					try {
-						parseFile(files[i].getAbsoluteFile());
-					} catch (Exception e) {
-						if (logger != null) {
-							logger
-									.logError(
-											"Failed to parse \"" + files[i].getAbsolutePath() + '"', e); //$NON-NLS-1$						
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Parses the given XML file.
-	 * 
-	 * @param xmlFile
-	 *            The XML file.
-	 */
-	protected void parseFile(File xmlFile) throws ParserConfigurationException,
-			IOException, SAXException {
-		// Create the SAX parser factory.
-		SAXParserFactory spf = SAXParserFactory.newInstance();
-
-		// Set the XML validating flag.
-		spf.setValidating(validating);
-
-		// Create the SAX parser.
-		SAXParser saxParser = spf.newSAXParser();
-
-		// Get the SAX XML reader.
-		XMLReader xmlReader = saxParser.getXMLReader();
-
-		// Set the SAX parser handlers to this class.
-		xmlReader.setContentHandler(this);
-		xmlReader.setErrorHandler(this);
-
-		// Instruct the SAX parser to parse the given XML file.
-		this.xmlFile = xmlFile.getAbsolutePath();
-		xmlReader.parse(NetUtil.getUri(xmlFile));
-	}
-
-	/**
-	 * Called when the XML parser starts to parse the document.
-	 */
-	public void startDocument() {
-		strBuf = new StringBuffer();
-	}
-
-	/**
-	 * Called when the the XML parser encounters the chararacter data within a
-	 * text element.
-	 */
-	public void characters(char[] buffer, int start, int length) {
-		strBuf.append(buffer, start, length);
-	}
-
-	/**
-	 * Called when the parser starts to parse each new element.
-	 */
-	public abstract void startElement(String namespaceURL, String localName,
-			String qname, Attributes attributes);
-
-	/**
-	 * Called when the XML parser reaches the end of the an element.
-	 */
-	public abstract void endElement(String namespaceURL, String localName,
-			String qname);
-
-	/**
-	 * Called when the XML parser reaches the end of the document.
-	 */
-	public void endDocument() {
-	}
-
-	/**
-	 * Logs the SAX parsing warning.
-	 * 
-	 * @param e
-	 *            The SAX parse exception.
-	 */
-	public void warning(SAXParseException e) {
-		if (logger != null) {
-			logger
-					.logWarning("SAX parsing warning encountered at " //$NON-NLS-1$
-							+ XMLUtil.getLocationOfException(e)
-							+ ": " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Logs the SAX parsing error.
-	 * 
-	 * @param e
-	 *            The SAX parse exception.
-	 */
-	public void error(SAXParseException e) {
-		if (logger != null) {
-			logger
-					.logError("SAX parsing error encountered at " //$NON-NLS-1$
-							+ XMLUtil.getLocationOfException(e)
-							+ ": " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Logs the SAX non-recoverable error and exits.
-	 * 
-	 * @param e
-	 *            The SAX parse exception.
-	 */
-	public void fatalError(SAXParseException e) throws SAXException {
-		if (logger != null) {
-			logger
-					.logError("SAX parsing fatal error encountered at " //$NON-NLS-1$
-							+ XMLUtil.getLocationOfException(e)
-							+ ": " + e.getMessage()); //$NON-NLS-1$
-			logger.logError(e);
-		}
-	}
-
-	/**
-	 * Returns the current XML file that is being parsed.
-	 * 
-	 * @return The name of the XML file.
-	 */
-	public String getXMLFile() {
-		return xmlFile;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/XSLTProcessor.java b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/XSLTProcessor.java
deleted file mode 100755
index b37313a..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/XSLTProcessor.java
+++ /dev/null
@@ -1,404 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.xml;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.eclipse.epf.common.CommonPlugin;
-
-/**
- * A wrapper over the XSLT processor bundled with the JRE.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class XSLTProcessor {
-
-	// If true, cache the compiled the XSL transformer with the compiled XSL
-	// templates.
-	private static boolean cacheXSL;
-
-	// Caches the XSL transformers.
-	private static Map<String, Transformer> transformerCache;
-
-	static {
-		String cacheXSLProperty = CommonPlugin.getDefault().getString(
-				"cacheXSL"); //$NON-NLS-1$
-		if (cacheXSLProperty != null && !cacheXSLProperty.startsWith("[")) { //$NON-NLS-1$
-			cacheXSL = Boolean.getBoolean(cacheXSLProperty);
-		} else {
-			cacheXSL = true;
-		}
-		if (cacheXSL) {
-			transformerCache = new HashMap<String, Transformer>();
-		}
-		
-		// Increase the entity expansion line limit to handle a larger number of XML entities. 
-		System.setProperty("entityExpansionLimit", "1000000");
-	}
-
-	/**
-	 * Default private constructor to prevent this class from being
-	 * instantiated.
-	 */
-	private XSLTProcessor() {
-	}
-
-	/**
-	 * Executes the XSL transformation given the XSL source, XML source, target
-	 * output and encoding.
-	 * 
-	 * @param xslSource
-	 *            The XSL source.
-	 * @param xmlSource
-	 *            The XML source.
-	 * @param output
-	 *            The output target.
-	 * @param params
-	 *            The parameters for the XSL transformation.
-	 * @param encoding
-	 *            The target encoding.
-	 */
-	public static void transform(Source xslSource, Source xmlSource,
-			Writer output, Properties params, String encoding) throws Exception {
-		if (xslSource != null && xmlSource != null) {
-			Transformer transformer = null;
-			String xslFile = xslSource.getSystemId();
-			if (cacheXSL && xslFile != null) {
-				synchronized (transformerCache) {
-					transformer = (Transformer) transformerCache.get(xslFile);
-					if (transformer == null) {
-						TransformerFactory factory = TransformerFactory
-								.newInstance();
-						transformer = factory.newTransformer(xslSource);
-						transformerCache.put(xslFile, transformer);
-					}
-				}
-			} else {
-				TransformerFactory factory = TransformerFactory.newInstance();
-				transformer = factory.newTransformer(xslSource);
-			}
-			if (params != null && params.size() > 0) {
-				for (Iterator i = params.keySet().iterator(); i.hasNext();) {
-					String paramName = (String) i.next();
-					String paramValue = params.getProperty(paramName);
-					transformer.setParameter(paramName, paramValue);
-				}
-			}
-			if (encoding != null && encoding.length() > 0) {
-				transformer.setOutputProperty("encoding", encoding); //$NON-NLS-1$
-			} else {
-				transformer.setOutputProperty("encoding", "utf-8"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			transformer.transform(xmlSource, new StreamResult(output));
-		}
-	}
-
-	/**
-	 * Executes the XSL transformation given the XSL source, XML source, target
-	 * output and encoding.
-	 * 
-	 * @param xslSource
-	 *            The XSL source.
-	 * @param xmlSource
-	 *            The XML source.
-	 * @param output
-	 *            The output target.
-	 * @param encoding
-	 *            The target encoding.
-	 */
-	public static void transform(Source xslSource, Source xmlSource,
-			Writer output, String encoding) throws Exception {
-		transform(xslSource, xmlSource, output, null, encoding);
-	}
-
-	/**
-	 * Executes the XSL transformation given the XSL stylesheet URI, XML source,
-	 * target output and encoding.
-	 * 
-	 * @param xslURI
-	 *            The XSL stylesheet URI.
-	 * @param xmlStr
-	 *            The XML source.
-	 * @param output
-	 *            The output target.
-	 * @param params
-	 *            The parameters for the XSL transformation.
-	 * @param encoding
-	 *            The target encoding.
-	 */
-	public static void transform(String xslUri, Source xmlSource,
-			Writer output, Properties params, String encoding) throws Exception {
-		InputStream xslInput = getXslInputStream(xslUri);
-		if (xslInput != null) {
-			StreamSource xslSource = new StreamSource(xslInput);
-			xslSource.setSystemId(new File(xslUri));
-			transform(xslSource, xmlSource, output, params, encoding);
-			try {
-				xslInput.close();
-			} catch (Exception e) {
-			}
-		}
-	}
-
-	/**
-	 * Executes the XSL transformation given the XSL stylesheet URI, XML source,
-	 * target output and encoding.
-	 * 
-	 * @param xslURI
-	 *            The XSL stylesheet URI.
-	 * @param xmlStr
-	 *            The XML source.
-	 * @param output
-	 *            The output target.
-	 * @param encoding
-	 *            The target encoding.
-	 */
-	public static void transform(String xslUri, Source xmlSource,
-			Writer output, String encoding) throws Exception {
-		transform(xslUri, xmlSource, output, null, encoding);
-	}
-
-	/**
-	 * Executes the XSL transformation given the XSL stylesheet URI, XML string,
-	 * target output and encoding.
-	 * 
-	 * @param xslURI
-	 *            The XSL stylesheet URI.
-	 * @param xmlStr
-	 *            The XML string.
-	 * @param output
-	 *            The output target.
-	 * @param params
-	 *            The parameters for the XSL transformation.
-	 * @param encoding
-	 *            The target encoding.
-	 */
-	public static void transform(String xslUri, String xmlStr, Writer output,
-			Properties params, String encoding) throws Exception {
-		InputStream xslInput = getXslInputStream(xslUri);
-		if (xslInput != null) {
-			StreamSource xslSource = new StreamSource(xslInput);
-			xslSource.setSystemId(new File(xslUri));
-
-			byte[] xml = xmlStr.getBytes("utf-8"); //$NON-NLS-1$
-			ByteArrayInputStream xmlInput = new ByteArrayInputStream(xml);
-			StreamSource xmlSource = new StreamSource(xmlInput);
-
-			transform(xslSource, xmlSource, output, params, encoding);
-
-			try {
-				xslInput.close();
-			} catch (Exception e) {
-			}
-		}
-	}
-
-	/**
-	 * Executes the XSL transformation given the XSL stylesheet URI, XML string,
-	 * target output and encoding.
-	 * 
-	 * @param xslURI
-	 *            The XSL stylesheet URI.
-	 * @param xmlStr
-	 *            The XML string.
-	 * @param output
-	 *            The output target.
-	 * @param encoding
-	 *            The target encoding.
-	 */
-	public static void transform(String xslUri, String xmlStr, Writer output,
-			String encoding) throws Exception {
-		transform(xslUri, xmlStr, output, null, encoding);
-	}
-
-	/**
-	 * Executes the XSL transformation given the XSL stylesheet URI, XML string,
-	 * target output and encoding.
-	 * 
-	 * @param xslURI
-	 *            The XSL stylesheet URI.
-	 * @param xmlStr
-	 *            The XML string.
-	 * @param file
-	 *            The output file.
-	 * @param params
-	 *            The parameters for the XSL transformation.
-	 * @param encoding
-	 *            The target encoding.
-	 */
-	public static void transform(String xslUri, String xmlStr, File file,
-			Properties params, String encoding) throws Exception {
-		FileWriter output = new FileWriter(file);
-		if (output != null) {
-			transform(xslUri, xmlStr, output, params, encoding);
-			try {
-				output.close();
-			} catch (Exception e) {
-			}
-		}
-	}
-
-	/**
-	 * Executes the XSL transformation given the XSL stylesheet URI, XML string,
-	 * target output and encoding.
-	 * 
-	 * @param xslURI
-	 *            The XSL stylesheet URI.
-	 * @param xmlStr
-	 *            The XML string.
-	 * @param file
-	 *            The output file.
-	 * @param encoding
-	 *            The target encoding.
-	 */
-	public static void transform(String xslUri, String xmlStr, File file,
-			String encoding) throws Exception {
-		transform(xslUri, xmlStr, file, null, encoding);
-	}
-
-	/**
-	 * Executes the XSL transformation given the XSL stylesheet URI, XML source
-	 * and target output.
-	 * 
-	 * @param xslURI
-	 *            The XSL stylesheet URI.
-	 * @param xmlStr
-	 *            The XML source.
-	 * @param params
-	 *            The parameters for the XSL transformation.
-	 * @param output
-	 *            The output target.
-	 */
-	public static void transform(String xslUri, Source xmlSource,
-			Properties params, Writer output) throws Exception {
-		transform(xslUri, xmlSource, output, params, null);
-	}
-
-	/**
-	 * Executes the XSL transformation given the XSL stylesheet URI, XML source
-	 * and target output.
-	 * 
-	 * @param xslURI
-	 *            The XSL stylesheet URI.
-	 * @param xmlStr
-	 *            The XML source.
-	 * @param output
-	 *            The output target.
-	 */
-	public static void transform(String xslUri, Source xmlSource, Writer output)
-			throws Exception {
-		transform(xslUri, xmlSource, output, null, null);
-	}
-
-	/**
-	 * Executes the XSL transformation given the XSL stylesheet URI, XML string
-	 * and target output.
-	 * 
-	 * @param xslURI
-	 *            The XSL stylesheet URI.
-	 * @param xmlStr
-	 *            The XML string.
-	 * @param params
-	 *            The parameters for the XSL transformation.
-	 * @param output
-	 *            The output target.
-	 */
-	public static void transform(String xslUri, String xmlStr,
-			Properties params, Writer output) throws Exception {
-		transform(xslUri, xmlStr, output, params, null);
-	}
-
-	/**
-	 * Executes the XSL transformation given the XSL stylesheet URI, XML string
-	 * and target output.
-	 * 
-	 * @param xslURI
-	 *            The XSL stylesheet URI.
-	 * @param xmlStr
-	 *            The XML string.
-	 * @param output
-	 *            The output target.
-	 */
-	public static void transform(String xslUri, String xmlStr, Writer output)
-			throws Exception {
-		transform(xslUri, xmlStr, output, null, null);
-	}
-
-	/**
-	 * Executes the XSL transformation given the XSL stylesheet URI, XML string
-	 * and target output file.
-	 * 
-	 * @param xslURI
-	 *            The XSL stylesheet URI.
-	 * @param xmlStr
-	 *            The XML string.
-	 * @param params
-	 *            The parameters for the XSL transformation.
-	 * @param output
-	 *            The output target.
-	 */
-	public static void transform(String xslUri, String xmlStr,
-			Properties params, File file) throws Exception {
-		transform(xslUri, xmlStr, file, params, null);
-	}
-
-	/**
-	 * Executes the XSL transformation given the XSL stylesheet URI, XML string
-	 * and target output file.
-	 * 
-	 * @param xslURI
-	 *            The XSL stylesheet URI.
-	 * @param xmlStr
-	 *            The XML string.
-	 * @param output
-	 *            The output target.
-	 */
-	public static void transform(String xslUri, String xmlStr, File file)
-			throws Exception {
-		transform(xslUri, xmlStr, file, null, null);
-	}
-
-	/**
-	 * Returns the XSL input stream given the XSL stylesheet URI.
-	 * 
-	 * @param xslURI
-	 *            The XSL stylesheet URI.
-	 */
-	private static InputStream getXslInputStream(String xslUri) {
-		InputStream xslInput = null;
-		try {
-			xslInput = new FileInputStream(xslUri);
-		} catch (Exception e) {
-			if (xslInput == null) {
-				xslInput = XSLTProcessor.class.getClassLoader()
-						.getResourceAsStream(xslUri);
-			}
-		}
-		return xslInput;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/package.html b/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/package.html
deleted file mode 100755
index 82ca741..0000000
--- a/plugins/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides XML and XSLT processing services.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.dataexchange/.classpath b/plugins/org.eclipse.epf.dataexchange/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/plugins/org.eclipse.epf.dataexchange/.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/plugins/org.eclipse.epf.dataexchange/.cvsignore b/plugins/org.eclipse.epf.dataexchange/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.dataexchange/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.dataexchange/.project b/plugins/org.eclipse.epf.dataexchange/.project
deleted file mode 100755
index 21b9e88..0000000
--- a/plugins/org.eclipse.epf.dataexchange/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.dataexchange</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/plugins/org.eclipse.epf.dataexchange/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.dataexchange/META-INF/MANIFEST.MF
deleted file mode 100755
index a529f05..0000000
--- a/plugins/org.eclipse.epf.dataexchange/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.dataexchange
-Bundle-Version: 1.2.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.epf.library
-Export-Package: org.eclipse.epf.dataexchange.importing,
- org.eclipse.epf.dataexchange.internal.importing,
- org.eclipse.epf.dataexchange.util
diff --git a/plugins/org.eclipse.epf.dataexchange/build.properties b/plugins/org.eclipse.epf.dataexchange/build.properties
deleted file mode 100755
index 37d9849..0000000
--- a/plugins/org.eclipse.epf.dataexchange/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               plugin.properties
diff --git a/plugins/org.eclipse.epf.dataexchange/plugin.properties b/plugins/org.eclipse.epf.dataexchange/plugin.properties
deleted file mode 100755
index b626c54..0000000
--- a/plugins/org.eclipse.epf.dataexchange/plugin.properties
+++ /dev/null
@@ -1,12 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-pluginName=EPF Data Exchange Plug-in
-providerName=Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/importing/LibraryService.java b/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/importing/LibraryService.java
deleted file mode 100755
index 5e47236..0000000
--- a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/importing/LibraryService.java
+++ /dev/null
@@ -1,48 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.dataexchange.importing;
-
-import org.eclipse.epf.dataexchange.internal.importing.LibraryServiceImpl;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodPlugin;
-
-
-/**
- * Library service for importing external library/plugins into the current library.
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public interface LibraryService {
-
-	public static LibraryService INSTANCE = new LibraryServiceImpl();
-	/**
-	 * create a new MethodPlugin and add to the library, perform initialization as needed
-	 * @param name
-	 * @return MethodPlugin 
-	 */
-	public MethodPlugin createPlugin(String name, String guid) throws Exception;
-
-	/**
-	 * create a MethodConfiguration for this library
-	 * @param name
-	 * @return MethodConfiguration
-	 */
-	public MethodConfiguration createConfiguration(String name, String guid);
-
-	/**
-	 * create a plugin service for the specified plugin
-	 * @param plugin MethodPlugin
-	 * @return PluginService
-	 */
-	public PluginService createPluginService(MethodPlugin plugin);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/importing/PluginService.java b/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/importing/PluginService.java
deleted file mode 100755
index e455635..0000000
--- a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/importing/PluginService.java
+++ /dev/null
@@ -1,200 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.dataexchange.importing;
-
-import java.util.List;
-
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Artifact;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Deliverable;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.Iteration;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.Outcome;
-import org.eclipse.epf.uma.Phase;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.Report;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.Roadmap;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.Template;
-import org.eclipse.epf.uma.TermDefinition;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.Whitepaper;
-import org.eclipse.epf.uma.WorkProductType;
-
-/**
- * Plugin service for importing external plugin data into the current library
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public interface PluginService {
-
-	public ContentPackage getContentPackageRoot();
-
-	/**
-	 * create a Discipline object add add to the system default Disciplines package
-	 * @param name
-	 * @return Discipline
-	 */
-	public Discipline createDiscipline();
-
-	/**
-	 * create a DisciplineGrouping object add add to the system default Disciplines package
-	 * @param name
-	 * @return DisciplineGrouping
-	 */
-	public DisciplineGrouping createDisciplineGrouping();
-
-	/**
-	 * create a Tool object add add to the system default Tools package
-	 * @param name
-	 * @return Tool
-	 */
-	public Tool createTool();
-
-	/**
-	 * create a Domain object add add to the system default Domains package
-	 * @param name
-	 * @return Domain
-	 */
-	public Domain createDomain();
-
-	/**
-	 * create a WorkProductType object add add to the system default WorkProductTypes package
-	 * @param name
-	 * @return WorkProductType
-	 */
-	public WorkProductType createWorkProductType();
-
-	/**
-	 * create a RoleSet object add add to the system default RoleSets package
-	 * @param name
-	 * @return RoleSet
-	 */
-	public RoleSet createRoleSet();
-
-	/**
-	 * create a RoleSetGrouping object add add to the system default RoleSets package
-	 * @param name
-	 * @return RoleSetGrouping
-	 */
-	public RoleSetGrouping createRoleSetGrouping();
-
-	/**
-	 * create a CustomCategory object add add to the system default CustomCategories package
-	 * @param name
-	 * @return CustomCategory
-	 */
-	public CustomCategory createCustomCategory(CustomCategory parent);
-
-	/**
-	 * create a CapabilityPattern object add add to the system default CapabilityPatterns package
-	 * perform other initializations as needed, such as create the containing ProcessComponent.
-	 * @param name
-	 * @return ProcessService a ProcessService that contains the created CapabilityPattern
-	 */
-	public CapabilityPattern createCapabilityPattern(MethodConfiguration defaultConfig);
-
-	/**
-	 * create a DeliveryProcess object add add to the system default DeliveryProcesses package.
-	 * perform other initializations as needed, such as create the containing ProcessComponent.
-	 * @param name
-	 * @return ProcessService a ProcessService that contains the created DeliveryProcess
-	 */
-	public DeliveryProcess createDeliveryProcess(MethodConfiguration defaultConfig);
-
-	/**
-	 * create a content package as the child of the internal root content package,
-	 * @return ContentPackageService a ContentPackageService that contains the created ContentPackage
-	 */
-	public ContentPackage createContentPackage(ContentPackage container);
-
-
-	/**
-	 * create a new child package
-	 * @return ContentPackageService a ContentPackageService for the created package
-	 */
-	//public ContentPackage createChildPackage(ContentPackage container);
-
-	public Artifact createArtifact(ContentPackage container);
-	public Checklist createChecklist(ContentPackage container);
-	public Concept createConcept(ContentPackage container);
-	public Deliverable createDeliverable(ContentPackage container);
-	public Example createExample(ContentPackage container);
-	public Guidance createGuidance(ContentPackage container);
-	public Outcome createOutcome(ContentPackage container);
-	public Practice createPractice(ContentPackage container);
-	public Report createReport(ContentPackage container);
-	public ReusableAsset createReusableAsset(ContentPackage container);
-	public Roadmap createRoadmap(ContentPackage container);
-	public Role createRole(ContentPackage container);
-	public SupportingMaterial createSupportingMaterial(ContentPackage container);
-	public Task createTask(ContentPackage container);
-	public Template createTemplate(ContentPackage container);
-	public TermDefinition createTermDefinition(ContentPackage container);
-	public ToolMentor createToolMentor(ContentPackage container);
-	public Whitepaper createWhitepaper(ContentPackage container);
-
-
-	/**
-	 * create a new Activity as a breakdown element of the servicing element.
-	 * @return Activity
-	 */
-	public Activity createActivity(Activity superActivity);
-
-	/**
-	 * create a new Phase as a breakdown element of the servicing element.
-	 * @return Phase
-	 */
-	public Phase createPhase(Activity superActivity);
-
-	/**
-	 * create a new Iteration as a breakdown element of the servicing element.
-	 * @return Iteration
-	 */
-	public Iteration createIteration(Activity superActivity);
-
-	/**
-	 * create a new Milestone as a breakdown element of the servicing element.
-	 * @return Milestone
-	 */
-	public Milestone createMilestone(Activity superActivity);
-
-
-	/**
-	 * add the task and create the breakdown elements associated with the task
-	 * call this method only when the cross references (Roles, workproducts) of the Task is already established.
-	 * @param element
-	 */
-	public void addTaskToActivity(Activity act, Task element);
-
-	public void addTasksToActivity(Activity act, List tasks);
-
-}
diff --git a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/importing/package.html b/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/importing/package.html
deleted file mode 100755
index 344bb89..0000000
--- a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/importing/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces for the data exchange service.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/internal/importing/LibraryServiceImpl.java b/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/internal/importing/LibraryServiceImpl.java
deleted file mode 100755
index 59b26f4..0000000
--- a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/internal/importing/LibraryServiceImpl.java
+++ /dev/null
@@ -1,99 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.dataexchange.internal.importing;
-
-import org.eclipse.epf.dataexchange.importing.LibraryService;
-import org.eclipse.epf.dataexchange.importing.PluginService;
-import org.eclipse.epf.library.util.ModelStorage;
-import org.eclipse.epf.persistence.MethodLibraryPersister;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.UmaFactory;
-
-/**
- * Library service for importing external library/plugins into the current
- * library.
- * 
- * @author Jinhua Xi
- * @since 1.0
- * 
- * TODO: Merge with org.eclipse.epf.library.LibraryService
- */
-public class LibraryServiceImpl implements LibraryService {
-
-	public LibraryServiceImpl() {
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.LibraryService#createPlugin(String, String)
-	 */
-	public MethodPlugin createPlugin(String name, String guid) throws Exception {
-		MethodPlugin plugin = UmaFactory.eINSTANCE.createMethodPlugin();
-		plugin.setName(name);
-		plugin.setGuid(guid);
-
-		// initialize the plugin
-		plugin = ModelStorage.initialize(plugin);
-
-		// MUST save the plugin before process anything else
-		// this method call will cause resource refresh which is not desired in
-		// the importing process
-		MethodLibrary library = org.eclipse.epf.library.LibraryService
-				.getInstance().getCurrentMethodLibrary();
-				
-		library.getMethodPlugins().add(plugin);
-		
-		// 150063 - XML import: CP/DPs are unresovled after XML plugin import 
-		// need to save tht library and plugin resources specifically, can't use saveLibrary
-//		LibraryUtil.saveLibrary(library, false, false);
-		MethodLibraryPersister.INSTANCE.save(library.eResource());
-		MethodLibraryPersister.INSTANCE.save(plugin.eResource());
-
-		// still mark the resource as dirty
-		library.eResource().setModified(true);
-		plugin.eResource().setModified(true);
-		return plugin;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.LibraryService#createConfiguration(String, String)
-	 */
-	public MethodConfiguration createConfiguration(String name, String guid) {
-		MethodConfiguration config = UmaFactory.eINSTANCE
-				.createMethodConfiguration();
-		config.setName(name);
-		config.setGuid(guid);
-
-		MethodLibrary library = org.eclipse.epf.library.LibraryService
-				.getInstance().getCurrentMethodLibrary();
-		boolean oldNotify = library.eDeliver();
-		try {
-			library.eSetDeliver(false);
-			library.getPredefinedConfigurations().add(config);
-		} finally {
-			library.eSetDeliver(oldNotify);
-		}
-
-		return config;
-	}
-
-	/**
-	 * create a plugin service for the specified plugin
-	 * 
-	 * @param plugin
-	 *            MethodPlugin
-	 * @return PluginService
-	 */
-	public PluginService createPluginService(MethodPlugin plugin) {
-		return new PluginServiceImpl(plugin);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/internal/importing/PluginServiceImpl.java b/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/internal/importing/PluginServiceImpl.java
deleted file mode 100755
index 92594b8..0000000
--- a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/internal/importing/PluginServiceImpl.java
+++ /dev/null
@@ -1,545 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.dataexchange.internal.importing;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.epf.dataexchange.importing.PluginService;
-import org.eclipse.epf.library.edit.process.command.WBSDropCommand;
-import org.eclipse.epf.library.edit.util.ModelStructure;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Artifact;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Deliverable;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.Iteration;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.Outcome;
-import org.eclipse.epf.uma.Phase;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.Report;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.Roadmap;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.Template;
-import org.eclipse.epf.uma.TermDefinition;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.Whitepaper;
-import org.eclipse.epf.uma.WorkProductType;
-import org.eclipse.epf.uma.util.UmaUtil;
-
-
-/**
- * Plugin service for importing external plugin data into the current library
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public class PluginServiceImpl implements PluginService {
-
-	MethodPlugin plugin;
-
-	public PluginServiceImpl(MethodPlugin element)
-	{
-		plugin = element;
-	}
-
-	/**
-	 * get the method plughin
-	 * @return {@link MethodPlugin}
-	 */
-	public MethodPlugin getPlugin()
-	{
-		return (MethodPlugin)plugin;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#getContentPackageRoot()
-	 */
-	public ContentPackage getContentPackageRoot()
-	{
-		return UmaUtil.findContentPackage(plugin, ModelStructure.DEFAULT.coreContentPath);
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createDiscipline()
-	 */
-	public Discipline createDiscipline() {
-		Discipline d = UmaFactory.eINSTANCE.createDiscipline();
-		ContentPackage pkg = (ContentPackage)UmaUtil.findMethodPackage(getPlugin(), ModelStructure.DEFAULT.disciplineDefinitionPath);
-		pkg.getContentElements().add(d);
-
-		return d;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createDisciplineGrouping()
-	 */
-	public DisciplineGrouping createDisciplineGrouping() {
-		DisciplineGrouping d = UmaFactory.eINSTANCE.createDisciplineGrouping();
-		ContentPackage pkg = (ContentPackage)UmaUtil.findMethodPackage(getPlugin(), ModelStructure.DEFAULT.disciplineDefinitionPath);
-		pkg.getContentElements().add(d);
-
-		return d;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createTool()
-	 */
-	public Tool createTool() {
-		Tool tool = UmaFactory.eINSTANCE.createTool();
-		ContentPackage pkg = UmaUtil.findContentPackage(getPlugin(), ModelStructure.DEFAULT.toolPath);
-		((ContentPackage)pkg).getContentElements().add(tool);
-		return tool;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createDomain()
-	 */
-	public Domain createDomain() {
-		Domain d = UmaFactory.eINSTANCE.createDomain();
-		ContentPackage pkg = UmaUtil.findContentPackage(getPlugin(), ModelStructure.DEFAULT.domainPath);
-		((ContentPackage)pkg).getContentElements().add(d);
-		return d;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createWorkProductType()
-	 */
-	public WorkProductType createWorkProductType() {
-		WorkProductType w = UmaFactory.eINSTANCE.createWorkProductType();
-		ContentPackage pkg = UmaUtil.findContentPackage(getPlugin(), ModelStructure.DEFAULT.workProductTypePath);
-		((ContentPackage)pkg).getContentElements().add(w);
-		return w;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createRoleSet()
-	 */
-	public RoleSet createRoleSet() {
-		RoleSet r = UmaFactory.eINSTANCE.createRoleSet();
-		ContentPackage pkg = UmaUtil.findContentPackage(getPlugin(), ModelStructure.DEFAULT.roleSetPath);
-		((ContentPackage)pkg).getContentElements().add(r);
-		return r;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createRoleSetGrouping()
-	 */
-	public RoleSetGrouping createRoleSetGrouping() {
-		RoleSetGrouping r = UmaFactory.eINSTANCE.createRoleSetGrouping();
-		ContentPackage pkg = UmaUtil.findContentPackage(getPlugin(), ModelStructure.DEFAULT.roleSetPath);
-		((ContentPackage)pkg).getContentElements().add(r);
-		return r;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createCustomCategory(CustomCategory)
-	 */
-	public CustomCategory createCustomCategory(CustomCategory parent) {
-		ContentPackage pkg = UmaUtil.findContentPackage(getPlugin(), ModelStructure.DEFAULT.customCategoryPath);
-		CustomCategory c = UmaFactory.eINSTANCE.createCustomCategory();
-
-		// also need to add the category object into the parent package
-		pkg.getContentElements().add(c);
-		if ( parent != null )
-		{
-			((CustomCategory)parent).getCategorizedElements().add(c);
-		}
-		else
-		{
-			// add to the root category
-			TngUtil.getRootCustomCategory(getPlugin()).getCategorizedElements().add(c);
-		}
-
-		return c;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createCapabilityPattern(MethodConfiguration)
-	 */
-	public CapabilityPattern createCapabilityPattern(MethodConfiguration defaultConfig) {
-
-		CapabilityPattern cp = UmaFactory.eINSTANCE.createCapabilityPattern();
-		cp.setDefaultContext(defaultConfig);
-
-		ProcessPackage capabilityPatternPkgs = (ProcessPackage)UmaUtil.findMethodPackage(getPlugin(), ModelStructure.DEFAULT.capabilityPatternPath);
-		List items = capabilityPatternPkgs.getChildPackages();
-
-		// need to create a package for this capability pattern
-		//System.out.println("Create pkg, TODIO");
-		// to add a capability process, you need to create a ProcessComponent package to hold the process
-		org.eclipse.epf.uma.ProcessComponent pc = UmaFactory.eINSTANCE.createProcessComponent();
-		pc.setGuid(EcoreUtil.generateUUID());
-		items.add(pc);
-		pc.setProcess(cp);
-
-		return cp;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createDeliveryProcess(MethodConfiguration)
-	 */
-	public DeliveryProcess createDeliveryProcess(MethodConfiguration defaultConfig) {
-		DeliveryProcess dp = UmaFactory.eINSTANCE.createDeliveryProcess();
-		dp.setDefaultContext(defaultConfig);
-
-		// this is the package that stores all capability patterns
-		MethodPlugin plugin = getPlugin();
-		ProcessPackage deliveryProcessPkgs = (ProcessPackage)UmaUtil.findMethodPackage(plugin, ModelStructure.DEFAULT.deliveryProcessPath);
-		List items = deliveryProcessPkgs.getChildPackages();
-
-		// you need to create a ProcessComponent package to hold the process
-		org.eclipse.epf.uma.ProcessComponent pc = UmaFactory.eINSTANCE.createProcessComponent();
-		pc.setGuid(EcoreUtil.generateUUID());
-		items.add(pc);
-		pc.setProcess(dp);
-
-		return dp;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createContentPackage(ContentPackage)
-	 */
-	public ContentPackage createContentPackage(ContentPackage container) {
-
-		ContentPackage pkg = UmaFactory.eINSTANCE.createContentPackage();
-		if ( container == null)
-		{
-			container = UmaUtil.findContentPackage(getPlugin(), ModelStructure.DEFAULT.coreContentPath);
-		}
-		container.getChildPackages().add(pkg);
-		return pkg;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createArtifact(ContentPackage)
-	 */
-	public Artifact createArtifact(ContentPackage container) {
-		Artifact e = UmaFactory.eINSTANCE.createArtifact();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createChecklist(ContentPackage)
-	 */
-	public Checklist createChecklist(ContentPackage container) {
-		Checklist e = UmaFactory.eINSTANCE.createChecklist();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createConcept(ContentPackage)
-	 */
-	public Concept createConcept(ContentPackage container) {
-		Concept e = UmaFactory.eINSTANCE.createConcept();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createDeliverable(ContentPackage)
-	 */
-	public Deliverable createDeliverable(ContentPackage container) {
-		Deliverable e = UmaFactory.eINSTANCE.createDeliverable();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createExample(ContentPackage)
-	 */
-	public Example createExample(ContentPackage container) {
-		Example e = UmaFactory.eINSTANCE.createExample();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createGuidance(ContentPackage)
-	 */
-	public Guidance createGuidance(ContentPackage container) {
-		Guidance e = UmaFactory.eINSTANCE.createGuideline();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createOutcome(ContentPackage)
-	 */
-	public Outcome createOutcome(ContentPackage container) {
-		Outcome e = UmaFactory.eINSTANCE.createOutcome();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createPractice(ContentPackage)
-	 */
-	public Practice createPractice(ContentPackage container) {
-		Practice e = UmaFactory.eINSTANCE.createPractice();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createReport(ContentPackage)
-	 */
-	public Report createReport(ContentPackage container) {
-		Report e = UmaFactory.eINSTANCE.createReport();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createReusableAsset(ContentPackage)
-	 */
-	public ReusableAsset createReusableAsset(ContentPackage container) {
-		ReusableAsset e = UmaFactory.eINSTANCE.createReusableAsset();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createRoadmap(ContentPackage)
-	 */
-	public Roadmap createRoadmap(ContentPackage container) {
-		Roadmap e = UmaFactory.eINSTANCE.createRoadmap();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createRole(ContentPackage)
-	 */
-	public Role createRole(ContentPackage container) {
-		Role e = UmaFactory.eINSTANCE.createRole();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createSupportingMaterial(ContentPackage)
-	 */
-	public SupportingMaterial createSupportingMaterial(ContentPackage container) {
-		SupportingMaterial e = UmaFactory.eINSTANCE.createSupportingMaterial();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createTask(ContentPackage)
-	 */
-	public Task createTask(ContentPackage container) {
-		Task e = UmaFactory.eINSTANCE.createTask();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createTemplate(ContentPackage)
-	 */
-	public Template createTemplate(ContentPackage container) {
-		Template e = UmaFactory.eINSTANCE.createTemplate();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createTermDefinition(ContentPackage)
-	 */
-	public TermDefinition createTermDefinition(ContentPackage container) {
-		TermDefinition e = UmaFactory.eINSTANCE.createTermDefinition();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createToolMentor(ContentPackage)
-	 */
-	public ToolMentor createToolMentor(ContentPackage container) {
-		ToolMentor e = UmaFactory.eINSTANCE.createToolMentor();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createWhitepaper(ContentPackage)
-	 */
-	public Whitepaper createWhitepaper(ContentPackage container) {
-		Whitepaper e = UmaFactory.eINSTANCE.createWhitepaper();
-		container.getContentElements().add(e);
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createActivity(Activity)
-	 */
-	public Activity createActivity(Activity superActivity) {
-		Activity e = UmaFactory.eINSTANCE.createActivity();
-		superActivity.getBreakdownElements().add(e);
-
-		addActivityToContainer(e);
-		
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createPhase(Activity)
-	 */
-	public Phase createPhase(Activity superActivity) {
-		Phase e = UmaFactory.eINSTANCE.createPhase();
-		superActivity.getBreakdownElements().add(e);
-
-		addActivityToContainer(e);
-
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createIteration(Activity)
-	 */
-	public Iteration createIteration(Activity superActivity) {
-		Iteration e = UmaFactory.eINSTANCE.createIteration();
-		superActivity.getBreakdownElements().add(e);
-
-		addActivityToContainer(e);
-
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#createMilestone(Activity)
-	 */
-	public Milestone createMilestone(Activity superActivity) {
-		Milestone e = UmaFactory.eINSTANCE.createMilestone();
-		superActivity.getBreakdownElements().add(e);
-
-		return e;
-	}
-
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#addTaskToActivity(Activity, Task)
-	 */
-	public void addTaskToActivity(Activity act, Task task) {
-		addTasksToActivity(act, Collections.singletonList(task));
-	}
-	
-	/**
-	 * @see org.eclipse.epf.dataexchange.importing.PluginService#addTasksToActivity(Activity, List)
-	 */
-	public void addTasksToActivity(final Activity act, final List tasks) {
-		// this method does not work any moredue to later changes
-		// use our own code instead
-		//ProcessUtil.addTaskToActivity(task, act);
-		
-		// before doing the command, make sure the object is 
-		// in the default configuration of the owing process
-		// otherwise you will get msg box asking for that, which may cause error for background process
-		org.eclipse.epf.uma.Process proc = TngUtil.getOwningProcess(act);
-		MethodConfiguration config = proc.getDefaultContext();
-		if ( config != null ) {
-			
-			for (Iterator it = tasks.iterator(); it.hasNext(); ) {
-				Task task = (Task)it.next();			
-				MethodPackage pkg = (MethodPackage)task.eContainer();
-				List pkgs = config.getMethodPackageSelection();
-				if ( !pkgs.contains(pkg) ) {
-					pkgs.add(pkg);
-				}
-			}
-		}
-
-		SafeUpdateController.syncExec(new Runnable() {public void run() {
-			WBSDropCommand cmd = new WBSDropCommand(act, tasks);
-			try {
-					cmd.execute();
-			} catch (Exception ex) {
-				ex.printStackTrace();
-			}	
-			finally {
-				cmd.dispose();
-			}	
-	    }});
-	}
-
-	/**
-	 * get process component for the element
-	 * @param e BreakdownElement
-	 * @return ProcessComponent
-	 */
-	public static ProcessComponent getProcessComponent(BreakdownElement e) {
-		
-		if ( e.eContainer() == null ) {
-			Activity parent = e.getSuperActivities();
-			if ( parent == null ) {
-				return null;
-			}
-			
-			return getProcessComponent(parent);
-		}
-	
-		EObject container;
-		for (container = e.eContainer(); container != null
-				&& !(container instanceof ProcessComponent); container = container
-				.eContainer())
-			;
-
-		if ( container != null ) {
-			return ((ProcessComponent) container);
-		}
-		
-		return null;
-	}
-	
-	private void addActivityToContainer(Activity act) {
-		ProcessComponent pc = getProcessComponent(act);
-		if ( pc != null ) {
-			// create a process package for the activity
-			 ProcessPackage pkg = UmaFactory.eINSTANCE.createProcessPackage();
-			 pkg.setName(act.getName());
-			 pkg.setGuid(EcoreUtil.generateUUID());
-			 pc.getChildPackages().add(pkg);
-			 
-			 pkg.getProcessElements().add(act);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/internal/importing/package.html b/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/internal/importing/package.html
deleted file mode 100755
index 2b01da3..0000000
--- a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/internal/importing/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the implementation for the data exchange service.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/BaseResourceHandler.java b/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/BaseResourceHandler.java
deleted file mode 100755
index 062c254..0000000
--- a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/BaseResourceHandler.java
+++ /dev/null
@@ -1,49 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.dataexchange.util;
-
-import java.io.File;
-
-import org.eclipse.epf.library.util.ResourceHelper;
-
-/**
- * content resource handler to process the respources in the content
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public abstract class BaseResourceHandler implements IResourceHandler {
-
-	protected File sourceLibRoot;
-	protected File targetLibRoot;
-
-	public BaseResourceHandler(File sourceLibRoot, File targetLibRoot) {
-		this.sourceLibRoot = sourceLibRoot;
-		this.targetLibRoot = targetLibRoot;
-	}
-	
-	public abstract UrlInfo resolveFileUrl(Object owner, String srcUrl) throws Exception;
-	
-	
-	/**
-	 * copying the resource file from the source library to the target
-	 * 
-	 * @param sourceFile the file path relative to the source root
-	 */
-	public void copyResource(String sourceFile) {
-		File src = new File(sourceLibRoot, sourceFile);
-		if ( src.exists() ) {
-			File tgt = new File(targetLibRoot, sourceFile);
-			ResourceHelper.copyFile(src, tgt);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/ContentProcessor.java b/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/ContentProcessor.java
deleted file mode 100755
index db6a03f..0000000
--- a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/ContentProcessor.java
+++ /dev/null
@@ -1,241 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.dataexchange.util;
-
-import java.io.File;
-import java.util.StringTokenizer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.epf.library.util.ResourceHelper;
-
-
-
-/**
- * content processer to fix references and copy resources to the target library location
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public class ContentProcessor {
-
-	protected static final Pattern p_src_ref = Pattern.compile("src\\s*=\\s*\"(.*?)\"", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
-//	protected static final Pattern p_link_ref = Pattern.compile("<a\\s+?([^>]*)>(.*?)</a>", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
-	protected static final Pattern p_href_ref = Pattern.compile("href\\s*=\\s*\"(.*?)\"", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
-
-	IResourceHandler handler;
-	ILogger logger;
-	
-	public ContentProcessor(IResourceHandler handler, ILogger logger) {
-		this.handler = handler;
-		this.logger = logger;
-	}
-	
-	/**
-	 * resovle the resource string for the given owner. 
-	 * The owner is a method element, but can be either from uma model or xml model. 
-	 * @param owner
-	 * @param source
-	 * @return
-	 */
-	public String resolveResourceFiles(Object owner, String source) {
-		StringBuffer sb = new StringBuffer();
-
-		try
-		{
-			// process images and other src resources
-			Matcher m = p_src_ref.matcher(source);
-			while ( m.find() )
-			{
-				String url = m.group(1);
-				String new_url  = processResourceUrl(owner, url);
-				String replacement = "src=\"" + new_url + "\""; 		 //$NON-NLS-1$ //$NON-NLS-2$
-				m.appendReplacement(sb, fixReplacementStr(replacement));
-			}
-			m.appendTail(sb);
-			
-			// process hrefs
-			m = p_href_ref.matcher(sb.toString());
-			sb.setLength(0);
-			
-			while ( m.find() )
-			{
-				String url = m.group(1);
-				String mark = ""; //$NON-NLS-1$
-
-				int index = url.indexOf("#"); //$NON-NLS-1$
-				if ( index >= 0 )
-				{
-					mark = url.substring(index);
-					url = url.substring(0, index);
-				}
-
-				if ( url.length() > 0 )
-				{
-					url = processResourceUrl(owner, url);
-				}
-				m.appendReplacement(sb, fixReplacementStr("href=\"" + url + mark + "\"")); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			m.appendTail(sb);
-			
-			// anything else ???
-			
-		}
-		catch (Exception ex)
-		{
-			ex.printStackTrace();
-		}
-		
-		//System.out.println(sb);
-		
-		return sb.toString();
-	}
-	
-	private String fixReplacementStr(String str) {
-		// escape the $ since it's treated as a group sequence
-		try {
-			int index = str.indexOf("$"); //$NON-NLS-1$
-			if ( index < 0 ) {
-				return str;
-			}
-			
-			StringBuffer b = new StringBuffer();
-			int start = 0;
-			while ( index >= 0 ) {
-				b.append(str.substring(start, index)).append("\\$"); //$NON-NLS-1$
-				start = index+1;
-				index = str.indexOf("$", start); //$NON-NLS-1$
-			}
-			
-			b.append(str.substring(start));
-			
-			return b.toString();
-		
-		} catch (RuntimeException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-		return str;
-	}
-	
-	protected boolean isFileUrl(String url)
-	{
-		//System.out.println("Processing image url [" + url + "]");
-		if ( 	url == null || url.length() == 0
-				|| url.startsWith("http") //$NON-NLS-1$
-				|| url.startsWith("www.") //$NON-NLS-1$
-				|| url.startsWith("mailto:") //$NON-NLS-1$
-				|| url.toLowerCase().indexOf("javascript:") >=0 ) //$NON-NLS-1$
-		{
-			return false;
-		}
-
-		return true;
-	}
-	
-	protected boolean isValidFilePath(File f) {
-		return (f != null) && f.exists();
-	}
-	
-
-	public String processResourceUrl(Object owner, String url)
-	{
-		if ( !isFileUrl(url) )
-		{
-			return url;
-		}
-
-		UrlInfo info = null;
-		try {
-			info = handler.resolveFileUrl(owner, url);
-		} catch (Exception ex) {
-			logger.logWarning("error processing url '" + url + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-			return url;
-		}
-		
-		if ( info.sourceFile == null || info.targetFile == null ) {
-			return url;
-		}
-		
-		if ( info.sourceFile.isFile() && info.sourceFile.exists() )
-		{
-			ResourceHelper.copyFile(info.sourceFile, info.targetFile);
-			
-			// return the fixed target url if the file exists 
-			// and is copied over to the target location
-			return info.targetUrl;
-		}
-
-		return url;
-	}
-
-
-	/**
-	 * process the url, update the result buffer, and return the associated element if any
-	 * @param source teh url text string
-	 * @param result StringBuffer
-	 * @return MethodElement the linked element or null
-	 */
-	protected void processUrlText(Object owner, String source)
-	{
-		Matcher m = p_href_ref.matcher(source);
-		if ( m.find() )
-		{
-			String url = m.group(1);
-			if ( url.toLowerCase().indexOf("javaScript:") < 0 ) //$NON-NLS-1$
-			{
-				int index = url.indexOf("#"); //$NON-NLS-1$
-				if ( index >= 0 )
-				{
-					url = url.substring(0, index);
-				}
-
-				if ( url.length() > 0 )
-				{
-					processResourceUrl(owner, url);
-				}
-			}
-		}
-	}
-	
-	public void copyResource(String sourceFile) {
-		handler.copyResource(sourceFile);
-	}
-	
-	/**
-	 * this method is for resolveing the template attachment resources
-	 * The resource is a set of urls seperated by |
-	 * 
-	 * @param owner
-	 * @param urls
-	 * @return String
-	 */
-	public String resolveAttachmentResources(Object owner, String urls) {
-		if ( (urls != null) && urls.length() != 0 ) {
-			StringBuffer buffer = new StringBuffer();
-			StringTokenizer st = new StringTokenizer(urls, "|"); // this is hardcoded somehow
-			while (st.hasMoreTokens() ) {
-				String url = st.nextToken();
-				url = processResourceUrl(owner, url);
-				if ( buffer.length() > 0 ) {
-					buffer.append("|");
-				}
-				buffer.append(url);
-			}
-			
-			return buffer.toString();
-		}
-		
-		return "";
-	}
-}
diff --git a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/DefaultLogger.java b/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/DefaultLogger.java
deleted file mode 100755
index c4f950b..0000000
--- a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/DefaultLogger.java
+++ /dev/null
@@ -1,36 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.dataexchange.util;
-
-import java.io.PrintStream;
-
-public class DefaultLogger implements ILogger {
-
-	protected PrintStream info = System.out;
-	protected PrintStream warning = System.out;
-	protected PrintStream error = System.err;
-	public void logError(String message, Throwable th) {
-		error.println();
-		if ( th != null ) {
-			th.printStackTrace(error);
-		}	
-	}
-	public void logWarning(String message) {
-		warning.println(message);
-	}
-	public void logMessage(String message) {
-		info.println(message);
-	}
-
-	public void dispose() {
-		
-	}
-}
diff --git a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/FileLogger.java b/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/FileLogger.java
deleted file mode 100755
index ba500bf..0000000
--- a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/FileLogger.java
+++ /dev/null
@@ -1,74 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.dataexchange.util;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.PrintStream;
-
-/**
- * file Logger class
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public class FileLogger extends DefaultLogger {
-
-	public static final String ERROR_LOG_FILENAME = "error.log"; //$NON-NLS-1$
-
-	public static final String WARNING_LOG_FILENAME = "warning.log"; //$NON-NLS-1$
-
-	public static final String INFO_LOG_FILENAME = "info.log"; //$NON-NLS-1$
-
-	protected File logPath;
-
-	public FileLogger(File logPath) {
-		this.logPath = logPath;
-
-		if (!this.logPath.exists()) {
-			this.logPath.mkdirs();
-		}
-
-		super.info = getStream(new File(logPath, INFO_LOG_FILENAME));
-		super.warning = getStream(new File(logPath, WARNING_LOG_FILENAME));
-		super.error = getStream(new File(logPath, ERROR_LOG_FILENAME));
-
-	}
-
-	private PrintStream getStream(File f) {
-		try {
-			File dir = f.getParentFile();
-			dir.mkdirs();
-
-			if (!f.exists()) {
-				f.createNewFile();
-			}
-
-			return new PrintStream(new FileOutputStream(f), true);
-		} catch (Exception e) {
-
-		}
-
-		return null;
-	}
-
-	public void dispose() {
-		info.close();
-		warning.close();
-		error.close();
-
-	}
-	
-	public File getLogPath() {
-		return logPath;
-	}
-}
diff --git a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/ILogger.java b/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/ILogger.java
deleted file mode 100755
index 30f15bb..0000000
--- a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/ILogger.java
+++ /dev/null
@@ -1,29 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.dataexchange.util;
-
-/**
- * Logger interface for export and import
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public interface ILogger {
-
-	public void logError(String message, Throwable th);
-	
-	public void logWarning(String message);
-	
-	public void logMessage(String message);
-	
-	public void dispose();
-}
diff --git a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/IResourceHandler.java b/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/IResourceHandler.java
deleted file mode 100755
index 15f728a..0000000
--- a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/IResourceHandler.java
+++ /dev/null
@@ -1,30 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.dataexchange.util;
-
-/**
- * Resource handler interface for xml export and import
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public interface IResourceHandler {
-
-	public UrlInfo resolveFileUrl(Object owner, String srcUrl) throws Exception;
-
-	/**
-	 * copying the resource file from the source library to the target
-	 * 
-	 * @param sourceFile the file path relative to the source root
-	 */
-	public void copyResource(String sourceFile);
-}
diff --git a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/UrlInfo.java b/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/UrlInfo.java
deleted file mode 100755
index 7c2e8c8..0000000
--- a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/UrlInfo.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.dataexchange.util;
-
-import java.io.File;
-
-/**
- * Data structure to store url info in content
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public class UrlInfo {
-
-	public File sourceFile;
-	public File targetFile;
-	public String sourceUrl;
-	public String targetUrl;
-}
diff --git a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/package.html b/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/package.html
deleted file mode 100755
index b69c60f..0000000
--- a/plugins/org.eclipse.epf.dataexchange/src/org/eclipse/epf/dataexchange/util/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides implementation support for the data exchange service.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.diagram/.classpath b/plugins/org.eclipse.epf.diagram/.classpath
deleted file mode 100755
index 065ac06..0000000
--- a/plugins/org.eclipse.epf.diagram/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.diagram/.cvsignore b/plugins/org.eclipse.epf.diagram/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.diagram/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.diagram/.project b/plugins/org.eclipse.epf.diagram/.project
deleted file mode 100755
index 4f267b7..0000000
--- a/plugins/org.eclipse.epf.diagram/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.diagram</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.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.epf.diagram/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.diagram/META-INF/MANIFEST.MF
deleted file mode 100755
index 042fb4c..0000000
--- a/plugins/org.eclipse.epf.diagram/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.diagram; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.epf.library.edit,
- org.eclipse.core.runtime,
- org.eclipse.draw2d,
- org.eclipse.emf.transaction
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.diagram,
- org.eclipse.epf.diagram.model,
- org.eclipse.epf.diagram.model.impl,
- org.eclipse.epf.diagram.model.util
diff --git a/plugins/org.eclipse.epf.diagram/build.properties b/plugins/org.eclipse.epf.diagram/build.properties
deleted file mode 100755
index a72e3cd..0000000
--- a/plugins/org.eclipse.epf.diagram/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               .project,\
-               META-INF/,\
-               plugin.properties,\
-               plugin.xml
-
diff --git a/plugins/org.eclipse.epf.diagram/model/diagram.ecore b/plugins/org.eclipse.epf.diagram/model/diagram.ecore
deleted file mode 100755
index c0a78ec..0000000
--- a/plugins/org.eclipse.epf.diagram/model/diagram.ecore
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="model"
-    nsURI="http://www.eclipse.org/epf/diagram/1.0.0/diagram.ecore" nsPrefix="org.eclipse.epf.diagram.model">
-  <eClassifiers xsi:type="ecore:EClass" name="Diagram" eSuperTypes="#//NodeContainer"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Link" eSuperTypes="#//LinkedObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral=""/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" eType="#//Node"
-        eOpposite="#//Node/outgoingConnections"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//Node"
-        eOpposite="#//Node/incomingConnections"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bendpoints" upperBound="-1"
-        eType="#//AbsoluteBendpoint" transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sourceEndPoint" eType="#//Point"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetEndPoint" eType="#//Point"
-        transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LinkedObject" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="linkedElement" eType="ecore:EClass ../../org.eclipse.epf.uma/model/1.0.4/uma.ecore#//MethodElement"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="object" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NamedNode" eSuperTypes="#//Node">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Node" abstract="true" eSuperTypes="#//LinkedObject">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" eType="#//Point"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        transient="true" defaultValueLiteral="-1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        transient="true" defaultValueLiteral="-1"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="incomingConnections" upperBound="-1"
-        eType="#//Link" eOpposite="#//Link/target"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoingConnections" upperBound="-1"
-        eType="#//Link" containment="true" resolveProxies="false" eOpposite="#//Link/source"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="readOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ActivityDiagram" eSuperTypes="#//Diagram"/>
-  <eClassifiers xsi:type="ecore:EClass" name="TypedNode" eSuperTypes="#//Node">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductDependencyDiagram" eSuperTypes="#//Diagram"/>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductNode" eSuperTypes="#//NamedNode">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ActivityDetailDiagram" eSuperTypes="#//Diagram">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="autoLayout" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NodeContainer" abstract="true" eSuperTypes="#//Node">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
-        eType="#//Node" containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleNode" eSuperTypes="#//NamedNode"/>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleTaskComposite" eSuperTypes="#//NodeContainer">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rowIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TaskNode" eSuperTypes="#//NamedNode">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="index" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="-1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductDescriptorNode" eSuperTypes="#//NamedNode"/>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkBreakdownElementNode" eSuperTypes="#//NamedNode"/>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductComposite" eSuperTypes="#//NodeContainer">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="AbsoluteBendpoint" instanceClassName="org.eclipse.draw2d.AbsoluteBendpoint"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Point" instanceClassName="org.eclipse.draw2d.geometry.Point"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="RoleDescriptor" instanceClassName="org.eclipse.epf.uma.RoleDescriptor"/>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.epf.diagram/model/diagram.genmodel b/plugins/org.eclipse.epf.diagram/model/diagram.genmodel
deleted file mode 100755
index f2759d4..0000000
--- a/plugins/org.eclipse.epf.diagram/model/diagram.genmodel
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.epf.diagram/src"
-    modelPluginID="org.eclipse.epf.diagram" modelName="Diagram" importerID="org.eclipse.emf.importer.java"
-    usedGenPackages="../../org.eclipse.epf.uma/model/1.0.4/uma.genmodel#//uma">
-  <foreignModel>@model</foreignModel>
-  <genPackages prefix="Model" basePackage="org.eclipse.epf.diagram" disposableProviderFactory="true"
-      ecorePackage="diagram.ecore#/">
-    <genDataTypes ecoreDataType="diagram.ecore#//AbsoluteBendpoint"/>
-    <genDataTypes ecoreDataType="diagram.ecore#//Point"/>
-    <genDataTypes ecoreDataType="diagram.ecore#//RoleDescriptor"/>
-    <genClasses ecoreClass="diagram.ecore#//Diagram"/>
-    <genClasses ecoreClass="diagram.ecore#//Link">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Link/name"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference diagram.ecore#//Link/source"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diagram.ecore#//Link/target"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Link/bendpoints"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Link/sourceEndPoint"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Link/targetEndPoint"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="diagram.ecore#//LinkedObject">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diagram.ecore#//LinkedObject/linkedElement"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//LinkedObject/object"/>
-    </genClasses>
-    <genClasses ecoreClass="diagram.ecore#//NamedNode">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//NamedNode/name"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="diagram.ecore#//Node">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Node/location"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Node/width"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Node/height"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diagram.ecore#//Node/incomingConnections"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diagram.ecore#//Node/outgoingConnections"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Node/readOnly"/>
-    </genClasses>
-    <genClasses ecoreClass="diagram.ecore#//ActivityDiagram"/>
-    <genClasses ecoreClass="diagram.ecore#//TypedNode">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//TypedNode/type"/>
-    </genClasses>
-    <genClasses ecoreClass="diagram.ecore#//WorkProductDependencyDiagram"/>
-    <genClasses ecoreClass="diagram.ecore#//WorkProductNode">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//WorkProductNode/type"/>
-    </genClasses>
-    <genClasses ecoreClass="diagram.ecore#//ActivityDetailDiagram"/>
-    <genClasses image="false" ecoreClass="diagram.ecore#//NodeContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diagram.ecore#//NodeContainer/nodes"/>
-    </genClasses>
-    <genClasses ecoreClass="diagram.ecore#//RoleNode"/>
-    <genClasses ecoreClass="diagram.ecore#//RoleTaskComposite"/>
-    <genClasses ecoreClass="diagram.ecore#//TaskNode"/>
-    <genClasses ecoreClass="diagram.ecore#//WorkProductDescriptorNode"/>
-    <genClasses ecoreClass="diagram.ecore#//WorkBreakdownElementNode"/>
-    <genClasses ecoreClass="diagram.ecore#//WorkProductComposite">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//WorkProductComposite/type"/>
-    </genClasses>
-    <nestedGenPackages prefix="Model" basePackage="org.eclipse.epf.diagram" disposableProviderFactory="true"
-        ecorePackage="diagram.ecore#/">
-      <genDataTypes ecoreDataType="diagram.ecore#//AbsoluteBendpoint"/>
-      <genDataTypes ecoreDataType="diagram.ecore#//Point"/>
-      <genDataTypes ecoreDataType="diagram.ecore#//RoleDescriptor"/>
-      <genClasses ecoreClass="diagram.ecore#//Diagram" labelFeature="#//model/model/LinkedObject/object"/>
-      <genClasses ecoreClass="diagram.ecore#//Link" labelFeature="#//model/model/Link/name">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Link/name"/>
-        <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference diagram.ecore#//Link/source"/>
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EReference diagram.ecore#//Link/target"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Link/bendpoints"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Link/sourceEndPoint"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Link/targetEndPoint"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="diagram.ecore#//LinkedObject" labelFeature="#//model/model/LinkedObject/object">
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EReference diagram.ecore#//LinkedObject/linkedElement"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//LinkedObject/object"/>
-      </genClasses>
-      <genClasses ecoreClass="diagram.ecore#//NamedNode" labelFeature="#//model/model/NamedNode/name">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//NamedNode/name"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="diagram.ecore#//Node" labelFeature="#//model/model/LinkedObject/object">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Node/location"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Node/width"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Node/height"/>
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EReference diagram.ecore#//Node/incomingConnections"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diagram.ecore#//Node/outgoingConnections"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//Node/readOnly"/>
-      </genClasses>
-      <genClasses ecoreClass="diagram.ecore#//ActivityDiagram" labelFeature="#//model/model/LinkedObject/object"/>
-      <genClasses ecoreClass="diagram.ecore#//TypedNode" labelFeature="#//model/model/LinkedObject/object">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//TypedNode/type"/>
-      </genClasses>
-      <genClasses ecoreClass="diagram.ecore#//WorkProductDependencyDiagram" labelFeature="#//model/model/LinkedObject/object"/>
-      <genClasses ecoreClass="diagram.ecore#//WorkProductNode" labelFeature="#//model/model/NamedNode/name">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//WorkProductNode/type"/>
-      </genClasses>
-      <genClasses ecoreClass="diagram.ecore#//ActivityDetailDiagram" labelFeature="#//model/model/LinkedObject/object"/>
-      <genClasses image="false" ecoreClass="diagram.ecore#//NodeContainer" labelFeature="#//model/model/LinkedObject/object">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diagram.ecore#//NodeContainer/nodes"/>
-      </genClasses>
-      <genClasses ecoreClass="diagram.ecore#//RoleNode" labelFeature="#//model/model/NamedNode/name"/>
-      <genClasses ecoreClass="diagram.ecore#//RoleTaskComposite" labelFeature="#//model/model/LinkedObject/object"/>
-      <genClasses ecoreClass="diagram.ecore#//TaskNode" labelFeature="#//model/model/NamedNode/name"/>
-      <genClasses ecoreClass="diagram.ecore#//WorkProductDescriptorNode" labelFeature="#//model/model/NamedNode/name"/>
-      <genClasses ecoreClass="diagram.ecore#//WorkBreakdownElementNode" labelFeature="#//model/model/NamedNode/name"/>
-      <genClasses ecoreClass="diagram.ecore#//WorkProductComposite" labelFeature="#//model/model/LinkedObject/object">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//WorkProductComposite/type"/>
-      </genClasses>
-    </nestedGenPackages>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.epf.diagram/plugin.properties b/plugins/org.eclipse.epf.diagram/plugin.properties
deleted file mode 100755
index d40e7c6..0000000
--- a/plugins/org.eclipse.epf.diagram/plugin.properties
+++ /dev/null
@@ -1,18 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Diagram Model
-providerName=Eclipse.org
-
-# ====================================================================
-

diff --git a/plugins/org.eclipse.epf.diagram/plugin.xml b/plugins/org.eclipse.epf.diagram/plugin.xml
deleted file mode 100755
index 0a3a1d7..0000000
--- a/plugins/org.eclipse.epf.diagram/plugin.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "http://www.eclipse.org/epf/diagram/1.0.0/diagram.ecore" 
-       class = "org.eclipse.epf.diagram.model.ModelPackage" />
-  </extension>
-  <extension
-        point="org.eclipse.epf.library.edit.diagramManager">
-     <diagramManager class="org.eclipse.epf.diagram.model.util.DiagramManager"/>
-  </extension>
-
-</plugin>
-
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/DiagramResources.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/DiagramResources.java
deleted file mode 100755
index 26c51ec..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/DiagramResources.java
+++ /dev/null
@@ -1,38 +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
- *******************************************************************************/
-package org.eclipse.epf.diagram;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The resource class of diagram plugin
- * 
- * @since  1.0
- */
-public final class DiagramResources extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.epf.diagram.Resources";//$NON-NLS-1$
-
-	private DiagramResources() {
-		// Do not instantiate
-	}
-
-	public static String type_activity;
-	public static String defaultBaseName;
-	public static String type_WPD;
-	public static String type_activityDetail;
-	public static String addFreeTxt;
-	public static String type_unknown;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, DiagramResources.class);
-	}
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/Resources.properties b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/Resources.properties
deleted file mode 100755
index 4371a5f..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/Resources.properties
+++ /dev/null
@@ -1,18 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-type_activity=Activity Diagram
-defaultBaseName=New {0}
-type_WPD=Work Product Dependency Diagram
-type_activityDetail=Activity Detail Diagram
-addFreeTxt=Add Free Text
-type_unknown=Unknown
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/ActivityDetailDiagram.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/ActivityDetailDiagram.java
deleted file mode 100755
index e324775..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/ActivityDetailDiagram.java
+++ /dev/null
@@ -1,48 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-/**
- * Interface for activity detail diagram model object
- * 
- * @author Phong Nguyen Le
- * @since  1.0
- * @model
- */
-public interface ActivityDetailDiagram extends Diagram {
-
-	/**
-	 * Returns the value of the '<em><b>Auto Layout</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Auto Layout</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Auto Layout</em>' attribute.
-	 * @see #setAutoLayout(boolean)
-	 * @see org.eclipse.epf.diagram.model.ModelPackage#getActivityDetailDiagram_AutoLayout()
-	 * @model
-	 * @generated
-	 */
-	boolean isAutoLayout();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.ActivityDetailDiagram#isAutoLayout <em>Auto Layout</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Auto Layout</em>' attribute.
-	 * @see #isAutoLayout()
-	 * @generated
-	 */
-	void setAutoLayout(boolean value);
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/ActivityDiagram.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/ActivityDiagram.java
deleted file mode 100755
index a22b037..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/ActivityDiagram.java
+++ /dev/null
@@ -1,22 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-/**
- * Interface for activity diagram model object
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @model
- */
-public interface ActivityDiagram extends Diagram {
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/Diagram.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/Diagram.java
deleted file mode 100755
index 75cecfd..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/Diagram.java
+++ /dev/null
@@ -1,74 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.util.Suppression;
-
-/**
- * Base diagram interface
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @model
- */
-public interface Diagram extends NodeContainer {
-
-	/**
-	 * Gets the UMA model object for this diagram
-	 * 
-	 * @return
-	 */
-	org.eclipse.epf.uma.Diagram getUMADiagram();
-
-	/**
-	 * Sets default name for new node
-	 * 
-	 * @param newNode
-	 */
-	void setDefaultName(NamedNode newNode);
-
-	/**
-	 * Sets a suppression instance for this diagram
-	 * 
-	 * @param suppression
-	 */
-	void setSuppression(Suppression suppression);
-
-	/**
-	 * Gets the suppression instance used in this diagram
-	 * 
-	 * @return
-	 */
-	Suppression getSuppression();
-
-	/**
-	 * Sets filter used to to filter diagram elements in this diagram
-	 * 
-	 * @param filter
-	 */
-	void setFilter(IFilter filter);
-
-	/**
-	 * Checks if this diagram is newly created and not saved yet)
-	 * 
-	 * @return
-	 */
-	boolean isNew();
-
-	/**
-	 * Sets or unsets the isNew flag of this diagram
-	 * 
-	 * @param n
-	 * @see #isNew()
-	 */
-	void setNew(boolean n);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/Link.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/Link.java
deleted file mode 100755
index b9e2271..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/Link.java
+++ /dev/null
@@ -1,124 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.util.EList;
-
-/**
- * This interface represents model object for a link between diagram nodes
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @model
- */
-public interface Link extends LinkedObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.epf.diagram.model.ModelPackage#getLink_Name()
-	 * @model default=""
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.Link#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Gets the source node of this link.
-	 * 
-	 * @model
-	 */
-	Node getSource();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.Link#getSource <em>Source</em>}' container reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source</em>' container reference.
-	 * @see #getSource()
-	 * @generated
-	 */
-	void setSource(Node value);
-
-	/**
-	 * Gets the target node of this link
-	 * 
-	 * @model
-	 */
-	Node getTarget();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.Link#getTarget <em>Target</em>}' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target</em>' reference.
-	 * @see #getTarget()
-	 * @generated
-	 */
-	void setTarget(Node value);
-
-	/**
-	 * Gets the list of bend points in this link
-	 * 
-	 * @model type="org.eclipse.draw2d.AbsoluteBendpoint" lower="0" transient="true"
-	 */
-	EList getBendpoints();
-
-	/**
-	 * Gets the end point of this link in the source node
-	 * 
-	 * @model transient="true"
-	 * @return
-	 */
-	Point getSourceEndPoint();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.Link#getSourceEndPoint <em>Source End Point</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source End Point</em>' attribute.
-	 * @see #getSourceEndPoint()
-	 * @generated
-	 */
-	void setSourceEndPoint(Point value);
-
-	/**
-	 * Gets the end point of this link in target node
-	 * 
-	 * @model transient="true"
-	 * @return
-	 */
-	Point getTargetEndPoint();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.Link#getTargetEndPoint <em>Target End Point</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target End Point</em>' attribute.
-	 * @see #getTargetEndPoint()
-	 * @generated
-	 */
-	void setTargetEndPoint(Point value);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/LinkedObject.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/LinkedObject.java
deleted file mode 100755
index ef1e70e..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/LinkedObject.java
+++ /dev/null
@@ -1,47 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.uma.MethodElement;
-
-/**
- * This interface represents objects that is linked with other object in a
- * difference model
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @model abstract="true"
- */
-public interface LinkedObject extends EObject {
-	/**
-	 * @model transient="true"
-	 */
-	Object getObject();
-
-	void setObject(Object value);
-
-	/**
-	 * @model
-	 */
-	MethodElement getLinkedElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.LinkedObject#getLinkedElement <em>Linked Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Linked Element</em>' reference.
-	 * @see #getLinkedElement()
-	 * @generated
-	 */
-	void setLinkedElement(MethodElement value);
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/ModelFactory.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/ModelFactory.java
deleted file mode 100755
index 738f9d1..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/ModelFactory.java
+++ /dev/null
@@ -1,167 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.diagram.model.ModelPackage
- * @generated
- */
-public interface ModelFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    ModelFactory eINSTANCE = org.eclipse.epf.diagram.model.impl.ModelFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Diagram</em>'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Diagram</em>'.
-	 * @generated
-	 */
-    Diagram createDiagram();
-
-	/**
-	 * Returns a new object of class '<em>Link</em>'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Link</em>'.
-	 * @generated
-	 */
-    Link createLink();
-
-	/**
-	 * Returns a new object of class '<em>Named Node</em>'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Named Node</em>'.
-	 * @generated
-	 */
-    NamedNode createNamedNode();
-
-	/**
-	 * Returns a new object of class '<em>Activity Diagram</em>'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Activity Diagram</em>'.
-	 * @generated
-	 */
-    ActivityDiagram createActivityDiagram();
-
-	/**
-	 * Returns a new object of class '<em>Typed Node</em>'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Typed Node</em>'.
-	 * @generated
-	 */
-    TypedNode createTypedNode();
-
-	/**
-	 * Returns a new object of class '<em>Work Product Dependency Diagram</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Product Dependency Diagram</em>'.
-	 * @generated
-	 */
-	WorkProductDependencyDiagram createWorkProductDependencyDiagram();
-
-	/**
-	 * Returns a new object of class '<em>Work Product Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Product Node</em>'.
-	 * @generated
-	 */
-	WorkProductNode createWorkProductNode();
-
-	/**
-	 * Returns a new object of class '<em>Activity Detail Diagram</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Activity Detail Diagram</em>'.
-	 * @generated
-	 */
-	ActivityDetailDiagram createActivityDetailDiagram();
-
-	/**
-	 * Returns a new object of class '<em>Role Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Role Node</em>'.
-	 * @generated
-	 */
-	RoleNode createRoleNode();
-
-	/**
-	 * Returns a new object of class '<em>Role Task Composite</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Role Task Composite</em>'.
-	 * @generated
-	 */
-	RoleTaskComposite createRoleTaskComposite();
-
-	/**
-	 * Returns a new object of class '<em>Task Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Task Node</em>'.
-	 * @generated
-	 */
-	TaskNode createTaskNode();
-
-	/**
-	 * Returns a new object of class '<em>Work Product Descriptor Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Product Descriptor Node</em>'.
-	 * @generated
-	 */
-	WorkProductDescriptorNode createWorkProductDescriptorNode();
-
-	/**
-	 * Returns a new object of class '<em>Work Breakdown Element Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Breakdown Element Node</em>'.
-	 * @generated
-	 */
-	WorkBreakdownElementNode createWorkBreakdownElementNode();
-
-	/**
-	 * Returns a new object of class '<em>Work Product Composite</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Product Composite</em>'.
-	 * @generated
-	 */
-	WorkProductComposite createWorkProductComposite();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-    ModelPackage getModelPackage();
-
-} //ModelFactory
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/ModelPackage.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/ModelPackage.java
deleted file mode 100755
index 3f28c3e..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/ModelPackage.java
+++ /dev/null
@@ -1,2608 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.diagram.model.ModelFactory
- * @model kind="package"
- * @generated
- */
-public interface ModelPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    String eNAME = "model"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    String eNS_URI = "http://www.eclipse.org/epf/diagram/1.0.0/diagram.ecore"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    String eNS_PREFIX = "org.eclipse.epf.diagram.model"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    ModelPackage eINSTANCE = org.eclipse.epf.diagram.model.impl.ModelPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.NodeContainerImpl <em>Node Container</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.NodeContainerImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getNodeContainer()
-	 * @generated
-	 */
-	int NODE_CONTAINER = 10;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.LinkedObjectImpl <em>Linked Object</em>}' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.LinkedObjectImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getLinkedObject()
-	 * @generated
-	 */
-    int LINKED_OBJECT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.DiagramImpl <em>Diagram</em>}' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getDiagram()
-	 * @generated
-	 */
-    int DIAGRAM = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.LinkImpl <em>Link</em>}' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.LinkImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getLink()
-	 * @generated
-	 */
-    int LINK = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.NodeImpl <em>Node</em>}' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.NodeImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getNode()
-	 * @generated
-	 */
-    int NODE = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.NamedNodeImpl <em>Named Node</em>}' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.NamedNodeImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getNamedNode()
-	 * @generated
-	 */
-    int NAMED_NODE = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.ActivityDiagramImpl <em>Activity Diagram</em>}' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.ActivityDiagramImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getActivityDiagram()
-	 * @generated
-	 */
-    int ACTIVITY_DIAGRAM = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.TypedNodeImpl <em>Typed Node</em>}' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.TypedNodeImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getTypedNode()
-	 * @generated
-	 */
-    int TYPED_NODE = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.WorkProductDependencyDiagramImpl <em>Work Product Dependency Diagram</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.WorkProductDependencyDiagramImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getWorkProductDependencyDiagram()
-	 * @generated
-	 */
-	int WORK_PRODUCT_DEPENDENCY_DIAGRAM = 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.WorkProductNodeImpl <em>Work Product Node</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.WorkProductNodeImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getWorkProductNode()
-	 * @generated
-	 */
-	int WORK_PRODUCT_NODE = 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.ActivityDetailDiagramImpl <em>Activity Detail Diagram</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.ActivityDetailDiagramImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getActivityDetailDiagram()
-	 * @generated
-	 */
-	int ACTIVITY_DETAIL_DIAGRAM = 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.RoleNodeImpl <em>Role Node</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.RoleNodeImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getRoleNode()
-	 * @generated
-	 */
-	int ROLE_NODE = 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.RoleTaskCompositeImpl <em>Role Task Composite</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.RoleTaskCompositeImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getRoleTaskComposite()
-	 * @generated
-	 */
-	int ROLE_TASK_COMPOSITE = 12;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.TaskNodeImpl <em>Task Node</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.TaskNodeImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getTaskNode()
-	 * @generated
-	 */
-	int TASK_NODE = 13;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.WorkProductDescriptorNodeImpl <em>Work Product Descriptor Node</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.WorkProductDescriptorNodeImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getWorkProductDescriptorNode()
-	 * @generated
-	 */
-	int WORK_PRODUCT_DESCRIPTOR_NODE = 14;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__LINKED_ELEMENT = ModelPackage.NODE_CONTAINER__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__OBJECT = ModelPackage.NODE_CONTAINER__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__LOCATION = ModelPackage.NODE_CONTAINER__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__WIDTH = ModelPackage.NODE_CONTAINER__WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__HEIGHT = ModelPackage.NODE_CONTAINER__HEIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Incoming Connections</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__INCOMING_CONNECTIONS = ModelPackage.NODE_CONTAINER__INCOMING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__OUTGOING_CONNECTIONS = ModelPackage.NODE_CONTAINER__OUTGOING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__READ_ONLY = ModelPackage.NODE_CONTAINER__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Nodes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int DIAGRAM__NODES = ModelPackage.NODE_CONTAINER__NODES;
-
-	/**
-	 * The number of structural features of the '<em>Diagram</em>' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int DIAGRAM_FEATURE_COUNT = ModelPackage.NODE_CONTAINER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK__LINKED_ELEMENT = ModelPackage.LINKED_OBJECT__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK__OBJECT = ModelPackage.LINKED_OBJECT__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK__NAME = ModelPackage.LINKED_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int LINK__SOURCE = ModelPackage.LINKED_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int LINK__TARGET = ModelPackage.LINKED_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Bendpoints</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int LINK__BENDPOINTS = ModelPackage.LINKED_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Source End Point</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK__SOURCE_END_POINT = ModelPackage.LINKED_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Target End Point</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK__TARGET_END_POINT = ModelPackage.LINKED_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Link</em>' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int LINK_FEATURE_COUNT = ModelPackage.LINKED_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINKED_OBJECT__LINKED_ELEMENT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINKED_OBJECT__OBJECT = 1;
-
-	/**
-	 * The number of structural features of the '<em>Linked Object</em>' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int LINKED_OBJECT_FEATURE_COUNT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMED_NODE__LINKED_ELEMENT = ModelPackage.NODE__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMED_NODE__OBJECT = ModelPackage.NODE__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int NAMED_NODE__LOCATION = ModelPackage.NODE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int NAMED_NODE__WIDTH = ModelPackage.NODE__WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int NAMED_NODE__HEIGHT = ModelPackage.NODE__HEIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Incoming Connections</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int NAMED_NODE__INCOMING_CONNECTIONS = ModelPackage.NODE__INCOMING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int NAMED_NODE__OUTGOING_CONNECTIONS = ModelPackage.NODE__OUTGOING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMED_NODE__READ_ONLY = ModelPackage.NODE__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int NAMED_NODE__NAME = ModelPackage.NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Named Node</em>' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int NAMED_NODE_FEATURE_COUNT = ModelPackage.NODE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__LINKED_ELEMENT = ModelPackage.LINKED_OBJECT__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OBJECT = ModelPackage.LINKED_OBJECT__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int NODE__LOCATION = ModelPackage.LINKED_OBJECT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int NODE__WIDTH = ModelPackage.LINKED_OBJECT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int NODE__HEIGHT = ModelPackage.LINKED_OBJECT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Incoming Connections</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int NODE__INCOMING_CONNECTIONS = ModelPackage.LINKED_OBJECT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int NODE__OUTGOING_CONNECTIONS = ModelPackage.LINKED_OBJECT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__READ_ONLY = ModelPackage.LINKED_OBJECT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Node</em>' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int NODE_FEATURE_COUNT = ModelPackage.LINKED_OBJECT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DIAGRAM__LINKED_ELEMENT = ModelPackage.DIAGRAM__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DIAGRAM__OBJECT = ModelPackage.DIAGRAM__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DIAGRAM__LOCATION = ModelPackage.DIAGRAM__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DIAGRAM__WIDTH = ModelPackage.DIAGRAM__WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DIAGRAM__HEIGHT = ModelPackage.DIAGRAM__HEIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Incoming Connections</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DIAGRAM__INCOMING_CONNECTIONS = ModelPackage.DIAGRAM__INCOMING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DIAGRAM__OUTGOING_CONNECTIONS = ModelPackage.DIAGRAM__OUTGOING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DIAGRAM__READ_ONLY = ModelPackage.DIAGRAM__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Nodes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int ACTIVITY_DIAGRAM__NODES = ModelPackage.DIAGRAM__NODES;
-
-	/**
-	 * The number of structural features of the '<em>Activity Diagram</em>' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int ACTIVITY_DIAGRAM_FEATURE_COUNT = ModelPackage.DIAGRAM_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TYPED_NODE__LINKED_ELEMENT = ModelPackage.NODE__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TYPED_NODE__OBJECT = ModelPackage.NODE__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int TYPED_NODE__LOCATION = ModelPackage.NODE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int TYPED_NODE__WIDTH = ModelPackage.NODE__WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int TYPED_NODE__HEIGHT = ModelPackage.NODE__HEIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Incoming Connections</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int TYPED_NODE__INCOMING_CONNECTIONS = ModelPackage.NODE__INCOMING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int TYPED_NODE__OUTGOING_CONNECTIONS = ModelPackage.NODE__OUTGOING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TYPED_NODE__READ_ONLY = ModelPackage.NODE__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int TYPED_NODE__TYPE = ModelPackage.NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Typed Node</em>' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int TYPED_NODE_FEATURE_COUNT = ModelPackage.NODE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DEPENDENCY_DIAGRAM__LINKED_ELEMENT = ModelPackage.DIAGRAM__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DEPENDENCY_DIAGRAM__OBJECT = ModelPackage.DIAGRAM__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DEPENDENCY_DIAGRAM__LOCATION = ModelPackage.DIAGRAM__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DEPENDENCY_DIAGRAM__WIDTH = ModelPackage.DIAGRAM__WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DEPENDENCY_DIAGRAM__HEIGHT = ModelPackage.DIAGRAM__HEIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Incoming Connections</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DEPENDENCY_DIAGRAM__INCOMING_CONNECTIONS = ModelPackage.DIAGRAM__INCOMING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DEPENDENCY_DIAGRAM__OUTGOING_CONNECTIONS = ModelPackage.DIAGRAM__OUTGOING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DEPENDENCY_DIAGRAM__READ_ONLY = ModelPackage.DIAGRAM__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Nodes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DEPENDENCY_DIAGRAM__NODES = ModelPackage.DIAGRAM__NODES;
-
-	/**
-	 * The number of structural features of the '<em>Work Product Dependency Diagram</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DEPENDENCY_DIAGRAM_FEATURE_COUNT = ModelPackage.DIAGRAM_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_NODE__LINKED_ELEMENT = ModelPackage.NAMED_NODE__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_NODE__OBJECT = ModelPackage.NAMED_NODE__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_NODE__LOCATION = ModelPackage.NAMED_NODE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_NODE__WIDTH = ModelPackage.NAMED_NODE__WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_NODE__HEIGHT = ModelPackage.NAMED_NODE__HEIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Incoming Connections</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_NODE__INCOMING_CONNECTIONS = ModelPackage.NAMED_NODE__INCOMING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_NODE__OUTGOING_CONNECTIONS = ModelPackage.NAMED_NODE__OUTGOING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_NODE__READ_ONLY = ModelPackage.NAMED_NODE__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_NODE__NAME = ModelPackage.NAMED_NODE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_NODE__TYPE = ModelPackage.NAMED_NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Work Product Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_NODE_FEATURE_COUNT = ModelPackage.NAMED_NODE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DETAIL_DIAGRAM__LINKED_ELEMENT = ModelPackage.DIAGRAM__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DETAIL_DIAGRAM__OBJECT = ModelPackage.DIAGRAM__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DETAIL_DIAGRAM__LOCATION = ModelPackage.DIAGRAM__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DETAIL_DIAGRAM__WIDTH = ModelPackage.DIAGRAM__WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DETAIL_DIAGRAM__HEIGHT = ModelPackage.DIAGRAM__HEIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Incoming Connections</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DETAIL_DIAGRAM__INCOMING_CONNECTIONS = ModelPackage.DIAGRAM__INCOMING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DETAIL_DIAGRAM__OUTGOING_CONNECTIONS = ModelPackage.DIAGRAM__OUTGOING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DETAIL_DIAGRAM__READ_ONLY = ModelPackage.DIAGRAM__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Nodes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DETAIL_DIAGRAM__NODES = ModelPackage.DIAGRAM__NODES;
-
-	/**
-	 * The feature id for the '<em><b>Auto Layout</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DETAIL_DIAGRAM__AUTO_LAYOUT = ModelPackage.DIAGRAM_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Activity Detail Diagram</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DETAIL_DIAGRAM_FEATURE_COUNT = ModelPackage.DIAGRAM_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_CONTAINER__LINKED_ELEMENT = ModelPackage.NODE__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_CONTAINER__OBJECT = ModelPackage.NODE__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_CONTAINER__LOCATION = ModelPackage.NODE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_CONTAINER__WIDTH = ModelPackage.NODE__WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_CONTAINER__HEIGHT = ModelPackage.NODE__HEIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Incoming Connections</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_CONTAINER__INCOMING_CONNECTIONS = ModelPackage.NODE__INCOMING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_CONTAINER__OUTGOING_CONNECTIONS = ModelPackage.NODE__OUTGOING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_CONTAINER__READ_ONLY = ModelPackage.NODE__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Nodes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_CONTAINER__NODES = ModelPackage.NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Node Container</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_CONTAINER_FEATURE_COUNT = ModelPackage.NODE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_NODE__LINKED_ELEMENT = ModelPackage.NAMED_NODE__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_NODE__OBJECT = ModelPackage.NAMED_NODE__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_NODE__LOCATION = ModelPackage.NAMED_NODE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_NODE__WIDTH = ModelPackage.NAMED_NODE__WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_NODE__HEIGHT = ModelPackage.NAMED_NODE__HEIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Incoming Connections</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_NODE__INCOMING_CONNECTIONS = ModelPackage.NAMED_NODE__INCOMING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_NODE__OUTGOING_CONNECTIONS = ModelPackage.NAMED_NODE__OUTGOING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_NODE__READ_ONLY = ModelPackage.NAMED_NODE__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_NODE__NAME = ModelPackage.NAMED_NODE__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Role Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_NODE_FEATURE_COUNT = ModelPackage.NAMED_NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_TASK_COMPOSITE__LINKED_ELEMENT = ModelPackage.NODE_CONTAINER__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_TASK_COMPOSITE__OBJECT = ModelPackage.NODE_CONTAINER__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_TASK_COMPOSITE__LOCATION = ModelPackage.NODE_CONTAINER__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_TASK_COMPOSITE__WIDTH = ModelPackage.NODE_CONTAINER__WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_TASK_COMPOSITE__HEIGHT = ModelPackage.NODE_CONTAINER__HEIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Incoming Connections</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_TASK_COMPOSITE__INCOMING_CONNECTIONS = ModelPackage.NODE_CONTAINER__INCOMING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_TASK_COMPOSITE__OUTGOING_CONNECTIONS = ModelPackage.NODE_CONTAINER__OUTGOING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_TASK_COMPOSITE__READ_ONLY = ModelPackage.NODE_CONTAINER__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Nodes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_TASK_COMPOSITE__NODES = ModelPackage.NODE_CONTAINER__NODES;
-
-	/**
-	 * The feature id for the '<em><b>Row Index</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_TASK_COMPOSITE__ROW_INDEX = ModelPackage.NODE_CONTAINER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Role Task Composite</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_TASK_COMPOSITE_FEATURE_COUNT = ModelPackage.NODE_CONTAINER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_NODE__LINKED_ELEMENT = ModelPackage.NAMED_NODE__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_NODE__OBJECT = ModelPackage.NAMED_NODE__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_NODE__LOCATION = ModelPackage.NAMED_NODE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_NODE__WIDTH = ModelPackage.NAMED_NODE__WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_NODE__HEIGHT = ModelPackage.NAMED_NODE__HEIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Incoming Connections</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_NODE__INCOMING_CONNECTIONS = ModelPackage.NAMED_NODE__INCOMING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_NODE__OUTGOING_CONNECTIONS = ModelPackage.NAMED_NODE__OUTGOING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_NODE__READ_ONLY = ModelPackage.NAMED_NODE__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_NODE__NAME = ModelPackage.NAMED_NODE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Index</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_NODE__INDEX = ModelPackage.NAMED_NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Task Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_NODE_FEATURE_COUNT = ModelPackage.NAMED_NODE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR_NODE__LINKED_ELEMENT = ModelPackage.NAMED_NODE__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR_NODE__OBJECT = ModelPackage.NAMED_NODE__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR_NODE__LOCATION = ModelPackage.NAMED_NODE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR_NODE__WIDTH = ModelPackage.NAMED_NODE__WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR_NODE__HEIGHT = ModelPackage.NAMED_NODE__HEIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Incoming Connections</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR_NODE__INCOMING_CONNECTIONS = ModelPackage.NAMED_NODE__INCOMING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR_NODE__OUTGOING_CONNECTIONS = ModelPackage.NAMED_NODE__OUTGOING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR_NODE__READ_ONLY = ModelPackage.NAMED_NODE__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR_NODE__NAME = ModelPackage.NAMED_NODE__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Work Product Descriptor Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR_NODE_FEATURE_COUNT = ModelPackage.NAMED_NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.WorkBreakdownElementNodeImpl <em>Work Breakdown Element Node</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.WorkBreakdownElementNodeImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getWorkBreakdownElementNode()
-	 * @generated
-	 */
-	int WORK_BREAKDOWN_ELEMENT_NODE = 15;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT_NODE__LINKED_ELEMENT = ModelPackage.NAMED_NODE__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT_NODE__OBJECT = ModelPackage.NAMED_NODE__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT_NODE__LOCATION = ModelPackage.NAMED_NODE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT_NODE__WIDTH = ModelPackage.NAMED_NODE__WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT_NODE__HEIGHT = ModelPackage.NAMED_NODE__HEIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Incoming Connections</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT_NODE__INCOMING_CONNECTIONS = ModelPackage.NAMED_NODE__INCOMING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT_NODE__OUTGOING_CONNECTIONS = ModelPackage.NAMED_NODE__OUTGOING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT_NODE__READ_ONLY = ModelPackage.NAMED_NODE__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT_NODE__NAME = ModelPackage.NAMED_NODE__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Work Breakdown Element Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT_NODE_FEATURE_COUNT = ModelPackage.NAMED_NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.diagram.model.impl.WorkProductCompositeImpl <em>Work Product Composite</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.diagram.model.impl.WorkProductCompositeImpl
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getWorkProductComposite()
-	 * @generated
-	 */
-	int WORK_PRODUCT_COMPOSITE = 16;
-
-	/**
-	 * The feature id for the '<em><b>Linked Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_COMPOSITE__LINKED_ELEMENT = ModelPackage.NODE_CONTAINER__LINKED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_COMPOSITE__OBJECT = ModelPackage.NODE_CONTAINER__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_COMPOSITE__LOCATION = ModelPackage.NODE_CONTAINER__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_COMPOSITE__WIDTH = ModelPackage.NODE_CONTAINER__WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_COMPOSITE__HEIGHT = ModelPackage.NODE_CONTAINER__HEIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Incoming Connections</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_COMPOSITE__INCOMING_CONNECTIONS = ModelPackage.NODE_CONTAINER__INCOMING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_COMPOSITE__OUTGOING_CONNECTIONS = ModelPackage.NODE_CONTAINER__OUTGOING_CONNECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_COMPOSITE__READ_ONLY = ModelPackage.NODE_CONTAINER__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Nodes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_COMPOSITE__NODES = ModelPackage.NODE_CONTAINER__NODES;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_COMPOSITE__TYPE = ModelPackage.NODE_CONTAINER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Work Product Composite</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_COMPOSITE_FEATURE_COUNT = ModelPackage.NODE_CONTAINER_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '<em>Absolute Bendpoint</em>' data type.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.draw2d.AbsoluteBendpoint
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getAbsoluteBendpoint()
-	 * @generated
-	 */
-    int ABSOLUTE_BENDPOINT = 17;
-
-	/**
-	 * The meta object id for the '<em>Point</em>' data type.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.draw2d.geometry.Point
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getPoint()
-	 * @generated
-	 */
-    int POINT = 18;
-
-
-	/**
-	 * The meta object id for the '<em>Role Descriptor</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.RoleDescriptor
-	 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getRoleDescriptor()
-	 * @generated
-	 */
-	int ROLE_DESCRIPTOR = 19;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.Diagram <em>Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Diagram</em>'.
-	 * @see org.eclipse.epf.diagram.model.Diagram
-	 * @generated
-	 */
-    EClass getDiagram();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.Link <em>Link</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Link</em>'.
-	 * @see org.eclipse.epf.diagram.model.Link
-	 * @generated
-	 */
-    EClass getLink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.diagram.model.Link#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.epf.diagram.model.Link#getName()
-	 * @see #getLink()
-	 * @generated
-	 */
-	EAttribute getLink_Name();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.epf.diagram.model.Link#getSource <em>Source</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Source</em>'.
-	 * @see org.eclipse.epf.diagram.model.Link#getSource()
-	 * @see #getLink()
-	 * @generated
-	 */
-    EReference getLink_Source();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.diagram.model.Link#getTarget <em>Target</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Target</em>'.
-	 * @see org.eclipse.epf.diagram.model.Link#getTarget()
-	 * @see #getLink()
-	 * @generated
-	 */
-    EReference getLink_Target();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.diagram.model.Link#getBendpoints <em>Bendpoints</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Bendpoints</em>'.
-	 * @see org.eclipse.epf.diagram.model.Link#getBendpoints()
-	 * @see #getLink()
-	 * @generated
-	 */
-    EAttribute getLink_Bendpoints();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.diagram.model.Link#getSourceEndPoint <em>Source End Point</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Source End Point</em>'.
-	 * @see org.eclipse.epf.diagram.model.Link#getSourceEndPoint()
-	 * @see #getLink()
-	 * @generated
-	 */
-	EAttribute getLink_SourceEndPoint();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.diagram.model.Link#getTargetEndPoint <em>Target End Point</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Target End Point</em>'.
-	 * @see org.eclipse.epf.diagram.model.Link#getTargetEndPoint()
-	 * @see #getLink()
-	 * @generated
-	 */
-	EAttribute getLink_TargetEndPoint();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.LinkedObject <em>Linked Object</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Linked Object</em>'.
-	 * @see org.eclipse.epf.diagram.model.LinkedObject
-	 * @generated
-	 */
-    EClass getLinkedObject();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.diagram.model.LinkedObject#getLinkedElement <em>Linked Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Linked Element</em>'.
-	 * @see org.eclipse.epf.diagram.model.LinkedObject#getLinkedElement()
-	 * @see #getLinkedObject()
-	 * @generated
-	 */
-	EReference getLinkedObject_LinkedElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.diagram.model.LinkedObject#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Object</em>'.
-	 * @see org.eclipse.epf.diagram.model.LinkedObject#getObject()
-	 * @see #getLinkedObject()
-	 * @generated
-	 */
-	EAttribute getLinkedObject_Object();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.NamedNode <em>Named Node</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Named Node</em>'.
-	 * @see org.eclipse.epf.diagram.model.NamedNode
-	 * @generated
-	 */
-    EClass getNamedNode();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.diagram.model.NamedNode#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.epf.diagram.model.NamedNode#getName()
-	 * @see #getNamedNode()
-	 * @generated
-	 */
-    EAttribute getNamedNode_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.Node <em>Node</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Node</em>'.
-	 * @see org.eclipse.epf.diagram.model.Node
-	 * @generated
-	 */
-    EClass getNode();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.diagram.model.Node#getLocation <em>Location</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Location</em>'.
-	 * @see org.eclipse.epf.diagram.model.Node#getLocation()
-	 * @see #getNode()
-	 * @generated
-	 */
-    EAttribute getNode_Location();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.diagram.model.Node#getWidth <em>Width</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Width</em>'.
-	 * @see org.eclipse.epf.diagram.model.Node#getWidth()
-	 * @see #getNode()
-	 * @generated
-	 */
-    EAttribute getNode_Width();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.diagram.model.Node#getHeight <em>Height</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Height</em>'.
-	 * @see org.eclipse.epf.diagram.model.Node#getHeight()
-	 * @see #getNode()
-	 * @generated
-	 */
-    EAttribute getNode_Height();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.diagram.model.Node#getIncomingConnections <em>Incoming Connections</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Incoming Connections</em>'.
-	 * @see org.eclipse.epf.diagram.model.Node#getIncomingConnections()
-	 * @see #getNode()
-	 * @generated
-	 */
-    EReference getNode_IncomingConnections();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.diagram.model.Node#getOutgoingConnections <em>Outgoing Connections</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Outgoing Connections</em>'.
-	 * @see org.eclipse.epf.diagram.model.Node#getOutgoingConnections()
-	 * @see #getNode()
-	 * @generated
-	 */
-    EReference getNode_OutgoingConnections();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.diagram.model.Node#isReadOnly <em>Read Only</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Read Only</em>'.
-	 * @see org.eclipse.epf.diagram.model.Node#isReadOnly()
-	 * @see #getNode()
-	 * @generated
-	 */
-	EAttribute getNode_ReadOnly();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.ActivityDiagram <em>Activity Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Activity Diagram</em>'.
-	 * @see org.eclipse.epf.diagram.model.ActivityDiagram
-	 * @generated
-	 */
-    EClass getActivityDiagram();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.TypedNode <em>Typed Node</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Typed Node</em>'.
-	 * @see org.eclipse.epf.diagram.model.TypedNode
-	 * @generated
-	 */
-    EClass getTypedNode();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.diagram.model.TypedNode#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.epf.diagram.model.TypedNode#getType()
-	 * @see #getTypedNode()
-	 * @generated
-	 */
-    EAttribute getTypedNode_Type();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.WorkProductDependencyDiagram <em>Work Product Dependency Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Product Dependency Diagram</em>'.
-	 * @see org.eclipse.epf.diagram.model.WorkProductDependencyDiagram
-	 * @generated
-	 */
-	EClass getWorkProductDependencyDiagram();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.WorkProductNode <em>Work Product Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Product Node</em>'.
-	 * @see org.eclipse.epf.diagram.model.WorkProductNode
-	 * @generated
-	 */
-	EClass getWorkProductNode();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.diagram.model.WorkProductNode#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.epf.diagram.model.WorkProductNode#getType()
-	 * @see #getWorkProductNode()
-	 * @generated
-	 */
-	EAttribute getWorkProductNode_Type();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.ActivityDetailDiagram <em>Activity Detail Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Activity Detail Diagram</em>'.
-	 * @see org.eclipse.epf.diagram.model.ActivityDetailDiagram
-	 * @generated
-	 */
-	EClass getActivityDetailDiagram();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.diagram.model.ActivityDetailDiagram#isAutoLayout <em>Auto Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Auto Layout</em>'.
-	 * @see org.eclipse.epf.diagram.model.ActivityDetailDiagram#isAutoLayout()
-	 * @see #getActivityDetailDiagram()
-	 * @generated
-	 */
-	EAttribute getActivityDetailDiagram_AutoLayout();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.NodeContainer <em>Node Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Node Container</em>'.
-	 * @see org.eclipse.epf.diagram.model.NodeContainer
-	 * @generated
-	 */
-	EClass getNodeContainer();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.diagram.model.NodeContainer#getNodes <em>Nodes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Nodes</em>'.
-	 * @see org.eclipse.epf.diagram.model.NodeContainer#getNodes()
-	 * @see #getNodeContainer()
-	 * @generated
-	 */
-	EReference getNodeContainer_Nodes();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.RoleNode <em>Role Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Role Node</em>'.
-	 * @see org.eclipse.epf.diagram.model.RoleNode
-	 * @generated
-	 */
-	EClass getRoleNode();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.RoleTaskComposite <em>Role Task Composite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Role Task Composite</em>'.
-	 * @see org.eclipse.epf.diagram.model.RoleTaskComposite
-	 * @generated
-	 */
-	EClass getRoleTaskComposite();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.diagram.model.RoleTaskComposite#getRowIndex <em>Row Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Row Index</em>'.
-	 * @see org.eclipse.epf.diagram.model.RoleTaskComposite#getRowIndex()
-	 * @see #getRoleTaskComposite()
-	 * @generated
-	 */
-	EAttribute getRoleTaskComposite_RowIndex();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.TaskNode <em>Task Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Task Node</em>'.
-	 * @see org.eclipse.epf.diagram.model.TaskNode
-	 * @generated
-	 */
-	EClass getTaskNode();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.diagram.model.TaskNode#getIndex <em>Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Index</em>'.
-	 * @see org.eclipse.epf.diagram.model.TaskNode#getIndex()
-	 * @see #getTaskNode()
-	 * @generated
-	 */
-	EAttribute getTaskNode_Index();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.WorkProductDescriptorNode <em>Work Product Descriptor Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Product Descriptor Node</em>'.
-	 * @see org.eclipse.epf.diagram.model.WorkProductDescriptorNode
-	 * @generated
-	 */
-	EClass getWorkProductDescriptorNode();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.WorkBreakdownElementNode <em>Work Breakdown Element Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Breakdown Element Node</em>'.
-	 * @see org.eclipse.epf.diagram.model.WorkBreakdownElementNode
-	 * @generated
-	 */
-	EClass getWorkBreakdownElementNode();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.diagram.model.WorkProductComposite <em>Work Product Composite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Product Composite</em>'.
-	 * @see org.eclipse.epf.diagram.model.WorkProductComposite
-	 * @generated
-	 */
-	EClass getWorkProductComposite();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.diagram.model.WorkProductComposite#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.epf.diagram.model.WorkProductComposite#getType()
-	 * @see #getWorkProductComposite()
-	 * @generated
-	 */
-	EAttribute getWorkProductComposite_Type();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.draw2d.AbsoluteBendpoint <em>Absolute Bendpoint</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Absolute Bendpoint</em>'.
-	 * @see org.eclipse.draw2d.AbsoluteBendpoint
-	 * @model instanceClass="org.eclipse.draw2d.AbsoluteBendpoint"
-	 * @generated
-	 */
-    EDataType getAbsoluteBendpoint();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.draw2d.geometry.Point <em>Point</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Point</em>'.
-	 * @see org.eclipse.draw2d.geometry.Point
-	 * @model instanceClass="org.eclipse.draw2d.geometry.Point"
-	 * @generated
-	 */
-    EDataType getPoint();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.epf.uma.RoleDescriptor <em>Role Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Role Descriptor</em>'.
-	 * @see org.eclipse.epf.uma.RoleDescriptor
-	 * @model instanceClass="org.eclipse.epf.uma.RoleDescriptor"
-	 * @generated
-	 */
-	EDataType getRoleDescriptor();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-    ModelFactory getModelFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.DiagramImpl <em>Diagram</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getDiagram()
-		 * @generated
-		 */
-		EClass DIAGRAM = eINSTANCE.getDiagram();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.LinkImpl <em>Link</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.LinkImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getLink()
-		 * @generated
-		 */
-		EClass LINK = eINSTANCE.getLink();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LINK__NAME = eINSTANCE.getLink_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Source</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LINK__SOURCE = eINSTANCE.getLink_Source();
-
-		/**
-		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LINK__TARGET = eINSTANCE.getLink_Target();
-
-		/**
-		 * The meta object literal for the '<em><b>Bendpoints</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LINK__BENDPOINTS = eINSTANCE.getLink_Bendpoints();
-
-		/**
-		 * The meta object literal for the '<em><b>Source End Point</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LINK__SOURCE_END_POINT = eINSTANCE.getLink_SourceEndPoint();
-
-		/**
-		 * The meta object literal for the '<em><b>Target End Point</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LINK__TARGET_END_POINT = eINSTANCE.getLink_TargetEndPoint();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.LinkedObjectImpl <em>Linked Object</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.LinkedObjectImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getLinkedObject()
-		 * @generated
-		 */
-		EClass LINKED_OBJECT = eINSTANCE.getLinkedObject();
-
-		/**
-		 * The meta object literal for the '<em><b>Linked Element</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LINKED_OBJECT__LINKED_ELEMENT = eINSTANCE.getLinkedObject_LinkedElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Object</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LINKED_OBJECT__OBJECT = eINSTANCE.getLinkedObject_Object();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.NamedNodeImpl <em>Named Node</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.NamedNodeImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getNamedNode()
-		 * @generated
-		 */
-		EClass NAMED_NODE = eINSTANCE.getNamedNode();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute NAMED_NODE__NAME = eINSTANCE.getNamedNode_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.NodeImpl <em>Node</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.NodeImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getNode()
-		 * @generated
-		 */
-		EClass NODE = eINSTANCE.getNode();
-
-		/**
-		 * The meta object literal for the '<em><b>Location</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute NODE__LOCATION = eINSTANCE.getNode_Location();
-
-		/**
-		 * The meta object literal for the '<em><b>Width</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute NODE__WIDTH = eINSTANCE.getNode_Width();
-
-		/**
-		 * The meta object literal for the '<em><b>Height</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute NODE__HEIGHT = eINSTANCE.getNode_Height();
-
-		/**
-		 * The meta object literal for the '<em><b>Incoming Connections</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference NODE__INCOMING_CONNECTIONS = eINSTANCE.getNode_IncomingConnections();
-
-		/**
-		 * The meta object literal for the '<em><b>Outgoing Connections</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference NODE__OUTGOING_CONNECTIONS = eINSTANCE.getNode_OutgoingConnections();
-
-		/**
-		 * The meta object literal for the '<em><b>Read Only</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute NODE__READ_ONLY = eINSTANCE.getNode_ReadOnly();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.ActivityDiagramImpl <em>Activity Diagram</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.ActivityDiagramImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getActivityDiagram()
-		 * @generated
-		 */
-		EClass ACTIVITY_DIAGRAM = eINSTANCE.getActivityDiagram();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.TypedNodeImpl <em>Typed Node</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.TypedNodeImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getTypedNode()
-		 * @generated
-		 */
-		EClass TYPED_NODE = eINSTANCE.getTypedNode();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TYPED_NODE__TYPE = eINSTANCE.getTypedNode_Type();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.WorkProductDependencyDiagramImpl <em>Work Product Dependency Diagram</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.WorkProductDependencyDiagramImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getWorkProductDependencyDiagram()
-		 * @generated
-		 */
-		EClass WORK_PRODUCT_DEPENDENCY_DIAGRAM = eINSTANCE.getWorkProductDependencyDiagram();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.WorkProductNodeImpl <em>Work Product Node</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.WorkProductNodeImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getWorkProductNode()
-		 * @generated
-		 */
-		EClass WORK_PRODUCT_NODE = eINSTANCE.getWorkProductNode();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_NODE__TYPE = eINSTANCE.getWorkProductNode_Type();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.ActivityDetailDiagramImpl <em>Activity Detail Diagram</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.ActivityDetailDiagramImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getActivityDetailDiagram()
-		 * @generated
-		 */
-		EClass ACTIVITY_DETAIL_DIAGRAM = eINSTANCE.getActivityDetailDiagram();
-
-		/**
-		 * The meta object literal for the '<em><b>Auto Layout</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY_DETAIL_DIAGRAM__AUTO_LAYOUT = eINSTANCE.getActivityDetailDiagram_AutoLayout();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.NodeContainerImpl <em>Node Container</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.NodeContainerImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getNodeContainer()
-		 * @generated
-		 */
-		EClass NODE_CONTAINER = eINSTANCE.getNodeContainer();
-
-		/**
-		 * The meta object literal for the '<em><b>Nodes</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference NODE_CONTAINER__NODES = eINSTANCE.getNodeContainer_Nodes();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.RoleNodeImpl <em>Role Node</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.RoleNodeImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getRoleNode()
-		 * @generated
-		 */
-		EClass ROLE_NODE = eINSTANCE.getRoleNode();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.RoleTaskCompositeImpl <em>Role Task Composite</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.RoleTaskCompositeImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getRoleTaskComposite()
-		 * @generated
-		 */
-		EClass ROLE_TASK_COMPOSITE = eINSTANCE.getRoleTaskComposite();
-
-		/**
-		 * The meta object literal for the '<em><b>Row Index</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE_TASK_COMPOSITE__ROW_INDEX = eINSTANCE.getRoleTaskComposite_RowIndex();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.TaskNodeImpl <em>Task Node</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.TaskNodeImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getTaskNode()
-		 * @generated
-		 */
-		EClass TASK_NODE = eINSTANCE.getTaskNode();
-
-		/**
-		 * The meta object literal for the '<em><b>Index</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_NODE__INDEX = eINSTANCE.getTaskNode_Index();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.WorkProductDescriptorNodeImpl <em>Work Product Descriptor Node</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.WorkProductDescriptorNodeImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getWorkProductDescriptorNode()
-		 * @generated
-		 */
-		EClass WORK_PRODUCT_DESCRIPTOR_NODE = eINSTANCE.getWorkProductDescriptorNode();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.WorkBreakdownElementNodeImpl <em>Work Breakdown Element Node</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.WorkBreakdownElementNodeImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getWorkBreakdownElementNode()
-		 * @generated
-		 */
-		EClass WORK_BREAKDOWN_ELEMENT_NODE = eINSTANCE.getWorkBreakdownElementNode();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.diagram.model.impl.WorkProductCompositeImpl <em>Work Product Composite</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.diagram.model.impl.WorkProductCompositeImpl
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getWorkProductComposite()
-		 * @generated
-		 */
-		EClass WORK_PRODUCT_COMPOSITE = eINSTANCE.getWorkProductComposite();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_COMPOSITE__TYPE = eINSTANCE.getWorkProductComposite_Type();
-
-		/**
-		 * The meta object literal for the '<em>Absolute Bendpoint</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.draw2d.AbsoluteBendpoint
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getAbsoluteBendpoint()
-		 * @generated
-		 */
-		EDataType ABSOLUTE_BENDPOINT = eINSTANCE.getAbsoluteBendpoint();
-
-		/**
-		 * The meta object literal for the '<em>Point</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.draw2d.geometry.Point
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getPoint()
-		 * @generated
-		 */
-		EDataType POINT = eINSTANCE.getPoint();
-
-		/**
-		 * The meta object literal for the '<em>Role Descriptor</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.RoleDescriptor
-		 * @see org.eclipse.epf.diagram.model.impl.ModelPackageImpl#getRoleDescriptor()
-		 * @generated
-		 */
-		EDataType ROLE_DESCRIPTOR = eINSTANCE.getRoleDescriptor();
-
-	}
-
-} //ModelPackage
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/NamedNode.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/NamedNode.java
deleted file mode 100755
index edc3cd6..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/NamedNode.java
+++ /dev/null
@@ -1,52 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-/**
- * A diagram node with name
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @model
- */
-public interface NamedNode extends Node {
-	/**
-	 * Gets node name
-	 * 
-	 * @return the name of this node
-	 * @model
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.NamedNode#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Gets the suppression status of this node
-	 * 
-	 * @return <code>true</code> if it is suppressed, <code>false</code>
-	 *         otherwise
-	 */
-	boolean isSuppressed();
-
-	/**
-	 * Gets the wrapper of the method element that this node represents
-	 * 
-	 * @return the wrapper
-	 */
-	Object getWrapper();
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/Node.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/Node.java
deleted file mode 100755
index 5d55c9d..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/Node.java
+++ /dev/null
@@ -1,170 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.epf.uma.GraphNode;
-
-/**
- * The diagram node
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @model abstract="true"
- */
-public interface Node extends LinkedObject {
-
-	/**
-	 * Gets location of this node
-	 * 
-	 * @model transient="true"
-	 */
-	Point getLocation();
-
-	/**
-	 * Gets width
-	 * 
-	 * @model default="-1" transient="true"
-	 */
-	int getWidth();
-
-	/**
-	 * Gets height
-	 * 
-	 * @return the height
-	 * @model default="-1" transient="true"
-	 */
-	int getHeight();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.Node#getHeight <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Height</em>' attribute.
-	 * @see #getHeight()
-	 * @generated
-	 */
-	void setHeight(int value);
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.Node#getWidth <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Width</em>' attribute.
-	 * @see #getWidth()
-	 * @generated
-	 */
-	void setWidth(int value);
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.Node#getLocation <em>Location</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Location</em>' attribute.
-	 * @see #getLocation()
-	 * @generated
-	 */
-	void setLocation(Point value);
-
-	/**
-	 * Gets incoming links
-	 * 
-	 * @model type="Link" opposite="target" lower="0"
-	 */
-	EList getIncomingConnections();
-
-	/**
-	 * Gets outgoing links
-	 * 
-	 * @model type="Link" containment="true" opposite="source" lower="0"
-	 */
-	EList getOutgoingConnections();
-
-	/**
-	 * Checks if this node is read-only
-	 * 
-	 * @model
-	 */
-	boolean isReadOnly();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.Node#isReadOnly <em>Read Only</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Read Only</em>' attribute.
-	 * @see #isReadOnly()
-	 * @generated
-	 */
-	void setReadOnly(boolean value);
-
-	/**
-	 * Gets the diagram of this node
-	 * 
-	 * @return
-	 */
-	Diagram getDiagram();
-
-	/**
-	 * Sets diagram for this node
-	 * 
-	 * @param diagram
-	 */
-	void setDiagram(Diagram diagram);
-
-	/**
-	 * Gets the GraphNode associated with this node.
-	 * 
-	 * @return
-	 */
-	GraphNode getGraphNode();
-
-	/**
-	 * Gets the type of method element adapter. Method element adapter is a node
-	 * internal {@link Adapter adapter} that is listening on changes of linked
-	 * method element or its wrapper to update the node accordingly.
-	 * 
-	 * @return the class of the method element adapter of this node
-	 */
-	Class getMethodElementAdapterType();
-
-	/**
-	 * This method is used to set the UMA diagram for the new node so it can
-	 * find the GraphNode for the linked method element.
-	 * 
-	 * @param umaDiagram
-	 */
-	void setUMADiagram(org.eclipse.epf.uma.Diagram umaDiagram);
-
-	/**
-	 * Sets the graph node that is the container of the
-	 * {@link #getGraphNode() linked graph node}
-	 * 
-	 * @param umaContainer
-	 */
-	void setUMAContainer(GraphNode umaContainer);
-
-	/**
-	 * Adds the given consumer to the consumer list of this node.
-	 * 
-	 * @param consumer
-	 */
-	void addConsumer(Object consumer);
-
-	/**
-	 * Removes the given consumer from the consumer list of this node. Disposes
-	 * the node if it does not have any more consumer after this call. Disposing
-	 * a node will take care of removing this node's listener from the UMA
-	 * object and all the adapters that had been added to the adapter list of
-	 * this node.
-	 * 
-	 * @param consumer
-	 */
-	void removeConsumer(Object consumer);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/NodeContainer.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/NodeContainer.java
deleted file mode 100755
index 3b25919..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/NodeContainer.java
+++ /dev/null
@@ -1,29 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * A composite node that can contain child nodes
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @model abstract="true"
- */
-public interface NodeContainer extends Node {
-	/**
-	 * Gets child nodes
-	 * 
-	 * @model containment="true" type="Node"
-	 */
-	EList getNodes();
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/RoleNode.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/RoleNode.java
deleted file mode 100755
index caa4673..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/RoleNode.java
+++ /dev/null
@@ -1,22 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-/**
- * Node that represents a role in diagram
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @model
- */
-public interface RoleNode extends NamedNode {
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/RoleTaskComposite.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/RoleTaskComposite.java
deleted file mode 100755
index 59636ef..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/RoleTaskComposite.java
+++ /dev/null
@@ -1,48 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-/**
- * A container that groups a RoleNode and TaskNodes whose tasks the Role performs.
- * The linked object for RoleTaskComposite is RoleDescriptor.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @model
- */
-public interface RoleTaskComposite extends NodeContainer {
-	/**
-	 * Returns the value of the '<em><b>Row Index</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Row Index</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Row Index</em>' attribute.
-	 * @see #setRowIndex(int)
-	 * @see org.eclipse.epf.diagram.model.ModelPackage#getRoleTaskComposite_RowIndex()
-	 * @model
-	 * @generated
-	 */
-	int getRowIndex();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.RoleTaskComposite#getRowIndex <em>Row Index</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Row Index</em>' attribute.
-	 * @see #getRowIndex()
-	 * @generated
-	 */
-	void setRowIndex(int value);
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/TaskNode.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/TaskNode.java
deleted file mode 100755
index a0413e6..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/TaskNode.java
+++ /dev/null
@@ -1,49 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-/**
- * Node that represents a task in diagram
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @model
- */
-public interface TaskNode extends NamedNode {
-
-	/**
-	 * Returns the value of the '<em><b>Index</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Index</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Index</em>' attribute.
-	 * @see #setIndex(int)
-	 * @see org.eclipse.epf.diagram.model.ModelPackage#getTaskNode_Index()
-	 * @model default="-1"
-	 * @generated
-	 */
-	int getIndex();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.TaskNode#getIndex <em>Index</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Index</em>' attribute.
-	 * @see #getIndex()
-	 * @generated
-	 */
-	void setIndex(int value);
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/TypedNode.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/TypedNode.java
deleted file mode 100755
index 5c0f4ca..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/TypedNode.java
+++ /dev/null
@@ -1,50 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-/**
- * Node that is not linked to any method element (not a {@link LinkedObject}).
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @model
- */
-public interface TypedNode extends Node {
-	static final int SYNCH_BAR = 1;
-
-	static final int DECISION = 2;
-
-	static final int START = 3;
-
-	static final int END = 4;
-
-	static final int STICKY_NOTE = 5;
-
-	static final int FREE_TEXT = 6;
-
-	/**
-	 * Gets type. The type must be one of the constants defined in this
-	 * interface.
-	 * 
-	 * @model
-	 */
-	int getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.TypedNode#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(int value);
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/WorkBreakdownElementNode.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/WorkBreakdownElementNode.java
deleted file mode 100755
index e2714fa..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/WorkBreakdownElementNode.java
+++ /dev/null
@@ -1,24 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-import org.eclipse.epf.uma.WorkBreakdownElement;
-
-/**
- * Node that represents a {@link WorkBreakdownElement}
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @model
- */
-public interface WorkBreakdownElementNode extends NamedNode {
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/WorkProductComposite.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/WorkProductComposite.java
deleted file mode 100755
index dc12610..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/WorkProductComposite.java
+++ /dev/null
@@ -1,45 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-import org.eclipse.epf.uma.WorkProduct;
-
-/**
- * Node that represents a group of {@link WorkProduct}
- * 
- * @author Shashidhar Kannoori
- * @since 1.0
- * @model
- */
-public interface WorkProductComposite extends NodeContainer {
-
-	public static final int INPUTS = 1;
-
-	public static final int OUTPUTS = 2;
-
-	/**
-	 * Gets type.
-	 * 
-	 * @return {@link #INPUTS} or {@link #OUTPUTS}
-	 * @model
-	 */
-	int getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.WorkProductComposite#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(int value);
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/WorkProductDependencyDiagram.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/WorkProductDependencyDiagram.java
deleted file mode 100755
index 97db81a..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/WorkProductDependencyDiagram.java
+++ /dev/null
@@ -1,22 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-/**
- * This interface represents the model of the Work Product Dependency diagram
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @model
- */
-public interface WorkProductDependencyDiagram extends Diagram {
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/WorkProductDescriptorNode.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/WorkProductDescriptorNode.java
deleted file mode 100755
index dc48129..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/WorkProductDescriptorNode.java
+++ /dev/null
@@ -1,22 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-/**
- * Node for WorkProductDescriptor in ActivityDetailDiagram.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @model
- */
-public interface WorkProductDescriptorNode extends NamedNode {
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/WorkProductNode.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/WorkProductNode.java
deleted file mode 100755
index 35d4fad..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/WorkProductNode.java
+++ /dev/null
@@ -1,45 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model;
-
-/**
- * This class represents a node in Work Product Dependency Diagram
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @model
- */
-public interface WorkProductNode extends NamedNode {
-
-	public static final int ARTIFACT = 1;
-
-	public static final int DELIVERABLE = 2;
-
-	public static final int OUTCOME = 3;
-
-	/**
-	 * Gets the work product type of this node. This must be one of the
-	 * following constants: {@link #ARTIFACT}, {@link #DELIVERABLE}, {@link #OUTCOME}
-	 * 
-	 * @model
-	 */
-	int getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.diagram.model.WorkProductNode#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(int value);
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/ActivityDetailDiagramImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/ActivityDetailDiagramImpl.java
deleted file mode 100755
index 4e6ea0f..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/ActivityDetailDiagramImpl.java
+++ /dev/null
@@ -1,800 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.NodeContainer;
-import org.eclipse.epf.diagram.model.RoleTaskComposite;
-import org.eclipse.epf.diagram.model.WorkProductComposite;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.diagram.model.util.IActivityDetailDiagramChangeListener;
-import org.eclipse.epf.diagram.model.util.IAdapterFactoryFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.util.ConfigurableComposedAdapterFactory;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.Descriptor;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.epf.uma.util.AssociationHelper;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Activity Detail Diagram</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.ActivityDetailDiagramImpl#isAutoLayout <em>Auto Layout</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ActivityDetailDiagramImpl extends DiagramImpl implements
-		ActivityDetailDiagram {
-	/**
-	 * The default value of the '{@link #isAutoLayout() <em>Auto Layout</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAutoLayout()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean AUTO_LAYOUT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isAutoLayout() <em>Auto Layout</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAutoLayout()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean autoLayout = AUTO_LAYOUT_EDEFAULT;
-
-	private class ActivityDetailDiagramChangeListener extends ActivityAdapter
-			implements IActivityDetailDiagramChangeListener {
-		// /* (non-Javadoc)
-		// * @see
-		// org.eclipse.epf.diagram.model.impl.DiagramImpl.ActivityAdapter#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:
-		// repopulateDiagram();
-		// break;
-		// }
-		// }
-		// finally {
-		// notificationEnabled = true;
-		// }
-		//
-		// }
-
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	protected ActivityDetailDiagramImpl() {
-		super();
-
-		diagramChangeListener = new ActivityDetailDiagramChangeListener();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.ACTIVITY_DETAIL_DIAGRAM__AUTO_LAYOUT:
-				return isAutoLayout() ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.ACTIVITY_DETAIL_DIAGRAM__AUTO_LAYOUT:
-				setAutoLayout(((Boolean)newValue).booleanValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.ACTIVITY_DETAIL_DIAGRAM__AUTO_LAYOUT:
-				setAutoLayout(AUTO_LAYOUT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.ACTIVITY_DETAIL_DIAGRAM__AUTO_LAYOUT:
-				return autoLayout != AUTO_LAYOUT_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (autoLayout: ");
-		result.append(autoLayout);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * 
-	 */
-	public void repopulateDiagram() {
-		// clear diagram
-		//
-
-		int size = getNodes().size();
-
-		// disable notification for all nodes in this diagram to avoid unwanted
-		// concurrent modification of their connection list
-		//
-		for (int i = 0; i < size; i++) {
-			NodeImpl node = ((NodeImpl) getNodes().get(i));
-			node.notificationEnabled = false;
-		}
-		for (Iterator iteration = getNodes().iterator(); iteration.hasNext();) {
-			Node node = (Node) iteration.next();
-
-			// clear all links
-			//
-			for (Iterator iter = node.getOutgoingConnections().iterator(); iter
-					.hasNext();) {
-				Link link = (Link) iter.next();
-				link.setTarget(null);
-			}
-
-			for (Iterator iter = node.getIncomingConnections().iterator(); iter
-					.hasNext();) {
-				Link link = (Link) iter.next();
-				link.setSource(null);
-			}
-			node.getOutgoingConnections().clear();
-			node.getIncomingConnections().clear();
-		}
-
-		getNodes().clear();
-
-		populateDiagram();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.ACTIVITY_DETAIL_DIAGRAM;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public boolean isAutoLayout() {
-		if(isGraphicalDataRequired()) {
-			return GraphicalDataHelper.PROP_AUTO_LAYOUT_VALUE_TRUE.equals(
-					GraphicalDataHelper.getAutoLayoutFlag(this));
-		}
-		return autoLayout;
-	}
-
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAutoLayout(boolean newAutoLayout) {
-		boolean oldAutoLayout = autoLayout;
-		autoLayout = newAutoLayout;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.ACTIVITY_DETAIL_DIAGRAM__AUTO_LAYOUT, oldAutoLayout, autoLayout));
-	}
-	
-	public void doSetAutoLayout(boolean newAutoLayout) {
-		if(isGraphicalDataRequired()) {
-			GraphicalDataHelper.createProperty(this.graphNode, 
-					GraphicalDataHelper.PROP_AUTO_LAYOUT, 
-					String.valueOf(newAutoLayout));
-		}
-		else {
-			setAutoLayout(newAutoLayout);
-		}
-	}
-	
-	@Override
-	public Collection getChildren() {
-		return getAllBreakdownElements();
-	}
-
-	/**
-	 * Gets all breakdown elements or their wrappers for the activity of this
-	 * diagram
-	 * 
-	 * @return
-	 */
-	Collection getAllBreakdownElements() {
-		ArrayList breakdownElements = new ArrayList();
-		AdapterFactory[] adapterFactories;
-		if(filter instanceof IAdapterFactoryFilter) {
-			IAdapterFactoryFilter adapterFactoryFilter = (IAdapterFactoryFilter) filter;
-			adapterFactories = new AdapterFactory[] {
-					adapterFactoryFilter.getWBSAdapterFactory(),
-					adapterFactoryFilter.getTBSAdapterFactory(),
-					adapterFactoryFilter.getWPBSAdapterFactory() 
-			};
-		}
-		else {
-			adapterFactories = DEFAULT_ADAPTER_FACTORIES;
-		}
-		if (wrapper != null) {
-			List wrappers = ProcessUtil.getWrappers(wrapper, adapterFactories);
-			for (Iterator iter = wrappers.iterator(); iter.hasNext();) {
-				BreakdownElementWrapperItemProvider w = (BreakdownElementWrapperItemProvider) iter
-						.next();
-				extractChildren(w, w, breakdownElements);
-			}
-		} else {
-				for (int i = 0; i < adapterFactories.length; i++) {
-					AdapterFactory adapterFactory = adapterFactories[i];
-					ITreeItemContentProvider adapter = (ITreeItemContentProvider) adapterFactory
-							.adapt(getObject(), ITreeItemContentProvider.class);
-				extractChildren(adapter, getObject(), breakdownElements);
-			}
-		}
-		return breakdownElements;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl#populateNodes()
-	 */
-	protected void populateNodes() {
-		Activity act = (Activity) getObject();
-		if (act == null)
-			return;
-		
-		if(isGraphicalDataRequired()) {
-			// to populate the typednode.
-			super.populateNodes();
-		}
-
-		if(filter == null){
-			filter = ((ConfigurableComposedAdapterFactory)DEFAULT_ADAPTER_FACTORIES[0]).getFilter();	
-		}
-		
-		//Node newNode = null;
-		ArrayList nodes = new ArrayList();
-		Collection breakdownElements = getAllBreakdownElements();
-		Collection roleDescriptors = new HashSet();
-		for (Iterator iterator = breakdownElements.iterator(); iterator
-				.hasNext();) {
-			Object object = iterator.next();
-			Object element = TngUtil.unwrap(object);
-			if (element instanceof TaskDescriptor) {
-				TaskDescriptor descriptor = (TaskDescriptor) element;
-				RoleDescriptor roleDescriptor = descriptor
-				.getPerformedPrimarilyBy();
-				if (roleDescriptor != null && filter.accept(roleDescriptor)
-						//TODO: need to check if the role descriptor is inherited and locally suppressed
-						// if locally suppressed, check the wrapper of the role descriptor
-						//
-						&& !roleDescriptor.getSuppressed().booleanValue() 
-						&& !roleDescriptors.contains(roleDescriptor)) {
-					roleDescriptors.add(roleDescriptor);
-//					newNode = createRoleTaskComposite(roleDescriptor);
-//					if(newNode != null) {
-//						if(ProcessUtil.isInherited(object)) {
-//							// task descriptor is inherited, its primary performer is not local
-//							// set role node of the RoleTaskComposite to read-only						
-//							//
-//							Node roleNode = (Node) ((NodeContainer)newNode).getNodes().get(0);
-//							roleNode.setReadOnly(true);
-//						}
-//						nodes.add(newNode);
-//					}
-					createRoleTaskCompositeRows(roleDescriptor, object, nodes);
-				}
-				if(roleDescriptors.contains(roleDescriptor)){
-					createTaskInputOutputNodes(descriptor, nodes);
-				}
-			}
-		}
-		selectNodes(nodes);
-	}	
-
-    private void createRoleTaskCompositeRows(RoleDescriptor roleDescriptor, 
-    		Object object, List nodes) {
-    	
-    	int tasksPerRow = GraphicalDataHelper.getTasksPerRow();
-    	List primaryTaskDescriptors = //AssociationHelper.getPrimaryTaskDescriptors(roleDescriptor);
-    		getRealizedPrimaryTaskDescriptors(roleDescriptor);
-    	int totalTasks = primaryTaskDescriptors.size();
-    	
-    	if(tasksPerRow > 0 && totalTasks > 0  && totalTasks > tasksPerRow
-    			&& isAutoLayout()){
-    		for(int i =0; i <= totalTasks/tasksPerRow; i++){
-    			Node newNode = createRoleTaskComposite(roleDescriptor, i);
-    			if(newNode != null) {
-    				if(ProcessUtil.isInherited(object)) {
-    					// task descriptor is inherited, its primary performer is not local
-    					// set role node of the RoleTaskComposite to read-only						
-    					//
-    					List nods = ((NodeContainer)newNode).getNodes();
-    					if(!nods.isEmpty()){
-    						Node roleNode = (Node) nods.get(0);
-    						roleNode.setReadOnly(true);
-    					}
-    				}
-    				nodes.add(newNode);
-    			}
-    		}
-    	}else{
-    		Node newNode = createRoleTaskComposite(roleDescriptor);
-			if(newNode != null) {
-				if(ProcessUtil.isInherited(object)) {
-					// task descriptor is inherited, its primary performer is not local
-					// set role node of the RoleTaskComposite to read-only						
-					//
-					List nods = ((NodeContainer)newNode).getNodes();
-					if(!nods.isEmpty()){
-						Node roleNode = (Node) nods.get(0);
-						roleNode.setReadOnly(true);
-					}
-				}
-				nodes.add(newNode);
-			}
-    	}
-    	
-	}
-
-	/**
-	 * @param taskDescriptor
-	 * @return
-	 */
-	Node createNode(TaskDescriptor taskDescriptor) {
-		Node node = ModelFactory.eINSTANCE.createTaskNode();
-		node.setUMAContainer(getGraphNode());
-		node.setDiagram(this);
-		node.setObject(taskDescriptor);
-		return node;
-	}
-
-	/**
-	 * @param descriptor
-	 * @return
-	 */
-	Node createNode(WorkProductDescriptor descriptor) {
-		Node node = ModelFactory.eINSTANCE.createWorkProductDescriptorNode();
-		node.setUMAContainer(getGraphNode());
-		node.setDiagram(this);
-		node.setObject(descriptor);
-		return node;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl#populateLinks()
-	 */
-	protected void populateLinks() {
-		populateLinks(getNodes(), true);
-	}
-
-	/**
-	 * @param newNodes
-	 * @param disableNotification
-	 */
-	private void populateLinks(Collection newNodes, boolean disableNotification) {
-		// fill outgoing/incoming connection lists of all nodes
-		//
-		int size = getNodes().size();
-		boolean[] notifies = new boolean[size];
-		try {
-			if (disableNotification)
-				// disable notification for all nodes in this diagram to avoid
-				// unwanted concurrent modification of their connection list
-				//
-				for (int i = 0; i < size; i++) {
-					Node node = ((Node) getNodes().get(i));
-					notifies[i] = node.eDeliver();
-					node.eSetDeliver(false);
-				}
-
-			for (Iterator iter = newNodes.iterator(); iter.hasNext();) {
-				Node child = (Node) iter.next();
-				if (child instanceof WorkProductComposite) {
-					// WorkProductComposite workproductComposite =
-					// (WorkProductComposite) child.getObject();
-					WorkProductComposite workproductComposite = (WorkProductComposite) child;
-					if (workproductComposite.getType() == WorkProductComposite.INPUTS) {
-						Object object = workproductComposite.getObject();
-						if (object instanceof TaskDescriptor) {
-							Node node = GraphicalDataHelper.findNode(this,
-									object);
-							if(GraphicalDataHelper.findLink(child, object) == null) {
-								Link link = ModelFactory.eINSTANCE.createLink();
-								link.setSource(child);
-								link.setTarget(node);
-								if(isGraphicalDataRequired()) {
-									GraphicalDataHelper.addGraphicalData(link);
-								}
-							}
-						}
-					}
-					if (workproductComposite.getType() == WorkProductComposite.OUTPUTS) {
-						Object object = workproductComposite.getObject();
-						if (object instanceof TaskDescriptor) {
-							Node node = GraphicalDataHelper.findNode(this,
-									object);
-							if(GraphicalDataHelper.findLink(node, object) == null) {
-								Link link = ModelFactory.eINSTANCE.createLink();
-								link.setSource(node);
-								link.setTarget(child);
-								if(isGraphicalDataRequired()) {
-									GraphicalDataHelper.addGraphicalData(link);
-								}
-							}
-						}
-					}
-				}
-			}
- 		} finally {
-			if (disableNotification)
-				// restore notification flag
-				//
-				for (int i = 0; i < size; i++) {
-					((EObject) getNodes().get(i)).eSetDeliver(notifies[i]);
-				}
-		}
-
-	}
-	
-	private RoleTaskComposite doCreateRoleTaskComposite(RoleDescriptor roleDescriptor) {
-		RoleTaskComposite roleTaskComposite = null;
-		for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-			Node element = (Node) iter.next();
-			if (element instanceof RoleTaskComposite) {
-				RoleTaskComposite rtc = (RoleTaskComposite) element;
-				if(rtc.getLinkedElement() == roleDescriptor) {
-					roleTaskComposite = rtc;
-					break;
-				}
-			}
-		}
-
-		if (roleTaskComposite == null) {
-			roleTaskComposite = ModelFactory.eINSTANCE
-					.createRoleTaskComposite();
-			roleTaskComposite.setUMAContainer(getGraphNode());
-			roleTaskComposite.setDiagram(this);
-		}
-		return roleTaskComposite;
-	}
-
-	public RoleTaskComposite createRoleTaskComposite(
-			RoleDescriptor roleDescriptor) {
-		RoleTaskComposite roleTaskComposite = doCreateRoleTaskComposite(roleDescriptor);
-		roleTaskComposite.setObject(roleDescriptor);
-		return roleTaskComposite;
-	}
-	
-	public RoleTaskComposite createRoleTaskComposite(
-			RoleDescriptor roleDescriptor, int rowIndex) {
-		RoleTaskComposite roleTaskComposite = doCreateRoleTaskComposite(roleDescriptor);
-		((RoleTaskCompositeImpl)roleTaskComposite).setRowIndex(rowIndex);
-		roleTaskComposite.setObject(roleDescriptor);
-		return roleTaskComposite;
-	}
-
-	public WorkProductComposite createWorkProductComposite(
-			TaskDescriptor taskDescriptor, int type) {
-		WorkProductComposite workproductComposite = null;
-		for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-			Node element = (Node) iter.next();
-			if (element instanceof WorkProductComposite) {
-				WorkProductComposite wpc = (WorkProductComposite) element;
-				if(wpc.getLinkedElement() == taskDescriptor && wpc.getType() == type) {					
-					workproductComposite = wpc;
-					break;
-				}
-			}
-		}
-		if(workproductComposite == null) {
-			workproductComposite = ModelFactory.eINSTANCE
-			.createWorkProductComposite();
-			workproductComposite.setType(type);
-		}
-		workproductComposite.setUMAContainer(getGraphNode());
-		workproductComposite.setDiagram(this);
-		workproductComposite.setObject(taskDescriptor);
-		return workproductComposite;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl#getType()
-	 */
-	protected int getType() {
-		return GraphicalDataHelper.ACTIVITY_DETAIL_DIAGRAM;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl#getDiagramChangeListenerType()
-	 */
-	protected Class getDiagramChangeListenerType() {
-		return IActivityDetailDiagramChangeListener.class;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl#getBreakdownElementType()
-	 */
-	protected Class getBreakdownElementType() {
-		return Descriptor.class;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl#toNode(org.eclipse.epf.uma.MethodElement)
-	 */
-	protected Node toNode(MethodElement e) {
-		if (e instanceof RoleDescriptor) {
-			List list = //AssociationHelper.getPrimaryTaskDescriptors((RoleDescriptor) e);
-				getRealizedPrimaryTaskDescriptors((RoleDescriptor)e);
-			for (Iterator iterator = list.iterator(); iterator.hasNext();) {
-				Object obj = iterator.next();
-				if (obj instanceof TaskDescriptor) {
-					createTaskInputOutputNodes((TaskDescriptor) obj, getNodes());
-				}
-			}
-			return createRoleTaskComposite((RoleDescriptor) e);
-		} else if (e instanceof TaskDescriptor) {
-			createTaskInputOutputNodes((TaskDescriptor) e, getNodes());
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl#addNode(java.lang.Object)
-	 */
-	protected Node addNode(Object obj) {
-		if (filter == null) {
-			filter = ((ConfigurableComposedAdapterFactory) DEFAULT_ADAPTER_FACTORIES[0])
-					.getFilter();
-		}
-		if (obj instanceof TaskDescriptor
-				&& !filter.accept(((TaskDescriptor) obj)
-						.getPerformedPrimarilyBy()))
-			return null;
-		Node node = null;
-		if (obj instanceof TaskDescriptor) {
-			RoleDescriptor roleDescriptor = ((TaskDescriptor) obj)
-					.getPerformedPrimarilyBy();
-			node = findNode(this, roleDescriptor);
-			if (node == null) {
-				node = createRoleTaskComposite(roleDescriptor);
-				getNodes().add(node);
-			} else {
-				node = super.addNode(getNodes(), obj);
-			}
-		} else {
-			node = super.addNode(getNodes(), obj);
-		}
-		if (node != null) {
-			populateLinks(Collections.singletonList(node), false);
-		}
-		return node;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl#addNodes(java.util.Collection)
-	 */
-	protected Collection addNodes(Collection collection) {
-		Collection nodes = super.addNodes(collection);
-		if (!nodes.isEmpty()) {
-			populateLinks(nodes, false);
-		}
-		return nodes;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl#removeFromUmaModel(org.eclipse.epf.diagram.model.Node)
-	 */
-	protected void removeFromUmaModel(Node removedNode) {
-		// if the removed node is a TaskNode that had been moved to a
-		// RoleTaskComposite
-		// then its TaskDescriptor will not be removed from model
-		//
-		if (GraphicalDataHelper.findNode(this, removedNode.getObject()) != null) {
-			return;
-		}
-		if (removedNode instanceof RoleTaskComposite
-				|| removedNode instanceof WorkProductComposite)
-			return;
-
-		super.removeFromUmaModel(removedNode);
-	}
-
-	protected void addToUmaModel(int position, Node addedNode) {
-		super.addToUmaModel(position, addedNode);
-
-		if (addedNode.getObject() instanceof BreakdownElement) {
-			Activity act = (Activity) getObject();
-			// translate Node index to Activity index
-			int i = toActivityIndex(position);
-			System.out
-					.println("ActivityDetailDiagram.addToUmaModel(): WorkBreakdownElement index: " + i); //$NON-NLS-1$
-			if (i == -1) {
-				act.getBreakdownElements().add(addedNode.getObject());
-			} else {
-				act.getBreakdownElements().add(i, addedNode.getObject());
-			}
-		}
-
-	}
-
-	private int toActivityIndex(int index) {
-		if (index == -1)
-			return index;
-		int size = getNodes().size();
-		int i = index + 1;
-		if (i == size)
-			return -1;
-		Node node = (Node) getNodes().get(i);
-		if (node == null)
-			return -1;
-
-		for (; !(node.getObject() instanceof BreakdownElement) && i < size; i++) {
-			node = (Node) getNodes().get(i);
-		}
-		if (i == size)
-			return -1;
-		Activity act = (Activity) getObject();
-		return act.getBreakdownElements().indexOf(node.getObject());
-
-	}
-
-	public Node findNode(ActivityDetailDiagram diagram, Object object) {
-		for (Iterator iter = diagram.getNodes().iterator(); iter.hasNext();) {
-			Node element = (Node) iter.next();
-			if (object == element.getObject()) {
-				return element;
-			}
-		}
-		return null;
-	}
-	
-	private static final AdapterFactory[] DEFAULT_ADAPTER_FACTORIES = {			
-		TngAdapterFactory.INSTANCE.getWBS_ComposedAdapterFactory(),
-		TngAdapterFactory.INSTANCE.getOBS_ComposedAdapterFactory(),
-		TngAdapterFactory.INSTANCE.getPBS_ComposedAdapterFactory() 
-	}; 
-	
-	public void createTaskInputOutputNodes(TaskDescriptor descriptor, Collection nodes) {
-		Node newNode = null;
-		if (!descriptor.getMandatoryInput().isEmpty()) {
-			newNode = createWorkProductComposite(descriptor,
-					WorkProductComposite.INPUTS);
-			nodes.add(newNode);
-		}
-		if (!descriptor.getOutput().isEmpty()) {
-			newNode = createWorkProductComposite(descriptor,
-					WorkProductComposite.OUTPUTS);
-			nodes.add(newNode);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl#setNew(boolean)
-	 */
-	public void setNew(boolean n) {
-		super.setNew(n);
-		if(n){
-			doSetAutoLayout(true);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl#moveNode(java.lang.Object)
-	 */
-	public void moveNode(Object oldValue) {
-		// TODO Auto-generated method stub
-	}
-	
-	public List getRealizedPrimaryTaskDescriptors(RoleDescriptor r){
-		List list = new ArrayList();
-		if(r != null){
-			List actualList = AssociationHelper.getPrimaryTaskDescriptors(r);
-			Collection collection = getAllBreakdownElements();
-			for(Iterator iterator = actualList.iterator(); iterator.hasNext();){
-				Object e = iterator.next();
-				if(TngUtil.contains(collection, e)){
-					list.add(e);
-				}
-			}
-		}
-		return list;
-	}
-	
-} // ActivityDetailDiagramImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/ActivityDiagramImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/ActivityDiagramImpl.java
deleted file mode 100755
index 8b20399..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/ActivityDiagramImpl.java
+++ /dev/null
@@ -1,632 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.diagram.model.ActivityDiagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.diagram.model.util.IActivityDiagramChangeListener;
-import org.eclipse.epf.diagram.model.util.IAdapterFactoryFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.process.ActivityWrapperItemProvider;
-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.process.WBSActivityItemProvider;
-import org.eclipse.epf.library.edit.util.ConfigurableComposedAdapterFactory;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.GraphEdge;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.SemanticModelBridge;
-import org.eclipse.epf.uma.SimpleSemanticModelElement;
-import org.eclipse.epf.uma.UMASemanticModelBridge;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkOrder;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Activity Diagram</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ActivityDiagramImpl extends DiagramImpl implements ActivityDiagram {
-	private class ActivityDiagramChangeListener extends ActivityAdapter
-			implements IActivityDiagramChangeListener {
-
-	};
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	protected ActivityDiagramImpl() {
-		super();
-
-		diagramChangeListener = new ActivityDiagramChangeListener();
-	}
-
-	protected Class getDiagramChangeListenerType() {
-		return IActivityDiagramChangeListener.class;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.ACTIVITY_DIAGRAM;
-	}
-
-	protected void populateNodes() {
-		// Activity act = (Activity) getObject();
-		org.eclipse.epf.uma.Diagram diagram = getUMADiagram();
-
-		// add TypedNodes
-		//
-		List typedNodes = new ArrayList();
-		for (Iterator iter = diagram.getContained().iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			int type = getType(element);
-			if (type > 0) {
-				TypedNode node = ModelFactory.eINSTANCE.createTypedNode();
-				node.setType(type);
-				node.setObject(element);
-				typedNodes.add(node);
-			}
-		}
-		getNodes().addAll(typedNodes);
-
-		// add WorkBreakdownElementNodes
-		//
-		addElementNodes();
-	}
-
-	private static boolean isValidWorkOrder(WorkOrder wo, Object pred) {
-		if (wo.getPred() == pred) {
-			return true;
-		}
-
-		if (pred instanceof Activity) {
-			Activity act = (Activity) pred;
-			// check if predecessor reference in the given work order is base of
-			// pred
-			//
-			for (VariabilityElement ve = act.getVariabilityBasedOnElement(); ve != null; ve = ve
-					.getVariabilityBasedOnElement()) {
-				if (ve == wo.getPred()) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	private boolean isValid(Link link) {
-		if (link.getSource() == null || link.getTarget() == null
-				|| !getNodes().contains(link.getSource())
-				|| !getNodes().contains(link.getTarget())) {
-			return false;
-		}
-		return true;
-	}
-
-	protected void populateLinks() {
-		super.populateLinks();
-
-		// remove the invalid links
-		//
-		for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-			Node node = ((Node) iter.next());
-			WorkBreakdownElement wbe = null;
-			if (node.getObject() instanceof WorkBreakdownElement) {
-				wbe = (WorkBreakdownElement) node.getObject();
-			}
-			ArrayList linksToRemove = new ArrayList();
-			linkListWalk: for (Iterator iterator = node
-					.getIncomingConnections().iterator(); iterator.hasNext();) {
-				Link link = (Link) iterator.next();
-				if (!isValid(link)) {
-					linksToRemove.add(link);
-				}
-
-				if (wbe != null) {
-					// TODO: need revisit to check the valid connection from a
-					// TypedNode
-					//
-					if (link.getSource() instanceof TypedNode)
-						continue linkListWalk;
-
-					Object pred = link.getSource().getObject();
-					boolean workOrderFound = false;
-					find_WorkOrder: for (Iterator iterator1 = wbe
-							.getLinkToPredecessor().iterator(); iterator1
-							.hasNext();) {
-						WorkOrder wo = (WorkOrder) iterator1.next();
-						if (isValidWorkOrder(wo, pred)) {
-							workOrderFound = true;
-							break find_WorkOrder;
-						}
-					}
-					if (!workOrderFound) {
-						// invalid link, remove it
-						//
-						linksToRemove.add(link);
-					}
-				}
-			}
-
-			for (Iterator iterator = linksToRemove.iterator(); iterator
-					.hasNext();) {
-				Link link = (Link) iterator.next();
-				GraphicalDataHelper.removeLink(link);
-			}
-			linksToRemove.clear();
-
-			for (Iterator iterator = node.getOutgoingConnections().iterator(); iterator
-					.hasNext();) {
-				Link link = (Link) iterator.next();
-				if (!isValid(link)) {
-					linksToRemove.add(link);
-				}
-			}
-
-			for (Iterator iterator = linksToRemove.iterator(); iterator
-					.hasNext();) {
-				Link link = (Link) iterator.next();
-				GraphicalDataHelper.removeLink(link);
-			}
-			linksToRemove.clear();
-			linksToRemove = null;
-		}
-
-		// Check the links of each ActivityNode
-		// set the WorkOrder to the link if needed
-		// add new link for those WorkOrders that still don't have the
-		// corresponding link
-		//
-		AdapterFactory adapterFactory = getAdapterFactory();
-		
-		for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-			Node node = ((Node) iter.next());
-			if (node.getObject() instanceof WorkBreakdownElement) {
-				List list = new ArrayList(); 
-				// Get the raw data of workorders for object.
-				WorkBreakdownElement local = (WorkBreakdownElement) node.getObject();
-				list.addAll(local.getLinkToPredecessor());
-				
-				// Get the Predecessor List on top of raw data, this is need for in case of extend.
-				ITreeItemContentProvider adapter = null;
-				adapter = (ITreeItemContentProvider)adapterFactory
-									.adapt(local, ITreeItemContentProvider.class);
-				if(adapter instanceof IBSItemProvider){
-					list.addAll(((IBSItemProvider)adapter).getPredecessors());
-				}
-				
-				// Iterate work orders and create links.
-				for (Iterator iterator = list.iterator(); iterator
-						.hasNext();) {
-					Object next = iterator.next();
-					WorkOrder workOrder = null;
-					BreakdownElement pred = null;
-					if(next instanceof WorkOrder){
-						workOrder = (WorkOrder)next;
-						pred = workOrder.getPred();
-					}
-					if(next instanceof WBSActivityItemProvider){
-						pred = (BreakdownElement)((WBSActivityItemProvider)next).getTarget(); 
-					}
-					
-					if (pred != null && pred instanceof WorkBreakdownElement) {
-						Node predNode = GraphicalDataHelper.findNode(this,
-								pred, true);
-						if (predNode != null) {
-							// check if there is a link for this work order
-							// already
-							//
-							boolean linkFound = false;
-							find_link: for (Iterator iterator1 = node
-									.getIncomingConnections().iterator(); iterator1
-									.hasNext();) {
-								Link link = (Link) iterator1.next();
-								if (link.getSource() == predNode) {
-									// link already exists
-									// check if work order is set to this link
-									//
-									linkFound = true;
-									GraphEdge edge = (GraphEdge) link
-											.getObject();
-									if (edge.getSemanticModel() == null) {
-										GraphicalDataHelper.setSemanticModel(
-												link, workOrder);
-									}
-									break find_link;
-								}
-							}
-							if (!linkFound) {
-								// check if this WorkOrder can be represented
-								// via links of TypedNodes
-								//
-								if (!canReachAsFirstActivityNode(predNode, node)) {
-									// add new link for this work order
-									//
-									NamedNodeImpl nodeImpl = ((NamedNodeImpl) node);
-									NamedNodeImpl predNodeImpl = (NamedNodeImpl) predNode;
-									boolean oldNotify = nodeImpl.notificationEnabled;
-									boolean predNodeNotify = predNodeImpl.notificationEnabled;
-									try {
-										nodeImpl.notificationEnabled = false;
-										predNodeImpl.notificationEnabled = false;
-										nodeImpl.addIncomingConnection(pred); 
-									} finally {
-										nodeImpl.notificationEnabled = oldNotify;
-										predNodeImpl.notificationEnabled = predNodeNotify;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		cleanDuplicateLinks();
-	}
-
-	private void cleanDuplicateLinks() {
-		List duplicateLinks = new ArrayList();
-		for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-			Object node = iter.next();
-			if (node instanceof Node) {
-				Node wbNode = (Node) node;
-				if(wbNode.getIncomingConnections() != null){
-					findDuplicateLinks(duplicateLinks, wbNode.getIncomingConnections());
-				}
-				if(wbNode.getOutgoingConnections() !=null){
-					findDuplicateLinks(duplicateLinks, wbNode.getOutgoingConnections());
-				}
-			}
-			
-		}
-		for (Iterator iterator = duplicateLinks.iterator(); iterator.hasNext();) {
-			Link link = (Link) iterator.next();
-			GraphicalDataHelper.removeLink(link);
-		}
-		duplicateLinks.clear();
-		duplicateLinks = null;
-	}
-
-	private void findDuplicateLinks(List duplicateLinks, List links) {
-		for (int i = 0; i < links.size(); i++) {
-			Link link = (Link) links.get(i);
-			if(!duplicateLinks.contains(link)){
-				for (int j = i + 1; j < links.size(); j++) {
-					Link link1 = (Link) links.get(j);
-					if (link1.getSource() == link.getSource()
-							&& link1.getTarget() == link.getTarget()) {
-						duplicateLinks.add(link1);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Checks if Node src can reach Node target as the first ActivityNode in the
-	 * diagram
-	 * 
-	 * @param src
-	 * @param target
-	 * @return
-	 */
-	private static boolean canReachAsFirstActivityNode(Node src, Node target) {
-		for (Iterator iter = src.getOutgoingConnections().iterator(); iter
-				.hasNext();) {
-			Link link = (Link) iter.next();
-			if (link.getTarget() == target) {
-				return true;
-			}
-			if (link.getTarget() instanceof TypedNode
-					&& canReachAsFirstActivityNode(link.getTarget(), target)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	// private List toNodes(List activities) {
-	// List list = new ArrayList();
-	// for (Iterator iter = activities.iterator(); iter.hasNext();) {
-	// list.add(toNode((MethodElement) iter.next()));
-	// }
-	// return list;
-	// }
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl#newNode()
-	 */
-	protected Node newNode() {
-		return ModelFactory.eINSTANCE.createWorkBreakdownElementNode();
-	}
-
-	public Collection getChildren() {
-		ITreeItemContentProvider adapter = getAdapter();
-		if (adapter != null) {
-			
-			//Turn off the VariabilityInfo for the activity diagram.
-			Object obj = null;
-			boolean enableVariabilityInfo = false;
-			if(adapter instanceof ActivityWrapperItemProvider){
-				obj = ((ActivityWrapperItemProvider)adapter).getDelegatingItemProvider();
-			}
-			if(adapter instanceof BSActivityItemProvider){
-				obj = adapter;
-			}
-			
-			if(obj instanceof BSActivityItemProvider){
-				enableVariabilityInfo = ((BSActivityItemProvider)obj).isEnableVariabilityInfo();
-				((BSActivityItemProvider)obj).setEnableVariabilityInfo(false);
-			}
-			// end of variability info 
-			
-			
-			// return adapter.getChildren(getObject());
-			// commented above line, For diagrams - rollup should be false, for
-			// handling rollup state below code.
-			List children = new ArrayList();
-			extractChildren(adapter, getObject(), children);
-			
-			// reset variabilityinfo status back
-			if(obj instanceof BSActivityItemProvider){
-				((BSActivityItemProvider)obj).setEnableVariabilityInfo(enableVariabilityInfo);
-			}
-			
-			return children;
-		} else {
-			return Collections.EMPTY_LIST;
-		}
-	}
-
-	private void addElementNodes() {
-
-		ArrayList nodes = new ArrayList();
-		for (Iterator iter = getChildren().iterator(); iter.hasNext();) {
-			Object e = iter.next();
-			Object child = TngUtil.unwrap(e);
-			if (child instanceof WorkBreakdownElement) {
-				NamedNodeImpl node = (NamedNodeImpl) toNode((MethodElement) child);
-				if (e instanceof BreakdownElementWrapperItemProvider) {
-					BreakdownElementWrapperItemProvider wrapper = ((BreakdownElementWrapperItemProvider) e);
-					if (wrapper.isReadOnly()) {
-						node.itemProvider = wrapper;
-						// TODO: check if readOnly attribute is still needed
-						// after introduction of itemProvider
-						//
-						node.readOnly = true;
-					}
-				}
-				nodes.add(node);
-			}
-		}
-
-		getNodes().addAll(nodes);
-	}
-
-	private static int getType(Object obj) {
-		if (obj instanceof GraphNode) {
-			GraphNode node = (GraphNode) obj;
-			SemanticModelBridge modelBridge = node.getSemanticModel();
-			if (modelBridge instanceof SimpleSemanticModelElement) {
-				String type = ((SimpleSemanticModelElement) modelBridge)
-						.getTypeInfo();
-				if (GraphicalDataHelper.GRAPH_NODE_SYNCH_BAR.equals(type)) {
-					return TypedNode.SYNCH_BAR;
-				} else if (GraphicalDataHelper.GRAPH_NODE_DECISION.equals(type)) {
-					return TypedNode.DECISION;
-				} else if (GraphicalDataHelper.GRAPH_NODE_END.equals(type)) {
-					return TypedNode.END;
-				} else if (GraphicalDataHelper.GRAPH_NODE_START.equals(type)) {
-					return TypedNode.START;
-				} else if (GraphicalDataHelper.GRAPH_NODE_FREE_TEXT
-						.equals(type)) {
-					return TypedNode.FREE_TEXT;
-				}
-			}
-		}
-		return -1;
-	}
-
-	protected int getType() {
-		return GraphicalDataHelper.ACTIVITY_DIAGRAM;
-	}
-
-	protected List getBreakdownElementTypes() {
-		return Collections.singletonList(WorkBreakdownElement.class);
-	}
-
-	private int toActivityIndex(int index) {
-		if (index == -1)
-			return index;
-		int size = getNodes().size();
-		int i = index + 1;
-		if (i == size)
-			return -1;
-		Node node = (Node) getNodes().get(i);
-		if (node == null)
-			return -1;
-
-		for (; !(node.getObject() instanceof BreakdownElement) && i < size; i++) {
-			node = (Node) getNodes().get(i);
-		}
-		if (i == size)
-			return -1;
-		Activity act = (Activity) getObject();
-		return act.getBreakdownElements().indexOf(node.getObject());
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl#addToUmaModel(int,
-	 *      org.eclipse.epf.diagram.model.Node)
-	 */
-	protected void addToUmaModel(int position, Node addedNode) {
-		if (addedNode.getObject() instanceof BreakdownElement) {
-			Activity act = (Activity) getObject();
-
-			// translate ActivityNode index to Activity index
-			//
-			int i = toActivityIndex(position);
-			// System.out.println("DiagramImpl.addToUmaModel():
-			// WorkBreakdownElement index: " + i);
-			if (i == -1) {
-				act.getBreakdownElements().add(addedNode.getObject());
-			} else {
-				act.getBreakdownElements().add(i, addedNode.getObject());
-			}
-		}
-
-		super.addToUmaModel(position, addedNode);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl#addNode(java.util.Collection,
-	 *      java.lang.Object)
-	 */
-	protected Node addNode(Collection nodes, Object obj) {
-		if (obj instanceof Activity) {
-			Activity act = (Activity) obj;
-			VariabilityElement base = act.getVariabilityBasedOnElement();
-			if (base != null) {
-				// find existing node for base and link it to the activity
-				//
-				NodeImpl baseNode = (NodeImpl) GraphicalDataHelper.findNode(
-						this, base);
-				if (baseNode != null) {
-					GraphNode graphNode = baseNode.getGraphNode();
-					UMASemanticModelBridge bridge = (UMASemanticModelBridge) graphNode
-							.getSemanticModel();
-					if (bridge.getElement() != act) {
-						bridge.setElement(act);
-					}
-				} else {
-					baseNode = (NodeImpl) GraphicalDataHelper.findNode(this,
-							act);
-				}
-				if (baseNode != null) {
-					// disassociate with the base
-					//
-					if (baseNode.methodElementAdapter != null) {
-						base.eAdapters().remove(baseNode.methodElementAdapter);
-					}
-
-					baseNode.basicSetObject(act);
-					baseNode.setReadOnly(false);
-
-					return null;
-				}
-			}
-		}
-		return super.addNode(nodes, obj);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.DiagramImpl#removeNode(java.lang.Object)
-	 */
-	protected boolean removeNode(Object obj) {
-		if (obj instanceof Activity) {
-			Activity act = (Activity) obj;
-			VariabilityElement base = act.getVariabilityBasedOnElement();
-			if (base != null) {
-				// find existing node for the old activity and relink it to its
-				// base
-				//
-				NodeImpl node = (NodeImpl) GraphicalDataHelper.findNode(this,
-						act);
-				if (node != null) {
-					GraphNode graphNode = node.getGraphNode();
-					UMASemanticModelBridge bridge = (UMASemanticModelBridge) graphNode
-							.getSemanticModel();
-					if (bridge.getElement() != base) {
-						bridge.setElement(base);
-					}
-				} else {
-					node = (NodeImpl) GraphicalDataHelper.findNode(this, base);
-				}
-				if (node != null) {
-					// disassociate with the old activity
-					//
-					if (node.methodElementAdapter != null) {
-						act.eAdapters().remove(node.methodElementAdapter);
-					}
-
-					node.basicSetObject(base);
-					node.setReadOnly(true);
-
-					return false;
-				}
-			}
-		}
-		return super.removeNode(obj);
-	}
-	/**
-	 * Moved code from getChildren. getAdapter() will return Adapter,
-	 * which will allow us to find itemprovider for the children. 
-	 * 
-	 * @return
-	 */
-	private ITreeItemContentProvider getAdapter(){
-		ITreeItemContentProvider adapter = null;
-		if (wrapper != null) {
-			adapter = wrapper;
-		} else {
-			
-			adapter =(ITreeItemContentProvider)getAdapterFactory().adapt(
-					getObject(), ITreeItemContentProvider.class);
-		}
-		return adapter;
-	}
-	
-	private AdapterFactory getAdapterFactory(){
-		AdapterFactory adapterFactory = null;
-		if (filter == null) {
-			adapterFactory = TngAdapterFactory.INSTANCE.getWBS_ComposedAdapterFactory();
-		} else if (filter instanceof IAdapterFactoryFilter) {
-			adapterFactory = (ConfigurableComposedAdapterFactory) ((IAdapterFactoryFilter) filter)
-					.getWBSAdapterFactory();
-		}
-		return adapterFactory;
-	}
-} // ActivityDiagramImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/DiagramImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/DiagramImpl.java
deleted file mode 100755
index 6a851f8..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/DiagramImpl.java
+++ /dev/null
@@ -1,690 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.diagram.DiagramResources;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.diagram.model.util.GraphicalDataManager;
-import org.eclipse.epf.diagram.model.util.IDiagramChangeListener;
-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.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.SemanticModelBridge;
-import org.eclipse.epf.uma.SimpleSemanticModelElement;
-import org.eclipse.epf.uma.UmaPackage;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Diagram</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class DiagramImpl extends NodeContainerImpl implements Diagram {
-
-	private boolean newDiagram;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DiagramImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.DIAGRAM;
-	}
-
-	// -------------------//
-	// Start custom code //
-	// -------------------//
-
-	protected class ActivityAdapter extends TransactionalNodeLink implements
-			IDiagramChangeListener {
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.epf.diagram.model.util.IDiagramChangeListener#getDiagram()
-		 */
-		public Diagram getDiagram() {
-			return DiagramImpl.this;
-		}
-
-		@Override
-		protected void handleNotification(Notification msg) {
-			switch (msg.getFeatureID(Activity.class)) {
-			case UmaPackage.ACTIVITY__BREAKDOWN_ELEMENTS:
-				switch (msg.getEventType()) {
-				case Notification.ADD:
-					Node node = (Node) addNode(msg.getNewValue());
-					if (node != null) {
-					if (msg.getNotifier() == baseAct) {
-						node.setReadOnly(true);
-						}
-					}
-					break;
-				case Notification.REMOVE:
-					removeNode(msg.getOldValue());
-					break;
-				case Notification.ADD_MANY:
-					Collection nodes = addNodes((Collection) msg
-							.getNewValue());
-					if (msg.getNotifier() == baseAct) {
-						for (Iterator iter = nodes.iterator(); iter
-								.hasNext();) {
-							node = (NodeImpl) iter.next();
-							node.setReadOnly(true);
-						}
-					}
-					break;
-				case Notification.REMOVE_MANY:
-					removeNodes((Collection) msg.getOldValue());
-					break;
-				case Notification.MOVE:
-					moveNode(msg.getNewValue());
-					break;
-				}
-				break;
-			}
-		}
-
-	}
-
-	protected IDiagramChangeListener diagramChangeListener;
-
-	private Activity baseAct;
-
-	private Object diagramAdapter = new AdapterImpl() {
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification msg) {
-			if (!notificationEnabled)
-				return;
-			notificationEnabled = false;
-			try {
-				//Activity act = (Activity) getObject();
-				switch (msg.getFeatureID(Diagram.class)) {
-				case ModelPackage.DIAGRAM__NODES:
-					// System.out.println(".notifyChanged(): index=" +
-					// msg.getPosition());
-					Collection collection;
-					switch (msg.getEventType()) {
-					case Notification.ADD:
-						nodeAdded(msg.getPosition(), (Node) msg
-								.getNewValue());
-						return;
-					case Notification.REMOVE:
-						nodeRemoved((Node) msg.getOldValue());
-						return;
-					case Notification.ADD_MANY:
-						collection = (Collection) msg.getNewValue();
-						for (Iterator iter = collection.iterator(); iter
-								.hasNext();) {
-							Node node = (Node) iter.next();
-							nodeAdded(msg.getPosition(), node);
-						}
-
-						return;
-					case Notification.REMOVE_MANY:
-						collection = (Collection) msg.getOldValue();
-						for (Iterator iter = collection.iterator(); iter
-								.hasNext();) {
-							nodeRemoved((Node) iter.next());
-						}
-						return;
-					}
-
-				}
-			} finally {
-				notificationEnabled = true;
-			}
-		}
-	};
-
-	protected Node addNode(Object obj) {
-		Node node = addNode(getNodes(), obj);
-		if (node == null)
-			return node;
-		populateLinks(node, true);
-		return node;
-	}
-
-	protected Node addNode(Collection nodes, Object obj) {
-		if (TngUtil.isInstanceOf(getBreakdownElementTypes(), obj)) {
-			Node node = toNode((MethodElement) obj);
-			if (node != null) {
-				nodes.add(node);
-				return node;
-			}
-		}
-		return null;
-	}
-
-	protected Collection addNodes(Collection collection) {
-		List nodes = new ArrayList();
-		for (Iterator iter = collection.iterator(); iter.hasNext();) {
-			addNode(nodes, iter.next());
-		}
-
-		// use addAll() to avoid unnecessary notifications
-		//
-		getNodes().addAll(nodes);
-		return nodes;
-	}
-
-	/**
-	 * @param obj
-	 */
-	protected boolean removeNode(Object obj) {
-		if (!TngUtil.isInstanceOf(getBreakdownElementTypes(), obj))
-			return false;
-
-		Node node = GraphicalDataHelper.findNode(this, obj);
-		if (node == null)
-			return false;
-
-		for (Iterator iter = node.getOutgoingConnections().iterator(); iter
-				.hasNext();) {
-			Link link = (Link) iter.next();
-			link.setTarget(null);
-		}
-
-		for (Iterator iter = node.getIncomingConnections().iterator(); iter
-				.hasNext();) {
-			Link link = (Link) iter.next();
-			link.setSource(null);
-		}
-		node.getOutgoingConnections().clear();
-		node.getIncomingConnections().clear();
-
-		getNodes().remove(node);
-		return true;
-	}
-
-	protected void removeNodes(Collection collection) {
-		for (Iterator iter = collection.iterator(); iter.hasNext();) {
-			removeNode(iter.next());
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.Diagram#getUMADiagram()
-	 */
-	public org.eclipse.epf.uma.Diagram getUMADiagram() {
-		return (org.eclipse.epf.uma.Diagram) getGraphNode();
-	}
-
-	protected Class getDiagramChangeListenerType() {
-		return IDiagramChangeListener.class;
-	}
-
-	protected List getBreakdownElementTypes() {
-		return Collections.singletonList(BreakdownElement.class);
-	}
-
-	protected int getType() {
-		return -1;
-	}
-
-	protected void nodeAdded(int index, Node node) {
-		addToUmaModel(index, node);
-		node.addConsumer(this);
-	}
-
-	protected void nodeRemoved(Node node) {
-		removeFromUmaModel(node);
-		node.removeConsumer(this);
-	}
-
-	public boolean isNew() {
-		return this.newDiagram;
-	}
-
-	public void setNew(boolean n) {
-		this.newDiagram = n;
-	}
-
-	/**
-	 * NOTE: this method is re-entrant, make sure to handle the data correctly to avoid memory leak and data corruption
-	 * 
-	 * @param newObject
-	 *            must be an Activity
-	 */
-	public void setObject(Object newObject) {
-		if (newObject instanceof BreakdownElementWrapperItemProvider
-				&& ((BreakdownElementWrapperItemProvider) newObject)
-						.isReadOnly()) {
-			wrapper = (BreakdownElementWrapperItemProvider) newObject;
-			setReadOnly(true);
-		}
-		newObject = TngUtil.unwrap(newObject);
-
-		Object oldObject = object;
-		object = newObject;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					ModelPackage.LINKED_OBJECT__OBJECT, oldObject, object));
-
-		// add diagram change listener to the linked object. Remove the old
-		// listener if there is any.
-		// But first keep the old listener to help find the UMA diagram of the
-		// activity quickly.
-		//
-		Activity e = (Activity) newObject;		
-		if(ProcessUtil.isExtendingOrLocallyContributing(e)) {
-			baseAct = (Activity) e.getVariabilityBasedOnElement();
-		}
-		baseAct = null;
-		
-		if(newObject == null) {
-			return;
-		}
-
-		// set the UMA diagram for this diagram
-		//
-		if(isGraphicalDataRequired()) {
-			graphNode = GraphicalDataManager.getInstance().getUMADiagram(e,
-					getType(), false);
-			// set the flag to indicate this is a new diagram or not
-			if (graphNode == null) {
-				graphNode = GraphicalDataManager.getInstance().getUMADiagram(e,
-						getType(), true);
-				setNew(true);
-			}
-		}
-
-		if(!e.eAdapters().contains(diagramChangeListener)) {
-			e.eAdapters().add(diagramChangeListener);
-		}
-		if (baseAct != null) {
-			baseAct.eAdapters().add(diagramChangeListener);
-		}
-
-		populateDiagram();
-
-		if(!eAdapters().contains(diagramAdapter)) {
-			this.eAdapters().add(diagramAdapter);
-		}
-
-	}
-
-	/**
-	 * Populates the diagram with the data from the UMA model. Subclass should
-	 * override this method.
-	 */
-	protected void populateDiagram() {
-		populateNodes();
-		populateLinks();
-
-		// add this diagram to the consumer list of all nodes so they will not
-		// be disposed
-		// before this diagram.
-		//
-		for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-			NodeImpl node = (NodeImpl) iter.next();
-			node.addConsumer(this);
-		}
-	}
-
-	/**
-	 * Populates the incoming/outgoing links of the given node
-	 * 
-	 * @param node
-	 */
-	protected void populateLinks(Node node, boolean disableNotification) {
-		int size = 0;
-		boolean[] notifies = null;
-		try {
-			if (disableNotification) {
-				size = getNodes().size();
-				notifies = new boolean[size];
-				// disable notification for all nodes in this diagram to avoid
-				// unwanted concurrent modification of their connection list
-				//
-				for (int i = 0; i < size; i++) {
-					Node child = ((Node) getNodes().get(i));
-					notifies[i] = child.eDeliver();
-					child.eSetDeliver(false);
-				}
-			}
-
-			GraphNode graphNode = node.getGraphNode();
-			if (graphNode != null) {
-				GraphicalDataHelper.fillConnections(node, graphNode);
-			}
-		} finally {
-			if (disableNotification) {
-				// restore notification flag
-				//
-				for (int i = 0; i < size; i++) {
-					((EObject) getNodes().get(i)).eSetDeliver(notifies[i]);
-				}
-			}
-		}
-	}
-
-	protected void populateNodes() {		
-		org.eclipse.epf.uma.Diagram diagram = getUMADiagram();
-		if(diagram != null) {
-			List typedNodes = new ArrayList();
-			for (Iterator iter = diagram.getContained().iterator(); iter.hasNext();) {
-				Object element = iter.next();
-				int type = getType(element);
-				if (type > 0) {
-					TypedNode node = ModelFactory.eINSTANCE.createTypedNode();
-					node.setType(type);
-					node.setObject(element);
-					typedNodes.add(node);
-				}
-			}
-			getNodes().addAll(typedNodes);
-		}
-	}
-
-	private static int getType(Object obj) {
-		if (obj instanceof GraphNode) {
-			GraphNode node = (GraphNode) obj;
-			SemanticModelBridge modelBridge = node.getSemanticModel();
-			if (modelBridge instanceof SimpleSemanticModelElement) {
-				String type = ((SimpleSemanticModelElement) modelBridge)
-						.getTypeInfo();
-				if (GraphicalDataHelper.GRAPH_NODE_SYNCH_BAR.equals(type)) {
-					return TypedNode.SYNCH_BAR;
-				} else if (GraphicalDataHelper.GRAPH_NODE_DECISION.equals(type)) {
-					return TypedNode.DECISION;
-				} else if (GraphicalDataHelper.GRAPH_NODE_END.equals(type)) {
-					return TypedNode.END;
-				} else if (GraphicalDataHelper.GRAPH_NODE_START.equals(type)) {
-					return TypedNode.START;
-				} else if (GraphicalDataHelper.GRAPH_NODE_FREE_TEXT
-						.equals(type)) {
-					return TypedNode.FREE_TEXT;
-				}
-			}
-		}
-		return -1;
-	}
-
-	protected void populateLinks() {
-		// fill outgoing/incoming connection lists of all nodes
-		//
-		int size = getNodes().size();
-		boolean[] notifies = new boolean[size];
-		try {
-			// disable notification for all nodes in this diagram to avoid
-			// unwanted concurrent modification of their connection list
-			//
-			for (int i = 0; i < size; i++) {
-				Node node = ((Node) getNodes().get(i));
-				notifies[i] = node.eDeliver();
-				node.eSetDeliver(false);
-			}
-			for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-				Node node = (Node) iter.next();
-				populateLinks(node, false);
-			}
-		} finally {
-			// restore notification flag
-			//
-			for (int i = 0; i < size; i++) {
-				((EObject) getNodes().get(i)).eSetDeliver(notifies[i]);
-			}
-		}
-
-	}
-
-	/**
-	 * Removes the data for the removed node from the UMA model Subclass should
-	 * override this method.
-	 * 
-	 * @param removedNode
-	 */
-	protected void removeFromUmaModel(Node removedNode) {
-		Activity act = (Activity) getObject();
-		if (removedNode.getObject() instanceof BreakdownElement) {
-			act.getBreakdownElements().remove(removedNode.getObject());
-		}
-		
-		if(getUMADiagram() != null) {
-			getUMADiagram().getContained().remove(removedNode.getGraphNode());
-		}
-	}
-
-	/**
-	 * Adds the data for the newly added node to the UMA model Subclass should
-	 * override this method.
-	 * 
-	 * @param position
-	 * @param newValue
-	 */
-	protected void addToUmaModel(int position, Node addedNode) {
-
-		if (addedNode.getGraphNode() == null) {
-			// this node is readded after undo
-			//
-			((NodeImpl) addedNode).basicSetObject(addedNode.getObject());
-		}
-		
-		if(getUMADiagram() != null) {
-			getUMADiagram().getContained().add(addedNode.getGraphNode());
-		}
-	}
-
-	/**
-	 * Creates new node for this diagram for the given MethodElement.
-	 * 
-	 * @param e
-	 * @return
-	 */
-	protected Node toNode(MethodElement e) {
-		Node node = newNode();
-		if (node == null)
-			return null;
-		node.setUMADiagram(getUMADiagram());
-		node.setDiagram(this);
-		node.setObject(e);
-		return node;
-	}
-
-	protected Node newNode() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.Node#getMethodElementAdapterType()
-	 */
-	public Class getMethodElementAdapterType() {
-		return getDiagramChangeListenerType();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.NodeImpl#dispose()
-	 */
-	protected void dispose() {
-		// dispose all nodes
-		//
-		for (Iterator iter = nodes.iterator(); iter.hasNext();) {
-			NodeImpl node = (NodeImpl) iter.next();
-			node.dispose();
-		}
-
-		if (diagramChangeListener != null) {
-			Activity e = (Activity) getObject();
-			if (baseAct != null) {
-				baseAct.eAdapters().remove(diagramChangeListener);
-			}
-			e.eAdapters().remove(diagramChangeListener);
-		}
-
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.Diagram#setDefaultName(org.eclipse.epf.diagram.model.NamedNode)
-	 */
-	public void setDefaultName(NamedNode newNode) {
-		MethodElement obj = (MethodElement) newNode.getObject();
-		int classID = obj.eClass().getClassifierID();
-		Activity act = (Activity) getObject();
-		ArrayList siblings = new ArrayList();
-		for (Iterator iter = act.getBreakdownElements().iterator(); iter
-				.hasNext();) {
-			BreakdownElement e = (BreakdownElement) iter.next();
-			if (e.eClass().getClassifierID() == classID) {
-				siblings.add(e);
-			}
-		}
-		String baseName = MessageFormat
-				.format(
-						DiagramResources.defaultBaseName, new Object[] { TngUtil.getTypeText(obj.eClass().getName()) }); 
-		TngUtil.setDefaultName(siblings, obj, baseName);
-		newNode.setName(obj.getName());
-	}
-	
-	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;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.Diagram#setFilter(com.ibm.library.edit.IFilter)
-	 */
-	public void setFilter(IFilter filter) {
-		this.filter = filter;
-	}
-
-	/**
-	 * In Process WBS, if breakdownelement is moved
-	 * up or down, diagram should be updated accordingly. 
-	 * Sub-class should override this method if diagram needs update on move. 
-	 * @param newValue
-	 */
-	public void moveNode(Object oldValue) {
-	}
-		
-	public boolean isGraphicalDataRequired() {
-		return graphicalDataRequired;
-	}
-
-	public void setGraphicalDataRequired(boolean graphicalDataRequired) {
-		this.graphicalDataRequired = graphicalDataRequired;
-	}
-		
-	public IFilter getFilter() {
-		return filter;
-	}
-	
-	public void setWrapper(BreakdownElementWrapperItemProvider wrapper) {
-		this.wrapper = wrapper;
-	}
-	
-	public Collection getChildren() {
-		return Collections.EMPTY_LIST;
-	}
-	
-	private Suppression suppression;
-
-	protected BreakdownElementWrapperItemProvider wrapper;
-
-	protected IFilter filter;
-	
-	private boolean graphicalDataRequired = true;
-
-} // DiagramImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/LinkImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/LinkImpl.java
deleted file mode 100755
index 3ab1453..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/LinkImpl.java
+++ /dev/null
@@ -1,632 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.uma.GraphConnector;
-import org.eclipse.epf.uma.GraphEdge;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Link</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.LinkImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.LinkImpl#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.LinkImpl#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.LinkImpl#getBendpoints <em>Bendpoints</em>}</li>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.LinkImpl#getSourceEndPoint <em>Source End Point</em>}</li>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.LinkImpl#getTargetEndPoint <em>Target End Point</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LinkImpl extends LinkedObjectImpl implements Link {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getTarget()
-	 * @generated
-	 * @ordered
-	 */
-	protected Node target = null;
-
-	/**
-	 * The cached value of the '{@link #getBendpoints() <em>Bendpoints</em>}' attribute list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getBendpoints()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList bendpoints = null;
-
-	/**
-	 * The default value of the '{@link #getSourceEndPoint() <em>Source End Point</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getSourceEndPoint()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Point SOURCE_END_POINT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSourceEndPoint() <em>Source End Point</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getSourceEndPoint()
-	 * @generated
-	 * @ordered
-	 */
-	protected Point sourceEndPoint = SOURCE_END_POINT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTargetEndPoint() <em>Target End Point</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getTargetEndPoint()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Point TARGET_END_POINT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTargetEndPoint() <em>Target End Point</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getTargetEndPoint()
-	 * @generated
-	 * @ordered
-	 */
-	protected Point targetEndPoint = TARGET_END_POINT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LinkImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.LINK;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.LINK__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Node getSource() {
-		if (eContainerFeatureID != ModelPackage.LINK__SOURCE) return null;
-		return (Node)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSource(Node newSource, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newSource, ModelPackage.LINK__SOURCE, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSource(Node newSource) {
-		if (newSource != eInternalContainer() || (eContainerFeatureID != ModelPackage.LINK__SOURCE && newSource != null)) {
-			if (EcoreUtil.isAncestor(this, newSource))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newSource != null)
-				msgs = ((InternalEObject)newSource).eInverseAdd(this, ModelPackage.NODE__OUTGOING_CONNECTIONS, Node.class, msgs);
-			msgs = basicSetSource(newSource, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.LINK__SOURCE, newSource, newSource));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Node getTarget() {
-		if (target != null && target.eIsProxy()) {
-			InternalEObject oldTarget = (InternalEObject)target;
-			target = (Node)eResolveProxy(oldTarget);
-			if (target != oldTarget) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.LINK__TARGET, oldTarget, target));
-			}
-		}
-		return target;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Node basicGetTarget() {
-		return target;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTarget(Node newTarget, NotificationChain msgs) {
-		Node oldTarget = target;
-		target = newTarget;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ModelPackage.LINK__TARGET, oldTarget, newTarget);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTarget(Node newTarget) {
-		if (newTarget != target) {
-			NotificationChain msgs = null;
-			if (target != null)
-				msgs = ((InternalEObject)target).eInverseRemove(this, ModelPackage.NODE__INCOMING_CONNECTIONS, Node.class, msgs);
-			if (newTarget != null)
-				msgs = ((InternalEObject)newTarget).eInverseAdd(this, ModelPackage.NODE__INCOMING_CONNECTIONS, Node.class, msgs);
-			msgs = basicSetTarget(newTarget, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.LINK__TARGET, newTarget, newTarget));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getBendpoints() {
-		if (bendpoints == null) {
-			bendpoints = new EDataTypeUniqueEList(AbsoluteBendpoint.class, this, ModelPackage.LINK__BENDPOINTS);
-		}
-		return bendpoints;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point getSourceEndPoint() {
-		return sourceEndPoint;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSourceEndPoint(Point newSourceEndPoint) {
-		Point oldSourceEndPoint = sourceEndPoint;
-		sourceEndPoint = newSourceEndPoint;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.LINK__SOURCE_END_POINT, oldSourceEndPoint, sourceEndPoint));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point getTargetEndPoint() {
-		return targetEndPoint;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTargetEndPoint(Point newTargetEndPoint) {
-		Point oldTargetEndPoint = targetEndPoint;
-		targetEndPoint = newTargetEndPoint;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.LINK__TARGET_END_POINT, oldTargetEndPoint, targetEndPoint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ModelPackage.LINK__SOURCE:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetSource((Node)otherEnd, msgs);
-			case ModelPackage.LINK__TARGET:
-				if (target != null)
-					msgs = ((InternalEObject)target).eInverseRemove(this, ModelPackage.NODE__INCOMING_CONNECTIONS, Node.class, msgs);
-				return basicSetTarget((Node)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ModelPackage.LINK__SOURCE:
-				return basicSetSource(null, msgs);
-			case ModelPackage.LINK__TARGET:
-				return basicSetTarget(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case ModelPackage.LINK__SOURCE:
-				return eInternalContainer().eInverseRemove(this, ModelPackage.NODE__OUTGOING_CONNECTIONS, Node.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.LINK__NAME:
-				return getName();
-			case ModelPackage.LINK__SOURCE:
-				return getSource();
-			case ModelPackage.LINK__TARGET:
-				if (resolve) return getTarget();
-				return basicGetTarget();
-			case ModelPackage.LINK__BENDPOINTS:
-				return getBendpoints();
-			case ModelPackage.LINK__SOURCE_END_POINT:
-				return getSourceEndPoint();
-			case ModelPackage.LINK__TARGET_END_POINT:
-				return getTargetEndPoint();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.LINK__NAME:
-				setName((String)newValue);
-				return;
-			case ModelPackage.LINK__SOURCE:
-				setSource((Node)newValue);
-				return;
-			case ModelPackage.LINK__TARGET:
-				setTarget((Node)newValue);
-				return;
-			case ModelPackage.LINK__BENDPOINTS:
-				getBendpoints().clear();
-				getBendpoints().addAll((Collection)newValue);
-				return;
-			case ModelPackage.LINK__SOURCE_END_POINT:
-				setSourceEndPoint((Point)newValue);
-				return;
-			case ModelPackage.LINK__TARGET_END_POINT:
-				setTargetEndPoint((Point)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.LINK__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case ModelPackage.LINK__SOURCE:
-				setSource((Node)null);
-				return;
-			case ModelPackage.LINK__TARGET:
-				setTarget((Node)null);
-				return;
-			case ModelPackage.LINK__BENDPOINTS:
-				getBendpoints().clear();
-				return;
-			case ModelPackage.LINK__SOURCE_END_POINT:
-				setSourceEndPoint(SOURCE_END_POINT_EDEFAULT);
-				return;
-			case ModelPackage.LINK__TARGET_END_POINT:
-				setTargetEndPoint(TARGET_END_POINT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.LINK__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case ModelPackage.LINK__SOURCE:
-				return getSource() != null;
-			case ModelPackage.LINK__TARGET:
-				return target != null;
-			case ModelPackage.LINK__BENDPOINTS:
-				return bendpoints != null && !bendpoints.isEmpty();
-			case ModelPackage.LINK__SOURCE_END_POINT:
-				return SOURCE_END_POINT_EDEFAULT == null ? sourceEndPoint != null : !SOURCE_END_POINT_EDEFAULT.equals(sourceEndPoint);
-			case ModelPackage.LINK__TARGET_END_POINT:
-				return TARGET_END_POINT_EDEFAULT == null ? targetEndPoint != null : !TARGET_END_POINT_EDEFAULT.equals(targetEndPoint);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", bendpoints: ");
-		result.append(bendpoints);
-		result.append(", sourceEndPoint: ");
-		result.append(sourceEndPoint);
-		result.append(", targetEndPoint: ");
-		result.append(targetEndPoint);
-		result.append(')');
-		return result.toString();
-	}
-
-	public void setObject(Object newObject) {
-		super.setObject(newObject);
-
-		if (newObject == null)
-			return;
-
-		GraphEdge edge = (GraphEdge) newObject;
-
-		// copy bendpoints from edge
-		//
-		for (Iterator iter = edge.getWaypoints().iterator(); iter.hasNext();) {
-			getBendpoints().add(
-					new AbsoluteBendpoint(GraphicalDataHelper
-							.toPoint((org.eclipse.epf.uma.Point) iter.next())));
-		}
-
-		// copy end points from GraphConnectors
-		//
-		if (getSourceGraphConnector().getPosition() != null) {
-			sourceEndPoint = GraphicalDataHelper
-					.toPoint(getSourceGraphConnector().getPosition());
-		}
-		if (getTargetGraphConnector().getPosition() != null) {
-			targetEndPoint = GraphicalDataHelper
-					.toPoint(getTargetGraphConnector().getPosition());
-		}
-				
-		eAdapters().add(new AdapterImpl() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-			 */
-			public void notifyChanged(Notification msg) {
-				Point p;
-				GraphEdge edge = (GraphEdge) getObject();
-				switch (msg.getFeatureID(Link.class)) {
-				case ModelPackage.LINK__BENDPOINTS:
-					switch (msg.getEventType()) {
-					case Notification.ADD:
-						p = (AbsoluteBendpoint) msg.getNewValue();
-						int index = msg.getPosition();
-						org.eclipse.epf.uma.Point umaPoint = GraphicalDataHelper
-								.newModelPoint(p.x, p.y);
-						if (index == Notification.NO_INDEX) {
-							edge.getWaypoints().add(umaPoint);
-						} else {
-							edge.getWaypoints().add(index, umaPoint);
-						}
-						return;
-					case Notification.REMOVE:
-						// p = (AbsoluteBendpoint) msg.getOldValue();
-						// edge.getWaypoints().remove(GraphicalDataHelper.newModelPoint(p.x,
-						// p.y));
-
-						index = msg.getPosition();
-						if (index == Notification.NO_INDEX) {
-							edge.getWaypoints().remove(msg.getPosition());
-						} else {
-							edge.getWaypoints().remove(index);
-						}
-
-						return;
-					case Notification.ADD_MANY:
-						Collection collection = (Collection) msg.getNewValue();
-						ArrayList umaPoints = new ArrayList();
-						for (Iterator iter = collection.iterator(); iter
-								.hasNext();) {
-							p = (AbsoluteBendpoint) iter.next();
-							umaPoints.add(GraphicalDataHelper.newModelPoint(
-									p.x, p.y));
-						}
-						index = msg.getPosition();
-						if (index == Notification.NO_INDEX) {
-							edge.getWaypoints().addAll(umaPoints);
-						} else {
-							edge.getWaypoints().addAll(index, umaPoints);
-						}
-						return;
-					// case Notification.REMOVE_MANY:
-					// collection = (Collection) msg.getOldValue();
-					// for (Iterator iter = collection.iterator(); iter
-					// .hasNext();) {
-					// p = (AbsoluteBendpoint) msg.getOldValue();
-					// edge.getWaypoints().remove(GraphicalDataHelper.newModelPoint(p.x,
-					// p.y));
-					// }
-					// return;
-					case Notification.SET:
-						p = (AbsoluteBendpoint) msg.getNewValue();
-//						Point oldp = (AbsoluteBendpoint) msg.getOldValue();
-						int pointIndex = msg.getPosition();
-						org.eclipse.epf.uma.Point newUmaPoint = GraphicalDataHelper
-								.newModelPoint(p.x, p.y);
-//						org.eclipse.epf.uma.Point oldUmaPoint = GraphicalDataHelper
-//								.newModelPoint(oldp.x, oldp.y);
-						if (pointIndex == Notification.NO_INDEX) {
-							System.out
-									.println("Index for bendpoint is -1, Cannot set the bend point location."); //$NON-NLS-1$
-						} else {
-							edge.getWaypoints().remove(pointIndex);
-							edge.getWaypoints().add(pointIndex, newUmaPoint);
-						}
-						return;
-					}
-					return;
-				case ModelPackage.LINK__SOURCE_END_POINT:
-					p = (Point) msg.getNewValue();
-					// System.out.println(".notifyChanged(): new source end
-					// point: " + p + ". " + getSource());
-					if (p != null) {
-						// translate to relative position
-						//
-						// p.translate(getSource().getLocation().getNegated());
-						getSourceGraphConnector().setPosition(
-								GraphicalDataHelper.newModelPoint(p.x, p.y));
-					}
-					return;
-				case ModelPackage.LINK__TARGET_END_POINT:
-					p = (Point) msg.getNewValue();
-					// System.out.println(".notifyChanged(): new target end
-					// point: " + p + ". " + getTarget());
-					if (p != null) {
-						// translate to relative position
-						//
-						// p.translate(LinkImpl.this.getTarget().getLocation().getNegated());
-						getTargetGraphConnector().setPosition(
-								GraphicalDataHelper.newModelPoint(p.x, p.y));
-					}
-					return;
-				case ModelPackage.LINK__SOURCE:
-					// TODO
-					return;
-				case ModelPackage.LINK__TARGET:
-					// TODO
-					return;
-				}
-			}
-		});
-	}
-
-	private GraphConnector getSourceGraphConnector() {
-		return (GraphConnector) ((GraphEdge) getObject()).getAnchor().get(0);
-	}
-
-	private GraphConnector getTargetGraphConnector() {
-		return (GraphConnector) ((GraphEdge) getObject()).getAnchor().get(1);
-	}
-
-} // LinkImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/LinkedObjectImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/LinkedObjectImpl.java
deleted file mode 100755
index 44ca014..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/LinkedObjectImpl.java
+++ /dev/null
@@ -1,227 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.diagram.model.LinkedObject;
-import org.eclipse.epf.diagram.model.ModelPackage;
-
-
-import org.eclipse.epf.uma.MethodElement;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Linked Object</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.LinkedObjectImpl#getLinkedElement <em>Linked Element</em>}</li>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.LinkedObjectImpl#getObject <em>Object</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class LinkedObjectImpl extends EObjectImpl implements
-		LinkedObject {
-	/**
-	 * The cached value of the '{@link #getLinkedElement() <em>Linked Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLinkedElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected MethodElement linkedElement = null;
-
-	/**
-	 * The default value of the '{@link #getObject() <em>Object</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObject()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object OBJECT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getObject() <em>Object</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObject()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object object = OBJECT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LinkedObjectImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.LINKED_OBJECT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodElement getLinkedElement() {
-		if (linkedElement != null && ((EObject)linkedElement).eIsProxy()) {
-			InternalEObject oldLinkedElement = (InternalEObject)linkedElement;
-			linkedElement = (MethodElement)eResolveProxy(oldLinkedElement);
-			if (linkedElement != oldLinkedElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.LINKED_OBJECT__LINKED_ELEMENT, oldLinkedElement, linkedElement));
-			}
-		}
-		return linkedElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodElement basicGetLinkedElement() {
-		return linkedElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLinkedElement(MethodElement newLinkedElement) {
-		MethodElement oldLinkedElement = linkedElement;
-		linkedElement = newLinkedElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.LINKED_OBJECT__LINKED_ELEMENT, oldLinkedElement, linkedElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getObject() {
-		return object;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setObject(Object newObject) {
-		Object oldObject = object;
-		object = newObject;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.LINKED_OBJECT__OBJECT, oldObject, object));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.LINKED_OBJECT__LINKED_ELEMENT:
-				if (resolve) return getLinkedElement();
-				return basicGetLinkedElement();
-			case ModelPackage.LINKED_OBJECT__OBJECT:
-				return getObject();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.LINKED_OBJECT__LINKED_ELEMENT:
-				setLinkedElement((MethodElement)newValue);
-				return;
-			case ModelPackage.LINKED_OBJECT__OBJECT:
-				setObject((Object)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.LINKED_OBJECT__LINKED_ELEMENT:
-				setLinkedElement((MethodElement)null);
-				return;
-			case ModelPackage.LINKED_OBJECT__OBJECT:
-				setObject(OBJECT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.LINKED_OBJECT__LINKED_ELEMENT:
-				return linkedElement != null;
-			case ModelPackage.LINKED_OBJECT__OBJECT:
-				return OBJECT_EDEFAULT == null ? object != null : !OBJECT_EDEFAULT.equals(object);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (object: ");
-		result.append(object);
-		result.append(')');
-		return result.toString();
-	}
-
-} // LinkedObjectImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/ModelFactoryImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/ModelFactoryImpl.java
deleted file mode 100755
index eacdc15..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/ModelFactoryImpl.java
+++ /dev/null
@@ -1,331 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.epf.diagram.model.*;
-
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.ActivityDiagram;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.RoleNode;
-import org.eclipse.epf.diagram.model.RoleTaskComposite;
-import org.eclipse.epf.diagram.model.TaskNode;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.WorkBreakdownElementNode;
-import org.eclipse.epf.diagram.model.WorkProductComposite;
-import org.eclipse.epf.diagram.model.WorkProductDependencyDiagram;
-import org.eclipse.epf.diagram.model.WorkProductDescriptorNode;
-import org.eclipse.epf.diagram.model.WorkProductNode;
-import org.eclipse.epf.uma.RoleDescriptor;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
- * end-user-doc -->
- * @generated
- */
-public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ModelFactory init() {
-		try {
-			ModelFactory theModelFactory = (ModelFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/epf/diagram/1.0.0/diagram.ecore"); 
-			if (theModelFactory != null) {
-				return theModelFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ModelFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 */
-	public ModelFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ModelPackage.DIAGRAM: return createDiagram();
-			case ModelPackage.LINK: return createLink();
-			case ModelPackage.NAMED_NODE: return createNamedNode();
-			case ModelPackage.ACTIVITY_DIAGRAM: return createActivityDiagram();
-			case ModelPackage.TYPED_NODE: return createTypedNode();
-			case ModelPackage.WORK_PRODUCT_DEPENDENCY_DIAGRAM: return createWorkProductDependencyDiagram();
-			case ModelPackage.WORK_PRODUCT_NODE: return createWorkProductNode();
-			case ModelPackage.ACTIVITY_DETAIL_DIAGRAM: return createActivityDetailDiagram();
-			case ModelPackage.ROLE_NODE: return createRoleNode();
-			case ModelPackage.ROLE_TASK_COMPOSITE: return createRoleTaskComposite();
-			case ModelPackage.TASK_NODE: return createTaskNode();
-			case ModelPackage.WORK_PRODUCT_DESCRIPTOR_NODE: return createWorkProductDescriptorNode();
-			case ModelPackage.WORK_BREAKDOWN_ELEMENT_NODE: return createWorkBreakdownElementNode();
-			case ModelPackage.WORK_PRODUCT_COMPOSITE: return createWorkProductComposite();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case ModelPackage.ABSOLUTE_BENDPOINT:
-				return createAbsoluteBendpointFromString(eDataType, initialValue);
-			case ModelPackage.POINT:
-				return createPointFromString(eDataType, initialValue);
-			case ModelPackage.ROLE_DESCRIPTOR:
-				return createRoleDescriptorFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case ModelPackage.ABSOLUTE_BENDPOINT:
-				return convertAbsoluteBendpointToString(eDataType, instanceValue);
-			case ModelPackage.POINT:
-				return convertPointToString(eDataType, instanceValue);
-			case ModelPackage.ROLE_DESCRIPTOR:
-				return convertRoleDescriptorToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Diagram createDiagram() {
-		DiagramImpl diagram = new DiagramImpl();
-		return diagram;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Link createLink() {
-		LinkImpl link = new LinkImpl();
-		return link;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NamedNode createNamedNode() {
-		NamedNodeImpl namedNode = new NamedNodeImpl();
-		return namedNode;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivityDiagram createActivityDiagram() {
-		ActivityDiagramImpl activityDiagram = new ActivityDiagramImpl();
-		return activityDiagram;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TypedNode createTypedNode() {
-		TypedNodeImpl typedNode = new TypedNodeImpl();
-		return typedNode;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProductDependencyDiagram createWorkProductDependencyDiagram() {
-		WorkProductDependencyDiagramImpl workProductDependencyDiagram = new WorkProductDependencyDiagramImpl();
-		return workProductDependencyDiagram;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProductNode createWorkProductNode() {
-		WorkProductNodeImpl workProductNode = new WorkProductNodeImpl();
-		return workProductNode;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivityDetailDiagram createActivityDetailDiagram() {
-		ActivityDetailDiagramImpl activityDetailDiagram = new ActivityDetailDiagramImpl();
-		return activityDetailDiagram;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleNode createRoleNode() {
-		RoleNodeImpl roleNode = new RoleNodeImpl();
-		return roleNode;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleTaskComposite createRoleTaskComposite() {
-		RoleTaskCompositeImpl roleTaskComposite = new RoleTaskCompositeImpl();
-		return roleTaskComposite;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskNode createTaskNode() {
-		TaskNodeImpl taskNode = new TaskNodeImpl();
-		return taskNode;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProductDescriptorNode createWorkProductDescriptorNode() {
-		WorkProductDescriptorNodeImpl workProductDescriptorNode = new WorkProductDescriptorNodeImpl();
-		return workProductDescriptorNode;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkBreakdownElementNode createWorkBreakdownElementNode() {
-		WorkBreakdownElementNodeImpl workBreakdownElementNode = new WorkBreakdownElementNodeImpl();
-		return workBreakdownElementNode;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProductComposite createWorkProductComposite() {
-		WorkProductCompositeImpl workProductComposite = new WorkProductCompositeImpl();
-		return workProductComposite;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbsoluteBendpoint createAbsoluteBendpointFromString(EDataType eDataType, String initialValue) {
-		return (AbsoluteBendpoint)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertAbsoluteBendpointToString(EDataType eDataType,
-			Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point createPointFromString(EDataType eDataType, String initialValue) {
-		return (Point)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertPointToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleDescriptor createRoleDescriptorFromString(EDataType eDataType, String initialValue) {
-		return (RoleDescriptor)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertRoleDescriptorToString(EDataType eDataType,
-			Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelPackage getModelPackage() {
-		return (ModelPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static ModelPackage getPackage() {
-		return ModelPackage.eINSTANCE;
-	}
-
-} // ModelFactoryImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/ModelPackageImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/ModelPackageImpl.java
deleted file mode 100755
index f3e302d..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/ModelPackageImpl.java
+++ /dev/null
@@ -1,782 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.ActivityDiagram;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.LinkedObject;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.NodeContainer;
-import org.eclipse.epf.diagram.model.RoleNode;
-import org.eclipse.epf.diagram.model.RoleTaskComposite;
-import org.eclipse.epf.diagram.model.TaskNode;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.WorkBreakdownElementNode;
-import org.eclipse.epf.diagram.model.WorkProductComposite;
-import org.eclipse.epf.diagram.model.WorkProductDependencyDiagram;
-import org.eclipse.epf.diagram.model.WorkProductDescriptorNode;
-import org.eclipse.epf.diagram.model.WorkProductNode;
-import org.eclipse.epf.uma.RoleDescriptor;
-
-
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
- * end-user-doc -->
- * @generated
- */
-public class ModelPackageImpl extends EPackageImpl implements ModelPackage {
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass diagramEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass linkEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass linkedObjectEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass namedNodeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass nodeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass activityDiagramEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass typedNodeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workProductDependencyDiagramEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workProductNodeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass activityDetailDiagramEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass nodeContainerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleNodeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleTaskCompositeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass taskNodeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workProductDescriptorNodeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workBreakdownElementNodeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workProductCompositeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType absoluteBendpointEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType pointEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType roleDescriptorEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
-	 * package package URI value.
-	 * <p>
-	 * Note: the correct way to create the package is via the static factory
-	 * method {@link #init init()}, which also performs initialization of the
-	 * package, or returns the registered package, if one already exists. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.epf.diagram.model.ModelPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private ModelPackageImpl() {
-		super(eNS_URI, ModelFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static ModelPackage init() {
-		if (isInited) return (ModelPackage)EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI);
-
-		// Obtain or create and register package
-		ModelPackageImpl theModelPackage = (ModelPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ModelPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		UmaPackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		ModelPackageImpl theModelPackage_1 = (ModelPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI) : ModelPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theModelPackage.createPackageContents();
-		theModelPackage_1.createPackageContents();
-
-		// Initialize created meta-data
-		theModelPackage.initializePackageContents();
-		theModelPackage_1.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theModelPackage.freeze();
-
-		return theModelPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDiagram() {
-		return diagramEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLink() {
-		return linkEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLink_Name() {
-		return (EAttribute)linkEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLink_Source() {
-		return (EReference)linkEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLink_Target() {
-		return (EReference)linkEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLink_Bendpoints() {
-		return (EAttribute)linkEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLink_SourceEndPoint() {
-		return (EAttribute)linkEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLink_TargetEndPoint() {
-		return (EAttribute)linkEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLinkedObject() {
-		return linkedObjectEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLinkedObject_LinkedElement() {
-		return (EReference)linkedObjectEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLinkedObject_Object() {
-		return (EAttribute)linkedObjectEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getNamedNode() {
-		return namedNodeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getNamedNode_Name() {
-		return (EAttribute)namedNodeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getNode() {
-		return nodeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getNode_Location() {
-		return (EAttribute)nodeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getNode_Width() {
-		return (EAttribute)nodeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getNode_Height() {
-		return (EAttribute)nodeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getNode_IncomingConnections() {
-		return (EReference)nodeEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getNode_OutgoingConnections() {
-		return (EReference)nodeEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getNode_ReadOnly() {
-		return (EAttribute)nodeEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getActivityDiagram() {
-		return activityDiagramEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTypedNode() {
-		return typedNodeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTypedNode_Type() {
-		return (EAttribute)typedNodeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkProductDependencyDiagram() {
-		return workProductDependencyDiagramEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkProductNode() {
-		return workProductNodeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductNode_Type() {
-		return (EAttribute)workProductNodeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getActivityDetailDiagram() {
-		return activityDetailDiagramEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivityDetailDiagram_AutoLayout() {
-		return (EAttribute)activityDetailDiagramEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getNodeContainer() {
-		return nodeContainerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getNodeContainer_Nodes() {
-		return (EReference)nodeContainerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRoleNode() {
-		return roleNodeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRoleTaskComposite() {
-		return roleTaskCompositeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRoleTaskComposite_RowIndex() {
-		return (EAttribute)roleTaskCompositeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTaskNode() {
-		return taskNodeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskNode_Index() {
-		return (EAttribute)taskNodeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkProductDescriptorNode() {
-		return workProductDescriptorNodeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkBreakdownElementNode() {
-		return workBreakdownElementNodeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkProductComposite() {
-		return workProductCompositeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductComposite_Type() {
-		return (EAttribute)workProductCompositeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getAbsoluteBendpoint() {
-		return absoluteBendpointEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getPoint() {
-		return pointEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getRoleDescriptor() {
-		return roleDescriptorEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelFactory getModelFactory() {
-		return (ModelFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		diagramEClass = createEClass(DIAGRAM);
-
-		linkEClass = createEClass(LINK);
-		createEAttribute(linkEClass, LINK__NAME);
-		createEReference(linkEClass, LINK__SOURCE);
-		createEReference(linkEClass, LINK__TARGET);
-		createEAttribute(linkEClass, LINK__BENDPOINTS);
-		createEAttribute(linkEClass, LINK__SOURCE_END_POINT);
-		createEAttribute(linkEClass, LINK__TARGET_END_POINT);
-
-		linkedObjectEClass = createEClass(LINKED_OBJECT);
-		createEReference(linkedObjectEClass, LINKED_OBJECT__LINKED_ELEMENT);
-		createEAttribute(linkedObjectEClass, LINKED_OBJECT__OBJECT);
-
-		namedNodeEClass = createEClass(NAMED_NODE);
-		createEAttribute(namedNodeEClass, NAMED_NODE__NAME);
-
-		nodeEClass = createEClass(NODE);
-		createEAttribute(nodeEClass, NODE__LOCATION);
-		createEAttribute(nodeEClass, NODE__WIDTH);
-		createEAttribute(nodeEClass, NODE__HEIGHT);
-		createEReference(nodeEClass, NODE__INCOMING_CONNECTIONS);
-		createEReference(nodeEClass, NODE__OUTGOING_CONNECTIONS);
-		createEAttribute(nodeEClass, NODE__READ_ONLY);
-
-		activityDiagramEClass = createEClass(ACTIVITY_DIAGRAM);
-
-		typedNodeEClass = createEClass(TYPED_NODE);
-		createEAttribute(typedNodeEClass, TYPED_NODE__TYPE);
-
-		workProductDependencyDiagramEClass = createEClass(WORK_PRODUCT_DEPENDENCY_DIAGRAM);
-
-		workProductNodeEClass = createEClass(WORK_PRODUCT_NODE);
-		createEAttribute(workProductNodeEClass, WORK_PRODUCT_NODE__TYPE);
-
-		activityDetailDiagramEClass = createEClass(ACTIVITY_DETAIL_DIAGRAM);
-		createEAttribute(activityDetailDiagramEClass, ACTIVITY_DETAIL_DIAGRAM__AUTO_LAYOUT);
-
-		nodeContainerEClass = createEClass(NODE_CONTAINER);
-		createEReference(nodeContainerEClass, NODE_CONTAINER__NODES);
-
-		roleNodeEClass = createEClass(ROLE_NODE);
-
-		roleTaskCompositeEClass = createEClass(ROLE_TASK_COMPOSITE);
-		createEAttribute(roleTaskCompositeEClass, ROLE_TASK_COMPOSITE__ROW_INDEX);
-
-		taskNodeEClass = createEClass(TASK_NODE);
-		createEAttribute(taskNodeEClass, TASK_NODE__INDEX);
-
-		workProductDescriptorNodeEClass = createEClass(WORK_PRODUCT_DESCRIPTOR_NODE);
-
-		workBreakdownElementNodeEClass = createEClass(WORK_BREAKDOWN_ELEMENT_NODE);
-
-		workProductCompositeEClass = createEClass(WORK_PRODUCT_COMPOSITE);
-		createEAttribute(workProductCompositeEClass, WORK_PRODUCT_COMPOSITE__TYPE);
-
-		// Create data types
-		absoluteBendpointEDataType = createEDataType(ABSOLUTE_BENDPOINT);
-		pointEDataType = createEDataType(POINT);
-		roleDescriptorEDataType = createEDataType(ROLE_DESCRIPTOR);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model. This
-	 * method is guarded to have no affect on any invocation but its first. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		ModelPackage theModelPackage_1 = (ModelPackage)EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI);
-		UmaPackage theUmaPackage = (UmaPackage)EPackage.Registry.INSTANCE.getEPackage(UmaPackage.eNS_URI);
-
-		// Add supertypes to classes
-		diagramEClass.getESuperTypes().add(theModelPackage_1.getNodeContainer());
-		linkEClass.getESuperTypes().add(theModelPackage_1.getLinkedObject());
-		namedNodeEClass.getESuperTypes().add(theModelPackage_1.getNode());
-		nodeEClass.getESuperTypes().add(theModelPackage_1.getLinkedObject());
-		activityDiagramEClass.getESuperTypes().add(theModelPackage_1.getDiagram());
-		typedNodeEClass.getESuperTypes().add(theModelPackage_1.getNode());
-		workProductDependencyDiagramEClass.getESuperTypes().add(theModelPackage_1.getDiagram());
-		workProductNodeEClass.getESuperTypes().add(theModelPackage_1.getNamedNode());
-		activityDetailDiagramEClass.getESuperTypes().add(theModelPackage_1.getDiagram());
-		nodeContainerEClass.getESuperTypes().add(theModelPackage_1.getNode());
-		roleNodeEClass.getESuperTypes().add(theModelPackage_1.getNamedNode());
-		roleTaskCompositeEClass.getESuperTypes().add(theModelPackage_1.getNodeContainer());
-		taskNodeEClass.getESuperTypes().add(theModelPackage_1.getNamedNode());
-		workProductDescriptorNodeEClass.getESuperTypes().add(theModelPackage_1.getNamedNode());
-		workBreakdownElementNodeEClass.getESuperTypes().add(theModelPackage_1.getNamedNode());
-		workProductCompositeEClass.getESuperTypes().add(theModelPackage_1.getNodeContainer());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(diagramEClass, Diagram.class, "Diagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(linkEClass, Link.class, "Link", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getLink_Name(), ecorePackage.getEString(), "name", "", 0, 1, Link.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getLink_Source(), theModelPackage_1.getNode(), theModelPackage_1.getNode_OutgoingConnections(), "source", null, 0, 1, Link.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getLink_Target(), theModelPackage_1.getNode(), theModelPackage_1.getNode_IncomingConnections(), "target", null, 0, 1, Link.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLink_Bendpoints(), theModelPackage_1.getAbsoluteBendpoint(), "bendpoints", null, 0, -1, Link.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLink_SourceEndPoint(), theModelPackage_1.getPoint(), "sourceEndPoint", null, 0, 1, Link.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLink_TargetEndPoint(), theModelPackage_1.getPoint(), "targetEndPoint", null, 0, 1, Link.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(linkedObjectEClass, LinkedObject.class, "LinkedObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLinkedObject_LinkedElement(), theUmaPackage.getMethodElement(), null, "linkedElement", null, 0, 1, LinkedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLinkedObject_Object(), ecorePackage.getEJavaObject(), "object", null, 0, 1, LinkedObject.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(namedNodeEClass, NamedNode.class, "NamedNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getNamedNode_Name(), ecorePackage.getEString(), "name", null, 0, 1, NamedNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(nodeEClass, Node.class, "Node", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getNode_Location(), theModelPackage_1.getPoint(), "location", null, 0, 1, Node.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getNode_Width(), ecorePackage.getEInt(), "width", "-1", 0, 1, Node.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getNode_Height(), ecorePackage.getEInt(), "height", "-1", 0, 1, Node.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getNode_IncomingConnections(), theModelPackage_1.getLink(), theModelPackage_1.getLink_Target(), "incomingConnections", null, 0, -1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getNode_OutgoingConnections(), theModelPackage_1.getLink(), theModelPackage_1.getLink_Source(), "outgoingConnections", null, 0, -1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getNode_ReadOnly(), ecorePackage.getEBoolean(), "readOnly", null, 0, 1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(activityDiagramEClass, ActivityDiagram.class, "ActivityDiagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(typedNodeEClass, TypedNode.class, "TypedNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTypedNode_Type(), ecorePackage.getEInt(), "type", null, 0, 1, TypedNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(workProductDependencyDiagramEClass, WorkProductDependencyDiagram.class, "WorkProductDependencyDiagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(workProductNodeEClass, WorkProductNode.class, "WorkProductNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWorkProductNode_Type(), ecorePackage.getEInt(), "type", null, 0, 1, WorkProductNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(activityDetailDiagramEClass, ActivityDetailDiagram.class, "ActivityDetailDiagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getActivityDetailDiagram_AutoLayout(), ecorePackage.getEBoolean(), "autoLayout", null, 0, 1, ActivityDetailDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(nodeContainerEClass, NodeContainer.class, "NodeContainer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getNodeContainer_Nodes(), theModelPackage_1.getNode(), null, "nodes", null, 0, -1, NodeContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(roleNodeEClass, RoleNode.class, "RoleNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(roleTaskCompositeEClass, RoleTaskComposite.class, "RoleTaskComposite", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRoleTaskComposite_RowIndex(), ecorePackage.getEInt(), "rowIndex", null, 0, 1, RoleTaskComposite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(taskNodeEClass, TaskNode.class, "TaskNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTaskNode_Index(), ecorePackage.getEInt(), "index", "-1", 0, 1, TaskNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(workProductDescriptorNodeEClass, WorkProductDescriptorNode.class, "WorkProductDescriptorNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(workBreakdownElementNodeEClass, WorkBreakdownElementNode.class, "WorkBreakdownElementNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(workProductCompositeEClass, WorkProductComposite.class, "WorkProductComposite", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWorkProductComposite_Type(), ecorePackage.getEInt(), "type", null, 0, 1, WorkProductComposite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize data types
-		initEDataType(absoluteBendpointEDataType, AbsoluteBendpoint.class, "AbsoluteBendpoint", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(pointEDataType, Point.class, "Point", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(roleDescriptorEDataType, RoleDescriptor.class, "RoleDescriptor", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-	}
-
-} // ModelPackageImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/NamedNodeImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/NamedNodeImpl.java
deleted file mode 100755
index 24ed49b..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/NamedNodeImpl.java
+++ /dev/null
@@ -1,493 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.transaction.impl.InternalTransaction;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.epf.common.CommonPlugin;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.diagram.model.util.INodeChangeListener;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Named Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.NamedNodeImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NamedNodeImpl extends NodeImpl implements NamedNode {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NamedNodeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.NAMED_NODE;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.NAMED_NODE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.NAMED_NODE__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.NAMED_NODE__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.NAMED_NODE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.NAMED_NODE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	// -------------------//
-	// Start custom code  //
-	// -------------------//
-
-	protected class MethodElementAdapter extends TransactionalNodeLink {
-		protected void handleNotification(Notification msg) {
-			switch (msg.getFeatureID(DescribableElement.class)) {
-			case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION_NAME:
-				setName(msg.getNewStringValue());
-				return;
-			}
-		}
-		
-		public void notifyChanged(Notification msg) {
-			if (!notificationEnabled)
-				return;
-			notificationEnabled = false;
-			try {
-				InternalTransaction tx = null;
-				InternalTransactionalEditingDomain domain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(getNode());
-				if(domain != null) {
-					tx = domain.startTransaction(false, Collections.EMPTY_MAP);
-				}
-				
-				handleNotification(msg);
-				
-				if(tx != null) {
-					tx.commit();
-				}
-			} catch (Exception e) {
-				CommonPlugin.getDefault().getLogger().logError(e);
-			} finally {
-				notificationEnabled = true;
-			}
-		}
-
-		public Node getNode() {
-			return NamedNodeImpl.this;
-		}
-
-	}
-
-	protected Link addIncomingConnection(MethodElement source) {
-		Node srcNode = findNode(source);
-		if (srcNode == null)
-			return null;
-		Link link = ModelFactory.eINSTANCE.createLink();
-		link.setTarget(this);
-
-		// disable notification of srcNode before associate it with the link
-		// so it will not create duplicate UMA data
-		//
-		NodeImpl srcNodeImpl = (NodeImpl) srcNode;
-		boolean notify = srcNodeImpl.notificationEnabled;
-		try {
-			srcNodeImpl.notificationEnabled = false;
-			link.setSource(srcNode);
-		} finally {
-			srcNodeImpl.notificationEnabled = notify;
-		}
-
-		if(isGraphicalDataRequired()) {
-			GraphicalDataHelper.addGraphicalData(link);
-		}
-		return link;
-	}
-
-	protected Node findNode(MethodElement linkedElement) {
-		return GraphicalDataHelper.findNode(getDiagram(), linkedElement);
-	}
-
-	protected Link addOutgoingConnection(MethodElement target) {
-		Node targetNode = findNode(target);
-		if (targetNode == null)
-			return null;
-		Link link = ModelFactory.eINSTANCE.createLink();
-
-		// disable notification of targetNode before associate it with the link
-		// so it will not create duplicate UMA data
-		//
-		NodeImpl nodeImpl = (NodeImpl) targetNode;
-		boolean notify = nodeImpl.notificationEnabled;
-		try {
-			nodeImpl.notificationEnabled = false;
-			link.setTarget(targetNode);
-		} finally {
-			nodeImpl.notificationEnabled = notify;
-		}
-
-		link.setSource(this);
-		if(isGraphicalDataRequired()) {
-			GraphicalDataHelper.addGraphicalData(link);
-		}
-		return link;
-	}
-
-	protected boolean removeIncomingConnection(MethodElement source) {
-		// look for the incoming connection with source as linked object of the
-		// source node
-		//
-		for (Iterator iter = getIncomingConnections().iterator(); iter
-				.hasNext();) {
-			Link link = (Link) iter.next();
-			if (link.getSource() != null
-					&& link.getSource().getObject() == source) {
-				GraphicalDataHelper.removeGraphicalData(link);
-				// disable internal notification of the source node
-				//
-				NodeImpl sourceNode = (NodeImpl) link.getSource();
-				boolean oldNotify = sourceNode.notificationEnabled;
-				try {
-					sourceNode.notificationEnabled = false;
-					link.setSource(null);
-				} finally {
-					sourceNode.notificationEnabled = oldNotify;
-				}
-				link.setTarget(null);
-				link.setObject(null);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	protected boolean removeOutgoingConnection(MethodElement target) {
-		// look for the incoming connection with source as linked object of the
-		// source node
-		//
-		for (Iterator iter = getOutgoingConnections().iterator(); iter
-				.hasNext();) {
-			Link link = (Link) iter.next();
-			if (link.getTarget() != null
-					&& link.getTarget().getObject() == target) {
-				GraphicalDataHelper.removeGraphicalData(link);
-				// disable internal notification of the source node
-				//
-				NodeImpl targetNode = (NodeImpl) link.getTarget();
-				boolean oldNotify = targetNode.notificationEnabled;
-				try {
-					targetNode.notificationEnabled = false;
-					link.setTarget(null);
-				} finally {
-					targetNode.notificationEnabled = oldNotify;
-				}
-				link.setSource(null);
-				link.setObject(null);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public void setObject(Object newObject) {
-		super.setObject(newObject);
-
-		if (newObject == null)
-			return;
-		String name = null;
-
-		// use presentation name
-		if (newObject instanceof DescribableElement) {
-			DescribableElement element = (DescribableElement) newObject;
-			name = ProcessUtil.getPresentationName((BreakdownElement) element);
-		}
-
-		// if it's blank then use name
-		if (StrUtil.isBlank(name)) {
-			MethodElement element = (MethodElement) newObject;
-			name = element.getName();
-		}
-
-		this.name = name;
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.NodeImpl#basicSetObject(java.lang.Object)
-	 */
-	protected void basicSetObject(Object newObject) {
-		super.basicSetObject(newObject);
-
-		if (newObject instanceof VariabilityElement
-				&& ProcessUtil
-						.isExtendingOrLocallyContributing((BreakdownElement) newObject)) {
-			// listen to change in the base
-			//
-			VariabilityElement base = ((VariabilityElement) newObject)
-					.getVariabilityBasedOnElement();
-			if (base != null) {
-				if (baseListener == null) {
-					baseListener = new AdapterImpl() {
-						public void notifyChanged(Notification msg) {
-							switch (msg.getFeatureID(DescribableElement.class)) {
-							case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION_NAME:
-								DescribableElement e = (DescribableElement) getObject();
-								if (StrUtil.isBlank(e.getPresentationName())) {
-									String oldName = name;
-									name = msg.getNewStringValue();
-									if (!name.equals(oldName)) {
-									eNotify(new ENotificationImpl(
-											NamedNodeImpl.this, -1,
-											ModelPackage.NAMED_NODE__NAME,
-											oldName, name));
-									}
-								}
-								break;
-							}
-						}
-					};
-				}
-				base.eAdapters().add(baseListener);
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.NodeImpl#dispose()
-	 */
-	protected void dispose() {
-		EObject obj = (EObject) getObject();
-		if (obj != null) {
-			if (baseListener != null) {
-				obj.eAdapters().remove(baseListener);
-			}
-		}
-
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.NodeImpl#createNodeAdapter()
-	 */
-	protected Adapter createNodeAdapter() {
-		return new NodeAdapter() {
-			public void notifyChanged(Notification msg) {
-				if (!notificationEnabled)
-					return;
-				notificationEnabled = false;
-				try {
-					switch (msg.getFeatureID(NamedNode.class)) {
-					case ModelPackage.NAMED_NODE__NAME:
-						if (msg.getEventType() == Notification.SET
-								&& getObject() instanceof BreakdownElement) {
-							String newName = msg.getNewStringValue();
-							BreakdownElement e = ((BreakdownElement) getObject());
-							e.setPresentationName(newName);
-							if (StrUtil.isBlank(e.getName())) {
-								e.setName(newName);
-							}
-						}
-						return;
-					}
-					super.notifyChanged(msg);
-				} finally {
-					notificationEnabled = true;
-				}
-
-			}
-		};
-
-	}
-
-	public boolean isNotificationEnabled() {
-		return notificationEnabled;
-	}
-
-	public void setNotificationEnabled(boolean notificationEnabled) {
-		this.notificationEnabled = notificationEnabled;
-	}
-
-	public boolean isSuppressed() {
-		Suppression suppression = getDiagram().getSuppression();
-		if (suppression != null) {
-			Object o = itemProvider != null ? itemProvider : getLinkedElement();
-			return getDiagram().getSuppression().isSuppressed(o);
-		}
-		return false;
-	}
-	public Object getWrapper() {
-		return itemProvider;
-	}
-
-	/**
-	 * Sets the item provider for the this node if there is a read-only wrapper
-	 * for the node in the given element collection
-	 * 
-	 * @param node
-	 * @param allElements
-	 */
-	void setItemProvider(Collection allElements) {
-		Object object = GraphicalDataHelper.findElement(allElements,
-				getObject());
-		if (object instanceof BreakdownElementWrapperItemProvider) {
-			BreakdownElementWrapperItemProvider wrapper = (BreakdownElementWrapperItemProvider) object;
-			if (wrapper.isReadOnly()) {
-				itemProvider = wrapper;
-				readOnly = true;
-			}
-		}
-	}
-
-	private AdapterImpl baseListener;
-
-	/**
-	 * Item provider of the linked object
-	 */
-	protected BreakdownElementWrapperItemProvider itemProvider;
-
-} // NamedNodeImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/NodeContainerImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/NodeContainerImpl.java
deleted file mode 100755
index 3309374..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/NodeContainerImpl.java
+++ /dev/null
@@ -1,214 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.NodeContainer;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Node Container</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.NodeContainerImpl#getNodes <em>Nodes</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class NodeContainerImpl extends NodeImpl implements
-		NodeContainer {
-	/**
-	 * The cached value of the '{@link #getNodes() <em>Nodes</em>}' containment reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getNodes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList nodes = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NodeContainerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.NODE_CONTAINER;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getNodes() {
-		if (nodes == null) {
-			nodes = new EObjectContainmentEList(Node.class, this, ModelPackage.NODE_CONTAINER__NODES);
-		}
-		return nodes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ModelPackage.NODE_CONTAINER__NODES:
-				return ((InternalEList)getNodes()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.NODE_CONTAINER__NODES:
-				return getNodes();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.NODE_CONTAINER__NODES:
-				getNodes().clear();
-				getNodes().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.NODE_CONTAINER__NODES:
-				getNodes().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.NODE_CONTAINER__NODES:
-				return nodes != null && !nodes.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.NodeImpl#setReadOnly(boolean)
-	 */
-	public void setReadOnly(boolean newReadOnly) {
-		super.setReadOnly(newReadOnly);
-		if (newReadOnly) {
-			for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-				Node child = (Node) iter.next();
-				child.setReadOnly(newReadOnly);
-			}
-		}
-	}
-
-	/**
-	 * @param removedNodes
-	 */
-	protected void pushBackToDiagram(Collection removedNodes) {
-		ActivityDetailDiagramImpl diagram = (ActivityDetailDiagramImpl) getDiagram();
-		Collection breakdownElements = diagram.getAllBreakdownElements();
-		for (Iterator iter = removedNodes.iterator(); iter.hasNext();) {
-			Node node = (Node) iter.next();
-			if (!breakdownElements.contains(node.getObject())) {
-				iter.remove();
-			}
-		}
-		// for (Iterator iter = diagram.getNodes().iterator(); iter.hasNext();)
-		// {
-		// Object node = iter.next();
-		// if(node instanceof RoleTaskComposite){
-		// List list = ((RoleTaskComposite)node).getNodes();
-		// boolean destroy = true;
-		// for(Iterator iterator = list.iterator(); iterator.hasNext();){
-		// Object obj = iterator.next();
-		// if(obj instanceof TaskNode) destroy = false;
-		// }
-		// if(destroy) iter.remove();
-		// }
-		// }
-		if (!removedNodes.isEmpty()) {
-			diagram.getNodes().addAll(removedNodes);
-		}
-	}
-	
-	protected void selectNodes(Collection nodes) {
-		if (!nodes.isEmpty()) {
-			for (Iterator iter = nodes.iterator(); iter.hasNext();) {
-				NodeImpl node = (NodeImpl) iter.next();
-				node.visible = true;
-			}
-			for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-				NodeImpl node = (NodeImpl) iter.next();
-				if(!nodes.contains(node)) {
-					node.visible = false;
-				}
-			}
-			getNodes().addAll(nodes);
-		}
-		else {
-			for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-				NodeImpl node = (NodeImpl) iter.next();
-				node.visible = false;
-			}
-		}
-	}
-	
-} // NodeContainerImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/NodeImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/NodeImpl.java
deleted file mode 100755
index 72e3746..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/NodeImpl.java
+++ /dev/null
@@ -1,872 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.transaction.impl.InternalTransaction;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.epf.common.CommonPlugin;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.impl.NamedNodeImpl.MethodElementAdapter;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.diagram.model.util.GraphicalDataManager;
-import org.eclipse.epf.diagram.model.util.INodeChangeListener;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.util.UmaUtil;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.NodeImpl#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.NodeImpl#getWidth <em>Width</em>}</li>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.NodeImpl#getHeight <em>Height</em>}</li>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.NodeImpl#getIncomingConnections <em>Incoming Connections</em>}</li>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.NodeImpl#getOutgoingConnections <em>Outgoing Connections</em>}</li>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.NodeImpl#isReadOnly <em>Read Only</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class NodeImpl extends LinkedObjectImpl implements Node {
-	/**
-	 * The default value of the '{@link #getLocation() <em>Location</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Point LOCATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocation() <em>Location</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected Point location = LOCATION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int WIDTH_EDEFAULT = -1;
-
-	/**
-	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected int width = WIDTH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getHeight()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int HEIGHT_EDEFAULT = -1;
-
-	/**
-	 * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getHeight()
-	 * @generated
-	 * @ordered
-	 */
-	protected int height = HEIGHT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getIncomingConnections() <em>Incoming Connections</em>}' reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getIncomingConnections()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList incomingConnections = null;
-
-	/**
-	 * The cached value of the '{@link #getOutgoingConnections() <em>Outgoing Connections</em>}' containment reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getOutgoingConnections()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList outgoingConnections = null;
-
-	/**
-	 * The default value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #isReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean READ_ONLY_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #isReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean readOnly = READ_ONLY_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NodeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.NODE;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point getLocation() {
-		return location;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocation(Point newLocation) {
-		Point oldLocation = location;
-		location = newLocation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.NODE__LOCATION, oldLocation, location));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getWidth() {
-		return width;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWidth(int newWidth) {
-		int oldWidth = width;
-		width = newWidth;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.NODE__WIDTH, oldWidth, width));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getHeight() {
-		return height;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHeight(int newHeight) {
-		int oldHeight = height;
-		height = newHeight;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.NODE__HEIGHT, oldHeight, height));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getIncomingConnections() {
-		if (incomingConnections == null) {
-			incomingConnections = new EObjectWithInverseResolvingEList(Link.class, this, ModelPackage.NODE__INCOMING_CONNECTIONS, ModelPackage.LINK__TARGET);
-		}
-		return incomingConnections;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getOutgoingConnections() {
-		if (outgoingConnections == null) {
-			outgoingConnections = new EObjectContainmentWithInverseEList(Link.class, this, ModelPackage.NODE__OUTGOING_CONNECTIONS, ModelPackage.LINK__SOURCE);
-		}
-		return outgoingConnections;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isReadOnly() {
-		return readOnly;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (location: ");
-		result.append(location);
-		result.append(", width: ");
-		result.append(width);
-		result.append(", height: ");
-		result.append(height);
-		result.append(", readOnly: ");
-		result.append(readOnly);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * Adds incoming connection
-	 * 
-	 * @param link
-	 * @return
-	 */
-	protected boolean addToUMA(Link link) {
-		if (link.getTarget() == null || link.getSource() == null)
-			return false;
-		if(isGraphicalDataRequired()) {
-			GraphicalDataHelper.addGraphicalData(link);
-		}
-		return true;
-	}
-
-	/**
-	 * Removes outgoing connection
-	 * 
-	 * @param link
-	 * @param oldSource
-	 * @param oldTarget
-	 */
-	protected void removeFromUMA(Link link, Node oldSource, Node oldTarget) {
-		// GraphicalDataManager.getInstance().removeGraphConnectorPair(oldSource.getGraphNode(),
-		// oldTarget.getGraphNode());
-		
-		GraphicalDataHelper.removeGraphicalData(link);
-	}
-
-	protected org.eclipse.epf.uma.Diagram getUMADiagram() {
-		if (getDiagram() == null)
-			return umaDiagram;
-		return getDiagram().getUMADiagram();
-	}
-
-	protected GraphNode getUMAContainer() {
-		Node container = (Node) eContainer();
-		if (container == null)
-			return umaContainer;
-		return container.getGraphNode();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.Node#setUMAContainer(org.eclipse.epf.uma.GraphNode)
-	 */
-	public void setUMAContainer(GraphNode umaContainer) {
-		this.umaContainer = umaContainer;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.ActivityNode#setUMADiagram(org.eclipse.epf.uma.Diagram)
-	 */
-	public void setUMADiagram(org.eclipse.epf.uma.Diagram umaDiagram) {
-		this.umaDiagram = umaDiagram;
-		umaContainer = umaDiagram;
-	}
-
-	protected class NodeAdapter extends AdapterImpl {
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification msg) {
-			switch (msg.getFeatureID(Node.class)) {
-			case ModelPackage.NODE__WIDTH:
-				getGraphNode().getSize().setWidth(
-						new Double(msg.getNewIntValue()));
-				return;
-
-			case ModelPackage.NODE__HEIGHT:
-				if (getGraphNode() != null) {
-					getGraphNode().getSize().setHeight(
-							new Double(msg.getNewIntValue()));
-				}
-				return;
-
-			case ModelPackage.NODE__LOCATION:
-				if (getGraphNode() != null && msg.getNewValue() != null) {
-					Point p = (Point) msg.getNewValue();
-					getGraphNode().getPosition().setX(new Double(p.x));
-					getGraphNode().getPosition().setY(new Double(p.y));
-				}
-				return;
-
-			case ModelPackage.NODE__INCOMING_CONNECTIONS:
-				Link link;
-				switch (msg.getEventType()) {
-				case Notification.ADD:
-					link = (Link) msg.getNewValue();
-					addToUMA(link);
-					return;
-				case Notification.ADD_MANY:
-					for (Iterator iter = ((Collection) msg.getNewValue())
-							.iterator(); iter.hasNext();) {
-						addToUMA((Link) iter.next());
-					}
-					break;
-				case Notification.REMOVE:
-					link = (Link) msg.getOldValue();
-					if (link.getSource() != null) {
-						((NodeImpl) link.getSource()).removeFromUMA(link, link
-								.getSource(), (Node) msg.getNotifier());
-					}
-					break;
-				case Notification.REMOVE_MANY:
-					for (Iterator iter = ((Collection) msg.getOldValue())
-							.iterator(); iter.hasNext();) {
-						link = (Link) iter.next();
-						if (link.getSource() != null) {
-							((NodeImpl) link.getSource()).removeFromUMA(link,
-									link.getSource(), (Node) msg.getNotifier());
-						}
-					}
-					break;
-				}
-				return;
-			case ModelPackage.NODE__OUTGOING_CONNECTIONS:
-				switch (msg.getEventType()) {
-				case Notification.ADD:
-					link = (Link) msg.getNewValue();
-					if (link.getTarget() != null) {
-						((NodeImpl) link.getTarget()).addToUMA(link);
-					}
-					break;
-				case Notification.ADD_MANY:
-					for (Iterator iter = ((Collection) msg.getNewValue())
-							.iterator(); iter.hasNext();) {
-						link = (Link) iter.next();
-						if (link.getTarget() != null) {
-							((NodeImpl) link.getTarget()).addToUMA(link);
-						}
-					}
-					break;
-				case Notification.REMOVE:
-					link = (Link) msg.getOldValue();
-					if (link.getTarget() != null) {
-						removeFromUMA(link, (Node) msg.getNotifier(), link
-								.getTarget());
-					}
-					break;
-				case Notification.REMOVE_MANY:
-					for (Iterator iter = ((Collection) msg.getOldValue())
-							.iterator(); iter.hasNext();) {
-						link = (Link) iter.next();
-						if (link.getTarget() != null) {
-							removeFromUMA(link, (Node) msg.getNotifier(), link
-									.getTarget());
-						}
-					}
-					break;
-				}
-				return;
-
-			}
-		}
-
-	}
-	
-	/**
-	 * Loads graphnode data and associates the adapters.
-	 * @param newObject
-	 */
-	protected void basicSetObject(Object newObject) {
-		if (newObject == null)
-			return;
-
-		this.object = newObject;
-		MethodElement element = (MethodElement) newObject;
-		
-		graphNode = getGraphNode(element);
-
-		// System.out.println("NodeImpl.setObject(): element: '" +
-		// element.getName() + "', graphNode: " + graphNode);
-
-		if(graphNode != null) {
-			// populate/synch data
-			//
-			if (height == HEIGHT_EDEFAULT) {
-				setHeight(graphNode.getSize().getHeight().intValue());
-			} else {
-				graphNode.getSize().setHeight(new Double(height));
-			}
-
-			if (width == WIDTH_EDEFAULT) {
-				setWidth(graphNode.getSize().getWidth().intValue());
-			} else {
-				graphNode.getSize().setWidth(new Double(width));
-			}
-
-			if (location == LOCATION_EDEFAULT) {
-				setLocation(GraphicalDataHelper.toPoint(graphNode.getPosition()));
-			} else {
-				graphNode.getPosition().setX(new Double(location.x));
-				graphNode.getPosition().setY(new Double(location.y));
-			}
-		}
-
-		// add methodElementAdapter
-		//
-		getMethodElementAdapter();
-		if (methodElementAdapter != null) {
-			element.eAdapters().add(methodElementAdapter);
-		}
-
-		this.eAdapters().add(createNodeAdapter());
-				
-		Object e = TngUtil.unwrap(object);
-		if(e instanceof MethodElement) {
-			setLinkedElement((MethodElement) e);
-		}
-	}
-	
-	protected abstract class TransactionalNodeLink extends AdapterImpl 
-	implements INodeChangeListener
-	{
-		public void notifyChanged(Notification msg) {
-			if (!notificationEnabled)
-				return;
-			notificationEnabled = false;
-			try {
-				InternalTransaction tx = null;
-				InternalTransactionalEditingDomain domain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(getNode());
-				if(domain != null) {
-					tx = domain.startTransaction(false, Collections.EMPTY_MAP);
-				}
-				
-				handleNotification(msg);
-				
-				if(tx != null) {
-					tx.commit();
-				}
-			} catch (Exception e) {
-				CommonPlugin.getDefault().getLogger().logError(e);
-			} finally {
-				notificationEnabled = true;
-			}
-		}
-
-		protected abstract void handleNotification(Notification msg);
-
-		public Node getNode() {
-			return NodeImpl.this;
-		}
-	}
-
-	
-	/**
-	 * Subclass can override this method to provide MethodElementAdapter that will synchronize
-	 * the change from method element to the node.
-	 * 
-	 * @return the method element adapter of this node
-	 */
-	protected Object getMethodElementAdapter() {
-		return methodElementAdapter;
-	}
-
-	public GraphNode getGraphNode(MethodElement methodElement){
-		if(isGraphicalDataRequired()) {
-			return GraphicalDataManager.getInstance().getGraphNode(
-					getUMADiagram(), methodElement);
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.LinkedObjectImpl#setObject(java.lang.Object)
-	 */
-	public void setObject(Object newObject) {
-		super.setObject(newObject);
-		
-		//TODO: ??? why task descriptor is excluded if the diagram is an activity detail diagram
-		//
-//		if (!((newObject instanceof TaskDescriptor) && getDiagram() instanceof ActivityDetailDiagram))
-			basicSetObject(newObject);
-	}
-
-	/**
-	 * @return
-	 */
-	protected Adapter createNodeAdapter() {
-		return new NodeAdapter();
-	}
-
-	public GraphNode getGraphNode() {
-		return graphNode;
-	}
-
-	// TODO: force subclass to implement this method
-	public Class getMethodElementAdapterType() {
-		return INodeChangeListener.class;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.Node#getDiagram()
-	 */
-	public Diagram getDiagram() {
-		EObject parent = eContainer;
-		for (; parent != null && !(parent instanceof Diagram); parent = parent
-				.eContainer())
-			;
-		if (parent instanceof Diagram) {
-			return (Diagram) parent;
-		}
-		return diagram;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.Node#setDiagram(org.eclipse.epf.diagram.model.Diagram)
-	 */
-	public void setDiagram(Diagram diagram) {
-		this.diagram = diagram;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.Node#addConsumer(java.lang.Object)
-	 */
-	public void addConsumer(Object consumer) {
-		if (!consumers.contains(consumer)) {
-			consumers.add(consumer);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.Node#removeConsumer(java.lang.Object)
-	 */
-	public void removeConsumer(Object consumer) {
-		consumers.remove(consumer);
-		if (consumers.isEmpty()) {
-			// no more consumer of this node, it should be disposed
-			dispose();
-		}
-	}
-
-	protected void dispose() {
-		EObject obj = (EObject) getObject();
-		if (obj != null) {
-			if (methodElementAdapter != null) {
-				obj.eAdapters().remove(methodElementAdapter);
-			}
-		}
-
-		eAdapters().clear();
-
-		umaContainer = null;
-		umaDiagram = null;
-		graphNode = null;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReadOnly(boolean newReadOnly) {
-		boolean oldReadOnly = readOnly;
-		readOnly = newReadOnly;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.NODE__READ_ONLY, oldReadOnly, readOnly));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ModelPackage.NODE__INCOMING_CONNECTIONS:
-				return ((InternalEList)getIncomingConnections()).basicAdd(otherEnd, msgs);
-			case ModelPackage.NODE__OUTGOING_CONNECTIONS:
-				return ((InternalEList)getOutgoingConnections()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ModelPackage.NODE__INCOMING_CONNECTIONS:
-				return ((InternalEList)getIncomingConnections()).basicRemove(otherEnd, msgs);
-			case ModelPackage.NODE__OUTGOING_CONNECTIONS:
-				return ((InternalEList)getOutgoingConnections()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.NODE__LOCATION:
-				return getLocation();
-			case ModelPackage.NODE__WIDTH:
-				return new Integer(getWidth());
-			case ModelPackage.NODE__HEIGHT:
-				return new Integer(getHeight());
-			case ModelPackage.NODE__INCOMING_CONNECTIONS:
-				return getIncomingConnections();
-			case ModelPackage.NODE__OUTGOING_CONNECTIONS:
-				return getOutgoingConnections();
-			case ModelPackage.NODE__READ_ONLY:
-				return isReadOnly() ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.NODE__LOCATION:
-				setLocation((Point)newValue);
-				return;
-			case ModelPackage.NODE__WIDTH:
-				setWidth(((Integer)newValue).intValue());
-				return;
-			case ModelPackage.NODE__HEIGHT:
-				setHeight(((Integer)newValue).intValue());
-				return;
-			case ModelPackage.NODE__INCOMING_CONNECTIONS:
-				getIncomingConnections().clear();
-				getIncomingConnections().addAll((Collection)newValue);
-				return;
-			case ModelPackage.NODE__OUTGOING_CONNECTIONS:
-				getOutgoingConnections().clear();
-				getOutgoingConnections().addAll((Collection)newValue);
-				return;
-			case ModelPackage.NODE__READ_ONLY:
-				setReadOnly(((Boolean)newValue).booleanValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.NODE__LOCATION:
-				setLocation(LOCATION_EDEFAULT);
-				return;
-			case ModelPackage.NODE__WIDTH:
-				setWidth(WIDTH_EDEFAULT);
-				return;
-			case ModelPackage.NODE__HEIGHT:
-				setHeight(HEIGHT_EDEFAULT);
-				return;
-			case ModelPackage.NODE__INCOMING_CONNECTIONS:
-				getIncomingConnections().clear();
-				return;
-			case ModelPackage.NODE__OUTGOING_CONNECTIONS:
-				getOutgoingConnections().clear();
-				return;
-			case ModelPackage.NODE__READ_ONLY:
-				setReadOnly(READ_ONLY_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.NODE__LOCATION:
-				return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
-			case ModelPackage.NODE__WIDTH:
-				return width != WIDTH_EDEFAULT;
-			case ModelPackage.NODE__HEIGHT:
-				return height != HEIGHT_EDEFAULT;
-			case ModelPackage.NODE__INCOMING_CONNECTIONS:
-				return incomingConnections != null && !incomingConnections.isEmpty();
-			case ModelPackage.NODE__OUTGOING_CONNECTIONS:
-				return outgoingConnections != null && !outgoingConnections.isEmpty();
-			case ModelPackage.NODE__READ_ONLY:
-				return readOnly != READ_ONLY_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	private Collection consumers = new ArrayList();
-
-	private GraphNode umaContainer;
-
-	private org.eclipse.epf.uma.Diagram umaDiagram;
-
-	private Diagram diagram;
-
-	protected GraphNode graphNode;
-
-	protected boolean notificationEnabled = true;
-
-	protected INodeChangeListener methodElementAdapter;
-
-	protected boolean visible;
-	
-	/**
-	 * addDefaultWorkOrder is moved from
-	 * GraphicalDataHelper.addDefaultWorkOrder(NamedNodeImpl,
-	 * WorkbreakdownElement) Method will set notificationEnabled flag to false
-	 * of all adapters of type MethodElementAdapter of Successor object before
-	 * creating a WorkOrder object. After creation of WorkOrder (Predecessor
-	 * link) restores the notificationEnabled flag of Successor's adapters of
-	 * type MethodElementAdapter.
-	 * 
-	 * eg: If an Activity "actA" is extended in another CP. Base "actA" AD
-	 * diagram is opened, and Extended "actA" AD Diagram is opened. On creating
-	 * predecessor link between any two child activities, creates a extra link
-	 * in Extended "actA" AD diagram, because creating workorder will notify the
-	 * extended "actA" diagram to draw a link. To avoid duplicate links in the
-	 * extended activity diagram, we have to set notificationEnabled flag to
-	 * false, before creating a WorkOrder object.
-	 * 
-	 */
-	public WorkOrder addDefaultWorkOrder(NamedNodeImpl node,
-			WorkBreakdownElement predBreakdownElement) {
-		boolean notify = node.isNotificationEnabled();
-		Map map = new HashMap();
-		List list = ((WorkBreakdownElement) node.getObject()).eAdapters();
-		for (Iterator iterator = list.iterator(); iterator.hasNext();) {
-			Object obj = iterator.next();
-			if (obj instanceof MethodElementAdapter) {
-				NodeImpl nodeobj = (NodeImpl) ((MethodElementAdapter) obj)
-						.getNode();
-				boolean predNotification = node.notificationEnabled;
-				((NodeImpl) (((MethodElementAdapter) obj).getNode())).notificationEnabled = false;
-				map.put(nodeobj, new Boolean(predNotification));
-			}
-		}
-		try {
-			node.setNotificationEnabled(false);
-			return UmaUtil.createDefaultWorkOrder((WorkBreakdownElement) node
-					.getObject(), predBreakdownElement);
-		} finally {
-			node.setNotificationEnabled(notify);
-			Set set = map.keySet();
-			for (Iterator iter = set.iterator(); iter.hasNext();) {
-				Object object = iter.next();
-				Object obj = map.get(object);
-				if (obj instanceof Boolean) {
-					boolean prednot = ((Boolean) obj).booleanValue();
-					((NodeImpl) object).notificationEnabled = prednot;
-				}
-			}
-		}
-	}
-	
-	protected boolean isGraphicalDataRequired() {
-		DiagramImpl diagram = (DiagramImpl) getDiagram();
-		return diagram.isGraphicalDataRequired();
-	}
-	
-	public boolean isVisible() {
-		return visible ;
-	}
-
-} // NodeImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/RoleNodeImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/RoleNodeImpl.java
deleted file mode 100755
index 18f1dca..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/RoleNodeImpl.java
+++ /dev/null
@@ -1,63 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.util.Collection;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.RoleNode;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Role Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class RoleNodeImpl extends NamedNodeImpl implements RoleNode {
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	protected RoleNodeImpl() {
-		super();
-
-		methodElementAdapter = new RoleDescriptorAdapter();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.ROLE_NODE;
-	}
-
-	private class RoleDescriptorAdapter extends MethodElementAdapter {
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.NodeImpl#getMethodElementAdapterType()
-	 */
-	public Class getMethodElementAdapterType() {
-		return RoleDescriptorAdapter.class;
-	}
-} // RoleNodeImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/RoleTaskCompositeImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/RoleTaskCompositeImpl.java
deleted file mode 100755
index e5fc4cd..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/RoleTaskCompositeImpl.java
+++ /dev/null
@@ -1,775 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.NodeContainer;
-import org.eclipse.epf.diagram.model.RoleNode;
-import org.eclipse.epf.diagram.model.RoleTaskComposite;
-import org.eclipse.epf.diagram.model.TaskNode;
-import org.eclipse.epf.diagram.model.WorkProductComposite;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.diagram.model.util.GraphicalDataManager;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UMASemanticModelBridge;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.ecore.util.OppositeFeatureNotification;
-import org.eclipse.epf.uma.util.AssociationHelper;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Role Task Composite</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.RoleTaskCompositeImpl#getRowIndex <em>Row Index</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RoleTaskCompositeImpl extends NodeContainerImpl implements
-		RoleTaskComposite {
-	
-	/**
-	 * The default value of the '{@link #getRowIndex() <em>Row Index</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRowIndex()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ROW_INDEX_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getRowIndex() <em>Row Index</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRowIndex()
-	 * @generated
-	 * @ordered
-	 */
-	protected int rowIndex = ROW_INDEX_EDEFAULT;
-
-//	private int rowIndex;
-	
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	protected RoleTaskCompositeImpl() {
-		super();
-
-		methodElementAdapter = new RoleDescriptorAdapter();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.ROLE_TASK_COMPOSITE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getRowIndex() {
-		return rowIndex;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRowIndex(int newRowIndex) {
-		int oldRowIndex = rowIndex;
-		rowIndex = newRowIndex;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.ROLE_TASK_COMPOSITE__ROW_INDEX, oldRowIndex, rowIndex));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.ROLE_TASK_COMPOSITE__ROW_INDEX:
-				return new Integer(getRowIndex());
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.ROLE_TASK_COMPOSITE__ROW_INDEX:
-				setRowIndex(((Integer)newValue).intValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.ROLE_TASK_COMPOSITE__ROW_INDEX:
-				setRowIndex(ROW_INDEX_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.ROLE_TASK_COMPOSITE__ROW_INDEX:
-				return rowIndex != ROW_INDEX_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (rowIndex: ");
-		result.append(rowIndex);
-		result.append(')');
-		return result.toString();
-	}
-
-	private static boolean contains(Collection mixedCollection, Object element) {
-		for (Iterator iter = mixedCollection.iterator(); iter.hasNext();) {
-			if( element == TngUtil.unwrap(iter.next()) ) {
-				return true;
-			}		
-		}
-		return false;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.NodeImpl#setObject(java.lang.Object)
-	 */
-	public void setObject(Object newObject) {
-		super.setObject(newObject);
-		populateNodes(newObject);
-//		if (newObject instanceof RoleDescriptor) {
-//			RoleDescriptor roleDescriptor = (RoleDescriptor) newObject;
-//			ActivityDetailDiagramImpl diagram = (ActivityDetailDiagramImpl) getDiagram();
-//			Collection allElements = diagram.getAllBreakdownElements();
-//			List primaryTaskDescriptors = AssociationHelper.getPrimaryTaskDescriptors(roleDescriptor);
-//			if (!primaryTaskDescriptors.isEmpty()) { // overriding
-//																	
-//				// use list to maintain order of
-//				// taskdescriptors.
-//				List taskDescriptors = new ArrayList();
-//				taskDescriptors.addAll(primaryTaskDescriptors);
-//				// taskDescriptors.addAll(roleDescriptor.getPerformsAdditionally());
-//				// taskDescriptors.addAll(roleDescriptor.getAssistsIn());
-//
-//				HashSet selectedDescriptors = new HashSet();
-//				List taskNodes = new ArrayList();
-//				
-//				String autolayout = GraphicalDataHelper.getAutoLayoutFlag((ActivityDetailDiagram)getDiagram()); 
-//				if(autolayout != null){
-//					int index = 0;
-//					for (Iterator iter = allElements.iterator(); iter.hasNext();) {
-//						Object obj = iter.next();
-//						obj = TngUtil.unwrap(obj);
-//						if (obj instanceof TaskDescriptor
-//								&& TngUtil.contains(taskDescriptors, obj)) {
-//							TaskDescriptor taskDescriptor = (TaskDescriptor) obj;
-//
-//							// eliminate descriptor that is duplicate,
-//							// suppressed or filtered out
-//							//
-//							if (!selectedDescriptors.contains(taskDescriptor)
-//							// && contains(allElements, taskDescriptor) // make
-//							// sure that task descriptor is of the owning
-//							// activity
-//							) {
-//								selectedDescriptors.add(taskDescriptor);
-//								Node node = GraphicalDataHelper.findNode(
-//										this, taskDescriptor,
-//										TaskNode.class);
-//								if (node == null) {
-//									node = ModelFactory.eINSTANCE
-//											.createTaskNode();
-//									node.setDiagram(getDiagram());
-//									node.setObject(taskDescriptor);
-//									((NamedNodeImpl) node)
-//											.setItemProvider(allElements);
-//									if(GraphicalDataHelper.findProperty(node.getGraphNode(), 
-//											GraphicalDataHelper.PROP_INDEX) == null
-//											|| GraphicalDataHelper.isAutoLayout((ActivityDetailDiagram)getDiagram())){
-//										GraphicalDataHelper.createProperty(node
-//											.getGraphNode(),
-//											GraphicalDataHelper.PROP_INDEX,
-//											new Integer(index).toString());
-//										index++;
-//									}
-//									
-//								}
-//								taskNodes.add(node);
-//							}
-//						}
-//					}
-//					// Sort the taskNode based on their index if autolayout is
-//					// false
-//					if (GraphicalDataHelper.PROP_AUTO_LAYOUT_VALUE_FALSE
-//							.equals(autolayout)) {
-//						Collections.sort(taskNodes, comparator);
-//					}
-//			  }else{
-//					for (Iterator iter = taskDescriptors.iterator(); iter.hasNext();) {
-//						TaskDescriptor taskDescriptor = (TaskDescriptor) iter.next();
-//						
-//						// eliminate descriptor that is duplicate, suppressed or filtered out
-//						//
-//						if(!selectedDescriptors.contains(taskDescriptor)
-//								&& contains(allElements, taskDescriptor) // make sure that task descriptor is of the owning activity
-//						) {
-//							selectedDescriptors.add(taskDescriptor);					
-//						Node node = GraphicalDataHelper.findNode(getDiagram(),
-//									taskDescriptor, TaskNode.class);
-//						if (node == null) {
-//							node = ModelFactory.eINSTANCE.createTaskNode();
-//							node.setDiagram(getDiagram());
-//							node.setObject(taskDescriptor);
-//							((NamedNodeImpl) node).setItemProvider(allElements);
-//						}
-//						taskNodes.add(node);
-//						}
-//					}
-//				}
-//				if(!taskNodes.isEmpty()) {
-//					// add role node
-//					//
-//					Node node = (NamedNodeImpl) ModelFactory.eINSTANCE.createRoleNode();
-//					node.setDiagram(getDiagram());
-//					node.setObject(roleDescriptor);
-//					((NamedNodeImpl) node).setItemProvider(allElements);
-//					getNodes().add(node);
-//					// add task nodes
-//					//
-//					getNodes().addAll(taskNodes);
-//				}
-//			}
-//		}
-
-		
-	}
-	
-	public GraphNode getGraphNode(MethodElement methodElement) {
-		if(isGraphicalDataRequired()) {
-			if (getUMADiagram() == null) {
-				// new MethodElement
-				//
-				return GraphicalDataManager.getInstance().createGraphNode(methodElement);
-			}
-			GraphNode node = findGraphNode(getUMADiagram(), methodElement);
-			if (node == null) {
-				node = GraphicalDataManager.getInstance().createGraphNode(methodElement);
-				// createGraphConnectors(node, getUMADiagram());
-				getUMADiagram().getContained().add(node);
-			}
-			String autolayout = GraphicalDataHelper.getAutoLayoutFlag((ActivityDetailDiagram)getDiagram());
-			if(autolayout != null){
-				GraphicalDataHelper.createProperty(node, GraphicalDataHelper.PROP_INDEX, new Integer(rowIndex).toString());
-			}
-			return node;
-		}
-		return null;
-	}
-
-	public GraphNode findGraphNode(Diagram diagram, Object methodElement) {
-		for (Iterator iter = diagram.getContained().iterator(); iter.hasNext();) {
-			GraphNode element = (GraphNode) iter.next();
-			if (element.getSemanticModel() instanceof UMASemanticModelBridge
-					&& methodElement == ((UMASemanticModelBridge) element
-							.getSemanticModel()).getElement()) {
-
-				Property property = GraphicalDataHelper.findProperty(element, GraphicalDataHelper.PROP_INDEX);
-				
-				if (property != null) {
-					String index = property.getValue();
-					if (index != null) {
-						if (getRowIndex() == new Integer(index).intValue())
-							return element;
-					}
-				}else{
-					return element;
-				}
-			}
-		}
-		return null;
-	}
-	
-//	public GraphNode createGraphNode(MethodElement element) {
-//		GraphNode node = GraphicalDataManager.getInstance().createGraphNode(element);
-//		GraphicalDataHelper.createProperty(node,
-//				GraphicalDataHelper.PROP_INDEX, new Integer(rowIndex)
-//						.toString());
-//		return node;
-//	}
-	
-	private class RoleDescriptorAdapter extends TransactionalNodeLink {
-
-		@Override
-		protected void handleNotification(Notification msg) {
-			if(msg instanceof OppositeFeatureNotification) {
-				Object feature = ((OppositeFeatureNotification)msg).getOppsiteFeature();
-				if(feature == AssociationHelper.RoleDescriptor_PrimaryTaskDescriptors) {
-					switch (msg.getEventType()) {
-					case Notification.ADD:
-						addNode((TaskDescriptor) msg.getNewValue());
-						return;
-					case Notification.REMOVE:
-						removeNode(msg.getOldValue());
-						return;
-					case Notification.ADD_MANY:
-						addNode((Collection) msg.getNewValue());
-						return;
-					case Notification.REMOVE_MANY:
-						removeNode((Collection) msg.getOldValue());
-						return;
-					}
-				}
-			}
-			switch (msg.getFeatureID(Activity.class)) {
-			case UmaPackage.ACTIVITY__BREAKDOWN_ELEMENTS:
-				switch (msg.getEventType()) {
-				case Notification.MOVE:
-					System.out.println("MOVEEEEEEED");
-					break;
-				}
-				break;
-			}
-		}
-
-	}
-
-	/**
-	 * @param oldValue
-	 */
-	private void removeNode(Object oldValue) {
-		Collection removedNodes = new HashSet();
-		for (Iterator iter = nodes.iterator(); iter.hasNext();) {
-			Node node = (Node) iter.next();
-			if (oldValue instanceof TaskDescriptor) {
-				if (node instanceof RoleNode) {
-					ActivityDetailDiagramImpl d = (ActivityDetailDiagramImpl)getDiagram();
-					List list = //AssociationHelper.getPrimaryTaskDescriptors((RoleDescriptor) node.getObject());
-						d.getRealizedPrimaryTaskDescriptors((RoleDescriptor) node.getObject());
-					if (list == null || list.size() < 1) {
-						iter.remove();
-						removedNodes.add(node);
-					}
-				}
-			}
-			if (node.getObject() == oldValue) {
-				iter.remove();
-				removedNodes.add(node);
-				if (oldValue instanceof TaskDescriptor) {
-					Node wpnode = GraphicalDataHelper.findNode(
-							(ActivityDetailDiagram) getDiagram(), oldValue);
-					getDiagram().getNodes().remove(wpnode);
-					wpnode = GraphicalDataHelper.findNode(
-							(ActivityDetailDiagram) getDiagram(), oldValue);
-					getDiagram().getNodes().remove(wpnode);
-				}
-			}
-		}
-		if (nodes.isEmpty()) {
-			getDiagram().getNodes().remove(this);
-		}
-		// pushBackToDiagram(removedNodes);
-	}
-
-	/**
-	 * @param descriptor
-	 */
-	private void addNode(TaskDescriptor descriptor) {
-		addNode(getNodes(), descriptor);
-	}
-
-	private void addNode(Collection nodes, TaskDescriptor descriptor) {
-
-		ActivityDetailDiagramImpl diagram = (ActivityDetailDiagramImpl) getDiagram();
-		Node node = GraphicalDataHelper.findNode((NodeContainer) diagram,
-				descriptor);
-		if (node == null) {
-			if (descriptor instanceof TaskDescriptor) {
-				RoleDescriptor roleDescriptor = ((TaskDescriptor) descriptor)
-						.getPerformedPrimarilyBy();
-				Node roleNode = ((ActivityDetailDiagramImpl) getDiagram()).findNode(
-						(ActivityDetailDiagram) getDiagram(), roleDescriptor);
-				if (roleNode == null) {
-					roleNode = ((ActivityDetailDiagramImpl) getDiagram())
-							.createRoleTaskComposite(roleDescriptor);
-					getDiagram().getNodes().add(roleNode);
-				} else {
-					node = diagram.createNode(descriptor);
-					int i = getNextIndex(getNodes());
-					if(node instanceof TaskNodeImpl){
-						((TaskNodeImpl)node).doSetIndex(i + 1);
-					}
-					//createTaskInputOutputNodes(descriptor, getDiagram().getNodes());
-				}
-			}
-		}
-		if(node != null){
-			nodes.add(node);
-		}
-	}
-
-	/**
-	 * @param oldValue
-	 */
-	private void removeNode(Collection elements) {
-		Collection nodes = new ArrayList();
-		for (Iterator iter = nodes.iterator(); iter.hasNext();) {
-			Node node = (Node) iter.next();
-			if (elements.contains(node.getObject())) {
-				nodes.add(node);
-			}
-		}
-		getNodes().removeAll(nodes);
-		// pushBackToDiagram(nodes);
-	}
-
-	/**
-	 * @param newValue
-	 */
-	private void addNode(Collection elements) {
-		Collection nodes = new ArrayList();
-		for (Iterator iter = elements.iterator(); iter.hasNext();) {
-			TaskDescriptor descriptor = (TaskDescriptor) iter.next();
-			addNode(nodes, descriptor);
-		}
-
-		getNodes().addAll(nodes);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.NodeImpl#getMethodElementAdapterType()
-	 */
-	public Class getMethodElementAdapterType() {
-		return RoleDescriptorAdapter.class;
-	}
-	
-	/**
-	 * @return
-	 */
-	private int getNextIndex(List nodes) {
-		int index = 0;
-		for(Iterator iterator = nodes.iterator(); iterator.hasNext();){
-			Object obj = iterator.next();			
-//			if(obj instanceof Node){
-//				Node node = (Node)obj;
-//				//String temp = GraphicalDataHelper.findProperty(node.getGraphNode(), GraphicalDataHelper.PROP_INDEX).getValue();
-//				List list = node.getGraphNode().getList(UmaPackage.GRAPH_NODE__PROPERTY);
-//				if(list != null && !list.isEmpty()){
-//					for (int i = list.size() - 1; i > -1; i--) {
-//						Property prop = (Property) list.get(i);
-//						if (GraphicalDataHelper.PROP_INDEX.equals(prop.getKey())){
-//							int temp  = Integer.parseInt(prop.getValue());
-//							if(temp > index ) index = temp;
-//						}
-//					}
-//				}
-//			}
-			if(obj instanceof TaskNodeImpl) {
-				int id = ((TaskNodeImpl)obj).doGetIndex();
-				if(id > index) {
-					index = id;
-				}
-			}
-		}
-		return index;
-	}
-	
-	private static final Comparator comparator = new Comparator() {
-
-		public int compare(Object obj1, Object obj2) {
-			if (obj1 == obj2)
-				return 0;
-			if(obj1 instanceof TaskNodeImpl && obj2 instanceof TaskNodeImpl){
-				TaskNodeImpl node1 = (TaskNodeImpl)obj1;
-				TaskNodeImpl node2 = (TaskNodeImpl)obj2;
-				if(node1.doGetIndex() >  node2.doGetIndex())
-					return 1;
-			}
-			return 0;
-		}
-
-	};
-
-	public void createTaskInputOutputNodes(TaskDescriptor descriptor, Collection nodes) {
-		Node newNode = null;
-		if (!descriptor.getMandatoryInput().isEmpty()) {
-			newNode = createWorkProductComposite(descriptor,
-					WorkProductComposite.INPUTS);
-			nodes.add(newNode);
-		}
-		if (!descriptor.getOutput().isEmpty()) {
-			newNode = createWorkProductComposite(descriptor,
-					WorkProductComposite.OUTPUTS);
-			nodes.add(newNode);
-		}
-	}
-	
-	public WorkProductComposite createWorkProductComposite(
-			TaskDescriptor taskDescriptor, int type) {
-		WorkProductComposite workproductComposite = ModelFactory.eINSTANCE
-				.createWorkProductComposite();
-		workproductComposite.setUMAContainer(getGraphNode());
-		workproductComposite.setDiagram(getDiagram());
-		workproductComposite.setType(type);
-		workproductComposite.setObject(taskDescriptor);
-		return workproductComposite;
-	}
-	
-	private TaskNode createTaskNode(TaskDescriptor td) {
-		TaskNode taskNode = null;
-		for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-			Node node = (Node) iter.next();
-			if(node instanceof TaskNode) {
-				TaskNode tn = (TaskNode) node;
-				if(tn.getLinkedElement() == td) {
-					taskNode = tn;
-					break;
-				}
-			}
-		}
-		if(taskNode == null) {
-			taskNode = ModelFactory.eINSTANCE.createTaskNode();
-			taskNode.setDiagram(getDiagram());
-		}
-		taskNode.setObject(td);
-		return taskNode;
-	}
-	
-	private RoleNode createRoleNode(RoleDescriptor rd) {
-		RoleNode roleNode = null;
-		for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-			Node node = (Node) iter.next();
-			if(node instanceof RoleNode) {
-				RoleNode rn = (RoleNode) node;
-				if(rn.getLinkedElement() == rd) {
-					roleNode = rn;
-					break;
-				}
-			}
-		}
-		if(roleNode == null) {
-			roleNode = ModelFactory.eINSTANCE.createRoleNode();
-			roleNode.setDiagram(getDiagram());
-			roleNode.setObject(rd);
-		}
-		return roleNode;
-	}
-	
-	public void populateNodes(Object newObject){
-		
-		if (newObject instanceof RoleDescriptor) {
-			RoleDescriptor roleDescriptor = (RoleDescriptor) newObject;
-			ActivityDetailDiagramImpl diagram = (ActivityDetailDiagramImpl) getDiagram();
-			Collection allElements = diagram.getAllBreakdownElements();
-			List taskNodes = new ArrayList();
-			List primaryTaskDescriptors = AssociationHelper.getPrimaryTaskDescriptors(roleDescriptor);
-			if (!primaryTaskDescriptors.isEmpty()) { // overriding
-																	
-				List taskDescriptors = new ArrayList();
-				taskDescriptors.addAll(primaryTaskDescriptors);
-				HashSet selectedDescriptors = new HashSet();
-				boolean autoLayout = ((ActivityDetailDiagramImpl)getDiagram()).isAutoLayout();
-				if(autoLayout) {
-					int index = 0;
-					int rowTasksCount = 0;
-					int startCount = 0;
-					
-					for (Iterator iter = allElements.iterator(); iter.hasNext();) {
-						Object obj = iter.next();
-						obj = TngUtil.unwrap(obj);
-						if (obj instanceof TaskDescriptor
-								&& TngUtil.contains(taskDescriptors, obj)) {
-							TaskDescriptor taskDescriptor = (TaskDescriptor) obj;
-							
-							if(startCount < rowIndex * GraphicalDataHelper.getTasksPerRow()){
-								startCount++;
-							} else {
-
-								if (!selectedDescriptors
-										.contains(taskDescriptor)) {
-									selectedDescriptors.add(taskDescriptor);
-									Node node = GraphicalDataHelper.findNode(
-											this, taskDescriptor,
-											TaskNode.class);
-									if (node == null) {
-//										node = createTaskNode(taskDescriptor,
-//												index, allElements);
-										node = createTaskNode(taskDescriptor);
-										((NamedNodeImpl) node).setItemProvider(allElements);
-										TaskNodeImpl tn = (TaskNodeImpl) node;
-										if (autoLayout || tn.doGetIndex() == -1) {
-											tn.doSetIndex(index);
-											index++;
-										}
-										//return node;
-									}
-									if (node != null) {
-										if (rowTasksCount < GraphicalDataHelper
-												.getTasksPerRow()) {
-											taskNodes.add(node);
-											rowTasksCount++;
-										} else {
-											break;
-										}
-									}
-								}
-							}
-						}
-					}
-					// Sort the taskNode based on their index if autolayout is
-					// false
-					if (!autoLayout) {
-						Collections.sort(taskNodes, comparator);
-					}
-				} else {
-					List oldTaskDescriptors = new ArrayList();
-					Diagram umaDiagram = getUMADiagram();
-					if(umaDiagram != null) {
-						// Lame way of doing this, to fix a defect of 1.0 to 1.0.1 migration				  
-						List graphNodes = umaDiagram.getContained();
-						for (Iterator iter = graphNodes.iterator(); iter.hasNext();) {
-							GraphNode element = (GraphNode) iter.next();
-							Object bridge = element.getSemanticModel();
-							if(bridge instanceof UMASemanticModelBridge){
-								Object taskObject = ((UMASemanticModelBridge)bridge).getElement();
-								List list = element.getList(UmaPackage.GRAPH_NODE__PROPERTY);
-								Property property = GraphicalDataHelper.getPropertyByKey(list,
-										GraphicalDataHelper.PROP_WORK_PRODUCT_COMPOSITE_TYPE);
-								if (taskDescriptors.contains(taskObject) && property == null) {
-									oldTaskDescriptors.add(taskObject);
-								}
-							}
-						}
-					}
-					else {
-						for (Iterator iter = getNodes().iterator(); iter
-								.hasNext();) {
-							Node node = (Node) iter.next();
-							if(node.getLinkedElement() instanceof TaskDescriptor) {
-								oldTaskDescriptors.add(node.getLinkedElement());
-							}
-						}
-					}
-					for (Iterator iter = oldTaskDescriptors.iterator(); iter.hasNext();) {
-						TaskDescriptor taskDescriptor = (TaskDescriptor) iter.next();
-
-						// eliminate descriptor that is duplicate, suppressed or filtered out
-						//
-						if(!selectedDescriptors.contains(taskDescriptor)
-								&& contains(allElements, taskDescriptor) // make sure that task descriptor is of the owning activity
-						) {
-							selectedDescriptors.add(taskDescriptor);					
-							Node node = GraphicalDataHelper.findNode(getDiagram(),
-									taskDescriptor, TaskNode.class);
-							if (node == null) {
-								node = createTaskNode(taskDescriptor);
-								((NamedNodeImpl) node).setItemProvider(allElements);
-							}
-							taskNodes.add(node);
-						}
-					}
-				}
-			}
-			if(!taskNodes.isEmpty()) {
-				// add role node
-				//
-				NamedNodeImpl namedNode = ((NamedNodeImpl) createRoleNode(roleDescriptor));
-				namedNode.visible = true;
-				namedNode.setItemProvider(allElements);
-				getNodes().add(namedNode);		
-				taskNodes.add(namedNode);
-			}
-			selectNodes(taskNodes);
-		}
-		
-	}
-	
-//	public Node createTaskNode(TaskDescriptor taskDescriptor, int index, Collection allElements) {
-//		Node node = ModelFactory.eINSTANCE.createTaskNode();
-//		node.setDiagram(getDiagram());
-//		node.setObject(taskDescriptor);
-//		((NamedNodeImpl) node).setItemProvider(allElements);
-//		if (GraphicalDataHelper.findProperty(node.getGraphNode(),
-//				GraphicalDataHelper.PROP_INDEX) == null
-//				|| GraphicalDataHelper
-//						.isAutoLayout((ActivityDetailDiagram) getDiagram())) {
-//			GraphicalDataHelper.createProperty(node.getGraphNode(),
-//					GraphicalDataHelper.PROP_INDEX, new Integer(index)
-//							.toString());
-//			index++;
-//		}
-//		return node;
-//	}
-	
-} // RoleTaskCompositeImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/TaskNodeImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/TaskNodeImpl.java
deleted file mode 100755
index 9ebd254..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/TaskNodeImpl.java
+++ /dev/null
@@ -1,370 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.TaskNode;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Task Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.TaskNodeImpl#getIndex <em>Index</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TaskNodeImpl extends NamedNodeImpl implements TaskNode {
-	/**
-	 * The default value of the '{@link #getIndex() <em>Index</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIndex()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int INDEX_EDEFAULT = -1;
-
-	/**
-	 * The cached value of the '{@link #getIndex() <em>Index</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIndex()
-	 * @generated
-	 * @ordered
-	 */
-	protected int index = INDEX_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	protected TaskNodeImpl() {
-		super();
-
-		methodElementAdapter = new TaskDescriptorAdapter();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.TASK_NODE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getIndex() {
-		return index;
-	}
-	
-	public int doGetIndex() {
-		if(isGraphicalDataRequired()) {
-			Property prop = GraphicalDataHelper.getProperty(this, GraphicalDataHelper.PROP_INDEX);
-			if(prop != null) {
-				try {
-					int i = Integer.parseInt(prop.getValue());
-					return i;
-				}
-				catch(NumberFormatException e) {
-					//
-				}
-			}
-		}
-		return getIndex();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIndex(int newIndex) {
-		int oldIndex = index;
-		index = newIndex;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.TASK_NODE__INDEX, oldIndex, index));
-	}
-	
-	public void doSetIndex(int newIndex) {
-		if(isGraphicalDataRequired()) {
-			GraphicalDataHelper.createProperty(getGraphNode(), 
-					GraphicalDataHelper.PROP_INDEX, String.valueOf(newIndex));
-		}
-		else {
-			setIndex(newIndex);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.TASK_NODE__INDEX:
-				return new Integer(getIndex());
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.TASK_NODE__INDEX:
-				setIndex(((Integer)newValue).intValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.TASK_NODE__INDEX:
-				setIndex(INDEX_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.TASK_NODE__INDEX:
-				return index != INDEX_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (index: ");
-		result.append(index);
-		result.append(')');
-		return result.toString();
-	}
-
-	private class TaskDescriptorAdapter extends MethodElementAdapter {
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification msg) {
-			if (!notificationEnabled)
-				return;
-			notificationEnabled = false;
-			try {
-				MethodElement obj;
-				switch (msg.getFeatureID(TaskDescriptor.class)) {
-				case UmaPackage.TASK_DESCRIPTOR__MANDATORY_INPUT:
-				case UmaPackage.TASK_DESCRIPTOR__OPTIONAL_INPUT:
-				case UmaPackage.TASK_DESCRIPTOR__EXTERNAL_INPUT:
-					switch (msg.getEventType()) {
-					case Notification.ADD:
-						obj = (MethodElement) msg.getNewValue();
-						addIncomingConnection(obj);
-						return;
-					case Notification.REMOVE:
-						obj = (MethodElement) msg.getOldValue();
-						removeIncomingConnection(obj);
-						return;
-					case Notification.ADD_MANY:
-						Collection collection = (Collection) msg.getNewValue();
-						for (Iterator iter = collection.iterator(); iter
-								.hasNext();) {
-							obj = (MethodElement) iter.next();
-							addIncomingConnection(obj);
-						}
-						return;
-					case Notification.REMOVE_MANY:
-						collection = (Collection) msg.getOldValue();
-						for (Iterator iter = collection.iterator(); iter
-								.hasNext();) {
-							obj = (MethodElement) iter.next();
-							removeIncomingConnection(obj);
-						}
-						return;
-					}
-					break;
-				case UmaPackage.TASK_DESCRIPTOR__OUTPUT:
-					switch (msg.getEventType()) {
-					case Notification.ADD:
-						obj = (MethodElement) msg.getNewValue();
-						addOutgoingConnection(obj);
-						return;
-					case Notification.REMOVE:
-						obj = (MethodElement) msg.getOldValue();
-						removeOutgoingConnection(obj);
-						return;
-					case Notification.ADD_MANY:
-						Collection collection = (Collection) msg.getNewValue();
-						for (Iterator iter = collection.iterator(); iter
-								.hasNext();) {
-							obj = (MethodElement) iter.next();
-							addOutgoingConnection(obj);
-						}
-						return;
-					case Notification.REMOVE_MANY:
-						collection = (Collection) msg.getOldValue();
-						for (Iterator iter = collection.iterator(); iter
-								.hasNext();) {
-							obj = (MethodElement) iter.next();
-							removeOutgoingConnection(obj);
-						}
-						return;
-					}
-					break;
-				}
-			} finally {
-				notificationEnabled = true;
-			}
-
-			super.notifyChanged(msg);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.epf.diagram.model.util.INodeChangeListener#getNode()
-		 */
-		public Node getNode() {
-			return TaskNodeImpl.this;
-		}
-	}
-
-	// /* (non-Javadoc)
-	// * @see
-	// org.eclipse.epf.diagram.model.impl.NamedNodeImpl#setObject(java.lang.Object)
-	// */
-	// public void setObject(Object newObject) {
-	// Object oldObject = object;
-	// object = newObject;
-	// if (eNotificationRequired())
-	// eNotify(new ENotificationImpl(this, Notification.SET,
-	// ModelPackage.LINKED_OBJECT__OBJECT, oldObject, object));
-	//
-	// if(newObject == null) return;
-	//		
-	// MethodElement element = (MethodElement) newObject;
-	// if(element != null && getMethodElementAdapterType() != null) {
-	// // remove old methodElementAdapter
-	// //
-	// Object oldAdapter = UmaUtil.getAdapter(element,
-	// getMethodElementAdapterType());
-	// if(oldAdapter != null) {
-	// element.eAdapters().remove(oldAdapter);
-	// }
-	// }
-	// graphNode =
-	// GraphicalDataManager.getInstance().getGraphNode(getUMADiagram(),
-	// element);
-	//        
-	// // System.out.println("NodeImpl.setObject(): element: '" +
-	// element.getName() + "', graphNode: " + graphNode);
-	//        
-	// // populate data
-	// //
-	// setHeight(graphNode.getSize().getHeight().intValue());
-	// setLocation(GraphicalDataHelper.toPoint(graphNode.getPosition()));
-	// setWidth(graphNode.getSize().getWidth().intValue());
-	//        
-	// // add methodElementAdapter
-	// //
-	// if(methodElementAdapter != null) {
-	// element.eAdapters().add(methodElementAdapter);
-	// }
-	//        
-	// this.eAdapters().add(createNodeAdapter());
-	//
-	// setName(element.getName());
-	// }
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.NodeImpl#addToUMA(org.eclipse.epf.diagram.model.Link)
-	 */
-	protected boolean addToUMA(Link link) {
-		if (!super.addToUMA(link))
-			return false;
-
-		//TaskDescriptor taskDesc = (TaskDescriptor) getObject();
-		NodeImpl nodeImpl = (NodeImpl) link.getSource();
-		boolean notify = notificationEnabled;
-		boolean notifySource = nodeImpl.notificationEnabled;
-		try {
-			notificationEnabled = false;
-			nodeImpl.notificationEnabled = false;
-			// taskDesc.getMandatoryInput().add(link.getSource().getObject());
-		} finally {
-			notificationEnabled = notify;
-			nodeImpl.notificationEnabled = notifySource;
-		}
-
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.NodeImpl#removeFromUMA(org.eclipse.epf.diagram.model.Link,
-	 *      org.eclipse.epf.diagram.model.Node, org.eclipse.epf.diagram.model.Node)
-	 */
-	protected void removeFromUMA(Link link, Node oldSource, Node oldTarget) {
-		TaskDescriptor taskDesc = (TaskDescriptor) getObject();
-		taskDesc.getOutput().remove(link.getTarget().getObject());
-
-		super.removeFromUMA(link, oldSource, oldTarget);
-	}
-
-} // TaskNodeImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/TypedNodeImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/TypedNodeImpl.java
deleted file mode 100755
index 99794c1..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/TypedNodeImpl.java
+++ /dev/null
@@ -1,377 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.WorkBreakdownElementNode;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.util.UmaUtil;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Typed Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.TypedNodeImpl#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TypedNodeImpl extends NodeImpl implements TypedNode {
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int TYPE_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected int type = TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TypedNodeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.TYPED_NODE;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(int newType) {
-		int oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.TYPED_NODE__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.TYPED_NODE__TYPE:
-				return new Integer(getType());
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.TYPED_NODE__TYPE:
-				setType(((Integer)newValue).intValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.TYPED_NODE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.TYPED_NODE__TYPE:
-				return type != TYPE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (type: ");
-		result.append(type);
-		result.append(')');
-		return result.toString();
-	}
-
-	protected void basicSetObject(Object newObject) {
-		//populate data from linked GraphNode
-		// 
-		graphNode = (GraphNode) newObject;
-		setWidth(graphNode.getSize().getWidth().intValue());
-		setHeight(graphNode.getSize().getHeight().intValue());
-		setLocation(GraphicalDataHelper.toPoint(graphNode.getPosition()));
-//		 this.eAdapters().add(new AdapterImpl() {
-		// /* (non-Javadoc)
-		// * @see
-		// org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		// */
-		// public void notifyChanged(Notification msg) {
-		// GraphNode graphNode = (GraphNode) getObject();
-		// switch(msg.getFeatureID(TypedNode.class)) {
-		// case ModelPackage.TYPED_NODE__WIDTH:
-		// graphNode.getSize().setWidth(new Double(msg.getNewIntValue()));
-		// return;
-		//                    
-		// case ModelPackage.TYPED_NODE__HEIGHT:
-		// graphNode.getSize().setHeight(new Double(msg.getNewIntValue()));
-		// return;
-		//                        
-		// case ModelPackage.TYPED_NODE__LOCATION:
-		// Point p = (Point) msg.getNewValue();
-		// System.out.println("TypedNodeImpl$.notifyChanged(): new location: " +
-		// p + ". " + TypedNodeImpl.this);
-		// graphNode.getPosition().setX(new Double(p.x));
-		// graphNode.getPosition().setY(new Double(p.y));
-		// return;
-		//                    
-		// case ModelPackage.TYPED_NODE__INCOMING_CONNECTIONS:
-		// Link link;
-		// switch(msg.getEventType()) {
-		// case Notification.ADD:
-		// addToUMA((Link) msg.getNewValue());
-		// break;
-		// case Notification.ADD_MANY:
-		// for (Iterator iter = ((Collection)msg.getNewValue()).iterator(); iter
-		// .hasNext();) {
-		// addToUMA((Link) iter.next());
-		// }
-		// break;
-		// case Notification.REMOVE:
-		// link = (Link) msg.getOldValue();
-		// if(link.getSource() != null) {
-		// ((NodeImpl)link.getSource()).removeFromUMA(link, link.getSource(),
-		// (Node)msg.getNotifier());
-		// }
-		// break;
-		// case Notification.REMOVE_MANY:
-		// for (Iterator iter = ((Collection)msg.getOldValue()).iterator(); iter
-		// .hasNext();) {
-		// link = (Link) iter.next();
-		// if(link.getSource() != null) {
-		// ((NodeImpl)link.getSource()).removeFromUMA(link, link.getSource(),
-		// (Node)msg.getNotifier());
-		// }
-		// }
-		// break;
-		// }
-		// return;
-		//
-		// case ModelPackage.TYPED_NODE__OUTGOING_CONNECTIONS:
-		// switch(msg.getEventType()) {
-		// case Notification.ADD:
-		// addToUMA((Link) msg.getNewValue());
-		// break;
-		// case Notification.ADD_MANY:
-		// for (Iterator iter = ((Collection)msg.getNewValue()).iterator(); iter
-		// .hasNext();) {
-		// addToUMA((Link) iter.next());
-		// }
-		// break;
-		//
-		// case Notification.REMOVE:
-		// link = (Link) msg.getOldValue();
-		// if(link.getTarget() != null) {
-		// removeFromUMA(link, (Node)msg.getNotifier(), link.getTarget());
-		// }
-		// break;
-		// case Notification.REMOVE_MANY:
-		// for (Iterator iter = ((Collection)msg.getOldValue()).iterator(); iter
-		// .hasNext();) {
-		// link = (Link) iter.next();
-		// if(link.getTarget() != null) {
-		// removeFromUMA(link, (Node)msg.getNotifier(), link.getTarget());
-		// }
-		// }
-		// break;
-		// }
-		// return;
-		// }
-		// }
-		//
-		// });
-		eAdapters().add(new NodeAdapter());
-	}
-	
-	public Class getMethodElementAdapterType() {
-		return null;
-	}
-
-	protected boolean addToUMA(Link link) {
-		if (!super.addToUMA(link))
-			return false;
-
-		if (link.getSource() instanceof WorkBreakdownElementNode) {
-			if (link.getTarget() instanceof TypedNode
-					&& ((TypedNode) link.getTarget()).getType() == TypedNode.SYNCH_BAR) {
-				Collection targetActNodes = new ArrayList();
-				GraphicalDataHelper.getSyncBarTargetNodes((TypedNode) link
-						.getTarget(), targetActNodes);
-				for (Iterator iter = targetActNodes.iterator(); iter.hasNext();) {
-					NamedNodeImpl node = ((NamedNodeImpl) iter.next());
-					if (UmaUtil.findWorkOrder((WorkBreakdownElement) node
-							.getObject(), (WorkBreakdownElement) link
-							.getSource().getObject()) == null) {
-						addDefaultWorkOrder(node, (WorkBreakdownElement) link
-								.getSource().getObject());
-					}
-				}
-			}
-		} else if (link.getSource() instanceof TypedNode) {
-			// Predecessor should be created only in case of
-			// Syncronization Bar, not for DecisionPoint.
-			if (((TypedNode) link.getSource()).getType() == TypedNode.SYNCH_BAR) {
-				Collection srcActNodes = new ArrayList();
-				GraphicalDataHelper.getSyncBarSourceNodes((TypedNode) link
-						.getSource(), srcActNodes);
-				Collection targetActNodes = new ArrayList();
-				GraphicalDataHelper.getSyncBarTargetNodes((TypedNode) link
-						.getTarget(), targetActNodes);
-
-				for (Iterator iter = targetActNodes.iterator(); iter.hasNext();) {
-					NamedNodeImpl node = ((NamedNodeImpl) iter.next());
-					for (Iterator iterator = srcActNodes.iterator(); iterator
-							.hasNext();) {
-						WorkBreakdownElement pred = (WorkBreakdownElement) ((Node) iterator
-								.next()).getObject();
-						if (UmaUtil.findWorkOrder((WorkBreakdownElement) node
-								.getObject(), pred) == null) {
-							addDefaultWorkOrder(node, pred);
-						}
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
-	protected void removeFromUMA(Link link, Node oldSource, Node oldTarget) {
-		TypedNode typedNode = (TypedNode) oldSource;
-		Collection srcActNodes = GraphicalDataHelper.getSourceNodes(typedNode,
-				WorkBreakdownElementNode.class);
-
-		if (oldTarget instanceof WorkBreakdownElementNode) {
-			for (Iterator iterator = srcActNodes.iterator(); iterator.hasNext();) {
-				// Object pred = ((Node) iterator.next()).getObject();
-				// GraphicalDataHelper.removeWorkOrder((NamedNodeImpl)
-				// oldTarget, pred);
-				Node node = (Node) iterator.next();
-				if (GraphicalDataHelper
-						.canRemoveAllPreds(link, node, oldTarget)) {
-					while (UmaUtil.findWorkOrder(
-							(WorkBreakdownElement) oldTarget.getObject(),
-							(WorkBreakdownElement) node.getObject()) != null) {
-						UmaUtil.removeWorkOrder(
-								(WorkBreakdownElement) oldTarget.getObject(),
-								(WorkBreakdownElement) node.getObject());
-					}
-				}
-			}
-		} else if (oldTarget instanceof TypedNode) {
-			Collection targetActNodes = GraphicalDataHelper.getTargetNodes(
-					(TypedNode) oldTarget, WorkBreakdownElementNode.class);
-
-			// remove the work orders of target activities that have the
-			// predecessor in srcActNodes
-			//
-			for (Iterator iter = targetActNodes.iterator(); iter.hasNext();) {
-				NamedNodeImpl node = ((NamedNodeImpl) iter.next());
-				for (Iterator iterator = srcActNodes.iterator(); iterator
-						.hasNext();) {
-					// Object pred = ((Node) iterator.next()).getObject();
-					// GraphicalDataHelper.removeWorkOrder(node, pred);
-					Node prednode = (Node) iterator.next();
-					if (GraphicalDataHelper.canRemoveAllPreds(link, prednode,
-							node)) {
-						while (UmaUtil.findWorkOrder(
-								(WorkBreakdownElement) node.getObject(),
-								(WorkBreakdownElement) prednode.getObject()) != null) {
-							UmaUtil
-									.removeWorkOrder(
-											(WorkBreakdownElement) node
-													.getObject(),
-											(WorkBreakdownElement) prednode
-													.getObject());
-						}
-					}
-				}
-			}
-		}
-
-		super.removeFromUMA(link, oldSource, oldTarget);
-	}
-} // TypedNodeImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/WorkBreakdownElementNodeImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/WorkBreakdownElementNodeImpl.java
deleted file mode 100755
index bc5b7f0..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/WorkBreakdownElementNodeImpl.java
+++ /dev/null
@@ -1,268 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.WorkBreakdownElementNode;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.util.UmaUtil;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Work Breakdown Element Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class WorkBreakdownElementNodeImpl extends NamedNodeImpl implements
-		WorkBreakdownElementNode {
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	protected WorkBreakdownElementNodeImpl() {
-		super();
-
-		methodElementAdapter = new WorkBreakdownElementAdapter();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.WORK_BREAKDOWN_ELEMENT_NODE;
-	}
-
-	private class WorkBreakdownElementAdapter extends MethodElementAdapter {
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification msg) {
-			if (!notificationEnabled)
-				return;
-			notificationEnabled = false;
-			try {
-				WorkOrder obj;
-				switch (msg.getFeatureID(WorkBreakdownElement.class)) {
-				case UmaPackage.WORK_BREAKDOWN_ELEMENT__LINK_TO_PREDECESSOR:
-					switch (msg.getEventType()) {
-					case Notification.ADD:
-						obj = (WorkOrder) msg.getNewValue();
-						addIncomingConnection(obj.getPred());
-						return;
-					case Notification.REMOVE:
-						obj = (WorkOrder) msg.getOldValue();
-						removeIncomingConnection(obj.getPred());
-						return;
-					case Notification.ADD_MANY:
-						Collection collection = (Collection) msg.getNewValue();
-						for (Iterator iter = collection.iterator(); iter
-								.hasNext();) {
-							obj = (WorkOrder) iter.next();
-							addIncomingConnection(obj.getPred());
-						}
-						return;
-					case Notification.REMOVE_MANY:
-						collection = (Collection) msg.getOldValue();
-						for (Iterator iter = collection.iterator(); iter
-								.hasNext();) {
-							obj = (WorkOrder) iter.next();
-							removeIncomingConnection(obj.getPred());
-						}
-						return;
-					}
-					break;
-
-				}
-			} finally {
-				notificationEnabled = true;
-			}
-
-			super.notifyChanged(msg);
-		}
-
-	}
-
-	protected void removeFromUMA(Link link, Node oldSource, Node oldTarget) {
-		if (oldTarget instanceof WorkBreakdownElementNode) {
-			// this is a direct link
-			// remove WorkOrder
-			//
-			// GraphEdge edge = (GraphEdge) link.getObject();
-			// WorkOrder order = (WorkOrder)
-			// ((UMASemanticModelBridge)edge.getSemanticModel()).getElement();
-			// WorkBreakdownElement be = UmaUtil.getOwner(order);
-			// if(be != null) {
-			NamedNodeImpl target = (NamedNodeImpl) oldTarget;
-			boolean notify = target.notificationEnabled;
-			try {
-				target.notificationEnabled = false;
-				// be.getLinkToPredecessor().remove(order);
-				if (GraphicalDataHelper.canRemoveAllPreds(link, oldSource,
-						oldTarget)) {
-					while (UmaUtil.findWorkOrder((WorkBreakdownElement) target
-							.getObject(), oldSource.getObject()) != null) {
-						UmaUtil.removeWorkOrder((WorkBreakdownElement) target
-								.getObject(), oldSource.getObject());
-					}
-				}
-			} finally {
-				target.notificationEnabled = notify;
-			}
-			// }
-		} else if (oldTarget instanceof TypedNode) {
-			// get all the WorkBreakdownElementNodes that this TypedNode are
-			// coming to and
-			// remove the WorkOrders with this WorkBreakdownElementNode's
-			// activity as predecessor from them
-			//
-			Collection actNodes = GraphicalDataHelper.getTargetNodes(
-					(TypedNode) oldTarget, WorkBreakdownElementNode.class);
-			for (Iterator iter = actNodes.iterator(); iter.hasNext();) {
-				NamedNodeImpl node = (NamedNodeImpl) iter.next();
-				WorkBreakdownElement e = (WorkBreakdownElement) node
-						.getObject();
-				boolean notify = node.notificationEnabled;
-				try {
-					node.notificationEnabled = false;
-					if (GraphicalDataHelper.canRemoveAllPreds(link, oldSource,
-							node)) {
-						while (UmaUtil.findWorkOrder(e, oldSource.getObject()) != null) {
-							UmaUtil.removeWorkOrder(e, oldSource.getObject());
-						}
-					}
-				} finally {
-					node.notificationEnabled = notify;
-				}
-			}
-		}
-		// remove graphical data from UMA model
-		//
-		super.removeFromUMA(link, oldSource, oldTarget);
-	}
-
-	/**
-	 * @param link
-	 */
-	protected boolean addToUMA(Link link) {
-		if (!super.addToUMA(link))
-			return false;
-
-		Node src = link.getSource();
-		if (src instanceof WorkBreakdownElementNode) {
-			// this is a direct link
-			// add new WorkOrder object to UMA
-			//
-			WorkOrder order = null;
-			WorkBreakdownElement succ = (WorkBreakdownElement) link.getTarget()
-					.getObject();
-			WorkBreakdownElement pred = (WorkBreakdownElement) src.getObject();
-			if (UmaUtil.findWorkOrder(succ, pred) == null) {
-				NodeImpl sourceNode = ((NodeImpl) src);
-				boolean sourceNotify = sourceNode.notificationEnabled;
-				try {
-					sourceNode.notificationEnabled = false;
-					//UmaUtil.createDefaultWorkOrder(succ, pred);
-					//Create a workorder and disable notification flag.
-					addDefaultWorkOrder((NamedNodeImpl)link.getTarget(), pred);
-				} finally {
-					sourceNode.notificationEnabled = sourceNotify;
-				}
-			}
-
-			// set the WorkOrder as the element of the SemanticModel of the
-			// link's GraphEdge
-			//
-			GraphicalDataHelper.setSemanticModel(link, order);
-		} else if (src instanceof TypedNode) {
-			// get all WorkBreakdownElementNodes that are comming to this
-			// TypedNode, both directly and indirectly
-			// and create work orders with their activity as predecessor
-			//
-
-			// Predecessor should be created only in case of
-			// Syncronization Bar, not for DecisionPoint.
-			if (((TypedNode) src).getType() == TypedNode.SYNCH_BAR) {
-				
-				Collection actNodes = new ArrayList();
-				// Get the collection incoming connection of syncbar 
-				// excluding decisionpoint incoming connection
-				GraphicalDataHelper.getSyncBarSourceNodes((TypedNode)src, actNodes);
-				WorkBreakdownElement succ = (WorkBreakdownElement) link
-						.getTarget().getObject();
-				for (Iterator iter = actNodes.iterator(); iter.hasNext();) {
-					Node node = (Node) iter.next();
-					WorkBreakdownElement pred = (WorkBreakdownElement) node
-							.getObject();
-					if (UmaUtil.findWorkOrder(succ, pred) == null) {
-						NodeImpl sourceNode = ((NodeImpl) node);
-						boolean sourceNotify = sourceNode.notificationEnabled;
-						try {
-							sourceNode.notificationEnabled = false;
-							//UmaUtil.createDefaultWorkOrder(succ, pred);
-							// Create a workorder and disable notification flag.
-							addDefaultWorkOrder((NamedNodeImpl)link.getTarget(),pred);
-						} finally {
-							sourceNode.notificationEnabled = sourceNotify;
-						}
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
-	protected Link addIncomingConnection(MethodElement source) {
-		Link link = super.addIncomingConnection(source);
-		if (link == null)
-			return link;
-
-		WorkOrder workOrder = UmaUtil.findWorkOrder(
-				(WorkBreakdownElement) getObject(), source);
-		GraphicalDataHelper.setSemanticModel(link, workOrder);
-
-		return link;
-	}
-
-	protected Link addOutgoingConnection(MethodElement target) {
-		Link link = super.addOutgoingConnection(target);
-
-		WorkOrder workOrder = UmaUtil.findWorkOrder(
-				(WorkBreakdownElement) target, getObject());
-		GraphicalDataHelper.setSemanticModel(link, workOrder);
-
-		return link;
-	}
-
-} // WorkBreakdownElementNodeImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/WorkProductCompositeImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/WorkProductCompositeImpl.java
deleted file mode 100755
index d95d08e..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/WorkProductCompositeImpl.java
+++ /dev/null
@@ -1,507 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.WorkProductComposite;
-import org.eclipse.epf.diagram.model.WorkProductDescriptorNode;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.util.ConfigurableComposedAdapterFactory;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UMASemanticModelBridge;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Work Product Composite</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.WorkProductCompositeImpl#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkProductCompositeImpl extends NodeContainerImpl implements
-		WorkProductComposite {
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int TYPE_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected int type = TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkProductCompositeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.WORK_PRODUCT_COMPOSITE;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(int newType) {
-		int oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.WORK_PRODUCT_COMPOSITE__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.WORK_PRODUCT_COMPOSITE__TYPE:
-				return new Integer(getType());
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.WORK_PRODUCT_COMPOSITE__TYPE:
-				setType(((Integer)newValue).intValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.WORK_PRODUCT_COMPOSITE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.WORK_PRODUCT_COMPOSITE__TYPE:
-				return type != TYPE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (type: ");
-		result.append(type);
-		result.append(')');
-		return result.toString();
-	}
-
-	private class TaskDescriptorAdapter extends TransactionalNodeLink {
-		protected void handleNotification(Notification msg) {
-			switch (msg.getFeatureID(TaskDescriptor.class)) {
-			case UmaPackage.TASK_DESCRIPTOR__OUTPUT:
-				switch (msg.getEventType()) {
-				case Notification.ADD:
-					Object obj = msg.getNewValue();
-					if (obj != null && type == WorkProductComposite.OUTPUTS) {
-						addNode(obj);
-					}
-					return;
-				case Notification.REMOVE:
-					obj = msg.getOldValue();
-					if (obj != null && type == WorkProductComposite.OUTPUTS) {
-						removeNode(obj);
-					}
-					return;
-				}
-				break;
-			case UmaPackage.TASK_DESCRIPTOR__MANDATORY_INPUT:
-				switch (msg.getEventType()) {
-				case Notification.ADD:
-					Object obj = msg.getNewValue();
-					if (obj != null && type == WorkProductComposite.INPUTS) {
-						addNode(obj);
-					}
-					return;
-				case Notification.REMOVE:
-					obj = msg.getOldValue();
-					if (obj != null && type == WorkProductComposite.INPUTS) {
-						removeNode(obj);
-					}
-					return;
-				}
-				break;
-			}
-		}
-		
-	}
-
-	private IFilter getFilter() {
-		DiagramImpl diagram = (DiagramImpl) getDiagram();
-		if (diagram.filter == null) {
-			ConfigurableComposedAdapterFactory adapterFactory = (ConfigurableComposedAdapterFactory) TngAdapterFactory.INSTANCE
-					.getPBS_ComposedAdapterFactory();
-			return adapterFactory.getFilter();
-		} else {
-			return diagram.filter;
-		}
-	}
-	public void setObject(Object newObject) {
-		
-		super.setObject(newObject);
-		populateNodes(newObject);
-		
-	}
-
-	protected void basicSetObject(Object newObject) {
-
-		super.basicSetObject(newObject);
-		
-		if(isGraphicalDataRequired()) {
-			// Set the Type information for workproduct composite.
-			if (type == TYPE_EDEFAULT) {
-				List list = graphNode.getList(UmaPackage.GRAPH_NODE__PROPERTY);
-				Property property = GraphicalDataHelper.getPropertyByKey(list,
-						GraphicalDataHelper.PROP_WORK_PRODUCT_COMPOSITE_TYPE);
-				if (property != null) {
-					property.setValue(property.getValue());
-					list.add(property);
-				}
-			} else {
-				List list = graphNode.getList(UmaPackage.GRAPH_NODE__PROPERTY);
-				Property property = GraphicalDataHelper.getPropertyByKey(list,
-						GraphicalDataHelper.PROP_WORK_PRODUCT_COMPOSITE_TYPE);
-				if (property != null) {
-					property.setValue(new Integer(getType()).toString());
-					list.add(property);
-				}
-			}
-		}
-	}
-	
-	private WorkProductDescriptorNode createWorkProductDescriptorNode(WorkProductDescriptor wpd) {
-		WorkProductDescriptorNode wpdNode = null;
-		for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-			Node node = (Node) iter.next();
-			if(node instanceof WorkProductDescriptorNode && node.getLinkedElement() == wpd) {
-				wpdNode = (WorkProductDescriptorNode) node;
-			}
-		}
-		if(wpdNode == null) {
-			wpdNode = ModelFactory.eINSTANCE.createWorkProductDescriptorNode();
-			wpdNode.setDiagram(getDiagram());
-		}
-		wpdNode.setObject(wpd);
-		return wpdNode;
-	}
-	
-	public void populateNodes(Object newObject){
-		if (newObject instanceof TaskDescriptor) {
-			List wplist = new ArrayList();
-			if (getType() == WorkProductComposite.INPUTS) {
-				if (!((TaskDescriptor) newObject).getMandatoryInput().isEmpty())
-					wplist.addAll(((TaskDescriptor) newObject)
-							.getMandatoryInput());
-			} else {
-				if (!((TaskDescriptor) newObject).getOutput().isEmpty())
-					wplist.addAll(((TaskDescriptor) newObject).getOutput());
-			}
-
-			IFilter filter = getFilter();
-			Collection allElements = ((ActivityDetailDiagramImpl) getDiagram())
-					.getAllBreakdownElements();
-			ArrayList nodes = new ArrayList();
-//			for (Iterator iter = wplist.iterator(); iter.hasNext();) {
-//				WorkProductDescriptor wpDescriptor = (WorkProductDescriptor) iter
-//						.next();
-//				if (filter == null || filter.accept(wpDescriptor)) {
-//					Node node = GraphicalDataHelper.findNode(this,
-//							wpDescriptor);
-//					if (node == null) {
-//						node = createWorkProductDescriptorNode(wpDescriptor);
-//						((NamedNodeImpl) node).setItemProvider(allElements);
-//					}
-//					nodes.add(node);
-//				}
-//			}
-			for (Iterator iterator = allElements.iterator(); iterator
-			.hasNext();) {
-				Object object = iterator.next();
-				Object wpDescriptor = TngUtil.unwrap(object);
-				if(wpDescriptor instanceof WorkProductDescriptor){
-					if(TngUtil.contains(wplist, wpDescriptor)){
-						if (filter == null || filter.accept(wpDescriptor)) {
-							Node node = GraphicalDataHelper.findNode(this,
-									wpDescriptor);
-							if (node == null) {
-								node = createWorkProductDescriptorNode((WorkProductDescriptor)wpDescriptor);
-								((NamedNodeImpl) node).setItemProvider(allElements);
-							}
-							nodes.add(node);
-						}
-					}
-					
-				}
-			}
-			selectNodes(nodes);
-		}
-	}
-	
-	public void addNode(Collection collection) {
-		Collection nodes = new ArrayList();
-		for (Iterator iter = collection.iterator(); iter.hasNext();) {
-			WorkProductDescriptor descriptor = (WorkProductDescriptor) iter
-					.next();
-			addNode(nodes, descriptor);
-		}
-
-		getNodes().addAll(nodes);
-	}
-
-	public void removeNode(Object oldValue) {
-		Collection removedNodes = new HashSet();
-		if (oldValue instanceof TaskDescriptor) {
-			Node node = findNode((ActivityDetailDiagram) getDiagram(),
-					getObject());
-			getDiagram().getNodes().remove(node);
-		}
-		for (Iterator iter = nodes.iterator(); iter.hasNext();) {
-			Node node = (Node) iter.next();
-			if (node.getObject() == oldValue) {
-				iter.remove();
-				removedNodes.add(node);
-			}
-		}
-		// pushBackToDiagram(removedNodes);
-	}
-
-	public void addNode(Object descriptor) {
-		addNode(getNodes(), descriptor);
-	}
-
-	private void addNode(Collection nodes, Object descriptor) {
-		
-		if (descriptor instanceof TaskDescriptor) {
-			Node node = findNode((ActivityDetailDiagram) getDiagram(),
-					descriptor);
-			if (node == null) {
-				node = ((ActivityDetailDiagramImpl) getDiagram())
-						.createWorkProductComposite(
-								(TaskDescriptor) descriptor, this.type);
-				getDiagram().getNodes().add(node);
-			}
-		}
-		if(descriptor instanceof WorkProductDescriptor){
-			ActivityDetailDiagramImpl diagram = (ActivityDetailDiagramImpl) getDiagram();
-			Node node = GraphicalDataHelper.findNode(this ,
-					descriptor);
-			if (node == null) {
-				if (descriptor instanceof WorkProductDescriptor){
-					node = diagram.createNode((WorkProductDescriptor) descriptor);
-				}
-				nodes.add(node);
-			}
-		}
-	}
-
-	/**
-	 * @param oldValue
-	 */
-//	private void removeNode(Collection elements) {
-//		Collection nodes = new ArrayList();
-//		for (Iterator iter = nodes.iterator(); iter.hasNext();) {
-//			Node node = (Node) iter.next();
-//			if (elements.contains(node.getObject())) {
-//				nodes.add(node);
-//			}
-//		}
-//		getNodes().removeAll(nodes);
-//		pushBackToDiagram(nodes);
-//	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.NodeImpl#getMethodElementAdapterType()
-	 */
-	public Class getMethodElementAdapterType() {
-		return TaskDescriptorAdapter.class;
-	}
-
-	public Point getLocation() {
-		if (getType() == WorkProductComposite.INPUTS) {
-			return super.getLocation();
-		}
-		if (getType() == WorkProductComposite.OUTPUTS) {
-			return super.getLocation();
-		} else {
-			return new Point(-1, -1);
-		}
-	}
-
-	public GraphNode getGraphNode(MethodElement methodElement) {
-		if(isGraphicalDataRequired()) {
-			if (getUMADiagram() == null) {
-				// new MethodElement
-				//
-				return createGraphNode(methodElement);
-			}
-			GraphNode node = findGraphNode(getUMADiagram(), methodElement);
-			if (node == null) {
-				node = createGraphNode(methodElement);
-				// createGraphConnectors(node, getUMADiagram());
-				getUMADiagram().getContained().add(node);
-			}
-			return node;
-		}
-		return null;
-	}
-
-	public GraphNode findGraphNode(Diagram diagram, Object methodElement) {
-		for (Iterator iter = diagram.getContained().iterator(); iter.hasNext();) {
-			GraphNode element = (GraphNode) iter.next();
-			if (element.getSemanticModel() instanceof UMASemanticModelBridge
-					&& methodElement == ((UMASemanticModelBridge) element
-							.getSemanticModel()).getElement()) {
-
-				List list = element.getList(UmaPackage.GRAPH_NODE__PROPERTY);
-				Property property = GraphicalDataHelper.getPropertyByKey(list,
-						GraphicalDataHelper.PROP_WORK_PRODUCT_COMPOSITE_TYPE);
-				if (property != null) {
-					String typeString = property.getValue();
-					if (typeString != null) {
-						if (getType() == new Integer(typeString).intValue())
-							return element;
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	private GraphNode createGraphNode(MethodElement element) {
-		GraphNode graphNode = UmaFactory.eINSTANCE.createGraphNode();
-		UMASemanticModelBridge modelBridge = UmaFactory.eINSTANCE
-				.createUMASemanticModelBridge();
-		modelBridge.setElement(element);
-		graphNode.setSemanticModel(modelBridge);
-		org.eclipse.epf.uma.Point point = UmaFactory.eINSTANCE.createPoint();
-		point.setX(new Double(-1));
-		point.setY(new Double(-1));
-		graphNode.setPosition(point);
-		org.eclipse.epf.uma.Dimension dim = UmaFactory.eINSTANCE.createDimension();
-		dim.setWidth(new Double(-1));
-		dim.setHeight(new Double(-1));
-		graphNode.setSize(dim);
-
-		// For setting type of WorkProductComposite
-		Property property = UmaFactory.eINSTANCE.createProperty();
-		property.setKey(GraphicalDataHelper.PROP_WORK_PRODUCT_COMPOSITE_TYPE);
-		property.setValue(new Integer(getType()).toString()); //$NON-NLS-1$
-		List list = new ArrayList();
-		list.add(property);
-		graphNode.set(UmaPackage.GRAPH_NODE__PROPERTY, list);
-		return graphNode;
-	}
-
-	public Node findNode(ActivityDetailDiagram diagram, Object object) {
-		for (Iterator iter = diagram.getNodes().iterator(); iter.hasNext();) {
-			Node element = (Node) iter.next();
-			if (object == element.getObject()
-					&& element instanceof WorkProductComposite) {
-				if (((WorkProductComposite) element).getType() == this.type)
-					return element;
-			}
-		}
-		return null;
-	}
-	
-	@Override
-	protected Object getMethodElementAdapter() {
-		if(methodElementAdapter == null) {
-			methodElementAdapter = new TaskDescriptorAdapter();
-		}
-		return methodElementAdapter;
-	}
-} // WorkProductCompositeImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/WorkProductDependencyDiagramImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/WorkProductDependencyDiagramImpl.java
deleted file mode 100755
index 0bb4d75..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/WorkProductDependencyDiagramImpl.java
+++ /dev/null
@@ -1,266 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.WorkProductDependencyDiagram;
-import org.eclipse.epf.diagram.model.WorkProductNode;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.diagram.model.util.IAdapterFactoryFilter;
-import org.eclipse.epf.diagram.model.util.IWPDDiagramChangeListener;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Artifact;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.Deliverable;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Outcome;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Work Product Dependency Diagram</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class WorkProductDependencyDiagramImpl extends DiagramImpl implements
-		WorkProductDependencyDiagram {
-	private class WPDDiagramChangeListener extends ActivityAdapter implements
-			IWPDDiagramChangeListener {
-
-	};
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	protected WorkProductDependencyDiagramImpl() {
-		super();
-
-		diagramChangeListener = new WPDDiagramChangeListener();
-	}
-
-	protected Class getDiagramChangeListenerType() {
-		return IWPDDiagramChangeListener.class;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.WORK_PRODUCT_DEPENDENCY_DIAGRAM;
-	}
-
-	private static final AdapterFactory[] DEFAULT_ADAPTER_FACTORIES = {			
-		TngAdapterFactory.INSTANCE.getPBS_ComposedAdapterFactory() 
-	}; 
-
-	//
-	// Start custom code
-	//
-	public Collection getChildren() {
-		ITreeItemContentProvider adapter = null;
-		AdapterFactory adapterFactory = null;
-		if (wrapper != null) {
-			//https://bugs.eclipse.org/bugs/show_bug.cgi?id=147552
-			List wrappers = ProcessUtil.getWrappers(wrapper, DEFAULT_ADAPTER_FACTORIES);
-			if(wrappers != null && wrappers.size() > 0){
-				adapter = (ITreeItemContentProvider)wrappers.get(0);
-			}
-		} else {
-			if (filter == null) {
-				adapter = (ITreeItemContentProvider) TngAdapterFactory.INSTANCE
-						.getPBS_ComposedAdapterFactory().adapt(getObject(),
-								ITreeItemContentProvider.class);
-			} else if (filter instanceof IAdapterFactoryFilter) {
-				adapterFactory = ((IAdapterFactoryFilter) filter)
-						.getWPBSAdapterFactory();
-				adapter = (ITreeItemContentProvider) adapterFactory.adapt(
-						getObject(), ITreeItemContentProvider.class);
-			}
-		}
-		if (adapter != null) {
-			// return adapter.getChildren(getObject());
-			// commented above line, For diagrams - rollup should be false, for
-			// handling rollup state below code.
-			List children = new ArrayList();
-			extractChildren(adapter, getObject(), children);
-			return children;
-		} else {
-			return Collections.EMPTY_LIST;
-		}
-	}
-
-	protected void populateNodes() {
-		// Activity act = (Activity) getObject();
-
-		// get all WorkProductDescriptors under the activity
-		//
-		super.populateNodes();
-		// ITreeItemContentProvider adapter = (ITreeItemContentProvider)
-		// TngAdapterFactory.INSTANCE.getPBS_ComposedAdapterFactory().adapt(act,
-		// ITreeItemContentProvider.class);
-
-		// ArrayList wpDescriptors = new ArrayList();
-		ArrayList nodes = new ArrayList();
-		for (Iterator iter = getChildren().iterator(); iter.hasNext();) {
-			Object e = iter.next();
-			Object element = TngUtil.unwrap(e);
-			if (element instanceof WorkProductDescriptor) {
-				WorkProductNode node = (WorkProductNode) GraphicalDataHelper.findNode(this, element);
-				if(node == null) {
-					node = (WorkProductNode) toNode((MethodElement) element);
-				}
-				if (e instanceof BreakdownElementWrapperItemProvider) {
-					BreakdownElementWrapperItemProvider wrapper = (BreakdownElementWrapperItemProvider) e;
-					if (wrapper.isReadOnly()) {
-						((NamedNodeImpl) node).itemProvider = wrapper;
-						node.setReadOnly(true);
-					}
-				}
-				if (((WorkProductDescriptor) element).getWorkProduct() instanceof Artifact) {
-					node.setType(1);
-				}
-				if (((WorkProductDescriptor) element).getWorkProduct() instanceof Deliverable) {
-					node.setType(2);
-				}
-				if (((WorkProductDescriptor) element).getWorkProduct() instanceof Outcome) {
-					node.setType(3);
-				}
-				nodes.add(node);
-			}
-		}
-		selectNodes(nodes);
-	}
-	protected Node toNode(MethodElement e) {
-		if(e instanceof WorkProductDescriptor){
-			return super.toNode(e);
-		}
-		return null;
-	}
-
-	protected Node newNode() {
-		return ModelFactory.eINSTANCE.createWorkProductNode();
-	}
-
-	protected int getType() {
-		return GraphicalDataHelper.WORK_PRODUCT_DEPENDENCY_DIAGRAM;
-	}
-
-	protected Class getBreakdownElementType() {
-		return WorkProductDescriptor.class;
-	}
-
-	protected void addToUmaModel(int position, Node addedNode) {		
-		if (addedNode.getObject() instanceof BreakdownElement) {
-			((Activity) getObject()).getBreakdownElements().add(
-					addedNode.getObject());
-		}
-		super.addToUmaModel(position, addedNode);
-	}
-	
-	@Override
-	protected void nodeAdded(int index, Node node) {
-		if(node.getObject() == null) {
-			if(node instanceof WorkProductNode) {
-				node.setObject(UmaFactory.eINSTANCE.createWorkProductDescriptor());
-			}
-		}
-		super.nodeAdded(index, node);
-	}
-	@Override
-	protected void populateLinks() {
-		super.populateLinks();
-		
-		// Clean up un-used the links.
-		for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-			Node node = ((Node) iter.next());
-			ArrayList<Link> linksToRemove = new ArrayList<Link>();
-			for (Iterator iterator = node
-					.getIncomingConnections().iterator(); iterator.hasNext();) {
-				Link link = (Link) iterator.next();
-				if (!isValid(link)) {
-					linksToRemove.add(link);
-				}
-			}
-			for (Iterator iterator = linksToRemove.iterator(); iterator
-					.hasNext();) {
-				Link link = (Link) iterator.next();
-				GraphicalDataHelper.removeLink(link);
-			}
-			linksToRemove.clear();
-			linksToRemove = null;
-		}
-		// Refresh links based on model info.
-		for(Iterator iter = getNodes().iterator(); iter.hasNext();){
-			Node node = ((Node)iter.next());
-			WorkProductDescriptor wbe = null;
-			wbe = (WorkProductDescriptor) node.getObject();
-			if(wbe != null){
-				List impactedBy = ((WorkProductDescriptor)wbe).getImpactedBy();
-				if(!impactedBy.isEmpty()){
-					for(Iterator iter1 = impactedBy.iterator(); iter1.hasNext();){
-						WorkProductDescriptor source = (WorkProductDescriptor)iter1.next();
-						Link link = findLink(node, source);
-						if(link == null){
-							NamedNodeImpl nodeImpl = ((NamedNodeImpl) node);
-							boolean oldNotify = nodeImpl.notificationEnabled;
-							try {
-								nodeImpl.notificationEnabled = false;
-								nodeImpl.addIncomingConnection(source); 
-							} finally {
-								nodeImpl.notificationEnabled = oldNotify;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private boolean isValid(Link link) {
-		if (link.getSource() == null || link.getTarget() == null
-				|| !getNodes().contains(link.getSource())
-				|| !getNodes().contains(link.getTarget())) {
-			return false;
-		}
-		return true;
-	}
-	
-	public Link findLink(Node target, Object sourceLinkedElement) {
-		for (Iterator iter = target.getIncomingConnections().iterator(); iter.hasNext();) {
-			Link link = (Link) iter.next();
-			Node source = link.getSource();
-			if(source.getLinkedElement() == sourceLinkedElement) {
-				return link;
-			}
-		}
-		return null;
-	}
-} // WorkProductDependencyDiagramImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/WorkProductDescriptorNodeImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/WorkProductDescriptorNodeImpl.java
deleted file mode 100755
index c14df57..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/WorkProductDescriptorNodeImpl.java
+++ /dev/null
@@ -1,172 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.WorkProductDescriptorNode;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Work Product Descriptor Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class WorkProductDescriptorNodeImpl extends NamedNodeImpl implements
-		WorkProductDescriptorNode {
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	protected WorkProductDescriptorNodeImpl() {
-		super();
-
-		methodElementAdapter = new WorkProductDescriptorAdapter();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.WORK_PRODUCT_DESCRIPTOR_NODE;
-	}
-
-	private class WorkProductDescriptorAdapter extends MethodElementAdapter {
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.epf.diagram.model.impl.NamedNodeImpl.MethodElementAdapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification msg) {
-			if (!notificationEnabled)
-				return;
-			notificationEnabled = false;
-
-			try {
-				switch (msg.getFeatureID(WorkProductDescriptor.class)) {
-				case UmaPackage.WORK_PRODUCT__SUPPRESSED:
-					switch (msg.getEventType()) {
-					case Notification.SET:
-						Boolean b = (Boolean)msg.getNewValue();
-						// TODO: implement handling suppress.
-					}
-				}
-				super.notifyChanged(msg);
-			} finally {
-				notificationEnabled = true;
-			}
-
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.epf.diagram.model.impl.NamedNodeImpl.MethodElementAdapter#getNode()
-		 */
-		public Node getNode() {
-			return WorkProductDescriptorNodeImpl.this;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.NamedNodeImpl#findNode(org.eclipse.epf.uma.MethodElement)
-	 */
-	protected Node findNode(MethodElement linkedElement) {
-		return GraphicalDataHelper.findNode(
-				(ActivityDetailDiagram) getDiagram(), linkedElement);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.NodeImpl#getMethodElementAdapterType()
-	 */
-	public Class getMethodElementAdapterType() {
-		return WorkProductDescriptorAdapter.class;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.NodeImpl#addToUMA(org.eclipse.epf.diagram.model.Link)
-	 */
-	protected boolean addToUMA(Link link) {
-		if (!super.addToUMA(link))
-			return false;
-
-		WorkProductDescriptor wpd = (WorkProductDescriptor) getObject();
-
-		// disable notification of source node before changing the UMA object
-		// associated with it
-		// so it will not create duplicate links
-		//
-		NodeImpl nodeImpl = (NodeImpl) link.getSource();
-		boolean notify = nodeImpl.notificationEnabled;
-		boolean notifyTarget = notificationEnabled;
-		try {
-			nodeImpl.notificationEnabled = false;
-			notificationEnabled = false;
-//			wpd.getOutputFrom().add(link.getSource().getObject());
-			TaskDescriptor taskDesc = (TaskDescriptor) link.getSource().getObject();
-			if(taskDesc != null) {
-				taskDesc.getOutput().add(wpd);
-			}
-		} finally {
-			nodeImpl.notificationEnabled = notify;
-			notificationEnabled = notifyTarget;
-		}
-
-		// TaskDescriptor td = (TaskDescriptor) link.getSource().getObject();
-		// td.getOutput().add(getObject());
-
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.diagram.model.impl.NodeImpl#removeFromUMA(org.eclipse.epf.diagram.model.Link,
-	 *      org.eclipse.epf.diagram.model.Node, org.eclipse.epf.diagram.model.Node)
-	 */
-	protected void removeFromUMA(Link link, Node oldSource, Node oldTarget) {
-		WorkProductDescriptor wpd = (WorkProductDescriptor) getObject();
-//		wpd.getMandatoryInputTo().remove(oldTarget.getObject());
-		TaskDescriptor taskDesc = (TaskDescriptor) oldTarget.getObject();
-		if(taskDesc != null) {
-			taskDesc.getMandatoryInput().remove(wpd);
-		}
-
-		super.removeFromUMA(link, oldSource, oldTarget);
-	}
-} // WorkProductDescriptorNodeImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/WorkProductNodeImpl.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/WorkProductNodeImpl.java
deleted file mode 100755
index f515752..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/WorkProductNodeImpl.java
+++ /dev/null
@@ -1,308 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.WorkProductNode;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Work Product Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.diagram.model.impl.WorkProductNodeImpl#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkProductNodeImpl extends NamedNodeImpl implements
-		WorkProductNode {
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int TYPE_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected int type = TYPE_EDEFAULT;
-
-	private class WorkProductDescriptorAdapter extends MethodElementAdapter {
-
-		public Node getNode() {
-			return WorkProductNodeImpl.this;
-		}
-
-		public void notifyChanged(Notification msg) {
-			if (!notificationEnabled)
-				return;
-			notificationEnabled = false;
-
-			try {
-				switch (msg.getFeatureID(WorkProductDescriptor.class)) {
-				case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY:
-					MethodElement obj;
-					switch (msg.getEventType()) {
-					case Notification.ADD:
-						obj = (MethodElement) msg.getNewValue();
-						addIncomingConnection(obj);
-						return;
-					case Notification.REMOVE:
-						obj = (MethodElement) msg.getOldValue();
-						removeIncomingConnection(obj);
-						return;
-					case Notification.ADD_MANY:
-						Collection collection = (Collection) msg.getNewValue();
-						for (Iterator iter = collection.iterator(); iter
-								.hasNext();) {
-							obj = (MethodElement) iter.next();
-							addIncomingConnection(obj);
-						}
-						return;
-					case Notification.REMOVE_MANY:
-						collection = (Collection) msg.getOldValue();
-						for (Iterator iter = collection.iterator(); iter
-								.hasNext();) {
-							obj = (MethodElement) iter.next();
-							removeIncomingConnection(obj);
-						}
-						return;
-					}
-				case UmaPackage.WORK_PRODUCT__SUPPRESSED:
-					switch (msg.getEventType()) {
-					case Notification.SET:
-						Boolean b = (Boolean)msg.getNewValue();
-						if(b.booleanValue()==true){
-							removeLinks();
-						}
-					}
-				}
-				super.notifyChanged(msg);
-			} finally {
-				notificationEnabled = true;
-			}
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 */
-	protected WorkProductNodeImpl() {
-		super();
-
-		methodElementAdapter = new WorkProductDescriptorAdapter();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.WORK_PRODUCT_NODE;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(int newType) {
-		int oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.WORK_PRODUCT_NODE__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.WORK_PRODUCT_NODE__TYPE:
-				return new Integer(getType());
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.WORK_PRODUCT_NODE__TYPE:
-				setType(((Integer)newValue).intValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.WORK_PRODUCT_NODE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.WORK_PRODUCT_NODE__TYPE:
-				return type != TYPE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (type: ");
-		result.append(type);
-		result.append(')');
-		return result.toString();
-	}
-
-	protected boolean addToUMA(Link link) {
-		if (!super.addToUMA(link))
-			return false;
-
-		WorkProductDescriptor descriptor = (WorkProductDescriptor) link
-				.getSource().getObject();
-
-		NodeImpl source = (NodeImpl) link.getSource();
-		NodeImpl target = (NodeImpl) link.getTarget();
-		boolean notifySource = source.notificationEnabled;
-		boolean notifyTarget = target.notificationEnabled;
-		try {
-			source.notificationEnabled = target.notificationEnabled = false;
-			descriptor.getImpacts().add(link.getTarget().getObject());
-		} finally {
-			source.notificationEnabled = notifySource;
-			target.notificationEnabled = notifyTarget;
-		}
-
-		return true;
-	}
-
-	protected void removeFromUMA(Link link, Node oldSource, Node oldTarget) {
-		WorkProductDescriptor descriptor = (WorkProductDescriptor) oldTarget
-				.getObject();
-		// disable internal notification of the target node before removing its
-		// descriptor from the dependency list
-		//
-		NamedNodeImpl nodeImpl = (NamedNodeImpl) oldSource;
-		boolean notify = nodeImpl.notificationEnabled;
-		try {
-			nodeImpl.notificationEnabled = false;
-			descriptor.getImpactedBy().remove(nodeImpl.getObject());
-		} finally {
-			nodeImpl.notificationEnabled = notify;
-		}
-
-		super.removeFromUMA(link, oldSource, oldTarget);
-	}
-
-	protected void removeLinks() {
-		for (Iterator iter = getIncomingConnections().iterator(); iter
-				.hasNext();) {
-			Link link = (Link) iter.next();
-			if (link.getSource() != null) {
-				GraphicalDataHelper.removeGraphicalData(link);
-				// disable internal notification of the source node
-				//
-				NodeImpl sourceNode = (NodeImpl) link.getSource();
-				boolean oldNotify = sourceNode.notificationEnabled;
-				try {
-					sourceNode.notificationEnabled = false;
-					link.setSource(null);
-				} finally {
-					sourceNode.notificationEnabled = oldNotify;
-				}
-				//link.setTarget(null);
-				link.setObject(null);
-			}
-		}
-
-		for (Iterator iter = getOutgoingConnections().iterator(); iter
-				.hasNext();) {
-			Link link = (Link) iter.next();
-			if (link.getTarget() != null) {
-				GraphicalDataHelper.removeGraphicalData(link);
-				// disable internal notification of the source node
-				//
-				NodeImpl targetNode = (NodeImpl) link.getTarget();
-				boolean oldNotify = targetNode.notificationEnabled;
-				try {
-					targetNode.notificationEnabled = false;
-					link.setTarget(null);
-				} finally {
-					targetNode.notificationEnabled = oldNotify;
-				}
-				//link.setSource(null);
-				link.setObject(null);
-			}
-		}
-	}
-} // WorkProductNodeImpl
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/package.html b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/package.html
deleted file mode 100755
index 3b1df16..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/impl/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the implementation for the activity diagram model objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/package.html b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/package.html
deleted file mode 100755
index c69d95e..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces for the activity diagram model objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/DiagramInfo.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/DiagramInfo.java
deleted file mode 100755
index 1027058..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/DiagramInfo.java
+++ /dev/null
@@ -1,350 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.util;
-
-import java.util.Iterator;
-
-import org.eclipse.epf.library.edit.util.ConstraintManager;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Constraint;
-import org.eclipse.epf.uma.SupportingMaterial;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * This class stores diagram publish options and references to user-specified
- * diagrams to replace the activity diagram, activity detail diagram, or work
- * product dependency diagram for an activity.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class DiagramInfo {
-	private static final String AD_IMAGE_URI = "ad_image_uri";
-
-	private static final String ADD_IMAGE_URI = "add_image_uri";
-
-	private static final String WPD_IMAGE_URI = "wpd_image_uri";
-
-	private static final String PUBLISH_AD_IMAGE = "publish_ad_image";
-
-	private static final String PUBLISH_ADD_IMAGE = "publish_add_image";
-
-	private static final String PUBLISH_WPD_IMAGE = "publish_wpd_image";
-
-	private static final String DELIMITER = "|"; //$NON-NLS-1$
-
-	private Activity activity;
-
-	private String AD_ImageURI;
-
-	private String ADD_ImageURI;
-
-	private String WPD_ImageURI;
-
-	private boolean publishADImage;
-
-	private boolean publishADDImage;
-
-	private boolean publishWPDImage;
-
-	private Constraint constraint;
-
-	private SupportingMaterial activityDiagram;
-
-	private SupportingMaterial activityDetailDiagram;
-
-	private SupportingMaterial wpdDiagram;
-
-	/**
-	 * Constructs and loads a DiagramInfo instance for a given activity
-	 * 
-	 * @param activity
-	 */
-	public DiagramInfo(Activity activity) {
-		this.activity = activity;
-		refresh();
-	}
-
-	private DiagramInfo() {
-		AD_ImageURI = ADD_ImageURI = WPD_ImageURI = ""; //$NON-NLS-1$
-	}
-
-	private DiagramInfo load() {
-		DiagramInfo info = new DiagramInfo();
-		for (StringTokenizer tokens = new StringTokenizer(constraint.getBody(),
-				DELIMITER); tokens.hasMoreTokens();) {
-			String token = tokens.nextToken();
-			int id = token.indexOf('=');
-			int max = token.length() - 1;
-			if (id != -1 && id < max) {
-				String key = token.substring(0, id);
-				if (key.equalsIgnoreCase(AD_IMAGE_URI)) {
-					info.AD_ImageURI = token.substring(id + 1);
-				} else if (key.equalsIgnoreCase(ADD_IMAGE_URI)) {
-					info.ADD_ImageURI = token.substring(id + 1);
-				} else if (key.equalsIgnoreCase(WPD_IMAGE_URI)) {
-					info.WPD_ImageURI = token.substring(id + 1);
-				} else if (key.equalsIgnoreCase(PUBLISH_AD_IMAGE)) {
-					info.publishADImage = Boolean.valueOf(
-							token.substring(id + 1)).booleanValue();
-				} else if (key.equalsIgnoreCase(PUBLISH_ADD_IMAGE)) {
-					info.publishADDImage = Boolean.valueOf(
-							token.substring(id + 1)).booleanValue();
-				} else if (key.equalsIgnoreCase(PUBLISH_WPD_IMAGE)) {
-					info.publishWPDImage = Boolean.valueOf(
-							token.substring(id + 1)).booleanValue();
-				}
-			}
-		}
-		return info;
-	}
-
-	private void save() {
-		if (constraint == null) {
-			constraint = ConstraintManager.getConstraint(activity,
-					ConstraintManager.ACITIVY_DIAGRAM, true);
-		}
-		if (activityDiagram != null) {
-			AD_ImageURI = activityDiagram.getGuid();
-		}
-		if (activityDetailDiagram != null) {
-			ADD_ImageURI = activityDetailDiagram.getGuid();
-		}
-		if (wpdDiagram != null) {
-			WPD_ImageURI = wpdDiagram.getGuid();
-		}
-
-		DiagramInfo info = load();
-
-		if (AD_ImageURI != null) {
-			info.AD_ImageURI = AD_ImageURI;
-		}
-		if (ADD_ImageURI != null) {
-			info.ADD_ImageURI = ADD_ImageURI;
-		}
-		if (WPD_ImageURI != null) {
-			info.WPD_ImageURI = WPD_ImageURI;
-		}
-		info.publishADImage = publishADImage;
-		info.publishADDImage = publishADDImage;
-		info.publishWPDImage = publishWPDImage;
-
-		String str = new StringBuffer(AD_IMAGE_URI).append('=').append(
-				info.AD_ImageURI).append(DELIMITER).append(PUBLISH_AD_IMAGE)
-				.append('=').append(String.valueOf(info.publishADImage))
-				.append(DELIMITER).append(ADD_IMAGE_URI).append('=').append(
-						String.valueOf(info.ADD_ImageURI)).append(DELIMITER)
-				.append(PUBLISH_ADD_IMAGE).append('=').append(
-						String.valueOf(info.publishADDImage)).append(DELIMITER)
-				.append(WPD_IMAGE_URI).append('=').append(
-						String.valueOf(info.WPD_ImageURI)).append(DELIMITER)
-				.append(PUBLISH_WPD_IMAGE).append('=').append(
-						String.valueOf(info.publishWPDImage)).toString();
-
-		constraint.setBody(str);
-	}
-
-	/**
-	 * Refreshes this DiagramInfo object from the model
-	 * 
-	 */
-	public void refresh() {
-		constraint = ConstraintManager.getConstraint(activity,
-				ConstraintManager.ACITIVY_DIAGRAM, false);
-		if (constraint == null) {
-			return;
-		}
-
-		DiagramInfo info = load();
-
-		AD_ImageURI = info.AD_ImageURI;
-		ADD_ImageURI = info.ADD_ImageURI;
-		WPD_ImageURI = info.WPD_ImageURI;
-		publishADImage = info.publishADImage;
-		publishADDImage = info.publishADDImage;
-		publishWPDImage = info.publishWPDImage;
-
-		activityDiagram = getSupportingMaterial(AD_ImageURI);
-		activityDetailDiagram = getSupportingMaterial(ADD_ImageURI);
-		wpdDiagram = getSupportingMaterial(WPD_ImageURI);
-	}
-
-	public String getAD_ImageURI() {
-		return AD_ImageURI;
-	}
-
-	public String getADD_ImageURI() {
-		return ADD_ImageURI;
-	}
-
-	public String getWPD_ImageURI() {
-		return WPD_ImageURI;
-	}
-
-	/**
-	 * Gets the option to publish user-specified activity detail diagram
-	 * instead.
-	 * 
-	 * @return
-	 * @see #getActivityDetailDiagram()
-	 */
-	public boolean canPublishADDImage() {
-		return publishADDImage;
-	}
-
-	/**
-	 * Sets the option to publish user-specified activity detail diagram
-	 * instead.
-	 * 
-	 * @param publishADDImage
-	 */
-	public void setPublishADDImage(boolean publishADDImage) {
-		this.publishADDImage = publishADDImage;
-		save();
-	}
-
-	/**
-	 * Gets the option to publish user-specified activity diagram instead.
-	 * 
-	 * @return
-	 * @see #getActivityDiagram()
-	 */
-	public boolean canPublishADImage() {
-		return publishADImage;
-	}
-
-	/**
-	 * Sets the option to publish user-specified image for activity diagram
-	 * instead of the activity diagram
-	 * 
-	 * @param publishADImage
-	 */
-	public void setPublishADImage(boolean publishADImage) {
-		this.publishADImage = publishADImage;
-		save();
-	}
-
-	/**
-	 * Gets the option to publish user-specified work product dependency diagram
-	 * instead.
-	 * 
-	 * @return
-	 * @see #getWPDDiagram()
-	 */
-	public boolean canPublishWPDImage() {
-		return publishWPDImage;
-	}
-
-	/**
-	 * Sets the option to publish user-specified image for work product
-	 * dependency diagram instead of the work product dependency diagram
-	 * 
-	 * @param publishWPDImage
-	 */
-	public void setPublishWPDImage(boolean publishWPDImage) {
-		this.publishWPDImage = publishWPDImage;
-		save();
-	}
-
-	public SupportingMaterial getActivityDiagram() {
-		return activityDiagram;
-	}
-
-	/**
-	 * Gets user-specified activity detail diagram.
-	 * 
-	 * @return a {@link SupportingMaterial} with the digram in its main
-	 *         description
-	 */
-	public SupportingMaterial getActivityDetailDiagram() {
-		return activityDetailDiagram;
-	}
-
-	/**
-	 * Gets user-specified work product dependency diagram.
-	 * 
-	 * @return a {@link SupportingMaterial} with the digram in its main
-	 *         description
-	 */
-	public SupportingMaterial getWPDDiagram() {
-		return wpdDiagram;
-	}
-
-	public void setWPDDiagram(SupportingMaterial wpdDiagram) {
-		if (this.wpdDiagram != wpdDiagram) {
-			SupportingMaterial old = this.wpdDiagram;
-			this.wpdDiagram = wpdDiagram;
-			update(old, wpdDiagram);
-		}
-	}
-
-	public void setActivityDetailDiagram(
-			SupportingMaterial activityDetailDiagram) {
-		if (this.activityDetailDiagram != activityDetailDiagram) {
-			SupportingMaterial old = this.activityDetailDiagram;
-			this.activityDetailDiagram = activityDetailDiagram;
-			update(old, activityDetailDiagram);
-		}
-	}
-
-	public void setActivityDiagram(SupportingMaterial activityDiagram) {
-		if (this.activityDiagram != activityDiagram) {
-			SupportingMaterial old = this.activityDiagram;
-			this.activityDiagram = activityDiagram;
-			update(old, activityDiagram);
-		}
-	}
-
-	/**
-	 * Gets the SupportingMaterial object for the diagram with the given URI
-	 * 
-	 * @param diagramURI
-	 * @return null of the SupportingMaterial object could not be found in the
-	 *         library
-	 */
-	private SupportingMaterial getSupportingMaterial(String diagramURI) {
-		// diagramURI is the GUID of the supporting material that must be in the
-		// list
-		// of supporting materials of the activity
-		//
-		for (Iterator iter = activity.getSupportingMaterials().iterator(); iter
-				.hasNext();) {
-			SupportingMaterial e = (SupportingMaterial) iter.next();
-			if (e.getGuid().equals(diagramURI)) {
-				return e;
-			}
-		}
-		return null;
-	}
-
-	private void update(SupportingMaterial old, SupportingMaterial neu) {
-		if (old != null) {
-			activity.getSupportingMaterials().remove(old);
-		}
-		if (neu != null) {
-			activity.getSupportingMaterials().add(neu);
-		}
-		save();
-	}
-
-	/**
-	 * Checks if the given supporting material is a user-defined diagram of this
-	 * DiagramInfo's activity
-	 * 
-	 * @param sm
-	 * @return
-	 */
-	public boolean isDiagram(SupportingMaterial sm) {
-		return sm != null
-				&& (sm == activityDiagram || sm == activityDetailDiagram || sm == wpdDiagram);
-	}
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/DiagramManager.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/DiagramManager.java
deleted file mode 100755
index 7833b68..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/DiagramManager.java
+++ /dev/null
@@ -1,37 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.util;
-
-import org.eclipse.epf.library.edit.util.IDiagramManager;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Diagram;
-
-/**
- * Extension to contribute to extension point
- * "org.eclipse.epf.library.edit.diagramManager"
- * 
- * @author Phong Nguyen Le - Jun 27, 2006
- * @since 1.0
- */
-public class DiagramManager implements IDiagramManager {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.library.edit.util.IDiagramManager#getDiagram(org.eclipse.epf.uma.Activity,
-	 *      int)
-	 */
-	public Diagram getDiagram(Activity act, int type) {
-		return GraphicalDataManager.getInstance().getUMADiagram(act, type,
-				false);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/GraphicalDataHelper.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/GraphicalDataHelper.java
deleted file mode 100755
index 8d5a08f..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/GraphicalDataHelper.java
+++ /dev/null
@@ -1,1117 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.util.AbstractTreeIterator;
-import org.eclipse.epf.diagram.DiagramResources;
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.ModelFactory;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.NodeContainer;
-import org.eclipse.epf.diagram.model.RoleTaskComposite;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.WorkBreakdownElementNode;
-import org.eclipse.epf.diagram.model.impl.NamedNodeImpl;
-import org.eclipse.epf.library.edit.LibraryEditPlugin;
-import org.eclipse.epf.library.edit.process.WorkProductDescriptorWrapperItemProvider;
-import org.eclipse.epf.library.edit.util.IDiagramManager;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.DiagramElement;
-import org.eclipse.epf.uma.Dimension;
-import org.eclipse.epf.uma.GraphConnector;
-import org.eclipse.epf.uma.GraphEdge;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.epf.uma.SemanticModelBridge;
-import org.eclipse.epf.uma.SimpleSemanticModelElement;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UMASemanticModelBridge;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.util.UmaUtil;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class GraphicalDataHelper {
-	/** Diagram type constants */
-	public static final int ACTIVITY_DIAGRAM = IDiagramManager.ACTIVITY_DIAGRAM;
-
-	public static final int WORK_PRODUCT_DEPENDENCY_DIAGRAM = IDiagramManager.WORK_PRODUCT_DEPENDENCY_DIAGRAM;
-
-	public static final int ACTIVITY_DETAIL_DIAGRAM = IDiagramManager.ACTIVITY_DETAIL_DIAGRAM;
-
-	static final int[] DIAGRAM_TYPES = { ACTIVITY_DIAGRAM,
-			ACTIVITY_DETAIL_DIAGRAM, WORK_PRODUCT_DEPENDENCY_DIAGRAM };
-
-	static final String[] DIAGRAM_TYPE_TEXTS = {
-			DiagramResources.type_activity, DiagramResources.type_WPD, DiagramResources.type_activityDetail }; 
-
-	/** Property names */
-	public static final String PROP_TYPE = "type"; //$NON-NLS-1$
-
-	public static final String PROP_WORK_PRODUCT_COMPOSITE_TYPE = "wpCompositeType"; //$NON-NLS-1$
-	
-	/** property names for activity detail diagram **/
-	public static final String PROP_AUTO_LAYOUT = "autolayout"; //$NON-NLS-1$
-	
-	public static final String PROP_INDEX = "index"; //$NON-NLS-1$
-	
-	/** property values constants for autolayout **/
-	
-	public static final String PROP_AUTO_LAYOUT_VALUE_TRUE = "true"; //$NON-NLS-1$
-	
-	public static final String PROP_AUTO_LAYOUT_VALUE_FALSE = "false"; //$NON-NLS-1$
-	
-	/** Type info for UI node (@see TypedNode) */
-	public static final String GRAPH_NODE_SYNCH_BAR = "synchnonization bar"; //$NON-NLS-1$
-
-	public static final String GRAPH_NODE_START = "start node"; //$NON-NLS-1$
-
-	public static final String GRAPH_NODE_END = "end node"; //$NON-NLS-1$
-
-	public static final String GRAPH_NODE_DECISION = "decision node"; //$NON-NLS-1$
-
-	public static final String GRAPH_NODE_FREE_TEXT = "free text"; //$NON-NLS-1$
-
-	/** Diagram type string constants */
-	public static final String DIAGRAM_WORKFLOW = "Workflow"; //$NON-NLS-1$
-
-	public static final String DIAGRAM_WORK_PRODUCT_DEPENDENCY = "Work Product Dependency"; //$NON-NLS-1$
-
-	public static final String DIAGRAM_ACTIVITY_DETAIL = "Activity Detail"; //$NON-NLS-1$
-	
-	public static final String ADD_DIAGRAM_TASKS_PER_ROW = "ACTIVITY_DETAIL_DIAGRAM_TASKS_PER_ROW"; //$NON-NLS-1$
-
-	public static Point toPoint(org.eclipse.epf.uma.Point p) {
-		return new Point(p.getX().doubleValue(), p.getY().doubleValue());
-	}
-
-	public static org.eclipse.epf.uma.Point newModelPoint(int x, int y) {
-		org.eclipse.epf.uma.Point p = UmaFactory.eINSTANCE.createPoint();
-		p.setX(new Double(x));
-		p.setY(new Double(y));
-		return p;
-	}
-
-	public static Property findProperty(GraphNode node, String propKey) {
-		for (int i = node.getProperty().size() - 1; i > -1; i--) {
-			Property prop = (Property) node.getProperty().get(i);
-			if (propKey.equals(prop.getKey()))
-				return prop;
-		}
-		return null;
-	}
-
-	/**
-	 * @param width
-	 * @param height
-	 * @return
-	 */
-	public static Dimension newModelDimension(int width, int height) {
-		Dimension size = UmaFactory.eINSTANCE.createDimension();
-		size.setWidth(new Double(width));
-		size.setHeight(new Double(height));
-		return size;
-	}
-
-	public static void fillConnections(Node node, GraphNode graphNode) {
-		boolean old = node.eDeliver();
-		try {
-			node.eSetDeliver(false);
-			org.eclipse.epf.diagram.model.Diagram diagram = (org.eclipse.epf.diagram.model.Diagram) node
-					.eContainer();
-			for (Iterator iter = graphNode.getAnchorage().iterator(); iter
-					.hasNext();) {
-				GraphConnector conn = ((GraphConnector) iter.next());
-				for (Iterator iterator = conn.getGraphEdge().iterator(); iterator
-						.hasNext();) {
-					GraphEdge edge = (GraphEdge) iterator.next();
-					if(edge.getAnchor().size() > 1) { 
-						GraphConnector targetConnector;
-						Link link = null;
-						if (edge.eContainer() == graphNode) {
-							targetConnector = (GraphConnector) edge.getAnchor()
-							.get(1);
-							GraphNode targetGraphNode = (GraphNode) targetConnector
-							.eContainer();
-							if (graphNode.eContainer() == targetGraphNode
-									.eContainer()) {
-								Object linkedObject = targetGraphNode;
-								if (targetGraphNode.getSemanticModel() instanceof UMASemanticModelBridge) {
-									linkedObject = ((UMASemanticModelBridge) targetGraphNode
-											.getSemanticModel()).getElement();
-								}
-								Node targetNode = findNode(diagram, linkedObject);
-								link = ModelFactory.eINSTANCE.createLink();
-								link.setSource(node);
-								link.setTarget(targetNode);
-								link.setObject(edge);
-							}
-						}
-					}
-				}
-
-			}
-		} finally {
-			node.eSetDeliver(old);
-		}
-	}
-
-	public static Node findNode(org.eclipse.epf.diagram.model.Diagram diagram,
-			GraphNode gNode, Class adapterType) {
-		SemanticModelBridge bridge = gNode.getSemanticModel();
-		if (bridge instanceof UMASemanticModelBridge) {
-			INodeChangeListener listener = (INodeChangeListener) UmaUtil
-					.getAdapter(((UMASemanticModelBridge) bridge).getElement(),
-							adapterType);
-			return listener.getNode();
-		}
-
-		// gNode is not a activity's GraphNode. Try to find a Node with gNode as
-		// a linked object in the diagram.
-		//
-		for (Iterator iter = diagram.getNodes().iterator(); iter.hasNext();) {
-			Node element = (Node) iter.next();
-			if (gNode == element.getObject()) {
-				return element;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Finds node whose linked object is the given object
-	 * 
-	 * @return
-	 */
-	public static Node findNode(NodeContainer container, Object object) {
-		for (Iterator iter = container.getNodes().iterator(); iter.hasNext();) {
-			Node element = (Node) iter.next();
-			if (object == element.getObject() || object == element.getLinkedElement()) {
-				return element;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Finds node whose linked object or one of its base is the given object
-	 * 
-	 * @param container
-	 * @param object
-	 * @return
-	 */
-	public static Node findNode(NodeContainer container, Object object,
-			boolean checkBase) {
-		for (Iterator iter = container.getNodes().iterator(); iter.hasNext();) {
-			Node node = (Node) iter.next();
-			if (object == node.getObject()) {
-				return node;
-			} else if (checkBase
-					&& node.getObject() instanceof VariabilityElement) {
-				for (VariabilityElement ve = ((VariabilityElement) node
-						.getObject()).getVariabilityBasedOnElement(); ve != null; ve = ve
-						.getVariabilityBasedOnElement()) {
-					if (ve == object) {
-						return node;
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	public static Node findNode(ActivityDetailDiagram diagram, Object object) {
-		Node node = null;
-		for (Iterator iter = diagram.getNodes().iterator(); iter.hasNext();) {
-			Node element = (Node) iter.next();
-			if (element instanceof RoleTaskComposite) {
-				node = findNode((NodeContainer) element, object);
-				if (node != null)
-					return node;
-			}
-			if (object == element.getObject()) {
-				return element;
-			}
-		}
-		return null;
-	}
-	
-	public static Link findLink(Node source, Object targetLinkedElement) {
-		for (Iterator iter = source.getOutgoingConnections().iterator(); iter.hasNext();) {
-			Link link = (Link) iter.next();
-			Node target = link.getTarget();
-			if(target.getLinkedElement() == targetLinkedElement) {
-				return link;
-			}
-		}
-		return null;
-	}
-
-	private static String getTypeString(int type) {
-		switch (type) {
-		case TypedNode.DECISION:
-			return GRAPH_NODE_DECISION;
-		case TypedNode.END:
-			return GRAPH_NODE_END;
-		case TypedNode.START:
-			return GRAPH_NODE_START;
-		case TypedNode.SYNCH_BAR:
-			return GRAPH_NODE_SYNCH_BAR;
-		case TypedNode.FREE_TEXT:
-			return GRAPH_NODE_FREE_TEXT;
-		}
-		return null;
-	}
-
-	public static GraphNode newTypedGraphNode(int type) {
-		GraphNode graphNode = UmaFactory.eINSTANCE.createGraphNode();
-		SimpleSemanticModelElement bridge = UmaFactory.eINSTANCE
-				.createSimpleSemanticModelElement();
-		bridge.setTypeInfo(getTypeString(type));
-		graphNode.setSemanticModel(bridge);
-		org.eclipse.epf.uma.Point point = UmaFactory.eINSTANCE.createPoint();
-		point.setX(new Double(-1));
-		point.setY(new Double(-1));
-		graphNode.setPosition(point);
-		org.eclipse.epf.uma.Dimension dim = UmaFactory.eINSTANCE.createDimension();
-		dim.setWidth(new Double(-1));
-		dim.setHeight(new Double(-1));
-		graphNode.setSize(dim);
-
-		if (type == TypedNode.FREE_TEXT) {
-			graphNode.setName(DiagramResources.addFreeTxt); 
-		}
-		if (type == TypedNode.FREE_TEXT) {
-			Property property = UmaFactory.eINSTANCE.createProperty();
-			property.setKey(GRAPH_NODE_FREE_TEXT);
-			property.setValue(DiagramResources.addFreeTxt); 
-			List list = new ArrayList();
-			list.add(property);
-			graphNode.set(UmaPackage.GRAPH_NODE__PROPERTY, list);
-		}
-
-		return graphNode;
-	}
-
-	/**
-	 * @param link
-	 */
-	public static void removeGraphicalData(Link link) {
-		// GraphicalDataManager.getInstance().removeGraphConnectorPair(link.getSource().getGraphNode(),
-		// link.getTarget().getGraphNode());
-		
-		GraphEdge edge = (GraphEdge) link.getObject();
-		if(edge != null) {
-			GraphicalDataManager.getInstance().removeGraphEdge(edge);
-		}
-	}
-
-	/**
-	 * @param link
-	 */
-	public static void addGraphicalData(Link link) {
-		GraphEdge edge = (GraphEdge) link.getObject();
-		if (edge == null) {
-			// new link
-			//
-			edge = GraphicalDataManager.getInstance().addGraphConnectorPair(
-					link.getSource().getGraphNode(),
-					link.getTarget().getGraphNode());
-			link.setObject(edge);
-
-			// save the source end point and target end point from the given
-			// link
-			//
-			link.setSourceEndPoint(link.getSourceEndPoint());
-			link.setTargetEndPoint(link.getTargetEndPoint());
-		} else {
-			// undo deleted link
-			//
-			GraphNode srcNode = link.getSource().getGraphNode();
-			GraphNode targetNode = link.getTarget().getGraphNode();
-			Object srcConnector = edge.getAnchor().get(0);
-			srcNode.getAnchorage().add(srcConnector);
-			srcNode.getContained().add(edge);
-			Object targetConnector = edge.getAnchor().get(1);
-			targetNode.getAnchorage().add(targetConnector);
-		}
-	}
-
-	public static void setSemanticModel(Link link, WorkOrder workOrder) {
-		// set the WorkOrder as the element of the SemanticModel of the link's
-		// GraphEdge
-		//
-		GraphEdge edge = (GraphEdge) link.getObject();
-		UMASemanticModelBridge bridge = UmaFactory.eINSTANCE
-				.createUMASemanticModelBridge();
-		bridge.setElement(workOrder);
-		edge.setSemanticModel(bridge);
-	}
-
-	// public static Collection getSourceActivityNodes(TypedNode typedNode) {
-	// List actNodes = new ArrayList();
-	// getSourceActivityNodes(actNodes, typedNode);
-	// return actNodes;
-	// }
-
-	public static Collection getSourceNodes(TypedNode typedNode, Class type) {
-		List actNodes = new ArrayList();
-		getSourceNodes(actNodes, typedNode, type);
-		return actNodes;
-	}
-
-	// public static void getSourceActivityNodes(Collection actNodes, TypedNode
-	// typedNode) {
-	// for (Iterator iter = typedNode.getIncomingConnections().iterator();
-	// iter.hasNext();) {
-	// Link link = (Link)iter.next();
-	// Node source = link.getSource();
-	// if(source instanceof ActivityNode) {
-	// actNodes.add(source);
-	// }
-	// else if(source instanceof TypedNode) {
-	// getSourceActivityNodes(actNodes, (TypedNode) source);
-	// }
-	// }
-	// }
-
-	// public static Collection getTargetActivityNodes(TypedNode typedNode) {
-	// List actNodes = new ArrayList();
-	// getTargetActivityNodes(actNodes, typedNode);
-	// return actNodes;
-	// }
-
-	public static Collection getTargetNodes(TypedNode typedNode, Class type) {
-		List actNodes = new ArrayList();
-		getTargetNodes(actNodes, typedNode, type);
-		return actNodes;
-	}
-
-	// public static void getTargetActivityNodes(Collection actNodes, TypedNode
-	// typedNode) {
-	// for (Iterator iter = typedNode.getOutgoingConnections().iterator();
-	// iter.hasNext();) {
-	// Link link = (Link)iter.next();
-	// Node target = link.getTarget();
-	// if(target instanceof ActivityNode) {
-	// actNodes.add(target);
-	// }
-	// else if(target instanceof TypedNode) {
-	// getTargetActivityNodes(actNodes, (TypedNode) target);
-	// }
-	// }
-	// }
-
-	/**
-	 * Gets all nodes with the given type that are direct or indirect targets of
-	 * the given source typedNode.
-	 * 
-	 * @param actNodes
-	 * @param typedNode
-	 * @param type
-	 */
-	public static void getTargetNodes(Collection actNodes, TypedNode typedNode,
-			Class type) {
-		for (Iterator iter = typedNode.getOutgoingConnections().iterator(); iter
-				.hasNext();) {
-			Link link = (Link) iter.next();
-			Node target = link.getTarget();
-			if (type.isInstance(target)) {
-				actNodes.add(target);
-			} else if (target instanceof TypedNode) {
-				getTargetNodes(actNodes, (TypedNode) target, type);
-			}
-		}
-	}
-
-	public static void getSourceNodes(Collection actNodes, TypedNode typedNode,
-			Class type) {
-		for (Iterator iter = typedNode.getIncomingConnections().iterator(); iter
-				.hasNext();) {
-			Link link = (Link) iter.next();
-			Node source = link.getSource();
-			if (type.isInstance(source)) {
-				actNodes.add(source);
-			} else if (source instanceof TypedNode) {
-				getSourceNodes(actNodes, (TypedNode) source, type);
-			}
-		}
-	}
-
-	public static Node getFirstSourceNode(TypedNode typedNode, Class type) {
-		for (Iterator iter = typedNode.getIncomingConnections().iterator(); iter
-				.hasNext();) {
-			Link link = (Link) iter.next();
-			Node source = link.getSource();
-			if (type.isInstance(source)) {
-				return source;
-			} else if (source instanceof TypedNode) {
-				source = getFirstSourceNode((TypedNode) source, type);
-				if (source != null)
-					return source;
-			}
-		}
-		return null;
-	}
-
-	public static WorkOrder removeWorkOrder(NamedNodeImpl node,
-			Object predBreakdownElement) {
-		boolean notify = node.isNotificationEnabled();
-		try {
-			node.setNotificationEnabled(false);
-			return UmaUtil.removeWorkOrder((WorkBreakdownElement) node
-					.getObject(), predBreakdownElement);
-		} finally {
-			node.setNotificationEnabled(notify);
-		}
-	}
-
-	public static WorkOrder addDefaultWorkOrder(NamedNodeImpl node,
-			WorkBreakdownElement predBreakdownElement) {
-		boolean notify = node.isNotificationEnabled();
-		try {
-			node.setNotificationEnabled(false);
-			return UmaUtil.createDefaultWorkOrder((WorkBreakdownElement) node
-					.getObject(), predBreakdownElement);
-		} finally {
-			node.setNotificationEnabled(notify);
-		}
-
-	}
-
-	/**
-	 * @param taskDescriptor
-	 * @return
-	 */
-	public static boolean hasNoRoleDescriptorAssociated(
-			TaskDescriptor taskDescriptor) {
-		return taskDescriptor.getPerformedPrimarilyBy() == null;
-		// commented - requirements not to allow additional performer and
-		// assisted by in diagrams.
-		// && taskDescriptor.getAdditionallyPerformedBy().isEmpty();
-		// && taskDescriptor.getAssistedBy().isEmpty();
-	}
-
-	/**
-	 * @param diagram
-	 * @param node
-	 * @return
-	 */
-	public static boolean contains(NodeContainer container, Node node) {
-		for (Iterator iter = container.getNodes().iterator(); iter.hasNext();) {
-			Object child = iter.next();
-			if (child == node)
-				return true;
-			if (child instanceof NodeContainer
-					&& contains((NodeContainer) child, node)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static boolean refreshFromBase(Diagram diagram) {
-		// find the base diagram
-		//
-		SemanticModelBridge modelBridge = diagram.getSemanticModel();
-		if (modelBridge instanceof UMASemanticModelBridge) {
-			UMASemanticModelBridge umaModelBridge = ((UMASemanticModelBridge) modelBridge);
-			Activity act = (Activity) umaModelBridge.getElement();
-			Activity base = (Activity) act.getVariabilityBasedOnElement();
-			if (base == null
-					|| act.getVariabilityType() == VariabilityType.LOCAL_REPLACEMENT_LITERAL) {
-				return false;
-			}
-			int diagramType = GraphicalDataManager.getInstance()
-					.getDiagramType(diagram);
-			switch (diagramType) {
-			case ACTIVITY_DIAGRAM: {
-				Diagram baseDiagram = GraphicalDataManager.getInstance()
-						.getUMADiagram(base, diagramType, false);
-				if (baseDiagram == null)
-					return false;
-				List oldNodes = new ArrayList();
-				Diagram copy = copyDiagram(baseDiagram);
-				for (Iterator iter = baseDiagram.getContained().iterator(); iter
-						.hasNext();) {
-					GraphNode baseNode = (GraphNode) iter.next();
-					modelBridge = baseNode.getSemanticModel();
-					if (modelBridge instanceof UMASemanticModelBridge) {
-						// this is a element's node
-						MethodElement e = ((UMASemanticModelBridge) modelBridge)
-								.getElement();
-						GraphNode node = GraphicalDataManager.findGraphNode(
-								diagram, e);
-						if (node != null) {
-							oldNodes.add(node);
-						}
-					} else if (isUIGraphNode(baseNode)) {
-						GraphNode node = findUIGraphNode(diagram, baseNode
-								.getGuid());
-						if (node != null) {
-							oldNodes.add(node);
-						}
-					}
-				}
-
-				// // remove all the GraphEdges of the old nodes
-				// //
-				// List removeEdges = new ArrayList();
-				// for (Iterator iter = oldNodes.iterator(); iter.hasNext();) {
-				// GraphNode node = (GraphNode) iter.next();
-				// for (Iterator iterator = node.getContained().iterator();
-				// iterator.hasNext();) {
-				// Object element = iterator.next();
-				// if(element instanceof GraphEdge) {
-				// removeEdges.add(element);
-				// }
-				// }
-				// }
-				// if(!removeEdges.isEmpty()) {
-				// for (Iterator iter = removeEdges.iterator(); iter
-				// .hasNext();) {
-				// GraphicalDataManager.getInstance().removeGraphEdge((GraphEdge)
-				// iter.next());
-				// }
-				// }
-
-				// remove old nodes
-				//
-				diagram.getContained().removeAll(oldNodes);
-
-				// remove unused old UI nodes && nodes of contributor/replacer
-				for (Iterator iter = diagram.getContained().iterator(); iter
-						.hasNext();) {
-					GraphNode node = (GraphNode) iter.next();
-					if (isUIGraphNode(node)
-							&& node.getBriefDescription() != null
-							&& node.getBriefDescription().length() > 0
-					// && node.getContained().isEmpty()
-					) {
-						iter.remove();
-					} else {
-						SemanticModelBridge bridge = node.getSemanticModel();
-						if (bridge instanceof UMASemanticModelBridge) {
-							MethodElement e = ((UMASemanticModelBridge) bridge)
-									.getElement();
-							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();
-						GraphNode node = GraphicalDataManager.findGraphNode(
-								copy, baseElement);
-						if (node != null) {
-							UMASemanticModelBridge bridge = (UMASemanticModelBridge) node
-									.getSemanticModel();
-							bridge.setElement((MethodElement) element);
-						}
-					}
-				}
-
-				// add new nodes
-				//
-				diagram.getContained().addAll(copy.getContained());
-
-				break;
-			}
-			default: {
-				Diagram baseDiagram = GraphicalDataManager.getInstance()
-						.getUMADiagram(base, diagramType, false);
-				if (baseDiagram == null)
-					return false;
-				List oldNodes = new ArrayList();
-				Diagram copy = copyDiagram(baseDiagram);
-				for (Iterator iter = baseDiagram.getContained().iterator(); iter
-						.hasNext();) {
-					GraphNode baseNode = (GraphNode) iter.next();
-					modelBridge = baseNode.getSemanticModel();
-					if (modelBridge instanceof UMASemanticModelBridge) {
-						// this is a element's node
-						MethodElement e = ((UMASemanticModelBridge) modelBridge)
-								.getElement();
-						GraphNode node = GraphicalDataManager.findGraphNode(
-								diagram, e);
-						if (node != null) {
-							oldNodes.add(node);
-						}
-					}
-				}
-
-				// remove old nodes
-				//
-				diagram.getContained().removeAll(oldNodes);
-
-				// add new nodes
-				//
-				diagram.getContained().addAll(copy.getContained());
-
-				break;
-			}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @param diagram
-	 * @param baseGuid
-	 *            the GUID of the base UI GraphNode
-	 * @return
-	 */
-	private static GraphNode findUIGraphNode(Diagram diagram, String baseGuid) {
-		for (Iterator iter = diagram.getContained().iterator(); iter.hasNext();) {
-			GraphNode node = (GraphNode) iter.next();
-			if (isUIGraphNode(node)
-					&& baseGuid.equals(node.getBriefDescription())) {
-				return node;
-			}
-		}
-		return null;
-	}
-
-	public static boolean isUIGraphNode(GraphNode gNode) {
-		SemanticModelBridge modelBridge = gNode.getSemanticModel();
-		if (modelBridge instanceof SimpleSemanticModelElement) {
-			String typeInfo = ((SimpleSemanticModelElement) modelBridge)
-					.getTypeInfo();
-			if (typeInfo.equals(GRAPH_NODE_DECISION)
-					|| typeInfo.equals(GRAPH_NODE_END)
-					|| typeInfo.equals(GRAPH_NODE_START)
-					|| typeInfo.equals(GRAPH_NODE_SYNCH_BAR)
-					|| typeInfo.equals(GRAPH_NODE_FREE_TEXT)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static Diagram copyDiagram(Diagram baseDiagram) {
-		Diagram copy = (Diagram) TngUtil.copy(baseDiagram);
-
-		// HACK:
-		// go thru the nodes of the diagram copy, if any node is a UI-only node
-		// (see TypedNode)
-		// save the GUID of the original one in its briefDescription to remember
-		// who is base.
-		//
-		int size = copy.getContained().size();
-		for (int i = 0; i < size; i++) {
-			GraphNode gNode = (GraphNode) copy.getContained().get(i);
-			if (GraphicalDataHelper.isUIGraphNode(gNode)) {
-				gNode.setBriefDescription(((DiagramElement) baseDiagram
-						.getContained().get(i)).getGuid());
-			}
-		}
-
-		return copy;
-	}
-
-	/**
-	 * Gets all diagrams of this activities.
-	 * 
-	 * @param selectedActivity
-	 * @return
-	 */
-	public static Collection getDiagrams(Activity act) {
-		return getDiagrams(act, false);
-	}
-
-	public static Collection getDiagrams(Activity act, boolean create) {
-		ArrayList diagrams = new ArrayList();
-		for (int i = 0; i < DIAGRAM_TYPES.length; i++) {
-			Diagram diagram = GraphicalDataManager.getInstance().getUMADiagram(
-					act, DIAGRAM_TYPES[i], create);
-			if (diagram != null) {
-				diagrams.add(diagram);
-			}
-		}
-		return diagrams;
-	}
-
-	public static String getDiagramTypeText(Diagram diagram) {
-		int type = GraphicalDataManager.getInstance().getDiagramType(diagram);
-		if (type != -1) {
-			return DIAGRAM_TYPE_TEXTS[type];
-		}
-		return DiagramResources.type_unknown; 
-	}
-
-	/**
-	 * Sets or unsets suppressed flag of all diagrams in the given process
-	 * 
-	 * @param proc
-	 */
-	public static void setAllDiagramSuppressed(Process proc, boolean suppressed) {
-		Iterator iter = new AbstractTreeIterator(proc) {
-
-			/**
-			 * Comment for <code>serialVersionUID</code>
-			 */
-			private static final long serialVersionUID = -618949014476371114L;
-
-			protected Iterator getChildren(Object object) {
-				Activity act = (Activity) object;
-				ArrayList children = new ArrayList();
-				for (Iterator iterator = act.getBreakdownElements().iterator(); iterator
-						.hasNext();) {
-					Object element = iterator.next();
-					if (element instanceof Activity) {
-						children.add(element);
-					}
-				}
-				return children.iterator();
-			}
-
-		};
-
-		while (iter.hasNext()) {
-			Collection diagrams = getDiagrams((Activity) iter.next(),
-					suppressed);
-			for (Iterator iterator = diagrams.iterator(); iterator.hasNext();) {
-				Diagram diagram = (Diagram) iterator.next();
-				diagram.setSuppressed(Boolean.valueOf(suppressed));
-			}
-		}
-	}
-
-	// public static boolean removeUMAPoint(Collection umaPoints, int x, int y)
-	// {
-	// for (Iterator iter = umaPoints.iterator(); iter.hasNext();) {
-	// org.eclipse.epf.uma.Point p = (org.eclipse.epf.uma.Point) iter.next();
-	// if(p.getX().intValue() == x && p.getY().intValue() == y) {
-	// iter.remove();
-	// return true;
-	// }
-	// }
-	// return false;
-	// }
-
-	public static void removeLink(Link link) {
-		Node sourceNode = link.getSource();
-		Node targetNode = link.getTarget();
-		boolean srcNotify = sourceNode != null ? sourceNode.eDeliver() : false;
-		boolean targetNotify = targetNode != null ? targetNode.eDeliver()
-				: false;
-		try {
-			if (sourceNode != null) {
-				sourceNode.eSetDeliver(false);
-			}
-			if (targetNode != null) {
-				targetNode.eSetDeliver(false);
-			}
-			link.setSource(null);
-			link.setTarget(null);
-		} finally {
-			if (sourceNode != null) {
-				sourceNode.eSetDeliver(srcNotify);
-			}
-			if (targetNode != null) {
-				targetNode.eSetDeliver(targetNotify);
-			}
-		}
-	}
-
-	/**
-	 * Finds the object or its wrapper in the given collection
-	 * 
-	 * @param allElements
-	 * @param e
-	 * @return
-	 */
-	public static Object findElement(Collection allElements, Object e) {
-		for (Iterator iter = allElements.iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			if (e == TngUtil.unwrap(element)) {
-				return element;
-			}
-			// If object (e) is a workproduct descriptor( sub-artifact)
-			// passed collection donot have wrapper for sub-artifact, check the
-			// container artifact's wrapper.
-			//https://bugs.eclipse.org/bugs/show_bug.cgi?id=155914
-			if(element instanceof WorkProductDescriptorWrapperItemProvider){
-				Object childElement = findElement(((WorkProductDescriptorWrapperItemProvider)element).getChildren(element), e);
-				if(childElement != null){
-					return childElement;
-				}
-			}
-		}
-		return null;
-	}
-
-	/*
-	 * Method to check if any duplicate predecessor in the predecessors list of
-	 * WorkBreakdownElement.
-	 */
-	public static boolean anyDuplicatePredecessors(WorkBreakdownElement e) {
-		List list = new ArrayList();
-		List predlist = new ArrayList();
-		getPreds(e, predlist);
-		for (Iterator itor = predlist.iterator(); itor.hasNext();) {
-			Object obj = itor.next();
-			if (!list.contains(obj)) {
-				list.add(obj);
-			} else {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/*
-	 * Utility method to get all the predecessors activities instead of
-	 * workorders.
-	 */
-	public static void getPreds(WorkBreakdownElement e, List list) {
-		List predlist = e.getLinkToPredecessor();
-		for (Iterator itor = predlist.iterator(); itor.hasNext();) {
-			WorkOrder workorder = (WorkOrder) itor.next();
-			list.add(workorder.getPred());
-		}
-	}
-
-	/*
-	 * Method to check before deleting a link. If duplicate predecessor exists
-	 * in the legacy data, check if deleting link should remove all the
-	 * predecessors or not by verifying if target or indirect target have direct
-	 * or indirect links.
-	 */
-	public static boolean canRemoveAllPreds(Link link, Node oldSource,
-			Node oldTarget) {
-
-		if (oldTarget instanceof WorkBreakdownElementNode) {
-			List inlist = oldTarget.getIncomingConnections();
-			for (Iterator itor = inlist.iterator(); itor.hasNext();) {
-				Link incominglink = (Link) itor.next();
-				// RATLC00384245 : Predecessor changes should be done only in
-				// case of Synchronization Bar.
-				if (incominglink.getSource() instanceof TypedNode
-						&& ((TypedNode) incominglink.getSource()).getType() == TypedNode.SYNCH_BAR) {
-					Collection col = GraphicalDataHelper.getSourceNodes(
-							(TypedNode) incominglink.getSource(),
-							WorkBreakdownElementNode.class);
-					if (col.contains(oldSource)) {
-						return false;
-					}
-				} else if (incominglink.getSource() instanceof WorkBreakdownElementNode) {
-					if (incominglink.getSource().equals(oldSource))
-						return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/*
-	 * Method to get the sources of SyncBar inComming connections
-	 * and if syncbar have incoming connection from decision point, 
-	 * and decision point have incomming connections (workbreaddown elemtns)
-	 * collections will ignore all the incoming connection from decision point.  
-	 * @return
-	 */
-	public static void getSyncBarSourceNodes(TypedNode typedNode, Collection actNodes){
-		for (Iterator iter = typedNode.getIncomingConnections().iterator(); iter.hasNext();) {
-				Link link = (Link) iter.next();
-				Node source = link.getSource();
-				if(source instanceof WorkBreakdownElementNode){
-					actNodes.add(source);
-				}else if(source instanceof TypedNode){
-					if(((TypedNode)source).getType() == TypedNode.SYNCH_BAR)
-						getSyncBarSourceNodes((TypedNode)source,actNodes);
-				}
-		}
-	}
-	/*
-	 * Method to collect synchronization bar outgoing connection
-	 * except any connection going from decision points.  
-	 */
-	public static void getSyncBarTargetNodes(TypedNode typedNode, Collection actNodes){
-		for (Iterator iter = typedNode.getOutgoingConnections().iterator(); iter.hasNext();) {
-				Link link = (Link) iter.next();
-				Node target = link.getTarget();
-				if(target instanceof WorkBreakdownElementNode){
-					actNodes.add(target);
-				}else if(target instanceof TypedNode){
-					if(((TypedNode)target).getType() == TypedNode.SYNCH_BAR)
-						getSyncBarTargetNodes((TypedNode)target, actNodes);
-				}
-		}
-	}
-	
-	public static Node findNode(NodeContainer container, Object object, Class nodeType) {
-		for (Iterator iter = container.getNodes().iterator(); iter.hasNext();) {
-			Node element = (Node) iter.next();
-			if (object == element.getObject() && nodeType.isInstance(element)) {
-				return element;
-			}
-		}
-		return null;
-	}
-	
-
-	/**
-	 * Convenient method to add a property to GraphNode property list
-	 * (UmaPackage.GRAPH_NODE__PROPERTY) Verifies property exists or not, if not
-	 * creates a property with given key and value. and set into graph node
-	 * property list, if exists just sets value for property.
-	 * 
-	 * @param graphNode
-	 * @param key
-	 * @param value
-	 * @return Property
-	 * @author skannoor
-	 */
-	public static Property createProperty(GraphNode graphNode, String key,
-			String value) {
-		Property property = null;
-		if (graphNode != null) {
-			property = findProperty(graphNode, key);
-		}
-		if (property == null) {
-			property = UmaFactory.eINSTANCE.createProperty();
-			property.setKey(key);
-			property.setValue(value);
-			List list = graphNode.getList(UmaPackage.GRAPH_NODE__PROPERTY);
-			if (list == null) {
-				list = new ArrayList();
-				graphNode.set(UmaPackage.GRAPH_NODE__PROPERTY, list);
-			}
-			list.add(property);
-		} else {
-			property.setValue(value);
-		}
-		return property;
-	}
-	
-	/**
-	 * Accesible method for ActivityDetailDiagram, to get a autolayout flag from
-	 * GraphhNode property list. return string can be
-	 * GraphicalDataHelper.PROP_AUTOLAYOUT_VALUE_TRUE,
-	 * GraphicalDataHelper.PROP_AUTOLAYOUT_VALUE_FALSE, or null.
-	 * 
-	 * @param diagram
-	 * @return String
-	 */
-	public static String getAutoLayoutFlag(ActivityDetailDiagram diagram) {
-		String flag = null;
-		GraphNode graphNode = diagram.getGraphNode();
-		if (graphNode != null) {
-			List propList = graphNode.getList(UmaPackage.GRAPH_NODE__PROPERTY);
-			if (propList != null && propList.size() > 0) {
-				Property property = GraphicalDataHelper.findProperty(graphNode,
-						GraphicalDataHelper.PROP_AUTO_LAYOUT);
-				if (property != null) {
-					flag = property.getValue();
-				}
-			}
-		}
-		return flag;
-	}
-	
-	public static boolean isAutoLayout(ActivityDetailDiagram diagram){
-		GraphNode graphNode = diagram.getGraphNode();
-		if(graphNode != null){
-			List propList = graphNode.getList(UmaPackage.GRAPH_NODE__PROPERTY);
-			if(propList != null && propList.size() > 0){
-				Property property = GraphicalDataHelper.findProperty(
-					graphNode, GraphicalDataHelper.PROP_AUTO_LAYOUT);
-				if(property != null){
-					String temp = property.getValue();
-					if(temp != null && temp != "" && 
-							(GraphicalDataHelper.PROP_AUTO_LAYOUT_VALUE_TRUE.equals(temp)
-									|| GraphicalDataHelper.PROP_AUTO_LAYOUT_VALUE_FALSE.equals(temp))){
-						return new Boolean(temp).booleanValue();
-					}
-				}
-			}
-		}
-		return false;
-	}
-	
-	public static int getTasksPerRow(){
-		String count = LibraryEditPlugin.getDefault().getPreferenceStore()
-		.getString(GraphicalDataHelper.ADD_DIAGRAM_TASKS_PER_ROW);
-		if(count != null || count != ""){
-			int i = Integer.parseInt(count);
-			return i;
-		}
-		return 10;
-	}
-
-	/**
-	 * @param list the list of {@link Property} objects
-	 * @param key
-	 * @return
-	 */
-	public static Property getPropertyByKey(List list, String key) {
-		if (!list.isEmpty()) {
-			for (Iterator iror = list.iterator(); iror.hasNext();) {
-				Property property = (Property) iror.next();
-				if (property != null) {
-					if (property.getKey().equals(key)) {
-						return property;
-					}
-//						else {
-//						return null;
-//					}
-				}
-			}
-		}
-		return null;
-	}
-
-	public static Property getProperty(Node node, String key) {
-		GraphNode graphNode = node.getGraphNode();
-		if (graphNode != null) {
-			List list = graphNode.getProperty();
-			if (list != null && !list.isEmpty()) {
-				for (int i = list.size() - 1; i > -1; i--) {
-					Property prop = (Property) list.get(i);
-					if (key.equals(prop.getKey())) {
-						return prop;
-					}
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/GraphicalDataManager.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/GraphicalDataManager.java
deleted file mode 100755
index f50b7b3..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/GraphicalDataManager.java
+++ /dev/null
@@ -1,641 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.epf.library.edit.ICommandListener;
-import org.eclipse.epf.library.edit.process.command.VaryActivityCommand;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Descriptor;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.GraphConnector;
-import org.eclipse.epf.uma.GraphEdge;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.SemanticModelBridge;
-import org.eclipse.epf.uma.UMASemanticModelBridge;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.epf.uma.util.UmaUtil;
-
-
-/**
- * Diagram data stored in UMA: SemanticModelBridge .Presentation diagram type,
- * its value can be one of following constants defined in GraphicalDataHelper
- * DIAGRAM_WORKFLOW, DIAGRAM_WORK_PRODUCT_DEPENDENCY, DIAGRAM_ACTIVITY_DETAIL
- * 
- * UMASemanticModelBridge .Element BreakdownElement that the DiagramElement of
- * this SemanticModelBridge represents
- * 
- * SimpleSemanticModelElement .TypeInfo type information for TypedNode, its
- * value can be one of the constants defined in GraphicalDataHelper
- * wpCompositeType WorkProductComposite type
- * 
- * DiagramElement .Property (list of properties)
- * 
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public final class GraphicalDataManager {
-	private static final String[] diagramPresentations = new String[] {
-			GraphicalDataHelper.DIAGRAM_WORKFLOW,
-			GraphicalDataHelper.DIAGRAM_WORK_PRODUCT_DEPENDENCY,
-			GraphicalDataHelper.DIAGRAM_ACTIVITY_DETAIL };
-
-	private static final Class[] childTypes = new Class[] { Activity.class,
-			WorkProductDescriptor.class, Descriptor.class };
-
-	private static final Class[] diagramChangeListenerClasses = new Class[] {
-			IActivityDiagramChangeListener.class,
-			IWPDDiagramChangeListener.class,
-			IActivityDetailDiagramChangeListener.class };
-
-	private static GraphicalDataManager instance = null;
-
-	//private Map graphicalDataMap = new HashMap();
-
-	private List commandListeners;
-
-	private GraphicalDataManager() {
-	}
-
-	public static GraphicalDataManager getInstance() {
-		if (instance == null) {
-			synchronized (GraphicalDataManager.class) {
-				if (instance == null) {
-					instance = new GraphicalDataManager();
-				}
-			}
-		}
-		return instance;
-	}
-
-	// public GraphNode getGraphNode(Activity act, int diagramType, Activity
-	// parent) {
-	// // ItemProviderAdapter adapter = (ItemProviderAdapter)
-	// TngAdapterFactory.INSTANCE.getWBS_ComposedAdapterFactory().adapt(act,
-	// ITreeItemContentProvider.class);
-	// // Object parent = adapter.getParent(act);
-	// // if(parent instanceof Activity) {
-	// if(parent == null) {
-	// // new Activity
-	// //
-	// return createGraphNode(act);
-	// }
-	// if(!act.getSuperActivities().contains(parent)) {
-	// throw new IllegalArgumentException("Invalid super activity for " + act +
-	// ": " + parent);
-	// }
-	// Activity parentAct = (Activity) parent;
-	// Diagram diagram = getDiagram(parentAct, diagramType).getUMADiagram();
-	// return getGraphNode(diagram, act);
-	// }
-
-	/**
-	 * Gets the GraphNode of the given method element for the given diagram.
-	 * Create the GraphNode if it does not exist yet.
-	 * 
-	 * @param diagram
-	 * @param methodElement
-	 * @return
-	 */
-	public GraphNode getGraphNode(Diagram diagram, MethodElement methodElement) {
-		if (diagram == null) {
-			// new MethodElement
-			//
-			return createGraphNode(methodElement);
-		}
-		GraphNode node = findGraphNode(diagram, methodElement);
-		if (node == null) {
-			node = createGraphNode(methodElement);
-			createGraphConnectors(node, diagram);
-			diagram.getContained().add(node);
-		}
-		return node;
-	}
-
-	public static GraphNode findGraphNode(Diagram diagram, Object methodElement) {
-		for (Iterator iter = diagram.getContained().iterator(); iter.hasNext();) {
-			GraphNode element = (GraphNode) iter.next();
-			if (element.getSemanticModel() instanceof UMASemanticModelBridge
-					&& methodElement == ((UMASemanticModelBridge) element
-							.getSemanticModel()).getElement()) {
-				return element;
-			}
-		}
-		return null;
-	}
-
-	// public DiagramElement getDiagramElement(Object object) {
-	// if(object instanceof Activity) {
-	// return getGraphNode((Activity) object);
-	// }
-	// else if(object instanceof WorkOrder) {
-	// WorkOrder workOrder = (WorkOrder) object;
-	// BreakdownElement be = workOrder.getPred();
-	// if(be instanceof Activity) {
-	// GraphNode graphNode = getGraphNode((Activity) be);
-	// List list = graphNode.getContained();
-	// Polyline polyline = null;
-	// for(int i = 0; i < list.size(); i++) {
-	// Object obj = list.get(i);
-	// if(obj instanceof Polyline) {
-	// polyline = (Polyline) obj;
-	// break;
-	// }
-	// }
-	// if(polyline == null) {
-	// polyline = UmaFactory.eINSTANCE.createPolyline();
-	// list.add(0, polyline);
-	// }
-	// return polyline;
-	// }
-	// }
-	// return null;
-	// }
-
-	/**
-	 * @param object
-	 * @return
-	 */
-	private Diagram createDiagram(Activity act, int diagramType) {
-		// check if this activity contributes/extends other activity and try
-		// copy
-		// the existing diagram from the base
-		//
-		if (ProcessUtil.isExtendingOrLocallyContributing(act)) {
-			Diagram baseDiagram = getUMADiagram((Activity) act
-					.getVariabilityBasedOnElement(), diagramType, false);
-			if (baseDiagram != null) {
-				Diagram copy = GraphicalDataHelper.copyDiagram(baseDiagram);
-
-				UMASemanticModelBridge modelBridge = (UMASemanticModelBridge) copy
-						.getSemanticModel();
-				modelBridge.setElement(act);
-				return copy;
-			}
-		}
-
-		Diagram diagram = UmaFactory.eINSTANCE.createDiagram();
-		UMASemanticModelBridge modelBridge = UmaFactory.eINSTANCE
-				.createUMASemanticModelBridge();
-		modelBridge.setElement(act);
-		modelBridge.setPresentation(diagramPresentations[diagramType]);
-		diagram.setSemanticModel(modelBridge);
-
-		// getDiagram(act, diagramType).setUMADiagram(diagram);
-
-		populateDiagram(diagram, act, diagramType);
-
-		return diagram;
-	}
-
-	private void populateDiagram(Diagram diagram, Activity act, int diagramType) {
-		// create GraphNode for each BreakdownElement and add it to the diagram
-		//
-		List nodes = new ArrayList();
-		for (Iterator iter = act.getBreakdownElements().iterator(); iter
-				.hasNext();) {
-			Object element = iter.next();
-			if (childTypes[diagramType].isInstance(element)) {
-				GraphNode node = createGraphNode((MethodElement) element);
-				diagram.getContained().add(node);
-				nodes.add(node);
-			}
-		}
-
-		// create GraphConnectors for each BreakdownElement
-		//
-		for (Iterator iter = nodes.iterator(); iter.hasNext();) {
-			GraphNode node = (GraphNode) iter.next();
-			createGraphConnectors(node, diagram, diagramType);
-		}
-	}
-
-//	private void populateActivityDiagram(Diagram diagram, Activity act) {
-//		// create GraphNode for each child activity and add it to the diagram
-//		// 
-//		List nodes = new ArrayList();
-//		for (Iterator iter = act.getBreakdownElements().iterator(); iter
-//				.hasNext();) {
-//			Object element = (Object) iter.next();
-//			if (element instanceof Activity) {
-//				Activity childAct = (Activity) element;
-//				GraphNode node = createGraphNode(childAct);
-//				diagram.getContained().add(node);
-//				nodes.add(node);
-//			}
-//		}
-//
-//		// create GraphConnectors for each child activity
-//		//
-//		for (Iterator iter = nodes.iterator(); iter.hasNext();) {
-//			GraphNode node = (GraphNode) iter.next();
-//			createGraphConnectors(node, diagram);
-//		}
-//	}
-
-	/**
-	 * @param act
-	 * @param diagramType
-	 * @return
-	 */
-	public IDiagramChangeListener getDiagramChangeListener(Activity act,
-			int diagramType) {
-		for (Iterator iter = act.eAdapters().iterator(); iter.hasNext();) {
-			Object element = (Object) iter.next();
-			if (diagramChangeListenerClasses[diagramType].isInstance(element)) {
-				return (IDiagramChangeListener) element;
-			}
-		}
-
-		return null;
-	}
-
-	public GraphNode createGraphNode(MethodElement element) {
-		GraphNode graphNode = UmaFactory.eINSTANCE.createGraphNode();
-		UMASemanticModelBridge modelBridge = UmaFactory.eINSTANCE
-				.createUMASemanticModelBridge();
-		modelBridge.setElement(element);
-		graphNode.setSemanticModel(modelBridge);
-		org.eclipse.epf.uma.Point point = UmaFactory.eINSTANCE.createPoint();
-		point.setX(new Double(-1));
-		point.setY(new Double(-1));
-		graphNode.setPosition(point);
-		org.eclipse.epf.uma.Dimension dim = UmaFactory.eINSTANCE.createDimension();
-		dim.setWidth(new Double(-1));
-		dim.setHeight(new Double(-1));
-		graphNode.setSize(dim);
-
-		return graphNode;
-	}
-
-	public GraphEdge addGraphConnectorPair(Diagram diagram,
-			GraphNode graphNode, WorkOrder element) {
-		GraphConnector srcConnector = UmaFactory.eINSTANCE
-				.createGraphConnector();
-		graphNode.getAnchorage().add(srcConnector);
-		GraphEdge edge = UmaFactory.eINSTANCE.createGraphEdge();
-		UMASemanticModelBridge bridge = UmaFactory.eINSTANCE
-				.createUMASemanticModelBridge();
-		bridge.setElement(element);
-		edge.setSemanticModel(bridge);
-		graphNode.getContained().add(edge);
-		edge.getAnchor().add(srcConnector);
-
-		GraphNode succNode = getGraphNode(diagram, UmaUtil
-				.getOwningActivity(element));
-		GraphConnector targetConnector = UmaFactory.eINSTANCE
-				.createGraphConnector();
-		succNode.getAnchorage().add(targetConnector);
-		edge.getAnchor().add(targetConnector);
-		return edge;
-	}
-
-	public GraphEdge addGraphConnectorPair(GraphNode srcNode,
-			GraphNode targetNode) {
-		GraphConnector srcConnector = UmaFactory.eINSTANCE
-				.createGraphConnector();
-		srcNode.getAnchorage().add(srcConnector);
-		GraphEdge edge = UmaFactory.eINSTANCE.createGraphEdge();
-		srcNode.getContained().add(edge);
-		edge.getAnchor().add(srcConnector);
-
-		GraphConnector targetConnector = UmaFactory.eINSTANCE
-				.createGraphConnector();
-		targetNode.getAnchorage().add(targetConnector);
-		edge.getAnchor().add(targetConnector);
-		return edge;
-	}
-
-	public void removeGraphEdge(GraphEdge edge) {
-		EcoreUtil.remove(edge);
-		for (Iterator iter = edge.getAnchor().iterator(); iter.hasNext();) {
-			GraphConnector conn = (GraphConnector) iter.next();
-			EcoreUtil.remove(conn);
-		}
-	}
-
-	// public void removeGraphConnectorPair(GraphNode srcNode, GraphNode
-	// targetNode) {
-	// // find the source GraphConnector and remove it, its GraphEdge, and its
-	// target GraphConnector
-	// //
-	// for (Iterator iter = srcNode.getAnchorage().iterator(); iter.hasNext();)
-	// {
-	// GraphConnector connector = (GraphConnector) iter.next();
-	// for (Iterator iterator = connector.getGraphEdge().iterator(); iterator
-	// .hasNext();) {
-	// GraphEdge edge = (GraphEdge) iterator.next();
-	// Object targetConnector = edge.getAnchor().get(1);
-	// if(targetNode.getAnchorage().remove(targetConnector)) {
-	// srcNode.getContained().remove(edge);
-	// // don't remove the edge from connector to support undo
-	// //
-	// // iterator.remove();
-	// }
-	// }
-	// if(connector.getGraphEdge().isEmpty()) {
-	// iter.remove();
-	// }
-	// }
-	// }
-
-	public void removeGraphConnectionPair(GraphNode graphNode,
-			WorkOrder workOrder) {
-		for (Iterator iter = graphNode.getAnchorage().iterator(); iter
-				.hasNext();) {
-			GraphConnector conn = (GraphConnector) iter.next();
-			GraphEdge edge = (GraphEdge) conn.getGraphEdge().get(0);
-			if (edge.eContainer() == graphNode) {
-				GraphConnector conn2 = (GraphConnector) edge.getAnchor().get(1);
-				SemanticModelBridge bridge = conn2.getGraphElement()
-						.getSemanticModel();
-				if (bridge instanceof UMASemanticModelBridge
-						&& ((UMASemanticModelBridge) bridge).getElement() == UmaUtil
-								.getOwningActivity(workOrder)) {
-					conn2.getGraphElement().getAnchorage().remove(conn2);
-					iter.remove();
-					graphNode.getContained().remove(edge);
-					return;
-				}
-			}
-		}
-	}
-
-	private void createGraphConnectors(GraphNode graphNode, Diagram diagram) {
-		createGraphConnectors(graphNode, diagram, getDiagramType(diagram));
-	}
-
-	int getDiagramType(Diagram diagram) {
-		String typeStr = diagram.getSemanticModel().getPresentation();
-		for (int i = 0; i < diagramPresentations.length; i++) {
-			if (diagramPresentations[i].equals(typeStr))
-				return i;
-		}
-		return -1;
-	}
-
-	private void createGraphConnectors(GraphNode graphNode, Diagram diagram,
-			int diagramType) {
-		MethodElement e = ((UMASemanticModelBridge) graphNode
-				.getSemanticModel()).getElement();
-		switch (diagramType) {
-		case GraphicalDataHelper.ACTIVITY_DIAGRAM:
-			if (e instanceof Activity) {
-				Activity act = (Activity) e;
-				// create connectors
-				//
-				// List list = act.getLinkToPredecessor();
-				// int size = list.size();
-				//				
-				// Activity parent = (Activity)
-				// ((UMASemanticModelBridge)diagram.getSemanticModel()).getElement();
-				// List breakdownElements = parent.getBreakdownElements();
-				// for(int i = 0; i < size; i++) {
-				// WorkOrder workOrder = (WorkOrder) list.get(i);
-				// if(breakdownElements.contains(workOrder.getPred())) {
-				// addGraphConnectorPair(diagram, graphNode, workOrder);
-				// }
-				// }
-
-				for (Iterator iter = act.getLinkToPredecessor().iterator(); iter
-						.hasNext();) {
-					WorkOrder workOrder = (WorkOrder) iter.next();
-					GraphNode srcNode = findGraphNode(diagram, workOrder
-							.getPred());
-					if (srcNode != null) {
-						addGraphConnectorPair(srcNode, graphNode);
-					}
-				}
-			}
-
-			break;
-		case GraphicalDataHelper.WORK_PRODUCT_DEPENDENCY_DIAGRAM:
-			if (e instanceof WorkProductDescriptor) {
-				WorkProductDescriptor descriptor = (WorkProductDescriptor) e;
-				for (Iterator iter = descriptor.getImpacts().iterator(); iter
-						.hasNext();) {
-					WorkProductDescriptor impactedDescriptor = (WorkProductDescriptor) iter
-							.next();
-					GraphNode targetNode = GraphicalDataManager.findGraphNode(
-							diagram, impactedDescriptor);
-					if (targetNode != null) {
-						addGraphConnectorPair(graphNode, targetNode);
-					}
-				}
-			}
-
-			break;
-		}
-
-	}
-
-	/**
-	 * Gets the UMA diagram from the UMA model for the given activity.
-	 * 
-	 * @param e
-	 * @param diagramType
-	 *            one of the diagram type constants defined in
-	 *            {@link GraphicalDataHelper GraphicalDataHelper }
-	 * @param create
-	 *            if true, new UMA diagram will be created if the activity does
-	 *            not have one already.
-	 * @return
-	 * @see GraphicalDataHelper#ACTIVITY_DIAGRAM
-	 * @see GraphicalDataHelper#ACTIVITY_DETAIL_DIAGRAM
-	 * @see GraphicalDataHelper#WORK_PRODUCT_DEPENDENCY_DIAGRAM
-	 */
-	public Diagram getUMADiagram(Activity e, int diagramType, boolean create) {
-		Diagram diagram = null;
-
-		// // look for IDiagramChangeListener in activity's adapter list first
-		// IDiagramChangeListener listener = (IDiagramChangeListener)
-		// UmaUtil.getAdapter(e, diagramListenerType);
-		// if(listener != null) {
-		// diagram = listener.getDiagram().getUMADiagram();
-		// if(diagram != null) return diagram;
-		// }
-
-		Object container = e.eContainer();
-		if (container != null) {
-			ProcessPackage pkg = (ProcessPackage) container;
-			for (Iterator iter = pkg.getDiagrams().iterator(); iter.hasNext();) {
-				diagram = (Diagram) iter.next();
-				SemanticModelBridge modelBridge = diagram.getSemanticModel();
-				if (modelBridge != null
-						&& modelBridge instanceof UMASemanticModelBridge
-						&& e == ((UMASemanticModelBridge) modelBridge)
-								.getElement()
-						&& diagramPresentations[diagramType]
-								.equals(((UMASemanticModelBridge) modelBridge)
-										.getPresentation())) {
-					return diagram;
-				}
-			}
-		}
-
-		if (create) {
-			// could not find it, create new one
-			//
-			diagram = createDiagram(e, diagramType);
-			if (container != null) {
-				((ProcessPackage) container).getDiagrams().add(diagram);
-			}
-			return diagram;
-		}
-		return null;
-	}
-
-	// public Diagram getUMADiagram(Activity act, int diagramType) {
-	// Diagram diagram = null;
-	//        
-	// // look for IDiagramChangeListener in activity's adapter list first
-	// IDiagramChangeListener listener = getDiagramChangeListener(act,
-	// diagramType);
-	// if(listener != null) {
-	// diagram = listener.getDiagram().getUMADiagram();
-	// if(diagram != null) return diagram;
-	// }
-	// Object container = act.eContainer();
-	// if(container != null) {
-	// ProcessPackage pkg = (ProcessPackage) container;
-	// for (Iterator iter = pkg.getDiagrams().iterator(); iter.hasNext();) {
-	// diagram = (Diagram) iter.next();
-	// SemanticModelBridge modelBridge = diagram.getSemanticModel();
-	// if(modelBridge != null && modelBridge instanceof UMASemanticModelBridge
-	// && act == ((UMASemanticModelBridge)modelBridge).getElement()
-	// &&
-	// diagramPresentations[diagramType].equals(((UMASemanticModelBridge)modelBridge).getPresentation()))
-	// {
-	// return diagram;
-	// }
-	// }
-	// }
-	//        
-	// // could not find it, create new one
-	// //
-	// return createDiagram(act, diagramType);
-	// }
-
-	/**
-	 * @param act
-	 * @return
-	 */
-	public org.eclipse.epf.diagram.model.Diagram getDiagram(Activity act,
-			int diagramType) {
-		IDiagramChangeListener listener = getDiagramChangeListener(act,
-				diagramType);
-		return listener == null ? null : listener.getDiagram();
-	}
-
-	/**
-	 * Gets list of command listeners that will handle the diagram related changes of the commands of interesses
-	 * 
-	 * @return
-	 * @see ICommandListener
-	 */
-	public List getCommandListeners() {
-		if (commandListeners == null) {
-			commandListeners = new ArrayList();
-		}
-
-		commandListeners.add(new ICommandListener() {
-			
-			public void notifyExecuted(Command command) {
-				// get contributor/replacer of the activity
-				//
-				Activity act = (Activity) command.getResult().iterator().next();
-				Activity base = (Activity) act.getVariabilityBasedOnElement();
-				if (base != null) {
-					Activity parentAct = act.getSuperActivities();
-					Diagram diagram = getUMADiagram(parentAct,
-							GraphicalDataHelper.ACTIVITY_DIAGRAM, false);
-					if (diagram != null) {
-						// find existing node for base and link it to the
-						// contributore/replacer of the activity
-						//
-						GraphNode graphNode = findGraphNode(diagram, base);
-						if (graphNode != null) {
-							UMASemanticModelBridge bridge = (UMASemanticModelBridge) graphNode
-									.getSemanticModel();
-							if (bridge.getElement() != act) {
-								bridge.setElement(act);
-							}
-						}
-					}
-					
-					if(act.getVariabilityType() == VariabilityType.LOCAL_CONTRIBUTION_LITERAL) {
-						// copy diagrams and their publishing options
-						//
-						for (int i = 0; i < GraphicalDataHelper.DIAGRAM_TYPES.length; i++) {
-							int diagramType = GraphicalDataHelper.DIAGRAM_TYPES[i];
-							diagram = getUMADiagram(base, diagramType, false);
-							if (diagram != null) {
-								Diagram copy = getUMADiagram(act, diagramType, true);
-								copy.setSuppressed(diagram.getSuppressed());
-							}
-						}
-					}
-				}
-			}
-
-			public Class getCommandType() {
-				return VaryActivityCommand.class;
-			}
-
-			public void preUndo(Command command) {
-				// get old contributor/replacer of the activity
-				//
-				Activity act = (Activity) command.getResult().iterator().next();
-//				VaryActivityCommand cmd = (VaryActivityCommand) command;
-//				BreakdownElementWrapperItemProvider adapter = cmd.getWrapper();
-				VariabilityElement baseAct = act.getVariabilityBasedOnElement();
-				if (baseAct != null) {
-					Activity parentAct = act.getSuperActivities();
-					Diagram diagram = getUMADiagram(parentAct,
-							GraphicalDataHelper.ACTIVITY_DIAGRAM, false);
-					if (diagram != null) {
-						// find existing node for the old contributore/replacer
-						// old and relink it to the base activity
-						//
-						GraphNode graphNode = findGraphNode(diagram, act);
-						if (graphNode != null) {
-							UMASemanticModelBridge bridge = (UMASemanticModelBridge) graphNode
-									.getSemanticModel();
-							if (bridge.getElement() != baseAct) {
-								bridge.setElement(baseAct);
-							}
-						}
-					}
-				}
-			}
-
-			public void preExecute(Command command) {
-				
-			}
-
-		});
-
-		return commandListeners;
-	}
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IActivityDetailDiagramChangeListener.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IActivityDetailDiagramChangeListener.java
deleted file mode 100755
index a70ea56..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IActivityDetailDiagramChangeListener.java
+++ /dev/null
@@ -1,22 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.util;
-
-/**
- * Diagram change listener for activity detail diagram
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface IActivityDetailDiagramChangeListener extends
-		IDiagramChangeListener {
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IActivityDiagramChangeListener.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IActivityDiagramChangeListener.java
deleted file mode 100755
index ba2adc2..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IActivityDiagramChangeListener.java
+++ /dev/null
@@ -1,21 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.util;
-
-/**
- * Diagram change listener for activity diagram
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface IActivityDiagramChangeListener extends IDiagramChangeListener {
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IActivityNodeChangeListener.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IActivityNodeChangeListener.java
deleted file mode 100755
index 41cce32..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IActivityNodeChangeListener.java
+++ /dev/null
@@ -1,21 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.util;
-
-/**
- * Node change listener for activity node
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface IActivityNodeChangeListener extends INodeChangeListener {
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IAdapterFactoryFilter.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IAdapterFactoryFilter.java
deleted file mode 100755
index a5b094c..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IAdapterFactoryFilter.java
+++ /dev/null
@@ -1,24 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.util;
-
-import org.eclipse.epf.library.edit.IAdapterFactoryProvider;
-import org.eclipse.epf.library.edit.IFilter;
-
-/**
- * Filter that provides adapter factories for different views of process
- * breakdown structure.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface IAdapterFactoryFilter extends IFilter, IAdapterFactoryProvider {
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IDiagramChangeListener.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IDiagramChangeListener.java
deleted file mode 100755
index eb189a8..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IDiagramChangeListener.java
+++ /dev/null
@@ -1,24 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.epf.diagram.model.Diagram;
-
-/**
- * Adapter to listen to diagram changes
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface IDiagramChangeListener extends Adapter {
-	Diagram getDiagram();
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/INodeChangeListener.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/INodeChangeListener.java
deleted file mode 100755
index 3480d05..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/INodeChangeListener.java
+++ /dev/null
@@ -1,24 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.epf.diagram.model.Node;
-
-/**
- * Adapter to listen to changes in diagram node
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface INodeChangeListener extends Adapter {
-	Node getNode();
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IWPDDiagramChangeListener.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IWPDDiagramChangeListener.java
deleted file mode 100755
index 1c602e5..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/IWPDDiagramChangeListener.java
+++ /dev/null
@@ -1,21 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.util;
-
-/**
- * Diagram change listener for work product dependency diagram.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface IWPDDiagramChangeListener extends IDiagramChangeListener {
-
-}
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/ModelAdapterFactory.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/ModelAdapterFactory.java
deleted file mode 100755
index 856bda4..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/ModelAdapterFactory.java
+++ /dev/null
@@ -1,498 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.diagram.model.*;
-
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.ActivityDiagram;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.LinkedObject;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.NodeContainer;
-import org.eclipse.epf.diagram.model.RoleNode;
-import org.eclipse.epf.diagram.model.RoleTaskComposite;
-import org.eclipse.epf.diagram.model.TaskNode;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.WorkBreakdownElementNode;
-import org.eclipse.epf.diagram.model.WorkProductComposite;
-import org.eclipse.epf.diagram.model.WorkProductDependencyDiagram;
-import org.eclipse.epf.diagram.model.WorkProductDescriptorNode;
-import org.eclipse.epf.diagram.model.WorkProductNode;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.diagram.model.ModelPackage
- * @generated
- */
-public class ModelAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected static ModelPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public ModelAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = ModelPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-     * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-     * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-    public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected ModelSwitch modelSwitch =
-		new ModelSwitch() {
-			public Object caseDiagram(Diagram object) {
-				return createDiagramAdapter();
-			}
-			public Object caseLink(Link object) {
-				return createLinkAdapter();
-			}
-			public Object caseLinkedObject(LinkedObject object) {
-				return createLinkedObjectAdapter();
-			}
-			public Object caseNamedNode(NamedNode object) {
-				return createNamedNodeAdapter();
-			}
-			public Object caseNode(Node object) {
-				return createNodeAdapter();
-			}
-			public Object caseActivityDiagram(ActivityDiagram object) {
-				return createActivityDiagramAdapter();
-			}
-			public Object caseTypedNode(TypedNode object) {
-				return createTypedNodeAdapter();
-			}
-			public Object caseWorkProductDependencyDiagram(WorkProductDependencyDiagram object) {
-				return createWorkProductDependencyDiagramAdapter();
-			}
-			public Object caseWorkProductNode(WorkProductNode object) {
-				return createWorkProductNodeAdapter();
-			}
-			public Object caseActivityDetailDiagram(ActivityDetailDiagram object) {
-				return createActivityDetailDiagramAdapter();
-			}
-			public Object caseNodeContainer(NodeContainer object) {
-				return createNodeContainerAdapter();
-			}
-			public Object caseRoleNode(RoleNode object) {
-				return createRoleNodeAdapter();
-			}
-			public Object caseRoleTaskComposite(RoleTaskComposite object) {
-				return createRoleTaskCompositeAdapter();
-			}
-			public Object caseTaskNode(TaskNode object) {
-				return createTaskNodeAdapter();
-			}
-			public Object caseWorkProductDescriptorNode(WorkProductDescriptorNode object) {
-				return createWorkProductDescriptorNodeAdapter();
-			}
-			public Object caseWorkBreakdownElementNode(WorkBreakdownElementNode object) {
-				return createWorkBreakdownElementNodeAdapter();
-			}
-			public Object caseWorkProductComposite(WorkProductComposite object) {
-				return createWorkProductCompositeAdapter();
-			}
-			public Object caseModel_LinkedObject(LinkedObject object) {
-				return createModel_LinkedObjectAdapter();
-			}
-			public Object caseModel_Node(Node object) {
-				return createModel_NodeAdapter();
-			}
-			public Object caseModel_NodeContainer(NodeContainer object) {
-				return createModel_NodeContainerAdapter();
-			}
-			public Object caseModel_Diagram(Diagram object) {
-				return createModel_DiagramAdapter();
-			}
-			public Object caseModel_NamedNode(NamedNode object) {
-				return createModel_NamedNodeAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-    public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.Diagram <em>Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.Diagram
-	 * @generated
-	 */
-    public Adapter createDiagramAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.Link <em>Link</em>}'.
-	 * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.Link
-	 * @generated
-	 */
-    public Adapter createLinkAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.LinkedObject <em>Linked Object</em>}'.
-	 * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.LinkedObject
-	 * @generated
-	 */
-    public Adapter createLinkedObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.NamedNode <em>Named Node</em>}'.
-	 * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.NamedNode
-	 * @generated
-	 */
-    public Adapter createNamedNodeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.Node <em>Node</em>}'.
-	 * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.Node
-	 * @generated
-	 */
-    public Adapter createNodeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.ActivityDiagram <em>Activity Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.ActivityDiagram
-	 * @generated
-	 */
-    public Adapter createActivityDiagramAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.TypedNode <em>Typed Node</em>}'.
-	 * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.TypedNode
-	 * @generated
-	 */
-    public Adapter createTypedNodeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.WorkProductDependencyDiagram <em>Work Product Dependency Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.WorkProductDependencyDiagram
-	 * @generated
-	 */
-	public Adapter createWorkProductDependencyDiagramAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.WorkProductNode <em>Work Product Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.WorkProductNode
-	 * @generated
-	 */
-	public Adapter createWorkProductNodeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.ActivityDetailDiagram <em>Activity Detail Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.ActivityDetailDiagram
-	 * @generated
-	 */
-	public Adapter createActivityDetailDiagramAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.NodeContainer <em>Node Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.NodeContainer
-	 * @generated
-	 */
-	public Adapter createNodeContainerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.RoleNode <em>Role Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.RoleNode
-	 * @generated
-	 */
-	public Adapter createRoleNodeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.RoleTaskComposite <em>Role Task Composite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.RoleTaskComposite
-	 * @generated
-	 */
-	public Adapter createRoleTaskCompositeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.TaskNode <em>Task Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.TaskNode
-	 * @generated
-	 */
-	public Adapter createTaskNodeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.WorkProductDescriptorNode <em>Work Product Descriptor Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.WorkProductDescriptorNode
-	 * @generated
-	 */
-	public Adapter createWorkProductDescriptorNodeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.WorkBreakdownElementNode <em>Work Breakdown Element Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.WorkBreakdownElementNode
-	 * @generated
-	 */
-	public Adapter createWorkBreakdownElementNodeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.WorkProductComposite <em>Work Product Composite</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.WorkProductComposite
-	 * @generated
-	 */
-	public Adapter createWorkProductCompositeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.LinkedObject <em>Linked Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.LinkedObject
-	 * @generated
-	 */
-	public Adapter createModel_LinkedObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.Node <em>Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.Node
-	 * @generated
-	 */
-	public Adapter createModel_NodeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.NodeContainer <em>Node Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.NodeContainer
-	 * @generated
-	 */
-	public Adapter createModel_NodeContainerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.Diagram <em>Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.Diagram
-	 * @generated
-	 */
-	public Adapter createModel_DiagramAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.diagram.model.NamedNode <em>Named Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.diagram.model.NamedNode
-	 * @generated
-	 */
-	public Adapter createModel_NamedNodeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-     * This default implementation returns null.
-     * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-    public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //ModelAdapterFactory
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/ModelSwitch.java b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/ModelSwitch.java
deleted file mode 100755
index 1272ed4..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/ModelSwitch.java
+++ /dev/null
@@ -1,608 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagram.model.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.diagram.model.*;
-
-import org.eclipse.epf.diagram.model.ActivityDetailDiagram;
-import org.eclipse.epf.diagram.model.ActivityDiagram;
-import org.eclipse.epf.diagram.model.Diagram;
-import org.eclipse.epf.diagram.model.Link;
-import org.eclipse.epf.diagram.model.LinkedObject;
-import org.eclipse.epf.diagram.model.ModelPackage;
-import org.eclipse.epf.diagram.model.NamedNode;
-import org.eclipse.epf.diagram.model.Node;
-import org.eclipse.epf.diagram.model.NodeContainer;
-import org.eclipse.epf.diagram.model.RoleNode;
-import org.eclipse.epf.diagram.model.RoleTaskComposite;
-import org.eclipse.epf.diagram.model.TaskNode;
-import org.eclipse.epf.diagram.model.TypedNode;
-import org.eclipse.epf.diagram.model.WorkBreakdownElementNode;
-import org.eclipse.epf.diagram.model.WorkProductComposite;
-import org.eclipse.epf.diagram.model.WorkProductDependencyDiagram;
-import org.eclipse.epf.diagram.model.WorkProductDescriptorNode;
-import org.eclipse.epf.diagram.model.WorkProductNode;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.diagram.model.ModelPackage
- * @generated
- */
-public class ModelSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected static ModelPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public ModelSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ModelPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-    public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-    protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-    protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ModelPackage.DIAGRAM: {
-				Diagram diagram = (Diagram)theEObject;
-				Object result = caseDiagram(diagram);
-				if (result == null) result = caseModel_NodeContainer(diagram);
-				if (result == null) result = caseModel_Node(diagram);
-				if (result == null) result = caseModel_LinkedObject(diagram);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.LINK: {
-				Link link = (Link)theEObject;
-				Object result = caseLink(link);
-				if (result == null) result = caseModel_LinkedObject(link);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.LINKED_OBJECT: {
-				LinkedObject linkedObject = (LinkedObject)theEObject;
-				Object result = caseLinkedObject(linkedObject);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.NAMED_NODE: {
-				NamedNode namedNode = (NamedNode)theEObject;
-				Object result = caseNamedNode(namedNode);
-				if (result == null) result = caseModel_Node(namedNode);
-				if (result == null) result = caseModel_LinkedObject(namedNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.NODE: {
-				Node node = (Node)theEObject;
-				Object result = caseNode(node);
-				if (result == null) result = caseModel_LinkedObject(node);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.ACTIVITY_DIAGRAM: {
-				ActivityDiagram activityDiagram = (ActivityDiagram)theEObject;
-				Object result = caseActivityDiagram(activityDiagram);
-				if (result == null) result = caseModel_Diagram(activityDiagram);
-				if (result == null) result = caseModel_NodeContainer(activityDiagram);
-				if (result == null) result = caseModel_Node(activityDiagram);
-				if (result == null) result = caseModel_LinkedObject(activityDiagram);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.TYPED_NODE: {
-				TypedNode typedNode = (TypedNode)theEObject;
-				Object result = caseTypedNode(typedNode);
-				if (result == null) result = caseModel_Node(typedNode);
-				if (result == null) result = caseModel_LinkedObject(typedNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.WORK_PRODUCT_DEPENDENCY_DIAGRAM: {
-				WorkProductDependencyDiagram workProductDependencyDiagram = (WorkProductDependencyDiagram)theEObject;
-				Object result = caseWorkProductDependencyDiagram(workProductDependencyDiagram);
-				if (result == null) result = caseModel_Diagram(workProductDependencyDiagram);
-				if (result == null) result = caseModel_NodeContainer(workProductDependencyDiagram);
-				if (result == null) result = caseModel_Node(workProductDependencyDiagram);
-				if (result == null) result = caseModel_LinkedObject(workProductDependencyDiagram);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.WORK_PRODUCT_NODE: {
-				WorkProductNode workProductNode = (WorkProductNode)theEObject;
-				Object result = caseWorkProductNode(workProductNode);
-				if (result == null) result = caseModel_NamedNode(workProductNode);
-				if (result == null) result = caseModel_Node(workProductNode);
-				if (result == null) result = caseModel_LinkedObject(workProductNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.ACTIVITY_DETAIL_DIAGRAM: {
-				ActivityDetailDiagram activityDetailDiagram = (ActivityDetailDiagram)theEObject;
-				Object result = caseActivityDetailDiagram(activityDetailDiagram);
-				if (result == null) result = caseModel_Diagram(activityDetailDiagram);
-				if (result == null) result = caseModel_NodeContainer(activityDetailDiagram);
-				if (result == null) result = caseModel_Node(activityDetailDiagram);
-				if (result == null) result = caseModel_LinkedObject(activityDetailDiagram);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.NODE_CONTAINER: {
-				NodeContainer nodeContainer = (NodeContainer)theEObject;
-				Object result = caseNodeContainer(nodeContainer);
-				if (result == null) result = caseModel_Node(nodeContainer);
-				if (result == null) result = caseModel_LinkedObject(nodeContainer);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.ROLE_NODE: {
-				RoleNode roleNode = (RoleNode)theEObject;
-				Object result = caseRoleNode(roleNode);
-				if (result == null) result = caseModel_NamedNode(roleNode);
-				if (result == null) result = caseModel_Node(roleNode);
-				if (result == null) result = caseModel_LinkedObject(roleNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.ROLE_TASK_COMPOSITE: {
-				RoleTaskComposite roleTaskComposite = (RoleTaskComposite)theEObject;
-				Object result = caseRoleTaskComposite(roleTaskComposite);
-				if (result == null) result = caseModel_NodeContainer(roleTaskComposite);
-				if (result == null) result = caseModel_Node(roleTaskComposite);
-				if (result == null) result = caseModel_LinkedObject(roleTaskComposite);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.TASK_NODE: {
-				TaskNode taskNode = (TaskNode)theEObject;
-				Object result = caseTaskNode(taskNode);
-				if (result == null) result = caseModel_NamedNode(taskNode);
-				if (result == null) result = caseModel_Node(taskNode);
-				if (result == null) result = caseModel_LinkedObject(taskNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.WORK_PRODUCT_DESCRIPTOR_NODE: {
-				WorkProductDescriptorNode workProductDescriptorNode = (WorkProductDescriptorNode)theEObject;
-				Object result = caseWorkProductDescriptorNode(workProductDescriptorNode);
-				if (result == null) result = caseModel_NamedNode(workProductDescriptorNode);
-				if (result == null) result = caseModel_Node(workProductDescriptorNode);
-				if (result == null) result = caseModel_LinkedObject(workProductDescriptorNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.WORK_BREAKDOWN_ELEMENT_NODE: {
-				WorkBreakdownElementNode workBreakdownElementNode = (WorkBreakdownElementNode)theEObject;
-				Object result = caseWorkBreakdownElementNode(workBreakdownElementNode);
-				if (result == null) result = caseModel_NamedNode(workBreakdownElementNode);
-				if (result == null) result = caseModel_Node(workBreakdownElementNode);
-				if (result == null) result = caseModel_LinkedObject(workBreakdownElementNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.WORK_PRODUCT_COMPOSITE: {
-				WorkProductComposite workProductComposite = (WorkProductComposite)theEObject;
-				Object result = caseWorkProductComposite(workProductComposite);
-				if (result == null) result = caseModel_NodeContainer(workProductComposite);
-				if (result == null) result = caseModel_Node(workProductComposite);
-				if (result == null) result = caseModel_LinkedObject(workProductComposite);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Diagram</em>'.
-	 * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Diagram</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-    public Object caseDiagram(Diagram object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Link</em>'.
-	 * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Link</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-    public Object caseLink(Link object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Linked Object</em>'.
-	 * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Linked Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-    public Object caseLinkedObject(LinkedObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Named Node</em>'.
-	 * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Named Node</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-    public Object caseNamedNode(NamedNode object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Node</em>'.
-	 * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Node</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-    public Object caseNode(Node object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Activity Diagram</em>'.
-	 * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Activity Diagram</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-    public Object caseActivityDiagram(ActivityDiagram object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Typed Node</em>'.
-	 * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Typed Node</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-    public Object caseTypedNode(TypedNode object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Product Dependency Diagram</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Product Dependency Diagram</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkProductDependencyDiagram(WorkProductDependencyDiagram object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Product Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Product Node</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkProductNode(WorkProductNode object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Activity Detail Diagram</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Activity Detail Diagram</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseActivityDetailDiagram(ActivityDetailDiagram object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Node Container</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Node Container</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseNodeContainer(NodeContainer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role Node</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoleNode(RoleNode object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role Task Composite</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role Task Composite</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoleTaskComposite(RoleTaskComposite object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Task Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Task Node</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTaskNode(TaskNode object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Product Descriptor Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Product Descriptor Node</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkProductDescriptorNode(WorkProductDescriptorNode object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Breakdown Element Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Breakdown Element Node</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkBreakdownElementNode(WorkBreakdownElementNode object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Product Composite</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Product Composite</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkProductComposite(WorkProductComposite object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Linked Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Linked Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseModel_LinkedObject(LinkedObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Node</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseModel_Node(Node object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Node Container</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Node Container</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseModel_NodeContainer(NodeContainer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Diagram</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Diagram</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseModel_Diagram(Diagram object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Named Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Named Node</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseModel_NamedNode(NamedNode object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch, but this is the last case anyway.
-     * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-    public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //ModelSwitch
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/package.html b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/package.html
deleted file mode 100755
index e17c8a7..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/model/util/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides implementation support for accessing the activity diagram model objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/package.html b/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/package.html
deleted file mode 100755
index a49c40a..0000000
--- a/plugins/org.eclipse.epf.diagram/src/org/eclipse/epf/diagram/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides resource bundle support for the activity diagram models.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export.msp/.classpath b/plugins/org.eclipse.epf.export.msp/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/plugins/org.eclipse.epf.export.msp/.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/plugins/org.eclipse.epf.export.msp/.cvsignore b/plugins/org.eclipse.epf.export.msp/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.export.msp/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.export.msp/.options b/plugins/org.eclipse.epf.export.msp/.options
deleted file mode 100755
index cf274ec..0000000
--- a/plugins/org.eclipse.epf.export.msp/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-# Turn on debug trace for the Rich Text plug-in
-org.eclipse.epf.export.msp/debug=true
diff --git a/plugins/org.eclipse.epf.export.msp/.project b/plugins/org.eclipse.epf.export.msp/.project
deleted file mode 100755
index 94031ba..0000000
--- a/plugins/org.eclipse.epf.export.msp/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.export.msp</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/plugins/org.eclipse.epf.export.msp/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.export.msp/META-INF/MANIFEST.MF
deleted file mode 100755
index 1933fb2..0000000
--- a/plugins/org.eclipse.epf.export.msp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.export.msp; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.epf.export.msp.ExportMSPPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.epf.export;visibility:=reexport,
- org.eclipse.epf.msproject;visibility:=reexport,
- org.eclipse.epf.publishing,
- org.eclipse.epf.publishing.ui;visibility:=reexport,
- org.eclipse.ui
-Eclipse-LazyStart: true
-Bundle-Vendor: %providerName
-Bundle-ClassPath: exportmsp.jar
-Export-Package: org.eclipse.epf.export.msp
diff --git a/plugins/org.eclipse.epf.export.msp/build.properties b/plugins/org.eclipse.epf.export.msp/build.properties
deleted file mode 100755
index 1d2e46c..0000000
--- a/plugins/org.eclipse.epf.export.msp/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.exportmsp.jar = src/
-output.exportmsp.jar = bin/
-bin.includes = exportmsp.jar,\
-               plugin.properties,\
-               plugin.xml,\
-               template/,\
-               META-INF/,\
-               .options
-
diff --git a/plugins/org.eclipse.epf.export.msp/plugin.properties b/plugins/org.eclipse.epf.export.msp/plugin.properties
deleted file mode 100755
index e5fe0d8..0000000
--- a/plugins/org.eclipse.epf.export.msp/plugin.properties
+++ /dev/null
@@ -1,19 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Export Microsoft Project
-providerName=Eclipse.org
-
-# Wizards
-exportProjectTemplateWizardName=Microsoft Project
-exportProjectTemplateWizardDescription=Export a process to a Microsoft Project.
diff --git a/plugins/org.eclipse.epf.export.msp/plugin.xml b/plugins/org.eclipse.epf.export.msp/plugin.xml
deleted file mode 100755
index 367e2f8..0000000
--- a/plugins/org.eclipse.epf.export.msp/plugin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-<!--
-   <extension
-         point="org.eclipse.ui.exportWizards">
-      <wizard
-            category="org.eclipse.epf.ui.exportWizards.category"
-            class="org.eclipse.epf.export.msp.ui.wizards.ExportMSPWizard"
-            icon="icons/full/obj16/MSProject.gif"
-            id="org.eclipse.epf.export.msp.wizards.ExportToMSProjectWizard"
-            name="%exportProjectTemplateWizardName">
-         <description>
-               %exportProjectTemplateWizardDescription
-         </description>
-      </wizard>
-   </extension>
-   
-   <extension-point
-         id="exportMSPWizard"
-         name="Export Microsoft Project Wizard Extension"
-         schema="schema/ExportMSPWizard.exsd" />
-
-   <extension
-         point="org.eclipse.epf.ui.exportWizards">
-      <wizard id="org.eclipse.epf.export.msp.wizards.ExportToMSProjectWizard"/>
-   </extension>
--->
-
-</plugin>
diff --git a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPException.java b/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPException.java
deleted file mode 100755
index 14bc726..0000000
--- a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPException.java
+++ /dev/null
@@ -1,63 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.msp;
-
-/**
- * Signals that an Export Microsoft Project operation has failed.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportMSPException extends ExportMSPServiceException {
-
-	private static final long serialVersionUID = -923189700561806262L;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportMSPException() {
-		super();
-	}
-
-	/**
-	 * Creates a new instance given the root cause of the exception.
-	 * 
-	 * @param rootCause
-	 *            the root cause of the exception
-	 */
-	public ExportMSPException(Throwable rootCause) {
-		super(rootCause);
-	}
-
-	/**
-	 * Creates a new instance given the error message.
-	 * 
-	 * @param errorMsg
-	 *            the error message
-	 */
-	public ExportMSPException(String errorMsg) {
-		super(errorMsg);
-	}
-
-	/**
-	 * Creates a new instance given the root cause of the exception and the
-	 * error message.
-	 * 
-	 * @param rootCause
-	 *            the root cause of the exception
-	 * @param errorMsg
-	 *            the error message
-	 */
-	public ExportMSPException(Throwable rootCause, String errorMsg) {
-		super(rootCause, errorMsg);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPOptions.java b/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPOptions.java
deleted file mode 100755
index b9c7254..0000000
--- a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPOptions.java
+++ /dev/null
@@ -1,44 +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.export.msp;
-
-import org.eclipse.epf.export.ExportProcessOptions;
-
-/**
- * The export Microsoft Project options.
- * 
- * @author Kelvin Low
- * @since 7.2
- */
-public class ExportMSPOptions extends ExportProcessOptions {
-
-	private String msprojectName;
-
-	/**
-	 * Gets the Microsoft Project name.
-	 * 
-	 * @return the name of the exported Microsoft Project name
-	 */
-	public String getMSProjectName() {
-		return msprojectName;
-	}
-
-	/**
-	 * Sets the Microsoft Project name.
-	 * 
-	 * @param templateName
-	 *            the name of the exported Microsoft Project
-	 */
-	public void setMSProjectName(String msprojectName) {
-		this.msprojectName = msprojectName;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPPlugin.java b/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPPlugin.java
deleted file mode 100755
index 28d6b2d..0000000
--- a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPPlugin.java
+++ /dev/null
@@ -1,58 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.msp;
-
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The Export Microsoft Project plug-in class.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportMSPPlugin extends AbstractPlugin {
-
-	// The shared instance.
-	private static ExportMSPPlugin plugin;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportMSPPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * @see AbstractPlugin#start(BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * @see AbstractPlugin#stop(BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static ExportMSPPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPResources.java b/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPResources.java
deleted file mode 100755
index 12af486..0000000
--- a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPResources.java
+++ /dev/null
@@ -1,80 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.msp;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The Export Microsoft Project message resource bundle accessor class.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public final class ExportMSPResources extends NLS {
-
-	private static String BUNDLE_NAME = ExportMSPResources.class.getPackage()
-			.getName()
-			+ ".Resources"; //$NON-NLS-1$
-
-	private ExportMSPResources() {
-		// Do not instantiate
-	}
-
-	public static String exportMSPWizard_title;
-
-	public static String selectProcessWizardPage_title;
-
-	public static String selectProcessWizardPage_text;
-
-	public static String processGroup_text;
-
-	public static String capabilityPatternRadioButton_text;
-
-	public static String deliveryProcessRadioButton_text;
-
-	public static String processNameLabel_text;
-
-	public static String contextNameLabel_text;
-
-	public static String optionsGroup_text;
-
-	public static String publishConfigurationCheckBox_text;
-
-	public static String exportOnlyPlannedElementsCheckBox_text;
-
-	public static String selectPublishOptionsWizardPage_title;
-
-	public static String selectPublishOptionsWizardPage_text;
-
-	public static String selectExportDirWizardPage_title;
-
-	public static String selectExportDirWizardPage_text;
-
-	public static String projectNameLabel_text;
-
-	public static String dirLabel_text;
-
-	public static String browseButton_text;
-
-	public static String exportMSPTask_name;
-
-	public static String overwriteText_msg;
-
-	public static String completedText_msg;
-
-	public static String exportMSPError_msg;
-
-	public static String exportMSPError_reason;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ExportMSPResources.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPService.java b/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPService.java
deleted file mode 100755
index 9b6270d..0000000
--- a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPService.java
+++ /dev/null
@@ -1,49 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.msp;
-
-import org.eclipse.epf.uma.Process;
-
-/**
- * The default Export Microsoft Project Service implementation.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportMSPService implements IExportMSPService {
-
-	// The shared instance.
-	private static ExportMSPService instance = null;
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static ExportMSPService getInstance() {
-		if (instance == null) {
-			synchronized (ExportMSPService.class) {
-				if (instance == null) {
-					instance = new ExportMSPService();
-				}
-			}
-		}
-		return instance;
-	}
-
-	/**
-	 * @see org.eclipse.epf.export.msp.IExportMSPService#exportMSProject(Process,
-	 *      ExportMSPOptions)
-	 */
-	public boolean exportMSProject(Process process,
-			ExportMSPOptions exportOptions) throws ExportMSPServiceException {
-		return new ExportMSPXMLService().export(process, exportOptions);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPServiceException.java b/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPServiceException.java
deleted file mode 100755
index fffa11f..0000000
--- a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPServiceException.java
+++ /dev/null
@@ -1,84 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.msp;
-
-/**
- * Signals that a Export Project Plan Service operation has failed.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportMSPServiceException extends Exception {
-
-	private static final long serialVersionUID = -6103689868572480359L;
-
-	/**
-	 * The root cause of the exception.
-	 */
-	protected Throwable rootCause;
-
-	/**
-	 * The error message associated with the exception.
-	 */
-	protected String errorMsg;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportMSPServiceException() {
-		super();
-	}
-
-	/**
-	 * Creates a new instance given the root cause of the exception.
-	 * 
-	 * @param rootCause
-	 *            the root cause of the exception
-	 */
-	public ExportMSPServiceException(Throwable rootCause) {
-		this(rootCause, rootCause.getMessage());
-	}
-
-	/**
-	 * Creates a new instance given the error message.
-	 * 
-	 * @param errorMsg
-	 *            the error message
-	 */
-	public ExportMSPServiceException(String errorMsg) {
-		this(null, errorMsg);
-	}
-
-	/**
-	 * Creates a new instance given the root cause of the exception and the
-	 * error message.
-	 * 
-	 * @param rootCause
-	 *            the root cause of the exception
-	 * @param errorMsg
-	 *            the error message
-	 */
-	public ExportMSPServiceException(Throwable rootCause, String errorMsg) {
-		super();
-		this.rootCause = rootCause;
-		this.errorMsg = errorMsg;
-	}
-
-	/**
-	 * Returns the root cause of the exception.
-	 * 
-	 * @return the root cause of the exception
-	 */
-	public Throwable getRootCause() {
-		return rootCause;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPXMLOperation.java b/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPXMLOperation.java
deleted file mode 100755
index 56ec3e7..0000000
--- a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPXMLOperation.java
+++ /dev/null
@@ -1,73 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.msp;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.epf.publishing.services.AbstractPublishManager;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-/**
- * The Export Microsoft Project XML file operation.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportMSPXMLOperation implements IRunnableWithProgress {
-
-	private AbstractPublishManager publishMgr;
-
-	private String published_url;
-
-	private Exception exception;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportMSPXMLOperation(AbstractPublishManager publishMgr) {
-		super();
-		this.publishMgr = publishMgr;
-	}
-
-	/**
-	 * Returns the published URL.
-	 */
-	public String getPublishedUrl() {
-		return published_url;
-	}
-
-	/**
-	 * Returns the exception, if any, that occurred while running the operation.
-	 */
-	public Exception getException() {
-		return exception;
-	}
-
-	/**
-	 * @see org.eclipse.jface.operation.IRunnableWithProgress#run(IProgressMonitor)
-	 */
-	public void run(IProgressMonitor monitor) throws InvocationTargetException,
-			InterruptedException {
-		exception = null;
-		monitor.beginTask("", IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-		monitor.setTaskName(ExportMSPResources.exportMSPTask_name);
-		try {
-			publishMgr.publish(monitor);
-			published_url = publishMgr.getPublishedUrl();
-		} catch (Exception e) {
-			exception = e;
-		} finally {
-			monitor.done();
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPXMLService.java b/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPXMLService.java
deleted file mode 100755
index dd400c6..0000000
--- a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportMSPXMLService.java
+++ /dev/null
@@ -1,1282 +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.export.msp;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.edit.provider.AdapterFactoryTreeIterator;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.epf.common.utils.XMLUtil;
-import org.eclipse.epf.library.configuration.ConfigurationHelper;
-import org.eclipse.epf.library.configuration.ProcessConfigurator;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.process.ActivityWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.IBSItemProvider;
-import org.eclipse.epf.library.edit.process.RoleDescriptorWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.TaskDescriptorWrapperItemProvider;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.library.edit.util.ConfigurableComposedAdapterFactory;
-import org.eclipse.epf.library.edit.util.PredecessorList;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.msproject.Assignment;
-import org.eclipse.epf.msproject.DocumentRoot;
-import org.eclipse.epf.msproject.MsprojectFactory;
-import org.eclipse.epf.msproject.PredecessorLink;
-import org.eclipse.epf.msproject.Project;
-import org.eclipse.epf.msproject.Resource;
-import org.eclipse.epf.msproject.Task;
-import org.eclipse.epf.msproject.util.MsprojectResourceImpl;
-import org.eclipse.epf.publishing.services.PublishManager;
-import org.eclipse.epf.publishing.services.PublishOptions;
-import org.eclipse.epf.publishing.wizards.PublishProgressMonitorDialog;
-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.DescribableElement;
-import org.eclipse.epf.uma.Descriptor;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * The default Export Microsoft Project Plan Service implementation.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- * 
- * Bugs fixed: https://bugs.eclipse.org/bugs/show_bug.cgi?id=155089
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=155086
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=155095
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=157265
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=155155
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=156959
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=157321
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=159230
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=162336
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=168801
- * fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=176951
- */
-public class ExportMSPXMLService {
-
-	// If true, generate debug traces.
-	private static boolean debug = ExportMSPPlugin.getDefault().isDebugging();
-
-	// All Tasks referenced by the exported Project Template.
-	private List referencedTasks = new ArrayList();
-
-	private HashMap rolesToUidMap = new HashMap();
-
-	private HashMap taskUidToWbsWapperPathMap = new HashMap();
-
-	private HashMap wbsWapperPathToLocalPredListMap = new HashMap();
-
-	private HashMap wbsGuidToTaskUidMap = new HashMap();
-
-	private HashMap wbsWrapperPathToPredListMap = new HashMap();
-
-	// The name of the content folder. This will be named after the context.
-	private String contentFolderName;
-
-	private String abTargetDir;
-
-	// If true, only export breakdown elements with 'isPlanned' attributes set
-	// to true.
-	private boolean exportOnlyPlannedElements;
-
-	private boolean publishContentSite = false;
-
-	private int task_uid = 1;
-
-	private int res_uid = 1;
-
-	private int assign_uid = 1;
-
-	private MsprojectFactory projectFactory = MsprojectFactory.eINSTANCE;
-
-	// The process to be exported.
-	private Process process;
-
-	private ConfigurableComposedAdapterFactory wbsAdapterFactory;
-
-	// The process configurator for filtering breakdown elements in a
-	// configuration.
-	private ProcessConfigurator breakdownElementFilter;
-
-	private IStructuredContentProvider wbsContentProvider;
-
-	// Map processes to suppression objects.
-	private Map suppressionMap = new HashMap();
-
-	// The suppression object associated with the selected process to be
-	// exported.
-	private Suppression suppression;
-
-	// The WBS element paths.
-	private Stack elementPaths = new Stack();
-
-	private Object currentElement;
-
-	private String currentElementPath;
-
-	private PredecessorList currentPredList;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportMSPXMLService() {
-		super();
-	}
-
-	/**
-	 * Export a process to a Microsoft Project XML file.
-	 * 
-	 * @param process
-	 *            a capability pattern or delivery process
-	 * @param exportOptions
-	 *            a collection of user specified export options
-	 * @throws ExportMSPServiceException
-	 *             if an error occurs while executing the operation
-	 */
-	public boolean export(Process process, ExportMSPOptions exportOptions)
-			throws ExportMSPServiceException {
-		String msprojectName = exportOptions.getMSProjectName();
-		File exportDir = exportOptions.getExportDir();
-		publishContentSite = exportOptions.getPublishWebSite();
-		PublishOptions publishingOptions = exportOptions.getPublishingOptions();
-
-		if (debug) {
-			System.out.println("$$$ exporting to Microsoft Project!"); //$NON-NLS-1$
-			System.out.println("$$$ process                   = " + process); //$NON-NLS-1$
-			System.out.println("$$$ msprojectName             = " //$NON-NLS-1$
-					+ msprojectName);
-			System.out
-					.println("$$$ targetDir                 = " + exportDir.getAbsolutePath()); //$NON-NLS-1$
-			System.out.println("$$$ exportOnlyPlannedElements = " //$NON-NLS-1$
-					+ exportOnlyPlannedElements);
-			System.out.println("$$$ publishConfigOptions      = " //$NON-NLS-1$
-					+ publishingOptions);
-		}
-
-		// construct the export target xml file path
-		if (!exportDir.exists()) {
-			exportDir.mkdirs();
-		}
-		abTargetDir = exportDir.getAbsolutePath();
-		Path exportPath = new Path(abTargetDir);
-		boolean endWithXmlExt = msprojectName.toLowerCase().endsWith(".xml"); //$NON-NLS-1$
-		String exportPathStr = (exportPath.append(endWithXmlExt ? msprojectName
-				: (msprojectName + ".xml"))).toOSString(); //$NON-NLS-1$
-		if (debug)
-			System.out.println("$$$ exportPathStr                 = " //$NON-NLS-1$
-					+ exportPathStr);
-
-		// construct the empty MS project xml template file path
-		String emptyTemplateFile = ExportMSPPlugin.getDefault()
-				.getInstallPath()
-				+ "template" //$NON-NLS-1$
-				+ File.separator + "msproject_2003_template.xml"; //$NON-NLS-1$
-		if (debug)
-			System.out.println("$$$ emptyTemplateFile             = " //$NON-NLS-1$
-					+ emptyTemplateFile);
-
-		// copy the empty template MS project xml file to the export target
-		try {
-			File src = new File(emptyTemplateFile);
-			File dst = new File(exportPathStr);
-			copy(src, dst);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		Project project = null;
-		URI fileURI = URI.createFileURI(exportPathStr);
-
-		try {
-
-			XMLResource res = new MsprojectResourceImpl(fileURI);
-			res.getDefaultSaveOptions().put(
-					XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-			res.getDefaultLoadOptions().put(
-					XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-			res.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION,
-					Boolean.TRUE);
-			res.getDefaultSaveOptions().put(
-					XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE,
-					Boolean.TRUE);
-			res.getDefaultLoadOptions().put(
-					XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
-			res.load(null);
-
-			DocumentRoot docRoot = (DocumentRoot) res.getEObject("/"); //$NON-NLS-1$
-			project = (Project) docRoot.getProject();
-
-			generateMSProject(process, project, exportOptions);
-
-			res.save(null);
-
-			if (debug) {
-				printMSProject(project);
-			}
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new ExportMSPException(e);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Exports a capability pattern or delivery process to a Microsoft Project
-	 * XML file.
-	 * 
-	 * @param process
-	 *            a capability pattern or delivery process
-	 * @param project
-	 *            a Microsoft Project object
-	 * @param exportOptions
-	 *            a collection of user specified export options
-	 * @throws ExportMSPServiceException
-	 *             if an error occurs while executing the operation
-	 */
-	public boolean generateMSProject(Process process, Project project,
-			ExportMSPOptions exportOptions) throws Exception {
-		if (process == null || project == null) {
-			throw new IllegalArgumentException();
-		}
-
-		try {
-			MethodConfiguration config = exportOptions.getMethodConfiguration();
-			if (config == null) {
-				// Get the default method configuration associated with the
-				// process.
-				if (process instanceof DeliveryProcess) {
-					config = ((DeliveryProcess) process).getDefaultContext();
-				} else if (process instanceof CapabilityPattern) {
-					config = ((CapabilityPattern) process).getDefaultContext();
-				} else {
-					throw new IllegalArgumentException();
-				}
-			}
-
-			// Create the sub folder to store the published HTML content files.
-			contentFolderName = config.getName();
-
-			PublishOptions publishingOptions = exportOptions
-					.getPublishingOptions();
-			if (publishContentSite && publishingOptions != null) {
-				File contentDir = new File(exportOptions.getExportDir(),
-						contentFolderName);
-				if (!contentDir.exists()) {
-					contentDir.mkdirs();
-				}
-				if (debug) {
-					System.out.println("$$$ vieBuilder methodConfig = " //$NON-NLS-1$
-							+ config);
-					System.out.println("$$$ vieBuilder publishConfigOptions = " //$NON-NLS-1$
-							+ publishingOptions);
-				}
-
-				// Publish the associated configuration.
-				if (!publishConfiguration(contentDir.getAbsolutePath(), config,
-						publishingOptions)) {
-					return false;
-				}
-			}
-
-			exportOnlyPlannedElements = exportOptions
-					.getExportOnlyPlannedWBSElements();
-
-			// Generate the Microsoft Project XML file.
-			// populate the project's attributes
-			project.setName(process.getName());
-			project.setStartDate(new Date());
-			project.setCreationDate(new Date());
-			project.setLastSaved(new Date());
-			project.setFinishDate(new Date());
-
-			generateProjectResources(process, config, project);
-			generateProjectTasks(process, config, project);
-			generateLinks(process, project);
-
-			return true;
-		} catch (Exception e) {
-			throw e;
-		}
-	}
-
-	/**
-	 * Sets the export options.
-	 * 
-	 * @param exportOptions
-	 *            a collection of user specified export options
-	 */
-	protected void setExportOptions(ExportOptions exportOptions) {
-		Boolean exportOnlyPlannedElements = (Boolean) exportOptions
-				.get(ExportOptions.EXPORT_ONLY_PLANNED_ELEMENTS);
-		this.exportOnlyPlannedElements = exportOnlyPlannedElements
-				.booleanValue();
-	}
-
-	/**
-	 * Generates the project resources for all the task descriptors in the
-	 * process.
-	 * 
-	 * @param process
-	 *            a process
-	 * @param config
-	 *            a method configuration used to filter the work breakdown
-	 *            elements in the process
-	 * @param project
-	 *            an object to store the generated Microsoft Project WBS
-	 * @throws Exception
-	 *             if an error occurs while generating the Microsoft Project WBS
-	 */
-	protected void generateProjectResources(Process process,
-			MethodConfiguration config, Project project) throws Exception {
-		ComposedAdapterFactory adapterFactory = null;
-		try {
-			adapterFactory = TngAdapterFactory.INSTANCE
-					.createTBSComposedAdapterFactory();
-			if (adapterFactory instanceof ConfigurableComposedAdapterFactory) {
-				((ConfigurableComposedAdapterFactory) adapterFactory)
-						.setFilter(new ProcessConfigurator(config, null));
-			}
-			IStructuredContentProvider contentProvider = new AdapterFactoryContentProvider(
-					adapterFactory);
-
-			List elements = process.getBreakdownElements();
-			if (elements.size() > 0) {
-				generateProjectResource(contentProvider,
-						(BreakdownElement) process, project);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw e;
-		} finally {
-			if (adapterFactory != null) {
-				adapterFactory.dispose();
-			}
-		}
-	}
-
-	/**
-	 * Generates the project resources for all the role descriptors in the
-	 * process.
-	 */
-	protected void generateProjectResource(
-			IStructuredContentProvider contentProvider,
-			BreakdownElement breakdownElement, Project project)
-			throws Exception {
-		if (breakdownElement instanceof WorkProductDescriptor
-				|| breakdownElement.getSuppressed().booleanValue()
-				|| (exportOnlyPlannedElements && !breakdownElement
-						.getIsPlanned().booleanValue())) {
-			return;
-		}
-
-		if (breakdownElement instanceof RoleDescriptor) {
-			addResource(breakdownElement, project);
-			return;
-		}
-
-		if (contentProvider != null) {
-			Object[] elements = contentProvider.getElements(breakdownElement);
-			for (int i = 0; i < elements.length; i++) {
-				Object element = elements[i];
-				if (element instanceof RoleDescriptorWrapperItemProvider) {
-					RoleDescriptorWrapperItemProvider provider = (RoleDescriptorWrapperItemProvider) element;
-					Object value = provider.getValue();
-					if (value instanceof RoleDescriptor) {
-						addResource((BreakdownElement) value, project);
-					}
-				} else if (element instanceof RoleDescriptor) {
-					addResource((BreakdownElement) element, project);
-				} else if (element instanceof BreakdownElementWrapperItemProvider) {
-					BreakdownElementWrapperItemProvider provider = (BreakdownElementWrapperItemProvider) element;
-					Object value = provider.getValue();
-					if (value instanceof WorkBreakdownElement) {
-						generateProjectResource(contentProvider,
-								(WorkBreakdownElement) value, project);
-					}
-				} else if (element instanceof WorkBreakdownElement) {
-					generateProjectResource(contentProvider,
-							(WorkBreakdownElement) element, project);
-				}
-			}
-		}
-
-	}
-
-	// for each RoleDescriptor, create a MS Project resource
-	// for the RoleDescriptor and its underlying role, remember the assigned
-	// res_uid
-	protected void addResource(BreakdownElement breakdownElement, Project proj)
-			throws Exception {
-		if (!(breakdownElement instanceof RoleDescriptor)) {
-			return;
-		}
-
-		// check the existence of the underlying role of this roleDescriptor
-		// and skip the creation if a resource for the role already exists
-		RoleDescriptor roleDescriptor = (RoleDescriptor) breakdownElement;
-		if (debug)
-			System.out.println("$$$ handle RoleDescriptor = " + roleDescriptor); //$NON-NLS-1$
-		Role ref_edRole = roleDescriptor.getRole();
-		if (debug)
-			System.out.println("$$$ handle Ref-ed Role = " + ref_edRole); //$NON-NLS-1$
-
-		// check the need to add a new resource based on RoleDescriptor's disply
-		// name
-		boolean newRDResource = true;
-		String rdResourceName = getDisplayName(roleDescriptor);
-		if (rolesToUidMap.get(rdResourceName) != null) {
-			newRDResource = false;
-		}
-
-		// check the need to add a new resource based on associated role's
-		// disply name
-		boolean newRoleReource = false;
-		String roleResourceName = null;
-		if (ref_edRole != null
-				&& rolesToUidMap
-						.get((roleResourceName = getDisplayName(ref_edRole))) == null
-				&& !roleResourceName.equalsIgnoreCase(rdResourceName)) {
-			newRoleReource = true;
-		}
-
-		// create a resource for the RoleDescriptor
-		if (newRDResource) {
-			Resource aRes = projectFactory.createResource();
-
-			aRes.setUID(BigInteger.valueOf(res_uid));
-			aRes.setID(BigInteger.valueOf(res_uid));
-			aRes.setName(rdResourceName);
-			proj.getResources().getResource().add(aRes);
-
-			rolesToUidMap.put(rdResourceName, BigInteger.valueOf(res_uid));
-			res_uid++;
-		}
-
-		// create a resource for the underlying associated role too
-		if (newRoleReource) {
-			Resource aRes = projectFactory.createResource();
-
-			aRes.setUID(BigInteger.valueOf(res_uid));
-			aRes.setID(BigInteger.valueOf(res_uid));
-			aRes.setName(roleResourceName);
-			proj.getResources().getResource().add(aRes);
-
-			rolesToUidMap.put(roleResourceName, BigInteger.valueOf(res_uid));
-			res_uid++;
-		}
-	}
-
-	/**
-	 * Generates the MS Project WBS for a capability pattern or delivery
-	 * process.
-	 * 
-	 * @param process
-	 *            a process
-	 * @param config
-	 *            a method configuration used to filter the work breakdown
-	 *            elements in the process
-	 * @param project
-	 *            an object to store the generated Microsoft Project WBS
-	 * @throws Exception
-	 *             if an error occurs while generating the Microsoft Project WBS
-	 */
-	protected void generateProjectTasks(Process process,
-			MethodConfiguration config, Project project) throws Exception {
-		// Save the reference to the exported process.
-		this.process = process;
-
-		wbsAdapterFactory = null;
-		try {
-			// Add the suppression object associated with the process to be
-			// exported
-			// to the suppression map.
-			suppression = new Suppression(process);
-			suppressionMap.put(process, suppression);
-
-			wbsAdapterFactory = (ConfigurableComposedAdapterFactory) TngAdapterFactory.INSTANCE
-					.createWBSComposedAdapterFactory();
-			breakdownElementFilter = new ProcessConfigurator(config, null);
-			wbsAdapterFactory.setFilter(breakdownElementFilter);
-
-			wbsContentProvider = new AdapterFactoryContentProvider(
-					wbsAdapterFactory);
-
-			// test
-			// enumerateProcessPredecessorLists();
-
-			currentElement = process;
-			if (process instanceof CapabilityPattern) {
-				generateProjectTask(wbsContentProvider,
-						(BreakdownElement) process, 1, project);
-			} else {
-				List breakdownElements = process.getBreakdownElements();
-				if (breakdownElements.size() > 0) {
-					generateProjectTask(wbsContentProvider,
-							(BreakdownElement) process, 1, project);
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw e;
-		} finally {
-			if (wbsAdapterFactory != null) {
-				wbsAdapterFactory.dispose();
-			}
-			if (suppressionMap != null) {
-				suppressionMap.clear();
-				suppressionMap = null;
-			}
-			if (wbsContentProvider != null) {
-				wbsContentProvider.dispose();
-			}
-		}
-	}
-
-	private void enumerateProcessPredecessorLists() {
-		// WBS tree
-		Iterator wbsTreeIterator = new AdapterFactoryTreeIterator(
-				wbsAdapterFactory, process);
-		Object obj;
-		while (wbsTreeIterator.hasNext()) {
-			obj = wbsTreeIterator.next();
-			System.out.println("treeIterator: " + obj);
-			IBSItemProvider adapter = (IBSItemProvider) wbsAdapterFactory
-					.adapt(obj, ITreeItemContentProvider.class);
-			PredecessorList predList = adapter.getPredecessors();
-			for (Iterator iter = predList.iterator(); iter.hasNext();) {
-				IBSItemProvider e = (IBSItemProvider) iter.next();
-				System.out.println("    predList: " + e);
-				if (e instanceof ItemProviderAdapter) {
-					System.out.println("    unwrappedPredList: "
-							+ ((ItemProviderAdapter) e).getTarget());
-				}
-			}
-		}
-	}
-
-	/**
-	 * Generates the Microsft Project task for a breakdown element.
-	 * 
-	 * @param contentProvider
-	 *            a content provider
-	 * @param breakdownElement
-	 *            a breakdown element
-	 * @param strBuf
-	 *            a <code>StringBuffer</code> to store the generated XML
-	 */
-	protected void generateProjectTask(
-			IStructuredContentProvider contentProvider,
-			Object elementOrWrapper, int taskOLevel, Project proj)
-			throws Exception {
-
-		WorkBreakdownElement breakdownElement = (WorkBreakdownElement) TngUtil
-				.unwrap(elementOrWrapper);
-
-		// not really neccessary here
-		if (breakdownElement instanceof WorkProductDescriptor
-				|| breakdownElement instanceof RoleDescriptor
-				|| breakdownElement.getSuppressed().booleanValue()
-				|| (exportOnlyPlannedElements && !breakdownElement
-						.getIsPlanned().booleanValue())) {
-			return;
-		}
-
-		boolean isSubTasksPlanned = false;
-		if (exportOnlyPlannedElements && breakdownElement instanceof Activity
-				&& contentProvider != null) {
-			Object[] elements = contentProvider.getElements(elementOrWrapper);
-			for (int i = 0; i < elements.length; i++) {
-				Object element = elements[i];
-				if (element instanceof Activity) {
-					if (!exportOnlyPlannedElements
-							|| ((Activity) element).getIsPlanned()
-									.booleanValue()) {
-						isSubTasksPlanned = true;
-						break;
-					}
-				} else if (element instanceof ActivityWrapperItemProvider) {
-					Object wrappedElement = TngUtil.unwrap(element);
-					if (wrappedElement instanceof Activity) {
-						if (!exportOnlyPlannedElements
-								|| ((Activity) wrappedElement).getIsPlanned()
-										.booleanValue()) {
-							isSubTasksPlanned = true;
-							break;
-						}
-					}
-				} else if (element instanceof TaskDescriptor) {
-					TaskDescriptor descriptor = (TaskDescriptor) element;
-					if (!exportOnlyPlannedElements
-							|| descriptor.getIsPlanned().booleanValue()) {
-						isSubTasksPlanned = true;
-						break;
-					}
-				} else if (element instanceof TaskDescriptorWrapperItemProvider) {
-					Object wrappedElement = TngUtil.unwrap(element);
-					if (wrappedElement instanceof TaskDescriptor) {
-						TaskDescriptor descriptor = (TaskDescriptor) wrappedElement;
-						if (!exportOnlyPlannedElements
-								|| descriptor.getIsPlanned().booleanValue()) {
-							isSubTasksPlanned = true;
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		// create a task for the WorkBreakdownElement
-		// decided just to check the isPlanned flag on the WBS
-		boolean isPlannedTask = breakdownElement.getIsPlanned().booleanValue();
-		Task newTask = null;
-		if (!exportOnlyPlannedElements || exportOnlyPlannedElements
-				&& isPlannedTask) {
-			boolean suppressed = isSuppressed(breakdownElement);
-			if (!suppressed) {
-				newTask = addTask(elementOrWrapper, taskOLevel, proj);
-			}
-		}
-
-		// if export planned only wbs, then we need to do the role rollup
-		// calculation
-		if (exportOnlyPlannedElements && newTask != null
-				&& breakdownElement instanceof Activity
-				&& contentProvider != null && !isSubTasksPlanned) {
-			ArrayList rollupRoles = new ArrayList();
-			boolean rb = calculateRollupRoles(contentProvider,
-					breakdownElement, rollupRoles);
-			// if the whole subtree of the breakdownElemnt is not planned
-			// then roll up all the roles
-			if (!rb) {
-				HashSet rolesSet = new HashSet(rollupRoles);
-				for (Iterator iter = rolesSet.iterator(); iter.hasNext();) {
-					String roleName = (String) iter.next();
-					addAssignment(roleName, newTask.getUID().intValue(), proj);
-				}
-			}
-		}
-
-		// export the next level wbs
-		if (contentProvider != null) {
-			boolean suppressed = isSuppressed(breakdownElement);
-			if (!suppressed) {
-				elementPaths.push(breakdownElement.getGuid());
-				Object[] elements = contentProvider
-						.getElements(elementOrWrapper);
-				for (int i = 0; i < elements.length; i++) {
-					Object element = elements[i];
-
-					// get the current elementOrWrapper and the hierarcal guid
-					// path to it
-					currentElement = element;
-					String[] paths = new String[elementPaths.size()];
-					elementPaths.toArray(paths);
-					StringBuffer pathStr = new StringBuffer();
-					for (int j = 0; j < paths.length; j++) {
-						pathStr.append(paths[j] + ".");
-					}
-					if (currentElement instanceof BreakdownElementWrapperItemProvider) {
-						Object wrapped = TngUtil.unwrap(element);
-						pathStr.append(((BreakdownElement) wrapped).getGuid());
-					} else {
-						pathStr.append(((BreakdownElement) currentElement)
-								.getGuid());
-					}
-					currentElementPath = pathStr.toString();
-					// if (debug) System.out.println(" path: " +
-					// currentElementPath);
-
-					generateProjectTask(contentProvider, element,
-							taskOLevel + 1, proj);
-				}
-				generateLinks(process, proj);
-				elementPaths.pop();
-			}
-		}
-
-	}
-
-	/**
-	 * Checks whether the given object is a suppressed work breakdown element in
-	 * its owning process.
-	 * 
-	 * @param object
-	 *            an object
-	 * @return <ocde>true</code> if the object is a suppressed work breakdown
-	 *         element in its owning process.
-	 */
-	protected boolean isSuppressed(Object object) {
-		if (object != null) {
-			if (object instanceof Descriptor) {
-				if (debug)
-					System.out.println("Descriptor = "
-							+ ((Descriptor) object).getName());
-			}
-			Process owningProcess = TngUtil.getOwningProcess(object);
-			Suppression owningProcessSuppression = (Suppression) suppressionMap
-					.get(owningProcess);
-			if (owningProcessSuppression == null) {
-				owningProcessSuppression = new Suppression(owningProcess);
-				suppressionMap.put(owningProcess, owningProcessSuppression);
-			}
-			if (owningProcessSuppression.isSuppressed(object)) {
-				return true;
-			}
-			if (owningProcess != process
-					&& object instanceof WorkBreakdownElement) {
-				elementPaths.push(((WorkBreakdownElement) object).getGuid());
-				String[] paths = new String[elementPaths.size()];
-				elementPaths.toArray(paths);
-				Object wrapper = suppression.getObjectByPath(paths,
-						wbsAdapterFactory);
-				elementPaths.pop();
-				return suppression.isSuppressed(wrapper);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Adds a task to a Microsoft Project.
-	 * 
-	 * @param element
-	 *            a work breakdown element
-	 * @param taskOLevel
-	 *            the outline level
-	 * @param project
-	 *            a Microsoft Project object
-	 * @return the newly added task
-	 * @throws Exception
-	 *             if an error occurrs while performing the operation
-	 */
-	protected Task addTask(Object elementOrWrapper, int taskOLevel,
-			Project project) throws Exception {
-
-		if (elementOrWrapper == null) {
-			return null;
-		}
-
-		WorkBreakdownElement element = (WorkBreakdownElement) TngUtil
-				.unwrap(elementOrWrapper);
-
-		Task task = projectFactory.createTask();
-		task.setName(getDisplayName(element));
-		task.setOutlineLevel(BigInteger.valueOf(taskOLevel));
-		task.setUID(BigInteger.valueOf(task_uid));
-		task.setID(BigInteger.valueOf(task_uid));
-		task.setType(BigInteger.valueOf(0));
-
-		GregorianCalendar gcDate = new GregorianCalendar();
-		// gcDate.add(GregorianCalendar.DATE, 80);
-		Date startDate = gcDate.getTime();
-		task.setStart(startDate);
-
-		// task.setDuration("PT20H0M0S");
-
-		String notes = getBriefDescription(element);
-		if (notes != null || notes.trim().length() > 0) {
-			task.setNotes(notes);
-		}
-
-		if (element instanceof Milestone) {
-			task.setMilestone(true);
-			task.setDurationFormat(BigInteger.valueOf(7));
-		}
-
-		// Assign the task to all the associated roles.
-		List rolesList = null;
-		if (element instanceof TaskDescriptor) {
-			rolesList = getRolesForTaskD((TaskDescriptor) element);
-		} else if (element instanceof org.eclipse.epf.uma.Task) {
-			rolesList = getRolesForTask((org.eclipse.epf.uma.Task) element);
-		}
-		if (rolesList != null) {
-			for (Iterator iter = rolesList.iterator(); iter.hasNext();) {
-				String roleName = (String) iter.next();
-				addAssignment(roleName, task_uid, project);
-			}
-		}
-
-		// Add the generated URL link to the task.
-		if (publishContentSite) {
-			String linkURL = getElementURL(element);
-			if (element instanceof TaskDescriptor) {
-				TaskDescriptor taskDescriptor = (TaskDescriptor) element;
-				org.eclipse.epf.uma.Task ref_edTask = taskDescriptor.getTask();
-				referencedTasks.add(ref_edTask);
-			}
-			task.setHyperlinkAddress(linkURL);
-		}
-
-		// aTask.setType(new BigInteger("1"));
-		// aTask.setStart(new Date());
-		// aTask.setSummary(false);
-		// aTask.setConstraintType(new BigInteger("2"));
-
-		// Add the task to the Microsoft Project object.
-		project.getTasks().getTask().add(task);
-
-		if (debug) {
-			System.out.println("$$$ theCurrent element: taskUid=" + task_uid
-					+ ", " + currentElement);
-			System.out.println("                  path: " + currentElementPath);
-		}
-
-		// Store the task's local predecessors.
-		storeTaskPredecessors(element);
-
-		taskUidToWbsWapperPathMap.put(BigInteger.valueOf(task_uid),
-				currentElementPath);
-		wbsGuidToTaskUidMap
-				.put(element.getGuid(), BigInteger.valueOf(task_uid));
-
-		// get predecessors of a work breakdown element
-		IBSItemProvider adapter = (IBSItemProvider) wbsAdapterFactory.adapt(
-				elementOrWrapper, ITreeItemContentProvider.class);
-		PredecessorList currentPredList = adapter.getPredecessors();
-		List guidPredList = new ArrayList();
-		for (Iterator iter = currentPredList.iterator(); iter.hasNext();) {
-			Object e = (Object) iter.next();
-			if (debug)
-				System.out.println("    wrapperPredListMember: " + e);
-			Object unwrappedE = TngUtil.unwrap(e);
-			if (unwrappedE instanceof WorkBreakdownElement) {
-				guidPredList.add(((WorkBreakdownElement) unwrappedE).getGuid());
-				if (debug)
-					System.out.println("    unwrappedPredListMember: "
-							+ unwrappedE);
-			}
-			if (e instanceof ItemProviderAdapter) {
-				unwrappedE = ((ItemProviderAdapter) e).getTarget();
-				guidPredList.add(((BreakdownElement) unwrappedE).getGuid());
-				if (debug)
-					System.out.println("    unwrappedPredListMember: "
-							+ unwrappedE);
-			}
-		}
-		wbsWrapperPathToPredListMap.put(currentElementPath, guidPredList);
-		if (debug)
-			System.out.println("    __wrapperPredList: " + guidPredList);
-
-		task_uid++;
-
-		return task;
-	}
-
-	private String getBriefDescription(WorkBreakdownElement element) {
-		if (element == null)
-			return null;
-
-		String briefDesc = element.getBriefDescription();
-		if ((briefDesc == null || briefDesc.trim().length() <= 0)) {
-			if (element instanceof TaskDescriptor) {
-				TaskDescriptor taskDescriptor = (TaskDescriptor) element;
-				org.eclipse.epf.uma.Task ref_edTask = taskDescriptor.getTask();
-				if (ref_edTask != null)
-					briefDesc = ref_edTask.getBriefDescription();
-			}
-		}
-
-		return briefDesc;
-	}
-
-	private void addAssignment(String resName, int taskUid, Project proj) {
-		Assignment assignment = projectFactory.createAssignment();
-
-		assignment.setUID(BigInteger.valueOf(assign_uid));
-		assignment.setTaskUID(BigInteger.valueOf(taskUid));
-		BigInteger resID = (BigInteger) rolesToUidMap.get(resName);
-		assignment.setResourceUID(resID);
-
-		proj.getAssignments().getAssignment().add(assignment);
-
-		assign_uid++;
-	}
-
-	private List getRolesForTaskD(TaskDescriptor taskDescriptor) {
-		ArrayList rolesList = new ArrayList();
-
-		// RoleDescriptor roleDescrp = taskDescriptor.getPerformedPrimarilyBy();
-		RoleDescriptor roleDescrp = (RoleDescriptor) ConfigurationHelper
-				.getCalculatedElement(taskDescriptor.getPerformedPrimarilyBy(),
-						breakdownElementFilter.getMethodConfiguration());
-
-		if (roleDescrp != null) {
-			rolesList.add(getDisplayName(roleDescrp));
-		}
-		// List roleDescrpList = taskDescriptor.getAdditionallyPerformedBy();
-		List roleDescrpList = ConfigurationHelper.getCalculatedElements(
-				taskDescriptor.getAdditionallyPerformedBy(),
-				breakdownElementFilter.getMethodConfiguration());
-
-		for (Iterator iter = roleDescrpList.iterator(); iter.hasNext();) {
-			roleDescrp = (RoleDescriptor) iter.next();
-			rolesList.add(getDisplayName(roleDescrp));
-		}
-
-		return rolesList;
-	}
-
-	private List getRolesForTask(org.eclipse.epf.uma.Task umaTask) {
-		ArrayList rolesList = new ArrayList();
-
-		Role role = umaTask.getPerformedBy();
-		if (role != null) {
-			rolesList.add(getDisplayName(role));
-		}
-		List list = umaTask.getAdditionallyPerformedBy();
-		for (Iterator iter = list.iterator(); iter.hasNext();) {
-			role = (Role) iter.next();
-			rolesList.add(getDisplayName(role));
-		}
-
-		return rolesList;
-	}
-
-	private boolean calculateRollupRoles(
-			IStructuredContentProvider contentProvider,
-			BreakdownElement breakdownElement, List rollupRoles) {
-
-		boolean isAnySubTaskPlanned = false;
-
-		Object[] elements = contentProvider.getElements(breakdownElement);
-		for (int i = 0; i < elements.length; i++) {
-			Object element = elements[i];
-			if (element instanceof Activity) {
-				if (!exportOnlyPlannedElements
-						|| ((Activity) element).getIsPlanned().booleanValue()) {
-					isAnySubTaskPlanned = true;
-				} else {
-					isAnySubTaskPlanned = calculateRollupRoles(contentProvider,
-							(BreakdownElement) element, rollupRoles);
-				}
-			} else if (element instanceof ActivityWrapperItemProvider) {
-				Object wrappedElement = TngUtil.unwrap(element);
-				if (wrappedElement instanceof Activity) {
-					if (!exportOnlyPlannedElements
-							|| ((Activity) wrappedElement).getIsPlanned()
-									.booleanValue()) {
-						isAnySubTaskPlanned = true;
-					} else {
-						isAnySubTaskPlanned = calculateRollupRoles(
-								contentProvider,
-								(BreakdownElement) wrappedElement, rollupRoles);
-					}
-				}
-			} else if (element instanceof TaskDescriptor) {
-				TaskDescriptor descriptor = (TaskDescriptor) element;
-				if (!exportOnlyPlannedElements
-						|| descriptor.getIsPlanned().booleanValue()) {
-					isAnySubTaskPlanned = true;
-				} else {
-					rollupRoles
-							.addAll(getRolesForTaskD((TaskDescriptor) element));
-				}
-			} else if (element instanceof TaskDescriptorWrapperItemProvider) {
-				Object wrappedElement = TngUtil.unwrap(element);
-				if (wrappedElement instanceof TaskDescriptor) {
-					TaskDescriptor descriptor = (TaskDescriptor) wrappedElement;
-					if (!exportOnlyPlannedElements
-							|| descriptor.getIsPlanned().booleanValue()) {
-						isAnySubTaskPlanned = true;
-					} else {
-						rollupRoles
-								.addAll(getRolesForTaskD((TaskDescriptor) wrappedElement));
-					}
-				}
-			}
-		}
-
-		return isAnySubTaskPlanned;
-	}
-
-	/**
-	 * Retrieves a work breakdown element's predecessors, stores them in an
-	 * <ocde>ArrayList</code>, and put it into a map.
-	 * 
-	 * @param element
-	 *            a work breakdown element
-	 */
-	private void storeTaskPredecessors(WorkBreakdownElement element) {
-		if (element == null) {
-			return;
-		}
-
-		List predecessors = element.getLinkToPredecessor();
-		List predList = new ArrayList();
-		if (predecessors != null && predecessors.size() > 0) {
-			for (Iterator i = predecessors.iterator(); i.hasNext();) {
-				WorkOrder workOrder = (WorkOrder) i.next();
-				BreakdownElement predecessor = workOrder.getPred();
-				if (debug) {
-					System.out.println("    localPredListMember: "
-							+ predecessor);
-				}
-				if (predecessor != null) {
-					String predGuid = predecessor.getGuid();
-					if (predGuid != null)
-						predList.add(predGuid);
-				}
-			}
-		}
-		if (debug) {
-			System.out.println("   local predlist for " + element.getName()
-					+ " = " + predList.toString());
-		}
-
-		wbsWapperPathToLocalPredListMap.put(currentElementPath, predList);
-	}
-
-	protected void generateLinks(Process process, Project project)
-			throws Exception {
-		EList tasks = project.getTasks().getTask();
-		for (Iterator iter = tasks.iterator(); iter.hasNext();) {
-			Task task = (Task) iter.next();
-			BigInteger taskUid = task.getUID();
-			// skip the MS project hidden task with uid = 0
-			if (taskUid.intValue() == 0)
-				continue;
-
-			String wbsPathStr = (String) taskUidToWbsWapperPathMap.get(taskUid);
-
-			// List predList = (ArrayList)
-			// wbsWapperPathToLocalPredListMap.get(wbsPathStr);
-			List predList = (ArrayList) wbsWrapperPathToPredListMap
-					.get(wbsPathStr);
-			if (predList != null) {
-				List removeList = new ArrayList();
-				for (Iterator iterator = predList.iterator(); iterator
-						.hasNext();) {
-					String predGuid = (String) iterator.next();
-					BigInteger predTaskUid = (BigInteger) wbsGuidToTaskUidMap
-							.get(predGuid);
-
-					if (predTaskUid == null
-							|| predTaskUid.intValue() == taskUid.intValue()) {
-						continue;
-					}
-
-					if (debug) {
-						System.out.println("$$$ taskUid = " + taskUid
-								+ ", wbsPathStr = " + wbsPathStr);
-						System.out.println("    localPredList: " + predList);
-						System.out.println("    found pred guid: " + predGuid);
-					}
-
-					removeList.add(predGuid);
-
-					PredecessorLink preLink = projectFactory
-							.createPredecessorLink();
-					task.getPredecessorLink().add(preLink);
-					preLink.setPredecessorUID(predTaskUid);
-					preLink.setType(new BigInteger("1")); //$NON-NLS-1$
-					preLink.setCrossProject(false);
-					preLink.setLinkLag(new BigInteger("0")); //$NON-NLS-1$
-					preLink.setLagFormat(new BigInteger("7")); //$NON-NLS-1$
-				}
-				predList.removeAll(removeList);
-			}
-		}
-	}
-
-	/**
-	 * Returns the generated HTML content file URL for a method element.
-	 * 
-	 * @param element
-	 *            a method element
-	 * @return the URL of the generated HTML content file
-	 */
-	protected String getElementURL(MethodElement element) {
-		if (element == null)
-			return null;
-
-		String elementPath = null;
-		String elementFileName = null;
-		try {
-			elementPath = ResourceHelper.getElementPath(element);
-			elementFileName = ResourceHelper.getFileName(element,
-					ResourceHelper.FILE_EXT_HTML);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return ""; //$NON-NLS-1$
-		}
-		if (elementPath != null && elementFileName != null) {
-			elementPath = elementPath.replace('\\', '/');
-			elementFileName = elementFileName.replace('\\', '/');
-			String url = contentFolderName
-					+ "/" + elementPath + elementFileName; //$NON-NLS-1$
-			return abTargetDir + File.separator + url;
-		} else {
-			return ""; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Returns the display name of a method element.
-	 * 
-	 * @param element
-	 *            a method element
-	 * @return the display name of the given element
-	 */
-	protected String getDisplayName(MethodElement element) {
-		String name = null;
-		if (element instanceof BreakdownElement) {
-			name = ProcessUtil.getPresentationName((BreakdownElement) element);
-		} else if (element instanceof DescribableElement) {
-			name = ((DescribableElement) element).getPresentationName();
-		}
-		if (name == null || name.length() == 0) {
-			name = element.getName();
-		}
-		return XMLUtil.escapeAttr(name);
-	}
-
-	/**
-	 * Publishes the selected configuration associated with the exported
-	 * process.
-	 * 
-	 * @param dir
-	 *            the output directory
-	 * @param config
-	 *            the configuration to publish
-	 * @param publishConfigOptions
-	 *            the publishing options
-	 * @return <code>true</code> if the configuration was published
-	 *         successfully, <code>false</code> otherwise
-	 * @throws Exception
-	 *             if an error occurs while publishing the configuration
-	 */
-	protected boolean publishConfiguration(String dir,
-			MethodConfiguration config, PublishOptions publishConfigOptions)
-			throws Exception {
-		PublishManager publishMgr = null;
-		try {
-			publishMgr = new PublishManager();
-			publishMgr.init(dir, config, publishConfigOptions);
-
-			ExportMSPXMLOperation operation = new ExportMSPXMLOperation(
-					publishMgr);
-			PublishProgressMonitorDialog dlg = new PublishProgressMonitorDialog(
-					Display.getCurrent().getActiveShell(), publishMgr
-							.getViewBuilder());
-			boolean success = UserInteractionHelper.runWithProgress(operation,
-					dlg, true, ExportMSPResources.exportMSPWizard_title);
-			if (operation.getException() != null) {
-				throw operation.getException();
-			}
-			return success && !dlg.getProgressMonitor().isCanceled();
-		} catch (Exception e) {
-			throw e;
-		} finally {
-			if (publishMgr != null) {
-				publishMgr.dispose();
-				publishMgr = null;
-			}
-		}
-	}
-
-	/**
-	 * Copies a source file to a destination file. The destination file is
-	 * created automatically if it odes not exists.
-	 * 
-	 * @param src
-	 *            the source file
-	 * @param tgt
-	 *            the target file
-	 * @throws IOException
-	 *             if an error occurs while copy the file
-	 */
-	private void copy(File src, File dst) throws IOException {
-		InputStream in = new FileInputStream(src);
-		OutputStream out = new FileOutputStream(dst);
-
-		// Transfer bytes from in to out
-		byte[] buf = new byte[1024];
-		int len;
-		while ((len = in.read(buf)) > 0) {
-			out.write(buf, 0, len);
-		}
-		in.close();
-		out.close();
-	}
-
-	/**
-	 * Prints the trace information for the Microsoft Project.
-	 */
-	private static void printMSProject(Project project) {
-		System.out.println("\n$$$ read-in project = " + project); //$NON-NLS-1$
-
-		EList tasks = project.getTasks().getTask();
-		for (Iterator iter = tasks.iterator(); iter.hasNext();) {
-			Task element = (Task) iter.next();
-			System.out.println("$$$ a task = " + element); //$NON-NLS-1$
-		}
-
-		EList resources = project.getResources().getResource();
-		for (Iterator iter = resources.iterator(); iter.hasNext();) {
-			org.eclipse.epf.msproject.Resource element = (org.eclipse.epf.msproject.Resource) iter
-					.next();
-			System.out.println("$$$ a resource = " + element); //$NON-NLS-1$
-		}
-
-		EList assignments = project.getAssignments().getAssignment();
-		for (Iterator iter = assignments.iterator(); iter.hasNext();) {
-			Assignment element = (Assignment) iter.next();
-			System.out.println("$$$ an assignment = " + element); //$NON-NLS-1$
-		}
-
-		System.out.println("$$$===\n"); //$NON-NLS-1$
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportOptions.java b/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportOptions.java
deleted file mode 100755
index 00920cb..0000000
--- a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/ExportOptions.java
+++ /dev/null
@@ -1,55 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.msp;
-
-import java.util.HashMap;
-
-/**
- * A HashMap for Export Options
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- * 
- */
-public class ExportOptions extends HashMap {
-
-	private static final long serialVersionUID = -589701215913212273L;
-	
-	/**
-	 * The publish selected configuration option.
-	 */
-	public static final String PUBLISH_CONFIG = "publishConfig"; //$NON-NLS-1$
-
-	/**
-	 * The export only planned workbreakdown elements option.
-	 */
-	public static final String EXPORT_ONLY_PLANNED_ELEMENTS = "exportOnlyPlannedElements"; //$NON-NLS-1$
-
-	/**
-	 * The export effort estimates for workbreakdown elements option.
-	 */
-	public static final String EXPORT_ESTIMATES = "exportEstimates";
-
-	/**
-	 * The estimating model used to calculate the effort estimates of the
-	 * exported workbreakdown elements.
-	 */
-	public static final String ESTIMATING_MODEL = "estimatingModel";
-	
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportOptions() {
-		super();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/IExportMSPService.java b/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/IExportMSPService.java
deleted file mode 100755
index 04934a0..0000000
--- a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/IExportMSPService.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.export.msp;
-
-import org.eclipse.epf.uma.Process;
-
-/**
- * The interface for the Export Microsoft Project Service.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public interface IExportMSPService {
-
-	/**
-	 * Export a process to a Microsoft Project file.
-	 * 
-	 * @param process
-	 *            a capability pattern or delivery process
-	 * @param exportOptions
-	 *            a collection of user specified export options
-	 * @return <code>true</code> if the operation was completed successfully
-	 * @throws ExportMSPServiceException
-	 *             if an error occurs while executing the operation
-	 */
-	public boolean exportMSProject(Process process,
-			ExportMSPOptions exportOptions) throws ExportMSPServiceException;
-
-}
diff --git a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/Resources.properties b/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/Resources.properties
deleted file mode 100755
index f583646..0000000
--- a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/Resources.properties
+++ /dev/null
@@ -1,48 +0,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
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Export Microsoft Project Wizard
-exportMSPWizard_title=Export Microsoft Project
-
-# Select Process Wizard Page
-selectProcessWizardPage_title=Select process and export options
-selectProcessWizardPage_text=Select a process to export and specify the export options.
-processGroup_text=Process
-capabilityPatternRadioButton_text=Capability Pattern
-deliveryProcessRadioButton_text=Delivery Process
-optionsGroup_text=Export options
-processNameLabel_text=Name:
-contextNameLabel_text=Configuration:
-publishConfigurationCheckBox_text=Publish the selected configuration
-exportOnlyPlannedElementsCheckBox_text=Export only breakdown elements that are planned
-
-# Select Publishing Options Wizard Page
-selectPublishOptionsWizardPage_title=Select publishing options
-selectPublishOptionsWizardPage_text=Select the publishing options that will be used to publish the specified configuration.
-
-# Select Export Directory Wizard page
-selectExportDirWizardPage_title=Specify project name and export directory
-selectExportDirWizardPage_text=Specify the Microsoft Project name and export directory.
-projectNameLabel_text=Name:
-dirLabel_text=Directory:
-browseButton_text=Browse...
-
-# Progress Messages
-exportMSPTask_name=Exporting selected process to Microsoft Project...
-
-# Confirmation Messages
-overwriteText_msg=A Microsoft Project ''{0}'' already exists in ''{1}''.\nDo you want to overwrite it?
-completedText_msg=The selected process ''{0}'' has been successfully exported to Microsoft Project XML file ''{1}''.
-
-# Error Messages
-exportMSPError_msg=An error has occurred while exporting the selected process ''{0}'' to Microsoft Project ''{1}''.
-exportMSPError_reason=Click Details for more information.
diff --git a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/package.html b/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/package.html
deleted file mode 100755
index 6fa5220..0000000
--- a/plugins/org.eclipse.epf.export.msp/src/org/eclipse/epf/export/msp/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces and implementation for the Export Microsoft Project service.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export.msp/template/msproject_2003_template.xml b/plugins/org.eclipse.epf.export.msp/template/msproject_2003_template.xml
deleted file mode 100755
index bfe50c3..0000000
--- a/plugins/org.eclipse.epf.export.msp/template/msproject_2003_template.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0"?>
-<Project xmlns="http://epf.eclipse.org/msproject">
-<Name>msproject_2003_template.xml</Name>
-<Company>Eclipse.org</Company>
-<Author></Author>
-<CreationDate>2006-02-10T14:36:00</CreationDate>
-<LastSaved>2006-02-10T15:19:00</LastSaved>
-<ScheduleFromStart>1</ScheduleFromStart>
-<StartDate>2006-02-10T08:00:00</StartDate>
-<FinishDate>2006-02-10T08:00:00</FinishDate>
-<FYStartDate>1</FYStartDate>
-<CriticalSlackLimit>0</CriticalSlackLimit>
-<CurrencyDigits>2</CurrencyDigits>
-<CurrencySymbol>$</CurrencySymbol>
-<CurrencySymbolPosition>0</CurrencySymbolPosition>
-<CalendarUID>1</CalendarUID>
-<DefaultStartTime>08:00:00</DefaultStartTime>
-<DefaultFinishTime>17:00:00</DefaultFinishTime>
-<MinutesPerDay>480</MinutesPerDay>
-<MinutesPerWeek>2400</MinutesPerWeek>
-<DaysPerMonth>20</DaysPerMonth>
-<DefaultTaskType>0</DefaultTaskType>
-<DefaultFixedCostAccrual>3</DefaultFixedCostAccrual>
-<DefaultStandardRate>0</DefaultStandardRate>
-<DefaultOvertimeRate>0</DefaultOvertimeRate>
-<DurationFormat>7</DurationFormat>
-<WorkFormat>2</WorkFormat>
-<EditableActualCosts>0</EditableActualCosts>
-<HonorConstraints>0</HonorConstraints>
-<InsertedProjectsLikeSummary>1</InsertedProjectsLikeSummary>
-<MultipleCriticalPaths>0</MultipleCriticalPaths>
-<NewTasksEffortDriven>1</NewTasksEffortDriven>
-<NewTasksEstimated>1</NewTasksEstimated>
-<SplitsInProgressTasks>1</SplitsInProgressTasks>
-<SpreadActualCost>0</SpreadActualCost>
-<SpreadPercentComplete>0</SpreadPercentComplete>
-<TaskUpdatesResource>1</TaskUpdatesResource>
-<FiscalYearStart>0</FiscalYearStart>
-<WeekStartDay>0</WeekStartDay>
-<MoveCompletedEndsBack>0</MoveCompletedEndsBack>
-<MoveRemainingStartsBack>0</MoveRemainingStartsBack>
-<MoveRemainingStartsForward>0</MoveRemainingStartsForward>
-<MoveCompletedEndsForward>0</MoveCompletedEndsForward>
-<BaselineForEarnedValue>0</BaselineForEarnedValue>
-<AutoAddNewResourcesAndTasks>1</AutoAddNewResourcesAndTasks>
-<CurrentDate>2006-02-10T08:00:00</CurrentDate>
-<MicrosoftProjectServerURL>1</MicrosoftProjectServerURL>
-<Autolink>1</Autolink>
-<NewTaskStartDate>0</NewTaskStartDate>
-<DefaultTaskEVMethod>0</DefaultTaskEVMethod>
-<ProjectExternallyEdited>0</ProjectExternallyEdited>
-<ExtendedCreationDate>1984-01-01T00:00:00</ExtendedCreationDate>
-<ActualsInSync>1</ActualsInSync>
-<RemoveFileProperties>0</RemoveFileProperties>
-<AdminProject>0</AdminProject>
-<OutlineCodes/>
-<WBSMasks/>
-<ExtendedAttributes/>
-<Calendars>
-<Calendar>
-<UID>1</UID>
-<Name>Standard</Name>
-<IsBaseCalendar>1</IsBaseCalendar>
-<BaseCalendarUID>-1</BaseCalendarUID>
-<WeekDays>
-<WeekDay>
-<DayType>1</DayType>
-<DayWorking>0</DayWorking>
-</WeekDay>
-<WeekDay>
-<DayType>2</DayType>
-<DayWorking>1</DayWorking>
-<WorkingTimes>
-<WorkingTime>
-<FromTime>08:00:00</FromTime>
-<ToTime>12:00:00</ToTime>
-</WorkingTime>
-<WorkingTime>
-<FromTime>13:00:00</FromTime>
-<ToTime>17:00:00</ToTime>
-</WorkingTime>
-</WorkingTimes>
-</WeekDay>
-<WeekDay>
-<DayType>3</DayType>
-<DayWorking>1</DayWorking>
-<WorkingTimes>
-<WorkingTime>
-<FromTime>08:00:00</FromTime>
-<ToTime>12:00:00</ToTime>
-</WorkingTime>
-<WorkingTime>
-<FromTime>13:00:00</FromTime>
-<ToTime>17:00:00</ToTime>
-</WorkingTime>
-</WorkingTimes>
-</WeekDay>
-<WeekDay>
-<DayType>4</DayType>
-<DayWorking>1</DayWorking>
-<WorkingTimes>
-<WorkingTime>
-<FromTime>08:00:00</FromTime>
-<ToTime>12:00:00</ToTime>
-</WorkingTime>
-<WorkingTime>
-<FromTime>13:00:00</FromTime>
-<ToTime>17:00:00</ToTime>
-</WorkingTime>
-</WorkingTimes>
-</WeekDay>
-<WeekDay>
-<DayType>5</DayType>
-<DayWorking>1</DayWorking>
-<WorkingTimes>
-<WorkingTime>
-<FromTime>08:00:00</FromTime>
-<ToTime>12:00:00</ToTime>
-</WorkingTime>
-<WorkingTime>
-<FromTime>13:00:00</FromTime>
-<ToTime>17:00:00</ToTime>
-</WorkingTime>
-</WorkingTimes>
-</WeekDay>
-<WeekDay>
-<DayType>6</DayType>
-<DayWorking>1</DayWorking>
-<WorkingTimes>
-<WorkingTime>
-<FromTime>08:00:00</FromTime>
-<ToTime>12:00:00</ToTime>
-</WorkingTime>
-<WorkingTime>
-<FromTime>13:00:00</FromTime>
-<ToTime>17:00:00</ToTime>
-</WorkingTime>
-</WorkingTimes>
-</WeekDay>
-<WeekDay>
-<DayType>7</DayType>
-<DayWorking>0</DayWorking>
-</WeekDay>
-</WeekDays>
-</Calendar>
-</Calendars>
-<Tasks>
-<Task>
-<UID>0</UID>
-<ID>0</ID>
-<Type>1</Type>
-<IsNull>0</IsNull>
-<CreateDate>2006-02-10T14:36:00</CreateDate>
-<WBS>0</WBS>
-<OutlineNumber>0</OutlineNumber>
-<OutlineLevel>0</OutlineLevel>
-<Priority>500</Priority>
-<Start>2006-02-10T08:00:00</Start>
-<Finish>2006-02-10T08:00:00</Finish>
-<Duration>PT0H0M0S</Duration>
-<DurationFormat>53</DurationFormat>
-<Work>PT0H0M0S</Work>
-<ResumeValid>0</ResumeValid>
-<EffortDriven>0</EffortDriven>
-<Recurring>0</Recurring>
-<OverAllocated>0</OverAllocated>
-<Estimated>1</Estimated>
-<Milestone>0</Milestone>
-<Summary>1</Summary>
-<Critical>1</Critical>
-<IsSubproject>0</IsSubproject>
-<IsSubprojectReadOnly>0</IsSubprojectReadOnly>
-<ExternalTask>0</ExternalTask>
-<EarlyStart>2006-02-10T08:00:00</EarlyStart>
-<EarlyFinish>2006-02-10T08:00:00</EarlyFinish>
-<LateStart>2006-02-10T08:00:00</LateStart>
-<LateFinish>2006-02-10T08:00:00</LateFinish>
-<StartVariance>0</StartVariance>
-<FinishVariance>0</FinishVariance>
-<WorkVariance>0</WorkVariance>
-<FreeSlack>0</FreeSlack>
-<TotalSlack>0</TotalSlack>
-<FixedCost>0</FixedCost>
-<FixedCostAccrual>3</FixedCostAccrual>
-<PercentComplete>0</PercentComplete>
-<PercentWorkComplete>0</PercentWorkComplete>
-<Cost>0</Cost>
-<OvertimeCost>0</OvertimeCost>
-<OvertimeWork>PT0H0M0S</OvertimeWork>
-<ActualDuration>PT0H0M0S</ActualDuration>
-<ActualCost>0</ActualCost>
-<ActualOvertimeCost>0</ActualOvertimeCost>
-<ActualWork>PT0H0M0S</ActualWork>
-<ActualOvertimeWork>PT0H0M0S</ActualOvertimeWork>
-<RegularWork>PT0H0M0S</RegularWork>
-<RemainingDuration>PT0H0M0S</RemainingDuration>
-<RemainingCost>0</RemainingCost>
-<RemainingWork>PT0H0M0S</RemainingWork>
-<RemainingOvertimeCost>0</RemainingOvertimeCost>
-<RemainingOvertimeWork>PT0H0M0S</RemainingOvertimeWork>
-<ACWP>0</ACWP>
-<CV>0</CV>
-<ConstraintType>0</ConstraintType>
-<CalendarUID>-1</CalendarUID>
-<LevelAssignments>1</LevelAssignments>
-<LevelingCanSplit>1</LevelingCanSplit>
-<LevelingDelay>0</LevelingDelay>
-<LevelingDelayFormat>8</LevelingDelayFormat>
-<IgnoreResourceCalendar>0</IgnoreResourceCalendar>
-<HideBar>0</HideBar>
-<Rollup>0</Rollup>
-<BCWS>0</BCWS>
-<BCWP>0</BCWP>
-<PhysicalPercentComplete>0</PhysicalPercentComplete>
-<EarnedValueMethod>0</EarnedValueMethod>
-<ActualWorkProtected>PT0H0M0S</ActualWorkProtected>
-<ActualOvertimeWorkProtected>PT0H0M0S</ActualOvertimeWorkProtected>
-</Task>
-</Tasks>
-<Resources>
-<Resource>
-<UID>0</UID>
-<ID>0</ID>
-<Type>1</Type>
-<IsNull>0</IsNull>
-<WorkGroup>0</WorkGroup>
-<MaxUnits>1</MaxUnits>
-<PeakUnits>0</PeakUnits>
-<OverAllocated>0</OverAllocated>
-<CanLevel>1</CanLevel>
-<AccrueAt>3</AccrueAt>
-<Work>PT0H0M0S</Work>
-<RegularWork>PT0H0M0S</RegularWork>
-<OvertimeWork>PT0H0M0S</OvertimeWork>
-<ActualWork>PT0H0M0S</ActualWork>
-<RemainingWork>PT0H0M0S</RemainingWork>
-<ActualOvertimeWork>PT0H0M0S</ActualOvertimeWork>
-<RemainingOvertimeWork>PT0H0M0S</RemainingOvertimeWork>
-<PercentWorkComplete>0</PercentWorkComplete>
-<StandardRate>0</StandardRate>
-<StandardRateFormat>2</StandardRateFormat>
-<Cost>0</Cost>
-<OvertimeRate>0</OvertimeRate>
-<OvertimeRateFormat>2</OvertimeRateFormat>
-<OvertimeCost>0</OvertimeCost>
-<CostPerUse>0</CostPerUse>
-<ActualCost>0</ActualCost>
-<ActualOvertimeCost>0</ActualOvertimeCost>
-<RemainingCost>0</RemainingCost>
-<RemainingOvertimeCost>0</RemainingOvertimeCost>
-<WorkVariance>0</WorkVariance>
-<CostVariance>0</CostVariance>
-<SV>0</SV>
-<CV>0</CV>
-<ACWP>0</ACWP>
-<CalendarUID>2</CalendarUID>
-<BCWS>0</BCWS>
-<BCWP>0</BCWP>
-<IsGeneric>0</IsGeneric>
-<IsInactive>0</IsInactive>
-<IsEnterprise>0</IsEnterprise>
-<BookingType>0</BookingType>
-<ActualWorkProtected>PT0H0M0S</ActualWorkProtected>
-<ActualOvertimeWorkProtected>PT0H0M0S</ActualOvertimeWorkProtected>
-<CreationDate>2006-02-10T14:36:00</CreationDate>
-</Resource>
-</Resources>
-<Assignments/>
-</Project>
diff --git a/plugins/org.eclipse.epf.export.xml/.classpath b/plugins/org.eclipse.epf.export.xml/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/plugins/org.eclipse.epf.export.xml/.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/plugins/org.eclipse.epf.export.xml/.cvsignore b/plugins/org.eclipse.epf.export.xml/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.export.xml/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.export.xml/.options b/plugins/org.eclipse.epf.export.xml/.options
deleted file mode 100755
index d731bd7..0000000
--- a/plugins/org.eclipse.epf.export.xml/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-# Turn on debug trace for the xml export plug-in
-org.eclipse.epf.export.xml/debug=true
diff --git a/plugins/org.eclipse.epf.export.xml/.project b/plugins/org.eclipse.epf.export.xml/.project
deleted file mode 100755
index 7179e06..0000000
--- a/plugins/org.eclipse.epf.export.xml/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.export.xml</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/plugins/org.eclipse.epf.export.xml/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.export.xml/META-INF/MANIFEST.MF
deleted file mode 100755
index c0ae242..0000000
--- a/plugins/org.eclipse.epf.export.xml/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.export.xml;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.epf.export.xml.ExportXMLPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.epf.authoring.ui;visibility:=reexport,
- org.eclipse.epf.dataexchange;visibility:=reexport,
- org.eclipse.epf.export;visibility:=reexport,
- org.eclipse.epf.xml.uma;visibility:=reexport,
- org.eclipse.ui
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.export.xml,
- org.eclipse.epf.export.xml.preferences,
- org.eclipse.epf.export.xml.services,
- org.eclipse.epf.export.xml.wizards
diff --git a/plugins/org.eclipse.epf.export.xml/build.properties b/plugins/org.eclipse.epf.export.xml/build.properties
deleted file mode 100755
index 68bcc2f..0000000
--- a/plugins/org.eclipse.epf.export.xml/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               .options,\
-               META-INF/,\
-               plugin.properties,\
-               plugin.xml,\
-               icons/
diff --git a/plugins/org.eclipse.epf.export.xml/icons/full/obj16/XMLFile.gif b/plugins/org.eclipse.epf.export.xml/icons/full/obj16/XMLFile.gif
deleted file mode 100755
index 83b44bb..0000000
--- a/plugins/org.eclipse.epf.export.xml/icons/full/obj16/XMLFile.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.export.xml/icons/full/wizban/ExportXML.gif b/plugins/org.eclipse.epf.export.xml/icons/full/wizban/ExportXML.gif
deleted file mode 100755
index e249831..0000000
--- a/plugins/org.eclipse.epf.export.xml/icons/full/wizban/ExportXML.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.export.xml/plugin.properties b/plugins/org.eclipse.epf.export.xml/plugin.properties
deleted file mode 100755
index 4f2ba3a..0000000
--- a/plugins/org.eclipse.epf.export.xml/plugin.properties
+++ /dev/null
@@ -1,19 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Export XML Plug-in
-providerName=Eclipse.org
-
-# Export XML Wizard
-exportXMLWizardName=XML
-exportXMLWizardDescription=Export method library content to a XML file.
-
diff --git a/plugins/org.eclipse.epf.export.xml/plugin.xml b/plugins/org.eclipse.epf.export.xml/plugin.xml
deleted file mode 100755
index 7b46464..0000000
--- a/plugins/org.eclipse.epf.export.xml/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.exportWizards">
-      <wizard
-            category="org.eclipse.epf.ui.exportWizards.category"
-            class="org.eclipse.epf.export.xml.wizards.ExportXMLWizard"
-            icon="icons/full/obj16/XMLFile.gif"
-            id="org.eclipse.epf.export.xml.wizards.ExportXMLWizard"
-            name="%exportXMLWizardName">
-         <description>
-               %exportXMLWizardDescription
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.epf.ui.exportWizards">
-      <wizard id="org.eclipse.epf.export.xml.wizards.ExportXMLWizard"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/ExportXMLPlugin.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/ExportXMLPlugin.java
deleted file mode 100755
index 2ec318c..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/ExportXMLPlugin.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml;
-
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The Export XML plug-in class.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportXMLPlugin extends AbstractPlugin {
-
-	// The shared plug-in instance.
-	private static ExportXMLPlugin plugin;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportXMLPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * @see AbstractPlugin#start(BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * @see AbstractPlugin#stop(BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared plug-in instance.
-	 */
-	public static ExportXMLPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/ExportXMLResources.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/ExportXMLResources.java
deleted file mode 100755
index 5be1439..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/ExportXMLResources.java
+++ /dev/null
@@ -1,92 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The Export XML message resource bundle accessor class.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public final class ExportXMLResources extends NLS {
-
-	private static String BUNDLE_NAME = ExportXMLResources.class.getPackage()
-			.getName()
-			+ ".Resources"; //$NON-NLS-1$
-
-	private ExportXMLResources() {
-		// Do not instantiate
-	}
-
-	public static String exportXMLWizard_title;
-
-	public static String exportLibraryRadioButton_text;
-
-	public static String exportPluginsRadioButton_text;
-
-	public static String exportConfigsRadioButton_text;
-
-	public static String selectXMLFilePage_title;
-
-	public static String selectXMLFilePage_desc;
-
-	public static String fileLabel_text;
-
-	public static String browseButton_text;
-
-	public static String overwriteText_msg;
-
-	public static String exportingXML_text;
-
-	public static String invalidXMLFile_error;
-
-	public static String exportXMLWizard_error;
-
-	public static String exportXMLWizard_reviewLog;
-
-	public static String selectExportTypePage_desc;
-
-	public static String exportXMLService_error;
-
-	public static String exportXMLService_feature_error;
-
-	public static String xmlLibrary_error_load_xml;
-
-	public static String xmlLibrary_no_plugin;
-
-	public static String xmlLibrary_no_feature;
-
-	public static String xmlLibrary_no_class;
-
-	public static String xmlLibrary_error_create_element;
-
-	public static String xmlLibrary_error_set_value;
-
-	public static String xmlLibrary_invalid_feature_value;
-
-	public static String xmlLibrary_error_set_value_2;
-
-	public static String xmlLibrary_error_set_value_3;
-
-	public static String xmlLibrary_error_set_reference;
-
-	public static String xmlLibrary_error_process_wrong_container;
-
-	public static String xmlLibrary_new_id;
-
-	public static String xmlLibrary_id_not_unique;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ExportXMLResources.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/Resources.properties b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/Resources.properties
deleted file mode 100755
index b49983e..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/Resources.properties
+++ /dev/null
@@ -1,57 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-#
-# Message ID Range:
-#
-
-# Export XML Wizard
-exportXMLWizard_title=Export XML
-
-# Select Export Type Wizard Page
-selectExportTypePage_desc=Select the type of method library content to export.
-exportLibraryRadioButton_text=Export the entire method library
-exportPluginsRadioButton_text=Export one or more method plug-ins
-exportConfigsRadioButton_text=Export a method configuration
-
-# Select Destination XML File Wizard Page
-selectXMLFilePage_title=Specify export file
-selectXMLFilePage_desc=Specify a destination XML file to store the exported method library content.
-fileLabel_text=XML File:
-browseButton_text=Browse...
-
-# Overwrite Confirmation Dialog
-overwriteText_msg=''{0}'' already exists.\nDo you want to overwrite it?
-
-# Progress Messages
-exportingXML_text=Export method library content to XML file...
-
-# Error Messages
-invalidXMLFile_error=The specified XML file is not valid.
-exportXMLWizard_error=IUPM0000E: The Export failed: {0}
-exportXMLWizard_reviewLog=Export completed. Please review the log files under the export directory.
-exportXMLService_error=Error exporting library: {0}
-exportXMLService_feature_error=Error setting feature value:: Element={0}, feature={1}
-xmlLibrary_error_load_xml=Unable to load xml source ''{0}''
-xmlLibrary_no_plugin=No MethodPlugin for id {0}
-xmlLibrary_no_feature=Unable to get Xml feature for {0}_{1}
-xmlLibrary_no_class=Unable to get EClass for {0}
-xmlLibrary_error_create_element=Error creating element, Don''t know how to set value for feature {0}
-xmlLibrary_error_set_value=Error creating element, Can''t set value {0} to container {1}
-xmlLibrary_invalid_feature_value=Invalid attribute feature value for feature {0}, with value {1}
-xmlLibrary_error_set_value_2=Error setting attribute, Unable to set value for feature={0}, object={1}, value={2}
-xmlLibrary_error_set_value_3=Don''t know how to set value for feature={0}, object={1}, value={2}
-xmlLibrary_error_set_reference=Error setting reference, Unable to set value for feature={0}, object={1}, value={2}
-xmlLibrary_error_process_wrong_container=process ''{0}'' don''t have a valid container. The container is of type ''{1}'', which is not a Processpackage
-xmlLibrary_new_id=Element {0} is assigned with a new id {1} because it does not have a valid one
-xmlLibrary_id_not_unique=Element Id ''{0}'' is used by more than one element
-
-
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/package.html b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/package.html
deleted file mode 100755
index e309989..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the activator for managing the Export XML plug-in's life cycle.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/preferences/ExportXMLPreferences.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/preferences/ExportXMLPreferences.java
deleted file mode 100755
index 083e077..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/preferences/ExportXMLPreferences.java
+++ /dev/null
@@ -1,78 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2004, 2005 IBM Corporation.  All Rights Reserved.
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml.preferences;
-
-import org.eclipse.epf.export.xml.ExportXMLPlugin;
-import org.eclipse.epf.export.xml.services.ExportXMLData;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * The Export XML preferences.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportXMLPreferences {
-
-	/**
-	 * The export type preference key.
-	 */
-	public static final String EXPORT_TYPE = "exportType"; //$NON-NLS-1$
-
-	/**
-	 * The exported XML file preference key.
-	 */
-	public static final String XML_FILE = "xmlFile"; //$NON-NLS-1$
-
-	static {
-		// Initialize the default preference values.
-		IPreferenceStore store = ExportXMLPlugin.getDefault()
-				.getPreferenceStore();
-		store.setDefault(EXPORT_TYPE, ExportXMLData.EXPORT_METHOD_LIBRARY); //$NON-NLS-1$		
-		store.setDefault(XML_FILE, ""); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns the export type preference.
-	 * 
-	 * @return the export type preference
-	 */
-	public static int getExportType() {
-		return ExportXMLPlugin.getDefault().getPreferenceStore().getInt(
-				EXPORT_TYPE);
-	}
-
-	/**
-	 * Sets the exported type preference.
-	 * 
-	 * @param exportType
-	 *            the user specified export type
-	 */
-	public static void setExportType(int exportType) {
-		ExportXMLPlugin.getDefault().getPreferenceStore().setValue(EXPORT_TYPE,
-				exportType);
-	}
-
-	/**
-	 * Returns the exported XML file preference.
-	 * 
-	 * @return the exported XML file preference
-	 */
-	public static String getXMLFile() {
-		return ExportXMLPlugin.getDefault().getPreferenceStore().getString(
-				XML_FILE);
-	}
-
-	/**
-	 * Sets the exported XML file preference.
-	 * 
-	 * @param path
-	 *            the absolute path to a XML file
-	 */
-	public static void setXMLFile(String path) {
-		ExportXMLPlugin.getDefault().getPreferenceStore().setValue(XML_FILE,
-				path);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/preferences/package.html b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/preferences/package.html
deleted file mode 100755
index 12c20c5..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/preferences/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides preference support for the Export XML service.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/ExportResourceHandler.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/ExportResourceHandler.java
deleted file mode 100755
index 5406149..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/ExportResourceHandler.java
+++ /dev/null
@@ -1,136 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml.services;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.epf.dataexchange.util.BaseResourceHandler;
-import org.eclipse.epf.dataexchange.util.UrlInfo;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.MethodElement;
-
-/**
- * The resource handler for content in the exported library.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ExportResourceHandler extends BaseResourceHandler {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportResourceHandler(File sourceLibRoot, File targetLibRoot) {
-		super(sourceLibRoot, targetLibRoot);
-	}
-
-	/**
-	 * resolve the url. For XML export, we should reserve the resource locations.
-	 */
-	public UrlInfo resolveFileUrl(Object owner, String srcUrl) throws Exception {
-		return loadUrlInfoWithFixedPath(owner, srcUrl);
-	}
-
-	
-	/**
-	 * the resource path will be relative to the libary root. urls needs to be
-	 * fixed
-	 * 
-	 * @param owner
-	 *            the owner object in the target library
-	 * @param srcUrl
-	 * @return
-	 */
-	private UrlInfo loadUrlInfoWithFixedPath(Object owner, String srcUrl) {
-		UrlInfo info = new UrlInfo();
-		info.sourceUrl = srcUrl;
-		info.targetUrl = srcUrl;
-		String srcFile = getFileRelPath(owner, srcUrl);
-		if (srcFile != null) {
-			info.sourceFile = new File(sourceLibRoot, srcFile);
-			info.targetFile = new File(targetLibRoot, srcFile);
-			info.targetUrl = srcFile.replace(File.separatorChar, '/');
-		}
-
-		return info;
-	}
-
-	private String getFileRelPath(Object owner, String srcUrl) {
-		try {
-			if (owner instanceof org.eclipse.epf.xml.uma.MethodElement) {
-				String id = ((org.eclipse.epf.xml.uma.MethodElement) owner)
-						.getId();
-				ILibraryManager manager = LibraryService.getInstance()
-						.getCurrentLibraryManager();
-				if (manager != null) {
-					MethodElement element = manager.getMethodElement(id);
-					if (element != null) {
-						File f = new File(new File(sourceLibRoot,
-								ResourceHelper.getElementPath(element)), srcUrl);
-						String path = f.getCanonicalPath();
-						return path.substring(sourceLibRoot.getCanonicalPath()
-								.length() + 1);
-					}
-				}
-			}
-		} catch (IOException e) {
-			// Log error here
-		}
-
-		return null;
-	}
-
-//	/**
-//	 * the resource path will be relative to the owner element. urls will not be
-//	 * changed but resource files is relicated.
-//	 * 
-//	 * @param owner
-//	 * @param srcUrl
-//	 * @return
-//	 */
-//	private UrlInfo loadUrlInfoWithRelativePath(Object owner, String srcUrl) {
-//		UrlInfo info = new UrlInfo();
-//
-//		try {
-//			info.sourceUrl = srcUrl;
-//			info.targetUrl = srcUrl; // no url change
-//
-//			// get the rmc object
-//			if (owner instanceof org.eclipse.epf.xml.uma.MethodElement) {
-//				String id = ((org.eclipse.epf.xml.uma.MethodElement) owner)
-//						.getId();
-//				ILibraryManager manager = LibraryService.getInstance()
-//						.getCurrentLibraryManager();
-//				if (manager != null) {
-//					MethodElement element = manager.getMethodElement(id);
-//					if (element != null) {
-//						File f = new File(new File(sourceLibRoot,
-//								ResourceHelper.getElementPath(element)), srcUrl);
-//						f = f.getCanonicalFile();
-//
-//						info.sourceFile = f;
-//					}
-//				}
-//			}
-//
-//			info.targetFile = new File(targetLibRoot, srcUrl)
-//					.getCanonicalFile();
-//
-//		} catch (IOException e) {
-//			// log error TODO
-//		}
-//		return info;
-//	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/ExportXMLData.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/ExportXMLData.java
deleted file mode 100755
index 329402e..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/ExportXMLData.java
+++ /dev/null
@@ -1,144 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml.services;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.epf.uma.MethodConfiguration;
-
-/**
- * Stores the selections and settings made by the user in the Export XML wizard.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportXMLData {
-
-	public static final int EXPORT_METHOD_LIBRARY = 1;
-
-	public static final int EXPORT_METHOD_PLUGINS = 2;
-
-	public static final int EXPORT_METHOD_CONFIGS = 3;
-
-	protected int exportType = EXPORT_METHOD_LIBRARY;
-
-	protected List selectedPlugins;
-	
-	protected HashSet associatedConfigs;
-
-	protected List selectedConfigs;
-
-	protected String xmlFile;
-
-	/**
-	 * Gets the user specified export type.
-	 * 
-	 * @return the type of export operation to perform.
-	 */
-	public int getExportType() {
-		return exportType;
-	}
-
-	/**
-	 * Sets the user specified export type.
-	 * 
-	 * @param exporType
-	 *            the type of export operation to perform
-	 */
-	public void setExportType(int exportType) {
-		this.exportType = exportType;
-	}
-
-	/**
-	 * Gets the user selected method plug-ins.
-	 * 
-	 * @return a list of method plug-ins
-	 */
-	public List getSelectedPlugins() {
-		return selectedPlugins;
-	}
-
-	/**
-	 * Sets the associated configs with respected to selected plug-ins
-	 * 
-	 * @param associatedConfigMap
-	 *           Map of selected plug-ins to associated configs
-	 */
-	public void setAssociatedConfigs(Map associatedConfigMap) {
-		if (associatedConfigMap == null || associatedConfigMap.isEmpty()) {
-			return;
-		}
-		associatedConfigs = new HashSet(); 
-		for (Iterator it = associatedConfigMap.values().iterator(); it.hasNext();) {
-			List configList = (List) it.next();
-			int sz = configList == null ? 0 : configList.size();
-			for (int i=0; i<sz; i++) {
-				MethodConfiguration config = (MethodConfiguration) configList.get(i);
-				if (!associatedConfigs.contains(config.getGuid())) {
-					associatedConfigs.add(config.getGuid());
-				}
-			}
-		}
-	}
-
-	/**
-	 * Sets the user selected method plug-ins.
-	 * 
-	 * @param plugins
-	 *            a list of method plug-ins
-	 */
-	public void setSelectedPlugins(List plugins) {
-		selectedPlugins = plugins;
-	}
-	
-	/**
-	 * Gets the user selected method configurations.
-	 * 
-	 * @return a list of method configurations
-	 */
-	public List getSelectedConfigs() {
-		return selectedConfigs;
-	}
-
-	/**
-	 * Sets the user selected method configurations.
-	 * 
-	 * @param configs
-	 *            a list of method configurations
-	 */
-	public void setSelectedConfigs(List configs) {
-		selectedConfigs = configs;
-	}
-
-	/**
-	 * Gets the user specified destination XML file.
-	 * 
-	 * @return an absolute path to the XML file
-	 */
-	public String getXMLFile() {
-		return xmlFile;
-	}
-
-	/**
-	 * Sets the user specified destination XML file.
-	 * 
-	 * @param xmlFile
-	 *            an absolute path to the XML file
-	 */
-	public void setXMLFile(String xmlFile) {
-		this.xmlFile = xmlFile;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/ExportXMLLogger.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/ExportXMLLogger.java
deleted file mode 100755
index da53348..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/ExportXMLLogger.java
+++ /dev/null
@@ -1,35 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml.services;
-
-import java.io.File;
-
-import org.eclipse.epf.dataexchange.util.FileLogger;
-
-
-/**
- * Logger class for xml export
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public class ExportXMLLogger extends FileLogger {
-
-	private static final String LOGS_FOLDER = "logs"; //$NON-NLS-1$
-	
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportXMLLogger(File logRoot) {
-		super(new File(logRoot, LOGS_FOLDER));
-	}
-}
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/ExportXMLService.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/ExportXMLService.java
deleted file mode 100755
index da07097..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/ExportXMLService.java
+++ /dev/null
@@ -1,524 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml.services;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.sdo.EDataObject;
-import org.eclipse.epf.dataexchange.util.ContentProcessor;
-import org.eclipse.epf.dataexchange.util.IResourceHandler;
-import org.eclipse.epf.export.services.DiagramHandler;
-import org.eclipse.epf.export.xml.ExportXMLResources;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.util.ModelStructure;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkOrderType;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * XmlExport service class to process the exporting task
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ExportXMLService {
-
-	// String xmlPath;
-	private ExportXMLData data;
-
-	private XMLLibrary xmlLib;
-
-	private List discardedElements = new ArrayList();
-
-	ExportXMLLogger logger = null;
-
-	// in case we need to mapping the uma objects to xml objects
-	// such as the content categories
-	private Map umaIdToXmlIdMap = new HashMap();
-	
-	private DiagramHandler diagramHandler;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportXMLService(ExportXMLData data) {
-		this.data = data;
-		logger = new ExportXMLLogger(new File(this.data.xmlFile)
-				.getParentFile());
-	}
-	/**
-	 * Gets the logger file.
-	 */
-	public File getLogPath() {
-		return logger.getLogPath();
-	}
-
-	/**
-	 * Dispose
-	 */
-	public void dispose() {
-		logger.dispose();
-	}
-
-	/**
-	 * Does XML library export.
-	 */
-	public void doExport(IProgressMonitor monitor) {
-		try {
-
-			IResourceHandler handler = new ExportResourceHandler(
-					new File(LibraryService.getInstance()
-							.getCurrentMethodLibraryPath()), new File(data
-							.getXMLFile()).getParentFile());
-			ContentProcessor contentProc = new ContentProcessor(handler,
-					this.logger);
-			
-			diagramHandler = new DiagramHandler(
-					new File(LibraryService.getInstance()
-							.getCurrentMethodLibraryPath()), new File(data
-							.getXMLFile()).getParentFile());
-
-			// FeatureManager.INSTANCE.printFeatureNameMapping();
-
-			// export the current library to the xml file
-			// get the current library instance and export all to the xml
-			MethodLibrary src = LibraryService.getInstance()
-					.getCurrentMethodLibrary();
-
-			this.xmlLib = new XMLLibrary(contentProc, logger, data
-					.getXMLFile());
-
-			this.xmlLib.createLibrary(src.getGuid(), src.getName());
-			EDataObject target = this.xmlLib.getRoot();
-
-			creatEDataObjectTree(src, target);
-			iteratEDataObject(src);
-
-			this.xmlLib.fixLibraryForExport();
-			
-			this.xmlLib.save();
-			diagramHandler.execute();
-
-		} catch (Exception e) {
-			logger.logError(NLS.bind(ExportXMLResources.exportXMLService_error,
-					e.getMessage()), e);
-		}
-	}
-
-	private boolean isPluginSelected(MethodPlugin plugin) {
-		if (data.exportType == ExportXMLData.EXPORT_METHOD_LIBRARY) {
-			return true;
-		} else if (data.exportType == ExportXMLData.EXPORT_METHOD_PLUGINS) {
-			return (data.selectedPlugins != null)
-					&& data.selectedPlugins.contains(plugin);
-		} else if (data.exportType == ExportXMLData.EXPORT_METHOD_CONFIGS) {
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	private boolean isConfigExcluded(MethodConfiguration config) {
-		if (data.exportType == ExportXMLData.EXPORT_METHOD_PLUGINS) {
-			return data.associatedConfigs == null || 
-					!data.associatedConfigs.contains(config.getGuid());
-		} 
-		return false;
-	}
-	
-	private void creatEDataObjectTree(MethodElement srcObj,
-			EDataObject targetObj) {
-
-		// if it's a plugin, skip all the system packages
-		// and find the top most user packages
-		if (srcObj instanceof MethodPlugin) {
-
-			MethodPlugin plugin = (MethodPlugin) srcObj;
-			if (!isPluginSelected(plugin)) {
-				return;
-			}
-
-			// all system packages are discarded
-			discardedElements.addAll(TngUtil.getAllSystemPackages(plugin));
-
-			List topmostUserPackages = getTopmostUserPackage(plugin);
-			List categoryPkgs = TngUtil.getContentCategoryPackages(plugin);
-
-			org.eclipse.epf.xml.uma.ContentCategoryPackage xmlPkg = (org.eclipse.epf.xml.uma.ContentCategoryPackage) this.xmlLib
-					.getContentCategoryPackage(plugin.getGuid());
-			String contentCategoryPackageId = xmlPkg.getId();
-
-			for (Iterator itp = topmostUserPackages.iterator(); itp.hasNext();) {
-				MethodPackage pkg = (MethodPackage) itp.next();
-
-				// if it's a category package,
-				// create all contained elements in the single custom category
-				// package
-				if (categoryPkgs.contains(pkg)) {
-
-					// set the it mapping
-					setIdMapping(pkg.getGuid(), contentCategoryPackageId);
-					creatEDataObjectTree(pkg, xmlPkg);
-				} else {
-					creatEDataObjectTree(pkg, targetObj);
-				}
-			}
-		} else {
-			for (Iterator it = srcObj.eContents().iterator(); it.hasNext();) {
-				MethodElement child = (MethodElement) it.next();
-
-				// in uma model, WorkOrder is contained in package
-				// in xml model, WorkOrder is contained by the owning
-				// WorkBreakdownElement,
-				// so delay the creation if the owner is a package
-				if (child instanceof WorkOrder
-						&& srcObj instanceof MethodPackage) {
-					continue;
-				}
-
-				if ((child instanceof MethodPlugin)
-						&& !isPluginSelected((MethodPlugin) child)) {
-					continue;
-				}
-				
-				if (child instanceof MethodConfiguration &&
-					isConfigExcluded((MethodConfiguration) child)) {
-					continue;
-				}
-
-				if (!isDiscarded(child)) {
-					createXmlObject(child, targetObj);
-				}
-			}
-		}
-	}
-
-	private void setIdMapping(String umaId, String xmlId) {
-		if (!umaIdToXmlIdMap.containsKey(umaId)) {
-			umaIdToXmlIdMap.put(umaId, xmlId);
-		}
-	}
-
-	private String getXmlId(String umaId) {
-		if (umaIdToXmlIdMap.containsKey(umaId)) {
-			return (String) umaIdToXmlIdMap.get(umaId);
-		}
-		return umaId;
-	}
-
-	private boolean isDiscarded(Object o) {
-		if (o instanceof Diagram) {
-			return true;
-		}
-		return discardedElements.contains(o);
-	}
-
-	private EDataObject getXmlObject(MethodElement srcObj) {
-		String id = srcObj.getGuid();
-		if (umaIdToXmlIdMap.containsKey(id)) {
-			id = (String) umaIdToXmlIdMap.get(id);
-		}
-		return this.xmlLib.getElement(id);
-	}
-
-	/**
-	 * create an xml element for the container, based on the uma element
-	 * 
-	 * @param umaElement
-	 * @param targetContainer
-	 */
-	private void createXmlObject(MethodElement umaElement,
-			EDataObject targetContainer) {
-		EStructuralFeature feature = umaElement.eContainmentFeature();
-		createXmlObject(umaElement, targetContainer, feature.getName());
-	}
-
-	/**
-	 * create an xml element for the container, based on the uma element
-	 * 
-	 * @param umaElement
-	 * @param targetContainer
-	 */
-	private void createXmlObject(MethodElement umaElement,
-			EDataObject targetContainer, String containmentFeature) {
-
-		try {
-			if (umaElement == null) {
-				return;
-			}
-
-			// get the containment feature so we can create the object of the
-			// same type
-			String elementType = umaElement.getType().getName();
-			EDataObject xmlElement = xmlLib.createElement(targetContainer,
-					containmentFeature, umaElement.eClass().getName(),
-					elementType, umaElement.getGuid());
-			if (xmlElement != null) {
-
-				// recursive
-				creatEDataObjectTree(umaElement, xmlElement);
-			}
-
-		} catch (Exception e) {
-			// log the error and continue???
-			e.printStackTrace();
-		}
-	}
-
-	private void iteratEDataObject(MethodElement srcObj) {
-		diagramHandler.registerElement(srcObj, true);
-		
-		if (srcObj instanceof MethodPlugin) {
-			MethodPlugin plugin = (MethodPlugin) srcObj;
-			if (!isPluginSelected(plugin)) {
-				return;
-			}
-		}
-
-		if (isProcessed(srcObj.getGuid())) {
-			return;
-		}
-		setProcessed(srcObj.getGuid());
-
-		EDataObject targetObj = getXmlObject(srcObj);
-
-		// if object is not created,
-		// which means it's either a system package or something wrong
-		if (targetObj == null) {
-			if (srcObj instanceof MethodPackage) {
-				// iterate the child packages
-				for (Iterator it = ((MethodPackage) srcObj).getChildPackages()
-						.iterator(); it.hasNext();) {
-					iteratEDataObject((MethodElement) it.next());
-				}
-			}
-
-			// // elements can be reference in other plugins
-			// // don't need to care about this
-			// else if (!isDiscarded(srcObj) ) {
-			// logger.logWarning("Warning: xml object not created for " +
-			// LibraryUtil.getTypeName(srcObj) );
-			// }
-
-			return;
-		}
-
-		EClass eClass = srcObj.eClass();
-
-		EList features = eClass.getEAllStructuralFeatures();
-		for (Iterator it = features.iterator(); it.hasNext();) {
-			EStructuralFeature feature = (EStructuralFeature) it.next();
-
-			Object value = srcObj.eGet(feature);
-
-			try {
-				if (value instanceof List) {
-					for (Iterator itv = ((List) value).iterator(); itv
-							.hasNext();) {
-						MethodElement src_value = (MethodElement) itv.next();
-
-						// handle the
-						// UmaPackage#getWorkBreakdownElement_LinkToPredecessor
-						// feature value
-						// the WorkOrder in uma is a process element in a
-						// package
-						// in xml model, it's an EDataObject contained by the
-						// WorkBreakdownElement
-						if (src_value instanceof WorkOrder) {
-							// get the owner of the WorkOrder
-							EDataObject workOrder = getXmlObject(src_value);
-							if (workOrder == null) {
-								createXmlObject(src_value, targetObj, feature
-										.getName());
-							}
-							// System.out.println("workorder value");
-						}
-
-						// set the reference
-						String xmlId = getXmlId(src_value.getGuid());
-						xmlLib.setReferenceValue(targetObj, feature.getName(),
-								xmlId, src_value.getType());
-
-						iteratEDataObject(src_value);
-					}
-				} else if (value instanceof MethodElement) {
-					// get the xml object and iterate again
-					MethodElement src_value = (MethodElement) value;
-
-					// if ( src_value instanceof WorkOrder ) {
-					// System.out.println("workorder value");
-					// }
-
-					// elements like Presentation may not have a Content
-					// Description
-					// the one returned may not have a container
-					if (src_value.eContainer() != null) {
-						String xmlId = getXmlId(src_value.getGuid());
-						xmlLib.setReferenceValue(targetObj, feature.getName(),
-								xmlId, src_value.getType());
-
-						iteratEDataObject(src_value);
-					}
-				} else if (!isDiscarded(srcObj)) {
-					// if ( targetObj instanceof ContentCategoryPackage) {
-					// System.out.println("hrre");
-					// }
-
-					if (value instanceof WorkOrderType) {
-						value = ((WorkOrderType) value).getName();
-					}
-
-					xmlLib.setAtributeFeatureValue(targetObj,
-							feature.getName(), value);
-				}
-			} catch (Exception e) {
-				String msg = NLS.bind(
-						ExportXMLResources.exportXMLService_feature_error,
-						LibraryUtil.getTypeName(srcObj), feature.getName());
-				logger.logError(msg, e);
-			}
-
-		}
-
-	}
-
-	// goid of processed element
-	private List processedElements = new ArrayList();
-
-	private boolean isProcessed(String guid) {
-		return processedElements.contains(guid);
-	}
-
-	private void setProcessed(String guid) {
-		if (!processedElements.contains(guid)) {
-			processedElements.add(guid);
-		}
-	}
-
-	private List getTopmostUserPackage(MethodPlugin plugin) {
-
-		MethodPackage pkg_core_content = UmaUtil.findMethodPackage(plugin,
-				ModelStructure.DEFAULT.coreContentPath);
-
-		MethodPackage pkg_custom_categories = UmaUtil.findMethodPackage(plugin,
-				ModelStructure.DEFAULT.customCategoryPath);
-
-		MethodPackage pkg_disciplines = UmaUtil.findMethodPackage(plugin,
-				ModelStructure.DEFAULT.disciplineDefinitionPath);
-
-		MethodPackage pkg_domains = UmaUtil.findMethodPackage(plugin,
-				ModelStructure.DEFAULT.domainPath);
-
-		MethodPackage pkg_rolesets = UmaUtil.findMethodPackage(plugin,
-				ModelStructure.DEFAULT.roleSetPath);
-
-		MethodPackage pkg_tools = UmaUtil.findMethodPackage(plugin,
-				ModelStructure.DEFAULT.toolPath);
-
-		MethodPackage pkg_wptypes = UmaUtil.findMethodPackage(plugin,
-				ModelStructure.DEFAULT.workProductTypePath);
-
-		MethodPackage pkg_cp = UmaUtil.findMethodPackage(plugin,
-				ModelStructure.DEFAULT.capabilityPatternPath);
-
-		MethodPackage pkg_dp = UmaUtil.findMethodPackage(plugin,
-				ModelStructure.DEFAULT.deliveryProcessPath);
-
-		MethodPackage pkg_proc_contribution = UmaUtil.findMethodPackage(plugin,
-				ModelStructure.DEFAULT.processContributionPath);
-
-		List pkgs = new ArrayList();
-		pkgs.add(pkg_core_content);
-		pkgs.add(pkg_custom_categories);
-		pkgs.add(pkg_disciplines);
-		pkgs.add(pkg_domains);
-		pkgs.add(pkg_rolesets);
-		pkgs.add(pkg_tools);
-		pkgs.add(pkg_wptypes);
-		pkgs.add(pkg_cp);
-		pkgs.add(pkg_dp);
-
-		if ( pkg_proc_contribution != null ) {
-			pkgs.add(pkg_proc_contribution);
-		}
-		
-		return pkgs;
-
-		// List systemPkgs = TngUtil.getAllSystemPackages(plugin);
-		//		
-		// List unprocessedPkgs = new ArrayList(plugin.getMethodPackages());
-		// while (unprocessedPkgs.size() > 0 ) {
-		// MethodPackage pkg = (MethodPackage) unprocessedPkgs.remove(0);
-		// if ( !systemPkgs.contains(pkg) ) {
-		// if ( !pkgs.contains(pkg) ) {
-		// pkgs.add(pkg);
-		// }
-		// continue;
-		// }
-		//			
-		// for ( Iterator it = pkg.getChildPackages().iterator(); it.hasNext();
-		// ) {
-		// MethodPackage p = (MethodPackage)it.next();
-		// if ( systemPkgs.contains(p) )
-		// {
-		// if ( !unprocessedPkgs.contains(p) ) {
-		// unprocessedPkgs.add(p);
-		// }
-		// } else {
-		// if ( !pkgs.contains(p) ) {
-		// pkgs.add(p);
-		// }
-		// }
-		// }
-		//			
-		// if ( unprocessedPkgs.size() == 0 ) {
-		// break;
-		// }
-		// }
-		//		
-		// // need to include the content packages
-		// pkgs.addAll(TngUtil.getContentCategoryPackages(plugin));
-
-	}
-
-	// private boolean isSystemPackage(EDataObject element) {
-	//		
-	// if ( !(element instanceof MethodPackage) ) {
-	// return false;
-	// }
-	//		
-	// MethodPlugin plugin = LibraryUtil.getMethodPlugin(element);
-	// if ( plugin == null ) {
-	// return false;
-	// }
-	//		
-	// return TngUtil.getAllSystemPackages(plugin).contains(element);
-	//		
-	// }
-}
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/FeatureManager.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/FeatureManager.java
deleted file mode 100755
index ef43f43..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/FeatureManager.java
+++ /dev/null
@@ -1,639 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml.services;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.epf.uma.UmaFactory;
-
-
-/**
- * manage the features of EClass.
- * maintains a map of feature name to the EStructuralFeature object for easier access
- * 
- * @author Jinhua Xi
- *
- */
-public class FeatureManager {
-
-	public static FeatureManager INSTANCE = new FeatureManager();
-	
-	//private Map classMap = new HashMap();
-	
-	// map of uma feature name to the corresponding xml feature name
-	private Map featureNameMap = new TreeMap();
-	
-	// uma features that should be ignored
-	private List unneededRmcFeatures = new ArrayList();
-
-	// xml features that can be ignored
-	private List unneededXmlFeatures = new ArrayList();
-
-	// map of EClass name to EClass Object for xml model
-	// note: we can't use feature.getEType() to get the EClass from feature
-	// the problem is the above returned EClass may not be the concreate EClass, instead, it is the base class
-	// for example, it returns MethodPackage instead of ProcessPackage or ContentPackage
-	// so we have to maintain a map manually
-	private Map xmlEClassMap = new TreeMap();
-	
-	// map of Eclas name to EClass object for uma model
-	private Map umaEClassMap = new TreeMap();
-	
-	private FeatureManager() {
-		
-		featureNameMap.put("OptionalInputTo", "optionalInputTo"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("Role", "role"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("Task", "task"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("activityReferences", "activityReference"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("aggregatedRoles", "aggregatedRole"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("assets", "reusableAsset"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("attachments", "attachment"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("baseConfigurations", "baseConfiguration"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("basedOnProcesses", "baseProcess"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("bases", "referencedMethodPlugin"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("body", "mainDescription"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("breakdownElements", "breakdownElement"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("categorizedElements", "categorizedElement"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("checklists", "checklist"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("childPackages", "methodPackage"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("communicationsMaterials", "communicationsMaterial"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("concepts", "concept,whitepaper"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("conceptsAndPapers", "concept,whitepaper"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("containedArtifacts", "containedArtifact"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("contentElements", "contentElement"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("contentReferences", "contentReference"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("copyrightStatement", "copyright"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("deliveredWorkProducts", "deliveredWorkProduct"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("disciplines", "discipline"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("educationMaterials", "educationMaterial"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("estimationConderations", "estimationConsiderations"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("examples", "example"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("guid", "id"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("guidelines", "guideline"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("howtoStaff", "howToStaff"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("includesPatterns", "includesPattern"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("interfaces", "interface"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("linkToPredecessor", "predecessor"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("methodPackages", "methodPackage"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("methodPlugins", "methodPlugin"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("ownedRules", "ownedRule"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("predefinedConfigurations", "methodConfiguration"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("processElements", "processElement"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("processViews", "processView"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("referenceWorkflows", "referenceWorkflow"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("reports", "report"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("reusableAssets", "reusableAsset"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("reusedPackages", "reusedPackage"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("roadmaps", "roadmap"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("roleSets", "roleSet"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("roles", "role"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("sectionDescription", "description"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("sections", "section"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("selectedSteps", "step"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("subCategories", "subCategory"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("subdiscipline", "subDiscipline"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("subPractices", "subPractice"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("subSections", "subSection"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("subdomains", "subdomain"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("superActivities", "superActivity"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("supportingMaterials", "supportingMaterial"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("tasks", "task"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("teamRoles", "role"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("templates", "template"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("toolMentors", "toolMentor"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("WorkProduct", "workProduct"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("workProducts", "workProduct"); //$NON-NLS-1$ //$NON-NLS-2$
-		featureNameMap.put("pred", "value"); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		unneededRmcFeatures.add("containerArtifact"); //$NON-NLS-1$
-		unneededRmcFeatures.add("modifies"); //$NON-NLS-1$
-		unneededRmcFeatures.add("parentPackage"); //$NON-NLS-1$
-		unneededRmcFeatures.add("diagrams"); //$NON-NLS-1$
-		unneededRmcFeatures.add("modifies"); //$NON-NLS-1$
-		unneededRmcFeatures.add("steps"); //$NON-NLS-1$
-		unneededRmcFeatures.add("workedOnBy"); //$NON-NLS-1$
-		unneededRmcFeatures.add("diagrams"); //$NON-NLS-1$
-		
-		unneededXmlFeatures.add("group"); //$NON-NLS-1$
-		unneededXmlFeatures.add("group1"); //$NON-NLS-1$
-		unneededXmlFeatures.add("group2"); //$NON-NLS-1$
-		unneededXmlFeatures.add("predecessor1"); //$NON-NLS-1$
-		
-		loadXmlClasses();
-		loadRmcClasses();
-		
-//		// print out the EClasses and feature map, for testing purpose
-//		// don't delete this code segment
-//		System.out.println("============ Loading EClasses for XML Uma model =================");
-//		for (Iterator it = xmlEClassMap.keySet().iterator(); it.hasNext(); ) {
-//			System.out.println("\t" + it.next());			
-//		}
-//		System.out.println("=================================================================");
-//
-//		for (Iterator it = featureNameMap.entrySet().iterator(); it.hasNext(); ) {
-//			Map.Entry entry = (Map.Entry) it.next();
-//			String key = (String)entry.getKey();
-//			String value = (String)entry.getValue();
-//			if (value != null && value.length() > 0 ) {
-//				System.out.println("\tfeatureNameMap.put(\"" + key + "\", \"" + value + "\");");	
-//			}
-//		}
-	}
-	
-	private void loadRmcClasses() {
-		
-		// load EClass map
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getActivity());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getActivityDescription());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getArtifact());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getArtifactDescription());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getBreakdownElement());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getBreakdownElementDescription());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getCapabilityPattern());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getChecklist());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getCompositeRole());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getConcept());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getConstraint());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getContentCategory());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getContentDescription());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getContentElement());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getContentPackage());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getCustomCategory());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getDeliverable());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getDeliverableDescription());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getDeliveryProcess());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getDeliveryProcessDescription());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getDescribableElement());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getDescriptor());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getDescriptorDescription());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getDiscipline());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getDisciplineGrouping());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getDomain());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getEstimationConsiderations());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getExample());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getGuidance());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getGuidanceDescription());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getGuideline());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getIteration());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getMethodConfiguration());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getMethodElement());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getMethodLibrary());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getMethodPackage());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getMethodPlugin());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getMethodUnit());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getMilestone());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getNamedElement());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getOutcome());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getPackageableElement());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getPhase());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getPlanningData());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getPractice());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getPracticeDescription());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getProcess());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getProcessComponent());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getProcessComponentInterface());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getProcessDescription());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getProcessElement());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getProcessPackage());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getProcessPlanningTemplate());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getReport());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getReusableAsset());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getRoadmap());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getRole());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getRoleDescription());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getRoleDescriptor());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getRoleSet());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getRoleSetGrouping());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getSection());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getSupportingMaterial());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getTask());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getTaskDescription());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getTaskDescriptor());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getTeamProfile());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getTemplate());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getTermDefinition());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getTool());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getToolMentor());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getWhitepaper());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getWorkBreakdownElement());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getWorkDefinition());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getWorkOrder());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getWorkProduct());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getWorkProductDescription());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getWorkProductDescriptor());
-		loadModelClasses(umaEClassMap, org.eclipse.epf.uma.UmaPackage.eINSTANCE.getWorkProductType());	
-	}
-	
-	
-	private void loadXmlClasses() {
-		
-		// load EClass map
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getActivity());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getActivityDescription());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getArtifact());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getArtifactDescription());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getBreakdownElement());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getBreakdownElementDescription());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getCapabilityPattern());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getChecklist());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getCompositeRole());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getConcept());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getConstraint());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getContentCategory());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getContentCategoryPackage());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getContentDescription());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getContentElement());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getContentPackage());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getCustomCategory());
-//		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getCategoryType());
-//		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getCategoryTypeObject());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getDeliverable());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getDeliverableDescription());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getDeliveryProcess());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getDeliveryProcessDescription());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getDescribableElement());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getDescriptor());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getDescriptorDescription());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getDiscipline());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getDisciplineGrouping());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getDomain());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getEstimate());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getEstimatingMetric());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getEstimationConsiderations());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getExample());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getGuidance());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getGuidanceDescription());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getGuideline());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getIteration());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getMethodConfiguration());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getMethodElement());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getMethodLibrary());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getMethodPackage());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getMethodPlugin());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getMethodUnit());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getMilestone());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getNamedElement());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getOutcome());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getPackageableElement());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getPhase());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getPlanningData());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getPractice());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getPracticeDescription());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getProcess());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getProcessComponent());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getProcessComponentInterface());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getProcessDescription());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getProcessElement());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getProcessPackage());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getProcessPlanningTemplate());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getReport());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getReusableAsset());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getRoadmap());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getRole());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getRoleDescription());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getRoleDescriptor());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getRoleSet());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getRoleSetGrouping());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getSection());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getSupportingMaterial());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getTask());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getTaskDescription());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getTaskDescriptor());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getTeamProfile());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getTemplate());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getTermDefinition());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getTool());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getToolMentor());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getWhitepaper());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getWorkBreakdownElement());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getWorkDefinition());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getWorkOrder());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getWorkProduct());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getWorkProductDescription());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getWorkProductDescriptor());
-		loadModelClasses(xmlEClassMap, org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getWorkProductType());	
-	}
-	
-	private void loadModelClasses(Map classMap, EClass clazz) {
-
-		String name = clazz.getName();
-		if( classMap.containsKey(name) ) {
-			return;
-		}
-		
-		classMap.put(name, clazz);
-			
-		//for (Iterator it = clazz.getEAllStructuralFeatures().iterator(); it.hasNext(); ) {
-		for (Iterator elements = ExtendedMetaData.INSTANCE.getAllElements(clazz).iterator(); 
-				elements.hasNext(); ) {
-			EStructuralFeature eStructuralFeature = (EStructuralFeature)elements.next();
-			EClassifier eClassifier = eStructuralFeature.getEType();
-			if (eClassifier instanceof EClass) {
-				EClass eClass = (EClass)eClassifier;				
-				// recursively find the nestedt features
-				loadModelClasses(classMap, eClass);
-			}
-		}
-	}
-
-	/**
-	 * @param clazz
-	 * @param umaFeatureName
-	 * @return the corresponding xml feature.
-	 */
-	public EStructuralFeature getXmlFeature(EClass clazz, String umaFeatureName) {
-		return getXmlFeature(clazz, umaFeatureName, null);
-	}
-	
-	/**
-	 * @param umaClazz
-	 * @param xmlFeatureName
-	 * @return the corresponding EStructuralFeature object.
-	 */
-	public EStructuralFeature getRmcFeature(EClass umaClazz, String xmlFeatureName) {
-		for ( Iterator it = umaClazz.getEAllStructuralFeatures().iterator(); it.hasNext(); )
-		{
-			EStructuralFeature feature = (EStructuralFeature)it.next();
-			String umaFeaturename = feature.getName();
-			
-			// if the feature name is the same, got it
-			if ( umaFeaturename.equals(xmlFeatureName) ) {
-				return feature;
-			}
-			
-			// check if the feature name is mapped to another xml feature name
-			String featureName = (String)featureNameMap.get(umaFeaturename);
-			if ( featureName != null ) {
-				int i = featureName.indexOf(","); //$NON-NLS-1$
-				if ( i > 0 ) {
-					if ( featureName.substring(0,i).equals(xmlFeatureName) || 
-						 featureName.substring(i+1).equals(xmlFeatureName)	) {
-						return feature;
-					}
-				} else {
-					if ( featureName.equals(xmlFeatureName) ) {
-						return feature;
-					}
-				}				
-			}
-		}
-
-		//System.out.print("FeatureManager: Unable to find uma feature for xml feature" + xmlFeatureName);
-		
-		return null;
-	}
-	
-	/**
-	 * @param clazz
-	 * @param umaFeatureName
-	 * @param objectType
-	 * @return the corrsponding xml feature.
-	 */
-	public EStructuralFeature getXmlFeature(EClass clazz, String umaFeatureName, String objectType) {
-
-		String featureName = umaFeatureName;
-		if ( featureNameMap.containsKey(featureName) ) {
-			featureName = (String)featureNameMap.get(featureName);
-			
-			// if the feature is not unique, use the first one
-			int i = featureName.indexOf(","); //$NON-NLS-1$
-			if ( i > 0 ) {
-				String name = featureName.substring(0, i);
-				if ( objectType != null ) {				
-					// pick the feature based on object type
-					if ( !name.equalsIgnoreCase(objectType) ) {
-						name = featureName.substring(i+1);
-					}
-					if ( !name.equalsIgnoreCase(objectType) ) {
-						name = null;
-					}
-				}
-				
-				featureName = name;
-			}
-		}
-		
-		if ( featureName == null ) {
-			return null;
-		}
-		
-		EStructuralFeature feature = clazz.getEStructuralFeature(featureName);
-		if ( (feature==null) && (clazz.getName().equals("ContentCategoryPackage")) && featureName.equals("contentElement") ) { //$NON-NLS-1$ //$NON-NLS-2$
-			feature = org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getContentCategoryPackage_ContentCategory();
-		}
-
-//		if ( feature == null ) {
-//			System.out.println("No xml feature " + featureName + " for class " + clazz.getName());
-//		}
-		
-		return feature;
-	}
-	
-	/**
-	 * @param umaEClassName
-	 * @return the corresponding xml eclass
-	 */
-	public EClass getXmlEClass(String umaEClassName) {
-//		EClass rootClass = ExtendedMetaData.INSTANCE.getDocumentRoot(org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE);
-//		EClass eClass = (EClass)rootClass.getEStructuralFeature(umaEClassName);
-//		return eClass;
-		
-		EClass cls = (EClass)xmlEClassMap.get(umaEClassName);
-//		if ( cls == null ) {
-//			System.out.println("No xml EClass for uma class " + umaEClassName);
-//		}
-		
-		return cls;
-	}
-	
-	/**
-	 * @param xmlEClassName
-	 * @return the corresponding EClass object.
-	 */
-	public EClass getRmcEClass(String xmlEClassName) {
-		EClass cls = (EClass)umaEClassMap.get(xmlEClassName);
-//		if ( cls == null ) {
-//			System.out.println("No uma EClass for xml class " + xmlEClassName);
-//		}
-		
-		return cls;
-	}
-	
-	/**
-	 * @param featurename
-	 * @return true if the feature is unneeded given by featurename.
-	 */
-	public boolean isUnneededRmcFeature(String featurename) {
-		return unneededRmcFeatures.contains(featurename);
-	}
-	
-	/**
-	 * @param featurename
-	 * @return true if the xml feature is unneeded given by featurename.
-	 */
-	public boolean isUnneededXmlFeature(String featurename) {
-		return unneededXmlFeatures.contains(featurename);
-	}
-	
-	/**
-	 * Prints the feature-name map.
-	 */
-	public void printFeatureNameMapping() {
-		printFeature(UmaFactory.eINSTANCE.createActivity(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createActivity());
-		printFeature(UmaFactory.eINSTANCE.createActivityDescription(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createActivityDescription());
-		printFeature(UmaFactory.eINSTANCE.createArtifact(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createArtifact());
-		printFeature(UmaFactory.eINSTANCE.createArtifactDescription(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createArtifactDescription());
-		printFeature(UmaFactory.eINSTANCE.createBreakdownElementDescription(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createBreakdownElementDescription());
-		printFeature(UmaFactory.eINSTANCE.createCapabilityPattern(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createCapabilityPattern());
-		printFeature(UmaFactory.eINSTANCE.createChecklist(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createChecklist());
-		printFeature(UmaFactory.eINSTANCE.createCompositeRole(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createCompositeRole());
-		printFeature(UmaFactory.eINSTANCE.createConcept(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createConcept());
-		printFeature(UmaFactory.eINSTANCE.createConstraint(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createConstraint());
-		printFeature(UmaFactory.eINSTANCE.createContentDescription(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createContentDescription());
-		printFeature(UmaFactory.eINSTANCE.createContentPackage(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createContentPackage());
-		printFeature(UmaFactory.eINSTANCE.createCustomCategory(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createCustomCategory());
-		printFeature(UmaFactory.eINSTANCE.createDeliverable(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createDeliverable());
-		printFeature(UmaFactory.eINSTANCE.createDeliverableDescription(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createDeliverableDescription());
-		printFeature(UmaFactory.eINSTANCE.createDeliveryProcess(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createDeliveryProcess());
-		printFeature(UmaFactory.eINSTANCE.createDeliveryProcessDescription(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createDeliveryProcessDescription());
-		printFeature(UmaFactory.eINSTANCE.createDescriptorDescription(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createDescriptorDescription());
-		printFeature(UmaFactory.eINSTANCE.createDiscipline(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createDiscipline());
-		printFeature(UmaFactory.eINSTANCE.createDisciplineGrouping(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createDisciplineGrouping());
-		printFeature(UmaFactory.eINSTANCE.createDomain(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createDomain());
-		printFeature(UmaFactory.eINSTANCE.createEstimationConsiderations(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createEstimationConsiderations());
-		printFeature(UmaFactory.eINSTANCE.createExample(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createExample());
-		printFeature(UmaFactory.eINSTANCE.createGuidanceDescription(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createGuidanceDescription());
-		printFeature(UmaFactory.eINSTANCE.createGuideline(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createGuideline());
-		printFeature(UmaFactory.eINSTANCE.createIteration(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createIteration());
-		printFeature(UmaFactory.eINSTANCE.createMethodConfiguration(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createMethodConfiguration());
-		printFeature(UmaFactory.eINSTANCE.createMethodLibrary(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createMethodLibrary());
-		printFeature(UmaFactory.eINSTANCE.createMethodPlugin(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createMethodPlugin());
-		printFeature(UmaFactory.eINSTANCE.createMilestone(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createMilestone());
-		printFeature(UmaFactory.eINSTANCE.createOutcome(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createOutcome());
-		printFeature(UmaFactory.eINSTANCE.createPhase(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createPhase());
-		printFeature(UmaFactory.eINSTANCE.createPlanningData(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createPlanningData());
-		printFeature(UmaFactory.eINSTANCE.createPractice(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createPractice());
-		printFeature(UmaFactory.eINSTANCE.createPracticeDescription(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createPracticeDescription());
-		printFeature(UmaFactory.eINSTANCE.createProcessComponent(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createProcessComponent());
-		printFeature(UmaFactory.eINSTANCE.createProcessDescription(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createProcessDescription());
-		printFeature(UmaFactory.eINSTANCE.createProcessPackage(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createProcessPackage());
-		printFeature(UmaFactory.eINSTANCE.createProcessPlanningTemplate(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createProcessPlanningTemplate());
-		printFeature(UmaFactory.eINSTANCE.createReport(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createReport());
-		printFeature(UmaFactory.eINSTANCE.createReusableAsset(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createReusableAsset());
-		printFeature(UmaFactory.eINSTANCE.createRoadmap(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createRoadmap());
-		printFeature(UmaFactory.eINSTANCE.createRole(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createRole());
-		printFeature(UmaFactory.eINSTANCE.createRoleDescription(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createRoleDescription());
-		printFeature(UmaFactory.eINSTANCE.createRoleDescriptor(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createRoleDescriptor());
-		printFeature(UmaFactory.eINSTANCE.createRoleSet(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createRoleSet());
-		printFeature(UmaFactory.eINSTANCE.createRoleSetGrouping(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createRoleSetGrouping());
-		printFeature(UmaFactory.eINSTANCE.createSection(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createSection());
-		printFeature(UmaFactory.eINSTANCE.createSupportingMaterial(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createSupportingMaterial());
-		printFeature(UmaFactory.eINSTANCE.createTask(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createTask());
-		printFeature(UmaFactory.eINSTANCE.createTaskDescription(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createTaskDescription());
-		printFeature(UmaFactory.eINSTANCE.createTaskDescriptor(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createTaskDescriptor());
-		printFeature(UmaFactory.eINSTANCE.createTeamProfile(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createTeamProfile());
-		printFeature(UmaFactory.eINSTANCE.createTemplate(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createTemplate());
-		printFeature(UmaFactory.eINSTANCE.createTermDefinition(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createTermDefinition());
-		printFeature(UmaFactory.eINSTANCE.createTool(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createTool());
-		printFeature(UmaFactory.eINSTANCE.createToolMentor(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createToolMentor());
-		printFeature(UmaFactory.eINSTANCE.createWhitepaper(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createWhitepaper());
-		printFeature(UmaFactory.eINSTANCE.createWorkOrder(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createWorkOrder());
-		printFeature(UmaFactory.eINSTANCE.createWorkProductDescription(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createWorkProductDescription());
-		printFeature(UmaFactory.eINSTANCE.createWorkProductDescriptor(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createWorkProductDescriptor());
-		printFeature(UmaFactory.eINSTANCE.createWorkProductType(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.createWorkProductType());
-//		printFeature(UmaFactory.eINSTANCE.create(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.create());
-//		printFeature(UmaFactory.eINSTANCE.create(), org.eclipse.epf.xml.uma.UmaFactory.eINSTANCE.create());
-
-
-	}
-	
-	
-	private void printFeature(EObject obj1, EObject obj2) {
-		List matched = new ArrayList();
-		List unmatched = new ArrayList();
-		List umaFeatures = new ArrayList();
-				
-		EList features = obj1.eClass().getEAllStructuralFeatures();
-		for ( Iterator it = features.iterator(); it.hasNext(); ) {
-			EStructuralFeature feature = (EStructuralFeature)it.next();
-			String name = feature.getName();
-			if ( featureNameMap.containsKey(name) ) {
-				String xml_name = (String) featureNameMap.get(name);
-				int indx = xml_name.indexOf(","); //$NON-NLS-1$
-				if ( indx > 0 ) {
-					matched.add(xml_name.substring(0, indx));
-					matched.add(xml_name.substring(indx+1).trim());					
-				}
-				else if ( !matched.contains(xml_name) ) {
-					matched.add(xml_name);
-				}
-			}
-			else if (!unneededRmcFeatures.contains(name) && !umaFeatures.contains(name) ) {
-				umaFeatures.add(name);
-			}
-		}			
-		
-		features = obj2.eClass().getEAllStructuralFeatures();
-		for ( Iterator it = features.iterator(); it.hasNext(); ) {
-			EStructuralFeature feature = (EStructuralFeature)it.next();
-			String name = feature.getName();
-			if ( umaFeatures.contains(name) ) {
-				umaFeatures.remove(name);
-			} else if (!unneededXmlFeatures.contains(name) && !matched.contains(name) && !unmatched.contains(name) ) {
-				unmatched.add(name);
-			}
-		}	
-		
-		if ( umaFeatures.size() + unmatched.size() == 0 ) {
-			return;
-		}
-		
-		System.out.println("============== un-matched features for " + obj1.eClass().getName() + " =================="); //$NON-NLS-1$ //$NON-NLS-2$
-		for ( Iterator it = umaFeatures.iterator(); it.hasNext(); ) {
-			String name = (String)it.next();
-			System.out.println("\tfeatureNameMap.put(\"" + name + "\", \"\");"); //$NON-NLS-1$ //$NON-NLS-2$
-			//System.out.println(name);
-		}
-		for ( Iterator it = unmatched.iterator(); it.hasNext(); ) {
-			String name = (String)it.next();
-			System.out.println("\t\t" + name); //$NON-NLS-1$
-		}
-
-		System.out.println(""); //$NON-NLS-1$
-		
-	}
-	
-//	public class FeatureMap {
-//		private Map featureMap = new HashMap();
-//		
-//		FeatureMap(EClass clazz) {
-//			EList features = clazz.getEAllStructuralFeatures();
-//			for ( Iterator it = features.iterator(); it.hasNext(); ) {
-//				EStructuralFeature feature = (EStructuralFeature)it.next();
-//				featureMap.put(feature.getName(), feature);
-//			}			
-//		}
-//		
-//		public EStructuralFeature getFeature(String featureName) {
-//			return (EStructuralFeature) featureMap.get(featureName);			
-//		}
-//	}
-}
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/XMLLibrary.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/XMLLibrary.java
deleted file mode 100755
index dc0a920..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/XMLLibrary.java
+++ /dev/null
@@ -1,955 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml.services;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.sdo.EDataObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.epf.common.serviceability.VersionUtil;
-import org.eclipse.epf.dataexchange.util.ContentProcessor;
-import org.eclipse.epf.dataexchange.util.ILogger;
-import org.eclipse.epf.export.xml.ExportXMLResources;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.xml.uma.BreakdownElement;
-import org.eclipse.epf.xml.uma.ContentCategoryPackage;
-import org.eclipse.epf.xml.uma.ContentPackage;
-import org.eclipse.epf.xml.uma.DocumentRoot;
-import org.eclipse.epf.xml.uma.MethodElement;
-import org.eclipse.epf.xml.uma.MethodLibrary;
-import org.eclipse.epf.xml.uma.MethodPackage;
-import org.eclipse.epf.xml.uma.MethodPlugin;
-import org.eclipse.epf.xml.uma.ProcessComponent;
-import org.eclipse.epf.xml.uma.ProcessPackage;
-import org.eclipse.epf.xml.uma.UmaFactory;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.VariabilityType;
-import org.eclipse.epf.xml.uma.WorkBreakdownElement;
-import org.eclipse.epf.xml.uma.WorkOrder;
-import org.eclipse.epf.xml.uma.WorkOrderType;
-import org.eclipse.epf.xml.uma.util.UmaResourceFactoryImpl;
-import org.eclipse.osgi.util.NLS;
-
-import com.ibm.icu.text.SimpleDateFormat;
-import commonj.sdo.Type;
-
-/**
- * XmlLibrary represents a method library loaded from a specified xml file The
- * xml file should be valid to the xml schema for MethodLibrary
- * 
- * @author Jinhua Xi
- * @since 1.0
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=162153
- */
-public class XMLLibrary {
-
-	private String filePath;
-
-	private ILogger logger;
-
-	private ContentProcessor contentProc = null;
-
-	private MethodLibrary rootObject;
-
-	// map of content category package for each plugin id
-	private Map contentCategoryPkgMap = new HashMap();
-
-	// map of created elements, guid - EDataObject
-	private Map elementsMap = new HashMap();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public XMLLibrary(ContentProcessor contentProc, ILogger logger,
-			String filePath) {
-		this.contentProc = contentProc;
-		this.logger = logger;
-		this.filePath = filePath;
-
-	}
-
-	/**
-	 * @return root object.
-	 */
-	public EDataObject getRoot() {
-		return this.rootObject;
-	}
-
-	/**
-	 * @return file path string.
-	 */
-	public String getFilePath() {
-		return this.filePath;
-	}
-
-	/**
-	 * get an array of plugin ids in the library
-	 * 
-	 * @return
-	 */
-	public String[] getPluginIds() {
-		List plugins = rootObject.getMethodPlugin();
-		String[] ids = new String[plugins.size()];
-		for (int i = 0; i < plugins.size(); i++) {
-			ids[i] = ((MethodPlugin) plugins.get(i)).getId();
-		}
-
-		return ids;
-	}
-
-	/**
-	 * @param id
-	 * @param name
-	 * @return a new XML library.
-	 */
-	public EDataObject createLibrary(String id, String name) {
-
-		MethodLibrary root = UmaFactory.eINSTANCE.createMethodLibrary();
-		String version = "";								//$NON-NLS-1$	
-		for (Iterator iter = VersionUtil.getAllToolIDs().iterator();iter.hasNext();) {
-			String toolID = (String)iter.next();
-			String toolVersion = VersionUtil.getVersions(toolID).getMinToolVersionForCurrentXMLSchemaVersion().getToolVersion().toString();
-			if (version.length() > 0) {
-				version += VersionUtil.XML_VERSIONS_SEPARATOR;
-			}
-			version += toolID + VersionUtil.XML_TOOL_VERSION_SEPARATOR + toolVersion;		
-		}
-		if (version.length() > 0) {
-			root.setTool(version);
-		}
-		return create(id, name, root);
-	}
-
-	/**
-	 * Loads the xml file.
-	 */
-	public void load() {
-		try {
-			ResourceSet resourceSet = new ResourceSetImpl();
-
-			// Get the URI of the model file.
-			//
-			URI fileURI = URI.createFileURI((new File(this.filePath)).getAbsolutePath());
-
-			// Create a resource for this file.
-			//
-			// Resource resource = resourceSet.createResource(fileURI);
-			Resource resource = new UmaResourceFactoryImpl()
-					.createResource(fileURI);
-			resourceSet.getResources().add(resource);
-
-			resource.load(new HashMap());
-
-			// Resource resource = resourceSet.getResource(fileURI, false);
-
-			// EClass eClass =
-			// ExtendedMetaData.INSTANCE.getDocumentRoot(umaPackage);
-
-			DocumentRoot root = (DocumentRoot) resource.getContents().get(0);
-			for (Iterator itr = root.eContents().iterator(); itr.hasNext();) {
-				Object o = itr.next();
-				if (o instanceof MethodLibrary) {
-					this.rootObject = (MethodLibrary) o;
-					break;
-				}
-			}
-
-			// System.out.println("Resource loaded");
-		} catch (IOException e) {
-			logger.logError(NLS.bind(
-					ExportXMLResources.xmlLibrary_error_load_xml, filePath), e);
-		}
-	}
-
-	/**
-	 * create the library and return the root object
-	 * 
-	 * @param filePath
-	 * @return
-	 */
-	private MethodLibrary create(String id, String name, MethodElement root) {
-
-		// Create a resource set
-		//
-		ResourceSet resourceSet = new ResourceSetImpl();
-
-		// Get the URI of the model file.
-		//
-		File file = new File(this.filePath);
-		URI fileURI = URI.createFileURI(file.getAbsolutePath());
-
-		// Create a resource for this file.
-		//
-		// Resource resource = resourceSet.createResource(fileURI);
-		Resource resource = new UmaResourceFactoryImpl()
-				.createResource(fileURI);
-		resourceSet.getResources().add(resource);
-
-		// Add the initial model object to the contents.
-		// root.setId(id);
-		// root.setName(name);
-
-		setElement(id, root);
-
-		// this.rootObject = root;
-		if (root != null) {
-			resource.getContents().add(root);
-		}
-
-		try {
-			Map options = new HashMap();
-			options.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
-			resource.save(options);
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-		if (root instanceof MethodLibrary) {
-			this.rootObject = (MethodLibrary) root;
-		}
-
-		return this.rootObject;
-	}
-
-	/**
-	 * @param pluginId
-	 * @return a content catergory package in the plugin given by pluginId.
-	 */
-	public EDataObject getContentCategoryPackage(String pluginId) {
-
-		ContentCategoryPackage pkg = (ContentCategoryPackage) contentCategoryPkgMap
-				.get(pluginId);
-		if (pkg != null) {
-			return pkg;
-		}
-
-		MethodPlugin plugin = (MethodPlugin) getElement(pluginId);
-		if (plugin == null) {
-			logger.logWarning(NLS.bind(ExportXMLResources.xmlLibrary_no_plugin,
-					pluginId));
-			return null;
-		}
-
-		pkg = UmaFactory.eINSTANCE.createContentCategoryPackage();
-		pkg.setName("ContentCategories"); //$NON-NLS-1$
-
-		setElement(EcoreUtil.generateUUID(), pkg);
-
-		plugin.getMethodPackage().add(pkg);
-
-		contentCategoryPkgMap.put(pluginId, pkg);
-		return pkg;
-	}
-
-	/**
-	 * Saves the xml file.
-	 */
-	public void save() throws Exception {
-		// Save the contents of the resource to the file system.
-		//
-		Map options = new HashMap();
-		options.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
-		Resource resource = rootObject.eResource();
-		resource.save(options);
-	}
-
-	/**
-	 * @return the root object.
-	 */
-	public EDataObject open() {
-		return rootObject;
-	}
-
-	/**
-	 * @param guid
-	 * @return the corresponding base library element.
-	 */
-	public EDataObject getElement(String guid) {
-		return (EDataObject) elementsMap.get(guid);
-	}
-
-	/**
-	 * @param obj
-	 * @return the corresponding base library element.
-	 */
-	public EDataObject getElement(Object obj) {
-		if (obj instanceof MethodElement) {
-			return getElement(((MethodElement) obj).getId());
-		}
-
-		return null;
-	}
-
-	
-	/**
-	 * @param obj
-	 * @return elmenent id string.
-	 */
-	public String getElementId(EDataObject obj) {
-
-		if (obj instanceof MethodElement) {
-			return ((MethodElement) obj).getId();
-		} else if (obj instanceof WorkOrder) {
-			return ((WorkOrder) obj).getId();
-		}
-
-		return null;
-	}
-
-	private void setElement(String guid, EDataObject obj) {
-		// addElementToContainer(container, obj);
-		if (!elementsMap.containsKey(guid)) {
-
-			if (obj instanceof MethodElement) {
-				((MethodElement) obj).setId(guid);
-			}
-
-			elementsMap.put(guid, obj);
-		}
-	}
-
-	// private void addElementToContainer(EDataObject container, EDataObject
-	// child) {
-	//		
-	// try {
-	// if ( container == null ) {
-	// return;
-	// }
-	//			
-	// if ( child instanceof MethodLibrary || child instanceof MethodPlugin ||
-	// child instanceof MethodPackage ) {
-	// return;
-	// }
-	//			
-	// while ( !(container instanceof MethodPackage) && (container != null) ) {
-	// container = container.eContainer();
-	// }
-	//			
-	// if ( container instanceof ContentPackage ) {
-	// ((ContentPackage)container).getContentElement().add(child);
-	// } else if ( container instanceof ProcessPackage ) {
-	// ((ProcessPackage)container).getProcessElement().add(child);
-	// } else {
-	// System.out.println("Don't know how to set element " + child);
-	// }
-	// } catch (RuntimeException e) {
-	// // TODO Auto-generated catch block
-	// e.printStackTrace();
-	// }
-	// }
-
-	/**
-	 * create a child element with the specified guid
-	 * 
-	 * @param container
-	 *            container of the element to be created
-	 * @param umaFeatureName
-	 *            uma feature for the element to be created
-	 * @param umaEClassName
-	 *            uma EClass name for the feature
-	 * @param umaElementType
-	 *            uma element type for the element to be created
-	 * @param guid
-	 *            guid of the element to be created
-	 * @return EDataObject the Xml uma element
-	 */
-	public EDataObject createElement(EDataObject container,
-			String umaFeatureName, String umaEClassName, String umaElementType,
-			String guid) {
-
-		EDataObject obj = getElement(guid);
-		if (obj == null) {
-			if (FeatureManager.INSTANCE.isUnneededRmcFeature(umaFeatureName)) {
-				return null;
-			}
-			EStructuralFeature feature = FeatureManager.INSTANCE.getXmlFeature(
-					container.eClass(), umaFeatureName, umaElementType);
-			if (feature == null) {
-				logger.logWarning(NLS.bind(
-						ExportXMLResources.xmlLibrary_no_feature, container
-								.eClass().getName(), umaFeatureName));
-				return null;
-			}
-
-			// if ( !(feature instanceof EReference) ) {
-			// System.out.println("Error creating element: containment feature
-			// should be EReference type. " + feature.getName());
-			// //return null;
-			// }
-
-			// // this is an easier way, test it,
-			// // does not work since feature.getEType() returns the base
-			// element type, not the extended one
-			// // for example, it returns MethodPackage instead of
-			// ProcessPackage or ContentPackage
-			// // so we need to make our own map
-			// EClassifier c = feature.getEType();
-			// if ( !c.getName().equals(umaEClassName) ) {
-			// System.out.println("EClass name not match: " + c.getName() + "
-			// --- " + umaEClassName);
-			// }
-
-			EClass objClass = FeatureManager.INSTANCE
-					.getXmlEClass(umaEClassName);
-			if (objClass == null) {
-				logger.logWarning(NLS.bind(
-						ExportXMLResources.xmlLibrary_no_class, umaEClassName));
-				return null;
-			}
-
-			obj = (EDataObject) EcoreUtil.create(objClass);
-			setElement(guid, obj);
-
-			if (obj instanceof WorkOrder) {
-				// WorkOrder is not contained in a processPackage in xml model
-				// it's contained by the breakdownElement
-				// so we save the element id-object to the map and continue
-				// don't set the feature value
-				
-				// the workOrder in EPF UMA model is referenced by feature
-				// WorkBreakDownElement_LinkToPredecessor,
-				// the corresponding feature in the xml model is 
-				// WorkBreakDownElement_Predecessor, 
-				// the feature value is a list of guid of the WorkOrders
-				// when this feature value is set in the setReferenceValue() call
-				// get the XmlUma object, if it's WorkOrder, 
-				// add to the current workorder to the WorkBreakDownElement
-				// Jinhua Xi, 08/24/2006
-				return obj;
-			}
-
-			// note: all element references are string type (id)
-			// package references are object references
-			if (feature.isMany()) {
-				List values = (List) container.eGet(feature);
-				try {
-					if (feature instanceof EAttribute) {
-						values.add(guid);
-
-						// need to put the object in a container
-						// for example, the ContaiedArtifacts
-						addToContainer(container, obj);
-
-					} else if (feature instanceof EReference) {
-						try {
-							values.add(obj);
-						} catch (RuntimeException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-						}
-					} else {
-						logger
-								.logWarning(NLS
-										.bind(
-												ExportXMLResources.xmlLibrary_error_create_element,
-												feature.getName()));
-					}
-				} catch (RuntimeException e) {
-					logger.logError(NLS.bind(
-							ExportXMLResources.xmlLibrary_error_set_value, obj,
-							container), e);
-					// e.printStackTrace();
-				}
-			} else {
-				if (feature instanceof EAttribute) {
-					container.eSet(feature, guid);
-					addToContainer(container, obj);
-				} else if (feature instanceof EReference) {
-					container.eSet(feature, obj);
-				} else {
-					logger.logWarning(NLS.bind(
-							ExportXMLResources.xmlLibrary_error_create_element,
-							feature.getName()));
-				}
-			}
-		}
-
-		return obj;
-	}
-
-	private void addToContainer(EObject container, EObject obj) {
-
-		if (container == null) {
-			return;
-		}
-		if (container instanceof ContentPackage) {
-			((ContentPackage) container).getContentElement().add(obj);
-		} else if (container instanceof ProcessPackage) {
-			((ProcessPackage) container).getProcessElement().add(obj);
-			// } else if ( (obj instanceof Constraint) && (container instanceof
-			// MethodElement) ) {
-			// // the owner rule should be a containment 0..n feature, waiting
-			// for model fix
-			// //((MethodElement)container).setO
-		} else {
-			addToContainer(container.eContainer(), obj);
-		}
-	}
-
-	/**
-	 * Sets attribute feature value.
-	 * @param obj
-	 * @param featureName
-	 * @param value
-	 * @throws Exception
-	 */
-	public void setAtributeFeatureValue(EDataObject obj, String featureName,
-			Object value) throws Exception {
-		if (obj == null || featureName == null || value == null) {
-			return;
-		}
-
-		if (value instanceof List || value instanceof EDataObject) {
-			logger.logWarning(NLS.bind(
-					ExportXMLResources.xmlLibrary_invalid_feature_value,
-					featureName, value));
-
-			return;
-		}
-
-		// find the feature and set the value
-		EStructuralFeature feature = FeatureManager.INSTANCE.getXmlFeature(obj
-				.eClass(), featureName);
-		if (feature == null) {
-
-			// ignore missing features for WorkOrder
-			if (!(obj instanceof WorkOrder)) {
-				Object[] paras = new Object[] { featureName, obj, value };
-				logger
-						.logWarning(NLS
-								.bind(
-										ExportXMLResources.xmlLibrary_error_set_value_2,
-										paras));
-			}
-			return;
-		}
-
-		// 158688 - Missing template files in exported xml library
-		// process the attachment url
-		if ( feature == UmaPackage.eINSTANCE.getGuidanceDescription_Attachment() ) {
-			if ( value != null ) {
-				value = contentProc.resolveAttachmentResources(obj, value.toString().trim());
-			}
-			obj.eSet(feature, value);
-		}
-		
-		if (feature instanceof EAttribute) {
-			try {
-				if (feature.getName().equals("variabilityType")) { //$NON-NLS-1$
-					value = VariabilityType.get(value.toString());
-				} else if (feature.getName().equals("linkType")) { //$NON-NLS-1$
-					value = WorkOrderType.get(value.toString());
-				} else if (value instanceof java.util.Date) {
-					// convert java.util.Date to xml Date
-					value = getXmlDate((java.util.Date) value);
-				} else if ((contentProc != null)
-						&& (obj instanceof MethodElement)
-						&& (value instanceof String)) {
-					value = contentProc.resolveResourceFiles(
-							(MethodElement) obj, (String) value);
-				} else if (value instanceof java.net.URI) {
-					value = ((java.net.URI) value).getPath();
-					if (contentProc != null) {
-						contentProc.copyResource((String) value);
-					}
-				}
-				obj.eSet(feature, value);
-			} catch (RuntimeException e) {
-				Object[] paras = new Object[] { featureName, obj, value };
-				logger
-						.logError(
-								NLS
-										.bind(
-												ExportXMLResources.xmlLibrary_error_set_value_2,
-												paras), e);
-			}
-		} else {
-			System.out.println(ExportXMLResources.xmlLibrary_error_set_value_3); //$NON-NLS-1$
-		}
-
-	}
-
-	/**
-	 * set the id references for the object
-	 * 
-	 * @param obj
-	 *            EDataObject the object
-	 * @param featureName
-	 *            String the feature of the object
-	 * @param idValue
-	 *            String the id reference value of the feature
-	 * @param valueType
-	 *            Type the object type of the reference. Need to have this to
-	 *            determine the xml feature in case the feature mappting is not
-	 *            unique
-	 * @throws Exception
-	 */
-	public void setReferenceValue(EDataObject obj, String featureName,
-			String idValue, Type valueType) throws Exception {
-		if (obj == null || featureName == null || idValue == null) {
-			return;
-		}
-
-		if (FeatureManager.INSTANCE.isUnneededRmcFeature(featureName)) {
-			return;
-		}
-
-		// find the feature and set the value
-		EStructuralFeature feature = FeatureManager.INSTANCE.getXmlFeature(obj
-				.eClass(), featureName, valueType.getName());
-		if (feature == null) {
-			Object[] paras = new Object[] { featureName, obj, idValue };
-			logger.logWarning(NLS.bind(
-					ExportXMLResources.xmlLibrary_error_set_reference, paras));
-			return;
-		}
-
-		String str = feature.getEType().getName();
-		if (str.equals("String")) { //$NON-NLS-1$
-			if (feature.isMany()) {
-				List l = (List) obj.eGet(feature);
-				if (!l.contains(idValue)) {
-					l.add(idValue);
-				}
-			} else {
-				obj.eSet(feature, idValue);
-			}
-		} else if (feature == UmaPackage.eINSTANCE
-				.getActivity_BreakdownElement()) {
-			// special handling for breakdown element. In uma, breakdown
-			// elements are under process packages
-			// in xml model, they are owned by the activity
-			EDataObject v = getElement(idValue);
-			if (v instanceof BreakdownElement) {
-				EObject old_container = v.eContainer();
-				List l = (List) obj.eGet(feature);
-				if (!l.contains(v)) {
-					l.add(v);
-				}
-
-				// if the old container package is empty, delete it
-				if ((old_container instanceof ProcessPackage)
-						&& (old_container.eContainer() instanceof ProcessComponent)) {
-					if (((ProcessPackage) old_container).getProcessElement()
-							.size() == 0) {
-						((ProcessPackage) old_container.eContainer())
-								.getMethodPackage().remove(old_container);
-					}
-				}
-			}
-		} else if ( feature == UmaPackage.eINSTANCE.getWorkBreakdownElement_Predecessor() ) {
-			// the orker order needs to be added to the WorkBreakdownElement
-			// since in Xml model the work order is contained by the WorkBreakdownElement
-			// Jinhua Xi, 08/24/2006
-			Object v = getElement(idValue);
-			if (v instanceof WorkOrder) {
-				((WorkBreakdownElement)obj).getPredecessor().add(v);
-			}
-		} else {
-			// not handled, add warning log
-			// the id feature value is not set
-			// JInhua Xi, TODO
-		}
-	}
-
-	/**
-	 * @param dt
-	 * @return a Xml date.
-	 */
-	public Object getXmlDate(java.util.Date dt) {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); //$NON-NLS-1$
-		String dtStr = sdf.format(dt);
-		dtStr = dtStr.replace(' ', 'T');
-		EDataType type = XMLTypePackage.eINSTANCE.getDateTime();
-		return XMLTypeFactory.eINSTANCE.createFromString(type, dtStr);
-
-	}
-
-	private String getString(Object obj) {
-		String str = ""; //$NON-NLS-1$
-		if (obj instanceof MethodElement) {
-			MethodElement me = (MethodElement) obj;
-			str = me.getType().getName() + ":" + me.getName(); //$NON-NLS-1$
-		} else if (obj != null) {
-			str = obj.toString();
-		}
-
-		return str;
-	}
-
-	/**
-	 * fix the library so that it meets the uma library standards
-	 * 
-	 */
-	public void fixLibraryForImport() {
-
-		fixGuid((MethodElement) rootObject);
-
-		if (rootObject instanceof MethodLibrary) {
-			for (Iterator it = ((MethodLibrary) rootObject).getMethodPlugin()
-					.iterator(); it.hasNext();) {
-				fixPlugin((MethodPlugin) it.next());
-			}
-		} else if (rootObject instanceof MethodPlugin) {
-			fixPlugin((MethodPlugin) rootObject);
-		}
-	}
-
-	/**
-	 * fix the library so that it meets the xml schema standards
-	 * also remove possible structure errors such as ProcessComponent without process in it.
-	 * 
-	 */
-	public void fixLibraryForExport() {
-
-		List invalidItems = new ArrayList();
-		for (Iterator it = ((MethodLibrary) rootObject).eAllContents(); it.hasNext();) {
-			Object obj = it.next();
-			if ( obj instanceof ProcessComponent ) {
-				org.eclipse.epf.xml.uma.Process proc = ((ProcessComponent)obj).getProcess();
-				if ( proc == null ) {
-					invalidItems.add(obj);
-				}
-			}
-		}
-
-		// remove the objects
-		while (invalidItems.size() > 0 ) {
-			EObject obj = (EObject)invalidItems.remove(0);
-			EcoreUtil.remove(obj);
-		}
-	}
-
-	
-	
-	/**
-	 * get a list of referenced plugins for the library. The referenced plugins
-	 * does not include the ones inside this library. When importing, these
-	 * plugins must be in the target library already.
-	 * 
-	 * @return List a list of referenced plugins
-	 */
-	public List getReferencedPlugins() {
-
-		List externalPlugins = new ArrayList();
-
-		if (!(rootObject instanceof MethodLibrary)) {
-			return externalPlugins;
-		}
-
-		List selectedPlugins = new ArrayList();
-		for (Iterator it = ((MethodLibrary) rootObject).getMethodPlugin()
-				.iterator(); it.hasNext();) {
-			MethodPlugin plugin = (MethodPlugin) it.next();
-			String id = plugin.getId();
-			selectedPlugins.add(id);
-			if (externalPlugins.contains(id)) {
-				externalPlugins.remove(id);
-			}
-
-			for (Iterator itr = plugin.getReferencedMethodPlugin().iterator(); itr
-					.hasNext();) {
-				String ref = (String) itr.next();
-				if (!selectedPlugins.contains(ref)
-						&& !externalPlugins.contains(ref)) {
-					externalPlugins.add(ref);
-				}
-			}
-		}
-
-		return externalPlugins;
-	}
-
-	private void fixGuid(MethodElement element) {
-		if (element == null) {
-			return;
-		}
-
-		// if the xml element does not have an id specified, create a new one
-		String id = element.getId();
-		if (id == null || id.equals("")) { //$NON-NLS-1$
-			id = EcoreUtil.generateUUID();
-			element.setId(id);
-			String msg = NLS.bind(ExportXMLResources.xmlLibrary_new_id,
-					getString(element), id);
-			logger.logWarning(msg);
-		} else {
-			// check if the element has a unique id or not
-			Object old = getElement(id);
-			if ((old != null) && (old != element)) {
-				logger.logWarning(NLS.bind(
-						ExportXMLResources.xmlLibrary_id_not_unique, id));
-			}
-
-			setElement(id, element);
-		}
-		// iterate the children
-		for (Iterator it = element.eContents().iterator(); it.hasNext();) {
-			Object o = it.next();
-			if (o instanceof MethodElement) {
-				fixGuid((MethodElement) o);
-			}
-		}
-	}
-
-	private void fixPlugin(MethodPlugin plugin) {
-
-		// find all processes and make sure they are wrapped with a
-		// ProcessComponent,
-		// if not, create one.
-		// collect the processes to be fixed,
-		// don't fix within the iteration, may cause concurrent modification
-		// exeception
-		List procs = new ArrayList();
-		for (Iterator it = plugin.eAllContents(); it.hasNext();) {
-			EObject o = (EObject) it.next();
-			if (isProcess(o)) {
-				procs.add(o);
-			}
-		}
-
-		if (procs.size() > 0) {
-			for (Iterator it = procs.iterator(); it.hasNext();) {
-				fixProcess((org.eclipse.epf.xml.uma.Process) it.next());
-			}
-		}
-	}
-
-	/**
-	 * In EPF, a process (Capability pattern and Delivery Process) can be reside
-	 * in a ProcessPackage or a ProcessComponent. If it's in a processComponent,
-	 * it is treated as a root level process. If it's in a ProcessPackage, it is
-	 * treated as a local copy of another process. So we need to check the
-	 * parent and see it this process is contained by a ProcessComponent.
-	 * 
-	 * @param Obj
-	 * @return boolean
-	 */
-	private boolean isProcess(EObject obj) {
-		if (!(obj instanceof org.eclipse.epf.xml.uma.Process)) {
-			return false;
-		}
-
-		obj = obj.eContainer();
-		if (obj instanceof ProcessComponent) {
-			return true;
-		}
-
-		// if it's immediate parent is not a ProcessComponent but it's within a
-		// ProcessComponent
-		// it's a local copy of the process
-		while (((obj = obj.eContainer()) != null)
-				&& (obj instanceof ProcessPackage)) {
-			if (obj instanceof ProcessComponent) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	private void fixProcess(org.eclipse.epf.xml.uma.Process proc) {
-		EDataObject container = (EDataObject) proc.eContainer();
-		ProcessComponent pc = null;
-		if (container instanceof ProcessComponent) {
-			return;
-		}
-
-		if (!(container instanceof ProcessPackage)) {
-			String msg = NLS
-					.bind(
-							ExportXMLResources.xmlLibrary_error_process_wrong_container,
-							proc.getName(), container.getType().getName());
-			logger.logWarning(msg);
-			return;
-		}
-
-		pc = UmaFactory.eINSTANCE.createProcessComponent();
-		String id = getTargetParentId(proc.getId());
-		if (id == null) {
-			id = EcoreUtil.generateUUID();
-		}
-
-		pc.setId(id);
-		pc.setName(proc.getName());
-		((ProcessPackage) container).getProcessElement().remove(proc);
-		((ProcessPackage) container).getMethodPackage().add(pc);
-		pc.setProcess(proc);
-
-	}
-
-	/**
-	 * if the process exists in the target library, get the process component id
-	 * from the target library
-	 */
-	private String getTargetParentId(String id) {
-		ILibraryManager manager = LibraryService.getInstance()
-				.getCurrentLibraryManager();
-		if (manager != null) {
-			EObject obj = manager.getMethodElement(id);
-			if (obj != null) {
-				obj = obj.eContainer();
-				if (obj instanceof org.eclipse.epf.uma.MethodElement) {
-					return ((org.eclipse.epf.uma.MethodElement) obj).getGuid();
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * @param pkg
-	 * @return the list of all processes in pkg.
-	 */
-	public List getAllProcesses(MethodPackage pkg) {
-		List processes = new ArrayList();
-		_iteratePackageForProcesses(pkg, processes);
-
-		return processes;
-	}
-
-	private void _iteratePackageForProcesses(MethodPackage pkg, List processes) {
-		if (pkg instanceof ProcessComponent) {
-			org.eclipse.epf.xml.uma.Process p = ((ProcessComponent) pkg)
-					.getProcess();
-			if (p != null && !processes.contains(p)) {
-				processes.add(p);
-			}
-		}
-
-		for (Iterator it = pkg.getMethodPackage().iterator(); it.hasNext();) {
-			_iteratePackageForProcesses((MethodPackage) it.next(), processes);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/package.html b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/package.html
deleted file mode 100755
index bfb7675..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/services/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces and implementation for the Export XML service.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/ExportXMLWizard.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/ExportXMLWizard.java
deleted file mode 100755
index c912851..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/ExportXMLWizard.java
+++ /dev/null
@@ -1,176 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml.wizards;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.export.services.ConfigurationExportData;
-import org.eclipse.epf.export.services.PluginExportData;
-import org.eclipse.epf.export.xml.ExportXMLPlugin;
-import org.eclipse.epf.export.xml.ExportXMLResources;
-import org.eclipse.epf.export.xml.preferences.ExportXMLPreferences;
-import org.eclipse.epf.export.xml.services.ExportXMLData;
-import org.eclipse.epf.export.xml.services.ExportXMLService;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * The Export XML wizard.
- * <p>
- * This wizard is used to export method library content to XML files.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportXMLWizard extends Wizard implements IImportWizard {
-
-	private SelectExportTypePage selectExportTypePage;
-
-	protected SelectPluginPage selectPluginPage;
-
-	protected ViewPluginInfoPage viewPluginInfoPage;
-
-	protected ViewExportSummaryPage viewExportSummaryPage;
-
-	protected SelectConfigPage selectConfigPage;
-
-	protected SelectXMLFilePage selectXMLFilePage;
-
-	protected ExportXMLData xmlData = new ExportXMLData();
-
-	protected PluginExportData pluginData = new PluginExportData();
-
-	protected ConfigurationExportData configData = new ConfigurationExportData();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportXMLWizard() {
-		super();
-		setWindowTitle(ExportXMLResources.exportXMLWizard_title);
-		setNeedsProgressMonitor(true);
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
-	 *      IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		selectExportTypePage = new SelectExportTypePage();
-		selectPluginPage = new SelectPluginPage(pluginData);
-		viewPluginInfoPage = new ViewPluginInfoPage(pluginData);
-		viewExportSummaryPage = new ViewExportSummaryPage(pluginData);
-		selectConfigPage = new SelectConfigPage(configData);
-		selectXMLFilePage = new SelectXMLFilePage();
-
-		addPage(selectExportTypePage);
-		addPage(selectPluginPage);
-		addPage(viewPluginInfoPage);
-		addPage(viewExportSummaryPage);
-		addPage(selectConfigPage);
-		addPage(selectXMLFilePage);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#createPageControls(Composite)
-	 */
-	public void createPageControls(Composite pageContainer) {
-		super.createPageControls(pageContainer);
-		pageContainer.getShell().setImage(
-				ExportXMLPlugin.getDefault().getSharedImage(
-						"full/obj16/XMLFile.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#canFinish()
-	 */
-	public boolean canFinish() {
-		return getContainer().getCurrentPage() == selectXMLFilePage
-				&& selectXMLFilePage.isPageComplete();
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		String xmlFilePath = selectXMLFilePage.getPath();
-		File xmlFile = new File(xmlFilePath);
-		if (xmlFile.exists()) {
-			boolean ok = ExportXMLPlugin.getDefault().getMsgDialog()
-					.displayPrompt(
-							ExportXMLResources.exportXMLWizard_title,
-							ExportXMLResources.bind(
-									ExportXMLResources.overwriteText_msg,
-									new String[] { xmlFilePath }));
-			if (!ok) {
-				return false;
-			}
-		}
-
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException {
-				ExportXMLService service = null;
-				try {
-					monitor.beginTask(ExportXMLResources.exportingXML_text,
-							IProgressMonitor.UNKNOWN);
-
-					xmlData.setXMLFile(selectXMLFilePage.getPath());
-					service = new ExportXMLService(xmlData);
-					service.doExport(monitor);
-					ExportXMLPreferences.setExportType(xmlData.getExportType());
-					ExportXMLPreferences.setXMLFile(xmlData.getXMLFile());
-				} catch (Exception e) {
-					throw new InvocationTargetException(e);
-				} finally {
-					monitor.done();
-					if (service != null) {
-						service.dispose();
-					}
-				}
-			}
-		};
-		try {
-			getContainer().run(true, false, op);
-		} catch (InterruptedException e) {
-			return false;
-		} catch (InvocationTargetException e) {
-			Throwable realException = e.getTargetException();
-			ExportXMLPlugin.getDefault().getMsgDialog().displayError(
-					ExportXMLResources.exportXMLWizard_title,
-					NLS.bind(ExportXMLResources.exportXMLWizard_error,
-							realException.getMessage()), realException);
-			return false;
-		}
-
-		String msg = ExportXMLResources.exportXMLWizard_reviewLog;
-		MsgBox.prompt(msg, SWT.OK);
-
-		return true;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/SelectConfigPage.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/SelectConfigPage.java
deleted file mode 100755
index 41e6cbc..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/SelectConfigPage.java
+++ /dev/null
@@ -1,43 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml.wizards;
-
-import org.eclipse.epf.export.services.ConfigurationExportData;
-import org.eclipse.epf.export.wizards.ExportConfigSelectConfigPage;
-import org.eclipse.jface.wizard.IWizardPage;
-
-/**
- * A wizard page that prompts the user to select one or more method configuration
- * specifications to export.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class SelectConfigPage extends ExportConfigSelectConfigPage {
-
-	/**
-	 * Creates a nes instance.
-	 */
-	public SelectConfigPage(ConfigurationExportData data) {
-		super(data);
-	}
-	
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		super.saveDataToModel();
-		ExportXMLWizard wizard = (ExportXMLWizard) getWizard();
-		wizard.xmlData.setSelectedConfigs(wizard.configData.selectedConfigs);		
-		return wizard.selectXMLFilePage;
-	}	
-
-}
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/SelectExportTypePage.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/SelectExportTypePage.java
deleted file mode 100755
index 8ee9de1..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/SelectExportTypePage.java
+++ /dev/null
@@ -1,128 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml.wizards;
-
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.export.xml.ExportXMLPlugin;
-import org.eclipse.epf.export.xml.ExportXMLResources;
-import org.eclipse.epf.export.xml.preferences.ExportXMLPreferences;
-import org.eclipse.epf.export.xml.services.ExportXMLData;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * A wizard page that displays the type of method library content to export.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class SelectExportTypePage extends BaseWizardPage implements Listener {
-
-	public static final String PAGE_NAME = SelectExportTypePage.class.getName();
-
-	private Button exportLibraryRadioButton;
-
-	private Button exportPluginsRadioButton;
-
-	// Postponed to next release.
-	//private Button exportConfigsRadioButton;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SelectExportTypePage() {
-		super(PAGE_NAME);
-		setTitle(ExportResources.selectExportTypePage_title);
-		setDescription(ExportXMLResources.selectExportTypePage_desc); //$NON-NLS-1$
-		setImageDescriptor(ExportXMLPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ExportXML.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout());
-
-		exportLibraryRadioButton = createRadioButton(container,
-				ExportXMLResources.exportLibraryRadioButton_text, 1, false);
-
-		exportPluginsRadioButton = createRadioButton(container,
-				ExportXMLResources.exportPluginsRadioButton_text, 1, false);
-
-		// Postponed to next release.
-		//exportConfigsRadioButton = createRadioButton(container,
-		//		ExportXMLResources.exportConfigsRadioButton_text, 1, false);
-		
-		switch (ExportXMLPreferences.getExportType()) {
-		case ExportXMLData.EXPORT_METHOD_LIBRARY:
-			exportLibraryRadioButton.setSelection(true);
-			break;
-		case ExportXMLData.EXPORT_METHOD_PLUGINS:
-			exportPluginsRadioButton.setSelection(true);
-			break;
-		// Postponed to next release.			
-		//case ExportXMLData.EXPORT_METHOD_CONFIGS:
-		//	exportConfigsRadioButton.setSelection(true);
-		//	break;
-		}
-
-		addListeners();
-
-		setControl(container);
-		setPageComplete(true);
-	}
-
-	private void addListeners() {
-		exportLibraryRadioButton.addListener(SWT.Selection, this);
-		exportPluginsRadioButton.addListener(SWT.Selection, this);
-		// Postponed to next release.		
-		//exportConfigsRadioButton.addListener(SWT.Selection, this);
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(Event)
-	 */
-	public void handleEvent(Event event) {
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isCompleted()
-	 */
-	public IWizardPage getNextPage() {
-		ExportXMLWizard wizard = (ExportXMLWizard) getWizard();
-
-		if (exportLibraryRadioButton.getSelection()) {
-			wizard.xmlData.setExportType(ExportXMLData.EXPORT_METHOD_LIBRARY);
-			return wizard.selectXMLFilePage;
-		} else if (exportPluginsRadioButton.getSelection()) {
-			wizard.xmlData.setExportType(ExportXMLData.EXPORT_METHOD_PLUGINS);
-			return wizard.selectPluginPage;
-		}
-		// Postponed to next release.
-		//else if (exportConfigsRadioButton.getSelection()) {
-		//	wizard.xmlData.setExportType(ExportXMLData.EXPORT_METHOD_CONFIGS);
-		//	return wizard.selectConfigPage;
-		//}
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/SelectPluginPage.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/SelectPluginPage.java
deleted file mode 100755
index 11b6f34..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/SelectPluginPage.java
+++ /dev/null
@@ -1,45 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml.wizards;
-
-import org.eclipse.epf.export.services.PluginExportData;
-import org.eclipse.jface.wizard.IWizardPage;
-
-/**
- * A wizard page that prompts the user to select one or more method plug-ins to
- * export.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class SelectPluginPage extends
-		org.eclipse.epf.export.wizards.SelectPluginPage {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SelectPluginPage(PluginExportData data) {
-		super(data);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		super.saveDataToModel();
-		ExportXMLWizard wizard = (ExportXMLWizard) getWizard();
-		wizard.xmlData.setSelectedPlugins(wizard.pluginData.selectedPlugins);
-		ViewPluginInfoPage page = wizard.viewPluginInfoPage;
-		page.onEnterPage(null);
-		return page;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/SelectXMLFilePage.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/SelectXMLFilePage.java
deleted file mode 100755
index a4071ec..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/SelectXMLFilePage.java
+++ /dev/null
@@ -1,143 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml.wizards;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.epf.export.xml.ExportXMLPlugin;
-import org.eclipse.epf.export.xml.ExportXMLResources;
-import org.eclipse.epf.export.xml.preferences.ExportXMLPreferences;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A wizard page that prompts the user to specify a XML file to store the
- * exported method library content.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class SelectXMLFilePage extends WizardPage {
-
-	public static final String PAGE_NAME = SelectXMLFilePage.class.getName();
-
-	private Text pathText;
-
-	private String path;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SelectXMLFilePage() {
-		super(PAGE_NAME);
-		setTitle(ExportXMLResources.selectXMLFilePage_title);
-		setDescription(ExportXMLResources.selectXMLFilePage_desc);
-		setImageDescriptor(ExportXMLPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ExportXML.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(3, false));
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label fileLabel = new Label(composite, SWT.NONE);
-		fileLabel.setText(ExportXMLResources.fileLabel_text);
-
-		pathText = new Text(composite, SWT.BORDER);
-		pathText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		pathText.setText(ExportXMLPreferences.getXMLFile());
-		pathText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (isValidPath(pathText.getText().trim())) {
-					setPageComplete(true);
-					setErrorMessage(null);
-				} else {
-					setPageComplete(false);
-					setErrorMessage(ExportXMLResources.invalidXMLFile_error);
-				}
-			}
-		});
-
-		Button browseButton = new Button(composite, SWT.PUSH);
-		browseButton.setLayoutData(new GridData(GridData.END));
-		browseButton.setText(ExportXMLResources.browseButton_text);
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				FileDialog fd = new FileDialog(Display.getCurrent()
-						.getActiveShell(), SWT.SAVE);
-				fd.setFilterExtensions(new String[] { "*.xml", "*.*" }); //$NON-NLS-1$ //$NON-NLS-2$
-				String path = fd.open();
-				boolean ok = false;
-				if (path != null) {
-					pathText.setText(path);
-					ok = isValidPath(path);
-				}
-				setPageComplete(ok);
-				getWizard().getContainer().updateButtons();
-			}
-		});
-
-		setControl(composite);
-
-		setPageComplete(isValidPath(pathText.getText().trim()));
-	}
-
-	/**
-	 * Checks whether the user specific path is valid.
-	 * 
-	 * @param path
-	 *            the user specific path
-	 * @return <code>true</code> if the user specified path is valid.
-	 */
-	private boolean isValidPath(String path) {
-		IPath ecPath = Path.fromOSString(path);
-		if (ecPath.isValidPath(path) && path.endsWith(".xml")) { //$NON-NLS-1$
-			this.path = path;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isCompleted()
-	 */
-	public IWizardPage getNextPage() {
-		return null; // no more page
-	}
-
-	/**
-	 * Gets the user specified XML file.
-	 * 
-	 * @return an absolute path to the XML file
-	 */
-	public String getPath() {
-		return this.path;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/ViewExportSummaryPage.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/ViewExportSummaryPage.java
deleted file mode 100755
index 34c8633..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/ViewExportSummaryPage.java
+++ /dev/null
@@ -1,41 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml.wizards;
-
-import org.eclipse.epf.export.services.PluginExportData;
-import org.eclipse.epf.export.wizards.ExportPluginSummaryPage;
-import org.eclipse.jface.wizard.IWizardPage;
-
-/**
- * A wizard page that displays a summary of the selected method plug-ins that
- * will be exported.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ViewExportSummaryPage extends ExportPluginSummaryPage {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ViewExportSummaryPage(PluginExportData data) {
-		super(data);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		ExportXMLWizard wizard = (ExportXMLWizard) getWizard();
-		return wizard.selectXMLFilePage;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/ViewPluginInfoPage.java b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/ViewPluginInfoPage.java
deleted file mode 100755
index fd79dc4..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/ViewPluginInfoPage.java
+++ /dev/null
@@ -1,45 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.xml.wizards;
-
-import org.eclipse.epf.export.services.PluginExportData;
-import org.eclipse.epf.export.wizards.PluginInfoPage;
-import org.eclipse.jface.wizard.IWizardPage;
-
-/**
- * A wizard page that prompts the user to review the dependencies of the method
- * plug-ins that have been selected for export.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ViewPluginInfoPage extends PluginInfoPage {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ViewPluginInfoPage(PluginExportData data) {
-		super(data);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		super.saveDataToModel();
-		ExportXMLWizard wizard = (ExportXMLWizard) getWizard();
-		wizard.xmlData.setAssociatedConfigs(wizard.pluginData.associatedConfigMap);
-		ViewExportSummaryPage page = wizard.viewExportSummaryPage;
-		page.onEnterPage(null);
-		return page;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/package.html b/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/package.html
deleted file mode 100755
index 44c1ccf..0000000
--- a/plugins/org.eclipse.epf.export.xml/src/org/eclipse/epf/export/xml/wizards/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides wizards for exporting method library content to XML.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export/.classpath b/plugins/org.eclipse.epf.export/.classpath
deleted file mode 100755
index 8c4f20f..0000000
--- a/plugins/org.eclipse.epf.export/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.export/.cvsignore b/plugins/org.eclipse.epf.export/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.export/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.export/.options b/plugins/org.eclipse.epf.export/.options
deleted file mode 100755
index 6f75942..0000000
--- a/plugins/org.eclipse.epf.export/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-# Turn on debug trace for the export plug-in
-org.eclipse.epf.export/debug=true
diff --git a/plugins/org.eclipse.epf.export/.project b/plugins/org.eclipse.epf.export/.project
deleted file mode 100755
index d5aa490..0000000
--- a/plugins/org.eclipse.epf.export/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.export</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/plugins/org.eclipse.epf.export/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.export/META-INF/MANIFEST.MF
deleted file mode 100755
index 0bd1914..0000000
--- a/plugins/org.eclipse.epf.export/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.export; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.epf.export.ExportPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.export,
- org.eclipse.epf.export.services,
- org.eclipse.epf.export.wizards
-Require-Bundle: org.apache.ant,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.epf.authoring.ui,
- org.eclipse.epf.library,
- org.eclipse.epf.publishing
diff --git a/plugins/org.eclipse.epf.export/build.properties b/plugins/org.eclipse.epf.export/build.properties
deleted file mode 100755
index 6c780cd..0000000
--- a/plugins/org.eclipse.epf.export/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               .options,\
-               META-INF/,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml
diff --git a/plugins/org.eclipse.epf.export/icons/Authoring.gif b/plugins/org.eclipse.epf.export/icons/Authoring.gif
deleted file mode 100755
index 531baf2..0000000
--- a/plugins/org.eclipse.epf.export/icons/Authoring.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.export/icons/ContentPackage.gif b/plugins/org.eclipse.epf.export/icons/ContentPackage.gif
deleted file mode 100755
index 00a311e..0000000
--- a/plugins/org.eclipse.epf.export/icons/ContentPackage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.export/icons/Folder.gif b/plugins/org.eclipse.epf.export/icons/Folder.gif
deleted file mode 100755
index 06419d8..0000000
--- a/plugins/org.eclipse.epf.export/icons/Folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.export/icons/MethodPlugin.gif b/plugins/org.eclipse.epf.export/icons/MethodPlugin.gif
deleted file mode 100755
index bb82c39..0000000
--- a/plugins/org.eclipse.epf.export/icons/MethodPlugin.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.export/icons/Packaging.gif b/plugins/org.eclipse.epf.export/icons/Packaging.gif
deleted file mode 100755
index a96394f..0000000
--- a/plugins/org.eclipse.epf.export/icons/Packaging.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.export/icons/Roles.gif b/plugins/org.eclipse.epf.export/icons/Roles.gif
deleted file mode 100755
index 54a3f67..0000000
--- a/plugins/org.eclipse.epf.export/icons/Roles.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.export/icons/Tasks.gif b/plugins/org.eclipse.epf.export/icons/Tasks.gif
deleted file mode 100755
index 638bd83..0000000
--- a/plugins/org.eclipse.epf.export/icons/Tasks.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.export/icons/configuration.gif b/plugins/org.eclipse.epf.export/icons/configuration.gif
deleted file mode 100755
index de89602..0000000
--- a/plugins/org.eclipse.epf.export/icons/configuration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.export/icons/error.gif b/plugins/org.eclipse.epf.export/icons/error.gif
deleted file mode 100755
index c5e7a94..0000000
--- a/plugins/org.eclipse.epf.export/icons/error.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.export/icons/full/wizban/ExportLibraryConfiguration.gif b/plugins/org.eclipse.epf.export/icons/full/wizban/ExportLibraryConfiguration.gif
deleted file mode 100755
index e249831..0000000
--- a/plugins/org.eclipse.epf.export/icons/full/wizban/ExportLibraryConfiguration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.export/icons/full/wizban/ExportMethodPlugins.gif b/plugins/org.eclipse.epf.export/icons/full/wizban/ExportMethodPlugins.gif
deleted file mode 100755
index e249831..0000000
--- a/plugins/org.eclipse.epf.export/icons/full/wizban/ExportMethodPlugins.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.export/icons/warning.gif b/plugins/org.eclipse.epf.export/icons/warning.gif
deleted file mode 100755
index 1ee20aa..0000000
--- a/plugins/org.eclipse.epf.export/icons/warning.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.export/plugin.properties b/plugins/org.eclipse.epf.export/plugin.properties
deleted file mode 100755
index 34d2787..0000000
--- a/plugins/org.eclipse.epf.export/plugin.properties
+++ /dev/null
@@ -1,49 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Export
-providerName=Eclipse.org
-
-# Perspective
-packagingPerspectiveName=Packaging
-
-# Category
-packagingCategoryName=Packaging
-
-# Views
-packagingViewName=Packaging Method Library
-packagingMessageViewName=Library Packaging Message
-
-# Action Set
-packagingActionSet=Packaging
-
-# Actions
-newConfigAction=&Configuration
-newConfigActionTooltip=Create a new library Configuration
-openConfigAction=&Configuration
-openConfigActionTooltip=Open an existing library configuration
-
-# Export Wizard Category
-exportCategoryName=Method
-
-# Export Library Configuration Wizard
-exportLibraryConfigurationWizardName=Library Configuration
-exportLibraryConfiguration=Export a library configuration.
-
-# Export Method Plug-ins Wizard
-exportMethodPluginsWizardName=Method Plug-ins
-exportMethodPlugins=Export one or more method plug-ins.
-
-
-
-               
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export/plugin.xml b/plugins/org.eclipse.epf.export/plugin.xml
deleted file mode 100755
index 45fd3a1..0000000
--- a/plugins/org.eclipse.epf.export/plugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.exportWizards">
-      <wizard
-            category="org.eclipse.epf.ui.exportWizards.category"
-            class="org.eclipse.epf.export.wizards.ExportConfigurationWizard"
-            icon="/icons/configuration.gif"
-            id="org.eclipse.epf.export.wizards.ExportConfigurationWizard"
-            name="%exportLibraryConfigurationWizardName">
-         <description>
-               %exportLibraryConfiguration
-         </description>
-      </wizard>
-      <wizard
-            category="org.eclipse.epf.ui.exportWizards.category"
-            class="org.eclipse.epf.export.wizards.ExportPluginWizard"
-            icon="/icons/MethodPlugin.gif"
-            id="org.eclipse.epf.export.wizards.ExportPluginWizard"
-            name="%exportMethodPluginsWizardName">
-         <description> 
-               %exportMethodPlugins
-         </description>
-      </wizard> 
-   </extension>
-
-   <extension
-         point="org.eclipse.epf.ui.exportWizards">
-      <wizard id="org.eclipse.epf.export.wizards.ExportConfigurationWizard"/>
-      <wizard id="org.eclipse.epf.export.wizards.ExportPluginWizard"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/ExportOptions.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/ExportOptions.java
deleted file mode 100755
index 7213b48..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/ExportOptions.java
+++ /dev/null
@@ -1,50 +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.export;
-
-import java.io.File;
-
-/**
- * The export options.
- * 
- * @author Kelvin Low
- * @since 1.2
- */
-public class ExportOptions {
-
-	protected File exportDir;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportOptions() {
-	}
-
-	/**
-	 * Gets the user selected export directory.
-	 * 
-	 * @return a directory for storing the exported content
-	 */
-	public File getExportDir() {
-		return exportDir;
-	}
-
-	/**
-	 * Sets the user selected export directory.
-	 * 
-	 * @param exportDir
-	 *            a directory for storing the exported content
-	 */
-	public void setExportDir(File exportDir) {
-		this.exportDir = exportDir;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/ExportPlugin.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/ExportPlugin.java
deleted file mode 100755
index 0996879..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/ExportPlugin.java
+++ /dev/null
@@ -1,58 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export;
-
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * The Export plugin class.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportPlugin extends AbstractPlugin {
-
-	// The shared plug-in instance.
-	private static ExportPlugin plugin;
-
-	/**
-	 * Default constructor.
-	 */
-	public ExportPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * @see org.eclipse.epf.uma.core.plugin.AbstractPlugin#start(BundleContext context)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * @see org.eclipse.epf.uma.core.plugin.AbstractPlugin#start(BundleContext context)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared plug-in instance.
-	 */
-	public static ExportPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/ExportProcessOptions.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/ExportProcessOptions.java
deleted file mode 100755
index 7c85996..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/ExportProcessOptions.java
+++ /dev/null
@@ -1,120 +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.export;
-
-import org.eclipse.epf.publishing.services.PublishOptions;
-import org.eclipse.epf.uma.MethodConfiguration;
-
-/**
- * The export prcoess options.
- * 
- * @author Kelvin Low
- * @since 1.2
- */
-public class ExportProcessOptions extends ExportOptions {
-
-	protected MethodConfiguration config;
-
-	private boolean publishWebSite;
-
-	private PublishOptions publishingOptions;
-
-	private boolean exportOnlyPlannedWBSElements;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportProcessOptions() {
-		super();
-	}
-
-	/**
-	 * Gets the method configuration that will be used export the process.
-	 * 
-	 * @return a method configuration
-	 */
-	public MethodConfiguration getMethodConfiguration() {
-		return config;
-	}
-
-	/**
-	 * Sets the method configuration that will be used export the process.
-	 * 
-	 * @param config
-	 *            a method configuration
-	 */
-	public void setMethodConfiguration(MethodConfiguration config) {
-		this.config = config;
-	}
-
-	/**
-	 * Gets the publish process web site option.
-	 * 
-	 * @return <code>true</code> if the process web site should be published
-	 *         as part of the export operation
-	 */
-	public boolean getPublishWebSite() {
-		return publishWebSite;
-	}
-
-	/**
-	 * Sets the publish process web site option.
-	 * 
-	 * @param publishWebSite
-	 *            if <code>true</code>, publish the process web site
-	 */
-	public void setPublishWebSite(boolean publishWebSite) {
-		this.publishWebSite = publishWebSite;
-	}
-
-	/**
-	 * Gets the publishing options.
-	 * 
-	 * @return the publishing options that will be used to publish the process
-	 *         web site
-	 */
-	public PublishOptions getPublishingOptions() {
-		return publishingOptions;
-	}
-
-	/**
-	 * Sets the publishing options.
-	 * 
-	 * @param publishingOptions
-	 *            the publishing options that will be used to publish the
-	 *            process web site
-	 */
-	public void setPublishingOptions(PublishOptions publishingOptions) {
-		this.publishingOptions = publishingOptions;
-	}
-
-	/**
-	 * Gets the export only planned WBS elements option.
-	 * 
-	 * @return <code>true</code> if only planned WBS elements should be
-	 *         exported.
-	 */
-	public boolean getExportOnlyPlannedWBSElements() {
-		return exportOnlyPlannedWBSElements;
-	}
-
-	/**
-	 * Sets the export only planned WBS elements option.
-	 * 
-	 * @param exportOnlyPlannedWBSElements
-	 *            if <code>true</code>, export only planned WBS elements
-	 */
-	public void setExportOnlyPlannedWBSElements(
-			boolean exportOnlyPlannedWBSElements) {
-		this.exportOnlyPlannedWBSElements = exportOnlyPlannedWBSElements;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/ExportResources.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/ExportResources.java
deleted file mode 100755
index 4b4d562..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/ExportResources.java
+++ /dev/null
@@ -1,91 +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
- *******************************************************************************/
-package org.eclipse.epf.export;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ExportResources extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.epf.export.Resources";//$NON-NLS-1$
-
-	private ExportResources() {
-		// Do not instantiate
-	}
-
-	public static String exportConfigWizard_title;
-	public static String selectExportTypePage_title;
-	public static String selectExportTypePage_desc;
-	public static String selectExportTypePage_configLabel_text;
-	public static String selectExportTypePage_configSpecsLabel_text;
-	public static String selectConfigPage_title;
-	public static String selectConfigPage_desc;
-	public static String selectConfigPage_configsLabel_text;
-	public static String selectConfigSpecsPage_title;
-	public static String selectConfigSpecsPage_desc;
-	public static String selectConfigSpecsPage_configsLabel_text;
-	public static String checkConfigPage_title;
-	public static String checkConfigPage_desc;
-	public static String selectDestinationPage_title;
-	public static String selectDestinationPage_desc;
-	public static String exportPluginsWizard_title;
-	public static String selectPluginsPage_title;
-	public static String selectPluginsPage_desc;
-	public static String selectPluginsPage_pluginsLabel_text;
-	public static String reviewPluginsPage_title;
-	public static String reviewPluginsPage_desc;
-	public static String reviewPluginsPage_pluginsLabel_text;
-	public static String reviewPluginsPage_dependentPluginsLabel_text;
-	public static String reviewPluginsPage_associatedConfigsLabel_text;
-	public static String exportPluginSummaryPage_title;
-	public static String exportPluginSummaryPage_desc;
-	public static String exportPluginSummaryPage_noPlugin_text;
-	public static String specifyPathPage_title;
-	public static String specifyPathPage_desc;
-	public static String SavePluginPage_desc;
-	public static String ExportPluginWizard_title;
-	public static String ExportPluginError_msg;
-	public static String exportConfigErrorDialog_title;
-	public static String exportConfigErrorDialog_msg;
-	public static String analyzingConfigTask_name;
-	public static String ConfigurationSpecsExportService_MSG0;
-	public static String ConfigurationSpecsExportService_MSG1;
-	public static String ExportConfigCheckingPage_summary_1;
-	public static String ExportConfigCheckingPage_summary_2;
-	public static String ExportConfigCheckingPage_summary_3;
-	public static String ExportConfigCheckingPage_summary_4;
-	public static String ExportConfigCheckingPage_checking;
-	public static String ExportConfigSelectConfigPage_title;
-	public static String DestinationCommonPage_label_browse;
-	public static String DestinationCommonPage_label_default_dir;
-	public static String ConfigurationExportService_MSG0;
-	public static String ConfigurationExportService_MSG2;
-	public static String ConfigurationExportService_MSG4;
-	public static String ConfigurationExportService_MSG1;
-	public static String ConfigurationExportService_MSG9;
-	public static String DestinationCommonPage_label_name;
-	public static String DestinationCommonPage_label_dir;
-	public static String ExportPluginWizard_error;
-	public static String DestinationCommonPage_title;
-	public static String DestinationCommonPage_desc;
-	public static String PluginExportService_MSG0;
-	public static String PluginExportService_MSG1;
-	public static String PluginExportService_MSG2;
-	public static String PluginExportService_MSG3;
-	public static String PluginExportService_MSG4;
-	public static String SaveLibraryPage_title;
-	public static String SavePluginPage_label_name;
-	public static String SaveLibraryPage_desc;
-	public static String ExportPluginWizard_MSG1;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ExportResources.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/Resources.properties b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/Resources.properties
deleted file mode 100755
index 9c66172..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/Resources.properties
+++ /dev/null
@@ -1,88 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-#
-# Message ID Range: IUPE0000E - IUPE0099E
-#
-
-# Export Library Configuration Wizard
-exportConfigWizard_title=Export Library Configuration
-selectExportTypePage_title=Select export type
-selectExportTypePage_desc=Select the type of library configuration to export.
-selectExportTypePage_configLabel_text=Export a method configuration and all its method plug-ins
-selectExportTypePage_configSpecsLabel_text=Export one or more method configuration specifications
-selectConfigPage_title=Select method configuration
-selectConfigPage_desc=Select a method configuration to export. All referenced method plug-ins in the selected configuration will be included in the export.
-selectConfigPage_configsLabel_text=Method configurations:
-selectConfigSpecsPage_title=Select configuration specifications
-selectConfigSpecsPage_desc=Select one or more method configuration specificatons to export.
-selectConfigSpecsPage_configsLabel_text=Method configurations:
-checkConfigPage_title=Review configuration errors
-checkConfigPage_desc=An integrity check has been performed on the selected method configuration. Review the error report and perform the necessary corrective actions.
-selectDestinationPage_title=Specify export directory
-selectDestinationPage_desc=Specify a destination directory to store the exported configuration.
-
-# Export Method Plug-ins Wizard
-exportPluginsWizard_title=Export Method Plug-ins
-selectPluginsPage_title=Select method plug-ins
-selectPluginsPage_desc=Select one or more method plug-ins to export.
-selectPluginsPage_pluginsLabel_text=Method plug-ins:
-reviewPluginsPage_title=Review dependencies
-reviewPluginsPage_desc=Select each method plug-in to review its dependencies. Click Back to select the dependent plug-ins if they must be included in the export.
-reviewPluginsPage_pluginsLabel_text=Method Plug-ins:
-reviewPluginsPage_dependentPluginsLabel_text=Dependent method plug-ins:
-reviewPluginsPage_associatedConfigsLabel_text=Associated method configurations:
-exportPluginSummaryPage_title=Confirm export
-exportPluginSummaryPage_desc=Confirm the method plug-ins that will be exported.
-exportPluginSummaryPage_noPlugin_text=No method plug-in has been selected.
-specifyPathPage_title=Specify export directory
-specifyPathPage_desc=Specify a destination directory to store the exported method plug-ins.
-SavePluginPage_desc=Export the selected Plugins and Configurations to the specified destination directory.
-ExportPluginWizard_title=Export Method Plug-in Wizard Error
-ExportPluginError_msg=IUPE0000E: Error encountered in exporting
-
-# Export Library Configuration Error Dialog
-exportConfigErrorDialog_title=Export Library Configuration
-exportConfigErrorDialog_msg=IUPE0001E: The export operation cannot proceed.
-
-# Progress Messages
-analyzingConfigTask_name=Analyzing library configuration...
-
-# The following messages have not been reviewed.
-ConfigurationSpecsExportService_MSG0=Exporting configuration...
-ConfigurationSpecsExportService_MSG1=Export done.
-ExportConfigCheckingPage_summary_1=Checking the integrity of the selected configuration...\n
-ExportConfigCheckingPage_summary_2=No coniguration selected.\n
-ExportConfigCheckingPage_summary_3=There is no problem in the selected configuration.\n
-ExportConfigCheckingPage_summary_4=There are {0} problems in the selected configuration. \nYou can open the configuration editor and fix those problems. \nOr you can choose to ignore these problems and continue.
-ExportConfigCheckingPage_checking=Checking configuration, please wait...
-ExportConfigSelectConfigPage_title=Choose Method Configuration
-DestinationCommonPage_label_browse=Browse...
-DestinationCommonPage_label_default_dir=Use default directory
-ConfigurationExportService_MSG0=Exporting configuration...
-ConfigurationExportService_MSG2=IUPE0002E: Export failed: Error loading library
-ConfigurationExportService_MSG4=IUPE0003E: Export failed: Error copying library
-ConfigurationExportService_MSG1=IUPE0004E: Export failed: Error making library configuration closure
-ConfigurationExportService_MSG9=IUPE0005E: Export failed: Error saving library
-DestinationCommonPage_label_name=Name:
-DestinationCommonPage_label_dir=Directory:
-ExportPluginWizard_error=Error
-DestinationCommonPage_title=Default Title
-DestinationCommonPage_desc=Default description:
-PluginExportService_MSG0=Exporting plug-ins...
-PluginExportService_MSG1=Creating export directory...
-PluginExportService_MSG2=Copying files...
-PluginExportService_MSG3=Generating library and resource file...
-PluginExportService_MSG4=Export done.
-SaveLibraryPage_title=Export Method Plug-in
-SavePluginPage_label_name=Export name:
-SaveLibraryPage_desc=Export the selected method plug-ins and associated configurations
-ExportPluginWizard_MSG1=Analyzing library configuration...
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/package.html b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/package.html
deleted file mode 100755
index 23b6aab..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the activator for managing the Export plug-in's life cycle.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/BaseExportService.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/BaseExportService.java
deleted file mode 100755
index 368071d..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/BaseExportService.java
+++ /dev/null
@@ -1,143 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.services;
-
-import java.io.File;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.library.LibraryService;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-/**
- * The abstract base class for the Export Service.
- * 
- * @author Jinhua Xi
- * @author Weiping Lu
- * @since 1.0
- */
-public abstract class BaseExportService {
-
-	protected static final String exportFile = "export.xmi"; //$NON-NLS-1$
-
-	protected static final String libraryFile = "library.xmi"; //$NON-NLS-1$
-
-	protected List selectedIds = new ArrayList();
-
-	protected List selectedPluginNames = new ArrayList();
-
-	protected boolean isIdSelected(String uri) {
-		for (Iterator it = selectedIds.iterator(); it.hasNext();) {
-			String id = (String) it.next();
-			if (uri.indexOf(id) >= 0) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	protected boolean isSelectedPluginResource(String uri) {
-		for (Iterator it = selectedPluginNames.iterator(); it.hasNext();) {
-			String plugin_name = (String) it.next();
-			if (uri.startsWith(plugin_name + "/")) //$NON-NLS-1$
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	protected boolean isResourceSelected(String uri) {
-		if (isIdSelected(uri)) {
-			return true;
-		}
-		return isSelectedPluginResource(uri);
-	}
-
-	protected LibraryDocument processLibraryFile(File source, File target) {
-		try {
-			LibraryDocument document = new LibraryDocument(source);
-
-			// Reload the element mapping.
-			NodeList nodes = document.getPlugins();
-			int i = 0;
-			while (i < nodes.getLength()) {
-				Element node = (Element) nodes.item(i);
-				String uri = node.getAttribute(LibraryDocument.ATTR_href);
-				if (!isIdSelected(uri)) {
-					document.removePlugin(node);
-				} else {
-					i++;
-				}
-			}
-
-			// Remove the unneeded configurations.
-			nodes = document.getConfigurations();
-			i = 0;
-			while (i < nodes.getLength()) {
-				Element node = (Element) nodes.item(i);
-				
-				// 142379 - update plugin importing and exporting to match with the new file format
-				// configuration is saved as seperate resource since 1.0m3
-				String uri = node.getAttribute(LibraryDocument.ATTR_href);
-				if (!isIdSelected(uri)) {
-					document.removeConfiguration(node);
-				} else {
-					i++;
-				}
-			}
-
-			// Reload the element mapping.
-			nodes = document.getResourceDescriptors();
-			i = 0;
-			while (i < nodes.getLength()) {
-				Element node = (Element) nodes.item(i);
-				String id = node.getAttribute(LibraryDocument.ATTR_id);
-				String uri = node.getAttribute(LibraryDocument.ATTR_uri);
-				if (!isIdSelected(id)
-						&& !isResourceSelected(URLDecoder.decode(uri, "UTF-8"))) { //$NON-NLS-1$
-					document.removeResourceDescriptor(node);
-				} else {
-					i++;
-				}
-			}
-
-			nodes = document.getResourceSubManagers();
-			i = 0;
-			while (i < nodes.getLength()) {
-				Element node = (Element) nodes.item(i);
-				String uri = node.getAttribute(LibraryDocument.ATTR_href);
-				if (!isResourceSelected(uri)) {
-					document.removeResourceDescriptor(node);
-				} else {
-					i++;
-				}
-			}
-
-			List pluginList =  LibraryService.getInstance().getCurrentMethodLibrary()
-			.getMethodPlugins();
-			document.storeExtraInfo(pluginList);
-			
-			document.saveAs(target.getAbsolutePath());
-			
-			return document;
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-		
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/ConfigurationExportData.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/ConfigurationExportData.java
deleted file mode 100755
index d5bf9d0..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/ConfigurationExportData.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.services;
-
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.preferences.LibraryLocationData;
-
-
-/**
- * Encapsulates the input data required to export a library configuration.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ConfigurationExportData {
-
-	public boolean exportOneConfig;
-
-	public boolean exportConfigSpecs;
-
-	public List selectedConfigs;
-
-	/**
-	 * Indicates if the broken references should be removed or not.
-	 */
-	public boolean removeBrokenReferences = false;
-
-	public LibraryLocationData llData = null;
-
-	public String errorMsg = ""; //$NON-NLS-1$
-
-	/**
-	 * Creates a nes instance.
-	 */
-	public ConfigurationExportData() {
-		llData = new LibraryLocationData();
-		llData.loadFromPreferenceStore();
-	}
-
-	/**
-	 * Validate attribute
-	 */
-	public boolean validate() {
-		return true;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/ConfigurationExportService.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/ConfigurationExportService.java
deleted file mode 100755
index 28e488e..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/ConfigurationExportService.java
+++ /dev/null
@@ -1,235 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.services;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.epf.export.ExportPlugin;
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.library.IConfigurationClosure;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryManagerFactory;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.configuration.ConfigurationClosure;
-import org.eclipse.epf.library.layout.LayoutResources;
-import org.eclipse.epf.library.project.MethodLibraryProject;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodLibrary;
-
-/**
- * Exports a library configuration.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ConfigurationExportService {
-
-	public static String excludes = ".copyarea.dat, **/.copyarea.dat, .copyarea.db, **/.copyarea.db"; //$NON-NLS-1$
-	private ConfigurationExportData data;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ConfigurationExportService(ConfigurationExportData data) {
-		this.data = data;
-	}
-	
-	/**
-	 * Run to export a configuration closure
-	 */
-	public void run(IProgressMonitor monitor) {
-		try {
-			if (data.selectedConfigs == null
-					|| data.selectedConfigs.size() == 0) {
-				return;
-			}
-			monitor.setTaskName(ExportResources.ConfigurationExportService_MSG0); //$NON-NLS-1$
-			String exportLibPath = data.llData.getParentFolder();
-			File exportLibFolder = new File(exportLibPath);
-			if (!exportLibFolder.exists()) {
-				exportLibFolder.mkdir();
-			}
-			MethodConfiguration config = (MethodConfiguration) data.selectedConfigs
-					.get(0);
-			exportConfig(config.getName(), exportLibFolder.getAbsolutePath(),
-					monitor);
-		} catch (Exception e) {
-			ExportPlugin.getDefault().getLogger().logError(e);
-		}
-	}
-
-	/**
-	 * Export a configuration closure
-	 */
-	public void exportConfig(String selectedConfigName, String filePath,
-			IProgressMonitor monitor) throws Exception {
-
-		// need to disable the workspace refreshing
-		boolean refresh = RefreshJob.getInstance().isEnabled();
-		try {
-			if (refresh) {
-				// disable resource refreshing during import
-				//
-				RefreshJob.getInstance().setEnabled(false);
-			}
-			doEexportConfig(selectedConfigName, filePath, monitor);
-		} finally {
-			if (refresh) {
-				// re-enable resource refreshing
-				//
-				RefreshJob.getInstance().setEnabled(true);
-			}
-		}
-	}
-
-	private void doEexportConfig(String selectedConfigName, String filePath,
-			IProgressMonitor monitor) throws Exception {
-
-		MethodLibrary currentLib = LibraryService.getInstance()
-				.getCurrentMethodLibrary();
-
-		try {
-			// Load the whole Method Library.
-			LibraryUtil.loadAll(currentLib);
-		} catch (Throwable e) {
-			ExportPlugin.getDefault().getLogger().logError(
-					"Error loading library", e); //$NON-NLS-1$
-			data.errorMsg = ExportResources.ConfigurationExportService_MSG2; //$NON-NLS-1$
-			return;
-		}
-
-		// Copy the current library to a new library,
-		// since we need to make changes when packaging the new library.
-		MethodLibrary newLibrary = null;
-		try {
-			newLibrary = (MethodLibrary) EcoreUtil.copy(currentLib);
-		} catch (Throwable e) {
-			ExportPlugin.getDefault().getLogger().logError(e);
-			data.errorMsg = ExportResources.ConfigurationExportService_MSG4; //$NON-NLS-1$
-			return;
-		}
-
-		IConfigurationClosure closure = null;
-		ILibraryManager libMgr = null;
-		try {
-			// Detach the new library from the current resource so it can be
-			// added to a new Library Processor instance.
-			LibraryUtil.detachFromResource(newLibrary);
-
-			// Create a new Library Manager and create a new resource for the
-			// new library.
-			// TODO: Update the UI to prompt for the method library type.
-			Map params = new HashMap();
-			params.put("library.path", filePath); //$NON-NLS-1$
-			
-			// this will not work since this will mess up the main library
-			// Jinhua Xi 07/13/06
-//			MethodLibrary library = LibraryService.getInstance()
-//					.createMethodLibrary("library.xmi", "xmi", params); //$NON-NLS-1$ //$NON-NLS-2$
-//			LibraryService.getInstance().replaceMethodLibrary(library,
-//					newLibrary);
-//			LibraryService.getInstance().setCurrentMethodLibrary(newLibrary);
-
-			String name = "library.xmi";	//$NON-NLS-1$
-			String type = "xmi";		//$NON-NLS-1$
-			libMgr = LibraryManagerFactory.getInstance()
-				.createLibraryManager(type);	
-			libMgr.createMethodLibrary(name, params);
-			libMgr.setMethodLibrary(newLibrary);
-			LibraryService.getInstance().setLibraryManager(libMgr);
-			
-			// Begin packaging the new library for export.
-			MethodConfiguration config = LibraryServiceUtil
-					.getMethodConfiguration(newLibrary, selectedConfigName);
-
-			// Validate the configuration and make sure the global packages are
-			// selected. If global packages are missing, the exported library
-			// can't be loaded.
-			LibraryUtil.validateMethodConfiguration(config);
-
-			closure = new ConfigurationClosure(config);
-			closure.packageLibrary(data.removeBrokenReferences);
-		} catch (Throwable e) {
-			ExportPlugin.getDefault().getLogger().logError(
-					"Error making library configuration closure", e); //$NON-NLS-1$
-			data.errorMsg = ExportResources.ConfigurationExportService_MSG1; //$NON-NLS-1$
-
-			if (closure != null)
-				closure.dispose();
-			if ( libMgr != null ) {
-				LibraryService.getInstance().removeLibraryManager(libMgr);
-				libMgr.closeMethodLibrary();
-				libMgr.dispose();
-			}
-			
-			return;
-		}
-
-		try {
-			LibraryUtil.saveAll(newLibrary);
-
-			// the first round of save will create the resource structure,
-			// need to save again to make sure all references are saved.
-			// This step is critical since the first round only created the data
-			// structure
-			// some of the cross-referenced elements might be lost on the first
-			// saving
-			// for example, when create a method configuration with references
-			// to a new plugin,
-			// which are not saved yet, those references will be lost.
-			// 145891 - Import Configuration: default config is loss after
-			// import
-			LibraryUtil.saveAll(newLibrary);
-
-		} catch (Throwable e) {
-			ExportPlugin.getDefault().getLogger().logError(
-					"Error saving library", e); //$NON-NLS-1$
-			data.errorMsg = ExportResources.ConfigurationExportService_MSG9; //$NON-NLS-1$
-
-			if (closure != null)
-				closure.dispose();
-			if ( libMgr != null ) {
-				LibraryService.getInstance().removeLibraryManager(libMgr);
-				libMgr.closeMethodLibrary();
-				libMgr.dispose();
-			}
-			return;
-		}
-
-		// Copy the resource files in the current library to the new library.
-		// For simplicity sake, copy all resource files if the files do not
-		// exist in the target library or if the files are newer
-		//String includes = "resources/**, **/resources/**"; //$NON-NLS-1$
-		String includes = "resources/**, **/resources/**, **/diagram.xmi"; //$NON-NLS-1$
-
-		File srcDir = LibraryUtil.getLibraryRootPath(currentLib);
-		File destDir = LibraryUtil.getLibraryRootPath(newLibrary);
-
-		LayoutResources.copyDir(srcDir, destDir, includes, excludes);
-
-		// Close the newly created library.
-		if (closure != null)
-			closure.dispose();
-		if ( libMgr != null ) {
-			LibraryService.getInstance().removeLibraryManager(libMgr);
-			libMgr.closeMethodLibrary();
-			libMgr.dispose();
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/ConfigurationSpec.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/ConfigurationSpec.java
deleted file mode 100755
index daddc99..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/ConfigurationSpec.java
+++ /dev/null
@@ -1,44 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.services;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Models a library configuration specification.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ConfigurationSpec {
-
-	public String name;
-
-	public String guid;
-
-	public String version;
-
-	public String brief_desc;
-
-	public List pluginIds = new ArrayList();
-
-	public List packageIds = new ArrayList();
-
-	public List viewIds = new ArrayList();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ConfigurationSpec() {
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/ConfigurationSpecsExportService.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/ConfigurationSpecsExportService.java
deleted file mode 100755
index f5c6e70..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/ConfigurationSpecsExportService.java
+++ /dev/null
@@ -1,152 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.services;
-
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.epf.export.ExportPlugin;
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-
-
-/**
- * Exports a library configuration specification.
- * 
- * @author Jinhua Xi
- * @since 1.0
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=162153
- */
-public class ConfigurationSpecsExportService extends BaseExportService {
-
-	private ConfigurationExportData data;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ConfigurationSpecsExportService(ConfigurationExportData data) {
-		this.data = data;
-	}
-
-	/**
-	 * Run to export a configuration specificaiton.
-	 */
-	public void run(IProgressMonitor monitor) {
-		if (data.selectedConfigs == null || data.selectedConfigs.size() == 0) {
-			return;
-		}
-
-		monitor.setTaskName(ExportResources.ConfigurationSpecsExportService_MSG0); //$NON-NLS-1$
-
-		// Create the export library folder.
-		File libFolder;
-		File exportLibFolder;
-
-		String exportLibPath = (new File(data.llData.getParentFolder())).getAbsolutePath();
-		exportLibFolder = new File(exportLibPath);
-		if (!exportLibFolder.exists()) {
-			exportLibFolder.mkdir();
-		}
-
-		MethodConfiguration config = (MethodConfiguration) data.selectedConfigs
-				.get(0);
-		MethodLibrary lib = (MethodLibrary) config.eContainer();
-		URI uri = lib.eResource().getURI();
-		String path = uri.toFileString();
-		libFolder = (new File(path)).getParentFile();
-
-		// Prepare the id selections,
-		getSelectedIds(data.selectedConfigs);
-
-		// Load the library.xmi and remove unneeded elements.
-		LibraryDocument document = processLibraryFile(new File(libFolder, libraryFile), new File(
-				exportLibFolder, exportFile));
-
-		if ( document != null ) {
-			// copy the conifuration files
-			// 143033 - update config specs' importing and exporting to match with the new file format
-			copyConfigurationFiles(document, libFolder, exportLibFolder);
-		}
-		
-		monitor.setTaskName(ExportResources.ConfigurationSpecsExportService_MSG1); //$NON-NLS-1$
-
-	}
-
-	private void copyConfigurationFiles(LibraryDocument document, File libFolder, File exportLibFolder) {
-		// 143033 - update config specs' importing and exporting to match with the new file format
-		for (Iterator it = data.selectedConfigs.iterator(); it.hasNext();) {
-			MethodConfiguration config = (MethodConfiguration) it.next();
-			String guid = config.getGuid();
-			String uri = document.getResourceUri(guid);
-			if (uri == null) {
-				URI resUri = config.eResource().getURI();
-				uri = MultiFileSaveUtil.METHOD_CONFIGURATION_FOLDER_NAME + File.separator + resUri.lastSegment();
-				uri = document.decodeUri(uri);
-			}
-			if ( uri != null ) {
-				File src = new File(libFolder, uri);
-				File target =  new File(exportLibFolder, uri);
-				ResourceHelper.copyFile(src, target);
-			}
-		}
-	}
-	
-	private void getSelectedIds(List configs) {
-		selectedIds.clear();
-		selectedPluginNames.clear();
-
-		// Get selected config ids.
-		if (configs == null || configs.size() == 0) {
-			return;
-		}
-
-		for (Iterator it = configs.iterator(); it.hasNext();) {
-			MethodConfiguration config = (MethodConfiguration) it.next();
-			String guid = config.getGuid();
-			if (selectedIds.contains(guid)) {
-				continue;
-			}
-
-			// Add the configuration.
-			selectedIds.add(guid);
-
-			// For each configuration, we need to save the method plugin ids and
-			// method package ids so that their entries in the resource file can
-			// be kept.
-			List refs = config.eCrossReferences();
-			for (Iterator itr = refs.iterator(); itr.hasNext();) {
-				Object o = itr.next();
-				if (o instanceof MethodPlugin || o instanceof MethodPackage) {
-					guid = ((MethodElement) o).getGuid();
-					if (!selectedIds.contains(guid)) {
-						selectedIds.add(guid);
-					}
-				} else {
-					ExportPlugin
-							.getDefault()
-							.getLogger()
-							.logError(
-									"Unexpected element type '" + ((MethodElement) o).getType().getName() //$NON-NLS-1$
-											+ "' in configuration '" + config.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/DiagramHandler.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/DiagramHandler.java
deleted file mode 100755
index bec884f..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/DiagramHandler.java
+++ /dev/null
@@ -1,210 +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.export.services;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.MethodElement;
-
-
-/**
- * Utility class to handle diagram export/import
- * @author Weiping Lu
- * @since 1.2
- *
- */
-public class DiagramHandler {
-	
-	//To do: need to consider element rename issue. 
-	//		 -> Resovle the involved file names after all resource names are settled.
-	//		 -> Let a sub class to take of it?
-
-	private File sourceLibRoot;
-	private File targetLibRoot;
-	private Map<String, MapEntryValue> elementMap = new HashMap<String, MapEntryValue>();
-	private static boolean debug = false;
-		
-	/**
-	 * Creates a new instance.
-	 */	
-	public DiagramHandler(File sourceLibRoot, File targetLibRoot) {
-		this.sourceLibRoot = sourceLibRoot;
-		this.targetLibRoot = targetLibRoot;
-	}
-	
-	private boolean needToProcess(MethodElement elem) {
-		boolean b = elem instanceof CapabilityPattern ||
-								elem instanceof DeliveryProcess;
-		return b;	
-	}
-	
-	public void registerElement(MethodElement elem) {
-		registerElement(elem, false);
-	}
-	
-	public void registerElement(MethodElement elem, boolean processEntry) {
-		if (! needToProcess(elem)) {
-			return;
-		}
-		if (elementMap.containsKey(elem.getGuid())) {
-			return;
-		}
-		
-		MapEntryValue mapEntryValue = new MapEntryValue();
-		mapEntryValue.element = elem;
-		elementMap.put(elem.getGuid(), mapEntryValue);		
-		
-		if (processEntry) {
-			processEntry(elem, mapEntryValue);
-		}
-	}
-	
-	public void postRegisterElements() {
-		for (Iterator<MapEntryValue> it = elementMap.values().iterator(); it.hasNext();) {
-			MapEntryValue value = it.next();
-			processEntry(value.element, value);
-		}	
-	}
-
-	private void processEntry(MethodElement elem, MapEntryValue mapEntryValue) {
-		File[] files = getFiles(elem);
-		File sourceFile = files[0];
-		File targetFile = files[1];
-
-		if (sourceFile != null && sourceFile.exists()) {
-			mapEntryValue.sourceFile = sourceFile;
-		}
-
-		if (targetFile.exists()) {
-			if (mapEntryValue.sourceFile == null || needCopy(mapEntryValue.sourceFile, targetFile)) {
-				mapEntryValue.targetFile = targetFile;
-			}
-			mapEntryValue.existing = true;
-		} else {
-			if (mapEntryValue.sourceFile != null) {
-				mapEntryValue.targetFile = targetFile;
-			}
-		}
-		
-		if (debug) {
-			System.out.println("LD> mapEntryValue: ");					//$NON-NLS-1$
-			System.out.println(mapEntryValue.toDebugString("LD> "));	//$NON-NLS-1$
-			System.out.println("");										//$NON-NLS-1$
-		}
-	}
-	
-	public List getModifiedFiles() {
-		List ret = new ArrayList();		
-		for (Iterator<MapEntryValue> it = elementMap.values().iterator(); it.hasNext();) {
-			MapEntryValue value = it.next();
-			if (value.existing && value.targetFile != null) {
-				ret.add(value.targetFile.getAbsolutePath());
-			}
-		}		
-		return ret;
-	}
-
-	/**
-	 * copy all the files to the destination
-	 *
-	 */
-	public void execute() {
-		try {
-			execute_();
-		} catch (Throwable e) {
-			if (debug) {
-				e.printStackTrace();
-			}
-		}	
-	}
-	
-	private void execute_() {
-		
-		for (Iterator<MapEntryValue> it = elementMap.values().iterator(); it.hasNext(); ) {
-			MapEntryValue value = it.next();
-			if (value.targetFile == null) {
-				continue;
-			} else if (value.sourceFile != null) {
-				File parentFile = value.targetFile.getParentFile();
-				ResourceHelper.copyFile(value.sourceFile, value.targetFile);
-				if (debug) {
-					System.out.println("LD: File copied: " + value.sourceFile);	//$NON-NLS-1$
-				}
-			} else {
-				value.targetFile.delete();
-			}
-		}	
-	}
-		
-	/**
-	 * Checks to see if the copy action is needed.
-	 */
-	public static boolean needCopy(File source, File dest) {
-		boolean ret = true;
-		if (dest.exists()) {
-			ret = (dest.lastModified() != source.lastModified())
-					|| (dest.length() != source.length());
-		}
-		return ret;
-	}
-	
-	static class MapEntryValue {
-
-		public MethodElement element;
-		public File sourceFile;
-		public File targetFile;
-		public boolean existing = false;		
-		
-		public String toDebugString(String prompt) {
-			String str = prompt + "element: " + element.getName();		//$NON-NLS-1$
-			str += "\n" + prompt + "sourceFile: " + sourceFile;		//$NON-NLS-1$
-			str += "\n" + prompt + "targetFile: " + targetFile;		//$NON-NLS-1$ 	//$NON-NLS-2$
-			str += "\n" + prompt + "existing: " + existing;			//$NON-NLS-1$ 	//$NON-NLS-2$			
-			return str;
-		}
-		
-	}
-
-	//[0]: sourceFile
-	//[1]: targetFile
-	private File[] getFiles(MethodElement elem) {
-		File[] files = new File[2];
-		
-		String elementPath = ResourceHelper.getElementPath(elem);
-		if (debug) {
-			System.out.println("LD> elementPath: " + elementPath); //$NON-NLS-1$
-		}
-		if (elementPath == null || elementPath.length() == 0) {
-			if (debug) {
-				System.out.println("LD> elementPath is null or empty!"); //$NON-NLS-1$
-			}
-			return files;
-		}
-
-		String diagramPath = elementPath + elem.getName() + File.separator + 
-								"diagram.xmi";				//$NON-NLS-1$
-
-		files[0] = new File(sourceLibRoot, diagramPath);
-		files[1] = new File(targetLibRoot, diagramPath);		
-
-		return files;
-	}
-	
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/LibraryDocument.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/LibraryDocument.java
deleted file mode 100755
index ce642dd..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/LibraryDocument.java
+++ /dev/null
@@ -1,732 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.services;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.eclipse.epf.common.utils.XMLUtil;
-import org.eclipse.epf.export.ExportPlugin;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * Encapsulates a method library using a DOM document.
- * 
- * @author Jinhua Xi
- * @author Weiping Lu
- * @since 1.0
- */
-public class LibraryDocument {
-
-	public static final String TAG_methodPlugins = "methodPlugins"; //$NON-NLS-1$
-
-	public static final String TAG_predefinedConfigurations = "predefinedConfigurations"; //$NON-NLS-1$
-
-	public static final String TAG_resourceDescriptors = "resourceDescriptors"; //$NON-NLS-1$
-
-	public static final String TAG_resourceSubManagers = "subManagers"; //$NON-NLS-1$
-	
-	public static final String TAG_methodElementProperty = "methodElementProperty"; //$NON-NLS-1$
-
-	public static final String ATTR_href = "href"; //$NON-NLS-1$
-
-	public static final String ATTR_id = "id"; //$NON-NLS-1$
-
-	public static final String ATTR_uri = "uri"; //$NON-NLS-1$
-
-	public static final String ATTR_guid = "guid"; //$NON-NLS-1$
-	
-	public static final String ATTR_value = "value"; //$NON-NLS-1$
-
-	public static final String exportFile = "export.xmi"; //$NON-NLS-1$
-
-	public static final String libraryFile = "library.xmi"; //$NON-NLS-1$
-
-	protected File libFile;
-
-	protected Document document;
-
-	protected Element libTag = null;
-
-	protected Element resTag = null;
-	
-	private HashMap guidToUriMap = null;
-	
-	private Map<String, String> guidToPlugNameMap;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public LibraryDocument(File libFile) throws Exception {
-		this.libFile = libFile;
-		init();
-	}
-
-	private void init() throws Exception {
-		this.document = XMLUtil.loadXml(libFile);
-
-		Element root = document.getDocumentElement();
-		NodeList nodes = root.getElementsByTagName("org.eclipse.epf.uma:MethodLibrary"); //$NON-NLS-1$
-		if (nodes != null && nodes.getLength() > 0) {
-			libTag = (Element) nodes.item(0);
-		}
-
-		nodes = root
-				.getElementsByTagName("org.eclipse.epf.uma.resourcemanager:ResourceManager"); //$NON-NLS-1$
-		if (nodes != null && nodes.getLength() > 0) {
-			resTag = (Element) nodes.item(0);
-		}
-	}
-
-    /**
-     * Returns the document field
-     */
-	public Document getDocument() {
-		return this.document;
-	}
-
-    /**
-     * Returns the libFile field
-     */
-	public File getFile() {
-		return libFile;
-	}
-
-    /**
-     * Returns the libTag field
-     */
-	public Element getLibTag() {
-		return libTag;
-	}
-
-    /**
-     * Returns the library name
-     */
-	public String getLibraryName() {
-		return libTag.getAttribute("name"); //$NON-NLS-1$
-	}
-
-    /**
-     * Returns the library guid
-     */
-	public String getLibraryGuid() {
-		return libTag.getAttribute("guid"); //$NON-NLS-1$
-	}
-
-    /**
-     * Returns the resource tag
-     */
-	public Element getResourceTag() {
-		return resTag;
-	}
-
-    /**
-     * Removes a plugin node
-     */
-	public void removePlugin(Element node) {
-		libTag.removeChild(node);
-	}
-
-    /**
-     * Removes a config node
-     */
-	public void removeConfiguration(Element node) {
-		libTag.removeChild(node);
-	}
-
-    /**
-     * Removes a resource descriptor node
-     */
-	public void removeResourceDescriptor(Element node) {
-		resTag.removeChild(node);
-	}
-
-    /**
-     * Returns plugin node list
-     */
-	public NodeList getPlugins() {
-		return libTag.getElementsByTagName(TAG_methodPlugins);
-	}
-
-    /**
-     * Returns configuration node list
-     */
-	public NodeList getConfigurations() {
-		return libTag.getElementsByTagName(TAG_predefinedConfigurations);
-	}
-
-    /**
-     * Returns resource descriptor node list
-     */
-	public NodeList getResourceDescriptors() {
-		return resTag.getElementsByTagName(TAG_resourceDescriptors);
-	}
-
-    /**
-     * Returns resource submanager node list
-     */
-	public NodeList getResourceSubManagers() {
-		return resTag.getElementsByTagName(TAG_resourceSubManagers);
-	}
-
-    /**
-     * Adds a plugin node
-     */
-	public void addPlugin(Element node) {
-		libTag.appendChild(getValidNode(node));
-	}
-
-    /**
-     * Adds a configuration node
-     */
-	public void addConfiguration(Element node) {
-		libTag.appendChild(getValidNode(node));
-	}
-
-    /**
-     * Adds a resource node
-     */
-	public void addResource(Element node) {
-		resTag.appendChild(getValidNode(node));
-	}
-
-    /**
-     * Returns a valid node
-     */
-	public Node getValidNode(Node node) {
-		if (node.getOwnerDocument() == document) {
-			return node;
-		}
-
-		return document.importNode(node, true);
-	}
-
-	/**
-	 * remove plugins by guid
-	 * 
-	 * @param removeList
-	 *            List a list of guids
-	 */
-	public void removePlugins(List removeList) {
-		// Importing a package of plgins twice generates 2
-		// identical plugins
-		// remove the node will cause the node list to shrink, so don't increase
-		// the index
-		NodeList nodes = getPlugins();
-		int i = 0;
-		while (i < nodes.getLength()) {
-			Element node = (Element) nodes.item(i);
-			String guid = getGuid(node);
-			if (removeList.contains(guid)) {
-				libTag.removeChild(node);
-			} else {
-				i++;
-			}
-		}
-	}
-
-    /**
-     * Remove the list from the configuration nodes
-     */
-	public void removeConfigurations(List removeList) {
-		// remove the unneeded configurations
-		NodeList nodes = getConfigurations();
-		int i = 0;
-		while (i < nodes.getLength()) {
-			Element node = (Element) nodes.item(i);
-			String guid = getGuid(node);
-			if (removeList.contains(guid)) {
-				libTag.removeChild(node);
-			} else {
-				i++;
-			}
-		}
-	}
-
-    /**
-     * Remove the list from the resource nodes
-     */
-	public void removeResourceEntries(List removeList) {
-		NodeList nodes = getResourceDescriptors();
-		int i = 0;
-		while (i < nodes.getLength()) {
-			Element node = (Element) nodes.item(i);
-			String guid = node.getAttribute(ATTR_id);
-			String uri = node.getAttribute(ATTR_uri);
-			if (removeList.contains(guid)) {
-				resTag.removeChild(node);
-
-				// check the plugin xmi file, if exists, delete the folder
-				File plugn_file = getFileFromUri(uri);
-				if (plugn_file.exists()) {
-					// delete the folder ???
-				}
-			} else {
-				i++;
-			}
-		}
-
-		// also remove the sub managers
-		nodes = getResourceSubManagers();
-		i = 0;
-		while (i < nodes.getLength()) {
-			Element node = (Element) nodes.item(i);
-			String guid = getSubManagerBaseGuid(node.getAttribute(ATTR_href));
-			if (removeList.contains(guid)) {
-				resTag.removeChild(node);
-			} else {
-				i++;
-			}
-		}
-	}
-
-	/**
-	 * get the resource uri for the resource guid
-	 * @param guid
-	 * @return String the uri
-	 */
-	public String getResourceUri(String guid) {
-		String uri = getUriFromGuidToUriMap(guid);
-		if (uri == null) {
-			uri = getResourceUri_(guid);
-			if (uri != null) {
-				//addToGuidToUriMap(guid, uri);
-			}
-		}
-		return uri;
-	}
-	
-	private String getResourceUri_(String guid) {
-	
-		NodeList nodes = getResourceDescriptors();
-		for (int i = 0; i < nodes.getLength(); i++ ) {
-			Element node = (Element) nodes.item(i);
-			String id = node.getAttribute(ATTR_id);
-			String uri = node.getAttribute(ATTR_uri);
-			if ( guid.equals(id) ) {
-				return decodeUri(uri);
-			}
-		}
-		
-		return null;
-	}
-
-	/**
-	 * Returns the decored URI.
-	 */
-	public String decodeUri(String uri) {
-		try {
-			uri = URLDecoder.decode(uri, "UTF-8"); //$NON-NLS-1$
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
-		
-		return uri;
-	}
-	
-	/**
-	 * Returns the file given the uri.
-	 */
-	public File getFileFromUri(String uri) {
-		uri = decodeUri(uri);
-		
-		int i = uri.indexOf("#"); //$NON-NLS-1$
-		if (i > 0) {
-			uri = uri.substring(0, i);
-		}
-
-		return new File(libFile.getParentFile(), uri);
-	}
-
-	/**
-	 * Saves the document.
-	 */
-	public void save() throws Exception {
-		saveAs(libFile.getAbsolutePath());
-	}
-
-	/**
-	 * Saves the document in the file given by filePathName.
-	 */
-	public void saveAs(String filePathName) throws Exception {
-		XMLUtil.saveDocument(this.document, filePathName);
-	}
-
-	/**
-	 * Is the document for configutation specification export/import only?
-	 */
-	public boolean isConfigSpecsOnly() {
-		NodeList nodes = getPlugins();
-		if (nodes == null || nodes.getLength() == 0) {
-			return true;
-		}
-
-		for (int i = 0; i < nodes.getLength(); i++) {
-			Element node = (Element) nodes.item(i);
-			String href = node.getAttribute(LibraryDocument.ATTR_href);
-			String guid = getGuidFromHref(href);
-			String uri = getResourceUri(guid);
-			
-			// check if the resource files are there
-			File plugn_file = getFileFromUri(uri);
-			if (plugn_file.exists()) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	// static hlper methods /////////////////////////////////////
-	/**
-	 * Returns submanager's base guid.
-	 */
-	public static String getSubManagerBaseGuid(String href) {
-		final Pattern p = Pattern.compile(
-				"uma://(.*?)#(.*?)", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
-		Matcher m = p.matcher(href);
-		if (m.find()) {
-			return m.group(1);
-		}
-
-		return href;
-	}
-
-	/**
-	 * Returns child value of the child tag given by childTagName.
-	 */
-	public static String getChildValue(Element tag, String childTagName) {
-		NodeList nodes = tag.getChildNodes();
-		if (nodes == null || nodes.getLength() == 0) {
-			return ""; //$NON-NLS-1$
-		}
-
-		int size = nodes.getLength();
-		for (int i = 0; i < size; i++) {
-			Node node = nodes.item(i);
-			if ((node instanceof Element)
-					&& ((Element) node).getTagName().equals(childTagName)) {
-				return getNodeText((Element) node);
-			}
-		}
-
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * text of a leaf node, without child element
-	 * 
-	 * @param tag
-	 * @return
-	 */
-	public static String getNodeText(Element tag) {
-
-		NodeList nodes = tag.getChildNodes();
-		if (nodes == null || nodes.getLength() == 0) {
-			return ""; //$NON-NLS-1$
-		}
-
-		int size = nodes.getLength();
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; i < size; i++) {
-			Node node = nodes.item(i);
-			if (node.getNodeType() == Node.TEXT_NODE) {
-				buffer.append(node.getNodeValue());
-			}
-		}
-
-		return buffer.toString();
-	}
-
-	/**
-	 * Returns guid from href.
-	 */
-	public static String getGuidFromHref(String href) {
-		int i = href.indexOf("#"); //$NON-NLS-1$
-		if (i > 0) {
-			return href.substring(i + 1);
-		}
-
-		return href;
-	}
-
-	/**
-	 * Returns guid of the node.
-	 */
-	public static String getGuid(Element node) {
-		String id = node.getAttribute("xmi:id"); //$NON-NLS-1$
-		if ( id == null || id.length() == 0 ) {
-			String href = node.getAttribute(ATTR_href);
-			id = getGuidFromHref(href);
-		}
-		
-		return id;
-	}
-	
-	// 143033 - update config specs' importing and exporting to match with the new file format
-	protected Element getConfigNode(Element configNode) {
-		try {
-			
-			// new model defines href for configuration 
-			String href = configNode.getAttribute(ATTR_href);
-			if (href == null || href.length() == 0 ) {
-				return configNode;
-			} 
-
-			String guid = getGuidFromHref(href);
-			String uri = getResourceUri(guid);
-			if ( uri == null ) {
-				return configNode;
-			}
-			
-			File source = getFileFromUri(uri);
-			Document document = XMLUtil.loadXml(source);
-			Element root = document.getDocumentElement();
-
-			Element configTag = null;
-			if (root.getTagName().equals("org.eclipse.epf.uma:MethodConfiguration")) //$NON-NLS-1$
-			{
-				configTag = root;
-			} else {
-				NodeList nodes = root
-						.getElementsByTagName("org.eclipse.epf.uma:MethodConfiguration"); //$NON-NLS-1$
-				if (nodes.getLength() > 0) {
-					configTag = (Element) nodes.item(0);
-				}
-			}
-			
-			return configTag;
-
-		} catch (Exception e) {
-			ExportPlugin.getDefault().getLogger().logError(e);
-		}
-		
-		return configNode;
-	}
-	
-	/**
-	 * Returns ConfigurationSpec instance given the element node config.
-	 */
-	public ConfigurationSpec getConfigurationSpec(Element config) {
-		ConfigurationSpec spec = new ConfigurationSpec();
-		
-		Element configNode = getConfigNode(config);
-		spec.guid = configNode.getAttribute("xmi:id"); //$NON-NLS-1$
-		spec.name = configNode.getAttribute("name"); //$NON-NLS-1$
-		spec.brief_desc = configNode.getAttribute("briefDescription"); //$NON-NLS-1$
-		
-		// get plugins
-		NodeList nodes = configNode.getElementsByTagName("methodPluginSelection"); //$NON-NLS-1$
-		if (nodes != null) {
-			for (int i = 0; i < nodes.getLength(); i++) {
-				Element node = (Element) nodes.item(i);
-				String guid = getGuidFromHref(node.getAttribute(ATTR_href));
-				spec.pluginIds.add(guid);
-			}
-		}
-
-		// get packages
-		nodes = configNode.getElementsByTagName("methodPackageSelection"); //$NON-NLS-1$
-		if (nodes != null) {
-			for (int i = 0; i < nodes.getLength(); i++) {
-				Element node = (Element) nodes.item(i);
-				String guid = getGuidFromHref(node.getAttribute(ATTR_href));
-				spec.packageIds.add(guid);
-			}
-		}
-
-		// get views
-		nodes = configNode.getElementsByTagName("processViews"); //$NON-NLS-1$
-		if (nodes != null) {
-			for (int i = 0; i < nodes.getLength(); i++) {
-				Element node = (Element) nodes.item(i);
-				String guid = getGuidFromHref(node.getAttribute(ATTR_href));
-				spec.viewIds.add(guid);
-			}
-		}
-
-		return spec;
-	}
-	
-	/**
-	 * Adds guid/uri pair to guidToUriMap.
-	 */
-	public void addToGuidToUriMap(String guid, String uri) {
-		if (guidToUriMap == null) {
-			guidToUriMap = new HashMap();
-		}
-		guidToUriMap.put(guid, uri);
-	}
-	
-	/**
-	 * Gets uri from guid.
-	 */
-	public String getUriFromGuidToUriMap(String guid) {
-		return guidToUriMap == null ? null : (String) guidToUriMap.get(guid);
-	}
-	
-	/**
-	 * Create an instance.
-	 */
-	public static class ConfigDocVisitor {
-		public void visit(File file, Element node) {			
-		}
-	}
-	
-	/**
-	 * Visit configuration files given by the configuration file folder configDir.
-	 */
-	public static void visitConfigFiles(File configDir, ConfigDocVisitor visitor) {	
-		FileFilter filter = new FileFilter() {
-			public boolean accept(File pathname) {
-				return !pathname.getName().equalsIgnoreCase("cvs") && 		//$NON-NLS-1$
-						pathname.isDirectory() || pathname.getName().endsWith(MultiFileSaveUtil.DEFAULT_FILE_EXTENSION);
-			}			
-		};		
-		File[] files = configDir.listFiles(filter);
-		if (files == null) {
-			return;
-		}
-		for (int i=0; i<files.length; i++) {
-			File file = files[i];
-			try {
-				DocumentBuilder builder = DocumentBuilderFactory.newInstance()
-						.newDocumentBuilder();
-				Document doc = builder.parse(file);
-				Element root = doc.getDocumentElement();
-				visitor.visit(file, root);				
-			} catch (Throwable e) {
-				e.printStackTrace();
-			}
-		}		
-	}
-	
-	/**
-	 * Build a map from pluign guids to resource manager guids.
-	 */
-	public Map buildPluginGuidToResMgrGuidMap(List pluginGuids) {
-		if (pluginGuids == null || pluginGuids.size() == 0) {
-			return null;
-		}
-		NodeList subMgrs = getResourceSubManagers();
-		if (subMgrs == null || subMgrs.getLength() == 0) {
-			return null;
-		}				
-		HashMap pluginGuidToResMgrGuidMap = new HashMap();
-		for (int i=0; i<pluginGuids.size(); i++) {			
-			String pluginGuid = (String) pluginGuids.get(i);
-			pluginGuidToResMgrGuidMap.put(pluginGuid, null);
-		}
-		boolean isEmpty = true;
-		for (int i=0; i<subMgrs.getLength(); i++) {			
-			Element mgr = (Element) subMgrs.item(i);
-			String  href = mgr.getAttribute(ATTR_href);
-			String pluginGuid = getSubManagerBaseGuid(href);
-			if (pluginGuidToResMgrGuidMap.containsKey(pluginGuid)) {
-				pluginGuidToResMgrGuidMap.put(pluginGuid, getGuidFromHref(href));
-				isEmpty = false;
-			}
-		}		
-		return isEmpty ?  null : pluginGuidToResMgrGuidMap;
-	}
-	
-	/**
-	 * Save extra info (all plugin guids and names) in libTag's MethodElementProperty
-	 */
-	public void storeExtraInfo(List<MethodPlugin> plugins) {
-		if (plugins == null) {
-			return;
-		}		
-
-		Element versionNode = document.createElement(TAG_methodElementProperty);
-		versionNode.setAttribute(ATTR_value, "0");	//$NON-NLS-1$ 
-		libTag.appendChild(versionNode);		
-		
-		for (Iterator<MethodPlugin> it = plugins.iterator(); it.hasNext();) {
-			MethodPlugin plug = it.next();
-			
-			Element guidNode = document.createElement(TAG_methodElementProperty);	
-			guidNode.setAttribute(ATTR_value, plug.getGuid());
-			Element nameNode = document.createElement(TAG_methodElementProperty);	
-			nameNode.setAttribute(ATTR_value, plug.getName());
-			
-			libTag.appendChild(guidNode);
-			libTag.appendChild(nameNode);
-		}
-		
-	}	
-	
-	private void recallExtraInfo() {
-		try {
-			NodeList nodes = getMethodElementProperties();
-			if (nodes == null || nodes.getLength() == 0) {
-				return;
-			}
-			Element versionNode = (Element) nodes.item(0);
-			String versionStr = versionNode.getAttribute(ATTR_value);
-			
-			if (versionStr.equals("0")) { //$NON-NLS-1$ 
-				guidToPlugNameMap = new HashMap<String, String>();
-				for (int i = 1; i < nodes.getLength();) {
-					Element node = (Element) nodes.item(i);
-					String guid = node.getAttribute(ATTR_value);
-					node = (Element) nodes.item(i + 1);
-					String name = node.getAttribute(ATTR_value);
-					guidToPlugNameMap.put(guid, name);
-					if (false) {				
-						System.out.println("LD> guid: " + guid);
-						System.out.println("LD> name: " + name);
-					}					
-					i += 2;
-				}
-			}
-		} catch (Throwable e) {
-			e.printStackTrace();
-			guidToPlugNameMap = null;
-		}
-		
-	}
-	
-	/**
-	 * Get guid to plugin map
-	 */
-	public Map<String, String> getGuidToPlugNameMap() {
-		if (guidToPlugNameMap == null) {
-			recallExtraInfo();
-		}		
-		return guidToPlugNameMap;
-	}
-	
-    /**
-     * Returns methodElementProperty node list
-     */
-	private NodeList getMethodElementProperties() {
-		return libTag.getElementsByTagName(TAG_methodElementProperty);
-	}
-	
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/PluginExportData.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/PluginExportData.java
deleted file mode 100755
index bb58230..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/PluginExportData.java
+++ /dev/null
@@ -1,85 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.services;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.preferences.LibraryLocationData;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.uma.MethodPlugin;
-
-
-/**
- * Encapsulates the input data required to export a method plug-in.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class PluginExportData {
-
-	public List selectedPlugins = null;
-
-	public LibraryLocationData llData = null;
-
-	public Hashtable associatedConfigMap = new Hashtable();
-
-	// don't need it after the service code changes
-	public List associatedConfigs = new ArrayList();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PluginExportData() {
-		llData = new LibraryLocationData();
-		llData.loadFromPreferenceStore();
-	}
-
-	/**
-	 * Returns the list of selected plugins.
-	 */
-	public List getSelectedPlugins() {
-		return selectedPlugins;
-	}
-
-	/**
-	 * Sets the list of selected plugins.
-	 */
-	public void setSelectedPlugins(List selectedPlugins) {
-		this.selectedPlugins = selectedPlugins;
-	};
-
-	/**
-	 * validate attribute
-	 */
-	public boolean validate() {
-		return true;
-	}
-	
-	/**
-	 * Builds associatedConfigMap.
-	 */
-	public void buildAssociatedConfigMap() {
-		if (getSelectedPlugins() != null) {
-			associatedConfigMap.clear();
-			for (Iterator iter = getSelectedPlugins().iterator(); iter
-					.hasNext();) {
-				MethodPlugin element = (MethodPlugin) iter.next();
-				associatedConfigMap.put(element, LibraryUtil
-						.getAssociatedConfigurations(element));
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/PluginExportService.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/PluginExportService.java
deleted file mode 100755
index 43ba6ed..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/PluginExportService.java
+++ /dev/null
@@ -1,223 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.services;
-
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Copy;
-import org.apache.tools.ant.types.FileSet;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-
-/**
- * Exports one or more method plug-ins to a target directory.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=162153
- */
-public class PluginExportService extends BaseExportService {
-
-	PluginExportData data;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PluginExportService(PluginExportData data) {
-		this.data = data;
-	}
-
-	/**
-	 * Run to export plugins
-	 */
-	public void run(IProgressMonitor monitor) {
-		monitor.setTaskName(ExportResources.PluginExportService_MSG0); //$NON-NLS-1$
-
-		List plugins = data.selectedPlugins;
-		if (plugins == null || plugins.size() == 0) {
-			return;
-		}
-
-		monitor.setTaskName(ExportResources.PluginExportService_MSG1); //$NON-NLS-1$
-
-		// Create the library folder in the target directory.
-		String exportLibPath = (new File(data.llData.getParentFolder())).getAbsolutePath();
-		File exportLibFolder = new File(exportLibPath);
-		if (!exportLibFolder.exists()) {
-			exportLibFolder.mkdir();
-		}
-
-		File libFolder = null;
-
-		monitor.setTaskName(ExportResources.PluginExportService_MSG2); //$NON-NLS-1$
-
-		// Iterate the selected plug-ins and copy their associated model files.
-		for (Iterator it = plugins.iterator(); it.hasNext();) {
-			MethodPlugin plugin = (MethodPlugin) it.next();
-			if (plugin == null) {
-				continue;
-			}
-
-			// Step 1: Create the plug-in folder.
-			URI uri = plugin.eResource().getURI();
-			String path = uri.toFileString();
-
-			File pluginFolder = (new File(path)).getParentFile();
-			if (libFolder == null) {
-				libFolder = pluginFolder.getParentFile();
-			}
-
-			String pluginPath = libFolder.toURI().relativize(
-					pluginFolder.toURI()).getPath();
-			File exportPluginFolder = new File(exportLibFolder, pluginPath);
-
-			// Step 2: Copy the plug-in files.
-			copyDir(pluginFolder, exportPluginFolder);			
-		}
-
-		monitor.setTaskName(ExportResources.PluginExportService_MSG3); //$NON-NLS-1$
-
-		// Get the selected plug-in and configuration ids so we can remove the
-		// unneeded stuff.
-		getSelectedIds(data.selectedPlugins, data.associatedConfigMap);
-
-		// Step 3: Load the library.xmi and the resmgr.xmi, remove the unneeded
-		// stuff.
-		LibraryDocument document = processLibraryFile(new File(libFolder, libraryFile), new File(
-				exportLibFolder, exportFile));
-
-		if ( document != null ) {
-			// copy the conifuration files
-			// 142379 - update plugin importing and exporting to match with the new file format
-			copyConfigurationFiles(document, libFolder, exportLibFolder);
-		}
-		
-		monitor.setTaskName(ExportResources.PluginExportService_MSG4); //$NON-NLS-1$
-	}
-
-	
-	private void copyConfigurationFiles(LibraryDocument document, File libFolder, File exportLibFolder) {
-		// // 142379 - update plugin importing and exporting to match with the new file format
-		// Get the selected configuration ids.
-		for (Iterator itc = data.associatedConfigMap.values().iterator(); itc.hasNext();) {
-			List configs = (List) itc.next();
-			if (configs == null || configs.size() == 0) {
-				continue;
-			}
-
-			for (Iterator it = configs.iterator(); it.hasNext();) {
-				MethodConfiguration config = (MethodConfiguration) it.next();
-				String guid = config.getGuid();
-				String uri = document.getResourceUri(guid);
-				if (uri == null) {
-					URI resUri = config.eResource().getURI();
-					uri = MultiFileSaveUtil.METHOD_CONFIGURATION_FOLDER_NAME + File.separator + resUri.lastSegment();
-					uri = document.decodeUri(uri);
-				}				
-				if ( uri != null ) {
-					File src = new File(libFolder, uri);
-					File target =  new File(exportLibFolder, uri);
-					ResourceHelper.copyFile(src, target);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Copies directories from "fromDir" to "toDir".
-	 */
-	public static void copyDir(File fromDir, File toDir) {
-		Copy cp = new Copy();
-		cp.setOverwrite(true);
-		FileSet set = new FileSet();
-		set.setExcludes(ConfigurationExportService.excludes);
-		set.setDir(fromDir);
-		cp.addFileset(set);
-		cp.setTodir(toDir);
-		cp.setProject(new Project());
-		cp.setPreserveLastModified(true);
-		cp.execute();
-	}
-
-	private void getSelectedIds(List plugins, Map configsMap) {
-		selectedIds.clear();
-		selectedPluginNames.clear();
-
-		// Get the plug-in ids and names.
-		MethodPlugin plugin = null;
-		for (Iterator it = plugins.iterator(); it.hasNext();) {
-			plugin = (MethodPlugin) it.next();
-			String guid = plugin.getGuid();
-			selectedPluginNames.add(plugin.getName());
-			if (!selectedIds.contains(guid)) {
-				selectedIds.add(guid);
-			}
-		}
-
-		// Save the library guid so that the entry in resgr.xmi will be kept.
-		if (plugin != null) {
-			MethodLibrary lib = (MethodLibrary) plugin.eContainer();
-			if (lib != null) {
-				selectedIds.add(lib.getGuid());
-			}
-		}
-
-		// Get the selected configuration ids.
-		for (Iterator itc = configsMap.values().iterator(); itc.hasNext();) {
-			List configs = (List) itc.next();
-			if (configs == null || configs.size() == 0) {
-				continue;
-			}
-
-			for (Iterator it = configs.iterator(); it.hasNext();) {
-				MethodConfiguration config = (MethodConfiguration) it.next();
-				String guid = config.getGuid();
-				if (selectedIds.contains(guid)) {
-					continue;
-				}
-
-				// Add the configuration.
-				selectedIds.add(guid);
-
-				// For each configuration, save the method plug-in and package
-				// ids so that their entries in the resource file can be kept.
-				List refs = config.eCrossReferences();
-				for (Iterator itr = refs.iterator(); itr.hasNext();) {
-					Object o = itr.next();
-					if (o instanceof MethodPlugin || o instanceof MethodPackage) {
-						guid = ((MethodElement) o).getGuid();
-						if (!selectedIds.contains(guid)) {
-							selectedIds.add(guid);
-						}
-					} else {
-						System.out
-								.println("Unexpected element type '" + ((MethodElement) o).getType().getName() //$NON-NLS-1$
-										+ "' in configuration '" + config.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				}
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/package.html b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/package.html
deleted file mode 100755
index fd4aaa5..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces and implementation for the method plug-in and configuration export services.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/DestinationCommonPage.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/DestinationCommonPage.java
deleted file mode 100755
index fb9b779..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/DestinationCommonPage.java
+++ /dev/null
@@ -1,190 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.wizards;
-
-import java.io.File;
-
-import org.eclipse.epf.authoring.ui.preferences.LibraryLocationData;
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * A wizard page that prompts the user to select a destination directory for an
- * export or import operation.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- * fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=157401
- */
-public class DestinationCommonPage extends BaseWizardPage implements Listener {
-
-	private static final String pageTitle = ExportResources.DestinationCommonPage_title; //$NON-NLS-1$
-
-	private static final String pageDesc = ExportResources.DestinationCommonPage_desc; //$NON-NLS-1$
-
-	protected Composite container;
-
-	protected Combo ctrl_exportPath;
-
-	protected Button ctrl_browse_button;
-
-	protected LibraryLocationData llData;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public DestinationCommonPage(String pageName, LibraryLocationData llData) {
-		super(pageName);
-		setTitle(pageTitle);
-		setDescription(pageDesc);
-		this.llData = llData;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout(3, false));
-
-		createLabel(container, ExportResources.DestinationCommonPage_label_dir); //$NON-NLS-1$
-		ctrl_exportPath = super.createCombobox(container, 1); //$NON-NLS-1$
-		ctrl_browse_button = new Button(container, SWT.NONE);
-		ctrl_browse_button.setText(ExportResources.DestinationCommonPage_label_browse); //$NON-NLS-1$
-		ctrl_browse_button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				openDirectoryDialog();
-			}
-		});
-
-		createLabel(container, ""); //$NON-NLS-1$		
-
-		addListeners();
-
-		setControl(container);
-
-		initComboItems();
-		
-		setDefaultValue();
-		
-		setPageComplete(false);
-	}
-	
-	protected void setDefaultValue(){
-//		set last opened dir as the default selection when init this page
-		addDefaultToItems();
-		ctrl_exportPath.select(0);
-		ctrl_exportPath.setEnabled(true);
-		ctrl_browse_button.setEnabled(true);
-
-	}
-	
-	protected void addDefaultToItems(){
-		String[] items = ctrl_exportPath.getItems();
-		int index=0;
-		if(items!=null && items.length>0){
-			for(int i=0; i<items.length; i++){
-				if(items[i].equals(ExportUIPreferences.getDefaultExportPath()))
-					return;
-				index = i;
-			}
-			index++;
-		}
-		if(index>ExportUIPreferences.getListLength()-1){
-			index = ExportUIPreferences.getListLength()-1;
-			ctrl_exportPath.remove(index);
-		}
-		ctrl_exportPath.add(ExportUIPreferences.getDefaultExportPath(), index);
-	}
-
-	private void addListeners() {
-		ctrl_exportPath.addListener(SWT.FocusIn, this);
-		ctrl_exportPath.addListener(SWT.Modify, this);
-		ctrl_exportPath.addListener(SWT.FocusOut, this);
-		ctrl_exportPath.addListener(SWT.Selection, this);
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)
-	 */
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (visible) {
-			Display display = container.getDisplay();
-			if (!(display == null || display.isDisposed())) {
-				display.asyncExec(new Runnable() {
-					public void run() {
-						ctrl_exportPath.setFocus();
-					}
-				});
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		Wizard wizard = (Wizard) getWizard();
-		
-		setPageComplete(isPageComplete());
-		wizard.getContainer().updateButtons();
-
-	}
-
-	protected void saveToDataModel() {
-		String libName = ctrl_exportPath.getText();
-		if (libName.length() > 0) {
-			if (!libName.endsWith(File.separator)){
-				libName = libName.substring(libName.lastIndexOf(File.separator)+1, libName.length());
-			}else
-				libName = "";
-		}
-		llData.setLibName(libName);
-		llData.setParentFolder(ctrl_exportPath.getText());
-	}
-
-	private void openDirectoryDialog() {
-		try {
-			DirectoryDialog dd = new DirectoryDialog(container.getShell(),
-					SWT.NONE);
-			dd.setFilterPath(ctrl_exportPath.getText());
-
-			String destination = dd.open();
-			if (destination != null) {
-				ctrl_exportPath.setText(destination);
-			}
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-	}
-	
-	/**
-	 * use the opened dirs to init combo list
-	 */
-	protected void initComboItems(){
-		return;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigCheckingPage.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigCheckingPage.java
deleted file mode 100755
index 080f428..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigCheckingPage.java
+++ /dev/null
@@ -1,128 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.wizards;
-
-import java.util.List;
-
-import org.eclipse.epf.export.ExportPlugin;
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.export.services.ConfigurationExportData;
-import org.eclipse.epf.library.IConfigurationClosure;
-import org.eclipse.epf.library.configuration.ConfigurationClosure;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * A wizard page that displays the result of a configuration integrity check.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportConfigCheckingPage extends BaseWizardPage {
-
-	public static final String PAGE_NAME = ExportConfigCheckingPage.class
-			.getName();
-
-	private TextViewer textViewer;
-
-	private TextPresentation style;
-
-	private ConfigurationExportData data;
-
-	private IConfigurationClosure closure = null;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportConfigCheckingPage(ConfigurationExportData data) {
-		super(PAGE_NAME);
-		setTitle(ExportResources.checkConfigPage_title); 
-		setDescription(ExportResources.checkConfigPage_desc); 
-		setImageDescriptor(ExportPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ExportLibraryConfiguration.gif")); //$NON-NLS-1$
-		this.data = data;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout());
-
-		textViewer = createTextViewer(container, 360, 160, 1);
-		Document doc = new Document(" "); //$NON-NLS-1$
-		textViewer.setDocument(doc);
-
-		setControl(container);
-		setPageComplete(true);
-	}
-
-	private void displaySummary() {
-		style = new TextPresentation();
-		Document doc = getSummaryText();
-		textViewer.setDocument(doc);
-		textViewer.changeTextPresentation(style, true);
-	}
-
-	/**
-	 * @see org.eclipse.epf.ui.wizards.BaseWizardPage#onEnterPage(Object)
-	 */
-	public void onEnterPage(Object obj) {
-		displaySummary();
-	}
-
-	/**
-	 * Returns a document of summary text.
-	 */
-	public Document getSummaryText() {
-		final StringBuffer textBuf = new StringBuffer();
-
-		if (data.selectedConfigs.size() == 0) {
-			textBuf.append(ExportResources.ExportConfigCheckingPage_summary_2); //$NON-NLS-1$
-		} else {
-			final MethodConfiguration config = (MethodConfiguration) data.selectedConfigs
-					.get(0);
-			if ((closure == null) || (closure.getConfiguration() != config)) {
-				Runnable runnable = new Runnable() {
-
-					public void run() {
-						// Check the configuration closure.
-						closure = new ConfigurationClosure(config);
-					}
-
-				};
-
-				UserInteractionHelper.runWithProgress(runnable, ExportResources.ExportConfigCheckingPage_checking); //$NON-NLS-1$
-			}
-		}
-
-		List errors = closure.getAllErrors();
-		if (errors.size() == 0) {
-			textBuf.append(ExportResources.ExportConfigCheckingPage_summary_3); //$NON-NLS-1$
-		} else {
-			textBuf
-					.append(ExportResources.bind(ExportResources.ExportConfigCheckingPage_summary_4, (new Object[] { Integer.toString(errors.size()) }))); 
-		}
-
-		Document doc = new Document(textBuf.toString());
-		return doc;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigChooseMode.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigChooseMode.java
deleted file mode 100755
index 4874c32..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigChooseMode.java
+++ /dev/null
@@ -1,109 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.wizards;
-
-import org.eclipse.epf.export.ExportPlugin;
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.export.services.ConfigurationExportData;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * A wizard page that displays the types of configuration that can be exported.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportConfigChooseMode extends BaseWizardPage implements Listener {
-
-	public static final String PAGE_NAME = ExportConfigChooseMode.class
-			.getName();
-
-	private Button oneConfigButton;
-
-	private Button configSpecButton;
-
-	private ConfigurationExportData data;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportConfigChooseMode(ConfigurationExportData data) {
-		super(PAGE_NAME);
-		setTitle(ExportResources.selectExportTypePage_title); 
-		setDescription(ExportResources.selectExportTypePage_desc); //$NON-NLS-1$
-		setImageDescriptor(ExportPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ExportLibraryConfiguration.gif")); //$NON-NLS-1$
-		this.data = data;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout());
-
-		oneConfigButton = createRadioButton(
-				container,
-				ExportResources.selectExportTypePage_configLabel_text, 1, true); //$NON-NLS-1$
-
-		configSpecButton = createRadioButton(
-				container,
-				ExportResources.selectExportTypePage_configSpecsLabel_text, 1, false); //$NON-NLS-1$
-
-		addListeners();
-
-		setControl(container);
-		setPageComplete(true);
-	}
-
-	private void addListeners() {
-		oneConfigButton.addListener(SWT.Selection, this);
-		configSpecButton.addListener(SWT.Selection, this);
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	private void saveDataToModel() {
-		data.exportOneConfig = oneConfigButton.getSelection();
-		data.exportConfigSpecs = configSpecButton.getSelection();
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		saveDataToModel();
-		if (data.exportOneConfig) {
-			ExportConfigSelectConfigPage page = ((ExportConfigurationWizard) getWizard()).selectConfigPage;
-			return page;
-		} else if (data.exportConfigSpecs) {
-			ExportConfigSelectSpecsPage page = ((ExportConfigurationWizard) getWizard()).selectSpecsPage;
-			return page;
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigDestinationPage.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigDestinationPage.java
deleted file mode 100755
index f440437..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigDestinationPage.java
+++ /dev/null
@@ -1,74 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.wizards;
-
-import java.io.File;
-import java.util.List;
-
-import org.eclipse.epf.export.ExportPlugin;
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.export.services.ConfigurationExportData;
-
-
-/**
- * A wizard page that prompts the user for the destination directory of an
- * export operation.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportConfigDestinationPage extends DestinationCommonPage {
-
-	public static final String PAGE_NAME = ExportConfigDestinationPage.class
-			.getName();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportConfigDestinationPage(ConfigurationExportData data) {
-		super(PAGE_NAME, data.llData);
-		setTitle(ExportResources.selectDestinationPage_title); //$NON-NLS-1$
-		setDescription(ExportResources.selectDestinationPage_desc); //$NON-NLS-1$
-		setImageDescriptor(ExportPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ExportLibraryConfiguration.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		ExportConfigurationWizard wizard = (ExportConfigurationWizard) getWizard();
-		if (ctrl_exportPath.getText().length()>0 && !ctrl_exportPath.getText().endsWith(File.separator)) {
-			saveToDataModel();
-			wizard.okToComplete = true;
-			return true;
-		}
-		wizard.okToComplete = false;
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.export.wizards.DestinationCommonPage#initComboItems()
-	 */
-	protected void initComboItems() {
-		List dirList = ExportUIPreferences.getRecentlyExportedConfigDirs();
-		
-		if(dirList!=null && !dirList.isEmpty()){
-			String[] dirs = new String[dirList.size()];
-			for(int i=0; i<dirList.size(); i++){
-				dirs[i] = dirList.get(i).toString();
-			}
-			ctrl_exportPath.setItems(dirs);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigSelectConfigPage.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigSelectConfigPage.java
deleted file mode 100755
index d3b53ee..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigSelectConfigPage.java
+++ /dev/null
@@ -1,176 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.wizards;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.export.ExportPlugin;
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.export.services.ConfigurationExportData;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.ui.LibraryUIImages;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A wizard page that prompts the user to select a method configuration to
- * export.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportConfigSelectConfigPage extends BaseWizardPage implements
-		ISelectionChangedListener, Listener {
-
-	public static final String PAGE_NAME = ExportConfigSelectConfigPage.class
-			.getName();
-
-	private Table table;
-
-	private TableViewer ctrl_tableViewer;
-
-	private Text ctrl_briefDesc;
-
-	private ConfigurationExportData data;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportConfigSelectConfigPage(ConfigurationExportData data) {
-		super(PAGE_NAME);
-		setTitle(ExportResources.selectConfigPage_title); 
-		setDescription(ExportResources.selectConfigPage_desc); //$NON-NLS-1$
-		setImageDescriptor(ExportPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ExportLibraryConfiguration.gif")); //$NON-NLS-1$
-		this.data = data;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout());
-
-		createLabel(container, ExportResources.selectConfigPage_configsLabel_text); //$NON-NLS-1$
-
-		ctrl_tableViewer = createTableViewer(container, 360, 120, 1);
-		table = ctrl_tableViewer.getTable();
-
-		MethodConfiguration[] configs = LibraryServiceUtil
-				.getMethodConfigurations(LibraryService.getInstance()
-						.getCurrentMethodLibrary());
-
-		ILabelProvider labelProvider = new LabelProvider() {
-			public Image getImage(Object element) {
-				return LibraryUIImages.IMG_METHOD_PLUGIN;
-			}
-
-			public String getText(Object element) {
-				if (element instanceof MethodConfiguration) {
-					return ((MethodConfiguration) element).getName();
-				} else {
-					return element.toString();
-				}
-			}
-		};
-		ctrl_tableViewer.setLabelProvider(labelProvider);
-		ctrl_tableViewer.setContentProvider(new ArrayContentProvider());
-		if (configs != null) {
-			ctrl_tableViewer.setInput(configs);
-		}
-
-		createLabel(container, AuthoringUIText.BRIEF_DESCRIPTION_TEXT); //$NON-NLS-1$
-
-		ctrl_briefDesc = createTextMulti(container, "", 360, 80, 3); //$NON-NLS-1$
-
-		if (configs != null && configs.length > 0) {
-			table.select(0);
-			setDisplayAttributes((MethodConfiguration) configs[0]);
-		}
-
-		addListeners();
-
-		setControl(container);
-		setPageComplete(true);
-	}
-
-	private void addListeners() {
-		ctrl_tableViewer.addSelectionChangedListener(this);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		StructuredSelection selection = (StructuredSelection) event
-				.getSelection();
-		if (!selection.isEmpty()) {
-			Object[] configs = selection.toArray();
-			setDisplayAttributes((MethodConfiguration) configs[0]);
-		}
-
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	private void setDisplayAttributes(MethodConfiguration config) {
-		ctrl_briefDesc.setText(config.getBriefDescription());
-	}
-
-	protected void saveDataToModel() {
-		IStructuredSelection selection = (IStructuredSelection) ctrl_tableViewer
-				.getSelection();
-		Object[] configs = selection.toArray();
-		MethodConfiguration config = (MethodConfiguration) configs[0];
-		List arrList = new ArrayList();
-		arrList.add(config);
-		data.selectedConfigs = arrList;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		saveDataToModel();
-		ExportConfigCheckingPage page = ((ExportConfigurationWizard) getWizard()).configCheckingPage;
-		page.onEnterPage(null);
-		return page;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigSelectSpecsPage.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigSelectSpecsPage.java
deleted file mode 100755
index f7b2309..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigSelectSpecsPage.java
+++ /dev/null
@@ -1,199 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.wizards;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.export.ExportPlugin;
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.export.services.ConfigurationExportData;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.ui.LibraryUIImages;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A wizard page that prompts the user to select one or more method
- * configuration specifications to export.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportConfigSelectSpecsPage extends BaseWizardPage implements
-		ISelectionChangedListener, ICheckStateListener, Listener {
-
-	public static final String PAGE_NAME = ExportConfigSelectSpecsPage.class
-			.getName();
-
-	private Table table;
-
-	private CheckboxTableViewer ctrl_chkboxTableViewer;
-
-	private Text ctrl_briefDesc;
-
-	private int checkedCount = 0;
-
-	private List checkedConfigList = new ArrayList();
-
-	private ConfigurationExportData data;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportConfigSelectSpecsPage(ConfigurationExportData data) {
-		super(PAGE_NAME);
-		setTitle(ExportResources.selectConfigSpecsPage_title); //$NON-NLS-1$
-		setDescription(ExportResources.selectConfigSpecsPage_desc); //$NON-NLS-1$
-		setImageDescriptor(ExportPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ExportLibraryConfiguration.gif")); //$NON-NLS-1$
-		this.data = data;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout());
-
-		createLabel(container, ExportResources.selectConfigSpecsPage_configsLabel_text); //$NON-NLS-1$
-
-		ctrl_chkboxTableViewer = createCheckboxTableViewer(container, 1);
-		table = ctrl_chkboxTableViewer.getTable();
-
-		MethodConfiguration[] configs = LibraryServiceUtil
-				.getMethodConfigurations(LibraryService.getInstance()
-						.getCurrentMethodLibrary());
-
-		ILabelProvider labelProvider = new LabelProvider() {
-			public Image getImage(Object element) {
-				return LibraryUIImages.IMG_METHOD_PLUGIN;
-			}
-
-			public String getText(Object element) {
-				if (element instanceof MethodConfiguration) {
-					return ((MethodConfiguration) element).getName();
-				} else {
-					return element.toString();
-				}
-			}
-		};
-		ctrl_chkboxTableViewer.setLabelProvider(labelProvider);
-		ctrl_chkboxTableViewer.setContentProvider(new ArrayContentProvider());
-		if (configs != null) {
-			ctrl_chkboxTableViewer.setInput(configs);
-		}
-
-		createLabel(container, AuthoringUIText.BRIEF_DESCRIPTION_TEXT);
-		ctrl_briefDesc = createTextMulti(container, "", 360, 80, 3); //$NON-NLS-1$
-
-		if (configs != null && configs.length > 0) {
-			setDisplayAttributes((MethodConfiguration) configs[0]);
-		}
-
-		addListeners();
-
-		setControl(container);
-		setPageComplete(true);
-	}
-
-	private void addListeners() {
-		ctrl_chkboxTableViewer.addSelectionChangedListener(this);
-		ctrl_chkboxTableViewer.addCheckStateListener(this);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent)
-	 */
-	public void checkStateChanged(CheckStateChangedEvent event) {
-		Object obj = event.getElement();
-
-		if (event.getChecked()) {
-			checkedCount++;
-			checkedConfigList.add(obj);
-		} else {
-			checkedCount--;
-			checkedConfigList.remove(obj);
-		}
-
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		StructuredSelection selection = (StructuredSelection) event
-				.getSelection();
-		if (!selection.isEmpty()) {
-			Object[] configs = selection.toArray();
-			setDisplayAttributes((MethodConfiguration) configs[0]);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	private void setDisplayAttributes(MethodConfiguration config) {
-		ctrl_briefDesc.setText(config.getBriefDescription());
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		if (getErrorMessage() != null)
-			return false;
-		return checkedCount > 0;
-	}
-
-	protected void saveDataToModel() {
-		data.selectedConfigs = checkedConfigList;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		saveDataToModel();
-		ExportConfigDestinationPage page = ((ExportConfigurationWizard) getWizard()).destinationPage;
-		return page;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigurationWizard.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigurationWizard.java
deleted file mode 100755
index 1e62f31..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportConfigurationWizard.java
+++ /dev/null
@@ -1,177 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.epf.authoring.ui.wizards.SaveAllEditorsPage;
-import org.eclipse.epf.export.ExportPlugin;
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.export.services.ConfigurationExportData;
-import org.eclipse.epf.export.services.ConfigurationExportService;
-import org.eclipse.epf.export.services.ConfigurationSpecsExportService;
-import org.eclipse.epf.library.ui.LibraryUIImages;
-import org.eclipse.epf.library.ui.wizards.DirectoryValidator;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-
-
-/**
- * The Export Library Configuration wizard.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportConfigurationWizard extends Wizard implements IImportWizard {
-
-	protected ExportConfigChooseMode modePage;
-
-	protected ExportConfigSelectSpecsPage selectSpecsPage;
-
-	protected ExportConfigSelectConfigPage selectConfigPage;
-
-	protected ExportConfigCheckingPage configCheckingPage;
-
-	protected ExportConfigDestinationPage destinationPage;
-
-	protected boolean okToComplete = false;
-
-	protected ConfigurationExportData data = new ConfigurationExportData();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportConfigurationWizard() {
-		setWindowTitle(ExportResources.exportConfigWizard_title); //$NON-NLS-1$
-		setNeedsProgressMonitor(true);
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
-	 *      IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		SaveAllEditorsPage.addPageIfNeeded(this, false, null, null,
-				ExportPlugin.getDefault().getImageDescriptor(
-						"full/wizban/ExportLibraryConfiguration.gif")); //$NON-NLS-1$
-
-		modePage = new ExportConfigChooseMode(data);
-		addPage(modePage);
-
-		selectSpecsPage = new ExportConfigSelectSpecsPage(data);
-		addPage(selectSpecsPage);
-
-		selectConfigPage = new ExportConfigSelectConfigPage(data);
-		addPage(selectConfigPage);
-
-		configCheckingPage = new ExportConfigCheckingPage(data);
-		addPage(configCheckingPage);
-
-		destinationPage = new ExportConfigDestinationPage(data);
-		addPage(destinationPage);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#createPageControls(Composite)
-	 */
-	public void createPageControls(Composite pageContainer) {
-		super.createPageControls(pageContainer);
-		pageContainer.getShell().setImage(
-				LibraryUIImages.IMG_METHOD_CONFIGURATON);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#canFinish()
-	 */
-	public boolean canFinish() {
-		// Cannot complete the wizard if it's not the last page.
-		if (this.getContainer().getCurrentPage() != destinationPage)
-			return false;
-		return okToComplete;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		String exportLibPath = data.llData.getParentFolder();
-		if (!checkAndCreateDir(exportLibPath)) {
-			return false;
-		}
-
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException {
-				try {
-					monitor
-							.beginTask(
-									ExportResources.exportConfigErrorDialog_title, IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-
-					if (data.validate()) {
-						if (data.exportConfigSpecs) {
-							// Export configuration specs only.
-							(new ConfigurationSpecsExportService(data))
-									.run(monitor);
-						} else {
-							// Export a configuration closure.
-							(new ConfigurationExportService(data)).run(monitor);
-						}
-					}
-				} catch (Exception e) {
-					throw new InvocationTargetException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-
-		try {
-			getContainer().run(true, false, op);
-		} catch (InterruptedException e) {
-			return false;
-		} catch (InvocationTargetException e) {
-			Throwable realException = e.getTargetException();
-			ExportPlugin.getDefault().getMsgDialog().displayError(
-					ExportResources.exportConfigErrorDialog_title, //$NON-NLS-1$
-					realException.getMessage());
-			return false;
-		}
-
-		if (data.errorMsg != null && data.errorMsg.length() > 0) {
-			ExportPlugin.getDefault().getMsgDialog().displayError(
-					ExportResources.exportConfigErrorDialog_title, //$NON-NLS-1$
-					data.errorMsg);
-		}
-		
-		//record this export path into preference store when success
-		ExportUIPreferences.addRecentlyExportConfigDir(exportLibPath);
-
-		return true;
-	}
-
-	private boolean checkAndCreateDir(String dir) {
-		return DirectoryValidator.checkAndCreateDir(dir, ExportResources.exportConfigErrorDialog_title, //$NON-NLS-1$
-				ExportResources.ExportPluginError_msg); 
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportPluginSummaryPage.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportPluginSummaryPage.java
deleted file mode 100755
index d32da50..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportPluginSummaryPage.java
+++ /dev/null
@@ -1,172 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.wizards;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.export.ExportPlugin;
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.export.services.PluginExportData;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * A wizard page that displays a summary of the selected method plug-ins that
- * will be exported.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportPluginSummaryPage extends BaseWizardPage {
-
-	public static final String PAGE_NAME = ExportPluginSummaryPage.class
-			.getName();
-
-	private TextViewer textViewer;
-
-	private TextPresentation style;
-
-	private PluginExportData data;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportPluginSummaryPage(PluginExportData data) {
-		super(PAGE_NAME);
-		setTitle(ExportResources.exportPluginSummaryPage_title); //$NON-NLS-1$
-		setDescription(ExportResources.exportPluginSummaryPage_desc); //$NON-NLS-1$
-		setImageDescriptor(ExportPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ExportMethodPlugins.gif")); //$NON-NLS-1$		
-		this.data = data;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout());
-
-		textViewer = createTextViewer(container, 360, 160, 1);
-		Document doc = new Document(""); //$NON-NLS-1$		
-		textViewer.setDocument(doc);
-
-		setControl(container);
-		setPageComplete(true);
-	}
-
-	private void displaySummary() {
-		style = new TextPresentation();
-		Document doc = getSummaryText();
-		textViewer.setDocument(doc);
-		textViewer.changeTextPresentation(style, true);
-	}
-
-	/**
-	 * @see org.eclipse.epf.ui.wizards.BaseWizardPage#onEnterPage(Object)
-	 */
-	public void onEnterPage(Object obj) {
-		displaySummary();
-	}
-
-	/**
-	 * Returns a document of the summary text.
-	 */
-	public Document getSummaryText() {
-		StringBuffer textBuf = new StringBuffer();
-
-		if (data.selectedPlugins == null || data.selectedPlugins.isEmpty())
-			return new Document(ExportResources.exportPluginSummaryPage_noPlugin_text); //$NON-NLS-1$
-
-		int start = 0;
-		int offset = 0;
-		for (int i = 0; i < data.selectedPlugins.size(); i++) {
-			MethodPlugin plugin = (MethodPlugin) data.selectedPlugins.get(i);
-			start = textBuf.length();
-			offset = plugin.getName().length();
-			style.addStyleRange(new StyleRange(start, offset, null, null,
-					SWT.BOLD));
-			textBuf.append(plugin.getName()).append("\n"); //$NON-NLS-1$
-
-			start = textBuf.length();
-			offset = AuthoringUIText.AUTHORS_TEXT.length();
-			style.addStyleRange(new StyleRange(start, offset, null, null,
-					SWT.BOLD | SWT.ITALIC));
-			textBuf
-					.append("\t").append(AuthoringUIText.AUTHORS_TEXT).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$
-			textBuf.append("\t\t").append(plugin.getAuthors()).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$
-
-			start = textBuf.length();
-			offset = AuthoringUIText.VERSION_TEXT.length();
-			style.addStyleRange(new StyleRange(start, offset, null, null,
-					SWT.BOLD | SWT.ITALIC));
-			textBuf
-					.append("\t").append(AuthoringUIText.VERSION_TEXT).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$
-			textBuf.append("\t\t").append(plugin.getVersion()).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$
-
-			start = textBuf.length();
-			offset = AuthoringUIText.BRIEF_DESCRIPTION_TEXT.length();
-			style.addStyleRange(new StyleRange(start, offset, null, null,
-					SWT.BOLD | SWT.ITALIC));
-			textBuf
-					.append("\t").append(AuthoringUIText.BRIEF_DESCRIPTION_TEXT).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$
-			textBuf
-					.append("\t\t").append(plugin.getBriefDescription()).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$
-
-			start = textBuf.length();
-			offset = ExportResources.reviewPluginsPage_dependentPluginsLabel_text.length(); //$NON-NLS-1$
-			style.addStyleRange(new StyleRange(start, offset, null, null,
-					SWT.BOLD | SWT.ITALIC));
-			textBuf
-					.append("\t").append(ExportResources.reviewPluginsPage_dependentPluginsLabel_text).append("\n"); 
-			List dependentPluginList = plugin.getBases();
-			boolean addLinefeed = true;
-			for (Iterator iter = dependentPluginList.iterator(); iter.hasNext();) {
-				MethodPlugin element = (MethodPlugin) iter.next();
-				textBuf.append("\t\t").append(element.getName()).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$
-				addLinefeed = false;
-			}
-			if (addLinefeed)
-				textBuf.append("\n"); //$NON-NLS-1$
-
-			start = textBuf.length();
-			offset = ExportResources.reviewPluginsPage_associatedConfigsLabel_text.length(); //$NON-NLS-1$
-			style.addStyleRange(new StyleRange(start, offset, null, null,
-					SWT.BOLD | SWT.ITALIC));
-			textBuf
-					.append("\t").append(ExportResources.reviewPluginsPage_associatedConfigsLabel_text).append("\n"); 
-			List associatedConfigList = (List) data.associatedConfigMap
-					.get(plugin);
-			for (Iterator iter = associatedConfigList.iterator(); iter
-					.hasNext();) {
-				MethodConfiguration element = (MethodConfiguration) iter.next();
-				textBuf.append("\t\t").append(element.getName()).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-			textBuf.append("\n"); //$NON-NLS-1$
-		}
-
-		Document doc = new Document(textBuf.toString());
-		return doc;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportPluginWizard.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportPluginWizard.java
deleted file mode 100755
index 62ef9b5..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportPluginWizard.java
+++ /dev/null
@@ -1,159 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.epf.authoring.ui.wizards.SaveAllEditorsPage;
-import org.eclipse.epf.export.ExportPlugin;
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.export.services.PluginExportData;
-import org.eclipse.epf.export.services.PluginExportService;
-import org.eclipse.epf.library.ui.LibraryUIImages;
-import org.eclipse.epf.library.ui.wizards.DirectoryValidator;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-
-
-/**
- * The Export Method Plug-in wizard.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class ExportPluginWizard extends Wizard implements IImportWizard {
-
-	protected SelectPluginPage page1;
-
-	protected PluginInfoPage page2;
-
-	protected ExportPluginSummaryPage page3;
-
-	protected SavePluginPage page4;
-
-	protected boolean okToComplete = false;
-
-	protected PluginExportData data = new PluginExportData();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ExportPluginWizard() {
-		setWindowTitle(ExportResources.exportPluginsWizard_title); //$NON-NLS-1$
-		setNeedsProgressMonitor(true);
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
-	 *      IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		SaveAllEditorsPage.addPageIfNeeded(this, false, null, null,
-				ExportPlugin.getDefault().getImageDescriptor(
-						"full/wizban/ExportMethodPlugins.gif")); //$NON-NLS-1$
-
-		page1 = new SelectPluginPage(data);
-		addPage(page1);
-
-		page2 = new PluginInfoPage(data);
-		addPage(page2);
-
-		page3 = new ExportPluginSummaryPage(data);
-		addPage(page3);
-
-		page4 = new SavePluginPage(data);
-		addPage(page4);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#createPageControls(Composite)
-	 */
-	public void createPageControls(Composite pageContainer) {
-		super.createPageControls(pageContainer);
-		pageContainer.getShell().setImage(LibraryUIImages.IMG_METHOD_PLUGIN);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#canFinish()
-	 */
-	public boolean canFinish() {
-		if (this.getContainer().getCurrentPage() != page4)
-			return false;
-		return okToComplete;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		String exportLibPath = data.llData.getParentFolder();
-		if (checkAndCreateDir(exportLibPath) == false) {
-			return false;
-		}
-
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException {
-				try {
-					monitor
-							.beginTask(
-									ExportResources.ExportPluginWizard_MSG1, IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-
-					if (data.validate()) {
-						(new PluginExportService(data)).run(monitor);
-					}
-
-				} catch (Exception e) {
-					throw new InvocationTargetException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-
-		try {
-			getContainer().run(true, false, op);
-		} catch (InterruptedException e) {
-			return false;
-		} catch (InvocationTargetException e) {
-			Throwable realException = e.getTargetException();
-			ExportPlugin
-					.getDefault()
-					.getMsgDialog()
-					.displayError(
-							ExportResources.ExportPluginWizard_error, realException.getMessage()); //$NON-NLS-1$
-			return false;
-		}
-		
-//		record this export path into preference store when success
-		ExportUIPreferences.addRecentlyExportPluginDir(exportLibPath);
-
-		return true;
-	}
-
-	private boolean checkAndCreateDir(String dir) {
-		return DirectoryValidator.checkAndCreateDir(dir, ExportResources.ExportPluginWizard_title, //$NON-NLS-1$
-				ExportResources.ExportPluginError_msg); 
-	}
-	
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportUIPreferences.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportUIPreferences.java
deleted file mode 100755
index 8a37134..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/ExportUIPreferences.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package org.eclipse.epf.export.wizards;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.export.ExportPlugin;
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.epf.library.prefs.LibraryPreferenceConstants;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * Manages the export UI preferences.
- * 
- * @author hopeshared
- * @since 1.2
- */
-public class ExportUIPreferences {
-	
-	/**
-	 * The recently opened dir preference delimiter.
-	 */
-	public static final String PREFERENCE_DELIMITER = ";"; //$NON-NLS-1$
-	
-	/**
-	 * set <code>10</code> as the default length of the combo popup list
-	 */
-	private static final int DEFAIL_LIST_LENGTH = 10;
-	
-	/**
-	 * The Export Plugin preference key.
-	 */
-	public static final String LAST_EXPORT_PLUGIN_PATH = "lastExportPluginPath"; //$NON-NLS-1$
-	
-	/**
-	 * The Export Configuration preference key.
-	 */
-	public static final String LAST_EXPORT_CONFIG_PATH = "lastExportConfigPath"; //$NON-NLS-1$
-
-
-	/**
-	 * Returns the default export path.
-	 * 
-	 * @return The default export path.
-	 */	
-	public static String getDefaultExportPath() {
-		String defExportPPath = System.getProperty("user.home") + //$NON-NLS-1$
-				FileUtil.FILE_SEP + LibraryUIPreferences.getApplicationShortName() + 
-				FileUtil.FILE_SEP + "Export"; //$NON-NLS-1$
-		return defExportPPath;
-	}
-	
-	/**
-	 * Gets the recently opened method plugin dir preference.
-	 * 
-	 * @return a collection of String
-	 */
-	public static List getRecentlyExportedPluginDirs() {
-		List dirs = getPropertyList(LAST_EXPORT_PLUGIN_PATH);
-		List result = new ArrayList();
-		if (dirs.size() > 0) {
-			for (Iterator it = dirs.iterator(); it.hasNext();) {
-				String dir = (String) it.next();
-				result.add(dir);
-			}
-		}
-		return result;
-	}
-	
-	/**
-	 * Sets the recently opened method plugin preference.
-	 * 
-	 * @param dir   export plugin dir
-	 */
-	public static void addRecentlyExportPluginDir(String dir) {
-		if (dir == null || dir.length()==0) {
-			return;
-		}
-
-		List dirs = getRecentlyExportedPluginDirs();
-
-		addProperty(dirs, dir, LAST_EXPORT_PLUGIN_PATH);
-	}
-	
-	/**
-	 * Gets the recently export config dirs preference.
-	 * 
-	 * @return a collection of String
-	 */
-	public static List getRecentlyExportedConfigDirs() {
-		//TODO
-		List dirs = getPropertyList(LAST_EXPORT_CONFIG_PATH);
-		List result = new ArrayList();
-		if (dirs.size() > 0) {
-			for (Iterator it = dirs.iterator(); it.hasNext();) {
-				String dir = (String) it.next();
-				result.add(dir);
-			}
-		}
-		return result;
-	}
-	
-	/**
-	 * Sets the recently opened method config dir preference.
-	 * 
-	 * @param dir   export config dir
-	 */
-	public static void addRecentlyExportConfigDir(String dir) {
-		if (dir == null || dir.length()==0) {
-			return;
-		}
-
-		List dirs = getRecentlyExportedConfigDirs();
-
-		addProperty(dirs, dir, LAST_EXPORT_CONFIG_PATH);
-	}
-	
-	/**
-	 * Add the property to the first position.
-	 * 
-	 * @param oldPropertyList   old property list
-	 * @param newProperty       new property value 
-	 * @param propertyKey       target property key
-	 */
-	private static void addProperty(List oldPropertyList, String newProperty, String propertyKey){
-		List dirsResult = new ArrayList();
-		
-		if(oldPropertyList.contains(newProperty))
-			oldPropertyList.remove(newProperty);
-		
-		dirsResult.add(0, newProperty);
-		
-		for (int i=0; i<oldPropertyList.size(); i++) {
-			String path = (String) oldPropertyList.get(i);
-			dirsResult.add(i+1, path);
-		}
-		
-		if(dirsResult.size()>getListLength())
-			dirsResult = dirsResult.subList(0, getListLength());
-			
-		setPropertyList(propertyKey, StrUtil.convertListToStrArray(dirsResult));
-	}
-	
-	/**
-	 * Returns the string values associated with the named preference as a
-	 * <ocde>List</code>.
-	 */
-	private static List getPropertyList(String name) {
-		List list = convertToList(ExportPlugin.getDefault().getPreferenceStore()
-				.getString(name));
-		int length = getListLength();
-		if(list.size()>length){
-			list = list.subList(0, length);
-		}
-		return list;
-	}
-	
-	/**
-	 * Saves the given string values associated with the named preference.
-	 */
-	private static void setPropertyList(String name, String[] items) {
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; i < items.length; i++) {
-			buffer.append(items[i]);
-			buffer.append(PREFERENCE_DELIMITER);
-		}
-		ExportPlugin.getDefault().getPreferenceStore().setValue(name,
-				buffer.toString());
-	}
-	
-	/**
-	 * Converts the supplied PREFERENCE_DELIMITER delimited string into a
-	 * <code>List</code> object.
-	 */
-	private static ArrayList convertToList(String preferenceValue) {
-		ArrayList topics = new ArrayList();
-		StringTokenizer tokenizer = new StringTokenizer(preferenceValue,
-				PREFERENCE_DELIMITER);
-		int tokenCount = tokenizer.countTokens();
-		for (int i = 0; i < tokenCount; i++) {
-			topics.add(tokenizer.nextToken());
-		}
-		return topics;
-	}
-	
-	/**
-	 * @return the length of list
-	 */
-	public static int getListLength(){
-		String length = LibraryPlugin.getDefault().getPreferenceStore().getString(LibraryPreferenceConstants.PREF_DEFAULT_HISTORY_SIZE);
-		int ll = 0;
-		if(length!=null && length.length()>0){
-			try{
-				ll = Integer.parseInt(length);
-			}catch (Exception e){
-				
-			}
-		}
-		return ll>0?ll:DEFAIL_LIST_LENGTH;
-	}
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/PluginInfoPage.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/PluginInfoPage.java
deleted file mode 100755
index ca01571..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/PluginInfoPage.java
+++ /dev/null
@@ -1,222 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.wizards;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.wizards.ConfigurationTableLabelProvider;
-import org.eclipse.epf.export.ExportPlugin;
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.export.services.PluginExportData;
-import org.eclipse.epf.library.ui.LibraryUIImages;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-
-/**
- * A wizard page that prompts the user to review the dependencies of the method
- * plug-ins that have been selected for export.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class PluginInfoPage extends BaseWizardPage implements
-		ISelectionChangedListener, Listener {
-
-	public static final String PAGE_NAME = PluginInfoPage.class.getName();
-
-	private Table table;
-
-	private TableViewer ctrl_tableViewer;
-
-	private TableViewer ctrl_dependPluginsViewer;
-
-	private TableViewer ctrl_associatedConfigViewer;
-
-	private List dependentPluginList = new ArrayList();
-
-	private List associatedConfigList = new ArrayList();
-
-	private PluginExportData data;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PluginInfoPage(PluginExportData data) {
-		super(PAGE_NAME);
-		setTitle(ExportResources.reviewPluginsPage_title); 
-		setDescription(ExportResources.reviewPluginsPage_desc); //$NON-NLS-1$
-		setImageDescriptor(ExportPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ExportMethodPlugins.gif")); //$NON-NLS-1$		
-		this.data = data;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout());
-
-		createLabel(container, ExportResources.reviewPluginsPage_pluginsLabel_text); //$NON-NLS-1$
-
-		ctrl_tableViewer = createTableViewer(container, 360, 60, 1);
-		table = ctrl_tableViewer.getTable();
-
-		ILabelProvider labelProvider = new LabelProvider() {
-			public Image getImage(Object element) {
-				return LibraryUIImages.IMG_METHOD_PLUGIN;
-			}
-
-			public String getText(Object element) {
-				if (element instanceof MethodPlugin) {
-					return ((MethodPlugin) element).getName();
-				} else {
-					return element.toString();
-				}
-			}
-		};
-		ctrl_tableViewer.setLabelProvider(labelProvider);
-		ctrl_tableViewer.setContentProvider(new ArrayContentProvider());
-		if (data.getSelectedPlugins() != null) {
-			ctrl_tableViewer.setInput(data.getSelectedPlugins().toArray());
-		}
-
-		createLabel(
-				container,
-				ExportResources.reviewPluginsPage_dependentPluginsLabel_text); //$NON-NLS-1$
-
-		ctrl_dependPluginsViewer = createTableViewer(container, 360, 60, 1);
-		ctrl_dependPluginsViewer.setLabelProvider(labelProvider);
-		ctrl_dependPluginsViewer.setContentProvider(new ArrayContentProvider());
-		ctrl_dependPluginsViewer.setInput(dependentPluginList);
-
-		createLabel(
-				container,
-				ExportResources.reviewPluginsPage_associatedConfigsLabel_text); //$NON-NLS-1$
-
-		ctrl_associatedConfigViewer = createTableViewer(container, 360, 60, 1);
-		ctrl_associatedConfigViewer
-				.setLabelProvider(new ConfigurationTableLabelProvider());
-		ctrl_associatedConfigViewer
-				.setContentProvider(new ArrayContentProvider());
-		ctrl_associatedConfigViewer.setInput(associatedConfigList);
-
-		if (data.getSelectedPlugins() != null
-				&& !data.getSelectedPlugins().isEmpty()) {
-			table.select(0);
-			displayRelatedInfo((MethodPlugin) data.getSelectedPlugins().get(0));
-		}
-
-		addListeners();
-
-		setControl(container);
-		setPageComplete(false);
-	}
-
-	private void addListeners() {
-		ctrl_tableViewer.addSelectionChangedListener(this);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		StructuredSelection selection = (StructuredSelection) event
-				.getSelection();
-		if (!selection.isEmpty()) {
-			Object[] plugin = selection.toArray();
-			displayRelatedInfo((MethodPlugin) plugin[0]);
-		}
-
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	/**
-	 * @see org.eclipse.epf.ui.wizards.BaseWizardPage#onEnterPage(Object)
-	 */
-	public void onEnterPage(Object obj) {
-		if (data.getSelectedPlugins() != null
-				&& !data.getSelectedPlugins().isEmpty()) {
-			ctrl_tableViewer.setInput(data.getSelectedPlugins().toArray());
-			table.select(0);
-			displayRelatedInfo((MethodPlugin) data.getSelectedPlugins().get(0));
-		}
-	}
-
-	private void displayRelatedInfo(MethodPlugin plugin) {
-		if (plugin == null)
-			return;
-
-		dependentPluginList = plugin.getBases();
-		ctrl_dependPluginsViewer.setInput(dependentPluginList.toArray());
-		associatedConfigList = LibraryUtil.getAssociatedConfigurations(plugin);
-		ctrl_associatedConfigViewer.setInput(associatedConfigList.toArray());
-
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		return true;
-	}
-
-	protected void saveDataToModel() {
-		//Will refactor to use: data.buildAssociatedConfigMap()
-		
-		if (data.getSelectedPlugins() != null) {
-			data.associatedConfigMap.clear();
-			for (Iterator iter = data.getSelectedPlugins().iterator(); iter
-					.hasNext();) {
-				MethodPlugin element = (MethodPlugin) iter.next();
-				data.associatedConfigMap.put(element, LibraryUtil
-						.getAssociatedConfigurations(element));
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		saveDataToModel();
-		ExportPluginSummaryPage page = ((ExportPluginWizard) getWizard()).page3;
-		page.onEnterPage(null);
-		return page;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/SavePluginPage.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/SavePluginPage.java
deleted file mode 100755
index 4db2d72..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/SavePluginPage.java
+++ /dev/null
@@ -1,70 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.wizards;
-
-import java.io.File;
-import java.util.List;
-
-import org.eclipse.epf.export.ExportPlugin;
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.export.services.PluginExportData;
-
-
-/**
- * A wizard page that informs the user that changes to the existing method
- * plug-ins will be saved prior to an export operation.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class SavePluginPage extends DestinationCommonPage {
-
-	public static final String PAGE_NAME = SavePluginPage.class.getName();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SavePluginPage(PluginExportData data) {
-		super(PAGE_NAME, data.llData);
-		setTitle(ExportResources.specifyPathPage_title); 
-		setDescription(ExportResources.specifyPathPage_desc); 
-		setImageDescriptor(ExportPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ExportMethodPlugins.gif")); //$NON-NLS-1$
-	}
-
-	public boolean isPageComplete() {
-		ExportPluginWizard wizard = (ExportPluginWizard) getWizard();
-		if (ctrl_exportPath.getText().length()>0 && !ctrl_exportPath.getText().endsWith(File.separator)) {
-			saveToDataModel();
-			wizard.okToComplete = true;
-			return true;
-		}
-		wizard.okToComplete = false;
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.export.wizards.DestinationCommonPage#initComboItems()
-	 */
-	protected void initComboItems() {
-		List dirList = ExportUIPreferences.getRecentlyExportedPluginDirs();
-		
-		if(dirList!=null && !dirList.isEmpty()){
-			String[] dirs = new String[dirList.size()];
-			for(int i=0; i<dirList.size(); i++){
-				dirs[i] = dirList.get(i).toString();
-			}
-			ctrl_exportPath.setItems(dirs);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/SelectPluginPage.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/SelectPluginPage.java
deleted file mode 100755
index 9eaa164..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/SelectPluginPage.java
+++ /dev/null
@@ -1,215 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.export.wizards;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.export.ExportPlugin;
-import org.eclipse.epf.export.ExportResources;
-import org.eclipse.epf.export.services.PluginExportData;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.ui.LibraryUIImages;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A wizard page that prompts the user to select the method plug-ins to be
- * exported.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class SelectPluginPage extends BaseWizardPage implements
-		ISelectionChangedListener, ICheckStateListener, Listener {
-
-	public static final String PAGE_NAME = SelectPluginPage.class.getName();
-
-	private Table table;
-
-	private CheckboxTableViewer ctrl_chkboxTableViewer;
-
-	private Text ctrl_author;
-
-	private Text ctrl_version;
-
-	private Text ctrl_briefDesc;
-
-	private int checkedCount = 0;
-
-	private List checkedPluginList = new ArrayList();
-
-	private PluginExportData data;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SelectPluginPage(PluginExportData data) {
-		super(PAGE_NAME);
-		setTitle(ExportResources.selectPluginsPage_title);
-		setDescription(ExportResources.selectPluginsPage_desc); //$NON-NLS-1$
-		setImageDescriptor(ExportPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ExportMethodPlugins.gif")); //$NON-NLS-1$
-		this.data = data;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout());
-
-		createLabel(container,
-				ExportResources.selectPluginsPage_pluginsLabel_text); //$NON-NLS-1$
-
-		ctrl_chkboxTableViewer = createCheckboxTableViewer(container, 1);
-		table = ctrl_chkboxTableViewer.getTable();
-
-		MethodLibrary library = LibraryService.getInstance()
-				.getCurrentMethodLibrary();
-		List plugins = (library == null) ? new ArrayList() : library
-				.getMethodPlugins();
-		ILabelProvider labelProvider = new LabelProvider() {
-			public Image getImage(Object element) {
-				return LibraryUIImages.IMG_METHOD_PLUGIN;
-			}
-
-			public String getText(Object element) {
-				if (element instanceof MethodPlugin) {
-					return ((MethodPlugin) element).getName();
-				} else {
-					return element.toString();
-				}
-			}
-		};
-
-		ctrl_chkboxTableViewer.setLabelProvider(labelProvider);
-		ctrl_chkboxTableViewer.setContentProvider(new ArrayContentProvider());
-		if (plugins != null) {
-			ctrl_chkboxTableViewer.setInput(plugins.toArray());
-		}
-
-		createLabel(container, AuthoringUIText.AUTHORS_TEXT);
-		ctrl_author = createTextMulti(container, "", 360, 40, 3); //$NON-NLS-1$
-
-		createLabel(container, AuthoringUIText.VERSION_TEXT);
-		ctrl_version = createText(container, "", 360, 3); //$NON-NLS-1$
-
-		createLabel(container, AuthoringUIText.BRIEF_DESCRIPTION_TEXT);
-		ctrl_briefDesc = createTextMulti(container, "", 360, 80, 3); //$NON-NLS-1$
-
-		if (plugins != null && !plugins.isEmpty()) {
-			table.select(0);
-			setDisplayAttributes((MethodPlugin) plugins.get(0));
-		}
-
-		addListeners();
-
-		setControl(container);
-		setPageComplete(false);
-	}
-
-	private void addListeners() {
-		ctrl_chkboxTableViewer.addSelectionChangedListener(this);
-		ctrl_chkboxTableViewer.addCheckStateListener(this);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent)
-	 */
-	public void checkStateChanged(CheckStateChangedEvent event) {
-		Object obj = event.getElement();
-
-		if (event.getChecked()) {
-			checkedCount++;
-			checkedPluginList.add(obj);
-		} else {
-			checkedCount--;
-			checkedPluginList.remove(obj);
-		}
-
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		StructuredSelection selection = (StructuredSelection) event
-				.getSelection();
-		if (!selection.isEmpty()) {
-			Object[] plugin = selection.toArray();
-			setDisplayAttributes((MethodPlugin) plugin[0]);
-		}
-
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	private void setDisplayAttributes(MethodPlugin plugin) {
-		ctrl_author.setText(plugin.getAuthors());
-		ctrl_version.setText(plugin.getVersion());
-		ctrl_briefDesc.setText(plugin.getBriefDescription());
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		if (getErrorMessage() != null)
-			return false;
-		return checkedCount > 0;
-	}
-
-	protected void saveDataToModel() {
-		data.setSelectedPlugins(checkedPluginList);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		saveDataToModel();
-		PluginInfoPage page = ((ExportPluginWizard) getWizard()).page2;
-		page.onEnterPage(null);
-		return page;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/package.html b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/package.html
deleted file mode 100755
index 8c7679d..0000000
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/wizards/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides wizards for exporting method plug-ins and configurations.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.help.doc/.classpath b/plugins/org.eclipse.epf.help.doc/.classpath
deleted file mode 100755
index 065ac06..0000000
--- a/plugins/org.eclipse.epf.help.doc/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.help.doc/.cvsignore b/plugins/org.eclipse.epf.help.doc/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.help.doc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.help.doc/.project b/plugins/org.eclipse.epf.help.doc/.project
deleted file mode 100755
index 5a36dc7..0000000
--- a/plugins/org.eclipse.epf.help.doc/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.help.doc</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/plugins/org.eclipse.epf.help.doc/build.properties b/plugins/org.eclipse.epf.help.doc/build.properties
deleted file mode 100755
index 38748bd..0000000
--- a/plugins/org.eclipse.epf.help.doc/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-source.doc.jar = src/
-output.doc.jar = bin/
-bin.includes = plugin.xml,\
-               doc.jar,\
-               doc.zip,\
-               plugin.properties,\
-               concepts.xml,\
-               gettingstarted.xml,\
-               glossary.xml,\
-               main.xml,\
-               overview.xml,\
-               tasks.xml,\
-               reference.xml,\
-               tutorials.xml,\
-               cheatsheets/
diff --git a/plugins/org.eclipse.epf.help.doc/categorizemethcont.xml b/plugins/org.eclipse.epf.help.doc/categorizemethcont.xml
deleted file mode 100755
index 1d5269a..0000000
--- a/plugins/org.eclipse.epf.help.doc/categorizemethcont.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Categorize method content" link_to="main.xml#categorizemethodcont_id">
-   <topic label="Method content categories" href="html/help/content_categories.html"/>
-   <topic label="Create a method view with custom categories" href="html/help/create_custom_categories.html"/>
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/cheatsheets/addmethodref_or_hyperlink.xml b/plugins/org.eclipse.epf.help.doc/cheatsheets/addmethodref_or_hyperlink.xml
deleted file mode 100755
index 2d987ef..0000000
--- a/plugins/org.eclipse.epf.help.doc/cheatsheets/addmethodref_or_hyperlink.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
-    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
--->
-
-<cheatsheet title="Add a Method Reference or Hyperlink (URL)">
-	<intro 
-		href="/org.eclipse.epf.help.doc/html/addareferenceorhyperlink.html">
-		<description>There are two types of references or hyperlinks to other content within your content text: references  to other elements in the method library or references to external text outside the method library with a URL. This cheat sheet walks you through creating both types.</description>
-	</intro>
-
-	<item
-		title="Create a Hyperlink to another element in the Method Library"
-		skip="false">
-		<description>You can recognize a text field that supports hyperlinks by the little triangle next to the text field's label.  This triangle allows you to expand the text field into a full size editor with an editor toolbar providing rich text editing functionality such as font styles, bullet points, etc.<br/><br/>To insert a hyperlink to another element in the method library in the text field simply find the element in the library or configuration view and drag it into an expanded or collapsed form field.<br/><br/>Alternatively, you can also position the cursor where you want the link to be added and click the Add Link button in the tool bar. It opens the Add Link dialog that provides you amongst others with three options for creating links to other content elements by selecting the element via the "Browse..." button.  Every option offers a different way for displaying the link's name:<br/><br/>"Method Element": links that displays the element name."<br/><br/>"Method with type prefix": link that displays the element name and type.<br/><br/>"Method element with custom text": link that displays a user defined text. To define this text manipulate the text in between the &lt;a&gt;&lt;/a&gt; tags in the URL text field once you have selected an element using the "Browse..." button.</description>
-	</item>
-
-	<item
-		title="Create a Hyperlink to an External page using a URL"
-		skip="false">
-		<description>To insert a hyperlink to an external URL, expand the editor, position the cursor where you want the link to be added and then click the "Add Link" button in the tool bar. Fill in the dialog with the link URL details and then click OK.</description>
-	</item>
-	<item title="Done"><description></description></item>
-</cheatsheet>
diff --git a/plugins/org.eclipse.epf.help.doc/cheatsheets/addnewmethodcontent.xml b/plugins/org.eclipse.epf.help.doc/cheatsheets/addnewmethodcontent.xml
deleted file mode 100755
index dc7d54b..0000000
--- a/plugins/org.eclipse.epf.help.doc/cheatsheets/addnewmethodcontent.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
-    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
--->
-
-<cheatsheet title="Add new Method Content such as Roles, Tasks, Work Products or Guidance">
-
-	<intro 
-		href="/org.eclipse.epf.help.doc/html/createmethodcontent.html">
-		<description>This cheat sheet guides you though the steps of creating your own method content. You should always create method content in a method plug-in that you produce. This separates your content from content that you reused from third parties and allows you to update your own library with new releases of such third party plug-ins without affecting the content that you have created in your own plug-ins.<br/><br/>All plug-ins shipped with your method library are protected from direct modification. Creating new elements in your own plug-in and then relating those elements to the elements in the locked plug-in allows you to tailor the contents of the locked plug-in for your own use. If you have not created your own method plug-in, perform the "Create your own Method Plug-in" cheat sheet first.</description>
-	</intro>
-
-	<item
-		href="/org.eclipse.epf.help.doc/html/methodcontentpackage.html"
-		title="Select or Create a Content Package"
-		skip="false">
-		<description>Content packages are used to group related method content together. Since content packages are selectable at publication time, it is recommended practice to group content that needs to be published together into the same content package.<br/><br/>Find your method plug-in in the Library view. Drill into the plug-in's packages to locate the package called "Content Packages". This package contains all packages that are allowed to contain method elements. Select and expand a package in the "Content Packages" hierarchy in which you want to create your element, or to create a new content package. Right click a package and select New -&gt; Content Package.<br/><br/>An editor opens that allows you to provide a unique name for the package as well as to briefly describe its purpose.</description>
-	</item>
-
-	<item
-		href="/org.eclipse.epf.help.doc/html/methodcontent.html"
-		title="Create Method Content Element"
-		skip="false">
-		<description>In your expanded content package within the library view, right click any one of roles, tasks, work products, or guidance to create any of these content elements. Highlight "New" and then select the concrete type of the element you want to create (e.g. for work products choose between artifact, outcome, or deliverable). The new element is created and its respective editor is opened.</description>
-	</item>
-
-	<item
-		title="Detail the Newly Created Method Content Element"
-		skip="false">
-		<description>Use the fields in the content element editor to specify the content element details. Start by assigning a unique "Name" to the element as well as giving it a "Presentation Name" that will be used as the external visible name when other elements refer to this element or when the element is published.<br/><br/>Every element owns several specific content fields distributed on several stacked editor tabs and sections within these tabs that you can use for your descriptions. For more information on these description fields as well as how to use the rich text editor see the online help.</description>
-	</item>
-	<item title="Done"><description></description></item>
-</cheatsheet>
-
diff --git a/plugins/org.eclipse.epf.help.doc/cheatsheets/applycapabilitypattern.xml b/plugins/org.eclipse.epf.help.doc/cheatsheets/applycapabilitypattern.xml
deleted file mode 100755
index 4985436..0000000
--- a/plugins/org.eclipse.epf.help.doc/cheatsheets/applycapabilitypattern.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
-    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
--->
-
-<cheatsheet title="Apply a Capability Pattern">
-
-	<intro 
-		href="/org.eclipse.epf.help.doc/html/applyacapabilitypattern.html">
-		<description>When developing a process you do not need to work from scratch by creating activities and descriptors one by one.  This cheat sheet walks you through applying pre-defined capability patterns or even capability pattern or delivery process parts as building blocks to your process.<br/><br/>A capability pattern is a special process that describes a reusable cluster of activities in common process areas.  Capabilities patterns express and communicate process knowledge for a key area of interest such as a discipline and can be directly used by a process practitioner to guide his work.  They are also used as building blocks to assemble delivery processes or larger capability patterns ensuring optimal reuse and application of the key practices they express. You can apply the same pattern several times to the same process and define local modifications to each individual pattern application. This allows you to express specific changes each time the pattern is being performed throughout a lifecycle a process represents.</description>
-	</intro>
-
-	<item
-		title="Find an Activity to which a Pattern will be Applied"
-		skip="false">
-		<description>Given that you have already opened your process in the process editor, switch to the work breakdown structure tab and review your process. Find the location where you want to apply a capability pattern. A capability pattern has to be applied to one specific activity (including iteration or phase which are special activities) in a process. Such an activity can either be defined locally in the process (presented as a name in a standard black font) or an activity which had been added to the process by applying another capability pattern (presented as a name in a green-italic font).<br/><br/>If you want to apply a pattern to a local activity (black font), go to step "Select a Capability Pattern in the Configuration View". If you want to apply a pattern to an activity from another pattern (green italic font), please go to step "Contribute to an Activity from Another Pattern".</description>
-	</item>
-
-	<item
-		title="Contribute to an Activity from Another Pattern"
-		skip="true">
-		<description>Only if you want to apply a pattern to an activity from another pattern (recognizable by the green italic font) then you need to create an activity contribution, which allows you to make local changes to the activity.<br/><br/>Find the activity's parent element. If this element is a not a local element (green italic font) then you first need create a contribution to this parent and so on (if the parent's parent is not local then create a contribution to the parent's parent first, etc.) <br/><br/>To create a contribution to a non-local activity, right-click the non-local activity and then click "Contribute". Do this with all parents top-down until you reach the activity to which you want to apply the pattern. Once you clicked "Contribute", the activity become local and is presented with a standard black font.</description>
-	</item>
-
-	<item
-		href="/org.eclipse.epf.help.doc/html/configurationview.html" 
-		title="Select a Capability Pattern in the Configuration View"
-		skip="false">
-		<description>Find a capability pattern in the configuration view. Expand the package "Processes -&gt; Capability Patterns" as well as its sub-packages. Select the pattern you want to apply to your process.</description>
-	</item>
-
-	<item
-		title="Apply the Capability Pattern or Capability Patterns Activity"
-		skip="false">
-		<description>You can apply either the whole capability pattern to your process or just one or more activities from it. To apply the whole capability pattern drag the pattern over the activity selected earlier in your process. To apply one or more activities of the capability pattern select them in the configuration view. You can multi select by pressing ctrl + select, or shift + select to capture an all-inclusive section.<br/><br/>Drag them to the activity selected earlier in your process. After dragging the pattern or activities you will be prompted you to apply the pattern/activities via Extends (dynamic binding) or Copy (See the online help section "Process Authoring Overview" for more details on these two choices). Make your choice by clicking.<br/><br/>As an alternative to dragging the capability pattern you can also right-click the activity to which you want to apply the pattern and select the menu option "Apply Pattern -&gt; Copy..." or "Apply Pattern -&gt; Extend..."</description>
-	</item>
-	
-	<item
-		title="Make Local Changes to a Pattern Application"
-		skip="true">
-		<description>If you applied the pattern via copy, you can freely make modifications to the copied elements. If you applied the pattern via extends (dynamic binding) you can still provide local additions to the pattern by defining a contribution to the pattern's activities. Follow the instructions of the step "Contribute to an Activity from Another Pattern" above to define such a contribution. After you create the local activity contribution, you can add additional descriptors or patterns to this activity.</description>
-	</item>
-	
-	<item
-		title="Suppress Pattern Elements"
-		skip="true">
-		<description>You can suppress elements such as descriptors or activities of a dynamically bounds pattern (via extends) by right clicking and selecting "Suppress" from the context menu.</description>
-	</item>
-	<item title="Done"><description></description></item>
-</cheatsheet>
diff --git a/plugins/org.eclipse.epf.help.doc/cheatsheets/createaprocess.xml b/plugins/org.eclipse.epf.help.doc/cheatsheets/createaprocess.xml
deleted file mode 100755
index c4c7953..0000000
--- a/plugins/org.eclipse.epf.help.doc/cheatsheets/createaprocess.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
-    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
--->
-
-<cheatsheet title="Create a Process (Capability Pattern or Delivery Process)">
-
-	<intro 
-		href="/org.eclipse.epf.help.doc/html/processauthoringoverview.html">
-		<description>This cheat sheet guides you through the steps of creating a Process. There are two main types of processes: Capability Patterns and Delivery Processes. A Capability Pattern is a special Process that describes a reusable cluster of Activities in common process areas, while a Delivery Process describes a complete and integrated approach for performing a specific type of development project. See the online help section "Process Authoring Overview" for more details.</description>
-	</intro>
-
-	<item
-		href="/org.eclipse.epf.help.doc/html/createamethodconfiguration.html"
-		title="Select or Create a Default Method Configuration for your Process"
-		skip="true">
-		<description>Your process can contain content from many different method plug-ins. The content elements from these plug-ins, such as tasks or work products, applied to your process via drag and drop, can have many contributions or replacements. Such contributions or replacements may provide additional relationships that need to be considered for creating the process elements with their mirrored set of relationships.<br/><br/>For that reason you need to define a configuration that defines the visible set of elements and relationships when the process is authored. This process authoring configuration is referred to as the "Default Configuration" for the process and should define the largest reasonable set of method plug-ins, content packages, and other processes from the method library that will be referred to by the process at some point.<br/><br/>In addition to the default configuration, a process can be linked to many additional method configurations that have been verified to also produce valid results. However, all other valid configurations need to define sub-sets of the default configuration.  In other words, it is not possible to link a method configuration to a process that refers to elements that are not part of the default configuration, because such elements were not considered when the process was created.<br/><br/>Process elements that refer to content packages that are defined outside the scope of such a configuration will not be shown in the process when published or used under such a configuration. This allows you to easily hide content from a process by moving content packages in or out of the related configuration.<br/><br/>Therefore, before you start creating a process, review your list of configurations in the library view and decide which configuration you are going to use.  If necessary, open configurations and examine their specification. If you do not find a fitting configuration that defines the right set of elements, create a new method configuration.  For more information on process and method configuration see the section "Process Authoring Overview" in the online help.</description>
-	</item>
-
-	<item
-		href="/org.eclipse.epf.help.doc/html/createamethodplugin.html"
-		title="Choose a Method Plug-in to Hold your Process"
-		skip="false">
-		<description>Since you cannot add processes to write-locked third-party method plug-ins your process needs to be created in one of your own method plug-ins. Therefore, it is best to create your process within the plug-in in which it is going to be used. For instance, if you want to develop a set of capability patterns to use to assemble a delivery process, try to maintain all of the capability patterns in the same method plug-in.<br/><br/>If you have not created a method plug-in, go to the "Create your own Method Plug-in" cheat sheet.<br/><br/>In the library view, select a plug-in from the list of available method plug-ins. Icons that appear to be grayed-out have been locked for modification and cannot be used.</description>
-	</item>
-
-	<item
-		href="/org.eclipse.epf.help.doc/html/process.html" 
-		title="Find or Create a Process Package"
-		skip="false">
-		<description>Processes can be organized with process packages to increase maintainability and to make it easier for the process user to browse and find them. Please be aware that you can create capability patterns only in a capability patterns package or sub-package and delivery processes only in a delivery process package or sub-package.<br/><br/>Using the library view, review the structure of process packages available in the method plug-in that you selected or created in the last step and then select one of the packages present as a container for your process. Alternatively, you can create a new Process Package by right-clicking a capability pattern or delivery process package or sub-package and then clicking New -&gt; Process Package. In the dialog box that appears, specify the name of the package and then click OK.</description>
-	</item>
-
-	<item
-		href="/org.eclipse.epf.help.doc/html/createareusablecapabilitypattern.html" 
-		title="Create the Capability Pattern or Delivery Process"
-		skip="false">	
-		<description>To create a new capability pattern or delivery process: Right click the selected or newly created process package and then click New -&gt; Capability Pattern or New -&gt; Delivery Process.  In the dialog box that appears, specify the process name and default configuration and then click OK. The process is created and the editor is opened.</description>
-	</item>
-	
-	<item
-		title="Document your Process"
-		skip="false">
-		<description>With the process editor opened in the Description tab, document your process using the available text fields.  At a minimum provide a presentation name and a brief description for your process.  See the online help for definitions of each available documentation field.</description>
-	</item>
-	
-<item
-		title="Decide on your Primary Process Authoring View"
-		skip="false">
-		<description>You can develop a process from three different views:<br/><br/>Breakdown Structure:  Create your process by defining a work breakdown structure.  Create iterations and activities first and then populate your activities by either applying tasks from your method content or applying capability patterns. Go to step "Develop the Work Breakdown Structure" to work with this view.<br/><br/>Team Allocation: Create your process by defining which teams and roles shall participate in activities and finding responsible work products and tasks from there.  Go to step "Develop the Team Allocation Structure" to work with this view.<br/><br/>Work Product Usage: Create your process by defining which work products should be created in activities and finding tasks and roles from there. Go to step "Develop Work Product Usage Structure" to work with this view.</description>
-	</item>
-
-	<item
-		href="/org.eclipse.epf.help.doc/html/developaworkbreakdownstructure.html" 
-		title="Develop the Work Breakdown Structure"
-		skip="true">
-		<description>Before you start, ensure the method configuration selected in the tool bar is the same as the configuration you selected as the default configuration for your process.<br/><br/>To access the work breakdown structure editor, select the "Work Breakdown Structure" tab in the process editor.<br/><br/>Right-click the element in the first row of the breakdown structure and then click New Child -&gt; Activity to create a new activity. Alternatively, you can create a phase or iteration, depending on the scope of your process. If needed, create more activities to set-up your breakdown structure. Activities can be nested inside each other.<br/><br/>Review the list of tasks in the configuration view. In this view tasks are sorted by discipline. Drill into the disciplines hierarchy to see which tasks are available in this configuration. Select a task that you want to add to your breakdown structure and drag it on top of one of the activities you just created. The task is added as a so-called task descriptor (an occurrence of a task in one specific activity).<br/><br/>Review the task descriptor's details in its properties view. If the properties view is not displayed then select the task in the work breakdown structure editor, right-click, and select "Properties". Use the tabs on the side of the properties view to review different aspects of the task descriptor.<br/><br/>Perform individual modifications of the task descriptor in the properties view.  For example, you can change the presentation name, add textual descriptions, change performing roles, change the inputs and outputs, etc. When changing the task descriptor's relationships in the property window tabs roles or work products, you can either add new elements from your method content by using the 'Add..' button or connect your task descriptor with tasks already present in this activity.<br/><br/>Instead of dragging task one by one you can also apply whole capability patterns or activities from other processes available in your current method configuration.  Select a capability pattern or any activity of such a pattern or delivery process available in the configuration view and drag it on top of an activity within your process breakdown in the process editor. (Find a detailed walkthrough to applying capability pattern in the cheat sheet "Apply a Capability Pattern".)<br/><br/>Continue adding more tasks, activities or patterns to your activities or switch to the team allocation tab to add roles or to the work product usage tab to add work products.</description>
-	</item>
-
-<item
-		href="/org.eclipse.epf.help.doc/html/developateamallocationstructure.html" 
-		title="Develop the Team Allocation Structure"
-		skip="true">
-		<description>Before you start, ensure the configuration selected in the tool bar is the same as the configuration you selected as the default configuration for your process.<br/><br/>In the process editor, click the "Team Allocation" tab to open the team allocation editor.<br/><br/>Right-click the element in the first row of the breakdown structure and then click New Child -&gt; Activity to create a new activity. Alternatively, you can create a phase or iteration, depending on the scope of your process. If needed, create more activities to set-up your breakdown structure. Activities can be nested inside each other.<br/><br/>You can add roles directly to your activities now. In the configuration view, review the list of roles. In this view roles are organized into role sets. Drill into the role sets hierarchy to see which roles are available in this configuration. Select a Role that you want to add to your activity and drag it on top of the activity you created earlier. The role is added as a role descriptor (an occurrence of a role in one specific activity).<br/><br/>If the role that you just dragged has responsibility relationships to work products defined, a wizard appears prompting you to add any of the work products to the process. Select zero to many work products and then click OK.<br/><br/>For each selected work product the next wizard window prompts you to select tasks that produce these work products. Again, select zero to many tasks and then click OK to add these elements to your process.<br/><br/>Review the role descriptor's details in its properties view. If the properties view is not displayed then select the role in the breakdown structure editor, right-click, and select "Properties". Use the tabs on the side of the properties view to review different aspects of the role descriptor. You can also perform individual modifications of the role descriptor, such as change the presentation name, add textual descriptions, change work products the role is responsible for, etc.<br/><br/>When changing the role descriptor’s relationships in the property window tab’s roles or work products, you can add new elements from your method content by using the "Add…" button, or connect your role descriptor with work products already present in this activity.<br/><br/>Continue adding more roles to your activities, or switch to the work breakdown structure tab to add tasks or to the work product usage tab to add work products.</description>
-	</item>
-
-<item
-		href="/org.eclipse.epf.help.doc/html/developaworkproductusagestructure.html" 
-		title="Develop the Work Product Usage Structure"
-		skip="true">
-		<description>Before you start, ensure the configuration selected in the tool bar is the same as the configuration you selected as the default configuration for your process.<br/><br/>In the process editor, click the "Work Product Usage" tab to open the work product usage editor.<br/><br/>Right-click the element in the first row of the breakdown structure and then click New Child -&gt; Activity to create a new activity. Alternatively, you can create a phase or iteration, depending on the scope of your process. If needed, create more activities to set-up your breakdown structure. Activities can be nested inside each other.<br/><br/>Review the list of work products in the configuration view. In this view work products are sorted by domain as well as work product types.  Drill into either of these hierarchies to see which work products are available in this configuration. Select a work product you want to add to an activity and then drag it on top of an Activity that you created earlier. The work product is added as a work product descriptor (an occurrence of a work product in one specific activity).<br/><br/>After you have added the work product to the activity, a wizard prompts you to add tasks that produce this work product to this activity. Select zero to many tasks and then click OK. The wizard adds task descriptors for each selected task to the work breakdown structure.<br/><br/>Review the new work product descriptor’s details in its properties view. If the properties view is not displayed then select the work product descriptor in the process editor, right-click, and select "Properties". Use the tabs on the side of the properties view to review different aspects of the work product descriptor. You can also perform individual modifications of the role descriptor, such as change the presentation name add textual descriptions, add entry and exit states, etc.<br/><br/>When changing the role descriptor’s relationships in the property window tab’s roles or work products, you can add new elements from your method content by using the "Add…" button, or connect your role descriptor with work products already present in this Activity.<br/><br/>Continue by adding more work products to your activities, or switch to the work breakdown structure tab to add tasks or the team allocation tab to add roles.</description>
-	</item>
-
-<item
-		href="/org.eclipse.epf.help.doc/html/applyacapabilitypattern.html" 
-		title="Apply a Capability Patter or Capability Pattern's Activity"
-		skip="true">
-		<description>You do not need to develop your process from scratch by adding descriptors one by one as described in the last steps.  You can also reuse existing capability patterns or even capability pattern parts. Go to the cheat sheet "Apply a Capability Pattern" to see how.</description>
-	</item>
-	<item title="Done"><description></description></item>
-</cheatsheet>
-
diff --git a/plugins/org.eclipse.epf.help.doc/cheatsheets/createmethodconfiguration.xml b/plugins/org.eclipse.epf.help.doc/cheatsheets/createmethodconfiguration.xml
deleted file mode 100755
index 10bd304..0000000
--- a/plugins/org.eclipse.epf.help.doc/cheatsheets/createmethodconfiguration.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
-    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
--->
-
-<cheatsheet title="Create your own Method Configuration">
-	<intro href="/org.eclipse.epf.help.doc/html/createamethodconfiguration.html">
-		<description>This cheat sheet guides you though the steps of creating your own method configuration. Because the method library can contain large numbers of elements, you may want to limit your work to a user-defined subset of the library called method configuration. A method configuration defines a working set of packages within the method library that helps you limit your view to a subset of all elements. Method configurations are not only used for creating processes (you drag and drop elements into a process from here), but also for publication, because a configuration defines which elements will be published in HTML and which will not.<br/><br/>The elements that are part of a selected configuration are displayed in the configuration view. The configuration view allows you to browse the collection of method elements that are part of the selected configuration, and to populate processes by dragging elements from the configuration view into the process editor.</description>
-	</intro>
-
-	<item
-		href="/org.eclipse.epf.help.doc/html/methodconfigurations.html"
-		title="Prepare Creating a Method Configuration"
-		skip="false">
-		<description>Before creating a method configuration you should determine your needs and goals for the configuration. One scenario for creating a method configuration is that you have already created a new method plug-in in which you want to define method elements that extend an already existing plug-in. In this case, you need to create a configuration that includes your new plug-in as well as the existing plug-in. If you want to create your own method plug-in first then go the cheat "Create your own Method Plug-in".<br/><br/>Another scenario for creating a method configuration is that you want to define a new configuration for publication purposes on existing plug-ins, defining which elements to publish. For example, if the current set of configurations available does not meet your needs, you could now either customize an existing configuration or create a completely new configuration from scratch.<br/><br/>If you want to create a method configuration by copying an existing configuration go to the next step "Create a Method Configuration by copying an existing configuration".<br/><br/>If you want to create a completely new method configuration, skip to step "Create a new Method Configuration from scratch".</description>
-	</item>
-
-	<item
-		title="Create a Method Configuration by Copying an Existing Configuration"
-		skip="true">
-		<description>Expand the "Configurations" package at the end of the Library view. Right click the method configuration you want to copy, and then select "Copy" from the menu. Right click the configurations package and then select "Paste" from the menu.<br/><br/>A dialog prompts your for a new configuration name. Provide a name that reflects the character or purpose of this configuration. To continue specifying your method configuration, skip to step "Specify the Method Configuration".</description>
-	</item>
-
-	<item
-		title="Create a new Method Configuration from Scratch"
-		skip="true">
-		<description>Right click the configurations package and select New -&gt; Method Configuration from the menu. The new configuration is added to the list and its editor is opened. Change the name of the new configuration to reflect its character or purpose and then continue to the next step, "Specify the Method Configuration".</description>
-	</item>
-
-	<item
-		title="Specify the Method Configuration"
-		skip="false">
-		<description>Click the "Plug-in and Package Selection" tab in the method configuration editor to go to the configuration specification form. This form displays a list of all method plug-ins and for every plug-in all of its content packages as well as all processes. Use the check boxes to add or remove plug-ins, packages, and processes to or from your configuration.</description>
-	</item>
-	
-	<item
-		href="/org.eclipse.epf.help.doc/html/configurationview.html" 
-		title="Preview your Configuration in the Configuration View"
-		skip="false">
-		<description>You can immediately preview your method configuration using the configuration view. Refresh your configuration view by clicking the view's "Refresh All" icon. Drill into the tree structures displayed by the configuration view to see elements included in the configuration.</description>
-	</item>
-	
-	<item
-		href="/org.eclipse.epf.help.doc/html/methodcontentcategories.html" 
-		title="Define Navigation Views for the Method Configuration"
-		skip="false">
-		<description>A navigation view is a navigation tree browser for a configuration published as HTML. Every published configuration can have several views that are displayed as stacked tree browser tabs. The structure of the navigation view is defined as custom categories. A custom category is a user-defined collection of categorizing elements, which may itself contain subcategories. This structure is what defines the structure for the tree browser. (For more information about Custom Categories, see the online help.) Therefore, to define a navigation view you select a custom category and all of this categories sub-elements make up the tree browser structure displayed by the view.<br/><br/>To add navigation views to your configuration click the "Views" tab in the configuration editor. Use the "Add View..." and "Remove View" buttons to select the custom categories you want to add and remove as a view, respectively. Click the tab of the views you just added to preview.<br/><br/>To select a view to display as the start-up view, click the "Make Default" button. The start-up view is the first view shown when a published configuration is displayed when starting up.</description>
-	</item>
-	<item title="Done"><description></description>
-	</item>
-</cheatsheet>
-
diff --git a/plugins/org.eclipse.epf.help.doc/cheatsheets/createmethodplugin.xml b/plugins/org.eclipse.epf.help.doc/cheatsheets/createmethodplugin.xml
deleted file mode 100755
index e43ab0d..0000000
--- a/plugins/org.eclipse.epf.help.doc/cheatsheets/createmethodplugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- Copyright (c) 2004, 2005 IBM Corporation.  All Rights Reserved. -->
-<cheatsheet title="Create your own Method Plug-in">
-
-	<intro 
-		href="/org.eclipse.epf.help.doc/html/createamethodplugin.html">
-		<description>Because the plug-ins shipped with the method library are locked and read-only, all your changes, additions, and extensions to existing method content and processes have to be placed in your own method plug-ins. However, you can use various capabilities to logically merge your plug-in contents into other plug-ins allowing you, as a result, to publish extended methods and processes that seamlessly incorporate your method elements. To create your own method plug-ins follow these steps.</description>
-	</intro>
-
-	<item
-		title="Use the Method Plug-in Wizard"
-		skip="false">
-		<description>Create a new method plug-in using the "New Method Plug-in" wizard. To open the wizard select File -&gt; New -&gt; Method Plug-in. Specify at least the name for your new method plug-in and select the check box for any other method plug-ins which content you wish to extend or reuse.</description>
-	</item>
-
-	<item
-		title="Open the Method Plugin Editor"
-		skip="false">
-		<description>After you have created the plug-in, you can make changes to its specifications in the method plug-in editor. In the library view, double click the method plug-in that you just created to open the editor.</description>
-	</item>
-
-	<item
-		title="Specify Version Information"
-		skip="false">
-		<description>In addition to the information already specified in the method plug-in wizard, you can provide information about the current version of the plug-in.</description>
-	</item>
-
-	<item
-		title="Select the Default Copyright Definition File"
-		skip="false">
-		<description>Use the "Select" button to specify which page of the type "Supporting Material" contains the copyright information for elements of this plug-in.  The contents of this file will be appended to every page that gets published based on an element from this plug-in.  Note, that individual method elements can override this standard selection with the copyright field in their own editors.</description>
-	</item>
-	<item title="Done"><description></description></item>
-</cheatsheet>
-
diff --git a/plugins/org.eclipse.epf.help.doc/cheatsheets/navigatemethodcontent.xml b/plugins/org.eclipse.epf.help.doc/cheatsheets/navigatemethodcontent.xml
deleted file mode 100755
index 4fad221..0000000
--- a/plugins/org.eclipse.epf.help.doc/cheatsheets/navigatemethodcontent.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    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
--->
-
-<cheatsheet title="Navigate Method Content">
-	<intro href="/org.eclipse.epf.help.doc/html/userinterfaceoverview.html">
-		<description>There are two ways to navigate method content: by using the physical library structure in the library view or by using the logical categorization of method content in the configuration view.  This cheat sheet walks you through both scenarios.</description>
-	</intro>
-	<item href="/org.eclipse.epf.help.doc/html/authoringperspective.html" title="Switch to Authoring Perspective" skip="true">
-		<description>You can work with two perspectives: the authoring perspective and the browsing perspective. A perspective defines a set of views and functions to be available for specific tasks. The authoring perspective provides views and functions to navigate and author method content and processes, while the browsing perspective allows you to preview and browse a method configuration. This cheat sheet refers to the authoring perspective.<br/><br/>Click the "Open Perspective" button or the Window-&gt;Open Perspective menu and then select "Authoring" to switch to the authoring perspective.</description>
-	</item>
-	<item href="/org.eclipse.epf.help.doc/html/libraryview.html" title="Open the Library View" skip="true">
-		<description>If you do not see a tree-browser view labeled "Library" in your authoring perspective click the Window-&gt;Reset Perspective menu.</description>
-	</item>
-	<item href="/org.eclipse.epf.help.doc/html/methodcontentpackage.html" title="Drill into Method Content Packages" skip="false">
-		<description>Within the library view tree-browser, expand a plug-in and drill into the packages "Method Content"-&gt;"Content Packages" and its sub-packages. Examine the contents.
-		</description>
-	</item>
-	<item title="Review Content Packages" skip="false">
-		<description>Every content package contains different types of method content elements which are sorted into different categories. The categories are roles, tasks, work products, and guidance.</description>
-	</item>
-	<item href="/org.eclipse.epf.help.doc/html/methodcontent.html" title="Open a Method Content Element Editor" skip="false">
-		<description>Select a method element, such as a task, and double click to open its editor.<br/><br/>The editor provides tabs and forms to organize textual description for the element.  Select the different tabs and the bottom of every editor and review the different forms displayed.</description>
-	</item>
-	<item href="/org.eclipse.epf.help.doc/html/methodcontentcategories.html" title="Examine Categories" skip="false">
-		<description>Within the library view tree-browser, expand the packages to the same level as content packages until you find the “Custom Categories� and “Standard Categories� packages. Drill into these packages and then examine their contents.<br/><br/>Every category listed here is a content element as well.  Open the description of a category such as a discipline or a domain by double clicking the category which opens the category editor.</description>
-	</item>
-	<item href="/org.eclipse.epf.help.doc/html/configurationview.html" title="Select a Configuration for the Configuration View" skip="true">
-		<description>Because the method library can contain large numbers of elements, you may want to limit your work to a user-defined subset of the library called method configuration. A configuration defines a working set of packages within the method library that helps you limit your view to a subset of all elements. The elements that are part of a selected configuration are displayed in the configuration view.<br/><br/>The configuration view displays categorized method elements of the currently selected configuration.  This is the configuration that has been selected in the unlabeled combo box in the tool bar.  Use this combo box to select a configuration.<br/><br/>After selecting a configuration the configuration view is (re-)populated with new trees showing elements from that configuration.</description>
-	</item>
-	<item title="Drill into Categories in Configuration View" skip="false">
-		<description>Drill into the configuration view's categories folders and examine the elements listed there.<br/><br/>As in the library view you can open elements listed here via a double-click. However, the configuration view computes so-called contributions and replacements of method content elements (see "Variability Overview" in the online help for more details). If an element has contributing elements then a double click will show you a dialog with all the elements participating in the contribution.  Select one element to open its editor.</description>
-	</item>
-	<item title="Done">
-		<description/>
-	</item>
-</cheatsheet>
diff --git a/plugins/org.eclipse.epf.help.doc/cheatsheets/replaceexistingmethodelements.xml b/plugins/org.eclipse.epf.help.doc/cheatsheets/replaceexistingmethodelements.xml
deleted file mode 100755
index 275fb62..0000000
--- a/plugins/org.eclipse.epf.help.doc/cheatsheets/replaceexistingmethodelements.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
-    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
--->
-
-<cheatsheet title="Replace Existing Method Elements (Roles, Tasks, Work Products, or Guidance)">
-
-	<intro 
-		href="/org.eclipse.epf.help.doc/html/variability.html">
-		<description>You can tailor existing method elements, such as an element that is defined in a locked plug-in, without directly modifying it, but by replacing it with one of your own elements defined in your own method plug-in. This cheat sheet walks you through the steps of creating such a replacement.  See the online help section "Variability Overview" for an introduction on variability and replacements.<br/><br/>Replacements can also be applied within the same method plug-in between method content elements from different content packages.  This is useful in the case where you want to provide alternative content that can be selected using different method configurations.</description>
-	</intro>
-
-	<item
-		title="Plan your Replacement"
-		skip="false">
-		<description>When defining the replacement of an existing method element you need to know where the existing element that you want to replace is physically located within its method plug-in. You also need to decide were to create and place the replacing element. Typically you create the replacing element within a specific content package in your own method plug-in. Finally, you need to know what the replacing element's content is, because all of the replaced element’s content (i.e. its text attributes as well as its relationships that point to other elements) will be removed.</description>
-	</item>
-
-	<item
-		href="/org.eclipse.epf.help.doc/html/createmethodcontent.html"
-		title="Create a Replacing Content Element"
-		skip="false">
-		<description>Create a method content element in your method plug-in that you intend to be the replacing content element. Remember, you must provide this element with its own content because all attributes of the replaced element will be replaced with empty fields, if you do not provide new descriptions.<br/><br/>Go to cheat sheet "Add a new Method Content such as Roles, Tasks, Work Products, or Guidance" to be guided through these steps.</description>
-	</item>
-
-	<item
-		href="/org.eclipse.epf.help.doc/html/replace.html" 
-		title="Specify the Replacement Relationship"
-		skip="false">
-		<description>Go to the "Content Variability" section of the elements description tab. Select "Replaces" from the combo box. Click the "Select..." button of the base role field and select the element that your new element replaces.</description>
-	</item>
-
-	<item
-		href="/org.eclipse.epf.help.doc/html/browseandpreviewmethodcontent.html" 
-		title="Review your Replaced Element"
-		skip="false">
-		<description>To review your replaced element, select a method configuration in the current configuration combo box in the tool bar that contains the method plug-ins and content packages of both elements participating in your replacement. In other words, the configuration must contain the replacing element as well as the replaced base element.<br/><br/>Switch to the Browsing perspective. Find and select the replacing element (i.e. your new element) in the configuration view. The content window displays the results of the replacement. Review an element that referred to the replaced element. In other words, if you replaced an artifact, find a task that used this artifact as an input or output. Make sure this element now refers to the replacing element.</description>
-	</item>
-	<item title="Done"><description></description></item>
-</cheatsheet>
-
diff --git a/plugins/org.eclipse.epf.help.doc/cheatsheets/tailorexistingmethodelements.xml b/plugins/org.eclipse.epf.help.doc/cheatsheets/tailorexistingmethodelements.xml
deleted file mode 100755
index 0af7260..0000000
--- a/plugins/org.eclipse.epf.help.doc/cheatsheets/tailorexistingmethodelements.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
-    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
--->
-
-<cheatsheet title="Tailor Existing Method Elements (Roles, Tasks, Work Products, or Guidance) Using Contribution">
-
-	<intro 
-		href="/org.eclipse.epf.help.doc/html/variability.html">
-		<description>You can tailor existing method elements, such as an element that is defined in a locked method plug-in, without directly modifying it, but by contributing new content or relationships to it from an element defined in one of your own method plug-ins. This cheat sheet walks you through the steps of creating such a contribution.  See the online help section "Variability Overview" for an introduction on variability and contributions.<br/><br/>Contributions can also be applied within the same method plug-in between elements from different content packages. This is useful in the event you want to build up your content elements in layers of complexity by gradually adding more and more content via contribution.  The respective levels of contribution can then be selected within method configurations that allow you to include or exclude the content packages with the contributing elements.</description>
-	</intro>
-
-	<item
-		title="Plan your Contribution"
-		skip="false">
-		<description>Before you can create a contribution to an existing method content element you need to know where this element is located within its method plug-in. You also need to decide where to create and place the contributing element. Typically, you create this element in your own method plug-in, in a specific content package. Finally, you need to know what it is you actually want to contribute. This could be additional text for the form fields, new relationships to other elements, or new categorizations. (See the online help for more details on these fields and relationships.)</description>
-	</item>
-
-	<item
-		href="/org.eclipse.epf.help.doc/html/createmethodcontent.html"
-		title="Create a Contributing Content Element"
-		skip="false">
-		<description>Create a content element in your method plug-in that provides contributions to the content element that you wish to tailor.  Go to the cheat sheet "Add a new Method Content such as Roles, Tasks, Work Products, or Guidance" to be guided through these steps.<br/><br/>Add your contributions such as revised text for form fields or additional relationships to your method content element.</description>
-	</item>
-
-	<item
-		href="/org.eclipse.epf.help.doc/html/contributes.html" 
-		title="Specify the Contribution Relationship"
-		skip="false">
-		<description>Go to the "Content Variability" section of the elements description tab. Select "Contributes" from the combo box. Click the "Select..." button of the base role field and then select the element that you want your new element to contribute to.</description>
-	</item>
-
-	<item
-		href="/org.eclipse.epf.help.doc/html/browseandpreviewmethodcontent.html" 
-		title="Review your Contributions"
-		skip="false">
-		<description>To review your contributions select (or create first and then select) a method configuration in the current configuration combo box in the tool bar that contains the plug-ins and packages of both of the elements participating in your contribution.  In other words the configuration has to contain the contributing element as well as the base element.<br/><br/>Switch to the "Browsing Perspective". Find and select the base element (i.e. the element you contributed to) in the configuration view. The content window displays the results of the contribution.</description>
-	</item>	
-	<item title="Done"><description></description></item>
-</cheatsheet>
-
diff --git a/plugins/org.eclipse.epf.help.doc/concepts.xml b/plugins/org.eclipse.epf.help.doc/concepts.xml
deleted file mode 100755
index 67d2fdd..0000000
--- a/plugins/org.eclipse.epf.help.doc/concepts.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Concepts" link_to="main.xml#concepts_id">
-   <topic label="Overview of EPF Composer" href="html/overview/product_overview.html"/>
-   <topic label="Method content authoring overview" href="html/overview/method_authoring_overview.html"/>
-   <topic label="Process authoring overview" href="html/overview/process_authoring_overview.html"/>
-   <topic label="Method configurations overview" href="html/overview/configurations_overview.html"/>
-   <topic label="Configuration publishing overview" href="html/overview/publishing_overview.html"/>
-   <topic label="User roles and role specific tasks" href="html/help/user_roles.html"/>
-   <topic label="Method content" href="html/help/method_content.html"/>
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/contexts_Search.xml b/plugins/org.eclipse.epf.help.doc/contexts_Search.xml
deleted file mode 100755
index 447b807..0000000
--- a/plugins/org.eclipse.epf.help.doc/contexts_Search.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- 
-    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
--->
-<contexts>
-	<context  id="open_search_dialog_action_context" >
-      	<description></description>
- 		<topic label="Search for method content" href="html/help/searchformethod_content.html"/>
-   	</context>
-
-   	<context  id="file_search_action_context" >
-     	 <description></description>
- 		<topic label="Search for method content" href="html/help/searchformethod_content.html"/>
-   	</context>
-   	
-</contexts>
diff --git a/plugins/org.eclipse.epf.help.doc/contexts_authoring_ui.xml b/plugins/org.eclipse.epf.help.doc/contexts_authoring_ui.xml
deleted file mode 100755
index d39f10e..0000000
--- a/plugins/org.eclipse.epf.help.doc/contexts_authoring_ui.xml
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<contexts> 
-	<context  id="file_new_library_context"> 
-		<description></description> 
-        <topic href="html/help/library_overview.html"  label="Method library overview"/>  
-	</context> 
-	
-	<context  id="file_new_plugin_context"> 
-		<description></description> 
-        <topic href="html/help/create_method_plugin.html"  label="Create a method plug-in"/> 
-	</context> 
-	
-	<context  id="file_new_configuration_context"> 
-		<description></description> 
-        <topic href="html/help/methodconfigurations.html"  label="Method configurations overview"/> 
-	</context> 
-	
-	<context  id="file_open_library_context"> 
-		<description></description> 
-        <topic href="html/help/library_overview.html"  label="Method library overview"/> 
-	</context> 
-	
-	<context  id="file_open_configuration_context"> 
-		<description></description> 
-        <topic href="html/help/methodconfigurations.html"  label="Method configurations overview"/> 
-	</context> 
-	
-	<context  id="library_navigator_view_context"> 
-		<description> </description> 
-        <topic href="html/help/library_view.html"  label="Library view"/> 
-        <topic href="html/help/authoring_perspective.html"  label="Authoring perspective"/> 
-	</context> 
-
-	<context  id="configuration_view_context"> 
-		<description></description> 
-        <topic href="html/help/configuration_view.html"  label="Configuration view"/> 
-        <topic href="html/help/browsingperspective.html"  label="Browsing perspective"/> 
-	</context> 
-	
-			<!-- beginning of the library navigator node sensitive F1 context helps -->
-			<context  id="library_view_method_plugin_context"> 
-				<description> This is a sample F1 help text for library view method plug-in node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-				<context  id="library_view_content_package_context"> 
-				<description> This is a sample F1 help text for library view ContentPackage node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-				<context  id="library_view_task_context"> 
-				<description> This is a sample F1 help text for library view method Task node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-				<context  id="library_view_work_product_context"> 
-				<description> This is a sample F1 help text for library view WorkProduct node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-				<context  id="library_view_guidance_context"> 
-				<description> This is a sample F1 help text for library view Guidance node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-				<context  id="library_view_discipline_context"> 
-				<description> This is a sample F1 help text for library view Discipline node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-				<context  id="library_view_discipline_grouping_context"> 
-				<description> This is a sample F1 help text for library view DisciplineGrouping node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-				<context  id="library_view_domain_context"> 
-				<description> This is a sample F1 help text for library view Domain node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-				<context  id="library_view_role_context"> 
-				<description> This is a sample F1 help text for library view Role node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-				<context  id="library_view_work_product_type_context"> 
-				<description> This is a sample F1 help text for library view WorkProductType node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-			<context  id="library_view_role_set_context"> 
-				<description> This is a sample F1 help text for library view RoleSet node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-			
-			<context  id="library_view_tool_context"> 
-				<description> This is a sample F1 help text for library view method Tool node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-			<context  id="library_view_role_set_grouping_context"> 
-				<description> This is a sample F1 help text for library view RoleSetGrouping node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-			<context  id="library_view_custom_category_context"> 
-				<description> This is a sample F1 help text for library view CustomCategory node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-			<context  id="library_view_process_component_context"> 
-				<description> This is a sample F1 help text for library view ProcessComponent node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-				<context  id="library_view_process_context"> 
-				<description> This is a sample F1 help text for library view Process node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-				<context  id="library_view_method_configuration_context"> 
-				<description> This is a sample F1 help text for library view MethodConfiguration node.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			<!-- end of the library navigator node sensitive F1 context helps -->
-	
-	
-	<!-- form editor section context help -->
-	
-	<context  id="plugin_editor_description_all_context"> 
-		<description> </description> 
-        <topic href="html/help/create_method_plugin.html"  label="Create a method plug-in"/> 
-        <topic href="html/help/methodplugin.html"  label="Method plug-in"/> 
-	</context> 
-	
-	<context  id="configuration_editor_all_context"> 
-		<description></description> 
-        <topic href="html/help/create_method_configuration.html"  label="Create a method configuration"/> 
-        <topic href="html/help/methodconfigurations.html"  label="Method configurations overview"/> 
-	</context> 
-	
-	<context  id="content_package_editor_all_context"> 
-		<description></description> 
-        <topic href="html/help/create_contentpackage.html"  label="Creating a content package"/> 
-        <topic href="html/help/methodcontentpackage.html"  label="Method content package"/> 
-	</context> 
-	
-	
-	<context  id="editor_role_context_help_ID"> 
-		<description></description> 
-        <topic href="html/help/create_role.html"  label="Create a role"/> 
-	</context> 
-
-	<context  id="editor_task_context_help_ID"> 
-		<description></description> 
-        <topic href="html/help/create_task.html"  label="Create a task"/>  
-	</context> 
-
-	<context  id="editor_work_product_context_help_ID"> 
-		<description></description> 
-        <topic href="html/help/create_workproduct.html"  label="Create work product"/> 
-	</context> 
-
-	<context  id="editor_guidance_context_help_ID"> 
-		<description></description> 
-        <topic href="html/help/create_guidance.html"  label="Creating guidance"/> 
-	</context> 
-
-	<context  id="editor_discipline_context_help_ID"> 
-		<description></description> 
-        <topic href="html/help/content_categories.html"  label="Method content categories"/> 
-	</context> 
-
-	<context  id="editor_discipline_grouping_context_help_ID"> 
-		<description></description> 
-        <topic href="html/help/content_categories.html"  label="Method content categories"/> 
-	</context> 
-
-	<context  id="editor_domain_context_help_ID"> 
-		<description></description> 
-        <topic href="html/help/content_categories.html"  label="Method content categories"/> 
-	</context> 
-
-	<context  id="editor_work_product_type_context_help_ID"> 
-		<description> </description> 
-        <topic href="html/help/content_categories.html"  label="Method content categories"/> 
-	</context> 
-
-	<context  id="editor_role_set_context_help_ID"> 
-		<description></description> 
-        <topic href="html/help/content_categories.html"  label="Method content categories"/> 
-	</context> 
-
-	<context  id="editor_rolse_set_grouping_context_help_ID"> 
-		<description></description> 
-        <topic href="html/help/content_categories.html"  label="Method content categories"/> 
-	</context> 
-
-	<context  id="editor_tool_context_help_ID"> 
-		<description></description> 
-        <topic href="html/help/content_categories.html"  label="Method content categories"/> 
-	</context> 
-
-	<context  id="editor_custom_category_context_help_ID"> 
-		<description></description> 
-        <topic href="html/help/content_categories.html"  label="Method content categories"/> 
-	</context> 
-	
-			<!-- beginning of section based F1 context help -->
-			<context  id="form_editor_description_general_context"> 
-				<description> This is a sample F1 help text for form_editor_description_general_context.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-				<context  id="form_editor_description_detail_context"> 
-				<description> This is a sample F1 help text for form_editor_description_detail_context.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-				<context  id="form_editor_description_notation_context"> 
-				<description> This is a sample F1 help text for form_editor_description_notation_context.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-				<context  id="form_editor_description_tailoring_context"> 
-				<description> This is a sample F1 help text for form_editor_description_tailoring_context.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-				<context  id="form_editor_description_version_context"> 
-				<description> This is a sample F1 help text for form_editor_description_version_context.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-			<context  id="form_editor_description_element_context"> 
-				<description> This is a sample F1 help text for form_editor_description_element_context.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			
-			<context  id="form_editor_description_icon_context"> 
-				<description> This is a sample F1 help text for form_editor_description_icon_context.</description> 
-		        <topic href="html/help/maintopic.html"  label="HelpTopic1"/> 
-		        <topic href="html/help/subtopic2.html"  label="HelpTopic2"/> 
-			</context> 
-			<!-- end of section based F1 context help -->
-	
-	<context  id="editor_cp_description_context_help_ID"> 
-		<description></description> 
-		<topic href="html/help/capabilitypattern.html"  label="Capability pattern"/> 
-        <topic href="html/help/create_capability_pattern.html"  label="Create a reusable capability pattern"/> 
-	</context> 
-	
-	<context  id="editor_dp_description_context_help_ID"> 
-		<description></description> 
-		<topic href="html/help/delivery_process.html"  label="Delivery process"/> 
-        <topic href="html/help/create_delivery_process.html"  label="Create a delivery process"/> 
-	</context> 
-	
-	<context  id="form_editor_process_wbs_context"> 
-		<description></description> 
-        <topic href="html/help/develop_wbs.html"  label="Develop a work breakdown structure"/> 
-	</context> 
-	
-	<context  id="form_editor_process_obs_context"> 
-		<description></description> 
-        <topic href="html/help/develop_team_structure.html"  label="Develop a team allocation structure"/> 
-	</context> 
-	
-	<context  id="form_editor_process_pbs_context"> 
-		<description></description> 
-        <topic href="html/help/develop_workproduct_structure.html"  label="Develop a work product usage structure"/> 
-	</context> 
-
-	
-	<context  id="configuration_publish_wizard_all_pages_context"> 
-		<description></description> 
-        <topic href="html/help/publishingoverview.html"  label="Publishing overview"/> 
-	</context> 
-	
-	<context  id="rich_text_editor_context_ID"> 
-		<description></description> 
-        <topic href="html/help/richtexteditor.html"  label="Rich text editor"/> 
-        <topic href="html/help/add_hyperlink.html"  label="Adding a reference or hyperlink"/> 
-	</context> 
-	
-</contexts> 
diff --git a/plugins/org.eclipse.epf.help.doc/createreusablemethodcontent.xml b/plugins/org.eclipse.epf.help.doc/createreusablemethodcontent.xml
deleted file mode 100755
index f8eefb4..0000000
--- a/plugins/org.eclipse.epf.help.doc/createreusablemethodcontent.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Create Reusable Method Content" link_to="main.xml#createreusablemethodcontent_id">
-  <topic label="Method content authoring overview" href="html/help/methodauthoringoverview.html"/>
-   <topic label="Method content" href="html/help/method_content.html"/>
-   <topic label="Create method content" href="html/help/create_method_content.html">
-      <topic label="Create a role" href="html/help/create_role.html"/>
-      <topic label="Create a task" href="html/help/create_task.html"/>
-      <topic label="Create a work product" href="html/help/create_workproduct.html"/>
-      <topic label="Create guidance" href="html/help/create_guidance.html"/>
-      <topic label="Variability" href="html/help/variability.html">
-         <topic label="Contributes" href="html/help/variability_contributes.html"/>
-         <topic label="Extends" href="html/help/variability_extends.html"/>
-         <topic label="Replaces" href="html/help/variability_replace.html"/>
-         <topic label="Variability associations" href="html/help/variability_associations.html"/>
-      </topic>
-   </topic>
-   <topic label="Browse and preview method content" href="html/help/browse_content.html"/>
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/creatingprocesses.xml b/plugins/org.eclipse.epf.help.doc/creatingprocesses.xml
deleted file mode 100755
index 98fc7b3..0000000
--- a/plugins/org.eclipse.epf.help.doc/creatingprocesses.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Creating Processes" link_to="main.xml#creatingprocesses_id">
-      <topic label="Process authoring overview" href="html/help/processauthoringoverview.html">
-      <topic label="Process" href="html/help/process.html"/>
-   </topic>
-   <topic label="Create a reusable capability pattern" href="html/help/create_capability_pattern.html">
-      <topic label="Capability pattern" href="html/help/capabilitypattern.html"/>
-   </topic>
-   <topic label="Create a delivery process" href="html/help/create_delivery_process.html">
-      <topic label="Delivery process" href="html/help/delivery_process.html"/>
-   </topic>
-   <topic label="Develop a work breakdown structure" href="html/help/develop_wbs.html"/>
-   <topic label="Develop a team allocation structure" href="html/help/develop_team_structure.html"/>
-   <topic label="Develop a work product usage structure" href="html/help/develop_workproduct_structure.html"/>
-   <topic label="Apply a capability pattern" href="html/help/apply_capabilitypattern.html"/>
-   <topic label="Process element properties view" href="html/help/properties_view.html"/>
-   <topic label="Working with process diagrams" href="html/help/process_diagrams.html">
-      <topic label="Working with activity diagrams" href="html/help/activity_diagrams.html"/>
-      <topic label="Working with activity detail diagrams" href="html/help/activity_detail_diagrams.html"/>
-   </topic>
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/doc.zip b/plugins/org.eclipse.epf.help.doc/doc.zip
deleted file mode 100755
index d3c9a76..0000000
--- a/plugins/org.eclipse.epf.help.doc/doc.zip
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/gettingstarted.xml b/plugins/org.eclipse.epf.help.doc/gettingstarted.xml
deleted file mode 100755
index 6ac0fea..0000000
--- a/plugins/org.eclipse.epf.help.doc/gettingstarted.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Getting Started" link_to="main.xml#gettingstarted_id">
-  <topic label="Standard method library overview" href="html/help/library_overview.html"/>
-   <topic label="Tool interface" href="html/help/userinterface_overview.html">
-      <topic label="Authoring perspective" href="html/help/authoring_perspective.html"/>
-      <topic label="Browsing perspective" href="html/help/browsing_perspective.html"/>
-      <topic label="Configuration View" href="html/help/configuration_view.html"/>
-      <topic label="Library view" href="html/help/library_view.html"/>
-      <topic label="Browse and preview method content" href="html/help/browse_content.html"/>
-      <topic label="Search for method content" href="html/help/search_content.html"/>
-   </topic>
-      <topic label="Create a method plug-in" href="html/help/create_method_plugin.html"/>
-      <topic label="Create a content package" href="html/help/create_contentpackage.html"/>
-      <topic label="Create a method configuration" href="html/help/create_method_configuration.html"/>
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/glossary.xml b/plugins/org.eclipse.epf.help.doc/glossary.xml
deleted file mode 100755
index 63e2243..0000000
--- a/plugins/org.eclipse.epf.help.doc/glossary.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Glossary" link_to="main.xml#glossary_id">
-  <topic label="Activity" href="html/help/glossary/activity.html"/>
-  <topic label="Activity variability" href="html/help/glossary/activity_variability.html"/>
-   <topic label="Artifact" href="html/help/glossary/artifact.html"/>
-   <topic label="Capability pattern" href="html/help/glossary/capabilitypattern.html"/>
-   <topic label="Checklist" href="html/help/glossary/checklist.html"/>
-   <topic label="Concept" href="html/help/glossary/concept.html"/>
-   <topic label="Contributes" href="html/help/variability_contributes.html"/>
-   <topic label="Deliverable" href="html/help/glossary/deliverable.html"/>
-   <topic label="Deep copy" href="html/help/glossary/deep_copy.html"/>
-   <topic label="Discipline" href="html/help/glossary/discipline.html"/>
-   <topic label="Domain" href="html/help/glossary/domain.html"/>
-   <topic label="Estimating guideline" href="html/help/glossary/estimating_guideline.html"/>
-   <topic label="Example" href="html/help/glossary/example.html"/>
-   <topic label="Extends" href="html/help/variability_extends.html"/>
-   <topic label="Guidance" href="html/help/glossary/guidance.html"/>
-   <topic label="Guideline" href="html/help/glossary/guideline.html"/>
-   <topic label="Iteration" href="html/help/glossary/iteration.html"/>
-   <topic label="Method configuration" href="html/help/glossary/methodconfigurations.html"/>
-   <topic label="Method content" href="html/help/glossary/method_content.html"/>
-   <topic label="Method content Package" href="html/help/glossary/methodcontentpackage.html"/>
-   <topic label="Method plug-in" href="html/help/glossary/methodplugin.html"/>
-   <topic label="Milestone" href="html/help/glossary/milestone.html"/>
-   <topic label="Outcome" href="html/help/glossary/outcome.html"/>
-   <topic label="Perspectives" href="html/help/glossary/perspectives.html"/>
-   <topic label="Phase" href="html/help/glossary/phase.html"/>
-   <topic label="Practice" href="html/help/glossary/practice.html"/>
-   <topic label="Preview" href="html/help/glossary/preview.html"/>
-   <topic label="Process" href="html/help/glossary/process.html"/>
-   <topic label="Replaces" href="html/help/variability_replace.html"/>
-   <topic label="Report" href="html/help/glossary/report.html"/>
-   <topic label="Reusable asset" href="html/help/glossary/reusableasset.html"/>
-   <topic label="Roadmap" href="html/help/glossary/roadmap.html"/>
-   <topic label="Role" href="html/help/glossary/role.html"/>
-   <topic label="Role set" href="html/help/glossary/roleset.html"/>
-   <topic label="Role set grouping" href="html/help/glossary/rolesetgrouping.html"/>
-   <topic label="Step" href="html/help/glossary/step.html"/>
-   <topic label="Supporting material" href="html/help/glossary/supportingmaterial.html"/>
-   <topic label="Synchronization" href="html/help/glossary/synchronization.html"/>
-   <topic label="Task" href="html/help/glossary/task.html"/>
-   <topic label="Template" href="html/help/glossary/template.html"/>
-   <topic label="Term definition" href="html/help/glossary/termdefinition.html"/>
-   <topic label="Tool mentor" href="html/help/glossary/toolmentor.html"/>
-   <topic label="Variability" href="html/help/variability.html"/>
-   <topic label="Whitepaper" href="html/help/glossary/whitepaper.html"/>
-   <topic label="Work product" href="html/help/glossary/workproduct.html"/>
-   <topic label="Work product descriptors" href="html/help/glossary/workproductdescriptors.html"/>
-   <topic label="Work product kind" href="html/help/glossary/workproductkind.html"/>
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/html/AuthorPersp.JPG b/plugins/org.eclipse.epf.help.doc/html/AuthorPersp.JPG
deleted file mode 100755
index fa4e790..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/AuthorPersp.JPG
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/aboutepfcomposer.html b/plugins/org.eclipse.epf.help.doc/html/aboutepfcomposer.html
deleted file mode 100755
index 8ca5623..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/aboutepfcomposer.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="About Eclipse Process Framework Composer" />
-<meta name="DC.Relation" scheme="URI" content="methodauthoringoverview.html#methodauthoringoverview" />
-<meta name="DC.Relation" scheme="URI" content="processauthoringoverview.html#processauthoringoverview" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="aboutepfcomposer" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>About Eclipse Process Framework Composer</title>
-</head>
-<body id="aboutepfcomposer"><a name="aboutepfcomposer"><!-- --></a>
-
-<h1 class="topictitle1">About Eclipse Process Framework Composer</h1>
-<div><p>Welcome to Eclipse Process Framework Composer (EPF Composer). EPF Composer is a tool platform that
-enables process engineers and managers to implement, deploy, and maintain
-processes for organizations or individual projects. Typically, two key problems
-need to be addressed to successfully deploy new processes.</p>
-<p>First, development teams need to be educated on the methods applicable
-to the roles that they are responsible for. Software developers typically
-need to learn how to do analysis and design, testers need to learn how to
-test implementations against requirements, managers need to learn how to manage
-the project scope and change, and so on. Some organizations assume that developers
-implicitly know how to do such work without documenting their methods, but
-many organizations want to establish common and regulated practices, to drive
-specific improvement objectives, and to meet compliance standards. </p>
-<p>Second, development teams need to understand how to apply these methods
-throughout a development lifecycle. That is, they need to define or select
-a development process. For example, requirements management methods have to
-be applied differently in early phases of a project where the focus is on
-elicitation of stakeholder needs and requirements and scoping a vision, than
-in later phases where the focus is on managing requirements updates and changes
-and performing impact analysis of these requirements changes. Teams also need
-clear understanding of how the different tasks of the methods relate to each
-other, for example, how the change management method impacts the requirements
-management method as well as regression testing method throughout the lifecycle.
-Even self-organizing teams need to define a process that gives at minimum
-some guidance on how the development will be scoped throughout the lifecycle,
-when milestones will be achieved and verified, and so on.  </p>
-<div class="p">To that end, EPF Composer has two main purposes:<ul><li>To provide a knowledge base of intellectual capital which you can browse,
-manage and deploy. This content can include externally developed content,
-and, more importantly, can include your own content including of whitepapers,
-guidelines, templates, principles, best practices, internal procedures and
-regulations, training material, and any other general descriptions of your
-methods. This knowledge base can used for reference and education. It also
-forms the basis for developing processes (the second purpose). EPF Composer is designed
-to be a content management system that provides a common management structure
-and look and feel for all of your content, rather than being a document management
-system in which you would store and access hard to maintain legacy documents
-all in their own shapes and formats. All content managed in EPF Composer can be published
-to html and deployed to Web servers for distributed usage. </li>
-<li>To provide process engineering capabilities by supporting process engineers
-and project managers in selecting, tailoring, and rapidly assembling processes
-for their concrete development projects. EPF Composer provides catalogs of pre-defined
-processes for typical project situations that can be adapted to individual
-needs. It also provides process building blocks, called capability patterns,
-that represent best development practices for specific disciplines, technologies,
-or management styles. These building blocks form a toolkit for quick assembly
-of processes based on project-specific needs. EPF Composer also allows you to set up
-your own organization-specific capability pattern libraries. Finally, the
-processes created with EPF Composer can be published and deployed as Web sites. </li>
-</ul>
-</div>
-<div class="p"><strong>Eclipse Process Framework Composer Key Concepts</strong><ul><li>Provides completely redesigned tools for authoring, configuring, viewing,
-and publishing development processes. </li>
-<li>Provides just-in-time generation of publication previews in dedicated
-browsing perspective that allows rapid configuration switching. </li>
-<li>Manages method content using simple form-based user interfaces. Therefore,
-UML modeling skills are no longer required. </li>
-<li>Provides intuitive rich text editors for creating illustrative content
-descriptions. Editors allow use of styles, images, tables, hyperlinks, and
-direct HTML editing.</li>
-<li>Allows creating processes with breakdown structure editors and workflow
-diagrams through use of multi-presentation process editors. Breakdown structure
-editor supports different process views: work-breakdown view, work product
-usage view, and team allocation view. EPF Composer automatically synchronizes all presentations
-with process changes. </li>
-<li>Provides support for many alternative lifecycle
-models. For example, waterfall, incremental, or iterative models can be created
-with the same overlapping method content. </li>
-<li>Improved reuse and extensibility capabilities. The plug-in mechanisms
-from past versions have been extended to support extensions for breakdown
-structures.</li>
-<li>Supports reusable dynamically-linked process patterns of best practices
-for rapid process assembly via drag-and-drop. </li>
-</ul>
-</div>
-<p><strong>Key Terminology and Concepts</strong></p>
-<p>To effectively work with EPF Composer, you need to understand a few
-concepts that are used to organize the content. The pages Method Content Authoring
-Overview and Process Authoring Overview contain more detail and concrete examples
-of how to work in the tool. This page provides you with a general overview
-of these concepts. </p>
-<p>The most fundamental principle in EPF Composer is the separation of reusable core
-method content from its application in processes. This directly relates back
-to the two purposes of EPF Composer described in the first section. Almost all of EPF Composer's
-concepts are categorized along this separation. Method content describes what
-is to be produced, the necessary skills required and the step-by-step explanations
-describing how specific development goals are achieved. These method content
-descriptions are independent of a development lifecycle. Processes describe
-the development lifecycle. Processes take the method content elements and
-relate them into semi-ordered sequences that are customized to specific types
-of projects. </p>
-<p><img src="uma_hump.gif" alt="" /></p>
-<p>The figure above shows how this separation is depicted in Basic Unified
-Process. Method content, describing how development work is being performed,
-is categorized by disciplines along the y-axis of the diagram. The work described
-in a process is seen along the x-axis representing the timeline. This is the
-lifecycle of a development project. It expresses when what work will be performed.
-The graph in the illustration represents an estimated workload for each discipline.
-As you see, for example, one never stops working on requirements in OpenUP/Basic, but
-there are certainly peak times in which most of the requirements elicitation
-and description work is performed. There are also times at which a downward
-trend needs to be observed where fewer and fewer requirements changes have
-to be processed to bring the project to a close. This avoids what is referred
-to as feature creep in which requirements work remains constant or even increases.
-Hence, a lifecycle (process) expresses the variances of work performed in
-the various disciplines (method content). </p>
-<p><img src="meth_vs_proc.gif" alt="" /></p>
-<p>The picture above provides a summary of the key elements used in EPF Composer and
-how they relate to method content or process. As you see, method content is
-primarily expressed using work products, roles, tasks, and guidance. Guidance,
-such as checklists, examples, or roadmaps, can also be defined to provide
-exemplary walkthroughs of a process. On the right-hand side of the diagram,
-you see the elements used to represent processes in EPF Composer. The main element
-is the activity that can be nested to define breakdown structures as well
-as related to each other to define a flow of work. Activities also contain
-descriptors that reference method content. Activities are used to define processes
-of which EPF Composer support two main kinds: delivery processes and capability patterns.
-Delivery processes represent a complete and integrated process template for
-performing one specific type of project. They describe a complete end-to-end
-project lifecycle and are used as a reference for running projects with similar
-characteristics. Capability patterns are processes that express and communicate
-process knowledge for a key area of interest such as a discipline or a best
-practice. They are also used as building blocks to assemble delivery processes
-or larger capability patterns. This ensures optimal reuse and application
-of their key best practices in process authoring activities in EPF Composer.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="methodauthoringoverview.html#methodauthoringoverview">Method Content Authoring Overview</a></div>
-<div><a href="processauthoringoverview.html#processauthoringoverview">Process Authoring Overview</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/activity.html b/plugins/org.eclipse.epf.help.doc/html/activity.html
deleted file mode 100755
index a852149..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/activity.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Activity" />
-<meta name="DC.Relation" scheme="URI" content="developaworkbreakdownstructure.html#developaworkbreakdownstructure" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="activity" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Activity</title>
-</head>
-<body id="activity"><a name="activity"><!-- --></a>
-
-<h1 class="topictitle1">Activity</h1>
-<div><p>Activities represent the key building blocks for processes. Activities
-represent a grouping of breakdown elements such as other activities, task
-descriptors, role descriptors, <a href="workproductdescriptors.html#workproductdescriptors">work product descriptors</a>, and <a href="milestone.html#milestone">milestones</a>. In addition to breakdown structures, activities
-can also be presented in activity diagrams that graphically show the flow
-of work by showing which activities precede other activities. <a href="phase.html#phase">Phase</a> and <a href="iteration.html#iteration">iteration</a> are
-special types of activities that define specific properties.</p>
-</div>
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="developaworkbreakdownstructure.html#developaworkbreakdownstructure">Develop a Work Breakdown Structure</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/addareferenceorhyperlink.html b/plugins/org.eclipse.epf.help.doc/html/addareferenceorhyperlink.html
deleted file mode 100755
index ad12501..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/addareferenceorhyperlink.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Add a Reference or Hyperlink" />
-<meta name="DC.Relation" scheme="URI" content="richtexteditor.html#richtexteditor" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="addareferenceorhyperlink" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Add a Reference or Hyperlink</title>
-</head>
-<body>
-
-<div class="nested0" id="addareferenceorhyperlink"><a name="addareferenceorhyperlink"><!-- --></a><h1 class="topictitle1">Add a Reference or Hyperlink</h1>
-<div><p>You can add two types of references or hyperlinks to your content text:
-references  to other elements in the method library or references to external
-text with a URL that resides outside the method library.</p>
-<p>Text fields that support hyperlinks have a twisty symbol <img src="twisty symbol1.JPG" alt="" /> next to the text field's label. Click the symbol to expand
-the field into a full text editor. </p>
-<p>To insert a hyperlink to another element in the method library into a text
-field, locate the element you want to create a link to in the library or configuration
-view and then drag it into the appropriate text field, The link to the element
-is added as a method element with type prefix, meaning that the method element
-name is prefixed with the method element type. You can also drag a method
-element into an unexpanded text field that supports hyperlinks with the same
-result.</p>
-<div class="p">You can use the Add Link function in the rich text editor to add links
-that are references to other method elements or links to files or Web pages.
-This gives you further options in how your links are displayed.<ol><li>In the text editor, position the cursor where you want to insert the link
-and then click the <strong>Add Link</strong> button <img src="addlink_co.gif" alt="" /> in the tool bar. The Add Link dialog opens.</li>
-<li>Click the <strong>Browse</strong> button to locate and select the element you wish
-to create a link to. There are several options for creating links to other
-content elements, with each option offering a different way for displaying
-the link's name:<ul><li>Method element: the link displays the element name.</li>
-<li>Method with type prefix: the link displays the element name and type.</li>
-<li>Method element with custom text: the link displays user defined text.
-To define this text manipulate the text in between the &lt;a&gt;&lt;/a&lt;
-tags in the URL text field one you have selected an element using the <strong>Browse</strong> button.</li>
-</ul>
-</li>
-<li>To insert a hyperlink to an external URL, select URL from the Type drop
-down list, type the URL details in the URL field, and then click <strong>OK</strong>.</li>
-<li>To insert a hyperlink to a file, in the Type drop down list, click <strong>File</strong>,
-enter the file name or browse to find the file, and then click <strong>OK</strong>.
-Each time you add a link you can choose to have the target open in the same
-browser window or in a new window.</li>
-</ol>
-</div>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="richtexteditor.html#richtexteditor">Rich Text Editor</a></div>
-</div>
-</div></div>
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/addimg_co.gif b/plugins/org.eclipse.epf.help.doc/html/addimg_co.gif
deleted file mode 100755
index ecbd720..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/addimg_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/addlink_co.gif b/plugins/org.eclipse.epf.help.doc/html/addlink_co.gif
deleted file mode 100755
index 41a386a..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/addlink_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/addordlist_co.gif b/plugins/org.eclipse.epf.help.doc/html/addordlist_co.gif
deleted file mode 100755
index 971d677..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/addordlist_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/addtable_co.gif b/plugins/org.eclipse.epf.help.doc/html/addtable_co.gif
deleted file mode 100755
index 2536dd9..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/addtable_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/addunordlist_co.gif b/plugins/org.eclipse.epf.help.doc/html/addunordlist_co.gif
deleted file mode 100755
index 70749e7..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/addunordlist_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/applyacapabilitypattern.html b/plugins/org.eclipse.epf.help.doc/html/applyacapabilitypattern.html
deleted file mode 100755
index 3c7368a..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/applyacapabilitypattern.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Apply a Capability Pattern" />
-<meta name="DC.Relation" scheme="URI" content="capabilitypattern.html#capabilitypattern" />
-<meta name="DC.Relation" scheme="URI" content="createareusablecapabilitypattern.html#createareusablecapabilitypattern" />
-<meta name="DC.Relation" scheme="URI" content="replace.html#replaces" />
-<meta name="DC.Relation" scheme="URI" content="process.html#process" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="applyacapabilitypattern" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Apply a Capability Pattern</title>
-</head>
-<body id="applyacapabilitypattern"><a name="applyacapabilitypattern"><!-- --></a>
-
-<h1 class="topictitle1">Apply a Capability Pattern</h1>
-<div><div class="p">When developing a process, it is not necessary to develop the process
-from scratch, adding descriptors one by one. You can reuse existing capability
-patterns or even capability pattern parts to individually customize the pattern's
-content to the particular situation for which it is applied. A capability
-pattern must be applied to one specific activity in a process. For more information
-see <a href="capabilitypattern.html#capabilitypattern">Capability Pattern</a>.</div>
-<div class="section">There are two ways to apply a Capability Pattern: Copy and Extend. <p><strong>Copy
-a capability pattern:</strong></p>
-<div class="p">If a capability pattern is copied into a process,
-method content elements in the capability pattern are disconnected from the
-original. The capability pattern elements can be altered, deleted or changed
-as you want in the process editor without affecting the original method content
-elements. Method elements in a copied capability pattern appear in regular
-black font. To copy a capability pattern:<ol><li>In the <a href="configurationview.html#configurationview">Configuration View</a>,
-select a capability pattern or its parts that you want to copy into an activity
-in a process and drag the pattern or parts into the activity to which you
-want it to apply. To select multiple activities in a capability pattern, press
-the CTRL or SHIFT keys while you select. </li>
-<li>In the pop-up box that appears, click <strong>Copy</strong>. The capability pattern
-name is displayed in black and is now available for you to edit.</li>
-</ol>
-</div>
-<div class="p">Or,<ol><li>In the process view, right click an activity, and then click <strong>Apply
-Pattern &gt; Copy</strong>. The Select Dialog For Processes window appears.</li>
-<li>Drill down into the process tree until you locate the capability pattern
-you want to copy.</li>
-<li>Select the pattern, and then click <strong>OK</strong>. The Select Dialog For Processes
-window closes and the capability pattern is applied.</li>
-</ol>
-</div>
-<p><strong>Extend a capability pattern:</strong></p>
-<div class="p">If a capability pattern
-is extended into a process, method content elements in the Capability Pattern
-retain a connection to the original. Extended capability pattern elements
-cannot be deleted or modified and appear as read-only in a green-italic font.
-To extend a capability pattern: <ol><li>In the <a href="configurationview.html#configurationview">Configuration View</a>,
-select a capability pattern or its parts that you want to extend into an activity
-in a process and drag the pattern or parts into the activity to which you
-want it to apply. To select multiple activities in a capability pattern, press
-the CTRL or SHIFT keys while you select.</li>
-<li>In the pop-up box that appears, click <strong>Extend</strong>. The capability pattern
-name is displayed in green, which indicates it is part of a process defined
-elsewhere.</li>
-</ol>
-</div>
-<div class="p">Or, <ol><li>In the process view, right click an activity and then click <strong>Apply
-Pattern &gt; Extend</strong>. The Select Dialog For Processes window appears.</li>
-<li>Drill down into the process tree until you locate the capability pattern
-you want to extend.</li>
-<li>Select the pattern, and then click <strong>OK</strong>. The Select Dialog For Processes
-window closes and the capability pattern is applied.</li>
-</ol>
-</div>
-<div class="p"><div class="note"><span class="notetitle">Note:</span> If you do not want a specific activity or task in the capability
-pattern to be included in your process you can suppress it. The activity or
-task will not appear in the published process or be exported to a project
-planning tool. To suppress a process element, right click the element and
-then select <strong>Suppress</strong>. The element appears grayed out in the process
-view.</div>
-</div>
-</div>
-<div class="section"><div class="p">To add elements to an activity in an extended capability pattern:<ol><li>Find the activity's parent element. If this element is a not a local element
-that appears in green italic font, then you need create a contribution to
-this parent first.  If the parent's parent is not local, also appearing in
-green italic font, then you need to create a contribution to the parent first,
-and so on. </li>
-<li>To create a contribution to an extended activity, right click the extended
-activity and then click <strong>Contribute</strong>. The activity becomes local and
-appears in a standard black font. Do this with all parent elements, top-down,
-until you reach the activity to which you want to apply the element. Once
-you click Contribute, the activity becomes local and is presented in standard
-black font.</li>
-</ol>
-For more information see <a href="contributes.html#contributes">Contributes</a>.</div>
-</div>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="capabilitypattern.html#capabilitypattern">Capability Pattern</a></div>
-<div><a href="replace.html#replaces">Replaces</a></div>
-<div><a href="process.html#process">Process</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createareusablecapabilitypattern.html#createareusablecapabilitypattern">Create a Reusable Capability Pattern</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/artifact.html b/plugins/org.eclipse.epf.help.doc/html/artifact.html
deleted file mode 100755
index 3fe5fc5..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/artifact.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Artifact" />
-<meta name="DC.Relation" scheme="URI" content="workproduct.html#workproduct" />
-<meta name="DC.Relation" scheme="URI" content="createaworkproduct.html#createaworkproduct" />
-<meta name="DC.Relation" scheme="URI" content="deliverable.html#deliverable" />
-<meta name="DC.Relation" scheme="URI" content="outcome.html#outcome" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="artifact" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Artifact</title>
-</head>
-<body id="artifact"><a name="artifact"><!-- --></a>
-
-<h1 class="topictitle1">Artifact</h1>
-<div><p>An artifact is a tangible work product that is consumed, produced, or modified
-by tasks. Artifacts may be composed of other artifacts. For example, a model
-artifact can be composed of model elements, which are also artifacts. </p>
-<p>Roles use artifacts to perform tasks and to produce other artifacts. Each
-artifact is the responsibility of a single role, making responsibility easy
-to identify and understand, and promoting the idea that every piece of information
-produced in a method requires the appropriate set of skills. Even though only
-one role is responsible for an artifact, other roles may use the artifacts.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="workproduct.html#workproduct">Work Product</a></div>
-<div><a href="deliverable.html#deliverable">Deliverable</a></div>
-<div><a href="outcome.html#outcome">Outcome</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createaworkproduct.html#createaworkproduct">Create a Work Product</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/authoringperspective.html b/plugins/org.eclipse.epf.help.doc/html/authoringperspective.html
deleted file mode 100755
index dc64a65..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/authoringperspective.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Authoring Perspective" />
-<meta name="DC.Relation" scheme="URI" content="browsingperspective.html#browingperspective" />
-<meta name="DC.Relation" scheme="URI" content="userinterfaceoverview.html#userinterfaceoverview" />
-<meta name="DC.Relation" scheme="URI" content="userinterfaceoverview.html" />
-<meta name="DC.Relation" scheme="URI" content="browsingperspective.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="authoringperspective" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Authoring Perspective</title>
-</head>
-<body id="authoringperspective"><a name="authoringperspective"><!-- --></a>
-
-<h1 class="topictitle1">Authoring Perspective</h1>
-<div><p>The Authoring Perspective provides views and functions to navigate and
-author method content and processes. You must be in the Authoring Perspective
-to create or modify any element types.</p>
-<p>Click the Open Perspective button <img src="openpersp.JPG" alt="" /> and select Authoring to open the Authoring Perspective. </p>
-<p><img src="AuthorPersp.JPG" alt="" /></p>
-<p>The Authoring Perspective contains two Views: the <a href="libraryview.html#libraryview">Library View</a> and the <a href="configurationview.html#configurationview">Configuration View</a>. Double click any element in the
-Library View or Configuration View to open the Editor window on the right.
-The Editor window contains several tabs through which you can edit information
-about the element you have selected.</p>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="userinterfaceoverview.html" title="Eclipse Process Framework Composer is built on the Eclipse Integrated Development Environment (IDE). The parts of the workspace are:">Tool Interface</a></div>
-<div class="nextlink"><strong>Next topic:</strong> <a href="browsingperspective.html">Browsing Perspective</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="browsingperspective.html#browingperspective">Browsing Perspective</a></div>
-<div><a href="userinterfaceoverview.html#userinterfaceoverview" title="Eclipse Process Framework Composer is built on the Eclipse Integrated Development Environment (IDE). The parts of the workspace are:">Tool Interface</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/bold.gif b/plugins/org.eclipse.epf.help.doc/html/bold.gif
deleted file mode 100755
index f0c4685..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/bold.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/browseandpreviewmethodcontent.html b/plugins/org.eclipse.epf.help.doc/html/browseandpreviewmethodcontent.html
deleted file mode 100755
index 33cc014..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/browseandpreviewmethodcontent.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Browse and Preview Method Content" />
-<meta name="DC.Relation" scheme="URI" content="userinterfaceoverview.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="browseandpreviewmethodcontent" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Browse and Preview Method Content</title>
-</head>
-<body id="browseandpreviewmethodcontent"><a name="browseandpreviewmethodcontent"><!-- --></a>
-
-<h1 class="topictitle1">Browse and Preview Method Content</h1>
-<div><div class="p">You can browse method content in both the <a href="authoringperspective.html#authoringperspective">Authoring Perspective</a> and <a href="browsingperspective.html#browingperspective">Browsing Perspective</a>. While authoring method content, you can see a preview
-of the published page for the content you are editing by selecting the <strong>Preview</strong> tab
-at the bottom of the content editor. Click any link in the displayed page
-to go to that page. Use the buttons in the editor toolbar to perform familiar
-browser actions such as back or refresh. While browsing method content in
-the browsing perspective you can see a preview of any method and process content
-in a method configuration as it appears in a published Web site. </div>
-<div class="section"><p>To browse and preview <a href="methodcontent.html#creatingreusablemethodcontents">Method Content</a> in the <a href="authoringperspective.html#authoringperspective">Authoring Perspective</a>:</p>
-</div>
-<ol><li class="stepexpand"><span>Click the Open Perspective button <img src="openpersp.JPG" alt="" /> and select <strong>Authoring</strong>. The Authoring perspective
-opens with the <a href="libraryview.html#libraryview">Library View</a> and <a href="configurationview.html#configurationview">Configuration View</a> on
-the left and the content view on the right. If a method element is selected,
-the appropriate editor is open on the right.</span></li>
-<li class="stepexpand"><span>Explore the contents in the both the Library View and Configuration
-View by expanding the different content packages and method plug-ins down
-to their method elements. Double click an element to open it in the editor.</span></li>
-<li class="stepexpand"><span>Click the <strong>Preview</strong> tab at the bottom of the content editor
-to preview the content of any selected element.</span> <div class="note"><span class="notetitle">Note:</span> The preview
-page in the content editor does not resolve content variability relationships.
-If you are extending, contributing to, or replacing a base content item, you
-can only see the result of this in the Configuration View in the Browsing
-Perspective. For more information see <a href="variability.html#variability">Variability</a>.</div>
-<p></p>
-</li>
-</ol>
-<div class="section"><p>To browse and preview<a href="methodcontent.html#creatingreusablemethodcontents">Method Content</a> in the <a href="browsingperspective.html#browingperspective">Browsing Perspective</a>:</p>
-<ol><li>Click the Open Perspective button <img src="openpersp.JPG" alt="" /> and select <strong>Browsing</strong>. The <a href="browsingperspective.html#browingperspective">Browsing Perspective</a> opens with the <a href="configurationview.html#configurationview">Configuration View</a> on the left and the Content View on the right.<p></p>
-</li>
-<li>Select a method configuration from the configuration drop-down list in
-the tool bar. The content of the method configuration appears in the content
-view, as it will appear in a published Web site.<p></p>
-</li>
-<li>Explore and preview the content in the Configuration View by expanding
-the categories and other folders down to method elements. Click a method element
-to open it in the content view.</li>
-</ol>
-</div>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="userinterfaceoverview.html" title="Eclipse Process Framework Composer is built on the Eclipse Integrated Development Environment (IDE). The parts of the workspace are:">Tool Interface</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/browsepersp.JPG b/plugins/org.eclipse.epf.help.doc/html/browsepersp.JPG
deleted file mode 100755
index af691ff..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/browsepersp.JPG
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/browsingperspective.html b/plugins/org.eclipse.epf.help.doc/html/browsingperspective.html
deleted file mode 100755
index e61fe43..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/browsingperspective.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Browsing Perspective" />
-<meta name="DC.Relation" scheme="URI" content="authoringperspective.html#authoringperspective" />
-<meta name="DC.Relation" scheme="URI" content="userinterfaceoverview.html#userinterfaceoverview" />
-<meta name="DC.Relation" scheme="URI" content="userinterfaceoverview.html" />
-<meta name="DC.Relation" scheme="URI" content="authoringperspective.html" />
-<meta name="DC.Relation" scheme="URI" content="configurationview.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="browingperspective" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Browsing Perspective</title>
-</head>
-<body id="browingperspective"><a name="browingperspective"><!-- --></a>
-
-<h1 class="topictitle1">Browsing Perspective</h1>
-<div><p>The Browsing Perspective allows you to preview and navigate through a Method
-Configuration without making any changes.</p>
-<p>Click the Open Perspective button <img src="openpersp.JPG" alt="" /> and select <strong>Browsing</strong> to open the Browsing Perspective.</p>
-<p><img src="browsepersp.JPG" alt="" /></p>
-<p>The Browsing perspective contains the <a href="configurationview.html#configurationview">Configuration View</a>, which shows the content in the currently
-selected configuration. Click any element in the Configuration
-View to preview the element in the Content View as it will appear in a published
-Web site. The Content View provides browser-like navigation features. Click
-any link in the displayed page to go to that page. Use the buttons in the
-Content View toolbar to perform familiar browser actions such as back or refresh.</p>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="userinterfaceoverview.html" title="Eclipse Process Framework Composer is built on the Eclipse Integrated Development Environment (IDE). The parts of the workspace are:">Tool Interface</a></div>
-<div class="previouslink"><strong>Previous topic:</strong> <a href="authoringperspective.html">Authoring Perspective</a></div>
-<div class="nextlink"><strong>Next topic:</strong> <a href="configurationview.html">Configuration View</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="authoringperspective.html#authoringperspective">Authoring Perspective</a></div>
-<div><a href="userinterfaceoverview.html#userinterfaceoverview" title="Eclipse Process Framework Composer is built on the Eclipse Integrated Development Environment (IDE). The parts of the workspace are:">Tool Interface</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/capabilitypattern.html b/plugins/org.eclipse.epf.help.doc/html/capabilitypattern.html
deleted file mode 100755
index 9fe56ad..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/capabilitypattern.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Capability Pattern" />
-<meta name="DC.Relation" scheme="URI" content="applyacapabilitypattern.html#applyacapabilitypattern" />
-<meta name="DC.Relation" scheme="URI" content="activity.html#activity" />
-<meta name="DC.Relation" scheme="URI" content="discipline.html#discipline" />
-<meta name="DC.Relation" scheme="URI" content="deliveryprocess.html#deliveryprocess" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="capabilitypattern" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Capability Pattern</title>
-</head>
-<body id="capabilitypattern"><a name="capabilitypattern"><!-- --></a>
-
-<h1 class="topictitle1">Capability Pattern</h1>
-<div><p>A Capability pattern is a special process that describes a reusable cluster
-of activities in common process areas. Capability patterns express and communicate
-process knowledge for a key area of interest such as a discipline and can
-be directly used by a process practitioner to guide his work. Capability patterns
-are also used as building blocks to assemble Delivery processes or larger
-capability patterns ensuring optimal reuse and application of the key practices
-they express.</p>
-<p>Examples of a capability pattern could be "use case-based requirements
-management", "use case analysis", or "unit testing". Typically, but not necessarily,
-capability patterns have the scope of one discipline providing a breakdown
-of reusable complex activities, relationships to the roles which perform tasks
-within these activities, as well as to the work products that are used and
-produced. A capability pattern does not relate to any specific
-phase or iteration of a development lifecycle, and should not imply any. In
-other words, a pattern should be designed in a way that it is applicable anywhere
-in a delivery process. thereby enabling its activities to be flexibly assigned
-to whatever phases there are in the delivery process to which it is being
-applied.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="activity.html#activity">Activity</a></div>
-<div><a href="discipline.html#discipline">Discipline</a></div>
-<div><a href="deliveryprocess.html#deliveryprocess">Delivery Process</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="applyacapabilitypattern.html#applyacapabilitypattern">Apply a Capability Pattern</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/checklist.html b/plugins/org.eclipse.epf.help.doc/html/checklist.html
deleted file mode 100755
index 5078ade..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/checklist.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Checklist" />
-<meta name="DC.Relation" scheme="URI" content="guidance.html#guidance" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="checklist" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Checklist</title>
-</head>
-<body id="checklist"><a name="checklist"><!-- --></a>
-
-<h1 class="topictitle1">Checklist</h1>
-<div><p>A Checklist is a specific type of guidance that identifies a series of
-items that need to be completed or verified. Checklists are often used in
-reviews such as a walk-throughs or inspections.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="guidance.html#guidance">Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/clearcontent.gif b/plugins/org.eclipse.epf.help.doc/html/clearcontent.gif
deleted file mode 100755
index ea35f47..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/clearcontent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/collapsed.gif b/plugins/org.eclipse.epf.help.doc/html/collapsed.gif
deleted file mode 100755
index 4e87759..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/collapsed.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/concept.html b/plugins/org.eclipse.epf.help.doc/html/concept.html
deleted file mode 100755
index f1982a9..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/concept.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Concept" />
-<meta name="DC.Relation" scheme="URI" content="guidance.html#guidance" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="concept" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Concept</title>
-</head>
-<body id="concept"><a name="concept"><!-- --></a>
-
-<h1 class="topictitle1">Concept</h1>
-<div><p>A Concept is a specific type of guidance that outlines key ideas associated
-with basic principles underlying the referenced item. Concepts normally address
-more general topics than guidelines and span across several work product and/or
-tasks or activities.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="guidance.html#guidance">Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/conf.gif b/plugins/org.eclipse.epf.help.doc/html/conf.gif
deleted file mode 100755
index 4e5e6b9..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/conf.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/configurationsandpublishingoverview.html b/plugins/org.eclipse.epf.help.doc/html/configurationsandpublishingoverview.html
deleted file mode 100755
index 3fe11d7..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/configurationsandpublishingoverview.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Configurations and Publishing Overview" />
-<meta name="abstract" content="Put your short description here; used for first paragraph and abstract." />
-<meta name="description" content="Put your short description here; used for first paragraph and abstract." />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="configurationsandpublishingoverview" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Configurations and Publishing Overview</title>
-</head>
-<body id="configurationsandpublishingoverview">
-<h3>Method Configurations Overview</h3>
-<p>Eclipse Process Framework Composer ships with a lot of content out of the box. It includes
-  the OpenUP framework and various plug-ins extending
-  OpenUP/Basic with domain-specific additions. No organization or project requires all of this
-  documentation all at once, but would work with a selection of specific subsets.</p>
-<p> Eclipse Process Framework Composer (EPF Composer) manages for that purpose so-called method
-  configurations, which allow you to specify working sets of content and processes
-  for a specific context, such as a specific variant of the OpenUP framework that
-  you want to publish and deploy for a given software project or as a foundation
-  for a development organization. All content and processes in EPF Composer are organized
-  in method plug-ins, which are organized into method packages. A method configuration
-  is simply a selection of the method plug-ins and packages.</p>
-<p><img src="conf.gif" width="665"></p>
-<p>You create and specify a configuration using the configuration editor depicted
-  in the figure above. You could start creating your own method configuration
-  by copying one of the configurations that ship with EPF Composer and modify it to fit
-  your specific needs. You can add or remove whole method plug-ins as well as
-  make selection with each plug-in by checking or un-checking packages. </p>
-<p> You can use the resulting configuration as your working set for your EPF Composer
-  work. The actual content of the configuration, i.e. the included method content
-  and process elements are always accessible in the Configuration view. Use the
-  combo box in the toolbar to select the currently used method configuration.</p>
-<h3>Publishing Overview</h3>
-<p>Method configurations are the basis for publishing method content and processes.
-  A published configuration is an html Web site that presents all the method
-  content and processes of the method configuration in a navigable and searchable
-  way. It uses the relationships established during method content and process
-  authoring to generate hyperlinks between elements as well as provides tree
-  browsers based on the configuration view and user-defined categorizations of
-  the content. The figure below shows an example of the published 'Classic RUP'
-  method configuration.</p>
-<p><img src="pub.gif" width="550"></p>
-<p>For publishing simply create and select a configuration. The publication wizard
-  will do the rest for you and only publish content that is part of the method
-  configuration. It will also automatically adopt content to the configuration
-  such as removing
-  references of method content elements to elements outside of the configuration
-  or removing activities from your processes that only contain work defined outside
-  of the configuration set. Hence, publishing will only include the content that
-  you really need. You can always preview a published configuration using EPF Composer's
-browsing perspective.</p>
-<p>&nbsp;</p>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/configurationview.html b/plugins/org.eclipse.epf.help.doc/html/configurationview.html
deleted file mode 100755
index c26192e..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/configurationview.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Configuration View" />
-<meta name="DC.Relation" scheme="URI" content="browsingperspective.html#browingperspective" />
-<meta name="DC.Relation" scheme="URI" content="libraryview.html#libraryview" />
-<meta name="DC.Relation" scheme="URI" content="userinterfaceoverview.html#userinterfaceoverview" />
-<meta name="DC.Relation" scheme="URI" content="userinterfaceoverview.html" />
-<meta name="DC.Relation" scheme="URI" content="browsingperspective.html" />
-<meta name="DC.Relation" scheme="URI" content="libraryview.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="configurationview" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Configuration View</title>
-</head>
-<body id="configurationview"><a name="configurationview"><!-- --></a>
-
-<h1 class="topictitle1">Configuration View</h1>
-<div><p>The Configuration view shows the content elements in a library filtered
-by a configuration. </p>
-<p>A configuration is a subset of the <a href="standardmethodlibraryoverview.html#standardmethodlibraryoverview">method library</a> content. Once a configuration is selected
-in the Configuration selection box, the Configuration view is refreshed with
-the content from the selected configuration. The content in the Configuration
-view is always presented in the same way in standard categories, processes,
-custom categories, and guidance. The Configuration view does not show any
-physical folders. Folders are only shown in the Library view.</p>
-<p></p>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="userinterfaceoverview.html" title="Eclipse Process Framework Composer is built on the Eclipse Integrated Development Environment (IDE). The parts of the workspace are:">Tool Interface</a></div>
-<div class="previouslink"><strong>Previous topic:</strong> <a href="browsingperspective.html">Browsing Perspective</a></div>
-<div class="nextlink"><strong>Next topic:</strong> <a href="libraryview.html">Library View</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="browsingperspective.html#browingperspective">Browsing Perspective</a></div>
-<div><a href="libraryview.html#libraryview">Library View</a></div>
-<div><a href="userinterfaceoverview.html#userinterfaceoverview" title="Eclipse Process Framework Composer is built on the Eclipse Integrated Development Environment (IDE). The parts of the workspace are:">Tool Interface</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/contributes.html b/plugins/org.eclipse.epf.help.doc/html/contributes.html
deleted file mode 100755
index 5c41bb4..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/contributes.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Contributes" />
-<meta name="DC.Relation" scheme="URI" content="variability.html#variability" />
-<meta name="DC.Relation" scheme="URI" content="extends.html#extends" />
-<meta name="DC.Relation" scheme="URI" content="replace.html#replaces" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="contributes" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Contributes</title>
-</head>
-<body id="contributes"><a name="contributes"><!-- --></a>
-
-<h1 class="topictitle1">Contributes</h1>
-<div><p>A contributing element adds to the base element. Contributes provides a
-way for elements to contribute their properties into their base element without
-directly changing any of its existing properties, such as in an additive fashion.
-The effect, after contribution, is that the base element is logically replaced
-with an element that combines the attributes and associations of the contributing
-element with the base element.</p>
-<p>Use the Content Variability section on the Description tab to make an element
-contribute to another element. Select <strong>Contributes</strong> as the Variability
-type and then select the base element to which this element will contribute.
-The base element must be the same type of element as the contributing element.</p>
-<p>Any information you enter in the contributing element is added to the base
-element. Text fields in the contributing element are added at the end of the
-respective text fields in the base element.</p>
-<p>Contribution only adds attributes and associations to the base. It never
-overrides or replaces any information from the base. In other words, if the
-base is allowed an association to exactly one other element and has this one
-already defined, it is not being replaced by a contributor's association.</p>
-<div class="p"><strong>Contribution rules:</strong><ul><li>Attributes are appended except for identifying/naming attributes and non-string
-attributes such as boolean, date, etc.</li>
-<li>Outgoing to-one associations of the contributor are ignored if the base
-already has such an association or if the base element has more than one contributing
-element (i.e. it cannot be decided which contribution should be chose, then
-none will be chosen).</li>
-<li>Outgoing to-many associations are added to the base elements of a contribution.</li>
-<li>Incoming associations to the contributing element with a to-one constraint
-on the other association end are ignored if the base already has such an incoming
-association or if there is more than one contribution to consider for the
-base element.</li>
-<li>Other incoming associations to the contributing element are added to the
-base elements of a contribution.</li>
-<li>A base element of a contribution can have more than one contributor</li>
-<li>Contribution works transitively, i.e. a contribution element contributes
-its own contributors.</li>
-</ul>
-See <a href="variabilityassociations.html#variabilityassociations">Variability Associations</a> to find the associations for each element
-type.</div>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="variability.html#variability" title="Variability allows elements in one content package to influence or modify elements in other content packages without actually directly modifying the original content. Variability enables changes to the content while keeping the changes separate and optional.">Variability</a></div>
-<div><a href="extends.html#extends">Extends</a></div>
-<div><a href="replace.html#replaces">Replaces</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/copy.gif b/plugins/org.eclipse.epf.help.doc/html/copy.gif
deleted file mode 100755
index bc6dfe2..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/copy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/createacontentpackage.html b/plugins/org.eclipse.epf.help.doc/html/createacontentpackage.html
deleted file mode 100755
index 9f58b8e..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/createacontentpackage.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Create a Content Package" />
-<meta name="DC.Relation" scheme="URI" content="methodcontentpackage.html#methodcontentpackage" />
-<meta name="DC.Relation" scheme="URI" content="createmethodcontent.html#createmethodcontent" />
-<meta name="DC.Relation" scheme="URI" content="createamethodplugin.html#createamethodplugin" />
-<meta name="DC.Relation" scheme="URI" content="methodcontentpackage.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="createcontentpackage" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Create a Content Package</title>
-</head>
-<body id="createcontentpackage"><a name="createcontentpackage"><!-- --></a>
-
-<h1 class="topictitle1">Create a Content Package</h1>
-<div><div class="p"><p>Method content is organized into content packages which, in turn,
-are contained in method plug-ins.</p>
-Before creating a content package, you
-should create a method plug-in. For more information, see <a href="createamethodplugin.html#createamethodplugin">Create a Method Plug-in</a>.</div>
-<div class="section">You should always create a new <a href="methodcontentpackage.html#methodcontentpackage">Method Content Package</a> and <a href="methodcontent.html#creatingreusablemethodcontents">Method Content</a> in a <a href="methodplugin.html#methodplugin">Method Plug-in</a> that
-you produce. This separates your content from original content shipped with
-the tool and allows you to update your own library with new library releases
-without affecting the content that you have created in your own plug-ins. <div class="note"><span class="notetitle">Note:</span> You
-cannot create a new content package or any other element in a locked plug-in.</div>
-<p>To
-create a content package:</p>
-</div>
-<ol><li><span>Find your method plug-in in the <a href="libraryview.html#libraryview">Library View</a>.</span></li>
-<li><span>Drill into the plug-in to locate the package called <strong>Content
-Packages</strong>. This package contains all packages that are allowed to contain
-method elements.</span></li>
-<li><span>Right click the content package and then select <strong>New &gt; Content
-Package</strong>. The content package editor appears.</span></li>
-<li><span>Under General Information, give the new content package a unique
-name and provide a brief description.</span></li>
-<li><span>Save the new content package in one of three ways:</span><ol type="a"><li><span>Click the disk icon in the toolbar.</span></li>
-<li><span>Select <strong>File &gt; Save</strong>.</span></li>
-<li><span>Simply close the content editor.</span></li>
-</ol>
-</li>
-</ol>
-<div class="section"><div class="note"><span class="notetitle">Note:</span> The tool automatically creates nodes for <a href="task.html#task">Task</a>, <a href="role.html#role">Role</a>, <a href="workproduct.html#workproduct">Work Product</a>, and <a href="guidance.html#guidance">Guidance</a> under the new content package.</div>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="methodcontentpackage.html">Method Content Package</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="methodcontentpackage.html#methodcontentpackage">Method Content Package</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createmethodcontent.html#createmethodcontent">Create Method Content</a></div>
-<div><a href="createamethodplugin.html#createamethodplugin">Create a Method Plug-in</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/createadeliveryprocess.html b/plugins/org.eclipse.epf.help.doc/html/createadeliveryprocess.html
deleted file mode 100755
index ecdef2e..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/createadeliveryprocess.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Create a Delivery Process" />
-<meta name="DC.Relation" scheme="URI" content="process.html#process" />
-<meta name="DC.Relation" scheme="URI" content="capabilitypattern.html#capabilitypattern" />
-<meta name="DC.Relation" scheme="URI" content="deliveryprocess.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="createadeliveryprocess" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Create a Delivery Process</title>
-</head>
-<body id="createadeliveryprocess"><a name="createadeliveryprocess"><!-- --></a>
-
-<h1 class="topictitle1">Create a Delivery Process</h1>
-<div><div class="p"><p>A Delivery Process describes a complete and integrated approach
-for performing a specific type of project. A Delivery Process describes what
-is produced, how it is produced and the required staffing for the entire project
-lifecycle.</p>
-A Delivery Process is created for a particular type of project
-to reflect the specific planning and project management needs. <p>Before
-creating a delivery process:</p>
-<ul><li>Select a method plug-in to hold your process. For more information, see <a href="methodplugin.html#methodplugin">Method Plug-in</a>.</li>
-<li>Find or create a process package.</li>
-</ul>
-</div>
-<div class="section">There are several ways to populate a process with method elements:<ul><li>By incorporating individual method elements by dragging the elements onto
-an activity in the process.</li>
-<li>By including already defined capability patterns.</li>
-<li>By including parts of already defined capability patterns.</li>
-<li>By creating descriptors directly in the process, which are either unrelated
-to any method content or related to method content at a later point in time.</li>
-</ul>
-To create a Delivery Process:</div>
-<ol><li class="stepexpand"><span>Once you have selected or created a process package, right click
-the process package.</span></li>
-<li class="stepexpand"><span>Click <strong>New &gt; Delivery Process</strong>. The New Process Component
-dialog appears.</span></li>
-<li class="stepexpand"><span>Type a name for the delivery process into the <strong>Name</strong> field
-and then select a default configuration from the drop down list. Your process
-can contain content from many different method plug-ins. for this reason you
-need to define a configuration that defines the visible set of elements and
-relationships when the process is authored. This process authoring configuration
-is referred to as the Default Configuration for the process and should define
-the largest reasonable set of method plug-ins, content packages, and other
-processes from the method library that will be referred to by the process
-at some point.</span></li>
-<li class="stepexpand"><span>Click <strong>OK</strong>. The process is created and the process editor
-is opened.</span> <div class="note"><span class="notetitle">Note:</span> If the Properties window opens to the right of
-the process editor, click the <strong>x</strong> to close it.</div>
-</li>
-<li class="stepexpand"><span>In the process editor, under the Description tab, document your
-process using the available text fields.</span> <div class="note"><span class="notetitle">Note:</span> You can use the
-Rich Text Editor to edit or enter the text for any field that has a twisty
-symbol <img src="collapsed.gif" alt="" />. Simply click the symbol
-to access the Rich Text Editor. Click the symbol again to close the Rich Text
-Editor. For more information see <a href="richtexteditor.html#richtexteditor">Rich Text Editor</a></div>
-</li>
-<li class="stepexpand"><span>Decide on your primary process authoring view. You develop a process
-using three different views:</span><ul><li><strong>Work Breakdown Structure</strong>: Define a work breakdown structure
-in your process. Create iterations and activities first, and then populate
-your activities by applying tasks from your Method Content. For more information
-see <a href="developaworkbreakdownstructure.html">Develop a Work Breakdown Structure</a>.</li>
-<li><strong>Team Allocation</strong>: Define which teams and roles shall participate
-in activities and then find responsible work products and tasks from there.
-For more information, see <a href="developateamallocationstructure.html#developateamallocationstructure">Develop a Team Allocation Structure</a>.</li>
-<li><strong>Work Product Usage</strong>: Define which work products should be created
-in activities and find tasks and roles from there. For more information see <a href="developaworkproductusagestructure.html#developaworkproductusagestructure">Develop a Work Product Usage Structure</a>.</li>
-</ul>
-</li>
-<li class="stepexpand"><span><a href="applyacapabilitypattern.html#applyacapabilitypattern">Apply a Capability Pattern</a> or capability pattern parts to the delivery process.</span></li>
-</ol>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="deliveryprocess.html">Delivery Process</a></strong><br />
-</li>
-</ul>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="process.html#process">Process</a></div>
-<div><a href="capabilitypattern.html#capabilitypattern">Capability Pattern</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/createamethodconfiguration.html b/plugins/org.eclipse.epf.help.doc/html/createamethodconfiguration.html
deleted file mode 100755
index 92ba465..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/createamethodconfiguration.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Create a Method Configuration" />
-<meta name="DC.Relation" scheme="URI" content="methodconfigurations.html#methodconfigurations" />
-<meta name="DC.Relation" scheme="URI" content="methodplugin.html" />
-<meta name="DC.Relation" scheme="URI" content="methodcontentpackage.html#methodcontentpackage" />
-<meta name="DC.Relation" scheme="URI" content="createamethodplugin.html" />
-<meta name="DC.Relation" scheme="URI" content="methodconfigurations.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="createamethodconfiguration" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Create a Method Configuration</title>
-</head>
-<body id="createamethodconfiguration"><a name="createamethodconfiguration"><!-- --></a>
-
-<h1 class="topictitle1">Create a Method Configuration</h1>
-<div><div class="p"><p>A method configuration allows you to select and deselect from the
-content packages and process available in the method library's set of plug-ins.
-The selections you make help you narrow down the content you are really interested
-in working with, as well as determine the content of the Web site you ultimately
-publish to deploy your process. A configuration is given a name and then saved
-so it can be changed and then re-published at a later date.</p>
-Before creating
-a method configuration, assess your needs and goals for the configuration.</div>
-<div class="section">There are two ways to create a method configuration:<a name="createamethodconfiguration__create"><!-- --></a><ul id="createamethodconfiguration__create"><li>Create a new method configuration from scratch.</li>
-<li>Create a method configuration by copying an existing configuration.</li>
-</ul>
-<strong>To create a new method configuration from scratch:</strong></div>
-<ol><li class="stepexpand"><span>Make sure you are working in the <a href="authoringperspective.html#authoringperspective">Authoring Perspective</a>.</span></li>
-<li class="stepexpand"><span>In the Library view, right click the <strong>Configurations</strong> folder
-and then select <strong>New &gt; Method Configuration</strong>. Your new configuration
-is created and the configuration editor is opened.</span></li>
-<li class="stepexpand"><span>In the configuration editor window, type a name for your configuration
-in the <strong>Name</strong> field. If you click anywhere in the <a href="libraryview.html#libraryview">Library View</a> or <a href="configurationview.html">Configuration View</a>, you
-will be able to see your new configuration name in the Configurations folder
-in the Library view tree.</span></li>
-<li class="stepexpand"><span>Type a description for your configuration in the Description field,
-and then select <strong>File &gt; Save All</strong> to save your new method configuration.</span></li>
-<li class="stepexpand"><span>At the bottom of the editor window, click the <strong>Plug-in and Package
-Selection</strong> tab. </span></li>
-<li class="stepexpand"><span>The method configuration selection section displays a list of all
-method plug-ins their content packages and processes. Use the check boxes
-to add or remove plug-ins, packages, and processes to or from your configuration.
-Expand each plug-in to select and deselect individual packages and processes.</span> <p>As you make your selections, warning signs may appear against
-some of the plug-in and package names, and the Configuration Warning Log view
-may be displayed. These warnings are intended to help ensure that you create
-a configuration that "makes sense".</p>
-<p>If you reference an element in a
-package that is from another package, you can only see the full details for
-that element in a published Web site if the package containing the element
-is in the configuration. If the package containing the element is not in the
-configuration, the "offending" package is marked with a warning sign. You
-may choose not to include the full details of a referenced element. Click
-the <strong>Add Missing References</strong> button to automatically and recursively
-add packages containing any elements that are referenced in already selected
-packages. Since this is recursive, a large number of packages may be added,
-perhaps making your configuration larger than you want it to be.</p>
-<p>If
-you have elements in a package that contribute to, extend, or replace elements
-in another package, it is an error if the base package is not included in
-the configuration. Errors are marked with a red cross. If you drill down into
-a plug-in or package marked with a cross you will discover the "offending"
-package and then you can find the packages you need to include to resolve
-the error. Alternatively you can click the <strong>Make closure by fixing errors</strong> button
-to automatically fix the errors by adding the missing base packages.</p>
-<p>The
-Configuration Warning Log lists and explains all errors and warnings in the
-configuration.</p>
-</li>
-<li class="stepexpand"><span>Select <strong>File &gt; Save All</strong></span></li>
-<li class="stepexpand"><span>Define the views for the method configuration. A view is a navigation
-tree browser in a published configuration. Every published configuration can
-have several views that are displayed as stacked tree browser tabs. The structure
-of the view is defined as a Custom Category.</span><ol type="a"><li><span>In the Configuration Editor, click the <strong>Views</strong> tab.</span></li>
-<li><span>Click the <strong>Add View</strong> button. The Select Categories dialog
-appears.</span></li>
-<li><span>If needed, click the (+) sign to expand the Custom Categories
-folder and then select the category you want to use as your view. Click the
-(+) sign to expand your chosen category and view it's contents. Press and
-hold the CTRL key to select multiple views.</span></li>
-<li><span>Click <strong>OK</strong>. The dialog window disappears and the views
-you selected are added to the Configuration.</span></li>
-</ol>
-</li>
-<li class="stepexpand"><span>Select the view you want to display as your configuration's start-up
-view and then click the <strong>Make Default</strong> button. The start-up view is the
-first view shown when a published configuration is displayed for the first
-time.</span></li>
-<li class="stepexpand"><span>Click <strong>File &gt; Save all</strong> to save your configuration.</span></li>
-</ol>
-<div class="section"><strong>To create a method configuration by copying an existing configuration</strong>:<ol><li>Make sure you are working in the <a href="authoringperspective.html#authoringperspective">Authoring Perspective</a>.<p></p>
-</li>
-<li>In the <a href="libraryview.html#libraryview">Library View</a>,
-expand the Configurations folder.<p></p>
-</li>
-<li> Right click the method configuration you want to copy and then click <strong>Copy</strong>.<p></p>
-</li>
-<li>Right click the <strong>Configurations</strong> folder and then click <strong>Paste</strong>.
-Type a name for the new configuration in the pop-up window. The copied method
-configuration is pasted into the Configurations folder.<p></p>
-</li>
-<li>Double click the newly pasted method configuration to open its configuration
-editor.<p></p>
-</li>
-<li>Follow steps 3 through 10 in <strong>To Create a New Method Configuration from
-Scratch</strong> above to continue.</li>
-</ol>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="methodconfigurations.html">Method Configuration</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="methodconfigurations.html#methodconfigurations">Method Configuration</a></div>
-<div><a href="methodplugin.html">Method Plug-in</a></div>
-<div><a href="methodcontentpackage.html#methodcontentpackage">Method Content Package</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createamethodplugin.html">Create a Method Plug-in</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/createamethodplugin.html b/plugins/org.eclipse.epf.help.doc/html/createamethodplugin.html
deleted file mode 100755
index 48d6232..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/createamethodplugin.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Create a Method Plug-in" />
-<meta name="DC.Relation" scheme="URI" content="methodplugin.html#methodplugin" />
-<meta name="DC.Relation" scheme="URI" content="methodcontentpackage.html#methodcontentpackage" />
-<meta name="DC.Relation" scheme="URI" content="createacontentpackage.html#createcontentpackage" />
-<meta name="DC.Relation" scheme="URI" content="methodplugin.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="createamethodplugin" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Create a Method Plug-in</title>
-</head>
-<body id="createamethodplugin"><a name="createamethodplugin"><!-- --></a>
-
-<h1 class="topictitle1">Create a Method Plug-in</h1>
-<div><div class="p"><p>Method Plug-ins allow the extension or customization of base library
-content without directly changing that base content by defining the differences
-to the content. You should always create new content in a method plug-in that
-you produce to separate your content from the original OpenUP/Basic content. This
-also allows you to update your own library with new releases of the OpenUP/Basic Method
-Library without affecting the content that you have created in your own plug-ins.</p>
-<div class="note"><span class="notetitle">Note:</span> Plug-ins
-that are shipped with Eclipse Process Framework Composer are locked and read-only.
-These plug-ins are grayed out in the <a href="libraryview.html#libraryview">Library View</a>, indicating that they are locked.</div>
-</div>
-<div class="section">To create a new Method Plug-in:</div>
-<ol><li class="stepexpand"><span>Make sure you are in the <a href="authoringperspective.html#authoringperspective">Authoring Perspective</a>.</span></li>
-<li class="stepexpand"><span>You can begin the method plug-in creation process in one of two
-ways:</span><ul><li>Click <strong>File &gt; New &gt; Method Plug-in</strong>. Or,</li>
-<li>In the Library view, right click an existing plug-in and select <strong>New
-Method Plug-in</strong>.</li>
-</ul>
- The New Method Plug-in wizard opens.</li>
-<li class="stepexpand"><span>Type a name for your new plug-in in the <strong>Name</strong> field and then
-select a plugin in the <strong>Referenced Plug-ins</strong> field. The plug-in you create
-extends the plug-in you select from the list and allows you to use content
-from the selected plug-in as you create your own plug-in content.</span></li>
-<li class="stepexpand"><span>Provide a brief description of the plug-in and list its authors
-to help you and others keep track of the plug-ins in the library. You can
-return to edit this information at any time.</span></li>
-<li class="stepexpand"><span>Click <strong>Finish</strong>. Your new plug-in now appears in the <a href="libraryview.html#libraryview">Library View</a> with the other
-Method Plug-ins.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="methodplugin.html">Method Plug-in</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="methodplugin.html#methodplugin">Method Plug-in</a></div>
-<div><a href="methodcontentpackage.html#methodcontentpackage">Method Content Package</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createacontentpackage.html#createcontentpackage">Create a Content Package</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/createamethodviewwithcustomcategories.html b/plugins/org.eclipse.epf.help.doc/html/createamethodviewwithcustomcategories.html
deleted file mode 100755
index 90eda5c..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/createamethodviewwithcustomcategories.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Create a Method View with Custom Categories" />
-<meta name="DC.Relation" scheme="URI" content="methodcontentcategories.html#methodcontentcategories" />
-<meta name="DC.Relation" scheme="URI" content="publishingoverview.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="createamethodviewwithcustomcategories" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Create a Method View with Custom Categories</title>
-</head>
-<body id="createamethodviewwithcustomcategories"><a name="createamethodviewwithcustomcategories"><!-- --></a>
-
-<h1 class="topictitle1">Create a Method View with Custom Categories</h1>
-<div><div class="section">Custom categories allow you to categorize content according to any
-scheme you want. Custom categories can then be used to compose publishable
-views, providing a means to organize method content prior to publishing.<p>To
-create a new custom category:</p>
-</div>
-<ol><li><span>Switch to the <a href="authoringperspective.html#authoringperspective">Authoring Perspective</a>.</span></li>
-<li><span>Open the <strong>Method Content</strong> folder in the method plug-in where
-you want to create the custom category.</span></li>
-<li><span>Right click the Custom Categories folder and select <strong>New &gt; Custom
-Category</strong>. The editor window opens.</span></li>
-<li><span>Provide descriptive information about the custom category in the
-fields available under the <strong>Description</strong> tab.</span></li>
-<li><span>Under the <strong>Assign</strong> tab, you can select the things you want
-to include in the custom category. Select individual method elements, processes,
-standard categories or custom categories. The custom category
-is also available to add to individual elements on the <strong>Categories</strong> tab
-in the appropriate editor.</span></li>
-<li><span>Once you assign content to the custom category, you can modify
-the sequence of the items in the category. This affects the sequence of the
-items in the <a href="libraryview.html#libraryview">Library View</a> and <a href="configurationview.html#configurationview">Configuration View</a>, as
-well as in a published Web site if the custom category is included as a view
-in a configuration.</span></li>
-<li><span>To save your new custom category, click <strong>File &gt; Save</strong> or close
-the editor and click <strong>Yes</strong> when prompted to save the changes.</span></li>
-</ol>
-<div class="section">You can now use the custom category as a view in a published configuration.<ol><li>Switch to the <a href="authoringperspective.html#authoringperspective">Authoring Perspective</a>.</li>
-<li>In the <a href="libraryview.html#libraryview">Library View</a>,
-double click the configuration to which you want to add a view. The configuration
-editor opens.</li>
-<li>Click the <strong>Views</strong> tab and then click the <strong>Add View</strong> button.
-The Select Categories dialog appears. The Select Categories dialog displays
-all the standard and custom categories in the configuration.</li>
-<li>Select one or more categories to include as a view in your configuration
-and then click <strong>OK</strong>. The view display provides a preview of how the view
-will appear n the published tree browser.</li>
-<li>Select a view to display as the default start-up view in the published
-Web site, and then click the <strong>Make Default</strong> button.</li>
-<li>To save the configuration, click <strong>File &gt; Save</strong> or close the configuration
-editor and click <strong>Yes</strong> when prompted to save the changes.</li>
-</ol>
-</div>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="methodcontentcategories.html#methodcontentcategories">Method Content Categories</a></div>
-<div><a href="publishingoverview.html">Publishing Overview</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/createareusablecapabilitypattern.html b/plugins/org.eclipse.epf.help.doc/html/createareusablecapabilitypattern.html
deleted file mode 100755
index 539d364..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/createareusablecapabilitypattern.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Create a Reusable Capability Pattern" />
-<meta name="DC.Relation" scheme="URI" content="process.html#process" />
-<meta name="DC.Relation" scheme="URI" content="processauthoringoverview.html#processauthoringoverview" />
-<meta name="DC.Relation" scheme="URI" content="createadeliveryprocess.html#createadeliveryprocess" />
-<meta name="DC.Relation" scheme="URI" content="capabilitypattern.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="createareusablecapabilitypattern" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Create a Reusable Capability Pattern</title>
-</head>
-<body id="createareusablecapabilitypattern"><a name="createareusablecapabilitypattern"><!-- --></a>
-
-<h1 class="topictitle1">Create a Reusable Capability Pattern</h1>
-<div><div class="p"><p>A Capability pattern is a special process that describes a reusable
-cluster of activities in a general process area that provides a consistent
-development approach to common problems. Capability patterns can be used as
-building blocks to assemble delivery processes or larger capability patterns. </p>
-Before
-creating a capability pattern:<ul><li>Select a method plug-in to hold your process. For more information, see <a href="methodplugin.html#methodplugin">Method Plug-in</a>.</li>
-<li>Find or create a process package.</li>
-</ul>
-</div>
-<div class="section">A capability pattern does not relate to any specific phase or iteration
-of a development lifecycle, and should not imply any. In other words, a capability
-pattern should be designed in a way so that it is applicable anywhere in a
-delivery process. This enables the pattern's activities to be flexibly assigned
-to whatever phases there are in the delivery process to which it is being
-applied. For more information see <a href="capabilitypattern.html#capabilitypattern">Capability Pattern</a>.<div class="p">You do not need to develop your process from scratch;
-you can reuse existing capability patterns or even capability pattern parts.
-There are several ways to populate a process with method elements:<ul><li>By incorporating individual method elements by dragging the elements onto
-an activity in the process.</li>
-<li>By including already defined capability patterns.</li>
-<li>By including parts of already defined capability patterns.</li>
-<li>By creating descriptors directly in the process, which are either unrelated
-to any method content or related to method content at a later point in time.</li>
-</ul>
-</div>
-<p> To create a capability pattern:</p>
-</div>
-<ol><li class="stepexpand"><span>Once you have selected or created a process package, right click
-the <strong>Process Package</strong>.</span></li>
-<li class="stepexpand"><span>Click <strong>New –&gt; Capability Pattern</strong>. The New Process Component
-dialog box appears.</span></li>
-<li class="stepexpand"><span>Type a name for the capability pattern into the <strong>Name</strong> field
-and then select a default configuration from the drop down list.</span></li>
-<li class="stepexpand"><span>Click <strong>OK</strong>. The process is created and the process editor
-is opened.</span></li>
-<li class="stepexpand"><span>In the process editor, under the Description tab, document your
-process using the available text fields.</span> <div class="note"><span class="notetitle">Note:</span> You can use the
-Rich Text Editor to edit or enter the text for any field that has a twisty
-symbol <img src="twisty symbol1.JPG" alt="" />. Simply click
-the symbol to access the Rich Text Editor. Click the symbol again to close
-the Rich Text Editor. For more information see <a href="richtexteditor.html#richtexteditor">Rich Text Editor</a></div>
-</li>
-<li class="stepexpand"><span>Decide on your primary process authoring view. You develop a process
-using three different views: </span><ul><li><strong>Work Breakdown Structure</strong>: Define a work breakdown structure
-in your process. Create iterations and activities first, and then populate
-your activities by applying tasks from your method content. For more information
-see <a href="developaworkbreakdownstructure.html#developaworkbreakdownstructure">Develop a Work Breakdown Structure</a>.</li>
-<li><strong>Team Allocation</strong>: Define which teams and roles shall participate
-in activities and then find responsible work products and tasks from there.
-For more information, see <a href="developateamallocationstructure.html">Develop a Team Allocation Structure</a>.</li>
-<li><strong>Work Product Usage</strong>: Define which work products should be created
-in activities and find tasks and roles from there. For more information see <a href="developaworkproductusagestructure.html#developaworkproductusagestructure">Develop a Work Product Usage Structure</a>.</li>
-</ul>
- <p>Once you have created your capability pattern, you need to apply
-it. For more information, please see <a href="applyacapabilitypattern.html#applyacapabilitypattern">Apply a Capability Pattern</a>.</p>
-</li>
-</ol>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="capabilitypattern.html">Capability Pattern</a></strong><br />
-</li>
-</ul>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="process.html#process">Process</a></div>
-<div><a href="processauthoringoverview.html#processauthoringoverview">Process Authoring Overview</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createadeliveryprocess.html#createadeliveryprocess">Create a Delivery Process</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/createarole.html b/plugins/org.eclipse.epf.help.doc/html/createarole.html
deleted file mode 100755
index 6ea6901..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/createarole.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Create a Role" />
-<meta name="DC.Relation" scheme="URI" content="methodcontent.html#creatingreusablemethodcontents" />
-<meta name="DC.Relation" scheme="URI" content="createatask.html#createatask" />
-<meta name="DC.Relation" scheme="URI" content="createaworkproduct.html#createaworkproduct" />
-<meta name="DC.Relation" scheme="URI" content="createguidance.html#createguidance" />
-<meta name="DC.Relation" scheme="URI" content="variability.html#variability" />
-<meta name="DC.Relation" scheme="URI" content="createmethodcontent.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="createarole" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Create a Role</title>
-</head>
-<body id="createarole"><a name="createarole"><!-- --></a>
-
-<h1 class="topictitle1">Create a Role</h1>
-<div><div class="p"><p>A <span class="keyword">Role</span> defines a set of related skills, competencies,
-and responsibilities of an individual or individuals.</p>
-You should always
-create new method content in a <a href="methodplugin.html#methodplugin">Method Plug-in</a> that you produce.</div>
-<div class="section">To create a role:</div>
-<ol><li class="stepexpand"><span>Expand the content package in which you want to create the role.</span></li>
-<li class="stepexpand"><span>Right click <strong>Roles</strong>, and then select <strong>New &gt; Role</strong>. The
-role editor appears with the Description tab set as the default.</span></li>
-<li class="stepexpand"><span>In the Name field, type a unique name for your role. The role name
-is the file name that appears in the Library view.</span></li>
-<li class="stepexpand"><span>In the Presentation name field, type a presentation name. The presentation
-name is the name that appears in your published content and in the <a href="configurationview.html#configurationview">Configuration View</a>. You can also make this name appear in the <a href="libraryview.html#libraryview">Library View</a> by toggling the <strong>Show Presentation Names</strong> button
-in the Library View toolbar.</span></li>
-<li class="stepexpand"><span>In the Brief Description field, type a short description of the
-new Role. </span></li>
-<li class="stepexpand"><span>Type a more detailed description of the new Role in the Main Description
-field. The main description is a more detailed version of the description
-you typed into the Brief Description field. There are three ways you can create
-text for the description:</span> <ul><li>Directly, by typing it manually in the editor.</li>
-<li>Copy from another similar role and then modify by using the editor.</li>
-<li>Copy from an HTML source such as a published OpenUP/Basic Web site.</li>
-</ul>
-<div class="note"><span class="notetitle">Note:</span> You can use the Rich Text Editor to edit or enter the text for
-any field that has a twisty symbol <img src="collapsed.gif" alt="" />. Simply click the symbol to access the Rich Text Editor. Click the
-symbol again to close the Rich Text Editor. For more information see <a href="richtexteditor.html#richtexteditor">Rich Text Editor</a>.</div>
-</li>
-<li class="stepexpand"><span>Under Version Information, provide any pertinent version information
-about the role.</span></li>
-<li class="stepexpand"><span>Click the <strong>Work Products</strong> tab and then click the <strong>Add</strong> button
-to the right of the "Role is responsible for:" field. The Select Dialog for
-Work Products dialog opens.</span></li>
-<li class="stepexpand"><span>Select one or more work products from the list. A description of
-the work product you select appears in the Brief Description field at the
-bottom of the dialog box.</span> <div class="note"><span class="notetitle">Note:</span> The list of work products in the
-"Work products that are output of tasks that this role performs" field is
-calculated and cannot be changed with the role editor. A work product appears
-here if it is an output of a task that the role performs.</div>
-</li>
-<li class="stepexpand"><span>Click <strong>OK</strong>. The dialog box closes and the "Role is responsible
-for:" field is populated.</span> <div class="note"><span class="notetitle">Note:</span> Selected elements in an Add/Remove
-section display both the element name (plug-in name) and the "path" (package
-name) to that element.</div>
-</li>
-<li class="stepexpand"><span>Click the <strong>Guidance</strong> tab. This part of the editor allows you
-to add and remove guidance for the role. To add guidance, click the <strong>Add</strong> button,
-select the guidance you want to add, and then click <strong>OK</strong>. To remove guidance,
-select it in the Guidance field and then click <strong>Remove</strong>. When you select
-a guidance element, the brief description of the guidance is displayed.</span></li>
-<li class="stepexpand"><span>Click the <strong>Categories</strong> tab. A role can be included in one
-or more rolesets and any number of custom categories. Open the appropriate
-Select dialog by clicking the <strong>Add</strong> button next to the category lists.
-You can remove a role from a category by selecting it and then clicking the <strong>Remove</strong> button.</span></li>
-<li class="stepexpand"><span>Click the <strong>Preview</strong> tab to view the newly created
-role and then save by closing the tab.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="createmethodcontent.html">Create Method Content</a></div>
-</div>
-
-<div class="linklist">
-<div><a href="methodcontent.html#creatingreusablemethodcontents">Method Content</a></div>
-<div><a href="createatask.html#createatask">Create a Task</a></div>
-<div><a href="createaworkproduct.html#createaworkproduct">Create a Work Product</a></div>
-<div><a href="createguidance.html#createguidance">Create Guidance</a></div>
-<div><a href="variability.html#variability" title="Variability allows elements in one content package to influence or modify elements in other content packages without actually directly modifying the original content. Variability enables changes to the content while keeping the changes separate and optional.">Variability</a></div></div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/createatask.html b/plugins/org.eclipse.epf.help.doc/html/createatask.html
deleted file mode 100755
index 712e204..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/createatask.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Create a Task" />
-<meta name="DC.Relation" scheme="URI" content="methodcontent.html#creatingreusablemethodcontents" />
-<meta name="DC.Relation" scheme="URI" content="createarole.html#createarole" />
-<meta name="DC.Relation" scheme="URI" content="createaworkproduct.html#createaworkproduct" />
-<meta name="DC.Relation" scheme="URI" content="createguidance.html#createguidance" />
-<meta name="DC.Relation" scheme="URI" content="variability.html#variability" />
-<meta name="DC.Relation" scheme="URI" content="createmethodcontent.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="createatask" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Create a Task</title>
-</head>
-<body id="createatask"><a name="createatask"><!-- --></a>
-
-<h1 class="topictitle1">Create a Task</h1>
-<div><div class="p"><p>A task is an assignable unit of work. Every task is assigned to
-a specific role. The granularity of a task is generally a few hours to a few
-days and usually affects one or only a small umber of work products.</p>
-You
-should always create new method content in a <a href="methodplugin.html#methodplugin">Method Plug-in</a> that you produce. </div>
-<div class="section">To create a task:</div>
-<ol><li class="stepexpand"><span>Expand the content package in which you want to create the task.</span></li>
-<li class="stepexpand"><span>Right click <strong>Tasks</strong>, and then select <strong>New &gt; Task</strong>. The
-task editor appears with the <strong>Description</strong> tab set as the default.</span></li>
-<li class="stepexpand"><span>In the Name field, type a unique name for your task. the task name
-is the file name that appears in the <a href="libraryview.html#libraryview">Library View</a>.</span></li>
-<li class="stepexpand"><span>In the Presentation name field, type a presentation name. The presentation
-name is the name that appears in your published content and in the <a href="configurationview.html">Configuration View</a>.
-You can also make this name appear in the Library view by toggling the <strong>Show
-Presentation Names</strong> button in the Library view toolbar.</span> </li>
-<li class="stepexpand"><span>In the Brief Description field, type a short description of the
-new task.</span></li>
-<li class="stepexpand"><span>Type a more detailed description of the new task in the Main Description
-field. The main description is a more detailed version of the description
-you typed into the Brief Description field. There are three ways you can create
-text for the description:</span> <ul><li>Directly, by typing it manually in the editor.</li>
-<li>Copy from another similar role and then modify by using the editor.</li>
-<li>Copy from an HTML source such as a published OpenUP/Basic Web site.</li>
-</ul>
-<div class="note"><span class="notetitle">Note:</span> You can use the Rich Text Editor to edit or enter the text for
-any field that has a twisty symbol <img src="collapsed.gif" alt="" />. Simply click the symbol to access the Rich Text Editor. Click the
-symbol again to close the Rich Text Editor. For more information see <a href="richtexteditor.html#richtexteditor">Rich Text Editor</a>.</div>
-</li>
-<li class="stepexpand"><span>Complete the other task specific fields in Detail Information as
-needed. See <a href="variability.html#variability">Variability</a> for
-information on creating variability. </span></li>
-<li class="stepexpand"><span>Click the <strong>Steps</strong> tab. The Steps Editor appears.</span> <div class="p">A
-task can have a series of steps that detail how to perform that task. The
-Step Editor allows you to:<ul><li>Create a new step<ul><li>Click the <strong>New</strong> button.</li>
-<li>Give the Task a name in the <strong>Name</strong> field.</li>
-<li>Describe the Task in the <strong>Description</strong> field.</li>
-</ul>
-</li>
-<li>Remove a step<ul><li>Select the step to remove in the <strong>Steps</strong> field.</li>
-<li>Click the <strong>Delete</strong> button.</li>
-</ul>
-</li>
-<li>Move a step up the list<ul><li>Select the step you want to move up.</li>
-<li>Click the <strong>Move Up</strong> button.</li>
-</ul>
-</li>
-<li>Move a step down the list<ul><li>Select the step you want to move down.</li>
-<li>Click the <strong>Move Down</strong> button</li>
-</ul>
-</li>
-</ul>
-</div>
-</li>
-<li class="stepexpand"><span>Click the <strong>Roles</strong> tab. This part of the editor allows you
-to define the roles that perform the task. You should select a role as the
-Performing Role for this task. You can also add one or more roles as Additional
-Performers. To add a role, click the <strong>Select</strong> or <strong>Add</strong> button as
-appropriate, select the role you want to add, and then click <strong>OK</strong>. To
-remove a role, select it in the Guidance box, and then click <strong>Clear</strong> or <strong>Remove</strong> as
-appropriate. When you select a role the brief description of that role is
-displayed.</span></li>
-<li class="stepexpand"><span>Click the <strong>Work Products</strong> tab. This part of the editor allows
-you to define the work products that are inputs and outputs for this task.
-You can select any number of work products as Mandatory Inputs, Optional Inputs,
-and Outputs. To add a work product, click the appropriate <strong>Add</strong> button,
-select the work products you want to add, and then click <strong>OK</strong>. To remove
-a work product, select it in the appropriate box and then click the corresponding <strong>Remove</strong> button.
-When you select a work product the brief description of the work product is
-displayed.</span></li>
-<li class="stepexpand"><span>Click the <strong>Guidance</strong> tab. This part of the editor allows you
-to add and remove guidance for the task. To add guidance, click the <strong>Add</strong> button,
-select the guidance you want to add, and then click <strong>OK</strong>. To remove guidance,
-select it in the Guidance box and then click <strong>Remove</strong>. When you select
-a guidance element the brief description of the guidance is displayed.</span></li>
-<li class="stepexpand"><span>Click the <strong>Categories</strong> tab. A task can be included in one
-discipline and any number of custom categories. Open the Select dialog by
-clicking the appropriate <strong>Select</strong> or <strong>Add</strong> button next to the category
-lists. Select a single discipline or any number of custom categories, and
-then click <strong>OK</strong>. You can remove a task from a category by selecting it
-and then clicking the appropriate <strong>Remove</strong> button.</span></li>
-<li class="stepexpand"><span>Click the <strong>Preview</strong> tab to view the newly created task as
-it will appear in a published Web page, and then save by closing the tab.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="createmethodcontent.html">Create Method Content</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="methodcontent.html#creatingreusablemethodcontents">Method Content</a></div>
-<div><a href="variability.html#variability" title="Variability allows elements in one content package to influence or modify elements in other content packages without actually directly modifying the original content. Variability enables changes to the content while keeping the changes separate and optional.">Variability</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createarole.html#createarole">Create a Role</a></div>
-<div><a href="createaworkproduct.html#createaworkproduct">Create a Work Product</a></div>
-<div><a href="createguidance.html#createguidance">Create Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/createaworkproduct.html b/plugins/org.eclipse.epf.help.doc/html/createaworkproduct.html
deleted file mode 100755
index 5f74f91..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/createaworkproduct.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Create a Work Product" />
-<meta name="DC.Relation" scheme="URI" content="createmethodcontent.html#createmethodcontent" />
-<meta name="DC.Relation" scheme="URI" content="createarole.html#createarole" />
-<meta name="DC.Relation" scheme="URI" content="createatask.html" />
-<meta name="DC.Relation" scheme="URI" content="variability.html#variability" />
-<meta name="DC.Relation" scheme="URI" content="createguidance.html#createguidance" />
-<meta name="DC.Relation" scheme="URI" content="createmethodcontent.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="createaworkproduct" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Create a Work Product</title>
-</head>
-<body id="createaworkproduct"><a name="createaworkproduct"><!-- --></a>
-
-<h1 class="topictitle1">Create a Work Product</h1>
-<div><div class="p"><div class="p">Work product is a general term for task inputs and outputs. There
-are three types of work product:<ul><li><a href="artifact.html#artifact">Artifact</a></li>
-<li><a href="outcome.html#outcome">Outcome</a></li>
-<li><a href="deliverable.html#deliverable">Deliverable</a></li>
-</ul>
-</div>
-You should always create new method content in a <a href="methodplugin.html#methodplugin">Method Plug-in</a> that you produce.</div>
-<div class="section">To create a work product:</div>
-<ol><li class="stepexpand"><span>Expand the Content Package in which you want to create the work
-product.</span></li>
-<li class="stepexpand"><span>Right click <strong>Work Products</strong>, and then select one of the following:</span> <ul><li><strong>New &gt; Artifact</strong></li>
-<li><strong>New &gt; Outcome</strong></li>
-<li><strong>New &gt; Deliverable</strong></li>
-</ul>
-The Work Product editor for the specific type of work product you are
-creating appears with the Description tab set as the default.</li>
-<li class="stepexpand"><span>In the Name field, type a unique name for your work product. The
-work product name is the file name that appears in the <a href="libraryview.html#libraryview">Library View</a>. </span></li>
-<li class="stepexpand"><span>In the Presentation name field, type a presentation name. the presentation
-name is the name that appears in your published content and in the <a href="configurationview.html#configurationview">Configuration View</a>. You can also make this name appear in the library
-view by toggling the <strong>Show Presentation Names</strong> button in the library
-view toolbar.</span></li>
-<li class="stepexpand"><span>In the Brief Description field, type a short description of the
-new work product.</span></li>
-<li class="stepexpand"><span>Type a more detailed description of the new work product in the
-Main Description field. The main description is a more detailed version of
-the description you typed into the Brief Description field. There are three
-ways to create text for the description:</span> <ul><li>Directly, by typing it manually in the editor.</li>
-<li>Copy from another similar work product and then modify using the editor.</li>
-<li>Copy from an HTML source, such as a published OpenUP/Basic Web site.</li>
-</ul>
-<div class="note"><span class="notetitle">Note:</span> You can use the Rich Text Editor to edit or enter the text for
-any field that has a twisty symbol <img src="collapsed.gif" alt="" />. Simply click the symbol to access the Rich Text Editor. Click the
-symbol again to close the Rich Text Editor. For more information see <a href="richtexteditor.html#richtexteditor">Rich Text Editor</a>.</div>
-</li>
-<li class="stepexpand"><span>Under <strong>Notation</strong>, provide any notations about the Work Product.</span> <div class="note"><span class="notetitle">Note:</span> Artifacts and Deliverables contain the Notation fields, while
-Outcomes do not.</div>
-</li>
-<li class="stepexpand"><span>Under <strong>Icon</strong> you can select a node icon to appear with the
-work product in the Library and Configuration views and in the tree browser
-in a published Web site. The node icon should be 16 x 16 pixels. You can also
-select a Shape icon to appear at the top of the published Web page for the
-work product. the Shape icon should be 32 x 32 pixels.</span></li>
-<li class="stepexpand"><span>Complete the other work product specific fields as needed. See <a href="variability.html#variability">Variability</a> for information
-on adding variability to your work product.</span></li>
-<li class="stepexpand"><span>Select the <strong>Guidance</strong> tab. This part of the editor allows
-you to add and remove guidance for the work product. To add guidance, click
-the <strong>Add</strong> button, select the guidance you want to add, and then click <strong>OK</strong>.
-To remove guidance, select it in the Guidance field, and then click <strong>Remove</strong>.
-When you select a guidance element the brief description of the guidance is
-displayed.</span></li>
-<li class="stepexpand"><span>Select the <strong>Categories</strong> tab. A work product can be included
-in one domain, any number of work product types, and any number of custom
-categories. Open the appropriate Select dialog by clicking the <strong>Select</strong> or <strong>Add</strong> button
-next to the category lists. Select a single domain or any number of work product
-kinds or custom categories and then click <strong>OK</strong>. You can remove a work
-product from a category by selecting it and then clicking the appropriate <strong>Remove</strong> button.</span></li>
-<li class="stepexpand"><span>If the work product is a deliverable, you can define what the deliverable
-consists of on the Deliverable Parts tab. Click the <strong>Deliverable Parts</strong> tab.
-This part of the editor only appears for deliverables and it allows you to
-add other work products as part of the deliverable. To add work products,
-click the <strong>Add</strong> button, select the work products you want to add, and
-then click <strong>OK</strong>. To remove a work product, select it in the work products
-as deliverable parts: field, and then click <strong>Remove</strong>. When you select
-a work product the brief description of the work product is displayed.</span></li>
-<li class="stepexpand"><span>Select the <strong>Preview</strong> tab to view the newly created work product,
-and then save by closing the tab.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="createmethodcontent.html">Create Method Content</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="variability.html#variability" title="Variability allows elements in one content package to influence or modify elements in other content packages without actually directly modifying the original content. Variability enables changes to the content while keeping the changes separate and optional.">Variability</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createmethodcontent.html#createmethodcontent">Create Method Content</a></div>
-<div><a href="createarole.html#createarole">Create a Role</a></div>
-<div><a href="createatask.html">Create a Task</a></div>
-<div><a href="createguidance.html#createguidance">Create Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/createguidance.html b/plugins/org.eclipse.epf.help.doc/html/createguidance.html
deleted file mode 100755
index e9f3308..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/createguidance.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Create Guidance" />
-<meta name="DC.Relation" scheme="URI" content="createmethodcontent.html#createmethodcontent" />
-<meta name="DC.Relation" scheme="URI" content="createarole.html" />
-<meta name="DC.Relation" scheme="URI" content="createatask.html" />
-<meta name="DC.Relation" scheme="URI" content="createaworkproduct.html#createaworkproduct" />
-<meta name="DC.Relation" scheme="URI" content="createmethodcontent.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="createguidance" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Create Guidance</title>
-</head>
-<body id="createguidance"><a name="createguidance"><!-- --></a>
-
-<h1 class="topictitle1">Create Guidance</h1>
-<div><div class="p"><p>Guidance is a general term for additional information related to <a href="role.html#role">Role</a>, <a href="task.html#task">Task</a>, and <a href="workproduct.html">Work Product</a>. Guidance
-provides information on how to perform your role, how to create a work product,
-how to perform your task, and so on. For more information see <a href="guidance.html#guidance">Guidance</a>.</p>
-<p>You should always create new <a href="methodcontent.html#creatingreusablemethodcontents">Method Content</a> in a <a href="methodplugin.html#methodplugin">Method Plug-in</a> that
-you produce.</p>
-</div>
-<div class="section"><p>To create<strong>Guidance</strong>:</p>
-</div>
-<ol><li class="stepexpand"><span>Expand the Content Package in which you want to create Guidance
-until you see the Method Elements (Roles, Tasks, Work Products, Guidance).</span></li>
-<li class="stepexpand"><span>Right click <strong>Guidance</strong> and then click <strong>New &gt; "guidance type"</strong>.
-The guidance editor for that particular guidance type opens. </span> <div class="p">The
-following guidance types have the same editor which includes a Description
-tab and a Preview tab:<ul><li><a href="concept.html#concept">Concept</a></li>
-<li><a href="example.html#example">Example</a></li>
-<li><a href="guideline.html#guideline">Guideline</a></li>
-<li><a href="report.html#report">Report</a></li>
-<li><a href="reusableasset.html#reusableasset">Reusable Asset</a></li>
-<li><a href="roadmap.html#roadmap">Roadmap</a></li>
-<li><a href="supportingmaterial.html">Supporting Material</a></li>
-<li><a href="termdefinition.html#termdefinition">Term Definition</a></li>
-<li><a href="toolmentor.html#toolmentor">Tool Mentor</a></li>
-<li><a href="whitepaper.html#whitepaper">Whitepaper</a></li>
-</ul>
-</div>
-</li>
-<li class="stepexpand"><span>Use the fields in the content element editor to specify the guidance
-details. Start by assigning a unique name to the guidance element along with
-a presentation name that is used as the external visible name when other elements
-refer to this element, or when the element is published. Every guidance type
-has specific content fields in the content editor that are distributed over
-two or more stacked tabs. Use the content fields to describe your guidance
-type.</span> <div class="note"><span class="notetitle">Note:</span> You can use the Rich Text Editor to edit or enter
-the text for any field that has a twisty symbol <img src="collapsed.gif" alt="" />. Simply click the symbol to access the Rich Text Editor.
-Click the symbol again to close the Rich Text Editor. For more information
-see <a href="richtexteditor.html#richtexteditor">Rich Text Editor</a>.</div>
-</li>
-<li class="stepexpand"><span>In the Icon section, select a Node icon to appear with the work
-product in the <a href="libraryview.html#libraryview">Library View</a> and <a href="configurationview.html#configurationview">Configuration View</a> and
-in the tree browser in a published Web site. The node icon should be 16 x
-16 pixels. You can also select a Shape icon to appear at the top of the published
-page for the work product. The shape icon should be 32 x 32 pixels.</span></li>
-<li class="stepexpand"><span>Select the <strong>Preview</strong> tab to view the newly created work product
-and then save by closing the tab.</span></li>
-</ol>
-<div class="section">It is possible to change the types of some types of guidance to a
-limited number of other guidance types. To change a guidance type, click the <strong>Change
-Type</strong> button and select an available new type.<p>If the type of guidance
-is a <a href="practice.html#practice">Practice</a>, you can add
-references to other elements. If the guidance is a <a href="template.html">Template</a>,
-you can attach a file to the guidance.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="createmethodcontent.html">Create Method Content</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createmethodcontent.html#createmethodcontent">Create Method Content</a></div>
-<div><a href="createarole.html">Create a Role</a></div>
-<div><a href="createatask.html">Create a Task</a></div>
-<div><a href="createaworkproduct.html#createaworkproduct">Create a Work Product</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/createmethodcontent.html b/plugins/org.eclipse.epf.help.doc/html/createmethodcontent.html
deleted file mode 100755
index a1f26fd..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/createmethodcontent.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Create Method Content" />
-<meta name="DC.Relation" scheme="URI" content="createarole.html#createarole" />
-<meta name="DC.Relation" scheme="URI" content="createatask.html#createatask" />
-<meta name="DC.Relation" scheme="URI" content="createaworkproduct.html" />
-<meta name="DC.Relation" scheme="URI" content="createguidance.html#createguidance" />
-<meta name="DC.Relation" scheme="URI" content="createarole.html" />
-<meta name="DC.Relation" scheme="URI" content="createatask.html" />
-<meta name="DC.Relation" scheme="URI" content="createaworkproduct.html" />
-<meta name="DC.Relation" scheme="URI" content="createguidance.html" />
-<meta name="DC.Relation" scheme="URI" content="variability.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="createmethodcontent" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Create Method Content</title>
-</head>
-<body id="createmethodcontent"><a name="createmethodcontent"><!-- --></a>
-
-<h1 class="topictitle1">Create Method Content</h1>
-<div><div class="p"><p>Method content provides step-by-step explanations,
-describing how specific development goals are achieved independent of the
-placement of these steps within a development lifecycle. Processes take the
-method elements and relate them into semi-ordered sequences that are customized
-to specific types of projects.</p>
-<p>Method content elements are:</p>
-<ul><li><a href="task.html#task">Task</a></li>
-<li><a href="role.html#role">Role</a></li>
-<li><a href="workproduct.html#workproduct">Work Product</a></li>
-<li><a href="guidance.html">Guidance</a></li>
-</ul>
-Click here for more information about <a href="methodcontent.html#creatingreusablemethodcontents">Method Content</a>.</div>
-<div class="section">To create method content:</div>
-<ol><li class="stepexpand"><span>In the <a href="libraryview.html#libraryview">Library View</a>,
-expand the content package in which you want to create new method content.</span></li>
-<li class="stepexpand"><span>Right click the folder containing the type of method element you
-want to create, click <strong>New</strong> and then select the element that appears.
-The new element is created and its respective editor opens.</span> <div class="note"><span class="notetitle">Note:</span> For
-Work Products, choose between Artifact, Outcome, or Deliverable. For Guidance,
-choose from the list of guidance types.</div>
-</li>
-</ol>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="createarole.html">Create a Role</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="createatask.html">Create a Task</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="createaworkproduct.html">Create a Work Product</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="createguidance.html">Create Guidance</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="variability.html">Variability</a></strong><br />
-Variability allows elements in one content package to influence
-or modify elements in other content packages without actually directly modifying
-the original content. Variability enables changes to the content while keeping
-the changes separate and optional.</li>
-</ul>
-
-<div class="linklist">
-<div><a href="createarole.html#createarole">Create a Role</a></div>
-<div><a href="createatask.html#createatask">Create a Task</a></div>
-<div><a href="createaworkproduct.html">Create a Work Product</a></div>
-<div><a href="createguidance.html#createguidance">Create Guidance</a></div></div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/cut.gif b/plugins/org.eclipse.epf.help.doc/html/cut.gif
deleted file mode 100755
index 0cf11d4..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/cut.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/deliverable.html b/plugins/org.eclipse.epf.help.doc/html/deliverable.html
deleted file mode 100755
index 23b266e..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/deliverable.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Deliverable" />
-<meta name="DC.Relation" scheme="URI" content="workproduct.html#workproduct" />
-<meta name="DC.Relation" scheme="URI" content="createaworkproduct.html#createaworkproduct" />
-<meta name="DC.Relation" scheme="URI" content="artifact.html#artifact" />
-<meta name="DC.Relation" scheme="URI" content="outcome.html#outcome" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="deliverable" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Deliverable</title>
-</head>
-<body id="deliverable"><a name="deliverable"><!-- --></a>
-
-<h1 class="topictitle1">Deliverable</h1>
-<div><p>A deliverable is a collection of work products, usually artifacts. A deliverable
-is used to pre-define typical or recommended content in the form of work products
-packaged for delivery. Deliverables are used to represent an output from a
-process that has value, material or otherwise, to a client, customer, or other
-stakeholder.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="workproduct.html#workproduct">Work Product</a></div>
-<div><a href="artifact.html#artifact">Artifact</a></div>
-<div><a href="outcome.html#outcome">Outcome</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createaworkproduct.html#createaworkproduct">Create a Work Product</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/deliveryprocess.html b/plugins/org.eclipse.epf.help.doc/html/deliveryprocess.html
deleted file mode 100755
index 0d5e9ba..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/deliveryprocess.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Delivery Process" />
-<meta name="DC.Relation" scheme="URI" content="createadeliveryprocess.html#createadeliveryprocess" />
-<meta name="DC.Relation" scheme="URI" content="createadeliveryprocess.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="deliveryprocess" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Delivery Process</title>
-</head>
-<body id="deliveryprocess"><a name="deliveryprocess"><!-- --></a>
-
-<h1 class="topictitle1">Delivery Process</h1>
-<div><p>A Delivery Process is the process that covers a whole development lifecycle
-from beginning to end. A Delivery Process can be used as a template for planning
-and running a project. It provides a complete lifecycle model with predefined
-phases, iterations, and activities.</p>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="createadeliveryprocess.html">Create a Delivery Process</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createadeliveryprocess.html#createadeliveryprocess">Create a Delivery Process</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/developateamallocationstructure.html b/plugins/org.eclipse.epf.help.doc/html/developateamallocationstructure.html
deleted file mode 100755
index 7123a93..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/developateamallocationstructure.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Develop a Team Allocation Structure" />
-<meta name="DC.Relation" scheme="URI" content="developaworkbreakdownstructure.html#developaworkbreakdownstructure" />
-<meta name="DC.Relation" scheme="URI" content="developaworkproductusagestructure.html#developaworkproductusagestructure" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="developateamallocationstructure" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Develop a Team Allocation Structure</title>
-</head>
-<body id="developateamallocationstructure"><a name="developateamallocationstructure"><!-- --></a>
-
-<h1 class="topictitle1">Develop a Team Allocation Structure</h1>
-<div><div class="p">In the Team Allocation view, you can create a process by defining
-which roles participate in activities and find responsible work products and
-tasks from there. You can also review the roles in a process that has been
-created by adding tasks or work products to the process. Before you create
-a team allocation structure, ensure the configuration selected in the tool
-bar is the same as the configuration you selected as the default configuration
-for your process.</div>
-<div class="section">To develop a team allocation structure:</div>
-<ol><li class="stepexpand"><span>To access the team allocation editor, select the <strong>Team Allocation</strong> tab
-in the process editor.</span> <div class="note"><span class="notetitle">Note:</span> For the purposes of this topic, the
-breakdown element example used is <a href="activity.html#activity">Activity</a>.
-Other breakdown elements include (but are not limited to) <a href="phase.html#phase">Phase</a> and <a href="iteration.html#iteration">Iteration</a>.
-The element you use depends on the scope of the process you create.</div>
-</li>
-<li class="stepexpand"><span>Right click the element (either a <a href="capabilitypattern.html#capabilitypattern">Capability Pattern</a> or <a href="deliveryprocess.html#deliveryprocess">Delivery Process</a>) to which you want to add structure, and then click <strong>New
-Child &gt; Activity</strong> to create a new activity. If needed, create more activities
-to set up your breakdown structure. Activities (as well as phases and iterations)
-can be nested inside each other according to how each relates in the hierarchy.
-You can add roles directly to your activities.</span></li>
-<li class="stepexpand"><span>In the Configuration view, review the list of roles. In this view,
-tasks are sorted by role sets.</span></li>
-<li class="stepexpand"><span>Drill into the role sets hierarchy to see which roles are available
-in this configuration.</span></li>
-<li class="stepexpand"><span>Select a role and drag it on top of the appropriate activity. The
-role is added as a role descriptor. If the role is responsible for work products
-in the configuration's method content, a wizard appears prompting you to add
-work products.</span></li>
-<li class="stepexpand"><span>Select one or more work products and then click <strong>OK</strong>. For
-each selected work product the next wizard window prompts you to select tasks
-that produce these work products. Again, select one or more tasks and then
-click <strong>OK</strong> to add these elements to your process.</span></li>
-<li class="stepexpand"><span>Review the role descriptor's details in its properties view. If
-the properties view is not displayed, in the work breakdown structure editor,
-right click the role and then select <strong>Properties</strong>. Use the tabs on the
-side of the properties view to review different aspects of the role descriptor.
-In the properties view, you can also perform individual modifications of the
-role descriptor, such as change the presentation name, add textual descriptions,
-change work products the role is responsible for, and more. When changing
-the task descriptor's relationships under the roles or work products tabs,
-you can add new elements from your method content by clicking the <strong>Add...</strong> button,
-or connect your task descriptor with tasks already present in this activity.
-For more information, see <a href="processelementpropertiesview.html#processelementpropertiesview">Process Element Properties View</a></span></li>
-<li class="stepexpand"><span>Continue adding roles to your activities.</span></li>
-</ol>
-<div class="section">You can preview what your process will look like in a published Web
-site at any time by switching to the <a href="browsingperspective.html#browingperspective">Browsing Perspective</a> and then selecting the process, or an activity in the
-process, in the <a href="configurationview.html">Configuration View</a>. You can use the
-links on the page to navigate through the process. Switch back to the <a href="authoringperspective.html#authoringperspective">Authoring Perspective</a> to
-continue editing your process.</div>
-</div>
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="developaworkbreakdownstructure.html#developaworkbreakdownstructure">Develop a Work Breakdown Structure</a></div>
-<div><a href="developaworkproductusagestructure.html#developaworkproductusagestructure">Develop a Work Product Usage Structure</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/developaworkbreakdownstructure.html b/plugins/org.eclipse.epf.help.doc/html/developaworkbreakdownstructure.html
deleted file mode 100755
index 8747eb0..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/developaworkbreakdownstructure.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Develop a Work Breakdown Structure" />
-<meta name="DC.Relation" scheme="URI" content="developateamallocationstructure.html#developateamallocationstructure" />
-<meta name="DC.Relation" scheme="URI" content="developaworkproductusagestructure.html#developaworkproductusagestructure" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="developaworkbreakdownstructure" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Develop a Work Breakdown Structure</title>
-</head>
-<body id="developaworkbreakdownstructure"><a name="developaworkbreakdownstructure"><!-- --></a>
-
-<h1 class="topictitle1">Develop a Work Breakdown Structure</h1>
-<div><div class="p">A work breakdown structure is a hierarchical breakdown of work, such
-as activities, tasks, and steps, defining a process. <p>Before creating a
-work breakdown structure, be sure that the configuration selected in the tool
-bar is the same as the configuration selected as the default configuration
-for your process.</p>
-</div>
-<div class="section">To develop a work breakdown structure:</div>
-<ol><li class="stepexpand"><span>To access the work breakdown structure editor, select the <strong>Work
-Breakdown Structure</strong> tab in a process editor.</span> <div class="note"><span class="notetitle">Note:</span> A breakdown
-structure is created with breakdown elements. Examples of breakdown elements
-are <a href="phase.html#phase">Phase</a>, <a href="iteration.html#iteration">Iteration</a>, <a href="activity.html#activity">Activity</a>,
-or task descriptor. Typically, a process is created by defining
-its phases and iterations within or across these phases. Phases and iterations
-are then further broken down into levels of activities. Finally, you can populate
-a work breakdown structure's activity with task descriptors.</div>
-</li>
-<li class="stepexpand"><span>Right click the element (either a <a href="capabilitypattern.html#capabilitypattern">Capability Pattern</a> or <a href="deliveryprocess.html#deliveryprocess">Delivery Process</a>) to which you want to add structure, and then click <strong>New
-Child &gt; Activity</strong> to create the new activity. If needed, create more activities
-to set up your breakdown structure. Activities (as well as phases and iterations)
-can be nested inside each other according to how each relates in the hierarchy.</span></li>
-<li class="stepexpand"><span>Right click the activity and then select <strong>Properties</strong> to open
-the Properties view. Complete the information under the Documentation tab
-for the activity. This information appears in the published Web page for the
-activity.</span></li>
-<li class="stepexpand"><span>Review the list of tasks in the configuration view to see which
-tasks are available.</span></li>
-<li class="stepexpand"><span>Select a task to add to the breakdown structure and then drag it
-on top of the activity to which you want it to belong. The task is added as
-a task descriptor to that activity.</span></li>
-<li class="stepexpand"><span>If the properties view for the activity is not displayed, select
-the task in the work breakdown structure editor, right click, and then select <strong>Properties</strong>.
-Click the <strong>Documentation</strong> tab and then complete the information required
-under this tab. This information appears in the published Web page for the
-activity. Use the tabs on the side of the properties view to review different
-aspects of the task descriptor. In the properties view, you can perform individual
-modifications of the task descriptor, such as change the presentation name,
-add textual descriptions, and change performing roles, among others. When
-changing the task descriptor's relationships under the roles or work products
-tabs, you can add new elements from your method content by clicking the <strong>Add...</strong> button,
-or connect your task descriptor with tasks already present in this activity.
-For more information, see <a href="processelementpropertiesview.html#processelementpropertiesview">Process Element Properties View</a>.</span></li>
-<li class="stepexpand"><span>Continue adding tasks to the activity or activities.</span></li>
-</ol>
-<div class="section">You can preview what your process will look like in a published Web
-site at any time by switching to the <a href="browsingperspective.html#browingperspective">Browsing Perspective</a> and then selecting the process, or an activity in the
-process, in the <a href="configurationview.html">Configuration View</a>. You can use the
-links on the page to navigate through the process. Switch back to the <a href="authoringperspective.html#authoringperspective">Authoring Perspective</a> to
-continue editing your process.</div>
-</div>
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="developateamallocationstructure.html#developateamallocationstructure">Develop a Team Allocation Structure</a></div>
-<div><a href="developaworkproductusagestructure.html#developaworkproductusagestructure">Develop a Work Product Usage Structure</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/developaworkproductusagestructure.html b/plugins/org.eclipse.epf.help.doc/html/developaworkproductusagestructure.html
deleted file mode 100755
index c40a063..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/developaworkproductusagestructure.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Develop a Work Product Usage Structure" />
-<meta name="DC.Relation" scheme="URI" content="developaworkbreakdownstructure.html#developaworkbreakdownstructure" />
-<meta name="DC.Relation" scheme="URI" content="developateamallocationstructure.html#developateamallocationstructure" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="developaworkproductusagestructure" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Develop a Work Product Usage Structure</title>
-</head>
-<body id="developaworkproductusagestructure"><a name="developaworkproductusagestructure"><!-- --></a>
-
-<h1 class="topictitle1">Develop a Work Product Usage Structure</h1>
-<div><div class="p">In the Work Product Usage view, you can create a process by defining
-which work products will be created and used in the process, and then finding
-responsible roles and tasks from there. You can also review the work products
-in a process that has been created by adding tasks or roles to the process.<p>Before
-you create a work product usage structure, ensure the configuration selected
-in the tool bar is the same as the configuration you selected as the default
-configuration for your process.</p>
-</div>
-<div class="section">To develop a work product usage structure:</div>
-<ol><li class="stepexpand"><span>To access the work product usage editor, select the <strong>Work Product
-Usage</strong> tab in the process editor.</span> <div class="note"><span class="notetitle">Note:</span> For the purposes of
-this topic, the breakdown element example used is <a href="activity.html#activity">Activity</a>. Other breakdown elements include (but are not limited
-to) <a href="phase.html#phase">Phase</a> and <a href="iteration.html#iteration">Iteration</a>. The element you use depends on the scope of the process
-you create.</div>
-</li>
-<li class="stepexpand"><span>Right click the element (either a <a href="capabilitypattern.html#capabilitypattern">Capability Pattern</a> or <a href="deliveryprocess.html#deliveryprocess">Delivery Process</a>) to which you want to add structure, and then click <strong>New
-Child &gt; Activity</strong> to create a new activity. If needed, create more activities
-to set up your breakdown structure. Activities (as well as phases and iterations)
-can be nested inside each other according to how each relates in the hierarchy.</span></li>
-<li class="stepexpand"><span>Review the list of work products in the <a href="configurationview.html#configurationview">Configuration View</a>. In this view, work products are sorted by domain as
-well as work product kinds. Drill into either of these hierarchies to see
-which work products are available in this configuration.</span></li>
-<li class="stepexpand"><span>Select a work product to add to activity and then drag it on top
-of the activity which you want it to belong. The work product is added as
-a work product descriptor to that activity. If the work product is an output
-to one or more tasks in the configuration, a wizard appears prompting you
-to add the task. </span> <div class="note"><span class="notetitle">Note:</span> It is not required to add a task. A valid
-process can contain just roles and work products.</div>
-</li>
-<li class="stepexpand"><span>Specify the entry and exit states of the work product for the activity
-to which it was added.</span></li>
-<li class="stepexpand"><span>Review the new work product descriptor details in the properties
-view. If the properties view is not displayed, right click the work product
-descriptor in the process editor, and then select <strong>Properties</strong>. Use the
-tabs on the side of the properties view to review different aspects of the
-work product descriptor. In the Properties view, you can also perform individual
-modifications of the role descriptor, such as change the presentation name,
-add textual descriptions, add entry and exit states, and more. When changing
-the role descriptor's relationships under the Roles or Work Products tabs,
-you can add new elements from your method content by clicking the <strong>Add...</strong> button,
-or connect your role descriptor with tasks already present in this activity.
-For more information, see <a href="processelementpropertiesview.html#processelementpropertiesview">Process Element Properties View</a>.</span></li>
-<li class="stepexpand"><span>Continue adding work products to your activities. </span></li>
-</ol>
-<div class="section">See also:</div>
-</div>
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="developaworkbreakdownstructure.html#developaworkbreakdownstructure">Develop a Work Breakdown Structure</a></div>
-<div><a href="developateamallocationstructure.html#developateamallocationstructure">Develop a Team Allocation Structure</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/differencesbetweenexistingandmigratedcontent.html b/plugins/org.eclipse.epf.help.doc/html/differencesbetweenexistingandmigratedcontent.html
deleted file mode 100755
index ee0b1b1..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/differencesbetweenexistingandmigratedcontent.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Differences Between IBM RUP 2003 and Migrated Content" />
-<meta name="DC.Relation" scheme="URI" content="migrationoverview.html#migrationoverview" />
-<meta name="DC.Relation" scheme="URI" content="migrateanrpw2003plugin.html#migrateanrpw2003plugin" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="differencesbetweenexistingandmigratedcontent" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Differences Between IBM RUP 2003 and Migrated Content</title>
-</head>
-<body id="differencesbetweenexistingandmigratedcontent"><a name="differencesbetweenexistingandmigratedcontent"><!-- --></a>
-
-<h1 class="topictitle1">Differences Between IBM RUP 2003 and Migrated Content</h1>
-<div><p>Eclipse Process Framework Composer content is based on IBM Unified
-Method Architecture.</p>
-<ul><li><strong>Activities have been renamed to task</strong>: To provide a tighter link
-to process enactment and project management we renamed the lowest assignable
-units of work to Task, because this is the term most commonly used.</li>
-<li><strong>Workflow details renamed to activity</strong>: Workflows are commonly expressed
-in hierarchies of activity diagrams (e.g. activity diagrams defined in the
-UML 2.0).  Although RUP only provided one level of workflow breakdown, UMA
-is designed to provide multiple levels of such a breakdown. Because the word
-Activity was more commonly used to express the elements of activity diagrams
-as well as the activity diagram itself, we decided to replace the name Workflow
-Detail used in RUP with the name Activity.  We realize that the shift in the
-usage of the word Activity might cause confusion with existing RUP users.
- However, one important goal of the UMA work was to use terms in the way they
-are most commonly used in standards and industry. </li>
-<li><strong>Tasks (former RUP Activities) can be performed by many roles</strong>: 
-In RUP 2003 an activity was modeled as an operation of a role.  Customer feedback,
-a look at other process modeling approaches, as well as changes introduced
-in UML 2.0 indicated that this was a too restrictive way of modeling human
-behavior.  This approach did not allow expressing that some work was performed
-as a collaboration of different roles.  UMA addresses this issue by making
-Task an independent model element to which performing roles can be assigned
-as resources.  UMA therefore now allows several roles to be assigned to a
-task.  For backward compatibility, it still allows a primary performing role
-to be identified (being responsible for the task) as well as several additional
-performers.</li>
-<li><strong>Refinement of the artifact concept</strong>: RUP only used the concept of
-artifact to define things that are used and produced in a development project.
- UMA defines an extended taxonomy for these concepts.  It defines the general
-concept of work product, which has three different specializations (specific
-work product types): Artifacts (managed work products), Deliverables (packaged
-work products that will be delivered to a stakeholder for review), and Outcome
-(unmanaged, intangible work products).</li>
-<li><strong>Different categorizations for work products and roles</strong>: In RUP,
-artifacts and roles were all categorized by discipline. However, sometimes
-artifacts were used across disciplines and a categorization to only one discipline
-caused confusion.  In UMA different categories have been defined for work
-definitions (discipline for tasks and activities), work products (domain and
-work product kind), and roles (role sets).</li>
-<li><strong>Process Components renamed to Method Package</strong>:  The concept of component
-is commonly used in many standards and technologies.  Most applications of
-component link it to the abstraction of encapsulation defining a component
-as a black box which can be used via well-defined interfaces.  RUP component
-did not fulfill this black box criterion.  Also the SPEM standard defined
-packages as well as components. To be compliant to SPEM and the industry usage
-of the word component, we renamed Process Component to Method Package ('method'
-because it can contain method elements or process elements)</li>
-<li><strong>Separation of method content elements from process elements</strong>: In
-RUP 2003 you created a new process by defining a new configuration and documenting
-manually in a development case artifact changes to standard RUP.  UMA provides
-extended concepts in addition to the configuration concept for tailoring processes.
- It allows you to model concretely for a process what work defined in the
-method content you want to actually do in each phase, because you can easily
-add, remove, and reorder elements in the process structure, reusing or not
-reusing whatever you want from the method content. It achieves these features
-by a more clear separation of method content (e.g. tasks defined for disciplines)
-and the application of method content in process (expressed with activity
-diagrams and/or work breakdown structures) as well as the modeling of processes
-(i.e. creating new or adapted activity diagrams or new or adapted work breakdown
-structures).  It introduces a few new concepts such as descriptor that support
-this separation and achieve new capabilities for maintaining and reusing many
-different families of alternative processes and process parts all within the
-same configuration.</li>
-</ul>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="migrationoverview.html#migrationoverview">Migration Overview</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="migrateanrpw2003plugin.html#migrateanrpw2003plugin">Migrate an IBM RUP 2003.06 Plugin</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/discipline.html b/plugins/org.eclipse.epf.help.doc/html/discipline.html
deleted file mode 100755
index 1f5a29d..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/discipline.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Discipline" />
-<meta name="DC.Relation" scheme="URI" content="methodcontentcategories.html#methodcontentcategories" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="discipline" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Discipline</title>
-</head>
-<body id="discipline"><a name="discipline"><!-- --></a>
-
-<h1 class="topictitle1">Discipline</h1>
-<div><p>A discipline is a collection of <a href="task.html#task">Tasks</a> that
-are related to a major area of concern within the overall IT environment.
-For example, on a software development project, it is common to perform certain
-requirements tasks in close coordination with analysis and design tasks. Separating
-these tasks into separate disciplines makes the tasks easier to comprehend.
-Disciplines can be organized using Discipline Groupings.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="methodcontentcategories.html#methodcontentcategories">Method Content Categories</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/domain.html b/plugins/org.eclipse.epf.help.doc/html/domain.html
deleted file mode 100755
index ca42351..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/domain.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Domain" />
-<meta name="DC.Relation" scheme="URI" content="methodcontentcategories.html#methodcontentcategories" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="domain" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Domain</title>
-</head>
-<body id="domain"><a name="domain"><!-- --></a>
-
-<h1 class="topictitle1">Domain</h1>
-<div><p>A Domain is a refineable, logical, hierarchy of related <a href="workproduct.html#workproduct">Work Products</a> grouped together based on timing, resources,
-or relationship. While a Domain categorizes many work products, a work product
-belongs to only one Domain. Domains can be further divided into sub-domains. </p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="methodcontentcategories.html#methodcontentcategories">Method Content Categories</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/example.html b/plugins/org.eclipse.epf.help.doc/html/example.html
deleted file mode 100755
index 1d1a512..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/example.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Example" />
-<meta name="DC.Relation" scheme="URI" content="guidance.html#guidance" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="example" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Example</title>
-</head>
-<body id="example"><a name="example"><!-- --></a>
-
-<h1 class="topictitle1">Example</h1>
-<div><p>An Example is a specific type of guidance that provides an example of a
-completed work product. </p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="guidance.html#guidance">Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/extends.html b/plugins/org.eclipse.epf.help.doc/html/extends.html
deleted file mode 100755
index 7e1fb43..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/extends.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Extends" />
-<meta name="DC.Relation" scheme="URI" content="variability.html#variability" />
-<meta name="DC.Relation" scheme="URI" content="replace.html#replaces" />
-<meta name="DC.Relation" scheme="URI" content="contributes.html#contributes" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="extends" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Extends</title>
-</head>
-<body id="extends"><a name="extends"><!-- --></a>
-
-<h1 class="topictitle1">Extends</h1>
-<div><p>An extending element inherits characteristics of the base element. Extension
-allows Method Plug-ins to easily reuse elements from a base plug-in by providing
-a kind of inheritance for the extending element. Attribute values and association
-instances are inherited from the "based-on" element to the extending element.
-The result is that the extending element has the same properties as the "based-on"
-element, but might define its own additions. Extends is not used to modify
-content of the base plug-in, but to provide the ability for the extending
-plug-in to define its own content which is a variant of content already defined.
-For example, a special version of a generic Review Record for a specific type
-of review. The effect of this is that the base element and any number of extending
-elements can be used side by side, but refer to each other through the extends
-relationship. Extends also provides the key mechanism for binding capability
-patterns to processes: A pattern is applied by defining an extends relationship
-from an activity of the applying processes to the capability pattern. The
-activity inherits association instances from the pattern and the pattern appears
-to be part of the resulting process after interpretation.</p>
-<p>Use the Content Variability section on the Description tab to make an element
-extend another element. Select <strong>Extends</strong> as the Variability Type, and
-then select the base element which this element extends. The base element
-must be the same type of element as the extending element.</p>
-<p>Any information you enter in the extending element is added to the base
-element in creating an additional element. Text fields in the extending element
-are added at the end of the respective text fields in the base element.</p>
-<p>Extends only defines inheritance for the extending element. The base remains
-untouched. If the extending element is allowed an association to only one
-other element and has such an element defined itself, inheritance will not
-override this association.</p>
-<div class="p"><strong>Extends rules:</strong><ul><li>Attribute values of the base element are inherited to the extending element
-if the extending element has not defined its own values.</li>
-<li>Outgoing to-many associations of the base element are inherited to the
-extending element.</li>
-<li>Outgoing to-one associations are only inherited if the extending element
-does not define its own to-one association.</li>
-<li>Extends works transitively, i.e. if an extending element is extended itself,
-the second extension inherits from its direct and indirect base elements.</li>
-<li>Contribution precedes Extends, i.e. contribution is evaluated first and
-then extending elements inherit afterwards from the base element (including
-all of its contribution).</li>
-<li>Replace precedes Extends, i.e. if a base element has a replace and extends
-relationship, the extending element inherits from the replacing element.</li>
-</ul>
-See <a href="variabilityassociations.html#variabilityassociations">Variability Associations</a> for more information on the associations for each element
-type.</div>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="variability.html#variability" title="Variability allows elements in one content package to influence or modify elements in other content packages without actually directly modifying the original content. Variability enables changes to the content while keeping the changes separate and optional.">Variability</a></div>
-<div><a href="replace.html#replaces">Replaces</a></div>
-<div><a href="contributes.html#contributes">Contributes</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/findreplace.gif b/plugins/org.eclipse.epf.help.doc/html/findreplace.gif
deleted file mode 100755
index 383963b..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/findreplace.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/guidance.html b/plugins/org.eclipse.epf.help.doc/html/guidance.html
deleted file mode 100755
index e772a4f..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/guidance.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Guidance" />
-<meta name="DC.Relation" scheme="URI" content="createguidance.html#createguidance" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="guidance" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Guidance</title>
-</head>
-<body id="guidance"><a name="guidance"><!-- --></a>
-
-<h1 class="topictitle1">Guidance</h1>
-<div><div class="p">Guidance is a general term for additional information related to <a href="role.html#role">roles</a>, <a href="task.html#task">tasks</a>, and <a href="workproduct.html#workproduct">work products</a>. Examples of guidance are:<ul><li><strong><span class="keyword">Guideline</span></strong> - Provides additional detail on how
-to perform a particular task or grouping of tasks, or that provides additional
-detail, rules, and recommendations on work products and their properties.
-Amongst others, it can include details about best practices and different
-approaches for doing work, how to use particular types of work products, information
-on different subtypes and variants of the work product and how they evolve
-throughout a lifecycle, discussions on skills the performing roles should
-acquire or improve upon, and measurements for progress and maturity.<p></p>
-</li>
-<li><strong><span class="keyword">Template</span></strong> - A specific type of guidance that
-provides for a work product a predefined table of contents, sections, packages,
-and/or headings, a standardized format, as well as descriptions how the sections
-and packages are supposed to be used and completed. Templates cannot only
-be provided for documents, but also for conceptual models or physical data
-stores.<p></p>
-</li>
-<li><strong><span class="keyword">Checklist</span></strong> - A specific type of guidance that
-identifies a series of items that need to be completed or verified. Checklists
-are often used in reviews such as walkthroughs or inspections.<p></p>
-</li>
-<li><strong><span class="keyword">Tool Mentor</span></strong> - A specific type of guidance that
-shows how to use a specific tool to accomplish some piece of work, either
-in the context of, or independent from, a task or activity.<p></p>
-</li>
-<li><strong><span class="keyword">Supporting Material</span></strong> - Used as a catch all for
-other types of guidance not specifically defined elsewhere. It can be related
-to all kinds of content elements, including other guidance elements.<p></p>
-</li>
-<li><strong><span class="keyword">Report</span></strong> - A predefined template of a result that
-is generated on the basis of other work products as an output from some form
-of tool automation. An example for a report would be a use case model survey,
-which is generated by extracting diagram information from a graphical model
-and textual information from documents and combines these two types of information
-into a report.<p></p>
-</li>
-<li><strong><span class="keyword">Concept</span></strong> - A specific type of guidance that outlines
-key ideas associated with basic principles underlying the referenced item.
-Concepts normally address more general topics than guidelines and span across
-several work product and/or tasks or activities.<p></p>
-</li>
-<li><strong><span class="keyword">Practice</span></strong> - Represents a proven way or strategy
-of doing work to achieve a goal that has a positive impact on work product
-or process quality. Practices are defined orthogonal to methods and processes.
-They could summarize aspects that impact may different parts of a method or
-specific process. <p></p>
-</li>
-<li><strong><span class="keyword">Reusable Asset</span></strong> - Provides a solution to a problem
-for a given context. The asset may have a variability point, which is a location
-in the asset that may have a value provided or customized by the asset consumer.
-The asset has rules for usage which are the instructions describing how the
-asset should be used.<p></p>
-</li>
-<li><strong><span class="keyword">Term Definition</span></strong> - Defines concepts and is used
-to build up the Glossary. A term definition is not directly related to content
-elements, but its relationship is being derived when the term is used in the
-content elements description text.<p></p>
-</li>
-<li><strong><span class="keyword">White Paper</span></strong> - A special concept guidance that
-has been external reviewed or published and can be read and understood in
-isolation of other content elements and guidance.<p></p>
-</li>
-<li><strong><span class="keyword">Example</span></strong> - A specific type of guidance that provides
-an example of a completed work product.</li>
-</ul>
-See also:</div>
-</div>
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createguidance.html#createguidance">Create Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/guideline.html b/plugins/org.eclipse.epf.help.doc/html/guideline.html
deleted file mode 100755
index 79e788f..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/guideline.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Guideline" />
-<meta name="DC.Relation" scheme="URI" content="guidance.html#guidance" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="guideline" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Guideline</title>
-</head>
-<body id="guideline"><a name="guideline"><!-- --></a>
-
-<h1 class="topictitle1">Guideline</h1>
-<div><p>A Guideline is a specific type of guidance that provides additional detail
-on how to perform a particular task or grouping of tasks, or that provides
-additional detail, rules, and recommendations on work products and their properties.
-Amongst others, it can include details about best practices and different
-approaches for doing work, how to use particular types of work products, information
-on different subtypes and variants of the work product and how they evolve
-throughout a lifecycle, discussions on skills the performing roles should
-acquire or improve upon, measurements for progress, and maturity.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="guidance.html#guidance">Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/ibmdita.css b/plugins/org.eclipse.epf.help.doc/html/ibmdita.css
deleted file mode 100755
index 7da26c5..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/ibmdita.css
+++ /dev/null
@@ -1,231 +0,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
- */
-
-.unresolved { background-color: skyblue; }
-.noTemplate { background-color: yellow; }
-
-.sidebar {background: silver }
-.toc {font-size: small; }
-
-.base { background-color: #ffffff; }
-.breadcrumb { font-size : smaller;}
-.prereq { margin-left : 20px;}
-.hierarchy { display: block; border-style: solid; padding-left : 3px; border-width : 2px; padding-right : 3px; border-color : Silver;}
-
-.nested0 { margin-top : 1em;}
-.nested1 { }
-.nested2 { }
-
-.p {margin-top: 1em}
-
-.tableborder { margin-top: 1em; margin-bottom: 1em }
-.tablenoborder { margin-top: 1em; margin-bottom: 1em }
-caption { text-align: left; font-style: italic }
-.simpletableborder { margin-top: 1em; margin-bottom: 1em }
-.simpletablenoborder { margin-top: 1em; margin-bottom: 1em }
-.choicetableborder { margin-top: 1em; margin-bottom: 1em }
-.choicetablenoborder { margin-top: 1em; margin-bottom: 1em }
-
-.figcap { font-style: italic }
-.figdesc { font-style: normal }
-
-.fignone {margin-top: 1em}
-.figborder { border-style: solid; padding-left : 3px; border-width : 2px; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.figsides { border-left : 2px solid; padding-left : 3px; border-right : 2px solid; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.figtop { border-top : 2px solid; margin-top: 1em; border-color : Silver;}
-.figbottom { border-bottom : 2px solid; border-color : Silver;}
-.figtopbot { border-top : 2px solid; border-bottom : 2px solid; margin-top: 1em; border-color : Silver;}
-
-.synnone {margin-top: 1em}
-.synborder { border-style: solid; padding-left : 3px; border-width : 2px; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.synsides { border-left : 2px solid; padding-left : 3px; border-right : 2px solid; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.syntop { border-top : 2px solid; margin-top: 1em; border-color : Silver;}
-.synbottom { border-bottom : 2px solid; border-color : Silver;}
-.syntopbot { border-top : 2px solid; border-bottom : 2px solid; margin-top: 1em; border-color : Silver;}
-
-.skip { margin-top: 1em }
-.skipspace { margin-top: 1em; margin-bottom: 1em }
-.ullinks { list-style-type: none }
-.ulchildlink { margin-top: 1em; margin-bottom: 1em }
-.olchildlink { margin-top: 1em; margin-bottom: 1em }
-.linklist { margin-bottom: 1em }
-.linklistwithchild { margin-left: 1.5em; margin-bottom: 1em  }
-.sublinklist { margin-left: 1.5em; margin-bottom: 1em  }
-.relconcepts { margin-top: 1em; margin-bottom: 1em }
-.reltasks { margin-top: 1em; margin-bottom: 1em }
-.relref { margin-top: 1em; margin-bottom: 1em }
-.relinfo { margin-top: 1em; margin-bottom: 1em }
-div.breadcrumb {margin-bottom: 1em }
-
-.topictitle1 { margin-top: 0pc; margin-bottom: .1em; font-size: 1.34em; }
-.topictitle2 { margin-top: 1pc; margin-bottom: .45em; font-size: 1.17em; }
-.topictitle3 { margin-top: 1pc; margin-bottom: .17em; font-size: 1.17em; font-weight: bold; }
-.topictitle4 { margin-top: .83em; font-size: 1.17em; font-weight: bold; }
-.topictitle5 { font-size: 1.17em; font-weight: bold; }
-.topictitle6 { font-size: 1.17em; font-style: italic; }
-.sectiontitle { margin-top: 1em; margin-bottom: 0em; color: black; font-size: 1.17em; font-weight: bold;}
-.section { margin-top: 1em; margin-bottom: 1em }
-.example { margin-top: 1em; margin-bottom: 1em }
-
-.note { margin-top: 1em; margin-bottom : 1em;}
-.notetitle { font-weight: bold }
-.notelisttitle { font-weight: bold }
-.tip { margin-top: 1em; margin-bottom : 1em;}
-.tiptitle { font-weight: bold }
-.fastpath { margin-top: 1em; margin-bottom : 1em;}
-.fastpathtitle { font-weight: bold }
-.important { margin-top: 1em; margin-bottom : 1em;}
-.importanttitle { font-weight: bold }
-.remember { margin-top: 1em; margin-bottom : 1em;}
-.remembertitle { font-weight: bold }
-.restriction { margin-top: 1em; margin-bottom : 1em;}
-.restrictiontitle { font-weight: bold }
-.attention { margin-top: 1em; margin-bottom : 1em;}
-.attentiontitle { font-weight: bold }
-.dangertitle { margin-top: 1em; font-weight: bold }
-.danger { padding: 5px 5px 5px 5px; border: solid; border-width: thin; font-weight: bold; margin-top: 2px; margin-bottom : 1em; }
-.cautiontitle { margin-top: 1em; font-weight: bold }
-.caution { font-weight: bold; margin-bottom : 1em; }
-
-ul.simple { list-style-type: none }
-
-.firstcol { font-weight : bold;}
-
-.bold { font-weight: bold; }
-.boldItalic { font-weight: bold; font-style: italic; }
-.italic { font-style: italic; }
-.underlined { text-decoration: underline; }
-.uicontrol { font-weight: bold; }
-.parmname { font-weight: bold; }
-.defparmname { font-weight: bold; text-decoration: underline; }
-.kwd { font-weight: bold; }
-.defkwd { font-weight: bold; text-decoration: underline; }
-.var { font-style : italic;}
-.shortcut { text-decoration: underline; }
-
-.ptocH1 {font-size: x-small; }
-.ptocH2 {font-size: x-small; }
-
-.smallCaps { text-transform: uppercase; font-size: smaller; }
-.stitle { font-style: italic; text-decoration: underline; }
-.nte {}
-
-.dlterm { font-weight: bold; }
-.dltermexpand { font-weight: bold; margin-top: 1em; }
-.defListHead { font-weight: bold; text-decoration: underline; }
-.parmListKwd { font-weight: bold; }
-.parmListVar { font-style: italic; }
-.pk { font-weight: bold; text-decoration: underline; }
-
-*[compact="yes"]>li { margin-top: 0em;}
-*[compact="no"]>li { margin-top: .53em;}	
-.liexpand { margin-top: 1em; margin-bottom: 1em }
-.sliexpand { margin-top: 1em; margin-bottom: 1em }
-.dlexpand { margin-top: 1em; margin-bottom: 1em }
-.ddexpand { margin-top: 1em; margin-bottom: 1em }
-.stepexpand { margin-top: 1em; margin-bottom: 1em }
-.substepexpand { margin-top: 1em; margin-bottom: 1em }
-
-div.imageleft { text-align: left }
-div.imagecenter { text-align: center }
-div.imageright { text-align: right }
-div.imagejustify { text-align: justify }
-
-pre.screen { padding: 5px 5px 5px 5px; border: outset; background-color: #CCCCCC; margin-top: 2px; margin-bottom : 2px; white-space: pre}
-
-CITE { font-style: italic; }
-EM { font-style: italic; }
-STRONG { font-weight: bold; }
-VAR { font-style: italic; }
-
-/************************************************************************
-   Styles added to support .NET output. Not used by standard processing. 
- ************************************************************************/
-
-body.dotnet /* This body tag requires the use of one of the sets of banner and/or text div ids */
-	{
-	margin: 0px 0px 0px 0px;
-	padding: 0px 0px 0px 0px;
-	background: #ffffff; 
-	color: #000000;
-	width: 100%;
-	}
-
-div.nstext /* Creates the scrolling text area for Nonscrolling region topic */
-	{
-	padding: 5px 10px 0px 22px; 
-	}
-
-div.nsbanner /* Creates Nonscrolling banner region */
-	{
-	position: relative;
-	left: 0px;
-	padding: 0px 0px 0px 0px;
-	border-bottom: 1px solid #999999;
-	}
-
-div.bannerrow1 /* provides full-width color to top row in running head */
-	{
-	background-color: #99ccff;
-	}
-
-/*       STYLES FOR RUNNING HEADS      */
-
-table.bannerparthead, table.bannertitle /* General values for the Running Head tables */
-	{
-	position: relative;
-	left: 0px;
-	top: 0px;
-	padding: 0px 0px 0px 0px;
-	margin: 0px 0px 0px 0px;
-	width: 100%;
-	height: 21px; 
-	border-collapse: collapse;
-	border-style: solid;
-	border-width: 0px;
-	background-color: #99ccff; 
-	font-size: 100%;
-	}
-table.bannerparthead td /* General Values for cells in the top row of running head */
-	{
-	margin: 0px 0px 0px 0px;
-	padding: 2px 0px 0px 4px;
-	vertical-align: middle;
-	/*border-width: 0px 0px 1px 0px; */
-	border-width: 0px
-	border-style: solid;
-	border-color: #999999;
-	background: transparent; 
-	font-style: italic;
-	font-weight: normal;
-	}
-table.bannerparthead td.product /* Values for top right cell in running head */
-	{                       /* Allows for a second text block in the running head */
-	text-align: right;
-	padding: 2px 5px 0px 5px;
-	}
-
-h1.dtH1 {
-	margin-left: -18px;
-	}
-div.titlerow /* provides non-scroll topic title area (requires script) */
-	{
-	width: 100%; /* Forces tables to have correct right margin */
-	padding: 0px 10px 0px 22px; 
-	background-color: #99ccff;        
-	}
-div.titlerow h1
-	{
-	margin-top: 0em;
-	font-weight: bold;
-	margin-bottom: .2em
-	}
diff --git a/plugins/org.eclipse.epf.help.doc/html/indent.gif b/plugins/org.eclipse.epf.help.doc/html/indent.gif
deleted file mode 100755
index a21fb77..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/indent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/italic.gif b/plugins/org.eclipse.epf.help.doc/html/italic.gif
deleted file mode 100755
index dfe3e0d..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/italic.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/iteration.html b/plugins/org.eclipse.epf.help.doc/html/iteration.html
deleted file mode 100755
index 854a36f..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/iteration.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Iteration" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="iteration" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Iteration</title>
-</head>
-<body id="iteration"><a name="iteration"><!-- --></a>
-
-<h1 class="topictitle1">Iteration</h1>
-<div><p>Iteration is a group of nested Activities that are repeated more than once.
-Iteration represents an important structuring element to organize work in
-repetitive cycles.</p>
-</div>
-<div></div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/libraryview.html b/plugins/org.eclipse.epf.help.doc/html/libraryview.html
deleted file mode 100755
index 7f27e95..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/libraryview.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Library View" />
-<meta name="DC.Relation" scheme="URI" content="userinterfaceoverview.html#userinterfaceoverview" />
-<meta name="DC.Relation" scheme="URI" content="configurationview.html#configurationview" />
-<meta name="DC.Relation" scheme="URI" content="userinterfaceoverview.html" />
-<meta name="DC.Relation" scheme="URI" content="configurationview.html" />
-<meta name="DC.Relation" scheme="URI" content="browseandpreviewmethodcontent.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="libraryview" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Library View</title>
-</head>
-<body id="libraryview"><a name="libraryview"><!-- --></a>
-
-<h1 class="topictitle1">Library View</h1>
-<div><p>The Library View displays the Method Plug-ins and Configurations contained
-in a <a href="standardmethodlibraryoverview.html">Method Library</a>.</p>
-<p>The Library View is available only in the <a href="authoringperspective.html">Authoring Perspective</a> and,
-when open, enables the creation, modification and viewing of all element types.</p>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="userinterfaceoverview.html" title="Eclipse Process Framework Composer is built on the Eclipse Integrated Development Environment (IDE). The parts of the workspace are:">Tool Interface</a></div>
-<div class="previouslink"><strong>Previous topic:</strong> <a href="configurationview.html">Configuration View</a></div>
-<div class="nextlink"><strong>Next topic:</strong> <a href="browseandpreviewmethodcontent.html">Browse and Preview Method Content</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="userinterfaceoverview.html#userinterfaceoverview" title="Eclipse Process Framework Composer is built on the Eclipse Integrated Development Environment (IDE). The parts of the workspace are:">Tool Interface</a></div>
-<div><a href="configurationview.html#configurationview">Configuration View</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/mc.gif b/plugins/org.eclipse.epf.help.doc/html/mc.gif
deleted file mode 100755
index 6e2cee1..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/mc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/meth_vs_proc.gif b/plugins/org.eclipse.epf.help.doc/html/meth_vs_proc.gif
deleted file mode 100755
index b145ab2..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/meth_vs_proc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/methodauthoringoverview.html b/plugins/org.eclipse.epf.help.doc/html/methodauthoringoverview.html
deleted file mode 100755
index e9d567d..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/methodauthoringoverview.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Method Content Authoring Overview" />
-<meta name="DC.Relation" scheme="URI" content="methodcontent.html#creatingreusablemethodcontents" />
-<meta name="DC.Relation" scheme="URI" content="createmethodcontent.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="methodauthoringoverview" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Method Content Authoring Overview</title>
-</head>
-<body id="methodauthoringoverview"><a name="methodauthoringoverview"><!-- --></a>
-
-<h1 class="topictitle1">Method Content Authoring Overview</h1>
-<div><p>Method content is described by defining tasks that have work products as
-inputs and outputs and that are performed by roles. The roles also define
-responsibility relationships to the work products.</p>
-<p><img src="mc.gif" alt="" /></p>
-<p>The figure above depicts typical sources for method content, as well as
-how the method content is represented. To learn about development methods,
-people research in libraries or receive training. Development methods are
-typically described in publications such as books, articles, training material,
-standards and regulations, or any other form of documentation. These sources
-usually document methods by providing step-by-step explanations for a particular
-way of achieving a specific development goal under general circumstances.
-Some examples are: transforming a requirements document into an analysis model;
-defining an architectural mechanism based on functional and non-functional
-requirements; creating a project plan for a development iteration; defining
-a quality assurance plan for functional requirements; redesigning a business
-organization based on a new strategic direction, and so on. </p>
-<p>This tool takes content such as the content described above, and structures
-it in one specific way using a predefined schema of concepts. This schema
-supports the organization of large amounts of descriptions for development
-methods and processes. Such method content and processes do not have to be
-limited to software engineering, but can also cover other design and engineering
-disciplines such as mechanical engineering, business transformation, sales
-cycles, and so on. </p>
-<p>The schema for method content is represented this tool as a construct of
-roles defining development skills and responsibilities for work products.
-These work products are produced by tasks that are performed by the roles
-and have the work products as inputs and outputs. The screen capture in the
-figure above shows how such method content elements are organized in tree
-browsers on the left. These tree browsers, similar to a library, provide different
-indexes of the available elements for rapid access. The screen capture shows
-on the right an example of a task presentation. This task presentation defines
-the task in terms of steps that need to be performed to achieve the task's
-purpose. You can see that the task has various relationships, such as relationships
-to performing roles as well as work products that serve as inputs and outputs
-to the task. Find more details on tasks, role, and work products in the online
-help here. In addition to roles, tasks, and work products, this tool supports
-the addition of guidance elements. Guidance are supplementary free-form documentation
-such as white papers, concept descriptions, guidelines, templates, examples,
-and so on. </p>
-<p>This tool provides various form-based editors to create new method content
-elements. Document your task, roles, work products, and guidance elements
-using intuitive rich-text editors that allow you to copy and paste text from
-other sources such as web pages or documents. Use simple dialogs to establish
-relationships between content elements. For example, make a work product the
-input to your task simply by selecting it in a dialog.</p>
-<p>Using this tool, you can organize content in physical content packages
-that allow you to manage your content in configurable units. You can also
-categorize your content based on a set of predefined categories (for example,
-categorize your tasks into development disciplines, or your work products
-into domains) or create your own categorization schemes for your content with
-your own user-defined categories that allow you to index content in any way
-you want. </p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="methodcontent.html#creatingreusablemethodcontents">Method Content</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createmethodcontent.html">Create Method Content</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/methodconfigurations.html b/plugins/org.eclipse.epf.help.doc/html/methodconfigurations.html
deleted file mode 100755
index b700f2c..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/methodconfigurations.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Method Configuration" />
-<meta name="DC.Relation" scheme="URI" content="createamethodconfiguration.html#createamethodconfiguration" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="methodconfigurations" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Method Configuration</title>
-</head>
-<body id="methodconfigurations"><a name="methodconfigurations"><!-- --></a>
-
-<h1 class="topictitle1">Method Configuration</h1>
-<div><p>Method configurations are user-defined subsets of elements contained in
-the Method Library.</p>
-<p>A method configuration defines a working set of packages within the method
-library that helps you limit your view to a subset of elements. The elements
-that are part of a selected configuration are displayed in the <a href="configurationview.html#configurationview">Configuration View</a>. Method configurations are used for creating processes
-and for publication by defining which elements are published in HTML and which
-are not.</p>
-<p>A method configuration consists of three specifying parts:</p>
-<ul><li>A description of the configuration.</li>
-<li>A selection from the set of plug-ins and packages.</li>
-<li>A selection of views to be published in the Web site.</li>
-</ul>
-<p>In a method configuration, you are able to select and deselect from the
-content packages and process available in the method library's
-set of plug-ins. The selections you make help determine the content of your
-published Web site. A configuration is given a name and then saved so it can
-be changed and then re-published at a later date.</p>
-</div>
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createamethodconfiguration.html#createamethodconfiguration">Create a Method Configuration</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/methodcontent.html b/plugins/org.eclipse.epf.help.doc/html/methodcontent.html
deleted file mode 100755
index d3cbddd..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/methodcontent.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Method Content" />
-<meta name="DC.Relation" scheme="URI" content="methodcontentcategories.html#methodcontentcategories" />
-<meta name="DC.Relation" scheme="URI" content="createmethodcontent.html#createmethodcontent" />
-<meta name="DC.Relation" scheme="URI" content="createamethodplugin.html#createamethodplugin" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="creatingreusablemethodcontents" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Method Content</title>
-</head>
-<body id="creatingreusablemethodcontents"><a name="creatingreusablemethodcontents"><!-- --></a>
-
-<h1 class="topictitle1">Method Content</h1>
-<div><p>Method content provides step-by-step explanations, describing
-how specific development goals are achieved, independent of the placement
-of these steps within a development lifecycle. Processes take these method
-elements and relate them into semi-ordered sequences that are customized to
-specific types of projects.</p>
-<p>Method content elements are:</p>
-<ul><li><a href="task.html#task">Task</a></li>
-<li><a href="role.html#role">Role</a></li>
-<li><a href="workproduct.html#workproduct">Work Product</a></li>
-<li><a href="guidance.html">Guidance</a></li>
-</ul>
-<p>A Process Engineer authors these elements, defines the relationships between
-them, and then categorizes them. Method content provides step-by-step explanations,
-describing how specific development goals are achieved independent of the
-placement of these steps within a development lifecycle. Processes take these
-method elements and relate them into semi-ordered sequences that are customized
-to specific types of projects.</p>
-<p>For example, a software development project that develops an application
-from scratch performs development tasks such as "Develop Vision" or "Use Case
-Design" similar to a project that extends an existing software system. However,
-the two projects will perform the tasks at different points in time with a
-different emphasis, i.e., they perform the steps of these tasks at different
-points of time and perhaps apply individual variations and additions. </p>
-<p>Method content elements are contained within method content packages which,
-in turn, are contained within a Method plug-in. In order to separate your
-own content from original OpenUP content, you should always create new
-method content in a method plug-in that you produce. Creating method content
-in a method plug-in of your own also allows you to update your own library
-with new releases of the OpenUP library without affecting the content
-that you have created in your own plug-ins.</p>
-<p>See also:</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="methodcontentcategories.html#methodcontentcategories">Method Content Categories</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createmethodcontent.html#createmethodcontent">Create Method Content</a></div>
-<div><a href="createamethodplugin.html#createamethodplugin">Create a Method Plug-in</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/methodcontentcategories.html b/plugins/org.eclipse.epf.help.doc/html/methodcontentcategories.html
deleted file mode 100755
index e3a6494..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/methodcontentcategories.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Method Content Categories" />
-<meta name="DC.Relation" scheme="URI" content="methodcontent.html#creatingreusablemethodcontents" />
-<meta name="DC.Relation" scheme="URI" content="createmethodcontent.html#createmethodcontent" />
-<meta name="DC.Relation" scheme="URI" content="methodcontentpackage.html#methodcontentpackage" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="methodcontentcategories" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Method Content Categories</title>
-</head>
-<body id="methodcontentcategories"><a name="methodcontentcategories"><!-- --></a>
-
-<h1 class="topictitle1">Method Content Categories</h1>
-<div><p>Method Content elements are organized into logical categories. The categories
-can appear in your final, published Web site as views.</p>
-<p>There are two types of category: Standard and Custom.</p>
-<p></p>
-<div class="section"><h4 class="sectiontitle">Standard Categories</h4><p>Standard Categories provide
-a means to categorize core method content in line with the best practices
-for creating structured methods. Standard Categories are linked with a specific
-method content type, e.g. Disciplines contain only tasks. </p>
-<div class="p">Standard
-Category types are:<ul><li><strong>Disciplines</strong> - A discipline is a collection of <a href="task.html#task">Tasks</a> that are related to a major area of concern within
-the overall IT environment. For example, on a software development project,
-it is common to perform certain requirements tasks in close coordination with
-analysis and design tasks. Separating these tasks into separate disciplines
-makes the tasks easier to comprehend. Disciplines can be organized using Discipline
-Groupings.</li>
-<li><strong>Domains</strong> - A Domain is a refineable, logical, hierarchy of related <a href="workproduct.html#workproduct">Work Products</a> grouped
-together based on timing, resources, or relationship. While a Domain categorizes
-many work products, a work product belongs to only one Domain. Domains can
-be further divided into sub-domains. </li>
-<li><strong>Work Product Kinds</strong> - Work Product Kind is another category for
-grouping <a href="workproduct.html#workproduct">Work Products</a>.
-A work product can have many work product kinds. As an example, you might
-want to have a series of work product kinds that correspond to the overall
-intent of work products, such as specification, plan, or model.</li>
-<li><strong>Role Sets</strong> - A Role Set is used to group <a href="role.html#role">Roles</a> with certain commonalities together. For example,
-in a software development environment, an Analyst role set could be used to
-group together roles such as Business Process Analyst, System Analyst and
-Requirements Specifier. Each of these roles work with similar techniques and
-have overlapping skills, but may be responsible for performing certain tasks
-and creating certain work products. Role sets can be organized using Role
-Set Groupings.</li>
-<li><strong>Tools</strong> - Tools is a container for <a href="toolmentor.html#toolmentor">Tool Mentors</a>. Tools can also provide general descriptions
-of a tool and it's general capabilities.</li>
-</ul>
-</div>
-</div>
-<div class="section"><h4 class="sectiontitle">Custom Categories</h4><p>Custom Categories are highly customizable
-and can contain any type of element. Custom Categories allow you to categorize
-content according to any scheme you want and can then be used to compose publishable
-Views, providing a means to organize the method content prior to publishing.
-For example, you could create a custom category that logically organizes content
-relevant to your development organization department, such as a Testing category
-that groups together all roles, work products, tasks, and guidance elements
-relevant to testing.</p>
-</div>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="methodcontent.html#creatingreusablemethodcontents">Method Content</a></div>
-<div><a href="methodcontentpackage.html#methodcontentpackage">Method Content Package</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createmethodcontent.html#createmethodcontent">Create Method Content</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/methodcontentpackage.html b/plugins/org.eclipse.epf.help.doc/html/methodcontentpackage.html
deleted file mode 100755
index fa85f95..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/methodcontentpackage.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Method Content Package" />
-<meta name="DC.Relation" scheme="URI" content="createacontentpackage.html#createcontentpackage" />
-<meta name="DC.Relation" scheme="URI" content="createamethodplugin.html#createamethodplugin" />
-<meta name="DC.Relation" scheme="URI" content="createmethodcontent.html#createmethodcontent" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="methodcontentpackage" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Method Content Package</title>
-</head>
-<body id="methodcontentpackage"><a name="methodcontentpackage"><!-- --></a>
-
-<h1 class="topictitle1">Method Content Package</h1>
-<div><p>A Method package is a container for method elements. Elements are organized
-in method packages to structure a large scale of method content and processes
-as well as to define a mechanism for reuse. Method elements from one package
-can reuse elements from other packages by defining a link between them. For
-example, a work product defined in one package can be used as an input for
-tasks defined in another package, ensuring that no redundant definitions of
-the same elements are required. Also, maintenance of method content is greatly
-improved as changes can be performed in only one place.</p>
-<p></p>
-<div class="section"><h4 class="sectiontitle">Structure of a Method Package</h4><p>Although a method
-package is a container for method elements, its structure is broken down into
-smaller packages to better organize the content, such as content packages,
-standard categories, and custom categories.</p>
-</div>
-</div>
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createacontentpackage.html#createcontentpackage">Create a Content Package</a></div>
-<div><a href="createamethodplugin.html#createamethodplugin">Create a Method Plug-in</a></div>
-<div><a href="createmethodcontent.html#createmethodcontent">Create Method Content</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/methodplugin.html b/plugins/org.eclipse.epf.help.doc/html/methodplugin.html
deleted file mode 100755
index e83904c..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/methodplugin.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Method Plug-in" />
-<meta name="DC.Relation" scheme="URI" content="createamethodplugin.html#createamethodplugin" />
-<meta name="DC.Relation" scheme="URI" content="methodcontentpackage.html#methodcontentpackage" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="methodplugin" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Method Plug-in</title>
-</head>
-<body id="methodplugin"><a name="methodplugin"><!-- --></a>
-
-<h1 class="topictitle1">Method Plug-in</h1>
-<div><p>All content is organized in method plug-ins. A method plug-in is a container
-for method packages which, in turn, contain the method and process content.
-Method plug-ins and method packages allow you to organize your content at
-a level of granularity that suits your needs for authoring and reusing the
-content. </p>
-<p>When you create a method plug-in, you will usually want to reuse content
-in other plug-ins. You may want to modify or extend the content in these other
-plug-ins or add your own content. When you create a plug-in you
-can reference any number of other plug-ins that want to use in this way. A
-method plug-in can also be stand-alone and not reference other plug-ins.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="methodcontentpackage.html#methodcontentpackage">Method Content Package</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createamethodplugin.html#createamethodplugin">Create a Method Plug-in</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/milestone.html b/plugins/org.eclipse.epf.help.doc/html/milestone.html
deleted file mode 100755
index 59cc774..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/milestone.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Milestone" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="milestone" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Milestone</title>
-</head>
-<body id="milestone"><a name="milestone"><!-- --></a>
-
-<h1 class="topictitle1">Milestone</h1>
-<div><p>A Milestone describes a significant event in a project, such
-as a major decision, completion of a deliverable, or meeting of a major dependency
-such as the completion of a project phase.</p>
-</div>
-<div></div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/openpersp.JPG b/plugins/org.eclipse.epf.help.doc/html/openpersp.JPG
deleted file mode 100755
index ba4a604..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/openpersp.JPG
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/outcome.html b/plugins/org.eclipse.epf.help.doc/html/outcome.html
deleted file mode 100755
index 6d3fbe8..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/outcome.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Outcome" />
-<meta name="DC.Relation" scheme="URI" content="workproduct.html#workproduct" />
-<meta name="DC.Relation" scheme="URI" content="createaworkproduct.html" />
-<meta name="DC.Relation" scheme="URI" content="artifact.html#artifact" />
-<meta name="DC.Relation" scheme="URI" content="deliverable.html#deliverable" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="outcome" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Outcome</title>
-</head>
-<body id="outcome"><a name="outcome"><!-- --></a>
-
-<h1 class="topictitle1">Outcome</h1>
-<div><p>An outcome is an intangible work product that may be a result or state.
-Outcomes may also be used to describe work products that are not formally
-defined. </p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="workproduct.html#workproduct">Work Product</a></div>
-<div><a href="artifact.html#artifact">Artifact</a></div>
-<div><a href="deliverable.html#deliverable">Deliverable</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createaworkproduct.html">Create a Work Product</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/outdent.gif b/plugins/org.eclipse.epf.help.doc/html/outdent.gif
deleted file mode 100755
index ad64691..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/outdent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/paste.gif b/plugins/org.eclipse.epf.help.doc/html/paste.gif
deleted file mode 100755
index ed7e690..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/paste.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/perspectives.html b/plugins/org.eclipse.epf.help.doc/html/perspectives.html
deleted file mode 100755
index a8c3e5c..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/perspectives.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Perspectives" />
-<meta name="DC.Relation" scheme="URI" content="userinterfaceoverview.html#userinterfaceoverview" />
-<meta name="DC.Relation" scheme="URI" content="authoringperspective.html#authoringperspective" />
-<meta name="DC.Relation" scheme="URI" content="browsingperspective.html#browingperspective" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="perspectives" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Perspectives</title>
-</head>
-<body id="perspectives"><a name="perspectives"><!-- --></a>
-
-<h1 class="topictitle1">Perspectives</h1>
-<div><p>A Perspective defines a set of views and functions available for specific
-tasks. Eclipse Process Framework Composer contains two working perspectives: an
-Authoring Perspective and a Browsing Perspective.</p>
-<p>The <a href="authoringperspective.html#authoringperspective">Authoring
-Perspective</a> provides views and functions to navigate and author method
-content and processes, while the <a href="browsingperspective.html#browingperspective">Browsing Perspective</a>, as its name implies, allows you
-to preview and navigate through a <a href="methodconfigurations.html#methodconfigurations">Method Configuration</a> without making any changes.</p>
-<p>To select a perspective, click the Open Perspective button <img src="openpersp.JPG" alt="" />.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="userinterfaceoverview.html#userinterfaceoverview" title="Eclipse Process Framework Composer is built on the Eclipse Integrated Development Environment (IDE). The parts of the workspace are:">Tool Interface</a></div>
-<div><a href="authoringperspective.html#authoringperspective">Authoring Perspective</a></div>
-<div><a href="browsingperspective.html#browingperspective">Browsing Perspective</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/phase.html b/plugins/org.eclipse.epf.help.doc/html/phase.html
deleted file mode 100755
index a32fea9..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/phase.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Phase" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="phase" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Phase</title>
-</head>
-<body id="phase"><a name="phase"><!-- --></a>
-
-<h1 class="topictitle1">Phase</h1>
-<div><p>A Phase is a special type of activity that represents a significant
-period in a project, ending with a major management checkpoint, milestone
-or set of deliverables.</p>
-</div>
-<div></div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/practice.html b/plugins/org.eclipse.epf.help.doc/html/practice.html
deleted file mode 100755
index ce74ca2..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/practice.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Practice" />
-<meta name="DC.Relation" scheme="URI" content="guidance.html#guidance" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="practice" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Practice</title>
-</head>
-<body id="practice"><a name="practice"><!-- --></a>
-
-<h1 class="topictitle1">Practice</h1>
-<div><p>A practice represents a proven way or strategy of doing work to achieve
-a goal that has a positive impact on work product or process quality. Practices
-are defined orthogonal to methods and processes. They could summarize aspects
-that impact many different parts of a method or specific processes. Examples
-for practices would be manage risks, continuously verify quality, architecture
-centric, and component based development, to name a few.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="guidance.html#guidance">Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/preview.html b/plugins/org.eclipse.epf.help.doc/html/preview.html
deleted file mode 100755
index 37a4f9b..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/preview.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Preview" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="preview" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Preview</title>
-</head>
-<body id="preview"><a name="preview"><!-- --></a>
-
-<h1 class="topictitle1">Preview</h1>
-<div><p>Preview displays your content in browser format similar to
-how it will appear to an end user browsing a published Web site.</p>
-</div>
-<div></div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/procauth.gif b/plugins/org.eclipse.epf.help.doc/html/procauth.gif
deleted file mode 100755
index cbf8e88..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/procauth.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/process.html b/plugins/org.eclipse.epf.help.doc/html/process.html
deleted file mode 100755
index e2fc82c..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/process.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Process" />
-<meta name="DC.Relation" scheme="URI" content="processauthoringoverview.html#processauthoringoverview" />
-<meta name="DC.Relation" scheme="URI" content="createadeliveryprocess.html#createadeliveryprocess" />
-<meta name="DC.Relation" scheme="URI" content="createareusablecapabilitypattern.html#createareusablecapabilitypattern" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="process" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Process</title>
-</head>
-<body id="process"><a name="process"><!-- --></a>
-
-<h1 class="topictitle1">Process</h1>
-<div><div class="section"><p>A <span class="keyword">process</span> describes how a particular piece
-of work should be done. The work may have a relatively small scope, in which
-case it can be described as a capability pattern, or may address a full project
-lifecycle, in which case it can be described as a delivery process. A process
-can reuse method elements and combines them into a structure and sequence
-for carrying out work.</p>
-<p>There are two main types of process, a <a href="capabilitypattern.html#capabilitypattern">Capability Pattern</a> and
-a <a href="deliveryprocess.html#deliveryprocess">Delivery Process</a>.
-A capability pattern is a special process that describes a reusable cluster
-of activities in common process areas, while a delivery process describes
-a complete and integrated approach for performing a specific type of project.</p>
-<p>Each
-time a task is included in a process, a reference object to that task is created
-in the context of the process. This is called a task descriptor. The same
-task can be referenced any number of times in the same process. In other words,
-one task can have many task descriptors. A task descriptor can also modify
-the base task without actually changing the task. For example, roles and work
-products can be added or suppressed, and steps can be suppressed or re-sequenced.</p>
-<p>Roles
-and work products can also be included in processes as role descriptors and
-work product descriptors. Roles and work products can be customized to fit
-with the content of the process in which they are used.</p>
-</div>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="processauthoringoverview.html#processauthoringoverview">Process Authoring Overview</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createadeliveryprocess.html#createadeliveryprocess">Create a Delivery Process</a></div>
-<div><a href="createareusablecapabilitypattern.html#createareusablecapabilitypattern">Create a Reusable Capability Pattern</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/processauthoringoverview.html b/plugins/org.eclipse.epf.help.doc/html/processauthoringoverview.html
deleted file mode 100755
index 15ccb4b..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/processauthoringoverview.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Process Authoring Overview" />
-<meta name="DC.Relation" scheme="URI" content="process.html#process" />
-<meta name="DC.Relation" scheme="URI" content="createareusablecapabilitypattern.html#createareusablecapabilitypattern" />
-<meta name="DC.Relation" scheme="URI" content="createadeliveryprocess.html#createadeliveryprocess" />
-<meta name="DC.Relation" scheme="URI" content="process.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="processauthoringoverview" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Process Authoring Overview</title>
-</head>
-<body id="processauthoringoverview"><a name="processauthoringoverview"><!-- --></a>
-
-<h1 class="topictitle1">Process Authoring Overview</h1>
-<div><p>A development process defines sequences of tasks performed by roles and
-work products produced over time. </p>
-<p><img src="procauth.gif" alt="" /></p>
-<p>Processes are typically expressed as workflows or breakdown
-structures. Defining a strict sequence as in a waterfall model is as much
-a process as defining semi-ordered sequences in iterations of parallel work.
-They just represent different development approaches. Hence, for defining
-a process, one can take method content and combine it into structures that
-specify how the work shall be organized over time, to meet the needs of a
-particular type of development project (such as software for a online system
-versus software and hardware for an embedded system). EPF Composer supports processes
-based on different development approaches across many different lifecycle
-models, including waterfall, incremental, and iterative lifecycles. EPF Composer also
-supports different presentations for process, such as work-breakdown structure
-or workflow presentations. You can also define processes in EPF Composer that use a
-minimal set of method content to define processes for agile, self-organizing
-teams.</p>
-<p>The EPF Composer screen capture above shows an example of a process presented as
-a breakdown structure of nested activities as well as a workflow or activity
-diagram for one particular activity, the inception phase. It also indicates
-with the two blue arrows that the particular method content task "Detail a
-Use Case" has been applied in the process twice; firstly in the inception
-phase under the activity "Define the System," and secondly, in the elaboration
-phase in the activity "Refine the system definition". You see below each of
-these task applications, referred to as a task descriptors in EPF Composer, lists of
-the performing roles as well as the input and output work products. If you
-look closely, you see that these lists are different for each of these two
-task descriptors, expressing differences in performing the "Detail a Use Case"
-method throughout the lifecycle. You see different roles involved and changes
-in the list of inputs to be considered and outputs to be produced or updated.
-These changes were defined by the author that created this process to express
-the exact focus of the task performance for each occurrence. In addition to
-updating the roles, input and output work products for a task descriptor,
-you can also provide additional textual descriptions as well as define the
-exact steps of the task that should and should not be performed for this particular
-occurrence of the task. </p>
-<p>EPF Composer provides you with a process editor that supports different breakdown
-structure views as well as graphical process presentations. As a process author,
-you typically start by creating an activity breakdown, dividing and breaking
-your process down into phases, iterations, and high-level activities. Instead
-of creating your activities in the breakdown structure editor, you can alternatively
-work in a graphical activity diagram editor that allows you to graphically
-create a workflow for your activities. To assign method content to your process,
-you then have the choice of working in different process views (work breakdown
-structure, work product usage, or team allocation view). Each view supports
-a different approach for creating a process. You can define the work to be
-done, define the results to be produced, or define responsibilities for your
-roles. If requested, the editor updates the other process views semi-automatically
-using wizards that prompt you for decisions on selecting method content elements. </p>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="process.html">Process</a></strong><br />
-</li>
-</ul>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="process.html#process">Process</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createareusablecapabilitypattern.html#createareusablecapabilitypattern">Create a Reusable Capability Pattern</a></div>
-<div><a href="createadeliveryprocess.html#createadeliveryprocess">Create a Delivery Process</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/processelementpropertiesview.html b/plugins/org.eclipse.epf.help.doc/html/processelementpropertiesview.html
deleted file mode 100755
index 21142ea..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/processelementpropertiesview.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Process Element Properties View" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="processelementpropertiesview" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Process Element Properties View</title>
-</head>
-<body id="processelementpropertiesview"><a name="processelementpropertiesview"><!-- --></a>
-
-<h1 class="topictitle1">Process Element Properties View</h1>
-<div><p>When you are editing a process, the process element properties view allows
-you to edit all the details for a single element in the process. If you click
-in any row in a process display, you will see the full details of the process
-element in the row in the properties view.</p>
-<p>If the properties view is not open, right click any row in a process and
-select <strong>Show Properties View</strong>.</p>
-<p>The properties view is the editor for activities, task descriptors, roles
-descriptors, and work product descriptors. The information for
-a descriptor is similar to the corresponding method element editor, but it
-also has information related to the element in the process. The process information
-is also displayed in the corresponding row in the process display.</p>
-<p><strong>General Information tab:</strong></p>
-<p>The Name and Presentation Name default to the corresponding names in the
-base method element. These names can be changed in a descriptor.</p>
-<div class="p">The following attributes are used to specify certain aspects of the element
-in the process and can be set for all types of process elements:<ul><li><strong>Optional</strong>: If this is checked (true), it indicates that the element
-is considered optional in the process. This means that it is safe to remove
-the element. If this is not checked (false), the element is considered mandatory
-and should not be removed from the process.</li>
-<li><strong>Multiple Occurrences</strong>: If this is checked (true), it indicates that
-when the process is instantiated as a project or other process, it is expected
-that there will be multiple occurrences of this element. If this is not checked
-(false), it indicates that there should only be a single occurrence of this
-element when the process is instantiated.</li>
-<li><strong>Planned</strong>: If this is checked (true), the element will be included
-in an export to a project management tool. If this is not checked (false),
-it will not be included in an export.</li>
-<li><strong>Suppressed</strong>: If this is checked (true), the element will not appear
-in a published process. This is usually used to modify a capability pattern
-included in a process. This is not checked (false) as default.</li>
-</ul>
-</div>
-<div class="p">The following elements can be set for task descriptors and activities:<ul><li><strong>Event Driven</strong>: If this is checked (true), it indicates that the
-task or activity will be initiated when a particular event occurs. If this
-is not checked (false), it indicates that the task or activity will be initiated
-based on other tasks in the process.</li>
-<li><strong>Ongoing</strong>: If this is checked (true), it indicates that the task
-or activity is continuous. If this is not checked (false), it indicates that
-the task or activity has a clear start and finish in the process.</li>
-<li><strong>Repeatable</strong>: If this is checked (true), it indicates that the task
-or activity can iterate when the process is instantiated. If this is not checked
-(false), it indicates that the task or activity will only occur once in the
-process.</li>
-</ul>
-</div>
-<p>Dependency Field: You can add one or more dependencies for a task or activity.
-Click the <strong>Add...</strong> button and enter the index number for the task or
-activity on which the current element is dependent. The dependency (type)
-defaults to Finish-to-Start. If you want to set another dependency type, click
-the <strong>Edit</strong> button and select the required dependency type in the dependency
-drop down box. You can enter a different index number on the Edit dialog.
-You can also remove a dependency by selecting the dependency and clicking
-the <strong>Remove</strong> button.</p>
-<p>The base method element for the descriptor is displayed on the page. You
-can select a different element by clicking the <strong>Link Method Element</strong> button
-and selecting the required element.</p>
-<p><strong>Documentation tab:</strong></p>
-<p>The documentation tab contains descriptive attributes for the descriptor
-or activity.</p>
-<p><strong>Roll-Up tabs:</strong></p>
-<p>The properties view for an activity includes roll-up tabs that provide
-lists of tasks, roles, or work products "rolled up", or summarized, for the
-activity.</p>
-<p><strong>Association tabs:</strong></p>
-<p>The remaining tabs are used to add or remove associations between the activity
-or descriptor to method elements.</p>
-</div>
-<div></div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/pub.gif b/plugins/org.eclipse.epf.help.doc/html/pub.gif
deleted file mode 100755
index 0725474..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/pub.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/publishingamethodconfigurationtoamethodweb.html b/plugins/org.eclipse.epf.help.doc/html/publishingamethodconfigurationtoamethodweb.html
deleted file mode 100755
index 6f29a5a..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/publishingamethodconfigurationtoamethodweb.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Publishing a Method Configuration to a Method Web" />
-<meta name="DC.Relation" scheme="URI" content="publishingoverview.html#publishingoverview" />
-<meta name="DC.Relation" scheme="URI" content="exportaprocessormethodcontenttoaplanningtool.html" />
-<meta name="DC.Relation" scheme="URI" content="methodconfigurations.html#methodconfigurations" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="publishingamethodconfigurationtoamethodweb" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Publishing a Method Configuration to a Method Web</title>
-</head>
-<body id="publishingamethodconfigurationtoamethodweb"><a name="publishingamethodconfigurationtoamethodweb"><!-- --></a>
-
-<h1 class="topictitle1">Publishing a Method Configuration to a Method Web</h1>
-<div><div class="p">Using the Publish Method Configuration wizard, you can select from
-a series of publication options to turn a method configuration into a published
-method Web.</div>
-<div class="section">To publish a method configuration:</div>
-<ol><li class="stepexpand"><span>From the toolbar, select <strong>Configuration &gt; Publish</strong>. The Publish
-Method Configuration wizard appears.</span></li>
-<li class="stepexpand"><span>On the Select Configuration page, select the configuration you
-want to publish from the list of method configurations in the library and
-then click <strong>Next</strong>.</span></li>
-<li class="stepexpand"><span>On the Specify Publishing Options page:</span><ul><li>Provide a destination directory for the published Web site in the
-Publication path field.</li>
-<li>Provide a title for the published method web.</li>
-<li>Select a banner image to use.</li>
-<li>Select a file to use for the "about" information.</li>
-<li>Provide a feedback URL</li>
-<li>Choose to include a glossary, index, search capability and/or process
-tree customization.</li>
-<li>Choose to check that external hyperlinks are valid.</li>
-<li>Choose to publish activity diagrams that have not been edited, such
-as activity diagrams that have been generated by the tool, but not manually
-edited.</li>
-</ul>
- <div class="note"><span class="notetitle">Note:</span> Choosing to include either the search capability or to support
-customization of the process view will include the browser applet in the published
-Web site. If you choose not to publish with the last two options, the browser
-applet will not be included.</div>
-</li>
-<li class="stepexpand"><span>Click <strong>Finish</strong>. Publishing is initiated.</span></li>
-</ol>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="publishingoverview.html#publishingoverview">Publishing Overview</a></div>
-<div><a href="methodconfigurations.html#methodconfigurations">Method Configuration</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/publishingoverview.html b/plugins/org.eclipse.epf.help.doc/html/publishingoverview.html
deleted file mode 100755
index 93980e1..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/publishingoverview.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Publishing Overview" />
-<meta name="DC.Relation" scheme="URI" content="createamethodviewwithcustomcategories.html#createamethodviewwithcustomcategories" />
-<meta name="DC.Relation" scheme="URI" content="publishingamethodconfigurationtoamethodweb.html#publishingamethodconfigurationtoamethodweb" />
-<meta name="DC.Relation" scheme="URI" content="exportaprocessormethodcontenttoaplanningtool.html#exportaprocessormethodcontenttoaplanningtool" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="publishingoverview" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Publishing Overview</title>
-</head>
-<body id="publishingoverview"><a name="publishingoverview"><!-- --></a>
-
-<h1 class="topictitle1">Publishing Overview</h1>
-<div><p>The ultimate output of EPF Composer is a published Web site with method
-guidance and processes that can be used by a project team. The information
-contained in the Web site provides a project team with a consistent method
-for the entire team to follow and a complete description of the end-to-end
-work lifecycle. </p>
-<p>It is easy to configure a process for a particular type or size of project
-and to publish the guidance to a Web site. A Method Configuration is a selection
-of Content Packages across different Method Plug-ins containing the method
-and process content that will be included in the published Web site. At publishing
-time, the configuration is combined with different Method Views which define
-the Web site's navigation structures and content organization.</p>
-<p>The Browsing Perspective renders the Method Configuration content in HTML
-format within the tool, providing a navigable representation of the method
-or process content associated with the configuration.</p>
-</div>
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createamethodviewwithcustomcategories.html#createamethodviewwithcustomcategories">Create a Method View with Custom Categories</a></div>
-<div><a href="publishingamethodconfigurationtoamethodweb.html#publishingamethodconfigurationtoamethodweb">Publishing a Method Configuration to a Method Web</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/replace.html b/plugins/org.eclipse.epf.help.doc/html/replace.html
deleted file mode 100755
index ccee2f2..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/replace.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Replaces" />
-<meta name="DC.Relation" scheme="URI" content="variability.html#variability" />
-<meta name="DC.Relation" scheme="URI" content="extends.html#extends" />
-<meta name="DC.Relation" scheme="URI" content="contributes.html#contributes" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="replaces" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Replaces</title>
-</head>
-<body id="replaces"><a name="replaces"><!-- --></a>
-
-<h1 class="topictitle1">Replaces</h1>
-<div><p>A replacing element replaces parts of the base element. Replaces provides
-a way for an element to replace a base element without directly changing any
-of the base element's existing properties. This is, in most cases, used for
-method plug-ins that aim to replace specific content elements such as roles,
-tasks, or activities with either a completely new variant or to change the
-fundamental relationships of these elements. The effect of this, is that the
-base content element is logically replaced with the new replacing element
-to which all incoming associations still point as before, but which has potentially
-new attribute values and outgoing association properties.</p>
-<p>Use the Content Variability section on the Description tab to make an element
-replace another element. Select <strong>Replaces</strong> as the variability type and
-select the base element that this element will replace. The base element must
-be the same type of element as the replacing element.</p>
-<p>When you replace an element, all the description attributes are replaced
-by the replacing element. If a description attribute in the replacing element
-is blank, but the base element has content, the attribute will be blank in
-the resulting element.</p>
-<p>Replace always replaces attributes and associations of the base element
-with the replacing element's attributes and associations, except for incoming
-associations, which are only added to the base, but do not replace the base's
-incoming associations.</p>
-<div class="p"><strong>Replaces rules:</strong><ul><li>Attributes of the base element are replaced with attributes of the replacing
-element including identifier of the base element.</li>
-<li>Outgoing to-one and to-many associations of the replacing element replace
-any outgoing associations of the base element. If the contributor does not
-have any outgoing associations, then neither will the resulting element.</li>
-<li>Incoming associations with a to-many constraint on the other association
-end to the replaced element are preserved and augmented with incoming associations
-of the replacing element.</li>
-<li>Incoming associations with a to-one constraint on the other association
-end to the replaced element are replaced with the respective incoming association
-of the replacing element. If the replacing element does not have such an association
-then the resulting element keeps the incoming association of the base element.</li>
-<li>A base element of a replacement can have only one replacing element per
-configuration. If more than one replacing element is present, no replacement
-takes place.</li>
-<li>Replacement works transitively, i.e. if a replacing element is replaced
-itself, the final replacer prevails.</li>
-<li>Contribution precedes Replacement, i.e. contribution is evaluated first
-and then replacement performed afterward. The evaluation of contribution and
-replacement is performed top-down in the specialization hierarchy.</li>
-</ul>
-See <a href="variabilityassociations.html#variabilityassociations">Variability Associations</a> for more information on the associations for each element
-type.</div>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="variability.html#variability" title="Variability allows elements in one content package to influence or modify elements in other content packages without actually directly modifying the original content. Variability enables changes to the content while keeping the changes separate and optional.">Variability</a></div>
-<div><a href="extends.html#extends">Extends</a></div>
-<div><a href="contributes.html#contributes">Contributes</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/report.html b/plugins/org.eclipse.epf.help.doc/html/report.html
deleted file mode 100755
index d253a2b..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/report.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Report" />
-<meta name="DC.Relation" scheme="URI" content="guidance.html#guidance" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="report" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Report</title>
-</head>
-<body id="report"><a name="report"><!-- --></a>
-
-<h1 class="topictitle1">Report</h1>
-<div><p>A Report is a predefined template of a result that is generated on the
-basis of other work products as an output from some form of tool automation.
-For example, a report may combine a graphical model from a design tool with
-textual information documents into a report.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="guidance.html#guidance">Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/reusableasset.html b/plugins/org.eclipse.epf.help.doc/html/reusableasset.html
deleted file mode 100755
index ae0114e..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/reusableasset.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Reusable Asset" />
-<meta name="DC.Relation" scheme="URI" content="guidance.html#guidance" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="reusableasset" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Reusable Asset</title>
-</head>
-<body id="reusableasset"><a name="reusableasset"><!-- --></a>
-
-<h1 class="topictitle1">Reusable Asset</h1>
-<div><p>A reusable asset provides a solution to a problem for a given context.
-The asset has rules for usage which are the instructions describing how the
-asset should be used.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="guidance.html#guidance">Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/richtexteditor.html b/plugins/org.eclipse.epf.help.doc/html/richtexteditor.html
deleted file mode 100755
index f5c1a42..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/richtexteditor.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Rich Text Editor" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="richtexteditor" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Rich Text Editor</title>
-</head>
-<body id="richtexteditor"><a name="richtexteditor"><!-- --></a>
-
-<h1 class="topictitle1">Rich Text Editor</h1>
-<div><p>The Rich Text Editor provides simple text formatting functions
-that allow an author to change how sections of text appear in a published
-Web site. The Rich Text Editor allows individual components of text to be
-changed within the context of the overall style sheet(s) that determine the
-style and format of a published Web site.</p>
-<div class="p">The Rich Text Editor allows you to:<ul><li>Copy, cut and paste text. Simply highlight the text you want to cut or
-copy and then click the Cut <img src="cut.gif" alt="" /> or Copy <img src="copy.gif" alt="" /> buttons. To paste text, place the cursor
-where you want to include the text and then click the Paste button <img src="paste.gif" alt="" />.</li>
-<li>Remove all the contents in the text editor window at once by clicking
-the Clear Content button <img src="clearcontent.gif" alt="" />.</li>
-<li>Change the appearance of your text by making it bold, italicized, or underlining
-it. Highlight the text you want to change and then click the Bold <img src="bold.gif" alt="" />, Italics <img src="italic.gif" alt="" />,
-or Underline <img src="underline.gif" alt="" /> button.</li>
-<li>Create Super or Sub script by clicking the Superscript <img src="superscript.gif" alt="" /> or Subscript <img src="subscript.gif" alt="" /> buttons.</li>
-<li>Add numbered or bulleted lists using the ordered <img src="addordlist_co.gif" alt="" /> or unordered list <img src="addunordlist_co.gif" alt="" /> buttons.</li>
-<li>Indent or Outdent text using the Indent <img src="indent.gif" alt="" /> or Outdent <img src="outdent.gif" alt="" /> buttons.</li>
-<li>Find and replace text. Click the Find/Replace button <img src="findreplace.gif" alt="" />. The Find/Replace dialog box appears. Type the text you
-want to find in the Find field and, if you are replacing that text, type the
-replacement text in the Replace with field. You can search forward or back
-and specify whether you want your search to be case sensitive or search for
-only parts of words.</li>
-<li>Add or create hyperlinks using the Add link button <img src="addlink_co.gif" alt="" />. For more information see <a href="addareferenceorhyperlink.html#addareferenceorhyperlink">Add a Reference or Hyperlink</a>.</li>
-<li>Add images. Click the Add Image button <img src="addimg_co.gif" alt="" />. The Add Image dialog box appears. Browse for the image you'd like
-to add and then click <strong>OK</strong>.</li>
-<li>Add tables. Click the Add Table button <img src="addtable_co.gif" alt="" />. The Add Table dialog box appears. Specify the table parameters
-and then click <strong>OK</strong>.</li>
-</ul>
-</div>
-</div>
-<div></div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/roadmap.html b/plugins/org.eclipse.epf.help.doc/html/roadmap.html
deleted file mode 100755
index aa99bd9..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/roadmap.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Roadmap" />
-<meta name="DC.Relation" scheme="URI" content="guidance.html#guidance" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="roadmap" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Roadmap</title>
-</head>
-<body id="roadmap"><a name="roadmap"><!-- --></a>
-
-<h1 class="topictitle1">Roadmap</h1>
-<div><p>A Roadmap is a specific type of guidance that describes how a process is
-typically performed. Often process can be much easier understood by providing
-a walkthrough with a linear thread of a typical instantiation of the process.
-In addition to making the process practitioner understand how work in the
-process is being performed, a roadmap provides additional information about
-how activities and tasks relate to each other over time. </p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="guidance.html#guidance">Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/role.html b/plugins/org.eclipse.epf.help.doc/html/role.html
deleted file mode 100755
index 0aabd9f..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/role.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Role" />
-<meta name="DC.Relation" scheme="URI" content="createarole.html#createarole" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="role" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Role</title>
-</head>
-<body id="role"><a name="role"><!-- --></a>
-
-<h1 class="topictitle1">Role</h1>
-<div><p>A Role defines a set of related skills, competencies, and responsibilities
-of an individual or individuals.</p>
-</div>
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createarole.html#createarole">Create a Role</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/roleset.html b/plugins/org.eclipse.epf.help.doc/html/roleset.html
deleted file mode 100755
index 79bbc1c..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/roleset.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Role Set" />
-<meta name="DC.Relation" scheme="URI" content="methodcontentcategories.html#methodcontentcategories" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="roleset" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Role Set</title>
-</head>
-<body id="roleset"><a name="roleset"><!-- --></a>
-
-<h1 class="topictitle1">Role Set</h1>
-<div><p>A Role Set is used to group <a href="role.html#role">Roles</a> with
-certain commonalities together. For example, in a software development environment,
-an Analyst role set could be used to group together roles such as Business
-Process Analyst, System Analyst and Requirements Specifier. Each of these
-roles work with similar techniques and have overlapping skills, but may be
-responsible for performing certain tasks and creating certain work products.
-Role sets can be organized using Role Set Groupings.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="methodcontentcategories.html#methodcontentcategories">Method Content Categories</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/rolesetgrouping.html b/plugins/org.eclipse.epf.help.doc/html/rolesetgrouping.html
deleted file mode 100755
index fc75fb0..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/rolesetgrouping.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Role Set Grouping" />
-<meta name="DC.Relation" scheme="URI" content="roleset.html#roleset" />
-<meta name="DC.Relation" scheme="URI" content="role.html" />
-<meta name="DC.Relation" scheme="URI" content="createarole.html#createarole" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="rolesetgrouping" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Role Set Grouping</title>
-</head>
-<body id="rolesetgrouping"><a name="rolesetgrouping"><!-- --></a>
-
-<h1 class="topictitle1">Role Set Grouping</h1>
-<div><p>Role sets can be categorized into role set groupings. For example, different
-method might define similar Role Sets which, however, need to be distinguished
-from each other on a global scale. Thus, Role Set Groupings allow distinguishing,
-for example, Software Services Manager Role sets from Software Development
-Organization Manager Role Sets.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="roleset.html#roleset">Role Set</a></div>
-<div><a href="role.html">Role</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createarole.html#createarole">Create a Role</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/searchformethcont.JPG b/plugins/org.eclipse.epf.help.doc/html/searchformethcont.JPG
deleted file mode 100755
index d9c50df..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/searchformethcont.JPG
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/searchformethodcontent.html b/plugins/org.eclipse.epf.help.doc/html/searchformethodcontent.html
deleted file mode 100755
index 58d2555..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/searchformethodcontent.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="task" />
-<meta name="DC.Title" content="Search for Method Content" />
-<meta name="DC.Relation" scheme="URI" content="methodcontent.html#creatingreusablemethodcontents" />
-<meta name="DC.Relation" scheme="URI" content="userinterfaceoverview.html" />
-<meta name="DC.Relation" scheme="URI" content="browseandpreviewmethodcontent.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="searchformethodcontent" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Search for Method Content</title>
-</head>
-<body id="searchformethodcontent"><a name="searchformethodcontent"><!-- --></a>
-
-<h1 class="topictitle1">Search for Method Content</h1>
-<div><div class="section">To Search for Method Content:</div>
-<ol><li class="stepexpand"><span>There are three ways to begin your search for method content.</span><ul><li>Select <strong>Search &gt; Search</strong></li>
-<li><strong>Search &gt; File</strong></li>
-<li>Click the Search button <span class="uicontrol"><img src="searchformethcont.JPG" alt="" /></span> in the tool bar.</li>
-</ul>
- The Search dialog window opens.</li>
-<li class="stepexpand"><span>Click either the <strong>File Search</strong> tab or the <strong>Method Search</strong> tab
-and then set your criteria. Using the <strong>File Search</strong> tab, you can search
-for content by the file name of the content. Using the <strong>Method Search</strong> tab,
-you can search the method content itself.</span><ul><li><strong>Using File Search</strong>: Type a text string to search for within
-the files (optional), or type a file name pattern to use for matching file
-names. You must use a pattern. Use * if you want to search for the text in
-all files. Leave all other options as default.</li>
-<li><strong>Using Method Search</strong>: Type a text string to search for within
-the files (optional), or type a name pattern for matching element names and
-presentation names. You must use a pattern. Use * if you want to search for
-text in all files. In the Scope section, you can restrict your search to a
-subset of element types.</li>
-</ul>
-</li>
-<li class="stepexpand"><span>Click <strong>Search</strong>. The Search View opens with your search results.</span></li>
-<li class="stepexpand"><span>In the Search View, you can drill down into the search results
-and double-click an element to open the editor for the selected element. If
-you have Link with Editor selected in the library view, the library view display
-changes to show you where the selected element is in the library.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="userinterfaceoverview.html" title="Eclipse Process Framework Composer is built on the Eclipse Integrated Development Environment (IDE). The parts of the workspace are:">Tool Interface</a></div>
-<div class="previouslink"><strong>Previous topic:</strong> <a href="browseandpreviewmethodcontent.html">Browse and Preview Method Content</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="methodcontent.html#creatingreusablemethodcontents">Method Content</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/standardmethodlibraryoverview.html b/plugins/org.eclipse.epf.help.doc/html/standardmethodlibraryoverview.html
deleted file mode 100755
index f9baeae..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/standardmethodlibraryoverview.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Standard Method Library Overview" />
-<meta name="abstract" content="A Method Library is a physical container for method plug-ins and method configuration definitions. All method elements are stored in a method library." />
-<meta name="description" content="A Method Library is a physical container for method plug-ins and method configuration definitions. All method elements are stored in a method library." />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="standardmethodlibraryoverview" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Standard Method Library Overview</title>
-</head>
-<body id="standardmethodlibraryoverview"><a name="standardmethodlibraryoverview"><!-- --></a>
-
-<h1 class="topictitle1">Standard Method Library Overview</h1>
-<div><p>A Method Library is a physical container for method plug-ins and
-method configuration definitions. All method elements are stored in a method
-library.</p>
-<p>Much like a library has books, a method library has method plug-ins. Where
-a library book is made up of sections or chapters and content within those
-chapters, <a href="methodplugin.html#methodplugin">method
-plug-ins</a> are made up of <a href="methodcontent.html#creatingreusablemethodcontents">method content</a> and processes. Method content contains
-content packages and both <a href="methodcontentcategories.html#methodcontentcategories">standard and custom categories</a>, while processes structure
-this content into process fragments called <a href="capabilitypattern.html#capabilitypattern">capability patterns</a> and full lifecycle processes called <a href="deliveryprocess.html">delivery processes</a>.</p>
-<p>A method library also has one or more <a href="methodconfigurations.html#methodconfigurations">method configurations</a> that filter the library and provide
-smaller working sets of library content for the end user.</p>
-</div>
-<div></div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/step.html b/plugins/org.eclipse.epf.help.doc/html/step.html
deleted file mode 100755
index 11ed0ac..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/step.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Step" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="step" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Step</title>
-</head>
-<body id="step"><a name="step"><!-- --></a>
-
-<h1 class="topictitle1">Step</h1>
-<div><p>A Step is a part of the overall work described for a task. The collection
-of steps defined for a task represents all the work that should be done to
-achieve the overall goal of the task. Not all steps are necessarily performed
-each time a task is invoked in a process.</p>
-</div>
-<div></div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/subscript.gif b/plugins/org.eclipse.epf.help.doc/html/subscript.gif
deleted file mode 100755
index 1033c83..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/subscript.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/superscript.gif b/plugins/org.eclipse.epf.help.doc/html/superscript.gif
deleted file mode 100755
index a3675ca..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/superscript.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/supportingmaterial.html b/plugins/org.eclipse.epf.help.doc/html/supportingmaterial.html
deleted file mode 100755
index c1c6d15..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/supportingmaterial.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Supporting Material" />
-<meta name="DC.Relation" scheme="URI" content="guidance.html#guidance" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="supportingmaterial" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Supporting Material</title>
-</head>
-<body id="supportingmaterial"><a name="supportingmaterial"><!-- --></a>
-
-<h1 class="topictitle1">Supporting Material</h1>
-<div><p>Supporting Material is a catch-all for other types of guidance
-not specifically defined elsewhere. It can be related to all kinds of content
-elements, including other guidance elements.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="guidance.html#guidance">Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/task.html b/plugins/org.eclipse.epf.help.doc/html/task.html
deleted file mode 100755
index ec55775..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/task.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Task" />
-<meta name="DC.Relation" scheme="URI" content="createatask.html#createatask" />
-<meta name="DC.Relation" scheme="URI" content="createmethodcontent.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="task" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Task</title>
-</head>
-<body id="task"><a name="task"><!-- --></a>
-
-<h1 class="topictitle1">Task</h1>
-<div><p>A Task is an assignable unit of work. Every Task is assigned to a specific
-Role. The granularity of a Task is generally a few hours to a few days and
-usually affects one or only a small umber of Work Products.</p>
-</div>
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createatask.html#createatask">Create a Task</a></div>
-<div><a href="createmethodcontent.html">Create Method Content</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/template.html b/plugins/org.eclipse.epf.help.doc/html/template.html
deleted file mode 100755
index 5557110..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/template.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Template" />
-<meta name="DC.Relation" scheme="URI" content="guidance.html#guidance" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="template" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Template</title>
-</head>
-<body id="template"><a name="template"><!-- --></a>
-
-<h1 class="topictitle1">Template</h1>
-<div><p>A Template is a specific type of guidance that provides a work product
-with a predefined table of contents, sections, packages, and/or headings,
-a standardized format, as well as descriptions of how the sections
-and packages are supposed to be used and completed. Templates can be provided
-for documents as well as conceptual models or physical data stores.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="guidance.html#guidance">Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/termdefinition.html b/plugins/org.eclipse.epf.help.doc/html/termdefinition.html
deleted file mode 100755
index 1d5a356..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/termdefinition.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Term Definition" />
-<meta name="DC.Relation" scheme="URI" content="guidance.html#guidance" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="termdefinition" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Term Definition</title>
-</head>
-<body id="termdefinition"><a name="termdefinition"><!-- --></a>
-
-<h1 class="topictitle1">Term Definition</h1>
-<div><p>Term definitions defines a specific term, concept, or other idea relevant
-to method and process content. A term definition is not directly related to
-any content elements, but relationships are derived when the term is used
-in the description text in a content element.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="guidance.html#guidance">Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/toolmentor.html b/plugins/org.eclipse.epf.help.doc/html/toolmentor.html
deleted file mode 100755
index 613ef40..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/toolmentor.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Tool Mentor" />
-<meta name="DC.Relation" scheme="URI" content="guidance.html#guidance" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="toolmentor" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Tool Mentor</title>
-</head>
-<body id="toolmentor"><a name="toolmentor"><!-- --></a>
-
-<h1 class="topictitle1">Tool Mentor</h1>
-<div><p>A Tool Mentor is a specific type of guidance that shows how to use a specific
-tool to accomplish a piece of work.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="guidance.html#guidance">Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_ex_1.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_ex_1.htm
deleted file mode 100755
index ef930b8..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_ex_1.htm
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a>Exercise 1: Explore the User Interface </a></h2>
-<p>The purpose of this exercise is to become familiar with the major parts of the Eclipse Process Framework Composer user interface. </p>
-<ol>
-  <li>
-    <p>Switch perspective. The current perspective is displayed near the top right of the screen. You will see either Authoring or Browsing. Click on the <strong>Open Perspective</strong> icon, and select the other perspective. </p>
-  </li>
-  <li>
-    <p>Explore the <strong>Library</strong> <strong>View</strong>. The library view is available in authoring perspective – it is not shown in the browsing perspective. The Library View shows you all the content in the current library. The highest level content unit is a plugin. Click on some <strong>+</strong> signs and explore the content. </p>
-  </li>
-  <li>
-    <p>Drill down into a plugin as follows: <strong>Method Content &gt; Content Packages &gt; [any] &gt; Tasks</strong>. Double click on a task. The Task Editor is displayed on the right of the screen. There are separate editors for the different types of content that you can create in a library. Each editor has a series of tabs and a number of form elements on each tab. You can find out more about these in the <u>Create Method Content </u>tutorial. </p>
-  </li>
-  <li>
-    <p>Click the <strong>Preview </strong> tab. A preview of an HTML page is displayed. This is what the selected element will look like in a published web site. </p>
-  </li>
-  <li>
-    <p>Switch to the <strong>browsing perspective</strong>. The Configuration View is now displayed. The configuration view always has the same structure but the content changes based on which configuration is currently selected. Drill down into the Disciplines folder until you get to tasks and click on a task. The HTML preview of the selected item is shown on the right of the screen. </p>
-  </li>
-  <li>
-    <p>Switch configurations. The current configuration is displayed in the selection box below the main menu bar. Select a configuration from the drop down list. You will see the Configuration View refresh when you do this. </p>
-  </li>
-  <li>Switch to the <strong>authoring</strong> <strong>perspective</strong>. Drill down into a plugin as follows: <strong>Processes &gt; Capability Patterns &gt; [any] &gt; Capability Patterns</strong>. Note that not all plugins have capability patterns. Double-click on a capability pattern. The right side of the screen is now filled with the Capability Pattern editor and the Properties View. You can find out more about these in the <u>Working with Processes</u> tutorial.</li>
-</ol>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_ex_2.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_ex_2.htm
deleted file mode 100755
index 407a920..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_ex_2.htm
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a>Exercise 2: Browse Method Content via Browsing Perspective </a></h2>
-<p>The purpose of this exercise is to become familiar with browsing method content in a library using the browsing perspective. </p>
-<ol>
-  <li>
-    <p>Select <strong>RUP for Small Projects </strong> in the current configuration drop-down list located underneath the main menu bar. </p>
-  </li>
-  <li>
-    <p>Select <strong>Browsing perspective</strong>. The Configuration View appears on the left. </p>
-  </li>
-  <li>
-    <p>To view a Task, click <strong>Disciplines &gt; RUP Disciplines &gt; Analysis &amp; Design &gt; Design the User Interface</strong>. A preview of the published Web page for the selected element is displayed. </p>
-  </li>
-  <li>
-    <p>Click the <strong>Primary Performer </strong>link in the relationships section. This will show the preview page for the User-Interface Designer. </p>
-  </li>
-  <li>
-    <p>You can click on any links in the preview and use the back icon in the preview toolbar to return to previous pages. </p>
-  </li>
-  <li>
-    <p>View other elements in the Configuration View tree – e.g. under Domains, Role Sets, etc. </p>
-  </li>
-</ol>
-<h1>&nbsp;</h1>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_ex_3.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_ex_3.htm
deleted file mode 100755
index 1e11a81..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_ex_3.htm
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a>Exercise 3: Browse Process Content via Browsing Perspective </a></h2>
-<p> The purpose of this exercise is to become familiar with browsing process content in a library using the browsing perspective </p>
-<ol>
-  <li>
-    <p>Make sure you are in the Browsing perspective. </p>
-  </li>
-  <li>
-    <p>To view a Capability Pattern, click <strong>Processes &gt; Capability Patterns &gt; Classic RUP &gt; Discipline Workflows &gt; Analysis and Design</strong>. A preview of the published Web page for the selected Capability Pattern is displayed. </p>
-  </li>
-  <li>A Capability Pattern contains a large amount of information and is displayed over four tabs – Description, Work Breakdown Structure, Work Product Usage and Team Allocation. Explore the information on each tab. 
-    <p>Note that when you click on a task in the Work Breakdown Structure tab you preview a ‘Task Descriptor'. A Task Descriptor is a task within a process. The task descriptor page has information about the task as it is used at a specific point in a process. The task descriptor has a link to the Task on which it is based. </p>
-    <p>Clicking on a role or work product in a task descriptor takes you to a Role Descriptor or a Work Product Descriptor. These provide information about the role or work product at the same point in the process and also provide links back to the core method element on which they are based. </p>
-  </li>
-  <li>To view a Delivery Process, click <strong>Processes &gt; Delivery Processes &gt; Classic RUP Lifecycle</strong>. The display for a Delivery Process is similar to a Capability Pattern. </li>
-</ol>
-<p>&nbsp;</p>
-<h1>&nbsp;</h1>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_ex_4.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_ex_4.htm
deleted file mode 100755
index 1b6f45b..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_ex_4.htm
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a>Exercise 4: Browse Method Content via Authoring Perspective </a></h2>
-<p> The purpose of this exercise is to become familiar with browsing library content while in the authoring perspective. </p>
-<ol>
-  <li>
-    <p>Switch to Authoring perspective. </p>
-  </li>
-  <li>
-    <p>In the Library View, navigate to <strong>RUP &gt; Method Content &gt; Content Packages &gt; Design &gt; GUI Design &gt; Role</strong>s. </p>
-  </li>
-  <li>
-    <p>Select a role (double click) and use the preview tab at the bottom of the role window to view the html representation of that role and its relationships to other method elements. View the other tabs to see the information presented when authoring the method content and relationships for a role. </p>
-  </li>
-  <li>
-    <p>Repeat step 3 to preview a <strong>task</strong> , <strong>work product</strong>, and <strong>guidance element</strong>. </p>
-  </li>
-</ol>
-<p>&nbsp;</p>
-<h1>&nbsp;</h1>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_ex_5.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_ex_5.htm
deleted file mode 100755
index 61451c7..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_ex_5.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-
-<body>
-<h2><a>Exercise 5: Search for Method Content </a></h2>
-<p>The purpose of this exercise is to become familiar with the search function in Eclipse Process Framework Composer. </p>
-<ol>
-  <li>
-    <p>Switch to <strong>Authoring </strong>perspective. </p>
-  </li>
-  <li>Open up the Search dialog by : </li>
-  <blockquote>
-    <p>&#149;&nbsp; Clicking on the Flashlight icon in the toolbar </p>
-    <blockquote>
-      <blockquote>
-        <p><strong>Or </strong></p>
-      </blockquote>
-    </blockquote>
-    <p>&#149;&nbsp; Selecting <strong>Search / Search</strong> in the main menu. </p>
-  </blockquote>
-  <li>
-    <p>Click on the <strong>Method Search</strong> tab. Enter <span class="style1">Database</span> in the text box and click on <strong>Search</strong>. It will take a few seconds to find all the hits. </p>
-  </li>
-  <li>
-    <p>Drill down in the search results and double-click on an element. The editor for the selected item is opened. If you have <strong>Link with Editor</strong> selected in the library view, the library view display changes to show you where the selected item is in the library. </p>
-  </li>
-  <li>
-    <p>Open the search dialog again and repeat the same search but this time reduce the scope to just look for tasks. Uncheck all the other content types in the scope panel. The search should be quicker and result in fewer hits. </p>
-  </li>
-  <li>
-    <p>Open the search dialog again and repeat the same search but this time add <strong>rup_*</strong> as a file name pattern. Make sure the scope is still set to tasks. The search should be even quicker and result in even fewer hits. </p>
-  </li>
-  <li>Experiment with other Method Searches.</li>
-</ol>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_intro.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_intro.htm
deleted file mode 100755
index 65a2deb..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_1_intro.htm
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h1><a>Tutorial: 
-
-
- Navigate the User Interface
-
-</a></h1>
-<h2><a>Introduction </a></h2>
-<p>The purpose of this tutorial is to get familiar with user interface and the way method and process content is stored and viewed. </p>
-<p>A Method Library consists of a series of <strong><em>method plug-ins. </em></strong>Within a plugin, content is separated into <strong><em>Method Content </em></strong> (tasks, roles, work products and guidance) and <strong><em>Processes </em></strong> (capability patterns and delivery processes). This is how the Library View, which shows all the content in the library is organized. </p>
-<p>A configuration is a subset of the method library content. The Configuration View shows the content in the currently selected configuration. Once a configuration is selected, the configuration view is refreshed with the content from the configuration. The content in the configuration view is always laid out using the same set of folders regardless of which configuration is selected. </p>
-<p>EPF Composer has two ‘perspectives'. The Authoring Perspective provides full browsing and authoring capabilities. The Browsing Perspective allows browsing content in the currently selected configuration. </p>
-<p>Content is created and maintained using a series of <strong><em>editors. </em></strong></p>
-<h2>&nbsp;</h2>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_1.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_1.htm
deleted file mode 100755
index 4d41c82..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_1.htm
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-
-<body>
-<h2><a></a><a>Exercise 1: Create or Modify a Method Content Package </a></h2>
-<p>The purpose of this task is to create a new <strong>Content Package </strong> within a <strong>Method Plug-in</strong>. </p>
-<p>To create a new Method Plug-in: </p>
-<ol>
-  <li>
-    <p> Make sure you are in the <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>Click <strong>File &gt; New &gt; Method Plug-in</strong>. 
-    <p>Or </p>
-    <p>Right-click an existing Plug-in and select <strong>New Method Plug-in</strong>. <br>
-  The New Method Plug-in wizard is launched. </p>
-  </li>
-  <li>
-    <p>In the New Method Plug-in wizard, provide a name for the new plug-in. In this instance, we'll call it My Plugin. </p>
-  </li>
-  <li>
-    <p>Select <strong>RUP </strong> in the Referenced Plug-ins panel, and then click <strong>Finish</strong>. This means that your plug-in will extend the RUP plug-in and you will be able to select content from the RUP plug-in as you create your own plug-in content. <br>
-      <span class="style1">My Plugin</span> now appears in the Library View on the left side of your screen. It is not grayed out indicating that it is not locked and that you can edit it. </p>
-  </li>
-  <li>Double click on <span class="style1">My Plugin</span> to open the Plugin editor. About halfway down the page you will see the ‘Lock Plugin' checkbox. This will be unchecked for your new plugin. If you open the plugin editor for the RUP plugin this field will be checked. </li>
-</ol>
-<p>To create a Method Package: </p>
-<ol start="6">
-  <li>
-    <p>In the Library View, click <strong>My Plugin &gt; Method Content &gt; Content Packages</strong>.  </p>
-  </li>
-  <li>
-    <p>Right-click <strong>Content Packages</strong>. </p>
-  </li>
-  <li>
-    <p> Highlight <strong>New</strong> and then click <strong>Content Package</strong> to create a new Content Package. <br>
-      The Content Package editor is displayed and you can name the package and provide a Brief Description. We'll call it “My Content Package”. <br>
-      <strong>Note: </strong> You cannot create a new Content Package or any other element in a locked plugin. </p>
-  </li>
-  <li>Save your new content. </li>
-</ol>
-<p><strong>Note: </strong> When you create a new element or modify an existing element, a ‘*' appears in the tab next to the name of the element, indicating that the element needs to be saved. An element can be saved by closing the editor, clicking the disk icon in the toolbar, or clicking <strong>File &gt; Save </strong>. </p>
-<p><strong>Note: </strong> EPF Composer automatically creates nodes for tasks, roles, work products and guidance under the new content package. </p>
-<h1>&nbsp;</h1>
-<h2>&nbsp;</h2>
-<h1>&nbsp;</h1>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_2.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_2.htm
deleted file mode 100755
index e9f4557..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_2.htm
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-
-<body>
-<h2><a></a><a>Exercise 2: Create Work Product</a>s </h2>
-<p>The purpose of this exercise is to create new method content. Specifically, <strong>Work Products </strong>of type <strong> Artifact </strong>. You can create any content but some examples are provided if you want to use them. These examples are referred to in other tutorials. </p>
-<p>Method and Process elements have two names in EPF Composer: Name and Presentation Name. </p>
-<p>The Name field is used as the file name for the item. In RUP, we are careful how we name the files and use conventions such as lower case, no spaces, and no special characters. We do this so that the name is a valid file name on all operating systems and for integration with source control software in the future. The Name is shown in the Library View. </p>
-<p>The Presentation Name is the name that is shown on published pages and it is also shown in the Configuration View. This name can contain any characters, but by convention in RUP, we use the same text as the Name, just prettier. </p>
-<p>In the Library view you can choose to display Names or Presentation Names. You can switch the name display using the ‘Show Presentation Names' button in the Library view toolbar. </p>
-<p>In general, you create new elements by right-clicking the folder that will contain the new element. For example, to create a new role in a content package, right-click the <strong>Roles </strong> folder, highlight <strong>New </strong> and then click <strong>Role</strong>. </p>
-<ol>
-  <li>
-    <p>Make sure you are in the <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>
-    <p> Within <span class="style1">My Content Package</span> right-click on the <strong>Work Products</strong> folder. </p>
-  </li>
-  <li>
-    <p> Highlight <strong>New</strong> and then click <strong>Artifact</strong>. The artifact editor is displayed. </p>
-  </li>
-  <li>
-    <p> In the Name field, type the new Artifact name. In this instance, we'll call it <strong>my_rup_navmap</strong>. </p>
-  </li>
-  <li> In the <strong>Presentation Name</strong> field, type: </li>
-  <blockquote>
-    <p>My RUP Navigation Map</p>
-  </blockquote>
-  <li>In the <strong>Brief Description</strong> field, type:
-    <blockquote>
-      <p>The Navigation Map expresses the structure of the user-interface elements in the system, along with their potential navigation pathways.</p>
-    </blockquote>
-  </li>
-  <li> In the <strong>Purpose</strong> field type: 
-    <blockquote>
-      <p>There is one Navigation Map per system. The purpose of the Navigation Map is to express the principal user interface paths through the system. These are the main pathways through the screens of the system and not necessarily all of the possible paths. It can be thought of as a road map of the system's user interface. The Navigation Map makes it easy to see how many &quot;clicks&quot; it will take a user to get to a specific screen. </p>
-    </blockquote>
-  </li>
-  <li>
-    <p>Click the preview tab to view the new Artifact. </p>
-  </li>
-  <li>
-    <p> Save the Artifact. </p>
-  </li>
-  <li> Repeat steps 2 through 9 using the following information: 
-    <blockquote>
-      <p>&#149;&nbsp; <strong>Artifact Name</strong>: my_rup_user_interface_prototype </p>
-      <p>&#149;&nbsp; <strong>Presentation Name</strong>: My RUP UI Prototype </p>
-      <p>&#149;&nbsp; <strong>Brief Description</strong>: A user-interface prototype is an example of the user interface that is built in order to explore and/or validate the user-interface design. </p>
-      <p>&#149;&nbsp; <strong>Purpose: </strong> The following roles use the user-interface prototype: </p>
-      <blockquote>
-        <p>- <strong>user-interface designers</strong> , to explore and/or validate the user-interface design before too much is invested in it </p>
-        <p>- <strong>requirements specifiers </strong>, to understand the user interface for a Use Case </p>
-        <p><strong>- system analysts </strong>, to understand how the user interface impacts the analysis of the system </p>
-        <p>- <strong>designers </strong>, to understand how the user interface impacts and what it requires from the &quot;inside&quot; of the system </p>
-        <p> - <strong>managers </strong>, to plan development and testing activities </p>
-      </blockquote>
-    </blockquote>
-  </li>
-</ol>
-<h2>&nbsp;</h2>
-<h1>&nbsp;</h1>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_3.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_3.htm
deleted file mode 100755
index c8d6e84..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_3.htm
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a></a><a>Exercise 3: Create Roles </a></h2>
-<p>To create a Role in My Content Package: </p>
-<ol>
-  <li>
-    <p> Make sure you are in the <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>
-    <p>Within My Content Package right-click on the <strong>Roles </strong> folder. </p>
-  </li>
-  <li>
-    <p>Highlight <strong>New </strong> and then click <strong>Role</strong>. </p>
-  </li>
-  <li>
-    <p>In the <strong>Name field </strong> type: my_rup_user_interface_designer. </p>
-  </li>
-  <li>
-    <p>In the <strong>Presentation Name</strong> field type: My UI Designer. </p>
-  </li>
-  <li>In the <strong>Brief Description </strong> field type: </li>
-  <blockquote>
-    <p>The user-interface designer coordinates the design of the user interface. User-interface designers are also involved in gathering usability requirements and prototyping candidate user-interface designs to meet those requirements. </p>
-    <p><strong>Tip </strong> - there are different ways that you can create the text above for the new role: </p>
-    <blockquote>
-      <p>&#149;&nbsp; Directly, by typing it manually in the EPF Composer editor. </p>
-      <p>&#149;&nbsp; By copying from another similar role and then modify using the editors (e.g. rup_user_interface_designer). </p>
-    &#149;&nbsp;By copying from an html source such as the tutorial you are reading. </blockquote>
-  </blockquote>
-  <li>    Try the <strong>Rich Text Editor </strong> for editing the <strong>Main Description. </strong>You can open the Rich Text Editor for any item that has a ‘twisty' <img width="13" height="13" src="tutorial_2_ex_3_clip_image002.gif">symbol 
-    <blockquote>
-      <p>&#149;&nbsp; The user-interface designer role is not responsible for implementing the user interface. Instead, this role focuses on the design and the &quot;visual shaping&quot; of the user interface, by: </p>
-    </blockquote>
-  </li>
-  <ol>
-    <blockquote>
-      <p> - Capturing requirements on the user interface, including usability requirements. </p>
-      <p>- Building user-interface prototypes.</p>
-      <p>- Involving other stakeholders of the user interface, such as end-users, in usability reviews and use testing sessions. </p>
-      <p>- Reviewing and providing the appropriate feedback on the final implementation of the user interface, as created by other developers; that is, designers and implementers. </p>
-    </blockquote>
-  </ol>
-  <blockquote>
-    <p><strong>Note</strong> – if you copy text from a Microsoft Word document you will get a lot of formatting information that is not needed in Eclipse Process Framework Composer. You can see this if you open the HTML editor in the Rich Text Editor. </p>
-  </blockquote>
-  <li>
-    <p>Click the <strong>WorkProducts </strong> tab; make this new role responsible for the my_rup_navmap and my_rup_user_interface_prototype artifacts that you previously created. </p>
-  </li>
-  <li>
-    <p>Click the <strong>Add </strong> button. This displays a selection dialog where you can select the Work Products to add. </p>
-  </li>
-  <li>Once you have selected the appropriate Work Products, click <strong>OK</strong>. The work products you selected appear in the <strong>Responsible for: </strong> panel. 
-    <blockquote>
-      <p>Note that selected elements in an Add/Remove section display both the element name and the ‘path' to that element – the Plugin name and package name. </p>
-    </blockquote>
-  </li>
-  <li>Click the <strong>Preview </strong> tab to view the newly created role and then save by closing the editor. </li>
-</ol>
-<h2>&nbsp;</h2>
-<h1>&nbsp;</h1>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_3_clip_image002.gif b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_3_clip_image002.gif
deleted file mode 100755
index bb2fc81..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_3_clip_image002.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_4.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_4.htm
deleted file mode 100755
index 15f921c..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_4.htm
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a></a><a></a><a>Exercise 4: Create Tasks </a></h2>
-<p>The purpose of this exercise is to create a task and then relate that task to the other elements you have created. </p>
-<p>To create a Task in My Content Package: </p>
-<ol>
-  <li>
-    <p>Make sure you are in the <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>
-    <p> Within My Content Package right-click on the <strong>Tasks </strong> folder. </p>
-  </li>
-  <li>
-    <p> Highlight <strong>New </strong> and then click <strong>Task</strong>. </p>
-  </li>
-  <li>Use the following information to create the task:  </li>
-  <blockquote>
-    <p>&#149;&nbsp; <strong>Task: </strong> my_design_user_interface </p>
-    <p>&#149;&nbsp; <strong>Presentation Name </strong>: My Design User Interface </p>
-    <p>&#149;&nbsp; <strong>Brief Description: </strong> To produce a design of the user interface that supports the reasoning about, and the enhancement of, its usability. </p>
-    <p>&#149;&nbsp; <strong>Steps </strong>(Use steps tab):</p>
-    <blockquote>
-      <p>- Describe the characteristics of related users </p>
-    - Identify the primary user interface elements </blockquote>
-    <p>&#149;&nbsp; <strong>Roles (Primary Performer): </strong>my_rup_user_interface_designer </p>
-    <p>&#149;&nbsp; <strong>Work Products (Mandatory Input) </strong> rup_software_requirement (under requirements) <strong></strong></p>
-    <p>&#149;&nbsp; <strong>Work Products </strong> (Outputs): my_rup_navmap </p>
-    <p>&#149;&nbsp; <strong>Guidance: </strong>representing_graphical_user-interfaces (under gui_design) <strong></strong></p>
-  &#149;&nbsp; <strong>Categories: </strong>rup_analysis_design_discipline <strong></strong></blockquote>
-  <li>
-    <p>Click the <strong>Preview </strong> tab to view the newly created task and save by closing the editor. </p>
-  </li>
-  <li>    Create another task using the following information:
-    <blockquote>
-      <p>&#149;&nbsp; <strong>Task: </strong> my_prototype_user_interface </p>
-      <p>&#149;&nbsp; <strong>Presentation name </strong>: My Prototype User Interface </p>
-      <p>&#149;&nbsp; <strong>Brief Description: </strong> To prototype the system's user interface in an attempt to validate the user-interface design against the functional and usability requirements. </p>
-      <p>&#149;&nbsp; <strong>Steps: </strong></p>
-      <blockquote>
-        <p>-&nbsp; Design the user interface prototype </p>
-        <p>-&nbsp; Implement the user interface prototype </p>
-      </blockquote>
-      <p>&#149;&nbsp; <strong>Roles (Primary Performer): </strong>my_rup_user_interface_designer </p>
-      <p>&#149;&nbsp; <strong>Work Products (Mandatory Input) </strong> my_rup_navmap </p>
-      <p>&#149;&nbsp; <strong>Work Products (Outputs): </strong>my_rup_user_interface_prototype </p>
-      <p>&#149;&nbsp; <strong>Categories: </strong>rup_analysis_design_discipline </p>
-    </blockquote>
-  </li>
-  </ol>
-<h2>&nbsp;</h2>
-<h1>&nbsp;</h1>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_5.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_5.htm
deleted file mode 100755
index dcadeaf..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_5.htm
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a></a><a></a><a>Exercise 5: Working with Steps </a></h2>
-<p>The purpose of this exercise is to understand the Step Editor that is part of the Task Editor. </p>
-<p>When you create a task, you can define a series of steps that detail how to perform the task. The Step Editor allows you to add new steps, change the sequence of steps and to delete steps. </p>
-<ol>
-  <li>
-    <p>Open the my_design_user_interface task or create a new task. Click on the <strong>Steps</strong> tab. </p>
-  </li>
-  <li>Create a new step:  </li>
-  <blockquote>
-    <p>&#149; Enter a name for the step in the ‘Steps' box. </p>
-    <p>&#149; Enter a <strong>Description </strong> – you can use the Rich Text Editor for this. </p>
-    <p>&#149; Click the <strong>Add </strong> button. </p>
-    <p>&#149; See the results on the <strong>Preview </strong> tab. </p>
-  </blockquote>
-  <li>    Remove a step : </li>
-  <blockquote>
-    <p>&#149; Return to the <strong>Steps</strong> tab. </p>
-    <p>&#149; Click the step to remove in the Steps panel. </p>
-    <p>&#149; Click the <strong>Delete </strong> button. </p>
-    <p>&#149; See the results on the <strong>Preview </strong> tab. </p>
-  </blockquote>
-  <li>    Move a step up the list: </li>
-  <blockquote>
-    <p>&#149;&nbsp; Return to the <strong>Steps</strong> tab. </p>
-    <p>&#149;&nbsp; Click the step you want to move up.</p>
-    <p>&#149;&nbsp; Click the <strong>Up </strong> button.</p>
-    <p>&#149;&nbsp; See the results on the <strong>Preview </strong> tab. </p>
-  </blockquote>
-  <li>Move a step down the list :  </li>
-  <blockquote>
-    <p>&#149;&nbsp; Return to the <strong>Steps</strong> tab. </p>
-    <p>&#149;&nbsp; Click the step you want to move down.</p>
-    <p>&#149;&nbsp; Click the <strong>Down </strong> button.</p>
-    <p>&#149;&nbsp; See the results on the <strong>Preview </strong> tab. </p>
-  </blockquote>
-</ol>
-<h2>&nbsp;</h2>
-<h1>&nbsp;</h1>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_6.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_6.htm
deleted file mode 100755
index 4912df5..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_6.htm
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-
-<body>
-<h2><a></a><a></a><a>Exercise 6: Create Guidance </a></h2>
-<p>The purpose of this exercise is to create method <strong>Guidance </strong> elements. There is a range of different types of guidance that can be created. For this task we will simply create a representative guidance element, a checklist. Once you have done this, try authoring additional Guidance types. </p>
-<p>In a checklist, Check Items are created in the same way as Steps in a task are created using the <strong>Check Items </strong> tab in the <strong>Checklist Editor</strong>. </p>
-<ol>
-  <li>
-    <p>Make sure you are in the <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>
-    <p>Within <span class="style1">My Content Package</span> right-click on the <strong>Guidance </strong> folder. </p>
-  </li>
-  <li>
-    <p>Highlight <strong>New </strong> and then click <strong>Checklist</strong>. </p>
-  </li>
-  <li>
-    <p>Name the guidance, my_create_physical_appearance_checklist, and provide the presentation name, My Create Physical Appearance Checklist. </p>
-  </li>
-  <li>    Add the following check items: </li>
-  <blockquote>
-    <p>&#149;&nbsp; Create branding specifications </p>
-    <p>&#149;&nbsp; Define physical specifications </p>
-  </blockquote>
-  <li>Add the checklist to the <strong> my_prototype_user_interface </strong>task and then look for it on the preview page. </li>
-</ol>
-<h2>&nbsp;</h2>
-<h1>&nbsp;</h1>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_7.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_7.htm
deleted file mode 100755
index 09d460f..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_7.htm
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-
-<body>
-<h2><a></a><a></a><a></a><a>Exercise 7: Manage Guidance </a></h2>
-<p>Guidance can be attached to any Core Method Content or Process Element. Guidance can even be attached to a Guidance element. </p>
-<p>The goal of this exercise is to carry out some simple guidance management tasks (i.e., adding and removing guidance.)</p>
-<ol>
-  <li>
-    <p>Navigate to the artifact <strong>my_rup_navmap </strong> that you created in exercise 2 in this tutorial. </p>
-  </li>
-  <li>    Add the Concept Paper <strong>process_view </strong> from the RUP plug-in. </li>
-  <blockquote>
-    <p>The list of items in the Select Dialog is restricted to just those items that are allowed to be added. The list can be long though. You can enter a search string, such as ‘pro' in the ‘Name patterns' box to filter the items that are displayed. Note that you can use the Collapse All and Expand All buttons on this dialog to change the way the tree is displayed. </p>
-  </blockquote>
-  <li>
-    <p>Add <strong>my_create_physical_appearance_checklist </strong> Checklist. </p>
-  </li>
-  <li>
-    <p>Click the <strong>Preview </strong> tab to view your work. </p>
-  </li>
-  <li>
-    <p>Remove the Concept Paper process_view. </p>
-  </li>
-  <li>Click the <strong>Preview </strong> tab to view your work. </li>
-</ol>
-<h2>&nbsp;</h2>
-<h1>&nbsp;</h1>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_8.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_8.htm
deleted file mode 100755
index 3d23694..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_8.htm
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-
-<body>
-<h2><a></a><a></a><a></a><a></a><a></a><a>Exercise 8: Create New Standard Category </a></h2>
-<p>The purpose of this exercise is to understand and use <strong>Standard Categories. </strong>In practice, this will not be done very often, as Standard Categories tend to be relatively stable. Also, if you are creating a plug-in that extends RUP, you should attempt to use the RUP Standard Categories before creating new ones. </p>
-<p><strong>Standard Categories </strong> provide a means to categorize core method content in line with best practices for creating structured methods. In order to encourage good method structure we provide standard categories for grouping <strong>Tasks </strong>into <strong><em>Disciplines </em></strong>, <strong>Work Products </strong> into <strong><em>Domains </em></strong>, <strong>Roles </strong> into <strong><em>Role Sets </em></strong>, and <strong>Tool-Mentors </strong> into <strong><em>Tools </em></strong>. Unlike <strong><em>Custom </em> Categories </strong>, <strong>Standard Categories </strong> by definition are linked with a specific method content type – e.g. Role Sets with Roles, Disciplines with Tasks, and Domains with Work Products. </p>
-<ol>
-  <li>
-    <p>Click <strong>My Plugin &gt; Method Content &gt; Standard Categories</strong>. </p>
-  </li>
-  <li>
-    <p> Create a new <strong>Role Set </strong>named <span class="style1">my_design</span> with a presentation name of <span class="style1">My Design</span>. </p>
-  </li>
-  <li>    Add the role <span class="style1">my_rup_user_interface_designer</span> to the<span class="style1"> my_design</span> <strong>Role Set</strong>. </li>
-</ol>
-<blockquote>
-  <p>There are two ways you can do this: </p>
-  <blockquote>
-    <p>&#149;&nbsp; In the Standard Category editor for <span class="style1">my_design</span>, open the <strong>Roles</strong> tab, and add the role to the roleset. </p>
-    <p>&#149;&nbsp;In the Role editor for <span class="style1">my_rup_user_interface_designer</span>, open the <strong>Categories</strong> tab and add the <span class="style1">my_design</span> category as a Selected Roleset. </p>
-  </blockquote>
-</blockquote>
-<h2>&nbsp;</h2>
-<h1>&nbsp;</h1>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_9.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_9.htm
deleted file mode 100755
index ee78930..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_ex_9.htm
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a></a><a></a><a></a><a></a><a></a><a>Exercise 9: </a>Adding Your Plug-in to the Configuration View </h2>
-<p>The purpose of this exercise is to learn how to include your plug-in in a configuration. </p>
-<p>Before your new elements can be seen in the Configuration View, you need to first add your new plug-in to a configuration. We'll add the new plug-in to the Config for RUP configuration and see the results in the Configuration View. </p>
-<ol>
-  <li>
-    <p>Switch to the <strong>Browsing </strong>perspective and in the <strong>Configuration View </strong>try to find your new content. For example look for My Design Roleset. You shouldn't see it. </p>
-  </li>
-  <li>
-    <p> Switch to the <strong>Authoring </strong>perspective and then click <strong>Configurations </strong> at the bottom of the tree display. </p>
-  </li>
-  <li>
-    <p> Make a copy of the <strong>RUP for Small Projects </strong> configuration. Right-click on the <strong>RUP for Small Projects </strong> configuration and select <strong>Copy </strong>. Then right-click on the Configurations folder and click <strong>Paste </strong>. Name the new configuration <strong>My RUP for Small Projects. </strong></p>
-  </li>
-  <li>
-    <p> Double-click on the <strong>My RUP for Small Projects </strong> configuration to open the Configuration Editor. </p>
-  </li>
-  <li>
-    <p> Click on the <strong>Plug-in and Package Selection</strong> tab. </p>
-  </li>
-  <li>
-    <p> Add <strong>My Plugin </strong> to the configuration by checking the box next to it in the Configuration Components field. If you expand <strong>My Plugin </strong> you will see that the full contents of the plug-in have been selected. 
-      You may see some errors in the Library Error Log view. You can click through these errors or ignore them for now. </p>
-  </li>
-  <li>
-    <p> Close the editor and save the changes. </p>
-  </li>
-  <li>
-    <p> Change the current configuration to <strong>My RUP for Small Projects </strong>in the configuration selection box in the EPF Composer toolbar, just below the main menu bar. </p>
-  </li>
-  <li> Switch to the <strong>Browsing </strong> perspective and now look for your content in the <strong>Configuration View</strong>. You should now see <strong>My Design Roleset </strong>. You should also see your new Work Products in the Uncategorized folder under Domains. </li>
-</ol>
-<blockquote>&nbsp;</blockquote>
-<h2>&nbsp;</h2>
-<h1>&nbsp;</h1>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_intro.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_intro.htm
deleted file mode 100755
index b3eca88..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_2_intro.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h1><a>Tutorial: Create Method Content </a></h1>
-<h2><a>Introduction </a></h2>
-<p>EPF Composer separates reusable <strong>method content </strong> from its application in <strong>processes </strong>. The primary method content elements are <strong>tasks </strong>, <strong>roles </strong>, <strong>work products </strong> and <strong>guidance </strong>. A Process Engineer uses EPF Composer to author these elements, define the relationships between them, and to categorize them. Method content provides step-by-step explanations, describing how specific development goals are achieved independent of the placement of these steps within a development lifecycle. Processes take these method elements and relate them into semi-ordered sequences that are customized to specific types of projects. </p>
-<p>EPF Composer supports the concept of <strong>Method Plug-ins </strong> that allows the extension or customization of base library content without directly changing that base content. When we ship a library with EPF Composer the library is protected from direct modification. The RUP plugins are grayed out in the Library view indicating that they are locked. </p>
-<p><strong>You should always create new content in a Method Plug-in that you produce. </strong>This separates your content from the original OpenUP content and allows you to update your own library with new releases of the OpenUP library without affecting the content that you have created in your own plug-ins. </p>
-<p>In this tutorial you will use several ‘editors'. Each editor opens in its own tab in the content display section of the screen. It is good practice to close an editor when you have finished with it. This ensures that you save any changes you make. </p>
-<p>If you do have several editors open, you may want to turn on the ‘Link with Editor' feature by clicking on the Link with Editor button in the Library view toolbar. If this is selected, when you switch between editors, the element in the current editor is highlighted in the Library view. </p>
-<p>The following exercises take you through the creation of “core method content”. </p>
-<h2>&nbsp;</h2>
-<h1>&nbsp;</h1>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_1.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_1.htm
deleted file mode 100755
index a289b09..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_1.htm
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-
-<body>
-<h2><a>Exercise 1: Adding to base method content associated with a role using Contribution </a></h2>
-<p>The purpose of this exercise is to extend a role in RUP using ‘contribution'. </p>
-<ol>
-  <li>
-    <p>Switch to the <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>
-    <p>This exercise adds content to the My Plugin plugin. If you have not carried out the ‘Create Core Method Content tutorial, create it now. </p>
-  </li>
-  <li>
-    <p>Create a Content Package in the My Plugin plug-in called <span class="style1">Contribution</span> Test. </p>
-  </li>
-  <li>
-    <p>In the new Contribution Test content package, create a new Role: <span class="style1">my_contributing_ui_designer</span>. </p>
-  </li>
-  <li>
-    <p>Page down the Description tab to the Content Variability section and then, in the <strong>Variability Type </strong>, select <strong>Contributes </strong> and choose the base role: <strong>rup_user_interface_designer </strong>. You will find this in <strong>RUP &gt; Design &gt; GUI Design</strong>. </p>
-  </li>
-  <li>    Complete the following: </li>
-  <blockquote>
-    <p>&#149;&nbsp; Add Brief Description: Contributing brief description text </p>
-    <p>&#149;&nbsp; Add Main Description : Contributing main description text </p>
-    <p>&#149;&nbsp; Save (by closing the role editor). </p>
-  </blockquote>
-  <li>
-    <p>Create a new Configuration by selecting the <strong>Configurations </strong> folder in the Library View tree. </p>
-  </li>
-  <li>
-    <p>Right click the folder to create new configuration and then name the configuration <span class="style1">Variability Configuration</span>. </p>
-  </li>
-  <li>
-    <p> Select the RUP base and your plug-in (My Plugin) by marking the checkboxes. Save the configuration (close the configuration tab). </p>
-  </li>
-  <li>
-    <p>Set “current configuration” – located under main menu bar as “Variability Configura tion”. </p>
-  </li>
-  <li>
-    <p>Switch to the <strong>Browsing</strong> perspective and then open the User-Interface Designer role. </p>
-  </li>
-  <li>    You should see the text that you included in the Contributing role displayed in the User-Interface Designer. </li>
-</ol>
-<blockquote>
-  <p><strong>Note: </strong> The Configuration View resolves the variability relationships between related plug-ins in a configuration and shows the results as they will be published in a published web site. </p>
-</blockquote>
-<h2>&nbsp;</h2>
-<h1>&nbsp;</h1>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_2.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_2.htm
deleted file mode 100755
index 937973e..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_2.htm
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-
-<body>
-<h2><a>Exercise 2: Adding to base method content associated with a work product using <u>Contribution</u> </a></h2>
-<p>The purpose of this exercise is to extend a <strong>Work Product </strong> (<strong>Artifact</strong>) in RUP using ‘contribution'. </p>
-<ol>
-  <li>
-    <p>Switch to the <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>
-    <p> Within the Contribution Test package create a new artifact called <span class="style1">my_contributing_navmap</span>. </p>
-  </li>
-  <li>
-    <p> Add a <strong>Brief Description, Main Description</strong>, <strong>Purpose</strong>, etc., : <span class="style1">Contributing Brief Description, Contributing Main Description, and Contributing Purpose</span>. </p>
-  </li>
-  <li>
-    <p> In <strong>Variability Relationship </strong> select <strong>Contributes </strong>, and for <strong>base artifact </strong> select <span class="style1">rup_navmap</span>. Save by closing the Work Product editor. </p>
-  </li>
-  <li>
-    <p> Switch to the Browsing perspective and view the Navigation Map artifact in the <strong>Analysis and Design Domain </strong> folder in <strong>Configuration View. </strong></p>
-  </li>
-  <li> You should see the text that you included in the Contributing role displayed in the User-Interface Designer. </li>
-</ol>
-<blockquote>&nbsp;</blockquote>
-<h2>&nbsp;</h2>
-<h1>&nbsp;</h1>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_3.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_3.htm
deleted file mode 100755
index 344d90c..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_3.htm
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-
-<body>
-<h2><a>Exercise 3: Adding base method content associated with a task using <u>Contribution</u> </a></h2>
-<p>The purpose of this exercise is to extend a <strong>Task </strong> in RUP using ‘contribution'. </p>
-<ol>
-  <li>
-    <p>Switch to the <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>
-    <p>Within the <span class="style1">Contribution Test </span>package create a new <strong>Task</strong>: <span class="style1">my_contributing_design_user_interface</span>. </p>
-  </li>
-  <li>
-    <p> Add a <strong>Brief Description, Main description </strong>, <strong>Purpose</strong>, etc.,: <span class="style1">Contributing Brief Description text, Contributing Main Description text, and Contributing Purpose text. </span></p>
-  </li>
-  <li>
-    <p> Add two new steps: <span class="style1">Contributing Step 1 </span>and<span class="style1"> Contributing Step 2</span>. </p>
-  </li>
-  <li>
-    <p> In <strong>Variability Relationship </strong> select <strong>Contributes</strong>, and for base <strong>task </strong> select, <span class="style1">design_user_interface</span>. </p>
-  </li>
-  <li>
-    <p> Go back to the <strong>Steps </strong> tab and click the <strong>Order </strong> button. You can now insert your new steps into the original steps. </p>
-  </li>
-  <li>
-    <p>Save the new task by closing the task editor. </p>
-  </li>
-  <li>
-    <p> Switch to the Browsing perspective and view the <span class="style1">Design the User Interface</span> task in the <strong>Disciplines </strong> folder in <strong>Configuration View </strong>. You will find it under the <span class="style1">Analysis_&amp; Design</span> discipline. </p>
-  </li>
-  <li>
-    <p> Look at the descriptions and the steps to see how your new material was contributed. You should see the text that you included in the Contributing role displayed in the User Interface task. </p>
-  </li>
-  <li> You can also try specifying additional <strong>artifacts </strong>, <strong>guidance </strong>, <strong>additional performer roles</strong>, etc., in the contributing task (in Authoring perspective) and then view the result in the Configuration View to see the behavior. </li>
-</ol>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_4.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_4.htm
deleted file mode 100755
index 845ce43..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_4.htm
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-
-<body>
-<h2><a>Exercise 4: Extending base method content associated with a role using <u>Extends</u> </a></h2>
-<p>The purpose of this exercise is to extend base method content via extends variability. Extends variability works differently than Contributes variability in that the method content element that extends the base method element inherits the attributes of the extended base element. </p>
-<ol>
-  <li>
-    <p> Switch to the <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>
-    <p> Create a new <strong>Content Package </strong> in the My Plugin Plug-in called Extends Test. </p>
-  </li>
-  <li>
-    <p> Create a new <strong>Role </strong>: <span class="style1">my_extends_ui_designer,</span> with the presentation name, <span class="style1">Extends RUP UI Designer</span>. </p>
-  </li>
-  <li>
-    <p> In the Variability Type select <strong>Extends </strong> and choose the base role: <span class="style1">rup_user_interface_designer</span>. </p>
-  </li>
-  <li>
-    <p> Add a <strong>Brief Description</strong>: Extends Role Brief Description. </p>
-  </li>
-  <li>
-    <p> Add a <strong>Main Description </strong>: Extends Role Main Description. </p>
-  </li>
-  <li>
-    <p> Save the new role by closing the role editor. </p>
-  </li>
-  <li> Update the Variability Configuration to include the new content package. </li>
-  <blockquote>
-    <p> &#149;&nbsp;Open the <span class="style1">Variability Configuration</span> and expand <strong>My Plugin &gt; Method Content &gt; Content Packages. </strong> </p>
-    <p>&#149; Uncheck Contribution Test. </p>
-    <p>&#149; Make sure <strong>Extends Test </strong>is checked. This is done so there that are no conflicting extensions to the same method element. </p>
-    <p>&#149; Close and save the changes to the configuration. </p>
-  </blockquote>
-  <li>
-    <p> Switch to <strong>Browsing </strong> perspective. </p>
-  </li>
-  <li> In the <strong>Configuration View</strong>, select the <span class="style1">Extends RUP UI Designer role</span> in the Uncategorized Roles folder under the “<strong>Role Sets</strong>” folder. You will see in the html page that content entered in the extending role has been replaced, whereas content not provided has been inherited from the base artifact. Note that the extended role <span class="style1">User-Interface Designer</span> remains unchanged. </li>
-</ol>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_5.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_5.htm
deleted file mode 100755
index 44b851f..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_5.htm
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-
-<body>
-<h2><a>Exercise 5: Extending base method content associated with a Work Product using <u>Extends</u> </a></h2>
-<p>The purpose of this exercise is to extend a base method work product using extends variability. </p>
-<ol>
-  <li>
-    <p> Switch to the <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>
-    <p> Create a new <strong>Work Product </strong> in the <span class="style1">Extends Test</span> Content Package called <span class="style1">my_extends_rup_navmap</span> with the presentation name, <span class="style1">Extends RUP Navmap</span>. </p>
-  </li>
-  <li>
-    <p> In the <strong>Variability Type </strong> select <strong>extends </strong> and choose the base <strong>Work Product </strong><span class="style1">rup_navmap</span>. </p>
-  </li>
-  <li>
-    <p> Add a <strong>Brief Description </strong>: Extends Navmap Brief Description. </p>
-  </li>
-  <li>
-    <p> Save and then switch to the <strong>Browsing </strong> perspective. </p>
-  </li>
-  <li>In the <strong>Configuration View</strong>, select the <span class="style1">Extends RUP Navmap</span> work product in the <strong>Uncategorized Folder </strong> under <strong>Domains </strong>. You will see in the html page that content entered in the extending artifact has been replaced, whereas content not provided has been inherited from the base artifact. Note that the extended artifact <span class="style1">Navigation Map</span> remains unchanged.</li>
-</ol>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_6.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_6.htm
deleted file mode 100755
index 8db4c51..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_6.htm
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-
-<body>
-<h2><a>Exercise 6: Extending base method content associated with a Task using <u>Extends</u> </a></h2>
-<p>The purpose of this exercise is to extend a base method task using extends variability. </p>
-<ol>
-  <li>
-    <p> Create a new <strong>task </strong> in the Extends Test content package called <span class="style1">my_extends_design_user_interface</span>, with presentation name, <span class="style1">Extends Design User Interface. </span></p>
-  </li>
-  <li>
-    <p> In the <strong>Variability Type, </strong> select <strong>extends </strong> and choose the base task design_user_interface. </p>
-  </li>
-  <li>
-    <p> Add a <strong>Brief Description </strong>: <span class="style1">Extends Task Brief Description</span>. </p>
-  </li>
-  <li>
-    <p> Add <strong>Steps </strong>: <span class="style1">Extend Step 1, Extend Step 2 </span></p>
-  </li>
-  <li>
-    <p> Add the <strong>Role </strong> created in exercise 4: <span class="style1">my_extends_ui_designer</span>, as Primary Performer. </p>
-  </li>
-  <li>
-    <p> Add the Work Product created in exercise 5: <span class="style1">my_extends_rup_navmap</span>, as an Output. </p>
-  </li>
-  <li>
-    <p> Add <strong>Guidance </strong>(choose any guidance) </p>
-  </li>
-  <li>
-    <p> Add the <strong>task </strong> to the appropriate Standard Category: <span class="style1">rup_analysis_design_discipline</span>. </p>
-  </li>
-  <li>
-    <p> Save and then switch to the <strong>Browsing </strong> perspective. </p>
-  </li>
-  <li>In the <strong>Configuration View</strong>, select the <span class="style1">Extends Design User Interface</span> task under the <strong>Disciplines </strong> folder in the <span class="style1">Analysis &amp; Design</span> discipline. You will see in the html page that method content and relationships have been inherited from the base task and extended by the plug-in extending content and relationships. Note that the extended task remains unchanged.</li>
-</ol>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_7.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_7.htm
deleted file mode 100755
index a115d46..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_ex_7.htm
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-
-<body>
-<h2><a>Exercise 7: Extending base method content using <u>Replace</u> variability </a></h2>
-<p>The purpose of this exercise is to extend base method content using replace variability. </p>
-<ol>
-  <li>
-    <p>Switch to the <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>
-    <p> Create a new <strong>content package </strong> named, <span class="style1">Replace Test</span>, in the My Plugin plug-in. </p>
-  </li>
-  <li>
-    <p> Create a new <strong>role </strong>: <span class="style1">my_replace_ui_designer role</span> with presentation name, <span class="style1">My Replace UI Designer</span>. </p>
-  </li>
-  <li>
-    <p> In the <strong>Variability Type </strong> select <strong>replaces </strong> and then choose the <strong>base role </strong>: <span class="style1">rup_user_interface_designer</span>. </p>
-  </li>
-  <li>
-    <p> Add a <strong>Brief Description </strong>: <span class="style1">Replace Brief Description.</span> </p>
-  </li>
-  <li>
-    <p> Add a <strong>Main Description </strong>: <span class="style1">Replace Main Description</span>. </p>
-  </li>
-  <li>
-    <p> Save the role by closing the role editor. </p>
-  </li>
-  <li>    Update the Variability Test Configuration: </li>
-  <blockquote>
-    <p> &#149;&nbsp;Open the Variability Configuration and expand <strong>My Plugin &gt; Method Content &gt; Content Packages</strong>. </p>
-    <p>&#149;&nbsp;Uncheck <strong>Extends Test</strong>. </p>
-    <p>&#149;&nbsp;Check <strong>Replace Test</strong>. This is done so there are no conflicting extensions in the same method element. </p>
-  </blockquote>
-  <li>
-    <p> Switch to the <strong>Browsing </strong> perspective. </p>
-  </li>
-  <li>In the <strong>Configuration View</strong>, you will see that there is no longer a (RUP) <span class="style1">User-Interface Designer</span> role in the <strong>Role Sets </strong> folder. It was replaced by <span class="style1">My Replace UI Designer</span> role. Moreover, other content elements in the base plug-in that referenced the (RUP) <span class="style1">User-Interface Designer</span> role now reference the replacing role instead (e.g., if you open the disciplines folder and view the task <span class="style1">Design The User Interface</span> you will see that the <strong>Performing Role </strong> is now <span class="style1">My Replace UI Designer</span>.) <strong>Replace </strong> works in a similar way for <strong>tasks</strong>, <strong>artifacts </strong>, <strong>guidance </strong> and <strong>categories </strong> (feel free to try it out). </li>
-</ol>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_intro.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_intro.htm
deleted file mode 100755
index c1a78ca..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_3_intro.htm
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a></a><a></a><a></a><a></a><a></a></h2>
-<h1><a></a><a>Tutorial: Create Reusable Method Content </a></h1>
-<p>The purpose of this tutorial is to understand the variety of ways in which the content in a base plug-in can be extended and modified by content in other plug-ins. </p>
-<p>The ‘Create Core Method Content' tutorial shows how to create new content in a plug-in. In this tutorial we will see how to extend existing content in a plug-in. </p>
-<p><strong>Note: </strong>In the following exercises we create separate Content Packages to demonstrate each of the ways that a method plug-in can modify content in another plug-in (i.e. extends, replaces, and/or contributes). This is for easy illustration of the effect of applying each type of method element variability. </p>
-Managing content via the Method Plug-in mechanism is a key and very powerful feature of EPF Composer. This tutorial explores the effects of the different variability types in the following exercises.
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_4_ex_1.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_4_ex_1.htm
deleted file mode 100755
index 346333c..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_4_ex_1.htm
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a>Exercise 1: Publishing a pre-defined configuration </a></h2>
-<p>The purpose of this exercise is to publish a <strong>Configuration </strong>that is included in Eclipse Process Framework Composer. </p>
-<ol>
-  <li>
-    <p> Select the <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>    In the <strong>Library View</strong>, open the Configurations folder and select the configuration: My RUP for Small Projects. This opens the Configuration Editor. 
-    <p>The Plug in and Package Selection tab shows the plug-ins and packages within each plug-in that are included in the Configuration. The plug-ins and packages in the Configuration can be adjusted by selecting and deselecting them in the tree display. </p>
-  </li>
-  <li>    Review <strong>Configuration </strong><strong>Views </strong>: (i.e. how the published site will be laid out). 
-    <p>Select the <strong>Views </strong> tab in the configuration editor. A View is a Custom Category that is designed for publication. Required packages and content elements are assigned to a Custom Category. The Custom Category can then be added as a View to a Configuration. </p>
-  </li>
-  <li>    Select <strong>Default</strong> View.
-    <p>One of the views can be selected as the Default View by selecting the View and clicking the ‘Make Default' button. When the configuration is published, the Default View will be selected when the published configuration is opened in the EPF Composer Browser. </p>
-  </li>
-  <li>
-    <p> Close the configuration editor. </p>
-  </li>
-  <li>
-    <p> Select <strong>My RUP for Small Projects</strong> in the configuration selection box in the EPF Composer toolbar. </p>
-  </li>
-  <li>
-    <p> Select <strong>Configuration &gt; Publish </strong> from the main menu bar. </p>
-  </li>
-  <li>    Step through Publish wizard, accepting the defaults, and publish the configuration. It will take a few minutes to generate the web site. Assuming that you have the right java environment, the EPF Composer Browser applet should launch allowing you to view the resulting published web site (accept the security warnings when the applet fires up). </li>
-</ol>
-<blockquote>
-  <p><strong>Note: </strong> The published web site has a richer organization and lay-out as defined by the Configuration View, as compared to the more simple view of the configuration content available within the EPF Composer <strong>Configuration View</strong>. </p>
-</blockquote>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_4_ex_2.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_4_ex_2.htm
deleted file mode 100755
index acc8e37..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_4_ex_2.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-
-<body>
-<h2><a>Exercise 2: Create New Custom Category </a></h2>
-<p>The purpose of this exercise is to understand and use <strong>Custom Categories </strong>. </p>
-<p><strong>Custom Categories </strong> allow you to categorize content according to any scheme you want. Custom Categories can then be used to compose publishable <strong>Views </strong> providing a means to organize method content prior to publishing. </p>
-<ol>
-  <li>
-    <p>Make sure you are in the <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>
-    <p> Navigate to <strong>My Plug-in &gt; Method Content &gt; Custom Categories</strong>. If you have not already created this plugin, create it now, or go through the <u>Create Core Method Content</u> tutorial. </p>
-  </li>
-  <li>
-    <p> Create a new custom category named, <span class="style1">my_custom_category</span>. Right-click on the <strong>Custom Categories</strong> folder, highlight <strong>New, </strong> and then click <strong>Custom Category </strong>. </p>
-  </li>
-  <li>    Open the <strong>Assign </strong> tab. If you have previously created <span class="style1">my_content_packag</span>e, add the <strong>roles </strong>, <strong>artifacts</strong>, <strong>tasks, </strong> and <strong>guidance </strong> from it into the custom category. If you do not have this package, add content from another area in the library. </li>
-  <blockquote>
-    <p><strong>Note: </strong> You can do multiple select using shift or control key . </p>
-  </blockquote>
-  <li>
-    <p> Add the <span class="style1">rup_analysis_design_discipline</span>. You will find this under <strong>RUP &gt; Disciplines &gt; rup_disciplines. </strong></p>
-  </li>
-  <li> Open one of the elements you assigned to the new custom category. Observe how the custom category is now reflected in the <strong>Categories </strong> tab. </li>
-</ol>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_4_ex_3.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_4_ex_3.htm
deleted file mode 100755
index 64d139b..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_4_ex_3.htm
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-
-<body>
-<h2><a>Exercise 3: Create a customized configuration </a></h2>
-<p>The purpose of this exercise is to create your own customized configuration. </p>
-<ol>
-  <li>
-    <p>Make sure you are in the <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>
-    <p>Click <strong>File &gt; New &gt; Configuration</strong>. Or, you can right-click on the <strong>Configurations</strong> folder in the Library View and select <strong>New Configuration. </strong>The Configuration Editor is launched.</p>
-  </li>
-  <li>
-    <p> Name the configuration, <span class="style1">my_configuration</span>.</p>
-  </li>
-  <li>
-    <p> Click on the <strong>Plug-in and Package Selection </strong> tab. In the list of Plugins, check My Plugin that you created in the <u>Create Core Method Content</u> tutorial. This plugin has RUP as a base and references parts of the RUP content, and also has elements that extend, contribute to, and replace base RUP content. <br>
-      If you do not have this plugin, consider completing the <u>Create Core Method Content</u> tutorial before continuing with this tutorial. </p>
-  </li>
-  <li>
-    <p> The display will give you a series of warnings and the Library Error Log view will be displayed. <br>
-      Eclipse Process Framework Composer gives these warnings to help ensure that you create a configuration that ‘makes sense'. If you reference an element, you will only be able to see the full details for that element in a published web site if the package containing the element is in the configuration. If the package containing the element is not in the configuration, the ‘offending' package is marked as a warning – you may choose not to include the full details of the referenced element. </p>
-  </li>
-  <li>
-    <p> Check the <strong>Add Missing References</strong> button. This will automatically and recursively add packages containing any elements that are referenced in already selected packages. Explore what packages have been added to the configuration. You will probably now see all of RUP selected. This is because of the inter-connected nature of RUP. Uncheck RUP to restore the warnings. </p>
-  </li>
-  <li>
-    <p> Drill down into the content packages in the My Plugin, plugin package   by clicking on the <strong>+</strong> signs. Uncheck the<strong> Extends Test </strong>and <strong>Replace Test </strong>content packages. Unchecking these avoids conflicts that may occur because the same base element is affected by the plugins. </p>
-  </li>
-  <li>
-    <p> There should be a <strong>+</strong> by the <strong>Contribution Test</strong> package. Click the <strong>Make Closure by Fixing Errors</strong> button. This automatically makes your configuration complete based on what is currently selected. </p>
-  </li>
-  <li>
-    <p> Drill down into the RUP plugin, and see what packages have been selected. These will be the packages that contain the elements used as base elements in the Configuration Test content package. </p>
-  </li>
-  <li>    Click on the <strong>Views</strong> tab. 
-    <p>Any custom category can be added as a view to a configuration. You can created any number of custom categories and they are very flexible in terms of the content that you can add to a custom category and in the order in which the content appears. </p>
-    <p>Add the <span class="style1">my_custom_category</span> custom category as a view in the configuration. </p>
-    <p>Experiment with adding other custom categories as views. </p>
-  </li>
-  <li>
-    <p> Make <span class="style1">my_custom_category</span> the default view by selecting the <span class="style1">my_custom_category</span> tab and clicking the <strong>Make Default</strong> button. </p>
-  </li>
-  <li>
-    <p> Save the configuration by closing the Configuration Editor. </p>
-  </li>
-  <li>
-    <p> Select <span class="style1">my_configuration</span> in the configuration selection box at the top of the screen. You will see the items displayed in the Configuration View change. </p>
-  </li>
-  <li> Switch to the <strong>Browsing</strong> perspective. Explore the content in the configuration view. You should see the content you created in your plugins and some RUP content. </li>
-</ol>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_4_ex_4.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_4_ex_4.htm
deleted file mode 100755
index 7d8be1d..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_4_ex_4.htm
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a>Exercise 4: Publishing a custom configuration </a></h2>
-<ol>
-  <li>
-    <p> Select <strong>Configuration &gt; Publish </strong> from the main menu bar. </p>
-  </li>
-  <li>
-    <p> Select my-configuration in the list of configurations. </p>
-  </li>
-  <li> Step through Publish wizard, accepting the defaults, and publish the configuration. It will take a few minutes to generate the web site. Assuming that you have the right java environment, the EPF Composer Browser applet should launch allowing you to view the resulting published web site (accept the security warnings when the applet fires up). </li>
-</ol>
-<blockquote>
-  <p><strong>Note: </strong> The published web site has a richer organization and lay-out as defined by the Configuration View, as compared to the more simple view of the configuration content available within the EPF Composer <strong>Configuration View </strong>. </p>
-</blockquote>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_4_intro.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_4_intro.htm
deleted file mode 100755
index 421db7e..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_4_intro.htm
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h1><a>Tutorial: Publishing and Exporting </a></h1>
-<p>EPF Composer is essentially a content management application. The ultimate output of EPF Composer is a Web site with published method guidance and processes that can be viewed by a project team. </p>
-<p>EPF Composer makes it easy to configure a process for a particular type or size of project and to publish the guidance to a Web site. A Method <strong>Configuration </strong> is a selection of <strong>Content Packages </strong> across different <strong>Method Plug-ins </strong> containing the method and process content that will be included in the published web site. At publishing time, the configuration is combined with different Method <strong>Views </strong> which define the website's navigation structures and content organization. </p>
-<p>The EPF Composer <strong>Browsing Perspective </strong> renders the Method <strong>Configuration </strong> content in html format within EPF Composer, providing a navigable representation of the method/process content associated with that Configuration. </p>
-<p>This tutorial uses content that is created in the ‘Create Core Method Content' and ‘Extending base method content using Variability' tutorials. </p>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_ex_1.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_ex_1.htm
deleted file mode 100755
index 0b2b81e..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_ex_1.htm
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a>Exercise 1: Browse Process Content using Browsing Perspective </a></h2>
-<p>The purpose of this exercise is to get a basic understanding of processes in EPF Composer. </p>
-<p>(Note that this is a repeat of exercise 2 in the <u>Browse the Library</u> tutorial.) </p>
-<ol>
-  <li>
-    <p>Make sure you are in the <strong>Browsing</strong> perspective. </p>
-  </li>
-  <li>
-    <p> Select the <strong>My RUP for Small Projects</strong> configuration. If you have not created this configuration, select the <strong>RUP for Small Projects</strong> configuration. </p>
-  </li>
-  <li>
-    <p> To view a Capability Pattern, click <strong>Processes &gt; Capability Patterns &gt; Classic RUP &gt; Discipline Workflows &gt; Analysis and Design</strong>. A preview of the published Web page for the selected Capability Pattern is displayed. </p>
-  </li>
-  <li>
-    <p> A Capability Pattern contains a large amount of information and is displayed over four tabs – <strong>Description, Work Breakdown Structure, Work Product Usage, </strong>and<strong> Team Allocation</strong>. Explore the information on each tab. </p>
-  </li>
-  <li>To view a Delivery Process, click <strong>Processes &gt; Delivery Processes &gt; Classic RUP Lifecycle</strong>. The display for a Delivery Process is similar to a Capability Pattern. </li>
-</ol>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_ex_2.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_ex_2.htm
deleted file mode 100755
index 518efa9..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_ex_2.htm
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a></a><a>Exercise 2: Explore a Process using Authoring perspective </a></h2>
-<p>The purpose of this tutorial is to explore the information and editors for processes. A Capability Pattern is used as an example but the same applies to Delivery Processes. </p>
-<ol>
-  <li>
-    <p>Switch to <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>
-    <p>In the Library View, click <strong>RUP &gt; Processes &gt; Capability Patterns &gt; Classic RUP &gt; Discipline Workflows</strong>. </p>
-  </li>
-  <li>
-    <p>Double click the <strong>Analysis and Design Capability Pattern</strong> and examine the Capability Pattern. </p>
-  </li>
-  <li>The <strong>Description</strong> tab provides a number of sections that can be used to fully describe the Capability Pattern. 
-    <p>A Capability Pattern or Delivery Process must be associated with at least one configuration but can be associated with many. The configuration sets the scope for core method content and other process elements that can be included in a process. </p>
-  </li>
-  <li>    Click the <strong>Work Breakdown Structure</strong> tab. 
-    <p>This shows the Activities in the Capability Pattern and the (core method content) tasks that are included in each Activity. </p>
-    <p>When a task is added to a process, the roles and work products that are associated with the task are also pulled into the process. </p>
-    <p>Each task, role, and work product shown in the activity is actually an instance of the element as it is used at the particular point in the process. So what you see in the process are actually Task Descriptors, Role Descriptors and Work Product Descriptors. </p>
-  </li>
-  <li>    Click the <strong>Team Allocation</strong> tab. 
-    <p>This shows the activities in the capability pattern and the roles that are the performers of the tasks in the activities. </p>
-  </li>
-  <li>    Click the <strong>Work Product Usage</strong> tab. 
-    <p>This shows the activities in the capability pattern and the work products that are input and outputs of the tasks in the activities. </p>
-  </li>
-  <li>    Click on the <strong>Consolidated View</strong> tab. 
-    <p>This shows the full set of information for each activity in the Capability Pattern. It shows the tasks, work products and roles within each activity. </p>
-  </li>
-  <li>    Right click any <strong>task </strong> in the <strong>Work Breakdown Structure view, </strong> and click on <strong>Show Properties View</strong>. 
-    <p>This displays a new view that shows all the information about the task (task descriptor) as it is used in the process and allows you to customize the task as it is used at this point in the process. </p>
-    <p>The Properties View has a number of tabs that organize the task descriptor information. </p>
-  </li>
-  <li>
-    <p>Click on the <strong>Documentation</strong> tab. This allows you to enter information that is specific to this Task Descriptor. </p>
-  </li>
-  <li>
-    <p>Click on the <strong>Roles</strong> tab. This allows you to replace, remove or add to the roles that are associated with the core method task for this specific instance of the task in the process. </p>
-  </li>
-  <li>
-    <p>Click on the <strong>Work Products</strong> tab. This allows you to replace, remove or add to the work products that are associated with the core method task for this specific instance of the task in the process. </p>
-  </li>
-  <li>
-    <p>Click on the <strong>Steps</strong> tab. This allows you to adjust the task steps as they are applied at this point in the process. </p>
-  </li>
-  <li>
-    <p>When a role is selected in the Team Allocation view, or a work product is selected in the Work Product Usage view, the Properties View allows you to edit these elements in the context of the process. </p>
-  </li>
-  <li>Click on an <strong>Activity</strong> in the process. <br>
-    The properties view allows you to see roll-ups of the tasks, roles, and work products in the activity. Roll-ups can also be displayed in the main content window by selecting the <strong>Roll-Up</strong> option in the context sensitive menu. The Roll-Up view can be turned off by selecting, <strong>Roll-Down</strong>. </li>
-</ol>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_ex_3.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_ex_3.htm
deleted file mode 100755
index 5435afe..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_ex_3.htm
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a></a><a>Exercise 3: Create a Delivery Process </a></h2>
-<p>The purpose of this exercise is to learn how to create a delivery process using core method content directly. </p>
-<p>In <strong>Process Authoring </strong> we do not directly include the definitions of the core method elements in the WBS but rather create local references termed <strong>descriptors </strong> that refer back to the elements in the method library but also contain additional information that is only relevant to the local process. </p>
-<p>Descriptors also provide a mechanism whereby relationships defined in core method authoring (e.g. roles associated with a task, input and output, work products, etc.), can be defined or changed locally within the process. </p>
-<ol>
-  <li>    Create a new Delivery Process in the My Plugin, plug-in called, My RUP. </li>
-  <blockquote>
-    <p>When you create a process you are asked to identify the default Configuration to be used with the process. Select the My RUP for Small Projects configuration. If you nave not created this configuration, select RUP for Small Projects. </p>
-    <p>A process has a hierarchy of activities and can include the special types of activity – Phases and Iterations. These structures can also be created in Capability Patterns. First of all, we'll create some activities directly and reuse some capability patterns later. </p>
-  </blockquote>
-  <li>
-    <p> To create the Inception Phase, in the Work Breakdown Structure view, right click the <strong>My RUP </strong>Process, and then select, <strong>New Child &gt; Phase </strong>. Call the Phase, <strong>Inception</strong>. </p>
-  </li>
-  <li>    
-    <p>To create the Requirements Discipline in Inception, in the <strong>Work Breakdown Structure </strong> view, right click <strong>Inception, </strong> and select <strong>New </strong><strong>Child &gt; Activity </strong>. Call this <strong>Requirements</strong>. </p>
-  </li>
-  <li>To add Tasks to the Requirements activity, in the <strong>Configuration </strong> view, open the Requirements Discipline and then drag and drop the following tasks onto the Requirements Activity you have just created:  </li>
-  <blockquote>
-    <p>&#149;&nbsp; Develop Vision </p>
-    <p>&#149;&nbsp; Detail the Software Requirements </p>
-    <p>&#149;&nbsp; Find Actors and use Cases </p>
-    <p>When you include these tasks in your process, the associated roles and work products are also included in the process. </p>
-  </blockquote>
-  <li>
-    <p> You can review the information for each method element in the <strong>Properties </strong> view. </p>
-  </li>
-  <li>
-    <p> Customize the steps from the Find Actors and Use Cases task for the Inception phase. Click on the <strong>Find Actors and Use Cases</strong> task descriptor, and open the <strong>Properties</strong> view. Click on the <strong>Steps</strong> tab. Remove the last four steps and close the properties view. </p>
-  </li>
-  <li>
-    <p> Switch to the <strong>Browsing</strong> perspective and select <strong>Processes &gt; Delivery Processes &gt; My RUP</strong>. The Work Breakdown Structure tab is displayed. Click on <strong>Find Actors and Use Cases</strong>. Only the first three steps from the core method task are included. </p>
-  </li>
-  <li>Make other changes to the tasks in the delivery process you have just created and see how they are reflected when you view the process in the Browsing perspective.</li>
-</ol>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_ex_4.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_ex_4.htm
deleted file mode 100755
index 7260d2a..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_ex_4.htm
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a>Exercise 4: Create a new delivery Process using capability patterns. </a></h2>
-<p>The purpose of this exercise is to learn how to create a delivery process using <strong>Capability Patterns </strong>. </p>
-<p>A Capability Pattern is a process ‘fragment'. It represents a process that can be reused many times in the same process and / or in different processes. Organizing core method content into capability patterns and then using the capability patterns to construct full life-cycle delivery processes is a key feature of Eclipse Process Framework Composer. </p>
-<p>A capability pattern can be included in another process (another capability pattern or a delivery process) in two ways: </p>
-<blockquote>
-  <p>&#149;&nbsp; Copy – this creates a full copy of the capability pattern in the target process but does not retain any links back to the original capability pattern. The capability pattern can be customized in the new process. Any changes that are subsequently made to the capability pattern are not reflected in the process into which it was copied. </p>
-  <p>&#149;&nbsp; Extends – this extends the capability pattern into the process. The process retains links to the capability pattern and any subsequent changes to the capability pattern are reflected in the process into which it is extended. The capability pattern can be customized by suppressing tasks, roles, and work products. Other changes cannot be made. </p>
-</blockquote>
-<p>We will add some Capability Patterns to the Delivery Process you created in Exercise 3. </p>
-<p>To add a Capability Pattern using Copy: </p>
-<ol>
-  <li>
-    <p> Switch to the authoring perspective and open the My RUP delivery process you created in Exercise 3. </p>
-  </li>
-  <li>
-    <p> In the Configurations View click <strong>Processes &gt; Capability Patterns &gt; Classic RUP &gt; Discipline Workflows &gt; Project Management. </strong></p>
-  </li>
-  <li>
-    <p> Drag and drop the <strong>Project Management </strong> Capability Pattern onto the Inception phase in My RUP delivery process. </p>
-  </li>
-  <li>
-    <p> Select <strong>Copy </strong> in the pop-up box. </p>
-  </li>
-  <li>   Expand one of the activities in the Project Management capability pattern to the Task level. Note that the task name is displayed in black. This indicates that the task is available for you to edit. Any changes in the Capability Pattern will not be reflected in your process. You can edit the task in the Properties view. </li>
-</ol>
-<p>To add a Capability Pattern using Extends:  </p>
-<ol start="6">
-  <li>
-    <p> Create a new Phase in the My RUP delivery process. Right-click on the first row and select <strong>New Child &gt; Phase </strong>. Call the phase, Elaboration. </p>
-  </li>
-  <li>
-    <p> Create a new Iteration in the Elaboration phase. Right-click on the Elaboration phase and select <strong>New Child &gt; Iteration </strong>. Call the iteration, Elaboration Iteration 1. </p>
-  </li>
-  <li>
-    <p> In the Configurations View, click <strong>Processes &gt; Capability Patterns &gt; Classic RUP &gt; Discipline Workflows &gt; Project Management. </strong></p>
-  </li>
-  <li>
-    <p> Drag and drop the <strong>Project Management </strong> Capability Pattern onto the Elaboration Iteration 1 iteration in My RUP Process. </p>
-  </li>
-  <li>
-    <p> Select <strong>Extend </strong> in the pop-up box. </p>
-  </li>
-  <li>
-    <p> Expand one of the activities in the Project Management capability pattern you have just added to the Task level. Note that the task name is displayed in green italics. This indicates that the task is in a part of a process defined elsewhere – a Capability Pattern. Any changes to the Capability Pattern will be reflected in your process. Also, the Properties view shows the task details, but they cannot be edited. </p>
-  </li>
-  <li>Right click on a task in the extended capability pattern and select <strong>Suppress </strong>. The task is grayed out. The task will not appear in the published version of the delivery process, nor will it be included in an export of the process.</li>
-</ol>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_ex_5.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_ex_5.htm
deleted file mode 100755
index 8dbf82f..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_ex_5.htm
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h2><a></a><a>Exercise 5: Create Process Diagrams </a></h2>
-<p>The purpose of this exercise is to explore the diagram features of Eclipse Process Framework Composer. </p>
-<p>EPF Composer supports three types of process diagram. These are: </p>
-<blockquote>
-        <p>&#149;&nbsp; <strong>Activity Diagram</strong> </p>
-        <blockquote>
-          <p>            This shows the (sub) activities in a higher level activity. It shows the sequence relationships between the activities. </p>
-        </blockquote>
-  <p>&#149;&nbsp; <strong>Activity Detail</strong> – similar to RUP Workflow Detail </p>
-  <blockquote>
-    <p>      This shows the tasks in an activity with their performing roles and input and output work products. </p>
-  </blockquote>
-  <p>&#149;&nbsp; <strong>Work Product Dependency Diagram</strong> </p>
-  <blockquote>
-    <p>This diagram can be used to show how a work product is dependent on other work products. </p>
-  </blockquote>
-</blockquote>
-<p>These diagrams can then be included in the published web site. The diagrams are automatically generated (to a degree) and inherently synchronized with the WBS. Changes to the process structure using the diagram editor are automatically reflected in the WBS, and vice versa. </p>
-<ol>
-  <li>
-    <p>Switch to <strong>Authoring </strong> perspective. </p>
-  </li>
-  <li>
-    <p>Select the My RUP delivery process that you have been working on. </p>
-  </li>
-  <li>
-    <p>Highlight the delivery process in the WBS and then right-click. </p>
-  </li>
-  <li>
-    <p>Click <strong>Diagrams &gt; Open Activity Diagram</strong>. The diagram editor should open, showing the top level activities - phases. </p>
-  </li>
-  <li>
-    <p>Expand the <strong>Palette </strong> on the right of the diagram view. All the elements required to create an <strong>Activity Diagram </strong> are available on the palette. Add a new phase to the diagram – call it, Construction. Create links between the phases to show the sequence of the phases. </p>
-  </li>
-  <li>
-    <p>Switch back to the <strong>Work Breakdown Structure </strong>view and notice the new phase. Also notice that the links you added on the diagram are reflected in the Predecessors column. </p>
-  </li>
-  <li>
-    <p>Double click the <strong>Inception Phase</strong> in the diagram – it will drill down to show the contained Activities (the rule is that the editor will display the process elements at the level below the current selected element). Successive drill down through the levels is possible by clicking on the diagram elements. </p>
-  </li>
-  <li>
-    <p>Close the diagrams you have opened. </p>
-  </li>
-  <li>In the Work Breakdown Structure, right-click on the Requirements activity and select, <strong>Diagrams &gt; Open Activity Detail Diagram. </strong>The Activity Detail Diagram is automatically generated. It shows:  </li>
-  <blockquote>
-    <p>&#149;&nbsp; The Roles that perform tasks in the activity </p>
-    <p>&#149;&nbsp; The Tasks that the roles perform </p>
-    <p>&#149;&nbsp; The input and output work products for each task </p>
-    <p>You can change the layout of the diagram but you cannot add or remove any elements from the diagram. </p>
-  </blockquote>
-  <li>
-    <p>Close the diagrams you have opened. </p>
-  </li>
-  <li>    In the Work Breakdown Structure, right-click on the Requirements activity and select, <strong>Diagrams &gt; Open Work Product Dependency Diagram. </strong>The work products used in the activity are automatically added to the diagram.  </li>
-</ol>
-<blockquote>
-  <p>Add a (dependency) link between two work products. This indicates that the work product at the arrow end of the link is dependent on the other work product, i.e., the other work product needs to be created in order to create the second work product.
-  </p>
-  <p>Add a work product descriptor to the diagram. </p>
-</blockquote>
-<ol start="12">
-  <li>
-    <p>Switch back to the delivery process and open the <strong>Work Product Usage</strong> view. Notice the new work product in the Requirements activity. </p>
-  </li>
-  <li>
-    <p>Once you have edited a diagram, you can choose to include it or exclude it when publishing the process in a configuration. In the Work Breakdown Structure, right-click on the <strong>Requirements</strong> activity and select <strong>Diagrams &gt; Publishing Options. </strong>Check or uncheck the types of diagram listed. If a diagram type is not listed, it means that you have not edited that diagram type for the activity yet. </p>
-  </li>
-  </ol>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_intro.htm b/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_intro.htm
deleted file mode 100755
index eea3513..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/tutorials/tutorial_5_intro.htm
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-    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
--->
-
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h1><a></a><a>Tutorial: Working with Processes </a></h1>
-<p><strong><em>Process Authoring </em></strong> allows a Process Engineer to incorporate <strong><em>Method Elements </em></strong> into process structures. For example, a Work Breakdown Structure format familiar to Project Managers. The processes can be included in a configuration to be published as part of the published web site. </p>
-<p>In <strong><em>Method </em> Authoring </strong> the Process Engineer defines roles, tasks, work products and guidance and defines the relationships between these elements. </p>
-<p>In <strong><em>Process </em> Authoring </strong> the process engineer defines additional lifecycle elements such as <strong>Activities </strong> (summary tasks), <strong>Phases </strong>, <strong>Iterations </strong> and <strong>Milestones </strong>, that can then be used to compose the core elements into processes. A complete process corresponding to a project plan or a phase we call a <strong><em>Delivery Process </em></strong><em>(corresponding to Small RUP, for example) </em>. We can also create smaller more granular sections of process, termed <strong><em>Capability Patterns </em></strong> that can be used as building blocks to more easily compose delivery processes. </p>
-<p>Each time a task is included in a process, a copy of that task is created in the context of the process. We call this a Task Descriptor. The same task can be included any number of times in the same process. This allows, for example, the same RUP task to be included in each Iteration in each RUP Phase. A Task Descriptor can also modify the base task without actually changing the task. For example, roles and work products can be added or suppressed, steps can be suppressed or re-sequenced. </p>
-<p>oles and Work Products are also included in processes as Role Descriptors and Work Product Descriptors. So roles and work products can also be customized to fit with the context of the process in which they are used.</p>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/twisty symbol1.JPG b/plugins/org.eclipse.epf.help.doc/html/twisty symbol1.JPG
deleted file mode 100755
index 23b11b3..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/twisty symbol1.JPG
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/uma_hump.gif b/plugins/org.eclipse.epf.help.doc/html/uma_hump.gif
deleted file mode 100755
index 66f4544..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/uma_hump.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/underline.gif b/plugins/org.eclipse.epf.help.doc/html/underline.gif
deleted file mode 100755
index db768c9..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/underline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/userinterface.JPG b/plugins/org.eclipse.epf.help.doc/html/userinterface.JPG
deleted file mode 100755
index 0b368aa..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/userinterface.JPG
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/userinterfaceoverview.html b/plugins/org.eclipse.epf.help.doc/html/userinterfaceoverview.html
deleted file mode 100755
index 4a28395..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/userinterfaceoverview.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Tool Interface" />
-<meta name="abstract" content="Eclipse Process Framework Composer is built on the Eclipse Integrated Development Environment (IDE). The parts of the workspace are:" />
-<meta name="description" content="Eclipse Process Framework Composer is built on the Eclipse Integrated Development Environment (IDE). The parts of the workspace are:" />
-<meta name="DC.Relation" scheme="URI" content="authoringperspective.html#authoringperspective" />
-<meta name="DC.Relation" scheme="URI" content="browsingperspective.html#browingperspective" />
-<meta name="DC.Relation" scheme="URI" content="authoringperspective.html" />
-<meta name="DC.Relation" scheme="URI" content="browsingperspective.html" />
-<meta name="DC.Relation" scheme="URI" content="configurationview.html" />
-<meta name="DC.Relation" scheme="URI" content="libraryview.html" />
-<meta name="DC.Relation" scheme="URI" content="browseandpreviewmethodcontent.html" />
-<meta name="DC.Relation" scheme="URI" content="searchformethodcontent.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="userinterfaceoverview" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Tool Interface</title>
-</head>
-<body id="userinterfaceoverview"><a name="userinterfaceoverview"><!-- --></a>
-
-<h1 class="topictitle1">Tool Interface</h1>
-<div><p>Eclipse Process Framework Composer is built on the Eclipse Integrated
-Development Environment (IDE). The parts of the workspace are:</p>
-<p><img src="userinterface.JPG" alt="" /></p>
-<div class="p"><ul><li><strong>Configuration drop-down selection box</strong> - The configuration drop-down
-selection box allows you to select a <a href="configurationview.html#configurationview">configuration</a> in which to work. </li>
-<li><strong>Open Perspective button</strong> - Click the Open Perspective button
-to select a <a href="perspectives.html#perspectives">perspective</a>.
-There are two perspectives to select from: The <a href="browsingperspective.html#browingperspective">Browsing Perspective</a> and the <a href="authoringperspective.html#authoringperspective">Authoring Perspective</a>. </li>
-<li><strong>Library View</strong> - The <a href="libraryview.html#libraryview">Library
-View</a> displays the Method Plug-ins and Configurations contained in a
-Method Library.</li>
-<li><strong>Configuration View</strong> - The <a href="configurationview.html#configurationview">Configuration View</a> shows the content elements in a library
-filtered by a configuration.</li>
-<li><strong>Content Editors and Preview</strong> - When you are working in the <a href="authoringperspective.html#authoringperspective">Authoring
-Perspective</a>, the window on the right side of your screen contains content
-editors, which allow you to create or modify element types. When the <a href="browsingperspective.html#browingperspective">Browsing
-Perspective</a> is open, the window on the right contains a preview of
-your content as it will appear in a published Web site.</li>
-</ul>
-</div>
-</div>
-<div>
-<ol>
-<li class="olchildlink"><a href="authoringperspective.html">Authoring Perspective</a><br />
-</li>
-<li class="olchildlink"><a href="browsingperspective.html">Browsing Perspective</a><br />
-</li>
-<li class="olchildlink"><a href="configurationview.html">Configuration View</a><br />
-</li>
-<li class="olchildlink"><a href="libraryview.html">Library View</a><br />
-</li>
-<li class="olchildlink"><a href="browseandpreviewmethodcontent.html">Browse and Preview Method Content</a><br />
-</li>
-<li class="olchildlink"><a href="searchformethodcontent.html">Search for Method Content</a><br />
-</li>
-</ol>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="authoringperspective.html#authoringperspective">Authoring Perspective</a></div>
-<div><a href="browsingperspective.html#browingperspective">Browsing Perspective</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/userrolesandrolespecifictasks.html b/plugins/org.eclipse.epf.help.doc/html/userrolesandrolespecifictasks.html
deleted file mode 100755
index cdf1643..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/userrolesandrolespecifictasks.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="topic" />
-<meta name="DC.Title" content="User Roles and Role Specific Tasks" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="userrolesandrolespecifictasks" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>User Roles and Role Specific Tasks</title>
-</head>
-<body id="userrolesandrolespecifictasks"><a name="userrolesandrolespecifictasks"><!-- --></a>
-
-<h1 class="topictitle1">User Roles and Role Specific Tasks</h1>
-<div><p>There are four primary roles played by the users of this tool:</p>
-<ul><li>Method Author</li>
-<li>Process Author</li>
-<li>Process Configurator</li>
-<li>Practitioner</li>
-</ul>
-<div class="p"><strong>Method Author</strong> - The Method Author uses the tool on a regular basis
-to provide standard processes for use in an organization. The Method Author
-uses the full functionality of the tool to:<ul><li>Create plug-ins.</li>
-<li>Create new method elements.</li>
-<li>Extend existing method elements.</li>
-<li>Create reusable capability patterns by reusing method elements.</li>
-<li>Create delivery processes by reusing capability patterns and method elements.</li>
-<li>Create custom categories for use as views in a configuration.</li>
-<li>Create and modify configurations.</li>
-<li>Publish configurations or processes.</li>
-</ul>
-</div>
-<div class="p"><strong>Process Author</strong> - The Process Author's goal is to produce a delivery
-process for their project(s) by reusing method elements. The Process Author
-uses the tool occasionally, as project needs dictate, typically supporting
-one or, more likely, several projects by specifying the processes to be followed.
-The Process Author uses the process authoring and configuration publishing
-functionality of this tool to:<ul><li>Create plug-ins.</li>
-<li>Create reusable capability patterns by reusing method elements.</li>
-<li>Create delivery processes by reusing capability patterns and method elements.</li>
-<li>Create custom categories for use as views in a configuration. </li>
-<li>Create and modify configurations.</li>
-<li>Publish configurations or processes.</li>
-</ul>
-</div>
-<div class="p"><strong>Process Configurator</strong> - The Process Configurator's goal is to produce
-a delivery process for their project(s) by rapidly leveraging ready-made plug-ins.
-The Process Configurator uses this tool occasional, as project needs dictate,
-typically supporting one or several projects by specifying the process for
-the projects. The Process Configurator uses the configuration
-publishing functionality in this tool to:<ul><li>Create and modify configurations.</li>
-<li>Publish configurations or processes.</li>
-</ul>
-</div>
-<p><strong>Practitioner</strong> - A Practitioner's goal is to correctly use the organization's
-processes and best practices effectively. A Practitioner uses a published
-configuration on a regular basis driven by the work being performed to view
-processes and methods.</p>
-</div>
-<div></div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/variability.html b/plugins/org.eclipse.epf.help.doc/html/variability.html
deleted file mode 100755
index 24aa9b7..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/variability.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Variability" />
-<meta name="abstract" content="Variability allows elements in one content package to influence or modify elements in other content packages without actually directly modifying the original content. Variability enables changes to the content while keeping the changes separate and optional." />
-<meta name="description" content="Variability allows elements in one content package to influence or modify elements in other content packages without actually directly modifying the original content. Variability enables changes to the content while keeping the changes separate and optional." />
-<meta name="DC.Relation" scheme="URI" content="variabilityassociations.html#variabilityassociations" />
-<meta name="DC.Relation" scheme="URI" content="contributes.html" />
-<meta name="DC.Relation" scheme="URI" content="replace.html#replaces" />
-<meta name="DC.Relation" scheme="URI" content="extends.html#extends" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="variability" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Variability</title>
-</head>
-<body id="variability"><a name="variability"><!-- --></a>
-
-<h1 class="topictitle1">Variability</h1>
-<div><p>Variability allows elements in one content package to influence
-or modify elements in other content packages without actually directly modifying
-the original content. Variability enables changes to the content while keeping
-the changes separate and optional.</p>
-<p>Variability allows you to factor your method content and processes in interrelated
-units and to architect method content and processes in layers that extend
-each other with new capabilities. Variability also allows you to extend and
-tailor method content and processes you do not own and cannot directly modify,
-and to easily upgrade to newer versions by simply reapplying your personal
-changes to the upgrades.</p>
-<p>The use of variability affects two characteristics of a method element:
-its attributes and its relationships with other content elements. If an element
-allows variability, the specification is shown at the bottom of the element's
-description view.</p>
-<div class="p">For the purposes of variability, there are three groups of information
-for any element to be considered:<ul><li><strong>Attributes</strong> - pieces of data about an element such as Main Description.</li>
-<li><strong>Incoming Associations</strong> - associations to other elements where the
-association reference is held in the other element. In other words, the other
-element has references to the subject element.</li>
-<li><strong>Outgoing Associations</strong> - associations to other elements where the
-association reference is held in the subject element. In other words, the
-subject element has references to the other element.</li>
-</ul>
-In addition, associations can be one-to-one or one-to-many. See <a href="variabilityassociations.html#variabilityassociations">Variability Associations</a> for
-a full list of the associations for each type of element.</div>
-<div class="section"><h4 class="sectiontitle">Variability Type</h4><div class="p">Variability
-type defines the nature of how one element affects another element using variability.
-The variability types are:<ul><li><strong>Not Applicable</strong> - The element is a base element and does not affect
-another element through variability. This is the default value of an element's
-variability type.</li>
-</ul>
-<ul><li><strong><span class="keyword">Contributes</span></strong> -
-A contributing element adds to the base element. Contributes provides a way
-for elements to contribute their properties into their base element without
-directly changing any of its existing properties, such as in an additive fashion.
-The effect, after contribution, is that the base element is logically replaced
-with an element that combines the attributes and associations of the contributing
-element with the base element.</li>
-</ul>
-<ul><li><strong><span class="keyword">Replaces</span></strong> -
-A replacing element replaces parts of the base element. Replaces provides
-a way for an element to replace a base element without directly changing any
-of the base element's existing properties. This is, in most cases, used for
-method plug-ins that aim to replace specific content elements such as roles,
-tasks, or activities with either a completely new variant or to change the
-fundamental relationships of these elements. The effect of this, is that the
-base content element is logically replaced with the new replacing element
-to which all incoming associations still point as before, but which has potentially
-new attribute values and outgoing association properties.</li>
-</ul>
-<ul><li><strong><span class="keyword">Extends</span></strong> -
-An extending element inherits characteristics of the base element. Extension
-allows Method Plug-ins to easily reuse elements from a base plug-in by providing
-a kind of inheritance for the extending element. Attribute values and association
-instances are inherited from the "based-on" element to the extending element.
-The result is that the extending element has the same properties as the "based-on"
-element, but might define its own additions. Extends is not used to modify
-content of the base plug-in, but to provide the ability for the extending
-plug-in to define its own content which is a variant of content already defined.
-For example, a special version of a generic Review Record for a specific type
-of review. The effect of this is that the base element and any number of extending
-elements can be used side by side, but refer to each other through the extends
-relationship. Extends also provides the key mechanism for binding capability
-patterns to processes: A pattern is applied by defining an extends relationship
-from an activity of the applying processes to the capability pattern. The
-activity inherits association instances from the pattern and the pattern appears
-to be part of the resulting process after interpretation.</li>
-</ul>
-</div>
-</div>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="variabilityassociations.html#variabilityassociations">Variability Associations</a></div>
-<div><a href="contributes.html">Contributes</a></div>
-<div><a href="replace.html#replaces">Replaces</a></div>
-<div><a href="extends.html#extends">Extends</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/variabilityassociations.html b/plugins/org.eclipse.epf.help.doc/html/variabilityassociations.html
deleted file mode 100755
index 49a3d2a..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/variabilityassociations.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Variability Associations" />
-<meta name="DC.Relation" scheme="URI" content="variability.html#variability" />
-<meta name="DC.Relation" scheme="URI" content="variability.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="variabilityassociations" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Variability Associations</title>
-</head>
-<body id="variabilityassociations"><a name="variabilityassociations"><!-- --></a>
-
-<h1 class="topictitle1">Variability Associations</h1>
-<div><div class="p">The following table lists the incoming and outgoing associations for each
-element type for which variability can be used. Associations also have a cardinality
-of to-many or to-one.
-<div class="tablenoborder"><table cellpadding="4" cellspacing="0" summary="" frame="border" border="1" rules="all"><thead align="left"><tr valign="bottom"><th valign="bottom" id="d0e16">Element Type</th>
-<th valign="bottom" id="d0e18">Associated Element Type</th>
-<th valign="bottom" id="d0e20">Association</th>
-</tr>
-</thead>
-<tbody><tr><td rowspan="8" valign="top" headers="d0e16 ">Work Product</td>
-<td valign="top" headers="d0e18 ">contained artifacts</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">deliverable parts</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">guidance</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">container artifact</td>
-<td valign="top" headers="d0e20 ">in-one</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">deliverable</td>
-<td valign="top" headers="d0e20 ">in-one</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">responsible role</td>
-<td valign="top" headers="d0e20 ">in-one</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">input and output to tasks</td>
-<td valign="top" headers="d0e20 ">in-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">categories</td>
-<td valign="top" headers="d0e20 ">in-many</td>
-</tr>
-<tr><td rowspan="4" valign="top" headers="d0e16 ">Role</td>
-<td valign="top" headers="d0e18 ">responsible for work product</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">guidance</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">performer in task</td>
-<td valign="top" headers="d0e20 ">in-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">categories</td>
-<td valign="top" headers="d0e20 ">in-many</td>
-</tr>
-<tr><td rowspan="7" valign="top" headers="d0e16 ">Task</td>
-<td valign="top" headers="d0e18 ">primary performer role</td>
-<td valign="top" headers="d0e20 ">out-one</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">additional performer roles</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">input and output work products</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">guidance</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">steps</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">categories</td>
-<td valign="top" headers="d0e20 ">in-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">discipline</td>
-<td valign="top" headers="d0e20 ">in-one</td>
-</tr>
-<tr><td colspan="3" valign="top" headers="d0e16 d0e18 d0e20 ">Categories</td>
-</tr>
-<tr><td rowspan="2" valign="top" headers="d0e16 ">Custom Category</td>
-<td valign="top" headers="d0e18 ">categorized elements</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">other custom categories</td>
-<td valign="top" headers="d0e20 ">in-many</td>
-</tr>
-<tr><td rowspan="4" valign="top" headers="d0e16 ">Discipline</td>
-<td valign="top" headers="d0e18 ">categorized tasks</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">referenced workflow activity</td>
-<td valign="top" headers="d0e20 ">out-one</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">discipline grouping</td>
-<td valign="top" headers="d0e20 ">in-one</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">custom categories</td>
-<td valign="top" headers="d0e20 ">in-many</td>
-</tr>
-<tr><td rowspan="2" valign="top" headers="d0e16 ">Discipline Grouping</td>
-<td valign="top" headers="d0e18 ">categorized disciplines</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">custom categories</td>
-<td valign="top" headers="d0e20 ">in-many</td>
-</tr>
-<tr><td rowspan="4" valign="top" headers="d0e16 ">Domain</td>
-<td valign="top" headers="d0e18 ">categorized work products</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">sub-domains</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">super-domains</td>
-<td valign="top" headers="d0e20 ">in-one</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">custom categories</td>
-<td valign="top" headers="d0e20 ">in-many</td>
-</tr>
-<tr><td rowspan="2" valign="top" headers="d0e16 ">Work Product Type</td>
-<td valign="top" headers="d0e18 ">categorized work products</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">custom categories</td>
-<td valign="top" headers="d0e20 ">in-many</td>
-</tr>
-<tr><td rowspan="3" valign="top" headers="d0e16 ">Role Set</td>
-<td valign="top" headers="d0e18 ">categorized roles</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">role set grouping</td>
-<td valign="top" headers="d0e20 ">in-one</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">custom categories</td>
-<td valign="top" headers="d0e20 ">in-many</td>
-</tr>
-<tr><td rowspan="2" valign="top" headers="d0e16 ">Role Set Grouping</td>
-<td valign="top" headers="d0e18 ">categorized role sets</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e18 ">custom categories</td>
-<td valign="top" headers="d0e20 ">in-many</td>
-</tr>
-<tr><td colspan="3" valign="top" headers="d0e16 d0e18 d0e20 ">Guidance</td>
-</tr>
-<tr><td valign="top" headers="d0e16 ">Practice</td>
-<td valign="top" headers="d0e18 ">content element</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-<tr><td valign="top" headers="d0e16 ">Other Guidance Types</td>
-<td valign="top" headers="d0e18 ">sections via content descriptions</td>
-<td valign="top" headers="d0e20 ">out-many</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="variability.html" title="Variability allows elements in one content package to influence or modify elements in other content packages without actually directly modifying the original content. Variability enables changes to the content while keeping the changes separate and optional.">Variability</a></div>
-</div>
-<div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="variability.html#variability" title="Variability allows elements in one content package to influence or modify elements in other content packages without actually directly modifying the original content. Variability enables changes to the content while keeping the changes separate and optional.">Variability</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/welcome/conf.gif b/plugins/org.eclipse.epf.help.doc/html/welcome/conf.gif
deleted file mode 100755
index 4e5e6b9..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/welcome/conf.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/welcome/mc.gif b/plugins/org.eclipse.epf.help.doc/html/welcome/mc.gif
deleted file mode 100755
index d4342c2..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/welcome/mc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/welcome/mc_vs_p.gif b/plugins/org.eclipse.epf.help.doc/html/welcome/mc_vs_p.gif
deleted file mode 100755
index cdf1b09..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/welcome/mc_vs_p.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/welcome/methodauthoring.html b/plugins/org.eclipse.epf.help.doc/html/welcome/methodauthoring.html
deleted file mode 100755
index 838dd05..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/welcome/methodauthoring.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-<!-- 
-    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
--->
-
-<head>
-<title>Method Content Authoring Overview</title>
-</head>
-<body>
-<h3>Method Content Authoring Overview</h3>
-<p>Method content describes roles, the tasks that they perform, the work products
-  that are used and produced by those tasks, and supporting guidance.</p>
-<p><img src="mc.gif"></p>
-<p>The figure above depicts typical sources for method content, as well as how
-  the method content is represented in EPF Composer. Many development methods are described
-  in publications such as books, articles, training material, standards and regulations,
-  and other forms of documentation. These sources usually document methods by
-  providing step-by-step explanations for a particular way of achieving a specific
-  development goal under general circumstances. Some examples are: transforming
-  a requirements document into an analysis model; defining an architectural mechanism
-  based on functional and non-functional requirements; creating a project plan
-  for a development iteration; defining a quality assurance plan for functional
-  requirements; redesigning a business organization based on a new strategic direction,
-  and so on.</p>
-<p>EPF Composer takes content such as that described above, and structures it in a specific
-  schema of roles, work products, tasks, and guidance. This schema supports the
-  organization of large amounts of descriptions for development methods and processes.
-  Such method content and processes do not have to be limited to software engineering,
-  but can also cover other design and engineering disciplines such as mechanical
-  engineering, business transformation, sales cycles, and so on.</p>
-<p> The EPF Composer screen capture in the figure above shows how such method content elements
-  are organized in tree browsers on the left. These tree browsers, similar to
-  a library, provide different indexes of the available elements for rapid access.
-  The screen capture shows on the right an example of a task presentation. This
-  task presentation defines the task in terms of steps that need to be performed
-  to achieve the task's purpose. You can see that the task has various relationships,
-  such as relationships to performing roles as well as work products that serve
-  as inputs and outputs to the task. Find out more details on tasks, role, and
-  work products in the online help <a href="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.epf.help.doc/html/methodauthoringoverview.html">here</a>.
-  In addition to roles, tasks, and work products, EPF Composer supports the addition of
-  guidance elements. Guidance are supplementary free-form documentation such as
-  whitepapers, concept descriptions, guidelines, templates, examples, and so on.</p>
-<p>EPF Composer provides various form-based editors to create new method content elements.
-  Document your task, roles, work products, and guidance elements using intuitive
-  rich-text editors that allow you to copy and paste text from other sources such
-  as web pages or documents. Use simple dialogs to establish relationships between
-  content elements.</p>
-<p>EPF Composer organizes content in physical content packages that allow you to manage
-  your content in configurable units. EPF Composer also allows you to categorize your content
-  based on a set of predefined categories (for example, categorize your tasks
-  into development disciplines, or your work products into domains) or create
-  your own categorization schemes for your content with your own user-defined
-  categories that allow you to index content in any way you want.</p>
-<p>For more details on method content authoring see the online help:</p>
-<div align="left">
-<ul>
-  <li><a href="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.epf.help.doc/html/methodauthoringoverview.html">Method
-      Authoring Overview</a></li>
-</ul>
-</div>
-<p>&nbsp;</p>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/welcome/overview.html b/plugins/org.eclipse.epf.help.doc/html/welcome/overview.html
deleted file mode 100755
index 03f9148..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/welcome/overview.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<html>
-<!-- 
-    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
--->
-
-<head>
-<title>Eclipse Process Framework Composer Overview</title>
-</head>
-<body>
-<h3>Introduction to Eclipse Process Framework Composer (EPF Composer)</h3>
-<p>Welcome to Eclipse Process Framework Composer (EPF Composer). EPF Composer is a tool platform that enables
-  process engineers and managers to implement, deploy, and maintain processes
-  for organizations or individual projects. Typically, two key problems need to
-  be addressed to successfully deploy new processes.</p>
-<p> First, development teams need to be educated on the methods applicable to
-  the roles that they are responsible for. Software developers typically need
-  to
-  learn
-  how
-  to
-  do analysis and design, testers need to learn how to test implementations against
-   requirements, managers need to learn how to manage the project scope and change,
-
-  and so on. Some organizations assume that developers implicitly know how to
-   do such work without documenting their methods, but many organizations want
-
-  to establish common and regulated practices, to drive specific improvement
-  objectives,  and to meet compliance standards.</p>
-<p> Second, development teams need to understand how to apply these methods throughout
-  a development lifecycle. That is, they need to define or select a development
-  process. For
-
-  example, requirements management methods have to be applied differently in
-  early  phases of a project where the focus is on elicitation of stakeholder
-  needs and
-  requirements and scoping a vision, than in later phases where the focus is
-  on  managing requirements updates and changes and performing impact analysis
-  of
-  these requirements changes. Teams also need clear understanding of how the
-  different  tasks of the methods relate to each other, for example, how the
-  change management
-  method impacts the requirements management method as well as regression testing
-   method throughout the lifecycle. Even self-organizing teams need to define
-  a
-  process that gives at minimum some guidance on how the development will be
-  scoped  throughout the lifecycle, when milestones will be achieved and verified,
-  and
-  so on. </p>
-<p>To that end, EPF Composer has two main purposes: </p>
-<div align="left"><ul>
-  <li>To provide a knowledge base of intellectual capital which you can browse,
-    manage and deploy. This content can include externally developed content,
-    and, more importantly, can include your own content including of whitepapers,
-    guidelines, templates, principles, best practices, internal procedures and
-    regulations, training material, and any other general descriptions of your
-    methods. This knowledge base can used for reference and education. It also
-    forms the basis for developing processes (the second purpose). EPF Composer is designed
-    to be a content management system that provides a common management structure
-    and look and feel for all of your content, rather than being a document management
-    system in which you would store and access hard to maintain legacy documents
-    all in their own shapes and formats. All content managed in EPF Composer can be published
-    to html and deployed to Web servers for distributed usage.<br>
-  </li>
-  <li>To provide process engineering capabilities by supporting process engineers
-    and project managers in selecting, tailoring, and rapidly assembling processes
-    for their concrete development projects. EPF Composer provides catalogs of pre-defined
-    processes for typical project situations that can be adapted to individual
-    needs. It also provides process building blocks, called capability patterns,
-    that represent best development practices for specific disciplines, technologies,
-    or management styles. These building blocks form a toolkit for quick assembly
-    of processes based on project-specific needs. EPF Composer also allows you to set up
-    your own organization-specific capability pattern libraries. Finally, the
-    processes created with EPF Composer can be published and deployed as Web sites.</li>
-</ul>
-</div>
-<h3>Eclipse Process Framework Composer's Key Capabilities</h3>
-<p>Eclipse Process Framework Composer provides the following new key capabilities:</p>
-  <div align="left">
-<ul>
-  <li> Provides completely redesigned tools for authoring, configuring, viewing,
-    and publishing development processes.</li>
-  <li> Provides just-in-time generation of publication previews in dedicated browsing
-    perspective that allows rapid configuration switching.</li>
-  <li> Manages method content using simple form-based user interfaces. Therefore,
-    UML modeling skills are no longer required.</li>
-  <li> Provides intuitive rich text editors for creating illustrative content
-    descriptions. Editors allow use of styles, images, tables, hyperlinks, and
-    direct html editing.</li>
-  <li>Allows creating processes with breakdown structure editors and workflow
-    diagrams through use of multi-presentation process editors. Breakdown structure
-    editor supports different process views: work-breakdown view, work product
-    usage view, and team allocation view. EPF Composer automatically synchronizes all presentations
-    with process changes. </li>
-  <li>Provides support for many alternative lifecycle
-    models. For example, waterfall, incremental, or iterative models can be created
-    with the same overlapping method content.</li>
-  <li>Improved reuse and extensibility capabilities. The plug-in mechanisms from
-    past versions have been extended to support extensions for breakdown structures.</li>
-  <li>Supports reusable dynamically-linked process patterns of best practices
-    for rapid process assembly via drag-and-drop.</li>
-</ul>
-</div>
-<h3>Key Terminology and Concepts</h3>
-<p>To effectively work with EPF Composer, you need to understand a few concepts
-  that are used to organize the content. The pages <a href="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.epf.help.doc/html/methodauthoringoverview.html">Method
-  Content Authoring Overview</a> and <a href="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.epf.help.doc/html/processauthoringoverview.html">Process
-  Authoring Overview</a> contain more detail and concrete examples of how to work
-  in the tool. This page provides you with a general overview of these concepts.</p>
-<p>The most fundamental principle in EPF Composer is the separation of reusable core method
-  content from its application in processes. This directly relates back to the
-  two purposes of EPF Composer described in the first section. Almost all of EPF Composer's concepts
-  are categorized along this separation. Method content describes what is to be
-  produced, the necessary skills required and the step-by-step explanations describing
-  how specific development goals are achieved. These method content descriptions
-  are independent of a development lifecycle. Processes describe the development
-  lifecycle. Processes take the method content elements and relate them into semi-ordered
-  sequences that are customized to specific types of projects.</p>
-<p><img src="uma_hump.gif"></p>
-<p>The figure above shows how this separation is depicted in Basic Unified
-  Process. Method content, describing how development work is being performed,
-  is categorized by disciplines along the y-axis of the diagram. The work described
-  in a process is seen along the x-axis representing the timeline. This is the
-  lifecycle of a development project. It expresses when what work will be performed.
-  The graph in the illustration represents an estimated workload for each discipline.
-  As you see, for example, one never stops working on requirements in RUP, but
-  there are certainly peak times in which most of the requirements elicitation
-  and description work is performed. There are also times at which a downward
-  trend needs to be observed where fewer and fewer requirements changes have to
-  be processed to bring the project to a close. This avoids what is referred to
-  as feature creep in which requirements work remains constant or even increases.
-  Hence, a lifecycle (process) expresses the variances of work performed in the
-  various disciplines (method content).</p>
-<p><img src="mc_vs_p.gif"></p>
-<p>The picture above provides a summary of the key elements used in EPF Composer and how
-  they relate to method content or process. As you see, method content is primarily
-  expressed using work products, roles, tasks, and guidance. Guidance, such as
-  checklists, examples, or roadmaps, can also be defined to provide exemplary
-  walkthroughs of a process. On the right-hand side of the diagram, you see the
-  elements used to represent processes in EPF Composer. The main element is the activity
-  that can be nested to define breakdown structures as well as related to each
-  other to define a flow of work. Activities also contain descriptors that reference
-  method content. Activities are used to define processes of which EPF Composer support
-  two main kinds: delivery processes and capability patterns. Delivery processes
-  represent a complete and integrated process template for performing one specific
-  type of project. They describe a complete end-to-end project lifecycle and are
-  used as a reference for running projects with similar characteristics. Capability
-  patterns are processes that express and communicate process knowledge for a
-  key area of interest such as a discipline or a best practice. They are also
-  used as building blocks to assemble delivery processes or larger capability
-  patterns. This ensures optimal reuse and application of their key best practices
-  in process authoring activities in EPF Composer. </p>
-
-<p>For more details on Eclipse Process Framework Composer, see the online help:</p>
-<div align="left">
-<ul>
-  <li><a href="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.epf.help.doc/html/aboutepfcomposer.html">Overview</a></li>
-  <li><a href="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.epf.help.doc/html/standardmethodlibraryoverview.html">Getting
-      Started</a></li>
-</ul>
-</div>
-<p></p>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/welcome/p.gif b/plugins/org.eclipse.epf.help.doc/html/welcome/p.gif
deleted file mode 100755
index cb86887..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/welcome/p.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/welcome/processauthoring.html b/plugins/org.eclipse.epf.help.doc/html/welcome/processauthoring.html
deleted file mode 100755
index 438422d..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/welcome/processauthoring.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<html>
-<!-- 
-    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
--->
-
-<head>
-<title>Process Authoring Overview</title>
-</head>
-<body>
-<h3>Process Authoring Overview</h3>
-<p>A development process defines sequences of tasks performed by roles and work
-  products produced over time.</p>
-<p><img src="p.gif"></p>
-<p>The figure above shows that processes are typically expressed as workflows
-  or breakdown structures. Defining a strict sequence as in a waterfall model
-  is as much a process as defining semi-ordered sequences in iterations of parallel
-  work. They just represent different development approaches. Hence, for defining
-  a process, one can take method content and combine it into structures that specify
-  how the work shall be organized over time, to meet the needs of a particular
-  type of development project (such as software for a online system versus software
-  and hardware for an embedded system). EPF Composer supports processes based on different
-  development approaches across many different lifecycle models, including waterfall,
-  incremental, and iterative lifecycles. EPF Composer also supports different presentations
-  for process, such as work-breakdown structure or workflow presentations. You
-  can also define processes in EPF Composer that use a minimal set of method content to
-  define processes for agile, self-organizing teams.</p>
-<p> The EPF Composer screen capture above shows an example of a process presented as a
-  breakdown structure of nested activities as well as a workflow or activity diagram
-  for one particular activity, the inception phase. It also indicates with the
-  two blue arrows that the particular method content task &quot;Detail a Use Case&quot;
-  has been applied in the process twice; firstly in the inception phase under
-  the activity &quot;Define the System,&quot; and secondly, in the elaboration
-  phase in the activity &quot;Refine the system definition&quot;. You see below
-  each of these task applications, referred to as a task descriptors in EPF Composer, lists
-  of the performing roles as well as the input and output work products. If you
-  look closely, you see that these lists are different for each of these two task
-  descriptors, expressing differences in performing the &quot;Detail a Use Case&quot;
-  method throughout the lifecycle. You see different roles involved and changes
-  in the list of inputs to be considered and outputs to be produced or updated.
-  These changes were defined by the author that created this process to express
-  the exact focus of the task performance for each occurrence. In addition to
-  updating the roles, input and output work products for a task descriptor, you
-  can also provide additional textual descriptions as well as define the exact
-  steps of the task that should and should not be performed for this particular
-  occurrence of the task.</p>
-<p>EPF Composer provides you with a process editor that supports different breakdown structure
-  views as well as graphical process presentations. As a process author, you typically
-  start by creating an activity breakdown, dividing and breaking your process
-  down into phases, iterations, and high-level activities. Instead of creating
-  your activities in the breakdown structure editor, you can alternatively work
-  in a graphical activity diagram editor that allows you to graphically create
-  a workflow for your activities. To assign method content to your process, you
-  then have the choice of working in different process views (work breakdown structure,
-  work product usage, or team allocation view). Each view supports a different
-  approach for creating a process. You can define the work to be done, define
-  the results to be produced, or define responsibilities for your roles. If requested,
-  the editor updates the other process views semi-automatically using wizards
-  that prompt you for decisions on selecting method content elements.</p>
-<p>For more details on process authoring see the online help:</p>
-<div align="left">
-<ul>
-  <li><a href="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.epf.help.doc/html/processauthoringoverview.html">Process
-  Authoring Overview</a></li>
-</ul>
-</div>
-<p>&nbsp;</p>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/welcome/pub.gif b/plugins/org.eclipse.epf.help.doc/html/welcome/pub.gif
deleted file mode 100755
index 0725474..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/welcome/pub.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/welcome/publishing.html b/plugins/org.eclipse.epf.help.doc/html/welcome/publishing.html
deleted file mode 100755
index 80b8c1c..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/welcome/publishing.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<html>
-<!-- 
-    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
--->
-
-<head>
-<title>Configuration and Publishing</title>
-</head>
-<body>
-<h3>Method Configurations Overview</h3>
-<p>Eclipse Process Framework Composer ships with a lot of content out of the box. It includes
-  the Open Unified Process (OpenUP) framework and various plug-ins extending
-  OpenUP/Basic with domain-specific additions. No organization or project requires all of this
-  documentation all at once, but would work with a selection of specific subsets.</p>
-<p> Eclipse Process Framework Composer (EPF Composer) manages for that purpose so-called method
-  configurations, which allow you to specify working sets of content and processes
-  for a specific context, such as a specific variant of the RUP framework that
-  you want to publish and deploy for a given software project or as a foundation
-  for a development organization. All content and processes in EPF Composer are organized
-  in method plug-ins, which are organized into method packages. A method configuration
-  is simply a selection of the method plug-ins and packages.</p>
-<p><img src="conf.gif"></p>
-<p>You create and specify a configuration using the configuration editor depicted
-  in the figure above. You could start creating your own method configuration
-  by copying one of the configurations that ship with EPF Composer and modify it to fit
-  your specific needs. You can add or remove whole method plug-ins as well as
-  make selection with each plug-in by checking or un-checking packages. </p>
-<p> You can use the resulting configuration as your working set for your EPF Composer
-  work. The actual content of the configuration, i.e. the included method content
-  and process elements are always accessible in the Configuration view. Use the
-  combo box in the toolbar to select the currently used method configuration.</p>
-<h3>Publishing Overview</h3>
-<p>Method configurations are the basis for publishing method content and processes.
-  A published configuration is an html Web site that presents all the method
-  content and processes of the method configuration in a navigable and searchable
-  way. It uses the relationships established during method content and process
-  authoring to generate hyperlinks between elements as well as provides tree
-  browsers based on the configuration view and user-defined categorizations of
-  the content. The figure below shows an example of the published 'Classic RUP'
-  method configuration.</p>
-<p><img src="pub.gif"></p>
-<p>For publishing simply create and select a configuration. The publication wizard
-  will do the rest for you and only publish content that is part of the method
-  configuration. It will also automatically adopt content to the configuration
-  such as removing
-  references of method content elements to elements outside of the configuration
-  or removing activities from your processes that only contain work defined outside
-  of the configuration set. Hence, publishing will only include the content that
-  you really need. You can always preview a published configuration using EPF Composer's
-browsing perspective.</p>
-<p>&nbsp;</p>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/welcome/uma_hump.gif b/plugins/org.eclipse.epf.help.doc/html/welcome/uma_hump.gif
deleted file mode 100755
index 4e98f28..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/welcome/uma_hump.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.help.doc/html/whitepaper.html b/plugins/org.eclipse.epf.help.doc/html/whitepaper.html
deleted file mode 100755
index dece33a..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/whitepaper.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Whitepaper" />
-<meta name="DC.Relation" scheme="URI" content="guidance.html#guidance" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="whitepaper" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Whitepaper</title>
-</head>
-<body id="whitepaper"><a name="whitepaper"><!-- --></a>
-
-<h1 class="topictitle1">Whitepaper</h1>
-<div><p>A Whitepaper is a special type of concept guidance that is externally reviewed
-or published and can be read and understood in isolation of other content
-elements and guidance.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="guidance.html#guidance">Guidance</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/workproduct.html b/plugins/org.eclipse.epf.help.doc/html/workproduct.html
deleted file mode 100755
index 98a2c13..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/workproduct.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Work Product" />
-<meta name="DC.Relation" scheme="URI" content="createaworkproduct.html#createaworkproduct" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="workproduct" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Work Product</title>
-</head>
-<body id="workproduct"><a name="workproduct"><!-- --></a>
-
-<h1 class="topictitle1">Work Product</h1>
-<div><div class="p">Work product is a general term for task inputs and outputs,
-descriptions of content elements that are used to define anything used, produced,
-or modified by a task. The three types of work product are:<ul><li><a href="artifact.html#artifact">Artifact</a></li>
-<li><a href="outcome.html#outcome">Outcome</a></li>
-<li><a href="deliverable.html#deliverable">Deliverable</a></li>
-</ul>
-</div>
-</div>
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createaworkproduct.html#createaworkproduct">Create a Work Product</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/workproductdescriptors.html b/plugins/org.eclipse.epf.help.doc/html/workproductdescriptors.html
deleted file mode 100755
index c4fca95..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/workproductdescriptors.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Work Product Descriptors" />
-<meta name="DC.Relation" scheme="URI" content="workproduct.html#workproduct" />
-<meta name="DC.Relation" scheme="URI" content="createaworkproduct.html" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="workproductdescriptors" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Work Product Descriptors</title>
-</head>
-<body id="workproductdescriptors"><a name="workproductdescriptors"><!-- --></a>
-
-<h1 class="topictitle1">Work Product Descriptors</h1>
-<div><p>A work product descriptor is a work product in the context of one specific
-activity. Every breakdown structure can define different relationships of
-work product descriptors of task descriptors and role descriptors. One work
-product can be represented by many work product descriptors, each within the
-context of an activity with its own set of relationships.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="workproduct.html#workproduct">Work Product</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="createaworkproduct.html">Create a Work Product</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/html/workproductkind.html b/plugins/org.eclipse.epf.help.doc/html/workproductkind.html
deleted file mode 100755
index 87ddb29..0000000
--- a/plugins/org.eclipse.epf.help.doc/html/workproductkind.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="DC.rights.owner" content="(C) Copyright Eclipse contributors 2005, 2006" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Type" content="concept" />
-<meta name="DC.Title" content="Work Product Kind" />
-<meta name="DC.Relation" scheme="URI" content="methodcontentcategories.html#methodcontentcategories" />
-<meta name="DC.Format" content="XHTML" />
-<meta name="DC.Identifier" content="workproductkind" />
-<meta name="DC.Language" content="en-us" />
-<!-- 
-    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
--->
-<link rel="stylesheet" type="text/css" href="./ibmdita.css" />
-<title>Work Product Kind</title>
-</head>
-<body id="workproductkind"><a name="workproductkind"><!-- --></a>
-
-<h1 class="topictitle1">Work Product Kind</h1>
-<div><p>Work Product Kind is another category for grouping <a href="workproduct.html#workproduct">Work Products</a>. A work product can have many work product
-kinds. As an example, you might want to have a series of work product kinds
-that correspond to the overall intent of work products, such as specification,
-plan, or model.</p>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="methodcontentcategories.html#methodcontentcategories">Method Content Categories</a></div>
-</div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.help.doc/main.xml b/plugins/org.eclipse.epf.help.doc/main.xml
deleted file mode 100755
index 01a7275..0000000
--- a/plugins/org.eclipse.epf.help.doc/main.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="About EPF Composer" >
-  
-  <!-- Getting Started -->
-  <topic label="Getting started">
-    <anchor id="gettingstarted_id"/>
-  </topic>
-
-<!-- Concepts -->
-  <topic label="Concepts">
-    <anchor id="concepts_id"/>
-  </topic>
-
-  <!-- Tasks -->
-  <topic label="Tasks">
-    <anchor id="tasks_id"/>
-  </topic>
-
-  <!-- Reference -->
-  <topic label="Reference">
-    <anchor id="reference_id"/>
-  </topic>
-
-  <!--Glossary -->
-  <topic label="Glossary">
-    <anchor id="glossary_id"/>
-  </topic>
-  
-<!--Tutorials -->
-  <topic label="Tutorials" href="html/tutorials/tutorials_startpage.htm">
-    <anchor id="tutorials_id"/>
-  </topic>
-
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/overview.xml b/plugins/org.eclipse.epf.help.doc/overview.xml
deleted file mode 100755
index 8708ef3..0000000
--- a/plugins/org.eclipse.epf.help.doc/overview.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Overview" link_to="main.xml#overview_id">
-   <topic label="About Eclipse Process Framework Composer" href="html/help/aboutcomposer.html"/>
-   <topic label="Method content authoring overview" href="html/help/methodauthoringoverview.html"/>
-   <topic label="Process authoring overview" href="html/help/processauthoringoverview.html"/>
-   <topic label="Method configurations overview" href="html/help/configurationsandpublishingoverview.html"/>
-   <topic label="User roles and role specific tasks" href="html/help/userrolesandrolespecifictasks.html"/>
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/plugin.properties b/plugins/org.eclipse.epf.help.doc/plugin.properties
deleted file mode 100755
index cec8026..0000000
--- a/plugins/org.eclipse.epf.help.doc/plugin.properties
+++ /dev/null
@@ -1,36 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Documentation
-providerName=Eclipse.org
-
-
-# Cheat Sheets
-methodAuthoringCheatSheetsName=Method Authoring Cheat Sheets
-CheatsheetGetstartedCategoryText=Getting Started
-CheatsheetReusableContentCategoryText=Create Reusable Method Content
-CheatsheetWriteContentCategoryText=Write Method Content
-CheatsheetProcessesCategoryText=Work with Processes
-CheatsheetNavigateMethodContent=Navigate Method Content
-CheatsheetCreateMethodConfiguration=Create your own Method Configuration
-CheatsheetCreateMethodPlugin=Create your own Method Plug-in
-CheatsheetAddMethodContent=Add new Method Content such as Roles, Tasks, Work Products, or Guidance
-CheatsheetTailorMethodElements=Tailor existing Method Elements (Roles, Tasks, Work Products or Guidance) Using Contribution
-CheatsheetReplaceMehtodElements=Replace existing Method Elements (Roles, Tasks, Work Products or Guidance)
-CheatsheetAddMethodRefOrHyperlink=Add a Method Reference or Hyperlink (URL)
-CheatsheetApplyCapabilityPattern=Apply a Capability Pattern
-CheatsheetCreateProcess=Create a Process (Capability Pattern or Delivery Process)
-
-
-
-               
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.help.doc/plugin.xml b/plugins/org.eclipse.epf.help.doc/plugin.xml
deleted file mode 100755
index b7ea4aa..0000000
--- a/plugins/org.eclipse.epf.help.doc/plugin.xml
+++ /dev/null
@@ -1,147 +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
-   id="org.eclipse.epf.help.doc"
-   name="%pluginName"
-   version="1.2.0"
-   provider-name="%providerName"
-   class="org.eclipse.epf.help.doc.DocPlugin">
-
-   <runtime>
-      <library name="doc.jar"/>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.help"/>
-   </requires>
-
-   <extension point="org.eclipse.help.toc">
-      	<toc
-            file="main.xml"
-            primary="true">
-      	</toc>
-      	<toc
-		file="gettingstarted.xml">
-      	</toc>
-      	<toc
-		file="concepts.xml">
-      	</toc>
-	<toc
-		file="tasks.xml">
-	</toc>
-	<toc
-		file="reference.xml">
-	</toc>
-	<toc
-		file="glossary.xml">
-	</toc>
-	<toc
-		file="tutorials.xml">
-	</toc>
-   </extension>
-
-<!-- ============================================================================= -->
-<!-- F1 context files                                                              -->
-<!-- ============================================================================= -->
-
-	<extension point="org.eclipse.help.contexts"> 
-		<contexts file="$nl$/contexts_authoring_ui.xml" plugin="org.eclipse.epf.authoring.ui"/> 
-	</extension>
-
- 	<extension point="org.eclipse.help.contexts"> 
-      <contexts file="$nl$/contexts_Search.xml" plugin="org.eclipse.search"/> 
-   	</extension>
-	
-	<extension 
-         point="org.eclipse.ui.cheatsheets.cheatSheetContent"
-         id="org.eclipse.epf.help.doc.cheatsheets"
-         name="%methodAuthoringCheatSheetsName">
-      <category
-            id="org.eclipse.epf.help.doc.cheatsheets.getstarted" 
-            name="%CheatsheetGetstartedCategoryText"/>
-      <cheatsheet
-            id="org.eclipse.epf.help.doc.cheatsheets.navigatemethodcontent"
-            category="org.eclipse.epf.help.doc.cheatsheets.getstarted"
-            contentFile="$nl$/cheatsheets/navigatemethodcontent.xml"
-            name="%CheatsheetNavigateMethodContent"/>
-      <cheatsheet
-            id="org.eclipse.epf.help.doc.cheatsheets.createmethodconfiguration"
-            category="org.eclipse.epf.help.doc.cheatsheets.getstarted"
-            contentFile="$nl$/cheatsheets/createmethodconfiguration.xml"
-            name="%CheatsheetCreateMethodConfiguration"/>
-      <cheatsheet
-            id="org.eclipse.epf.help.doc.cheatsheets.createmethodplugin"
-            category="org.eclipse.epf.help.doc.cheatsheets.getstarted"
-            contentFile="$nl$/cheatsheets/createmethodplugin.xml"
-            name="%CheatsheetCreateMethodPlugin"/>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.cheatsheets.cheatSheetContent" 
-         id="org.eclipse.epf.help.doc.cheatsheets" 
-         name="%methodAuthoringCheatSheetsName">
-      <category
-            id="org.eclipse.epf.help.doc.cheatsheets.resuable.content"
-            name="%CheatsheetReusableContentCategoryText"/>
-      <cheatsheet
-            id="org.eclipse.epf.help.doc.cheatsheets.addnewmethodcontent"
-            category="org.eclipse.epf.help.doc.cheatsheets.resuable.content"
-            contentFile="$nl$/cheatsheets/addnewmethodcontent.xml"
-            name="%CheatsheetAddMethodContent"/>
-      <cheatsheet
-            id="org.eclipse.epf.help.doc.cheatsheets.tailorexistingmethodelements"
-            category="org.eclipse.epf.help.doc.cheatsheets.resuable.content"
-            contentFile="$nl$/cheatsheets/tailorexistingmethodelements.xml"
-            name="%CheatsheetTailorMethodElements"/>
-      <cheatsheet
-            id="org.eclipse.epf.help.doc.cheatsheets.replaceexistingmethodelements"
-            category="org.eclipse.epf.help.doc.cheatsheets.resuable.content"
-            contentFile="$nl$/cheatsheets/replaceexistingmethodelements.xml"
-            name="%CheatsheetReplaceMehtodElements"/>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.cheatsheets.cheatSheetContent"
-         id="org.eclipse.epf.help.doc.cheatsheets"
-         name="%methodAuthoringCheatSheetsName">
-      <category
-            id="org.eclipse.epf.help.doc.cheatsheets.write.content"
-            name="%CheatsheetWriteContentCategoryText"/>
-      <cheatsheet
-            id="org.eclipse.epf.help.doc.cheatsheets.addmethodref_or_hyperlink"
-            category="org.eclipse.epf.help.doc.cheatsheets.write.content"
-            contentFile="$nl$/cheatsheets/addmethodref_or_hyperlink.xml"
-            name="%CheatsheetAddMethodRefOrHyperlink"/>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.cheatsheets.cheatSheetContent"
-         id="org.eclipse.epf.help.doc.cheatsheets"
-         name="%methodAuthoringCheatSheetsName">
-      <category
-            id="org.eclipse.epf.help.doc.cheatsheets.processes"
-            name="%CheatsheetProcessesCategoryText"/>
-      <cheatsheet
-            id="org.eclipse.epf.help.doc.cheatsheets.applycapabilitypattern"
-            category="org.eclipse.epf.help.doc.cheatsheets.processes"
-            contentFile="$nl$/cheatsheets/applycapabilitypattern.xml"
-            name="%CheatsheetApplyCapabilityPattern"/>
-      <cheatsheet
-            id="org.eclipse.epf.help.doc.cheatsheets.createaprocess"
-            category="org.eclipse.epf.help.doc.cheatsheets.processes"
-            contentFile="$nl$/cheatsheets/createaprocess.xml"
-            name="%CheatsheetCreateProcess"/>
-   </extension>
-	
-</plugin>
diff --git a/plugins/org.eclipse.epf.help.doc/publishandexport.xml b/plugins/org.eclipse.epf.help.doc/publishandexport.xml
deleted file mode 100755
index 512ec30..0000000
--- a/plugins/org.eclipse.epf.help.doc/publishandexport.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Publishing and exporting" link_to="main.xml#publishandexport_id">
-   <topic label="Publishing overview" href="html/help/publishingoverview.html"/>
-   <topic label="Publishing a method configuration to a method web" href="html/help/publishingamethodconfigurationtoamethodweb.html"/>
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/reference.xml b/plugins/org.eclipse.epf.help.doc/reference.xml
deleted file mode 100755
index 97a6bba..0000000
--- a/plugins/org.eclipse.epf.help.doc/reference.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Reference" link_to="main.xml#reference_id">
-   <topic label="Suport for code management systems" href="html/help/cm_overview.html">
-   <topic label="Support for CVS" href="html/help/cm_cvs.html"/>
-   <topic label="Suport for Rational ClearCase" href="html/help/cm_rationalcc.html"/>
-   <topic label="Support for Rational CCRC" href="html/help/cm_ccrc.html"/>
-</topic>
-
-   <topic label="Accessibility" href="html/help/ac_main.html">
-   <topic label="Keyboard navigation" href="html/help/ac_navigation.html"/>
-   <topic label="Fonts and colors" href="html/help/ac_fontsandcolors.html"/>
-</topic>
-   
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/src/org/eclipse/epf/help/doc/DocPlugin.java b/plugins/org.eclipse.epf.help.doc/src/org/eclipse/epf/help/doc/DocPlugin.java
deleted file mode 100755
index 23da93d..0000000
--- a/plugins/org.eclipse.epf.help.doc/src/org/eclipse/epf/help/doc/DocPlugin.java
+++ /dev/null
@@ -1,91 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.help.doc;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class DocPlugin extends AbstractUIPlugin {
-
-	// The shared instance.
-	private static DocPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public DocPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static DocPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-//	public static String getResourceString(String key) {
-//		ResourceBundle bundle = DocPlugin.getDefault().getResourceBundle();
-//		try {
-//			return (bundle != null) ? bundle.getString(key) : key;
-//		} catch (MissingResourceException e) {
-//			return key;
-//		}
-//	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-//	public ResourceBundle getResourceBundle() {
-//		try {
-//			if (resourceBundle == null)
-//				resourceBundle = ResourceBundle.getBundle("org.eclipse.epf.help.doc.DocPluginResources");
-//		} catch (MissingResourceException x) {
-//			resourceBundle = null;
-//		}
-//		return resourceBundle;
-//	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-//	public static ImageDescriptor getImageDescriptor(String path) {
-//		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.epf.help.doc", path);
-//	}
-	
-}
diff --git a/plugins/org.eclipse.epf.help.doc/src/org/eclipse/epf/help/doc/package.html b/plugins/org.eclipse.epf.help.doc/src/org/eclipse/epf/help/doc/package.html
deleted file mode 100755
index 2bdb86d..0000000
--- a/plugins/org.eclipse.epf.help.doc/src/org/eclipse/epf/help/doc/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the activator for managing the Documentation plug-in's life cycle.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.help.doc/tasks.xml b/plugins/org.eclipse.epf.help.doc/tasks.xml
deleted file mode 100755
index ad46165..0000000
--- a/plugins/org.eclipse.epf.help.doc/tasks.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Tasks" link_to="main.xml#tasks_id">  
-
-  <!-- Creating reusable method content -->
-  <topic label="Creating reusable method content">
-   <topic label="Method content categories" href="html/help/content_categories.html"/>
-   <topic label="Create a method view with custom categories" href="html/help/create_custom_categories.html"/> 
-   <topic label="Create method content" href="html/help/create_method_content.html">
-      <topic label="Create a role" href="html/help/create_role.html"/>
-      <topic label="Create a task" href="html/help/create_task.html"/>
-      <topic label="Create a work product" href="html/help/create_workproduct.html"/>
-      <topic label="Create guidance" href="html/help/create_guidance.html"/>
-      <topic label="Method Content Variability" href="html/help/variability.html">
-         <topic label="Contributes" href="html/help/variability_contributes.html"/>
-         <topic label="Extends" href="html/help/variability_extends.html"/>
-         <topic label="Replaces" href="html/help/variability_replace.html"/>
-         <topic label="Associations impacted by variability" href="html/help/variability_associations.html"/>
-         <topic label="Browsing variability associations" href="html/help/variability_browsing.html"/>
-      </topic>
-   </topic>
-   <topic label="Browse and preview method content" href="html/help/browse_content.html"/>
-   <topic label="Creating index entries" href="html/help/indexing.html"/>
-   <topic label="Creating glossary entries" href="html/help/glossary_entries.html"/>
-   <topic label="Changing copyright notices" href="html/help/changing_copyright.html"/>
-</topic>
-
-  <!-- Categorizing method content -->
-  <topic label="Categorizing method content">
-  <topic label="Method content categories" href="html/help/content_categories.html"/>
-  <topic label="Create a method view with custom categories" href="html/help/create_custom_categories.html"/></topic>
-
-  <!-- Creating processes -->
-  <topic label="Creating processes">
-  <topic label="Create a reusable capability pattern" href="html/help/create_capability_pattern.html"/>
-  <topic label="Create a delivery process" href="html/help/create_delivery_process.html">
-  <topic label="Develop a work breakdown structure" href="html/help/develop_wbs.html"/>
-  <topic label="Develop a team allocation structure" href="html/help/develop_team_structure.html"/>
-  <topic label="Develop a work product usage structure" href="html/help/develop_workproduct_structure.html"/>
-  <topic label="Apply a capability pattern" href="html/help/apply_capabilitypattern.html"/>
-  <topic label="Process element properties View" href="html/help/properties_view.html"/>
-  <topic label="Using deep copy" href="html/help/using_deep_copy.html"/>
-  <topic label="Using activity variability" href="html/help/using_activity_variability.html"/>
-  <topic label="Working with process diagrams" href="html/help/process_diagrams.html">
-  <topic label="Working with activity diagrams" href="html/help/activity_diagrams.html"/>
-  <topic label="Working with activity detail diagrams" href="html/help/activity_detail_diagrams.html"/>
-
-  </topic>
-
-  <!-- Publishing Method Content -->
-  <topic label="Publishing and exporting method content">
-   <topic label="Publishing a method configuration to a method web" href="html/help/publishing.html"/>
-   <topic label="Exporting to Microsoft Project" href="html/help/export_to_msproject.html"/>
-   <topic label="XML Import/Export" href="html/help/export_to_xml.html"/>
- </topic>
-
-  <!-- Working with Textual Descriptions -->
- <topic label="Rich text editor" href="html/help/richtexteditor.html"/>
-   <topic label="Add a reference or hyperlink" href="html/help/add_hyperlink.html"/>
-  </topic>
-  </topic>
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/toc.xml b/plugins/org.eclipse.epf.help.doc/toc.xml
deleted file mode 100755
index 08596c8..0000000
--- a/plugins/org.eclipse.epf.help.doc/toc.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Eclipse Process Framework Composer" topic="html/toc.html">
-   <topic label="Getting Started">
-      <anchor id="gettingstarted"/>
-   </topic>
-   <topic label="Concepts">
-      <anchor id="concepts"/>
-   </topic>
-   <topic label="Tasks">
-      <anchor id="tasks"/>
-   </topic>
-   <topic label="Reference">
-      <anchor id="reference"/>
-   </topic>
-   <topic label="Samples">
-      <anchor id="samples"/>
-   </topic>
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/tocconcepts.xml b/plugins/org.eclipse.epf.help.doc/tocconcepts.xml
deleted file mode 100755
index 4609e11..0000000
--- a/plugins/org.eclipse.epf.help.doc/tocconcepts.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Concepts" link_to="toc.xml#concepts"> 
-	<topic label="Main Topic"  href="html/concepts/maintopic.html"> 
-		<topic label="Sub Topic" href="html/concepts/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/concepts/subtopic2.html" /> 
-	</topic> 
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/tocgettingstarted.xml b/plugins/org.eclipse.epf.help.doc/tocgettingstarted.xml
deleted file mode 100755
index afab317..0000000
--- a/plugins/org.eclipse.epf.help.doc/tocgettingstarted.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Getting Started" link_to="toc.xml#gettingstarted"> 
-	<topic label="Main Topic"  href="html/gettingstarted/maintopic.html"> 
-		<topic label="Sub Topic" href="html/gettingstarted/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/gettingstarted/subtopic2.html" />
-	</topic> 
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/tocreference.xml b/plugins/org.eclipse.epf.help.doc/tocreference.xml
deleted file mode 100755
index e55c5a2..0000000
--- a/plugins/org.eclipse.epf.help.doc/tocreference.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Reference" link_to="toc.xml#reference"> 
-	<topic label="Main Topic"  href="html/reference/maintopic.html"> 
-		<topic label="Sub Topic" href="html/reference/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/reference/subtopic2.html" /> 
-	</topic> 
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/tocsamples.xml b/plugins/org.eclipse.epf.help.doc/tocsamples.xml
deleted file mode 100755
index 897efb7..0000000
--- a/plugins/org.eclipse.epf.help.doc/tocsamples.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Samples" link_to="toc.xml#samples"> 
-	<topic label="Main Topic"  href="html/samples/maintopic.html"> 
-		<topic label="Sub Topic" href="html/samples/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/samples/subtopic2.html" /> 
-	</topic> 
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/toctasks.xml b/plugins/org.eclipse.epf.help.doc/toctasks.xml
deleted file mode 100755
index 7214544..0000000
--- a/plugins/org.eclipse.epf.help.doc/toctasks.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Tasks" link_to="toc.xml#tasks"> 
-	<topic label="Main Topic"  href="html/tasks/maintopic.html"> 
-		<topic label="Sub Topic" href="html/tasks/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/tasks/subtopic2.html" /> 
-	</topic> 
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/tutorials.xml b/plugins/org.eclipse.epf.help.doc/tutorials.xml
deleted file mode 100755
index dca868e..0000000
--- a/plugins/org.eclipse.epf.help.doc/tutorials.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Tutorials" link_to="main.xml#tutorials_id">
-   <topic label="Explore the user interface" href="html/tutorials/tut1_intro.htm">
-	<topic label="Concepts" href="html/tutorials/tut1_concepts.htm" /> 
-   	<topic label="Basic navigation" href="html/tutorials/tut1_ex1.htm" />
-   	<topic label="Browse method content" href="html/tutorials/tut1_ex2.htm" />
-   	<topic label="Browse process content" href="html/tutorials/tut1_ex3.htm" />
-   	<topic label="Browse while authoring" href="html/tutorials/tut1_ex4.htm" />
-   	<topic label="Search" href="html/tutorials/tut1_ex5.htm" />
-   </topic>
-   <topic label="Create method content" href="html/tutorials/tut2_intro.htm">
-	<topic label="Concepts" href="html/tutorials/tut2_concepts.htm" /> 
-	<topic label="Create a content package" href="html/tutorials/tut2_ex1.htm" />
-	<topic label="Create a work product" href="html/tutorials/tut2_ex2.htm" />
-	<topic label="Create a role" href="html/tutorials/tut2_ex3.htm" />
-	<topic label="Create a task" href="html/tutorials/tut2_ex4.htm" />
-	<topic label="Work with steps" href="html/tutorials/tut2_ex5.htm" />
-   	<topic label="Create a guidance" href="html/tutorials/tut2_ex6.htm" />
-   	<topic label="Manage guidance" href="html/tutorials/tut2_ex7.htm" />
-   	<topic label="Create a standard category" href="html/tutorials/tut2_ex8.htm" />
-   	<topic label="Add a plug-in" href="html/tutorials/tut2_ex9.htm" />
-   </topic>
-   <topic label="Reuse method content" href="html/tutorials/tut3_intro.htm">
-   	<topic label="Concepts" href="html/tutorials/tut3_concepts.htm" /> 
-   	<topic label="Contribute to a role" href="html/tutorials/tut3_ex1.htm" />
-   	<topic label="Contribute to a work product" href="html/tutorials/tut3_ex2.htm" />
-   	<topic label="Contribute to a task" href="html/tutorials/tut3_ex3.htm" />
-   	<topic label="Extend a role" href="html/tutorials/tut3_ex4.htm" />
-   	<topic label="Extend a work product" href="html/tutorials/tut3_ex5.htm" />
-   	<topic label="Extend a task" href="html/tutorials/tut3_ex6.htm" />
-   	<topic label="Replace a role" href="html/tutorials/tut3_ex7.htm" />
-   </topic>
-   <topic label="Working with processes" href="html/tutorials/tut5_intro.htm">
-       	<topic label="Concepts" href="html/tutorials/tut5_concepts.htm" /> 
-   	<topic label="Browse process content" href="html/tutorials/tut5_ex1.htm" />
-   	<topic label="Explore process content" href="html/tutorials/tut5_ex2.htm" />
-   	<topic label="Create a delivery process" href="html/tutorials/tut5_ex3.htm" />
-   	<topic label="Use capability patterns" href="html/tutorials/tut5_ex4.htm" />
-   	<topic label="Create a process diagram" href="html/tutorials/tut5_ex5.htm" />
-   </topic>
-   <topic label="Publishing method content" href="html/tutorials/tut4_intro.htm">
-       	<topic label="Concepts" href="html/tutorials/tut4_concepts.htm" /> 
-   	<topic label="Publish a configuration" href="html/tutorials/tut4_ex1.htm" />
-   	<topic label="Create a custom category" href="html/tutorials/tut4_ex2.htm" />
-   	<topic label="Create a custom configuration" href="html/tutorials/tut4_ex3.htm" />
-   	<topic label="Publish a custom configuration" href="html/tutorials/tut4_ex4.htm" />
-   </topic>
-</toc>
diff --git a/plugins/org.eclipse.epf.help.doc/workwithtextdesc.xml b/plugins/org.eclipse.epf.help.doc/workwithtextdesc.xml
deleted file mode 100755
index 02876fd..0000000
--- a/plugins/org.eclipse.epf.help.doc/workwithtextdesc.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<!-- 
-    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
--->
-<toc label="Working with Textual Descriptions" link_to="main.xml#workwithtextdesc_id">
-   <topic label="Rich Text Editor" href="html/help/richtexteditor.html"/>
-   <topic label="Add a Reference or Hyperlink" href="html/help/add_hyperlink.html"/>
-</toc>
diff --git a/plugins/org.eclipse.epf.import.xml/.classpath b/plugins/org.eclipse.epf.import.xml/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/plugins/org.eclipse.epf.import.xml/.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/plugins/org.eclipse.epf.import.xml/.cvsignore b/plugins/org.eclipse.epf.import.xml/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.import.xml/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.import.xml/.options b/plugins/org.eclipse.epf.import.xml/.options
deleted file mode 100755
index 139d1de..0000000
--- a/plugins/org.eclipse.epf.import.xml/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-# Turn on debug trace for the xml import plug-in
-org.eclipse.epf.import.xml/debug=true
diff --git a/plugins/org.eclipse.epf.import.xml/.project b/plugins/org.eclipse.epf.import.xml/.project
deleted file mode 100755
index f27599a..0000000
--- a/plugins/org.eclipse.epf.import.xml/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.import.xml</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/plugins/org.eclipse.epf.import.xml/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.import.xml/META-INF/MANIFEST.MF
deleted file mode 100755
index 24963cf..0000000
--- a/plugins/org.eclipse.epf.import.xml/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.import.xml;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.epf.importing.xml.ImportXMLPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.epf.export.xml,
- org.eclipse.ui,
- org.eclipse.epf.import
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.importing.xml,
- org.eclipse.epf.importing.xml.preferences,
- org.eclipse.epf.importing.xml.services,
- org.eclipse.epf.importing.xml.wizards
diff --git a/plugins/org.eclipse.epf.import.xml/build.properties b/plugins/org.eclipse.epf.import.xml/build.properties
deleted file mode 100755
index 68bcc2f..0000000
--- a/plugins/org.eclipse.epf.import.xml/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               .options,\
-               META-INF/,\
-               plugin.properties,\
-               plugin.xml,\
-               icons/
diff --git a/plugins/org.eclipse.epf.import.xml/icons/full/obj16/XMLFile.gif b/plugins/org.eclipse.epf.import.xml/icons/full/obj16/XMLFile.gif
deleted file mode 100755
index 83b44bb..0000000
--- a/plugins/org.eclipse.epf.import.xml/icons/full/obj16/XMLFile.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.import.xml/icons/full/wizban/ImportXML.gif b/plugins/org.eclipse.epf.import.xml/icons/full/wizban/ImportXML.gif
deleted file mode 100755
index e249831..0000000
--- a/plugins/org.eclipse.epf.import.xml/icons/full/wizban/ImportXML.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.import.xml/plugin.properties b/plugins/org.eclipse.epf.import.xml/plugin.properties
deleted file mode 100755
index e410583..0000000
--- a/plugins/org.eclipse.epf.import.xml/plugin.properties
+++ /dev/null
@@ -1,18 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Import XML Plug-in
-providerName=Eclipse.org
-
-# Import XML Wizard
-importXMLWizardName=XML
-importXMLWizardDescription=Import method library content stored in a XML file.
diff --git a/plugins/org.eclipse.epf.import.xml/plugin.xml b/plugins/org.eclipse.epf.import.xml/plugin.xml
deleted file mode 100755
index 3fbaaee..0000000
--- a/plugins/org.eclipse.epf.import.xml/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.importWizards">
-      <wizard
-            category="org.eclipse.epf.ui.importWizards.category"
-            class="org.eclipse.epf.importing.xml.wizards.ImportXMLWizard"
-            icon="icons/full/obj16/XMLFile.gif"
-            id="org.eclipse.epf.importing.xml.wizards.ImportXMLWizard"
-            name="%importXMLWizardName">
-         <description>
-               %importXMLWizardDescription
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.epf.ui.importWizards">
-      <wizard id="org.eclipse.epf.importing.xml.wizards.ImportXMLWizard"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/ImportXMLPlugin.java b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/ImportXMLPlugin.java
deleted file mode 100755
index 794c4c8..0000000
--- a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/ImportXMLPlugin.java
+++ /dev/null
@@ -1,60 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.xml;
-
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public class ImportXMLPlugin extends AbstractPlugin {
-
-	//The shared instance.
-	private static ImportXMLPlugin plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public ImportXMLPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		
-		// set this to allow parse large xml file
-		System.setProperty("entityExpansionLimit", "100000000"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static ImportXMLPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/ImportXMLResources.java b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/ImportXMLResources.java
deleted file mode 100755
index 2adc8a4..0000000
--- a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/ImportXMLResources.java
+++ /dev/null
@@ -1,96 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.xml;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The Export XML message resource bundle accessor class.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public final class ImportXMLResources extends NLS {
-
-	private static String BUNDLE_NAME = ImportXMLResources.class.getPackage()
-			.getName()
-			+ ".Resources"; //$NON-NLS-1$
-
-	private ImportXMLResources() {
-		// Do not instantiate
-	}
-
-	public static String importXMLWizard_title;
-
-	public static String selectXMLFilePage_title;
-
-	public static String selectXMLFilePage_desc;
-
-	public static String fileLabel_text;
-
-	public static String browseButton_text;
-
-	public static String optionGroup_text;
-
-	public static String overwriteRadioButton_text;
-
-	public static String mergeRadioButton_text;
-
-	public static String importingXML_text;
-
-	public static String review_log_files;
-
-	public static String importXMLError_msg;
-
-	public static String importXMLError_reason;
-
-	public static String invalidXMLFile_error;
-
-	public static String importXMLService_element_not_handled;
-
-	public static String importXMLService_element_without_id;
-
-	public static String importXMLService_import_failed;
-
-	public static String importXMLService_missing_plugin;
-
-	public static String importXMLService_error_missing_plugins;
-
-	public static String library_error_no_eclass;
-
-	public static String library_no_package;
-
-	public static String library_error_create_element;
-
-	public static String library_object_string;
-
-	public static String library_error_set_attribute_2;
-
-	public static String library_error_set_attribute;
-
-	public static String library_error_set_attribute_3;
-
-	public static String library_error_set_reference;
-
-	public static String library_error_set_reference_2;
-
-	public static String versionMismatch_oldData;
-
-	public static String versionMismatch_oldData_unknown;
-
-	public static String versionMismatch_oldTool;
-	
-	public static String versionMismatch_oldTool_unknown;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ImportXMLResources.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/Resources.properties b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/Resources.properties
deleted file mode 100755
index 48b05f7..0000000
--- a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/Resources.properties
+++ /dev/null
@@ -1,58 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-#
-# Message ID Range:
-#
-
-# Import XML Wizard
-importXMLWizard_title=Import XML
-
-# Select Import XML File Wizard Page
-selectXMLFilePage_title=Specify import file
-selectXMLFilePage_desc=Specify the XML file containing the method library content to import, and select the appropriate import operation to perform.
-fileLabel_text=XML File:
-browseButton_text=Browse...
-optionGroup_text=Import option
-overwriteRadioButton_text=Override existing method library content with the imported content
-mergeRadioButton_text=Merge imported content into the existing method library
-
-# Progress Messages
-importingXML_text=Importing XML library content into the current method library...
-
-# Import XML Error Dialog
-review_log_files=The import operation has been completed. Review the log files in the \n''{0}'' folder for any errors.
-importXMLError_msg=IUPM0000E: The import operation cannot proceed.
-importXMLError_reason=IUPM0009E: The current method library is read-only.\n\nMake sure that ''{0}'' is writable or create a new method library and try again.
-
-# Error Messages
-invalidXMLFile_error=The specified XML file is not valid.
-versionMismatch_oldData=IUPM0010E: The specified XML file was exported by a previous version ({0}) of {1}. The files must be exported using the current version of {1}.
-versionMismatch_oldData_unknown=IUPM0011E: The specified XML file was exported by a previous version of {0}. The files must be exported using the current version of {0}.
-versionMismatch_oldTool=IUPM0012E: The specified XML file was exported by a newer version ({0}) of {1}. You must upgrade {1} in order to import the file.  
-versionMismatch_oldTool_unknown=IUPM0013E: The specified XML file cannot be opened. You must upgrade {0} in order to import the file.  
-
-importXMLService_element_not_handled=Element not handled: {0}
-importXMLService_element_without_id=Element without ID: {0}
-importXMLService_import_failed=Import failed: {0}
-importXMLService_missing_plugin=Missing required plugin {0}
-importXMLService_error_missing_plugins=Missing required plugin(s). Please check the log files for detail
-
-library_error_no_eclass=Error creating ContentCategory: Unable to get EClass for {0}
-library_no_package=Unable to find owning package for object {0}
-library_error_create_element=Error creating element: {0}
-library_object_string=object {0}, feature {1}
-library_error_set_attribute_2=Error setting attribute: Invalid attribute feature value {0}
-library_error_set_attribute=Error setting attribute for object {0}, feature {1}, and value {2}
-library_error_set_attribute_3=Don''t know how to setting attribute for object {0}, feature {1}, and value {2}
-library_error_set_reference=Error setting reference for feature {0}: no element with id {1}
-library_error_set_reference_2=Error setting reference for object {0}, feature {1}, and value {2}
-
diff --git a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/package.html b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/package.html
deleted file mode 100755
index 41a7234..0000000
--- a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the activator for managing the Import XML plug-in's life cycle.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/preferences/ImportXMLPreferences.java b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/preferences/ImportXMLPreferences.java
deleted file mode 100755
index d855791..0000000
--- a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/preferences/ImportXMLPreferences.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2004, 2005 IBM Corporation.  All Rights Reserved.
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.xml.preferences;
-
-import org.eclipse.epf.importing.xml.ImportXMLPlugin;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * The Export XML preferences.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ImportXMLPreferences {
-
-	/**
-	 * The import XML file preference key.
-	 */
-	public static final String XML_FILE = "xmlFile"; //$NON-NLS-1$
-
-	/**
-	 * The merge option preference key.
-	 */
-	public static final String MERGE_OPTION = "mergeOption"; //$NON-NLS-1$	
-
-	static {
-		// Initialize the default preference values.
-		IPreferenceStore store = ImportXMLPlugin.getDefault()
-				.getPreferenceStore();
-		store.setDefault(XML_FILE, ""); //$NON-NLS-1$
-		store.setDefault(MERGE_OPTION, false); //$NON-NLS-1$		
-	}
-
-	/**
-	 * Returns the import XML file preference.
-	 * 
-	 * @return the import XML file preference
-	 */
-	public static String getXMLFile() {
-		return ImportXMLPlugin.getDefault().getPreferenceStore().getString(
-				XML_FILE);
-	}
-
-	/**
-	 * Sets the import XML file preference.
-	 * 
-	 * @param path
-	 *            the absolute path to a XML file
-	 */
-	public static void setXMLFile(String path) {
-		ImportXMLPlugin.getDefault().getPreferenceStore().setValue(XML_FILE,
-				path);
-	}
-
-	/**
-	 * Returns the merge option file preference.
-	 * 
-	 * @return the merge option file preference
-	 */
-	public static boolean getMergeOption() {
-		return ImportXMLPlugin.getDefault().getPreferenceStore().getBoolean(
-				MERGE_OPTION);
-	}
-
-	/**
-	 * Sets the merge option file preference.
-	 * 
-	 * @param mergeOption
-	 *            the user specified merge option
-	 */
-	public static void setMergeOption(boolean mergeOption) {
-		ImportXMLPlugin.getDefault().getPreferenceStore().setValue(
-				MERGE_OPTION, mergeOption);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/preferences/package.html b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/preferences/package.html
deleted file mode 100755
index 9b164fc..0000000
--- a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/preferences/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides preference support for the Import XML service.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/ImportResourceHandler.java b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/ImportResourceHandler.java
deleted file mode 100755
index 4921083..0000000
--- a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/ImportResourceHandler.java
+++ /dev/null
@@ -1,126 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.xml.services;
-
-import java.io.File;
-
-import org.eclipse.epf.dataexchange.util.BaseResourceHandler;
-import org.eclipse.epf.dataexchange.util.UrlInfo;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.MethodElement;
-
-
-/**
- * resource handler for content in the imported library
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public class ImportResourceHandler extends BaseResourceHandler {
-
-		
-	/**
-	 * The constructor
-	 * @param sourceLibRoot
-	 * @param targetLibRoot
-	 */
-	public ImportResourceHandler(File sourceLibRoot, File targetLibRoot) {
-		super(sourceLibRoot, targetLibRoot);
-	}
-	
-	/**
-	 * resolve the url. put the resources into the location based on the library resource structure definition.
-	 */
-	public UrlInfo resolveFileUrl(Object owner, String srcUrl) throws Exception {
-
-		UrlInfo info = new UrlInfo();
-
-		info.sourceUrl = srcUrl;
-		info.sourceFile = new File(sourceLibRoot, srcUrl).getCanonicalFile();
-		info.targetUrl = srcUrl; 
-		info.targetFile = null;
-
-		if (info.sourceFile == null || !info.sourceFile.exists() ) {
-			return info;
-		}
-		
-		if ( owner instanceof MethodElement ) {
-			// fix the target url and 
-			info.targetUrl = fixUrl(srcUrl);
-			
-			//String elementPath = ResourceHelper.getElementResourcePath(owner);
-			String elementPath = ResourceHelper.getElementPath( (MethodElement)owner);	
-			info.targetFile = new File(new File(targetLibRoot, elementPath), info.targetUrl);	
-		} else {
-			info.targetUrl = srcUrl; 
-			info.sourceFile = new File(sourceLibRoot, srcUrl);
-		}
-
-		return info;
-	}
-
-	private String fixUrl(String url) {
-		url = url.replace(File.separatorChar, '/');  //$NON-NLS-1$
-		int indx = url.lastIndexOf(ResourceHelper.RESOURCE_FOLDER + "/");  //$NON-NLS-1$
-		if ( indx >=0 ) {
-			return url.substring(indx);
-		}
-		
-		// put the resource into the resources folder
-		return new File(ResourceHelper.RESOURCE_FOLDER, url)
-			.toString().replace(File.separatorChar, '/'); //$NON-NLS-1$
-	}
-	
-//	/**
-//	 * the resource path will be relative to the libary root. urls needs to be fixed
-//	 * 
-//	 * @param owner the owner object in the target library
-//	 * @param srcUrl the url referenced in the source content
-//	 * @return
-//	 */
-//	private UrlInfo loadUrlInfoWithFixedPath(Object owner, String srcUrl) {
-//		UrlInfo info = new UrlInfo();
-//		info.sourceUrl = srcUrl;
-//		info.targetUrl = srcUrl;
-//		info.sourceFile = new File(sourceLibRoot, srcUrl);
-//		info.targetFile = new File(targetLibRoot, srcUrl);
-//
-//		if ( owner instanceof MethodElement)  {
-//			String backPath = ResourceHelper.getBackPath( (MethodElement)owner);
-//			info.targetUrl = backPath + srcUrl;
-//		}
-//		return info;	
-//	}
-//	
-//	/**
-//	 * the resource path will be relative to the owner element. 
-//	 * urls will not be changed but resource files is relicated.
-//	 * @param owner owner the owner object in the target library
-//	 * @param srcUrl
-//	 * @return
-//	 */
-//	private UrlInfo loadUrlInfoWithRelativePath(Object owner, String srcUrl) {
-//		UrlInfo info = new UrlInfo();
-//		info.sourceUrl = srcUrl;
-//		info.targetUrl = info.sourceUrl; // no url change
-//		info.sourceFile = new File(sourceLibRoot, srcUrl);
-//		
-//		if ( owner instanceof MethodElement)  {
-//			//String elementPath = ResourceHelper.getElementResourcePath(owner);
-//			String elementPath = ResourceHelper.getElementResourcePath((MethodElement)owner);
-//			info.targetFile = new File(new File(targetLibRoot, elementPath), srcUrl);			
-//		}
-//
-//		return info;
-//	}
-	
-}
diff --git a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/ImportXMLService.java b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/ImportXMLService.java
deleted file mode 100755
index 1ebb1ee..0000000
--- a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/ImportXMLService.java
+++ /dev/null
@@ -1,685 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.xml.services;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.sdo.EDataObject;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.common.serviceability.VersionUtil;
-import org.eclipse.epf.dataexchange.util.ContentProcessor;
-import org.eclipse.epf.dataexchange.util.IResourceHandler;
-import org.eclipse.epf.export.services.DiagramHandler;
-import org.eclipse.epf.export.xml.services.FeatureManager;
-import org.eclipse.epf.export.xml.services.XMLLibrary;
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.importing.services.ConfigurationImportService;
-import org.eclipse.epf.importing.services.FileModifyChecker;
-import org.eclipse.epf.importing.services.LibraryImportManager;
-import org.eclipse.epf.importing.wizards.PluginModifyInfo;
-import org.eclipse.epf.importing.wizards.SelectImportConfigurationSource;
-import org.eclipse.epf.importing.xml.ImportXMLPlugin;
-import org.eclipse.epf.importing.xml.ImportXMLResources;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.xml.uma.Activity;
-import org.eclipse.epf.xml.uma.CapabilityPattern;
-import org.eclipse.epf.xml.uma.ContentCategory;
-import org.eclipse.epf.xml.uma.ContentCategoryPackage;
-import org.eclipse.epf.xml.uma.ContentPackage;
-import org.eclipse.epf.xml.uma.DeliveryProcess;
-import org.eclipse.epf.xml.uma.Discipline;
-import org.eclipse.epf.xml.uma.Domain;
-import org.eclipse.epf.xml.uma.Guidance;
-import org.eclipse.epf.xml.uma.MethodElement;
-import org.eclipse.epf.xml.uma.MethodLibrary;
-import org.eclipse.epf.xml.uma.MethodPackage;
-import org.eclipse.epf.xml.uma.MethodPlugin;
-import org.eclipse.epf.xml.uma.ProcessComponent;
-import org.eclipse.epf.xml.uma.ProcessPackage;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.WorkOrder;
-import org.eclipse.epf.xml.uma.WorkOrderType;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Xml import service class to process the importing task
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ImportXMLService {
-
-	private boolean error = false;
-	
-	private Map renameElementMap = new HashMap();
-	
-	private boolean overwrite = false;
-	
-	private IStatus fileCheckedOutStatus = null;
-	
-	private String xmlPath;
-
-	private XMLLibrary xmlLib;
-
-	private UmaLibrary umaLib;
-
-	private ImportXMLogger logger = new ImportXMLogger();
-
-	private List discardedElements = new ArrayList();
-
-	private DiagramHandler diagramHandler;
-	
-	// map xml WorkOrder to uma WorkOrder
-	Map workOrderMap = new HashMap();
-
-	/**
-	 * The constructor
-	 */
-	public ImportXMLService() {
-
-	}
-
-	/**
-	 * Loads the xml file.
-	 * @param xmlPath
-	 * @return true if succeeds.
-	 */
-	public boolean loadXml(final String xmlPath) {
-		String versionError = versionCheck(xmlPath,	ImportXMLResources.importXMLWizard_title);		
-		if (versionError != null) {
-			return false;
-		}
-				
-		this.xmlPath = xmlPath;
-
-		logger.logMessage("Loading xml library ..."); //$NON-NLS-1$
-		this.xmlLib = new XMLLibrary(null, logger, xmlPath);
-		this.xmlLib.load();
-		
-		return checkOldPlugins();
-	}
-	
-	private boolean checkOldPlugins() {
-		List plugins = ((MethodLibrary) xmlLib.getRoot()).getMethodPlugin();
-		List guids = new ArrayList();
-		for (int i=0; i<plugins.size(); i++) {
-			MethodElement elem = (MethodElement) plugins.get(i);
-			guids.add(elem.getId());
-		}				
-		
-		final PluginModifyInfo modifyInfo = SelectImportConfigurationSource
-										.checkModify(guids, MsgBox.getDefaultShell(), false);		
-
-		// allow user to proceed with locked plugins
-		if ( modifyInfo.lockedPlugins.size() > 0 ) {
-			final boolean ret[] = new boolean[1];
-			SafeUpdateController.syncExec(new Runnable() {
-				public void run() {
-					String WIZARD_TITLE = ImportXMLResources.importXMLWizard_title; 
-					String message = modifyInfo.getLockedMessage().toString() +
-						ImportResources.ImportPluginWizard_confirm_continue; 
-					ret[0] = ImportXMLPlugin
-							.getDefault().getMsgDialog().displayConfirmation(WIZARD_TITLE, message);
-				}
-			});		
-			return ret[0];
-		} 			
-		return true;
-	}
-	
-	/**
-	 * @return the log file.
-	 */
-	public File getLogPath() {
-		return logger.getLogPath();
-	}
-
-	/**
-	 * Dispose
-	 */
-	public void dispose() {
-
-		discardedElements.clear();
-		workOrderMap.clear();
-		logger.dispose();
-	}
-
-	/**
-	 * Does XML export.
-	 * @param monitor
-	 * @throws Exception
-	 */
-	public void doImport(IProgressMonitor monitor) throws Exception {
-		boolean refresh = RefreshJob.getInstance().isEnabled();
-		try {
-			if (refresh) {
-				// disable resource refreshing during import
-				//
-				RefreshJob.getInstance().setEnabled(false);
-			}
-			
-			handleTypeChanges();
-			
-			IResourceHandler handler = new ImportResourceHandler(new File(
-					xmlPath).getParentFile(), new File(LibraryService
-					.getInstance().getCurrentMethodLibraryPath()));
-
-			ContentProcessor contentProc = new ContentProcessor(handler,
-					this.logger);
-			
-			diagramHandler = new DiagramHandler(new File(
-					xmlPath).getParentFile(), new File(LibraryService
-							.getInstance().getCurrentMethodLibraryPath()));
-
-			this.xmlLib.fixLibraryForImport();
-
-			// make sure all the dependent plugins are there
-			List referencedPlugins = xmlLib.getReferencedPlugins();
-			if (referencedPlugins.size() > 0) {
-				org.eclipse.epf.uma.MethodLibrary library = org.eclipse.epf.library.LibraryService
-						.getInstance().getCurrentMethodLibrary();
-				if (library != null) {
-					List plugins = library.getMethodPlugins();
-					for (Iterator it = plugins.iterator(); it.hasNext();) {
-						String id = ((org.eclipse.epf.uma.MethodPlugin) it
-								.next()).getGuid();
-						referencedPlugins.remove(id);
-					}
-				}
-			}
-
-			if (referencedPlugins.size() > 0) {
-				for (Iterator it = referencedPlugins.iterator(); it.hasNext();) {
-					String id = (String) it.next();
-					logger.logError(NLS.bind(ImportXMLResources.importXMLService_missing_plugin, id),
-							null);
-				}
-
-				throw new Exception(
-						ImportXMLResources.importXMLService_error_missing_plugins);
-			}
-
-			this.umaLib = new UmaLibrary(contentProc, logger, overwrite);
-
-			EDataObject xmlRoot = this.xmlLib.getRoot();
-			EDataObject umaRoot = this.umaLib.getRoot();
-			
-			logger.logMessage("create target library elements ..."); //$NON-NLS-1$
-			creatEDataObjectTree(xmlRoot, umaRoot);
-
-			logger
-					.logMessage("copying all feature values for target library elements ..."); //$NON-NLS-1$
-			iteratEDataObject((MethodElement) xmlRoot);
-
-			logger.logMessage("fix the target library ..."); //$NON-NLS-1$
-			umaLib.fixLibrary();
-
-			LibraryImportManager.handleNameReplace(renameElementMap);
-			
-			diagramHandler.postRegisterElements();
-			
-			// delete the un-needed elements
-			logger.logMessage("delete unneeded elements ..."); //$NON-NLS-1$
-			umaLib.deleteElements();
-			
-			final List modifiedFiles = FileModifyChecker.getModifiedFiles(LibraryService.getInstance().
-										getCurrentMethodLibrary().eResource().getResourceSet());
-			modifiedFiles.addAll(diagramHandler.getModifiedFiles());
-			final IStatus fileCheckedOutStatus = FileModifyChecker.syncExecCheckModify(modifiedFiles);
-			
-			if (fileCheckedOutStatus.isOK()) {
-			
-				logger.logMessage("saving target library ..."); //$NON-NLS-1$
-	
-				List configs = LibraryService.getInstance()
-				.getCurrentMethodLibrary().getPredefinedConfigurations();
-				int configSz = configs == null ? 0 : configs.size();
-				for (int i=0; i<configSz; i++) {
-					org.eclipse.epf.uma.MethodConfiguration config = 
-						(org.eclipse.epf.uma.MethodConfiguration ) configs.get(i);
-					LibraryUtil.validateMethodConfiguration(config);
-				}
-				
-				// don't refresh the workspace
-				LibraryUtil.saveLibrary(LibraryService.getInstance()
-						.getCurrentMethodLibrary(), false, false);
-				diagramHandler.execute();				
-	
-				logger.logMessage("re-open target library ..."); //$NON-NLS-1$
-				LibraryService.getInstance().reopenCurrentMethodLibrary();
-	
-				logger.logMessage("import completed successfully ..."); //$NON-NLS-1$
-			} else {
-				SafeUpdateController.syncExec(new Runnable() {
-					public void run() {
-						String title = ImportXMLResources.importXMLWizard_title; 
-						String msg = ImportXMLResources.importXMLService_import_failed; 
-						new MsgDialog(ImportXMLPlugin.getDefault())
-							.displayError(title, msg, fileCheckedOutStatus);
-						}
-				});
-			}	
-						
-			//ResourceUtil.refreshResources(LibraryService.getInstance()
-			//		.getCurrentMethodLibrary(), monitor);
-
-		} catch (Exception e) {
-			logger.logError(NLS.bind(ImportXMLResources.importXMLService_import_failed, e.getMessage()), e);
-
-			throw e;
-
-		} finally {
-			if (refresh) {
-				// re-enable resource refreshing
-				//
-				RefreshJob.getInstance().setEnabled(true);
-			}
-		}
-	}
-
-	private void creatEDataObjectTree(EDataObject xmlObj, EDataObject umaObj) {
-
-		for (Iterator it = xmlObj.eContents().iterator(); it.hasNext();) {
-			EDataObject child = (EDataObject) it.next();
-			createRmcObject(child, umaObj);
-		}
-	}
-
-	private void createRmcObject(EDataObject xmlElement,
-			EDataObject targetContainer) {
-
-		// get the targetContainer's containing feature
-		EStructuralFeature feature = xmlElement.eContainmentFeature();
-		createRmcObject(xmlElement, targetContainer, feature.getName());
-	}
-
-	private void createRmcObject(EDataObject xmlElement,
-			EDataObject targetContainer, String containmentXmlFeature) {
-
-		try {
-			if (xmlElement == null) {
-				return;
-			}
-
-			EDataObject umaElement = null;
-
-			// don't create content category package since in uma, it's
-			// seperated based on type
-			if (xmlElement instanceof MethodPlugin) {
-				MethodPlugin plugin = (MethodPlugin) xmlElement;
-				umaElement = umaLib.createMethodPlugin(plugin.getId(), plugin
-						.getName());
-			} else if (xmlElement instanceof ContentCategoryPackage) {
-				// don't create, do nothing
-				// mark as discarded so we don't need to copy it's attributes
-				setDiscarded(((ContentCategoryPackage) xmlElement).getId());
-
-			} else if ((xmlElement instanceof ContentCategory)
-					&& !(xmlElement.eContainer() instanceof Domain 
-							|| xmlElement.eContainer() instanceof Discipline)
-					|| (xmlElement.eContainer() instanceof ContentCategoryPackage)) {
-				// create the content categories for root content categories,
-				// not for sub-domain and sub-discipline
-				// 154143 - import xml did not reserve the sub-discipline structure
-				String pluginId = getPlugin(xmlElement).getId();
-				umaElement = umaLib.createContentCategory(pluginId, xmlElement
-						.eClass().getName(), xmlElement.getType().getName(),
-						xmlLib.getElementId(xmlElement));
-			} else {
-
-				// if this is root level package, find the corresponding
-				// container for the UMA object
-				if (xmlElement instanceof MethodPackage
-						&& xmlElement.eContainer() instanceof MethodPlugin) {
-					if (xmlElement instanceof ContentPackage) {
-						targetContainer = umaLib
-								.getContentRootPackage(targetContainer);
-					} else if (xmlElement instanceof ProcessComponent) {
-						Object proc = ((ProcessComponent) xmlElement)
-								.getProcess();
-						if (proc instanceof CapabilityPattern) {
-							targetContainer = umaLib
-									.getCapabilityPatternRootPackage(targetContainer);
-						} else if (proc instanceof DeliveryProcess) {
-							targetContainer = umaLib
-									.getDeliveryProcessRootPackage(targetContainer);
-						}
-					} else if (xmlElement instanceof ProcessPackage) {
-						List procs = xmlLib
-								.getAllProcesses((MethodPackage) xmlElement);
-						if (procs != null && procs.size() > 0) {
-							Object proc = procs.get(0);
-							if (proc instanceof CapabilityPattern) {
-								targetContainer = umaLib
-										.getCapabilityPatternRootPackage(targetContainer);
-							} else if (proc instanceof DeliveryProcess) {
-								targetContainer = umaLib
-										.getDeliveryProcessRootPackage(targetContainer);
-							}
-						}
-					}
-				}
-				// get the containment feature so we can create the object of
-				// the same type
-				umaElement = umaLib.createElement(targetContainer,
-						containmentXmlFeature, xmlElement.eClass().getName(),
-						xmlElement.getType().getName(), xmlLib
-								.getElementId(xmlElement));
-
-				// xml WorkOrder does not have an id, need to map the uma Object
-				if (xmlElement instanceof WorkOrder) {
-					workOrderMap.put(xmlElement, umaElement);
-				}
-			}
-
-			// recursive,
-			// note, uma element might be null since we can't determine the
-			// owner of the element yet
-			creatEDataObjectTree(xmlElement, umaElement);
-
-		} catch (Exception e) {
-			// log the error and continue???
-			e.printStackTrace();
-		}
-	}
-
-	private MethodPlugin getPlugin(EObject element) {
-		while ((element != null) && !(element instanceof MethodPlugin)) {
-			element = element.eContainer();
-		}
-
-		return (MethodPlugin) element;
-	}
-
-	private EDataObject getRmcObject(MethodElement xmlObj) {
-		if (xmlObj instanceof MethodLibrary) {
-			return umaLib.getRoot();
-		} else {
-			String id = xmlObj.getId();
-			return this.umaLib.getElement(id);
-		}
-	}
-
-	private void iteratEDataObject(MethodElement srcObj) {
-		iteratEDataObject_(srcObj);
-		EDataObject targetObj = getRmcObject(srcObj);
-		if (targetObj instanceof org.eclipse.epf.uma.MethodElement) {
-			diagramHandler.registerElement((org.eclipse.epf.uma.MethodElement) targetObj); 
-		}
-	}
-	
-	private void iteratEDataObject_(MethodElement srcObj) {
-
-		logger
-				.logMessage(" === processing element " + srcObj.getType().getName() + ": " + srcObj.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-
-		if (isProcessed(srcObj.getId())) {
-			return;
-		}
-		setProcessed(srcObj.getId());
-
-		// if object is not created, it's xml wrapper package
-		if (srcObj instanceof ContentCategoryPackage) {
-
-			// iterate the child packages
-			for (Iterator it = ((ContentCategoryPackage) srcObj)
-					.getContentCategory().iterator(); it.hasNext();) {
-				iteratEDataObject((MethodElement) it.next());
-			}
-			return;
-		}
-
-		EDataObject targetObj = getRmcObject(srcObj);
-		EClass eClass = srcObj.eClass();
-
-		EList features = eClass.getEAllStructuralFeatures();
-		boolean isNewElement = umaLib.isNewElement(srcObj.getId()) || srcObj instanceof MethodLibrary;
-		boolean isOldPlugin = !isNewElement && (srcObj instanceof MethodPlugin);
-		
-		for (Iterator it = features.iterator(); it.hasNext();) {
-			EStructuralFeature feature = (EStructuralFeature) it.next();
-						
-			if (FeatureManager.INSTANCE.isUnneededXmlFeature(feature.getName())) {
-				continue;
-			}
-			if (isOldPlugin && UmaPackage.eINSTANCE.getMethodPlugin_UserChangeable() == feature) {
-				continue;
-			}
-
-			Object value = srcObj.eGet(feature);
-			if (value == null) {
-				continue;
-			}
-
-			try {
-				if (value instanceof List) {
-					for (Iterator itv = ((List) value).iterator(); itv
-							.hasNext();) {
-						Object src_value = itv.next();
-
-						if (src_value instanceof String) {
-
-							// it's an id reference
-							umaLib.setReferenceValue(targetObj, feature
-									.getName(), (String) src_value);
-						} else if (src_value instanceof MethodElement) {
-							// set the reference
-							MethodElement e = (MethodElement) src_value;
-							String guid = e.getId();
-
-							// don't set the containment feature value since
-							// it's already handled
-							// when creating the library structure
-							if (!isDiscarded(guid) && e.eContainer() != srcObj) {
-								umaLib.setReferenceValue(targetObj, feature
-										.getName(), guid);
-							}
-
-							iteratEDataObject((MethodElement) src_value);
-						} else if (src_value instanceof WorkOrder) {
-							// WorkOrder is not method element and does not have
-							// an id, need special handling
-							// set the prede
-							WorkOrder wr = (WorkOrder) src_value;
-							Object umaWr = workOrderMap.get(wr);
-							umaLib.setWorkOrder(umaWr, wr.getValue());
-						} else {
-							logger
-									.logMessage(NLS.bind(ImportXMLResources.importXMLService_element_not_handled, src_value));
-						}
-					}
-				} else if (feature instanceof EReference) {
-
-					// get the xml object and iterate again
-					Object src_value = value;
-
-					if (src_value instanceof WorkOrder) {
-						logger.logMessage("workorder value"); //$NON-NLS-1$
-					} else if (src_value instanceof String
-							&& !isDiscarded((String) src_value)) {
-						// it's an id reference
-						umaLib.setReferenceValue(targetObj, feature.getName(),
-								(String) src_value);
-					} else if (src_value instanceof MethodElement) {
-						// set the reference
-						String guid = ((MethodElement) src_value).getId();
-						if (guid == null) {
-							logger
-									.logWarning(NLS.bind(ImportXMLResources.importXMLService_element_without_id, ((MethodElement) src_value)
-									.getName()));
-						}
-						if (!isDiscarded(guid)) {
-							umaLib.setReferenceValue(targetObj, feature
-									.getName(), guid);
-						}
-						iteratEDataObject((MethodElement) src_value);
-					} else {
-						logger
-								.logWarning(NLS.bind(ImportXMLResources.importXMLService_element_not_handled, src_value));
-					}
-
-				} else {
-					if (targetObj instanceof ContentCategoryPackage) {
-						logger.logMessage("hrre"); //$NON-NLS-1$
-					}
-
-					if (value instanceof WorkOrderType) {
-						value = ((WorkOrderType) value).getName();
-					}
-					
-					boolean rename = false;
-					if (!isNewElement && feature == org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getNamedElement_Name()) {
-						String oldName = (String)targetObj.eGet(org.eclipse.epf.uma.UmaPackage.eINSTANCE.getNamedElement_Name());
-						String newName = (String)srcObj.eGet(feature);				
-						if (!newName.equals(oldName)) {
-							LibraryImportManager.ensureUniqueNameForExistingElement
-								((org.eclipse.epf.uma.MethodElement) targetObj, oldName, newName, renameElementMap);
-							rename = true;
-						}
-					}
-					if (!rename) {
-						umaLib.setAtributeFeatureValue(targetObj,
-								feature.getName(), value);
-					}
-					if (isNewElement && feature == org.eclipse.epf.xml.uma.UmaPackage.eINSTANCE.getNamedElement_Name()) {
-						org.eclipse.epf.uma.MethodElement elem = (org.eclipse.epf.uma.MethodElement) targetObj;
-						EObject ceobj = elem.eContainer();						
-						if (ceobj instanceof org.eclipse.epf.uma.MethodElement && 
-								! umaLib.isNewElement(((org.eclipse.epf.uma.MethodElement) ceobj).getGuid())) {
-							LibraryImportManager.ensureUniqueName(ceobj, elem, renameElementMap);
-						}
-					}
-
-				}
-			} catch (Exception e) {
-				// log the error and continue???
-				e.printStackTrace();
-			}
-
-		}
-
-	}
-
-	// goid of processed element
-	private List processedElements = new ArrayList();
-
-	private boolean isProcessed(String guid) {
-		return processedElements.contains(guid);
-	}
-
-	private void setProcessed(String guid) {
-		if (!processedElements.contains(guid)) {
-			processedElements.add(guid);
-		}
-	}
-
-	private boolean isDiscarded(String id) {
-		return discardedElements.contains(id);
-	}
-
-	private void setDiscarded(String id) {
-		discardedElements.add(id);
-	}
-	
-	/**
-	 * Sets overwrite attribute.
-	 * @param b
-	 */
-	public void setOverwrite(boolean b) {
-		overwrite = b;
-	}	
-	
-	private static String versionCheck(final String xmlPath, final String title) {
-		final String[] ret = new String[1];
-		ret[0] = null;
-		SafeUpdateController.syncExec(new Runnable() {	
-			public void run() {				
-				VersionUtil.VersionCheckInfo info = VersionUtil.checkXMLVersion(new File(xmlPath));
-				if (info == null) {
-					ret[0] = NLS.bind(ImportXMLResources.versionMismatch_oldData_unknown, new Object[] {
-							Platform.getProduct().getName()});					
-				} else {
-					if (info.result < 0) {
-						if (info.toolID.equals(VersionUtil.getPrimaryToolID())) {
-							ret[0] = NLS.bind(ImportXMLResources.versionMismatch_oldData, new Object[] {
-									info.toolVersion, Platform.getProduct().getName()});
-						} else {
-							ret[0] = NLS.bind(ImportXMLResources.versionMismatch_oldData_unknown, new Object[] {
-									Platform.getProduct().getName()});					
-						}
-					} else if (info.result > 0) {
-						if (info.toolID.equals(VersionUtil.getPrimaryToolID())) {
-							ret[0] = NLS.bind(ImportXMLResources.versionMismatch_oldTool, new Object[] {
-								info.toolVersion, Platform.getProduct().getName()});
-						} else {
-							ret[0] = NLS.bind(ImportXMLResources.versionMismatch_oldTool_unknown, new Object[] {
-									Platform.getProduct().getName()});
-						}
-					} 
-				}
-				if (ret[0] != null) {
-					ImportXMLPlugin.getDefault().getMsgDialog().displayError(title, ret[0]);					
-				}
-			}
-		});		
-		return ret[0];
-	}
-	
-	 public void handleTypeChanges() {
-		org.eclipse.epf.uma.MethodLibrary baseLib = LibraryService.getInstance()
-												.getCurrentMethodLibrary();
-		HashMap baseMap = new HashMap();
-		ConfigurationImportService.collectPotentialTypeChanged(baseLib, baseMap);
-		
-		HashMap eClassObjMap = new HashMap();
-		HashMap importMap = new HashMap();
-		for (Iterator it = xmlLib.getRoot().eAllContents(); it.hasNext();) {
-			Object obj = it.next();
-			if (obj instanceof Guidance ||
-				obj instanceof Activity) {
-				MethodElement xmlElement = (MethodElement) obj;
-				String eClassName = xmlElement.eClass().getName();
-				Object eClassObj = eClassObjMap.get(eClassName);
-				if (eClassObj == null) {
-					EClass objEClass = FeatureManager.INSTANCE.getRmcEClass(eClassName);
-					if (objEClass != null) {
-						eClassObj = UmaFactory.eINSTANCE.create(objEClass);
-						eClassObjMap.put(eClassName, eClassObj);	
-					}
-				}
-				if (eClassObj != null) {
-					importMap.put(xmlElement.getId(), eClassObj);
-				}
-			}
-		}
-		
-		ConfigurationImportService.handleTypeChanges(baseMap, importMap);	
-	}
-	
-}
diff --git a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/ImportXMLogger.java b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/ImportXMLogger.java
deleted file mode 100755
index cece2c1..0000000
--- a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/ImportXMLogger.java
+++ /dev/null
@@ -1,36 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.xml.services;
-
-import java.io.File;
-
-import org.eclipse.epf.dataexchange.util.FileLogger;
-import org.eclipse.epf.library.LibraryService;
-
-/**
- * Logger class for xml import
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ImportXMLogger extends FileLogger {
-
-	public static final String LOGS_FOLDER = "logs/import/xml"; //$NON-NLS-1$
-
-	/**
-	 * The constructor
-	 */
-	public ImportXMLogger() {
-		super(new File(LibraryService.getInstance()
-				.getCurrentMethodLibraryPath(), LOGS_FOLDER));
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/UmaLibrary.java b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/UmaLibrary.java
deleted file mode 100755
index fea08f6..0000000
--- a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/UmaLibrary.java
+++ /dev/null
@@ -1,954 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.xml.services;
-
-import java.io.File;
-import java.text.ParsePosition;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.sdo.EDataObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.dataexchange.importing.LibraryService;
-import org.eclipse.epf.dataexchange.util.ContentProcessor;
-import org.eclipse.epf.dataexchange.util.ILogger;
-import org.eclipse.epf.export.xml.services.FeatureManager;
-import org.eclipse.epf.importing.xml.ImportXMLPlugin;
-import org.eclipse.epf.importing.xml.ImportXMLResources;
-import org.eclipse.epf.library.edit.util.ModelStructure;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.services.IFileManager;
-import org.eclipse.epf.services.Services;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.Section;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkOrderType;
-import org.eclipse.epf.uma.WorkProductType;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.osgi.util.NLS;
-
-import com.ibm.icu.text.SimpleDateFormat;
-
-/**
- * UmaLibrary represents a method library and provide methods to create elements
- * and set attributes and feature values
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class UmaLibrary {
-
-	private boolean debug = ImportXMLPlugin.getDefault().isDebugging();
-
-	private boolean overwrite = false;	
-	
-	private ILogger logger;
-
-	private ContentProcessor contentProc = null;
-	
-	private Map newElementsMap = new HashMap();
-
-	// map of created elements, guid - EDataObject
-	Map elementsMap = new HashMap();
-
-	// keep the source element ids so we can determine the elements that are not in the xml source library
-	// this is needed for deleting un-needed elements
-	// 154149 - allow package level merging for xml import
-	HashSet sourceElementIDs = new HashSet();
-	
-	/**
-	 * The constructor.
-	 * @param contentProc
-	 * @param logger
-	 * @param overwrite
-	 */
-	public UmaLibrary(ContentProcessor contentProc, ILogger logger, boolean overwrite) {
-		this.logger = logger;
-		this.contentProc = contentProc;
-		this.overwrite = overwrite;
-
-		buildElementsMap();
-	}
-
-	/**
-	 * @return the current library as the root object.
-	 */
-	public MethodLibrary getRoot() {
-		return org.eclipse.epf.library.LibraryService.getInstance()
-				.getCurrentMethodLibrary();
-	}
-
-	private void buildElementsMap() {
-		// build the elements map for easy operation
-
-		elementsMap.clear();
-		elementsMap.put(getRoot().getGuid(), getRoot());
-		TreeIterator it = getRoot().eAllContents();
-		while (it.hasNext()) {
-			Object e = it.next();
-			if (e instanceof MethodElement) {
-				elementsMap.put(((MethodElement) e).getGuid(), e);
-			}
-		}
-	}
-
-	/**
-	 * Creates a content catergory.
-	 * @param pluginId
-	 * @param xmlEClassName
-	 * @param xmlElementType
-	 * @param id
-	 * @return
-	 */
-	public EDataObject createContentCategory(String pluginId,
-			String xmlEClassName, String xmlElementType, String id) {
-
-		setSourceId(id);
-		
-		// make sure the same object created only once
-		EDataObject obj = getElement(id);
-		if (obj != null) {
-			return obj;
-		}
-
-		MethodPlugin plugin = (MethodPlugin) getElement(pluginId);
-
-		EClass objClass = FeatureManager.INSTANCE.getRmcEClass(xmlEClassName);
-		if (objClass == null) {
-			logger.logWarning(NLS.bind(ImportXMLResources.library_error_no_eclass, xmlEClassName));
-			return null;
-		}
-
-		obj = (EDataObject) EcoreUtil.create(objClass);
-		setElement(id, obj);
-
-		ContentPackage rootPkg = (ContentPackage) getRootPackage(plugin, obj);
-		rootPkg.getContentElements().add(obj);
-		return obj;
-	}
-
-	/**
-	 * Gets the root package
-	 * @param plugin
-	 * @param obj
-	 * @return
-	 */
-	public MethodPackage getRootPackage(MethodPlugin plugin, Object obj) {
-
-		String[] path = null;
-		if (obj instanceof CustomCategory) {
-			path = ModelStructure.DEFAULT.customCategoryPath;
-		} else if (obj instanceof Discipline
-				|| obj instanceof DisciplineGrouping) {
-			path = ModelStructure.DEFAULT.disciplineDefinitionPath;
-		} else if (obj instanceof Domain) {
-			path = ModelStructure.DEFAULT.domainPath;
-		} else if (obj instanceof RoleSet || obj instanceof RoleSetGrouping) {
-			path = ModelStructure.DEFAULT.roleSetPath;
-		} else if (obj instanceof Tool) {
-			path = ModelStructure.DEFAULT.toolPath;
-		} else if (obj instanceof WorkProductType) {
-			path = ModelStructure.DEFAULT.workProductTypePath;
-		}
-
-		if (path != null) {
-			return UmaUtil.findMethodPackage(plugin, path);
-		} else {
-			logger.logWarning(NLS.bind(ImportXMLResources.library_no_package, obj)); 
-		}
-
-		return null;
-	}
-
-	/**
-	 * Creates a method plugin.
-	 * @param id
-	 * @param name
-	 * @return
-	 * @throws Exception
-	 */
-	public EDataObject createMethodPlugin(String id, String name)
-			throws Exception {
-		
-		// make sure the same object created only once
-		EDataObject obj = getElement(id);
-		boolean isOld = obj != null;
-		if (obj == null) {
-			obj = LibraryService.INSTANCE.createPlugin(name, id);
-
-			setElement(id, obj);
-		}
-
-		// make sure the system packages are included
-		setSourceId(id);
-		List pkgs = TngUtil.getAllSystemPackages((MethodPlugin)obj);
-		for (Iterator it = pkgs.iterator(); it.hasNext(); ) {
-			MethodPackage pkg = (MethodPackage)it.next();
-			setSourceId(pkg.getGuid());
-			if (!isOld) {
-				newElementsMap.put(pkg.getGuid(), pkg);
-			}
-		}
-		
-		return obj;
-	}
-
-	/**
-	 * Gets content's root package.
-	 * @param plugin
-	 * @return
-	 */
-	public EDataObject getContentRootPackage(EDataObject plugin) {
-		if (!(plugin instanceof MethodPlugin)) {
-			return null;
-		}
-		return UmaUtil.findMethodPackage((MethodPlugin) plugin,
-				ModelStructure.DEFAULT.coreContentPath);
-	}
-
-	/**
-	 * Gets capability pattern' root package.
-	 * @param plugin
-	 * @return
-	 */
-	public EDataObject getCapabilityPatternRootPackage(EDataObject plugin) {
-		if (!(plugin instanceof MethodPlugin)) {
-			return null;
-		}
-		return UmaUtil.findMethodPackage((MethodPlugin) plugin,
-				ModelStructure.DEFAULT.capabilityPatternPath);
-	}
-
-	/**
-	 * Gets delivery process' root package.
-	 * @param plugin
-	 * @return
-	 */
-	public EDataObject getDeliveryProcessRootPackage(EDataObject plugin) {
-		if (!(plugin instanceof MethodPlugin)) {
-			return null;
-		}
-		return UmaUtil.findMethodPackage((MethodPlugin) plugin,
-				ModelStructure.DEFAULT.deliveryProcessPath);
-	}
-
-//	public EDataObject getProcessContributionRootPackage(EDataObject plugin) {
-//		if (!(plugin instanceof MethodPlugin)) {
-//			return null;
-//		}
-//		return UmaUtil.findMethodPackage((MethodPlugin) plugin,
-//				ModelStructure.DEFAULT.processContributionPath);
-//	}
-
-	/**
-	 * Creates an element.
-	 * @param container
-	 * @param xmlFeatureName
-	 * @param xmlEClassName
-	 * @param xmlElementType
-	 * @param id
-	 * @return
-	 */
-	public EDataObject createElement(EDataObject container,
-			String xmlFeatureName, String xmlEClassName, String xmlElementType,
-			String id) {
-
-		setSourceId(id);
-
-		// make sure the same object created only once
-		EDataObject obj = getElement(id);
-		if (obj != null) {
-			if (obj instanceof Activity) {
-				EObject eobj = obj.eContainer();
-				if (eobj instanceof ProcessPackage) {
-					ProcessPackage p = (ProcessPackage) eobj;
-					setSourceId(p.getGuid());
-				}
-			}
-			return obj;
-		}
-
-		// if ( obj instanceof MethodPlugin ) {
-		// return getElement(id);
-		// }
-
-		// // this is an easier way, test it,
-		// // does not work since feature.getEType() returns the base element
-		// type, not the extended one
-		// // for example, it returns MethodPackage instead of ProcessPackage or
-		// ContentPackage
-		// // so we need to make our own map
-		// EClassifier c = feature.getEType();
-
-		EClass objClass = FeatureManager.INSTANCE.getRmcEClass(xmlEClassName);
-		if (objClass == null) {
-			logger.logWarning(NLS.bind(ImportXMLResources.library_error_no_eclass, xmlEClassName)); 
-			return null;
-		}
-
-		obj = (EDataObject) EcoreUtil.create(objClass);	
-
-		if (obj instanceof WorkOrder) {
-			// WorkOrder is not a method element in xml uma, need to create it
-			// with a guid
-			//id = EcoreUtil.generateUUID();
-
-			// also need to add the element into the container of the owner
-			((ProcessPackage) container.eContainer()).getProcessElements().add(
-					obj);
-		}
-
-		setElement(id, obj);
-
-		try {
-			if (container instanceof MethodPlugin) {
-				MethodPlugin plugin = (MethodPlugin) container;
-				// need special handling for new plugin
-				if (obj instanceof ContentPackage) {
-					// content package and owner is Plugin, goto the root
-					// content package
-					MethodPackage pkg_core_content = UmaUtil.findMethodPackage(
-							plugin, ModelStructure.DEFAULT.coreContentPath);
-					pkg_core_content.getChildPackages().add(obj);
-				} else if (obj instanceof ProcessComponent) {
-					MethodPackage pkg_cp = UmaUtil.findMethodPackage(plugin,
-							ModelStructure.DEFAULT.capabilityPatternPath);
-					pkg_cp.getChildPackages().add(obj);
-
-				} else if (obj instanceof ProcessPackage) {
-					// this is a root process package
-					// put into the root delivery processes package
-					MethodPackage pkg_dp = UmaUtil.findMethodPackage(plugin,
-							ModelStructure.DEFAULT.deliveryProcessPath);
-					pkg_dp.getChildPackages().add(obj);
-				}
-			} else {
-
-				EStructuralFeature feature = FeatureManager.INSTANCE
-						.getRmcFeature(container.eClass(), xmlFeatureName);
-				if (feature == null) {
-					return null;
-				}
-
-				if ((container instanceof Activity)
-						&& feature == UmaPackage.eINSTANCE
-								.getActivity_BreakdownElements()
-						&& obj instanceof BreakdownElement) {
-
-					// the container needs to be a process package
-					EObject pkg = container;
-					while ((pkg != null) && !(pkg instanceof ProcessPackage)) {
-						pkg = pkg.eContainer();
-					}
-
-					// if the object is an activity, create a package for it and
-					// all it's breakdown elements
-					if ((obj instanceof Activity)) {
-						List childPkgs = ((ProcessPackage) pkg)
-								.getChildPackages();
-						ProcessPackage pp = null;
-						if (true || childPkgs.size() == 0) {	//158363: always create a package for act
-							pp = UmaFactory.eINSTANCE.createProcessPackage();
-							pp.setName(((MethodElement) container).getName());
-							setElement(EcoreUtil.generateUUID(), pp);
-							setSourceId(pp.getGuid());
-							childPkgs.add(pp);
-						} else {
-							pp = (ProcessPackage) childPkgs.get(0);
-						}
-
-						pkg = pp;
-					}
-
-					((ProcessPackage) pkg).getProcessElements().add(obj);
-				}
-
-				// note: all element references are string type (id)
-				// package references are object references
-				if (feature.isMany()) {
-					List values = (List) container.eGet(feature);
-					values.add(obj);
-				} else {
-					container.eSet(feature, obj);
-				}
-			}				
-		} catch (RuntimeException e) {
-			logger.logWarning(NLS.bind(ImportXMLResources.library_error_create_element, e.getMessage()));
-			// e.printStackTrace();
-		}
-
-		return obj;
-	}
-
-	private void setElement(String guid, EDataObject obj) {
-		// addElementToContainer(container, obj);
-				
-		if (!elementsMap.containsKey(guid)) {
-
-			if (obj instanceof MethodElement) {
-				((MethodElement) obj).setGuid(guid);
-			}
-
-			elementsMap.put(guid, obj);
-					
-			setDirty(obj);
-			newElementsMap.put(guid, obj);
-		}
-	}
-
-	private void setSourceId(String id) {
-		// 154149 - allow package level merging for xml import
-		if ( !sourceElementIDs.contains(id) ) {
-			sourceElementIDs.add(id);
-		}
-	}
-	
-	private void setDirty(EObject obj) {
-		// mark the resource as dirty
-		Resource res = obj.eResource();
-		if ( res != null && !res.isModified() ) {
-			res.setModified(true);
-		}
-	}
-	
-	/**
-	 * Gets element given the guid.
-	 * @param guid
-	 * @return
-	 */
-	public EDataObject getElement(String guid) {
-		return (EDataObject) elementsMap.get(guid);
-	}
-
-	private Date createDate(String dateStr) {
-		dateStr = dateStr.replace('T', ' ');
-		SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); //$NON-NLS-1$
-		return f.parse(dateStr, new ParsePosition(0));
-
-	}
-
-	private String getString(Object obj) {
-		String str = ""; //$NON-NLS-1$
-		if (obj instanceof MethodElement) {
-			str = LibraryUtil.getTypeName((MethodElement) obj);
-		} else if (obj != null) {
-			str = obj.toString();
-		}
-
-		return str;
-	}
-
-	/**
-	 * Sets attribute feature value.
-	 * @param obj
-	 * @param featureName
-	 * @param value
-	 * @throws Exception
-	 */
-	public void setAtributeFeatureValue(EDataObject obj, String featureName,
-			Object value) throws Exception {
-		if (obj == null || featureName == null || value == null) {
-			return;
-		}
-		
-		if (value instanceof List || value instanceof EDataObject) {
-			throw new Exception(NLS.bind(ImportXMLResources.library_error_set_attribute_2, value)); 
-		}
-
-		// find the feature and set the value
-		EStructuralFeature feature = FeatureManager.INSTANCE.getRmcFeature(obj
-				.eClass(), featureName);
-		if (feature == null) {
-			Object[] paras = new Object[] { getString(obj), featureName, value };
-			logger.logWarning(NLS.bind(ImportXMLResources.library_error_set_attribute, paras) + obj); 
-			return;
-		} 
-		
-		setDirty(obj);
-
-		// 158688 - Missing template files in exported xml library
-		// process the attachment url
-		if ( feature == UmaPackage.eINSTANCE.getGuidanceDescription_Attachments() ) {
-			if ( value != null ) {
-				value = contentProc.resolveAttachmentResources(obj, value.toString().trim());
-			}
-			obj.eSet(feature, value);
-		}
-		
-		else if (feature instanceof EReference && value instanceof String) {
-			// if the uma feature is a reference feature
-			// but the xml feature is an attribute
-			// the attribute value must be a guid
-			Object e = getElement((String) value);
-			if (e != null) {
-				if (feature.isMany()) {
-					((List) obj.eGet(feature)).add(e);
-				} else {
-					obj.eSet(feature, e);
-				}
-			} else {
-				Object[] paras = new Object[] { getString(obj),
-						feature.getName(), value };
-				String msg = NLS.bind(ImportXMLResources.library_error_set_attribute, paras); 
-				logger.logWarning(msg);
-			}
-		} else if (feature instanceof EAttribute) {
-			try {
-				if (feature.getName().equals("variabilityType")) { //$NON-NLS-1$
-					value = VariabilityType.get(value.toString());
-				} else if (feature.getName().equals("linkType")) { //$NON-NLS-1$
-					value = WorkOrderType.get(value.toString());
-				} else if (feature == UmaPackage.eINSTANCE
-						.getMethodUnit_ChangeDate()) {
-					// convert java.util.Date to xml Date
-					value = createDate(value.toString());
-				} else if (feature.getName().equals("nodeicon") //$NON-NLS-1$
-						|| feature.getName().equals("shapeicon")) { //$NON-NLS-1$
-					value = new java.net.URI(value.toString());
-
-					// need to copy the resource file to the target library
-					contentProc.copyResource(((java.net.URI) value).getPath());
-				} else if ((contentProc != null)
-						&& (obj instanceof MethodElement)
-						&& (value instanceof String)) {
-					value = contentProc.resolveResourceFiles(
-							(MethodElement) obj, (String) value);
-				}
-				obj.eSet(feature, value);
-			} catch (RuntimeException e) {
-				Object[] paras = new Object[] { getString(obj), featureName,
-						value };
-				logger.logError(NLS.bind(ImportXMLResources.library_error_set_attribute, paras), e); 
-				// e.printStackTrace();
-			}
-		} else {
-			Object[] paras = new Object[] { getString(obj), featureName, value };
-			logger.logWarning(NLS.bind(ImportXMLResources.library_error_set_attribute_3, paras)); 
-		}
-
-	}
-
-	/**
-	 * Sets reference value.
-	 * @param obj
-	 * @param featureName
-	 * @param id
-	 * @throws Exception
-	 */
-	public void setReferenceValue(EDataObject obj, String featureName, String id)
-			throws Exception {
-		if (obj == null || featureName == null || id == null) {
-			return;
-		}
-		
-		EObject value = getElement(id);
-		if (value == null) {
-			logger.logWarning(NLS.bind(ImportXMLResources.library_error_set_reference, featureName, id));
-
-			return;
-		}
-
-		// find the feature and set the value
-		EStructuralFeature feature = FeatureManager.INSTANCE.getRmcFeature(obj
-				.eClass(), featureName);
-		if (feature == null) {
-			Object[] paras = new Object[] { getString(obj), featureName, id };
-			logger.logWarning(NLS.bind(ImportXMLResources.library_error_set_reference_2, paras)); 
-			return;
-		}
-
-		// don't iterate the containment feature
-		if (value.eContainer() == obj) {
-			return;
-		}
-
-		// String str = feature.getEType().getName();
-		if (feature.isMany()) {
-			try {
-				List items = (List) obj.eGet(feature);
-				if (!items.contains(value)) {
-					items.add(value);
-				}
-			} catch (RuntimeException e) {
-				Object[] paras = new Object[] { getString(obj), featureName, id };
-				logger
-						.logError(
-								NLS.bind(ImportXMLResources.library_error_set_reference_2, paras), e); 
-			}
-		} else {
-			obj.eSet(feature, value);
-		}
-		
-		setDirty(obj);
-	}
-
-	/**
-	 * Sets work order.
-	 * @param umaWorkOrder
-	 * @param predId
-	 */
-	public void setWorkOrder(Object umaWorkOrder, String predId) {
-		if (umaWorkOrder instanceof WorkOrder) {
-			WorkBreakdownElement e = (WorkBreakdownElement) getElement(predId);
-			((WorkOrder) umaWorkOrder).setPred(e);
-			
-			setDirty((EObject)umaWorkOrder);
-
-		}
-	}
-
-	/**
-	 * Fixes library.
-	 */
-	public void fixLibrary() {
-		MethodLibrary rootObject = getRoot();
-		for (Iterator it = ((MethodLibrary) rootObject).getMethodPlugins()
-				.iterator(); it.hasNext();) {
-			fixPlugin((MethodPlugin) it.next());
-		}
-	}
-
-	private MethodPackage cpRoot = null;
-
-	private MethodPackage dpRoot = null;
-
-//	private MethodPackage pcRoot = null;
-
-	private void fixPlugin(MethodPlugin plugin) {
-
-		// fix the root custom categories
-		fixCustomCategories(plugin);
-
-		List cpPkgs = new ArrayList();
-		List dpPkgs = new ArrayList();
-//		List pcPkgs = new ArrayList();
-
-		cpRoot = UmaUtil.findMethodPackage(plugin,
-				ModelStructure.DEFAULT.capabilityPatternPath);
-		dpRoot = UmaUtil.findMethodPackage(plugin,
-				ModelStructure.DEFAULT.deliveryProcessPath);
-//		pcRoot = UmaUtil.findMethodPackage(plugin,
-//				ModelStructure.DEFAULT.processContributionPath);
-		getAllPackages(cpRoot, cpPkgs);
-		getAllPackages(dpRoot, dpPkgs);
-		
-//		if ( pcPkgs != null ) {
-//			getAllPackages(pcRoot, pcPkgs);
-//		}
-			
-		List procs = new ArrayList();
-		for (Iterator it = plugin.eAllContents(); it.hasNext();) {
-			EObject o = (EObject)it.next();
-			boolean oldNotify = o.eDeliver();
-			try	{
-				// turn off notifications to avoid possible deadlock or thread issue
-				// 154142 - import xml caused thread access error
-				o.eSetDeliver(false);
-				
-				if (o instanceof ProcessComponent) {
-					procs.add(o);
-				} else if (o instanceof DescribableElement) {
-					String pName = ((DescribableElement) o).getPresentationName();
-					if (pName == null || pName.length() == 0) {
-						((DescribableElement) o)
-								.setPresentationName(((DescribableElement) o)
-										.getName());
-					}
-				}
-	
-				// fix the name string
-				if (o instanceof MethodElement && !(o instanceof Section)) {
-					String name = ((MethodElement) o).getName();
-					String new_name = StrUtil.makeValidFileName(name);
-					if ( !new_name.equals(name) ) {
-						((MethodElement) o).setName(new_name);
-					}
-				}
-			} finally {
-				o.eSetDeliver(oldNotify);
-			}
-		}
-
-		if (procs.size() > 0) {
-			for (Iterator it = procs.iterator(); it.hasNext();) {
-				ProcessComponent pc = (ProcessComponent) it.next();
-				Object proc = pc.getProcess();
-				if (proc instanceof DeliveryProcess) {
-					if (!dpPkgs.contains(pc)) {
-						moveProcessComponent(pc, dpRoot);
-					}
-				} else if (proc instanceof CapabilityPattern) {
-					if (!cpPkgs.contains(pc)) {
-						moveProcessComponent(pc, cpRoot);
-					}
-				}
-			}
-		}
-	}
-
-	private void getAllPackages(MethodPackage pkg, List pkgs) {
-		pkgs.add(pkg);
-		for (Iterator it = pkg.getChildPackages().iterator(); it.hasNext();) {
-			getAllPackages((MethodPackage) it.next(), pkgs);
-		}
-	}
-
-	/**
-	 * move the process package to the specified container, if the package is
-	 * the only child of it's parent, move it's parent
-	 * 
-	 * @param pkg
-	 * @param container
-	 */
-	private void moveProcessComponent(ProcessPackage pkg,
-			MethodPackage container) {
-		// make sure Capability patterns are in the Capability packages
-		Object o = pkg.eContainer();
-		if ((o instanceof ProcessPackage)
-				&& (((ProcessPackage) o).getChildPackages().size() == 1)
-				&& o != cpRoot && o != dpRoot ) {
-			moveProcessComponent((ProcessPackage) o, container);
-		} else {
-			container.getChildPackages().add(pkg);
-		}
-	}
-
-	/**
-	 * find the root custom cagegory and put to the root package
-	 * 
-	 * @param plugin
-	 *            MethodPlugin
-	 */
-	private void fixCustomCategories(MethodPlugin plugin) {
-		ContentPackage pkg = UmaUtil.findContentPackage(plugin,
-				ModelStructure.DEFAULT.customCategoryPath);
-		List items = new ArrayList(pkg.getContentElements());
-
-		List rootItems = new ArrayList();
-		while (items.size() > 0) {
-			CustomCategory cc = (CustomCategory) items.remove(0);
-			rootItems.add(cc);
-			
-			// 158691Custom Category is different in exported library
-			// need to remove sub-categories recursively
-			fixCustomCategories(cc, items, rootItems);
-		}
-
-		TngUtil.getRootCustomCategory(plugin).getCategorizedElements().addAll(
-				rootItems);
-
-	}
-	
-	/**
-	 * find the root custom categories by removing the sub-categories recursively
-	 * 
-	 * @param cc
-	 * @param items
-	 * @param rootItems
-	 */
-	private void fixCustomCategories(CustomCategory cc, List items, List rootItems) {
-		for (Iterator it = cc.getSubCategories().iterator(); it.hasNext();) {
-			Object item = it.next();
-			items.remove(item);
-			rootItems.remove(item);
-			fixCustomCategories((CustomCategory)item, items, rootItems);
-		}
-		
-		// also iterate the contained elements
-		for (Iterator it = cc.getCategorizedElements().iterator(); it
-				.hasNext();) {
-			Object item = it.next();
-			if (item instanceof CustomCategory) {
-				items.remove(item);
-				rootItems.remove(item);
-				fixCustomCategories((CustomCategory)item, items, rootItems);
-			}
-		}
-	}
-	
-	/**
-	 * delete the un-needed elements are clear resources 
-	 */
-	public void deleteElements() {
-		
-		IFileManager fileMgr = Services.getFileManager();
-
-		List deletedElements = new ArrayList();
-		
-		for (Iterator it = elementsMap.entrySet().iterator(); it.hasNext(); ) {
-			Map.Entry entry = (Map.Entry)it.next();
-			String id = (String)entry.getKey();
-			MethodElement e = (MethodElement)entry.getValue();
-			if ( sourceElementIDs.contains(id) ) {
-				continue;
-			} else if (overwrite) {
-				boolean toDelete = !(e instanceof MethodLibrary || e instanceof MethodPlugin
-									|| e instanceof MethodConfiguration);
-				if (toDelete) {
-					MethodElement plugin = UmaUtil.getMethodPlugin(e);
-					toDelete = plugin != null && !isNewElement(plugin.getGuid())
-					&& sourceElementIDs.contains(plugin.getGuid());
-				}
-				if (toDelete) {
-					deletedElements.add(e);
-					handleActivityRemoval(e);
-					//EcoreUtil.remove(e);
-					continue;
-				}
-			}
-			
-			if ( (e instanceof CustomCategory) && TngUtil.isRootCustomCategory( (CustomCategory)e ) ) {
-				continue;
-			}
-			handleActivityRemoval(e);	
-			
-			// delete the element if the containg package is in the source library
-			// don't delete if the package is not in the xml library
-			MethodPackage pkg = TngUtil.getMethodPackage(e);
-			
-			if ( pkg != null ) { 
-				String pid = pkg.getGuid();
-				if ( sourceElementIDs.contains(pid) ) {
-					deletedElements.add(e);
-					
-					// delete the element from the library
-					//EcoreUtil.remove(e);				
-				}
-			}
-		}
-		
-		// delete the resources
-		deleteResoruces(deletedElements);
-	}
-
-	//	164581
-	private void handleActivityRemoval(MethodElement e) {
-		if (!(e instanceof Activity)) {
-			return;
-		}
-		Activity eact = (Activity) e;
-		Activity sact = eact.getSuperActivities();
-		if (sact != null) {
-			sact.getBreakdownElements().remove(eact);
-		}
-	}
-	
-	// clear resources for deleted elements
-	private void deleteResoruces(List deletedElements) {
-		if ( deletedElements.size() == 0 ) {
-			return;
-		}
-		
-		IFileManager fileMgr = Services.getFileManager();
-
-		for (Iterator it = deletedElements.iterator(); it.hasNext(); ) {
-			MethodElement e = (MethodElement)it.next();
-			
-			EObject obj = null;
-			if ( e instanceof DescribableElement ) {
-				obj = ((DescribableElement)e).getPresentation();
-			} else if ( e instanceof ContentDescription ||
-					overwrite && e instanceof ProcessComponent) {
-				obj = e;
-			}
-			if ( obj != null ) {
-				MethodElement plugin = UmaUtil.getMethodPlugin(e);
-				Resource pluginRes = plugin == null ? null : plugin.eResource();
-				
-				Resource res = obj.eResource();
-				if ( res != null && res != pluginRes) {		//Protected from bugs like 177042
-					String file = res.getURI().toFileString();
-					if ( debug ) {
-						System.out.println("deleting resource: " + file);
-					}
-					
-					if ( !fileMgr.delete(file) ) {
-						if ( debug ) {
-							System.out.println("unable to delete file: " + file);
-						}
-					}
-					
-					EObject resMgr = MultiFileSaveUtil.getResourceManager(res);
-					if (resMgr != null) {
-						EcoreUtil.remove(resMgr);
-					}
-					EObject resDes = MultiFileSaveUtil.getResourceDescriptor(res);
-					if (resDes != null) {
-						EcoreUtil.remove(resDes);
-					}
-					if (overwrite) {						
-						File folder = new File(file).getParentFile();
-						File files[] = folder.listFiles();
-						if (files == null || files.length == 0 ) {
-							if ( debug ) {
-								System.out.println("deleting folder resource: " + folder);
-							}
-							if ( !fileMgr.delete(folder.getAbsolutePath()) ) {
-								if ( debug ) {
-									System.out.println("unable to delete folder file: " + folder);
-								}
-							}
-						}
-					}
-				}								
-			}
-			
-			EcoreUtil.remove(e);
-		}
-	}
-	
-	/**
-	 * @param guid
-	 * @return true if the element given by guid is new.
-	 */
-	public boolean isNewElement(String guid) {
-		return newElementsMap.containsKey(guid);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/package.html b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/package.html
deleted file mode 100755
index 879b168..0000000
--- a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces and implementation for the Import XML service.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/wizards/ImportXMLWizard.java b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/wizards/ImportXMLWizard.java
deleted file mode 100755
index 77eab47..0000000
--- a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/wizards/ImportXMLWizard.java
+++ /dev/null
@@ -1,215 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.xml.wizards;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.epf.authoring.ui.actions.LibraryLockingOperationRunner;
-import org.eclipse.epf.authoring.ui.wizards.SaveAllEditorsPage;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.export.xml.ExportXMLPlugin;
-import org.eclipse.epf.importing.xml.ImportXMLPlugin;
-import org.eclipse.epf.importing.xml.ImportXMLResources;
-import org.eclipse.epf.importing.xml.preferences.ImportXMLPreferences;
-import org.eclipse.epf.importing.xml.services.ImportXMLService;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.ui.wizards.LibraryBackupUtil;
-import org.eclipse.epf.library.util.ResourceUtil;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-import org.eclipse.epf.services.IFileManager;
-import org.eclipse.epf.services.Services;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * The Import XML wizard.
- * <p>
- * This wizard is used to import method library content stored in a XML file.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class ImportXMLWizard extends Wizard implements IImportWizard {
-
-	ImportXMLService service = new ImportXMLService();
-
-	private boolean succeed = true;
-	
-	private SelectXMLFilePage filePage = null;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ImportXMLWizard() {
-		super();
-		setWindowTitle(ImportXMLResources.importXMLWizard_title);
-		setNeedsProgressMonitor(true);
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
-	 *      IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		// check out the library first
-		IFileManager fileMgr = Services.getFileManager();
-		fileMgr.checkModify(LibraryService.getInstance()
-				.getCurrentMethodLibrary().eResource().getURI().toFileString(),
-				MsgBox.getDefaultShell());
-
-		ILibraryManager manager = (ILibraryManager) LibraryService
-				.getInstance().getCurrentLibraryManager();
-		if (manager != null && manager.isMethodLibraryReadOnly()) {
-			File libraryFile = new File(LibraryService.getInstance()
-					.getCurrentMethodLibraryPath(),
-					MultiFileSaveUtil.DEFAULT_LIBRARY_MODEL_FILENAME);
-			ImportXMLPlugin.getDefault().getMsgDialog().displayError(
-					ImportXMLResources.importXMLWizard_title,
-					ImportXMLResources.importXMLError_msg,
-					NLS.bind(ImportXMLResources.importXMLError_reason,
-							libraryFile.getAbsolutePath()));
-			return;
-		}
-
-		SaveAllEditorsPage.addPageIfNeeded(this, true, null, null, ImportXMLPlugin
-				.getDefault().getImageDescriptor(
-						"full/wizban/ImportXML.gif")); //$NON-NLS-1$
-		
-		filePage = new SelectXMLFilePage();
-		addPage(filePage);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#createPageControls(Composite)
-	 */
-	public void createPageControls(Composite pageContainer) {
-		super.createPageControls(pageContainer);
-		pageContainer.getShell().setImage(
-				ExportXMLPlugin.getDefault().getSharedImage(
-						"full/obj16/XMLFile.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		boolean refresh = RefreshJob.getInstance().isEnabled();
-		if (refresh) {
-			//Needed: because LibraryLockingOperationRunner adds events to RefreshJob at the
-			//end of "run" call!
-			RefreshJob.getInstance().setEnabled(false);
-		}		
-		final boolean ret[] = new boolean[1];		
-		LibraryLockingOperationRunner runner = new LibraryLockingOperationRunner();
-		runner.run(new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				ret[0] = performFinish_();
-			}			
-		});
-		if (refresh) {		
-			RefreshJob.getInstance().setEnabled(true);
-		}
-		
-		
-		runner = new LibraryLockingOperationRunner();
-		runner.run(new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				String msg = NLS.bind(ImportXMLResources.review_log_files,
-						service.getLogPath());
-					MsgBox.prompt(msg, SWT.OK);
-			}			
-		});		
-		
-		ResourceUtil.refreshResources(LibraryService.getInstance()
-				.getCurrentMethodLibrary(), new NullProgressMonitor());
-		
-		return ret[0];
-	}
-	
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	private boolean performFinish_() {
-		LibraryBackupUtil.promptBackupLibrary(null, new File(LibraryService
-				.getInstance().getCurrentMethodLibraryPath()));
-
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException {
-				try {
-					monitor.beginTask(ImportXMLResources.importingXML_text,
-							IProgressMonitor.UNKNOWN);
-
-					String xmlFile = filePage.getPath();
-					boolean mergeOption = filePage.getMergeOption();
-					service.setOverwrite(!mergeOption);
-					succeed = service.loadXml(xmlFile);
-					if (! succeed) {
-						return;
-					}					
-					service.doImport(monitor);
-					ImportXMLPreferences.setXMLFile(xmlFile);
-					ImportXMLPreferences.setMergeOption(mergeOption);
-				} catch (Exception e) {
-					throw new InvocationTargetException(e);
-				} finally {
-					monitor.done();
-				}
-
-			}
-		};
-		try {
-			getContainer().run(true, false, op);
-		} catch (InterruptedException e) {
-			return false;
-		} catch (InvocationTargetException e) {
-			Throwable realException = e.getTargetException();
-			ImportXMLPlugin.getDefault().getMsgDialog().displayError(
-					ImportXMLResources.importXMLWizard_title,
-					realException.getMessage(), realException);
-			return false;
-		}
-
-		if (!succeed) {
-			return false;
-		}
-		//String msg = NLS.bind(ImportXMLResources.review_log_files,
-		//	service.getLogPath());
-		//MsgBox.prompt(msg, SWT.OK);
-
-		return true;
-	}
-
-	/**
-	 * Disposes of this wizard and frees all SWT resources.
-	 */
-	public void dispose() {
-		service.dispose();
-	}
-}
diff --git a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/wizards/SelectXMLFilePage.java b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/wizards/SelectXMLFilePage.java
deleted file mode 100755
index 080d749..0000000
--- a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/wizards/SelectXMLFilePage.java
+++ /dev/null
@@ -1,171 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.xml.wizards;
-
-import java.io.File;
-
-import org.eclipse.epf.importing.xml.ImportXMLPlugin;
-import org.eclipse.epf.importing.xml.ImportXMLResources;
-import org.eclipse.epf.importing.xml.preferences.ImportXMLPreferences;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A wizard page that prompts the user to select a XML file to import.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class SelectXMLFilePage extends BaseWizardPage {
-
-	public static final String PAGE_NAME = SelectXMLFilePage.class.getName();
-
-	private Text pathText;
-
-	private String path;
-
-	private boolean mergeOption = true;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SelectXMLFilePage() {
-		super(PAGE_NAME);
-		setTitle(ImportXMLResources.selectXMLFilePage_title);
-		setDescription(ImportXMLResources.selectXMLFilePage_desc);
-		setImageDescriptor(ImportXMLPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ImportXML.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(3, false));
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label fileLabel = new Label(composite, SWT.NONE);
-		fileLabel.setText(ImportXMLResources.fileLabel_text); //$NON-NLS-1$
-
-		pathText = new Text(composite, SWT.BORDER);
-		pathText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		pathText.setText(ImportXMLPreferences.getXMLFile());		
-		pathText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (isValidPath(pathText.getText().trim())) {
-					setPageComplete(true);
-					setErrorMessage(null);
-				} else {
-					setPageComplete(false);
-					setErrorMessage(ImportXMLResources.invalidXMLFile_error);
-				}
-			}
-		});
-
-		Button browseButton = new Button(composite, SWT.PUSH);
-		browseButton.setLayoutData(new GridData(GridData.END));
-		browseButton.setText(ImportXMLResources.browseButton_text);
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				FileDialog fd = new FileDialog(Display.getCurrent()
-						.getActiveShell(), SWT.OPEN);
-				fd.setFilterExtensions(new String[] { "*.xml", "*.*" }); //$NON-NLS-1$ //$NON-NLS-2$
-				String path = fd.open();
-				boolean ok = false;
-				if (path != null) {
-					pathText.setText(path);
-					ok = isValidPath(path);
-				}
-				setPageComplete(ok);
-			}
-		});
-
-		Group optionGroup = new Group(composite, SWT.NONE);
-		optionGroup.setLayout(new GridLayout(1, false));
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = 3;
-		optionGroup.setLayoutData(gridData);
-		optionGroup.setText(ImportXMLResources.optionGroup_text);
-
-		mergeOption = ImportXMLPreferences.getMergeOption();
-			
-		Button overwriteRadioButton = createRadioButton(optionGroup,
-				ImportXMLResources.overwriteRadioButton_text, 1, !mergeOption);
-		overwriteRadioButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				mergeOption = false;
-			}
-		});
-		
-		Button mergeRadioButton = createRadioButton(optionGroup,
-				ImportXMLResources.mergeRadioButton_text, 1, mergeOption);
-		mergeRadioButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				mergeOption = true;
-			}
-		});
-
-		setControl(composite);
-
-		setPageComplete(isValidPath(pathText.getText().trim()));
-	}
-
-	/**
-	 * Checks whether the user specific path is valid.
-	 * 
-	 * @param path
-	 *            the user specific path
-	 * @return <code>true</code> if the user specified path is valid.
-	 */
-	private boolean isValidPath(String path) {
-		File file = new File(path);
-		if (file.exists() && file.isFile()) {
-			this.path = path;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Gets the user specified XML file.
-	 * 
-	 * @return an absolute path to the XML file
-	 */
-	public String getPath() {
-		return path;
-	}
-
-	/**
-	 * Gets the user specified import option.
-	 * 
-	 * @return <code>true</code> if the user selected the merge option,
-	 *         <code>false</code> if the user selected the overwrite option
-	 */
-	public boolean getMergeOption() {
-		return mergeOption;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/wizards/package.html b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/wizards/package.html
deleted file mode 100755
index b8ee622..0000000
--- a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/wizards/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides wizards for importing method library content stored in XML.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import/.classpath b/plugins/org.eclipse.epf.import/.classpath
deleted file mode 100755
index 065ac06..0000000
--- a/plugins/org.eclipse.epf.import/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.import/.cvsignore b/plugins/org.eclipse.epf.import/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.import/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.import/.options b/plugins/org.eclipse.epf.import/.options
deleted file mode 100755
index b3ecd96..0000000
--- a/plugins/org.eclipse.epf.import/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-# Turn on debug trace for the Import plug-in
-org.eclipse.epf.import/debug=true
diff --git a/plugins/org.eclipse.epf.import/.project b/plugins/org.eclipse.epf.import/.project
deleted file mode 100755
index 1f44150..0000000
--- a/plugins/org.eclipse.epf.import/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.import</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/plugins/org.eclipse.epf.import/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.import/META-INF/MANIFEST.MF
deleted file mode 100755
index a5127b3..0000000
--- a/plugins/org.eclipse.epf.import/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.import; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.epf.importing.ImportPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.importing,
- org.eclipse.epf.importing.services,
- org.eclipse.epf.importing.wizards
-Require-Bundle: org.apache.ant,
- org.eclipse.core.runtime,
- org.eclipse.epf.authoring.ui,
- org.eclipse.epf.dataexchange,
- org.eclipse.epf.export,
- org.eclipse.epf.services,
- org.eclipse.epf.library.xmi
diff --git a/plugins/org.eclipse.epf.import/build.properties b/plugins/org.eclipse.epf.import/build.properties
deleted file mode 100755
index 6c780cd..0000000
--- a/plugins/org.eclipse.epf.import/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               .options,\
-               META-INF/,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml
diff --git a/plugins/org.eclipse.epf.import/icons/Authoring.gif b/plugins/org.eclipse.epf.import/icons/Authoring.gif
deleted file mode 100755
index 531baf2..0000000
--- a/plugins/org.eclipse.epf.import/icons/Authoring.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.import/icons/Importing.gif b/plugins/org.eclipse.epf.import/icons/Importing.gif
deleted file mode 100755
index a96394f..0000000
--- a/plugins/org.eclipse.epf.import/icons/Importing.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.import/icons/MethodPlugin.gif b/plugins/org.eclipse.epf.import/icons/MethodPlugin.gif
deleted file mode 100755
index bb82c39..0000000
--- a/plugins/org.eclipse.epf.import/icons/MethodPlugin.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.import/icons/configuration.gif b/plugins/org.eclipse.epf.import/icons/configuration.gif
deleted file mode 100755
index de89602..0000000
--- a/plugins/org.eclipse.epf.import/icons/configuration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.import/icons/full/wizban/ImportLibraryConfiguration.gif b/plugins/org.eclipse.epf.import/icons/full/wizban/ImportLibraryConfiguration.gif
deleted file mode 100755
index e249831..0000000
--- a/plugins/org.eclipse.epf.import/icons/full/wizban/ImportLibraryConfiguration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.import/icons/full/wizban/ImportMethodPlugins.gif b/plugins/org.eclipse.epf.import/icons/full/wizban/ImportMethodPlugins.gif
deleted file mode 100755
index e249831..0000000
--- a/plugins/org.eclipse.epf.import/icons/full/wizban/ImportMethodPlugins.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.import/plugin.properties b/plugins/org.eclipse.epf.import/plugin.properties
deleted file mode 100755
index 504eeec..0000000
--- a/plugins/org.eclipse.epf.import/plugin.properties
+++ /dev/null
@@ -1,30 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Import
-providerName=Eclipse.org
-
-# Import Wizard Category
-importCategoryName=Method
-
-# Import Library Configuration Wizard
-importLibraryConfigurationWizardName=Library Configuration
-importLibraryConfigurationWizardText=Import a library configuration.
-
-# Import Method Plug-ins Wizard
-importMethodPluginsWizardName=Method Plug-ins
-importMethodPluginsWizardText=Import one or more method plug-ins.
-
-
-
-               
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import/plugin.xml b/plugins/org.eclipse.epf.import/plugin.xml
deleted file mode 100755
index 0861ebc..0000000
--- a/plugins/org.eclipse.epf.import/plugin.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.importWizards">
-      <wizard
-            category="org.eclipse.epf.ui.importWizards.category"
-            class="org.eclipse.epf.importing.wizards.ImportConfigurationWizard"
-            icon="/icons/configuration.gif"
-            id="org.eclipse.epf.importing.wizards.ImportConfigurationWizard"
-            name="%importLibraryConfigurationWizardName">
-         <description> 
-               %importLibraryConfigurationWizardText
-         </description>
-      </wizard>
-      <wizard
-            category="org.eclipse.epf.ui.importWizards.category"
-            class="org.eclipse.epf.importing.wizards.ImportPluginWizard"
-            icon="/icons/MethodPlugin.gif"
-            id="org.eclipse.epf.importing.wizards.ImportPluginWizard"
-            name="%importMethodPluginsWizardName">
-         <description>
-               %importMethodPluginsWizardText
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.epf.ui.importWizards">
-      <wizard id="org.eclipse.epf.importing.wizards.ImportPluginWizard"/>
-   </extension>
-
-   <extension
-         point="org.eclipse.epf.ui.importWizards">
-      <wizard id="org.eclipse.epf.importing.wizards.ImportConfigurationWizard"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/ImportPlugin.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/ImportPlugin.java
deleted file mode 100755
index 39b2b53..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/ImportPlugin.java
+++ /dev/null
@@ -1,58 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing;
-
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * The Import plug-in class.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ImportPlugin extends AbstractPlugin {
-
-	// The shared plug-in instance.
-	private static ImportPlugin plugin;
-
-	/**
-	 * Default constructor.
-	 */
-	public ImportPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * @see AbstractPlugin#start(BundleContext context)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * @see AbstractPlugin#start(BundleContext context)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared plug-in instance.
-	 */
-	public static ImportPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/ImportResources.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/ImportResources.java
deleted file mode 100755
index 6a86fa9..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/ImportResources.java
+++ /dev/null
@@ -1,101 +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
- *******************************************************************************/
-package org.eclipse.epf.importing;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ImportResources extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.epf.importing.Resources";//$NON-NLS-1$
-
-	private ImportResources() {
-		// Do not instantiate
-	}
-
-	public static String ConfigurationImportService_MSG2;
-	public static String importConfigWizard_title;
-	public static String selectConfigDirWizardPage_title;
-	public static String selectConfigDirWizardPage_text;
-	public static String reviewChangesWizardPage_title;
-	public static String reviewChangesWizardPage_text;
-	public static String selectConfigSpecsWizardPage_title;
-	public static String selectConfigSpecsWizardPage_text;
-	public static String importPluginsWizard_title;
-	public static String selectPluginsDirWizardPage_title;
-	public static String selectPluginsDirWizardPage_text;
-	public static String selectPluginsWizardPage_title;
-	public static String selectPluginsWizardPage_text;
-	public static String importPluginsWizard_ERR_Import_plugin;
-	public static String ConfigurationImportService_MSG0;
-	public static String ConfigurationImportService_MSG1;
-	public static String ConfigurationImportService_MSG3;
-	public static String ImportConfigurationWizard_MSG1;
-	public static String FileModifyChecker_Checkout_failed_msg;
-	public static String FileModifyChecker_Checkout_failed_title;
-	public static String ImportConfigurationWizard_ERR_Import_configuration;
-	public static String ImportConfigReportPage_title;
-	public static String ImportPluginWizard_readonly;
-	public static String ImportPluginWizard_MSG1;
-	public static String ImportPluginWizard_error;
-	public static String ImportPluginWizard_warn_existing_plugins;
-	public static String ImportPluginWizard_confirm_continue;
-	public static String ImportPluginWizard_warn_circular_plugins;
-	public static String SelectConfigsToImport_label1;
-	public static String ImportConfigurationWizard_error;
-	public static String SelectImportConfigurationSource_MSG1;
-	public static String SelectConfigSpecsToImportPage_title2;
-	public static String SelectImportPluginSource_not_used;
-	public static String SelectImportPluginSource_no_path;
-	public static String SelectImportPluginSource_no_dir;
-	public static String SelectPluginsToImport_label_plugins;
-	public static String SelectPluginsToImport_label_author;
-	public static String SelectPluginsToImport_label_version;
-	public static String SelectPluginsToImport_label_desc;
-	public static String ImportConfigurationWizard_readonly;
-	public static String PluginImportingService_MSG0;
-	public static String PluginImportingService_MSG1;
-	public static String PluginImportingService_MSG3;
-	public static String PluginImportingService_MSG5;
-	public static String PluginImportingService_MSG6;
-	public static String DiffReportViewer_content;
-	public static String DiffReportViewer_in_import;
-	public static String SelectPluginsToImport_MSG1;
-	public static String DiffReportLabelProvider_yes;
-	public static String SelectPluginsToImport_error;
-	public static String DiffReportViewer_in_lib;
-	public static String DiffReportViewer_status;
-	public static String SelectPluginsToImport_libraryPluginExists;
-	public static String SelectPluginsToImport_libraryPluginNotExists;
-	public static String SelectConfigSpecsToImportPage_libraryConfigSpecExists;
-	public static String SelectConfigSpecsToImportPage_configSpecNoSelection;
-	public static String SelectConfigSpecsToImportPage_configSpecDataLabel;
-	public static String SelectConfigSpecsToImportPage_label_configs;
-	public static String SelectImportConfigurationSource_not_used;
-	public static String SelectConfigSpecsToImportPage_label_desc;
-	public static String SelectImportConfigurationSource_no_path;
-	public static String SelectPluginsToImport_pluginNoSelection;
-	public static String SelectImportConfigurationSource_no_dir;
-	public static String SelectImportConfigurationSource_plugin_readonly;
-	public static String SelectImportConfigurationSource_plugin_locked;
-	public static String SelectImportConfigurationSource_error_not_updatable;
-	public static String SelectPluginsToImport_pluginDataLabel;
-	public static String DiffReportViewer_type;
-	public static String SelectConfigSpecsToImportPage_libraryConfigSpecNotExists;
-	public static String versionMismatch_oldData;
-	public static String versionMismatch_oldData_unknown;
-	public static String versionMismatch_oldTool;
-	public static String versionMismatch_oldTool_unknown;
-	
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ImportResources.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/Resources.properties b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/Resources.properties
deleted file mode 100755
index ae7821f..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/Resources.properties
+++ /dev/null
@@ -1,95 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-#
-# Message ID Range: IUPE0200E - IUPE0299E
-#
-
-# Import Library Configuration Wizard
-importConfigWizard_title=Import Library Configuration
-selectConfigDirWizardPage_title=Specify import directory
-selectConfigDirWizardPage_text=Specify the directory containing the library configuration to import.
-reviewChangesWizardPage_title=Review library changes
-reviewChangesWizardPage_text=Review the changes that will be made to the current method library.
-selectConfigSpecsWizardPage_title=Select configuration specifications
-selectConfigSpecsWizardPage_text=Select one or more configuration specifications to import.
-
-# Import Method Plug-ins Wizard
-importPluginsWizard_title=Import Method Plug-ins
-selectPluginsDirWizardPage_title=Specify import directory
-selectPluginsDirWizardPage_text=Specify the directory containing the method plug-ins to import.
-selectPluginsWizardPage_title=Select method plug-ins
-selectPluginsWizardPage_text=Select one or more method plug-ins to import. If a selected plug-n already exists in the current method library, verify the version differences.
-importPluginsWizard_ERR_Import_plugin=Import plugin failed
-
-ConfigurationImportService_MSG0=Validating selected library configuration...
-ConfigurationImportService_MSG1=The specified directory does not contain a valid configuration.
-ConfigurationImportService_MSG3=Importing method configuration...
-ConfigurationImportService_MSG2=Cannot import the currently opened library into itself.
-ImportConfigurationWizard_MSG1=Importing method configuration...
-ImportConfigurationWizard_ERR_Import_configuration=Import configuration failed
-
-FileModifyChecker_Checkout_failed_title=Checkout failed
-FileModifyChecker_Checkout_failed_msg=Some files are not checked out, do you want to try again?
-
-ImportConfigReportPage_title=Importing Configuration Report
-ImportPluginWizard_readonly=IUPE0201E: Library is read-only.
-ImportPluginWizard_MSG1=Importing method plug-in...
-ImportPluginWizard_error=Error
-ImportPluginWizard_warn_existing_plugins=IUPE0200E: The following selected plugin(s) already exist and re-importing the same plugin(s) will overwrite the existing one(s):\n\n {0} \n\nAre you sure you want to continue?
-ImportPluginWizard_confirm_continue=\n\nAre you sure you want to continue?
-ImportPluginWizard_warn_circular_plugins=Circular references detected among the following plugins
-
-SelectConfigsToImport_label1=The following elements will be imported:
-ImportConfigurationWizard_error=Error
-SelectImportConfigurationSource_MSG1=Analyzing
-SelectConfigSpecsToImportPage_title2=Select configuration specifications to import
-SelectImportPluginSource_not_used=not_used
-SelectImportPluginSource_no_path=The specified directory does not exist.
-SelectImportPluginSource_no_dir=No directory specified
-SelectPluginsToImport_label_plugins=Available plug-ins in the import directory:
-SelectPluginsToImport_label_author=Author:
-SelectPluginsToImport_label_version=Version:
-SelectPluginsToImport_label_desc=Brief description:
-ImportConfigurationWizard_readonly=IUPE0201E: Library is read-only.
-PluginImportingService_MSG0=Validating selected plug-ins...
-PluginImportingService_MSG1=The specified path does not contain a valid method plug-in.
-PluginImportingService_MSG3=Importing method plug-in...
-PluginImportingService_MSG5=The selected method plug-in cannot be imported. Its dependent plug-in ''{0}'' cannot be found in the current method library.
-PluginImportingService_MSG6=The selected method plug-in cannot be imported. A dependent plug-in cannot be found in the current method library.
-DiffReportViewer_content=Content
-DiffReportViewer_in_import=In Import
-SelectPluginsToImport_MSG1=Analyzing files...
-DiffReportLabelProvider_yes=Yes
-SelectPluginsToImport_error=Error
-DiffReportViewer_in_lib=In Library
-DiffReportViewer_status=Status
-SelectPluginsToImport_libraryPluginExists=Selected plug-in found in the current library
-SelectPluginsToImport_libraryPluginNotExists=Selected plug-in not found in the current library
-SelectConfigSpecsToImportPage_libraryConfigSpecExists=Configuration found in the current library
-SelectConfigSpecsToImportPage_configSpecNoSelection=No configuration specification selected.
-SelectConfigSpecsToImportPage_configSpecDataLabel=Selected configuration in the import directory
-SelectConfigSpecsToImportPage_label_configs=Available configuration specifications in the import directory:
-SelectImportConfigurationSource_not_used=not_used
-SelectConfigSpecsToImportPage_label_desc=Brief description:
-SelectImportConfigurationSource_no_path=The specified path does not exist.
-SelectPluginsToImport_pluginNoSelection=No plug-in selected.
-SelectImportConfigurationSource_no_dir=No directory specified
-SelectImportConfigurationSource_plugin_readonly=Plugin {0} is readonly\n
-SelectImportConfigurationSource_plugin_locked=IUPE0203E: Plugin {0} is locked\n
-SelectImportConfigurationSource_error_not_updatable=Some of the plugin(s) in the library are either locked or readonly.\n Please unlock the plugins and make sure the files are updatable.
-SelectPluginsToImport_pluginDataLabel=Selected plug-in in the import directory
-DiffReportViewer_type=Content Type
-SelectConfigSpecsToImportPage_libraryConfigSpecNotExists=Selected configuration not found in the current library.
-versionMismatch_oldData=IUPE0204E: The specified files were exported by a previous version ({0}) of {1}. The files must be exported using the current version of {1}.
-versionMismatch_oldData_unknown=IUPE0205E: The specified files were exported by a previous version of {0}. The files must be exported using the current version of {0}.
-versionMismatch_oldTool=IUPE0206E: The specified files were exported by a newer version ({0}) of {1}. You must upgrade {1} in order to import the files.  
-versionMismatch_oldTool_unknown=IUPE0207E: The specified files cannot be opened. You must upgrade {0} in order to import the files.  
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/package.html b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/package.html
deleted file mode 100755
index 06b9030..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the activator for managing the Import plug-in's life cycle.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ConfigSpecs.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ConfigSpecs.java
deleted file mode 100755
index 2896972..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ConfigSpecs.java
+++ /dev/null
@@ -1,72 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.services;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.export.services.ConfigurationSpec;
-import org.eclipse.epf.uma.MethodConfiguration;
-
-
-/**
- * Models a list of library configuration specifications.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ConfigSpecs {
-
-	// A list of configuration entries.
-	public List configs = new ArrayList();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ConfigSpecs() {
-	}
-
-	/**
-	 * Returns a new entry.
-	 */
-	public Entry newEntry() {
-		Entry e = new Entry();
-		configs.add(e);
-
-		return e;
-	}
-
-	/**
-	 * Returns a iterator for the config specs.
-	 */
-	public Iterator iterator() {
-		return configs.iterator();
-	}
-
-	public class Entry {
-
-		public ConfigurationSpec configSpec = null;
-
-		public MethodConfiguration existingConfig = null;
-
-		public boolean selected = true;
-
-		public String toString() {
-			if (configSpec != null)
-				if (configSpec.name != null)
-					return configSpec.name;
-			return "unknown configuration specification"; //$NON-NLS-1$
-		}
-
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ConfigSpecsImportManager.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ConfigSpecsImportManager.java
deleted file mode 100755
index 2d069b3..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ConfigSpecsImportManager.java
+++ /dev/null
@@ -1,192 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.services;
-
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.export.services.ConfigurationSpec;
-import org.eclipse.epf.export.services.LibraryDocument;
-import org.eclipse.epf.importing.ImportPlugin;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.UmaFactory;
-import org.w3c.dom.Element;
-
-/**
- * Manages the import of library configuration specifications.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ConfigSpecsImportManager {
-
-	/**
-	 * Creates a new instance.
-	 */
-	ConfigSpecsImportManager() {
-	}
-
-	/**
-	 * Returns the config specs in the document.
-	 */
-	public ConfigSpecs getConfigSpecs(final LibraryDocument document) {
-		final ConfigSpecs configSpecs = new ConfigSpecs();
-
-		// Remove the unneeded configurations.
-		File configDir = new File(document.getFile().getParent(), MultiFileSaveUtil.METHOD_CONFIGURATION_FOLDER_NAME);			
-		LibraryDocument.ConfigDocVisitor visitor = new LibraryDocument.ConfigDocVisitor() {
-			public void visit(File file, Element node) {
-				ConfigSpecs.Entry entry = configSpecs.newEntry();
-				entry.configSpec = document.getConfigurationSpec(node);
-				entry.existingConfig = getExistingConfig(entry.configSpec.guid);
-			}
-		};			
-		LibraryDocument.visitConfigFiles(configDir, visitor);			
-		return configSpecs;
-	}
-
-	private MethodConfiguration getExistingConfig(String guid) {
-		MethodConfiguration[] configs = LibraryServiceUtil
-				.getMethodConfigurations(LibraryService.getInstance()
-						.getCurrentMethodLibrary());
-		if (configs == null || configs.length == 0) {
-			return null;
-		}
-
-		for (int i = 0; i < configs.length; i++) {
-			MethodConfiguration config = configs[i];
-			if (config.getGuid().equals(guid)) {
-				return config;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Imports the selected library configuration specifications.
-	 * 
-	 * @param specs
-	 *            A library configuration object.
-	 */
-	public void doImport(ConfigSpecs specs) {
-		try {
-			MethodLibrary lib = LibraryService.getInstance()
-					.getCurrentMethodLibrary();
-
-			LibraryUtil.loadAll(lib);
-
-			for (Iterator it = specs.iterator(); it.hasNext();) {
-				ConfigSpecs.Entry entry = (ConfigSpecs.Entry) it.next();
-				if (entry.selected) {
-					MethodConfiguration config = createConfig(entry.configSpec);
-
-					if (entry.existingConfig != null) {
-						// Merge the new plug-ins and packages into the existing
-						// one,
-						// anything in the current configuation should be kept.
-						// EcoreUtil.replace(entry.existingConfig, config);
-						List plugins = entry.existingConfig
-								.getMethodPluginSelection();
-						List pkgs = entry.existingConfig
-								.getMethodPackageSelection();
-						List views = entry.existingConfig.getProcessViews();
-
-						for (Iterator itp = config.getMethodPluginSelection()
-								.iterator(); itp.hasNext();) {
-							Object e = itp.next();
-							if (!plugins.contains(e)) {
-								plugins.add(e);
-							}
-						}
-
-						for (Iterator itp = config.getMethodPackageSelection()
-								.iterator(); itp.hasNext();) {
-							Object e = itp.next();
-							if (!pkgs.contains(e)) {
-								pkgs.add(e);
-							}
-						}
-
-						for (Iterator itp = config.getProcessViews().iterator(); itp
-								.hasNext();) {
-							Object e = itp.next();
-							if (!pkgs.contains(e)) {
-								views.add(e);
-							}
-						}
-					} else {
-						// Add the configuration.
-						lib.getPredefinedConfigurations().add(config);
-					}
-				}
-			}
-
-			LibraryUtil.saveLibrary(lib, false, false);
-
-		} catch (Exception e) {
-			ImportPlugin.getDefault().getLogger().logError(e);
-		}
-
-	}
-
-	private MethodConfiguration createConfig(ConfigurationSpec spec) {
-		MethodConfiguration config = UmaFactory.eINSTANCE
-				.createMethodConfiguration();
-
-		// Set the attributes.
-		config.setName(spec.name);
-		config.setBriefDescription(spec.brief_desc);
-		config.setGuid(spec.guid);
-
-		List plugins = config.getMethodPluginSelection();
-		List pkgs = config.getMethodPackageSelection();
-		List views = config.getProcessViews();
-
-		ILibraryManager manager = LibraryService.getInstance()
-				.getCurrentLibraryManager();
-		if (manager != null) {
-			for (Iterator it = spec.pluginIds.iterator(); it.hasNext();) {
-				String guid = (String) it.next();
-				Object element = manager.getMethodElement(guid);
-				if (element != null && !plugins.contains(element)) {
-					plugins.add(element);
-				}
-			}
-			
-			for (Iterator it = spec.packageIds.iterator(); it.hasNext();) {
-				String guid = (String) it.next();
-				Object element = manager.getMethodElement(guid);
-				if (element != null && !pkgs.contains(element)) {
-					pkgs.add(element);
-				}
-			}
-
-			for (Iterator it = spec.viewIds.iterator(); it.hasNext();) {
-				String guid = (String) it.next();
-				Object element = manager.getMethodElement(guid);
-				if (element != null && !views.contains(element)) {
-					views.add(element);
-				}
-			}
-		}
-
-		return config;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ConfigurationImportData.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ConfigurationImportData.java
deleted file mode 100755
index 154ce61..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ConfigurationImportData.java
+++ /dev/null
@@ -1,72 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.services;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.preferences.LibraryLocationData;
-
-
-/**
- * Encapsulates the input data required to import a library configuration.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ConfigurationImportData {
-
-	public LibraryLocationData llData = new LibraryLocationData();
-
-	private ErrorInfo error = new ErrorInfo();
-
-	// If specs != null, it's a configuration specification only.
-	public ConfigSpecs specs = null;
-
-	public List importList = new ArrayList();
-
-	// Indicate if you want to replace existing method packages.
-	public boolean replaceExisting = true;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ConfigurationImportData() {
-	}
-
-	/**
-	 * Returns the error message if any.
-	 */
-	public ErrorInfo getErrorInfo() {
-		return error;
-	}
-
-	public class ErrorInfo {
-
-		private StringBuffer errorMessage = new StringBuffer();
-
-		public ErrorInfo() {
-		}
-
-		public void addError(String message) {
-			errorMessage.append(message);
-		}
-
-		public String getError() {
-			return errorMessage.toString();
-		}
-
-		public void clear() {
-			errorMessage.setLength(0);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ConfigurationImportService.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ConfigurationImportService.java
deleted file mode 100755
index 3986578..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ConfigurationImportService.java
+++ /dev/null
@@ -1,473 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.services;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.common.serviceability.VersionUtil;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.export.services.LibraryDocument;
-import org.eclipse.epf.export.services.PluginExportService;
-import org.eclipse.epf.importing.ImportPlugin;
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.project.MethodLibraryProject;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.library.ui.wizards.OpenLibraryWizard;
-import org.eclipse.epf.library.util.ConvertGuidanceType;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.library.util.ResourceUtil;
-import org.eclipse.epf.library.util.TypeConverter;
-import org.eclipse.epf.persistence.migration.UpgradeCallerInfo;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Display;
-
-import com.ibm.icu.util.Calendar;
-
-
-/**
- * Imports a library configuration.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ConfigurationImportService {
-
-	private UpgradeCallerInfo upGradeInfo;
-	
-	private ConfigurationImportData data;
-
-	LibraryDocument importingLibDoc = null;
-
-	LibraryDiffManager diffMgr = null;
-
-	ConfigSpecsImportManager specsMgr = null;
-	
-	/**
-	 * Creates a new instance.
-	 */
-	public ConfigurationImportService(ConfigurationImportData data) {
-		this.data = data;
-	}
-
-	/**
-	 * Analyzes the imported library with respect to the base library.
-	 */
-	public void analyze(IProgressMonitor monitor) {
-		try {
-			if (monitor != null) {
-				monitor.setTaskName(ImportResources.ConfigurationImportService_MSG0);
-			}
-
-			data.getErrorInfo().clear();
-
-			// Prepare the library files.
-			String path = data.llData.getParentFolder();
-			if (path.indexOf(File.separator + LibraryDocument.libraryFile) < 0) {
-				path += File.separator + LibraryDocument.libraryFile;
-			}
-			File importingLibPath = new File(path);
-			
-			boolean isLibraryFile = true;
-			if (!importingLibPath.exists()) {
-				importingLibPath = new File(importingLibPath.getParentFile(),
-						LibraryDocument.exportFile);
-				isLibraryFile = false;
-			}
-
-			if (!importingLibPath.exists()) {
-				data
-						.getErrorInfo()
-						.addError(
-								NLS.bind(ImportResources.ConfigurationImportService_MSG1, importingLibPath.getParent())); 
-				return;
-			}
-
-			boolean handleVersion = isLibraryFile;
-			if (handleVersion) {
-				upGradeInfo = new ConfigurationImportService.UpgradeInfo(UpgradeCallerInfo.upgradeImportConfig, importingLibPath);
-				if (! handleToolVersion(importingLibPath, upGradeInfo)) {
-					data
-					.getErrorInfo()
-					.addError(
-							NLS.bind(ImportResources.ImportConfigurationWizard_ERR_Import_configuration, importingLibPath.getParent())); 
-
-					return;
-				}
-				if (upGradeInfo.getCopiedLibFile() != null) {
-					importingLibPath = upGradeInfo.getCopiedLibFile();
-				}
-			}
-						
-			importingLibDoc = new LibraryDocument(importingLibPath);
-			
-			if (! handleVersion) {
-				String versionError = versionCheck(importingLibPath.getAbsolutePath(), 
-										ImportResources.importConfigWizard_title);
-				if (versionError != null) {
-					data.getErrorInfo().addError(versionError);
-					return;
-				}
-			}
-
-			boolean isConfigSpecs = importingLibDoc.isConfigSpecsOnly();
-
-			if (isConfigSpecs) {
-
-				specsMgr = new ConfigSpecsImportManager();
-
-				// Scan the library file for configuration information.
-				data.specs = specsMgr.getConfigSpecs(importingLibDoc);
-
-			} else {
-				if (!isLibraryFile) {
-					data
-					.getErrorInfo()
-					.addError(
-							NLS.bind(ImportResources.ConfigurationImportService_MSG1, importingLibPath.getParent())); 
-					return;
-				}
-				data.specs = null;
-
-				// Open the library and compare the difference.
-				
-				// need to open and close the library to have the project resources initialized properly
-				String libDir = importingLibPath.getParentFile().getAbsolutePath();
-
-				String projectName = "Configuration Import Project (" //$NON-NLS-1$
-						+ Integer.toHexString(libDir.hashCode()) + ")"; //$NON-NLS-1$
-				
-				MethodLibraryProject.openProject(libDir, projectName, monitor);
-				try {
-					MethodLibrary importLibraty = LibraryUtil
-							.loadLibrary(importingLibPath.getAbsolutePath());
-					MethodLibrary baseLibrary = LibraryService.getInstance()
-							.getCurrentMethodLibrary();
-					
-					handleTypeChanges(baseLibrary, importLibraty);
-					
-					String baseLibDir = null;
-					try {	//Not neccessary, but prevent introducing any potential regression due to this change
-						File bFile = new File(baseLibrary.eResource().getURI().toFileString()).getParentFile();;
-						baseLibDir = bFile.getAbsolutePath();
-					} catch (Throwable e) {						
-					}
-					if (libDir.equalsIgnoreCase(baseLibDir)) {
-						data
-								.getErrorInfo()
-								.addError(
-										NLS.bind(ImportResources.ConfigurationImportService_MSG2, importingLibPath.getParent())); 
-						return;
-					}
-					
-					fixImportLibrarySystemPackageGUIDs(baseLibrary, importLibraty);
-					
-					diffMgr = new LibraryDiffManager(baseLibrary, importLibraty);
-					diffMgr.buildDiffTree();
-				} catch (RuntimeException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-				MethodLibraryProject.closeProject(libDir, monitor);
-				
-			}
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-
-	}
-
-	/**
-	 * Returns the import data.
-	 */
-	public ConfigurationImportData getImportData() {
-		return data;
-	}
-
-	/**
-	 * Returns spec only attribute.
-	 */
-	public boolean isSpecsOnly() {
-		return (data.specs != null);
-	}
-
-	/**
-	 * Returns the diff tree.
-	 */
-	public ElementDiffTree getDiffTree() {
-		return diffMgr.getDiffTree();
-	}
-
-	/**
-	 * Returns the import library.
-	 */
-	public MethodLibrary getImportingLibrary() {
-		return diffMgr.getImportingLibrary();
-	}
-
-	/**
-	 * Performs the import.
-	 */
-	public void performImport(final IProgressMonitor monitor) {
-		
-		// need to disable the workspace refreshing
-		boolean refresh = RefreshJob.getInstance().isEnabled();
-		if(refresh) {
-			// disable resource refreshing during import
-			//
-			RefreshJob.getInstance().setEnabled(false);
-		}
-		
-		try {
-			if (monitor != null) {
-				monitor.setTaskName(ImportResources.ConfigurationImportService_MSG3);
-			}
-
-			if (isSpecsOnly()) {
-				specsMgr.doImport(data.specs);
-			} else {
-				LibraryImportManager importingMgr = new LibraryImportManager(diffMgr, data.importList);			
-				importingMgr.doMerge(data.replaceExisting, monitor);
-			}
-			
-			// refresh library files in workspace
-			//
-			MethodLibrary lib = LibraryService.getInstance().getCurrentMethodLibrary();
-			ResourceUtil.refreshResources(lib, monitor);
-			
-		} catch (Exception e) {
-			ImportPlugin.getDefault().getLogger().logError(e);
-		} finally {
-			if(refresh) {
-				// re-enable resource refreshing 
-				//
-				RefreshJob.getInstance().setEnabled(true);
-			}
-			if (upGradeInfo != null) {
-				upGradeInfo.removeCopiedLibrary();
-				upGradeInfo = null;
-			}
-		}	
-		
-		try {
-			// Reopen the library.
-			LibraryService.getInstance().reopenCurrentMethodLibrary();		
-
-		} catch (Exception e) {
-			ImportPlugin.getDefault().getLogger().logError(e);
-		}
-	}
-	
-	/**
-	 * Checks the tool version.
-	 */
-	public static String versionCheck(final String xmlPath, final String title) {
-		final String[] ret = new String[1];
-		ret[0] = null;
-		SafeUpdateController.syncExec(new Runnable() {	
-			public void run() {				
-				VersionUtil.VersionCheckInfo info = VersionUtil.checkLibraryVersion(new File(xmlPath));
-				if (info == null) {
-					ret[0] = NLS.bind(ImportResources.versionMismatch_oldData_unknown, new Object[] {
-							Platform.getProduct().getName()});					
-				} else {
-					if (info.result < 0) {
-						if (info.toolID.equals(VersionUtil.getPrimaryToolID())) {
-							ret[0] = NLS.bind(ImportResources.versionMismatch_oldData, new Object[] {
-									info.toolVersion, Platform.getProduct().getName()});
-						} else {
-							ret[0] = NLS.bind(ImportResources.versionMismatch_oldData_unknown, new Object[] {
-									Platform.getProduct().getName()});					
-						}
-					} else if (info.result > 0) {
-						if (info.toolID.equals(VersionUtil.getPrimaryToolID())) {
-							ret[0] = NLS.bind(ImportResources.versionMismatch_oldTool, new Object[] {
-									info.toolVersion, Platform.getProduct().getName()});
-						} else {
-							ret[0] = NLS.bind(ImportResources.versionMismatch_oldTool_unknown, new Object[] {
-									Platform.getProduct().getName()});
-						}
-					} 
-				}
-				if (ret[0] != null) {
-					ImportPlugin.getDefault().getMsgDialog().displayError(title, ret[0]);					
-				}
-			}
-		});		
-		return ret[0];
-	}
-	
-	/**
-	 * Fixes the imported library's system package guids with those base's.
-	 */
-	public static void fixImportLibrarySystemPackageGUIDs(MethodLibrary baseLibrary, MethodLibrary importLibraty) {
-		HashMap pluginsMap = new HashMap();
-		List plugins = baseLibrary.getMethodPlugins();
-		for (int i=0; i < plugins.size(); i++) {
-			MethodPlugin plugin = (MethodPlugin) plugins.get(i);
-			pluginsMap.put(plugin.getGuid(), plugin);
-		}
-		if (pluginsMap.isEmpty()) {
-			return;
-		}
-		
-		List importPluginsToFix = new ArrayList();
-		List importPlugins = importLibraty.getMethodPlugins();
-		for (int i=0; i < importPlugins.size(); i++) {
-			MethodPlugin plugin = (MethodPlugin) importPlugins.get(i);
-			if (pluginsMap.containsKey(plugin.getGuid())) {
-				importPluginsToFix.add(plugin);
-			}
-		}
-		
-		for (int i=0; i < importPluginsToFix.size(); i++) {
-			MethodPlugin importPlugin = (MethodPlugin) importPluginsToFix.get(i);
-			MethodPlugin basePlugin = (MethodPlugin) pluginsMap.get(importPlugin.getGuid());
-			if (basePlugin == null) {
-				continue;
-			}
-			List importPackages = TngUtil.getAllSystemPackages(importPlugin);
-			HashMap importPackageMap = new HashMap();
-			for (int j=0; j < importPackages.size(); j++) {
-				MethodElement importPackage = (MethodElement) importPackages.get(j);
-				importPackageMap.put(importPackage.getName(), importPackage);
-			}
-			
-			List basePackages = TngUtil.getAllSystemPackages(basePlugin);			
-			for (int j=0; j < basePackages.size(); j++) {
-				MethodElement basePackage = (MethodElement) basePackages.get(j);
-				MethodElement importPackage = (MethodElement) importPackageMap.get(basePackage.getName());
-				if (importPackage == null) {
-					continue;
-				}
-				String guid = basePackage.getGuid();
-				if (! importPackage.getGuid().equals(guid)) {
-					importPackage.setGuid(guid);
-				}
-			}
-		}			
-	}
-	
-	private void handleTypeChanges(MethodLibrary baseLib, MethodLibrary importLib) {
-		HashMap baseMap = new HashMap();
-		collectPotentialTypeChanged(baseLib, baseMap);
-		HashMap importMap = new HashMap();
-		collectPotentialTypeChanged(importLib, importMap);
-		handleTypeChanges(baseMap, importMap);
-	}
-
-	/**
-	 * Handles MethodElement type changes. Note: for MethodElement objects in importMap
-	 * only eClass type is used in this method.
-	 */
-	public static void handleTypeChanges(HashMap baseMap, HashMap importMap) {
-		ArrayList toChangeList = new ArrayList();
-		for (Iterator it = importMap.entrySet().iterator(); it.hasNext();) {
-			Map.Entry entry = (Map.Entry) it.next();
-			Object guid = entry.getKey();
-			MethodElement baseElem = (MethodElement) baseMap.get(guid);
-			if (baseElem != null) {
-				MethodElement elem = (MethodElement) entry.getValue();
-				if (! elem.eClass().equals(baseElem.eClass())) {
-					MethodElement elemPair[] = new MethodElement[] {baseElem, elem};
-					toChangeList.add(elemPair);
-				}
-			}			
-		}
-		for (int i=0; i<toChangeList.size(); i++) {
-			MethodElement elemPair[] = (MethodElement[]) toChangeList.get(i);
-			final MethodElement baseElem = elemPair[0];
-			final MethodElement importElem = elemPair[1];
-			if (baseElem instanceof Guidance) {
-				Display.getDefault().syncExec(new Runnable() {
-					public void run() {
-						ConvertGuidanceType.convertGuidance((Guidance) baseElem, MsgBox.getDefaultShell(), null, importElem.eClass());
-					}
-				});
-			} else if (baseElem instanceof Activity) {
-				TypeConverter.convertActivity((Activity) baseElem, importElem.eClass()); 
-			}
-		}
-	}
-
-	/**
-	 * Collects elements in lib that may have type changes 
-	 */
-	public static void collectPotentialTypeChanged(MethodLibrary lib, HashMap map) {
-		for (Iterator it = lib.eAllContents(); it.hasNext();) {
-			Object obj = it.next();
-			if (obj instanceof Guidance ||
-				obj instanceof Activity) {
-				MethodElement elem = (MethodElement) obj;
-				map.put(elem.getGuid(), elem);
-			}
-		}
-	}
-	
-	public static boolean handleToolVersion(File libFile, final UpgradeCallerInfo info) {
-		final String libFolderPath = libFile.getParentFile().getAbsolutePath();
-		final boolean ret[] = new boolean[1];
-		SafeUpdateController.syncExec(new Runnable() {	
-			public void run() {
-				ret[0] = OpenLibraryWizard.handleToolVersion(libFolderPath, info);
-			}
-		});								
-		return ret[0];
-	}	
-
-	public static class UpgradeInfo extends UpgradeCallerInfo {
-		
-		public UpgradeInfo(int callerType, File libFile) {
-			super(callerType, libFile);
-		}
-		
-		public void copyLibrary() {
-			String userHome = System.getProperty("user.home"); //$NON-NLS-1$
-			String desLibFolderPath = userHome + File.separator
-					+ "EPF" + File.separator + "Export" + File.separator //$NON-NLS-1$ //$NON-NLS-2$
-					+ Long.toHexString(Calendar.getInstance().getTimeInMillis()) + File.separator;		
-			File desLibFolder = new File(desLibFolderPath);
-			if (!desLibFolder.exists()) {
-				desLibFolder.mkdirs();
-			} else {
-				FileUtil.deleteAllFiles(desLibFolder.getAbsolutePath());
-			}
-			
-			PluginExportService.copyDir(getLibFile().getParentFile(), desLibFolder);
-			setCopiedLibFile(new File(desLibFolderPath + getLibFile().getName()));
-		}
-		
-		public void removeCopiedLibrary() {
-			if (getCopiedLibFile() == null) {
-				return;
-			}
-			FileUtil.deleteAllFiles(getCopiedLibFile().getParentFile().getAbsolutePath());
-			getCopiedLibFile().getParentFile().delete();
-			setCopiedLibFile(null);
-		}
-	};	
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/DirCopy.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/DirCopy.java
deleted file mode 100755
index 947e235..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/DirCopy.java
+++ /dev/null
@@ -1,196 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.services;
-
-import java.io.File;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.services.IFileManager;
-import org.eclipse.epf.services.Services;
-
-
-/**
- * utility class to copy files from one dir to another, and delete the un-needed files from source dir.
- *
- * @author Jinhua Xi
- * @since 1.0
- */
-public class DirCopy {
-
-	//private IStatus fileCheckedOutStatus = null;
-	
-	File srcDir;
-	File targetDir;
-	
-	// new files to be added to the target
-	List newFiles = new ArrayList();
-	
-	// files exists in both src and target dir
-	List oldFiles = new ArrayList();
-	
-	// files only in target dir, these files are treated as deleted in the src folder.
-	List deletedFiles = new ArrayList();
-	
-	/**
-	 * Creates a new instance.
-	 */
-	public DirCopy(File srcDir, File targetDir) {
-		this.srcDir = srcDir;
-		this.targetDir = targetDir;
-		
-		prepare();
-	}
-	
-	private static String CP_FODLER = MultiFileSaveUtil.CAPABILITY_PATTERN_PATH + "/"; //$NON-NLS-1$
-	private static String DP_FODLER = MultiFileSaveUtil.DELIVERY_PROCESS_PATH + "/"; //$NON-NLS-1$
-	
-	/**
-	 * check out the existing files, delete the files from cm, and add new files, copy the files over
-	 *
-	 */
-	public IStatus execute() {
-			
-		// check out files
-		List files = new ArrayList();
-		for ( Iterator it = oldFiles.iterator(); it.hasNext(); ) {
-			String path = (String)it.next();						
-			if (needCopy(new File(srcDir, path), new File(targetDir, path))) {	//154321
-				files.add(new File(targetDir, path).getAbsolutePath());
-			}
-		}
-		
-		IStatus fileCheckedOutStatus = FileModifyChecker.checkModify(files);
-		
-		if ( !fileCheckedOutStatus.isOK() ) {
-			return fileCheckedOutStatus;
-		}
-			
-		// delete files
-		IFileManager fileMgr = Services.getFileManager();
-		for ( Iterator it = deletedFiles.iterator(); it.hasNext(); ) {
-			String path = (String)it.next();
-			File f = new File(targetDir, path);
-			fileMgr.delete(f.getAbsolutePath());
-			
-			// delete the empty CP and DP folder
-			path = path.replace(File.separatorChar, '/'); //$NON-NLS-1$
-			if ( path.startsWith(CP_FODLER) || path.startsWith(DP_FODLER) ) {
-				File folder = f.getParentFile();
-				String[] items = folder.list();
-				if ( items == null || items.length == 0 ) {
-					fileMgr.delete(folder.getAbsolutePath());				
-				}
-			}
-		}	
-		
-		// copy old files
-		for ( Iterator it = oldFiles.iterator(); it.hasNext(); ) {
-			String path = (String)it.next();
-			ResourceHelper.copyFile(new File(srcDir, path), new File(targetDir, path));
-		}
-		
-		// copy new files
-		for ( Iterator it = newFiles.iterator(); it.hasNext(); ) {
-			String path = (String)it.next();
-			ResourceHelper.copyFile(new File(srcDir, path), new File(targetDir, path));
-		}
-		
-		return fileCheckedOutStatus;
-	}
-	
-	
-	private void prepare() {
-		List allSrcFiles = getAllFiles(srcDir);
-		List allTargetFiles = getAllFiles(targetDir);
-
-		while ( allTargetFiles.size() > 0 ) {
-			String path = (String)allTargetFiles.remove(0);
-			if ( allSrcFiles.contains(path) ) {
-				oldFiles.add(path);
-				allSrcFiles.remove(path);
-			} else {
-				deletedFiles.add(path);
-			}
-		}
-		
-		// the remaining files in the target list is the new files
-		newFiles.addAll(allSrcFiles);
-	}
-	
-	/**
-	 * get all the files with relative path to the root
-	 * @param dir the root dir
-	 * @return List all files in the dir, with relative path to the root
-	 */
-	private List getAllFiles(File dir) {
-		List files = new ArrayList();
-		FileUtil.getAllFiles(dir, files, true);
-
-		// convert to list of path, not File
-		URI baseUrl = dir.toURI();
-		
-		int i = 0;
-		while ( i < files.size() ) {
-			File f = (File)files.get(i);
-			if ( canIgnore(f.getAbsolutePath()) || canIgnore(f)) {
-				files.remove(i);
-			} else {
-				URI rel = baseUrl.relativize(f.toURI());
-				files.set(i, rel.getPath());	
-				i++;
-			}
-		}
-
-		return files;
-	}
-	
-	private static final String CVS_FOLDER = File.separator + "CVS" + File.separator;
-	private boolean canIgnore(String path) {
-		if ( path.indexOf(CVS_FOLDER) >=0 ) {
-			return true;
-		}
-		
-		return false;
-	}
-	
-	private static final String[] ignoreFiles = {
-									".copyarea.dat",
-									".copyarea.db"
-									};			//$NON-NLS-1$	//$NON-NLS-2$
-	private boolean canIgnore(File file) {
-		String name = file.getName();
-		for (int i=0; i<ignoreFiles.length; i++) {
-			if (name.equals(ignoreFiles[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Checks to see if the copy action is needed.
-	 */
-	public static boolean needCopy(File source, File dest) {
-		boolean ret = true;
-		if (dest.exists()) {
-			ret = (dest.lastModified() != source.lastModified())
-					|| (dest.length() != source.length());
-		}
-		return ret;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ElementDiffTree.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ElementDiffTree.java
deleted file mode 100755
index 33c7504..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ElementDiffTree.java
+++ /dev/null
@@ -1,249 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.services;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-
-
-/**
- * Displays the element differences in a tree.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ElementDiffTree {
-
-	public static final int DIFF_STATE_SAME = 0;
-
-	public static final int DIFF_STATE_NEW = 1;
-
-	public static final int DIFF_STATE_CHANGED = 4;
-
-	public static final int DIFF_STATE_OLD_ONLY = 5;
-
-	private MethodElement e1;
-
-	private MethodElement e2;
-
-	// The parent in the base library if e2 is a new element.
-	private MethodElement e1_parent;
-
-	private ElementDiffTree parent = null;
-
-	// Define the diff state of the second element compared to the first one.
-	private int diffState = DIFF_STATE_SAME;
-
-	private List children = new ArrayList();
-
-	private boolean hasDirtyChild = false;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ElementDiffTree(MethodElement e1, MethodElement e2) {
-		this(e1, e2, null);
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ElementDiffTree(MethodElement e1, MethodElement e2,
-			MethodElement e1_parent) {
-		this.e1_parent = e1_parent;
-		this.e1 = e1;
-		this.e2 = e2;
-
-		resolveDiffState();
-	}
-	
-	/**
-	 * Returns the base method element.
-	 */
-	public MethodElement getBaseElement() {
-		return e1;
-	}
-
-	/**
-	 * Returns the base method element's parent.
-	 */
-	public MethodElement getBaseParentElement() {
-		return e1_parent;
-	}
-
-	/**
-	 * Returns the import method element.
-	 */
-	public MethodElement getImportElement() {
-		return e2;
-	}
-
-	/**
-	 * Checks whether the element is new to the library.
-	 */
-	public boolean isNew() {
-		return (e1 == null) && (e2 != null);
-	}
-
-	/**
-	 * Checks whether the element exists only in the library and not in the
-	 * configuration to be imported.
-	 */
-	public boolean isOldOnly() {
-		return (e1 != null) && (e2 == null);
-	}
-
-	/**
-	 * Returns true if both base and import elements are not null, 
-	 * otherwise returns false.
-	 */
-	public boolean isBoth() {
-		return (e1 != null) && (e2 != null);
-	}
-
-	/**
-	 * Adds a child node.
-	 */
-	public void addChild(ElementDiffTree child) {
-		children.add(child);
-		child.setParent(this);
-	}
-
-	/**
-	 * hasDirtyChild attribute.
-	 */
-	public boolean hasDirtyChild() {
-		return this.hasDirtyChild;
-	}
-
-	/**
-	 * Sets hasDirtyChild attribute.
-	 */
-	public void setDirtyChild(boolean flag) {
-		hasDirtyChild = hasDirtyChild || flag;
-		if (hasDirtyChild && parent != null) {
-			parent.setDirtyChild(hasDirtyChild);
-		}
-	}
-
-	private void setParent(ElementDiffTree parent) {
-		this.parent = parent;
-		if (diffState != DIFF_STATE_SAME && parent != null) {
-			parent.setDirtyChild(true);
-		}
-	}
-
-	/**
-	 * Returns the parent.
-	 */
-	public ElementDiffTree getParent() {
-		return this.parent;
-	}
-
-	/**
-	 * hasChildren attribute.
-	 */
-	public boolean hasChildren() {
-		return (children != null) && (children.size() > 0);
-	}
-
-	/**
-	 * Returns the child list.
-	 */
-	public List getChildren() {
-		return children;
-	}
-
-	/**
-	 * Returns the diff state of the second element comparing to the first one.
-	 */
-	public int getDiffState() {
-		return diffState;
-	}
-
-	/**
-	 * Returns a message string.
-	 */
-	public String getDiffMessage() {
-		return "[" + getVersion(e1) + "] : [" + getVersion(e2) + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	private void resolveDiffState() {
-		// how to fidd two elements?
-		// 1. attributes
-		// 2. version number
-		// 3. children
-		// 4. references
-		// 5. ...
-		if (e1 == null) {
-			diffState = DIFF_STATE_NEW;
-		} else if (e2 == null) {
-			diffState = DIFF_STATE_OLD_ONLY;
-		} else {
-			if (e1 instanceof MethodLibrary) {
-				diffState = DIFF_STATE_SAME;
-			} else {
-				diffState = DIFF_STATE_CHANGED;
-			}
-		}
-	}
-
-	private String getVersion(MethodElement element) {
-		if (element == null) {
-			return ""; //$NON-NLS-1$
-		}
-
-		return getPackage(element).getVersion();
-	}
-
-	private org.eclipse.epf.uma.MethodUnit getPackage(MethodElement element) {
-		if (element instanceof org.eclipse.epf.uma.MethodUnit) {
-			return (org.eclipse.epf.uma.MethodUnit) element;
-		}
-
-		return getPackage((MethodElement) element.eContainer());
-	}
-
-	// Utility method to get the element information.
-	/**
-	 * Returns the name.
-	 */
-	public String getName() {
-		if (e1 != null) {
-			return e1.getName();
-		}
-		if (e2 != null) {
-			return e2.getName();
-		} else {
-			return ""; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Returns the content type.
-	 */
-	public String getContentType() {
-		MethodElement e = e1;
-		if (e == null) {
-			e = e2;
-		}
-
-		if (e != null) {
-			return e.getType().getName();
-		}
-
-		return ""; //$NON-NLS-1$
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/FileModifyChecker.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/FileModifyChecker.java
deleted file mode 100755
index 4ee40ab..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/FileModifyChecker.java
+++ /dev/null
@@ -1,103 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.services;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.importing.ImportPlugin;
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.services.IFileManager;
-import org.eclipse.epf.services.Services;
-
-
-/**
- * utility class to check files for modifications
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public class FileModifyChecker {
-
-	/**
-	 * Checks modification status of the given list of files.
-	 */
-	public static IStatus checkModify(List modifiedFiles) {
-		
-		try {
-			String[] paths = new String[modifiedFiles.size()];
-			modifiedFiles.toArray(paths);
-			
-			IFileManager fileMgr = Services.getFileManager();
-			IStatus status = fileMgr.checkModify(paths, MsgBox.getDefaultShell());
-
-			// make sure all the files are updatable			
-			List readonlyFiles = new ArrayList();
-			for (int i = 0; i < paths.length; i++ ) {
-				File f = new File(paths[i]);
-				if ( f.exists() && !f.canWrite() ) {
-					readonlyFiles.add(paths[i]);
-				}
-			}
-			
-			if ( readonlyFiles.size() > 0 ) {
-				String title = ImportResources.FileModifyChecker_Checkout_failed_title; 
-				String msg = ImportResources.FileModifyChecker_Checkout_failed_msg; 
-				if ( new MsgDialog(ImportPlugin.getDefault()).displayPrompt(title, msg) ) {
-					return checkModify(readonlyFiles);
-				}
-			}		
-			return status;
-			
-		} catch (Throwable e) {
-			e.printStackTrace();
-			return new Status(IStatus.ERROR, ImportPlugin.getDefault()
-					.getId(), 0, e.getMessage() == null ? "" : e.getMessage(), null); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * Checks modification status of the given list of files.
-	 */
-	public static IStatus syncExecCheckModify(final List modifiedFiles) {
-		final IStatus[] ret = new IStatus[1];
-		SafeUpdateController.syncExec(new Runnable() {
-			public void run() {
-				ret[0] = FileModifyChecker.checkModify(modifiedFiles);
-			}
-		});
-		return ret[0];
-	}
-	
-	/**
-	 * Retruns the modified file list of the given resource set.
-	 */
-	public static List getModifiedFiles(ResourceSet resourceSet) {
-		List ret = new ArrayList();
-		for (Iterator it = resourceSet.getResources().iterator(); it.hasNext();) {
-			Resource res = (Resource) it.next();
-			if (res != null && res.isModified()) {
-				ret.add(res.getURI().toFileString());
-			}
-		}
-		return ret;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryDiffManager.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryDiffManager.java
deleted file mode 100755
index 389cd7d..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryDiffManager.java
+++ /dev/null
@@ -1,295 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.services;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.epf.importing.ImportPlugin;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.Dimension;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Point;
-
-
-/**
- * Manages the differences between method elements in the current library and
- * those that will be imported.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class LibraryDiffManager {
-
-	private MethodLibrary baseLibrary;
-
-	private MethodLibrary importLibraty;
-
-	// Map of uid to ElementDiffTree, the root of the ElementDiffTree is the
-	// library.
-	private Map diffElementMap = new HashMap();
-
-	// Map of uid to element for import library configuration.
-	private Map importElementMap = new HashMap();
-
-	// id to element map of the current library.
-	private Map currentElementMap = new HashMap();
-
-	// The diff tree.
-	ElementDiffTree rootDiffTree = null;
-
-	private boolean debug = ImportPlugin.getDefault().isDebugging();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public LibraryDiffManager(MethodLibrary baseLibrary,
-			MethodLibrary importLibraty) {
-		this.baseLibrary = baseLibrary;
-		this.importLibraty = importLibraty;
-
-		rootDiffTree = new ElementDiffTree(baseLibrary, importLibraty);
-	}
-
-	/**
-	 * Returns the import library.
-	 */
-	public MethodLibrary getImportingLibrary() {
-		return this.importLibraty;
-	}
-
-	/**
-	 * Builds the difference tree.
-	 */
-	public ElementDiffTree buildDiffTree() {
-		// Build the uid to element map for the import library.
-		buildUIDMap(importLibraty.eContents(), importElementMap, true, false);
-
-		buildUIDMap(baseLibrary.eContents(), currentElementMap, true, true);
-
-		// Get all the system packages in each plug-in so we can filter out
-		// those packages when comparing the libraries.
-
-		// Iterate the element in the current library, and build a diff tree by
-		// comparing to the import library.
-		List plugins = baseLibrary.getMethodPlugins();
-		for (Iterator it = plugins.iterator(); it.hasNext();) {
-			MethodPlugin plugin = (MethodPlugin) it.next();
-			List systemPackages = TngUtil.getAllSystemPackages(plugin);
-			
-			// content category packages should be included into the diff tree 
-			// otherwise the category information will be lost
-			List categoryList = TngUtil.getContentCategoryPackages(plugin);
-			for ( Iterator itc = categoryList.iterator(); itc.hasNext(); ) {
-				Object o = itc.next();
-				if ( systemPackages.contains(o) ) {
-					systemPackages.remove(o);
-				}
-			}
-			
-			// the root customcategoty package needs to be included into the diff tree
-			int i = 0;
-			while (i < systemPackages.size() ) {
-				MethodPackage pkg = (MethodPackage)systemPackages.get(i);
-				if ( TngUtil.isRootCutomCategoryPackage(pkg) ) {
-					systemPackages.remove(pkg);
-					break;
-				} else {
-					i++;
-				}
-			}
-			
-			// Build the diff tree by iterating the current library.
-			iterateElement(plugin, rootDiffTree, systemPackages);
-		}
-
-		List configs = baseLibrary.getPredefinedConfigurations();
-		for (Iterator it = configs.iterator(); it.hasNext();) {
-			MethodConfiguration config = (MethodConfiguration) it.next();
-
-			// Build the diff tree by iterating the current library.
-			iterateElement(config, rootDiffTree, new ArrayList());
-		}
-
-		// Process the new elements in the import library and add them to the
-		// diff tree.
-		handleNewElements(importLibraty);
-
-		return rootDiffTree;
-	}
-
-	/**
-	 * Returns the differnece tree.
-	 */
-	public ElementDiffTree getDiffTree() {
-		return rootDiffTree;
-	}
-
-	/**
-	 * Returns the differnece map.
-	 */
-	public Map getDiffTreeMap() {
-		return diffElementMap;
-	}
-
-	/**
-	 * Iterates the element in the current library and build a diff tree by
-	 * comparing to the import library.
-	 */
-	private void iterateElement(MethodElement element,
-			ElementDiffTree diffTree, List systemPackages) {
-		if (!selectable(element)) {
-			return;
-		}
-
-		// Update the diffelement UID map.
-		if (!systemPackages.contains(element)
-				&& !(element instanceof MethodLibrary)) {
-			String uid = element.getGuid();
-			ElementDiffTree diffChild = new ElementDiffTree(element,
-					(MethodElement) importElementMap.get(uid));
-			diffElementMap.put(uid, diffChild);
-			diffTree.addChild(diffChild);
-			diffTree = diffChild;
-		}
-
-		// Check with the importing element and create an ElementDiffInfo object
-		EList children = element.eContents();
-		if (children != null) {
-			for (Iterator it = children.iterator(); it.hasNext();) {
-				Object e = it.next();
-				if (e instanceof MethodElement) {
-					MethodElement child = (MethodElement) e;
-					if (selectable(child)) {
-						iterateElement(child, diffTree, systemPackages);
-					}
-				} else {
-					if (debug ) {
-						System.out
-								.println("Error! " + e + " is not a MethodElement object"); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * If there are newly added elements in the importing library, add the new
-	 * elements into the parent
-	 */
-	private void handleNewElements(MethodElement element) {
-		if (!selectable(element)) {
-			return;
-		}
-
-		if (isNewElement(element)) {
-			// This is a new element, find the parent in the base library.
-			MethodElement parent = (MethodElement) element.eContainer();
-			while (isNewElement(parent)) {
-				element = parent;
-				parent = (MethodElement) parent.eContainer();
-			}
-
-			// Always merge libray plugins even it's from a different library.
-			if (parent instanceof MethodLibrary) {
-				parent = baseLibrary;
-			}
-
-			// Need to find the parent element in the current library so that we
-			// know where to add the new element.
-			MethodElement lib_parent = (MethodElement) currentElementMap
-					.get(parent.getGuid());
-			if (lib_parent == null) {
-				lib_parent = baseLibrary;
-			}
-			ElementDiffTree elementDiffTree = new ElementDiffTree(null,
-					element, lib_parent);
-
-			// Find the parent diff tree.
-			ElementDiffTree parentDiffTree = null;
-			while ((parentDiffTree == null) && (parent != null)) {
-				parentDiffTree = (ElementDiffTree) diffElementMap.get(parent
-						.getGuid());
-				parent = (MethodElement) parent.eContainer();
-			}
-
-			if (parentDiffTree == null) {
-				parentDiffTree = rootDiffTree;
-			}
-
-			parentDiffTree.addChild(elementDiffTree);
-		} else {
-			// Iterate the children.
-			List children = element.eContents();
-			for (Iterator itc = children.iterator(); itc.hasNext();) {
-				MethodElement e = (MethodElement) itc.next();
-				handleNewElements(e);
-			}
-
-		}
-	}
-
-	private boolean isNewElement(MethodElement element) {
-		if (element == null || element instanceof MethodLibrary) {
-			return false;
-		}
-		return !currentElementMap.containsKey(element.getGuid());
-	}
-
-	private void buildUIDMap(List elements, Map elementUIDMap, boolean recursive, boolean full) {
-		MethodElement element;
-		for (Iterator it = elements.iterator(); it.hasNext();) {
-			Object e = it.next();
-			if (e instanceof MethodElement) {
-				element = (MethodElement) e;
-				if (selectable(element) || full) {
-					String uid = element.getGuid();
-					elementUIDMap.put(uid, element);
-
-					if (recursive) {
-						buildUIDMap(element.eContents(), elementUIDMap,
-								recursive, full);
-					}
-				}
-			} else if ( !(e instanceof Point || e instanceof Dimension) ){
-				ImportPlugin.getDefault().getLogger().logError(
-							"Import error. " + e + " is not a MethodElement object"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-
-	}
-
-	/**
-	 * Checks if the method element is selectable.
-	 */
-	public boolean selectable(MethodElement element) {
-		return (element instanceof MethodLibrary
-				|| element instanceof MethodPlugin
-				|| element instanceof MethodPackage
-				|| element instanceof MethodConfiguration);
-	}
-
-	/**
-	 * Returns the existing method element given by the guid.
-	 */
-	public MethodElement getExistingElement(String guid) {
-		return (MethodElement)currentElementMap.get(guid);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryImportManager.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryImportManager.java
deleted file mode 100755
index 20a86a7..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryImportManager.java
+++ /dev/null
@@ -1,1559 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.services;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.export.services.DiagramHandler;
-import org.eclipse.epf.importing.ImportPlugin;
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.services.IFileManager;
-import org.eclipse.epf.services.Services;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.DiagramElement;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.UmaPackage;
-
-
-/**
- * Manages the importing of a library.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class LibraryImportManager {
-
-	private Map renameElementMap = new HashMap();
-	private Map setElementMap = null;
-
-	private LibraryDiffManager diffMgr;
-	private ElementDiffTree rootTree;
-
-	//protected AdapterFactoryEditingDomain editingDomain = null;
-
-	//protected AdapterFactoryContentProvider afcp = null;
-
-	private MethodLibrary baseLibrary = null;
-	private MethodLibrary importingLibrary = null;
-
-	// guid of replaced element id to the element in the base library
-	// we need this to redirect the reference of new elements from the importing
-	// libraty to the base library
-	private Map replacedElementMap = new HashMap();
-
-	// keep the new elements, we need to iterate their feature value and
-	// redirect the valeu element
-	// from the importing library to the base library
-	private List newElements = new ArrayList();
-		
-	// deleted elements,
-	private List deletedElements = new ArrayList();
-	
-	private boolean debug = ImportPlugin.getDefault().isDebugging();
-	
-	// list of user selected items to be imported
-	List checkedList = new ArrayList();
-	
-	// flag to indicate the file cheout status
-	IStatus fileCheckedOutStatus = null;
-	
-	// resource file path for new resoruces
-	List newResources = new ArrayList();
-	
-	ResourceScanner resScanner;
-	
-	private DiagramHandler diagramHandler;
-	
-	/**
-	 * Creates a new instance.
-	 */
-	public LibraryImportManager(LibraryDiffManager diffMgr,
-			List checkedItems) {
-		this.diffMgr = diffMgr;
-		this.rootTree = diffMgr.getDiffTree();
-		
-		if ( checkedItems != null ) {
-			// checkedList contains a list of ElementDiffTree objects
-			// get the packages as well
-			this.checkedList.addAll(checkedItems);
-			for (Iterator it = checkedItems.iterator(); it.hasNext(); ) {
-				ElementDiffTree diffTree = (ElementDiffTree) it.next();
-				MethodElement e = diffTree.getBaseElement();
-				if ( e != null ) {
-					checkedList.add(e);
-				}
-								
-				if ( e instanceof ProcessComponent ) {
-					LibraryUtil.getAllChildPackages((MethodPackage)e, checkedList);
-				}
-				
-				// also incldue the hidden root custom package if the package is the CustomCategories package
-				// 150895 - Import Config: CustomCategory did not sync up by import
-				if ( e instanceof MethodPackage ) {
-					List children = ((MethodPackage)e).getChildPackages();
-					if ( children.size() == 1 ) {
-						MethodPackage pkg  = (MethodPackage)children.get(0);
-						if ( TngUtil.isRootCutomCategoryPackage(pkg) ) {
-							checkedList.add(pkg);
-						}
-					}
-				}
-				
-				e = diffTree.getImportElement();
-				if ( e != null ) {
-					checkedList.add(e);
-				}
-				
-				if ( e instanceof ProcessComponent ) {
-					LibraryUtil.getAllChildPackages((MethodPackage)e, checkedList);
-				}
-
-				
-				// for new item, add all the sub packages
-				if ( diffTree.isNew() ) {
-					if ( e instanceof MethodPlugin ) {
-						checkedList.addAll(LibraryUtil.getAllPackages((MethodPlugin)e));
-					} else if ( e instanceof MethodPackage ) {
-						LibraryUtil.getAllChildPackages((MethodPackage)e, checkedList);
-					} 
-				}
-			}
-			
-		} else {
-			checkedList = null;
-		}
-		
-		
-		init();
-
-		// Get the current library.
-		baseLibrary = (MethodLibrary) this.rootTree.getBaseElement();
-		importingLibrary = (MethodLibrary) this.rootTree
-				.getImportElement();
-
-		// create the resource scanner
-		resScanner = new ResourceScanner(
-				LibraryUtil.getLibraryRootPath(importingLibrary), 
-				LibraryUtil.getLibraryRootPath(baseLibrary));
-			
-		diagramHandler = new DiagramHandler(
-				LibraryUtil.getLibraryRootPath(importingLibrary), 
-				LibraryUtil.getLibraryRootPath(baseLibrary));
-	}
-		
-	private void init() {
-//		// Set the tree content.
-//		List factories = new ArrayList();
-//		factories.add(new ResourceItemProviderAdapterFactory());
-//		factories.add(new UmaItemProviderAdapterFactory());
-//		factories.add(new ReflectiveItemProviderAdapterFactory());
-//
-//		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
-//				factories);
-//		afcp = new AdapterFactoryContentProvider(adapterFactory);
-//
-//		BasicCommandStack commandStack = new BasicCommandStack();
-//
-//		// Create the editing domain with a special command stack.
-//		editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
-//				commandStack, new HashMap());
-//
-	}
-
-	private boolean isSelected(ElementDiffTree diffTree) {
-		if ( checkedList == null || checkedList.contains(diffTree) ) {
-			return true;
-		}
-		
-		MethodElement e = diffTree.getBaseElement();		
-		if ( e == null ) {
-			e = diffTree.getImportElement();
-		}
-		
-		return isSelected(e);
-	}
-	
-	private boolean isSelected(MethodElement e) {
-		
-		if ( checkedList == null || 
-				e instanceof ContentDescription || 
-				e.eContainer() instanceof ContentDescription || 
-				e instanceof MethodLibrary ) {
-			return true;
-		}
-		
-		if ( checkedList.size() == 0 ) {
-			return false;
-		}
-		
-		if ( e instanceof MethodConfiguration ) {
-			return checkedList.contains(e);
-		}
-		
-		MethodElement o = (MethodElement)LibraryUtil.getSelectable(e);
-		if ( o == null ) {
-			return false;
-		} 
-		
-		if ( o instanceof MethodLibrary ) {
-			return true;
-		}
-		
-		return checkedList.contains(o);
-	}
-	
-	/**
-	 * Does merge from the import library into the base library.
-	 */
-	public void doMerge(boolean replaceExisting, IProgressMonitor monitor) throws Exception {
-
-		if ( debug ) {
-			System.out.println("Merging configuration ..."); //$NON-NLS-1$
-		}
-			
-		// Save the library path before detaching the resource.
-
-		if ( debug ) {
-			System.out.println("loading library ..."); //$NON-NLS-1$
-		}
-
-		LibraryUtil.loadAll(baseLibrary);
-		LibraryUtil.loadAll(importingLibrary);
-
-		// Detach the new library from the current resource so it can be
-		// added to a new Library Processor instance.
-		LibraryUtil.detachFromResource(importingLibrary);
-
-		// for test
-		importingLibrary.setName("ImportingLib: " + importingLibrary.getName()); //$NON-NLS-1$
-		
-		if ( debug ) {
-			System.out.println("Process configuration diff tree ..."); //$NON-NLS-1$
-		}
-
-		// before processing, save the original resources 
-		// so that we can find the newly added resources
-		List oldResources = new ArrayList(
-				baseLibrary.eResource().getResourceSet().getResources());
-		
-		// Iterate each element and the necessary merges.
-		processDiffTree(rootTree, replaceExisting);
-
-		handleSetElements();
-		
-		if ( debug ) {
-			System.out.println("perform integrity checking ..."); //$NON-NLS-1$
-		}
-
-		// perform an integrity check of the library
-		// fix any danfling elements due to package/element replacement
-		doIntegrityCheck();
-
-		// now process the new resources and mark them dirst so that 
-		// the data will be saved again. 
-		// This step is critical since the first round only created the data structure
-		// some of the cross-referenced elements might be lost on the first saving
-		// for example, when create a method configuration with references to a new plugin,
-		// which are not saved yet, those references will be lost.
-		// 145891 - Import Configuration: default config is loss after import
-		handleNewResources(oldResources);
-		
-		handleNameReplace(renameElementMap);
-		
-		diagramHandler.postRegisterElements();
-		
-		// get all the modified resources and resource files
-		// check CM for file check-out
-		if ( debug ) {
-			System.out.println("check out files ..."); //$NON-NLS-1$
-		}
-		
-		// clear resources for deleted elements
-		deleteResoruces();
-	
-		checkModifiedFiles();
-				
-		if ( fileCheckedOutStatus.isOK() ) {
-		 
-			if ( debug ) {
-				System.out.println("copying resource files ..."); //$NON-NLS-1$
-			}
-			resScanner.execute();
-			diagramHandler.execute();
-
-			if ( debug ) {
-				System.out.println("saving library ..."); //$NON-NLS-1$
-			}
-			
-			LibraryUtil.saveLibrary(baseLibrary, false, false);
-		} 
-		else {
-			fileCheckOutError();
-		}	
-// if ( debug ) {
-// System.out.println("copying resource files ..."); //$NON-NLS-1$
-// }
-//
-// // Copy the resource files in the current library to the new library.
-// // For simplicity sake, copy all resource files if the files do not
-// // exist in the target library or if the files are newer.
-// String includes = "resources/**, **/resources/**"; //$NON-NLS-1$
-//
-// LayoutResources.copyDir(srcDir, destDir, includes, null);
-
-		if ( debug ) {
-			System.out.println("Merging configuration done..."); //$NON-NLS-1$
-		}
-
-	}
-	
-	private void fileCheckOutError() {
-		// log error
-		SafeUpdateController.syncExec(new Runnable() {
-			public void run() {
-				String title = ImportResources.importConfigWizard_title; 
-				String msg = ImportResources.ImportConfigurationWizard_ERR_Import_configuration; 
-				new MsgDialog(ImportPlugin.getDefault())
-					.displayError(title, msg, fileCheckedOutStatus);
-				}
-		});
-
-		if ( debug ) {
-			System.out.println("Checkout files failed ..."); //$NON-NLS-1$
-		}
-	}
-		
-	private void handleNewResources(List oldResources) {
-		for (Iterator it = baseLibrary.eResource().getResourceSet()
-				.getResources().iterator(); it.hasNext(); ) {
-			Resource res = (Resource)it.next();
-			if ( !oldResources.contains(res) ) {
-				logNewResource(res);
-			}
-		}	
-	}
-	
-	
-	/**
-	 * Processes the diff tree. Only need to do the first level since the
-	 * replace or add is done at the method package level.
-	 */
-	private void processDiffTree(ElementDiffTree diffTree,
-			boolean replaceExisting) throws Exception {
-		if (diffTree == null || !isSelected(diffTree) ) {
-			return;
-		}
-
-		// There is a change.
-		int state = diffTree.getDiffState();
-		MethodElement base = diffTree.getBaseElement();
-		MethodElement imp = diffTree.getImportElement();
-		if (replaceExisting && (state == ElementDiffTree.DIFF_STATE_CHANGED) ) {
-
-			if ( (base instanceof MethodConfiguration)) {
-				// replace the configuration by adding the new packages into the
-				// configuration
-				doReplaceConfiguration((MethodConfiguration) base, (MethodConfiguration) imp);
-			}
-			else if ( (base instanceof MethodPlugin)) {
-				// Replace the plugin with the non-package features.
-				doReplacePlugin((MethodPlugin) base, (MethodPlugin) imp);
-			}
-			else if ( (base instanceof MethodPackage)) {
-				// Replace the package.
-				doReplacePackage((MethodPackage) base, (MethodPackage) imp);
-			}
-			else
-			{
-				if (debug ) {
-					System.out.println("What is this: " + LibraryUtil.getTypeName(base)); //$NON-NLS-1$
-				}
-			}
-		} else if (state == ElementDiffTree.DIFF_STATE_NEW) {
-			// Add the new package from import library.
-			doAdd(diffTree.getBaseParentElement(), diffTree.getImportElement()); 
-		}
-
-		// Process the children recursively if it's not a new one.
-		if (state != ElementDiffTree.DIFF_STATE_NEW) {
-			List children = diffTree.getChildren();
-			if (children != null && children.size() > 0) {
-				for (Iterator it = children.iterator(); it.hasNext();) {
-					processDiffTree((ElementDiffTree) it.next(),
-							replaceExisting);
-				}
-			}
-		}
-	}
-
-	/**
-	 * update the configuration by replacing the non-package features, and
-	 * adding the new packages into the configuration
-	 * 
-	 * @param oldObj
-	 *            MethodConfiguration
-	 * @param newObj
-	 *            MethodConfiguration
-	 */
-	private void doReplaceConfiguration(MethodConfiguration oldObj, MethodConfiguration newObj)
-	{
-		if ( isReplaced(oldObj) ) {
-			return;
-		}
-		setReplaced(oldObj);
-		
-		List properties = oldObj.getInstanceProperties();
-		if (properties != null) {
-			for (int i = 0; i < properties.size(); i++) {
-				EStructuralFeature feature = (EStructuralFeature) properties.get(i);
-				// don't delete old feature values
-				Object newValue = newObj.eGet(feature);
-				setFeatureValue(oldObj, feature, newValue, false);
-			}
-		}
-	}
-
-// private void mergeElementList(List source, List target)
-// {
-// List ids = new ArrayList();
-// for ( Iterator it = target.iterator(); it.hasNext(); )
-// {
-// MethodElement e = (MethodElement)it.next();
-// ids.add(e.getGuid());
-// }
-//
-// for ( Iterator it = source.iterator(); it.hasNext(); )
-// {
-// MethodElement e = (MethodElement)it.next();
-// if ( !ids.contains(e.getGuid()) )
-// {
-// target.add(e);
-// }
-// }
-// }
-
-	/**
-	 * replace the plugin features, but not the plugin object and it's packages
-	 * 
-	 * @param oldObj
-	 *            MethodPlugin
-	 * @param newObj
-	 *            MethodPlugin
-	 */
-	private void doReplacePlugin(MethodPlugin oldObj, MethodPlugin newObj) {
-		if ( isReplaced(oldObj) ) {
-			return;
-		}
-		setReplaced(oldObj);
-		
-		List properties = oldObj.getInstanceProperties();
-		if (properties != null) {
-			for (int i = 0; i < properties.size(); i++) {
-				EStructuralFeature feature = (EStructuralFeature) properties.get(i);
-				if ( feature != UmaPackage.eINSTANCE.getMethodPlugin_MethodPackages() )
-				{
-					Object newValue = newObj.eGet(feature);
-					setFeatureValue(oldObj, feature, newValue, true);
-				}
-				/* No, don't do this, fix the diff manager to include the root package instead
-				 * 150895 - Import Config: CustomCategory did not sync up by import
-				else {
-					// custom categories package needs special handing
-					// we need to start with the root custom category otherwise
-					// all child categories will be lost
-					MethodPackage oldPkg = UmaUtil.findContentPackage(oldObj, ModelStructure.DEFAULT_CUSTOM_CATEGORY_PATH);
-// ContentPackage newPkg = UmaUtil.findContentPackage(newObj,
-// ModelStructure.DEFAULT.DEFAULT_CUSTOM_CATEGORY_PATH);
-					setReplaced(oldPkg);
-					
-					// find the root custom category and start from there
-					CustomCategory oldCC = TngUtil.getRootCustomCategory(oldObj);
-					CustomCategory newCC = TngUtil.getRootCustomCategory(newObj);
-					oldPkg = (MethodPackage)oldCC.eContainer();
-					setReplaced(oldPkg);
-					doReplaceElement(oldCC, newCC);
-				}
-				*/
-			}
-		}
-
-	}
-
-
-
-	/**
-	 * Replaces the atrributes and contained elements, but not the child
-	 * packages
-	 */
-	private void doReplacePackage(MethodPackage oldObj, MethodPackage newObj) {
-		if ( isReplaced(oldObj) ) {
-			return;
-		}
-		setReplaced(oldObj);
-
-		if ( debug ) {
-			System.out.println("Replacing package " + LibraryUtil.getTypeName(oldObj)); //$NON-NLS-1$
-		}
-		
-		List properties = oldObj.getInstanceProperties();
-		if (properties != null) {
-			for (int i = 0; i < properties.size(); i++) {
-				EStructuralFeature feature = (EStructuralFeature) properties.get(i);
-				if ( feature == UmaPackage.eINSTANCE.getMethodPackage_ChildPackages() )
-				{
-					continue;
-				}
-
-				Object newValue = newObj.eGet(feature);
-				setFeatureValue(oldObj, feature, newValue, true);
-			}
-		}
-
-	}
-
-// private MethodElement objOld = null;
-// private MethodElement objNew = null;
-// private void testIt() {
-// if ( objOld != null ) {
-// System.out.println("Old container =" + objOld.eContainer());
-// System.out.println("New container =" + objNew.eContainer());
-// if ( objOld.eContainer() == null ) {
-// System.out.println("old is gone!");
-// }
-// if ( objNew.eContainer() == null ) {
-// System.out.println("new is gone!");
-// }
-// }
-// }
-	
-	/**
-	 * replace the element by replacing the feature values, but don't replace
-	 * the object if it is marked as not replaceable. recursive the feature
-	 * value and replace it
-	 * 
-	 * @param oldObj
-	 *            MethodPlugin
-	 * @param newObj
-	 *            MethodPlugin
-	 */
-	private void doReplaceElement(MethodElement oldObj, MethodElement newObj) {
-		
-		// check if the element is already replaced or not
-		if ( isReplaced(oldObj) ) {
-			return;
-		}
-
-		if ( diffMgr.selectable(oldObj) ) {
-			return;
-		}
-
-		if ( !isSelected(oldObj) ) {
-			return;
-		}
-		
-		// if content description, check if it's changed or not
-		if ( (oldObj instanceof ContentDescription) && (newObj instanceof ContentDescription) ) {
-			if ( LibraryUtil.isIdentical((ContentDescription)oldObj, (ContentDescription)newObj) ) {
-				if (debug ) {
-					Resource res = oldObj.eResource();
-					if ( res != null ) {
-						System.out.println("Identical element not replaced: " + res.getURI().toFileString() );
-					}
-				}
-				
-				// even though the content is the same, we still need to copy the resources
-				scanResources(oldObj, true);
-				return;
-			} 
-		}
-		
-		// set repalced first to avoid calling into the same object recursively
-		setReplaced(oldObj);
-		
-		if ( debug ) {
-			System.out.println("Replacing element " + LibraryUtil.getTypeName(oldObj)); //$NON-NLS-1$
-		}
-
-		List properties = oldObj.getInstanceProperties();
-		if (properties != null) {
-			for (int i = 0; i < properties.size(); i++) {
-				EStructuralFeature feature = (EStructuralFeature) properties.get(i);
-
-				// package structure is handled by the diff tree
-				// so we don't process the related feature
-				if ( feature == UmaPackage.eINSTANCE.getMethodPlugin_MethodPackages()
-						|| feature == UmaPackage.eINSTANCE.getMethodPackage_ChildPackages() 
-						|| feature.isDerived() )
-				{
-					continue;
-				}
-
-				Object newValue = newObj.eGet(feature);
-				setFeatureValue(oldObj, feature, newValue, true);
-			}
-		}
-
-	}
-
-	/**
-	 * set the new value from the importing library to the old object in the
-	 * base library. if the value or onle of values are not replaceable, suach
-	 * as MethodLibrary, MethodPlugin, MethodPackage, etc, those values should
-	 * be substitued with the one in the old library
-	 * 
-	 * @param element
-	 * @param feature
-	 * @param value
-	 */
-	
-
-	static MethodElement newCont = null;
-	static MethodElement newElem = null;
-	private void setFeatureValue(MethodElement element, EStructuralFeature feature, Object newValue, boolean doDelete)
-	{		
-		if ( canIgnore(feature) ) {
-			return;
-		}
-		
-		boolean oldNotify = element.eDeliver();
-		try
-		{
-			// turn off notifications to avoid possible deadlock or thread issue
-			element.eSetDeliver(false);
-			
-			if ( canReset(feature) ) {
-				element.eSet(feature, newValue);
-			}
-			else if ( feature.isMany() && newValue instanceof List)
-			{
-				List oldValue = (List)element.eGet(feature);
-				ElementListDiff diff = new ElementListDiff(oldValue, (List)newValue);
-				if ( doDelete && diff.deletedItems.size() > 0 ) {
-					oldValue.removeAll(diff.deletedItems);
-					logRemovedElements(diff.deletedItems);
-					if ( debug ) {
-						System.out.println("  Deleting feature value, feature: " + feature.getName() + ",  element: "  //$NON-NLS-1$ //$NON-NLS-2$
-								+ LibraryUtil.getTypeName(element) + ", values: " +  diff.deletedItems); //$NON-NLS-1$
-					}
-				}
-
-				if ( diff.newItems.size() > 0 ) {					
-					// save the new elements and fix the references later
-					// note: the newly added feature values might not be REALLY
-					// new element to the base library
-					// it might be just a newly added reference, so check and
-					// make sure
-					// if it's old element, do replace again
-					for ( Iterator itn = diff.newItems.iterator(); itn.hasNext(); ) {
-						MethodElement newObj = (MethodElement)itn.next();
-						
-						// only process the new object if it's selected
-						if ( isSelected(newObj) ) {
-							MethodElement oldObj = diffMgr.getExistingElement(newObj.getGuid());
-							if ( oldObj == null ) {
-								oldValue.add(newObj);
-								logNewElement(newObj);							
-							} else {
-								oldValue.add(oldObj);
-								doReplaceElement(oldObj, newObj);
-							}
-						}
-					}
-					
-					if ( debug ) {
-						System.out.println("  Adding feature value, feature: " + feature.getName() + ",  element: "  //$NON-NLS-1$ //$NON-NLS-2$
-								+ LibraryUtil.getTypeName(element) + ", values: " +  diff.newItems); //$NON-NLS-1$
-					}
-					
-				}
-
-				if ( diff.oldNewMap.size() > 0 ) {
-					for ( Iterator it = diff.oldNewMap.entrySet().iterator(); it.hasNext(); ) {
-						Map.Entry entry = (Map.Entry) it.next();
-						MethodElement oldObj = (MethodElement)entry.getKey();
-						
-						// only process the new object if it's selected
-						if ( !isSelected(oldObj) ) {
-							continue;
-						}
-						
-						MethodElement newObj = (MethodElement)entry.getValue();
-						if ( canReset(oldObj) ) {
-							if ( debug ) {
-								System.out.println("  Resetting feature value, feature: " + feature.getName() + ",  element: "  //$NON-NLS-1$ //$NON-NLS-2$
-										+ LibraryUtil.getTypeName(element) + ", value: " +  LibraryUtil.getTypeName(oldObj)); //$NON-NLS-1$
-							}
-
-							EcoreUtil.replace(element, feature, oldObj, newObj);
-							logResetElement(newObj);
-						} else {
-							doReplaceElement(oldObj, newObj); 
-						}
-					}
-				}
-			}
-			else if (newValue instanceof MethodElement)
-			{
-				// if the old and new element are the same,
-				// only replace the feature value
-				MethodElement o = (MethodElement)element.eGet(feature);
-				MethodElement n = (MethodElement)newValue;
-				
-				// only process the new object if it's selected
-				if ( (o == null || isSelected(o)) && isSelected(n) ) {
-
-					if ( debug ) {
-						System.out.println("  Replacinging feature value, feature: " + feature.getName() + ",  element: "  //$NON-NLS-1$ //$NON-NLS-2$
-								+ LibraryUtil.getTypeName(element) + ", value: " +  LibraryUtil.getTypeName(o)); //$NON-NLS-1$
-					}
-	
-					if ( newValue instanceof ContentDescription ) {
-						// always replace content description (not reset) to
-						// reserve the existing resource (xmi file)
-						// since the contentDescription is unique the a method
-						// element, so we don't need to compare the guid
-												
-						// if both object has no container, there is no such
-						// description, ignore it
-						if ( o.eContainer() != null || n.eContainer() != null ) {
-							if ( o.eContainer() == null ) {
-								element.eSet(feature, o);
-							}
-							doReplaceElement(o, n);						
-						}
-					}
-					// if the element can be replaced, such as for
-					// ContentDescription element
-					// set the value directly
-					else if ( canReset(n) ) {
-						element.eSet(feature, newValue);
-						logNewElement(n);
-					}
-					else
-					{
-						if ( o != null && n != null && o.getGuid().equals(n.getGuid()) ) {
-							 doReplaceElement(o, n);
-						}
-						else {													
-							registerSetElement(element, feature, newValue);
-							
-							element.eSet(feature, newValue);
-							logNewElement(n);
-						}
-					}
-				}
-			}
-			else if ( feature == UmaPackage.eINSTANCE.getNamedElement_Name() ) {
-				// check difference name, if replace, need to rename resources if if has it's own resource
-				// like content elements, plugins, configuirations, and process components					
-				if (! (newValue instanceof String)) {
-					throw new UnsupportedOperationException();
-				}
-				String oldName = (String)element.eGet(feature);
-				if (!newValue.equals(oldName)) {					
-					ensureUniqueNameForExistingElement(element, oldName, (String) newValue, renameElementMap);										
-				}
-			} else {
-				element.eSet(feature, newValue);
-				
-				// scan and copy the resources
-				scanResources(element, feature, newValue);
-			}
-
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-		}
-		finally
-		{
-			element.eSetDeliver(oldNotify);
-		}
-	}
-
-	private void scanResources(MethodElement element, boolean recursive) {
-
-		if ( element == null ) {
-			return;
-		}
-		
-		List properties = element.getInstanceProperties();
-		if (properties != null) {
-			for (int i = 0; i < properties.size(); i++) {
-				EStructuralFeature feature = (EStructuralFeature) properties.get(i);
-				if ( !(feature instanceof EAttribute) ) {
-					continue;
-				}
-
-				Object value = element.eGet(feature);
-				scanResources(element, feature, value);
-			}
-		}
-		
-		if ( !recursive ) {
-			return;
-		}
-		
-		for (Iterator it = element.eAllContents(); it.hasNext(); ) {
-			EObject obj = (EObject)it.next();
-			
-			if (obj instanceof MethodLibrary
-					|| obj instanceof MethodPlugin 
-					|| obj instanceof MethodPackage 
-					|| obj instanceof MethodConfiguration) {
-				continue;
-			}
-			
-			if ( obj instanceof MethodElement ) {
-				scanResources((MethodElement)obj, false);
-			}
-		}
-	}
-	
-	private void scanResources(MethodElement element, EStructuralFeature feature, Object newValue) {
-		diagramHandler.registerElement(element);
-		
-		// scan the resources
-		if ( feature == UmaPackage.eINSTANCE.getGuidanceDescription_Attachments() ) {
-			// process the attachments
-			String urls = (String)newValue;
-			if ( (urls != null) && urls.length() != 0 ) {
-				StringTokenizer st = new StringTokenizer(urls, "|"); // this is hardcoded somehow
-				while (st.hasMoreTokens() ) {
-					String url = st.nextToken();
-					resScanner.copyResource (element, url);
-				}						
-			}
-		} else if ( newValue instanceof String ) {
-			resScanner.scan(element, newValue.toString());
-		} else if (newValue instanceof URI ) {
-			resScanner.copyResource ( ((URI)newValue).getPath());
-		}
-
-	}
-	
-	private void doAdd(EObject owner, MethodElement newObj) throws Exception {
-		if ( debug ) {
-			System.out.println("Adding element " + LibraryUtil.getTypeName((MethodElement)newObj)); //$NON-NLS-1$
-		}
-
-		// the owner can only be library and package
-		if (owner == null) {
-			return;
-		}
-		
-		ensureUniqueName(owner, newObj, renameElementMap);
-		
-		boolean error = false;
-		
-		if (owner instanceof MethodLibrary) {			
-			// can be configuration or plugin
-			if (newObj instanceof MethodPlugin) {
-				MethodPlugin plugin = (MethodPlugin)newObj;				
-				
-				checkModifiedFiles();				
-				error = ! fileCheckedOutStatus.isOK();				
-								
-				// don't intitialize the storage since this will recreate the global packages
-				// and such causing two set of global packages
-				// 145850 - Import Configuration: CP/DPs did not shown in authering
-				// ModelStorage.initialize(plugin);
-				// NO, since the global packages are already created
-				if (!error) {
-					((MethodLibrary)owner).getMethodPlugins().add(plugin);
-					LibraryUtil.saveLibrary((MethodLibrary)owner, false, false);
-				}
-								
-			} else if (newObj instanceof MethodConfiguration ) {
-				checkModifiedFiles();				
-				error = ! fileCheckedOutStatus.isOK();
-				if (!error) {
-					((MethodLibrary)owner).getPredefinedConfigurations().add(newObj);
-					LibraryUtil.saveLibrary((MethodLibrary)owner, false, false);
-				}
-			} else {
-				error = true;			
-			}
-		} else if ( (owner instanceof MethodPackage) 
-				&& (owner.eContainer() != null) 
-				&& (newObj instanceof MethodPackage) ) {
-			((MethodPackage)owner).getChildPackages().add(newObj);
-		} else {
-			error = true;
-		}
-			
-		if ( error ) {
-			String msg = "can't add " + LibraryUtil.getTypeName(newObj) //$NON-NLS-1$
-			+ " to " + LibraryUtil.getTypeName((MethodPackage)owner); //$NON-NLS-1$
-			
-			ImportPlugin.getDefault().getLogger().logError(msg); 
-			if ( debug ) {
-				System.out.println(msg);
-			}
-		} else {
-			logNewElement(newObj);
-		}
-	}
-
-	private boolean checkModifiedConfigs(MethodPlugin plugin) {
-		List configList = LibraryUtil.getAssociatedConfigurations(plugin);
-		List baseConfigs = baseLibrary.getPredefinedConfigurations();
-		Map baseConfigMap = new HashMap();
-		for (int i=0; i<baseConfigs.size(); i++) {
-			MethodConfiguration config = (MethodConfiguration) baseConfigs.get(i);
-			baseConfigMap.put(config.getGuid(), config);
-		}
-		final List modifiedFiles = new ArrayList();
-		for (int i=0; i<configList.size(); i++) {
-			MethodConfiguration config = (MethodConfiguration) configList.get(i);
-			config = (MethodConfiguration) baseConfigMap.get(config.getGuid());
-			if (config != null) {
-				Resource res = config.eResource();
-				if (res != null) {
-					modifiedFiles.add(res.getURI().toFileString());
-				}
-			}
-		}
-		SafeUpdateController.syncExec(new Runnable() {
-			public void run() {
-				fileCheckedOutStatus = FileModifyChecker.checkModify(modifiedFiles);
-			}
-		});
-		fileCheckOutError();
-		
-		return fileCheckedOutStatus.isOK();
-	}
-
-	private void doIntegrityCheck()
-	{		
-		// now the newly added elements may have feature value element that
-		// still pointing to the importing library
-		// we need to replace those with the one in the base library
-		while (newElements.size() > 0) {
-			MethodElement newObj = (MethodElement)newElements.remove(0);
-			try {
-				if ( newObj instanceof DiagramElement ) {
-					fixDiagram((DiagramElement)newObj);
-				} else {
-					fixNewElementReferences(newObj);
-				}
-			} catch (Exception e) {
-				if (debug) {
-					System.out.println("Exception while fixing new element " + LibraryUtil.getTypeName(newObj));
-				}
-				e.printStackTrace();
-			}
-		}
-		
-		// the configurations needs to be fixed
-		List configs = baseLibrary.getPredefinedConfigurations();
-		for ( Iterator it = configs.iterator(); it.hasNext(); )
-		{
-			MethodConfiguration config = (MethodConfiguration)it.next();
-			LibraryUtil.validateMethodConfiguration(config);
-		}
-	}
-
-	private List processedNewElements = new ArrayList();
-	
-	
-	
-	/**
-	 * iterate all features, if the feature value references an element which is
-	 * an old element, replace it with the old element. if the element is new,
-	 * iterate it's containment elements
-	 * 
-	 * @param newObj
-	 */
-	private void fixNewElementReferences(MethodElement newObj) {
-		if ( processedNewElements.contains(newObj) ) {
-			return;
-		}
-		
-		processedNewElements.add(newObj);
-		
-		if ( debug ) {
-			System.out.println("Fixing element " + LibraryUtil.getTypeName(newObj)); //$NON-NLS-1$
-		}
-		
-		List properties = newObj.getInstanceProperties();
-		if (properties != null) {
-			for (int i = 0; i < properties.size(); i++) {
-				EStructuralFeature feature = (EStructuralFeature) properties.get(i);
-				Object value = newObj.eGet(feature);
-
-				if ( value instanceof List) {
-					
-					// fixing the feature value may cause the list to change
-					// iterate on a new copy to avoid
-					// ConcurrentModificationException
-					for (Iterator it= new ArrayList(((List)value)).iterator(); it.hasNext(); ) {
-						Object o = it.next();
-						fixNewElementFeatureValue(newObj, feature, o);
-					}
-				} else {
-					fixNewElementFeatureValue(newObj, feature, value);
-				}
-			}
-		}	
-	}
-	
-	
-	private void fixDiagram(DiagramElement newObj) {		
-
-		if ( processedNewElements.contains(newObj) ) {
-			return;
-		}
-		
-		processedNewElements.add(newObj);
-		
-		if ( debug ) {
-			System.out.println("Fixing diagram element " + LibraryUtil.getTypeName(newObj)); //$NON-NLS-1$
-		}
-		
-		List properties = newObj.getInstanceProperties();
-		if (properties != null) {
-			for (int i = 0; i < properties.size(); i++) {
-				EStructuralFeature feature = (EStructuralFeature) properties.get(i);
-				Object value = newObj.eGet(feature);
-
-				if ( value instanceof List) {
-					
-					// fixing the feature value may cause the list to change
-					// iterate on a new copy to avoid
-					// ConcurrentModificationException
-					for (Iterator it= new ArrayList(((List)value)).iterator(); it.hasNext(); ) {
-						Object o = it.next();
-						if ( o instanceof MethodElement ) {
-							if ( feature == UmaPackage.eINSTANCE.getUMASemanticModelBridge_Element() ) {
-								fixNewElementFeatureValue(newObj, feature, o);
-							} else if ( (o instanceof DiagramElement) ) {
-								fixDiagram((DiagramElement)o);
-							} 
-						}
-					}
-				} else if ( value instanceof MethodElement ) {
-					if ( feature == UmaPackage.eINSTANCE.getUMASemanticModelBridge_Element() ) {
-						fixNewElementFeatureValue(newObj, feature, value);
-					} else if ( (value instanceof DiagramElement) ) {
-						fixDiagram((DiagramElement)value);
-					} 
-				}
-			}
-		}	
-	}
-	
-	/**
-	 * check if the value is an old element in the base, if yes, replace it with
-	 * the old one if it's new, iterate it's feature value
-	 * 
-	 * @param feature
-	 * @param obj
-	 */
-	private void fixNewElementFeatureValue(MethodElement element, EStructuralFeature feature, Object obj) {
-		if ( !(obj instanceof MethodElement) ) {
-			return;
-		}
-		
-		if ( debug ) {
-			System.out.println("fixing element feature value " + LibraryUtil.getTypeName(element) + ", feature=" + feature.getName()); //$NON-NLS-1$
-		}
-
-		boolean oldNotify = element.eDeliver();
-		try
-		{
-			element.eSetDeliver(false);
-			
-			MethodElement newObj = (MethodElement)obj;
-			MethodElement oldObj = getReplaced(newObj.getGuid());
-			if ( oldObj == null ) {
-				// get existing element, for example, the global packages in the
-				// configuration feature
-				oldObj = diffMgr.getExistingElement(newObj.getGuid());
-			}
-			
-			if ( oldObj == null ) {
-				// it's a new one
-				fixNewElementReferences(newObj);
-			} else {
-				
-				try {
-					// replace the newObj with the oldObj
-					EcoreUtil.replace(element, feature, newObj, oldObj); 
-				}
-				catch (Exception ex) {
-					// if replace failed, remove the feature
-					EcoreUtil.remove(element, feature, newObj); 
-					if (debug ) {
-						System.out.println("Replaceing feature value failed for element [" 
-								+ LibraryUtil.getTypeName(element) + "], feature [" 
-								+ feature.getName() + "], value=" 
-								+ newObj + ". The feature value is removed. ");
-						
-					}
-				}
-			}	
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-		}
-		finally
-		{
-			element.eSetDeliver(oldNotify);
-		}
-	}
-	
-	private boolean canReset(MethodElement e) {
-		boolean reset = false;
-		
-		// an element can be reset if you are sure that no other element(s)
-		// reference to it
-		// reset elements may have references to other elements in the importing
-		// library, that needs to be fixed later
-		
-		// for anything contained by ContentDescription, reset it
-		if ( e == null /* || e.eContainer() instanceof ContentDescription */
-				|| e instanceof DiagramElement) {
-			reset = true;
-		}
-				
-		return reset;
-	}
-
-	private boolean canReset(EStructuralFeature feature) {
-		// for anything contained by ContentDescription, reset it
-		// no don't reset the sections since it will cause the one in the
-		// importing library removed
-		// which caused problem for TaskDescription where the same feature
-		// (Steps) can't find the steps from the importing library
-		// which then will treat the steps in the base library being deteted
-// if ( feature == UmaPackage.eINSTANCE.getContentDescription_Sections()) {
-// return true;
-// }
-		return false;
-	}
-
-	private boolean canIgnore(EStructuralFeature feature) {
-		// don't reset the plugin lock status
-		if ( feature == UmaPackage.eINSTANCE.getMethodPlugin_UserChangeable()) {
-			return true;
-		}
-
-		// 146144 - Import Configuration: some unchange elements disappear in authoring after import
-		// this is caused by a bug in ArtifactImpl, when setContainerArtifact to null, 
-		//  it set the eContainer to null, if the eContainer is a content package, 
-		// the artifact is removed from the package
-		//  this bug will be fixed in M4. 
-		// for now, ignore this feature since this is an opposite feature, we don't need to handle it	
-		if ( feature == UmaPackage.eINSTANCE.getArtifact_ContainerArtifact() ) {
-			return true;
-		}
-		return false;
-	}
-	
-	private boolean isReplaced(MethodElement oldObj) {
-		return replacedElementMap.containsKey(oldObj.getGuid());
-	}
-
-	private void setReplaced(MethodElement oldObj) {
-		String guid = oldObj.getGuid();
-		if ( !replacedElementMap.containsKey(guid) ) {
-			replacedElementMap.put(guid, oldObj);
-			setModified(oldObj);
-		}
-	}
-	
-	/**
-	 * get the old element been replaced
-	 * 
-	 * @param oldObj
-	 * @return
-	 */
-	private MethodElement getReplaced(String guid) {
-		return (MethodElement)replacedElementMap.get(guid);
-	}
-	
-	/**
-	 * when new elements are added into the library, the associated resource
-	 * files must be copied over as well
-	 * 
-	 * @param newObj
-	 *            MethodElement
-	 */
-	private void copyNewElementResources(MethodElement newObj) {
-		
-//		List properties = newObj.getInstanceProperties();
-//		if (properties != null) {
-//			for (int i = 0; i < properties.size(); i++) {
-//				EStructuralFeature feature = (EStructuralFeature) properties.get(i);
-//				Object value = newObj.eGet(feature);
-//				if ( value instanceof URI ) {
-//					resScanner.copyResource(((URI)value).getPath());
-//				} else if ( value instanceof String ) {
-//					resScanner.scan(newObj, (String)value);
-//				}
-//			}
-//		}
-//		
-//		for ( Iterator it = newObj.eContents().iterator(); it.hasNext(); ) {
-//			Object o = it.next();
-//			if ( o instanceof MethodElement ) {
-//				copyNewElementResources((MethodElement)o);
-//			}
-//		}
-		
-		scanResources(newObj, true);
-	}
-	
-	private void logNewElement(MethodElement newObj) {
-		
-		// make sure the element is not in the original library
-		// since we have the guid-element map build up in the diff manager,
-		// check there
-		if ( !newElements.contains(newObj) && diffMgr.getExistingElement(newObj.getGuid()) == null) {
-			newElements.add(newObj);
-			copyNewElementResources(newObj);
-			setModified(newObj);
-		}
-	}
-	
-	private void logResetElement(MethodElement newObj) {
-		if ( !newElements.contains(newObj) ) {
-			newElements.add(newObj);
-			setModified(newObj);
-		}
-	}
-
-	private void logNewResource(Resource res ) {
-		if ( res != null ) {
-			
-			// mark the resource as dirty so that we can save it again
-			// the first save may lose cross references 
-			res.setModified(true);
-			String file = res.getURI().toFileString();
-			if ( !newResources.contains(file) ) {
-				newResources.add(file);
-			}
-		}
-	}
-	
-	private void logRemovedElements(List items) {
-		
-		if ( items == null || items.size() == 0 ) {
-			return;
-		}
-		
-		// removed elements can be removed from any feature
-		// check if the element's container is null
-		// if is, then the element is deleted and the resource should be deleted
-		// as well
-		for (Iterator it = items.iterator(); it.hasNext(); ) {
-			MethodElement e = (MethodElement)it.next();
-			if ( (e.eContainer() == null) && !deletedElements.contains(e) ) {			
-				deletedElements.add(e);
-			}			
-		}
-	}
-	
-	private void setModified(EObject obj) {
-		if ( obj != null ) {
-			Resource res = obj.eResource();
-			if ( res != null ) {
-				if ( !res.isModified() ) {
-					res.setModified(true);				
-				}
-// } else {
-// System.out.println("No resource for " + obj);
-				
-				if (debug && res.isModified() ) {
-					System.out.println("Modified: " + res.getURI().toFileString());
-				}
-
-			}
-		}
-	}
-
-	private List getModifiedResources(MethodLibrary lib) {
-		
-		// avoid the newly added element resources
-		List modifiedList = new ArrayList();
-		Resource res = lib.eResource();
-		if ( res != null ) {
-			ResourceSet resSet = res.getResourceSet();
-			for ( Iterator it = resSet.getResources().iterator(); it.hasNext(); ) {
-				res = (Resource) it.next();
-				if ( res != null && res.isModified() ) {
-					String file = res.getURI().toFileString();
-					if ( newResources.contains(file) ) {
-						continue;
-					}
-					
-					if ( debug ) {
-						System.out.println("Resource modified: " + file);
-					}		
-					modifiedList.add(file);
-				}
-			}
-		}
-		return modifiedList;
-	}
-
-	// clear resources for deleted elements
-	private void deleteResoruces() {
-		if ( deletedElements.size() == 0 ) {
-			return;
-		}
-		
-		IFileManager fileMgr = Services.getFileManager();
-
-		for (Iterator it = deletedElements.iterator(); it.hasNext(); ) {
-			MethodElement e = (MethodElement)it.next();
-			
-			EObject obj = null;
-			if ( e instanceof DescribableElement ) {
-				obj = ((DescribableElement)e).getPresentation();
-			} else if ( e instanceof ContentDescription ) {
-				obj = e;
-			}
-			if ( obj != null ) {
-				Resource res = obj.eResource();
-				if ( res != null ) {
-					String file = res.getURI().toFileString();
-					if ( debug ) {
-						System.out.println("deleting resource: " + file);
-					}
-					
-					if ( !fileMgr.delete(file) ) {
-						if ( debug ) {
-							System.out.println("unable to delete file: " + file);
-						}
-					}
-				}								
-			}
-		}
-	}
-
-	
-	public class ElementListDiff {
-
-		List newItems = new ArrayList();
-		List deletedItems = new ArrayList();
-		
-		// use LinkedHashMap to reserve the order of the values
-		Map oldNewMap = new LinkedHashMap();
-
-		// with the old and new list of MethodElements,
-		// find the common ones, the deleted ones, and the new ones
-		public ElementListDiff(List oldList, List newList) {
-			// Map oldListGuidMap = getGuidMap(oldList);
-			Map newListGuidMap = getGuidMap(newList);
-
-			newItems.addAll(newList);
-
-			for (Iterator it = oldList.iterator(); it.hasNext(); ) {
-				MethodElement oldObj = (MethodElement)it.next();
-				String guid = oldObj.getGuid();
-				Object newObj = newListGuidMap.get(guid);
-				if ( newObj != null ) {
-					oldNewMap.put(oldObj, newObj);
-					newItems.remove(newObj);
-				}
-				else
-				{
-					// it's been deleted
-					deletedItems.add(oldObj);
-				}
-			}
-		}
-
-		private Map getGuidMap(List items) {
-			Map m = new HashMap();
-			for (Iterator it= items.iterator(); it.hasNext(); ) {
-				MethodElement e = (MethodElement)it.next();
-				m.put(e.getGuid(), e);
-			}
-
-			return m;
-		}
-	}	
-	
-	/**
-	 * Handles name replacement.
-	 */
-	public static void handleNameReplace(Map renameElementMap) {
-		Iterator it = renameElementMap.entrySet().iterator();
-		while (it.hasNext()) {
-			Map.Entry entry = (Map.Entry) it.next();
-			Object[] val = (Object[])entry.getValue();
-			
-			MethodElement element = (MethodElement) val[0];
-			String newName = val.length == 4 ? element.getGuid() : (String) val[1];
-			rename(element, newName);
-			if (val.length == 4) {
-				element = (MethodElement) val[2];
-				newName = (String) val[3];
-				rename(element, newName);
-				
-				element = (MethodElement) val[0];
-				newName = (String) val[1];
-				rename(element, newName);
-			}
-		}
-		
-		//Make resouces dirty again, as rename process would mark resouce un-modified
-		it = renameElementMap.entrySet().iterator();
-		while (it.hasNext()) {
-			Map.Entry entry = (Map.Entry) it.next();
-			Object[] val = (Object[])entry.getValue();			
-			MethodElement element = (MethodElement) val[0];
-			element.eResource().setModified(true);
-		}
-	}
-	
-	private static void rename(MethodElement element, String newName) {
-		if (newName.equals(element.getName())) {
-			return;
-		}
-		if (element instanceof ContentDescription || element.eResource() == null) {
-			element.setName(newName);
-			if (element instanceof ProcessComponent) {
-				Process proc = ((ProcessComponent) element)
-						.getProcess();
-				proc.setName(newName);
-			}
-		} else {
-			LibraryView.runRename(element, newName);
-		}
-	}
-		
-	private void registerSetElement(MethodElement element, EStructuralFeature feature, Object newValue) {
-		String guid0 = ((MethodElement)newValue).getGuid();
-		String guid1 = element.getGuid();
-		Object[] val = new Object[3];
-		val[0] = feature;
-		val[1] = newValue;
-		val[2] = element;
-		if (setElementMap == null) {
-			setElementMap = new HashMap();
-		}
-		setElementMap.put(element.getName() + guid0 + guid1, val);
-	}
-	
-	private void handleSetElements() {
-		if (setElementMap == null) {
-			return;
-		}
-		for (Iterator it = setElementMap.entrySet().iterator(); it.hasNext();) {
-			Map.Entry entry = (Map.Entry) it.next();
-			Object[] val = (Object[])entry.getValue();
-			EStructuralFeature feature = (EStructuralFeature) val[0];
-			MethodElement newValue = (MethodElement) val[1];
-			MethodElement element = (MethodElement) val[2];
-			String guid = newValue.getGuid();
-			MethodElement mergedValue = (MethodElement) replacedElementMap.get(guid);
-			if (mergedValue != null && mergedValue != newValue) {
-				element.eSet(feature, mergedValue);
-			}			
-		}
-	}
-
-	/**
-	 * Ensures unique name.
-	 */
-	public static void ensureUniqueName(EObject owner, MethodElement newObj, Map renameElementMap) {
-		if (owner == null) {
-			return;
-		}
-		Class cls = newObj.getClass();
-		Map nameMap = new HashMap();
-		for (int i=0; i < owner.eContents().size(); i++) {
-			Object oldObj = owner.eContents().get(i);
-			if (oldObj.getClass() == cls && oldObj != newObj) {
-				MethodElement oldElem = (MethodElement) oldObj;
-				nameMap.put(oldElem.getName(), oldElem);
-			}
-		}
-		String name = newObj.getName();
-		String renamed = name;
-		while (nameMap.containsKey(renamed)) {
-			renamed += "_renamed";
-		}
-		if (renamed != name) {
-			newObj.setName(renamed);
-			
-			Object[] entryVal = new Object[4];
-			entryVal[0] = newObj;
-			entryVal[1] = name;
-			entryVal[2] = nameMap.get(name);
-			entryVal[3] = renamed;
-			renameElementMap.put(newObj.getGuid(), entryVal);			
-		}
-	}
-	
-	/**
-	 * Ensures unique name for existing element.
-	 */
-	public static void ensureUniqueNameForExistingElement(MethodElement element, String oldName, String newName, Map renameElementMap) {
-		EObject elementOwner = element.eContainer();					
-		if (elementOwner != null) {
-			element.setName(newName);
-			ensureUniqueName(elementOwner, element, renameElementMap);
-			if (!element.getName().equals(newName)) {	//if handled then return
-				return;
-			}			
-			element.setName(oldName);
-		}			
-		Object[] entryVal = new Object[2];
-		entryVal[0] = element;
-		entryVal[1] = newName;
-		renameElementMap.put(element.getGuid(), entryVal);
-	}
-
-	private void checkModifiedFiles() {
-		final List modifiedFiles = getModifiedResources(baseLibrary);
-		modifiedFiles.addAll(resScanner.getFilesTobeReplaced());
-		modifiedFiles.addAll(diagramHandler.getModifiedFiles());
-
-		SafeUpdateController.syncExec(new Runnable() {
-			public void run() {
-				fileCheckedOutStatus = FileModifyChecker.checkModify(modifiedFiles);
-			}
-		});
-	}
-
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/PluginImportData.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/PluginImportData.java
deleted file mode 100755
index c49e2bb..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/PluginImportData.java
+++ /dev/null
@@ -1,230 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.services;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.epf.authoring.ui.preferences.LibraryLocationData;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodPlugin;
-
-
-/**
- * Encapsulates the input data required to import a method plug-in.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class PluginImportData {
-
-	// these are set by the wizard
-	public LibraryLocationData llData = new LibraryLocationData();
-
-	public boolean deleteExistingPlugins;
-
-	// these are filled in by the importing service
-	public String libraryVersion;
-
-	private List plugins = new ArrayList();
-
-	private List configs = new ArrayList();
-
-	private ErrorInfo error = new ErrorInfo();
-
-	// ap the guid to url for base plugin, this is the only formation available
-	public Map basePluginUrlMap = new HashMap();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PluginImportData() {
-	}
-
-	/**
-	 * Clears the contents.
-	 */
-	public void clear() {
-		plugins.clear();
-		configs.clear();
-		error.errorMessage.setLength(0);
-	}
-
-	/**
-	 * Validates the plugins.
-	 */
-	public void validatePlugins() {
-		PluginInfo info;
-		int i = 0;
-		while (i < plugins.size()) {
-			info = (PluginInfo) plugins.get(i);
-			if (info.url == null) {
-				plugins.remove(i);
-			} else {
-				i++;
-			}
-		}
-	}
-
-	/**
-	 * Returns a PluginInfo object given the guid.
-	 */
-	public PluginInfo getPluginInfo(String guid) {
-		PluginInfo info;
-		for (Iterator it = plugins.iterator(); it.hasNext();) {
-			info = (PluginInfo) it.next();
-			if (info.guid.equals(guid)) {
-				return info;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Removes a PluginInfo object given the guid.
-	 */
-	public void removePluginInfo(String guid) {
-		PluginInfo info;
-		for (Iterator it = plugins.iterator(); it.hasNext();) {
-			info = (PluginInfo) it.next();
-			if (info.guid.equals(guid)) {
-				plugins.remove(info);
-				break;
-			}
-		}
-
-	}
-
-	/**
-	 * Returns a ConfiguarationInfo object given the guid.
-	 */
-	public ConfiguarationInfo getConfigInfo(String guid) {
-
-		if ( guid == null ) {
-			return null;
-		}
-		PluginImportData.ConfiguarationInfo cinfo;
-		for (Iterator it = getConfigs().iterator(); it.hasNext();) {
-			cinfo = (PluginImportData.ConfiguarationInfo) it.next();
-			if (guid.equals(cinfo.guid) ) {
-				return cinfo;
-			}
-		}
-		
-		return null;
-	}
-	
-	
-	/**
-	 * return a list of PluginInfo object
-	 * 
-	 * @return List a list of PluginInfo objects
-	 */
-	public List getPlugins() {
-		return plugins;
-	}
-
-	/**
-	 * return a list of ConfigInfo objects
-	 * 
-	 * @return List
-	 */
-	public List getConfigs() {
-		return configs;
-	}
-
-	/**
-	 * return the error message if any
-	 * 
-	 * @return String
-	 */
-	public ErrorInfo getErrorInfo() {
-		return error;
-	}
-
-	public class PluginInfo {
-
-		// If not null, this is a valid plug-in.
-		public String url = null;
-
-		public String name;
-
-		public String guid;
-
-		public String version;
-
-		public String brief_desc;
-
-		public String authors;
-
-		public String changeDate;
-
-		public List usedPlugins = new ArrayList();
-
-		// If null, this plug-in does not exists in the current library.
-		public MethodPlugin existingPlugin = null;
-
-		// If true, replace the current plug-in with the one in the import
-		// library. If false, don't import the plug-in.
-		public boolean selected = false;
-
-		public PluginInfo() {
-		}
-
-		public String toString() {
-			return name;
-		}
-	}
-
-	public class ConfiguarationInfo {
-
-		public String name;
-
-		public String guid;
-
-		public String version;
-
-		// The current configuration.
-		public MethodConfiguration existingConfig = null;
-
-		public boolean selected = true;
-
-		public ConfiguarationInfo() {
-		}
-
-	}
-
-	public class ErrorInfo {
-
-		private StringBuffer errorMessage = new StringBuffer();
-
-		public ErrorInfo() {
-
-		}
-
-		public void addError(String message) {
-			errorMessage.append(message);
-		}
-
-		public String getError() {
-			return errorMessage.toString();
-		}
-
-		public void clear() {
-			errorMessage.setLength(0);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/PluginImportingService.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/PluginImportingService.java
deleted file mode 100755
index f0f8c1c..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/PluginImportingService.java
+++ /dev/null
@@ -1,979 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.services;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Copy;
-import org.apache.tools.ant.types.FileSet;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.epf.authoring.ui.views.LibraryView;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.common.utils.XMLUtil;
-import org.eclipse.epf.export.services.ConfigurationExportService;
-import org.eclipse.epf.export.services.LibraryDocument;
-import org.eclipse.epf.importing.ImportPlugin;
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.library.util.ResourceUtil;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.persistence.migration.UpgradeCallerInfo;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.resourcemanager.ResourceManager;
-import org.eclipse.epf.services.ILibraryPersister;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-/**
- * Imports a method plug-in into the current library.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @author Weiping Lu
- * @since 1.0
- */
-public class PluginImportingService {
-
-	private UpgradeCallerInfo upGradeInfo;
-	
-	//Temp flag indicating use of the new merge scheme
-	private static boolean newMergeScheme = true; 
-	
-	private PluginImportData data;
-
-	LibraryDocument importingLibDoc;
-	LibraryDocument targetLibDoc;
-
-	// Flag to indicate the file checkout status.
-	IStatus fileCheckedOutStatus = null;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PluginImportingService(PluginImportData data) {
-		this.data = data;
-	}
-
-	/**
-	 * Validates the plug-in against the current library, collects all the
-	 * informations including plug-in info, configuation info and error info.
-	 * Call this method, then call getError(), getPlugins(), getConfigs().
-	 */
-	public void validate(IProgressMonitor monitor) {
-		try {
-			if (monitor != null) {
-				monitor.setTaskName(ImportResources.PluginImportingService_MSG0); //$NON-NLS-1$
-			}
-
-			if (this.data == null) {
-				return;
-			}
-
-			this.data.clear();
-
-			// Prepare the lib files.
-			File importingLibPath = new File(data.llData.getParentFolder()
-					+ File.separator + LibraryDocument.exportFile);
-			if (!importingLibPath.exists()) {
-				data
-						.getErrorInfo()
-						.addError(
-								NLS.bind(ImportResources.PluginImportingService_MSG1, importingLibPath.toString())); 
-				return;
-			}
-			
-			boolean handleVersion = true;
-			if (handleVersion) {
-				upGradeInfo = new ConfigurationImportService.UpgradeInfo(UpgradeCallerInfo.upgradeImportPlugin, importingLibPath);
-				if (! ConfigurationImportService.handleToolVersion(importingLibPath, upGradeInfo)) {
-					data
-					.getErrorInfo()
-					.addError(
-							NLS.bind(ImportResources.importPluginsWizard_ERR_Import_plugin, importingLibPath.toString())); 
-					return;
-				}
-				if (upGradeInfo.getCopiedLibFile() != null) {
-					importingLibPath = upGradeInfo.getCopiedLibFile();
-				}
-			} else {
-				String versionError = ConfigurationImportService.versionCheck(importingLibPath.getAbsolutePath(), 
-						ImportResources.importPluginsWizard_title);
-				if (versionError != null) {
-					data.getErrorInfo().addError(versionError);
-					return;
-				}
-			}
-
-			importingLibDoc = new LibraryDocument(importingLibPath);
-			
-			File libFile = new File(LibraryService.getInstance()
-					.getCurrentMethodLibrary().eResource().getURI()
-					.toFileString());
-			targetLibDoc = new LibraryDocument(libFile);
-
-			scanLibraryFile(importingLibDoc);
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-
-	}
-
-	/**
-	 * Performs import.
-	 */
-	public void performImport(IProgressMonitor monitor) throws Exception {
-
-		// need to disable the workspace refreshing
-		boolean refresh = RefreshJob.getInstance().isEnabled();
-		try {
-			if (refresh) {
-				// disable resource refreshing during import
-				//
-				RefreshJob.getInstance().setEnabled(false);
-			}
-
-			__doImport(monitor);
-
-		} finally {
-			if (refresh) {
-				// re-enable resource refreshing
-				//
-				RefreshJob.getInstance().setEnabled(true);
-			}
-			if (upGradeInfo != null) {
-				upGradeInfo.removeCopiedLibrary();
-				upGradeInfo = null;
-			}
-		}
-	}
-
-	private void __doImport(IProgressMonitor monitor) {
-		try {
-			if (monitor != null) {
-				monitor.setTaskName(ImportResources.PluginImportingService_MSG3); //$NON-NLS-1$
-			}
-
-			List unlockedPlugins = unlockPlugins();
-
-			// To import the plug-ins, we need to do the following:
-			// 1. Delete the plug-ins in the current library if user specify
-			// remove
-			// 2. Copy the selected plugin files to the destination
-			// 3. Update the library.xmi
-			// 4. Reload the library
-			
-			File libFile = targetLibDoc.getFile();
-			
-			if (newMergeScheme) {			
-				merge(targetLibDoc);
-				if (unlockedPlugins.size() > 0) {
-					lockUnlockedPlugins(unlockedPlugins);
-					LibraryService.getInstance().saveCurrentMethodLibrary();
-					LibraryService.getInstance().reopenCurrentMethodLibrary();
-				}
-				MethodLibrary lib = LibraryService.getInstance().getCurrentMethodLibrary();
-				ResourceUtil.refreshResources(lib, monitor);
-				return;
-			}			
-
-			// // Remove existing entries.
-			// removeExistingEntries(targetLibDoc);
-
-			// Import entries and copy files.
-			if (importEntries(targetLibDoc)) {
-				// Save the updated library file.
-				targetLibDoc.save();
-
-				// Replace the guid of the old MethodLibrary with the new one.
-				fixLibraryGuid(libFile.getParentFile(), importingLibDoc
-						.getLibraryGuid(), targetLibDoc.getLibraryGuid());
-
-				// Reopen the library.
-				LibraryService.getInstance().reopenCurrentMethodLibrary();
-
-				// Finally, re-lock the unlocked plugins and save the library
-				// again.
-				if (unlockedPlugins.size() > 0) {
-					lockUnlockedPlugins(unlockedPlugins);
-					LibraryService.getInstance().saveCurrentMethodLibrary();
-				}
-			}
-
-			// Re-open library and fresh the workspace.
-			LibraryService.getInstance().reopenCurrentMethodLibrary();
-
-			// refresh library files in workspace
-			//
-			MethodLibrary lib = LibraryService.getInstance().getCurrentMethodLibrary();
-			ResourceUtil.refreshResources(lib, monitor);
-
-		} catch (Exception e) {
-			ImportPlugin.getDefault().getLogger().logError(e);
-		}
-	}
-
-	private List unlockPlugins() {
-
-		List pluginIds = new ArrayList();
-
-		PluginImportData.PluginInfo info;
-		for (Iterator it = data.getPlugins().iterator(); it.hasNext();) {
-			info = (PluginImportData.PluginInfo) it.next();
-			if ((info.existingPlugin != null) && info.selected) {
-				if (info.existingPlugin.getUserChangeable().booleanValue() == false) {
-					info.existingPlugin.setUserChangeable(new Boolean(true));
-					pluginIds.add(info.existingPlugin.getGuid());
-				}
-			}
-		}
-
-		return pluginIds;
-	}
-
-	private void lockUnlockedPlugins(List unlockedPlugins) {
-		List plugins = LibraryService.getInstance().getCurrentMethodLibrary()
-				.getMethodPlugins();
-		for (Iterator it = plugins.iterator(); it.hasNext();) {
-			MethodPlugin plugin = (MethodPlugin) it.next();
-			if (unlockedPlugins.contains(plugin.getGuid())) {
-				plugin.setUserChangeable(new Boolean(false));
-			}
-		}
-	}
-
-	private boolean importEntries(LibraryDocument targetLibDoc) {
-		// 1. Find the entries to be removed.
-		List importList = new ArrayList();
-		List newList = new ArrayList();
-		PluginImportData.PluginInfo info;
-		for (Iterator it = data.getPlugins().iterator(); it.hasNext();) {
-			info = (PluginImportData.PluginInfo) it.next();
-			if (info.selected) {
-				if (info.existingPlugin == null) {
-					newList.add(info.guid);
-				}
-
-				importList.add(info.guid);
-			}
-		}
-
-		PluginImportData.ConfiguarationInfo cinfo;
-		for (Iterator it = data.getConfigs().iterator(); it.hasNext();) {
-			cinfo = (PluginImportData.ConfiguarationInfo) it.next();
-			if (cinfo.selected) {
-				if (cinfo.existingConfig == null) {
-					newList.add(cinfo.guid);
-				}
-
-				importList.add(cinfo.guid);
-
-			}
-		}
-
-		// 2. Iterate the docuemnt and add the new entries.
-		if (!newMergeScheme) {
-			importLibEntries(targetLibDoc, newList);
-		} else {
-			MethodLibrary lib = LibraryService.getInstance().getCurrentMethodLibrary();
-			ensureUniqueNames(lib.getMethodPlugins());
-			ensureUniqueNames(lib.getPredefinedConfigurations());
-		}
-		return copyFiles(targetLibDoc, importList, newList);
-	}
-
-	private void importLibEntries(LibraryDocument targetLibDoc, List newList) {
-
-		if (newList == null || newList.size() == 0) {
-			return;
-		}
-
-		// Add plug-ins.
-		NodeList nodes = importingLibDoc.getPlugins();
-		for (int i = 0; i < nodes.getLength(); i++) {
-			Element node = (Element) nodes.item(i);
-			String guid = LibraryDocument.getGuid(node);
-			if (newList.contains(guid)) {
-				targetLibDoc.addPlugin(node);
-			}
-		}
-
-		// Add configurations.
-		nodes = importingLibDoc.getConfigurations();
-		for (int i = 0; i < nodes.getLength(); i++) {
-			Element node = (Element) nodes.item(i);
-			String guid = LibraryDocument.getGuid(node);
-			if (newList.contains(guid)) {
-				targetLibDoc.addConfiguration(node);
-			}
-		}
-
-		// add resource entries
-		nodes = importingLibDoc.getResourceDescriptors();
-		for (int i = 0; i < nodes.getLength(); i++) {
-			Element node = (Element) nodes.item(i);
-			String guid = node.getAttribute(LibraryDocument.ATTR_id);
-			if (newList.contains(guid)) {
-				targetLibDoc.addResource(node);
-			}
-		}
-
-		// Add the resource sub managers.
-		nodes = importingLibDoc.getResourceSubManagers();
-		for (int i = 0; i < nodes.getLength(); i++) {
-			Element node = (Element) nodes.item(i);
-			String guid = LibraryDocument.getSubManagerBaseGuid(node
-					.getAttribute(LibraryDocument.ATTR_href));
-			if (newList.contains(guid)) {
-				targetLibDoc.addResource(node);
-			}
-		}
-
-	}
-
-	private boolean copyFiles(LibraryDocument targetLibDoc, List importList,
-			List newList) {
-
-		for (Iterator it = importList.iterator(); it.hasNext();) {
-			String guid = (String) it.next();
-			String src_uri = importingLibDoc.getResourceUri(guid);
-			String target_uri;
-			if (src_uri == null || src_uri.length() == 0) {
-				continue;
-			}
-
-			target_uri = src_uri;
-			/*
-			if (newList.contains(guid)) {
-				target_uri = src_uri;
-			} else {
-				target_uri = targetLibDoc.getResourceUri(guid); // the resource
-				// might be
-				// renamed
-			}
-			*/
-
-			// Check the plugin.xmi file. If it exists, copy the folder to
-			// the destination directory.
-			final File src_file = importingLibDoc.getFileFromUri(src_uri);
-			if (src_file.exists()) {
-				final File target_file = targetLibDoc
-						.getFileFromUri(target_uri);
-
-				// if it's a configuration, only copy the file,
-				// if it's a plugin, copy the whole directory
-
-				if (data.getPluginInfo(guid) != null) {
-					if (target_file.exists()) {
-						SafeUpdateController.syncExec(new Runnable() {
-							public void run() {
-								DirCopy copy = new DirCopy(src_file
-										.getParentFile(), target_file
-										.getParentFile());
-								fileCheckedOutStatus = copy.execute();
-							}
-						});
-					} else {
-						copyDir(src_file.getParentFile(), target_file
-								.getParentFile());
-					}
-				} else if (data.getConfigInfo(guid) != null && DirCopy.needCopy(src_file, target_file)) {
-					final List files = new ArrayList();
-					if (target_file.exists()) {
-						files.add(target_file.getAbsolutePath());
-						SafeUpdateController.syncExec(new Runnable() {
-							public void run() {
-								fileCheckedOutStatus = FileModifyChecker
-										.checkModify(files);
-							}
-						});
-					}
-
-					if (fileCheckedOutStatus == null
-							|| fileCheckedOutStatus.isOK()) {
-						ResourceHelper.copyFile(src_file, target_file);
-					}
-				}
-
-				if ((fileCheckedOutStatus != null)
-						&& !fileCheckedOutStatus.isOK()) {
-					// log error
-					SafeUpdateController.syncExec(new Runnable() {
-						public void run() {
-							String title = ImportResources.importPluginsWizard_title; //$NON-NLS-1$
-							String msg = ImportResources.importPluginsWizard_ERR_Import_plugin; //$NON-NLS-1$
-							new MsgDialog(ImportPlugin.getDefault())
-									.displayError(title, msg,
-											fileCheckedOutStatus);
-						}
-					});
-
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Copies directories from "fromDir" to "toDir".
-	 */
-	public static void copyDir(File fromDir, File toDir) {
-		Copy cp = new Copy();
-		cp.setOverwrite(true);
-		FileSet set = new FileSet();
-		set.setExcludes(ConfigurationExportService.excludes);
-		set.setDir(fromDir);
-		cp.addFileset(set);
-		cp.setTodir(toDir);
-		cp.setProject(new Project());
-		cp.execute();
-
-	}
-
-	// /**
-	// * remove the plugin entry from the library document
-	// *
-	// * @param document
-	// * LibraryDocument
-	// * @param guid
-	// * String guid of the plugin
-	// */
-	// private void removeExistingEntries(LibraryDocument document) {
-	// // 1. Find the entries to be removed.
-	// List removeList = new ArrayList();
-	// PluginImportData.PluginInfo info;
-	// for (Iterator it = data.getPlugins().iterator(); it.hasNext();) {
-	// info = (PluginImportData.PluginInfo) it.next();
-	// if ((info.existingPlugin != null) && info.selected) {
-	// removeList.add(info.guid);
-	// }
-	// }
-	//
-	// PluginImportData.ConfiguarationInfo cinfo;
-	// for (Iterator it = data.getConfigs().iterator(); it.hasNext();) {
-	// cinfo = (PluginImportData.ConfiguarationInfo) it.next();
-	// if ((cinfo.existingConfig != null) && cinfo.selected) {
-	// removeList.add(cinfo.guid);
-	// }
-	// }
-	//
-	// // 2. Iterate the docuemnt and remove the entries.
-	// document.removePlugins(removeList);
-	// document.removeConfigurations(removeList);
-	// document.removeResourceEntries(removeList);
-	// }
-
-	 /** 
-	  * Validates selection.
-	 */
-	public String validateSelection() {
-		data.getErrorInfo().clear();
-
-		// Iterate the new plugins, make sure the base is included
-		// either as an importing plugin, or is in the current library
-		// get the method plugins in the current library.
-		MethodLibrary library = LibraryService.getInstance()
-				.getCurrentMethodLibrary();
-		List plugins = (library == null) ? new ArrayList() : library
-				.getMethodPlugins();
-		Map pluginids = new HashMap();
-		for (Iterator it = plugins.iterator(); it.hasNext();) {
-			MethodPlugin plugin = (MethodPlugin) it.next();
-			pluginids.put(plugin.getGuid(), plugin);
-		}
-
-		// The base plug-ins MUST be either a selected one or an existing one
-		// otherwise, can't import
-		Set basePlugins = new HashSet();
-
-		Set newPlugins = new HashSet();
-		for (Iterator it = data.getPlugins().iterator(); it.hasNext();) {
-			PluginImportData.PluginInfo info = (PluginImportData.PluginInfo) it
-					.next();
-			if (info.selected && (info.existingPlugin == null)) {
-				newPlugins.add(info.guid);
-				for (Iterator itb = info.usedPlugins.iterator(); itb.hasNext();) {
-					Object base = itb.next();
-					if (!basePlugins.contains(base)) {
-						basePlugins.add(base);
-					}
-				}
-			}
-		}
-
-		if (newPlugins.size() > 0) {
-			for (Iterator it = basePlugins.iterator(); it.hasNext();) {
-				String guid = (String) it.next();
-				String uri = (String) data.basePluginUrlMap.get(guid);
-				if (!newPlugins.contains(guid) && !pluginids.containsKey(guid)) {
-					String message;
-					if (uri != null && uri.length() > 0) {
-						message = NLS.bind(ImportResources.PluginImportingService_MSG5, uri); 
-					} else {
-						Map<String, String> guidToPlugNameMap = importingLibDoc.getGuidToPlugNameMap();
-						String pluginName = guidToPlugNameMap == null ? null : guidToPlugNameMap.get(guid);
-						if (pluginName == null || pluginName.length() == 0) {
-							message = ImportResources.PluginImportingService_MSG6; 
-						} else {
-							message = NLS.bind(ImportResources.PluginImportingService_MSG5, 
-									pluginName + ", " + guid); 		//$NON-NLS-1$
-						}
-					}
-					data.getErrorInfo().addError(message);
-
-					if (uri == null || uri.length() == 0) {
-						break;
-					}
-				}
-			}
-		}
-
-		return data.getErrorInfo().getError();
-	}
-
-	private void scanLibraryFile(LibraryDocument document) {
-		visitLibTag(document);
-		visitResourceTag(document);
-		data.validatePlugins();
-
-		// Check base plug-in dependencies.
-		for (Iterator it = data.getPlugins().iterator(); it.hasNext();) {
-			PluginImportData.PluginInfo info = (PluginImportData.PluginInfo) it
-					.next();
-			if (info.existingPlugin == null) {
-				for (Iterator itbase = info.usedPlugins.iterator(); itbase
-						.hasNext();) {
-					String guid = (String) itbase.next();
-					if (!data.basePluginUrlMap.containsKey(guid)) {
-						data.basePluginUrlMap.put(guid, ""); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-	}
-
-	private void visitLibTag(LibraryDocument document) {
-		// Reload the element mapping.
-		NodeList nodes = document.getPlugins();
-		for (int i = 0; i < nodes.getLength(); i++) {
-			Element node = (Element) nodes.item(i);
-			PluginImportData.PluginInfo pi = data.new PluginInfo();
-			pi.guid = LibraryDocument.getGuid(node);
-			data.getPlugins().add(pi);
-
-			// Check with the current library, get the related information.
-			loadExistingPluginInfo(pi);
-		}
-
-		// Remove the unneeded configurations.
-		buildConfigInfoFromFiles();
-	}
-
-	private void visitResourceTag(LibraryDocument document) {
-		NodeList nodes = document.getResourceDescriptors();
-		for (int i = 0; i < nodes.getLength(); i++) {
-			Element node = (Element) nodes.item(i);
-			String guid = node.getAttribute(LibraryDocument.ATTR_id);
-			String uri = node.getAttribute(LibraryDocument.ATTR_uri);
-
-			// Load the plugin.xmi file for detail information.
-			File file = document.getFileFromUri(uri);
-
-			PluginImportData.PluginInfo pi = data.getPluginInfo(guid);
-			if (pi != null) {
-				if (file.exists()) {
-					loadPluginInfo(file, pi);
-				} else {
-					// Remove the plug-in info entry since thias is not
-					// a valid plug-in to import.
-					data.removePluginInfo(guid);
-				}
-			} else {
-				// if not plugin, might be a configuration
-				PluginImportData.ConfiguarationInfo ci = data
-						.getConfigInfo(guid);
-				if (ci != null) {
-					if (file.exists()) {
-						loadConfigInfo(file, ci);
-					}
-				}
-			}
-		}
-	}
-
-	protected void loadConfigInfo(File source,
-			PluginImportData.ConfiguarationInfo info) {
-		try {
-			Document document = XMLUtil.loadXml(source);
-			Element root = document.getDocumentElement();
-
-			Element configTag = null;
-			if (root.getTagName().equals(
-					"org.eclipse.epf.uma:MethodConfiguration")) //$NON-NLS-1$
-			{
-				configTag = root;
-			} else {
-				NodeList nodes = root
-						.getElementsByTagName("org.eclipse.epf.uma:MethodConfiguration"); //$NON-NLS-1$
-				if (nodes.getLength() > 0) {
-					configTag = (Element) nodes.item(0);
-				}
-			}
-
-			if (configTag != null) {
-				info.name = configTag.getAttribute("name"); //$NON-NLS-1$
-			}
-		} catch (Exception e) {
-			ImportPlugin.getDefault().getLogger().logError(e);
-		}
-	}
-
-	protected void loadPluginInfo(File source, PluginImportData.PluginInfo info) {
-		try {
-			Document document = XMLUtil.loadXml(source);
-			Element root = document.getDocumentElement();
-
-			Element pluginTag = null;
-			if (root.getTagName().equals("org.eclipse.epf.uma:MethodPlugin")) //$NON-NLS-1$
-			{
-				pluginTag = root;
-			} else {
-				NodeList nodes = root
-						.getElementsByTagName("org.eclipse.epf.uma:MethodPlugin"); //$NON-NLS-1$
-				if (nodes.getLength() > 0) {
-					pluginTag = (Element) nodes.item(0);
-				}
-			}
-
-			if (pluginTag != null) {
-				info.name = pluginTag.getAttribute("name"); //$NON-NLS-1$
-				info.version = LibraryDocument.getChildValue(pluginTag,
-						"version"); //$NON-NLS-1$
-				info.brief_desc = LibraryDocument.getChildValue(pluginTag,
-						"briefDescription"); //$NON-NLS-1$
-				info.authors = LibraryDocument.getChildValue(pluginTag,
-						"authors"); //$NON-NLS-1$
-				info.changeDate = LibraryDocument.getChildValue(pluginTag,
-						"changeDate"); //$NON-NLS-1$
-				info.url = source.toString();
-
-				// Get the base plug-ins.
-				NodeList nodes = pluginTag.getElementsByTagName("bases"); //$NON-NLS-1$
-				for (int i = 0; i < nodes.getLength(); i++) {
-					Element node = (Element) nodes.item(i);
-					String guid = node.getAttribute(LibraryDocument.ATTR_href);
-
-					int indx = guid.indexOf("#"); //$NON-NLS-1$
-					if (indx > 0) {
-						guid = guid.substring(indx + 1);
-					} else {
-						indx = guid.indexOf("uma://"); //$NON-NLS-1$
-						if (indx >= 0) {
-							guid = guid.substring(indx + 6);
-						}
-					}
-					info.usedPlugins.add(guid);
-				}
-			}
-		} catch (Exception e) {
-			ImportPlugin.getDefault().getLogger().logError(e);
-		}
-	}
-
-	private void loadExistingPluginInfo(PluginImportData.PluginInfo info) {
-		MethodLibrary library = LibraryService.getInstance()
-				.getCurrentMethodLibrary();
-		List plugins = (library == null) ? new ArrayList() : library
-				.getMethodPlugins();
-		for (Iterator it = plugins.iterator(); it.hasNext();) {
-			MethodPlugin plugin = (MethodPlugin) it.next();
-			if (plugin.getGuid().equals(info.guid)) {
-				info.existingPlugin = plugin;
-			}
-		}
-	}
-
-	private void loadExistingConfigInfo(PluginImportData.ConfiguarationInfo info) {
-		MethodConfiguration[] configs = LibraryServiceUtil
-				.getMethodConfigurations(LibraryService.getInstance()
-						.getCurrentMethodLibrary());
-		if (configs == null || configs.length == 0) {
-			return;
-		}
-
-		for (int i = 0; i < configs.length; i++) {
-			MethodConfiguration config = configs[i];
-			if (config.getGuid().equals(info.guid)) {
-				info.existingConfig = config;
-			}
-		}
-	}
-
-	/**
-	 * Replaces the guid of the old method library with the new one.
-	 * <p>
-	 * Search for the following files: library.xmi, plugin.xmi, model.xmi.
-	 */
-	private void fixLibraryGuid(File path, String oldGuid, String newGuid) {
-		if (!path.isDirectory()) {
-			return;
-		}
-
-		File[] files = path.listFiles(new FileFilter() {
-
-			public boolean accept(File f) {
-
-				if (f.isDirectory()) {
-					return true;
-				}
-
-				String name = f.getName();
-				return name.equals("library.xmi") || name.equals("plugin.xmi") || name.equals("model.xmi"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			}
-		});
-
-		if (files == null || files.length == 0) {
-			return;
-		}
-
-		for (int i = 0; i < files.length; i++) {
-			if (files[i].isDirectory()) {
-				fixLibraryGuid(files[i], oldGuid, newGuid);
-			} else {
-				// Read in the file, update it and save the file.
-				try {
-					String source = FileUtil.readFile(files[i],
-							FileUtil.ENCODING_UTF_8).toString();
-					if (source.indexOf(oldGuid) >= 0) {
-						// TODO: This is a regexp repalcement, is it safe?
-						source = source.replaceAll(oldGuid, newGuid);
-
-						FileUtil.writeUTF8File(files[i].getAbsolutePath(),
-								source);
-					}
-
-				} catch (IOException e) {
-					ImportPlugin.getDefault().getLogger().logError(e);
-				}
-			}
-		}
-	}
-	
-	private void merge(LibraryDocument targetLibDoc) throws Exception {
-		//Copy files only as newMergeScheme = true
-		importEntries(targetLibDoc);
-		
-		MethodLibrary lib = LibraryService.getInstance().getCurrentMethodLibrary();
-		Resource res0 = lib.eResource();
-		ResourceManager resMgr0 = (ResourceManager) MultiFileSaveUtil.getResourceManager(res0);
-		ResourceSet resSet = res0.getResourceSet();
-		
-		mergePlugins(targetLibDoc, lib, resMgr0, resSet);		
-		mergeConfigs(targetLibDoc, lib, resMgr0, resSet);
-		
-		lib.eResource().setModified(true);
-		
-		//LibraryUtil.saveLibrary(lib, false, false);
-		ILibraryPersister.FailSafeMethodLibraryPersister persister = LibraryServiceUtil.getCurrentPersister().getFailSafePersister();
-		try {
-			persister.save(lib.eResource());
-			persister.commit();
-		} catch (Exception e) {
-			persister.rollback();
-			e.printStackTrace();
-		}	
-		
-		//fixLibraryGuid(targetLibDoc.getFile().getParentFile(), importingLibDoc
-		//		.getLibraryGuid(), targetLibDoc.getLibraryGuid());
-		
-		LibraryService.getInstance().reopenCurrentMethodLibrary();
-	}
-
-	private void mergePlugins(LibraryDocument targetLibDoc, MethodLibrary lib, ResourceManager resMgr0, ResourceSet resSet) {
-		List existingPluginGuids = null;
-		for (Iterator it = data.getPlugins().iterator(); it.hasNext();) {
-			PluginImportData.PluginInfo info = (PluginImportData.PluginInfo) it.next();
-			if (info.selected && info.existingPlugin != null) {
-				if (existingPluginGuids == null) {
-					existingPluginGuids = new ArrayList();
-				}
-				existingPluginGuids.add(info.guid);
-			}
-		}
-		
-		Map pgToRgMap = importingLibDoc.buildPluginGuidToResMgrGuidMap(existingPluginGuids);				
-		
-		for (Iterator it = data.getPlugins().iterator(); it.hasNext();) {
-			PluginImportData.PluginInfo info = (PluginImportData.PluginInfo) it.next();
-			if (info.selected && info.existingPlugin == null) {
-				mergeElement(info.guid, targetLibDoc, lib, resMgr0, resSet, lib.getMethodPlugins());
-			} else if (info.selected && pgToRgMap != null) {	//151786
-				Resource res = info.existingPlugin.eResource();
-				ResourceManager resMgr = (ResourceManager) MultiFileSaveUtil.getResourceManager(res);
-				String existingGuid = resMgr.getGuid();
-				String importedGuid = (String) pgToRgMap.get(info.guid);
-				if (importedGuid != null && !importedGuid.equals(existingGuid)) {
-					resMgr.setGuid(importedGuid);
-				}
-			}
-		}
-	}
-	
-	private void mergeConfigs(LibraryDocument targetLibDoc, MethodLibrary lib, ResourceManager resMgr0, ResourceSet resSet) {
-		for (Iterator it = data.getConfigs().iterator(); it.hasNext();) {
-			PluginImportData.ConfiguarationInfo info = (PluginImportData.ConfiguarationInfo) it.next();
-			if (info.selected && info.existingConfig == null) {
-				mergeElement(info.guid, targetLibDoc, lib, resMgr0, resSet, lib.getPredefinedConfigurations());
-			}					
-		}
-	}
-	
-	private void mergeElement(String guid, LibraryDocument targetLibDoc, 
-			MethodLibrary lib, ResourceManager resMgr0, ResourceSet resSet, List elements){
-		String src_uri = importingLibDoc.getResourceUri(guid);
-		if (src_uri == null || src_uri.length() == 0) {
-			return;
-		}
-		File target_file = targetLibDoc.getFileFromUri(src_uri);
-		String path = target_file.getAbsolutePath();
-		
-		URI uri = URI.createFileURI(path);
-		Resource res = resSet.getResource(uri, true);
-		MethodElement element = PersistenceUtil.getMethodElement(res);
-		elements.add(element);		
-		
-		MultiFileSaveUtil.registerWithResourceManager(resMgr0, element, uri);
-		ResourceManager resMgr = (ResourceManager) MultiFileSaveUtil.getResourceManager(res);
-		if (resMgr != null) {
-			resMgr0.getSubManagers().add(resMgr);
-		}
-	}		
-	
-	private void buildConfigInfoFromFiles() {	
-		File copiedLibPath = upGradeInfo == null ? null : upGradeInfo.getCopiedLibFile();
-		File importingLibPath = copiedLibPath == null ? new File(data.llData.getParentFolder()
-				+ File.separator + LibraryDocument.exportFile) : copiedLibPath;
-		File configDir = new File(importingLibPath.getParent(), MultiFileSaveUtil.METHOD_CONFIGURATION_FOLDER_NAME);
-		
-		LibraryDocument.ConfigDocVisitor visitor = new LibraryDocument.ConfigDocVisitor() {
-			public void visit(File file, Element node) {
-				PluginImportData.ConfiguarationInfo ci = data.new ConfiguarationInfo();
-				ci.guid = node.getAttribute(LibraryDocument.ATTR_guid);
-				ci.name = node.getAttribute("name"); //$NON-NLS-1$
-				String uri = MultiFileSaveUtil.METHOD_CONFIGURATION_FOLDER_NAME + File.separator + file.getName();
-				importingLibDoc.addToGuidToUriMap(ci.guid, uri);
-				data.getConfigs().add(ci);
-				// Check with the current library, get the related information.
-				loadExistingConfigInfo(ci);
-				if (ci.existingConfig != null) {
-					URI resUri = ci.existingConfig.eResource().getURI();
-					uri = MultiFileSaveUtil.METHOD_CONFIGURATION_FOLDER_NAME + File.separator + resUri.lastSegment();
-					uri = targetLibDoc.decodeUri(uri);
-					targetLibDoc.addToGuidToUriMap(ci.guid, uri);
-				}
-			}
-		};
-		
-		LibraryDocument.visitConfigFiles(configDir, visitor);				
-	}
-	
-	private void ensureUniqueNames(List elements) {
-		if (elements.isEmpty()) {
-			return;
-		}
-		Map nameMap = new HashMap();
-		for (int i=0; i < elements.size(); i++) {
-			MethodElement elem = (MethodElement) elements.get(i);
-			nameMap.put(elem.getName().toUpperCase(), elem);
-		}
-		
-		List importedList = new ArrayList();
-		List importedExistList = new ArrayList();
-		if (elements.get(0) instanceof MethodPlugin) {
-			for (Iterator it = data.getPlugins().iterator(); it.hasNext();) {
-				PluginImportData.PluginInfo info = (PluginImportData.PluginInfo) it.next();
-				if (info.selected) {
-					if (info.existingPlugin == null || 
-							!info.existingPlugin.getName().equals(info.name)) {
-						importedList.add(info.name);
-						if (info.existingPlugin != null) {
-							importedExistList.add(info);
-						}
-					}
-				}
-			}
-		} else {
-			for (Iterator it = data.getConfigs().iterator(); it.hasNext();) {
-				PluginImportData.ConfiguarationInfo info = (PluginImportData.ConfiguarationInfo) it.next();
-				if (info.selected) {
-					if (info.existingConfig == null || 
-							!info.existingConfig.getName().equals(info.name)) {
-						importedList.add(info.name);
-						if (info.existingConfig != null) {
-							importedExistList.add(info);
-						}
-					}
-				}				
-			}
-		}
-		for (int i=0; i<importedList.size(); i++) {
-			String name = (String) importedList.get(i);
-			String renamed = name;
-			while (nameMap.containsKey(renamed.toUpperCase())) {
-				renamed += "_renamed";
-			}
-			if (renamed != name) {
-				MethodElement elem = (MethodElement) nameMap.get(name.toUpperCase());
-				LibraryView.runRename(elem, renamed);
-			}			
-		}				
-		for (int i=0; i<importedExistList.size(); i++) {
-			Object info = importedExistList.get(i);
-			MethodElement elem = info instanceof PluginImportData.PluginInfo ? 
-					(MethodElement)((PluginImportData.PluginInfo) info).existingPlugin :
-					(MethodElement)((PluginImportData.ConfiguarationInfo) info).existingConfig;
-			String newName = info instanceof PluginImportData.PluginInfo ? 
-					(String)((PluginImportData.PluginInfo) info).name :
-					(String)((PluginImportData.ConfiguarationInfo) info).name;								
-			LibraryView.runRename(elem, newName);		
-		}	
-		
-		
-		
-	}
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ResourceScanner.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ResourceScanner.java
deleted file mode 100755
index a49be41..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/ResourceScanner.java
+++ /dev/null
@@ -1,229 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.services;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.epf.library.util.ResourceHelper;
-import org.eclipse.epf.uma.MethodElement;
-
-
-/**
- * utility class to scan and copy resources from the source library to the target library
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public class ResourceScanner {
-
-	public static final Pattern p_src_ref = Pattern.compile("src\\s*=\\s*\"(.*?)\"", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
-//	protected static final Pattern p_link_ref = Pattern.compile("<a\\s+?([^>]*)>(.*?)</a>", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
-	public static final Pattern p_href_ref = Pattern.compile("href\\s*=\\s*\"(.*?)\"", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
-
-	File srcLibRoot;
-	File targetLibRoot;
-	
-	private Map newFileMap = new HashMap();
-	private Map existingFileMap = new HashMap();
-	
-	/**
-	 * Creates a new instance.
-	 */	
-	public ResourceScanner(File srcLibRoot, File targetLibRoot) {
-		this.srcLibRoot = srcLibRoot;
-		this.targetLibRoot = targetLibRoot;
-	}
-	
-	/**
-	 * scan th etext and copy the resources
-	 * @param owner MethodElement
-	 * @param source String
-	 */
-	public void scan(MethodElement owner, String source) {
-		
-		try
-		{
-			// process images and other src resources
-			Matcher m = p_src_ref.matcher(source);
-			while ( m.find() )
-			{
-				String url = m.group(1);
-				processUrl(owner, url);
-			}
-
-			// process hrefs
-			m = p_href_ref.matcher(source);
-			
-			while ( m.find() )
-			{
-				String url = m.group(1);
-				processUrl(owner, url);
-			}			
-		}
-		catch (Exception ex)
-		{
-			ex.printStackTrace();
-		}
-	}
-	
-	/**
-	 * process the url and copy the resource
-	 * if the owner element is specified, the url is relative to the owner element, 
-	 *otherwise it's relative to the library
-	 *
-	 * @param owner
-	 * @param url
-	 */
-	private void processUrl(MethodElement owner, String url) {
-		
-		if ( url == null ) {
-			return;
-		}
-		
-		int index = url.indexOf("#"); //$NON-NLS-1$
-		if ( index >= 0 )
-		{
-			url = url.substring(0, index);
-		}
-		
-		index = url.indexOf("?"); //$NON-NLS-1$
-		if ( index >= 0 )
-		{
-			url = url.substring(0, index);
-		}
-		
-		if (url.trim().length() == 0 ) {
-			return;
-		}
-		
-		// the url is relative to the owner element
-		// need to convert to the path relative to the library root
-		File srcFile = null;
-		File targetFile = null;
-		try {
-			if ( owner != null ) {
-				String elementPath = ResourceHelper.getElementPath(owner);
-				srcFile = new File(new File(srcLibRoot, elementPath), url);		
-				targetFile = new File(new File(targetLibRoot, elementPath), url);	
-			} else {
-				srcFile = new File(srcLibRoot, url);		
-				targetFile = new File(targetLibRoot, url);				
-			}
-			
-			if ( srcFile.isFile() && srcFile.exists() ) {
-
-				srcFile = srcFile.getCanonicalFile();
-				targetFile = targetFile.getCanonicalFile();
-				
-				if ( targetFile.exists() ) {
-					if ( !existingFileMap.containsKey(srcFile) ) {
-						if ( srcFile.length() != targetFile.length() 
-								|| srcFile.lastModified() != targetFile.lastModified() )
-						{
-							existingFileMap.put(srcFile, targetFile);
-						}
-					}
-				} else {
-					if ( !newFileMap.containsKey(srcFile) ) {
-						newFileMap.put(srcFile, targetFile);
-					}
-				}
-			}
-		} catch (IOException e) {
-			// Log the error and proceed. TODO
-			e.printStackTrace();
-		}
-
-	}
-	
-	/**
-	 * Copies resource.
-	 */
-	public void copyResource(String url) {
-		processUrl(null, url);
-	}
-	
-	/**
-	 * Copies resource.
-	 */
-	public void copyResource(MethodElement owner, String url) {
-		processUrl(owner, url);
-	}
-	
-	/**
-	 * return a list of all the files to be replaced
-	 * @return List a list of file path string
-	 */
-	public List getFilesTobeReplaced() {
-		List files = new ArrayList();
-		if ( existingFileMap.size() > 0 ) {
-			for (Iterator it = existingFileMap.values().iterator(); it.hasNext(); ) {
-				File f = (File)it.next();
-				if (f != null ) {
-					String path = f.getAbsolutePath();
-					if ( !files.contains(path) ) {
-						files.add(path);
-					}
-				}
-			}
-		}
-		
-		return files;
-	}
-	
-	/**
-	 * copy all the files to the destination
-	 *
-	 */
-	public void execute() {
-		
-		for (Iterator it = newFileMap.entrySet().iterator(); it.hasNext(); ) {
-			Map.Entry entry = (Map.Entry)it.next();
-			File srcFile = (File) entry.getKey();
-			File targetFile = (File) entry.getValue();
-			ResourceHelper.copyFile(srcFile, targetFile);
-			
-			System.out.println("File copied: " + srcFile);
-		}	
-		
-		for (Iterator it = existingFileMap.entrySet().iterator(); it.hasNext(); ) {
-			Map.Entry entry = (Map.Entry)it.next();
-			File srcFile = (File) entry.getKey();
-			File targetFile = (File) entry.getValue();
-			ResourceHelper.copyFile(srcFile, targetFile);
-			
-			System.out.println("File copied: " + srcFile);
-		}	
-	}
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/package.html b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/package.html
deleted file mode 100755
index bfb1116..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces and implementation for the method plug-in and configuration import services.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/DiffReportContentProvider.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/DiffReportContentProvider.java
deleted file mode 100755
index f1f7643..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/DiffReportContentProvider.java
+++ /dev/null
@@ -1,119 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.wizards;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.importing.services.ElementDiffTree;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * The content provider for the diff report.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class DiffReportContentProvider implements ITreeContentProvider {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public DiffReportContentProvider() {
-	}
-
-
-	/**
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		if (inputElement instanceof ElementDiffTree) {
-			
-			MethodElement e = ((ElementDiffTree)inputElement).getBaseElement();
-			
-			// don't show sub-packages under process component, hide the process detial
-			if ( (e instanceof ProcessComponent) ) {
-				return new Object[] {};
-			}
-
-			List items = ((ElementDiffTree) inputElement).getChildren();
-			if (items != null) {
-				List dirtyItems = new ArrayList();
-				for (Iterator it = items.iterator(); it.hasNext();) {
-					ElementDiffTree item = (ElementDiffTree) it.next();
-					if (item.isOldOnly()) {
-						continue;
-					}
-					
-					// 150895Import Config: CustomCategory did not sync up by import
-					// to fix this problem, we need to include the Hidden root customCategory package 
-					// but need to hide here
-					MethodElement base = item.getBaseElement();
-					if ( (base instanceof MethodPackage) 
-							&& TngUtil.isRootCutomCategoryPackage((MethodPackage)base) ) {
-						continue;
-					}
-					
-					dirtyItems.add(item);
-				}
-
-				return dirtyItems.toArray();
-			}
-		}
-		return new Object[] {};
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		return getElements(parentElement);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object element) {
-		if (element instanceof ElementDiffTree) {
-			return ((ElementDiffTree) element).getParent();
-		}
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object element) {
-		if (element instanceof ElementDiffTree) {
-			return ((ElementDiffTree) element).hasChildren();
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/DiffReportLabelProvider.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/DiffReportLabelProvider.java
deleted file mode 100755
index 6ac6cfb..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/DiffReportLabelProvider.java
+++ /dev/null
@@ -1,115 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.wizards;
-
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.importing.services.ElementDiffTree;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * The label provider for the diff report.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class DiffReportLabelProvider implements ILabelProvider,
-		ITableLabelProvider {
-
-	
-	/**
-	 * Creates a new instance.
-	 */
-	public DiffReportLabelProvider() {
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object object) {
-		return null;
-	}
-
-	protected Image getImageFromObject(Object object) {
-		return ExtendedImageRegistry.getInstance().getImage(object);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
-	 */
-	public Image getColumnImage(Object object, int columnIndex) {
-		if (columnIndex == 0) {
-			return this.getImage(object);
-		}
-
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
-	 */
-	public String getColumnText(Object object, int columnIndex) {
-		if (object instanceof ElementDiffTree) {
-			ElementDiffTree diffTree = (ElementDiffTree) object;
-			if (columnIndex == 0) {
-				return diffTree.getName();
-
-			} else if (columnIndex == 1) {
-				return diffTree.getContentType();
-			} else if (columnIndex == 2) {
-				return (diffTree.getImportElement() == null) ? "" : ImportResources.DiffReportLabelProvider_yes; 
-			} else if (columnIndex == 3) {
-				return (diffTree.getBaseElement() == null) ? "" : ImportResources.DiffReportLabelProvider_yes; 
-			} else if (columnIndex == 4) {
-				return diffTree.getDiffMessage();
-			}
-		}
-
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object object) {
-		return this.getColumnText(object, 0);
-	}
-
-	/**
-	 * Since we won't ever generate these notifications, we can just ignore
-	 * this.
-	 */
-	public void addListener(ILabelProviderListener listener) {
-	}
-
-	/**
-	 * Since we won't ever add listeners, we can just ignore this.
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-	}
-
-	/**
-	 * Always returns true for now.
-	 */
-	public boolean isLabelProperty(Object object, String id) {
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-	}
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/DiffReportViewer.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/DiffReportViewer.java
deleted file mode 100755
index 446f237..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/DiffReportViewer.java
+++ /dev/null
@@ -1,185 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.wizards;
-
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.importing.services.ConfigurationImportData;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-
-/**
- * Displays the before and after method library differences for an import
- * operation.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class DiffReportViewer {
-
-	protected Composite parent;
-
-	protected CheckboxTreeViewer treeViewer;
-
-	ConfigurationImportData data;
-	
-	/**
-	 * Creates a new instance.
-	 */
-	DiffReportViewer(Composite parent, ConfigurationImportData data) {
-		this.parent = parent;
-		this.data = data;
-		
-		treeViewer = new CheckboxTreeViewer(parent);
-		treeViewer.getControl()
-				.setLayoutData(new GridData(GridData.FILL_BOTH));
-		treeViewer.setContentProvider(new DiffReportContentProvider());
-		treeViewer.setLabelProvider(new DiffReportLabelProvider());
-		createTableColumns();
-		
-		addListeners();
-		
-	}
-
-	/**
-	 * Creates the table columns.
-	 */
-	private void createTableColumns() {
-		Tree tree = treeViewer.getTree();
-		tree.setLayoutData(new GridData(GridData.FILL_BOTH));
-		tree.setHeaderVisible(true);
-		tree.setLinesVisible(true);
-
-		TreeColumn column = new TreeColumn(tree, SWT.NONE, 0);
-		column.setText(ImportResources.DiffReportViewer_content); //$NON-NLS-1$
-		column.setWidth(200);
-
-		column = new TreeColumn(tree, SWT.NONE, 1);
-		column.setText(ImportResources.DiffReportViewer_type); //$NON-NLS-1$
-		column.setWidth(150);
-
-		column = new TreeColumn(tree, SWT.NONE, 2);
-		column.setText(ImportResources.DiffReportViewer_in_import); //$NON-NLS-1$
-		column.setWidth(75);
-
-		column = new TreeColumn(tree, SWT.NONE, 3);
-		column.setText(ImportResources.DiffReportViewer_in_lib); //$NON-NLS-1$
-		column.setWidth(75);
-
-		column = new TreeColumn(tree, SWT.NONE, 4);
-		column.setText(ImportResources.DiffReportViewer_status); //$NON-NLS-1$
-		column.setWidth(100);
-	}
-
-	/**
-	 * Displays the reviw.
-	 */
-	public void showReport(Object input) {
-		treeViewer.getTree().setVisible(false);
-		treeViewer.setInput(input);
-		setCheckStates();
-		treeViewer.expandAll();
-		treeViewer.getTree().setVisible(true);
-	}
-
-	private void addListeners() {
-		// add a check state change listener
-		treeViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				boolean checked = event.getChecked();
-				updateCheckStates(event.getElement(), checked);
-			}
-		});
-	}
-	
-	private void updateCheckStates(Object element, boolean checked) {
-
-		// Object element = event.getElement();
-
-		if (checked == true) {
-			ITreeContentProvider cp = (ITreeContentProvider) treeViewer
-					.getContentProvider();
-			checkParent(cp, element);
-			// treeViewer.setChecked(element, true);
-		}
-		else
-			treeViewer.setChecked(element, false);
-			
-		selectionChildren(element, checked);
-
-		setData(treeViewer.getCheckedElements());
-
-	}
-
-	/**
-	 * @param element
-	 * @param checked
-	 */
-	public void selectionChildren(Object element, boolean checked) {
-		ITreeContentProvider cp = (ITreeContentProvider) treeViewer
-				.getContentProvider();
-		Object[] childs = cp.getChildren(element);
-		for (int i = 0; i < childs.length; i++) {
-			treeViewer.setChecked(childs[i], checked);
-			selectionChildren(childs[i], checked);
-		}
-	}
-
-
-	private void checkParent(ITreeContentProvider cp, Object element) {
-		if (element == null || element instanceof MethodLibrary /*
-																 * || element ==
-																 * currentRootNode
-																 */) {
-			return;
-		}
-		Object parent = LibraryUtil.unwrap(cp.getParent(element));
-		if (parent != null) {
-			treeViewer.setChecked(parent, true);
-			// configFactory.getCurrentConfiguration().add((EObject)parent,
-			// false);
-			checkParent(cp, parent);
-		}
-
-	}
-	
-	private void setCheckStates() {
-		treeViewer.getTree().setVisible(false);
-		try {
-			Object element = treeViewer.getInput();
-			selectionChildren(element, true);
-		} finally {
-			treeViewer.getTree().setVisible(true);
-		}
-
-		setData(treeViewer.getCheckedElements());
-	}
-	
-	private void setData(Object[] sels) {
-		if ( sels == null ) {
-			return;
-		}
-		
-		data.importList.clear();
-		for ( int i = 0; i < sels.length; i++ ) {
-			data.importList.add(sels[i]);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/ImportConfigReportPage.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/ImportConfigReportPage.java
deleted file mode 100755
index 86cad69..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/ImportConfigReportPage.java
+++ /dev/null
@@ -1,73 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.wizards;
-
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.importing.services.ConfigurationImportService;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-
-/**
- * A wizard page that displays the result of an import operation.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ImportConfigReportPage extends WizardPage {
-
-	ConfigurationImportService importingService;
-
-	DiffReportViewer viewer;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ImportConfigReportPage(ConfigurationImportService importingService) {
-		super(ImportResources.ImportConfigReportPage_title); 
-		this.importingService = importingService;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		container.setLayout(layout);
-		parent.setLayoutData(new GridData(GridData.FILL_BOTH
-				| GridData.GRAB_VERTICAL));
-		container.setLayoutData(new GridData(GridData.FILL_BOTH
-				| GridData.GRAB_VERTICAL));
-
-		viewer = new DiffReportViewer(container, importingService.getImportData());
-
-		setControl(container);
-
-		setPageComplete(false);
-	}
-
-	/**
-	 * Show result.
-	 */
-	public void showResult() {
-		// Analize the importing configuration and report result.
-		importingService.analyze(null);
-
-		viewer.showReport(importingService.getDiffTree());
-
-		setPageComplete(true);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/ImportConfigurationWizard.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/ImportConfigurationWizard.java
deleted file mode 100755
index 623432e..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/ImportConfigurationWizard.java
+++ /dev/null
@@ -1,173 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.wizards;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.epf.authoring.ui.wizards.SaveAllEditorsPage;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.importing.ImportPlugin;
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.importing.services.ConfigurationImportData;
-import org.eclipse.epf.importing.services.ConfigurationImportService;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.ui.LibraryUIImages;
-import org.eclipse.epf.library.ui.wizards.LibraryBackupUtil;
-import org.eclipse.epf.services.IFileManager;
-import org.eclipse.epf.services.Services;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * A wizard that imports exported library configurations into the current method
- * library.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @since 1.0
- */
-public class ImportConfigurationWizard extends Wizard implements IImportWizard {
-
-	private static final String WIZARD_TITLE = ImportResources.importConfigWizard_title; //$NON-NLS-1$
-
-	public boolean okToComplete = false;
-
-	protected SelectImportConfigurationSource page1;
-
-	protected SelectConfigsToImport configPage;
-
-	protected SelectConfigSpecsToImportPage specsPage;
-
-	protected ConfigurationImportData data = new ConfigurationImportData();
-
-	protected ConfigurationImportService service = new ConfigurationImportService(
-			data);
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ImportConfigurationWizard() {
-		setWindowTitle(WIZARD_TITLE);
-		setNeedsProgressMonitor(true);
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
-	 *      IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		IFileManager fileMgr = Services.getFileManager();
-		fileMgr.checkModify(LibraryService.getInstance()
-				.getCurrentMethodLibrary().eResource().getURI().toFileString(),
-				MsgBox.getDefaultShell());
-
-		ILibraryManager manager = (ILibraryManager) LibraryService
-				.getInstance().getCurrentLibraryManager();
-		if (manager != null && manager.isMethodLibraryReadOnly()) {
-			ImportPlugin
-					.getDefault()
-					.getMsgDialog()
-					.displayError(
-							WIZARD_TITLE,
-							ImportResources.ImportConfigurationWizard_readonly); //$NON-NLS-1$
-			return;
-		}
-
-		SaveAllEditorsPage.addPageIfNeeded(this, true, null, null, ImportPlugin
-				.getDefault().getImageDescriptor(
-						"full/wizban/ImportLibraryConfiguration.gif")); //$NON-NLS-1$
-
-		page1 = new SelectImportConfigurationSource(data, service);
-		addPage(page1);
-
-		configPage = new SelectConfigsToImport(service);
-		addPage(configPage);
-
-		specsPage = new SelectConfigSpecsToImportPage(data);
-		addPage(specsPage);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#createPageControls(Composite)
-	 */
-	public void createPageControls(Composite pageContainer) {
-		super.createPageControls(pageContainer);
-		pageContainer.getShell().setImage(
-				LibraryUIImages.IMG_METHOD_CONFIGURATON);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#canFinish()
-	 */
-	public boolean canFinish() {
-		return okToComplete;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		// Prompt the user to back up library.
-		LibraryBackupUtil.promptBackupLibrary(null, new File(LibraryService
-				.getInstance().getCurrentMethodLibraryPath()));
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException {
-				try {
-					// Start the import.
-					monitor
-							.beginTask(
-									ImportResources.ImportConfigurationWizard_MSG1, IProgressMonitor.UNKNOWN); //$NON-NLS-1$					
-					service.performImport(monitor);
-				} catch (Exception e) {
-					throw new InvocationTargetException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-
-		try {
-			getContainer().run(true, false, op);
-		} catch (InterruptedException e) {
-			return false;
-		} catch (InvocationTargetException e) {
-			Throwable realException = e.getTargetException();
-			ImportPlugin
-					.getDefault()
-					.getMsgDialog()
-					.displayError(
-							ImportResources.ImportConfigurationWizard_error, //$NON-NLS-1$
-							realException.getMessage());
-			return false;
-		}
-		
-		//record the opened dir into preference store
-		ImportUIPreferences.addRecentlyImportConfigDir(data.llData
-				.getParentFolder());
-
-		return true;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/ImportPluginWizard.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/ImportPluginWizard.java
deleted file mode 100755
index 437b862..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/ImportPluginWizard.java
+++ /dev/null
@@ -1,290 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.wizards;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.epf.authoring.ui.wizards.SaveAllEditorsPage;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.importing.ImportPlugin;
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.importing.services.PluginImportData;
-import org.eclipse.epf.importing.services.PluginImportingService;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.edit.validation.PluginDepInfo;
-import org.eclipse.epf.library.edit.validation.PluginDependencyInfoMgr;
-import org.eclipse.epf.library.ui.LibraryUIImages;
-import org.eclipse.epf.library.ui.wizards.LibraryBackupUtil;
-import org.eclipse.epf.services.IFileManager;
-import org.eclipse.epf.services.Services;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * A wizard that imports an exported method plug-ins into the currrent method
- * library.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @since 1.0
- */
-public class ImportPluginWizard extends Wizard implements IImportWizard {
-
-	private static final String WIZARD_TITLE = ImportResources.importPluginsWizard_title; //$NON-NLS-1$
-
-	protected SelectImportPluginSource page1;
-
-	protected SelectPluginsToImport page2;
-
-	protected PluginImportData data = new PluginImportData();
-
-	protected PluginImportingService service = new PluginImportingService(data);
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ImportPluginWizard() {
-		setWindowTitle(WIZARD_TITLE);
-		setNeedsProgressMonitor(true);
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
-	 *      IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		// check out the library first
-		IFileManager fileMgr = Services.getFileManager();
-		fileMgr.checkModify(LibraryService.getInstance()
-				.getCurrentMethodLibrary().eResource().getURI().toFileString(),
-				MsgBox.getDefaultShell());
-		ILibraryManager manager = (ILibraryManager) LibraryService
-				.getInstance().getCurrentLibraryManager();
-		if (manager != null && manager.isMethodLibraryReadOnly()) {
-			ImportPlugin.getDefault().getMsgDialog().displayError(
-					WIZARD_TITLE,
-					ImportResources.ImportPluginWizard_readonly); //$NON-NLS-1$
-			return;
-		}
-
-		SaveAllEditorsPage.addPageIfNeeded(this, true, null, null, ImportPlugin
-				.getDefault().getImageDescriptor(
-						"full/wizban/ImportMethodPlugins.gif")); //$NON-NLS-1$
-
-		page1 = new SelectImportPluginSource(data, service);
-		addPage(page1);
-
-		page2 = new SelectPluginsToImport(data, service);
-		addPage(page2);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#createPageControls(Composite)
-	 */
-	public void createPageControls(Composite pageContainer) {
-		super.createPageControls(pageContainer);
-		pageContainer.getShell().setImage(LibraryUIImages.IMG_METHOD_PLUGIN);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#canFinish()
-	 */
-	public boolean canFinish() {
-		if (this.getContainer().getCurrentPage() != page2)
-			return false;
-		return page2.isPageComplete();
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		// Check if the selected plug-ins are updatable or not.
-		PluginModifyInfo modifyInfo = checkModify();
-
-		// if only locked, we can auto-unlock and relock the plugins
-		// if the pluin is readonly, user need to manually make it updatable
-		// customers need to manually unlock and lock plugins
-		// during content library upgrade
-
-		if (modifyInfo.readonlyPlugins.size() > 0) {
-			// Display an error message.
-			String error = modifyInfo.getReadonlyMessage().toString();
-			ImportPlugin
-					.getDefault()
-					.getMsgDialog()
-					.displayError(
-							ImportResources.ImportConfigurationWizard_error, error); //$NON-NLS-1$
-
-			return false;
-		}
-
-		StringBuffer buffer = new StringBuffer();
-		PluginImportData.PluginInfo info;
-		for (Iterator it = data.getPlugins().iterator(); it.hasNext();) {
-			info = (PluginImportData.PluginInfo) it.next();
-			if ((info.existingPlugin != null) && info.selected) {
-				if (buffer.length() > 0) {
-					buffer.append("\n"); //$NON-NLS-1$
-				}
-				buffer.append("\t").append(info.name); //$NON-NLS-1$
-			}
-		}
-
-		if (buffer.length() > 0) {
-			boolean yes = ImportPlugin
-					.getDefault()
-					.getMsgDialog()
-					.displayConfirmation(
-							WIZARD_TITLE,
-							NLS.bind(ImportResources.ImportPluginWizard_warn_existing_plugins, buffer.toString()));
-
-			if (!yes) {
-				return false;
-			}
-		}
-
-		// allow user to proceed with locked plugins
-		if (modifyInfo.lockedPlugins.size() > 0) {
-			String message = modifyInfo.getLockedMessage().toString()
-					+ ImportResources.ImportPluginWizard_confirm_continue; //$NON-NLS-1$
-			boolean yes = ImportPlugin.getDefault().getMsgDialog()
-					.displayConfirmation(WIZARD_TITLE, message);
-			if (!yes) {
-				return false;
-			}
-		}
-
-		// Prompt user to back up library.
-		LibraryBackupUtil.promptBackupLibrary(null, new File(LibraryService
-				.getInstance().getCurrentMethodLibraryPath()));
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException {
-				try {
-					monitor
-							.beginTask(
-									ImportResources.ImportPluginWizard_MSG1, IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-
-					// Start the import.
-					service.performImport(monitor);
-				} catch (Exception e) {
-					throw new InvocationTargetException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-
-		try {
-			getContainer().run(true, false, op);
-		} catch (InterruptedException e) {
-			return false;
-		} catch (InvocationTargetException e) {
-			Throwable realException = e.getTargetException();
-			ImportPlugin.getDefault().getMsgDialog().displayError(
-					ImportResources.ImportPluginWizard_error, //$NON-NLS-1$
-					realException.getMessage());
-			return false;
-		}
-
-		try {
-			checkPluginCircularDependency();
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-		
-//		record the opened dir into preference store
-		ImportUIPreferences.addRecentlyImportPluginDir(data.llData
-				.getParentFolder());
-		return true;
-	}
-
-	/**
-	 * Returns a PluginModifyInfo object.
-	 */
-	public PluginModifyInfo checkModify() {
-		// StringBuffer error = new StringBuffer();
-		PluginModifyInfo modifyInfo = new PluginModifyInfo();
-
-		PluginImportData.PluginInfo info;
-		for (Iterator it = data.getPlugins().iterator(); it.hasNext();) {
-			info = (PluginImportData.PluginInfo) it.next();
-			MethodPlugin plugin = info.existingPlugin;
-			if ((plugin != null) && info.selected) {
-				if (plugin.getUserChangeable().booleanValue() == false) {
-					// The plug-in is locked
-					// String msg = ImportResources
-					// .getString(
-					// "Import.SelectImportConfigurationSource.plugin_locked",
-					// plugin.getName()); //$NON-NLS-1$
-					// error.append(msg);
-					modifyInfo.lockedPlugins.add(plugin);
-				} else {
-					// The plug-in exists in the current library, make sure the
-					// plug-in is updatable.
-					IStatus status = TngUtil.checkEdit(plugin, getShell());
-					if (!status.isOK()) {
-						// String msg = ImportResources
-						// .getString(
-						// "Import.SelectImportConfigurationSource.plugin_readonly",
-						// plugin.getName()); //$NON-NLS-1$
-						// error.append(msg);
-						modifyInfo.readonlyPlugins.add(plugin);
-					}
-				}
-			}
-		}
-
-		// modifyInfo.message = error.toString();
-
-		return modifyInfo;
-	}
-	
-	private void checkPluginCircularDependency() {
-		PluginDependencyInfoMgr mgr = new PluginDependencyInfoMgr(LibraryService.getInstance().getCurrentMethodLibrary());
-		PluginDependencyInfoMgr.CheckResult result = mgr.checkCircularDependnecy(null, false);
-		if (result.circularList != null && !result.circularList.isEmpty()) {
-			List cirPlugins = (List) result.circularList.get(0);
-			String msg = "";	//$NON-NLS-1$
-			for (int i=0; i<cirPlugins.size(); i++) {
-				PluginDepInfo pinfo = (PluginDepInfo) cirPlugins.get(i);
-				if (i != 0) {
-					msg += ", "; 						//$NON-NLS-1$
-				}
-				msg += pinfo.getPlugin().getName();
-			}
-			ImportPlugin.getDefault().getMsgDialog().displayWarning(
-					ImportResources.ImportPluginWizard_warn_circular_plugins, 
-					msg);	
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/ImportUIPreferences.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/ImportUIPreferences.java
deleted file mode 100755
index d7fb827..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/ImportUIPreferences.java
+++ /dev/null
@@ -1,175 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.wizards;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.export.wizards.ExportUIPreferences;
-import org.eclipse.epf.importing.ImportPlugin;
-
-import com.ibm.icu.util.StringTokenizer;
-
-
-/**
-* Manages the Publishing UI preferences.
-* 
-* @author Bingxue Xu
-* @since 1.0
-*/
-public class ImportUIPreferences {
-
-	/**
-	 * The Publishing UI preference keys.
-	 */
-	public static final String LAST_IMPORT_PLUGIN_PATH = "lastImportPluginPath"; //$NON-NLS-1$
-	
-	/**
-	 * last import config preference key
-	 */
-	public static final String LAST_IMPORT_CONFIG_PATH = "lastImportConfigPath"; 
-
-
-	/**
-	 * Returns the last import plugin path that was saved in a previous session.
-	 * 
-	 * @return The saved last import plugin path as <code>List</code>.
-	 */
-	public static List getLastImportPluginPaths() {
-		List dirs = getPropertyList(LAST_IMPORT_PLUGIN_PATH);
-		List result = new ArrayList();
-		if (dirs.size() > 0) {
-			for (Iterator it = dirs.iterator(); it.hasNext();) {
-				String dir = (String) it.next();
-				result.add(dir);
-			}
-		}
-		return result;
-	}
-	
-	/**
-	 * Returns the last import plugin path that was saved in a previous session.
-	 * 
-	 * @return The saved last import plugin path as <code>List</code>.
-	 */
-	public static List getLastImportConfigPaths() {
-		List dirs = getPropertyList(LAST_IMPORT_CONFIG_PATH);
-		List result = new ArrayList();
-		if (dirs.size() > 0) {
-			for (Iterator it = dirs.iterator(); it.hasNext();) {
-				String dir = (String) it.next();
-				result.add(dir);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Add the recently opened method plugin preference.
-	 * 
-	 * @param dir   import plugin dir
-	 */
-	public static void addRecentlyImportPluginDir(String dir) {
-		if (dir == null || dir.length()==0) {
-			return;
-		}
-
-		List dirs = getLastImportPluginPaths();
-
-		addProperty(dirs, dir, LAST_IMPORT_PLUGIN_PATH);
-	}
-	
-	/**
-	 * Add the recently opened import config preference.
-	 * 
-	 * @param dir   import config dir
-	 */
-	public static void addRecentlyImportConfigDir(String dir) {
-		if (dir == null || dir.length()==0) {
-			return;
-		}
-
-		List dirs = getLastImportConfigPaths();
-
-		addProperty(dirs, dir, LAST_IMPORT_CONFIG_PATH);
-	}
-	
-	/**
-	 * Add the property to the first position.
-	 * 
-	 * @param oldPropertyList   old property list
-	 * @param newProperty       new property value 
-	 * @param propertyKey       target property key
-	 */
-	private static void addProperty(List oldPropertyList, String newProperty, String propertyKey){
-		List dirsResult = new ArrayList();
-		
-		if(oldPropertyList.contains(newProperty))
-			oldPropertyList.remove(newProperty);
-		
-		dirsResult.add(0, newProperty);
-		
-		for (int i=0; i<oldPropertyList.size(); i++) {
-			String path = (String) oldPropertyList.get(i);
-			dirsResult.add(i+1, path);
-		}
-			
-		if(dirsResult.size()>ExportUIPreferences.getListLength())
-			dirsResult = dirsResult.subList(0, ExportUIPreferences.getListLength());
-			
-		setPropertyList(propertyKey, StrUtil.convertListToStrArray(dirsResult));
-	}
-	
-	/**
-	 * Returns the string values associated with the named preference as a
-	 * <ocde>List</code>.
-	 */
-	private static List getPropertyList(String name) {
-		List list = convertToList(ImportPlugin.getDefault().getPreferenceStore()
-				.getString(name));
-		int length = ExportUIPreferences.getListLength();
-		if(list.size()>length){
-			list = list.subList(0, length);
-		}
-		return list;
-	}
-	
-	/**
-	 * Saves the given string values associated with the named preference.
-	 */
-	private static void setPropertyList(String name, String[] items) {
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; i < items.length; i++) {
-			buffer.append(items[i]);
-			buffer.append(ExportUIPreferences.PREFERENCE_DELIMITER);
-		}
-		ImportPlugin.getDefault().getPreferenceStore().setValue(name,
-				buffer.toString());
-	}
-	
-	/**
-	 * Converts the supplied PREFERENCE_DELIMITER delimited string into a
-	 * <code>List</code> object.
-	 */
-	private static ArrayList convertToList(String preferenceValue) {
-		ArrayList topics = new ArrayList();
-		StringTokenizer tokenizer = new StringTokenizer(preferenceValue,
-				ExportUIPreferences.PREFERENCE_DELIMITER);
-		int tokenCount = tokenizer.countTokens();
-		for (int i = 0; i < tokenCount; i++) {
-			topics.add(tokenizer.nextToken());
-		}
-		return topics;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/PluginModifyInfo.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/PluginModifyInfo.java
deleted file mode 100755
index f0f041a..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/PluginModifyInfo.java
+++ /dev/null
@@ -1,58 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.wizards;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.osgi.util.NLS;
-
-
-public class PluginModifyInfo {
-
-	public List lockedPlugins = new ArrayList();
-	public List readonlyPlugins = new ArrayList();
-	
-	PluginModifyInfo() {
-		
-	}
-
-	/**
-	 * Returns a StringBuffer object for locked message.
-	 */
-	public StringBuffer getLockedMessage() {
-		StringBuffer buffer = new StringBuffer();
-		for (Iterator it = lockedPlugins.iterator(); it.hasNext(); ) {
-			MethodPlugin plugin = (MethodPlugin)it.next();
-			String msg = NLS.bind(ImportResources.SelectImportConfigurationSource_plugin_locked, plugin.getName()); 
-			buffer.append(msg);
-		}
-		
-		return buffer;
-	}
-	
-	/**
-	 * Returns a StringBuffer object for readonly message.
-	 */
-	public StringBuffer getReadonlyMessage() {
-		StringBuffer buffer = new StringBuffer();
-		for (Iterator it = readonlyPlugins.iterator(); it.hasNext(); ) {
-			MethodPlugin plugin = (MethodPlugin)it.next();
-			String msg = NLS.bind(ImportResources.SelectImportConfigurationSource_plugin_readonly, plugin.getName()); 
-			buffer.append(msg);
-		}
-		
-		return buffer;
-	}
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/SelectConfigSpecsToImportPage.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/SelectConfigSpecsToImportPage.java
deleted file mode 100755
index b1ff006..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/SelectConfigSpecsToImportPage.java
+++ /dev/null
@@ -1,254 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.wizards;
-
-import java.util.Iterator;
-
-import org.eclipse.epf.importing.ImportPlugin;
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.importing.services.ConfigSpecs;
-import org.eclipse.epf.importing.services.ConfigurationImportData;
-import org.eclipse.epf.library.ui.LibraryUIImages;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A wizard page that prompts the user to select the configuration
- * specificaitons to import.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @since 1.0
- */
-public class SelectConfigSpecsToImportPage extends BaseWizardPage implements
-		ISelectionChangedListener, ICheckStateListener {
-
-	public static final String PAGE_NAME = SelectConfigSpecsToImportPage.class
-			.getName();
-
-	private static final String libraryConfigSpecExists = ImportResources.SelectConfigSpecsToImportPage_libraryConfigSpecExists; //$NON-NLS-1$
-
-	private static final String libraryConfigSpecNotExists = ImportResources.SelectConfigSpecsToImportPage_libraryConfigSpecNotExists; //$NON-NLS-1$
-
-	private static final String configSpecNoSelection = ImportResources.SelectConfigSpecsToImportPage_configSpecNoSelection; //$NON-NLS-1$
-
-	private static final String configSpecDataLabel = ImportResources.SelectConfigSpecsToImportPage_configSpecDataLabel; //$NON-NLS-1$
-
-	private CheckboxTableViewer ctrl_chkboxTableViewer;
-
-	// 2 controls for displaying configspec info for plugins in import directory
-	private Text ctrl_briefDescImport;
-
-	private Label importConfigSpecLabel;
-
-	// 2 controls for displaying configspec info for plugins in the library
-	private Text ctrl_briefDescLibrary;
-
-	private Label libraryConfigSpecLabel;
-
-	private Composite container;
-
-	private ConfigurationImportData data;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SelectConfigSpecsToImportPage(ConfigurationImportData data) {
-		super(PAGE_NAME);
-		setTitle(ImportResources.selectConfigSpecsWizardPage_title); //$NON-NLS-1$
-		setDescription(ImportResources.selectConfigSpecsWizardPage_text); //$NON-NLS-1$
-		setImageDescriptor(ImportPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ImportLibraryConfiguration.gif")); //$NON-NLS-1$
-		this.data = data;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout(2, true));
-
-		Composite tableContainer = new Composite(container, SWT.NONE);
-		tableContainer.setLayout(new GridLayout());
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = 2;
-		tableContainer.setLayoutData(gridData);
-
-		createLabel(
-				tableContainer,
-				ImportResources.SelectConfigSpecsToImportPage_label_configs, 2); //$NON-NLS-1$
-		ctrl_chkboxTableViewer = createCheckboxTableViewer(tableContainer, 1);
-
-		ILabelProvider labelProvider = new LabelProvider() {
-			public Image getImage(Object element) {
-				return LibraryUIImages.IMG_METHOD_CONFIGURATON;
-			}
-
-			public String getText(Object element) {
-				return super.getText(element);
-			}
-		};
-
-		ctrl_chkboxTableViewer.setLabelProvider(labelProvider);
-		ctrl_chkboxTableViewer.setContentProvider(new ArrayContentProvider());
-
-		Composite importContainer = new Composite(container, SWT.NONE);
-		importContainer.setLayout(new GridLayout());
-		importContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		createImportConfigSpecInfo(importContainer);
-
-		Composite libraryContainer = new Composite(container, SWT.NONE);
-		libraryContainer.setLayout(new GridLayout());
-		libraryContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		createLibraryConfigSpecInfo(libraryContainer);
-
-		addListeners();
-
-		setControl(container);
-		setPageComplete(false);
-	}
-
-	private void createImportConfigSpecInfo(Composite container) {
-		importConfigSpecLabel = createLabel(container, configSpecNoSelection, 1);
-		createLine(container, 1);
-
-		createLabel(
-				container,
-				ImportResources.SelectConfigSpecsToImportPage_label_desc, 1); //$NON-NLS-1$
-		ctrl_briefDescImport = createTextMulti(container, "", 275, 100, 1); //$NON-NLS-1$
-	}
-
-	private void createLibraryConfigSpecInfo(Composite container) {
-		libraryConfigSpecLabel = createLabel(container, configSpecNoSelection,
-				1);
-		createLine(container, 1);
-
-		createLabel(
-				container,
-				ImportResources.SelectConfigSpecsToImportPage_label_desc, 1); //$NON-NLS-1$
-		ctrl_briefDescLibrary = createTextMulti(container, "", 275, 100, 1); //$NON-NLS-1$
-	}
-
-	private void addListeners() {
-		ctrl_chkboxTableViewer.addSelectionChangedListener(this);
-		ctrl_chkboxTableViewer.addCheckStateListener(this);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent)
-	 */
-	public void checkStateChanged(CheckStateChangedEvent event) {
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		StructuredSelection selection = (StructuredSelection) event
-				.getSelection();
-		if (!selection.isEmpty()) {
-			Object[] configs = selection.toArray();
-			setDisplayAttributes((ConfigSpecs.Entry) configs[0]);
-		} else {
-			clearDisplayAttributes();
-		}
-	}
-
-	private void setDisplayAttributes(ConfigSpecs.Entry spec) {
-		ctrl_briefDescImport
-				.setText(spec.configSpec.brief_desc == null ? "" : spec.configSpec.brief_desc); //$NON-NLS-1$
-		importConfigSpecLabel.setText(configSpecDataLabel);
-
-		if (spec.existingConfig != null) {
-			ctrl_briefDescLibrary.setText(spec.existingConfig
-					.getBriefDescription());
-			libraryConfigSpecLabel.setText(libraryConfigSpecExists);
-		} else {
-			libraryConfigSpecLabel.setText(libraryConfigSpecNotExists);
-			ctrl_briefDescLibrary.setText(""); //$NON-NLS-1$
-		}
-	}
-
-	private void clearDisplayAttributes() {
-		ctrl_briefDescImport.setText(""); //$NON-NLS-1$
-		ctrl_briefDescLibrary.setText(""); //$NON-NLS-1$
-		libraryConfigSpecLabel.setText(configSpecNoSelection);
-		importConfigSpecLabel.setText(configSpecNoSelection);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isCompleted()
-	 */
-	public boolean isPageComplete() {
-		if (getErrorMessage() != null)
-			return false;
-
-		if (ctrl_chkboxTableViewer.getCheckedElements().length > 0) {
-			// Set data.specs.configs list, fix the selected field of each
-			// entry.
-			Iterator iter = data.specs.configs.iterator();
-			while (iter.hasNext()) {
-				ConfigSpecs.Entry e = (ConfigSpecs.Entry) iter.next();
-				if (ctrl_chkboxTableViewer.getChecked(e))
-					e.selected = true;
-				else
-					e.selected = false;
-			}
-			((ImportConfigurationWizard) getWizard()).okToComplete = true;
-		} else {
-			((ImportConfigurationWizard) getWizard()).okToComplete = false;
-		}
-
-		// Always return false so that the "Next" button is never enabled.
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
-	 */
-	public boolean canFlipToNextPage() {
-		return isPageComplete();
-	}
-
-	/**
-	 * @see org.eclipse.epf.ui.wizards.BaseWizardPage#onEnterPage(Object)
-	 */
-	public void onEnterPage(Object obj) {
-		ctrl_chkboxTableViewer.setInput(data.specs.configs);
-		if (data.specs.configs.size() > 0) {
-			IStructuredSelection sel = new StructuredSelection(
-					data.specs.configs.get(0));
-			ctrl_chkboxTableViewer.setSelection(sel);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/SelectConfigsToImport.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/SelectConfigsToImport.java
deleted file mode 100755
index 3d0d1d1..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/SelectConfigsToImport.java
+++ /dev/null
@@ -1,84 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.wizards;
-
-import org.eclipse.epf.importing.ImportPlugin;
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.importing.services.ConfigurationImportService;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * A wizard page that displays the library configuration elements that will be
- * imported.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @since 1.0
- */
-public class SelectConfigsToImport extends BaseWizardPage {
-
-	public static final String PAGE_NAME = SelectConfigsToImport.class
-			.getName();
-
-	private ConfigurationImportService service;
-
-	private Composite container;
-
-	private DiffReportViewer diff;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SelectConfigsToImport(ConfigurationImportService service) {
-		super(PAGE_NAME);
-		setTitle(ImportResources.reviewChangesWizardPage_title); //$NON-NLS-1$
-		setDescription(ImportResources.reviewChangesWizardPage_text); //$NON-NLS-1$
-		setImageDescriptor(ImportPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ImportLibraryConfiguration.gif")); //$NON-NLS-1$		
-		this.service = service;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		container = new Composite(parent, SWT.NONE);
-		container.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		container.setLayout(new GridLayout(1, false));
-
-		createLabel(container, ImportResources.SelectConfigsToImport_label1, 1); //$NON-NLS-1$
-		diff = new DiffReportViewer(container, service.getImportData());
-
-		setControl(container);
-		setPageComplete(false);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isCompleted()
-	 */
-	public boolean isPageComplete() {
-		((ImportConfigurationWizard) getWizard()).okToComplete = true;
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.epf.ui.wizards.BaseWizardPage#onEnterPage(Object)
-	 */
-	public void onEnterPage(Object obj) {
-		diff.showReport(service.getDiffTree());
-		((ImportConfigurationWizard) getWizard()).okToComplete = true;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/SelectImportConfigurationSource.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/SelectImportConfigurationSource.java
deleted file mode 100755
index 8a55778..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/SelectImportConfigurationSource.java
+++ /dev/null
@@ -1,257 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.wizards;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.epf.export.wizards.DestinationCommonPage;
-import org.eclipse.epf.importing.ImportPlugin;
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.importing.services.ConfigurationImportData;
-import org.eclipse.epf.importing.services.ConfigurationImportService;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * A wizard page that prompts the user to select a directory that contains the
- * configurations to import.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @since 1.0
- */
-public class SelectImportConfigurationSource extends DestinationCommonPage {
-
-	public static final String PAGE_NAME = SelectImportConfigurationSource.class
-			.getName();
-
-	private static final Status okStatus = new Status(
-			IStatus.OK,
-			ImportResources.SelectImportConfigurationSource_not_used, 0, "", null); //$NON-NLS-1$ //$NON-NLS-2$
-
-	private ConfigurationImportData data;
-
-	private ConfigurationImportService service;
-
-	private Status status = okStatus;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SelectImportConfigurationSource(ConfigurationImportData data,
-			ConfigurationImportService service) {
-		super(PAGE_NAME, data.llData);
-		setTitle(ImportResources.selectConfigDirWizardPage_title); //$NON-NLS-1$
-		setDescription(ImportResources.selectConfigDirWizardPage_text); //$NON-NLS-1$
-		setImageDescriptor(ImportPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ImportLibraryConfiguration.gif")); //$NON-NLS-1$		
-		this.service = service;
-		this.data = data;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.export.wizards.DestinationCommonPage#initComboItems()
-	 */
-	protected void initComboItems() {
-		List dirList = ImportUIPreferences.getLastImportConfigPaths();
-		
-		if(dirList!=null && !dirList.isEmpty()){
-			String[] dirs = new String[dirList.size()];
-			for(int i=0; i<dirList.size(); i++){
-				dirs[i] = dirList.get(i).toString();
-			}
-			ctrl_exportPath.setItems(dirs);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isCompleted()
-	 */
-	public boolean isPageComplete() {
-		boolean returnValue = false;
-		status = okStatus;
-		if (ctrl_exportPath.getText().length()>0) {
-			saveToDataModel();
-			File libDir = new File(ctrl_exportPath.getText());
-			if (!libDir.exists()) {
-				status = new Status(
-						IStatus.ERROR,
-						ImportResources.SelectImportConfigurationSource_not_used, 0, ImportResources.SelectImportConfigurationSource_no_path, null); 
-			} else {
-				returnValue = true;
-			}
-		}
-		applyToStatusLine();
-		return returnValue;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		saveToDataModel();
-		IRunnableWithProgress operation = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException, InterruptedException {
-				monitor
-						.beginTask(
-								ImportResources.SelectImportConfigurationSource_MSG1, IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-				service.analyze(monitor);
-				monitor.done();
-			}
-		};
-		try {
-			// This runs the options, and shows progress.
-			getWizard().getContainer().run(true, false, operation);
-		} catch (Exception exception) {
-			// Something went wrong that shouldn't.
-			exception.printStackTrace();
-		}
-
-		String error = data.getErrorInfo().getError();
-		if (error != null && error.length() > 0) {
-			status = new Status(
-					IStatus.ERROR,
-					ImportResources.SelectImportConfigurationSource_not_used, 0, error, null); //$NON-NLS-1$ 
-			applyToStatusLine();
-			return this;
-		}
-		BaseWizardPage page = null;
-		if (data.specs != null)
-			page = ((ImportConfigurationWizard) getWizard()).specsPage;
-		else {
-			PluginModifyInfo modifyInfo = checkModify();
-			
-			// if only locked, we can auto-unlock and relock the plugins
-			// if the pluin is readonly, user need to manually make it updatable
-			// customers need to manually unlock and lock plugins during content library upgrade
-			
-			if ( modifyInfo.readonlyPlugins.size() > 0 ) {
-
-				error = modifyInfo.getReadonlyMessage().toString();
-				
-				// show error message box
-				ImportPlugin
-						.getDefault()
-						.getMsgDialog()
-						.displayError(
-								ImportResources.ImportConfigurationWizard_error, error); //$NON-NLS-1$
-
-				status = new Status(
-						IStatus.ERROR,
-						ImportResources.SelectImportConfigurationSource_not_used, //$NON-NLS-1$
-						0,
-						ImportResources.SelectImportConfigurationSource_error_not_updatable, //$NON-NLS-1$
-						null); //$NON-NLS-1$ 
-				applyToStatusLine();
-				return this;
-			}
-
-			// allow user to proceed with locked plugins
-			if ( modifyInfo.lockedPlugins.size() > 0 ) {
-				String WIZARD_TITLE = ImportResources.importConfigWizard_title; //$NON-NLS-1$
-				String message = modifyInfo.getLockedMessage().toString() + 
-					ImportResources.ImportPluginWizard_confirm_continue; 
-				boolean yes = ImportPlugin
-				.getDefault().getMsgDialog().displayConfirmation(WIZARD_TITLE, message);
-				if (!yes) {
-					status = new Status(
-							IStatus.ERROR,
-							ImportResources.SelectImportConfigurationSource_not_used, //$NON-NLS-1$
-							0,
-							ImportResources.SelectImportConfigurationSource_error_not_updatable, //$NON-NLS-1$
-							null); //$NON-NLS-1$ 
-					applyToStatusLine();
-					return this;
-				}
-			} 			
-			page = ((ImportConfigurationWizard) getWizard()).configPage;
-		}
-		page.onEnterPage(null);
-		return page;
-	}
-	
-	/**
-	 * Returns a PluginModifyInfo object.
-	 */
-	public PluginModifyInfo checkModify() {
-		return checkModify(LibraryUtil.getMethodPluginGuids(service.getImportingLibrary()), 
-				getShell(), true);
-	}
-
-	/**
-	 * Returns a PluginModifyInfo object.
-	 */
-	public static PluginModifyInfo checkModify(List guids, Shell shell, boolean checkEdit) {
-		PluginModifyInfo modifyInfo = new PluginModifyInfo();
-		//StringBuffer error = new StringBuffer();
-		//List guids = LibraryUtil.getMethodPluginGuids(service
-		//		.getImportingLibrary());
-
-		List plugins = LibraryService.getInstance().getCurrentMethodLibrary()
-				.getMethodPlugins();
-		for (Iterator it = plugins.iterator(); it.hasNext();) {
-			MethodPlugin plugin = (MethodPlugin) it.next();
-			if (guids.contains(plugin.getGuid())) {
-				if (plugin.getUserChangeable().booleanValue() == false) {
-					// plugin is locked
-//					String msg = ImportResources
-//							.getString(
-//									"Import.SelectImportConfigurationSource.plugin_locked", plugin.getName()); //$NON-NLS-1$
-//					error.append(msg);
-					modifyInfo.lockedPlugins.add(plugin);
-				} else if (checkEdit){
-					// plugin exists in the current library, make sure the
-					// plugin is updatable
-					//IStatus status = TngUtil.checkEdit(plugin, getShell());
-					IStatus status = TngUtil.checkEdit(plugin, shell);
-					if (!status.isOK()) {
-//						String msg = ImportResources
-//								.getString(
-//										"Import.SelectImportConfigurationSource.plugin_readonly", plugin.getName()); //$NON-NLS-1$
-//						error.append(msg);
-						modifyInfo.readonlyPlugins.add(plugin);
-					}
-				}
-			}
-		}
-
-		return modifyInfo;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
-	 */
-	public boolean canFlipToNextPage() {
-		return isPageComplete();
-	}
-
-	private void applyToStatusLine() {
-		if (status != okStatus)
-			setErrorMessage(status.getMessage());
-		else {
-			setErrorMessage(null);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/SelectImportPluginSource.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/SelectImportPluginSource.java
deleted file mode 100755
index 3964b27..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/SelectImportPluginSource.java
+++ /dev/null
@@ -1,132 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.wizards;
-
-import java.io.File;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.epf.export.wizards.DestinationCommonPage;
-import org.eclipse.epf.importing.ImportPlugin;
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.importing.services.PluginImportData;
-import org.eclipse.epf.importing.services.PluginImportingService;
-import org.eclipse.jface.wizard.IWizardPage;
-
-/**
- * A wizard page that prompts the user to select a directory that contains the
- * method plug-ins to import.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @since 1.0
- */
-public class SelectImportPluginSource extends DestinationCommonPage {
-
-	public static final String PAGE_NAME = SelectImportPluginSource.class
-			.getName();
-
-	private static final Status OK_STATUS = new Status(
-			IStatus.OK,
-			ImportResources.SelectImportPluginSource_not_used, 0, "", null); //$NON-NLS-1$ //$NON-NLS-2$
-
-	private PluginImportData data;
-
-	private PluginImportingService service;
-
-	private Status status = OK_STATUS;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SelectImportPluginSource(PluginImportData data,
-			PluginImportingService service) {
-		super(PAGE_NAME, data.llData);
-		setTitle(ImportResources.selectPluginsDirWizardPage_title); //$NON-NLS-1$
-		setDescription(ImportResources.selectPluginsDirWizardPage_text); //$NON-NLS-1$
-		setImageDescriptor(ImportPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ImportMethodPlugins.gif")); //$NON-NLS-1$
-		this.service = service;
-		this.data = data;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.export.wizards.DestinationCommonPage#initComboItems()
-	 */
-	protected void initComboItems() {
-		List dirList = ImportUIPreferences.getLastImportPluginPaths();
-		
-		if(dirList!=null && !dirList.isEmpty()){
-			String[] dirs = new String[dirList.size()];
-			for(int i=0; i<dirList.size(); i++){
-				dirs[i] = dirList.get(i).toString();
-			}
-			ctrl_exportPath.setItems(dirs);
-		}
-	}
-	
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isCompleted()
-	 */
-	public boolean isPageComplete() {
-		boolean returnValue = false;
-		status = OK_STATUS;
-		if (ctrl_exportPath.getText().length()>0) {
-			saveToDataModel();
-			File libDir = new File(ctrl_exportPath.getText());
-			if (!libDir.exists()) {
-				status = new Status(
-						IStatus.ERROR,
-						ImportResources.SelectImportPluginSource_not_used, 0, ImportResources.SelectImportPluginSource_no_path, null); 
-			} else {
-				returnValue = true;
-			}
-		}
-		applyToStatusLine();
-		return returnValue;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		saveToDataModel();
-
-		// Validate first before going to the next page.
-		service.validate(null);
-		String error = data.getErrorInfo().getError();
-		if (error != null && error.length() > 0) {
-			super.setErrorMessage(error);
-			return this;
-		} else {
-			SelectPluginsToImport page = ((ImportPluginWizard) getWizard()).page2;
-			page.onEnterPage(null);
-			return page;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
-	 */
-	public boolean canFlipToNextPage() {
-		return isPageComplete();
-	}
-
-	private void applyToStatusLine() {
-		if (status != OK_STATUS)
-			setErrorMessage(status.getMessage());
-		else {
-			setErrorMessage(null);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/SelectPluginsToImport.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/SelectPluginsToImport.java
deleted file mode 100755
index 6e4d1a6..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/SelectPluginsToImport.java
+++ /dev/null
@@ -1,297 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.importing.wizards;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.importing.ImportPlugin;
-import org.eclipse.epf.importing.ImportResources;
-import org.eclipse.epf.importing.services.PluginImportData;
-import org.eclipse.epf.importing.services.PluginImportingService;
-import org.eclipse.epf.importing.services.PluginImportData.PluginInfo;
-import org.eclipse.epf.library.ui.LibraryUIImages;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A wizard page that prompts the user to the method plug-ins to import.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @since 1.0
- */
-public class SelectPluginsToImport extends BaseWizardPage implements
-		ISelectionChangedListener, ICheckStateListener, Listener {
-
-	public static final String PAGE_NAME = SelectPluginsToImport.class
-			.getName();
-
-	private static final String libraryPluginExists = ImportResources.SelectPluginsToImport_libraryPluginExists; //$NON-NLS-1$
-
-	private static final String libraryPluginNotExists = ImportResources.SelectPluginsToImport_libraryPluginNotExists; //$NON-NLS-1$
-
-	private static final String pluginNoSelection = ImportResources.SelectPluginsToImport_pluginNoSelection; //$NON-NLS-1$
-
-	private static final String pluginDataLabel = ImportResources.SelectPluginsToImport_pluginDataLabel; //$NON-NLS-1$
-
-	private CheckboxTableViewer ctrl_chkboxTableViewer;
-
-	private Text ctrl_authorImport;
-
-	private Text ctrl_versionImport;
-
-	private Text ctrl_briefDescImport;
-
-	private Label importPluginLabel;
-
-	private Text ctrl_authorLibrary;
-
-	private Text ctrl_versionLibrary;
-
-	private Text ctrl_briefDescLibrary;
-
-	private Label libraryPluginLabel;
-
-	private Composite container;
-
-	private int checkedCount = 0;
-
-	private List checkedPluginList = new ArrayList();
-
-	private PluginImportData data;
-
-	private PluginImportingService service;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SelectPluginsToImport(PluginImportData data,
-			PluginImportingService service) {
-		super(PAGE_NAME);
-		setTitle(ImportResources.selectPluginsWizardPage_title); //$NON-NLS-1$
-		setDescription(ImportResources.selectPluginsWizardPage_text); //$NON-NLS-1$
-		setImageDescriptor(ImportPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ImportMethodPlugins.gif")); //$NON-NLS-1$		
-		this.service = service;
-		this.data = data;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout(2, true));
-
-		Composite tableContainer = new Composite(container, SWT.NONE);
-		tableContainer.setLayout(new GridLayout());
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = 2;
-		tableContainer.setLayoutData(gridData);
-
-		createLabel(tableContainer, ImportResources.SelectPluginsToImport_label_plugins, 2); //$NON-NLS-1$
-
-		ctrl_chkboxTableViewer = createCheckboxTableViewer(tableContainer, 2);
-
-		ILabelProvider labelProvider = new LabelProvider() {
-			public Image getImage(Object element) {
-				return LibraryUIImages.IMG_METHOD_PLUGIN;
-			}
-
-			public String getText(Object element) {
-				if (element instanceof MethodPlugin) {
-					return ((MethodPlugin) element).getName();
-				} else {
-					return element.toString();
-				}
-			}
-		};
-		ctrl_chkboxTableViewer.setLabelProvider(labelProvider);
-		ctrl_chkboxTableViewer.setContentProvider(new ArrayContentProvider());
-
-		Composite importContainer = new Composite(container, SWT.NONE);
-		importContainer.setLayout(new GridLayout());
-
-		createImportPluginInfo(importContainer);
-
-		Composite libraryContainer = new Composite(container, SWT.NONE);
-		libraryContainer.setLayout(new GridLayout());
-
-		createLibraryPluginInfo(libraryContainer);
-
-		addListeners();
-
-		setControl(container);
-		setPageComplete(false);
-	}
-
-	private void createImportPluginInfo(Composite container) {
-		importPluginLabel = createLabel(container, pluginNoSelection, 1);
-		createLine(container, 1);
-
-		createLabel(container, ImportResources.SelectPluginsToImport_label_author, 1); //$NON-NLS-1$
-		ctrl_authorImport = createTextMulti(container, "", 275, 40, 1); //$NON-NLS-1$
-
-		createLabel(container, ImportResources.SelectPluginsToImport_label_version, 1); //$NON-NLS-1$
-		ctrl_versionImport = createText(container, "", 275, 1); //$NON-NLS-1$
-
-		createLabel(container, ImportResources.SelectPluginsToImport_label_desc, 1); //$NON-NLS-1$
-		ctrl_briefDescImport = createTextMulti(container, "", 275, 100, 1); //$NON-NLS-1$
-	}
-
-	private void createLibraryPluginInfo(Composite container) {
-		libraryPluginLabel = createLabel(container, pluginNoSelection, 1);
-		createLine(container, 1);
-
-		createLabel(container, ImportResources.SelectPluginsToImport_label_author, 1); //$NON-NLS-1$
-		ctrl_authorLibrary = createTextMulti(container, "", 275, 40, 1); //$NON-NLS-1$
-
-		createLabel(container, ImportResources.SelectPluginsToImport_label_version, 1); //$NON-NLS-1$
-		ctrl_versionLibrary = createText(container, "", 275, 1); //$NON-NLS-1$
-
-		createLabel(container, ImportResources.SelectPluginsToImport_label_desc, 1); //$NON-NLS-1$
-		ctrl_briefDescLibrary = createTextMulti(container, "", 275, 100, 1); //$NON-NLS-1$
-	}
-
-	private void addListeners() {
-		ctrl_chkboxTableViewer.addSelectionChangedListener(this);
-		ctrl_chkboxTableViewer.addCheckStateListener(this);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent)
-	 */
-	public void checkStateChanged(CheckStateChangedEvent event) {
-		Object obj = event.getElement();
-
-		// Set the flag to import the selected plug-ins.
-		if (obj instanceof PluginImportData.PluginInfo) {
-			((PluginImportData.PluginInfo) obj).selected = event.getChecked();
-		}
-		String message = service.validateSelection();
-		if (message != null && message.length() > 0) {
-			super.setErrorMessage(message);
-		} else {
-			super.setErrorMessage(null);
-		}
-
-		if (event.getChecked()) {
-			checkedCount++;
-			checkedPluginList.add(obj);
-		} else {
-			checkedCount--;
-			checkedPluginList.remove(obj);
-		}
-
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		StructuredSelection selection = (StructuredSelection) event
-				.getSelection();
-		if (!selection.isEmpty()) {
-			Object[] plugin = selection.toArray();
-			setDisplayAttributes((PluginInfo) plugin[0]);
-		} else {
-			clearDisplayAttributes();
-		}
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	private void setDisplayAttributes(PluginInfo plugin) {
-		ctrl_authorImport.setText(plugin.authors == null ? "" : plugin.authors); //$NON-NLS-1$
-		ctrl_versionImport
-				.setText(plugin.version == null ? "" : plugin.version); //$NON-NLS-1$
-		ctrl_briefDescImport
-				.setText(plugin.brief_desc == null ? "" : plugin.brief_desc); //$NON-NLS-1$
-		importPluginLabel.setText(pluginDataLabel);
-
-		if (plugin.existingPlugin != null) {
-			libraryPluginLabel.setText(libraryPluginExists);
-			ctrl_authorLibrary.setText(plugin.existingPlugin.getAuthors());
-			ctrl_versionLibrary.setText(plugin.existingPlugin.getVersion());
-			ctrl_briefDescLibrary.setText(plugin.existingPlugin
-					.getBriefDescription());
-		} else {
-			libraryPluginLabel.setText(libraryPluginNotExists);
-			ctrl_authorLibrary.setText(""); //$NON-NLS-1$
-			ctrl_versionLibrary.setText(""); //$NON-NLS-1$
-			ctrl_briefDescLibrary.setText(""); //$NON-NLS-1$
-		}
-	}
-
-	private void clearDisplayAttributes() {
-		importPluginLabel.setText(pluginNoSelection);
-		ctrl_authorImport.setText(""); //$NON-NLS-1$
-		ctrl_versionImport.setText(""); //$NON-NLS-1$
-		ctrl_briefDescImport.setText(""); //$NON-NLS-1$
-
-		libraryPluginLabel.setText(pluginNoSelection);
-		ctrl_authorLibrary.setText(""); //$NON-NLS-1$
-		ctrl_versionLibrary.setText(""); //$NON-NLS-1$
-		ctrl_briefDescLibrary.setText(""); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		if (getErrorMessage() != null)
-			return false;
-		return (checkedCount > 0);
-	}
-
-	/**
-	 * @see org.eclipse.epf.ui.wizards.BaseWizardPage#onEnterPage(Object)
-	 */
-	public void onEnterPage(Object obj) {
-		List plugins = data.getPlugins();
-		if (plugins != null) {
-			ctrl_chkboxTableViewer.setInput(plugins.toArray());
-			if (!plugins.isEmpty()) {
-				StructuredSelection selection = new StructuredSelection(plugins
-						.get(0));
-				ctrl_chkboxTableViewer.setSelection(selection);
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/package.html b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/package.html
deleted file mode 100755
index ce6107d..0000000
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/wizards/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides wizards for importing method plug-ins and configurations.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/.classpath b/plugins/org.eclipse.epf.library.persistence/.classpath
deleted file mode 100755
index 8c4f20f..0000000
--- a/plugins/org.eclipse.epf.library.persistence/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.library.persistence/.cvsignore b/plugins/org.eclipse.epf.library.persistence/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.library.persistence/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.library.persistence/.options b/plugins/org.eclipse.epf.library.persistence/.options
deleted file mode 100755
index cd3b8ef..0000000
--- a/plugins/org.eclipse.epf.library.persistence/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-# Turn on debug trace for the Common plug-in
-org.eclipse.epf.library.persistence/debug=true
diff --git a/plugins/org.eclipse.epf.library.persistence/.project b/plugins/org.eclipse.epf.library.persistence/.project
deleted file mode 100755
index f3c18ca..0000000
--- a/plugins/org.eclipse.epf.library.persistence/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.library.persistence</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/plugins/org.eclipse.epf.library.persistence/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.library.persistence/META-INF/MANIFEST.MF
deleted file mode 100755
index 3fff182..0000000
--- a/plugins/org.eclipse.epf.library.persistence/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.library.persistence; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.epf.common;visibility:=reexport,
- org.eclipse.epf.diagram;visibility:=reexport,
- org.eclipse.epf.uma;visibility:=reexport,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.emf.mapping.ecore2ecore;visibility:=reexport,
- org.eclipse.emf.mapping.ecore2xml;visibility:=reexport,
- org.eclipse.core.filebuffers,
- org.eclipse.jface.text,
- org.eclipse.epf.services;visibility:=reexport,
- org.eclipse.emf.workspace
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.library.persistence,
- org.eclipse.epf.library.persistence.internal,
- org.eclipse.epf.library.persistence.util,
- org.eclipse.epf.persistence,
- org.eclipse.epf.persistence.migration,
- org.eclipse.epf.persistence.refresh,
- org.eclipse.epf.persistence.refresh.internal,
- org.eclipse.epf.persistence.util,
- org.eclipse.epf.resourcemanager,
- org.eclipse.epf.resourcemanager.impl,
- org.eclipse.epf.resourcemanager.util
-Bundle-Activator: org.eclipse.epf.persistence.PersistencePlugin
diff --git a/plugins/org.eclipse.epf.library.persistence/build.properties b/plugins/org.eclipse.epf.library.persistence/build.properties
deleted file mode 100755
index 35cca7a..0000000
--- a/plugins/org.eclipse.epf.library.persistence/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               migration/,\
-               plugin.properties,\
-               plugin.xml,\
-               schema/
-
diff --git a/plugins/org.eclipse.epf.library.persistence/migration/migrators.properties b/plugins/org.eclipse.epf.library.persistence/migration/migrators.properties
deleted file mode 100755
index 4079e6c..0000000
--- a/plugins/org.eclipse.epf.library.persistence/migration/migrators.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-http\:///com/ibm/uma.ecore=org.eclipse.epf.persistence.migration.internal.Migrator
-org.eclipse.epf.persistence.migration.internal.Migrator=http\://www.ibm.com/uma/1.0.2/uma.ecore
-http\://www.ibm.com/uma/1.0.2/uma.ecore=org.eclipse.epf.persistence.migration.internal.Migrator102
-org.eclipse.epf.persistence.migration.internal.Migrator102=http\://www.eclipse.org/epf/uma/1.0.3/uma.ecore
-
diff --git a/plugins/org.eclipse.epf.library.persistence/migration/uma1.0.2_1.0.3.ecore2ecore b/plugins/org.eclipse.epf.library.persistence/migration/uma1.0.2_1.0.3.ecore2ecore
deleted file mode 100755
index 902e74d..0000000
--- a/plugins/org.eclipse.epf.library.persistence/migration/uma1.0.2_1.0.3.ecore2ecore
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore2ecore:Ecore2EcoreMappingRoot xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore2ecore="http://www.eclipse.org/emf/2004/Ecore2Ecore" topToBottom="true">
-  <inputs href="../../org.eclipse.epf.uma/model/1.0.2/uma.ecore#/"/>
-  <outputs href="../../org.eclipse.epf.uma/model/1.0.3/uma.ecore#/"/>
-</ecore2ecore:Ecore2EcoreMappingRoot>
diff --git a/plugins/org.eclipse.epf.library.persistence/plugin.properties b/plugins/org.eclipse.epf.library.persistence/plugin.properties
deleted file mode 100755
index ece2cfd..0000000
--- a/plugins/org.eclipse.epf.library.persistence/plugin.properties
+++ /dev/null
@@ -1,17 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Library Persistence
-providerName=Eclipse.org
-# ====================================================================
-

diff --git a/plugins/org.eclipse.epf.library.persistence/plugin.xml b/plugins/org.eclipse.epf.library.persistence/plugin.xml
deleted file mode 100755
index b4b0849..0000000
--- a/plugins/org.eclipse.epf.library.persistence/plugin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="migrators" name="Migrators" schema="schema/migrators.exsd"/>
-   <extension-point id="resourceSetFactories" name="Library Resource Set Factories" schema="schema/resourceSetFactories.exsd"/>
-
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "http:///com/ibm/uma/resourcemanager.ecore" 
-       class = "org.eclipse.epf.resourcemanager.ResourcemanagerPackage" />
-    <package
-          class="org.eclipse.epf.resourcemanager.ResourcemanagerPackage"
-          uri="http:///org/eclipse/epf/uma/resourcemanager.ecore"/>
-  </extension>
-  <extension
-        point="org.eclipse.epf.library.persistence.migrators">
-     <migrator
-           class="org.eclipse.epf.persistence.migration.internal.Migrator"
-           libNsURI="http:///com/ibm/uma.ecore"/>
-  </extension>
-  <extension
-        point="org.eclipse.epf.services.serviceProviders">
-     <accessController class="org.eclipse.epf.library.persistence.internal.AccessController"/>
-     <libraryPersister
-           class="org.eclipse.epf.persistence.XMILibraryPersister"
-           default="false"
-           type="xmi"/>
-     <fileManager class="org.eclipse.epf.persistence.DelegateFileManager"/>
-  </extension>
-  <extension
-        point="org.eclipse.epf.library.persistence.resourceSetFactories">
-     <resourceSetFactory
-           class="org.eclipse.epf.persistence.XMILibraryResourceSetFactory"
-           type="xmi"/>
-  </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.epf.library.persistence/schema/migrators.exsd b/plugins/org.eclipse.epf.library.persistence/schema/migrators.exsd
deleted file mode 100755
index b60a0ee..0000000
--- a/plugins/org.eclipse.epf.library.persistence/schema/migrators.exsd
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.epf.library.persistence">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.epf.library.persistence" id="migrators" name="Migrators"/>
-      </appInfo>
-      <documentation>
-         Migrator migrates method library from one version to another
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="migrator" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="migrator">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The Java class that implements a migrator. This class must be a public implementation of &lt;code&gt;org.eclipse.epf.persistence.IMigrator&lt;/code&gt; with a public 0-argument constructor.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="libNsURI" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The name space URI of the method library that this migrator can migrates
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         1.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         &lt;p&gt;
-&lt;pre&gt;
-  &lt;extension
-        point=&quot;org.eclipse.epf.library.persistence.migrators&quot;&gt;
-     &lt;migrator
-           class=&quot;org.eclipse.epf.persistence.migration.internal.Migrator&quot;
-           libNsURI=&quot;http:///com/ibm/uma.ecore&quot;/&gt;
-  &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         org.eclipse.epf.persistence.IMigrator
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         org.eclipse.epf.persistence.migration.internal.Migrator
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005, 2006 IBM Corporation and others.&lt;br&gt;
-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 &lt;a 
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.epf.library.persistence/schema/resourceSetFactories.exsd b/plugins/org.eclipse.epf.library.persistence/schema/resourceSetFactories.exsd
deleted file mode 100755
index 4ce5884..0000000
--- a/plugins/org.eclipse.epf.library.persistence/schema/resourceSetFactories.exsd
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.epf.library.persistence">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.epf.library.persistence" id="resourceSetFactories" name="Library Resource Set Factories"/>
-      </appInfo>
-      <documentation>
-         Extension point to contribute factories for creation of library resource set. The factories must implement interface org.eclipse.epf.library.persistence.ILibraryResourceSetFactory and must have a public non-argument constructor.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="resourceSetFactory" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="resourceSetFactory">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="type"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <attribute name="type" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.epf.library.persistence.ILibraryResourceSetFactory"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         1.1
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         org.eclipse.epf.library.persistence.ILibraryResourceSetFactory
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005, 2006 IBM Corporation and others.&lt;br&gt;
-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 &lt;a 
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/ILibraryResource.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/ILibraryResource.java
deleted file mode 100755
index 6a3c55c..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/ILibraryResource.java
+++ /dev/null
@@ -1,24 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.persistence;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-
-/**
- * @author Phong Nguyen Le
- * @since  1.0
- */
-public interface ILibraryResource extends Resource {
-	long getLoadStamp();
-	URI getProxyURI(EObject object);
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/ILibraryResourceSet.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/ILibraryResourceSet.java
deleted file mode 100755
index b17ee18..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/ILibraryResourceSet.java
+++ /dev/null
@@ -1,176 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.persistence;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.epf.persistence.refresh.IRefreshListener;
-import org.eclipse.epf.services.ILibraryPersister;
-import org.eclipse.epf.services.Services;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.ecore.IUmaResourceSet;
-
-/**
- * A resource set that manages a collection of {@link Resource}
- * 
- * @author Phong Nguyen Le
- * @since 1.1
- */
-public interface ILibraryResourceSet extends IUmaResourceSet {
-	/**
-	 * Gets the persistence type this resource set supports
-	 * 
-	 * @return the persistence type
-	 * @see Services#getDefaultLibraryPersistenceType()
-	 * @see Services#XMI_PERSISTENCE_TYPE
-	 */
-	String getPersistenceType();
-
-	/**
-	 * Loads method libraries into this resource set from the given URI.
-	 * 
-	 * @param parameters
-	 * @return
-	 */
-	void loadMethodLibraries(URI uri, Map parameters)
-			throws LibraryResourceException;
-
-	/**
-	 * Gets the list of method libraries that have been loaded into this
-	 * resource set.
-	 * 
-	 * @return
-	 */
-	List getMethodLibraries();
-
-	/**
-	 * Gets the first loaded method library of this resource set.
-	 * 
-	 * @return the method library or <code>null</code> if it is not loaded
-	 *         yet.
-	 * @see #loadLibrary(URI, Map)
-	 */
-	MethodLibrary getFirstMethodLibrary();
-
-	/**
-	 * Gets the object with the specified GUID (Globally Unique Identifier)
-	 * 
-	 * @param guid
-	 * @return
-	 */
-	EObject getEObject(String guid);
-
-	Map getDefaultSaveOptions();
-
-	/**
-	 * Loads the given opposite features of all loaded objects in this resource
-	 * set.
-	 * 
-	 * @param oppositeFeatures
-	 */
-	void loadOppositeFeatures(List oppositeFeatures);
-
-	/**
-	 * Loads the given opposite features of those objects in this resource set
-	 * whose GUIDs are specified in <code>GUIDs</code> set.
-	 * 
-	 * @param oppositeFeatures
-	 * @param GUIDs
-	 */
-	void loadOppositeFeatures(List oppositeFeatures, Set GUIDs);
-
-	/**
-	 * Saves this resource set with the given save options.
-	 * 
-	 * @param options
-	 *            save options
-	 * @throws LibraryResourceException
-	 */
-	void save(Map options) throws LibraryResourceException;
-
-	/**
-	 * Unloads the given object in this resource set
-	 * 
-	 * @param object
-	 * @return boolean <code>true</code> if the given object was unloaded
-	 *         successfully
-	 */
-	boolean unload(EObject object);
-
-	/**
-	 * Unloads the specified resource of this resource set.
-	 * 
-	 * @param resource
-	 * @param options
-	 */
-	void unload(Resource resource, Map options);
-
-	/**
-	 * Reloads the given resources
-	 * 
-	 * @param resources
-	 * @return resources that had been reloaded
-	 */
-	Collection reloadResources(Collection resources);
-
-	/**
-	 * Reloads the given persisted objects.
-	 * 
-	 * @param objects
-	 * @return objects that have been reloaded
-	 */
-	Collection reloadObjects(Collection objects);
-
-	/**
-	 * Unloads this resource set. This will unload every resource in this
-	 * resource set and reset the resource set to the state before loading the
-	 * library.
-	 * 
-	 */
-	void unload();
-
-	/**
-	 * Checks if there is any unresolved proxy detected in the library
-	 * 
-	 * @return
-	 */
-	boolean hasUnresolvedProxy();
-
-	/**
-	 * Subscribes the specified listener to listen to refresh events broadcasted
-	 * whenever resources or objects of this resource set is refreshed/reloaded.
-	 * 
-	 * @param listener
-	 * @see #reloadResources(Collection)
-	 */
-	void addRefreshListener(IRefreshListener listener);
-	
-	/**
-	 * Unsubscribes the specified listener from listening to refresh events.
-	 * 
-	 * @param listener
-	 */
-	void removeRefreshListenter(IRefreshListener listener);
-
-	ILibraryPersister getPersister();
-
-	void checkModify(Resource[] resources, Object context)
-			throws LibraryResourceException;
-
-	IStatus checkModify(Collection eObjects, Object context);
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/ILibraryResourceSetFactory.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/ILibraryResourceSetFactory.java
deleted file mode 100755
index b2973b5..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/ILibraryResourceSetFactory.java
+++ /dev/null
@@ -1,35 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.persistence;
-
-/**
- * Factory to create {@link ILibraryResourceSet} instance of the particular
- * persistence type
- * 
- * @author Phong Nguyen Le - Oct 26, 2006
- * @since 1.0
- */
-public interface ILibraryResourceSetFactory {
-
-	/**
-	 * Gets the persistence type of the resource set created by this factory
-	 * 
-	 * @return the persistence type
-	 */
-	String getPersistenceType();
-
-	/**
-	 * Creates a new library resource set
-	 * 
-	 * @return a new library resource set
-	 */
-	ILibraryResourceSet createLibraryResourceSet();
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/IRefreshInfo.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/IRefreshInfo.java
deleted file mode 100755
index fea7b0ce..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/IRefreshInfo.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.persistence;
-
-import java.util.Collection;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-/**
- * @author Phong Nguyen Le - Oct 3, 2006
- * @since  1.0
- */
-public interface IRefreshInfo {
-	/**
-	 * Gets existing resources that reappears in workspace
-	 * 
-	 * @return the addedResources
-	 */
-	public Collection getAddedResources();
-	
-	/**
-	 * Gets newly added workspace resources
-	 * 
-	 * @return
-	 */
-	public Collection getAddedWorkspaceResources();
-	
-	/**
-	 * @return Returns the changedResources.
-	 */
-	public Collection getChangedResources();
-	
-	/**
-	 * @return the loadedBeforeRefreshResources
-	 */
-	public Collection getReloadedBeforeRefreshResources();
-	
-	/**
-	 * @return Returns the removedResources.
-	 */
-	public Collection getRemovedResources();
-	
-	/**
-	 * Notifies this manager that the given resource just has been saved.
-	 * 
-	 * @param resource
-	 */
-	public void resourceSaved(Resource resource);	
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/LibraryResourceException.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/LibraryResourceException.java
deleted file mode 100755
index e40b013..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/LibraryResourceException.java
+++ /dev/null
@@ -1,53 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.persistence;
-
-/**
- * @author Phong Nguyen Le - Oct 2, 2006
- * @since  1.0
- */
-public class LibraryResourceException extends Exception {
-
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 8272587344678676828L;
-
-	/**
-	 * 
-	 */
-	public LibraryResourceException() {
-		super();
-	}
-
-	/**
-	 * @param message
-	 */
-	public LibraryResourceException(String message) {
-		super(message);
-	}
-
-	/**
-	 * @param message
-	 * @param cause
-	 */
-	public LibraryResourceException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	/**
-	 * @param cause
-	 */
-	public LibraryResourceException(Throwable cause) {
-		super(cause);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/PersistenceService.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/PersistenceService.java
deleted file mode 100755
index 91691c1..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/PersistenceService.java
+++ /dev/null
@@ -1,145 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.persistence;
-
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.epf.persistence.PersistencePlugin;
-import org.osgi.framework.Bundle;
-
-/**
- * @author Phong Nguyen Le - Oct 7, 2006
- * @since 1.0
- */
-public class PersistenceService {
-	private static final boolean DEBUG = PersistencePlugin.getDefault().isDebugging();
-	
-	public static final PersistenceService INSTANCE = new PersistenceService();
-
-	private static HashMap typeToFactoryDefMap;
-
-	private PersistenceService() {
-
-	}
-
-	/**
-	 * Creates a new ResourceSet for the given persistence type
-	 * 
-	 * @param type
-	 * @return
-	 */
-	public ILibraryResourceSet createResourceSet(String type) {
-		ILibraryResourceSetFactory factory = getFactory(type);
-		if(factory != null) {
-			return factory.createLibraryResourceSet();
-		}
-		else {
-			throw new IllegalArgumentException("Unknown type: " + type); //$NON-NLS-1$
-		}
-	}
-
-	private static class FactoryDef {
-		Bundle bundle;
-
-		String type;
-
-		String className;
-		
-		ILibraryResourceSetFactory instance;
-
-		/**
-		 * @param bundle
-		 * @param type
-		 * @param className
-		 * @param instance
-		 */
-		private FactoryDef(Bundle bundle, String type, String className) {
-			super();
-			this.bundle = bundle;
-			this.type = type;
-			this.className = className;
-		}
-				
-	}
-	
-	public static final ILibraryResourceSetFactory getFactory(String persistenceType) {
-		if (typeToFactoryDefMap == null) {
-			typeToFactoryDefMap = new HashMap();
-			// Process the "org.eclipse.epf.library.persistence.migrators"
-			// extension point
-			// contributors.
-			IExtensionRegistry extensionRegistry = Platform
-					.getExtensionRegistry();
-			IExtensionPoint extensionPoint = extensionRegistry
-					.getExtensionPoint(
-							"org.eclipse.epf.library.persistence", "resourceSetFactories"); //$NON-NLS-1$ //$NON-NLS-2$
-			if (extensionPoint != null) {
-				IExtension[] extensions = extensionPoint.getExtensions();
-				for (int i = 0; i < extensions.length; i++) {
-					IExtension extension = extensions[i];
-					String pluginId = extension.getNamespaceIdentifier();
-					Bundle bundle = Platform.getBundle(pluginId);
-					IConfigurationElement[] configElements = extension
-							.getConfigurationElements();
-					for (int j = 0; j < configElements.length; j++) {
-						IConfigurationElement configElement = configElements[j];
-						try {
-							String className = configElement
-									.getAttribute("class"); //$NON-NLS-1$
-							String type = configElement
-									.getAttribute("type"); //$NON-NLS-1$
-							if (className != null
-									&& className.trim().length() > 0
-									&& type != null
-									&& type.trim().length() > 0) {
-								typeToFactoryDefMap.put(type, new FactoryDef(bundle,
-										type, className));
-							}
-						} catch (Exception e) {
-							CommonPlugin.INSTANCE.log(e);
-						}
-					}
-				}
-			}
-		}
-		FactoryDef factory = (FactoryDef) typeToFactoryDefMap.get(persistenceType);
-		if (factory != null) {
-			if (factory.instance == null) {
-				try {
-					ILibraryResourceSetFactory resourceSetFactory = (ILibraryResourceSetFactory) factory.bundle.loadClass(
-							factory.className).newInstance();
-					if(persistenceType.equals(resourceSetFactory.getPersistenceType())) {
-						factory.instance = resourceSetFactory;
-					}
-					else {
-						PersistencePlugin.getDefault().getLogger().logError(factory.className +
-								" is registered with the wrong persistence type '" + persistenceType + //$NON-NLS-1$
-								"'. The correct type must be '" + resourceSetFactory.getPersistenceType() + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				} catch (Exception e) {
-					PersistencePlugin.getDefault().getLogger().logError(e);
-					if(DEBUG) {
-						e.printStackTrace();
-					}
-				}
-			}
-			return factory.instance;
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/internal/AccessController.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/internal/AccessController.java
deleted file mode 100755
index e39046e..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/internal/AccessController.java
+++ /dev/null
@@ -1,81 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.persistence.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.epf.library.persistence.ILibraryResourceSet;
-import org.eclipse.epf.persistence.FileManager;
-import org.eclipse.epf.services.IAccessController;
-
-/**
- * @author Phong Nguyen Le - Oct 9, 2006
- * @since  1.0
- */
-public class AccessController implements IAccessController {
-
-	public AccessController() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.IAccessController#checkModify(java.util.Collection, java.lang.Object)
-	 */
-	public IStatus checkModify(Collection eObjects, Object context) {
-		if(eObjects.isEmpty()) {
-			return Status.OK_STATUS;
-		}
-		ResourceSet resourceSet = null;
-		for (Iterator iter = eObjects.iterator(); iter.hasNext();) {
-			EObject o = (EObject) iter.next();
-			Resource resource = o.eResource();
-			if(resource != null) {
-				resourceSet = resource.getResourceSet();
-				if(resourceSet != null) {
-					break;
-				}
-			}
-		}
-		if(resourceSet instanceof ILibraryResourceSet) {
-			return ((ILibraryResourceSet)resourceSet).checkModify(eObjects, context);
-		}
-		return Status.OK_STATUS;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.IAccessController#checkModify(org.eclipse.emf.ecore.resource.Resource[], java.lang.Object)
-	 */
-	public IStatus checkModify(Resource[] resources, Object context) {
-		if(resources.length == 0) {
-			return Status.OK_STATUS;
-		}
-		ArrayList<String> paths = new ArrayList<String>();
-		for (int i = 0; i < resources.length; i++) {
-			Resource resource = resources[i];
-			if(resource.getURI().isFile()) {
-				paths.add(resource.getURI().toFileString());
-			}
-		}
-		if(!paths.isEmpty()) {
-			String[] arr = new String[paths.size()];
-			paths.toArray(arr);
-			return FileManager.getInstance().checkModify(arr, context);
-		}
-		return Status.OK_STATUS;		
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/internal/IFailSafeSavable.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/internal/IFailSafeSavable.java
deleted file mode 100755
index e971ca0..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/internal/IFailSafeSavable.java
+++ /dev/null
@@ -1,32 +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.library.persistence.internal;
-
-/**
- * Interface a resource must implement to support fail-safe persistence
- * 
- * @author Phong Nguyen Le
- *
- * @since 1.2
- */
-public interface IFailSafeSavable {
-	void commit();
-	
-	boolean restore();
-	
-	void setTxID(String txID);
-	
-	boolean hasTempURI();
-	
-	void txFinished(boolean successful);
-	
-	void deleteBackup();
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/util/ExtendedResourceSet.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/util/ExtendedResourceSet.java
deleted file mode 100755
index d3194b8..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/util/ExtendedResourceSet.java
+++ /dev/null
@@ -1,103 +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.library.persistence.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-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.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.epf.common.CommonPlugin;
-import org.eclipse.epf.persistence.UnnormalizedURIException;
-
-/**
- * A extended resource set whose objects can references objects of other resource set
- * 
- * @author Phong Nguyen Le - Aug 9, 2006
- * @since  1.0
- */
-public class ExtendedResourceSet extends ResourceSetImpl {
-	public static final int URI_TYPE_UNKNOWN = 0;
-	public static final int URI_TYPE_LOCAL = 1;
-	public static final int URI_TYPE_EXTERNAL = 2;
-	
-	protected List<ResourceSet> referencedResourceSets = new ArrayList<ResourceSet>();
-
-	
-	/**
-	 * Gets the type of the given URI.
-	 * 
-	 * @param uri
-	 * @return one of URI type constants: {@link #URI_TYPE_EXTERNAL}, {@link #URI_TYPE_LOCAL}, {@link #URI_TYPE_UNKNOWN}
-	 */
-	protected int getURIType(URI uri) {
-		return URI_TYPE_UNKNOWN;
-	}
-	
-	public boolean add(ResourceSet referencedResourceSet) {
-		if(!referencedResourceSets.contains(referencedResourceSet)) {
-			return referencedResourceSets.add(referencedResourceSet);
-		}
-		return false;
-	}
-	
-	@Override
-	public EObject getEObject(URI uri, boolean loadOnDemand) {
-		EObject object = null;
-		UnnormalizedURIException ex = null;
-		int uriType = getURIType(uri);
-		if(uriType == URI_TYPE_UNKNOWN || uriType == URI_TYPE_LOCAL) {
-			try {
-				object = super.getEObject(uri, loadOnDemand);
-			} catch (UnnormalizedURIException e) {
-				ex = e;
-			}
-			if(object != null) {
-				return object;
-			}
-		}
-		if(uriType == URI_TYPE_UNKNOWN || uriType == URI_TYPE_EXTERNAL) {
-			for (Iterator iter = referencedResourceSets.iterator(); iter.hasNext();) {
-				ResourceSet resourceSet = (ResourceSet) iter.next();
-				try {
-					object = resourceSet.getEObject(uri, loadOnDemand);
-					if(object != null) {
-						return object;
-					}
-				} catch (UnnormalizedURIException e) {
-					ex = e;
-				}
-			}
-		} 
-		
-		if(ex != null) {
-			throw ex;
-		}
-		return object;
-	}	
-	
-	public void dispose() {
-		for (Iterator iter = getResources().iterator(); iter.hasNext();) {
-			Resource resource = (Resource) iter.next();
-			try{
-				resource.unload();			
-			}
-			catch(Exception e) {
-				CommonPlugin.getDefault().getLogger().logError(e);
-			}
-		}
-		referencedResourceSets.clear();
-	}
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/DelegateFileManager.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/DelegateFileManager.java
deleted file mode 100755
index 57abbd2..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/DelegateFileManager.java
+++ /dev/null
@@ -1,59 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.epf.services.IFileManager;
-
-/**
- * @author Phong Nguyen Le - Oct 10, 2006
- * @since  1.0
- */
-public class DelegateFileManager implements IFileManager {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.IFileManager#checkModify(java.lang.String, java.lang.Object)
-	 */
-	public IStatus checkModify(String path, Object context) {
-		return FileManager.getInstance().checkModify(path, context);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.IFileManager#checkModify(java.lang.String[], java.lang.Object)
-	 */
-	public IStatus checkModify(String[] paths, Object context) {
-		return FileManager.getInstance().checkModify(paths, context);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.IFileManager#delete(java.lang.String)
-	 */
-	public boolean delete(String path) {
-		return FileManager.getInstance().delete(path);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.IFileManager#move(java.lang.String, java.lang.String)
-	 */
-	public boolean move(String oldPath, String newPath) {
-		return FileManager.getInstance().move(oldPath, newPath);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.IFileManager#rename(java.io.File, java.io.File)
-	 */
-	public boolean rename(File oldFile, File newFile) {
-		return FileManager.getInstance().rename(oldFile, newFile);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/ExtendedResourceSet.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/ExtendedResourceSet.java
deleted file mode 100755
index 99761c7..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/ExtendedResourceSet.java
+++ /dev/null
@@ -1,78 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * A extended resource set whose objects can references objects of other resource set
- * 
- * @author Phong Nguyen Le - Aug 9, 2006
- * @since  1.0
- */
-public class ExtendedResourceSet extends MultiFileResourceSetImpl {
-	public static final int URI_TYPE_UNKNOWN = 0;
-	public static final int URI_TYPE_LOCAL = 1;
-	public static final int URI_TYPE_EXTERNAL = 2;
-	
-	protected MultiFileResourceSetImpl referencedResourceSet;
-
-	/**
-	 * Creates an {@link ExtendedResourceSet} that can have reference to objects in the given resource set 
-	 */
-	public ExtendedResourceSet(MultiFileResourceSetImpl referencedResourceSet) {
-		super();
-		this.referencedResourceSet = referencedResourceSet;
-	}
-	
-	/**
-	 * Gets the type of the given URI.
-	 * 
-	 * @param uri
-	 * @return one of URI type constants: {@link #URI_TYPE_EXTERNAL}, {@link #URI_TYPE_LOCAL}, {@link #URI_TYPE_UNKNOWN}
-	 */
-	protected int getURIType(URI uri) {
-		return URI_TYPE_UNKNOWN;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.persistence.MultiFileResourceSetImpl#getEObject(org.eclipse.emf.ecore.EObject, org.eclipse.emf.common.util.URI, boolean)
-	 */
-	public EObject getEObject(EObject resolver, URI uri, boolean loadOnDemand) {
-		EObject object = null;
-		UnnormalizedURIException ex = null;
-		int uriType = getURIType(uri);
-		if(uriType == URI_TYPE_UNKNOWN || uriType == URI_TYPE_LOCAL) {
-			try {
-				object = super.getEObject(resolver, uri, loadOnDemand);
-			} catch (UnnormalizedURIException e) {
-				ex = e;
-			}
-			if(object != null) {
-				return object;
-			}
-		}
-		if(uriType == URI_TYPE_UNKNOWN || uriType == URI_TYPE_EXTERNAL) {
-			try {
-				object = referencedResourceSet.getEObject(resolver, uri,
-						loadOnDemand);
-			} catch (UnnormalizedURIException e) {
-				ex = e;
-			}
-		} 
-		
-		if(ex != null) {
-			throw ex;
-		}
-		return object;
-	}
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/FailSafePersistenceHelper.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/FailSafePersistenceHelper.java
deleted file mode 100755
index be7cf88..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/FailSafePersistenceHelper.java
+++ /dev/null
@@ -1,255 +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.persistence;
-
-import java.io.File;
-
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.persistence.util.PersistenceResources;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Phong Nguyen Le
- *
- * @since 1.2
- */
-public class FailSafePersistenceHelper {
-	private URI finalURI;
-	private URI oldURI;
-	private String currentTxID;
-	private Resource resource;
-	private URI tempURI;
-	private String id;
-	private String backupFile;
-	private URIConverter converter;
-	
-	public FailSafePersistenceHelper(Resource resource, String id) {
-		this.resource = resource; 
-		this.id = id;
-		this.converter = resource.getResourceSet() != null ? resource.getResourceSet().getURIConverter() : null;
-	}
-
-	/**
-	 * Sets the temporary URI to save this resource to and it will be renamed to
-	 * the original URI when saving is done
-	 */
-	public URI setTempURI(String txID) {
-		if (finalURI == null) {
-			finalURI = oldURI = resource.getURI();
-			currentTxID = txID;
-
-			tempURI = createTempURI();
-			resource.setURI(tempURI);
-		}
-		return tempURI;
-	}
-	
-	private URI createTempURI() {
-		return URI.createFileURI(new StringBuffer(MultiFileXMIResourceImpl.getTempDir()).append(
-				File.separator).append(currentTxID)
-				.append("new").append(id).toString()); //$NON-NLS-1$
-	}
-	
-	public String getBackupFilePath() {
-		String backupFile = new StringBuffer(MultiFileXMIResourceImpl.getTempDir())
-				.append(File.separator)
-				.append(currentTxID)
-				.append("old").append(id).toString(); //$NON-NLS-1$
-		return backupFile;
-	}
-	
-	private String toFileString(URI uri) {
-		return FileManager.toFileString(uri, converter);
-	}
-	
-	public void commit() {
-		if (finalURI != null && !resource.getContents().isEmpty()) {
-			File finalFile = new File(toFileString(finalURI));
-			boolean wasMove = !oldURI.equals(finalURI);
-			if (wasMove) {
-			} else {
-				// back up the file
-				//
-				String backup = getBackupFilePath();
-				File bakFile = new File(backup);
-
-				// trying to delete the old backup file if it exists
-				//
-				if (bakFile.exists()) {
-					bakFile.delete();
-				}
-
-				if (finalFile.exists()) {
-					// some CM provider like ClearCase renamed the versioned
-					// file it its repository as soon as user renamed the file
-					// in the workspace. To avoid this, use only regular rename
-					// routine of java.io.File instead of IResource routine
-					//
-					if (FileUtil.moveFile(finalFile, bakFile)) {
-						backupFile = backup;
-					} else {
-						String msg = NLS.bind(
-								PersistenceResources.renameError_msg,
-								finalFile, backup);
-						throw new MultiFileIOException(msg);
-					}
-				}
-			}
-
-			// rename the resource file to the original name
-			//
-			File currentFile = new File(wasMove ? toFileString(oldURI)
-					: toFileString(resource.getURI()));
-			boolean success = false;
-			if (wasMove) {
-				success = MultiFileSaveUtil.move(resource, currentFile, finalFile);
-			} else {
-				// some CM provider like ClearCase renamed the versioned file it
-				// its repository as soon as user renamed the file
-				// in the workspace. To avoid this, use only regular rename
-				// routine of java.io.File instead of IResource routine
-				//
-				success = FileUtil.moveFile(currentFile, finalFile);
-			}
-			if (!success) {
-				String msg = NLS.bind(PersistenceResources.renameError_msg,
-						currentFile, finalFile);
-				throw new MultiFileIOException(msg);
-			} else {
-				if (wasMove) {
-					didMove();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Subclass to override to handle post move
-	 */
-	protected void didMove() {
-	}
-
-	public void deleteBackup() {
-		if (backupFile != null) {
-			try {
-				// FileManager.getInstance().delete(backupFile);
-				new File(backupFile).delete();
-				backupFile = null;
-			} catch (Throwable e) {
-				CommonPlugin.INSTANCE.log(e);
-				if (MultiFileSaveUtil.DEBUG) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-	
-	public boolean hasTempURI() {
-		if (currentTxID != null) {
-			return createTempURI().equals(resource.getURI());
-		}
-		return false;
-	}
-
-	public URI getFinalURI() {
-		if (finalURI != null) {
-			return finalURI;
-		}
-		return resource.getURI();
-	}
-
-	public boolean restore() {
-		File src = null, dest = null;
-		boolean moved = false;
-		if (backupFile != null) {
-			src = new File(backupFile);
-			dest = new File(toFileString(getFinalURI()));
-		} else {
-			moved = oldURI != null && !oldURI.equals(finalURI);
-			if (moved) {
-				File file = new File(toFileString(getFinalURI()));
-				dest = new File(toFileString(oldURI));
-				moved = file.exists() && !dest.exists();
-				if (moved) {
-					src = file;
-				}
-			}
-		}
-		if (src != null) {
-			if (dest.exists()) {
-				FileUtil.moveFile(dest,new File(toFileString(resource.getURI())));
-			}
-			boolean success;
-			if (moved) {
-				success = MultiFileSaveUtil.move(resource, src, dest);
-				// if(success) {
-				// MultiFileSaveUtil.updateURIMappings(this, null);
-				// }
-			} else {
-				success = FileUtil.moveFile(src,dest);
-			}
-			if (!success) {
-				throw new MultiFileIOException(NLS.bind(
-						PersistenceResources.restoreResourceError_msg, this));
-			}
-			return true;
-		}
-		return false;
-	}
-
-	public void txFinished(boolean successful) {
-//		boolean wasMove = !oldURI.equals(finalURI);
-		if (successful) {
-			resource.setURI(finalURI);
-			resource.setModified(false);
-//			updateTimeStamps();
-//			FileManager.getInstance().refresh(this);
-//			if(!wasMove) {
-//				MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) getResourceSet();
-//				if(resourceSet != null) {
-//					resourceSet.getUnresolvedProxyMarkerManager().validateMarkers(this);
-//				}
-//			}
-		} else {
-			restoreURI();
-//			if (wasMove) {
-//				// restore uri of ResourceDescriptor of this resource
-//				//
-//				MultiFileSaveUtil.updateURIMappings(this, oldURI, null, true);
-//			}
-		}
-//		if (oldURI != null) {
-//			MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) getResourceSet();
-//			if (resourceSet != null) {
-//				resourceSet.getURIToTempURIMap().remove(oldURI);
-//			}
-//			oldURI = null;
-//		}
-		currentTxID = null;
-		finalURI = null;
-	}
-
-	/**
-	 * Restores the resource URI to the original one. This method must be call
-	 * after saving regarless of its success.
-	 * 
-	 */
-	private void restoreURI() {
-		if (oldURI != null) {
-			resource.setURI(oldURI);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/FileManager.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/FileManager.java
deleted file mode 100755
index 86a9a6e..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/FileManager.java
+++ /dev/null
@@ -1,477 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import java.io.File;
-import java.security.AccessController;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.internal.resources.ResourceException;
-import org.eclipse.core.internal.resources.ResourceStatus;
-import org.eclipse.core.internal.utils.Messages;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.epf.persistence.util.PersistenceResources;
-import org.eclipse.epf.services.IFileManager;
-import org.eclipse.osgi.util.NLS;
-
-import sun.security.action.GetPropertyAction;
-
-/**
- * Implementation class for IFileManager.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class FileManager implements IFileManager {
-
-	public static final String PLUGIN_ID = FileManager.class.getPackage()
-			.getName();
-
-	private static FileManager instance = null;
-
-	private static String tmpdir;
-
-	public static String getTempDir() {
-		if (tmpdir == null) {
-			GetPropertyAction a = new GetPropertyAction("java.io.tmpdir"); //$NON-NLS-1$
-			tmpdir = ((String) AccessController.doPrivileged(a));
-		}
-		return tmpdir;
-	}
-
-	private boolean validateEditInitialized = false;
-
-	public static final FileManager getInstance() {
-		if (instance == null) {
-			synchronized (FileManager.class) {
-				if (instance == null) {
-					instance = new FileManager();
-				}
-			}
-		}
-
-		return instance;
-	}
-
-	private FileManager() {
-	}
-
-	public static IResource getResourceForLocation(String location) {
-		File file = new File(location);
-		if (!file.exists()) {
-			return null;
-		}
-		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-		IPath path = new Path(location);
-		IResource resource;
-		if (file.isFile()) {
-			resource = workspaceRoot.getFileForLocation(path);
-			if (resource == null) {
-				IResource parentResource = getResourceForLocation(file
-						.getParent());
-				if (parentResource != null) {
-					try {
-						parentResource.refreshLocal(IResource.DEPTH_ONE, null);
-					} catch (CoreException e) {
-						CommonPlugin.INSTANCE.log(e);
-					}
-					resource = workspaceRoot.getFileForLocation(path);
-				}
-			}
-		} else {
-			resource = workspaceRoot.getContainerForLocation(path);
-		}
-		return resource;
-	}
-
-	public static boolean refresh(IResource resource) throws CoreException {
-		if (!resource.exists()) {
-			ArrayList foldersToRefresh = new ArrayList();
-			IContainer container;
-			for (container = resource.getParent(); !container.exists(); container = container
-					.getParent()) {
-				foldersToRefresh.add(0, container);
-			}
-			if (container.exists()) {
-				container.refreshLocal(IResource.DEPTH_ONE, null);
-			}
-			if (!foldersToRefresh.isEmpty()) {
-				for (Iterator iter = foldersToRefresh.iterator(); iter
-						.hasNext();) {
-					IFolder folder = (IFolder) iter.next();
-					if (folder.exists()) {
-						folder.refreshLocal(IResource.DEPTH_ONE, null);
-					} else {
-						return false;
-					}
-				}
-			}
-		}
-		resource.refreshLocal(IResource.DEPTH_ONE, null);
-		return true;
-	}
-
-	/**
-	 * Refreshes file or directory with given local file system
-	 * <code>path</code>
-	 * 
-	 * @param path
-	 *            local file system path
-	 * @return
-	 * @throws CoreException
-	 */
-	private static boolean refresh(String path) throws CoreException {
-		IResource resource = getResourceForLocation(path);
-		if (resource != null) {
-			return refresh(resource);
-		}
-		return false;
-	}
-
-	public boolean refresh(Resource resource) {
-		try {
-			return refresh(resource.getURI().toFileString());
-		} catch (CoreException e) {
-			CommonPlugin.INSTANCE.log(e);
-			return false;
-		}
-	}
-
-	public boolean move(String oldPath, String newPath) {
-		return move(oldPath, newPath, false);
-	}
-
-	public boolean move(String oldPath, String newPath,
-			boolean forceRemoveSource) {
-		try {
-			refresh(oldPath);
-
-			IResource resource = null;
-			IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace()
-					.getRoot();
-
-			// create the folders of the destination if they did not exist
-			IPath destPath = new Path(newPath);
-			if (new File(oldPath).isFile()) {
-				resource = workspaceRoot.getFileForLocation(destPath);
-			} else {
-				resource = workspaceRoot.getContainerForLocation(destPath);
-			}
-			if (resource.exists()) {
-				resource.refreshLocal(IResource.DEPTH_ZERO, null);
-				if(resource.exists()) {
-					throw new MultiFileIOException(NLS.bind(
-							PersistenceResources.moveError_msg, oldPath, newPath));
-				}
-			}
-			ArrayList foldersToCreate = new ArrayList();
-			IContainer container;
-			for (container = resource.getParent(); !container.exists(); container = container
-					.getParent()) {
-				foldersToCreate.add(0, container);
-			}
-			if (!foldersToCreate.isEmpty()) {
-				container.refreshLocal(IResource.DEPTH_ONE, null);
-				for (Iterator iter = foldersToCreate.iterator(); iter.hasNext();) {
-					IFolder folder = (IFolder) iter.next();
-					if (!folder.exists()) {
-						folder.create(true, true, null);
-					} else {
-						folder.refreshLocal(IResource.DEPTH_ONE, null);
-					}
-				}
-			}
-			destPath = resource.getFullPath();
-
-			IPath path = new Path(oldPath);
-			IFile file = workspaceRoot.getFileForLocation(path);
-			if (file != null && file.exists()) {
-				resource = file;
-			} else {
-				resource = workspaceRoot.getContainerForLocation(path);
-			}
-			if (resource != null) {
-				try {
-					resource.move(destPath, true, null);
-				} catch (ResourceException e) {
-					if (forceRemoveSource) {
-						throw e;
-					}
-
-					boolean failed = false;
-
-					// handle situation when Eclipse moves file/directory by
-					// copying it to destination then deleting the source
-					// but deletion failed
-					IStatus[] statuses = e.getStatus().getChildren();
-					for (int i = 0; i < statuses.length; i++) {
-						IStatus status = statuses[i];
-						if (status.getCode() == IResourceStatus.FAILED_DELETE_LOCAL
-								&& status.getMessage() == Messages.localstore_deleteProblem) {
-							String msg = MessageFormat
-									.format(
-											"Warning while moving ''{0}'' to ''{1}'': {2}", new Object[] { oldPath, newPath, status.getMessage() }); //$NON-NLS-1$
-							CommonPlugin.INSTANCE.log(msg);
-						} else {
-							failed = true;
-						}
-					}
-					if (failed || !new File(newPath).exists()) {
-						return false;
-					}
-				}
-				return true;
-			}
-		} catch (CoreException e) {
-			CommonPlugin.INSTANCE.log(e);
-			if (MultiFileSaveUtil.DEBUG) {
-				e.printStackTrace();
-			}
-		}
-		return false;
-	}
-
-	public boolean rename(File oldFile, File newFile) {
-		return move(oldFile.getAbsolutePath(), newFile.getAbsolutePath());
-	}
-
-	public void deleteResource(String path, IProgressMonitor monitor)
-			throws CoreException {
-		// no need to refresh the whole tree from specified path
-		// getResourceForLocation() refreshes resource in a more efficient way
-		//
-		// IWorkspaceRoot workspaceRoot =
-		// ResourcesPlugin.getWorkspace().getRoot();
-		// try {
-		// workspaceRoot.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-		// } catch (CoreException e1) {
-		// e1.printStackTrace();
-		// }
-
-		IResource resource = getResourceForLocation(path);
-		if (resource != null) {
-			resource.delete(true, monitor);
-		}
-	}
-
-	public boolean delete(String path) {
-		try {
-			deleteResource(path, null);
-			return true;
-		} catch (CoreException e) {
-			CommonPlugin.INSTANCE.log(e);
-			if (MultiFileSaveUtil.DEBUG) {
-				e.printStackTrace();
-			}
-		}
-		return false;
-	}
-
-	private static boolean fromCC(IStatus status) {
-		String pluginId = status.getPlugin();
-		return pluginId != null
-				&& pluginId.toLowerCase().indexOf("clearcase") != -1; //$NON-NLS-1$
-	}
-
-	public IStatus checkModify(String[] paths, Object context) {
-		IStatus status = null;
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		IFile[] files = new IFile[paths.length];
-		ArrayList notFoundFiles = new ArrayList();
-		for (int i = 0; i < paths.length; i++) {
-			String path = paths[i];
-			try {
-				refresh(path);
-			} catch (CoreException e) {
-				CommonPlugin.INSTANCE.log(e);
-			}
-			IFile file = workspace.getRoot().getFileForLocation(new Path(path));
-			if (file == null) {
-				notFoundFiles.add(path);
-			} else {
-				files[i] = file;
-			}
-		}
-		if (!notFoundFiles.isEmpty()) {
-			return new Status(IStatus.WARNING, PLUGIN_ID, IStatus.WARNING, NLS
-					.bind(PersistenceResources.fileNotFoundError_msg,
-							notFoundFiles), null);
-		}
-
-		if (!validateEditInitialized) {
-			status = workspace.validateEdit(files, context);
-			validateEditInitialized = true;
-			if (status.isOK()) {
-				// double-check after initialization
-				//
-				status = workspace.validateEdit(files, context);
-			}
-		} else {
-			status = workspace.validateEdit(files, context);
-		}
-
-		if (status.isOK()) {
-			// some version control provider still returns OK status even though
-			// user cancelled the check out
-			// double-check here again to make sure the file is not read-only
-			//			
-			ArrayList readOnlyFiles = new ArrayList();
-			for (int i = 0; i < files.length; i++) {
-				IFile file = files[i];
-				try {
-					file.refreshLocal(IResource.DEPTH_ZERO, null);
-				} catch (CoreException e) {
-					CommonPlugin.INSTANCE.log(e);
-				}
-				if (file.isReadOnly()) {
-					readOnlyFiles.add(file);
-				}
-			}
-			if (!readOnlyFiles.isEmpty()) {
-				MultiStatus multiStatus = new MultiStatus(PLUGIN_ID,
-						IStatus.OK, PersistenceResources.modifyFilesError_msg,
-						null);
-				for (Iterator iter = readOnlyFiles.iterator(); iter.hasNext();) {
-					IFile file = (IFile) iter.next();
-					String localPath = file.getLocation().toOSString();
-					String msg = MessageFormat.format(
-							PersistenceResources.FileManager_fileReadOnly,
-							new Object[] { localPath });
-					multiStatus.add(new ResourceStatus(IStatus.ERROR, 0, file
-							.getFullPath(), msg, null));
-				}
-				status = multiStatus;
-				return status;
-			}
-		} else {
-			// hack for clearcase
-			if (fromCC(status)) {
-				String msg = PersistenceResources.modifyFilesError_msg;
-				MultiStatus multiStatus = new MultiStatus(PLUGIN_ID, status
-						.getCode(), msg, null);
-				multiStatus.add(status);
-				return multiStatus;
-			}
-		}
-
-		// convert workspace path to local file system path
-		if (status instanceof MultiStatus) {
-			MultiStatus ms = (MultiStatus) status;
-			for (int i = 0; i < ms.getChildren().length; i++) {
-				IStatus childStatus = ms.getChildren()[i];
-				if (childStatus instanceof IResourceStatus
-						&& childStatus.getCode() == IResourceStatus.READ_ONLY_LOCAL) {
-					IResourceStatus resourceStatus = ((IResourceStatus) childStatus);
-					IPath path = resourceStatus.getPath();
-					IFile file = ResourcesPlugin.getWorkspace().getRoot()
-							.getFile(path);
-					String localPath = file.getLocation().toOSString();
-					String msg = MessageFormat.format(
-							PersistenceResources.FileManager_fileReadOnly,
-							new Object[] { localPath }); //$NON-NLS-1$
-					ms.getChildren()[i] = new ResourceStatus(childStatus
-							.getSeverity(), childStatus.getCode(),
-							resourceStatus.getPath(), msg, childStatus
-									.getException());
-				}
-			}
-		}
-
-		return status;
-	}
-
-	/**
-	 * @see org.eclipse.epf.services.IFileManager#checkModify(java.lang.String,
-	 *      java.lang.Object)
-	 */
-	public IStatus checkModify(String path, Object context) {
-		return checkModify(new String[] { path }, context);
-	}
-
-	/**
-	 * Checks if the given path is team-private file or folder
-	 * 
-	 * @param path
-	 * @return
-	 */
-	public boolean isTeamPrivate(String path) {
-		IResource resource = getResourceForLocation(path);
-		return resource != null && resource.isTeamPrivateMember();
-	}
-
-    /**
-     * Finds the file corresponding to the specified URI, using a URI converter
-     * if necessary (and provided) to normalize it.
-     * 
-     * @param uri a URI
-     * @param converter an optional URI converter (may be <code>null</code>)
-     * 
-     * @return the file, if available in the workspace
-     */
-    public static IFile getFile(URI uri, URIConverter converter) {
-        IFile result = null;
-        
-        if ("platform".equals(uri.scheme()) && (uri.segmentCount() > 2)) { //$NON-NLS-1$
-            if ("resource".equals(uri.segment(0))) { //$NON-NLS-1$
-                IPath path = new Path(URI.decode(uri.path())).removeFirstSegments(1);
-                
-                result = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-            }
-        } else if (uri.isFile() && !uri.isRelative()) {
-            result = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(
-                new Path(uri.toFileString()));
-        } else {
-            // normalize, to see whether may we can resolve it this time
-            if (converter != null) {
-                URI normalized = converter.normalize(uri);
-                
-                if (!uri.equals(normalized)) {
-                    // recurse on the new URI
-                    result = getFile(normalized, converter);
-                }
-            }
-        }
-        
-        return result;
-    }
-
-	public static String toFileString(URI uri, URIConverter converter) {
-		if(uri.isFile()) {
-			return uri.toFileString();
-		}
-		IFile file = getFile(uri, converter);
-		return file != null ? file.getLocation().toString() : null;
-	}
-	
-	public static String toFileString(URI uri) {
-		return toFileString(uri, null);
-	}	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/FilePathProvider.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/FilePathProvider.java
deleted file mode 100755
index dfc26ec..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/FilePathProvider.java
+++ /dev/null
@@ -1,35 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.uma.MethodElement;
-
-/**
- * File-based URI provider
- * 
- * @author Phong Nguyen Le - Aug 8, 2006
- * @since  1.0
- */
-class FilePathProvider implements IURIProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.persistence.IURIProvider#getURI(org.eclipse.emf.ecore.EObject)
-	 */
-	public URI getURI(EObject object) {
-		if(object instanceof MethodElement) {
-			return MultiFileSaveUtil.createFileURI((MethodElement) object);
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/IURIProvider.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/IURIProvider.java
deleted file mode 100755
index 1fecf5a..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/IURIProvider.java
+++ /dev/null
@@ -1,31 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * Interface to provide URI for an EObject.
- * 
- * @author Phong Nguyen Le - Aug 8, 2006
- * @since  1.0
- */
-public interface IURIProvider {
-	
-	/**
-	 * Gets the URI for the given object if this object has or should have a direct resource
-	 * 
-	 * @param object
-	 * @return the URI or null if the given object does/will not have a direct resource
-	 */
-	URI getURI(EObject object);
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MethodLibraryPersister.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MethodLibraryPersister.java
deleted file mode 100755
index 2d8cae4..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MethodLibraryPersister.java
+++ /dev/null
@@ -1,1005 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.epf.library.persistence.internal.IFailSafeSavable;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-import org.eclipse.epf.persistence.util.PersistenceResources;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.services.IFileBasedLibraryPersister;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.MethodUnit;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * File-based implementation for IMethodLibraryPersister
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MethodLibraryPersister implements IFileBasedLibraryPersister {
-
-	private static class FolderInfo {
-
-		EClass eClazz;
-
-		boolean shared;
-
-		private String name;
-
-		/**
-		 * @param clazz
-		 * @param shared
-		 */
-		public FolderInfo(EClass clazz, boolean shared) {
-			super();
-			eClazz = clazz;
-			this.shared = shared;
-			this.name = lowerAndPluralize(clazz.getName());
-		}
-
-	}
-
-	public static final MethodLibraryPersister INSTANCE = new MethodLibraryPersister();
-
-	// need to expose this, jxi
-	public static final String RESOURCE_FOLDER = "resources"; //$NON-NLS-1$
-
-	private static final List folderInfos = new ArrayList();
-
-	static {
-		folderInfos.add(new FolderInfo(UmaPackage.eINSTANCE.getGuidance(),
-				false));
-		folderInfos.add(new FolderInfo(UmaPackage.eINSTANCE.getWorkProduct(),
-				true));
-		folderInfos
-				.add(new FolderInfo(UmaPackage.eINSTANCE.getActivity(), true));
-	}
-
-	protected List warnings;
-
-	public MethodLibraryPersister() {
-	}
-
-	/**
-	 * Returns the correct path (relative to the plugin) of the file of the
-	 * given content description or null if the given content does not be long
-	 * to any plugin.
-	 * 
-	 * @param content
-	 * @return
-	 */
-	public static String getCorrectPath(ContentDescription content) {
-		return getCorrectPath((DescribableElement) content.eContainer(),
-				content);
-	}
-
-	private static String getCorrectPath(DescribableElement e,
-			ContentDescription content) {
-		if (e == null)
-			return null;
-		MethodPlugin plugin = UmaUtil.getMethodPlugin(e);
-		if (plugin == null) {
-			return null;
-		}
-		Resource resource = plugin.eResource();
-		URI uri;
-		if (resource instanceof MultiFileXMIResourceImpl) {
-			uri = ((MultiFileXMIResourceImpl) resource).getFinalURI();
-		} else {
-			uri = resource.getURI();
-		}
-		File pluginDir = new File(uri.toFileString()).getParentFile();
-		String folderPath = staticGetFolderPath(e.eClass());
-		String dir = new StringBuffer(pluginDir.getAbsolutePath()).append(
-				File.separator).append(folderPath).append(File.separator)
-				.toString();
-
-		return getNextAvailableFileName(dir, e, content);
-	}
-
-	static String getNextAvailableFileName(String dir, String requestedName,
-			MultiResourceEObject e) {
-		String currentFilename = null;
-		File currentFile = null;
-		MultiFileXMIResourceImpl resource = (MultiFileXMIResourceImpl) e
-				.eDirectResource();
-		if (resource != null) {
-			// keep existing file name during move if it is not taken yet. Don't
-			// try to match the element's name
-			//
-			String path = ((MultiFileXMIResourceImpl) e.eResource())
-					.getFinalURI().toFileString();
-			currentFile = new File(path);
-			currentFilename = currentFile.getName();
-			File file = new File(dir, currentFilename);
-			if (!file.exists()) {
-				// the element is being moved
-				//
-				return file.getAbsolutePath();
-			}
-		}
-
-		// element without a resource or path is already taken
-		//
-		String path = new StringBuffer(dir).append(requestedName).append(
-				MultiFileSaveUtil.DEFAULT_FILE_EXTENSION).toString();
-		File file = new File(path);
-		if(file.equals(currentFile)) {
-			return path;
-		}
-		if ((currentFilename != null && currentFilename.equals(requestedName))
-				|| file.exists()) {
-			for (int i = 2; true; i++) {
-				path = new StringBuffer(dir).append(requestedName).append(' ')
-						.append(i).append(
-								MultiFileSaveUtil.DEFAULT_FILE_EXTENSION)
-						.toString();
-				if (!new File(path).exists()) {
-					return path;
-				}
-			}
-		} else {
-			return path;
-		}
-	}
-
-	static String getNextAvailableFileName(String dir,
-			ContentDescription content) {
-		return getNextAvailableFileName(dir, (DescribableElement) content
-				.eContainer(), content);
-	}
-
-	private static String getNextAvailableFileName(String dir,
-			DescribableElement e, ContentDescription content) {
-		return getNextAvailableFileName(dir, e.getName(),
-				(MultiResourceEObject) content);
-	}
-
-	private static String staticGetFolderPath(EClass eClazz) {
-		int size = folderInfos.size();
-		FolderInfo info = null;
-		for (int i = 0; i < size; i++) {
-			FolderInfo folderInfo = (FolderInfo) folderInfos.get(i);
-			if (folderInfo.eClazz.isSuperTypeOf(eClazz)) {
-				info = folderInfo;
-			}
-		}
-		if (info != null) {
-			if (info.eClazz == eClazz || info.shared) {
-				return info.name;
-			} else {
-				return new StringBuffer(info.name).append(File.separatorChar)
-						.append(lowerAndPluralize(eClazz.getName())).toString();
-			}
-		} else {
-			return lowerAndPluralize(eClazz.getName());
-		}
-	}
-
-	public static String lowerAndPluralize(String name) {
-		name = name.toLowerCase();
-		if (name.endsWith("children")) { //$NON-NLS-1$
-			return name;
-		} else if (name.endsWith("child")) { //$NON-NLS-1$
-			return name + "ren"; //$NON-NLS-1$
-		} else if (name.endsWith("data")) { //$NON-NLS-1$
-			return name;
-		} else if (name.endsWith("datum")) { //$NON-NLS-1$
-			return name.substring(0, name.length() - 2) + "a"; //$NON-NLS-1$
-		} else if (name.endsWith("by")) { //$NON-NLS-1$
-			return name + "s"; //$NON-NLS-1$
-		} else if (name.endsWith("y")) { //$NON-NLS-1$
-			return name.substring(0, name.length() - 1) + "ies"; //$NON-NLS-1$
-		} else if (name.endsWith("ex")) { //$NON-NLS-1$
-			return name.substring(0, name.length() - 2) + "ices"; //$NON-NLS-1$
-		} else if (name.endsWith("x")) { //$NON-NLS-1$
-			return name + "es"; //$NON-NLS-1$
-		} else if (name.endsWith("us")) { //$NON-NLS-1$
-			return name.substring(0, name.length() - 2) + "i"; //$NON-NLS-1$
-		} else if (name.endsWith("ss")) { //$NON-NLS-1$
-			return name + "es"; //$NON-NLS-1$
-		} else if (name.endsWith("s")) { //$NON-NLS-1$
-			return name;
-		} else {
-			return name + "s"; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Gets the path relative to the library root directory to the resource
-	 * folder of the given MethodElement object.
-	 * 
-	 * @param e
-	 * @return
-	 */
-	public static String getResourcePath(MethodElement e) {
-		String folderPath = getElementPath(e);
-		if (folderPath == null || folderPath.equals("")) //$NON-NLS-1$
-		{
-			return RESOURCE_FOLDER;
-		} else if (folderPath.endsWith(File.separator)) {
-			return new StringBuffer(folderPath).append(RESOURCE_FOLDER)
-					.toString();
-		} else {
-			return new StringBuffer(folderPath).append(File.separator).append(
-					RESOURCE_FOLDER).toString();
-		}
-	}
-
-	public static String getElementPath(MethodElement e) {
-		MethodPlugin plugin = UmaUtil.getMethodPlugin(e);
-		if (plugin == null) {
-			if (!(e instanceof MethodConfiguration || e instanceof MethodLibrary)) {
-				// error: plugin element without a valid plugin set. This
-				// problem needs to be fixed.
-				// still see it from time to time,
-				// for example, when lick on a capability pattern in
-				// COnfiguration Explorer
-				System.out
-						.println("error in MethodLibraryPersister.getElementPath(): plugin element without a valid plugin. This problem needs to be fixed."); //$NON-NLS-1$
-			}
-			return ""; //$NON-NLS-1$
-		}
-
-		if (plugin.eContainer() == null) {
-			// error: plugin without library set. This problem needs to be
-			// fixed.
-			// still see it from time to time
-			System.out
-					.println("error in MethodLibraryPersister.getElementPath(): plugin without library set. This problem needs to be fixed."); //$NON-NLS-1$
-			return ""; //$NON-NLS-1$
-		}
-
-		String relPluginPath;
-		if (plugin.eResource() != null) {
-			Resource libRes = UmaUtil.getMethodLibrary(plugin).eResource();
-			if (libRes == plugin.eResource()) {
-				// the plugin is not saved yet
-				relPluginPath = plugin.getName();
-			} else {
-				URI uri = MultiFileSaveUtil.getFinalURI(plugin.eResource());
-				URI relUri = uri.deresolve(MultiFileSaveUtil
-						.getFinalURI(libRes));
-				relPluginPath = relUri.trimSegments(1).toFileString();
-			}
-		} else {
-			// the library is not saved yet
-			relPluginPath = plugin.getName();
-		}
-		String folderPath = staticGetFolderRelativePath(e);
-
-		return (folderPath.length() == 0 ? relPluginPath : new StringBuffer(
-				relPluginPath).append(File.separatorChar).append(folderPath)
-				.append(File.separatorChar).toString());
-	}
-
-	public static void main(String[] args) {
-		EClass eCls = UmaPackage.eINSTANCE.getTemplate();
-		System.out.println(eCls.getName());
-	}
-
-	/**
-	 * Adjusts the location of the given resource and save all the resources
-	 * that have been changed as the result of this adjustment
-	 * 
-	 * @param resource
-	 */
-	public void adjustLocation(Resource resource) {
-		Set modifiedResources = new HashSet();
-		MultiFileSaveUtil.adjustLocation(resource, modifiedResources);
-
-		// save the modified resources
-		MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) resource
-				.getResourceSet();
-		for (Iterator iter = modifiedResources.iterator(); iter.hasNext();) {
-			try {
-				resourceSet.save((Resource) iter.next(), null);
-			} catch (Exception e) {
-				CommonPlugin.INSTANCE.log(e);
-			}
-		}
-	}
-
-	public void save(Resource resource) throws Exception {
-		MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) resource
-				.getResourceSet();
-		resourceSet.save(resource, null);
-	}
-
-	protected void deleteFiles(MethodElement e, String path,
-			ResourceSet resourceSet) {
-		if (new File(path).isDirectory() && !e.eIsProxy()) {
-			for (Iterator iter = resourceSet.getResources().iterator(); iter
-					.hasNext();) {
-				Resource res = (Resource) iter.next();
-				MethodElement me = PersistenceUtil.getMethodElement(res);
-				if (me != null && UmaUtil.isContainedBy(me, e)) {
-					res.unload();
-					iter.remove();
-				}
-			}
-		}
-
-		try {
-			FileManager.getInstance().deleteResource(path, null);
-		} catch (CoreException ex) {
-			CommonPlugin.INSTANCE.log(ex);
-			throw new WrappedException(ex);
-		}
-	}
-
-	/**
-	 * Deletes the files associated with the given MethodElement
-	 * 
-	 * @param e
-	 */
-	protected void delete(MethodElement e, Set modifiedResources) {
-		if (!UmaUtil.hasDirectResource(e)) {
-			return;
-		}
-
-		MultiFileXMIResourceImpl resource = (MultiFileXMIResourceImpl) e
-				.eResource();
-		MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) resource
-				.getResourceSet();
-
-		// Don't delete this resource's file if it still contains other
-		// MethodElement
-		for (Iterator iter = resource.getContents().iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			if (element instanceof MethodElement && element != e) {
-				resourceSet.removeURIMappings(e, modifiedResources);
-				resource.getContents().remove(e);
-				modifiedResources.add(resource);
-				return;
-			}
-		}
-
-		String path;
-		if (MultiFileSaveUtil.hasOwnFolder(e)) {
-			// path is the directory of the MethodPlugin/ProcessComponent
-			//
-			path = new File(resource.getFinalURI().toFileString()).getParent();
-
-			// unload/remove all resources under the folder
-			//
-			Collection unloadedResources = new ArrayList();
-			do {
-				unloadedResources.clear();
-				// collect all resources whose root element is contained by the
-				// given element
-				//
-				for (Iterator iter = new ArrayList(resourceSet.getResources())
-						.iterator(); iter.hasNext();) {
-					Resource res = (Resource) iter.next();
-					if (res.isLoaded()) {
-						MethodElement me = PersistenceUtil
-								.getMethodElement(res);
-						if (me != null && UmaUtil.isContainedBy(me, e)) {
-							unloadedResources.add(res);
-						}
-					}
-				}
-				for (Iterator iter = unloadedResources.iterator(); iter
-						.hasNext();) {
-					Resource res = (Resource) iter.next();
-					res.unload();
-				}
-				resourceSet.getResources().removeAll(unloadedResources);
-			} while (!unloadedResources.isEmpty());
-		} else {
-			path = resource.getFinalURI().toFileString();
-		}
-
-		try {
-			resourceSet.cleanUp(resource, modifiedResources);
-		} catch (Exception e1) {
-			CommonPlugin.INSTANCE.log(e1);
-			if (MultiFileSaveUtil.DEBUG) {
-				e1.printStackTrace();
-			}
-		}
-
-		deleteFiles(e, path, resourceSet);
-	}
-
-	/**
-	 * @param e
-	 * @param objectsWithDirectResources
-	 */
-	private static void getObjectsWithDirectResources(EObject e,
-			Collection objectsWithDirectResources) {
-		if (UmaUtil.hasDirectResource(e)) {
-			objectsWithDirectResources.add(e);
-		} else {
-			for (Iterator iter = e.eContents().iterator(); iter.hasNext();) {
-				getObjectsWithDirectResources((EObject) iter.next(),
-						objectsWithDirectResources);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.services.IFileBasedLibraryPersister#delete(org.eclipse.epf.uma.MethodElement)
-	 */
-	public void delete(MethodElement e) {
-		// collect all elements with direct resources that are the given element
-		// or its offstring
-		ArrayList elements = new ArrayList();
-		getObjectsWithDirectResources(e, elements);
-		if (!elements.isEmpty()) {
-			Set modifiedResources = new HashSet();
-			for (Iterator iter = elements.iterator(); iter.hasNext();) {
-				delete((MethodElement) iter.next(), modifiedResources);
-			}
-
-			// save modified resources
-			//
-			for (Iterator iter = modifiedResources.iterator(); iter.hasNext();) {
-				Resource resource = (Resource) iter.next();
-				try {
-					save(resource);
-				} catch (Exception ex) {
-					throw new WrappedException(ex);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Gets the relative path of the folder that can store the content of the
-	 * given MethodElement. The path is relative to its plugin folder or library
-	 * folder if the element cannot be stored in a plugin.
-	 */
-	private static String staticGetFolderRelativePath(MethodElement e) {
-		if (e instanceof MethodPlugin) {
-			return ""; //$NON-NLS-1$
-		} else if (e instanceof ContentElement) {
-			return staticGetFolderPath(e.eClass());
-		} else if (e instanceof MethodConfiguration) {
-			return MultiFileSaveUtil.METHOD_CONFIGURATION_FOLDER_NAME;
-		}
-
-		MethodUnit unit = UmaUtil.getMethodUnit(e);
-
-		if (unit instanceof ProcessComponent) {
-			Process proc = ((ProcessComponent) unit).getProcess();
-			if (proc instanceof CapabilityPattern) {
-				return MultiFileSaveUtil.CAPABILITY_PATTERN_PATH;
-			} else if (proc instanceof DeliveryProcess) {
-				return MultiFileSaveUtil.DELIVERY_PROCESS_PATH;
-			}
-		} else if (unit instanceof ContentDescription) {
-			return staticGetFolderRelativePath((MethodElement) unit
-					.eContainer());
-		}
-
-		return ""; //$NON-NLS-1$
-	}
-
-	public String getFolderRelativePath(MethodElement e) {
-		return staticGetFolderRelativePath(e);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister#getWarnings()
-	 */
-	public List getWarnings() {
-		if (warnings == null) {
-			warnings = new ArrayList();
-		}
-		return warnings;
-	}
-
-	static class FailSafePersister extends MethodLibraryPersister implements
-			FailSafeMethodLibraryPersister {
-
-		private Map saveOptions;
-
-		private TxRecord txRecord = new TxRecord() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.epf.persistence.TxRecord#clear()
-			 */
-			public void clear() {
-				if (warnings != null && !warnings.isEmpty()) {
-					// copy the warning to persister
-					//
-					FailSafePersister.this.warnings = Collections
-							.unmodifiableList(warnings);
-				}
-				super.clear();
-			}
-		};
-
-		private Map elementToInfoMapToDeleteFiles;
-
-		public FailSafePersister() {
-			saveOptions = new HashMap(
-					MultiFileResourceSetImpl.DEFAULT_SAVE_OPTIONS);
-			txRecord = new TxRecord();
-			saveOptions.put(MultiFileXMISaveImpl.TX_RECORD, txRecord);
-			elementToInfoMapToDeleteFiles = new HashMap();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.epf.persistence.MethodLibraryPersister#getWarnings()
-		 */
-		public List getWarnings() {
-			if (txRecord.getTxID() == null) {
-				return super.getWarnings();
-			}
-			return txRecord.getWarnings();
-		}
-
-		Map getSaveOptions() {
-			return saveOptions;
-		}
-
-		void checkMove(Resource resource) {
-			// disallow new operation on resource which has started operation
-			// that is not committed
-			MultiFileXMIResourceImpl mfResource = (MultiFileXMIResourceImpl) resource;
-			if (mfResource.txStarted()) {
-				throw new MultiFileIOException(NLS.bind(
-						PersistenceResources.moveResourceError_msg, resource));
-			}			
-		}
-
-		/**
-		 * @see org.eclipse.epf.uma.persistence.MethodLibraryPersister#save(org.eclipse.emf.ecore.resource.Resource)
-		 */
-		public void save(Resource resource) throws Exception {
-			if(resource.getResourceSet() instanceof MultiFileResourceSetImpl &&
-					resource instanceof MultiFileXMIResourceImpl) {
-				MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) resource
-				.getResourceSet();
-				if (resourceSet == null) {
-					return;
-				}
-
-				// update version info in library resource if needed
-				//
-				Resource libResourceToSave = null;
-				MethodElement me = PersistenceUtil.getMethodElement(resource);
-				if(me != null) {
-					MethodLibrary lib = UmaUtil.getMethodLibrary(me);
-					if(lib != null) {
-						Resource libResource = lib.eResource();
-						if(libResource != null 
-								&& libResource != resource
-								&& PersistenceUtil.checkToolVersion(libResource) != 0) {
-							libResourceToSave = libResource;
-						}
-					}
-				}
-
-				if (MultiFileXMISaveImpl.checkModifyRequired(saveOptions)) {
-					Collection resources;
-					if(libResourceToSave != null) {
-						resources = new ArrayList();
-						resources.add(resource);
-						resources.add(libResourceToSave);
-					}
-					else {
-						resources = Collections.singletonList(resource);
-					}
-					MultiFileSaveUtil.checkModify(resources);
-					MultiFileSaveUtil.checkOutOfSynch(resources);
-				}
-
-				resourceSet.save(resource, saveOptions);
-				if(libResourceToSave != null) {
-					resourceSet.save(libResourceToSave, saveOptions);
-				}
-			}
-			else if(resource instanceof IFailSafeSavable) {
-				IFailSafeSavable failSafeSavable = (IFailSafeSavable) resource;
-				failSafeSavable.setTxID(txRecord.getTxID());
-				resource.save(saveOptions);
-				txRecord.getResourcesToCommit().add(resource);
-			}
-			else {
-				throw new IllegalAccessException("Resource must implement org.eclipse.epf.library.persistence.internal.IFailSafeSavable"); //$NON-NLS-1$
-			}
-		}
-
-		/**
-		 * @see org.eclipse.epf.uma.persistence.MethodLibraryPersister#adjustLocation(org.eclipse.emf.ecore.resource.Resource)
-		 */
-		public void adjustLocation(Resource resource) {
-			checkMove(resource);
-			Set modifiedResources = new HashSet();
-			if (MultiFileSaveUtil.prepareAdjustLocation(
-					(MultiFileXMIResourceImpl) resource, modifiedResources)) {
-				txRecord.getResourcesToCommit().add(resource);
-				
-				HashSet resourcesToCheck = new HashSet(modifiedResources);
-				resourcesToCheck.addAll(resourcesToCheck);
-				MultiFileSaveUtil.checkModify(resourcesToCheck);
-				
-				if (!modifiedResources.isEmpty()) {					
-					MultiFileSaveUtil.checkOutOfSynch(modifiedResources);
-
-					// save the modified resources
-					for (Iterator iter = modifiedResources.iterator(); iter
-							.hasNext();) {
-						try {
-							save((Resource) iter.next());
-						} catch (Exception e) {
-							CommonPlugin.INSTANCE.log(e);
-							throw new MultiFileIOException(e.toString());
-						}
-					}
-				}
-			}
-			commit();
-		}
-
-		public void adjustLocation(Collection resources) {
-			if (resources == null || resources.isEmpty()) {
-				return;
-			}
-
-			for (Iterator iter = resources.iterator(); iter.hasNext();) {
-				checkMove((Resource) iter.next());
-			}
-
-			Set modifiedResources = new HashSet();
-			HashSet resourcesToCheck = new HashSet();
-			for (Iterator iter = resources.iterator(); iter.hasNext();) {
-				MultiFileXMIResourceImpl resource = (MultiFileXMIResourceImpl) iter
-						.next();
-				if (MultiFileSaveUtil.prepareAdjustLocation(
-						(MultiFileXMIResourceImpl) resource, modifiedResources)) {
-					txRecord.getResourcesToCommit().add(resource);
-					resourcesToCheck.add(resource);
-				}
-			}
-
-			resourcesToCheck.addAll(modifiedResources);
-			if(!resourcesToCheck.isEmpty()) {
-				MultiFileSaveUtil.checkModify(resourcesToCheck);
-			}			
-			if (!modifiedResources.isEmpty()) {
-				MultiFileSaveUtil.checkOutOfSynch(modifiedResources);
-
-				// save the modified resources
-				for (Iterator iter = modifiedResources.iterator(); iter
-						.hasNext();) {
-					try {
-						save((Resource) iter.next());
-					} catch (Exception e) {
-						CommonPlugin.INSTANCE.log(e);
-						throw new MultiFileIOException(e.toString());
-					}
-				}
-			}
-			commit();
-		}
-
-		/**
-		 * @see org.eclipse.epf.uma.persistence.MethodLibraryPersister#deleteFiles(org.eclipse.epf.uma.MethodElement,
-		 *      java.lang.String, org.eclipse.emf.ecore.resource.ResourceSet)
-		 */
-		protected void deleteFiles(MethodElement e, String path,
-				ResourceSet resourceSet) {
-			// keep the info to really delete the files in commit()
-			elementToInfoMapToDeleteFiles.put(e, new Object[] { path,
-					resourceSet });
-		}
-
-		private void superDeleteFiles(MethodElement e, String path,
-				ResourceSet resourceSet) {
-			super.deleteFiles(e, path, resourceSet);
-		}
-
-		/**
-		 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister.FailSafeMethodLibraryPersister#commit()
-		 */
-		public void commit() {
-			// save is done
-			// call saveIsDone() on every saved file to rename it to the correct
-			// name
-			int size = txRecord.getResourcesToCommit().size();
-			for (int i = 0; i < size; i++) {
-				((IFailSafeSavable) txRecord.getResourcesToCommit()
-						.get(i)).commit();
-			}
-
-			// notify all commited resources that the transaction is done
-			for (int i = 0; i < size; i++) {
-				((IFailSafeSavable) txRecord.getResourcesToCommit()
-						.get(i)).txFinished(true);
-			}
-
-			// delete backup
-			for (int i = 0; i < size; i++) {
-				((IFailSafeSavable) txRecord.getResourcesToCommit()
-						.get(i)).deleteBackup();
-			}
-
-			txRecord.clear();
-
-			// delete files of deleted elements
-			//
-			for (Iterator iter = elementToInfoMapToDeleteFiles.entrySet()
-					.iterator(); iter.hasNext();) {
-				Map.Entry entry = (Map.Entry) iter.next();
-				Object[] info = (Object[]) entry.getValue();
-				String path = (String) info[0];
-				try {
-					superDeleteFiles((MethodElement) entry.getKey(), path,
-							(ResourceSet) info[1]);
-				} catch (Exception e) {
-					if (e instanceof WrappedException) {
-						e = ((WrappedException) e).exception();
-					}
-					String msg = PersistenceResources.ErrMsg_CouldNotDelete;
-					String otherMsg = null;
-					if (e instanceof CoreException) {
-						IStatus status = ((CoreException) e).getStatus();
-						if (status != null) {
-							otherMsg = UmaUtil.getMessage(status);
-						}
-					}
-					if (otherMsg == null) {
-						otherMsg = ""; //$NON-NLS-1$
-					}
-					msg = MessageFormat.format(msg, new Object[] { path,
-							otherMsg });
-					e = new Exception(msg, e);
-					getWarnings().add(e);
-					CommonPlugin.INSTANCE.log(e);
-					if (MultiFileSaveUtil.DEBUG) {
-						e.printStackTrace();
-					}
-				}
-			}
-			elementToInfoMapToDeleteFiles.clear();
-		}
-
-		/**
-		 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister.FailSafeMethodLibraryPersister#rollback()
-		 */
-		public void rollback() {
-			if (!txRecord.getResourcesToCommit().isEmpty()) {
-				try {
-					int max = txRecord.getResourcesToCommit().size() - 1;
-					ArrayList restoredResources = new ArrayList();
-
-					// Something went wrong, restore from backup
-					for (int i = max; i > -1; i--) {
-						IFailSafeSavable resource = (IFailSafeSavable) txRecord
-								.getResourcesToCommit().get(i);
-						if (resource.restore()) {
-							restoredResources.add(resource);
-						}
-					}
-
-					for (Iterator iter = restoredResources.iterator(); iter
-							.hasNext();) {
-						Resource resource = (Resource) iter
-								.next();
-						resource.setModified(true);
-					}
-
-					// delete temp files
-					for (int i = max; i > -1; i--) {
-						Resource resource = (Resource) txRecord
-								.getResourcesToCommit().get(i);
-						if (((IFailSafeSavable)resource).hasTempURI()) {
-							// uri keeps the path to temp file
-							try {
-								new File(resource.getURI().toFileString())
-										.delete();
-							} catch (Exception e) {
-								CommonPlugin.INSTANCE.log(e);
-								if (MultiFileSaveUtil.DEBUG) {
-									e.printStackTrace();
-								}
-							}
-						}
-					}
-
-					// notify all commited resources that the transaction is
-					// done
-					for (int i = max; i > -1; i--) {
-						((IFailSafeSavable) txRecord
-								.getResourcesToCommit().get(i))
-								.txFinished(false);
-					}
-
-				} catch (RuntimeException e) {
-					CommonPlugin.INSTANCE.log(e);
-					if (MultiFileSaveUtil.DEBUG) {
-						e.printStackTrace();
-					}
-					throw e;
-				}
-			}
-			txRecord.clear();
-		}
-
-		/**
-		 * @see org.eclipse.epf.services.IFileBasedLibraryPersister#getFailSafePersister()
-		 */
-		public FailSafeMethodLibraryPersister getFailSafePersister() {
-			return this;
-		}
-
-		/**
-		 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister.FailSafeMethodLibraryPersister#getCurrentTxID()
-		 */
-		public String getCurrentTxID() {
-			return txRecord.getTxID();
-		}
-
-	}
-
-	FailSafePersister getFailSafePersister(Map options) {
-		FailSafePersister persister = new FailSafePersister();
-		persister.saveOptions.putAll(options);
-
-		// make sure that TX_RECORD still keeps the correct value
-		persister.saveOptions.put(MultiFileXMISaveImpl.TX_RECORD,
-				persister.txRecord);
-
-		return persister;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister#hasOwnFolder(java.lang.Object)
-	 */
-	public boolean hasOwnFolder(Object e) {
-		return MultiFileSaveUtil.hasOwnFolder(e);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister#hasOwnResource(java.lang.Object)
-	 */
-	public boolean hasOwnResource(Object e) {
-		return MultiFileSaveUtil.hasOwnResource(e,
-				MultiFileResourceSetImpl.DEFAULT_SAVE_SEPARATELY_CLASS_SET);
-	}
-
-	/**
-	 * @see org.eclipse.epf.services.IFileBasedLibraryPersister#getFailSafePersister()
-	 */
-	public FailSafeMethodLibraryPersister getFailSafePersister() {
-		return new FailSafePersister();
-	}
-
-	public static class NonFailSafePersister extends MethodLibraryPersister
-			implements FailSafeMethodLibraryPersister {
-
-		/**
-		 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister.FailSafeMethodLibraryPersister#commit()
-		 */
-		public void commit() {
-			// do nothing
-		}
-
-		/**
-		 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister.FailSafeMethodLibraryPersister#rollback()
-		 */
-		public void rollback() {
-			// do nothing
-		}
-
-		/**
-		 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister.FailSafeMethodLibraryPersister#getCurrentTxID()
-		 */
-		public String getCurrentTxID() {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister.FailSafeMethodLibraryPersister#adjustLocation(java.util.Collection)
-		 */
-		public void adjustLocation(Collection resources) {
-			for (Iterator iter = resources.iterator(); iter.hasNext();) {
-				adjustLocation((Resource) iter.next());
-			}
-		}
-
-	}
-
-	private static final FailSafeMethodLibraryPersister nonFailSafePersister = new NonFailSafePersister();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister#getFileExtension(java.lang.Object)
-	 */
-	public String getFileExtension(Object e) {
-		return MultiFileSaveUtil.DEFAULT_FILE_EXTENSION;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister#save(org.eclipse.epf.uma.MethodElement)
-	 */
-	public void save(MethodElement element) throws Exception {
-		if(!hasOwnResourceWithoutReferrer(element)) {
-			return;
-		}
-		MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) UmaUtil.getMethodLibrary(element).eResource().getResourceSet();
-		URI uri = MultiFileSaveUtil.createFileURI(element);
-		Map options = resourceSet.getDefaultSaveOptions(); 
-		MultiFileXMIResourceImpl resource = MultiFileSaveUtil.save(resourceSet, element, uri, options, false);
-		resource.updateTimeStamps();
-		
-		String str = (String) options.get(MultiFileXMISaveImpl.REFRESH_NEW_RESOURCE);
-		if (str != null && Boolean.valueOf(str).booleanValue()) {
-			// notify RefreshJob the this resource is saved so it will not be
-			// reloaded after refreshing it
-			//
-			RefreshJob.getInstance().resourceSaved(resource);
-
-			// refresh the newly created resource so it is in synch with the
-			// workspace
-			//
-			FileManager.getInstance().refresh(resource);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister#hasOwnResourceWithoutReferrer(java.lang.Object)
-	 */
-	public boolean hasOwnResourceWithoutReferrer(Object e) {
-		return e instanceof MethodConfiguration;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileIOException.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileIOException.java
deleted file mode 100755
index e3c2796..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileIOException.java
+++ /dev/null
@@ -1,51 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-/**
- * Base exception for file-based persistence
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MultiFileIOException extends RuntimeException {
-
-	private static final long serialVersionUID = 3257853198722347321L;
-
-	private Object troubleObject;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public MultiFileIOException() {
-		super();
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	public MultiFileIOException(String arg0) {
-		super(arg0);
-	}
-
-	public MultiFileIOException(String msg, Object troubleObj) {
-		super(msg);
-		troubleObject = troubleObj;
-	}
-
-	/**
-	 * @return Returns the troubleObject.
-	 */
-	public Object getTroubleObject() {
-		return troubleObject;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileResourceSetImpl.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileResourceSetImpl.java
deleted file mode 100755
index 148a601..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileResourceSetImpl.java
+++ /dev/null
@@ -1,2447 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.emf.common.util.AbstractTreeIterator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMLInfoImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLMapImpl;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.library.persistence.ILibraryResourceSet;
-import org.eclipse.epf.library.persistence.LibraryResourceException;
-import org.eclipse.epf.persistence.refresh.IRefreshEvent;
-import org.eclipse.epf.persistence.refresh.IRefreshListener;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-import org.eclipse.epf.persistence.refresh.internal.RefreshEvent;
-import org.eclipse.epf.persistence.util.PersistenceResources;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.persistence.util.UnresolvedProxyMarkerManager;
-import org.eclipse.epf.resourcemanager.ResourceDescriptor;
-import org.eclipse.epf.resourcemanager.ResourceManager;
-import org.eclipse.epf.services.ILibraryPersister;
-import org.eclipse.epf.services.Services;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.Descriptor;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessElement;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.SemanticModelBridge;
-import org.eclipse.epf.uma.TeamProfile;
-import org.eclipse.epf.uma.UMASemanticModelBridge;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.epf.uma.ecore.IProxyResolutionListener;
-import org.eclipse.epf.uma.ecore.IUmaResourceSet;
-import org.eclipse.epf.uma.ecore.ResolveException;
-import org.eclipse.epf.uma.ecore.util.EventTypes;
-import org.eclipse.epf.uma.ecore.util.OppositeFeature;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.epf.uma.util.ContentDescriptionFactory;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.osgi.util.NLS;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-import com.ibm.icu.util.Calendar;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MultiFileResourceSetImpl extends ResourceSetImpl implements
-		IProxyResolutionListener, IUmaResourceSet, ILibraryResourceSet {
-
-	private static final String[] DEFAULT_DELIVERY_PROCESS_PATH = { "DeliveryProcesses" }; //$NON-NLS-1$
-
-	private static final String[] DEFAULT_CAPABILITY_PATTERN_PATH = {
-			"Content", "CapabilityPatterns" }; //$NON-NLS-1$ //$NON-NLS-2$
-
-	private static final String[] DEFAULT_PROCESS_CONTRIBUTION_PATH = { "ProcessContributions" }; //$NON-NLS-1$		
-
-	public static final String[][] PROCESS_PACKAGE_PATHS = {
-			DEFAULT_DELIVERY_PROCESS_PATH, DEFAULT_CAPABILITY_PATTERN_PATH,
-			DEFAULT_PROCESS_CONTRIBUTION_PATH };
-
-	public static boolean REPORT_ERROR = true;
-
-	static final Map DEFAULT_SAVE_OPTIONS = new HashMap();
-
-	static final Set DEFAULT_SAVE_SEPARATELY_CLASS_SET = new HashSet();
-
-	static {
-		DEFAULT_SAVE_SEPARATELY_CLASS_SET.add(UmaPackage.eINSTANCE
-				.getMethodPlugin());
-		DEFAULT_SAVE_SEPARATELY_CLASS_SET.add(UmaPackage.eINSTANCE
-				.getProcessComponent());
-		DEFAULT_SAVE_SEPARATELY_CLASS_SET.add(UmaPackage.eINSTANCE
-				.getContentDescription());
-		// eClasses.add(ResourcemanagerPackage.eINSTANCE.getResourceManager());
-		DEFAULT_SAVE_SEPARATELY_CLASS_SET.add(UmaPackage.eINSTANCE
-				.getMethodConfiguration());
-
-		XMLResource.XMLMap xmlMap = createSaveXMLMap();
-
-		HashSet saveTogether = new HashSet();
-		saveTogether.add(UmaPackage.eINSTANCE.getBreakdownElementDescription());
-
-		DEFAULT_SAVE_OPTIONS.put(
-				MultiFileXMISaveImpl.SAVE_SEPARATELY_CLASS_SET,
-				DEFAULT_SAVE_SEPARATELY_CLASS_SET);
-		DEFAULT_SAVE_OPTIONS.put(MultiFileXMISaveImpl.SAVE_ALL, "false"); //$NON-NLS-1$
-		DEFAULT_SAVE_OPTIONS.put(MultiFileXMISaveImpl.SAVE_TOGETHER_CLASS_SET,
-				saveTogether);
-		DEFAULT_SAVE_OPTIONS.put(MultiFileXMISaveImpl.REFRESH_NEW_RESOURCE,
-				"true"); //$NON-NLS-1$
-		DEFAULT_SAVE_OPTIONS.put(MultiFileXMISaveImpl.CHECK_MODIFY, "true"); //$NON-NLS-1$
-		DEFAULT_SAVE_OPTIONS.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
-		DEFAULT_SAVE_OPTIONS.put(XMLResource.OPTION_PROCESS_DANGLING_HREF,
-				XMLResource.OPTION_PROCESS_DANGLING_HREF_DISCARD);
-		DEFAULT_SAVE_OPTIONS.put(XMLResource.OPTION_XML_MAP, xmlMap);
-
-		AssociationHelper.init();
-	}
-
-	public static final String RESMGR_XMI = "resmgr.xmi"; //$NON-NLS-1$
-
-	private HashMap defaultSaveOptions;
-
-	private HashMap guidToMethodElementMap;
-
-	private boolean loading;
-
-	private boolean loadingResourceManagerTree;
-
-	private Map URIToTempURIMap;
-
-	private UnresolvedProxyMarkerManager markerMananger;
-
-	private UniqueEList refreshListeners;
-
-	private IURIProvider uriProvider;
-
-	private Path configFolderPath;
-
-	private Path libFolderPath;
-
-	private static XMLResource.XMLMap createLoadXMLMap() {
-		XMLResource.XMLMap xmlMap = new XMLMapImpl();
-		Set excludedAttributes = new HashSet();
-		excludedAttributes.add(UmaPackage.eINSTANCE.getMethodElement_Guid());
-		excludedAttributes.add(UmaPackage.eINSTANCE.getNamedElement_Name());
-
-		for (Iterator iter = UmaPackage.eINSTANCE.getEClassifiers().iterator(); iter
-				.hasNext();) {
-			EClassifier eClassifier = (EClassifier) iter.next();
-			if (eClassifier instanceof EClass) {
-				EClass eClass = (EClass) eClassifier;
-
-				for (Iterator iterator = eClass.getEAttributes().iterator(); iterator
-						.hasNext();) {
-					EAttribute attrib = (EAttribute) iterator.next();
-					if (!excludedAttributes.contains(attrib)) {
-						XMLResource.XMLInfo xmlInfo = new XMLInfoImpl();
-						xmlInfo.setName(attrib.getName());
-						xmlInfo
-								.setXMLRepresentation(XMLResource.XMLInfo.ELEMENT);
-						xmlMap.add(attrib, xmlInfo);
-					}
-				}
-			}
-		}
-
-		return xmlMap;
-	}
-
-	private static boolean saveAttributeAsElement(EClass eClass,
-			Collection selectedEClasses) {
-		for (Iterator iter = selectedEClasses.iterator(); iter.hasNext();) {
-			EClass base = (EClass) iter.next();
-			if (base.isSuperTypeOf(eClass)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private static XMLResource.XMLMap createSaveXMLMap() {
-		XMLResource.XMLMap xmlMap = new XMLMapImpl();
-		Set excludedAttributes = new HashSet();
-		excludedAttributes.add(UmaPackage.eINSTANCE.getMethodElement_Guid());
-		excludedAttributes.add(UmaPackage.eINSTANCE.getNamedElement_Name());
-
-		// select only ContentDescription and Section
-		Set selectedEClasses = new HashSet();
-		selectedEClasses.add(UmaPackage.eINSTANCE.getContentDescription());
-		selectedEClasses.add(UmaPackage.eINSTANCE.getSection());
-
-		for (Iterator iter = UmaPackage.eINSTANCE.getEClassifiers().iterator(); iter
-				.hasNext();) {
-			EClassifier eClassifier = (EClassifier) iter.next();
-			if (eClassifier instanceof EClass) {
-				EClass eClass = (EClass) eClassifier;
-
-				if (saveAttributeAsElement(eClass, selectedEClasses)) {
-					for (Iterator iterator = eClass.getEAttributes().iterator(); iterator
-							.hasNext();) {
-						EAttribute attrib = (EAttribute) iterator.next();
-						if (!excludedAttributes.contains(attrib)) {
-							XMLResource.XMLInfo xmlInfo = new XMLInfoImpl();
-							xmlInfo.setName(attrib.getName());
-							xmlInfo
-									.setXMLRepresentation(XMLResource.XMLInfo.ELEMENT);
-							xmlMap.add(attrib, xmlInfo);
-						}
-					}
-				}
-			}
-		}
-
-		return xmlMap;
-	}
-
-	public MultiFileResourceSetImpl() {
-		super();
-		markerMananger = new UnresolvedProxyMarkerManager(this);
-	}
-
-	public MultiFileResourceSetImpl(boolean reportError) {
-		this();
-		markerMananger.setEnabled(reportError);
-	}
-
-	public UnresolvedProxyMarkerManager getUnresolvedProxyMarkerManager() {
-		return markerMananger;		
-	}
-	
-	protected IURIProvider getURIProvider() {
-		if(uriProvider == null) {
-			uriProvider = new FilePathProvider();
-		}
-		return uriProvider;
-	}
-	
-	private void handleResourceChange(IResource wsRes) {
-		System.out
-				.println("MultiFileResourceSetImpl.handleResourceChange(): " + wsRes.toString()); //$NON-NLS-1$
-
-		MultiFileXMIResourceImpl resource = (MultiFileXMIResourceImpl) getResource(
-				URI.createFileURI(wsRes.getLocation().toString()), false);
-		if (resource != null) {
-			try {
-				ArrayList proxies = new ArrayList();
-				resource.reload(proxies);
-
-				// notify MAKE_PROXY event for all proxies
-				//
-				Notification msg = new NotificationImpl(EventTypes.MAKE_PROXY,
-						false, true);
-				for (Iterator iter = proxies.iterator(); iter.hasNext();) {
-					EObject o = (EObject) iter.next();
-					o.eNotify(msg);
-				}
-
-			} catch (IOException e) {
-				CommonPlugin.INSTANCE.log(e);
-			}
-		}
-
-	}
-
-	public Map getLoadOptions() {
-		Map options = super.getLoadOptions();
-		options.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
-		options.put(XMLResource.OPTION_XML_MAP, createLoadXMLMap());
-		return options;
-	}
-
-	public Map getDefaultSaveOptions() {
-		if (defaultSaveOptions == null) {
-			defaultSaveOptions = new HashMap();
-			defaultSaveOptions.putAll(DEFAULT_SAVE_OPTIONS);
-		}
-
-		return defaultSaveOptions;
-	}
-
-	private Resource getMethodLibraryResource() {
-		if (getResources().isEmpty())
-			return null;
-		return (Resource) getResources().get(0);
-	}
-
-	public MethodLibrary getMethodLibrary() {
-		Resource resource = getMethodLibraryResource();
-		return resource == null ? null : (MethodLibrary) PersistenceUtil
-				.getMethodElement(resource);
-	}
-
-	ResourceManager getRootResourceManager() {
-		Resource resource = getMethodLibraryResource();
-		return resource == null ? null : MultiFileSaveUtil
-				.getResourceManager(resource);
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#getURIConverter()
-	 */
-	public URIConverter getURIConverter() {
-		if (uriConverter == null) {
-			uriConverter = new MultiFileURIConverter(this);
-		}
-		return uriConverter;
-	}
-
-	/**
-	 * @param uri
-	 * @return null if the resource with the given URI could not be found
-	 */
-	public Resource getResource(URI uri) {
-		if (getURIConverter().normalize(uri) == null)
-			return null;
-		Resource res = null;
-		try {
-			res = super.getResource(uri, false);
-			if (res == null) {
-				Map map = getURIResourceMap();
-				res = createResource(uri);
-
-				try {
-					demandLoadHelper(res);
-				} catch (RuntimeException e) {
-					// remove the resource from resource set if it could not be
-					// loaded
-					//
-					getResources().remove(res);
-					throw e;
-				}
-
-				if (map != null) {
-					map.put(uri, res);
-				}
-			}
-		} catch (WrappedException e) {
-			if (e.exception() instanceof FileNotFoundException) {
-				return null;
-			}
-			throw e;
-		}
-		return res;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#demandLoad(org.eclipse.emf.ecore.resource.Resource)
-	 */
-	protected void demandLoad(Resource resource) throws IOException {
-		super.demandLoad(resource);
-		
-		// refresh workspace resource of this resource to make them synchronized
-		//
-		boolean ret = FileManager.getInstance().refresh(resource);
-		if(MultiFileSaveUtil.DEBUG) {
-			if(!ret) {
-				System.err.println("MultiFileResourceSetImpl.demandLoad(): could not refresh resource " + resource); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#getResource(org.eclipse.emf.common.util.URI,
-	 *      boolean)
-	 */
-	public Resource getResource(URI uri, boolean loadOnDemand) {
-		if (getURIConverter().normalize(uri) == null)
-			return null;
-		Resource res = null;
-		try {
-			res = super.getResource(uri, loadOnDemand);
-		} catch (RuntimeException e) {
-			String msg = null;
-			if (e.getMessage() != null)
-				msg = NLS.bind(
-						PersistenceResources.loadResourceErrorWithReason_msg,
-						(new Object[] { uri, e.getMessage() }));
-			else
-				msg = NLS.bind(PersistenceResources.loadResourceError_msg, uri);
-			handleException(msg);
-			CommonPlugin.INSTANCE.log(e);
-			throw e;
-		}
-		return res;
-	}
-
-	public void addRefreshListener(IRefreshListener listener) {
-		if (refreshListeners == null) {
-			refreshListeners = new UniqueEList();
-		}
-		refreshListeners.add(listener);
-	}
-
-	public void removeRefreshListenter(IRefreshListener listener) {
-		if (refreshListeners != null) {
-			refreshListeners.remove(listener);
-		}
-	}
-
-	/**
-	 * Reloads the given resources
-	 * 
-	 * @param resources
-	 * @return resources that had been reloaded
-	 */
-	public synchronized Collection reloadResources(Collection resources) {		
-		// save the ResourceDescriptor for the resources to create URI for their
-		// proxies after unload
-		//
-		for (Iterator iter = resources.iterator(); iter.hasNext();) {
-			MultiFileXMIResourceImpl resource = (MultiFileXMIResourceImpl) iter
-					.next();
-			
-			if(MultiFileSaveUtil.DEBUG) {
-				System.out
-						.println("MultiFileResourceSetImpl.reloadResources(): resource=" + resource + ", element=" + PersistenceUtil.getMethodElement(resource)); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			
-			ResourceDescriptor resDesc = MultiFileSaveUtil
-					.getResourceDescriptor(resource);
-			if (resDesc != null) {
-				resource.setResourceDescriptor(resDesc);
-			}
-		}
-
-		ArrayList reloadedResources = new ArrayList();
-		HashSet proxies = new HashSet();
-		ArrayList resourceList = new ArrayList(resources);
-
-		Resource libResource = getMethodLibraryResource();
-		boolean reloadAllConfigs = false;
-		if (resourceList.remove(libResource)) {
-			// MethodLibrary resource is to reload, it must be reloaded first
-			//			
-			MultiFileXMIResourceImpl resource = (MultiFileXMIResourceImpl) libResource;
-
-			// clear markers for this resource
-			//
-			markerMananger.clearMarkers(resource);
-
-			try {
-				if (resource.reload(proxies)) {
-					reloadedResources.add(resource);
-
-					// reset the resource manager reference in URIConverter of
-					// this resource set
-					// since the resource manager is reloaded
-					//
-					MultiFileURIConverter uriConverter = (MultiFileURIConverter) getURIConverter();
-					uriConverter.resMgr = null;
-					
-					reloadAllConfigs = true;
-				}
-			} catch (IOException e) {
-				CommonPlugin.INSTANCE.log(e);
-			}
-
-		}
-		// reload the resources
-		//
-		for (Iterator iter = resourceList.iterator(); iter.hasNext();) {
-			MultiFileXMIResourceImpl resource = (MultiFileXMIResourceImpl) iter
-					.next();
-
-			// clear markers for this resource
-			//
-			markerMananger.clearMarkers(resource);
-
-			try {
-				if (resource.reload(proxies)) {
-					reloadedResources.add(resource);
-				}
-			} catch (IOException e) {
-				CommonPlugin.INSTANCE.log(e);
-			}
-		}
-
-		if (!reloadedResources.isEmpty()) {
-			// reinitialize the resource set
-			//
-			initialize(reloadAllConfigs);
-
-			// notify the listeners
-			//
-			if (refreshListeners != null) {
-				IRefreshEvent event = new RefreshEvent(reloadedResources,
-						proxies);
-				for (Iterator iter = new ArrayList(refreshListeners).iterator(); iter
-						.hasNext();) {
-					IRefreshListener listener = (IRefreshListener) iter.next();
-					listener.notifyRefreshed(event);
-				}
-			}
-		}
-
-		return reloadedResources;
-	}
-
-	public void initialize(boolean loadConfigurations) {
-		// load the ResourceManager tree and opposite features
-		//
-		loadResourceManagerTree();
-
-		setContainersOfLoadedElements();
-		
-		if(loadConfigurations) {
-			loadConfigurations();
-		}
-
-		loadOppositeFeatures();
-
-		// reset the resource manager reference in URIConverter of this resource
-		// set
-		//
-		MultiFileURIConverter uriConverter = (MultiFileURIConverter) getURIConverter();
-		uriConverter.resMgr = null;
-	}
-	
-	private void setContainersOfLoadedElements() {
-		ResourceManager resMgr = getRootResourceManager();
-		Iterator iterator = new AbstractTreeIterator(resMgr, false) {
-
-			/**
-			 * Comment for <code>serialVersionUID</code>
-			 */
-			private static final long serialVersionUID = 2172691017987702506L;
-
-			protected Iterator getChildren(Object object) {
-				ResourceManager resMgr = (ResourceManager) object;
-				Collection GUIDs = new HashSet();
-				List subMgrs = new ArrayList(resMgr.getSubManagers());
-				for (Iterator iter = subMgrs.iterator(); iter.hasNext();) {
-					try {
-						InternalEObject subMgr = (InternalEObject) iter
-								.next();
-						if (subMgr != null && !subMgr.eIsProxy()) {
-							MethodElement e = PersistenceUtil
-									.getMethodElement(subMgr.eResource());
-							GUIDs.add(e.getGuid());
-						}
-					} catch (RuntimeException e) {
-						throw e;
-					}
-				}
-				MethodElement parent = PersistenceUtil
-						.getMethodElement(resMgr.eResource());
-
-				// resolve the proxy of this element in the parent
-				//
-				MultiFileSaveUtil.resolveProxies(GUIDs, parent);
-
-				return resMgr.getSubManagers().iterator();
-			}
-
-		};
-		for (; iterator.hasNext(); iterator.next())
-			;
-	}
-
-	/**
-	 * Checks if the given workspace resource represents a library resource
-	 * 
-	 * @param wsResource
-	 * @return
-	 */
-	public boolean isLibraryResource(IResource wsResource) {
-		return libFolderPath != null && libFolderPath.isPrefixOf(wsResource.getLocation());
-	}
-	
-	/**
-	 * Checks if the given workspace resource is a new resource that can be loaded 
-	 * using {@link #loadNewResources(Collection)}
-	 *  
-	 * @return
-	 */
-	public boolean isNewResourceToLoad(IResource wsResource) {
-		IPath loc = wsResource.getLocation();
-		return (loc != null && configFolderPath != null 
-				&& MultiFileSaveUtil.DEFAULT_FILE_EXTENSION.equalsIgnoreCase("." + loc.getFileExtension()) //$NON-NLS-1$
-				&& configFolderPath.isPrefixOf(loc)
-				&& !FileManager.getInstance().isTeamPrivate(loc.toString()));
-
-	}
-	
-	/**
-	 * Loads new resources specified by the given collection of {@link IResource work space resources}
-	 * into this resource set
-	 * TODO: merge this code to {@link #getResource(URI, boolean)}
-	 * @param wsResources collection of {@link IResource} objects
-	 */
-	public void loadNewResources(Collection wsResources) {
-		ArrayList newConfigFiles = new ArrayList();
-		for (Iterator iter = wsResources.iterator(); iter.hasNext();) {
-			Object wsResource = (Object) iter.next();
-			if(wsResource instanceof IResource) {
-				IResource wsRes = (IResource) wsResource;
-				IPath loc = wsRes.getLocation();
-				String configFile;
-				if(loc != null && configFolderPath != null 
-						&& MultiFileSaveUtil.DEFAULT_FILE_EXTENSION.equalsIgnoreCase("." + loc.getFileExtension()) //$NON-NLS-1$
-						&& configFolderPath.isPrefixOf(loc)
-						&& !FileManager.getInstance().isTeamPrivate(configFile = loc.toString())) {
-					newConfigFiles.add(configFile);
-				}
-			}
-		}
-		
-		// load new configurations
-		//
-		for (Iterator iter = newConfigFiles.iterator(); iter.hasNext();) {
-			String configFile = (String) iter.next();
-			loadConfiguration(new File(configFile));
-		}
-	}
-
-	/**
-	 * Special handling for MethodConfiguration since MethodLibrary will no
-	 * longer keeps the references to MethodConfigurations and their files. Any
-	 * XMI file under folder ./configurations and its subfolders will be treated
-	 * as a configuration file. They will be loaded and added to MethodLibrary
-	 * as its configurations.
-	 */
-	private void loadConfigurations() {
-		MethodLibrary lib = getMethodLibrary();
-		File configDir = new File(new File(lib.eResource().getURI()
-				.toFileString()).getParent(),
-				MultiFileSaveUtil.METHOD_CONFIGURATION_FOLDER_NAME);
-		Iterator dirIter = new AbstractTreeIterator(configDir, false) {
-			/**
-			 * Comment for <code>serialVersionUID</code>
-			 */
-			private static final long serialVersionUID = 2758436193000640907L;
-
-			FileFilter filter = new FileFilter() {
-
-				public boolean accept(File pathname) {
-					return !FileManager.getInstance().isTeamPrivate(pathname.getAbsolutePath()) &&
-							(pathname.isDirectory()
-							|| pathname.getName().endsWith(
-									MultiFileSaveUtil.DEFAULT_FILE_EXTENSION));
-				}
-
-			};
-
-			protected Iterator getChildren(Object object) {
-				File[] files = ((File) object).listFiles(filter);
-				if (files != null && files.length > 0) {
-					return Arrays.asList(files).iterator();
-				}
-				return Collections.EMPTY_LIST.iterator();
-			}
-
-		};
-		HashSet configFiles = new HashSet();
-		while (dirIter.hasNext()) {
-			File configFile = (File) dirIter.next();
-			if(configFile.isFile()) {
-				configFiles.add(configFile);
-			}
-		}
-
-		for (Iterator iter = lib.getPredefinedConfigurations().iterator(); iter
-				.hasNext();) {
-			MethodConfiguration config = (MethodConfiguration) iter.next();
-			File file = new File(config.eResource().getURI().toFileString());
-			if (configFiles.contains(file)) {
-				configFiles.remove(file);
-			}
-		}
-
-		for (Iterator iter = configFiles.iterator(); iter.hasNext();) {
-			File file = (File) iter.next();
-			loadConfiguration(file);
-		}
-	}
-	
-	private void loadConfiguration(File configFile) {
-		try {
-			MethodLibrary lib = getMethodLibrary();
-			URI uri = URI.createFileURI(configFile.getCanonicalPath());
-			Resource resource = super.getResource(uri, true);
-			if (resource != null) {
-				MethodElement e = PersistenceUtil
-						.getMethodElement(resource);
-				if (e instanceof MethodConfiguration) {
-					lib.getPredefinedConfigurations().add(e);
-				} else {
-					// TODO: must log error into problem view
-				}
-			}
-		} catch (Exception e) {
-			// TODO: must log error into problem view
-			CommonPlugin.INSTANCE.log(e);
-		}
-	}
-
-	/**
-	 * @param string
-	 */
-	protected void handleException(Object err) {
-		CommonPlugin.INSTANCE.log(err);
-		if (err instanceof Exception) {
-			((Exception) err).printStackTrace();
-		} else {
-			System.err.println(err.toString());
-		}
-	}
-
-	public void reset() {
-		if (uriConverter instanceof MultiFileURIConverter) {
-			((MultiFileURIConverter) uriConverter).dispose();
-		}
-		uriConverter = null;
-		boolean notify = eDeliver();
-		boolean reportError = REPORT_ERROR;
-		boolean refresh = RefreshJob.getInstance().isEnabled();
-		try {
-			RefreshJob.getInstance().setEnabled(false);
-			eSetDeliver(false);
-			REPORT_ERROR = false;
-			markerMananger.setEnabled(false);
-			markerMananger.clearAll();
-
-			for (Iterator iter = new ArrayList(getResources()).iterator(); iter
-					.hasNext();) {
-				Resource resource = (Resource) iter.next();
-				try {
-					resource.unload();
-				} catch (Exception e) {
-					// System.err.println("Error unloading resource: " +
-					// resource.getURI());
-					// e.printStackTrace();
-				}
-			}
-
-			clearErrors();
-		} finally {
-			eSetDeliver(notify);
-			REPORT_ERROR = reportError;
-			markerMananger.setEnabled(true);
-			RefreshJob.getInstance().setEnabled(refresh);
-		}
-
-		if (guidToMethodElementMap != null) {
-			guidToMethodElementMap.clear();
-		}
-
-		getResources().clear();
-
-		if (URIToTempURIMap != null) {
-			URIToTempURIMap.clear();
-		}
-
-		MultiFileXMIResourceImpl.clearDetachedEObjectToIDMap();
-	}
-
-	private void clearErrors() {
-		// clear all markers
-		markerMananger.clearAll();
-	}
-
-	public MethodLibrary loadLibrary(String path) throws Exception {
-		long begin = System.currentTimeMillis();
-
-		reset();
-
-		long afterReset = System.currentTimeMillis();
-		
-		if (MultiFileSaveUtil.DEBUG) {
-			System.out.println("Reset time: " + (afterReset - begin)); //$NON-NLS-1$
-		}
-
-		MethodLibrary lib = loadLibraryWithoutReset(path);
-
-		if (MultiFileSaveUtil.DEBUG) {
-			System.out
-					.println("Load time: " + (System.currentTimeMillis() - begin)); //$NON-NLS-1$
-		}
-
-		if (MultiFileSaveUtil.DEBUG) {
-			// check if any resource is marked as modified after loading
-			//
-			System.err.println("Modified resources after loading:");
-			for (Iterator iter = getResources().iterator(); iter.hasNext();) {
-				Resource resource = (Resource) iter.next();
-				if (resource.isModified()) {
-					System.err.println("  " + resource.getURI());
-				}
-			}
-		}
-
-		return lib;
-	}
-
-	public MethodLibrary loadLibraryWithoutReset(String path) throws Exception {
-		loading = true;
-
-		// no refresh during loading
-		//
-		boolean b = RefreshJob.getInstance().isEnabled();
-		RefreshJob.getInstance().setEnabled(false);
-		RefreshJob.getInstance().reset();
-		try {		
-			File libFile = new File(path);
-			configFolderPath = new Path(new File(libFile.getParentFile(),
-					MultiFileSaveUtil.METHOD_CONFIGURATION_FOLDER_NAME).getCanonicalPath());
-			libFolderPath = new Path(libFile.getParentFile().getCanonicalPath());
-			URI uri = URI.createFileURI(libFile.getCanonicalPath());
-			Resource res = super.getResource(uri, true);
-			if (!res.getErrors().isEmpty()) {
-				StringBuffer strBuf = new StringBuffer();
-				strBuf.append(PersistenceResources.loadLibraryError_msg);
-				for (Iterator iter = res.getErrors().iterator(); iter.hasNext();) {
-					Resource.Diagnostic error = (Resource.Diagnostic) iter
-							.next();
-					strBuf.append(NLS.bind(
-							PersistenceResources.loadLibraryError_details,
-							(new Object[] { String.valueOf(error.getLine()),
-									String.valueOf(error.getColumn()),
-									error.getMessage() })));
-				}
-				String msg = strBuf.toString();
-				CommonPlugin.INSTANCE.log(msg);
-				System.err.println(msg);
-			}
-			try {
-				initialize(true);
-				
-				// Set modified flag of library resource to false in case it had been modified during initialization
-				//
-				res.setModified(false);
-				
-				return getMethodLibrary();
-			} catch (Exception e) {
-				CommonPlugin.INSTANCE.log(e);
-				throw new Exception(NLS.bind(
-						PersistenceResources.invalidLibraryFileError_msg, path));
-			}
-		} finally {
-			RefreshJob.getInstance().setEnabled(b);
-
-			loading = false;
-		}
-	}
-
-	/**
-	 * Loads opposite features for all loaded objects
-	 */
-	private void loadOppositeFeatures() {
-		ArrayList oppositeFeatures = new ArrayList();
-		for (Iterator iter = AssociationHelper.getPredefinedOppositeFeatures()
-				.iterator(); iter.hasNext();) {
-			OppositeFeature oppositeFeature = (OppositeFeature) iter.next();
-			if (oppositeFeature.resolveOwner()) {
-				oppositeFeatures.add(oppositeFeature);
-			}
-		}
-		loadOppositeFeatures(oppositeFeatures);
-	}
-
-	/**
-	 * Loads ResourceManager tree of the open library and connect any loaded
-	 * MethodUnit to the library tree as well.
-	 */
-	private void loadResourceManagerTree() {
-		long begin = 0;
-		
-		if(MultiFileSaveUtil.DEBUG) {
-			begin = System.currentTimeMillis();
-		}
-
-		// disable logging unresolved proxies during loading resource manager
-		// tree
-		//
-		markerMananger.setEnabled(false);
-
-		MultiFileURIConverter uriConverter = (MultiFileURIConverter) getURIConverter();
-		try {
-			// this prevents uriConverter from loading resources while
-			// normalizing URI
-			//
-			uriConverter.setResolveProxy(false);
-
-			ResourceManager resMgr = getRootResourceManager();
-			Iterator iterator = new AbstractTreeIterator(resMgr, false) {
-
-				/**
-				 * Comment for <code>serialVersionUID</code>
-				 */
-				private static final long serialVersionUID = 2172691017987702506L;
-
-				protected Iterator getChildren(Object object) {
-					ResourceManager resMgr = (ResourceManager) object;
-					return resMgr.getSubManagers().iterator();
-				}
-
-			};
-			loadingResourceManagerTree = true;
-			for (; iterator.hasNext(); iterator.next())
-				;
-		} finally {
-			markerMananger.setEnabled(true);
-			uriConverter.setResolveProxy(true);
-			loadingResourceManagerTree = false;
-
-			// Reporting of unnormalized URIs was disabled while loading
-			// resource manager tree. Now we need
-			// to go thru all the loaded objects to find proxies with
-			// unnormalized URIs and report them
-			//
-			try {
-				for (Iterator iter = new ArrayList(getGuidToMethodElementMap().values())
-						.iterator(); iter.hasNext();) {
-					InternalEObject o = (InternalEObject) iter.next();
-					if (o.eIsProxy() && o.eContainer() != null) {
-						URI uri = o.eProxyURI();
-						URI normalizedURI = getURIConverter().normalize(uri);
-						if (normalizedURI == null) {
-							// this call will log error about unresolved proxy
-							//
-							((InternalEObject) o.eContainer()).eResolveProxy(o);
-						}
-					}
-				}
-			}
-			catch(Exception e) {
-				PersistencePlugin.getDefault().getLogger().logError(e);
-			}
-			
-			if(MultiFileSaveUtil.DEBUG) {
-				System.out
-						.println("MultiFileResourceSetImpl.loadResourceManagerTree(): " + (System.currentTimeMillis() - begin)); //$NON-NLS-1$
-			}
-		}
-	}
-
-	protected ResourceManager getResourceManager() {
-		return ((MultiFileURIConverter) getURIConverter()).getResourceManager();
-	}
-
-	protected EObject findEObjectInUnloadedResources(String id) {
-		return findEObjectInUnloadedResources(getResourceManager(), id);
-	}
-
-	private EObject findEObjectInUnloadedResources(ResourceManager resMgr,
-			String id) {
-		for (Iterator iter = resMgr.getResourceDescriptors().iterator(); iter
-				.hasNext();) {
-			ResourceDescriptor desc = (ResourceDescriptor) iter.next();
-			Resource resource = super.getResource(desc.getResolvedURI(), false);
-			if (resource == null || !resource.isLoaded()) {
-				try {
-					resource = super.getResource(desc.getResolvedURI(), true);
-				} catch (Exception e) {
-					//
-				}
-				if (resource != null) {
-					EObject eObject = resource.getEObject(id);
-					if (eObject != null) {
-						return eObject;
-					}
-				}
-			}
-		}
-		for (Iterator iter = resMgr.getSubManagers().iterator(); iter.hasNext();) {
-			EObject eObject = findEObjectInUnloadedResources(
-					(ResourceManager) iter.next(), id);
-			if (eObject != null)
-				return eObject;
-		}
-		return null;
-	}
-
-	/**
-	 * Gets object with the given id
-	 */
-	public EObject getEObject(String id) {
-		// first, try to get the object from the cache guidToMethodElement
-		//
-		EObject eObject = (EObject) getGuidToMethodElementMap().get(id);
-		if (eObject != null)
-			return eObject;
-
-		URI uri = MultiFileURIConverter.createURI(id).appendFragment(id);
-		URI normalized = getURIConverter().normalize(uri);
-		if (normalized == null) {
-			// the object with the given id might not have direct resource,
-			// hence, it does not have
-			// its own ResourceDescriptor in ResourceManager tree.
-			// go thru all unloaded resources, load them, and try to find the
-			// object with the given id.
-			//
-			eObject = findEObjectInUnloadedResources(id);
-			if (eObject == null && REPORT_ERROR) {
-				handleException(NLS.bind(
-						PersistenceResources.objNotFoundError_msg, id));
-			}
-			return eObject;
-		}
-
-		try {
-			return getEObject(uri, true);
-		} catch (RuntimeException e) {
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.ResourceSet#getEObject(org.eclipse.emf.common.util.URI,
-	 *      boolean)
-	 */
-	public EObject getEObject(URI uri, boolean loadOnDemand) {
-		return getEObject(null, uri, loadOnDemand);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.ResourceSet#createResource(org.eclipse.emf.common.util.URI)
-	 */
-	public Resource createResource(URI uri) {
-		Resource result = doCreateResource(uri);
-		result.setTrackingModification(true);
-		getResources().add(result);
-		return result;
-	}
-	
-	protected Resource doCreateResource(URI uri) {
-		return new MultiFileXMIResourceImpl(uri);
-	}
-
-	private static boolean backupRequired(Map options) {
-		Boolean backup = (Boolean) options
-				.get(MultiFileXMISaveImpl.BACK_UP_BEFORE_SAVE);
-		return backup != null && backup.booleanValue();
-	}
-
-	private void backup(Resource res) {
-		try {
-			if (res.getContents().isEmpty())
-				return;
-			Object object = res.getContents().get(0);
-			if (!(object instanceof MethodLibrary
-					|| object instanceof ResourceManager || object instanceof MethodPlugin))
-				return;
-
-			MethodLibrary library = getMethodLibrary();
-			String backupDir = new File(library.eResource().getURI()
-					.toFileString()).getParent()
-					+ File.separator + ".bak"; //$NON-NLS-1$
-			SimpleDateFormat dateFormatter = new SimpleDateFormat(
-					"yyMMddHHmmss.S"); //$NON-NLS-1$
-			if (res == library.eResource()) {
-				DateFormat.getInstance().format(
-						Calendar.getInstance().getTime());
-				File backupFile = new File(backupDir,
-						MultiFileSaveUtil.DEFAULT_LIBRARY_MODEL_FILENAME
-								+ '_'
-								+ dateFormatter.format(Calendar.getInstance()
-										.getTime()));
-				if (!backupFile.getParentFile().exists()) {
-					backupFile.getParentFile().mkdirs();
-				}
-				FileUtil.moveFile(new File(res.getURI().toFileString()), backupFile);
-			} else {
-				String relativePath = res.getURI().deresolve(
-						library.eResource().getURI()).toFileString();
-				File backupFile = new File(backupDir, relativePath
-						+ '_'
-						+ dateFormatter
-								.format(Calendar.getInstance().getTime()));
-				if (!backupFile.getParentFile().exists()) {
-					backupFile.getParentFile().mkdirs();
-				}
-				FileUtil.moveFile(new File(res.getURI().toFileString()), backupFile);
-			}
-		} catch (Exception e) {
-			handleException(e);
-			handleException(NLS.bind(PersistenceResources.backupError_msg, res));
-		}
-	}
-
-	void removeURIMappings(EObject eObj, Set modifiedResources) {
-		ResourceManager resMgr = MultiFileSaveUtil.getResourceManager(eObj
-				.eResource());
-		if (resMgr != null && resMgr.eContainer() != null) {
-			EcoreUtil.remove(resMgr);
-		}
-		resMgr = getRootResourceManager();
-		if(resMgr != null) {
-			ResourceDescriptor desc = MultiFileSaveUtil.findResourceDescriptor(
-					resMgr, MultiFileSaveUtil.getGuid(eObj),
-					null, true);
-			if (desc != null) {
-				if (modifiedResources != null && desc.eResource() != null) {
-					modifiedResources.add(desc.eResource());
-				}
-				EcoreUtil.remove(desc);
-			}
-		}
-	}
-
-	protected void cleanUp(Resource removedResource) throws IOException {
-		cleanUp(removedResource, null);
-	}
-
-	// protected void cleanUp(EObject obj, Set modifiedResources) {
-	// try {
-	// // remove all the URI mappings
-	// //
-	// removeURIMappings(obj, modifiedResources);
-	// }
-	// finally {
-	// Resource resource = obj.eResource();
-	// if(resource != null && resource.getContents().contains(obj)) {
-	// resource.unload();
-	// getResources().remove(resource);
-	// }
-	// }
-	// }
-
-	void cleanUp(Resource removedResource, Set modifiedResources)
-			throws IOException {
-		try {
-			//
-			if (removedResource.getContents().isEmpty()) {
-				removedResource.unload();
-				try {
-					removedResource.load(null);
-				} catch (FileNotFoundException e) {
-					// the file might already be deleted, moved or never
-					// creared.
-					//
-					return;
-				}
-			}
-
-			EObject obj = PersistenceUtil.getMethodElement(removedResource);
-
-			// if(obj == null) return;
-			// boolean cleanFolder;
-			// if(obj instanceof MethodPlugin) {
-			// cleanFolder = true;
-			// }
-			// else {
-			// cleanFolder = false;
-			// }
-
-			// MultiFileURIConverter umaUriConverter =
-			// ((MultiFileURIConverter)getURIConverter());
-			// umaUriConverter.getResourceManager().removeResourceDescriptor(removedResource.getURI(),
-			// cleanFolder);
-
-			// remove all the URI mappings
-			//
-			removeURIMappings(obj, modifiedResources);
-
-			// if(obj instanceof ProcessPackage) {
-			// cleanUpResourceDescriptors((ProcessPackage)obj);
-			// }
-
-			removedResource.unload();
-		} finally {
-			getResources().remove(removedResource);
-			URI oldURI = ((MultiFileXMIResourceImpl) removedResource)
-					.getOldURI();
-			if (oldURI != null) {
-				getURIToTempURIMap().remove(oldURI);
-			}
-		}
-	}
-
-	private void cleanUp(ProcessPackage procPkg) {
-		// remove ContentDescription of all ProcessElements in this
-		// ProcessPackage
-		//
-		removeContentDescriptions(procPkg);
-
-		EcoreUtil.remove(procPkg);
-	}
-
-	/**
-	 * @param procPkg
-	 */
-	private void removeContentDescriptions(ProcessPackage procPkg) {
-		for (Iterator iter = procPkg.getProcessElements().iterator(); iter
-				.hasNext();) {
-			ProcessElement element = (ProcessElement) iter.next();
-			if (ContentDescriptionFactory.hasPresentation(element)
-					&& element.getPresentation().eResource() != null) {
-				removePresentation(element);
-			}
-		}
-
-		for (Iterator iter = procPkg.getChildPackages().iterator(); iter
-				.hasNext();) {
-			Object pkg = iter.next();
-			if (pkg instanceof ProcessPackage) {
-				removeContentDescriptions((ProcessPackage) pkg);
-			}
-		}
-	}
-
-	/**
-	 * @param element
-	 */
-	private void removePresentation(ProcessElement element) {
-		Resource resource = element.getPresentation().eResource();
-		resource.getContents().remove(element.getPresentation());
-	}
-
-	private boolean save(Collection resources, Map options, boolean prepareSave)
-			throws Exception {
-		if (options == null) {
-			options = getDefaultSaveOptions();
-		}
-
-		Set modifiedResources = new HashSet();
-		options.put(MultiFileXMISaveImpl.MODIFIED_RESOURCE_SET,
-				modifiedResources);
-		try {
-			for (Iterator iter = resources.iterator(); iter.hasNext();) {
-				Resource res = (Resource) iter.next();
-				save(res, options, prepareSave);
-			}
-			saveModifiedResources(options);
-			return true;
-		} finally {
-			options.remove(MultiFileXMISaveImpl.MODIFIED_RESOURCE_SET);
-		}
-	}
-
-	boolean save(Resource res, Map options, boolean prepareSave)
-			throws Exception {
-		Set modifiedResources = (Set) options
-				.get(MultiFileXMISaveImpl.MODIFIED_RESOURCE_SET);
-		TxRecord txRecord = (TxRecord) options
-				.get(MultiFileXMISaveImpl.TX_RECORD);
-		List resourcesToCommit = txRecord != null ? txRecord
-				.getResourcesToCommit() : null;
-
-		try {
-			MethodElement eObj = PersistenceUtil.getMethodElement(res);
-			if (eObj != null) {
-				if (prepareSave) {
-					if (eObj instanceof ProcessComponent) {
-						ProcessComponent procComp = (ProcessComponent) eObj;
-						Resource content = procComp.getProcess() != null
-								&& ContentDescriptionFactory
-										.hasPresentation(procComp.getProcess()) ? procComp
-								.getProcess().getPresentation().eResource()
-								: null;
-						boolean alreadyModified = content != null
-								&& content.isModified();
-						prepareSave(procComp);
-						if (content != null && content.isModified()
-								&& !alreadyModified) {
-							// content is modified as result of prepareSave(),
-							// it needs to be saved after model is saved
-							//
-							modifiedResources.add(content);
-						}
-					}
-					else if (eObj instanceof MethodPlugin) {
-						MultiFileSaveUtil.addResourceManager(res);
-					}
-				}
-				if (res.isModified()) {
-					// System.out.println("----> Start saving " + res);
-					boolean backupRequired = backupRequired(options);
-					if (backupRequired) {
-						// back up resource before saving
-						//
-						backup(res);
-					}
-
-					if (resourcesToCommit != null) {
-						((MultiFileXMIResourceImpl) res).setTempURI(txRecord
-								.getTxID());
-						resourcesToCommit.add(res);
-					}
-
-					MultiFileSaveUtil.save(res, options);
-
-					// System.out.println("<---- Saved resource: " + res);
-
-					return true;
-				}
-			}
-		} catch (Exception exception) {
-			handleException(exception);
-			throw exception;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Save a resource of this resource set with the given save options
-	 * 
-	 * @param res
-	 * @param options
-	 * @return <code>true</code> if there is at least a resource has been saved in this call
-	 * @throws Exception
-	 */
-	public boolean save(Resource res, Map options) throws Exception {
-//		// clear all error markers for this resource
-//		//
-//		markerMananger.clearMarkers(res);
-
-		if (res == null || res.getContents().isEmpty())
-			return false;
-
-		if (options == null) {
-			options = getDefaultSaveOptions();
-		}
-
-		Set modifiedResources = new HashSet();
-		options.put(MultiFileXMISaveImpl.MODIFIED_RESOURCE_SET,
-				modifiedResources);
-		boolean notFailSafe = options.get(MultiFileXMISaveImpl.TX_RECORD) == null;
-		try {
-			Collection savedResources = null;
-			if(notFailSafe) {
-				savedResources = new ArrayList();
-			}
-			boolean ret = save(res, options, true);
-			if(ret && notFailSafe) {
-				savedResources.add(res);
-			}
-			Collection collection = saveModifiedResources(options);
-			if(!collection.isEmpty()) {
-				ret = true;
-				if(notFailSafe) {
-					savedResources.addAll(collection);
-				}
-			}
-			
-			if(notFailSafe && ret) {
-				// update resource cached timestamps
-				//
-				for (Iterator iter = savedResources.iterator(); iter.hasNext();) {
-					Object resource = iter.next();
-					if(resource instanceof MultiFileXMIResourceImpl) {
-						((MultiFileXMIResourceImpl)resource).updateTimeStamps();
-					}
-				}								
-			}
-			
-			return ret;
-		} finally {
-			options.remove(MultiFileXMISaveImpl.MODIFIED_RESOURCE_SET);
-		}
-	}
-
-	/**
-	 * Saves only the modified resources in this resource set.
-	 * 
-	 * @param options
-	 */
-	public void save(Map options) throws LibraryResourceException {
-		try {
-			save(options, false, true);
-		} catch (Exception e) {
-			if(e instanceof RuntimeException) {
-				throw (RuntimeException)e;
-			}
-			throw new LibraryResourceException(e);
-		}
-	}
-
-	/**
-	 * 
-	 * @param options
-	 * @return resources that had been saved by this call
-	 */
-	Collection saveModifiedResources(Map options) {
-		Set modifiedResources = (Set) options
-				.get(MultiFileXMISaveImpl.MODIFIED_RESOURCE_SET);
-		TxRecord txRecord = (TxRecord) options
-				.get(MultiFileXMISaveImpl.TX_RECORD);
-		List resourcesToCommit = txRecord != null ? txRecord
-				.getResourcesToCommit() : null;
-		if (modifiedResources == null)
-			return Collections.EMPTY_LIST;
-		boolean backupRequired = backupRequired(options);
-		boolean checkModify = MultiFileXMISaveImpl.checkModifyRequired(options);
-		Collection savedResources = new ArrayList();
-		while (!modifiedResources.isEmpty()) {
-			Iterator iter = new ArrayList(modifiedResources).iterator();
-			modifiedResources.clear();
-			while (iter.hasNext()) {
-				Resource resource = (Resource) iter.next();
-				if (checkModify) {
-					MultiFileSaveUtil.checkModify(resource);
-					if(resourcesToCommit != null) {
-						// check for out-of-synch only in fail-safe saving for now
-						//
-						MultiFileSaveUtil.checkOutOfSynch(Collections.singletonList(resource));
-					}
-				}
-				// if(resource.isModified()) {
-				if (backupRequired) {
-					// back up resource before saving
-					//
-					backup(resource);
-				}
-
-				if (resourcesToCommit != null) {
-					((MultiFileXMIResourceImpl) resource).setTempURI(txRecord
-							.getTxID());
-					resourcesToCommit.add(resource);
-				}
-
-				if(MultiFileSaveUtil.save(resource, options)) {
-					savedResources.add(resource);
-				}
-				// }
-			}
-		}
-		return savedResources;
-	}
-
-	/**
-	 * 
-	 * @param options
-	 * @param saveAll
-	 *            if true, force saving all the resources even if they are not
-	 *            modified.
-	 * @throws Exception
-	 */
-	public void save(Map options, boolean saveAll) throws Exception {
-		save(options, saveAll, false);
-	}
-	
-	private void save(Map options, boolean saveAll, boolean failSafe)
-			throws Exception {
-		if (options == null) {
-			options = new HashMap(getDefaultSaveOptions());
-		}
-
-		MethodLibrary library = getMethodLibrary();
-		MultiFileSaveUtil.setGuid(library);
-
-		prepareSave(library);
-
-		// do clean-up this resource set before saving
-		//
-		cleanUp();
-
-		MultiFileURIConverter umaUriConverter = ((MultiFileURIConverter) getURIConverter());
-		umaUriConverter.setLibraryURIs(library);
-
-		Set modifiedResources = new HashSet();
-		options.put(MultiFileXMISaveImpl.MODIFIED_RESOURCE_SET,
-				modifiedResources);
-		MethodLibraryPersister.FailSafePersister persister = null;
-		if (failSafe) {
-			persister = MethodLibraryPersister.INSTANCE
-					.getFailSafePersister(options);
-			options = persister.getSaveOptions();
-		}
-		try {
-			List list = getResources();
-			int size = list.size();
-			// System.out.println("Start saving " + size + " loaded resources: "
-			// + list);
-			// System.out.println();
-			boolean backupRequired = backupRequired(options);
-			List saveResources = new ArrayList();
-			List moveResources = new ArrayList();
-			for (int i = 0; i < size; i++) {
-				Resource res = (Resource) list.get(i);
-
-				 if (res.isModified() && 
-						 MultiFileSaveUtil.adjustLocationRequired((MultiFileXMIResourceImpl) res)) {
-					 moveResources.add(res);
-				 }
-
-				MethodElement eObj = PersistenceUtil.getMethodElement(res);
-				if (eObj != null && eObj instanceof MethodElement) {
-					if (saveAll || res.isModified()) {
-//						// System.out.println("----> Start saving " + res);
-//						if (failSafe) {
-//							saveResources.add(res);
-//						} else {
-//							if (backupRequired) {
-//								// back up resource before saving
-//								//
-//								backup(res);
-//							}
-//
-//							if(MultiFileSaveUtil.save(res, options)) {
-//								savedResources.add(res);
-//								if(res instanceof MultiFileXMIResourceImpl) {
-//									((MultiFileXMIResourceImpl)res).updateTimeStamps();
-//								}
-//							}
-//						}
-//						// System.out.println("<---- Saved resource: " + res);
-						
-						saveResources.add(res);
-					}
-				}
-			}
-
-			if(!saveResources.isEmpty()) {
-				Resource libResource = getMethodLibraryResource();
-				if(!saveResources.contains(libResource) && PersistenceUtil.checkToolVersion(libResource) != 0) {
-					saveResources.add(libResource);
-				}
-				if(MultiFileXMISaveImpl.checkModifyRequired(options)) {
-					MultiFileSaveUtil.checkModify(saveResources);
-				}
-				if (failSafe) {
-					try {
-						save(saveResources, options, false);
-						persister.commit();
-						persister.adjustLocation(moveResources);
-					} catch (Exception e) {
-						persister.rollback();
-						throw e;
-					}
-				} else {
-					for (Iterator iter = saveResources.iterator(); iter
-							.hasNext();) {
-						Resource resource = (Resource) iter.next();
-						if(MultiFileSaveUtil.save(resource, options)) {
-							if(resource instanceof MultiFileXMIResourceImpl) {
-								((MultiFileXMIResourceImpl)resource).updateTimeStamps();
-							}
-						}
-					}
-					for (Iterator iter = moveResources.iterator(); iter.hasNext();) {
-						Resource resource = (Resource) iter.next();
-						MultiFileSaveUtil.adjustLocation(resource,
-								modifiedResources);
-					}
-					Collection saved = saveModifiedResources(options);
-					if (saved != null) {
-						for (Iterator iter = saved.iterator(); iter.hasNext();) {
-							Resource resource = (Resource) iter.next();
-							if(resource instanceof MultiFileXMIResourceImpl) {
-								((MultiFileXMIResourceImpl)resource).updateTimeStamps();
-							}
-						}
-					}
-				}
-			}
-		} catch (Exception exception) {
-			handleException(exception);
-			throw exception;
-		} finally {
-			options.remove(MultiFileXMISaveImpl.MODIFIED_RESOURCE_SET);
-		}
-	}
-
-	/**
-	 * Saves the open library under a new location
-	 * 
-	 * @param newLocation
-	 *            directory to save the open library to
-	 * @param if
-	 *            true, regenerateGUID regenerate GUID for all MethodElements in
-	 *            the open library
-	 */
-	public void saveAs(String newLocation, boolean regenerateGUID,
-			IProgressMonitor monitor) throws Exception {
-		MethodLibrary lib = getMethodLibrary();
-		if (lib == null)
-			return;
-
-		// load all the resources in memory
-		//
-		if (monitor != null)
-			monitor.setTaskName(PersistenceResources.loadResourcesTask_name);
-		for (Iterator iter = lib.eAllContents(); iter.hasNext();) {
-			EObject element = (EObject) iter.next();
-			if (regenerateGUID && element instanceof MethodElement) {
-				((MethodElement) element).setGuid(UmaUtil.generateGUID());
-			}
-			for (Iterator iterator = element.eCrossReferences().iterator(); iterator
-					.hasNext();) {
-				iterator.next();
-			}
-		}
-
-		// change URI of all loaded resources for new location
-		//
-		URI oldDir = URI.createFileURI(new File(lib.eResource().getURI()
-				.toFileString()).getParent()
-				+ File.separator);
-		URI newDir = URI.createFileURI(newLocation + File.separator);
-		for (Iterator iter = getResources().iterator(); iter.hasNext();) {
-			Resource resource = (Resource) iter.next();
-			resource.setURI(resource.getURI().replacePrefix(oldDir, newDir));
-		}
-
-		// clear the ResourceManager
-		//
-		ResourceManager resMgr = ((MultiFileURIConverter) getURIConverter())
-				.getResourceManager();
-		if (resMgr != null) {
-			resMgr.getResourceDescriptors().clear();
-		}
-
-		if (monitor != null)
-			monitor.setTaskName(PersistenceResources.saveLibraryTask_name);
-		save(null, true);
-	}
-	
-	public void unloadWithoutRemove(MultiFileXMIResourceImpl resource) {
-		MethodElement e = PersistenceUtil.getMethodElement(resource);
-		resource.unloadWithoutRemove();
-		if(e instanceof MethodConfiguration) {
-			MethodLibrary lib = getMethodLibrary();
-			if(lib != null) {
-				lib.getPredefinedConfigurations().remove(e);
-			}
-		}
-	}
-
-	/**
-	 * @throws IOException
-	 * 
-	 */
-	private void cleanUp() throws IOException {
-		MethodLibrary library = getMethodLibrary();
-		List removedResources = new ArrayList();
-
-		List list = getResources();
-		int size = list.size();
-		for (int i = 0; i < size; i++) {
-			Resource res = (Resource) list.get(i);
-			boolean remove = false;
-			if (res.getContents().isEmpty()) {
-				System.out
-						.println("MultiFileResourceSetImpl.cleanUp(): empty resource: " + res); //$NON-NLS-1$
-				remove = true;
-			} else {
-				MethodElement eObj = PersistenceUtil.getMethodElement(res);
-				if (eObj == null
-						|| (eObj != library && eObj.eContainer() == null)) {
-					if (eObj == null) {
-						System.out
-								.println("MultiFileResourceSetImpl.cleanUp(): resource without any MethodElement: " + res); //$NON-NLS-1$
-						remove = true;
-					}
-					// some resources might be loaded directly, not thru its
-					// container. Therefore, we cannot assume
-					// that a object without a container in a loaded resource is
-					// a removed object.
-					//
-					else if (eObj != library && eObj.eContainer() == null) {
-						System.out
-								.println("MultiFileResourceSetImpl.cleanUp(): resource without a container: " + res); //$NON-NLS-1$
-					}
-				}
-			}
-			if (remove) {
-				// This is a removed object. Add its path to the list for
-				// removing its files later.
-				//
-				removedResources.add(res);
-			}
-		}
-
-		// do clean-up
-		//
-		System.out
-				.println("MultiFileResourceSetImpl.cleanUp(): removed resources: " + removedResources); //$NON-NLS-1$
-
-		for (Iterator iter = removedResources.iterator(); iter.hasNext();) {
-			Resource res = (Resource) iter.next();
-
-			try {
-				// remove ResourceDescriptor of the removed resource
-				//
-				cleanUp(res);
-			} catch (Exception e) {
-				handleException(e);
-			}
-		}
-
-		// getResources().removeAll(removedResources);
-	}
-	
-	/**
-	 * Prepares the library for saving
-	 */
-	private void prepareSave(MethodLibrary library) {
-		// check if the library already has a ResourceManager
-		// if not, create ResourceManager for it
-		//
-		MultiFileXMIResourceImpl resource = (MultiFileXMIResourceImpl) library
-				.eResource();
-		ResourceManager libResMgr = MultiFileSaveUtil.addResourceManager(resource);
-		if(libResMgr != null) {
-			MultiFileSaveUtil.registerWithResourceManager(libResMgr, library,
-					resource.getFinalURI());
-		}
-
-		List models = library.getMethodPlugins();
-		int size = models.size();
-		for (int i = 0; i < size; i++) {
-			prepareSave((MethodPlugin) models.get(i));
-		}
-
-		for (int i = 0; i < size; i++) {
-			cleanUp((MethodPlugin) models.get(i));
-		}
-	}
-
-	private static void cleanUp(MethodPlugin plugin) {
-		for (int i = 0; i < PROCESS_PACKAGE_PATHS.length; i++) {
-			ProcessPackage pkg = (ProcessPackage) UmaUtil.findMethodPackage(
-					plugin, PROCESS_PACKAGE_PATHS[i]);
-			if (pkg != null) {
-				cleanUpProcesses(pkg);
-			}
-		}
-	}
-
-	private void prepareSave(MethodPlugin model) {
-		for (int i = 0; i < PROCESS_PACKAGE_PATHS.length; i++) {
-			ProcessPackage pkg = (ProcessPackage) UmaUtil.findMethodPackage(
-					model, PROCESS_PACKAGE_PATHS[i]);
-			if (pkg != null) {
-				prepareSave(pkg);
-			}
-		}
-	}
-
-	/**
-	 * Removes process packages of unused activities.
-	 * 
-	 * @param pkg
-	 */
-	private static void cleanUpProcesses(ProcessPackage pkg) {
-		List list = pkg.getChildPackages();
-		int size = list.size();
-		for (int i = 0; i < size; i++) {
-			Object obj = list.get(i);
-			if (obj instanceof ProcessComponent) {
-				ProcessComponent procComp = (ProcessComponent) obj;
-				List packages = new ArrayList();
-				for (Iterator iter = procComp.getChildPackages().iterator(); iter
-						.hasNext();) {
-					Object element = (Object) iter.next();
-					if (element instanceof ProcessPackage) {
-						getRemovedPackages((ProcessPackage) element, packages);
-					}
-				}
-				for (Iterator iterator = packages.iterator(); iterator
-						.hasNext();) {
-					EcoreUtil.remove((EObject) iterator.next());
-				}
-			}
-		}
-	}
-
-	private static void getRemovedPackages(ProcessPackage pkg,
-			List removedPackages) {
-		// find activity
-		//
-		Activity act = getActivity(pkg);
-
-		if (act == null || getParent(act) == null) {
-			// Invalid process package. It does not contain any activity.
-			// Add it to the list of packages to be removed.
-			//
-			removedPackages.add(pkg);
-		} else {
-			for (Iterator iter = pkg.getChildPackages().iterator(); iter
-					.hasNext();) {
-				Object element = (Object) iter.next();
-				if (element instanceof ProcessPackage) {
-					getRemovedPackages((ProcessPackage) element,
-							removedPackages);
-				}
-			}
-		}
-	}
-
-	private static Activity getActivity(ProcessPackage pkg) {
-		// find activity
-		//
-		Activity act = null;
-		for (Iterator iter = pkg.getProcessElements().iterator(); iter
-				.hasNext();) {
-			Object element = iter.next();
-			if (element instanceof Activity) {
-				act = (Activity) element;
-				break;
-			}
-		}
-		return act;
-	}
-
-	private static Object getParent(BreakdownElement e) {
-		// ItemProviderAdapter adapter = (ItemProviderAdapter)
-		// TngUtil.getAdapter(e, IBSItemProvider.class);
-		// return adapter == null ? null : adapter.getParent(e);
-
-		return UmaUtil.getParentActivity(e);
-	}
-
-	/**
-	 * Creates process package for those activities that still don't belong to
-	 * any process package.
-	 */
-	private void prepareSave(ProcessPackage pkg) {
-		List list = pkg.getChildPackages();
-		int size = list.size();
-		for (int i = 0; i < size; i++) {
-			Object obj = list.get(i);
-			if (obj instanceof ProcessComponent) {
-				prepareSave((ProcessComponent) obj);
-			}
-		}
-	}
-
-	private void prepareSave(ProcessComponent procComp) {
-		Process proc = procComp.getProcess();
-		if (proc != null) {
-			// associateAllAdapters(proc);
-			prepareSave(proc);
-
-			cleanUpDanglingDescriptors(procComp);
-
-			List danglingPkgs = new ArrayList();
-			for (Iterator iter = new ArrayList(procComp.getChildPackages())
-					.iterator(); iter.hasNext();) {
-				Object element = (Object) iter.next();
-				if (element instanceof ProcessPackage) {
-					ProcessPackage pkg = (ProcessPackage) element;
-					reorganize(pkg, danglingPkgs);
-				}
-			}
-
-			// clean up dangling ProcessPackages
-			//
-			for (Iterator iter = danglingPkgs.iterator(); iter.hasNext();) {
-				cleanUp((ProcessPackage) iter.next());
-			}
-
-		}
-	}
-
-	// /**
-	// * @param activity
-	// */
-	// private static void associateAllAdapters(Activity activity) {
-	// AdapterFactory adapterFactory =
-	// TngAdapterFactory.INSTANCE.getWBS_ComposedAdapterFactory();
-	// ItemProviderAdapter adapter = (ItemProviderAdapter)
-	// adapterFactory.adapt(activity, ITreeItemContentProvider.class);
-	// for (Iterator iter = adapter.getChildren(activity).iterator();
-	// iter.hasNext();) {
-	// Object element = iter.next();
-	// if(element instanceof Activity) {
-	// associateAllAdapters((Activity) element);
-	// }
-	// }
-	// }
-
-	/**
-	 * @param activity
-	 */
-	private static void prepareSave(Activity activity) {
-		ProcessPackage parentPkg = (ProcessPackage) activity.eContainer();
-		List elements = activity.getBreakdownElements();
-
-		// add new descriptors and other non-activity breakdown elements of the
-		// activity to its process package
-		//
-		for (Iterator iter = elements.iterator(); iter.hasNext();) {
-			EObject element = (EObject) iter.next();
-			if (!(element instanceof Activity) && element.eContainer() == null) {
-				parentPkg.getProcessElements().add(element);
-			}
-		}
-
-		// add new WorkOrder objects or remove unused WorkOrder objects of this
-		// activity
-		//
-		for (Iterator iter = activity.getLinkToPredecessor().iterator(); iter
-				.hasNext();) {
-			WorkOrder workOrder = (WorkOrder) iter.next();
-			if (workOrder.eContainer() == null) {
-				if (workOrder.getPred() != null
-						&& getParent(workOrder.getPred()) != null) {
-					parentPkg.getProcessElements().add(workOrder);
-				}
-			} else {
-				if (workOrder.getPred() == null
-						|| getParent(workOrder.getPred()) == null) {
-					if (MultiFileSaveUtil.DEBUG) {
-						System.err.println("Invalid WorkOrder: " + workOrder); //$NON-NLS-1$
-					}
-					parentPkg.getProcessElements().remove(workOrder);
-				}
-			}
-		}
-
-		// removed unused diagrams
-		//
-		for (Iterator iter = parentPkg.getDiagrams().iterator(); iter.hasNext();) {
-			Diagram diagram = (Diagram) iter.next();
-			SemanticModelBridge bridge = diagram.getSemanticModel();
-			if (bridge instanceof UMASemanticModelBridge) {
-				MethodElement element = ((UMASemanticModelBridge) bridge)
-						.getElement();
-				if (element instanceof Activity
-						&& (!(element instanceof Process) && getParent((Activity) element) == null)) {
-					iter.remove();
-				}
-			}
-		}
-
-		int size = elements.size();
-		for (int i = 0; i < size; i++) {
-			Object e = elements.get(i);
-			if (e instanceof Activity) {
-				Activity act = (Activity) e;
-				if (act.eContainer() == null) {
-					ProcessPackage pkg = UmaFactory.eINSTANCE
-							.createProcessPackage();
-					pkg.setName(act.getName());
-					pkg.getProcessElements().add(act);
-					List descriptors = new ArrayList();
-					for (int j = 0; j < act.getBreakdownElements().size(); j++) {
-						Object obj = act.getBreakdownElements().get(j);
-						if (obj instanceof Descriptor) {
-							descriptors.add(obj);
-						}
-					}
-					pkg.getProcessElements().addAll(descriptors);
-
-					parentPkg.getChildPackages().add(pkg);
-					// System.out.println("Process package created for activity:
-					// '" + act.getName() + "'");
-				}
-				prepareSave(act);
-			}
-		}
-	}
-
-	private static void cleanUpDanglingDescriptors(ProcessPackage pkg) {
-		for (Iterator iter = pkg.getProcessElements().iterator(); iter
-				.hasNext();) {
-			Object element = iter.next();
-			if (element instanceof BreakdownElement
-					&& ((BreakdownElement) element).getSuperActivities() == null) {
-				boolean remove = false;
-				if (element instanceof RoleDescriptor) {
-					if (AssociationHelper.getTeamProfiles(
-							(RoleDescriptor) element).isEmpty()) {
-						remove = true;
-					}
-				} else if (element instanceof WorkProductDescriptor) {
-					if (AssociationHelper.getDeliverableDescriptors(
-							(WorkProductDescriptor) element).isEmpty()) {
-						remove = true;
-					}
-				} else if (element instanceof TeamProfile) {
-					if (((TeamProfile) element).getSuperTeam() == null) {
-						remove = true;
-					}
-				} else {
-					remove = true;
-				}
-
-				if (remove) {
-					iter.remove();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Moves the process packages to the right location in the tree if needed.
-	 * 
-	 * @param pkg
-	 * @param danglingPkgs
-	 */
-	private void reorganize(ProcessPackage pkg, List danglingPkgs) {
-		Activity act = getActivity(pkg);
-		if (act == null)
-			return;
-
-		// make sure the package has the same name as the activity's name
-		//
-		if (!pkg.getName().equals(act.getName())) {
-			pkg.setName(act.getName());
-		}
-
-		// check if the container of pkg is actually holding the parent activity
-		// of act
-		//
-		EObject parentAct = (EObject) getParent(act);
-
-		if (parentAct == null) {
-			// cleanUpResourceDescriptors(pkg);
-			// cleanUp(pkg);
-			// return;
-			danglingPkgs.add(pkg);
-		} else if (parentAct != getActivity((ProcessPackage) pkg.eContainer())) {
-			// move the package to the right location, under the process package
-			// of parentAct
-			//
-			ProcessPackage parentPkg = (ProcessPackage) parentAct.eContainer();
-			parentPkg.getChildPackages().add(pkg);
-		}
-
-		if (parentAct != null) {
-			cleanUpDanglingDescriptors(pkg);
-		}
-
-		for (Iterator iter = pkg.getChildPackages().iterator(); iter.hasNext();) {
-			Object element = (Object) iter.next();
-			if (element instanceof ProcessPackage) {
-				reorganize((ProcessPackage) element, danglingPkgs);
-			}
-		}
-	}
-
-	public Map getGuidToMethodElementMap() {
-		if (guidToMethodElementMap == null) {
-			guidToMethodElementMap = new HashMap();
-		}
-		return guidToMethodElementMap;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.notify.impl.BasicNotifierImpl#eNotify(org.eclipse.emf.common.notify.Notification)
-	 */
-	public void eNotify(Notification notification) {
-		try {
-			super.eNotify(notification);
-		} catch (RuntimeException e) {
-			CommonPlugin.INSTANCE
-					.log("ERROR notifying changes: resourceSet=" + this + ", notification=" + notification); //$NON-NLS-1$ //$NON-NLS-2$
-			CommonPlugin.INSTANCE.log(e);
-			e.printStackTrace();
-		}
-	}
-
-	public void addMarker(Exception e) {
-		try {
-			// insert problem marker
-			//
-			markerMananger.notifyException(e);
-		} catch (RuntimeException ex) {
-			CommonPlugin.INSTANCE.log(ex);
-			if (MultiFileSaveUtil.DEBUG) {
-				ex.printStackTrace();
-			}
-		}
-	}
-
-	public void setLoading(boolean b) {
-		loading = b;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.uma.ecore.IExceptionCollector#collect(java.lang.Exception)
-	 */
-	public void notifyException(Exception e) {
-		if (loadingResourceManagerTree) {
-			if (e instanceof ResolveException) {
-				if (((ResolveException) e).exception() instanceof MultiFileIOException) {
-					return;
-				}
-			}
-		}
-		try {
-			addMarker(e);
-		} catch (Exception ex) {
-			//
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.uma.ecore.IProxyResolutionListener#proxyResolved(java.lang.Object,
-	 *      java.lang.Object)
-	 */
-	public void proxyResolved(Object proxy, Object resolved) {
-		if(resolved instanceof MethodElement) {
-			String guid = MultiFileSaveUtil.getGuid(resolved);
-			if (guid != null) {
-				getGuidToMethodElementMap().put(guid, resolved);
-			}
-		}
-		markerMananger.proxyResolved(proxy, resolved);
-	}
-
-	private EObject getEObjectByGUID(String guid) {
-		return (EObject) getGuidToMethodElementMap().get(guid);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.uma.ecore.IUmaResourceSet#getEObject(org.eclipse.emf.ecore.EObject,
-	 *      org.eclipse.emf.common.util.URI, boolean)
-	 */
-	public EObject getEObject(EObject resolver, URI uri, boolean loadOnDemand) {
-		// long start;
-		// if(MultiFileSaveUtil.PROFILE) {
-		// start = System.currentTimeMillis();
-		// }
-
-		URI normalized = ((MultiFileURIConverter) getURIConverter()).normalize(
-				uri, resolver);
-		if (normalized == null) {
-			// work-around to look up for object by its GUID in case it had been
-			// moved to other resource
-			//
-			String guid = uri.fragment();
-			EObject eObject = getEObjectByGUID(guid);
-			if (eObject != null) {
-				return eObject;
-			}
-
-			String msg = NLS.bind(PersistenceResources.normalizeURIError_msg,
-					uri);
-			throw new UnnormalizedURIException(msg);
-		}
-		Resource resource = getResource(normalized.trimFragment(), loadOnDemand);
-		if (resource != null) {
-			String fragment = normalized.fragment();
-			if (fragment == null || fragment.length() == 0) {
-				return PersistenceUtil.getMethodElement(resource);
-			}
-			EObject eObject = resource.getEObject(fragment);
-			if (eObject == null && !fragment.equals(uri.authority())) {
-				// work-around to look up for object by its GUID in case it had
-				// been moved
-				//
-				return getEObjectByGUID(fragment);
-			}
-			return eObject;
-		} else {
-			return null;
-		}
-
-		// if(MultiFileSaveUtil.PROFILE) {
-		//			
-		// }
-	}
-
-	// /**
-	// * @return Returns the exceptions.
-	// */
-	// public List getExceptions() {
-	// return exceptions;
-	// }
-
-	public void loadOppositeFeatures(List oppositeFeatures) {
-		int max = oppositeFeatures.size() - 1;
-		if (max < 0) {
-			return;
-		}
-		ArrayList elements = new ArrayList(getGuidToMethodElementMap().values());
-		HashSet loadedElements = new HashSet();
-		while (!elements.isEmpty()) {
-			for (Iterator iter = elements.iterator(); iter.hasNext();) {
-				Object obj = iter.next();
-				if (obj instanceof MethodElement) {
-					MethodElement element = (MethodElement) obj;
-					for (int i = max; i > -1; i--) {
-						EStructuralFeature eFeature = ((OppositeFeature) oppositeFeatures
-								.get(i)).getTargetFeature();
-						if (eFeature.getContainerClass().isInstance(element)) {
-							if (eFeature.isMany()) {
-								InternalEList list = (InternalEList) element
-										.eGet(eFeature);
-								if (!list.isEmpty()) {
-									for (Iterator iterator = list.iterator(); iterator
-											.hasNext();) {
-										iterator.next();
-									}
-								}
-							} else {
-								element.eGet(eFeature);
-							}
-						}
-					}
-				}
-			}
-
-			// gets the newly loaded elements to load their opposite features
-			//
-			loadedElements.addAll(elements);
-			elements = new ArrayList(getGuidToMethodElementMap().values());
-			elements.removeAll(loadedElements);
-		}
-	}
-
-	public void loadOppositeFeatures(List oppositeFeatures, Set deletedGUIDs) {
-		int max = oppositeFeatures.size() - 1;
-		if (max < 0) {
-			return;
-		}
-		ArrayList elements = new ArrayList(getGuidToMethodElementMap().values());
-		HashSet loadedElements = new HashSet();
-		while (!elements.isEmpty()) {
-			for (Iterator iter = elements.iterator(); iter.hasNext();) {
-				Object obj = iter.next();
-				if (obj instanceof MethodElement) {
-					MethodElement element = (MethodElement) obj;
-					for (int i = max; i > -1; i--) {
-						EStructuralFeature eFeature = ((OppositeFeature) oppositeFeatures
-								.get(i)).getTargetFeature();
-						if (eFeature.getContainerClass().isInstance(element)) {
-							if (eFeature.isMany()) {
-								InternalEList list = (InternalEList) element
-										.eGet(eFeature);
-								if (!list.isEmpty()) {
-									boolean resolve = false;
-									check_resolve: for (Iterator iterator = list
-											.basicIterator(); iterator
-											.hasNext();) {
-										InternalEObject e = (InternalEObject) iterator
-												.next();
-										if (e.eIsProxy()) {
-											String guid = e.eProxyURI()
-													.fragment();
-											if (deletedGUIDs.contains(guid)) {
-												resolve = true;
-												break check_resolve;
-											}
-										}
-									}
-									if (resolve) {
-										for (Iterator iterator = list
-												.iterator(); iterator.hasNext();) {
-											iterator.next();
-										}
-									}
-								}
-							} else {
-								Object value = element.eGet(eFeature, false);
-								if (value instanceof InternalEObject) {
-									InternalEObject e = (InternalEObject) value;
-									if (e.eIsProxy()) {
-										String guid = e.eProxyURI().fragment();
-										if (deletedGUIDs.contains(guid)) {
-											element.eGet(eFeature);
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			// gets the newly loaded elements to load their opposite features
-			//
-			loadedElements.addAll(elements);
-			elements = new ArrayList(getGuidToMethodElementMap().values());
-			elements.removeAll(loadedElements);
-		}
-	}
-
-	public boolean hasUnresolvedProxy() {
-		return markerMananger.hasUnresolvedProxy();
-	}
-
-	protected Map getURIToTempURIMap() {
-		if (URIToTempURIMap == null) {
-			URIToTempURIMap = new HashMap();
-		}
-
-		return URIToTempURIMap;
-	}
-
-	public UnresolvedProxyMarkerManager getMarkerMananger() {
-		return markerMananger;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.persistence.ILibraryResourceSet#checkModify(org.eclipse.epf.library.persistence.ILibraryResource[], java.lang.Object)
-	 */
-	public void checkModify(Resource[] resources, Object context) throws LibraryResourceException {		
-		MultiFileSaveUtil.checkModify(Arrays.asList(resources));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.persistence.ILibraryResourceSet#checkModify(java.util.Collection, java.lang.Object)
-	 */
-	public IStatus checkModify(Collection eObjects, Object context) {
-		HashSet pathSet = new HashSet();
-		for (Iterator iter = eObjects.iterator(); iter.hasNext();) {
-			EObject o = (EObject) iter.next();
-			Resource resource = o.eResource();
-			if(resource != null && resource.getResourceSet() == this) {
-				MultiFileXMIResourceImpl mfResource = (MultiFileXMIResourceImpl) resource;
-				if(!mfResource.hasTempURI()) {
-					String path = mfResource.getURI().toFileString();
-					pathSet.add(path);
-				}
-			}
-		}
-		if(pathSet.isEmpty()) {
-			return Status.OK_STATUS;
-		}
-		String[] paths = new String[pathSet.size()];
-		pathSet.toArray(paths);
-		return FileManager.getInstance().checkModify(paths, context);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.persistence.ILibraryResourceSet#getPersister()
-	 */
-	public ILibraryPersister getPersister() {
-		return MethodLibraryPersister.INSTANCE;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.persistence.ILibraryResourceSet#unload(org.eclipse.emf.ecore.resource.Resource, java.util.Map)
-	 */
-	public void unload(Resource resource, Map options) {
-		if(resource instanceof MultiFileXMIResourceImpl) {
-			unloadWithoutRemove((MultiFileXMIResourceImpl) resource);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.persistence.ILibraryResourceSet#unload()
-	 */
-	public void unload() {
-		reset();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.persistence.ILibraryResourceSet#getFirstMethodLibrary()
-	 */
-	public MethodLibrary getFirstMethodLibrary() {
-		return getMethodLibrary();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.persistence.ILibraryResourceSet#getMethodLibraries()
-	 */
-	public List getMethodLibraries() {
-		MethodLibrary lib = getMethodLibrary();
-		if(lib == null) {
-			return Collections.EMPTY_LIST;
-		}
-		return Collections.singletonList(lib);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.persistence.ILibraryResourceSet#loadMethodLibraries(org.eclipse.emf.common.util.URI, java.util.Map)
-	 */
-	public void loadMethodLibraries(URI uri, Map parameters) throws LibraryResourceException {
-		try {
-			loadLibrary(uri.toFileString());
-		} catch (Exception e) {
-			if(e instanceof RuntimeException) {
-				throw (RuntimeException)e;
-			}
-			throw new LibraryResourceException(e);
-		}
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.persistence.ILibraryResourceSet#getPersistenceType()
-	 */
-	public String getPersistenceType() {
-		return Services.XMI_PERSISTENCE_TYPE;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.persistence.ILibraryResourceSet#unload(org.eclipse.emf.ecore.EObject)
-	 */
-	public boolean unload(EObject object) {
-		Resource resource = object.eResource();
-		if(resource instanceof MultiFileXMIResourceImpl) {
-			((MultiFileXMIResourceImpl)resource).unloaded((InternalEObject) object);
-			return true;
-		}		
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.persistence.ILibraryResourceSet#reloadObjects(java.util.Collection)
-	 */
-	public Collection reloadObjects(Collection objects) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileSaveUtil.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileSaveUtil.java
deleted file mode 100755
index a251de8..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileSaveUtil.java
+++ /dev/null
@@ -1,1519 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.AbstractTreeIterator;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-import org.eclipse.epf.persistence.util.PersistenceResources;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.resourcemanager.ResourceDescriptor;
-import org.eclipse.epf.resourcemanager.ResourceManager;
-import org.eclipse.epf.resourcemanager.ResourcemanagerFactory;
-import org.eclipse.epf.uma.BreakdownElementDescription;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.MethodUnit;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.osgi.util.NLS;
-
-import com.ibm.icu.text.SimpleDateFormat;
-import com.ibm.icu.util.Calendar;
-
-/**
- * Utility class with static routines for XMI persistence
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public final class MultiFileSaveUtil {
-
-	public static final String DEFAULT_MODEL_FILENAME = "model.xmi"; //$NON-NLS-1$
-
-	public static final String DEFAULT_CONTENT_FILENAME = "content.xmi"; //$NON-NLS-1$
-
-	public static final String DEFAULT_LIBRARY_MODEL_FILENAME = "library.xmi"; //$NON-NLS-1$
-	
-	public static final String DEFAULT_PLUGIN_EXPORT_FILENAME = "export.xmi"; //$NON-NLS-1$
-
-	public static final String DEFAULT_PLUGIN_MODEL_FILENAME = "plugin.xmi"; //$NON-NLS-1$
-
-	public static final String DEFAULT_FILE_EXTENSION = ".xmi"; //$NON-NLS-1$
-
-	public static final String LIBRARY_FILE_EXTENSION = "uma"; //$NON-NLS-1$
-
-	public static final String CAPABILITY_PATTERN_PATH = "capabilitypatterns"; //$NON-NLS-1$
-
-	public static final String DELIVERY_PROCESS_PATH = "deliveryprocesses"; //$NON-NLS-1$
-
-	public static final String PROCESS_CONTRIBUTION_PATH = "processcontributions"; //$NON-NLS-1$
-
-	public static final String METHOD_CONFIGURATION_FOLDER_NAME = "configurations"; //$NON-NLS-1$
-
-	public static final boolean DEBUG = PersistencePlugin.getDefault()
-			.isDebugging();
-
-	static final boolean PROFILE = false;
-
-	private static final SimpleDateFormat dateFormatter = new SimpleDateFormat(
-			"yyMMddHHmmss.S"); //$NON-NLS-1$
-
-	public static boolean isValidFileName(String name) {
-		if (name == null)
-			return false;
-		if (name.indexOf('/') != -1 || name.indexOf('\\') != -1
-				|| name.indexOf(':') != -1 || name.indexOf('*') != -1
-				|| name.indexOf('?') != -1 || name.indexOf('"') != -1
-				|| name.indexOf('<') != -1 || name.indexOf('>') != -1
-				|| name.indexOf('|') != -1)
-			return false;
-		return true;
-	}
-
-	public static String getPath(MethodElement e) {
-		StringBuffer strBuff = new StringBuffer(String.valueOf(e.getName()));
-		for (e = (MethodElement) ((EObject) e).eContainer(); e != null; e = (MethodElement) ((EObject) e)
-				.eContainer()) {
-			strBuff.insert(0, String.valueOf(e.getName()) + " > "); //$NON-NLS-1$
-		}
-		return strBuff.toString();
-	}
-
-	public static String createDirName(MethodElement obj) {
-		String name = ((MethodElement) obj).getName();
-		if (isValidFileName(name))
-			return name;
-		throw new MultiFileIOException(NLS.bind(
-				PersistenceResources.invalidNameError_msg, name), obj);
-	}
-
-	public static EObject resolve(EObject proxy) {
-		if (!(proxy instanceof InternalEObject))
-			return proxy;
-		InternalEObject obj = (InternalEObject) proxy;
-		if (obj.eProxyURI() == null)
-			return proxy;
-		XMIResourceImpl res = new XMIResourceImpl(obj.eProxyURI());
-		try {
-			res.load(null);
-			return PersistenceUtil.getMethodElement(res);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return proxy;
-	}
-
-	static Resource save(EObject o, URI uri, Map options) {
-		ResourceSet resourceSet = o.eResource().getResourceSet();
-		MultiFileXMIResourceImpl resource = save(resourceSet, o, uri, options);
-
-		if (options == null) {
-			options = ((MultiFileResourceSetImpl) resourceSet)
-					.getDefaultSaveOptions();
-		}
-		String str = (String) options
-				.get(MultiFileXMISaveImpl.REFRESH_NEW_RESOURCE);
-		if (str != null && Boolean.valueOf(str).booleanValue()) {
-			// notify RefreshJob the this resource is saved so it will not be
-			// reloaded after refreshing it
-			//
-			RefreshJob.getInstance().resourceSaved(resource);
-
-			// refresh the newly created resource so it is in synch with the
-			// workspace
-			//
-			FileManager.getInstance().refresh(resource);
-		}
-
-		return resource;
-	}
-
-	public static boolean canSaveTogether(Map options, Object obj) {
-		Set saveTogetherClasses = (Set) options
-				.get(MultiFileXMISaveImpl.SAVE_TOGETHER_CLASS_SET);
-		if (saveTogetherClasses == null)
-			return false;
-		for (Iterator iter = saveTogetherClasses.iterator(); iter.hasNext();) {
-			EClass eCls = (EClass) iter.next();
-			if (eCls.isInstance(obj))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Adds the given object to the given resource while still preserving
-	 * object's container reference.
-	 * 
-	 * @param resource
-	 * @param o
-	 */
-	private static void addTo(Resource resource, MultiResourceEObject o) {
-		BasicEList contents = ((BasicEList) resource.getContents());
-		if (contents.isEmpty()) {
-			// this will flag resource as loaded
-			//
-			contents.clear();
-
-			contents.setData(1, new Object[] { o });
-		} else {
-			Object[] data = contents.toArray();
-			Object[] newData = new Object[data.length + 1];
-			System.arraycopy(data, 0, newData, 0, data.length);
-			newData[data.length] = o;
-			contents.setData(newData.length, newData);
-		}
-		o.eSetResource((Resource.Internal) resource);
-	}
-
-	/**
-	 * Saves a new contained EObject in its own new resource.
-	 * 
-	 * @param o
-	 * @param uri
-	 * @param options
-	 */
-	private static MultiFileXMIResourceImpl save(ResourceSet resourceSet,
-			EObject o, URI uri, Map options) {
-		return save(resourceSet, o, uri, options, true);
-	}
-	
-	static MultiFileXMIResourceImpl save(ResourceSet resourceSet,
-			EObject o, URI uri, Map options, boolean registerWithResourceManager) {
-		// Detach the object from container resource
-		//
-		MultiResourceEObject mrEObj = (MultiResourceEObject) o;
-		MultiFileXMIResourceImpl currentResource = (MultiFileXMIResourceImpl) o
-				.eResource();
-
-		if (currentResource != null) {
-			currentResource.detached(o);
-		}
-
-		List newResourceDescriptors = null;
-		Set modifiedResources = (Set) options
-				.get(MultiFileXMISaveImpl.MODIFIED_RESOURCE_SET);
-
-		MultiFileXMIResourceImpl res = null;
-		if (canSaveTogether(options, o)) {
-			MultiFileResourceSetImpl mfResourceSet = ((MultiFileResourceSetImpl) resourceSet);
-
-			// if the uri has a temporary URI, use it instead to locate the
-			// resource that is in process of saving
-			//
-			URI tempURI = (URI) mfResourceSet.getURIToTempURIMap().get(uri);
-			if (tempURI != null) {
-				uri = tempURI;
-			}
-
-			res = (MultiFileXMIResourceImpl) mfResourceSet.getResource(uri);
-			if (res != null) {
-				if (!res.getContents().contains(o)) {
-					if (res.getFinalURI() == res.getURI()) {
-						if (MultiFileXMISaveImpl.checkModifyRequired(options)) {
-							// not a temp file of fail-safe persistence
-							// transaction
-							// check for writeable
-							//
-							MultiFileSaveUtil.checkModify(res);
-						}
-					}
-
-					addTo(res, mrEObj);
-
-					ResourceDescriptor desc = null;
-					try {
-						if(registerWithResourceManager) {
-							// register this new object with ResourceManager
-							//
-							ResourceManager resMgr = getResourceManagerFor(o,
-									modifiedResources);
-							desc = registerWithResourceManager(resMgr, o, res
-									.getFinalURI());
-							if (desc != null && modifiedResources != null) {
-								modifiedResources.add(resMgr.eResource());
-							}
-						}
-
-						res.setModified(true);
-						mfResourceSet.save(res, options, false);
-
-						res.attachedAll(o);
-					} catch (Exception e) {
-						// rollback
-						//
-
-						// remove this object from the resource
-						res.getContents().remove(mrEObj);
-						mrEObj.eSetResource((Resource.Internal) null);
-
-						// remove the created ResourceDescriptor
-						if (desc != null) {
-							EcoreUtil.remove(desc);
-						}
-
-						// re-attach to container resource
-						if (currentResource != null) {
-							currentResource.attached(o);
-						}
-
-						throw new MultiFileIOException(e.getMessage());
-					}
-				}
-				return res;
-			}
-		}
-
-		res = (MultiFileXMIResourceImpl) resourceSet.createResource(uri);
-		addTo(res, mrEObj);
-		if(mrEObj instanceof MethodPlugin) {
-			addResourceManager(res);
-		}
-
-		Map objToContainerMap = null;
-		try {
-			if(registerWithResourceManager) {
-				newResourceDescriptors = registerWithResourceManager(res,
-					modifiedResources);
-			}
-
-			// back up the container references and set content object's
-			// container to null
-			//
-			objToContainerMap = removeContainers(res);
-
-			res.save(options);
-
-			res.attachedAll(o);
-		} catch (Exception e) {
-			CommonPlugin.INSTANCE.log(e);
-
-			// rollback
-			//
-
-			// remove the failed reousrce from the resource set
-			resourceSet.getResources().remove(res);
-			mrEObj.eSetResource((Resource.Internal) null);
-
-			// remove the created ResourceDescriptors
-			if(newResourceDescriptors != null && !newResourceDescriptors.isEmpty()) {
-				for (Iterator iter = newResourceDescriptors.iterator(); iter
-				.hasNext();) {
-					EcoreUtil.remove((EObject) iter.next());
-				}
-			}
-
-			// re-attach to container resource
-			if (currentResource != null) {
-				currentResource.attached(o);
-			}
-
-			throw new MultiFileIOException(e.getMessage());
-		} finally {
-			// restore the container references for the content objects
-			//
-			restoreContainers(res, objToContainerMap);
-		}
-
-		if(registerWithResourceManager) {
-			ResourceManager resMgr = addNewResourceManager(res);
-			if (resMgr == null) {
-				if (o instanceof MethodPlugin) {
-					// create new ResourceManager for new MethodPlugin
-					//
-					resMgr = getResourceManagerFor(o, modifiedResources);
-				}
-			} else if (modifiedResources != null) {
-				modifiedResources.add(resMgr.eContainer().eResource());
-			}
-		}
-
-		res.updateTimeStamps();
-
-		return res;
-	}
-
-	private static Map removeContainers(Resource resource) {
-		int size = resource.getContents().size();
-		Map objToContainerMap = new HashMap();
-		for (int i = 0; i < size; i++) {
-			MultiResourceEObject multiResEObj = (MultiResourceEObject) resource
-					.getContents().get(i);
-			InternalEObject container = (InternalEObject) multiResEObj
-					.eContainer();
-			if (container != null) {
-				objToContainerMap.put(multiResEObj, container);
-				multiResEObj.eBasicSetContainer(null, multiResEObj
-						.eContainerFeatureID());
-			}
-		}
-		return objToContainerMap;
-	}
-
-	/**
-	 * Gets the containers of objects in resource's contents
-	 * 
-	 * @param resource
-	 * @return map of object to container entries
-	 */
-	static Map getContainers(Resource resource) {
-		int size = resource.getContents().size();
-		Map objToContainerMap = new HashMap();
-		for (int i = 0; i < size; i++) {
-			MultiResourceEObject multiResEObj = (MultiResourceEObject) resource
-					.getContents().get(i);
-			InternalEObject container = (InternalEObject) multiResEObj
-					.eContainer();
-			if (container != null) {
-				objToContainerMap.put(multiResEObj, container);
-			}
-		}
-		return objToContainerMap;
-
-	}
-
-	/**
-	 * Restores the containers of the objects in resource's contents that
-	 * previously saved in a map returned from getContainers(Resource resource)
-	 * or removeContainers(Resource resource)
-	 * 
-	 * @param resource
-	 * @param objToContainerMap
-	 * @see #getContainers(Resource)
-	 * @see #removeContainers(Resource)
-	 */
-	private static void restoreContainers(Resource resource,
-			Map objToContainerMap) {
-		int size = resource.getContents().size();
-		for (int i = 0; i < size; i++) {
-			MultiResourceEObject multiResEObj = (MultiResourceEObject) resource
-					.getContents().get(i);
-			InternalEObject container = (InternalEObject) objToContainerMap
-					.get(multiResEObj);
-			if (container != null) {
-				multiResEObj.eBasicSetContainer(container, multiResEObj
-						.eContainerFeatureID());
-			}
-		}
-	}
-
-	public static void checkModify(Resource resource) {
-		// don't check if the resource is currently being saved to a temporary
-		// file
-		//
-		if (resource instanceof MultiFileXMIResourceImpl
-				&& ((MultiFileXMIResourceImpl) resource).hasTempURI()) {
-			return;
-		}
-		String path = resource.getURI().toFileString();
-		IStatus status = FileManager.getInstance().checkModify(path,
-				MsgBox.getDefaultShell());
-		if (!status.isOK()) {
-			String msg = UmaUtil.getMessage(status);
-			if (msg == null) {
-				msg = NLS.bind(PersistenceResources.modifyFileError_msg, path);
-			}
-			throw new MultiFileIOException(msg);
-		}
-	}
-
-	public static void checkModify(Collection resources) {
-		ArrayList pathList = new ArrayList();
-		for (Iterator iter = resources.iterator(); iter.hasNext();) {
-			Resource resource = (Resource) iter.next();
-			if(resource instanceof MultiFileXMIResourceImpl && ((MultiFileXMIResourceImpl)resource).hasTempURI()) {
-				continue;
-			}
-			pathList.add(resource.getURI().toFileString());
-		}
-		if(!pathList.isEmpty()) {
-			String[] paths = new String[pathList.size()];
-			pathList.toArray(paths);
-			IStatus status = FileManager.getInstance().checkModify(paths,
-					MsgBox.getDefaultShell());
-			if (!status.isOK()) {
-				String msg = UmaUtil.getMessage(status);
-				if (msg == null) {
-					msg = NLS.bind(PersistenceResources.modifyFileError_msg, Arrays
-							.asList(paths));
-				}
-				throw new MultiFileIOException(msg);
-			}
-		}
-	}
-
-	public static void checkOutOfSynch(Collection resources) {
-		// check for out-of-synch
-		//
-		for (Iterator iter = resources.iterator(); iter.hasNext();) {
-			MultiFileXMIResourceImpl res = (MultiFileXMIResourceImpl) iter
-					.next();
-			if(res.isLoaded() && !res.hasTempURI()) {
-				File file = new File(res.getURI().toFileString());
-				if(file.exists()) {
-					long lastModified = file.lastModified();
-					if (res.getFileLastModified() != lastModified && !same(lastModified, res.getFileLastModified())) {
-						String msg = NLS.bind(
-								PersistenceResources.resourceOutOfSynch_msg, res
-								.getURI().toFileString());
-						throw new MultiFileIOException(msg);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Saves the existing own resource of a contained EObject. Adds resources
-	 * that have been modifed after this call to the MODIFIED_RESOURCE_SET of
-	 * the save options.
-	 * 
-	 * @param resource
-	 * @param options
-	 * @return true if the given resource has been saved successfully, false otherwise
-	 */
-	public static boolean save(Resource resource, Map options) {
-		if (resource.getContents().isEmpty())
-			return false;
-
-		Set modifiedResources = (Set) options
-				.get(MultiFileXMISaveImpl.MODIFIED_RESOURCE_SET);
-
-		// should not change resource location automatically without letting
-		// user know about it
-		//
-		// adjustLocation(resource, modifiedResources);
-
-		// back up the container references and set content object's container
-		// to null
-		//
-		Map objToContainerMap = removeContainers(resource);
-		try {
-			resource.save(options);
-		} catch (IOException e) {
-			e.printStackTrace();
-			throw new MultiFileIOException(e.getMessage());
-		} finally {
-			// restore the container references for the content objects
-			//
-			restoreContainers(resource, objToContainerMap);
-		}
-
-		ResourceManager resMgr = addNewResourceManager(resource);
-		if (resMgr != null && modifiedResources != null) {
-			modifiedResources.add(resMgr.eContainer().eResource());
-		}
-		
-		return true;
-	}
-
-	/**
-	 * 
-	 * @param resource
-	 * @return ResourceManager that is just added to the resource manager tree
-	 *         or null.
-	 */
-	private static ResourceManager addNewResourceManager(Resource resource) {
-		ResourceManager resMgr = getResourceManager(resource);
-		MethodElement e = PersistenceUtil.getMethodElement(resource);
-		EObject container = e.eContainer();
-		if (resMgr != null && container != null && resMgr.eContainer() == null) {
-			// new ResourceManager is added to the resource
-			//
-			ResourceManager parentResMgr = getResourceManager(container
-					.eResource());
-
-			// check if resMgr is already a sub manager of parentResMgr before
-			// adding it
-			//
-			if (!parentResMgr.getSubManagers().contains(resMgr)) {
-				parentResMgr.getSubManagers().add(resMgr);
-				return resMgr;
-			}
-
-			// registerWithResourceManager(parentResMgr, resMgr,
-			// resMgr.eResource().getURI().appendFragment(resMgr.getGuid()));
-			// return resMgr;
-		}
-		return null;
-	}
-
-	private static String toFileString(EObject eObj) {
-		return eObj.eResource().getResourceSet().getURIConverter().normalize(
-				eObj.eResource().getURI()).toFileString();
-	}
-
-	static boolean hasOwnFolder(Object e) {
-		return e instanceof MethodPlugin || e instanceof ProcessComponent;
-	}
-
-	static boolean hasOwnResource(Object obj, Collection saveSeparatelyClassSet) {
-		if (obj instanceof MethodUnit)
-			return true;
-		if (saveSeparatelyClassSet == null)
-			return false;
-		for (Iterator iter = saveSeparatelyClassSet.iterator(); iter.hasNext();) {
-			EClass eCls = (EClass) iter.next();
-			if (eCls.isInstance(obj))
-				return true;
-		}
-		return false;
-	}
-
-	public static URI createFileURI(MethodElement e) {
-		if (e.eContainer() == null)
-			return ((MultiFileXMIResourceImpl) e.eResource()).getFinalURI();
-
-		// Handle ProcessComponent specially. ProcessComponent objects are
-		// stored as following in the method library:
-		// <Method Library>
-		// |_ <Method Plugin>
-		// |_processes
-		// |_capability_patterns
-		// |_delivery_processes
-		// |_process_contributions
-		//
-		if (e instanceof ProcessComponent) {
-			MethodPlugin plugin = UmaUtil.getMethodPlugin(e);
-			MethodLibrary lib = (MethodLibrary) plugin.eContainer();
-			String pluginDir;
-			if (lib != null) {
-				String libDir = new File(((MultiFileXMIResourceImpl) lib
-						.eResource()).getFinalURI().toFileString()).getParent();
-				pluginDir = libDir + File.separator + plugin.getName();
-			} else {
-				if (plugin.eResource() == null) {
-					// plugin is already deleted
-					//
-					return null;
-				}
-				pluginDir = new File(((MultiFileXMIResourceImpl) plugin
-						.eResource()).getFinalURI().toFileString()).getParent();
-			}
-			String relativeDir;
-			org.eclipse.epf.uma.Process proc = ((ProcessComponent) e)
-					.getProcess();
-			if (proc instanceof CapabilityPattern) {
-				relativeDir = CAPABILITY_PATTERN_PATH;
-			} else if (proc instanceof DeliveryProcess) {
-				relativeDir = DELIVERY_PROCESS_PATH;
-			} else {
-				relativeDir = ""; //$NON-NLS-1$
-			}
-
-			String path = pluginDir + File.separator + relativeDir
-					+ File.separator + e.getName() + File.separator
-					+ DEFAULT_MODEL_FILENAME;
-			return URI.createFileURI(path);
-		} else if (e instanceof BreakdownElementDescription) {
-			String dir = null;
-			try {
-				dir = new File(((MultiFileXMIResourceImpl) UmaUtil
-						.getProcessComponent(e).eResource()).getFinalURI()
-						.toFileString()).getParent();
-			} catch (RuntimeException ex) {
-				throw ex;
-			}
-			return URI.createFileURI(dir + File.separator
-					+ DEFAULT_CONTENT_FILENAME);
-		} else if (e instanceof ContentDescription) {
-			URI uri;
-			ContentDescription content = (ContentDescription) e;
-			String path = MethodLibraryPersister.getCorrectPath(content);
-			if (path == null) {
-				String dir = ((MultiFileXMIResourceImpl) e.eResource())
-						.getFinalURI().trimSegments(1).toFileString()
-						+ File.separator;
-				path = MethodLibraryPersister.getNextAvailableFileName(dir,
-						content);
-			}
-			uri = URI.createFileURI(path);
-			return uri;
-		} else if (e instanceof MethodConfiguration) {
-			String dir = new StringBuffer(((MultiFileXMIResourceImpl) e
-					.eContainer().eResource()).getFinalURI().trimSegments(1)
-					.toFileString()).append(File.separator).append(
-					METHOD_CONFIGURATION_FOLDER_NAME).append(File.separator)
-					.toString();
-			String path = MethodLibraryPersister.getNextAvailableFileName(dir,
-					StrUtil.makeValidFileName(e.getName()),
-					(MultiResourceEObject) e);
-			return URI.createFileURI(path);
-		}
-
-		StringBuffer path = new StringBuffer();
-		EObject lastContainer = null;
-		for (MethodElement obj = (MethodElement) e.eContainer(); obj != null; obj = (MethodElement) obj
-				.eContainer()) {
-			lastContainer = obj;
-			if (obj instanceof MethodLibrary) {
-				path.insert(0, new File(((MultiFileXMIResourceImpl) obj
-						.eResource()).getFinalURI().toFileString())
-						.getParentFile().getAbsolutePath());
-				break;
-			} else {
-				path.insert(0, obj.getName()).insert(0, File.separatorChar);
-			}
-		}
-		if (lastContainer == null) {
-			return e.eResource() != null ? ((MultiFileXMIResourceImpl) e
-					.eResource()).getFinalURI() : null;
-		}
-		if (!(lastContainer instanceof MethodLibrary)) {
-			path.insert(0, new File(toFileString(lastContainer))
-					.getParentFile().getParentFile().getAbsolutePath());
-		}
-
-		String modelFileName;
-		if (e instanceof MethodPlugin) {
-			modelFileName = DEFAULT_PLUGIN_MODEL_FILENAME;
-		} else {
-			modelFileName = MultiFileSaveUtil.DEFAULT_MODEL_FILENAME;
-		}
-		URI uri = URI.createFileURI(path.toString() + File.separator
-				+ MultiFileSaveUtil.createDirName(e) + File.separator
-				+ modelFileName);
-		return uri;
-	}
-
-	public static void delete(File file) {
-		File[] files = file.listFiles();
-		if (files != null) {
-			for (int i = 0; i < files.length; i++) {
-				delete(files[i]);
-			}
-		}
-		file.delete();
-	}
-
-	/**
-	 * 
-	 * @param e
-	 * @param uri
-	 * @param modifiedResources
-	 *            output of resources that have been changed after this call.
-	 */
-	static void setURIMapping(EObject e, URI uri, Set modifiedResources) {
-		MultiFileURIConverter uriConverter = (MultiFileURIConverter) e
-				.eResource().getResourceSet().getURIConverter();
-		uriConverter.setURIMapping(e, uri, modifiedResources);
-	}
-
-	/**
-	 * 
-	 * @param resource
-	 * @param modifiedResources
-	 *            output of resources that have been changed after this call
-	 */
-	static void updateURIMappings(MultiFileXMIResourceImpl resource,
-			Set modifiedResources) {
-		updateURIMappings(resource, modifiedResources, true);
-	}
-
-	/**
-	 * Checks if the given resourceSet has the loaded resource with the given
-	 * uri
-	 * 
-	 * @param resourceSet
-	 * @param uri
-	 * @return
-	 */
-	static boolean hasLoadedResource(ResourceSet resourceSet, URI uri) {
-		for (Iterator iter = resourceSet.getResources().iterator(); iter
-				.hasNext();) {
-			Resource resource = (Resource) iter.next();
-			if (resource.isLoaded() && resource.getURI().equals(uri)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Update the URIMappings with the final URI of the given resource
-	 * 
-	 * @param resource
-	 */
-	static void updateURIMappings(MultiFileXMIResourceImpl resource,
-			Set modifiedResources, boolean afterMove) {
-		updateURIMappings(resource, resource.getFinalURI(), modifiedResources,
-				afterMove);
-	}
-
-	static void updateURIMappings(MultiFileXMIResourceImpl resource, URI uri,
-			Set modifiedResources, boolean afterMove) {
-		// the resource URI has been changed, reset all the cached resolved URI
-		// in all offstring resource descriptors
-		// of its manager, if it has one.
-		//
-		HashMap oldURIToResourceDescriptorMap = null;
-		ResourceManager resMgr = getResourceManager(resource);
-		if (resMgr != null) {
-			oldURIToResourceDescriptorMap = new HashMap();
-			for (Iterator iter = resMgr.eAllContents(); iter.hasNext();) {
-				Object obj = iter.next();
-				if (obj instanceof ResourceDescriptor) {
-					ResourceDescriptor desc = ((ResourceDescriptor) obj);
-					oldURIToResourceDescriptorMap.put(desc.getResolvedURI(),
-							desc);
-					if (afterMove) {
-						desc.clearResolvedURI();
-					}
-				}
-			}
-		}
-
-		if (!resource.getContents().isEmpty()) {
-			EObject element = PersistenceUtil.getMethodElement(resource);
-			// setURIMapping(element, resource.getFinalURI(),
-			// modifiedResources);
-			MultiFileURIConverter uriConverter = (MultiFileURIConverter) resource
-					.getResourceSet().getURIConverter();
-			uriConverter.setURIMapping(element, uri, modifiedResources,
-					afterMove);
-		}
-
-		// for (Iterator iter = resource.getContents().iterator();
-		// iter.hasNext();) {
-		// EObject element = (EObject) iter.next();
-		// setURIMapping(element, resource.getURI(), modifiedResources);
-		// }
-
-		if (oldURIToResourceDescriptorMap != null) {
-			// go thru the list of loaded resources in resource set to update
-			// the URI
-			//
-			for (Iterator iter = resource.getResourceSet().getResources()
-					.iterator(); iter.hasNext();) {
-				Resource res = (Resource) iter.next();
-				ResourceDescriptor desc = (ResourceDescriptor) oldURIToResourceDescriptorMap
-						.get(res.getURI());
-				if (desc != null) {
-					if (afterMove) {
-						res.setURI(desc.getResolvedURI());
-					} else if (res.isLoaded()) {
-						desc.clearResolvedURI();
-						res.setURI(desc.getResolvedURI());
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param resMgr
-	 * @param o
-	 * @param uri
-	 */
-	// private static void setUri(ResourceManager resMgr, MethodElement e, URI
-	// uri) {
-	// for (Iterator iter = resMgr.getResourceDescriptors().iterator();
-	// iter.hasNext();) {
-	// ResourceDescriptor resDesc = (ResourceDescriptor) iter.next();
-	// if(resDesc.getId().equals(e.getGuid())) {
-	// // change other URIs that are changed as result of this URI change
-	// //
-	// if(uri.fragment() == null) {
-	// URI oldDir = URI.createFileURI(new
-	// File(resDesc.getResolvedURI().toFileString()).getParent() +
-	// File.separator);
-	// URI newDir = URI.createFileURI(new File(uri.toFileString()).getParent() +
-	// File.separator);
-	// for (Iterator iterator = resMgr.getResourceDescriptors().iterator();
-	// iterator
-	// .hasNext();) {
-	// ResourceDescriptor element = (ResourceDescriptor) iterator.next();
-	// URI currentUri = element.getResolvedURI();
-	// URI newUri = currentUri.replacePrefix(oldDir, newDir);
-	// if(newUri != null) {
-	// element.setResolvedURI(newUri);
-	// }
-	// }
-	// }
-	// resDesc.setResolvedURI(uri);
-	// return;
-	// }
-	// }
-	// ResourceDescriptor resDesc =
-	// ResourcemanagerFactory.eINSTANCE.createResourceDescriptor();
-	// resDesc.setId(e.getGuid());
-	// resDesc.setResolvedURI(uri);
-	// resMgr.getResourceDescriptors().add(resDesc);
-	// }
-	/**
-	 * Gets the right ResourceManager for the given EObject, creates new
-	 * ResourceManager if it does not exist yet.
-	 * 
-	 * @param modifiedResources
-	 *            output of resources that have been changed after this call.
-	 */
-	static ResourceManager getResourceManagerFor(EObject eObj,
-			Set modifiedResources) {
-		Resource resource = eObj.eContainer() != null ? eObj.eContainer()
-				.eResource() : eObj.eResource();
-		ResourceManager resMgr = getResourceManager(resource);
-		if (resMgr == null) {
-			resMgr = ResourcemanagerFactory.eINSTANCE.createResourceManager();
-
-			// add to beginning of the resource's contents
-			//
-			resource.getContents().add(0, resMgr);
-
-			if (modifiedResources != null) {
-				modifiedResources.add(resource);
-			}
-			EObject container = getContainerWithDirectResource((InternalEObject) eObj);
-			if (container != null && container.eResource() != resource) {
-				ResourceManager parentResMgr = getResourceManagerFor(container,
-						modifiedResources);
-				if (parentResMgr != null) {
-					parentResMgr.getSubManagers().add(resMgr);
-					if (modifiedResources != null) {
-						modifiedResources.add(parentResMgr.eResource());
-					}
-				}
-			}
-		}
-
-		return resMgr;
-
-	}
-
-	static List registerWithResourceManager(MultiFileXMIResourceImpl resource,
-			Set modifiedResources) {
-		ResourceManager resMgr = getResourceManagerFor(
-				PersistenceUtil.getMethodElement(resource), modifiedResources);
-
-		List resourceDescriptors = new ArrayList();
-		for (Iterator iter = resource.getContents().iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			if(element instanceof MethodElement) {
-				ResourceDescriptor resDesc = registerWithResourceManager(resMgr,
-						element, resource.getFinalURI());
-				if (resDesc != null) {
-					resourceDescriptors.add(resDesc);
-				}
-			}
-		}
-		if (!resourceDescriptors.isEmpty() && modifiedResources != null) {
-			modifiedResources.add(resMgr.eResource());
-		}
-		return resourceDescriptors;
-	}
-
-	public static ResourceDescriptor registerWithResourceManager(
-			ResourceManager resMgr, Object element, URI uri) {
-		String guid = getGuid(element);
-		if (resMgr.getResourceDescriptor(guid) == null) {
-			return createResourceDescriptor(resMgr, guid, uri);
-		} else {
-			return null;
-		}
-	}
-
-	// /**
-	// * Creates a new ResourceDescriptor for the given MethodElement and add it
-	// to the given ResourceManager
-	// *
-	// * @param e
-	// * @return newly added ResourceDescriptor
-	// */
-	// private static ResourceDescriptor
-	// createResourceDescriptor(ResourceManager resMgr, MethodElement e) {
-	// return createResourceDescriptor(resMgr, e.getGuid(), createFileURI(e));
-	// }
-
-	/**
-	 * Creates a new ResourceDescriptor with the given id and resolvedURI, then
-	 * adds it to the given resMgr
-	 * 
-	 * @param resMgr
-	 * @param id
-	 * @param resolvedURI
-	 * @return
-	 */
-	private static ResourceDescriptor createResourceDescriptor(
-			ResourceManager resMgr, String id, URI resolvedURI) {
-		ResourceDescriptor resDesc = ResourcemanagerFactory.eINSTANCE
-				.createResourceDescriptor();
-		resDesc.setId(id);
-		resMgr.getResourceDescriptors().add(resDesc);
-		resDesc.setResolvedURI(resolvedURI);
-		return resDesc;
-	}
-
-	// static void setUri(MultiFileURIConverter uriConverter, MethodElement e,
-	// URI uri) {
-	// setUri(uriConverter, e, uri, false);
-	// }
-
-	// static void setUri(MultiFileURIConverter uriConverter, MethodElement e,
-	// URI uri, boolean saveNow) {
-	// ResourceManager resMgr = uriConverter.getResourceManager();
-	// if(resMgr == null) {
-	// resMgr = ResourcemanagerFactory.eINSTANCE.createResourceManager();
-	// uriConverter.setResourceManager(resMgr);
-	// }
-	// setUri(resMgr, e, uri);
-	// resMgr.eResource();
-	// }
-
-	/**
-	 * @param element
-	 */
-	public static void setGuid(MethodElement e) {
-		if (e.getGuid() == null || e.getGuid().trim().length() == 0) {
-			e.setGuid(EcoreUtil.generateUUID());
-		}
-	}
-
-	/**
-	 * Saves the given MethodElement in its own file while still preserving the
-	 * existing containment association if there is any
-	 * 
-	 * @param e
-	 */
-	public static void save(MethodElement e, Map options) {
-		MultiFileXMIResourceImpl resource = (MultiFileXMIResourceImpl) e
-				.eResource();
-		MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) resource
-				.getResourceSet();
-		if (options == null) {
-			options = resourceSet.getDefaultSaveOptions();
-		}
-		EObject container = e.eContainer();
-
-		Set modifiedResources = new HashSet();
-		options.put(MultiFileXMISaveImpl.MODIFIED_RESOURCE_SET,
-				modifiedResources);
-		try {
-			URI uri = MultiFileSaveUtil.createFileURI(e);
-			boolean createResource = resource == null
-					|| (container != null && resource == container.eResource());
-			if (createResource) {
-				MultiFileSaveUtil.save(e, uri, options);
-			} else {
-				URI oldUri = resource.getURI();
-				if (!oldUri.equals(uri)) {
-
-					// resource's location is changed.
-					// move the resource, then change its URI if the resource
-					// move is successful.
-					//   
-					if (FileManager.getInstance().move(oldUri.toFileString(),
-							uri.toFileString())) {
-						// MultiFileURIConverter uriConverter =
-						// (MultiFileURIConverter)
-						// resource.getResourceSet().getURIConverter();
-						// MultiFileSaveUtil.setUri(uriConverter, e, uri);
-						resource.setURI(uri);
-						updateURIMappings(resource, modifiedResources);
-					}
-				}
-
-				if (resource.isModified()) {
-					MultiFileSaveUtil.save(resource, options);
-				}
-			}
-
-			resourceSet.saveModifiedResources(options);
-		} finally {
-
-		}
-
-	}
-
-	public static void save(ResourceSet resourceSet, MethodElement e,
-			Map options) {
-		URI uri = createFileURI(e);
-		save(resourceSet, e, uri, options);
-	}
-
-	static void adjustLocation(Resource resource, Set modifiedResources) {
-		MethodElement e = PersistenceUtil.getMethodElement(resource);
-		if (e == null)
-			return;
-		URI newFile = createFileURI(e);
-		if (newFile != null && adjustLocation(resource, newFile)) {
-			resource.setURI(newFile);
-			updateURIMappings((MultiFileXMIResourceImpl) resource,
-					modifiedResources);
-		}
-	}
-
-	static URI getNewURI(MultiFileXMIResourceImpl resource) {
-		MethodElement e = PersistenceUtil.getMethodElement(resource);
-		if (e == null) {
-			return null;
-		}
-		URI newFile = createFileURI(e);
-		if (newFile != null && adjustLocationRequired(resource, newFile)) {
-			return newFile;
-		}
-		return null;
-	}
-
-	static boolean prepareAdjustLocation(MultiFileXMIResourceImpl resource,
-			Set modifiedResources) {
-		URI newFile = getNewURI(resource);
-		if (newFile != null) {
-			resource.backUpURI();
-			resource.setFinalURI(newFile);
-			updateURIMappings((MultiFileXMIResourceImpl) resource,
-					modifiedResources, false);
-			return true;
-		}
-		return false;
-	}
-
-	public static String getGuid(Object e) {
-		if (e instanceof MethodElement) {
-			return ((MethodElement) e).getGuid();
-		} else if (e instanceof ResourceManager) {
-			return ((ResourceManager) e).getGuid();
-		}
-		return null;
-	}
-
-	static boolean adjustLocationRequired(MultiFileXMIResourceImpl resource,
-			URI newURI) {
-		File oldFile = new File(resource.getFinalURI().toFileString());
-		File newFile = new File(newURI.toFileString());
-		return !oldFile.equals(newFile);
-	}
-
-	/**
-	 * Checks if the resource's URI has been changed and adjust the resource's
-	 * location.
-	 * 
-	 * @param oldUri
-	 * @param newUri
-	 */
-	static boolean adjustLocation(Resource resource, URI newUri) {
-		File oldFile = new File(resource.getURI().toFileString());
-		File newFile = new File(newUri.toFileString());
-		if (oldFile.equals(newFile)) {
-			return false;
-		}
-		return move(resource, oldFile, newFile);
-	}
-
-	static boolean move(Resource resource, File oldFile, File newFile) {
-		boolean ret = true;
-		if (oldFile.equals(newFile)) {
-			return false;
-		}
-		Object obj = PersistenceUtil.getMethodElement(resource);
-		if (hasOwnFolder(obj)) {
-			String oldDir = oldFile.getParentFile().toString();
-			if (!oldFile.getParentFile().equals(newFile.getParentFile())) {
-				if (FileManager.getInstance().rename(oldFile.getParentFile(),
-						newFile.getParentFile())) {
-					if (DEBUG) {
-						System.out
-								.println("Directory '" + oldDir + "' is successfully moved to '" + newFile.getParentFile() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					}
-				} else {
-					ret = false;
-					if (DEBUG) {
-						System.out
-								.println("Could not move directory '" + oldDir + "' to '" + newFile.getParentFile() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					}
-				}
-			}
-			if (!oldFile.getName().equals(newFile.getName())) {
-				oldFile = new File(newFile.getParentFile(), oldFile.getName());
-				if (FileManager.getInstance().rename(oldFile, newFile)) {
-					if (DEBUG) {
-						System.out
-								.println("File '" + oldFile + "' is successfully moved to '" + newFile + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					}
-				} else {
-					ret = false;
-					if (DEBUG) {
-						System.out
-								.println("Could not move file '" + oldFile + "' to '" + newFile + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					}
-				}
-			}
-			return ret;
-		} else if (oldFile.exists()) /* if(oldFile.getParentFile().equals(newFile.getParentFile())) */{
-			String oldFileStr = oldFile.toString();
-			if (FileManager.getInstance().rename(oldFile, newFile)) {
-				if (DEBUG) {
-					System.out
-							.println("File '" + oldFileStr + "' is successfully moved to '" + newFile + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				}
-				return true;
-			} else {
-				if (DEBUG) {
-					System.out
-							.println("Could not move file '" + oldFileStr + "' to '" + newFile + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * 
-	 * @param resMgr
-	 * @param guid
-	 * @param excludedResManagers
-	 *            ResourceManager that are excluded from this search
-	 * @return
-	 */
-	public static ResourceDescriptor findResourceDescriptor(
-			ResourceManager resMgr, String guid,
-			Collection excludedResManagers, boolean resolveProxy) {
-		try {
-			ResourceDescriptor desc = resMgr.getResourceDescriptor(guid);
-			if (desc != null)
-				return desc;
-			// TODO: (Phong) performance improvement needed to avoid loading
-			// resources excessively
-			//
-			Iterator iter;
-			if (resolveProxy) {
-				iter = new ArrayList(resMgr.getSubManagers()).iterator();
-			} else {
-				iter = ((InternalEList) resMgr.getSubManagers())
-						.basicIterator();
-			}
-			while (iter.hasNext()) {
-				ResourceManager mgr = (ResourceManager) iter.next();
-				if (mgr != null
-						&& !mgr.eIsProxy()
-						&& (excludedResManagers == null || !excludedResManagers
-								.contains(mgr))) {
-					desc = findResourceDescriptor(mgr, guid,
-							excludedResManagers, resolveProxy);
-					if (desc != null)
-						return desc;
-				}
-			}
-			return null;
-		} catch (RuntimeException e) {
-			throw e;
-		}
-	}
-
-	/**
-	 * 
-	 * @param resMgr
-	 * @return how many ResourceDescriptors are in the resMgr and its
-	 *         SubManagers
-	 */
-	public static int getCountResourceDescriptors(ResourceManager resMgr) {
-		int count = resMgr.getResourceDescriptors().size();
-		for (Iterator iter = resMgr.getSubManagers().iterator(); iter.hasNext();) {
-			ResourceManager mgr = (ResourceManager) iter.next();
-			count += getCountResourceDescriptors(mgr);
-		}
-		return count;
-	}
-
-	/**
-	 * Gets the resource descriptor for the given resource
-	 * 
-	 * @param resource
-	 * @return
-	 */
-	public static ResourceDescriptor getResourceDescriptor(Resource resource) {
-		ResourceManager containerResMgr = null;
-		MethodElement me = null;
-		for (Iterator iter = resource.getContents().iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			if (element instanceof MethodLibrary) {
-				ResourceManager resMgr = getResourceManager(resource);
-				if (resMgr != null) {
-					ResourceDescriptor desc = resMgr
-							.getResourceDescriptor(((MethodElement) element)
-									.getGuid());
-					// hack to add missing ResourceDescriptor for library's
-					// resource
-					//
-					if (desc == null) {
-						desc = registerWithResourceManager(resMgr, element,
-								((MultiFileXMIResourceImpl) resource)
-										.getFinalURI());
-					}
-					return desc;
-				}
-			}
-			if (me == null && element instanceof MethodElement) {
-				me = (MethodElement) element;
-			}
-			if (containerResMgr == null && element instanceof InternalEObject) {
-				EObject container = getContainerWithDirectResource((InternalEObject) element);
-				if (container != null) {
-					containerResMgr = getResourceManager(container.eResource());
-				}
-			}
-			if (me != null && containerResMgr != null) {
-				break;
-			}
-		}
-
-		if(me != null) {
-			if (containerResMgr != null) {
-				return containerResMgr.getResourceDescriptor(((MethodElement) me)
-						.getGuid());
-			}
-			else if(me.eContainer() == null) {
-				// this element has been loaded before its container
-				// try to find its resource descriptor using root resource manager
-				//
-				ResourceSet resourceSet = resource.getResourceSet();
-				if(resourceSet instanceof MultiFileResourceSetImpl) {
-					ResourceManager rootResMgr = ((MultiFileResourceSetImpl)resourceSet).getRootResourceManager();
-					Iterator iter = new AbstractTreeIterator(rootResMgr) {
-
-						/**
-						 * Comment for <code>serialVersionUID</code>
-						 */
-						private static final long serialVersionUID = 1L;
-
-						protected Iterator getChildren(Object object) {
-							if(object instanceof ResourceManager) {
-								ArrayList children = new ArrayList();
-								ResourceManager resMgr = (ResourceManager)object; 
-								children.addAll(resMgr.getResourceDescriptors());
-								children.addAll(resMgr.getSubManagers());
-								return children.iterator();
-							}
-							return Collections.EMPTY_LIST.iterator();
-						}
-						
-					};
-					URI uri = getFinalURI(resource);
-					while(iter.hasNext()) {
-						Object o = iter.next();
-						if(o instanceof ResourceDescriptor) {
-							ResourceDescriptor resDesc = (ResourceDescriptor) o;
-							if(uri.equals(resDesc.getResolvedURI())) {
-								return resDesc;
-							}
-						}
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	// public static ResourceDescriptor findResourceDescriptor(MethodElement e)
-	// {
-	// ResourceManager resMgr = null;
-	// if(e.eResource() != null) {
-	// resMgr = getResourceManager(e.eResource());
-	// }
-	// ResourceDescriptor desc = null;
-	// Collection excludedResMgrs = null;
-	// if(resMgr != null) {
-	// desc = findResourceDescriptor(resMgr, e.getGuid());
-	// if(desc != null) return desc;
-	// excludedResMgrs = Collections.singletonList(resMgr);
-	// }
-	//		
-	// MethodLibrary lib = UmaUtil.getMethodLibrary(e);
-	// resMgr = getResourceManager(lib.eResource());
-	//		
-	// return findResourceDescriptor(resMgr, e.getGuid(), excludedResMgrs);
-	// }
-
-	/**
-	 * Gets the ResourceManager in the contents of the given resource
-	 * 
-	 * @param resource
-	 * @return
-	 */
-	public static ResourceManager getResourceManager(Resource resource) {
-		ResourceManager resMgr = null;
-		for (Iterator iter = resource.getContents().iterator(); iter.hasNext();) {
-			Object element = (Object) iter.next();
-			if (element instanceof ResourceManager) {
-				resMgr = (ResourceManager) element;
-				break;
-			}
-		}
-
-		return resMgr;
-	}
-
-	static InternalEObject getContainerWithDirectResource(InternalEObject obj) {
-		if (obj.eContainer() == null)
-			return null;
-		InternalEObject container = (InternalEObject) ((InternalEObject) obj
-				.eContainer());
-		if (container.eDirectResource() != null) {
-			return container;
-		}
-		return getContainerWithDirectResource(container);
-	}
-
-	static String getHREF(Resource resource, Object obj) {
-		MethodElement owner = PersistenceUtil.getMethodElement(resource);
-		return MultiFileURIConverter.createURI(owner.getGuid()).appendFragment(
-				getGuid(obj)).toString();
-	}
-
-	public static String getBackupFileSuffix() {
-		return "_" + dateFormatter.format(Calendar.getInstance().getTime()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Resolve the proxy identified by the given <code>guid</code> without
-	 * loading all other proxies in <code>parent</code>
-	 * 
-	 * @param guid
-	 * @param parent
-	 * @return
-	 */
-	public static void resolveProxies(Collection GUIDs, EObject parent) {
-		for (Iterator iterator = parent.eClass().getEAllContainments()
-				.iterator(); !GUIDs.isEmpty() && iterator.hasNext();) {
-			EStructuralFeature feature = (EStructuralFeature) iterator.next();
-			if (feature.isMany()) {
-				InternalEList list = (InternalEList) parent.eGet(feature);
-				int index = 0;
-				for (Iterator iter1 = list.basicIterator(); !GUIDs.isEmpty()
-						&& iter1.hasNext(); index++) {
-					InternalEObject child = (InternalEObject) iter1.next();
-					if (child.eIsProxy()) {
-						String guid = child.eProxyURI().fragment();
-						if (GUIDs.contains(guid)) {
-							// this will resolve the object with guid
-							//
-							list.get(index);
-							GUIDs.remove(guid);
-						}
-					} else {
-						resolveProxies(GUIDs, child);
-					}
-				}
-			} else {
-				InternalEObject child = (InternalEObject) parent.eGet(feature,
-						false);
-				if (child != null) {
-					if (child.eIsProxy()) {
-						String guid = child.eProxyURI().fragment();
-						if (GUIDs.contains(guid)) {
-							// this will resolve the object with guid
-							//
-							parent.eGet(feature);
-							GUIDs.remove(guid);
-						}
-					} else {
-						resolveProxies(GUIDs, child);
-					}
-				}
-			}
-		}
-	}
-
-	public static URI getFinalURI(Resource resource) {
-		return resource instanceof MultiFileXMIResourceImpl ? ((MultiFileXMIResourceImpl) resource)
-				.getFinalURI()
-				: resource.getURI();
-	}
-
-	/**
-	 * @param impl
-	 * @return
-	 */
-	static boolean adjustLocationRequired(MultiFileXMIResourceImpl resource) {
-		MethodElement e = PersistenceUtil.getMethodElement(resource);		
-		if(e != null && hasOwnFolder(e)) {
-			URI newURI = createFileURI(e);
-			if(adjustLocationRequired(resource, newURI) && !new File(newURI.toFileString()).exists()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if the specified resource is currently synchronized with its data store
-	 * 
-	 * @return <li> -1 don't know
-	 *         <li> 0 no
-	 *         <li> 1 yes
-	 */
-	public static int checkSynchronized(Resource resource) {
-		if(resource instanceof MultiFileXMIResourceImpl) {
-			return ((MultiFileXMIResourceImpl)resource).checkSynchronized();
-		}
-		return -1;
-	}
-
-	/**
-	 * Some team providers changed the timestamp of last file modification by removing second fraction
-	 * even the file was not changed. This method check the current and old time stamps for this.
-	 * 
-	 * @param currentTimeStamp
-	 * @param lastTimeStamp
-	 * @return
-	 */
-	public static boolean same(long currentTimeStamp, long lastTimeStamp) {
-		return currentTimeStamp < lastTimeStamp && (currentTimeStamp & 7) == 0 && (lastTimeStamp - currentTimeStamp) < 1000;
-	}
-
-	/**
-	 * Adds an empty resource manager for the given resource if it does not have one.
-	 * 
-	 * @param resource
-	 * @return true if a new resource manager is added, false otherwise
-	 */
-	static ResourceManager addResourceManager(Resource resource) {
-		ResourceManager resMgr = getResourceManager(resource);
-		if (resMgr == null) {
-			resMgr = ResourcemanagerFactory.eINSTANCE.createResourceManager();
-			resource.getContents().add(0, resMgr);
-			return resMgr;
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileURIConverter.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileURIConverter.java
deleted file mode 100755
index 9ef4292..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileURIConverter.java
+++ /dev/null
@@ -1,340 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.AbstractTreeIterator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-import org.eclipse.epf.resourcemanager.ResourceDescriptor;
-import org.eclipse.epf.resourcemanager.ResourceManager;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-
-/**
- * URI converter that converts a file-based URI to a UMA-based URI and vice
- * versa using the mapping information stored in ResourceDescriptors of
- * ResourceManager. A UMA-based URI has the following format:
- * uma://GUID1#GUID2 where GUID1 is the GUID of the file and GUID2 is the
- * object's GUID. 
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MultiFileURIConverter extends URIConverterImpl {
-
-	public static final String SCHEME = "uma"; //$NON-NLS-1$
-
-	private static final HashSet lockedGUIDs = new HashSet();
-
-	protected ResourceManager resMgr;
-
-	private URI libraryURI;
-
-	private URI libraryUmaURI;
-
-	private MultiFileResourceSetImpl resourceSet;
-
-	private boolean resolveProxy;
-
-	public MultiFileURIConverter(MultiFileResourceSetImpl resourceSet) {
-		this.resourceSet = resourceSet;
-	}
-
-	void setResolveProxy(boolean resolveProxy) {
-		this.resolveProxy = resolveProxy;
-	}
-
-	void setLibraryURIs(MethodLibrary library) {
-		libraryURI = library.eResource().getURI();
-		libraryUmaURI = URI.createURI(new StringBuffer(SCHEME)
-				.append("://").append(library.getGuid()).toString()); //$NON-NLS-1$
-	}
-
-	private static void lockGUID(String guid) {
-		synchronized (lockedGUIDs) {
-			lockedGUIDs.add(guid);
-		}
-	}
-
-	private static boolean isLockedGUID(String guid) {
-		synchronized (lockedGUIDs) {
-			return lockedGUIDs.contains(guid);
-		}
-	}
-
-	private static boolean unlockGUID(String guid) {
-		synchronized (lockedGUIDs) {
-			return lockedGUIDs.remove(guid);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.impl.URIConverterImpl#normalize(org.eclipse.emf.common.util.URI)
-	 */
-	public URI normalize(URI uri) {
-		return normalize(uri, null);
-	}
-
-	public URI normalize(URI uri, EObject resolver) {
-		if (SCHEME.equalsIgnoreCase(uri.scheme())) {
-			String guid = uri.authority();
-			if (isLockedGUID(guid)) {
-				return null;
-			}
-			try {
-				lockGUID(guid);
-
-				ResourceDescriptor desc = null;
-				HashSet excludedResManagers = null;
-				if (resolver != null && resolver.eResource() != null) {
-					ResourceManager resMgr = MultiFileSaveUtil
-							.getResourceManager(resolver.eResource());
-					if (resMgr != null) {
-						desc = MultiFileSaveUtil.findResourceDescriptor(resMgr,
-								guid, null, resolveProxy);
-						if (desc == null) {
-							// add this ResourceManager and its submanagers to
-							// excludedResManagers
-							// so the next search for ResourceDescriptor will
-							// ignore them
-							//
-							excludedResManagers = new HashSet();
-							Iterator iter = new AbstractTreeIterator(resMgr) {
-
-								protected Iterator getChildren(Object object) {
-									return ((ResourceManager) object)
-											.getSubManagers().iterator();
-								}
-
-							};
-							while (iter.hasNext()) {
-								excludedResManagers.add(iter.next());
-							}
-						}
-					}
-				}
-				if (desc == null && getResourceManager() != null) {
-					desc = MultiFileSaveUtil.findResourceDescriptor(
-							getResourceManager(), guid, excludedResManagers,
-							resolveProxy);
-				}
-				if (desc != null) {
-					URI normalized = desc.getResolvedURI();
-
-					// check if the resource with this normalized URI has
-					// temporary URI
-					//
-					URI tempURI = (URI) resourceSet.getURIToTempURIMap().get(
-							normalized);
-					if (tempURI != null) {
-						normalized = tempURI;
-					}
-
-					if (uri.hasFragment()) {
-						normalized = normalized.appendFragment(uri.fragment());
-					}
-
-					return normalized;
-				}
-				return null;
-			} finally {
-				unlockGUID(guid);
-			}
-		}
-
-		return super.normalize(uri);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.impl.URIConverterImpl#createInputStream(org.eclipse.emf.common.util.URI)
-	 */
-	public InputStream createInputStream(URI uri) throws IOException {
-		if (uri == null)
-			return null;
-		return super.createInputStream(uri);
-	}
-
-	public static URI createURI(String guid) {
-		return URI.createURI(new StringBuffer(SCHEME)
-				.append("://").append(guid).toString()); //$NON-NLS-1$
-	}
-
-	public static URI createURI(MethodElement e) {
-		return URI.createURI(createUriString(e));
-	}
-
-	public static String createUriString(Object e) {
-		InternalEObject o = (InternalEObject) e;
-
-		URI objectURI = o.eProxyURI();
-		if (objectURI != null && SCHEME.equals(objectURI.scheme())) {
-			return objectURI.toString();
-		}
-
-		String guid = MultiFileSaveUtil.getGuid(e);
-		if (guid == null) {
-			return null;
-		}
-		return new StringBuffer(SCHEME).append("://").append(guid).toString(); //$NON-NLS-1$
-	}
-
-	// public URI toUmaUri(URI uri) {
-	// // System.out.println("MultiFileURIConverter.toUmaUri(): uri="+uri);
-	// if(uri.scheme().equals("uma") || uriDescMap == null) return uri;
-	// if(libraryURI.equals(uri)) return libraryUmaURI;
-	// ResourceDescriptor desc = (ResourceDescriptor)
-	// uriDescMap.get(uri.trimFragment().toString());
-	// return desc == null ? uri : URI.createURI("uma://" +
-	// desc.getId()).appendFragment(uri.fragment());
-	// }
-
-	// public void setResourceManager(ResourceManager resMgr) {
-	// this.resMgr = resMgr;
-	// }
-
-	public ResourceManager getResourceManager() {
-		if (resMgr == null) {
-			resMgr = resourceSet.getRootResourceManager();
-		}
-		return resMgr;
-	}
-
-	/**
-	 * Finds ResourceDescriptor for the given GUID from root ResourceManager
-	 * 
-	 * @param guid
-	 * @return
-	 */
-	public ResourceDescriptor findResourceDescriptor(String guid) {
-		return MultiFileSaveUtil.findResourceDescriptor(getResourceManager(),
-				guid, null, resolveProxy);
-	}
-
-	public void dispose() {
-		if (resMgr != null) {
-			resMgr.dispose();
-			resMgr = null;
-		}
-	}
-
-	/**
-	 * 
-	 * @param e
-	 * @param uri
-	 * @param modifiedResources
-	 *            output of resources that have been changed after this call.
-	 */
-	public void setURIMapping(EObject e, URI uri, Set modifiedResources) {
-		setURIMapping(e, uri, modifiedResources, true);
-	}
-
-	public void setURIMapping(EObject e, URI uri, Set modifiedResources,
-			boolean afterMove) {
-		String guid = MultiFileSaveUtil.getGuid(e);
-		ResourceManager resMgr = MultiFileSaveUtil.getResourceManagerFor(e,
-				modifiedResources);
-		ResourceDescriptor resDesc = resMgr.getResourceDescriptor(guid);
-		if (resDesc != null) {
-			if (afterMove) {
-				resDesc.setResolvedURI(uri);
-			} else {
-				// preserve the current resolved URI
-				resDesc.getResolvedURI();
-				// set new URI string for the upcoming move
-				resDesc.setUri(uri.deresolve(
-						MultiFileSaveUtil.getFinalURI(resDesc.eResource()))
-						.toString());
-			}
-			if (modifiedResources != null)
-				modifiedResources.add(resDesc.eResource());
-		} else {
-			// find the ResourceDescriptor in other ResourceManagers
-			//
-			MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) e
-					.eResource().getResourceSet();
-			ResourceManager libResMgr = resourceSet.getRootResourceManager();
-			resDesc = MultiFileSaveUtil.findResourceDescriptor(libResMgr, guid,
-					Collections.singletonList(resMgr), resolveProxy);
-			if (resDesc != null) {
-				// ResourceDescriptor already exists
-				// change its uri, move it and its sub manager, if there is any,
-				// to new ResourceManager
-				//
-
-				// find sub manager
-				ResourceManager currentResMgr = (ResourceManager) resDesc
-						.eContainer();
-				ResourceManager subMgr = null;
-				for (Iterator iter = currentResMgr.getSubManagers().iterator(); iter
-						.hasNext();) {
-					ResourceManager mgr = (ResourceManager) iter.next();
-					URI mgrURI = ((MultiFileXMIResourceImpl) mgr.eResource())
-							.getFinalURI();
-					if (mgrURI.equals(uri)) {
-						subMgr = mgr;
-						break;
-					}
-				}
-
-				// move ResourceDescriptor
-				resMgr.getResourceDescriptors().add(resDesc);
-				if (modifiedResources != null) {
-					modifiedResources.add(currentResMgr.eResource());
-					modifiedResources.add(resMgr.eResource());
-				}
-
-				// move sub ResourceManager
-				if (subMgr != null) {
-					resMgr.getSubManagers().add(subMgr);
-				}
-
-				// set new URI
-				if (afterMove) {
-					resDesc.setResolvedURI(uri);
-				} else {
-					// preserve the current resolved URI
-					resDesc.getResolvedURI();
-					// set new URI string for the upcoming move
-					resDesc.setUri(uri.deresolve(resDesc.eResource().getURI())
-							.toString());
-				}
-				if (modifiedResources != null)
-					modifiedResources.add(resDesc.eResource());
-			} else {
-				MultiFileSaveUtil.registerWithResourceManager(resMgr, e, uri);
-				if (modifiedResources != null)
-					modifiedResources.add(resMgr.eResource());
-			}
-		}
-	}
-
-	public static void main(String[] args) {
-		URI uri = URI
-				.createURI("uma://_LPzdAGZ7EdmAm_xSX2EdUA#//@breakdownElements.0"); //$NON-NLS-1$
-		System.out.println(uri);
-		System.out
-				.println("deresolved URI: " + uri.deresolve(URI.createURI("uma://_LPzdAGZ7EdmAm_xSX2EdUA"))); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileXMIHelperImpl.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileXMIHelperImpl.java
deleted file mode 100755
index de85cb3..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileXMIHelperImpl.java
+++ /dev/null
@@ -1,296 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMIHelperImpl;
-import org.eclipse.epf.resourcemanager.ResourceDescriptor;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-
-/**
- * XMLHelper implementation for library XMI persistence
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MultiFileXMIHelperImpl extends XMIHelperImpl {
-
-	/**
-	 * Platform-specific line separator.
-	 */
-	private static final String LINE_SEP = System.getProperty("line.separator"); //$NON-NLS-1$
-
-	protected boolean logError = true;
-
-	protected List sameDocReferences;
-
-	private boolean discardUnresolvedRef;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public MultiFileXMIHelperImpl(MultiFileXMIResourceImpl xmiRes) {
-		super(xmiRes);
-		sameDocReferences = new UniqueEList();
-		Boolean b = (Boolean) ((MultiFileResourceSetImpl) xmiRes
-				.getResourceSet()).getDefaultSaveOptions().get(
-				MultiFileXMISaveImpl.DISCARD_UNRESOLVED_REFERENCES);
-		discardUnresolvedRef = b != null ? b.booleanValue() : false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl#setResource(org.eclipse.emf.ecore.xmi.XMLResource)
-	 */
-	public void setResource(XMLResource resource) {
-		super.setResource(resource);
-		if(resource instanceof MultiFileXMIResourceImpl) {
-			resourceURI = ((MultiFileXMIResourceImpl)resource).getFinalURI();
-			deresolve = resourceURI != null && !resourceURI.isRelative() && resourceURI.isHierarchical();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl#getHREF(org.eclipse.emf.ecore.EObject)
-	 */
-	public String getHREF(EObject obj) {
-		if (discardUnresolvedRef) {
-			// remove unresolved references
-			//
-			if (obj instanceof MultiResourceEObject
-					&& !((MultiResourceEObject) obj).isValid()) {
-				return null;
-			}
-		}
-
-		if (obj instanceof MultiResourceEObject) {
-			InternalEObject o = (InternalEObject) obj;
-
-			URI objectURI = o.eProxyURI();
-			if (objectURI == null) {
-				Resource otherResource = obj.eResource();
-				if (otherResource == null) {
-					objectURI = handleDanglingHREF(obj);
-					if (objectURI == null) {
-						return null;
-					}
-				} else if (resource == otherResource) {
-					return "#" + resource.getURIFragment(obj); //$NON-NLS-1$
-				} else {
-					if (obj instanceof MethodConfiguration) {
-						// Special handling for MethodConfiguration.
-						// See
-						// org.eclipse.epf.persistence.MultiFileResourceSetImpl.loadConfigurations()
-						//
-						EObject lib = obj.eContainer();
-						if (lib != null) {
-							otherResource = lib.eResource();
-						} else {
-							return null;
-						}
-					}
-					if (otherResource != null) {
-						ResourceSet resourceSet = otherResource.getResourceSet();
-						if(resourceSet instanceof MultiFileResourceSetImpl 
-								&& ((MultiFileResourceSetImpl)resourceSet).getResourceManager() == null) {
-							objectURI = MultiFileSaveUtil.getFinalURI(otherResource).appendFragment(getURIFragment(otherResource, obj));
-							return deresolve(objectURI).toString();
-						}
-						ResourceDescriptor resDesc = MultiFileSaveUtil
-								.getResourceDescriptor(otherResource);
-						if (resDesc != null) {
-							objectURI = MultiFileURIConverter.createURI(
-									resDesc.getId()).appendFragment(
-									getURIFragment(otherResource, obj));
-							return objectURI.toString();
-						} else {
-							return null;
-						}
-					}
-				}
-			} else {
-				if (!objectURI.scheme().equals(MultiFileURIConverter.SCHEME)) {
-					String fragment = objectURI.fragment();
-					if (resource instanceof MultiFileXMIResourceImpl
-							&& ((MultiFileXMIResourceImpl) resource)
-									.getEObjectByID(fragment) != null) {
-						return "#" + fragment; //$NON-NLS-1$
-					} else {
-						objectURI = deresolve(objectURI);
-					}
-				}
-				return objectURI.toString();
-			}
-		}
-
-		return super.getHREF(obj);
-	}
-
-	protected static class ProxyReference {
-		private InternalEObject owner;
-
-		private EReference reference;
-
-		private InternalEObject proxy;
-
-		/**
-		 * @param owner
-		 * @param reference
-		 * @param proxy
-		 */
-		public ProxyReference(InternalEObject owner, EReference reference,
-				InternalEObject proxy) {
-			super();
-			this.owner = owner;
-			this.reference = reference;
-			this.proxy = proxy;
-		}
-
-		public InternalEObject getOwner() {
-			return owner;
-		}
-
-		public InternalEObject getProxy() {
-			return proxy;
-		}
-
-		public EReference getReference() {
-			return reference;
-		}
-
-	}
-
-	public void setValue(EObject object, EStructuralFeature feature,
-			Object value, int position) {
-		// TODO: more efficient way to do this replacement
-		// should look at MultiFileXMISaveImpl.MyEscape.convertText()
-		//
-		if (value instanceof String) {
-			String str = (String) value;
-			if (str.indexOf("\n") > 0) { //$NON-NLS-1$
-				value = str.replaceAll("\n", LINE_SEP); //$NON-NLS-1$
-			}
-		}
-		;
-
-		int kind = getFeatureKind(feature);
-
-		try {
-			// TODO: temporary fix to avoid ArrayIndexOutOfBoundsException,
-			// needs revisit
-			//
-			if (kind == IS_MANY_MOVE) {
-				List list = (List) object.eGet(feature);
-				if (position > -1 && list.indexOf(value) == -1) {
-					return;
-				}
-			}
-
-			super.setValue(object, feature, value, position);
-
-			switch (kind) {
-			case IS_MANY_ADD:
-			case IS_MANY_MOVE:
-				InternalEList list = (InternalEList) object.eGet(feature);
-
-				// save same document forward (unidirectional) references to
-				// resolve at the end of document parsing
-				//				
-				if (feature instanceof EReference) {
-					EReference ref = (EReference) feature;
-					if (ref.getEOpposite() != null) {
-						InternalEObject owner = (InternalEObject) object;
-						for (Iterator iter = list.basicIterator(); iter
-								.hasNext();) {
-							InternalEObject element = (InternalEObject) iter
-									.next();
-							if (element.eIsProxy()
-									&& element.eProxyURI().trimFragment()
-											.equals(resourceURI)) {
-								sameDocReferences.add(new ProxyReference(owner,
-										ref, element));
-							}
-						}
-					}
-				}
-
-				break;
-			}
-		} catch (RuntimeException e) {
-			if (logError) {
-				if(MultiFileSaveUtil.DEBUG) {
-					e.printStackTrace();
-				}
-				CommonPlugin.INSTANCE.log(e);
-				String errMsg = new StringBuffer(
-						"MultiFileXMIHelperImpl.setValue(): ERROR") //$NON-NLS-1$
-						.append("\n  object: ").append(object) //$NON-NLS-1$
-						.append("\n  feature: ").append(feature) //$NON-NLS-1$
-						.append("\n  value: ").append(value) //$NON-NLS-1$
-						.append("\n  position: ").append(position) //$NON-NLS-1$
-						.append("\n  kind: ").append(kind) //$NON-NLS-1$
-						.toString();
-				if(MultiFileSaveUtil.DEBUG) {
-					System.err.println(errMsg);
-				}
-				CommonPlugin.INSTANCE.log(errMsg);
-			}
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl#getValue(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public Object getValue(EObject obj, EStructuralFeature f) {
-		Object value = super.getValue(obj, f);
-		
-		// remove any value that does not belong to any resource
-		//
-		if(f instanceof EReference) {
-			if(f.isMany()) {
-				if(f.isChangeable() && value instanceof InternalEList) {
-					InternalEList list = (InternalEList) value;
-					for (Iterator iter = list.iterator(); iter.hasNext();) {
-						EObject o = (EObject) iter.next();
-						if(!o.eIsProxy() && o.eResource() == null) {
-							iter.remove();
-						}
-					}
-				}
-			}
-			else {
-				EObject o = (EObject) value;
-				if(!o.eIsProxy() && o.eResource() == null) {
-					value = null;
-				}
-			}
-		}
-		
-		return value;
-	}
-		
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileXMILoadImpl.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileXMILoadImpl.java
deleted file mode 100755
index 8d81b67..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileXMILoadImpl.java
+++ /dev/null
@@ -1,123 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PushbackInputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.SAXXMIHandler;
-import org.eclipse.emf.ecore.xmi.impl.XMILoadImpl;
-import org.eclipse.epf.common.serviceability.EPFVersions;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * XMLLoad implementation for library XMI persistence
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MultiFileXMILoadImpl extends XMILoadImpl {
-
-	public MultiFileXMILoadImpl(XMLHelper helper) {
-		super(helper);
-	}
-
-	protected DefaultHandler makeDefaultHandler() {
-		return new SAXXMIHandler(resource, helper, options) {
-			  
-			protected EStructuralFeature getFeature(EObject object, String prefix, String name, boolean isElement) {
-				if (EPFVersions.TOOL_ID.equals(prefix)) {
-					return null;
-				}
-				return super.getFeature(object, prefix, name, isElement);
-			}
-			
-			protected void handleUnknownFeature(String prefix, String name, boolean isElement, EObject peekObject, String value) {
-				if (EPFVersions.TOOL_ID.equals(prefix)) {
-					return;
-				}
-				super.handleUnknownFeature(prefix, name, isElement, peekObject, value);
-			}
-			
-			public void endDocument() {
-				super.endDocument();
-
-				if (helper instanceof MultiFileXMIHelperImpl) {
-					List sameDocReferences = ((MultiFileXMIHelperImpl) helper).sameDocReferences;
-					if (!sameDocReferences.isEmpty()) {
-						for (Iterator iter = sameDocReferences.iterator(); iter
-								.hasNext();) {
-							MultiFileXMIHelperImpl.ProxyReference proxyRef = (MultiFileXMIHelperImpl.ProxyReference) iter
-									.next();
-
-							// this will merge the opposite feature maps as well
-							EObject resolved = proxyRef.getOwner()
-									.eResolveProxy(proxyRef.getProxy());
-
-							InternalEList values = (InternalEList) proxyRef
-									.getOwner().eGet(proxyRef.getReference());
-							int index = values.basicList().indexOf(
-									proxyRef.getProxy());
-							if (index != -1) {
-								values.setUnique(index, resolved);
-							}
-						}
-					}
-				}
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLLoadImpl#load(org.eclipse.emf.ecore.xmi.XMLResource,
-	 *      java.io.InputStream, java.util.Map)
-	 */
-	public void load(XMLResource resource, InputStream inputStream, Map options)
-			throws IOException {
-		try {
-			// strip off the UTF-8 BOM bytes if they are still there
-			//
-			PushbackInputStream pbis = new PushbackInputStream(inputStream, 3);
-			byte bom[] = new byte[3];
-			if (pbis.read(bom) == 3) {
-				if (bom[0] != (byte) 0xEF || bom[1] != (byte) 0xBB
-						|| bom[2] != (byte) 0xBF) {
-					pbis.unread(bom);
-				}
-			}
-
-			super.load(resource, pbis, options);
-		} catch (Resource.IOWrappedException e) {
-			if (!resource.getErrors().isEmpty() && helper == null) {
-				// unknown features detected, log the warning and ignore them
-				for (Iterator iter = resource.getErrors().iterator(); iter
-						.hasNext();) {
-					Exception ex = (Exception) iter.next();
-					CommonPlugin.INSTANCE.log(ex.getMessage());
-				}
-				return;
-			}
-			throw e;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileXMIResourceImpl.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileXMIResourceImpl.java
deleted file mode 100755
index 58e1499..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileXMIResourceImpl.java
+++ /dev/null
@@ -1,1136 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.AbstractTreeIterator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentsEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLLoad;
-import org.eclipse.emf.ecore.xmi.XMLSave;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.library.persistence.ILibraryResource;
-import org.eclipse.epf.library.persistence.internal.IFailSafeSavable;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-import org.eclipse.epf.persistence.util.PersistenceResources;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.resourcemanager.ResourceDescriptor;
-import org.eclipse.epf.resourcemanager.ResourceManager;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-import org.eclipse.epf.uma.ecore.util.OppositeFeatureNotification;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Resource implementation for library XMI persistence
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MultiFileXMIResourceImpl extends XMIResourceImpl 
-implements ILibraryResource, IFailSafeSavable
-{
-
-	private static String tempDir;
-
-	private URI finalURI;
-
-	private URI oldURI;
-
-	private String backupFile;
-
-	private String currentTxID;
-
-	private long lastLoadTimeStamp;
-
-	private ResourceDescriptor resourceDescriptor;
-
-	private boolean isUnloading;
-
-	private long fileLastModified;
-
-	public MultiFileXMIResourceImpl(URI uri) {
-		super(uri);
-		setIntrinsicIDToEObjectMap(new HashMap());
-	}
-
-	protected XMLLoad createXMLLoad() {
-		return new MultiFileXMILoadImpl(createXMLHelper());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#createXMLSave()
-	 */
-	protected XMLSave createXMLSave() {
-		return new MultiFileXMISaveImpl(createXMLHelper());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl#createXMLHelper()
-	 */
-	protected XMLHelper createXMLHelper() {
-		return new MultiFileXMIHelperImpl(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.XMLResource#getID(org.eclipse.emf.ecore.EObject)
-	 */
-	public String getID(EObject eObject) {
-		String id = MultiFileSaveUtil.getGuid(eObject);
-		if (id != null)
-			return id;
-		return super.getID(eObject);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#setID(org.eclipse.emf.ecore.EObject,
-	 *      java.lang.String)
-	 */
-	public void setID(EObject eObject, String id) {
-		Object oldID = id != null ? getEObjectToIDMap().put(eObject, id)
-				: getEObjectToIDMap().remove(eObject);
-
-		Map guidToMethodElementMap = ((MultiFileResourceSetImpl) getResourceSet())
-				.getGuidToMethodElementMap();
-
-		if (oldID != null) {
-			getIDToEObjectMap().remove(oldID);
-			
-			if (eObject instanceof MethodElement) {
-				// remove object from guidToMethodElementMap only if it is a proxy
-				//
-				if(eObject.eIsProxy()) {
-					EObject obj = (EObject) guidToMethodElementMap.get(id);
-					if(obj != null && obj.eIsProxy()) {
-						guidToMethodElementMap.remove(id);
-					}
-				}
-				else {
-					guidToMethodElementMap.remove(id);
-				}
-			}
-		}
-
-		if (id != null) {
-			getIDToEObjectMap().put(id, eObject);
-			if (eObject instanceof MethodElement) {
-				guidToMethodElementMap.put(id, eObject);
-
-				MethodElement e = (MethodElement) eObject;
-				if (!e.getGuid().equals(id)) {
-					e.setGuid(id);
-				}
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#useUUIDs()
-	 */
-	protected boolean useUUIDs() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.Resource#getURIFragment(org.eclipse.emf.ecore.EObject)
-	 */
-	public String getURIFragment(EObject eObject) {
-		try {
-			String id = getID(eObject);
-
-			if (id != null) {
-				return id;
-			} else {
-				List uriFragmentPath = new ArrayList();
-				for (EObject container = eObject.eContainer(); container != null
-						&& container.eResource() == this; container = eObject
-						.eContainer()) {
-					uriFragmentPath.add(((InternalEObject) container)
-							.eURIFragmentSegment(eObject.eContainingFeature(),
-									eObject));
-					eObject = container;
-				}
-
-				StringBuffer result = new StringBuffer("/"); //$NON-NLS-1$
-				result.append(getURIFragmentRootSegment(eObject));
-
-				for (ListIterator i = uriFragmentPath
-						.listIterator(uriFragmentPath.size()); i.hasPrevious();) {
-					result.append('/');
-					result.append((String) i.previous());
-				}
-				return result.toString();
-			}
-		} catch (RuntimeException e) {
-			System.err.println("Error getting URI fragment for " + eObject); //$NON-NLS-1$
-			throw e;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#attachedHelper(org.eclipse.emf.ecore.EObject)
-	 */
-	protected void attachedHelper(EObject eObject) {
-		super.attachedHelper(eObject);
-
-		if (useIDs()) {
-			String id = getID(eObject);
-			if (id != null) {
-				// update the eObjectToIDMap
-				//
-				getEObjectToIDMap().put(eObject, id);
-				
-				if (eObject instanceof MethodElement) {
-					((MultiFileResourceSetImpl) getResourceSet())
-							.getGuidToMethodElementMap().put(id, eObject);
-				}
-			}
-		}
-
-		if (isTrackingModification() && eObject.eResource() != this) {
-			// remove the modification tracking adapter from the eObject
-			//
-			eObject.eAdapters().remove(modificationTrackingAdapter);
-		}
-	}
-
-	private void attachedAllWithIDs(EObject eObj) {
-		// attachedHelper(eObj);
-		// List list = eObj.eContents();
-		// int size = list.size();
-		// for (int i = 0; i < size; i++) {
-		// EObject o = (EObject) list.get(i);
-		// if (o.eResource() == this) {
-		// attachedAllWithIDs(o);
-		// }
-		// }
-
-		Iterator allContents = new ContentTreeIterator(eObj);
-
-		while (allContents.hasNext()) {
-			attachedHelper((EObject) allContents.next());
-		}
-	}
-
-	private void basicAttachedAll(EObject eObj) {
-		eObj.eAdapters().add(modificationTrackingAdapter);
-		List list = eObj.eContents();
-		int size = list.size();
-		for (int i = 0; i < size; i++) {
-			EObject o = (EObject) list.get(i);
-			if (o.eResource() == this) {
-				basicAttachedAll(o);
-			}
-		}
-	}
-
-	/**
-	 * Calls on an object and all of its offstring objects that are in the same
-	 * resource as the object when the object is attached to this resource. This
-	 * method is expensive, so use it with caution.
-	 * 
-	 * @param eObj
-	 */
-	public void attachedAll(EObject eObj) {
-		if (useIDs()) {
-			attachedAllWithIDs(eObj);
-		} else {
-			basicAttachedAll(eObj);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.Resource.Internal#attached(org.eclipse.emf.ecore.EObject)
-	 */
-	public void attached(EObject eObject) {
-		attachedAll(eObject);
-	}
-
-	private void detachedAllWithIDs(EObject eObj) {
-		Iterator allContents = new ContentTreeIterator(eObj);
-
-		while (allContents.hasNext()) {
-			detachedHelper((EObject) allContents.next());
-		}
-	}
-
-	private void basicDetachedAll(EObject eObj) {
-		eObj.eAdapters().remove(modificationTrackingAdapter);
-		List list = eObj.eContents();
-		int size = list.size();
-		for (int i = 0; i < size; i++) {
-			EObject o = (EObject) list.get(i);
-			if (o.eResource() == this) {
-				basicDetachedAll(o);
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#getEObjectByID(java.lang.String)
-	 */
-	protected EObject getEObjectByID(String id) {
-		for (Iterator iter = getContents().iterator(); iter.hasNext();) {
-			EObject element = (EObject) iter.next();
-			String guid = MultiFileSaveUtil.getGuid(element);
-			if (guid != null && guid.equals(id))
-				return element;
-		}
-
-		// return super.getEObjectByID(id);
-
-		if (idToEObjectMap != null) {
-			InternalEObject eObject = (InternalEObject) idToEObjectMap.get(id);
-			if (eObject != null && !eObject.eIsProxy()) {
-				return eObject;
-			}
-		}
-
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceImpl#load(java.util.Map)
-	 */
-	public void load(Map options) throws IOException {
-		if (isUnloading) {
-			return;
-		}
-		super.load(options);
-		updateTimeStamps();
-		if (MultiFileSaveUtil.DEBUG) {
-			if (getURI().toString().equals(testResourceURIStr)) {
-				testResourceLoaded = true;
-			}
-		}
-	}
-
-	private static boolean testResourceLoaded;
-
-	private static final String testResourceURIStr = "file:/C:/temp/newlib/library.xmi"; //$NON-NLS-1$
-
-	/**
-	 * @return the fileLastModified
-	 */
-	public long getFileLastModified() {
-		return fileLastModified;
-	}
-
-	/**
-	 * Reloads this resource. Old objects will become proxies and they will be
-	 * added to the specified collection <code>proxies</code>
-	 * 
-	 * @param proxies
-	 */
-	synchronized boolean reload(Collection proxies) throws IOException {
-		if (isLoaded) {
-			Notification notification = setLoaded(false);
-			doUnload(proxies, false);
-			// doUnload() might have set this resource loaded again
-			// set isLoaded to false and contents to null to make sure
-			//
-			isLoaded = false;
-			contents = null;
-			if (notification != null) {
-				eNotify(notification);
-			}
-			load(getResourceSet().getLoadOptions());
-			return true;
-		}
-		return false;
-	}
-
-	/*
-	 * Javadoc copied from interface.
-	 */
-	public final void unloadWithoutRemove() {
-		if (isLoaded) {
-			// save the ResourceDescriptor pf this resource for later use to
-			// create URI for the proxies after unload
-			//
-			ResourceDescriptor resDesc = MultiFileSaveUtil
-					.getResourceDescriptor(this);
-			if (resDesc != null) {
-				setResourceDescriptor(resDesc);
-			}
-
-			Notification notification = setLoaded(false);
-			doUnload(null, false);
-			if (notification != null) {
-				eNotify(notification);
-			}
-		}
-	}
-
-	/**
-	 * Does all the work of unloading the resource. It calls
-	 * {@link #unloaded unloaded} for each object it the content
-	 * {@link #getAllContents tree}, and clears the
-	 * {@link #getContents contents}, {@link #getErrors errors}, and
-	 * {@link #getWarnings warnings}.
-	 */
-	protected void doUnload() {
-		doUnload(null, true);
-	}
-
-	/**
-	 * @author Phong Nguyen Le - Jul 17, 2006
-	 * @since 1.0
-	 */
-	private final class ContentTreeIterator extends AbstractTreeIterator {
-		/**
-		 * Comment for <code>serialVersionUID</code>
-		 */
-		private static final long serialVersionUID = 1L;
-
-		/**
-		 * @param object
-		 */
-		private ContentTreeIterator(Object object) {
-			super(object);
-		}
-
-		protected Iterator getChildren(Object object) {
-			if (object instanceof EObject) {
-				ArrayList children = new ArrayList();
-				EContentsEList contents = new EContentsEList((EObject) object) {
-					/*
-					 * (non-Javadoc)
-					 * 
-					 * @see org.eclipse.emf.ecore.util.EContentsEList#resolve()
-					 */
-					protected boolean resolve() {
-						return false;
-					}
-				};
-				for (Iterator iter = contents.basicIterator(); iter.hasNext();) {
-					EObject o = (EObject) iter.next();
-					if (o.eResource() == MultiFileXMIResourceImpl.this
-							|| o.eIsProxy()) {
-						children.add(o);
-					}
-				}
-				return children.iterator();
-			}
-			return Collections.EMPTY_LIST.iterator();
-		}
-	}
-
-	/**
-	 * Unloads this resource. Old objects will be come proxies and will be added
-	 * to the specified collection <code>proxies</code>
-	 * 
-	 * @param proxies
-	 * @param remove
-	 *            if <code>true</code> will remove all the unloaded objects in
-	 *            the resource from their containers.
-	 */
-	protected void doUnload(Collection proxies, boolean remove) {
-		isUnloading = true;
-
-		try {
-			// from ResourceImpl
-			//
-
-			Iterator allContents = getAllProperContents(new ArrayList(
-					getContents()));
-
-			// This guard is needed to ensure that clear doesn't make the
-			// resource
-			// become loaded.
-			//
-			if (!getContents().isEmpty()) {
-				if (remove) {
-					getContents().clear();
-				} else {
-					// don't call getContents().clear() to keep the references
-					// to elements
-					// that just became proxies after unload
-					//
-					contents = null;
-				}
-
-				// Map objToContainerMap = null;
-				// Map containerToDeliverMap = null;
-				// if(!remove) {
-				// objToContainerMap = MultiFileSaveUtil.getContainers(this);
-				// if(!objToContainerMap.isEmpty()) {
-				// // save the current deliver flag of all containers of content
-				// objects
-				// // and disable notification on those container so
-				// getContent().clear() will
-				// // not dispatch notification that might update UI. And we
-				// don't want to update
-				// // UI at this stage
-				// //
-				// containerToDeliverMap = new HashMap();
-				// for (Iterator iter = objToContainerMap.values().iterator();
-				// iter.hasNext();) {
-				// EObject container = (EObject) iter.next();
-				// containerToDeliverMap.put(container, new
-				// Boolean(container.eDeliver()));
-				// container.eSetDeliver(false);
-				// }
-				// }
-				// }
-				// getContents().clear();
-				// if(!remove && containerToDeliverMap != null) {
-				// // restore the container of contents objects
-				// //
-				// for (Iterator iter = objToContainerMap.entrySet().iterator();
-				// iter.hasNext();) {
-				// Map.Entry entry = (Map.Entry) iter.next();
-				// MultiResourceEObject obj =
-				// ((MultiResourceEObject)entry.getKey());
-				// InternalEObject container = (InternalEObject)
-				// entry.getValue();
-				// obj.eBasicSetContainer(container, obj.eContainerFeatureID());
-				// }
-
-				// // restore the deliver flag of contents objects;
-				// //
-				// for (Iterator iter =
-				// containerToDeliverMap.entrySet().iterator(); iter.hasNext();)
-				// {
-				// Map.Entry entry = (Map.Entry) iter.next();
-				// EObject container = (EObject) entry.getKey();
-				// boolean deliver = ((Boolean)entry.getValue()).booleanValue();
-				// container.eSetDeliver(deliver);
-				// }
-				// }
-			}
-			getErrors().clear();
-			getWarnings().clear();
-
-			ArrayList unloadedObjects = new ArrayList();
-			try {
-				while (allContents.hasNext()) {
-					try {
-						InternalEObject o = (InternalEObject) allContents
-								.next();
-						unloaded(o);
-						unloadedObjects.add(o);
-					} catch (Exception e) {
-						CommonPlugin.INSTANCE.log(e);
-					}
-				}
-			} catch (Exception e) {
-				CommonPlugin.INSTANCE.log(e);
-			}
-			if (proxies != null && !unloadedObjects.isEmpty()) {
-				proxies.addAll(unloadedObjects);
-			}
-			if (remove) {
-				// remove the unloaded objects from its container to prevent the
-				// whole library from staying
-				// in memory if only one of its element is leaked
-				// 
-				for (Iterator iter = unloadedObjects.iterator(); iter.hasNext();) {
-					EObject object = (EObject) iter.next();
-					EcoreUtil.remove(object);
-				}
-			}
-
-			// from XMLResourceIml
-			//		
-
-			if (idToEObjectMap != null) {
-				for (Iterator iter = idToEObjectMap.keySet().iterator(); iter
-						.hasNext();) {
-					((MultiFileResourceSetImpl) getResourceSet())
-							.getGuidToMethodElementMap().remove(iter.next());
-				}
-				idToEObjectMap.clear();
-			}
-
-			if (eObjectToIDMap != null) {
-				eObjectToIDMap.clear();
-			}
-
-			if (eObjectToExtensionMap != null) {
-				eObjectToExtensionMap.clear();
-			}
-
-			if (intrinsicIDToEObjectMap != null) {
-				intrinsicIDToEObjectMap.clear();
-			}
-		} finally {
-			isUnloading = false;
-		}
-	}
-
-	protected void unloaded(InternalEObject internalEObject) {
-		String guid = MultiFileSaveUtil.getGuid(internalEObject);
-		if (guid != null) {
-			URI uri = resourceDescriptor != null ? MultiFileURIConverter
-					.createURI(resourceDescriptor.getId()) : getURI();
-			internalEObject.eSetProxyURI(uri.appendFragment(guid));
-		}
-		internalEObject.eAdapters().clear();
-
-		if (internalEObject instanceof MultiResourceEObject) {
-			MultiResourceEObject multiResourceEObject = ((MultiResourceEObject) internalEObject);
-
-			// clear own opposite feature map
-			//			
-			Map oppositeFeatureMap = multiResourceEObject
-					.basicGetOppositeFeatureMap();
-			if (oppositeFeatureMap != null) {
-				oppositeFeatureMap.clear();
-			}
-
-			// remove itself from all opposite features
-			// 
-			multiResourceEObject.removeFromAllOppositeFeatures();
-		}
-	}
-
-	public void detachedAll(EObject eObj) {
-		if (useIDs()) {
-			detachedAllWithIDs(eObj);
-		} else {
-			basicDetachedAll(eObj);
-		}
-	}		
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.Resource.Internal#detached(org.eclipse.emf.ecore.EObject)
-	 */
-	public void detached(EObject eObject) {
-		detachedAll(eObject);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceImpl#createModificationTrackingAdapter()
-	 */
-	protected Adapter createModificationTrackingAdapter() {
-		return new ModificationTrackingAdapter() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.emf.ecore.resource.impl.ResourceImpl.ModificationTrackingAdapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
-			 */
-			public void notifyChanged(Notification notification) {
-				// don't handle OppositeFeatureNotification b/c it does not
-				// really modify this resource
-				//
-				if (notification instanceof OppositeFeatureNotification) {
-					return;
-				}
-				super.notifyChanged(notification);
-			}
-		};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceImpl#setModified(boolean)
-	 */
-	public void setModified(boolean isModified) {
-		// boolean wasModified = isModified();
-		super.setModified(isModified);
-		// if(MultiFileSaveUtil.getMethodElement(this) instanceof
-		// ProcessComponent) {
-		// System.out.println("MultiFileXMIResourceImpl.setModified(): " +
-		// this);
-		// }
-		// this code is needed to set dirty flag to the item provider's label
-		//
-		// if(wasModified != isModified && !getContents().isEmpty()) {
-		// // refresh the label of the resource's object
-		// //
-		// EObject obj = (EObject) getContents().get(0);
-		// for (Iterator iter = obj.eAdapters().iterator(); iter.hasNext();) {
-		// Object adapter = iter.next();
-		// if(adapter instanceof ItemProviderAdapter) {
-		// ((ItemProviderAdapter)adapter).fireNotifyChanged(new
-		// ViewerNotification(new NotificationImpl(Notification.SET, obj, obj),
-		// obj, false, true));
-		// }
-		// }
-		// }
-
-		if (MultiFileSaveUtil.DEBUG) {
-			if (testResourceLoaded
-					&& getURI().toString().equals(testResourceURIStr)) {
-				System.out.println("isModified=" + isModified); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.notify.impl.NotifierImpl#eDeliver()
-	 */
-	public boolean eDeliver() {
-		ResourceSet resourceSet = getResourceSet();
-		if (resourceSet != null && !resourceSet.eDeliver())
-			return false;
-
-		return super.eDeliver();
-	}
-
-	public void save(Map options) throws IOException {
-		if (options == null) {
-			options = MultiFileResourceSetImpl.DEFAULT_SAVE_OPTIONS;
-		}
-		
-		super.save(options);
-
-		// Special handling for saving MethodLibrary to remove all references to
-		// MethodConfigurations from library file.
-		//
-		MethodElement e = PersistenceUtil.getMethodElement(this);
-		if (e instanceof MethodLibrary) {
-			MethodLibrary lib = (MethodLibrary) e;
-			// remove ResourceDescriptors of configuration files
-			//
-			ResourceManager resMgr = MultiFileSaveUtil.getResourceManager(this);
-			if (resMgr != null) {
-				for (Iterator iter = lib.getPredefinedConfigurations()
-						.iterator(); iter.hasNext();) {
-					MethodConfiguration config = (MethodConfiguration) iter
-							.next();
-					ResourceDescriptor resDesc = resMgr
-							.getResourceDescriptor(config.getGuid());
-					if (resDesc != null) {
-						EcoreUtil.remove(resDesc);
-					}
-				}
-			}
-			List configs = new ArrayList(lib.getPredefinedConfigurations());
-			boolean oldDeliver = lib.eDeliver();
-			try {
-				lib.eSetDeliver(false);
-				lib.getPredefinedConfigurations().clear();
-				
-				// Save library file again to remove all references to configurations.
-				// The previous save is still needed to save new configuration in its own file
-				//
-				super.save(options);
-			} finally {
-				lib.getPredefinedConfigurations().addAll(configs);
-				lib.eSetDeliver(oldDeliver);
-			}
-		}
-	}
-
-	public URI getFinalURI() {
-		if (finalURI != null) {
-			return finalURI;
-		}
-		return getURI();
-	}
-
-	public void setFinalURI(URI uri) {
-		finalURI = uri;
-	}
-
-	public void backUpURI() {
-		oldURI = getURI();
-	}
-
-	public boolean hasTempURI() {
-		if (currentTxID != null) {
-			return createTempURI().equals(getURI());
-		}
-		return false;
-	}
-
-	private URI createTempURI() {
-		MethodElement e = PersistenceUtil.getMethodElement(this);
-		return URI.createFileURI(new StringBuffer(getTempDir()).append(
-				File.separator).append(currentTxID)
-				.append("new").append(e.getGuid()).toString()); //$NON-NLS-1$
-	}
-
-	static String getTempDir() {
-		if (tempDir == null) {
-			tempDir = new File(FileManager.getTempDir(), "EPF").getAbsolutePath(); //$NON-NLS-1$
-		}
-		return tempDir;
-	}
-
-	/**
-	 * Sets the temporary URI to save this resource to and it will be renamed to
-	 * the original URI when saving is done
-	 */
-	public void setTempURI(String txID) {
-		if (finalURI == null) {
-			finalURI = oldURI = getURI();
-			currentTxID = txID;
-
-			URI tempURI = createTempURI();
-			setURI(tempURI);
-
-			MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) getResourceSet();
-			resourceSet.getURIToTempURIMap().put(oldURI, tempURI);
-		}
-	}
-
-	/**
-	 * Restores the resource URI to the original one. This method must be call
-	 * after saving regarless of its success.
-	 * 
-	 */
-	private void restoreURI() {
-		if (oldURI != null) {
-			setURI(oldURI);
-		}
-	}
-
-	public boolean txStarted() {
-		return moveStarted() || saveStarted();
-	}
-
-	protected void updateTimeStamps() {
-		lastLoadTimeStamp = System.currentTimeMillis();
-		fileLastModified = new File(getURI().toFileString()).lastModified();
-	}
-	
-	/**
-	 * Checks if this resource is currently synchronized with its data store
-	 * 
-	 * @return <li> -1 don't know
-	 *         <li> 0 no
-	 *         <li> 1 yes
-	 */
-	public int checkSynchronized() {
-		long currentTime = new File(getURI().toFileString()).lastModified();
-		if(MultiFileSaveUtil.same(currentTime, fileLastModified)) {
-			// some team providers changed the timestamp of last file modification by removing second fraction
-			// even the file was not changed
-			//
-			return 1;
-		}
-		return -1;
-	}
-
-	public void txFinished(boolean successful) {
-		boolean wasMove = !oldURI.equals(finalURI);
-		if (successful) {
-			setURI(finalURI);
-			setModified(false);
-			updateTimeStamps();
-			FileManager.getInstance().refresh(this);
-			if(!wasMove) {
-				MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) getResourceSet();
-				if(resourceSet != null) {
-					resourceSet.getUnresolvedProxyMarkerManager().validateMarkers(this);
-				}
-			}
-		} else {
-			restoreURI();
-			if (wasMove) {
-				// restore uri of ResourceDescriptor of this resource
-				//
-				MultiFileSaveUtil.updateURIMappings(this, oldURI, null, true);
-			}
-		}
-		if (oldURI != null) {
-			MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) getResourceSet();
-			if (resourceSet != null) {
-				resourceSet.getURIToTempURIMap().remove(oldURI);
-			}
-			oldURI = null;
-		}
-		currentTxID = null;
-		finalURI = null;
-	}
-
-	public void deleteBackup() {
-		if (backupFile != null) {
-			try {
-				// FileManager.getInstance().delete(backupFile);
-				new File(backupFile).delete();
-				backupFile = null;
-			} catch (Throwable e) {
-				CommonPlugin.INSTANCE.log(e);
-				if (MultiFileSaveUtil.DEBUG) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-
-	public boolean restore() {
-		File src = null, dest = null;
-		boolean moved = false;
-		if (backupFile != null) {
-			src = new File(backupFile);
-			dest = new File(getFinalURI().toFileString());
-		} else {
-			moved = oldURI != null && !oldURI.equals(finalURI);
-			if (moved) {
-				File file = new File(getFinalURI().toFileString());
-				dest = new File(oldURI.toFileString());
-				moved = file.exists() && !dest.exists();
-				if (moved) {
-					src = file;
-				}
-			}
-		}
-		if (src != null) {
-			if (dest.exists()) {
-				FileUtil.moveFile(dest,new File(getURI().toFileString()));
-			}
-			boolean success;
-			if (moved) {
-				success = MultiFileSaveUtil.move(this, src, dest);
-				// if(success) {
-				// MultiFileSaveUtil.updateURIMappings(this, null);
-				// }
-			} else {
-				success = FileUtil.moveFile(src,dest);
-			}
-			if (!success) {
-				throw new MultiFileIOException(NLS.bind(
-						PersistenceResources.restoreResourceError_msg, this));
-			}
-			return true;
-		}
-		return false;
-	}
-
-	URI getOldURI() {
-		return oldURI;
-	}
-
-	boolean moveStarted() {
-		return oldURI != null && !oldURI.equals(getFinalURI());
-	}
-
-	boolean saveStarted() {
-		return currentTxID != null;
-	}
-
-	public void commit() {
-		if (finalURI != null && !getContents().isEmpty()) {
-			File finalFile = new File(finalURI.toFileString());
-			boolean wasMove = !oldURI.equals(finalURI);
-			if (wasMove) {
-				Object e = PersistenceUtil.getMethodElement(this);
-				if (e instanceof ContentDescription) {
-					if (finalFile.exists()) {
-						// name for finalFile is already taken
-						// try to get the next available name
-						//
-						finalURI = URI.createFileURI(MethodLibraryPersister
-								.getNextAvailableFileName(finalFile.getParent()
-										+ File.separator,
-										(ContentDescription) e));
-						finalFile = new File(finalURI.toFileString());
-					}
-				}
-			} else {
-				// back up the file
-				//
-				String backup = getBackupFilePath();
-				File bakFile = new File(backup);
-
-				// trying to delete the old backup file if it exists
-				//
-				if (bakFile.exists()) {
-					bakFile.delete();
-				}
-
-				if (finalFile.exists()) {
-					// some CM provider like ClearCase renamed the versioned
-					// file it its repository as soon as user renamed the file
-					// in the workspace. To avoid this, use only regular rename
-					// routine of java.io.File instead of IResource routine
-					//
-					if (FileUtil.moveFile(finalFile, bakFile)) {
-						backupFile = backup;
-					} else {
-						String msg = NLS.bind(
-								PersistenceResources.renameError_msg,
-								finalFile, backup);
-						throw new MultiFileIOException(msg);
-					}
-				}
-			}
-
-			// rename the resource file to the original name
-			//
-			File currentFile = new File(wasMove ? oldURI.toFileString()
-					: getURI().toFileString());
-			boolean success = false;
-			if (wasMove) {
-				success = MultiFileSaveUtil.move(this, currentFile, finalFile);
-			} else {
-				// some CM provider like ClearCase renamed the versioned file it
-				// its repository as soon as user renamed the file
-				// in the workspace. To avoid this, use only regular rename
-				// routine of java.io.File instead of IResource routine
-				//
-				success = FileUtil.moveFile(currentFile, finalFile);
-			}
-			if (!success) {
-				String msg = NLS.bind(PersistenceResources.renameError_msg,
-						currentFile, finalFile);
-				throw new MultiFileIOException(msg);
-			} else {
-				if (wasMove) {
-					// refresh resolve URI of ResourceDescriptor of this
-					// resource
-					//
-					ResourceDescriptor resDesc = MultiFileSaveUtil
-							.getResourceDescriptor(this);
-					if (resDesc != null) {
-						resDesc.clearResolvedURI();
-					} else {
-						String msg = "FATAL ERROR: no ResourceDescriptor found in parent resource for " + this; //$NON-NLS-1$
-						CommonPlugin.INSTANCE.log(msg);
-						System.err.println(msg);
-					}
-
-					// refresh resolve URIs in ResourceDescriptors of the child
-					// resources of this resource
-					//
-					HashMap oldURIToResourceDescriptorMap = null;
-					ResourceManager resMgr = MultiFileSaveUtil
-							.getResourceManager(this);
-					if (resMgr != null) {
-						oldURIToResourceDescriptorMap = new HashMap();
-						for (Iterator iter = resMgr.eAllContents(); iter
-								.hasNext();) {
-							Object obj = iter.next();
-							if (obj instanceof ResourceDescriptor) {
-								ResourceDescriptor desc = ((ResourceDescriptor) obj);
-								oldURIToResourceDescriptorMap.put(desc
-										.getResolvedURI(), desc);
-								desc.clearResolvedURI();
-							}
-						}
-					}
-
-					// refresh URI of loaded child resources of this resource
-					//
-					if (oldURIToResourceDescriptorMap != null) {
-						// go thru the list of loaded resources in resource set
-						// to update the URI
-						//
-						for (Iterator iter = getResourceSet().getResources()
-								.iterator(); iter.hasNext();) {
-							Resource res = (Resource) iter.next();
-							ResourceDescriptor desc = (ResourceDescriptor) oldURIToResourceDescriptorMap
-									.get(res.getURI());
-							if (desc != null) {
-								res.setURI(desc.getResolvedURI());
-							}
-						}
-					}
-				}
-
-				RefreshJob.getInstance().resourceSaved(this);
-			}
-		}
-	}
-
-	public String getBackupFilePath() {
-		String backupFile = new StringBuffer(getTempDir())
-				.append(File.separator)
-				.append(currentTxID)
-				.append("old").append(PersistenceUtil.getMethodElement(this).getGuid()).toString(); //$NON-NLS-1$
-		return backupFile;
-	}
-
-	/**
-	 * @return the lastLoadTimeStamp
-	 */
-	public long getLastLoadTimeStamp() {
-		return lastLoadTimeStamp;
-	}
-
-	static void clearDetachedEObjectToIDMap() {
-		DETACHED_EOBJECT_TO_ID_MAP.clear();
-	}
-
-	/**
-	 * @param resDesc
-	 */
-	void setResourceDescriptor(ResourceDescriptor resDesc) {
-		resourceDescriptor = resDesc;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.persistence.ILibraryResource#getLoadStamp()
-	 */
-	public long getLoadStamp() {
-		return getLastLoadTimeStamp();
-	}
-
-	public URI getProxyURI(EObject object) {
-		String guid = MultiFileSaveUtil.getGuid(object);
-		if (guid != null) {
-			ResourceDescriptor resourceDescriptor = this.resourceDescriptor != null ? this.resourceDescriptor :
-					MultiFileSaveUtil.getResourceDescriptor(this);
-			URI uri = resourceDescriptor != null ? MultiFileURIConverter
-					.createURI(resourceDescriptor.getId()) : getURI();
-			return uri.appendFragment(guid);
-		}
-		return getURI().appendFragment(getID(object));
-	}
-
-	public void setTxID(String txID) {
-		setTempURI(txID);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileXMISaveImpl.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileXMISaveImpl.java
deleted file mode 100755
index b9d8ab4..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileXMISaveImpl.java
+++ /dev/null
@@ -1,445 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMISaveImpl;
-import org.eclipse.epf.common.serviceability.EPFVersions;
-import org.eclipse.epf.common.serviceability.VersionUtil;
-import org.eclipse.epf.resourcemanager.ResourceManager;
-import org.eclipse.epf.uma.MethodElement;
-
-/**
- * XMLSave implementation for library XMI persistence
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MultiFileXMISaveImpl extends XMISaveImpl {
-
-	public static final String SAVE_SEPARATELY_CLASS_SET = "SAVE_SEPARATELY_CLASS_SET"; //$NON-NLS-1$
-
-	/**
-	 * Save options to force saving all resources in the resource set, whether
-	 * they have been modified or unchanged. Its value must be a string "true"
-	 * or "false"
-	 */
-	public static final String SAVE_ALL = "SAVE_ALL"; //$NON-NLS-1$
-
-	/**
-	 * Save option to save objects of the save type together in the same file if
-	 * MultiFileUtil.createFileURI() returns the same URI for them.
-	 */
-	public static final String SAVE_TOGETHER_CLASS_SET = "SAVE_TOGETHER_CLASS_SET"; //$NON-NLS-1$
-
-	public static final String BACK_UP_BEFORE_SAVE = "BACK_UP_BEFORE_SAVE"; //$NON-NLS-1$
-
-	public static final String DISCARD_UNRESOLVED_REFERENCES = "DISCARD_UNRESOLVED_REFERENCES"; //$NON-NLS-1$
-
-	static final String MODIFIED_RESOURCE_SET = "MODIFIED_RESOURCE_SET"; //$NON-NLS-1$
-
-	/**
-	 * Save option to specify a TxRecord to log the transactional data for
-	 * fail-safe persistence
-	 * 
-	 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister.FailSafeMethodLibraryPersister
-	 * @see TxRecord
-	 */
-	static final String TX_RECORD = "TX_RECORD"; //$NON-NLS-1$
-
-	public static final String MULTI_FILE = "MULTI_FILE"; //$NON-NLS-1$
-
-	/**
-	 * Save option to refresh the workspace when new resource is created and
-	 * saved. Its value must be a string "true" or "false"
-	 */
-	public static final String REFRESH_NEW_RESOURCE = "REFRESH_NEW_RESOURCE"; //$NON-NLS-1$
-
-	/**
-	 * Save option to check the resource for modifiable before saving it. Its
-	 * value must be a string "true" or "false"
-	 */
-	public static final String CHECK_MODIFY = "CHECK_MODIFY"; //$NON-NLS-1$
-
-	// private Resource resource;
-	private Set saveSeparatelyClassSet;
-
-	private Map options;
-
-	/**
-	 * @param helper
-	 */
-	public MultiFileXMISaveImpl(XMLHelper helper) {
-		super(helper);
-	}
-
-	XMLHelper getXMLHelper() {
-		return helper;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLSaveImpl#init(org.eclipse.emf.ecore.xmi.XMLResource,
-	 *      java.util.Map)
-	 */
-	protected void init(XMLResource resource, Map opts) {
-		super.init(resource, opts);
-
-		if (escape != null) {
-			// use MyEscape to ignore whitespaces
-			//
-			escape = new MyEscape();
-		}
-
-		saveSeparatelyClassSet = (Set) opts.get(SAVE_SEPARATELY_CLASS_SET);
-		options = opts;
-
-		ResourceSet resourceSet = resource.getResourceSet();
-		if (resourceSet == null) {
-			resourceSet = new MultiFileResourceSetImpl();
-			resourceSet.getResources().add(resource);
-		}
-	}
-
-	boolean canSaveSeparately(Object obj) {
-		return MultiFileSaveUtil.hasOwnResource(obj, saveSeparatelyClassSet);
-	}
-
-	private String getUmaHREF(Resource resource, InternalEObject o) {
-		if (o.eIsProxy()
-				&& o.eProxyURI().scheme().equals(MultiFileURIConverter.SCHEME)) {
-			return o.eProxyURI().toString();
-		}
-		String href = null;
-		if (o instanceof MethodElement) {
-			href = helper.getHREF(o);
-		}
-		if (href == null) {
-			PersistencePlugin.getDefault().getLogger().logError("Could not find resource descriptor for resource " + resource + "\n  object: " + o); //$NON-NLS-1$ //$NON-NLS-2$
-			return MultiFileSaveUtil.getHREF(resource, o);
-		}
-		return href;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLSaveImpl#saveHref(org.eclipse.emf.ecore.EObject,
-	 *      org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	protected void saveHref(EObject remote, EStructuralFeature f) {
-		if (f instanceof EReference && ((EReference) f).isContainment()
-				&& !toDOM) {
-			// if this HREF is a contained element, save its ID attribute so the
-			// proxy can be cached in the
-			// GUIDToElementMap for temporary use before it can be resolved.
-			// This helps improve loading time.
-			//
-			String href = helper.getHREF(remote);
-			if (href != null) {
-				if (escapeURI != null) {
-					href = escapeURI.convert(href);
-				}
-				String name = helper.getQName(f);
-				doc.startElement(name);
-				EClass eClass = remote.eClass();
-				EClass expectedType = (EClass) f.getEType();
-				if (saveTypeInfo ? xmlTypeInfo.shouldSaveType(eClass,
-						expectedType, f) : eClass != expectedType
-						&& expectedType.isAbstract()) {
-					saveTypeAttribute(eClass);
-				}
-				String id = helper.getID(remote);
-				if (id != null) {
-					doc.addAttribute(idAttributeName, id);
-				}
-				doc.addAttribute(XMLResource.HREF, href);
-				if (eObjectToExtensionMap != null) {
-					processAttributeExtensions(remote);
-					if (processElementExtensions(remote)) {
-						doc.endElement();
-					} else {
-						doc.endEmptyElement();
-					}
-				} else {
-					doc.endEmptyElement();
-				}
-			}
-			return;
-		}
-
-		super.saveHref(remote, f);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLSaveImpl#saveFeatures(org.eclipse.emf.ecore.EObject)
-	 */
-	protected boolean saveFeatures(EObject o) {
-		try {
-			MultiFileXMIResourceImpl resource = (MultiFileXMIResourceImpl) o
-					.eResource();
-			if (resource != null) {
-				EObject container = o.eContainer();
-				InternalEObject internalEObject = ((InternalEObject) o);
-				if (o instanceof MethodElement && canSaveSeparately(o)
-						&& container != null) {
-					boolean containsNewFeature = (resource == container
-							.eResource());
-					MethodElement e = (MethodElement) o;
-					URI uri = MultiFileSaveUtil
-							.createFileURI((MethodElement) o);
-					if (containsNewFeature) {
-						if (!internalEObject.eIsProxy()) {
-							resource = (MultiFileXMIResourceImpl) MultiFileSaveUtil
-									.save(o, uri, options);
-						}
-					} else {
-						// check if there is a ResourceDescriptor for this
-						// element
-						// create a new one if needed
-						//
-						ResourceManager resMgr = MultiFileSaveUtil
-								.getResourceManager(container.eResource());
-						if (resMgr != null
-								&& resMgr.getResourceDescriptor(e.getGuid()) == null) {
-							// make sure that no other ResourceManager has a
-							// ResourceDescriptor for this element
-							//
-							MultiFileURIConverter uriConverter = (MultiFileURIConverter) resource
-									.getResourceSet().getURIConverter();
-							if (uriConverter
-									.findResourceDescriptor(e.getGuid()) == null) {
-								MultiFileSaveUtil.registerWithResourceManager(
-										resMgr, e, resource.getFinalURI());
-							}
-						}
-					}
-
-					String href = getUmaHREF(resource, internalEObject);
-					doc.addAttribute(XMLResource.HREF, href);
-					endSaveFeatures(o, 0, null);
-					return true;
-				}
-				if (o instanceof ResourceManager
-						&& helper.getResource() != resource) {
-					String href = getUmaHREF(resource, internalEObject);
-					doc.addAttribute(XMLResource.HREF, href);
-					endSaveFeatures(o, 0, null);
-					return true;
-				}
-			}
-			return super.saveFeatures(o);
-		} catch (RuntimeException e) {
-			CommonPlugin.INSTANCE.log(e);
-			if (MultiFileSaveUtil.DEBUG) {
-				e.printStackTrace();
-				System.err.println("ERROR saving feature: " + o); //$NON-NLS-1$
-				System.err.println("  Feature resource: " + o.eResource()); //$NON-NLS-1$
-			}
-			throw e;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMISaveImpl#addNamespaceDeclarations()
-	 */
-	public void addNamespaceDeclarations() {
-		super.addNamespaceDeclarations();
-		
-		if (!toDOM) {
-			// save tool version info
-			//
-			for (Iterator iter = VersionUtil.getAllToolIDs().iterator();iter.hasNext();) {
-				String toolID = (String)iter.next();
-				EPFVersions epfVersions = VersionUtil.getVersions(toolID);
-				String nsUri = epfVersions.getNsURI();
-				doc.addAttribute(ExtendedMetaData.XMLNS_PREFIX + ":" + toolID, nsUri); //$NON-NLS-1$
-				String toolVersion = epfVersions.getMinToolVersionForCurrentLibraryVersion().getToolVersion().toString();
-				doc.addAttribute(toolID + ":version", toolVersion); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/*
-	 * protected String getDatatypeValue(Object value, EStructuralFeature f,
-	 * boolean isAttribute) { if (value != null && value instanceof String) {
-	 * String str = (String)value; if (str.indexOf("\r") > 0) { str =
-	 * str.replaceAll("\r", ""); return super.getDatatypeValue(str, f,
-	 * isAttribute); } }; return super.getDatatypeValue(value, f, isAttribute); }
-	 */
-
-	// TODO: needs to revisit this class since its base class has been updated a
-	// lot in EMF 2.2
-	public static class MyEscape extends Escape {
-		protected final char[] GREATER = { '&', 'g', 't', ';' };
-
-		protected final char[] BLANK = {};
-
-		public MyEscape() {
-			super();
-		}
-
-		/*
-		 * Converts: & to &amp; < to &lt; " to &quot; \t to &#x9; \n to &#xA; \r
-		 * to &#xD;
-		 */
-		public String convert(String input) {
-			boolean changed = false;
-			int inputLength = input.length();
-			grow(inputLength);
-			input.getChars(0, inputLength, value, 0);
-			int pos = 0;
-			char ch = 0;
-			while (inputLength-- > 0) {
-				ch = value[pos];
-				switch (ch) {
-				case '&':
-					pos = replace(pos, AMP, inputLength);
-					changed = true;
-					break;
-				case '<':
-					pos = replace(pos, LESS, inputLength);
-					changed = true;
-					break;
-				case '>':
-					pos = replace(pos, GREATER, inputLength);
-					changed = true;
-					break;
-				case '"':
-					pos = replace(pos, QUOTE, inputLength);
-					changed = true;
-					break;
-				default:
-					/*
-					 * if (!XMLChar.isValid(ch)) { throw new
-					 * RuntimeException("An invalid XML character (Unicode: 0x" +
-					 * Integer.toHexString(ch)+") was found in the element
-					 * content:" +input); }
-					 */
-					pos++;
-					break;
-				}
-			}
-			return changed ? new String(value, 0, pos) : input;
-		}
-
-		/**
-		 * Converts: & to &amp; < to &lt; > to &gt; " to &quot; \n to
-		 * platform-dependent line breaking character
-		 */
-		public String convertText(String input) {
-			boolean changed = false;
-			int inputLength = input.length();
-			grow(inputLength);
-			input.getChars(0, inputLength, value, 0);
-			int pos = 0;
-			while (inputLength-- > 0) {
-				switch (value[pos]) {
-				case '&':
-					pos = replace(pos, AMP, inputLength);
-					changed = true;
-					break;
-				case '<':
-					pos = replace(pos, LESS, inputLength);
-					changed = true;
-					break;
-				case '>':
-					pos = replace(pos, GREATER, inputLength);
-					changed = true;
-					break;
-				case '"':
-					pos = replace(pos, QUOTE, inputLength);
-					changed = true;
-					break;
-				case '\r':
-					pos = replace(pos, BLANK, inputLength);
-					changed = true;
-					break;
-				case '\n':
-					pos = replace(pos, LINE_FEED, inputLength);
-					changed = true;
-					break;
-				default:
-					pos++;
-					break;
-				}
-			}
-			return changed ? new String(value, 0, pos) : input;
-		}
-
-		/*
-		 * Taken from XMLSaveImpl$Escape.convertText, and added conversion of >
-		 * This is used for XLIFF's - change it's name so it doesn't impact EMF
-		 * saving Convert: & to &amp; < to &lt; " to &quot; \n to line separator
-		 */
-		public String myConvertText(String input) {
-			boolean changed = false;
-			int inputLength = input.length();
-			grow(inputLength);
-			input.getChars(0, inputLength, value, 0);
-			int pos = 0;
-			while (inputLength-- > 0) {
-				switch (value[pos]) {
-				case '&':
-					pos = replace(pos, AMP, inputLength);
-					changed = true;
-					break;
-				case '<':
-					pos = replace(pos, LESS, inputLength);
-					changed = true;
-					break;
-				case '>':
-					pos = replace(pos, GREATER, inputLength);
-					changed = true;
-					break;
-				case '"':
-					pos = replace(pos, QUOTE, inputLength);
-					changed = true;
-					break;
-				case '\n': {
-					pos = replace(pos, LINE_FEED, inputLength);
-					changed = true;
-					break;
-				}
-				default:
-					pos++;
-					break;
-				}
-			}
-
-			return changed ? new String(value, 0, pos) : input;
-		}
-	}
-
-	public static boolean checkModifyRequired(Map options) {
-		Object opt = options.get(MultiFileXMISaveImpl.CHECK_MODIFY);
-		return opt != null ? Boolean.valueOf(opt.toString()).booleanValue()
-				: false;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/PersistencePlugin.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/PersistencePlugin.java
deleted file mode 100755
index fc0cb86..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/PersistencePlugin.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class for the Library Persistence plug-in.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class PersistencePlugin extends AbstractPlugin {
-
-	// The shared plug-in instance.
-	private static PersistencePlugin plugin;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PersistencePlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * @see AbstractPlugin#start(BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * @see AbstractPlugin#stop(BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared plug-in instance.
-	 */
-	public static PersistencePlugin getDefault() {
-		return plugin;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/TxRecord.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/TxRecord.java
deleted file mode 100755
index c9c0eaa..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/TxRecord.java
+++ /dev/null
@@ -1,71 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.epf.uma.util.UmaUtil;
-
-/**
- * This class keep the transaction data to support fail-safe persistence
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-class TxRecord {
-
-	private String txID;
-
-	private List resourcesToCommit;
-
-	protected List warnings;
-
-	/**
-	 * @param txid
-	 * @param commit
-	 */
-	public TxRecord() {
-		super();
-		resourcesToCommit = new UniqueEList();
-	}
-
-	public String getTxID() {
-		if (txID == null) {
-			txID = UmaUtil.generateGUID();
-		}
-		return txID;
-	}
-
-	public List getResourcesToCommit() {
-		return resourcesToCommit;
-	}
-
-	/**
-	 * @return the warnings
-	 */
-	public List getWarnings() {
-		if (warnings == null) {
-			warnings = new ArrayList();
-		}
-		return warnings;
-	}
-
-	public void clear() {
-		txID = null;
-		resourcesToCommit.clear();
-		if (warnings != null) {
-			warnings.clear();
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/UnnormalizedURIException.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/UnnormalizedURIException.java
deleted file mode 100755
index 188e222..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/UnnormalizedURIException.java
+++ /dev/null
@@ -1,33 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-/**
- * Exception for URI that cannot be normalized.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class UnnormalizedURIException extends MultiFileIOException {
-
-	/**
-	 * @param msg
-	 */
-	public UnnormalizedURIException(String msg) {
-		super(msg);
-	}
-
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 8129316210755337816L;
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/XMILibraryPersister.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/XMILibraryPersister.java
deleted file mode 100755
index 0580aab..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/XMILibraryPersister.java
+++ /dev/null
@@ -1,108 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.epf.services.IFileBasedLibraryPersister;
-import org.eclipse.epf.uma.MethodElement;
-
-/**
- * @author Phong Nguyen Le - Oct 10, 2006
- * @since  1.0
- */
-public class XMILibraryPersister implements IFileBasedLibraryPersister {
-	
-	/**
-	 * Contructs a new XMILibraryPersister instance.
-	 */
-	public XMILibraryPersister() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister#getFileExtension(java.lang.Object)
-	 */
-	public String getFileExtension(Object e) {
-		return MethodLibraryPersister.INSTANCE.getFileExtension(e);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister#getFolderRelativePath(org.eclipse.epf.uma.MethodElement)
-	 */
-	public String getFolderRelativePath(MethodElement e) {
-		return MethodLibraryPersister.INSTANCE.getFolderRelativePath(e);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.IFileBasedLibraryPersister#hasOwnFolder(java.lang.Object)
-	 */
-	public boolean hasOwnFolder(Object e) {
-		return MethodLibraryPersister.INSTANCE.hasOwnFolder(e);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.ILibraryPersister#adjustLocation(org.eclipse.emf.ecore.resource.Resource)
-	 */
-	public void adjustLocation(Resource resource) {
-		MethodLibraryPersister.INSTANCE.adjustLocation(resource);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.ILibraryPersister#delete(org.eclipse.epf.uma.MethodElement)
-	 */
-	public void delete(MethodElement e) {
-		MethodLibraryPersister.INSTANCE.delete(e);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.ILibraryPersister#getFailSafePersister()
-	 */
-	public FailSafeMethodLibraryPersister getFailSafePersister() {
-		return MethodLibraryPersister.INSTANCE.getFailSafePersister();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.ILibraryPersister#getWarnings()
-	 */
-	public List getWarnings() {
-		return MethodLibraryPersister.INSTANCE.getWarnings();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.ILibraryPersister#hasOwnResource(java.lang.Object)
-	 */
-	public boolean hasOwnResource(Object e) {
-		return MethodLibraryPersister.INSTANCE.hasOwnResource(e);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.ILibraryPersister#hasOwnResourceWithoutReferrer(java.lang.Object)
-	 */
-	public boolean hasOwnResourceWithoutReferrer(Object e) {
-		return MethodLibraryPersister.INSTANCE.hasOwnResourceWithoutReferrer(e);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.ILibraryPersister#save(org.eclipse.emf.ecore.resource.Resource)
-	 */
-	public void save(Resource resource) throws Exception {
-		MethodLibraryPersister.INSTANCE.save(resource);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.util.ILibraryPersister#save(org.eclipse.epf.uma.MethodElement)
-	 */
-	public void save(MethodElement element) throws Exception {
-		MethodLibraryPersister.INSTANCE.save(element);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/XMILibraryResourceSetFactory.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/XMILibraryResourceSetFactory.java
deleted file mode 100755
index 7c2af96..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/XMILibraryResourceSetFactory.java
+++ /dev/null
@@ -1,37 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence;
-
-import org.eclipse.epf.library.persistence.ILibraryResourceSet;
-import org.eclipse.epf.library.persistence.ILibraryResourceSetFactory;
-import org.eclipse.epf.services.Services;
-
-/**
- * @author Phong Nguyen Le - Oct 27, 2006
- * @since  1.0
- */
-public class XMILibraryResourceSetFactory implements ILibraryResourceSetFactory {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.persistence.ILibraryResourceSetFactory#createLibraryResourceSet()
-	 */
-	public ILibraryResourceSet createLibraryResourceSet() {
-		return new MultiFileResourceSetImpl();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.persistence.ILibraryResourceSetFactory#getPersistenceType()
-	 */
-	public String getPersistenceType() {
-		return Services.XMI_PERSISTENCE_TYPE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/IMigrator.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/IMigrator.java
deleted file mode 100755
index 46611ac..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/IMigrator.java
+++ /dev/null
@@ -1,26 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.migration;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * Migrates one version of UMA library to another
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface IMigrator {
-
-	void migrate(String libPath, IProgressMonitor monitor) throws Exception;
-	void migrate(String libPath, IProgressMonitor monitor, UpgradeCallerInfo info) throws Exception;
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/MappingUtil.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/MappingUtil.java
deleted file mode 100755
index fd33a44..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/MappingUtil.java
+++ /dev/null
@@ -1,158 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.migration;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.osgi.framework.Bundle;
-
-/**
- * Utility class with static convenience methods to perform library upgrade from
- * older version.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public final class MappingUtil {
-
-	private static class Migrator {
-		Bundle bundle;
-
-		String className;
-
-		String libNsURI;
-
-		IMigrator instance;
-
-		/**
-		 * @param bundle
-		 * @param className
-		 * @param libNsURI
-		 */
-		public Migrator(Bundle bundle, String className, String libNsURI) {
-			super();
-			this.bundle = bundle;
-			this.className = className;
-			this.libNsURI = libNsURI;
-		}
-	}
-
-	private static Map migrators;
-	private static Set oldNsUris = new HashSet();
-
-	public static final IMigrator getMigrator(String libNsURI) {
-		if (migrators == null) {
-			migrators = new HashMap();
-			// Process the "org.eclipse.epf.library.persistence.migrators"
-			// extension point
-			// contributors.
-			IExtensionRegistry extensionRegistry = Platform
-					.getExtensionRegistry();
-			IExtensionPoint extensionPoint = extensionRegistry
-					.getExtensionPoint(
-							"org.eclipse.epf.library.persistence", "migrators"); //$NON-NLS-1$ //$NON-NLS-2$
-			if (extensionPoint != null) {
-				IExtension[] extensions = extensionPoint.getExtensions();
-				for (int i = 0; i < extensions.length; i++) {
-					IExtension extension = extensions[i];
-					String pluginId = extension.getNamespaceIdentifier();
-					Bundle bundle = Platform.getBundle(pluginId);
-					IConfigurationElement[] configElements = extension
-							.getConfigurationElements();
-					for (int j = 0; j < configElements.length; j++) {
-						IConfigurationElement configElement = configElements[j];
-						try {
-							String className = configElement
-									.getAttribute("class"); //$NON-NLS-1$
-							String nsURI = configElement
-									.getAttribute("libNsURI"); //$NON-NLS-1$
-							if (className != null
-									&& className.trim().length() > 0
-									&& nsURI != null
-									&& nsURI.trim().length() > 0) {
-								migrators.put(nsURI, new Migrator(bundle,
-										className, nsURI));
-							}
-						} catch (Exception e) {
-							CommonPlugin.INSTANCE.log(e);
-						}
-					}
-				}
-			}
-		}
-		Migrator migrator = (Migrator) migrators.get(libNsURI);
-		if (migrator != null) {
-			if (migrator.instance == null) {
-				try {
-					migrator.instance = (IMigrator) migrator.bundle.loadClass(
-							migrator.className).newInstance();
-				} catch (Exception e) {
-					CommonPlugin.INSTANCE.log(e);
-				}
-			}
-			return migrator.instance;
-		}
-		return null;
-	}
-
-	public synchronized static final boolean conversionRequired(String libPath) {
-		String currentNsURI = PersistenceUtil.getUMANsURI();
-		String libNsURI = PersistenceUtil.getUMANsURI(libPath);
-
-		if (oldNsUris.contains(libNsURI)) {
-			return true;
-		}
-		if (currentNsURI.equals(libNsURI)) {
-			return false;
-		}
-		boolean ret = getMigrator(libNsURI) != null;
-		if (ret) {
-			oldNsUris.add(libNsURI);
-		}
-		return ret;
-	}
-
-	public static void migrate(String libPath, IProgressMonitor monitor, UpgradeCallerInfo info)
-			throws Exception {
-		String nsURI = PersistenceUtil.getUMANsURI(libPath);
-		IMigrator migrator = getMigrator(nsURI);
-		if (migrator != null) {
-			migrator.migrate(libPath, monitor, info);
-		}
-	}
-
-	public static void main(String[] args) {
-		String libPath = args[0];
-		System.out
-				.println("Start migrating method library at '" + libPath + "'..."); //$NON-NLS-1$ //$NON-NLS-2$
-		try {
-			migrate(libPath, null, null);
-			System.out.println();
-			System.out.println("Migration successfull."); //$NON-NLS-1$
-		} catch (Exception e) {
-			e.printStackTrace();
-			System.err.println();
-			System.err.println("Migration failed."); //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/MigrationResourceHandler.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/MigrationResourceHandler.java
deleted file mode 100755
index b2c38f1..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/MigrationResourceHandler.java
+++ /dev/null
@@ -1,152 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.migration;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap.Entry;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.BasicResourceHandler;
-import org.eclipse.emf.ecore.xml.type.AnyType;
-
-/**
- * Resource handler for migrating UMA library from one version to another.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public abstract class MigrationResourceHandler extends BasicResourceHandler {
-
-	private static final boolean DEBUG = true;
-
-	public MigrationResourceHandler() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.BasicResourceHandler#postLoad(org.eclipse.emf.ecore.xmi.XMLResource,
-	 *      java.io.InputStream, java.util.Map)
-	 */
-	public void postLoad(XMLResource resource, InputStream inputStream,
-			Map options) {
-		if (!resource.getEObjectToExtensionMap().isEmpty()) {
-			if (DEBUG) {
-				System.out
-						.println("MigrationResourceHandler.postLoad(): " + resource.getURI()); //$NON-NLS-1$
-				System.out.println("---- Start unknown features ----"); //$NON-NLS-1$
-			}
-			for (Iterator iter = resource.getEObjectToExtensionMap().entrySet()
-					.iterator(); iter.hasNext();) {
-				Map.Entry entry = (Map.Entry) iter.next();
-				if (entry.getKey() instanceof EObject) {
-					// handle moved data
-					//
-					handleUnknownData((EObject) entry.getKey(), (AnyType)entry.getValue());
-				}
-			}
-			if (DEBUG)
-				System.out.println("---- End unknown features ----"); //$NON-NLS-1$
-		}
-	}
-
-	public static String getText(AnyType value) {
-		try {
-			if (value == null)
-				return null;
-			FeatureMap.Entry entry = (FeatureMap.Entry) value.getMixed().get(0);
-			return (String) entry.getValue();
-		} catch (RuntimeException e) {
-			throw e;
-		}
-	}
-
-	protected static EAttribute getEAttribute(EClass eClass, String name) {
-		for (Iterator iterator = eClass.getEAllAttributes().iterator(); iterator
-				.hasNext();) {
-			EAttribute attrib = (EAttribute) iterator.next();
-			if (attrib.getName().equals(name)) {
-				return attrib;
-			}
-		}
-		return null;
-	}
-
-	public static void setValue(EObject eObject, EStructuralFeature feature,
-			Object value) {
-		if (!feature.isMany()) {
-			eObject.eSet(feature, value);
-		} else {
-			Collection values = (Collection) eObject.eGet(feature);
-			if (value instanceof Collection) {
-				values.addAll((Collection) value);
-			} else {
-				values.add(value);
-			}
-		}
-
-	}
-	
-	protected abstract boolean handleUnknownFeature(EObject owner, EStructuralFeature feature, Object value);
-
-	private void handleUnknownFeatures(EObject owner, FeatureMap featureMap) {
-		for (Iterator iter = featureMap.iterator(); iter.hasNext();) {
-			FeatureMap.Entry entry = (FeatureMap.Entry) iter.next();
-			EStructuralFeature f = entry.getEStructuralFeature();
-			if(handleUnknownFeature(owner, f, entry.getValue())) {
-				iter.remove();
-			}
-		}
-	}
-
-	/**
-	 * @param key
-	 * @param value
-	 */
-	protected void handleUnknownData(EObject e, AnyType unknownData) {
-		handleUnknownFeatures(e, unknownData.getMixed());
-		handleUnknownFeatures(e, unknownData.getAnyAttribute());
-	}
-
-
-	public static Object getSingleValue(FeatureMap featureMap,
-			String featureName) {
-		for (Iterator iter = featureMap.iterator(); iter.hasNext();) {
-			FeatureMap.Entry entry = (Entry) iter.next();
-			if (entry.getEStructuralFeature().getName().equals(featureName)) {
-				return entry.getValue();
-			}
-		}
-		return null;
-	}
-
-	protected static Collection getValue(FeatureMap featureMap,
-			String featureName) {
-		Collection list = new ArrayList();
-		for (Iterator iter = featureMap.iterator(); iter.hasNext();) {
-			FeatureMap.Entry entry = (Entry) iter.next();
-			if (entry.getEStructuralFeature().getName().equals(featureName)) {
-				list.add(entry.getValue());
-			}
-		}
-		return list;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/MigrationUtil.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/MigrationUtil.java
deleted file mode 100755
index 1e1528f..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/MigrationUtil.java
+++ /dev/null
@@ -1,72 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.migration;
-
-import java.io.UnsupportedEncodingException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.epf.common.html.HTMLFormatter;
-import org.eclipse.epf.uma.MethodElement;
-
-/**
- * Utility class to help migrate and format the html content.
- * 
- * @author JInhua Xi
- * @since 1.0
- */
-public class MigrationUtil {
-
-	public static Set<String> cdataFeatureNames = new HashSet<String>();
-	static {
-		cdataFeatureNames.add("alternatives"); //$NON-NLS-1$
-		cdataFeatureNames.add("mainDescription"); //$NON-NLS-1$
-		cdataFeatureNames.add("howToStaff"); //$NON-NLS-1$
-		cdataFeatureNames.add("keyConsiderations"); //$NON-NLS-1$
-		cdataFeatureNames.add("purpose"); //$NON-NLS-1$
-		cdataFeatureNames.add("scope"); // ProcessDescription //$NON-NLS-1$
-		cdataFeatureNames.add("usageNotes"); // ProcessDescription //$NON-NLS-1$
-	}
-
-	private static boolean isHtmlFeature(EStructuralFeature f) {
-		return cdataFeatureNames.contains(f.getName());
-	}
-
-	public static void formatValue(MethodElement element) throws Exception {
-		List properties = element.getInstanceProperties();
-		if (properties != null) {
-			// get all string type attributes
-
-			HTMLFormatter formater = new HTMLFormatter();
-
-			for (int i = 0; i < properties.size(); i++) {
-				EStructuralFeature feature = (EStructuralFeature) properties
-						.get(i);
-
-				Object value = element.eGet(feature);
-				Object newValue = value;
-				if (isHtmlFeature(feature) && value instanceof String) {
-					try {
-						newValue = formater.formatHTML((String) value);
-					} catch (UnsupportedEncodingException e) {
-						// Not change value if it cannot be formatted
-						// Should also write to log for user attention
-						continue;
-					}
-					element.eSet(feature, newValue);
-				}
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/UMA2UMAResourceHandler.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/UMA2UMAResourceHandler.java
deleted file mode 100755
index 1425d1b..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/UMA2UMAResourceHandler.java
+++ /dev/null
@@ -1,181 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.migration;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap.Entry;
-import org.eclipse.emf.ecore.xml.type.AnyType;
-
-/**
- * Resource handler for migrating UMA library from one version to another.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class UMA2UMAResourceHandler extends MigrationResourceHandler {
-
-	private static final boolean DEBUG = true;
-
-	private List moveInfos;
-
-	public UMA2UMAResourceHandler() {
-		moveInfos = new ArrayList();
-	}
-
-	protected static EAttribute getEAttribute(EClass eClass, String name) {
-		for (Iterator iterator = eClass.getEAllAttributes().iterator(); iterator
-				.hasNext();) {
-			EAttribute attrib = (EAttribute) iterator.next();
-			if (attrib.getName().equals(name)) {
-				return attrib;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Subclass can override this method to customize rules to move data
-	 * 
-	 * @param owner
-	 * @param featureName
-	 * @return
-	 */
-	protected EStructuralFeature getNewFeature(EObject owner, String featureName) {
-		return null;
-	}
-
-	/**
-	 * Subclass can override this method to customize rules to move data
-	 * 
-	 * @param oldOwner
-	 * @param featureName
-	 * @return
-	 */
-	protected EObject getNewOwner(EObject oldOwner, String featureName) {
-		return null;
-	}
-
-	protected Object getNewValue(EObject oldOwner, String featureName,
-			AnyType value) {
-		return null;
-	}
-
-	public void moveData() {
-		for (Iterator iter = moveInfos.iterator(); iter.hasNext();) {
-			MoveInfo info = (MoveInfo) iter.next();
-			EObject newOwner = getNewOwner(info.oldOwner, info.oldFeatureName);
-			if (newOwner != null) {
-				setValue(newOwner, info.newFeature, info.value);
-			}
-		}
-	}
-
-	public static void setValue(EObject eObject, EStructuralFeature feature,
-			Object value) {
-		if (!feature.isMany()) {
-			eObject.eSet(feature, value);
-		} else {
-			Collection values = (Collection) eObject.eGet(feature);
-			if (value instanceof Collection) {
-				values.addAll((Collection) value);
-			} else {
-				values.add(value);
-			}
-		}
-
-	}
-
-	private static class MoveInfo {
-		EObject oldOwner;
-
-		String oldFeatureName;
-
-		EStructuralFeature newFeature;
-
-		Object value;
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see java.lang.Object#toString()
-		 */
-		public String toString() {
-			return new StringBuffer()
-					.append(getClass().getName())
-					.append("(\n") //$NON-NLS-1$
-					.append("  oldFeatureName: ").append(oldFeatureName).append('\n') //$NON-NLS-1$
-					.append("  newFeature: ").append(newFeature).append('\n') //$NON-NLS-1$
-					.append("  value: ").append(value).append('\n') //$NON-NLS-1$
-					.append(")").toString(); //$NON-NLS-1$
-		}
-	}
-
-	public static Object getSingleValue(FeatureMap featureMap,
-			String featureName) {
-		for (Iterator iter = featureMap.iterator(); iter.hasNext();) {
-			FeatureMap.Entry entry = (Entry) iter.next();
-			if (entry.getEStructuralFeature().getName().equals(featureName)) {
-				return entry.getValue();
-			}
-		}
-		return null;
-	}
-
-	protected static Collection getValue(FeatureMap featureMap,
-			String featureName) {
-		Collection list = new ArrayList();
-		for (Iterator iter = featureMap.iterator(); iter.hasNext();) {
-			FeatureMap.Entry entry = (Entry) iter.next();
-			if (entry.getEStructuralFeature().getName().equals(featureName)) {
-				list.add(entry.getValue());
-			}
-		}
-		return list;
-	}
-
-	public void clearMoveInfos() {
-		moveInfos.clear();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.persistence.migration.MigrationResourceHandler#handleUnknownFeature(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)
-	 */
-	protected boolean handleUnknownFeature(EObject owner, EStructuralFeature feature, Object value) {
-		String featureName = feature.getName();
-		EStructuralFeature newFeature = getNewFeature(owner, featureName);
-		if (newFeature != null) {
-			MoveInfo moveInfo = new MoveInfo();
-			moveInfo.oldOwner = owner;
-			moveInfo.oldFeatureName = featureName;
-			moveInfo.newFeature = newFeature;
-			moveInfo.value = value instanceof AnyType ? getNewValue(
-					owner, featureName, (AnyType) value)
-					: value;
-			moveInfos.add(moveInfo);
-			if (DEBUG) {
-				System.out.println(moveInfo);
-				System.out.println();
-			}
-			return true;
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/UpgradeCallerInfo.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/UpgradeCallerInfo.java
deleted file mode 100755
index 43ce675..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/UpgradeCallerInfo.java
+++ /dev/null
@@ -1,77 +0,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
-//------------------------------------------------------------------------------
-
-package org.eclipse.epf.persistence.migration;
-
-import java.io.File;
-
-/**
- * Class representing caller info for calling library upgrade code.
- * 
- * @author Weiping Lu
- * 
- * @since 1.0
- */
-public class UpgradeCallerInfo {
-	
-	public static int upgradeLibrary = 0;
-	public static int upgradeImportPlugin = 1;
-	public static int upgradeImportConfig = 2;
-	
-	private int callerType = upgradeLibrary;
-	private String errorMsg;
-	File libFile;
-	File copiedLibFile;
-	
-	public UpgradeCallerInfo(int callerType, File libFile) {
-		this.callerType = callerType;
-		this.libFile = libFile;
-	}
-	
-	public static boolean isUpgradeLibrary(UpgradeCallerInfo info) {
-		return info == null || info.isUpgradeLibrary();
-	}
-	
-	public boolean isUpgradeLibrary() {
-		return callerType == upgradeLibrary;
-	}
-	
-	public boolean getIsExportedPluginLib() {
-		return callerType == upgradeImportPlugin;
-	}
-	
-	public void setErrorMsg(String msg) {
-		errorMsg = msg;
-	}
-	
-	public String getErrorMsg() {
-		return errorMsg;
-	}			
-	
-	public void setCopiedLibFile(File file) {
-		copiedLibFile = file;
-	}
-	
-	public File getCopiedLibFile() {
-		return copiedLibFile;
-	}
-	
-	protected File getLibFile() {
-		return libFile;
-	}
-
-	public void copyLibrary() {
-	}
-	
-	public void removeCopiedLibrary() {
-	}
-	
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/internal/Migrator.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/internal/Migrator.java
deleted file mode 100755
index b385aa2..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/internal/Migrator.java
+++ /dev/null
@@ -1,725 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.migration.internal;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.xmi.IllegalValueException;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-import org.eclipse.emf.ecore.xml.type.AnyType;
-import org.eclipse.emf.mapping.ecore2xml.Ecore2XMLPackage;
-import org.eclipse.emf.mapping.ecore2xml.Ecore2XMLRegistry;
-import org.eclipse.emf.mapping.ecore2xml.impl.Ecore2XMLRegistryImpl;
-import org.eclipse.emf.mapping.ecore2xml.util.Ecore2XMLExtendedMetaData;
-import org.eclipse.epf.persistence.MultiFileResourceSetImpl;
-import org.eclipse.epf.persistence.MultiFileURIConverter;
-import org.eclipse.epf.persistence.MultiFileXMIHelperImpl;
-import org.eclipse.epf.persistence.MultiFileXMIResourceImpl;
-import org.eclipse.epf.persistence.migration.UMA2UMAResourceHandler;
-import org.eclipse.epf.persistence.util.PersistenceResources;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.resourcemanager.ResourceDescriptor;
-import org.eclipse.epf.resourcemanager.ResourceManager;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.util.ContentDescriptionFactory;
-import org.eclipse.epf.uma.util.UmaUtil;
-
-/**
- * Migrates one version of UMA library to another using the provided Ecore2XML
- * mapping files and UMA2UMAResourceHandler. The Ecore2XML mapping files
- * specifies the name changes of classes/attributes while UMA2UMAResourceHandler
- * handles the data moving.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class Migrator {
-	private static final String[] NS_URIs = { Migrator.OLD_UMA_NS_URI,
-			Migrator.OLD_UMA_NS_URI, Migrator.UMA_NS_URI };
-
-	private static final URI[] ECORE2XML_URIs = {
-			URI
-					.createURI("platform:/plugin/com.ibm.rpm.library.persistence/migration/uma.ecore2xml") //$NON-NLS-1$
-			,
-			URI
-					.createURI("platform:/plugin/com.ibm.rpm.library.persistence/migration/uma2.ecore2xml") //$NON-NLS-1$
-			,
-			URI
-					.createURI("platform:/plugin/com.ibm.rpm.library.persistence/migration/uma3.ecore2xml") //$NON-NLS-1$
-	};
-
-	public static final String OLD_UMA_NS_URI = "http:///com/ibm/uma.ecore"; //$NON-NLS-1$
-
-	public static final String UMA_NS_URI = "http://www.ibm.com/uma/1.0.2/uma.ecore"; //$NON-NLS-1$
-
-	private ExtendedMetaData[] extendedMetaDatas;
-
-	private UMA2UMAResourceHandler0 resourceHandler;
-
-	public HashMap oldPathToNewURIMap = new HashMap();
-
-	public Collection anyTypeFeatureValues = new ArrayList();
-
-	private static final ExtendedMetaData getExtendedMetaData(String oldNsURI,
-			URI ecore2XMLURI) {
-		EPackage.Registry ePackageRegistry = new EPackageRegistryImpl(
-				EPackage.Registry.INSTANCE);
-		ePackageRegistry.put(oldNsURI, UmaPackage.eINSTANCE);
-
-		Ecore2XMLRegistry ecore2xmlRegistry = new Ecore2XMLRegistryImpl(
-				Ecore2XMLRegistry.INSTANCE);
-
-		ecore2xmlRegistry
-				.put(oldNsURI, EcoreUtil.getObjectByType(new ResourceSetImpl()
-						.getResource(ecore2XMLURI, true).getContents(),
-						Ecore2XMLPackage.eINSTANCE.getXMLMap()));
-
-		return new Ecore2XMLExtendedMetaData(ePackageRegistry,
-				ecore2xmlRegistry) {
-			public EClassifier getType(EPackage ePackage, String name) {
-				EClassifier type = super.getType(ePackage, name);
-
-				if (type == null) {
-					// try to get type from the package with the given name
-					//
-					List eClassifiers = ePackage.getEClassifiers();
-					for (int i = 0, size = eClassifiers.size(); i < size; ++i) {
-						EClassifier eClassifier = (EClassifier) eClassifiers
-								.get(i);
-						if (name.equals(eClassifier.getName())) {
-							return eClassifier;
-						}
-					}
-
-				}
-
-				return type;
-			}
-		};
-	}
-
-	public Migrator() {
-		this(NS_URIs, ECORE2XML_URIs);
-	}
-
-	public Migrator(String[] nsURIs, URI[] ecore2XMLURIs) {
-		int size = ecore2XMLURIs.length;
-		extendedMetaDatas = new ExtendedMetaData[size];
-		for (int i = 0; i < ecore2XMLURIs.length; i++) {
-			extendedMetaDatas[i] = getExtendedMetaData(nsURIs[i],
-					ecore2XMLURIs[i]);
-		}
-		this.resourceHandler = new UMA2UMAResourceHandler0();
-	}
-
-	private static void updateStatus(IProgressMonitor monitor, String msg) {
-		if (monitor != null) {
-			monitor.setTaskName(msg);
-		} else {
-			System.out.println(msg);
-		}
-	}
-
-	private static class AnyTypeFeatureValue {
-		String ownerId;
-
-		EObject owner;
-
-		EStructuralFeature feature;
-
-		String valueId;
-
-		AnyType value;
-
-		int index;
-	}
-
-	class MigratorURIConverter extends MultiFileURIConverter {
-		private ResourceManager oldResMgr;
-
-		/**
-		 * @param resourceSet
-		 */
-		public MigratorURIConverter(MultiFileResourceSetImpl resourceSet) {
-			super(resourceSet);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see com.ibm.uma.persistence.MultiFileURIConverter#normalize(org.eclipse.emf.common.util.URI)
-		 */
-		public URI normalize(URI uri) {
-			URI normalized = super.normalize(uri);
-			if (normalized == null && SCHEME.equalsIgnoreCase(uri.scheme())) {
-				if (oldResMgr != null) {
-					String id = uri.authority();
-					normalized = getURIFromOldResourceManager(id);
-					if (normalized != null) {
-						if (uri.hasFragment()) {
-							normalized = normalized.appendFragment(uri
-									.fragment());
-						} else {
-							normalized = normalized.appendFragment(id);
-						}
-					}
-				}
-
-			}
-			return normalized;
-		}
-
-		public URI getURIFromOldResourceManager(String id) {
-			if (oldResMgr == null)
-				return null;
-			ResourceDescriptor desc = oldResMgr.getResourceDescriptor(id);
-			if (desc != null) {
-				URI normalized = desc.getResolvedURI();
-				URI newURI = (URI) oldPathToNewURIMap.get(normalized
-						.toFileString());
-				if (newURI != null) {
-					normalized = newURI;
-				}
-				return normalized;
-			}
-			return null;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see com.ibm.uma.persistence.MultiFileURIConverter#dispose()
-		 */
-		public void dispose() {
-			if (oldResMgr != null) {
-				oldResMgr.dispose();
-				oldResMgr = null;
-			}
-
-			super.dispose();
-		}
-
-		/**
-		 * @param resMgr2
-		 */
-		public void setOldResourceManager(ResourceManager resMgr) {
-			oldResMgr = resMgr;
-		}
-
-		public ResourceManager getOldResourceManager() {
-			return oldResMgr;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see com.ibm.uma.persistence.MultiFileURIConverter#setURIMapping(org.eclipse.emf.ecore.EObject,
-		 *      org.eclipse.emf.common.util.URI, java.util.Set)
-		 */
-		public void setURIMapping(EObject e, URI uri, Set modifiedResources) {
-			// code to support migration from older version
-			//
-			if (e instanceof MethodElement) {
-				MigratorURIConverter uriConverter = (MigratorURIConverter) ((MultiFileResourceSetImpl) e
-						.eResource().getResourceSet()).getURIConverter();
-				ResourceManager oldResMgr = uriConverter
-						.getOldResourceManager();
-				if (oldResMgr != null) {
-					ResourceDescriptor desc = oldResMgr
-							.getResourceDescriptor(((MethodElement) e)
-									.getGuid());
-					if (desc != null) {
-						oldPathToNewURIMap.put(desc.getResolvedURI()
-								.toFileString(), uri);
-					}
-				}
-			}
-
-			super.setURIMapping(e, uri, modifiedResources);
-		}
-	}
-
-	class MigratorResourceSet extends MultiFileResourceSetImpl {
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see com.ibm.uma.persistence.MultiFileResourceSetImpl#getURIConverter()
-		 */
-		public URIConverter getURIConverter() {
-			if (uriConverter == null) {
-				uriConverter = new MigratorURIConverter(this);
-			}
-			return uriConverter;
-		}
-
-		private void loadOldResourceManager(String libPath) throws IOException {
-			// trying to load the resource descriptors file
-			//
-			String libDir = new File(libPath).getParent() + File.separator;
-			File file = new File(libDir, RESMGR_XMI);
-			ResourceManager resMgr = null;
-			MultiFileURIConverter multiFileURIConverter = (MultiFileURIConverter) getURIConverter();
-			if (file.exists()) {
-				Resource resMgrRes = new XMIResourceImpl(URI.createFileURI(file
-						.getAbsolutePath())); // super.getResource(URI.createFileURI(file.getAbsolutePath()),
-				// true);
-				resMgrRes.load(null);
-				if (!resMgrRes.getContents().isEmpty()) {
-					Object obj = resMgrRes.getContents().get(0);
-					if (obj instanceof ResourceManager) {
-						resMgr = (ResourceManager) obj;
-						// resMgr.resolve();
-					} else {
-						System.err
-								.println("Invalid ResourceManager file: " + file); //$NON-NLS-1$
-					}
-				}
-			}
-			((MigratorURIConverter) multiFileURIConverter)
-					.setOldResourceManager(resMgr);
-		}
-
-		public MethodLibrary loadLibrary(String path) throws Exception {
-			loadOldResourceManager(path);
-
-			return loadLibraryWithoutReset(path);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see com.ibm.uma.persistence.MultiFileResourceSetImpl#findEObjectInUnloadedResources(java.lang.String)
-		 */
-		protected EObject findEObjectInUnloadedResources(String id) {
-			Object object = null;
-			if (getResourceManager() != null) {
-				object = super.findEObjectInUnloadedResources(id);
-			}
-			if (object == null) {
-				URI uri = ((MigratorURIConverter) getURIConverter())
-						.getURIFromOldResourceManager(id);
-				Resource resource = super.getResource(uri, true);
-				return resource.getEObject(id);
-			}
-			return null;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see com.ibm.uma.persistence.MultiFileResourceSetImpl#getEObject(org.eclipse.emf.common.util.URI,
-		 *      boolean)
-		 */
-		public EObject getEObject(URI uri, boolean loadOnDemand) {
-			// EObject eObj = superGetEObject(uri, loadOnDemand);
-			EObject eObj = super.getEObject(uri, loadOnDemand);
-			if (eObj == null
-					&& MigratorURIConverter.SCHEME.equalsIgnoreCase(uri
-							.scheme()) && !uri.hasFragment()) {
-				eObj = super.getEObject(uri.authority());
-			}
-			// if(uri.authority().equals("{11B60A4B-A0C7-4D5C-891A-346E8652A4EB}"))
-			// {
-			// System.out.println("MigratorResourceSet.getEObject(): eObj = " +
-			// eObj);
-			// }
-			if (eObj == null || eObj.eIsProxy()) {
-				throw new RuntimeException(
-						"Could not load object with URI '" + uri + "' (normalized URI: '" + getURIConverter().normalize(uri) + "').\nPlease see log file for more details."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			}
-			return eObj;
-		}
-
-		public EObject superGetEObject(URI uri, boolean loadOnDemand) {
-			try {
-				URI normalized = getURIConverter().normalize(uri);
-				if (normalized == null) {
-					return null;
-				}
-				Resource resource = null;
-				resource = getResource(normalized.trimFragment(), loadOnDemand);
-				if (resource != null) {
-					String fragment = normalized.fragment();
-					if (fragment == null || fragment.length() == 0) {
-						return PersistenceUtil.getMethodElement(resource);
-					}
-					try {
-						return resource.getEObject(fragment);
-					} catch (NullPointerException e) {
-						throw e;
-					}
-				} else {
-					return null;
-				}
-			} catch (RuntimeException e) {
-				//
-			}
-			return null;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see com.ibm.uma.persistence.MultiFileResourceSetImpl#createResource(org.eclipse.emf.common.util.URI)
-		 */
-		public Resource createResource(URI uri) {
-			Resource result = new MultiFileXMIResourceImpl(uri) {
-				protected XMLHelper createXMLHelper() {
-					return new MultiFileXMIHelperImpl(this) {
-						public void setValue(EObject object,
-								EStructuralFeature feature, Object value,
-								int position) {
-							boolean old = logError;
-							try {
-								logError = false;
-								super
-										.setValue(object, feature, value,
-												position);
-							} catch (RuntimeException e) {
-								if (value instanceof AnyType
-										&& object instanceof MethodElement
-								// && object instanceof WorkBreakdownElement
-								// && feature ==
-								// UmaPackage.eINSTANCE.getWorkBreakdownElement_LinkToPredecessor()
-								) {
-									AnyTypeFeatureValue fvalue = new AnyTypeFeatureValue();
-									// fvalue.owner = object;
-									fvalue.ownerId = ((MethodElement) object)
-											.getGuid();
-									fvalue.feature = feature;
-									// fvalue.value = (AnyType) value;
-									fvalue.valueId = (String) UMA2UMAResourceHandler
-											.getSingleValue(((AnyType) value)
-													.getAnyAttribute(), "guid"); //$NON-NLS-1$
-									fvalue.index = position;
-									anyTypeFeatureValues.add(fvalue);
-								} else {
-									throw e;
-								}
-							} finally {
-								logError = old;
-							}
-						}
-
-						public List setManyReference(
-								org.eclipse.emf.ecore.xmi.XMLHelper.ManyReference reference,
-								String location) {
-							List exceptions = super.setManyReference(reference,
-									location);
-							if (exceptions == null)
-								return null;
-							for (Iterator iter = exceptions.iterator(); iter
-									.hasNext();) {
-								Object ex = iter.next();
-								if (ex instanceof IllegalValueException) {
-									IllegalValueException ive = (IllegalValueException) ex;
-									if (ive.getValue() instanceof AnyType
-											&& ive.getObject() instanceof MethodElement) {
-										AnyTypeFeatureValue fvalue = new AnyTypeFeatureValue();
-										fvalue.ownerId = ((MethodElement) ive
-												.getObject()).getGuid();
-										fvalue.feature = ive.getFeature();
-										fvalue.valueId = (String) UMA2UMAResourceHandler
-												.getSingleValue(((AnyType) ive
-														.getValue())
-														.getAnyAttribute(),
-														"guid"); //$NON-NLS-1$
-										fvalue.index = -1;
-										anyTypeFeatureValues.add(fvalue);
-										iter.remove();
-									}
-								}
-							}
-							if (exceptions.isEmpty()) {
-								return null;
-							}
-							return exceptions;
-						}
-					};
-				}
-			};
-			result.setTrackingModification(true);
-			getResources().add(result);
-			return result;
-		}
-	}
-
-	public void migrate(String libPath, IProgressMonitor monitor)
-			throws Exception {
-		Set classNames = new HashSet();
-		classNames.add("Technique"); //$NON-NLS-1$
-
-		MultiFileResourceSetImpl resourceSet = new MigratorResourceSet();
-		// ResourceManager oldResMgr = null;
-		for (int i = 0; i < extendedMetaDatas.length; i++) {
-			resourceSet.getLoadOptions().put(
-					XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
-			if (i < 2) {
-				resourceSet.getLoadOptions().put(
-						XMLResource.OPTION_RESOURCE_HANDLER, resourceHandler);
-			}
-			resourceSet.getLoadOptions()
-					.put(XMLResource.OPTION_EXTENDED_META_DATA,
-							extendedMetaDatas[i]);
-
-			if (i == 0) {
-				resourceHandler.savePresentationURIFor(classNames);
-			} else {
-				resourceHandler.savePresentationURIFor(null);
-			}
-
-			updateStatus(monitor, PersistenceResources.loadLibraryTask_name);
-
-			// if(oldResMgr != null) {
-			// ((MigratorURIConverter)resourceSet.getURIConverter()).setOldResourceManager(oldResMgr);
-			// resourceSet.loadLibraryWithoutReset(libPath);
-			// }
-			// else {
-			resourceSet.loadLibrary(libPath);
-			// }
-
-			MethodLibrary lib = resourceSet.getMethodLibrary();
-			if (lib == null)
-				return;
-
-			// load all the resources in memory
-			//
-			updateStatus(monitor, PersistenceResources.loadResourcesTask_name);
-
-			for (Iterator iter = lib.eAllContents(); iter.hasNext();) {
-				EObject element = (EObject) iter.next();
-				if (element instanceof Guideline && i > 0) {
-					// hack to restore the right presentation for old Technique
-					//
-					Guideline guideline = (Guideline) element;
-					URI uri = resourceHandler.getPresentationURI(guideline
-							.getGuid());
-					if (uri != null) {
-						ContentDescription presentation = (ContentDescription) resourceSet
-								.getEObject(uri, true);
-						guideline.setPresentation(presentation);
-					}
-				}
-				if (element instanceof MethodElement) {
-					try {
-						for (Iterator iterator = element.eCrossReferences()
-								.iterator(); iterator.hasNext();) {
-							iterator.next();
-						}
-					} catch (Exception e) {
-						CommonPlugin.INSTANCE.log(e);
-						System.err
-								.println("Error iterate thru cross references of element: " + element); //$NON-NLS-1$
-					}
-				}
-			}
-
-			if (i == 0) {
-				// oldResMgr =
-				// ((MigratorURIConverter)resourceSet.getURIConverter()).getOldResourceManager();
-
-				migrateProcessContentDescriptions(monitor, lib);
-
-				updateStatus(monitor, PersistenceResources.moveDataTask_name);
-
-			}
-
-			if (i < 2) {
-				resourceHandler.moveData();
-				resourceHandler.clearMoveInfos();
-			}
-
-			if (i == extendedMetaDatas.length - 1) {
-				migrateProcesses(monitor, lib);
-
-				restoreReferences(resourceSet);
-
-			}
-
-			updateStatus(monitor, PersistenceResources.saveLibraryTask_name);
-
-			resourceSet.save(null, true);
-			resourceSet.reset();
-
-		}
-
-		// delete old resmgr.xmi
-		//
-		try {
-			File resMgrFile = new File(new File(libPath).getParentFile(),
-					MultiFileResourceSetImpl.RESMGR_XMI);
-			if (resMgrFile.exists()) {
-				resMgrFile.delete();
-			}
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	private void restoreReferences(MultiFileResourceSetImpl resourceSet) {
-		for (Iterator iter = anyTypeFeatureValues.iterator(); iter.hasNext();) {
-			AnyTypeFeatureValue element = (AnyTypeFeatureValue) iter.next();
-			if (element.ownerId != null && element.valueId != null) {
-				EObject owner = resourceSet.getEObject(element.ownerId);
-				Object value = resourceSet.getEObject(element.valueId);
-				UMA2UMAResourceHandler.setValue(owner, element.feature, value);
-			}
-		}
-		anyTypeFeatureValues.clear();
-	}
-
-	private static void migrateProcesses(IProgressMonitor monitor,
-			MethodLibrary lib) {
-		updateStatus(monitor, PersistenceResources.fixPresentationNameTask_name);
-
-		String[][] procPkgPaths = MultiFileResourceSetImpl.PROCESS_PACKAGE_PATHS;
-		for (Iterator iter = lib.getMethodPlugins().iterator(); iter.hasNext();) {
-			MethodPlugin plugin = (MethodPlugin) iter.next();
-			ArrayList procPkgs = new ArrayList();
-			for (int j = 0; j < procPkgPaths.length; j++) {
-				MethodPackage pkg = UmaUtil.findMethodPackage(plugin,
-						procPkgPaths[j]);
-				if (pkg != null) {
-					procPkgs.add(pkg);
-				}
-			}
-			for (Iterator iterator = procPkgs.iterator(); iterator.hasNext();) {
-				ProcessPackage pkg = (ProcessPackage) iterator.next();
-				for (Iterator iterator1 = pkg.getChildPackages().iterator(); iterator1
-						.hasNext();) {
-					EObject childPkg = (EObject) iterator1.next();
-					if (childPkg instanceof ProcessComponent) {
-						org.eclipse.epf.uma.Process proc = ((ProcessComponent) childPkg)
-								.getProcess();
-						if (proc != null) {
-							try {
-								fixPresentationName(proc);
-							} catch (RuntimeException e) {
-								throw e;
-							}
-						} else {
-							String msg = Migrator.class.getName()
-									+ ": invalid ProcessComponent (with no Process): " + childPkg //$NON-NLS-1$
-									+ "\n  ProcessComponent's resource URI: " + (childPkg.eResource() != null ? childPkg.eResource().getURI() : null) //$NON-NLS-1$
-									+ "\n  Parent package: " + pkg //$NON-NLS-1$
-									+ "\n  Parent package's resource URI: " + (pkg.eResource() != null ? pkg.eResource().getURI() : null) //$NON-NLS-1$
-							;
-							CommonPlugin.INSTANCE.log(msg);
-							System.err.println(msg);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private static void migrateProcessContentDescriptions(
-			IProgressMonitor monitor, MethodLibrary lib) {
-		updateStatus(monitor,
-				PersistenceResources.migrateContentDescriptionsTask_name);
-
-		String[][] procPkgPaths = MultiFileResourceSetImpl.PROCESS_PACKAGE_PATHS;
-		for (Iterator iter = lib.getMethodPlugins().iterator(); iter.hasNext();) {
-			MethodPlugin plugin = (MethodPlugin) iter.next();
-			ArrayList procPkgs = new ArrayList();
-			for (int j = 0; j < procPkgPaths.length; j++) {
-				MethodPackage pkg = UmaUtil.findMethodPackage(plugin,
-						procPkgPaths[j]);
-				if (pkg != null) {
-					procPkgs.add(pkg);
-				}
-			}
-			for (Iterator iterator = procPkgs.iterator(); iterator.hasNext();) {
-				ProcessPackage pkg = (ProcessPackage) iterator.next();
-				for (Iterator iterator1 = pkg.getChildPackages().iterator(); iterator1
-						.hasNext();) {
-					Object childPkg = (Object) iterator1.next();
-					if (childPkg instanceof ProcessComponent) {
-						org.eclipse.epf.uma.Process proc = ((ProcessComponent) childPkg)
-								.getProcess();
-						migrateContentDescription(proc);
-					}
-				}
-			}
-		}
-	}
-
-	private static void migrateContentDescription(BreakdownElement e) {
-		if (ContentDescriptionFactory.hasPresentation(e)) {
-			ContentDescription content = e.getPresentation();
-			EClass eCls = ContentDescriptionFactory
-					.getContentDescriptionEClass(e);
-			if (eCls != content) {
-				ContentDescription newContent = ContentDescriptionFactory
-						.createContentDescription(e);
-				newContent.setMainDescription(content.getMainDescription());
-				newContent.setKeyConsiderations(content.getKeyConsiderations());
-				newContent.getSections().addAll(content.getSections());
-				e.setPresentation(newContent);
-			}
-		}
-		if (e instanceof Activity) {
-			for (Iterator iter = ((Activity) e).getBreakdownElements()
-					.iterator(); iter.hasNext();) {
-				migrateContentDescription((BreakdownElement) iter.next());
-			}
-		}
-	}
-
-	private static void fixPresentationName(BreakdownElement e) {
-		if (e.getPresentationName() == null
-				|| e.getPresentationName().trim().length() == 0) {
-			e.setPresentationName(e.getName());
-		}
-		if (e instanceof Activity) {
-			for (Iterator iter = ((Activity) e).getBreakdownElements()
-					.iterator(); iter.hasNext();) {
-				fixPresentationName((BreakdownElement) iter.next());
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/internal/UMA2UMAResourceHandler0.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/internal/UMA2UMAResourceHandler0.java
deleted file mode 100755
index f3d21c2..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/internal/UMA2UMAResourceHandler0.java
+++ /dev/null
@@ -1,190 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.migration.internal;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.xml.type.AnyType;
-import org.eclipse.epf.persistence.MultiFileResourceSetImpl;
-import org.eclipse.epf.persistence.migration.UMA2UMAResourceHandler;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.ProcessElement;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkOrderType;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class UMA2UMAResourceHandler0 extends UMA2UMAResourceHandler {
-
-	private Set procMovedFeatureNames;
-
-	private Map guidToPresentationMap;
-
-	private Set classNamesToSavePresentationURI;
-
-	public UMA2UMAResourceHandler0() {
-		super();
-
-		guidToPresentationMap = new HashMap();
-
-		procMovedFeatureNames = new HashSet(Arrays.asList(new String[] {
-				"purpose" //$NON-NLS-1$
-				, "keyConsiderations" //$NON-NLS-1$
-				, "alternatives" //$NON-NLS-1$
-				, "howtoStaff" //$NON-NLS-1$
-				, "usageGuidance" //$NON-NLS-1$
-				, "externalId" //$NON-NLS-1$
-				, "scope" //$NON-NLS-1$
-				, "usageNotes" //$NON-NLS-1$
-				, "scale" //$NON-NLS-1$
-				, "projectCharacteristics" //$NON-NLS-1$
-				, "riskLevel" //$NON-NLS-1$
-				, "estimatingTechnique" //$NON-NLS-1$
-				, "projectMemberExpertise" //$NON-NLS-1$
-				, "typeOfContract" //$NON-NLS-1$
-				, "techniques" //$NON-NLS-1$
-				, "mainDescription" //$NON-NLS-1$
-		}));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.persistence.migration.UMA2UMAResourceHandler#getNewFeature(org.eclipse.emf.ecore.EObject,
-	 *      java.lang.String)
-	 */
-	protected EStructuralFeature getNewFeature(EObject owner, String featureName) {
-		if ("presentationName".equals(featureName) && owner instanceof ContentDescription) { //$NON-NLS-1$
-			return UmaPackage.eINSTANCE
-					.getDescribableElement_PresentationName();
-		}
-		if (procMovedFeatureNames.contains(featureName)) {
-			if (owner instanceof ProcessElement) {
-				ContentDescription content = ((ProcessElement) owner)
-						.getPresentation();
-				EAttribute attrib = getEAttribute(content.eClass(), featureName);
-				if (attrib != null) {
-					return attrib;
-				}
-			}
-		}
-		if ("WorkOrder".equals(featureName) && owner instanceof ProcessPackage) { //$NON-NLS-1$
-			return UmaPackage.eINSTANCE.getProcessPackage_ProcessElements();
-		}
-
-		return super.getNewFeature(owner, featureName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.persistence.migration.UMA2UMAResourceHandler#getNewOwner(org.eclipse.emf.ecore.EObject,
-	 *      java.lang.String)
-	 */
-	protected EObject getNewOwner(EObject oldOwner, String featureName) {
-		if ("presentationName".equals(featureName) && oldOwner instanceof ContentDescription) { //$NON-NLS-1$
-			DescribableElement de = ((DescribableElement) oldOwner.eContainer());
-			if (de instanceof Activity) {
-				return null;
-			}
-			return de;
-		}
-		if (procMovedFeatureNames.contains(featureName)
-				&& oldOwner instanceof ProcessElement) {
-			return ((ProcessElement) oldOwner).getPresentation();
-		}
-		if ("WorkOrder".equals(featureName) && oldOwner instanceof ProcessPackage) { //$NON-NLS-1$
-			return oldOwner;
-		}
-
-		return super.getNewOwner(oldOwner, featureName);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.persistence.migration.UMA2UMAResourceHandler#getNewValue(org.eclipse.emf.ecore.EObject, java.lang.String, org.eclipse.emf.ecore.xml.type.AnyType)
-	 */
-	protected Object getNewValue(EObject oldOwner, String featureName, AnyType value) {
-		if ("WorkOrder".equals(featureName) && oldOwner instanceof ProcessPackage) { //$NON-NLS-1$
-			WorkOrder workOrder = UmaFactory.eINSTANCE.createWorkOrder();
-			workOrder.setGuid((String) getSingleValue(value.getAnyAttribute(),
-					"guid")); //$NON-NLS-1$
-			String predGuid = (String) getSingleValue(value.getAnyAttribute(),
-					"pred"); //$NON-NLS-1$
-			if (predGuid == null) {
-				InternalEObject obj = (InternalEObject) getSingleValue(value
-						.getMixed(), "pred"); //$NON-NLS-1$
-				predGuid = obj.eProxyURI().authority();
-			}
-			MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) oldOwner
-					.eResource().getResourceSet();
-			WorkBreakdownElement pred = (WorkBreakdownElement) resourceSet
-					.getEObject(predGuid);
-			workOrder.setPred(pred);
-			workOrder.setLinkType(WorkOrderType.FINISH_TO_FINISH_LITERAL);
-			return workOrder;
-		}
-		return getText(value);
-	}
-
-	public void savePresentationURIFor(Set classNames) {
-		classNamesToSavePresentationURI = classNames;
-	}
-
-	public URI getPresentationURI(String guid) {
-		return (URI) guidToPresentationMap.get(guid);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.persistence.migration.MigrationResourceHandler#handleUnknownData(org.eclipse.emf.ecore.EObject, java.lang.Object)
-	 */
-	protected void handleUnknownData(EObject e, AnyType unknownData) {
-		super.handleUnknownData(e, unknownData);
-		
-		if (classNamesToSavePresentationURI != null
-				&& e instanceof ContentPackage) {
-			for (Iterator iter = getValue(unknownData.getMixed(), "contentElements").iterator(); iter.hasNext();) { //$NON-NLS-1$
-				AnyType value = (AnyType) iter.next();
-				if (value != null
-						&& classNamesToSavePresentationURI.contains(value
-								.eClass().getName())) {
-					Object presentation = getSingleValue(value.getMixed(),
-							"presentation"); //$NON-NLS-1$
-					if (presentation != null) {
-						Object guid = getSingleValue(value.getAnyAttribute(),
-								"guid"); //$NON-NLS-1$
-						URI uri = ((InternalEObject) presentation).eProxyURI();
-						guidToPresentationMap.put(guid, uri);
-					}
-				}
-			}
-		}		
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/internal/package.html b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/internal/package.html
deleted file mode 100755
index ff3e01a..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/internal/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the implemntation for upgrading a method library to a newer UMA version.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/package.html b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/package.html
deleted file mode 100755
index abf06d4..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces for upgrading a method library to a newer UMA version.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/package.html b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/package.html
deleted file mode 100755
index e6b07d7..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces and implementation for persisting a method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/IRefreshEvent.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/IRefreshEvent.java
deleted file mode 100755
index 0874ef2..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/IRefreshEvent.java
+++ /dev/null
@@ -1,43 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.refresh;
-
-import java.util.Collection;
-
-/**
- * Instance of this class provides data about a refresh event.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface IRefreshEvent {
-
-	/**
-	 * Gets resources that had been refreshed.
-	 * 
-	 * @return refreshed resources
-	 */
-	Collection getRefreshedResources();
-
-	/**
-	 * Gets objects that had been unloaded and become proxies after refresh
-	 * 
-	 * @return unloaded objects
-	 */
-	Collection getUnloadedObjects();
-
-	/**
-	 * Gets objects that had been refreshed.
-	 * 
-	 * @return refreshed objects
-	 */
-	Collection getRefreshedObjects();
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/IRefreshHandler.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/IRefreshHandler.java
deleted file mode 100755
index 649bbb9..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/IRefreshHandler.java
+++ /dev/null
@@ -1,26 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.refresh;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * Instance of this class will be notify about changes in resources so it can
- * react accordingly
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface IRefreshHandler {
-
-	void refresh(IProgressMonitor monitor);
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/IRefreshListener.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/IRefreshListener.java
deleted file mode 100755
index c413413..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/IRefreshListener.java
+++ /dev/null
@@ -1,23 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.refresh;
-
-/**
- * Instance of this class, if listening to refresh event, will get notified.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface IRefreshListener {
-
-	void notifyRefreshed(IRefreshEvent event);
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/RefreshJob.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/RefreshJob.java
deleted file mode 100755
index b64e4c3..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/RefreshJob.java
+++ /dev/null
@@ -1,511 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.refresh;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.epf.persistence.FileManager;
-import org.eclipse.epf.persistence.MultiFileResourceSetImpl;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.persistence.MultiFileXMIResourceImpl;
-import org.eclipse.epf.persistence.PersistencePlugin;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.MethodElement;
-
-/**
- * Background job that keeps notifying refresh handlers about changes in
- * resources
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class RefreshJob extends WorkspaceJob implements IResourceChangeListener {
-
-	private static final long UPDATE_DELAY = 200;
-
-	private static final boolean DEBUG = PersistencePlugin.getDefault().isDebugging();
-
-	private static final String DEBUG_PREFIX = "EPF Auto-refresh:"; //$NON-NLS-1$
-
-	private ResourceSet resourceSet;
-
-	private Collection addedResources = new UniqueEList();
-
-	private Collection changedResources = new UniqueEList();
-
-	private Collection removedResources = new UniqueEList();
-	
-	private Collection movedResources = new UniqueEList();
-
-	private UniqueEList savedResources = new UniqueEList();
-
-	private Collection loadedBeforeRefreshResources = new ArrayList();
-
-	private IRefreshHandler refreshHandler;
-
-	private boolean enabled = true;
-
-	private Collection addedWorkspaceResources = new UniqueEList();
-
-	private RefreshJob() {
-		super("EPF Auto-Refresh"); //$NON-NLS-1$
-	}
-
-	public void setEnabled(boolean b) {
-		enabled = b;
-	}
-
-	public boolean isEnabled() {
-		return enabled;
-	}
-
-	/**
-	 * @param resourceSet
-	 *            The resourceSet to set.
-	 */
-	public void setResourceSet(ResourceSet resourceSet) {
-		this.resourceSet = resourceSet;
-	}
-
-	public void setRefreshHandler(IRefreshHandler handler) {
-		refreshHandler = handler;
-	}
-
-	/**
-	 * Gets existing resources that reappear in workspaces
-	 * 
-	 * @return the addedResources
-	 */
-	public Collection getAddedResources() {
-		removeResources(addedResources, savedResources);
-		return addedResources;
-	}
-
-	public Collection getAddedWorkspaceResources() {
-		return addedWorkspaceResources;
-	}
-
-	/**
-	 * @return Returns the changedResources.
-	 */
-	public Collection getChangedResources() {
-		removeResources(changedResources, savedResources);
-		removeResources(changedResources, loadedBeforeRefreshResources);
-		return changedResources;
-	}
-
-	/**
-	 * Removes <code>resourcesToRemove</code> from <code>resources</code> if
-	 * the resources are synchronized with their storage.
-	 * 
-	 * @param resourcesToRemove
-	 */
-	private static void removeResources(Collection resources,
-			Collection resourcesToRemove) {
-		synchronized (resourcesToRemove) {
-			if (!resourcesToRemove.isEmpty()) {
-				for (Iterator iter = resourcesToRemove.iterator(); iter
-						.hasNext();) {
-					Object resource = iter.next();
-					boolean canRemove = true;
-					if (resource instanceof MultiFileXMIResourceImpl) {
-						MultiFileXMIResourceImpl mfResource = ((MultiFileXMIResourceImpl) resource);
-						long currentTime = new File(mfResource.getURI()
-								.toFileString()).lastModified();
-						canRemove = currentTime == mfResource
-								.getFileLastModified()
-								|| MultiFileSaveUtil.same(currentTime,
-										mfResource.getFileLastModified());
-					}
-					if (canRemove) {
-						if (resources.remove(resource)) {
-							iter.remove();
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @return Returns the removedResources.
-	 */
-	public Collection getRemovedResources() {
-		return removedResources;
-	}
-	
-	/**                                    
-	 * @return Returns the movedResources. 
-	 */                                    
-	public Collection getMovedResources() {
-		return movedResources;             
-	}                                      
-
-	public void resourceSaved(Resource resource) {
-		synchronized (savedResources) {
-			savedResources.add(resource);
-		}
-	}
-
-	/**
-	 * @return the loadedBeforeRefreshResources
-	 */
-	public Collection getReloadedBeforeRefreshResources() {
-		return loadedBeforeRefreshResources;
-	}
-
-	public void reset() {
-		changedResources.clear();
-		removedResources.clear();
-		movedResources.clear();
-		savedResources.clear();
-		loadedBeforeRefreshResources.clear();
-		addedResources.clear();
-		addedWorkspaceResources.clear();
-	}
-
-	private void scheduleRefresh() {
-		if (getState() == Job.NONE) {
-			schedule(UPDATE_DELAY);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see WorkspaceJob#runInWorkspace
-	 */
-	public IStatus runInWorkspace(IProgressMonitor monitor) {
-		if (refreshHandler == null)
-			return Status.OK_STATUS;
-
-		long start = System.currentTimeMillis();
-		Throwable error = null;
-		try {
-			if (DEBUG)
-				System.out.println(DEBUG_PREFIX + " starting refresh job"); //$NON-NLS-1$
-			monitor.beginTask("", IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-			if (monitor.isCanceled())
-				throw new OperationCanceledException();
-			try {
-				refreshHandler.refresh(monitor);
-			} catch (Throwable e) {
-				error = e;
-			}
-		} finally {
-			monitor.done();
-			if (DEBUG)
-				System.out
-						.println(DEBUG_PREFIX
-								+ " finished refresh job in: " + (System.currentTimeMillis() - start) + "ms"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		if (error != null)
-			return new Status(IStatus.ERROR, FileManager.PLUGIN_ID, 0,
-					"Refresh error", error); //$NON-NLS-1$
-		return Status.OK_STATUS;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.jobs.Job#shouldRun()
-	 */
-	public synchronized boolean shouldRun() {
-		return shouldRefresh();
-	}
-
-	private boolean shouldRefresh() {
-		return !removedResources.isEmpty() || !changedResources.isEmpty()
-				|| !addedResources.isEmpty() || !movedResources.isEmpty()
-				|| !loadedBeforeRefreshResources.isEmpty()
-				|| !addedWorkspaceResources.isEmpty();
-	}
-
-	/**
-	 * Starts the refresh job
-	 */
-	public void start() {
-		if (DEBUG) {
-			System.out.println("RefreshJob.start()"); //$NON-NLS-1$
-		}
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
-	}
-
-	/**
-	 * Stops the refresh job
-	 */
-	public void stop() {
-		if (DEBUG) {
-			System.out.println("RefreshJob.stop()"); //$NON-NLS-1$
-		}
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		cancel();
-	}
-
-	//TODO: move this method to a utility class and make it static
-	public Resource getResource(String path) {
-		URI uri = URI.createFileURI(path);
-		for (Iterator iter = new ArrayList(resourceSet.getResources())
-				.iterator(); iter.hasNext();) {
-			Resource resource = (Resource) iter.next();
-			if (uri.equals(resource.getURI())) {
-				return resource;
-			}
-		}
-		return null;
-	}
-
-	//TODO: move this method to a utility class and make it static
-	public Resource getResource(IResource wsRes) {
-		return getResource(wsRes.getLocation().toString());
-	}
-
-	/**
-	 * Checks if the given resource can be accepted as a new resource of
-	 * resource set of this refresh job that needs to be loaded.
-	 * 
-	 * @param resource
-	 * @return
-	 */
-	private boolean accept(IResource resource) {
-		if (resourceSet instanceof MultiFileResourceSetImpl) {
-			return ((MultiFileResourceSetImpl) resourceSet)
-					.isNewResourceToLoad(resource);
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-	 */
-	public void resourceChanged(IResourceChangeEvent event) {
-		if (!isEnabled() || resourceSet == null)
-			return;
-		IResourceDelta delta = event.getDelta();
-		if (delta == null)
-			return;
-		try {
-			class ResourceDeltaVisitor implements IResourceDeltaVisitor {
-				private Collection changedResources = new ArrayList();
-
-				private Collection removedResources = new ArrayList();
-				
-				private Collection movedResources = new ArrayList();
-
-				private Collection addedResources = new ArrayList();
-
-				private ArrayList addedWorkspaceResources = new ArrayList();
-
-				public boolean visit(IResourceDelta delta) throws CoreException {
-					Resource resource;
-					IPath path;
-					String loc;
-					if (delta.getFlags() != IResourceDelta.MARKERS
-							&& delta.getResource().getType() == IResource.FILE) {
-						switch (delta.getKind()) {
-						case IResourceDelta.ADDED:
-							// handle added resource
-							//
-							path = delta.getResource().getLocation();
-							if (path != null) {
-								loc = path.toString();
-								resource = getResource(loc);
-								if (resource != null) {
-									if (!resource.isLoaded()) {
-										// the resource was created but not
-										// loaded b/c the workspace resource
-										// was not added to the workspace at the
-										// time of loading
-										//
-										MethodElement me = PersistenceUtil
-												.getMethodElement(resource);
-										if (!(me instanceof ContentDescription)) {
-											// no auto-reload for content
-											// description
-											// MethodElementEditor will detect
-											// the change and load it
-											// when activated.
-											//
-											addedResources.add(resource);
-										}
-									}
-								} else if (accept(delta.getResource())) {
-									addedWorkspaceResources.add(delta
-											.getResource());
-								}
-							}
-							break;
-						case IResourceDelta.REMOVED:
-							if ((IResourceDelta.MOVED_TO & delta.getFlags()) != 0) {
-								// handle file move
-								path = delta.getResource().getLocation();             
-								if(path != null) {                                    
-									resource = getResource(path.toString());          
-									if (resource != null) {                           
-										movedResources.add(resource);                 
-									}                                                 
-								}                                                     
-								//
-								if (DEBUG) {
-									IPath movedFromPath = delta.getResource()
-											.getLocation();
-									IPath movedToPath = delta.getMovedToPath();
-									System.out
-											.println("Resource moved from '" + movedFromPath + "' to '" + movedToPath + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-								}
-
-							} else {
-								path = delta.getResource().getLocation();
-								if (path != null) {
-									resource = getResource(path.toString());
-									if (resource != null) {
-										removedResources.add(resource);
-									}
-								}
-							}
-							break;
-						case IResourceDelta.CHANGED:
-							boolean encodingChanged = ((IResourceDelta.ENCODING & delta
-									.getFlags()) != 0);
-							boolean contentChanged = ((IResourceDelta.CONTENT & delta
-									.getFlags()) != 0);
-							if (encodingChanged || contentChanged) {
-								path = delta.getResource().getLocation();
-								if (path != null) {
-									loc = path.toString();
-									resource = getResource(loc);
-									if (resource != null
-											&& MultiFileSaveUtil
-													.checkSynchronized(resource) != 1) {
-										changedResources.add(resource);
-									}
-								}
-							}
-							break;
-						}
-					}
-					// watch for project move                                                         
-					else if (delta.getFlags() != IResourceDelta.MARKERS                               
-							&& delta.getResource().getType() == IResource.PROJECT) {                  
-						// tested using the Move.. command in the Resource Navigator view             
-						// the REPLACED flag only seemed to occur when the library was moved          
-						// outside of EPF and EPF was re-started, so make sure it's clear, otherwise  
-						// we reload the library right after loading it when starting EPF             
-						if (delta.getKind() == IResourceDelta.CHANGED &&                              
-								((delta.getFlags() & IResourceDelta.REPLACED) == 0) &&                
-								((delta.getFlags() & IResourceDelta.DESCRIPTION) != 0)) {             
-							movedResources.add(delta.getResource());                                  
-									                                                                  
-						}                                                                             
-						return true;                                                                  
-					}                                                                                 
-					return true;
-				}
-
-				public Collection getChangedResources() {
-					return changedResources;
-				}
-
-				public Collection getRemovedResources() {
-					return removedResources;
-				}
-
-				public Collection getMovedResources() {    
-					return movedResources;                 
-				}                                          
-			};                                             
-
-			ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
-			delta.accept(visitor);
-
-			removedResources.addAll(visitor.getRemovedResources());
-			movedResources.addAll(visitor.getMovedResources());
-			changedResources.addAll(visitor.getChangedResources());
-			addedResources.addAll(visitor.addedResources);
-			addedWorkspaceResources.addAll(visitor.addedWorkspaceResources);
-
-			if (shouldRefresh()) {
-				scheduleRefresh();
-			}
-		} catch (CoreException e) {
-			CommonPlugin.INSTANCE.log(e);
-		}
-	}
-
-	/**
-	 * Resolves the proxy and its containers
-	 * 
-	 * TODO: move this method to a utility class and make it static
-	 * 
-	 * @param proxy
-	 * @return
-	 */
-	public EObject resolve(EObject proxy) {
-		EObject resolved;
-		try {
-			resolved = EcoreUtil.resolve(proxy, resourceSet);
-		} catch (Exception e) {
-			resolved = proxy;
-		}
-		EObject container = proxy.eContainer();
-		if (resolved.eContainer() == null && container != null) {
-			if (container.eIsProxy()) {
-				container = resolve(container);
-			}
-			EReference ref = proxy.eContainmentFeature();
-			if (ref.isMany()) {
-				List values = (List) container.eGet(ref);
-				for (Iterator iter = values.iterator(); iter.hasNext(); iter
-						.next())
-					;
-			} else {
-				container.eGet(ref);
-			}
-		}
-		return resolved;
-	}
-
-	public static RefreshJob getInstance() {
-		return instance;
-	}
-
-	private static RefreshJob instance = new RefreshJob();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/internal/RefreshEvent.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/internal/RefreshEvent.java
deleted file mode 100755
index 3f9d35b..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/internal/RefreshEvent.java
+++ /dev/null
@@ -1,76 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.refresh.internal;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.epf.persistence.refresh.IRefreshEvent;
-
-/**
- * Implementation class of IRefreshEvent
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class RefreshEvent implements IRefreshEvent {
-
-	private Collection refreshedResources;
-
-	private Collection unloadedObjects;
-	
-	private Collection refreshedObjects;
-
-	public RefreshEvent(Collection refreshedResources,
-			Collection unloadedObjects) {
-		this(refreshedResources, unloadedObjects, Collections.EMPTY_LIST);
-	}	
-
-	/**
-	 * @param refreshedResources
-	 * @param unloadedObjects
-	 * @param refreshedObjects
-	 */
-	public RefreshEvent(Collection refreshedResources, Collection unloadedObjects, Collection refreshedObjects) {
-		super();
-		this.refreshedResources = refreshedResources;
-		this.unloadedObjects = unloadedObjects;
-		this.refreshedObjects = refreshedObjects;
-	}
-
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.persistence.refresh.IRefreshEvent#getRefreshedResources()
-	 */
-	public Collection getRefreshedResources() {
-		return refreshedResources;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.persistence.refresh.IRefreshEvent#getUnloadedObjects()
-	 */
-	public Collection getUnloadedObjects() {
-		return unloadedObjects;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.persistence.refresh.IRefreshEvent#getRefreshedObjects()
-	 */
-	public Collection getRefreshedObjects() {
-		return refreshedObjects;
-	}
-	
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/internal/package.html b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/internal/package.html
deleted file mode 100755
index 03d7b48..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/internal/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the implementation for managing method library refreshes.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/package.html b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/package.html
deleted file mode 100755
index 9ab7c56..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/refresh/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces for managing method library refreshes.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/LibrarySchedulingRule.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/LibrarySchedulingRule.java
deleted file mode 100755
index 7f36bee..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/LibrarySchedulingRule.java
+++ /dev/null
@@ -1,82 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.util;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.MultiRule;
-import org.eclipse.epf.uma.MethodLibrary;
-
-/**
- * Scheduling rule used to lock a library during a operation and defer the
- * broadcasting of resource change event until the operation is finished.
- * 
- * @author Phong Nguyen Le - Aug 15, 2006
- * @since 1.0
- */
-public class LibrarySchedulingRule implements ISchedulingRule {
-	private MethodLibrary library;
-
-	/**
-	 * @param lib
-	 */
-	public LibrarySchedulingRule(MethodLibrary lib) {
-		this.library = lib;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.jobs.ISchedulingRule#contains(org.eclipse.core.runtime.jobs.ISchedulingRule)
-	 */
-	public boolean contains(ISchedulingRule rule) {
-		if (this == rule) {
-			return true;
-		}
-		if (rule instanceof LibrarySchedulingRule) {
-			return ((LibrarySchedulingRule) rule).library == library;
-		}
-		if (rule instanceof MultiRule) {
-			MultiRule mrule = (MultiRule) rule;
-			ISchedulingRule[] childRules = mrule.getChildren();
-			for (int i=0; i<childRules.length; i++) {
-				if (! (childRules[i] instanceof IResource)) {
-					return false;
-				}
-			}
-			return true;
-		}
-
-		// allow any IResource rule to nest within the same thread
-		//
-		return rule instanceof IResource;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.jobs.ISchedulingRule#isConflicting(org.eclipse.core.runtime.jobs.ISchedulingRule)
-	 */
-	public boolean isConflicting(ISchedulingRule rule) {
-		return equals(rule);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		return this == obj
-				|| (obj instanceof LibrarySchedulingRule && ((LibrarySchedulingRule) obj).library == library);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/PatternConstructor.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/PatternConstructor.java
deleted file mode 100755
index 6246e60..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/PatternConstructor.java
+++ /dev/null
@@ -1,186 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.util;
-
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-/**
- * Utility class with static methods to create search pattern
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class PatternConstructor {
-
-	private PatternConstructor() {
-		// don't instantiate
-	}
-
-	public static Pattern createPattern(String pattern,
-			boolean isCaseSensitive, boolean isRegex)
-			throws PatternSyntaxException {
-		return createPattern(pattern, isRegex, true, isCaseSensitive, false);
-	}
-
-	/**
-	 * Creates a pattern element from the pattern string which is either a
-	 * reg-ex expression or in our old 'StringMatcher' format.
-	 * 
-	 * @param pattern
-	 *            The search pattern
-	 * @param isRegex
-	 *            <code>true</code> if the passed string already is a reg-ex
-	 *            pattern
-	 * @param isStringMatcher
-	 *            <code>true</code> if the passed string is in the
-	 *            StringMatcher format.
-	 * @param isCaseSensitive
-	 *            Set to <code>true</code> to create a case insensitive
-	 *            pattern
-	 * @param isWholeWord
-	 *            <code>true</code> to create a pattern that requires a word
-	 *            boundary at the beginning and the end.
-	 * @return The created pattern
-	 * @throws PatternSyntaxException
-	 */
-	public static Pattern createPattern(String pattern, boolean isRegex,
-			boolean isStringMatcher, boolean isCaseSensitive,
-			boolean isWholeWord) throws PatternSyntaxException {
-		if (isRegex) {
-			if (isWholeWord) {
-				StringBuffer buffer = new StringBuffer(pattern.length() + 10);
-				buffer.append("\\b(?:").append(pattern).append(")\\b"); //$NON-NLS-1$ //$NON-NLS-2$
-				pattern = buffer.toString();
-			}
-		} else {
-			int len = pattern.length();
-			StringBuffer buffer = new StringBuffer(len + 10);
-			// don't add a word boundary if the search text does not start with
-			// a word char. (this works around a user input error).
-			if (isWholeWord && len > 0 && isWordChar(pattern.charAt(0))) {
-				buffer.append("\\b"); //$NON-NLS-1$
-			}
-			appendAsRegEx(isStringMatcher, pattern, buffer);
-			if (isWholeWord && len > 0 && isWordChar(pattern.charAt(len - 1))) {
-				buffer.append("\\b"); //$NON-NLS-1$
-			}
-			pattern = buffer.toString();
-		}
-
-		int regexOptions = Pattern.MULTILINE;
-		if (!isCaseSensitive) {
-			regexOptions |= Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE;
-		}
-		return Pattern.compile(pattern, regexOptions);
-	}
-
-	private static boolean isWordChar(char c) {
-		return Character.isLetterOrDigit(c);
-	}
-
-	/**
-	 * Creates a pattern element from an array of patterns in the old
-	 * 'StringMatcher' format.
-	 * 
-	 * @param patterns
-	 *            The search patterns
-	 * @param isCaseSensitive
-	 *            Set to <code>true</code> to create a case insensitive
-	 *            pattern
-	 * @return The created pattern
-	 * @throws PatternSyntaxException
-	 */
-	public static Pattern createPattern(String[] patterns,
-			boolean isCaseSensitive) throws PatternSyntaxException {
-		StringBuffer pattern = new StringBuffer();
-		for (int i = 0; i < patterns.length; i++) {
-			if (i > 0) {
-				// note that this works only as we know that the operands of the
-				// or expression will be simple and need no brackets.
-				pattern.append('|');
-			}
-			appendAsRegEx(true, patterns[i], pattern);
-		}
-		return createPattern(pattern.toString(), true, true, isCaseSensitive,
-				false);
-	}
-
-	public static StringBuffer appendAsRegEx(boolean isStringMatcher,
-			String pattern, StringBuffer buffer) {
-		boolean isEscaped = false;
-		for (int i = 0; i < pattern.length(); i++) {
-			char c = pattern.charAt(i);
-			switch (c) {
-			// the backslash
-			case '\\':
-				// the backslash is escape char in string matcher
-				if (isStringMatcher && !isEscaped) {
-					isEscaped = true;
-				} else {
-					buffer.append("\\\\"); //$NON-NLS-1$
-					isEscaped = false;
-				}
-				break;
-			// characters that need to be escaped in the regex.
-			case '(':
-			case ')':
-			case '{':
-			case '}':
-			case '.':
-			case '[':
-			case ']':
-			case '$':
-			case '^':
-			case '+':
-			case '|':
-				if (isEscaped) {
-					buffer.append("\\\\"); //$NON-NLS-1$
-					isEscaped = false;
-				}
-				buffer.append('\\');
-				buffer.append(c);
-				break;
-			case '?':
-				if (isStringMatcher && !isEscaped) {
-					buffer.append('.');
-				} else {
-					buffer.append('\\');
-					buffer.append(c);
-					isEscaped = false;
-				}
-				break;
-			case '*':
-				if (isStringMatcher && !isEscaped) {
-					buffer.append(".*"); //$NON-NLS-1$
-				} else {
-					buffer.append('\\');
-					buffer.append(c);
-					isEscaped = false;
-				}
-				break;
-			default:
-				if (isEscaped) {
-					buffer.append("\\\\"); //$NON-NLS-1$
-					isEscaped = false;
-				}
-				buffer.append(c);
-				break;
-			}
-		}
-		if (isEscaped) {
-			buffer.append("\\\\"); //$NON-NLS-1$
-			isEscaped = false;
-		}
-		return buffer;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/PersistenceResources.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/PersistenceResources.java
deleted file mode 100755
index 39cc886..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/PersistenceResources.java
+++ /dev/null
@@ -1,92 +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
- *******************************************************************************/
-package org.eclipse.epf.persistence.util;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Message bundle class for library persistence
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public final class PersistenceResources extends NLS {
-
-	private static String BUNDLE_NAME = PersistenceResources.class.getPackage()
-			.getName()
-			+ ".Resources"; //$NON-NLS-1$
-
-	private PersistenceResources() {
-		// Do not instantiate
-	}
-
-	public static String invalidNameError_msg;
-
-	public static String objNotFoundError_msg;
-
-	public static String loadLibraryError_msg;
-
-	public static String loadLibraryError_details;
-
-	public static String refreshLibraryFilesTask_name;
-
-	public static String restoreResourceError_msg;
-
-	public static String FileManager_fileReadOnly;
-
-	public static String ErrMsg_CouldNotDelete;
-
-	public static String renameError_msg;
-
-	public static String backupError_msg;
-
-	public static String marker_err_cannotResolveProxy;
-
-	public static String modifyFileError_msg;
-
-	public static String loadResourceError_msg;
-
-	public static String loadResourceErrorWithReason_msg;
-
-	public static String invalidLibraryFileError_msg;
-
-	public static String fileNotFoundError_msg;
-
-	public static String normalizeURIError_msg;
-
-	public static String moveError_msg;
-
-	public static String modifyReadOnlyFileError_msg;
-
-	public static String moveResourceError_msg;
-
-	public static String modifyFilesError_msg;
-
-	public static String resourceOutOfSynch_msg;
-
-	public static String loadLibraryTask_name;
-
-	public static String moveDataTask_name;
-
-	public static String saveLibraryTask_name;
-
-	public static String loadResourcesTask_name;
-
-	public static String migrateContentDescriptionsTask_name;
-
-	public static String fixPresentationNameTask_name;
-
-	public static String UnresolvedProxyMarkerManager_couldNotResolveProxy;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, PersistenceResources.class);
-	}
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/PersistenceUtil.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/PersistenceUtil.java
deleted file mode 100755
index 0db2152..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/PersistenceUtil.java
+++ /dev/null
@@ -1,158 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.epf.common.serviceability.EPFVersions;
-import org.eclipse.epf.common.serviceability.VersionUtil;
-import org.eclipse.epf.persistence.FileManager;
-import org.eclipse.epf.persistence.migration.internal.Migrator;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.UmaPackage;
-import org.osgi.framework.Version;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-/**
- * Utility class with static helper methods for library persistence
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class PersistenceUtil {
-
-	/**
-	 * Gets the current namespace URI of UMA.
-	 */
-	public static final String getUMANsURI() {
-		return UmaPackage.eNS_URI;
-	}
-
-	public static final String getUMANsURI(String libPath) {
-		try {
-			DocumentBuilder builder = DocumentBuilderFactory.newInstance()
-					.newDocumentBuilder();
-			Document doc = builder.parse(new File(libPath));
-			Element root = doc.getDocumentElement();
-			String nsURI = root.getAttribute("xmlns:com.ibm.uma"); //$NON-NLS-1$
-			if (nsURI == null || nsURI.equals("")) { //$NON-NLS-1$
-				nsURI = root.getAttribute("xmlns:org.eclipse.epf.uma"); //$NON-NLS-1$
-			}
-			return nsURI;
-		} catch (ParserConfigurationException e) {
-			e.printStackTrace();
-		} catch (FactoryConfigurationError e) {
-			e.printStackTrace();
-		} catch (SAXException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	public static final boolean conversionRequired(String libPath) {
-		String currentNsURI = PersistenceUtil.getUMANsURI();
-		String libNsURI = PersistenceUtil.getUMANsURI(libPath);
-		if (currentNsURI.equals(libNsURI))
-			return false;
-		if (Migrator.OLD_UMA_NS_URI.equals(libNsURI))
-			return true;
-		return false;
-	}
-
-	public static final IResource getWorkspaceResource(Object obj) {
-		Resource resource = null;
-		if (obj instanceof DescribableElement) {
-			DescribableElement e = (DescribableElement) obj;
-			ContentDescription content = e.getPresentation();
-			resource = content.eResource();
-			if (resource == null) {
-				resource = e.eResource();
-			}
-		} else if (obj instanceof EObject) {
-			resource = ((EObject) obj).eResource();
-		} else if (obj instanceof Resource) {
-			resource = (Resource) obj;
-		}
-		if (resource != null && resource.getURI().isFile()) {
-			return FileManager.getResourceForLocation(resource.getURI()
-					.toFileString());
-		}
-		return null;
-	}
-
-	public static final Collection<EObject> getProxies(EObject obj) {
-		Collection<EObject> proxies = new ArrayList<EObject>();
-		for (Iterator iter = obj.eAllContents(); iter.hasNext();) {
-			EObject o = (EObject) iter.next();
-			if (o.eIsProxy()) {
-				proxies.add(o);
-			}
-		}
-		return proxies;
-	}
-
-	/**
-	 * Checks the primary tool version stored in the given resource
-	 * 
-	 * @param resource
-	 * @return <li> < 0 if the version of the primary tool stored in the given resource is missing or older than current
-	 *         <li> 0 if the primary tool version in the given resource matches the current version
-	 *         <li> > 0 if  the primary tool version in the given resource is newer than the current version
-	 */
-	public static final int checkToolVersion(Resource resource) {
-		File file = new File(resource.getURI().toFileString());
-		Map fileVersionMap = VersionUtil.readVersionsFromFile(file);
-		if(fileVersionMap != null) {
-			String version = (String) fileVersionMap.get(VersionUtil.getPrimaryToolID());
-			if(version != null) {
-				EPFVersions versions = VersionUtil.getVersions(VersionUtil.getPrimaryToolID());
-				return versions.getCurrentVersion().compareToolVersionTo(new Version(version));
-			}
-		}
-		return -1;
-	}
-
-	/**
-	 * Gets the first method element in contents of the given resource.
-	 *  
-	 * @param resource
-	 * @return
-	 */
-	public static MethodElement getMethodElement(Resource resource) {
-		for (Iterator iter = resource.getContents().iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			if (element instanceof MethodElement) {
-				return (MethodElement) element;
-			}
-		}
-		return null;
-	}
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/Resources.properties b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/Resources.properties
deleted file mode 100755
index 2e2ada3..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/Resources.properties
+++ /dev/null
@@ -1,44 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Error Messages
-invalidNameError_msg=The name ''{0}'' is invalid. Method element name cannot contain these characters: \\ / : * ? " < > |
-objNotFoundError_msg=Could not find object with id ''{0}''
-loadLibraryError_msg=Errors encountered while loading method library:
-loadLibraryError_details=\ \ line: {0}, column: {1}, msg: {2}
-restoreResourceError_msg=Could not restore resource ''{0}''
-FileManager_fileReadOnly=File ''{0}'' is read-only
-ErrMsg_CouldNotDelete=Could not delete {0}. {1}
-renameError_msg=Could not rename ''{0}'' to ''{1}''
-backupError_msg=Could not backup up resource ''{0}''
-marker_err_cannotResolveProxy=Could not resolve proxy {0}
-modifyFileError_msg=Cannot modify file ''{0}''
-loadResourceError_msg=Could not load resource ''{0}''
-loadResourceErrorWithReason_msg=Could not load resource ''{0}''. Reason: {1}
-invalidLibraryFileError_msg=Invalid method library file:
-fileNotFoundError_msg=Could not locate any method library file in workspace ''{0}''
-normalizeURIError_msg=Could not find the normalized URI for ''{0}''
-moveError_msg=Could not move ''{0}'' to ''{1}''. The destination already exists.
-modifyReadOnlyFileError_msg=Cannot modify read-only file(s): {0}
-moveResourceError_msg=Resource ''{0}'' is involved in a persistence operation that has not been committed.
-modifyFilesError_msg=Could not modify one or more files
-resourceOutOfSynch_msg=Resource is out of synch and needs to be reloaded: {0}
-
-# Progress Messages
-loadLibraryTask_name=Loading method library...
-moveDataTask_name=Moving the data...
-saveLibraryTask_name=Saving method library...
-loadResourcesTask_name=Loading all resources into memory...
-migrateContentDescriptionsTask_name=Migrating process content descriptions...
-fixPresentationNameTask_name=Setting null/empty presentation name of every breakdown element to its name...
-UnresolvedProxyMarkerManager_couldNotResolveProxy=Could not resolve proxy ''{0}''
-refreshLibraryFilesTask_name=Refreshing library files in workspace
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/UnresolvedProxyMarkerManager.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/UnresolvedProxyMarkerManager.java
deleted file mode 100755
index be7d41e..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/UnresolvedProxyMarkerManager.java
+++ /dev/null
@@ -1,759 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.persistence.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-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.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.epf.persistence.FileManager;
-import org.eclipse.epf.persistence.MultiFileResourceSetImpl;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.persistence.PersistencePlugin;
-import org.eclipse.epf.uma.ecore.IProxyResolutionListener;
-import org.eclipse.epf.uma.ecore.ResolveException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.osgi.util.NLS;
-
-
-/**
- * Background job that manage markers for unresolved proxies
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class UnresolvedProxyMarkerManager extends WorkspaceJob implements IProxyResolutionListener {
-
-	private static final long DELAY = 0;
-	public static final String PROXY_URI = "proxyURI"; //$NON-NLS-1$
-	public static final String OWNER_GUID = "ownerGUID"; //$NON-NLS-1$
-	
-	private static class ValidObject {
-		boolean valid;
-		Object object;
-		
-		/**
-		 * @param valid
-		 * @param object
-		 */
-		public ValidObject(Object object) {
-			super();
-			this.object = object;
-			valid = true;			
-		}
-				
-	}
-	
-	private Map uriToExceptionsMap;
-	private List exceptions;
-	private Map resourceGUIToMarkersMap;
-	private Map elementGUIToMarkersMap;
-	private ResourceSet resourceSet;
-	private boolean enabled;
-	private List resourcesToValidateMarkers;
-
-	public UnresolvedProxyMarkerManager(ResourceSet resourceSet) {
-		super("EPF Unresolved Proxy Logger"); //$NON-NLS-1$		
-		this.resourceSet = resourceSet;
-//		unresolvedResourceGUIDToMarkersMap = new HashMap();
-		uriToExceptionsMap = new HashMap();
-		exceptions = new ArrayList(); 
-		resourceGUIToMarkersMap = new HashMap();
-		elementGUIToMarkersMap = new HashMap();
-		resourcesToValidateMarkers = new UniqueEList();
-	}
-
-	public IMarker findMarker(IFile file, String proxyURI, int start, int end) throws CoreException {
-		IMarker[] markers = file.findMarkers(IMarker.PROBLEM, false, IResource.DEPTH_ZERO);
-		for (int i = 0; i < markers.length; i++) {
-			IMarker marker = markers[i];
-			if(proxyURI.equals(marker.getAttribute(PROXY_URI))
-					&& marker.getAttribute(IMarker.CHAR_START, -1) == start
-					&& marker.getAttribute(IMarker.CHAR_END, -1) == end) 
-			{
-				return marker;
-			}
-		}
-		return null;
-	}
-
-	private boolean addException(ResolveException re) {
-		synchronized(exceptions) {
-			URI uri = ((InternalEObject)re.getProxy()).eProxyURI();
-			Set exceptions = (Set) uriToExceptionsMap.get(uri);		
-			if(exceptions == null) {
-				exceptions = new HashSet();
-				uriToExceptionsMap.put(uri, exceptions);
-			}
-			if(exceptions.add(re)) {
-				this.exceptions.add(re);
-				return true;
-			}
-			return false;
-		}
-	}
-	
-	/**
-	 * Document based character sequence.
-	 */
-	private static class DocumentCharSequence implements CharSequence {
-
-		/** Document */
-		private IDocument fDocument;
-
-		/**
-		 * Initialize with the sequence of characters in the given
-		 * document.
-		 *
-		 * @param document the document
-		 */
-		public DocumentCharSequence(IDocument document) {
-			fDocument= document;
-		}
-
-		/*
-		 * @see java.lang.CharSequence#length()
-		 */
-		public int length() {
-			return fDocument.getLength();
-		}
-
-		/*
-		 * @see java.lang.CharSequence#charAt(int)
-		 */
-		public char charAt(int index) {
-			try {
-				return fDocument.getChar(index);
-			} catch (BadLocationException x) {
-				throw new IndexOutOfBoundsException(x.getLocalizedMessage());
-			}
-		}
-
-		/*
-		 * @see java.lang.CharSequence#subSequence(int, int)
-		 */
-		public CharSequence subSequence(int start, int end) {
-			try {
-				return fDocument.get(start, end - start);
-			} catch (BadLocationException x) {
-				throw new IndexOutOfBoundsException(x.getLocalizedMessage());
-			}
-		}
-	}
-	
-	private void addMarker(Resource resource, URI proxyURI, String errMsg, String ownerGUID, IProgressMonitor monitor) {
-		URI containerURI = resource.getURI();
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		IPath path = new Path(containerURI.toFileString());
-		IFile file = workspace.getRoot().getFileForLocation(path);
-		if (file != null) {
-			String location = containerURI != null ? containerURI
-					.toFileString() : ""; //$NON-NLS-1$
-			
-			try {
-				file.refreshLocal(IResource.DEPTH_ZERO, null);
-				
-				// locate the text of unresolved URI in file
-				//
-				ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();
-				try {
-					manager.connect(path, monitor);
-					ITextFileBuffer fileBuffer= manager.getTextFileBuffer(path);
-					fileBuffer.requestSynchronizationContext();
-					fileBuffer.getDocument();
-					IDocument doc = fileBuffer.getDocument();
-					if(doc != null) {
-						String proxyURIStr = proxyURI.toString();
-						Pattern pattern = PatternConstructor.createPattern(proxyURIStr, true, false);
-						Matcher matcher = pattern.matcher(new DocumentCharSequence(doc));
-						while(matcher.find()) {
-							int start = matcher.start();
-							int end = matcher.end();
-							if(start != end) {
-								// make sure that resolver is still in the open library by checking whether its resource
-								// still belongs to a resource set
-								//
-								if(resource != null && resource.getResourceSet() != null) {
-									// create problem marker for file
-									IMarker marker = findMarker(file, proxyURIStr, start, end);
-									if(marker == null) {
-										marker = file.createMarker(IMarker.PROBLEM);
-										marker.setAttribute(IMarker.SEVERITY,
-												IMarker.SEVERITY_ERROR);
-										marker.setAttribute(IMarker.MESSAGE, errMsg);
-										marker.setAttribute(IMarker.LOCATION, location);
-										marker.setAttribute(IMarker.TRANSIENT, true);
-										marker.setAttribute(IMarker.CHAR_START, start);	
-										marker.setAttribute(IMarker.CHAR_END, end);
-										marker.setAttribute(PROXY_URI, proxyURIStr);
-										marker.setAttribute(OWNER_GUID, ownerGUID);
-
-										// cache marker to it can be found easily and deleted
-										//
-										cacheMarker(marker, proxyURI);
-									}
-									else {
-										// update owner GUID
-										//
-										marker.setAttribute(OWNER_GUID, ownerGUID);
-									}
-								}
-							}
-						}
-					}
-					fileBuffer.releaseSynchronizationContext();
-				}
-				finally {
-					manager.disconnect(path, monitor);
-				}
-			} catch (CoreException ex) {
-				CommonPlugin.INSTANCE.log(ex);
-				if (MultiFileSaveUtil.DEBUG) {
-					ex.printStackTrace();
-				}
-			}
-		}
-	}
-	
-	private void addMarker(ResolveException re, IProgressMonitor monitor) {
-		InternalEObject proxy = (InternalEObject) re.getProxy();
-		URI containerURI = null;
-		Resource resource = null;
-		if(re.getResolver() != null) {
-			resource = re.getResolver().eResource();
-			
-			// make sure that resolver is still in the open library by checking whether its resource
-			// still belongs to a resource set
-			//
-//			System.out.println("UnresolvedProxyMarkerManager.addMarker(): resourceSet=" + resource.getResourceSet().hashCode());
-			if(resource != null && resource.getResourceSet() != null) {				
-				containerURI = resource.getURI();
-			}
-		}				
-		if (containerURI != null) {
-			IWorkspace workspace = ResourcesPlugin.getWorkspace();
-			IPath path = new Path(containerURI.toFileString());
-			IFile file = workspace.getRoot().getFileForLocation(path);
-			if (file != null) {
-				String errMsg;
-				if (re.exception() != null && re.exception().getLocalizedMessage() != null && 
-						re.exception().getLocalizedMessage().trim().length() > 0) {
-					errMsg = re.exception().getLocalizedMessage();
-				}
-				else {
-					errMsg = re.getMessage() == null ? NLS.bind(PersistenceResources.UnresolvedProxyMarkerManager_couldNotResolveProxy, proxy.eProxyURI()) : re
-								.getMessage();
-				}
-				addMarker(resource, proxy.eProxyURI(), errMsg, MultiFileSaveUtil.getGuid(re.getResolver()), monitor);
-			}
-		}
-	}
-
-	/**
-	 * @param marker
-	 * @param uri proxy uri 
-	 */
-	private void cacheMarker(IMarker marker, URI uri) {
-		synchronized(elementGUIToMarkersMap) {
-			String resourceGUID = uri.authority();
-			if(resourceGUID != null) {
-				ValidObject vo = (ValidObject) resourceGUIToMarkersMap.get(resourceGUID);
-				if(vo == null) {
-					vo = new ValidObject(new HashSet());
-					resourceGUIToMarkersMap.put(resourceGUID, vo);
-				}
-				Collection markers = (Collection) vo.object;
-				markers.add(marker);
-			}
-			String elementGUID = uri.fragment();
-			Collection markers = (Collection) elementGUIToMarkersMap.get(elementGUID);
-			if(markers == null) {
-				markers = new HashSet();
-				elementGUIToMarkersMap.put(elementGUID, markers);
-			}
-			markers.add(new ValidObject(marker));
-		}
-	}
-
-	public void clearAll() {
-		boolean oldEnabled = enabled;
-		try {
-			enabled = false;
-			cancel();
-
-			synchronized (exceptions) {
-				uriToExceptionsMap.clear();
-				exceptions.clear();
-			}
-			synchronized(elementGUIToMarkersMap) {
-				if(!elementGUIToMarkersMap.isEmpty()) {
-					for (Iterator iter = elementGUIToMarkersMap.values().iterator(); iter.hasNext();) {
-						Collection markers = (Collection) iter.next();
-						for (Iterator iter1 = markers.iterator(); iter1.hasNext();) {
-							ValidObject vo = (ValidObject) iter1.next();
-							IMarker marker = (IMarker) vo.object;
-							try {
-								if(marker.exists()) {
-									marker.delete();
-								}
-							}
-							catch(Exception e) {
-								CommonPlugin.INSTANCE.log(e);
-							}
-						}
-						markers.clear();
-					}
-					elementGUIToMarkersMap.clear();
-					resourceGUIToMarkersMap.clear();
-				}	
-			}
-			synchronized(resourcesToValidateMarkers) {
-				resourcesToValidateMarkers.clear();
-			}
-		}
-		finally {
-			enabled = oldEnabled;
-//			System.out.println("UnresolvedProxyMarkerManager.clearAll(): end");
-		}
-	}
-
-	public boolean hasUnresolvedProxy() {
-		return !elementGUIToMarkersMap.isEmpty();
-	}
-	
-	private ResolveException nextException() {
-		synchronized(exceptions) {			
-			// synchronized: in order to atomically obtain and clear requests
-			if(exceptions.isEmpty()) {
-				return null;
-			}
-			else {
-				ResolveException e = (ResolveException) this.exceptions.remove(0);
-				URI uri = ((InternalEObject)e.getProxy()).eProxyURI();
-				Collection exceptions = (Collection) uriToExceptionsMap.get(uri);
-				if(exceptions != null) {
-					exceptions.remove(e);
-					if(exceptions.isEmpty()) {
-						uriToExceptionsMap.remove(uri);
-					}
-				}
-				return e;
-			}
-		}
-	}
-	
-	private Resource nextResourceToValidateMarkers() {
-		synchronized(resourcesToValidateMarkers) {
-			if(resourcesToValidateMarkers.isEmpty()) {
-				return null;
-			}
-			else {
-				return (Resource) resourcesToValidateMarkers.remove(0);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.WorkspaceJob#runInWorkspace(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
-//		System.out.println("UnresolvedProxyMarkerManager.runInWorkspace(): begin");
-		try {
-		if(!enabled) return Status.OK_STATUS;
-
-		try {
-			// add markers
-			//
-			ResolveException re;
-			while((re = nextException()) != null) {
-				try {
-					addMarker(re, monitor);
-				}
-				catch(Exception e) {
-					CommonPlugin.INSTANCE.log(e);
-				}
-			}
-
-			// remove invalid markers
-			//
-			removeMarkers(monitor);
-			
-			// validate resource markers
-			//
-			Resource resource;
-			while((resource = nextResourceToValidateMarkers()) != null) {
-				doValidateMarkers(resource);
-			}
-		}
-		catch(Exception e) {
-			CommonPlugin.INSTANCE.log(e);
-		}
-		
-		return Status.OK_STATUS;
-		}
-		finally {
-//			System.out.println("UnresolvedProxyMarkerManager.runInWorkspace(): end");
-		}
-	}
-	
-	private boolean removeFromResourceGUIDToMarkersMap(String proxyURI, IMarker marker) {
-		URI uri = URI.createURI(proxyURI);
-		String resourceGUID = uri.authority();
-		if(resourceGUID != null) {
-			ValidObject vo = (ValidObject) resourceGUIToMarkersMap.get(resourceGUID);
-			if(vo != null) {
-				Collection markers = ((Collection)vo.object);
-				boolean ret = markers.remove(marker);
-				if(markers.isEmpty()) {
-					resourceGUIToMarkersMap.remove(resourceGUID);
-				}
-				return ret;
-			}
-		}
-		return false;
-	}
-	
-	private void removeFromElementGUIDToMarkersMap(String proxyURI, IMarker marker) {
-		URI uri = URI.createURI(proxyURI);
-		String elementGUID = uri.fragment();
-		if(elementGUID != null) {
-			Collection validObjects = (Collection) elementGUIToMarkersMap.get(elementGUID);
-			if(validObjects != null) {
-				for (Iterator iterator1 = validObjects.iterator(); iterator1
-				.hasNext();) {
-					ValidObject vo1 = (ValidObject) iterator1.next();
-					if(vo1.object == marker) {
-						iterator1.remove();
-					}
-				}
-				if(validObjects.isEmpty()) {
-					elementGUIToMarkersMap.remove(elementGUID);
-				}	
-			}
-		}
-	}
-	
-	private void removeMarkers(IProgressMonitor monitor) {
-		synchronized(elementGUIToMarkersMap) {
-		for (Iterator iter = elementGUIToMarkersMap.values().iterator(); iter.hasNext();) {
-			Collection markers = (Collection) iter.next();
-			for (Iterator iterator = markers.iterator(); iterator.hasNext();) {
-				ValidObject vo = (ValidObject) iterator.next();
-				if(!vo.valid) {
-					try {
-						IMarker marker = (IMarker) vo.object;
-						if(marker.exists()) {
-							String proxyURI = (String) marker.getAttribute(PROXY_URI);
-
-							marker.delete();
-
-							// remove this marker from resourceGUIToMarkersMap
-							//
-							removeFromResourceGUIDToMarkersMap(proxyURI, marker);
-						}
-						iterator.remove();
-
-					} catch (Exception e) {
-						CommonPlugin.INSTANCE.log(e);
-					}
-				}
-			}
-		}
-		for (Iterator iter = resourceGUIToMarkersMap.values().iterator(); iter.hasNext();) {
-			ValidObject vo = (ValidObject) iter.next();
-			if(!vo.valid) {
-				vo.valid = true;
-				Collection markers = (Collection) vo.object;
-				for (Iterator iterator = markers.iterator(); iterator.hasNext();) {
-					IMarker marker;
-					try {
-						marker = (IMarker) iterator.next();
-						if(marker.exists()) {
-							String proxyURIStr = (String) marker.getAttribute(PROXY_URI);
-							URI proxyURI = URI.createURI(proxyURIStr);
-
-							// proxy is in the same resource that is just loaded 
-							// try to get the object with this proxy URI without loading new resource
-							//
-//							EObject o = resourceSet.getEObject(proxyURI, false);
-							String elementGUID = proxyURI.fragment();							
-							EObject o = (EObject) ((MultiFileResourceSetImpl)resourceSet).getGuidToMethodElementMap().get(elementGUID);
-							if(o != null && !o.eIsProxy()) {
-								marker.delete();
-								iterator.remove();	
-
-								// remove this marker from elementGUIToMarkersMap
-								//
-								removeFromElementGUIDToMarkersMap(proxyURIStr, marker);
-							}
-						}
-						else {
-							iterator.remove();
-						}
-					}
-					catch(Exception e) {
-						CommonPlugin.INSTANCE.log(e);
-					}
-				}
-				if(markers.isEmpty()) {
-					iter.remove();
-				}
-			}
-		}
-		}
-	}
-	
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.ecore.IProxyResolutionListener#notifyException(java.lang.Exception)
-	 */
-	public void notifyException(Exception e) {
-		if(!enabled) return;
-		
-		if(e instanceof ResolveException) {
-			ResolveException re = (ResolveException) e;
-			
-//			URI uri = ((InternalEObject)re.getProxy()).eProxyURI();
-//			if("_2J4YoPTDEdmkpYARNN468A".equals(uri.fragment())) {
-//				System.out.println();
-//			}
-			
-			if(addException(re)) {			
-				schedule(DELAY);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.ecore.IProxyResolutionListener#proxyResolved(java.lang.Object, java.lang.Object)
-	 */
-	public void proxyResolved(Object proxy, Object resolved) {
-		if(!enabled) return;
-		
-		if(proxy instanceof InternalEObject) {
-			URI uri = ((InternalEObject)proxy).eProxyURI();
-			
-//			if("_2J4YoPTDEdmkpYARNN468A".equals(uri.fragment())) {
-//				System.out.println();
-//			}
-			
-			// remove all exceptions for this URI
-			//
-			removeExceptions(uri);
-			
-			// invalidate all markers for this URI
-			//
-			if(invalidateMarkers(uri)) {
-				schedule(DELAY);
-			}						
-		}		
-	}
-	
-	/**
-	 * @param uri
-	 */
-	private boolean invalidateMarkers(URI uri) {
-		synchronized(elementGUIToMarkersMap) {
-			boolean ret = false;
-			String resourceGUID = uri.authority();
-			if(resourceGUID != null) {
-				ValidObject vo = (ValidObject) resourceGUIToMarkersMap.get(resourceGUID);
-				if(vo != null) {
-					vo.valid = false;
-					ret = true;
-				}
-			}
-			String elementGUID = uri.fragment();
-			if(elementGUID != null) {
-				Collection markers = (Collection) elementGUIToMarkersMap.get(elementGUID);
-				if(markers != null && !markers.isEmpty()) {
-					ret = true;
-					for (Iterator iter = markers.iterator(); iter.hasNext();) {
-						ValidObject vo = (ValidObject) iter.next();
-						vo.valid = false;
-					}
-				}
-			}
-			return ret;
-		}
-	}
-
-	/**
-	 * @param uri
-	 */
-	private void removeExceptions(URI uri) {
-		synchronized (exceptions) {
-			Collection exceptions = (Collection) uriToExceptionsMap.get(uri);
-			if(exceptions == null || exceptions.isEmpty()) return;
-			this.exceptions.removeAll(exceptions);
-			uriToExceptionsMap.remove(uri);
-		}
-	}
-
-	/**
-	 * Clears markers for unresolved proxies of the given resource
-	 *  
-	 * @param resource
-	 */
-	public void clearMarkers(Resource resource) {
-		try {
-			IResource file = FileManager.getResourceForLocation(resource.getURI().toFileString());
-			if(file instanceof IFile) {
-				IMarker[] markers = file.findMarkers(IMarker.PROBLEM, false, IResource.DEPTH_ZERO);
-				for (int i = 0; i < markers.length; i++) {
-					IMarker marker = markers[i];
-					removeMarker(marker);
-				}
-			}
-		}
-		catch(Exception e) {
-			PersistencePlugin.getDefault().getLogger().logError(e);
-		}
-	}
-	
-	public void removeMarker(IMarker marker) {
-		String proxyURI = null;
-		try {
-			if(marker.exists()) {
-				proxyURI = (String) marker.getAttribute(PROXY_URI);
-				marker.delete();
-			}
-		} catch (Exception e) {
-			PersistencePlugin.getDefault().getLogger().logError(e);
-		}
-		if(proxyURI != null) {
-			synchronized(elementGUIToMarkersMap) {
-				removeFromElementGUIDToMarkersMap(proxyURI, marker);
-				removeFromResourceGUIDToMarkersMap(proxyURI, marker);
-			}
-		}		
-	}
-
-	private static class MarkerInfo {
-		String proxyURI;
-		String ownerGUID;
-		String message;
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
-		public boolean equals(Object obj) {
-			if(obj instanceof MarkerInfo) {
-				MarkerInfo info = (MarkerInfo) obj;
-				if(proxyURI != null && ownerGUID != null && proxyURI.equals(info.proxyURI) && ownerGUID.equals(info.ownerGUID)) {
-					return true;
-				}
-			}
-			return super.equals(obj);
-		}
-	}
-	
-	/**
-	 * Validates markers for unresolved proxies of the given resource
-	 * 
-	 * @param resource
-	 */
-	public void validateMarkers(Resource resource) {
-		boolean newlyAdded = false;
-		synchronized(resourcesToValidateMarkers) {
-			newlyAdded = resourcesToValidateMarkers.add(resource);
-		}
-		if(newlyAdded) {
-			schedule(DELAY);
-		}
-	}
-	
-	private void doValidateMarkers(Resource resource) {
-		try {
-			IResource file = FileManager.getResourceForLocation(resource.getURI().toFileString());
-			if(file instanceof IFile) {
-				IMarker[] markers = file.findMarkers(IMarker.PROBLEM, false, IResource.DEPTH_ZERO);
-				HashSet markerInfos = new HashSet();				
-				for (int i = 0; i < markers.length; i++) {
-					IMarker marker = markers[i];
-					String proxyURI = (String) marker.getAttribute(PROXY_URI);
-					if(proxyURI != null) {
-						URI uri = URI.createURI(proxyURI);
-						// try to get the object with this proxy URI without loading new resource
-						//
-						String elementGUID = uri.fragment();							
-						EObject o = (EObject) ((MultiFileResourceSetImpl)resourceSet).getGuidToMethodElementMap().get(elementGUID);
-						if(o == null || o.eIsProxy()) {
-							MarkerInfo info = new MarkerInfo();
-							info.message = (String) marker.getAttribute(IMarker.MESSAGE);
-							info.ownerGUID = (String) marker.getAttribute(OWNER_GUID);
-							info.proxyURI = proxyURI;
-							markerInfos.add(info);						
-						}
-						
-						if(marker.exists()) {
-							try {
-								marker.delete();
-							}
-							catch(Exception e) {
-								PersistencePlugin.getDefault().getLogger().logError(e);									
-							}
-						}
-						synchronized(elementGUIToMarkersMap) {
-							removeFromElementGUIDToMarkersMap(proxyURI, marker);
-							removeFromResourceGUIDToMarkersMap(proxyURI, marker);
-						}
-
-					}
-				}
-				if(!markerInfos.isEmpty()) {
-					for (Iterator iter = markerInfos.iterator(); iter.hasNext();) {
-						MarkerInfo info = (MarkerInfo) iter.next();
-						addMarker(resource, URI.createURI(info.proxyURI), info.message, info.ownerGUID, new NullProgressMonitor());
-					}
-				}
-			}
-		}
-		catch(Exception e) {
-			PersistencePlugin.getDefault().getLogger().logError(e);		
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/package.html b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/package.html
deleted file mode 100755
index 4b3fa09..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/util/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides implementation support for persisting a method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/ResourceDescriptor.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/ResourceDescriptor.java
deleted file mode 100755
index 794c238..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/ResourceDescriptor.java
+++ /dev/null
@@ -1,99 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.resourcemanager;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.sdo.EDataObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Resource Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.resourcemanager.ResourceDescriptor#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.epf.resourcemanager.ResourceDescriptor#getUri <em>Uri</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.resourcemanager.ResourcemanagerPackage#getResourceDescriptor()
- * @model
- * @extends EDataObject
- * @generated
- */
-public interface ResourceDescriptor extends EDataObject {
-	
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Id</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.epf.resourcemanager.ResourcemanagerPackage#getResourceDescriptor_Id()
-	 * @model
-	 * @generated
-	 */
-    String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.resourcemanager.ResourceDescriptor#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-    void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Uri</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-	 * @return the value of the '<em>Uri</em>' attribute.
-	 * @see #setUri(String)
-	 * @see org.eclipse.epf.resourcemanager.ResourcemanagerPackage#getResourceDescriptor_Uri()
-	 * @model
-	 * @generated
-	 */
-    String getUri();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.resourcemanager.ResourceDescriptor#getUri <em>Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Uri</em>' attribute.
-	 * @see #getUri()
-	 * @generated
-	 */
-    void setUri(String value);
-
-    URI getResolvedURI();
-    
-    void setResolvedURI(URI uri);
-	
-	/**
-	 * Clears the resolved URI that has been cached in previous called of getResolvedURI()
-	 * so the next call to getResolvedURI() will update the resolvedURI.
-	 *
-	 */
-	void clearResolvedURI();
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/ResourceManager.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/ResourceManager.java
deleted file mode 100755
index d17fb11..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/ResourceManager.java
+++ /dev/null
@@ -1,147 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.resourcemanager;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.sdo.EDataObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Resource Manager</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.resourcemanager.ResourceManager#getGuid <em>Guid</em>}</li>
- *   <li>{@link org.eclipse.epf.resourcemanager.ResourceManager#getUriBase <em>Uri Base</em>}</li>
- *   <li>{@link org.eclipse.epf.resourcemanager.ResourceManager#getSubManagers <em>Sub Managers</em>}</li>
- *   <li>{@link org.eclipse.epf.resourcemanager.ResourceManager#getResourceDescriptors <em>Resource Descriptors</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.resourcemanager.ResourcemanagerPackage#getResourceManager()
- * @model
- * @extends EDataObject
- * @generated
- */
-public interface ResourceManager extends EDataObject {
-	
-	/**
-	 * Returns the value of the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Guid</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Guid</em>' attribute.
-	 * @see #setGuid(String)
-	 * @see org.eclipse.epf.resourcemanager.ResourcemanagerPackage#getResourceManager_Guid()
-	 * @model
-	 * @generated
-	 */
-	String getGuid();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.resourcemanager.ResourceManager#getGuid <em>Guid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Guid</em>' attribute.
-	 * @see #getGuid()
-	 * @generated
-	 */
-	void setGuid(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Uri Base</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Uri Base</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Uri Base</em>' attribute.
-	 * @see #setUriBase(String)
-	 * @see org.eclipse.epf.resourcemanager.ResourcemanagerPackage#getResourceManager_UriBase()
-	 * @model
-	 * @generated
-	 */
-	String getUriBase();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.resourcemanager.ResourceManager#getUriBase <em>Uri Base</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Uri Base</em>' attribute.
-	 * @see #getUriBase()
-	 * @generated
-	 */
-	void setUriBase(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Sub Managers</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.resourcemanager.ResourceManager}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sub Managers</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sub Managers</em>' containment reference list.
-	 * @see org.eclipse.epf.resourcemanager.ResourcemanagerPackage#getResourceManager_SubManagers()
-	 * @model type="org.eclipse.epf.resourcemanager.ResourceManager" containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	List getSubManagers();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Descriptors</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.resourcemanager.ResourceDescriptor}.
-	 * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Resource Descriptors</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resource Descriptors</em>' containment reference list.
-	 * @see org.eclipse.epf.resourcemanager.ResourcemanagerPackage#getResourceManager_ResourceDescriptors()
-	 * @model type="org.eclipse.epf.resourcemanager.ResourceDescriptor" containment="true" resolveProxies="true"
-	 * @generated
-	 */
-    List getResourceDescriptors();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Gets direct ResourceDescriptor whose id is the given guid
-	 * <!-- end-model-doc -->
-	 * @model
-	 * @generated
-	 */
-	ResourceDescriptor getResourceDescriptor(String guid);
-
-    /**
-     * Removes the ResourceDescriptor identified by the given uri. If clearFolder is true, this call will remove
-     * all other ResourceDescriptors whose URI shares the same folder of the given uri.
-     * 
-     * @param uri
-     * @param clearFolder
-     * @return
-     */
-    List removeResourceDescriptor(URI uri, boolean clearFolder);
-
-	void dispose();
-	
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/ResourcemanagerFactory.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/ResourcemanagerFactory.java
deleted file mode 100755
index 8886cac..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/ResourcemanagerFactory.java
+++ /dev/null
@@ -1,60 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.resourcemanager;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.resourcemanager.ResourcemanagerPackage
- * @generated
- */
-public interface ResourcemanagerFactory extends EFactory {
-	
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    ResourcemanagerFactory eINSTANCE = org.eclipse.epf.resourcemanager.impl.ResourcemanagerFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Resource Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Resource Descriptor</em>'.
-	 * @generated
-	 */
-    ResourceDescriptor createResourceDescriptor();
-
-	/**
-	 * Returns a new object of class '<em>Resource Manager</em>'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Resource Manager</em>'.
-	 * @generated
-	 */
-    ResourceManager createResourceManager();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-    ResourcemanagerPackage getResourcemanagerPackage();
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/ResourcemanagerPackage.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/ResourcemanagerPackage.java
deleted file mode 100755
index 03e19ae..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/ResourcemanagerPackage.java
+++ /dev/null
@@ -1,338 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.resourcemanager;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.resourcemanager.ResourcemanagerFactory
- * @model kind="package"
- * @generated
- */
-public interface ResourcemanagerPackage extends EPackage {
-	
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    String eNAME = "resourcemanager"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    String eNS_URI = "http:///org/eclipse/epf/uma/resourcemanager.ecore"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    String eNS_PREFIX = "org.eclipse.epf.uma.resourcemanager"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    ResourcemanagerPackage eINSTANCE = org.eclipse.epf.resourcemanager.impl.ResourcemanagerPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.resourcemanager.impl.ResourceDescriptorImpl <em>Resource Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.resourcemanager.impl.ResourceDescriptorImpl
-	 * @see org.eclipse.epf.resourcemanager.impl.ResourcemanagerPackageImpl#getResourceDescriptor()
-	 * @generated
-	 */
-    int RESOURCE_DESCRIPTOR = 0;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int RESOURCE_DESCRIPTOR__ID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int RESOURCE_DESCRIPTOR__URI = 1;
-
-	/**
-	 * The number of structural features of the '<em>Resource Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int RESOURCE_DESCRIPTOR_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.resourcemanager.impl.ResourceManagerImpl <em>Resource Manager</em>}' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.resourcemanager.impl.ResourceManagerImpl
-	 * @see org.eclipse.epf.resourcemanager.impl.ResourcemanagerPackageImpl#getResourceManager()
-	 * @generated
-	 */
-    int RESOURCE_MANAGER = 1;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_MANAGER__GUID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Uri Base</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_MANAGER__URI_BASE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Sub Managers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_MANAGER__SUB_MANAGERS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Resource Descriptors</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int RESOURCE_MANAGER__RESOURCE_DESCRIPTORS = 3;
-
-	/**
-	 * The number of structural features of the '<em>Resource Manager</em>' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int RESOURCE_MANAGER_FEATURE_COUNT = 4;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.resourcemanager.ResourceDescriptor <em>Resource Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Resource Descriptor</em>'.
-	 * @see org.eclipse.epf.resourcemanager.ResourceDescriptor
-	 * @generated
-	 */
-    EClass getResourceDescriptor();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.resourcemanager.ResourceDescriptor#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.epf.resourcemanager.ResourceDescriptor#getId()
-	 * @see #getResourceDescriptor()
-	 * @generated
-	 */
-    EAttribute getResourceDescriptor_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.resourcemanager.ResourceDescriptor#getUri <em>Uri</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Uri</em>'.
-	 * @see org.eclipse.epf.resourcemanager.ResourceDescriptor#getUri()
-	 * @see #getResourceDescriptor()
-	 * @generated
-	 */
-    EAttribute getResourceDescriptor_Uri();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.resourcemanager.ResourceManager <em>Resource Manager</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Resource Manager</em>'.
-	 * @see org.eclipse.epf.resourcemanager.ResourceManager
-	 * @generated
-	 */
-    EClass getResourceManager();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.resourcemanager.ResourceManager#getGuid <em>Guid</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Guid</em>'.
-	 * @see org.eclipse.epf.resourcemanager.ResourceManager#getGuid()
-	 * @see #getResourceManager()
-	 * @generated
-	 */
-	EAttribute getResourceManager_Guid();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.resourcemanager.ResourceManager#getUriBase <em>Uri Base</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Uri Base</em>'.
-	 * @see org.eclipse.epf.resourcemanager.ResourceManager#getUriBase()
-	 * @see #getResourceManager()
-	 * @generated
-	 */
-	EAttribute getResourceManager_UriBase();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.resourcemanager.ResourceManager#getSubManagers <em>Sub Managers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Sub Managers</em>'.
-	 * @see org.eclipse.epf.resourcemanager.ResourceManager#getSubManagers()
-	 * @see #getResourceManager()
-	 * @generated
-	 */
-	EReference getResourceManager_SubManagers();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.resourcemanager.ResourceManager#getResourceDescriptors <em>Resource Descriptors</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource Descriptors</em>'.
-	 * @see org.eclipse.epf.resourcemanager.ResourceManager#getResourceDescriptors()
-	 * @see #getResourceManager()
-	 * @generated
-	 */
-    EReference getResourceManager_ResourceDescriptors();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-    ResourcemanagerFactory getResourcemanagerFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.resourcemanager.impl.ResourceDescriptorImpl <em>Resource Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.resourcemanager.impl.ResourceDescriptorImpl
-		 * @see org.eclipse.epf.resourcemanager.impl.ResourcemanagerPackageImpl#getResourceDescriptor()
-		 * @generated
-		 */
-		EClass RESOURCE_DESCRIPTOR = eINSTANCE.getResourceDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_DESCRIPTOR__ID = eINSTANCE.getResourceDescriptor_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Uri</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_DESCRIPTOR__URI = eINSTANCE.getResourceDescriptor_Uri();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.resourcemanager.impl.ResourceManagerImpl <em>Resource Manager</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.resourcemanager.impl.ResourceManagerImpl
-		 * @see org.eclipse.epf.resourcemanager.impl.ResourcemanagerPackageImpl#getResourceManager()
-		 * @generated
-		 */
-		EClass RESOURCE_MANAGER = eINSTANCE.getResourceManager();
-
-		/**
-		 * The meta object literal for the '<em><b>Guid</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_MANAGER__GUID = eINSTANCE.getResourceManager_Guid();
-
-		/**
-		 * The meta object literal for the '<em><b>Uri Base</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RESOURCE_MANAGER__URI_BASE = eINSTANCE.getResourceManager_UriBase();
-
-		/**
-		 * The meta object literal for the '<em><b>Sub Managers</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESOURCE_MANAGER__SUB_MANAGERS = eINSTANCE.getResourceManager_SubManagers();
-
-		/**
-		 * The meta object literal for the '<em><b>Resource Descriptors</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RESOURCE_MANAGER__RESOURCE_DESCRIPTORS = eINSTANCE.getResourceManager_ResourceDescriptors();
-
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/impl/ResourceDescriptorImpl.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/impl/ResourceDescriptorImpl.java
deleted file mode 100755
index e60e82e..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/impl/ResourceDescriptorImpl.java
+++ /dev/null
@@ -1,274 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.resourcemanager.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.resourcemanager.ResourceDescriptor;
-import org.eclipse.epf.resourcemanager.ResourcemanagerPackage;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Resource Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.resourcemanager.impl.ResourceDescriptorImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.epf.resourcemanager.impl.ResourceDescriptorImpl#getUri <em>Uri</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ResourceDescriptorImpl extends MultiResourceEObject implements ResourceDescriptor {
-	
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3256725082662385462L;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-    protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-    protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getUri() <em>Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #getUri()
-	 * @generated
-	 * @ordered
-	 */
-    protected static final String URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUri() <em>Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #getUri()
-	 * @generated
-	 * @ordered
-	 */
-    protected String uri = URI_EDEFAULT;
-
-	protected URI resolvedURI;
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected ResourceDescriptorImpl() {
-		super();
-  
- //UMA-->
- 		reassignDefaultValues();
- //UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected EClass eStaticClass() {
-		return ResourcemanagerPackage.Literals.RESOURCE_DESCRIPTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ResourcemanagerPackage.RESOURCE_DESCRIPTOR__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 */
-    public String getUri() {
-		if(resolvedURI != null && (uri == null || uri.startsWith("../"))) { //$NON-NLS-1$
-			uri = resolvedURI.deresolve(MultiFileSaveUtil.getFinalURI(eResource())).toString();
-		}
-		return uri;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public void setUri(String newUri) {
-		String oldUri = uri;
-		uri = newUri;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ResourcemanagerPackage.RESOURCE_DESCRIPTOR__URI, oldUri, uri));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ResourcemanagerPackage.RESOURCE_DESCRIPTOR__ID:
-				return getId();
-			case ResourcemanagerPackage.RESOURCE_DESCRIPTOR__URI:
-				return getUri();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ResourcemanagerPackage.RESOURCE_DESCRIPTOR__ID:
-				setId((String)newValue);
-				return;
-			case ResourcemanagerPackage.RESOURCE_DESCRIPTOR__URI:
-				setUri((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ResourcemanagerPackage.RESOURCE_DESCRIPTOR__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case ResourcemanagerPackage.RESOURCE_DESCRIPTOR__URI:
-				setUri(URI_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if(feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-//UMA<--		
-		switch (featureID) {
-			case ResourcemanagerPackage.RESOURCE_DESCRIPTOR__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case ResourcemanagerPackage.RESOURCE_DESCRIPTOR__URI:
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: "); //$NON-NLS-1$
-		result.append(id);
-		result.append(", uri: "); //$NON-NLS-1$
-		result.append(uri);
-		result.append(')');
-		return result.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.resourcemanager.ResourceDescriptor#getURI()
-	 */
-	public URI getResolvedURI() {
-		if(resolvedURI == null) {
-			URI base = MultiFileSaveUtil.getFinalURI(eResource());
-			resolvedURI = URI.createURI(getUri()).resolve(base);
-		}
-		return resolvedURI;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.resourcemanager.ResourceDescriptor#setURI(org.eclipse.emf.common.util.URI)
-	 */
-	public void setResolvedURI(URI uri) {		
-		resolvedURI = uri;
-		String newUri = null;
-		if(resolvedURI != null) {
-			Resource resource = eResource();	
-			if(resource != null) {
-				URI baseURI = MultiFileSaveUtil.getFinalURI(resource);
-				newUri = resolvedURI.deresolve(baseURI).toString();
-			}
-		}
-		setUri(newUri);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.resourcemanager.ResourceDescriptor#clearResolvedURI()
-	 */
-	public void clearResolvedURI() {
-		resolvedURI = null;
-	}
-	
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/impl/ResourceManagerImpl.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/impl/ResourceManagerImpl.java
deleted file mode 100755
index 8f062fd..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/impl/ResourceManagerImpl.java
+++ /dev/null
@@ -1,481 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.resourcemanager.impl;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.resourcemanager.ResourceDescriptor;
-import org.eclipse.epf.resourcemanager.ResourceManager;
-import org.eclipse.epf.resourcemanager.ResourcemanagerPackage;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-import org.eclipse.epf.uma.util.UmaUtil;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Resource Manager</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.resourcemanager.impl.ResourceManagerImpl#getGuid <em>Guid</em>}</li>
- *   <li>{@link org.eclipse.epf.resourcemanager.impl.ResourceManagerImpl#getUriBase <em>Uri Base</em>}</li>
- *   <li>{@link org.eclipse.epf.resourcemanager.impl.ResourceManagerImpl#getSubManagers <em>Sub Managers</em>}</li>
- *   <li>{@link org.eclipse.epf.resourcemanager.impl.ResourceManagerImpl#getResourceDescriptors <em>Resource Descriptors</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ResourceManagerImpl extends MultiResourceEObject implements ResourceManager {
-	
-	private static final long serialVersionUID = -5164471475509169204L;
-
-	/**
-	 * The default value of the '{@link #getGuid() <em>Guid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGuid()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String GUID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getGuid() <em>Guid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGuid()
-	 * @generated
-	 * @ordered
-	 */
-	protected String guid = GUID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getUriBase() <em>Uri Base</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUriBase()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String URI_BASE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUriBase() <em>Uri Base</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUriBase()
-	 * @generated
-	 * @ordered
-	 */
-	protected String uriBase = URI_BASE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getSubManagers() <em>Sub Managers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubManagers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList subManagers = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceDescriptors() <em>Resource Descriptors</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #getResourceDescriptors()
-	 * @generated
-	 * @ordered
-	 */
-    protected EList resourceDescriptors = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 */
-    protected ResourceManagerImpl() {
-		super();
-		
-		guid = UmaUtil.generateGUID();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected EClass eStaticClass() {
-		return ResourcemanagerPackage.Literals.RESOURCE_MANAGER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getGuid() {
-		return guid;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGuid(String newGuid) {
-		String oldGuid = guid;
-		guid = newGuid;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ResourcemanagerPackage.RESOURCE_MANAGER__GUID, oldGuid, guid));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getUriBase() {
-		return uriBase;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUriBase(String newUriBase) {
-		String oldUriBase = uriBase;
-		uriBase = newUriBase;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ResourcemanagerPackage.RESOURCE_MANAGER__URI_BASE, oldUriBase, uriBase));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSubManagers() {
-		if (subManagers == null) {
-			subManagers = new EObjectContainmentEList.Resolving(ResourceManager.class, this, ResourcemanagerPackage.RESOURCE_MANAGER__SUB_MANAGERS);
-		}
-		return subManagers;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public List getResourceDescriptors() {
-		if (resourceDescriptors == null) {
-			resourceDescriptors = new EObjectContainmentEList.Resolving(ResourceDescriptor.class, this, ResourcemanagerPackage.RESOURCE_MANAGER__RESOURCE_DESCRIPTORS);
-		}
-		return resourceDescriptors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (guid: "); //$NON-NLS-1$
-		result.append(guid);
-		result.append(", uriBase: "); //$NON-NLS-1$
-		result.append(uriBase);
-		result.append(')');
-		return result.toString();
-	}
-
-	//
-	// Start custom code
-	//
-
-	/* (non-Javadoc)
-	 * @see com.ibm.umaf.ecore.impl.MultiResourceEObject#eResolveProxy(org.eclipse.emf.ecore.InternalEObject)
-	 */
-	public EObject eResolveProxy(InternalEObject proxy) {
-		return super.eResolveProxy(proxy);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.resourcemanager.ResourceManager#resolve()
-	 */
-	public void resolve() {
-		URI base = MultiFileSaveUtil.getFinalURI(eResource());
-        for (Iterator iter = getResourceDescriptors().iterator(); iter.hasNext();) {
-            ResourceDescriptorImpl desc = (ResourceDescriptorImpl) iter.next();
-            desc.resolvedURI = URI.createURI(desc.getUri()).resolve(base);
-        }
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.resourcemanager.ResourceManager#deresolve()
-	 */
-	public void deresolve() {
-		URI base = MultiFileSaveUtil.getFinalURI(eResource());
-        // convert path in all descriptors to relative
-        //
-        for (Iterator iter = getResourceDescriptors().iterator(); iter.hasNext();) {
-            ResourceDescriptor desc = (ResourceDescriptor) iter.next();
-            desc.setUri(desc.getResolvedURI().deresolve(base).toString());
-        }
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.resourcemanager.ResourceManager#removeResourceDescriptor(org.eclipse.emf.common.util.URI, boolean)
-	 */
-	public List removeResourceDescriptor(URI uri, boolean clearFolder) {
-		ArrayList removedList = new ArrayList();
-//		ResourceDescriptor removedDescriptor = null;
-        for (Iterator iter = getResourceDescriptors().iterator(); iter.hasNext();) {
-            ResourceDescriptor desc = (ResourceDescriptor) iter.next();
-            if(uri.equals(desc.getResolvedURI().trimFragment())) {
-                iter.remove();
-//                removedDescriptor = desc;
-                removedList.add(desc);
-            }
-        }
-//        if(removedDescriptor != null) {        	
-        	if(clearFolder) {
-                // remove all child descriptors of the removed descriptor
-        		//
-        		String oldDir = new File(uri.toFileString()).getParent() + File.separator;
-        		for (Iterator iter = getResourceDescriptors().iterator(); iter.hasNext();) {
-        			ResourceDescriptor desc = (ResourceDescriptor) iter.next();
-        			if(desc.getResolvedURI().toFileString().startsWith(oldDir)) {
-        				iter.remove();
-        				removedList.add(desc);
-        			}
-        		}
-        	}
-//        	else {
-//        		// remove all the descriptors of the same resource
-//        		//
-//        		URI resUri = removedDescriptor.getResolvedURI().trimFragment();
-//        		for (Iterator iter = getResourceDescriptors().iterator(); iter.hasNext();) {
-//        			ResourceDescriptor desc = (ResourceDescriptor) iter.next();
-//        			if(desc.getResolvedURI().trimFragment().equals(resUri)) {
-//        				iter.remove();
-//        				removedList.add(desc);
-//        			}
-//        		}        		
-//        	}
-//        }
-        return removedList;
-	}	
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public ResourceDescriptor getResourceDescriptor(String guid) {
-		if(idToResourceDescriptorMap == null) {
-			idToResourceDescriptorMap = new HashMap();
-			
-			eAdapters().add(new AdapterImpl() {
-		        public void notifyChanged(Notification msg) {
-		            ResourceDescriptor desc;
-		            switch(msg.getFeatureID(ResourceManager.class)) {
-		                case ResourcemanagerPackage.RESOURCE_MANAGER__RESOURCE_DESCRIPTORS:
-		                    switch(msg.getEventType()) {
-		                        case Notification.ADD:
-		                            desc = (ResourceDescriptor)msg.getNewValue();
-									idToResourceDescriptorMap.put(desc.getId(), desc);
-		                            return;
-		                        case Notification.ADD_MANY:
-		                            for (Iterator iter = ((Collection)msg.getNewValue()).iterator(); iter
-		                                    .hasNext();) {
-										desc = (ResourceDescriptor) iter.next();
-										idToResourceDescriptorMap.put(desc.getId(), desc);
-		                            }
-		                            return;
-		                        case Notification.REMOVE:
-		                            idToResourceDescriptorMap.remove(((ResourceDescriptor)msg.getOldValue()).getId());
-		                            return;
-		                        case Notification.REMOVE_MANY:
-		                            for (Iterator iter = ((Collection)msg.getOldValue()).iterator(); iter
-		                                    .hasNext();) {
-		                                idToResourceDescriptorMap.remove(((ResourceDescriptor) iter.next()).getId());
-		                            }
-		                            return;
-		                    }
-		            }
-		        }
-
-			});
-			
-			// populate the map
-			//
-			for (Iterator iter = getResourceDescriptors().iterator(); iter.hasNext();) {
-				ResourceDescriptor element = (ResourceDescriptor) iter.next();
-				idToResourceDescriptorMap.put(element.getId(), element);
-			}
-		}
-		
-		return (ResourceDescriptor) idToResourceDescriptorMap.get(guid);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ResourcemanagerPackage.RESOURCE_MANAGER__SUB_MANAGERS:
-				return ((InternalEList)getSubManagers()).basicRemove(otherEnd, msgs);
-			case ResourcemanagerPackage.RESOURCE_MANAGER__RESOURCE_DESCRIPTORS:
-				return ((InternalEList)getResourceDescriptors()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ResourcemanagerPackage.RESOURCE_MANAGER__GUID:
-				return getGuid();
-			case ResourcemanagerPackage.RESOURCE_MANAGER__URI_BASE:
-				return getUriBase();
-			case ResourcemanagerPackage.RESOURCE_MANAGER__SUB_MANAGERS:
-				return getSubManagers();
-			case ResourcemanagerPackage.RESOURCE_MANAGER__RESOURCE_DESCRIPTORS:
-				return getResourceDescriptors();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ResourcemanagerPackage.RESOURCE_MANAGER__GUID:
-				setGuid((String)newValue);
-				return;
-			case ResourcemanagerPackage.RESOURCE_MANAGER__URI_BASE:
-				setUriBase((String)newValue);
-				return;
-			case ResourcemanagerPackage.RESOURCE_MANAGER__SUB_MANAGERS:
-				getSubManagers().clear();
-				getSubManagers().addAll((Collection)newValue);
-				return;
-			case ResourcemanagerPackage.RESOURCE_MANAGER__RESOURCE_DESCRIPTORS:
-				getResourceDescriptors().clear();
-				getResourceDescriptors().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ResourcemanagerPackage.RESOURCE_MANAGER__GUID:
-				setGuid(GUID_EDEFAULT);
-				return;
-			case ResourcemanagerPackage.RESOURCE_MANAGER__URI_BASE:
-				setUriBase(URI_BASE_EDEFAULT);
-				return;
-			case ResourcemanagerPackage.RESOURCE_MANAGER__SUB_MANAGERS:
-				getSubManagers().clear();
-				return;
-			case ResourcemanagerPackage.RESOURCE_MANAGER__RESOURCE_DESCRIPTORS:
-				getResourceDescriptors().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if(feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-//UMA<--		
-		switch (featureID) {
-			case ResourcemanagerPackage.RESOURCE_MANAGER__GUID:
-				return GUID_EDEFAULT == null ? guid != null : !GUID_EDEFAULT.equals(guid);
-			case ResourcemanagerPackage.RESOURCE_MANAGER__URI_BASE:
-				return URI_BASE_EDEFAULT == null ? uriBase != null : !URI_BASE_EDEFAULT.equals(uriBase);
-			case ResourcemanagerPackage.RESOURCE_MANAGER__SUB_MANAGERS:
-				return subManagers != null && !subManagers.isEmpty();
-			case ResourcemanagerPackage.RESOURCE_MANAGER__RESOURCE_DESCRIPTORS:
-				return resourceDescriptors != null && !resourceDescriptors.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.resourcemanager.ResourceManager#dispose()
-	 */
-	public void dispose() {
-		if(idToResourceDescriptorMap != null) {
-			idToResourceDescriptorMap.clear();
-			idToResourceDescriptorMap = null;
-		}
-		
-		eAdapters().clear();		
-		
-		// dispose the sub managers
-		//
-		for (Iterator iter = ((InternalEList)getSubManagers()).basicIterator(); iter.hasNext();) {
-			ResourceManager subMgr = (ResourceManager) iter.next();
-			if(!((InternalEObject)subMgr).eIsProxy()) {
-				subMgr.dispose();
-			}
-		}
-	}
-
-	private Map idToResourceDescriptorMap;
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/impl/ResourcemanagerFactoryImpl.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/impl/ResourcemanagerFactoryImpl.java
deleted file mode 100755
index 17f5daa..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/impl/ResourcemanagerFactoryImpl.java
+++ /dev/null
@@ -1,113 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.resourcemanager.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.epf.resourcemanager.ResourceDescriptor;
-import org.eclipse.epf.resourcemanager.ResourceManager;
-import org.eclipse.epf.resourcemanager.ResourcemanagerFactory;
-import org.eclipse.epf.resourcemanager.ResourcemanagerPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ResourcemanagerFactoryImpl extends EFactoryImpl implements ResourcemanagerFactory {
-	
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResourcemanagerFactory init() {
-		try {
-			ResourcemanagerFactory theResourcemanagerFactory = (ResourcemanagerFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/epf/uma/resourcemanager.ecore"); //$NON-NLS-1$ 
-			if (theResourcemanagerFactory != null) {
-				return theResourcemanagerFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ResourcemanagerFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public ResourcemanagerFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ResourcemanagerPackage.RESOURCE_DESCRIPTOR: return (EObject)createResourceDescriptor();
-			case ResourcemanagerPackage.RESOURCE_MANAGER: return (EObject)createResourceManager();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public ResourceDescriptor createResourceDescriptor() {
-		ResourceDescriptorImpl resourceDescriptor = new ResourceDescriptorImpl();
-		return resourceDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public ResourceManager createResourceManager() {
-		ResourceManagerImpl resourceManager = new ResourceManagerImpl();
-		return resourceManager;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public ResourcemanagerPackage getResourcemanagerPackage() {
-		return (ResourcemanagerPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-    public static ResourcemanagerPackage getPackage() {
-		return ResourcemanagerPackage.eINSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/impl/ResourcemanagerPackageImpl.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/impl/ResourcemanagerPackageImpl.java
deleted file mode 100755
index 845b729..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/impl/ResourcemanagerPackageImpl.java
+++ /dev/null
@@ -1,268 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.resourcemanager.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.epf.resourcemanager.ResourceDescriptor;
-import org.eclipse.epf.resourcemanager.ResourceManager;
-import org.eclipse.epf.resourcemanager.ResourcemanagerFactory;
-import org.eclipse.epf.resourcemanager.ResourcemanagerPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ResourcemanagerPackageImpl extends EPackageImpl implements ResourcemanagerPackage {
-	
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    private EClass resourceDescriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    private EClass resourceManagerEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.epf.resourcemanager.ResourcemanagerPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-    private ResourcemanagerPackageImpl() {
-		super(eNS_URI, ResourcemanagerFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-    public static ResourcemanagerPackage init() {
-		if (isInited) return (ResourcemanagerPackage)EPackage.Registry.INSTANCE.getEPackage(ResourcemanagerPackage.eNS_URI);
-
-		// Obtain or create and register package
-		ResourcemanagerPackageImpl theResourcemanagerPackage = (ResourcemanagerPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ResourcemanagerPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ResourcemanagerPackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theResourcemanagerPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theResourcemanagerPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theResourcemanagerPackage.freeze();
-
-		return theResourcemanagerPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EClass getResourceDescriptor() {
-		return resourceDescriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EAttribute getResourceDescriptor_Id() {
-		return (EAttribute)resourceDescriptorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EAttribute getResourceDescriptor_Uri() {
-		return (EAttribute)resourceDescriptorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EClass getResourceManager() {
-		return resourceManagerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResourceManager_Guid() {
-		return (EAttribute)resourceManagerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResourceManager_UriBase() {
-		return (EAttribute)resourceManagerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResourceManager_SubManagers() {
-		return (EReference)resourceManagerEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EReference getResourceManager_ResourceDescriptors() {
-		return (EReference)resourceManagerEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public ResourcemanagerFactory getResourcemanagerFactory() {
-		return (ResourcemanagerFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		resourceDescriptorEClass = createEClass(RESOURCE_DESCRIPTOR);
-		createEAttribute(resourceDescriptorEClass, RESOURCE_DESCRIPTOR__ID);
-		createEAttribute(resourceDescriptorEClass, RESOURCE_DESCRIPTOR__URI);
-
-		resourceManagerEClass = createEClass(RESOURCE_MANAGER);
-		createEAttribute(resourceManagerEClass, RESOURCE_MANAGER__GUID);
-		createEAttribute(resourceManagerEClass, RESOURCE_MANAGER__URI_BASE);
-		createEReference(resourceManagerEClass, RESOURCE_MANAGER__SUB_MANAGERS);
-		createEReference(resourceManagerEClass, RESOURCE_MANAGER__RESOURCE_DESCRIPTORS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(resourceDescriptorEClass, ResourceDescriptor.class, "ResourceDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getResourceDescriptor_Id(), ecorePackage.getEString(), "id", null, 0, 1, ResourceDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getResourceDescriptor_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, ResourceDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(resourceManagerEClass, ResourceManager.class, "ResourceManager", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getResourceManager_Guid(), ecorePackage.getEString(), "guid", null, 0, 1, ResourceManager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getResourceManager_UriBase(), ecorePackage.getEString(), "uriBase", null, 0, 1, ResourceManager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getResourceManager_SubManagers(), this.getResourceManager(), null, "subManagers", null, 0, -1, ResourceManager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getResourceManager_ResourceDescriptors(), this.getResourceDescriptor(), null, "resourceDescriptors", null, 0, -1, ResourceManager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		EOperation op = addEOperation(resourceManagerEClass, this.getResourceDescriptor(), "getResourceDescriptor", 0, 1); //$NON-NLS-1$
-		addEParameter(op, ecorePackage.getEString(), "guid", 0, 1); //$NON-NLS-1$
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/impl/package.html b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/impl/package.html
deleted file mode 100755
index 34b0d36..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/impl/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the implementation for managing XMI resources in a method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/package.html b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/package.html
deleted file mode 100755
index 34afc53..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces for managing XMI resources in a method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/resourcemanager.ecore b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/resourcemanager.ecore
deleted file mode 100755
index b41c8b5..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/resourcemanager.ecore
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="resourcemanager"
-    nsURI="http:///org/eclipse/epf/uma/resourcemanager.ecore" nsPrefix="org.eclipse.epf.uma.resourcemanager">
-  <eClassifiers xsi:type="ecore:EClass" name="ResourceDescriptor">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ResourceManager">
-    <eOperations name="getResourceDescriptor" eType="#//ResourceDescriptor">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Gets direct ResourceDescriptor whose id is the given guid"/>
-      </eAnnotations>
-      <eParameters name="guid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="guid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uriBase" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subManagers" upperBound="-1"
-        eType="#//ResourceManager" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="resourceDescriptors" upperBound="-1"
-        eType="#//ResourceDescriptor" containment="true"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/resourcemanager.genmodel b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/resourcemanager.genmodel
deleted file mode 100755
index acb79c7..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/resourcemanager.genmodel
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.epf.library.persistence/src"
-    editDirectory="/org.eclipse.epf.resourcemanager.edit/src" editorDirectory="/org.eclipse.epf.resourcemanager.editor/src"
-    modelPluginID="org.eclipse.epf.resourcemanager" templateDirectory="/org.eclipse.epf.uma.ecore/templates"
-    runtimeJar="true" dynamicTemplates="true" modelName="Resourcemanager" editPluginClass="org.eclipse.epf.resourcemanager.provider.ResourcemanagerEditPlugin"
-    editorPluginClass="org.eclipse.epf.resourcemanager.presentation.ResourcemanagerEditorPlugin"
-    nonNLSMarkers="true" rootExtendsInterface="org.eclipse.emf.ecore.sdo.EDataObject"
-    rootExtendsClass="org.eclipse.epf.uma.ecore.impl.MultiResourceEObject" rootImplementsInterface="org.eclipse.emf.ecore.sdo.InternalEDataObject"
-    suppressEMFTypes="true" featureMapWrapperInterface="commonj.sdo.Sequence" featureMapWrapperInternalInterface="org.eclipse.emf.ecore.sdo.util.ESequence"
-    featureMapWrapperClass="org.eclipse.emf.ecore.sdo.util.BasicESequence" containmentProxies="true">
-  <foreignModel>C:\CC_Views\ple_TNG_Authoring\tng_authoring\TNG UML Models\resourcemanager.mdl</foreignModel>
-  <staticPackages>http://www.eclipse.org/emf/2003/SDO</staticPackages>
-  <modelPluginVariables>EMF_COMMONJ_SDO=org.eclipse.emf.commonj.sdo</modelPluginVariables>
-  <modelPluginVariables>EMF_ECORE_SDO=org.eclipse.emf.ecore.sdo</modelPluginVariables>
-  <genPackages prefix="Resourcemanager" basePackage="org.eclipse.epf" ecorePackage="resourcemanager.ecore#/">
-    <genClasses ecoreClass="resourcemanager.ecore#//ResourceDescriptor">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute resourcemanager.ecore#//ResourceDescriptor/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute resourcemanager.ecore#//ResourceDescriptor/uri"/>
-    </genClasses>
-    <genClasses ecoreClass="resourcemanager.ecore#//ResourceManager">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute resourcemanager.ecore#//ResourceManager/guid"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute resourcemanager.ecore#//ResourceManager/uriBase"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference resourcemanager.ecore#//ResourceManager/subManagers"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference resourcemanager.ecore#//ResourceManager/resourceDescriptors"/>
-      <genOperations ecoreOperation="resourcemanager.ecore#//ResourceManager/getResourceDescriptor">
-        <genParameters ecoreParameter="resourcemanager.ecore#//ResourceManager/getResourceDescriptor/guid"/>
-      </genOperations>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/util/ResourcemanagerAdapterFactory.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/util/ResourcemanagerAdapterFactory.java
deleted file mode 100755
index 4330d5d..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/util/ResourcemanagerAdapterFactory.java
+++ /dev/null
@@ -1,141 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.resourcemanager.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.resourcemanager.ResourceDescriptor;
-import org.eclipse.epf.resourcemanager.ResourceManager;
-import org.eclipse.epf.resourcemanager.ResourcemanagerPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.resourcemanager.ResourcemanagerPackage
- * @generated
- */
-public class ResourcemanagerAdapterFactory extends AdapterFactoryImpl {
-	
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected static ResourcemanagerPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public ResourcemanagerAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = ResourcemanagerPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-     * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-     * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-    public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected ResourcemanagerSwitch modelSwitch =
-		new ResourcemanagerSwitch() {
-			public Object caseResourceDescriptor(ResourceDescriptor object) {
-				return createResourceDescriptorAdapter();
-			}
-			public Object caseResourceManager(ResourceManager object) {
-				return createResourceManagerAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-    public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.resourcemanager.ResourceDescriptor <em>Resource Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.resourcemanager.ResourceDescriptor
-	 * @generated
-	 */
-    public Adapter createResourceDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.resourcemanager.ResourceManager <em>Resource Manager</em>}'.
-	 * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.resourcemanager.ResourceManager
-	 * @generated
-	 */
-    public Adapter createResourceManagerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-     * This default implementation returns null.
-     * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-    public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/util/ResourcemanagerSwitch.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/util/ResourcemanagerSwitch.java
deleted file mode 100755
index 90a47c3..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/util/ResourcemanagerSwitch.java
+++ /dev/null
@@ -1,157 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.resourcemanager.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.resourcemanager.ResourceDescriptor;
-import org.eclipse.epf.resourcemanager.ResourceManager;
-import org.eclipse.epf.resourcemanager.ResourcemanagerPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.resourcemanager.ResourcemanagerPackage
- * @generated
- */
-public class ResourcemanagerSwitch {
-	
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected static ResourcemanagerPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public ResourcemanagerSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ResourcemanagerPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-    public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-    protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-    protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ResourcemanagerPackage.RESOURCE_DESCRIPTOR: {
-				ResourceDescriptor resourceDescriptor = (ResourceDescriptor)theEObject;
-				Object result = caseResourceDescriptor(resourceDescriptor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ResourcemanagerPackage.RESOURCE_MANAGER: {
-				ResourceManager resourceManager = (ResourceManager)theEObject;
-				Object result = caseResourceManager(resourceManager);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Resource Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Resource Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-    public Object caseResourceDescriptor(ResourceDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Resource Manager</em>'.
-	 * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Resource Manager</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-    public Object caseResourceManager(ResourceManager object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch, but this is the last case anyway.
-     * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-    public Object defaultCase(EObject object) {
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/util/package.html b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/util/package.html
deleted file mode 100755
index b587d6f..0000000
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/resourcemanager/util/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides implementation support for managing XMI resources in a method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.ui/.classpath b/plugins/org.eclipse.epf.library.ui/.classpath
deleted file mode 100755
index 065ac06..0000000
--- a/plugins/org.eclipse.epf.library.ui/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.library.ui/.cvsignore b/plugins/org.eclipse.epf.library.ui/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.library.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.library.ui/.options b/plugins/org.eclipse.epf.library.ui/.options
deleted file mode 100755
index de1dee4..0000000
--- a/plugins/org.eclipse.epf.library.ui/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-# Turn on debug trace for the Library plug-in
-org.eclipse.epf.library.ui/debug=true
diff --git a/plugins/org.eclipse.epf.library.ui/.project b/plugins/org.eclipse.epf.library.ui/.project
deleted file mode 100755
index 5cde1e9..0000000
--- a/plugins/org.eclipse.epf.library.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.library.ui</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/plugins/org.eclipse.epf.library.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.library.ui/META-INF/MANIFEST.MF
deleted file mode 100755
index 0ea5a0b..0000000
--- a/plugins/org.eclipse.epf.library.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.library.ui; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.epf.library.ui.LibraryUIPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.epf.library;visibility:=reexport,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.epf.library.xmi,
- org.eclipse.epf.ui;visibility:=reexport,
- org.eclipse.jface.text;visibility:=reexport,
- org.eclipse.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.library.ui,
- org.eclipse.epf.library.ui.actions,
- org.eclipse.epf.library.ui.dialogs,
- org.eclipse.epf.library.ui.preferences,
- org.eclipse.epf.library.ui.views,
- org.eclipse.epf.library.ui.wizards
-
diff --git a/plugins/org.eclipse.epf.library.ui/build.properties b/plugins/org.eclipse.epf.library.ui/build.properties
deleted file mode 100755
index 0731edb..0000000
--- a/plugins/org.eclipse.epf.library.ui/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               .options
-                 
diff --git a/plugins/org.eclipse.epf.library.ui/icons/OpenLibrary.gif b/plugins/org.eclipse.epf.library.ui/icons/OpenLibrary.gif
deleted file mode 100755
index e249831..0000000
--- a/plugins/org.eclipse.epf.library.ui/icons/OpenLibrary.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.library.ui/icons/full/obj16/MethodLibrary.gif b/plugins/org.eclipse.epf.library.ui/icons/full/obj16/MethodLibrary.gif
deleted file mode 100755
index 00a311e..0000000
--- a/plugins/org.eclipse.epf.library.ui/icons/full/obj16/MethodLibrary.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.library.ui/icons/full/wizban/ExportProcess.gif b/plugins/org.eclipse.epf.library.ui/icons/full/wizban/ExportProcess.gif
deleted file mode 100755
index e249831..0000000
--- a/plugins/org.eclipse.epf.library.ui/icons/full/wizban/ExportProcess.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.library.ui/icons/full/wizban/Open.gif b/plugins/org.eclipse.epf.library.ui/icons/full/wizban/Open.gif
deleted file mode 100755
index e249831..0000000
--- a/plugins/org.eclipse.epf.library.ui/icons/full/wizban/Open.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.library.ui/plugin.properties b/plugins/org.eclipse.epf.library.ui/plugin.properties
deleted file mode 100755
index 7be1bd9..0000000
--- a/plugins/org.eclipse.epf.library.ui/plugin.properties
+++ /dev/null
@@ -1,28 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Library UI
-providerName=Eclipse.org
-
-# Open Method Library Action 
-actionSetLabel=Method Authoring
-fileOpenMenuLabel=Open
-openLibraryActionlabel=Method Library
-openLibraryActionTooltip=Open a method library
-
-################################################################################
-# THE FOLLOWING PROPERTIES SHOULD NOT BE TRANSLATED!!!
-################################################################################
-
-# Default Method Library Path.
-libraryPath=<user.home>/<app.name>/Method Libraries/library1
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.ui/plugin.xml b/plugins/org.eclipse.epf.library.ui/plugin.xml
deleted file mode 100755
index fb6131b..0000000
--- a/plugins/org.eclipse.epf.library.ui/plugin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>           
-
-   <extension-point
-         id="newLibraryWizardPages"
-         name="EPF New Method Library Wizard Pages"
-         schema="schema/NewLibraryWizardPages.exsd"/>
-
-   <extension-point
-         id="openLibraryWizardPages"
-         name="EPF Open Method Library Wizard Pages"
-         schema="schema/OpenLibraryWizardPages.exsd"/>
-
-   <extension point="org.eclipse.ui.actionSets">
-      <actionSet
-            id="org.eclipse.epf.library.ui.actionSet"
-            label="%actionSetLabel"
-            visible="true">
-         <menu
-               id="org.eclipse.epf.library.ui.menu.fileOpenMenu"
-               label="%fileOpenMenuLabel"
-               path="file/new.ext">
-            <separator name="groupm1"/>
-            <separator name="groupm2"/>
-         </menu>
-         <action
-               class="org.eclipse.epf.library.ui.actions.OpenLibraryAction"
-               helpContextId="file_open_library_context"
-               icon="icons/full/obj16/MethodLibrary.gif"
-               id="org.eclipse.epf.library.ui.actions.OpenLibraryAction"
-               label="%openLibraryActionlabel"
-               menubarPath="file/org.eclipse.epf.library.ui.menu.fileOpenMenu/groupm1"
-               tooltip="%openLibraryActionTooltip"/>
-      </actionSet>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.epf.library.ui/schema/NewLibraryWizardPages.exsd b/plugins/org.eclipse.epf.library.ui/schema/NewLibraryWizardPages.exsd
deleted file mode 100755
index e39c46f..0000000
--- a/plugins/org.eclipse.epf.library.ui/schema/NewLibraryWizardPages.exsd
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.epf.library.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.epf.library.ui" id="newLibraryWizardPages" name="EPF New Method Library Wizard Pages"/>
-      </appInfo>
-      <documentation>
-         Enables a plug-in to contribute a method library type specific wizard page to the New Method Library wizard.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="newLibraryWizardPage" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A fully qualified identifier of the target extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  An optional identifier of the extension instance.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  An optional name of the extension instance.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="newLibraryWizardPage">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The Java class that implements a wizard page. This class must extends &lt;code&gt;org.eclipse.epf.library.ui.wizards.AddLibraryWizardPage&lt;/code&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="type" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The identifier of a specific method library type (database, xmi, etc.).
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="title" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The title for the wizard page.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The description for the wizard page.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         1.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of a Library Manager extension point: 
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.epf.library.ui.newLibraryWizardPages&quot;&gt;
-      &lt;addLibraryWizardPage
-         class=&quot;org.eclipse.epf.library.ui.xmi.NewXMILibraryWizardPage&quot;
-         type=&quot;xmi&quot;
-         title=&quot;Creates a XMI method library.&quot;
-         description=&quot;Specify the location for the XMI method library.&quot;&gt;
-      &lt;/addLibraryWizardPage&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005, 2006 IBM Corporation and others.&lt;br&gt;
-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 &lt;a 
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.epf.library.ui/schema/OpenLibraryWizardPages.exsd b/plugins/org.eclipse.epf.library.ui/schema/OpenLibraryWizardPages.exsd
deleted file mode 100755
index 4c0e416..0000000
--- a/plugins/org.eclipse.epf.library.ui/schema/OpenLibraryWizardPages.exsd
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.epf.library.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.epf.library.ui" id="openLibraryWizardPages" name="EPF Open Method Library Wizard Pages"/>
-      </appInfo>
-      <documentation>
-         Enables a plug-in to contribute a method library type specific wizard page to the Open Method Library wizard.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="openLibraryWizardPage" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A fully qualified identifier of the target extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  An optional identifier of the extension instance.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  An optional name of the extension instance.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="openLibraryWizardPage">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The Java class that implements a wizard page. This class must extends &lt;code&gt;org.eclipse.epf.library.ui.wizards.AddLibraryWizardPage&lt;/code&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="type" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The identifier of a specific method library type (database, xmi, etc.).
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="title" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The title for the wizard page.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The description for the wizard page.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         1.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of a Library Manager extension point: 
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.epf.librray.ui.openLibraryWizardPages&quot;&gt;
-      &lt;openLibraryWizardPage
-         class=&quot;org.eclipse.epf.library.ui.xmi.OpenXMILibraryWizardPage&quot;
-         type=&quot;xmi&quot;
-         title=&quot;Opens a XMI method library.&quot;
-         description=&quot;Specify the location for the XMI method library.&quot;&gt;
-      &lt;/openLibraryWizardPage&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005, 2006 IBM Corporation and others.&lt;br&gt;
-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 &lt;a 
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/ILibraryUIManager.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/ILibraryUIManager.java
deleted file mode 100755
index 73adbc0..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/ILibraryUIManager.java
+++ /dev/null
@@ -1,39 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui;
-
-/**
- * Interface to provide user interface for creating or opening method library.
- * 
- * @author Phong Nguyen Le - Oct 26, 2006
- * @since 1.0
- */
-public interface ILibraryUIManager {
-	/**
-	 * Creates a new method library with user specified information.
-	 * 
-	 * @return
-	 */
-	boolean createNewLibrary();
-
-	/**
-	 * Open a method library that user specified.
-	 * 
-	 * @param lastOpen
-	 *            if true will try to open the method library that had been
-	 *            opened most recently.
-	 * @return
-	 *            <li><code>true</code> if successful
-	 *            <li><code>false</code> if user cancelled or exception
-	 *            occured
-	 */
-	boolean openLibrary(boolean lastOpen);
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/IMethodElementProvider.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/IMethodElementProvider.java
deleted file mode 100755
index a64b661..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/IMethodElementProvider.java
+++ /dev/null
@@ -1,22 +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.library.ui;
-
-import org.eclipse.epf.uma.MethodElement;
-
-/**
- * @author Phong Nguyen Le
- *
- * @since 1.2
- */
-public interface IMethodElementProvider {
-	MethodElement getMethodElement();
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIImages.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIImages.java
deleted file mode 100755
index 0a1a531..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIImages.java
+++ /dev/null
@@ -1,139 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui;
-
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.epf.uma.provider.UmaEditPlugin;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Library UI images.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class LibraryUIImages {
-
-	/**
-	 * The images associated with the Method Library elements.
-	 * <p>
-	 * These images are cached and should not be disposed by the user!
-	 */
-	public static final Image IMG_ACTIVITY = getElementImage("full/obj16/Activity"); //$NON-NLS-1$
-
-	public static final Image IMG_ARTIFACT = getElementImage("full/obj16/Artifact"); //$NON-NLS-1$
-
-	public static final Image IMG_CAPABILITY_PATTERN = getElementImage("full/obj16/CapabilityPattern"); //$NON-NLS-1$
-
-	public static final Image IMG_CHECKLIST = getElementImage("full/obj16/Checklist"); //$NON-NLS-1$
-
-	public static final Image IMG_COMPOSITE_ROLE = getElementImage("full/obj16/CompositeRole"); //$NON-NLS-1$
-
-	public static final Image IMG_CONCEPT = getElementImage("full/obj16/Concept"); //$NON-NLS-1$
-
-	public static final Image IMG_CONTENT_PACKAGE = getElementImage("full/obj16/ContentPackage"); //$NON-NLS-1$
-
-	public static final Image IMG_CUSTOM_CATEGORY = getElementImage("full/obj16/CustomCategory"); //$NON-NLS-1$
-
-	public static final Image IMG_DELIVERABLE = getElementImage("full/obj16/Deliverable"); //$NON-NLS-1$
-
-	public static final Image IMG_DELIVERY_PROCESS = getElementImage("full/obj16/DeliveryProcess"); //$NON-NLS-1$
-
-	public static final Image IMG_DISCIPLINE = getElementImage("full/obj16/Discipline"); //$NON-NLS-1$
-
-	public static final Image IMG_DISCIPLINE_GROUPING = getElementImage("full/obj16/DisciplineGrouping"); //$NON-NLS-1$
-
-	public static final Image IMG_DOMAIN = getElementImage("full/obj16/Domain"); //$NON-NLS-1$
-
-	public static final Image IMG_ESTIMATE = getElementImage("full/obj16/Estimate"); //$NON-NLS-1$
-
-	public static final Image IMG_ESTIMATING_METRIC = getElementImage("full/obj16/EstimatingMetric"); //$NON-NLS-1$
-
-	public static final Image IMG_ESTIMATION_CONSIDERATIONS = getElementImage("full/obj16/EstimationConsiderations"); //$NON-NLS-1$
-
-	public static final Image IMG_EXAMPLE = getElementImage("full/obj16/Example"); //$NON-NLS-1$
-
-	public static final Image IMG_GUIDELINE = getElementImage("full/obj16/Guideline"); //$NON-NLS-1$
-
-	public static final Image IMG_ITERATION = getElementImage("full/obj16/Iteration"); //$NON-NLS-1$	
-
-	public static final Image IMG_METHOD_CONFIGURATON = getElementImage("full/obj16/MethodConfiguration"); //$NON-NLS-1$
-
-	public static final Image IMG_METHOD_LIBARARY = getElementImage("full/obj16/MethodLibrary"); //$NON-NLS-1$
-
-	public static final Image IMG_METHOD_PACKAGE = getElementImage("full/obj16/MethodPackage"); //$NON-NLS-1$
-
-	public static final Image IMG_METHOD_PLUGIN = getElementImage("full/obj16/MethodPlugin"); //$NON-NLS-1$
-
-	public static final Image IMG_MILESTONE = getElementImage("full/obj16/Milestone"); //$NON-NLS-1$
-
-	public static final Image IMG_OUTCOME = getElementImage("full/obj16/Outcome"); //$NON-NLS-1$
-
-	public static final Image IMG_PHASE = getElementImage("full/obj16/Phase"); //$NON-NLS-1$	
-
-	public static final Image IMG_PRACTICE = getElementImage("full/obj16/Practice"); //$NON-NLS-1$
-
-	public static final Image IMG_PROCESS = getElementImage("full/obj16/Process"); //$NON-NLS-1$	
-
-	public static final Image IMG_PROCESS_CONTRIBUTION = getElementImage("full/obj16/ProcessContribution"); //$NON-NLS-1$
-
-	public static final Image IMG_PROCESS_FAMILY = getElementImage("full/obj16/ProcessFamily"); //$NON-NLS-1$
-
-	public static final Image IMG_PROCESS_PACKAGE = getElementImage("full/obj16/ProcessPackage"); //$NON-NLS-1
-
-	public static final Image IMG_REPORT = getElementImage("full/obj16/Report"); //$NON-NLS-1$
-
-	public static final Image IMG_ROADMAP = getElementImage("full/obj16/Roadmap"); //$NON-NLS-1$
-
-	public static final Image IMG_ROLE_DESCRIPTOR = getElementImage("full/obj16/RoleDescriptor"); //$NON-NLS-1$
-
-	public static final Image IMG_ROLE = getElementImage("full/obj16/Role"); //$NON-NLS-1$
-
-	public static final Image IMG_ROLE_SET = getElementImage("full/obj16/RoleSet"); //$NON-NLS-1$
-
-	public static final Image IMG_ROLE_SET_GROUPING = getElementImage("full/obj16/RoleSetGrouping"); //$NON-NLS-1$
-
-	public static final Image IMG_SUPPORTING_MATERIAL = getElementImage("full/obj16/SupportingMaterial"); //$NON-NLS-1$
-
-	public static final Image IMG_TASK = getElementImage("full/obj16/Task"); //$NON-NLS-1$
-
-	public static final Image IMG_TASK_DESCRIPTOR = getElementImage("full/obj16/TaskDescriptor"); //$NON-NLS-1$
-
-	public static final Image IMG_TEAM_PROFILE = getElementImage("full/obj16/TeamProfile"); //$NON-NLS-1$
-
-	public static final Image IMG_TEMPLATE = getElementImage("full/obj16/Template"); //$NON-NLS-1$
-
-	public static final Image IMG_TERM_DEFINITION = getElementImage("full/obj16/TermDefinition"); //$NON-NLS-1$
-
-	public static final Image IMG_TOOL = getElementImage("full/obj16/Tool"); //$NON-NLS-1$
-
-	public static final Image IMG_TOOL_MENTOR = getElementImage("full/obj16/ToolMentor"); //$NON-NLS-1$
-
-	public static final Image IMG_WHITEPAPER = getElementImage("full/obj16/Whitepaper"); //$NON-NLS-1$
-
-	public static final Image IMG_WORK_PRODUCT = getElementImage("full/obj16/WorkProduct"); //$NON-NLS-1$
-
-	public static final Image IMG_WORK_PRODUCT_TYPE = getElementImage("full/obj16/WorkProductType"); //$NON-NLS-1$
-
-	/**
-	 * Returns the image given the relative path.
-	 * 
-	 * @param path
-	 *            A path relative to the UMA Edit plug-in root.
-	 * @return A <code>Image</code> object.
-	 */
-	protected static Image getElementImage(String path) {
-		return ExtendedImageRegistry.getInstance().getImage(
-				UmaEditPlugin.INSTANCE.getImage(path));
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIManager.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIManager.java
deleted file mode 100755
index 933d1f0..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIManager.java
+++ /dev/null
@@ -1,747 +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.library.ui;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.common.serviceability.VersionUtil;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.persistence.ILibraryResourceSet;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.library.ui.actions.ConfigurationContributionItem;
-import org.eclipse.epf.library.ui.actions.OpenLibraryAction;
-import org.eclipse.epf.library.ui.dialogs.OpenLibraryDialog;
-import org.eclipse.epf.library.ui.dialogs.SelectLibraryDirectoryDialog;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.epf.library.ui.wizards.LibraryBackupUtil;
-import org.eclipse.epf.library.xmi.XMILibraryManager;
-import org.eclipse.epf.library.xmi.XMILibraryUtil;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.persistence.PersistencePlugin;
-import org.eclipse.epf.persistence.migration.MappingUtil;
-import org.eclipse.epf.persistence.migration.UpgradeCallerInfo;
-import org.eclipse.epf.services.Services;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.ICoolBarManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.ToolBarContributionItem;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.window.ApplicationWindow;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.osgi.framework.Bundle;
-
-/**
- * The Library UI Manager.
- * 
- * @author Kelvin Low
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class LibraryUIManager {
-
-	private static final String TOOLBAR_CONFIG_CONTRIBUTION_ID = "toolbar.config.contribution"; //$NON-NLS-1$
-
-	private static LibraryUIManager instance = null;
-
-	private static String cmdLineLibPath = null;
-	private static String cmdLineDefaultLibPath = null;
-	
-	private static String appName = "composer";
-
-	private static HashMap typeToManagerDefMap;
-
-	public static boolean DEBUG = LibraryUIPlugin.getDefault().isDebugging();
-
-	/**
-	 * Returns the singleton instance.
-	 */
-	public static LibraryUIManager getInstance() {
-		if (instance == null) {
-			synchronized (LibraryUIManager.class) {
-				if (instance == null) {
-					instance = new LibraryUIManager();
-				}
-			}
-		}
-		return instance;
-	}
-
-	/**
-	 * Private default constructor to prevent this class from being
-	 * instantiated.
-	 */
-	private LibraryUIManager() {
-		addConfigurationContribution();
-	}
-
-	/**
-	 * Prompts the user to select a Method Library.
-	 */
-	public void promptForMethodLibrary() {
-		try {
-			OpenLibraryAction action = new OpenLibraryAction();
-			action.init(PlatformUI.getWorkbench().getActiveWorkbenchWindow());
-			action.run(null);
-		}
-		catch (Exception e) {
-			LibraryUIPlugin.getDefault().getLogger().logError(e);
-		}
-		
-		/*
-		if(!Services.getDefaultLibraryPersistenceType().equals(Services.XMI_PERSISTENCE_TYPE)) {
-			ILibraryUIManager manager = getLibraryUIManager(Services.getDefaultLibraryPersistenceType());
-			if(manager != null) {
-				if(!manager.openLibrary(true)) {
-					System.exit(0);
-				}
-			}
-			return;
-		}
-
-		
-		// Retrieve the Library path that was saved in a previous session.
-		String libPath = LibraryUIPreferences.getSavedLibraryPath();
-		if (cmdLineLibPath != null) {
-			libPath = cmdLineLibPath;
-		} else if (libPath == null || libPath.length() == 0) {
-			if (cmdLineDefaultLibPath != null) {
-				libPath = cmdLineDefaultLibPath;
-			}
-		}
-
-		// Prompt the user to select a Method Library folder if:
-		// (1) The saved or command line Library path is invalid AND
-		// (2) The prompt for Method Library at startup preference is set to
-		// true (the default)
-		if (XMILibraryUtil.isValidLibrary(libPath, true) == Status.OK_STATUS
-				&& !LibraryUIPreferences.getPromptForMethodLibraryAtStartup()
-				&& !XMILibraryUtil.isMethodLibraryLocked(libPath)) {
-			openLibrary(libPath);
-			return;
-		}
-
-		// Open a dialog to prompt the user to select a Method Librray folder.
-		if (XMILibraryUtil.isValidLibrary(libPath) != Status.OK_STATUS) {
-			libPath = LibraryUIPreferences.getDefaultLibraryPath();
-		}
-		
-		// bug 151199 - change parent shell to null. dialog is also changed to
-		// not be ON_TOP
-		OpenLibraryDialog dialog = new OpenLibraryDialog(null, libPath);
-		while (dialog.open() == Window.OK) {
-			libPath = dialog.getLibraryPath();
-			libPath = toAbsoluteLibraryPath(libPath);
-			if (XMILibraryUtil.isValidLibrary(libPath, true) == Status.OK_STATUS) {
-				if (XMILibraryUtil.isMethodLibraryLocked(libPath)) {
-					if (displayLibraryLockedMessage() != 0)
-						continue;
-				}
-				VersionUtil.VersionCheckInfo info = VersionUtil.checkLibraryVersion(
-						new File(libPath, XMILibraryManager.LIBRARY_XMI));
-				if (info != null && info.result > 0) {
-					String message = ""; //$NON-NLS-1$
-					if (info.toolID.equals(VersionUtil.getPrimaryToolID())) {
-						message = NLS.bind(LibraryUIResources.versionMismatchDialog_text, new Object[] {
-								Platform.getProduct().getName(), info.toolVersion});
-					} else {
-						message = NLS.bind(LibraryUIResources.versionMismatchDialog_text_unknown, new Object[] {
-								Platform.getProduct().getName()});
-					}
-					LibraryUIPlugin.getDefault().getMsgDialog().
-						displayError(LibraryUIResources.openLibraryWizard_title, message);
-					continue;
-				}
-				if (XMILibraryUtil.isMethodLibraryUpgradeRequired(libPath)) {
-					if (!LibraryUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayConfirmation(
-									LibraryUIResources.openLibraryWizard_title,
-									LibraryUIResources.upgradeLibraryDialog_text)) {
-						continue;
-					}
-					if (!upgradeLibrary(libPath, null)) {
-						continue;
-					}
-				}
-				if (openLibrary(libPath)) {
-					return;
-				}
-			} else {
-				MsgDialog msgDialog = LibraryUIPlugin.getDefault()
-						.getMsgDialog();
-				boolean rc = msgDialog
-						.displayConfirmation(
-								LibraryUIResources.openLibraryWizard_title,
-								NLS
-										.bind(
-												LibraryUIResources.openLibraryDialog_newLibrary_text,
-												new Object[] { libPath }));
-				if (!rc)
-					continue;
-				if (createLibrary(libPath)) {
-					return;
-				}
-			}
-
-			LibraryUIPlugin.getDefault().getMsgDialog().displayError(
-					LibraryUIResources.openLibraryWizard_title,
-					LibraryUIResources.invalidLibraryPath_msg,
-					LibraryUIResources.invalidLibraryPath_reason);
-		}
-		;
-
-		// if dialog is closed with the OK buttonbeing clicked -- treat it as
-		// cancel
-		System.exit(0);
-		*/
-	}
-	
-	private static class ManagerDef {
-		Bundle bundle;
-
-		String type;
-
-		String className;
-		
-		ILibraryUIManager instance;
-
-		/**
-		 * @param bundle
-		 * @param type
-		 * @param className
-		 * @param instance
-		 */
-		private ManagerDef(Bundle bundle, String type, String className) {
-			super();
-			this.bundle = bundle;
-			this.type = type;
-			this.className = className;
-		}
-				
-	}
-	
-	public static ILibraryUIManager getLibraryUIManager(String persistenceType) {
-		if (typeToManagerDefMap == null) {
-			typeToManagerDefMap = new HashMap();
-			// Process the extension point contributors.
-			//
-			IExtensionRegistry extensionRegistry = Platform
-					.getExtensionRegistry();
-			IExtensionPoint extensionPoint = extensionRegistry
-					.getExtensionPoint(
-							"org.eclipse.epf.library.ui", "libraryUIManagers"); //$NON-NLS-1$ //$NON-NLS-2$
-			if (extensionPoint != null) {
-				IExtension[] extensions = extensionPoint.getExtensions();
-				for (int i = 0; i < extensions.length; i++) {
-					IExtension extension = extensions[i];
-					String pluginId = extension.getNamespaceIdentifier();
-					Bundle bundle = Platform.getBundle(pluginId);
-					IConfigurationElement[] configElements = extension
-							.getConfigurationElements();
-					for (int j = 0; j < configElements.length; j++) {
-						IConfigurationElement configElement = configElements[j];
-						try {
-							String className = configElement
-									.getAttribute("class"); //$NON-NLS-1$
-							String type = configElement
-									.getAttribute("type"); //$NON-NLS-1$
-							if (className != null
-									&& className.trim().length() > 0
-									&& type != null
-									&& type.trim().length() > 0) {
-								typeToManagerDefMap.put(type, new ManagerDef(bundle,
-										type, className));
-							}
-						} catch (Exception e) {
-							CommonPlugin.INSTANCE.log(e);
-						}
-					}
-				}
-			}
-		}
-		ManagerDef mgr = (ManagerDef) typeToManagerDefMap.get(persistenceType);
-		if (mgr != null) {
-			if (mgr.instance == null) {
-				try {
-					mgr.instance = (ILibraryUIManager) mgr.bundle.loadClass(
-							mgr.className).newInstance();
-				} catch (Exception e) {
-					PersistencePlugin.getDefault().getLogger().logError(e);
-					if(DEBUG ) {
-						e.printStackTrace();
-					}
-				}
-			}
-			return mgr.instance;
-		}
-		return null;
-	}
-		
-	/**
-	 * Opens a Method Library.
-	 */
-	public void openLibrary() {
-		if(!Services.getDefaultLibraryPersistenceType().equals(Services.XMI_PERSISTENCE_TYPE)) {
-			ILibraryUIManager manager = getLibraryUIManager(Services.getDefaultLibraryPersistenceType());
-			if(manager != null) {
-				manager.openLibrary(false);
-			}
-			return;
-		}
-		SelectLibraryDirectoryDialog dialog = new SelectLibraryDirectoryDialog(
-				Display.getCurrent().getActiveShell());
-		String libPath = LibraryUIPreferences.getSavedLibraryPath();
-		dialog.setFilterPath(libPath);
-		do {
-			libPath = dialog.open();
-			if (libPath == null) {
-				return;
-			}
-			if (XMILibraryUtil.isValidLibrary(libPath, true) == Status.OK_STATUS) {
-				if (XMILibraryUtil.isMethodLibraryLocked(libPath)) {
-					if (displayLibraryLockedMessage() != 0)
-						continue;
-				}
-				VersionUtil.VersionCheckInfo info = VersionUtil.checkLibraryVersion(
-						new File(libPath, XMILibraryManager.LIBRARY_XMI));
-				if (info != null && info.result > 0) {
-					String message = ""; //$NON-NLS-1$
-					if (info.toolID.equals(VersionUtil.getPrimaryToolID())) {
-						message = NLS.bind(LibraryUIResources.versionMismatchDialog_text, new Object[] {
-								Platform.getProduct().getName(), info.toolVersion});
-					} else {
-						message = NLS.bind(LibraryUIResources.versionMismatchDialog_text_unknown, new Object[] {
-								Platform.getProduct().getName()});
-					}
-					LibraryUIPlugin.getDefault().getMsgDialog().
-						displayError(LibraryUIResources.openLibraryWizard_title, message);
-					return;
-				}
-				if (XMILibraryUtil.isMethodLibraryUpgradeRequired(libPath)) {
-					if (!LibraryUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayConfirmation(
-									LibraryUIResources.openLibraryWizard_title,
-									LibraryUIResources.upgradeLibraryDialog_text)) {
-						return;
-					}
-					if (!upgradeLibrary(libPath, null)) {
-						return;
-					}
-				}
-				if (openLibrary(libPath)) {
-					return;
-				}
-			}
-			MsgDialog msgDialog = LibraryUIPlugin.getDefault().getMsgDialog();
-			msgDialog.displayError(LibraryUIResources.openLibraryWizard_title,
-					LibraryUIResources.invalidLibraryPath_msg,
-					LibraryUIResources.invalidLibraryPath_reason);
-		} while (libPath != null);
-	}
-
-	/**
-	 * Opens a Method Library given the Library path.
-	 * 
-	 * @param path
-	 *            Path to a Method Library.
-	 * @return <code>true</code> if the Method Library is opened successfully.
-	 */
-	public boolean openLibrary(final String path) {
-		Shell shell = Display.getCurrent().getActiveShell();
-
-		final List errors = new ArrayList();
-		// final IStatus[] status = new IStatus[1];
-
-		// Do the work within an operation because this is a long running
-		// activity that modifies the workspace.
-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
-			public void execute(IProgressMonitor monitor) {
-				String taskName = LibraryUIResources.openingLibraryTask_name;
-				monitor.beginTask(taskName, 2);
-				try {
-					monitor.setTaskName(taskName);
-					monitor.worked(1);
-					LibraryService.getInstance().closeCurrentMethodLibrary();
-					MethodLibrary library = XMILibraryUtil
-							.openMethodLibrary(path);
-					LibraryService.getInstance().setCurrentMethodLibrary(
-							library);
-					LibraryUIPreferences.setSavedLibraryPath(path);
-					// show Problems View if necessary
-					ILibraryResourceSet resourceSet = ((ILibraryResourceSet) LibraryService
-							.getInstance().getCurrentLibraryManager()
-							.getEditingDomain().getResourceSet());
-					if (resourceSet.hasUnresolvedProxy()) {
-						SafeUpdateController.asyncExec(new Runnable() {
-							public void run() {
-								try {
-									PlatformUI
-											.getWorkbench()
-											.getActiveWorkbenchWindow()
-											.getActivePage()
-											.showView(
-													"org.eclipse.ui.views.ProblemView", null, IWorkbenchPage.VIEW_VISIBLE); //$NON-NLS-1$
-								} catch (Exception e) {
-									// couldn't open the problem view, too bad..
-								}
-							}
-						});
-					}
-				} catch (Exception e) {
-					if (!(e instanceof IOException && e.getMessage()
-							.startsWith("###"))) { //$NON-NLS-1$
-						LibraryUIPlugin.getDefault().getLogger().logError(e);
-					}
-					errors.add(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-
-		try {
-			ProgressMonitorDialog dialog = new ProgressMonitorDialog(shell) {
-				protected void configureShell(Shell shell) {
-					super.configureShell(shell);
-					shell.setText(LibraryUIResources.openLibraryWizard_title);
-				}
-			};
-			dialog.run(true, false, operation);
-			if (errors.isEmpty()) {
-				IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench()
-						.getActiveWorkbenchWindow();
-				if (workbenchWindow != null) {
-					IWorkbenchPage activePage = workbenchWindow.getActivePage();
-					if (activePage != null) {
-						activePage.closeAllEditors(false);
-					}
-				}
-				return true;
-			} else {
-				Iterator iter = errors.iterator();
-				while (iter.hasNext()) {
-					Exception e = (Exception) iter.next();
-					if (e instanceof IOException) {
-						String message = e.getMessage();
-						if (message.startsWith("###")) { //$NON-NLS-1$
-							String projectFileName = message.substring(3);
-
-							String prompt = LibraryUIResources
-									.bind(
-											LibraryUIResources.readOnlyProjectFile_text,
-											projectFileName);
-							String[] buttonLabels = {
-									LibraryUIResources.retryButton_text,
-									LibraryUIResources.cancelButton_text };
-							MessageDialog msgBox = new MessageDialog(Display
-									.getCurrent().getActiveShell(),
-									LibraryUIResources.openLibraryWizard_title,
-									null, prompt, MessageDialog.WARNING,
-									buttonLabels, 0);
-							if (msgBox.open() == 0) {
-								return openLibrary(path);
-							} else {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		} catch (Exception e) {
-			LibraryUIPlugin.getDefault().getLogger().logError(e);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Creates and opens a new Method Library.
-	 * 
-	 * @param path
-	 *            The Method Library path.
-	 * @return <code>true</code> if the Method Library is opened successfully.
-	 */
-	public boolean createLibrary(String path) {
-		try {
-			File libraryPath = new File(path);
-			if (!libraryPath.exists()) {
-				libraryPath.mkdirs();
-			}
-			XMILibraryUtil.createMethodLibrary(libraryPath.getName(), path);
-			LibraryUIPreferences.setSavedLibraryPath(path);
-			return true;
-		} catch (Exception e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Adds the Configuration contribution to the workbench toolbar.
-	 */
-	public void addConfigurationContribution() {
-		IWorkbench workbench = LibraryUIPlugin.getDefault().getWorkbench();
-		if (workbench != null) {
-			IWorkbenchWindow window = (IWorkbenchWindow) workbench
-					.getActiveWorkbenchWindow();
-			if (window != null && window instanceof ApplicationWindow) {
-				// Check to see if the configuration contribution already
-				// exists.
-				ICoolBarManager coolBar = ((ApplicationWindow)window).getCoolBarManager();
-				IContributionItem marker = null;
-				IContributionItem coolBarItem = coolBar
-						.find(TOOLBAR_CONFIG_CONTRIBUTION_ID);
-				if (coolBarItem != null) {
-					if (coolBarItem.isVisible()) {
-						return;
-					}
-					IContributionItem[] items = coolBar.getItems();
-					for (int i = 0; i < items.length; i++) {
-						if (items[i] == coolBarItem) {
-							coolBar.remove(TOOLBAR_CONFIG_CONTRIBUTION_ID);
-							if (i + 1 < items.length) {
-								marker = items[i + 1];
-							}
-						}
-					}
-				}
-
-				IToolBarManager toolbarMgr = new ToolBarManager(SWT.FLAT
-						| SWT.LEFT);
-				ConfigurationContributionItem testItem = new ConfigurationContributionItem(
-						null);
-				toolbarMgr.add(testItem);
-				ToolBarContributionItem contribItem = new ToolBarContributionItem(
-						toolbarMgr, TOOLBAR_CONFIG_CONTRIBUTION_ID);
-				if (marker != null) {
-					coolBar.insertBefore(marker.getId(), contribItem);
-				} else {
-					coolBar.add(contribItem);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Upgrades a Method Library to a new meta-model.
-	 * 
-	 * @param libDir
-	 *            Path to a Method Library.
-	 * @return <code>true</code> if the given Method Library is sucessfully
-	 *         upgraded.
-	 */
-	public static boolean upgradeLibrary(final String libDir, final UpgradeCallerInfo callerInfo) {								
-		Shell shell = Display.getCurrent().getActiveShell();
-		if (UpgradeCallerInfo.isUpgradeLibrary(callerInfo)) {
-			LibraryBackupUtil.promptBackupLibrary(shell, new File(libDir));
-		}
-		
-		final StringBuffer errMsg = new StringBuffer();
-		final boolean[] cancelFlagHolder = { false };
-
-		// Do the work within an operation because this is a long running
-		// activity that modifies the workbench.
-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
-			public void execute(IProgressMonitor monitor) {
-				String libXmi = MultiFileSaveUtil.DEFAULT_LIBRARY_MODEL_FILENAME;
-				if (callerInfo != null && callerInfo.getIsExportedPluginLib()) {
-					libXmi = XMILibraryManager.exportFile;
-				}
-				monitor.beginTask(LibraryUIResources.upgradingLibraryTask_name, 10);
-				monitor.worked(1);
-				try {
-					MappingUtil
-							.migrate(
-									libDir
-											+ "/" + libXmi, monitor, callerInfo); //$NON-NLS-1$
-				} 
-				catch(OperationCanceledException e) {
-					cancelFlagHolder[0] = true;
-				}
-				catch (Exception e) {
-					CommonPlugin.INSTANCE.log(e);
-					e.printStackTrace();
-					String msg = e.getMessage();
-					if (msg == null) {
-						msg = LibraryUIResources.upgradeLibraryError_msg;
-					}
-					errMsg.append(msg);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-
-		try {
-			// Run the operation and display the progress.
-			ProgressMonitorDialog pmDialog = new ProgressMonitorDialog(shell) {			
-			    protected Point getInitialSize() {
-			        Point calculatedSize = super.getInitialSize();
-			        if (calculatedSize.x < 675) {
-			        	calculatedSize.x = 675;
-					}
-			        return calculatedSize;
-			    }
-			};		    
-			pmDialog.run(true, false, operation);
-			if(cancelFlagHolder[0]) {
-				return false;
-			}
-			else if (errMsg.length() > 0) {
-				LibraryUIPlugin.getDefault().getMsgDialog().displayError(
-						LibraryUIResources.upgradeLibraryDialog_title,
-						errMsg.toString());
-				return false;
-			}
-			return true;
-		} catch (Exception e) {
-			LibraryUIPlugin.getDefault().getLogger().logError(e);
-			e.printStackTrace();
-			LibraryUIPlugin.getDefault().getMsgDialog().displayError(
-					LibraryUIResources.upgradeLibraryDialog_title,
-					LibraryUIResources.upgradeLibraryError_msg);
-			return false;
-		}
-	}
-
-	/**
-	 * Returns the Library path set via the command line option "-library
-	 * <path>".
-	 */
-	public static String getCommandLineLibraryPath() {
-		return cmdLineLibPath;
-	}
-
-	/**
-	 * Sets the Library path via the command line option "-library <path>".
-	 */
-	public static void setCommandLineLibraryPath(String libPath) {
-		cmdLineLibPath = libPath;
-		IPath path = Path.fromOSString(libPath);
-		if (!path.isAbsolute()) {
-			// TODO: Review implementation.
-			cmdLineLibPath = System.getProperty("user.dir") + File.separator + libPath; //$NON-NLS-1$
-		}
-		if (XMILibraryUtil.isValidLibrary(cmdLineLibPath, true) != Status.OK_STATUS) {
-			cmdLineLibPath = null;
-		}
-	}
-
-	/**
-	 * Sets the Library path via the command line option "-defaultlibrary <path>".
-	 */
-	public static void setCommandLineDefaultLibraryPath(String libPath) {
-		cmdLineDefaultLibPath = libPath;
-		IPath path = Path.fromOSString(libPath);
-		if (!path.isAbsolute()) {
-			// TODO: Review implementation.
-			cmdLineDefaultLibPath = System.getProperty("user.dir") + File.separator + libPath; //$NON-NLS-1$
-		}
-		System.out.println("cmdLineDefaultLibPath=" + cmdLineDefaultLibPath);
-		if (XMILibraryUtil.isValidLibrary(cmdLineDefaultLibPath, true) != Status.OK_STATUS) {
-			cmdLineDefaultLibPath = null;
-		}
-	}
-	
-	/**
-	 * Converts lib path to absolute library path
-	 * 
-	 * @param libPath
-	 * @return Returns absolute library path
-	 */
-	public static String toAbsoluteLibraryPath(String libPath) {
-		String absPath = libPath;
-
-		IPath ecPath = Path.fromOSString(libPath);
-		if (!ecPath.isAbsolute()) {
-			// TODO: Review implementation.
-			absPath = System.getProperty("user.dir") + File.separator + //$NON-NLS-1$
-					"Method Libraries" + File.separator + libPath; //$NON-NLS-1$
-		}
-
-		return absPath;
-	}
-
-	/**
-	 * Display library locked message
-	 * 
-	 */
-	public static int displayLibraryLockedMessage() {
-		Shell shell = null;
-		Image image = null;
-		try {
-			shell = LibraryUIPlugin.getDefault().getWorkbench().getDisplay()
-					.getActiveShell();
-			image = shell.getImage();
-		} catch (Exception e) {
-		}
-		MessageDialog msgDlg = new MessageDialog(shell,
-				LibraryUIResources.openLibraryWizard_title, image,
-				LibraryUIResources.libraryLocked_msg, MessageDialog.ERROR,
-				new String[] {
-						LibraryUIResources.libraryLocked_openButton_text,
-						IDialogConstants.CANCEL_LABEL },
-				1);
-
-		return msgDlg.open();
-	}
-
-	/**
-	 * Returns application name
-	 * 
-	 */
-	public static String getAppName() {
-		return appName;
-	}
-
-	/**
-	 * Set application name
-	 * @param appName
-	 * 			Application name
-	 */
-	public static void setAppName(String appName) {
-		LibraryUIManager.appName = appName;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIPlugin.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIPlugin.java
deleted file mode 100755
index e8ccbe6..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIPlugin.java
+++ /dev/null
@@ -1,60 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui;
-
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * The Library UI plug-in class.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class LibraryUIPlugin extends AbstractPlugin {
-
-	// The shared plug-in instance.
-	private static LibraryUIPlugin plugin;
-
-	/**
-	 * Default constructor.
-	 */
-	public LibraryUIPlugin() {
-		super();
-		plugin = this;
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.common.plugin.AbstractPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-
-	/**
-	 * @see org.eclipse.epf.common.plugin.AbstractPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared plug-in instance.
-	 */
-	public static LibraryUIPlugin getDefault() {
-		return plugin;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIResources.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIResources.java
deleted file mode 100755
index 26e3456..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIResources.java
+++ /dev/null
@@ -1,409 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The Library UI Resources
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class LibraryUIResources extends NLS {
-
-	private static String BUNDLE_NAME = LibraryUIResources.class.getPackage()
-			.getName()
-			+ ".Resources"; //$NON-NLS-1$
-
-	public static String activity_text;
-
-	public static String artifact_text;
-
-	public static String capabilityPattern_text;
-
-	public static String checklist_text;
-
-	public static String checkItem_text;
-
-	public static String compositeRole_text;
-
-	public static String concept_text;
-
-	public static String contentPackage_text;
-
-	public static String customCategory_text;
-
-	public static String deliverable_text;
-
-	public static String deliveryProcess_text;
-
-	public static String descriptor_text;
-
-	public static String discipline_text;
-
-	public static String disciplineGrouping_text;
-
-	public static String domain_text;
-
-	public static String estimate_text;
-
-	public static String estimatingMetric_text;
-
-	public static String estimationConsiderations_text;
-
-	public static String example_text;
-
-	public static String guidance_text;
-
-	public static String guideline_text;
-
-	public static String iteration_text;
-
-	public static String methodConfiguration_text;
-
-	public static String methodContent_text;
-
-	public static String methodLibrary_text;
-
-	public static String methodPackage_text;
-
-	public static String methodPlugin_text;
-
-	public static String milestone_text;
-
-	public static String outcome_text;
-
-	public static String phase_text;
-
-	public static String practice_text;
-
-	public static String process_text;
-
-	public static String processContribution_text;
-
-	public static String processFamily_text;
-
-	public static String processPackage_text;
-
-	public static String report_text;
-
-	public static String reusableAsset_text;
-
-	public static String roadmap_text;
-
-	public static String roleDescriptor_text;
-
-	public static String role_text;
-
-	public static String roleSet_text;
-
-	public static String roleSetGrouping_text;
-
-	public static String standardCategory_text;
-
-	public static String step_text;
-
-	public static String supportingMaterial_text;
-
-	public static String task_text;
-
-	public static String taskDescriptor_text;
-
-	public static String teamProfile_text;
-
-	public static String template_text;
-
-	public static String termDefinition_text;
-
-	public static String tool_text;
-
-	public static String toolMentor_text;
-
-	public static String whitepaper_text;
-
-	public static String workProduct_text;
-
-	public static String workProductDescriptor_text;
-
-	public static String workProductElement_text;
-
-	public static String workProductType_text;
-
-	public static String activity_text_plural;
-
-	public static String artifact_text_plural;
-
-	public static String capabilityPattern_text_plural;
-
-	public static String checklist_text_plural;
-
-	public static String checkItem_text_plural;
-
-	public static String compositeRole_text_plural;
-
-	public static String concept_text_plural;
-
-	public static String contentPackage_text_plural;
-
-	public static String customCategory_text_plural;
-
-	public static String deliverable_text_plural;
-
-	public static String deliveryProcess_text_plural;
-
-	public static String descriptor_text_plural;
-
-	public static String discipline_text_plural;
-
-	public static String disciplineGrouping_text_plural;
-
-	public static String domain_text_plural;
-
-	public static String estimate_text_plural;
-
-	public static String estimatingMetric_text_plural;
-
-	public static String estimationConsiderations_text_plural;
-
-	public static String example_text_plural;
-
-	public static String guidance_text_plural;
-
-	public static String guideline_text_plural;
-
-	public static String iteration_text_plural;
-
-	public static String methodConfiguration_text_plural;
-
-	public static String methodContent_text_plural;
-
-	public static String methodLibrary_text_plural;
-
-	public static String methodPackage_text_plural;
-
-	public static String methodPlugin_text_plural;
-
-	public static String milestone_text_plural;
-
-	public static String outcome_text_plural;
-
-	public static String phase_text_plural;
-
-	public static String practice_text_plural;
-
-	public static String process_text_plural;
-
-	public static String processContribution_text_plural;
-
-	public static String processFamily_text_plural;
-
-	public static String processPackage_text_plural;
-
-	public static String report_text_plural;
-
-	public static String reusableAsset_text_plural;
-
-	public static String roadmap_text_plural;
-
-	public static String roleDescriptor_text_plural;
-
-	public static String role_text_plural;
-
-	public static String roleSet_text_plural;
-
-	public static String roleSetGrouping_text_plural;
-
-	public static String standardCategory_text_plural;
-
-	public static String step_text_plural;
-
-	public static String supportingMaterial_text_plural;
-
-	public static String task_text_plural;
-
-	public static String taskDescriptor_text_plural;
-
-	public static String teamProfile_text_plural;
-
-	public static String template_text_plural;
-
-	public static String termDefinition_text_plural;
-
-	public static String tool_text_plural;
-
-	public static String toolMentor_text_plural;
-
-	public static String whitepaper_text_plural;
-
-	public static String workProduct_text_plural;
-
-	public static String workProductDescriptor_text_plural;
-
-	public static String workProductElement_text_plural;
-
-	public static String workProductType_text_plural;
-
-	public static String application_title;
-
-	public static String openLibraryWizard_title;
-
-	public static String openLibraryMainWizardPage_title;
-
-	public static String openLibraryMainWizardPage_title_2;
-
-	public static String openLibraryMainWizardPage_text;
-
-	public static String pathLabel_text;
-
-	public static String nameLabel_text;
-
-	public static String uriLabel_text;
-
-	public static String openUnlistedLibraryCheckbox_text;
-
-	public static String libraryTypeLabel_text;
-
-	public static String libraryLabel_text;
-
-	public static String browseButton_text;
-
-	public static String promptForLibraryCheckbox_text;
-
-	public static String openLibraryDialog_newLibrary_text;
-
-	public static String selectLibraryFolderDialog_title;
-
-	public static String selectLibraryFolderDialog_text;
-
-	public static String openingLibraryTask_name;
-
-	public static String openLibraryError_msg;
-
-	public static String openLibraryInternlError_reason;
-
-	public static String openLibraryError_reason1;
-
-	public static String openLibraryError_reason2;
-
-	public static String openLibraryError_reason3;
-
-	public static String openLibraryError_reason4;
-
-	public static String openLibraryError_advice;
-
-	public static String invalidLibraryPath_msg;
-
-	public static String invalidLibraryPath_reason;
-
-	public static String libraryLocked_msg;
-
-	public static String libraryLocked_openButton_text;
-
-	public static String readOnlyProjectFile_text;
-
-	public static String retryButton_text;
-
-	public static String cancelButton_text;
-
-	public static String upgradeLibraryDialog_title;
-
-	public static String upgradeLibraryDialog_text;
-
-	public static String upgradingLibraryTask_name;
-
-	public static String upgradeLibraryError_msg;
-
-	public static String switchConfigDialog_title;
-
-	public static String switchConfigDialog_text;
-
-	public static String currentConfigLabel_text;
-
-	public static String selectConfigLabel_text;
-
-	public static String deleteFilesConfirmation_msg;
-
-	public static String deleteFilesError_reason;
-
-	public static String createPathError_reason;
-
-	public static String invalidPath_msg;
-
-	public static String backupLibraryDialog_title;
-
-	public static String backupLibraryDialog_text;
-
-	public static String backingUpLibraryTask_name;
-
-	public static String pathSelectionError_msg;
-
-	public static String okButton_text;
-
-	public static String skipButton_text;
-
-	public static String alwaysButton_text;
-
-	public static String neverButton_text;
-
-	public static String promptButton_text;
-
-	public static String linkToURL_name;
-
-	public static String linkToFile_name;
-
-	public static String elementLink_name;
-
-	public static String elementLinkWithType_name;
-
-	public static String elementLinkWithUserText_name;
-
-	public static String convertActivityDialog_title;
-
-	public static String convertActivityDialog_text;
-
-	public static String unsupportedActivityType_msg;
-
-	public static String unsupportedActivityType_reason;
-
-	public static String versionMismatchDialog_text;
-
-	public static String versionMismatchDialog_text_unknown;
-
-	public static String selectProcessWizardPage_title;
-
-	public static String selectProcessWizardPage_text;
-
-	public static String processesLabel_text;
-
-	public static String briefDescriptionLabel_text;
-	
-	public static String noOpenLibraryWarning_msg;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, LibraryUIResources.class);
-	}
-
-	/**
-	 * Returns the localized string associated with a resource key and formatted
-	 * with a given object.
-	 * 
-	 * @param key
-	 *            A resource key.
-	 * @param data
-	 *            An object.
-	 * @return A formatted localized string.
-	 */
-	public static String bind(String key, Object data) {
-		return NLS.bind(key, new Object[] { data });
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIText.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIText.java
deleted file mode 100755
index b763037..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIText.java
+++ /dev/null
@@ -1,486 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.impl.ActivityImpl;
-import org.eclipse.epf.uma.impl.ArtifactImpl;
-import org.eclipse.epf.uma.impl.CapabilityPatternImpl;
-import org.eclipse.epf.uma.impl.ChecklistImpl;
-import org.eclipse.epf.uma.impl.CompositeRoleImpl;
-import org.eclipse.epf.uma.impl.ConceptImpl;
-import org.eclipse.epf.uma.impl.ContentPackageImpl;
-import org.eclipse.epf.uma.impl.CustomCategoryImpl;
-import org.eclipse.epf.uma.impl.DeliverableImpl;
-import org.eclipse.epf.uma.impl.DeliveryProcessImpl;
-import org.eclipse.epf.uma.impl.DisciplineGroupingImpl;
-import org.eclipse.epf.uma.impl.DisciplineImpl;
-import org.eclipse.epf.uma.impl.DomainImpl;
-import org.eclipse.epf.uma.impl.EstimationConsiderationsImpl;
-import org.eclipse.epf.uma.impl.ExampleImpl;
-import org.eclipse.epf.uma.impl.GuidelineImpl;
-import org.eclipse.epf.uma.impl.IterationImpl;
-import org.eclipse.epf.uma.impl.MethodConfigurationImpl;
-import org.eclipse.epf.uma.impl.MethodLibraryImpl;
-import org.eclipse.epf.uma.impl.MethodPackageImpl;
-import org.eclipse.epf.uma.impl.MethodPluginImpl;
-import org.eclipse.epf.uma.impl.MilestoneImpl;
-import org.eclipse.epf.uma.impl.OutcomeImpl;
-import org.eclipse.epf.uma.impl.PhaseImpl;
-import org.eclipse.epf.uma.impl.PracticeImpl;
-import org.eclipse.epf.uma.impl.ProcessFamilyImpl;
-import org.eclipse.epf.uma.impl.ProcessPackageImpl;
-import org.eclipse.epf.uma.impl.ReportImpl;
-import org.eclipse.epf.uma.impl.ReusableAssetImpl;
-import org.eclipse.epf.uma.impl.RoadmapImpl;
-import org.eclipse.epf.uma.impl.RoleDescriptorImpl;
-import org.eclipse.epf.uma.impl.RoleImpl;
-import org.eclipse.epf.uma.impl.RoleSetGroupingImpl;
-import org.eclipse.epf.uma.impl.RoleSetImpl;
-import org.eclipse.epf.uma.impl.StepImpl;
-import org.eclipse.epf.uma.impl.SupportingMaterialImpl;
-import org.eclipse.epf.uma.impl.TaskDescriptorImpl;
-import org.eclipse.epf.uma.impl.TaskImpl;
-import org.eclipse.epf.uma.impl.TeamProfileImpl;
-import org.eclipse.epf.uma.impl.TemplateImpl;
-import org.eclipse.epf.uma.impl.TermDefinitionImpl;
-import org.eclipse.epf.uma.impl.ToolImpl;
-import org.eclipse.epf.uma.impl.ToolMentorImpl;
-import org.eclipse.epf.uma.impl.WhitepaperImpl;
-import org.eclipse.epf.uma.impl.WorkProductDescriptorImpl;
-import org.eclipse.epf.uma.impl.WorkProductImpl;
-import org.eclipse.epf.uma.impl.WorkProductTypeImpl;
-
-/**
- * Defines and caches the commonly referenced text in the Library UI.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class LibraryUIText {
-
-	public static final String TEXT_ACTIVITY = LibraryUIResources.activity_text;
-
-	public static final String TEXT_ARTIFACT = LibraryUIResources.artifact_text;
-
-	public static final String TEXT_CAPABILITY_PATTERN = LibraryUIResources.capabilityPattern_text;
-
-	public static final String TEXT_CHECKLIST = LibraryUIResources.checklist_text;
-
-	public static final String TEXT_CHECK_ITEM = LibraryUIResources.checkItem_text;
-
-	public static final String TEXT_COMPOSITE_ROLE = LibraryUIResources.compositeRole_text;
-
-	public static final String TEXT_CONCEPT = LibraryUIResources.concept_text;
-
-	public static final String TEXT_CONTENT_PACKAGE = LibraryUIResources.contentPackage_text;
-
-	public static final String TEXT_CUSTOM_CATEGORY = LibraryUIResources.customCategory_text;
-
-	public static final String TEXT_DELIVERABLE = LibraryUIResources.deliverable_text;
-
-	public static final String TEXT_DELIVERY_PROCESS = LibraryUIResources.deliveryProcess_text;
-
-	public static final String TEXT_DESCRIPTOR = LibraryUIResources.descriptor_text;
-
-	public static final String TEXT_DISCIPLINE = LibraryUIResources.discipline_text;
-
-	public static final String TEXT_DISCIPLINE_GROUPING = LibraryUIResources.disciplineGrouping_text;
-
-	public static final String TEXT_DOMAIN = LibraryUIResources.domain_text;
-
-	public static final String TEXT_ESTIMATE = LibraryUIResources.example_text;
-
-	public static final String TEXT_ESTIMATING_METRIC = LibraryUIResources.estimatingMetric_text;
-
-	public static final String TEXT_ESTIMATION_CONSIDERATIONS = LibraryUIResources.estimationConsiderations_text;
-
-	public static final String TEXT_EXAMPLE = LibraryUIResources.example_text;
-
-	public static final String TEXT_GUIDANCE = LibraryUIResources.guidance_text;
-
-	public static final String TEXT_GUIDELINE = LibraryUIResources.guideline_text;
-
-	public static final String TEXT_ITERATION = LibraryUIResources.iteration_text;
-
-	public static final String TEXT_METHOD_CONFIGURATON = LibraryUIResources.methodConfiguration_text;
-
-	public static final String TEXT_METHOD_CONTENT = LibraryUIResources.methodContent_text;
-
-	public static final String TEXT_METHOD_LIBARARY = LibraryUIResources.methodLibrary_text;
-
-	public static final String TEXT_METHOD_PACKAGE = LibraryUIResources.methodPackage_text;
-
-	public static final String TEXT_METHOD_PLUGIN = LibraryUIResources.methodPlugin_text;
-
-	public static final String TEXT_MILESTONE = LibraryUIResources.milestone_text;
-
-	public static final String TEXT_OUTCOME = LibraryUIResources.outcome_text;
-
-	public static final String TEXT_PHASE = LibraryUIResources.phase_text;
-
-	public static final String TEXT_PRACTICE = LibraryUIResources.practice_text;
-
-	public static final String TEXT_PROCESS = LibraryUIResources.process_text;
-
-	public static final String TEXT_PROCESS_CONTRIBUTION = LibraryUIResources.processContribution_text;
-
-	public static final String TEXT_PROCESS_FAMILY = LibraryUIResources.processFamily_text;
-
-	public static final String TEXT_PROCESS_PACKAGE = LibraryUIResources.processPackage_text;
-
-	public static final String TEXT_REPORT = LibraryUIResources.report_text;
-
-	public static final String TEXT_REUSABLE_ASSET = LibraryUIResources.reusableAsset_text;
-
-	public static final String TEXT_ROADMAP = LibraryUIResources.roadmap_text;
-
-	public static final String TEXT_ROLE = LibraryUIResources.role_text;
-
-	public static final String TEXT_ROLE_DESCRIPTOR = LibraryUIResources.roleDescriptor_text;
-
-	public static final String TEXT_ROLE_SET = LibraryUIResources.roleSet_text;
-
-	public static final String TEXT_ROLE_SET_GROUPING = LibraryUIResources.roleSetGrouping_text;
-
-	public static final String TEXT_STANDARD_CATEGORY = LibraryUIResources.standardCategory_text;
-
-	public static final String TEXT_STEP = LibraryUIResources.step_text;
-
-	public static final String TEXT_SUPPORTING_MATERIAL = LibraryUIResources.supportingMaterial_text;
-
-	public static final String TEXT_TASK = LibraryUIResources.task_text;
-
-	public static final String TEXT_TASK_DESCRIPTOR = LibraryUIResources.taskDescriptor_text;
-
-	public static final String TEXT_TEAM_PROFILE = LibraryUIResources.teamProfile_text;
-
-	public static final String TEXT_TEMPLATE = LibraryUIResources.template_text;
-
-	public static final String TEXT_TERM_DEFINITION = LibraryUIResources.termDefinition_text;
-
-	public static final String TEXT_TOOL = LibraryUIResources.tool_text;
-
-	public static final String TEXT_TOOL_MENTOR = LibraryUIResources.toolMentor_text;
-
-	public static final String TEXT_WHITEPAPER = LibraryUIResources.whitepaper_text;
-
-	public static final String TEXT_WORK_PRODUCT = LibraryUIResources.workProduct_text;
-
-	public static final String TEXT_WORK_PRODUCT_DESCRIPTOR = LibraryUIResources.workProductDescriptor_text;
-
-	public static final String TEXT_WORK_PRODUCT_ELEMENT = LibraryUIResources.workProductElement_text;
-
-	public static final String TEXT_WORK_PRODUCT_TYPE = LibraryUIResources.workProductType_text;
-
-	public static final String TEXT_ACTIVITY_PLURAL = LibraryUIResources.activity_text_plural;
-
-	public static final String TEXT_ARTIFACT_PLURAL = LibraryUIResources.artifact_text_plural;
-
-	public static final String TEXT_CAPABILITY_PATTERN_PLURAL = LibraryUIResources.capabilityPattern_text_plural;
-
-	public static final String TEXT_CHECKLIST_PLURAL = LibraryUIResources.checklist_text_plural;
-
-	public static final String TEXT_CHECK_ITEM_PLURAL = LibraryUIResources.checkItem_text_plural;
-
-	public static final String TEXT_COMPOSITE_ROLE_PLURAL = LibraryUIResources.compositeRole_text_plural;
-
-	public static final String TEXT_CONCEPT_PLURAL = LibraryUIResources.concept_text_plural;
-
-	public static final String TEXT_CONTENT_PACKAGE_PLURAL = LibraryUIResources.contentPackage_text_plural;
-
-	public static final String TEXT_CUSTOM_CATEGORY_PLURAL = LibraryUIResources.customCategory_text_plural;
-
-	public static final String TEXT_DELIVERABLE_PLURAL = LibraryUIResources.deliverable_text_plural;
-
-	public static final String TEXT_DELIVERY_PROCESS_PLURAL = LibraryUIResources.deliveryProcess_text_plural;
-
-	public static final String TEXT_DESCRIPTOR_PLURAL = LibraryUIResources.descriptor_text_plural;
-
-	public static final String TEXT_DISCIPLINE_PLURAL = LibraryUIResources.discipline_text_plural;
-
-	public static final String TEXT_DISCIPLINE_GROUPING_PLURAL = LibraryUIResources.disciplineGrouping_text_plural;
-
-	public static final String TEXT_DOMAIN_PLURAL = LibraryUIResources.domain_text_plural;
-
-	public static final String TEXT_ESTIMATE_PLURAL = LibraryUIResources.example_text_plural;
-
-	public static final String TEXT_ESTIMATING_METRIC_PLURAL = LibraryUIResources.estimatingMetric_text_plural;
-
-	public static final String TEXT_ESTIMATION_CONSIDERATIONS_PLURAL = LibraryUIResources.estimationConsiderations_text_plural;
-
-	public static final String TEXT_EXAMPLE_PLURAL = LibraryUIResources.example_text_plural;
-
-	public static final String TEXT_GUIDANCE_PLURAL = LibraryUIResources.guidance_text_plural;
-
-	public static final String TEXT_GUIDELINE_PLURAL = LibraryUIResources.guideline_text_plural;
-
-	public static final String TEXT_ITERATION_PLURAL = LibraryUIResources.iteration_text_plural;
-
-	public static final String TEXT_METHOD_CONFIGURATON_PLURAL = LibraryUIResources.methodConfiguration_text_plural;
-
-	public static final String TEXT_METHOD_CONTENT_PLURAL = LibraryUIResources.methodContent_text_plural;
-
-	public static final String TEXT_METHOD_LIBARARY_PLURAL = LibraryUIResources.methodLibrary_text_plural;
-
-	public static final String TEXT_METHOD_PACKAGE_PLURAL = LibraryUIResources.methodPackage_text_plural;
-
-	public static final String TEXT_METHOD_PLUGIN_PLURAL = LibraryUIResources.methodPlugin_text_plural;
-
-	public static final String TEXT_MILESTONE_PLURAL = LibraryUIResources.milestone_text_plural;
-
-	public static final String TEXT_OUTCOME_PLURAL = LibraryUIResources.outcome_text_plural;
-
-	public static final String TEXT_PHASE_PLURAL = LibraryUIResources.phase_text_plural;
-
-	public static final String TEXT_PRACTICE_PLURAL = LibraryUIResources.practice_text_plural;
-
-	public static final String TEXT_PROCESS_PLURAL = LibraryUIResources.process_text_plural;
-
-	public static final String TEXT_PROCESS_CONTRIBUTION_PLURAL = LibraryUIResources.processContribution_text_plural;
-
-	public static final String TEXT_PROCESS_FAMILY_PLURAL = LibraryUIResources.processFamily_text_plural;
-
-	public static final String TEXT_PROCESS_PACKAGE_PLURAL = LibraryUIResources.processPackage_text_plural;
-
-	public static final String TEXT_REPORT_PLURAL = LibraryUIResources.report_text_plural;
-
-	public static final String TEXT_REUSABLE_ASSET_PLURAL = LibraryUIResources.reusableAsset_text_plural;
-
-	public static final String TEXT_ROADMAP_PLURAL = LibraryUIResources.roadmap_text_plural;
-
-	public static final String TEXT_ROLE_PLURAL = LibraryUIResources.role_text_plural;
-
-	public static final String TEXT_ROLE_DESCRIPTOR_PLURAL = LibraryUIResources.roleDescriptor_text_plural;
-
-	public static final String TEXT_ROLE_SET_PLURAL = LibraryUIResources.roleSet_text_plural;
-
-	public static final String TEXT_ROLE_SET_GROUPING_PLURAL = LibraryUIResources.roleSetGrouping_text_plural;
-
-	public static final String TEXT_STANDARD_CATEGORY_PLURAL = LibraryUIResources.standardCategory_text_plural;
-
-	public static final String TEXT_STEP_PLURAL = LibraryUIResources.step_text_plural;
-
-	public static final String TEXT_SUPPORTING_MATERIAL_PLURAL = LibraryUIResources.supportingMaterial_text_plural;
-
-	public static final String TEXT_TASK_PLURAL = LibraryUIResources.task_text_plural;
-
-	public static final String TEXT_TASK_DESCRIPTOR_PLURAL = LibraryUIResources.taskDescriptor_text_plural;
-
-	public static final String TEXT_TEAM_PROFILE_PLURAL = LibraryUIResources.teamProfile_text_plural;
-
-	public static final String TEXT_TEMPLATE_PLURAL = LibraryUIResources.template_text_plural;
-
-	public static final String TEXT_TERM_DEFINITION_PLURAL = LibraryUIResources.termDefinition_text_plural;
-
-	public static final String TEXT_TOOL_PLURAL = LibraryUIResources.tool_text_plural;
-
-	public static final String TEXT_TOOL_MENTOR_PLURAL = LibraryUIResources.toolMentor_text_plural;
-
-	public static final String TEXT_WHITEPAPER_PLURAL = LibraryUIResources.whitepaper_text_plural;
-
-	public static final String TEXT_WORK_PRODUCT_PLURAL = LibraryUIResources.workProduct_text_plural;
-
-	public static final String TEXT_WORK_PRODUCT_DESCRIPTOR_PLURAL = LibraryUIResources.workProductDescriptor_text_plural;
-
-	public static final String TEXT_WORK_PRODUCT_ELEMENT_PLURAL = LibraryUIResources.workProductElement_text_plural;
-
-	public static final String TEXT_WORK_PRODUCT_TYPE_PLURAL = LibraryUIResources.workProductType_text_plural;
-
-	private static final Map ELEMENT_TEXT = new HashMap();
-
-	private static final Map ELEMENT_TEXT_PLURAL = new HashMap();
-
-	static {
-		ELEMENT_TEXT.put(ActivityImpl.class, TEXT_ACTIVITY);
-		ELEMENT_TEXT.put(ArtifactImpl.class, TEXT_ARTIFACT);
-		ELEMENT_TEXT.put(CapabilityPatternImpl.class, TEXT_CAPABILITY_PATTERN);
-		ELEMENT_TEXT.put(ChecklistImpl.class, TEXT_CHECKLIST);
-		ELEMENT_TEXT.put(CompositeRoleImpl.class, TEXT_COMPOSITE_ROLE);
-		ELEMENT_TEXT.put(ConceptImpl.class, TEXT_CONCEPT);
-		ELEMENT_TEXT.put(ContentPackageImpl.class, TEXT_CONTENT_PACKAGE);
-		ELEMENT_TEXT.put(CustomCategoryImpl.class, TEXT_CUSTOM_CATEGORY);
-		ELEMENT_TEXT.put(DeliverableImpl.class, TEXT_DELIVERABLE);
-		ELEMENT_TEXT.put(DeliveryProcessImpl.class, TEXT_DELIVERY_PROCESS);
-		ELEMENT_TEXT.put(DisciplineImpl.class, TEXT_DISCIPLINE);
-		ELEMENT_TEXT
-				.put(DisciplineGroupingImpl.class, TEXT_DISCIPLINE_GROUPING);
-		ELEMENT_TEXT.put(DomainImpl.class, TEXT_DOMAIN);
-		ELEMENT_TEXT.put(EstimationConsiderationsImpl.class,
-				TEXT_ESTIMATION_CONSIDERATIONS);
-		ELEMENT_TEXT.put(ExampleImpl.class, TEXT_EXAMPLE);
-		ELEMENT_TEXT.put(GuidelineImpl.class, TEXT_GUIDELINE);
-		ELEMENT_TEXT.put(IterationImpl.class, TEXT_ITERATION);
-		ELEMENT_TEXT.put(MethodConfigurationImpl.class,
-				TEXT_METHOD_CONFIGURATON);
-		ELEMENT_TEXT.put(MethodLibraryImpl.class, TEXT_METHOD_LIBARARY);
-		ELEMENT_TEXT.put(MethodPackageImpl.class, TEXT_METHOD_PACKAGE);
-		ELEMENT_TEXT.put(MethodPluginImpl.class, TEXT_METHOD_PLUGIN);
-		ELEMENT_TEXT.put(MilestoneImpl.class, TEXT_MILESTONE);
-		ELEMENT_TEXT.put(OutcomeImpl.class, TEXT_OUTCOME);
-		ELEMENT_TEXT.put(PhaseImpl.class, TEXT_PHASE);
-		ELEMENT_TEXT.put(PracticeImpl.class, TEXT_PRACTICE);
-		ELEMENT_TEXT.put(ProcessFamilyImpl.class, TEXT_PROCESS_FAMILY);
-		ELEMENT_TEXT.put(ProcessPackageImpl.class, TEXT_PROCESS_PACKAGE);
-		ELEMENT_TEXT.put(ReportImpl.class, TEXT_REPORT);
-		ELEMENT_TEXT.put(ReusableAssetImpl.class, TEXT_REUSABLE_ASSET);
-		ELEMENT_TEXT.put(RoadmapImpl.class, TEXT_ROADMAP);
-		ELEMENT_TEXT.put(RoleImpl.class, TEXT_ROLE);
-		ELEMENT_TEXT.put(RoleDescriptorImpl.class, TEXT_ROLE_DESCRIPTOR);
-		ELEMENT_TEXT.put(RoleSetImpl.class, TEXT_ROLE_SET);
-		ELEMENT_TEXT.put(RoleSetGroupingImpl.class, TEXT_ROLE_SET_GROUPING);
-		ELEMENT_TEXT.put(StepImpl.class, TEXT_STEP);
-		ELEMENT_TEXT
-				.put(SupportingMaterialImpl.class, TEXT_SUPPORTING_MATERIAL);
-		ELEMENT_TEXT.put(TaskImpl.class, TEXT_TASK);
-		ELEMENT_TEXT.put(TaskDescriptorImpl.class, TEXT_TASK_DESCRIPTOR);
-		ELEMENT_TEXT.put(TeamProfileImpl.class, TEXT_TEAM_PROFILE);
-		ELEMENT_TEXT.put(TemplateImpl.class, TEXT_TEMPLATE);
-		ELEMENT_TEXT.put(TermDefinitionImpl.class, TEXT_TERM_DEFINITION);
-		ELEMENT_TEXT.put(TemplateImpl.class, TEXT_TEMPLATE);
-		ELEMENT_TEXT.put(ToolImpl.class, TEXT_TOOL);
-		ELEMENT_TEXT.put(ToolMentorImpl.class, TEXT_TOOL_MENTOR);
-		ELEMENT_TEXT.put(WhitepaperImpl.class, TEXT_WHITEPAPER);
-		ELEMENT_TEXT.put(WorkProductImpl.class, TEXT_WORK_PRODUCT);
-		ELEMENT_TEXT.put(WorkProductDescriptorImpl.class,
-				TEXT_WORK_PRODUCT_DESCRIPTOR);
-		ELEMENT_TEXT.put(WorkProductTypeImpl.class, TEXT_WORK_PRODUCT_TYPE);
-
-		// plural
-		ELEMENT_TEXT_PLURAL.put(ActivityImpl.class, TEXT_ACTIVITY_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(ArtifactImpl.class, TEXT_ARTIFACT_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(CapabilityPatternImpl.class,
-				TEXT_CAPABILITY_PATTERN_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(ChecklistImpl.class, TEXT_CHECKLIST_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(CompositeRoleImpl.class,
-				TEXT_COMPOSITE_ROLE_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(ConceptImpl.class, TEXT_CONCEPT_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(ContentPackageImpl.class,
-				TEXT_CONTENT_PACKAGE_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(CustomCategoryImpl.class,
-				TEXT_CUSTOM_CATEGORY_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(DeliverableImpl.class, TEXT_DELIVERABLE_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(DeliveryProcessImpl.class,
-				TEXT_DELIVERY_PROCESS_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(DisciplineImpl.class, TEXT_DISCIPLINE_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(DisciplineGroupingImpl.class,
-				TEXT_DISCIPLINE_GROUPING_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(DomainImpl.class, TEXT_DOMAIN_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(EstimationConsiderationsImpl.class,
-				TEXT_ESTIMATION_CONSIDERATIONS_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(ExampleImpl.class, TEXT_EXAMPLE_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(GuidelineImpl.class, TEXT_GUIDELINE_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(IterationImpl.class, TEXT_ITERATION_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(MethodConfigurationImpl.class,
-				TEXT_METHOD_CONFIGURATON_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(MethodLibraryImpl.class,
-				TEXT_METHOD_LIBARARY_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(MethodPackageImpl.class,
-				TEXT_METHOD_PACKAGE_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(MethodPluginImpl.class,
-				TEXT_METHOD_PLUGIN_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(MilestoneImpl.class, TEXT_MILESTONE_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(OutcomeImpl.class, TEXT_OUTCOME_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(PhaseImpl.class, TEXT_PHASE_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(PracticeImpl.class, TEXT_PRACTICE_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(ProcessFamilyImpl.class,
-				TEXT_PROCESS_FAMILY_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(ProcessPackageImpl.class,
-				TEXT_PROCESS_PACKAGE_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(ReportImpl.class, TEXT_REPORT_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(ReusableAssetImpl.class,
-				TEXT_REUSABLE_ASSET_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(RoadmapImpl.class, TEXT_ROADMAP_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(RoleImpl.class, TEXT_ROLE_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(RoleDescriptorImpl.class,
-				TEXT_ROLE_DESCRIPTOR_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(RoleSetImpl.class, TEXT_ROLE_SET_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(RoleSetGroupingImpl.class,
-				TEXT_ROLE_SET_GROUPING_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(StepImpl.class, TEXT_STEP_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(SupportingMaterialImpl.class,
-				TEXT_SUPPORTING_MATERIAL_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(TaskImpl.class, TEXT_TASK_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(TaskDescriptorImpl.class,
-				TEXT_TASK_DESCRIPTOR_PLURAL);
-		ELEMENT_TEXT_PLURAL
-				.put(TeamProfileImpl.class, TEXT_TEAM_PROFILE_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(TemplateImpl.class, TEXT_TEMPLATE_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(TermDefinitionImpl.class,
-				TEXT_TERM_DEFINITION_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(TemplateImpl.class, TEXT_TEMPLATE_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(ToolImpl.class, TEXT_TOOL_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(ToolMentorImpl.class, TEXT_TOOL_MENTOR_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(WhitepaperImpl.class, TEXT_WHITEPAPER_PLURAL);
-		ELEMENT_TEXT_PLURAL
-				.put(WorkProductImpl.class, TEXT_WORK_PRODUCT_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(WorkProductDescriptorImpl.class,
-				TEXT_WORK_PRODUCT_DESCRIPTOR_PLURAL);
-		ELEMENT_TEXT_PLURAL.put(WorkProductTypeImpl.class,
-				TEXT_WORK_PRODUCT_TYPE_PLURAL);
-
-	}
-
-	/**
-	 * Returns the user friendly text for a Method element.
-	 */
-	public static String getUIText(MethodElement element) {
-		return getUIText(element, false);
-	}
-
-	/**
-	 * Returns the user friendly text for a Method element.
-	 * 
-	 * @param plural
-	 *            true to return the plural form
-	 */
-	public static String getUIText(MethodElement element, boolean plural) {
-		if (plural) {
-			String label = (String) ELEMENT_TEXT_PLURAL.get(element.getClass());
-			return (label == null) ? element.getName() : label;
-		} else {
-			String label = (String) ELEMENT_TEXT.get(element.getClass());
-			return (label == null) ? element.getName() : label;
-		}
-	}
-
-	/**
-	 * Returns the user friendly text for a Method element in lower case (except
-	 * for German).
-	 */
-	public static String getUITextLower(MethodElement element) {
-		return getUITextLower(element, false);
-	}
-
-	/**
-	 * Returns the user friendly text for a Method element in lower case (except
-	 * for German).
-	 * 
-	 * @param plural
-	 *            true to return the plural form
-	 */
-	public static String getUITextLower(MethodElement element, boolean plural) {
-		String label;
-		if (plural) {
-			label = (String) ELEMENT_TEXT_PLURAL.get(element.getClass());
-			label = (label == null) ? element.getName() : label;
-		} else {
-			label = (String) ELEMENT_TEXT.get(element.getClass());
-			label = (label == null) ? element.getName() : label;
-		}
-
-		return StrUtil.toLower(label);
-	}
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIUtil.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIUtil.java
deleted file mode 100755
index 2a147de..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIUtil.java
+++ /dev/null
@@ -1,51 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Helper utilities for implementing method library UI.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class LibraryUIUtil {
-
-	/**
-	 * Updates the application shell title to display the application name and
-	 * the default method library path.
-	 */
-	public static void updateShellTitle() {
-		IWorkbenchWindow window = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow();
-		if (window != null) {
-			Shell shell = window.getShell();
-			if (shell != null) {
-				String libPath = LibraryServiceUtil.getCurrentMethodLibraryPath(); 
-				if(libPath == null) {
-					libPath = LibraryService.getInstance().getCurrentMethodLibrary().getName();
-				}
-				String appName = Platform.getProduct().getName();
-				String appTitle = NLS.bind(LibraryUIResources.application_title,
-						new Object[] { appName, libPath });
-				shell.setText(appTitle);
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/Resources.properties b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/Resources.properties
deleted file mode 100755
index 87f20b3..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/Resources.properties
+++ /dev/null
@@ -1,242 +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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Method Element Names (Singular)
-activity_text=Activity
-artifact_text=Artifact
-capabilityPattern_text=Capability Pattern
-checklist_text=Checklist
-checkItem_text=Check Item
-compositeRole_text=Composite Role
-concept_text=Concept
-contentPackage_text=Content Package
-customCategory_text=Custom Category
-deliverable_text=Deliverable
-deliveryProcess_text=Delivery Process
-descriptor_text=Descriptor
-discipline_text=Discipline
-disciplineGrouping_text=Discipline Grouping
-domain_text=Domain
-estimate_text=Estimate
-estimatingMetric_text=Estimating Metric
-estimationConsiderations_text=Estimation Considerations
-example_text=Example
-guidance_text=Guidance
-guideline_text=Guideline
-iteration_text=Iteration
-methodConfiguration_text=Method Configuration
-methodContent_text=Method Content
-methodLibrary_text=Method Library
-methodPackage_text=Method Package
-methodPlugin_text=Method Plug-in
-milestone_text=Milestone
-outcome_text=Outcome
-phase_text=Phase
-practice_text=Practice
-process_text=Process
-processContribution_text=Differential Process
-processFamily_text=Process Family
-processPackage_text=Process Package
-report_text=Report
-reusableAsset_text=Reusable Asset
-roadmap_text=Roadmap
-roleDescriptor_text=Role Descriptor
-role_text=Role
-roleSet_text=Role Set
-roleSetGrouping_text=Role Set Grouping
-standardCategory_text=Standard Category
-step_text=Step
-supportingMaterial_text=Supporting Material
-task_text=Task
-taskDescriptor_text=Task Descriptor
-teamProfile_text=Team Profile
-template_text=Template
-termDefinition_text=Term Definition
-tool_text=Tool
-toolMentor_text=Tool Mentor
-whitepaper_text=Whitepaper
-workProduct_text=Work Product
-workProductDescriptor_text=Work Product Descriptor
-workProductElement_text=Work Product Element
-workProductType_text=Work Product Kind
-
-# Method Element Names (Plural)
-activity_text_plural=Activities
-artifact_text_plural=Artifacts
-capabilityPattern_text_plural=Capability Patterns
-checklist_text_plural=Checklists
-checkItem_text_plural=Check Items
-compositeRole_text_plural=Composite Roles
-concept_text_plural=Concepts
-contentPackage_text_plural=Content Packages
-customCategory_text_plural=Custom Categories
-deliverable_text_plural=Deliverables
-deliveryProcess_text_plural=Delivery Processes
-descriptor_text_plural=Descriptors
-discipline_text_plural=Disciplines
-disciplineGrouping_text_plural=Discipline Groupings
-domain_text_plural=Domains
-estimate_text_plural=Estimates
-estimatingMetric_text_plural=Estimating Metrics
-estimationConsiderations_text_plural=Estimation Considerations
-example_text_plural=Examples
-guidance_text_plural=Guidances
-guideline_text_plural=Guidelines
-iteration_text_plural=Iterations
-methodConfiguration_text_plural=Method Configurations
-methodContent_text_plural=Method Contents
-methodLibrary_text_plural=Method Libraries
-methodPackage_text_plural=Method Packages
-methodPlugin_text_plural=Method Plug-ins
-milestone_text_plural=Milestones
-outcome_text_plural=Outcomes
-phase_text_plural=Phases
-practice_text_plural=Practices
-process_text_plural=Processes
-processContribution_text_plural=Differential Processes
-processFamily_text_plural=Process Families
-processPackage_text_plural=Process Packages
-report_text_plural=Reports
-reusableAsset_text_plural=Reusable Assets
-roadmap_text_plural=Roadmaps
-roleDescriptor_text_plural=Role Descriptors
-role_text_plural=Roles
-roleSet_text_plural=Role Sets
-roleSetGrouping_text_plural=Role Set Groupings
-standardCategory_text_plural=Standard Categories
-step_text_plural=Steps
-supportingMaterial_text_plural=Supporting Materials
-task_text_plural=Tasks
-taskDescriptor_text_plural=Task Descriptors
-teamProfile_text_plural=Team Profiles
-template_text_plural=Templates
-termDefinition_text_plural=Term Definitions
-tool_text_plural=Tools
-toolMentor_text_plural=Tool Mentors
-whitepaper_text_plural=Whitepapers
-workProduct_text_plural=Work Products
-workProductDescriptor_text_plural=Work Product Descriptors
-workProductElement_text_plural=Work Product Elements
-workProductType_text_plural=Work Product Kinds
-
-# Application title.
-application_title={0} - {1}
-
-# Open Method Library Wizard
-openLibraryWizard_title=Open Method Library
-openLibraryMainWizardPage_title=Specify a path containing a method library
-openLibraryMainWizardPage_title_2=Select a method library
-openLibraryMainWizardPage_text={0} stores methods and processes in a folder called \na method library. Select a method library folder to use for this session.
-pathLabel_text=Path:
-nameLabel_text=Name:
-uriLabel_text=URI:
-openUnlistedLibraryCheckbox_text=Open a method library that is not listed above
-libraryTypeLabel_text=Type:
-libraryLabel_text=Library:
-browseButton_text=Browse...
-promptForLibraryCheckbox_text=Use this as the default and do not ask again.
-openLibraryDialog_newLibrary_text=No method library exists at ''{0}''.\nA new method library will be created and opened for you at the specified directory.\n\nClick OK to proceed or Cancel to specify another method library path.
-
-# Select Method Library Folder Dialog
-selectLibraryFolderDialog_title=Select Method Library
-selectLibraryFolderDialog_text=Select a method library folder.
-
-# Open Library Progress Message
-openingLibraryTask_name=Opening method library...
-
-# Open Method Library Error Dialog
-openLibraryError_msg=IUPA0014E: Unable to create the method library.
-openLibraryInternlError_reason=An internal error has occurred.
-openLibraryError_reason1=The specified method library path ''{0}'' is invalid.
-openLibraryError_reason2=A method library already exists in ''{0}''.
-openLibraryError_reason3=The specified method library folder ''{0}'' cannot be created.
-openLibraryError_reason4=The specified method library folder is a plugin or configuration specification export folder.
-openLibraryError_advice=Select OK to specify another method library name or location.
-
-# Open Method Library Error Messages
-invalidLibraryPath_msg=IUPL0300E: Unable to open the specified method library.
-invalidLibraryPath_reason=The selected method library folder is invalid, does not exist, or you do not have the proper permission to access it.\n\nClick OK to select another library folder.
-
-# Library Locked Error Dialog
-libraryLocked_msg=IUPL0303E: Unable to open the specified method library.\n\nThe selected method library appears to be in use. Click Cancel to select another library folder, or click Force Open if you want to open the library anyway.\n\nWARNING: Concurrent use of a method library may cause that library to become corrupted.
-libraryLocked_openButton_text=Force Open
-
-# Read-only Project File Error Dialog
-readOnlyProjectFile_text=IUPL0302E: ''{0}'' is read-only. Make it writable before continuing.
-retryButton_text=Retry
-cancelButton_text=Cancel
-
-# Version Mismatch Dialog
-versionMismatchDialog_text=IUPL305E: The selected library cannot be opened. You must upgrade {0} to version {1} or higher in order to open this library.
-versionMismatchDialog_text_unknown=IUPL306E: The selected library cannot be opened. You must upgrade {0} to a higher version in order to open this library.
-
-# Upgrade Method Library Dialog
-upgradeLibraryDialog_title=Upgrade Method Library
-upgradeLibraryDialog_text=The library you have selected needs to be upgraded to the new library structure.\n\nDo you want to proceed with the upgrade?
-upgradingLibraryTask_name=Upgrading method library...
-
-# Upgrade Library Error Dialog
-upgradeLibraryError_msg=IUPL0301E: Failed to upgrade the method library. Please see the log file for more details.
-
-# Switch Configuration Dialog
-switchConfigDialog_title=Switch Configuration
-switchConfigDialog_text=Do you want to switch the current configuration to the default configuration, ''{0}'', associated with the selected process?
-	
-# Configuration Combo
-currentConfigLabel_text=Current configuration:
-selectConfigLabel_text=Select a configuration
-
-# Delete Files Confirmation Message
-deleteFilesConfirmation_msg=The specified path ''{0}'' already exists. All files in the folder will be deleted. Do you want to proceed?
-
-# Paths/Files Error Messages
-deleteFilesError_reason=The path ''{0}'' contains one or more files that cannot be deleted.\n\nSelect another path and try again.
-createPathError_reason=Unable to create path ''{0}''.\n\nSelect another path and try again.
-invalidPath_msg=The specified path is not valid.
-
-# Backup Library Dialog
-backupLibraryDialog_title=Backup Library
-backupLibraryDialog_text=It is strongly recommended that you back up the current method library before proceeding.\n\nClick OK to create a backup copy of the library in the specified directory. Click Skip to continue without creating the backup.
-backingUpLibraryTask_name=Making a backup copy of library files ...
-
-# Path Selection Dialog
-pathSelectionError_msg=Unable to create dir
-okButton_text=OK
-skipButton_text=Skip
-
-# Process Editor preferences
-alwaysButton_text=Always
-neverButton_text=Never
-promptButton_text=Prompt
-
-# Add Link Dialog
-linkToURL_name=URL
-linkToFile_name=File
-elementLink_name=Method element
-elementLinkWithType_name=Method element with type prefix
-elementLinkWithUserText_name=Method element with custom text
-
-# Convert Activity Type Dialog
-convertActivityDialog_title=Convert Activity Type
-convertActivityDialog_text=Select the target activity type.
-unsupportedActivityType_msg=IUPL0304E: This activity cannot be converted to another type.
-unsupportedActivityType_reason=There is no compatible activity type for {0}.
-
-# Select Process Wizard Page
-selectProcessWizardPage_title=Select process
-selectProcessWizardPage_text=Select a capability pattern or delivery process to export.
-processesLabel_text=Processes:
-briefDescriptionLabel_text=Brief description:
-
-# Export Process Wizard Error Message.
-noOpenLibraryWarning_msg=No method library is currently opened. Click Cancel, open a method library or create a new one, and run this wizard again. 
-
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/actions/ConfigurationContributionItem.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/actions/ConfigurationContributionItem.java
deleted file mode 100755
index d3e4cad..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/actions/ConfigurationContributionItem.java
+++ /dev/null
@@ -1,313 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.library.ILibraryServiceListener;
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.prefs.LibraryPreferenceConstants;
-import org.eclipse.epf.library.services.NameCache;
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.jface.action.ContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.CoolBar;
-import org.eclipse.swt.widgets.CoolItem;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-
-/**
- * Adds the Configuration comboxbox to the system toolbar.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @author Jinhua Xi
- * @since 1.0
- */
-public class ConfigurationContributionItem extends ContributionItem {
-
-	private static Combo configCombo;
-	private static ComboViewer configComboViewer;
-	protected ToolItem item;
-	protected CoolItem coolItem;
-	private ILibraryServiceListener libSvcListener;
-
-	
-	// the "Select a configuration" string
-	private static final String SELECT_CONFIGURATION = LibraryUIResources.selectConfigLabel_text;
-
-	// content provider
-	protected static IStructuredContentProvider contentProviderConfigs = new AdapterFactoryContentProvider(
-			TngAdapterFactory.INSTANCE
-			.getNavigatorView_ComposedAdapterFactory()) {
-		public Object[] getElements(Object object) {
-			List configsList = new ArrayList();
-			if (LibraryService.getInstance().getCurrentMethodConfiguration() == null) {
-				configsList.add(SELECT_CONFIGURATION);
-			}
-			configsList.addAll(Arrays.asList(LibraryServiceUtil.getMethodConfigurations(LibraryService.getInstance().getCurrentMethodLibrary())));
-			return configsList.toArray();
-		}
-	};
-	
-	// label provider
-	protected ILabelProvider labelProviderConfigs = new AdapterFactoryLabelProvider(
-			TngAdapterFactory.INSTANCE
-					.getNavigatorView_ComposedAdapterFactory()) {
-		public String getText(Object object) {
-			if (object instanceof String) {
-				return (String) object;
-			}
-			else if (object instanceof MethodConfiguration) {
-				return ((MethodConfiguration)object).getName();
-			}
-			else return object.toString();
-		}
-	};
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ConfigurationContributionItem(IAction action) {
-	}
-
-	/* 
-	 * @see org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets.ToolBar, int)
-	 */
-	public void fill(ToolBar parent, int index) {
-		item = new ToolItem(parent, SWT.SEPARATOR);
-		Control box = createControl(parent);
-		item.setControl(box);
-		item.setWidth(240);
-	}
-
-	/* 
-	 * @see org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets.CoolBar, int)
-	 */
-	public void fill(CoolBar coolBar, int index) {
-		Control box = createControl(coolBar);
-
-		int flags = SWT.DROP_DOWN;
-		if (index >= 0) {
-			coolItem = new CoolItem(coolBar, flags, index);
-		} else {
-			coolItem = new CoolItem(coolBar, flags);
-		}
-		// Set the back reference.
-		coolItem.setData(this);
-
-		// Add the toolbar to the CoolItem widget.
-		coolItem.setControl(box);
-
-		// If the toolbar item exists then adjust the size of the cool item.
-		Point toolBarSize = box.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
-		// Set the preffered size to the size of the toolbar plus trim.
-		coolItem.setMinimumSize(toolBarSize);
-		coolItem.setPreferredSize(toolBarSize);
-		coolItem.setSize(toolBarSize);
-	}
-
-	/* 
-	 * @see org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets.Composite)
-	 */
-	public void fill(Composite parent) {
-		createControl(parent);
-	}
-
-	private Control createControl(Composite parent) {
-		configCombo = new Combo(parent, SWT.DROP_DOWN | SWT.READ_ONLY);
-		configCombo.setVisibleItemCount(10);
-		configCombo.setEnabled(true);
-		configComboViewer = new ComboViewer(configCombo);
-		configComboViewer.setContentProvider(contentProviderConfigs);
-		configComboViewer.setLabelProvider(labelProviderConfigs);
-		configComboViewer.setInput(LibraryService.getInstance().getCurrentMethodLibrary());
-		configComboViewer.setSorter(new ViewerSorter());
-
-
-		configComboViewer.addPostSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				performSelectionChanged();
-			}
-		});
-		
-		String savedConfigName = getSavedLastConfig();
-		MethodConfiguration savedConfig = LibraryServiceUtil.getMethodConfiguration(
-				LibraryService.getInstance().getCurrentMethodLibrary(), savedConfigName);
-		if (savedConfig != null) {
-			configComboViewer.setSelection(new StructuredSelection(savedConfig));
-		}
-		else {
-			configComboViewer.setSelection(new StructuredSelection(SELECT_CONFIGURATION));
-		}
-		
-		libSvcListener = new ILibraryServiceListener() {
-
-			public void configurationSet(MethodConfiguration config) {
-				selectConfiguration(config);
-			}
-
-			public void libraryClosed(MethodLibrary library) {
-				configComboViewer.setInput(null);
-			}
-
-			public void libraryCreated(MethodLibrary library) {
-				configComboViewer.setInput(library);
-				selectConfiguration(null);
-			}
-
-			public void libraryOpened(MethodLibrary library) {
-				configComboViewer.setInput(library);
-				refresh();
-			}
-
-			public void libraryReopened(MethodLibrary library) {
-				if (library != configComboViewer.getInput()) {
-					configComboViewer.setInput(library);
-					refresh();
-				}
-			}
-
-			public void librarySet(MethodLibrary library) {
-				if (library != configComboViewer.getInput()) {
-					configComboViewer.setInput(library);
-					if (library == null) {
-						selectConfiguration(null);
-					} else {
-						refresh();
-					}
-				}
-			}
-			
-		};
-		LibraryService.getInstance().addListener(libSvcListener);
-		
-		return configCombo;
-	}
-
-	/**
-	 * Returns currently selected method configuration
-	 */
-	private static MethodConfiguration getCurrentSelectedConfig() {
-		IStructuredSelection selection = (IStructuredSelection) configComboViewer.getSelection();
-		Object object = selection.getFirstElement();
-		if (object instanceof MethodConfiguration) {
-			return (MethodConfiguration)object;
-		}
-		return null;
-	}
-	
-	/**
-	 * Return currently selected method configuration name
-	 */
-	private static String getCurrentSelectedConfigName() {
-		IStructuredSelection selection = (IStructuredSelection) configComboViewer.getSelection();
-		Object object = selection.getFirstElement();
-		if (object != null && object instanceof MethodConfiguration) {
-			return ((MethodConfiguration)object).getName();
-		}
-		if (object instanceof String)
-			return (String)object;
-		return ""; //$NON-NLS-1$
-	}
-
-	
-	private static void performSelectionChanged() {
-		MethodConfiguration config = getCurrentSelectedConfig();
-		if (config != LibraryService.getInstance().getCurrentMethodConfiguration()) { 
-			LibraryService.getInstance().setCurrentMethodConfiguration(config);
-		}
-		saveSelectedConfigIntoPersistence();
-		refresh();
-	}
-
-	private static void saveSelectedConfigIntoPersistence() {
-		IPreferenceStore store = LibraryPlugin.getDefault()
-				.getPreferenceStore();
-		store
-				.setValue(
-						LibraryPreferenceConstants.PREF_SELECTED_CONFIG_IN_LAST_SESSION,
-						getCurrentSelectedConfigName());
-		LibraryPlugin.getDefault().savePluginPreferences();
-	}
-
-	private static String getSavedLastConfig() {
-		IPreferenceStore store = LibraryPlugin.getDefault()
-				.getPreferenceStore();
-		return store
-				.getString(LibraryPreferenceConstants.PREF_SELECTED_CONFIG_IN_LAST_SESSION);
-	}
-
-	/* 
-	 * @see org.eclipse.jface.action.ContributionItem#dispose()
-	 */
-	public void dispose() {
-		if(libSvcListener != null) {
-			LibraryService.getInstance().removeListener(libSvcListener);
-		}
-		
-		if ( configCombo != null && !configCombo.isDisposed() ) {
-			configCombo.dispose();
-		}
-		super.dispose();
-	}
-	
-	/**
-	 * Refresh configuration combo
-	 */
-	public static void refresh() {
-		configComboViewer.refresh();
-	}
-	
-	/**
-	 * Select configuration in configuration combo box
-	 * @param config
-	 */
-	public static void selectConfiguration(MethodConfiguration config) {
-		NameCache.getInstance().clear();
-		if (config != null && config == getCurrentSelectedConfig()) {
-			return;
-		}
-		if (config != null) {
-			configComboViewer.setSelection(new StructuredSelection(config));
-		}
-		else {
-			// config is null, so select the "Select a configuration item"
-			// first refresh list so that the "Select a config.." string gets added to the list
-			refresh();
-			configComboViewer.setSelection(new StructuredSelection(SELECT_CONFIGURATION), true);
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/actions/OpenLibraryAction.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/actions/OpenLibraryAction.java
deleted file mode 100755
index 1947f28..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/actions/OpenLibraryAction.java
+++ /dev/null
@@ -1,63 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.actions;
-
-import org.eclipse.epf.library.ui.wizards.OpenLibraryWizard;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * Implements the Open Library action.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class OpenLibraryAction implements IWorkbenchWindowActionDelegate {
-
-	private IWorkbenchWindow window;
-
-	/**
-	 * @see IWorkbenchWindowActionDelegate#init
-	 */
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-	}
-
-	/**
-	 * @see IWorkbenchWindowActionDelegate#selectionChanged
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	/**
-	 * @see IWorkbenchWindowActionDelegate#run
-	 */
-	public void run(IAction action) {
-		OpenLibraryWizard wizard = new OpenLibraryWizard();
-		wizard.init(window.getWorkbench(), null);
-		Shell shell = Display.getCurrent().getActiveShell();
-		WizardDialog dialog = new WizardDialog(shell, wizard);
-		dialog.create();
-		dialog.open();
-	}
-
-	/**
-	 * @see IWorkbenchWindowActionDelegate#dispose
-	 */
-	public void dispose() {
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/actions/package.html b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/actions/package.html
deleted file mode 100755
index 3e54c9a..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/actions/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides actions for managing a method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/BaseDialog.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/BaseDialog.java
deleted file mode 100755
index 92dcd78..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/BaseDialog.java
+++ /dev/null
@@ -1,74 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.dialogs;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The base class for all Library UI dialogs.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class BaseDialog extends TitleAreaDialog {
-
-	/**
-	 * The OK button.
-	 */
-	protected Button okButton;
-
-	/**
-	 * The Cancel button.
-	 */
-	protected Button cancelButton;
-
-	/**
-	 * Creates a new instance given the parent control.
-	 * 
-	 * @param parent
-	 *            The parent control.
-	 */
-	public BaseDialog(Shell parent) {
-		super(parent);
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(Composite parent)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		return super.createDialogArea(parent);
-	}
-
-	/**
-	 * Creates the dialog buttons.
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		// Create the OK button.
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
-				true);
-
-		// Create the Cancel button.
-		createButton(parent, IDialogConstants.CANCEL_ID,
-				IDialogConstants.CANCEL_LABEL, false);
-
-		// Set help context for the OK button.
-		okButton = super.getButton(IDialogConstants.OK_ID);
-
-		// Set help context for the Cancel button.
-		cancelButton = super.getButton(IDialogConstants.CANCEL_ID);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/ConvertActivityDialog.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/ConvertActivityDialog.java
deleted file mode 100755
index 4e4eec8..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/ConvertActivityDialog.java
+++ /dev/null
@@ -1,131 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.dialogs;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.LibraryResources;
-import org.eclipse.epf.library.edit.command.DeleteMethodElementCommand;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.library.util.ConvertActivityType;
-import org.eclipse.epf.library.util.TypeConverter;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ListDialog;
-
-/**
- * Dialog to convert activity type 
- * 
- * @author Jeff Hardy
- * @since 1.0
- */
-public class ConvertActivityDialog {
-
-	/**
-	 * Query user and convert the old activity into new one
-	 * 
-	 * @param oldActivity
-	 * @param shell
-	 * @param command
-	 * 
-	 * @return Newly converted activity
-	 */
-	public static Activity queryUserAndConvert(Activity oldActivity, Shell shell,
-			DeleteMethodElementCommand command) {
-		
-		if (shell == null)
-			shell = Display.getCurrent().getActiveShell();
-		ListDialog dlg = new ListDialog(shell);
-		dlg.setHeightInChars(5);
-		dlg.setContentProvider(new ArrayContentProvider());
-		dlg.setLabelProvider(new LabelProvider() {
-			public String getText(Object element) {
-				switch (((Integer) element).intValue()) {
-				// TODO: refactor these strings (and this whole dialog) into
-				// library.ui
-				case UmaPackage.ACTIVITY:
-					return LibraryUIText.TEXT_ACTIVITY;
-				case UmaPackage.ITERATION:
-					return LibraryUIText.TEXT_ITERATION;
-				case UmaPackage.PHASE:
-					return LibraryUIText.TEXT_PHASE;
-				default:
-					return LibraryResources.unknownGuidance_text; //$NON-NLS-1$
-				}
-
-			}
-		});
-		List newActivityTypeList = getValidNewActivityTypes(oldActivity);
-		if (newActivityTypeList == null) {
-			LibraryUIPlugin
-					.getDefault()
-					.getMsgDialog()
-					.displayError(
-							LibraryResources.convertActivityError_title, //$NON-NLS-1$
-							LibraryUIResources.unsupportedActivityType_msg,
-							LibraryUIResources.bind(LibraryUIResources.unsupportedActivityType_reason, StrUtil.toLower(TngUtil.getTypeText(oldActivity))));
-			return null;
-		}
-		dlg.setInput(newActivityTypeList);
-		dlg.setTitle(LibraryUIResources.convertActivityDialog_title);
-		dlg.setMessage(LibraryUIResources.convertActivityDialog_text);
-		if (dlg.open() == Dialog.CANCEL)
-			return null;
-
-		Object[] selectionResult = dlg.getResult();
-		if (selectionResult == null)
-			return null;
-		int chosenActivity = ((Integer) selectionResult[0]).intValue();
-		
-//		return ConvertActivityType.convertActivity(oldActivity, chosenActivity, command);
-		
-		return TypeConverter.convertActivity(oldActivity, TypeConverter.getActivityType(chosenActivity));
-	}
-	
-	/**
-	 * Gets list of valid new activity types based on old activity type
-	 * 
-	 * @param oldActivity
-	 * 
-	 * @return list of valid activity types
-	 * 
-	 */
-	public static List getValidNewActivityTypes(Activity oldActivity) {
-		if (oldActivity == null)
-			return null;
-		Integer oldActivityClassID = new Integer(oldActivity.eClass()
-				.getClassifierID());
-		if (!ConvertActivityType.compatibleActivitiesList.contains(oldActivityClassID))
-			return null;
-		List activityList = new ArrayList();
-		for (Iterator iter = ConvertActivityType.compatibleActivitiesList.iterator(); iter.hasNext();) {
-			Integer compatibleActivityTypeClassID = (Integer)iter.next();
-			if (!oldActivityClassID.equals(compatibleActivityTypeClassID) &&
-					compatibleActivityTypeClassID.intValue() != UmaPackage.CAPABILITY_PATTERN &&
-					compatibleActivityTypeClassID.intValue() != UmaPackage.DELIVERY_PROCESS)
-				activityList.add(compatibleActivityTypeClassID);
-		}
-		return activityList;
-	}
-
-	
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/LibraryBackupDialog.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/LibraryBackupDialog.java
deleted file mode 100755
index 9eb5bbf..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/LibraryBackupDialog.java
+++ /dev/null
@@ -1,48 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.dialogs;
-
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Utility class to back up library.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class LibraryBackupDialog extends PathSelectionDialog {
-
-	public LibraryBackupDialog(Shell parentShell, String dialogTitle,
-			String dialogMessage, String defaultPath) {
-		super(parentShell, dialogTitle, dialogMessage, defaultPath);
-	}
-
-	
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#createButton(org.eclipse.swt.widgets.Composite, int, java.lang.String, boolean)
-	 */
-	protected Button createButton(Composite parent, int id, String label,
-			boolean defaultButton) {
-		Button b = super.createButton(parent, id, label, defaultButton);
-		if (id == IDialogConstants.OK_ID) {
-			b.setText(LibraryUIResources.okButton_text);
-
-		} else if (id == IDialogConstants.CANCEL_ID) {
-			b.setText(LibraryUIResources.skipButton_text);
-		}
-
-		return b;
-	}
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/OpenLibraryDialog.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/OpenLibraryDialog.java
deleted file mode 100755
index daade52..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/OpenLibraryDialog.java
+++ /dev/null
@@ -1,238 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.dialogs;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Prompts the user to select a Method Library folder.
- * 
- * @author Kelvin Low
- * @author 1.0
- * 
- * fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=154638
- */
-public class OpenLibraryDialog extends BaseDialog implements Listener {
-
-	private Image titleImage;
-
-	private Text libraryPathText;
-
-	private String libraryPath;
-
-	private Button promptForLibraryCheckbox;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param parent
-	 *            The parent control.
-	 * @param libraryPath
-	 *            Path to a Method Library.
-	 */
-	public OpenLibraryDialog(Shell parent, String libraryPath) {
-		super(parent);
-		this.libraryPath = libraryPath;
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.ui.dialogs.BaseDialog#createDialogArea(Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		final Composite dialogArea = (Composite) super.createDialogArea(parent);
-
-		setTitle(LibraryUIResources.openLibraryMainWizardPage_title);
-		String appName = Platform.getProduct().getName();
-		String openLibDtext = NLS.bind(LibraryUIResources.openLibraryMainWizardPage_text,
-				new Object[] { appName});
-		setMessage(openLibDtext);
-		titleImage = LibraryUIPlugin.getDefault().getImage("OpenLibrary.gif"); //$NON-NLS-1$
-		setTitleImage(titleImage);
-
-		Composite inputComposite = new Composite(dialogArea, SWT.NONE);
-		inputComposite.setLayout(new GridLayout(3, false));
-
-		createLabel(inputComposite, " ", 3); //$NON-NLS-1$
-
-		Label libraryLabel = new Label(inputComposite, SWT.NONE);
-		libraryLabel.setText(LibraryUIResources.libraryLabel_text);
-
-		libraryPathText = new Text(inputComposite, SWT.BORDER);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.widthHint = 450;
-		libraryPathText.setLayoutData(gridData);
-
-		libraryPathText.setText(libraryPath);
-		libraryPathText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (okButton != null) {
-					String status = isValidPath(libraryPathText.getText());
-					if (status == null) {
-						setErrorMessage(null);
-						okButton.setEnabled(true);
-					} else {
-						setErrorMessage(status);
-						okButton.setEnabled(false);
-					}
-				}
-			}
-		});
-
-		Button browseButton = new Button(inputComposite, SWT.NONE);
-		browseButton.setText(LibraryUIResources.browseButton_text);
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				try {
-					SelectLibraryDirectoryDialog dd = new SelectLibraryDirectoryDialog(
-							Display.getCurrent().getActiveShell());
-					dd.setFilterPath(libraryPathText.getText());
-					String path = dd.open();
-					if (path != null) {
-						libraryPathText.setText(path);
-					}
-				} catch (Exception e) {
-					// TODO: Display an error dialog.
-					e.printStackTrace();
-				}
-			}
-		});
-
-		createLabel(inputComposite, " ", 3); //$NON-NLS-1$
-		createLabel(inputComposite, " ", 3); //$NON-NLS-1$
-		createLabel(inputComposite, " ", 3); //$NON-NLS-1$
-		new Label(inputComposite, SWT.CHECK);
-
-		promptForLibraryCheckbox = new Button(inputComposite, SWT.CHECK);
-		promptForLibraryCheckbox
-				.setText(LibraryUIResources.promptForLibraryCheckbox_text);
-
-		super.getShell().setText(LibraryUIResources.openLibraryWizard_title);
-
-		super.getShell().addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent event) {
-				if (titleImage != null && !titleImage.isDisposed()) {
-					titleImage.dispose();
-				}
-			}
-		});
-
-		return dialogArea;
-	}
-
-	/** 
-	 * @see org.eclipse.jface.window.Window#open()
-	 */
-	public int open() {
-		setShellStyle(getShellStyle() | SWT.APPLICATION_MODAL);
-		return super.open();
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		if (event.widget == promptForLibraryCheckbox) {
-			LibraryUIPreferences
-					.setPromptForMethodLibraryAtStartup(promptForLibraryCheckbox
-							.getSelection());
-		}
-	}
-
-	private Label createLabel(Composite parent, String text, int span) {
-		Label label = new Label(parent, SWT.LEFT);
-		label.setText(text);
-		GridData data = new GridData();
-		data.horizontalSpan = span;
-		data.horizontalAlignment = GridData.FILL;
-		label.setLayoutData(data);
-		return label;
-	}
-
-	private String isValidPath(String path) {
-		if (path == null || path.trim().length() == 0) {
-			return LibraryUIResources.invalidPath_msg;
-		}
-
-		IPath ecPath = Path.fromOSString(path);
-		boolean isValid = ecPath.isValidPath(path);
-		if (!isValid) {
-			return LibraryUIResources.invalidPath_msg;
-		} else {
-			if (!StrUtil.isValidPublishPath(path))
-				return LibraryUIResources.invalidPath_msg;
-			else
-				return null;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.epf.library.ui.dialogs.BaseDialog#createButtonsForButtonBar(Composite
-	 *      parent)
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		super.createButtonsForButtonBar(parent);
-		okButton.setEnabled(true);
-	}
-
-	/**
-	 * Called when the OK button is selected.
-	 */
-	protected void okPressed() {
-		libraryPath = libraryPathText.getText().trim();
-		LibraryUIPreferences
-				.setPromptForMethodLibraryAtStartup(!promptForLibraryCheckbox
-						.getSelection());
-		super.okPressed();
-	}
-
-	/**
-	 * Called when the Cancel button is selected.
-	 * 
-	 * TODO: This will shutdown the Eclipse IDE.
-	 */
-	protected void cancelPressed() {
-		System.exit(0);
-	}
-
-	/**
-	 * Returns the selected Method Library path.
-	 */
-	public String getLibraryPath() {
-		return libraryPath;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/PathSelectionDialog.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/PathSelectionDialog.java
deleted file mode 100755
index 41cae2a..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/PathSelectionDialog.java
+++ /dev/null
@@ -1,167 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.dialogs;
-
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.library.ui.wizards.DirectoryValidator;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * 
- * Utility class to select a path
- * 
- * @author Jinhua Xi
- * 
- */
-public class PathSelectionDialog extends Dialog {
-
-	protected Text ctrl_path;
-
-	protected Button ctrl_browse_button;
-
-	protected String title;
-
-	protected String message;
-
-	protected String value;
-
-	public PathSelectionDialog(Shell parentShell, String dialogTitle,
-			String dialogMessage, String defaultPath) {
-		super(parentShell);
-
-		title = dialogTitle;
-		message = dialogMessage;
-		value = defaultPath;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
-	 */
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.OK_ID) {
-			value = ctrl_path.getText();
-
-			// make sure the path is valid
-			String msg = LibraryUIResources.pathSelectionError_msg;
-			if (DirectoryValidator.checkAndCreateDir(value, title, msg) == false) {
-				return;
-			}
-		} else {
-			value = null;
-		}
-		super.buttonPressed(buttonId);
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		if (title != null)
-			shell.setText(title);
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		// create OK and Cancel buttons by default
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
-				true);
-
-		createButton(parent, IDialogConstants.CANCEL_ID,
-				IDialogConstants.CANCEL_LABEL, false);
-
-		// do this here because setting the text will set enablement on the ok
-		// button
-		ctrl_path.setFocus();
-		if (value != null) {
-			ctrl_path.setText(value);
-			ctrl_path.selectAll();
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		// create composite
-		Composite composite = (Composite) super.createDialogArea(parent);
-		// create message
-		if (message != null) {
-			Label label = new Label(composite, SWT.WRAP);
-			label.setText(message);
-			GridData data = new GridData(GridData.GRAB_HORIZONTAL
-					| GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL
-					| GridData.VERTICAL_ALIGN_CENTER);
-			data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
-			label.setLayoutData(data);
-			label.setFont(parent.getFont());
-		}
-		ctrl_path = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		ctrl_path.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
-				| GridData.HORIZONTAL_ALIGN_FILL));
-
-		ctrl_browse_button = new Button(composite, SWT.NONE);
-		ctrl_browse_button.setLayoutData(new GridData(
-				GridData.HORIZONTAL_ALIGN_END));
-		ctrl_browse_button.setText(LibraryUIResources.browseButton_text);
-		ctrl_browse_button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				openDirectoryDialog();
-			}
-		});
-
-		applyDialogFont(composite);
-		return composite;
-	}
-
-	/**
-	 * Open directory dialog
-	 *
-	 */
-	private void openDirectoryDialog() {
-		try {
-			// Text ctrl_path = super.getText();
-			DirectoryDialog dd = new DirectoryDialog(this.getShell(), SWT.NONE);
-			dd.setFilterPath(ctrl_path.getText());
-
-			String destination = dd.open();
-			if (destination != null) {
-				ctrl_path.setText(destination);
-			}
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-	}
-
-	/**
-	 * Returns the path
-	 * @return path
-	 */
-	public String getPath() {
-		return value;
-	}
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/SelectLibraryDirectoryDialog.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/SelectLibraryDirectoryDialog.java
deleted file mode 100755
index 28ca7fe..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/SelectLibraryDirectoryDialog.java
+++ /dev/null
@@ -1,71 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.dialogs;
-
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Promps the user to select a method library folder.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class SelectLibraryDirectoryDialog {
-
-	private DirectoryDialog dialog;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param parent
-	 *            The parent shell.
-	 */
-	public SelectLibraryDirectoryDialog(Shell parent) {
-		this(parent, SWT.NONE);
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param parent
-	 *            The parent shell.
-	 * @param style
-	 *            The dialog style.
-	 */
-	public SelectLibraryDirectoryDialog(Shell parent, int style) {
-		dialog = new DirectoryDialog(parent, style);
-		dialog.setText(LibraryUIResources.selectLibraryFolderDialog_title);
-		dialog.setMessage(LibraryUIResources.selectLibraryFolderDialog_text);
-		dialog.setFilterPath(LibraryUIPreferences.getDefaultLibraryPath());
-	}
-
-	/**
-	 * Sets the filter path.
-	 * 
-	 * @param path
-	 *            The filter path.
-	 */
-	public void setFilterPath(String path) {
-		dialog.setFilterPath(path);
-	}
-
-	/**
-	 * Makes the dialog visible and brings it to the front of the display.
-	 */
-	public String open() {
-		return dialog.open();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/SwitchConfigDialog.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/SwitchConfigDialog.java
deleted file mode 100755
index c285733..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/SwitchConfigDialog.java
+++ /dev/null
@@ -1,108 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.dialogs;
-
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Prompts the user to switch the current Configuration to a recommended
- * Configuration.
- * 
- * @author Jeff Hardy
- * @author Kelvin Low
- * @since 1.0
- */
-public class SwitchConfigDialog {
-
-	private MethodConfiguration recommendedConfig;
-
-	private Shell shell;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param shell
-	 *            The parent shell.
-	 * @param recommendedConfig
-	 *            The recommended configuration.
-	 */
-	public SwitchConfigDialog(Shell shell, MethodConfiguration recommendedConfig) {
-		this.shell = shell;
-		this.recommendedConfig = recommendedConfig;
-	}
-
-	/**
-	 * Displays the dialog iff the given recommendedConfig is different than the
-	 * currently selected config
-	 * 
-	 * returns IDialogConstants.OK_ID if dialog wasn't shown, or if config was
-	 * switched returns IDialogConstants.CANCEL_ID if dialog was shown and user
-	 * did not click Yes
-	 */
-	public void execute() {
-		if (recommendedConfig == null) {
-			return;
-		}
-		String switchConfigPref = LibraryUIPreferences.getSwitchConfig();
-		if (MessageDialogWithToggle.NEVER.equals(switchConfigPref)) {
-			// Call this to refresh active part if needed.
-			// TODO: Review implementation.
-			LibraryService.getInstance().setCurrentMethodConfiguration(
-					LibraryService.getInstance()
-							.getCurrentMethodConfiguration());
-			return;
-		}
-		if (LibraryService.getInstance().getCurrentMethodConfiguration() != recommendedConfig) {
-			String configName = recommendedConfig.getName();
-			if (MessageDialogWithToggle.PROMPT.equals(switchConfigPref)) {
-				MessageDialogWithToggle dialog = MessageDialogWithToggle
-						.openYesNoQuestion(shell,
-								LibraryUIResources.switchConfigDialog_title,
-								LibraryUIResources
-								.bind(
-										LibraryUIResources.switchConfigDialog_text,
-										configName),
-								null, false, LibraryUIPlugin.getDefault()
-										.getPreferenceStore(),
-								LibraryUIPreferences.PREF_SWITCH_CONFIG);
-				if (dialog.getReturnCode() == IDialogConstants.YES_ID) {
-					MethodConfiguration config = LibraryServiceUtil
-							.getMethodConfiguration(LibraryService
-									.getInstance().getCurrentMethodLibrary(),
-									configName);
-					LibraryService.getInstance().setCurrentMethodConfiguration(
-							config);
-				} else {
-					// Call this to refresh active part if needed.
-					// TODO: Review implementation.
-					LibraryService.getInstance().setCurrentMethodConfiguration(
-							LibraryService.getInstance()
-									.getCurrentMethodConfiguration());
-				}
-			} else if (MessageDialogWithToggle.ALWAYS.equals(switchConfigPref)) {
-				MethodConfiguration config = LibraryServiceUtil
-						.getMethodConfiguration(LibraryService.getInstance()
-								.getCurrentMethodLibrary(), configName);
-				LibraryService.getInstance().setCurrentMethodConfiguration(
-						config);
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/package.html b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/package.html
deleted file mode 100755
index 540076c..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/dialogs/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides dialogs for managing a method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/internal/wizards/NewLibraryWizardPageContribution.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/internal/wizards/NewLibraryWizardPageContribution.java
deleted file mode 100755
index 74136a6..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/internal/wizards/NewLibraryWizardPageContribution.java
+++ /dev/null
@@ -1,86 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.internal.wizards;
-
-import org.osgi.framework.Bundle;
-
-/**
- * Models the <newLibraryWizardPage> element in the
- * "org.eclipse.epf.librray.ui.newLibraryWizardPages" extension point.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class NewLibraryWizardPageContribution {
-
-	// The plug-in that contributed this provider.
-	private Bundle bundle;
-
-	// The wizard page class name.
-	private String className;
-
-	// The library type identifier.
-	private String typeId;
-
-	// The wizard page title.
-	private String title;
-
-	// The wizard page description.
-	private String description;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public NewLibraryWizardPageContribution(Bundle bundle, String className,
-			String typeId, String title, String description) {
-		this.bundle = bundle;
-		this.className = className;
-		this.typeId = typeId;
-		this.title = title;
-		this.description = description;
-	}
-
-	/**
-	 * Returns the plug-in that contributed this provider.
-	 */
-	public Bundle getBundle() {
-		return bundle;
-	}
-
-	/**
-	 * Returns the wizard page class name.
-	 */
-	public String getClassName() {
-		return className;
-	}
-
-	/**
-	 * Returns the method library type identifier.
-	 */
-	public String getTypeId() {
-		return typeId;
-	}
-
-	/**
-	 * Returns the wizard page title.
-	 */
-	public String getTitle() {
-		return title;
-	}
-
-	/**
-	 * Returns the wizard page description.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/internal/wizards/OpenLibraryWizardPageContribution.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/internal/wizards/OpenLibraryWizardPageContribution.java
deleted file mode 100755
index dd77c4e..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/internal/wizards/OpenLibraryWizardPageContribution.java
+++ /dev/null
@@ -1,86 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.internal.wizards;
-
-import org.osgi.framework.Bundle;
-
-/**
- * Models the <openLibraryWizardPage> element in the
- * "org.eclipse.epf.librray.ui.openLibraryWizardPages" extension point.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class OpenLibraryWizardPageContribution {
-
-	// The plug-in that contributed this provider.
-	private Bundle bundle;
-
-	// The wizard page class name.
-	private String className;
-
-	// The library type identifier.
-	private String typeId;
-
-	// The wizard page title.
-	private String title;
-
-	// The wizard page description.
-	private String description;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public OpenLibraryWizardPageContribution(Bundle bundle, String className,
-			String typeId, String title, String description) {
-		this.bundle = bundle;
-		this.className = className;
-		this.typeId = typeId;
-		this.title = title;
-		this.description = description;
-	}
-
-	/**
-	 * Returns the plug-in that contributed this provider.
-	 */
-	public Bundle getBundle() {
-		return bundle;
-	}
-
-	/**
-	 * Returns the wizard page class name.
-	 */
-	public String getClassName() {
-		return className;
-	}
-
-	/**
-	 * Returns the method library type identifier.
-	 */
-	public String getTypeId() {
-		return typeId;
-	}
-
-	/**
-	 * Returns the wizard page title.
-	 */
-	public String getTitle() {
-		return title;
-	}
-
-	/**
-	 * Returns the wizard page description.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/package.html b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/package.html
deleted file mode 100755
index dd32de3..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the UI suppport for managing a method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/preferences/LibraryUIPreferences.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/preferences/LibraryUIPreferences.java
deleted file mode 100755
index 6d05cc5..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/preferences/LibraryUIPreferences.java
+++ /dev/null
@@ -1,332 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.preferences;
-
-import java.util.List;
-
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.common.utils.PreferenceUtil;
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * Manages the Library UI preferences.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class LibraryUIPreferences {
-
-	/**
-	 * The Library UI preference keys.
-	 */
-	public static final String PROMPT_FOR_LIBRARY_AT_STARTUP = "promptForLibraryAtStartup"; //$NON-NLS-1$
-
-	public static final String SAVED_LIBRARY_PATH = "savedLibraryPath"; //$NON-NLS-1$
-
-	public static final String PUBLISH_UNOPEN_ACTIVITY_DD = "publishUnopenActivityDetailDiagram"; //$NON-NLS-1$
-
-	public static final String PREF_SWITCH_CONFIG = "switchConfigurationOnProcessActivate"; //$NON-NLS-1$
-
-	public static final String PUBLISH_AD_FOR_ACTIVITY_EXTENSION = "publishActivityDiagramforActivityExtension"; //$NON-NLS-1$
-
-	public static final String APPLICATION_SHORT_NAME = "appname"; //$NON-NLS-1$
-
-	private static final String NEW_LIBRARY_PATHS = "newLibraryPaths"; //$NON-NLS-1$
-
-	private static final String OPEN_LIBRARY_PATHS = "openLibraryPaths"; //$NON-NLS-1$		
-
-	private static final String OPEN_LIBRARY_URIS = "openLibraryURIs"; //$NON-NLS-1$
-
-	static {
-		// Initialize the default preference values.
-		IPreferenceStore store = LibraryUIPlugin.getDefault()
-				.getPreferenceStore();
-		store.setDefault(PROMPT_FOR_LIBRARY_AT_STARTUP, true);
-		store.setDefault(SAVED_LIBRARY_PATH, ""); //$NON-NLS-1$	
-		store.setDefault(PREF_SWITCH_CONFIG, MessageDialogWithToggle.PROMPT);
-		store.setDefault(NEW_LIBRARY_PATHS, getDefaultLibraryPath());
-		store.setDefault(OPEN_LIBRARY_PATHS, getDefaultLibraryPath());
-		store.setDefault(OPEN_LIBRARY_URIS, ""); //$NON-NLS-1$	
-	}
-
-	/**
-	 * Returns the prompt for Method Library at startup preference.
-	 * 
-	 * @return <code>true</code> is the preference is set.
-	 */
-	public static boolean getPromptForMethodLibraryAtStartup() {
-		return LibraryUIPlugin.getDefault().getPreferenceStore().getBoolean(
-				PROMPT_FOR_LIBRARY_AT_STARTUP);
-	}
-
-	/**
-	 * Sets the prompt for Method Library at startup preference.
-	 * 
-	 * @param enabled
-	 * 
-	 */
-	public static void setPromptForMethodLibraryAtStartup(boolean enabled) {
-		LibraryUIPlugin.getDefault().getPreferenceStore().setValue(
-				PROMPT_FOR_LIBRARY_AT_STARTUP, enabled);
-	}
-
-	public static void setPublishUnopenActivitydd(boolean enabled) {
-		LibraryUIPlugin.getDefault().getPreferenceStore().setValue(
-				PUBLISH_UNOPEN_ACTIVITY_DD, enabled);
-	}
-
-	public static boolean getPublishUnopenActivitydd() {
-		return LibraryUIPlugin.getDefault().getPreferenceStore().getBoolean(
-				PUBLISH_UNOPEN_ACTIVITY_DD);
-	}
-
-	/**
-	 * Setter method for Publish Activity Diagram for Activity Extension,
-	 * 
-	 * @param enabled
-	 */
-	public static void setPublishADForActivityExtension(boolean enabled) {
-		LibraryUIPlugin.getDefault().getPreferenceStore().setValue(
-				PUBLISH_AD_FOR_ACTIVITY_EXTENSION, enabled);
-	}
-
-	/**
-	 * getter method for Publish Activity Diagram for Activity Extension flag
-	 * from preference store,
-	 */
-	public static boolean getPublishADForActivityExtension() {
-		return LibraryUIPlugin.getDefault().getPreferenceStore().getBoolean(
-				PUBLISH_AD_FOR_ACTIVITY_EXTENSION);
-	}
-
-	/**
-	 * Returns switch configuration value store in preference store
-	 * 
-	 * @return value - could be ALWAYS, NEVER, PROMPT
-	 */
-	public static String getSwitchConfig() {
-		return LibraryUIPlugin.getDefault().getPreferenceStore().getString(
-				PREF_SWITCH_CONFIG);
-	}
-
-	/**
-	 * Saves switch configuration value in preference store
-	 * 
-	 * @param value
-	 *            Value could be ALWAYS, NEVER, PROMPT
-	 */
-	public static void setSwitchConfig(String value) {
-		LibraryUIPlugin.getDefault().getPreferenceStore().setValue(
-				PREF_SWITCH_CONFIG, value);
-	}
-
-	/**
-	 * Returns the Method Library path that was saved in a previous session.
-	 * 
-	 * @return The saved library path.
-	 */
-	public static String getSavedLibraryPath() {
-		return LibraryUIPlugin.getDefault().getPreferenceStore().getString(
-				SAVED_LIBRARY_PATH);
-	}
-
-	/**
-	 * Saves a Method Library path to the Library UI preference store.
-	 * 
-	 * @param libPath
-	 *            Path to a Method Library.
-	 */
-	public static void setSavedLibraryPath(String libPath) {
-		String path = libPath;
-		if (path.endsWith(MultiFileSaveUtil.DEFAULT_LIBRARY_MODEL_FILENAME)) {
-			path = FileUtil.getParentDirectory(path);
-		}
-		LibraryUIPlugin.getDefault().getPreferenceStore().setValue(
-				SAVED_LIBRARY_PATH, path);
-		LibraryUIPlugin.getDefault().savePluginPreferences();
-	}
-
-	/**
-	 * Returns the default Method Library path.
-	 * 
-	 * @return The default Method Library path.
-	 */
-	public static String getDefaultLibraryPath() {
-		String userHome = System.getProperty("user.home").replace('\\', '/'); //$NON-NLS-1$
-		String libraryPath = LibraryUIPlugin.getDefault().getString(
-				"libraryPath"); //$NON-NLS-1$
-		if (libraryPath == null || libraryPath.length() == 0
-				|| libraryPath.startsWith("[")) { //$NON-NLS-1$
-			libraryPath = userHome + "/Method Libraries/Library"; //$NON-NLS-1$
-		} else if (libraryPath.startsWith("<user.home>")) { //$NON-NLS-1$
-			libraryPath = userHome + libraryPath.substring(11);
-		}
-		if (System.getProperty("file.separator").equals("\\")) { //$NON-NLS-1$ //$NON-NLS-2$
-			libraryPath = libraryPath.replace('/', '\\');
-		}
-
-		int idx = -1;
-		if ((idx = libraryPath.indexOf("<app.name>")) >= 0) { //$NON-NLS-1$
-			String appNameProper = LibraryUIPreferences
-					.getApplicationShortName();
-			libraryPath = libraryPath.substring(0, idx) + appNameProper
-					+ libraryPath.substring(idx + 10);
-		}
-
-		return libraryPath;
-	}
-
-	/**
-	 * Returns the application short name passed in the main feature's
-	 * plugin_customization.ini.
-	 * 
-	 * @return The passed-in application short name.
-	 */
-	public static String getApplicationShortName() {
-		String appname = LibraryUIPlugin.getDefault().getPreferenceStore()
-				.getString(APPLICATION_SHORT_NAME);
-		return appname;
-	}
-
-	/**
-	 * Gets the new library paths preference.
-	 * 
-	 * @return an array of method library paths
-	 */
-	public static String[] getNewLibraryPaths() {
-		return PreferenceUtil.getStringValues(LibraryUIPlugin.getDefault()
-				.getPreferenceStore(), NEW_LIBRARY_PATHS);
-	}
-
-	/**
-	 * Gets the new library paths preference.
-	 * 
-	 * @return a collection of method library paths
-	 */
-	public static List getNewLibraryPathsList() {
-		return PreferenceUtil.getList(LibraryUIPlugin.getDefault()
-				.getPreferenceStore(), NEW_LIBRARY_PATHS);
-	}
-
-	/**
-	 * Adds a method library path to the new library paths preference.
-	 * 
-	 * @param path
-	 *            a method library path
-	 */
-	public static void addNewLibraryPath(String path) {
-		if (path != null) {
-			List paths = getNewLibraryPathsList();
-			paths.remove(path);
-			paths.add(0, path);
-			// FIXME! Read from global preference.
-			if (paths.size() > 10) {
-				paths = paths.subList(0, 10);
-				paths.set(9, getDefaultLibraryPath());
-			}
-			PreferenceUtil.setList(LibraryUIPlugin.getDefault()
-					.getPreferenceStore(), NEW_LIBRARY_PATHS, paths);
-		}
-	}
-
-	/**
-	 * Gets the open library paths preference.
-	 * 
-	 * @return an array of method library paths
-	 */
-	public static String[] getOpenLibraryPaths() {
-		return PreferenceUtil.getStringValues(LibraryUIPlugin.getDefault()
-				.getPreferenceStore(), OPEN_LIBRARY_PATHS);
-	}
-
-	/**
-	 * Gets the open library paths preference.
-	 * 
-	 * @return a collection of method library paths
-	 */
-	public static List getOpenLibraryPathsList() {
-		return PreferenceUtil.getList(LibraryUIPlugin.getDefault()
-				.getPreferenceStore(), OPEN_LIBRARY_PATHS);
-	}
-
-	/**
-	 * Adds a method library path to the open library paths preference.
-	 * 
-	 * @param path
-	 *            a method library path
-	 */
-	public static void addOpenLibraryPath(String path) {
-		if (path != null) {
-			List paths = getOpenLibraryPathsList();
-			paths.remove(path);
-			paths.add(0, path);
-			// FIXME! Read from global preference.
-			if (paths.size() > 10) {
-				paths = paths.subList(0, 10);
-				paths.set(9, getDefaultLibraryPath());
-			}
-			PreferenceUtil.setList(LibraryUIPlugin.getDefault()
-					.getPreferenceStore(), OPEN_LIBRARY_PATHS, paths);
-		}
-	}
-
-	/**
-	 * Gets the open library URIs preference.
-	 * 
-	 * @return a collection of method library URIs
-	 */
-	public static String[] getOpenLibraryURIs() {
-		return PreferenceUtil.getStringValues(LibraryUIPlugin.getDefault()
-				.getPreferenceStore(), OPEN_LIBRARY_URIS);
-	}
-
-	/**
-	 * Gets the open library URIs preference.
-	 * 
-	 * @return a collection of method library URIs
-	 */
-	public static List getOpenLibraryURIsList() {
-		return PreferenceUtil.getList(LibraryUIPlugin.getDefault()
-				.getPreferenceStore(), OPEN_LIBRARY_URIS);
-	}
-
-	/**
-	 * Adds a method library URI to the open library URIs preference.
-	 * 
-	 * @param uri
-	 *            a method library URI
-	 */
-	public static void addOpenLibraryURI(String uri) {
-		if (uri != null) {
-			List libraryURIs = getOpenLibraryPathsList();
-			libraryURIs.remove(uri);
-			libraryURIs.add(0, uri);
-			// FIXME! Read from global preference.
-			if (libraryURIs.size() > 10) {
-				libraryURIs = libraryURIs.subList(0, 10);
-			}
-			PreferenceUtil.setList(LibraryUIPlugin.getDefault()
-					.getPreferenceStore(), OPEN_LIBRARY_URIS, libraryURIs);
-		}
-	}
-
-	/**
-	 * Save all preferences
-	 * 
-	 */
-	public static void saveAllPreferences() {
-		LibraryUIPlugin.getDefault().savePluginPreferences();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/preferences/RecentlyOpenedLibrary.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/preferences/RecentlyOpenedLibrary.java
deleted file mode 100755
index 41ea317..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/preferences/RecentlyOpenedLibrary.java
+++ /dev/null
@@ -1,64 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.preferences;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-/**
- * Models a recently opened method library preference.
- * 
- * @author Kelvin Low
- */
-public class RecentlyOpenedLibrary {
-
-	private URI uri;
-	
-	private String name;
-	
-	private String path;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public RecentlyOpenedLibrary(String uri) {
-		try {
-			this.uri = new URI(uri);
-			File file = new File(this.uri);
-			this.name = file.getName();
-			this.path = file.getAbsolutePath();
-		} catch (URISyntaxException e) {
-		}
-	}
-
-	/**
-	 * Gets the library name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Gets the library URI.
-	 */
-	public URI getURI() {
-		return uri;
-	}
-	
-	/**
-	 * Gets the library path.
-	 */
-	public String getPath() {
-		return path;
-	}	
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/preferences/package.html b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/preferences/package.html
deleted file mode 100755
index a9858a0..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/preferences/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides preference support for managing a method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/views/ProcessTreeContentProvider.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/views/ProcessTreeContentProvider.java
deleted file mode 100755
index 2512f17..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/views/ProcessTreeContentProvider.java
+++ /dev/null
@@ -1,132 +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.library.ui.views;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.library.edit.LibraryEditPlugin;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * The content provider for the process tree viewer.
- * 
- * @author Kelvin Low
- * @since 1.2
- */
-public class ProcessTreeContentProvider implements ITreeContentProvider {
-
-	private static final String CAPABILITY_PATTERNS = LibraryUIResources.capabilityPattern_text_plural;
-
-	private static final String DELIVERY_PROCESSES = LibraryUIResources.deliveryProcess_text_plural;
-
-	private static final Object[] EMPTY_LIST = new Object[0];
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof MethodLibrary) {
-			List children = new ArrayList();
-			List plugins = ((MethodLibrary) parentElement).getMethodPlugins();
-			for (Iterator it = plugins.iterator(); it.hasNext();) {
-				MethodPlugin plugin = (MethodPlugin) it.next();
-				List processes = TngUtil.getAllProcesses(plugin);
-				if (processes.size() > 0) {
-					children.add(plugin);
-				}
-			}
-			return children.toArray();
-		} else if (parentElement instanceof MethodPlugin) {
-			return new Object[] {
-					new ProcessTreeUIFolder(
-							CAPABILITY_PATTERNS,
-							LibraryEditPlugin.INSTANCE
-									.getImage("full/obj16/CapabilityPatterns"), parentElement), //$NON-NLS-1$
-					new ProcessTreeUIFolder(
-							DELIVERY_PROCESSES,
-							LibraryEditPlugin.INSTANCE
-									.getImage("full/obj16/DeliveryProcesses"), parentElement) //$NON-NLS-1$
-			};
-		} else if (parentElement instanceof ProcessTreeUIFolder) {
-			ProcessTreeUIFolder uiFolder = (ProcessTreeUIFolder) parentElement;
-			MethodPlugin plugin = (MethodPlugin) uiFolder.getParent();
-			if (uiFolder.getName() == CAPABILITY_PATTERNS) {
-				return getCapabilityPatterns(plugin).toArray();
-			} else {
-				return getDeliveryProcesses(plugin).toArray();
-			}
-		}
-		return EMPTY_LIST;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(Object)
-	 */
-	public Object getParent(Object element) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(Object)
-	 */
-	public boolean hasChildren(Object element) {
-		return getChildren(element).length > 0;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		return getChildren(inputElement);
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-	}
-
-	public void dispose() {
-	}
-
-	private List getCapabilityPatterns(MethodPlugin plugin) {
-		List capabilityPatterns = new ArrayList();
-		List items = TngUtil.getAllProcesses(plugin);
-		for (Iterator it = items.iterator(); it.hasNext();) {
-			org.eclipse.epf.uma.Process p = (org.eclipse.epf.uma.Process) it
-					.next();
-			if (p instanceof CapabilityPattern) {
-				capabilityPatterns.add(p);
-			}
-		}
-		return capabilityPatterns;
-	}
-
-	private List getDeliveryProcesses(MethodPlugin plugin) {
-		List deliveryProcesses = new ArrayList();
-		List items = TngUtil.getAllProcesses(plugin);
-		for (Iterator it = items.iterator(); it.hasNext();) {
-			org.eclipse.epf.uma.Process p = (org.eclipse.epf.uma.Process) it
-					.next();
-			if (p instanceof DeliveryProcess) {
-				deliveryProcesses.add(p);
-			}
-		}
-		return deliveryProcesses;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/views/ProcessTreeLabelProvider.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/views/ProcessTreeLabelProvider.java
deleted file mode 100755
index 0ea165a..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/views/ProcessTreeLabelProvider.java
+++ /dev/null
@@ -1,60 +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.library.ui.views;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.provider.UmaItemProviderAdapterFactory;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The label provider for the process tree viewer.
- * 
- * @author Kelvin Low
- * @since 1.2
- */
-public class ProcessTreeLabelProvider extends LabelProvider {
-
-	private static ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-			new UmaItemProviderAdapterFactory());
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ProcessTreeLabelProvider() {
-		super();
-	}
-
-	/**
-	 * @see LabelProvider#getText(Object)
-	 */
-	public String getText(Object obj) {
-		if (obj instanceof ProcessTreeUIFolder) {
-			return ((ProcessTreeUIFolder) obj).getName();
-		} else if (obj instanceof MethodElement) {
-			return ((MethodElement) obj).getName();
-		}
-		return labelProvider.getText(obj);
-	}
-
-	/**
-	 * @see LabelProvider#getImage(Object)
-	 */
-	public Image getImage(Object obj) {
-		if (obj instanceof ProcessTreeUIFolder) {
-			return ((ProcessTreeUIFolder) obj).getImage();
-		}
-		return labelProvider.getImage(obj);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/views/ProcessTreeUIFolder.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/views/ProcessTreeUIFolder.java
deleted file mode 100755
index 93eee1d..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/views/ProcessTreeUIFolder.java
+++ /dev/null
@@ -1,118 +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.library.ui.views;
-
-import org.eclipse.epf.library.edit.LibraryEditPlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Models a UI folder in the process tree viewer.
- * 
- * @author Kelvin Low
- * @since 1.2
- */
-public class ProcessTreeUIFolder {
-
-	private static final Image DEFAULT_IMAGE = LibraryEditPlugin.INSTANCE
-			.getImage("full/obj16/Folder"); //$NON-NLS-1$
-
-	private String name;
-
-	private Image image;
-
-	private Object parent;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param name
-	 *            a name for the folder
-	 */
-	public ProcessTreeUIFolder(String name) {
-		this(name, DEFAULT_IMAGE, null);
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param name
-	 *            a name for the folder
-	 * @param parent
-	 *            the parent object
-	 */
-	public ProcessTreeUIFolder(String name, Object parent) {
-		this(name, DEFAULT_IMAGE, parent);
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param name
-	 *            a name for the folder
-	 * @param image
-	 *            an image for the folder
-	 * @param parent
-	 *            the parent object
-	 */
-	public ProcessTreeUIFolder(String name, Image image, Object parent) {
-		this.name = name;
-		this.image = image;
-		this.parent = parent;
-	}
-
-	/**
-	 * Returns the name.
-	 * 
-	 * @return the folder name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Returns the image.
-	 * 
-	 * @return the image for a UI folder
-	 */
-	public Image getImage() {
-		return image;
-	}
-
-	/**
-	 * Returns the parent object.
-	 * 
-	 * @return the parent object for the folder
-	 */
-	public Object getParent() {
-		return parent;
-	}
-
-	/**
-	 * Sets the parent object.
-	 * 
-	 * @param parent
-	 *            the parent object
-	 * @return the given parent object
-	 */
-	public Object setParent(Object parent) {
-		return this.parent = parent;
-	}
-
-	/**
-	 * Returns the string representation of this object.
-	 * 
-	 * @return the folder name
-	 */
-	public String toString() {
-		return name;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/views/ProcessTreeViewer.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/views/ProcessTreeViewer.java
deleted file mode 100755
index 6ba0235..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/views/ProcessTreeViewer.java
+++ /dev/null
@@ -1,38 +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.library.ui.views;
-
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Displays a tree view that allows a user to select a capability pattern or
- * delivery process.
- * 
- * @author Kelvin Low
- * @since 1.2
- */
-public class ProcessTreeViewer extends TreeViewer {
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param parent
-	 *            the parent composite
-	 */
-	public ProcessTreeViewer(Composite parent) {
-		super(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-		setContentProvider(new ProcessTreeContentProvider());
-		setLabelProvider(new ProcessTreeLabelProvider());
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/views/ProcessView.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/views/ProcessView.java
deleted file mode 100755
index c95462f..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/views/ProcessView.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.eclipse.epf.library.ui.views;
-
-public class ProcessView {
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/DirectoryValidator.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/DirectoryValidator.java
deleted file mode 100755
index 70c66f7..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/DirectoryValidator.java
+++ /dev/null
@@ -1,129 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.wizards;
-
-import java.io.File;
-
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.library.ui.LibraryUIResources;
-
-/**
- * Utility class for validating and creating a directory.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=162153
- */
-public class DirectoryValidator {
-
-	/**
-	 * Validates and creates a given directory.
-	 * <p>
-	 * Displays an error dialog if the directory path is not valid.
-	 * 
-	 * @param dir
-	 *            The path to be validated and created.
-	 * @param title
-	 *            The dialog title.
-	 * @param errorMsg
-	 *            The error message to be displayed in the error dialog.
-	 * @return <code>true</code> if path is valid.
-	 */
-	public static boolean checkAndCreateDir(String dir, String title,
-			String errorMsg) {
-		boolean answer = false;
-
-		File file = new File(dir);
-		if (file.exists()) {
-			File[] files = file.listFiles();
-			if (files != null && files.length > 0) {
-				answer = LibraryUIPlugin
-						.getDefault()
-						.getMsgDialog()
-						.displayConfirmation(
-								title,
-								LibraryUIResources
-										.bind(
-												LibraryUIResources.deleteFilesConfirmation_msg,
-												dir));
-				if (answer == true) {
-					try {
-						answer = FileUtil
-								.deleteAllFiles(file.getAbsolutePath());
-						if (answer == false) {
-							LibraryUIPlugin
-									.getDefault()
-									.getMsgDialog()
-									.displayError(
-											title,
-											errorMsg,
-											LibraryUIResources
-													.bind(
-															LibraryUIResources.deleteFilesError_reason,
-															dir));
-						}
-					} catch (Exception e) {
-						LibraryUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayError(
-										title,
-										errorMsg,
-										LibraryUIResources
-												.bind(
-														LibraryUIResources.deleteFilesError_reason,
-														dir), e);
-						answer = false;
-					}
-				}
-			} else {
-				answer = true;
-			}
-		} else {
-//			if (!file.isAbsolute()) {
-//				LibraryUIPlugin.getDefault().getMsgDialog().displayError(title,
-//						LibraryUIResources.invalidPath_msg);
-//				answer = false;
-//			} else {
-
-				try {
-					if (file.mkdirs() == false) {
-						LibraryUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayError(
-										title,
-										errorMsg,
-										LibraryUIResources
-												.bind(
-														LibraryUIResources.createPathError_reason,
-														dir));
-						answer = false;
-					} else {
-						answer = true;
-					}
-				} catch (Exception e) {
-					LibraryUIPlugin.getDefault().getMsgDialog().displayError(
-							title,
-							errorMsg,
-							LibraryUIResources.bind(
-									LibraryUIResources.createPathError_reason,
-									dir), e);
-					answer = false;
-				}
-			}
-//		}
-
-		return answer;
-	}
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/LibraryBackupUtil.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/LibraryBackupUtil.java
deleted file mode 100755
index 62cd605..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/LibraryBackupUtil.java
+++ /dev/null
@@ -1,101 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.wizards;
-
-import java.io.File;
-
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.library.layout.LayoutResources;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.library.ui.dialogs.LibraryBackupDialog;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Utility class to back up library.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class LibraryBackupUtil {
-
-	private String path = null;
-
-	/**
-	 * Prompts to backup library
-	 * 
-	 * @param shell
-	 * @param libPath
-	 */
-	public static void promptBackupLibrary(Shell shell, File libPath) {
-		new LibraryBackupUtil().doBackup(shell, libPath);
-	}
-
-	private void doBackup(final Shell shell, final File libPath) {
-		path = null;
-
-		SafeUpdateController.syncExec(new Runnable() {
-			public void run() {
-				Shell s = shell;
-				if (s == null) {
-					s = MsgBox.getDefaultShell();
-				}
-
-				if (s == null) {
-					s = new Shell(MsgBox.getDisplay());
-				}
-
-				String title = LibraryUIResources.backupLibraryDialog_title;
-				String message = LibraryUIResources.backupLibraryDialog_text;
-				String backupPath = libPath.getAbsolutePath() + ".backup"; //$NON-NLS-1$	
-
-				LibraryBackupDialog dlg = new LibraryBackupDialog(s, title,
-						message, backupPath);
-
-				if (dlg.open() == Dialog.OK) {
-					path = dlg.getPath();
-				}
-			}
-		});
-
-		if (path != null) {
-			backup(libPath, new File(path));
-		}
-
-	}
-
-	/**
-	 * Back up library 
-	 * 
-	 * @param source
-	 * @param dest
-	 */
-	public static void backup(final File source, final File dest) {
-		Runnable runnable = new Runnable() {
-			public void run() {
-				try {
-					// excude the non-library files that might be locked by rmc.
-					// these files may cause backup to fail due to file lock.
-					String excludes = ".lock";
-					LayoutResources.copyDir(source, dest, "**", excludes);
-				} catch (RuntimeException e) {
-					e.printStackTrace();
-				}
-			}
-		};
-
-		UserInteractionHelper.runWithProgress(runnable,
-				LibraryUIResources.backingUpLibraryTask_name);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/NewLibraryWizardPage.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/NewLibraryWizardPage.java
deleted file mode 100755
index 3aa0604..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/NewLibraryWizardPage.java
+++ /dev/null
@@ -1,37 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.wizards;
-
-import java.util.Map;
-
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-
-/**
- * The abstract class for a New Method Library wizard page.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public abstract class NewLibraryWizardPage extends BaseWizardPage {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public NewLibraryWizardPage(String name) {
-		super(name);
-	}
-
-	/**
-	 * Returns the library specific user selections.
-	 */
-	public abstract Map getSelections();
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/NewLibraryWizardPageFactory.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/NewLibraryWizardPageFactory.java
deleted file mode 100755
index c85c99f..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/NewLibraryWizardPageFactory.java
+++ /dev/null
@@ -1,177 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.wizards;
-
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.common.serviceability.DebugTrace;
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.library.ui.internal.wizards.NewLibraryWizardPageContribution;
-import org.osgi.framework.Bundle;
-
-/**
- * Manages the New Library wizard pages defined via the
- * "org.eclipse.epf.library.ui.newLibraryWizardPages" extension point.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class NewLibraryWizardPageFactory {
-
-	/**
-	 * The extension point namespace.
-	 */
-	public static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.epf.library.ui"; //$NON-NLS-1$
-
-	/**
-	 * The extension point name.
-	 */
-	public static final String EXTENSION_POINT_NAME = "newLibraryWizardPages"; //$NON-NLS-1$
-
-	// If true, debug tracing is enabled.
-	private static boolean debug = LibraryUIPlugin.getDefault().isDebugging();
-
-	// The shared instance.
-	private static NewLibraryWizardPageFactory instance = null;
-
-	// A map of wizard page providers.
-	private Map wizardPageProviders = new HashMap();
-
-	// A list of wizard page instances.
-	private Map wizardPages = new HashMap();
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static NewLibraryWizardPageFactory getInstance() {
-		if (instance == null) {
-			synchronized (NewLibraryWizardPageFactory.class) {
-				if (instance == null) {
-					instance = new NewLibraryWizardPageFactory();
-				}
-			}
-		}
-		return instance;
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	private NewLibraryWizardPageFactory() {
-		init();
-	}
-
-	/**
-	 * Performs the necessary initialization.
-	 */
-	protected void init() {
-		if (debug) {
-			DebugTrace.print(this, "init"); //$NON-NLS-1$
-		}
-		IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(
-				EXTENSION_POINT_NAMESPACE, EXTENSION_POINT_NAME);
-		if (extensionPoint != null) {
-			IExtension[] extensions = extensionPoint.getExtensions();
-			for (int i = 0; i < extensions.length; i++) {
-				IExtension extension = extensions[i];
-				String pluginId = extension.getNamespaceIdentifier();
-				Bundle bundle = Platform.getBundle(pluginId);
-				IConfigurationElement[] configElements = extension
-						.getConfigurationElements();
-				for (int j = 0; j < configElements.length; j++) {
-					IConfigurationElement configElement = configElements[j];
-					try {
-						String className = configElement.getAttribute("class"); //$NON-NLS-1$
-						String typeId = configElement.getAttribute("type"); //$NON-NLS-1$
-						String title = configElement.getAttribute("title"); //$NON-NLS-1$
-						String description = configElement
-								.getAttribute("description"); //$NON-NLS-1$
-						if (debug) {
-							DebugTrace.print(this, "init", //$NON-NLS-1$ 
-									"configElement, class=" + className + //$NON-NLS-1$
-											", type=" + typeId + //$NON-NLS-1$
-											", title=" + title + //$NON-NLS-1$
-											", description=" + description); //$NON-NLS-1$							
-						}
-						if (className != null && className.trim().length() > 0
-								&& typeId != null && typeId.trim().length() > 0
-								&& title != null && title.trim().length() > 0
-								&& description != null
-								&& description.trim().length() > 0) {
-							if (!wizardPageProviders.containsKey(typeId)) {
-								NewLibraryWizardPageContribution provider = new NewLibraryWizardPageContribution(
-										bundle, className, typeId, title,
-										description);
-								wizardPageProviders.put(typeId, provider);
-							}
-						}
-					} catch (Exception e) {
-						LibraryUIPlugin.getDefault().getLogger().logError(e);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Creates a wizard page.
-	 * 
-	 * @return a <code>NewLibraryWizardPage</code>
-	 */
-	public NewLibraryWizardPage createWizardPage(String pageId, String typeId) {
-		NewLibraryWizardPage wizardPage = (NewLibraryWizardPage) wizardPages
-				.get(typeId);
-		if (wizardPage != null) {
-			return wizardPage;
-		}
-
-		NewLibraryWizardPageContribution provider = (NewLibraryWizardPageContribution) wizardPageProviders
-				.get(typeId);
-		if (provider != null) {
-			Bundle bundle = provider.getBundle();
-			String className = provider.getClassName();
-			Class wizardPageClass;
-			Class[] argClass = new Class[] { String.class };
-			Object[] argValue = new Object[] { pageId };
-			Constructor constructor;
-			try {
-				wizardPageClass = bundle.loadClass(className);
-				constructor = wizardPageClass.getConstructor(argClass);
-				wizardPage = (NewLibraryWizardPage) constructor
-						.newInstance(argValue);
-				wizardPage.setTitle(provider.getTitle());
-				wizardPage.setDescription(provider.getDescription());
-				wizardPages.put(typeId, wizardPage);
-			} catch (Exception e) {
-				LibraryUIPlugin.getDefault().getLogger().logError(e);
-			}
-		}
-		return wizardPage;
-	}
-
-	/**
-	 * Returns a new or cached wizard page.
-	 * 
-	 * @return a <code>NewLibraryWizardPage</code> object
-	 */
-	public NewLibraryWizardPage getWizardPage(String typeId) {
-		return (NewLibraryWizardPage) wizardPages.get(typeId);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryMainPage.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryMainPage.java
deleted file mode 100755
index da0123c..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryMainPage.java
+++ /dev/null
@@ -1,165 +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.library.ui.wizards;
-
-import java.io.File;
-
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * A wizard page that prompts the user to select a path to open a method
- * library.
- * 
- * @author Kelvin Low
- * @since 1.2
- */
-public class OpenLibraryMainPage extends BaseWizardPage {
-
-	/**
-	 * The wizard page name.
-	 */
-	public static final String PAGE_NAME = OpenLibraryMainPage.class.getName();
-
-	protected static final String TYPE_ID = "typeId"; //$NON-NLS-1$	
-
-	private Shell shell;
-
-	private Combo libraryPathCombo;
-
-	private Button browseButton;
-
-	private String libraryType;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public OpenLibraryMainPage() {
-		super(PAGE_NAME);
-		setTitle(LibraryUIResources.openLibraryWizard_title);
-		setDescription(LibraryUIResources.openLibraryMainWizardPage_title);
-		setImageDescriptor(LibraryUIPlugin.getDefault().getImageDescriptor(
-				"full/wizban/Open.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		shell = parent.getShell();
-
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(3, false));
-
-		createLabel(composite, LibraryUIResources.pathLabel_text);
-
-		libraryPathCombo = createCombobox(composite);
-
-		browseButton = createButton(composite,
-				LibraryUIResources.browseButton_text);
-
-		initControls();
-
-		addListeners();
-
-		setControl(composite);
-	}
-
-	/**
-	 * Initializes the wizard page controls with data.
-	 */
-	protected void initControls() {
-		String[] openLibraryPaths = LibraryUIPreferences.getOpenLibraryPaths();
-		libraryPathCombo.setItems(openLibraryPaths);
-		if (openLibraryPaths.length > 0) {
-			libraryPathCombo.setText(openLibraryPaths[0]);
-		}
-	}
-
-	/**
-	 * Adds event listeners to the wizard page controls.
-	 */
-	protected void addListeners() {
-		libraryPathCombo.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setPageComplete(isPageComplete());
-				getWizard().getContainer().updateButtons();
-			}
-		});
-
-		libraryPathCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				setPageComplete(isPageComplete());
-				getWizard().getContainer().updateButtons();
-			}
-		});
-
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				DirectoryDialog dialog = new DirectoryDialog(shell, SWT.NONE);
-				dialog.setFilterPath(getLibraryPath());
-				String selectedDir = dialog.open();
-				if (selectedDir != null) {
-					libraryPathCombo.add(selectedDir, 0);
-					libraryPathCombo.setText(selectedDir);
-				}
-			}
-		});
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isCompleted()
-	 */
-	public boolean isPageComplete() {
-		return getLibraryName().length() > 0;
-	}
-
-	/**
-	 * Gets the library name.
-	 */
-	public String getLibraryName() {
-		String libPath = getLibraryPath();
-		String libName = new File(libPath).getName();
-		if (!libPath.equals(libName)) {
-			return libName;
-		} else {
-			return ""; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Gets the user specified library path.
-	 */
-	public String getLibraryPath() {
-		return libraryPathCombo.getText().trim();
-	}
-
-	/**
-	 * Gets the user specified method library type.
-	 */
-	public String getLibraryType() {
-		return libraryType;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryMainPage2.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryMainPage2.java
deleted file mode 100755
index 2becc72..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryMainPage2.java
+++ /dev/null
@@ -1,257 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.wizards;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.epf.library.LibraryManagerFactory;
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.epf.library.ui.preferences.RecentlyOpenedLibrary;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A wizard page that prompts the user to enter the name, brief description and
- * type for a new method library.
- * 
- * @author Kelvin Low
- * @since 1.2
- */
-public class OpenLibraryMainPage2 extends BaseWizardPage {
-
-	/**
-	 * The wizard page name.
-	 */
-	public static final String PAGE_NAME = OpenLibraryMainPage2.class.getName();
-
-	protected static final String TYPE_ID = "typeId"; //$NON-NLS-1$	
-
-	protected Combo nameCombo;
-
-	protected Text uriText;
-
-	protected Button openUnlistedLibraryCheckbox;
-
-	protected boolean openUnlistedLibrary = false;
-
-	protected Button[] radioButtons;
-
-	protected Map recentlyOpenedLibraries = new HashMap();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public OpenLibraryMainPage2() {
-		super(PAGE_NAME);
-		setTitle(LibraryUIResources.openLibraryWizard_title);
-		setDescription(LibraryUIResources.openLibraryMainWizardPage_title_2);
-		setImageDescriptor(LibraryUIPlugin.getDefault().getImageDescriptor(
-				"full/wizban/Open.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(2, false));
-
-		Label nameLabel = new Label(composite, SWT.NORMAL);
-		nameLabel.setText(LibraryUIResources.nameLabel_text);
-
-		nameCombo = new Combo(composite, SWT.BORDER | SWT.READ_ONLY);
-		nameCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		// Set the configuration list.
-		List libraryList = getRecentlyOpenedLibraries();
-		for (Iterator it = libraryList.iterator(); it.hasNext();) {
-			RecentlyOpenedLibrary library = (RecentlyOpenedLibrary) it.next();
-			recentlyOpenedLibraries.put(library.getName(), library);
-		}
-		String[] libraryNames = new String[recentlyOpenedLibraries.size()];
-		recentlyOpenedLibraries.keySet().toArray(libraryNames);
-		nameCombo.setItems(libraryNames);
-
-		Label uriLabel = new Label(composite, SWT.NORMAL);
-		uriLabel.setText(LibraryUIResources.uriLabel_text);
-
-		uriText = new Text(composite, SWT.BORDER);
-		uriText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		uriText.setEditable(false);
-
-		openUnlistedLibraryCheckbox = new Button(composite, SWT.CHECK);
-		openUnlistedLibraryCheckbox
-				.setText(LibraryUIResources.openUnlistedLibraryCheckbox_text);
-		openUnlistedLibraryCheckbox.setLayoutData(new GridData(
-				GridData.FILL_HORIZONTAL));
-		((GridData) openUnlistedLibraryCheckbox.getLayoutData()).horizontalSpan = 2;
-
-		Label libraryTypeLabel = new Label(composite, SWT.NORMAL);
-		libraryTypeLabel.setText(LibraryUIResources.libraryTypeLabel_text);
-
-		Composite typeComposite = new Composite(composite, SWT.NORMAL);
-		typeComposite.setLayout(new GridLayout(2, false));
-		typeComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Map types = LibraryManagerFactory.getInstance().getLibraryTypes();
-		radioButtons = new Button[types.size()];
-		int radioButtonIndex = 0;
-		for (Iterator it = types.keySet().iterator(); it.hasNext();) {
-			String typeId = (String) it.next();
-			String typeName = (String) types.get(typeId);
-			Button radioButton = new Button(typeComposite, SWT.RADIO);
-			radioButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent event) {
-					setPageComplete(isPageComplete());
-					getWizard().getContainer().updateButtons();
-				}
-			});
-			radioButton.setText(typeName);
-			radioButton.setData(TYPE_ID, typeId);
-			radioButtons[radioButtonIndex++] = radioButton;
-		}
-
-		if (radioButtons.length > 0) {
-			radioButtons[0].setSelection(true);
-		}
-
-		addListeners();
-
-		setPageComplete(isPageComplete());
-
-		setControl(composite);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		OpenLibraryWizardPage wizardPage = OpenLibraryWizardPageFactory
-				.getInstance().getWizardPage(getLibraryType());
-		if (wizardPage != null) {
-			wizardPage.onEnterPage(getLibraryName());
-		}
-		if (!openUnlistedLibrary) {
-			return null;
-		}
-		return wizardPage;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isCompleted()
-	 */
-	public boolean isPageComplete() {
-		return getLibraryName().length() > 0 || openUnlistedLibrary;
-	}
-
-	/**
-	 * Adds listeners to the wizard controls.
-	 */
-	private void addListeners() {
-		nameCombo.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				getWizard().getContainer().updateButtons();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent event) {
-			}
-		});
-
-		openUnlistedLibraryCheckbox
-				.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent event) {
-						openUnlistedLibrary = openUnlistedLibraryCheckbox
-								.getSelection();
-						getWizard().getContainer().updateButtons();
-					}
-				});
-	}
-
-	/**
-	 * Gets the user selected method library name.
-	 */
-	public String getLibraryName() {
-		return nameCombo.getText().trim();
-	}
-
-	/**
-	 * Gets the URI of the user selected method library.
-	 */
-	public String getLibraryURI() {
-		RecentlyOpenedLibrary library = (RecentlyOpenedLibrary) recentlyOpenedLibraries
-				.get(getLibraryName());
-		return library.getURI().toString();
-	}
-
-	/**
-	 * Gets the path of the user selected method library.
-	 */
-	public String getLibraryPath() {
-		RecentlyOpenedLibrary library = (RecentlyOpenedLibrary) recentlyOpenedLibraries
-				.get(getLibraryName());
-		return library.getPath();
-	}
-
-	/**
-	 * Gets the open unlisted method librray option.
-	 */
-	public boolean isOpenUnlistedLibrary() {
-		return openUnlistedLibrary;
-	}
-
-	/**
-	 * Returns the user selected method library type.
-	 */
-	public String getLibraryType() {
-		for (int i = 0; i < radioButtons.length; i++) {
-			Button radioButton = radioButtons[i];
-			if (radioButton.getSelection()) {
-				return (String) radioButton.getData(TYPE_ID);
-			}
-		}
-		return (String) radioButtons[0].getData(TYPE_ID);
-	}
-
-	/**
-	 * Gets a list of recently opened method libraries.
-	 * 
-	 * @return a collection of <code>RecentlyOpenedLibrary</code> objects
-	 */
-	protected static List getRecentlyOpenedLibraries() {
-		List libraryURIs = LibraryUIPreferences.getOpenLibraryURIsList();
-		List libraries = new ArrayList();
-		if (libraryURIs.size() > 0) {
-			for (Iterator it = libraryURIs.iterator(); it.hasNext();) {
-				String libraryURI = (String) it.next();
-				libraries.add(new RecentlyOpenedLibrary(libraryURI));
-			}
-		}
-		return libraries;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizard.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizard.java
deleted file mode 100755
index 8aaa7f9..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizard.java
+++ /dev/null
@@ -1,217 +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.library.ui.wizards;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.common.serviceability.VersionUtil;
-import org.eclipse.epf.library.ui.LibraryUIManager;
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.epf.library.xmi.XMILibraryManager;
-import org.eclipse.epf.library.xmi.XMILibraryUtil;
-import org.eclipse.epf.persistence.migration.UpgradeCallerInfo;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * A wizard that guides the user to open a method library.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class OpenLibraryWizard extends Wizard implements INewWizard {
-
-	/**
-	 * The wizard ID.
-	 */
-	public static final String WIZARD_ID = OpenLibraryWizard.class.getName();
-
-	// The main wizard page.
-	private OpenLibraryMainPage mainPage;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public OpenLibraryWizard() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
-	 *      IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		setWindowTitle(LibraryUIResources.openLibraryWizard_title);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		mainPage = new OpenLibraryMainPage();
-		addPage(mainPage);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#createPageControls(Composite)
-	 */
-	public void createPageControls(Composite pageContainer) {
-		super.createPageControls(pageContainer);
-		pageContainer.getShell().setImage(
-				LibraryUIPlugin.getDefault().getSharedImage(
-						"full/obj16/MethodLibrary.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		try {
-			String path = mainPage.getLibraryPath();
-			String name = mainPage.getLibraryName();
-			String type = mainPage.getLibraryType();
-
-			Map options = new HashMap();
-			File libraryPath = new File(mainPage.getLibraryPath());
-			options.put(XMILibraryManager.ARG_LIBRARY_PATH, libraryPath
-					.getAbsolutePath());
-
-			if (XMILibraryUtil.isValidLibrary(path, true) == Status.OK_STATUS) {
-				if (XMILibraryUtil.isMethodLibraryLocked(path)) {
-					if (LibraryUIManager.displayLibraryLockedMessage() != 0)
-						return false;
-				}
-				if (!handleToolVersion(path, null)) {
-					return false;
-				}
-				if (LibraryUIManager.getInstance().openLibrary(path)) {
-					LibraryUIPreferences.addOpenLibraryPath(libraryPath
-							.getAbsolutePath());
-					return true;
-				}
-			} else if (XMILibraryUtil
-					.containsPluginOrConfigSpecExportFile(path)) {
-				throw new Exception(LibraryUIResources.openLibraryError_reason4);
-			} else {
-				MsgDialog msgDialog = LibraryUIPlugin.getDefault()
-						.getMsgDialog();
-				boolean rc = msgDialog
-						.displayConfirmation(
-								LibraryUIResources.openLibraryWizard_title,
-								NLS
-										.bind(
-												LibraryUIResources.openLibraryDialog_newLibrary_text,
-												new Object[] { path }));
-				if (!rc)
-					return false;
-				if (LibraryUIManager.getInstance().createLibrary(path)) {
-					LibraryUIPreferences.addOpenLibraryPath(libraryPath
-							.getAbsolutePath());
-					return true;
-				}
-			}
-
-			return true;
-		} catch (Exception e) {
-			String reason = e.getMessage();
-			if (reason == null) {
-				reason = LibraryUIResources.openLibraryInternlError_reason;
-			}
-			reason += "\n\n" + LibraryUIResources.openLibraryError_advice; //$NON-NLS-1$
-			if (e.getMessage() != null) {
-				LibraryUIPlugin.getDefault().getMsgDialog().displayError(
-						LibraryUIResources.openLibraryWizard_title,
-						LibraryUIResources.openLibraryError_msg, reason);
-			} else {
-				LibraryUIPlugin.getDefault().getMsgDialog().displayError(
-						LibraryUIResources.openLibraryWizard_title,
-						LibraryUIResources.openLibraryError_msg, reason, e);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Check and handle tool version differences
-	 */
-	public static boolean handleToolVersion(String path,
-			UpgradeCallerInfo callerInfo) {
-		String libXmi = XMILibraryManager.LIBRARY_XMI;
-		if (callerInfo != null && callerInfo.getIsExportedPluginLib()) {
-			libXmi = XMILibraryManager.exportFile;
-		}
-		VersionUtil.VersionCheckInfo info = VersionUtil
-				.checkLibraryVersion(new File(path, libXmi));
-		if (info != null && info.result > 0) {
-			String message = ""; //$NON-NLS-1$
-			if (info.toolID.equals(VersionUtil.getPrimaryToolID())) {
-				message = NLS.bind(
-						LibraryUIResources.versionMismatchDialog_text,
-						new Object[] { Platform.getProduct().getName(),
-								info.toolVersion });
-			} else {
-				message = NLS.bind(
-						LibraryUIResources.versionMismatchDialog_text_unknown,
-						new Object[] { Platform.getProduct().getName() });
-			}
-			if (!isUpgradeLibrary(callerInfo)) {
-				callerInfo.setErrorMsg(message);
-				return false;
-			}
-			LibraryUIPlugin.getDefault().getMsgDialog().displayError(
-					LibraryUIResources.openLibraryWizard_title, message);
-			return false;
-		}
-		if (XMILibraryUtil.isMethodLibraryUpgradeRequired(path, libXmi)) {
-			if (isUpgradeLibrary(callerInfo)
-					&& !LibraryUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayConfirmation(
-									LibraryUIResources.openLibraryWizard_title,
-									LibraryUIResources.upgradeLibraryDialog_text)) {
-				return false;
-			}
-			if (!isUpgradeLibrary(callerInfo)) {
-				callerInfo.copyLibrary();
-				if (callerInfo.getCopiedLibFile() != null) {
-					path = callerInfo.getCopiedLibFile().getParentFile()
-							.getAbsolutePath();
-				}
-			}
-			if (!LibraryUIManager.upgradeLibrary(path, callerInfo)) {
-				if (callerInfo != null) {
-					// callerInfo.setErrorMsg("upgradeLibrary Failed!"); //need
-					// new resource string
-				}
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	private static boolean isUpgradeLibrary(UpgradeCallerInfo callerInfo) {
-		return UpgradeCallerInfo.isUpgradeLibrary(callerInfo);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizard2.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizard2.java
deleted file mode 100755
index 5c5a56b..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizard2.java
+++ /dev/null
@@ -1,265 +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.library.ui.wizards;
-
-import java.io.File;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.common.serviceability.VersionUtil;
-import org.eclipse.epf.library.LibraryManagerFactory;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.ui.LibraryUIManager;
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.epf.library.xmi.XMILibraryManager;
-import org.eclipse.epf.library.xmi.XMILibraryUtil;
-import org.eclipse.epf.persistence.migration.UpgradeCallerInfo;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * A wizard that guides the user to open a method library.
- * 
- * @author Kelvin Low
- * @since 1.2
- */
-public class OpenLibraryWizard2 extends Wizard implements INewWizard {
-
-	/**
-	 * The wizard ID.
-	 */
-	public static final String WIZARD_ID = OpenLibraryWizard2.class.getName();
-
-	// The main wizard page.
-	private OpenLibraryMainPage2 mainPage;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public OpenLibraryWizard2() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
-	 *      IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		setWindowTitle(LibraryUIResources.openLibraryWizard_title);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		mainPage = new OpenLibraryMainPage2();
-		addPage(mainPage);
-
-		for (Iterator it = LibraryManagerFactory.getInstance()
-				.getLibraryTypes().keySet().iterator(); it.hasNext();) {
-			String persistenceId = (String) it.next();
-			String pageId = persistenceId + "Page"; //$NON-NLS-1$
-			OpenLibraryWizardPage page = OpenLibraryWizardPageFactory
-					.getInstance().createWizardPage(pageId, persistenceId);
-			if (page != null) {
-				page.setImageDescriptor(LibraryUIPlugin.getDefault()
-						.getImageDescriptor("full/wizban/Open.gif")); //$NON-NLS-1$					
-				addPage(page);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#createPageControls(Composite)
-	 */
-	public void createPageControls(Composite pageContainer) {
-		super.createPageControls(pageContainer);
-		pageContainer.getShell().setImage(
-				LibraryUIPlugin.getDefault().getSharedImage(
-						"full/obj16/MethodLibrary.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#canFinish()
-	 */
-	public boolean canFinish() {
-		if (mainPage.isPageComplete() && !mainPage.isOpenUnlistedLibrary()) {
-			return true;
-		}
-		IWizardPage[] pages = getPages();
-		for (int i = 1; i < pages.length; i++) {
-			if (!pages[i].isPageComplete()) {
-				return false;
-			}
-		}
-		return getContainer().getCurrentPage() != mainPage;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		String type = mainPage.getLibraryType();
-		OpenLibraryWizardPage page = OpenLibraryWizardPageFactory.getInstance()
-				.getWizardPage(type);
-		try {
-			String path = null;
-			if (mainPage.isOpenUnlistedLibrary()) {
-				Map options = page.getSelections();
-				path = (String) options.get(XMILibraryManager.ARG_LIBRARY_PATH);
-			} else {
-				path = mainPage.getLibraryPath();
-			}
-			if (path != null) {
-				if (XMILibraryUtil.isValidLibrary(path, true) == Status.OK_STATUS) {
-					if (XMILibraryUtil.isMethodLibraryLocked(path)) {
-						if (LibraryUIManager.displayLibraryLockedMessage() != 0)
-							return false;
-					}
-					if (!handleToolVersion(path, null)) {
-						return false;
-					}
-					if (LibraryUIManager.getInstance().openLibrary(path)) {
-						addRecentlyOpenedLibrary();
-						return true;
-					}
-				} else if (XMILibraryUtil
-						.containsPluginOrConfigSpecExportFile(path)) {
-					throw new Exception(
-							LibraryUIResources.openLibraryError_reason4);
-				} else {
-					MsgDialog msgDialog = LibraryUIPlugin.getDefault()
-							.getMsgDialog();
-					boolean rc = msgDialog
-							.displayConfirmation(
-									LibraryUIResources.openLibraryWizard_title,
-									NLS
-											.bind(
-													LibraryUIResources.openLibraryDialog_newLibrary_text,
-													new Object[] { path }));
-					if (!rc)
-						return false;
-					if (LibraryUIManager.getInstance().createLibrary(path)) {
-						addRecentlyOpenedLibrary();
-						return true;
-					}
-				}
-			}
-			return true;
-		} catch (Exception e) {
-			String reason = e.getMessage();
-			if (reason == null) {
-				reason = LibraryUIResources.openLibraryInternlError_reason;
-			}
-			reason += "\n\n" + LibraryUIResources.openLibraryError_advice;
-			if (e.getMessage() != null) {
-				LibraryUIPlugin.getDefault().getMsgDialog().displayError(
-						LibraryUIResources.openLibraryWizard_title,
-						LibraryUIResources.openLibraryError_msg, reason);
-			} else {
-				LibraryUIPlugin.getDefault().getMsgDialog().displayError(
-						LibraryUIResources.openLibraryWizard_title,
-						LibraryUIResources.openLibraryError_msg, reason, e);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Adds the newly opened or created method library to the recently opened
-	 * method libraries preference.
-	 */
-	protected void addRecentlyOpenedLibrary() {
-		MethodLibrary library = LibraryService.getInstance()
-				.getCurrentMethodLibrary();
-		if (library != null) {
-			String libraryURI = LibraryService.getInstance().getLibraryManager(
-					library).getMethodLibraryURI().toString();
-			LibraryUIPreferences.addOpenLibraryURI(libraryURI);
-		}
-	}
-
-	/**
-	 * Check and handle tool version differences
-	 */
-	public static boolean handleToolVersion(String path,
-			UpgradeCallerInfo callerInfo) {
-		String libXmi = XMILibraryManager.LIBRARY_XMI;
-		if (callerInfo != null && callerInfo.getIsExportedPluginLib()) {
-			libXmi = XMILibraryManager.exportFile;
-		}
-		VersionUtil.VersionCheckInfo info = VersionUtil
-				.checkLibraryVersion(new File(path, libXmi));
-		if (info != null && info.result > 0) {
-			String message = ""; //$NON-NLS-1$
-			if (info.toolID.equals(VersionUtil.getPrimaryToolID())) {
-				message = NLS.bind(
-						LibraryUIResources.versionMismatchDialog_text,
-						new Object[] { Platform.getProduct().getName(),
-								info.toolVersion });
-			} else {
-				message = NLS.bind(
-						LibraryUIResources.versionMismatchDialog_text_unknown,
-						new Object[] { Platform.getProduct().getName() });
-			}
-			if (!isUpgradeLibrary(callerInfo)) {
-				callerInfo.setErrorMsg(message);
-				return false;
-			}
-			LibraryUIPlugin.getDefault().getMsgDialog().displayError(
-					LibraryUIResources.openLibraryWizard_title, message);
-			return false;
-		}
-		if (XMILibraryUtil.isMethodLibraryUpgradeRequired(path, libXmi)) {
-			if (isUpgradeLibrary(callerInfo)
-					&& !LibraryUIPlugin
-							.getDefault()
-							.getMsgDialog()
-							.displayConfirmation(
-									LibraryUIResources.openLibraryWizard_title,
-									LibraryUIResources.upgradeLibraryDialog_text)) {
-				return false;
-			}
-			if (!isUpgradeLibrary(callerInfo)) {
-				callerInfo.copyLibrary();
-				if (callerInfo.getCopiedLibFile() != null) {
-					path = callerInfo.getCopiedLibFile().getParentFile()
-							.getAbsolutePath();
-				}
-			}
-			if (!LibraryUIManager.upgradeLibrary(path, callerInfo)) {
-				if (callerInfo != null) {
-					// callerInfo.setErrorMsg("upgradeLibrary Failed!"); //need
-					// new resource string
-				}
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	private static boolean isUpgradeLibrary(UpgradeCallerInfo callerInfo) {
-		return UpgradeCallerInfo.isUpgradeLibrary(callerInfo);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizardPage.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizardPage.java
deleted file mode 100755
index eba2901..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizardPage.java
+++ /dev/null
@@ -1,37 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.wizards;
-
-import java.util.Map;
-
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-
-/**
- * The abstract class for a Open Method Library wizard page.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public abstract class OpenLibraryWizardPage extends BaseWizardPage {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public OpenLibraryWizardPage(String name) {
-		super(name);
-	}
-
-	/**
-	 * Returns the library specific user selections.
-	 */
-	public abstract Map getSelections();
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizardPageFactory.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizardPageFactory.java
deleted file mode 100755
index 4587db8..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizardPageFactory.java
+++ /dev/null
@@ -1,157 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.ui.wizards;
-
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.library.ui.internal.wizards.NewLibraryWizardPageContribution;
-import org.eclipse.epf.library.ui.internal.wizards.OpenLibraryWizardPageContribution;
-import org.osgi.framework.Bundle;
-
-/**
- * Manages the Open Library wizard pages defined via the
- * "org.eclipse.epf.library.ui.openLibraryWizardPages" extension point.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class OpenLibraryWizardPageFactory {
-
-	/**
-	 * The extension point namespace.
-	 */
-	public static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.epf.library.ui"; //$NON-NLS-1$
-
-	/**
-	 * The extension point name.
-	 */
-	public static final String EXTENSION_POINT_NAME = "openLibraryWizardPages"; //$NON-NLS-1$
-
-	// The shared instance.
-	private static OpenLibraryWizardPageFactory instance = new OpenLibraryWizardPageFactory();
-
-	// A map of wizard page providers.
-	private Map wizardPageProviders = new HashMap();
-
-	// A list of wizard page instances.
-	private Map wizardPages = new HashMap();
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static OpenLibraryWizardPageFactory getInstance() {
-		return instance;
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	private OpenLibraryWizardPageFactory() {
-		init();
-	}
-
-	/**
-	 * Performs the necessary initialization.
-	 */
-	protected void init() {
-		IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(
-				EXTENSION_POINT_NAMESPACE, EXTENSION_POINT_NAME);
-		if (extensionPoint != null) {
-			IExtension[] extensions = extensionPoint.getExtensions();
-			for (int i = 0; i < extensions.length; i++) {
-				IExtension extension = extensions[i];
-				String pluginId = extension.getNamespaceIdentifier();
-				Bundle bundle = Platform.getBundle(pluginId);
-				IConfigurationElement[] configElements = extension
-						.getConfigurationElements();
-				for (int j = 0; j < configElements.length; j++) {
-					IConfigurationElement configElement = configElements[j];
-					try {
-						String className = configElement.getAttribute("class"); //$NON-NLS-1$
-						String typeId = configElement.getAttribute("type"); //$NON-NLS-1$
-						String title = configElement.getAttribute("title"); //$NON-NLS-1$
-						String description = configElement
-								.getAttribute("description"); //$NON-NLS-1$						
-						if (className != null && className.trim().length() > 0
-								&& typeId != null && typeId.trim().length() > 0
-								&& title != null && title.trim().length() > 0
-								&& description != null
-								&& description.trim().length() > 0) {
-							if (!wizardPageProviders.containsKey(typeId)) {
-								OpenLibraryWizardPageContribution provider = new OpenLibraryWizardPageContribution(
-										bundle, className, typeId, title,
-										description);
-								wizardPageProviders.put(typeId, provider);
-							}
-						}
-					} catch (Exception e) {
-						LibraryUIPlugin.getDefault().getLogger().logError(e);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Creates a wizard page.
-	 * 
-	 * @return a <code>OpenLibraryWizardPage</code>
-	 */
-	public OpenLibraryWizardPage createWizardPage(String pageId, String typeId) {
-		OpenLibraryWizardPage wizardPage = (OpenLibraryWizardPage) wizardPages
-				.get(typeId);
-		if (wizardPage != null) {
-			return wizardPage;
-		}
-
-		OpenLibraryWizardPageContribution provider = (OpenLibraryWizardPageContribution) wizardPageProviders
-				.get(typeId);
-		if (provider != null) {
-			Bundle bundle = provider.getBundle();
-			String className = provider.getClassName();
-			Class wizardPageClass;
-			Class[] argClass = new Class[] { String.class };
-			Object[] argValue = new Object[] { pageId };
-			Constructor constructor;
-			try {
-				wizardPageClass = bundle.loadClass(className);
-				constructor = wizardPageClass.getConstructor(argClass);
-				wizardPage = (OpenLibraryWizardPage) constructor
-						.newInstance(argValue);
-				wizardPage.setTitle(provider.getTitle());
-				wizardPage.setDescription(provider.getDescription());
-				wizardPages.put(typeId, wizardPage);
-			} catch (Exception e) {
-				LibraryUIPlugin.getDefault().getLogger().logError(e);
-			}
-		}
-		return wizardPage;
-	}
-
-	/**
-	 * Returns a new or cached wizard page.
-	 * 
-	 * @return a <code>NewLibraryWizardPage</code> object
-	 */
-	public OpenLibraryWizardPage getWizardPage(String typeId) {
-		return (OpenLibraryWizardPage) wizardPages.get(typeId);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/SelectProcessPage.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/SelectProcessPage.java
deleted file mode 100755
index 9dde2a4..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/SelectProcessPage.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.library.ui.wizards;
-
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.ui.LibraryUIPlugin;
-import org.eclipse.epf.library.ui.LibraryUIResources;
-import org.eclipse.epf.library.ui.views.ProcessTreeViewer;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A wizard page that prompts the user to select a process to export.
- * 
- * @author Kelvin Low
- * @since 7.0
- */
-public class SelectProcessPage extends BaseWizardPage {
-
-	public static final String PAGE_NAME = SelectProcessPage.class.getName();
-
-	private ProcessTreeViewer processTreeViewer;
-
-	private Text briefDescText;
-
-	private Process process;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SelectProcessPage() {
-		super(PAGE_NAME);
-		setTitle(LibraryUIResources.selectProcessWizardPage_title);
-		setDescription(LibraryUIResources.selectProcessWizardPage_text);
-		setImageDescriptor(LibraryUIPlugin.getDefault().getImageDescriptor(
-				"full/wizban/ExportProcess.gif")); //$NON-NLS-1$		
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite composite = createGridLayoutComposite(parent, 1);
-
-		createLabel(composite, LibraryUIResources.processesLabel_text);
-
-		processTreeViewer = new ProcessTreeViewer(composite);
-		GridData gridData = new GridData(GridData.FILL_BOTH
-				| GridData.GRAB_HORIZONTAL);
-		gridData.heightHint = 250;
-		processTreeViewer.getTree().setLayoutData(gridData);
-
-		createLabel(composite, LibraryUIResources.briefDescriptionLabel_text);
-
-		briefDescText = createTextMulti(composite, "", 100, 70, 1); //$NON-NLS-1$	
-
-		initControls();
-
-		setControl(composite);
-	}
-
-	/**
-	 * Initializes the wizard page controls with data.
-	 */
-	protected void initControls() {
-		processTreeViewer.setInput(LibraryService.getInstance()
-				.getCurrentMethodLibrary());
-		processTreeViewer.expandAll();
-
-		addEventHandlers();
-	}
-
-	/**
-	 * Adds event handlers to the wizard page controls.
-	 */
-	protected void addEventHandlers() {
-		processTreeViewer
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-					public void selectionChanged(SelectionChangedEvent event) {
-						Object selection = event.getSelection();
-						if (selection instanceof TreeSelection) {
-							Object element = ((TreeSelection) selection)
-									.getFirstElement();
-							if (element instanceof Process) {
-								process = (Process) element;
-								briefDescText.setText(process
-										.getBriefDescription());
-							} else {
-								process = null;
-								briefDescText.setText(""); //$NON-NLS-1$
-							}
-						}
-						setPageComplete(isPageComplete());
-						getWizard().getContainer().updateButtons();
-					}
-				});
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isCompleted()
-	 */
-	public boolean isPageComplete() {
-		if (LibraryService.getInstance().getCurrentMethodLibrary() == null) {
-			setErrorMessage(LibraryUIResources.noOpenLibraryWarning_msg);
-			return false;
-		}
-		return getProcess() != null;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		IWizardPage wizardPage = getWizard().getNextPage(this);
-		if (wizardPage != null && wizardPage instanceof BaseWizardPage) {
-			BaseWizardPage nextWizardPage = (BaseWizardPage) wizardPage;
-			nextWizardPage.onEnterPage(getProcess());
-		}
-		return wizardPage;
-	}
-
-	/**
-	 * Gets the user selected process.
-	 */
-	public Process getProcess() {
-		return process;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/package.html b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/package.html
deleted file mode 100755
index 7f6600f..0000000
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides wizards for managing a method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.xmi/.classpath b/plugins/org.eclipse.epf.library.xmi/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/plugins/org.eclipse.epf.library.xmi/.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/plugins/org.eclipse.epf.library.xmi/.cvsignore b/plugins/org.eclipse.epf.library.xmi/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.library.xmi/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.library.xmi/.options b/plugins/org.eclipse.epf.library.xmi/.options
deleted file mode 100755
index 21b778a..0000000
--- a/plugins/org.eclipse.epf.library.xmi/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-# Turn on debug trace for the XMI Library plug-in
-org.eclipse.epf.library.xmi/debug=true
diff --git a/plugins/org.eclipse.epf.library.xmi/.project b/plugins/org.eclipse.epf.library.xmi/.project
deleted file mode 100755
index 7f3253d..0000000
--- a/plugins/org.eclipse.epf.library.xmi/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.library.xmi</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/plugins/org.eclipse.epf.library.xmi/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.epf.library.xmi/.settings/org.eclipse.core.resources.prefs
deleted file mode 100755
index 8ef0397..0000000
--- a/plugins/org.eclipse.epf.library.xmi/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Sep 11 12:31:57 PDT 2006
-eclipse.preferences.version=1
-encoding//src/org/eclipse/epf/library/xmi/Resources.properties=8859_1
diff --git a/plugins/org.eclipse.epf.library.xmi/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.library.xmi/META-INF/MANIFEST.MF
deleted file mode 100755
index ac2a72f..0000000
--- a/plugins/org.eclipse.epf.library.xmi/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.library.xmi; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.epf.library.xmi.XMILibraryPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.epf.library
-Eclipse-LazyStart: true
-Bundle-Vendor: %providerName
-Export-Package: org.eclipse.epf.library.xmi,
- org.eclipse.epf.library.xmi.preferences
diff --git a/plugins/org.eclipse.epf.library.xmi/build.properties b/plugins/org.eclipse.epf.library.xmi/build.properties
deleted file mode 100755
index 30b2fc4..0000000
--- a/plugins/org.eclipse.epf.library.xmi/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               plugin.xml
diff --git a/plugins/org.eclipse.epf.library.xmi/plugin.properties b/plugins/org.eclipse.epf.library.xmi/plugin.properties
deleted file mode 100755
index 9f2ec7f..0000000
--- a/plugins/org.eclipse.epf.library.xmi/plugin.properties
+++ /dev/null
@@ -1,15 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF XMI Library
-providerName=Eclipse.org
diff --git a/plugins/org.eclipse.epf.library.xmi/plugin.xml b/plugins/org.eclipse.epf.library.xmi/plugin.xml
deleted file mode 100755
index 41a8b85..0000000
--- a/plugins/org.eclipse.epf.library.xmi/plugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.epf.library.libraryManagers">
-      <libraryManager
-            class="org.eclipse.epf.library.xmi.XMILibraryManager"       		
-            type="xmi"
-            typeName="XMI">
-      </libraryManager>     
-   </extension>
-   <extension
-         point="org.eclipse.epf.library.persistence.migrators">
-      <migrator
-            class="org.eclipse.epf.library.xmi.internal.migration.Migrator102"
-            libNsURI="http://www.ibm.com/uma/1.0.2/uma.ecore"/>
-      <migrator
-            class="org.eclipse.epf.library.xmi.internal.migration.Migrator103"
-            libNsURI="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore1"/>
-   </extension>
-   <extension
-         point="org.eclipse.epf.library.edit.oppositeFeatureLoaders">
-      <oppositeFeatureLoader class="org.eclipse.epf.library.xmi.internal.XMIOppositeFeatureLoader"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/Resources.properties b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/Resources.properties
deleted file mode 100755
index a11a93c..0000000
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/Resources.properties
+++ /dev/null
@@ -1,25 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-filePath=File path
-cannotWriteToFiles=Cannot write to file(s)
-readOnlyFiles_title=Read-only file(s)
-readOnlyFiles_msg=The files listed in Details are read-only. Make them writable and click on Retry to continue.
-elementPath=Element path
-promptRemoveReferencesToMissingFiles_msg=The following files are missing. Click OK if you want to remove every reference to the selected files in the library
-missingFiles_title=Missing file(s)
-loadError=Load error
-promptRemoveReferencesToFilesWithLoadErrors_msg=The following file(s) could not be loaded. Click OK if you want to remove every reference to the selected files in the library
-filesWithLoadErrors_title=File(s) with load error
-
-# Error Messages
-libraryAlreadyExistsError_msg=A method library already exists in ''{0}''.
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryManager.java b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryManager.java
deleted file mode 100755
index 020184b..0000000
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryManager.java
+++ /dev/null
@@ -1,386 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.xmi;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.epf.common.serviceability.DebugTrace;
-import org.eclipse.epf.common.serviceability.VersionUtil;
-import org.eclipse.epf.library.AbstractLibraryManager;
-import org.eclipse.epf.library.LibraryAlreadyExistsException;
-import org.eclipse.epf.library.LibraryNotFoundException;
-import org.eclipse.epf.library.LibraryServiceException;
-import org.eclipse.epf.library.persistence.ILibraryResourceSet;
-import org.eclipse.epf.library.persistence.PersistenceService;
-import org.eclipse.epf.library.project.MethodLibraryProject;
-import org.eclipse.epf.library.util.ModelStorage;
-import org.eclipse.epf.services.Services;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The default XMI Library Manager implementation.
- * 
- * @author Kelvin Low
- * @author Jinhua Xi
- * @author Phong Nguyen Le
- * 
- * @since 1.0
- */
-public class XMILibraryManager extends AbstractLibraryManager {
-	/**
-	 * The supported library type.
-	 */
-	public static final String LIBRARY_TYPE = "xmi";
-
-	/**
-	 * The library XMI file name.
-	 */
-	public static final String LIBRARY_XMI = "library.xmi";
-
-	/**
-	 * The plugin and config spec export file name.
-	 */
-	public static final String exportFile = "export.xmi"; //$NON-NLS-1$
-		
-	/**
-	 * The library path.
-	 */
-	public static final String ARG_LIBRARY_PATH = "library.path";
-
-	// The name of the lock file for a library.
-	protected static final String LIBRARY_LOCK_FILENAME = ".lock"; //$NON-NLS-1$
-
-	// The absolute path to the managed library.
-	protected String path;
-
-	// The file lock for the managed library.
-//	private FileLock lock;
-
-	/**
-	 * Checks whether the managed method library is locked.
-	 * 
-	 * @deprecated disable this code for now - see https://bugs.eclipse.org/bugs/show_bug.cgi?id=147106
-	 * @return <code>true</code> if the method library is locked
-	 */
-	public boolean isMethodLibraryLocked() {
-		return false;
-/*		if (debug) { 
-			DebugTrace.print(this, "isMethodLibraryLocked"); //$NON-NLS-1$
-		}
-
-		return XMILibraryUtil.isMethodLibraryLocked(getMethodLibraryPath());
-*/	}
-
-
-	/**
-	 * Creates a new method library.
-	 * 
-	 * @param name
-	 *            a name for the new method library
-	 * @param args
-	 *            method library specific arguments
-	 * @return a method library
-	 * @throw <code>LibraryServiceException</code> if an error occurs while
-	 *        performing the operation
-	 */
-	public MethodLibrary createMethodLibrary(String name, Map args)
-			throws LibraryServiceException {
-		if (debug) {
-			DebugTrace.print(this, "createMethodLibrary", "name=" + name); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		if (name == null || name.length() == 0 || args == null) {
-			throw new IllegalArgumentException();
-		}
-
-		String path = (String) args.get(ARG_LIBRARY_PATH);
-		if (path == null || path.length() == 0) {
-			throw new IllegalArgumentException();
-		}
-
-		File libraryPath = new File(path);
-		File libraryXMIFile = new File(libraryPath, LIBRARY_XMI);
-		if (libraryXMIFile.exists()) {
-			String msg = NLS.bind(
-					XMILibraryResources.libraryAlreadyExistsError_msg,
-					libraryPath.getAbsolutePath());
-			throw new LibraryAlreadyExistsException(msg);
-		}
-
-		if (!libraryPath.exists()) {
-			libraryPath.mkdirs();
-		}
-
-		try {
-			skipEventProcessing = true;
-
-			// Lock the method library to prevent access by another EPF composer
-			// instance.
-			lockMethodLibrary(libraryPath);
-
-			// Open the method library project file.
-			MethodLibraryProject.openProject(libraryPath.getAbsolutePath(),
-					null);
-
-			// Create the resource set.
-			ILibraryResourceSet resourceSet = (ILibraryResourceSet) editingDomain
-					.getResourceSet();
-
-			// Create a new method library.
-			ModelStorage.newLibrary(resourceSet, name, libraryPath
-					.getAbsolutePath(), true);
-			library = resourceSet.getFirstMethodLibrary();
-
-			// Add a listener to monitor library resource changes.
-			addResourceChangedListeners();
-
-			// // this is already moved to LibraryService
-			// notifyListeners(ILibraryChangeListener.OPTION_LOADED, null);
-
-			if (debug) {
-				DebugTrace.print(this,
-						"createMethodLibrary", "library=" + library); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-			return library;
-		} catch (Exception e) {
-			throw new LibraryServiceException(e);
-		} finally {
-			skipEventProcessing = false;
-
-			// // event processed in LibraryService
-			// notifyListeners(ILibraryChangeListener.OPTION_CREATED, null);
-		}
-	}
-
-	/**
-	 * Opens a method library.
-	 * 
-	 * @param uri
-	 *            a method library URI
-	 * @return a method library
-	 * @throw <code>LibraryServiceException</code> if an error occurs while
-	 *        performing the operation
-	 */
-	public MethodLibrary openMethodLibrary(java.net.URI uri)
-			throws LibraryServiceException {
-		if (debug) {
-			DebugTrace.print(this, "openMethodLibrary");
-		}
-
-		if (uri == null) {
-			throw new IllegalArgumentException();
-		}
-
-		try {
-			File file = new File(uri);
-			library = openMethodLibrary(file);
-		} catch (Exception e) {
-			library = null;
-		}
-
-		if (debug) {
-			DebugTrace.print(this, "openMethodLibrary", "library=" + library); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		return library;
-	}
-
-	/**
-	 * Opens a method library.
-	 * 
-	 * @param path
-	 *            a <code>File</code> object that contains the path to the
-	 *            method library.
-	 * @return a <code>MethodLibrary</code>.
-	 * @throw <code>LibraryServiceException</code> if an error occurred while
-	 *        performing the operation.
-	 */
-	protected MethodLibrary openMethodLibrary(File path)
-			throws LibraryServiceException {
-		File libraryXMIFile = new File(path, LIBRARY_XMI);
-		if (!libraryXMIFile.exists()) {
-			throw new LibraryNotFoundException();
-		}
-
-		//An old version library should always be openned from OpenLibraryWizard. Don't want to handle it here.
-		VersionUtil.VersionCheckInfo info = VersionUtil.checkLibraryVersion(libraryXMIFile);
-		if (info != null && info.result > 0) {
-			throw new LibraryServiceException();
-		} else if (XMILibraryUtil.isMethodLibraryUpgradeRequired(path.getAbsolutePath(), LIBRARY_XMI)) {
-			throw new LibraryServiceException();
-		}
-				
-		try {
-			skipEventProcessing = true;
-
-			// Lock the method library to prevent access by another EPF composer
-			// instance.
-			lockMethodLibrary(path);
-
-			// Open the method library project file.
-			MethodLibraryProject.openProject(path.getAbsolutePath(), null);
-
-			// Create the resource set.
-			ILibraryResourceSet resourceSet = ((ILibraryResourceSet) editingDomain
-					.getResourceSet());
-
-			// Load the method library.
-			resourceSet.loadMethodLibraries(URI.createFileURI(libraryXMIFile.getAbsolutePath())
-					, Collections.EMPTY_MAP);
-			library = resourceSet.getFirstMethodLibrary();
-			
-			// Add a listener to monitor library resource changes.
-			addResourceChangedListeners();
-
-			return library;
-		} catch (Exception e) {
-			if (debug) {
-				DebugTrace.print(e);
-			}
-			throw new LibraryServiceException(e);
-		} finally {
-			firePropertyChange(library, PROP_DIRTY);
-			skipEventProcessing = false;
-		}
-	}
-
-	/**
-	 * Unlocks the managed method library.
-	 * @deprecated disable this code for now - see https://bugs.eclipse.org/bugs/show_bug.cgi?id=147106
-	 */
-	protected void unlockMethodLibrary() {
-/*		try {
-			if (lock != null) {
-				lock.release();
-				lock.channel().close();
-			}
-		} catch (Exception e) {
-			LibraryPlugin.getDefault().getLogger().logError(e);
-			if (debug) {
-				DebugTrace.print(this, "unlockMethodLibrary", e); //$NON-NLS-1$
-			}
-		}
-*/	}
-
-	/**
-	 * Opens a method library.
-	 * 
-	 * @param args
-	 *            method library specific arguments
-	 * @return a method library
-	 * @throw <code>LibraryServiceException</code> if an error occurs while
-	 *        performing the operation
-	 */
-	public MethodLibrary openMethodLibrary(Map args)
-			throws LibraryServiceException {
-		if (debug) {
-			DebugTrace.print(this, "openMethodLibrary");
-		}
-
-		if (args == null) {
-			throw new IllegalArgumentException();
-		}
-
-		String path = (String) args.get(ARG_LIBRARY_PATH);
-		if (path == null || path.length() == 0) {
-			throw new IllegalArgumentException();
-		}
-
-		library = openMethodLibrary(new File(path));
-
-		if (debug) {
-			DebugTrace.print(this, "openMethodLibrary", "library=" + library); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		return library;
-	}
-
-	/**
-	 * Reopens the managed method library.
-	 * 
-	 * @return a method library
-	 * @throw <code>LibraryServiceException</code> if an error occurs while
-	 *        performing the operation
-	 */
-	public MethodLibrary reopenMethodLibrary() throws LibraryServiceException {
-		if (debug) {
-			DebugTrace.print(this, "reopenMethodLibrary");
-		}
-
-		library = openMethodLibrary(new File(getMethodLibraryPath()));
-
-		if (debug) {
-			DebugTrace.print(this, "reopenMethodLibrary", "library=" + library); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		return library;
-	}
-
-	/**
-	 * Locks the managed method library to prevent access by another EPF
-	 * Composer instance.
-	 * <p>
-	 * The .lock file in the method library folder will be locked. If it does
-	 * not exists, a new .lock file will be created.
-	 * 
-	 * @deprecated disable this code for now - see https://bugs.eclipse.org/bugs/show_bug.cgi?id=147106
-	 * @param path
-	 *            a <code>File</code> object that contains the path to the
-	 *            method library.
-	 */
-	protected void lockMethodLibrary(File path) {
-/*		File lockFile = new File(path, ResourceUtil.LOCK_FILENAME);
-		lock = FileUtil.lockFile(lockFile);
-*/	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.library.AbstractLibraryManager#getLibraryPersisterType()
-	 */
-	protected String getLibraryPersisterType() {
-		return Services.XMI_PERSISTENCE_TYPE;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.AbstractLibraryManager#createResourceSet()
-	 */
-	protected ILibraryResourceSet createResourceSet() {
-		return PersistenceService.INSTANCE.createResourceSet(Services.XMI_PERSISTENCE_TYPE);
-	}
-
-	/**
-	 * Gets the absolute path to the managed method library.
-	 * 
-	 * @return an absolute path to the method library
-	 */
-	public String getMethodLibraryPath() {
-		if (debug) {
-			DebugTrace.print(this, "getMethodLibraryPath"); //$NON-NLS-1$
-		}
-
-		java.net.URI libraryURI = getMethodLibraryURI();
-		if (libraryURI != null) {
-			// File libraryXMIFile = new File(libraryURI.toFileString());
-			File libraryXMIFile = new File(libraryURI);
-			if (libraryXMIFile.getName().equalsIgnoreCase(LIBRARY_XMI)) {
-				libraryXMIFile = libraryXMIFile.getParentFile();
-			}
-			return libraryXMIFile.getAbsolutePath();
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryPlugin.java b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryPlugin.java
deleted file mode 100755
index fb18b58..0000000
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryPlugin.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.epf.library.xmi;
-
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The XMI Library plug-in activator.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class XMILibraryPlugin extends AbstractPlugin {
-
-	// The shared plug-in instance.
-	private static XMILibraryPlugin plugin;
-
-	/**
-	 * Default constructor.
-	 */
-	public XMILibraryPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * @see org.eclipse.epf.uma.core.plugin.AbstractPlugin#start(BundleContext context)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * @see org.eclipse.epf.uma.core.plugin.AbstractPlugin#start(BundleContext context)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared plug-in instance.
-	 */
-	public static XMILibraryPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryResources.java b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryResources.java
deleted file mode 100755
index 34c2469..0000000
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryResources.java
+++ /dev/null
@@ -1,58 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.xmi;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The XMI Library resource bundle.
- * 
- * @author Phong Nguyen Le
- * @author Kelvin Low
- * @since 1.0
- */
-public class XMILibraryResources extends NLS {
-
-	private static String BUNDLE_NAME = XMILibraryResources.class.getPackage()
-			.getName()
-			+ ".Resources"; //$NON-NLS-1$
-
-	public static String cannotWriteToFiles;
-
-	public static String elementPath;
-
-	public static String filePath;
-
-	public static String filesWithLoadErrors_title;
-
-	public static String loadError;
-
-	public static String missingFiles_title;
-
-	public static String promptRemoveReferencesToFilesWithLoadErrors_msg;
-
-	public static String promptRemoveReferencesToMissingFiles_msg;
-
-	public static String readOnlyFiles_msg;
-
-	public static String readOnlyFiles_title;
-	
-	public static String libraryAlreadyExistsError_msg;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, XMILibraryResources.class);
-	}
-
-	private XMILibraryResources() {
-		// Do not instantiate
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryUtil.java b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryUtil.java
deleted file mode 100755
index b067fd3..0000000
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryUtil.java
+++ /dev/null
@@ -1,347 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.xmi;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.epf.library.LibraryResources;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceException;
-import org.eclipse.epf.library.util.ResourceUtil;
-import org.eclipse.epf.persistence.MultiFileResourceSetImpl;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.uma.MethodLibrary;
-
-/**
- * Helper utilities for accessing a XMI method library.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class XMILibraryUtil {
-
-	private static final String EMPTY_METHOD_LIBRARY_PATH_MSG = LibraryResources.emptyLibraryPathError_reason;
-
-	private static final String MISSING_LIBRARY_FILE_MSG = LibraryResources.missingLibraryFileError_reason;
-
-	private static final String COULD_NOT_LOCK_LIBRARY_MSG = LibraryResources.couldNotLockLibrary_reason;
-
-	public static final IStatus EMPTY_METHOD_LIBRARY_PATH_STATUS = new Status(
-			Status.ERROR, LibraryPlugin.getDefault().getId(), 1,
-			EMPTY_METHOD_LIBRARY_PATH_MSG, null);
-
-	public static final IStatus MISSING_LIBRARY_FILE_STATUS = new Status(
-			Status.ERROR, LibraryPlugin.getDefault().getId(), 1,
-			MISSING_LIBRARY_FILE_MSG, null);
-
-	public static final IStatus COULD_NOT_LOCK_LIBRARY_STATUS = new Status(
-			Status.ERROR, LibraryPlugin.getDefault().getId(), 1,
-			COULD_NOT_LOCK_LIBRARY_MSG, null);
-
-	static {
-		try {
-			// TODO: This call is needed to initialize the persistence layer
-			// to avoid a null pointer exception in
-			// PersistenceUtil.conversionRequired(). A better solution is
-			// needed.
-			new MultiFileResourceSetImpl();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Checks whether a method library exists on a given path.
-	 * 
-	 * @param path
-	 *            an absolute path to a method library
-	 * @return <code>true</code> if the given path contains a valid method
-	 *         library
-	 */
-	public static boolean hasMethodLibrary(String path) {
-		if (path == null) {
-			throw new IllegalArgumentException();
-		}
-
-		File libraryDir = new File(path);
-		if (!libraryDir.exists()) {
-			return false;
-		}
-
-		File libraryFile = new File(libraryDir, XMILibraryManager.LIBRARY_XMI);
-		if (!libraryFile.exists()) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Returns the absolute path to a method library model (library.xmi) file.
-	 * 
-	 * @param path
-	 *            an absolute path to a method library
-	 * @returnt an absolute path to a method library model file (if one exists)
-	 */
-	public static String getLibraryModelFile(String path) {
-		if (!StrUtil.isBlank(path)) {
-			String libPath = new File(path).getAbsolutePath();
-			String suffix = File.separator
-					+ MultiFileSaveUtil.DEFAULT_LIBRARY_MODEL_FILENAME;
-			if (libPath.endsWith(suffix)) {
-				return libPath;
-			} else {
-				return libPath + suffix;
-			}
-		}
-		return path;
-	}
-
-	/**
-	 * Validates a method library path.
-	 * 
-	 * @param path
-	 *            an absolute path to a method library
-	 * @param validateModelFile
-	 *            if <code>true</code>, validate that the library.xmi file
-	 *            also exists.
-	 * @return <code>true</code> if the given path is a valid method library
-	 *         folder
-	 */
-	public static IStatus isValidLibrary(String path, boolean validateModelFile) {
-		if (path == null || path.trim().length() == 0) {
-			return EMPTY_METHOD_LIBRARY_PATH_STATUS;
-		}
-
-		if (validateModelFile) {
-			File libFile = new File(getLibraryModelFile(path));
-			if (!libFile.exists()) {
-				return MISSING_LIBRARY_FILE_STATUS;
-			}
-		}
-
-		File libPath = new File(path);
-		if (path.endsWith(MultiFileSaveUtil.DEFAULT_LIBRARY_MODEL_FILENAME)) {
-			libPath = libPath.getParentFile();
-		}
-
-		String libFullPath = libPath.getAbsolutePath();
-
-		if (libFullPath.startsWith("\\")) { //$NON-NLS-1$
-			// the first part must be a machine name, and you must specify a
-			// folder
-
-			boolean isValid = true;
-			String uncPath;
-			int index = libFullPath.indexOf(File.separatorChar, 2);
-			if (index < 0) {
-				isValid = false;
-			} else {
-				uncPath = libFullPath.substring(index + 1);
-				if (uncPath.length() == 0) {
-					// must specify a valid path
-					isValid = false;
-				} else {
-					// the top level path must be valid
-					index = libFullPath.indexOf(File.separatorChar, index + 1);
-					if (index < 0) {
-						uncPath = libFullPath;
-					} else {
-						uncPath = libFullPath.substring(0, index);
-					}
-
-					File f = new File(uncPath);
-					if (!f.exists()) {
-						isValid = false;
-					}
-				}
-			}
-
-			if (!isValid) {
-				// no new resource string, wait later
-				// return new Status(Status.ERROR,
-				// LibraryPlugin.getDefault().getId(), 1, "Invalid path", null);
-				return EMPTY_METHOD_LIBRARY_PATH_STATUS;
-			}
-		}
-
-		// Check for presence of a .project file.
-		IProjectDescription description = null;
-		try {
-			description = ResourcesPlugin
-					.getWorkspace()
-					.loadProjectDescription(
-							new Path(libFullPath + File.separator
-									+ IProjectDescription.DESCRIPTION_FILE_NAME));
-			if (description != null) {
-				return Status.OK_STATUS;
-			}
-		} catch (CoreException e) {
-		}
-
-		// If a .project file does not exists, use it to validate the path.
-		// only call validateProjectLocation if path is not on workspace
-		// for some reason, validateProjectLocation only works on paths not on the workspace
-		if (Platform.getLocation().isPrefixOf(new Path(libFullPath))) {
-			return Status.OK_STATUS;
-		}
-		IProject project = ResourceUtil.findProject(libFullPath);
-		if (project == null) {
-			project = ResourcesPlugin.getWorkspace().getRoot().getProject(
-					libPath.getName());
-		}
-
-		return ResourcesPlugin.getWorkspace().validateProjectLocation(project,
-				new Path(libFullPath));
-	}
-
-	/**
-	 * Validates a method library path.
-	 * 
-	 * @param path
-	 *            an absolute path to a method library
-	 * @return <code>true</code> if the given path is a valid method library
-	 *         folder
-	 */
-	public static IStatus isValidLibrary(String path) {
-		return isValidLibrary(path, false);
-	}
-
-	/**
-	 * Checks whether a method library is locked.
-	 * <p>
-	 * Once a method library is locked, it cannot be accessed by another EPF
-	 * Composer instance.
-	 * 
-	 * @deprecated disable this code for now - see https://bugs.eclipse.org/bugs/show_bug.cgi?id=147106
-	 * @param path
-	 *            an absolute path to a method library
-	 * @return <code>true</code> if the method library is locked
-	 */
-	public static boolean isMethodLibraryLocked(String path) {
-		return false;
-/*		// check if library is currently opened by this instance
-		// the FileLock mechanism in Java does not seem to properly detect when
-		// 		the current JVM has locked the file
-		// TODO: check all opened libraries (rather than just current) when the API allows it
-		String currentLibraryPath = LibraryService.getInstance().getCurrentMethodLibraryPath();
-		if (currentLibraryPath != null && new File(currentLibraryPath).equals(new File(path)))
-			return false;
-		File lockFile = new File(path, ResourceUtil.LOCK_FILENAME);
-		return FileUtil.isFileLocked(lockFile);
-*/	}
-
-	/**
-	 * Checks whether a method library needs to be upgraded to a new format.
-	 * 
-	 * @param path
-	 *            An absolute path to a method library
-	 * @return <code>true</code> if the method library needs to be upgraded
-	 */
-	public static boolean isMethodLibraryUpgradeRequired(String path) {
-		return isMethodLibraryUpgradeRequired(path, XMILibraryManager.LIBRARY_XMI);
-	}
-	
-	public static boolean isMethodLibraryUpgradeRequired(String path, String libXmi) {
-		return org.eclipse.epf.persistence.migration.MappingUtil.conversionRequired(
-					path + File.separator + libXmi);
-	}
-	
-	/**
-	 * Creates a new XMI method library.
-	 * 
-	 * @param name
-	 *            a name for the new method library
-	 * @param path
-	 *            an absolute path to a method library
-	 * @return a method library
-	 * @throw <code>LibraryServiceException</code> if an error occurs while
-	 *        performing the operation
-	 */
-	public static MethodLibrary createMethodLibrary(String name, String path)
-			throws LibraryServiceException {
-		Map args = new HashMap();
-		args.put(XMILibraryManager.ARG_LIBRARY_PATH, path);
-		return LibraryService.getInstance().createMethodLibrary(name,
-				XMILibraryManager.LIBRARY_TYPE, args);
-	}
-
-	/**
-	 * Opens an existing method library.
-	 * 
-	 * @param path
-	 *            an absolute path to a method library
-	 * @return a method library
-	 * @throw <code>LibraryServiceException</code> if an error occurs while
-	 *        performing the operation
-	 */
-	public static MethodLibrary openMethodLibrary(String path)
-			throws LibraryServiceException {
-		Map args = new HashMap();
-		args.put(XMILibraryManager.ARG_LIBRARY_PATH, path);
-		return LibraryService.getInstance().openMethodLibrary(
-				XMILibraryManager.LIBRARY_TYPE, args);
-	}
-
-	/**
-	 * Opens the method library project associated with a method library.
-	 * 
-	 * @param library
-	 *            a method library
-	 * @param monitor
-	 *            a progress monitor
-	 */
-	public static void openMethodLibraryProject(MethodLibrary library,
-			IProgressMonitor monitor) {
-		if (library != null && library.eResource().getURI().isFile()) {			
-			IProject project = ResourceUtil.findProject(library);
-			if (project != null && !project.isOpen()) {
-				try {
-					project.open(IResource.BACKGROUND_REFRESH, monitor);
-				} catch (CoreException e) {
-					XMILibraryPlugin.getDefault().getLogger().logError(e);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Check if the directory given by specified path contains a plugin or config spec
-	 * export file. 
-	 * 
-	 * @param path
-	 *            an absolute path to a method library
-	 */
-	public static boolean containsPluginOrConfigSpecExportFile(String path) {
-		if (path == null || path.trim().length() == 0) {
-			return false;
-		}
-		path = new File(path).getAbsolutePath();
-		path += File.separator + XMILibraryManager.exportFile;
-		File exportFile = new File(path);
-		return exportFile.exists();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/LibraryProcessor.txt b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/LibraryProcessor.txt
deleted file mode 100755
index 6ab41a9..0000000
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/LibraryProcessor.txt
+++ /dev/null
@@ -1,1242 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.xmi.internal;
-
-import java.io.File;
-import java.nio.channels.FileLock;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.EventObject;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.CreateChildCommand;
-import org.eclipse.emf.edit.command.PasteFromClipboardCommand;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.epf.library.LibraryResources;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.command.IActionManager;
-import org.eclipse.epf.library.edit.itemsfilter.FilterConstants;
-import org.eclipse.epf.library.events.ILibraryChangeListener;
-import org.eclipse.epf.library.layout.ElementLayoutManager;
-import org.eclipse.epf.library.layout.LayoutResources;
-import org.eclipse.epf.library.prefs.PreferenceConstants;
-import org.eclipse.epf.library.services.LibraryModificationHelper;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.library.services.VersionManager;
-import org.eclipse.epf.library.util.CopyAttachmentsToNewLocation;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.library.util.Log;
-import org.eclipse.epf.library.util.ModelStorage;
-import org.eclipse.epf.library.util.ResourceUtil;
-import org.eclipse.epf.persistence.FileManager;
-import org.eclipse.epf.persistence.MethodLibraryPersister;
-import org.eclipse.epf.persistence.MultiFileResourceSetImpl;
-import org.eclipse.epf.persistence.MultiFileXMISaveImpl;
-import org.eclipse.epf.persistence.refresh.IRefreshEvent;
-import org.eclipse.epf.persistence.refresh.IRefreshListener;
-import org.eclipse.epf.persistence.refresh.RefreshJob;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.ProcessFamily;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-import org.eclipse.epf.uma.util.AssociationHelper;
-import org.eclipse.epf.services.util.ContentDescriptionFactory;
-import org.eclipse.epf.uma.util.IMethodLibraryPersister;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.ListenerList;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.ui.IPropertyListener;
-
-/**
- * Manages a Method Library.
- * 
- * @author Jinhua Xi
- * @author Phong Nguyen Le
- * @author Kelvin Low
- * @since 1.0
- */
-public class LibraryProcessor {
-
-	public static final int PROP_DIRTY = 1;
-
-	public static LibraryProcessor instance = null;
-
-	protected AdapterFactoryEditingDomain editingDomain;
-
-	// maintain the currently selected configuration
-	// user should call set/getCurrentConfiguration() methods
-	// protected String currentConfigName = null;
-
-	private Map saveOptions;
-
-	// private Map saveAsOptions;
-	// private Set eClasses;
-
-	private List listeners = new ArrayList();
-
-	// keep the listeners to be deleted, do the delete before each notification
-	// and empty this list.
-	// don't delete in the middle of the notification since we don't want to
-	// change the listener list at this time
-	private List tmp_listeners_tobe_deleted = new ArrayList();
-
-	// private boolean isMultipleFiles = false;
-
-	// private boolean dirty = false;
-
-	boolean loaded = false;
-
-	private boolean inOperation = false;
-
-	private VersionManager versionMgr = null;
-
-	private ElementLayoutManager layoutMgr = null;;
-
-	// RATLC00384598 - Export: Infinite loop NullpointerException after
-	// exporting and unchecking rup plugin in configuration
-	// add this flag to treat the instance as singleton instacne or not
-	// only the singleton instance can dispose shared objects.
-	private boolean isSingletonInstance = false;
-
-	// the lock on the library's .project file
-	private FileLock lock;
-
-	//TODO: find a better way to notify the change in library instead of relying on the command stack listener
-	private CommandStackListener commandStackListener = new CommandStackListener() {
-		public void commandStackChanged(final EventObject event) {
-			if (!inOperation) {
-				SafeUpdateController.asyncExec(new Runnable() {
-					public void run() {
-						// Try to select the affected objects.
-						//
-						Command mostRecentCommand = LibraryUtil
-								.unwrap(((CommandStack) event.getSource())
-										.getMostRecentCommand());
-
-						if (mostRecentCommand != null) {
-							if (mostRecentCommand instanceof AddCommand) {
-								AddCommand cmd = (AddCommand) mostRecentCommand;
-								EObject owner = cmd.getOwner();
-								if (owner instanceof MethodConfiguration) {
-									Collection objs = new ArrayList();
-									objs.add(owner);
-									notifyListeners(
-											ILibraryChangeListener.OPTION_CHANGED,
-											objs);
-								} else {
-									Collection objs = mostRecentCommand.getResult();
-									notifyListeners(
-											ILibraryChangeListener.OPTION_NEWCHILD,
-											objs);
-									
-									// update the configuration selection if the
-									// object is a newly added method package
-									//
-									if (owner instanceof MethodPackage) {
-										objs = LibraryUtil.getContainedElements(owner, objs);
-										if(!objs.isEmpty()) {
-											addNewPackagesToConfiguration(objs);
-										}
-									}
-								}
-
-							} 
-							else if(mostRecentCommand instanceof PasteFromClipboardCommand) {
-								Collection objs = mostRecentCommand.getResult();
-								notifyListeners(ILibraryChangeListener.OPTION_NEWCHILD, objs);	
-								PasteFromClipboardCommand cmd = ((PasteFromClipboardCommand)mostRecentCommand);
-								
-								// update the configuration selection if the
-								// object is a newly added method package
-								//
-								if (cmd.getOwner() instanceof MethodPackage) {
-									objs = LibraryUtil.getContainedElements(cmd.getOwner(), objs);
-									if(!objs.isEmpty()) {
-										addNewPackagesToConfiguration(objs);
-									}
-								}
-							}
-							else if (mostRecentCommand instanceof CreateChildCommand) {
-								notifyListeners(
-										ILibraryChangeListener.OPTION_NEWCHILD,
-										mostRecentCommand.getAffectedObjects());
-							} else if (mostRecentCommand != null) {
-								notifyListeners(
-										ILibraryChangeListener.OPTION_CHANGED,
-										mostRecentCommand.getAffectedObjects());
-							}
-						}
-					}
-				});
-			}
-		}
-	};
-
-	/**
-	 * add the new packages into the configurations if the parent is in the
-	 * configuration
-	 * 
-	 * @param newobjs
-	 */
-	private void addNewPackagesToConfiguration(Collection newobjs) {
-		if (newobjs == null || newobjs.size() == 0) {
-			return;
-		}
-
-		LibraryModificationHelper helper = new LibraryModificationHelper();
-
-		try {
-			EObject e, parent;
-			for (Iterator it = newobjs.iterator(); it.hasNext();) {
-				e = (EObject) it.next();
-				if ((e instanceof MethodPackage)
-						&& ((parent = e.eContainer()) != null)
-						&& (parent instanceof MethodPackage)) {
-					Object configs = ((MultiResourceEObject) parent)
-							.getOppositeFeatureValue(AssociationHelper.MethodPackage_MethodConfigurations);
-					if (configs instanceof List) {
-						for (Iterator itconfig = ((List) configs).iterator(); itconfig
-								.hasNext();) {
-							MethodConfiguration config = (MethodConfiguration) itconfig
-									.next();
-							List pkgs = config.getMethodPackageSelection();
-							if (!pkgs.contains(e)) {
-								// pkgs.add(e);
-								helper
-										.getActionManager()
-										.doAction(
-												IActionManager.ADD,
-												config,
-												UmaPackage.eINSTANCE
-														.getMethodConfiguration_MethodPackageSelection(),
-												e, -1);
-							}
-						}
-					}
-				}
-			}
-
-			helper.save();
-
-		} catch (RuntimeException e) {
-			LibraryPlugin.getDefault().getLogger().logError(e);
-		} finally {
-			helper.dispose();
-		}
-	}
-
-	private INotifyChangedListener notifyChangedListener = new INotifyChangedListener() {
-		public void notifyChanged(Notification notification) {
-			if (!inOperation) {
-				int eventType = notification.getEventType();
-				switch (eventType) {
-				case Notification.ADD: {
-					// only for add MethodPlugin, or maybe some other missing
-					// stuff (if any) that are not created by a command.
-					// anything created by a command are handled by the
-					// commandStackListener
-					Object notifier = notification.getNotifier();
-					Object v = notification.getNewValue();
-					if ((notifier instanceof MethodLibrary)
-							&& (v instanceof MethodPlugin)) {
-						Collection affectedObjects = new ArrayList();
-						affectedObjects.add(v);
-						notifyListeners(ILibraryChangeListener.OPTION_NEWCHILD,
-								affectedObjects);
-					}
-					break;
-				}
-
-				case Notification.SET: {
-					Object notifier = notification.getNotifier();
-					if (notifier != null) {
-						Collection affectedObjects = new ArrayList();
-						affectedObjects.add(notifier);
-						notifyListeners(ILibraryChangeListener.OPTION_CHANGED,
-								affectedObjects);
-					}
-					break;
-				}
-
-				// note: this is the remove of elements from the parent,
-				// it might be a delete action, or might be just a remove of
-				// references
-				// for delete action, the deleted element has no container
-				// for removed reference, the removed element still have it's
-				// parent
-				case Notification.REMOVE: {
-					Object notifier = notification.getNotifier();
-					Object oldValue = notification.getOldValue();
-					Collection affectedObjects = new ArrayList();
-					if (oldValue instanceof EObject
-							&& ((EObject) oldValue).eContainer() == null) {
-						// the element is deleted, sent a delete event
-						affectedObjects.add(oldValue);
-						notifyListeners(ILibraryChangeListener.OPTION_DELETED,
-								affectedObjects);
-					} else {
-						// otherwise, it's just a remove of references, the
-						// notifier is the changed element
-						affectedObjects.add(notifier);
-						notifyListeners(ILibraryChangeListener.OPTION_CHANGED,
-								affectedObjects);
-					}
-					break;
-				}
-				case Notification.REMOVE_MANY: {
-					List oldValue = new ArrayList((Collection) notification
-							.getOldValue());
-					ArrayList deletedElements = new ArrayList();
-					ArrayList removedReferences = new ArrayList();
-					if (!oldValue.isEmpty()) {
-						for (Iterator iter = oldValue.iterator(); iter
-								.hasNext();) {
-							Object element = iter.next();
-							if (element instanceof EObject) {
-								if (((EObject) element).eContainer() == null) {
-									deletedElements.add(element);
-								} else {
-									removedReferences.add(element);
-								}
-							}
-						}
-					}
-					if (!deletedElements.isEmpty()) {
-						// the element is deleted, sent a delete event
-						notifyListeners(ILibraryChangeListener.OPTION_DELETED,
-								deletedElements);
-					}
-					if (!removedReferences.isEmpty()) {
-						// otherwise, it's just a remove of references, the
-						// notifier is the changed element
-						notifyListeners(ILibraryChangeListener.OPTION_CHANGED,
-								removedReferences);
-					}
-					break;
-				}
-				}
-			}
-		}
-	};
-
-	private boolean listenerAdded = false;
-
-	private Adapter libChangedListener = new AdapterImpl() {
-		public void notifyChanged(Notification msg) {
-			switch (msg.getFeatureID(MethodLibrary.class)) {
-			case UmaPackage.METHOD_LIBRARY__METHOD_PLUGINS:
-				MethodPlugin plugin;
-				switch (msg.getEventType()) {
-				case Notification.ADD:
-					plugin = (MethodPlugin) msg.getNewValue();
-					plugin.eResource().eAdapters().add(resourceChangedListener);
-					break;
-				case Notification.ADD_MANY:
-					for (Iterator iter = ((Collection) msg.getNewValue())
-							.iterator(); iter.hasNext();) {
-						plugin = (MethodPlugin) iter.next();
-						plugin.eResource().eAdapters().add(
-								resourceChangedListener);
-					}
-					break;
-				case Notification.REMOVE:
-					plugin = (MethodPlugin) msg.getOldValue();
-					plugin.eResource().eAdapters().remove(
-							resourceChangedListener);
-					break;
-				case Notification.REMOVE_MANY:
-					for (Iterator iter = ((Collection) msg.getOldValue())
-							.iterator(); iter.hasNext();) {
-						plugin = (MethodPlugin) iter.next();
-						plugin.eResource().eAdapters().remove(
-								resourceChangedListener);
-					}
-					break;
-				}
-			}
-		}
-	};
-
-	private Adapter resourceChangedListener = new AdapterImpl() {
-		public void notifyChanged(org.eclipse.emf.common.notify.Notification msg) {
-			if (msg.getFeatureID(null) == Resource.RESOURCE__IS_MODIFIED
-					&& msg.getEventType() == org.eclipse.emf.common.notify.Notification.SET) {
-				// dirty = true;
-				firePropertyChange(msg.getNotifier(), PROP_DIRTY);
-			}
-		}
-	};
-
-	private ListenerList propChangeListeners = new ListenerList();
-
-	private IRefreshListener refreshListener = new IRefreshListener() {
-
-		public void notifyRefreshed(IRefreshEvent event) {
-			handleRefreshEvent(event);
-		}
-		
-	};
-
-	public static LibraryProcessor getInstance() {
-		if (instance == null) {
-			synchronized (LibraryProcessor.class) {
-				if (instance == null) {
-					instance = new LibraryProcessor();
-				}
-			}
-		}
-
-		return instance;
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void handleRefreshEvent(IRefreshEvent event) {
-		if(Log.DEBUG) {
-			System.out.println("LibraryProcessor.handleRefreshEvent()"); //$NON-NLS-N$
-			System.out.println("  refreshed resources: " + event.getRefreshedResources());
-		}
-		if(!event.getUnloadedObjects().isEmpty()) {
-			TngAdapterFactory.INSTANCE.cleanUp();
-		}
-	}
-
-	private LibraryProcessor() {
-		init();
-
-		// this is the main instance, will be treated as singleton
-		isSingletonInstance = true;
-	}
-
-	public LibraryProcessor(Resource res) {
-		this();
-		if (res != null) {
-			setResource(res);
-		}
-
-		isSingletonInstance = false;
-	}
-
-	/**
-	 * this construct should be called only if you want to maintain your own
-	 * LibraryProcessor, such as when for library importing or exporting.
-	 * Otherwise, call the static getInstance() method to retrieve the singleton
-	 * 
-	 * @param libraryPath
-	 */
-	public LibraryProcessor(String libraryPath) throws Exception {
-		this();
-		openLibrary(libraryPath);
-
-		isSingletonInstance = false;
-	}
-	
-	public void addPropertyListener(IPropertyListener l) {
-		propChangeListeners.add(l);
-	}
-
-	public void removePropertyListener(IPropertyListener l) {
-		propChangeListeners.remove(l);
-	}
-
-	/**
-	 * Fires a property changed event.
-	 * 
-	 * @param propertyId
-	 *            the id of the property that changed
-	 */
-	protected void firePropertyChange(final Object source, final int propertyId) {
-		Object[] array = propChangeListeners.getListeners();
-		for (int nX = 0; nX < array.length; nX++) {
-			final IPropertyListener l = (IPropertyListener) array[nX];
-
-			// since this will cause UI update, which must be executed in the UI
-			// thread
-			// otherwise, will cause Invalid Thread Access exception
-			SafeUpdateController.asyncExec(new Runnable() {
-				public void run() {
-					l.propertyChanged(source, propertyId);
-				}
-			});
-		}
-	}
-
-	private void addLibraryListeners() {
-		MethodLibrary library = getLibrary();
-
-		if (library == null || library.eResource() == null)
-			return;
-		// if(!library.eAdapters().contains(libChangedListener)) {
-		// library.eAdapters().add(libChangedListener);
-		// }
-		if (!library.eResource().eAdapters().contains(resourceChangedListener)) {
-			library.eResource().eAdapters().add(resourceChangedListener);
-		}
-		for (Iterator iter = library.getMethodPlugins().iterator(); iter
-				.hasNext();) {
-			MethodPlugin plugin = (MethodPlugin) iter.next();
-			if (!plugin.eResource().eAdapters().contains(
-					resourceChangedListener)) {
-				plugin.eResource().eAdapters().add(resourceChangedListener);
-			}
-		}
-	}
-
-	private void removeLibraryListeners() {
-		MethodLibrary library = getLibrary();
-
-		if (library == null || library.eResource() == null)
-			return;
-		// library.eAdapters().remove(libChangedListener);
-		library.eResource().eAdapters().remove(resourceChangedListener);
-		for (Iterator iter = library.getMethodPlugins().iterator(); iter
-				.hasNext();) {
-			MethodPlugin plugin = (MethodPlugin) iter.next();
-			plugin.eResource().eAdapters().remove(resourceChangedListener);
-		}
-	}
-
-	public void addListener(ILibraryChangeListener listener) {
-		synchronized (listeners) {
-			if (!listeners.contains(listener)) {
-				listeners.add(listener);
-			}
-		}
-	}
-
-	public void removeListener(ILibraryChangeListener listener) {
-		synchronized (tmp_listeners_tobe_deleted) {
-			// delay the remove till a notification is requested
-			if (!tmp_listeners_tobe_deleted.contains(listener)) {
-				tmp_listeners_tobe_deleted.add(listener);
-			}
-		}
-	}
-
-	private synchronized void notifyListeners(final int option,
-			final Collection collection) {
-		loaded = true;
-
-		try {
-			// remove the listeners to be deleted
-			if (tmp_listeners_tobe_deleted.size() > 0) {
-				for (Iterator it = tmp_listeners_tobe_deleted.iterator(); it
-						.hasNext();) {
-					Object l = it.next();
-					if (listeners.contains(l)) {
-						listeners.remove(l);
-					}
-				}
-				tmp_listeners_tobe_deleted.clear();
-			}
-
-			// notify listeners,
-			// note, the size may change since notify a listener may caused new
-			// listeners being added
-			// those new listeners will be added to the end of the list so we
-			// are ok
-			int i = 0;
-			while (i < listeners.size()) {
-				final ILibraryChangeListener listener = (ILibraryChangeListener) listeners
-						.get(i);
-				if (listener != null) {
-					// since this will cause UI update, which must be executed
-					// in the UI thread
-					// otherwise, will cause Invalid Thread Access exception
-
-					// execute it in sync mode, otherwise may cause problem
-					// since the notification might be executed too late.
-					// for example, after the listener object is disposed
-					SafeUpdateController.syncExec(new Runnable() {
-						public void run() {
-							listener.libraryChanged(option, collection);
-						}
-					});
-				}
-
-				i++;
-			}
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-	}
-
-	private void beginOperation() {
-		inOperation = true;
-	}
-
-	private void endOperation() {
-		inOperation = false;
-	}
-	
-	/**
-	 * Checks if the given object is valid in the current resource set
-	 * 
-	 * @param object
-	 * @return
-	 */
-	public boolean isValid(EObject object) {
-		if(object != null && object.eIsProxy()) {
-			EObject e = RefreshJob.getInstance().resolve(object);
-			return (e instanceof MethodElement
-					&& !e.eIsProxy()
-					&& UmaUtil.getMethodLibrary(e) == getLibrary());
-		}
-		return true;
-
-	}
-	
-	/**
-	 * Checks if the library's project is still open. If not, open it
-	 */
-	/*
-	public boolean ensureLibraryProjectOpen(IProgressMonitor monitor) {
-		MethodLibrary lib = getLibrary();
-		if(lib != null) {
-			IProject prj = ResourceUtil.findProject(lib);
-			if(prj != null && !prj.isOpen()) {
-				try {
-					prj.open(IResource.BACKGROUND_REFRESH, monitor);
-					return true;
-				} catch (CoreException e) {
-					LibraryPlugin.getDefault().getLogger().logError(e);
-				}
-			}
-		}
-		return false;
-	}
-	*/
-	
-	public void openLibrary() throws Exception {
-		String openLibrary = getLibraryRootPath().getAbsolutePath()
-				+ File.separator + "library.xmi"; //$NON-NLS-1$
-		if (openLibrary != null && !openLibrary.equals("")) { //$NON-NLS-1$
-			openLibrary(openLibrary);
-		}
-	}
-
-	public IStatus openLibrary(String libraryPath) throws Exception {
-		try {
-			beginOperation();
-			
-			// open the method library as a project in the workspace so it will
-			// show up in the Resource view.
-			//
-			File libDir = new File(libraryPath).getParentFile();
-			
-			// only close previous library if the new library's project was
-			// opened successfully
-			// close previous library's project only if it is different than the
-			// new one
-			closeOpenedLibrary();
-
-			// lock the library
-			//
-			lockLibrary(libDir);
-
-			ResourceUtil.open(libDir.getAbsolutePath(), null);
-
-			MultiFileResourceSetImpl resourceSet = ((MultiFileResourceSetImpl) editingDomain
-					.getResourceSet());
-			assignLibrary(resourceSet.loadLibrary(libraryPath));
-
-			IStatus status;
-			if (!resourceSet.hasUnresolvedProxy()) {
-				String msg = LibraryResources
-						.getString("Library.unresolvedProxyError.reason"); //$NON-NLS-1$
-				status = new Status(IStatus.WARNING, LibraryPlugin.getDefault()
-						.getId(), 0, msg, null);
-			} else {
-				status = Status.OK_STATUS;
-			}
-
-			notifyListeners(ILibraryChangeListener.OPTION_LOADED, null);
-			return status;
-		} finally {
-			endOperation();
-
-			// dirty = false;
-			firePropertyChange(getLibrary(), PROP_DIRTY);
-
-			// setCurrentConfiguration(null);
-		}
-
-	}
-
-	/**
-	 * Assigns library to a new value and attach the change listeners to it.
-	 * 
-	 * @param lib
-	 */
-	private void assignLibrary(MethodLibrary lib) {
-		removeLibraryListeners();
-		addLibraryListeners();
-	}
-
-	public void newLibrary(String libraryName, String libraryPath) throws Exception {
-		try {
-			closeOpenedLibrary();
-
-			// isMultipleFiles = bMultiple;
-			beginOperation();
-
-			File lib_path = new File(libraryPath);
-			libraryPath = lib_path.getAbsolutePath();
-
-			// open the method library as a project in the workspace so it will
-			// show up in the Resource view.
-			ResourceUtil.open(libraryPath, null);
-
-			MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) editingDomain
-					.getResourceSet();
-			ModelStorage.newLibrary(resourceSet, libraryName, libraryPath, true);
-			assignLibrary(resourceSet.getMethodLibrary());
-
-			// lock the library
-			lockLibrary(lib_path);
-		} finally {
-			endOperation();
-			// setDirty(true);
-			// setCurrentConfiguration(null);
-			notifyListeners(ILibraryChangeListener.OPTION_CREATED, null);
-		}
-	}
-
-	/**
-	 * Saves the given resource if it belong to the currently open library
-	 * 
-	 * @param resource
-	 * @throws Exception
-	 */
-	public void save(Resource resource) throws Exception {
-		MultiFileResourceSetImpl resourceSet = ((MultiFileResourceSetImpl) editingDomain
-				.getResourceSet());
-		if (resourceSet.getResources().contains(resource)) {
-			resourceSet.save(resource, saveOptions);
-		}
-	}
-
-	public void saveLibrary() throws Exception {
-		MethodLibrary library = getLibrary();
-		if (library != null) {
-			doSave(saveOptions);
-			firePropertyChange(library, PROP_DIRTY);
-
-			notifyListeners(ILibraryChangeListener.OPTION_SAVED, null);
-		}
-	}
-
-	/**
-	 * Saves the open library under a new location
-	 * 
-	 * @param newDir
-	 *            directory to save the open library to
-	 * @param regenerateGUID
-	 *            if true, regenerate GUID for all MethodElements in the open
-	 *            library
-	 */
-	public void saveLibraryAs(String newDir, boolean regenerateGUID,
-			IProgressMonitor monitor) throws Exception {
-		String oldLibDir = getLibraryRootPath()
-				.getAbsolutePath();
-
-		// create new IProject
-		ResourceUtil.open(newDir, monitor);
-
-		MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) getLibrary()
-				.eResource().getResourceSet();
-		resourceSet.saveAs(newDir, regenerateGUID, monitor);
-
-		// handle attachments here
-		CopyAttachmentsToNewLocation.copyAttachmentsLibrary(oldLibDir, newDir,
-				null, monitor);
-	}
-
-	/**
-	 * 
-	 * @param libraryPath
-	 * @param bMultiple
-	 * @throws Exception
-	 * @deprecated
-	 */
-	public void saveLibraryAs(String libraryPath, boolean bMultiple)
-			throws Exception {
-		// Resource res =
-		// ((Resource)editingDomain.getResourceSet().getResources().get(0));
-		// res.setURI(URI.createFileURI(libraryPath));
-		// res.setModified(true);
-		//
-		// setSaveAsMultipleFolder(bMultiple);
-		//        	
-		// doSave(saveAsOptions);
-		// setDirty(false);
-		// isMultipleFiles = bMultiple;
-		//        
-		// notifyListeners(ILibraryChangeListener.OPTION_SAVED, null);
-
-		throw new UnsupportedOperationException();
-	}
-
-	private void setResource(Resource res) {
-		if (res != null) {
-			MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) editingDomain
-					.getResourceSet();
-			resourceSet.reset();
-			resourceSet.getResources().add(res);
-			assignLibrary(resourceSet.getMethodLibrary());
-			notifyListeners(ILibraryChangeListener.OPTION_CHANGED, null);
-		}
-	}
-
-	private Resource getLibraryResource() {
-		List res = getEditingDomain().getResourceSet().getResources();
-		if (res.size() > 0) {
-			return (Resource) res.get(0);
-		}
-
-		return null;
-	}
-
-	public MethodLibrary getLibrary() {
-		Resource resource = getLibraryResource();
-		if (resource != null && resource.getContents().size() > 0) {
-			for (Iterator it = resource.getContents().iterator(); it.hasNext();) {
-				Object o = it.next();
-				if (o instanceof MethodLibrary) {
-					return (MethodLibrary) o;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	public URI getLibraryURI() {
-		Resource savedResource = getLibraryResource();
-		if (savedResource != null) {
-			return savedResource.getURI();
-		}
-
-		return null;
-	}
-
-	public URI getRelativeURI(MethodElement element) {
-		URI libURI = getLibraryURI();
-		URI elemetnURI = element.eResource().getURI();
-		URI relUri = elemetnURI.deresolve(libURI);
-
-		return relUri;
-	}
-
-	public synchronized ElementLayoutManager getLayoutManager() {
-		// no ElementLayoutManager id library is not loaded
-		if (layoutMgr == null) {
-			if (getLibrary() != null) {
-				layoutMgr = new ElementLayoutManager();
-			}
-		}
-
-		return layoutMgr;
-	}
-
-	/*
-	public VersionManager getVersionManager() {
-		if (versionMgr == null) {
-			synchronized (this) {
-				if (versionMgr == null) {
-					versionMgr = new VersionManager(this);
-				}
-			}
-		}
-
-		return versionMgr;
-	}
-	*/
-
-	public void setLibrary(MethodLibrary newLib) {
-		assignLibrary(newLib);
-		Resource res = (Resource) getEditingDomain().getResourceSet()
-				.getResources().get(0);
-		res.getContents().clear();
-		res.getContents().add(newLib);
-		notifyListeners(ILibraryChangeListener.OPTION_LOADED, null);
-	}
-
-	public AdapterFactoryEditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	private void init() {
-		LibraryPlugin.getDefault().getPreferenceStore()
-				.addPropertyChangeListener(new IPropertyChangeListener() {
-
-					public void propertyChange(PropertyChangeEvent event) {
-						if (event.getProperty().equals(
-								PreferenceConstants.PREF_BACK_UP_BEFORE_SAVE)) {
-							saveOptions.put(
-									MultiFileXMISaveImpl.BACK_UP_BEFORE_SAVE,
-									event.getNewValue());
-						} else if (event
-								.getProperty()
-								.equals(
-										PreferenceConstants.PREF_DISCARD_UNRESOLVED_REFERENCES)) {
-							saveOptions
-									.put(
-											MultiFileXMISaveImpl.DISCARD_UNRESOLVED_REFERENCES,
-											event.getNewValue());
-						}
-					}
-
-				});
-
-		// create the default editing domain for library operation
-		List factories = new ArrayList();
-		factories.add(new ResourceItemProviderAdapterFactory());
-		factories.add(new ReflectiveItemProviderAdapterFactory());
-
-		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
-				factories);
-
-		// Create the command stack that will notify this editor as commands are
-		// executed.
-		BasicCommandStack commandStack = new BasicCommandStack();
-
-		// Create the editing domain with a special command stack.
-		MultiFileResourceSetImpl resourceSet = new MultiFileResourceSetImpl();
-		
-		resourceSet.addRefreshListener(refreshListener);
-		RefreshJob.getInstance().setResourceSet(resourceSet);
-
-		saveOptions = resourceSet.getDefaultSaveOptions();
-		boolean b = LibraryPlugin.getDefault().getPreferenceStore().getBoolean(
-				PreferenceConstants.PREF_BACK_UP_BEFORE_SAVE);
-		saveOptions.put(MultiFileXMISaveImpl.BACK_UP_BEFORE_SAVE, Boolean
-				.valueOf(b));
-		b = LibraryPlugin.getDefault().getPreferenceStore().getBoolean(
-				PreferenceConstants.PREF_DISCARD_UNRESOLVED_REFERENCES);
-		saveOptions.put(MultiFileXMISaveImpl.DISCARD_UNRESOLVED_REFERENCES,
-				Boolean.valueOf(b));
-
-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
-				commandStack, resourceSet);
-
-		// Create new IContentDescriptionPersister and set it to the
-		// ContentDescriptionFactory for use.
-		//
-		IMethodLibraryPersister contentDescPersister = new MethodLibraryPersister();
-		ContentDescriptionFactory
-				.setMethodLibraryPersister(contentDescPersister);
-
-		ContentDescriptionFactory.setFileManager(FileManager.getInstance());
-
-		registerEditingDomain(editingDomain);
-	}
-
-	public void doSave(Map options) throws Exception {
-		if (Log.DEBUG) {
-			System.out.println("Save options: " + options); //$NON-NLS-1$
-		}
-
-		// List removedResources = new ArrayList();
-
-		// File libDir = new
-		// File(((Resource)editingDomain.getResourceSet().getResources().get(0)).getURI().toFileString()).getParentFile();
-
-		try {
-			beginOperation();
-			MultiFileResourceSetImpl resourceSet = ((MultiFileResourceSetImpl) editingDomain
-					.getResourceSet());
-			// Save the resource(s)
-			//
-			resourceSet.save(options);
-
-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();
-		} catch (Exception exception) {
-			exception.printStackTrace();
-			throw exception;
-		} finally {
-			endOperation();
-
-		}
-	}
-
-	/*
-	public void discardChanges() {
-		for (Iterator iter = editingDomain.getResourceSet().getResources()
-				.iterator(); iter.hasNext();) {
-			Resource resource = (Resource) iter.next();
-			resource.setModified(false);
-		}
-	}
-	*/
-
-	public boolean isLibraryLoaded() {
-		return loaded;
-	}
-
-	public ComposedAdapterFactory getAdapterFactory() {
-		return (ComposedAdapterFactory) getEditingDomain().getAdapterFactory();
-	}
-
-	private List getMethodModels() {
-		MethodLibrary library = getLibrary();
-		return (library == null) ? new ArrayList() : library.getMethodPlugins();
-	}
-
-	public MethodPlugin getMethodPlugin(String guid) {
-		if (guid != null) {	
-			for (Iterator it = getMethodModels().iterator(); it.hasNext();) {
-				MethodPlugin p = (MethodPlugin) it.next();
-				if (guid.equals(p.getGuid())) {
-					return p;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * get process family by name
-	 * 
-	 * @param name
-	 * @return ProcessFamily
-	 */
-	public ProcessFamily getProcessFamily(String name) {
-		MethodConfiguration config;
-		MethodLibrary library = getLibrary();
-		if (library != null) {
-			List configs = library.getPredefinedConfigurations();
-			for (Iterator it = configs.iterator(); it.hasNext();) {
-				config = (MethodConfiguration) it.next();
-				if ((config instanceof ProcessFamily)
-						&& config.getName().equals(name)) {
-					return (ProcessFamily) config;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * register edting domain with this library
-	 * 
-	 * @param domain
-	 */
-	public void registerEditingDomain(AdapterFactoryEditingDomain domain) {
-		/**
-		 * this notifys all changes, not just the content change, only pick the
-		 * ones for element updates. The other operations are colvered by the
-		 * Command events
-		 */
-		((ComposedAdapterFactory) domain.getAdapterFactory())
-				.addListener(notifyChangedListener);
-
-		// Add a listener to set the most recent command's affected objects to
-		// be the selection of the viewer with focus.
-		domain.getCommandStack().addCommandStackListener(commandStackListener);
-
-	}
-
-	public void listenTo(ComposedAdapterFactory adapterFactory) {
-		adapterFactory.addListener(notifyChangedListener);
-	}
-
-	public void stopListeningTo(ComposedAdapterFactory adapterFactory) {
-		adapterFactory.removeListener(notifyChangedListener);
-	}
-
-	public void listenTo(CommandStack commandStack) {
-		commandStack.addCommandStackListener(commandStackListener);
-	}
-
-	public void stopListeningTo(CommandStack commandStack) {
-		commandStack.removeCommandStackListener(commandStackListener);
-	}
-
-	/**
-	 * @return Returns the saveOptions.
-	 */
-	public Map getSaveOptions() {
-		return saveOptions;
-	}
-
-	public File getLibraryRootPath() {
-		URI uri = this.getLibraryURI();
-		if (uri != null) {
-			String path = uri.toFileString();
-			File f = new File(path);
-			return f.getParentFile();
-		}
-
-		return null;
-	}
-
-	public void addMethodPlugin(final MethodPlugin model) {
-
-		// since this will cause UI update, which must be executed in the UI
-		// thread
-		// otherwise, will cause Invalid Thread Access exception
-		final Exception[] exceptions = new Exception[1];
-
-		SafeUpdateController.syncExec(new Runnable() {
-			public void run() {
-				getLibrary().getMethodPlugins().add(model);
-
-				IMethodLibraryPersister.FailSafeMethodLibraryPersister persister = ContentDescriptionFactory
-						.getMethodLibraryPersister().getFailSafePersister();
-				try {
-					persister.save(getLibrary().eResource());
-					persister.commit();
-				} catch (Exception e) {
-					persister.rollback();
-					exceptions[0] = e;
-					return;
-				}
-
-				model.eResource().eAdapters().add(resourceChangedListener);
-			}
-		});
-
-		if (exceptions[0] != null) {
-			throw new WrappedException(exceptions[0]);
-		}
-	}
-
-	/**
-	 * Enables/disables notification entirely.
-	 * 
-	 * @param b
-	 */
-	public void setNotificationEnabled(boolean b) {
-		editingDomain.getResourceSet().eSetDeliver(b);
-	}
-
-	public boolean isNotificationEnabled() {
-		return editingDomain.getResourceSet().eDeliver();
-	}
-
-	/**
-	 * call this method when the current library is to be closed. for example,
-	 * when you try to open a nother library for create a new library
-	 */
-	public void closeOpenedLibrary() {
-		notifyListeners(ILibraryChangeListener.OPTION_LIBRARY_CLOSED, null);
-
-		if (Log.DEBUG) {
-			System.out
-					.println("Used memory before closing library: " + (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())); //$NON-NLS-1$
-		}
-		// RATLC00384598 - Export: Infinite loop NullpointerException after
-		// exporting and unchecking rup plugin in configuration
-		// so don't dispose it if not the main singleton instance
-		if (isSingletonInstance) {
-			// dispose all item providers
-			//
-			TngAdapterFactory.INSTANCE.reset();
-
-			// clear filter constants hashMap
-			if (FilterConstants.hashMap != null) {
-				FilterConstants.hashMap.clear();
-			}
-		}
-
-		if (this.layoutMgr != null) {
-			this.layoutMgr.clear();
-		}
-
-
-		// clear the temp layout 
-		LayoutResources.clear();
-
-		/*
-		 * if ( this.depMgr != null ) { this.depMgr.clear(); } this.depMgr =
-		 * null;
-		 */
-
-		this.layoutMgr = null;
-
-		// this.invalidGuids.clear();
-
-		MultiFileResourceSetImpl resourceSet = (MultiFileResourceSetImpl) editingDomain
-				.getResourceSet();
-
-		resourceSet.clearErrors();
-		MethodLibrary library = getLibrary();
-
-		unlockLibrary();
-
-		resourceSet.reset();
-		RefreshJob.getInstance().reset();
-
-		Runtime.getRuntime().gc();
-		if (Log.DEBUG) {
-			System.out
-					.println("Used memory after closing library: " + (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())); //$NON-NLS-1$
-		}
-
-	}
-
-	private void unlockLibrary() {
-		// release lock on old lib's project
-		try {
-			if (lock != null) {
-				lock.release();
-				lock.channel().close();
-			}
-		} catch (Exception e) {
-			LibraryPlugin.getDefault().getLogger().logError(e);
-		}
-	}
-
-	/**
-	 * Locks the .lock file in the given path. Creates a .lock file if one does
-	 * not exist
-	 * 
-	 * @param file
-	 *            path to library
-	 */
-	public void lockLibrary(File libDirFile) {
-		File lockFile = new File(libDirFile, ResourceUtil.LOCK_FILENAME);
-		lock = FileUtil.lockFile(lockFile);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/XMIOppositeFeatureLoader.java b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/XMIOppositeFeatureLoader.java
deleted file mode 100755
index 13b7b50..0000000
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/XMIOppositeFeatureLoader.java
+++ /dev/null
@@ -1,76 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.xmi.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.epf.library.edit.util.IOppositeFeatureLoader;
-import org.eclipse.epf.persistence.MultiFileResourceSetImpl;
-import org.eclipse.epf.uma.MethodElement;
-
-/**
- * Manages the loading of opposite features for a XMI-based method library.
- *  
- * @author Phong Nguyen Le
- * @since  1.0
- */
-public class XMIOppositeFeatureLoader implements IOppositeFeatureLoader {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.library.edit.util.IOppositeFeatureLoader#loadOppositeFeatures(java.util.Collection)
-	 */
-	public void loadOppositeFeatures(Collection elements) {
-		HashSet oppositeFeatures = new HashSet();
-		HashSet deletedGUIDs = new HashSet();
-		MultiFileResourceSetImpl resourceSet = null;
-		for (Iterator iter = elements.iterator(); iter.hasNext();) {
-			Object o = (Object) iter.next();
-			if(o instanceof MethodElement) {
-				MethodElement e = (MethodElement) o;
-				if(resourceSet == null) {
-					Resource resource = e.eResource();
-					ResourceSet rset;
-					if(resource == null || !((rset = resource.getResourceSet()) instanceof MultiFileResourceSetImpl)) {
-						continue;
-					}
-					resourceSet = (MultiFileResourceSetImpl) rset;
-				}
-				for (Iterator iterator = e.eAllContents(); iterator.hasNext();) {
-					Object element = iterator.next();
-					if (element instanceof MethodElement) {
-						Collection features = ((MethodElement) element)
-								.getOppositeFeatures();
-						if (features != null
-								&& !features.isEmpty()) {
-							oppositeFeatures
-									.addAll(features);
-							deletedGUIDs.add(((MethodElement) element)
-									.getGuid());
-						}
-					}
-				}
-				Collection features = e.getOppositeFeatures();
-				if (features != null && !features.isEmpty()) {
-					oppositeFeatures.addAll(features);
-					deletedGUIDs.add(e.getGuid());
-				}				
-			}
-		}
-		
-		resourceSet.loadOppositeFeatures(new ArrayList(oppositeFeatures), deletedGUIDs);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/migration/Migrator102.java b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/migration/Migrator102.java
deleted file mode 100755
index 55e6dce..0000000
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/migration/Migrator102.java
+++ /dev/null
@@ -1,675 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.xmi.internal.migration;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.util.EContentsEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.EContentsEList.FeatureIterator;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.diagram.model.util.GraphicalDataManager;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.util.ModelStructure;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.util.ResourceUtil;
-import org.eclipse.epf.library.xmi.XMILibraryPlugin;
-import org.eclipse.epf.library.xmi.XMILibraryResources;
-import org.eclipse.epf.persistence.MethodLibraryPersister;
-import org.eclipse.epf.persistence.MultiFileResourceSetImpl;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.persistence.MultiFileXMISaveImpl;
-import org.eclipse.epf.persistence.migration.IMigrator;
-import org.eclipse.epf.persistence.migration.MigrationResourceHandler;
-import org.eclipse.epf.persistence.migration.MigrationUtil;
-import org.eclipse.epf.persistence.migration.UpgradeCallerInfo;
-import org.eclipse.epf.persistence.util.PersistenceResources;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.SemanticModelBridge;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UMASemanticModelBridge;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author Phong Nguyen Le - Jun 12, 2006
- * @since 1.0
- */
-public class Migrator102 implements IMigrator {
-	private static final boolean DEBUG = XMILibraryPlugin.getDefault()
-			.isDebugging();
-
-	private static void updateStatus(IProgressMonitor monitor, String msg) {
-		if (monitor != null) {
-			monitor.subTask(msg);
-			monitor.worked(1);
-			try {
-				Thread.sleep(10);
-			} catch (InterruptedException e) {
-				//
-			}
-		} else {
-			System.out.println(msg);
-		}
-	}
-
-	private Collection proxiesToRemove = new ArrayList();
-
-	private Map proxyToFileMap = new HashMap();
-
-	private HashMap proxyToFileWithLoadErrorMap = new HashMap();
-
-	private ArrayList notFoundProxies = new ArrayList();
-
-	private ArrayList proxiesWithUnnormalizedURI = new ArrayList();
-
-	private MethodLibrary lib;
-
-	private MigrationResourceHandler resourceHandler = new MigrationResourceHandler() {
-
-		protected boolean handleUnknownFeature(EObject owner,
-				EStructuralFeature feature, Object value) {
-			// Order graph nodes of task descriptors in ADD based on their order
-			// in the task descriptor list of the role descriptor
-			// old feature: RoleDescriptor.performsAsOwner
-			//
-			if(owner instanceof RoleDescriptor
-					&& "performsAsOwner".equals(feature.getName()) //$NON-NLS-1$
-					&& value != null)
-			{
-				ArrayList GUIDs = new ArrayList();
-				StringTokenizer tokens = new StringTokenizer((String) value);
-				while(tokens.hasMoreTokens()) {
-					GUIDs.add(tokens.nextToken());
-				}
-				if(GUIDs.size() > 1) {
-					Activity act = ((RoleDescriptor)owner).getSuperActivities();
-					Diagram add = GraphicalDataManager.getInstance().getUMADiagram(act, GraphicalDataHelper.ACTIVITY_DETAIL_DIAGRAM, false);
-					if(add != null) {
-						Map tdGuidToGraphNodeMap = new HashMap();
-						int size = add.getContained().size();
-						for (int i = 0; i < size; i++) {
-							Object element = add.getContained().get(i);
-							if(element instanceof GraphNode) {
-								GraphNode graphNode = ((GraphNode)element);
-								SemanticModelBridge bridge = graphNode.getSemanticModel();
-								if (bridge instanceof UMASemanticModelBridge) {
-									MethodElement me = ((UMASemanticModelBridge) bridge).getElement();								
-									if(me instanceof TaskDescriptor) {
-										List list = graphNode.getList(UmaPackage.GRAPH_NODE__PROPERTY);
-										Property property = GraphicalDataHelper.getPropertyByKey(list,
-												GraphicalDataHelper.PROP_WORK_PRODUCT_COMPOSITE_TYPE);
-										if (property == null) {
-											// this is not a GraphNode for WorkProductComposite
-											// it must be a GraphNode for a TaskDescriptor
-											//
-											tdGuidToGraphNodeMap.put(me.getGuid(), graphNode);
-										}
-									}
-								}
-							}
-						}
-						
-						// reorder the graph nodes to match order of their linked task descriptors
-						//
-						ArrayList graphNodes = new ArrayList();
-						for(int i = 0; i < GUIDs.size(); i++) {
-							Object graphNode = tdGuidToGraphNodeMap.get(GUIDs.get(i));
-							if(graphNode != null) {
-								graphNodes.add(graphNode);
-							}
-						}
-						add.getContained().removeAll(graphNodes);
-						add.getContained().addAll(graphNodes);
-					}					
-				}
-			}
-			return true;
-		}
-
-	};
-
-	private static final String FILE_PATH = XMILibraryResources.filePath;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.persistence.migration.IMigrator#migrate(java.lang.String,
-	 *      org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void migrate(String libPath, IProgressMonitor monitor)
-		throws Exception {
-		migrate(libPath, monitor, null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.persistence.migration.IMigrator#migrate(java.lang.String, org.eclipse.core.runtime.IProgressMonitor, org.eclipse.epf.persistence.migration.UpgradeCallerInfo)
-	 */
-	public void migrate(String libPath, IProgressMonitor monitor, UpgradeCallerInfo info)
-			throws Exception {
-		File libFile = new File(libPath);
-
-		boolean toVerify = true;
-		if (info != null && info.getIsExportedPluginLib()) {
-			toVerify = false;
-		}
-		
-		ResourceUtil.open(libFile.getParent(), monitor);
-
-		MultiFileResourceSetImpl resourceSet = null;
-		try {
-			// set 1.0.2 default values so data can be correctly loaded
-			//
-			setOldDefaultValues();
-
-			// load the library
-			//
-			updateStatus(monitor, PersistenceResources.loadLibraryTask_name);
-
-			if (toVerify) {
-				resourceSet = new MultiFileResourceSetImpl(false);
-			} else {
-				resourceSet = new MultiFileResourceSetImpl(false) {
-					protected void demandLoad(Resource resource) throws IOException {
-						if (! skipDemandLoad(resource)) {
-							super.demandLoad(resource);
-						}
-					}
-					private boolean skipDemandLoad(Resource res) {
-						File file = new File(res.getURI().toFileString());
-						if (! file.exists() && file.getName().equals(MultiFileSaveUtil.DEFAULT_PLUGIN_MODEL_FILENAME)) {
-							return true;
-						}
-						return false;
-					}
-				};
-			}
-						
-			resourceSet.getLoadOptions().put(
-					XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
-			resourceSet.getLoadOptions().put(
-					XMLResource.OPTION_RESOURCE_HANDLER, resourceHandler);
-			lib = resourceSet.loadLibrary(libPath);
-			
-			removeProcessContributions(monitor);
-
-			// verify the library
-			//
-			// TODO: uncomment after externalize the text
-			// updateStatus(monitor, "Verifying...");
-
-			if (toVerify) {
-				Display dis = Display.getDefault();
-				if (dis == null || dis.getThread() == Thread.currentThread()) {
-					verify();
-				} else {
-					dis.syncExec(new Runnable() {
-						public void run() {
-							verify();
-						}
-					});
-				}
-				removeUnresolvedReferences(monitor);
-			}
-			
-			// load all elements in memory
-			//
-			updateStatus(monitor, PersistenceResources.loadResourcesTask_name);
-			for (Iterator iter = lib.eAllContents(); iter.hasNext();) {
-				EObject element = (EObject) iter.next();
-				if (element instanceof MethodElement) {
-					try {
-						for (Iterator iterator = element.eCrossReferences()
-								.iterator(); iterator.hasNext();) {
-							iterator.next();
-						}
-					} catch (Exception e) {
-						CommonPlugin.INSTANCE.log(e);
-						if (DEBUG) {
-							System.err
-									.println("Error iterate thru cross references of element: " + element); //$NON-NLS-1$
-						}
-					}
-					update((MethodElement) element, monitor);
-				}
-			}
-
-			
-			
-			removeOldDefaultValues();
-
-			// check modified resources for writable before saving them
-			//
-			Display dis = Display.getDefault();
-			if (dis == null || dis.getThread() == Thread.currentThread()) {
-				checkModifiedResources();
-			} else {
-				dis.syncExec(new Runnable() {
-					public void run() {
-						checkModifiedResources();
-					}
-				});
-			}
-
-			// save all files
-			//
-			updateStatus(monitor, PersistenceResources.saveLibraryTask_name);
-			Map saveOptions = resourceSet.getDefaultSaveOptions();
-			if (toVerify) {
-				saveOptions.put(MultiFileXMISaveImpl.DISCARD_UNRESOLVED_REFERENCES,
-					Boolean.TRUE);
-			}
-			resourceSet.save(saveOptions, true);
-
-			updateStatus(monitor,
-					PersistenceResources.refreshLibraryFilesTask_name);
-			ResourceUtil.refreshResources(lib, monitor);
-		} finally {
-			if (resourceSet != null) {
-				resourceSet.reset();
-				resourceSet = null;
-			}
-		}
-	}
-
-	/**
-	 * Removes process contributions from all plugins
-	 */
-	private void removeProcessContributions(IProgressMonitor monitor) {
-		for (Iterator iter = lib.getMethodPlugins().iterator(); iter.hasNext();) {
-			MethodPlugin plugin = (MethodPlugin) iter.next();
-			MethodPackage pkg = UmaUtil.findMethodPackage(plugin,
-					ModelStructure.DEFAULT.processContributionPath);
-			if (pkg != null) {
-				for (Iterator iterator = new ArrayList(pkg.getChildPackages())
-						.iterator(); iterator.hasNext();) {
-					MethodPackage childPkg = (MethodPackage) iterator.next();
-					Resource resource = ((InternalEObject) childPkg)
-							.eDirectResource();
-					if (resource != null) {
-						ResourceSet resourceSet = resource.getResourceSet();
-						try {
-							MethodLibraryPersister.INSTANCE.delete(pkg);
-						} catch (Exception e) {
-							if (DEBUG) {
-								e.printStackTrace();
-							}
-						}
-						if (resourceSet != null) {
-							resourceSet.getResources().remove(resource);
-						}
-					}
-				}
-				pkg.getChildPackages().clear();
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void checkModifiedResources() {
-		do {
-			ResourceSet resourceSet = lib.eResource().getResourceSet();
-			ArrayList readOnlyResources = new ArrayList();
-			String pluginId = XMILibraryPlugin.getDefault().getId();
-			MultiStatus status = new MultiStatus(pluginId, 0,
-					XMILibraryResources.cannotWriteToFiles, null);
-			for (Iterator iter = resourceSet.getResources().iterator(); iter
-					.hasNext();) {
-				Resource resource = (Resource) iter.next();
-				File file = new File(resource.getURI().toFileString());
-				if (file.exists() && !file.canWrite()) {
-					readOnlyResources.add(resource);
-					status.add(new Status(IStatus.ERROR, pluginId, 0, file
-							.toString(), null));
-				}
-			}
-			if (!status.isOK()) {
-				String title = XMILibraryResources.readOnlyFiles_title;
-				String msg = XMILibraryResources.readOnlyFiles_msg;
-				ErrorDialog errDlg = new ErrorDialog(MsgBox.getDefaultShell(),
-						title, msg, status, IStatus.OK | IStatus.INFO
-								| IStatus.WARNING | IStatus.ERROR) {
-					/*
-					 * (non-Javadoc)
-					 * 
-					 * @see org.eclipse.jface.dialogs.ErrorDialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
-					 */
-					protected void createButtonsForButtonBar(Composite parent) {
-						// create Retry, Cancel and Details buttons
-						createButton(parent, IDialogConstants.OK_ID,
-								IDialogConstants.RETRY_LABEL, true);
-
-						createButton(parent, IDialogConstants.CANCEL_ID,
-								IDialogConstants.CANCEL_LABEL, false);
-
-						createDetailsButton(parent);
-					}
-
-					/*
-					 * (non-Javadoc)
-					 * 
-					 * @see org.eclipse.jface.dialogs.ErrorDialog#open()
-					 */
-					public int open() {
-						showDetailsArea();
-						return super.open();
-					}
-
-				};
-				if (errDlg.open() == IDialogConstants.CANCEL_ID) {
-					throw new OperationCanceledException();
-				}
-			} else {
-				return;
-			}
-		} while (true);
-	}
-
-	/**
-	 * @param monitor
-	 */
-	private void removeUnresolvedReferences(IProgressMonitor monitor) {
-		if (proxiesToRemove.isEmpty())
-			return;
-		// TODO: uncomment after externalize the text
-		// updateStatus(monitor, "Removing unresolved references");
-		HashSet GUIDs = new HashSet();
-		for (Iterator iter = proxiesToRemove.iterator(); iter.hasNext();) {
-			InternalEObject proxy = (InternalEObject) iter.next();
-			GUIDs.add(proxy.eProxyURI().fragment());
-			EcoreUtil.remove(proxy);
-		}
-		for (Iterator iter = lib.eAllContents(); iter.hasNext();) {
-			EObject element = (EObject) iter.next();
-			for (EContentsEList.FeatureIterator iterator = (FeatureIterator) element
-					.eCrossReferences().iterator(); iterator.hasNext();) {
-				InternalEObject obj = (InternalEObject) iterator.next();
-				if (obj.eIsProxy()
-						&& GUIDs.contains(obj.eProxyURI().fragment())) {
-					EStructuralFeature feature = iterator.feature();
-					if (feature.isChangeable() && !feature.isDerived()) {
-						if (feature.isMany()) {
-							((List) element.eGet(feature)).remove(obj);
-						} else {
-							element.eSet(feature, null);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param lib
-	 */
-	private void verify() {
-		notFoundProxies.clear();
-		proxiesToRemove.clear();
-		proxyToFileMap.clear();
-		proxyToFileWithLoadErrorMap.clear();
-		proxiesWithUnnormalizedURI.clear();
-
-		Collection<EObject> proxies = PersistenceUtil.getProxies(lib);
-		if (!proxies.isEmpty()) {
-			ResourceSet resourceSet = lib.eResource().getResourceSet();
-			URIConverter uriConverter = resourceSet.getURIConverter();
-			for (Iterator iter = proxies.iterator(); iter.hasNext();) {
-				InternalEObject proxy = (InternalEObject) iter.next();
-				URI uri = proxy.eProxyURI();
-				URI normalizedURI = uriConverter.normalize(uri);
-				if (normalizedURI == null) {
-					proxiesWithUnnormalizedURI.add(proxy);
-				} else {
-					File file = new File(normalizedURI.toFileString());
-					if (!file.exists()) {
-						proxyToFileMap.put(proxy, file);
-					} else {
-						try {
-							Resource resource = resourceSet.getResource(
-									normalizedURI.trimFragment(), true);
-							if (resource.getEObject(normalizedURI.fragment()) == null) {
-								notFoundProxies.add(proxy);
-							}
-						} catch (Exception e) {
-							String errMsg = e.getMessage() != null ? e
-									.getMessage() : e.toString();
-							proxyToFileWithLoadErrorMap.put(proxy,
-									new Object[] { file, errMsg });
-						}
-					}
-				}
-			}
-		}
-
-		if (!proxyToFileMap.isEmpty()) {
-			// promp user to resolve missing files
-			//
-			List list = new ArrayList(proxyToFileMap.keySet());
-			final String ELEMENT_PATH = XMILibraryResources.elementPath;
-			ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-					TngAdapterFactory.INSTANCE
-							.getNavigatorView_ComposedAdapterFactory()) {
-
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider#getText(java.lang.Object)
-				 */
-				public String getText(Object object) {
-					File file = (File) proxyToFileMap.get(object);
-					return file.getAbsolutePath()
-							+ " (" + TngUtil.getLabelWithPath(object) + ')'; //$NON-NLS-1$
-				}
-
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider#getColumnText(java.lang.Object,
-				 *      int)
-				 */
-				public String getColumnText(Object object, int columnIndex) {
-					switch (columnIndex) {
-					case 0:
-						return proxyToFileMap.get(object).toString();
-					case 1:
-						return TngUtil.getLabelWithPath(object);
-					}
-					return null;
-				}
-
-			};
-
-			try {
-				String msg = XMILibraryResources.promptRemoveReferencesToMissingFiles_msg;
-				SelectionDialog dlg = new SelectionDialog(MsgBox
-						.getDefaultShell(), list, labelProvider, msg);
-
-				dlg.setTitle(XMILibraryResources.missingFiles_title);
-				dlg.setBlockOnOpen(true);
-				dlg.setInitialElementSelections(list);
-				dlg
-						.setColumnProperties(new String[] { FILE_PATH,
-								ELEMENT_PATH });
-				if (dlg.open() == Dialog.CANCEL) {
-					throw new OperationCanceledException();
-				}
-				Object objs[] = dlg.getResult();
-				if (objs == null) {
-					throw new OperationCanceledException();
-				} else {
-					for (Iterator iter = list.iterator(); iter.hasNext();) {
-						proxiesToRemove.add(iter.next());
-
-					}
-				}
-			} finally {
-				labelProvider.dispose();
-			}
-		}
-
-		// prompt user to resolve files that can not be loaded
-		//
-		if (!proxyToFileWithLoadErrorMap.isEmpty()) {
-			List list = new ArrayList(proxyToFileWithLoadErrorMap.keySet());
-			final String LOAD_ERROR = XMILibraryResources.loadError;
-			ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-					TngAdapterFactory.INSTANCE
-							.getNavigatorView_ComposedAdapterFactory()) {
-
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider#getColumnText(java.lang.Object,
-				 *      int)
-				 */
-				public String getColumnText(Object object, int columnIndex) {
-					Object[] arr = (Object[]) proxyToFileMap.get(object);
-					if (columnIndex < 2) {
-						return arr[columnIndex].toString();
-					}
-					return null;
-				}
-
-			};
-
-			try {
-				String msg = XMILibraryResources.promptRemoveReferencesToFilesWithLoadErrors_msg;
-				SelectionDialog dlg = new SelectionDialog(MsgBox
-						.getDefaultShell(), list, labelProvider, msg);
-
-				dlg.setTitle(XMILibraryResources.filesWithLoadErrors_title);
-				dlg.setBlockOnOpen(true);
-				dlg.setInitialElementSelections(list);
-				dlg.setColumnProperties(new String[] { FILE_PATH, LOAD_ERROR });
-				if (dlg.open() == Dialog.CANCEL) {
-					throw new OperationCanceledException();
-				}
-				Object objs[] = dlg.getResult();
-				if (objs == null) {
-					throw new OperationCanceledException();
-				} else {
-					for (Iterator iter = list.iterator(); iter.hasNext();) {
-						proxiesToRemove.add(iter.next());
-
-					}
-				}
-			} finally {
-				labelProvider.dispose();
-			}
-		}
-
-		ArrayList proxiesToRetain = new ArrayList();
-		proxies.addAll(proxyToFileMap.keySet());
-		proxies.addAll(proxyToFileWithLoadErrorMap.keySet());
-		proxies.removeAll(proxiesToRemove);
-
-		if (proxiesToRetain.isEmpty()) {
-			proxiesToRemove.addAll(notFoundProxies);
-			proxiesToRemove.addAll(proxiesWithUnnormalizedURI);
-		}
-
-		String msg = "Summary of unresolved proxies:"; //$NON-NLS-1$
-		msg += "\n  Not found proxies: " + notFoundProxies; //$NON-NLS-1$
-		msg += "\n  Proxies with unnormalized URI: " + proxiesWithUnnormalizedURI; //$NON-NLS-1$
-		XMILibraryPlugin.getDefault().getLogger().logInfo(msg);
-	}
-
-	/**
-	 * 
-	 */
-	private void removeOldDefaultValues() {
-		MultiResourceEObject.removeDefaultValue(UmaPackage.eINSTANCE
-				.getMethodPlugin_UserChangeable());
-	}
-
-	/**
-	 * @param e
-	 * 
-	 */
-	private void adjustToNewDefaultValues(MethodElement e) {
-		if (e instanceof MethodPlugin) {
-			((MultiResourceEObject) e)
-					.removeFeatureWithOverridenDefaultValue(UmaPackage.eINSTANCE
-							.getMethodPlugin_UserChangeable());
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void setOldDefaultValues() {
-		MultiResourceEObject.setDefaultValue(UmaPackage.eINSTANCE
-				.getMethodPlugin_UserChangeable(), Boolean.FALSE);
-	}
-
-	private void update(MethodElement e, IProgressMonitor monitor)
-			throws Exception {
-		adjustToNewDefaultValues(e);
-
-		if (e instanceof Activity) {
-			Activity act = (Activity) e;
-			VariabilityType type = act.getVariabilityType();
-			if (type == VariabilityType.CONTRIBUTES_LITERAL) {
-				act
-						.setVariabilityType(VariabilityType.LOCAL_CONTRIBUTION_LITERAL);
-			} else if (type == VariabilityType.REPLACES_LITERAL) {
-				act
-						.setVariabilityType(VariabilityType.LOCAL_REPLACEMENT_LITERAL);
-			}
-		}
-		MigrationUtil.formatValue(e);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/migration/Migrator103.java b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/migration/Migrator103.java
deleted file mode 100755
index 3b7c4cb..0000000
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/migration/Migrator103.java
+++ /dev/null
@@ -1,143 +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.library.xmi.internal.migration;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.util.EContentsEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.EContentsEList.FeatureIterator;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.common.serviceability.MsgBox;
-import org.eclipse.epf.diagram.model.util.GraphicalDataHelper;
-import org.eclipse.epf.diagram.model.util.GraphicalDataManager;
-import org.eclipse.epf.library.edit.TngAdapterFactory;
-import org.eclipse.epf.library.edit.util.ModelStructure;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.library.util.ResourceUtil;
-import org.eclipse.epf.library.xmi.XMILibraryPlugin;
-import org.eclipse.epf.library.xmi.XMILibraryResources;
-import org.eclipse.epf.persistence.MethodLibraryPersister;
-import org.eclipse.epf.persistence.MultiFileResourceSetImpl;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.persistence.MultiFileXMISaveImpl;
-import org.eclipse.epf.persistence.migration.IMigrator;
-import org.eclipse.epf.persistence.migration.MigrationResourceHandler;
-import org.eclipse.epf.persistence.migration.MigrationUtil;
-import org.eclipse.epf.persistence.migration.UpgradeCallerInfo;
-import org.eclipse.epf.persistence.util.PersistenceResources;
-import org.eclipse.epf.persistence.util.PersistenceUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.SemanticModelBridge;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UMASemanticModelBridge;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author Weiping Lu - Feb 12, 2007
- * @since 1.2
- */
-public class Migrator103 extends MigratorBase {
-	
-	public void migrate(String libPath, IProgressMonitor monitor) throws Exception {
-		migrate(libPath, monitor, null);
-	}
-	
-	public void migrate(String libPath, IProgressMonitor monitor, UpgradeCallerInfo info) throws Exception {
-		File libFile = new File(libPath);
-
-		ResourceUtil.open(libFile.getParent(), monitor);
-
-		MultiFileResourceSetImpl resourceSet = null;
-		try {
-			// load the library
-			//
-			updateStatus(monitor, PersistenceResources.loadLibraryTask_name);
-
-			resourceSet = new MultiFileResourceSetImpl(false);
-						
-			resourceSet.getLoadOptions().put(
-					XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
-
-			MethodLibrary lib = resourceSet.loadLibrary(libPath);
-						
-			// load all elements in memory
-			//
-			updateStatus(monitor, PersistenceResources.loadResourcesTask_name);
-			
-			updateAllContents(monitor, lib);
-			
-			// To do here: 
-			// Call GMF diagram API to convert diagram data			
-
-			// save all files
-			//
-			updateStatus(monitor, PersistenceResources.saveLibraryTask_name);
-			Map saveOptions = resourceSet.getDefaultSaveOptions();
-			resourceSet.save(saveOptions, true);
-
-			updateStatus(monitor,
-					PersistenceResources.refreshLibraryFilesTask_name);
-			ResourceUtil.refreshResources(lib, monitor);
-		} finally {
-			if (resourceSet != null) {
-				resourceSet.reset();
-				resourceSet = null;
-			}
-		}
-
-	}
-
-	protected void updateElement(MethodElement element, IProgressMonitor monitor) throws Exception {		
-		MigrationUtil.formatValue(element);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/migration/MigratorBase.java b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/migration/MigratorBase.java
deleted file mode 100755
index d0523b0..0000000
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/migration/MigratorBase.java
+++ /dev/null
@@ -1,76 +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.library.xmi.internal.migration;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.library.xmi.XMILibraryPlugin;
-import org.eclipse.epf.persistence.migration.IMigrator;
-import org.eclipse.epf.persistence.migration.UpgradeCallerInfo;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-
-/**
- * Base class implementation for migrators
- * 
- * @author Weiping Lu - Feb 12, 2007
- * @since 1.2
- */
-public abstract class MigratorBase implements IMigrator {
-	protected static final boolean DEBUG = XMILibraryPlugin.getDefault()
-			.isDebugging();
-	
-	protected static void updateStatus(IProgressMonitor monitor, String msg) {
-		if (monitor != null) {
-			monitor.subTask(msg);
-			monitor.worked(1);
-			try {
-				Thread.sleep(10);
-			} catch (InterruptedException e) {
-				//
-			}
-		} else {
-			System.out.println(msg);
-		}
-	}
-	
-	protected void updateAllContents(IProgressMonitor monitor, MethodLibrary lib) throws Exception {
-		for (Iterator iter = lib.eAllContents(); iter.hasNext();) {
-			EObject element = (EObject) iter.next();
-			if (element instanceof MethodElement) {
-				try {
-					for (Iterator iterator = element.eCrossReferences()
-							.iterator(); iterator.hasNext();) {
-						iterator.next();
-					}
-				} catch (Exception e) {
-					CommonPlugin.INSTANCE.log(e);
-					if (DEBUG) {
-						System.err
-								.println("Error iterate thru cross references of element: " + element); //$NON-NLS-1$
-					}
-				}
-				updateElement((MethodElement) element, monitor);
-			}
-		}
-	}
-	
-	protected abstract void updateElement(MethodElement element, IProgressMonitor monitor) throws Exception;	
-	
-	public abstract void migrate(String libPath, IProgressMonitor monitor) throws Exception;
-	
-	public abstract void migrate(String libPath, IProgressMonitor monitor, UpgradeCallerInfo info) throws Exception;
-
-	
-}
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/migration/SelectionDialog.java b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/migration/SelectionDialog.java
deleted file mode 100755
index d664dfb..0000000
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/migration/SelectionDialog.java
+++ /dev/null
@@ -1,92 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.xmi.internal.migration;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-
-/**
- * Displays a dialog that lists missing files in a method library to be upgraded.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class SelectionDialog extends ListSelectionDialog {
-
-	private String[] columnProperties;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SelectionDialog(Shell parentShell, Object input,
-			IStructuredContentProvider contentProvider,
-			ILabelProvider labelProvider, String message) {
-		super(parentShell, input, contentProvider, labelProvider, message);
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SelectionDialog(Shell parentShell, List input,
-			ILabelProvider labelProvider, String message) {
-		super(parentShell, input, new IStructuredContentProvider() {
-			public Object[] getElements(Object object) {
-				return ((List) object).toArray();
-			}
-
-			public void dispose() {
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput,
-					Object newInput) {
-			}
-		}, labelProvider, message);
-	}
-
-	public void setColumnProperties(String[] columnProperties) {
-		this.columnProperties = columnProperties;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.dialogs.ListSelectionDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Control ctrl = super.createDialogArea(parent);
-
-		// create table columns
-		//
-		Table table = getViewer().getTable();
-		table.setHeaderVisible(true);
-		for (int i = 0; i < columnProperties.length; i++) {
-			TableColumn col = new TableColumn(table, SWT.LEFT);
-			col.setText(columnProperties[i]);
-			col.setResizable(true);
-			col.setWidth(200);
-		}
-		getViewer().setColumnProperties(columnProperties);
-		getViewer().refresh();
-
-		return ctrl;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/migration/package.html b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/migration/package.html
deleted file mode 100755
index c87c3df..0000000
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/migration/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides migration support for upgrading a XMI-based method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/package.html b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/package.html
deleted file mode 100755
index 0e7768e..0000000
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/internal/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides implementation support for managing a XMI-based method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/package.html b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/package.html
deleted file mode 100755
index fa5de2a..0000000
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the implementation for managing a XMI-based method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/preferences/XMILibraryPreferences.java b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/preferences/XMILibraryPreferences.java
deleted file mode 100755
index 727c452..0000000
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/preferences/XMILibraryPreferences.java
+++ /dev/null
@@ -1,49 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.library.xmi.preferences;
-
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.library.xmi.XMILibraryPlugin;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * The XML Method Library preferences.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class XMILibraryPreferences {
-
-	/**
-	 * The default library path preference key.
-	 */
-	public static final String DEFAULT_LIBRARY_PATH = "defaultLibraryPath"; //$NON-NLS-1$
-
-	static {
-		// Initialize the default preference values.
-		IPreferenceStore store = XMILibraryPlugin.getDefault()
-				.getPreferenceStore();
-		String defaultLibraryPath = System.getProperty("user.home") //$NON-NLS-1$
-				// FIXME! Avoid using hard coded constant
-				+ FileUtil.FILE_SEP + "EPF"
-				+ FileUtil.FILE_SEP + "Method Libraries"; //$NON-NLS-1$
-		store.setDefault(DEFAULT_LIBRARY_PATH, defaultLibraryPath);
-	}
-
-	/**
-	 * Gets the default library path preference.
-	 */
-	public static String getDefaultLibraryPath() {
-		return XMILibraryPlugin.getDefault().getPreferenceStore().getString(
-				DEFAULT_LIBRARY_PATH);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.msproject/.classpath b/plugins/org.eclipse.epf.msproject/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/plugins/org.eclipse.epf.msproject/.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/plugins/org.eclipse.epf.msproject/.cvsignore b/plugins/org.eclipse.epf.msproject/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.msproject/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.msproject/.project b/plugins/org.eclipse.epf.msproject/.project
deleted file mode 100755
index ac9f795..0000000
--- a/plugins/org.eclipse.epf.msproject/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.msproject</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.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.epf.msproject/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.msproject/META-INF/MANIFEST.MF
deleted file mode 100755
index 884b30e..0000000
--- a/plugins/org.eclipse.epf.msproject/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.msproject; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.epf.msproject,
- org.eclipse.epf.msproject.impl,
- org.eclipse.epf.msproject.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- com.ibm.icu
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.epf.msproject/build.properties b/plugins/org.eclipse.epf.msproject/build.properties
deleted file mode 100755
index 8494eff..0000000
--- a/plugins/org.eclipse.epf.msproject/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               model/,\
-               plugin.properties,\
-               plugin.xml
-
diff --git a/plugins/org.eclipse.epf.msproject/model/MS_Project_2003.genmodel b/plugins/org.eclipse.epf.msproject/model/MS_Project_2003.genmodel
deleted file mode 100755
index 6946f2c..0000000
--- a/plugins/org.eclipse.epf.msproject/model/MS_Project_2003.genmodel
+++ /dev/null
@@ -1,598 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.epf.msproject/src"
-    modelPluginID="org.eclipse.epf.msproject" modelName="MS_Project_2003" importerID="org.eclipse.xsd.ecore.importer">
-  <foreignModel>file:/C:/Eclipse311/MS_Project_2003.xsd</foreignModel>
-  <genPackages prefix="Msproject" basePackage="org.eclipse.epf" resource="XML" disposableProviderFactory="true"
-      loadInitialization="true" ecorePackage="msproject.ecore#/">
-    <genDataTypes ecoreDataType="msproject.ecore#//AccrueAt"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//ActiveDirectoryGUIDType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//AliasType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//AuthorType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//BaselineForEarnedValueType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//BookingTypeType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//BookingTypeType1"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//CalculationTypeType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//CategoryType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//CodeType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//CompanyType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//ConstraintTypeType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//ContactType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//CostRateTableType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//CurrencySymbolPositionType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//CurrencySymbolType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//DayTypeType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//DefaultFixedCostAccrualType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//DefaultTaskEVMethodType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//DefaultTaskTypeType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//DurationFormatType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//DurationFormatType1"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//DurationFormatType2"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//DurationFormatType3"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//DurationFormatType4"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//DurationFormatType5"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//EarnedValueMethodType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//EarnedValueMethodType1"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//EmailAddressType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//ExternalTaskProjectType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//FixedCostAccrualType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//FYStartDateType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//GroupType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//HyperlinkAddressType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//HyperlinkAddressType1"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//HyperlinkAddressType2"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//HyperlinkSubAddressType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//HyperlinkSubAddressType1"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//HyperlinkSubAddressType2"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//HyperlinkType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//HyperlinkType1"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//HyperlinkType2"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//InitialsType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//LagFormatType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//LevelingDelayFormatType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//LevelingDelayFormatType1"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//ManagerType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//MaterialLabelType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//NameType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//NameType1"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//NameType2"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//NameType3"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//NewTaskStartDateType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//NTAccountType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//OutlineNumberType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//OvertimeRateFormatType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//OvertimeRateFormatType1"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//PhoneticAliasType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//PhoneticsType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//PrefixType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//RateTableType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//RollupTypeType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//StandardRateFormatType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//StandardRateFormatType1"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//SubjectType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//SubprojectNameType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//TitleType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//TypeType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//TypeType1"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//TypeType2"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//TypeType3"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//TypeType4"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//TypeType5"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//UIDType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//UnitType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//ValuelistSortOrderType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//WeekStartDayType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//WorkContourType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//WorkFormatType"/>
-    <genDataTypes ecoreDataType="msproject.ecore#//WorkGroupType"/>
-    <genClasses ecoreClass="msproject.ecore#//Assignment">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/uID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/taskUID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/resourceUID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/percentWorkComplete"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/actualCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/actualFinish"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/actualOvertimeCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/actualOvertimeWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/actualStart"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/actualWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/aCWP"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/confirmed"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/cost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/costRateTable"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/costVariance"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/cV"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/delay"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/finish"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/finishVariance"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/hyperlink"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/hyperlinkAddress"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/hyperlinkSubAddress"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/workVariance"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/hasFixedRateUnits"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/fixedMaterial"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/levelingDelay"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/levelingDelayFormat"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/linkedFields"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/milestone"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/notes"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/overallocated"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/overtimeCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/overtimeWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/regularWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/remainingCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/remainingOvertimeCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/remainingOvertimeWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/remainingWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/responsePending"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/start"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/stop"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/resume"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/startVariance"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/units"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/updateNeeded"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/vAC"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/work"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/workContour"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/bCWS"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/bCWP"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/bookingType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/actualWorkProtected"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/actualOvertimeWorkProtected"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Assignment/creationDate"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Assignment/extendedAttribute"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Assignment/baseline"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Assignment/timephasedData"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Assignments">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Assignments/assignment"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//AvailabilityPeriod">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//AvailabilityPeriod/availableFrom"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//AvailabilityPeriod/availableTo"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//AvailabilityPeriod/availableUnits"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//AvailabilityPeriods">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//AvailabilityPeriods/availabilityPeriod"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Baseline">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Baseline/timephasedData"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline/number"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline/interim"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline/start"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline/finish"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline/duration"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline/durationFormat"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline/estimatedDuration"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline/work"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline/cost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline/bCWS"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline/bCWP"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Baseline2">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline2/number"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline2/work"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline2/cost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline2/bCWS"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline2/bCWP"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Baseline3">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Baseline3/timephasedData"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline3/number"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline3/start"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline3/finish"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline3/work"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline3/cost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline3/bCWS"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Baseline3/bCWP"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Calendar">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Calendar/uID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Calendar/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Calendar/isBaseCalendar"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Calendar/baseCalendarUID"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Calendar/weekDays"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Calendars">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Calendars/calendar"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//DocumentRoot">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute msproject.ecore#//DocumentRoot/mixed"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference msproject.ecore#//DocumentRoot/xMLNSPrefixMap"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference msproject.ecore#//DocumentRoot/xSISchemaLocation"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference msproject.ecore#//DocumentRoot/project"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//ExtendedAttribute">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute/fieldID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute/fieldName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute/alias"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute/phoneticAlias"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute/rollupType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute/calculationType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute/formula"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute/restrictValues"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute/valuelistSortOrder"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute/appendNewValues"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute/default"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//ExtendedAttribute/valueList"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//ExtendedAttribute2">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute2/uID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute2/fieldID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute2/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute2/valueID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute2/durationFormat"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//ExtendedAttribute3">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute3/uID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute3/fieldID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute3/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute3/valueID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute3/durationFormat"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//ExtendedAttribute4">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute4/uID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute4/fieldID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute4/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute4/valueID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//ExtendedAttribute4/durationFormat"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//ExtendedAttributes">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//ExtendedAttributes/extendedAttribute"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Mask">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Mask/level"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Mask/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Mask/length"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Mask/separator"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Masks">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Masks/mask"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//OutlineCode">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode/fieldID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode/fieldName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode/alias"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode/phoneticAlias"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//OutlineCode/values"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode/enterprise"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode/enterpriseOutlineCodeAlias"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode/resourceSubstitutionEnabled"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode/leafOnly"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode/allLevelsRequired"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode/onlyTableValuesAllowed"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//OutlineCode/masks"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//OutlineCode2">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode2/uID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode2/fieldID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode2/valueID"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//OutlineCode3">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode3/uID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode3/fieldID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//OutlineCode3/valueID"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//OutlineCodes">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//OutlineCodes/outlineCode"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//PredecessorLink">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//PredecessorLink/predecessorUID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//PredecessorLink/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//PredecessorLink/crossProject"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//PredecessorLink/crossProjectName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//PredecessorLink/linkLag"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//PredecessorLink/lagFormat"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Project">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/uID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/title"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/subject"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/category"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/company"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/manager"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/author"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/creationDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/revision"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/lastSaved"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/scheduleFromStart"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/startDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/finishDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/fYStartDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/criticalSlackLimit"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/currencyDigits"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/currencySymbol"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/currencySymbolPosition"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/calendarUID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/defaultStartTime"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/defaultFinishTime"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/minutesPerDay"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/minutesPerWeek"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/daysPerMonth"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/defaultTaskType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/defaultFixedCostAccrual"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/defaultStandardRate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/defaultOvertimeRate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/durationFormat"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/workFormat"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/editableActualCosts"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/honorConstraints"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/earnedValueMethod"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/insertedProjectsLikeSummary"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/multipleCriticalPaths"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/newTasksEffortDriven"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/newTasksEstimated"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/splitsInProgressTasks"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/spreadActualCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/spreadPercentComplete"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/taskUpdatesResource"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/fiscalYearStart"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/weekStartDay"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/moveCompletedEndsBack"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/moveRemainingStartsBack"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/moveRemainingStartsForward"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/moveCompletedEndsForward"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/baselineForEarnedValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/autoAddNewResourcesAndTasks"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/statusDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/currentDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/microsoftProjectServerURL"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/autolink"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/newTaskStartDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/defaultTaskEVMethod"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/projectExternallyEdited"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/extendedCreationDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/actualsInSync"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/removeFileProperties"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Project/adminProject"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Project/outlineCodes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Project/wBSMasks"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Project/extendedAttributes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Project/calendars"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Project/tasks"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Project/resources"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Project/assignments"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Rate">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Rate/ratesFrom"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Rate/ratesTo"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Rate/rateTable"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Rate/standardRate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Rate/standardRateFormat"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Rate/overtimeRate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Rate/overtimeRateFormat"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Rate/costPerUse"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Rates">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Rates/rate"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Resource">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/uID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/iD"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/isNull"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/initials"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/phonetics"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/nTAccount"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/materialLabel"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/code"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/group"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/workGroup"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/emailAddress"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/hyperlink"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/hyperlinkAddress"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/hyperlinkSubAddress"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/maxUnits"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/peakUnits"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/overAllocated"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/availableFrom"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/availableTo"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/start"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/finish"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/canLevel"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/accrueAt"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/work"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/regularWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/overtimeWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/actualWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/remainingWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/actualOvertimeWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/remainingOvertimeWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/percentWorkComplete"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/standardRate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/standardRateFormat"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/cost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/overtimeRate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/overtimeRateFormat"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/overtimeCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/costPerUse"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/actualCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/actualOvertimeCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/remainingCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/remainingOvertimeCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/workVariance"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/costVariance"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/sV"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/cV"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/aCWP"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/calendarUID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/notes"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/bCWS"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/bCWP"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/isGeneric"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/isInactive"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/isEnterprise"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/bookingType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/actualWorkProtected"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/actualOvertimeWorkProtected"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/activeDirectoryGUID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Resource/creationDate"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Resource/extendedAttribute"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Resource/baseline"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Resource/outlineCode"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Resource/availabilityPeriods"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Resource/rates"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Resource/timephasedData"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Resources">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Resources/resource"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Task">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/uID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/iD"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/isNull"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/createDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/contact"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/wBS"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/wBSLevel"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/outlineNumber"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/outlineLevel"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/priority"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/start"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/finish"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/duration"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/durationFormat"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/work"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/stop"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/resume"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/resumeValid"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/effortDriven"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/recurring"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/overAllocated"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/estimated"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/milestone"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/summary"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/critical"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/isSubproject"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/isSubprojectReadOnly"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/subprojectName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/externalTask"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/externalTaskProject"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/earlyStart"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/earlyFinish"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/lateStart"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/lateFinish"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/startVariance"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/finishVariance"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/workVariance"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/freeSlack"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/totalSlack"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/fixedCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/fixedCostAccrual"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/percentComplete"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/percentWorkComplete"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/cost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/overtimeCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/overtimeWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/actualStart"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/actualFinish"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/actualDuration"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/actualCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/actualOvertimeCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/actualWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/actualOvertimeWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/regularWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/remainingDuration"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/remainingCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/remainingWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/remainingOvertimeCost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/remainingOvertimeWork"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/aCWP"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/cV"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/constraintType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/calendarUID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/constraintDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/deadline"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/levelAssignments"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/levelingCanSplit"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/levelingDelay"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/levelingDelayFormat"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/preLeveledStart"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/preLeveledFinish"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/hyperlink"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/hyperlinkAddress"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/hyperlinkSubAddress"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/ignoreResourceCalendar"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/notes"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/hideBar"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/rollup"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/bCWS"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/bCWP"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/physicalPercentComplete"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/earnedValueMethod"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Task/predecessorLink"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/actualWorkProtected"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Task/actualOvertimeWorkProtected"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Task/extendedAttribute"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Task/baseline"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Task/outlineCode"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Task/timephasedData"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Tasks">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//Tasks/task"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//TimePeriod">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//TimePeriod/fromDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//TimePeriod/toDate"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//TimephasedDataType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//TimephasedDataType/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//TimephasedDataType/uID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//TimephasedDataType/start"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//TimephasedDataType/finish"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//TimephasedDataType/unit"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//TimephasedDataType/value"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Value">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Value/valueID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Value/parentValueID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Value/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Value/description"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Value2">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Value2/iD"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Value2/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//Value2/description"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//ValueList">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//ValueList/value"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//Values">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute msproject.ecore#//Values/group"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference msproject.ecore#//Values/value"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//WBSMask">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//WBSMask/level"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//WBSMask/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//WBSMask/length"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//WBSMask/separator"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//WBSMasks">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//WBSMasks/verifyUniqueCodes"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//WBSMasks/generateCodes"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//WBSMasks/prefix"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//WBSMasks/wBSMask"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//WeekDay">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//WeekDay/dayType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//WeekDay/dayWorking"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//WeekDay/timePeriod"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//WeekDay/workingTimes"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//WeekDays">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//WeekDays/weekDay"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//WorkingTime">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//WorkingTime/fromTime"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute msproject.ecore#//WorkingTime/toTime"/>
-    </genClasses>
-    <genClasses ecoreClass="msproject.ecore#//WorkingTimes">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference msproject.ecore#//WorkingTimes/workingTime"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.epf.msproject/model/msproject.ecore b/plugins/org.eclipse.epf.msproject/model/msproject.ecore
deleted file mode 100755
index c1ebd22..0000000
--- a/plugins/org.eclipse.epf.msproject/model/msproject.ecore
+++ /dev/null
@@ -1,5511 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="msproject"
-    nsURI="http://epf.eclipse.org/msproject" nsPrefix="msproject">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="The full project schema definition from the project level down, &#xD;&#xA;&#x9;&#x9;starting with data type definitions."/>
-  </eAnnotations>
-  <eAnnotations>
-    <details key="appinfo" value="The Microsoft Project Data Interchange Schema for Microsoft Project 10.&#xD;&#xA;&#x9;&#x9;"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EDataType" name="AccrueAt" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="AccrueAt_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ActiveDirectoryGUIDType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ActiveDirectoryGUID_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="16"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="AliasType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Alias_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="50"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Assignment">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Assignment_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="taskUID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the task.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TaskUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceUID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the resource.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ResourceUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentWorkComplete" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of work completed on the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PercentWorkComplete"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual cost incurred on the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualFinish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual finish date of the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualFinish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual overtime cost incurred on the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual amount of overtime work incurred on the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualStart" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual start date of the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualStart"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual amount of work incurred on the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="aCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual cost of work performed on the assignment to-date.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ACWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="confirmed" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the Resource has accepted all of his or her assignments.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Confirmed"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The projected or scheduled cost of the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Cost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="costRateTable" unique="false"
-        eType="#//CostRateTableType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The cost rate table used for the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CostRateTable"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="costVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The difference between the cost and baseline cost for a resource.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CostVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cV" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Earned value cost variance.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CV"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="delay" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount that the assignment is delayed.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Delay"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled finish date of the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Finish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finishVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The variance of the assignment finish date from the baseline finish date.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FinishVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlink" unique="false"
-        eType="#//HyperlinkType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The title of the hyperlink associated with the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Hyperlink"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlinkAddress" unique="false"
-        eType="#//HyperlinkAddressType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The hyperlink associated with the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HyperlinkAddress"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlinkSubAddress" unique="false"
-        eType="#//HyperlinkSubAddressType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The document bookmark of the hyperlink associated with the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HyperlinkSubAddress"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The variance of assignment work from the baseline work as minutes x 1000.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hasFixedRateUnits" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the Units are Fixed Rate.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HasFixedRateUnits"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fixedMaterial" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the consumption of the assigned material resource occurs in a single, fixed amount.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FixedMaterial"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelingDelay" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The delay caused by leveling.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LevelingDelay"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelingDelayFormat" unique="false"
-        eType="#//LevelingDelayFormatType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the duration of the delay.  &#xD;&#xA;                            Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 20=e%, 21=null, &#xD;&#xA;                            35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 43=mo?, 44=emo?, 51=%?, 52=e%? and 53=null.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LevelingDelayFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="linkedFields" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the Project is linked to another OLE object.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LinkedFields"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="milestone" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the assignment is a milestone.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Milestone"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="notes" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Text notes associated with the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Notes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overallocated" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the assignment is overallocated.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Overallocated"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The sum of the actual and remaining overtime cost of the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled overtime work scheduled for the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="regularWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of non-overtime work scheduled for the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RegularWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining projected cost of completing the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingOvertimeCost"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining projected overtime cost of completing the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingOvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingOvertimeWork"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining overtime work scheduled to complete the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingOvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining work scheduled to complete the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="responsePending" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="True if a response has not been received for a TeamAssign message. &#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ResponsePending"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled start date of the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Start"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stop" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the assignment was stopped.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Stop"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resume" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the assignment resumed.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Resume"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="startVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The variance of the assignment start date from the baseline start date.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StartVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="units" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The number of units for the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Units"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="updateNeeded" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="True if the resource assigned to a task needs to be updated as to the status of the task.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UpdateNeeded"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="vAC" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The difference between basline cost and total cost.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="VAC"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="work" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of scheduled work for the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Work"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workContour" unique="false"
-        eType="#//WorkContourType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The work contour of the assignment. &#xD;&#xA;                            Values are: 0=Flat, 1=Back Loaded, 2=Front Loaded, 3=Double Peak, 4=Early Peak, 5=Late Peak, &#xD;&#xA;                            6=Bell, 7=Turtle, 8=Contoured&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkContour"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWS" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work on the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWS"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work performed on the assignment to-date.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bookingType" unique="false"
-        eType="#//BookingTypeType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the booking type of the assignment. 1=Commited, 2=Proposed&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BookingType"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualWorkProtected" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the duration through which actual work is protected.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualWorkProtected"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeWorkProtected"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the duration through which actual overtime work is protected.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeWorkProtected"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the assignment was created."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CreationDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedAttribute" upperBound="-1"
-        eType="#//ExtendedAttribute4" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of an extended attribute.  Two pieces of data are necessary - &#xD;&#xA;                            a pointer back to the extended attribute table which is specified either by the unique ID or the &#xD;&#xA;                            Field ID, and the value which is specified either with the value, or a pointer back to the value list.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExtendedAttribute"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="baseline" upperBound="-1"
-        eType="#//Baseline3" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of baseline values associated with the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Baseline"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timephasedData" upperBound="-1"
-        eType="#//TimephasedDataType" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The time phased data associated with the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TimephasedData"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Assignments">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Assignments_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="assignment" upperBound="-1"
-        eType="#//Assignment" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="There must be at least one assignment in each Assignments collection.&#xD;&#xA;                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Assignment"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="AuthorType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Author_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AvailabilityPeriod">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="AvailabilityPeriod_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="availableFrom" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the resource becomes available for the specified period.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AvailableFrom"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="availableTo" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The last date that the resource is available for the specified period.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AvailableTo"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="availableUnits" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The percentage that the resource is available during the specified period.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AvailableUnits"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AvailabilityPeriods">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="AvailabilityPeriods_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="availabilityPeriod" upperBound="-1"
-        eType="#//AvailabilityPeriod" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The period the resource is available.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AvailabilityPeriod"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Baseline">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Baseline_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timephasedData" upperBound="-1"
-        eType="#//TimephasedDataType" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The time phased data block associated with the task baseline.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TimephasedData"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="number" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique number of the baseline data record.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Number"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="interim" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether this is an Interim Baseline.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Interim"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled start date of the task when the baseline was saved.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Start"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled finish date of the task when the baseline was saved.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Finish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="duration" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled duration of the task when the baseline was saved.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Duration"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="durationFormat" unique="false"
-        eType="#//DurationFormatType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the Duration of the Task baseline.  &#xD;&#xA;                                            Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 20=e%, &#xD;&#xA;                                            21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 43=mo?, 44=emo?, &#xD;&#xA;                                            51=%?, 52=e%? and 53=null.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DurationFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="estimatedDuration" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the baseline duration of the task was estimated.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EstimatedDuration"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="work" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled work of the task when the baseline was saved.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Work"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The projected cost of the task when the baseline was saved.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Cost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWS" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work scheduled for the task.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWS"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work performed on the task to-date.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Baseline2">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Baseline_._1_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="number" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique number of the baseline data record.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Number"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="work" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The work assigned the resource when the baseline is saved.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Work"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The projected cost for the resource when the baseline was saved.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Cost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWS" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budget cost of work scheduled for the resource.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWS"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of of the work performed by the resource for the project to-date.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Baseline3">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Baseline_._2_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timephasedData" upperBound="-1"
-        eType="#//TimephasedDataType" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The time phased data associated with the Baseline.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TimephasedData"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="number" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique number of the baseline data record.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Number"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled start date of the assignment when the baseline was saved.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Start"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled finish date of the assignment when the baseline was saved.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Finish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="work" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The total amount of work scheduled on the assignment when the baseline was saved.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Work"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The total projected cost of the assignment when the baseline was saved.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Cost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWS" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work on the assignment.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWS"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work performed on the assignment to-date.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="BaselineForEarnedValueType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="BaselineForEarnedValue_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4 5 6 7 8 9 10"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="BookingTypeType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="BookingType_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="BookingTypeType1" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="BookingType_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="CalculationTypeType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="CalculationType_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Calendar">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Calendar_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the calendar.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="#//NameType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of the calendar."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Name"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isBaseCalendar" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the calendar is a base calendar.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsBaseCalendar"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseCalendarUID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the base calendar &#xD;&#xA;                                on which this calendar depends. Only applicable if the calendar is &#xD;&#xA;                                not a base calendar."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BaseCalendarUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="weekDays" eType="#//WeekDays"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of Weekdays that defines this calendar.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WeekDays"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Calendars">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Calendars_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="calendar" lowerBound="1"
-        upperBound="-1" eType="#//Calendar" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Calendars are used to define standard working and &#xD;&#xA;                    non-working times. Projects must have one base calendar. Tasks and resources &#xD;&#xA;                    may have their own non-base calendars which are based on a base calendar.&#xD;&#xA;                    "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Calendar"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="CategoryType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Category_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="CodeType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Code_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="CompanyType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Company_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ConstraintTypeType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ConstraintType_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4 5 6 7"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ContactType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Contact_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="CostRateTableType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="CostRateTable_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="CurrencySymbolPositionType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="CurrencySymbolPosition_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="CurrencySymbolType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="CurrencySymbol_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="20"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DayTypeType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DayType_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4 5 6 7"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DefaultFixedCostAccrualType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DefaultFixedCostAccrual_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DefaultTaskEVMethodType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DefaultTaskEVMethod_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DefaultTaskTypeType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DefaultTaskType_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DocumentRoot">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value=""/>
-      <details key="kind" value="mixed"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mixed" unique="false" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="elementWildcard"/>
-        <details key="name" value=":mixed"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="xMLNSPrefixMap" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
-        transient="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="xmlns:prefix"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="xSISchemaLocation" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
-        transient="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="xsi:schemaLocation"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="project" upperBound="-2"
-        eType="#//Project" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The project is the top level element of the document.&#xD;&#xA;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Project"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DurationFormatType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DurationFormat_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DurationFormatType1" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DurationFormat_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DurationFormatType2" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DurationFormat_._2_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DurationFormatType3" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DurationFormat_._3_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DurationFormatType4" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DurationFormat_._4_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DurationFormatType5" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DurationFormat_._5_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="EarnedValueMethodType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="EarnedValueMethod_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="EarnedValueMethodType1" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="EarnedValueMethod_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="EmailAddressType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="EmailAddress_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtendedAttribute">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ExtendedAttribute_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This corresponds to the PID of the custom field.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldName" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of the custom field."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldName"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias" unique="false" eType="#//AliasType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The alias of the custom field"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Alias"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="phoneticAlias" unique="false"
-        eType="#//PhoneticAliasType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The phonetic pronunciation of the alias of the &#xD;&#xA;                                custom field"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PhoneticAlias"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rollupType" unique="false"
-        eType="#//RollupTypeType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="How rollups are calculated. Values are: 0=Maximum &#xD;&#xA;                                (OR for flag fields), 1=Minimum (AND for flag fields), 2=Count all, 3=Sum, &#xD;&#xA;                                4=Average, 5=Average First Sublevel, 6=Count First Sublevel, 7=Count &#xD;&#xA;                                Nonsummaries"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RollupType"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="calculationType" unique="false"
-        eType="#//CalculationTypeType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether rollups are calculated for task and group summary rows. &#xD;&#xA;                                Values are: 0=None, 1=Rollup, 2=Calculation"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CalculationType"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="formula" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The formula that Microsoft Project uses to populate the &#xD;&#xA;                                custom task field."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Formula"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="restrictValues" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If RestrictValues=True then only values in the list are &#xD;&#xA;                                allowed in the file"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RestrictValues"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valuelistSortOrder" unique="false"
-        eType="#//ValuelistSortOrderType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="How value lists are sorted. Values are: &#xD;&#xA;                                0=Descending, 1=Ascending"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValuelistSortOrder"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="appendNewValues" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If AppendNewValues=True then any new values added in a project &#xD;&#xA;                                are automatically appended to the list."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AppendNewValues"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="default" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This points to the default value in the list. &#xD;&#xA;                                Not present if no default is set."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Default"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="valueList" eType="#//ValueList"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="When values of extended attributes are specified as &#xD;&#xA;                                properties of elements in the schema, they may either be specified by values &#xD;&#xA;                                or by references to the values contained in this list.  Applications may &#xD;&#xA;                                assume ordering of the list by ordering specified here."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValueList"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtendedAttribute2">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ExtendedAttribute_._1_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the value in the extended attribute collection.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The PID of the custom field.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual value of the extended attribute.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The ID of the value in the extended attribut lookup table.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValueID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="durationFormat" unique="false"
-        eType="#//DurationFormatType2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the bulk duration.  &#xD;&#xA;                                            Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, &#xD;&#xA;                                            19=%, 20=e%, 21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, &#xD;&#xA;                                            42=ew?, 43=mo?, 44=emo?, 51=%?, 52=e%? and 53=null.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DurationFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtendedAttribute3">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ExtendedAttribute_._2_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the value in the extended attribute collection.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The PID of the custom field.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual value of the extended attribute.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The ID of the value in the extended attribut lookup table.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValueID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="durationFormat" unique="false"
-        eType="#//DurationFormatType3">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the bulk duration.  &#xD;&#xA;                                            Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, &#xD;&#xA;                                            20=e%, 21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, &#xD;&#xA;                                            43=mo?, 44=emo?, 51=%?, 52=e%? and 53=null.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DurationFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtendedAttribute4">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ExtendedAttribute_._3_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the value in the extended attribute collection.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The field ID in the localised language.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual value of the extended attribute.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The ID of the value in the extended attribut lookup table.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValueID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="durationFormat" unique="false"
-        eType="#//DurationFormatType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the bulk duration.  &#xD;&#xA;                                        Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 20=e%, &#xD;&#xA;                                        21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 43=mo?, 44=emo?, &#xD;&#xA;                                        51=%?, 52=e%? and 53=null.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DurationFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtendedAttributes">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ExtendedAttributes_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedAttribute" upperBound="-1"
-        eType="#//ExtendedAttribute" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Each of the individual entries in the extended attributes definition &#xD;&#xA;                    collection.  There are no limits to the number of children that may appear, but project &#xD;&#xA;                    will only understand Flag1-Flag10, etc.  This must appear once in each ExtendedAttributes &#xD;&#xA;                    collection."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExtendedAttribute"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ExternalTaskProjectType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ExternalTaskProject_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="FixedCostAccrualType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="FixedCostAccrual_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="enumeration" value="1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="FYStartDateType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="FYStartDate_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3 4 5 6 7 8 9 10 11 12"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="GroupType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Group_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkAddressType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="HyperlinkAddress_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkAddressType1" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="HyperlinkAddress_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkAddressType2" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="HyperlinkAddress_._2_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkSubAddressType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="HyperlinkSubAddress_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkSubAddressType1" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="HyperlinkSubAddress_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkSubAddressType2" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="HyperlinkSubAddress_._2_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Hyperlink_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkType1" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Hyperlink_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkType2" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Hyperlink_._2_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="InitialsType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Initials_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="LagFormatType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="LagFormat_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="LevelingDelayFormatType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="LevelingDelayFormat_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="LevelingDelayFormatType1" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="LevelingDelayFormat_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ManagerType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Manager_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Mask">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Mask_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="level" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The level of the mask."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Level"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" eType="#//TypeType5">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The type of mask. Values are: 0=Numbers, 1=Upper Case Letters, 2=Lower Case Letters, 3=Characters"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Type"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="length" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The maximum length in characters of the outline code values.  If length is any, the value is zero."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Length"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="separator" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The separator value of the code values."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Separator"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Masks">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Masks_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mask" upperBound="-1" eType="#//Mask"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The four elements of the mask constitute the format in which the outline code must appear."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Mask"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="MaterialLabelType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="MaterialLabel_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="NameType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Name_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="NameType1" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Name_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="NameType2" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Name_._2_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="NameType3" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Name_._3_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="255"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="NewTaskStartDateType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="NewTaskStartDate_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="NTAccountType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="NTAccount_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OutlineCode">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="OutlineCode_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Coresponds to the field number of outline code."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldName" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of the custom outline code."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldName"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The alias of the custom outline code."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Alias"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="phoneticAlias" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The phonetic pronunciation of the alias of the custom outline code."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PhoneticAlias"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="values" eType="#//Values"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The values of the table associated with this outline code."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Values"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enterprise" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Indicates whether the custom outline code is an enterprise custom outline code."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Enterprise"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enterpriseOutlineCodeAlias"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A reference to another custom field for which this is an alias."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EnterpriseOutlineCodeAlias"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceSubstitutionEnabled"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the custom outline code can be used by the Resource Substitution Wizard in Microsoft Project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ResourceSubstitutionEnabled"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="leafOnly" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether or not values specified in this outline code field must be leaf values."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LeafOnly"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="allLevelsRequired" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="New codes must have all levels present.  Not available for Enterprise Codes."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AllLevelsRequired"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="onlyTableValuesAllowed"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether values specified must come from values table."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OnlyTableValuesAllowed"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="masks" eType="#//Masks"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The table of entries that define the outline code mask."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Masks"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OutlineCode2">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="OutlineCode_._1_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the value in the outline code collection.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The field ID in the localised language.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID in the value list associated with the definition in the &#xD;&#xA;                                            outline code collection.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValueID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OutlineCode3">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="OutlineCode_._2_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the value in the outline code collection.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The field ID in the localised language.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID in the value list associated with the definition &#xD;&#xA;                                            in the outline code collection."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValueID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OutlineCodes">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="OutlineCodes_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outlineCode" upperBound="-1"
-        eType="#//OutlineCode" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The individual outline codes."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OutlineCode"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="OutlineNumberType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="OutlineNumber_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="OvertimeRateFormatType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="OvertimeRateFormat_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3 4 5 7"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="OvertimeRateFormatType1" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="OvertimeRateFormat_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3 4 5 7"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="PhoneticAliasType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="PhoneticAlias_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="50"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="PhoneticsType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Phonetics_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PredecessorLink">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="PredecessorLink_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="predecessorUID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the predecessor task.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PredecessorUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" eType="#//TypeType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The link type.  Values are 0=FF, 1=FS, 2=SF and 3=SS&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Type"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="crossProject" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the predecessor is part of another project.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CrossProject"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="crossProjectName" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The external predecessor project.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CrossProjectName"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="linkLag" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of lag in tenths of a minute.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LinkLag"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lagFormat" unique="false"
-        eType="#//LagFormatType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the lag format.  &#xD;&#xA;                                            Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, &#xD;&#xA;                                            20=e%, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 43=mo?, &#xD;&#xA;                                            44=emo?, 51=%?, 52=e%? and 53=null.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LagFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="PrefixType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Prefix_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="50"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Project">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Project_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" eType="#//UIDType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="#//NameType3">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Name"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" unique="false" eType="#//TitleType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The title of the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Title"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="subject" unique="false"
-        eType="#//SubjectType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The subject of the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Subject"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" unique="false"
-        eType="#//CategoryType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The category of the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Category"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="company" unique="false"
-        eType="#//CompanyType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The company that owns the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Company"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="manager" unique="false"
-        eType="#//ManagerType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The manager of the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Manager"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="author" unique="false"
-        eType="#//AuthorType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The author of the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Author"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the project was created."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CreationDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The number of times a project has been saved."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Revision"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastSaved" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the project was last saved."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LastSaved"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scheduleFromStart" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the project is schduled from the start date or finish date.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ScheduleFromStart"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="startDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The start date of the project. Required if ScheduleFromStart is true.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StartDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finishDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The finish date of the project. Required if ScheduleFromStart is false.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FinishDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fYStartDate" unique="false"
-        eType="#//FYStartDateType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Fiscal Year starting month. Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;1=January, 2=February, 3=March, 4=April, 5=May, 6=June, 7=July, &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;8=August, 9=September, 10=October, 11=November, 12=December "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FYStartDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="criticalSlackLimit" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The number of days past its end date that a task can go &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;before Microsoft Project marks that task as a critical task."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CriticalSlackLimit"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="currencyDigits" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The number of digits after the decimal symbol."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CurrencyDigits"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="currencySymbol" unique="false"
-        eType="#//CurrencySymbolType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The currency symbol used in the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CurrencySymbol"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="currencySymbolPosition"
-        unique="false" eType="#//CurrencySymbolPositionType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The position of the currency symbol.  Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;0=Before, 1=After, 2=Before With Space, 3=After with space."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CurrencySymbolPosition"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="calendarUID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The project calendar.  Refers to a valid UID in the &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;Calendars element of the Microsoft Project XML Schema."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CalendarUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultStartTime" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Time">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default start time of new tasks."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultStartTime"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultFinishTime" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Time">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default finish time of new tasks."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultFinishTime"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minutesPerDay" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The number of minutes per day."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MinutesPerDay"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minutesPerWeek" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The number of minutes per week."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MinutesPerWeek"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="daysPerMonth" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The number of days per month."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DaysPerMonth"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultTaskType" unique="false"
-        eType="#//DefaultTaskTypeType" defaultValueLiteral="1" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default type of new tasks. Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;0=Fixed Units, 1=Fixed Duration, 2=Fixed Work."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultTaskType"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultFixedCostAccrual"
-        unique="false" eType="#//DefaultFixedCostAccrualType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default from where fixed costs are accrued.  Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;1=Start, 2=Prorated, 3=End"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultFixedCostAccrual"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultStandardRate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default standard rate for new resources."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultStandardRate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultOvertimeRate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default overtime rate for new resources."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultOvertimeRate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="durationFormat" unique="false"
-        eType="#//DurationFormatType5">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the bulk duration.  Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 20=e%, 21=null, &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 43=mo?, 44=emo?, 51=%?, 52=e%? and &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;53=null."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DurationFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workFormat" unique="false"
-        eType="#//WorkFormatType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default work unit format. Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;1=m, 2=h, 3=d, 4=w, 5=mo"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editableActualCosts" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether or not actual costs are editable."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EditableActualCosts"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="honorConstraints" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether tasks honour their constraint dates."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HonorConstraints"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="earnedValueMethod" unique="false"
-        eType="#//EarnedValueMethodType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default method for calculating earned value. Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;0=Percent Complete, 1=Physical Percent Complete"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EarnedValueMethod"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="insertedProjectsLikeSummary"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether to calculate subtasks as summary tasks."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="InsertedProjectsLikeSummary"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multipleCriticalPaths"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether multiple critical paths are calculated."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MultipleCriticalPaths"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="newTasksEffortDriven" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether new tasks are effort driven."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="NewTasksEffortDriven"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="newTasksEstimated" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether to show the estimated duration by default."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="NewTasksEstimated"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="splitsInProgressTasks"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether in-progress tasks can be split."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SplitsInProgressTasks"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="spreadActualCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether actual costs are spread to the status date."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SpreadActualCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="spreadPercentComplete"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether percent complete is spread to the status date."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SpreadPercentComplete"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="taskUpdatesResource" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether updates to tasks update resources."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TaskUpdatesResource"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fiscalYearStart" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies whether to use fiscal year numbering"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FiscalYearStart"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="weekStartDay" unique="false"
-        eType="#//WeekStartDayType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Start day of the week. Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;0=Sunday, 1=Monday, 2=Tuesday, 3=Wednesday, 4=Thursday, 5=Friday, 6=Saturday"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WeekStartDay"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="moveCompletedEndsBack"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;Specifies whether the end of completed portions of tasks scheduled to begin after the &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;status date but begun early should be moved back to the status date.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MoveCompletedEndsBack"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="moveRemainingStartsBack"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;Specifies whether the beginning of remaining portions of tasks scheduled to begin after the &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;status date but begun early should be moved back to the status date.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MoveRemainingStartsBack"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="moveRemainingStartsForward"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;Specifies whether the beginning of remaining portions of tasks scheduled to have begun late &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;should be moved up to the status date.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MoveRemainingStartsForward"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="moveCompletedEndsForward"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;Specifies whether the end of completed portions of tasks scheduled to have been completed &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;before the status date but begun late should be moved up to the status date.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MoveCompletedEndsForward"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="baselineForEarnedValue"
-        unique="false" eType="#//BaselineForEarnedValueType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The specific baseline used to calculate Variance values.  Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;0=Baseline, 1=Baseline 1, 2=Baseline 2, 3=Baseline 3, 4=Baseline 4, 5=Baseline 5, 6=Baseline 6, &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;7=Baseline 7, 8=Baseline 8, 9=Baseline 9, 10=Baseline 10"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BaselineForEarnedValue"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="autoAddNewResourcesAndTasks"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether to automatically add new resources to the resource pool."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AutoAddNewResourcesAndTasks"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="statusDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Date used for calculation and reporting."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StatusDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="currentDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The system date that the XML was generated."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CurrentDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="microsoftProjectServerURL"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the project was created by a Project Server user as opposed to an NT user.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MicrosoftProjectServerURL"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="autolink" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether to autolink inserted or moved tasks."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Autolink"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="newTaskStartDate" unique="false"
-        eType="#//NewTaskStartDateType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default date for new tasks start.  Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;0=Project Start Date, 1=Current Date"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="NewTaskStartDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultTaskEVMethod" unique="false"
-        eType="#//DefaultTaskEVMethodType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default earned value method for tasks.  Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;0=Percent Complete, 1=Physical Percent Complete"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultTaskEVMethod"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectExternallyEdited"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the project XML was edited."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ProjectExternallyEdited"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extendedCreationDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Date used for calculation and reporting."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExtendedCreationDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualsInSync" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether all actual work has been synchronized with the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualsInSync"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="removeFileProperties" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether to remove all file properties on save."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemoveFileProperties"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="adminProject" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the project is an administrative project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AdminProject"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outlineCodes" eType="#//OutlineCodes"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of outline code definitions associated with the project.  These codes may be associated only with this project, or may be common among several projects (enterprise codes)."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OutlineCodes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="wBSMasks" eType="#//WBSMasks"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The table of entries that define the outline code mask."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WBSMasks"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedAttributes" eType="#//ExtendedAttributes"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of extended attribute (custom field) definitions &#xD;&#xA;        associated with the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExtendedAttributes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="calendars" eType="#//Calendars"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of calendars that is associated with the &#xD;&#xA;        project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Calendars"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tasks" eType="#//Tasks"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of tasks that make up the project.&#xD;&#xA;        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Tasks"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="resources" eType="#//Resources"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of resources that make up the project.&#xD;&#xA;        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Resources"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="assignments" eType="#//Assignments"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of assignments that make up the project.&#xD;&#xA;    "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Assignments"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Rate">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Rate_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ratesFrom" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the rate becomes effective.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RatesFrom"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ratesTo" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The last date that the rate is effective.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RatesTo"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rateTable" unique="false"
-        eType="#//RateTableType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the rate table for the resource. &#xD;&#xA;                                                        Values are: 0=A, 1=B, 2=C, 3=D, 4=E"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RateTable"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="standardRate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The standard rate for the resource for the period specified.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StandardRate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="standardRateFormat" unique="false"
-        eType="#//StandardRateFormatType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The units used by Microsoft Project to display the standard rate.  &#xD;&#xA;                                                        1=m, 2=h, 3=d, 4=w, 5=mo, 7=y&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StandardRateFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeRate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The overtime rate for the resource for the period specified.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeRate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeRateFormat" unique="false"
-        eType="#//OvertimeRateFormatType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The units used by Microsoft Project to display the overtime rate.  &#xD;&#xA;                                                        1=m, 2=h, 3=d, 4=w, 5=mo, 7=y"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeRateFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="costPerUse" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The cost per use of the resource. &#xD;&#xA;                                                        This value is as of the current date if a rate table exists for the resource.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CostPerUse"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Rates">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Rates_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rate" upperBound="25" eType="#//Rate"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The definition of a time period, and the rates applicable for &#xD;&#xA;                                            the resource during that period."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Rate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="RateTableType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="RateTable_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Resource">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Resource_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The position identifier of the resource within the list of resources.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="#//NameType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Name"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" eType="#//TypeType4">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The type of resource. Values are: 0=Material, 1=Work&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Type"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isNull" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies whether the resource is null.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsNull"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="initials" unique="false"
-        eType="#//InitialsType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The initials of the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Initials"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="phonetics" unique="false"
-        eType="#//PhoneticsType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The phonetic spelling of the resource name.  &#xD;&#xA;                                For use with Japanese only.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Phonetics"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nTAccount" unique="false"
-        eType="#//NTAccountType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The NT account associated with the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="NTAccount"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="materialLabel" unique="false"
-        eType="#//MaterialLabelType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unit of measure for the material resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MaterialLabel"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="code" unique="false" eType="#//CodeType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The code or other information about the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Code"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group" unique="false" eType="#//GroupType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The group to which the resource belongs.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Group"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workGroup" unique="false"
-        eType="#//WorkGroupType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The type of workgroup to which the resource belongs. &#xD;&#xA;                                Values are: 0=Default, 1=None, 2=Email, 3=Web&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkGroup"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emailAddress" unique="false"
-        eType="#//EmailAddressType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The email address of the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EmailAddress"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlink" unique="false"
-        eType="#//HyperlinkType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The title of the hyperlink associated with the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Hyperlink"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlinkAddress" unique="false"
-        eType="#//HyperlinkAddressType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The hyperlink associated with the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HyperlinkAddress"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlinkSubAddress" unique="false"
-        eType="#//HyperlinkSubAddressType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The document bookmark of the hyperlink associated with the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HyperlinkSubAddress"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxUnits" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" defaultValueLiteral="1.0"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The maximum number of units that the resource is available.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MaxUnits"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="peakUnits" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The largest number of units assigned to the resource at any time.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PeakUnits"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overAllocated" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the resource is overallocated.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OverAllocated"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="availableFrom" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The first date that the resource is available.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AvailableFrom"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="availableTo" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The last date the resource is available.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AvailableTo"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled start date of the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Start"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled finish date of the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Finish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="canLevel" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the resource can be leveled.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CanLevel"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="accrueAt" unique="false"
-        eType="#//AccrueAt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="How cost is accrued against the resource. &#xD;&#xA;                                Values are: 1=Start, 2=End, 3=Prorated&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AccrueAt"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="work" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The total work assigned to the resource across all assigned tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Work"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="regularWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of non-overtime work assigned to the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RegularWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of overtime work assigned to the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of actual work performed by the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of remaining work required to complete all assigned tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of actual overtime work performed by the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingOvertimeWork"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of remaining overtime work required to complete all tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingOvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentWorkComplete" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The percentage of work completed across all tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PercentWorkComplete"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="standardRate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The standard rate of the resource. &#xD;&#xA;                                This value is as of the current date if a rate table exists for the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StandardRate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="standardRateFormat" unique="false"
-        eType="#//StandardRateFormatType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The units used by Microsoft Project to display the standard rate.  &#xD;&#xA;                                1=m, 2=h, 3=d, 4=w, 5=mo, 7=y, 8=material resource rate (or blank symbol specified)&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StandardRateFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The total project cost for the resource across all assigned tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Cost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeRate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The overtime rate of the resource. &#xD;&#xA;                                This value is as of the current date if a rate table exists for the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeRate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeRateFormat" unique="false"
-        eType="#//OvertimeRateFormatType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The units used by Microsoft Project to display the overtime rate.  &#xD;&#xA;                                1=m, 2=h, 3=d, 4=w, 5=mo, 7=y&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeRateFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The total overtime cost for the resource including actual and remaining overtime costs.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="costPerUse" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The cost per use of the resource. This value is as of the current date if a rate table &#xD;&#xA;                                exists for the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CostPerUse"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual cost incurred by the resource across all assigned tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual overtime cost incurred by the resource across all assigned tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining projected cost of the resource to complete all assigned tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingOvertimeCost"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining projected overtime cost of the resource to complete all assigned tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingOvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The difference between the baseline work and the work as minutes x 1000.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="costVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The difference between the baseline cost and the cost.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CostVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sV" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Earned value schedule variance, through the project status date.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SV"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cV" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Earned value cost variance, through the project status date.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CV"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="aCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual cost of the work performed by the resource for the project to-date.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ACWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="calendarUID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The resource calendar.Refers to a valid UID in the Calendars element of &#xD;&#xA;                                the Microsoft Project XML Schema.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CalendarUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="notes" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Text notes associated with the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Notes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWS" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budget cost of work scheduled for the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWS"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of of the work performed by the resource for the project to-date.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isGeneric" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies whether the resource is generic.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsGeneric"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isInactive" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies whether the resource is set to inactive.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsInactive"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isEnterprise" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies whether the resource is an Enterprise resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsEnterprise"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bookingType" unique="false"
-        eType="#//BookingTypeType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the booking type of the resource. 1=Commited, 2=Proposed&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BookingType"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualWorkProtected" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the duration through which actual work is protected.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualWorkProtected"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeWorkProtected"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the duration through which actual overtime work is protected.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeWorkProtected"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activeDirectoryGUID" unique="false"
-        eType="#//ActiveDirectoryGUIDType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The Active Directory GUID for the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActiveDirectoryGUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the resource was created.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CreationDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedAttribute" upperBound="-1"
-        eType="#//ExtendedAttribute3" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of an extended attribute.  Two pieces of data are necessary - &#xD;&#xA;                                a pointer back to the extended attribute table which is specified either by the unique ID or the Field ID, &#xD;&#xA;                                and the value which is specified either with the value, or a pointer back to the value list.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExtendedAttribute"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="baseline" upperBound="-1"
-        eType="#//Baseline2" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The baseline values for the resources.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Baseline"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outlineCode" upperBound="-1"
-        eType="#//OutlineCode3" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of an outline code.  Two pieces of data are necessary - a pointer back to &#xD;&#xA;                                the outline code table which is specified either by the unique ID or the Field ID, and the value which is &#xD;&#xA;                                specified either with the value, or a pointer back to the value list.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OutlineCode"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="availabilityPeriods" eType="#//AvailabilityPeriods"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A collection of periods during which the resource is available.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AvailabilityPeriods"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rates" eType="#//Rates"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A collection of periods and the rates associated with each one.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Rates"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timephasedData" upperBound="-1"
-        eType="#//TimephasedDataType" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The time phased data&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TimephasedData"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Resources">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Resources_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="resource" upperBound="-1"
-        eType="#//Resource" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="There must be at least one resource in each Resources collection.&#xD;&#xA;                    "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Resource"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="RollupTypeType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="RollupType_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4 5 6 7"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="StandardRateFormatType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="StandardRateFormat_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3 4 5 7"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="StandardRateFormatType1" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="StandardRateFormat_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3 4 5 7 8"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="SubjectType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Subject_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="SubprojectNameType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="SubprojectName_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Task">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Task_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The position identifier of the task within the list of tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="#//NameType2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Name"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" eType="#//TypeType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The type of task. &#xD;&#xA;                                Values are: 0=Fixed Units, 1=Fixed Duration, 2=Fixed Work.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Type"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isNull" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies whether the task is null.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsNull"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="createDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the task was created.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CreateDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="contact" unique="false"
-        eType="#//ContactType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The contact person for the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Contact"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wBS" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The work breakdown structure code of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WBS"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wBSLevel" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The rightmost WBS level of the task. &#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WBSLevel"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="outlineNumber" unique="false"
-        eType="#//OutlineNumberType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The outline number of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OutlineNumber"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="outlineLevel" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The outline level of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OutlineLevel"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="priority" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The priority of the task from 0 to 1000.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Priority"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled start date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Start"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled finish date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Finish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="duration" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The planned duration of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Duration"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="durationFormat" unique="false"
-        eType="#//DurationFormatType4">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the Duration of the Task.  &#xD;&#xA;                                Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, &#xD;&#xA;                                20=e%, 21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, &#xD;&#xA;                                43=mo?, 44=emo?, 51=%?, 52=e%? and 53=null.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DurationFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="work" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of scheduled work for the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Work"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stop" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the task was stopped.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Stop"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resume" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the task resumed.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Resume"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resumeValid" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task can be resumed.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ResumeValid"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="effortDriven" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is effort-driven.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EffortDriven"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="recurring" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is a recurring task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Recurring"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overAllocated" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is overallocated. &#xD;&#xA;                                This element is informational only.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OverAllocated"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="estimated" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is estimated.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Estimated"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="milestone" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is a milestone.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Milestone"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="summary" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is a summary task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Summary"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="critical" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is in the critical chain.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Critical"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSubproject" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is an inserted project.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsSubproject"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSubprojectReadOnly" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the inserted project is read-only.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsSubprojectReadOnly"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="subprojectName" unique="false"
-        eType="#//SubprojectNameType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The source location of the inserted project.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SubprojectName"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalTask" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is external.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExternalTask"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalTaskProject" unique="false"
-        eType="#//ExternalTaskProjectType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The source location and task identifier of the external task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExternalTaskProject"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="earlyStart" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The early start date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EarlyStart"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="earlyFinish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The early finish date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EarlyFinish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lateStart" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The late start date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LateStart"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lateFinish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The late finish date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LateFinish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="startVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The variance of the task start date from &#xD;&#xA;                                the baseline start date as minutes x 1000.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StartVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finishVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The variance of the task finish date from &#xD;&#xA;                                the baseline finish date as minutes x 1000.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FinishVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The variance of task work from the baseline &#xD;&#xA;                                task work as minutes x 1000.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="freeSlack" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of free slack.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FreeSlack"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="totalSlack" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of total slack.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TotalSlack"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fixedCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The fixed cost of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FixedCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fixedCostAccrual" unique="false"
-        eType="#//FixedCostAccrualType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="How the fixed cost is accrued against the task. &#xD;&#xA;                                Values are: 1=Start, 2=Prorated and 3=End.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FixedCostAccrual"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentComplete" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The percentage of the task duration completed.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PercentComplete"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentWorkComplete" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The percentage of the task work completed.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PercentWorkComplete"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The projected or scheduled cost of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Cost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The sum of the actual and remaining overtime cost of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of overtime work scheduled for the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualStart" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual start date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualStart"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualFinish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual finish date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualFinish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualDuration" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual duration of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualDuration"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual cost of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual overtime cost of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual work for the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual overtime work for the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="regularWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of non-overtime work scheduled for the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RegularWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingDuration" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of time required to complete the unfinished portion of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingDuration"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining projected cost of completing the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining work scheduled to complete the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingOvertimeCost"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining overtime cost projected to finish the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingOvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingOvertimeWork"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining overtime work scheduled to finish the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingOvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="aCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual cost of work performed on the task to-date.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ACWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cV" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Earned value cost variance.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CV"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="constraintType" unique="false"
-        eType="#//ConstraintTypeType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The constraint on the start or finish date of the task. &#xD;&#xA;                                Values are: 0=As Soon As Possible, 1=As Late As Possible, 2=Must Start On, 3=Must Finish On, &#xD;&#xA;                                4=Start No Earlier Than, 5=Start No Later Than, 6=Finish No Earlier Than and 7=Finish No Later Than&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ConstraintType"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="calendarUID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The task calendar.Refers to a valid UID in the Calendars element of &#xD;&#xA;                                the Microsoft Project XML Schema.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CalendarUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="constraintDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date argument for the task constraint type.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ConstraintDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deadline" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The deadline for the task to be completed.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Deadline"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelAssignments" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether leveling can adjust assignments.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LevelAssignments"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelingCanSplit" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether leveling can split the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LevelingCanSplit"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelingDelay" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The delay caused by leveling the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LevelingDelay"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelingDelayFormat" unique="false"
-        eType="#//LevelingDelayFormatType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the duration of the delay.  &#xD;&#xA;                                Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, &#xD;&#xA;                                20=e%, 21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, &#xD;&#xA;                                43=mo?, 44=emo?, 51=%?, 52=e%? and 53=null.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LevelingDelayFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="preLeveledStart" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The start date of the task before it was leveled.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PreLeveledStart"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="preLeveledFinish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The finish date of the task before it was leveled.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PreLeveledFinish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlink" unique="false"
-        eType="#//HyperlinkType2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The title of the hyperlink associated with the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Hyperlink"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlinkAddress" unique="false"
-        eType="#//HyperlinkAddressType2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The hyperlink associated with the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HyperlinkAddress"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlinkSubAddress" unique="false"
-        eType="#//HyperlinkSubAddressType2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The document bookmark of the hyperlink associated with the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HyperlinkSubAddress"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ignoreResourceCalendar"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task ignores the resource calendar.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IgnoreResourceCalendar"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="notes" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Text notes associated with the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Notes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hideBar" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the GANTT bar of the task is hidden when displayed in Microsoft Project.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HideBar"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rollup" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is rolled up.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Rollup"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWS" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work scheduled for the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWS"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work performed on the task to-date.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="physicalPercentComplete"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The percentage complete value entered by the Project Manager.  &#xD;&#xA;                                This can be used as an alternative for calculating BCWP.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PhysicalPercentComplete"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="earnedValueMethod" unique="false"
-        eType="#//EarnedValueMethodType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The method for calculating earned value. &#xD;&#xA;                                Values are: 0=Percent Complete, 1=Physical Percent Complete&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EarnedValueMethod"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="predecessorLink" upperBound="-1"
-        eType="#//PredecessorLink" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the predecessor task of the task that contains it.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PredecessorLink"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualWorkProtected" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the duration through which actual work is protected.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualWorkProtected"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeWorkProtected"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the duration through which actual overtime work is protected.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeWorkProtected"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedAttribute" upperBound="-1"
-        eType="#//ExtendedAttribute2" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of an extended attribute.  Two pieces of data are necessary - &#xD;&#xA;                                a pointer back to the extended attribute table which is specified either by the unique ID or &#xD;&#xA;                                the Field ID, and the value which is specified either with the value, or a pointer back to the value list.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExtendedAttribute"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="baseline" upperBound="-1"
-        eType="#//Baseline" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of baseline values of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Baseline"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outlineCode" upperBound="-1"
-        eType="#//OutlineCode2" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of an outline code.  Two pieces of data are necessary - &#xD;&#xA;                                a pointer back to the outline code table which is specified either by the unique ID or the Field ID, &#xD;&#xA;                                and the value which is specified either with the value, or a pointer back to the value list.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OutlineCode"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timephasedData" upperBound="-1"
-        eType="#//TimephasedDataType" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The time phased data block associated with the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TimephasedData"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Tasks">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Tasks_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="task" upperBound="-1" eType="#//Task"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="There must be at least one task in each Tasks collection.&#xD;&#xA;                    "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Task"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TimePeriod">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="TimePeriod_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fromDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The beginning of the exception time.&#xD;&#xA;                                                                     "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FromDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="toDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The end of the exception time.&#xD;&#xA;                                                                     "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ToDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TimephasedDataType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The definition of the time phased data block.&#xD;&#xA;&#x9;&#x9;        "/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="TimephasedDataType"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" eType="#//TypeType3">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&#xD;&#xA;                The type of task timephased data. Values are:&#xD;&#xA;                    1=Assignment Remaining Work&#xD;&#xA;                    2=Assignment Actual Work&#xD;&#xA;                    3=Assignment Actual Overtime Work&#xD;&#xA;                    4=Assignment Baseline Work&#xD;&#xA;                    5=Assignment Baseline Cost&#xD;&#xA;                    6=Assignment Actual Cost&#xD;&#xA;                    7=Resource Baseline Work&#xD;&#xA;                    8=Resource Baseline Cost&#xD;&#xA;                    9=Task Baseline Work&#xD;&#xA;                    10=Task Baseline Cost&#xD;&#xA;                    11=Task Percent Complete&#xD;&#xA;                    16=Assignment Baseline 1 Work&#xD;&#xA;                    17=Assignment Baseline 1 Cost&#xD;&#xA;                    18=Task Baseline 1 Work&#xD;&#xA;                    19=Task Baseline 1 Cost&#xD;&#xA;                    20=Resource Baseline 1 Work&#xD;&#xA;                    21=Resource Baseline 1 Cost&#xD;&#xA;                    22=Assignment Baseline 2 Work&#xD;&#xA;                    23=Assignment Baseline 2 Cost&#xD;&#xA;                    24=Task Baseline 2 Work&#xD;&#xA;                    25=Task Baseline 2 Cost&#xD;&#xA;                    26=Resource Baseline 2 Work&#xD;&#xA;                    27=Resource Baseline 2 Cost&#xD;&#xA;                    28=Assignment Baseline 3 Work&#xD;&#xA;                    29=Assignment Baseline 3 Cost&#xD;&#xA;                    30=Task Baseline 3 Work&#xD;&#xA;                    31=Task Baseline 3 Cost&#xD;&#xA;                    32=Resource Baseline 3 Work&#xD;&#xA;                    33=Resource Baseline 3 Cost&#xD;&#xA;                    34=Assignment Baseline 4 Work&#xD;&#xA;                    35=Assignment Baseline 4 Cost&#xD;&#xA;                    36=Task Baseline 4 Work&#xD;&#xA;                    37=Task Baseline 4 Cost&#xD;&#xA;                    38=Resource Baseline 4 Work&#xD;&#xA;                    39=Resource Baseline 4 Cost&#xD;&#xA;                    40=Assignment Baseline 5 Work&#xD;&#xA;                    41=Assignment Baseline 5 Cost&#xD;&#xA;                    42=Task Baseline 5 Work&#xD;&#xA;                    43=Task Baseline 5 Cost&#xD;&#xA;                    44=Resource Baseline 5 Work&#xD;&#xA;                    45=Resource Baseline 5 Cost&#xD;&#xA;                    46=Assignment Baseline 6 Work&#xD;&#xA;                    47=Assignment Baseline 6 Cost&#xD;&#xA;                    48=Task Baseline 6 Work&#xD;&#xA;                    49=Task Baseline 6 Cost&#xD;&#xA;                    50=Resource Baseline 6 Work&#xD;&#xA;                    51=Resource Baseline 6 Cost&#xD;&#xA;                    52=Assignment Baseline 7 Work&#xD;&#xA;                    53=Assignment Baseline 7 Cost&#xD;&#xA;                    54=Task Baseline 7 Work&#xD;&#xA;                    55=Task Baseline 7 Cost&#xD;&#xA;                    56=Resource Baseline 7 Work&#xD;&#xA;                    57=Resource Baseline 7 Cost&#xD;&#xA;                    58=Assignment Baseline 8 Work&#xD;&#xA;                    59=Assignment Baseline 8 Cost&#xD;&#xA;                    60=Task Baseline 8 Work&#xD;&#xA;                    61=Task Baseline 8 Cost&#xD;&#xA;                    62=Resource Baseline 8 Work&#xD;&#xA;                    63=Resource Baseline 8 Cost&#xD;&#xA;                    64=Assignment Baseline 9 Work&#xD;&#xA;                    65=Assignment Baseline 9 Cost&#xD;&#xA;                    66=Task Baseline 9 Work&#xD;&#xA;                    67=Task Baseline 9 Cost&#xD;&#xA;                    68=Resource Baseline 9 Work&#xD;&#xA;                    69=Resource Baseline 9 Cost&#xD;&#xA;                    70=Assignment Baseline 10 Work&#xD;&#xA;                    71=Assignment Baseline 10 Cost&#xD;&#xA;                    72=Task Baseline 10 Work&#xD;&#xA;                    73=Task Baseline 10 Cost&#xD;&#xA;                    74=Resource Baseline 10 Work&#xD;&#xA;                    75=Resource Baseline 10 Cost&#xD;&#xA;                    76=Physical Percent Complete&#xD;&#xA;                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Type"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the timephased data record.&#xD;&#xA;                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The start date of the timephased data period.&#xD;&#xA;                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Start"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The finish date of the timephased data period.&#xD;&#xA;                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Finish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unit" unique="false" eType="#//UnitType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The time unit of the timephased data period. &#xD;&#xA;                Values are: 0=m, 1=h, 2=d, 3=w, 5=mo, 8=y&#xD;&#xA;                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Unit"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value per unit of time for the timephased data period.&#xD;&#xA;                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TitleType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Title_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TypeType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Type_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TypeType1" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Type_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TypeType2" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Type_._2_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TypeType3" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Type_._3_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3 4 5 6 7 8 9 10 11 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TypeType4" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Type_._4_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TypeType5" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Type_._5_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="UIDType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="UID_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="16"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="UnitType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Unit_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 5 8"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Value">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Value_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the outline code value across the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValueID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentValueID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of the parent node of the outline code."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ParentValueID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual value."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A description of this value."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Description"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Value2">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Value_._1_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Unique ID of value across &#xD;&#xA;                                                        the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual value."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The description of the value &#xD;&#xA;                                                        in the list."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Description"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ValueList">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ValueList_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" upperBound="-1"
-        eType="#//Value2" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The values that make up the value list.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ValuelistSortOrderType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ValuelistSortOrder_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Values">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Values_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group" unique="false" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:0"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" upperBound="-1"
-        eType="#//Value" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The individual values."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-        <details key="group" value="#group:0"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WBSMask">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WBSMask_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="level" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The level of the mask."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Level"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" lowerBound="1"
-        eType="#//TypeType2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The type of the node value. &#xD;&#xA;                                The values are: 0=Numbers, 1=Uppercase Letters, 2=Lowercase Letters, 3=Characters."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Type"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="length" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The maximum length in characters.  &#xD;&#xA;                                This element is omitted when length is &quot;any&quot;."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Length"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="separator" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The separator character of the node."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Separator"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WBSMasks">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WBSMasks_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="verifyUniqueCodes" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether WBS codes are unique for new tasks."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="VerifyUniqueCodes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateCodes" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether WBS codes are generated for new tasks."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="GenerateCodes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" unique="false"
-        eType="#//PrefixType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The prefix for all WBS codes."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Prefix"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="wBSMask" upperBound="-1"
-        eType="#//WBSMask" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The WBS Mask that is applied to all tasks in the Project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WBSMask"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WeekDay">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WeekDay_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dayType" unique="false"
-        lowerBound="1" eType="#//DayTypeType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The type of day. &#xD;&#xA;                                                         Values are: 0=Exception, 1=Monday, 2=Tuesday, &#xD;&#xA;                                                         3=Wednesday, 4=Thursday, 5=Friday, 6=Saturday, &#xD;&#xA;                                                         7=Sunday"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DayType"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dayWorking" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the specified date or day &#xD;&#xA;                                                         type is working."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DayWorking"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timePeriod" eType="#//TimePeriod"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines a contiguous set of exception days.&#xD;&#xA;                                                         "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TimePeriod"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="workingTimes" eType="#//WorkingTimes"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of working times that define the time worked &#xD;&#xA;                                                         on the weekday.  One of these must be present, and there may be no more than five.&#xD;&#xA;                                                         "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkingTimes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WeekDays">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WeekDays_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="weekDay" upperBound="-1"
-        eType="#//WeekDay" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A weekday either defines regular days &#xD;&#xA;                                            of the week or exception days in the calendar."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WeekDay"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="WeekStartDayType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WeekStartDay_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4 5 6"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="WorkContourType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkContour_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4 5 6 7 8"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="WorkFormatType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkFormat_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3 4 5"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="WorkGroupType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkGroup_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkingTime">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkingTime_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fromTime" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Time">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The beginning of the working time.&#xD;&#xA;                                                                                     "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FromTime"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="toTime" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Time">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The end of the working  time.&#xD;&#xA;                                                                                     "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ToTime"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkingTimes">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkingTimes_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="workingTime" upperBound="5"
-        eType="#//WorkingTime" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the working time during the weekday.&#xD;&#xA;                                                                         "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkingTime"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.epf.msproject/plugin.properties b/plugins/org.eclipse.epf.msproject/plugin.properties
deleted file mode 100755
index 5168061..0000000
--- a/plugins/org.eclipse.epf.msproject/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# <copyright>
-# </copyright>
-#
-# $Id: plugin.properties,v 1.5 2007/03/06 21:10:22 skannoori Exp $
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-# NLS_MESSAGEFORMAT_VAR
-
-pluginName = EPF MSProject2003 Model
-providerName=Eclipse.org
-
diff --git a/plugins/org.eclipse.epf.msproject/plugin.xml b/plugins/org.eclipse.epf.msproject/plugin.xml
deleted file mode 100755
index 9bb43cc..0000000
--- a/plugins/org.eclipse.epf.msproject/plugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id: plugin.xml,v 1.2 2006/04/11 15:29:55 jthario Exp $
--->
-
-<plugin>
-
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "http://epf.eclipse.org/msproject" 
-       class = "org.eclipse.epf.msproject.MsprojectPackage"
-       genModel = "model/MS_Project_2003.genmodel" /> 
-  </extension>
-
-  <extension point="org.eclipse.emf.ecore.extension_parser">
-    <parser 
-       type="msproject" 
-       class="org.eclipse.epf.msproject.util.MsprojectResourceFactoryImpl" />
-  </extension>
-
-</plugin>
-
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Assignment.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Assignment.java
deleted file mode 100755
index e35d5a4..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Assignment.java
+++ /dev/null
@@ -1,2034 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Assignment.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Assignment</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getTaskUID <em>Task UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getResourceUID <em>Resource UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getPercentWorkComplete <em>Percent Work Complete</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getActualCost <em>Actual Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getActualFinish <em>Actual Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getActualOvertimeCost <em>Actual Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getActualOvertimeWork <em>Actual Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getActualStart <em>Actual Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getActualWork <em>Actual Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getACWP <em>ACWP</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#isConfirmed <em>Confirmed</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getCost <em>Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getCostRateTable <em>Cost Rate Table</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getCostVariance <em>Cost Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getCV <em>CV</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getDelay <em>Delay</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getFinish <em>Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getFinishVariance <em>Finish Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getHyperlink <em>Hyperlink</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getHyperlinkAddress <em>Hyperlink Address</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getHyperlinkSubAddress <em>Hyperlink Sub Address</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getWorkVariance <em>Work Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#isHasFixedRateUnits <em>Has Fixed Rate Units</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#isFixedMaterial <em>Fixed Material</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getLevelingDelay <em>Leveling Delay</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getLevelingDelayFormat <em>Leveling Delay Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#isLinkedFields <em>Linked Fields</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#isMilestone <em>Milestone</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getNotes <em>Notes</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#isOverallocated <em>Overallocated</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getOvertimeCost <em>Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getOvertimeWork <em>Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getRegularWork <em>Regular Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getRemainingCost <em>Remaining Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getRemainingOvertimeCost <em>Remaining Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getRemainingOvertimeWork <em>Remaining Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getRemainingWork <em>Remaining Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#isResponsePending <em>Response Pending</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getStop <em>Stop</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getResume <em>Resume</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getStartVariance <em>Start Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getUnits <em>Units</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#isUpdateNeeded <em>Update Needed</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getVAC <em>VAC</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getWork <em>Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getWorkContour <em>Work Contour</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getBCWS <em>BCWS</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getBCWP <em>BCWP</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getBookingType <em>Booking Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getActualWorkProtected <em>Actual Work Protected</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getActualOvertimeWorkProtected <em>Actual Overtime Work Protected</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getCreationDate <em>Creation Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getExtendedAttribute <em>Extended Attribute</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getBaseline <em>Baseline</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Assignment#getTimephasedData <em>Timephased Data</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment()
- * @model extendedMetaData="name='Assignment_._type' kind='elementOnly'"
- * @generated
- */
-public interface Assignment extends EObject {
-	/**
-	 * Returns the value of the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique identifier of the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>UID</em>' attribute.
-	 * @see #setUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_UID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer" required="true"
-	 *        extendedMetaData="kind='element' name='UID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getUID <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>UID</em>' attribute.
-	 * @see #getUID()
-	 * @generated
-	 */
-	void setUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Task UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique identifier of the task.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Task UID</em>' attribute.
-	 * @see #setTaskUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_TaskUID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='TaskUID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getTaskUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getTaskUID <em>Task UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Task UID</em>' attribute.
-	 * @see #getTaskUID()
-	 * @generated
-	 */
-	void setTaskUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Resource UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique identifier of the resource.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Resource UID</em>' attribute.
-	 * @see #setResourceUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_ResourceUID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='ResourceUID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getResourceUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getResourceUID <em>Resource UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Resource UID</em>' attribute.
-	 * @see #getResourceUID()
-	 * @generated
-	 */
-	void setResourceUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Percent Work Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of work completed on the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Percent Work Complete</em>' attribute.
-	 * @see #setPercentWorkComplete(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_PercentWorkComplete()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='PercentWorkComplete' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getPercentWorkComplete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getPercentWorkComplete <em>Percent Work Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Percent Work Complete</em>' attribute.
-	 * @see #getPercentWorkComplete()
-	 * @generated
-	 */
-	void setPercentWorkComplete(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual cost incurred on the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Cost</em>' attribute.
-	 * @see #setActualCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_ActualCost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='ActualCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getActualCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getActualCost <em>Actual Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Cost</em>' attribute.
-	 * @see #getActualCost()
-	 * @generated
-	 */
-	void setActualCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual finish date of the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Finish</em>' attribute.
-	 * @see #setActualFinish(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_ActualFinish()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='ActualFinish' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualFinish();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getActualFinish <em>Actual Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Finish</em>' attribute.
-	 * @see #getActualFinish()
-	 * @generated
-	 */
-	void setActualFinish(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual overtime cost incurred on the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Overtime Cost</em>' attribute.
-	 * @see #setActualOvertimeCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_ActualOvertimeCost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='ActualOvertimeCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getActualOvertimeCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getActualOvertimeCost <em>Actual Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Overtime Cost</em>' attribute.
-	 * @see #getActualOvertimeCost()
-	 * @generated
-	 */
-	void setActualOvertimeCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual amount of overtime work incurred on the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Overtime Work</em>' attribute.
-	 * @see #setActualOvertimeWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_ActualOvertimeWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='ActualOvertimeWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualOvertimeWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getActualOvertimeWork <em>Actual Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Overtime Work</em>' attribute.
-	 * @see #getActualOvertimeWork()
-	 * @generated
-	 */
-	void setActualOvertimeWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual start date of the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Start</em>' attribute.
-	 * @see #setActualStart(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_ActualStart()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='ActualStart' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualStart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getActualStart <em>Actual Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Start</em>' attribute.
-	 * @see #getActualStart()
-	 * @generated
-	 */
-	void setActualStart(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual amount of work incurred on the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Work</em>' attribute.
-	 * @see #setActualWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_ActualWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='ActualWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getActualWork <em>Actual Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Work</em>' attribute.
-	 * @see #getActualWork()
-	 * @generated
-	 */
-	void setActualWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>ACWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual cost of work performed on the assignment to-date.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>ACWP</em>' attribute.
-	 * @see #isSetACWP()
-	 * @see #unsetACWP()
-	 * @see #setACWP(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_ACWP()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='ACWP' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getACWP();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getACWP <em>ACWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>ACWP</em>' attribute.
-	 * @see #isSetACWP()
-	 * @see #unsetACWP()
-	 * @see #getACWP()
-	 * @generated
-	 */
-	void setACWP(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#getACWP <em>ACWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetACWP()
-	 * @see #getACWP()
-	 * @see #setACWP(float)
-	 * @generated
-	 */
-	void unsetACWP();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#getACWP <em>ACWP</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>ACWP</em>' attribute is set.
-	 * @see #unsetACWP()
-	 * @see #getACWP()
-	 * @see #setACWP(float)
-	 * @generated
-	 */
-	boolean isSetACWP();
-
-	/**
-	 * Returns the value of the '<em><b>Confirmed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the Resource has accepted all of his or her assignments.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Confirmed</em>' attribute.
-	 * @see #isSetConfirmed()
-	 * @see #unsetConfirmed()
-	 * @see #setConfirmed(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_Confirmed()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='Confirmed' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isConfirmed();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#isConfirmed <em>Confirmed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Confirmed</em>' attribute.
-	 * @see #isSetConfirmed()
-	 * @see #unsetConfirmed()
-	 * @see #isConfirmed()
-	 * @generated
-	 */
-	void setConfirmed(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#isConfirmed <em>Confirmed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetConfirmed()
-	 * @see #isConfirmed()
-	 * @see #setConfirmed(boolean)
-	 * @generated
-	 */
-	void unsetConfirmed();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#isConfirmed <em>Confirmed</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Confirmed</em>' attribute is set.
-	 * @see #unsetConfirmed()
-	 * @see #isConfirmed()
-	 * @see #setConfirmed(boolean)
-	 * @generated
-	 */
-	boolean isSetConfirmed();
-
-	/**
-	 * Returns the value of the '<em><b>Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The projected or scheduled cost of the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Cost</em>' attribute.
-	 * @see #setCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_Cost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='Cost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getCost <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cost</em>' attribute.
-	 * @see #getCost()
-	 * @generated
-	 */
-	void setCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Cost Rate Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The cost rate table used for the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Cost Rate Table</em>' attribute.
-	 * @see #setCostRateTable(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_CostRateTable()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.CostRateTableType"
-	 *        extendedMetaData="kind='element' name='CostRateTable' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getCostRateTable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getCostRateTable <em>Cost Rate Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cost Rate Table</em>' attribute.
-	 * @see #getCostRateTable()
-	 * @generated
-	 */
-	void setCostRateTable(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Cost Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The difference between the cost and baseline cost for a resource.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Cost Variance</em>' attribute.
-	 * @see #isSetCostVariance()
-	 * @see #unsetCostVariance()
-	 * @see #setCostVariance(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_CostVariance()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='CostVariance' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getCostVariance();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getCostVariance <em>Cost Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cost Variance</em>' attribute.
-	 * @see #isSetCostVariance()
-	 * @see #unsetCostVariance()
-	 * @see #getCostVariance()
-	 * @generated
-	 */
-	void setCostVariance(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#getCostVariance <em>Cost Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetCostVariance()
-	 * @see #getCostVariance()
-	 * @see #setCostVariance(float)
-	 * @generated
-	 */
-	void unsetCostVariance();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#getCostVariance <em>Cost Variance</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Cost Variance</em>' attribute is set.
-	 * @see #unsetCostVariance()
-	 * @see #getCostVariance()
-	 * @see #setCostVariance(float)
-	 * @generated
-	 */
-	boolean isSetCostVariance();
-
-	/**
-	 * Returns the value of the '<em><b>CV</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Earned value cost variance.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>CV</em>' attribute.
-	 * @see #isSetCV()
-	 * @see #unsetCV()
-	 * @see #setCV(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_CV()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='CV' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getCV();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getCV <em>CV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>CV</em>' attribute.
-	 * @see #isSetCV()
-	 * @see #unsetCV()
-	 * @see #getCV()
-	 * @generated
-	 */
-	void setCV(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#getCV <em>CV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetCV()
-	 * @see #getCV()
-	 * @see #setCV(float)
-	 * @generated
-	 */
-	void unsetCV();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#getCV <em>CV</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>CV</em>' attribute is set.
-	 * @see #unsetCV()
-	 * @see #getCV()
-	 * @see #setCV(float)
-	 * @generated
-	 */
-	boolean isSetCV();
-
-	/**
-	 * Returns the value of the '<em><b>Delay</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount that the assignment is delayed.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Delay</em>' attribute.
-	 * @see #setDelay(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_Delay()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='Delay' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getDelay();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getDelay <em>Delay</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Delay</em>' attribute.
-	 * @see #getDelay()
-	 * @generated
-	 */
-	void setDelay(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The scheduled finish date of the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Finish</em>' attribute.
-	 * @see #setFinish(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_Finish()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='Finish' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getFinish();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getFinish <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Finish</em>' attribute.
-	 * @see #getFinish()
-	 * @generated
-	 */
-	void setFinish(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Finish Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The variance of the assignment finish date from the baseline finish date.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Finish Variance</em>' attribute.
-	 * @see #setFinishVariance(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_FinishVariance()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='FinishVariance' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getFinishVariance();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getFinishVariance <em>Finish Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Finish Variance</em>' attribute.
-	 * @see #getFinishVariance()
-	 * @generated
-	 */
-	void setFinishVariance(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Hyperlink</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The title of the hyperlink associated with the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Hyperlink</em>' attribute.
-	 * @see #setHyperlink(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_Hyperlink()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.HyperlinkType"
-	 *        extendedMetaData="kind='element' name='Hyperlink' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getHyperlink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getHyperlink <em>Hyperlink</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hyperlink</em>' attribute.
-	 * @see #getHyperlink()
-	 * @generated
-	 */
-	void setHyperlink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Hyperlink Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The hyperlink associated with the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Hyperlink Address</em>' attribute.
-	 * @see #setHyperlinkAddress(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_HyperlinkAddress()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.HyperlinkAddressType"
-	 *        extendedMetaData="kind='element' name='HyperlinkAddress' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getHyperlinkAddress();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getHyperlinkAddress <em>Hyperlink Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hyperlink Address</em>' attribute.
-	 * @see #getHyperlinkAddress()
-	 * @generated
-	 */
-	void setHyperlinkAddress(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Hyperlink Sub Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The document bookmark of the hyperlink associated with the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Hyperlink Sub Address</em>' attribute.
-	 * @see #setHyperlinkSubAddress(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_HyperlinkSubAddress()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.HyperlinkSubAddressType1"
-	 *        extendedMetaData="kind='element' name='HyperlinkSubAddress' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getHyperlinkSubAddress();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getHyperlinkSubAddress <em>Hyperlink Sub Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hyperlink Sub Address</em>' attribute.
-	 * @see #getHyperlinkSubAddress()
-	 * @generated
-	 */
-	void setHyperlinkSubAddress(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Work Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The variance of assignment work from the baseline work as minutes x 1000.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Work Variance</em>' attribute.
-	 * @see #isSetWorkVariance()
-	 * @see #unsetWorkVariance()
-	 * @see #setWorkVariance(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_WorkVariance()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='WorkVariance' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getWorkVariance();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getWorkVariance <em>Work Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Work Variance</em>' attribute.
-	 * @see #isSetWorkVariance()
-	 * @see #unsetWorkVariance()
-	 * @see #getWorkVariance()
-	 * @generated
-	 */
-	void setWorkVariance(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#getWorkVariance <em>Work Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetWorkVariance()
-	 * @see #getWorkVariance()
-	 * @see #setWorkVariance(float)
-	 * @generated
-	 */
-	void unsetWorkVariance();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#getWorkVariance <em>Work Variance</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Work Variance</em>' attribute is set.
-	 * @see #unsetWorkVariance()
-	 * @see #getWorkVariance()
-	 * @see #setWorkVariance(float)
-	 * @generated
-	 */
-	boolean isSetWorkVariance();
-
-	/**
-	 * Returns the value of the '<em><b>Has Fixed Rate Units</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the Units are Fixed Rate.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Has Fixed Rate Units</em>' attribute.
-	 * @see #isSetHasFixedRateUnits()
-	 * @see #unsetHasFixedRateUnits()
-	 * @see #setHasFixedRateUnits(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_HasFixedRateUnits()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='HasFixedRateUnits' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isHasFixedRateUnits();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#isHasFixedRateUnits <em>Has Fixed Rate Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Has Fixed Rate Units</em>' attribute.
-	 * @see #isSetHasFixedRateUnits()
-	 * @see #unsetHasFixedRateUnits()
-	 * @see #isHasFixedRateUnits()
-	 * @generated
-	 */
-	void setHasFixedRateUnits(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#isHasFixedRateUnits <em>Has Fixed Rate Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetHasFixedRateUnits()
-	 * @see #isHasFixedRateUnits()
-	 * @see #setHasFixedRateUnits(boolean)
-	 * @generated
-	 */
-	void unsetHasFixedRateUnits();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#isHasFixedRateUnits <em>Has Fixed Rate Units</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Has Fixed Rate Units</em>' attribute is set.
-	 * @see #unsetHasFixedRateUnits()
-	 * @see #isHasFixedRateUnits()
-	 * @see #setHasFixedRateUnits(boolean)
-	 * @generated
-	 */
-	boolean isSetHasFixedRateUnits();
-
-	/**
-	 * Returns the value of the '<em><b>Fixed Material</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the consumption of the assigned material resource occurs in a single, fixed amount.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Fixed Material</em>' attribute.
-	 * @see #isSetFixedMaterial()
-	 * @see #unsetFixedMaterial()
-	 * @see #setFixedMaterial(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_FixedMaterial()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='FixedMaterial' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isFixedMaterial();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#isFixedMaterial <em>Fixed Material</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fixed Material</em>' attribute.
-	 * @see #isSetFixedMaterial()
-	 * @see #unsetFixedMaterial()
-	 * @see #isFixedMaterial()
-	 * @generated
-	 */
-	void setFixedMaterial(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#isFixedMaterial <em>Fixed Material</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetFixedMaterial()
-	 * @see #isFixedMaterial()
-	 * @see #setFixedMaterial(boolean)
-	 * @generated
-	 */
-	void unsetFixedMaterial();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#isFixedMaterial <em>Fixed Material</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Fixed Material</em>' attribute is set.
-	 * @see #unsetFixedMaterial()
-	 * @see #isFixedMaterial()
-	 * @see #setFixedMaterial(boolean)
-	 * @generated
-	 */
-	boolean isSetFixedMaterial();
-
-	/**
-	 * Returns the value of the '<em><b>Leveling Delay</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The delay caused by leveling.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Leveling Delay</em>' attribute.
-	 * @see #setLevelingDelay(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_LevelingDelay()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='LevelingDelay' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getLevelingDelay();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getLevelingDelay <em>Leveling Delay</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Leveling Delay</em>' attribute.
-	 * @see #getLevelingDelay()
-	 * @generated
-	 */
-	void setLevelingDelay(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Leveling Delay Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The format for expressing the duration of the delay.  
-	 *                             Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 20=e%, 21=null, 
-	 *                             35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 43=mo?, 44=emo?, 51=%?, 52=e%? and 53=null.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Leveling Delay Format</em>' attribute.
-	 * @see #setLevelingDelayFormat(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_LevelingDelayFormat()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.LevelingDelayFormatType"
-	 *        extendedMetaData="kind='element' name='LevelingDelayFormat' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getLevelingDelayFormat();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getLevelingDelayFormat <em>Leveling Delay Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Leveling Delay Format</em>' attribute.
-	 * @see #getLevelingDelayFormat()
-	 * @generated
-	 */
-	void setLevelingDelayFormat(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Linked Fields</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the Project is linked to another OLE object.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Linked Fields</em>' attribute.
-	 * @see #isSetLinkedFields()
-	 * @see #unsetLinkedFields()
-	 * @see #setLinkedFields(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_LinkedFields()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='LinkedFields' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isLinkedFields();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#isLinkedFields <em>Linked Fields</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Linked Fields</em>' attribute.
-	 * @see #isSetLinkedFields()
-	 * @see #unsetLinkedFields()
-	 * @see #isLinkedFields()
-	 * @generated
-	 */
-	void setLinkedFields(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#isLinkedFields <em>Linked Fields</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetLinkedFields()
-	 * @see #isLinkedFields()
-	 * @see #setLinkedFields(boolean)
-	 * @generated
-	 */
-	void unsetLinkedFields();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#isLinkedFields <em>Linked Fields</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Linked Fields</em>' attribute is set.
-	 * @see #unsetLinkedFields()
-	 * @see #isLinkedFields()
-	 * @see #setLinkedFields(boolean)
-	 * @generated
-	 */
-	boolean isSetLinkedFields();
-
-	/**
-	 * Returns the value of the '<em><b>Milestone</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the assignment is a milestone.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Milestone</em>' attribute.
-	 * @see #isSetMilestone()
-	 * @see #unsetMilestone()
-	 * @see #setMilestone(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_Milestone()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='Milestone' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isMilestone();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#isMilestone <em>Milestone</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Milestone</em>' attribute.
-	 * @see #isSetMilestone()
-	 * @see #unsetMilestone()
-	 * @see #isMilestone()
-	 * @generated
-	 */
-	void setMilestone(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#isMilestone <em>Milestone</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMilestone()
-	 * @see #isMilestone()
-	 * @see #setMilestone(boolean)
-	 * @generated
-	 */
-	void unsetMilestone();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#isMilestone <em>Milestone</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Milestone</em>' attribute is set.
-	 * @see #unsetMilestone()
-	 * @see #isMilestone()
-	 * @see #setMilestone(boolean)
-	 * @generated
-	 */
-	boolean isSetMilestone();
-
-	/**
-	 * Returns the value of the '<em><b>Notes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Text notes associated with the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Notes</em>' attribute.
-	 * @see #setNotes(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_Notes()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Notes' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getNotes();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getNotes <em>Notes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Notes</em>' attribute.
-	 * @see #getNotes()
-	 * @generated
-	 */
-	void setNotes(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Overallocated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the assignment is overallocated.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Overallocated</em>' attribute.
-	 * @see #isSetOverallocated()
-	 * @see #unsetOverallocated()
-	 * @see #setOverallocated(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_Overallocated()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='Overallocated' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isOverallocated();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#isOverallocated <em>Overallocated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Overallocated</em>' attribute.
-	 * @see #isSetOverallocated()
-	 * @see #unsetOverallocated()
-	 * @see #isOverallocated()
-	 * @generated
-	 */
-	void setOverallocated(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#isOverallocated <em>Overallocated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetOverallocated()
-	 * @see #isOverallocated()
-	 * @see #setOverallocated(boolean)
-	 * @generated
-	 */
-	void unsetOverallocated();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#isOverallocated <em>Overallocated</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Overallocated</em>' attribute is set.
-	 * @see #unsetOverallocated()
-	 * @see #isOverallocated()
-	 * @see #setOverallocated(boolean)
-	 * @generated
-	 */
-	boolean isSetOverallocated();
-
-	/**
-	 * Returns the value of the '<em><b>Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The sum of the actual and remaining overtime cost of the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Overtime Cost</em>' attribute.
-	 * @see #setOvertimeCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_OvertimeCost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='OvertimeCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getOvertimeCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getOvertimeCost <em>Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Overtime Cost</em>' attribute.
-	 * @see #getOvertimeCost()
-	 * @generated
-	 */
-	void setOvertimeCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The scheduled overtime work scheduled for the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Overtime Work</em>' attribute.
-	 * @see #setOvertimeWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_OvertimeWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='OvertimeWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getOvertimeWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getOvertimeWork <em>Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Overtime Work</em>' attribute.
-	 * @see #getOvertimeWork()
-	 * @generated
-	 */
-	void setOvertimeWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Regular Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of non-overtime work scheduled for the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Regular Work</em>' attribute.
-	 * @see #setRegularWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_RegularWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='RegularWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getRegularWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getRegularWork <em>Regular Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Regular Work</em>' attribute.
-	 * @see #getRegularWork()
-	 * @generated
-	 */
-	void setRegularWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Remaining Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The remaining projected cost of completing the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Remaining Cost</em>' attribute.
-	 * @see #setRemainingCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_RemainingCost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='RemainingCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getRemainingCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getRemainingCost <em>Remaining Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remaining Cost</em>' attribute.
-	 * @see #getRemainingCost()
-	 * @generated
-	 */
-	void setRemainingCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Remaining Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The remaining projected overtime cost of completing the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Remaining Overtime Cost</em>' attribute.
-	 * @see #setRemainingOvertimeCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_RemainingOvertimeCost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='RemainingOvertimeCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getRemainingOvertimeCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getRemainingOvertimeCost <em>Remaining Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remaining Overtime Cost</em>' attribute.
-	 * @see #getRemainingOvertimeCost()
-	 * @generated
-	 */
-	void setRemainingOvertimeCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Remaining Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The remaining overtime work scheduled to complete the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Remaining Overtime Work</em>' attribute.
-	 * @see #setRemainingOvertimeWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_RemainingOvertimeWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='RemainingOvertimeWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getRemainingOvertimeWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getRemainingOvertimeWork <em>Remaining Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remaining Overtime Work</em>' attribute.
-	 * @see #getRemainingOvertimeWork()
-	 * @generated
-	 */
-	void setRemainingOvertimeWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Remaining Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The remaining work scheduled to complete the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Remaining Work</em>' attribute.
-	 * @see #setRemainingWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_RemainingWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='RemainingWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getRemainingWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getRemainingWork <em>Remaining Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remaining Work</em>' attribute.
-	 * @see #getRemainingWork()
-	 * @generated
-	 */
-	void setRemainingWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Response Pending</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * True if a response has not been received for a TeamAssign message. 
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Response Pending</em>' attribute.
-	 * @see #isSetResponsePending()
-	 * @see #unsetResponsePending()
-	 * @see #setResponsePending(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_ResponsePending()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='ResponsePending' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isResponsePending();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#isResponsePending <em>Response Pending</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Response Pending</em>' attribute.
-	 * @see #isSetResponsePending()
-	 * @see #unsetResponsePending()
-	 * @see #isResponsePending()
-	 * @generated
-	 */
-	void setResponsePending(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#isResponsePending <em>Response Pending</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetResponsePending()
-	 * @see #isResponsePending()
-	 * @see #setResponsePending(boolean)
-	 * @generated
-	 */
-	void unsetResponsePending();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#isResponsePending <em>Response Pending</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Response Pending</em>' attribute is set.
-	 * @see #unsetResponsePending()
-	 * @see #isResponsePending()
-	 * @see #setResponsePending(boolean)
-	 * @generated
-	 */
-	boolean isSetResponsePending();
-
-	/**
-	 * Returns the value of the '<em><b>Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The scheduled start date of the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Start</em>' attribute.
-	 * @see #setStart(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_Start()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='Start' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getStart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getStart <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start</em>' attribute.
-	 * @see #getStart()
-	 * @generated
-	 */
-	void setStart(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Stop</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The date that the assignment was stopped.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Stop</em>' attribute.
-	 * @see #setStop(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_Stop()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='Stop' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getStop();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getStop <em>Stop</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Stop</em>' attribute.
-	 * @see #getStop()
-	 * @generated
-	 */
-	void setStop(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Resume</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The date that the assignment resumed.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Resume</em>' attribute.
-	 * @see #setResume(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_Resume()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='Resume' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getResume();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getResume <em>Resume</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Resume</em>' attribute.
-	 * @see #getResume()
-	 * @generated
-	 */
-	void setResume(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Start Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The variance of the assignment start date from the baseline start date.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Start Variance</em>' attribute.
-	 * @see #setStartVariance(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_StartVariance()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='StartVariance' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getStartVariance();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getStartVariance <em>Start Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start Variance</em>' attribute.
-	 * @see #getStartVariance()
-	 * @generated
-	 */
-	void setStartVariance(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Units</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The number of units for the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Units</em>' attribute.
-	 * @see #isSetUnits()
-	 * @see #unsetUnits()
-	 * @see #setUnits(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_Units()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='Units' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getUnits();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getUnits <em>Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Units</em>' attribute.
-	 * @see #isSetUnits()
-	 * @see #unsetUnits()
-	 * @see #getUnits()
-	 * @generated
-	 */
-	void setUnits(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#getUnits <em>Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetUnits()
-	 * @see #getUnits()
-	 * @see #setUnits(float)
-	 * @generated
-	 */
-	void unsetUnits();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#getUnits <em>Units</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Units</em>' attribute is set.
-	 * @see #unsetUnits()
-	 * @see #getUnits()
-	 * @see #setUnits(float)
-	 * @generated
-	 */
-	boolean isSetUnits();
-
-	/**
-	 * Returns the value of the '<em><b>Update Needed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * True if the resource assigned to a task needs to be updated as to the status of the task.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Update Needed</em>' attribute.
-	 * @see #isSetUpdateNeeded()
-	 * @see #unsetUpdateNeeded()
-	 * @see #setUpdateNeeded(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_UpdateNeeded()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='UpdateNeeded' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isUpdateNeeded();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#isUpdateNeeded <em>Update Needed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Update Needed</em>' attribute.
-	 * @see #isSetUpdateNeeded()
-	 * @see #unsetUpdateNeeded()
-	 * @see #isUpdateNeeded()
-	 * @generated
-	 */
-	void setUpdateNeeded(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#isUpdateNeeded <em>Update Needed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetUpdateNeeded()
-	 * @see #isUpdateNeeded()
-	 * @see #setUpdateNeeded(boolean)
-	 * @generated
-	 */
-	void unsetUpdateNeeded();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#isUpdateNeeded <em>Update Needed</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Update Needed</em>' attribute is set.
-	 * @see #unsetUpdateNeeded()
-	 * @see #isUpdateNeeded()
-	 * @see #setUpdateNeeded(boolean)
-	 * @generated
-	 */
-	boolean isSetUpdateNeeded();
-
-	/**
-	 * Returns the value of the '<em><b>VAC</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The difference between basline cost and total cost.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>VAC</em>' attribute.
-	 * @see #isSetVAC()
-	 * @see #unsetVAC()
-	 * @see #setVAC(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_VAC()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='VAC' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getVAC();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getVAC <em>VAC</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>VAC</em>' attribute.
-	 * @see #isSetVAC()
-	 * @see #unsetVAC()
-	 * @see #getVAC()
-	 * @generated
-	 */
-	void setVAC(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#getVAC <em>VAC</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetVAC()
-	 * @see #getVAC()
-	 * @see #setVAC(float)
-	 * @generated
-	 */
-	void unsetVAC();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#getVAC <em>VAC</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>VAC</em>' attribute is set.
-	 * @see #unsetVAC()
-	 * @see #getVAC()
-	 * @see #setVAC(float)
-	 * @generated
-	 */
-	boolean isSetVAC();
-
-	/**
-	 * Returns the value of the '<em><b>Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of scheduled work for the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Work</em>' attribute.
-	 * @see #setWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_Work()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='Work' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getWork <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Work</em>' attribute.
-	 * @see #getWork()
-	 * @generated
-	 */
-	void setWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Work Contour</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The work contour of the assignment. 
-	 *                             Values are: 0=Flat, 1=Back Loaded, 2=Front Loaded, 3=Double Peak, 4=Early Peak, 5=Late Peak, 
-	 *                             6=Bell, 7=Turtle, 8=Contoured
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Work Contour</em>' attribute.
-	 * @see #setWorkContour(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_WorkContour()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.WorkContourType"
-	 *        extendedMetaData="kind='element' name='WorkContour' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getWorkContour();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getWorkContour <em>Work Contour</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Work Contour</em>' attribute.
-	 * @see #getWorkContour()
-	 * @generated
-	 */
-	void setWorkContour(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>BCWS</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The budgeted cost of work on the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>BCWS</em>' attribute.
-	 * @see #isSetBCWS()
-	 * @see #unsetBCWS()
-	 * @see #setBCWS(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_BCWS()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='BCWS' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getBCWS();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getBCWS <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>BCWS</em>' attribute.
-	 * @see #isSetBCWS()
-	 * @see #unsetBCWS()
-	 * @see #getBCWS()
-	 * @generated
-	 */
-	void setBCWS(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#getBCWS <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBCWS()
-	 * @see #getBCWS()
-	 * @see #setBCWS(float)
-	 * @generated
-	 */
-	void unsetBCWS();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#getBCWS <em>BCWS</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>BCWS</em>' attribute is set.
-	 * @see #unsetBCWS()
-	 * @see #getBCWS()
-	 * @see #setBCWS(float)
-	 * @generated
-	 */
-	boolean isSetBCWS();
-
-	/**
-	 * Returns the value of the '<em><b>BCWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The budgeted cost of work performed on the assignment to-date.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>BCWP</em>' attribute.
-	 * @see #isSetBCWP()
-	 * @see #unsetBCWP()
-	 * @see #setBCWP(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_BCWP()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='BCWP' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getBCWP();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getBCWP <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>BCWP</em>' attribute.
-	 * @see #isSetBCWP()
-	 * @see #unsetBCWP()
-	 * @see #getBCWP()
-	 * @generated
-	 */
-	void setBCWP(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Assignment#getBCWP <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBCWP()
-	 * @see #getBCWP()
-	 * @see #setBCWP(float)
-	 * @generated
-	 */
-	void unsetBCWP();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Assignment#getBCWP <em>BCWP</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>BCWP</em>' attribute is set.
-	 * @see #unsetBCWP()
-	 * @see #getBCWP()
-	 * @see #setBCWP(float)
-	 * @generated
-	 */
-	boolean isSetBCWP();
-
-	/**
-	 * Returns the value of the '<em><b>Booking Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies the booking type of the assignment. 1=Commited, 2=Proposed
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Booking Type</em>' attribute.
-	 * @see #setBookingType(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_BookingType()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.BookingTypeType"
-	 *        extendedMetaData="kind='element' name='BookingType' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getBookingType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getBookingType <em>Booking Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Booking Type</em>' attribute.
-	 * @see #getBookingType()
-	 * @generated
-	 */
-	void setBookingType(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Work Protected</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies the duration through which actual work is protected.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Work Protected</em>' attribute.
-	 * @see #setActualWorkProtected(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_ActualWorkProtected()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='ActualWorkProtected' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualWorkProtected();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getActualWorkProtected <em>Actual Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Work Protected</em>' attribute.
-	 * @see #getActualWorkProtected()
-	 * @generated
-	 */
-	void setActualWorkProtected(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Overtime Work Protected</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies the duration through which actual overtime work is protected.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Overtime Work Protected</em>' attribute.
-	 * @see #setActualOvertimeWorkProtected(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_ActualOvertimeWorkProtected()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='ActualOvertimeWorkProtected' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualOvertimeWorkProtected();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getActualOvertimeWorkProtected <em>Actual Overtime Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Overtime Work Protected</em>' attribute.
-	 * @see #getActualOvertimeWorkProtected()
-	 * @generated
-	 */
-	void setActualOvertimeWorkProtected(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Creation Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The date that the assignment was created.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Creation Date</em>' attribute.
-	 * @see #setCreationDate(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_CreationDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='CreationDate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getCreationDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Assignment#getCreationDate <em>Creation Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Date</em>' attribute.
-	 * @see #getCreationDate()
-	 * @generated
-	 */
-	void setCreationDate(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Extended Attribute</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.ExtendedAttribute4}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The value of an extended attribute.  Two pieces of data are necessary - 
-	 *                             a pointer back to the extended attribute table which is specified either by the unique ID or the 
-	 *                             Field ID, and the value which is specified either with the value, or a pointer back to the value list.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Extended Attribute</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_ExtendedAttribute()
-	 * @model type="org.eclipse.epf.msproject.ExtendedAttribute4" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='ExtendedAttribute' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getExtendedAttribute();
-
-	/**
-	 * Returns the value of the '<em><b>Baseline</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.Baseline3}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The collection of baseline values associated with the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Baseline</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_Baseline()
-	 * @model type="org.eclipse.epf.msproject.Baseline3" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='Baseline' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getBaseline();
-
-	/**
-	 * Returns the value of the '<em><b>Timephased Data</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.TimephasedDataType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The time phased data associated with the assignment.
-	 *                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Timephased Data</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignment_TimephasedData()
-	 * @model type="org.eclipse.epf.msproject.TimephasedDataType" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='TimephasedData' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getTimephasedData();
-
-} // Assignment
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Assignments.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Assignments.java
deleted file mode 100755
index 272b73d..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Assignments.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Assignments.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Assignments</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Assignments#getAssignment <em>Assignment</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignments()
- * @model extendedMetaData="name='Assignments_._type' kind='elementOnly'"
- * @generated
- */
-public interface Assignments extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Assignment</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.Assignment}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * There must be at least one assignment in each Assignments collection.
-	 *                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Assignment</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAssignments_Assignment()
-	 * @model type="org.eclipse.epf.msproject.Assignment" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='Assignment' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getAssignment();
-
-} // Assignments
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/AvailabilityPeriod.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/AvailabilityPeriod.java
deleted file mode 100755
index 613bc7e..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/AvailabilityPeriod.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AvailabilityPeriod.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Availability Period</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.AvailabilityPeriod#getAvailableFrom <em>Available From</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.AvailabilityPeriod#getAvailableTo <em>Available To</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.AvailabilityPeriod#getAvailableUnits <em>Available Units</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getAvailabilityPeriod()
- * @model extendedMetaData="name='AvailabilityPeriod_._type' kind='elementOnly'"
- * @generated
- */
-public interface AvailabilityPeriod extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Available From</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The date that the resource becomes available for the specified period.
-	 *                                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Available From</em>' attribute.
-	 * @see #setAvailableFrom(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAvailabilityPeriod_AvailableFrom()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='AvailableFrom' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getAvailableFrom();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.AvailabilityPeriod#getAvailableFrom <em>Available From</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Available From</em>' attribute.
-	 * @see #getAvailableFrom()
-	 * @generated
-	 */
-	void setAvailableFrom(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Available To</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The last date that the resource is available for the specified period.
-	 *                                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Available To</em>' attribute.
-	 * @see #setAvailableTo(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAvailabilityPeriod_AvailableTo()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='AvailableTo' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getAvailableTo();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.AvailabilityPeriod#getAvailableTo <em>Available To</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Available To</em>' attribute.
-	 * @see #getAvailableTo()
-	 * @generated
-	 */
-	void setAvailableTo(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Available Units</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The percentage that the resource is available during the specified period.
-	 *                                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Available Units</em>' attribute.
-	 * @see #isSetAvailableUnits()
-	 * @see #unsetAvailableUnits()
-	 * @see #setAvailableUnits(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAvailabilityPeriod_AvailableUnits()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='AvailableUnits' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getAvailableUnits();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.AvailabilityPeriod#getAvailableUnits <em>Available Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Available Units</em>' attribute.
-	 * @see #isSetAvailableUnits()
-	 * @see #unsetAvailableUnits()
-	 * @see #getAvailableUnits()
-	 * @generated
-	 */
-	void setAvailableUnits(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.AvailabilityPeriod#getAvailableUnits <em>Available Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetAvailableUnits()
-	 * @see #getAvailableUnits()
-	 * @see #setAvailableUnits(float)
-	 * @generated
-	 */
-	void unsetAvailableUnits();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.AvailabilityPeriod#getAvailableUnits <em>Available Units</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Available Units</em>' attribute is set.
-	 * @see #unsetAvailableUnits()
-	 * @see #getAvailableUnits()
-	 * @see #setAvailableUnits(float)
-	 * @generated
-	 */
-	boolean isSetAvailableUnits();
-
-} // AvailabilityPeriod
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/AvailabilityPeriods.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/AvailabilityPeriods.java
deleted file mode 100755
index 6c423db..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/AvailabilityPeriods.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AvailabilityPeriods.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Availability Periods</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.AvailabilityPeriods#getAvailabilityPeriod <em>Availability Period</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getAvailabilityPeriods()
- * @model extendedMetaData="name='AvailabilityPeriods_._type' kind='elementOnly'"
- * @generated
- */
-public interface AvailabilityPeriods extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Availability Period</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.AvailabilityPeriod}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The period the resource is available.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Availability Period</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getAvailabilityPeriods_AvailabilityPeriod()
-	 * @model type="org.eclipse.epf.msproject.AvailabilityPeriod" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='AvailabilityPeriod' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getAvailabilityPeriod();
-
-} // AvailabilityPeriods
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Baseline.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Baseline.java
deleted file mode 100755
index 286de03..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Baseline.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Baseline.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Baseline</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Baseline#getTimephasedData <em>Timephased Data</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline#getNumber <em>Number</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline#isInterim <em>Interim</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline#getFinish <em>Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline#getDuration <em>Duration</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline#getDurationFormat <em>Duration Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline#isEstimatedDuration <em>Estimated Duration</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline#getWork <em>Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline#getCost <em>Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline#getBCWS <em>BCWS</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline#getBCWP <em>BCWP</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline()
- * @model extendedMetaData="name='Baseline_._type' kind='elementOnly'"
- * @generated
- */
-public interface Baseline extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Timephased Data</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.TimephasedDataType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The time phased data block associated with the task baseline.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Timephased Data</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline_TimephasedData()
-	 * @model type="org.eclipse.epf.msproject.TimephasedDataType" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='TimephasedData' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getTimephasedData();
-
-	/**
-	 * Returns the value of the '<em><b>Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique number of the baseline data record.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Number</em>' attribute.
-	 * @see #setNumber(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline_Number()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='Number' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getNumber();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline#getNumber <em>Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Number</em>' attribute.
-	 * @see #getNumber()
-	 * @generated
-	 */
-	void setNumber(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Interim</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether this is an Interim Baseline.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Interim</em>' attribute.
-	 * @see #isSetInterim()
-	 * @see #unsetInterim()
-	 * @see #setInterim(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline_Interim()
-	 * @model default="false" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='Interim' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isInterim();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline#isInterim <em>Interim</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Interim</em>' attribute.
-	 * @see #isSetInterim()
-	 * @see #unsetInterim()
-	 * @see #isInterim()
-	 * @generated
-	 */
-	void setInterim(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Baseline#isInterim <em>Interim</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetInterim()
-	 * @see #isInterim()
-	 * @see #setInterim(boolean)
-	 * @generated
-	 */
-	void unsetInterim();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Baseline#isInterim <em>Interim</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Interim</em>' attribute is set.
-	 * @see #unsetInterim()
-	 * @see #isInterim()
-	 * @see #setInterim(boolean)
-	 * @generated
-	 */
-	boolean isSetInterim();
-
-	/**
-	 * Returns the value of the '<em><b>Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The scheduled start date of the task when the baseline was saved.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Start</em>' attribute.
-	 * @see #setStart(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline_Start()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='Start' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getStart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline#getStart <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start</em>' attribute.
-	 * @see #getStart()
-	 * @generated
-	 */
-	void setStart(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The scheduled finish date of the task when the baseline was saved.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Finish</em>' attribute.
-	 * @see #setFinish(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline_Finish()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='Finish' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getFinish();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline#getFinish <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Finish</em>' attribute.
-	 * @see #getFinish()
-	 * @generated
-	 */
-	void setFinish(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Duration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The scheduled duration of the task when the baseline was saved.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Duration</em>' attribute.
-	 * @see #setDuration(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline_Duration()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='Duration' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getDuration();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline#getDuration <em>Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Duration</em>' attribute.
-	 * @see #getDuration()
-	 * @generated
-	 */
-	void setDuration(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Duration Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The format for expressing the Duration of the Task baseline.  
-	 *                                             Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 20=e%, 
-	 *                                             21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 43=mo?, 44=emo?, 
-	 *                                             51=%?, 52=e%? and 53=null.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Duration Format</em>' attribute.
-	 * @see #setDurationFormat(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline_DurationFormat()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.DurationFormatType1"
-	 *        extendedMetaData="kind='element' name='DurationFormat' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getDurationFormat();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline#getDurationFormat <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Duration Format</em>' attribute.
-	 * @see #getDurationFormat()
-	 * @generated
-	 */
-	void setDurationFormat(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Estimated Duration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the baseline duration of the task was estimated.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Estimated Duration</em>' attribute.
-	 * @see #isSetEstimatedDuration()
-	 * @see #unsetEstimatedDuration()
-	 * @see #setEstimatedDuration(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline_EstimatedDuration()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='EstimatedDuration' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isEstimatedDuration();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline#isEstimatedDuration <em>Estimated Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Estimated Duration</em>' attribute.
-	 * @see #isSetEstimatedDuration()
-	 * @see #unsetEstimatedDuration()
-	 * @see #isEstimatedDuration()
-	 * @generated
-	 */
-	void setEstimatedDuration(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Baseline#isEstimatedDuration <em>Estimated Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetEstimatedDuration()
-	 * @see #isEstimatedDuration()
-	 * @see #setEstimatedDuration(boolean)
-	 * @generated
-	 */
-	void unsetEstimatedDuration();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Baseline#isEstimatedDuration <em>Estimated Duration</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Estimated Duration</em>' attribute is set.
-	 * @see #unsetEstimatedDuration()
-	 * @see #isEstimatedDuration()
-	 * @see #setEstimatedDuration(boolean)
-	 * @generated
-	 */
-	boolean isSetEstimatedDuration();
-
-	/**
-	 * Returns the value of the '<em><b>Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The scheduled work of the task when the baseline was saved.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Work</em>' attribute.
-	 * @see #setWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline_Work()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='Work' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline#getWork <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Work</em>' attribute.
-	 * @see #getWork()
-	 * @generated
-	 */
-	void setWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The projected cost of the task when the baseline was saved.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Cost</em>' attribute.
-	 * @see #setCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline_Cost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='Cost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline#getCost <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cost</em>' attribute.
-	 * @see #getCost()
-	 * @generated
-	 */
-	void setCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>BCWS</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The budgeted cost of work scheduled for the task.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>BCWS</em>' attribute.
-	 * @see #isSetBCWS()
-	 * @see #unsetBCWS()
-	 * @see #setBCWS(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline_BCWS()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='BCWS' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getBCWS();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline#getBCWS <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>BCWS</em>' attribute.
-	 * @see #isSetBCWS()
-	 * @see #unsetBCWS()
-	 * @see #getBCWS()
-	 * @generated
-	 */
-	void setBCWS(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Baseline#getBCWS <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBCWS()
-	 * @see #getBCWS()
-	 * @see #setBCWS(float)
-	 * @generated
-	 */
-	void unsetBCWS();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Baseline#getBCWS <em>BCWS</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>BCWS</em>' attribute is set.
-	 * @see #unsetBCWS()
-	 * @see #getBCWS()
-	 * @see #setBCWS(float)
-	 * @generated
-	 */
-	boolean isSetBCWS();
-
-	/**
-	 * Returns the value of the '<em><b>BCWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The budgeted cost of work performed on the task to-date.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>BCWP</em>' attribute.
-	 * @see #isSetBCWP()
-	 * @see #unsetBCWP()
-	 * @see #setBCWP(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline_BCWP()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='BCWP' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getBCWP();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline#getBCWP <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>BCWP</em>' attribute.
-	 * @see #isSetBCWP()
-	 * @see #unsetBCWP()
-	 * @see #getBCWP()
-	 * @generated
-	 */
-	void setBCWP(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Baseline#getBCWP <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBCWP()
-	 * @see #getBCWP()
-	 * @see #setBCWP(float)
-	 * @generated
-	 */
-	void unsetBCWP();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Baseline#getBCWP <em>BCWP</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>BCWP</em>' attribute is set.
-	 * @see #unsetBCWP()
-	 * @see #getBCWP()
-	 * @see #setBCWP(float)
-	 * @generated
-	 */
-	boolean isSetBCWP();
-
-} // Baseline
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Baseline2.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Baseline2.java
deleted file mode 100755
index da0bdfc..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Baseline2.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Baseline2.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Baseline2</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Baseline2#getNumber <em>Number</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline2#getWork <em>Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline2#getCost <em>Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline2#getBCWS <em>BCWS</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline2#getBCWP <em>BCWP</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline2()
- * @model extendedMetaData="name='Baseline_._1_._type' kind='elementOnly'"
- * @generated
- */
-public interface Baseline2 extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique number of the baseline data record.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Number</em>' attribute.
-	 * @see #setNumber(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline2_Number()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer" required="true"
-	 *        extendedMetaData="kind='element' name='Number' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getNumber();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline2#getNumber <em>Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Number</em>' attribute.
-	 * @see #getNumber()
-	 * @generated
-	 */
-	void setNumber(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The work assigned the resource when the baseline is saved.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Work</em>' attribute.
-	 * @see #setWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline2_Work()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='Work' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline2#getWork <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Work</em>' attribute.
-	 * @see #getWork()
-	 * @generated
-	 */
-	void setWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The projected cost for the resource when the baseline was saved.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Cost</em>' attribute.
-	 * @see #isSetCost()
-	 * @see #unsetCost()
-	 * @see #setCost(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline2_Cost()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='Cost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline2#getCost <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cost</em>' attribute.
-	 * @see #isSetCost()
-	 * @see #unsetCost()
-	 * @see #getCost()
-	 * @generated
-	 */
-	void setCost(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Baseline2#getCost <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetCost()
-	 * @see #getCost()
-	 * @see #setCost(float)
-	 * @generated
-	 */
-	void unsetCost();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Baseline2#getCost <em>Cost</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Cost</em>' attribute is set.
-	 * @see #unsetCost()
-	 * @see #getCost()
-	 * @see #setCost(float)
-	 * @generated
-	 */
-	boolean isSetCost();
-
-	/**
-	 * Returns the value of the '<em><b>BCWS</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The budget cost of work scheduled for the resource.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>BCWS</em>' attribute.
-	 * @see #isSetBCWS()
-	 * @see #unsetBCWS()
-	 * @see #setBCWS(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline2_BCWS()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='BCWS' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getBCWS();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline2#getBCWS <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>BCWS</em>' attribute.
-	 * @see #isSetBCWS()
-	 * @see #unsetBCWS()
-	 * @see #getBCWS()
-	 * @generated
-	 */
-	void setBCWS(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Baseline2#getBCWS <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBCWS()
-	 * @see #getBCWS()
-	 * @see #setBCWS(float)
-	 * @generated
-	 */
-	void unsetBCWS();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Baseline2#getBCWS <em>BCWS</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>BCWS</em>' attribute is set.
-	 * @see #unsetBCWS()
-	 * @see #getBCWS()
-	 * @see #setBCWS(float)
-	 * @generated
-	 */
-	boolean isSetBCWS();
-
-	/**
-	 * Returns the value of the '<em><b>BCWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The budgeted cost of of the work performed by the resource for the project to-date.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>BCWP</em>' attribute.
-	 * @see #isSetBCWP()
-	 * @see #unsetBCWP()
-	 * @see #setBCWP(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline2_BCWP()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='BCWP' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getBCWP();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline2#getBCWP <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>BCWP</em>' attribute.
-	 * @see #isSetBCWP()
-	 * @see #unsetBCWP()
-	 * @see #getBCWP()
-	 * @generated
-	 */
-	void setBCWP(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Baseline2#getBCWP <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBCWP()
-	 * @see #getBCWP()
-	 * @see #setBCWP(float)
-	 * @generated
-	 */
-	void unsetBCWP();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Baseline2#getBCWP <em>BCWP</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>BCWP</em>' attribute is set.
-	 * @see #unsetBCWP()
-	 * @see #getBCWP()
-	 * @see #setBCWP(float)
-	 * @generated
-	 */
-	boolean isSetBCWP();
-
-} // Baseline2
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Baseline3.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Baseline3.java
deleted file mode 100755
index 876bfde..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Baseline3.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Baseline3.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Baseline3</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Baseline3#getTimephasedData <em>Timephased Data</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline3#getNumber <em>Number</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline3#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline3#getFinish <em>Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline3#getWork <em>Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline3#getCost <em>Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline3#getBCWS <em>BCWS</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Baseline3#getBCWP <em>BCWP</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline3()
- * @model extendedMetaData="name='Baseline_._2_._type' kind='elementOnly'"
- * @generated
- */
-public interface Baseline3 extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Timephased Data</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.TimephasedDataType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The time phased data associated with the Baseline.
-	 *                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Timephased Data</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline3_TimephasedData()
-	 * @model type="org.eclipse.epf.msproject.TimephasedDataType" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='TimephasedData' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getTimephasedData();
-
-	/**
-	 * Returns the value of the '<em><b>Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique number of the baseline data record.
-	 *                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Number</em>' attribute.
-	 * @see #setNumber(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline3_Number()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 *        extendedMetaData="kind='element' name='Number' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getNumber();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline3#getNumber <em>Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Number</em>' attribute.
-	 * @see #getNumber()
-	 * @generated
-	 */
-	void setNumber(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The scheduled start date of the assignment when the baseline was saved.
-	 *                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Start</em>' attribute.
-	 * @see #setStart(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline3_Start()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Start' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getStart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline3#getStart <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start</em>' attribute.
-	 * @see #getStart()
-	 * @generated
-	 */
-	void setStart(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The scheduled finish date of the assignment when the baseline was saved.
-	 *                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Finish</em>' attribute.
-	 * @see #setFinish(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline3_Finish()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Finish' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getFinish();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline3#getFinish <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Finish</em>' attribute.
-	 * @see #getFinish()
-	 * @generated
-	 */
-	void setFinish(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The total amount of work scheduled on the assignment when the baseline was saved.
-	 *                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Work</em>' attribute.
-	 * @see #setWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline3_Work()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='Work' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline3#getWork <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Work</em>' attribute.
-	 * @see #getWork()
-	 * @generated
-	 */
-	void setWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The total projected cost of the assignment when the baseline was saved.
-	 *                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Cost</em>' attribute.
-	 * @see #setCost(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline3_Cost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Cost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline3#getCost <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cost</em>' attribute.
-	 * @see #getCost()
-	 * @generated
-	 */
-	void setCost(String value);
-
-	/**
-	 * Returns the value of the '<em><b>BCWS</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The budgeted cost of work on the assignment.
-	 *                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>BCWS</em>' attribute.
-	 * @see #isSetBCWS()
-	 * @see #unsetBCWS()
-	 * @see #setBCWS(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline3_BCWS()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='BCWS' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getBCWS();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline3#getBCWS <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>BCWS</em>' attribute.
-	 * @see #isSetBCWS()
-	 * @see #unsetBCWS()
-	 * @see #getBCWS()
-	 * @generated
-	 */
-	void setBCWS(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Baseline3#getBCWS <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBCWS()
-	 * @see #getBCWS()
-	 * @see #setBCWS(float)
-	 * @generated
-	 */
-	void unsetBCWS();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Baseline3#getBCWS <em>BCWS</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>BCWS</em>' attribute is set.
-	 * @see #unsetBCWS()
-	 * @see #getBCWS()
-	 * @see #setBCWS(float)
-	 * @generated
-	 */
-	boolean isSetBCWS();
-
-	/**
-	 * Returns the value of the '<em><b>BCWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The budgeted cost of work performed on the assignment to-date.
-	 *                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>BCWP</em>' attribute.
-	 * @see #isSetBCWP()
-	 * @see #unsetBCWP()
-	 * @see #setBCWP(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getBaseline3_BCWP()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='BCWP' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getBCWP();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Baseline3#getBCWP <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>BCWP</em>' attribute.
-	 * @see #isSetBCWP()
-	 * @see #unsetBCWP()
-	 * @see #getBCWP()
-	 * @generated
-	 */
-	void setBCWP(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Baseline3#getBCWP <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBCWP()
-	 * @see #getBCWP()
-	 * @see #setBCWP(float)
-	 * @generated
-	 */
-	void unsetBCWP();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Baseline3#getBCWP <em>BCWP</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>BCWP</em>' attribute is set.
-	 * @see #unsetBCWP()
-	 * @see #getBCWP()
-	 * @see #setBCWP(float)
-	 * @generated
-	 */
-	boolean isSetBCWP();
-
-} // Baseline3
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Calendar.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Calendar.java
deleted file mode 100755
index e8a922b..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Calendar.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Calendar.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Calendar</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Calendar#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Calendar#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Calendar#isIsBaseCalendar <em>Is Base Calendar</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Calendar#getBaseCalendarUID <em>Base Calendar UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Calendar#getWeekDays <em>Week Days</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getCalendar()
- * @model extendedMetaData="name='Calendar_._type' kind='elementOnly'"
- * @generated
- */
-public interface Calendar extends EObject {
-	/**
-	 * Returns the value of the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique identifier of the calendar.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>UID</em>' attribute.
-	 * @see #setUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getCalendar_UID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer" required="true"
-	 *        extendedMetaData="kind='element' name='UID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Calendar#getUID <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>UID</em>' attribute.
-	 * @see #getUID()
-	 * @generated
-	 */
-	void setUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The name of the calendar.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getCalendar_Name()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.NameType"
-	 *        extendedMetaData="kind='element' name='Name' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Calendar#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Is Base Calendar</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the calendar is a base calendar.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Base Calendar</em>' attribute.
-	 * @see #isSetIsBaseCalendar()
-	 * @see #unsetIsBaseCalendar()
-	 * @see #setIsBaseCalendar(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getCalendar_IsBaseCalendar()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='IsBaseCalendar' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isIsBaseCalendar();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Calendar#isIsBaseCalendar <em>Is Base Calendar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Base Calendar</em>' attribute.
-	 * @see #isSetIsBaseCalendar()
-	 * @see #unsetIsBaseCalendar()
-	 * @see #isIsBaseCalendar()
-	 * @generated
-	 */
-	void setIsBaseCalendar(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Calendar#isIsBaseCalendar <em>Is Base Calendar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsBaseCalendar()
-	 * @see #isIsBaseCalendar()
-	 * @see #setIsBaseCalendar(boolean)
-	 * @generated
-	 */
-	void unsetIsBaseCalendar();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Calendar#isIsBaseCalendar <em>Is Base Calendar</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Base Calendar</em>' attribute is set.
-	 * @see #unsetIsBaseCalendar()
-	 * @see #isIsBaseCalendar()
-	 * @see #setIsBaseCalendar(boolean)
-	 * @generated
-	 */
-	boolean isSetIsBaseCalendar();
-
-	/**
-	 * Returns the value of the '<em><b>Base Calendar UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique identifier of the base calendar 
-	 *                                 on which this calendar depends. Only applicable if the calendar is 
-	 *                                 not a base calendar.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Base Calendar UID</em>' attribute.
-	 * @see #setBaseCalendarUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getCalendar_BaseCalendarUID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='BaseCalendarUID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getBaseCalendarUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Calendar#getBaseCalendarUID <em>Base Calendar UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Calendar UID</em>' attribute.
-	 * @see #getBaseCalendarUID()
-	 * @generated
-	 */
-	void setBaseCalendarUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Week Days</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The collection of Weekdays that defines this calendar.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Week Days</em>' containment reference.
-	 * @see #setWeekDays(WeekDays)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getCalendar_WeekDays()
-	 * @model containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='WeekDays' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	WeekDays getWeekDays();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Calendar#getWeekDays <em>Week Days</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Week Days</em>' containment reference.
-	 * @see #getWeekDays()
-	 * @generated
-	 */
-	void setWeekDays(WeekDays value);
-
-} // Calendar
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Calendars.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Calendars.java
deleted file mode 100755
index ada8fbb..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Calendars.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Calendars.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Calendars</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Calendars#getCalendar <em>Calendar</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getCalendars()
- * @model extendedMetaData="name='Calendars_._type' kind='elementOnly'"
- * @generated
- */
-public interface Calendars extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Calendar</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.Calendar}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Calendars are used to define standard working and 
-	 *                     non-working times. Projects must have one base calendar. Tasks and resources 
-	 *                     may have their own non-base calendars which are based on a base calendar.
-	 *                     
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Calendar</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getCalendars_Calendar()
-	 * @model type="org.eclipse.epf.msproject.Calendar" containment="true" resolveProxies="false" required="true"
-	 *        extendedMetaData="kind='element' name='Calendar' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getCalendar();
-
-} // Calendars
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/DocumentRoot.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/DocumentRoot.java
deleted file mode 100755
index 12c5df9..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/DocumentRoot.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentRoot.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.DocumentRoot#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.DocumentRoot#getProject <em>Project</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getDocumentRoot()
- * @model extendedMetaData="name='' kind='mixed'"
- * @generated
- */
-public interface DocumentRoot extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mixed</em>' attribute list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getDocumentRoot_Mixed()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='elementWildcard' name=':mixed'"
-	 * @generated
-	 */
-	FeatureMap getMixed();
-
-	/**
-	 * Returns the value of the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XMLNS Prefix Map</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XMLNS Prefix Map</em>' map.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getDocumentRoot_XMLNSPrefixMap()
-	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
-	 *        extendedMetaData="kind='attribute' name='xmlns:prefix'"
-	 * @generated
-	 */
-	EMap getXMLNSPrefixMap();
-
-	/**
-	 * Returns the value of the '<em><b>XSI Schema Location</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XSI Schema Location</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XSI Schema Location</em>' map.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getDocumentRoot_XSISchemaLocation()
-	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
-	 *        extendedMetaData="kind='attribute' name='xsi:schemaLocation'"
-	 * @generated
-	 */
-	EMap getXSISchemaLocation();
-
-	/**
-	 * Returns the value of the '<em><b>Project</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The project is the top level element of the document.
-	 * 			
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Project</em>' containment reference.
-	 * @see #setProject(Project)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getDocumentRoot_Project()
-	 * @model containment="true" resolveProxies="false" upper="-2" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Project' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Project getProject();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.DocumentRoot#getProject <em>Project</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Project</em>' containment reference.
-	 * @see #getProject()
-	 * @generated
-	 */
-	void setProject(Project value);
-
-} // DocumentRoot
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ExtendedAttribute.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ExtendedAttribute.java
deleted file mode 100755
index a5ba5b3..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ExtendedAttribute.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExtendedAttribute.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Extended Attribute</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute#getFieldID <em>Field ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute#getFieldName <em>Field Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute#getAlias <em>Alias</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute#getPhoneticAlias <em>Phonetic Alias</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute#getRollupType <em>Rollup Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute#getCalculationType <em>Calculation Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute#getFormula <em>Formula</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute#isRestrictValues <em>Restrict Values</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute#getValuelistSortOrder <em>Valuelist Sort Order</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute#isAppendNewValues <em>Append New Values</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute#getDefault <em>Default</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute#getValueList <em>Value List</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute()
- * @model extendedMetaData="name='ExtendedAttribute_._type' kind='elementOnly'"
- * @generated
- */
-public interface ExtendedAttribute extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Field ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This corresponds to the PID of the custom field.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field ID</em>' attribute.
-	 * @see #setFieldID(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute_FieldID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='FieldID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getFieldID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#getFieldID <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field ID</em>' attribute.
-	 * @see #getFieldID()
-	 * @generated
-	 */
-	void setFieldID(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Field Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The name of the custom field.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field Name</em>' attribute.
-	 * @see #setFieldName(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute_FieldName()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='FieldName' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getFieldName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#getFieldName <em>Field Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field Name</em>' attribute.
-	 * @see #getFieldName()
-	 * @generated
-	 */
-	void setFieldName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Alias</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The alias of the custom field
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Alias</em>' attribute.
-	 * @see #setAlias(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute_Alias()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.AliasType"
-	 *        extendedMetaData="kind='element' name='Alias' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getAlias();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#getAlias <em>Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Alias</em>' attribute.
-	 * @see #getAlias()
-	 * @generated
-	 */
-	void setAlias(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Phonetic Alias</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The phonetic pronunciation of the alias of the 
-	 *                                 custom field
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Phonetic Alias</em>' attribute.
-	 * @see #setPhoneticAlias(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute_PhoneticAlias()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.PhoneticAliasType"
-	 *        extendedMetaData="kind='element' name='PhoneticAlias' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getPhoneticAlias();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#getPhoneticAlias <em>Phonetic Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Phonetic Alias</em>' attribute.
-	 * @see #getPhoneticAlias()
-	 * @generated
-	 */
-	void setPhoneticAlias(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Rollup Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * How rollups are calculated. Values are: 0=Maximum 
-	 *                                 (OR for flag fields), 1=Minimum (AND for flag fields), 2=Count all, 3=Sum, 
-	 *                                 4=Average, 5=Average First Sublevel, 6=Count First Sublevel, 7=Count 
-	 *                                 Nonsummaries
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Rollup Type</em>' attribute.
-	 * @see #setRollupType(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute_RollupType()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.RollupTypeType"
-	 *        extendedMetaData="kind='element' name='RollupType' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getRollupType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#getRollupType <em>Rollup Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rollup Type</em>' attribute.
-	 * @see #getRollupType()
-	 * @generated
-	 */
-	void setRollupType(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Calculation Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether rollups are calculated for task and group summary rows. 
-	 *                                 Values are: 0=None, 1=Rollup, 2=Calculation
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Calculation Type</em>' attribute.
-	 * @see #setCalculationType(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute_CalculationType()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.CalculationTypeType"
-	 *        extendedMetaData="kind='element' name='CalculationType' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getCalculationType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#getCalculationType <em>Calculation Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Calculation Type</em>' attribute.
-	 * @see #getCalculationType()
-	 * @generated
-	 */
-	void setCalculationType(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Formula</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The formula that Microsoft Project uses to populate the 
-	 *                                 custom task field.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Formula</em>' attribute.
-	 * @see #setFormula(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute_Formula()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Formula' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getFormula();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#getFormula <em>Formula</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Formula</em>' attribute.
-	 * @see #getFormula()
-	 * @generated
-	 */
-	void setFormula(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Restrict Values</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If RestrictValues=True then only values in the list are 
-	 *                                 allowed in the file
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Restrict Values</em>' attribute.
-	 * @see #isSetRestrictValues()
-	 * @see #unsetRestrictValues()
-	 * @see #setRestrictValues(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute_RestrictValues()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='RestrictValues' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isRestrictValues();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#isRestrictValues <em>Restrict Values</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Restrict Values</em>' attribute.
-	 * @see #isSetRestrictValues()
-	 * @see #unsetRestrictValues()
-	 * @see #isRestrictValues()
-	 * @generated
-	 */
-	void setRestrictValues(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#isRestrictValues <em>Restrict Values</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetRestrictValues()
-	 * @see #isRestrictValues()
-	 * @see #setRestrictValues(boolean)
-	 * @generated
-	 */
-	void unsetRestrictValues();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#isRestrictValues <em>Restrict Values</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Restrict Values</em>' attribute is set.
-	 * @see #unsetRestrictValues()
-	 * @see #isRestrictValues()
-	 * @see #setRestrictValues(boolean)
-	 * @generated
-	 */
-	boolean isSetRestrictValues();
-
-	/**
-	 * Returns the value of the '<em><b>Valuelist Sort Order</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * How value lists are sorted. Values are: 
-	 *                                 0=Descending, 1=Ascending
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Valuelist Sort Order</em>' attribute.
-	 * @see #setValuelistSortOrder(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute_ValuelistSortOrder()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.ValuelistSortOrderType"
-	 *        extendedMetaData="kind='element' name='ValuelistSortOrder' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getValuelistSortOrder();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#getValuelistSortOrder <em>Valuelist Sort Order</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Valuelist Sort Order</em>' attribute.
-	 * @see #getValuelistSortOrder()
-	 * @generated
-	 */
-	void setValuelistSortOrder(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Append New Values</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If AppendNewValues=True then any new values added in a project 
-	 *                                 are automatically appended to the list.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Append New Values</em>' attribute.
-	 * @see #isSetAppendNewValues()
-	 * @see #unsetAppendNewValues()
-	 * @see #setAppendNewValues(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute_AppendNewValues()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='AppendNewValues' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isAppendNewValues();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#isAppendNewValues <em>Append New Values</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Append New Values</em>' attribute.
-	 * @see #isSetAppendNewValues()
-	 * @see #unsetAppendNewValues()
-	 * @see #isAppendNewValues()
-	 * @generated
-	 */
-	void setAppendNewValues(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#isAppendNewValues <em>Append New Values</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetAppendNewValues()
-	 * @see #isAppendNewValues()
-	 * @see #setAppendNewValues(boolean)
-	 * @generated
-	 */
-	void unsetAppendNewValues();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#isAppendNewValues <em>Append New Values</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Append New Values</em>' attribute is set.
-	 * @see #unsetAppendNewValues()
-	 * @see #isAppendNewValues()
-	 * @see #setAppendNewValues(boolean)
-	 * @generated
-	 */
-	boolean isSetAppendNewValues();
-
-	/**
-	 * Returns the value of the '<em><b>Default</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This points to the default value in the list. 
-	 *                                 Not present if no default is set.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Default</em>' attribute.
-	 * @see #setDefault(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute_Default()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Default' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getDefault();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#getDefault <em>Default</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default</em>' attribute.
-	 * @see #getDefault()
-	 * @generated
-	 */
-	void setDefault(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value List</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * When values of extended attributes are specified as 
-	 *                                 properties of elements in the schema, they may either be specified by values 
-	 *                                 or by references to the values contained in this list.  Applications may 
-	 *                                 assume ordering of the list by ordering specified here.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value List</em>' containment reference.
-	 * @see #setValueList(ValueList)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute_ValueList()
-	 * @model containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='ValueList' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	ValueList getValueList();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute#getValueList <em>Value List</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value List</em>' containment reference.
-	 * @see #getValueList()
-	 * @generated
-	 */
-	void setValueList(ValueList value);
-
-} // ExtendedAttribute
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ExtendedAttribute2.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ExtendedAttribute2.java
deleted file mode 100755
index f7f8124..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ExtendedAttribute2.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExtendedAttribute2.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Extended Attribute2</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute2#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute2#getFieldID <em>Field ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute2#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute2#getValueID <em>Value ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute2#getDurationFormat <em>Duration Format</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute2()
- * @model extendedMetaData="name='ExtendedAttribute_._1_._type' kind='elementOnly'"
- * @generated
- */
-public interface ExtendedAttribute2 extends EObject {
-	/**
-	 * Returns the value of the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique ID of the value in the extended attribute collection.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>UID</em>' attribute.
-	 * @see #setUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute2_UID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='UID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute2#getUID <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>UID</em>' attribute.
-	 * @see #getUID()
-	 * @generated
-	 */
-	void setUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Field ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The PID of the custom field.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field ID</em>' attribute.
-	 * @see #setFieldID(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute2_FieldID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='FieldID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getFieldID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute2#getFieldID <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field ID</em>' attribute.
-	 * @see #getFieldID()
-	 * @generated
-	 */
-	void setFieldID(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual value of the extended attribute.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute2_Value()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Value' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute2#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The ID of the value in the extended attribut lookup table.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value ID</em>' attribute.
-	 * @see #setValueID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute2_ValueID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='ValueID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getValueID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute2#getValueID <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value ID</em>' attribute.
-	 * @see #getValueID()
-	 * @generated
-	 */
-	void setValueID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Duration Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The format for expressing the bulk duration.  
-	 *                                             Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 
-	 *                                             19=%, 20=e%, 21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 
-	 *                                             42=ew?, 43=mo?, 44=emo?, 51=%?, 52=e%? and 53=null.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Duration Format</em>' attribute.
-	 * @see #setDurationFormat(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute2_DurationFormat()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.DurationFormatType2"
-	 *        extendedMetaData="kind='element' name='DurationFormat' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getDurationFormat();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute2#getDurationFormat <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Duration Format</em>' attribute.
-	 * @see #getDurationFormat()
-	 * @generated
-	 */
-	void setDurationFormat(BigInteger value);
-
-} // ExtendedAttribute2
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ExtendedAttribute3.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ExtendedAttribute3.java
deleted file mode 100755
index e0b0107..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ExtendedAttribute3.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExtendedAttribute3.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Extended Attribute3</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute3#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute3#getFieldID <em>Field ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute3#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute3#getValueID <em>Value ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute3#getDurationFormat <em>Duration Format</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute3()
- * @model extendedMetaData="name='ExtendedAttribute_._2_._type' kind='elementOnly'"
- * @generated
- */
-public interface ExtendedAttribute3 extends EObject {
-	/**
-	 * Returns the value of the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique ID of the value in the extended attribute collection.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>UID</em>' attribute.
-	 * @see #setUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute3_UID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='UID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute3#getUID <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>UID</em>' attribute.
-	 * @see #getUID()
-	 * @generated
-	 */
-	void setUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Field ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The PID of the custom field.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field ID</em>' attribute.
-	 * @see #setFieldID(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute3_FieldID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='FieldID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getFieldID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute3#getFieldID <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field ID</em>' attribute.
-	 * @see #getFieldID()
-	 * @generated
-	 */
-	void setFieldID(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual value of the extended attribute.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute3_Value()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Value' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute3#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The ID of the value in the extended attribut lookup table.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value ID</em>' attribute.
-	 * @see #setValueID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute3_ValueID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='ValueID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getValueID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute3#getValueID <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value ID</em>' attribute.
-	 * @see #getValueID()
-	 * @generated
-	 */
-	void setValueID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Duration Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The format for expressing the bulk duration.  
-	 *                                             Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 
-	 *                                             20=e%, 21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 
-	 *                                             43=mo?, 44=emo?, 51=%?, 52=e%? and 53=null.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Duration Format</em>' attribute.
-	 * @see #setDurationFormat(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute3_DurationFormat()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.DurationFormatType3"
-	 *        extendedMetaData="kind='element' name='DurationFormat' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getDurationFormat();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute3#getDurationFormat <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Duration Format</em>' attribute.
-	 * @see #getDurationFormat()
-	 * @generated
-	 */
-	void setDurationFormat(BigInteger value);
-
-} // ExtendedAttribute3
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ExtendedAttribute4.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ExtendedAttribute4.java
deleted file mode 100755
index 144240a..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ExtendedAttribute4.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExtendedAttribute4.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Extended Attribute4</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute4#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute4#getFieldID <em>Field ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute4#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute4#getValueID <em>Value ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttribute4#getDurationFormat <em>Duration Format</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute4()
- * @model extendedMetaData="name='ExtendedAttribute_._3_._type' kind='elementOnly'"
- * @generated
- */
-public interface ExtendedAttribute4 extends EObject {
-	/**
-	 * Returns the value of the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique ID of the value in the extended attribute collection.
-	 *                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>UID</em>' attribute.
-	 * @see #setUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute4_UID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='UID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute4#getUID <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>UID</em>' attribute.
-	 * @see #getUID()
-	 * @generated
-	 */
-	void setUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Field ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The field ID in the localised language.
-	 *                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field ID</em>' attribute.
-	 * @see #setFieldID(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute4_FieldID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='FieldID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getFieldID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute4#getFieldID <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field ID</em>' attribute.
-	 * @see #getFieldID()
-	 * @generated
-	 */
-	void setFieldID(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual value of the extended attribute.
-	 *                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute4_Value()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Value' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute4#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The ID of the value in the extended attribut lookup table.
-	 *                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value ID</em>' attribute.
-	 * @see #setValueID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute4_ValueID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='ValueID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getValueID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute4#getValueID <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value ID</em>' attribute.
-	 * @see #getValueID()
-	 * @generated
-	 */
-	void setValueID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Duration Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The format for expressing the bulk duration.  
-	 *                                         Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 20=e%, 
-	 *                                         21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 43=mo?, 44=emo?, 
-	 *                                         51=%?, 52=e%? and 53=null.
-	 *                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Duration Format</em>' attribute.
-	 * @see #setDurationFormat(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttribute4_DurationFormat()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.DurationFormatType"
-	 *        extendedMetaData="kind='element' name='DurationFormat' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getDurationFormat();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.ExtendedAttribute4#getDurationFormat <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Duration Format</em>' attribute.
-	 * @see #getDurationFormat()
-	 * @generated
-	 */
-	void setDurationFormat(BigInteger value);
-
-} // ExtendedAttribute4
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ExtendedAttributes.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ExtendedAttributes.java
deleted file mode 100755
index 5e63adc..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ExtendedAttributes.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExtendedAttributes.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Extended Attributes</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.ExtendedAttributes#getExtendedAttribute <em>Extended Attribute</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttributes()
- * @model extendedMetaData="name='ExtendedAttributes_._type' kind='elementOnly'"
- * @generated
- */
-public interface ExtendedAttributes extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Extended Attribute</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.ExtendedAttribute}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Each of the individual entries in the extended attributes definition 
-	 *                     collection.  There are no limits to the number of children that may appear, but project 
-	 *                     will only understand Flag1-Flag10, etc.  This must appear once in each ExtendedAttributes 
-	 *                     collection.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Extended Attribute</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getExtendedAttributes_ExtendedAttribute()
-	 * @model type="org.eclipse.epf.msproject.ExtendedAttribute" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='ExtendedAttribute' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getExtendedAttribute();
-
-} // ExtendedAttributes
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Mask.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Mask.java
deleted file mode 100755
index be02e26..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Mask.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Mask.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Mask</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Mask#getLevel <em>Level</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Mask#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Mask#getLength <em>Length</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Mask#getSeparator <em>Separator</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getMask()
- * @model extendedMetaData="name='Mask_._type' kind='elementOnly'"
- * @generated
- */
-public interface Mask extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Level</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The level of the mask.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Level</em>' attribute.
-	 * @see #setLevel(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getMask_Level()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='Level' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getLevel();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Mask#getLevel <em>Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Level</em>' attribute.
-	 * @see #getLevel()
-	 * @generated
-	 */
-	void setLevel(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The type of mask. Values are: 0=Numbers, 1=Upper Case Letters, 2=Lower Case Letters, 3=Characters
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getMask_Type()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.TypeType5"
-	 *        extendedMetaData="kind='element' name='Type' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Mask#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The maximum length in characters of the outline code values.  If length is any, the value is zero.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Length</em>' attribute.
-	 * @see #setLength(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getMask_Length()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='Length' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getLength();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Mask#getLength <em>Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Length</em>' attribute.
-	 * @see #getLength()
-	 * @generated
-	 */
-	void setLength(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Separator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The separator value of the code values.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Separator</em>' attribute.
-	 * @see #setSeparator(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getMask_Separator()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Separator' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getSeparator();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Mask#getSeparator <em>Separator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Separator</em>' attribute.
-	 * @see #getSeparator()
-	 * @generated
-	 */
-	void setSeparator(String value);
-
-} // Mask
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Masks.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Masks.java
deleted file mode 100755
index 244e455..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Masks.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Masks.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Masks</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Masks#getMask <em>Mask</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getMasks()
- * @model extendedMetaData="name='Masks_._type' kind='elementOnly'"
- * @generated
- */
-public interface Masks extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Mask</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.Mask}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The four elements of the mask constitute the format in which the outline code must appear.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Mask</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getMasks_Mask()
-	 * @model type="org.eclipse.epf.msproject.Mask" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='Mask' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getMask();
-
-} // Masks
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/MsprojectFactory.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/MsprojectFactory.java
deleted file mode 100755
index 7c9eed9..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/MsprojectFactory.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MsprojectFactory.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.msproject.MsprojectPackage
- * @generated
- */
-public interface MsprojectFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	MsprojectFactory eINSTANCE = new org.eclipse.epf.msproject.impl.MsprojectFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Assignment</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Assignment</em>'.
-	 * @generated
-	 */
-	Assignment createAssignment();
-
-	/**
-	 * Returns a new object of class '<em>Assignments</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Assignments</em>'.
-	 * @generated
-	 */
-	Assignments createAssignments();
-
-	/**
-	 * Returns a new object of class '<em>Availability Period</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Availability Period</em>'.
-	 * @generated
-	 */
-	AvailabilityPeriod createAvailabilityPeriod();
-
-	/**
-	 * Returns a new object of class '<em>Availability Periods</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Availability Periods</em>'.
-	 * @generated
-	 */
-	AvailabilityPeriods createAvailabilityPeriods();
-
-	/**
-	 * Returns a new object of class '<em>Baseline</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Baseline</em>'.
-	 * @generated
-	 */
-	Baseline createBaseline();
-
-	/**
-	 * Returns a new object of class '<em>Baseline2</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Baseline2</em>'.
-	 * @generated
-	 */
-	Baseline2 createBaseline2();
-
-	/**
-	 * Returns a new object of class '<em>Baseline3</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Baseline3</em>'.
-	 * @generated
-	 */
-	Baseline3 createBaseline3();
-
-	/**
-	 * Returns a new object of class '<em>Calendar</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Calendar</em>'.
-	 * @generated
-	 */
-	Calendar createCalendar();
-
-	/**
-	 * Returns a new object of class '<em>Calendars</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Calendars</em>'.
-	 * @generated
-	 */
-	Calendars createCalendars();
-
-	/**
-	 * Returns a new object of class '<em>Document Root</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Document Root</em>'.
-	 * @generated
-	 */
-	DocumentRoot createDocumentRoot();
-
-	/**
-	 * Returns a new object of class '<em>Extended Attribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Extended Attribute</em>'.
-	 * @generated
-	 */
-	ExtendedAttribute createExtendedAttribute();
-
-	/**
-	 * Returns a new object of class '<em>Extended Attribute2</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Extended Attribute2</em>'.
-	 * @generated
-	 */
-	ExtendedAttribute2 createExtendedAttribute2();
-
-	/**
-	 * Returns a new object of class '<em>Extended Attribute3</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Extended Attribute3</em>'.
-	 * @generated
-	 */
-	ExtendedAttribute3 createExtendedAttribute3();
-
-	/**
-	 * Returns a new object of class '<em>Extended Attribute4</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Extended Attribute4</em>'.
-	 * @generated
-	 */
-	ExtendedAttribute4 createExtendedAttribute4();
-
-	/**
-	 * Returns a new object of class '<em>Extended Attributes</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Extended Attributes</em>'.
-	 * @generated
-	 */
-	ExtendedAttributes createExtendedAttributes();
-
-	/**
-	 * Returns a new object of class '<em>Mask</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Mask</em>'.
-	 * @generated
-	 */
-	Mask createMask();
-
-	/**
-	 * Returns a new object of class '<em>Masks</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Masks</em>'.
-	 * @generated
-	 */
-	Masks createMasks();
-
-	/**
-	 * Returns a new object of class '<em>Outline Code</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Outline Code</em>'.
-	 * @generated
-	 */
-	OutlineCode createOutlineCode();
-
-	/**
-	 * Returns a new object of class '<em>Outline Code2</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Outline Code2</em>'.
-	 * @generated
-	 */
-	OutlineCode2 createOutlineCode2();
-
-	/**
-	 * Returns a new object of class '<em>Outline Code3</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Outline Code3</em>'.
-	 * @generated
-	 */
-	OutlineCode3 createOutlineCode3();
-
-	/**
-	 * Returns a new object of class '<em>Outline Codes</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Outline Codes</em>'.
-	 * @generated
-	 */
-	OutlineCodes createOutlineCodes();
-
-	/**
-	 * Returns a new object of class '<em>Predecessor Link</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Predecessor Link</em>'.
-	 * @generated
-	 */
-	PredecessorLink createPredecessorLink();
-
-	/**
-	 * Returns a new object of class '<em>Project</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Project</em>'.
-	 * @generated
-	 */
-	Project createProject();
-
-	/**
-	 * Returns a new object of class '<em>Rate</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Rate</em>'.
-	 * @generated
-	 */
-	Rate createRate();
-
-	/**
-	 * Returns a new object of class '<em>Rates</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Rates</em>'.
-	 * @generated
-	 */
-	Rates createRates();
-
-	/**
-	 * Returns a new object of class '<em>Resource</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Resource</em>'.
-	 * @generated
-	 */
-	Resource createResource();
-
-	/**
-	 * Returns a new object of class '<em>Resources</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Resources</em>'.
-	 * @generated
-	 */
-	Resources createResources();
-
-	/**
-	 * Returns a new object of class '<em>Task</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Task</em>'.
-	 * @generated
-	 */
-	Task createTask();
-
-	/**
-	 * Returns a new object of class '<em>Tasks</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tasks</em>'.
-	 * @generated
-	 */
-	Tasks createTasks();
-
-	/**
-	 * Returns a new object of class '<em>Time Period</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Time Period</em>'.
-	 * @generated
-	 */
-	TimePeriod createTimePeriod();
-
-	/**
-	 * Returns a new object of class '<em>Timephased Data Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Timephased Data Type</em>'.
-	 * @generated
-	 */
-	TimephasedDataType createTimephasedDataType();
-
-	/**
-	 * Returns a new object of class '<em>Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Value</em>'.
-	 * @generated
-	 */
-	Value createValue();
-
-	/**
-	 * Returns a new object of class '<em>Value2</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Value2</em>'.
-	 * @generated
-	 */
-	Value2 createValue2();
-
-	/**
-	 * Returns a new object of class '<em>Value List</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Value List</em>'.
-	 * @generated
-	 */
-	ValueList createValueList();
-
-	/**
-	 * Returns a new object of class '<em>Values</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Values</em>'.
-	 * @generated
-	 */
-	Values createValues();
-
-	/**
-	 * Returns a new object of class '<em>WBS Mask</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>WBS Mask</em>'.
-	 * @generated
-	 */
-	WBSMask createWBSMask();
-
-	/**
-	 * Returns a new object of class '<em>WBS Masks</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>WBS Masks</em>'.
-	 * @generated
-	 */
-	WBSMasks createWBSMasks();
-
-	/**
-	 * Returns a new object of class '<em>Week Day</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Week Day</em>'.
-	 * @generated
-	 */
-	WeekDay createWeekDay();
-
-	/**
-	 * Returns a new object of class '<em>Week Days</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Week Days</em>'.
-	 * @generated
-	 */
-	WeekDays createWeekDays();
-
-	/**
-	 * Returns a new object of class '<em>Working Time</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Working Time</em>'.
-	 * @generated
-	 */
-	WorkingTime createWorkingTime();
-
-	/**
-	 * Returns a new object of class '<em>Working Times</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Working Times</em>'.
-	 * @generated
-	 */
-	WorkingTimes createWorkingTimes();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	MsprojectPackage getMsprojectPackage();
-
-} //MsprojectFactory
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/MsprojectPackage.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/MsprojectPackage.java
deleted file mode 100755
index 8856767..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/MsprojectPackage.java
+++ /dev/null
@@ -1,11546 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MsprojectPackage.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The full project schema definition from the project level down, 
- * 		starting with data type definitions.
- * <!-- end-model-doc -->
- * @see org.eclipse.epf.msproject.MsprojectFactory
- * @model kind="package"
- * @generated
- */
-public interface MsprojectPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "msproject";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://epf.eclipse.org/msproject";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "msproject";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	MsprojectPackage eINSTANCE = org.eclipse.epf.msproject.impl.MsprojectPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.AssignmentImpl <em>Assignment</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.AssignmentImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getAssignment()
-	 * @generated
-	 */
-	int ASSIGNMENT = 0;
-
-	/**
-	 * The feature id for the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__UID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Task UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__TASK_UID = 1;
-
-	/**
-	 * The feature id for the '<em><b>Resource UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__RESOURCE_UID = 2;
-
-	/**
-	 * The feature id for the '<em><b>Percent Work Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__PERCENT_WORK_COMPLETE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Actual Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__ACTUAL_COST = 4;
-
-	/**
-	 * The feature id for the '<em><b>Actual Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__ACTUAL_FINISH = 5;
-
-	/**
-	 * The feature id for the '<em><b>Actual Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__ACTUAL_OVERTIME_COST = 6;
-
-	/**
-	 * The feature id for the '<em><b>Actual Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__ACTUAL_OVERTIME_WORK = 7;
-
-	/**
-	 * The feature id for the '<em><b>Actual Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__ACTUAL_START = 8;
-
-	/**
-	 * The feature id for the '<em><b>Actual Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__ACTUAL_WORK = 9;
-
-	/**
-	 * The feature id for the '<em><b>ACWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__ACWP = 10;
-
-	/**
-	 * The feature id for the '<em><b>Confirmed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__CONFIRMED = 11;
-
-	/**
-	 * The feature id for the '<em><b>Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__COST = 12;
-
-	/**
-	 * The feature id for the '<em><b>Cost Rate Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__COST_RATE_TABLE = 13;
-
-	/**
-	 * The feature id for the '<em><b>Cost Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__COST_VARIANCE = 14;
-
-	/**
-	 * The feature id for the '<em><b>CV</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__CV = 15;
-
-	/**
-	 * The feature id for the '<em><b>Delay</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__DELAY = 16;
-
-	/**
-	 * The feature id for the '<em><b>Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__FINISH = 17;
-
-	/**
-	 * The feature id for the '<em><b>Finish Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__FINISH_VARIANCE = 18;
-
-	/**
-	 * The feature id for the '<em><b>Hyperlink</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__HYPERLINK = 19;
-
-	/**
-	 * The feature id for the '<em><b>Hyperlink Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__HYPERLINK_ADDRESS = 20;
-
-	/**
-	 * The feature id for the '<em><b>Hyperlink Sub Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__HYPERLINK_SUB_ADDRESS = 21;
-
-	/**
-	 * The feature id for the '<em><b>Work Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__WORK_VARIANCE = 22;
-
-	/**
-	 * The feature id for the '<em><b>Has Fixed Rate Units</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__HAS_FIXED_RATE_UNITS = 23;
-
-	/**
-	 * The feature id for the '<em><b>Fixed Material</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__FIXED_MATERIAL = 24;
-
-	/**
-	 * The feature id for the '<em><b>Leveling Delay</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__LEVELING_DELAY = 25;
-
-	/**
-	 * The feature id for the '<em><b>Leveling Delay Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__LEVELING_DELAY_FORMAT = 26;
-
-	/**
-	 * The feature id for the '<em><b>Linked Fields</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__LINKED_FIELDS = 27;
-
-	/**
-	 * The feature id for the '<em><b>Milestone</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__MILESTONE = 28;
-
-	/**
-	 * The feature id for the '<em><b>Notes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__NOTES = 29;
-
-	/**
-	 * The feature id for the '<em><b>Overallocated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__OVERALLOCATED = 30;
-
-	/**
-	 * The feature id for the '<em><b>Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__OVERTIME_COST = 31;
-
-	/**
-	 * The feature id for the '<em><b>Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__OVERTIME_WORK = 32;
-
-	/**
-	 * The feature id for the '<em><b>Regular Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__REGULAR_WORK = 33;
-
-	/**
-	 * The feature id for the '<em><b>Remaining Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__REMAINING_COST = 34;
-
-	/**
-	 * The feature id for the '<em><b>Remaining Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__REMAINING_OVERTIME_COST = 35;
-
-	/**
-	 * The feature id for the '<em><b>Remaining Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__REMAINING_OVERTIME_WORK = 36;
-
-	/**
-	 * The feature id for the '<em><b>Remaining Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__REMAINING_WORK = 37;
-
-	/**
-	 * The feature id for the '<em><b>Response Pending</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__RESPONSE_PENDING = 38;
-
-	/**
-	 * The feature id for the '<em><b>Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__START = 39;
-
-	/**
-	 * The feature id for the '<em><b>Stop</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__STOP = 40;
-
-	/**
-	 * The feature id for the '<em><b>Resume</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__RESUME = 41;
-
-	/**
-	 * The feature id for the '<em><b>Start Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__START_VARIANCE = 42;
-
-	/**
-	 * The feature id for the '<em><b>Units</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__UNITS = 43;
-
-	/**
-	 * The feature id for the '<em><b>Update Needed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__UPDATE_NEEDED = 44;
-
-	/**
-	 * The feature id for the '<em><b>VAC</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__VAC = 45;
-
-	/**
-	 * The feature id for the '<em><b>Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__WORK = 46;
-
-	/**
-	 * The feature id for the '<em><b>Work Contour</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__WORK_CONTOUR = 47;
-
-	/**
-	 * The feature id for the '<em><b>BCWS</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__BCWS = 48;
-
-	/**
-	 * The feature id for the '<em><b>BCWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__BCWP = 49;
-
-	/**
-	 * The feature id for the '<em><b>Booking Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__BOOKING_TYPE = 50;
-
-	/**
-	 * The feature id for the '<em><b>Actual Work Protected</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__ACTUAL_WORK_PROTECTED = 51;
-
-	/**
-	 * The feature id for the '<em><b>Actual Overtime Work Protected</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__ACTUAL_OVERTIME_WORK_PROTECTED = 52;
-
-	/**
-	 * The feature id for the '<em><b>Creation Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__CREATION_DATE = 53;
-
-	/**
-	 * The feature id for the '<em><b>Extended Attribute</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__EXTENDED_ATTRIBUTE = 54;
-
-	/**
-	 * The feature id for the '<em><b>Baseline</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__BASELINE = 55;
-
-	/**
-	 * The feature id for the '<em><b>Timephased Data</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT__TIMEPHASED_DATA = 56;
-
-	/**
-	 * The number of structural features of the the '<em>Assignment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENT_FEATURE_COUNT = 57;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.AssignmentsImpl <em>Assignments</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.AssignmentsImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getAssignments()
-	 * @generated
-	 */
-	int ASSIGNMENTS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Assignment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENTS__ASSIGNMENT = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Assignments</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSIGNMENTS_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.AvailabilityPeriodImpl <em>Availability Period</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.AvailabilityPeriodImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getAvailabilityPeriod()
-	 * @generated
-	 */
-	int AVAILABILITY_PERIOD = 2;
-
-	/**
-	 * The feature id for the '<em><b>Available From</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AVAILABILITY_PERIOD__AVAILABLE_FROM = 0;
-
-	/**
-	 * The feature id for the '<em><b>Available To</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AVAILABILITY_PERIOD__AVAILABLE_TO = 1;
-
-	/**
-	 * The feature id for the '<em><b>Available Units</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AVAILABILITY_PERIOD__AVAILABLE_UNITS = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Availability Period</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AVAILABILITY_PERIOD_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.AvailabilityPeriodsImpl <em>Availability Periods</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.AvailabilityPeriodsImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getAvailabilityPeriods()
-	 * @generated
-	 */
-	int AVAILABILITY_PERIODS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Availability Period</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AVAILABILITY_PERIODS__AVAILABILITY_PERIOD = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Availability Periods</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AVAILABILITY_PERIODS_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.BaselineImpl <em>Baseline</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.BaselineImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getBaseline()
-	 * @generated
-	 */
-	int BASELINE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Timephased Data</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE__TIMEPHASED_DATA = 0;
-
-	/**
-	 * The feature id for the '<em><b>Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE__NUMBER = 1;
-
-	/**
-	 * The feature id for the '<em><b>Interim</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE__INTERIM = 2;
-
-	/**
-	 * The feature id for the '<em><b>Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE__START = 3;
-
-	/**
-	 * The feature id for the '<em><b>Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE__FINISH = 4;
-
-	/**
-	 * The feature id for the '<em><b>Duration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE__DURATION = 5;
-
-	/**
-	 * The feature id for the '<em><b>Duration Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE__DURATION_FORMAT = 6;
-
-	/**
-	 * The feature id for the '<em><b>Estimated Duration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE__ESTIMATED_DURATION = 7;
-
-	/**
-	 * The feature id for the '<em><b>Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE__WORK = 8;
-
-	/**
-	 * The feature id for the '<em><b>Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE__COST = 9;
-
-	/**
-	 * The feature id for the '<em><b>BCWS</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE__BCWS = 10;
-
-	/**
-	 * The feature id for the '<em><b>BCWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE__BCWP = 11;
-
-	/**
-	 * The number of structural features of the the '<em>Baseline</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE_FEATURE_COUNT = 12;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.Baseline2Impl <em>Baseline2</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.Baseline2Impl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getBaseline2()
-	 * @generated
-	 */
-	int BASELINE2 = 5;
-
-	/**
-	 * The feature id for the '<em><b>Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE2__NUMBER = 0;
-
-	/**
-	 * The feature id for the '<em><b>Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE2__WORK = 1;
-
-	/**
-	 * The feature id for the '<em><b>Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE2__COST = 2;
-
-	/**
-	 * The feature id for the '<em><b>BCWS</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE2__BCWS = 3;
-
-	/**
-	 * The feature id for the '<em><b>BCWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE2__BCWP = 4;
-
-	/**
-	 * The number of structural features of the the '<em>Baseline2</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE2_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.Baseline3Impl <em>Baseline3</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.Baseline3Impl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getBaseline3()
-	 * @generated
-	 */
-	int BASELINE3 = 6;
-
-	/**
-	 * The feature id for the '<em><b>Timephased Data</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE3__TIMEPHASED_DATA = 0;
-
-	/**
-	 * The feature id for the '<em><b>Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE3__NUMBER = 1;
-
-	/**
-	 * The feature id for the '<em><b>Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE3__START = 2;
-
-	/**
-	 * The feature id for the '<em><b>Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE3__FINISH = 3;
-
-	/**
-	 * The feature id for the '<em><b>Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE3__WORK = 4;
-
-	/**
-	 * The feature id for the '<em><b>Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE3__COST = 5;
-
-	/**
-	 * The feature id for the '<em><b>BCWS</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE3__BCWS = 6;
-
-	/**
-	 * The feature id for the '<em><b>BCWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE3__BCWP = 7;
-
-	/**
-	 * The number of structural features of the the '<em>Baseline3</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASELINE3_FEATURE_COUNT = 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.CalendarImpl <em>Calendar</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.CalendarImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getCalendar()
-	 * @generated
-	 */
-	int CALENDAR = 7;
-
-	/**
-	 * The feature id for the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALENDAR__UID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALENDAR__NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Is Base Calendar</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALENDAR__IS_BASE_CALENDAR = 2;
-
-	/**
-	 * The feature id for the '<em><b>Base Calendar UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALENDAR__BASE_CALENDAR_UID = 3;
-
-	/**
-	 * The feature id for the '<em><b>Week Days</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALENDAR__WEEK_DAYS = 4;
-
-	/**
-	 * The number of structural features of the the '<em>Calendar</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALENDAR_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.CalendarsImpl <em>Calendars</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.CalendarsImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getCalendars()
-	 * @generated
-	 */
-	int CALENDARS = 8;
-
-	/**
-	 * The feature id for the '<em><b>Calendar</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALENDARS__CALENDAR = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Calendars</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALENDARS_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.DocumentRootImpl <em>Document Root</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.DocumentRootImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getDocumentRoot()
-	 * @generated
-	 */
-	int DOCUMENT_ROOT = 9;
-
-	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__MIXED = 0;
-
-	/**
-	 * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
-
-	/**
-	 * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Project</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__PROJECT = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Document Root</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.ExtendedAttributeImpl <em>Extended Attribute</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.ExtendedAttributeImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getExtendedAttribute()
-	 * @generated
-	 */
-	int EXTENDED_ATTRIBUTE = 10;
-
-	/**
-	 * The feature id for the '<em><b>Field ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE__FIELD_ID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Field Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE__FIELD_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Alias</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE__ALIAS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Phonetic Alias</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE__PHONETIC_ALIAS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Rollup Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE__ROLLUP_TYPE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Calculation Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE__CALCULATION_TYPE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Formula</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE__FORMULA = 6;
-
-	/**
-	 * The feature id for the '<em><b>Restrict Values</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE__RESTRICT_VALUES = 7;
-
-	/**
-	 * The feature id for the '<em><b>Valuelist Sort Order</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE__VALUELIST_SORT_ORDER = 8;
-
-	/**
-	 * The feature id for the '<em><b>Append New Values</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE__APPEND_NEW_VALUES = 9;
-
-	/**
-	 * The feature id for the '<em><b>Default</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE__DEFAULT = 10;
-
-	/**
-	 * The feature id for the '<em><b>Value List</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE__VALUE_LIST = 11;
-
-	/**
-	 * The number of structural features of the the '<em>Extended Attribute</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE_FEATURE_COUNT = 12;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.ExtendedAttribute2Impl <em>Extended Attribute2</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.ExtendedAttribute2Impl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getExtendedAttribute2()
-	 * @generated
-	 */
-	int EXTENDED_ATTRIBUTE2 = 11;
-
-	/**
-	 * The feature id for the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE2__UID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Field ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE2__FIELD_ID = 1;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE2__VALUE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Value ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE2__VALUE_ID = 3;
-
-	/**
-	 * The feature id for the '<em><b>Duration Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE2__DURATION_FORMAT = 4;
-
-	/**
-	 * The number of structural features of the the '<em>Extended Attribute2</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE2_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.ExtendedAttribute3Impl <em>Extended Attribute3</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.ExtendedAttribute3Impl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getExtendedAttribute3()
-	 * @generated
-	 */
-	int EXTENDED_ATTRIBUTE3 = 12;
-
-	/**
-	 * The feature id for the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE3__UID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Field ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE3__FIELD_ID = 1;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE3__VALUE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Value ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE3__VALUE_ID = 3;
-
-	/**
-	 * The feature id for the '<em><b>Duration Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE3__DURATION_FORMAT = 4;
-
-	/**
-	 * The number of structural features of the the '<em>Extended Attribute3</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE3_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.ExtendedAttribute4Impl <em>Extended Attribute4</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.ExtendedAttribute4Impl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getExtendedAttribute4()
-	 * @generated
-	 */
-	int EXTENDED_ATTRIBUTE4 = 13;
-
-	/**
-	 * The feature id for the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE4__UID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Field ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE4__FIELD_ID = 1;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE4__VALUE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Value ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE4__VALUE_ID = 3;
-
-	/**
-	 * The feature id for the '<em><b>Duration Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE4__DURATION_FORMAT = 4;
-
-	/**
-	 * The number of structural features of the the '<em>Extended Attribute4</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTE4_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.ExtendedAttributesImpl <em>Extended Attributes</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.ExtendedAttributesImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getExtendedAttributes()
-	 * @generated
-	 */
-	int EXTENDED_ATTRIBUTES = 14;
-
-	/**
-	 * The feature id for the '<em><b>Extended Attribute</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTES__EXTENDED_ATTRIBUTE = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Extended Attributes</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ATTRIBUTES_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.MaskImpl <em>Mask</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.MaskImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getMask()
-	 * @generated
-	 */
-	int MASK = 15;
-
-	/**
-	 * The feature id for the '<em><b>Level</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MASK__LEVEL = 0;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MASK__TYPE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MASK__LENGTH = 2;
-
-	/**
-	 * The feature id for the '<em><b>Separator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MASK__SEPARATOR = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Mask</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MASK_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.MasksImpl <em>Masks</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.MasksImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getMasks()
-	 * @generated
-	 */
-	int MASKS = 16;
-
-	/**
-	 * The feature id for the '<em><b>Mask</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MASKS__MASK = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Masks</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MASKS_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.OutlineCodeImpl <em>Outline Code</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.OutlineCodeImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getOutlineCode()
-	 * @generated
-	 */
-	int OUTLINE_CODE = 17;
-
-	/**
-	 * The feature id for the '<em><b>Field ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE__FIELD_ID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Field Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE__FIELD_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Alias</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE__ALIAS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Phonetic Alias</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE__PHONETIC_ALIAS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Values</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE__VALUES = 4;
-
-	/**
-	 * The feature id for the '<em><b>Enterprise</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE__ENTERPRISE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Enterprise Outline Code Alias</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE__ENTERPRISE_OUTLINE_CODE_ALIAS = 6;
-
-	/**
-	 * The feature id for the '<em><b>Resource Substitution Enabled</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE__RESOURCE_SUBSTITUTION_ENABLED = 7;
-
-	/**
-	 * The feature id for the '<em><b>Leaf Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE__LEAF_ONLY = 8;
-
-	/**
-	 * The feature id for the '<em><b>All Levels Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE__ALL_LEVELS_REQUIRED = 9;
-
-	/**
-	 * The feature id for the '<em><b>Only Table Values Allowed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE__ONLY_TABLE_VALUES_ALLOWED = 10;
-
-	/**
-	 * The feature id for the '<em><b>Masks</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE__MASKS = 11;
-
-	/**
-	 * The number of structural features of the the '<em>Outline Code</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE_FEATURE_COUNT = 12;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.OutlineCode2Impl <em>Outline Code2</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.OutlineCode2Impl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getOutlineCode2()
-	 * @generated
-	 */
-	int OUTLINE_CODE2 = 18;
-
-	/**
-	 * The feature id for the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE2__UID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Field ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE2__FIELD_ID = 1;
-
-	/**
-	 * The feature id for the '<em><b>Value ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE2__VALUE_ID = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Outline Code2</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE2_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.OutlineCode3Impl <em>Outline Code3</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.OutlineCode3Impl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getOutlineCode3()
-	 * @generated
-	 */
-	int OUTLINE_CODE3 = 19;
-
-	/**
-	 * The feature id for the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE3__UID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Field ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE3__FIELD_ID = 1;
-
-	/**
-	 * The feature id for the '<em><b>Value ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE3__VALUE_ID = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Outline Code3</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODE3_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.OutlineCodesImpl <em>Outline Codes</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.OutlineCodesImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getOutlineCodes()
-	 * @generated
-	 */
-	int OUTLINE_CODES = 20;
-
-	/**
-	 * The feature id for the '<em><b>Outline Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODES__OUTLINE_CODE = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Outline Codes</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTLINE_CODES_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.PredecessorLinkImpl <em>Predecessor Link</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.PredecessorLinkImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getPredecessorLink()
-	 * @generated
-	 */
-	int PREDECESSOR_LINK = 21;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDECESSOR_LINK__PREDECESSOR_UID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDECESSOR_LINK__TYPE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Cross Project</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDECESSOR_LINK__CROSS_PROJECT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Cross Project Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDECESSOR_LINK__CROSS_PROJECT_NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Link Lag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDECESSOR_LINK__LINK_LAG = 4;
-
-	/**
-	 * The feature id for the '<em><b>Lag Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDECESSOR_LINK__LAG_FORMAT = 5;
-
-	/**
-	 * The number of structural features of the the '<em>Predecessor Link</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDECESSOR_LINK_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.ProjectImpl <em>Project</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.ProjectImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getProject()
-	 * @generated
-	 */
-	int PROJECT = 22;
-
-	/**
-	 * The feature id for the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__UID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__TITLE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Subject</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__SUBJECT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__CATEGORY = 4;
-
-	/**
-	 * The feature id for the '<em><b>Company</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__COMPANY = 5;
-
-	/**
-	 * The feature id for the '<em><b>Manager</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__MANAGER = 6;
-
-	/**
-	 * The feature id for the '<em><b>Author</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__AUTHOR = 7;
-
-	/**
-	 * The feature id for the '<em><b>Creation Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__CREATION_DATE = 8;
-
-	/**
-	 * The feature id for the '<em><b>Revision</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__REVISION = 9;
-
-	/**
-	 * The feature id for the '<em><b>Last Saved</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__LAST_SAVED = 10;
-
-	/**
-	 * The feature id for the '<em><b>Schedule From Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__SCHEDULE_FROM_START = 11;
-
-	/**
-	 * The feature id for the '<em><b>Start Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__START_DATE = 12;
-
-	/**
-	 * The feature id for the '<em><b>Finish Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__FINISH_DATE = 13;
-
-	/**
-	 * The feature id for the '<em><b>FY Start Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__FYSTART_DATE = 14;
-
-	/**
-	 * The feature id for the '<em><b>Critical Slack Limit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__CRITICAL_SLACK_LIMIT = 15;
-
-	/**
-	 * The feature id for the '<em><b>Currency Digits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__CURRENCY_DIGITS = 16;
-
-	/**
-	 * The feature id for the '<em><b>Currency Symbol</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__CURRENCY_SYMBOL = 17;
-
-	/**
-	 * The feature id for the '<em><b>Currency Symbol Position</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__CURRENCY_SYMBOL_POSITION = 18;
-
-	/**
-	 * The feature id for the '<em><b>Calendar UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__CALENDAR_UID = 19;
-
-	/**
-	 * The feature id for the '<em><b>Default Start Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__DEFAULT_START_TIME = 20;
-
-	/**
-	 * The feature id for the '<em><b>Default Finish Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__DEFAULT_FINISH_TIME = 21;
-
-	/**
-	 * The feature id for the '<em><b>Minutes Per Day</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__MINUTES_PER_DAY = 22;
-
-	/**
-	 * The feature id for the '<em><b>Minutes Per Week</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__MINUTES_PER_WEEK = 23;
-
-	/**
-	 * The feature id for the '<em><b>Days Per Month</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__DAYS_PER_MONTH = 24;
-
-	/**
-	 * The feature id for the '<em><b>Default Task Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__DEFAULT_TASK_TYPE = 25;
-
-	/**
-	 * The feature id for the '<em><b>Default Fixed Cost Accrual</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__DEFAULT_FIXED_COST_ACCRUAL = 26;
-
-	/**
-	 * The feature id for the '<em><b>Default Standard Rate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__DEFAULT_STANDARD_RATE = 27;
-
-	/**
-	 * The feature id for the '<em><b>Default Overtime Rate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__DEFAULT_OVERTIME_RATE = 28;
-
-	/**
-	 * The feature id for the '<em><b>Duration Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__DURATION_FORMAT = 29;
-
-	/**
-	 * The feature id for the '<em><b>Work Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__WORK_FORMAT = 30;
-
-	/**
-	 * The feature id for the '<em><b>Editable Actual Costs</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__EDITABLE_ACTUAL_COSTS = 31;
-
-	/**
-	 * The feature id for the '<em><b>Honor Constraints</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__HONOR_CONSTRAINTS = 32;
-
-	/**
-	 * The feature id for the '<em><b>Earned Value Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__EARNED_VALUE_METHOD = 33;
-
-	/**
-	 * The feature id for the '<em><b>Inserted Projects Like Summary</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__INSERTED_PROJECTS_LIKE_SUMMARY = 34;
-
-	/**
-	 * The feature id for the '<em><b>Multiple Critical Paths</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__MULTIPLE_CRITICAL_PATHS = 35;
-
-	/**
-	 * The feature id for the '<em><b>New Tasks Effort Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__NEW_TASKS_EFFORT_DRIVEN = 36;
-
-	/**
-	 * The feature id for the '<em><b>New Tasks Estimated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__NEW_TASKS_ESTIMATED = 37;
-
-	/**
-	 * The feature id for the '<em><b>Splits In Progress Tasks</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__SPLITS_IN_PROGRESS_TASKS = 38;
-
-	/**
-	 * The feature id for the '<em><b>Spread Actual Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__SPREAD_ACTUAL_COST = 39;
-
-	/**
-	 * The feature id for the '<em><b>Spread Percent Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__SPREAD_PERCENT_COMPLETE = 40;
-
-	/**
-	 * The feature id for the '<em><b>Task Updates Resource</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__TASK_UPDATES_RESOURCE = 41;
-
-	/**
-	 * The feature id for the '<em><b>Fiscal Year Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__FISCAL_YEAR_START = 42;
-
-	/**
-	 * The feature id for the '<em><b>Week Start Day</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__WEEK_START_DAY = 43;
-
-	/**
-	 * The feature id for the '<em><b>Move Completed Ends Back</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__MOVE_COMPLETED_ENDS_BACK = 44;
-
-	/**
-	 * The feature id for the '<em><b>Move Remaining Starts Back</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__MOVE_REMAINING_STARTS_BACK = 45;
-
-	/**
-	 * The feature id for the '<em><b>Move Remaining Starts Forward</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__MOVE_REMAINING_STARTS_FORWARD = 46;
-
-	/**
-	 * The feature id for the '<em><b>Move Completed Ends Forward</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__MOVE_COMPLETED_ENDS_FORWARD = 47;
-
-	/**
-	 * The feature id for the '<em><b>Baseline For Earned Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__BASELINE_FOR_EARNED_VALUE = 48;
-
-	/**
-	 * The feature id for the '<em><b>Auto Add New Resources And Tasks</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__AUTO_ADD_NEW_RESOURCES_AND_TASKS = 49;
-
-	/**
-	 * The feature id for the '<em><b>Status Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__STATUS_DATE = 50;
-
-	/**
-	 * The feature id for the '<em><b>Current Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__CURRENT_DATE = 51;
-
-	/**
-	 * The feature id for the '<em><b>Microsoft Project Server URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__MICROSOFT_PROJECT_SERVER_URL = 52;
-
-	/**
-	 * The feature id for the '<em><b>Autolink</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__AUTOLINK = 53;
-
-	/**
-	 * The feature id for the '<em><b>New Task Start Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__NEW_TASK_START_DATE = 54;
-
-	/**
-	 * The feature id for the '<em><b>Default Task EV Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__DEFAULT_TASK_EV_METHOD = 55;
-
-	/**
-	 * The feature id for the '<em><b>Project Externally Edited</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__PROJECT_EXTERNALLY_EDITED = 56;
-
-	/**
-	 * The feature id for the '<em><b>Extended Creation Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__EXTENDED_CREATION_DATE = 57;
-
-	/**
-	 * The feature id for the '<em><b>Actuals In Sync</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__ACTUALS_IN_SYNC = 58;
-
-	/**
-	 * The feature id for the '<em><b>Remove File Properties</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__REMOVE_FILE_PROPERTIES = 59;
-
-	/**
-	 * The feature id for the '<em><b>Admin Project</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__ADMIN_PROJECT = 60;
-
-	/**
-	 * The feature id for the '<em><b>Outline Codes</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__OUTLINE_CODES = 61;
-
-	/**
-	 * The feature id for the '<em><b>WBS Masks</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__WBS_MASKS = 62;
-
-	/**
-	 * The feature id for the '<em><b>Extended Attributes</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__EXTENDED_ATTRIBUTES = 63;
-
-	/**
-	 * The feature id for the '<em><b>Calendars</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__CALENDARS = 64;
-
-	/**
-	 * The feature id for the '<em><b>Tasks</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__TASKS = 65;
-
-	/**
-	 * The feature id for the '<em><b>Resources</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__RESOURCES = 66;
-
-	/**
-	 * The feature id for the '<em><b>Assignments</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT__ASSIGNMENTS = 67;
-
-	/**
-	 * The number of structural features of the the '<em>Project</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROJECT_FEATURE_COUNT = 68;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.RateImpl <em>Rate</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.RateImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getRate()
-	 * @generated
-	 */
-	int RATE = 23;
-
-	/**
-	 * The feature id for the '<em><b>Rates From</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RATE__RATES_FROM = 0;
-
-	/**
-	 * The feature id for the '<em><b>Rates To</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RATE__RATES_TO = 1;
-
-	/**
-	 * The feature id for the '<em><b>Rate Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RATE__RATE_TABLE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Standard Rate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RATE__STANDARD_RATE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Standard Rate Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RATE__STANDARD_RATE_FORMAT = 4;
-
-	/**
-	 * The feature id for the '<em><b>Overtime Rate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RATE__OVERTIME_RATE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Overtime Rate Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RATE__OVERTIME_RATE_FORMAT = 6;
-
-	/**
-	 * The feature id for the '<em><b>Cost Per Use</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RATE__COST_PER_USE = 7;
-
-	/**
-	 * The number of structural features of the the '<em>Rate</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RATE_FEATURE_COUNT = 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.RatesImpl <em>Rates</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.RatesImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getRates()
-	 * @generated
-	 */
-	int RATES = 24;
-
-	/**
-	 * The feature id for the '<em><b>Rate</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RATES__RATE = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Rates</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RATES_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.ResourceImpl <em>Resource</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.ResourceImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getResource()
-	 * @generated
-	 */
-	int RESOURCE = 25;
-
-	/**
-	 * The feature id for the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__UID = 0;
-
-	/**
-	 * The feature id for the '<em><b>ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__ID = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__NAME = 2;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__TYPE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Is Null</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__IS_NULL = 4;
-
-	/**
-	 * The feature id for the '<em><b>Initials</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__INITIALS = 5;
-
-	/**
-	 * The feature id for the '<em><b>Phonetics</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__PHONETICS = 6;
-
-	/**
-	 * The feature id for the '<em><b>NT Account</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__NTACCOUNT = 7;
-
-	/**
-	 * The feature id for the '<em><b>Material Label</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__MATERIAL_LABEL = 8;
-
-	/**
-	 * The feature id for the '<em><b>Code</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__CODE = 9;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__GROUP = 10;
-
-	/**
-	 * The feature id for the '<em><b>Work Group</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__WORK_GROUP = 11;
-
-	/**
-	 * The feature id for the '<em><b>Email Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__EMAIL_ADDRESS = 12;
-
-	/**
-	 * The feature id for the '<em><b>Hyperlink</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__HYPERLINK = 13;
-
-	/**
-	 * The feature id for the '<em><b>Hyperlink Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__HYPERLINK_ADDRESS = 14;
-
-	/**
-	 * The feature id for the '<em><b>Hyperlink Sub Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__HYPERLINK_SUB_ADDRESS = 15;
-
-	/**
-	 * The feature id for the '<em><b>Max Units</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__MAX_UNITS = 16;
-
-	/**
-	 * The feature id for the '<em><b>Peak Units</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__PEAK_UNITS = 17;
-
-	/**
-	 * The feature id for the '<em><b>Over Allocated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__OVER_ALLOCATED = 18;
-
-	/**
-	 * The feature id for the '<em><b>Available From</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__AVAILABLE_FROM = 19;
-
-	/**
-	 * The feature id for the '<em><b>Available To</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__AVAILABLE_TO = 20;
-
-	/**
-	 * The feature id for the '<em><b>Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__START = 21;
-
-	/**
-	 * The feature id for the '<em><b>Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__FINISH = 22;
-
-	/**
-	 * The feature id for the '<em><b>Can Level</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__CAN_LEVEL = 23;
-
-	/**
-	 * The feature id for the '<em><b>Accrue At</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__ACCRUE_AT = 24;
-
-	/**
-	 * The feature id for the '<em><b>Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__WORK = 25;
-
-	/**
-	 * The feature id for the '<em><b>Regular Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__REGULAR_WORK = 26;
-
-	/**
-	 * The feature id for the '<em><b>Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__OVERTIME_WORK = 27;
-
-	/**
-	 * The feature id for the '<em><b>Actual Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__ACTUAL_WORK = 28;
-
-	/**
-	 * The feature id for the '<em><b>Remaining Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__REMAINING_WORK = 29;
-
-	/**
-	 * The feature id for the '<em><b>Actual Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__ACTUAL_OVERTIME_WORK = 30;
-
-	/**
-	 * The feature id for the '<em><b>Remaining Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__REMAINING_OVERTIME_WORK = 31;
-
-	/**
-	 * The feature id for the '<em><b>Percent Work Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__PERCENT_WORK_COMPLETE = 32;
-
-	/**
-	 * The feature id for the '<em><b>Standard Rate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__STANDARD_RATE = 33;
-
-	/**
-	 * The feature id for the '<em><b>Standard Rate Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__STANDARD_RATE_FORMAT = 34;
-
-	/**
-	 * The feature id for the '<em><b>Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__COST = 35;
-
-	/**
-	 * The feature id for the '<em><b>Overtime Rate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__OVERTIME_RATE = 36;
-
-	/**
-	 * The feature id for the '<em><b>Overtime Rate Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__OVERTIME_RATE_FORMAT = 37;
-
-	/**
-	 * The feature id for the '<em><b>Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__OVERTIME_COST = 38;
-
-	/**
-	 * The feature id for the '<em><b>Cost Per Use</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__COST_PER_USE = 39;
-
-	/**
-	 * The feature id for the '<em><b>Actual Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__ACTUAL_COST = 40;
-
-	/**
-	 * The feature id for the '<em><b>Actual Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__ACTUAL_OVERTIME_COST = 41;
-
-	/**
-	 * The feature id for the '<em><b>Remaining Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__REMAINING_COST = 42;
-
-	/**
-	 * The feature id for the '<em><b>Remaining Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__REMAINING_OVERTIME_COST = 43;
-
-	/**
-	 * The feature id for the '<em><b>Work Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__WORK_VARIANCE = 44;
-
-	/**
-	 * The feature id for the '<em><b>Cost Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__COST_VARIANCE = 45;
-
-	/**
-	 * The feature id for the '<em><b>SV</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__SV = 46;
-
-	/**
-	 * The feature id for the '<em><b>CV</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__CV = 47;
-
-	/**
-	 * The feature id for the '<em><b>ACWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__ACWP = 48;
-
-	/**
-	 * The feature id for the '<em><b>Calendar UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__CALENDAR_UID = 49;
-
-	/**
-	 * The feature id for the '<em><b>Notes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__NOTES = 50;
-
-	/**
-	 * The feature id for the '<em><b>BCWS</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__BCWS = 51;
-
-	/**
-	 * The feature id for the '<em><b>BCWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__BCWP = 52;
-
-	/**
-	 * The feature id for the '<em><b>Is Generic</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__IS_GENERIC = 53;
-
-	/**
-	 * The feature id for the '<em><b>Is Inactive</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__IS_INACTIVE = 54;
-
-	/**
-	 * The feature id for the '<em><b>Is Enterprise</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__IS_ENTERPRISE = 55;
-
-	/**
-	 * The feature id for the '<em><b>Booking Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__BOOKING_TYPE = 56;
-
-	/**
-	 * The feature id for the '<em><b>Actual Work Protected</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__ACTUAL_WORK_PROTECTED = 57;
-
-	/**
-	 * The feature id for the '<em><b>Actual Overtime Work Protected</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__ACTUAL_OVERTIME_WORK_PROTECTED = 58;
-
-	/**
-	 * The feature id for the '<em><b>Active Directory GUID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__ACTIVE_DIRECTORY_GUID = 59;
-
-	/**
-	 * The feature id for the '<em><b>Creation Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__CREATION_DATE = 60;
-
-	/**
-	 * The feature id for the '<em><b>Extended Attribute</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__EXTENDED_ATTRIBUTE = 61;
-
-	/**
-	 * The feature id for the '<em><b>Baseline</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__BASELINE = 62;
-
-	/**
-	 * The feature id for the '<em><b>Outline Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__OUTLINE_CODE = 63;
-
-	/**
-	 * The feature id for the '<em><b>Availability Periods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__AVAILABILITY_PERIODS = 64;
-
-	/**
-	 * The feature id for the '<em><b>Rates</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__RATES = 65;
-
-	/**
-	 * The feature id for the '<em><b>Timephased Data</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE__TIMEPHASED_DATA = 66;
-
-	/**
-	 * The number of structural features of the the '<em>Resource</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_FEATURE_COUNT = 67;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.ResourcesImpl <em>Resources</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.ResourcesImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getResources()
-	 * @generated
-	 */
-	int RESOURCES = 26;
-
-	/**
-	 * The feature id for the '<em><b>Resource</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCES__RESOURCE = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Resources</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCES_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.TaskImpl <em>Task</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.TaskImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getTask()
-	 * @generated
-	 */
-	int TASK = 27;
-
-	/**
-	 * The feature id for the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__UID = 0;
-
-	/**
-	 * The feature id for the '<em><b>ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ID = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__NAME = 2;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__TYPE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Is Null</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__IS_NULL = 4;
-
-	/**
-	 * The feature id for the '<em><b>Create Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__CREATE_DATE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Contact</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__CONTACT = 6;
-
-	/**
-	 * The feature id for the '<em><b>WBS</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__WBS = 7;
-
-	/**
-	 * The feature id for the '<em><b>WBS Level</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__WBS_LEVEL = 8;
-
-	/**
-	 * The feature id for the '<em><b>Outline Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__OUTLINE_NUMBER = 9;
-
-	/**
-	 * The feature id for the '<em><b>Outline Level</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__OUTLINE_LEVEL = 10;
-
-	/**
-	 * The feature id for the '<em><b>Priority</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__PRIORITY = 11;
-
-	/**
-	 * The feature id for the '<em><b>Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__START = 12;
-
-	/**
-	 * The feature id for the '<em><b>Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__FINISH = 13;
-
-	/**
-	 * The feature id for the '<em><b>Duration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__DURATION = 14;
-
-	/**
-	 * The feature id for the '<em><b>Duration Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__DURATION_FORMAT = 15;
-
-	/**
-	 * The feature id for the '<em><b>Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__WORK = 16;
-
-	/**
-	 * The feature id for the '<em><b>Stop</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__STOP = 17;
-
-	/**
-	 * The feature id for the '<em><b>Resume</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__RESUME = 18;
-
-	/**
-	 * The feature id for the '<em><b>Resume Valid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__RESUME_VALID = 19;
-
-	/**
-	 * The feature id for the '<em><b>Effort Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__EFFORT_DRIVEN = 20;
-
-	/**
-	 * The feature id for the '<em><b>Recurring</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__RECURRING = 21;
-
-	/**
-	 * The feature id for the '<em><b>Over Allocated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__OVER_ALLOCATED = 22;
-
-	/**
-	 * The feature id for the '<em><b>Estimated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ESTIMATED = 23;
-
-	/**
-	 * The feature id for the '<em><b>Milestone</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__MILESTONE = 24;
-
-	/**
-	 * The feature id for the '<em><b>Summary</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__SUMMARY = 25;
-
-	/**
-	 * The feature id for the '<em><b>Critical</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__CRITICAL = 26;
-
-	/**
-	 * The feature id for the '<em><b>Is Subproject</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__IS_SUBPROJECT = 27;
-
-	/**
-	 * The feature id for the '<em><b>Is Subproject Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__IS_SUBPROJECT_READ_ONLY = 28;
-
-	/**
-	 * The feature id for the '<em><b>Subproject Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__SUBPROJECT_NAME = 29;
-
-	/**
-	 * The feature id for the '<em><b>External Task</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__EXTERNAL_TASK = 30;
-
-	/**
-	 * The feature id for the '<em><b>External Task Project</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__EXTERNAL_TASK_PROJECT = 31;
-
-	/**
-	 * The feature id for the '<em><b>Early Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__EARLY_START = 32;
-
-	/**
-	 * The feature id for the '<em><b>Early Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__EARLY_FINISH = 33;
-
-	/**
-	 * The feature id for the '<em><b>Late Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__LATE_START = 34;
-
-	/**
-	 * The feature id for the '<em><b>Late Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__LATE_FINISH = 35;
-
-	/**
-	 * The feature id for the '<em><b>Start Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__START_VARIANCE = 36;
-
-	/**
-	 * The feature id for the '<em><b>Finish Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__FINISH_VARIANCE = 37;
-
-	/**
-	 * The feature id for the '<em><b>Work Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__WORK_VARIANCE = 38;
-
-	/**
-	 * The feature id for the '<em><b>Free Slack</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__FREE_SLACK = 39;
-
-	/**
-	 * The feature id for the '<em><b>Total Slack</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__TOTAL_SLACK = 40;
-
-	/**
-	 * The feature id for the '<em><b>Fixed Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__FIXED_COST = 41;
-
-	/**
-	 * The feature id for the '<em><b>Fixed Cost Accrual</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__FIXED_COST_ACCRUAL = 42;
-
-	/**
-	 * The feature id for the '<em><b>Percent Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__PERCENT_COMPLETE = 43;
-
-	/**
-	 * The feature id for the '<em><b>Percent Work Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__PERCENT_WORK_COMPLETE = 44;
-
-	/**
-	 * The feature id for the '<em><b>Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__COST = 45;
-
-	/**
-	 * The feature id for the '<em><b>Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__OVERTIME_COST = 46;
-
-	/**
-	 * The feature id for the '<em><b>Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__OVERTIME_WORK = 47;
-
-	/**
-	 * The feature id for the '<em><b>Actual Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ACTUAL_START = 48;
-
-	/**
-	 * The feature id for the '<em><b>Actual Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ACTUAL_FINISH = 49;
-
-	/**
-	 * The feature id for the '<em><b>Actual Duration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ACTUAL_DURATION = 50;
-
-	/**
-	 * The feature id for the '<em><b>Actual Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ACTUAL_COST = 51;
-
-	/**
-	 * The feature id for the '<em><b>Actual Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ACTUAL_OVERTIME_COST = 52;
-
-	/**
-	 * The feature id for the '<em><b>Actual Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ACTUAL_WORK = 53;
-
-	/**
-	 * The feature id for the '<em><b>Actual Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ACTUAL_OVERTIME_WORK = 54;
-
-	/**
-	 * The feature id for the '<em><b>Regular Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__REGULAR_WORK = 55;
-
-	/**
-	 * The feature id for the '<em><b>Remaining Duration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__REMAINING_DURATION = 56;
-
-	/**
-	 * The feature id for the '<em><b>Remaining Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__REMAINING_COST = 57;
-
-	/**
-	 * The feature id for the '<em><b>Remaining Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__REMAINING_WORK = 58;
-
-	/**
-	 * The feature id for the '<em><b>Remaining Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__REMAINING_OVERTIME_COST = 59;
-
-	/**
-	 * The feature id for the '<em><b>Remaining Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__REMAINING_OVERTIME_WORK = 60;
-
-	/**
-	 * The feature id for the '<em><b>ACWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ACWP = 61;
-
-	/**
-	 * The feature id for the '<em><b>CV</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__CV = 62;
-
-	/**
-	 * The feature id for the '<em><b>Constraint Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__CONSTRAINT_TYPE = 63;
-
-	/**
-	 * The feature id for the '<em><b>Calendar UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__CALENDAR_UID = 64;
-
-	/**
-	 * The feature id for the '<em><b>Constraint Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__CONSTRAINT_DATE = 65;
-
-	/**
-	 * The feature id for the '<em><b>Deadline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__DEADLINE = 66;
-
-	/**
-	 * The feature id for the '<em><b>Level Assignments</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__LEVEL_ASSIGNMENTS = 67;
-
-	/**
-	 * The feature id for the '<em><b>Leveling Can Split</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__LEVELING_CAN_SPLIT = 68;
-
-	/**
-	 * The feature id for the '<em><b>Leveling Delay</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__LEVELING_DELAY = 69;
-
-	/**
-	 * The feature id for the '<em><b>Leveling Delay Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__LEVELING_DELAY_FORMAT = 70;
-
-	/**
-	 * The feature id for the '<em><b>Pre Leveled Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__PRE_LEVELED_START = 71;
-
-	/**
-	 * The feature id for the '<em><b>Pre Leveled Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__PRE_LEVELED_FINISH = 72;
-
-	/**
-	 * The feature id for the '<em><b>Hyperlink</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__HYPERLINK = 73;
-
-	/**
-	 * The feature id for the '<em><b>Hyperlink Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__HYPERLINK_ADDRESS = 74;
-
-	/**
-	 * The feature id for the '<em><b>Hyperlink Sub Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__HYPERLINK_SUB_ADDRESS = 75;
-
-	/**
-	 * The feature id for the '<em><b>Ignore Resource Calendar</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__IGNORE_RESOURCE_CALENDAR = 76;
-
-	/**
-	 * The feature id for the '<em><b>Notes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__NOTES = 77;
-
-	/**
-	 * The feature id for the '<em><b>Hide Bar</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__HIDE_BAR = 78;
-
-	/**
-	 * The feature id for the '<em><b>Rollup</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ROLLUP = 79;
-
-	/**
-	 * The feature id for the '<em><b>BCWS</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__BCWS = 80;
-
-	/**
-	 * The feature id for the '<em><b>BCWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__BCWP = 81;
-
-	/**
-	 * The feature id for the '<em><b>Physical Percent Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__PHYSICAL_PERCENT_COMPLETE = 82;
-
-	/**
-	 * The feature id for the '<em><b>Earned Value Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__EARNED_VALUE_METHOD = 83;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor Link</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__PREDECESSOR_LINK = 84;
-
-	/**
-	 * The feature id for the '<em><b>Actual Work Protected</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ACTUAL_WORK_PROTECTED = 85;
-
-	/**
-	 * The feature id for the '<em><b>Actual Overtime Work Protected</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ACTUAL_OVERTIME_WORK_PROTECTED = 86;
-
-	/**
-	 * The feature id for the '<em><b>Extended Attribute</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__EXTENDED_ATTRIBUTE = 87;
-
-	/**
-	 * The feature id for the '<em><b>Baseline</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__BASELINE = 88;
-
-	/**
-	 * The feature id for the '<em><b>Outline Code</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__OUTLINE_CODE = 89;
-
-	/**
-	 * The feature id for the '<em><b>Timephased Data</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__TIMEPHASED_DATA = 90;
-
-	/**
-	 * The number of structural features of the the '<em>Task</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_FEATURE_COUNT = 91;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.TasksImpl <em>Tasks</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.TasksImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getTasks()
-	 * @generated
-	 */
-	int TASKS = 28;
-
-	/**
-	 * The feature id for the '<em><b>Task</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASKS__TASK = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Tasks</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASKS_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.TimePeriodImpl <em>Time Period</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.TimePeriodImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getTimePeriod()
-	 * @generated
-	 */
-	int TIME_PERIOD = 29;
-
-	/**
-	 * The feature id for the '<em><b>From Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_PERIOD__FROM_DATE = 0;
-
-	/**
-	 * The feature id for the '<em><b>To Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_PERIOD__TO_DATE = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Time Period</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_PERIOD_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.TimephasedDataTypeImpl <em>Timephased Data Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.TimephasedDataTypeImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getTimephasedDataType()
-	 * @generated
-	 */
-	int TIMEPHASED_DATA_TYPE = 30;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIMEPHASED_DATA_TYPE__TYPE = 0;
-
-	/**
-	 * The feature id for the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIMEPHASED_DATA_TYPE__UID = 1;
-
-	/**
-	 * The feature id for the '<em><b>Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIMEPHASED_DATA_TYPE__START = 2;
-
-	/**
-	 * The feature id for the '<em><b>Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIMEPHASED_DATA_TYPE__FINISH = 3;
-
-	/**
-	 * The feature id for the '<em><b>Unit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIMEPHASED_DATA_TYPE__UNIT = 4;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIMEPHASED_DATA_TYPE__VALUE = 5;
-
-	/**
-	 * The number of structural features of the the '<em>Timephased Data Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIMEPHASED_DATA_TYPE_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.ValueImpl <em>Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.ValueImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getValue()
-	 * @generated
-	 */
-	int VALUE = 31;
-
-	/**
-	 * The feature id for the '<em><b>Value ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE__VALUE_ID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Parent Value ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE__PARENT_VALUE_ID = 1;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE__VALUE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE__DESCRIPTION = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Value</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.Value2Impl <em>Value2</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.Value2Impl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getValue2()
-	 * @generated
-	 */
-	int VALUE2 = 32;
-
-	/**
-	 * The feature id for the '<em><b>ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE2__ID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE2__VALUE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE2__DESCRIPTION = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Value2</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE2_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.ValueListImpl <em>Value List</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.ValueListImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getValueList()
-	 * @generated
-	 */
-	int VALUE_LIST = 33;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE_LIST__VALUE = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Value List</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE_LIST_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.ValuesImpl <em>Values</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.ValuesImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getValues()
-	 * @generated
-	 */
-	int VALUES = 34;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUES__GROUP = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUES__VALUE = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Values</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUES_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.WBSMaskImpl <em>WBS Mask</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.WBSMaskImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getWBSMask()
-	 * @generated
-	 */
-	int WBS_MASK = 35;
-
-	/**
-	 * The feature id for the '<em><b>Level</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WBS_MASK__LEVEL = 0;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WBS_MASK__TYPE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WBS_MASK__LENGTH = 2;
-
-	/**
-	 * The feature id for the '<em><b>Separator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WBS_MASK__SEPARATOR = 3;
-
-	/**
-	 * The number of structural features of the the '<em>WBS Mask</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WBS_MASK_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.WBSMasksImpl <em>WBS Masks</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.WBSMasksImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getWBSMasks()
-	 * @generated
-	 */
-	int WBS_MASKS = 36;
-
-	/**
-	 * The feature id for the '<em><b>Verify Unique Codes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WBS_MASKS__VERIFY_UNIQUE_CODES = 0;
-
-	/**
-	 * The feature id for the '<em><b>Generate Codes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WBS_MASKS__GENERATE_CODES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WBS_MASKS__PREFIX = 2;
-
-	/**
-	 * The feature id for the '<em><b>WBS Mask</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WBS_MASKS__WBS_MASK = 3;
-
-	/**
-	 * The number of structural features of the the '<em>WBS Masks</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WBS_MASKS_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.WeekDayImpl <em>Week Day</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.WeekDayImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getWeekDay()
-	 * @generated
-	 */
-	int WEEK_DAY = 37;
-
-	/**
-	 * The feature id for the '<em><b>Day Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEEK_DAY__DAY_TYPE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Day Working</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEEK_DAY__DAY_WORKING = 1;
-
-	/**
-	 * The feature id for the '<em><b>Time Period</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEEK_DAY__TIME_PERIOD = 2;
-
-	/**
-	 * The feature id for the '<em><b>Working Times</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEEK_DAY__WORKING_TIMES = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Week Day</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEEK_DAY_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.WeekDaysImpl <em>Week Days</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.WeekDaysImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getWeekDays()
-	 * @generated
-	 */
-	int WEEK_DAYS = 38;
-
-	/**
-	 * The feature id for the '<em><b>Week Day</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEEK_DAYS__WEEK_DAY = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Week Days</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEEK_DAYS_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.WorkingTimeImpl <em>Working Time</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.WorkingTimeImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getWorkingTime()
-	 * @generated
-	 */
-	int WORKING_TIME = 39;
-
-	/**
-	 * The feature id for the '<em><b>From Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORKING_TIME__FROM_TIME = 0;
-
-	/**
-	 * The feature id for the '<em><b>To Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORKING_TIME__TO_TIME = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Working Time</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORKING_TIME_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.msproject.impl.WorkingTimesImpl <em>Working Times</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.msproject.impl.WorkingTimesImpl
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getWorkingTimes()
-	 * @generated
-	 */
-	int WORKING_TIMES = 40;
-
-	/**
-	 * The feature id for the '<em><b>Working Time</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORKING_TIMES__WORKING_TIME = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Working Times</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORKING_TIMES_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '<em>Accrue At</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getAccrueAt()
-	 * @generated
-	 */
-	int ACCRUE_AT = 41;
-
-	/**
-	 * The meta object id for the '<em>Active Directory GUID Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getActiveDirectoryGUIDType()
-	 * @generated
-	 */
-	int ACTIVE_DIRECTORY_GUID_TYPE = 42;
-
-	/**
-	 * The meta object id for the '<em>Alias Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getAliasType()
-	 * @generated
-	 */
-	int ALIAS_TYPE = 43;
-
-	/**
-	 * The meta object id for the '<em>Author Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getAuthorType()
-	 * @generated
-	 */
-	int AUTHOR_TYPE = 44;
-
-	/**
-	 * The meta object id for the '<em>Baseline For Earned Value Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getBaselineForEarnedValueType()
-	 * @generated
-	 */
-	int BASELINE_FOR_EARNED_VALUE_TYPE = 45;
-
-	/**
-	 * The meta object id for the '<em>Booking Type Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getBookingTypeType()
-	 * @generated
-	 */
-	int BOOKING_TYPE_TYPE = 46;
-
-	/**
-	 * The meta object id for the '<em>Booking Type Type1</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getBookingTypeType1()
-	 * @generated
-	 */
-	int BOOKING_TYPE_TYPE1 = 47;
-
-	/**
-	 * The meta object id for the '<em>Calculation Type Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getCalculationTypeType()
-	 * @generated
-	 */
-	int CALCULATION_TYPE_TYPE = 48;
-
-	/**
-	 * The meta object id for the '<em>Category Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getCategoryType()
-	 * @generated
-	 */
-	int CATEGORY_TYPE = 49;
-
-	/**
-	 * The meta object id for the '<em>Code Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getCodeType()
-	 * @generated
-	 */
-	int CODE_TYPE = 50;
-
-	/**
-	 * The meta object id for the '<em>Company Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getCompanyType()
-	 * @generated
-	 */
-	int COMPANY_TYPE = 51;
-
-	/**
-	 * The meta object id for the '<em>Constraint Type Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getConstraintTypeType()
-	 * @generated
-	 */
-	int CONSTRAINT_TYPE_TYPE = 52;
-
-	/**
-	 * The meta object id for the '<em>Contact Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getContactType()
-	 * @generated
-	 */
-	int CONTACT_TYPE = 53;
-
-	/**
-	 * The meta object id for the '<em>Cost Rate Table Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getCostRateTableType()
-	 * @generated
-	 */
-	int COST_RATE_TABLE_TYPE = 54;
-
-	/**
-	 * The meta object id for the '<em>Currency Symbol Position Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getCurrencySymbolPositionType()
-	 * @generated
-	 */
-	int CURRENCY_SYMBOL_POSITION_TYPE = 55;
-
-	/**
-	 * The meta object id for the '<em>Currency Symbol Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getCurrencySymbolType()
-	 * @generated
-	 */
-	int CURRENCY_SYMBOL_TYPE = 56;
-
-	/**
-	 * The meta object id for the '<em>Day Type Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getDayTypeType()
-	 * @generated
-	 */
-	int DAY_TYPE_TYPE = 57;
-
-	/**
-	 * The meta object id for the '<em>Default Fixed Cost Accrual Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getDefaultFixedCostAccrualType()
-	 * @generated
-	 */
-	int DEFAULT_FIXED_COST_ACCRUAL_TYPE = 58;
-
-	/**
-	 * The meta object id for the '<em>Default Task EV Method Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getDefaultTaskEVMethodType()
-	 * @generated
-	 */
-	int DEFAULT_TASK_EV_METHOD_TYPE = 59;
-
-	/**
-	 * The meta object id for the '<em>Default Task Type Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getDefaultTaskTypeType()
-	 * @generated
-	 */
-	int DEFAULT_TASK_TYPE_TYPE = 60;
-
-	/**
-	 * The meta object id for the '<em>Duration Format Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getDurationFormatType()
-	 * @generated
-	 */
-	int DURATION_FORMAT_TYPE = 61;
-
-	/**
-	 * The meta object id for the '<em>Duration Format Type1</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getDurationFormatType1()
-	 * @generated
-	 */
-	int DURATION_FORMAT_TYPE1 = 62;
-
-	/**
-	 * The meta object id for the '<em>Duration Format Type2</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getDurationFormatType2()
-	 * @generated
-	 */
-	int DURATION_FORMAT_TYPE2 = 63;
-
-	/**
-	 * The meta object id for the '<em>Duration Format Type3</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getDurationFormatType3()
-	 * @generated
-	 */
-	int DURATION_FORMAT_TYPE3 = 64;
-
-	/**
-	 * The meta object id for the '<em>Duration Format Type4</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getDurationFormatType4()
-	 * @generated
-	 */
-	int DURATION_FORMAT_TYPE4 = 65;
-
-	/**
-	 * The meta object id for the '<em>Duration Format Type5</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getDurationFormatType5()
-	 * @generated
-	 */
-	int DURATION_FORMAT_TYPE5 = 66;
-
-	/**
-	 * The meta object id for the '<em>Earned Value Method Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getEarnedValueMethodType()
-	 * @generated
-	 */
-	int EARNED_VALUE_METHOD_TYPE = 67;
-
-	/**
-	 * The meta object id for the '<em>Earned Value Method Type1</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getEarnedValueMethodType1()
-	 * @generated
-	 */
-	int EARNED_VALUE_METHOD_TYPE1 = 68;
-
-	/**
-	 * The meta object id for the '<em>Email Address Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getEmailAddressType()
-	 * @generated
-	 */
-	int EMAIL_ADDRESS_TYPE = 69;
-
-	/**
-	 * The meta object id for the '<em>External Task Project Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getExternalTaskProjectType()
-	 * @generated
-	 */
-	int EXTERNAL_TASK_PROJECT_TYPE = 70;
-
-	/**
-	 * The meta object id for the '<em>Fixed Cost Accrual Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getFixedCostAccrualType()
-	 * @generated
-	 */
-	int FIXED_COST_ACCRUAL_TYPE = 71;
-
-	/**
-	 * The meta object id for the '<em>FY Start Date Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getFYStartDateType()
-	 * @generated
-	 */
-	int FY_START_DATE_TYPE = 72;
-
-	/**
-	 * The meta object id for the '<em>Group Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getGroupType()
-	 * @generated
-	 */
-	int GROUP_TYPE = 73;
-
-	/**
-	 * The meta object id for the '<em>Hyperlink Address Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getHyperlinkAddressType()
-	 * @generated
-	 */
-	int HYPERLINK_ADDRESS_TYPE = 74;
-
-	/**
-	 * The meta object id for the '<em>Hyperlink Address Type1</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getHyperlinkAddressType1()
-	 * @generated
-	 */
-	int HYPERLINK_ADDRESS_TYPE1 = 75;
-
-	/**
-	 * The meta object id for the '<em>Hyperlink Address Type2</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getHyperlinkAddressType2()
-	 * @generated
-	 */
-	int HYPERLINK_ADDRESS_TYPE2 = 76;
-
-	/**
-	 * The meta object id for the '<em>Hyperlink Sub Address Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getHyperlinkSubAddressType()
-	 * @generated
-	 */
-	int HYPERLINK_SUB_ADDRESS_TYPE = 77;
-
-	/**
-	 * The meta object id for the '<em>Hyperlink Sub Address Type1</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getHyperlinkSubAddressType1()
-	 * @generated
-	 */
-	int HYPERLINK_SUB_ADDRESS_TYPE1 = 78;
-
-	/**
-	 * The meta object id for the '<em>Hyperlink Sub Address Type2</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getHyperlinkSubAddressType2()
-	 * @generated
-	 */
-	int HYPERLINK_SUB_ADDRESS_TYPE2 = 79;
-
-	/**
-	 * The meta object id for the '<em>Hyperlink Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getHyperlinkType()
-	 * @generated
-	 */
-	int HYPERLINK_TYPE = 80;
-
-	/**
-	 * The meta object id for the '<em>Hyperlink Type1</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getHyperlinkType1()
-	 * @generated
-	 */
-	int HYPERLINK_TYPE1 = 81;
-
-	/**
-	 * The meta object id for the '<em>Hyperlink Type2</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getHyperlinkType2()
-	 * @generated
-	 */
-	int HYPERLINK_TYPE2 = 82;
-
-	/**
-	 * The meta object id for the '<em>Initials Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getInitialsType()
-	 * @generated
-	 */
-	int INITIALS_TYPE = 83;
-
-	/**
-	 * The meta object id for the '<em>Lag Format Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getLagFormatType()
-	 * @generated
-	 */
-	int LAG_FORMAT_TYPE = 84;
-
-	/**
-	 * The meta object id for the '<em>Leveling Delay Format Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getLevelingDelayFormatType()
-	 * @generated
-	 */
-	int LEVELING_DELAY_FORMAT_TYPE = 85;
-
-	/**
-	 * The meta object id for the '<em>Leveling Delay Format Type1</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getLevelingDelayFormatType1()
-	 * @generated
-	 */
-	int LEVELING_DELAY_FORMAT_TYPE1 = 86;
-
-	/**
-	 * The meta object id for the '<em>Manager Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getManagerType()
-	 * @generated
-	 */
-	int MANAGER_TYPE = 87;
-
-	/**
-	 * The meta object id for the '<em>Material Label Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getMaterialLabelType()
-	 * @generated
-	 */
-	int MATERIAL_LABEL_TYPE = 88;
-
-	/**
-	 * The meta object id for the '<em>Name Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getNameType()
-	 * @generated
-	 */
-	int NAME_TYPE = 89;
-
-	/**
-	 * The meta object id for the '<em>Name Type1</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getNameType1()
-	 * @generated
-	 */
-	int NAME_TYPE1 = 90;
-
-	/**
-	 * The meta object id for the '<em>Name Type2</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getNameType2()
-	 * @generated
-	 */
-	int NAME_TYPE2 = 91;
-
-	/**
-	 * The meta object id for the '<em>Name Type3</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getNameType3()
-	 * @generated
-	 */
-	int NAME_TYPE3 = 92;
-
-	/**
-	 * The meta object id for the '<em>New Task Start Date Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getNewTaskStartDateType()
-	 * @generated
-	 */
-	int NEW_TASK_START_DATE_TYPE = 93;
-
-	/**
-	 * The meta object id for the '<em>NT Account Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getNTAccountType()
-	 * @generated
-	 */
-	int NT_ACCOUNT_TYPE = 94;
-
-	/**
-	 * The meta object id for the '<em>Outline Number Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getOutlineNumberType()
-	 * @generated
-	 */
-	int OUTLINE_NUMBER_TYPE = 95;
-
-	/**
-	 * The meta object id for the '<em>Overtime Rate Format Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getOvertimeRateFormatType()
-	 * @generated
-	 */
-	int OVERTIME_RATE_FORMAT_TYPE = 96;
-
-	/**
-	 * The meta object id for the '<em>Overtime Rate Format Type1</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getOvertimeRateFormatType1()
-	 * @generated
-	 */
-	int OVERTIME_RATE_FORMAT_TYPE1 = 97;
-
-	/**
-	 * The meta object id for the '<em>Phonetic Alias Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getPhoneticAliasType()
-	 * @generated
-	 */
-	int PHONETIC_ALIAS_TYPE = 98;
-
-	/**
-	 * The meta object id for the '<em>Phonetics Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getPhoneticsType()
-	 * @generated
-	 */
-	int PHONETICS_TYPE = 99;
-
-	/**
-	 * The meta object id for the '<em>Prefix Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getPrefixType()
-	 * @generated
-	 */
-	int PREFIX_TYPE = 100;
-
-	/**
-	 * The meta object id for the '<em>Rate Table Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getRateTableType()
-	 * @generated
-	 */
-	int RATE_TABLE_TYPE = 101;
-
-	/**
-	 * The meta object id for the '<em>Rollup Type Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getRollupTypeType()
-	 * @generated
-	 */
-	int ROLLUP_TYPE_TYPE = 102;
-
-	/**
-	 * The meta object id for the '<em>Standard Rate Format Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getStandardRateFormatType()
-	 * @generated
-	 */
-	int STANDARD_RATE_FORMAT_TYPE = 103;
-
-	/**
-	 * The meta object id for the '<em>Standard Rate Format Type1</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getStandardRateFormatType1()
-	 * @generated
-	 */
-	int STANDARD_RATE_FORMAT_TYPE1 = 104;
-
-	/**
-	 * The meta object id for the '<em>Subject Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getSubjectType()
-	 * @generated
-	 */
-	int SUBJECT_TYPE = 105;
-
-	/**
-	 * The meta object id for the '<em>Subproject Name Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getSubprojectNameType()
-	 * @generated
-	 */
-	int SUBPROJECT_NAME_TYPE = 106;
-
-	/**
-	 * The meta object id for the '<em>Title Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getTitleType()
-	 * @generated
-	 */
-	int TITLE_TYPE = 107;
-
-	/**
-	 * The meta object id for the '<em>Type Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getTypeType()
-	 * @generated
-	 */
-	int TYPE_TYPE = 108;
-
-	/**
-	 * The meta object id for the '<em>Type Type1</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getTypeType1()
-	 * @generated
-	 */
-	int TYPE_TYPE1 = 109;
-
-	/**
-	 * The meta object id for the '<em>Type Type2</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getTypeType2()
-	 * @generated
-	 */
-	int TYPE_TYPE2 = 110;
-
-	/**
-	 * The meta object id for the '<em>Type Type3</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getTypeType3()
-	 * @generated
-	 */
-	int TYPE_TYPE3 = 111;
-
-	/**
-	 * The meta object id for the '<em>Type Type4</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getTypeType4()
-	 * @generated
-	 */
-	int TYPE_TYPE4 = 112;
-
-	/**
-	 * The meta object id for the '<em>Type Type5</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getTypeType5()
-	 * @generated
-	 */
-	int TYPE_TYPE5 = 113;
-
-	/**
-	 * The meta object id for the '<em>UID Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getUIDType()
-	 * @generated
-	 */
-	int UID_TYPE = 114;
-
-	/**
-	 * The meta object id for the '<em>Unit Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getUnitType()
-	 * @generated
-	 */
-	int UNIT_TYPE = 115;
-
-	/**
-	 * The meta object id for the '<em>Valuelist Sort Order Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getValuelistSortOrderType()
-	 * @generated
-	 */
-	int VALUELIST_SORT_ORDER_TYPE = 116;
-
-	/**
-	 * The meta object id for the '<em>Week Start Day Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getWeekStartDayType()
-	 * @generated
-	 */
-	int WEEK_START_DAY_TYPE = 117;
-
-	/**
-	 * The meta object id for the '<em>Work Contour Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getWorkContourType()
-	 * @generated
-	 */
-	int WORK_CONTOUR_TYPE = 118;
-
-	/**
-	 * The meta object id for the '<em>Work Format Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getWorkFormatType()
-	 * @generated
-	 */
-	int WORK_FORMAT_TYPE = 119;
-
-	/**
-	 * The meta object id for the '<em>Work Group Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.math.BigInteger
-	 * @see org.eclipse.epf.msproject.impl.MsprojectPackageImpl#getWorkGroupType()
-	 * @generated
-	 */
-	int WORK_GROUP_TYPE = 120;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Assignment <em>Assignment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Assignment</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment
-	 * @generated
-	 */
-	EClass getAssignment();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getUID <em>UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>UID</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getUID()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_UID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getTaskUID <em>Task UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Task UID</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getTaskUID()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_TaskUID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getResourceUID <em>Resource UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Resource UID</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getResourceUID()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_ResourceUID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getPercentWorkComplete <em>Percent Work Complete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Percent Work Complete</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getPercentWorkComplete()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_PercentWorkComplete();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getActualCost <em>Actual Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getActualCost()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_ActualCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getActualFinish <em>Actual Finish</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Finish</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getActualFinish()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_ActualFinish();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getActualOvertimeCost <em>Actual Overtime Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Overtime Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getActualOvertimeCost()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_ActualOvertimeCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getActualOvertimeWork <em>Actual Overtime Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Overtime Work</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getActualOvertimeWork()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_ActualOvertimeWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getActualStart <em>Actual Start</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Start</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getActualStart()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_ActualStart();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getActualWork <em>Actual Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Work</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getActualWork()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_ActualWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getACWP <em>ACWP</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>ACWP</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getACWP()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_ACWP();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#isConfirmed <em>Confirmed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Confirmed</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#isConfirmed()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_Confirmed();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getCost <em>Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getCost()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_Cost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getCostRateTable <em>Cost Rate Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cost Rate Table</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getCostRateTable()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_CostRateTable();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getCostVariance <em>Cost Variance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cost Variance</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getCostVariance()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_CostVariance();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getCV <em>CV</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>CV</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getCV()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_CV();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getDelay <em>Delay</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Delay</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getDelay()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_Delay();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getFinish <em>Finish</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Finish</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getFinish()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_Finish();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getFinishVariance <em>Finish Variance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Finish Variance</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getFinishVariance()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_FinishVariance();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getHyperlink <em>Hyperlink</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hyperlink</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getHyperlink()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_Hyperlink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getHyperlinkAddress <em>Hyperlink Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hyperlink Address</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getHyperlinkAddress()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_HyperlinkAddress();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getHyperlinkSubAddress <em>Hyperlink Sub Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hyperlink Sub Address</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getHyperlinkSubAddress()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_HyperlinkSubAddress();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getWorkVariance <em>Work Variance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Work Variance</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getWorkVariance()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_WorkVariance();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#isHasFixedRateUnits <em>Has Fixed Rate Units</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Has Fixed Rate Units</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#isHasFixedRateUnits()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_HasFixedRateUnits();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#isFixedMaterial <em>Fixed Material</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Fixed Material</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#isFixedMaterial()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_FixedMaterial();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getLevelingDelay <em>Leveling Delay</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Leveling Delay</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getLevelingDelay()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_LevelingDelay();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getLevelingDelayFormat <em>Leveling Delay Format</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Leveling Delay Format</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getLevelingDelayFormat()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_LevelingDelayFormat();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#isLinkedFields <em>Linked Fields</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Linked Fields</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#isLinkedFields()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_LinkedFields();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#isMilestone <em>Milestone</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Milestone</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#isMilestone()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_Milestone();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getNotes <em>Notes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Notes</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getNotes()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_Notes();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#isOverallocated <em>Overallocated</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Overallocated</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#isOverallocated()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_Overallocated();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getOvertimeCost <em>Overtime Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Overtime Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getOvertimeCost()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_OvertimeCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getOvertimeWork <em>Overtime Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Overtime Work</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getOvertimeWork()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_OvertimeWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getRegularWork <em>Regular Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Regular Work</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getRegularWork()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_RegularWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getRemainingCost <em>Remaining Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remaining Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getRemainingCost()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_RemainingCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getRemainingOvertimeCost <em>Remaining Overtime Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remaining Overtime Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getRemainingOvertimeCost()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_RemainingOvertimeCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getRemainingOvertimeWork <em>Remaining Overtime Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remaining Overtime Work</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getRemainingOvertimeWork()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_RemainingOvertimeWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getRemainingWork <em>Remaining Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remaining Work</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getRemainingWork()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_RemainingWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#isResponsePending <em>Response Pending</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Response Pending</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#isResponsePending()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_ResponsePending();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getStart <em>Start</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Start</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getStart()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_Start();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getStop <em>Stop</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Stop</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getStop()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_Stop();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getResume <em>Resume</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Resume</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getResume()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_Resume();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getStartVariance <em>Start Variance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Start Variance</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getStartVariance()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_StartVariance();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getUnits <em>Units</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Units</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getUnits()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_Units();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#isUpdateNeeded <em>Update Needed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Update Needed</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#isUpdateNeeded()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_UpdateNeeded();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getVAC <em>VAC</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>VAC</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getVAC()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_VAC();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getWork <em>Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Work</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getWork()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_Work();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getWorkContour <em>Work Contour</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Work Contour</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getWorkContour()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_WorkContour();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getBCWS <em>BCWS</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>BCWS</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getBCWS()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_BCWS();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getBCWP <em>BCWP</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>BCWP</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getBCWP()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_BCWP();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getBookingType <em>Booking Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Booking Type</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getBookingType()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_BookingType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getActualWorkProtected <em>Actual Work Protected</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Work Protected</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getActualWorkProtected()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_ActualWorkProtected();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getActualOvertimeWorkProtected <em>Actual Overtime Work Protected</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Overtime Work Protected</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getActualOvertimeWorkProtected()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_ActualOvertimeWorkProtected();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Assignment#getCreationDate <em>Creation Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Creation Date</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getCreationDate()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EAttribute getAssignment_CreationDate();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Assignment#getExtendedAttribute <em>Extended Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Extended Attribute</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getExtendedAttribute()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EReference getAssignment_ExtendedAttribute();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Assignment#getBaseline <em>Baseline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Baseline</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getBaseline()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EReference getAssignment_Baseline();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Assignment#getTimephasedData <em>Timephased Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Timephased Data</em>'.
-	 * @see org.eclipse.epf.msproject.Assignment#getTimephasedData()
-	 * @see #getAssignment()
-	 * @generated
-	 */
-	EReference getAssignment_TimephasedData();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Assignments <em>Assignments</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Assignments</em>'.
-	 * @see org.eclipse.epf.msproject.Assignments
-	 * @generated
-	 */
-	EClass getAssignments();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Assignments#getAssignment <em>Assignment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Assignment</em>'.
-	 * @see org.eclipse.epf.msproject.Assignments#getAssignment()
-	 * @see #getAssignments()
-	 * @generated
-	 */
-	EReference getAssignments_Assignment();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.AvailabilityPeriod <em>Availability Period</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Availability Period</em>'.
-	 * @see org.eclipse.epf.msproject.AvailabilityPeriod
-	 * @generated
-	 */
-	EClass getAvailabilityPeriod();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.AvailabilityPeriod#getAvailableFrom <em>Available From</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Available From</em>'.
-	 * @see org.eclipse.epf.msproject.AvailabilityPeriod#getAvailableFrom()
-	 * @see #getAvailabilityPeriod()
-	 * @generated
-	 */
-	EAttribute getAvailabilityPeriod_AvailableFrom();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.AvailabilityPeriod#getAvailableTo <em>Available To</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Available To</em>'.
-	 * @see org.eclipse.epf.msproject.AvailabilityPeriod#getAvailableTo()
-	 * @see #getAvailabilityPeriod()
-	 * @generated
-	 */
-	EAttribute getAvailabilityPeriod_AvailableTo();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.AvailabilityPeriod#getAvailableUnits <em>Available Units</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Available Units</em>'.
-	 * @see org.eclipse.epf.msproject.AvailabilityPeriod#getAvailableUnits()
-	 * @see #getAvailabilityPeriod()
-	 * @generated
-	 */
-	EAttribute getAvailabilityPeriod_AvailableUnits();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.AvailabilityPeriods <em>Availability Periods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Availability Periods</em>'.
-	 * @see org.eclipse.epf.msproject.AvailabilityPeriods
-	 * @generated
-	 */
-	EClass getAvailabilityPeriods();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.AvailabilityPeriods#getAvailabilityPeriod <em>Availability Period</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Availability Period</em>'.
-	 * @see org.eclipse.epf.msproject.AvailabilityPeriods#getAvailabilityPeriod()
-	 * @see #getAvailabilityPeriods()
-	 * @generated
-	 */
-	EReference getAvailabilityPeriods_AvailabilityPeriod();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Baseline <em>Baseline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Baseline</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline
-	 * @generated
-	 */
-	EClass getBaseline();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Baseline#getTimephasedData <em>Timephased Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Timephased Data</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline#getTimephasedData()
-	 * @see #getBaseline()
-	 * @generated
-	 */
-	EReference getBaseline_TimephasedData();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline#getNumber <em>Number</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Number</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline#getNumber()
-	 * @see #getBaseline()
-	 * @generated
-	 */
-	EAttribute getBaseline_Number();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline#isInterim <em>Interim</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Interim</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline#isInterim()
-	 * @see #getBaseline()
-	 * @generated
-	 */
-	EAttribute getBaseline_Interim();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline#getStart <em>Start</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Start</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline#getStart()
-	 * @see #getBaseline()
-	 * @generated
-	 */
-	EAttribute getBaseline_Start();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline#getFinish <em>Finish</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Finish</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline#getFinish()
-	 * @see #getBaseline()
-	 * @generated
-	 */
-	EAttribute getBaseline_Finish();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline#getDuration <em>Duration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Duration</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline#getDuration()
-	 * @see #getBaseline()
-	 * @generated
-	 */
-	EAttribute getBaseline_Duration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline#getDurationFormat <em>Duration Format</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Duration Format</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline#getDurationFormat()
-	 * @see #getBaseline()
-	 * @generated
-	 */
-	EAttribute getBaseline_DurationFormat();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline#isEstimatedDuration <em>Estimated Duration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Estimated Duration</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline#isEstimatedDuration()
-	 * @see #getBaseline()
-	 * @generated
-	 */
-	EAttribute getBaseline_EstimatedDuration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline#getWork <em>Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Work</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline#getWork()
-	 * @see #getBaseline()
-	 * @generated
-	 */
-	EAttribute getBaseline_Work();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline#getCost <em>Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline#getCost()
-	 * @see #getBaseline()
-	 * @generated
-	 */
-	EAttribute getBaseline_Cost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline#getBCWS <em>BCWS</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>BCWS</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline#getBCWS()
-	 * @see #getBaseline()
-	 * @generated
-	 */
-	EAttribute getBaseline_BCWS();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline#getBCWP <em>BCWP</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>BCWP</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline#getBCWP()
-	 * @see #getBaseline()
-	 * @generated
-	 */
-	EAttribute getBaseline_BCWP();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Baseline2 <em>Baseline2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Baseline2</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline2
-	 * @generated
-	 */
-	EClass getBaseline2();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline2#getNumber <em>Number</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Number</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline2#getNumber()
-	 * @see #getBaseline2()
-	 * @generated
-	 */
-	EAttribute getBaseline2_Number();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline2#getWork <em>Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Work</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline2#getWork()
-	 * @see #getBaseline2()
-	 * @generated
-	 */
-	EAttribute getBaseline2_Work();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline2#getCost <em>Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline2#getCost()
-	 * @see #getBaseline2()
-	 * @generated
-	 */
-	EAttribute getBaseline2_Cost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline2#getBCWS <em>BCWS</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>BCWS</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline2#getBCWS()
-	 * @see #getBaseline2()
-	 * @generated
-	 */
-	EAttribute getBaseline2_BCWS();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline2#getBCWP <em>BCWP</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>BCWP</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline2#getBCWP()
-	 * @see #getBaseline2()
-	 * @generated
-	 */
-	EAttribute getBaseline2_BCWP();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Baseline3 <em>Baseline3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Baseline3</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline3
-	 * @generated
-	 */
-	EClass getBaseline3();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Baseline3#getTimephasedData <em>Timephased Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Timephased Data</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline3#getTimephasedData()
-	 * @see #getBaseline3()
-	 * @generated
-	 */
-	EReference getBaseline3_TimephasedData();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline3#getNumber <em>Number</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Number</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline3#getNumber()
-	 * @see #getBaseline3()
-	 * @generated
-	 */
-	EAttribute getBaseline3_Number();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline3#getStart <em>Start</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Start</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline3#getStart()
-	 * @see #getBaseline3()
-	 * @generated
-	 */
-	EAttribute getBaseline3_Start();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline3#getFinish <em>Finish</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Finish</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline3#getFinish()
-	 * @see #getBaseline3()
-	 * @generated
-	 */
-	EAttribute getBaseline3_Finish();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline3#getWork <em>Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Work</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline3#getWork()
-	 * @see #getBaseline3()
-	 * @generated
-	 */
-	EAttribute getBaseline3_Work();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline3#getCost <em>Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline3#getCost()
-	 * @see #getBaseline3()
-	 * @generated
-	 */
-	EAttribute getBaseline3_Cost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline3#getBCWS <em>BCWS</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>BCWS</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline3#getBCWS()
-	 * @see #getBaseline3()
-	 * @generated
-	 */
-	EAttribute getBaseline3_BCWS();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Baseline3#getBCWP <em>BCWP</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>BCWP</em>'.
-	 * @see org.eclipse.epf.msproject.Baseline3#getBCWP()
-	 * @see #getBaseline3()
-	 * @generated
-	 */
-	EAttribute getBaseline3_BCWP();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Calendar <em>Calendar</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Calendar</em>'.
-	 * @see org.eclipse.epf.msproject.Calendar
-	 * @generated
-	 */
-	EClass getCalendar();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Calendar#getUID <em>UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>UID</em>'.
-	 * @see org.eclipse.epf.msproject.Calendar#getUID()
-	 * @see #getCalendar()
-	 * @generated
-	 */
-	EAttribute getCalendar_UID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Calendar#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.epf.msproject.Calendar#getName()
-	 * @see #getCalendar()
-	 * @generated
-	 */
-	EAttribute getCalendar_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Calendar#isIsBaseCalendar <em>Is Base Calendar</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Base Calendar</em>'.
-	 * @see org.eclipse.epf.msproject.Calendar#isIsBaseCalendar()
-	 * @see #getCalendar()
-	 * @generated
-	 */
-	EAttribute getCalendar_IsBaseCalendar();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Calendar#getBaseCalendarUID <em>Base Calendar UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Base Calendar UID</em>'.
-	 * @see org.eclipse.epf.msproject.Calendar#getBaseCalendarUID()
-	 * @see #getCalendar()
-	 * @generated
-	 */
-	EAttribute getCalendar_BaseCalendarUID();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.Calendar#getWeekDays <em>Week Days</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Week Days</em>'.
-	 * @see org.eclipse.epf.msproject.Calendar#getWeekDays()
-	 * @see #getCalendar()
-	 * @generated
-	 */
-	EReference getCalendar_WeekDays();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Calendars <em>Calendars</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Calendars</em>'.
-	 * @see org.eclipse.epf.msproject.Calendars
-	 * @generated
-	 */
-	EClass getCalendars();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Calendars#getCalendar <em>Calendar</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Calendar</em>'.
-	 * @see org.eclipse.epf.msproject.Calendars#getCalendar()
-	 * @see #getCalendars()
-	 * @generated
-	 */
-	EReference getCalendars_Calendar();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.DocumentRoot <em>Document Root</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Document Root</em>'.
-	 * @see org.eclipse.epf.msproject.DocumentRoot
-	 * @generated
-	 */
-	EClass getDocumentRoot();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.msproject.DocumentRoot#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Mixed</em>'.
-	 * @see org.eclipse.epf.msproject.DocumentRoot#getMixed()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EAttribute getDocumentRoot_Mixed();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.epf.msproject.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
-	 * @see org.eclipse.epf.msproject.DocumentRoot#getXMLNSPrefixMap()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_XMLNSPrefixMap();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.epf.msproject.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XSI Schema Location</em>'.
-	 * @see org.eclipse.epf.msproject.DocumentRoot#getXSISchemaLocation()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_XSISchemaLocation();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.DocumentRoot#getProject <em>Project</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Project</em>'.
-	 * @see org.eclipse.epf.msproject.DocumentRoot#getProject()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_Project();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.ExtendedAttribute <em>Extended Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Extended Attribute</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute
-	 * @generated
-	 */
-	EClass getExtendedAttribute();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute#getFieldID <em>Field ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Field ID</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute#getFieldID()
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute_FieldID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute#getFieldName <em>Field Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Field Name</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute#getFieldName()
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute_FieldName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute#getAlias <em>Alias</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Alias</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute#getAlias()
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute_Alias();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute#getPhoneticAlias <em>Phonetic Alias</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Phonetic Alias</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute#getPhoneticAlias()
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute_PhoneticAlias();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute#getRollupType <em>Rollup Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Rollup Type</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute#getRollupType()
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute_RollupType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute#getCalculationType <em>Calculation Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Calculation Type</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute#getCalculationType()
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute_CalculationType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute#getFormula <em>Formula</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Formula</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute#getFormula()
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute_Formula();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute#isRestrictValues <em>Restrict Values</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Restrict Values</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute#isRestrictValues()
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute_RestrictValues();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute#getValuelistSortOrder <em>Valuelist Sort Order</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Valuelist Sort Order</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute#getValuelistSortOrder()
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute_ValuelistSortOrder();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute#isAppendNewValues <em>Append New Values</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Append New Values</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute#isAppendNewValues()
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute_AppendNewValues();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute#getDefault <em>Default</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Default</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute#getDefault()
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute_Default();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.ExtendedAttribute#getValueList <em>Value List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Value List</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute#getValueList()
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 */
-	EReference getExtendedAttribute_ValueList();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.ExtendedAttribute2 <em>Extended Attribute2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Extended Attribute2</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute2
-	 * @generated
-	 */
-	EClass getExtendedAttribute2();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute2#getUID <em>UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>UID</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute2#getUID()
-	 * @see #getExtendedAttribute2()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute2_UID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute2#getFieldID <em>Field ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Field ID</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute2#getFieldID()
-	 * @see #getExtendedAttribute2()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute2_FieldID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute2#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute2#getValue()
-	 * @see #getExtendedAttribute2()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute2_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute2#getValueID <em>Value ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value ID</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute2#getValueID()
-	 * @see #getExtendedAttribute2()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute2_ValueID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute2#getDurationFormat <em>Duration Format</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Duration Format</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute2#getDurationFormat()
-	 * @see #getExtendedAttribute2()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute2_DurationFormat();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.ExtendedAttribute3 <em>Extended Attribute3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Extended Attribute3</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute3
-	 * @generated
-	 */
-	EClass getExtendedAttribute3();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute3#getUID <em>UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>UID</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute3#getUID()
-	 * @see #getExtendedAttribute3()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute3_UID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute3#getFieldID <em>Field ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Field ID</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute3#getFieldID()
-	 * @see #getExtendedAttribute3()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute3_FieldID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute3#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute3#getValue()
-	 * @see #getExtendedAttribute3()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute3_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute3#getValueID <em>Value ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value ID</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute3#getValueID()
-	 * @see #getExtendedAttribute3()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute3_ValueID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute3#getDurationFormat <em>Duration Format</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Duration Format</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute3#getDurationFormat()
-	 * @see #getExtendedAttribute3()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute3_DurationFormat();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.ExtendedAttribute4 <em>Extended Attribute4</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Extended Attribute4</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute4
-	 * @generated
-	 */
-	EClass getExtendedAttribute4();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute4#getUID <em>UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>UID</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute4#getUID()
-	 * @see #getExtendedAttribute4()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute4_UID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute4#getFieldID <em>Field ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Field ID</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute4#getFieldID()
-	 * @see #getExtendedAttribute4()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute4_FieldID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute4#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute4#getValue()
-	 * @see #getExtendedAttribute4()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute4_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute4#getValueID <em>Value ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value ID</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute4#getValueID()
-	 * @see #getExtendedAttribute4()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute4_ValueID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.ExtendedAttribute4#getDurationFormat <em>Duration Format</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Duration Format</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute4#getDurationFormat()
-	 * @see #getExtendedAttribute4()
-	 * @generated
-	 */
-	EAttribute getExtendedAttribute4_DurationFormat();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.ExtendedAttributes <em>Extended Attributes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Extended Attributes</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttributes
-	 * @generated
-	 */
-	EClass getExtendedAttributes();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.ExtendedAttributes#getExtendedAttribute <em>Extended Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Extended Attribute</em>'.
-	 * @see org.eclipse.epf.msproject.ExtendedAttributes#getExtendedAttribute()
-	 * @see #getExtendedAttributes()
-	 * @generated
-	 */
-	EReference getExtendedAttributes_ExtendedAttribute();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Mask <em>Mask</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Mask</em>'.
-	 * @see org.eclipse.epf.msproject.Mask
-	 * @generated
-	 */
-	EClass getMask();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Mask#getLevel <em>Level</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Level</em>'.
-	 * @see org.eclipse.epf.msproject.Mask#getLevel()
-	 * @see #getMask()
-	 * @generated
-	 */
-	EAttribute getMask_Level();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Mask#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.epf.msproject.Mask#getType()
-	 * @see #getMask()
-	 * @generated
-	 */
-	EAttribute getMask_Type();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Mask#getLength <em>Length</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Length</em>'.
-	 * @see org.eclipse.epf.msproject.Mask#getLength()
-	 * @see #getMask()
-	 * @generated
-	 */
-	EAttribute getMask_Length();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Mask#getSeparator <em>Separator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Separator</em>'.
-	 * @see org.eclipse.epf.msproject.Mask#getSeparator()
-	 * @see #getMask()
-	 * @generated
-	 */
-	EAttribute getMask_Separator();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Masks <em>Masks</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Masks</em>'.
-	 * @see org.eclipse.epf.msproject.Masks
-	 * @generated
-	 */
-	EClass getMasks();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Masks#getMask <em>Mask</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Mask</em>'.
-	 * @see org.eclipse.epf.msproject.Masks#getMask()
-	 * @see #getMasks()
-	 * @generated
-	 */
-	EReference getMasks_Mask();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.OutlineCode <em>Outline Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Outline Code</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode
-	 * @generated
-	 */
-	EClass getOutlineCode();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode#getFieldID <em>Field ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Field ID</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode#getFieldID()
-	 * @see #getOutlineCode()
-	 * @generated
-	 */
-	EAttribute getOutlineCode_FieldID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode#getFieldName <em>Field Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Field Name</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode#getFieldName()
-	 * @see #getOutlineCode()
-	 * @generated
-	 */
-	EAttribute getOutlineCode_FieldName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode#getAlias <em>Alias</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Alias</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode#getAlias()
-	 * @see #getOutlineCode()
-	 * @generated
-	 */
-	EAttribute getOutlineCode_Alias();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode#getPhoneticAlias <em>Phonetic Alias</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Phonetic Alias</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode#getPhoneticAlias()
-	 * @see #getOutlineCode()
-	 * @generated
-	 */
-	EAttribute getOutlineCode_PhoneticAlias();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.OutlineCode#getValues <em>Values</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Values</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode#getValues()
-	 * @see #getOutlineCode()
-	 * @generated
-	 */
-	EReference getOutlineCode_Values();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode#isEnterprise <em>Enterprise</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Enterprise</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode#isEnterprise()
-	 * @see #getOutlineCode()
-	 * @generated
-	 */
-	EAttribute getOutlineCode_Enterprise();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode#getEnterpriseOutlineCodeAlias <em>Enterprise Outline Code Alias</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Enterprise Outline Code Alias</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode#getEnterpriseOutlineCodeAlias()
-	 * @see #getOutlineCode()
-	 * @generated
-	 */
-	EAttribute getOutlineCode_EnterpriseOutlineCodeAlias();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode#isResourceSubstitutionEnabled <em>Resource Substitution Enabled</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Resource Substitution Enabled</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode#isResourceSubstitutionEnabled()
-	 * @see #getOutlineCode()
-	 * @generated
-	 */
-	EAttribute getOutlineCode_ResourceSubstitutionEnabled();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode#isLeafOnly <em>Leaf Only</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Leaf Only</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode#isLeafOnly()
-	 * @see #getOutlineCode()
-	 * @generated
-	 */
-	EAttribute getOutlineCode_LeafOnly();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode#isAllLevelsRequired <em>All Levels Required</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>All Levels Required</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode#isAllLevelsRequired()
-	 * @see #getOutlineCode()
-	 * @generated
-	 */
-	EAttribute getOutlineCode_AllLevelsRequired();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode#isOnlyTableValuesAllowed <em>Only Table Values Allowed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Only Table Values Allowed</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode#isOnlyTableValuesAllowed()
-	 * @see #getOutlineCode()
-	 * @generated
-	 */
-	EAttribute getOutlineCode_OnlyTableValuesAllowed();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.OutlineCode#getMasks <em>Masks</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Masks</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode#getMasks()
-	 * @see #getOutlineCode()
-	 * @generated
-	 */
-	EReference getOutlineCode_Masks();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.OutlineCode2 <em>Outline Code2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Outline Code2</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode2
-	 * @generated
-	 */
-	EClass getOutlineCode2();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode2#getUID <em>UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>UID</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode2#getUID()
-	 * @see #getOutlineCode2()
-	 * @generated
-	 */
-	EAttribute getOutlineCode2_UID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode2#getFieldID <em>Field ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Field ID</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode2#getFieldID()
-	 * @see #getOutlineCode2()
-	 * @generated
-	 */
-	EAttribute getOutlineCode2_FieldID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode2#getValueID <em>Value ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value ID</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode2#getValueID()
-	 * @see #getOutlineCode2()
-	 * @generated
-	 */
-	EAttribute getOutlineCode2_ValueID();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.OutlineCode3 <em>Outline Code3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Outline Code3</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode3
-	 * @generated
-	 */
-	EClass getOutlineCode3();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode3#getUID <em>UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>UID</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode3#getUID()
-	 * @see #getOutlineCode3()
-	 * @generated
-	 */
-	EAttribute getOutlineCode3_UID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode3#getFieldID <em>Field ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Field ID</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode3#getFieldID()
-	 * @see #getOutlineCode3()
-	 * @generated
-	 */
-	EAttribute getOutlineCode3_FieldID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.OutlineCode3#getValueID <em>Value ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value ID</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCode3#getValueID()
-	 * @see #getOutlineCode3()
-	 * @generated
-	 */
-	EAttribute getOutlineCode3_ValueID();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.OutlineCodes <em>Outline Codes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Outline Codes</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCodes
-	 * @generated
-	 */
-	EClass getOutlineCodes();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.OutlineCodes#getOutlineCode <em>Outline Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Outline Code</em>'.
-	 * @see org.eclipse.epf.msproject.OutlineCodes#getOutlineCode()
-	 * @see #getOutlineCodes()
-	 * @generated
-	 */
-	EReference getOutlineCodes_OutlineCode();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.PredecessorLink <em>Predecessor Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Predecessor Link</em>'.
-	 * @see org.eclipse.epf.msproject.PredecessorLink
-	 * @generated
-	 */
-	EClass getPredecessorLink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.PredecessorLink#getPredecessorUID <em>Predecessor UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Predecessor UID</em>'.
-	 * @see org.eclipse.epf.msproject.PredecessorLink#getPredecessorUID()
-	 * @see #getPredecessorLink()
-	 * @generated
-	 */
-	EAttribute getPredecessorLink_PredecessorUID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.PredecessorLink#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.epf.msproject.PredecessorLink#getType()
-	 * @see #getPredecessorLink()
-	 * @generated
-	 */
-	EAttribute getPredecessorLink_Type();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.PredecessorLink#isCrossProject <em>Cross Project</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cross Project</em>'.
-	 * @see org.eclipse.epf.msproject.PredecessorLink#isCrossProject()
-	 * @see #getPredecessorLink()
-	 * @generated
-	 */
-	EAttribute getPredecessorLink_CrossProject();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.PredecessorLink#getCrossProjectName <em>Cross Project Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cross Project Name</em>'.
-	 * @see org.eclipse.epf.msproject.PredecessorLink#getCrossProjectName()
-	 * @see #getPredecessorLink()
-	 * @generated
-	 */
-	EAttribute getPredecessorLink_CrossProjectName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.PredecessorLink#getLinkLag <em>Link Lag</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Link Lag</em>'.
-	 * @see org.eclipse.epf.msproject.PredecessorLink#getLinkLag()
-	 * @see #getPredecessorLink()
-	 * @generated
-	 */
-	EAttribute getPredecessorLink_LinkLag();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.PredecessorLink#getLagFormat <em>Lag Format</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lag Format</em>'.
-	 * @see org.eclipse.epf.msproject.PredecessorLink#getLagFormat()
-	 * @see #getPredecessorLink()
-	 * @generated
-	 */
-	EAttribute getPredecessorLink_LagFormat();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Project <em>Project</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Project</em>'.
-	 * @see org.eclipse.epf.msproject.Project
-	 * @generated
-	 */
-	EClass getProject();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getUID <em>UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>UID</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getUID()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_UID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getName()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Title</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getTitle()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_Title();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getSubject <em>Subject</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Subject</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getSubject()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_Subject();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getCategory <em>Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Category</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getCategory()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_Category();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getCompany <em>Company</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Company</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getCompany()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_Company();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getManager <em>Manager</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Manager</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getManager()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_Manager();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getAuthor <em>Author</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Author</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getAuthor()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_Author();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getCreationDate <em>Creation Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Creation Date</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getCreationDate()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_CreationDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getRevision <em>Revision</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Revision</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getRevision()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_Revision();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getLastSaved <em>Last Saved</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Last Saved</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getLastSaved()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_LastSaved();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isScheduleFromStart <em>Schedule From Start</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Schedule From Start</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isScheduleFromStart()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_ScheduleFromStart();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getStartDate <em>Start Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Start Date</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getStartDate()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_StartDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getFinishDate <em>Finish Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Finish Date</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getFinishDate()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_FinishDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getFYStartDate <em>FY Start Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>FY Start Date</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getFYStartDate()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_FYStartDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getCriticalSlackLimit <em>Critical Slack Limit</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Critical Slack Limit</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getCriticalSlackLimit()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_CriticalSlackLimit();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getCurrencyDigits <em>Currency Digits</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Currency Digits</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getCurrencyDigits()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_CurrencyDigits();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getCurrencySymbol <em>Currency Symbol</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Currency Symbol</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getCurrencySymbol()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_CurrencySymbol();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getCurrencySymbolPosition <em>Currency Symbol Position</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Currency Symbol Position</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getCurrencySymbolPosition()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_CurrencySymbolPosition();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getCalendarUID <em>Calendar UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Calendar UID</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getCalendarUID()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_CalendarUID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getDefaultStartTime <em>Default Start Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Default Start Time</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getDefaultStartTime()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_DefaultStartTime();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getDefaultFinishTime <em>Default Finish Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Default Finish Time</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getDefaultFinishTime()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_DefaultFinishTime();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getMinutesPerDay <em>Minutes Per Day</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Minutes Per Day</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getMinutesPerDay()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_MinutesPerDay();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getMinutesPerWeek <em>Minutes Per Week</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Minutes Per Week</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getMinutesPerWeek()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_MinutesPerWeek();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getDaysPerMonth <em>Days Per Month</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Days Per Month</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getDaysPerMonth()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_DaysPerMonth();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getDefaultTaskType <em>Default Task Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Default Task Type</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getDefaultTaskType()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_DefaultTaskType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getDefaultFixedCostAccrual <em>Default Fixed Cost Accrual</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Default Fixed Cost Accrual</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getDefaultFixedCostAccrual()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_DefaultFixedCostAccrual();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getDefaultStandardRate <em>Default Standard Rate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Default Standard Rate</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getDefaultStandardRate()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_DefaultStandardRate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getDefaultOvertimeRate <em>Default Overtime Rate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Default Overtime Rate</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getDefaultOvertimeRate()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_DefaultOvertimeRate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getDurationFormat <em>Duration Format</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Duration Format</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getDurationFormat()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_DurationFormat();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getWorkFormat <em>Work Format</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Work Format</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getWorkFormat()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_WorkFormat();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isEditableActualCosts <em>Editable Actual Costs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Editable Actual Costs</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isEditableActualCosts()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_EditableActualCosts();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isHonorConstraints <em>Honor Constraints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Honor Constraints</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isHonorConstraints()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_HonorConstraints();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getEarnedValueMethod <em>Earned Value Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Earned Value Method</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getEarnedValueMethod()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_EarnedValueMethod();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isInsertedProjectsLikeSummary <em>Inserted Projects Like Summary</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Inserted Projects Like Summary</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isInsertedProjectsLikeSummary()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_InsertedProjectsLikeSummary();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isMultipleCriticalPaths <em>Multiple Critical Paths</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Multiple Critical Paths</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isMultipleCriticalPaths()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_MultipleCriticalPaths();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isNewTasksEffortDriven <em>New Tasks Effort Driven</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>New Tasks Effort Driven</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isNewTasksEffortDriven()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_NewTasksEffortDriven();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isNewTasksEstimated <em>New Tasks Estimated</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>New Tasks Estimated</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isNewTasksEstimated()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_NewTasksEstimated();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isSplitsInProgressTasks <em>Splits In Progress Tasks</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Splits In Progress Tasks</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isSplitsInProgressTasks()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_SplitsInProgressTasks();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isSpreadActualCost <em>Spread Actual Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Spread Actual Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isSpreadActualCost()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_SpreadActualCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isSpreadPercentComplete <em>Spread Percent Complete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Spread Percent Complete</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isSpreadPercentComplete()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_SpreadPercentComplete();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isTaskUpdatesResource <em>Task Updates Resource</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Task Updates Resource</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isTaskUpdatesResource()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_TaskUpdatesResource();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isFiscalYearStart <em>Fiscal Year Start</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Fiscal Year Start</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isFiscalYearStart()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_FiscalYearStart();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getWeekStartDay <em>Week Start Day</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Week Start Day</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getWeekStartDay()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_WeekStartDay();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isMoveCompletedEndsBack <em>Move Completed Ends Back</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Move Completed Ends Back</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isMoveCompletedEndsBack()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_MoveCompletedEndsBack();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isMoveRemainingStartsBack <em>Move Remaining Starts Back</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Move Remaining Starts Back</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isMoveRemainingStartsBack()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_MoveRemainingStartsBack();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isMoveRemainingStartsForward <em>Move Remaining Starts Forward</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Move Remaining Starts Forward</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isMoveRemainingStartsForward()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_MoveRemainingStartsForward();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isMoveCompletedEndsForward <em>Move Completed Ends Forward</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Move Completed Ends Forward</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isMoveCompletedEndsForward()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_MoveCompletedEndsForward();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getBaselineForEarnedValue <em>Baseline For Earned Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Baseline For Earned Value</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getBaselineForEarnedValue()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_BaselineForEarnedValue();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isAutoAddNewResourcesAndTasks <em>Auto Add New Resources And Tasks</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Auto Add New Resources And Tasks</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isAutoAddNewResourcesAndTasks()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_AutoAddNewResourcesAndTasks();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getStatusDate <em>Status Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Status Date</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getStatusDate()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_StatusDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getCurrentDate <em>Current Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Current Date</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getCurrentDate()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_CurrentDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isMicrosoftProjectServerURL <em>Microsoft Project Server URL</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Microsoft Project Server URL</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isMicrosoftProjectServerURL()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_MicrosoftProjectServerURL();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isAutolink <em>Autolink</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Autolink</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isAutolink()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_Autolink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getNewTaskStartDate <em>New Task Start Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>New Task Start Date</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getNewTaskStartDate()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_NewTaskStartDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getDefaultTaskEVMethod <em>Default Task EV Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Default Task EV Method</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getDefaultTaskEVMethod()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_DefaultTaskEVMethod();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isProjectExternallyEdited <em>Project Externally Edited</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Project Externally Edited</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isProjectExternallyEdited()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_ProjectExternallyEdited();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#getExtendedCreationDate <em>Extended Creation Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Extended Creation Date</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getExtendedCreationDate()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_ExtendedCreationDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isActualsInSync <em>Actuals In Sync</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actuals In Sync</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isActualsInSync()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_ActualsInSync();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isRemoveFileProperties <em>Remove File Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remove File Properties</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isRemoveFileProperties()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_RemoveFileProperties();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Project#isAdminProject <em>Admin Project</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Admin Project</em>'.
-	 * @see org.eclipse.epf.msproject.Project#isAdminProject()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EAttribute getProject_AdminProject();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.Project#getOutlineCodes <em>Outline Codes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Outline Codes</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getOutlineCodes()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EReference getProject_OutlineCodes();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.Project#getWBSMasks <em>WBS Masks</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>WBS Masks</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getWBSMasks()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EReference getProject_WBSMasks();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.Project#getExtendedAttributes <em>Extended Attributes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Extended Attributes</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getExtendedAttributes()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EReference getProject_ExtendedAttributes();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.Project#getCalendars <em>Calendars</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Calendars</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getCalendars()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EReference getProject_Calendars();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.Project#getTasks <em>Tasks</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Tasks</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getTasks()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EReference getProject_Tasks();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.Project#getResources <em>Resources</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Resources</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getResources()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EReference getProject_Resources();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.Project#getAssignments <em>Assignments</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Assignments</em>'.
-	 * @see org.eclipse.epf.msproject.Project#getAssignments()
-	 * @see #getProject()
-	 * @generated
-	 */
-	EReference getProject_Assignments();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Rate <em>Rate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Rate</em>'.
-	 * @see org.eclipse.epf.msproject.Rate
-	 * @generated
-	 */
-	EClass getRate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Rate#getRatesFrom <em>Rates From</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Rates From</em>'.
-	 * @see org.eclipse.epf.msproject.Rate#getRatesFrom()
-	 * @see #getRate()
-	 * @generated
-	 */
-	EAttribute getRate_RatesFrom();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Rate#getRatesTo <em>Rates To</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Rates To</em>'.
-	 * @see org.eclipse.epf.msproject.Rate#getRatesTo()
-	 * @see #getRate()
-	 * @generated
-	 */
-	EAttribute getRate_RatesTo();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Rate#getRateTable <em>Rate Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Rate Table</em>'.
-	 * @see org.eclipse.epf.msproject.Rate#getRateTable()
-	 * @see #getRate()
-	 * @generated
-	 */
-	EAttribute getRate_RateTable();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Rate#getStandardRate <em>Standard Rate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Standard Rate</em>'.
-	 * @see org.eclipse.epf.msproject.Rate#getStandardRate()
-	 * @see #getRate()
-	 * @generated
-	 */
-	EAttribute getRate_StandardRate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Rate#getStandardRateFormat <em>Standard Rate Format</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Standard Rate Format</em>'.
-	 * @see org.eclipse.epf.msproject.Rate#getStandardRateFormat()
-	 * @see #getRate()
-	 * @generated
-	 */
-	EAttribute getRate_StandardRateFormat();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Rate#getOvertimeRate <em>Overtime Rate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Overtime Rate</em>'.
-	 * @see org.eclipse.epf.msproject.Rate#getOvertimeRate()
-	 * @see #getRate()
-	 * @generated
-	 */
-	EAttribute getRate_OvertimeRate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Rate#getOvertimeRateFormat <em>Overtime Rate Format</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Overtime Rate Format</em>'.
-	 * @see org.eclipse.epf.msproject.Rate#getOvertimeRateFormat()
-	 * @see #getRate()
-	 * @generated
-	 */
-	EAttribute getRate_OvertimeRateFormat();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Rate#getCostPerUse <em>Cost Per Use</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cost Per Use</em>'.
-	 * @see org.eclipse.epf.msproject.Rate#getCostPerUse()
-	 * @see #getRate()
-	 * @generated
-	 */
-	EAttribute getRate_CostPerUse();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Rates <em>Rates</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Rates</em>'.
-	 * @see org.eclipse.epf.msproject.Rates
-	 * @generated
-	 */
-	EClass getRates();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Rates#getRate <em>Rate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Rate</em>'.
-	 * @see org.eclipse.epf.msproject.Rates#getRate()
-	 * @see #getRates()
-	 * @generated
-	 */
-	EReference getRates_Rate();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Resource <em>Resource</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Resource</em>'.
-	 * @see org.eclipse.epf.msproject.Resource
-	 * @generated
-	 */
-	EClass getResource();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getUID <em>UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>UID</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getUID()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_UID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getID <em>ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>ID</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getID()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_ID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getName()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getType()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_Type();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#isIsNull <em>Is Null</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Null</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#isIsNull()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_IsNull();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getInitials <em>Initials</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Initials</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getInitials()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_Initials();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getPhonetics <em>Phonetics</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Phonetics</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getPhonetics()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_Phonetics();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getNTAccount <em>NT Account</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>NT Account</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getNTAccount()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_NTAccount();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getMaterialLabel <em>Material Label</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Material Label</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getMaterialLabel()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_MaterialLabel();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Code</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getCode()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_Code();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getGroup <em>Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Group</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getGroup()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_Group();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getWorkGroup <em>Work Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Work Group</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getWorkGroup()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_WorkGroup();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getEmailAddress <em>Email Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Email Address</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getEmailAddress()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_EmailAddress();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getHyperlink <em>Hyperlink</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hyperlink</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getHyperlink()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_Hyperlink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getHyperlinkAddress <em>Hyperlink Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hyperlink Address</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getHyperlinkAddress()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_HyperlinkAddress();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getHyperlinkSubAddress <em>Hyperlink Sub Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hyperlink Sub Address</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getHyperlinkSubAddress()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_HyperlinkSubAddress();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getMaxUnits <em>Max Units</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Max Units</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getMaxUnits()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_MaxUnits();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getPeakUnits <em>Peak Units</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Peak Units</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getPeakUnits()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_PeakUnits();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#isOverAllocated <em>Over Allocated</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Over Allocated</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#isOverAllocated()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_OverAllocated();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getAvailableFrom <em>Available From</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Available From</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getAvailableFrom()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_AvailableFrom();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getAvailableTo <em>Available To</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Available To</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getAvailableTo()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_AvailableTo();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getStart <em>Start</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Start</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getStart()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_Start();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getFinish <em>Finish</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Finish</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getFinish()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_Finish();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#isCanLevel <em>Can Level</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Can Level</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#isCanLevel()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_CanLevel();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getAccrueAt <em>Accrue At</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Accrue At</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getAccrueAt()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_AccrueAt();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getWork <em>Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Work</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getWork()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_Work();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getRegularWork <em>Regular Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Regular Work</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getRegularWork()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_RegularWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getOvertimeWork <em>Overtime Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Overtime Work</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getOvertimeWork()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_OvertimeWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getActualWork <em>Actual Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Work</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getActualWork()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_ActualWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getRemainingWork <em>Remaining Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remaining Work</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getRemainingWork()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_RemainingWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getActualOvertimeWork <em>Actual Overtime Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Overtime Work</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getActualOvertimeWork()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_ActualOvertimeWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getRemainingOvertimeWork <em>Remaining Overtime Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remaining Overtime Work</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getRemainingOvertimeWork()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_RemainingOvertimeWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getPercentWorkComplete <em>Percent Work Complete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Percent Work Complete</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getPercentWorkComplete()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_PercentWorkComplete();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getStandardRate <em>Standard Rate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Standard Rate</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getStandardRate()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_StandardRate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getStandardRateFormat <em>Standard Rate Format</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Standard Rate Format</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getStandardRateFormat()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_StandardRateFormat();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getCost <em>Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getCost()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_Cost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getOvertimeRate <em>Overtime Rate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Overtime Rate</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getOvertimeRate()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_OvertimeRate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getOvertimeRateFormat <em>Overtime Rate Format</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Overtime Rate Format</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getOvertimeRateFormat()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_OvertimeRateFormat();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getOvertimeCost <em>Overtime Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Overtime Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getOvertimeCost()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_OvertimeCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getCostPerUse <em>Cost Per Use</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cost Per Use</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getCostPerUse()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_CostPerUse();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getActualCost <em>Actual Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getActualCost()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_ActualCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getActualOvertimeCost <em>Actual Overtime Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Overtime Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getActualOvertimeCost()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_ActualOvertimeCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getRemainingCost <em>Remaining Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remaining Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getRemainingCost()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_RemainingCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getRemainingOvertimeCost <em>Remaining Overtime Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remaining Overtime Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getRemainingOvertimeCost()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_RemainingOvertimeCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getWorkVariance <em>Work Variance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Work Variance</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getWorkVariance()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_WorkVariance();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getCostVariance <em>Cost Variance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cost Variance</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getCostVariance()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_CostVariance();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getSV <em>SV</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>SV</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getSV()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_SV();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getCV <em>CV</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>CV</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getCV()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_CV();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getACWP <em>ACWP</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>ACWP</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getACWP()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_ACWP();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getCalendarUID <em>Calendar UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Calendar UID</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getCalendarUID()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_CalendarUID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getNotes <em>Notes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Notes</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getNotes()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_Notes();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getBCWS <em>BCWS</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>BCWS</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getBCWS()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_BCWS();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getBCWP <em>BCWP</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>BCWP</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getBCWP()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_BCWP();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#isIsGeneric <em>Is Generic</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Generic</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#isIsGeneric()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_IsGeneric();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#isIsInactive <em>Is Inactive</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Inactive</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#isIsInactive()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_IsInactive();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#isIsEnterprise <em>Is Enterprise</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Enterprise</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#isIsEnterprise()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_IsEnterprise();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getBookingType <em>Booking Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Booking Type</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getBookingType()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_BookingType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getActualWorkProtected <em>Actual Work Protected</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Work Protected</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getActualWorkProtected()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_ActualWorkProtected();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getActualOvertimeWorkProtected <em>Actual Overtime Work Protected</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Overtime Work Protected</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getActualOvertimeWorkProtected()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_ActualOvertimeWorkProtected();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getActiveDirectoryGUID <em>Active Directory GUID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Active Directory GUID</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getActiveDirectoryGUID()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_ActiveDirectoryGUID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Resource#getCreationDate <em>Creation Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Creation Date</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getCreationDate()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EAttribute getResource_CreationDate();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Resource#getExtendedAttribute <em>Extended Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Extended Attribute</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getExtendedAttribute()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EReference getResource_ExtendedAttribute();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Resource#getBaseline <em>Baseline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Baseline</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getBaseline()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EReference getResource_Baseline();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Resource#getOutlineCode <em>Outline Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Outline Code</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getOutlineCode()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EReference getResource_OutlineCode();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.Resource#getAvailabilityPeriods <em>Availability Periods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Availability Periods</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getAvailabilityPeriods()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EReference getResource_AvailabilityPeriods();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.Resource#getRates <em>Rates</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Rates</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getRates()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EReference getResource_Rates();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Resource#getTimephasedData <em>Timephased Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Timephased Data</em>'.
-	 * @see org.eclipse.epf.msproject.Resource#getTimephasedData()
-	 * @see #getResource()
-	 * @generated
-	 */
-	EReference getResource_TimephasedData();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Resources <em>Resources</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Resources</em>'.
-	 * @see org.eclipse.epf.msproject.Resources
-	 * @generated
-	 */
-	EClass getResources();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Resources#getResource <em>Resource</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Resource</em>'.
-	 * @see org.eclipse.epf.msproject.Resources#getResource()
-	 * @see #getResources()
-	 * @generated
-	 */
-	EReference getResources_Resource();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Task <em>Task</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Task</em>'.
-	 * @see org.eclipse.epf.msproject.Task
-	 * @generated
-	 */
-	EClass getTask();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getUID <em>UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>UID</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getUID()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_UID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getID <em>ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>ID</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getID()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getName()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getType()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Type();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isIsNull <em>Is Null</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Null</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isIsNull()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_IsNull();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getCreateDate <em>Create Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Create Date</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getCreateDate()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_CreateDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getContact <em>Contact</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Contact</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getContact()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Contact();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getWBS <em>WBS</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>WBS</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getWBS()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_WBS();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getWBSLevel <em>WBS Level</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>WBS Level</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getWBSLevel()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_WBSLevel();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getOutlineNumber <em>Outline Number</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Outline Number</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getOutlineNumber()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_OutlineNumber();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getOutlineLevel <em>Outline Level</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Outline Level</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getOutlineLevel()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_OutlineLevel();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getPriority <em>Priority</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Priority</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getPriority()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Priority();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getStart <em>Start</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Start</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getStart()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Start();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getFinish <em>Finish</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Finish</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getFinish()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Finish();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getDuration <em>Duration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Duration</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getDuration()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Duration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getDurationFormat <em>Duration Format</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Duration Format</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getDurationFormat()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_DurationFormat();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getWork <em>Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Work</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getWork()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Work();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getStop <em>Stop</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Stop</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getStop()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Stop();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getResume <em>Resume</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Resume</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getResume()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Resume();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isResumeValid <em>Resume Valid</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Resume Valid</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isResumeValid()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ResumeValid();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isEffortDriven <em>Effort Driven</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Effort Driven</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isEffortDriven()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_EffortDriven();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isRecurring <em>Recurring</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Recurring</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isRecurring()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Recurring();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isOverAllocated <em>Over Allocated</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Over Allocated</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isOverAllocated()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_OverAllocated();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isEstimated <em>Estimated</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Estimated</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isEstimated()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Estimated();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isMilestone <em>Milestone</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Milestone</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isMilestone()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Milestone();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isSummary <em>Summary</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Summary</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isSummary()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Summary();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isCritical <em>Critical</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Critical</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isCritical()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Critical();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isIsSubproject <em>Is Subproject</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Subproject</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isIsSubproject()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_IsSubproject();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isIsSubprojectReadOnly <em>Is Subproject Read Only</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Subproject Read Only</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isIsSubprojectReadOnly()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_IsSubprojectReadOnly();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getSubprojectName <em>Subproject Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Subproject Name</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getSubprojectName()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_SubprojectName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isExternalTask <em>External Task</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>External Task</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isExternalTask()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ExternalTask();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getExternalTaskProject <em>External Task Project</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>External Task Project</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getExternalTaskProject()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ExternalTaskProject();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getEarlyStart <em>Early Start</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Early Start</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getEarlyStart()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_EarlyStart();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getEarlyFinish <em>Early Finish</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Early Finish</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getEarlyFinish()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_EarlyFinish();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getLateStart <em>Late Start</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Late Start</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getLateStart()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_LateStart();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getLateFinish <em>Late Finish</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Late Finish</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getLateFinish()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_LateFinish();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getStartVariance <em>Start Variance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Start Variance</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getStartVariance()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_StartVariance();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getFinishVariance <em>Finish Variance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Finish Variance</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getFinishVariance()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_FinishVariance();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getWorkVariance <em>Work Variance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Work Variance</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getWorkVariance()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_WorkVariance();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getFreeSlack <em>Free Slack</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Free Slack</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getFreeSlack()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_FreeSlack();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getTotalSlack <em>Total Slack</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Total Slack</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getTotalSlack()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_TotalSlack();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getFixedCost <em>Fixed Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Fixed Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getFixedCost()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_FixedCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getFixedCostAccrual <em>Fixed Cost Accrual</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Fixed Cost Accrual</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getFixedCostAccrual()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_FixedCostAccrual();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getPercentComplete <em>Percent Complete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Percent Complete</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getPercentComplete()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_PercentComplete();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getPercentWorkComplete <em>Percent Work Complete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Percent Work Complete</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getPercentWorkComplete()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_PercentWorkComplete();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getCost <em>Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getCost()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Cost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getOvertimeCost <em>Overtime Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Overtime Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getOvertimeCost()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_OvertimeCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getOvertimeWork <em>Overtime Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Overtime Work</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getOvertimeWork()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_OvertimeWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getActualStart <em>Actual Start</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Start</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getActualStart()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ActualStart();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getActualFinish <em>Actual Finish</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Finish</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getActualFinish()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ActualFinish();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getActualDuration <em>Actual Duration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Duration</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getActualDuration()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ActualDuration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getActualCost <em>Actual Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getActualCost()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ActualCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getActualOvertimeCost <em>Actual Overtime Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Overtime Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getActualOvertimeCost()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ActualOvertimeCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getActualWork <em>Actual Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Work</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getActualWork()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ActualWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getActualOvertimeWork <em>Actual Overtime Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Overtime Work</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getActualOvertimeWork()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ActualOvertimeWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getRegularWork <em>Regular Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Regular Work</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getRegularWork()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_RegularWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getRemainingDuration <em>Remaining Duration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remaining Duration</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getRemainingDuration()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_RemainingDuration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getRemainingCost <em>Remaining Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remaining Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getRemainingCost()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_RemainingCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getRemainingWork <em>Remaining Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remaining Work</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getRemainingWork()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_RemainingWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getRemainingOvertimeCost <em>Remaining Overtime Cost</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remaining Overtime Cost</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getRemainingOvertimeCost()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_RemainingOvertimeCost();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getRemainingOvertimeWork <em>Remaining Overtime Work</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Remaining Overtime Work</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getRemainingOvertimeWork()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_RemainingOvertimeWork();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getACWP <em>ACWP</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>ACWP</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getACWP()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ACWP();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getCV <em>CV</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>CV</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getCV()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_CV();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getConstraintType <em>Constraint Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Constraint Type</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getConstraintType()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ConstraintType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getCalendarUID <em>Calendar UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Calendar UID</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getCalendarUID()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_CalendarUID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getConstraintDate <em>Constraint Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Constraint Date</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getConstraintDate()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ConstraintDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getDeadline <em>Deadline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Deadline</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getDeadline()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Deadline();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isLevelAssignments <em>Level Assignments</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Level Assignments</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isLevelAssignments()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_LevelAssignments();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isLevelingCanSplit <em>Leveling Can Split</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Leveling Can Split</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isLevelingCanSplit()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_LevelingCanSplit();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getLevelingDelay <em>Leveling Delay</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Leveling Delay</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getLevelingDelay()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_LevelingDelay();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getLevelingDelayFormat <em>Leveling Delay Format</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Leveling Delay Format</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getLevelingDelayFormat()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_LevelingDelayFormat();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getPreLeveledStart <em>Pre Leveled Start</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Pre Leveled Start</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getPreLeveledStart()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_PreLeveledStart();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getPreLeveledFinish <em>Pre Leveled Finish</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Pre Leveled Finish</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getPreLeveledFinish()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_PreLeveledFinish();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getHyperlink <em>Hyperlink</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hyperlink</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getHyperlink()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Hyperlink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getHyperlinkAddress <em>Hyperlink Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hyperlink Address</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getHyperlinkAddress()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_HyperlinkAddress();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getHyperlinkSubAddress <em>Hyperlink Sub Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hyperlink Sub Address</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getHyperlinkSubAddress()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_HyperlinkSubAddress();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isIgnoreResourceCalendar <em>Ignore Resource Calendar</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ignore Resource Calendar</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isIgnoreResourceCalendar()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_IgnoreResourceCalendar();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getNotes <em>Notes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Notes</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getNotes()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Notes();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isHideBar <em>Hide Bar</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hide Bar</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isHideBar()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_HideBar();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#isRollup <em>Rollup</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Rollup</em>'.
-	 * @see org.eclipse.epf.msproject.Task#isRollup()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Rollup();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getBCWS <em>BCWS</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>BCWS</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getBCWS()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_BCWS();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getBCWP <em>BCWP</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>BCWP</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getBCWP()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_BCWP();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getPhysicalPercentComplete <em>Physical Percent Complete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Physical Percent Complete</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getPhysicalPercentComplete()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_PhysicalPercentComplete();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getEarnedValueMethod <em>Earned Value Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Earned Value Method</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getEarnedValueMethod()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_EarnedValueMethod();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Task#getPredecessorLink <em>Predecessor Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Predecessor Link</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getPredecessorLink()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EReference getTask_PredecessorLink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getActualWorkProtected <em>Actual Work Protected</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Work Protected</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getActualWorkProtected()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ActualWorkProtected();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Task#getActualOvertimeWorkProtected <em>Actual Overtime Work Protected</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Overtime Work Protected</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getActualOvertimeWorkProtected()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ActualOvertimeWorkProtected();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Task#getExtendedAttribute <em>Extended Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Extended Attribute</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getExtendedAttribute()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EReference getTask_ExtendedAttribute();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Task#getBaseline <em>Baseline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Baseline</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getBaseline()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EReference getTask_Baseline();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Task#getOutlineCode <em>Outline Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Outline Code</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getOutlineCode()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EReference getTask_OutlineCode();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Task#getTimephasedData <em>Timephased Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Timephased Data</em>'.
-	 * @see org.eclipse.epf.msproject.Task#getTimephasedData()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EReference getTask_TimephasedData();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Tasks <em>Tasks</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tasks</em>'.
-	 * @see org.eclipse.epf.msproject.Tasks
-	 * @generated
-	 */
-	EClass getTasks();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Tasks#getTask <em>Task</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Task</em>'.
-	 * @see org.eclipse.epf.msproject.Tasks#getTask()
-	 * @see #getTasks()
-	 * @generated
-	 */
-	EReference getTasks_Task();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.TimePeriod <em>Time Period</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Time Period</em>'.
-	 * @see org.eclipse.epf.msproject.TimePeriod
-	 * @generated
-	 */
-	EClass getTimePeriod();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.TimePeriod#getFromDate <em>From Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>From Date</em>'.
-	 * @see org.eclipse.epf.msproject.TimePeriod#getFromDate()
-	 * @see #getTimePeriod()
-	 * @generated
-	 */
-	EAttribute getTimePeriod_FromDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.TimePeriod#getToDate <em>To Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>To Date</em>'.
-	 * @see org.eclipse.epf.msproject.TimePeriod#getToDate()
-	 * @see #getTimePeriod()
-	 * @generated
-	 */
-	EAttribute getTimePeriod_ToDate();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.TimephasedDataType <em>Timephased Data Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Timephased Data Type</em>'.
-	 * @see org.eclipse.epf.msproject.TimephasedDataType
-	 * @generated
-	 */
-	EClass getTimephasedDataType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.TimephasedDataType#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.epf.msproject.TimephasedDataType#getType()
-	 * @see #getTimephasedDataType()
-	 * @generated
-	 */
-	EAttribute getTimephasedDataType_Type();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.TimephasedDataType#getUID <em>UID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>UID</em>'.
-	 * @see org.eclipse.epf.msproject.TimephasedDataType#getUID()
-	 * @see #getTimephasedDataType()
-	 * @generated
-	 */
-	EAttribute getTimephasedDataType_UID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.TimephasedDataType#getStart <em>Start</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Start</em>'.
-	 * @see org.eclipse.epf.msproject.TimephasedDataType#getStart()
-	 * @see #getTimephasedDataType()
-	 * @generated
-	 */
-	EAttribute getTimephasedDataType_Start();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.TimephasedDataType#getFinish <em>Finish</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Finish</em>'.
-	 * @see org.eclipse.epf.msproject.TimephasedDataType#getFinish()
-	 * @see #getTimephasedDataType()
-	 * @generated
-	 */
-	EAttribute getTimephasedDataType_Finish();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.TimephasedDataType#getUnit <em>Unit</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Unit</em>'.
-	 * @see org.eclipse.epf.msproject.TimephasedDataType#getUnit()
-	 * @see #getTimephasedDataType()
-	 * @generated
-	 */
-	EAttribute getTimephasedDataType_Unit();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.TimephasedDataType#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.epf.msproject.TimephasedDataType#getValue()
-	 * @see #getTimephasedDataType()
-	 * @generated
-	 */
-	EAttribute getTimephasedDataType_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Value <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Value</em>'.
-	 * @see org.eclipse.epf.msproject.Value
-	 * @generated
-	 */
-	EClass getValue();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Value#getValueID <em>Value ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value ID</em>'.
-	 * @see org.eclipse.epf.msproject.Value#getValueID()
-	 * @see #getValue()
-	 * @generated
-	 */
-	EAttribute getValue_ValueID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Value#getParentValueID <em>Parent Value ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Parent Value ID</em>'.
-	 * @see org.eclipse.epf.msproject.Value#getParentValueID()
-	 * @see #getValue()
-	 * @generated
-	 */
-	EAttribute getValue_ParentValueID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Value#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.epf.msproject.Value#getValue()
-	 * @see #getValue()
-	 * @generated
-	 */
-	EAttribute getValue_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Value#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.epf.msproject.Value#getDescription()
-	 * @see #getValue()
-	 * @generated
-	 */
-	EAttribute getValue_Description();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Value2 <em>Value2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Value2</em>'.
-	 * @see org.eclipse.epf.msproject.Value2
-	 * @generated
-	 */
-	EClass getValue2();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Value2#getID <em>ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>ID</em>'.
-	 * @see org.eclipse.epf.msproject.Value2#getID()
-	 * @see #getValue2()
-	 * @generated
-	 */
-	EAttribute getValue2_ID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Value2#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.epf.msproject.Value2#getValue()
-	 * @see #getValue2()
-	 * @generated
-	 */
-	EAttribute getValue2_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.Value2#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.epf.msproject.Value2#getDescription()
-	 * @see #getValue2()
-	 * @generated
-	 */
-	EAttribute getValue2_Description();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.ValueList <em>Value List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Value List</em>'.
-	 * @see org.eclipse.epf.msproject.ValueList
-	 * @generated
-	 */
-	EClass getValueList();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.ValueList#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Value</em>'.
-	 * @see org.eclipse.epf.msproject.ValueList#getValue()
-	 * @see #getValueList()
-	 * @generated
-	 */
-	EReference getValueList_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.Values <em>Values</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Values</em>'.
-	 * @see org.eclipse.epf.msproject.Values
-	 * @generated
-	 */
-	EClass getValues();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.msproject.Values#getGroup <em>Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group</em>'.
-	 * @see org.eclipse.epf.msproject.Values#getGroup()
-	 * @see #getValues()
-	 * @generated
-	 */
-	EAttribute getValues_Group();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.Values#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Value</em>'.
-	 * @see org.eclipse.epf.msproject.Values#getValue()
-	 * @see #getValues()
-	 * @generated
-	 */
-	EReference getValues_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.WBSMask <em>WBS Mask</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>WBS Mask</em>'.
-	 * @see org.eclipse.epf.msproject.WBSMask
-	 * @generated
-	 */
-	EClass getWBSMask();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.WBSMask#getLevel <em>Level</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Level</em>'.
-	 * @see org.eclipse.epf.msproject.WBSMask#getLevel()
-	 * @see #getWBSMask()
-	 * @generated
-	 */
-	EAttribute getWBSMask_Level();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.WBSMask#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.epf.msproject.WBSMask#getType()
-	 * @see #getWBSMask()
-	 * @generated
-	 */
-	EAttribute getWBSMask_Type();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.WBSMask#getLength <em>Length</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Length</em>'.
-	 * @see org.eclipse.epf.msproject.WBSMask#getLength()
-	 * @see #getWBSMask()
-	 * @generated
-	 */
-	EAttribute getWBSMask_Length();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.WBSMask#getSeparator <em>Separator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Separator</em>'.
-	 * @see org.eclipse.epf.msproject.WBSMask#getSeparator()
-	 * @see #getWBSMask()
-	 * @generated
-	 */
-	EAttribute getWBSMask_Separator();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.WBSMasks <em>WBS Masks</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>WBS Masks</em>'.
-	 * @see org.eclipse.epf.msproject.WBSMasks
-	 * @generated
-	 */
-	EClass getWBSMasks();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.WBSMasks#isVerifyUniqueCodes <em>Verify Unique Codes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Verify Unique Codes</em>'.
-	 * @see org.eclipse.epf.msproject.WBSMasks#isVerifyUniqueCodes()
-	 * @see #getWBSMasks()
-	 * @generated
-	 */
-	EAttribute getWBSMasks_VerifyUniqueCodes();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.WBSMasks#isGenerateCodes <em>Generate Codes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Generate Codes</em>'.
-	 * @see org.eclipse.epf.msproject.WBSMasks#isGenerateCodes()
-	 * @see #getWBSMasks()
-	 * @generated
-	 */
-	EAttribute getWBSMasks_GenerateCodes();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.WBSMasks#getPrefix <em>Prefix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Prefix</em>'.
-	 * @see org.eclipse.epf.msproject.WBSMasks#getPrefix()
-	 * @see #getWBSMasks()
-	 * @generated
-	 */
-	EAttribute getWBSMasks_Prefix();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.WBSMasks#getWBSMask <em>WBS Mask</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>WBS Mask</em>'.
-	 * @see org.eclipse.epf.msproject.WBSMasks#getWBSMask()
-	 * @see #getWBSMasks()
-	 * @generated
-	 */
-	EReference getWBSMasks_WBSMask();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.WeekDay <em>Week Day</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Week Day</em>'.
-	 * @see org.eclipse.epf.msproject.WeekDay
-	 * @generated
-	 */
-	EClass getWeekDay();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.WeekDay#getDayType <em>Day Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Day Type</em>'.
-	 * @see org.eclipse.epf.msproject.WeekDay#getDayType()
-	 * @see #getWeekDay()
-	 * @generated
-	 */
-	EAttribute getWeekDay_DayType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.WeekDay#isDayWorking <em>Day Working</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Day Working</em>'.
-	 * @see org.eclipse.epf.msproject.WeekDay#isDayWorking()
-	 * @see #getWeekDay()
-	 * @generated
-	 */
-	EAttribute getWeekDay_DayWorking();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.WeekDay#getTimePeriod <em>Time Period</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Time Period</em>'.
-	 * @see org.eclipse.epf.msproject.WeekDay#getTimePeriod()
-	 * @see #getWeekDay()
-	 * @generated
-	 */
-	EReference getWeekDay_TimePeriod();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.msproject.WeekDay#getWorkingTimes <em>Working Times</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Working Times</em>'.
-	 * @see org.eclipse.epf.msproject.WeekDay#getWorkingTimes()
-	 * @see #getWeekDay()
-	 * @generated
-	 */
-	EReference getWeekDay_WorkingTimes();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.WeekDays <em>Week Days</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Week Days</em>'.
-	 * @see org.eclipse.epf.msproject.WeekDays
-	 * @generated
-	 */
-	EClass getWeekDays();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.WeekDays#getWeekDay <em>Week Day</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Week Day</em>'.
-	 * @see org.eclipse.epf.msproject.WeekDays#getWeekDay()
-	 * @see #getWeekDays()
-	 * @generated
-	 */
-	EReference getWeekDays_WeekDay();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.WorkingTime <em>Working Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Working Time</em>'.
-	 * @see org.eclipse.epf.msproject.WorkingTime
-	 * @generated
-	 */
-	EClass getWorkingTime();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.WorkingTime#getFromTime <em>From Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>From Time</em>'.
-	 * @see org.eclipse.epf.msproject.WorkingTime#getFromTime()
-	 * @see #getWorkingTime()
-	 * @generated
-	 */
-	EAttribute getWorkingTime_FromTime();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.msproject.WorkingTime#getToTime <em>To Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>To Time</em>'.
-	 * @see org.eclipse.epf.msproject.WorkingTime#getToTime()
-	 * @see #getWorkingTime()
-	 * @generated
-	 */
-	EAttribute getWorkingTime_ToTime();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.msproject.WorkingTimes <em>Working Times</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Working Times</em>'.
-	 * @see org.eclipse.epf.msproject.WorkingTimes
-	 * @generated
-	 */
-	EClass getWorkingTimes();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.msproject.WorkingTimes#getWorkingTime <em>Working Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Working Time</em>'.
-	 * @see org.eclipse.epf.msproject.WorkingTimes#getWorkingTime()
-	 * @see #getWorkingTimes()
-	 * @generated
-	 */
-	EReference getWorkingTimes_WorkingTime();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Accrue At</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Accrue At</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='AccrueAt_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='1 2 3'" 
-	 * @generated
-	 */
-	EDataType getAccrueAt();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Active Directory GUID Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Active Directory GUID Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='ActiveDirectoryGUID_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='16'" 
-	 * @generated
-	 */
-	EDataType getActiveDirectoryGUIDType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Alias Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Alias Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Alias_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='50'" 
-	 * @generated
-	 */
-	EDataType getAliasType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Author Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Author Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Author_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getAuthorType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Baseline For Earned Value Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Baseline For Earned Value Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='BaselineForEarnedValue_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2 3 4 5 6 7 8 9 10'" 
-	 * @generated
-	 */
-	EDataType getBaselineForEarnedValueType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Booking Type Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Booking Type Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='BookingType_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1'" 
-	 * @generated
-	 */
-	EDataType getBookingTypeType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Booking Type Type1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Booking Type Type1</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='BookingType_._1_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1'" 
-	 * @generated
-	 */
-	EDataType getBookingTypeType1();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Calculation Type Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Calculation Type Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='CalculationType_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2'" 
-	 * @generated
-	 */
-	EDataType getCalculationTypeType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Category Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Category Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Category_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getCategoryType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Code Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Code Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Code_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getCodeType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Company Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Company Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Company_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getCompanyType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Constraint Type Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Constraint Type Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='ConstraintType_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2 3 4 5 6 7'" 
-	 * @generated
-	 */
-	EDataType getConstraintTypeType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Contact Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Contact Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Contact_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getContactType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Cost Rate Table Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Cost Rate Table Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='CostRateTable_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2 3 4'" 
-	 * @generated
-	 */
-	EDataType getCostRateTableType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Currency Symbol Position Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Currency Symbol Position Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='CurrencySymbolPosition_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2 3'" 
-	 * @generated
-	 */
-	EDataType getCurrencySymbolPositionType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Currency Symbol Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Currency Symbol Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='CurrencySymbol_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='20'" 
-	 * @generated
-	 */
-	EDataType getCurrencySymbolType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Day Type Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Day Type Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='DayType_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2 3 4 5 6 7'" 
-	 * @generated
-	 */
-	EDataType getDayTypeType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Default Fixed Cost Accrual Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Default Fixed Cost Accrual Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='DefaultFixedCostAccrual_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='1 2 3'" 
-	 * @generated
-	 */
-	EDataType getDefaultFixedCostAccrualType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Default Task EV Method Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Default Task EV Method Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='DefaultTaskEVMethod_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1'" 
-	 * @generated
-	 */
-	EDataType getDefaultTaskEVMethodType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Default Task Type Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Default Task Type Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='DefaultTaskType_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2'" 
-	 * @generated
-	 */
-	EDataType getDefaultTaskTypeType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Duration Format Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Duration Format Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='DurationFormat_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53'" 
-	 * @generated
-	 */
-	EDataType getDurationFormatType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Duration Format Type1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Duration Format Type1</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='DurationFormat_._1_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53'" 
-	 * @generated
-	 */
-	EDataType getDurationFormatType1();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Duration Format Type2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Duration Format Type2</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='DurationFormat_._2_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53'" 
-	 * @generated
-	 */
-	EDataType getDurationFormatType2();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Duration Format Type3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Duration Format Type3</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='DurationFormat_._3_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53'" 
-	 * @generated
-	 */
-	EDataType getDurationFormatType3();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Duration Format Type4</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Duration Format Type4</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='DurationFormat_._4_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53'" 
-	 * @generated
-	 */
-	EDataType getDurationFormatType4();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Duration Format Type5</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Duration Format Type5</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='DurationFormat_._5_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53'" 
-	 * @generated
-	 */
-	EDataType getDurationFormatType5();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Earned Value Method Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Earned Value Method Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='EarnedValueMethod_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1'" 
-	 * @generated
-	 */
-	EDataType getEarnedValueMethodType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Earned Value Method Type1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Earned Value Method Type1</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='EarnedValueMethod_._1_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1'" 
-	 * @generated
-	 */
-	EDataType getEarnedValueMethodType1();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Email Address Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Email Address Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='EmailAddress_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getEmailAddressType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>External Task Project Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>External Task Project Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='ExternalTaskProject_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getExternalTaskProjectType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Fixed Cost Accrual Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Fixed Cost Accrual Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='FixedCostAccrual_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' enumeration='1 2 3'" 
-	 * @generated
-	 */
-	EDataType getFixedCostAccrualType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>FY Start Date Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>FY Start Date Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='FYStartDate_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='1 2 3 4 5 6 7 8 9 10 11 12'" 
-	 * @generated
-	 */
-	EDataType getFYStartDateType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Group Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Group Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Group_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getGroupType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Hyperlink Address Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Hyperlink Address Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='HyperlinkAddress_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getHyperlinkAddressType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Hyperlink Address Type1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Hyperlink Address Type1</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='HyperlinkAddress_._1_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getHyperlinkAddressType1();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Hyperlink Address Type2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Hyperlink Address Type2</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='HyperlinkAddress_._2_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getHyperlinkAddressType2();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Hyperlink Sub Address Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Hyperlink Sub Address Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='HyperlinkSubAddress_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getHyperlinkSubAddressType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Hyperlink Sub Address Type1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Hyperlink Sub Address Type1</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='HyperlinkSubAddress_._1_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getHyperlinkSubAddressType1();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Hyperlink Sub Address Type2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Hyperlink Sub Address Type2</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='HyperlinkSubAddress_._2_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getHyperlinkSubAddressType2();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Hyperlink Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Hyperlink Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Hyperlink_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getHyperlinkType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Hyperlink Type1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Hyperlink Type1</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Hyperlink_._1_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getHyperlinkType1();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Hyperlink Type2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Hyperlink Type2</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Hyperlink_._2_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getHyperlinkType2();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Initials Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Initials Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Initials_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getInitialsType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Lag Format Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Lag Format Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='LagFormat_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='3 4 5 6 7 8 9 10 11 12 19 20 35 36 37 38 39 40 41 42 43 44 51 52 53'" 
-	 * @generated
-	 */
-	EDataType getLagFormatType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Leveling Delay Format Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Leveling Delay Format Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='LevelingDelayFormat_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53'" 
-	 * @generated
-	 */
-	EDataType getLevelingDelayFormatType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Leveling Delay Format Type1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Leveling Delay Format Type1</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='LevelingDelayFormat_._1_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53'" 
-	 * @generated
-	 */
-	EDataType getLevelingDelayFormatType1();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Manager Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Manager Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Manager_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getManagerType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Material Label Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Material Label Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='MaterialLabel_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getMaterialLabelType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Name Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Name Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Name_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getNameType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Name Type1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Name Type1</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Name_._1_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getNameType1();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Name Type2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Name Type2</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Name_._2_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getNameType2();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Name Type3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Name Type3</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Name_._3_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='255'" 
-	 * @generated
-	 */
-	EDataType getNameType3();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>New Task Start Date Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>New Task Start Date Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='NewTaskStartDate_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1'" 
-	 * @generated
-	 */
-	EDataType getNewTaskStartDateType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>NT Account Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>NT Account Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='NTAccount_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getNTAccountType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Outline Number Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Outline Number Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='OutlineNumber_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getOutlineNumberType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Overtime Rate Format Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Overtime Rate Format Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='OvertimeRateFormat_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='1 2 3 4 5 7'" 
-	 * @generated
-	 */
-	EDataType getOvertimeRateFormatType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Overtime Rate Format Type1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Overtime Rate Format Type1</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='OvertimeRateFormat_._1_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='1 2 3 4 5 7'" 
-	 * @generated
-	 */
-	EDataType getOvertimeRateFormatType1();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Phonetic Alias Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Phonetic Alias Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='PhoneticAlias_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='50'" 
-	 * @generated
-	 */
-	EDataType getPhoneticAliasType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Phonetics Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Phonetics Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Phonetics_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getPhoneticsType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Prefix Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Prefix Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Prefix_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='50'" 
-	 * @generated
-	 */
-	EDataType getPrefixType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Rate Table Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Rate Table Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='RateTable_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2 3 4'" 
-	 * @generated
-	 */
-	EDataType getRateTableType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Rollup Type Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Rollup Type Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='RollupType_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2 3 4 5 6 7'" 
-	 * @generated
-	 */
-	EDataType getRollupTypeType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Standard Rate Format Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Standard Rate Format Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='StandardRateFormat_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='1 2 3 4 5 7'" 
-	 * @generated
-	 */
-	EDataType getStandardRateFormatType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Standard Rate Format Type1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Standard Rate Format Type1</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='StandardRateFormat_._1_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='1 2 3 4 5 7 8'" 
-	 * @generated
-	 */
-	EDataType getStandardRateFormatType1();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Subject Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Subject Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Subject_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getSubjectType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Subproject Name Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Subproject Name Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='SubprojectName_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getSubprojectNameType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Title Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Title Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='Title_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='512'" 
-	 * @generated
-	 */
-	EDataType getTitleType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Type Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Type Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='Type_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2'" 
-	 * @generated
-	 */
-	EDataType getTypeType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Type Type1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Type Type1</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='Type_._1_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2 3'" 
-	 * @generated
-	 */
-	EDataType getTypeType1();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Type Type2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Type Type2</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='Type_._2_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2 3'" 
-	 * @generated
-	 */
-	EDataType getTypeType2();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Type Type3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Type Type3</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='Type_._3_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='1 2 3 4 5 6 7 8 9 10 11 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76'" 
-	 * @generated
-	 */
-	EDataType getTypeType3();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Type Type4</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Type Type4</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='Type_._4_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1'" 
-	 * @generated
-	 */
-	EDataType getTypeType4();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Type Type5</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Type Type5</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='Type_._5_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2 3'" 
-	 * @generated
-	 */
-	EDataType getTypeType5();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>UID Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>UID Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="name='UID_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#string' maxLength='16'" 
-	 * @generated
-	 */
-	EDataType getUIDType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Unit Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Unit Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='Unit_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2 3 5 8'" 
-	 * @generated
-	 */
-	EDataType getUnitType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Valuelist Sort Order Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Valuelist Sort Order Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='ValuelistSortOrder_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1'" 
-	 * @generated
-	 */
-	EDataType getValuelistSortOrderType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Week Start Day Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Week Start Day Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='WeekStartDay_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2 3 4 5 6'" 
-	 * @generated
-	 */
-	EDataType getWeekStartDayType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Work Contour Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Work Contour Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='WorkContour_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2 3 4 5 6 7 8'" 
-	 * @generated
-	 */
-	EDataType getWorkContourType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Work Format Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Work Format Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='WorkFormat_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='1 2 3 4 5'" 
-	 * @generated
-	 */
-	EDataType getWorkFormatType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.math.BigInteger <em>Work Group Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Work Group Type</em>'.
-	 * @see java.math.BigInteger
-	 * @model instanceClass="java.math.BigInteger"
-	 *        extendedMetaData="name='WorkGroup_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#integer' enumeration='0 1 2 3'" 
-	 * @generated
-	 */
-	EDataType getWorkGroupType();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	MsprojectFactory getMsprojectFactory();
-
-} //MsprojectPackage
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/OutlineCode.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/OutlineCode.java
deleted file mode 100755
index 0de6f86..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/OutlineCode.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: OutlineCode.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Outline Code</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode#getFieldID <em>Field ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode#getFieldName <em>Field Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode#getAlias <em>Alias</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode#getPhoneticAlias <em>Phonetic Alias</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode#getValues <em>Values</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode#isEnterprise <em>Enterprise</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode#getEnterpriseOutlineCodeAlias <em>Enterprise Outline Code Alias</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode#isResourceSubstitutionEnabled <em>Resource Substitution Enabled</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode#isLeafOnly <em>Leaf Only</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode#isAllLevelsRequired <em>All Levels Required</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode#isOnlyTableValuesAllowed <em>Only Table Values Allowed</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode#getMasks <em>Masks</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode()
- * @model extendedMetaData="name='OutlineCode_._type' kind='elementOnly'"
- * @generated
- */
-public interface OutlineCode extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Field ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Coresponds to the field number of outline code.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field ID</em>' attribute.
-	 * @see #setFieldID(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode_FieldID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='FieldID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getFieldID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#getFieldID <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field ID</em>' attribute.
-	 * @see #getFieldID()
-	 * @generated
-	 */
-	void setFieldID(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Field Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The name of the custom outline code.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field Name</em>' attribute.
-	 * @see #setFieldName(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode_FieldName()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='FieldName' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getFieldName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#getFieldName <em>Field Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field Name</em>' attribute.
-	 * @see #getFieldName()
-	 * @generated
-	 */
-	void setFieldName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Alias</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The alias of the custom outline code.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Alias</em>' attribute.
-	 * @see #setAlias(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode_Alias()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Alias' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getAlias();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#getAlias <em>Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Alias</em>' attribute.
-	 * @see #getAlias()
-	 * @generated
-	 */
-	void setAlias(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Phonetic Alias</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The phonetic pronunciation of the alias of the custom outline code.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Phonetic Alias</em>' attribute.
-	 * @see #setPhoneticAlias(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode_PhoneticAlias()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='PhoneticAlias' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getPhoneticAlias();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#getPhoneticAlias <em>Phonetic Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Phonetic Alias</em>' attribute.
-	 * @see #getPhoneticAlias()
-	 * @generated
-	 */
-	void setPhoneticAlias(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Values</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The values of the table associated with this outline code.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Values</em>' containment reference.
-	 * @see #setValues(Values)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode_Values()
-	 * @model containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='Values' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Values getValues();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#getValues <em>Values</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Values</em>' containment reference.
-	 * @see #getValues()
-	 * @generated
-	 */
-	void setValues(Values value);
-
-	/**
-	 * Returns the value of the '<em><b>Enterprise</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Indicates whether the custom outline code is an enterprise custom outline code.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Enterprise</em>' attribute.
-	 * @see #isSetEnterprise()
-	 * @see #unsetEnterprise()
-	 * @see #setEnterprise(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode_Enterprise()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='Enterprise' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isEnterprise();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#isEnterprise <em>Enterprise</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Enterprise</em>' attribute.
-	 * @see #isSetEnterprise()
-	 * @see #unsetEnterprise()
-	 * @see #isEnterprise()
-	 * @generated
-	 */
-	void setEnterprise(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#isEnterprise <em>Enterprise</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetEnterprise()
-	 * @see #isEnterprise()
-	 * @see #setEnterprise(boolean)
-	 * @generated
-	 */
-	void unsetEnterprise();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.OutlineCode#isEnterprise <em>Enterprise</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Enterprise</em>' attribute is set.
-	 * @see #unsetEnterprise()
-	 * @see #isEnterprise()
-	 * @see #setEnterprise(boolean)
-	 * @generated
-	 */
-	boolean isSetEnterprise();
-
-	/**
-	 * Returns the value of the '<em><b>Enterprise Outline Code Alias</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A reference to another custom field for which this is an alias.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Enterprise Outline Code Alias</em>' attribute.
-	 * @see #setEnterpriseOutlineCodeAlias(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode_EnterpriseOutlineCodeAlias()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='EnterpriseOutlineCodeAlias' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getEnterpriseOutlineCodeAlias();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#getEnterpriseOutlineCodeAlias <em>Enterprise Outline Code Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Enterprise Outline Code Alias</em>' attribute.
-	 * @see #getEnterpriseOutlineCodeAlias()
-	 * @generated
-	 */
-	void setEnterpriseOutlineCodeAlias(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Resource Substitution Enabled</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the custom outline code can be used by the Resource Substitution Wizard in Microsoft Project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Resource Substitution Enabled</em>' attribute.
-	 * @see #isSetResourceSubstitutionEnabled()
-	 * @see #unsetResourceSubstitutionEnabled()
-	 * @see #setResourceSubstitutionEnabled(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode_ResourceSubstitutionEnabled()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='ResourceSubstitutionEnabled' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isResourceSubstitutionEnabled();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#isResourceSubstitutionEnabled <em>Resource Substitution Enabled</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Resource Substitution Enabled</em>' attribute.
-	 * @see #isSetResourceSubstitutionEnabled()
-	 * @see #unsetResourceSubstitutionEnabled()
-	 * @see #isResourceSubstitutionEnabled()
-	 * @generated
-	 */
-	void setResourceSubstitutionEnabled(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#isResourceSubstitutionEnabled <em>Resource Substitution Enabled</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetResourceSubstitutionEnabled()
-	 * @see #isResourceSubstitutionEnabled()
-	 * @see #setResourceSubstitutionEnabled(boolean)
-	 * @generated
-	 */
-	void unsetResourceSubstitutionEnabled();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.OutlineCode#isResourceSubstitutionEnabled <em>Resource Substitution Enabled</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Resource Substitution Enabled</em>' attribute is set.
-	 * @see #unsetResourceSubstitutionEnabled()
-	 * @see #isResourceSubstitutionEnabled()
-	 * @see #setResourceSubstitutionEnabled(boolean)
-	 * @generated
-	 */
-	boolean isSetResourceSubstitutionEnabled();
-
-	/**
-	 * Returns the value of the '<em><b>Leaf Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether or not values specified in this outline code field must be leaf values.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Leaf Only</em>' attribute.
-	 * @see #isSetLeafOnly()
-	 * @see #unsetLeafOnly()
-	 * @see #setLeafOnly(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode_LeafOnly()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='LeafOnly' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isLeafOnly();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#isLeafOnly <em>Leaf Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Leaf Only</em>' attribute.
-	 * @see #isSetLeafOnly()
-	 * @see #unsetLeafOnly()
-	 * @see #isLeafOnly()
-	 * @generated
-	 */
-	void setLeafOnly(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#isLeafOnly <em>Leaf Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetLeafOnly()
-	 * @see #isLeafOnly()
-	 * @see #setLeafOnly(boolean)
-	 * @generated
-	 */
-	void unsetLeafOnly();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.OutlineCode#isLeafOnly <em>Leaf Only</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Leaf Only</em>' attribute is set.
-	 * @see #unsetLeafOnly()
-	 * @see #isLeafOnly()
-	 * @see #setLeafOnly(boolean)
-	 * @generated
-	 */
-	boolean isSetLeafOnly();
-
-	/**
-	 * Returns the value of the '<em><b>All Levels Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * New codes must have all levels present.  Not available for Enterprise Codes.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>All Levels Required</em>' attribute.
-	 * @see #isSetAllLevelsRequired()
-	 * @see #unsetAllLevelsRequired()
-	 * @see #setAllLevelsRequired(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode_AllLevelsRequired()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='AllLevelsRequired' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isAllLevelsRequired();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#isAllLevelsRequired <em>All Levels Required</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>All Levels Required</em>' attribute.
-	 * @see #isSetAllLevelsRequired()
-	 * @see #unsetAllLevelsRequired()
-	 * @see #isAllLevelsRequired()
-	 * @generated
-	 */
-	void setAllLevelsRequired(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#isAllLevelsRequired <em>All Levels Required</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetAllLevelsRequired()
-	 * @see #isAllLevelsRequired()
-	 * @see #setAllLevelsRequired(boolean)
-	 * @generated
-	 */
-	void unsetAllLevelsRequired();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.OutlineCode#isAllLevelsRequired <em>All Levels Required</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>All Levels Required</em>' attribute is set.
-	 * @see #unsetAllLevelsRequired()
-	 * @see #isAllLevelsRequired()
-	 * @see #setAllLevelsRequired(boolean)
-	 * @generated
-	 */
-	boolean isSetAllLevelsRequired();
-
-	/**
-	 * Returns the value of the '<em><b>Only Table Values Allowed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether values specified must come from values table.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Only Table Values Allowed</em>' attribute.
-	 * @see #isSetOnlyTableValuesAllowed()
-	 * @see #unsetOnlyTableValuesAllowed()
-	 * @see #setOnlyTableValuesAllowed(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode_OnlyTableValuesAllowed()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='OnlyTableValuesAllowed' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isOnlyTableValuesAllowed();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#isOnlyTableValuesAllowed <em>Only Table Values Allowed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Only Table Values Allowed</em>' attribute.
-	 * @see #isSetOnlyTableValuesAllowed()
-	 * @see #unsetOnlyTableValuesAllowed()
-	 * @see #isOnlyTableValuesAllowed()
-	 * @generated
-	 */
-	void setOnlyTableValuesAllowed(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#isOnlyTableValuesAllowed <em>Only Table Values Allowed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetOnlyTableValuesAllowed()
-	 * @see #isOnlyTableValuesAllowed()
-	 * @see #setOnlyTableValuesAllowed(boolean)
-	 * @generated
-	 */
-	void unsetOnlyTableValuesAllowed();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.OutlineCode#isOnlyTableValuesAllowed <em>Only Table Values Allowed</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Only Table Values Allowed</em>' attribute is set.
-	 * @see #unsetOnlyTableValuesAllowed()
-	 * @see #isOnlyTableValuesAllowed()
-	 * @see #setOnlyTableValuesAllowed(boolean)
-	 * @generated
-	 */
-	boolean isSetOnlyTableValuesAllowed();
-
-	/**
-	 * Returns the value of the '<em><b>Masks</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The table of entries that define the outline code mask.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Masks</em>' containment reference.
-	 * @see #setMasks(Masks)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode_Masks()
-	 * @model containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='Masks' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Masks getMasks();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode#getMasks <em>Masks</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Masks</em>' containment reference.
-	 * @see #getMasks()
-	 * @generated
-	 */
-	void setMasks(Masks value);
-
-} // OutlineCode
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/OutlineCode2.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/OutlineCode2.java
deleted file mode 100755
index 9883d4b..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/OutlineCode2.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: OutlineCode2.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Outline Code2</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode2#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode2#getFieldID <em>Field ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode2#getValueID <em>Value ID</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode2()
- * @model extendedMetaData="name='OutlineCode_._1_._type' kind='elementOnly'"
- * @generated
- */
-public interface OutlineCode2 extends EObject {
-	/**
-	 * Returns the value of the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique ID of the value in the outline code collection.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>UID</em>' attribute.
-	 * @see #setUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode2_UID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='UID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode2#getUID <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>UID</em>' attribute.
-	 * @see #getUID()
-	 * @generated
-	 */
-	void setUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Field ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The field ID in the localised language.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field ID</em>' attribute.
-	 * @see #setFieldID(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode2_FieldID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='FieldID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getFieldID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode2#getFieldID <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field ID</em>' attribute.
-	 * @see #getFieldID()
-	 * @generated
-	 */
-	void setFieldID(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique ID in the value list associated with the definition in the 
-	 *                                             outline code collection.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value ID</em>' attribute.
-	 * @see #setValueID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode2_ValueID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='ValueID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getValueID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode2#getValueID <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value ID</em>' attribute.
-	 * @see #getValueID()
-	 * @generated
-	 */
-	void setValueID(BigInteger value);
-
-} // OutlineCode2
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/OutlineCode3.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/OutlineCode3.java
deleted file mode 100755
index 75a9a16..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/OutlineCode3.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: OutlineCode3.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Outline Code3</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode3#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode3#getFieldID <em>Field ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCode3#getValueID <em>Value ID</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode3()
- * @model extendedMetaData="name='OutlineCode_._2_._type' kind='elementOnly'"
- * @generated
- */
-public interface OutlineCode3 extends EObject {
-	/**
-	 * Returns the value of the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique ID of the value in the outline code collection.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>UID</em>' attribute.
-	 * @see #setUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode3_UID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='UID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode3#getUID <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>UID</em>' attribute.
-	 * @see #getUID()
-	 * @generated
-	 */
-	void setUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Field ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The field ID in the localised language.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field ID</em>' attribute.
-	 * @see #setFieldID(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode3_FieldID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='FieldID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getFieldID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode3#getFieldID <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field ID</em>' attribute.
-	 * @see #getFieldID()
-	 * @generated
-	 */
-	void setFieldID(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique ID in the value list associated with the definition 
-	 *                                             in the outline code collection.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value ID</em>' attribute.
-	 * @see #setValueID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCode3_ValueID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='ValueID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getValueID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.OutlineCode3#getValueID <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value ID</em>' attribute.
-	 * @see #getValueID()
-	 * @generated
-	 */
-	void setValueID(BigInteger value);
-
-} // OutlineCode3
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/OutlineCodes.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/OutlineCodes.java
deleted file mode 100755
index 210be6e..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/OutlineCodes.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: OutlineCodes.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Outline Codes</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.OutlineCodes#getOutlineCode <em>Outline Code</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCodes()
- * @model extendedMetaData="name='OutlineCodes_._type' kind='elementOnly'"
- * @generated
- */
-public interface OutlineCodes extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Outline Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.OutlineCode}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The individual outline codes.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Outline Code</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getOutlineCodes_OutlineCode()
-	 * @model type="org.eclipse.epf.msproject.OutlineCode" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='OutlineCode' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getOutlineCode();
-
-} // OutlineCodes
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/PredecessorLink.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/PredecessorLink.java
deleted file mode 100755
index 223fe53..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/PredecessorLink.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PredecessorLink.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Predecessor Link</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.PredecessorLink#getPredecessorUID <em>Predecessor UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.PredecessorLink#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.PredecessorLink#isCrossProject <em>Cross Project</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.PredecessorLink#getCrossProjectName <em>Cross Project Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.PredecessorLink#getLinkLag <em>Link Lag</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.PredecessorLink#getLagFormat <em>Lag Format</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getPredecessorLink()
- * @model extendedMetaData="name='PredecessorLink_._type' kind='elementOnly'"
- * @generated
- */
-public interface PredecessorLink extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Predecessor UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique identifier of the predecessor task.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Predecessor UID</em>' attribute.
-	 * @see #setPredecessorUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getPredecessorLink_PredecessorUID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='PredecessorUID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getPredecessorUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.PredecessorLink#getPredecessorUID <em>Predecessor UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Predecessor UID</em>' attribute.
-	 * @see #getPredecessorUID()
-	 * @generated
-	 */
-	void setPredecessorUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The link type.  Values are 0=FF, 1=FS, 2=SF and 3=SS
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getPredecessorLink_Type()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.TypeType1"
-	 *        extendedMetaData="kind='element' name='Type' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.PredecessorLink#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Cross Project</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the predecessor is part of another project.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Cross Project</em>' attribute.
-	 * @see #isSetCrossProject()
-	 * @see #unsetCrossProject()
-	 * @see #setCrossProject(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getPredecessorLink_CrossProject()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='CrossProject' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isCrossProject();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.PredecessorLink#isCrossProject <em>Cross Project</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cross Project</em>' attribute.
-	 * @see #isSetCrossProject()
-	 * @see #unsetCrossProject()
-	 * @see #isCrossProject()
-	 * @generated
-	 */
-	void setCrossProject(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.PredecessorLink#isCrossProject <em>Cross Project</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetCrossProject()
-	 * @see #isCrossProject()
-	 * @see #setCrossProject(boolean)
-	 * @generated
-	 */
-	void unsetCrossProject();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.PredecessorLink#isCrossProject <em>Cross Project</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Cross Project</em>' attribute is set.
-	 * @see #unsetCrossProject()
-	 * @see #isCrossProject()
-	 * @see #setCrossProject(boolean)
-	 * @generated
-	 */
-	boolean isSetCrossProject();
-
-	/**
-	 * Returns the value of the '<em><b>Cross Project Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The external predecessor project.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Cross Project Name</em>' attribute.
-	 * @see #setCrossProjectName(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getPredecessorLink_CrossProjectName()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='CrossProjectName' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getCrossProjectName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.PredecessorLink#getCrossProjectName <em>Cross Project Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cross Project Name</em>' attribute.
-	 * @see #getCrossProjectName()
-	 * @generated
-	 */
-	void setCrossProjectName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Link Lag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of lag in tenths of a minute.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Link Lag</em>' attribute.
-	 * @see #setLinkLag(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getPredecessorLink_LinkLag()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='LinkLag' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getLinkLag();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.PredecessorLink#getLinkLag <em>Link Lag</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Link Lag</em>' attribute.
-	 * @see #getLinkLag()
-	 * @generated
-	 */
-	void setLinkLag(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Lag Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The format for expressing the lag format.  
-	 *                                             Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 
-	 *                                             20=e%, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 43=mo?, 
-	 *                                             44=emo?, 51=%?, 52=e%? and 53=null.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Lag Format</em>' attribute.
-	 * @see #setLagFormat(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getPredecessorLink_LagFormat()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.LagFormatType"
-	 *        extendedMetaData="kind='element' name='LagFormat' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getLagFormat();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.PredecessorLink#getLagFormat <em>Lag Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lag Format</em>' attribute.
-	 * @see #getLagFormat()
-	 * @generated
-	 */
-	void setLagFormat(BigInteger value);
-
-} // PredecessorLink
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Project.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Project.java
deleted file mode 100755
index e8618a5..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Project.java
+++ /dev/null
@@ -1,2621 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Project.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Project</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Project#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getSubject <em>Subject</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getCompany <em>Company</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getManager <em>Manager</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getAuthor <em>Author</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getCreationDate <em>Creation Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getRevision <em>Revision</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getLastSaved <em>Last Saved</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isScheduleFromStart <em>Schedule From Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getStartDate <em>Start Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getFinishDate <em>Finish Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getFYStartDate <em>FY Start Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getCriticalSlackLimit <em>Critical Slack Limit</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getCurrencyDigits <em>Currency Digits</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getCurrencySymbol <em>Currency Symbol</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getCurrencySymbolPosition <em>Currency Symbol Position</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getCalendarUID <em>Calendar UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getDefaultStartTime <em>Default Start Time</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getDefaultFinishTime <em>Default Finish Time</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getMinutesPerDay <em>Minutes Per Day</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getMinutesPerWeek <em>Minutes Per Week</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getDaysPerMonth <em>Days Per Month</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getDefaultTaskType <em>Default Task Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getDefaultFixedCostAccrual <em>Default Fixed Cost Accrual</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getDefaultStandardRate <em>Default Standard Rate</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getDefaultOvertimeRate <em>Default Overtime Rate</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getDurationFormat <em>Duration Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getWorkFormat <em>Work Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isEditableActualCosts <em>Editable Actual Costs</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isHonorConstraints <em>Honor Constraints</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getEarnedValueMethod <em>Earned Value Method</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isInsertedProjectsLikeSummary <em>Inserted Projects Like Summary</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isMultipleCriticalPaths <em>Multiple Critical Paths</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isNewTasksEffortDriven <em>New Tasks Effort Driven</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isNewTasksEstimated <em>New Tasks Estimated</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isSplitsInProgressTasks <em>Splits In Progress Tasks</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isSpreadActualCost <em>Spread Actual Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isSpreadPercentComplete <em>Spread Percent Complete</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isTaskUpdatesResource <em>Task Updates Resource</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isFiscalYearStart <em>Fiscal Year Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getWeekStartDay <em>Week Start Day</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isMoveCompletedEndsBack <em>Move Completed Ends Back</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isMoveRemainingStartsBack <em>Move Remaining Starts Back</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isMoveRemainingStartsForward <em>Move Remaining Starts Forward</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isMoveCompletedEndsForward <em>Move Completed Ends Forward</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getBaselineForEarnedValue <em>Baseline For Earned Value</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isAutoAddNewResourcesAndTasks <em>Auto Add New Resources And Tasks</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getStatusDate <em>Status Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getCurrentDate <em>Current Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isMicrosoftProjectServerURL <em>Microsoft Project Server URL</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isAutolink <em>Autolink</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getNewTaskStartDate <em>New Task Start Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getDefaultTaskEVMethod <em>Default Task EV Method</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isProjectExternallyEdited <em>Project Externally Edited</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getExtendedCreationDate <em>Extended Creation Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isActualsInSync <em>Actuals In Sync</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isRemoveFileProperties <em>Remove File Properties</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#isAdminProject <em>Admin Project</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getOutlineCodes <em>Outline Codes</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getWBSMasks <em>WBS Masks</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getExtendedAttributes <em>Extended Attributes</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getCalendars <em>Calendars</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getTasks <em>Tasks</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getResources <em>Resources</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Project#getAssignments <em>Assignments</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getProject()
- * @model extendedMetaData="name='Project_._type' kind='elementOnly'"
- * @generated
- */
-public interface Project extends EObject {
-	/**
-	 * Returns the value of the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique ID of the project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>UID</em>' attribute.
-	 * @see #setUID(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_UID()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.UIDType"
-	 *        extendedMetaData="kind='element' name='UID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getUID <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>UID</em>' attribute.
-	 * @see #getUID()
-	 * @generated
-	 */
-	void setUID(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The name of the project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_Name()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.NameType3"
-	 *        extendedMetaData="kind='element' name='Name' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The title of the project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Title</em>' attribute.
-	 * @see #setTitle(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_Title()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.TitleType"
-	 *        extendedMetaData="kind='element' name='Title' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getTitle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
-	 * @see #getTitle()
-	 * @generated
-	 */
-	void setTitle(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Subject</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The subject of the project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Subject</em>' attribute.
-	 * @see #setSubject(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_Subject()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.SubjectType"
-	 *        extendedMetaData="kind='element' name='Subject' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getSubject();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getSubject <em>Subject</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Subject</em>' attribute.
-	 * @see #getSubject()
-	 * @generated
-	 */
-	void setSubject(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The category of the project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Category</em>' attribute.
-	 * @see #setCategory(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_Category()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.CategoryType"
-	 *        extendedMetaData="kind='element' name='Category' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getCategory();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getCategory <em>Category</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Category</em>' attribute.
-	 * @see #getCategory()
-	 * @generated
-	 */
-	void setCategory(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Company</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The company that owns the project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Company</em>' attribute.
-	 * @see #setCompany(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_Company()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.CompanyType"
-	 *        extendedMetaData="kind='element' name='Company' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getCompany();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getCompany <em>Company</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Company</em>' attribute.
-	 * @see #getCompany()
-	 * @generated
-	 */
-	void setCompany(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Manager</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The manager of the project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Manager</em>' attribute.
-	 * @see #setManager(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_Manager()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.ManagerType"
-	 *        extendedMetaData="kind='element' name='Manager' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getManager();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getManager <em>Manager</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Manager</em>' attribute.
-	 * @see #getManager()
-	 * @generated
-	 */
-	void setManager(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Author</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The author of the project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Author</em>' attribute.
-	 * @see #setAuthor(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_Author()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.AuthorType"
-	 *        extendedMetaData="kind='element' name='Author' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getAuthor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getAuthor <em>Author</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Author</em>' attribute.
-	 * @see #getAuthor()
-	 * @generated
-	 */
-	void setAuthor(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Creation Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The date that the project was created.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Creation Date</em>' attribute.
-	 * @see #setCreationDate(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_CreationDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='CreationDate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getCreationDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getCreationDate <em>Creation Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Date</em>' attribute.
-	 * @see #getCreationDate()
-	 * @generated
-	 */
-	void setCreationDate(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Revision</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The number of times a project has been saved.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Revision</em>' attribute.
-	 * @see #setRevision(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_Revision()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='Revision' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getRevision();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getRevision <em>Revision</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Revision</em>' attribute.
-	 * @see #getRevision()
-	 * @generated
-	 */
-	void setRevision(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Last Saved</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The date that the project was last saved.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Last Saved</em>' attribute.
-	 * @see #setLastSaved(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_LastSaved()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='LastSaved' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getLastSaved();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getLastSaved <em>Last Saved</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Last Saved</em>' attribute.
-	 * @see #getLastSaved()
-	 * @generated
-	 */
-	void setLastSaved(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Schedule From Start</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the project is schduled from the start date or finish date.
-	 * 						
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Schedule From Start</em>' attribute.
-	 * @see #isSetScheduleFromStart()
-	 * @see #unsetScheduleFromStart()
-	 * @see #setScheduleFromStart(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_ScheduleFromStart()
-	 * @model default="true" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='ScheduleFromStart' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isScheduleFromStart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isScheduleFromStart <em>Schedule From Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Schedule From Start</em>' attribute.
-	 * @see #isSetScheduleFromStart()
-	 * @see #unsetScheduleFromStart()
-	 * @see #isScheduleFromStart()
-	 * @generated
-	 */
-	void setScheduleFromStart(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isScheduleFromStart <em>Schedule From Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetScheduleFromStart()
-	 * @see #isScheduleFromStart()
-	 * @see #setScheduleFromStart(boolean)
-	 * @generated
-	 */
-	void unsetScheduleFromStart();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isScheduleFromStart <em>Schedule From Start</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Schedule From Start</em>' attribute is set.
-	 * @see #unsetScheduleFromStart()
-	 * @see #isScheduleFromStart()
-	 * @see #setScheduleFromStart(boolean)
-	 * @generated
-	 */
-	boolean isSetScheduleFromStart();
-
-	/**
-	 * Returns the value of the '<em><b>Start Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The start date of the project. Required if ScheduleFromStart is true.
-	 * 						
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Start Date</em>' attribute.
-	 * @see #setStartDate(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_StartDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='StartDate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getStartDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getStartDate <em>Start Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start Date</em>' attribute.
-	 * @see #getStartDate()
-	 * @generated
-	 */
-	void setStartDate(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Finish Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The finish date of the project. Required if ScheduleFromStart is false.
-	 * 						
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Finish Date</em>' attribute.
-	 * @see #setFinishDate(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_FinishDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='FinishDate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getFinishDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getFinishDate <em>Finish Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Finish Date</em>' attribute.
-	 * @see #getFinishDate()
-	 * @generated
-	 */
-	void setFinishDate(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>FY Start Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Fiscal Year starting month. Values are: 
-	 * 						1=January, 2=February, 3=March, 4=April, 5=May, 6=June, 7=July, 
-	 * 						8=August, 9=September, 10=October, 11=November, 12=December 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>FY Start Date</em>' attribute.
-	 * @see #setFYStartDate(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_FYStartDate()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.FYStartDateType"
-	 *        extendedMetaData="kind='element' name='FYStartDate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getFYStartDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getFYStartDate <em>FY Start Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>FY Start Date</em>' attribute.
-	 * @see #getFYStartDate()
-	 * @generated
-	 */
-	void setFYStartDate(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Critical Slack Limit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The number of days past its end date that a task can go 
-	 * 						before Microsoft Project marks that task as a critical task.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Critical Slack Limit</em>' attribute.
-	 * @see #setCriticalSlackLimit(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_CriticalSlackLimit()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='CriticalSlackLimit' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getCriticalSlackLimit();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getCriticalSlackLimit <em>Critical Slack Limit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Critical Slack Limit</em>' attribute.
-	 * @see #getCriticalSlackLimit()
-	 * @generated
-	 */
-	void setCriticalSlackLimit(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Currency Digits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The number of digits after the decimal symbol.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Currency Digits</em>' attribute.
-	 * @see #setCurrencyDigits(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_CurrencyDigits()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='CurrencyDigits' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getCurrencyDigits();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getCurrencyDigits <em>Currency Digits</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Currency Digits</em>' attribute.
-	 * @see #getCurrencyDigits()
-	 * @generated
-	 */
-	void setCurrencyDigits(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Currency Symbol</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The currency symbol used in the project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Currency Symbol</em>' attribute.
-	 * @see #setCurrencySymbol(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_CurrencySymbol()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.CurrencySymbolType"
-	 *        extendedMetaData="kind='element' name='CurrencySymbol' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getCurrencySymbol();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getCurrencySymbol <em>Currency Symbol</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Currency Symbol</em>' attribute.
-	 * @see #getCurrencySymbol()
-	 * @generated
-	 */
-	void setCurrencySymbol(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Currency Symbol Position</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The position of the currency symbol.  Values are: 
-	 * 						0=Before, 1=After, 2=Before With Space, 3=After with space.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Currency Symbol Position</em>' attribute.
-	 * @see #setCurrencySymbolPosition(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_CurrencySymbolPosition()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.CurrencySymbolPositionType"
-	 *        extendedMetaData="kind='element' name='CurrencySymbolPosition' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getCurrencySymbolPosition();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getCurrencySymbolPosition <em>Currency Symbol Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Currency Symbol Position</em>' attribute.
-	 * @see #getCurrencySymbolPosition()
-	 * @generated
-	 */
-	void setCurrencySymbolPosition(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Calendar UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The project calendar.  Refers to a valid UID in the 
-	 * 						Calendars element of the Microsoft Project XML Schema.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Calendar UID</em>' attribute.
-	 * @see #setCalendarUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_CalendarUID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='CalendarUID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getCalendarUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getCalendarUID <em>Calendar UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Calendar UID</em>' attribute.
-	 * @see #getCalendarUID()
-	 * @generated
-	 */
-	void setCalendarUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Default Start Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default start time of new tasks.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Default Start Time</em>' attribute.
-	 * @see #setDefaultStartTime(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_DefaultStartTime()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Time"
-	 *        extendedMetaData="kind='element' name='DefaultStartTime' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getDefaultStartTime();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getDefaultStartTime <em>Default Start Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Start Time</em>' attribute.
-	 * @see #getDefaultStartTime()
-	 * @generated
-	 */
-	void setDefaultStartTime(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Default Finish Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default finish time of new tasks.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Default Finish Time</em>' attribute.
-	 * @see #setDefaultFinishTime(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_DefaultFinishTime()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Time"
-	 *        extendedMetaData="kind='element' name='DefaultFinishTime' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getDefaultFinishTime();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getDefaultFinishTime <em>Default Finish Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Finish Time</em>' attribute.
-	 * @see #getDefaultFinishTime()
-	 * @generated
-	 */
-	void setDefaultFinishTime(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Minutes Per Day</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The number of minutes per day.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Minutes Per Day</em>' attribute.
-	 * @see #setMinutesPerDay(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_MinutesPerDay()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='MinutesPerDay' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getMinutesPerDay();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getMinutesPerDay <em>Minutes Per Day</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Minutes Per Day</em>' attribute.
-	 * @see #getMinutesPerDay()
-	 * @generated
-	 */
-	void setMinutesPerDay(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Minutes Per Week</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The number of minutes per week.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Minutes Per Week</em>' attribute.
-	 * @see #setMinutesPerWeek(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_MinutesPerWeek()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='MinutesPerWeek' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getMinutesPerWeek();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getMinutesPerWeek <em>Minutes Per Week</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Minutes Per Week</em>' attribute.
-	 * @see #getMinutesPerWeek()
-	 * @generated
-	 */
-	void setMinutesPerWeek(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Days Per Month</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The number of days per month.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Days Per Month</em>' attribute.
-	 * @see #setDaysPerMonth(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_DaysPerMonth()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='DaysPerMonth' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getDaysPerMonth();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getDaysPerMonth <em>Days Per Month</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Days Per Month</em>' attribute.
-	 * @see #getDaysPerMonth()
-	 * @generated
-	 */
-	void setDaysPerMonth(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Default Task Type</b></em>' attribute.
-	 * The default value is <code>"1"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default type of new tasks. Values are: 
-	 * 						0=Fixed Units, 1=Fixed Duration, 2=Fixed Work.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Default Task Type</em>' attribute.
-	 * @see #isSetDefaultTaskType()
-	 * @see #unsetDefaultTaskType()
-	 * @see #setDefaultTaskType(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_DefaultTaskType()
-	 * @model default="1" unique="false" unsettable="true" dataType="org.eclipse.epf.msproject.DefaultTaskTypeType"
-	 *        extendedMetaData="kind='element' name='DefaultTaskType' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getDefaultTaskType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getDefaultTaskType <em>Default Task Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Task Type</em>' attribute.
-	 * @see #isSetDefaultTaskType()
-	 * @see #unsetDefaultTaskType()
-	 * @see #getDefaultTaskType()
-	 * @generated
-	 */
-	void setDefaultTaskType(BigInteger value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#getDefaultTaskType <em>Default Task Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDefaultTaskType()
-	 * @see #getDefaultTaskType()
-	 * @see #setDefaultTaskType(BigInteger)
-	 * @generated
-	 */
-	void unsetDefaultTaskType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#getDefaultTaskType <em>Default Task Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Default Task Type</em>' attribute is set.
-	 * @see #unsetDefaultTaskType()
-	 * @see #getDefaultTaskType()
-	 * @see #setDefaultTaskType(BigInteger)
-	 * @generated
-	 */
-	boolean isSetDefaultTaskType();
-
-	/**
-	 * Returns the value of the '<em><b>Default Fixed Cost Accrual</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default from where fixed costs are accrued.  Values are: 
-	 * 						1=Start, 2=Prorated, 3=End
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Default Fixed Cost Accrual</em>' attribute.
-	 * @see #setDefaultFixedCostAccrual(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_DefaultFixedCostAccrual()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.DefaultFixedCostAccrualType"
-	 *        extendedMetaData="kind='element' name='DefaultFixedCostAccrual' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getDefaultFixedCostAccrual();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getDefaultFixedCostAccrual <em>Default Fixed Cost Accrual</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Fixed Cost Accrual</em>' attribute.
-	 * @see #getDefaultFixedCostAccrual()
-	 * @generated
-	 */
-	void setDefaultFixedCostAccrual(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Default Standard Rate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default standard rate for new resources.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Default Standard Rate</em>' attribute.
-	 * @see #isSetDefaultStandardRate()
-	 * @see #unsetDefaultStandardRate()
-	 * @see #setDefaultStandardRate(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_DefaultStandardRate()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='DefaultStandardRate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getDefaultStandardRate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getDefaultStandardRate <em>Default Standard Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Standard Rate</em>' attribute.
-	 * @see #isSetDefaultStandardRate()
-	 * @see #unsetDefaultStandardRate()
-	 * @see #getDefaultStandardRate()
-	 * @generated
-	 */
-	void setDefaultStandardRate(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#getDefaultStandardRate <em>Default Standard Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDefaultStandardRate()
-	 * @see #getDefaultStandardRate()
-	 * @see #setDefaultStandardRate(float)
-	 * @generated
-	 */
-	void unsetDefaultStandardRate();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#getDefaultStandardRate <em>Default Standard Rate</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Default Standard Rate</em>' attribute is set.
-	 * @see #unsetDefaultStandardRate()
-	 * @see #getDefaultStandardRate()
-	 * @see #setDefaultStandardRate(float)
-	 * @generated
-	 */
-	boolean isSetDefaultStandardRate();
-
-	/**
-	 * Returns the value of the '<em><b>Default Overtime Rate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default overtime rate for new resources.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Default Overtime Rate</em>' attribute.
-	 * @see #isSetDefaultOvertimeRate()
-	 * @see #unsetDefaultOvertimeRate()
-	 * @see #setDefaultOvertimeRate(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_DefaultOvertimeRate()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='DefaultOvertimeRate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getDefaultOvertimeRate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getDefaultOvertimeRate <em>Default Overtime Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Overtime Rate</em>' attribute.
-	 * @see #isSetDefaultOvertimeRate()
-	 * @see #unsetDefaultOvertimeRate()
-	 * @see #getDefaultOvertimeRate()
-	 * @generated
-	 */
-	void setDefaultOvertimeRate(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#getDefaultOvertimeRate <em>Default Overtime Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDefaultOvertimeRate()
-	 * @see #getDefaultOvertimeRate()
-	 * @see #setDefaultOvertimeRate(float)
-	 * @generated
-	 */
-	void unsetDefaultOvertimeRate();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#getDefaultOvertimeRate <em>Default Overtime Rate</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Default Overtime Rate</em>' attribute is set.
-	 * @see #unsetDefaultOvertimeRate()
-	 * @see #getDefaultOvertimeRate()
-	 * @see #setDefaultOvertimeRate(float)
-	 * @generated
-	 */
-	boolean isSetDefaultOvertimeRate();
-
-	/**
-	 * Returns the value of the '<em><b>Duration Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The format for expressing the bulk duration.  Values are: 
-	 * 						3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 20=e%, 21=null, 
-	 * 						35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 43=mo?, 44=emo?, 51=%?, 52=e%? and 
-	 * 						53=null.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Duration Format</em>' attribute.
-	 * @see #setDurationFormat(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_DurationFormat()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.DurationFormatType5"
-	 *        extendedMetaData="kind='element' name='DurationFormat' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getDurationFormat();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getDurationFormat <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Duration Format</em>' attribute.
-	 * @see #getDurationFormat()
-	 * @generated
-	 */
-	void setDurationFormat(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Work Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default work unit format. Values are: 
-	 * 						1=m, 2=h, 3=d, 4=w, 5=mo
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Work Format</em>' attribute.
-	 * @see #setWorkFormat(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_WorkFormat()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.WorkFormatType"
-	 *        extendedMetaData="kind='element' name='WorkFormat' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getWorkFormat();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getWorkFormat <em>Work Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Work Format</em>' attribute.
-	 * @see #getWorkFormat()
-	 * @generated
-	 */
-	void setWorkFormat(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Editable Actual Costs</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether or not actual costs are editable.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Editable Actual Costs</em>' attribute.
-	 * @see #isSetEditableActualCosts()
-	 * @see #unsetEditableActualCosts()
-	 * @see #setEditableActualCosts(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_EditableActualCosts()
-	 * @model default="false" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='EditableActualCosts' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isEditableActualCosts();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isEditableActualCosts <em>Editable Actual Costs</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Editable Actual Costs</em>' attribute.
-	 * @see #isSetEditableActualCosts()
-	 * @see #unsetEditableActualCosts()
-	 * @see #isEditableActualCosts()
-	 * @generated
-	 */
-	void setEditableActualCosts(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isEditableActualCosts <em>Editable Actual Costs</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetEditableActualCosts()
-	 * @see #isEditableActualCosts()
-	 * @see #setEditableActualCosts(boolean)
-	 * @generated
-	 */
-	void unsetEditableActualCosts();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isEditableActualCosts <em>Editable Actual Costs</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Editable Actual Costs</em>' attribute is set.
-	 * @see #unsetEditableActualCosts()
-	 * @see #isEditableActualCosts()
-	 * @see #setEditableActualCosts(boolean)
-	 * @generated
-	 */
-	boolean isSetEditableActualCosts();
-
-	/**
-	 * Returns the value of the '<em><b>Honor Constraints</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether tasks honour their constraint dates.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Honor Constraints</em>' attribute.
-	 * @see #isSetHonorConstraints()
-	 * @see #unsetHonorConstraints()
-	 * @see #setHonorConstraints(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_HonorConstraints()
-	 * @model default="true" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='HonorConstraints' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isHonorConstraints();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isHonorConstraints <em>Honor Constraints</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Honor Constraints</em>' attribute.
-	 * @see #isSetHonorConstraints()
-	 * @see #unsetHonorConstraints()
-	 * @see #isHonorConstraints()
-	 * @generated
-	 */
-	void setHonorConstraints(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isHonorConstraints <em>Honor Constraints</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetHonorConstraints()
-	 * @see #isHonorConstraints()
-	 * @see #setHonorConstraints(boolean)
-	 * @generated
-	 */
-	void unsetHonorConstraints();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isHonorConstraints <em>Honor Constraints</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Honor Constraints</em>' attribute is set.
-	 * @see #unsetHonorConstraints()
-	 * @see #isHonorConstraints()
-	 * @see #setHonorConstraints(boolean)
-	 * @generated
-	 */
-	boolean isSetHonorConstraints();
-
-	/**
-	 * Returns the value of the '<em><b>Earned Value Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default method for calculating earned value. Values are: 
-	 * 						0=Percent Complete, 1=Physical Percent Complete
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Earned Value Method</em>' attribute.
-	 * @see #setEarnedValueMethod(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_EarnedValueMethod()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.EarnedValueMethodType1"
-	 *        extendedMetaData="kind='element' name='EarnedValueMethod' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getEarnedValueMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getEarnedValueMethod <em>Earned Value Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Earned Value Method</em>' attribute.
-	 * @see #getEarnedValueMethod()
-	 * @generated
-	 */
-	void setEarnedValueMethod(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Inserted Projects Like Summary</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether to calculate subtasks as summary tasks.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Inserted Projects Like Summary</em>' attribute.
-	 * @see #isSetInsertedProjectsLikeSummary()
-	 * @see #unsetInsertedProjectsLikeSummary()
-	 * @see #setInsertedProjectsLikeSummary(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_InsertedProjectsLikeSummary()
-	 * @model default="true" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='InsertedProjectsLikeSummary' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isInsertedProjectsLikeSummary();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isInsertedProjectsLikeSummary <em>Inserted Projects Like Summary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Inserted Projects Like Summary</em>' attribute.
-	 * @see #isSetInsertedProjectsLikeSummary()
-	 * @see #unsetInsertedProjectsLikeSummary()
-	 * @see #isInsertedProjectsLikeSummary()
-	 * @generated
-	 */
-	void setInsertedProjectsLikeSummary(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isInsertedProjectsLikeSummary <em>Inserted Projects Like Summary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetInsertedProjectsLikeSummary()
-	 * @see #isInsertedProjectsLikeSummary()
-	 * @see #setInsertedProjectsLikeSummary(boolean)
-	 * @generated
-	 */
-	void unsetInsertedProjectsLikeSummary();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isInsertedProjectsLikeSummary <em>Inserted Projects Like Summary</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Inserted Projects Like Summary</em>' attribute is set.
-	 * @see #unsetInsertedProjectsLikeSummary()
-	 * @see #isInsertedProjectsLikeSummary()
-	 * @see #setInsertedProjectsLikeSummary(boolean)
-	 * @generated
-	 */
-	boolean isSetInsertedProjectsLikeSummary();
-
-	/**
-	 * Returns the value of the '<em><b>Multiple Critical Paths</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether multiple critical paths are calculated.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Multiple Critical Paths</em>' attribute.
-	 * @see #isSetMultipleCriticalPaths()
-	 * @see #unsetMultipleCriticalPaths()
-	 * @see #setMultipleCriticalPaths(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_MultipleCriticalPaths()
-	 * @model default="false" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='MultipleCriticalPaths' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isMultipleCriticalPaths();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isMultipleCriticalPaths <em>Multiple Critical Paths</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Multiple Critical Paths</em>' attribute.
-	 * @see #isSetMultipleCriticalPaths()
-	 * @see #unsetMultipleCriticalPaths()
-	 * @see #isMultipleCriticalPaths()
-	 * @generated
-	 */
-	void setMultipleCriticalPaths(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isMultipleCriticalPaths <em>Multiple Critical Paths</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMultipleCriticalPaths()
-	 * @see #isMultipleCriticalPaths()
-	 * @see #setMultipleCriticalPaths(boolean)
-	 * @generated
-	 */
-	void unsetMultipleCriticalPaths();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isMultipleCriticalPaths <em>Multiple Critical Paths</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Multiple Critical Paths</em>' attribute is set.
-	 * @see #unsetMultipleCriticalPaths()
-	 * @see #isMultipleCriticalPaths()
-	 * @see #setMultipleCriticalPaths(boolean)
-	 * @generated
-	 */
-	boolean isSetMultipleCriticalPaths();
-
-	/**
-	 * Returns the value of the '<em><b>New Tasks Effort Driven</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether new tasks are effort driven.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>New Tasks Effort Driven</em>' attribute.
-	 * @see #isSetNewTasksEffortDriven()
-	 * @see #unsetNewTasksEffortDriven()
-	 * @see #setNewTasksEffortDriven(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_NewTasksEffortDriven()
-	 * @model default="true" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='NewTasksEffortDriven' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isNewTasksEffortDriven();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isNewTasksEffortDriven <em>New Tasks Effort Driven</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>New Tasks Effort Driven</em>' attribute.
-	 * @see #isSetNewTasksEffortDriven()
-	 * @see #unsetNewTasksEffortDriven()
-	 * @see #isNewTasksEffortDriven()
-	 * @generated
-	 */
-	void setNewTasksEffortDriven(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isNewTasksEffortDriven <em>New Tasks Effort Driven</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetNewTasksEffortDriven()
-	 * @see #isNewTasksEffortDriven()
-	 * @see #setNewTasksEffortDriven(boolean)
-	 * @generated
-	 */
-	void unsetNewTasksEffortDriven();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isNewTasksEffortDriven <em>New Tasks Effort Driven</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>New Tasks Effort Driven</em>' attribute is set.
-	 * @see #unsetNewTasksEffortDriven()
-	 * @see #isNewTasksEffortDriven()
-	 * @see #setNewTasksEffortDriven(boolean)
-	 * @generated
-	 */
-	boolean isSetNewTasksEffortDriven();
-
-	/**
-	 * Returns the value of the '<em><b>New Tasks Estimated</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether to show the estimated duration by default.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>New Tasks Estimated</em>' attribute.
-	 * @see #isSetNewTasksEstimated()
-	 * @see #unsetNewTasksEstimated()
-	 * @see #setNewTasksEstimated(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_NewTasksEstimated()
-	 * @model default="true" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='NewTasksEstimated' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isNewTasksEstimated();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isNewTasksEstimated <em>New Tasks Estimated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>New Tasks Estimated</em>' attribute.
-	 * @see #isSetNewTasksEstimated()
-	 * @see #unsetNewTasksEstimated()
-	 * @see #isNewTasksEstimated()
-	 * @generated
-	 */
-	void setNewTasksEstimated(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isNewTasksEstimated <em>New Tasks Estimated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetNewTasksEstimated()
-	 * @see #isNewTasksEstimated()
-	 * @see #setNewTasksEstimated(boolean)
-	 * @generated
-	 */
-	void unsetNewTasksEstimated();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isNewTasksEstimated <em>New Tasks Estimated</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>New Tasks Estimated</em>' attribute is set.
-	 * @see #unsetNewTasksEstimated()
-	 * @see #isNewTasksEstimated()
-	 * @see #setNewTasksEstimated(boolean)
-	 * @generated
-	 */
-	boolean isSetNewTasksEstimated();
-
-	/**
-	 * Returns the value of the '<em><b>Splits In Progress Tasks</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether in-progress tasks can be split.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Splits In Progress Tasks</em>' attribute.
-	 * @see #isSetSplitsInProgressTasks()
-	 * @see #unsetSplitsInProgressTasks()
-	 * @see #setSplitsInProgressTasks(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_SplitsInProgressTasks()
-	 * @model default="true" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='SplitsInProgressTasks' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isSplitsInProgressTasks();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isSplitsInProgressTasks <em>Splits In Progress Tasks</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Splits In Progress Tasks</em>' attribute.
-	 * @see #isSetSplitsInProgressTasks()
-	 * @see #unsetSplitsInProgressTasks()
-	 * @see #isSplitsInProgressTasks()
-	 * @generated
-	 */
-	void setSplitsInProgressTasks(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isSplitsInProgressTasks <em>Splits In Progress Tasks</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetSplitsInProgressTasks()
-	 * @see #isSplitsInProgressTasks()
-	 * @see #setSplitsInProgressTasks(boolean)
-	 * @generated
-	 */
-	void unsetSplitsInProgressTasks();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isSplitsInProgressTasks <em>Splits In Progress Tasks</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Splits In Progress Tasks</em>' attribute is set.
-	 * @see #unsetSplitsInProgressTasks()
-	 * @see #isSplitsInProgressTasks()
-	 * @see #setSplitsInProgressTasks(boolean)
-	 * @generated
-	 */
-	boolean isSetSplitsInProgressTasks();
-
-	/**
-	 * Returns the value of the '<em><b>Spread Actual Cost</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether actual costs are spread to the status date.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Spread Actual Cost</em>' attribute.
-	 * @see #isSetSpreadActualCost()
-	 * @see #unsetSpreadActualCost()
-	 * @see #setSpreadActualCost(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_SpreadActualCost()
-	 * @model default="true" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='SpreadActualCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isSpreadActualCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isSpreadActualCost <em>Spread Actual Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Spread Actual Cost</em>' attribute.
-	 * @see #isSetSpreadActualCost()
-	 * @see #unsetSpreadActualCost()
-	 * @see #isSpreadActualCost()
-	 * @generated
-	 */
-	void setSpreadActualCost(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isSpreadActualCost <em>Spread Actual Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetSpreadActualCost()
-	 * @see #isSpreadActualCost()
-	 * @see #setSpreadActualCost(boolean)
-	 * @generated
-	 */
-	void unsetSpreadActualCost();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isSpreadActualCost <em>Spread Actual Cost</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Spread Actual Cost</em>' attribute is set.
-	 * @see #unsetSpreadActualCost()
-	 * @see #isSpreadActualCost()
-	 * @see #setSpreadActualCost(boolean)
-	 * @generated
-	 */
-	boolean isSetSpreadActualCost();
-
-	/**
-	 * Returns the value of the '<em><b>Spread Percent Complete</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether percent complete is spread to the status date.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Spread Percent Complete</em>' attribute.
-	 * @see #isSetSpreadPercentComplete()
-	 * @see #unsetSpreadPercentComplete()
-	 * @see #setSpreadPercentComplete(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_SpreadPercentComplete()
-	 * @model default="false" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='SpreadPercentComplete' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isSpreadPercentComplete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isSpreadPercentComplete <em>Spread Percent Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Spread Percent Complete</em>' attribute.
-	 * @see #isSetSpreadPercentComplete()
-	 * @see #unsetSpreadPercentComplete()
-	 * @see #isSpreadPercentComplete()
-	 * @generated
-	 */
-	void setSpreadPercentComplete(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isSpreadPercentComplete <em>Spread Percent Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetSpreadPercentComplete()
-	 * @see #isSpreadPercentComplete()
-	 * @see #setSpreadPercentComplete(boolean)
-	 * @generated
-	 */
-	void unsetSpreadPercentComplete();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isSpreadPercentComplete <em>Spread Percent Complete</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Spread Percent Complete</em>' attribute is set.
-	 * @see #unsetSpreadPercentComplete()
-	 * @see #isSpreadPercentComplete()
-	 * @see #setSpreadPercentComplete(boolean)
-	 * @generated
-	 */
-	boolean isSetSpreadPercentComplete();
-
-	/**
-	 * Returns the value of the '<em><b>Task Updates Resource</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether updates to tasks update resources.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Task Updates Resource</em>' attribute.
-	 * @see #isSetTaskUpdatesResource()
-	 * @see #unsetTaskUpdatesResource()
-	 * @see #setTaskUpdatesResource(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_TaskUpdatesResource()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='TaskUpdatesResource' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isTaskUpdatesResource();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isTaskUpdatesResource <em>Task Updates Resource</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Task Updates Resource</em>' attribute.
-	 * @see #isSetTaskUpdatesResource()
-	 * @see #unsetTaskUpdatesResource()
-	 * @see #isTaskUpdatesResource()
-	 * @generated
-	 */
-	void setTaskUpdatesResource(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isTaskUpdatesResource <em>Task Updates Resource</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTaskUpdatesResource()
-	 * @see #isTaskUpdatesResource()
-	 * @see #setTaskUpdatesResource(boolean)
-	 * @generated
-	 */
-	void unsetTaskUpdatesResource();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isTaskUpdatesResource <em>Task Updates Resource</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Task Updates Resource</em>' attribute is set.
-	 * @see #unsetTaskUpdatesResource()
-	 * @see #isTaskUpdatesResource()
-	 * @see #setTaskUpdatesResource(boolean)
-	 * @generated
-	 */
-	boolean isSetTaskUpdatesResource();
-
-	/**
-	 * Returns the value of the '<em><b>Fiscal Year Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies whether to use fiscal year numbering
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Fiscal Year Start</em>' attribute.
-	 * @see #isSetFiscalYearStart()
-	 * @see #unsetFiscalYearStart()
-	 * @see #setFiscalYearStart(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_FiscalYearStart()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='FiscalYearStart' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isFiscalYearStart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isFiscalYearStart <em>Fiscal Year Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fiscal Year Start</em>' attribute.
-	 * @see #isSetFiscalYearStart()
-	 * @see #unsetFiscalYearStart()
-	 * @see #isFiscalYearStart()
-	 * @generated
-	 */
-	void setFiscalYearStart(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isFiscalYearStart <em>Fiscal Year Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetFiscalYearStart()
-	 * @see #isFiscalYearStart()
-	 * @see #setFiscalYearStart(boolean)
-	 * @generated
-	 */
-	void unsetFiscalYearStart();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isFiscalYearStart <em>Fiscal Year Start</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Fiscal Year Start</em>' attribute is set.
-	 * @see #unsetFiscalYearStart()
-	 * @see #isFiscalYearStart()
-	 * @see #setFiscalYearStart(boolean)
-	 * @generated
-	 */
-	boolean isSetFiscalYearStart();
-
-	/**
-	 * Returns the value of the '<em><b>Week Start Day</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Start day of the week. Values are: 
-	 * 						0=Sunday, 1=Monday, 2=Tuesday, 3=Wednesday, 4=Thursday, 5=Friday, 6=Saturday
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Week Start Day</em>' attribute.
-	 * @see #setWeekStartDay(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_WeekStartDay()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.WeekStartDayType"
-	 *        extendedMetaData="kind='element' name='WeekStartDay' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getWeekStartDay();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getWeekStartDay <em>Week Start Day</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Week Start Day</em>' attribute.
-	 * @see #getWeekStartDay()
-	 * @generated
-	 */
-	void setWeekStartDay(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Move Completed Ends Back</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 							Specifies whether the end of completed portions of tasks scheduled to begin after the 
-	 * 							status date but begun early should be moved back to the status date.
-	 * 						
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Move Completed Ends Back</em>' attribute.
-	 * @see #isSetMoveCompletedEndsBack()
-	 * @see #unsetMoveCompletedEndsBack()
-	 * @see #setMoveCompletedEndsBack(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_MoveCompletedEndsBack()
-	 * @model default="false" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='MoveCompletedEndsBack' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isMoveCompletedEndsBack();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isMoveCompletedEndsBack <em>Move Completed Ends Back</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Move Completed Ends Back</em>' attribute.
-	 * @see #isSetMoveCompletedEndsBack()
-	 * @see #unsetMoveCompletedEndsBack()
-	 * @see #isMoveCompletedEndsBack()
-	 * @generated
-	 */
-	void setMoveCompletedEndsBack(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isMoveCompletedEndsBack <em>Move Completed Ends Back</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMoveCompletedEndsBack()
-	 * @see #isMoveCompletedEndsBack()
-	 * @see #setMoveCompletedEndsBack(boolean)
-	 * @generated
-	 */
-	void unsetMoveCompletedEndsBack();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isMoveCompletedEndsBack <em>Move Completed Ends Back</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Move Completed Ends Back</em>' attribute is set.
-	 * @see #unsetMoveCompletedEndsBack()
-	 * @see #isMoveCompletedEndsBack()
-	 * @see #setMoveCompletedEndsBack(boolean)
-	 * @generated
-	 */
-	boolean isSetMoveCompletedEndsBack();
-
-	/**
-	 * Returns the value of the '<em><b>Move Remaining Starts Back</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 							Specifies whether the beginning of remaining portions of tasks scheduled to begin after the 
-	 * 							status date but begun early should be moved back to the status date.
-	 * 						
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Move Remaining Starts Back</em>' attribute.
-	 * @see #isSetMoveRemainingStartsBack()
-	 * @see #unsetMoveRemainingStartsBack()
-	 * @see #setMoveRemainingStartsBack(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_MoveRemainingStartsBack()
-	 * @model default="false" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='MoveRemainingStartsBack' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isMoveRemainingStartsBack();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isMoveRemainingStartsBack <em>Move Remaining Starts Back</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Move Remaining Starts Back</em>' attribute.
-	 * @see #isSetMoveRemainingStartsBack()
-	 * @see #unsetMoveRemainingStartsBack()
-	 * @see #isMoveRemainingStartsBack()
-	 * @generated
-	 */
-	void setMoveRemainingStartsBack(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isMoveRemainingStartsBack <em>Move Remaining Starts Back</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMoveRemainingStartsBack()
-	 * @see #isMoveRemainingStartsBack()
-	 * @see #setMoveRemainingStartsBack(boolean)
-	 * @generated
-	 */
-	void unsetMoveRemainingStartsBack();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isMoveRemainingStartsBack <em>Move Remaining Starts Back</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Move Remaining Starts Back</em>' attribute is set.
-	 * @see #unsetMoveRemainingStartsBack()
-	 * @see #isMoveRemainingStartsBack()
-	 * @see #setMoveRemainingStartsBack(boolean)
-	 * @generated
-	 */
-	boolean isSetMoveRemainingStartsBack();
-
-	/**
-	 * Returns the value of the '<em><b>Move Remaining Starts Forward</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 							Specifies whether the beginning of remaining portions of tasks scheduled to have begun late 
-	 * 							should be moved up to the status date.
-	 * 						
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Move Remaining Starts Forward</em>' attribute.
-	 * @see #isSetMoveRemainingStartsForward()
-	 * @see #unsetMoveRemainingStartsForward()
-	 * @see #setMoveRemainingStartsForward(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_MoveRemainingStartsForward()
-	 * @model default="false" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='MoveRemainingStartsForward' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isMoveRemainingStartsForward();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isMoveRemainingStartsForward <em>Move Remaining Starts Forward</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Move Remaining Starts Forward</em>' attribute.
-	 * @see #isSetMoveRemainingStartsForward()
-	 * @see #unsetMoveRemainingStartsForward()
-	 * @see #isMoveRemainingStartsForward()
-	 * @generated
-	 */
-	void setMoveRemainingStartsForward(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isMoveRemainingStartsForward <em>Move Remaining Starts Forward</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMoveRemainingStartsForward()
-	 * @see #isMoveRemainingStartsForward()
-	 * @see #setMoveRemainingStartsForward(boolean)
-	 * @generated
-	 */
-	void unsetMoveRemainingStartsForward();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isMoveRemainingStartsForward <em>Move Remaining Starts Forward</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Move Remaining Starts Forward</em>' attribute is set.
-	 * @see #unsetMoveRemainingStartsForward()
-	 * @see #isMoveRemainingStartsForward()
-	 * @see #setMoveRemainingStartsForward(boolean)
-	 * @generated
-	 */
-	boolean isSetMoveRemainingStartsForward();
-
-	/**
-	 * Returns the value of the '<em><b>Move Completed Ends Forward</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * 							Specifies whether the end of completed portions of tasks scheduled to have been completed 
-	 * 							before the status date but begun late should be moved up to the status date.
-	 * 						
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Move Completed Ends Forward</em>' attribute.
-	 * @see #isSetMoveCompletedEndsForward()
-	 * @see #unsetMoveCompletedEndsForward()
-	 * @see #setMoveCompletedEndsForward(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_MoveCompletedEndsForward()
-	 * @model default="false" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='MoveCompletedEndsForward' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isMoveCompletedEndsForward();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isMoveCompletedEndsForward <em>Move Completed Ends Forward</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Move Completed Ends Forward</em>' attribute.
-	 * @see #isSetMoveCompletedEndsForward()
-	 * @see #unsetMoveCompletedEndsForward()
-	 * @see #isMoveCompletedEndsForward()
-	 * @generated
-	 */
-	void setMoveCompletedEndsForward(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isMoveCompletedEndsForward <em>Move Completed Ends Forward</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMoveCompletedEndsForward()
-	 * @see #isMoveCompletedEndsForward()
-	 * @see #setMoveCompletedEndsForward(boolean)
-	 * @generated
-	 */
-	void unsetMoveCompletedEndsForward();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isMoveCompletedEndsForward <em>Move Completed Ends Forward</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Move Completed Ends Forward</em>' attribute is set.
-	 * @see #unsetMoveCompletedEndsForward()
-	 * @see #isMoveCompletedEndsForward()
-	 * @see #setMoveCompletedEndsForward(boolean)
-	 * @generated
-	 */
-	boolean isSetMoveCompletedEndsForward();
-
-	/**
-	 * Returns the value of the '<em><b>Baseline For Earned Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The specific baseline used to calculate Variance values.  Values are: 
-	 * 						0=Baseline, 1=Baseline 1, 2=Baseline 2, 3=Baseline 3, 4=Baseline 4, 5=Baseline 5, 6=Baseline 6, 
-	 * 						7=Baseline 7, 8=Baseline 8, 9=Baseline 9, 10=Baseline 10
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Baseline For Earned Value</em>' attribute.
-	 * @see #setBaselineForEarnedValue(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_BaselineForEarnedValue()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.BaselineForEarnedValueType"
-	 *        extendedMetaData="kind='element' name='BaselineForEarnedValue' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getBaselineForEarnedValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getBaselineForEarnedValue <em>Baseline For Earned Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Baseline For Earned Value</em>' attribute.
-	 * @see #getBaselineForEarnedValue()
-	 * @generated
-	 */
-	void setBaselineForEarnedValue(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Auto Add New Resources And Tasks</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether to automatically add new resources to the resource pool.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Auto Add New Resources And Tasks</em>' attribute.
-	 * @see #isSetAutoAddNewResourcesAndTasks()
-	 * @see #unsetAutoAddNewResourcesAndTasks()
-	 * @see #setAutoAddNewResourcesAndTasks(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_AutoAddNewResourcesAndTasks()
-	 * @model default="true" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='AutoAddNewResourcesAndTasks' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isAutoAddNewResourcesAndTasks();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isAutoAddNewResourcesAndTasks <em>Auto Add New Resources And Tasks</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Auto Add New Resources And Tasks</em>' attribute.
-	 * @see #isSetAutoAddNewResourcesAndTasks()
-	 * @see #unsetAutoAddNewResourcesAndTasks()
-	 * @see #isAutoAddNewResourcesAndTasks()
-	 * @generated
-	 */
-	void setAutoAddNewResourcesAndTasks(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isAutoAddNewResourcesAndTasks <em>Auto Add New Resources And Tasks</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetAutoAddNewResourcesAndTasks()
-	 * @see #isAutoAddNewResourcesAndTasks()
-	 * @see #setAutoAddNewResourcesAndTasks(boolean)
-	 * @generated
-	 */
-	void unsetAutoAddNewResourcesAndTasks();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isAutoAddNewResourcesAndTasks <em>Auto Add New Resources And Tasks</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Auto Add New Resources And Tasks</em>' attribute is set.
-	 * @see #unsetAutoAddNewResourcesAndTasks()
-	 * @see #isAutoAddNewResourcesAndTasks()
-	 * @see #setAutoAddNewResourcesAndTasks(boolean)
-	 * @generated
-	 */
-	boolean isSetAutoAddNewResourcesAndTasks();
-
-	/**
-	 * Returns the value of the '<em><b>Status Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Date used for calculation and reporting.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Status Date</em>' attribute.
-	 * @see #setStatusDate(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_StatusDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='StatusDate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getStatusDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getStatusDate <em>Status Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Status Date</em>' attribute.
-	 * @see #getStatusDate()
-	 * @generated
-	 */
-	void setStatusDate(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Current Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The system date that the XML was generated.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Current Date</em>' attribute.
-	 * @see #setCurrentDate(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_CurrentDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='CurrentDate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getCurrentDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getCurrentDate <em>Current Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Current Date</em>' attribute.
-	 * @see #getCurrentDate()
-	 * @generated
-	 */
-	void setCurrentDate(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Microsoft Project Server URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the project was created by a Project Server user as opposed to an NT user.
-	 * 						
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Microsoft Project Server URL</em>' attribute.
-	 * @see #isSetMicrosoftProjectServerURL()
-	 * @see #unsetMicrosoftProjectServerURL()
-	 * @see #setMicrosoftProjectServerURL(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_MicrosoftProjectServerURL()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='MicrosoftProjectServerURL' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isMicrosoftProjectServerURL();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isMicrosoftProjectServerURL <em>Microsoft Project Server URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Microsoft Project Server URL</em>' attribute.
-	 * @see #isSetMicrosoftProjectServerURL()
-	 * @see #unsetMicrosoftProjectServerURL()
-	 * @see #isMicrosoftProjectServerURL()
-	 * @generated
-	 */
-	void setMicrosoftProjectServerURL(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isMicrosoftProjectServerURL <em>Microsoft Project Server URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMicrosoftProjectServerURL()
-	 * @see #isMicrosoftProjectServerURL()
-	 * @see #setMicrosoftProjectServerURL(boolean)
-	 * @generated
-	 */
-	void unsetMicrosoftProjectServerURL();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isMicrosoftProjectServerURL <em>Microsoft Project Server URL</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Microsoft Project Server URL</em>' attribute is set.
-	 * @see #unsetMicrosoftProjectServerURL()
-	 * @see #isMicrosoftProjectServerURL()
-	 * @see #setMicrosoftProjectServerURL(boolean)
-	 * @generated
-	 */
-	boolean isSetMicrosoftProjectServerURL();
-
-	/**
-	 * Returns the value of the '<em><b>Autolink</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether to autolink inserted or moved tasks.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Autolink</em>' attribute.
-	 * @see #isSetAutolink()
-	 * @see #unsetAutolink()
-	 * @see #setAutolink(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_Autolink()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='Autolink' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isAutolink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isAutolink <em>Autolink</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Autolink</em>' attribute.
-	 * @see #isSetAutolink()
-	 * @see #unsetAutolink()
-	 * @see #isAutolink()
-	 * @generated
-	 */
-	void setAutolink(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isAutolink <em>Autolink</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetAutolink()
-	 * @see #isAutolink()
-	 * @see #setAutolink(boolean)
-	 * @generated
-	 */
-	void unsetAutolink();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isAutolink <em>Autolink</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Autolink</em>' attribute is set.
-	 * @see #unsetAutolink()
-	 * @see #isAutolink()
-	 * @see #setAutolink(boolean)
-	 * @generated
-	 */
-	boolean isSetAutolink();
-
-	/**
-	 * Returns the value of the '<em><b>New Task Start Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default date for new tasks start.  Values are: 
-	 * 						0=Project Start Date, 1=Current Date
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>New Task Start Date</em>' attribute.
-	 * @see #setNewTaskStartDate(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_NewTaskStartDate()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.NewTaskStartDateType"
-	 *        extendedMetaData="kind='element' name='NewTaskStartDate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getNewTaskStartDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getNewTaskStartDate <em>New Task Start Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>New Task Start Date</em>' attribute.
-	 * @see #getNewTaskStartDate()
-	 * @generated
-	 */
-	void setNewTaskStartDate(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Default Task EV Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default earned value method for tasks.  Values are: 
-	 * 						0=Percent Complete, 1=Physical Percent Complete
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Default Task EV Method</em>' attribute.
-	 * @see #setDefaultTaskEVMethod(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_DefaultTaskEVMethod()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.DefaultTaskEVMethodType"
-	 *        extendedMetaData="kind='element' name='DefaultTaskEVMethod' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getDefaultTaskEVMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getDefaultTaskEVMethod <em>Default Task EV Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Task EV Method</em>' attribute.
-	 * @see #getDefaultTaskEVMethod()
-	 * @generated
-	 */
-	void setDefaultTaskEVMethod(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Project Externally Edited</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the project XML was edited.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Project Externally Edited</em>' attribute.
-	 * @see #isSetProjectExternallyEdited()
-	 * @see #unsetProjectExternallyEdited()
-	 * @see #setProjectExternallyEdited(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_ProjectExternallyEdited()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='ProjectExternallyEdited' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isProjectExternallyEdited();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isProjectExternallyEdited <em>Project Externally Edited</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Project Externally Edited</em>' attribute.
-	 * @see #isSetProjectExternallyEdited()
-	 * @see #unsetProjectExternallyEdited()
-	 * @see #isProjectExternallyEdited()
-	 * @generated
-	 */
-	void setProjectExternallyEdited(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isProjectExternallyEdited <em>Project Externally Edited</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetProjectExternallyEdited()
-	 * @see #isProjectExternallyEdited()
-	 * @see #setProjectExternallyEdited(boolean)
-	 * @generated
-	 */
-	void unsetProjectExternallyEdited();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isProjectExternallyEdited <em>Project Externally Edited</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Project Externally Edited</em>' attribute is set.
-	 * @see #unsetProjectExternallyEdited()
-	 * @see #isProjectExternallyEdited()
-	 * @see #setProjectExternallyEdited(boolean)
-	 * @generated
-	 */
-	boolean isSetProjectExternallyEdited();
-
-	/**
-	 * Returns the value of the '<em><b>Extended Creation Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Date used for calculation and reporting.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Extended Creation Date</em>' attribute.
-	 * @see #setExtendedCreationDate(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_ExtendedCreationDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='ExtendedCreationDate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getExtendedCreationDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getExtendedCreationDate <em>Extended Creation Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Extended Creation Date</em>' attribute.
-	 * @see #getExtendedCreationDate()
-	 * @generated
-	 */
-	void setExtendedCreationDate(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Actuals In Sync</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether all actual work has been synchronized with the project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actuals In Sync</em>' attribute.
-	 * @see #isSetActualsInSync()
-	 * @see #unsetActualsInSync()
-	 * @see #setActualsInSync(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_ActualsInSync()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='ActualsInSync' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isActualsInSync();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isActualsInSync <em>Actuals In Sync</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actuals In Sync</em>' attribute.
-	 * @see #isSetActualsInSync()
-	 * @see #unsetActualsInSync()
-	 * @see #isActualsInSync()
-	 * @generated
-	 */
-	void setActualsInSync(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isActualsInSync <em>Actuals In Sync</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetActualsInSync()
-	 * @see #isActualsInSync()
-	 * @see #setActualsInSync(boolean)
-	 * @generated
-	 */
-	void unsetActualsInSync();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isActualsInSync <em>Actuals In Sync</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Actuals In Sync</em>' attribute is set.
-	 * @see #unsetActualsInSync()
-	 * @see #isActualsInSync()
-	 * @see #setActualsInSync(boolean)
-	 * @generated
-	 */
-	boolean isSetActualsInSync();
-
-	/**
-	 * Returns the value of the '<em><b>Remove File Properties</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether to remove all file properties on save.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Remove File Properties</em>' attribute.
-	 * @see #isSetRemoveFileProperties()
-	 * @see #unsetRemoveFileProperties()
-	 * @see #setRemoveFileProperties(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_RemoveFileProperties()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='RemoveFileProperties' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isRemoveFileProperties();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isRemoveFileProperties <em>Remove File Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remove File Properties</em>' attribute.
-	 * @see #isSetRemoveFileProperties()
-	 * @see #unsetRemoveFileProperties()
-	 * @see #isRemoveFileProperties()
-	 * @generated
-	 */
-	void setRemoveFileProperties(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isRemoveFileProperties <em>Remove File Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetRemoveFileProperties()
-	 * @see #isRemoveFileProperties()
-	 * @see #setRemoveFileProperties(boolean)
-	 * @generated
-	 */
-	void unsetRemoveFileProperties();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isRemoveFileProperties <em>Remove File Properties</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Remove File Properties</em>' attribute is set.
-	 * @see #unsetRemoveFileProperties()
-	 * @see #isRemoveFileProperties()
-	 * @see #setRemoveFileProperties(boolean)
-	 * @generated
-	 */
-	boolean isSetRemoveFileProperties();
-
-	/**
-	 * Returns the value of the '<em><b>Admin Project</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the project is an administrative project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Admin Project</em>' attribute.
-	 * @see #isSetAdminProject()
-	 * @see #unsetAdminProject()
-	 * @see #setAdminProject(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_AdminProject()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='AdminProject' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isAdminProject();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#isAdminProject <em>Admin Project</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Admin Project</em>' attribute.
-	 * @see #isSetAdminProject()
-	 * @see #unsetAdminProject()
-	 * @see #isAdminProject()
-	 * @generated
-	 */
-	void setAdminProject(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Project#isAdminProject <em>Admin Project</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetAdminProject()
-	 * @see #isAdminProject()
-	 * @see #setAdminProject(boolean)
-	 * @generated
-	 */
-	void unsetAdminProject();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Project#isAdminProject <em>Admin Project</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Admin Project</em>' attribute is set.
-	 * @see #unsetAdminProject()
-	 * @see #isAdminProject()
-	 * @see #setAdminProject(boolean)
-	 * @generated
-	 */
-	boolean isSetAdminProject();
-
-	/**
-	 * Returns the value of the '<em><b>Outline Codes</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The collection of outline code definitions associated with the project.  These codes may be associated only with this project, or may be common among several projects (enterprise codes).
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Outline Codes</em>' containment reference.
-	 * @see #setOutlineCodes(OutlineCodes)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_OutlineCodes()
-	 * @model containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='OutlineCodes' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	OutlineCodes getOutlineCodes();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getOutlineCodes <em>Outline Codes</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Outline Codes</em>' containment reference.
-	 * @see #getOutlineCodes()
-	 * @generated
-	 */
-	void setOutlineCodes(OutlineCodes value);
-
-	/**
-	 * Returns the value of the '<em><b>WBS Masks</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The table of entries that define the outline code mask.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>WBS Masks</em>' containment reference.
-	 * @see #setWBSMasks(WBSMasks)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_WBSMasks()
-	 * @model containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='WBSMasks' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	WBSMasks getWBSMasks();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getWBSMasks <em>WBS Masks</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>WBS Masks</em>' containment reference.
-	 * @see #getWBSMasks()
-	 * @generated
-	 */
-	void setWBSMasks(WBSMasks value);
-
-	/**
-	 * Returns the value of the '<em><b>Extended Attributes</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The collection of extended attribute (custom field) definitions 
-	 *         associated with the project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Extended Attributes</em>' containment reference.
-	 * @see #setExtendedAttributes(ExtendedAttributes)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_ExtendedAttributes()
-	 * @model containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='ExtendedAttributes' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	ExtendedAttributes getExtendedAttributes();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getExtendedAttributes <em>Extended Attributes</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Extended Attributes</em>' containment reference.
-	 * @see #getExtendedAttributes()
-	 * @generated
-	 */
-	void setExtendedAttributes(ExtendedAttributes value);
-
-	/**
-	 * Returns the value of the '<em><b>Calendars</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The collection of calendars that is associated with the 
-	 *         project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Calendars</em>' containment reference.
-	 * @see #setCalendars(Calendars)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_Calendars()
-	 * @model containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='Calendars' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Calendars getCalendars();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getCalendars <em>Calendars</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Calendars</em>' containment reference.
-	 * @see #getCalendars()
-	 * @generated
-	 */
-	void setCalendars(Calendars value);
-
-	/**
-	 * Returns the value of the '<em><b>Tasks</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The collection of tasks that make up the project.
-	 *         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Tasks</em>' containment reference.
-	 * @see #setTasks(Tasks)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_Tasks()
-	 * @model containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='Tasks' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Tasks getTasks();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getTasks <em>Tasks</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Tasks</em>' containment reference.
-	 * @see #getTasks()
-	 * @generated
-	 */
-	void setTasks(Tasks value);
-
-	/**
-	 * Returns the value of the '<em><b>Resources</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The collection of resources that make up the project.
-	 *         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Resources</em>' containment reference.
-	 * @see #setResources(Resources)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_Resources()
-	 * @model containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='Resources' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Resources getResources();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getResources <em>Resources</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Resources</em>' containment reference.
-	 * @see #getResources()
-	 * @generated
-	 */
-	void setResources(Resources value);
-
-	/**
-	 * Returns the value of the '<em><b>Assignments</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The collection of assignments that make up the project.
-	 *     
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Assignments</em>' containment reference.
-	 * @see #setAssignments(Assignments)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getProject_Assignments()
-	 * @model containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='Assignments' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Assignments getAssignments();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Project#getAssignments <em>Assignments</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Assignments</em>' containment reference.
-	 * @see #getAssignments()
-	 * @generated
-	 */
-	void setAssignments(Assignments value);
-
-} // Project
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Rate.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Rate.java
deleted file mode 100755
index 3d71d7e..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Rate.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Rate.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Rate</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Rate#getRatesFrom <em>Rates From</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Rate#getRatesTo <em>Rates To</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Rate#getRateTable <em>Rate Table</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Rate#getStandardRate <em>Standard Rate</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Rate#getStandardRateFormat <em>Standard Rate Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Rate#getOvertimeRate <em>Overtime Rate</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Rate#getOvertimeRateFormat <em>Overtime Rate Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Rate#getCostPerUse <em>Cost Per Use</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getRate()
- * @model extendedMetaData="name='Rate_._type' kind='elementOnly'"
- * @generated
- */
-public interface Rate extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Rates From</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The date that the rate becomes effective.
-	 *                                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Rates From</em>' attribute.
-	 * @see #setRatesFrom(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getRate_RatesFrom()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime" required="true"
-	 *        extendedMetaData="kind='element' name='RatesFrom' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getRatesFrom();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Rate#getRatesFrom <em>Rates From</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rates From</em>' attribute.
-	 * @see #getRatesFrom()
-	 * @generated
-	 */
-	void setRatesFrom(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Rates To</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The last date that the rate is effective.
-	 *                                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Rates To</em>' attribute.
-	 * @see #setRatesTo(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getRate_RatesTo()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime" required="true"
-	 *        extendedMetaData="kind='element' name='RatesTo' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getRatesTo();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Rate#getRatesTo <em>Rates To</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rates To</em>' attribute.
-	 * @see #getRatesTo()
-	 * @generated
-	 */
-	void setRatesTo(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Rate Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique identifier of the rate table for the resource. 
-	 *                                                         Values are: 0=A, 1=B, 2=C, 3=D, 4=E
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Rate Table</em>' attribute.
-	 * @see #setRateTable(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getRate_RateTable()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.RateTableType"
-	 *        extendedMetaData="kind='element' name='RateTable' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getRateTable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Rate#getRateTable <em>Rate Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rate Table</em>' attribute.
-	 * @see #getRateTable()
-	 * @generated
-	 */
-	void setRateTable(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Standard Rate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The standard rate for the resource for the period specified.
-	 *                                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Standard Rate</em>' attribute.
-	 * @see #setStandardRate(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getRate_StandardRate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='StandardRate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getStandardRate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Rate#getStandardRate <em>Standard Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Standard Rate</em>' attribute.
-	 * @see #getStandardRate()
-	 * @generated
-	 */
-	void setStandardRate(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Standard Rate Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The units used by Microsoft Project to display the standard rate.  
-	 *                                                         1=m, 2=h, 3=d, 4=w, 5=mo, 7=y
-	 *                                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Standard Rate Format</em>' attribute.
-	 * @see #setStandardRateFormat(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getRate_StandardRateFormat()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.StandardRateFormatType"
-	 *        extendedMetaData="kind='element' name='StandardRateFormat' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getStandardRateFormat();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Rate#getStandardRateFormat <em>Standard Rate Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Standard Rate Format</em>' attribute.
-	 * @see #getStandardRateFormat()
-	 * @generated
-	 */
-	void setStandardRateFormat(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Overtime Rate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The overtime rate for the resource for the period specified.
-	 *                                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Overtime Rate</em>' attribute.
-	 * @see #setOvertimeRate(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getRate_OvertimeRate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='OvertimeRate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getOvertimeRate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Rate#getOvertimeRate <em>Overtime Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Overtime Rate</em>' attribute.
-	 * @see #getOvertimeRate()
-	 * @generated
-	 */
-	void setOvertimeRate(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Overtime Rate Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The units used by Microsoft Project to display the overtime rate.  
-	 *                                                         1=m, 2=h, 3=d, 4=w, 5=mo, 7=y
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Overtime Rate Format</em>' attribute.
-	 * @see #setOvertimeRateFormat(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getRate_OvertimeRateFormat()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.OvertimeRateFormatType"
-	 *        extendedMetaData="kind='element' name='OvertimeRateFormat' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getOvertimeRateFormat();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Rate#getOvertimeRateFormat <em>Overtime Rate Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Overtime Rate Format</em>' attribute.
-	 * @see #getOvertimeRateFormat()
-	 * @generated
-	 */
-	void setOvertimeRateFormat(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Cost Per Use</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The cost per use of the resource. 
-	 *                                                         This value is as of the current date if a rate table exists for the resource.
-	 *                                                         
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Cost Per Use</em>' attribute.
-	 * @see #setCostPerUse(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getRate_CostPerUse()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='CostPerUse' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getCostPerUse();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Rate#getCostPerUse <em>Cost Per Use</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cost Per Use</em>' attribute.
-	 * @see #getCostPerUse()
-	 * @generated
-	 */
-	void setCostPerUse(BigDecimal value);
-
-} // Rate
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Rates.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Rates.java
deleted file mode 100755
index ffff2c2..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Rates.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Rates.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Rates</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Rates#getRate <em>Rate</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getRates()
- * @model extendedMetaData="name='Rates_._type' kind='elementOnly'"
- * @generated
- */
-public interface Rates extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Rate</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.Rate}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The definition of a time period, and the rates applicable for 
-	 *                                             the resource during that period.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Rate</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getRates_Rate()
-	 * @model type="org.eclipse.epf.msproject.Rate" containment="true" resolveProxies="false" upper="25"
-	 *        extendedMetaData="kind='element' name='Rate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getRate();
-
-} // Rates
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Resource.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Resource.java
deleted file mode 100755
index 8465371..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Resource.java
+++ /dev/null
@@ -1,2286 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Resource.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Resource</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getID <em>ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#isIsNull <em>Is Null</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getInitials <em>Initials</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getPhonetics <em>Phonetics</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getNTAccount <em>NT Account</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getMaterialLabel <em>Material Label</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getWorkGroup <em>Work Group</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getEmailAddress <em>Email Address</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getHyperlink <em>Hyperlink</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getHyperlinkAddress <em>Hyperlink Address</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getHyperlinkSubAddress <em>Hyperlink Sub Address</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getMaxUnits <em>Max Units</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getPeakUnits <em>Peak Units</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#isOverAllocated <em>Over Allocated</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getAvailableFrom <em>Available From</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getAvailableTo <em>Available To</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getFinish <em>Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#isCanLevel <em>Can Level</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getAccrueAt <em>Accrue At</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getWork <em>Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getRegularWork <em>Regular Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getOvertimeWork <em>Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getActualWork <em>Actual Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getRemainingWork <em>Remaining Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getActualOvertimeWork <em>Actual Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getRemainingOvertimeWork <em>Remaining Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getPercentWorkComplete <em>Percent Work Complete</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getStandardRate <em>Standard Rate</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getStandardRateFormat <em>Standard Rate Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getCost <em>Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getOvertimeRate <em>Overtime Rate</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getOvertimeRateFormat <em>Overtime Rate Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getOvertimeCost <em>Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getCostPerUse <em>Cost Per Use</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getActualCost <em>Actual Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getActualOvertimeCost <em>Actual Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getRemainingCost <em>Remaining Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getRemainingOvertimeCost <em>Remaining Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getWorkVariance <em>Work Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getCostVariance <em>Cost Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getSV <em>SV</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getCV <em>CV</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getACWP <em>ACWP</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getCalendarUID <em>Calendar UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getNotes <em>Notes</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getBCWS <em>BCWS</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getBCWP <em>BCWP</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#isIsGeneric <em>Is Generic</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#isIsInactive <em>Is Inactive</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#isIsEnterprise <em>Is Enterprise</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getBookingType <em>Booking Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getActualWorkProtected <em>Actual Work Protected</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getActualOvertimeWorkProtected <em>Actual Overtime Work Protected</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getActiveDirectoryGUID <em>Active Directory GUID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getCreationDate <em>Creation Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getExtendedAttribute <em>Extended Attribute</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getBaseline <em>Baseline</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getOutlineCode <em>Outline Code</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getAvailabilityPeriods <em>Availability Periods</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getRates <em>Rates</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Resource#getTimephasedData <em>Timephased Data</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getResource()
- * @model extendedMetaData="name='Resource_._type' kind='elementOnly'"
- * @generated
- */
-public interface Resource extends EObject {
-	/**
-	 * Returns the value of the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique identifier of the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>UID</em>' attribute.
-	 * @see #setUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_UID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer" required="true"
-	 *        extendedMetaData="kind='element' name='UID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getUID <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>UID</em>' attribute.
-	 * @see #getUID()
-	 * @generated
-	 */
-	void setUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The position identifier of the resource within the list of resources.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>ID</em>' attribute.
-	 * @see #setID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_ID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='ID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getID <em>ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>ID</em>' attribute.
-	 * @see #getID()
-	 * @generated
-	 */
-	void setID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The name of the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_Name()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.NameType1"
-	 *        extendedMetaData="kind='element' name='Name' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The type of resource. Values are: 0=Material, 1=Work
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_Type()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.TypeType4"
-	 *        extendedMetaData="kind='element' name='Type' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Is Null</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies whether the resource is null.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Null</em>' attribute.
-	 * @see #isSetIsNull()
-	 * @see #unsetIsNull()
-	 * @see #setIsNull(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_IsNull()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='IsNull' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isIsNull();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#isIsNull <em>Is Null</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Null</em>' attribute.
-	 * @see #isSetIsNull()
-	 * @see #unsetIsNull()
-	 * @see #isIsNull()
-	 * @generated
-	 */
-	void setIsNull(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Resource#isIsNull <em>Is Null</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsNull()
-	 * @see #isIsNull()
-	 * @see #setIsNull(boolean)
-	 * @generated
-	 */
-	void unsetIsNull();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Resource#isIsNull <em>Is Null</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Null</em>' attribute is set.
-	 * @see #unsetIsNull()
-	 * @see #isIsNull()
-	 * @see #setIsNull(boolean)
-	 * @generated
-	 */
-	boolean isSetIsNull();
-
-	/**
-	 * Returns the value of the '<em><b>Initials</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The initials of the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Initials</em>' attribute.
-	 * @see #setInitials(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_Initials()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.InitialsType"
-	 *        extendedMetaData="kind='element' name='Initials' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getInitials();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getInitials <em>Initials</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Initials</em>' attribute.
-	 * @see #getInitials()
-	 * @generated
-	 */
-	void setInitials(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Phonetics</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The phonetic spelling of the resource name.  
-	 *                                 For use with Japanese only.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Phonetics</em>' attribute.
-	 * @see #setPhonetics(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_Phonetics()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.PhoneticsType"
-	 *        extendedMetaData="kind='element' name='Phonetics' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getPhonetics();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getPhonetics <em>Phonetics</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Phonetics</em>' attribute.
-	 * @see #getPhonetics()
-	 * @generated
-	 */
-	void setPhonetics(String value);
-
-	/**
-	 * Returns the value of the '<em><b>NT Account</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The NT account associated with the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>NT Account</em>' attribute.
-	 * @see #setNTAccount(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_NTAccount()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.NTAccountType"
-	 *        extendedMetaData="kind='element' name='NTAccount' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getNTAccount();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getNTAccount <em>NT Account</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>NT Account</em>' attribute.
-	 * @see #getNTAccount()
-	 * @generated
-	 */
-	void setNTAccount(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Material Label</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unit of measure for the material resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Material Label</em>' attribute.
-	 * @see #setMaterialLabel(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_MaterialLabel()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.MaterialLabelType"
-	 *        extendedMetaData="kind='element' name='MaterialLabel' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getMaterialLabel();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getMaterialLabel <em>Material Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Material Label</em>' attribute.
-	 * @see #getMaterialLabel()
-	 * @generated
-	 */
-	void setMaterialLabel(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Code</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The code or other information about the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Code</em>' attribute.
-	 * @see #setCode(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_Code()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.CodeType"
-	 *        extendedMetaData="kind='element' name='Code' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getCode();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getCode <em>Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Code</em>' attribute.
-	 * @see #getCode()
-	 * @generated
-	 */
-	void setCode(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Group</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The group to which the resource belongs.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Group</em>' attribute.
-	 * @see #setGroup(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_Group()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.GroupType"
-	 *        extendedMetaData="kind='element' name='Group' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getGroup();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getGroup <em>Group</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Group</em>' attribute.
-	 * @see #getGroup()
-	 * @generated
-	 */
-	void setGroup(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Work Group</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The type of workgroup to which the resource belongs. 
-	 *                                 Values are: 0=Default, 1=None, 2=Email, 3=Web
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Work Group</em>' attribute.
-	 * @see #setWorkGroup(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_WorkGroup()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.WorkGroupType"
-	 *        extendedMetaData="kind='element' name='WorkGroup' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getWorkGroup();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getWorkGroup <em>Work Group</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Work Group</em>' attribute.
-	 * @see #getWorkGroup()
-	 * @generated
-	 */
-	void setWorkGroup(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Email Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The email address of the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Email Address</em>' attribute.
-	 * @see #setEmailAddress(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_EmailAddress()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.EmailAddressType"
-	 *        extendedMetaData="kind='element' name='EmailAddress' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getEmailAddress();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getEmailAddress <em>Email Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Email Address</em>' attribute.
-	 * @see #getEmailAddress()
-	 * @generated
-	 */
-	void setEmailAddress(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Hyperlink</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The title of the hyperlink associated with the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Hyperlink</em>' attribute.
-	 * @see #setHyperlink(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_Hyperlink()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.HyperlinkType1"
-	 *        extendedMetaData="kind='element' name='Hyperlink' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getHyperlink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getHyperlink <em>Hyperlink</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hyperlink</em>' attribute.
-	 * @see #getHyperlink()
-	 * @generated
-	 */
-	void setHyperlink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Hyperlink Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The hyperlink associated with the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Hyperlink Address</em>' attribute.
-	 * @see #setHyperlinkAddress(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_HyperlinkAddress()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.HyperlinkAddressType1"
-	 *        extendedMetaData="kind='element' name='HyperlinkAddress' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getHyperlinkAddress();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getHyperlinkAddress <em>Hyperlink Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hyperlink Address</em>' attribute.
-	 * @see #getHyperlinkAddress()
-	 * @generated
-	 */
-	void setHyperlinkAddress(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Hyperlink Sub Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The document bookmark of the hyperlink associated with the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Hyperlink Sub Address</em>' attribute.
-	 * @see #setHyperlinkSubAddress(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_HyperlinkSubAddress()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.HyperlinkSubAddressType"
-	 *        extendedMetaData="kind='element' name='HyperlinkSubAddress' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getHyperlinkSubAddress();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getHyperlinkSubAddress <em>Hyperlink Sub Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hyperlink Sub Address</em>' attribute.
-	 * @see #getHyperlinkSubAddress()
-	 * @generated
-	 */
-	void setHyperlinkSubAddress(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Max Units</b></em>' attribute.
-	 * The default value is <code>"1.0"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The maximum number of units that the resource is available.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Max Units</em>' attribute.
-	 * @see #isSetMaxUnits()
-	 * @see #unsetMaxUnits()
-	 * @see #setMaxUnits(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_MaxUnits()
-	 * @model default="1.0" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='MaxUnits' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getMaxUnits();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getMaxUnits <em>Max Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Max Units</em>' attribute.
-	 * @see #isSetMaxUnits()
-	 * @see #unsetMaxUnits()
-	 * @see #getMaxUnits()
-	 * @generated
-	 */
-	void setMaxUnits(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Resource#getMaxUnits <em>Max Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMaxUnits()
-	 * @see #getMaxUnits()
-	 * @see #setMaxUnits(float)
-	 * @generated
-	 */
-	void unsetMaxUnits();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Resource#getMaxUnits <em>Max Units</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Max Units</em>' attribute is set.
-	 * @see #unsetMaxUnits()
-	 * @see #getMaxUnits()
-	 * @see #setMaxUnits(float)
-	 * @generated
-	 */
-	boolean isSetMaxUnits();
-
-	/**
-	 * Returns the value of the '<em><b>Peak Units</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The largest number of units assigned to the resource at any time.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Peak Units</em>' attribute.
-	 * @see #isSetPeakUnits()
-	 * @see #unsetPeakUnits()
-	 * @see #setPeakUnits(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_PeakUnits()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='PeakUnits' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getPeakUnits();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getPeakUnits <em>Peak Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Peak Units</em>' attribute.
-	 * @see #isSetPeakUnits()
-	 * @see #unsetPeakUnits()
-	 * @see #getPeakUnits()
-	 * @generated
-	 */
-	void setPeakUnits(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Resource#getPeakUnits <em>Peak Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetPeakUnits()
-	 * @see #getPeakUnits()
-	 * @see #setPeakUnits(float)
-	 * @generated
-	 */
-	void unsetPeakUnits();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Resource#getPeakUnits <em>Peak Units</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Peak Units</em>' attribute is set.
-	 * @see #unsetPeakUnits()
-	 * @see #getPeakUnits()
-	 * @see #setPeakUnits(float)
-	 * @generated
-	 */
-	boolean isSetPeakUnits();
-
-	/**
-	 * Returns the value of the '<em><b>Over Allocated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the resource is overallocated.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Over Allocated</em>' attribute.
-	 * @see #isSetOverAllocated()
-	 * @see #unsetOverAllocated()
-	 * @see #setOverAllocated(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_OverAllocated()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='OverAllocated' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isOverAllocated();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#isOverAllocated <em>Over Allocated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Over Allocated</em>' attribute.
-	 * @see #isSetOverAllocated()
-	 * @see #unsetOverAllocated()
-	 * @see #isOverAllocated()
-	 * @generated
-	 */
-	void setOverAllocated(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Resource#isOverAllocated <em>Over Allocated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetOverAllocated()
-	 * @see #isOverAllocated()
-	 * @see #setOverAllocated(boolean)
-	 * @generated
-	 */
-	void unsetOverAllocated();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Resource#isOverAllocated <em>Over Allocated</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Over Allocated</em>' attribute is set.
-	 * @see #unsetOverAllocated()
-	 * @see #isOverAllocated()
-	 * @see #setOverAllocated(boolean)
-	 * @generated
-	 */
-	boolean isSetOverAllocated();
-
-	/**
-	 * Returns the value of the '<em><b>Available From</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The first date that the resource is available.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Available From</em>' attribute.
-	 * @see #setAvailableFrom(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_AvailableFrom()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='AvailableFrom' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getAvailableFrom();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getAvailableFrom <em>Available From</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Available From</em>' attribute.
-	 * @see #getAvailableFrom()
-	 * @generated
-	 */
-	void setAvailableFrom(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Available To</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The last date the resource is available.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Available To</em>' attribute.
-	 * @see #setAvailableTo(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_AvailableTo()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='AvailableTo' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getAvailableTo();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getAvailableTo <em>Available To</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Available To</em>' attribute.
-	 * @see #getAvailableTo()
-	 * @generated
-	 */
-	void setAvailableTo(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The scheduled start date of the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Start</em>' attribute.
-	 * @see #setStart(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_Start()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='Start' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getStart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getStart <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start</em>' attribute.
-	 * @see #getStart()
-	 * @generated
-	 */
-	void setStart(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The scheduled finish date of the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Finish</em>' attribute.
-	 * @see #setFinish(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_Finish()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='Finish' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getFinish();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getFinish <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Finish</em>' attribute.
-	 * @see #getFinish()
-	 * @generated
-	 */
-	void setFinish(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Can Level</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the resource can be leveled.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Can Level</em>' attribute.
-	 * @see #isSetCanLevel()
-	 * @see #unsetCanLevel()
-	 * @see #setCanLevel(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_CanLevel()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='CanLevel' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isCanLevel();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#isCanLevel <em>Can Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Can Level</em>' attribute.
-	 * @see #isSetCanLevel()
-	 * @see #unsetCanLevel()
-	 * @see #isCanLevel()
-	 * @generated
-	 */
-	void setCanLevel(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Resource#isCanLevel <em>Can Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetCanLevel()
-	 * @see #isCanLevel()
-	 * @see #setCanLevel(boolean)
-	 * @generated
-	 */
-	void unsetCanLevel();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Resource#isCanLevel <em>Can Level</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Can Level</em>' attribute is set.
-	 * @see #unsetCanLevel()
-	 * @see #isCanLevel()
-	 * @see #setCanLevel(boolean)
-	 * @generated
-	 */
-	boolean isSetCanLevel();
-
-	/**
-	 * Returns the value of the '<em><b>Accrue At</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * How cost is accrued against the resource. 
-	 *                                 Values are: 1=Start, 2=End, 3=Prorated
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Accrue At</em>' attribute.
-	 * @see #setAccrueAt(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_AccrueAt()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.AccrueAt"
-	 *        extendedMetaData="kind='element' name='AccrueAt' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getAccrueAt();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getAccrueAt <em>Accrue At</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Accrue At</em>' attribute.
-	 * @see #getAccrueAt()
-	 * @generated
-	 */
-	void setAccrueAt(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The total work assigned to the resource across all assigned tasks.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Work</em>' attribute.
-	 * @see #setWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_Work()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='Work' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getWork <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Work</em>' attribute.
-	 * @see #getWork()
-	 * @generated
-	 */
-	void setWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Regular Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of non-overtime work assigned to the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Regular Work</em>' attribute.
-	 * @see #setRegularWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_RegularWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='RegularWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getRegularWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getRegularWork <em>Regular Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Regular Work</em>' attribute.
-	 * @see #getRegularWork()
-	 * @generated
-	 */
-	void setRegularWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of overtime work assigned to the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Overtime Work</em>' attribute.
-	 * @see #setOvertimeWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_OvertimeWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='OvertimeWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getOvertimeWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getOvertimeWork <em>Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Overtime Work</em>' attribute.
-	 * @see #getOvertimeWork()
-	 * @generated
-	 */
-	void setOvertimeWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of actual work performed by the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Work</em>' attribute.
-	 * @see #setActualWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_ActualWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='ActualWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getActualWork <em>Actual Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Work</em>' attribute.
-	 * @see #getActualWork()
-	 * @generated
-	 */
-	void setActualWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Remaining Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of remaining work required to complete all assigned tasks.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Remaining Work</em>' attribute.
-	 * @see #setRemainingWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_RemainingWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='RemainingWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getRemainingWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getRemainingWork <em>Remaining Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remaining Work</em>' attribute.
-	 * @see #getRemainingWork()
-	 * @generated
-	 */
-	void setRemainingWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of actual overtime work performed by the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Overtime Work</em>' attribute.
-	 * @see #setActualOvertimeWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_ActualOvertimeWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='ActualOvertimeWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualOvertimeWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getActualOvertimeWork <em>Actual Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Overtime Work</em>' attribute.
-	 * @see #getActualOvertimeWork()
-	 * @generated
-	 */
-	void setActualOvertimeWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Remaining Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of remaining overtime work required to complete all tasks.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Remaining Overtime Work</em>' attribute.
-	 * @see #setRemainingOvertimeWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_RemainingOvertimeWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='RemainingOvertimeWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getRemainingOvertimeWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getRemainingOvertimeWork <em>Remaining Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remaining Overtime Work</em>' attribute.
-	 * @see #getRemainingOvertimeWork()
-	 * @generated
-	 */
-	void setRemainingOvertimeWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Percent Work Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The percentage of work completed across all tasks.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Percent Work Complete</em>' attribute.
-	 * @see #setPercentWorkComplete(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_PercentWorkComplete()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='PercentWorkComplete' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getPercentWorkComplete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getPercentWorkComplete <em>Percent Work Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Percent Work Complete</em>' attribute.
-	 * @see #getPercentWorkComplete()
-	 * @generated
-	 */
-	void setPercentWorkComplete(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Standard Rate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The standard rate of the resource. 
-	 *                                 This value is as of the current date if a rate table exists for the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Standard Rate</em>' attribute.
-	 * @see #setStandardRate(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_StandardRate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='StandardRate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getStandardRate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getStandardRate <em>Standard Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Standard Rate</em>' attribute.
-	 * @see #getStandardRate()
-	 * @generated
-	 */
-	void setStandardRate(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Standard Rate Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The units used by Microsoft Project to display the standard rate.  
-	 *                                 1=m, 2=h, 3=d, 4=w, 5=mo, 7=y, 8=material resource rate (or blank symbol specified)
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Standard Rate Format</em>' attribute.
-	 * @see #setStandardRateFormat(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_StandardRateFormat()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.StandardRateFormatType1"
-	 *        extendedMetaData="kind='element' name='StandardRateFormat' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getStandardRateFormat();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getStandardRateFormat <em>Standard Rate Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Standard Rate Format</em>' attribute.
-	 * @see #getStandardRateFormat()
-	 * @generated
-	 */
-	void setStandardRateFormat(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The total project cost for the resource across all assigned tasks.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Cost</em>' attribute.
-	 * @see #setCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_Cost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='Cost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getCost <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cost</em>' attribute.
-	 * @see #getCost()
-	 * @generated
-	 */
-	void setCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Overtime Rate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The overtime rate of the resource. 
-	 *                                 This value is as of the current date if a rate table exists for the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Overtime Rate</em>' attribute.
-	 * @see #setOvertimeRate(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_OvertimeRate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='OvertimeRate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getOvertimeRate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getOvertimeRate <em>Overtime Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Overtime Rate</em>' attribute.
-	 * @see #getOvertimeRate()
-	 * @generated
-	 */
-	void setOvertimeRate(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Overtime Rate Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The units used by Microsoft Project to display the overtime rate.  
-	 *                                 1=m, 2=h, 3=d, 4=w, 5=mo, 7=y
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Overtime Rate Format</em>' attribute.
-	 * @see #setOvertimeRateFormat(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_OvertimeRateFormat()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.OvertimeRateFormatType1"
-	 *        extendedMetaData="kind='element' name='OvertimeRateFormat' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getOvertimeRateFormat();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getOvertimeRateFormat <em>Overtime Rate Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Overtime Rate Format</em>' attribute.
-	 * @see #getOvertimeRateFormat()
-	 * @generated
-	 */
-	void setOvertimeRateFormat(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The total overtime cost for the resource including actual and remaining overtime costs.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Overtime Cost</em>' attribute.
-	 * @see #setOvertimeCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_OvertimeCost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='OvertimeCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getOvertimeCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getOvertimeCost <em>Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Overtime Cost</em>' attribute.
-	 * @see #getOvertimeCost()
-	 * @generated
-	 */
-	void setOvertimeCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Cost Per Use</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The cost per use of the resource. This value is as of the current date if a rate table 
-	 *                                 exists for the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Cost Per Use</em>' attribute.
-	 * @see #setCostPerUse(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_CostPerUse()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='CostPerUse' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getCostPerUse();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getCostPerUse <em>Cost Per Use</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cost Per Use</em>' attribute.
-	 * @see #getCostPerUse()
-	 * @generated
-	 */
-	void setCostPerUse(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual cost incurred by the resource across all assigned tasks.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Cost</em>' attribute.
-	 * @see #setActualCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_ActualCost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='ActualCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getActualCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getActualCost <em>Actual Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Cost</em>' attribute.
-	 * @see #getActualCost()
-	 * @generated
-	 */
-	void setActualCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual overtime cost incurred by the resource across all assigned tasks.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Overtime Cost</em>' attribute.
-	 * @see #setActualOvertimeCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_ActualOvertimeCost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='ActualOvertimeCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getActualOvertimeCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getActualOvertimeCost <em>Actual Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Overtime Cost</em>' attribute.
-	 * @see #getActualOvertimeCost()
-	 * @generated
-	 */
-	void setActualOvertimeCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Remaining Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The remaining projected cost of the resource to complete all assigned tasks.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Remaining Cost</em>' attribute.
-	 * @see #setRemainingCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_RemainingCost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='RemainingCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getRemainingCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getRemainingCost <em>Remaining Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remaining Cost</em>' attribute.
-	 * @see #getRemainingCost()
-	 * @generated
-	 */
-	void setRemainingCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Remaining Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The remaining projected overtime cost of the resource to complete all assigned tasks.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Remaining Overtime Cost</em>' attribute.
-	 * @see #setRemainingOvertimeCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_RemainingOvertimeCost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='RemainingOvertimeCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getRemainingOvertimeCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getRemainingOvertimeCost <em>Remaining Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remaining Overtime Cost</em>' attribute.
-	 * @see #getRemainingOvertimeCost()
-	 * @generated
-	 */
-	void setRemainingOvertimeCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Work Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The difference between the baseline work and the work as minutes x 1000.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Work Variance</em>' attribute.
-	 * @see #isSetWorkVariance()
-	 * @see #unsetWorkVariance()
-	 * @see #setWorkVariance(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_WorkVariance()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='WorkVariance' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getWorkVariance();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getWorkVariance <em>Work Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Work Variance</em>' attribute.
-	 * @see #isSetWorkVariance()
-	 * @see #unsetWorkVariance()
-	 * @see #getWorkVariance()
-	 * @generated
-	 */
-	void setWorkVariance(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Resource#getWorkVariance <em>Work Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetWorkVariance()
-	 * @see #getWorkVariance()
-	 * @see #setWorkVariance(float)
-	 * @generated
-	 */
-	void unsetWorkVariance();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Resource#getWorkVariance <em>Work Variance</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Work Variance</em>' attribute is set.
-	 * @see #unsetWorkVariance()
-	 * @see #getWorkVariance()
-	 * @see #setWorkVariance(float)
-	 * @generated
-	 */
-	boolean isSetWorkVariance();
-
-	/**
-	 * Returns the value of the '<em><b>Cost Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The difference between the baseline cost and the cost.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Cost Variance</em>' attribute.
-	 * @see #isSetCostVariance()
-	 * @see #unsetCostVariance()
-	 * @see #setCostVariance(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_CostVariance()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='CostVariance' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getCostVariance();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getCostVariance <em>Cost Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cost Variance</em>' attribute.
-	 * @see #isSetCostVariance()
-	 * @see #unsetCostVariance()
-	 * @see #getCostVariance()
-	 * @generated
-	 */
-	void setCostVariance(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Resource#getCostVariance <em>Cost Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetCostVariance()
-	 * @see #getCostVariance()
-	 * @see #setCostVariance(float)
-	 * @generated
-	 */
-	void unsetCostVariance();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Resource#getCostVariance <em>Cost Variance</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Cost Variance</em>' attribute is set.
-	 * @see #unsetCostVariance()
-	 * @see #getCostVariance()
-	 * @see #setCostVariance(float)
-	 * @generated
-	 */
-	boolean isSetCostVariance();
-
-	/**
-	 * Returns the value of the '<em><b>SV</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Earned value schedule variance, through the project status date.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>SV</em>' attribute.
-	 * @see #isSetSV()
-	 * @see #unsetSV()
-	 * @see #setSV(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_SV()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='SV' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getSV();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getSV <em>SV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>SV</em>' attribute.
-	 * @see #isSetSV()
-	 * @see #unsetSV()
-	 * @see #getSV()
-	 * @generated
-	 */
-	void setSV(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Resource#getSV <em>SV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetSV()
-	 * @see #getSV()
-	 * @see #setSV(float)
-	 * @generated
-	 */
-	void unsetSV();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Resource#getSV <em>SV</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>SV</em>' attribute is set.
-	 * @see #unsetSV()
-	 * @see #getSV()
-	 * @see #setSV(float)
-	 * @generated
-	 */
-	boolean isSetSV();
-
-	/**
-	 * Returns the value of the '<em><b>CV</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Earned value cost variance, through the project status date.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>CV</em>' attribute.
-	 * @see #isSetCV()
-	 * @see #unsetCV()
-	 * @see #setCV(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_CV()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='CV' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getCV();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getCV <em>CV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>CV</em>' attribute.
-	 * @see #isSetCV()
-	 * @see #unsetCV()
-	 * @see #getCV()
-	 * @generated
-	 */
-	void setCV(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Resource#getCV <em>CV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetCV()
-	 * @see #getCV()
-	 * @see #setCV(float)
-	 * @generated
-	 */
-	void unsetCV();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Resource#getCV <em>CV</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>CV</em>' attribute is set.
-	 * @see #unsetCV()
-	 * @see #getCV()
-	 * @see #setCV(float)
-	 * @generated
-	 */
-	boolean isSetCV();
-
-	/**
-	 * Returns the value of the '<em><b>ACWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual cost of the work performed by the resource for the project to-date.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>ACWP</em>' attribute.
-	 * @see #isSetACWP()
-	 * @see #unsetACWP()
-	 * @see #setACWP(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_ACWP()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='ACWP' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getACWP();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getACWP <em>ACWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>ACWP</em>' attribute.
-	 * @see #isSetACWP()
-	 * @see #unsetACWP()
-	 * @see #getACWP()
-	 * @generated
-	 */
-	void setACWP(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Resource#getACWP <em>ACWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetACWP()
-	 * @see #getACWP()
-	 * @see #setACWP(float)
-	 * @generated
-	 */
-	void unsetACWP();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Resource#getACWP <em>ACWP</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>ACWP</em>' attribute is set.
-	 * @see #unsetACWP()
-	 * @see #getACWP()
-	 * @see #setACWP(float)
-	 * @generated
-	 */
-	boolean isSetACWP();
-
-	/**
-	 * Returns the value of the '<em><b>Calendar UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The resource calendar.Refers to a valid UID in the Calendars element of 
-	 *                                 the Microsoft Project XML Schema.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Calendar UID</em>' attribute.
-	 * @see #setCalendarUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_CalendarUID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='CalendarUID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getCalendarUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getCalendarUID <em>Calendar UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Calendar UID</em>' attribute.
-	 * @see #getCalendarUID()
-	 * @generated
-	 */
-	void setCalendarUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Notes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Text notes associated with the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Notes</em>' attribute.
-	 * @see #setNotes(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_Notes()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Notes' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getNotes();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getNotes <em>Notes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Notes</em>' attribute.
-	 * @see #getNotes()
-	 * @generated
-	 */
-	void setNotes(String value);
-
-	/**
-	 * Returns the value of the '<em><b>BCWS</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The budget cost of work scheduled for the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>BCWS</em>' attribute.
-	 * @see #isSetBCWS()
-	 * @see #unsetBCWS()
-	 * @see #setBCWS(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_BCWS()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='BCWS' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getBCWS();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getBCWS <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>BCWS</em>' attribute.
-	 * @see #isSetBCWS()
-	 * @see #unsetBCWS()
-	 * @see #getBCWS()
-	 * @generated
-	 */
-	void setBCWS(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Resource#getBCWS <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBCWS()
-	 * @see #getBCWS()
-	 * @see #setBCWS(float)
-	 * @generated
-	 */
-	void unsetBCWS();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Resource#getBCWS <em>BCWS</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>BCWS</em>' attribute is set.
-	 * @see #unsetBCWS()
-	 * @see #getBCWS()
-	 * @see #setBCWS(float)
-	 * @generated
-	 */
-	boolean isSetBCWS();
-
-	/**
-	 * Returns the value of the '<em><b>BCWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The budgeted cost of of the work performed by the resource for the project to-date.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>BCWP</em>' attribute.
-	 * @see #isSetBCWP()
-	 * @see #unsetBCWP()
-	 * @see #setBCWP(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_BCWP()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='BCWP' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getBCWP();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getBCWP <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>BCWP</em>' attribute.
-	 * @see #isSetBCWP()
-	 * @see #unsetBCWP()
-	 * @see #getBCWP()
-	 * @generated
-	 */
-	void setBCWP(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Resource#getBCWP <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBCWP()
-	 * @see #getBCWP()
-	 * @see #setBCWP(float)
-	 * @generated
-	 */
-	void unsetBCWP();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Resource#getBCWP <em>BCWP</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>BCWP</em>' attribute is set.
-	 * @see #unsetBCWP()
-	 * @see #getBCWP()
-	 * @see #setBCWP(float)
-	 * @generated
-	 */
-	boolean isSetBCWP();
-
-	/**
-	 * Returns the value of the '<em><b>Is Generic</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies whether the resource is generic.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Generic</em>' attribute.
-	 * @see #isSetIsGeneric()
-	 * @see #unsetIsGeneric()
-	 * @see #setIsGeneric(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_IsGeneric()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='IsGeneric' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isIsGeneric();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#isIsGeneric <em>Is Generic</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Generic</em>' attribute.
-	 * @see #isSetIsGeneric()
-	 * @see #unsetIsGeneric()
-	 * @see #isIsGeneric()
-	 * @generated
-	 */
-	void setIsGeneric(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Resource#isIsGeneric <em>Is Generic</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsGeneric()
-	 * @see #isIsGeneric()
-	 * @see #setIsGeneric(boolean)
-	 * @generated
-	 */
-	void unsetIsGeneric();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Resource#isIsGeneric <em>Is Generic</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Generic</em>' attribute is set.
-	 * @see #unsetIsGeneric()
-	 * @see #isIsGeneric()
-	 * @see #setIsGeneric(boolean)
-	 * @generated
-	 */
-	boolean isSetIsGeneric();
-
-	/**
-	 * Returns the value of the '<em><b>Is Inactive</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies whether the resource is set to inactive.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Inactive</em>' attribute.
-	 * @see #isSetIsInactive()
-	 * @see #unsetIsInactive()
-	 * @see #setIsInactive(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_IsInactive()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='IsInactive' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isIsInactive();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#isIsInactive <em>Is Inactive</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Inactive</em>' attribute.
-	 * @see #isSetIsInactive()
-	 * @see #unsetIsInactive()
-	 * @see #isIsInactive()
-	 * @generated
-	 */
-	void setIsInactive(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Resource#isIsInactive <em>Is Inactive</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsInactive()
-	 * @see #isIsInactive()
-	 * @see #setIsInactive(boolean)
-	 * @generated
-	 */
-	void unsetIsInactive();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Resource#isIsInactive <em>Is Inactive</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Inactive</em>' attribute is set.
-	 * @see #unsetIsInactive()
-	 * @see #isIsInactive()
-	 * @see #setIsInactive(boolean)
-	 * @generated
-	 */
-	boolean isSetIsInactive();
-
-	/**
-	 * Returns the value of the '<em><b>Is Enterprise</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies whether the resource is an Enterprise resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Enterprise</em>' attribute.
-	 * @see #isSetIsEnterprise()
-	 * @see #unsetIsEnterprise()
-	 * @see #setIsEnterprise(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_IsEnterprise()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='IsEnterprise' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isIsEnterprise();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#isIsEnterprise <em>Is Enterprise</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Enterprise</em>' attribute.
-	 * @see #isSetIsEnterprise()
-	 * @see #unsetIsEnterprise()
-	 * @see #isIsEnterprise()
-	 * @generated
-	 */
-	void setIsEnterprise(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Resource#isIsEnterprise <em>Is Enterprise</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsEnterprise()
-	 * @see #isIsEnterprise()
-	 * @see #setIsEnterprise(boolean)
-	 * @generated
-	 */
-	void unsetIsEnterprise();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Resource#isIsEnterprise <em>Is Enterprise</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Enterprise</em>' attribute is set.
-	 * @see #unsetIsEnterprise()
-	 * @see #isIsEnterprise()
-	 * @see #setIsEnterprise(boolean)
-	 * @generated
-	 */
-	boolean isSetIsEnterprise();
-
-	/**
-	 * Returns the value of the '<em><b>Booking Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies the booking type of the resource. 1=Commited, 2=Proposed
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Booking Type</em>' attribute.
-	 * @see #setBookingType(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_BookingType()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.BookingTypeType1"
-	 *        extendedMetaData="kind='element' name='BookingType' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getBookingType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getBookingType <em>Booking Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Booking Type</em>' attribute.
-	 * @see #getBookingType()
-	 * @generated
-	 */
-	void setBookingType(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Work Protected</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies the duration through which actual work is protected.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Work Protected</em>' attribute.
-	 * @see #setActualWorkProtected(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_ActualWorkProtected()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='ActualWorkProtected' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualWorkProtected();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getActualWorkProtected <em>Actual Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Work Protected</em>' attribute.
-	 * @see #getActualWorkProtected()
-	 * @generated
-	 */
-	void setActualWorkProtected(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Overtime Work Protected</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies the duration through which actual overtime work is protected.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Overtime Work Protected</em>' attribute.
-	 * @see #setActualOvertimeWorkProtected(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_ActualOvertimeWorkProtected()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='ActualOvertimeWorkProtected' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualOvertimeWorkProtected();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getActualOvertimeWorkProtected <em>Actual Overtime Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Overtime Work Protected</em>' attribute.
-	 * @see #getActualOvertimeWorkProtected()
-	 * @generated
-	 */
-	void setActualOvertimeWorkProtected(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Active Directory GUID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The Active Directory GUID for the resource.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Active Directory GUID</em>' attribute.
-	 * @see #setActiveDirectoryGUID(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_ActiveDirectoryGUID()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.ActiveDirectoryGUIDType"
-	 *        extendedMetaData="kind='element' name='ActiveDirectoryGUID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getActiveDirectoryGUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getActiveDirectoryGUID <em>Active Directory GUID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Active Directory GUID</em>' attribute.
-	 * @see #getActiveDirectoryGUID()
-	 * @generated
-	 */
-	void setActiveDirectoryGUID(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Creation Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The date that the resource was created.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Creation Date</em>' attribute.
-	 * @see #setCreationDate(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_CreationDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='CreationDate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getCreationDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getCreationDate <em>Creation Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Date</em>' attribute.
-	 * @see #getCreationDate()
-	 * @generated
-	 */
-	void setCreationDate(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Extended Attribute</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.ExtendedAttribute3}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The value of an extended attribute.  Two pieces of data are necessary - 
-	 *                                 a pointer back to the extended attribute table which is specified either by the unique ID or the Field ID, 
-	 *                                 and the value which is specified either with the value, or a pointer back to the value list.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Extended Attribute</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_ExtendedAttribute()
-	 * @model type="org.eclipse.epf.msproject.ExtendedAttribute3" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='ExtendedAttribute' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getExtendedAttribute();
-
-	/**
-	 * Returns the value of the '<em><b>Baseline</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.Baseline2}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The baseline values for the resources.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Baseline</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_Baseline()
-	 * @model type="org.eclipse.epf.msproject.Baseline2" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='Baseline' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getBaseline();
-
-	/**
-	 * Returns the value of the '<em><b>Outline Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.OutlineCode3}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The value of an outline code.  Two pieces of data are necessary - a pointer back to 
-	 *                                 the outline code table which is specified either by the unique ID or the Field ID, and the value which is 
-	 *                                 specified either with the value, or a pointer back to the value list.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Outline Code</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_OutlineCode()
-	 * @model type="org.eclipse.epf.msproject.OutlineCode3" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='OutlineCode' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getOutlineCode();
-
-	/**
-	 * Returns the value of the '<em><b>Availability Periods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A collection of periods during which the resource is available.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Availability Periods</em>' containment reference.
-	 * @see #setAvailabilityPeriods(AvailabilityPeriods)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_AvailabilityPeriods()
-	 * @model containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='AvailabilityPeriods' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	AvailabilityPeriods getAvailabilityPeriods();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getAvailabilityPeriods <em>Availability Periods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Availability Periods</em>' containment reference.
-	 * @see #getAvailabilityPeriods()
-	 * @generated
-	 */
-	void setAvailabilityPeriods(AvailabilityPeriods value);
-
-	/**
-	 * Returns the value of the '<em><b>Rates</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A collection of periods and the rates associated with each one.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Rates</em>' containment reference.
-	 * @see #setRates(Rates)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_Rates()
-	 * @model containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='Rates' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Rates getRates();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Resource#getRates <em>Rates</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rates</em>' containment reference.
-	 * @see #getRates()
-	 * @generated
-	 */
-	void setRates(Rates value);
-
-	/**
-	 * Returns the value of the '<em><b>Timephased Data</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.TimephasedDataType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The time phased data
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Timephased Data</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResource_TimephasedData()
-	 * @model type="org.eclipse.epf.msproject.TimephasedDataType" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='TimephasedData' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getTimephasedData();
-
-} // Resource
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Resources.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Resources.java
deleted file mode 100755
index 4cae91b..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Resources.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Resources.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Resources</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Resources#getResource <em>Resource</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getResources()
- * @model extendedMetaData="name='Resources_._type' kind='elementOnly'"
- * @generated
- */
-public interface Resources extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Resource</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.Resource}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * There must be at least one resource in each Resources collection.
-	 *                     
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Resource</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getResources_Resource()
-	 * @model type="org.eclipse.epf.msproject.Resource" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='Resource' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getResource();
-
-} // Resources
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Task.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Task.java
deleted file mode 100755
index 34571c6..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Task.java
+++ /dev/null
@@ -1,3171 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Task.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Task</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Task#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getID <em>ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isIsNull <em>Is Null</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getCreateDate <em>Create Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getContact <em>Contact</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getWBS <em>WBS</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getWBSLevel <em>WBS Level</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getOutlineNumber <em>Outline Number</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getOutlineLevel <em>Outline Level</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getPriority <em>Priority</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getFinish <em>Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getDuration <em>Duration</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getDurationFormat <em>Duration Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getWork <em>Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getStop <em>Stop</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getResume <em>Resume</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isResumeValid <em>Resume Valid</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isEffortDriven <em>Effort Driven</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isRecurring <em>Recurring</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isOverAllocated <em>Over Allocated</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isEstimated <em>Estimated</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isMilestone <em>Milestone</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isSummary <em>Summary</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isCritical <em>Critical</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isIsSubproject <em>Is Subproject</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isIsSubprojectReadOnly <em>Is Subproject Read Only</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getSubprojectName <em>Subproject Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isExternalTask <em>External Task</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getExternalTaskProject <em>External Task Project</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getEarlyStart <em>Early Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getEarlyFinish <em>Early Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getLateStart <em>Late Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getLateFinish <em>Late Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getStartVariance <em>Start Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getFinishVariance <em>Finish Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getWorkVariance <em>Work Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getFreeSlack <em>Free Slack</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getTotalSlack <em>Total Slack</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getFixedCost <em>Fixed Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getFixedCostAccrual <em>Fixed Cost Accrual</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getPercentComplete <em>Percent Complete</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getPercentWorkComplete <em>Percent Work Complete</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getCost <em>Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getOvertimeCost <em>Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getOvertimeWork <em>Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getActualStart <em>Actual Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getActualFinish <em>Actual Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getActualDuration <em>Actual Duration</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getActualCost <em>Actual Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getActualOvertimeCost <em>Actual Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getActualWork <em>Actual Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getActualOvertimeWork <em>Actual Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getRegularWork <em>Regular Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getRemainingDuration <em>Remaining Duration</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getRemainingCost <em>Remaining Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getRemainingWork <em>Remaining Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getRemainingOvertimeCost <em>Remaining Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getRemainingOvertimeWork <em>Remaining Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getACWP <em>ACWP</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getCV <em>CV</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getConstraintType <em>Constraint Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getCalendarUID <em>Calendar UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getConstraintDate <em>Constraint Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getDeadline <em>Deadline</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isLevelAssignments <em>Level Assignments</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isLevelingCanSplit <em>Leveling Can Split</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getLevelingDelay <em>Leveling Delay</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getLevelingDelayFormat <em>Leveling Delay Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getPreLeveledStart <em>Pre Leveled Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getPreLeveledFinish <em>Pre Leveled Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getHyperlink <em>Hyperlink</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getHyperlinkAddress <em>Hyperlink Address</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getHyperlinkSubAddress <em>Hyperlink Sub Address</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isIgnoreResourceCalendar <em>Ignore Resource Calendar</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getNotes <em>Notes</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isHideBar <em>Hide Bar</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#isRollup <em>Rollup</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getBCWS <em>BCWS</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getBCWP <em>BCWP</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getPhysicalPercentComplete <em>Physical Percent Complete</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getEarnedValueMethod <em>Earned Value Method</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getPredecessorLink <em>Predecessor Link</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getActualWorkProtected <em>Actual Work Protected</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getActualOvertimeWorkProtected <em>Actual Overtime Work Protected</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getExtendedAttribute <em>Extended Attribute</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getBaseline <em>Baseline</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getOutlineCode <em>Outline Code</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Task#getTimephasedData <em>Timephased Data</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getTask()
- * @model extendedMetaData="name='Task_._type' kind='elementOnly'"
- * @generated
- */
-public interface Task extends EObject {
-	/**
-	 * Returns the value of the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique ID of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>UID</em>' attribute.
-	 * @see #setUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_UID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer" required="true"
-	 *        extendedMetaData="kind='element' name='UID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getUID <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>UID</em>' attribute.
-	 * @see #getUID()
-	 * @generated
-	 */
-	void setUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The position identifier of the task within the list of tasks.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>ID</em>' attribute.
-	 * @see #setID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='ID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getID <em>ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>ID</em>' attribute.
-	 * @see #getID()
-	 * @generated
-	 */
-	void setID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The name of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Name()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.NameType2"
-	 *        extendedMetaData="kind='element' name='Name' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The type of task. 
-	 *                                 Values are: 0=Fixed Units, 1=Fixed Duration, 2=Fixed Work.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Type()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.TypeType"
-	 *        extendedMetaData="kind='element' name='Type' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Is Null</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies whether the task is null.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Null</em>' attribute.
-	 * @see #isSetIsNull()
-	 * @see #unsetIsNull()
-	 * @see #setIsNull(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_IsNull()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='IsNull' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isIsNull();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isIsNull <em>Is Null</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Null</em>' attribute.
-	 * @see #isSetIsNull()
-	 * @see #unsetIsNull()
-	 * @see #isIsNull()
-	 * @generated
-	 */
-	void setIsNull(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isIsNull <em>Is Null</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsNull()
-	 * @see #isIsNull()
-	 * @see #setIsNull(boolean)
-	 * @generated
-	 */
-	void unsetIsNull();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isIsNull <em>Is Null</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Null</em>' attribute is set.
-	 * @see #unsetIsNull()
-	 * @see #isIsNull()
-	 * @see #setIsNull(boolean)
-	 * @generated
-	 */
-	boolean isSetIsNull();
-
-	/**
-	 * Returns the value of the '<em><b>Create Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The date that the task was created.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Create Date</em>' attribute.
-	 * @see #setCreateDate(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_CreateDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='CreateDate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getCreateDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getCreateDate <em>Create Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Create Date</em>' attribute.
-	 * @see #getCreateDate()
-	 * @generated
-	 */
-	void setCreateDate(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Contact</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The contact person for the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Contact</em>' attribute.
-	 * @see #setContact(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Contact()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.ContactType"
-	 *        extendedMetaData="kind='element' name='Contact' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getContact();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getContact <em>Contact</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Contact</em>' attribute.
-	 * @see #getContact()
-	 * @generated
-	 */
-	void setContact(String value);
-
-	/**
-	 * Returns the value of the '<em><b>WBS</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The work breakdown structure code of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>WBS</em>' attribute.
-	 * @see #setWBS(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_WBS()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='WBS' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getWBS();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getWBS <em>WBS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>WBS</em>' attribute.
-	 * @see #getWBS()
-	 * @generated
-	 */
-	void setWBS(String value);
-
-	/**
-	 * Returns the value of the '<em><b>WBS Level</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The rightmost WBS level of the task. 
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>WBS Level</em>' attribute.
-	 * @see #setWBSLevel(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_WBSLevel()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='WBSLevel' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getWBSLevel();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getWBSLevel <em>WBS Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>WBS Level</em>' attribute.
-	 * @see #getWBSLevel()
-	 * @generated
-	 */
-	void setWBSLevel(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Outline Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The outline number of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Outline Number</em>' attribute.
-	 * @see #setOutlineNumber(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_OutlineNumber()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.OutlineNumberType"
-	 *        extendedMetaData="kind='element' name='OutlineNumber' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getOutlineNumber();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getOutlineNumber <em>Outline Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Outline Number</em>' attribute.
-	 * @see #getOutlineNumber()
-	 * @generated
-	 */
-	void setOutlineNumber(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Outline Level</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The outline level of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Outline Level</em>' attribute.
-	 * @see #setOutlineLevel(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_OutlineLevel()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='OutlineLevel' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getOutlineLevel();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getOutlineLevel <em>Outline Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Outline Level</em>' attribute.
-	 * @see #getOutlineLevel()
-	 * @generated
-	 */
-	void setOutlineLevel(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Priority</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The priority of the task from 0 to 1000.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Priority</em>' attribute.
-	 * @see #setPriority(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Priority()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='Priority' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getPriority();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getPriority <em>Priority</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Priority</em>' attribute.
-	 * @see #getPriority()
-	 * @generated
-	 */
-	void setPriority(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The scheduled start date of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Start</em>' attribute.
-	 * @see #setStart(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Start()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='Start' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getStart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getStart <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start</em>' attribute.
-	 * @see #getStart()
-	 * @generated
-	 */
-	void setStart(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The scheduled finish date of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Finish</em>' attribute.
-	 * @see #setFinish(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Finish()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='Finish' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getFinish();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getFinish <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Finish</em>' attribute.
-	 * @see #getFinish()
-	 * @generated
-	 */
-	void setFinish(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Duration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The planned duration of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Duration</em>' attribute.
-	 * @see #setDuration(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Duration()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='Duration' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getDuration();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getDuration <em>Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Duration</em>' attribute.
-	 * @see #getDuration()
-	 * @generated
-	 */
-	void setDuration(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Duration Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The format for expressing the Duration of the Task.  
-	 *                                 Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 
-	 *                                 20=e%, 21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 
-	 *                                 43=mo?, 44=emo?, 51=%?, 52=e%? and 53=null.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Duration Format</em>' attribute.
-	 * @see #setDurationFormat(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_DurationFormat()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.DurationFormatType4"
-	 *        extendedMetaData="kind='element' name='DurationFormat' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getDurationFormat();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getDurationFormat <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Duration Format</em>' attribute.
-	 * @see #getDurationFormat()
-	 * @generated
-	 */
-	void setDurationFormat(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of scheduled work for the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Work</em>' attribute.
-	 * @see #setWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Work()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='Work' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getWork <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Work</em>' attribute.
-	 * @see #getWork()
-	 * @generated
-	 */
-	void setWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Stop</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The date that the task was stopped.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Stop</em>' attribute.
-	 * @see #setStop(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Stop()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='Stop' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getStop();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getStop <em>Stop</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Stop</em>' attribute.
-	 * @see #getStop()
-	 * @generated
-	 */
-	void setStop(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Resume</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The date that the task resumed.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Resume</em>' attribute.
-	 * @see #setResume(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Resume()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='Resume' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getResume();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getResume <em>Resume</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Resume</em>' attribute.
-	 * @see #getResume()
-	 * @generated
-	 */
-	void setResume(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Resume Valid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the task can be resumed.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Resume Valid</em>' attribute.
-	 * @see #isSetResumeValid()
-	 * @see #unsetResumeValid()
-	 * @see #setResumeValid(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ResumeValid()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='ResumeValid' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isResumeValid();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isResumeValid <em>Resume Valid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Resume Valid</em>' attribute.
-	 * @see #isSetResumeValid()
-	 * @see #unsetResumeValid()
-	 * @see #isResumeValid()
-	 * @generated
-	 */
-	void setResumeValid(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isResumeValid <em>Resume Valid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetResumeValid()
-	 * @see #isResumeValid()
-	 * @see #setResumeValid(boolean)
-	 * @generated
-	 */
-	void unsetResumeValid();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isResumeValid <em>Resume Valid</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Resume Valid</em>' attribute is set.
-	 * @see #unsetResumeValid()
-	 * @see #isResumeValid()
-	 * @see #setResumeValid(boolean)
-	 * @generated
-	 */
-	boolean isSetResumeValid();
-
-	/**
-	 * Returns the value of the '<em><b>Effort Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the task is effort-driven.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Effort Driven</em>' attribute.
-	 * @see #isSetEffortDriven()
-	 * @see #unsetEffortDriven()
-	 * @see #setEffortDriven(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_EffortDriven()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='EffortDriven' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isEffortDriven();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isEffortDriven <em>Effort Driven</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Effort Driven</em>' attribute.
-	 * @see #isSetEffortDriven()
-	 * @see #unsetEffortDriven()
-	 * @see #isEffortDriven()
-	 * @generated
-	 */
-	void setEffortDriven(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isEffortDriven <em>Effort Driven</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetEffortDriven()
-	 * @see #isEffortDriven()
-	 * @see #setEffortDriven(boolean)
-	 * @generated
-	 */
-	void unsetEffortDriven();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isEffortDriven <em>Effort Driven</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Effort Driven</em>' attribute is set.
-	 * @see #unsetEffortDriven()
-	 * @see #isEffortDriven()
-	 * @see #setEffortDriven(boolean)
-	 * @generated
-	 */
-	boolean isSetEffortDriven();
-
-	/**
-	 * Returns the value of the '<em><b>Recurring</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the task is a recurring task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Recurring</em>' attribute.
-	 * @see #isSetRecurring()
-	 * @see #unsetRecurring()
-	 * @see #setRecurring(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Recurring()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='Recurring' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isRecurring();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isRecurring <em>Recurring</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Recurring</em>' attribute.
-	 * @see #isSetRecurring()
-	 * @see #unsetRecurring()
-	 * @see #isRecurring()
-	 * @generated
-	 */
-	void setRecurring(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isRecurring <em>Recurring</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetRecurring()
-	 * @see #isRecurring()
-	 * @see #setRecurring(boolean)
-	 * @generated
-	 */
-	void unsetRecurring();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isRecurring <em>Recurring</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Recurring</em>' attribute is set.
-	 * @see #unsetRecurring()
-	 * @see #isRecurring()
-	 * @see #setRecurring(boolean)
-	 * @generated
-	 */
-	boolean isSetRecurring();
-
-	/**
-	 * Returns the value of the '<em><b>Over Allocated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the task is overallocated. 
-	 *                                 This element is informational only.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Over Allocated</em>' attribute.
-	 * @see #isSetOverAllocated()
-	 * @see #unsetOverAllocated()
-	 * @see #setOverAllocated(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_OverAllocated()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='OverAllocated' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isOverAllocated();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isOverAllocated <em>Over Allocated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Over Allocated</em>' attribute.
-	 * @see #isSetOverAllocated()
-	 * @see #unsetOverAllocated()
-	 * @see #isOverAllocated()
-	 * @generated
-	 */
-	void setOverAllocated(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isOverAllocated <em>Over Allocated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetOverAllocated()
-	 * @see #isOverAllocated()
-	 * @see #setOverAllocated(boolean)
-	 * @generated
-	 */
-	void unsetOverAllocated();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isOverAllocated <em>Over Allocated</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Over Allocated</em>' attribute is set.
-	 * @see #unsetOverAllocated()
-	 * @see #isOverAllocated()
-	 * @see #setOverAllocated(boolean)
-	 * @generated
-	 */
-	boolean isSetOverAllocated();
-
-	/**
-	 * Returns the value of the '<em><b>Estimated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the task is estimated.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Estimated</em>' attribute.
-	 * @see #isSetEstimated()
-	 * @see #unsetEstimated()
-	 * @see #setEstimated(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Estimated()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='Estimated' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isEstimated();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isEstimated <em>Estimated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Estimated</em>' attribute.
-	 * @see #isSetEstimated()
-	 * @see #unsetEstimated()
-	 * @see #isEstimated()
-	 * @generated
-	 */
-	void setEstimated(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isEstimated <em>Estimated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetEstimated()
-	 * @see #isEstimated()
-	 * @see #setEstimated(boolean)
-	 * @generated
-	 */
-	void unsetEstimated();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isEstimated <em>Estimated</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Estimated</em>' attribute is set.
-	 * @see #unsetEstimated()
-	 * @see #isEstimated()
-	 * @see #setEstimated(boolean)
-	 * @generated
-	 */
-	boolean isSetEstimated();
-
-	/**
-	 * Returns the value of the '<em><b>Milestone</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the task is a milestone.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Milestone</em>' attribute.
-	 * @see #isSetMilestone()
-	 * @see #unsetMilestone()
-	 * @see #setMilestone(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Milestone()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='Milestone' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isMilestone();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isMilestone <em>Milestone</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Milestone</em>' attribute.
-	 * @see #isSetMilestone()
-	 * @see #unsetMilestone()
-	 * @see #isMilestone()
-	 * @generated
-	 */
-	void setMilestone(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isMilestone <em>Milestone</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMilestone()
-	 * @see #isMilestone()
-	 * @see #setMilestone(boolean)
-	 * @generated
-	 */
-	void unsetMilestone();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isMilestone <em>Milestone</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Milestone</em>' attribute is set.
-	 * @see #unsetMilestone()
-	 * @see #isMilestone()
-	 * @see #setMilestone(boolean)
-	 * @generated
-	 */
-	boolean isSetMilestone();
-
-	/**
-	 * Returns the value of the '<em><b>Summary</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the task is a summary task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Summary</em>' attribute.
-	 * @see #isSetSummary()
-	 * @see #unsetSummary()
-	 * @see #setSummary(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Summary()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='Summary' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isSummary();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isSummary <em>Summary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Summary</em>' attribute.
-	 * @see #isSetSummary()
-	 * @see #unsetSummary()
-	 * @see #isSummary()
-	 * @generated
-	 */
-	void setSummary(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isSummary <em>Summary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetSummary()
-	 * @see #isSummary()
-	 * @see #setSummary(boolean)
-	 * @generated
-	 */
-	void unsetSummary();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isSummary <em>Summary</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Summary</em>' attribute is set.
-	 * @see #unsetSummary()
-	 * @see #isSummary()
-	 * @see #setSummary(boolean)
-	 * @generated
-	 */
-	boolean isSetSummary();
-
-	/**
-	 * Returns the value of the '<em><b>Critical</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the task is in the critical chain.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Critical</em>' attribute.
-	 * @see #isSetCritical()
-	 * @see #unsetCritical()
-	 * @see #setCritical(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Critical()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='Critical' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isCritical();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isCritical <em>Critical</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Critical</em>' attribute.
-	 * @see #isSetCritical()
-	 * @see #unsetCritical()
-	 * @see #isCritical()
-	 * @generated
-	 */
-	void setCritical(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isCritical <em>Critical</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetCritical()
-	 * @see #isCritical()
-	 * @see #setCritical(boolean)
-	 * @generated
-	 */
-	void unsetCritical();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isCritical <em>Critical</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Critical</em>' attribute is set.
-	 * @see #unsetCritical()
-	 * @see #isCritical()
-	 * @see #setCritical(boolean)
-	 * @generated
-	 */
-	boolean isSetCritical();
-
-	/**
-	 * Returns the value of the '<em><b>Is Subproject</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the task is an inserted project.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Subproject</em>' attribute.
-	 * @see #isSetIsSubproject()
-	 * @see #unsetIsSubproject()
-	 * @see #setIsSubproject(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_IsSubproject()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='IsSubproject' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isIsSubproject();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isIsSubproject <em>Is Subproject</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Subproject</em>' attribute.
-	 * @see #isSetIsSubproject()
-	 * @see #unsetIsSubproject()
-	 * @see #isIsSubproject()
-	 * @generated
-	 */
-	void setIsSubproject(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isIsSubproject <em>Is Subproject</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsSubproject()
-	 * @see #isIsSubproject()
-	 * @see #setIsSubproject(boolean)
-	 * @generated
-	 */
-	void unsetIsSubproject();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isIsSubproject <em>Is Subproject</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Subproject</em>' attribute is set.
-	 * @see #unsetIsSubproject()
-	 * @see #isIsSubproject()
-	 * @see #setIsSubproject(boolean)
-	 * @generated
-	 */
-	boolean isSetIsSubproject();
-
-	/**
-	 * Returns the value of the '<em><b>Is Subproject Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the inserted project is read-only.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Subproject Read Only</em>' attribute.
-	 * @see #isSetIsSubprojectReadOnly()
-	 * @see #unsetIsSubprojectReadOnly()
-	 * @see #setIsSubprojectReadOnly(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_IsSubprojectReadOnly()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='IsSubprojectReadOnly' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isIsSubprojectReadOnly();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isIsSubprojectReadOnly <em>Is Subproject Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Subproject Read Only</em>' attribute.
-	 * @see #isSetIsSubprojectReadOnly()
-	 * @see #unsetIsSubprojectReadOnly()
-	 * @see #isIsSubprojectReadOnly()
-	 * @generated
-	 */
-	void setIsSubprojectReadOnly(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isIsSubprojectReadOnly <em>Is Subproject Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsSubprojectReadOnly()
-	 * @see #isIsSubprojectReadOnly()
-	 * @see #setIsSubprojectReadOnly(boolean)
-	 * @generated
-	 */
-	void unsetIsSubprojectReadOnly();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isIsSubprojectReadOnly <em>Is Subproject Read Only</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Subproject Read Only</em>' attribute is set.
-	 * @see #unsetIsSubprojectReadOnly()
-	 * @see #isIsSubprojectReadOnly()
-	 * @see #setIsSubprojectReadOnly(boolean)
-	 * @generated
-	 */
-	boolean isSetIsSubprojectReadOnly();
-
-	/**
-	 * Returns the value of the '<em><b>Subproject Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The source location of the inserted project.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Subproject Name</em>' attribute.
-	 * @see #setSubprojectName(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_SubprojectName()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.SubprojectNameType"
-	 *        extendedMetaData="kind='element' name='SubprojectName' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getSubprojectName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getSubprojectName <em>Subproject Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Subproject Name</em>' attribute.
-	 * @see #getSubprojectName()
-	 * @generated
-	 */
-	void setSubprojectName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>External Task</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the task is external.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>External Task</em>' attribute.
-	 * @see #isSetExternalTask()
-	 * @see #unsetExternalTask()
-	 * @see #setExternalTask(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ExternalTask()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='ExternalTask' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isExternalTask();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isExternalTask <em>External Task</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>External Task</em>' attribute.
-	 * @see #isSetExternalTask()
-	 * @see #unsetExternalTask()
-	 * @see #isExternalTask()
-	 * @generated
-	 */
-	void setExternalTask(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isExternalTask <em>External Task</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetExternalTask()
-	 * @see #isExternalTask()
-	 * @see #setExternalTask(boolean)
-	 * @generated
-	 */
-	void unsetExternalTask();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isExternalTask <em>External Task</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>External Task</em>' attribute is set.
-	 * @see #unsetExternalTask()
-	 * @see #isExternalTask()
-	 * @see #setExternalTask(boolean)
-	 * @generated
-	 */
-	boolean isSetExternalTask();
-
-	/**
-	 * Returns the value of the '<em><b>External Task Project</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The source location and task identifier of the external task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>External Task Project</em>' attribute.
-	 * @see #setExternalTaskProject(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ExternalTaskProject()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.ExternalTaskProjectType"
-	 *        extendedMetaData="kind='element' name='ExternalTaskProject' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getExternalTaskProject();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getExternalTaskProject <em>External Task Project</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>External Task Project</em>' attribute.
-	 * @see #getExternalTaskProject()
-	 * @generated
-	 */
-	void setExternalTaskProject(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Early Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The early start date of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Early Start</em>' attribute.
-	 * @see #setEarlyStart(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_EarlyStart()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='EarlyStart' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getEarlyStart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getEarlyStart <em>Early Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Early Start</em>' attribute.
-	 * @see #getEarlyStart()
-	 * @generated
-	 */
-	void setEarlyStart(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Early Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The early finish date of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Early Finish</em>' attribute.
-	 * @see #setEarlyFinish(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_EarlyFinish()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='EarlyFinish' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getEarlyFinish();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getEarlyFinish <em>Early Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Early Finish</em>' attribute.
-	 * @see #getEarlyFinish()
-	 * @generated
-	 */
-	void setEarlyFinish(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Late Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The late start date of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Late Start</em>' attribute.
-	 * @see #setLateStart(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_LateStart()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='LateStart' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getLateStart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getLateStart <em>Late Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Late Start</em>' attribute.
-	 * @see #getLateStart()
-	 * @generated
-	 */
-	void setLateStart(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Late Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The late finish date of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Late Finish</em>' attribute.
-	 * @see #setLateFinish(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_LateFinish()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='LateFinish' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getLateFinish();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getLateFinish <em>Late Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Late Finish</em>' attribute.
-	 * @see #getLateFinish()
-	 * @generated
-	 */
-	void setLateFinish(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Start Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The variance of the task start date from 
-	 *                                 the baseline start date as minutes x 1000.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Start Variance</em>' attribute.
-	 * @see #setStartVariance(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_StartVariance()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='StartVariance' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getStartVariance();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getStartVariance <em>Start Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start Variance</em>' attribute.
-	 * @see #getStartVariance()
-	 * @generated
-	 */
-	void setStartVariance(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Finish Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The variance of the task finish date from 
-	 *                                 the baseline finish date as minutes x 1000.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Finish Variance</em>' attribute.
-	 * @see #setFinishVariance(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_FinishVariance()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='FinishVariance' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getFinishVariance();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getFinishVariance <em>Finish Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Finish Variance</em>' attribute.
-	 * @see #getFinishVariance()
-	 * @generated
-	 */
-	void setFinishVariance(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Work Variance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The variance of task work from the baseline 
-	 *                                 task work as minutes x 1000.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Work Variance</em>' attribute.
-	 * @see #isSetWorkVariance()
-	 * @see #unsetWorkVariance()
-	 * @see #setWorkVariance(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_WorkVariance()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='WorkVariance' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getWorkVariance();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getWorkVariance <em>Work Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Work Variance</em>' attribute.
-	 * @see #isSetWorkVariance()
-	 * @see #unsetWorkVariance()
-	 * @see #getWorkVariance()
-	 * @generated
-	 */
-	void setWorkVariance(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#getWorkVariance <em>Work Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetWorkVariance()
-	 * @see #getWorkVariance()
-	 * @see #setWorkVariance(float)
-	 * @generated
-	 */
-	void unsetWorkVariance();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#getWorkVariance <em>Work Variance</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Work Variance</em>' attribute is set.
-	 * @see #unsetWorkVariance()
-	 * @see #getWorkVariance()
-	 * @see #setWorkVariance(float)
-	 * @generated
-	 */
-	boolean isSetWorkVariance();
-
-	/**
-	 * Returns the value of the '<em><b>Free Slack</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of free slack.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Free Slack</em>' attribute.
-	 * @see #setFreeSlack(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_FreeSlack()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='FreeSlack' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getFreeSlack();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getFreeSlack <em>Free Slack</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Free Slack</em>' attribute.
-	 * @see #getFreeSlack()
-	 * @generated
-	 */
-	void setFreeSlack(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Total Slack</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of total slack.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Total Slack</em>' attribute.
-	 * @see #setTotalSlack(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_TotalSlack()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='TotalSlack' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getTotalSlack();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getTotalSlack <em>Total Slack</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Total Slack</em>' attribute.
-	 * @see #getTotalSlack()
-	 * @generated
-	 */
-	void setTotalSlack(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Fixed Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The fixed cost of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Fixed Cost</em>' attribute.
-	 * @see #isSetFixedCost()
-	 * @see #unsetFixedCost()
-	 * @see #setFixedCost(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_FixedCost()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='FixedCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getFixedCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getFixedCost <em>Fixed Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fixed Cost</em>' attribute.
-	 * @see #isSetFixedCost()
-	 * @see #unsetFixedCost()
-	 * @see #getFixedCost()
-	 * @generated
-	 */
-	void setFixedCost(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#getFixedCost <em>Fixed Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetFixedCost()
-	 * @see #getFixedCost()
-	 * @see #setFixedCost(float)
-	 * @generated
-	 */
-	void unsetFixedCost();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#getFixedCost <em>Fixed Cost</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Fixed Cost</em>' attribute is set.
-	 * @see #unsetFixedCost()
-	 * @see #getFixedCost()
-	 * @see #setFixedCost(float)
-	 * @generated
-	 */
-	boolean isSetFixedCost();
-
-	/**
-	 * Returns the value of the '<em><b>Fixed Cost Accrual</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * How the fixed cost is accrued against the task. 
-	 *                                 Values are: 1=Start, 2=Prorated and 3=End.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Fixed Cost Accrual</em>' attribute.
-	 * @see #setFixedCostAccrual(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_FixedCostAccrual()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.FixedCostAccrualType"
-	 *        extendedMetaData="kind='element' name='FixedCostAccrual' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getFixedCostAccrual();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getFixedCostAccrual <em>Fixed Cost Accrual</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fixed Cost Accrual</em>' attribute.
-	 * @see #getFixedCostAccrual()
-	 * @generated
-	 */
-	void setFixedCostAccrual(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Percent Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The percentage of the task duration completed.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Percent Complete</em>' attribute.
-	 * @see #setPercentComplete(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_PercentComplete()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='PercentComplete' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getPercentComplete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getPercentComplete <em>Percent Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Percent Complete</em>' attribute.
-	 * @see #getPercentComplete()
-	 * @generated
-	 */
-	void setPercentComplete(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Percent Work Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The percentage of the task work completed.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Percent Work Complete</em>' attribute.
-	 * @see #setPercentWorkComplete(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_PercentWorkComplete()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='PercentWorkComplete' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getPercentWorkComplete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getPercentWorkComplete <em>Percent Work Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Percent Work Complete</em>' attribute.
-	 * @see #getPercentWorkComplete()
-	 * @generated
-	 */
-	void setPercentWorkComplete(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The projected or scheduled cost of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Cost</em>' attribute.
-	 * @see #setCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Cost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='Cost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getCost <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cost</em>' attribute.
-	 * @see #getCost()
-	 * @generated
-	 */
-	void setCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The sum of the actual and remaining overtime cost of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Overtime Cost</em>' attribute.
-	 * @see #setOvertimeCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_OvertimeCost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='OvertimeCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getOvertimeCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getOvertimeCost <em>Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Overtime Cost</em>' attribute.
-	 * @see #getOvertimeCost()
-	 * @generated
-	 */
-	void setOvertimeCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of overtime work scheduled for the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Overtime Work</em>' attribute.
-	 * @see #setOvertimeWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_OvertimeWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='OvertimeWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getOvertimeWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getOvertimeWork <em>Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Overtime Work</em>' attribute.
-	 * @see #getOvertimeWork()
-	 * @generated
-	 */
-	void setOvertimeWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual start date of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Start</em>' attribute.
-	 * @see #setActualStart(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ActualStart()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='ActualStart' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualStart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getActualStart <em>Actual Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Start</em>' attribute.
-	 * @see #getActualStart()
-	 * @generated
-	 */
-	void setActualStart(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual finish date of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Finish</em>' attribute.
-	 * @see #setActualFinish(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ActualFinish()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='ActualFinish' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualFinish();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getActualFinish <em>Actual Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Finish</em>' attribute.
-	 * @see #getActualFinish()
-	 * @generated
-	 */
-	void setActualFinish(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Duration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual duration of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Duration</em>' attribute.
-	 * @see #setActualDuration(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ActualDuration()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='ActualDuration' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualDuration();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getActualDuration <em>Actual Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Duration</em>' attribute.
-	 * @see #getActualDuration()
-	 * @generated
-	 */
-	void setActualDuration(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual cost of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Cost</em>' attribute.
-	 * @see #setActualCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ActualCost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='ActualCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getActualCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getActualCost <em>Actual Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Cost</em>' attribute.
-	 * @see #getActualCost()
-	 * @generated
-	 */
-	void setActualCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual overtime cost of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Overtime Cost</em>' attribute.
-	 * @see #setActualOvertimeCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ActualOvertimeCost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='ActualOvertimeCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getActualOvertimeCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getActualOvertimeCost <em>Actual Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Overtime Cost</em>' attribute.
-	 * @see #getActualOvertimeCost()
-	 * @generated
-	 */
-	void setActualOvertimeCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual work for the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Work</em>' attribute.
-	 * @see #setActualWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ActualWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='ActualWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getActualWork <em>Actual Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Work</em>' attribute.
-	 * @see #getActualWork()
-	 * @generated
-	 */
-	void setActualWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual overtime work for the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Overtime Work</em>' attribute.
-	 * @see #setActualOvertimeWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ActualOvertimeWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='ActualOvertimeWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualOvertimeWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getActualOvertimeWork <em>Actual Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Overtime Work</em>' attribute.
-	 * @see #getActualOvertimeWork()
-	 * @generated
-	 */
-	void setActualOvertimeWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Regular Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of non-overtime work scheduled for the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Regular Work</em>' attribute.
-	 * @see #setRegularWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_RegularWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='RegularWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getRegularWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getRegularWork <em>Regular Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Regular Work</em>' attribute.
-	 * @see #getRegularWork()
-	 * @generated
-	 */
-	void setRegularWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Remaining Duration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The amount of time required to complete the unfinished portion of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Remaining Duration</em>' attribute.
-	 * @see #setRemainingDuration(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_RemainingDuration()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='RemainingDuration' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getRemainingDuration();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getRemainingDuration <em>Remaining Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remaining Duration</em>' attribute.
-	 * @see #getRemainingDuration()
-	 * @generated
-	 */
-	void setRemainingDuration(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Remaining Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The remaining projected cost of completing the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Remaining Cost</em>' attribute.
-	 * @see #setRemainingCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_RemainingCost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='RemainingCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getRemainingCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getRemainingCost <em>Remaining Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remaining Cost</em>' attribute.
-	 * @see #getRemainingCost()
-	 * @generated
-	 */
-	void setRemainingCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Remaining Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The remaining work scheduled to complete the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Remaining Work</em>' attribute.
-	 * @see #setRemainingWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_RemainingWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='RemainingWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getRemainingWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getRemainingWork <em>Remaining Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remaining Work</em>' attribute.
-	 * @see #getRemainingWork()
-	 * @generated
-	 */
-	void setRemainingWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Remaining Overtime Cost</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The remaining overtime cost projected to finish the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Remaining Overtime Cost</em>' attribute.
-	 * @see #setRemainingOvertimeCost(BigDecimal)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_RemainingOvertimeCost()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal"
-	 *        extendedMetaData="kind='element' name='RemainingOvertimeCost' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigDecimal getRemainingOvertimeCost();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getRemainingOvertimeCost <em>Remaining Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remaining Overtime Cost</em>' attribute.
-	 * @see #getRemainingOvertimeCost()
-	 * @generated
-	 */
-	void setRemainingOvertimeCost(BigDecimal value);
-
-	/**
-	 * Returns the value of the '<em><b>Remaining Overtime Work</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The remaining overtime work scheduled to finish the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Remaining Overtime Work</em>' attribute.
-	 * @see #setRemainingOvertimeWork(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_RemainingOvertimeWork()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='RemainingOvertimeWork' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getRemainingOvertimeWork();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getRemainingOvertimeWork <em>Remaining Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remaining Overtime Work</em>' attribute.
-	 * @see #getRemainingOvertimeWork()
-	 * @generated
-	 */
-	void setRemainingOvertimeWork(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>ACWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual cost of work performed on the task to-date.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>ACWP</em>' attribute.
-	 * @see #isSetACWP()
-	 * @see #unsetACWP()
-	 * @see #setACWP(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ACWP()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='ACWP' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getACWP();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getACWP <em>ACWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>ACWP</em>' attribute.
-	 * @see #isSetACWP()
-	 * @see #unsetACWP()
-	 * @see #getACWP()
-	 * @generated
-	 */
-	void setACWP(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#getACWP <em>ACWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetACWP()
-	 * @see #getACWP()
-	 * @see #setACWP(float)
-	 * @generated
-	 */
-	void unsetACWP();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#getACWP <em>ACWP</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>ACWP</em>' attribute is set.
-	 * @see #unsetACWP()
-	 * @see #getACWP()
-	 * @see #setACWP(float)
-	 * @generated
-	 */
-	boolean isSetACWP();
-
-	/**
-	 * Returns the value of the '<em><b>CV</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Earned value cost variance.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>CV</em>' attribute.
-	 * @see #isSetCV()
-	 * @see #unsetCV()
-	 * @see #setCV(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_CV()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='CV' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getCV();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getCV <em>CV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>CV</em>' attribute.
-	 * @see #isSetCV()
-	 * @see #unsetCV()
-	 * @see #getCV()
-	 * @generated
-	 */
-	void setCV(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#getCV <em>CV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetCV()
-	 * @see #getCV()
-	 * @see #setCV(float)
-	 * @generated
-	 */
-	void unsetCV();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#getCV <em>CV</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>CV</em>' attribute is set.
-	 * @see #unsetCV()
-	 * @see #getCV()
-	 * @see #setCV(float)
-	 * @generated
-	 */
-	boolean isSetCV();
-
-	/**
-	 * Returns the value of the '<em><b>Constraint Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The constraint on the start or finish date of the task. 
-	 *                                 Values are: 0=As Soon As Possible, 1=As Late As Possible, 2=Must Start On, 3=Must Finish On, 
-	 *                                 4=Start No Earlier Than, 5=Start No Later Than, 6=Finish No Earlier Than and 7=Finish No Later Than
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Constraint Type</em>' attribute.
-	 * @see #setConstraintType(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ConstraintType()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.ConstraintTypeType"
-	 *        extendedMetaData="kind='element' name='ConstraintType' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getConstraintType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getConstraintType <em>Constraint Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Constraint Type</em>' attribute.
-	 * @see #getConstraintType()
-	 * @generated
-	 */
-	void setConstraintType(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Calendar UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The task calendar.Refers to a valid UID in the Calendars element of 
-	 *                                 the Microsoft Project XML Schema.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Calendar UID</em>' attribute.
-	 * @see #setCalendarUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_CalendarUID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='CalendarUID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getCalendarUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getCalendarUID <em>Calendar UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Calendar UID</em>' attribute.
-	 * @see #getCalendarUID()
-	 * @generated
-	 */
-	void setCalendarUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Constraint Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The date argument for the task constraint type.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Constraint Date</em>' attribute.
-	 * @see #setConstraintDate(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ConstraintDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='ConstraintDate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getConstraintDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getConstraintDate <em>Constraint Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Constraint Date</em>' attribute.
-	 * @see #getConstraintDate()
-	 * @generated
-	 */
-	void setConstraintDate(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Deadline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The deadline for the task to be completed.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Deadline</em>' attribute.
-	 * @see #setDeadline(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Deadline()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='Deadline' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getDeadline();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getDeadline <em>Deadline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Deadline</em>' attribute.
-	 * @see #getDeadline()
-	 * @generated
-	 */
-	void setDeadline(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Level Assignments</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether leveling can adjust assignments.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Level Assignments</em>' attribute.
-	 * @see #isSetLevelAssignments()
-	 * @see #unsetLevelAssignments()
-	 * @see #setLevelAssignments(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_LevelAssignments()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='LevelAssignments' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isLevelAssignments();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isLevelAssignments <em>Level Assignments</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Level Assignments</em>' attribute.
-	 * @see #isSetLevelAssignments()
-	 * @see #unsetLevelAssignments()
-	 * @see #isLevelAssignments()
-	 * @generated
-	 */
-	void setLevelAssignments(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isLevelAssignments <em>Level Assignments</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetLevelAssignments()
-	 * @see #isLevelAssignments()
-	 * @see #setLevelAssignments(boolean)
-	 * @generated
-	 */
-	void unsetLevelAssignments();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isLevelAssignments <em>Level Assignments</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Level Assignments</em>' attribute is set.
-	 * @see #unsetLevelAssignments()
-	 * @see #isLevelAssignments()
-	 * @see #setLevelAssignments(boolean)
-	 * @generated
-	 */
-	boolean isSetLevelAssignments();
-
-	/**
-	 * Returns the value of the '<em><b>Leveling Can Split</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether leveling can split the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Leveling Can Split</em>' attribute.
-	 * @see #isSetLevelingCanSplit()
-	 * @see #unsetLevelingCanSplit()
-	 * @see #setLevelingCanSplit(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_LevelingCanSplit()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='LevelingCanSplit' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isLevelingCanSplit();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isLevelingCanSplit <em>Leveling Can Split</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Leveling Can Split</em>' attribute.
-	 * @see #isSetLevelingCanSplit()
-	 * @see #unsetLevelingCanSplit()
-	 * @see #isLevelingCanSplit()
-	 * @generated
-	 */
-	void setLevelingCanSplit(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isLevelingCanSplit <em>Leveling Can Split</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetLevelingCanSplit()
-	 * @see #isLevelingCanSplit()
-	 * @see #setLevelingCanSplit(boolean)
-	 * @generated
-	 */
-	void unsetLevelingCanSplit();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isLevelingCanSplit <em>Leveling Can Split</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Leveling Can Split</em>' attribute is set.
-	 * @see #unsetLevelingCanSplit()
-	 * @see #isLevelingCanSplit()
-	 * @see #setLevelingCanSplit(boolean)
-	 * @generated
-	 */
-	boolean isSetLevelingCanSplit();
-
-	/**
-	 * Returns the value of the '<em><b>Leveling Delay</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The delay caused by leveling the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Leveling Delay</em>' attribute.
-	 * @see #setLevelingDelay(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_LevelingDelay()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='LevelingDelay' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getLevelingDelay();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getLevelingDelay <em>Leveling Delay</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Leveling Delay</em>' attribute.
-	 * @see #getLevelingDelay()
-	 * @generated
-	 */
-	void setLevelingDelay(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Leveling Delay Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The format for expressing the duration of the delay.  
-	 *                                 Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 
-	 *                                 20=e%, 21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 
-	 *                                 43=mo?, 44=emo?, 51=%?, 52=e%? and 53=null.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Leveling Delay Format</em>' attribute.
-	 * @see #setLevelingDelayFormat(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_LevelingDelayFormat()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.LevelingDelayFormatType1"
-	 *        extendedMetaData="kind='element' name='LevelingDelayFormat' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getLevelingDelayFormat();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getLevelingDelayFormat <em>Leveling Delay Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Leveling Delay Format</em>' attribute.
-	 * @see #getLevelingDelayFormat()
-	 * @generated
-	 */
-	void setLevelingDelayFormat(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Pre Leveled Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The start date of the task before it was leveled.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Pre Leveled Start</em>' attribute.
-	 * @see #setPreLeveledStart(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_PreLeveledStart()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='PreLeveledStart' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getPreLeveledStart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getPreLeveledStart <em>Pre Leveled Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pre Leveled Start</em>' attribute.
-	 * @see #getPreLeveledStart()
-	 * @generated
-	 */
-	void setPreLeveledStart(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Pre Leveled Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The finish date of the task before it was leveled.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Pre Leveled Finish</em>' attribute.
-	 * @see #setPreLeveledFinish(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_PreLeveledFinish()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='PreLeveledFinish' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getPreLeveledFinish();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getPreLeveledFinish <em>Pre Leveled Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pre Leveled Finish</em>' attribute.
-	 * @see #getPreLeveledFinish()
-	 * @generated
-	 */
-	void setPreLeveledFinish(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Hyperlink</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The title of the hyperlink associated with the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Hyperlink</em>' attribute.
-	 * @see #setHyperlink(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Hyperlink()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.HyperlinkType2"
-	 *        extendedMetaData="kind='element' name='Hyperlink' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getHyperlink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getHyperlink <em>Hyperlink</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hyperlink</em>' attribute.
-	 * @see #getHyperlink()
-	 * @generated
-	 */
-	void setHyperlink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Hyperlink Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The hyperlink associated with the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Hyperlink Address</em>' attribute.
-	 * @see #setHyperlinkAddress(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_HyperlinkAddress()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.HyperlinkAddressType2"
-	 *        extendedMetaData="kind='element' name='HyperlinkAddress' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getHyperlinkAddress();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getHyperlinkAddress <em>Hyperlink Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hyperlink Address</em>' attribute.
-	 * @see #getHyperlinkAddress()
-	 * @generated
-	 */
-	void setHyperlinkAddress(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Hyperlink Sub Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The document bookmark of the hyperlink associated with the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Hyperlink Sub Address</em>' attribute.
-	 * @see #setHyperlinkSubAddress(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_HyperlinkSubAddress()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.HyperlinkSubAddressType2"
-	 *        extendedMetaData="kind='element' name='HyperlinkSubAddress' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getHyperlinkSubAddress();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getHyperlinkSubAddress <em>Hyperlink Sub Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hyperlink Sub Address</em>' attribute.
-	 * @see #getHyperlinkSubAddress()
-	 * @generated
-	 */
-	void setHyperlinkSubAddress(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Ignore Resource Calendar</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the task ignores the resource calendar.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ignore Resource Calendar</em>' attribute.
-	 * @see #isSetIgnoreResourceCalendar()
-	 * @see #unsetIgnoreResourceCalendar()
-	 * @see #setIgnoreResourceCalendar(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_IgnoreResourceCalendar()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='IgnoreResourceCalendar' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isIgnoreResourceCalendar();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isIgnoreResourceCalendar <em>Ignore Resource Calendar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ignore Resource Calendar</em>' attribute.
-	 * @see #isSetIgnoreResourceCalendar()
-	 * @see #unsetIgnoreResourceCalendar()
-	 * @see #isIgnoreResourceCalendar()
-	 * @generated
-	 */
-	void setIgnoreResourceCalendar(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isIgnoreResourceCalendar <em>Ignore Resource Calendar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIgnoreResourceCalendar()
-	 * @see #isIgnoreResourceCalendar()
-	 * @see #setIgnoreResourceCalendar(boolean)
-	 * @generated
-	 */
-	void unsetIgnoreResourceCalendar();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isIgnoreResourceCalendar <em>Ignore Resource Calendar</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Ignore Resource Calendar</em>' attribute is set.
-	 * @see #unsetIgnoreResourceCalendar()
-	 * @see #isIgnoreResourceCalendar()
-	 * @see #setIgnoreResourceCalendar(boolean)
-	 * @generated
-	 */
-	boolean isSetIgnoreResourceCalendar();
-
-	/**
-	 * Returns the value of the '<em><b>Notes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Text notes associated with the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Notes</em>' attribute.
-	 * @see #setNotes(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Notes()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Notes' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getNotes();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getNotes <em>Notes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Notes</em>' attribute.
-	 * @see #getNotes()
-	 * @generated
-	 */
-	void setNotes(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Hide Bar</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the GANTT bar of the task is hidden when displayed in Microsoft Project.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Hide Bar</em>' attribute.
-	 * @see #isSetHideBar()
-	 * @see #unsetHideBar()
-	 * @see #setHideBar(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_HideBar()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='HideBar' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isHideBar();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isHideBar <em>Hide Bar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hide Bar</em>' attribute.
-	 * @see #isSetHideBar()
-	 * @see #unsetHideBar()
-	 * @see #isHideBar()
-	 * @generated
-	 */
-	void setHideBar(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isHideBar <em>Hide Bar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetHideBar()
-	 * @see #isHideBar()
-	 * @see #setHideBar(boolean)
-	 * @generated
-	 */
-	void unsetHideBar();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isHideBar <em>Hide Bar</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Hide Bar</em>' attribute is set.
-	 * @see #unsetHideBar()
-	 * @see #isHideBar()
-	 * @see #setHideBar(boolean)
-	 * @generated
-	 */
-	boolean isSetHideBar();
-
-	/**
-	 * Returns the value of the '<em><b>Rollup</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the task is rolled up.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Rollup</em>' attribute.
-	 * @see #isSetRollup()
-	 * @see #unsetRollup()
-	 * @see #setRollup(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Rollup()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='Rollup' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isRollup();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#isRollup <em>Rollup</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rollup</em>' attribute.
-	 * @see #isSetRollup()
-	 * @see #unsetRollup()
-	 * @see #isRollup()
-	 * @generated
-	 */
-	void setRollup(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#isRollup <em>Rollup</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetRollup()
-	 * @see #isRollup()
-	 * @see #setRollup(boolean)
-	 * @generated
-	 */
-	void unsetRollup();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#isRollup <em>Rollup</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Rollup</em>' attribute is set.
-	 * @see #unsetRollup()
-	 * @see #isRollup()
-	 * @see #setRollup(boolean)
-	 * @generated
-	 */
-	boolean isSetRollup();
-
-	/**
-	 * Returns the value of the '<em><b>BCWS</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The budgeted cost of work scheduled for the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>BCWS</em>' attribute.
-	 * @see #isSetBCWS()
-	 * @see #unsetBCWS()
-	 * @see #setBCWS(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_BCWS()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='BCWS' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getBCWS();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getBCWS <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>BCWS</em>' attribute.
-	 * @see #isSetBCWS()
-	 * @see #unsetBCWS()
-	 * @see #getBCWS()
-	 * @generated
-	 */
-	void setBCWS(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#getBCWS <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBCWS()
-	 * @see #getBCWS()
-	 * @see #setBCWS(float)
-	 * @generated
-	 */
-	void unsetBCWS();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#getBCWS <em>BCWS</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>BCWS</em>' attribute is set.
-	 * @see #unsetBCWS()
-	 * @see #getBCWS()
-	 * @see #setBCWS(float)
-	 * @generated
-	 */
-	boolean isSetBCWS();
-
-	/**
-	 * Returns the value of the '<em><b>BCWP</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The budgeted cost of work performed on the task to-date.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>BCWP</em>' attribute.
-	 * @see #isSetBCWP()
-	 * @see #unsetBCWP()
-	 * @see #setBCWP(float)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_BCWP()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Float"
-	 *        extendedMetaData="kind='element' name='BCWP' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	float getBCWP();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getBCWP <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>BCWP</em>' attribute.
-	 * @see #isSetBCWP()
-	 * @see #unsetBCWP()
-	 * @see #getBCWP()
-	 * @generated
-	 */
-	void setBCWP(float value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.Task#getBCWP <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBCWP()
-	 * @see #getBCWP()
-	 * @see #setBCWP(float)
-	 * @generated
-	 */
-	void unsetBCWP();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.Task#getBCWP <em>BCWP</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>BCWP</em>' attribute is set.
-	 * @see #unsetBCWP()
-	 * @see #getBCWP()
-	 * @see #setBCWP(float)
-	 * @generated
-	 */
-	boolean isSetBCWP();
-
-	/**
-	 * Returns the value of the '<em><b>Physical Percent Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The percentage complete value entered by the Project Manager.  
-	 *                                 This can be used as an alternative for calculating BCWP.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Physical Percent Complete</em>' attribute.
-	 * @see #setPhysicalPercentComplete(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_PhysicalPercentComplete()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='PhysicalPercentComplete' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getPhysicalPercentComplete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getPhysicalPercentComplete <em>Physical Percent Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Physical Percent Complete</em>' attribute.
-	 * @see #getPhysicalPercentComplete()
-	 * @generated
-	 */
-	void setPhysicalPercentComplete(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Earned Value Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The method for calculating earned value. 
-	 *                                 Values are: 0=Percent Complete, 1=Physical Percent Complete
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Earned Value Method</em>' attribute.
-	 * @see #setEarnedValueMethod(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_EarnedValueMethod()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.EarnedValueMethodType"
-	 *        extendedMetaData="kind='element' name='EarnedValueMethod' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getEarnedValueMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getEarnedValueMethod <em>Earned Value Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Earned Value Method</em>' attribute.
-	 * @see #getEarnedValueMethod()
-	 * @generated
-	 */
-	void setEarnedValueMethod(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Predecessor Link</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.PredecessorLink}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the predecessor task of the task that contains it.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Predecessor Link</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_PredecessorLink()
-	 * @model type="org.eclipse.epf.msproject.PredecessorLink" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='PredecessorLink' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getPredecessorLink();
-
-	/**
-	 * Returns the value of the '<em><b>Actual Work Protected</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies the duration through which actual work is protected.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Work Protected</em>' attribute.
-	 * @see #setActualWorkProtected(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ActualWorkProtected()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='ActualWorkProtected' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualWorkProtected();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getActualWorkProtected <em>Actual Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Work Protected</em>' attribute.
-	 * @see #getActualWorkProtected()
-	 * @generated
-	 */
-	void setActualWorkProtected(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Overtime Work Protected</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies the duration through which actual overtime work is protected.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual Overtime Work Protected</em>' attribute.
-	 * @see #setActualOvertimeWorkProtected(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ActualOvertimeWorkProtected()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Duration"
-	 *        extendedMetaData="kind='element' name='ActualOvertimeWorkProtected' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getActualOvertimeWorkProtected();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Task#getActualOvertimeWorkProtected <em>Actual Overtime Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Overtime Work Protected</em>' attribute.
-	 * @see #getActualOvertimeWorkProtected()
-	 * @generated
-	 */
-	void setActualOvertimeWorkProtected(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Extended Attribute</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.ExtendedAttribute2}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The value of an extended attribute.  Two pieces of data are necessary - 
-	 *                                 a pointer back to the extended attribute table which is specified either by the unique ID or 
-	 *                                 the Field ID, and the value which is specified either with the value, or a pointer back to the value list.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Extended Attribute</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_ExtendedAttribute()
-	 * @model type="org.eclipse.epf.msproject.ExtendedAttribute2" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='ExtendedAttribute' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getExtendedAttribute();
-
-	/**
-	 * Returns the value of the '<em><b>Baseline</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.Baseline}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The collection of baseline values of the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Baseline</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_Baseline()
-	 * @model type="org.eclipse.epf.msproject.Baseline" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='Baseline' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getBaseline();
-
-	/**
-	 * Returns the value of the '<em><b>Outline Code</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.OutlineCode2}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The value of an outline code.  Two pieces of data are necessary - 
-	 *                                 a pointer back to the outline code table which is specified either by the unique ID or the Field ID, 
-	 *                                 and the value which is specified either with the value, or a pointer back to the value list.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Outline Code</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_OutlineCode()
-	 * @model type="org.eclipse.epf.msproject.OutlineCode2" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='OutlineCode' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getOutlineCode();
-
-	/**
-	 * Returns the value of the '<em><b>Timephased Data</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.TimephasedDataType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The time phased data block associated with the task.
-	 *                                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Timephased Data</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTask_TimephasedData()
-	 * @model type="org.eclipse.epf.msproject.TimephasedDataType" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='TimephasedData' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getTimephasedData();
-
-} // Task
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Tasks.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Tasks.java
deleted file mode 100755
index 00f6970..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Tasks.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Tasks.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tasks</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Tasks#getTask <em>Task</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getTasks()
- * @model extendedMetaData="name='Tasks_._type' kind='elementOnly'"
- * @generated
- */
-public interface Tasks extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Task</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.Task}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * There must be at least one task in each Tasks collection.
-	 *                     
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Task</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTasks_Task()
-	 * @model type="org.eclipse.epf.msproject.Task" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='Task' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getTask();
-
-} // Tasks
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/TimePeriod.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/TimePeriod.java
deleted file mode 100755
index 2da77ca..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/TimePeriod.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TimePeriod.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Time Period</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.TimePeriod#getFromDate <em>From Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.TimePeriod#getToDate <em>To Date</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getTimePeriod()
- * @model extendedMetaData="name='TimePeriod_._type' kind='elementOnly'"
- * @generated
- */
-public interface TimePeriod extends EObject {
-	/**
-	 * Returns the value of the '<em><b>From Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The beginning of the exception time.
-	 *                                                                      
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>From Date</em>' attribute.
-	 * @see #setFromDate(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTimePeriod_FromDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='FromDate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getFromDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.TimePeriod#getFromDate <em>From Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>From Date</em>' attribute.
-	 * @see #getFromDate()
-	 * @generated
-	 */
-	void setFromDate(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>To Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The end of the exception time.
-	 *                                                                      
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>To Date</em>' attribute.
-	 * @see #setToDate(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTimePeriod_ToDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='ToDate' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getToDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.TimePeriod#getToDate <em>To Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>To Date</em>' attribute.
-	 * @see #getToDate()
-	 * @generated
-	 */
-	void setToDate(Object value);
-
-} // TimePeriod
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/TimephasedDataType.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/TimephasedDataType.java
deleted file mode 100755
index 0795a36..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/TimephasedDataType.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TimephasedDataType.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Timephased Data Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The definition of the time phased data block.
- * 		        
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.TimephasedDataType#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.TimephasedDataType#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.TimephasedDataType#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.TimephasedDataType#getFinish <em>Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.TimephasedDataType#getUnit <em>Unit</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.TimephasedDataType#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getTimephasedDataType()
- * @model extendedMetaData="name='TimephasedDataType' kind='elementOnly'"
- * @generated
- */
-public interface TimephasedDataType extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 *                 The type of task timephased data. Values are:
-	 *                     1=Assignment Remaining Work
-	 *                     2=Assignment Actual Work
-	 *                     3=Assignment Actual Overtime Work
-	 *                     4=Assignment Baseline Work
-	 *                     5=Assignment Baseline Cost
-	 *                     6=Assignment Actual Cost
-	 *                     7=Resource Baseline Work
-	 *                     8=Resource Baseline Cost
-	 *                     9=Task Baseline Work
-	 *                     10=Task Baseline Cost
-	 *                     11=Task Percent Complete
-	 *                     16=Assignment Baseline 1 Work
-	 *                     17=Assignment Baseline 1 Cost
-	 *                     18=Task Baseline 1 Work
-	 *                     19=Task Baseline 1 Cost
-	 *                     20=Resource Baseline 1 Work
-	 *                     21=Resource Baseline 1 Cost
-	 *                     22=Assignment Baseline 2 Work
-	 *                     23=Assignment Baseline 2 Cost
-	 *                     24=Task Baseline 2 Work
-	 *                     25=Task Baseline 2 Cost
-	 *                     26=Resource Baseline 2 Work
-	 *                     27=Resource Baseline 2 Cost
-	 *                     28=Assignment Baseline 3 Work
-	 *                     29=Assignment Baseline 3 Cost
-	 *                     30=Task Baseline 3 Work
-	 *                     31=Task Baseline 3 Cost
-	 *                     32=Resource Baseline 3 Work
-	 *                     33=Resource Baseline 3 Cost
-	 *                     34=Assignment Baseline 4 Work
-	 *                     35=Assignment Baseline 4 Cost
-	 *                     36=Task Baseline 4 Work
-	 *                     37=Task Baseline 4 Cost
-	 *                     38=Resource Baseline 4 Work
-	 *                     39=Resource Baseline 4 Cost
-	 *                     40=Assignment Baseline 5 Work
-	 *                     41=Assignment Baseline 5 Cost
-	 *                     42=Task Baseline 5 Work
-	 *                     43=Task Baseline 5 Cost
-	 *                     44=Resource Baseline 5 Work
-	 *                     45=Resource Baseline 5 Cost
-	 *                     46=Assignment Baseline 6 Work
-	 *                     47=Assignment Baseline 6 Cost
-	 *                     48=Task Baseline 6 Work
-	 *                     49=Task Baseline 6 Cost
-	 *                     50=Resource Baseline 6 Work
-	 *                     51=Resource Baseline 6 Cost
-	 *                     52=Assignment Baseline 7 Work
-	 *                     53=Assignment Baseline 7 Cost
-	 *                     54=Task Baseline 7 Work
-	 *                     55=Task Baseline 7 Cost
-	 *                     56=Resource Baseline 7 Work
-	 *                     57=Resource Baseline 7 Cost
-	 *                     58=Assignment Baseline 8 Work
-	 *                     59=Assignment Baseline 8 Cost
-	 *                     60=Task Baseline 8 Work
-	 *                     61=Task Baseline 8 Cost
-	 *                     62=Resource Baseline 8 Work
-	 *                     63=Resource Baseline 8 Cost
-	 *                     64=Assignment Baseline 9 Work
-	 *                     65=Assignment Baseline 9 Cost
-	 *                     66=Task Baseline 9 Work
-	 *                     67=Task Baseline 9 Cost
-	 *                     68=Resource Baseline 9 Work
-	 *                     69=Resource Baseline 9 Cost
-	 *                     70=Assignment Baseline 10 Work
-	 *                     71=Assignment Baseline 10 Cost
-	 *                     72=Task Baseline 10 Work
-	 *                     73=Task Baseline 10 Cost
-	 *                     74=Resource Baseline 10 Work
-	 *                     75=Resource Baseline 10 Cost
-	 *                     76=Physical Percent Complete
-	 *                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTimephasedDataType_Type()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.TypeType3"
-	 *        extendedMetaData="kind='element' name='Type' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.TimephasedDataType#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>UID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique identifier of the timephased data record.
-	 *                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>UID</em>' attribute.
-	 * @see #setUID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTimephasedDataType_UID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer" required="true"
-	 *        extendedMetaData="kind='element' name='UID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getUID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.TimephasedDataType#getUID <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>UID</em>' attribute.
-	 * @see #getUID()
-	 * @generated
-	 */
-	void setUID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The start date of the timephased data period.
-	 *                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Start</em>' attribute.
-	 * @see #setStart(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTimephasedDataType_Start()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='Start' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getStart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.TimephasedDataType#getStart <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start</em>' attribute.
-	 * @see #getStart()
-	 * @generated
-	 */
-	void setStart(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Finish</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The finish date of the timephased data period.
-	 *                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Finish</em>' attribute.
-	 * @see #setFinish(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTimephasedDataType_Finish()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='element' name='Finish' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getFinish();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.TimephasedDataType#getFinish <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Finish</em>' attribute.
-	 * @see #getFinish()
-	 * @generated
-	 */
-	void setFinish(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Unit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The time unit of the timephased data period. 
-	 *                 Values are: 0=m, 1=h, 2=d, 3=w, 5=mo, 8=y
-	 *                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Unit</em>' attribute.
-	 * @see #setUnit(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTimephasedDataType_Unit()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.UnitType"
-	 *        extendedMetaData="kind='element' name='Unit' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getUnit();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.TimephasedDataType#getUnit <em>Unit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unit</em>' attribute.
-	 * @see #getUnit()
-	 * @generated
-	 */
-	void setUnit(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The value per unit of time for the timephased data period.
-	 *                 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getTimephasedDataType_Value()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Value' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.TimephasedDataType#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-} // TimephasedDataType
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Value.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Value.java
deleted file mode 100755
index a596c70..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Value.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Value.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Value#getValueID <em>Value ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Value#getParentValueID <em>Parent Value ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Value#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Value#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getValue()
- * @model extendedMetaData="name='Value_._type' kind='elementOnly'"
- * @generated
- */
-public interface Value extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Value ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The unique ID of the outline code value across the project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value ID</em>' attribute.
-	 * @see #setValueID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getValue_ValueID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='ValueID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getValueID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Value#getValueID <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value ID</em>' attribute.
-	 * @see #getValueID()
-	 * @generated
-	 */
-	void setValueID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Parent Value ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The value of the parent node of the outline code.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Parent Value ID</em>' attribute.
-	 * @see #setParentValueID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getValue_ParentValueID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer"
-	 *        extendedMetaData="kind='element' name='ParentValueID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getParentValueID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Value#getParentValueID <em>Parent Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent Value ID</em>' attribute.
-	 * @see #getParentValueID()
-	 * @generated
-	 */
-	void setParentValueID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual value.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getValue_Value()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Value' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Value#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A description of this value.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getValue_Description()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Description' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Value#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-} // Value
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Value2.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Value2.java
deleted file mode 100755
index abd9139..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Value2.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Value2.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Value2</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Value2#getID <em>ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Value2#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Value2#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getValue2()
- * @model extendedMetaData="name='Value_._1_._type' kind='elementOnly'"
- * @generated
- */
-public interface Value2 extends EObject {
-	/**
-	 * Returns the value of the '<em><b>ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Unique ID of value across 
-	 *                                                         the project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>ID</em>' attribute.
-	 * @see #setID(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getValue2_ID()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer" required="true"
-	 *        extendedMetaData="kind='element' name='ID' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Value2#getID <em>ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>ID</em>' attribute.
-	 * @see #getID()
-	 * @generated
-	 */
-	void setID(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The actual value.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getValue2_Value()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Value' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Value2#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The description of the value 
-	 *                                                         in the list.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getValue2_Description()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Description' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.Value2#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-} // Value2
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ValueList.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ValueList.java
deleted file mode 100755
index 78bd7d3..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/ValueList.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ValueList.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Value List</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.ValueList#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getValueList()
- * @model extendedMetaData="name='ValueList_._type' kind='elementOnly'"
- * @generated
- */
-public interface ValueList extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.Value2}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The values that make up the value list.
-	 *                                             
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getValueList_Value()
-	 * @model type="org.eclipse.epf.msproject.Value2" containment="true" resolveProxies="false" required="true"
-	 *        extendedMetaData="kind='element' name='Value' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getValue();
-
-} // ValueList
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Values.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Values.java
deleted file mode 100755
index a330c30..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/Values.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Values.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Values</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.Values#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.Values#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getValues()
- * @model extendedMetaData="name='Values_._type' kind='elementOnly'"
- * @generated
- */
-public interface Values extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Group</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group</em>' attribute list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getValues_Group()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:0'"
-	 * @generated
-	 */
-	FeatureMap getGroup();
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.Value}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The individual values.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getValues_Value()
-	 * @model type="org.eclipse.epf.msproject.Value" containment="true" resolveProxies="false" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Value' namespace='##targetNamespace' group='#group:0'"
-	 * @generated
-	 */
-	EList getValue();
-
-} // Values
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WBSMask.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WBSMask.java
deleted file mode 100755
index b75ef47..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WBSMask.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WBSMask.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WBS Mask</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.WBSMask#getLevel <em>Level</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.WBSMask#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.WBSMask#getLength <em>Length</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.WBSMask#getSeparator <em>Separator</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getWBSMask()
- * @model extendedMetaData="name='WBSMask_._type' kind='elementOnly'"
- * @generated
- */
-public interface WBSMask extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Level</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The level of the mask.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Level</em>' attribute.
-	 * @see #setLevel(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWBSMask_Level()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Integer" required="true"
-	 *        extendedMetaData="kind='element' name='Level' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getLevel();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.WBSMask#getLevel <em>Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Level</em>' attribute.
-	 * @see #getLevel()
-	 * @generated
-	 */
-	void setLevel(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The type of the node value. 
-	 *                                 The values are: 0=Numbers, 1=Uppercase Letters, 2=Lowercase Letters, 3=Characters.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWBSMask_Type()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.TypeType2" required="true"
-	 *        extendedMetaData="kind='element' name='Type' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.WBSMask#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The maximum length in characters.  
-	 *                                 This element is omitted when length is "any".
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Length</em>' attribute.
-	 * @see #setLength(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWBSMask_Length()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 *        extendedMetaData="kind='element' name='Length' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getLength();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.WBSMask#getLength <em>Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Length</em>' attribute.
-	 * @see #getLength()
-	 * @generated
-	 */
-	void setLength(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Separator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The separator character of the node.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Separator</em>' attribute.
-	 * @see #setSeparator(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWBSMask_Separator()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 *        extendedMetaData="kind='element' name='Separator' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getSeparator();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.WBSMask#getSeparator <em>Separator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Separator</em>' attribute.
-	 * @see #getSeparator()
-	 * @generated
-	 */
-	void setSeparator(String value);
-
-} // WBSMask
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WBSMasks.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WBSMasks.java
deleted file mode 100755
index 49ea1fe..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WBSMasks.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WBSMasks.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WBS Masks</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.WBSMasks#isVerifyUniqueCodes <em>Verify Unique Codes</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.WBSMasks#isGenerateCodes <em>Generate Codes</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.WBSMasks#getPrefix <em>Prefix</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.WBSMasks#getWBSMask <em>WBS Mask</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getWBSMasks()
- * @model extendedMetaData="name='WBSMasks_._type' kind='elementOnly'"
- * @generated
- */
-public interface WBSMasks extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Verify Unique Codes</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether WBS codes are unique for new tasks.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Verify Unique Codes</em>' attribute.
-	 * @see #isSetVerifyUniqueCodes()
-	 * @see #unsetVerifyUniqueCodes()
-	 * @see #setVerifyUniqueCodes(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWBSMasks_VerifyUniqueCodes()
-	 * @model default="false" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='VerifyUniqueCodes' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isVerifyUniqueCodes();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.WBSMasks#isVerifyUniqueCodes <em>Verify Unique Codes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Verify Unique Codes</em>' attribute.
-	 * @see #isSetVerifyUniqueCodes()
-	 * @see #unsetVerifyUniqueCodes()
-	 * @see #isVerifyUniqueCodes()
-	 * @generated
-	 */
-	void setVerifyUniqueCodes(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.WBSMasks#isVerifyUniqueCodes <em>Verify Unique Codes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetVerifyUniqueCodes()
-	 * @see #isVerifyUniqueCodes()
-	 * @see #setVerifyUniqueCodes(boolean)
-	 * @generated
-	 */
-	void unsetVerifyUniqueCodes();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.WBSMasks#isVerifyUniqueCodes <em>Verify Unique Codes</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Verify Unique Codes</em>' attribute is set.
-	 * @see #unsetVerifyUniqueCodes()
-	 * @see #isVerifyUniqueCodes()
-	 * @see #setVerifyUniqueCodes(boolean)
-	 * @generated
-	 */
-	boolean isSetVerifyUniqueCodes();
-
-	/**
-	 * Returns the value of the '<em><b>Generate Codes</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether WBS codes are generated for new tasks.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Generate Codes</em>' attribute.
-	 * @see #isSetGenerateCodes()
-	 * @see #unsetGenerateCodes()
-	 * @see #setGenerateCodes(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWBSMasks_GenerateCodes()
-	 * @model default="false" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='GenerateCodes' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isGenerateCodes();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.WBSMasks#isGenerateCodes <em>Generate Codes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Generate Codes</em>' attribute.
-	 * @see #isSetGenerateCodes()
-	 * @see #unsetGenerateCodes()
-	 * @see #isGenerateCodes()
-	 * @generated
-	 */
-	void setGenerateCodes(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.WBSMasks#isGenerateCodes <em>Generate Codes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetGenerateCodes()
-	 * @see #isGenerateCodes()
-	 * @see #setGenerateCodes(boolean)
-	 * @generated
-	 */
-	void unsetGenerateCodes();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.WBSMasks#isGenerateCodes <em>Generate Codes</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Generate Codes</em>' attribute is set.
-	 * @see #unsetGenerateCodes()
-	 * @see #isGenerateCodes()
-	 * @see #setGenerateCodes(boolean)
-	 * @generated
-	 */
-	boolean isSetGenerateCodes();
-
-	/**
-	 * Returns the value of the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The prefix for all WBS codes.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Prefix</em>' attribute.
-	 * @see #setPrefix(String)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWBSMasks_Prefix()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.PrefixType"
-	 *        extendedMetaData="kind='element' name='Prefix' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	String getPrefix();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.WBSMasks#getPrefix <em>Prefix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Prefix</em>' attribute.
-	 * @see #getPrefix()
-	 * @generated
-	 */
-	void setPrefix(String value);
-
-	/**
-	 * Returns the value of the '<em><b>WBS Mask</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.WBSMask}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The WBS Mask that is applied to all tasks in the Project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>WBS Mask</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWBSMasks_WBSMask()
-	 * @model type="org.eclipse.epf.msproject.WBSMask" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='WBSMask' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getWBSMask();
-
-} // WBSMasks
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WeekDay.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WeekDay.java
deleted file mode 100755
index c3de2fd..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WeekDay.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WeekDay.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Week Day</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.WeekDay#getDayType <em>Day Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.WeekDay#isDayWorking <em>Day Working</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.WeekDay#getTimePeriod <em>Time Period</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.WeekDay#getWorkingTimes <em>Working Times</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getWeekDay()
- * @model extendedMetaData="name='WeekDay_._type' kind='elementOnly'"
- * @generated
- */
-public interface WeekDay extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Day Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The type of day. 
-	 *                                                          Values are: 0=Exception, 1=Monday, 2=Tuesday, 
-	 *                                                          3=Wednesday, 4=Thursday, 5=Friday, 6=Saturday, 
-	 *                                                          7=Sunday
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Day Type</em>' attribute.
-	 * @see #setDayType(BigInteger)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWeekDay_DayType()
-	 * @model unique="false" dataType="org.eclipse.epf.msproject.DayTypeType" required="true"
-	 *        extendedMetaData="kind='element' name='DayType' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	BigInteger getDayType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.WeekDay#getDayType <em>Day Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Day Type</em>' attribute.
-	 * @see #getDayType()
-	 * @generated
-	 */
-	void setDayType(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Day Working</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Whether the specified date or day 
-	 *                                                          type is working.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Day Working</em>' attribute.
-	 * @see #isSetDayWorking()
-	 * @see #unsetDayWorking()
-	 * @see #setDayWorking(boolean)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWeekDay_DayWorking()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='element' name='DayWorking' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	boolean isDayWorking();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.WeekDay#isDayWorking <em>Day Working</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Day Working</em>' attribute.
-	 * @see #isSetDayWorking()
-	 * @see #unsetDayWorking()
-	 * @see #isDayWorking()
-	 * @generated
-	 */
-	void setDayWorking(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.msproject.WeekDay#isDayWorking <em>Day Working</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDayWorking()
-	 * @see #isDayWorking()
-	 * @see #setDayWorking(boolean)
-	 * @generated
-	 */
-	void unsetDayWorking();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.msproject.WeekDay#isDayWorking <em>Day Working</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Day Working</em>' attribute is set.
-	 * @see #unsetDayWorking()
-	 * @see #isDayWorking()
-	 * @see #setDayWorking(boolean)
-	 * @generated
-	 */
-	boolean isSetDayWorking();
-
-	/**
-	 * Returns the value of the '<em><b>Time Period</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines a contiguous set of exception days.
-	 *                                                          
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Time Period</em>' containment reference.
-	 * @see #setTimePeriod(TimePeriod)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWeekDay_TimePeriod()
-	 * @model containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='TimePeriod' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	TimePeriod getTimePeriod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.WeekDay#getTimePeriod <em>Time Period</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Time Period</em>' containment reference.
-	 * @see #getTimePeriod()
-	 * @generated
-	 */
-	void setTimePeriod(TimePeriod value);
-
-	/**
-	 * Returns the value of the '<em><b>Working Times</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The collection of working times that define the time worked 
-	 *                                                          on the weekday.  One of these must be present, and there may be no more than five.
-	 *                                                          
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Working Times</em>' containment reference.
-	 * @see #setWorkingTimes(WorkingTimes)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWeekDay_WorkingTimes()
-	 * @model containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='WorkingTimes' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	WorkingTimes getWorkingTimes();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.WeekDay#getWorkingTimes <em>Working Times</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Working Times</em>' containment reference.
-	 * @see #getWorkingTimes()
-	 * @generated
-	 */
-	void setWorkingTimes(WorkingTimes value);
-
-} // WeekDay
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WeekDays.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WeekDays.java
deleted file mode 100755
index c07efa4..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WeekDays.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WeekDays.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Week Days</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.WeekDays#getWeekDay <em>Week Day</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getWeekDays()
- * @model extendedMetaData="name='WeekDays_._type' kind='elementOnly'"
- * @generated
- */
-public interface WeekDays extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Week Day</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.WeekDay}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A weekday either defines regular days 
-	 *                                             of the week or exception days in the calendar.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Week Day</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWeekDays_WeekDay()
-	 * @model type="org.eclipse.epf.msproject.WeekDay" containment="true" resolveProxies="false"
-	 *        extendedMetaData="kind='element' name='WeekDay' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getWeekDay();
-
-} // WeekDays
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WorkingTime.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WorkingTime.java
deleted file mode 100755
index fdb921e..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WorkingTime.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkingTime.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Working Time</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.WorkingTime#getFromTime <em>From Time</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.WorkingTime#getToTime <em>To Time</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getWorkingTime()
- * @model extendedMetaData="name='WorkingTime_._type' kind='elementOnly'"
- * @generated
- */
-public interface WorkingTime extends EObject {
-	/**
-	 * Returns the value of the '<em><b>From Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The beginning of the working time.
-	 *                                                                                      
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>From Time</em>' attribute.
-	 * @see #setFromTime(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWorkingTime_FromTime()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Time"
-	 *        extendedMetaData="kind='element' name='FromTime' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getFromTime();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.WorkingTime#getFromTime <em>From Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>From Time</em>' attribute.
-	 * @see #getFromTime()
-	 * @generated
-	 */
-	void setFromTime(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>To Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The end of the working  time.
-	 *                                                                                      
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>To Time</em>' attribute.
-	 * @see #setToTime(Object)
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWorkingTime_ToTime()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Time"
-	 *        extendedMetaData="kind='element' name='ToTime' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	Object getToTime();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.msproject.WorkingTime#getToTime <em>To Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>To Time</em>' attribute.
-	 * @see #getToTime()
-	 * @generated
-	 */
-	void setToTime(Object value);
-
-} // WorkingTime
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WorkingTimes.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WorkingTimes.java
deleted file mode 100755
index 35934a7..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/WorkingTimes.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkingTimes.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Working Times</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.WorkingTimes#getWorkingTime <em>Working Time</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.msproject.MsprojectPackage#getWorkingTimes()
- * @model extendedMetaData="name='WorkingTimes_._type' kind='elementOnly'"
- * @generated
- */
-public interface WorkingTimes extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Working Time</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.msproject.WorkingTime}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the working time during the weekday.
-	 *                                                                          
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Working Time</em>' containment reference list.
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#getWorkingTimes_WorkingTime()
-	 * @model type="org.eclipse.epf.msproject.WorkingTime" containment="true" resolveProxies="false" upper="5"
-	 *        extendedMetaData="kind='element' name='WorkingTime' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	EList getWorkingTime();
-
-} // WorkingTimes
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/AssignmentImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/AssignmentImpl.java
deleted file mode 100755
index 580f305..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/AssignmentImpl.java
+++ /dev/null
@@ -1,3700 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AssignmentImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.Assignment;
-import org.eclipse.epf.msproject.Baseline3;
-import org.eclipse.epf.msproject.ExtendedAttribute4;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.TimephasedDataType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Assignment</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getTaskUID <em>Task UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getResourceUID <em>Resource UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getPercentWorkComplete <em>Percent Work Complete</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getActualCost <em>Actual Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getActualFinish <em>Actual Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getActualOvertimeCost <em>Actual Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getActualOvertimeWork <em>Actual Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getActualStart <em>Actual Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getActualWork <em>Actual Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getACWP <em>ACWP</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#isConfirmed <em>Confirmed</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getCost <em>Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getCostRateTable <em>Cost Rate Table</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getCostVariance <em>Cost Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getCV <em>CV</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getDelay <em>Delay</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getFinish <em>Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getFinishVariance <em>Finish Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getHyperlink <em>Hyperlink</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getHyperlinkAddress <em>Hyperlink Address</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getHyperlinkSubAddress <em>Hyperlink Sub Address</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getWorkVariance <em>Work Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#isHasFixedRateUnits <em>Has Fixed Rate Units</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#isFixedMaterial <em>Fixed Material</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getLevelingDelay <em>Leveling Delay</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getLevelingDelayFormat <em>Leveling Delay Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#isLinkedFields <em>Linked Fields</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#isMilestone <em>Milestone</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getNotes <em>Notes</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#isOverallocated <em>Overallocated</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getOvertimeCost <em>Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getOvertimeWork <em>Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getRegularWork <em>Regular Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getRemainingCost <em>Remaining Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getRemainingOvertimeCost <em>Remaining Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getRemainingOvertimeWork <em>Remaining Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getRemainingWork <em>Remaining Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#isResponsePending <em>Response Pending</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getStop <em>Stop</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getResume <em>Resume</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getStartVariance <em>Start Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getUnits <em>Units</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#isUpdateNeeded <em>Update Needed</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getVAC <em>VAC</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getWork <em>Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getWorkContour <em>Work Contour</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getBCWS <em>BCWS</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getBCWP <em>BCWP</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getBookingType <em>Booking Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getActualWorkProtected <em>Actual Work Protected</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getActualOvertimeWorkProtected <em>Actual Overtime Work Protected</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getCreationDate <em>Creation Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getExtendedAttribute <em>Extended Attribute</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getBaseline <em>Baseline</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentImpl#getTimephasedData <em>Timephased Data</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AssignmentImpl extends EObjectImpl implements Assignment {
-	/**
-	 * The default value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger uID = UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTaskUID() <em>Task UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaskUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger TASK_UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTaskUID() <em>Task UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaskUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger taskUID = TASK_UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getResourceUID() <em>Resource UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger RESOURCE_UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceUID() <em>Resource UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger resourceUID = RESOURCE_UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPercentWorkComplete() <em>Percent Work Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPercentWorkComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger PERCENT_WORK_COMPLETE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPercentWorkComplete() <em>Percent Work Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPercentWorkComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger percentWorkComplete = PERCENT_WORK_COMPLETE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualCost() <em>Actual Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal ACTUAL_COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualCost() <em>Actual Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal actualCost = ACTUAL_COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualFinish() <em>Actual Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_FINISH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualFinish() <em>Actual Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualFinish = ACTUAL_FINISH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualOvertimeCost() <em>Actual Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal ACTUAL_OVERTIME_COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualOvertimeCost() <em>Actual Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal actualOvertimeCost = ACTUAL_OVERTIME_COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualOvertimeWork() <em>Actual Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_OVERTIME_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualOvertimeWork() <em>Actual Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualOvertimeWork = ACTUAL_OVERTIME_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualStart() <em>Actual Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_START_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualStart() <em>Actual Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualStart = ACTUAL_START_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualWork() <em>Actual Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualWork() <em>Actual Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualWork = ACTUAL_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getACWP() <em>ACWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getACWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float ACWP_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getACWP() <em>ACWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getACWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected float aCWP = ACWP_EDEFAULT;
-
-	/**
-	 * This is true if the ACWP attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean aCWPESet = false;
-
-	/**
-	 * The default value of the '{@link #isConfirmed() <em>Confirmed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isConfirmed()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CONFIRMED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isConfirmed() <em>Confirmed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isConfirmed()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean confirmed = CONFIRMED_EDEFAULT;
-
-	/**
-	 * This is true if the Confirmed attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean confirmedESet = false;
-
-	/**
-	 * The default value of the '{@link #getCost() <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCost() <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal cost = COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCostRateTable() <em>Cost Rate Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCostRateTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger COST_RATE_TABLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCostRateTable() <em>Cost Rate Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCostRateTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger costRateTable = COST_RATE_TABLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCostVariance() <em>Cost Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCostVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float COST_VARIANCE_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getCostVariance() <em>Cost Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCostVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected float costVariance = COST_VARIANCE_EDEFAULT;
-
-	/**
-	 * This is true if the Cost Variance attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean costVarianceESet = false;
-
-	/**
-	 * The default value of the '{@link #getCV() <em>CV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCV()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float CV_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getCV() <em>CV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCV()
-	 * @generated
-	 * @ordered
-	 */
-	protected float cV = CV_EDEFAULT;
-
-	/**
-	 * This is true if the CV attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean cVESet = false;
-
-	/**
-	 * The default value of the '{@link #getDelay() <em>Delay</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDelay()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger DELAY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDelay() <em>Delay</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDelay()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger delay = DELAY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFinish() <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object FINISH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFinish() <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object finish = FINISH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFinishVariance() <em>Finish Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinishVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger FINISH_VARIANCE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFinishVariance() <em>Finish Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinishVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger finishVariance = FINISH_VARIANCE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHyperlink() <em>Hyperlink</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HYPERLINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHyperlink() <em>Hyperlink</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlink()
-	 * @generated
-	 * @ordered
-	 */
-	protected String hyperlink = HYPERLINK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHyperlinkAddress() <em>Hyperlink Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlinkAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HYPERLINK_ADDRESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHyperlinkAddress() <em>Hyperlink Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlinkAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected String hyperlinkAddress = HYPERLINK_ADDRESS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHyperlinkSubAddress() <em>Hyperlink Sub Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlinkSubAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HYPERLINK_SUB_ADDRESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHyperlinkSubAddress() <em>Hyperlink Sub Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlinkSubAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected String hyperlinkSubAddress = HYPERLINK_SUB_ADDRESS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWorkVariance() <em>Work Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float WORK_VARIANCE_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getWorkVariance() <em>Work Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected float workVariance = WORK_VARIANCE_EDEFAULT;
-
-	/**
-	 * This is true if the Work Variance attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean workVarianceESet = false;
-
-	/**
-	 * The default value of the '{@link #isHasFixedRateUnits() <em>Has Fixed Rate Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHasFixedRateUnits()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean HAS_FIXED_RATE_UNITS_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isHasFixedRateUnits() <em>Has Fixed Rate Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHasFixedRateUnits()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean hasFixedRateUnits = HAS_FIXED_RATE_UNITS_EDEFAULT;
-
-	/**
-	 * This is true if the Has Fixed Rate Units attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean hasFixedRateUnitsESet = false;
-
-	/**
-	 * The default value of the '{@link #isFixedMaterial() <em>Fixed Material</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFixedMaterial()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean FIXED_MATERIAL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isFixedMaterial() <em>Fixed Material</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFixedMaterial()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean fixedMaterial = FIXED_MATERIAL_EDEFAULT;
-
-	/**
-	 * This is true if the Fixed Material attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean fixedMaterialESet = false;
-
-	/**
-	 * The default value of the '{@link #getLevelingDelay() <em>Leveling Delay</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevelingDelay()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger LEVELING_DELAY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLevelingDelay() <em>Leveling Delay</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevelingDelay()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger levelingDelay = LEVELING_DELAY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLevelingDelayFormat() <em>Leveling Delay Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevelingDelayFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger LEVELING_DELAY_FORMAT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLevelingDelayFormat() <em>Leveling Delay Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevelingDelayFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger levelingDelayFormat = LEVELING_DELAY_FORMAT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isLinkedFields() <em>Linked Fields</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isLinkedFields()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean LINKED_FIELDS_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isLinkedFields() <em>Linked Fields</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isLinkedFields()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean linkedFields = LINKED_FIELDS_EDEFAULT;
-
-	/**
-	 * This is true if the Linked Fields attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean linkedFieldsESet = false;
-
-	/**
-	 * The default value of the '{@link #isMilestone() <em>Milestone</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMilestone()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MILESTONE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isMilestone() <em>Milestone</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMilestone()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean milestone = MILESTONE_EDEFAULT;
-
-	/**
-	 * This is true if the Milestone attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean milestoneESet = false;
-
-	/**
-	 * The default value of the '{@link #getNotes() <em>Notes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNotes()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NOTES_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNotes() <em>Notes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNotes()
-	 * @generated
-	 * @ordered
-	 */
-	protected String notes = NOTES_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isOverallocated() <em>Overallocated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isOverallocated()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean OVERALLOCATED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isOverallocated() <em>Overallocated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isOverallocated()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean overallocated = OVERALLOCATED_EDEFAULT;
-
-	/**
-	 * This is true if the Overallocated attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean overallocatedESet = false;
-
-	/**
-	 * The default value of the '{@link #getOvertimeCost() <em>Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal OVERTIME_COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOvertimeCost() <em>Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal overtimeCost = OVERTIME_COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOvertimeWork() <em>Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object OVERTIME_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOvertimeWork() <em>Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object overtimeWork = OVERTIME_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRegularWork() <em>Regular Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRegularWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object REGULAR_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRegularWork() <em>Regular Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRegularWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object regularWork = REGULAR_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemainingCost() <em>Remaining Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal REMAINING_COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemainingCost() <em>Remaining Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal remainingCost = REMAINING_COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemainingOvertimeCost() <em>Remaining Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal REMAINING_OVERTIME_COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemainingOvertimeCost() <em>Remaining Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal remainingOvertimeCost = REMAINING_OVERTIME_COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemainingOvertimeWork() <em>Remaining Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object REMAINING_OVERTIME_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemainingOvertimeWork() <em>Remaining Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object remainingOvertimeWork = REMAINING_OVERTIME_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemainingWork() <em>Remaining Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object REMAINING_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemainingWork() <em>Remaining Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object remainingWork = REMAINING_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isResponsePending() <em>Response Pending</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isResponsePending()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean RESPONSE_PENDING_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isResponsePending() <em>Response Pending</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isResponsePending()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean responsePending = RESPONSE_PENDING_EDEFAULT;
-
-	/**
-	 * This is true if the Response Pending attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean responsePendingESet = false;
-
-	/**
-	 * The default value of the '{@link #getStart() <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object START_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStart() <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object start = START_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStop() <em>Stop</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStop()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object STOP_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStop() <em>Stop</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStop()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object stop = STOP_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getResume() <em>Resume</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResume()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object RESUME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getResume() <em>Resume</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResume()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object resume = RESUME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStartVariance() <em>Start Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStartVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger START_VARIANCE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStartVariance() <em>Start Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStartVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger startVariance = START_VARIANCE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getUnits() <em>Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnits()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float UNITS_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getUnits() <em>Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnits()
-	 * @generated
-	 * @ordered
-	 */
-	protected float units = UNITS_EDEFAULT;
-
-	/**
-	 * This is true if the Units attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean unitsESet = false;
-
-	/**
-	 * The default value of the '{@link #isUpdateNeeded() <em>Update Needed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isUpdateNeeded()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean UPDATE_NEEDED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isUpdateNeeded() <em>Update Needed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isUpdateNeeded()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean updateNeeded = UPDATE_NEEDED_EDEFAULT;
-
-	/**
-	 * This is true if the Update Needed attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean updateNeededESet = false;
-
-	/**
-	 * The default value of the '{@link #getVAC() <em>VAC</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVAC()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float VAC_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getVAC() <em>VAC</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVAC()
-	 * @generated
-	 * @ordered
-	 */
-	protected float vAC = VAC_EDEFAULT;
-
-	/**
-	 * This is true if the VAC attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean vACESet = false;
-
-	/**
-	 * The default value of the '{@link #getWork() <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWork() <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object work = WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWorkContour() <em>Work Contour</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkContour()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger WORK_CONTOUR_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWorkContour() <em>Work Contour</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkContour()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger workContour = WORK_CONTOUR_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getBCWS() <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWS()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float BCWS_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getBCWS() <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWS()
-	 * @generated
-	 * @ordered
-	 */
-	protected float bCWS = BCWS_EDEFAULT;
-
-	/**
-	 * This is true if the BCWS attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean bCWSESet = false;
-
-	/**
-	 * The default value of the '{@link #getBCWP() <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float BCWP_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getBCWP() <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected float bCWP = BCWP_EDEFAULT;
-
-	/**
-	 * This is true if the BCWP attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean bCWPESet = false;
-
-	/**
-	 * The default value of the '{@link #getBookingType() <em>Booking Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBookingType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger BOOKING_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getBookingType() <em>Booking Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBookingType()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger bookingType = BOOKING_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualWorkProtected() <em>Actual Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualWorkProtected()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_WORK_PROTECTED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualWorkProtected() <em>Actual Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualWorkProtected()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualWorkProtected = ACTUAL_WORK_PROTECTED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualOvertimeWorkProtected() <em>Actual Overtime Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeWorkProtected()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_OVERTIME_WORK_PROTECTED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualOvertimeWorkProtected() <em>Actual Overtime Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeWorkProtected()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualOvertimeWorkProtected = ACTUAL_OVERTIME_WORK_PROTECTED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCreationDate() <em>Creation Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object CREATION_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCreationDate() <em>Creation Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object creationDate = CREATION_DATE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExtendedAttribute() <em>Extended Attribute</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList extendedAttribute = null;
-
-	/**
-	 * The cached value of the '{@link #getBaseline() <em>Baseline</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBaseline()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList baseline = null;
-
-	/**
-	 * The cached value of the '{@link #getTimephasedData() <em>Timephased Data</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTimephasedData()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList timephasedData = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AssignmentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getAssignment();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getUID() {
-		return uID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUID(BigInteger newUID) {
-		BigInteger oldUID = uID;
-		uID = newUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__UID, oldUID, uID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getTaskUID() {
-		return taskUID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTaskUID(BigInteger newTaskUID) {
-		BigInteger oldTaskUID = taskUID;
-		taskUID = newTaskUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__TASK_UID, oldTaskUID, taskUID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getResourceUID() {
-		return resourceUID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResourceUID(BigInteger newResourceUID) {
-		BigInteger oldResourceUID = resourceUID;
-		resourceUID = newResourceUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__RESOURCE_UID, oldResourceUID, resourceUID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getPercentWorkComplete() {
-		return percentWorkComplete;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPercentWorkComplete(BigInteger newPercentWorkComplete) {
-		BigInteger oldPercentWorkComplete = percentWorkComplete;
-		percentWorkComplete = newPercentWorkComplete;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__PERCENT_WORK_COMPLETE, oldPercentWorkComplete, percentWorkComplete));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getActualCost() {
-		return actualCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualCost(BigDecimal newActualCost) {
-		BigDecimal oldActualCost = actualCost;
-		actualCost = newActualCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__ACTUAL_COST, oldActualCost, actualCost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualFinish() {
-		return actualFinish;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualFinish(Object newActualFinish) {
-		Object oldActualFinish = actualFinish;
-		actualFinish = newActualFinish;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__ACTUAL_FINISH, oldActualFinish, actualFinish));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getActualOvertimeCost() {
-		return actualOvertimeCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualOvertimeCost(BigDecimal newActualOvertimeCost) {
-		BigDecimal oldActualOvertimeCost = actualOvertimeCost;
-		actualOvertimeCost = newActualOvertimeCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__ACTUAL_OVERTIME_COST, oldActualOvertimeCost, actualOvertimeCost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualOvertimeWork() {
-		return actualOvertimeWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualOvertimeWork(Object newActualOvertimeWork) {
-		Object oldActualOvertimeWork = actualOvertimeWork;
-		actualOvertimeWork = newActualOvertimeWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__ACTUAL_OVERTIME_WORK, oldActualOvertimeWork, actualOvertimeWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualStart() {
-		return actualStart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualStart(Object newActualStart) {
-		Object oldActualStart = actualStart;
-		actualStart = newActualStart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__ACTUAL_START, oldActualStart, actualStart));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualWork() {
-		return actualWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualWork(Object newActualWork) {
-		Object oldActualWork = actualWork;
-		actualWork = newActualWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__ACTUAL_WORK, oldActualWork, actualWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getACWP() {
-		return aCWP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setACWP(float newACWP) {
-		float oldACWP = aCWP;
-		aCWP = newACWP;
-		boolean oldACWPESet = aCWPESet;
-		aCWPESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__ACWP, oldACWP, aCWP, !oldACWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetACWP() {
-		float oldACWP = aCWP;
-		boolean oldACWPESet = aCWPESet;
-		aCWP = ACWP_EDEFAULT;
-		aCWPESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__ACWP, oldACWP, ACWP_EDEFAULT, oldACWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetACWP() {
-		return aCWPESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isConfirmed() {
-		return confirmed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConfirmed(boolean newConfirmed) {
-		boolean oldConfirmed = confirmed;
-		confirmed = newConfirmed;
-		boolean oldConfirmedESet = confirmedESet;
-		confirmedESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__CONFIRMED, oldConfirmed, confirmed, !oldConfirmedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetConfirmed() {
-		boolean oldConfirmed = confirmed;
-		boolean oldConfirmedESet = confirmedESet;
-		confirmed = CONFIRMED_EDEFAULT;
-		confirmedESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__CONFIRMED, oldConfirmed, CONFIRMED_EDEFAULT, oldConfirmedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetConfirmed() {
-		return confirmedESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getCost() {
-		return cost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCost(BigDecimal newCost) {
-		BigDecimal oldCost = cost;
-		cost = newCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__COST, oldCost, cost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getCostRateTable() {
-		return costRateTable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCostRateTable(BigInteger newCostRateTable) {
-		BigInteger oldCostRateTable = costRateTable;
-		costRateTable = newCostRateTable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__COST_RATE_TABLE, oldCostRateTable, costRateTable));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getCostVariance() {
-		return costVariance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCostVariance(float newCostVariance) {
-		float oldCostVariance = costVariance;
-		costVariance = newCostVariance;
-		boolean oldCostVarianceESet = costVarianceESet;
-		costVarianceESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__COST_VARIANCE, oldCostVariance, costVariance, !oldCostVarianceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetCostVariance() {
-		float oldCostVariance = costVariance;
-		boolean oldCostVarianceESet = costVarianceESet;
-		costVariance = COST_VARIANCE_EDEFAULT;
-		costVarianceESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__COST_VARIANCE, oldCostVariance, COST_VARIANCE_EDEFAULT, oldCostVarianceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetCostVariance() {
-		return costVarianceESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getCV() {
-		return cV;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCV(float newCV) {
-		float oldCV = cV;
-		cV = newCV;
-		boolean oldCVESet = cVESet;
-		cVESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__CV, oldCV, cV, !oldCVESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetCV() {
-		float oldCV = cV;
-		boolean oldCVESet = cVESet;
-		cV = CV_EDEFAULT;
-		cVESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__CV, oldCV, CV_EDEFAULT, oldCVESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetCV() {
-		return cVESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getDelay() {
-		return delay;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDelay(BigInteger newDelay) {
-		BigInteger oldDelay = delay;
-		delay = newDelay;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__DELAY, oldDelay, delay));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getFinish() {
-		return finish;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinish(Object newFinish) {
-		Object oldFinish = finish;
-		finish = newFinish;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__FINISH, oldFinish, finish));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getFinishVariance() {
-		return finishVariance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinishVariance(BigInteger newFinishVariance) {
-		BigInteger oldFinishVariance = finishVariance;
-		finishVariance = newFinishVariance;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__FINISH_VARIANCE, oldFinishVariance, finishVariance));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHyperlink() {
-		return hyperlink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHyperlink(String newHyperlink) {
-		String oldHyperlink = hyperlink;
-		hyperlink = newHyperlink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__HYPERLINK, oldHyperlink, hyperlink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHyperlinkAddress() {
-		return hyperlinkAddress;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHyperlinkAddress(String newHyperlinkAddress) {
-		String oldHyperlinkAddress = hyperlinkAddress;
-		hyperlinkAddress = newHyperlinkAddress;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__HYPERLINK_ADDRESS, oldHyperlinkAddress, hyperlinkAddress));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHyperlinkSubAddress() {
-		return hyperlinkSubAddress;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHyperlinkSubAddress(String newHyperlinkSubAddress) {
-		String oldHyperlinkSubAddress = hyperlinkSubAddress;
-		hyperlinkSubAddress = newHyperlinkSubAddress;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__HYPERLINK_SUB_ADDRESS, oldHyperlinkSubAddress, hyperlinkSubAddress));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getWorkVariance() {
-		return workVariance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWorkVariance(float newWorkVariance) {
-		float oldWorkVariance = workVariance;
-		workVariance = newWorkVariance;
-		boolean oldWorkVarianceESet = workVarianceESet;
-		workVarianceESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__WORK_VARIANCE, oldWorkVariance, workVariance, !oldWorkVarianceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetWorkVariance() {
-		float oldWorkVariance = workVariance;
-		boolean oldWorkVarianceESet = workVarianceESet;
-		workVariance = WORK_VARIANCE_EDEFAULT;
-		workVarianceESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__WORK_VARIANCE, oldWorkVariance, WORK_VARIANCE_EDEFAULT, oldWorkVarianceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetWorkVariance() {
-		return workVarianceESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isHasFixedRateUnits() {
-		return hasFixedRateUnits;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHasFixedRateUnits(boolean newHasFixedRateUnits) {
-		boolean oldHasFixedRateUnits = hasFixedRateUnits;
-		hasFixedRateUnits = newHasFixedRateUnits;
-		boolean oldHasFixedRateUnitsESet = hasFixedRateUnitsESet;
-		hasFixedRateUnitsESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__HAS_FIXED_RATE_UNITS, oldHasFixedRateUnits, hasFixedRateUnits, !oldHasFixedRateUnitsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetHasFixedRateUnits() {
-		boolean oldHasFixedRateUnits = hasFixedRateUnits;
-		boolean oldHasFixedRateUnitsESet = hasFixedRateUnitsESet;
-		hasFixedRateUnits = HAS_FIXED_RATE_UNITS_EDEFAULT;
-		hasFixedRateUnitsESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__HAS_FIXED_RATE_UNITS, oldHasFixedRateUnits, HAS_FIXED_RATE_UNITS_EDEFAULT, oldHasFixedRateUnitsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetHasFixedRateUnits() {
-		return hasFixedRateUnitsESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isFixedMaterial() {
-		return fixedMaterial;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFixedMaterial(boolean newFixedMaterial) {
-		boolean oldFixedMaterial = fixedMaterial;
-		fixedMaterial = newFixedMaterial;
-		boolean oldFixedMaterialESet = fixedMaterialESet;
-		fixedMaterialESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__FIXED_MATERIAL, oldFixedMaterial, fixedMaterial, !oldFixedMaterialESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetFixedMaterial() {
-		boolean oldFixedMaterial = fixedMaterial;
-		boolean oldFixedMaterialESet = fixedMaterialESet;
-		fixedMaterial = FIXED_MATERIAL_EDEFAULT;
-		fixedMaterialESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__FIXED_MATERIAL, oldFixedMaterial, FIXED_MATERIAL_EDEFAULT, oldFixedMaterialESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetFixedMaterial() {
-		return fixedMaterialESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getLevelingDelay() {
-		return levelingDelay;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLevelingDelay(BigInteger newLevelingDelay) {
-		BigInteger oldLevelingDelay = levelingDelay;
-		levelingDelay = newLevelingDelay;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__LEVELING_DELAY, oldLevelingDelay, levelingDelay));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getLevelingDelayFormat() {
-		return levelingDelayFormat;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLevelingDelayFormat(BigInteger newLevelingDelayFormat) {
-		BigInteger oldLevelingDelayFormat = levelingDelayFormat;
-		levelingDelayFormat = newLevelingDelayFormat;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__LEVELING_DELAY_FORMAT, oldLevelingDelayFormat, levelingDelayFormat));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isLinkedFields() {
-		return linkedFields;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLinkedFields(boolean newLinkedFields) {
-		boolean oldLinkedFields = linkedFields;
-		linkedFields = newLinkedFields;
-		boolean oldLinkedFieldsESet = linkedFieldsESet;
-		linkedFieldsESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__LINKED_FIELDS, oldLinkedFields, linkedFields, !oldLinkedFieldsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetLinkedFields() {
-		boolean oldLinkedFields = linkedFields;
-		boolean oldLinkedFieldsESet = linkedFieldsESet;
-		linkedFields = LINKED_FIELDS_EDEFAULT;
-		linkedFieldsESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__LINKED_FIELDS, oldLinkedFields, LINKED_FIELDS_EDEFAULT, oldLinkedFieldsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetLinkedFields() {
-		return linkedFieldsESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMilestone() {
-		return milestone;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMilestone(boolean newMilestone) {
-		boolean oldMilestone = milestone;
-		milestone = newMilestone;
-		boolean oldMilestoneESet = milestoneESet;
-		milestoneESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__MILESTONE, oldMilestone, milestone, !oldMilestoneESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMilestone() {
-		boolean oldMilestone = milestone;
-		boolean oldMilestoneESet = milestoneESet;
-		milestone = MILESTONE_EDEFAULT;
-		milestoneESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__MILESTONE, oldMilestone, MILESTONE_EDEFAULT, oldMilestoneESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMilestone() {
-		return milestoneESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getNotes() {
-		return notes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNotes(String newNotes) {
-		String oldNotes = notes;
-		notes = newNotes;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__NOTES, oldNotes, notes));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isOverallocated() {
-		return overallocated;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOverallocated(boolean newOverallocated) {
-		boolean oldOverallocated = overallocated;
-		overallocated = newOverallocated;
-		boolean oldOverallocatedESet = overallocatedESet;
-		overallocatedESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__OVERALLOCATED, oldOverallocated, overallocated, !oldOverallocatedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetOverallocated() {
-		boolean oldOverallocated = overallocated;
-		boolean oldOverallocatedESet = overallocatedESet;
-		overallocated = OVERALLOCATED_EDEFAULT;
-		overallocatedESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__OVERALLOCATED, oldOverallocated, OVERALLOCATED_EDEFAULT, oldOverallocatedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetOverallocated() {
-		return overallocatedESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getOvertimeCost() {
-		return overtimeCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOvertimeCost(BigDecimal newOvertimeCost) {
-		BigDecimal oldOvertimeCost = overtimeCost;
-		overtimeCost = newOvertimeCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__OVERTIME_COST, oldOvertimeCost, overtimeCost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getOvertimeWork() {
-		return overtimeWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOvertimeWork(Object newOvertimeWork) {
-		Object oldOvertimeWork = overtimeWork;
-		overtimeWork = newOvertimeWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__OVERTIME_WORK, oldOvertimeWork, overtimeWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getRegularWork() {
-		return regularWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRegularWork(Object newRegularWork) {
-		Object oldRegularWork = regularWork;
-		regularWork = newRegularWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__REGULAR_WORK, oldRegularWork, regularWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getRemainingCost() {
-		return remainingCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemainingCost(BigDecimal newRemainingCost) {
-		BigDecimal oldRemainingCost = remainingCost;
-		remainingCost = newRemainingCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__REMAINING_COST, oldRemainingCost, remainingCost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getRemainingOvertimeCost() {
-		return remainingOvertimeCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemainingOvertimeCost(BigDecimal newRemainingOvertimeCost) {
-		BigDecimal oldRemainingOvertimeCost = remainingOvertimeCost;
-		remainingOvertimeCost = newRemainingOvertimeCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__REMAINING_OVERTIME_COST, oldRemainingOvertimeCost, remainingOvertimeCost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getRemainingOvertimeWork() {
-		return remainingOvertimeWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemainingOvertimeWork(Object newRemainingOvertimeWork) {
-		Object oldRemainingOvertimeWork = remainingOvertimeWork;
-		remainingOvertimeWork = newRemainingOvertimeWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__REMAINING_OVERTIME_WORK, oldRemainingOvertimeWork, remainingOvertimeWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getRemainingWork() {
-		return remainingWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemainingWork(Object newRemainingWork) {
-		Object oldRemainingWork = remainingWork;
-		remainingWork = newRemainingWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__REMAINING_WORK, oldRemainingWork, remainingWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isResponsePending() {
-		return responsePending;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResponsePending(boolean newResponsePending) {
-		boolean oldResponsePending = responsePending;
-		responsePending = newResponsePending;
-		boolean oldResponsePendingESet = responsePendingESet;
-		responsePendingESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__RESPONSE_PENDING, oldResponsePending, responsePending, !oldResponsePendingESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetResponsePending() {
-		boolean oldResponsePending = responsePending;
-		boolean oldResponsePendingESet = responsePendingESet;
-		responsePending = RESPONSE_PENDING_EDEFAULT;
-		responsePendingESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__RESPONSE_PENDING, oldResponsePending, RESPONSE_PENDING_EDEFAULT, oldResponsePendingESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetResponsePending() {
-		return responsePendingESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getStart() {
-		return start;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStart(Object newStart) {
-		Object oldStart = start;
-		start = newStart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__START, oldStart, start));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getStop() {
-		return stop;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStop(Object newStop) {
-		Object oldStop = stop;
-		stop = newStop;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__STOP, oldStop, stop));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getResume() {
-		return resume;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResume(Object newResume) {
-		Object oldResume = resume;
-		resume = newResume;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__RESUME, oldResume, resume));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getStartVariance() {
-		return startVariance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStartVariance(BigInteger newStartVariance) {
-		BigInteger oldStartVariance = startVariance;
-		startVariance = newStartVariance;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__START_VARIANCE, oldStartVariance, startVariance));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getUnits() {
-		return units;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUnits(float newUnits) {
-		float oldUnits = units;
-		units = newUnits;
-		boolean oldUnitsESet = unitsESet;
-		unitsESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__UNITS, oldUnits, units, !oldUnitsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetUnits() {
-		float oldUnits = units;
-		boolean oldUnitsESet = unitsESet;
-		units = UNITS_EDEFAULT;
-		unitsESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__UNITS, oldUnits, UNITS_EDEFAULT, oldUnitsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetUnits() {
-		return unitsESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isUpdateNeeded() {
-		return updateNeeded;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUpdateNeeded(boolean newUpdateNeeded) {
-		boolean oldUpdateNeeded = updateNeeded;
-		updateNeeded = newUpdateNeeded;
-		boolean oldUpdateNeededESet = updateNeededESet;
-		updateNeededESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__UPDATE_NEEDED, oldUpdateNeeded, updateNeeded, !oldUpdateNeededESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetUpdateNeeded() {
-		boolean oldUpdateNeeded = updateNeeded;
-		boolean oldUpdateNeededESet = updateNeededESet;
-		updateNeeded = UPDATE_NEEDED_EDEFAULT;
-		updateNeededESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__UPDATE_NEEDED, oldUpdateNeeded, UPDATE_NEEDED_EDEFAULT, oldUpdateNeededESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetUpdateNeeded() {
-		return updateNeededESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getVAC() {
-		return vAC;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVAC(float newVAC) {
-		float oldVAC = vAC;
-		vAC = newVAC;
-		boolean oldVACESet = vACESet;
-		vACESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__VAC, oldVAC, vAC, !oldVACESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetVAC() {
-		float oldVAC = vAC;
-		boolean oldVACESet = vACESet;
-		vAC = VAC_EDEFAULT;
-		vACESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__VAC, oldVAC, VAC_EDEFAULT, oldVACESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetVAC() {
-		return vACESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getWork() {
-		return work;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWork(Object newWork) {
-		Object oldWork = work;
-		work = newWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__WORK, oldWork, work));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getWorkContour() {
-		return workContour;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWorkContour(BigInteger newWorkContour) {
-		BigInteger oldWorkContour = workContour;
-		workContour = newWorkContour;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__WORK_CONTOUR, oldWorkContour, workContour));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getBCWS() {
-		return bCWS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBCWS(float newBCWS) {
-		float oldBCWS = bCWS;
-		bCWS = newBCWS;
-		boolean oldBCWSESet = bCWSESet;
-		bCWSESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__BCWS, oldBCWS, bCWS, !oldBCWSESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBCWS() {
-		float oldBCWS = bCWS;
-		boolean oldBCWSESet = bCWSESet;
-		bCWS = BCWS_EDEFAULT;
-		bCWSESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__BCWS, oldBCWS, BCWS_EDEFAULT, oldBCWSESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBCWS() {
-		return bCWSESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getBCWP() {
-		return bCWP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBCWP(float newBCWP) {
-		float oldBCWP = bCWP;
-		bCWP = newBCWP;
-		boolean oldBCWPESet = bCWPESet;
-		bCWPESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__BCWP, oldBCWP, bCWP, !oldBCWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBCWP() {
-		float oldBCWP = bCWP;
-		boolean oldBCWPESet = bCWPESet;
-		bCWP = BCWP_EDEFAULT;
-		bCWPESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.ASSIGNMENT__BCWP, oldBCWP, BCWP_EDEFAULT, oldBCWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBCWP() {
-		return bCWPESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getBookingType() {
-		return bookingType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBookingType(BigInteger newBookingType) {
-		BigInteger oldBookingType = bookingType;
-		bookingType = newBookingType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__BOOKING_TYPE, oldBookingType, bookingType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualWorkProtected() {
-		return actualWorkProtected;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualWorkProtected(Object newActualWorkProtected) {
-		Object oldActualWorkProtected = actualWorkProtected;
-		actualWorkProtected = newActualWorkProtected;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__ACTUAL_WORK_PROTECTED, oldActualWorkProtected, actualWorkProtected));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualOvertimeWorkProtected() {
-		return actualOvertimeWorkProtected;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualOvertimeWorkProtected(Object newActualOvertimeWorkProtected) {
-		Object oldActualOvertimeWorkProtected = actualOvertimeWorkProtected;
-		actualOvertimeWorkProtected = newActualOvertimeWorkProtected;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__ACTUAL_OVERTIME_WORK_PROTECTED, oldActualOvertimeWorkProtected, actualOvertimeWorkProtected));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getCreationDate() {
-		return creationDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCreationDate(Object newCreationDate) {
-		Object oldCreationDate = creationDate;
-		creationDate = newCreationDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.ASSIGNMENT__CREATION_DATE, oldCreationDate, creationDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getExtendedAttribute() {
-		if (extendedAttribute == null) {
-			extendedAttribute = new EObjectContainmentEList(ExtendedAttribute4.class, this, MsprojectPackage.ASSIGNMENT__EXTENDED_ATTRIBUTE);
-		}
-		return extendedAttribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getBaseline() {
-		if (baseline == null) {
-			baseline = new EObjectContainmentEList(Baseline3.class, this, MsprojectPackage.ASSIGNMENT__BASELINE);
-		}
-		return baseline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTimephasedData() {
-		if (timephasedData == null) {
-			timephasedData = new EObjectContainmentEList(TimephasedDataType.class, this, MsprojectPackage.ASSIGNMENT__TIMEPHASED_DATA);
-		}
-		return timephasedData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.ASSIGNMENT__EXTENDED_ATTRIBUTE:
-					return ((InternalEList)getExtendedAttribute()).basicRemove(otherEnd, msgs);
-				case MsprojectPackage.ASSIGNMENT__BASELINE:
-					return ((InternalEList)getBaseline()).basicRemove(otherEnd, msgs);
-				case MsprojectPackage.ASSIGNMENT__TIMEPHASED_DATA:
-					return ((InternalEList)getTimephasedData()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.ASSIGNMENT__UID:
-				return getUID();
-			case MsprojectPackage.ASSIGNMENT__TASK_UID:
-				return getTaskUID();
-			case MsprojectPackage.ASSIGNMENT__RESOURCE_UID:
-				return getResourceUID();
-			case MsprojectPackage.ASSIGNMENT__PERCENT_WORK_COMPLETE:
-				return getPercentWorkComplete();
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_COST:
-				return getActualCost();
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_FINISH:
-				return getActualFinish();
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_OVERTIME_COST:
-				return getActualOvertimeCost();
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_OVERTIME_WORK:
-				return getActualOvertimeWork();
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_START:
-				return getActualStart();
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_WORK:
-				return getActualWork();
-			case MsprojectPackage.ASSIGNMENT__ACWP:
-				return new Float(getACWP());
-			case MsprojectPackage.ASSIGNMENT__CONFIRMED:
-				return isConfirmed() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.ASSIGNMENT__COST:
-				return getCost();
-			case MsprojectPackage.ASSIGNMENT__COST_RATE_TABLE:
-				return getCostRateTable();
-			case MsprojectPackage.ASSIGNMENT__COST_VARIANCE:
-				return new Float(getCostVariance());
-			case MsprojectPackage.ASSIGNMENT__CV:
-				return new Float(getCV());
-			case MsprojectPackage.ASSIGNMENT__DELAY:
-				return getDelay();
-			case MsprojectPackage.ASSIGNMENT__FINISH:
-				return getFinish();
-			case MsprojectPackage.ASSIGNMENT__FINISH_VARIANCE:
-				return getFinishVariance();
-			case MsprojectPackage.ASSIGNMENT__HYPERLINK:
-				return getHyperlink();
-			case MsprojectPackage.ASSIGNMENT__HYPERLINK_ADDRESS:
-				return getHyperlinkAddress();
-			case MsprojectPackage.ASSIGNMENT__HYPERLINK_SUB_ADDRESS:
-				return getHyperlinkSubAddress();
-			case MsprojectPackage.ASSIGNMENT__WORK_VARIANCE:
-				return new Float(getWorkVariance());
-			case MsprojectPackage.ASSIGNMENT__HAS_FIXED_RATE_UNITS:
-				return isHasFixedRateUnits() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.ASSIGNMENT__FIXED_MATERIAL:
-				return isFixedMaterial() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.ASSIGNMENT__LEVELING_DELAY:
-				return getLevelingDelay();
-			case MsprojectPackage.ASSIGNMENT__LEVELING_DELAY_FORMAT:
-				return getLevelingDelayFormat();
-			case MsprojectPackage.ASSIGNMENT__LINKED_FIELDS:
-				return isLinkedFields() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.ASSIGNMENT__MILESTONE:
-				return isMilestone() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.ASSIGNMENT__NOTES:
-				return getNotes();
-			case MsprojectPackage.ASSIGNMENT__OVERALLOCATED:
-				return isOverallocated() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.ASSIGNMENT__OVERTIME_COST:
-				return getOvertimeCost();
-			case MsprojectPackage.ASSIGNMENT__OVERTIME_WORK:
-				return getOvertimeWork();
-			case MsprojectPackage.ASSIGNMENT__REGULAR_WORK:
-				return getRegularWork();
-			case MsprojectPackage.ASSIGNMENT__REMAINING_COST:
-				return getRemainingCost();
-			case MsprojectPackage.ASSIGNMENT__REMAINING_OVERTIME_COST:
-				return getRemainingOvertimeCost();
-			case MsprojectPackage.ASSIGNMENT__REMAINING_OVERTIME_WORK:
-				return getRemainingOvertimeWork();
-			case MsprojectPackage.ASSIGNMENT__REMAINING_WORK:
-				return getRemainingWork();
-			case MsprojectPackage.ASSIGNMENT__RESPONSE_PENDING:
-				return isResponsePending() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.ASSIGNMENT__START:
-				return getStart();
-			case MsprojectPackage.ASSIGNMENT__STOP:
-				return getStop();
-			case MsprojectPackage.ASSIGNMENT__RESUME:
-				return getResume();
-			case MsprojectPackage.ASSIGNMENT__START_VARIANCE:
-				return getStartVariance();
-			case MsprojectPackage.ASSIGNMENT__UNITS:
-				return new Float(getUnits());
-			case MsprojectPackage.ASSIGNMENT__UPDATE_NEEDED:
-				return isUpdateNeeded() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.ASSIGNMENT__VAC:
-				return new Float(getVAC());
-			case MsprojectPackage.ASSIGNMENT__WORK:
-				return getWork();
-			case MsprojectPackage.ASSIGNMENT__WORK_CONTOUR:
-				return getWorkContour();
-			case MsprojectPackage.ASSIGNMENT__BCWS:
-				return new Float(getBCWS());
-			case MsprojectPackage.ASSIGNMENT__BCWP:
-				return new Float(getBCWP());
-			case MsprojectPackage.ASSIGNMENT__BOOKING_TYPE:
-				return getBookingType();
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_WORK_PROTECTED:
-				return getActualWorkProtected();
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_OVERTIME_WORK_PROTECTED:
-				return getActualOvertimeWorkProtected();
-			case MsprojectPackage.ASSIGNMENT__CREATION_DATE:
-				return getCreationDate();
-			case MsprojectPackage.ASSIGNMENT__EXTENDED_ATTRIBUTE:
-				return getExtendedAttribute();
-			case MsprojectPackage.ASSIGNMENT__BASELINE:
-				return getBaseline();
-			case MsprojectPackage.ASSIGNMENT__TIMEPHASED_DATA:
-				return getTimephasedData();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.ASSIGNMENT__UID:
-				setUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__TASK_UID:
-				setTaskUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__RESOURCE_UID:
-				setResourceUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__PERCENT_WORK_COMPLETE:
-				setPercentWorkComplete((BigInteger)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_COST:
-				setActualCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_FINISH:
-				setActualFinish((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_OVERTIME_COST:
-				setActualOvertimeCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_OVERTIME_WORK:
-				setActualOvertimeWork((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_START:
-				setActualStart((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_WORK:
-				setActualWork((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACWP:
-				setACWP(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__CONFIRMED:
-				setConfirmed(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__COST:
-				setCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__COST_RATE_TABLE:
-				setCostRateTable((BigInteger)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__COST_VARIANCE:
-				setCostVariance(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__CV:
-				setCV(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__DELAY:
-				setDelay((BigInteger)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__FINISH:
-				setFinish((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__FINISH_VARIANCE:
-				setFinishVariance((BigInteger)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__HYPERLINK:
-				setHyperlink((String)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__HYPERLINK_ADDRESS:
-				setHyperlinkAddress((String)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__HYPERLINK_SUB_ADDRESS:
-				setHyperlinkSubAddress((String)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__WORK_VARIANCE:
-				setWorkVariance(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__HAS_FIXED_RATE_UNITS:
-				setHasFixedRateUnits(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__FIXED_MATERIAL:
-				setFixedMaterial(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__LEVELING_DELAY:
-				setLevelingDelay((BigInteger)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__LEVELING_DELAY_FORMAT:
-				setLevelingDelayFormat((BigInteger)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__LINKED_FIELDS:
-				setLinkedFields(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__MILESTONE:
-				setMilestone(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__NOTES:
-				setNotes((String)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__OVERALLOCATED:
-				setOverallocated(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__OVERTIME_COST:
-				setOvertimeCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__OVERTIME_WORK:
-				setOvertimeWork((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__REGULAR_WORK:
-				setRegularWork((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__REMAINING_COST:
-				setRemainingCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__REMAINING_OVERTIME_COST:
-				setRemainingOvertimeCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__REMAINING_OVERTIME_WORK:
-				setRemainingOvertimeWork((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__REMAINING_WORK:
-				setRemainingWork((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__RESPONSE_PENDING:
-				setResponsePending(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__START:
-				setStart((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__STOP:
-				setStop((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__RESUME:
-				setResume((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__START_VARIANCE:
-				setStartVariance((BigInteger)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__UNITS:
-				setUnits(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__UPDATE_NEEDED:
-				setUpdateNeeded(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__VAC:
-				setVAC(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__WORK:
-				setWork((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__WORK_CONTOUR:
-				setWorkContour((BigInteger)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__BCWS:
-				setBCWS(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__BCWP:
-				setBCWP(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.ASSIGNMENT__BOOKING_TYPE:
-				setBookingType((BigInteger)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_WORK_PROTECTED:
-				setActualWorkProtected((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_OVERTIME_WORK_PROTECTED:
-				setActualOvertimeWorkProtected((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__CREATION_DATE:
-				setCreationDate((Object)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__EXTENDED_ATTRIBUTE:
-				getExtendedAttribute().clear();
-				getExtendedAttribute().addAll((Collection)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__BASELINE:
-				getBaseline().clear();
-				getBaseline().addAll((Collection)newValue);
-				return;
-			case MsprojectPackage.ASSIGNMENT__TIMEPHASED_DATA:
-				getTimephasedData().clear();
-				getTimephasedData().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.ASSIGNMENT__UID:
-				setUID(UID_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__TASK_UID:
-				setTaskUID(TASK_UID_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__RESOURCE_UID:
-				setResourceUID(RESOURCE_UID_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__PERCENT_WORK_COMPLETE:
-				setPercentWorkComplete(PERCENT_WORK_COMPLETE_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_COST:
-				setActualCost(ACTUAL_COST_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_FINISH:
-				setActualFinish(ACTUAL_FINISH_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_OVERTIME_COST:
-				setActualOvertimeCost(ACTUAL_OVERTIME_COST_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_OVERTIME_WORK:
-				setActualOvertimeWork(ACTUAL_OVERTIME_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_START:
-				setActualStart(ACTUAL_START_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_WORK:
-				setActualWork(ACTUAL_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACWP:
-				unsetACWP();
-				return;
-			case MsprojectPackage.ASSIGNMENT__CONFIRMED:
-				unsetConfirmed();
-				return;
-			case MsprojectPackage.ASSIGNMENT__COST:
-				setCost(COST_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__COST_RATE_TABLE:
-				setCostRateTable(COST_RATE_TABLE_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__COST_VARIANCE:
-				unsetCostVariance();
-				return;
-			case MsprojectPackage.ASSIGNMENT__CV:
-				unsetCV();
-				return;
-			case MsprojectPackage.ASSIGNMENT__DELAY:
-				setDelay(DELAY_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__FINISH:
-				setFinish(FINISH_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__FINISH_VARIANCE:
-				setFinishVariance(FINISH_VARIANCE_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__HYPERLINK:
-				setHyperlink(HYPERLINK_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__HYPERLINK_ADDRESS:
-				setHyperlinkAddress(HYPERLINK_ADDRESS_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__HYPERLINK_SUB_ADDRESS:
-				setHyperlinkSubAddress(HYPERLINK_SUB_ADDRESS_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__WORK_VARIANCE:
-				unsetWorkVariance();
-				return;
-			case MsprojectPackage.ASSIGNMENT__HAS_FIXED_RATE_UNITS:
-				unsetHasFixedRateUnits();
-				return;
-			case MsprojectPackage.ASSIGNMENT__FIXED_MATERIAL:
-				unsetFixedMaterial();
-				return;
-			case MsprojectPackage.ASSIGNMENT__LEVELING_DELAY:
-				setLevelingDelay(LEVELING_DELAY_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__LEVELING_DELAY_FORMAT:
-				setLevelingDelayFormat(LEVELING_DELAY_FORMAT_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__LINKED_FIELDS:
-				unsetLinkedFields();
-				return;
-			case MsprojectPackage.ASSIGNMENT__MILESTONE:
-				unsetMilestone();
-				return;
-			case MsprojectPackage.ASSIGNMENT__NOTES:
-				setNotes(NOTES_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__OVERALLOCATED:
-				unsetOverallocated();
-				return;
-			case MsprojectPackage.ASSIGNMENT__OVERTIME_COST:
-				setOvertimeCost(OVERTIME_COST_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__OVERTIME_WORK:
-				setOvertimeWork(OVERTIME_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__REGULAR_WORK:
-				setRegularWork(REGULAR_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__REMAINING_COST:
-				setRemainingCost(REMAINING_COST_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__REMAINING_OVERTIME_COST:
-				setRemainingOvertimeCost(REMAINING_OVERTIME_COST_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__REMAINING_OVERTIME_WORK:
-				setRemainingOvertimeWork(REMAINING_OVERTIME_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__REMAINING_WORK:
-				setRemainingWork(REMAINING_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__RESPONSE_PENDING:
-				unsetResponsePending();
-				return;
-			case MsprojectPackage.ASSIGNMENT__START:
-				setStart(START_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__STOP:
-				setStop(STOP_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__RESUME:
-				setResume(RESUME_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__START_VARIANCE:
-				setStartVariance(START_VARIANCE_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__UNITS:
-				unsetUnits();
-				return;
-			case MsprojectPackage.ASSIGNMENT__UPDATE_NEEDED:
-				unsetUpdateNeeded();
-				return;
-			case MsprojectPackage.ASSIGNMENT__VAC:
-				unsetVAC();
-				return;
-			case MsprojectPackage.ASSIGNMENT__WORK:
-				setWork(WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__WORK_CONTOUR:
-				setWorkContour(WORK_CONTOUR_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__BCWS:
-				unsetBCWS();
-				return;
-			case MsprojectPackage.ASSIGNMENT__BCWP:
-				unsetBCWP();
-				return;
-			case MsprojectPackage.ASSIGNMENT__BOOKING_TYPE:
-				setBookingType(BOOKING_TYPE_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_WORK_PROTECTED:
-				setActualWorkProtected(ACTUAL_WORK_PROTECTED_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_OVERTIME_WORK_PROTECTED:
-				setActualOvertimeWorkProtected(ACTUAL_OVERTIME_WORK_PROTECTED_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__CREATION_DATE:
-				setCreationDate(CREATION_DATE_EDEFAULT);
-				return;
-			case MsprojectPackage.ASSIGNMENT__EXTENDED_ATTRIBUTE:
-				getExtendedAttribute().clear();
-				return;
-			case MsprojectPackage.ASSIGNMENT__BASELINE:
-				getBaseline().clear();
-				return;
-			case MsprojectPackage.ASSIGNMENT__TIMEPHASED_DATA:
-				getTimephasedData().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.ASSIGNMENT__UID:
-				return UID_EDEFAULT == null ? uID != null : !UID_EDEFAULT.equals(uID);
-			case MsprojectPackage.ASSIGNMENT__TASK_UID:
-				return TASK_UID_EDEFAULT == null ? taskUID != null : !TASK_UID_EDEFAULT.equals(taskUID);
-			case MsprojectPackage.ASSIGNMENT__RESOURCE_UID:
-				return RESOURCE_UID_EDEFAULT == null ? resourceUID != null : !RESOURCE_UID_EDEFAULT.equals(resourceUID);
-			case MsprojectPackage.ASSIGNMENT__PERCENT_WORK_COMPLETE:
-				return PERCENT_WORK_COMPLETE_EDEFAULT == null ? percentWorkComplete != null : !PERCENT_WORK_COMPLETE_EDEFAULT.equals(percentWorkComplete);
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_COST:
-				return ACTUAL_COST_EDEFAULT == null ? actualCost != null : !ACTUAL_COST_EDEFAULT.equals(actualCost);
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_FINISH:
-				return ACTUAL_FINISH_EDEFAULT == null ? actualFinish != null : !ACTUAL_FINISH_EDEFAULT.equals(actualFinish);
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_OVERTIME_COST:
-				return ACTUAL_OVERTIME_COST_EDEFAULT == null ? actualOvertimeCost != null : !ACTUAL_OVERTIME_COST_EDEFAULT.equals(actualOvertimeCost);
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_OVERTIME_WORK:
-				return ACTUAL_OVERTIME_WORK_EDEFAULT == null ? actualOvertimeWork != null : !ACTUAL_OVERTIME_WORK_EDEFAULT.equals(actualOvertimeWork);
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_START:
-				return ACTUAL_START_EDEFAULT == null ? actualStart != null : !ACTUAL_START_EDEFAULT.equals(actualStart);
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_WORK:
-				return ACTUAL_WORK_EDEFAULT == null ? actualWork != null : !ACTUAL_WORK_EDEFAULT.equals(actualWork);
-			case MsprojectPackage.ASSIGNMENT__ACWP:
-				return isSetACWP();
-			case MsprojectPackage.ASSIGNMENT__CONFIRMED:
-				return isSetConfirmed();
-			case MsprojectPackage.ASSIGNMENT__COST:
-				return COST_EDEFAULT == null ? cost != null : !COST_EDEFAULT.equals(cost);
-			case MsprojectPackage.ASSIGNMENT__COST_RATE_TABLE:
-				return COST_RATE_TABLE_EDEFAULT == null ? costRateTable != null : !COST_RATE_TABLE_EDEFAULT.equals(costRateTable);
-			case MsprojectPackage.ASSIGNMENT__COST_VARIANCE:
-				return isSetCostVariance();
-			case MsprojectPackage.ASSIGNMENT__CV:
-				return isSetCV();
-			case MsprojectPackage.ASSIGNMENT__DELAY:
-				return DELAY_EDEFAULT == null ? delay != null : !DELAY_EDEFAULT.equals(delay);
-			case MsprojectPackage.ASSIGNMENT__FINISH:
-				return FINISH_EDEFAULT == null ? finish != null : !FINISH_EDEFAULT.equals(finish);
-			case MsprojectPackage.ASSIGNMENT__FINISH_VARIANCE:
-				return FINISH_VARIANCE_EDEFAULT == null ? finishVariance != null : !FINISH_VARIANCE_EDEFAULT.equals(finishVariance);
-			case MsprojectPackage.ASSIGNMENT__HYPERLINK:
-				return HYPERLINK_EDEFAULT == null ? hyperlink != null : !HYPERLINK_EDEFAULT.equals(hyperlink);
-			case MsprojectPackage.ASSIGNMENT__HYPERLINK_ADDRESS:
-				return HYPERLINK_ADDRESS_EDEFAULT == null ? hyperlinkAddress != null : !HYPERLINK_ADDRESS_EDEFAULT.equals(hyperlinkAddress);
-			case MsprojectPackage.ASSIGNMENT__HYPERLINK_SUB_ADDRESS:
-				return HYPERLINK_SUB_ADDRESS_EDEFAULT == null ? hyperlinkSubAddress != null : !HYPERLINK_SUB_ADDRESS_EDEFAULT.equals(hyperlinkSubAddress);
-			case MsprojectPackage.ASSIGNMENT__WORK_VARIANCE:
-				return isSetWorkVariance();
-			case MsprojectPackage.ASSIGNMENT__HAS_FIXED_RATE_UNITS:
-				return isSetHasFixedRateUnits();
-			case MsprojectPackage.ASSIGNMENT__FIXED_MATERIAL:
-				return isSetFixedMaterial();
-			case MsprojectPackage.ASSIGNMENT__LEVELING_DELAY:
-				return LEVELING_DELAY_EDEFAULT == null ? levelingDelay != null : !LEVELING_DELAY_EDEFAULT.equals(levelingDelay);
-			case MsprojectPackage.ASSIGNMENT__LEVELING_DELAY_FORMAT:
-				return LEVELING_DELAY_FORMAT_EDEFAULT == null ? levelingDelayFormat != null : !LEVELING_DELAY_FORMAT_EDEFAULT.equals(levelingDelayFormat);
-			case MsprojectPackage.ASSIGNMENT__LINKED_FIELDS:
-				return isSetLinkedFields();
-			case MsprojectPackage.ASSIGNMENT__MILESTONE:
-				return isSetMilestone();
-			case MsprojectPackage.ASSIGNMENT__NOTES:
-				return NOTES_EDEFAULT == null ? notes != null : !NOTES_EDEFAULT.equals(notes);
-			case MsprojectPackage.ASSIGNMENT__OVERALLOCATED:
-				return isSetOverallocated();
-			case MsprojectPackage.ASSIGNMENT__OVERTIME_COST:
-				return OVERTIME_COST_EDEFAULT == null ? overtimeCost != null : !OVERTIME_COST_EDEFAULT.equals(overtimeCost);
-			case MsprojectPackage.ASSIGNMENT__OVERTIME_WORK:
-				return OVERTIME_WORK_EDEFAULT == null ? overtimeWork != null : !OVERTIME_WORK_EDEFAULT.equals(overtimeWork);
-			case MsprojectPackage.ASSIGNMENT__REGULAR_WORK:
-				return REGULAR_WORK_EDEFAULT == null ? regularWork != null : !REGULAR_WORK_EDEFAULT.equals(regularWork);
-			case MsprojectPackage.ASSIGNMENT__REMAINING_COST:
-				return REMAINING_COST_EDEFAULT == null ? remainingCost != null : !REMAINING_COST_EDEFAULT.equals(remainingCost);
-			case MsprojectPackage.ASSIGNMENT__REMAINING_OVERTIME_COST:
-				return REMAINING_OVERTIME_COST_EDEFAULT == null ? remainingOvertimeCost != null : !REMAINING_OVERTIME_COST_EDEFAULT.equals(remainingOvertimeCost);
-			case MsprojectPackage.ASSIGNMENT__REMAINING_OVERTIME_WORK:
-				return REMAINING_OVERTIME_WORK_EDEFAULT == null ? remainingOvertimeWork != null : !REMAINING_OVERTIME_WORK_EDEFAULT.equals(remainingOvertimeWork);
-			case MsprojectPackage.ASSIGNMENT__REMAINING_WORK:
-				return REMAINING_WORK_EDEFAULT == null ? remainingWork != null : !REMAINING_WORK_EDEFAULT.equals(remainingWork);
-			case MsprojectPackage.ASSIGNMENT__RESPONSE_PENDING:
-				return isSetResponsePending();
-			case MsprojectPackage.ASSIGNMENT__START:
-				return START_EDEFAULT == null ? start != null : !START_EDEFAULT.equals(start);
-			case MsprojectPackage.ASSIGNMENT__STOP:
-				return STOP_EDEFAULT == null ? stop != null : !STOP_EDEFAULT.equals(stop);
-			case MsprojectPackage.ASSIGNMENT__RESUME:
-				return RESUME_EDEFAULT == null ? resume != null : !RESUME_EDEFAULT.equals(resume);
-			case MsprojectPackage.ASSIGNMENT__START_VARIANCE:
-				return START_VARIANCE_EDEFAULT == null ? startVariance != null : !START_VARIANCE_EDEFAULT.equals(startVariance);
-			case MsprojectPackage.ASSIGNMENT__UNITS:
-				return isSetUnits();
-			case MsprojectPackage.ASSIGNMENT__UPDATE_NEEDED:
-				return isSetUpdateNeeded();
-			case MsprojectPackage.ASSIGNMENT__VAC:
-				return isSetVAC();
-			case MsprojectPackage.ASSIGNMENT__WORK:
-				return WORK_EDEFAULT == null ? work != null : !WORK_EDEFAULT.equals(work);
-			case MsprojectPackage.ASSIGNMENT__WORK_CONTOUR:
-				return WORK_CONTOUR_EDEFAULT == null ? workContour != null : !WORK_CONTOUR_EDEFAULT.equals(workContour);
-			case MsprojectPackage.ASSIGNMENT__BCWS:
-				return isSetBCWS();
-			case MsprojectPackage.ASSIGNMENT__BCWP:
-				return isSetBCWP();
-			case MsprojectPackage.ASSIGNMENT__BOOKING_TYPE:
-				return BOOKING_TYPE_EDEFAULT == null ? bookingType != null : !BOOKING_TYPE_EDEFAULT.equals(bookingType);
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_WORK_PROTECTED:
-				return ACTUAL_WORK_PROTECTED_EDEFAULT == null ? actualWorkProtected != null : !ACTUAL_WORK_PROTECTED_EDEFAULT.equals(actualWorkProtected);
-			case MsprojectPackage.ASSIGNMENT__ACTUAL_OVERTIME_WORK_PROTECTED:
-				return ACTUAL_OVERTIME_WORK_PROTECTED_EDEFAULT == null ? actualOvertimeWorkProtected != null : !ACTUAL_OVERTIME_WORK_PROTECTED_EDEFAULT.equals(actualOvertimeWorkProtected);
-			case MsprojectPackage.ASSIGNMENT__CREATION_DATE:
-				return CREATION_DATE_EDEFAULT == null ? creationDate != null : !CREATION_DATE_EDEFAULT.equals(creationDate);
-			case MsprojectPackage.ASSIGNMENT__EXTENDED_ATTRIBUTE:
-				return extendedAttribute != null && !extendedAttribute.isEmpty();
-			case MsprojectPackage.ASSIGNMENT__BASELINE:
-				return baseline != null && !baseline.isEmpty();
-			case MsprojectPackage.ASSIGNMENT__TIMEPHASED_DATA:
-				return timephasedData != null && !timephasedData.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (uID: ");
-		result.append(uID);
-		result.append(", taskUID: ");
-		result.append(taskUID);
-		result.append(", resourceUID: ");
-		result.append(resourceUID);
-		result.append(", percentWorkComplete: ");
-		result.append(percentWorkComplete);
-		result.append(", actualCost: ");
-		result.append(actualCost);
-		result.append(", actualFinish: ");
-		result.append(actualFinish);
-		result.append(", actualOvertimeCost: ");
-		result.append(actualOvertimeCost);
-		result.append(", actualOvertimeWork: ");
-		result.append(actualOvertimeWork);
-		result.append(", actualStart: ");
-		result.append(actualStart);
-		result.append(", actualWork: ");
-		result.append(actualWork);
-		result.append(", aCWP: ");
-		if (aCWPESet) result.append(aCWP); else result.append("<unset>");
-		result.append(", confirmed: ");
-		if (confirmedESet) result.append(confirmed); else result.append("<unset>");
-		result.append(", cost: ");
-		result.append(cost);
-		result.append(", costRateTable: ");
-		result.append(costRateTable);
-		result.append(", costVariance: ");
-		if (costVarianceESet) result.append(costVariance); else result.append("<unset>");
-		result.append(", cV: ");
-		if (cVESet) result.append(cV); else result.append("<unset>");
-		result.append(", delay: ");
-		result.append(delay);
-		result.append(", finish: ");
-		result.append(finish);
-		result.append(", finishVariance: ");
-		result.append(finishVariance);
-		result.append(", hyperlink: ");
-		result.append(hyperlink);
-		result.append(", hyperlinkAddress: ");
-		result.append(hyperlinkAddress);
-		result.append(", hyperlinkSubAddress: ");
-		result.append(hyperlinkSubAddress);
-		result.append(", workVariance: ");
-		if (workVarianceESet) result.append(workVariance); else result.append("<unset>");
-		result.append(", hasFixedRateUnits: ");
-		if (hasFixedRateUnitsESet) result.append(hasFixedRateUnits); else result.append("<unset>");
-		result.append(", fixedMaterial: ");
-		if (fixedMaterialESet) result.append(fixedMaterial); else result.append("<unset>");
-		result.append(", levelingDelay: ");
-		result.append(levelingDelay);
-		result.append(", levelingDelayFormat: ");
-		result.append(levelingDelayFormat);
-		result.append(", linkedFields: ");
-		if (linkedFieldsESet) result.append(linkedFields); else result.append("<unset>");
-		result.append(", milestone: ");
-		if (milestoneESet) result.append(milestone); else result.append("<unset>");
-		result.append(", notes: ");
-		result.append(notes);
-		result.append(", overallocated: ");
-		if (overallocatedESet) result.append(overallocated); else result.append("<unset>");
-		result.append(", overtimeCost: ");
-		result.append(overtimeCost);
-		result.append(", overtimeWork: ");
-		result.append(overtimeWork);
-		result.append(", regularWork: ");
-		result.append(regularWork);
-		result.append(", remainingCost: ");
-		result.append(remainingCost);
-		result.append(", remainingOvertimeCost: ");
-		result.append(remainingOvertimeCost);
-		result.append(", remainingOvertimeWork: ");
-		result.append(remainingOvertimeWork);
-		result.append(", remainingWork: ");
-		result.append(remainingWork);
-		result.append(", responsePending: ");
-		if (responsePendingESet) result.append(responsePending); else result.append("<unset>");
-		result.append(", start: ");
-		result.append(start);
-		result.append(", stop: ");
-		result.append(stop);
-		result.append(", resume: ");
-		result.append(resume);
-		result.append(", startVariance: ");
-		result.append(startVariance);
-		result.append(", units: ");
-		if (unitsESet) result.append(units); else result.append("<unset>");
-		result.append(", updateNeeded: ");
-		if (updateNeededESet) result.append(updateNeeded); else result.append("<unset>");
-		result.append(", vAC: ");
-		if (vACESet) result.append(vAC); else result.append("<unset>");
-		result.append(", work: ");
-		result.append(work);
-		result.append(", workContour: ");
-		result.append(workContour);
-		result.append(", bCWS: ");
-		if (bCWSESet) result.append(bCWS); else result.append("<unset>");
-		result.append(", bCWP: ");
-		if (bCWPESet) result.append(bCWP); else result.append("<unset>");
-		result.append(", bookingType: ");
-		result.append(bookingType);
-		result.append(", actualWorkProtected: ");
-		result.append(actualWorkProtected);
-		result.append(", actualOvertimeWorkProtected: ");
-		result.append(actualOvertimeWorkProtected);
-		result.append(", creationDate: ");
-		result.append(creationDate);
-		result.append(')');
-		return result.toString();
-	}
-
-} //AssignmentImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/AssignmentsImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/AssignmentsImpl.java
deleted file mode 100755
index c7e809b..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/AssignmentsImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AssignmentsImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.Assignment;
-import org.eclipse.epf.msproject.Assignments;
-import org.eclipse.epf.msproject.MsprojectPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Assignments</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.AssignmentsImpl#getAssignment <em>Assignment</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AssignmentsImpl extends EObjectImpl implements Assignments {
-	/**
-	 * The cached value of the '{@link #getAssignment() <em>Assignment</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAssignment()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList assignment = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AssignmentsImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getAssignments();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getAssignment() {
-		if (assignment == null) {
-			assignment = new EObjectContainmentEList(Assignment.class, this, MsprojectPackage.ASSIGNMENTS__ASSIGNMENT);
-		}
-		return assignment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.ASSIGNMENTS__ASSIGNMENT:
-					return ((InternalEList)getAssignment()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.ASSIGNMENTS__ASSIGNMENT:
-				return getAssignment();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.ASSIGNMENTS__ASSIGNMENT:
-				getAssignment().clear();
-				getAssignment().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.ASSIGNMENTS__ASSIGNMENT:
-				getAssignment().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.ASSIGNMENTS__ASSIGNMENT:
-				return assignment != null && !assignment.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //AssignmentsImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/AvailabilityPeriodImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/AvailabilityPeriodImpl.java
deleted file mode 100755
index 765232d..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/AvailabilityPeriodImpl.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AvailabilityPeriodImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.AvailabilityPeriod;
-import org.eclipse.epf.msproject.MsprojectPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Availability Period</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.AvailabilityPeriodImpl#getAvailableFrom <em>Available From</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AvailabilityPeriodImpl#getAvailableTo <em>Available To</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.AvailabilityPeriodImpl#getAvailableUnits <em>Available Units</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AvailabilityPeriodImpl extends EObjectImpl implements AvailabilityPeriod {
-	/**
-	 * The default value of the '{@link #getAvailableFrom() <em>Available From</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAvailableFrom()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object AVAILABLE_FROM_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAvailableFrom() <em>Available From</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAvailableFrom()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object availableFrom = AVAILABLE_FROM_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAvailableTo() <em>Available To</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAvailableTo()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object AVAILABLE_TO_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAvailableTo() <em>Available To</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAvailableTo()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object availableTo = AVAILABLE_TO_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAvailableUnits() <em>Available Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAvailableUnits()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float AVAILABLE_UNITS_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getAvailableUnits() <em>Available Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAvailableUnits()
-	 * @generated
-	 * @ordered
-	 */
-	protected float availableUnits = AVAILABLE_UNITS_EDEFAULT;
-
-	/**
-	 * This is true if the Available Units attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean availableUnitsESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AvailabilityPeriodImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getAvailabilityPeriod();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getAvailableFrom() {
-		return availableFrom;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAvailableFrom(Object newAvailableFrom) {
-		Object oldAvailableFrom = availableFrom;
-		availableFrom = newAvailableFrom;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_FROM, oldAvailableFrom, availableFrom));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getAvailableTo() {
-		return availableTo;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAvailableTo(Object newAvailableTo) {
-		Object oldAvailableTo = availableTo;
-		availableTo = newAvailableTo;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_TO, oldAvailableTo, availableTo));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getAvailableUnits() {
-		return availableUnits;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAvailableUnits(float newAvailableUnits) {
-		float oldAvailableUnits = availableUnits;
-		availableUnits = newAvailableUnits;
-		boolean oldAvailableUnitsESet = availableUnitsESet;
-		availableUnitsESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_UNITS, oldAvailableUnits, availableUnits, !oldAvailableUnitsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetAvailableUnits() {
-		float oldAvailableUnits = availableUnits;
-		boolean oldAvailableUnitsESet = availableUnitsESet;
-		availableUnits = AVAILABLE_UNITS_EDEFAULT;
-		availableUnitsESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_UNITS, oldAvailableUnits, AVAILABLE_UNITS_EDEFAULT, oldAvailableUnitsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetAvailableUnits() {
-		return availableUnitsESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_FROM:
-				return getAvailableFrom();
-			case MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_TO:
-				return getAvailableTo();
-			case MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_UNITS:
-				return new Float(getAvailableUnits());
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_FROM:
-				setAvailableFrom((Object)newValue);
-				return;
-			case MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_TO:
-				setAvailableTo((Object)newValue);
-				return;
-			case MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_UNITS:
-				setAvailableUnits(((Float)newValue).floatValue());
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_FROM:
-				setAvailableFrom(AVAILABLE_FROM_EDEFAULT);
-				return;
-			case MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_TO:
-				setAvailableTo(AVAILABLE_TO_EDEFAULT);
-				return;
-			case MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_UNITS:
-				unsetAvailableUnits();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_FROM:
-				return AVAILABLE_FROM_EDEFAULT == null ? availableFrom != null : !AVAILABLE_FROM_EDEFAULT.equals(availableFrom);
-			case MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_TO:
-				return AVAILABLE_TO_EDEFAULT == null ? availableTo != null : !AVAILABLE_TO_EDEFAULT.equals(availableTo);
-			case MsprojectPackage.AVAILABILITY_PERIOD__AVAILABLE_UNITS:
-				return isSetAvailableUnits();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (availableFrom: ");
-		result.append(availableFrom);
-		result.append(", availableTo: ");
-		result.append(availableTo);
-		result.append(", availableUnits: ");
-		if (availableUnitsESet) result.append(availableUnits); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //AvailabilityPeriodImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/AvailabilityPeriodsImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/AvailabilityPeriodsImpl.java
deleted file mode 100755
index e3c2332..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/AvailabilityPeriodsImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AvailabilityPeriodsImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.AvailabilityPeriod;
-import org.eclipse.epf.msproject.AvailabilityPeriods;
-import org.eclipse.epf.msproject.MsprojectPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Availability Periods</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.AvailabilityPeriodsImpl#getAvailabilityPeriod <em>Availability Period</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AvailabilityPeriodsImpl extends EObjectImpl implements AvailabilityPeriods {
-	/**
-	 * The cached value of the '{@link #getAvailabilityPeriod() <em>Availability Period</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAvailabilityPeriod()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList availabilityPeriod = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AvailabilityPeriodsImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getAvailabilityPeriods();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getAvailabilityPeriod() {
-		if (availabilityPeriod == null) {
-			availabilityPeriod = new EObjectContainmentEList(AvailabilityPeriod.class, this, MsprojectPackage.AVAILABILITY_PERIODS__AVAILABILITY_PERIOD);
-		}
-		return availabilityPeriod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.AVAILABILITY_PERIODS__AVAILABILITY_PERIOD:
-					return ((InternalEList)getAvailabilityPeriod()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.AVAILABILITY_PERIODS__AVAILABILITY_PERIOD:
-				return getAvailabilityPeriod();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.AVAILABILITY_PERIODS__AVAILABILITY_PERIOD:
-				getAvailabilityPeriod().clear();
-				getAvailabilityPeriod().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.AVAILABILITY_PERIODS__AVAILABILITY_PERIOD:
-				getAvailabilityPeriod().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.AVAILABILITY_PERIODS__AVAILABILITY_PERIOD:
-				return availabilityPeriod != null && !availabilityPeriod.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //AvailabilityPeriodsImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/Baseline2Impl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/Baseline2Impl.java
deleted file mode 100755
index c11d869..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/Baseline2Impl.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Baseline2Impl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.Baseline2;
-import org.eclipse.epf.msproject.MsprojectPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Baseline2</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.Baseline2Impl#getNumber <em>Number</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.Baseline2Impl#getWork <em>Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.Baseline2Impl#getCost <em>Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.Baseline2Impl#getBCWS <em>BCWS</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.Baseline2Impl#getBCWP <em>BCWP</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class Baseline2Impl extends EObjectImpl implements Baseline2 {
-	/**
-	 * The default value of the '{@link #getNumber() <em>Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNumber()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger NUMBER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNumber() <em>Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNumber()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger number = NUMBER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWork() <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWork() <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object work = WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCost() <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float COST_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getCost() <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected float cost = COST_EDEFAULT;
-
-	/**
-	 * This is true if the Cost attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean costESet = false;
-
-	/**
-	 * The default value of the '{@link #getBCWS() <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWS()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float BCWS_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getBCWS() <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWS()
-	 * @generated
-	 * @ordered
-	 */
-	protected float bCWS = BCWS_EDEFAULT;
-
-	/**
-	 * This is true if the BCWS attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean bCWSESet = false;
-
-	/**
-	 * The default value of the '{@link #getBCWP() <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float BCWP_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getBCWP() <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected float bCWP = BCWP_EDEFAULT;
-
-	/**
-	 * This is true if the BCWP attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean bCWPESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Baseline2Impl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getBaseline2();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getNumber() {
-		return number;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNumber(BigInteger newNumber) {
-		BigInteger oldNumber = number;
-		number = newNumber;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE2__NUMBER, oldNumber, number));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getWork() {
-		return work;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWork(Object newWork) {
-		Object oldWork = work;
-		work = newWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE2__WORK, oldWork, work));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getCost() {
-		return cost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCost(float newCost) {
-		float oldCost = cost;
-		cost = newCost;
-		boolean oldCostESet = costESet;
-		costESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE2__COST, oldCost, cost, !oldCostESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetCost() {
-		float oldCost = cost;
-		boolean oldCostESet = costESet;
-		cost = COST_EDEFAULT;
-		costESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.BASELINE2__COST, oldCost, COST_EDEFAULT, oldCostESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetCost() {
-		return costESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getBCWS() {
-		return bCWS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBCWS(float newBCWS) {
-		float oldBCWS = bCWS;
-		bCWS = newBCWS;
-		boolean oldBCWSESet = bCWSESet;
-		bCWSESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE2__BCWS, oldBCWS, bCWS, !oldBCWSESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBCWS() {
-		float oldBCWS = bCWS;
-		boolean oldBCWSESet = bCWSESet;
-		bCWS = BCWS_EDEFAULT;
-		bCWSESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.BASELINE2__BCWS, oldBCWS, BCWS_EDEFAULT, oldBCWSESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBCWS() {
-		return bCWSESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getBCWP() {
-		return bCWP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBCWP(float newBCWP) {
-		float oldBCWP = bCWP;
-		bCWP = newBCWP;
-		boolean oldBCWPESet = bCWPESet;
-		bCWPESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE2__BCWP, oldBCWP, bCWP, !oldBCWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBCWP() {
-		float oldBCWP = bCWP;
-		boolean oldBCWPESet = bCWPESet;
-		bCWP = BCWP_EDEFAULT;
-		bCWPESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.BASELINE2__BCWP, oldBCWP, BCWP_EDEFAULT, oldBCWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBCWP() {
-		return bCWPESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.BASELINE2__NUMBER:
-				return getNumber();
-			case MsprojectPackage.BASELINE2__WORK:
-				return getWork();
-			case MsprojectPackage.BASELINE2__COST:
-				return new Float(getCost());
-			case MsprojectPackage.BASELINE2__BCWS:
-				return new Float(getBCWS());
-			case MsprojectPackage.BASELINE2__BCWP:
-				return new Float(getBCWP());
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.BASELINE2__NUMBER:
-				setNumber((BigInteger)newValue);
-				return;
-			case MsprojectPackage.BASELINE2__WORK:
-				setWork((Object)newValue);
-				return;
-			case MsprojectPackage.BASELINE2__COST:
-				setCost(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.BASELINE2__BCWS:
-				setBCWS(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.BASELINE2__BCWP:
-				setBCWP(((Float)newValue).floatValue());
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.BASELINE2__NUMBER:
-				setNumber(NUMBER_EDEFAULT);
-				return;
-			case MsprojectPackage.BASELINE2__WORK:
-				setWork(WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.BASELINE2__COST:
-				unsetCost();
-				return;
-			case MsprojectPackage.BASELINE2__BCWS:
-				unsetBCWS();
-				return;
-			case MsprojectPackage.BASELINE2__BCWP:
-				unsetBCWP();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.BASELINE2__NUMBER:
-				return NUMBER_EDEFAULT == null ? number != null : !NUMBER_EDEFAULT.equals(number);
-			case MsprojectPackage.BASELINE2__WORK:
-				return WORK_EDEFAULT == null ? work != null : !WORK_EDEFAULT.equals(work);
-			case MsprojectPackage.BASELINE2__COST:
-				return isSetCost();
-			case MsprojectPackage.BASELINE2__BCWS:
-				return isSetBCWS();
-			case MsprojectPackage.BASELINE2__BCWP:
-				return isSetBCWP();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (number: ");
-		result.append(number);
-		result.append(", work: ");
-		result.append(work);
-		result.append(", cost: ");
-		if (costESet) result.append(cost); else result.append("<unset>");
-		result.append(", bCWS: ");
-		if (bCWSESet) result.append(bCWS); else result.append("<unset>");
-		result.append(", bCWP: ");
-		if (bCWPESet) result.append(bCWP); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //Baseline2Impl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/Baseline3Impl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/Baseline3Impl.java
deleted file mode 100755
index 6e64c75..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/Baseline3Impl.java
+++ /dev/null
@@ -1,610 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Baseline3Impl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.Baseline3;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.TimephasedDataType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Baseline3</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.Baseline3Impl#getTimephasedData <em>Timephased Data</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.Baseline3Impl#getNumber <em>Number</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.Baseline3Impl#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.Baseline3Impl#getFinish <em>Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.Baseline3Impl#getWork <em>Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.Baseline3Impl#getCost <em>Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.Baseline3Impl#getBCWS <em>BCWS</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.Baseline3Impl#getBCWP <em>BCWP</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class Baseline3Impl extends EObjectImpl implements Baseline3 {
-	/**
-	 * The cached value of the '{@link #getTimephasedData() <em>Timephased Data</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTimephasedData()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList timephasedData = null;
-
-	/**
-	 * The default value of the '{@link #getNumber() <em>Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNumber()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NUMBER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNumber() <em>Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNumber()
-	 * @generated
-	 * @ordered
-	 */
-	protected String number = NUMBER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStart() <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String START_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStart() <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected String start = START_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFinish() <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FINISH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFinish() <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected String finish = FINISH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWork() <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWork() <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object work = WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCost() <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCost() <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected String cost = COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getBCWS() <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWS()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float BCWS_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getBCWS() <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWS()
-	 * @generated
-	 * @ordered
-	 */
-	protected float bCWS = BCWS_EDEFAULT;
-
-	/**
-	 * This is true if the BCWS attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean bCWSESet = false;
-
-	/**
-	 * The default value of the '{@link #getBCWP() <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float BCWP_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getBCWP() <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected float bCWP = BCWP_EDEFAULT;
-
-	/**
-	 * This is true if the BCWP attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean bCWPESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Baseline3Impl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getBaseline3();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTimephasedData() {
-		if (timephasedData == null) {
-			timephasedData = new EObjectContainmentEList(TimephasedDataType.class, this, MsprojectPackage.BASELINE3__TIMEPHASED_DATA);
-		}
-		return timephasedData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getNumber() {
-		return number;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNumber(String newNumber) {
-		String oldNumber = number;
-		number = newNumber;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE3__NUMBER, oldNumber, number));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getStart() {
-		return start;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStart(String newStart) {
-		String oldStart = start;
-		start = newStart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE3__START, oldStart, start));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFinish() {
-		return finish;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinish(String newFinish) {
-		String oldFinish = finish;
-		finish = newFinish;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE3__FINISH, oldFinish, finish));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getWork() {
-		return work;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWork(Object newWork) {
-		Object oldWork = work;
-		work = newWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE3__WORK, oldWork, work));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCost() {
-		return cost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCost(String newCost) {
-		String oldCost = cost;
-		cost = newCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE3__COST, oldCost, cost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getBCWS() {
-		return bCWS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBCWS(float newBCWS) {
-		float oldBCWS = bCWS;
-		bCWS = newBCWS;
-		boolean oldBCWSESet = bCWSESet;
-		bCWSESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE3__BCWS, oldBCWS, bCWS, !oldBCWSESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBCWS() {
-		float oldBCWS = bCWS;
-		boolean oldBCWSESet = bCWSESet;
-		bCWS = BCWS_EDEFAULT;
-		bCWSESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.BASELINE3__BCWS, oldBCWS, BCWS_EDEFAULT, oldBCWSESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBCWS() {
-		return bCWSESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getBCWP() {
-		return bCWP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBCWP(float newBCWP) {
-		float oldBCWP = bCWP;
-		bCWP = newBCWP;
-		boolean oldBCWPESet = bCWPESet;
-		bCWPESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE3__BCWP, oldBCWP, bCWP, !oldBCWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBCWP() {
-		float oldBCWP = bCWP;
-		boolean oldBCWPESet = bCWPESet;
-		bCWP = BCWP_EDEFAULT;
-		bCWPESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.BASELINE3__BCWP, oldBCWP, BCWP_EDEFAULT, oldBCWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBCWP() {
-		return bCWPESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.BASELINE3__TIMEPHASED_DATA:
-					return ((InternalEList)getTimephasedData()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.BASELINE3__TIMEPHASED_DATA:
-				return getTimephasedData();
-			case MsprojectPackage.BASELINE3__NUMBER:
-				return getNumber();
-			case MsprojectPackage.BASELINE3__START:
-				return getStart();
-			case MsprojectPackage.BASELINE3__FINISH:
-				return getFinish();
-			case MsprojectPackage.BASELINE3__WORK:
-				return getWork();
-			case MsprojectPackage.BASELINE3__COST:
-				return getCost();
-			case MsprojectPackage.BASELINE3__BCWS:
-				return new Float(getBCWS());
-			case MsprojectPackage.BASELINE3__BCWP:
-				return new Float(getBCWP());
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.BASELINE3__TIMEPHASED_DATA:
-				getTimephasedData().clear();
-				getTimephasedData().addAll((Collection)newValue);
-				return;
-			case MsprojectPackage.BASELINE3__NUMBER:
-				setNumber((String)newValue);
-				return;
-			case MsprojectPackage.BASELINE3__START:
-				setStart((String)newValue);
-				return;
-			case MsprojectPackage.BASELINE3__FINISH:
-				setFinish((String)newValue);
-				return;
-			case MsprojectPackage.BASELINE3__WORK:
-				setWork((Object)newValue);
-				return;
-			case MsprojectPackage.BASELINE3__COST:
-				setCost((String)newValue);
-				return;
-			case MsprojectPackage.BASELINE3__BCWS:
-				setBCWS(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.BASELINE3__BCWP:
-				setBCWP(((Float)newValue).floatValue());
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.BASELINE3__TIMEPHASED_DATA:
-				getTimephasedData().clear();
-				return;
-			case MsprojectPackage.BASELINE3__NUMBER:
-				setNumber(NUMBER_EDEFAULT);
-				return;
-			case MsprojectPackage.BASELINE3__START:
-				setStart(START_EDEFAULT);
-				return;
-			case MsprojectPackage.BASELINE3__FINISH:
-				setFinish(FINISH_EDEFAULT);
-				return;
-			case MsprojectPackage.BASELINE3__WORK:
-				setWork(WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.BASELINE3__COST:
-				setCost(COST_EDEFAULT);
-				return;
-			case MsprojectPackage.BASELINE3__BCWS:
-				unsetBCWS();
-				return;
-			case MsprojectPackage.BASELINE3__BCWP:
-				unsetBCWP();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.BASELINE3__TIMEPHASED_DATA:
-				return timephasedData != null && !timephasedData.isEmpty();
-			case MsprojectPackage.BASELINE3__NUMBER:
-				return NUMBER_EDEFAULT == null ? number != null : !NUMBER_EDEFAULT.equals(number);
-			case MsprojectPackage.BASELINE3__START:
-				return START_EDEFAULT == null ? start != null : !START_EDEFAULT.equals(start);
-			case MsprojectPackage.BASELINE3__FINISH:
-				return FINISH_EDEFAULT == null ? finish != null : !FINISH_EDEFAULT.equals(finish);
-			case MsprojectPackage.BASELINE3__WORK:
-				return WORK_EDEFAULT == null ? work != null : !WORK_EDEFAULT.equals(work);
-			case MsprojectPackage.BASELINE3__COST:
-				return COST_EDEFAULT == null ? cost != null : !COST_EDEFAULT.equals(cost);
-			case MsprojectPackage.BASELINE3__BCWS:
-				return isSetBCWS();
-			case MsprojectPackage.BASELINE3__BCWP:
-				return isSetBCWP();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (number: ");
-		result.append(number);
-		result.append(", start: ");
-		result.append(start);
-		result.append(", finish: ");
-		result.append(finish);
-		result.append(", work: ");
-		result.append(work);
-		result.append(", cost: ");
-		result.append(cost);
-		result.append(", bCWS: ");
-		if (bCWSESet) result.append(bCWS); else result.append("<unset>");
-		result.append(", bCWP: ");
-		if (bCWPESet) result.append(bCWP); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //Baseline3Impl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/BaselineImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/BaselineImpl.java
deleted file mode 100755
index c7f7270..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/BaselineImpl.java
+++ /dev/null
@@ -1,896 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: BaselineImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.Baseline;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.TimephasedDataType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Baseline</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.BaselineImpl#getTimephasedData <em>Timephased Data</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.BaselineImpl#getNumber <em>Number</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.BaselineImpl#isInterim <em>Interim</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.BaselineImpl#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.BaselineImpl#getFinish <em>Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.BaselineImpl#getDuration <em>Duration</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.BaselineImpl#getDurationFormat <em>Duration Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.BaselineImpl#isEstimatedDuration <em>Estimated Duration</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.BaselineImpl#getWork <em>Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.BaselineImpl#getCost <em>Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.BaselineImpl#getBCWS <em>BCWS</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.BaselineImpl#getBCWP <em>BCWP</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BaselineImpl extends EObjectImpl implements Baseline {
-	/**
-	 * The cached value of the '{@link #getTimephasedData() <em>Timephased Data</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTimephasedData()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList timephasedData = null;
-
-	/**
-	 * The default value of the '{@link #getNumber() <em>Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNumber()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger NUMBER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNumber() <em>Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNumber()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger number = NUMBER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isInterim() <em>Interim</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isInterim()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean INTERIM_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isInterim() <em>Interim</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isInterim()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean interim = INTERIM_EDEFAULT;
-
-	/**
-	 * This is true if the Interim attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean interimESet = false;
-
-	/**
-	 * The default value of the '{@link #getStart() <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object START_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStart() <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object start = START_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFinish() <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object FINISH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFinish() <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object finish = FINISH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDuration() <em>Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDuration()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object DURATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDuration() <em>Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDuration()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object duration = DURATION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDurationFormat() <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDurationFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger DURATION_FORMAT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDurationFormat() <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDurationFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger durationFormat = DURATION_FORMAT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isEstimatedDuration() <em>Estimated Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEstimatedDuration()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ESTIMATED_DURATION_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isEstimatedDuration() <em>Estimated Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEstimatedDuration()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean estimatedDuration = ESTIMATED_DURATION_EDEFAULT;
-
-	/**
-	 * This is true if the Estimated Duration attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean estimatedDurationESet = false;
-
-	/**
-	 * The default value of the '{@link #getWork() <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWork() <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object work = WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCost() <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCost() <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal cost = COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getBCWS() <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWS()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float BCWS_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getBCWS() <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWS()
-	 * @generated
-	 * @ordered
-	 */
-	protected float bCWS = BCWS_EDEFAULT;
-
-	/**
-	 * This is true if the BCWS attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean bCWSESet = false;
-
-	/**
-	 * The default value of the '{@link #getBCWP() <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float BCWP_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getBCWP() <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected float bCWP = BCWP_EDEFAULT;
-
-	/**
-	 * This is true if the BCWP attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean bCWPESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BaselineImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getBaseline();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTimephasedData() {
-		if (timephasedData == null) {
-			timephasedData = new EObjectContainmentEList(TimephasedDataType.class, this, MsprojectPackage.BASELINE__TIMEPHASED_DATA);
-		}
-		return timephasedData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getNumber() {
-		return number;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNumber(BigInteger newNumber) {
-		BigInteger oldNumber = number;
-		number = newNumber;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE__NUMBER, oldNumber, number));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isInterim() {
-		return interim;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInterim(boolean newInterim) {
-		boolean oldInterim = interim;
-		interim = newInterim;
-		boolean oldInterimESet = interimESet;
-		interimESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE__INTERIM, oldInterim, interim, !oldInterimESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetInterim() {
-		boolean oldInterim = interim;
-		boolean oldInterimESet = interimESet;
-		interim = INTERIM_EDEFAULT;
-		interimESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.BASELINE__INTERIM, oldInterim, INTERIM_EDEFAULT, oldInterimESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetInterim() {
-		return interimESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getStart() {
-		return start;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStart(Object newStart) {
-		Object oldStart = start;
-		start = newStart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE__START, oldStart, start));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getFinish() {
-		return finish;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinish(Object newFinish) {
-		Object oldFinish = finish;
-		finish = newFinish;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE__FINISH, oldFinish, finish));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getDuration() {
-		return duration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDuration(Object newDuration) {
-		Object oldDuration = duration;
-		duration = newDuration;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE__DURATION, oldDuration, duration));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getDurationFormat() {
-		return durationFormat;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDurationFormat(BigInteger newDurationFormat) {
-		BigInteger oldDurationFormat = durationFormat;
-		durationFormat = newDurationFormat;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE__DURATION_FORMAT, oldDurationFormat, durationFormat));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isEstimatedDuration() {
-		return estimatedDuration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEstimatedDuration(boolean newEstimatedDuration) {
-		boolean oldEstimatedDuration = estimatedDuration;
-		estimatedDuration = newEstimatedDuration;
-		boolean oldEstimatedDurationESet = estimatedDurationESet;
-		estimatedDurationESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE__ESTIMATED_DURATION, oldEstimatedDuration, estimatedDuration, !oldEstimatedDurationESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetEstimatedDuration() {
-		boolean oldEstimatedDuration = estimatedDuration;
-		boolean oldEstimatedDurationESet = estimatedDurationESet;
-		estimatedDuration = ESTIMATED_DURATION_EDEFAULT;
-		estimatedDurationESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.BASELINE__ESTIMATED_DURATION, oldEstimatedDuration, ESTIMATED_DURATION_EDEFAULT, oldEstimatedDurationESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetEstimatedDuration() {
-		return estimatedDurationESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getWork() {
-		return work;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWork(Object newWork) {
-		Object oldWork = work;
-		work = newWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE__WORK, oldWork, work));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getCost() {
-		return cost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCost(BigDecimal newCost) {
-		BigDecimal oldCost = cost;
-		cost = newCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE__COST, oldCost, cost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getBCWS() {
-		return bCWS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBCWS(float newBCWS) {
-		float oldBCWS = bCWS;
-		bCWS = newBCWS;
-		boolean oldBCWSESet = bCWSESet;
-		bCWSESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE__BCWS, oldBCWS, bCWS, !oldBCWSESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBCWS() {
-		float oldBCWS = bCWS;
-		boolean oldBCWSESet = bCWSESet;
-		bCWS = BCWS_EDEFAULT;
-		bCWSESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.BASELINE__BCWS, oldBCWS, BCWS_EDEFAULT, oldBCWSESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBCWS() {
-		return bCWSESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getBCWP() {
-		return bCWP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBCWP(float newBCWP) {
-		float oldBCWP = bCWP;
-		bCWP = newBCWP;
-		boolean oldBCWPESet = bCWPESet;
-		bCWPESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.BASELINE__BCWP, oldBCWP, bCWP, !oldBCWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBCWP() {
-		float oldBCWP = bCWP;
-		boolean oldBCWPESet = bCWPESet;
-		bCWP = BCWP_EDEFAULT;
-		bCWPESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.BASELINE__BCWP, oldBCWP, BCWP_EDEFAULT, oldBCWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBCWP() {
-		return bCWPESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.BASELINE__TIMEPHASED_DATA:
-					return ((InternalEList)getTimephasedData()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.BASELINE__TIMEPHASED_DATA:
-				return getTimephasedData();
-			case MsprojectPackage.BASELINE__NUMBER:
-				return getNumber();
-			case MsprojectPackage.BASELINE__INTERIM:
-				return isInterim() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.BASELINE__START:
-				return getStart();
-			case MsprojectPackage.BASELINE__FINISH:
-				return getFinish();
-			case MsprojectPackage.BASELINE__DURATION:
-				return getDuration();
-			case MsprojectPackage.BASELINE__DURATION_FORMAT:
-				return getDurationFormat();
-			case MsprojectPackage.BASELINE__ESTIMATED_DURATION:
-				return isEstimatedDuration() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.BASELINE__WORK:
-				return getWork();
-			case MsprojectPackage.BASELINE__COST:
-				return getCost();
-			case MsprojectPackage.BASELINE__BCWS:
-				return new Float(getBCWS());
-			case MsprojectPackage.BASELINE__BCWP:
-				return new Float(getBCWP());
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.BASELINE__TIMEPHASED_DATA:
-				getTimephasedData().clear();
-				getTimephasedData().addAll((Collection)newValue);
-				return;
-			case MsprojectPackage.BASELINE__NUMBER:
-				setNumber((BigInteger)newValue);
-				return;
-			case MsprojectPackage.BASELINE__INTERIM:
-				setInterim(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.BASELINE__START:
-				setStart((Object)newValue);
-				return;
-			case MsprojectPackage.BASELINE__FINISH:
-				setFinish((Object)newValue);
-				return;
-			case MsprojectPackage.BASELINE__DURATION:
-				setDuration((Object)newValue);
-				return;
-			case MsprojectPackage.BASELINE__DURATION_FORMAT:
-				setDurationFormat((BigInteger)newValue);
-				return;
-			case MsprojectPackage.BASELINE__ESTIMATED_DURATION:
-				setEstimatedDuration(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.BASELINE__WORK:
-				setWork((Object)newValue);
-				return;
-			case MsprojectPackage.BASELINE__COST:
-				setCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.BASELINE__BCWS:
-				setBCWS(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.BASELINE__BCWP:
-				setBCWP(((Float)newValue).floatValue());
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.BASELINE__TIMEPHASED_DATA:
-				getTimephasedData().clear();
-				return;
-			case MsprojectPackage.BASELINE__NUMBER:
-				setNumber(NUMBER_EDEFAULT);
-				return;
-			case MsprojectPackage.BASELINE__INTERIM:
-				unsetInterim();
-				return;
-			case MsprojectPackage.BASELINE__START:
-				setStart(START_EDEFAULT);
-				return;
-			case MsprojectPackage.BASELINE__FINISH:
-				setFinish(FINISH_EDEFAULT);
-				return;
-			case MsprojectPackage.BASELINE__DURATION:
-				setDuration(DURATION_EDEFAULT);
-				return;
-			case MsprojectPackage.BASELINE__DURATION_FORMAT:
-				setDurationFormat(DURATION_FORMAT_EDEFAULT);
-				return;
-			case MsprojectPackage.BASELINE__ESTIMATED_DURATION:
-				unsetEstimatedDuration();
-				return;
-			case MsprojectPackage.BASELINE__WORK:
-				setWork(WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.BASELINE__COST:
-				setCost(COST_EDEFAULT);
-				return;
-			case MsprojectPackage.BASELINE__BCWS:
-				unsetBCWS();
-				return;
-			case MsprojectPackage.BASELINE__BCWP:
-				unsetBCWP();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.BASELINE__TIMEPHASED_DATA:
-				return timephasedData != null && !timephasedData.isEmpty();
-			case MsprojectPackage.BASELINE__NUMBER:
-				return NUMBER_EDEFAULT == null ? number != null : !NUMBER_EDEFAULT.equals(number);
-			case MsprojectPackage.BASELINE__INTERIM:
-				return isSetInterim();
-			case MsprojectPackage.BASELINE__START:
-				return START_EDEFAULT == null ? start != null : !START_EDEFAULT.equals(start);
-			case MsprojectPackage.BASELINE__FINISH:
-				return FINISH_EDEFAULT == null ? finish != null : !FINISH_EDEFAULT.equals(finish);
-			case MsprojectPackage.BASELINE__DURATION:
-				return DURATION_EDEFAULT == null ? duration != null : !DURATION_EDEFAULT.equals(duration);
-			case MsprojectPackage.BASELINE__DURATION_FORMAT:
-				return DURATION_FORMAT_EDEFAULT == null ? durationFormat != null : !DURATION_FORMAT_EDEFAULT.equals(durationFormat);
-			case MsprojectPackage.BASELINE__ESTIMATED_DURATION:
-				return isSetEstimatedDuration();
-			case MsprojectPackage.BASELINE__WORK:
-				return WORK_EDEFAULT == null ? work != null : !WORK_EDEFAULT.equals(work);
-			case MsprojectPackage.BASELINE__COST:
-				return COST_EDEFAULT == null ? cost != null : !COST_EDEFAULT.equals(cost);
-			case MsprojectPackage.BASELINE__BCWS:
-				return isSetBCWS();
-			case MsprojectPackage.BASELINE__BCWP:
-				return isSetBCWP();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (number: ");
-		result.append(number);
-		result.append(", interim: ");
-		if (interimESet) result.append(interim); else result.append("<unset>");
-		result.append(", start: ");
-		result.append(start);
-		result.append(", finish: ");
-		result.append(finish);
-		result.append(", duration: ");
-		result.append(duration);
-		result.append(", durationFormat: ");
-		result.append(durationFormat);
-		result.append(", estimatedDuration: ");
-		if (estimatedDurationESet) result.append(estimatedDuration); else result.append("<unset>");
-		result.append(", work: ");
-		result.append(work);
-		result.append(", cost: ");
-		result.append(cost);
-		result.append(", bCWS: ");
-		if (bCWSESet) result.append(bCWS); else result.append("<unset>");
-		result.append(", bCWP: ");
-		if (bCWPESet) result.append(bCWP); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //BaselineImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/CalendarImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/CalendarImpl.java
deleted file mode 100755
index d5c40be..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/CalendarImpl.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CalendarImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.Calendar;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.WeekDays;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Calendar</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.CalendarImpl#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.CalendarImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.CalendarImpl#isIsBaseCalendar <em>Is Base Calendar</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.CalendarImpl#getBaseCalendarUID <em>Base Calendar UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.CalendarImpl#getWeekDays <em>Week Days</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CalendarImpl extends EObjectImpl implements Calendar {
-	/**
-	 * The default value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger uID = UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isIsBaseCalendar() <em>Is Base Calendar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsBaseCalendar()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_BASE_CALENDAR_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsBaseCalendar() <em>Is Base Calendar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsBaseCalendar()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isBaseCalendar = IS_BASE_CALENDAR_EDEFAULT;
-
-	/**
-	 * This is true if the Is Base Calendar attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isBaseCalendarESet = false;
-
-	/**
-	 * The default value of the '{@link #getBaseCalendarUID() <em>Base Calendar UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBaseCalendarUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger BASE_CALENDAR_UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getBaseCalendarUID() <em>Base Calendar UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBaseCalendarUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger baseCalendarUID = BASE_CALENDAR_UID_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getWeekDays() <em>Week Days</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWeekDays()
-	 * @generated
-	 * @ordered
-	 */
-	protected WeekDays weekDays = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CalendarImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getCalendar();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getUID() {
-		return uID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUID(BigInteger newUID) {
-		BigInteger oldUID = uID;
-		uID = newUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.CALENDAR__UID, oldUID, uID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.CALENDAR__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsBaseCalendar() {
-		return isBaseCalendar;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsBaseCalendar(boolean newIsBaseCalendar) {
-		boolean oldIsBaseCalendar = isBaseCalendar;
-		isBaseCalendar = newIsBaseCalendar;
-		boolean oldIsBaseCalendarESet = isBaseCalendarESet;
-		isBaseCalendarESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.CALENDAR__IS_BASE_CALENDAR, oldIsBaseCalendar, isBaseCalendar, !oldIsBaseCalendarESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsBaseCalendar() {
-		boolean oldIsBaseCalendar = isBaseCalendar;
-		boolean oldIsBaseCalendarESet = isBaseCalendarESet;
-		isBaseCalendar = IS_BASE_CALENDAR_EDEFAULT;
-		isBaseCalendarESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.CALENDAR__IS_BASE_CALENDAR, oldIsBaseCalendar, IS_BASE_CALENDAR_EDEFAULT, oldIsBaseCalendarESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsBaseCalendar() {
-		return isBaseCalendarESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getBaseCalendarUID() {
-		return baseCalendarUID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBaseCalendarUID(BigInteger newBaseCalendarUID) {
-		BigInteger oldBaseCalendarUID = baseCalendarUID;
-		baseCalendarUID = newBaseCalendarUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.CALENDAR__BASE_CALENDAR_UID, oldBaseCalendarUID, baseCalendarUID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WeekDays getWeekDays() {
-		return weekDays;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWeekDays(WeekDays newWeekDays, NotificationChain msgs) {
-		WeekDays oldWeekDays = weekDays;
-		weekDays = newWeekDays;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MsprojectPackage.CALENDAR__WEEK_DAYS, oldWeekDays, newWeekDays);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWeekDays(WeekDays newWeekDays) {
-		if (newWeekDays != weekDays) {
-			NotificationChain msgs = null;
-			if (weekDays != null)
-				msgs = ((InternalEObject)weekDays).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.CALENDAR__WEEK_DAYS, null, msgs);
-			if (newWeekDays != null)
-				msgs = ((InternalEObject)newWeekDays).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.CALENDAR__WEEK_DAYS, null, msgs);
-			msgs = basicSetWeekDays(newWeekDays, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.CALENDAR__WEEK_DAYS, newWeekDays, newWeekDays));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.CALENDAR__WEEK_DAYS:
-					return basicSetWeekDays(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.CALENDAR__UID:
-				return getUID();
-			case MsprojectPackage.CALENDAR__NAME:
-				return getName();
-			case MsprojectPackage.CALENDAR__IS_BASE_CALENDAR:
-				return isIsBaseCalendar() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.CALENDAR__BASE_CALENDAR_UID:
-				return getBaseCalendarUID();
-			case MsprojectPackage.CALENDAR__WEEK_DAYS:
-				return getWeekDays();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.CALENDAR__UID:
-				setUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.CALENDAR__NAME:
-				setName((String)newValue);
-				return;
-			case MsprojectPackage.CALENDAR__IS_BASE_CALENDAR:
-				setIsBaseCalendar(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.CALENDAR__BASE_CALENDAR_UID:
-				setBaseCalendarUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.CALENDAR__WEEK_DAYS:
-				setWeekDays((WeekDays)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.CALENDAR__UID:
-				setUID(UID_EDEFAULT);
-				return;
-			case MsprojectPackage.CALENDAR__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case MsprojectPackage.CALENDAR__IS_BASE_CALENDAR:
-				unsetIsBaseCalendar();
-				return;
-			case MsprojectPackage.CALENDAR__BASE_CALENDAR_UID:
-				setBaseCalendarUID(BASE_CALENDAR_UID_EDEFAULT);
-				return;
-			case MsprojectPackage.CALENDAR__WEEK_DAYS:
-				setWeekDays((WeekDays)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.CALENDAR__UID:
-				return UID_EDEFAULT == null ? uID != null : !UID_EDEFAULT.equals(uID);
-			case MsprojectPackage.CALENDAR__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case MsprojectPackage.CALENDAR__IS_BASE_CALENDAR:
-				return isSetIsBaseCalendar();
-			case MsprojectPackage.CALENDAR__BASE_CALENDAR_UID:
-				return BASE_CALENDAR_UID_EDEFAULT == null ? baseCalendarUID != null : !BASE_CALENDAR_UID_EDEFAULT.equals(baseCalendarUID);
-			case MsprojectPackage.CALENDAR__WEEK_DAYS:
-				return weekDays != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (uID: ");
-		result.append(uID);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", isBaseCalendar: ");
-		if (isBaseCalendarESet) result.append(isBaseCalendar); else result.append("<unset>");
-		result.append(", baseCalendarUID: ");
-		result.append(baseCalendarUID);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CalendarImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/CalendarsImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/CalendarsImpl.java
deleted file mode 100755
index dbe370e..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/CalendarsImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CalendarsImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.Calendar;
-import org.eclipse.epf.msproject.Calendars;
-import org.eclipse.epf.msproject.MsprojectPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Calendars</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.CalendarsImpl#getCalendar <em>Calendar</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CalendarsImpl extends EObjectImpl implements Calendars {
-	/**
-	 * The cached value of the '{@link #getCalendar() <em>Calendar</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCalendar()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList calendar = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CalendarsImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getCalendars();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getCalendar() {
-		if (calendar == null) {
-			calendar = new EObjectContainmentEList(Calendar.class, this, MsprojectPackage.CALENDARS__CALENDAR);
-		}
-		return calendar;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.CALENDARS__CALENDAR:
-					return ((InternalEList)getCalendar()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.CALENDARS__CALENDAR:
-				return getCalendar();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.CALENDARS__CALENDAR:
-				getCalendar().clear();
-				getCalendar().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.CALENDARS__CALENDAR:
-				getCalendar().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.CALENDARS__CALENDAR:
-				return calendar != null && !calendar.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //CalendarsImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/DocumentRootImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/DocumentRootImpl.java
deleted file mode 100755
index af786f7..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/DocumentRootImpl.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentRootImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.EcoreEMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.DocumentRoot;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.Project;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.DocumentRootImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.DocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.DocumentRootImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.DocumentRootImpl#getProject <em>Project</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DocumentRootImpl extends EObjectImpl implements DocumentRoot {
-	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMixed()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap mixed = null;
-
-	/**
-	 * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXMLNSPrefixMap()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xMLNSPrefixMap = null;
-
-	/**
-	 * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXSISchemaLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xSISchemaLocation = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DocumentRootImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getDocumentRoot();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getMixed() {
-		if (mixed == null) {
-			mixed = new BasicFeatureMap(this, MsprojectPackage.DOCUMENT_ROOT__MIXED);
-		}
-		return mixed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getXMLNSPrefixMap() {
-		if (xMLNSPrefixMap == null) {
-			xMLNSPrefixMap = new EcoreEMap(EcorePackage.eINSTANCE.getEStringToStringMapEntry(), EStringToStringMapEntryImpl.class, this, MsprojectPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
-		}
-		return xMLNSPrefixMap;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getXSISchemaLocation() {
-		if (xSISchemaLocation == null) {
-			xSISchemaLocation = new EcoreEMap(EcorePackage.eINSTANCE.getEStringToStringMapEntry(), EStringToStringMapEntryImpl.class, this, MsprojectPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
-		}
-		return xSISchemaLocation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Project getProject() {
-		return (Project)getMixed().get(MsprojectPackage.eINSTANCE.getDocumentRoot_Project(), true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetProject(Project newProject, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(MsprojectPackage.eINSTANCE.getDocumentRoot_Project(), newProject, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setProject(Project newProject) {
-		((FeatureMap.Internal)getMixed()).set(MsprojectPackage.eINSTANCE.getDocumentRoot_Project(), newProject);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.DOCUMENT_ROOT__MIXED:
-					return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
-				case MsprojectPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-					return ((InternalEList)getXMLNSPrefixMap()).basicRemove(otherEnd, msgs);
-				case MsprojectPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-					return ((InternalEList)getXSISchemaLocation()).basicRemove(otherEnd, msgs);
-				case MsprojectPackage.DOCUMENT_ROOT__PROJECT:
-					return basicSetProject(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.DOCUMENT_ROOT__MIXED:
-				return getMixed();
-			case MsprojectPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				return getXMLNSPrefixMap();
-			case MsprojectPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				return getXSISchemaLocation();
-			case MsprojectPackage.DOCUMENT_ROOT__PROJECT:
-				return getProject();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.DOCUMENT_ROOT__MIXED:
-				getMixed().clear();
-				getMixed().addAll((Collection)newValue);
-				return;
-			case MsprojectPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				getXMLNSPrefixMap().addAll((Collection)newValue);
-				return;
-			case MsprojectPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				getXSISchemaLocation().addAll((Collection)newValue);
-				return;
-			case MsprojectPackage.DOCUMENT_ROOT__PROJECT:
-				setProject((Project)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.DOCUMENT_ROOT__MIXED:
-				getMixed().clear();
-				return;
-			case MsprojectPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				return;
-			case MsprojectPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				return;
-			case MsprojectPackage.DOCUMENT_ROOT__PROJECT:
-				setProject((Project)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.DOCUMENT_ROOT__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case MsprojectPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
-			case MsprojectPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
-			case MsprojectPackage.DOCUMENT_ROOT__PROJECT:
-				return getProject() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
-		result.append(mixed);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DocumentRootImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ExtendedAttribute2Impl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ExtendedAttribute2Impl.java
deleted file mode 100755
index f8fa5f9..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ExtendedAttribute2Impl.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExtendedAttribute2Impl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.ExtendedAttribute2;
-import org.eclipse.epf.msproject.MsprojectPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Extended Attribute2</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttribute2Impl#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttribute2Impl#getFieldID <em>Field ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttribute2Impl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttribute2Impl#getValueID <em>Value ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttribute2Impl#getDurationFormat <em>Duration Format</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExtendedAttribute2Impl extends EObjectImpl implements ExtendedAttribute2 {
-	/**
-	 * The default value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger uID = UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFieldID() <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FIELD_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFieldID() <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fieldID = FIELD_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValueID() <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger VALUE_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValueID() <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger valueID = VALUE_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDurationFormat() <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDurationFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger DURATION_FORMAT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDurationFormat() <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDurationFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger durationFormat = DURATION_FORMAT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExtendedAttribute2Impl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getExtendedAttribute2();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getUID() {
-		return uID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUID(BigInteger newUID) {
-		BigInteger oldUID = uID;
-		uID = newUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE2__UID, oldUID, uID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFieldID() {
-		return fieldID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFieldID(String newFieldID) {
-		String oldFieldID = fieldID;
-		fieldID = newFieldID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE2__FIELD_ID, oldFieldID, fieldID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE2__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getValueID() {
-		return valueID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValueID(BigInteger newValueID) {
-		BigInteger oldValueID = valueID;
-		valueID = newValueID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE2__VALUE_ID, oldValueID, valueID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getDurationFormat() {
-		return durationFormat;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDurationFormat(BigInteger newDurationFormat) {
-		BigInteger oldDurationFormat = durationFormat;
-		durationFormat = newDurationFormat;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE2__DURATION_FORMAT, oldDurationFormat, durationFormat));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__UID:
-				return getUID();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__FIELD_ID:
-				return getFieldID();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__VALUE:
-				return getValue();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__VALUE_ID:
-				return getValueID();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__DURATION_FORMAT:
-				return getDurationFormat();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__UID:
-				setUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__FIELD_ID:
-				setFieldID((String)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__VALUE:
-				setValue((String)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__VALUE_ID:
-				setValueID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__DURATION_FORMAT:
-				setDurationFormat((BigInteger)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__UID:
-				setUID(UID_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__FIELD_ID:
-				setFieldID(FIELD_ID_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__VALUE_ID:
-				setValueID(VALUE_ID_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__DURATION_FORMAT:
-				setDurationFormat(DURATION_FORMAT_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__UID:
-				return UID_EDEFAULT == null ? uID != null : !UID_EDEFAULT.equals(uID);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__FIELD_ID:
-				return FIELD_ID_EDEFAULT == null ? fieldID != null : !FIELD_ID_EDEFAULT.equals(fieldID);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__VALUE_ID:
-				return VALUE_ID_EDEFAULT == null ? valueID != null : !VALUE_ID_EDEFAULT.equals(valueID);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2__DURATION_FORMAT:
-				return DURATION_FORMAT_EDEFAULT == null ? durationFormat != null : !DURATION_FORMAT_EDEFAULT.equals(durationFormat);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (uID: ");
-		result.append(uID);
-		result.append(", fieldID: ");
-		result.append(fieldID);
-		result.append(", value: ");
-		result.append(value);
-		result.append(", valueID: ");
-		result.append(valueID);
-		result.append(", durationFormat: ");
-		result.append(durationFormat);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ExtendedAttribute2Impl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ExtendedAttribute3Impl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ExtendedAttribute3Impl.java
deleted file mode 100755
index 98c85f6..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ExtendedAttribute3Impl.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExtendedAttribute3Impl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.ExtendedAttribute3;
-import org.eclipse.epf.msproject.MsprojectPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Extended Attribute3</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttribute3Impl#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttribute3Impl#getFieldID <em>Field ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttribute3Impl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttribute3Impl#getValueID <em>Value ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttribute3Impl#getDurationFormat <em>Duration Format</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExtendedAttribute3Impl extends EObjectImpl implements ExtendedAttribute3 {
-	/**
-	 * The default value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger uID = UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFieldID() <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FIELD_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFieldID() <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fieldID = FIELD_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValueID() <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger VALUE_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValueID() <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger valueID = VALUE_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDurationFormat() <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDurationFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger DURATION_FORMAT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDurationFormat() <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDurationFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger durationFormat = DURATION_FORMAT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExtendedAttribute3Impl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getExtendedAttribute3();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getUID() {
-		return uID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUID(BigInteger newUID) {
-		BigInteger oldUID = uID;
-		uID = newUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE3__UID, oldUID, uID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFieldID() {
-		return fieldID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFieldID(String newFieldID) {
-		String oldFieldID = fieldID;
-		fieldID = newFieldID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE3__FIELD_ID, oldFieldID, fieldID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE3__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getValueID() {
-		return valueID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValueID(BigInteger newValueID) {
-		BigInteger oldValueID = valueID;
-		valueID = newValueID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE3__VALUE_ID, oldValueID, valueID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getDurationFormat() {
-		return durationFormat;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDurationFormat(BigInteger newDurationFormat) {
-		BigInteger oldDurationFormat = durationFormat;
-		durationFormat = newDurationFormat;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE3__DURATION_FORMAT, oldDurationFormat, durationFormat));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__UID:
-				return getUID();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__FIELD_ID:
-				return getFieldID();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__VALUE:
-				return getValue();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__VALUE_ID:
-				return getValueID();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__DURATION_FORMAT:
-				return getDurationFormat();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__UID:
-				setUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__FIELD_ID:
-				setFieldID((String)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__VALUE:
-				setValue((String)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__VALUE_ID:
-				setValueID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__DURATION_FORMAT:
-				setDurationFormat((BigInteger)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__UID:
-				setUID(UID_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__FIELD_ID:
-				setFieldID(FIELD_ID_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__VALUE_ID:
-				setValueID(VALUE_ID_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__DURATION_FORMAT:
-				setDurationFormat(DURATION_FORMAT_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__UID:
-				return UID_EDEFAULT == null ? uID != null : !UID_EDEFAULT.equals(uID);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__FIELD_ID:
-				return FIELD_ID_EDEFAULT == null ? fieldID != null : !FIELD_ID_EDEFAULT.equals(fieldID);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__VALUE_ID:
-				return VALUE_ID_EDEFAULT == null ? valueID != null : !VALUE_ID_EDEFAULT.equals(valueID);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3__DURATION_FORMAT:
-				return DURATION_FORMAT_EDEFAULT == null ? durationFormat != null : !DURATION_FORMAT_EDEFAULT.equals(durationFormat);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (uID: ");
-		result.append(uID);
-		result.append(", fieldID: ");
-		result.append(fieldID);
-		result.append(", value: ");
-		result.append(value);
-		result.append(", valueID: ");
-		result.append(valueID);
-		result.append(", durationFormat: ");
-		result.append(durationFormat);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ExtendedAttribute3Impl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ExtendedAttribute4Impl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ExtendedAttribute4Impl.java
deleted file mode 100755
index 1c635c7..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ExtendedAttribute4Impl.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExtendedAttribute4Impl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.ExtendedAttribute4;
-import org.eclipse.epf.msproject.MsprojectPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Extended Attribute4</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttribute4Impl#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttribute4Impl#getFieldID <em>Field ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttribute4Impl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttribute4Impl#getValueID <em>Value ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttribute4Impl#getDurationFormat <em>Duration Format</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExtendedAttribute4Impl extends EObjectImpl implements ExtendedAttribute4 {
-	/**
-	 * The default value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger uID = UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFieldID() <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FIELD_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFieldID() <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fieldID = FIELD_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValueID() <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger VALUE_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValueID() <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger valueID = VALUE_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDurationFormat() <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDurationFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger DURATION_FORMAT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDurationFormat() <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDurationFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger durationFormat = DURATION_FORMAT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExtendedAttribute4Impl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getExtendedAttribute4();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getUID() {
-		return uID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUID(BigInteger newUID) {
-		BigInteger oldUID = uID;
-		uID = newUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE4__UID, oldUID, uID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFieldID() {
-		return fieldID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFieldID(String newFieldID) {
-		String oldFieldID = fieldID;
-		fieldID = newFieldID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE4__FIELD_ID, oldFieldID, fieldID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE4__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getValueID() {
-		return valueID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValueID(BigInteger newValueID) {
-		BigInteger oldValueID = valueID;
-		valueID = newValueID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE4__VALUE_ID, oldValueID, valueID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getDurationFormat() {
-		return durationFormat;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDurationFormat(BigInteger newDurationFormat) {
-		BigInteger oldDurationFormat = durationFormat;
-		durationFormat = newDurationFormat;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE4__DURATION_FORMAT, oldDurationFormat, durationFormat));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__UID:
-				return getUID();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__FIELD_ID:
-				return getFieldID();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__VALUE:
-				return getValue();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__VALUE_ID:
-				return getValueID();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__DURATION_FORMAT:
-				return getDurationFormat();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__UID:
-				setUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__FIELD_ID:
-				setFieldID((String)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__VALUE:
-				setValue((String)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__VALUE_ID:
-				setValueID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__DURATION_FORMAT:
-				setDurationFormat((BigInteger)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__UID:
-				setUID(UID_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__FIELD_ID:
-				setFieldID(FIELD_ID_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__VALUE_ID:
-				setValueID(VALUE_ID_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__DURATION_FORMAT:
-				setDurationFormat(DURATION_FORMAT_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__UID:
-				return UID_EDEFAULT == null ? uID != null : !UID_EDEFAULT.equals(uID);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__FIELD_ID:
-				return FIELD_ID_EDEFAULT == null ? fieldID != null : !FIELD_ID_EDEFAULT.equals(fieldID);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__VALUE_ID:
-				return VALUE_ID_EDEFAULT == null ? valueID != null : !VALUE_ID_EDEFAULT.equals(valueID);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4__DURATION_FORMAT:
-				return DURATION_FORMAT_EDEFAULT == null ? durationFormat != null : !DURATION_FORMAT_EDEFAULT.equals(durationFormat);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (uID: ");
-		result.append(uID);
-		result.append(", fieldID: ");
-		result.append(fieldID);
-		result.append(", value: ");
-		result.append(value);
-		result.append(", valueID: ");
-		result.append(valueID);
-		result.append(", durationFormat: ");
-		result.append(durationFormat);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ExtendedAttribute4Impl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ExtendedAttributeImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ExtendedAttributeImpl.java
deleted file mode 100755
index c8b49fe..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ExtendedAttributeImpl.java
+++ /dev/null
@@ -1,853 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExtendedAttributeImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.ExtendedAttribute;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.ValueList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Extended Attribute</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttributeImpl#getFieldID <em>Field ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttributeImpl#getFieldName <em>Field Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttributeImpl#getAlias <em>Alias</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttributeImpl#getPhoneticAlias <em>Phonetic Alias</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttributeImpl#getRollupType <em>Rollup Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttributeImpl#getCalculationType <em>Calculation Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttributeImpl#getFormula <em>Formula</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttributeImpl#isRestrictValues <em>Restrict Values</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttributeImpl#getValuelistSortOrder <em>Valuelist Sort Order</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttributeImpl#isAppendNewValues <em>Append New Values</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttributeImpl#getDefault <em>Default</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttributeImpl#getValueList <em>Value List</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExtendedAttributeImpl extends EObjectImpl implements ExtendedAttribute {
-	/**
-	 * The default value of the '{@link #getFieldID() <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FIELD_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFieldID() <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fieldID = FIELD_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFieldName() <em>Field Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FIELD_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFieldName() <em>Field Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fieldName = FIELD_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlias()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ALIAS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlias()
-	 * @generated
-	 * @ordered
-	 */
-	protected String alias = ALIAS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPhoneticAlias() <em>Phonetic Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPhoneticAlias()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PHONETIC_ALIAS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPhoneticAlias() <em>Phonetic Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPhoneticAlias()
-	 * @generated
-	 * @ordered
-	 */
-	protected String phoneticAlias = PHONETIC_ALIAS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRollupType() <em>Rollup Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRollupType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger ROLLUP_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRollupType() <em>Rollup Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRollupType()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger rollupType = ROLLUP_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCalculationType() <em>Calculation Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCalculationType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger CALCULATION_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCalculationType() <em>Calculation Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCalculationType()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger calculationType = CALCULATION_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFormula() <em>Formula</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFormula()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FORMULA_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFormula() <em>Formula</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFormula()
-	 * @generated
-	 * @ordered
-	 */
-	protected String formula = FORMULA_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isRestrictValues() <em>Restrict Values</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRestrictValues()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean RESTRICT_VALUES_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isRestrictValues() <em>Restrict Values</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRestrictValues()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean restrictValues = RESTRICT_VALUES_EDEFAULT;
-
-	/**
-	 * This is true if the Restrict Values attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean restrictValuesESet = false;
-
-	/**
-	 * The default value of the '{@link #getValuelistSortOrder() <em>Valuelist Sort Order</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValuelistSortOrder()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger VALUELIST_SORT_ORDER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValuelistSortOrder() <em>Valuelist Sort Order</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValuelistSortOrder()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger valuelistSortOrder = VALUELIST_SORT_ORDER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isAppendNewValues() <em>Append New Values</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAppendNewValues()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean APPEND_NEW_VALUES_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isAppendNewValues() <em>Append New Values</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAppendNewValues()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean appendNewValues = APPEND_NEW_VALUES_EDEFAULT;
-
-	/**
-	 * This is true if the Append New Values attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean appendNewValuesESet = false;
-
-	/**
-	 * The default value of the '{@link #getDefault() <em>Default</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefault()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DEFAULT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDefault() <em>Default</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefault()
-	 * @generated
-	 * @ordered
-	 */
-	protected String default_ = DEFAULT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getValueList() <em>Value List</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueList()
-	 * @generated
-	 * @ordered
-	 */
-	protected ValueList valueList = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExtendedAttributeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getExtendedAttribute();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFieldID() {
-		return fieldID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFieldID(String newFieldID) {
-		String oldFieldID = fieldID;
-		fieldID = newFieldID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE__FIELD_ID, oldFieldID, fieldID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFieldName() {
-		return fieldName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFieldName(String newFieldName) {
-		String oldFieldName = fieldName;
-		fieldName = newFieldName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE__FIELD_NAME, oldFieldName, fieldName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAlias() {
-		return alias;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAlias(String newAlias) {
-		String oldAlias = alias;
-		alias = newAlias;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE__ALIAS, oldAlias, alias));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPhoneticAlias() {
-		return phoneticAlias;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPhoneticAlias(String newPhoneticAlias) {
-		String oldPhoneticAlias = phoneticAlias;
-		phoneticAlias = newPhoneticAlias;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE__PHONETIC_ALIAS, oldPhoneticAlias, phoneticAlias));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getRollupType() {
-		return rollupType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRollupType(BigInteger newRollupType) {
-		BigInteger oldRollupType = rollupType;
-		rollupType = newRollupType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE__ROLLUP_TYPE, oldRollupType, rollupType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getCalculationType() {
-		return calculationType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCalculationType(BigInteger newCalculationType) {
-		BigInteger oldCalculationType = calculationType;
-		calculationType = newCalculationType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE__CALCULATION_TYPE, oldCalculationType, calculationType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFormula() {
-		return formula;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFormula(String newFormula) {
-		String oldFormula = formula;
-		formula = newFormula;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE__FORMULA, oldFormula, formula));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isRestrictValues() {
-		return restrictValues;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRestrictValues(boolean newRestrictValues) {
-		boolean oldRestrictValues = restrictValues;
-		restrictValues = newRestrictValues;
-		boolean oldRestrictValuesESet = restrictValuesESet;
-		restrictValuesESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE__RESTRICT_VALUES, oldRestrictValues, restrictValues, !oldRestrictValuesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetRestrictValues() {
-		boolean oldRestrictValues = restrictValues;
-		boolean oldRestrictValuesESet = restrictValuesESet;
-		restrictValues = RESTRICT_VALUES_EDEFAULT;
-		restrictValuesESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.EXTENDED_ATTRIBUTE__RESTRICT_VALUES, oldRestrictValues, RESTRICT_VALUES_EDEFAULT, oldRestrictValuesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetRestrictValues() {
-		return restrictValuesESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getValuelistSortOrder() {
-		return valuelistSortOrder;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValuelistSortOrder(BigInteger newValuelistSortOrder) {
-		BigInteger oldValuelistSortOrder = valuelistSortOrder;
-		valuelistSortOrder = newValuelistSortOrder;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE__VALUELIST_SORT_ORDER, oldValuelistSortOrder, valuelistSortOrder));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isAppendNewValues() {
-		return appendNewValues;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAppendNewValues(boolean newAppendNewValues) {
-		boolean oldAppendNewValues = appendNewValues;
-		appendNewValues = newAppendNewValues;
-		boolean oldAppendNewValuesESet = appendNewValuesESet;
-		appendNewValuesESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE__APPEND_NEW_VALUES, oldAppendNewValues, appendNewValues, !oldAppendNewValuesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetAppendNewValues() {
-		boolean oldAppendNewValues = appendNewValues;
-		boolean oldAppendNewValuesESet = appendNewValuesESet;
-		appendNewValues = APPEND_NEW_VALUES_EDEFAULT;
-		appendNewValuesESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.EXTENDED_ATTRIBUTE__APPEND_NEW_VALUES, oldAppendNewValues, APPEND_NEW_VALUES_EDEFAULT, oldAppendNewValuesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetAppendNewValues() {
-		return appendNewValuesESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDefault() {
-		return default_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefault(String newDefault) {
-		String oldDefault = default_;
-		default_ = newDefault;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE__DEFAULT, oldDefault, default_));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ValueList getValueList() {
-		return valueList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValueList(ValueList newValueList, NotificationChain msgs) {
-		ValueList oldValueList = valueList;
-		valueList = newValueList;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE__VALUE_LIST, oldValueList, newValueList);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValueList(ValueList newValueList) {
-		if (newValueList != valueList) {
-			NotificationChain msgs = null;
-			if (valueList != null)
-				msgs = ((InternalEObject)valueList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.EXTENDED_ATTRIBUTE__VALUE_LIST, null, msgs);
-			if (newValueList != null)
-				msgs = ((InternalEObject)newValueList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.EXTENDED_ATTRIBUTE__VALUE_LIST, null, msgs);
-			msgs = basicSetValueList(newValueList, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.EXTENDED_ATTRIBUTE__VALUE_LIST, newValueList, newValueList));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.EXTENDED_ATTRIBUTE__VALUE_LIST:
-					return basicSetValueList(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__FIELD_ID:
-				return getFieldID();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__FIELD_NAME:
-				return getFieldName();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__ALIAS:
-				return getAlias();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__PHONETIC_ALIAS:
-				return getPhoneticAlias();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__ROLLUP_TYPE:
-				return getRollupType();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__CALCULATION_TYPE:
-				return getCalculationType();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__FORMULA:
-				return getFormula();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__RESTRICT_VALUES:
-				return isRestrictValues() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__VALUELIST_SORT_ORDER:
-				return getValuelistSortOrder();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__APPEND_NEW_VALUES:
-				return isAppendNewValues() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__DEFAULT:
-				return getDefault();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__VALUE_LIST:
-				return getValueList();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__FIELD_ID:
-				setFieldID((String)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__FIELD_NAME:
-				setFieldName((String)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__ALIAS:
-				setAlias((String)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__PHONETIC_ALIAS:
-				setPhoneticAlias((String)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__ROLLUP_TYPE:
-				setRollupType((BigInteger)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__CALCULATION_TYPE:
-				setCalculationType((BigInteger)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__FORMULA:
-				setFormula((String)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__RESTRICT_VALUES:
-				setRestrictValues(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__VALUELIST_SORT_ORDER:
-				setValuelistSortOrder((BigInteger)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__APPEND_NEW_VALUES:
-				setAppendNewValues(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__DEFAULT:
-				setDefault((String)newValue);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__VALUE_LIST:
-				setValueList((ValueList)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__FIELD_ID:
-				setFieldID(FIELD_ID_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__FIELD_NAME:
-				setFieldName(FIELD_NAME_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__ALIAS:
-				setAlias(ALIAS_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__PHONETIC_ALIAS:
-				setPhoneticAlias(PHONETIC_ALIAS_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__ROLLUP_TYPE:
-				setRollupType(ROLLUP_TYPE_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__CALCULATION_TYPE:
-				setCalculationType(CALCULATION_TYPE_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__FORMULA:
-				setFormula(FORMULA_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__RESTRICT_VALUES:
-				unsetRestrictValues();
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__VALUELIST_SORT_ORDER:
-				setValuelistSortOrder(VALUELIST_SORT_ORDER_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__APPEND_NEW_VALUES:
-				unsetAppendNewValues();
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__DEFAULT:
-				setDefault(DEFAULT_EDEFAULT);
-				return;
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__VALUE_LIST:
-				setValueList((ValueList)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__FIELD_ID:
-				return FIELD_ID_EDEFAULT == null ? fieldID != null : !FIELD_ID_EDEFAULT.equals(fieldID);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__FIELD_NAME:
-				return FIELD_NAME_EDEFAULT == null ? fieldName != null : !FIELD_NAME_EDEFAULT.equals(fieldName);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__ALIAS:
-				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__PHONETIC_ALIAS:
-				return PHONETIC_ALIAS_EDEFAULT == null ? phoneticAlias != null : !PHONETIC_ALIAS_EDEFAULT.equals(phoneticAlias);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__ROLLUP_TYPE:
-				return ROLLUP_TYPE_EDEFAULT == null ? rollupType != null : !ROLLUP_TYPE_EDEFAULT.equals(rollupType);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__CALCULATION_TYPE:
-				return CALCULATION_TYPE_EDEFAULT == null ? calculationType != null : !CALCULATION_TYPE_EDEFAULT.equals(calculationType);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__FORMULA:
-				return FORMULA_EDEFAULT == null ? formula != null : !FORMULA_EDEFAULT.equals(formula);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__RESTRICT_VALUES:
-				return isSetRestrictValues();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__VALUELIST_SORT_ORDER:
-				return VALUELIST_SORT_ORDER_EDEFAULT == null ? valuelistSortOrder != null : !VALUELIST_SORT_ORDER_EDEFAULT.equals(valuelistSortOrder);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__APPEND_NEW_VALUES:
-				return isSetAppendNewValues();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__DEFAULT:
-				return DEFAULT_EDEFAULT == null ? default_ != null : !DEFAULT_EDEFAULT.equals(default_);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE__VALUE_LIST:
-				return valueList != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (fieldID: ");
-		result.append(fieldID);
-		result.append(", fieldName: ");
-		result.append(fieldName);
-		result.append(", alias: ");
-		result.append(alias);
-		result.append(", phoneticAlias: ");
-		result.append(phoneticAlias);
-		result.append(", rollupType: ");
-		result.append(rollupType);
-		result.append(", calculationType: ");
-		result.append(calculationType);
-		result.append(", formula: ");
-		result.append(formula);
-		result.append(", restrictValues: ");
-		if (restrictValuesESet) result.append(restrictValues); else result.append("<unset>");
-		result.append(", valuelistSortOrder: ");
-		result.append(valuelistSortOrder);
-		result.append(", appendNewValues: ");
-		if (appendNewValuesESet) result.append(appendNewValues); else result.append("<unset>");
-		result.append(", default: ");
-		result.append(default_);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ExtendedAttributeImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ExtendedAttributesImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ExtendedAttributesImpl.java
deleted file mode 100755
index a0607f7..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ExtendedAttributesImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExtendedAttributesImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.ExtendedAttribute;
-import org.eclipse.epf.msproject.ExtendedAttributes;
-import org.eclipse.epf.msproject.MsprojectPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Extended Attributes</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.ExtendedAttributesImpl#getExtendedAttribute <em>Extended Attribute</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExtendedAttributesImpl extends EObjectImpl implements ExtendedAttributes {
-	/**
-	 * The cached value of the '{@link #getExtendedAttribute() <em>Extended Attribute</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList extendedAttribute = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExtendedAttributesImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getExtendedAttributes();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getExtendedAttribute() {
-		if (extendedAttribute == null) {
-			extendedAttribute = new EObjectContainmentEList(ExtendedAttribute.class, this, MsprojectPackage.EXTENDED_ATTRIBUTES__EXTENDED_ATTRIBUTE);
-		}
-		return extendedAttribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.EXTENDED_ATTRIBUTES__EXTENDED_ATTRIBUTE:
-					return ((InternalEList)getExtendedAttribute()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTES__EXTENDED_ATTRIBUTE:
-				return getExtendedAttribute();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTES__EXTENDED_ATTRIBUTE:
-				getExtendedAttribute().clear();
-				getExtendedAttribute().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTES__EXTENDED_ATTRIBUTE:
-				getExtendedAttribute().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.EXTENDED_ATTRIBUTES__EXTENDED_ATTRIBUTE:
-				return extendedAttribute != null && !extendedAttribute.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //ExtendedAttributesImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/MaskImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/MaskImpl.java
deleted file mode 100755
index 4a0f105..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/MaskImpl.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MaskImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.Mask;
-import org.eclipse.epf.msproject.MsprojectPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Mask</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.MaskImpl#getLevel <em>Level</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.MaskImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.MaskImpl#getLength <em>Length</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.MaskImpl#getSeparator <em>Separator</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MaskImpl extends EObjectImpl implements Mask {
-	/**
-	 * The default value of the '{@link #getLevel() <em>Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevel()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger LEVEL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLevel() <em>Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevel()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger level = LEVEL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger type = TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLength() <em>Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLength()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger LENGTH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLength() <em>Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLength()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger length = LENGTH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSeparator() <em>Separator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSeparator()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SEPARATOR_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSeparator() <em>Separator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSeparator()
-	 * @generated
-	 * @ordered
-	 */
-	protected String separator = SEPARATOR_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MaskImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getMask();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getLevel() {
-		return level;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLevel(BigInteger newLevel) {
-		BigInteger oldLevel = level;
-		level = newLevel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.MASK__LEVEL, oldLevel, level));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(BigInteger newType) {
-		BigInteger oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.MASK__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getLength() {
-		return length;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLength(BigInteger newLength) {
-		BigInteger oldLength = length;
-		length = newLength;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.MASK__LENGTH, oldLength, length));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSeparator() {
-		return separator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSeparator(String newSeparator) {
-		String oldSeparator = separator;
-		separator = newSeparator;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.MASK__SEPARATOR, oldSeparator, separator));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.MASK__LEVEL:
-				return getLevel();
-			case MsprojectPackage.MASK__TYPE:
-				return getType();
-			case MsprojectPackage.MASK__LENGTH:
-				return getLength();
-			case MsprojectPackage.MASK__SEPARATOR:
-				return getSeparator();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.MASK__LEVEL:
-				setLevel((BigInteger)newValue);
-				return;
-			case MsprojectPackage.MASK__TYPE:
-				setType((BigInteger)newValue);
-				return;
-			case MsprojectPackage.MASK__LENGTH:
-				setLength((BigInteger)newValue);
-				return;
-			case MsprojectPackage.MASK__SEPARATOR:
-				setSeparator((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.MASK__LEVEL:
-				setLevel(LEVEL_EDEFAULT);
-				return;
-			case MsprojectPackage.MASK__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case MsprojectPackage.MASK__LENGTH:
-				setLength(LENGTH_EDEFAULT);
-				return;
-			case MsprojectPackage.MASK__SEPARATOR:
-				setSeparator(SEPARATOR_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.MASK__LEVEL:
-				return LEVEL_EDEFAULT == null ? level != null : !LEVEL_EDEFAULT.equals(level);
-			case MsprojectPackage.MASK__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case MsprojectPackage.MASK__LENGTH:
-				return LENGTH_EDEFAULT == null ? length != null : !LENGTH_EDEFAULT.equals(length);
-			case MsprojectPackage.MASK__SEPARATOR:
-				return SEPARATOR_EDEFAULT == null ? separator != null : !SEPARATOR_EDEFAULT.equals(separator);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (level: ");
-		result.append(level);
-		result.append(", type: ");
-		result.append(type);
-		result.append(", length: ");
-		result.append(length);
-		result.append(", separator: ");
-		result.append(separator);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MaskImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/MasksImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/MasksImpl.java
deleted file mode 100755
index 3159e43..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/MasksImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MasksImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.Mask;
-import org.eclipse.epf.msproject.Masks;
-import org.eclipse.epf.msproject.MsprojectPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Masks</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.MasksImpl#getMask <em>Mask</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MasksImpl extends EObjectImpl implements Masks {
-	/**
-	 * The cached value of the '{@link #getMask() <em>Mask</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMask()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList mask = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MasksImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getMasks();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMask() {
-		if (mask == null) {
-			mask = new EObjectContainmentEList(Mask.class, this, MsprojectPackage.MASKS__MASK);
-		}
-		return mask;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.MASKS__MASK:
-					return ((InternalEList)getMask()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.MASKS__MASK:
-				return getMask();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.MASKS__MASK:
-				getMask().clear();
-				getMask().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.MASKS__MASK:
-				getMask().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.MASKS__MASK:
-				return mask != null && !mask.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //MasksImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/MsprojectFactoryImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/MsprojectFactoryImpl.java
deleted file mode 100755
index 1d4fc6e..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/MsprojectFactoryImpl.java
+++ /dev/null
@@ -1,2344 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MsprojectFactoryImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.epf.msproject.Assignment;
-import org.eclipse.epf.msproject.Assignments;
-import org.eclipse.epf.msproject.AvailabilityPeriod;
-import org.eclipse.epf.msproject.AvailabilityPeriods;
-import org.eclipse.epf.msproject.Baseline;
-import org.eclipse.epf.msproject.Baseline2;
-import org.eclipse.epf.msproject.Baseline3;
-import org.eclipse.epf.msproject.Calendar;
-import org.eclipse.epf.msproject.Calendars;
-import org.eclipse.epf.msproject.DocumentRoot;
-import org.eclipse.epf.msproject.ExtendedAttribute;
-import org.eclipse.epf.msproject.ExtendedAttribute2;
-import org.eclipse.epf.msproject.ExtendedAttribute3;
-import org.eclipse.epf.msproject.ExtendedAttribute4;
-import org.eclipse.epf.msproject.ExtendedAttributes;
-import org.eclipse.epf.msproject.Mask;
-import org.eclipse.epf.msproject.Masks;
-import org.eclipse.epf.msproject.MsprojectFactory;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.OutlineCode;
-import org.eclipse.epf.msproject.OutlineCode2;
-import org.eclipse.epf.msproject.OutlineCode3;
-import org.eclipse.epf.msproject.OutlineCodes;
-import org.eclipse.epf.msproject.PredecessorLink;
-import org.eclipse.epf.msproject.Project;
-import org.eclipse.epf.msproject.Rate;
-import org.eclipse.epf.msproject.Rates;
-import org.eclipse.epf.msproject.Resource;
-import org.eclipse.epf.msproject.Resources;
-import org.eclipse.epf.msproject.Task;
-import org.eclipse.epf.msproject.Tasks;
-import org.eclipse.epf.msproject.TimePeriod;
-import org.eclipse.epf.msproject.TimephasedDataType;
-import org.eclipse.epf.msproject.Value;
-import org.eclipse.epf.msproject.Value2;
-import org.eclipse.epf.msproject.ValueList;
-import org.eclipse.epf.msproject.Values;
-import org.eclipse.epf.msproject.WBSMask;
-import org.eclipse.epf.msproject.WBSMasks;
-import org.eclipse.epf.msproject.WeekDay;
-import org.eclipse.epf.msproject.WeekDays;
-import org.eclipse.epf.msproject.WorkingTime;
-import org.eclipse.epf.msproject.WorkingTimes;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MsprojectFactoryImpl extends EFactoryImpl implements MsprojectFactory {
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MsprojectFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case MsprojectPackage.ASSIGNMENT: return createAssignment();
-			case MsprojectPackage.ASSIGNMENTS: return createAssignments();
-			case MsprojectPackage.AVAILABILITY_PERIOD: return createAvailabilityPeriod();
-			case MsprojectPackage.AVAILABILITY_PERIODS: return createAvailabilityPeriods();
-			case MsprojectPackage.BASELINE: return createBaseline();
-			case MsprojectPackage.BASELINE2: return createBaseline2();
-			case MsprojectPackage.BASELINE3: return createBaseline3();
-			case MsprojectPackage.CALENDAR: return createCalendar();
-			case MsprojectPackage.CALENDARS: return createCalendars();
-			case MsprojectPackage.DOCUMENT_ROOT: return createDocumentRoot();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE: return createExtendedAttribute();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2: return createExtendedAttribute2();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3: return createExtendedAttribute3();
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4: return createExtendedAttribute4();
-			case MsprojectPackage.EXTENDED_ATTRIBUTES: return createExtendedAttributes();
-			case MsprojectPackage.MASK: return createMask();
-			case MsprojectPackage.MASKS: return createMasks();
-			case MsprojectPackage.OUTLINE_CODE: return createOutlineCode();
-			case MsprojectPackage.OUTLINE_CODE2: return createOutlineCode2();
-			case MsprojectPackage.OUTLINE_CODE3: return createOutlineCode3();
-			case MsprojectPackage.OUTLINE_CODES: return createOutlineCodes();
-			case MsprojectPackage.PREDECESSOR_LINK: return createPredecessorLink();
-			case MsprojectPackage.PROJECT: return createProject();
-			case MsprojectPackage.RATE: return createRate();
-			case MsprojectPackage.RATES: return createRates();
-			case MsprojectPackage.RESOURCE: return createResource();
-			case MsprojectPackage.RESOURCES: return createResources();
-			case MsprojectPackage.TASK: return createTask();
-			case MsprojectPackage.TASKS: return createTasks();
-			case MsprojectPackage.TIME_PERIOD: return createTimePeriod();
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE: return createTimephasedDataType();
-			case MsprojectPackage.VALUE: return createValue();
-			case MsprojectPackage.VALUE2: return createValue2();
-			case MsprojectPackage.VALUE_LIST: return createValueList();
-			case MsprojectPackage.VALUES: return createValues();
-			case MsprojectPackage.WBS_MASK: return createWBSMask();
-			case MsprojectPackage.WBS_MASKS: return createWBSMasks();
-			case MsprojectPackage.WEEK_DAY: return createWeekDay();
-			case MsprojectPackage.WEEK_DAYS: return createWeekDays();
-			case MsprojectPackage.WORKING_TIME: return createWorkingTime();
-			case MsprojectPackage.WORKING_TIMES: return createWorkingTimes();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case MsprojectPackage.ACCRUE_AT:
-				return createAccrueAtFromString(eDataType, initialValue);
-			case MsprojectPackage.ACTIVE_DIRECTORY_GUID_TYPE:
-				return createActiveDirectoryGUIDTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.ALIAS_TYPE:
-				return createAliasTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.AUTHOR_TYPE:
-				return createAuthorTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.BASELINE_FOR_EARNED_VALUE_TYPE:
-				return createBaselineForEarnedValueTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.BOOKING_TYPE_TYPE:
-				return createBookingTypeTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.BOOKING_TYPE_TYPE1:
-				return createBookingTypeType1FromString(eDataType, initialValue);
-			case MsprojectPackage.CALCULATION_TYPE_TYPE:
-				return createCalculationTypeTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.CATEGORY_TYPE:
-				return createCategoryTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.CODE_TYPE:
-				return createCodeTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.COMPANY_TYPE:
-				return createCompanyTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.CONSTRAINT_TYPE_TYPE:
-				return createConstraintTypeTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.CONTACT_TYPE:
-				return createContactTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.COST_RATE_TABLE_TYPE:
-				return createCostRateTableTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.CURRENCY_SYMBOL_POSITION_TYPE:
-				return createCurrencySymbolPositionTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.CURRENCY_SYMBOL_TYPE:
-				return createCurrencySymbolTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.DAY_TYPE_TYPE:
-				return createDayTypeTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.DEFAULT_FIXED_COST_ACCRUAL_TYPE:
-				return createDefaultFixedCostAccrualTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.DEFAULT_TASK_EV_METHOD_TYPE:
-				return createDefaultTaskEVMethodTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.DEFAULT_TASK_TYPE_TYPE:
-				return createDefaultTaskTypeTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.DURATION_FORMAT_TYPE:
-				return createDurationFormatTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.DURATION_FORMAT_TYPE1:
-				return createDurationFormatType1FromString(eDataType, initialValue);
-			case MsprojectPackage.DURATION_FORMAT_TYPE2:
-				return createDurationFormatType2FromString(eDataType, initialValue);
-			case MsprojectPackage.DURATION_FORMAT_TYPE3:
-				return createDurationFormatType3FromString(eDataType, initialValue);
-			case MsprojectPackage.DURATION_FORMAT_TYPE4:
-				return createDurationFormatType4FromString(eDataType, initialValue);
-			case MsprojectPackage.DURATION_FORMAT_TYPE5:
-				return createDurationFormatType5FromString(eDataType, initialValue);
-			case MsprojectPackage.EARNED_VALUE_METHOD_TYPE:
-				return createEarnedValueMethodTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.EARNED_VALUE_METHOD_TYPE1:
-				return createEarnedValueMethodType1FromString(eDataType, initialValue);
-			case MsprojectPackage.EMAIL_ADDRESS_TYPE:
-				return createEmailAddressTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.EXTERNAL_TASK_PROJECT_TYPE:
-				return createExternalTaskProjectTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.FIXED_COST_ACCRUAL_TYPE:
-				return createFixedCostAccrualTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.FY_START_DATE_TYPE:
-				return createFYStartDateTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.GROUP_TYPE:
-				return createGroupTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.HYPERLINK_ADDRESS_TYPE:
-				return createHyperlinkAddressTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.HYPERLINK_ADDRESS_TYPE1:
-				return createHyperlinkAddressType1FromString(eDataType, initialValue);
-			case MsprojectPackage.HYPERLINK_ADDRESS_TYPE2:
-				return createHyperlinkAddressType2FromString(eDataType, initialValue);
-			case MsprojectPackage.HYPERLINK_SUB_ADDRESS_TYPE:
-				return createHyperlinkSubAddressTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.HYPERLINK_SUB_ADDRESS_TYPE1:
-				return createHyperlinkSubAddressType1FromString(eDataType, initialValue);
-			case MsprojectPackage.HYPERLINK_SUB_ADDRESS_TYPE2:
-				return createHyperlinkSubAddressType2FromString(eDataType, initialValue);
-			case MsprojectPackage.HYPERLINK_TYPE:
-				return createHyperlinkTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.HYPERLINK_TYPE1:
-				return createHyperlinkType1FromString(eDataType, initialValue);
-			case MsprojectPackage.HYPERLINK_TYPE2:
-				return createHyperlinkType2FromString(eDataType, initialValue);
-			case MsprojectPackage.INITIALS_TYPE:
-				return createInitialsTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.LAG_FORMAT_TYPE:
-				return createLagFormatTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.LEVELING_DELAY_FORMAT_TYPE:
-				return createLevelingDelayFormatTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.LEVELING_DELAY_FORMAT_TYPE1:
-				return createLevelingDelayFormatType1FromString(eDataType, initialValue);
-			case MsprojectPackage.MANAGER_TYPE:
-				return createManagerTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.MATERIAL_LABEL_TYPE:
-				return createMaterialLabelTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.NAME_TYPE:
-				return createNameTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.NAME_TYPE1:
-				return createNameType1FromString(eDataType, initialValue);
-			case MsprojectPackage.NAME_TYPE2:
-				return createNameType2FromString(eDataType, initialValue);
-			case MsprojectPackage.NAME_TYPE3:
-				return createNameType3FromString(eDataType, initialValue);
-			case MsprojectPackage.NEW_TASK_START_DATE_TYPE:
-				return createNewTaskStartDateTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.NT_ACCOUNT_TYPE:
-				return createNTAccountTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.OUTLINE_NUMBER_TYPE:
-				return createOutlineNumberTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.OVERTIME_RATE_FORMAT_TYPE:
-				return createOvertimeRateFormatTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.OVERTIME_RATE_FORMAT_TYPE1:
-				return createOvertimeRateFormatType1FromString(eDataType, initialValue);
-			case MsprojectPackage.PHONETIC_ALIAS_TYPE:
-				return createPhoneticAliasTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.PHONETICS_TYPE:
-				return createPhoneticsTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.PREFIX_TYPE:
-				return createPrefixTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.RATE_TABLE_TYPE:
-				return createRateTableTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.ROLLUP_TYPE_TYPE:
-				return createRollupTypeTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.STANDARD_RATE_FORMAT_TYPE:
-				return createStandardRateFormatTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.STANDARD_RATE_FORMAT_TYPE1:
-				return createStandardRateFormatType1FromString(eDataType, initialValue);
-			case MsprojectPackage.SUBJECT_TYPE:
-				return createSubjectTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.SUBPROJECT_NAME_TYPE:
-				return createSubprojectNameTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.TITLE_TYPE:
-				return createTitleTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.TYPE_TYPE:
-				return createTypeTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.TYPE_TYPE1:
-				return createTypeType1FromString(eDataType, initialValue);
-			case MsprojectPackage.TYPE_TYPE2:
-				return createTypeType2FromString(eDataType, initialValue);
-			case MsprojectPackage.TYPE_TYPE3:
-				return createTypeType3FromString(eDataType, initialValue);
-			case MsprojectPackage.TYPE_TYPE4:
-				return createTypeType4FromString(eDataType, initialValue);
-			case MsprojectPackage.TYPE_TYPE5:
-				return createTypeType5FromString(eDataType, initialValue);
-			case MsprojectPackage.UID_TYPE:
-				return createUIDTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.UNIT_TYPE:
-				return createUnitTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.VALUELIST_SORT_ORDER_TYPE:
-				return createValuelistSortOrderTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.WEEK_START_DAY_TYPE:
-				return createWeekStartDayTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.WORK_CONTOUR_TYPE:
-				return createWorkContourTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.WORK_FORMAT_TYPE:
-				return createWorkFormatTypeFromString(eDataType, initialValue);
-			case MsprojectPackage.WORK_GROUP_TYPE:
-				return createWorkGroupTypeFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case MsprojectPackage.ACCRUE_AT:
-				return convertAccrueAtToString(eDataType, instanceValue);
-			case MsprojectPackage.ACTIVE_DIRECTORY_GUID_TYPE:
-				return convertActiveDirectoryGUIDTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.ALIAS_TYPE:
-				return convertAliasTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.AUTHOR_TYPE:
-				return convertAuthorTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.BASELINE_FOR_EARNED_VALUE_TYPE:
-				return convertBaselineForEarnedValueTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.BOOKING_TYPE_TYPE:
-				return convertBookingTypeTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.BOOKING_TYPE_TYPE1:
-				return convertBookingTypeType1ToString(eDataType, instanceValue);
-			case MsprojectPackage.CALCULATION_TYPE_TYPE:
-				return convertCalculationTypeTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.CATEGORY_TYPE:
-				return convertCategoryTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.CODE_TYPE:
-				return convertCodeTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.COMPANY_TYPE:
-				return convertCompanyTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.CONSTRAINT_TYPE_TYPE:
-				return convertConstraintTypeTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.CONTACT_TYPE:
-				return convertContactTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.COST_RATE_TABLE_TYPE:
-				return convertCostRateTableTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.CURRENCY_SYMBOL_POSITION_TYPE:
-				return convertCurrencySymbolPositionTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.CURRENCY_SYMBOL_TYPE:
-				return convertCurrencySymbolTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.DAY_TYPE_TYPE:
-				return convertDayTypeTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.DEFAULT_FIXED_COST_ACCRUAL_TYPE:
-				return convertDefaultFixedCostAccrualTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.DEFAULT_TASK_EV_METHOD_TYPE:
-				return convertDefaultTaskEVMethodTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.DEFAULT_TASK_TYPE_TYPE:
-				return convertDefaultTaskTypeTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.DURATION_FORMAT_TYPE:
-				return convertDurationFormatTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.DURATION_FORMAT_TYPE1:
-				return convertDurationFormatType1ToString(eDataType, instanceValue);
-			case MsprojectPackage.DURATION_FORMAT_TYPE2:
-				return convertDurationFormatType2ToString(eDataType, instanceValue);
-			case MsprojectPackage.DURATION_FORMAT_TYPE3:
-				return convertDurationFormatType3ToString(eDataType, instanceValue);
-			case MsprojectPackage.DURATION_FORMAT_TYPE4:
-				return convertDurationFormatType4ToString(eDataType, instanceValue);
-			case MsprojectPackage.DURATION_FORMAT_TYPE5:
-				return convertDurationFormatType5ToString(eDataType, instanceValue);
-			case MsprojectPackage.EARNED_VALUE_METHOD_TYPE:
-				return convertEarnedValueMethodTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.EARNED_VALUE_METHOD_TYPE1:
-				return convertEarnedValueMethodType1ToString(eDataType, instanceValue);
-			case MsprojectPackage.EMAIL_ADDRESS_TYPE:
-				return convertEmailAddressTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.EXTERNAL_TASK_PROJECT_TYPE:
-				return convertExternalTaskProjectTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.FIXED_COST_ACCRUAL_TYPE:
-				return convertFixedCostAccrualTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.FY_START_DATE_TYPE:
-				return convertFYStartDateTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.GROUP_TYPE:
-				return convertGroupTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.HYPERLINK_ADDRESS_TYPE:
-				return convertHyperlinkAddressTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.HYPERLINK_ADDRESS_TYPE1:
-				return convertHyperlinkAddressType1ToString(eDataType, instanceValue);
-			case MsprojectPackage.HYPERLINK_ADDRESS_TYPE2:
-				return convertHyperlinkAddressType2ToString(eDataType, instanceValue);
-			case MsprojectPackage.HYPERLINK_SUB_ADDRESS_TYPE:
-				return convertHyperlinkSubAddressTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.HYPERLINK_SUB_ADDRESS_TYPE1:
-				return convertHyperlinkSubAddressType1ToString(eDataType, instanceValue);
-			case MsprojectPackage.HYPERLINK_SUB_ADDRESS_TYPE2:
-				return convertHyperlinkSubAddressType2ToString(eDataType, instanceValue);
-			case MsprojectPackage.HYPERLINK_TYPE:
-				return convertHyperlinkTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.HYPERLINK_TYPE1:
-				return convertHyperlinkType1ToString(eDataType, instanceValue);
-			case MsprojectPackage.HYPERLINK_TYPE2:
-				return convertHyperlinkType2ToString(eDataType, instanceValue);
-			case MsprojectPackage.INITIALS_TYPE:
-				return convertInitialsTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.LAG_FORMAT_TYPE:
-				return convertLagFormatTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.LEVELING_DELAY_FORMAT_TYPE:
-				return convertLevelingDelayFormatTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.LEVELING_DELAY_FORMAT_TYPE1:
-				return convertLevelingDelayFormatType1ToString(eDataType, instanceValue);
-			case MsprojectPackage.MANAGER_TYPE:
-				return convertManagerTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.MATERIAL_LABEL_TYPE:
-				return convertMaterialLabelTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.NAME_TYPE:
-				return convertNameTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.NAME_TYPE1:
-				return convertNameType1ToString(eDataType, instanceValue);
-			case MsprojectPackage.NAME_TYPE2:
-				return convertNameType2ToString(eDataType, instanceValue);
-			case MsprojectPackage.NAME_TYPE3:
-				return convertNameType3ToString(eDataType, instanceValue);
-			case MsprojectPackage.NEW_TASK_START_DATE_TYPE:
-				return convertNewTaskStartDateTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.NT_ACCOUNT_TYPE:
-				return convertNTAccountTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.OUTLINE_NUMBER_TYPE:
-				return convertOutlineNumberTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.OVERTIME_RATE_FORMAT_TYPE:
-				return convertOvertimeRateFormatTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.OVERTIME_RATE_FORMAT_TYPE1:
-				return convertOvertimeRateFormatType1ToString(eDataType, instanceValue);
-			case MsprojectPackage.PHONETIC_ALIAS_TYPE:
-				return convertPhoneticAliasTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.PHONETICS_TYPE:
-				return convertPhoneticsTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.PREFIX_TYPE:
-				return convertPrefixTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.RATE_TABLE_TYPE:
-				return convertRateTableTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.ROLLUP_TYPE_TYPE:
-				return convertRollupTypeTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.STANDARD_RATE_FORMAT_TYPE:
-				return convertStandardRateFormatTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.STANDARD_RATE_FORMAT_TYPE1:
-				return convertStandardRateFormatType1ToString(eDataType, instanceValue);
-			case MsprojectPackage.SUBJECT_TYPE:
-				return convertSubjectTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.SUBPROJECT_NAME_TYPE:
-				return convertSubprojectNameTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.TITLE_TYPE:
-				return convertTitleTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.TYPE_TYPE:
-				return convertTypeTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.TYPE_TYPE1:
-				return convertTypeType1ToString(eDataType, instanceValue);
-			case MsprojectPackage.TYPE_TYPE2:
-				return convertTypeType2ToString(eDataType, instanceValue);
-			case MsprojectPackage.TYPE_TYPE3:
-				return convertTypeType3ToString(eDataType, instanceValue);
-			case MsprojectPackage.TYPE_TYPE4:
-				return convertTypeType4ToString(eDataType, instanceValue);
-			case MsprojectPackage.TYPE_TYPE5:
-				return convertTypeType5ToString(eDataType, instanceValue);
-			case MsprojectPackage.UID_TYPE:
-				return convertUIDTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.UNIT_TYPE:
-				return convertUnitTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.VALUELIST_SORT_ORDER_TYPE:
-				return convertValuelistSortOrderTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.WEEK_START_DAY_TYPE:
-				return convertWeekStartDayTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.WORK_CONTOUR_TYPE:
-				return convertWorkContourTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.WORK_FORMAT_TYPE:
-				return convertWorkFormatTypeToString(eDataType, instanceValue);
-			case MsprojectPackage.WORK_GROUP_TYPE:
-				return convertWorkGroupTypeToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Assignment createAssignment() {
-		AssignmentImpl assignment = new AssignmentImpl();
-		return assignment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Assignments createAssignments() {
-		AssignmentsImpl assignments = new AssignmentsImpl();
-		return assignments;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AvailabilityPeriod createAvailabilityPeriod() {
-		AvailabilityPeriodImpl availabilityPeriod = new AvailabilityPeriodImpl();
-		return availabilityPeriod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AvailabilityPeriods createAvailabilityPeriods() {
-		AvailabilityPeriodsImpl availabilityPeriods = new AvailabilityPeriodsImpl();
-		return availabilityPeriods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Baseline createBaseline() {
-		BaselineImpl baseline = new BaselineImpl();
-		return baseline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Baseline2 createBaseline2() {
-		Baseline2Impl baseline2 = new Baseline2Impl();
-		return baseline2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Baseline3 createBaseline3() {
-		Baseline3Impl baseline3 = new Baseline3Impl();
-		return baseline3;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Calendar createCalendar() {
-		CalendarImpl calendar = new CalendarImpl();
-		return calendar;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Calendars createCalendars() {
-		CalendarsImpl calendars = new CalendarsImpl();
-		return calendars;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DocumentRoot createDocumentRoot() {
-		DocumentRootImpl documentRoot = new DocumentRootImpl();
-		return documentRoot;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExtendedAttribute createExtendedAttribute() {
-		ExtendedAttributeImpl extendedAttribute = new ExtendedAttributeImpl();
-		return extendedAttribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExtendedAttribute2 createExtendedAttribute2() {
-		ExtendedAttribute2Impl extendedAttribute2 = new ExtendedAttribute2Impl();
-		return extendedAttribute2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExtendedAttribute3 createExtendedAttribute3() {
-		ExtendedAttribute3Impl extendedAttribute3 = new ExtendedAttribute3Impl();
-		return extendedAttribute3;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExtendedAttribute4 createExtendedAttribute4() {
-		ExtendedAttribute4Impl extendedAttribute4 = new ExtendedAttribute4Impl();
-		return extendedAttribute4;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExtendedAttributes createExtendedAttributes() {
-		ExtendedAttributesImpl extendedAttributes = new ExtendedAttributesImpl();
-		return extendedAttributes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Mask createMask() {
-		MaskImpl mask = new MaskImpl();
-		return mask;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Masks createMasks() {
-		MasksImpl masks = new MasksImpl();
-		return masks;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OutlineCode createOutlineCode() {
-		OutlineCodeImpl outlineCode = new OutlineCodeImpl();
-		return outlineCode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OutlineCode2 createOutlineCode2() {
-		OutlineCode2Impl outlineCode2 = new OutlineCode2Impl();
-		return outlineCode2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OutlineCode3 createOutlineCode3() {
-		OutlineCode3Impl outlineCode3 = new OutlineCode3Impl();
-		return outlineCode3;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OutlineCodes createOutlineCodes() {
-		OutlineCodesImpl outlineCodes = new OutlineCodesImpl();
-		return outlineCodes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredecessorLink createPredecessorLink() {
-		PredecessorLinkImpl predecessorLink = new PredecessorLinkImpl();
-		return predecessorLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Project createProject() {
-		ProjectImpl project = new ProjectImpl();
-		return project;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Rate createRate() {
-		RateImpl rate = new RateImpl();
-		return rate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Rates createRates() {
-		RatesImpl rates = new RatesImpl();
-		return rates;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Resource createResource() {
-		ResourceImpl resource = new ResourceImpl();
-		return resource;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Resources createResources() {
-		ResourcesImpl resources = new ResourcesImpl();
-		return resources;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Task createTask() {
-		TaskImpl task = new TaskImpl();
-		return task;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Tasks createTasks() {
-		TasksImpl tasks = new TasksImpl();
-		return tasks;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TimePeriod createTimePeriod() {
-		TimePeriodImpl timePeriod = new TimePeriodImpl();
-		return timePeriod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TimephasedDataType createTimephasedDataType() {
-		TimephasedDataTypeImpl timephasedDataType = new TimephasedDataTypeImpl();
-		return timephasedDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Value createValue() {
-		ValueImpl value = new ValueImpl();
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Value2 createValue2() {
-		Value2Impl value2 = new Value2Impl();
-		return value2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ValueList createValueList() {
-		ValueListImpl valueList = new ValueListImpl();
-		return valueList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Values createValues() {
-		ValuesImpl values = new ValuesImpl();
-		return values;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WBSMask createWBSMask() {
-		WBSMaskImpl wbsMask = new WBSMaskImpl();
-		return wbsMask;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WBSMasks createWBSMasks() {
-		WBSMasksImpl wbsMasks = new WBSMasksImpl();
-		return wbsMasks;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WeekDay createWeekDay() {
-		WeekDayImpl weekDay = new WeekDayImpl();
-		return weekDay;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WeekDays createWeekDays() {
-		WeekDaysImpl weekDays = new WeekDaysImpl();
-		return weekDays;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkingTime createWorkingTime() {
-		WorkingTimeImpl workingTime = new WorkingTimeImpl();
-		return workingTime;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkingTimes createWorkingTimes() {
-		WorkingTimesImpl workingTimes = new WorkingTimesImpl();
-		return workingTimes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createAccrueAtFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertAccrueAtToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createActiveDirectoryGUIDTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertActiveDirectoryGUIDTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createAliasTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertAliasTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createAuthorTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertAuthorTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createBaselineForEarnedValueTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertBaselineForEarnedValueTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createBookingTypeTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertBookingTypeTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createBookingTypeType1FromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertBookingTypeType1ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createCalculationTypeTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertCalculationTypeTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createCategoryTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertCategoryTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createCodeTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertCodeTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createCompanyTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertCompanyTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createConstraintTypeTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertConstraintTypeTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createContactTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertContactTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createCostRateTableTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertCostRateTableTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createCurrencySymbolPositionTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertCurrencySymbolPositionTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createCurrencySymbolTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertCurrencySymbolTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createDayTypeTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDayTypeTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createDefaultFixedCostAccrualTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDefaultFixedCostAccrualTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createDefaultTaskEVMethodTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDefaultTaskEVMethodTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createDefaultTaskTypeTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDefaultTaskTypeTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createDurationFormatTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDurationFormatTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createDurationFormatType1FromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDurationFormatType1ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createDurationFormatType2FromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDurationFormatType2ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createDurationFormatType3FromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDurationFormatType3ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createDurationFormatType4FromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDurationFormatType4ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createDurationFormatType5FromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDurationFormatType5ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createEarnedValueMethodTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertEarnedValueMethodTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createEarnedValueMethodType1FromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertEarnedValueMethodType1ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createEmailAddressTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertEmailAddressTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createExternalTaskProjectTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertExternalTaskProjectTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createFixedCostAccrualTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertFixedCostAccrualTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createFYStartDateTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertFYStartDateTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createGroupTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertGroupTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createHyperlinkAddressTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertHyperlinkAddressTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createHyperlinkAddressType1FromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertHyperlinkAddressType1ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createHyperlinkAddressType2FromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertHyperlinkAddressType2ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createHyperlinkSubAddressTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertHyperlinkSubAddressTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createHyperlinkSubAddressType1FromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertHyperlinkSubAddressType1ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createHyperlinkSubAddressType2FromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertHyperlinkSubAddressType2ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createHyperlinkTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertHyperlinkTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createHyperlinkType1FromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertHyperlinkType1ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createHyperlinkType2FromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertHyperlinkType2ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createInitialsTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertInitialsTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createLagFormatTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertLagFormatTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createLevelingDelayFormatTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertLevelingDelayFormatTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createLevelingDelayFormatType1FromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertLevelingDelayFormatType1ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createManagerTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertManagerTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createMaterialLabelTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertMaterialLabelTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createNameTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertNameTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createNameType1FromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertNameType1ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createNameType2FromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertNameType2ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createNameType3FromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertNameType3ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createNewTaskStartDateTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertNewTaskStartDateTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createNTAccountTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertNTAccountTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createOutlineNumberTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertOutlineNumberTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createOvertimeRateFormatTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertOvertimeRateFormatTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createOvertimeRateFormatType1FromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertOvertimeRateFormatType1ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createPhoneticAliasTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertPhoneticAliasTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createPhoneticsTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertPhoneticsTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createPrefixTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertPrefixTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createRateTableTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertRateTableTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createRollupTypeTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertRollupTypeTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createStandardRateFormatTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertStandardRateFormatTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createStandardRateFormatType1FromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertStandardRateFormatType1ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createSubjectTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertSubjectTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createSubprojectNameTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertSubprojectNameTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createTitleTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTitleTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createTypeTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTypeTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createTypeType1FromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTypeType1ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createTypeType2FromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTypeType2ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createTypeType3FromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTypeType3ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createTypeType4FromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTypeType4ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createTypeType5FromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTypeType5ToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createUIDTypeFromString(EDataType eDataType, String initialValue) {
-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getString(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertUIDTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getString(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createUnitTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertUnitTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createValuelistSortOrderTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertValuelistSortOrderTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createWeekStartDayTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertWeekStartDayTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createWorkContourTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertWorkContourTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createWorkFormatTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertWorkFormatTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger createWorkGroupTypeFromString(EDataType eDataType, String initialValue) {
-		return (BigInteger)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.eINSTANCE.getInteger(), initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertWorkGroupTypeToString(EDataType eDataType, Object instanceValue) {
-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.eINSTANCE.getInteger(), instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MsprojectPackage getMsprojectPackage() {
-		return (MsprojectPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static MsprojectPackage getPackage() {
-		return MsprojectPackage.eINSTANCE;
-	}
-
-} //MsprojectFactoryImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/MsprojectPackageImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/MsprojectPackageImpl.java
deleted file mode 100755
index 2552727..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/MsprojectPackageImpl.java
+++ /dev/null
@@ -1,6313 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MsprojectPackageImpl.java,v 1.4 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EValidator;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
-import org.eclipse.emf.ecore.xml.type.impl.XMLTypePackageImpl;
-import org.eclipse.epf.msproject.MsprojectFactory;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.util.MsprojectValidator;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MsprojectPackageImpl extends EPackageImpl implements MsprojectPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected String packageFilename = "msproject.ecore";
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass assignmentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass assignmentsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass availabilityPeriodEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass availabilityPeriodsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass baselineEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass baseline2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass baseline3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass calendarEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass calendarsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass documentRootEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass extendedAttributeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass extendedAttribute2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass extendedAttribute3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass extendedAttribute4EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass extendedAttributesEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass maskEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass masksEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass outlineCodeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass outlineCode2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass outlineCode3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass outlineCodesEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass predecessorLinkEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass projectEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass rateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ratesEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass resourceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass resourcesEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass taskEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tasksEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass timePeriodEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass timephasedDataTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass valueEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass value2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass valueListEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass valuesEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass wbsMaskEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass wbsMasksEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass weekDayEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass weekDaysEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workingTimeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workingTimesEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType accrueAtEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType activeDirectoryGUIDTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType aliasTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType authorTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType baselineForEarnedValueTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType bookingTypeTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType bookingTypeType1EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType calculationTypeTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType categoryTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType codeTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType companyTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType constraintTypeTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType contactTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType costRateTableTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType currencySymbolPositionTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType currencySymbolTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType dayTypeTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType defaultFixedCostAccrualTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType defaultTaskEVMethodTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType defaultTaskTypeTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType durationFormatTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType durationFormatType1EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType durationFormatType2EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType durationFormatType3EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType durationFormatType4EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType durationFormatType5EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType earnedValueMethodTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType earnedValueMethodType1EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType emailAddressTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType externalTaskProjectTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType fixedCostAccrualTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType fyStartDateTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType groupTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType hyperlinkAddressTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType hyperlinkAddressType1EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType hyperlinkAddressType2EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType hyperlinkSubAddressTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType hyperlinkSubAddressType1EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType hyperlinkSubAddressType2EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType hyperlinkTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType hyperlinkType1EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType hyperlinkType2EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType initialsTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType lagFormatTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType levelingDelayFormatTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType levelingDelayFormatType1EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType managerTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType materialLabelTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType nameTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType nameType1EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType nameType2EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType nameType3EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType newTaskStartDateTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType ntAccountTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType outlineNumberTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType overtimeRateFormatTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType overtimeRateFormatType1EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType phoneticAliasTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType phoneticsTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType prefixTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType rateTableTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType rollupTypeTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType standardRateFormatTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType standardRateFormatType1EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType subjectTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType subprojectNameTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType titleTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType typeTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType typeType1EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType typeType2EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType typeType3EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType typeType4EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType typeType5EDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType uidTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType unitTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType valuelistSortOrderTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType weekStartDayTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType workContourTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType workFormatTypeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType workGroupTypeEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.epf.msproject.MsprojectPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private MsprojectPackageImpl() {
-		super(eNS_URI, MsprojectFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @generated
-	 */
-	public static MsprojectPackage init() {
-		if (isInited) return (MsprojectPackage)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI);
-
-		// Obtain or create and register package
-		MsprojectPackageImpl theMsprojectPackage = (MsprojectPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof MsprojectPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new MsprojectPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XMLTypePackageImpl.init();
-
-		// Load packages
-		theMsprojectPackage.loadPackage();
-
-		// Fix loaded packages
-		theMsprojectPackage.fixPackageContents();
-
-		// Register package validator
-		EValidator.Registry.INSTANCE.put
-			(theMsprojectPackage, 
-			 new EValidator.Descriptor() {
-				 public EValidator getEValidator() {
-					 return MsprojectValidator.INSTANCE;
-				 }
-			 });
-
-		// Mark meta-data to indicate it can't be changed
-		theMsprojectPackage.freeze();
-
-		return theMsprojectPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAssignment() {
-		if (assignmentEClass == null) {
-			assignmentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(3);
-		}
-		return assignmentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_UID() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_TaskUID() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_ResourceUID() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_PercentWorkComplete() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_ActualCost() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_ActualFinish() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_ActualOvertimeCost() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_ActualOvertimeWork() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_ActualStart() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_ActualWork() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_ACWP() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_Confirmed() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_Cost() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_CostRateTable() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_CostVariance() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_CV() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(15);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_Delay() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(16);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_Finish() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(17);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_FinishVariance() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(18);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_Hyperlink() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(19);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_HyperlinkAddress() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(20);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_HyperlinkSubAddress() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(21);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_WorkVariance() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(22);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_HasFixedRateUnits() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(23);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_FixedMaterial() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(24);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_LevelingDelay() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(25);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_LevelingDelayFormat() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(26);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_LinkedFields() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(27);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_Milestone() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(28);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_Notes() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(29);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_Overallocated() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(30);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_OvertimeCost() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(31);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_OvertimeWork() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(32);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_RegularWork() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(33);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_RemainingCost() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(34);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_RemainingOvertimeCost() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(35);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_RemainingOvertimeWork() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(36);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_RemainingWork() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(37);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_ResponsePending() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(38);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_Start() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(39);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_Stop() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(40);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_Resume() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(41);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_StartVariance() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(42);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_Units() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(43);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_UpdateNeeded() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(44);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_VAC() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(45);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_Work() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(46);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_WorkContour() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(47);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_BCWS() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(48);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_BCWP() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(49);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_BookingType() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(50);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_ActualWorkProtected() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(51);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_ActualOvertimeWorkProtected() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(52);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssignment_CreationDate() {
-        return (EAttribute)getAssignment().getEStructuralFeatures().get(53);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAssignment_ExtendedAttribute() {
-        return (EReference)getAssignment().getEStructuralFeatures().get(54);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAssignment_Baseline() {
-        return (EReference)getAssignment().getEStructuralFeatures().get(55);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAssignment_TimephasedData() {
-        return (EReference)getAssignment().getEStructuralFeatures().get(56);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAssignments() {
-		if (assignmentsEClass == null) {
-			assignmentsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(4);
-		}
-		return assignmentsEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAssignments_Assignment() {
-        return (EReference)getAssignments().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAvailabilityPeriod() {
-		if (availabilityPeriodEClass == null) {
-			availabilityPeriodEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(6);
-		}
-		return availabilityPeriodEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAvailabilityPeriod_AvailableFrom() {
-        return (EAttribute)getAvailabilityPeriod().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAvailabilityPeriod_AvailableTo() {
-        return (EAttribute)getAvailabilityPeriod().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAvailabilityPeriod_AvailableUnits() {
-        return (EAttribute)getAvailabilityPeriod().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAvailabilityPeriods() {
-		if (availabilityPeriodsEClass == null) {
-			availabilityPeriodsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(7);
-		}
-		return availabilityPeriodsEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAvailabilityPeriods_AvailabilityPeriod() {
-        return (EReference)getAvailabilityPeriods().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBaseline() {
-		if (baselineEClass == null) {
-			baselineEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(8);
-		}
-		return baselineEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBaseline_TimephasedData() {
-        return (EReference)getBaseline().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline_Number() {
-        return (EAttribute)getBaseline().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline_Interim() {
-        return (EAttribute)getBaseline().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline_Start() {
-        return (EAttribute)getBaseline().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline_Finish() {
-        return (EAttribute)getBaseline().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline_Duration() {
-        return (EAttribute)getBaseline().getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline_DurationFormat() {
-        return (EAttribute)getBaseline().getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline_EstimatedDuration() {
-        return (EAttribute)getBaseline().getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline_Work() {
-        return (EAttribute)getBaseline().getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline_Cost() {
-        return (EAttribute)getBaseline().getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline_BCWS() {
-        return (EAttribute)getBaseline().getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline_BCWP() {
-        return (EAttribute)getBaseline().getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBaseline2() {
-		if (baseline2EClass == null) {
-			baseline2EClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(9);
-		}
-		return baseline2EClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline2_Number() {
-        return (EAttribute)getBaseline2().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline2_Work() {
-        return (EAttribute)getBaseline2().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline2_Cost() {
-        return (EAttribute)getBaseline2().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline2_BCWS() {
-        return (EAttribute)getBaseline2().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline2_BCWP() {
-        return (EAttribute)getBaseline2().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBaseline3() {
-		if (baseline3EClass == null) {
-			baseline3EClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(10);
-		}
-		return baseline3EClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBaseline3_TimephasedData() {
-        return (EReference)getBaseline3().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline3_Number() {
-        return (EAttribute)getBaseline3().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline3_Start() {
-        return (EAttribute)getBaseline3().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline3_Finish() {
-        return (EAttribute)getBaseline3().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline3_Work() {
-        return (EAttribute)getBaseline3().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline3_Cost() {
-        return (EAttribute)getBaseline3().getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline3_BCWS() {
-        return (EAttribute)getBaseline3().getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBaseline3_BCWP() {
-        return (EAttribute)getBaseline3().getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCalendar() {
-		if (calendarEClass == null) {
-			calendarEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(15);
-		}
-		return calendarEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCalendar_UID() {
-        return (EAttribute)getCalendar().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCalendar_Name() {
-        return (EAttribute)getCalendar().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCalendar_IsBaseCalendar() {
-        return (EAttribute)getCalendar().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCalendar_BaseCalendarUID() {
-        return (EAttribute)getCalendar().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCalendar_WeekDays() {
-        return (EReference)getCalendar().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCalendars() {
-		if (calendarsEClass == null) {
-			calendarsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(16);
-		}
-		return calendarsEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCalendars_Calendar() {
-        return (EReference)getCalendars().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDocumentRoot() {
-		if (documentRootEClass == null) {
-			documentRootEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(29);
-		}
-		return documentRootEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDocumentRoot_Mixed() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_XMLNSPrefixMap() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_XSISchemaLocation() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_Project() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExtendedAttribute() {
-		if (extendedAttributeEClass == null) {
-			extendedAttributeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(39);
-		}
-		return extendedAttributeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute_FieldID() {
-        return (EAttribute)getExtendedAttribute().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute_FieldName() {
-        return (EAttribute)getExtendedAttribute().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute_Alias() {
-        return (EAttribute)getExtendedAttribute().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute_PhoneticAlias() {
-        return (EAttribute)getExtendedAttribute().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute_RollupType() {
-        return (EAttribute)getExtendedAttribute().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute_CalculationType() {
-        return (EAttribute)getExtendedAttribute().getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute_Formula() {
-        return (EAttribute)getExtendedAttribute().getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute_RestrictValues() {
-        return (EAttribute)getExtendedAttribute().getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute_ValuelistSortOrder() {
-        return (EAttribute)getExtendedAttribute().getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute_AppendNewValues() {
-        return (EAttribute)getExtendedAttribute().getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute_Default() {
-        return (EAttribute)getExtendedAttribute().getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExtendedAttribute_ValueList() {
-        return (EReference)getExtendedAttribute().getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExtendedAttribute2() {
-		if (extendedAttribute2EClass == null) {
-			extendedAttribute2EClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(40);
-		}
-		return extendedAttribute2EClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute2_UID() {
-        return (EAttribute)getExtendedAttribute2().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute2_FieldID() {
-        return (EAttribute)getExtendedAttribute2().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute2_Value() {
-        return (EAttribute)getExtendedAttribute2().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute2_ValueID() {
-        return (EAttribute)getExtendedAttribute2().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute2_DurationFormat() {
-        return (EAttribute)getExtendedAttribute2().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExtendedAttribute3() {
-		if (extendedAttribute3EClass == null) {
-			extendedAttribute3EClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(41);
-		}
-		return extendedAttribute3EClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute3_UID() {
-        return (EAttribute)getExtendedAttribute3().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute3_FieldID() {
-        return (EAttribute)getExtendedAttribute3().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute3_Value() {
-        return (EAttribute)getExtendedAttribute3().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute3_ValueID() {
-        return (EAttribute)getExtendedAttribute3().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute3_DurationFormat() {
-        return (EAttribute)getExtendedAttribute3().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExtendedAttribute4() {
-		if (extendedAttribute4EClass == null) {
-			extendedAttribute4EClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(42);
-		}
-		return extendedAttribute4EClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute4_UID() {
-        return (EAttribute)getExtendedAttribute4().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute4_FieldID() {
-        return (EAttribute)getExtendedAttribute4().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute4_Value() {
-        return (EAttribute)getExtendedAttribute4().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute4_ValueID() {
-        return (EAttribute)getExtendedAttribute4().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtendedAttribute4_DurationFormat() {
-        return (EAttribute)getExtendedAttribute4().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExtendedAttributes() {
-		if (extendedAttributesEClass == null) {
-			extendedAttributesEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(43);
-		}
-		return extendedAttributesEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExtendedAttributes_ExtendedAttribute() {
-        return (EReference)getExtendedAttributes().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMask() {
-		if (maskEClass == null) {
-			maskEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(62);
-		}
-		return maskEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMask_Level() {
-        return (EAttribute)getMask().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMask_Type() {
-        return (EAttribute)getMask().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMask_Length() {
-        return (EAttribute)getMask().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMask_Separator() {
-        return (EAttribute)getMask().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMasks() {
-		if (masksEClass == null) {
-			masksEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(63);
-		}
-		return masksEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMasks_Mask() {
-        return (EReference)getMasks().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOutlineCode() {
-		if (outlineCodeEClass == null) {
-			outlineCodeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(71);
-		}
-		return outlineCodeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode_FieldID() {
-        return (EAttribute)getOutlineCode().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode_FieldName() {
-        return (EAttribute)getOutlineCode().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode_Alias() {
-        return (EAttribute)getOutlineCode().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode_PhoneticAlias() {
-        return (EAttribute)getOutlineCode().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOutlineCode_Values() {
-        return (EReference)getOutlineCode().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode_Enterprise() {
-        return (EAttribute)getOutlineCode().getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode_EnterpriseOutlineCodeAlias() {
-        return (EAttribute)getOutlineCode().getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode_ResourceSubstitutionEnabled() {
-        return (EAttribute)getOutlineCode().getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode_LeafOnly() {
-        return (EAttribute)getOutlineCode().getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode_AllLevelsRequired() {
-        return (EAttribute)getOutlineCode().getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode_OnlyTableValuesAllowed() {
-        return (EAttribute)getOutlineCode().getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOutlineCode_Masks() {
-        return (EReference)getOutlineCode().getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOutlineCode2() {
-		if (outlineCode2EClass == null) {
-			outlineCode2EClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(72);
-		}
-		return outlineCode2EClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode2_UID() {
-        return (EAttribute)getOutlineCode2().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode2_FieldID() {
-        return (EAttribute)getOutlineCode2().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode2_ValueID() {
-        return (EAttribute)getOutlineCode2().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOutlineCode3() {
-		if (outlineCode3EClass == null) {
-			outlineCode3EClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(73);
-		}
-		return outlineCode3EClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode3_UID() {
-        return (EAttribute)getOutlineCode3().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode3_FieldID() {
-        return (EAttribute)getOutlineCode3().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutlineCode3_ValueID() {
-        return (EAttribute)getOutlineCode3().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOutlineCodes() {
-		if (outlineCodesEClass == null) {
-			outlineCodesEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(74);
-		}
-		return outlineCodesEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOutlineCodes_OutlineCode() {
-        return (EReference)getOutlineCodes().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPredecessorLink() {
-		if (predecessorLinkEClass == null) {
-			predecessorLinkEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(80);
-		}
-		return predecessorLinkEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPredecessorLink_PredecessorUID() {
-        return (EAttribute)getPredecessorLink().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPredecessorLink_Type() {
-        return (EAttribute)getPredecessorLink().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPredecessorLink_CrossProject() {
-        return (EAttribute)getPredecessorLink().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPredecessorLink_CrossProjectName() {
-        return (EAttribute)getPredecessorLink().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPredecessorLink_LinkLag() {
-        return (EAttribute)getPredecessorLink().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPredecessorLink_LagFormat() {
-        return (EAttribute)getPredecessorLink().getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProject() {
-		if (projectEClass == null) {
-			projectEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(82);
-		}
-		return projectEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_UID() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_Name() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_Title() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_Subject() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_Category() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_Company() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_Manager() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_Author() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_CreationDate() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_Revision() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_LastSaved() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_ScheduleFromStart() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_StartDate() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_FinishDate() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_FYStartDate() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_CriticalSlackLimit() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(15);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_CurrencyDigits() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(16);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_CurrencySymbol() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(17);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_CurrencySymbolPosition() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(18);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_CalendarUID() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(19);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_DefaultStartTime() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(20);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_DefaultFinishTime() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(21);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_MinutesPerDay() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(22);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_MinutesPerWeek() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(23);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_DaysPerMonth() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(24);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_DefaultTaskType() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(25);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_DefaultFixedCostAccrual() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(26);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_DefaultStandardRate() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(27);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_DefaultOvertimeRate() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(28);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_DurationFormat() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(29);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_WorkFormat() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(30);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_EditableActualCosts() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(31);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_HonorConstraints() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(32);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_EarnedValueMethod() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(33);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_InsertedProjectsLikeSummary() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(34);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_MultipleCriticalPaths() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(35);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_NewTasksEffortDriven() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(36);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_NewTasksEstimated() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(37);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_SplitsInProgressTasks() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(38);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_SpreadActualCost() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(39);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_SpreadPercentComplete() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(40);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_TaskUpdatesResource() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(41);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_FiscalYearStart() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(42);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_WeekStartDay() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(43);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_MoveCompletedEndsBack() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(44);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_MoveRemainingStartsBack() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(45);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_MoveRemainingStartsForward() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(46);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_MoveCompletedEndsForward() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(47);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_BaselineForEarnedValue() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(48);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_AutoAddNewResourcesAndTasks() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(49);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_StatusDate() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(50);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_CurrentDate() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(51);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_MicrosoftProjectServerURL() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(52);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_Autolink() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(53);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_NewTaskStartDate() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(54);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_DefaultTaskEVMethod() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(55);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_ProjectExternallyEdited() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(56);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_ExtendedCreationDate() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(57);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_ActualsInSync() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(58);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_RemoveFileProperties() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(59);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProject_AdminProject() {
-        return (EAttribute)getProject().getEStructuralFeatures().get(60);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProject_OutlineCodes() {
-        return (EReference)getProject().getEStructuralFeatures().get(61);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProject_WBSMasks() {
-        return (EReference)getProject().getEStructuralFeatures().get(62);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProject_ExtendedAttributes() {
-        return (EReference)getProject().getEStructuralFeatures().get(63);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProject_Calendars() {
-        return (EReference)getProject().getEStructuralFeatures().get(64);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProject_Tasks() {
-        return (EReference)getProject().getEStructuralFeatures().get(65);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProject_Resources() {
-        return (EReference)getProject().getEStructuralFeatures().get(66);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProject_Assignments() {
-        return (EReference)getProject().getEStructuralFeatures().get(67);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRate() {
-		if (rateEClass == null) {
-			rateEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(83);
-		}
-		return rateEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRate_RatesFrom() {
-        return (EAttribute)getRate().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRate_RatesTo() {
-        return (EAttribute)getRate().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRate_RateTable() {
-        return (EAttribute)getRate().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRate_StandardRate() {
-        return (EAttribute)getRate().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRate_StandardRateFormat() {
-        return (EAttribute)getRate().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRate_OvertimeRate() {
-        return (EAttribute)getRate().getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRate_OvertimeRateFormat() {
-        return (EAttribute)getRate().getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRate_CostPerUse() {
-        return (EAttribute)getRate().getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRates() {
-		if (ratesEClass == null) {
-			ratesEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(84);
-		}
-		return ratesEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRates_Rate() {
-        return (EReference)getRates().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getResource() {
-		if (resourceEClass == null) {
-			resourceEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(86);
-		}
-		return resourceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_UID() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_ID() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_Name() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_Type() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_IsNull() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_Initials() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_Phonetics() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_NTAccount() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_MaterialLabel() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_Code() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_Group() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_WorkGroup() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_EmailAddress() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_Hyperlink() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_HyperlinkAddress() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_HyperlinkSubAddress() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(15);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_MaxUnits() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(16);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_PeakUnits() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(17);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_OverAllocated() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(18);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_AvailableFrom() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(19);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_AvailableTo() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(20);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_Start() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(21);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_Finish() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(22);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_CanLevel() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(23);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_AccrueAt() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(24);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_Work() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(25);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_RegularWork() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(26);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_OvertimeWork() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(27);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_ActualWork() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(28);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_RemainingWork() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(29);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_ActualOvertimeWork() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(30);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_RemainingOvertimeWork() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(31);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_PercentWorkComplete() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(32);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_StandardRate() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(33);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_StandardRateFormat() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(34);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_Cost() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(35);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_OvertimeRate() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(36);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_OvertimeRateFormat() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(37);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_OvertimeCost() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(38);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_CostPerUse() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(39);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_ActualCost() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(40);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_ActualOvertimeCost() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(41);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_RemainingCost() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(42);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_RemainingOvertimeCost() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(43);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_WorkVariance() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(44);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_CostVariance() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(45);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_SV() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(46);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_CV() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(47);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_ACWP() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(48);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_CalendarUID() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(49);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_Notes() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(50);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_BCWS() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(51);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_BCWP() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(52);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_IsGeneric() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(53);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_IsInactive() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(54);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_IsEnterprise() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(55);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_BookingType() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(56);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_ActualWorkProtected() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(57);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_ActualOvertimeWorkProtected() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(58);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_ActiveDirectoryGUID() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(59);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResource_CreationDate() {
-        return (EAttribute)getResource().getEStructuralFeatures().get(60);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResource_ExtendedAttribute() {
-        return (EReference)getResource().getEStructuralFeatures().get(61);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResource_Baseline() {
-        return (EReference)getResource().getEStructuralFeatures().get(62);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResource_OutlineCode() {
-        return (EReference)getResource().getEStructuralFeatures().get(63);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResource_AvailabilityPeriods() {
-        return (EReference)getResource().getEStructuralFeatures().get(64);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResource_Rates() {
-        return (EReference)getResource().getEStructuralFeatures().get(65);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResource_TimephasedData() {
-        return (EReference)getResource().getEStructuralFeatures().get(66);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getResources() {
-		if (resourcesEClass == null) {
-			resourcesEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(87);
-		}
-		return resourcesEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResources_Resource() {
-        return (EReference)getResources().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTask() {
-		if (taskEClass == null) {
-			taskEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(93);
-		}
-		return taskEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_UID() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ID() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Name() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Type() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_IsNull() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_CreateDate() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Contact() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_WBS() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_WBSLevel() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_OutlineNumber() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_OutlineLevel() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Priority() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Start() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Finish() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Duration() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_DurationFormat() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(15);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Work() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(16);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Stop() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(17);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Resume() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(18);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ResumeValid() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(19);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_EffortDriven() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(20);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Recurring() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(21);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_OverAllocated() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(22);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Estimated() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(23);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Milestone() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(24);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Summary() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(25);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Critical() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(26);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_IsSubproject() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(27);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_IsSubprojectReadOnly() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(28);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_SubprojectName() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(29);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ExternalTask() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(30);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ExternalTaskProject() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(31);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_EarlyStart() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(32);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_EarlyFinish() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(33);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_LateStart() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(34);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_LateFinish() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(35);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_StartVariance() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(36);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_FinishVariance() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(37);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_WorkVariance() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(38);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_FreeSlack() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(39);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_TotalSlack() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(40);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_FixedCost() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(41);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_FixedCostAccrual() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(42);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_PercentComplete() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(43);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_PercentWorkComplete() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(44);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Cost() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(45);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_OvertimeCost() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(46);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_OvertimeWork() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(47);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ActualStart() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(48);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ActualFinish() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(49);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ActualDuration() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(50);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ActualCost() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(51);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ActualOvertimeCost() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(52);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ActualWork() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(53);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ActualOvertimeWork() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(54);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_RegularWork() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(55);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_RemainingDuration() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(56);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_RemainingCost() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(57);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_RemainingWork() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(58);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_RemainingOvertimeCost() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(59);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_RemainingOvertimeWork() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(60);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ACWP() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(61);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_CV() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(62);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ConstraintType() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(63);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_CalendarUID() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(64);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ConstraintDate() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(65);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Deadline() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(66);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_LevelAssignments() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(67);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_LevelingCanSplit() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(68);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_LevelingDelay() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(69);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_LevelingDelayFormat() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(70);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_PreLeveledStart() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(71);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_PreLeveledFinish() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(72);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Hyperlink() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(73);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_HyperlinkAddress() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(74);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_HyperlinkSubAddress() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(75);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_IgnoreResourceCalendar() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(76);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Notes() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(77);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_HideBar() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(78);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Rollup() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(79);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_BCWS() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(80);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_BCWP() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(81);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_PhysicalPercentComplete() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(82);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_EarnedValueMethod() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(83);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTask_PredecessorLink() {
-        return (EReference)getTask().getEStructuralFeatures().get(84);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ActualWorkProtected() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(85);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ActualOvertimeWorkProtected() {
-        return (EAttribute)getTask().getEStructuralFeatures().get(86);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTask_ExtendedAttribute() {
-        return (EReference)getTask().getEStructuralFeatures().get(87);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTask_Baseline() {
-        return (EReference)getTask().getEStructuralFeatures().get(88);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTask_OutlineCode() {
-        return (EReference)getTask().getEStructuralFeatures().get(89);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTask_TimephasedData() {
-        return (EReference)getTask().getEStructuralFeatures().get(90);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTasks() {
-		if (tasksEClass == null) {
-			tasksEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(94);
-		}
-		return tasksEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTasks_Task() {
-        return (EReference)getTasks().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTimePeriod() {
-		if (timePeriodEClass == null) {
-			timePeriodEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(95);
-		}
-		return timePeriodEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTimePeriod_FromDate() {
-        return (EAttribute)getTimePeriod().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTimePeriod_ToDate() {
-        return (EAttribute)getTimePeriod().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTimephasedDataType() {
-		if (timephasedDataTypeEClass == null) {
-			timephasedDataTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(96);
-		}
-		return timephasedDataTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTimephasedDataType_Type() {
-        return (EAttribute)getTimephasedDataType().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTimephasedDataType_UID() {
-        return (EAttribute)getTimephasedDataType().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTimephasedDataType_Start() {
-        return (EAttribute)getTimephasedDataType().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTimephasedDataType_Finish() {
-        return (EAttribute)getTimephasedDataType().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTimephasedDataType_Unit() {
-        return (EAttribute)getTimephasedDataType().getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTimephasedDataType_Value() {
-        return (EAttribute)getTimephasedDataType().getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getValue() {
-		if (valueEClass == null) {
-			valueEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(106);
-		}
-		return valueEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValue_ValueID() {
-        return (EAttribute)getValue().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValue_ParentValueID() {
-        return (EAttribute)getValue().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValue_Value() {
-        return (EAttribute)getValue().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValue_Description() {
-        return (EAttribute)getValue().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getValue2() {
-		if (value2EClass == null) {
-			value2EClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(107);
-		}
-		return value2EClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValue2_ID() {
-        return (EAttribute)getValue2().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValue2_Value() {
-        return (EAttribute)getValue2().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValue2_Description() {
-        return (EAttribute)getValue2().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getValueList() {
-		if (valueListEClass == null) {
-			valueListEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(108);
-		}
-		return valueListEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getValueList_Value() {
-        return (EReference)getValueList().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getValues() {
-		if (valuesEClass == null) {
-			valuesEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(110);
-		}
-		return valuesEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValues_Group() {
-        return (EAttribute)getValues().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getValues_Value() {
-        return (EReference)getValues().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWBSMask() {
-		if (wbsMaskEClass == null) {
-			wbsMaskEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(111);
-		}
-		return wbsMaskEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWBSMask_Level() {
-        return (EAttribute)getWBSMask().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWBSMask_Type() {
-        return (EAttribute)getWBSMask().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWBSMask_Length() {
-        return (EAttribute)getWBSMask().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWBSMask_Separator() {
-        return (EAttribute)getWBSMask().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWBSMasks() {
-		if (wbsMasksEClass == null) {
-			wbsMasksEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(112);
-		}
-		return wbsMasksEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWBSMasks_VerifyUniqueCodes() {
-        return (EAttribute)getWBSMasks().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWBSMasks_GenerateCodes() {
-        return (EAttribute)getWBSMasks().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWBSMasks_Prefix() {
-        return (EAttribute)getWBSMasks().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWBSMasks_WBSMask() {
-        return (EReference)getWBSMasks().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWeekDay() {
-		if (weekDayEClass == null) {
-			weekDayEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(113);
-		}
-		return weekDayEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWeekDay_DayType() {
-        return (EAttribute)getWeekDay().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWeekDay_DayWorking() {
-        return (EAttribute)getWeekDay().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWeekDay_TimePeriod() {
-        return (EReference)getWeekDay().getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWeekDay_WorkingTimes() {
-        return (EReference)getWeekDay().getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWeekDays() {
-		if (weekDaysEClass == null) {
-			weekDaysEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(114);
-		}
-		return weekDaysEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWeekDays_WeekDay() {
-        return (EReference)getWeekDays().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkingTime() {
-		if (workingTimeEClass == null) {
-			workingTimeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(119);
-		}
-		return workingTimeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkingTime_FromTime() {
-        return (EAttribute)getWorkingTime().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkingTime_ToTime() {
-        return (EAttribute)getWorkingTime().getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkingTimes() {
-		if (workingTimesEClass == null) {
-			workingTimesEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(120);
-		}
-		return workingTimesEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkingTimes_WorkingTime() {
-        return (EReference)getWorkingTimes().getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getAccrueAt() {
-		if (accrueAtEDataType == null) {
-			accrueAtEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(0);
-		}
-		return accrueAtEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getActiveDirectoryGUIDType() {
-		if (activeDirectoryGUIDTypeEDataType == null) {
-			activeDirectoryGUIDTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(1);
-		}
-		return activeDirectoryGUIDTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getAliasType() {
-		if (aliasTypeEDataType == null) {
-			aliasTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(2);
-		}
-		return aliasTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getAuthorType() {
-		if (authorTypeEDataType == null) {
-			authorTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(5);
-		}
-		return authorTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getBaselineForEarnedValueType() {
-		if (baselineForEarnedValueTypeEDataType == null) {
-			baselineForEarnedValueTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(11);
-		}
-		return baselineForEarnedValueTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getBookingTypeType() {
-		if (bookingTypeTypeEDataType == null) {
-			bookingTypeTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(12);
-		}
-		return bookingTypeTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getBookingTypeType1() {
-		if (bookingTypeType1EDataType == null) {
-			bookingTypeType1EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(13);
-		}
-		return bookingTypeType1EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getCalculationTypeType() {
-		if (calculationTypeTypeEDataType == null) {
-			calculationTypeTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(14);
-		}
-		return calculationTypeTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getCategoryType() {
-		if (categoryTypeEDataType == null) {
-			categoryTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(17);
-		}
-		return categoryTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getCodeType() {
-		if (codeTypeEDataType == null) {
-			codeTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(18);
-		}
-		return codeTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getCompanyType() {
-		if (companyTypeEDataType == null) {
-			companyTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(19);
-		}
-		return companyTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getConstraintTypeType() {
-		if (constraintTypeTypeEDataType == null) {
-			constraintTypeTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(20);
-		}
-		return constraintTypeTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getContactType() {
-		if (contactTypeEDataType == null) {
-			contactTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(21);
-		}
-		return contactTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getCostRateTableType() {
-		if (costRateTableTypeEDataType == null) {
-			costRateTableTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(22);
-		}
-		return costRateTableTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getCurrencySymbolPositionType() {
-		if (currencySymbolPositionTypeEDataType == null) {
-			currencySymbolPositionTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(23);
-		}
-		return currencySymbolPositionTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getCurrencySymbolType() {
-		if (currencySymbolTypeEDataType == null) {
-			currencySymbolTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(24);
-		}
-		return currencySymbolTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getDayTypeType() {
-		if (dayTypeTypeEDataType == null) {
-			dayTypeTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(25);
-		}
-		return dayTypeTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getDefaultFixedCostAccrualType() {
-		if (defaultFixedCostAccrualTypeEDataType == null) {
-			defaultFixedCostAccrualTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(26);
-		}
-		return defaultFixedCostAccrualTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getDefaultTaskEVMethodType() {
-		if (defaultTaskEVMethodTypeEDataType == null) {
-			defaultTaskEVMethodTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(27);
-		}
-		return defaultTaskEVMethodTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getDefaultTaskTypeType() {
-		if (defaultTaskTypeTypeEDataType == null) {
-			defaultTaskTypeTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(28);
-		}
-		return defaultTaskTypeTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getDurationFormatType() {
-		if (durationFormatTypeEDataType == null) {
-			durationFormatTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(30);
-		}
-		return durationFormatTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getDurationFormatType1() {
-		if (durationFormatType1EDataType == null) {
-			durationFormatType1EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(31);
-		}
-		return durationFormatType1EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getDurationFormatType2() {
-		if (durationFormatType2EDataType == null) {
-			durationFormatType2EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(32);
-		}
-		return durationFormatType2EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getDurationFormatType3() {
-		if (durationFormatType3EDataType == null) {
-			durationFormatType3EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(33);
-		}
-		return durationFormatType3EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getDurationFormatType4() {
-		if (durationFormatType4EDataType == null) {
-			durationFormatType4EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(34);
-		}
-		return durationFormatType4EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getDurationFormatType5() {
-		if (durationFormatType5EDataType == null) {
-			durationFormatType5EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(35);
-		}
-		return durationFormatType5EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getEarnedValueMethodType() {
-		if (earnedValueMethodTypeEDataType == null) {
-			earnedValueMethodTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(36);
-		}
-		return earnedValueMethodTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getEarnedValueMethodType1() {
-		if (earnedValueMethodType1EDataType == null) {
-			earnedValueMethodType1EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(37);
-		}
-		return earnedValueMethodType1EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getEmailAddressType() {
-		if (emailAddressTypeEDataType == null) {
-			emailAddressTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(38);
-		}
-		return emailAddressTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getExternalTaskProjectType() {
-		if (externalTaskProjectTypeEDataType == null) {
-			externalTaskProjectTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(44);
-		}
-		return externalTaskProjectTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getFixedCostAccrualType() {
-		if (fixedCostAccrualTypeEDataType == null) {
-			fixedCostAccrualTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(45);
-		}
-		return fixedCostAccrualTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getFYStartDateType() {
-		if (fyStartDateTypeEDataType == null) {
-			fyStartDateTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(46);
-		}
-		return fyStartDateTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getGroupType() {
-		if (groupTypeEDataType == null) {
-			groupTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(47);
-		}
-		return groupTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getHyperlinkAddressType() {
-		if (hyperlinkAddressTypeEDataType == null) {
-			hyperlinkAddressTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(48);
-		}
-		return hyperlinkAddressTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getHyperlinkAddressType1() {
-		if (hyperlinkAddressType1EDataType == null) {
-			hyperlinkAddressType1EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(49);
-		}
-		return hyperlinkAddressType1EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getHyperlinkAddressType2() {
-		if (hyperlinkAddressType2EDataType == null) {
-			hyperlinkAddressType2EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(50);
-		}
-		return hyperlinkAddressType2EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getHyperlinkSubAddressType() {
-		if (hyperlinkSubAddressTypeEDataType == null) {
-			hyperlinkSubAddressTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(51);
-		}
-		return hyperlinkSubAddressTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getHyperlinkSubAddressType1() {
-		if (hyperlinkSubAddressType1EDataType == null) {
-			hyperlinkSubAddressType1EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(52);
-		}
-		return hyperlinkSubAddressType1EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getHyperlinkSubAddressType2() {
-		if (hyperlinkSubAddressType2EDataType == null) {
-			hyperlinkSubAddressType2EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(53);
-		}
-		return hyperlinkSubAddressType2EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getHyperlinkType() {
-		if (hyperlinkTypeEDataType == null) {
-			hyperlinkTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(54);
-		}
-		return hyperlinkTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getHyperlinkType1() {
-		if (hyperlinkType1EDataType == null) {
-			hyperlinkType1EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(55);
-		}
-		return hyperlinkType1EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getHyperlinkType2() {
-		if (hyperlinkType2EDataType == null) {
-			hyperlinkType2EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(56);
-		}
-		return hyperlinkType2EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getInitialsType() {
-		if (initialsTypeEDataType == null) {
-			initialsTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(57);
-		}
-		return initialsTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getLagFormatType() {
-		if (lagFormatTypeEDataType == null) {
-			lagFormatTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(58);
-		}
-		return lagFormatTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getLevelingDelayFormatType() {
-		if (levelingDelayFormatTypeEDataType == null) {
-			levelingDelayFormatTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(59);
-		}
-		return levelingDelayFormatTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getLevelingDelayFormatType1() {
-		if (levelingDelayFormatType1EDataType == null) {
-			levelingDelayFormatType1EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(60);
-		}
-		return levelingDelayFormatType1EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getManagerType() {
-		if (managerTypeEDataType == null) {
-			managerTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(61);
-		}
-		return managerTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getMaterialLabelType() {
-		if (materialLabelTypeEDataType == null) {
-			materialLabelTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(64);
-		}
-		return materialLabelTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getNameType() {
-		if (nameTypeEDataType == null) {
-			nameTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(65);
-		}
-		return nameTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getNameType1() {
-		if (nameType1EDataType == null) {
-			nameType1EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(66);
-		}
-		return nameType1EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getNameType2() {
-		if (nameType2EDataType == null) {
-			nameType2EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(67);
-		}
-		return nameType2EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getNameType3() {
-		if (nameType3EDataType == null) {
-			nameType3EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(68);
-		}
-		return nameType3EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getNewTaskStartDateType() {
-		if (newTaskStartDateTypeEDataType == null) {
-			newTaskStartDateTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(69);
-		}
-		return newTaskStartDateTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getNTAccountType() {
-		if (ntAccountTypeEDataType == null) {
-			ntAccountTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(70);
-		}
-		return ntAccountTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getOutlineNumberType() {
-		if (outlineNumberTypeEDataType == null) {
-			outlineNumberTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(75);
-		}
-		return outlineNumberTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getOvertimeRateFormatType() {
-		if (overtimeRateFormatTypeEDataType == null) {
-			overtimeRateFormatTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(76);
-		}
-		return overtimeRateFormatTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getOvertimeRateFormatType1() {
-		if (overtimeRateFormatType1EDataType == null) {
-			overtimeRateFormatType1EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(77);
-		}
-		return overtimeRateFormatType1EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getPhoneticAliasType() {
-		if (phoneticAliasTypeEDataType == null) {
-			phoneticAliasTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(78);
-		}
-		return phoneticAliasTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getPhoneticsType() {
-		if (phoneticsTypeEDataType == null) {
-			phoneticsTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(79);
-		}
-		return phoneticsTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getPrefixType() {
-		if (prefixTypeEDataType == null) {
-			prefixTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(81);
-		}
-		return prefixTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getRateTableType() {
-		if (rateTableTypeEDataType == null) {
-			rateTableTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(85);
-		}
-		return rateTableTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getRollupTypeType() {
-		if (rollupTypeTypeEDataType == null) {
-			rollupTypeTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(88);
-		}
-		return rollupTypeTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getStandardRateFormatType() {
-		if (standardRateFormatTypeEDataType == null) {
-			standardRateFormatTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(89);
-		}
-		return standardRateFormatTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getStandardRateFormatType1() {
-		if (standardRateFormatType1EDataType == null) {
-			standardRateFormatType1EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(90);
-		}
-		return standardRateFormatType1EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getSubjectType() {
-		if (subjectTypeEDataType == null) {
-			subjectTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(91);
-		}
-		return subjectTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getSubprojectNameType() {
-		if (subprojectNameTypeEDataType == null) {
-			subprojectNameTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(92);
-		}
-		return subprojectNameTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getTitleType() {
-		if (titleTypeEDataType == null) {
-			titleTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(97);
-		}
-		return titleTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getTypeType() {
-		if (typeTypeEDataType == null) {
-			typeTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(98);
-		}
-		return typeTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getTypeType1() {
-		if (typeType1EDataType == null) {
-			typeType1EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(99);
-		}
-		return typeType1EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getTypeType2() {
-		if (typeType2EDataType == null) {
-			typeType2EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(100);
-		}
-		return typeType2EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getTypeType3() {
-		if (typeType3EDataType == null) {
-			typeType3EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(101);
-		}
-		return typeType3EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getTypeType4() {
-		if (typeType4EDataType == null) {
-			typeType4EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(102);
-		}
-		return typeType4EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getTypeType5() {
-		if (typeType5EDataType == null) {
-			typeType5EDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(103);
-		}
-		return typeType5EDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getUIDType() {
-		if (uidTypeEDataType == null) {
-			uidTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(104);
-		}
-		return uidTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getUnitType() {
-		if (unitTypeEDataType == null) {
-			unitTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(105);
-		}
-		return unitTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getValuelistSortOrderType() {
-		if (valuelistSortOrderTypeEDataType == null) {
-			valuelistSortOrderTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(109);
-		}
-		return valuelistSortOrderTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getWeekStartDayType() {
-		if (weekStartDayTypeEDataType == null) {
-			weekStartDayTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(115);
-		}
-		return weekStartDayTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getWorkContourType() {
-		if (workContourTypeEDataType == null) {
-			workContourTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(116);
-		}
-		return workContourTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getWorkFormatType() {
-		if (workFormatTypeEDataType == null) {
-			workFormatTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(117);
-		}
-		return workFormatTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getWorkGroupType() {
-		if (workGroupTypeEDataType == null) {
-			workGroupTypeEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(MsprojectPackage.eNS_URI).getEClassifiers().get(118);
-		}
-		return workGroupTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MsprojectFactory getMsprojectFactory() {
-		return (MsprojectFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isLoaded = false;
-
-	/**
-	 * Laods the package and any sub-packages from their serialized form.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void loadPackage() {
-		if (isLoaded) return;
-		isLoaded = true;
-
-		URL url = getClass().getResource(packageFilename);
-		if (url == null) {
-			throw new RuntimeException("Missing serialized package: " + packageFilename);
-		}
-		Resource resource = new EcoreResourceFactoryImpl().createResource(URI.createURI(url.toString()));
-		try {
-			resource.load(null);
-		}
-		catch (IOException exception) {
-			throw new WrappedException(exception);
-		}
-		initializeFromLoadedEPackage(this, (EPackage)resource.getContents().get(0));
-		createResource(eNS_URI);
-	}
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isFixed = false;
-
-	/**
-	 * Fixes up the loaded package, to make it appear as if it had been programmatically built.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void fixPackageContents() {
-		if (isFixed) return;
-		isFixed = true;
-		fixEClassifiers();
-	}
-} //MsprojectPackageImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/OutlineCode2Impl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/OutlineCode2Impl.java
deleted file mode 100755
index 926d8d3..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/OutlineCode2Impl.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: OutlineCode2Impl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.OutlineCode2;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Outline Code2</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCode2Impl#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCode2Impl#getFieldID <em>Field ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCode2Impl#getValueID <em>Value ID</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OutlineCode2Impl extends EObjectImpl implements OutlineCode2 {
-	/**
-	 * The default value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger uID = UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFieldID() <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FIELD_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFieldID() <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fieldID = FIELD_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValueID() <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger VALUE_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValueID() <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger valueID = VALUE_ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OutlineCode2Impl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getOutlineCode2();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getUID() {
-		return uID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUID(BigInteger newUID) {
-		BigInteger oldUID = uID;
-		uID = newUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE2__UID, oldUID, uID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFieldID() {
-		return fieldID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFieldID(String newFieldID) {
-		String oldFieldID = fieldID;
-		fieldID = newFieldID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE2__FIELD_ID, oldFieldID, fieldID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getValueID() {
-		return valueID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValueID(BigInteger newValueID) {
-		BigInteger oldValueID = valueID;
-		valueID = newValueID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE2__VALUE_ID, oldValueID, valueID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODE2__UID:
-				return getUID();
-			case MsprojectPackage.OUTLINE_CODE2__FIELD_ID:
-				return getFieldID();
-			case MsprojectPackage.OUTLINE_CODE2__VALUE_ID:
-				return getValueID();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODE2__UID:
-				setUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.OUTLINE_CODE2__FIELD_ID:
-				setFieldID((String)newValue);
-				return;
-			case MsprojectPackage.OUTLINE_CODE2__VALUE_ID:
-				setValueID((BigInteger)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODE2__UID:
-				setUID(UID_EDEFAULT);
-				return;
-			case MsprojectPackage.OUTLINE_CODE2__FIELD_ID:
-				setFieldID(FIELD_ID_EDEFAULT);
-				return;
-			case MsprojectPackage.OUTLINE_CODE2__VALUE_ID:
-				setValueID(VALUE_ID_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODE2__UID:
-				return UID_EDEFAULT == null ? uID != null : !UID_EDEFAULT.equals(uID);
-			case MsprojectPackage.OUTLINE_CODE2__FIELD_ID:
-				return FIELD_ID_EDEFAULT == null ? fieldID != null : !FIELD_ID_EDEFAULT.equals(fieldID);
-			case MsprojectPackage.OUTLINE_CODE2__VALUE_ID:
-				return VALUE_ID_EDEFAULT == null ? valueID != null : !VALUE_ID_EDEFAULT.equals(valueID);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (uID: ");
-		result.append(uID);
-		result.append(", fieldID: ");
-		result.append(fieldID);
-		result.append(", valueID: ");
-		result.append(valueID);
-		result.append(')');
-		return result.toString();
-	}
-
-} //OutlineCode2Impl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/OutlineCode3Impl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/OutlineCode3Impl.java
deleted file mode 100755
index 98fdf5a..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/OutlineCode3Impl.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: OutlineCode3Impl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.OutlineCode3;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Outline Code3</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCode3Impl#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCode3Impl#getFieldID <em>Field ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCode3Impl#getValueID <em>Value ID</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OutlineCode3Impl extends EObjectImpl implements OutlineCode3 {
-	/**
-	 * The default value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger uID = UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFieldID() <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FIELD_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFieldID() <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fieldID = FIELD_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValueID() <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger VALUE_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValueID() <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger valueID = VALUE_ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OutlineCode3Impl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getOutlineCode3();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getUID() {
-		return uID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUID(BigInteger newUID) {
-		BigInteger oldUID = uID;
-		uID = newUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE3__UID, oldUID, uID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFieldID() {
-		return fieldID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFieldID(String newFieldID) {
-		String oldFieldID = fieldID;
-		fieldID = newFieldID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE3__FIELD_ID, oldFieldID, fieldID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getValueID() {
-		return valueID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValueID(BigInteger newValueID) {
-		BigInteger oldValueID = valueID;
-		valueID = newValueID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE3__VALUE_ID, oldValueID, valueID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODE3__UID:
-				return getUID();
-			case MsprojectPackage.OUTLINE_CODE3__FIELD_ID:
-				return getFieldID();
-			case MsprojectPackage.OUTLINE_CODE3__VALUE_ID:
-				return getValueID();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODE3__UID:
-				setUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.OUTLINE_CODE3__FIELD_ID:
-				setFieldID((String)newValue);
-				return;
-			case MsprojectPackage.OUTLINE_CODE3__VALUE_ID:
-				setValueID((BigInteger)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODE3__UID:
-				setUID(UID_EDEFAULT);
-				return;
-			case MsprojectPackage.OUTLINE_CODE3__FIELD_ID:
-				setFieldID(FIELD_ID_EDEFAULT);
-				return;
-			case MsprojectPackage.OUTLINE_CODE3__VALUE_ID:
-				setValueID(VALUE_ID_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODE3__UID:
-				return UID_EDEFAULT == null ? uID != null : !UID_EDEFAULT.equals(uID);
-			case MsprojectPackage.OUTLINE_CODE3__FIELD_ID:
-				return FIELD_ID_EDEFAULT == null ? fieldID != null : !FIELD_ID_EDEFAULT.equals(fieldID);
-			case MsprojectPackage.OUTLINE_CODE3__VALUE_ID:
-				return VALUE_ID_EDEFAULT == null ? valueID != null : !VALUE_ID_EDEFAULT.equals(valueID);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (uID: ");
-		result.append(uID);
-		result.append(", fieldID: ");
-		result.append(fieldID);
-		result.append(", valueID: ");
-		result.append(valueID);
-		result.append(')');
-		return result.toString();
-	}
-
-} //OutlineCode3Impl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/OutlineCodeImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/OutlineCodeImpl.java
deleted file mode 100755
index 5098bbe..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/OutlineCodeImpl.java
+++ /dev/null
@@ -1,968 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: OutlineCodeImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.Masks;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.OutlineCode;
-import org.eclipse.epf.msproject.Values;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Outline Code</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCodeImpl#getFieldID <em>Field ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCodeImpl#getFieldName <em>Field Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCodeImpl#getAlias <em>Alias</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCodeImpl#getPhoneticAlias <em>Phonetic Alias</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCodeImpl#getValues <em>Values</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCodeImpl#isEnterprise <em>Enterprise</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCodeImpl#getEnterpriseOutlineCodeAlias <em>Enterprise Outline Code Alias</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCodeImpl#isResourceSubstitutionEnabled <em>Resource Substitution Enabled</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCodeImpl#isLeafOnly <em>Leaf Only</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCodeImpl#isAllLevelsRequired <em>All Levels Required</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCodeImpl#isOnlyTableValuesAllowed <em>Only Table Values Allowed</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCodeImpl#getMasks <em>Masks</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OutlineCodeImpl extends EObjectImpl implements OutlineCode {
-	/**
-	 * The default value of the '{@link #getFieldID() <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FIELD_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFieldID() <em>Field ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fieldID = FIELD_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFieldName() <em>Field Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FIELD_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFieldName() <em>Field Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fieldName = FIELD_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlias()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ALIAS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlias()
-	 * @generated
-	 * @ordered
-	 */
-	protected String alias = ALIAS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPhoneticAlias() <em>Phonetic Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPhoneticAlias()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PHONETIC_ALIAS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPhoneticAlias() <em>Phonetic Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPhoneticAlias()
-	 * @generated
-	 * @ordered
-	 */
-	protected String phoneticAlias = PHONETIC_ALIAS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getValues() <em>Values</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValues()
-	 * @generated
-	 * @ordered
-	 */
-	protected Values values = null;
-
-	/**
-	 * The default value of the '{@link #isEnterprise() <em>Enterprise</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEnterprise()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ENTERPRISE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isEnterprise() <em>Enterprise</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEnterprise()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean enterprise = ENTERPRISE_EDEFAULT;
-
-	/**
-	 * This is true if the Enterprise attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean enterpriseESet = false;
-
-	/**
-	 * The default value of the '{@link #getEnterpriseOutlineCodeAlias() <em>Enterprise Outline Code Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnterpriseOutlineCodeAlias()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger ENTERPRISE_OUTLINE_CODE_ALIAS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEnterpriseOutlineCodeAlias() <em>Enterprise Outline Code Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnterpriseOutlineCodeAlias()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger enterpriseOutlineCodeAlias = ENTERPRISE_OUTLINE_CODE_ALIAS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isResourceSubstitutionEnabled() <em>Resource Substitution Enabled</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isResourceSubstitutionEnabled()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean RESOURCE_SUBSTITUTION_ENABLED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isResourceSubstitutionEnabled() <em>Resource Substitution Enabled</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isResourceSubstitutionEnabled()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean resourceSubstitutionEnabled = RESOURCE_SUBSTITUTION_ENABLED_EDEFAULT;
-
-	/**
-	 * This is true if the Resource Substitution Enabled attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean resourceSubstitutionEnabledESet = false;
-
-	/**
-	 * The default value of the '{@link #isLeafOnly() <em>Leaf Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isLeafOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean LEAF_ONLY_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isLeafOnly() <em>Leaf Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isLeafOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean leafOnly = LEAF_ONLY_EDEFAULT;
-
-	/**
-	 * This is true if the Leaf Only attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean leafOnlyESet = false;
-
-	/**
-	 * The default value of the '{@link #isAllLevelsRequired() <em>All Levels Required</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAllLevelsRequired()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ALL_LEVELS_REQUIRED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isAllLevelsRequired() <em>All Levels Required</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAllLevelsRequired()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean allLevelsRequired = ALL_LEVELS_REQUIRED_EDEFAULT;
-
-	/**
-	 * This is true if the All Levels Required attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean allLevelsRequiredESet = false;
-
-	/**
-	 * The default value of the '{@link #isOnlyTableValuesAllowed() <em>Only Table Values Allowed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isOnlyTableValuesAllowed()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ONLY_TABLE_VALUES_ALLOWED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isOnlyTableValuesAllowed() <em>Only Table Values Allowed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isOnlyTableValuesAllowed()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean onlyTableValuesAllowed = ONLY_TABLE_VALUES_ALLOWED_EDEFAULT;
-
-	/**
-	 * This is true if the Only Table Values Allowed attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean onlyTableValuesAllowedESet = false;
-
-	/**
-	 * The cached value of the '{@link #getMasks() <em>Masks</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMasks()
-	 * @generated
-	 * @ordered
-	 */
-	protected Masks masks = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OutlineCodeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getOutlineCode();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFieldID() {
-		return fieldID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFieldID(String newFieldID) {
-		String oldFieldID = fieldID;
-		fieldID = newFieldID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE__FIELD_ID, oldFieldID, fieldID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFieldName() {
-		return fieldName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFieldName(String newFieldName) {
-		String oldFieldName = fieldName;
-		fieldName = newFieldName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE__FIELD_NAME, oldFieldName, fieldName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAlias() {
-		return alias;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAlias(String newAlias) {
-		String oldAlias = alias;
-		alias = newAlias;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE__ALIAS, oldAlias, alias));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPhoneticAlias() {
-		return phoneticAlias;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPhoneticAlias(String newPhoneticAlias) {
-		String oldPhoneticAlias = phoneticAlias;
-		phoneticAlias = newPhoneticAlias;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE__PHONETIC_ALIAS, oldPhoneticAlias, phoneticAlias));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Values getValues() {
-		return values;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValues(Values newValues, NotificationChain msgs) {
-		Values oldValues = values;
-		values = newValues;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE__VALUES, oldValues, newValues);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValues(Values newValues) {
-		if (newValues != values) {
-			NotificationChain msgs = null;
-			if (values != null)
-				msgs = ((InternalEObject)values).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.OUTLINE_CODE__VALUES, null, msgs);
-			if (newValues != null)
-				msgs = ((InternalEObject)newValues).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.OUTLINE_CODE__VALUES, null, msgs);
-			msgs = basicSetValues(newValues, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE__VALUES, newValues, newValues));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isEnterprise() {
-		return enterprise;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEnterprise(boolean newEnterprise) {
-		boolean oldEnterprise = enterprise;
-		enterprise = newEnterprise;
-		boolean oldEnterpriseESet = enterpriseESet;
-		enterpriseESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE__ENTERPRISE, oldEnterprise, enterprise, !oldEnterpriseESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetEnterprise() {
-		boolean oldEnterprise = enterprise;
-		boolean oldEnterpriseESet = enterpriseESet;
-		enterprise = ENTERPRISE_EDEFAULT;
-		enterpriseESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.OUTLINE_CODE__ENTERPRISE, oldEnterprise, ENTERPRISE_EDEFAULT, oldEnterpriseESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetEnterprise() {
-		return enterpriseESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getEnterpriseOutlineCodeAlias() {
-		return enterpriseOutlineCodeAlias;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEnterpriseOutlineCodeAlias(BigInteger newEnterpriseOutlineCodeAlias) {
-		BigInteger oldEnterpriseOutlineCodeAlias = enterpriseOutlineCodeAlias;
-		enterpriseOutlineCodeAlias = newEnterpriseOutlineCodeAlias;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE__ENTERPRISE_OUTLINE_CODE_ALIAS, oldEnterpriseOutlineCodeAlias, enterpriseOutlineCodeAlias));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isResourceSubstitutionEnabled() {
-		return resourceSubstitutionEnabled;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResourceSubstitutionEnabled(boolean newResourceSubstitutionEnabled) {
-		boolean oldResourceSubstitutionEnabled = resourceSubstitutionEnabled;
-		resourceSubstitutionEnabled = newResourceSubstitutionEnabled;
-		boolean oldResourceSubstitutionEnabledESet = resourceSubstitutionEnabledESet;
-		resourceSubstitutionEnabledESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE__RESOURCE_SUBSTITUTION_ENABLED, oldResourceSubstitutionEnabled, resourceSubstitutionEnabled, !oldResourceSubstitutionEnabledESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetResourceSubstitutionEnabled() {
-		boolean oldResourceSubstitutionEnabled = resourceSubstitutionEnabled;
-		boolean oldResourceSubstitutionEnabledESet = resourceSubstitutionEnabledESet;
-		resourceSubstitutionEnabled = RESOURCE_SUBSTITUTION_ENABLED_EDEFAULT;
-		resourceSubstitutionEnabledESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.OUTLINE_CODE__RESOURCE_SUBSTITUTION_ENABLED, oldResourceSubstitutionEnabled, RESOURCE_SUBSTITUTION_ENABLED_EDEFAULT, oldResourceSubstitutionEnabledESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetResourceSubstitutionEnabled() {
-		return resourceSubstitutionEnabledESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isLeafOnly() {
-		return leafOnly;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLeafOnly(boolean newLeafOnly) {
-		boolean oldLeafOnly = leafOnly;
-		leafOnly = newLeafOnly;
-		boolean oldLeafOnlyESet = leafOnlyESet;
-		leafOnlyESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE__LEAF_ONLY, oldLeafOnly, leafOnly, !oldLeafOnlyESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetLeafOnly() {
-		boolean oldLeafOnly = leafOnly;
-		boolean oldLeafOnlyESet = leafOnlyESet;
-		leafOnly = LEAF_ONLY_EDEFAULT;
-		leafOnlyESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.OUTLINE_CODE__LEAF_ONLY, oldLeafOnly, LEAF_ONLY_EDEFAULT, oldLeafOnlyESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetLeafOnly() {
-		return leafOnlyESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isAllLevelsRequired() {
-		return allLevelsRequired;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAllLevelsRequired(boolean newAllLevelsRequired) {
-		boolean oldAllLevelsRequired = allLevelsRequired;
-		allLevelsRequired = newAllLevelsRequired;
-		boolean oldAllLevelsRequiredESet = allLevelsRequiredESet;
-		allLevelsRequiredESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE__ALL_LEVELS_REQUIRED, oldAllLevelsRequired, allLevelsRequired, !oldAllLevelsRequiredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetAllLevelsRequired() {
-		boolean oldAllLevelsRequired = allLevelsRequired;
-		boolean oldAllLevelsRequiredESet = allLevelsRequiredESet;
-		allLevelsRequired = ALL_LEVELS_REQUIRED_EDEFAULT;
-		allLevelsRequiredESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.OUTLINE_CODE__ALL_LEVELS_REQUIRED, oldAllLevelsRequired, ALL_LEVELS_REQUIRED_EDEFAULT, oldAllLevelsRequiredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetAllLevelsRequired() {
-		return allLevelsRequiredESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isOnlyTableValuesAllowed() {
-		return onlyTableValuesAllowed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOnlyTableValuesAllowed(boolean newOnlyTableValuesAllowed) {
-		boolean oldOnlyTableValuesAllowed = onlyTableValuesAllowed;
-		onlyTableValuesAllowed = newOnlyTableValuesAllowed;
-		boolean oldOnlyTableValuesAllowedESet = onlyTableValuesAllowedESet;
-		onlyTableValuesAllowedESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE__ONLY_TABLE_VALUES_ALLOWED, oldOnlyTableValuesAllowed, onlyTableValuesAllowed, !oldOnlyTableValuesAllowedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetOnlyTableValuesAllowed() {
-		boolean oldOnlyTableValuesAllowed = onlyTableValuesAllowed;
-		boolean oldOnlyTableValuesAllowedESet = onlyTableValuesAllowedESet;
-		onlyTableValuesAllowed = ONLY_TABLE_VALUES_ALLOWED_EDEFAULT;
-		onlyTableValuesAllowedESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.OUTLINE_CODE__ONLY_TABLE_VALUES_ALLOWED, oldOnlyTableValuesAllowed, ONLY_TABLE_VALUES_ALLOWED_EDEFAULT, oldOnlyTableValuesAllowedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetOnlyTableValuesAllowed() {
-		return onlyTableValuesAllowedESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Masks getMasks() {
-		return masks;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMasks(Masks newMasks, NotificationChain msgs) {
-		Masks oldMasks = masks;
-		masks = newMasks;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE__MASKS, oldMasks, newMasks);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMasks(Masks newMasks) {
-		if (newMasks != masks) {
-			NotificationChain msgs = null;
-			if (masks != null)
-				msgs = ((InternalEObject)masks).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.OUTLINE_CODE__MASKS, null, msgs);
-			if (newMasks != null)
-				msgs = ((InternalEObject)newMasks).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.OUTLINE_CODE__MASKS, null, msgs);
-			msgs = basicSetMasks(newMasks, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.OUTLINE_CODE__MASKS, newMasks, newMasks));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.OUTLINE_CODE__VALUES:
-					return basicSetValues(null, msgs);
-				case MsprojectPackage.OUTLINE_CODE__MASKS:
-					return basicSetMasks(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODE__FIELD_ID:
-				return getFieldID();
-			case MsprojectPackage.OUTLINE_CODE__FIELD_NAME:
-				return getFieldName();
-			case MsprojectPackage.OUTLINE_CODE__ALIAS:
-				return getAlias();
-			case MsprojectPackage.OUTLINE_CODE__PHONETIC_ALIAS:
-				return getPhoneticAlias();
-			case MsprojectPackage.OUTLINE_CODE__VALUES:
-				return getValues();
-			case MsprojectPackage.OUTLINE_CODE__ENTERPRISE:
-				return isEnterprise() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.OUTLINE_CODE__ENTERPRISE_OUTLINE_CODE_ALIAS:
-				return getEnterpriseOutlineCodeAlias();
-			case MsprojectPackage.OUTLINE_CODE__RESOURCE_SUBSTITUTION_ENABLED:
-				return isResourceSubstitutionEnabled() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.OUTLINE_CODE__LEAF_ONLY:
-				return isLeafOnly() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.OUTLINE_CODE__ALL_LEVELS_REQUIRED:
-				return isAllLevelsRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.OUTLINE_CODE__ONLY_TABLE_VALUES_ALLOWED:
-				return isOnlyTableValuesAllowed() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.OUTLINE_CODE__MASKS:
-				return getMasks();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODE__FIELD_ID:
-				setFieldID((String)newValue);
-				return;
-			case MsprojectPackage.OUTLINE_CODE__FIELD_NAME:
-				setFieldName((String)newValue);
-				return;
-			case MsprojectPackage.OUTLINE_CODE__ALIAS:
-				setAlias((String)newValue);
-				return;
-			case MsprojectPackage.OUTLINE_CODE__PHONETIC_ALIAS:
-				setPhoneticAlias((String)newValue);
-				return;
-			case MsprojectPackage.OUTLINE_CODE__VALUES:
-				setValues((Values)newValue);
-				return;
-			case MsprojectPackage.OUTLINE_CODE__ENTERPRISE:
-				setEnterprise(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.OUTLINE_CODE__ENTERPRISE_OUTLINE_CODE_ALIAS:
-				setEnterpriseOutlineCodeAlias((BigInteger)newValue);
-				return;
-			case MsprojectPackage.OUTLINE_CODE__RESOURCE_SUBSTITUTION_ENABLED:
-				setResourceSubstitutionEnabled(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.OUTLINE_CODE__LEAF_ONLY:
-				setLeafOnly(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.OUTLINE_CODE__ALL_LEVELS_REQUIRED:
-				setAllLevelsRequired(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.OUTLINE_CODE__ONLY_TABLE_VALUES_ALLOWED:
-				setOnlyTableValuesAllowed(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.OUTLINE_CODE__MASKS:
-				setMasks((Masks)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODE__FIELD_ID:
-				setFieldID(FIELD_ID_EDEFAULT);
-				return;
-			case MsprojectPackage.OUTLINE_CODE__FIELD_NAME:
-				setFieldName(FIELD_NAME_EDEFAULT);
-				return;
-			case MsprojectPackage.OUTLINE_CODE__ALIAS:
-				setAlias(ALIAS_EDEFAULT);
-				return;
-			case MsprojectPackage.OUTLINE_CODE__PHONETIC_ALIAS:
-				setPhoneticAlias(PHONETIC_ALIAS_EDEFAULT);
-				return;
-			case MsprojectPackage.OUTLINE_CODE__VALUES:
-				setValues((Values)null);
-				return;
-			case MsprojectPackage.OUTLINE_CODE__ENTERPRISE:
-				unsetEnterprise();
-				return;
-			case MsprojectPackage.OUTLINE_CODE__ENTERPRISE_OUTLINE_CODE_ALIAS:
-				setEnterpriseOutlineCodeAlias(ENTERPRISE_OUTLINE_CODE_ALIAS_EDEFAULT);
-				return;
-			case MsprojectPackage.OUTLINE_CODE__RESOURCE_SUBSTITUTION_ENABLED:
-				unsetResourceSubstitutionEnabled();
-				return;
-			case MsprojectPackage.OUTLINE_CODE__LEAF_ONLY:
-				unsetLeafOnly();
-				return;
-			case MsprojectPackage.OUTLINE_CODE__ALL_LEVELS_REQUIRED:
-				unsetAllLevelsRequired();
-				return;
-			case MsprojectPackage.OUTLINE_CODE__ONLY_TABLE_VALUES_ALLOWED:
-				unsetOnlyTableValuesAllowed();
-				return;
-			case MsprojectPackage.OUTLINE_CODE__MASKS:
-				setMasks((Masks)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODE__FIELD_ID:
-				return FIELD_ID_EDEFAULT == null ? fieldID != null : !FIELD_ID_EDEFAULT.equals(fieldID);
-			case MsprojectPackage.OUTLINE_CODE__FIELD_NAME:
-				return FIELD_NAME_EDEFAULT == null ? fieldName != null : !FIELD_NAME_EDEFAULT.equals(fieldName);
-			case MsprojectPackage.OUTLINE_CODE__ALIAS:
-				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);
-			case MsprojectPackage.OUTLINE_CODE__PHONETIC_ALIAS:
-				return PHONETIC_ALIAS_EDEFAULT == null ? phoneticAlias != null : !PHONETIC_ALIAS_EDEFAULT.equals(phoneticAlias);
-			case MsprojectPackage.OUTLINE_CODE__VALUES:
-				return values != null;
-			case MsprojectPackage.OUTLINE_CODE__ENTERPRISE:
-				return isSetEnterprise();
-			case MsprojectPackage.OUTLINE_CODE__ENTERPRISE_OUTLINE_CODE_ALIAS:
-				return ENTERPRISE_OUTLINE_CODE_ALIAS_EDEFAULT == null ? enterpriseOutlineCodeAlias != null : !ENTERPRISE_OUTLINE_CODE_ALIAS_EDEFAULT.equals(enterpriseOutlineCodeAlias);
-			case MsprojectPackage.OUTLINE_CODE__RESOURCE_SUBSTITUTION_ENABLED:
-				return isSetResourceSubstitutionEnabled();
-			case MsprojectPackage.OUTLINE_CODE__LEAF_ONLY:
-				return isSetLeafOnly();
-			case MsprojectPackage.OUTLINE_CODE__ALL_LEVELS_REQUIRED:
-				return isSetAllLevelsRequired();
-			case MsprojectPackage.OUTLINE_CODE__ONLY_TABLE_VALUES_ALLOWED:
-				return isSetOnlyTableValuesAllowed();
-			case MsprojectPackage.OUTLINE_CODE__MASKS:
-				return masks != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (fieldID: ");
-		result.append(fieldID);
-		result.append(", fieldName: ");
-		result.append(fieldName);
-		result.append(", alias: ");
-		result.append(alias);
-		result.append(", phoneticAlias: ");
-		result.append(phoneticAlias);
-		result.append(", enterprise: ");
-		if (enterpriseESet) result.append(enterprise); else result.append("<unset>");
-		result.append(", enterpriseOutlineCodeAlias: ");
-		result.append(enterpriseOutlineCodeAlias);
-		result.append(", resourceSubstitutionEnabled: ");
-		if (resourceSubstitutionEnabledESet) result.append(resourceSubstitutionEnabled); else result.append("<unset>");
-		result.append(", leafOnly: ");
-		if (leafOnlyESet) result.append(leafOnly); else result.append("<unset>");
-		result.append(", allLevelsRequired: ");
-		if (allLevelsRequiredESet) result.append(allLevelsRequired); else result.append("<unset>");
-		result.append(", onlyTableValuesAllowed: ");
-		if (onlyTableValuesAllowedESet) result.append(onlyTableValuesAllowed); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //OutlineCodeImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/OutlineCodesImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/OutlineCodesImpl.java
deleted file mode 100755
index f57a656..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/OutlineCodesImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: OutlineCodesImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.OutlineCode;
-import org.eclipse.epf.msproject.OutlineCodes;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Outline Codes</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.OutlineCodesImpl#getOutlineCode <em>Outline Code</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OutlineCodesImpl extends EObjectImpl implements OutlineCodes {
-	/**
-	 * The cached value of the '{@link #getOutlineCode() <em>Outline Code</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutlineCode()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList outlineCode = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OutlineCodesImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getOutlineCodes();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getOutlineCode() {
-		if (outlineCode == null) {
-			outlineCode = new EObjectContainmentEList(OutlineCode.class, this, MsprojectPackage.OUTLINE_CODES__OUTLINE_CODE);
-		}
-		return outlineCode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.OUTLINE_CODES__OUTLINE_CODE:
-					return ((InternalEList)getOutlineCode()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODES__OUTLINE_CODE:
-				return getOutlineCode();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODES__OUTLINE_CODE:
-				getOutlineCode().clear();
-				getOutlineCode().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODES__OUTLINE_CODE:
-				getOutlineCode().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.OUTLINE_CODES__OUTLINE_CODE:
-				return outlineCode != null && !outlineCode.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //OutlineCodesImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/PredecessorLinkImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/PredecessorLinkImpl.java
deleted file mode 100755
index 7b2734d..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/PredecessorLinkImpl.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PredecessorLinkImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.PredecessorLink;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Predecessor Link</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.PredecessorLinkImpl#getPredecessorUID <em>Predecessor UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.PredecessorLinkImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.PredecessorLinkImpl#isCrossProject <em>Cross Project</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.PredecessorLinkImpl#getCrossProjectName <em>Cross Project Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.PredecessorLinkImpl#getLinkLag <em>Link Lag</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.PredecessorLinkImpl#getLagFormat <em>Lag Format</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PredecessorLinkImpl extends EObjectImpl implements PredecessorLink {
-	/**
-	 * The default value of the '{@link #getPredecessorUID() <em>Predecessor UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPredecessorUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger PREDECESSOR_UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPredecessorUID() <em>Predecessor UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPredecessorUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger predecessorUID = PREDECESSOR_UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger type = TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isCrossProject() <em>Cross Project</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCrossProject()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CROSS_PROJECT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isCrossProject() <em>Cross Project</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCrossProject()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean crossProject = CROSS_PROJECT_EDEFAULT;
-
-	/**
-	 * This is true if the Cross Project attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean crossProjectESet = false;
-
-	/**
-	 * The default value of the '{@link #getCrossProjectName() <em>Cross Project Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCrossProjectName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CROSS_PROJECT_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCrossProjectName() <em>Cross Project Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCrossProjectName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String crossProjectName = CROSS_PROJECT_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLinkLag() <em>Link Lag</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLinkLag()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger LINK_LAG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLinkLag() <em>Link Lag</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLinkLag()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger linkLag = LINK_LAG_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLagFormat() <em>Lag Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLagFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger LAG_FORMAT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLagFormat() <em>Lag Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLagFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger lagFormat = LAG_FORMAT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PredecessorLinkImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getPredecessorLink();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getPredecessorUID() {
-		return predecessorUID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPredecessorUID(BigInteger newPredecessorUID) {
-		BigInteger oldPredecessorUID = predecessorUID;
-		predecessorUID = newPredecessorUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PREDECESSOR_LINK__PREDECESSOR_UID, oldPredecessorUID, predecessorUID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(BigInteger newType) {
-		BigInteger oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PREDECESSOR_LINK__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isCrossProject() {
-		return crossProject;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCrossProject(boolean newCrossProject) {
-		boolean oldCrossProject = crossProject;
-		crossProject = newCrossProject;
-		boolean oldCrossProjectESet = crossProjectESet;
-		crossProjectESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PREDECESSOR_LINK__CROSS_PROJECT, oldCrossProject, crossProject, !oldCrossProjectESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetCrossProject() {
-		boolean oldCrossProject = crossProject;
-		boolean oldCrossProjectESet = crossProjectESet;
-		crossProject = CROSS_PROJECT_EDEFAULT;
-		crossProjectESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PREDECESSOR_LINK__CROSS_PROJECT, oldCrossProject, CROSS_PROJECT_EDEFAULT, oldCrossProjectESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetCrossProject() {
-		return crossProjectESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCrossProjectName() {
-		return crossProjectName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCrossProjectName(String newCrossProjectName) {
-		String oldCrossProjectName = crossProjectName;
-		crossProjectName = newCrossProjectName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PREDECESSOR_LINK__CROSS_PROJECT_NAME, oldCrossProjectName, crossProjectName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getLinkLag() {
-		return linkLag;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLinkLag(BigInteger newLinkLag) {
-		BigInteger oldLinkLag = linkLag;
-		linkLag = newLinkLag;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PREDECESSOR_LINK__LINK_LAG, oldLinkLag, linkLag));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getLagFormat() {
-		return lagFormat;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLagFormat(BigInteger newLagFormat) {
-		BigInteger oldLagFormat = lagFormat;
-		lagFormat = newLagFormat;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PREDECESSOR_LINK__LAG_FORMAT, oldLagFormat, lagFormat));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.PREDECESSOR_LINK__PREDECESSOR_UID:
-				return getPredecessorUID();
-			case MsprojectPackage.PREDECESSOR_LINK__TYPE:
-				return getType();
-			case MsprojectPackage.PREDECESSOR_LINK__CROSS_PROJECT:
-				return isCrossProject() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PREDECESSOR_LINK__CROSS_PROJECT_NAME:
-				return getCrossProjectName();
-			case MsprojectPackage.PREDECESSOR_LINK__LINK_LAG:
-				return getLinkLag();
-			case MsprojectPackage.PREDECESSOR_LINK__LAG_FORMAT:
-				return getLagFormat();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.PREDECESSOR_LINK__PREDECESSOR_UID:
-				setPredecessorUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PREDECESSOR_LINK__TYPE:
-				setType((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PREDECESSOR_LINK__CROSS_PROJECT:
-				setCrossProject(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PREDECESSOR_LINK__CROSS_PROJECT_NAME:
-				setCrossProjectName((String)newValue);
-				return;
-			case MsprojectPackage.PREDECESSOR_LINK__LINK_LAG:
-				setLinkLag((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PREDECESSOR_LINK__LAG_FORMAT:
-				setLagFormat((BigInteger)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.PREDECESSOR_LINK__PREDECESSOR_UID:
-				setPredecessorUID(PREDECESSOR_UID_EDEFAULT);
-				return;
-			case MsprojectPackage.PREDECESSOR_LINK__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case MsprojectPackage.PREDECESSOR_LINK__CROSS_PROJECT:
-				unsetCrossProject();
-				return;
-			case MsprojectPackage.PREDECESSOR_LINK__CROSS_PROJECT_NAME:
-				setCrossProjectName(CROSS_PROJECT_NAME_EDEFAULT);
-				return;
-			case MsprojectPackage.PREDECESSOR_LINK__LINK_LAG:
-				setLinkLag(LINK_LAG_EDEFAULT);
-				return;
-			case MsprojectPackage.PREDECESSOR_LINK__LAG_FORMAT:
-				setLagFormat(LAG_FORMAT_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.PREDECESSOR_LINK__PREDECESSOR_UID:
-				return PREDECESSOR_UID_EDEFAULT == null ? predecessorUID != null : !PREDECESSOR_UID_EDEFAULT.equals(predecessorUID);
-			case MsprojectPackage.PREDECESSOR_LINK__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case MsprojectPackage.PREDECESSOR_LINK__CROSS_PROJECT:
-				return isSetCrossProject();
-			case MsprojectPackage.PREDECESSOR_LINK__CROSS_PROJECT_NAME:
-				return CROSS_PROJECT_NAME_EDEFAULT == null ? crossProjectName != null : !CROSS_PROJECT_NAME_EDEFAULT.equals(crossProjectName);
-			case MsprojectPackage.PREDECESSOR_LINK__LINK_LAG:
-				return LINK_LAG_EDEFAULT == null ? linkLag != null : !LINK_LAG_EDEFAULT.equals(linkLag);
-			case MsprojectPackage.PREDECESSOR_LINK__LAG_FORMAT:
-				return LAG_FORMAT_EDEFAULT == null ? lagFormat != null : !LAG_FORMAT_EDEFAULT.equals(lagFormat);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (predecessorUID: ");
-		result.append(predecessorUID);
-		result.append(", type: ");
-		result.append(type);
-		result.append(", crossProject: ");
-		if (crossProjectESet) result.append(crossProject); else result.append("<unset>");
-		result.append(", crossProjectName: ");
-		result.append(crossProjectName);
-		result.append(", linkLag: ");
-		result.append(linkLag);
-		result.append(", lagFormat: ");
-		result.append(lagFormat);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PredecessorLinkImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ProjectImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ProjectImpl.java
deleted file mode 100755
index fe3d83c..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ProjectImpl.java
+++ /dev/null
@@ -1,4771 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ProjectImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.Assignments;
-import org.eclipse.epf.msproject.Calendars;
-import org.eclipse.epf.msproject.ExtendedAttributes;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.OutlineCodes;
-import org.eclipse.epf.msproject.Project;
-import org.eclipse.epf.msproject.Resources;
-import org.eclipse.epf.msproject.Tasks;
-import org.eclipse.epf.msproject.WBSMasks;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Project</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getSubject <em>Subject</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getCompany <em>Company</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getManager <em>Manager</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getAuthor <em>Author</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getCreationDate <em>Creation Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getRevision <em>Revision</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getLastSaved <em>Last Saved</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isScheduleFromStart <em>Schedule From Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getStartDate <em>Start Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getFinishDate <em>Finish Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getFYStartDate <em>FY Start Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getCriticalSlackLimit <em>Critical Slack Limit</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getCurrencyDigits <em>Currency Digits</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getCurrencySymbol <em>Currency Symbol</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getCurrencySymbolPosition <em>Currency Symbol Position</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getCalendarUID <em>Calendar UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getDefaultStartTime <em>Default Start Time</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getDefaultFinishTime <em>Default Finish Time</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getMinutesPerDay <em>Minutes Per Day</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getMinutesPerWeek <em>Minutes Per Week</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getDaysPerMonth <em>Days Per Month</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getDefaultTaskType <em>Default Task Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getDefaultFixedCostAccrual <em>Default Fixed Cost Accrual</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getDefaultStandardRate <em>Default Standard Rate</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getDefaultOvertimeRate <em>Default Overtime Rate</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getDurationFormat <em>Duration Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getWorkFormat <em>Work Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isEditableActualCosts <em>Editable Actual Costs</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isHonorConstraints <em>Honor Constraints</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getEarnedValueMethod <em>Earned Value Method</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isInsertedProjectsLikeSummary <em>Inserted Projects Like Summary</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isMultipleCriticalPaths <em>Multiple Critical Paths</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isNewTasksEffortDriven <em>New Tasks Effort Driven</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isNewTasksEstimated <em>New Tasks Estimated</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isSplitsInProgressTasks <em>Splits In Progress Tasks</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isSpreadActualCost <em>Spread Actual Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isSpreadPercentComplete <em>Spread Percent Complete</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isTaskUpdatesResource <em>Task Updates Resource</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isFiscalYearStart <em>Fiscal Year Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getWeekStartDay <em>Week Start Day</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isMoveCompletedEndsBack <em>Move Completed Ends Back</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isMoveRemainingStartsBack <em>Move Remaining Starts Back</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isMoveRemainingStartsForward <em>Move Remaining Starts Forward</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isMoveCompletedEndsForward <em>Move Completed Ends Forward</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getBaselineForEarnedValue <em>Baseline For Earned Value</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isAutoAddNewResourcesAndTasks <em>Auto Add New Resources And Tasks</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getStatusDate <em>Status Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getCurrentDate <em>Current Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isMicrosoftProjectServerURL <em>Microsoft Project Server URL</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isAutolink <em>Autolink</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getNewTaskStartDate <em>New Task Start Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getDefaultTaskEVMethod <em>Default Task EV Method</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isProjectExternallyEdited <em>Project Externally Edited</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getExtendedCreationDate <em>Extended Creation Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isActualsInSync <em>Actuals In Sync</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isRemoveFileProperties <em>Remove File Properties</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#isAdminProject <em>Admin Project</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getOutlineCodes <em>Outline Codes</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getWBSMasks <em>WBS Masks</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getExtendedAttributes <em>Extended Attributes</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getCalendars <em>Calendars</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getTasks <em>Tasks</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getResources <em>Resources</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ProjectImpl#getAssignments <em>Assignments</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ProjectImpl extends EObjectImpl implements Project {
-	/**
-	 * The default value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String uID = UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TITLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected String title = TITLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSubject() <em>Subject</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubject()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SUBJECT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSubject() <em>Subject</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubject()
-	 * @generated
-	 * @ordered
-	 */
-	protected String subject = SUBJECT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCategory() <em>Category</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCategory()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CATEGORY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCategory() <em>Category</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCategory()
-	 * @generated
-	 * @ordered
-	 */
-	protected String category = CATEGORY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCompany() <em>Company</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompany()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMPANY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCompany() <em>Company</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompany()
-	 * @generated
-	 * @ordered
-	 */
-	protected String company = COMPANY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getManager() <em>Manager</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getManager()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MANAGER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getManager() <em>Manager</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getManager()
-	 * @generated
-	 * @ordered
-	 */
-	protected String manager = MANAGER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAuthor() <em>Author</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthor()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String AUTHOR_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAuthor() <em>Author</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthor()
-	 * @generated
-	 * @ordered
-	 */
-	protected String author = AUTHOR_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCreationDate() <em>Creation Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object CREATION_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCreationDate() <em>Creation Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object creationDate = CREATION_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRevision() <em>Revision</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRevision()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger REVISION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRevision() <em>Revision</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRevision()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger revision = REVISION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLastSaved() <em>Last Saved</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLastSaved()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object LAST_SAVED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLastSaved() <em>Last Saved</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLastSaved()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object lastSaved = LAST_SAVED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isScheduleFromStart() <em>Schedule From Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isScheduleFromStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SCHEDULE_FROM_START_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isScheduleFromStart() <em>Schedule From Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isScheduleFromStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean scheduleFromStart = SCHEDULE_FROM_START_EDEFAULT;
-
-	/**
-	 * This is true if the Schedule From Start attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean scheduleFromStartESet = false;
-
-	/**
-	 * The default value of the '{@link #getStartDate() <em>Start Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStartDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object START_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStartDate() <em>Start Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStartDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object startDate = START_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFinishDate() <em>Finish Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinishDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object FINISH_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFinishDate() <em>Finish Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinishDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object finishDate = FINISH_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFYStartDate() <em>FY Start Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFYStartDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger FYSTART_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFYStartDate() <em>FY Start Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFYStartDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger fYStartDate = FYSTART_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCriticalSlackLimit() <em>Critical Slack Limit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCriticalSlackLimit()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger CRITICAL_SLACK_LIMIT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCriticalSlackLimit() <em>Critical Slack Limit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCriticalSlackLimit()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger criticalSlackLimit = CRITICAL_SLACK_LIMIT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCurrencyDigits() <em>Currency Digits</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCurrencyDigits()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger CURRENCY_DIGITS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCurrencyDigits() <em>Currency Digits</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCurrencyDigits()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger currencyDigits = CURRENCY_DIGITS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCurrencySymbol() <em>Currency Symbol</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCurrencySymbol()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CURRENCY_SYMBOL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCurrencySymbol() <em>Currency Symbol</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCurrencySymbol()
-	 * @generated
-	 * @ordered
-	 */
-	protected String currencySymbol = CURRENCY_SYMBOL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCurrencySymbolPosition() <em>Currency Symbol Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCurrencySymbolPosition()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger CURRENCY_SYMBOL_POSITION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCurrencySymbolPosition() <em>Currency Symbol Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCurrencySymbolPosition()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger currencySymbolPosition = CURRENCY_SYMBOL_POSITION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCalendarUID() <em>Calendar UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCalendarUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger CALENDAR_UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCalendarUID() <em>Calendar UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCalendarUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger calendarUID = CALENDAR_UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDefaultStartTime() <em>Default Start Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultStartTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object DEFAULT_START_TIME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDefaultStartTime() <em>Default Start Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultStartTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object defaultStartTime = DEFAULT_START_TIME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDefaultFinishTime() <em>Default Finish Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultFinishTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object DEFAULT_FINISH_TIME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDefaultFinishTime() <em>Default Finish Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultFinishTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object defaultFinishTime = DEFAULT_FINISH_TIME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMinutesPerDay() <em>Minutes Per Day</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMinutesPerDay()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger MINUTES_PER_DAY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMinutesPerDay() <em>Minutes Per Day</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMinutesPerDay()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger minutesPerDay = MINUTES_PER_DAY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMinutesPerWeek() <em>Minutes Per Week</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMinutesPerWeek()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger MINUTES_PER_WEEK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMinutesPerWeek() <em>Minutes Per Week</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMinutesPerWeek()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger minutesPerWeek = MINUTES_PER_WEEK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDaysPerMonth() <em>Days Per Month</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDaysPerMonth()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger DAYS_PER_MONTH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDaysPerMonth() <em>Days Per Month</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDaysPerMonth()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger daysPerMonth = DAYS_PER_MONTH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDefaultTaskType() <em>Default Task Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultTaskType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger DEFAULT_TASK_TYPE_EDEFAULT = new BigInteger("1");
-
-	/**
-	 * The cached value of the '{@link #getDefaultTaskType() <em>Default Task Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultTaskType()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger defaultTaskType = DEFAULT_TASK_TYPE_EDEFAULT;
-
-	/**
-	 * This is true if the Default Task Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean defaultTaskTypeESet = false;
-
-	/**
-	 * The default value of the '{@link #getDefaultFixedCostAccrual() <em>Default Fixed Cost Accrual</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultFixedCostAccrual()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger DEFAULT_FIXED_COST_ACCRUAL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDefaultFixedCostAccrual() <em>Default Fixed Cost Accrual</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultFixedCostAccrual()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger defaultFixedCostAccrual = DEFAULT_FIXED_COST_ACCRUAL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDefaultStandardRate() <em>Default Standard Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultStandardRate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float DEFAULT_STANDARD_RATE_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getDefaultStandardRate() <em>Default Standard Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultStandardRate()
-	 * @generated
-	 * @ordered
-	 */
-	protected float defaultStandardRate = DEFAULT_STANDARD_RATE_EDEFAULT;
-
-	/**
-	 * This is true if the Default Standard Rate attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean defaultStandardRateESet = false;
-
-	/**
-	 * The default value of the '{@link #getDefaultOvertimeRate() <em>Default Overtime Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultOvertimeRate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float DEFAULT_OVERTIME_RATE_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getDefaultOvertimeRate() <em>Default Overtime Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultOvertimeRate()
-	 * @generated
-	 * @ordered
-	 */
-	protected float defaultOvertimeRate = DEFAULT_OVERTIME_RATE_EDEFAULT;
-
-	/**
-	 * This is true if the Default Overtime Rate attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean defaultOvertimeRateESet = false;
-
-	/**
-	 * The default value of the '{@link #getDurationFormat() <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDurationFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger DURATION_FORMAT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDurationFormat() <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDurationFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger durationFormat = DURATION_FORMAT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWorkFormat() <em>Work Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger WORK_FORMAT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWorkFormat() <em>Work Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger workFormat = WORK_FORMAT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isEditableActualCosts() <em>Editable Actual Costs</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEditableActualCosts()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EDITABLE_ACTUAL_COSTS_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isEditableActualCosts() <em>Editable Actual Costs</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEditableActualCosts()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean editableActualCosts = EDITABLE_ACTUAL_COSTS_EDEFAULT;
-
-	/**
-	 * This is true if the Editable Actual Costs attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean editableActualCostsESet = false;
-
-	/**
-	 * The default value of the '{@link #isHonorConstraints() <em>Honor Constraints</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHonorConstraints()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean HONOR_CONSTRAINTS_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isHonorConstraints() <em>Honor Constraints</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHonorConstraints()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean honorConstraints = HONOR_CONSTRAINTS_EDEFAULT;
-
-	/**
-	 * This is true if the Honor Constraints attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean honorConstraintsESet = false;
-
-	/**
-	 * The default value of the '{@link #getEarnedValueMethod() <em>Earned Value Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEarnedValueMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger EARNED_VALUE_METHOD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEarnedValueMethod() <em>Earned Value Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEarnedValueMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger earnedValueMethod = EARNED_VALUE_METHOD_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isInsertedProjectsLikeSummary() <em>Inserted Projects Like Summary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isInsertedProjectsLikeSummary()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean INSERTED_PROJECTS_LIKE_SUMMARY_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isInsertedProjectsLikeSummary() <em>Inserted Projects Like Summary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isInsertedProjectsLikeSummary()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean insertedProjectsLikeSummary = INSERTED_PROJECTS_LIKE_SUMMARY_EDEFAULT;
-
-	/**
-	 * This is true if the Inserted Projects Like Summary attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean insertedProjectsLikeSummaryESet = false;
-
-	/**
-	 * The default value of the '{@link #isMultipleCriticalPaths() <em>Multiple Critical Paths</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMultipleCriticalPaths()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MULTIPLE_CRITICAL_PATHS_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isMultipleCriticalPaths() <em>Multiple Critical Paths</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMultipleCriticalPaths()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean multipleCriticalPaths = MULTIPLE_CRITICAL_PATHS_EDEFAULT;
-
-	/**
-	 * This is true if the Multiple Critical Paths attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean multipleCriticalPathsESet = false;
-
-	/**
-	 * The default value of the '{@link #isNewTasksEffortDriven() <em>New Tasks Effort Driven</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNewTasksEffortDriven()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean NEW_TASKS_EFFORT_DRIVEN_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isNewTasksEffortDriven() <em>New Tasks Effort Driven</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNewTasksEffortDriven()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean newTasksEffortDriven = NEW_TASKS_EFFORT_DRIVEN_EDEFAULT;
-
-	/**
-	 * This is true if the New Tasks Effort Driven attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean newTasksEffortDrivenESet = false;
-
-	/**
-	 * The default value of the '{@link #isNewTasksEstimated() <em>New Tasks Estimated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNewTasksEstimated()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean NEW_TASKS_ESTIMATED_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isNewTasksEstimated() <em>New Tasks Estimated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNewTasksEstimated()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean newTasksEstimated = NEW_TASKS_ESTIMATED_EDEFAULT;
-
-	/**
-	 * This is true if the New Tasks Estimated attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean newTasksEstimatedESet = false;
-
-	/**
-	 * The default value of the '{@link #isSplitsInProgressTasks() <em>Splits In Progress Tasks</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSplitsInProgressTasks()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SPLITS_IN_PROGRESS_TASKS_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isSplitsInProgressTasks() <em>Splits In Progress Tasks</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSplitsInProgressTasks()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean splitsInProgressTasks = SPLITS_IN_PROGRESS_TASKS_EDEFAULT;
-
-	/**
-	 * This is true if the Splits In Progress Tasks attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean splitsInProgressTasksESet = false;
-
-	/**
-	 * The default value of the '{@link #isSpreadActualCost() <em>Spread Actual Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSpreadActualCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SPREAD_ACTUAL_COST_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isSpreadActualCost() <em>Spread Actual Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSpreadActualCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean spreadActualCost = SPREAD_ACTUAL_COST_EDEFAULT;
-
-	/**
-	 * This is true if the Spread Actual Cost attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean spreadActualCostESet = false;
-
-	/**
-	 * The default value of the '{@link #isSpreadPercentComplete() <em>Spread Percent Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSpreadPercentComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SPREAD_PERCENT_COMPLETE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isSpreadPercentComplete() <em>Spread Percent Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSpreadPercentComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean spreadPercentComplete = SPREAD_PERCENT_COMPLETE_EDEFAULT;
-
-	/**
-	 * This is true if the Spread Percent Complete attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean spreadPercentCompleteESet = false;
-
-	/**
-	 * The default value of the '{@link #isTaskUpdatesResource() <em>Task Updates Resource</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isTaskUpdatesResource()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean TASK_UPDATES_RESOURCE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isTaskUpdatesResource() <em>Task Updates Resource</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isTaskUpdatesResource()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean taskUpdatesResource = TASK_UPDATES_RESOURCE_EDEFAULT;
-
-	/**
-	 * This is true if the Task Updates Resource attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean taskUpdatesResourceESet = false;
-
-	/**
-	 * The default value of the '{@link #isFiscalYearStart() <em>Fiscal Year Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFiscalYearStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean FISCAL_YEAR_START_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isFiscalYearStart() <em>Fiscal Year Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFiscalYearStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean fiscalYearStart = FISCAL_YEAR_START_EDEFAULT;
-
-	/**
-	 * This is true if the Fiscal Year Start attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean fiscalYearStartESet = false;
-
-	/**
-	 * The default value of the '{@link #getWeekStartDay() <em>Week Start Day</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWeekStartDay()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger WEEK_START_DAY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWeekStartDay() <em>Week Start Day</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWeekStartDay()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger weekStartDay = WEEK_START_DAY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isMoveCompletedEndsBack() <em>Move Completed Ends Back</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMoveCompletedEndsBack()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MOVE_COMPLETED_ENDS_BACK_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isMoveCompletedEndsBack() <em>Move Completed Ends Back</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMoveCompletedEndsBack()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean moveCompletedEndsBack = MOVE_COMPLETED_ENDS_BACK_EDEFAULT;
-
-	/**
-	 * This is true if the Move Completed Ends Back attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean moveCompletedEndsBackESet = false;
-
-	/**
-	 * The default value of the '{@link #isMoveRemainingStartsBack() <em>Move Remaining Starts Back</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMoveRemainingStartsBack()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MOVE_REMAINING_STARTS_BACK_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isMoveRemainingStartsBack() <em>Move Remaining Starts Back</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMoveRemainingStartsBack()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean moveRemainingStartsBack = MOVE_REMAINING_STARTS_BACK_EDEFAULT;
-
-	/**
-	 * This is true if the Move Remaining Starts Back attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean moveRemainingStartsBackESet = false;
-
-	/**
-	 * The default value of the '{@link #isMoveRemainingStartsForward() <em>Move Remaining Starts Forward</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMoveRemainingStartsForward()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MOVE_REMAINING_STARTS_FORWARD_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isMoveRemainingStartsForward() <em>Move Remaining Starts Forward</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMoveRemainingStartsForward()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean moveRemainingStartsForward = MOVE_REMAINING_STARTS_FORWARD_EDEFAULT;
-
-	/**
-	 * This is true if the Move Remaining Starts Forward attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean moveRemainingStartsForwardESet = false;
-
-	/**
-	 * The default value of the '{@link #isMoveCompletedEndsForward() <em>Move Completed Ends Forward</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMoveCompletedEndsForward()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MOVE_COMPLETED_ENDS_FORWARD_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isMoveCompletedEndsForward() <em>Move Completed Ends Forward</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMoveCompletedEndsForward()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean moveCompletedEndsForward = MOVE_COMPLETED_ENDS_FORWARD_EDEFAULT;
-
-	/**
-	 * This is true if the Move Completed Ends Forward attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean moveCompletedEndsForwardESet = false;
-
-	/**
-	 * The default value of the '{@link #getBaselineForEarnedValue() <em>Baseline For Earned Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBaselineForEarnedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger BASELINE_FOR_EARNED_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getBaselineForEarnedValue() <em>Baseline For Earned Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBaselineForEarnedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger baselineForEarnedValue = BASELINE_FOR_EARNED_VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isAutoAddNewResourcesAndTasks() <em>Auto Add New Resources And Tasks</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAutoAddNewResourcesAndTasks()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean AUTO_ADD_NEW_RESOURCES_AND_TASKS_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isAutoAddNewResourcesAndTasks() <em>Auto Add New Resources And Tasks</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAutoAddNewResourcesAndTasks()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean autoAddNewResourcesAndTasks = AUTO_ADD_NEW_RESOURCES_AND_TASKS_EDEFAULT;
-
-	/**
-	 * This is true if the Auto Add New Resources And Tasks attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean autoAddNewResourcesAndTasksESet = false;
-
-	/**
-	 * The default value of the '{@link #getStatusDate() <em>Status Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStatusDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object STATUS_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStatusDate() <em>Status Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStatusDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object statusDate = STATUS_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCurrentDate() <em>Current Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCurrentDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object CURRENT_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCurrentDate() <em>Current Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCurrentDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object currentDate = CURRENT_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isMicrosoftProjectServerURL() <em>Microsoft Project Server URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMicrosoftProjectServerURL()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MICROSOFT_PROJECT_SERVER_URL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isMicrosoftProjectServerURL() <em>Microsoft Project Server URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMicrosoftProjectServerURL()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean microsoftProjectServerURL = MICROSOFT_PROJECT_SERVER_URL_EDEFAULT;
-
-	/**
-	 * This is true if the Microsoft Project Server URL attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean microsoftProjectServerURLESet = false;
-
-	/**
-	 * The default value of the '{@link #isAutolink() <em>Autolink</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAutolink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean AUTOLINK_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isAutolink() <em>Autolink</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAutolink()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean autolink = AUTOLINK_EDEFAULT;
-
-	/**
-	 * This is true if the Autolink attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean autolinkESet = false;
-
-	/**
-	 * The default value of the '{@link #getNewTaskStartDate() <em>New Task Start Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNewTaskStartDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger NEW_TASK_START_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNewTaskStartDate() <em>New Task Start Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNewTaskStartDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger newTaskStartDate = NEW_TASK_START_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDefaultTaskEVMethod() <em>Default Task EV Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultTaskEVMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger DEFAULT_TASK_EV_METHOD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDefaultTaskEVMethod() <em>Default Task EV Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultTaskEVMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger defaultTaskEVMethod = DEFAULT_TASK_EV_METHOD_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isProjectExternallyEdited() <em>Project Externally Edited</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isProjectExternallyEdited()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean PROJECT_EXTERNALLY_EDITED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isProjectExternallyEdited() <em>Project Externally Edited</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isProjectExternallyEdited()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean projectExternallyEdited = PROJECT_EXTERNALLY_EDITED_EDEFAULT;
-
-	/**
-	 * This is true if the Project Externally Edited attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean projectExternallyEditedESet = false;
-
-	/**
-	 * The default value of the '{@link #getExtendedCreationDate() <em>Extended Creation Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExtendedCreationDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object EXTENDED_CREATION_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExtendedCreationDate() <em>Extended Creation Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExtendedCreationDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object extendedCreationDate = EXTENDED_CREATION_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isActualsInSync() <em>Actuals In Sync</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isActualsInSync()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ACTUALS_IN_SYNC_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isActualsInSync() <em>Actuals In Sync</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isActualsInSync()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean actualsInSync = ACTUALS_IN_SYNC_EDEFAULT;
-
-	/**
-	 * This is true if the Actuals In Sync attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean actualsInSyncESet = false;
-
-	/**
-	 * The default value of the '{@link #isRemoveFileProperties() <em>Remove File Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRemoveFileProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean REMOVE_FILE_PROPERTIES_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isRemoveFileProperties() <em>Remove File Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRemoveFileProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean removeFileProperties = REMOVE_FILE_PROPERTIES_EDEFAULT;
-
-	/**
-	 * This is true if the Remove File Properties attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean removeFilePropertiesESet = false;
-
-	/**
-	 * The default value of the '{@link #isAdminProject() <em>Admin Project</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAdminProject()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ADMIN_PROJECT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isAdminProject() <em>Admin Project</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAdminProject()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean adminProject = ADMIN_PROJECT_EDEFAULT;
-
-	/**
-	 * This is true if the Admin Project attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean adminProjectESet = false;
-
-	/**
-	 * The cached value of the '{@link #getOutlineCodes() <em>Outline Codes</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutlineCodes()
-	 * @generated
-	 * @ordered
-	 */
-	protected OutlineCodes outlineCodes = null;
-
-	/**
-	 * The cached value of the '{@link #getWBSMasks() <em>WBS Masks</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWBSMasks()
-	 * @generated
-	 * @ordered
-	 */
-	protected WBSMasks wBSMasks = null;
-
-	/**
-	 * The cached value of the '{@link #getExtendedAttributes() <em>Extended Attributes</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExtendedAttributes()
-	 * @generated
-	 * @ordered
-	 */
-	protected ExtendedAttributes extendedAttributes = null;
-
-	/**
-	 * The cached value of the '{@link #getCalendars() <em>Calendars</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCalendars()
-	 * @generated
-	 * @ordered
-	 */
-	protected Calendars calendars = null;
-
-	/**
-	 * The cached value of the '{@link #getTasks() <em>Tasks</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTasks()
-	 * @generated
-	 * @ordered
-	 */
-	protected Tasks tasks = null;
-
-	/**
-	 * The cached value of the '{@link #getResources() <em>Resources</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResources()
-	 * @generated
-	 * @ordered
-	 */
-	protected Resources resources = null;
-
-	/**
-	 * The cached value of the '{@link #getAssignments() <em>Assignments</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAssignments()
-	 * @generated
-	 * @ordered
-	 */
-	protected Assignments assignments = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProjectImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getProject();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getUID() {
-		return uID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUID(String newUID) {
-		String oldUID = uID;
-		uID = newUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__UID, oldUID, uID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTitle() {
-		return title;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTitle(String newTitle) {
-		String oldTitle = title;
-		title = newTitle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__TITLE, oldTitle, title));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSubject() {
-		return subject;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSubject(String newSubject) {
-		String oldSubject = subject;
-		subject = newSubject;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__SUBJECT, oldSubject, subject));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCategory() {
-		return category;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCategory(String newCategory) {
-		String oldCategory = category;
-		category = newCategory;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__CATEGORY, oldCategory, category));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCompany() {
-		return company;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCompany(String newCompany) {
-		String oldCompany = company;
-		company = newCompany;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__COMPANY, oldCompany, company));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getManager() {
-		return manager;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setManager(String newManager) {
-		String oldManager = manager;
-		manager = newManager;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__MANAGER, oldManager, manager));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAuthor() {
-		return author;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthor(String newAuthor) {
-		String oldAuthor = author;
-		author = newAuthor;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__AUTHOR, oldAuthor, author));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getCreationDate() {
-		return creationDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCreationDate(Object newCreationDate) {
-		Object oldCreationDate = creationDate;
-		creationDate = newCreationDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__CREATION_DATE, oldCreationDate, creationDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getRevision() {
-		return revision;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRevision(BigInteger newRevision) {
-		BigInteger oldRevision = revision;
-		revision = newRevision;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__REVISION, oldRevision, revision));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getLastSaved() {
-		return lastSaved;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLastSaved(Object newLastSaved) {
-		Object oldLastSaved = lastSaved;
-		lastSaved = newLastSaved;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__LAST_SAVED, oldLastSaved, lastSaved));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isScheduleFromStart() {
-		return scheduleFromStart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setScheduleFromStart(boolean newScheduleFromStart) {
-		boolean oldScheduleFromStart = scheduleFromStart;
-		scheduleFromStart = newScheduleFromStart;
-		boolean oldScheduleFromStartESet = scheduleFromStartESet;
-		scheduleFromStartESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__SCHEDULE_FROM_START, oldScheduleFromStart, scheduleFromStart, !oldScheduleFromStartESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetScheduleFromStart() {
-		boolean oldScheduleFromStart = scheduleFromStart;
-		boolean oldScheduleFromStartESet = scheduleFromStartESet;
-		scheduleFromStart = SCHEDULE_FROM_START_EDEFAULT;
-		scheduleFromStartESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__SCHEDULE_FROM_START, oldScheduleFromStart, SCHEDULE_FROM_START_EDEFAULT, oldScheduleFromStartESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetScheduleFromStart() {
-		return scheduleFromStartESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getStartDate() {
-		return startDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStartDate(Object newStartDate) {
-		Object oldStartDate = startDate;
-		startDate = newStartDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__START_DATE, oldStartDate, startDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getFinishDate() {
-		return finishDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinishDate(Object newFinishDate) {
-		Object oldFinishDate = finishDate;
-		finishDate = newFinishDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__FINISH_DATE, oldFinishDate, finishDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getFYStartDate() {
-		return fYStartDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFYStartDate(BigInteger newFYStartDate) {
-		BigInteger oldFYStartDate = fYStartDate;
-		fYStartDate = newFYStartDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__FYSTART_DATE, oldFYStartDate, fYStartDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getCriticalSlackLimit() {
-		return criticalSlackLimit;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCriticalSlackLimit(BigInteger newCriticalSlackLimit) {
-		BigInteger oldCriticalSlackLimit = criticalSlackLimit;
-		criticalSlackLimit = newCriticalSlackLimit;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__CRITICAL_SLACK_LIMIT, oldCriticalSlackLimit, criticalSlackLimit));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getCurrencyDigits() {
-		return currencyDigits;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCurrencyDigits(BigInteger newCurrencyDigits) {
-		BigInteger oldCurrencyDigits = currencyDigits;
-		currencyDigits = newCurrencyDigits;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__CURRENCY_DIGITS, oldCurrencyDigits, currencyDigits));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCurrencySymbol() {
-		return currencySymbol;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCurrencySymbol(String newCurrencySymbol) {
-		String oldCurrencySymbol = currencySymbol;
-		currencySymbol = newCurrencySymbol;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__CURRENCY_SYMBOL, oldCurrencySymbol, currencySymbol));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getCurrencySymbolPosition() {
-		return currencySymbolPosition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCurrencySymbolPosition(BigInteger newCurrencySymbolPosition) {
-		BigInteger oldCurrencySymbolPosition = currencySymbolPosition;
-		currencySymbolPosition = newCurrencySymbolPosition;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__CURRENCY_SYMBOL_POSITION, oldCurrencySymbolPosition, currencySymbolPosition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getCalendarUID() {
-		return calendarUID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCalendarUID(BigInteger newCalendarUID) {
-		BigInteger oldCalendarUID = calendarUID;
-		calendarUID = newCalendarUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__CALENDAR_UID, oldCalendarUID, calendarUID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getDefaultStartTime() {
-		return defaultStartTime;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultStartTime(Object newDefaultStartTime) {
-		Object oldDefaultStartTime = defaultStartTime;
-		defaultStartTime = newDefaultStartTime;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__DEFAULT_START_TIME, oldDefaultStartTime, defaultStartTime));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getDefaultFinishTime() {
-		return defaultFinishTime;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultFinishTime(Object newDefaultFinishTime) {
-		Object oldDefaultFinishTime = defaultFinishTime;
-		defaultFinishTime = newDefaultFinishTime;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__DEFAULT_FINISH_TIME, oldDefaultFinishTime, defaultFinishTime));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getMinutesPerDay() {
-		return minutesPerDay;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMinutesPerDay(BigInteger newMinutesPerDay) {
-		BigInteger oldMinutesPerDay = minutesPerDay;
-		minutesPerDay = newMinutesPerDay;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__MINUTES_PER_DAY, oldMinutesPerDay, minutesPerDay));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getMinutesPerWeek() {
-		return minutesPerWeek;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMinutesPerWeek(BigInteger newMinutesPerWeek) {
-		BigInteger oldMinutesPerWeek = minutesPerWeek;
-		minutesPerWeek = newMinutesPerWeek;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__MINUTES_PER_WEEK, oldMinutesPerWeek, minutesPerWeek));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getDaysPerMonth() {
-		return daysPerMonth;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDaysPerMonth(BigInteger newDaysPerMonth) {
-		BigInteger oldDaysPerMonth = daysPerMonth;
-		daysPerMonth = newDaysPerMonth;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__DAYS_PER_MONTH, oldDaysPerMonth, daysPerMonth));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getDefaultTaskType() {
-		return defaultTaskType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultTaskType(BigInteger newDefaultTaskType) {
-		BigInteger oldDefaultTaskType = defaultTaskType;
-		defaultTaskType = newDefaultTaskType;
-		boolean oldDefaultTaskTypeESet = defaultTaskTypeESet;
-		defaultTaskTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__DEFAULT_TASK_TYPE, oldDefaultTaskType, defaultTaskType, !oldDefaultTaskTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetDefaultTaskType() {
-		BigInteger oldDefaultTaskType = defaultTaskType;
-		boolean oldDefaultTaskTypeESet = defaultTaskTypeESet;
-		defaultTaskType = DEFAULT_TASK_TYPE_EDEFAULT;
-		defaultTaskTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__DEFAULT_TASK_TYPE, oldDefaultTaskType, DEFAULT_TASK_TYPE_EDEFAULT, oldDefaultTaskTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetDefaultTaskType() {
-		return defaultTaskTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getDefaultFixedCostAccrual() {
-		return defaultFixedCostAccrual;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultFixedCostAccrual(BigInteger newDefaultFixedCostAccrual) {
-		BigInteger oldDefaultFixedCostAccrual = defaultFixedCostAccrual;
-		defaultFixedCostAccrual = newDefaultFixedCostAccrual;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__DEFAULT_FIXED_COST_ACCRUAL, oldDefaultFixedCostAccrual, defaultFixedCostAccrual));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getDefaultStandardRate() {
-		return defaultStandardRate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultStandardRate(float newDefaultStandardRate) {
-		float oldDefaultStandardRate = defaultStandardRate;
-		defaultStandardRate = newDefaultStandardRate;
-		boolean oldDefaultStandardRateESet = defaultStandardRateESet;
-		defaultStandardRateESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__DEFAULT_STANDARD_RATE, oldDefaultStandardRate, defaultStandardRate, !oldDefaultStandardRateESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetDefaultStandardRate() {
-		float oldDefaultStandardRate = defaultStandardRate;
-		boolean oldDefaultStandardRateESet = defaultStandardRateESet;
-		defaultStandardRate = DEFAULT_STANDARD_RATE_EDEFAULT;
-		defaultStandardRateESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__DEFAULT_STANDARD_RATE, oldDefaultStandardRate, DEFAULT_STANDARD_RATE_EDEFAULT, oldDefaultStandardRateESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetDefaultStandardRate() {
-		return defaultStandardRateESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getDefaultOvertimeRate() {
-		return defaultOvertimeRate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultOvertimeRate(float newDefaultOvertimeRate) {
-		float oldDefaultOvertimeRate = defaultOvertimeRate;
-		defaultOvertimeRate = newDefaultOvertimeRate;
-		boolean oldDefaultOvertimeRateESet = defaultOvertimeRateESet;
-		defaultOvertimeRateESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__DEFAULT_OVERTIME_RATE, oldDefaultOvertimeRate, defaultOvertimeRate, !oldDefaultOvertimeRateESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetDefaultOvertimeRate() {
-		float oldDefaultOvertimeRate = defaultOvertimeRate;
-		boolean oldDefaultOvertimeRateESet = defaultOvertimeRateESet;
-		defaultOvertimeRate = DEFAULT_OVERTIME_RATE_EDEFAULT;
-		defaultOvertimeRateESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__DEFAULT_OVERTIME_RATE, oldDefaultOvertimeRate, DEFAULT_OVERTIME_RATE_EDEFAULT, oldDefaultOvertimeRateESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetDefaultOvertimeRate() {
-		return defaultOvertimeRateESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getDurationFormat() {
-		return durationFormat;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDurationFormat(BigInteger newDurationFormat) {
-		BigInteger oldDurationFormat = durationFormat;
-		durationFormat = newDurationFormat;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__DURATION_FORMAT, oldDurationFormat, durationFormat));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getWorkFormat() {
-		return workFormat;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWorkFormat(BigInteger newWorkFormat) {
-		BigInteger oldWorkFormat = workFormat;
-		workFormat = newWorkFormat;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__WORK_FORMAT, oldWorkFormat, workFormat));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isEditableActualCosts() {
-		return editableActualCosts;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEditableActualCosts(boolean newEditableActualCosts) {
-		boolean oldEditableActualCosts = editableActualCosts;
-		editableActualCosts = newEditableActualCosts;
-		boolean oldEditableActualCostsESet = editableActualCostsESet;
-		editableActualCostsESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__EDITABLE_ACTUAL_COSTS, oldEditableActualCosts, editableActualCosts, !oldEditableActualCostsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetEditableActualCosts() {
-		boolean oldEditableActualCosts = editableActualCosts;
-		boolean oldEditableActualCostsESet = editableActualCostsESet;
-		editableActualCosts = EDITABLE_ACTUAL_COSTS_EDEFAULT;
-		editableActualCostsESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__EDITABLE_ACTUAL_COSTS, oldEditableActualCosts, EDITABLE_ACTUAL_COSTS_EDEFAULT, oldEditableActualCostsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetEditableActualCosts() {
-		return editableActualCostsESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isHonorConstraints() {
-		return honorConstraints;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHonorConstraints(boolean newHonorConstraints) {
-		boolean oldHonorConstraints = honorConstraints;
-		honorConstraints = newHonorConstraints;
-		boolean oldHonorConstraintsESet = honorConstraintsESet;
-		honorConstraintsESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__HONOR_CONSTRAINTS, oldHonorConstraints, honorConstraints, !oldHonorConstraintsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetHonorConstraints() {
-		boolean oldHonorConstraints = honorConstraints;
-		boolean oldHonorConstraintsESet = honorConstraintsESet;
-		honorConstraints = HONOR_CONSTRAINTS_EDEFAULT;
-		honorConstraintsESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__HONOR_CONSTRAINTS, oldHonorConstraints, HONOR_CONSTRAINTS_EDEFAULT, oldHonorConstraintsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetHonorConstraints() {
-		return honorConstraintsESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getEarnedValueMethod() {
-		return earnedValueMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEarnedValueMethod(BigInteger newEarnedValueMethod) {
-		BigInteger oldEarnedValueMethod = earnedValueMethod;
-		earnedValueMethod = newEarnedValueMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__EARNED_VALUE_METHOD, oldEarnedValueMethod, earnedValueMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isInsertedProjectsLikeSummary() {
-		return insertedProjectsLikeSummary;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInsertedProjectsLikeSummary(boolean newInsertedProjectsLikeSummary) {
-		boolean oldInsertedProjectsLikeSummary = insertedProjectsLikeSummary;
-		insertedProjectsLikeSummary = newInsertedProjectsLikeSummary;
-		boolean oldInsertedProjectsLikeSummaryESet = insertedProjectsLikeSummaryESet;
-		insertedProjectsLikeSummaryESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__INSERTED_PROJECTS_LIKE_SUMMARY, oldInsertedProjectsLikeSummary, insertedProjectsLikeSummary, !oldInsertedProjectsLikeSummaryESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetInsertedProjectsLikeSummary() {
-		boolean oldInsertedProjectsLikeSummary = insertedProjectsLikeSummary;
-		boolean oldInsertedProjectsLikeSummaryESet = insertedProjectsLikeSummaryESet;
-		insertedProjectsLikeSummary = INSERTED_PROJECTS_LIKE_SUMMARY_EDEFAULT;
-		insertedProjectsLikeSummaryESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__INSERTED_PROJECTS_LIKE_SUMMARY, oldInsertedProjectsLikeSummary, INSERTED_PROJECTS_LIKE_SUMMARY_EDEFAULT, oldInsertedProjectsLikeSummaryESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetInsertedProjectsLikeSummary() {
-		return insertedProjectsLikeSummaryESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMultipleCriticalPaths() {
-		return multipleCriticalPaths;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMultipleCriticalPaths(boolean newMultipleCriticalPaths) {
-		boolean oldMultipleCriticalPaths = multipleCriticalPaths;
-		multipleCriticalPaths = newMultipleCriticalPaths;
-		boolean oldMultipleCriticalPathsESet = multipleCriticalPathsESet;
-		multipleCriticalPathsESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__MULTIPLE_CRITICAL_PATHS, oldMultipleCriticalPaths, multipleCriticalPaths, !oldMultipleCriticalPathsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMultipleCriticalPaths() {
-		boolean oldMultipleCriticalPaths = multipleCriticalPaths;
-		boolean oldMultipleCriticalPathsESet = multipleCriticalPathsESet;
-		multipleCriticalPaths = MULTIPLE_CRITICAL_PATHS_EDEFAULT;
-		multipleCriticalPathsESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__MULTIPLE_CRITICAL_PATHS, oldMultipleCriticalPaths, MULTIPLE_CRITICAL_PATHS_EDEFAULT, oldMultipleCriticalPathsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMultipleCriticalPaths() {
-		return multipleCriticalPathsESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isNewTasksEffortDriven() {
-		return newTasksEffortDriven;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNewTasksEffortDriven(boolean newNewTasksEffortDriven) {
-		boolean oldNewTasksEffortDriven = newTasksEffortDriven;
-		newTasksEffortDriven = newNewTasksEffortDriven;
-		boolean oldNewTasksEffortDrivenESet = newTasksEffortDrivenESet;
-		newTasksEffortDrivenESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__NEW_TASKS_EFFORT_DRIVEN, oldNewTasksEffortDriven, newTasksEffortDriven, !oldNewTasksEffortDrivenESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetNewTasksEffortDriven() {
-		boolean oldNewTasksEffortDriven = newTasksEffortDriven;
-		boolean oldNewTasksEffortDrivenESet = newTasksEffortDrivenESet;
-		newTasksEffortDriven = NEW_TASKS_EFFORT_DRIVEN_EDEFAULT;
-		newTasksEffortDrivenESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__NEW_TASKS_EFFORT_DRIVEN, oldNewTasksEffortDriven, NEW_TASKS_EFFORT_DRIVEN_EDEFAULT, oldNewTasksEffortDrivenESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetNewTasksEffortDriven() {
-		return newTasksEffortDrivenESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isNewTasksEstimated() {
-		return newTasksEstimated;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNewTasksEstimated(boolean newNewTasksEstimated) {
-		boolean oldNewTasksEstimated = newTasksEstimated;
-		newTasksEstimated = newNewTasksEstimated;
-		boolean oldNewTasksEstimatedESet = newTasksEstimatedESet;
-		newTasksEstimatedESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__NEW_TASKS_ESTIMATED, oldNewTasksEstimated, newTasksEstimated, !oldNewTasksEstimatedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetNewTasksEstimated() {
-		boolean oldNewTasksEstimated = newTasksEstimated;
-		boolean oldNewTasksEstimatedESet = newTasksEstimatedESet;
-		newTasksEstimated = NEW_TASKS_ESTIMATED_EDEFAULT;
-		newTasksEstimatedESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__NEW_TASKS_ESTIMATED, oldNewTasksEstimated, NEW_TASKS_ESTIMATED_EDEFAULT, oldNewTasksEstimatedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetNewTasksEstimated() {
-		return newTasksEstimatedESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSplitsInProgressTasks() {
-		return splitsInProgressTasks;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSplitsInProgressTasks(boolean newSplitsInProgressTasks) {
-		boolean oldSplitsInProgressTasks = splitsInProgressTasks;
-		splitsInProgressTasks = newSplitsInProgressTasks;
-		boolean oldSplitsInProgressTasksESet = splitsInProgressTasksESet;
-		splitsInProgressTasksESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__SPLITS_IN_PROGRESS_TASKS, oldSplitsInProgressTasks, splitsInProgressTasks, !oldSplitsInProgressTasksESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetSplitsInProgressTasks() {
-		boolean oldSplitsInProgressTasks = splitsInProgressTasks;
-		boolean oldSplitsInProgressTasksESet = splitsInProgressTasksESet;
-		splitsInProgressTasks = SPLITS_IN_PROGRESS_TASKS_EDEFAULT;
-		splitsInProgressTasksESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__SPLITS_IN_PROGRESS_TASKS, oldSplitsInProgressTasks, SPLITS_IN_PROGRESS_TASKS_EDEFAULT, oldSplitsInProgressTasksESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetSplitsInProgressTasks() {
-		return splitsInProgressTasksESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSpreadActualCost() {
-		return spreadActualCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSpreadActualCost(boolean newSpreadActualCost) {
-		boolean oldSpreadActualCost = spreadActualCost;
-		spreadActualCost = newSpreadActualCost;
-		boolean oldSpreadActualCostESet = spreadActualCostESet;
-		spreadActualCostESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__SPREAD_ACTUAL_COST, oldSpreadActualCost, spreadActualCost, !oldSpreadActualCostESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetSpreadActualCost() {
-		boolean oldSpreadActualCost = spreadActualCost;
-		boolean oldSpreadActualCostESet = spreadActualCostESet;
-		spreadActualCost = SPREAD_ACTUAL_COST_EDEFAULT;
-		spreadActualCostESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__SPREAD_ACTUAL_COST, oldSpreadActualCost, SPREAD_ACTUAL_COST_EDEFAULT, oldSpreadActualCostESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetSpreadActualCost() {
-		return spreadActualCostESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSpreadPercentComplete() {
-		return spreadPercentComplete;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSpreadPercentComplete(boolean newSpreadPercentComplete) {
-		boolean oldSpreadPercentComplete = spreadPercentComplete;
-		spreadPercentComplete = newSpreadPercentComplete;
-		boolean oldSpreadPercentCompleteESet = spreadPercentCompleteESet;
-		spreadPercentCompleteESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__SPREAD_PERCENT_COMPLETE, oldSpreadPercentComplete, spreadPercentComplete, !oldSpreadPercentCompleteESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetSpreadPercentComplete() {
-		boolean oldSpreadPercentComplete = spreadPercentComplete;
-		boolean oldSpreadPercentCompleteESet = spreadPercentCompleteESet;
-		spreadPercentComplete = SPREAD_PERCENT_COMPLETE_EDEFAULT;
-		spreadPercentCompleteESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__SPREAD_PERCENT_COMPLETE, oldSpreadPercentComplete, SPREAD_PERCENT_COMPLETE_EDEFAULT, oldSpreadPercentCompleteESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetSpreadPercentComplete() {
-		return spreadPercentCompleteESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isTaskUpdatesResource() {
-		return taskUpdatesResource;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTaskUpdatesResource(boolean newTaskUpdatesResource) {
-		boolean oldTaskUpdatesResource = taskUpdatesResource;
-		taskUpdatesResource = newTaskUpdatesResource;
-		boolean oldTaskUpdatesResourceESet = taskUpdatesResourceESet;
-		taskUpdatesResourceESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__TASK_UPDATES_RESOURCE, oldTaskUpdatesResource, taskUpdatesResource, !oldTaskUpdatesResourceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTaskUpdatesResource() {
-		boolean oldTaskUpdatesResource = taskUpdatesResource;
-		boolean oldTaskUpdatesResourceESet = taskUpdatesResourceESet;
-		taskUpdatesResource = TASK_UPDATES_RESOURCE_EDEFAULT;
-		taskUpdatesResourceESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__TASK_UPDATES_RESOURCE, oldTaskUpdatesResource, TASK_UPDATES_RESOURCE_EDEFAULT, oldTaskUpdatesResourceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTaskUpdatesResource() {
-		return taskUpdatesResourceESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isFiscalYearStart() {
-		return fiscalYearStart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFiscalYearStart(boolean newFiscalYearStart) {
-		boolean oldFiscalYearStart = fiscalYearStart;
-		fiscalYearStart = newFiscalYearStart;
-		boolean oldFiscalYearStartESet = fiscalYearStartESet;
-		fiscalYearStartESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__FISCAL_YEAR_START, oldFiscalYearStart, fiscalYearStart, !oldFiscalYearStartESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetFiscalYearStart() {
-		boolean oldFiscalYearStart = fiscalYearStart;
-		boolean oldFiscalYearStartESet = fiscalYearStartESet;
-		fiscalYearStart = FISCAL_YEAR_START_EDEFAULT;
-		fiscalYearStartESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__FISCAL_YEAR_START, oldFiscalYearStart, FISCAL_YEAR_START_EDEFAULT, oldFiscalYearStartESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetFiscalYearStart() {
-		return fiscalYearStartESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getWeekStartDay() {
-		return weekStartDay;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWeekStartDay(BigInteger newWeekStartDay) {
-		BigInteger oldWeekStartDay = weekStartDay;
-		weekStartDay = newWeekStartDay;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__WEEK_START_DAY, oldWeekStartDay, weekStartDay));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMoveCompletedEndsBack() {
-		return moveCompletedEndsBack;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMoveCompletedEndsBack(boolean newMoveCompletedEndsBack) {
-		boolean oldMoveCompletedEndsBack = moveCompletedEndsBack;
-		moveCompletedEndsBack = newMoveCompletedEndsBack;
-		boolean oldMoveCompletedEndsBackESet = moveCompletedEndsBackESet;
-		moveCompletedEndsBackESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__MOVE_COMPLETED_ENDS_BACK, oldMoveCompletedEndsBack, moveCompletedEndsBack, !oldMoveCompletedEndsBackESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMoveCompletedEndsBack() {
-		boolean oldMoveCompletedEndsBack = moveCompletedEndsBack;
-		boolean oldMoveCompletedEndsBackESet = moveCompletedEndsBackESet;
-		moveCompletedEndsBack = MOVE_COMPLETED_ENDS_BACK_EDEFAULT;
-		moveCompletedEndsBackESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__MOVE_COMPLETED_ENDS_BACK, oldMoveCompletedEndsBack, MOVE_COMPLETED_ENDS_BACK_EDEFAULT, oldMoveCompletedEndsBackESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMoveCompletedEndsBack() {
-		return moveCompletedEndsBackESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMoveRemainingStartsBack() {
-		return moveRemainingStartsBack;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMoveRemainingStartsBack(boolean newMoveRemainingStartsBack) {
-		boolean oldMoveRemainingStartsBack = moveRemainingStartsBack;
-		moveRemainingStartsBack = newMoveRemainingStartsBack;
-		boolean oldMoveRemainingStartsBackESet = moveRemainingStartsBackESet;
-		moveRemainingStartsBackESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__MOVE_REMAINING_STARTS_BACK, oldMoveRemainingStartsBack, moveRemainingStartsBack, !oldMoveRemainingStartsBackESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMoveRemainingStartsBack() {
-		boolean oldMoveRemainingStartsBack = moveRemainingStartsBack;
-		boolean oldMoveRemainingStartsBackESet = moveRemainingStartsBackESet;
-		moveRemainingStartsBack = MOVE_REMAINING_STARTS_BACK_EDEFAULT;
-		moveRemainingStartsBackESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__MOVE_REMAINING_STARTS_BACK, oldMoveRemainingStartsBack, MOVE_REMAINING_STARTS_BACK_EDEFAULT, oldMoveRemainingStartsBackESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMoveRemainingStartsBack() {
-		return moveRemainingStartsBackESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMoveRemainingStartsForward() {
-		return moveRemainingStartsForward;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMoveRemainingStartsForward(boolean newMoveRemainingStartsForward) {
-		boolean oldMoveRemainingStartsForward = moveRemainingStartsForward;
-		moveRemainingStartsForward = newMoveRemainingStartsForward;
-		boolean oldMoveRemainingStartsForwardESet = moveRemainingStartsForwardESet;
-		moveRemainingStartsForwardESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__MOVE_REMAINING_STARTS_FORWARD, oldMoveRemainingStartsForward, moveRemainingStartsForward, !oldMoveRemainingStartsForwardESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMoveRemainingStartsForward() {
-		boolean oldMoveRemainingStartsForward = moveRemainingStartsForward;
-		boolean oldMoveRemainingStartsForwardESet = moveRemainingStartsForwardESet;
-		moveRemainingStartsForward = MOVE_REMAINING_STARTS_FORWARD_EDEFAULT;
-		moveRemainingStartsForwardESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__MOVE_REMAINING_STARTS_FORWARD, oldMoveRemainingStartsForward, MOVE_REMAINING_STARTS_FORWARD_EDEFAULT, oldMoveRemainingStartsForwardESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMoveRemainingStartsForward() {
-		return moveRemainingStartsForwardESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMoveCompletedEndsForward() {
-		return moveCompletedEndsForward;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMoveCompletedEndsForward(boolean newMoveCompletedEndsForward) {
-		boolean oldMoveCompletedEndsForward = moveCompletedEndsForward;
-		moveCompletedEndsForward = newMoveCompletedEndsForward;
-		boolean oldMoveCompletedEndsForwardESet = moveCompletedEndsForwardESet;
-		moveCompletedEndsForwardESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__MOVE_COMPLETED_ENDS_FORWARD, oldMoveCompletedEndsForward, moveCompletedEndsForward, !oldMoveCompletedEndsForwardESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMoveCompletedEndsForward() {
-		boolean oldMoveCompletedEndsForward = moveCompletedEndsForward;
-		boolean oldMoveCompletedEndsForwardESet = moveCompletedEndsForwardESet;
-		moveCompletedEndsForward = MOVE_COMPLETED_ENDS_FORWARD_EDEFAULT;
-		moveCompletedEndsForwardESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__MOVE_COMPLETED_ENDS_FORWARD, oldMoveCompletedEndsForward, MOVE_COMPLETED_ENDS_FORWARD_EDEFAULT, oldMoveCompletedEndsForwardESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMoveCompletedEndsForward() {
-		return moveCompletedEndsForwardESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getBaselineForEarnedValue() {
-		return baselineForEarnedValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBaselineForEarnedValue(BigInteger newBaselineForEarnedValue) {
-		BigInteger oldBaselineForEarnedValue = baselineForEarnedValue;
-		baselineForEarnedValue = newBaselineForEarnedValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__BASELINE_FOR_EARNED_VALUE, oldBaselineForEarnedValue, baselineForEarnedValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isAutoAddNewResourcesAndTasks() {
-		return autoAddNewResourcesAndTasks;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAutoAddNewResourcesAndTasks(boolean newAutoAddNewResourcesAndTasks) {
-		boolean oldAutoAddNewResourcesAndTasks = autoAddNewResourcesAndTasks;
-		autoAddNewResourcesAndTasks = newAutoAddNewResourcesAndTasks;
-		boolean oldAutoAddNewResourcesAndTasksESet = autoAddNewResourcesAndTasksESet;
-		autoAddNewResourcesAndTasksESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__AUTO_ADD_NEW_RESOURCES_AND_TASKS, oldAutoAddNewResourcesAndTasks, autoAddNewResourcesAndTasks, !oldAutoAddNewResourcesAndTasksESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetAutoAddNewResourcesAndTasks() {
-		boolean oldAutoAddNewResourcesAndTasks = autoAddNewResourcesAndTasks;
-		boolean oldAutoAddNewResourcesAndTasksESet = autoAddNewResourcesAndTasksESet;
-		autoAddNewResourcesAndTasks = AUTO_ADD_NEW_RESOURCES_AND_TASKS_EDEFAULT;
-		autoAddNewResourcesAndTasksESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__AUTO_ADD_NEW_RESOURCES_AND_TASKS, oldAutoAddNewResourcesAndTasks, AUTO_ADD_NEW_RESOURCES_AND_TASKS_EDEFAULT, oldAutoAddNewResourcesAndTasksESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetAutoAddNewResourcesAndTasks() {
-		return autoAddNewResourcesAndTasksESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getStatusDate() {
-		return statusDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStatusDate(Object newStatusDate) {
-		Object oldStatusDate = statusDate;
-		statusDate = newStatusDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__STATUS_DATE, oldStatusDate, statusDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getCurrentDate() {
-		return currentDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCurrentDate(Object newCurrentDate) {
-		Object oldCurrentDate = currentDate;
-		currentDate = newCurrentDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__CURRENT_DATE, oldCurrentDate, currentDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMicrosoftProjectServerURL() {
-		return microsoftProjectServerURL;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMicrosoftProjectServerURL(boolean newMicrosoftProjectServerURL) {
-		boolean oldMicrosoftProjectServerURL = microsoftProjectServerURL;
-		microsoftProjectServerURL = newMicrosoftProjectServerURL;
-		boolean oldMicrosoftProjectServerURLESet = microsoftProjectServerURLESet;
-		microsoftProjectServerURLESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__MICROSOFT_PROJECT_SERVER_URL, oldMicrosoftProjectServerURL, microsoftProjectServerURL, !oldMicrosoftProjectServerURLESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMicrosoftProjectServerURL() {
-		boolean oldMicrosoftProjectServerURL = microsoftProjectServerURL;
-		boolean oldMicrosoftProjectServerURLESet = microsoftProjectServerURLESet;
-		microsoftProjectServerURL = MICROSOFT_PROJECT_SERVER_URL_EDEFAULT;
-		microsoftProjectServerURLESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__MICROSOFT_PROJECT_SERVER_URL, oldMicrosoftProjectServerURL, MICROSOFT_PROJECT_SERVER_URL_EDEFAULT, oldMicrosoftProjectServerURLESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMicrosoftProjectServerURL() {
-		return microsoftProjectServerURLESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isAutolink() {
-		return autolink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAutolink(boolean newAutolink) {
-		boolean oldAutolink = autolink;
-		autolink = newAutolink;
-		boolean oldAutolinkESet = autolinkESet;
-		autolinkESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__AUTOLINK, oldAutolink, autolink, !oldAutolinkESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetAutolink() {
-		boolean oldAutolink = autolink;
-		boolean oldAutolinkESet = autolinkESet;
-		autolink = AUTOLINK_EDEFAULT;
-		autolinkESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__AUTOLINK, oldAutolink, AUTOLINK_EDEFAULT, oldAutolinkESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetAutolink() {
-		return autolinkESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getNewTaskStartDate() {
-		return newTaskStartDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNewTaskStartDate(BigInteger newNewTaskStartDate) {
-		BigInteger oldNewTaskStartDate = newTaskStartDate;
-		newTaskStartDate = newNewTaskStartDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__NEW_TASK_START_DATE, oldNewTaskStartDate, newTaskStartDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getDefaultTaskEVMethod() {
-		return defaultTaskEVMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultTaskEVMethod(BigInteger newDefaultTaskEVMethod) {
-		BigInteger oldDefaultTaskEVMethod = defaultTaskEVMethod;
-		defaultTaskEVMethod = newDefaultTaskEVMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__DEFAULT_TASK_EV_METHOD, oldDefaultTaskEVMethod, defaultTaskEVMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isProjectExternallyEdited() {
-		return projectExternallyEdited;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setProjectExternallyEdited(boolean newProjectExternallyEdited) {
-		boolean oldProjectExternallyEdited = projectExternallyEdited;
-		projectExternallyEdited = newProjectExternallyEdited;
-		boolean oldProjectExternallyEditedESet = projectExternallyEditedESet;
-		projectExternallyEditedESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__PROJECT_EXTERNALLY_EDITED, oldProjectExternallyEdited, projectExternallyEdited, !oldProjectExternallyEditedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetProjectExternallyEdited() {
-		boolean oldProjectExternallyEdited = projectExternallyEdited;
-		boolean oldProjectExternallyEditedESet = projectExternallyEditedESet;
-		projectExternallyEdited = PROJECT_EXTERNALLY_EDITED_EDEFAULT;
-		projectExternallyEditedESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__PROJECT_EXTERNALLY_EDITED, oldProjectExternallyEdited, PROJECT_EXTERNALLY_EDITED_EDEFAULT, oldProjectExternallyEditedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetProjectExternallyEdited() {
-		return projectExternallyEditedESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getExtendedCreationDate() {
-		return extendedCreationDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExtendedCreationDate(Object newExtendedCreationDate) {
-		Object oldExtendedCreationDate = extendedCreationDate;
-		extendedCreationDate = newExtendedCreationDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__EXTENDED_CREATION_DATE, oldExtendedCreationDate, extendedCreationDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isActualsInSync() {
-		return actualsInSync;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualsInSync(boolean newActualsInSync) {
-		boolean oldActualsInSync = actualsInSync;
-		actualsInSync = newActualsInSync;
-		boolean oldActualsInSyncESet = actualsInSyncESet;
-		actualsInSyncESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__ACTUALS_IN_SYNC, oldActualsInSync, actualsInSync, !oldActualsInSyncESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetActualsInSync() {
-		boolean oldActualsInSync = actualsInSync;
-		boolean oldActualsInSyncESet = actualsInSyncESet;
-		actualsInSync = ACTUALS_IN_SYNC_EDEFAULT;
-		actualsInSyncESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__ACTUALS_IN_SYNC, oldActualsInSync, ACTUALS_IN_SYNC_EDEFAULT, oldActualsInSyncESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetActualsInSync() {
-		return actualsInSyncESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isRemoveFileProperties() {
-		return removeFileProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemoveFileProperties(boolean newRemoveFileProperties) {
-		boolean oldRemoveFileProperties = removeFileProperties;
-		removeFileProperties = newRemoveFileProperties;
-		boolean oldRemoveFilePropertiesESet = removeFilePropertiesESet;
-		removeFilePropertiesESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__REMOVE_FILE_PROPERTIES, oldRemoveFileProperties, removeFileProperties, !oldRemoveFilePropertiesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetRemoveFileProperties() {
-		boolean oldRemoveFileProperties = removeFileProperties;
-		boolean oldRemoveFilePropertiesESet = removeFilePropertiesESet;
-		removeFileProperties = REMOVE_FILE_PROPERTIES_EDEFAULT;
-		removeFilePropertiesESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__REMOVE_FILE_PROPERTIES, oldRemoveFileProperties, REMOVE_FILE_PROPERTIES_EDEFAULT, oldRemoveFilePropertiesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetRemoveFileProperties() {
-		return removeFilePropertiesESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isAdminProject() {
-		return adminProject;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAdminProject(boolean newAdminProject) {
-		boolean oldAdminProject = adminProject;
-		adminProject = newAdminProject;
-		boolean oldAdminProjectESet = adminProjectESet;
-		adminProjectESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__ADMIN_PROJECT, oldAdminProject, adminProject, !oldAdminProjectESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetAdminProject() {
-		boolean oldAdminProject = adminProject;
-		boolean oldAdminProjectESet = adminProjectESet;
-		adminProject = ADMIN_PROJECT_EDEFAULT;
-		adminProjectESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.PROJECT__ADMIN_PROJECT, oldAdminProject, ADMIN_PROJECT_EDEFAULT, oldAdminProjectESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetAdminProject() {
-		return adminProjectESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OutlineCodes getOutlineCodes() {
-		return outlineCodes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOutlineCodes(OutlineCodes newOutlineCodes, NotificationChain msgs) {
-		OutlineCodes oldOutlineCodes = outlineCodes;
-		outlineCodes = newOutlineCodes;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__OUTLINE_CODES, oldOutlineCodes, newOutlineCodes);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOutlineCodes(OutlineCodes newOutlineCodes) {
-		if (newOutlineCodes != outlineCodes) {
-			NotificationChain msgs = null;
-			if (outlineCodes != null)
-				msgs = ((InternalEObject)outlineCodes).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.PROJECT__OUTLINE_CODES, null, msgs);
-			if (newOutlineCodes != null)
-				msgs = ((InternalEObject)newOutlineCodes).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.PROJECT__OUTLINE_CODES, null, msgs);
-			msgs = basicSetOutlineCodes(newOutlineCodes, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__OUTLINE_CODES, newOutlineCodes, newOutlineCodes));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WBSMasks getWBSMasks() {
-		return wBSMasks;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWBSMasks(WBSMasks newWBSMasks, NotificationChain msgs) {
-		WBSMasks oldWBSMasks = wBSMasks;
-		wBSMasks = newWBSMasks;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__WBS_MASKS, oldWBSMasks, newWBSMasks);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWBSMasks(WBSMasks newWBSMasks) {
-		if (newWBSMasks != wBSMasks) {
-			NotificationChain msgs = null;
-			if (wBSMasks != null)
-				msgs = ((InternalEObject)wBSMasks).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.PROJECT__WBS_MASKS, null, msgs);
-			if (newWBSMasks != null)
-				msgs = ((InternalEObject)newWBSMasks).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.PROJECT__WBS_MASKS, null, msgs);
-			msgs = basicSetWBSMasks(newWBSMasks, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__WBS_MASKS, newWBSMasks, newWBSMasks));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExtendedAttributes getExtendedAttributes() {
-		return extendedAttributes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExtendedAttributes(ExtendedAttributes newExtendedAttributes, NotificationChain msgs) {
-		ExtendedAttributes oldExtendedAttributes = extendedAttributes;
-		extendedAttributes = newExtendedAttributes;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__EXTENDED_ATTRIBUTES, oldExtendedAttributes, newExtendedAttributes);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExtendedAttributes(ExtendedAttributes newExtendedAttributes) {
-		if (newExtendedAttributes != extendedAttributes) {
-			NotificationChain msgs = null;
-			if (extendedAttributes != null)
-				msgs = ((InternalEObject)extendedAttributes).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.PROJECT__EXTENDED_ATTRIBUTES, null, msgs);
-			if (newExtendedAttributes != null)
-				msgs = ((InternalEObject)newExtendedAttributes).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.PROJECT__EXTENDED_ATTRIBUTES, null, msgs);
-			msgs = basicSetExtendedAttributes(newExtendedAttributes, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__EXTENDED_ATTRIBUTES, newExtendedAttributes, newExtendedAttributes));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Calendars getCalendars() {
-		return calendars;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCalendars(Calendars newCalendars, NotificationChain msgs) {
-		Calendars oldCalendars = calendars;
-		calendars = newCalendars;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__CALENDARS, oldCalendars, newCalendars);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCalendars(Calendars newCalendars) {
-		if (newCalendars != calendars) {
-			NotificationChain msgs = null;
-			if (calendars != null)
-				msgs = ((InternalEObject)calendars).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.PROJECT__CALENDARS, null, msgs);
-			if (newCalendars != null)
-				msgs = ((InternalEObject)newCalendars).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.PROJECT__CALENDARS, null, msgs);
-			msgs = basicSetCalendars(newCalendars, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__CALENDARS, newCalendars, newCalendars));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Tasks getTasks() {
-		return tasks;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTasks(Tasks newTasks, NotificationChain msgs) {
-		Tasks oldTasks = tasks;
-		tasks = newTasks;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__TASKS, oldTasks, newTasks);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTasks(Tasks newTasks) {
-		if (newTasks != tasks) {
-			NotificationChain msgs = null;
-			if (tasks != null)
-				msgs = ((InternalEObject)tasks).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.PROJECT__TASKS, null, msgs);
-			if (newTasks != null)
-				msgs = ((InternalEObject)newTasks).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.PROJECT__TASKS, null, msgs);
-			msgs = basicSetTasks(newTasks, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__TASKS, newTasks, newTasks));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Resources getResources() {
-		return resources;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetResources(Resources newResources, NotificationChain msgs) {
-		Resources oldResources = resources;
-		resources = newResources;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__RESOURCES, oldResources, newResources);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResources(Resources newResources) {
-		if (newResources != resources) {
-			NotificationChain msgs = null;
-			if (resources != null)
-				msgs = ((InternalEObject)resources).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.PROJECT__RESOURCES, null, msgs);
-			if (newResources != null)
-				msgs = ((InternalEObject)newResources).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.PROJECT__RESOURCES, null, msgs);
-			msgs = basicSetResources(newResources, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__RESOURCES, newResources, newResources));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Assignments getAssignments() {
-		return assignments;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAssignments(Assignments newAssignments, NotificationChain msgs) {
-		Assignments oldAssignments = assignments;
-		assignments = newAssignments;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__ASSIGNMENTS, oldAssignments, newAssignments);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAssignments(Assignments newAssignments) {
-		if (newAssignments != assignments) {
-			NotificationChain msgs = null;
-			if (assignments != null)
-				msgs = ((InternalEObject)assignments).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.PROJECT__ASSIGNMENTS, null, msgs);
-			if (newAssignments != null)
-				msgs = ((InternalEObject)newAssignments).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.PROJECT__ASSIGNMENTS, null, msgs);
-			msgs = basicSetAssignments(newAssignments, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.PROJECT__ASSIGNMENTS, newAssignments, newAssignments));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.PROJECT__OUTLINE_CODES:
-					return basicSetOutlineCodes(null, msgs);
-				case MsprojectPackage.PROJECT__WBS_MASKS:
-					return basicSetWBSMasks(null, msgs);
-				case MsprojectPackage.PROJECT__EXTENDED_ATTRIBUTES:
-					return basicSetExtendedAttributes(null, msgs);
-				case MsprojectPackage.PROJECT__CALENDARS:
-					return basicSetCalendars(null, msgs);
-				case MsprojectPackage.PROJECT__TASKS:
-					return basicSetTasks(null, msgs);
-				case MsprojectPackage.PROJECT__RESOURCES:
-					return basicSetResources(null, msgs);
-				case MsprojectPackage.PROJECT__ASSIGNMENTS:
-					return basicSetAssignments(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.PROJECT__UID:
-				return getUID();
-			case MsprojectPackage.PROJECT__NAME:
-				return getName();
-			case MsprojectPackage.PROJECT__TITLE:
-				return getTitle();
-			case MsprojectPackage.PROJECT__SUBJECT:
-				return getSubject();
-			case MsprojectPackage.PROJECT__CATEGORY:
-				return getCategory();
-			case MsprojectPackage.PROJECT__COMPANY:
-				return getCompany();
-			case MsprojectPackage.PROJECT__MANAGER:
-				return getManager();
-			case MsprojectPackage.PROJECT__AUTHOR:
-				return getAuthor();
-			case MsprojectPackage.PROJECT__CREATION_DATE:
-				return getCreationDate();
-			case MsprojectPackage.PROJECT__REVISION:
-				return getRevision();
-			case MsprojectPackage.PROJECT__LAST_SAVED:
-				return getLastSaved();
-			case MsprojectPackage.PROJECT__SCHEDULE_FROM_START:
-				return isScheduleFromStart() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__START_DATE:
-				return getStartDate();
-			case MsprojectPackage.PROJECT__FINISH_DATE:
-				return getFinishDate();
-			case MsprojectPackage.PROJECT__FYSTART_DATE:
-				return getFYStartDate();
-			case MsprojectPackage.PROJECT__CRITICAL_SLACK_LIMIT:
-				return getCriticalSlackLimit();
-			case MsprojectPackage.PROJECT__CURRENCY_DIGITS:
-				return getCurrencyDigits();
-			case MsprojectPackage.PROJECT__CURRENCY_SYMBOL:
-				return getCurrencySymbol();
-			case MsprojectPackage.PROJECT__CURRENCY_SYMBOL_POSITION:
-				return getCurrencySymbolPosition();
-			case MsprojectPackage.PROJECT__CALENDAR_UID:
-				return getCalendarUID();
-			case MsprojectPackage.PROJECT__DEFAULT_START_TIME:
-				return getDefaultStartTime();
-			case MsprojectPackage.PROJECT__DEFAULT_FINISH_TIME:
-				return getDefaultFinishTime();
-			case MsprojectPackage.PROJECT__MINUTES_PER_DAY:
-				return getMinutesPerDay();
-			case MsprojectPackage.PROJECT__MINUTES_PER_WEEK:
-				return getMinutesPerWeek();
-			case MsprojectPackage.PROJECT__DAYS_PER_MONTH:
-				return getDaysPerMonth();
-			case MsprojectPackage.PROJECT__DEFAULT_TASK_TYPE:
-				return getDefaultTaskType();
-			case MsprojectPackage.PROJECT__DEFAULT_FIXED_COST_ACCRUAL:
-				return getDefaultFixedCostAccrual();
-			case MsprojectPackage.PROJECT__DEFAULT_STANDARD_RATE:
-				return new Float(getDefaultStandardRate());
-			case MsprojectPackage.PROJECT__DEFAULT_OVERTIME_RATE:
-				return new Float(getDefaultOvertimeRate());
-			case MsprojectPackage.PROJECT__DURATION_FORMAT:
-				return getDurationFormat();
-			case MsprojectPackage.PROJECT__WORK_FORMAT:
-				return getWorkFormat();
-			case MsprojectPackage.PROJECT__EDITABLE_ACTUAL_COSTS:
-				return isEditableActualCosts() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__HONOR_CONSTRAINTS:
-				return isHonorConstraints() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__EARNED_VALUE_METHOD:
-				return getEarnedValueMethod();
-			case MsprojectPackage.PROJECT__INSERTED_PROJECTS_LIKE_SUMMARY:
-				return isInsertedProjectsLikeSummary() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__MULTIPLE_CRITICAL_PATHS:
-				return isMultipleCriticalPaths() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__NEW_TASKS_EFFORT_DRIVEN:
-				return isNewTasksEffortDriven() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__NEW_TASKS_ESTIMATED:
-				return isNewTasksEstimated() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__SPLITS_IN_PROGRESS_TASKS:
-				return isSplitsInProgressTasks() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__SPREAD_ACTUAL_COST:
-				return isSpreadActualCost() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__SPREAD_PERCENT_COMPLETE:
-				return isSpreadPercentComplete() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__TASK_UPDATES_RESOURCE:
-				return isTaskUpdatesResource() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__FISCAL_YEAR_START:
-				return isFiscalYearStart() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__WEEK_START_DAY:
-				return getWeekStartDay();
-			case MsprojectPackage.PROJECT__MOVE_COMPLETED_ENDS_BACK:
-				return isMoveCompletedEndsBack() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__MOVE_REMAINING_STARTS_BACK:
-				return isMoveRemainingStartsBack() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__MOVE_REMAINING_STARTS_FORWARD:
-				return isMoveRemainingStartsForward() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__MOVE_COMPLETED_ENDS_FORWARD:
-				return isMoveCompletedEndsForward() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__BASELINE_FOR_EARNED_VALUE:
-				return getBaselineForEarnedValue();
-			case MsprojectPackage.PROJECT__AUTO_ADD_NEW_RESOURCES_AND_TASKS:
-				return isAutoAddNewResourcesAndTasks() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__STATUS_DATE:
-				return getStatusDate();
-			case MsprojectPackage.PROJECT__CURRENT_DATE:
-				return getCurrentDate();
-			case MsprojectPackage.PROJECT__MICROSOFT_PROJECT_SERVER_URL:
-				return isMicrosoftProjectServerURL() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__AUTOLINK:
-				return isAutolink() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__NEW_TASK_START_DATE:
-				return getNewTaskStartDate();
-			case MsprojectPackage.PROJECT__DEFAULT_TASK_EV_METHOD:
-				return getDefaultTaskEVMethod();
-			case MsprojectPackage.PROJECT__PROJECT_EXTERNALLY_EDITED:
-				return isProjectExternallyEdited() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__EXTENDED_CREATION_DATE:
-				return getExtendedCreationDate();
-			case MsprojectPackage.PROJECT__ACTUALS_IN_SYNC:
-				return isActualsInSync() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__REMOVE_FILE_PROPERTIES:
-				return isRemoveFileProperties() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__ADMIN_PROJECT:
-				return isAdminProject() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.PROJECT__OUTLINE_CODES:
-				return getOutlineCodes();
-			case MsprojectPackage.PROJECT__WBS_MASKS:
-				return getWBSMasks();
-			case MsprojectPackage.PROJECT__EXTENDED_ATTRIBUTES:
-				return getExtendedAttributes();
-			case MsprojectPackage.PROJECT__CALENDARS:
-				return getCalendars();
-			case MsprojectPackage.PROJECT__TASKS:
-				return getTasks();
-			case MsprojectPackage.PROJECT__RESOURCES:
-				return getResources();
-			case MsprojectPackage.PROJECT__ASSIGNMENTS:
-				return getAssignments();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.PROJECT__UID:
-				setUID((String)newValue);
-				return;
-			case MsprojectPackage.PROJECT__NAME:
-				setName((String)newValue);
-				return;
-			case MsprojectPackage.PROJECT__TITLE:
-				setTitle((String)newValue);
-				return;
-			case MsprojectPackage.PROJECT__SUBJECT:
-				setSubject((String)newValue);
-				return;
-			case MsprojectPackage.PROJECT__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case MsprojectPackage.PROJECT__COMPANY:
-				setCompany((String)newValue);
-				return;
-			case MsprojectPackage.PROJECT__MANAGER:
-				setManager((String)newValue);
-				return;
-			case MsprojectPackage.PROJECT__AUTHOR:
-				setAuthor((String)newValue);
-				return;
-			case MsprojectPackage.PROJECT__CREATION_DATE:
-				setCreationDate((Object)newValue);
-				return;
-			case MsprojectPackage.PROJECT__REVISION:
-				setRevision((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__LAST_SAVED:
-				setLastSaved((Object)newValue);
-				return;
-			case MsprojectPackage.PROJECT__SCHEDULE_FROM_START:
-				setScheduleFromStart(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__START_DATE:
-				setStartDate((Object)newValue);
-				return;
-			case MsprojectPackage.PROJECT__FINISH_DATE:
-				setFinishDate((Object)newValue);
-				return;
-			case MsprojectPackage.PROJECT__FYSTART_DATE:
-				setFYStartDate((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__CRITICAL_SLACK_LIMIT:
-				setCriticalSlackLimit((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__CURRENCY_DIGITS:
-				setCurrencyDigits((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__CURRENCY_SYMBOL:
-				setCurrencySymbol((String)newValue);
-				return;
-			case MsprojectPackage.PROJECT__CURRENCY_SYMBOL_POSITION:
-				setCurrencySymbolPosition((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__CALENDAR_UID:
-				setCalendarUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__DEFAULT_START_TIME:
-				setDefaultStartTime((Object)newValue);
-				return;
-			case MsprojectPackage.PROJECT__DEFAULT_FINISH_TIME:
-				setDefaultFinishTime((Object)newValue);
-				return;
-			case MsprojectPackage.PROJECT__MINUTES_PER_DAY:
-				setMinutesPerDay((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__MINUTES_PER_WEEK:
-				setMinutesPerWeek((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__DAYS_PER_MONTH:
-				setDaysPerMonth((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__DEFAULT_TASK_TYPE:
-				setDefaultTaskType((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__DEFAULT_FIXED_COST_ACCRUAL:
-				setDefaultFixedCostAccrual((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__DEFAULT_STANDARD_RATE:
-				setDefaultStandardRate(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.PROJECT__DEFAULT_OVERTIME_RATE:
-				setDefaultOvertimeRate(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.PROJECT__DURATION_FORMAT:
-				setDurationFormat((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__WORK_FORMAT:
-				setWorkFormat((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__EDITABLE_ACTUAL_COSTS:
-				setEditableActualCosts(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__HONOR_CONSTRAINTS:
-				setHonorConstraints(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__EARNED_VALUE_METHOD:
-				setEarnedValueMethod((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__INSERTED_PROJECTS_LIKE_SUMMARY:
-				setInsertedProjectsLikeSummary(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__MULTIPLE_CRITICAL_PATHS:
-				setMultipleCriticalPaths(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__NEW_TASKS_EFFORT_DRIVEN:
-				setNewTasksEffortDriven(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__NEW_TASKS_ESTIMATED:
-				setNewTasksEstimated(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__SPLITS_IN_PROGRESS_TASKS:
-				setSplitsInProgressTasks(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__SPREAD_ACTUAL_COST:
-				setSpreadActualCost(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__SPREAD_PERCENT_COMPLETE:
-				setSpreadPercentComplete(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__TASK_UPDATES_RESOURCE:
-				setTaskUpdatesResource(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__FISCAL_YEAR_START:
-				setFiscalYearStart(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__WEEK_START_DAY:
-				setWeekStartDay((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__MOVE_COMPLETED_ENDS_BACK:
-				setMoveCompletedEndsBack(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__MOVE_REMAINING_STARTS_BACK:
-				setMoveRemainingStartsBack(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__MOVE_REMAINING_STARTS_FORWARD:
-				setMoveRemainingStartsForward(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__MOVE_COMPLETED_ENDS_FORWARD:
-				setMoveCompletedEndsForward(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__BASELINE_FOR_EARNED_VALUE:
-				setBaselineForEarnedValue((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__AUTO_ADD_NEW_RESOURCES_AND_TASKS:
-				setAutoAddNewResourcesAndTasks(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__STATUS_DATE:
-				setStatusDate((Object)newValue);
-				return;
-			case MsprojectPackage.PROJECT__CURRENT_DATE:
-				setCurrentDate((Object)newValue);
-				return;
-			case MsprojectPackage.PROJECT__MICROSOFT_PROJECT_SERVER_URL:
-				setMicrosoftProjectServerURL(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__AUTOLINK:
-				setAutolink(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__NEW_TASK_START_DATE:
-				setNewTaskStartDate((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__DEFAULT_TASK_EV_METHOD:
-				setDefaultTaskEVMethod((BigInteger)newValue);
-				return;
-			case MsprojectPackage.PROJECT__PROJECT_EXTERNALLY_EDITED:
-				setProjectExternallyEdited(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__EXTENDED_CREATION_DATE:
-				setExtendedCreationDate((Object)newValue);
-				return;
-			case MsprojectPackage.PROJECT__ACTUALS_IN_SYNC:
-				setActualsInSync(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__REMOVE_FILE_PROPERTIES:
-				setRemoveFileProperties(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__ADMIN_PROJECT:
-				setAdminProject(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.PROJECT__OUTLINE_CODES:
-				setOutlineCodes((OutlineCodes)newValue);
-				return;
-			case MsprojectPackage.PROJECT__WBS_MASKS:
-				setWBSMasks((WBSMasks)newValue);
-				return;
-			case MsprojectPackage.PROJECT__EXTENDED_ATTRIBUTES:
-				setExtendedAttributes((ExtendedAttributes)newValue);
-				return;
-			case MsprojectPackage.PROJECT__CALENDARS:
-				setCalendars((Calendars)newValue);
-				return;
-			case MsprojectPackage.PROJECT__TASKS:
-				setTasks((Tasks)newValue);
-				return;
-			case MsprojectPackage.PROJECT__RESOURCES:
-				setResources((Resources)newValue);
-				return;
-			case MsprojectPackage.PROJECT__ASSIGNMENTS:
-				setAssignments((Assignments)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.PROJECT__UID:
-				setUID(UID_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__SUBJECT:
-				setSubject(SUBJECT_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__COMPANY:
-				setCompany(COMPANY_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__MANAGER:
-				setManager(MANAGER_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__AUTHOR:
-				setAuthor(AUTHOR_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__CREATION_DATE:
-				setCreationDate(CREATION_DATE_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__REVISION:
-				setRevision(REVISION_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__LAST_SAVED:
-				setLastSaved(LAST_SAVED_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__SCHEDULE_FROM_START:
-				unsetScheduleFromStart();
-				return;
-			case MsprojectPackage.PROJECT__START_DATE:
-				setStartDate(START_DATE_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__FINISH_DATE:
-				setFinishDate(FINISH_DATE_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__FYSTART_DATE:
-				setFYStartDate(FYSTART_DATE_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__CRITICAL_SLACK_LIMIT:
-				setCriticalSlackLimit(CRITICAL_SLACK_LIMIT_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__CURRENCY_DIGITS:
-				setCurrencyDigits(CURRENCY_DIGITS_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__CURRENCY_SYMBOL:
-				setCurrencySymbol(CURRENCY_SYMBOL_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__CURRENCY_SYMBOL_POSITION:
-				setCurrencySymbolPosition(CURRENCY_SYMBOL_POSITION_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__CALENDAR_UID:
-				setCalendarUID(CALENDAR_UID_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__DEFAULT_START_TIME:
-				setDefaultStartTime(DEFAULT_START_TIME_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__DEFAULT_FINISH_TIME:
-				setDefaultFinishTime(DEFAULT_FINISH_TIME_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__MINUTES_PER_DAY:
-				setMinutesPerDay(MINUTES_PER_DAY_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__MINUTES_PER_WEEK:
-				setMinutesPerWeek(MINUTES_PER_WEEK_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__DAYS_PER_MONTH:
-				setDaysPerMonth(DAYS_PER_MONTH_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__DEFAULT_TASK_TYPE:
-				unsetDefaultTaskType();
-				return;
-			case MsprojectPackage.PROJECT__DEFAULT_FIXED_COST_ACCRUAL:
-				setDefaultFixedCostAccrual(DEFAULT_FIXED_COST_ACCRUAL_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__DEFAULT_STANDARD_RATE:
-				unsetDefaultStandardRate();
-				return;
-			case MsprojectPackage.PROJECT__DEFAULT_OVERTIME_RATE:
-				unsetDefaultOvertimeRate();
-				return;
-			case MsprojectPackage.PROJECT__DURATION_FORMAT:
-				setDurationFormat(DURATION_FORMAT_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__WORK_FORMAT:
-				setWorkFormat(WORK_FORMAT_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__EDITABLE_ACTUAL_COSTS:
-				unsetEditableActualCosts();
-				return;
-			case MsprojectPackage.PROJECT__HONOR_CONSTRAINTS:
-				unsetHonorConstraints();
-				return;
-			case MsprojectPackage.PROJECT__EARNED_VALUE_METHOD:
-				setEarnedValueMethod(EARNED_VALUE_METHOD_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__INSERTED_PROJECTS_LIKE_SUMMARY:
-				unsetInsertedProjectsLikeSummary();
-				return;
-			case MsprojectPackage.PROJECT__MULTIPLE_CRITICAL_PATHS:
-				unsetMultipleCriticalPaths();
-				return;
-			case MsprojectPackage.PROJECT__NEW_TASKS_EFFORT_DRIVEN:
-				unsetNewTasksEffortDriven();
-				return;
-			case MsprojectPackage.PROJECT__NEW_TASKS_ESTIMATED:
-				unsetNewTasksEstimated();
-				return;
-			case MsprojectPackage.PROJECT__SPLITS_IN_PROGRESS_TASKS:
-				unsetSplitsInProgressTasks();
-				return;
-			case MsprojectPackage.PROJECT__SPREAD_ACTUAL_COST:
-				unsetSpreadActualCost();
-				return;
-			case MsprojectPackage.PROJECT__SPREAD_PERCENT_COMPLETE:
-				unsetSpreadPercentComplete();
-				return;
-			case MsprojectPackage.PROJECT__TASK_UPDATES_RESOURCE:
-				unsetTaskUpdatesResource();
-				return;
-			case MsprojectPackage.PROJECT__FISCAL_YEAR_START:
-				unsetFiscalYearStart();
-				return;
-			case MsprojectPackage.PROJECT__WEEK_START_DAY:
-				setWeekStartDay(WEEK_START_DAY_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__MOVE_COMPLETED_ENDS_BACK:
-				unsetMoveCompletedEndsBack();
-				return;
-			case MsprojectPackage.PROJECT__MOVE_REMAINING_STARTS_BACK:
-				unsetMoveRemainingStartsBack();
-				return;
-			case MsprojectPackage.PROJECT__MOVE_REMAINING_STARTS_FORWARD:
-				unsetMoveRemainingStartsForward();
-				return;
-			case MsprojectPackage.PROJECT__MOVE_COMPLETED_ENDS_FORWARD:
-				unsetMoveCompletedEndsForward();
-				return;
-			case MsprojectPackage.PROJECT__BASELINE_FOR_EARNED_VALUE:
-				setBaselineForEarnedValue(BASELINE_FOR_EARNED_VALUE_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__AUTO_ADD_NEW_RESOURCES_AND_TASKS:
-				unsetAutoAddNewResourcesAndTasks();
-				return;
-			case MsprojectPackage.PROJECT__STATUS_DATE:
-				setStatusDate(STATUS_DATE_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__CURRENT_DATE:
-				setCurrentDate(CURRENT_DATE_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__MICROSOFT_PROJECT_SERVER_URL:
-				unsetMicrosoftProjectServerURL();
-				return;
-			case MsprojectPackage.PROJECT__AUTOLINK:
-				unsetAutolink();
-				return;
-			case MsprojectPackage.PROJECT__NEW_TASK_START_DATE:
-				setNewTaskStartDate(NEW_TASK_START_DATE_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__DEFAULT_TASK_EV_METHOD:
-				setDefaultTaskEVMethod(DEFAULT_TASK_EV_METHOD_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__PROJECT_EXTERNALLY_EDITED:
-				unsetProjectExternallyEdited();
-				return;
-			case MsprojectPackage.PROJECT__EXTENDED_CREATION_DATE:
-				setExtendedCreationDate(EXTENDED_CREATION_DATE_EDEFAULT);
-				return;
-			case MsprojectPackage.PROJECT__ACTUALS_IN_SYNC:
-				unsetActualsInSync();
-				return;
-			case MsprojectPackage.PROJECT__REMOVE_FILE_PROPERTIES:
-				unsetRemoveFileProperties();
-				return;
-			case MsprojectPackage.PROJECT__ADMIN_PROJECT:
-				unsetAdminProject();
-				return;
-			case MsprojectPackage.PROJECT__OUTLINE_CODES:
-				setOutlineCodes((OutlineCodes)null);
-				return;
-			case MsprojectPackage.PROJECT__WBS_MASKS:
-				setWBSMasks((WBSMasks)null);
-				return;
-			case MsprojectPackage.PROJECT__EXTENDED_ATTRIBUTES:
-				setExtendedAttributes((ExtendedAttributes)null);
-				return;
-			case MsprojectPackage.PROJECT__CALENDARS:
-				setCalendars((Calendars)null);
-				return;
-			case MsprojectPackage.PROJECT__TASKS:
-				setTasks((Tasks)null);
-				return;
-			case MsprojectPackage.PROJECT__RESOURCES:
-				setResources((Resources)null);
-				return;
-			case MsprojectPackage.PROJECT__ASSIGNMENTS:
-				setAssignments((Assignments)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.PROJECT__UID:
-				return UID_EDEFAULT == null ? uID != null : !UID_EDEFAULT.equals(uID);
-			case MsprojectPackage.PROJECT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case MsprojectPackage.PROJECT__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-			case MsprojectPackage.PROJECT__SUBJECT:
-				return SUBJECT_EDEFAULT == null ? subject != null : !SUBJECT_EDEFAULT.equals(subject);
-			case MsprojectPackage.PROJECT__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case MsprojectPackage.PROJECT__COMPANY:
-				return COMPANY_EDEFAULT == null ? company != null : !COMPANY_EDEFAULT.equals(company);
-			case MsprojectPackage.PROJECT__MANAGER:
-				return MANAGER_EDEFAULT == null ? manager != null : !MANAGER_EDEFAULT.equals(manager);
-			case MsprojectPackage.PROJECT__AUTHOR:
-				return AUTHOR_EDEFAULT == null ? author != null : !AUTHOR_EDEFAULT.equals(author);
-			case MsprojectPackage.PROJECT__CREATION_DATE:
-				return CREATION_DATE_EDEFAULT == null ? creationDate != null : !CREATION_DATE_EDEFAULT.equals(creationDate);
-			case MsprojectPackage.PROJECT__REVISION:
-				return REVISION_EDEFAULT == null ? revision != null : !REVISION_EDEFAULT.equals(revision);
-			case MsprojectPackage.PROJECT__LAST_SAVED:
-				return LAST_SAVED_EDEFAULT == null ? lastSaved != null : !LAST_SAVED_EDEFAULT.equals(lastSaved);
-			case MsprojectPackage.PROJECT__SCHEDULE_FROM_START:
-				return isSetScheduleFromStart();
-			case MsprojectPackage.PROJECT__START_DATE:
-				return START_DATE_EDEFAULT == null ? startDate != null : !START_DATE_EDEFAULT.equals(startDate);
-			case MsprojectPackage.PROJECT__FINISH_DATE:
-				return FINISH_DATE_EDEFAULT == null ? finishDate != null : !FINISH_DATE_EDEFAULT.equals(finishDate);
-			case MsprojectPackage.PROJECT__FYSTART_DATE:
-				return FYSTART_DATE_EDEFAULT == null ? fYStartDate != null : !FYSTART_DATE_EDEFAULT.equals(fYStartDate);
-			case MsprojectPackage.PROJECT__CRITICAL_SLACK_LIMIT:
-				return CRITICAL_SLACK_LIMIT_EDEFAULT == null ? criticalSlackLimit != null : !CRITICAL_SLACK_LIMIT_EDEFAULT.equals(criticalSlackLimit);
-			case MsprojectPackage.PROJECT__CURRENCY_DIGITS:
-				return CURRENCY_DIGITS_EDEFAULT == null ? currencyDigits != null : !CURRENCY_DIGITS_EDEFAULT.equals(currencyDigits);
-			case MsprojectPackage.PROJECT__CURRENCY_SYMBOL:
-				return CURRENCY_SYMBOL_EDEFAULT == null ? currencySymbol != null : !CURRENCY_SYMBOL_EDEFAULT.equals(currencySymbol);
-			case MsprojectPackage.PROJECT__CURRENCY_SYMBOL_POSITION:
-				return CURRENCY_SYMBOL_POSITION_EDEFAULT == null ? currencySymbolPosition != null : !CURRENCY_SYMBOL_POSITION_EDEFAULT.equals(currencySymbolPosition);
-			case MsprojectPackage.PROJECT__CALENDAR_UID:
-				return CALENDAR_UID_EDEFAULT == null ? calendarUID != null : !CALENDAR_UID_EDEFAULT.equals(calendarUID);
-			case MsprojectPackage.PROJECT__DEFAULT_START_TIME:
-				return DEFAULT_START_TIME_EDEFAULT == null ? defaultStartTime != null : !DEFAULT_START_TIME_EDEFAULT.equals(defaultStartTime);
-			case MsprojectPackage.PROJECT__DEFAULT_FINISH_TIME:
-				return DEFAULT_FINISH_TIME_EDEFAULT == null ? defaultFinishTime != null : !DEFAULT_FINISH_TIME_EDEFAULT.equals(defaultFinishTime);
-			case MsprojectPackage.PROJECT__MINUTES_PER_DAY:
-				return MINUTES_PER_DAY_EDEFAULT == null ? minutesPerDay != null : !MINUTES_PER_DAY_EDEFAULT.equals(minutesPerDay);
-			case MsprojectPackage.PROJECT__MINUTES_PER_WEEK:
-				return MINUTES_PER_WEEK_EDEFAULT == null ? minutesPerWeek != null : !MINUTES_PER_WEEK_EDEFAULT.equals(minutesPerWeek);
-			case MsprojectPackage.PROJECT__DAYS_PER_MONTH:
-				return DAYS_PER_MONTH_EDEFAULT == null ? daysPerMonth != null : !DAYS_PER_MONTH_EDEFAULT.equals(daysPerMonth);
-			case MsprojectPackage.PROJECT__DEFAULT_TASK_TYPE:
-				return isSetDefaultTaskType();
-			case MsprojectPackage.PROJECT__DEFAULT_FIXED_COST_ACCRUAL:
-				return DEFAULT_FIXED_COST_ACCRUAL_EDEFAULT == null ? defaultFixedCostAccrual != null : !DEFAULT_FIXED_COST_ACCRUAL_EDEFAULT.equals(defaultFixedCostAccrual);
-			case MsprojectPackage.PROJECT__DEFAULT_STANDARD_RATE:
-				return isSetDefaultStandardRate();
-			case MsprojectPackage.PROJECT__DEFAULT_OVERTIME_RATE:
-				return isSetDefaultOvertimeRate();
-			case MsprojectPackage.PROJECT__DURATION_FORMAT:
-				return DURATION_FORMAT_EDEFAULT == null ? durationFormat != null : !DURATION_FORMAT_EDEFAULT.equals(durationFormat);
-			case MsprojectPackage.PROJECT__WORK_FORMAT:
-				return WORK_FORMAT_EDEFAULT == null ? workFormat != null : !WORK_FORMAT_EDEFAULT.equals(workFormat);
-			case MsprojectPackage.PROJECT__EDITABLE_ACTUAL_COSTS:
-				return isSetEditableActualCosts();
-			case MsprojectPackage.PROJECT__HONOR_CONSTRAINTS:
-				return isSetHonorConstraints();
-			case MsprojectPackage.PROJECT__EARNED_VALUE_METHOD:
-				return EARNED_VALUE_METHOD_EDEFAULT == null ? earnedValueMethod != null : !EARNED_VALUE_METHOD_EDEFAULT.equals(earnedValueMethod);
-			case MsprojectPackage.PROJECT__INSERTED_PROJECTS_LIKE_SUMMARY:
-				return isSetInsertedProjectsLikeSummary();
-			case MsprojectPackage.PROJECT__MULTIPLE_CRITICAL_PATHS:
-				return isSetMultipleCriticalPaths();
-			case MsprojectPackage.PROJECT__NEW_TASKS_EFFORT_DRIVEN:
-				return isSetNewTasksEffortDriven();
-			case MsprojectPackage.PROJECT__NEW_TASKS_ESTIMATED:
-				return isSetNewTasksEstimated();
-			case MsprojectPackage.PROJECT__SPLITS_IN_PROGRESS_TASKS:
-				return isSetSplitsInProgressTasks();
-			case MsprojectPackage.PROJECT__SPREAD_ACTUAL_COST:
-				return isSetSpreadActualCost();
-			case MsprojectPackage.PROJECT__SPREAD_PERCENT_COMPLETE:
-				return isSetSpreadPercentComplete();
-			case MsprojectPackage.PROJECT__TASK_UPDATES_RESOURCE:
-				return isSetTaskUpdatesResource();
-			case MsprojectPackage.PROJECT__FISCAL_YEAR_START:
-				return isSetFiscalYearStart();
-			case MsprojectPackage.PROJECT__WEEK_START_DAY:
-				return WEEK_START_DAY_EDEFAULT == null ? weekStartDay != null : !WEEK_START_DAY_EDEFAULT.equals(weekStartDay);
-			case MsprojectPackage.PROJECT__MOVE_COMPLETED_ENDS_BACK:
-				return isSetMoveCompletedEndsBack();
-			case MsprojectPackage.PROJECT__MOVE_REMAINING_STARTS_BACK:
-				return isSetMoveRemainingStartsBack();
-			case MsprojectPackage.PROJECT__MOVE_REMAINING_STARTS_FORWARD:
-				return isSetMoveRemainingStartsForward();
-			case MsprojectPackage.PROJECT__MOVE_COMPLETED_ENDS_FORWARD:
-				return isSetMoveCompletedEndsForward();
-			case MsprojectPackage.PROJECT__BASELINE_FOR_EARNED_VALUE:
-				return BASELINE_FOR_EARNED_VALUE_EDEFAULT == null ? baselineForEarnedValue != null : !BASELINE_FOR_EARNED_VALUE_EDEFAULT.equals(baselineForEarnedValue);
-			case MsprojectPackage.PROJECT__AUTO_ADD_NEW_RESOURCES_AND_TASKS:
-				return isSetAutoAddNewResourcesAndTasks();
-			case MsprojectPackage.PROJECT__STATUS_DATE:
-				return STATUS_DATE_EDEFAULT == null ? statusDate != null : !STATUS_DATE_EDEFAULT.equals(statusDate);
-			case MsprojectPackage.PROJECT__CURRENT_DATE:
-				return CURRENT_DATE_EDEFAULT == null ? currentDate != null : !CURRENT_DATE_EDEFAULT.equals(currentDate);
-			case MsprojectPackage.PROJECT__MICROSOFT_PROJECT_SERVER_URL:
-				return isSetMicrosoftProjectServerURL();
-			case MsprojectPackage.PROJECT__AUTOLINK:
-				return isSetAutolink();
-			case MsprojectPackage.PROJECT__NEW_TASK_START_DATE:
-				return NEW_TASK_START_DATE_EDEFAULT == null ? newTaskStartDate != null : !NEW_TASK_START_DATE_EDEFAULT.equals(newTaskStartDate);
-			case MsprojectPackage.PROJECT__DEFAULT_TASK_EV_METHOD:
-				return DEFAULT_TASK_EV_METHOD_EDEFAULT == null ? defaultTaskEVMethod != null : !DEFAULT_TASK_EV_METHOD_EDEFAULT.equals(defaultTaskEVMethod);
-			case MsprojectPackage.PROJECT__PROJECT_EXTERNALLY_EDITED:
-				return isSetProjectExternallyEdited();
-			case MsprojectPackage.PROJECT__EXTENDED_CREATION_DATE:
-				return EXTENDED_CREATION_DATE_EDEFAULT == null ? extendedCreationDate != null : !EXTENDED_CREATION_DATE_EDEFAULT.equals(extendedCreationDate);
-			case MsprojectPackage.PROJECT__ACTUALS_IN_SYNC:
-				return isSetActualsInSync();
-			case MsprojectPackage.PROJECT__REMOVE_FILE_PROPERTIES:
-				return isSetRemoveFileProperties();
-			case MsprojectPackage.PROJECT__ADMIN_PROJECT:
-				return isSetAdminProject();
-			case MsprojectPackage.PROJECT__OUTLINE_CODES:
-				return outlineCodes != null;
-			case MsprojectPackage.PROJECT__WBS_MASKS:
-				return wBSMasks != null;
-			case MsprojectPackage.PROJECT__EXTENDED_ATTRIBUTES:
-				return extendedAttributes != null;
-			case MsprojectPackage.PROJECT__CALENDARS:
-				return calendars != null;
-			case MsprojectPackage.PROJECT__TASKS:
-				return tasks != null;
-			case MsprojectPackage.PROJECT__RESOURCES:
-				return resources != null;
-			case MsprojectPackage.PROJECT__ASSIGNMENTS:
-				return assignments != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (uID: ");
-		result.append(uID);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", title: ");
-		result.append(title);
-		result.append(", subject: ");
-		result.append(subject);
-		result.append(", category: ");
-		result.append(category);
-		result.append(", company: ");
-		result.append(company);
-		result.append(", manager: ");
-		result.append(manager);
-		result.append(", author: ");
-		result.append(author);
-		result.append(", creationDate: ");
-		result.append(creationDate);
-		result.append(", revision: ");
-		result.append(revision);
-		result.append(", lastSaved: ");
-		result.append(lastSaved);
-		result.append(", scheduleFromStart: ");
-		if (scheduleFromStartESet) result.append(scheduleFromStart); else result.append("<unset>");
-		result.append(", startDate: ");
-		result.append(startDate);
-		result.append(", finishDate: ");
-		result.append(finishDate);
-		result.append(", fYStartDate: ");
-		result.append(fYStartDate);
-		result.append(", criticalSlackLimit: ");
-		result.append(criticalSlackLimit);
-		result.append(", currencyDigits: ");
-		result.append(currencyDigits);
-		result.append(", currencySymbol: ");
-		result.append(currencySymbol);
-		result.append(", currencySymbolPosition: ");
-		result.append(currencySymbolPosition);
-		result.append(", calendarUID: ");
-		result.append(calendarUID);
-		result.append(", defaultStartTime: ");
-		result.append(defaultStartTime);
-		result.append(", defaultFinishTime: ");
-		result.append(defaultFinishTime);
-		result.append(", minutesPerDay: ");
-		result.append(minutesPerDay);
-		result.append(", minutesPerWeek: ");
-		result.append(minutesPerWeek);
-		result.append(", daysPerMonth: ");
-		result.append(daysPerMonth);
-		result.append(", defaultTaskType: ");
-		if (defaultTaskTypeESet) result.append(defaultTaskType); else result.append("<unset>");
-		result.append(", defaultFixedCostAccrual: ");
-		result.append(defaultFixedCostAccrual);
-		result.append(", defaultStandardRate: ");
-		if (defaultStandardRateESet) result.append(defaultStandardRate); else result.append("<unset>");
-		result.append(", defaultOvertimeRate: ");
-		if (defaultOvertimeRateESet) result.append(defaultOvertimeRate); else result.append("<unset>");
-		result.append(", durationFormat: ");
-		result.append(durationFormat);
-		result.append(", workFormat: ");
-		result.append(workFormat);
-		result.append(", editableActualCosts: ");
-		if (editableActualCostsESet) result.append(editableActualCosts); else result.append("<unset>");
-		result.append(", honorConstraints: ");
-		if (honorConstraintsESet) result.append(honorConstraints); else result.append("<unset>");
-		result.append(", earnedValueMethod: ");
-		result.append(earnedValueMethod);
-		result.append(", insertedProjectsLikeSummary: ");
-		if (insertedProjectsLikeSummaryESet) result.append(insertedProjectsLikeSummary); else result.append("<unset>");
-		result.append(", multipleCriticalPaths: ");
-		if (multipleCriticalPathsESet) result.append(multipleCriticalPaths); else result.append("<unset>");
-		result.append(", newTasksEffortDriven: ");
-		if (newTasksEffortDrivenESet) result.append(newTasksEffortDriven); else result.append("<unset>");
-		result.append(", newTasksEstimated: ");
-		if (newTasksEstimatedESet) result.append(newTasksEstimated); else result.append("<unset>");
-		result.append(", splitsInProgressTasks: ");
-		if (splitsInProgressTasksESet) result.append(splitsInProgressTasks); else result.append("<unset>");
-		result.append(", spreadActualCost: ");
-		if (spreadActualCostESet) result.append(spreadActualCost); else result.append("<unset>");
-		result.append(", spreadPercentComplete: ");
-		if (spreadPercentCompleteESet) result.append(spreadPercentComplete); else result.append("<unset>");
-		result.append(", taskUpdatesResource: ");
-		if (taskUpdatesResourceESet) result.append(taskUpdatesResource); else result.append("<unset>");
-		result.append(", fiscalYearStart: ");
-		if (fiscalYearStartESet) result.append(fiscalYearStart); else result.append("<unset>");
-		result.append(", weekStartDay: ");
-		result.append(weekStartDay);
-		result.append(", moveCompletedEndsBack: ");
-		if (moveCompletedEndsBackESet) result.append(moveCompletedEndsBack); else result.append("<unset>");
-		result.append(", moveRemainingStartsBack: ");
-		if (moveRemainingStartsBackESet) result.append(moveRemainingStartsBack); else result.append("<unset>");
-		result.append(", moveRemainingStartsForward: ");
-		if (moveRemainingStartsForwardESet) result.append(moveRemainingStartsForward); else result.append("<unset>");
-		result.append(", moveCompletedEndsForward: ");
-		if (moveCompletedEndsForwardESet) result.append(moveCompletedEndsForward); else result.append("<unset>");
-		result.append(", baselineForEarnedValue: ");
-		result.append(baselineForEarnedValue);
-		result.append(", autoAddNewResourcesAndTasks: ");
-		if (autoAddNewResourcesAndTasksESet) result.append(autoAddNewResourcesAndTasks); else result.append("<unset>");
-		result.append(", statusDate: ");
-		result.append(statusDate);
-		result.append(", currentDate: ");
-		result.append(currentDate);
-		result.append(", microsoftProjectServerURL: ");
-		if (microsoftProjectServerURLESet) result.append(microsoftProjectServerURL); else result.append("<unset>");
-		result.append(", autolink: ");
-		if (autolinkESet) result.append(autolink); else result.append("<unset>");
-		result.append(", newTaskStartDate: ");
-		result.append(newTaskStartDate);
-		result.append(", defaultTaskEVMethod: ");
-		result.append(defaultTaskEVMethod);
-		result.append(", projectExternallyEdited: ");
-		if (projectExternallyEditedESet) result.append(projectExternallyEdited); else result.append("<unset>");
-		result.append(", extendedCreationDate: ");
-		result.append(extendedCreationDate);
-		result.append(", actualsInSync: ");
-		if (actualsInSyncESet) result.append(actualsInSync); else result.append("<unset>");
-		result.append(", removeFileProperties: ");
-		if (removeFilePropertiesESet) result.append(removeFileProperties); else result.append("<unset>");
-		result.append(", adminProject: ");
-		if (adminProjectESet) result.append(adminProject); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //ProjectImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/RateImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/RateImpl.java
deleted file mode 100755
index ee39f50..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/RateImpl.java
+++ /dev/null
@@ -1,540 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RateImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.Rate;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Rate</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.RateImpl#getRatesFrom <em>Rates From</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.RateImpl#getRatesTo <em>Rates To</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.RateImpl#getRateTable <em>Rate Table</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.RateImpl#getStandardRate <em>Standard Rate</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.RateImpl#getStandardRateFormat <em>Standard Rate Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.RateImpl#getOvertimeRate <em>Overtime Rate</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.RateImpl#getOvertimeRateFormat <em>Overtime Rate Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.RateImpl#getCostPerUse <em>Cost Per Use</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RateImpl extends EObjectImpl implements Rate {
-	/**
-	 * The default value of the '{@link #getRatesFrom() <em>Rates From</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRatesFrom()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object RATES_FROM_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRatesFrom() <em>Rates From</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRatesFrom()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object ratesFrom = RATES_FROM_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRatesTo() <em>Rates To</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRatesTo()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object RATES_TO_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRatesTo() <em>Rates To</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRatesTo()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object ratesTo = RATES_TO_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRateTable() <em>Rate Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRateTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger RATE_TABLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRateTable() <em>Rate Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRateTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger rateTable = RATE_TABLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStandardRate() <em>Standard Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStandardRate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal STANDARD_RATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStandardRate() <em>Standard Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStandardRate()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal standardRate = STANDARD_RATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStandardRateFormat() <em>Standard Rate Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStandardRateFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger STANDARD_RATE_FORMAT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStandardRateFormat() <em>Standard Rate Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStandardRateFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger standardRateFormat = STANDARD_RATE_FORMAT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOvertimeRate() <em>Overtime Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeRate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal OVERTIME_RATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOvertimeRate() <em>Overtime Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeRate()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal overtimeRate = OVERTIME_RATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOvertimeRateFormat() <em>Overtime Rate Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeRateFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger OVERTIME_RATE_FORMAT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOvertimeRateFormat() <em>Overtime Rate Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeRateFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger overtimeRateFormat = OVERTIME_RATE_FORMAT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCostPerUse() <em>Cost Per Use</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCostPerUse()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal COST_PER_USE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCostPerUse() <em>Cost Per Use</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCostPerUse()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal costPerUse = COST_PER_USE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RateImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getRate();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getRatesFrom() {
-		return ratesFrom;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRatesFrom(Object newRatesFrom) {
-		Object oldRatesFrom = ratesFrom;
-		ratesFrom = newRatesFrom;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RATE__RATES_FROM, oldRatesFrom, ratesFrom));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getRatesTo() {
-		return ratesTo;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRatesTo(Object newRatesTo) {
-		Object oldRatesTo = ratesTo;
-		ratesTo = newRatesTo;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RATE__RATES_TO, oldRatesTo, ratesTo));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getRateTable() {
-		return rateTable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRateTable(BigInteger newRateTable) {
-		BigInteger oldRateTable = rateTable;
-		rateTable = newRateTable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RATE__RATE_TABLE, oldRateTable, rateTable));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getStandardRate() {
-		return standardRate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStandardRate(BigDecimal newStandardRate) {
-		BigDecimal oldStandardRate = standardRate;
-		standardRate = newStandardRate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RATE__STANDARD_RATE, oldStandardRate, standardRate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getStandardRateFormat() {
-		return standardRateFormat;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStandardRateFormat(BigInteger newStandardRateFormat) {
-		BigInteger oldStandardRateFormat = standardRateFormat;
-		standardRateFormat = newStandardRateFormat;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RATE__STANDARD_RATE_FORMAT, oldStandardRateFormat, standardRateFormat));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getOvertimeRate() {
-		return overtimeRate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOvertimeRate(BigDecimal newOvertimeRate) {
-		BigDecimal oldOvertimeRate = overtimeRate;
-		overtimeRate = newOvertimeRate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RATE__OVERTIME_RATE, oldOvertimeRate, overtimeRate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getOvertimeRateFormat() {
-		return overtimeRateFormat;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOvertimeRateFormat(BigInteger newOvertimeRateFormat) {
-		BigInteger oldOvertimeRateFormat = overtimeRateFormat;
-		overtimeRateFormat = newOvertimeRateFormat;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RATE__OVERTIME_RATE_FORMAT, oldOvertimeRateFormat, overtimeRateFormat));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getCostPerUse() {
-		return costPerUse;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCostPerUse(BigDecimal newCostPerUse) {
-		BigDecimal oldCostPerUse = costPerUse;
-		costPerUse = newCostPerUse;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RATE__COST_PER_USE, oldCostPerUse, costPerUse));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RATE__RATES_FROM:
-				return getRatesFrom();
-			case MsprojectPackage.RATE__RATES_TO:
-				return getRatesTo();
-			case MsprojectPackage.RATE__RATE_TABLE:
-				return getRateTable();
-			case MsprojectPackage.RATE__STANDARD_RATE:
-				return getStandardRate();
-			case MsprojectPackage.RATE__STANDARD_RATE_FORMAT:
-				return getStandardRateFormat();
-			case MsprojectPackage.RATE__OVERTIME_RATE:
-				return getOvertimeRate();
-			case MsprojectPackage.RATE__OVERTIME_RATE_FORMAT:
-				return getOvertimeRateFormat();
-			case MsprojectPackage.RATE__COST_PER_USE:
-				return getCostPerUse();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RATE__RATES_FROM:
-				setRatesFrom((Object)newValue);
-				return;
-			case MsprojectPackage.RATE__RATES_TO:
-				setRatesTo((Object)newValue);
-				return;
-			case MsprojectPackage.RATE__RATE_TABLE:
-				setRateTable((BigInteger)newValue);
-				return;
-			case MsprojectPackage.RATE__STANDARD_RATE:
-				setStandardRate((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.RATE__STANDARD_RATE_FORMAT:
-				setStandardRateFormat((BigInteger)newValue);
-				return;
-			case MsprojectPackage.RATE__OVERTIME_RATE:
-				setOvertimeRate((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.RATE__OVERTIME_RATE_FORMAT:
-				setOvertimeRateFormat((BigInteger)newValue);
-				return;
-			case MsprojectPackage.RATE__COST_PER_USE:
-				setCostPerUse((BigDecimal)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RATE__RATES_FROM:
-				setRatesFrom(RATES_FROM_EDEFAULT);
-				return;
-			case MsprojectPackage.RATE__RATES_TO:
-				setRatesTo(RATES_TO_EDEFAULT);
-				return;
-			case MsprojectPackage.RATE__RATE_TABLE:
-				setRateTable(RATE_TABLE_EDEFAULT);
-				return;
-			case MsprojectPackage.RATE__STANDARD_RATE:
-				setStandardRate(STANDARD_RATE_EDEFAULT);
-				return;
-			case MsprojectPackage.RATE__STANDARD_RATE_FORMAT:
-				setStandardRateFormat(STANDARD_RATE_FORMAT_EDEFAULT);
-				return;
-			case MsprojectPackage.RATE__OVERTIME_RATE:
-				setOvertimeRate(OVERTIME_RATE_EDEFAULT);
-				return;
-			case MsprojectPackage.RATE__OVERTIME_RATE_FORMAT:
-				setOvertimeRateFormat(OVERTIME_RATE_FORMAT_EDEFAULT);
-				return;
-			case MsprojectPackage.RATE__COST_PER_USE:
-				setCostPerUse(COST_PER_USE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RATE__RATES_FROM:
-				return RATES_FROM_EDEFAULT == null ? ratesFrom != null : !RATES_FROM_EDEFAULT.equals(ratesFrom);
-			case MsprojectPackage.RATE__RATES_TO:
-				return RATES_TO_EDEFAULT == null ? ratesTo != null : !RATES_TO_EDEFAULT.equals(ratesTo);
-			case MsprojectPackage.RATE__RATE_TABLE:
-				return RATE_TABLE_EDEFAULT == null ? rateTable != null : !RATE_TABLE_EDEFAULT.equals(rateTable);
-			case MsprojectPackage.RATE__STANDARD_RATE:
-				return STANDARD_RATE_EDEFAULT == null ? standardRate != null : !STANDARD_RATE_EDEFAULT.equals(standardRate);
-			case MsprojectPackage.RATE__STANDARD_RATE_FORMAT:
-				return STANDARD_RATE_FORMAT_EDEFAULT == null ? standardRateFormat != null : !STANDARD_RATE_FORMAT_EDEFAULT.equals(standardRateFormat);
-			case MsprojectPackage.RATE__OVERTIME_RATE:
-				return OVERTIME_RATE_EDEFAULT == null ? overtimeRate != null : !OVERTIME_RATE_EDEFAULT.equals(overtimeRate);
-			case MsprojectPackage.RATE__OVERTIME_RATE_FORMAT:
-				return OVERTIME_RATE_FORMAT_EDEFAULT == null ? overtimeRateFormat != null : !OVERTIME_RATE_FORMAT_EDEFAULT.equals(overtimeRateFormat);
-			case MsprojectPackage.RATE__COST_PER_USE:
-				return COST_PER_USE_EDEFAULT == null ? costPerUse != null : !COST_PER_USE_EDEFAULT.equals(costPerUse);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (ratesFrom: ");
-		result.append(ratesFrom);
-		result.append(", ratesTo: ");
-		result.append(ratesTo);
-		result.append(", rateTable: ");
-		result.append(rateTable);
-		result.append(", standardRate: ");
-		result.append(standardRate);
-		result.append(", standardRateFormat: ");
-		result.append(standardRateFormat);
-		result.append(", overtimeRate: ");
-		result.append(overtimeRate);
-		result.append(", overtimeRateFormat: ");
-		result.append(overtimeRateFormat);
-		result.append(", costPerUse: ");
-		result.append(costPerUse);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RateImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/RatesImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/RatesImpl.java
deleted file mode 100755
index 2c7d906..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/RatesImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RatesImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.Rate;
-import org.eclipse.epf.msproject.Rates;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Rates</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.RatesImpl#getRate <em>Rate</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RatesImpl extends EObjectImpl implements Rates {
-	/**
-	 * The cached value of the '{@link #getRate() <em>Rate</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRate()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList rate = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RatesImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getRates();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getRate() {
-		if (rate == null) {
-			rate = new EObjectContainmentEList(Rate.class, this, MsprojectPackage.RATES__RATE);
-		}
-		return rate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.RATES__RATE:
-					return ((InternalEList)getRate()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RATES__RATE:
-				return getRate();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RATES__RATE:
-				getRate().clear();
-				getRate().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RATES__RATE:
-				getRate().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RATES__RATE:
-				return rate != null && !rate.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //RatesImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ResourceImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ResourceImpl.java
deleted file mode 100755
index c05676c..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ResourceImpl.java
+++ /dev/null
@@ -1,4215 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ResourceImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.AvailabilityPeriods;
-import org.eclipse.epf.msproject.Baseline2;
-import org.eclipse.epf.msproject.ExtendedAttribute3;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.OutlineCode3;
-import org.eclipse.epf.msproject.Rates;
-import org.eclipse.epf.msproject.Resource;
-import org.eclipse.epf.msproject.TimephasedDataType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Resource</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getID <em>ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#isIsNull <em>Is Null</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getInitials <em>Initials</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getPhonetics <em>Phonetics</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getNTAccount <em>NT Account</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getMaterialLabel <em>Material Label</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getWorkGroup <em>Work Group</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getEmailAddress <em>Email Address</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getHyperlink <em>Hyperlink</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getHyperlinkAddress <em>Hyperlink Address</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getHyperlinkSubAddress <em>Hyperlink Sub Address</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getMaxUnits <em>Max Units</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getPeakUnits <em>Peak Units</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#isOverAllocated <em>Over Allocated</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getAvailableFrom <em>Available From</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getAvailableTo <em>Available To</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getFinish <em>Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#isCanLevel <em>Can Level</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getAccrueAt <em>Accrue At</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getWork <em>Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getRegularWork <em>Regular Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getOvertimeWork <em>Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getActualWork <em>Actual Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getRemainingWork <em>Remaining Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getActualOvertimeWork <em>Actual Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getRemainingOvertimeWork <em>Remaining Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getPercentWorkComplete <em>Percent Work Complete</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getStandardRate <em>Standard Rate</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getStandardRateFormat <em>Standard Rate Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getCost <em>Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getOvertimeRate <em>Overtime Rate</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getOvertimeRateFormat <em>Overtime Rate Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getOvertimeCost <em>Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getCostPerUse <em>Cost Per Use</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getActualCost <em>Actual Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getActualOvertimeCost <em>Actual Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getRemainingCost <em>Remaining Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getRemainingOvertimeCost <em>Remaining Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getWorkVariance <em>Work Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getCostVariance <em>Cost Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getSV <em>SV</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getCV <em>CV</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getACWP <em>ACWP</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getCalendarUID <em>Calendar UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getNotes <em>Notes</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getBCWS <em>BCWS</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getBCWP <em>BCWP</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#isIsGeneric <em>Is Generic</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#isIsInactive <em>Is Inactive</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#isIsEnterprise <em>Is Enterprise</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getBookingType <em>Booking Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getActualWorkProtected <em>Actual Work Protected</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getActualOvertimeWorkProtected <em>Actual Overtime Work Protected</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getActiveDirectoryGUID <em>Active Directory GUID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getCreationDate <em>Creation Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getExtendedAttribute <em>Extended Attribute</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getBaseline <em>Baseline</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getOutlineCode <em>Outline Code</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getAvailabilityPeriods <em>Availability Periods</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getRates <em>Rates</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourceImpl#getTimephasedData <em>Timephased Data</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ResourceImpl extends EObjectImpl implements Resource {
-	/**
-	 * The default value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger uID = UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getID() <em>ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getID() <em>ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger iD = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger type = TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isIsNull() <em>Is Null</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsNull()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_NULL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsNull() <em>Is Null</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsNull()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isNull = IS_NULL_EDEFAULT;
-
-	/**
-	 * This is true if the Is Null attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isNullESet = false;
-
-	/**
-	 * The default value of the '{@link #getInitials() <em>Initials</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitials()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String INITIALS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getInitials() <em>Initials</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitials()
-	 * @generated
-	 * @ordered
-	 */
-	protected String initials = INITIALS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPhonetics() <em>Phonetics</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPhonetics()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PHONETICS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPhonetics() <em>Phonetics</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPhonetics()
-	 * @generated
-	 * @ordered
-	 */
-	protected String phonetics = PHONETICS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getNTAccount() <em>NT Account</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNTAccount()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NTACCOUNT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNTAccount() <em>NT Account</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNTAccount()
-	 * @generated
-	 * @ordered
-	 */
-	protected String nTAccount = NTACCOUNT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMaterialLabel() <em>Material Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMaterialLabel()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MATERIAL_LABEL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMaterialLabel() <em>Material Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMaterialLabel()
-	 * @generated
-	 * @ordered
-	 */
-	protected String materialLabel = MATERIAL_LABEL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCode() <em>Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCode()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CODE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCode() <em>Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCode()
-	 * @generated
-	 * @ordered
-	 */
-	protected String code = CODE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getGroup() <em>Group</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String GROUP_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getGroup() <em>Group</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup()
-	 * @generated
-	 * @ordered
-	 */
-	protected String group = GROUP_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWorkGroup() <em>Work Group</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkGroup()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger WORK_GROUP_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWorkGroup() <em>Work Group</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkGroup()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger workGroup = WORK_GROUP_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEmailAddress() <em>Email Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEmailAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EMAIL_ADDRESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEmailAddress() <em>Email Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEmailAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected String emailAddress = EMAIL_ADDRESS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHyperlink() <em>Hyperlink</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HYPERLINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHyperlink() <em>Hyperlink</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlink()
-	 * @generated
-	 * @ordered
-	 */
-	protected String hyperlink = HYPERLINK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHyperlinkAddress() <em>Hyperlink Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlinkAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HYPERLINK_ADDRESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHyperlinkAddress() <em>Hyperlink Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlinkAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected String hyperlinkAddress = HYPERLINK_ADDRESS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHyperlinkSubAddress() <em>Hyperlink Sub Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlinkSubAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HYPERLINK_SUB_ADDRESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHyperlinkSubAddress() <em>Hyperlink Sub Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlinkSubAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected String hyperlinkSubAddress = HYPERLINK_SUB_ADDRESS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMaxUnits() <em>Max Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMaxUnits()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float MAX_UNITS_EDEFAULT = 1.0F;
-
-	/**
-	 * The cached value of the '{@link #getMaxUnits() <em>Max Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMaxUnits()
-	 * @generated
-	 * @ordered
-	 */
-	protected float maxUnits = MAX_UNITS_EDEFAULT;
-
-	/**
-	 * This is true if the Max Units attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean maxUnitsESet = false;
-
-	/**
-	 * The default value of the '{@link #getPeakUnits() <em>Peak Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPeakUnits()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float PEAK_UNITS_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getPeakUnits() <em>Peak Units</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPeakUnits()
-	 * @generated
-	 * @ordered
-	 */
-	protected float peakUnits = PEAK_UNITS_EDEFAULT;
-
-	/**
-	 * This is true if the Peak Units attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean peakUnitsESet = false;
-
-	/**
-	 * The default value of the '{@link #isOverAllocated() <em>Over Allocated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isOverAllocated()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean OVER_ALLOCATED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isOverAllocated() <em>Over Allocated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isOverAllocated()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean overAllocated = OVER_ALLOCATED_EDEFAULT;
-
-	/**
-	 * This is true if the Over Allocated attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean overAllocatedESet = false;
-
-	/**
-	 * The default value of the '{@link #getAvailableFrom() <em>Available From</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAvailableFrom()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object AVAILABLE_FROM_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAvailableFrom() <em>Available From</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAvailableFrom()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object availableFrom = AVAILABLE_FROM_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAvailableTo() <em>Available To</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAvailableTo()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object AVAILABLE_TO_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAvailableTo() <em>Available To</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAvailableTo()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object availableTo = AVAILABLE_TO_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStart() <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object START_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStart() <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object start = START_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFinish() <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object FINISH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFinish() <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object finish = FINISH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isCanLevel() <em>Can Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCanLevel()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CAN_LEVEL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isCanLevel() <em>Can Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCanLevel()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean canLevel = CAN_LEVEL_EDEFAULT;
-
-	/**
-	 * This is true if the Can Level attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean canLevelESet = false;
-
-	/**
-	 * The default value of the '{@link #getAccrueAt() <em>Accrue At</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccrueAt()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger ACCRUE_AT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccrueAt() <em>Accrue At</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccrueAt()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger accrueAt = ACCRUE_AT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWork() <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWork() <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object work = WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRegularWork() <em>Regular Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRegularWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object REGULAR_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRegularWork() <em>Regular Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRegularWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object regularWork = REGULAR_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOvertimeWork() <em>Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object OVERTIME_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOvertimeWork() <em>Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object overtimeWork = OVERTIME_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualWork() <em>Actual Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualWork() <em>Actual Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualWork = ACTUAL_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemainingWork() <em>Remaining Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object REMAINING_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemainingWork() <em>Remaining Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object remainingWork = REMAINING_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualOvertimeWork() <em>Actual Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_OVERTIME_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualOvertimeWork() <em>Actual Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualOvertimeWork = ACTUAL_OVERTIME_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemainingOvertimeWork() <em>Remaining Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object REMAINING_OVERTIME_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemainingOvertimeWork() <em>Remaining Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object remainingOvertimeWork = REMAINING_OVERTIME_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPercentWorkComplete() <em>Percent Work Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPercentWorkComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger PERCENT_WORK_COMPLETE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPercentWorkComplete() <em>Percent Work Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPercentWorkComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger percentWorkComplete = PERCENT_WORK_COMPLETE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStandardRate() <em>Standard Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStandardRate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal STANDARD_RATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStandardRate() <em>Standard Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStandardRate()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal standardRate = STANDARD_RATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStandardRateFormat() <em>Standard Rate Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStandardRateFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger STANDARD_RATE_FORMAT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStandardRateFormat() <em>Standard Rate Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStandardRateFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger standardRateFormat = STANDARD_RATE_FORMAT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCost() <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCost() <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal cost = COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOvertimeRate() <em>Overtime Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeRate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal OVERTIME_RATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOvertimeRate() <em>Overtime Rate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeRate()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal overtimeRate = OVERTIME_RATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOvertimeRateFormat() <em>Overtime Rate Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeRateFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger OVERTIME_RATE_FORMAT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOvertimeRateFormat() <em>Overtime Rate Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeRateFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger overtimeRateFormat = OVERTIME_RATE_FORMAT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOvertimeCost() <em>Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal OVERTIME_COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOvertimeCost() <em>Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal overtimeCost = OVERTIME_COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCostPerUse() <em>Cost Per Use</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCostPerUse()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal COST_PER_USE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCostPerUse() <em>Cost Per Use</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCostPerUse()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal costPerUse = COST_PER_USE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualCost() <em>Actual Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal ACTUAL_COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualCost() <em>Actual Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal actualCost = ACTUAL_COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualOvertimeCost() <em>Actual Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal ACTUAL_OVERTIME_COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualOvertimeCost() <em>Actual Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal actualOvertimeCost = ACTUAL_OVERTIME_COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemainingCost() <em>Remaining Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal REMAINING_COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemainingCost() <em>Remaining Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal remainingCost = REMAINING_COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemainingOvertimeCost() <em>Remaining Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal REMAINING_OVERTIME_COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemainingOvertimeCost() <em>Remaining Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal remainingOvertimeCost = REMAINING_OVERTIME_COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWorkVariance() <em>Work Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float WORK_VARIANCE_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getWorkVariance() <em>Work Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected float workVariance = WORK_VARIANCE_EDEFAULT;
-
-	/**
-	 * This is true if the Work Variance attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean workVarianceESet = false;
-
-	/**
-	 * The default value of the '{@link #getCostVariance() <em>Cost Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCostVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float COST_VARIANCE_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getCostVariance() <em>Cost Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCostVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected float costVariance = COST_VARIANCE_EDEFAULT;
-
-	/**
-	 * This is true if the Cost Variance attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean costVarianceESet = false;
-
-	/**
-	 * The default value of the '{@link #getSV() <em>SV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSV()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float SV_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getSV() <em>SV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSV()
-	 * @generated
-	 * @ordered
-	 */
-	protected float sV = SV_EDEFAULT;
-
-	/**
-	 * This is true if the SV attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean sVESet = false;
-
-	/**
-	 * The default value of the '{@link #getCV() <em>CV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCV()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float CV_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getCV() <em>CV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCV()
-	 * @generated
-	 * @ordered
-	 */
-	protected float cV = CV_EDEFAULT;
-
-	/**
-	 * This is true if the CV attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean cVESet = false;
-
-	/**
-	 * The default value of the '{@link #getACWP() <em>ACWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getACWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float ACWP_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getACWP() <em>ACWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getACWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected float aCWP = ACWP_EDEFAULT;
-
-	/**
-	 * This is true if the ACWP attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean aCWPESet = false;
-
-	/**
-	 * The default value of the '{@link #getCalendarUID() <em>Calendar UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCalendarUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger CALENDAR_UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCalendarUID() <em>Calendar UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCalendarUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger calendarUID = CALENDAR_UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getNotes() <em>Notes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNotes()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NOTES_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNotes() <em>Notes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNotes()
-	 * @generated
-	 * @ordered
-	 */
-	protected String notes = NOTES_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getBCWS() <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWS()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float BCWS_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getBCWS() <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWS()
-	 * @generated
-	 * @ordered
-	 */
-	protected float bCWS = BCWS_EDEFAULT;
-
-	/**
-	 * This is true if the BCWS attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean bCWSESet = false;
-
-	/**
-	 * The default value of the '{@link #getBCWP() <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float BCWP_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getBCWP() <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected float bCWP = BCWP_EDEFAULT;
-
-	/**
-	 * This is true if the BCWP attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean bCWPESet = false;
-
-	/**
-	 * The default value of the '{@link #isIsGeneric() <em>Is Generic</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsGeneric()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_GENERIC_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsGeneric() <em>Is Generic</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsGeneric()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isGeneric = IS_GENERIC_EDEFAULT;
-
-	/**
-	 * This is true if the Is Generic attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isGenericESet = false;
-
-	/**
-	 * The default value of the '{@link #isIsInactive() <em>Is Inactive</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsInactive()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_INACTIVE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsInactive() <em>Is Inactive</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsInactive()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isInactive = IS_INACTIVE_EDEFAULT;
-
-	/**
-	 * This is true if the Is Inactive attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isInactiveESet = false;
-
-	/**
-	 * The default value of the '{@link #isIsEnterprise() <em>Is Enterprise</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsEnterprise()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_ENTERPRISE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsEnterprise() <em>Is Enterprise</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsEnterprise()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isEnterprise = IS_ENTERPRISE_EDEFAULT;
-
-	/**
-	 * This is true if the Is Enterprise attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isEnterpriseESet = false;
-
-	/**
-	 * The default value of the '{@link #getBookingType() <em>Booking Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBookingType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger BOOKING_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getBookingType() <em>Booking Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBookingType()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger bookingType = BOOKING_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualWorkProtected() <em>Actual Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualWorkProtected()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_WORK_PROTECTED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualWorkProtected() <em>Actual Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualWorkProtected()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualWorkProtected = ACTUAL_WORK_PROTECTED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualOvertimeWorkProtected() <em>Actual Overtime Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeWorkProtected()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_OVERTIME_WORK_PROTECTED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualOvertimeWorkProtected() <em>Actual Overtime Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeWorkProtected()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualOvertimeWorkProtected = ACTUAL_OVERTIME_WORK_PROTECTED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActiveDirectoryGUID() <em>Active Directory GUID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActiveDirectoryGUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ACTIVE_DIRECTORY_GUID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActiveDirectoryGUID() <em>Active Directory GUID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActiveDirectoryGUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String activeDirectoryGUID = ACTIVE_DIRECTORY_GUID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCreationDate() <em>Creation Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object CREATION_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCreationDate() <em>Creation Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object creationDate = CREATION_DATE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExtendedAttribute() <em>Extended Attribute</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList extendedAttribute = null;
-
-	/**
-	 * The cached value of the '{@link #getBaseline() <em>Baseline</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBaseline()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList baseline = null;
-
-	/**
-	 * The cached value of the '{@link #getOutlineCode() <em>Outline Code</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutlineCode()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList outlineCode = null;
-
-	/**
-	 * The cached value of the '{@link #getAvailabilityPeriods() <em>Availability Periods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAvailabilityPeriods()
-	 * @generated
-	 * @ordered
-	 */
-	protected AvailabilityPeriods availabilityPeriods = null;
-
-	/**
-	 * The cached value of the '{@link #getRates() <em>Rates</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRates()
-	 * @generated
-	 * @ordered
-	 */
-	protected Rates rates = null;
-
-	/**
-	 * The cached value of the '{@link #getTimephasedData() <em>Timephased Data</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTimephasedData()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList timephasedData = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ResourceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getResource();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getUID() {
-		return uID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUID(BigInteger newUID) {
-		BigInteger oldUID = uID;
-		uID = newUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__UID, oldUID, uID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getID() {
-		return iD;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setID(BigInteger newID) {
-		BigInteger oldID = iD;
-		iD = newID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__ID, oldID, iD));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(BigInteger newType) {
-		BigInteger oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsNull() {
-		return isNull;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsNull(boolean newIsNull) {
-		boolean oldIsNull = isNull;
-		isNull = newIsNull;
-		boolean oldIsNullESet = isNullESet;
-		isNullESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__IS_NULL, oldIsNull, isNull, !oldIsNullESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsNull() {
-		boolean oldIsNull = isNull;
-		boolean oldIsNullESet = isNullESet;
-		isNull = IS_NULL_EDEFAULT;
-		isNullESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.RESOURCE__IS_NULL, oldIsNull, IS_NULL_EDEFAULT, oldIsNullESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsNull() {
-		return isNullESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getInitials() {
-		return initials;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInitials(String newInitials) {
-		String oldInitials = initials;
-		initials = newInitials;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__INITIALS, oldInitials, initials));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPhonetics() {
-		return phonetics;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPhonetics(String newPhonetics) {
-		String oldPhonetics = phonetics;
-		phonetics = newPhonetics;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__PHONETICS, oldPhonetics, phonetics));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getNTAccount() {
-		return nTAccount;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNTAccount(String newNTAccount) {
-		String oldNTAccount = nTAccount;
-		nTAccount = newNTAccount;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__NTACCOUNT, oldNTAccount, nTAccount));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMaterialLabel() {
-		return materialLabel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMaterialLabel(String newMaterialLabel) {
-		String oldMaterialLabel = materialLabel;
-		materialLabel = newMaterialLabel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__MATERIAL_LABEL, oldMaterialLabel, materialLabel));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCode() {
-		return code;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCode(String newCode) {
-		String oldCode = code;
-		code = newCode;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__CODE, oldCode, code));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getGroup() {
-		return group;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGroup(String newGroup) {
-		String oldGroup = group;
-		group = newGroup;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__GROUP, oldGroup, group));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getWorkGroup() {
-		return workGroup;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWorkGroup(BigInteger newWorkGroup) {
-		BigInteger oldWorkGroup = workGroup;
-		workGroup = newWorkGroup;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__WORK_GROUP, oldWorkGroup, workGroup));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEmailAddress() {
-		return emailAddress;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEmailAddress(String newEmailAddress) {
-		String oldEmailAddress = emailAddress;
-		emailAddress = newEmailAddress;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__EMAIL_ADDRESS, oldEmailAddress, emailAddress));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHyperlink() {
-		return hyperlink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHyperlink(String newHyperlink) {
-		String oldHyperlink = hyperlink;
-		hyperlink = newHyperlink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__HYPERLINK, oldHyperlink, hyperlink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHyperlinkAddress() {
-		return hyperlinkAddress;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHyperlinkAddress(String newHyperlinkAddress) {
-		String oldHyperlinkAddress = hyperlinkAddress;
-		hyperlinkAddress = newHyperlinkAddress;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__HYPERLINK_ADDRESS, oldHyperlinkAddress, hyperlinkAddress));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHyperlinkSubAddress() {
-		return hyperlinkSubAddress;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHyperlinkSubAddress(String newHyperlinkSubAddress) {
-		String oldHyperlinkSubAddress = hyperlinkSubAddress;
-		hyperlinkSubAddress = newHyperlinkSubAddress;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__HYPERLINK_SUB_ADDRESS, oldHyperlinkSubAddress, hyperlinkSubAddress));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getMaxUnits() {
-		return maxUnits;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMaxUnits(float newMaxUnits) {
-		float oldMaxUnits = maxUnits;
-		maxUnits = newMaxUnits;
-		boolean oldMaxUnitsESet = maxUnitsESet;
-		maxUnitsESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__MAX_UNITS, oldMaxUnits, maxUnits, !oldMaxUnitsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMaxUnits() {
-		float oldMaxUnits = maxUnits;
-		boolean oldMaxUnitsESet = maxUnitsESet;
-		maxUnits = MAX_UNITS_EDEFAULT;
-		maxUnitsESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.RESOURCE__MAX_UNITS, oldMaxUnits, MAX_UNITS_EDEFAULT, oldMaxUnitsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMaxUnits() {
-		return maxUnitsESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getPeakUnits() {
-		return peakUnits;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPeakUnits(float newPeakUnits) {
-		float oldPeakUnits = peakUnits;
-		peakUnits = newPeakUnits;
-		boolean oldPeakUnitsESet = peakUnitsESet;
-		peakUnitsESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__PEAK_UNITS, oldPeakUnits, peakUnits, !oldPeakUnitsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetPeakUnits() {
-		float oldPeakUnits = peakUnits;
-		boolean oldPeakUnitsESet = peakUnitsESet;
-		peakUnits = PEAK_UNITS_EDEFAULT;
-		peakUnitsESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.RESOURCE__PEAK_UNITS, oldPeakUnits, PEAK_UNITS_EDEFAULT, oldPeakUnitsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetPeakUnits() {
-		return peakUnitsESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isOverAllocated() {
-		return overAllocated;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOverAllocated(boolean newOverAllocated) {
-		boolean oldOverAllocated = overAllocated;
-		overAllocated = newOverAllocated;
-		boolean oldOverAllocatedESet = overAllocatedESet;
-		overAllocatedESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__OVER_ALLOCATED, oldOverAllocated, overAllocated, !oldOverAllocatedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetOverAllocated() {
-		boolean oldOverAllocated = overAllocated;
-		boolean oldOverAllocatedESet = overAllocatedESet;
-		overAllocated = OVER_ALLOCATED_EDEFAULT;
-		overAllocatedESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.RESOURCE__OVER_ALLOCATED, oldOverAllocated, OVER_ALLOCATED_EDEFAULT, oldOverAllocatedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetOverAllocated() {
-		return overAllocatedESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getAvailableFrom() {
-		return availableFrom;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAvailableFrom(Object newAvailableFrom) {
-		Object oldAvailableFrom = availableFrom;
-		availableFrom = newAvailableFrom;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__AVAILABLE_FROM, oldAvailableFrom, availableFrom));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getAvailableTo() {
-		return availableTo;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAvailableTo(Object newAvailableTo) {
-		Object oldAvailableTo = availableTo;
-		availableTo = newAvailableTo;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__AVAILABLE_TO, oldAvailableTo, availableTo));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getStart() {
-		return start;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStart(Object newStart) {
-		Object oldStart = start;
-		start = newStart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__START, oldStart, start));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getFinish() {
-		return finish;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinish(Object newFinish) {
-		Object oldFinish = finish;
-		finish = newFinish;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__FINISH, oldFinish, finish));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isCanLevel() {
-		return canLevel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCanLevel(boolean newCanLevel) {
-		boolean oldCanLevel = canLevel;
-		canLevel = newCanLevel;
-		boolean oldCanLevelESet = canLevelESet;
-		canLevelESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__CAN_LEVEL, oldCanLevel, canLevel, !oldCanLevelESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetCanLevel() {
-		boolean oldCanLevel = canLevel;
-		boolean oldCanLevelESet = canLevelESet;
-		canLevel = CAN_LEVEL_EDEFAULT;
-		canLevelESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.RESOURCE__CAN_LEVEL, oldCanLevel, CAN_LEVEL_EDEFAULT, oldCanLevelESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetCanLevel() {
-		return canLevelESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getAccrueAt() {
-		return accrueAt;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAccrueAt(BigInteger newAccrueAt) {
-		BigInteger oldAccrueAt = accrueAt;
-		accrueAt = newAccrueAt;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__ACCRUE_AT, oldAccrueAt, accrueAt));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getWork() {
-		return work;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWork(Object newWork) {
-		Object oldWork = work;
-		work = newWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__WORK, oldWork, work));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getRegularWork() {
-		return regularWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRegularWork(Object newRegularWork) {
-		Object oldRegularWork = regularWork;
-		regularWork = newRegularWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__REGULAR_WORK, oldRegularWork, regularWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getOvertimeWork() {
-		return overtimeWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOvertimeWork(Object newOvertimeWork) {
-		Object oldOvertimeWork = overtimeWork;
-		overtimeWork = newOvertimeWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__OVERTIME_WORK, oldOvertimeWork, overtimeWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualWork() {
-		return actualWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualWork(Object newActualWork) {
-		Object oldActualWork = actualWork;
-		actualWork = newActualWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__ACTUAL_WORK, oldActualWork, actualWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getRemainingWork() {
-		return remainingWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemainingWork(Object newRemainingWork) {
-		Object oldRemainingWork = remainingWork;
-		remainingWork = newRemainingWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__REMAINING_WORK, oldRemainingWork, remainingWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualOvertimeWork() {
-		return actualOvertimeWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualOvertimeWork(Object newActualOvertimeWork) {
-		Object oldActualOvertimeWork = actualOvertimeWork;
-		actualOvertimeWork = newActualOvertimeWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__ACTUAL_OVERTIME_WORK, oldActualOvertimeWork, actualOvertimeWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getRemainingOvertimeWork() {
-		return remainingOvertimeWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemainingOvertimeWork(Object newRemainingOvertimeWork) {
-		Object oldRemainingOvertimeWork = remainingOvertimeWork;
-		remainingOvertimeWork = newRemainingOvertimeWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__REMAINING_OVERTIME_WORK, oldRemainingOvertimeWork, remainingOvertimeWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getPercentWorkComplete() {
-		return percentWorkComplete;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPercentWorkComplete(BigInteger newPercentWorkComplete) {
-		BigInteger oldPercentWorkComplete = percentWorkComplete;
-		percentWorkComplete = newPercentWorkComplete;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__PERCENT_WORK_COMPLETE, oldPercentWorkComplete, percentWorkComplete));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getStandardRate() {
-		return standardRate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStandardRate(BigDecimal newStandardRate) {
-		BigDecimal oldStandardRate = standardRate;
-		standardRate = newStandardRate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__STANDARD_RATE, oldStandardRate, standardRate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getStandardRateFormat() {
-		return standardRateFormat;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStandardRateFormat(BigInteger newStandardRateFormat) {
-		BigInteger oldStandardRateFormat = standardRateFormat;
-		standardRateFormat = newStandardRateFormat;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__STANDARD_RATE_FORMAT, oldStandardRateFormat, standardRateFormat));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getCost() {
-		return cost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCost(BigDecimal newCost) {
-		BigDecimal oldCost = cost;
-		cost = newCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__COST, oldCost, cost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getOvertimeRate() {
-		return overtimeRate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOvertimeRate(BigDecimal newOvertimeRate) {
-		BigDecimal oldOvertimeRate = overtimeRate;
-		overtimeRate = newOvertimeRate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__OVERTIME_RATE, oldOvertimeRate, overtimeRate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getOvertimeRateFormat() {
-		return overtimeRateFormat;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOvertimeRateFormat(BigInteger newOvertimeRateFormat) {
-		BigInteger oldOvertimeRateFormat = overtimeRateFormat;
-		overtimeRateFormat = newOvertimeRateFormat;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__OVERTIME_RATE_FORMAT, oldOvertimeRateFormat, overtimeRateFormat));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getOvertimeCost() {
-		return overtimeCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOvertimeCost(BigDecimal newOvertimeCost) {
-		BigDecimal oldOvertimeCost = overtimeCost;
-		overtimeCost = newOvertimeCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__OVERTIME_COST, oldOvertimeCost, overtimeCost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getCostPerUse() {
-		return costPerUse;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCostPerUse(BigDecimal newCostPerUse) {
-		BigDecimal oldCostPerUse = costPerUse;
-		costPerUse = newCostPerUse;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__COST_PER_USE, oldCostPerUse, costPerUse));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getActualCost() {
-		return actualCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualCost(BigDecimal newActualCost) {
-		BigDecimal oldActualCost = actualCost;
-		actualCost = newActualCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__ACTUAL_COST, oldActualCost, actualCost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getActualOvertimeCost() {
-		return actualOvertimeCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualOvertimeCost(BigDecimal newActualOvertimeCost) {
-		BigDecimal oldActualOvertimeCost = actualOvertimeCost;
-		actualOvertimeCost = newActualOvertimeCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__ACTUAL_OVERTIME_COST, oldActualOvertimeCost, actualOvertimeCost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getRemainingCost() {
-		return remainingCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemainingCost(BigDecimal newRemainingCost) {
-		BigDecimal oldRemainingCost = remainingCost;
-		remainingCost = newRemainingCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__REMAINING_COST, oldRemainingCost, remainingCost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getRemainingOvertimeCost() {
-		return remainingOvertimeCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemainingOvertimeCost(BigDecimal newRemainingOvertimeCost) {
-		BigDecimal oldRemainingOvertimeCost = remainingOvertimeCost;
-		remainingOvertimeCost = newRemainingOvertimeCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__REMAINING_OVERTIME_COST, oldRemainingOvertimeCost, remainingOvertimeCost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getWorkVariance() {
-		return workVariance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWorkVariance(float newWorkVariance) {
-		float oldWorkVariance = workVariance;
-		workVariance = newWorkVariance;
-		boolean oldWorkVarianceESet = workVarianceESet;
-		workVarianceESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__WORK_VARIANCE, oldWorkVariance, workVariance, !oldWorkVarianceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetWorkVariance() {
-		float oldWorkVariance = workVariance;
-		boolean oldWorkVarianceESet = workVarianceESet;
-		workVariance = WORK_VARIANCE_EDEFAULT;
-		workVarianceESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.RESOURCE__WORK_VARIANCE, oldWorkVariance, WORK_VARIANCE_EDEFAULT, oldWorkVarianceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetWorkVariance() {
-		return workVarianceESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getCostVariance() {
-		return costVariance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCostVariance(float newCostVariance) {
-		float oldCostVariance = costVariance;
-		costVariance = newCostVariance;
-		boolean oldCostVarianceESet = costVarianceESet;
-		costVarianceESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__COST_VARIANCE, oldCostVariance, costVariance, !oldCostVarianceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetCostVariance() {
-		float oldCostVariance = costVariance;
-		boolean oldCostVarianceESet = costVarianceESet;
-		costVariance = COST_VARIANCE_EDEFAULT;
-		costVarianceESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.RESOURCE__COST_VARIANCE, oldCostVariance, COST_VARIANCE_EDEFAULT, oldCostVarianceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetCostVariance() {
-		return costVarianceESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getSV() {
-		return sV;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSV(float newSV) {
-		float oldSV = sV;
-		sV = newSV;
-		boolean oldSVESet = sVESet;
-		sVESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__SV, oldSV, sV, !oldSVESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetSV() {
-		float oldSV = sV;
-		boolean oldSVESet = sVESet;
-		sV = SV_EDEFAULT;
-		sVESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.RESOURCE__SV, oldSV, SV_EDEFAULT, oldSVESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetSV() {
-		return sVESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getCV() {
-		return cV;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCV(float newCV) {
-		float oldCV = cV;
-		cV = newCV;
-		boolean oldCVESet = cVESet;
-		cVESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__CV, oldCV, cV, !oldCVESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetCV() {
-		float oldCV = cV;
-		boolean oldCVESet = cVESet;
-		cV = CV_EDEFAULT;
-		cVESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.RESOURCE__CV, oldCV, CV_EDEFAULT, oldCVESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetCV() {
-		return cVESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getACWP() {
-		return aCWP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setACWP(float newACWP) {
-		float oldACWP = aCWP;
-		aCWP = newACWP;
-		boolean oldACWPESet = aCWPESet;
-		aCWPESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__ACWP, oldACWP, aCWP, !oldACWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetACWP() {
-		float oldACWP = aCWP;
-		boolean oldACWPESet = aCWPESet;
-		aCWP = ACWP_EDEFAULT;
-		aCWPESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.RESOURCE__ACWP, oldACWP, ACWP_EDEFAULT, oldACWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetACWP() {
-		return aCWPESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getCalendarUID() {
-		return calendarUID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCalendarUID(BigInteger newCalendarUID) {
-		BigInteger oldCalendarUID = calendarUID;
-		calendarUID = newCalendarUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__CALENDAR_UID, oldCalendarUID, calendarUID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getNotes() {
-		return notes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNotes(String newNotes) {
-		String oldNotes = notes;
-		notes = newNotes;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__NOTES, oldNotes, notes));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getBCWS() {
-		return bCWS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBCWS(float newBCWS) {
-		float oldBCWS = bCWS;
-		bCWS = newBCWS;
-		boolean oldBCWSESet = bCWSESet;
-		bCWSESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__BCWS, oldBCWS, bCWS, !oldBCWSESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBCWS() {
-		float oldBCWS = bCWS;
-		boolean oldBCWSESet = bCWSESet;
-		bCWS = BCWS_EDEFAULT;
-		bCWSESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.RESOURCE__BCWS, oldBCWS, BCWS_EDEFAULT, oldBCWSESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBCWS() {
-		return bCWSESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getBCWP() {
-		return bCWP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBCWP(float newBCWP) {
-		float oldBCWP = bCWP;
-		bCWP = newBCWP;
-		boolean oldBCWPESet = bCWPESet;
-		bCWPESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__BCWP, oldBCWP, bCWP, !oldBCWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBCWP() {
-		float oldBCWP = bCWP;
-		boolean oldBCWPESet = bCWPESet;
-		bCWP = BCWP_EDEFAULT;
-		bCWPESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.RESOURCE__BCWP, oldBCWP, BCWP_EDEFAULT, oldBCWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBCWP() {
-		return bCWPESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsGeneric() {
-		return isGeneric;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsGeneric(boolean newIsGeneric) {
-		boolean oldIsGeneric = isGeneric;
-		isGeneric = newIsGeneric;
-		boolean oldIsGenericESet = isGenericESet;
-		isGenericESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__IS_GENERIC, oldIsGeneric, isGeneric, !oldIsGenericESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsGeneric() {
-		boolean oldIsGeneric = isGeneric;
-		boolean oldIsGenericESet = isGenericESet;
-		isGeneric = IS_GENERIC_EDEFAULT;
-		isGenericESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.RESOURCE__IS_GENERIC, oldIsGeneric, IS_GENERIC_EDEFAULT, oldIsGenericESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsGeneric() {
-		return isGenericESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsInactive() {
-		return isInactive;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsInactive(boolean newIsInactive) {
-		boolean oldIsInactive = isInactive;
-		isInactive = newIsInactive;
-		boolean oldIsInactiveESet = isInactiveESet;
-		isInactiveESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__IS_INACTIVE, oldIsInactive, isInactive, !oldIsInactiveESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsInactive() {
-		boolean oldIsInactive = isInactive;
-		boolean oldIsInactiveESet = isInactiveESet;
-		isInactive = IS_INACTIVE_EDEFAULT;
-		isInactiveESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.RESOURCE__IS_INACTIVE, oldIsInactive, IS_INACTIVE_EDEFAULT, oldIsInactiveESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsInactive() {
-		return isInactiveESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsEnterprise() {
-		return isEnterprise;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsEnterprise(boolean newIsEnterprise) {
-		boolean oldIsEnterprise = isEnterprise;
-		isEnterprise = newIsEnterprise;
-		boolean oldIsEnterpriseESet = isEnterpriseESet;
-		isEnterpriseESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__IS_ENTERPRISE, oldIsEnterprise, isEnterprise, !oldIsEnterpriseESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsEnterprise() {
-		boolean oldIsEnterprise = isEnterprise;
-		boolean oldIsEnterpriseESet = isEnterpriseESet;
-		isEnterprise = IS_ENTERPRISE_EDEFAULT;
-		isEnterpriseESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.RESOURCE__IS_ENTERPRISE, oldIsEnterprise, IS_ENTERPRISE_EDEFAULT, oldIsEnterpriseESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsEnterprise() {
-		return isEnterpriseESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getBookingType() {
-		return bookingType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBookingType(BigInteger newBookingType) {
-		BigInteger oldBookingType = bookingType;
-		bookingType = newBookingType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__BOOKING_TYPE, oldBookingType, bookingType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualWorkProtected() {
-		return actualWorkProtected;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualWorkProtected(Object newActualWorkProtected) {
-		Object oldActualWorkProtected = actualWorkProtected;
-		actualWorkProtected = newActualWorkProtected;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__ACTUAL_WORK_PROTECTED, oldActualWorkProtected, actualWorkProtected));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualOvertimeWorkProtected() {
-		return actualOvertimeWorkProtected;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualOvertimeWorkProtected(Object newActualOvertimeWorkProtected) {
-		Object oldActualOvertimeWorkProtected = actualOvertimeWorkProtected;
-		actualOvertimeWorkProtected = newActualOvertimeWorkProtected;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__ACTUAL_OVERTIME_WORK_PROTECTED, oldActualOvertimeWorkProtected, actualOvertimeWorkProtected));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getActiveDirectoryGUID() {
-		return activeDirectoryGUID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActiveDirectoryGUID(String newActiveDirectoryGUID) {
-		String oldActiveDirectoryGUID = activeDirectoryGUID;
-		activeDirectoryGUID = newActiveDirectoryGUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__ACTIVE_DIRECTORY_GUID, oldActiveDirectoryGUID, activeDirectoryGUID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getCreationDate() {
-		return creationDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCreationDate(Object newCreationDate) {
-		Object oldCreationDate = creationDate;
-		creationDate = newCreationDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__CREATION_DATE, oldCreationDate, creationDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getExtendedAttribute() {
-		if (extendedAttribute == null) {
-			extendedAttribute = new EObjectContainmentEList(ExtendedAttribute3.class, this, MsprojectPackage.RESOURCE__EXTENDED_ATTRIBUTE);
-		}
-		return extendedAttribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getBaseline() {
-		if (baseline == null) {
-			baseline = new EObjectContainmentEList(Baseline2.class, this, MsprojectPackage.RESOURCE__BASELINE);
-		}
-		return baseline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getOutlineCode() {
-		if (outlineCode == null) {
-			outlineCode = new EObjectContainmentEList(OutlineCode3.class, this, MsprojectPackage.RESOURCE__OUTLINE_CODE);
-		}
-		return outlineCode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AvailabilityPeriods getAvailabilityPeriods() {
-		return availabilityPeriods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAvailabilityPeriods(AvailabilityPeriods newAvailabilityPeriods, NotificationChain msgs) {
-		AvailabilityPeriods oldAvailabilityPeriods = availabilityPeriods;
-		availabilityPeriods = newAvailabilityPeriods;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__AVAILABILITY_PERIODS, oldAvailabilityPeriods, newAvailabilityPeriods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAvailabilityPeriods(AvailabilityPeriods newAvailabilityPeriods) {
-		if (newAvailabilityPeriods != availabilityPeriods) {
-			NotificationChain msgs = null;
-			if (availabilityPeriods != null)
-				msgs = ((InternalEObject)availabilityPeriods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.RESOURCE__AVAILABILITY_PERIODS, null, msgs);
-			if (newAvailabilityPeriods != null)
-				msgs = ((InternalEObject)newAvailabilityPeriods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.RESOURCE__AVAILABILITY_PERIODS, null, msgs);
-			msgs = basicSetAvailabilityPeriods(newAvailabilityPeriods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__AVAILABILITY_PERIODS, newAvailabilityPeriods, newAvailabilityPeriods));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Rates getRates() {
-		return rates;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRates(Rates newRates, NotificationChain msgs) {
-		Rates oldRates = rates;
-		rates = newRates;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__RATES, oldRates, newRates);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRates(Rates newRates) {
-		if (newRates != rates) {
-			NotificationChain msgs = null;
-			if (rates != null)
-				msgs = ((InternalEObject)rates).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.RESOURCE__RATES, null, msgs);
-			if (newRates != null)
-				msgs = ((InternalEObject)newRates).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.RESOURCE__RATES, null, msgs);
-			msgs = basicSetRates(newRates, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.RESOURCE__RATES, newRates, newRates));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTimephasedData() {
-		if (timephasedData == null) {
-			timephasedData = new EObjectContainmentEList(TimephasedDataType.class, this, MsprojectPackage.RESOURCE__TIMEPHASED_DATA);
-		}
-		return timephasedData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.RESOURCE__EXTENDED_ATTRIBUTE:
-					return ((InternalEList)getExtendedAttribute()).basicRemove(otherEnd, msgs);
-				case MsprojectPackage.RESOURCE__BASELINE:
-					return ((InternalEList)getBaseline()).basicRemove(otherEnd, msgs);
-				case MsprojectPackage.RESOURCE__OUTLINE_CODE:
-					return ((InternalEList)getOutlineCode()).basicRemove(otherEnd, msgs);
-				case MsprojectPackage.RESOURCE__AVAILABILITY_PERIODS:
-					return basicSetAvailabilityPeriods(null, msgs);
-				case MsprojectPackage.RESOURCE__RATES:
-					return basicSetRates(null, msgs);
-				case MsprojectPackage.RESOURCE__TIMEPHASED_DATA:
-					return ((InternalEList)getTimephasedData()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RESOURCE__UID:
-				return getUID();
-			case MsprojectPackage.RESOURCE__ID:
-				return getID();
-			case MsprojectPackage.RESOURCE__NAME:
-				return getName();
-			case MsprojectPackage.RESOURCE__TYPE:
-				return getType();
-			case MsprojectPackage.RESOURCE__IS_NULL:
-				return isIsNull() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.RESOURCE__INITIALS:
-				return getInitials();
-			case MsprojectPackage.RESOURCE__PHONETICS:
-				return getPhonetics();
-			case MsprojectPackage.RESOURCE__NTACCOUNT:
-				return getNTAccount();
-			case MsprojectPackage.RESOURCE__MATERIAL_LABEL:
-				return getMaterialLabel();
-			case MsprojectPackage.RESOURCE__CODE:
-				return getCode();
-			case MsprojectPackage.RESOURCE__GROUP:
-				return getGroup();
-			case MsprojectPackage.RESOURCE__WORK_GROUP:
-				return getWorkGroup();
-			case MsprojectPackage.RESOURCE__EMAIL_ADDRESS:
-				return getEmailAddress();
-			case MsprojectPackage.RESOURCE__HYPERLINK:
-				return getHyperlink();
-			case MsprojectPackage.RESOURCE__HYPERLINK_ADDRESS:
-				return getHyperlinkAddress();
-			case MsprojectPackage.RESOURCE__HYPERLINK_SUB_ADDRESS:
-				return getHyperlinkSubAddress();
-			case MsprojectPackage.RESOURCE__MAX_UNITS:
-				return new Float(getMaxUnits());
-			case MsprojectPackage.RESOURCE__PEAK_UNITS:
-				return new Float(getPeakUnits());
-			case MsprojectPackage.RESOURCE__OVER_ALLOCATED:
-				return isOverAllocated() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.RESOURCE__AVAILABLE_FROM:
-				return getAvailableFrom();
-			case MsprojectPackage.RESOURCE__AVAILABLE_TO:
-				return getAvailableTo();
-			case MsprojectPackage.RESOURCE__START:
-				return getStart();
-			case MsprojectPackage.RESOURCE__FINISH:
-				return getFinish();
-			case MsprojectPackage.RESOURCE__CAN_LEVEL:
-				return isCanLevel() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.RESOURCE__ACCRUE_AT:
-				return getAccrueAt();
-			case MsprojectPackage.RESOURCE__WORK:
-				return getWork();
-			case MsprojectPackage.RESOURCE__REGULAR_WORK:
-				return getRegularWork();
-			case MsprojectPackage.RESOURCE__OVERTIME_WORK:
-				return getOvertimeWork();
-			case MsprojectPackage.RESOURCE__ACTUAL_WORK:
-				return getActualWork();
-			case MsprojectPackage.RESOURCE__REMAINING_WORK:
-				return getRemainingWork();
-			case MsprojectPackage.RESOURCE__ACTUAL_OVERTIME_WORK:
-				return getActualOvertimeWork();
-			case MsprojectPackage.RESOURCE__REMAINING_OVERTIME_WORK:
-				return getRemainingOvertimeWork();
-			case MsprojectPackage.RESOURCE__PERCENT_WORK_COMPLETE:
-				return getPercentWorkComplete();
-			case MsprojectPackage.RESOURCE__STANDARD_RATE:
-				return getStandardRate();
-			case MsprojectPackage.RESOURCE__STANDARD_RATE_FORMAT:
-				return getStandardRateFormat();
-			case MsprojectPackage.RESOURCE__COST:
-				return getCost();
-			case MsprojectPackage.RESOURCE__OVERTIME_RATE:
-				return getOvertimeRate();
-			case MsprojectPackage.RESOURCE__OVERTIME_RATE_FORMAT:
-				return getOvertimeRateFormat();
-			case MsprojectPackage.RESOURCE__OVERTIME_COST:
-				return getOvertimeCost();
-			case MsprojectPackage.RESOURCE__COST_PER_USE:
-				return getCostPerUse();
-			case MsprojectPackage.RESOURCE__ACTUAL_COST:
-				return getActualCost();
-			case MsprojectPackage.RESOURCE__ACTUAL_OVERTIME_COST:
-				return getActualOvertimeCost();
-			case MsprojectPackage.RESOURCE__REMAINING_COST:
-				return getRemainingCost();
-			case MsprojectPackage.RESOURCE__REMAINING_OVERTIME_COST:
-				return getRemainingOvertimeCost();
-			case MsprojectPackage.RESOURCE__WORK_VARIANCE:
-				return new Float(getWorkVariance());
-			case MsprojectPackage.RESOURCE__COST_VARIANCE:
-				return new Float(getCostVariance());
-			case MsprojectPackage.RESOURCE__SV:
-				return new Float(getSV());
-			case MsprojectPackage.RESOURCE__CV:
-				return new Float(getCV());
-			case MsprojectPackage.RESOURCE__ACWP:
-				return new Float(getACWP());
-			case MsprojectPackage.RESOURCE__CALENDAR_UID:
-				return getCalendarUID();
-			case MsprojectPackage.RESOURCE__NOTES:
-				return getNotes();
-			case MsprojectPackage.RESOURCE__BCWS:
-				return new Float(getBCWS());
-			case MsprojectPackage.RESOURCE__BCWP:
-				return new Float(getBCWP());
-			case MsprojectPackage.RESOURCE__IS_GENERIC:
-				return isIsGeneric() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.RESOURCE__IS_INACTIVE:
-				return isIsInactive() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.RESOURCE__IS_ENTERPRISE:
-				return isIsEnterprise() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.RESOURCE__BOOKING_TYPE:
-				return getBookingType();
-			case MsprojectPackage.RESOURCE__ACTUAL_WORK_PROTECTED:
-				return getActualWorkProtected();
-			case MsprojectPackage.RESOURCE__ACTUAL_OVERTIME_WORK_PROTECTED:
-				return getActualOvertimeWorkProtected();
-			case MsprojectPackage.RESOURCE__ACTIVE_DIRECTORY_GUID:
-				return getActiveDirectoryGUID();
-			case MsprojectPackage.RESOURCE__CREATION_DATE:
-				return getCreationDate();
-			case MsprojectPackage.RESOURCE__EXTENDED_ATTRIBUTE:
-				return getExtendedAttribute();
-			case MsprojectPackage.RESOURCE__BASELINE:
-				return getBaseline();
-			case MsprojectPackage.RESOURCE__OUTLINE_CODE:
-				return getOutlineCode();
-			case MsprojectPackage.RESOURCE__AVAILABILITY_PERIODS:
-				return getAvailabilityPeriods();
-			case MsprojectPackage.RESOURCE__RATES:
-				return getRates();
-			case MsprojectPackage.RESOURCE__TIMEPHASED_DATA:
-				return getTimephasedData();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RESOURCE__UID:
-				setUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__ID:
-				setID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__NAME:
-				setName((String)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__TYPE:
-				setType((BigInteger)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__IS_NULL:
-				setIsNull(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.RESOURCE__INITIALS:
-				setInitials((String)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__PHONETICS:
-				setPhonetics((String)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__NTACCOUNT:
-				setNTAccount((String)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__MATERIAL_LABEL:
-				setMaterialLabel((String)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__CODE:
-				setCode((String)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__GROUP:
-				setGroup((String)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__WORK_GROUP:
-				setWorkGroup((BigInteger)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__EMAIL_ADDRESS:
-				setEmailAddress((String)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__HYPERLINK:
-				setHyperlink((String)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__HYPERLINK_ADDRESS:
-				setHyperlinkAddress((String)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__HYPERLINK_SUB_ADDRESS:
-				setHyperlinkSubAddress((String)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__MAX_UNITS:
-				setMaxUnits(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.RESOURCE__PEAK_UNITS:
-				setPeakUnits(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.RESOURCE__OVER_ALLOCATED:
-				setOverAllocated(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.RESOURCE__AVAILABLE_FROM:
-				setAvailableFrom((Object)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__AVAILABLE_TO:
-				setAvailableTo((Object)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__START:
-				setStart((Object)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__FINISH:
-				setFinish((Object)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__CAN_LEVEL:
-				setCanLevel(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.RESOURCE__ACCRUE_AT:
-				setAccrueAt((BigInteger)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__WORK:
-				setWork((Object)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__REGULAR_WORK:
-				setRegularWork((Object)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__OVERTIME_WORK:
-				setOvertimeWork((Object)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__ACTUAL_WORK:
-				setActualWork((Object)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__REMAINING_WORK:
-				setRemainingWork((Object)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__ACTUAL_OVERTIME_WORK:
-				setActualOvertimeWork((Object)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__REMAINING_OVERTIME_WORK:
-				setRemainingOvertimeWork((Object)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__PERCENT_WORK_COMPLETE:
-				setPercentWorkComplete((BigInteger)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__STANDARD_RATE:
-				setStandardRate((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__STANDARD_RATE_FORMAT:
-				setStandardRateFormat((BigInteger)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__COST:
-				setCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__OVERTIME_RATE:
-				setOvertimeRate((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__OVERTIME_RATE_FORMAT:
-				setOvertimeRateFormat((BigInteger)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__OVERTIME_COST:
-				setOvertimeCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__COST_PER_USE:
-				setCostPerUse((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__ACTUAL_COST:
-				setActualCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__ACTUAL_OVERTIME_COST:
-				setActualOvertimeCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__REMAINING_COST:
-				setRemainingCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__REMAINING_OVERTIME_COST:
-				setRemainingOvertimeCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__WORK_VARIANCE:
-				setWorkVariance(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.RESOURCE__COST_VARIANCE:
-				setCostVariance(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.RESOURCE__SV:
-				setSV(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.RESOURCE__CV:
-				setCV(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.RESOURCE__ACWP:
-				setACWP(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.RESOURCE__CALENDAR_UID:
-				setCalendarUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__NOTES:
-				setNotes((String)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__BCWS:
-				setBCWS(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.RESOURCE__BCWP:
-				setBCWP(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.RESOURCE__IS_GENERIC:
-				setIsGeneric(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.RESOURCE__IS_INACTIVE:
-				setIsInactive(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.RESOURCE__IS_ENTERPRISE:
-				setIsEnterprise(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.RESOURCE__BOOKING_TYPE:
-				setBookingType((BigInteger)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__ACTUAL_WORK_PROTECTED:
-				setActualWorkProtected((Object)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__ACTUAL_OVERTIME_WORK_PROTECTED:
-				setActualOvertimeWorkProtected((Object)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__ACTIVE_DIRECTORY_GUID:
-				setActiveDirectoryGUID((String)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__CREATION_DATE:
-				setCreationDate((Object)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__EXTENDED_ATTRIBUTE:
-				getExtendedAttribute().clear();
-				getExtendedAttribute().addAll((Collection)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__BASELINE:
-				getBaseline().clear();
-				getBaseline().addAll((Collection)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__OUTLINE_CODE:
-				getOutlineCode().clear();
-				getOutlineCode().addAll((Collection)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__AVAILABILITY_PERIODS:
-				setAvailabilityPeriods((AvailabilityPeriods)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__RATES:
-				setRates((Rates)newValue);
-				return;
-			case MsprojectPackage.RESOURCE__TIMEPHASED_DATA:
-				getTimephasedData().clear();
-				getTimephasedData().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RESOURCE__UID:
-				setUID(UID_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__ID:
-				setID(ID_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__IS_NULL:
-				unsetIsNull();
-				return;
-			case MsprojectPackage.RESOURCE__INITIALS:
-				setInitials(INITIALS_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__PHONETICS:
-				setPhonetics(PHONETICS_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__NTACCOUNT:
-				setNTAccount(NTACCOUNT_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__MATERIAL_LABEL:
-				setMaterialLabel(MATERIAL_LABEL_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__CODE:
-				setCode(CODE_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__GROUP:
-				setGroup(GROUP_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__WORK_GROUP:
-				setWorkGroup(WORK_GROUP_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__EMAIL_ADDRESS:
-				setEmailAddress(EMAIL_ADDRESS_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__HYPERLINK:
-				setHyperlink(HYPERLINK_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__HYPERLINK_ADDRESS:
-				setHyperlinkAddress(HYPERLINK_ADDRESS_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__HYPERLINK_SUB_ADDRESS:
-				setHyperlinkSubAddress(HYPERLINK_SUB_ADDRESS_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__MAX_UNITS:
-				unsetMaxUnits();
-				return;
-			case MsprojectPackage.RESOURCE__PEAK_UNITS:
-				unsetPeakUnits();
-				return;
-			case MsprojectPackage.RESOURCE__OVER_ALLOCATED:
-				unsetOverAllocated();
-				return;
-			case MsprojectPackage.RESOURCE__AVAILABLE_FROM:
-				setAvailableFrom(AVAILABLE_FROM_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__AVAILABLE_TO:
-				setAvailableTo(AVAILABLE_TO_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__START:
-				setStart(START_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__FINISH:
-				setFinish(FINISH_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__CAN_LEVEL:
-				unsetCanLevel();
-				return;
-			case MsprojectPackage.RESOURCE__ACCRUE_AT:
-				setAccrueAt(ACCRUE_AT_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__WORK:
-				setWork(WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__REGULAR_WORK:
-				setRegularWork(REGULAR_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__OVERTIME_WORK:
-				setOvertimeWork(OVERTIME_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__ACTUAL_WORK:
-				setActualWork(ACTUAL_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__REMAINING_WORK:
-				setRemainingWork(REMAINING_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__ACTUAL_OVERTIME_WORK:
-				setActualOvertimeWork(ACTUAL_OVERTIME_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__REMAINING_OVERTIME_WORK:
-				setRemainingOvertimeWork(REMAINING_OVERTIME_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__PERCENT_WORK_COMPLETE:
-				setPercentWorkComplete(PERCENT_WORK_COMPLETE_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__STANDARD_RATE:
-				setStandardRate(STANDARD_RATE_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__STANDARD_RATE_FORMAT:
-				setStandardRateFormat(STANDARD_RATE_FORMAT_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__COST:
-				setCost(COST_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__OVERTIME_RATE:
-				setOvertimeRate(OVERTIME_RATE_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__OVERTIME_RATE_FORMAT:
-				setOvertimeRateFormat(OVERTIME_RATE_FORMAT_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__OVERTIME_COST:
-				setOvertimeCost(OVERTIME_COST_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__COST_PER_USE:
-				setCostPerUse(COST_PER_USE_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__ACTUAL_COST:
-				setActualCost(ACTUAL_COST_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__ACTUAL_OVERTIME_COST:
-				setActualOvertimeCost(ACTUAL_OVERTIME_COST_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__REMAINING_COST:
-				setRemainingCost(REMAINING_COST_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__REMAINING_OVERTIME_COST:
-				setRemainingOvertimeCost(REMAINING_OVERTIME_COST_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__WORK_VARIANCE:
-				unsetWorkVariance();
-				return;
-			case MsprojectPackage.RESOURCE__COST_VARIANCE:
-				unsetCostVariance();
-				return;
-			case MsprojectPackage.RESOURCE__SV:
-				unsetSV();
-				return;
-			case MsprojectPackage.RESOURCE__CV:
-				unsetCV();
-				return;
-			case MsprojectPackage.RESOURCE__ACWP:
-				unsetACWP();
-				return;
-			case MsprojectPackage.RESOURCE__CALENDAR_UID:
-				setCalendarUID(CALENDAR_UID_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__NOTES:
-				setNotes(NOTES_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__BCWS:
-				unsetBCWS();
-				return;
-			case MsprojectPackage.RESOURCE__BCWP:
-				unsetBCWP();
-				return;
-			case MsprojectPackage.RESOURCE__IS_GENERIC:
-				unsetIsGeneric();
-				return;
-			case MsprojectPackage.RESOURCE__IS_INACTIVE:
-				unsetIsInactive();
-				return;
-			case MsprojectPackage.RESOURCE__IS_ENTERPRISE:
-				unsetIsEnterprise();
-				return;
-			case MsprojectPackage.RESOURCE__BOOKING_TYPE:
-				setBookingType(BOOKING_TYPE_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__ACTUAL_WORK_PROTECTED:
-				setActualWorkProtected(ACTUAL_WORK_PROTECTED_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__ACTUAL_OVERTIME_WORK_PROTECTED:
-				setActualOvertimeWorkProtected(ACTUAL_OVERTIME_WORK_PROTECTED_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__ACTIVE_DIRECTORY_GUID:
-				setActiveDirectoryGUID(ACTIVE_DIRECTORY_GUID_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__CREATION_DATE:
-				setCreationDate(CREATION_DATE_EDEFAULT);
-				return;
-			case MsprojectPackage.RESOURCE__EXTENDED_ATTRIBUTE:
-				getExtendedAttribute().clear();
-				return;
-			case MsprojectPackage.RESOURCE__BASELINE:
-				getBaseline().clear();
-				return;
-			case MsprojectPackage.RESOURCE__OUTLINE_CODE:
-				getOutlineCode().clear();
-				return;
-			case MsprojectPackage.RESOURCE__AVAILABILITY_PERIODS:
-				setAvailabilityPeriods((AvailabilityPeriods)null);
-				return;
-			case MsprojectPackage.RESOURCE__RATES:
-				setRates((Rates)null);
-				return;
-			case MsprojectPackage.RESOURCE__TIMEPHASED_DATA:
-				getTimephasedData().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RESOURCE__UID:
-				return UID_EDEFAULT == null ? uID != null : !UID_EDEFAULT.equals(uID);
-			case MsprojectPackage.RESOURCE__ID:
-				return ID_EDEFAULT == null ? iD != null : !ID_EDEFAULT.equals(iD);
-			case MsprojectPackage.RESOURCE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case MsprojectPackage.RESOURCE__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case MsprojectPackage.RESOURCE__IS_NULL:
-				return isSetIsNull();
-			case MsprojectPackage.RESOURCE__INITIALS:
-				return INITIALS_EDEFAULT == null ? initials != null : !INITIALS_EDEFAULT.equals(initials);
-			case MsprojectPackage.RESOURCE__PHONETICS:
-				return PHONETICS_EDEFAULT == null ? phonetics != null : !PHONETICS_EDEFAULT.equals(phonetics);
-			case MsprojectPackage.RESOURCE__NTACCOUNT:
-				return NTACCOUNT_EDEFAULT == null ? nTAccount != null : !NTACCOUNT_EDEFAULT.equals(nTAccount);
-			case MsprojectPackage.RESOURCE__MATERIAL_LABEL:
-				return MATERIAL_LABEL_EDEFAULT == null ? materialLabel != null : !MATERIAL_LABEL_EDEFAULT.equals(materialLabel);
-			case MsprojectPackage.RESOURCE__CODE:
-				return CODE_EDEFAULT == null ? code != null : !CODE_EDEFAULT.equals(code);
-			case MsprojectPackage.RESOURCE__GROUP:
-				return GROUP_EDEFAULT == null ? group != null : !GROUP_EDEFAULT.equals(group);
-			case MsprojectPackage.RESOURCE__WORK_GROUP:
-				return WORK_GROUP_EDEFAULT == null ? workGroup != null : !WORK_GROUP_EDEFAULT.equals(workGroup);
-			case MsprojectPackage.RESOURCE__EMAIL_ADDRESS:
-				return EMAIL_ADDRESS_EDEFAULT == null ? emailAddress != null : !EMAIL_ADDRESS_EDEFAULT.equals(emailAddress);
-			case MsprojectPackage.RESOURCE__HYPERLINK:
-				return HYPERLINK_EDEFAULT == null ? hyperlink != null : !HYPERLINK_EDEFAULT.equals(hyperlink);
-			case MsprojectPackage.RESOURCE__HYPERLINK_ADDRESS:
-				return HYPERLINK_ADDRESS_EDEFAULT == null ? hyperlinkAddress != null : !HYPERLINK_ADDRESS_EDEFAULT.equals(hyperlinkAddress);
-			case MsprojectPackage.RESOURCE__HYPERLINK_SUB_ADDRESS:
-				return HYPERLINK_SUB_ADDRESS_EDEFAULT == null ? hyperlinkSubAddress != null : !HYPERLINK_SUB_ADDRESS_EDEFAULT.equals(hyperlinkSubAddress);
-			case MsprojectPackage.RESOURCE__MAX_UNITS:
-				return isSetMaxUnits();
-			case MsprojectPackage.RESOURCE__PEAK_UNITS:
-				return isSetPeakUnits();
-			case MsprojectPackage.RESOURCE__OVER_ALLOCATED:
-				return isSetOverAllocated();
-			case MsprojectPackage.RESOURCE__AVAILABLE_FROM:
-				return AVAILABLE_FROM_EDEFAULT == null ? availableFrom != null : !AVAILABLE_FROM_EDEFAULT.equals(availableFrom);
-			case MsprojectPackage.RESOURCE__AVAILABLE_TO:
-				return AVAILABLE_TO_EDEFAULT == null ? availableTo != null : !AVAILABLE_TO_EDEFAULT.equals(availableTo);
-			case MsprojectPackage.RESOURCE__START:
-				return START_EDEFAULT == null ? start != null : !START_EDEFAULT.equals(start);
-			case MsprojectPackage.RESOURCE__FINISH:
-				return FINISH_EDEFAULT == null ? finish != null : !FINISH_EDEFAULT.equals(finish);
-			case MsprojectPackage.RESOURCE__CAN_LEVEL:
-				return isSetCanLevel();
-			case MsprojectPackage.RESOURCE__ACCRUE_AT:
-				return ACCRUE_AT_EDEFAULT == null ? accrueAt != null : !ACCRUE_AT_EDEFAULT.equals(accrueAt);
-			case MsprojectPackage.RESOURCE__WORK:
-				return WORK_EDEFAULT == null ? work != null : !WORK_EDEFAULT.equals(work);
-			case MsprojectPackage.RESOURCE__REGULAR_WORK:
-				return REGULAR_WORK_EDEFAULT == null ? regularWork != null : !REGULAR_WORK_EDEFAULT.equals(regularWork);
-			case MsprojectPackage.RESOURCE__OVERTIME_WORK:
-				return OVERTIME_WORK_EDEFAULT == null ? overtimeWork != null : !OVERTIME_WORK_EDEFAULT.equals(overtimeWork);
-			case MsprojectPackage.RESOURCE__ACTUAL_WORK:
-				return ACTUAL_WORK_EDEFAULT == null ? actualWork != null : !ACTUAL_WORK_EDEFAULT.equals(actualWork);
-			case MsprojectPackage.RESOURCE__REMAINING_WORK:
-				return REMAINING_WORK_EDEFAULT == null ? remainingWork != null : !REMAINING_WORK_EDEFAULT.equals(remainingWork);
-			case MsprojectPackage.RESOURCE__ACTUAL_OVERTIME_WORK:
-				return ACTUAL_OVERTIME_WORK_EDEFAULT == null ? actualOvertimeWork != null : !ACTUAL_OVERTIME_WORK_EDEFAULT.equals(actualOvertimeWork);
-			case MsprojectPackage.RESOURCE__REMAINING_OVERTIME_WORK:
-				return REMAINING_OVERTIME_WORK_EDEFAULT == null ? remainingOvertimeWork != null : !REMAINING_OVERTIME_WORK_EDEFAULT.equals(remainingOvertimeWork);
-			case MsprojectPackage.RESOURCE__PERCENT_WORK_COMPLETE:
-				return PERCENT_WORK_COMPLETE_EDEFAULT == null ? percentWorkComplete != null : !PERCENT_WORK_COMPLETE_EDEFAULT.equals(percentWorkComplete);
-			case MsprojectPackage.RESOURCE__STANDARD_RATE:
-				return STANDARD_RATE_EDEFAULT == null ? standardRate != null : !STANDARD_RATE_EDEFAULT.equals(standardRate);
-			case MsprojectPackage.RESOURCE__STANDARD_RATE_FORMAT:
-				return STANDARD_RATE_FORMAT_EDEFAULT == null ? standardRateFormat != null : !STANDARD_RATE_FORMAT_EDEFAULT.equals(standardRateFormat);
-			case MsprojectPackage.RESOURCE__COST:
-				return COST_EDEFAULT == null ? cost != null : !COST_EDEFAULT.equals(cost);
-			case MsprojectPackage.RESOURCE__OVERTIME_RATE:
-				return OVERTIME_RATE_EDEFAULT == null ? overtimeRate != null : !OVERTIME_RATE_EDEFAULT.equals(overtimeRate);
-			case MsprojectPackage.RESOURCE__OVERTIME_RATE_FORMAT:
-				return OVERTIME_RATE_FORMAT_EDEFAULT == null ? overtimeRateFormat != null : !OVERTIME_RATE_FORMAT_EDEFAULT.equals(overtimeRateFormat);
-			case MsprojectPackage.RESOURCE__OVERTIME_COST:
-				return OVERTIME_COST_EDEFAULT == null ? overtimeCost != null : !OVERTIME_COST_EDEFAULT.equals(overtimeCost);
-			case MsprojectPackage.RESOURCE__COST_PER_USE:
-				return COST_PER_USE_EDEFAULT == null ? costPerUse != null : !COST_PER_USE_EDEFAULT.equals(costPerUse);
-			case MsprojectPackage.RESOURCE__ACTUAL_COST:
-				return ACTUAL_COST_EDEFAULT == null ? actualCost != null : !ACTUAL_COST_EDEFAULT.equals(actualCost);
-			case MsprojectPackage.RESOURCE__ACTUAL_OVERTIME_COST:
-				return ACTUAL_OVERTIME_COST_EDEFAULT == null ? actualOvertimeCost != null : !ACTUAL_OVERTIME_COST_EDEFAULT.equals(actualOvertimeCost);
-			case MsprojectPackage.RESOURCE__REMAINING_COST:
-				return REMAINING_COST_EDEFAULT == null ? remainingCost != null : !REMAINING_COST_EDEFAULT.equals(remainingCost);
-			case MsprojectPackage.RESOURCE__REMAINING_OVERTIME_COST:
-				return REMAINING_OVERTIME_COST_EDEFAULT == null ? remainingOvertimeCost != null : !REMAINING_OVERTIME_COST_EDEFAULT.equals(remainingOvertimeCost);
-			case MsprojectPackage.RESOURCE__WORK_VARIANCE:
-				return isSetWorkVariance();
-			case MsprojectPackage.RESOURCE__COST_VARIANCE:
-				return isSetCostVariance();
-			case MsprojectPackage.RESOURCE__SV:
-				return isSetSV();
-			case MsprojectPackage.RESOURCE__CV:
-				return isSetCV();
-			case MsprojectPackage.RESOURCE__ACWP:
-				return isSetACWP();
-			case MsprojectPackage.RESOURCE__CALENDAR_UID:
-				return CALENDAR_UID_EDEFAULT == null ? calendarUID != null : !CALENDAR_UID_EDEFAULT.equals(calendarUID);
-			case MsprojectPackage.RESOURCE__NOTES:
-				return NOTES_EDEFAULT == null ? notes != null : !NOTES_EDEFAULT.equals(notes);
-			case MsprojectPackage.RESOURCE__BCWS:
-				return isSetBCWS();
-			case MsprojectPackage.RESOURCE__BCWP:
-				return isSetBCWP();
-			case MsprojectPackage.RESOURCE__IS_GENERIC:
-				return isSetIsGeneric();
-			case MsprojectPackage.RESOURCE__IS_INACTIVE:
-				return isSetIsInactive();
-			case MsprojectPackage.RESOURCE__IS_ENTERPRISE:
-				return isSetIsEnterprise();
-			case MsprojectPackage.RESOURCE__BOOKING_TYPE:
-				return BOOKING_TYPE_EDEFAULT == null ? bookingType != null : !BOOKING_TYPE_EDEFAULT.equals(bookingType);
-			case MsprojectPackage.RESOURCE__ACTUAL_WORK_PROTECTED:
-				return ACTUAL_WORK_PROTECTED_EDEFAULT == null ? actualWorkProtected != null : !ACTUAL_WORK_PROTECTED_EDEFAULT.equals(actualWorkProtected);
-			case MsprojectPackage.RESOURCE__ACTUAL_OVERTIME_WORK_PROTECTED:
-				return ACTUAL_OVERTIME_WORK_PROTECTED_EDEFAULT == null ? actualOvertimeWorkProtected != null : !ACTUAL_OVERTIME_WORK_PROTECTED_EDEFAULT.equals(actualOvertimeWorkProtected);
-			case MsprojectPackage.RESOURCE__ACTIVE_DIRECTORY_GUID:
-				return ACTIVE_DIRECTORY_GUID_EDEFAULT == null ? activeDirectoryGUID != null : !ACTIVE_DIRECTORY_GUID_EDEFAULT.equals(activeDirectoryGUID);
-			case MsprojectPackage.RESOURCE__CREATION_DATE:
-				return CREATION_DATE_EDEFAULT == null ? creationDate != null : !CREATION_DATE_EDEFAULT.equals(creationDate);
-			case MsprojectPackage.RESOURCE__EXTENDED_ATTRIBUTE:
-				return extendedAttribute != null && !extendedAttribute.isEmpty();
-			case MsprojectPackage.RESOURCE__BASELINE:
-				return baseline != null && !baseline.isEmpty();
-			case MsprojectPackage.RESOURCE__OUTLINE_CODE:
-				return outlineCode != null && !outlineCode.isEmpty();
-			case MsprojectPackage.RESOURCE__AVAILABILITY_PERIODS:
-				return availabilityPeriods != null;
-			case MsprojectPackage.RESOURCE__RATES:
-				return rates != null;
-			case MsprojectPackage.RESOURCE__TIMEPHASED_DATA:
-				return timephasedData != null && !timephasedData.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (uID: ");
-		result.append(uID);
-		result.append(", iD: ");
-		result.append(iD);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", type: ");
-		result.append(type);
-		result.append(", isNull: ");
-		if (isNullESet) result.append(isNull); else result.append("<unset>");
-		result.append(", initials: ");
-		result.append(initials);
-		result.append(", phonetics: ");
-		result.append(phonetics);
-		result.append(", nTAccount: ");
-		result.append(nTAccount);
-		result.append(", materialLabel: ");
-		result.append(materialLabel);
-		result.append(", code: ");
-		result.append(code);
-		result.append(", group: ");
-		result.append(group);
-		result.append(", workGroup: ");
-		result.append(workGroup);
-		result.append(", emailAddress: ");
-		result.append(emailAddress);
-		result.append(", hyperlink: ");
-		result.append(hyperlink);
-		result.append(", hyperlinkAddress: ");
-		result.append(hyperlinkAddress);
-		result.append(", hyperlinkSubAddress: ");
-		result.append(hyperlinkSubAddress);
-		result.append(", maxUnits: ");
-		if (maxUnitsESet) result.append(maxUnits); else result.append("<unset>");
-		result.append(", peakUnits: ");
-		if (peakUnitsESet) result.append(peakUnits); else result.append("<unset>");
-		result.append(", overAllocated: ");
-		if (overAllocatedESet) result.append(overAllocated); else result.append("<unset>");
-		result.append(", availableFrom: ");
-		result.append(availableFrom);
-		result.append(", availableTo: ");
-		result.append(availableTo);
-		result.append(", start: ");
-		result.append(start);
-		result.append(", finish: ");
-		result.append(finish);
-		result.append(", canLevel: ");
-		if (canLevelESet) result.append(canLevel); else result.append("<unset>");
-		result.append(", accrueAt: ");
-		result.append(accrueAt);
-		result.append(", work: ");
-		result.append(work);
-		result.append(", regularWork: ");
-		result.append(regularWork);
-		result.append(", overtimeWork: ");
-		result.append(overtimeWork);
-		result.append(", actualWork: ");
-		result.append(actualWork);
-		result.append(", remainingWork: ");
-		result.append(remainingWork);
-		result.append(", actualOvertimeWork: ");
-		result.append(actualOvertimeWork);
-		result.append(", remainingOvertimeWork: ");
-		result.append(remainingOvertimeWork);
-		result.append(", percentWorkComplete: ");
-		result.append(percentWorkComplete);
-		result.append(", standardRate: ");
-		result.append(standardRate);
-		result.append(", standardRateFormat: ");
-		result.append(standardRateFormat);
-		result.append(", cost: ");
-		result.append(cost);
-		result.append(", overtimeRate: ");
-		result.append(overtimeRate);
-		result.append(", overtimeRateFormat: ");
-		result.append(overtimeRateFormat);
-		result.append(", overtimeCost: ");
-		result.append(overtimeCost);
-		result.append(", costPerUse: ");
-		result.append(costPerUse);
-		result.append(", actualCost: ");
-		result.append(actualCost);
-		result.append(", actualOvertimeCost: ");
-		result.append(actualOvertimeCost);
-		result.append(", remainingCost: ");
-		result.append(remainingCost);
-		result.append(", remainingOvertimeCost: ");
-		result.append(remainingOvertimeCost);
-		result.append(", workVariance: ");
-		if (workVarianceESet) result.append(workVariance); else result.append("<unset>");
-		result.append(", costVariance: ");
-		if (costVarianceESet) result.append(costVariance); else result.append("<unset>");
-		result.append(", sV: ");
-		if (sVESet) result.append(sV); else result.append("<unset>");
-		result.append(", cV: ");
-		if (cVESet) result.append(cV); else result.append("<unset>");
-		result.append(", aCWP: ");
-		if (aCWPESet) result.append(aCWP); else result.append("<unset>");
-		result.append(", calendarUID: ");
-		result.append(calendarUID);
-		result.append(", notes: ");
-		result.append(notes);
-		result.append(", bCWS: ");
-		if (bCWSESet) result.append(bCWS); else result.append("<unset>");
-		result.append(", bCWP: ");
-		if (bCWPESet) result.append(bCWP); else result.append("<unset>");
-		result.append(", isGeneric: ");
-		if (isGenericESet) result.append(isGeneric); else result.append("<unset>");
-		result.append(", isInactive: ");
-		if (isInactiveESet) result.append(isInactive); else result.append("<unset>");
-		result.append(", isEnterprise: ");
-		if (isEnterpriseESet) result.append(isEnterprise); else result.append("<unset>");
-		result.append(", bookingType: ");
-		result.append(bookingType);
-		result.append(", actualWorkProtected: ");
-		result.append(actualWorkProtected);
-		result.append(", actualOvertimeWorkProtected: ");
-		result.append(actualOvertimeWorkProtected);
-		result.append(", activeDirectoryGUID: ");
-		result.append(activeDirectoryGUID);
-		result.append(", creationDate: ");
-		result.append(creationDate);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ResourceImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ResourcesImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ResourcesImpl.java
deleted file mode 100755
index 9e9c039..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ResourcesImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ResourcesImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.Resource;
-import org.eclipse.epf.msproject.Resources;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Resources</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.ResourcesImpl#getResource <em>Resource</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ResourcesImpl extends EObjectImpl implements Resources {
-	/**
-	 * The cached value of the '{@link #getResource() <em>Resource</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResource()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList resource = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ResourcesImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getResources();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getResource() {
-		if (resource == null) {
-			resource = new EObjectContainmentEList(Resource.class, this, MsprojectPackage.RESOURCES__RESOURCE);
-		}
-		return resource;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.RESOURCES__RESOURCE:
-					return ((InternalEList)getResource()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RESOURCES__RESOURCE:
-				return getResource();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RESOURCES__RESOURCE:
-				getResource().clear();
-				getResource().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RESOURCES__RESOURCE:
-				getResource().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.RESOURCES__RESOURCE:
-				return resource != null && !resource.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //ResourcesImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/TaskImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/TaskImpl.java
deleted file mode 100755
index 9d61907..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/TaskImpl.java
+++ /dev/null
@@ -1,5740 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaskImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.Baseline;
-import org.eclipse.epf.msproject.ExtendedAttribute2;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.OutlineCode2;
-import org.eclipse.epf.msproject.PredecessorLink;
-import org.eclipse.epf.msproject.Task;
-import org.eclipse.epf.msproject.TimephasedDataType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Task</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getID <em>ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isIsNull <em>Is Null</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getCreateDate <em>Create Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getContact <em>Contact</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getWBS <em>WBS</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getWBSLevel <em>WBS Level</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getOutlineNumber <em>Outline Number</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getOutlineLevel <em>Outline Level</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getPriority <em>Priority</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getFinish <em>Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getDuration <em>Duration</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getDurationFormat <em>Duration Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getWork <em>Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getStop <em>Stop</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getResume <em>Resume</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isResumeValid <em>Resume Valid</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isEffortDriven <em>Effort Driven</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isRecurring <em>Recurring</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isOverAllocated <em>Over Allocated</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isEstimated <em>Estimated</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isMilestone <em>Milestone</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isSummary <em>Summary</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isCritical <em>Critical</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isIsSubproject <em>Is Subproject</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isIsSubprojectReadOnly <em>Is Subproject Read Only</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getSubprojectName <em>Subproject Name</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isExternalTask <em>External Task</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getExternalTaskProject <em>External Task Project</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getEarlyStart <em>Early Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getEarlyFinish <em>Early Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getLateStart <em>Late Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getLateFinish <em>Late Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getStartVariance <em>Start Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getFinishVariance <em>Finish Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getWorkVariance <em>Work Variance</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getFreeSlack <em>Free Slack</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getTotalSlack <em>Total Slack</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getFixedCost <em>Fixed Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getFixedCostAccrual <em>Fixed Cost Accrual</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getPercentComplete <em>Percent Complete</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getPercentWorkComplete <em>Percent Work Complete</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getCost <em>Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getOvertimeCost <em>Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getOvertimeWork <em>Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getActualStart <em>Actual Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getActualFinish <em>Actual Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getActualDuration <em>Actual Duration</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getActualCost <em>Actual Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getActualOvertimeCost <em>Actual Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getActualWork <em>Actual Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getActualOvertimeWork <em>Actual Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getRegularWork <em>Regular Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getRemainingDuration <em>Remaining Duration</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getRemainingCost <em>Remaining Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getRemainingWork <em>Remaining Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getRemainingOvertimeCost <em>Remaining Overtime Cost</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getRemainingOvertimeWork <em>Remaining Overtime Work</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getACWP <em>ACWP</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getCV <em>CV</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getConstraintType <em>Constraint Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getCalendarUID <em>Calendar UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getConstraintDate <em>Constraint Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getDeadline <em>Deadline</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isLevelAssignments <em>Level Assignments</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isLevelingCanSplit <em>Leveling Can Split</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getLevelingDelay <em>Leveling Delay</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getLevelingDelayFormat <em>Leveling Delay Format</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getPreLeveledStart <em>Pre Leveled Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getPreLeveledFinish <em>Pre Leveled Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getHyperlink <em>Hyperlink</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getHyperlinkAddress <em>Hyperlink Address</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getHyperlinkSubAddress <em>Hyperlink Sub Address</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isIgnoreResourceCalendar <em>Ignore Resource Calendar</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getNotes <em>Notes</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isHideBar <em>Hide Bar</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#isRollup <em>Rollup</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getBCWS <em>BCWS</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getBCWP <em>BCWP</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getPhysicalPercentComplete <em>Physical Percent Complete</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getEarnedValueMethod <em>Earned Value Method</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getPredecessorLink <em>Predecessor Link</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getActualWorkProtected <em>Actual Work Protected</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getActualOvertimeWorkProtected <em>Actual Overtime Work Protected</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getExtendedAttribute <em>Extended Attribute</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getBaseline <em>Baseline</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getOutlineCode <em>Outline Code</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TaskImpl#getTimephasedData <em>Timephased Data</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TaskImpl extends EObjectImpl implements Task {
-	/**
-	 * The default value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger uID = UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getID() <em>ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getID() <em>ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger iD = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger type = TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isIsNull() <em>Is Null</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsNull()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_NULL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsNull() <em>Is Null</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsNull()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isNull = IS_NULL_EDEFAULT;
-
-	/**
-	 * This is true if the Is Null attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isNullESet = false;
-
-	/**
-	 * The default value of the '{@link #getCreateDate() <em>Create Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreateDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object CREATE_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCreateDate() <em>Create Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreateDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object createDate = CREATE_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getContact() <em>Contact</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContact()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONTACT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getContact() <em>Contact</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContact()
-	 * @generated
-	 * @ordered
-	 */
-	protected String contact = CONTACT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWBS() <em>WBS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWBS()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String WBS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWBS() <em>WBS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWBS()
-	 * @generated
-	 * @ordered
-	 */
-	protected String wBS = WBS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWBSLevel() <em>WBS Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWBSLevel()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String WBS_LEVEL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWBSLevel() <em>WBS Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWBSLevel()
-	 * @generated
-	 * @ordered
-	 */
-	protected String wBSLevel = WBS_LEVEL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOutlineNumber() <em>Outline Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutlineNumber()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OUTLINE_NUMBER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOutlineNumber() <em>Outline Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutlineNumber()
-	 * @generated
-	 * @ordered
-	 */
-	protected String outlineNumber = OUTLINE_NUMBER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOutlineLevel() <em>Outline Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutlineLevel()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger OUTLINE_LEVEL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOutlineLevel() <em>Outline Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutlineLevel()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger outlineLevel = OUTLINE_LEVEL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPriority() <em>Priority</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPriority()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger PRIORITY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPriority() <em>Priority</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPriority()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger priority = PRIORITY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStart() <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object START_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStart() <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object start = START_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFinish() <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object FINISH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFinish() <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object finish = FINISH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDuration() <em>Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDuration()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object DURATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDuration() <em>Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDuration()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object duration = DURATION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDurationFormat() <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDurationFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger DURATION_FORMAT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDurationFormat() <em>Duration Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDurationFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger durationFormat = DURATION_FORMAT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWork() <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWork() <em>Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object work = WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStop() <em>Stop</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStop()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object STOP_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStop() <em>Stop</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStop()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object stop = STOP_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getResume() <em>Resume</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResume()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object RESUME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getResume() <em>Resume</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResume()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object resume = RESUME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isResumeValid() <em>Resume Valid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isResumeValid()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean RESUME_VALID_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isResumeValid() <em>Resume Valid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isResumeValid()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean resumeValid = RESUME_VALID_EDEFAULT;
-
-	/**
-	 * This is true if the Resume Valid attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean resumeValidESet = false;
-
-	/**
-	 * The default value of the '{@link #isEffortDriven() <em>Effort Driven</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEffortDriven()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EFFORT_DRIVEN_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isEffortDriven() <em>Effort Driven</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEffortDriven()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean effortDriven = EFFORT_DRIVEN_EDEFAULT;
-
-	/**
-	 * This is true if the Effort Driven attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean effortDrivenESet = false;
-
-	/**
-	 * The default value of the '{@link #isRecurring() <em>Recurring</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRecurring()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean RECURRING_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isRecurring() <em>Recurring</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRecurring()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean recurring = RECURRING_EDEFAULT;
-
-	/**
-	 * This is true if the Recurring attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean recurringESet = false;
-
-	/**
-	 * The default value of the '{@link #isOverAllocated() <em>Over Allocated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isOverAllocated()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean OVER_ALLOCATED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isOverAllocated() <em>Over Allocated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isOverAllocated()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean overAllocated = OVER_ALLOCATED_EDEFAULT;
-
-	/**
-	 * This is true if the Over Allocated attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean overAllocatedESet = false;
-
-	/**
-	 * The default value of the '{@link #isEstimated() <em>Estimated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEstimated()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ESTIMATED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isEstimated() <em>Estimated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEstimated()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean estimated = ESTIMATED_EDEFAULT;
-
-	/**
-	 * This is true if the Estimated attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean estimatedESet = false;
-
-	/**
-	 * The default value of the '{@link #isMilestone() <em>Milestone</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMilestone()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MILESTONE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isMilestone() <em>Milestone</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMilestone()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean milestone = MILESTONE_EDEFAULT;
-
-	/**
-	 * This is true if the Milestone attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean milestoneESet = false;
-
-	/**
-	 * The default value of the '{@link #isSummary() <em>Summary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSummary()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SUMMARY_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isSummary() <em>Summary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSummary()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean summary = SUMMARY_EDEFAULT;
-
-	/**
-	 * This is true if the Summary attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean summaryESet = false;
-
-	/**
-	 * The default value of the '{@link #isCritical() <em>Critical</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCritical()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CRITICAL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isCritical() <em>Critical</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCritical()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean critical = CRITICAL_EDEFAULT;
-
-	/**
-	 * This is true if the Critical attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean criticalESet = false;
-
-	/**
-	 * The default value of the '{@link #isIsSubproject() <em>Is Subproject</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSubproject()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_SUBPROJECT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsSubproject() <em>Is Subproject</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSubproject()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isSubproject = IS_SUBPROJECT_EDEFAULT;
-
-	/**
-	 * This is true if the Is Subproject attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isSubprojectESet = false;
-
-	/**
-	 * The default value of the '{@link #isIsSubprojectReadOnly() <em>Is Subproject Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSubprojectReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_SUBPROJECT_READ_ONLY_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsSubprojectReadOnly() <em>Is Subproject Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSubprojectReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isSubprojectReadOnly = IS_SUBPROJECT_READ_ONLY_EDEFAULT;
-
-	/**
-	 * This is true if the Is Subproject Read Only attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isSubprojectReadOnlyESet = false;
-
-	/**
-	 * The default value of the '{@link #getSubprojectName() <em>Subproject Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubprojectName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SUBPROJECT_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSubprojectName() <em>Subproject Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubprojectName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String subprojectName = SUBPROJECT_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isExternalTask() <em>External Task</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExternalTask()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EXTERNAL_TASK_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isExternalTask() <em>External Task</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExternalTask()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean externalTask = EXTERNAL_TASK_EDEFAULT;
-
-	/**
-	 * This is true if the External Task attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean externalTaskESet = false;
-
-	/**
-	 * The default value of the '{@link #getExternalTaskProject() <em>External Task Project</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExternalTaskProject()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXTERNAL_TASK_PROJECT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExternalTaskProject() <em>External Task Project</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExternalTaskProject()
-	 * @generated
-	 * @ordered
-	 */
-	protected String externalTaskProject = EXTERNAL_TASK_PROJECT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEarlyStart() <em>Early Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEarlyStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object EARLY_START_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEarlyStart() <em>Early Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEarlyStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object earlyStart = EARLY_START_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEarlyFinish() <em>Early Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEarlyFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object EARLY_FINISH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEarlyFinish() <em>Early Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEarlyFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object earlyFinish = EARLY_FINISH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLateStart() <em>Late Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLateStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object LATE_START_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLateStart() <em>Late Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLateStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object lateStart = LATE_START_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLateFinish() <em>Late Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLateFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object LATE_FINISH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLateFinish() <em>Late Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLateFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object lateFinish = LATE_FINISH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStartVariance() <em>Start Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStartVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger START_VARIANCE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStartVariance() <em>Start Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStartVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger startVariance = START_VARIANCE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFinishVariance() <em>Finish Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinishVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger FINISH_VARIANCE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFinishVariance() <em>Finish Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinishVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger finishVariance = FINISH_VARIANCE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWorkVariance() <em>Work Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float WORK_VARIANCE_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getWorkVariance() <em>Work Variance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkVariance()
-	 * @generated
-	 * @ordered
-	 */
-	protected float workVariance = WORK_VARIANCE_EDEFAULT;
-
-	/**
-	 * This is true if the Work Variance attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean workVarianceESet = false;
-
-	/**
-	 * The default value of the '{@link #getFreeSlack() <em>Free Slack</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFreeSlack()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger FREE_SLACK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFreeSlack() <em>Free Slack</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFreeSlack()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger freeSlack = FREE_SLACK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTotalSlack() <em>Total Slack</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTotalSlack()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger TOTAL_SLACK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTotalSlack() <em>Total Slack</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTotalSlack()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger totalSlack = TOTAL_SLACK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFixedCost() <em>Fixed Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFixedCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float FIXED_COST_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getFixedCost() <em>Fixed Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFixedCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected float fixedCost = FIXED_COST_EDEFAULT;
-
-	/**
-	 * This is true if the Fixed Cost attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean fixedCostESet = false;
-
-	/**
-	 * The default value of the '{@link #getFixedCostAccrual() <em>Fixed Cost Accrual</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFixedCostAccrual()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FIXED_COST_ACCRUAL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFixedCostAccrual() <em>Fixed Cost Accrual</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFixedCostAccrual()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fixedCostAccrual = FIXED_COST_ACCRUAL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPercentComplete() <em>Percent Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPercentComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger PERCENT_COMPLETE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPercentComplete() <em>Percent Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPercentComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger percentComplete = PERCENT_COMPLETE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPercentWorkComplete() <em>Percent Work Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPercentWorkComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger PERCENT_WORK_COMPLETE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPercentWorkComplete() <em>Percent Work Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPercentWorkComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger percentWorkComplete = PERCENT_WORK_COMPLETE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCost() <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCost() <em>Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal cost = COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOvertimeCost() <em>Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal OVERTIME_COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOvertimeCost() <em>Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal overtimeCost = OVERTIME_COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOvertimeWork() <em>Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object OVERTIME_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOvertimeWork() <em>Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object overtimeWork = OVERTIME_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualStart() <em>Actual Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_START_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualStart() <em>Actual Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualStart = ACTUAL_START_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualFinish() <em>Actual Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_FINISH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualFinish() <em>Actual Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualFinish = ACTUAL_FINISH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualDuration() <em>Actual Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualDuration()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_DURATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualDuration() <em>Actual Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualDuration()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualDuration = ACTUAL_DURATION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualCost() <em>Actual Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal ACTUAL_COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualCost() <em>Actual Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal actualCost = ACTUAL_COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualOvertimeCost() <em>Actual Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal ACTUAL_OVERTIME_COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualOvertimeCost() <em>Actual Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal actualOvertimeCost = ACTUAL_OVERTIME_COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualWork() <em>Actual Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualWork() <em>Actual Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualWork = ACTUAL_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualOvertimeWork() <em>Actual Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_OVERTIME_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualOvertimeWork() <em>Actual Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualOvertimeWork = ACTUAL_OVERTIME_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRegularWork() <em>Regular Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRegularWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object REGULAR_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRegularWork() <em>Regular Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRegularWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object regularWork = REGULAR_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemainingDuration() <em>Remaining Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingDuration()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object REMAINING_DURATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemainingDuration() <em>Remaining Duration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingDuration()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object remainingDuration = REMAINING_DURATION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemainingCost() <em>Remaining Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal REMAINING_COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemainingCost() <em>Remaining Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal remainingCost = REMAINING_COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemainingWork() <em>Remaining Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object REMAINING_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemainingWork() <em>Remaining Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object remainingWork = REMAINING_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemainingOvertimeCost() <em>Remaining Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigDecimal REMAINING_OVERTIME_COST_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemainingOvertimeCost() <em>Remaining Overtime Cost</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingOvertimeCost()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigDecimal remainingOvertimeCost = REMAINING_OVERTIME_COST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRemainingOvertimeWork() <em>Remaining Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object REMAINING_OVERTIME_WORK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRemainingOvertimeWork() <em>Remaining Overtime Work</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemainingOvertimeWork()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object remainingOvertimeWork = REMAINING_OVERTIME_WORK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getACWP() <em>ACWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getACWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float ACWP_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getACWP() <em>ACWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getACWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected float aCWP = ACWP_EDEFAULT;
-
-	/**
-	 * This is true if the ACWP attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean aCWPESet = false;
-
-	/**
-	 * The default value of the '{@link #getCV() <em>CV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCV()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float CV_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getCV() <em>CV</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCV()
-	 * @generated
-	 * @ordered
-	 */
-	protected float cV = CV_EDEFAULT;
-
-	/**
-	 * This is true if the CV attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean cVESet = false;
-
-	/**
-	 * The default value of the '{@link #getConstraintType() <em>Constraint Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConstraintType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger CONSTRAINT_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConstraintType() <em>Constraint Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConstraintType()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger constraintType = CONSTRAINT_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCalendarUID() <em>Calendar UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCalendarUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger CALENDAR_UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCalendarUID() <em>Calendar UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCalendarUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger calendarUID = CALENDAR_UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getConstraintDate() <em>Constraint Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConstraintDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object CONSTRAINT_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConstraintDate() <em>Constraint Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConstraintDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object constraintDate = CONSTRAINT_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDeadline() <em>Deadline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDeadline()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object DEADLINE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDeadline() <em>Deadline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDeadline()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object deadline = DEADLINE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isLevelAssignments() <em>Level Assignments</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isLevelAssignments()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean LEVEL_ASSIGNMENTS_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isLevelAssignments() <em>Level Assignments</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isLevelAssignments()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean levelAssignments = LEVEL_ASSIGNMENTS_EDEFAULT;
-
-	/**
-	 * This is true if the Level Assignments attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean levelAssignmentsESet = false;
-
-	/**
-	 * The default value of the '{@link #isLevelingCanSplit() <em>Leveling Can Split</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isLevelingCanSplit()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean LEVELING_CAN_SPLIT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isLevelingCanSplit() <em>Leveling Can Split</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isLevelingCanSplit()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean levelingCanSplit = LEVELING_CAN_SPLIT_EDEFAULT;
-
-	/**
-	 * This is true if the Leveling Can Split attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean levelingCanSplitESet = false;
-
-	/**
-	 * The default value of the '{@link #getLevelingDelay() <em>Leveling Delay</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevelingDelay()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger LEVELING_DELAY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLevelingDelay() <em>Leveling Delay</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevelingDelay()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger levelingDelay = LEVELING_DELAY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLevelingDelayFormat() <em>Leveling Delay Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevelingDelayFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger LEVELING_DELAY_FORMAT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLevelingDelayFormat() <em>Leveling Delay Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevelingDelayFormat()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger levelingDelayFormat = LEVELING_DELAY_FORMAT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPreLeveledStart() <em>Pre Leveled Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreLeveledStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object PRE_LEVELED_START_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPreLeveledStart() <em>Pre Leveled Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreLeveledStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object preLeveledStart = PRE_LEVELED_START_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPreLeveledFinish() <em>Pre Leveled Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreLeveledFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object PRE_LEVELED_FINISH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPreLeveledFinish() <em>Pre Leveled Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreLeveledFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object preLeveledFinish = PRE_LEVELED_FINISH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHyperlink() <em>Hyperlink</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HYPERLINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHyperlink() <em>Hyperlink</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlink()
-	 * @generated
-	 * @ordered
-	 */
-	protected String hyperlink = HYPERLINK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHyperlinkAddress() <em>Hyperlink Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlinkAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HYPERLINK_ADDRESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHyperlinkAddress() <em>Hyperlink Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlinkAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected String hyperlinkAddress = HYPERLINK_ADDRESS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHyperlinkSubAddress() <em>Hyperlink Sub Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlinkSubAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HYPERLINK_SUB_ADDRESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHyperlinkSubAddress() <em>Hyperlink Sub Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHyperlinkSubAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected String hyperlinkSubAddress = HYPERLINK_SUB_ADDRESS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isIgnoreResourceCalendar() <em>Ignore Resource Calendar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIgnoreResourceCalendar()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IGNORE_RESOURCE_CALENDAR_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIgnoreResourceCalendar() <em>Ignore Resource Calendar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIgnoreResourceCalendar()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean ignoreResourceCalendar = IGNORE_RESOURCE_CALENDAR_EDEFAULT;
-
-	/**
-	 * This is true if the Ignore Resource Calendar attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean ignoreResourceCalendarESet = false;
-
-	/**
-	 * The default value of the '{@link #getNotes() <em>Notes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNotes()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NOTES_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNotes() <em>Notes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNotes()
-	 * @generated
-	 * @ordered
-	 */
-	protected String notes = NOTES_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isHideBar() <em>Hide Bar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHideBar()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean HIDE_BAR_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isHideBar() <em>Hide Bar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHideBar()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean hideBar = HIDE_BAR_EDEFAULT;
-
-	/**
-	 * This is true if the Hide Bar attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean hideBarESet = false;
-
-	/**
-	 * The default value of the '{@link #isRollup() <em>Rollup</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRollup()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ROLLUP_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isRollup() <em>Rollup</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRollup()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean rollup = ROLLUP_EDEFAULT;
-
-	/**
-	 * This is true if the Rollup attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean rollupESet = false;
-
-	/**
-	 * The default value of the '{@link #getBCWS() <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWS()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float BCWS_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getBCWS() <em>BCWS</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWS()
-	 * @generated
-	 * @ordered
-	 */
-	protected float bCWS = BCWS_EDEFAULT;
-
-	/**
-	 * This is true if the BCWS attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean bCWSESet = false;
-
-	/**
-	 * The default value of the '{@link #getBCWP() <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float BCWP_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getBCWP() <em>BCWP</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBCWP()
-	 * @generated
-	 * @ordered
-	 */
-	protected float bCWP = BCWP_EDEFAULT;
-
-	/**
-	 * This is true if the BCWP attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean bCWPESet = false;
-
-	/**
-	 * The default value of the '{@link #getPhysicalPercentComplete() <em>Physical Percent Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPhysicalPercentComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger PHYSICAL_PERCENT_COMPLETE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPhysicalPercentComplete() <em>Physical Percent Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPhysicalPercentComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger physicalPercentComplete = PHYSICAL_PERCENT_COMPLETE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEarnedValueMethod() <em>Earned Value Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEarnedValueMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger EARNED_VALUE_METHOD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEarnedValueMethod() <em>Earned Value Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEarnedValueMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger earnedValueMethod = EARNED_VALUE_METHOD_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPredecessorLink() <em>Predecessor Link</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPredecessorLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList predecessorLink = null;
-
-	/**
-	 * The default value of the '{@link #getActualWorkProtected() <em>Actual Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualWorkProtected()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_WORK_PROTECTED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualWorkProtected() <em>Actual Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualWorkProtected()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualWorkProtected = ACTUAL_WORK_PROTECTED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualOvertimeWorkProtected() <em>Actual Overtime Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeWorkProtected()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object ACTUAL_OVERTIME_WORK_PROTECTED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActualOvertimeWorkProtected() <em>Actual Overtime Work Protected</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualOvertimeWorkProtected()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object actualOvertimeWorkProtected = ACTUAL_OVERTIME_WORK_PROTECTED_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExtendedAttribute() <em>Extended Attribute</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExtendedAttribute()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList extendedAttribute = null;
-
-	/**
-	 * The cached value of the '{@link #getBaseline() <em>Baseline</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBaseline()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList baseline = null;
-
-	/**
-	 * The cached value of the '{@link #getOutlineCode() <em>Outline Code</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutlineCode()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList outlineCode = null;
-
-	/**
-	 * The cached value of the '{@link #getTimephasedData() <em>Timephased Data</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTimephasedData()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList timephasedData = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaskImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getTask();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getUID() {
-		return uID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUID(BigInteger newUID) {
-		BigInteger oldUID = uID;
-		uID = newUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__UID, oldUID, uID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getID() {
-		return iD;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setID(BigInteger newID) {
-		BigInteger oldID = iD;
-		iD = newID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__ID, oldID, iD));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(BigInteger newType) {
-		BigInteger oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsNull() {
-		return isNull;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsNull(boolean newIsNull) {
-		boolean oldIsNull = isNull;
-		isNull = newIsNull;
-		boolean oldIsNullESet = isNullESet;
-		isNullESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__IS_NULL, oldIsNull, isNull, !oldIsNullESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsNull() {
-		boolean oldIsNull = isNull;
-		boolean oldIsNullESet = isNullESet;
-		isNull = IS_NULL_EDEFAULT;
-		isNullESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__IS_NULL, oldIsNull, IS_NULL_EDEFAULT, oldIsNullESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsNull() {
-		return isNullESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getCreateDate() {
-		return createDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCreateDate(Object newCreateDate) {
-		Object oldCreateDate = createDate;
-		createDate = newCreateDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__CREATE_DATE, oldCreateDate, createDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getContact() {
-		return contact;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContact(String newContact) {
-		String oldContact = contact;
-		contact = newContact;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__CONTACT, oldContact, contact));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getWBS() {
-		return wBS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWBS(String newWBS) {
-		String oldWBS = wBS;
-		wBS = newWBS;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__WBS, oldWBS, wBS));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getWBSLevel() {
-		return wBSLevel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWBSLevel(String newWBSLevel) {
-		String oldWBSLevel = wBSLevel;
-		wBSLevel = newWBSLevel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__WBS_LEVEL, oldWBSLevel, wBSLevel));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getOutlineNumber() {
-		return outlineNumber;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOutlineNumber(String newOutlineNumber) {
-		String oldOutlineNumber = outlineNumber;
-		outlineNumber = newOutlineNumber;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__OUTLINE_NUMBER, oldOutlineNumber, outlineNumber));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getOutlineLevel() {
-		return outlineLevel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOutlineLevel(BigInteger newOutlineLevel) {
-		BigInteger oldOutlineLevel = outlineLevel;
-		outlineLevel = newOutlineLevel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__OUTLINE_LEVEL, oldOutlineLevel, outlineLevel));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getPriority() {
-		return priority;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPriority(BigInteger newPriority) {
-		BigInteger oldPriority = priority;
-		priority = newPriority;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__PRIORITY, oldPriority, priority));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getStart() {
-		return start;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStart(Object newStart) {
-		Object oldStart = start;
-		start = newStart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__START, oldStart, start));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getFinish() {
-		return finish;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinish(Object newFinish) {
-		Object oldFinish = finish;
-		finish = newFinish;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__FINISH, oldFinish, finish));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getDuration() {
-		return duration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDuration(Object newDuration) {
-		Object oldDuration = duration;
-		duration = newDuration;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__DURATION, oldDuration, duration));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getDurationFormat() {
-		return durationFormat;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDurationFormat(BigInteger newDurationFormat) {
-		BigInteger oldDurationFormat = durationFormat;
-		durationFormat = newDurationFormat;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__DURATION_FORMAT, oldDurationFormat, durationFormat));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getWork() {
-		return work;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWork(Object newWork) {
-		Object oldWork = work;
-		work = newWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__WORK, oldWork, work));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getStop() {
-		return stop;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStop(Object newStop) {
-		Object oldStop = stop;
-		stop = newStop;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__STOP, oldStop, stop));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getResume() {
-		return resume;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResume(Object newResume) {
-		Object oldResume = resume;
-		resume = newResume;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__RESUME, oldResume, resume));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isResumeValid() {
-		return resumeValid;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResumeValid(boolean newResumeValid) {
-		boolean oldResumeValid = resumeValid;
-		resumeValid = newResumeValid;
-		boolean oldResumeValidESet = resumeValidESet;
-		resumeValidESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__RESUME_VALID, oldResumeValid, resumeValid, !oldResumeValidESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetResumeValid() {
-		boolean oldResumeValid = resumeValid;
-		boolean oldResumeValidESet = resumeValidESet;
-		resumeValid = RESUME_VALID_EDEFAULT;
-		resumeValidESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__RESUME_VALID, oldResumeValid, RESUME_VALID_EDEFAULT, oldResumeValidESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetResumeValid() {
-		return resumeValidESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isEffortDriven() {
-		return effortDriven;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEffortDriven(boolean newEffortDriven) {
-		boolean oldEffortDriven = effortDriven;
-		effortDriven = newEffortDriven;
-		boolean oldEffortDrivenESet = effortDrivenESet;
-		effortDrivenESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__EFFORT_DRIVEN, oldEffortDriven, effortDriven, !oldEffortDrivenESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetEffortDriven() {
-		boolean oldEffortDriven = effortDriven;
-		boolean oldEffortDrivenESet = effortDrivenESet;
-		effortDriven = EFFORT_DRIVEN_EDEFAULT;
-		effortDrivenESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__EFFORT_DRIVEN, oldEffortDriven, EFFORT_DRIVEN_EDEFAULT, oldEffortDrivenESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetEffortDriven() {
-		return effortDrivenESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isRecurring() {
-		return recurring;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRecurring(boolean newRecurring) {
-		boolean oldRecurring = recurring;
-		recurring = newRecurring;
-		boolean oldRecurringESet = recurringESet;
-		recurringESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__RECURRING, oldRecurring, recurring, !oldRecurringESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetRecurring() {
-		boolean oldRecurring = recurring;
-		boolean oldRecurringESet = recurringESet;
-		recurring = RECURRING_EDEFAULT;
-		recurringESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__RECURRING, oldRecurring, RECURRING_EDEFAULT, oldRecurringESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetRecurring() {
-		return recurringESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isOverAllocated() {
-		return overAllocated;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOverAllocated(boolean newOverAllocated) {
-		boolean oldOverAllocated = overAllocated;
-		overAllocated = newOverAllocated;
-		boolean oldOverAllocatedESet = overAllocatedESet;
-		overAllocatedESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__OVER_ALLOCATED, oldOverAllocated, overAllocated, !oldOverAllocatedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetOverAllocated() {
-		boolean oldOverAllocated = overAllocated;
-		boolean oldOverAllocatedESet = overAllocatedESet;
-		overAllocated = OVER_ALLOCATED_EDEFAULT;
-		overAllocatedESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__OVER_ALLOCATED, oldOverAllocated, OVER_ALLOCATED_EDEFAULT, oldOverAllocatedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetOverAllocated() {
-		return overAllocatedESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isEstimated() {
-		return estimated;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEstimated(boolean newEstimated) {
-		boolean oldEstimated = estimated;
-		estimated = newEstimated;
-		boolean oldEstimatedESet = estimatedESet;
-		estimatedESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__ESTIMATED, oldEstimated, estimated, !oldEstimatedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetEstimated() {
-		boolean oldEstimated = estimated;
-		boolean oldEstimatedESet = estimatedESet;
-		estimated = ESTIMATED_EDEFAULT;
-		estimatedESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__ESTIMATED, oldEstimated, ESTIMATED_EDEFAULT, oldEstimatedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetEstimated() {
-		return estimatedESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMilestone() {
-		return milestone;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMilestone(boolean newMilestone) {
-		boolean oldMilestone = milestone;
-		milestone = newMilestone;
-		boolean oldMilestoneESet = milestoneESet;
-		milestoneESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__MILESTONE, oldMilestone, milestone, !oldMilestoneESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMilestone() {
-		boolean oldMilestone = milestone;
-		boolean oldMilestoneESet = milestoneESet;
-		milestone = MILESTONE_EDEFAULT;
-		milestoneESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__MILESTONE, oldMilestone, MILESTONE_EDEFAULT, oldMilestoneESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMilestone() {
-		return milestoneESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSummary() {
-		return summary;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSummary(boolean newSummary) {
-		boolean oldSummary = summary;
-		summary = newSummary;
-		boolean oldSummaryESet = summaryESet;
-		summaryESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__SUMMARY, oldSummary, summary, !oldSummaryESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetSummary() {
-		boolean oldSummary = summary;
-		boolean oldSummaryESet = summaryESet;
-		summary = SUMMARY_EDEFAULT;
-		summaryESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__SUMMARY, oldSummary, SUMMARY_EDEFAULT, oldSummaryESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetSummary() {
-		return summaryESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isCritical() {
-		return critical;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCritical(boolean newCritical) {
-		boolean oldCritical = critical;
-		critical = newCritical;
-		boolean oldCriticalESet = criticalESet;
-		criticalESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__CRITICAL, oldCritical, critical, !oldCriticalESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetCritical() {
-		boolean oldCritical = critical;
-		boolean oldCriticalESet = criticalESet;
-		critical = CRITICAL_EDEFAULT;
-		criticalESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__CRITICAL, oldCritical, CRITICAL_EDEFAULT, oldCriticalESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetCritical() {
-		return criticalESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsSubproject() {
-		return isSubproject;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsSubproject(boolean newIsSubproject) {
-		boolean oldIsSubproject = isSubproject;
-		isSubproject = newIsSubproject;
-		boolean oldIsSubprojectESet = isSubprojectESet;
-		isSubprojectESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__IS_SUBPROJECT, oldIsSubproject, isSubproject, !oldIsSubprojectESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsSubproject() {
-		boolean oldIsSubproject = isSubproject;
-		boolean oldIsSubprojectESet = isSubprojectESet;
-		isSubproject = IS_SUBPROJECT_EDEFAULT;
-		isSubprojectESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__IS_SUBPROJECT, oldIsSubproject, IS_SUBPROJECT_EDEFAULT, oldIsSubprojectESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsSubproject() {
-		return isSubprojectESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsSubprojectReadOnly() {
-		return isSubprojectReadOnly;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsSubprojectReadOnly(boolean newIsSubprojectReadOnly) {
-		boolean oldIsSubprojectReadOnly = isSubprojectReadOnly;
-		isSubprojectReadOnly = newIsSubprojectReadOnly;
-		boolean oldIsSubprojectReadOnlyESet = isSubprojectReadOnlyESet;
-		isSubprojectReadOnlyESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__IS_SUBPROJECT_READ_ONLY, oldIsSubprojectReadOnly, isSubprojectReadOnly, !oldIsSubprojectReadOnlyESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsSubprojectReadOnly() {
-		boolean oldIsSubprojectReadOnly = isSubprojectReadOnly;
-		boolean oldIsSubprojectReadOnlyESet = isSubprojectReadOnlyESet;
-		isSubprojectReadOnly = IS_SUBPROJECT_READ_ONLY_EDEFAULT;
-		isSubprojectReadOnlyESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__IS_SUBPROJECT_READ_ONLY, oldIsSubprojectReadOnly, IS_SUBPROJECT_READ_ONLY_EDEFAULT, oldIsSubprojectReadOnlyESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsSubprojectReadOnly() {
-		return isSubprojectReadOnlyESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSubprojectName() {
-		return subprojectName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSubprojectName(String newSubprojectName) {
-		String oldSubprojectName = subprojectName;
-		subprojectName = newSubprojectName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__SUBPROJECT_NAME, oldSubprojectName, subprojectName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isExternalTask() {
-		return externalTask;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExternalTask(boolean newExternalTask) {
-		boolean oldExternalTask = externalTask;
-		externalTask = newExternalTask;
-		boolean oldExternalTaskESet = externalTaskESet;
-		externalTaskESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__EXTERNAL_TASK, oldExternalTask, externalTask, !oldExternalTaskESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetExternalTask() {
-		boolean oldExternalTask = externalTask;
-		boolean oldExternalTaskESet = externalTaskESet;
-		externalTask = EXTERNAL_TASK_EDEFAULT;
-		externalTaskESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__EXTERNAL_TASK, oldExternalTask, EXTERNAL_TASK_EDEFAULT, oldExternalTaskESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetExternalTask() {
-		return externalTaskESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getExternalTaskProject() {
-		return externalTaskProject;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExternalTaskProject(String newExternalTaskProject) {
-		String oldExternalTaskProject = externalTaskProject;
-		externalTaskProject = newExternalTaskProject;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__EXTERNAL_TASK_PROJECT, oldExternalTaskProject, externalTaskProject));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getEarlyStart() {
-		return earlyStart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEarlyStart(Object newEarlyStart) {
-		Object oldEarlyStart = earlyStart;
-		earlyStart = newEarlyStart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__EARLY_START, oldEarlyStart, earlyStart));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getEarlyFinish() {
-		return earlyFinish;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEarlyFinish(Object newEarlyFinish) {
-		Object oldEarlyFinish = earlyFinish;
-		earlyFinish = newEarlyFinish;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__EARLY_FINISH, oldEarlyFinish, earlyFinish));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getLateStart() {
-		return lateStart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLateStart(Object newLateStart) {
-		Object oldLateStart = lateStart;
-		lateStart = newLateStart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__LATE_START, oldLateStart, lateStart));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getLateFinish() {
-		return lateFinish;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLateFinish(Object newLateFinish) {
-		Object oldLateFinish = lateFinish;
-		lateFinish = newLateFinish;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__LATE_FINISH, oldLateFinish, lateFinish));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getStartVariance() {
-		return startVariance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStartVariance(BigInteger newStartVariance) {
-		BigInteger oldStartVariance = startVariance;
-		startVariance = newStartVariance;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__START_VARIANCE, oldStartVariance, startVariance));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getFinishVariance() {
-		return finishVariance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinishVariance(BigInteger newFinishVariance) {
-		BigInteger oldFinishVariance = finishVariance;
-		finishVariance = newFinishVariance;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__FINISH_VARIANCE, oldFinishVariance, finishVariance));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getWorkVariance() {
-		return workVariance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWorkVariance(float newWorkVariance) {
-		float oldWorkVariance = workVariance;
-		workVariance = newWorkVariance;
-		boolean oldWorkVarianceESet = workVarianceESet;
-		workVarianceESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__WORK_VARIANCE, oldWorkVariance, workVariance, !oldWorkVarianceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetWorkVariance() {
-		float oldWorkVariance = workVariance;
-		boolean oldWorkVarianceESet = workVarianceESet;
-		workVariance = WORK_VARIANCE_EDEFAULT;
-		workVarianceESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__WORK_VARIANCE, oldWorkVariance, WORK_VARIANCE_EDEFAULT, oldWorkVarianceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetWorkVariance() {
-		return workVarianceESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getFreeSlack() {
-		return freeSlack;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFreeSlack(BigInteger newFreeSlack) {
-		BigInteger oldFreeSlack = freeSlack;
-		freeSlack = newFreeSlack;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__FREE_SLACK, oldFreeSlack, freeSlack));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getTotalSlack() {
-		return totalSlack;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTotalSlack(BigInteger newTotalSlack) {
-		BigInteger oldTotalSlack = totalSlack;
-		totalSlack = newTotalSlack;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__TOTAL_SLACK, oldTotalSlack, totalSlack));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getFixedCost() {
-		return fixedCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFixedCost(float newFixedCost) {
-		float oldFixedCost = fixedCost;
-		fixedCost = newFixedCost;
-		boolean oldFixedCostESet = fixedCostESet;
-		fixedCostESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__FIXED_COST, oldFixedCost, fixedCost, !oldFixedCostESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetFixedCost() {
-		float oldFixedCost = fixedCost;
-		boolean oldFixedCostESet = fixedCostESet;
-		fixedCost = FIXED_COST_EDEFAULT;
-		fixedCostESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__FIXED_COST, oldFixedCost, FIXED_COST_EDEFAULT, oldFixedCostESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetFixedCost() {
-		return fixedCostESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFixedCostAccrual() {
-		return fixedCostAccrual;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFixedCostAccrual(String newFixedCostAccrual) {
-		String oldFixedCostAccrual = fixedCostAccrual;
-		fixedCostAccrual = newFixedCostAccrual;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__FIXED_COST_ACCRUAL, oldFixedCostAccrual, fixedCostAccrual));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getPercentComplete() {
-		return percentComplete;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPercentComplete(BigInteger newPercentComplete) {
-		BigInteger oldPercentComplete = percentComplete;
-		percentComplete = newPercentComplete;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__PERCENT_COMPLETE, oldPercentComplete, percentComplete));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getPercentWorkComplete() {
-		return percentWorkComplete;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPercentWorkComplete(BigInteger newPercentWorkComplete) {
-		BigInteger oldPercentWorkComplete = percentWorkComplete;
-		percentWorkComplete = newPercentWorkComplete;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__PERCENT_WORK_COMPLETE, oldPercentWorkComplete, percentWorkComplete));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getCost() {
-		return cost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCost(BigDecimal newCost) {
-		BigDecimal oldCost = cost;
-		cost = newCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__COST, oldCost, cost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getOvertimeCost() {
-		return overtimeCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOvertimeCost(BigDecimal newOvertimeCost) {
-		BigDecimal oldOvertimeCost = overtimeCost;
-		overtimeCost = newOvertimeCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__OVERTIME_COST, oldOvertimeCost, overtimeCost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getOvertimeWork() {
-		return overtimeWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOvertimeWork(Object newOvertimeWork) {
-		Object oldOvertimeWork = overtimeWork;
-		overtimeWork = newOvertimeWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__OVERTIME_WORK, oldOvertimeWork, overtimeWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualStart() {
-		return actualStart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualStart(Object newActualStart) {
-		Object oldActualStart = actualStart;
-		actualStart = newActualStart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__ACTUAL_START, oldActualStart, actualStart));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualFinish() {
-		return actualFinish;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualFinish(Object newActualFinish) {
-		Object oldActualFinish = actualFinish;
-		actualFinish = newActualFinish;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__ACTUAL_FINISH, oldActualFinish, actualFinish));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualDuration() {
-		return actualDuration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualDuration(Object newActualDuration) {
-		Object oldActualDuration = actualDuration;
-		actualDuration = newActualDuration;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__ACTUAL_DURATION, oldActualDuration, actualDuration));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getActualCost() {
-		return actualCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualCost(BigDecimal newActualCost) {
-		BigDecimal oldActualCost = actualCost;
-		actualCost = newActualCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__ACTUAL_COST, oldActualCost, actualCost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getActualOvertimeCost() {
-		return actualOvertimeCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualOvertimeCost(BigDecimal newActualOvertimeCost) {
-		BigDecimal oldActualOvertimeCost = actualOvertimeCost;
-		actualOvertimeCost = newActualOvertimeCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__ACTUAL_OVERTIME_COST, oldActualOvertimeCost, actualOvertimeCost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualWork() {
-		return actualWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualWork(Object newActualWork) {
-		Object oldActualWork = actualWork;
-		actualWork = newActualWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__ACTUAL_WORK, oldActualWork, actualWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualOvertimeWork() {
-		return actualOvertimeWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualOvertimeWork(Object newActualOvertimeWork) {
-		Object oldActualOvertimeWork = actualOvertimeWork;
-		actualOvertimeWork = newActualOvertimeWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__ACTUAL_OVERTIME_WORK, oldActualOvertimeWork, actualOvertimeWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getRegularWork() {
-		return regularWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRegularWork(Object newRegularWork) {
-		Object oldRegularWork = regularWork;
-		regularWork = newRegularWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__REGULAR_WORK, oldRegularWork, regularWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getRemainingDuration() {
-		return remainingDuration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemainingDuration(Object newRemainingDuration) {
-		Object oldRemainingDuration = remainingDuration;
-		remainingDuration = newRemainingDuration;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__REMAINING_DURATION, oldRemainingDuration, remainingDuration));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getRemainingCost() {
-		return remainingCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemainingCost(BigDecimal newRemainingCost) {
-		BigDecimal oldRemainingCost = remainingCost;
-		remainingCost = newRemainingCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__REMAINING_COST, oldRemainingCost, remainingCost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getRemainingWork() {
-		return remainingWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemainingWork(Object newRemainingWork) {
-		Object oldRemainingWork = remainingWork;
-		remainingWork = newRemainingWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__REMAINING_WORK, oldRemainingWork, remainingWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigDecimal getRemainingOvertimeCost() {
-		return remainingOvertimeCost;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemainingOvertimeCost(BigDecimal newRemainingOvertimeCost) {
-		BigDecimal oldRemainingOvertimeCost = remainingOvertimeCost;
-		remainingOvertimeCost = newRemainingOvertimeCost;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__REMAINING_OVERTIME_COST, oldRemainingOvertimeCost, remainingOvertimeCost));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getRemainingOvertimeWork() {
-		return remainingOvertimeWork;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemainingOvertimeWork(Object newRemainingOvertimeWork) {
-		Object oldRemainingOvertimeWork = remainingOvertimeWork;
-		remainingOvertimeWork = newRemainingOvertimeWork;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__REMAINING_OVERTIME_WORK, oldRemainingOvertimeWork, remainingOvertimeWork));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getACWP() {
-		return aCWP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setACWP(float newACWP) {
-		float oldACWP = aCWP;
-		aCWP = newACWP;
-		boolean oldACWPESet = aCWPESet;
-		aCWPESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__ACWP, oldACWP, aCWP, !oldACWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetACWP() {
-		float oldACWP = aCWP;
-		boolean oldACWPESet = aCWPESet;
-		aCWP = ACWP_EDEFAULT;
-		aCWPESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__ACWP, oldACWP, ACWP_EDEFAULT, oldACWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetACWP() {
-		return aCWPESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getCV() {
-		return cV;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCV(float newCV) {
-		float oldCV = cV;
-		cV = newCV;
-		boolean oldCVESet = cVESet;
-		cVESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__CV, oldCV, cV, !oldCVESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetCV() {
-		float oldCV = cV;
-		boolean oldCVESet = cVESet;
-		cV = CV_EDEFAULT;
-		cVESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__CV, oldCV, CV_EDEFAULT, oldCVESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetCV() {
-		return cVESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getConstraintType() {
-		return constraintType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConstraintType(BigInteger newConstraintType) {
-		BigInteger oldConstraintType = constraintType;
-		constraintType = newConstraintType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__CONSTRAINT_TYPE, oldConstraintType, constraintType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getCalendarUID() {
-		return calendarUID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCalendarUID(BigInteger newCalendarUID) {
-		BigInteger oldCalendarUID = calendarUID;
-		calendarUID = newCalendarUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__CALENDAR_UID, oldCalendarUID, calendarUID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getConstraintDate() {
-		return constraintDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConstraintDate(Object newConstraintDate) {
-		Object oldConstraintDate = constraintDate;
-		constraintDate = newConstraintDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__CONSTRAINT_DATE, oldConstraintDate, constraintDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getDeadline() {
-		return deadline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDeadline(Object newDeadline) {
-		Object oldDeadline = deadline;
-		deadline = newDeadline;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__DEADLINE, oldDeadline, deadline));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isLevelAssignments() {
-		return levelAssignments;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLevelAssignments(boolean newLevelAssignments) {
-		boolean oldLevelAssignments = levelAssignments;
-		levelAssignments = newLevelAssignments;
-		boolean oldLevelAssignmentsESet = levelAssignmentsESet;
-		levelAssignmentsESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__LEVEL_ASSIGNMENTS, oldLevelAssignments, levelAssignments, !oldLevelAssignmentsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetLevelAssignments() {
-		boolean oldLevelAssignments = levelAssignments;
-		boolean oldLevelAssignmentsESet = levelAssignmentsESet;
-		levelAssignments = LEVEL_ASSIGNMENTS_EDEFAULT;
-		levelAssignmentsESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__LEVEL_ASSIGNMENTS, oldLevelAssignments, LEVEL_ASSIGNMENTS_EDEFAULT, oldLevelAssignmentsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetLevelAssignments() {
-		return levelAssignmentsESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isLevelingCanSplit() {
-		return levelingCanSplit;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLevelingCanSplit(boolean newLevelingCanSplit) {
-		boolean oldLevelingCanSplit = levelingCanSplit;
-		levelingCanSplit = newLevelingCanSplit;
-		boolean oldLevelingCanSplitESet = levelingCanSplitESet;
-		levelingCanSplitESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__LEVELING_CAN_SPLIT, oldLevelingCanSplit, levelingCanSplit, !oldLevelingCanSplitESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetLevelingCanSplit() {
-		boolean oldLevelingCanSplit = levelingCanSplit;
-		boolean oldLevelingCanSplitESet = levelingCanSplitESet;
-		levelingCanSplit = LEVELING_CAN_SPLIT_EDEFAULT;
-		levelingCanSplitESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__LEVELING_CAN_SPLIT, oldLevelingCanSplit, LEVELING_CAN_SPLIT_EDEFAULT, oldLevelingCanSplitESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetLevelingCanSplit() {
-		return levelingCanSplitESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getLevelingDelay() {
-		return levelingDelay;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLevelingDelay(BigInteger newLevelingDelay) {
-		BigInteger oldLevelingDelay = levelingDelay;
-		levelingDelay = newLevelingDelay;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__LEVELING_DELAY, oldLevelingDelay, levelingDelay));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getLevelingDelayFormat() {
-		return levelingDelayFormat;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLevelingDelayFormat(BigInteger newLevelingDelayFormat) {
-		BigInteger oldLevelingDelayFormat = levelingDelayFormat;
-		levelingDelayFormat = newLevelingDelayFormat;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__LEVELING_DELAY_FORMAT, oldLevelingDelayFormat, levelingDelayFormat));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getPreLeveledStart() {
-		return preLeveledStart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPreLeveledStart(Object newPreLeveledStart) {
-		Object oldPreLeveledStart = preLeveledStart;
-		preLeveledStart = newPreLeveledStart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__PRE_LEVELED_START, oldPreLeveledStart, preLeveledStart));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getPreLeveledFinish() {
-		return preLeveledFinish;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPreLeveledFinish(Object newPreLeveledFinish) {
-		Object oldPreLeveledFinish = preLeveledFinish;
-		preLeveledFinish = newPreLeveledFinish;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__PRE_LEVELED_FINISH, oldPreLeveledFinish, preLeveledFinish));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHyperlink() {
-		return hyperlink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHyperlink(String newHyperlink) {
-		String oldHyperlink = hyperlink;
-		hyperlink = newHyperlink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__HYPERLINK, oldHyperlink, hyperlink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHyperlinkAddress() {
-		return hyperlinkAddress;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHyperlinkAddress(String newHyperlinkAddress) {
-		String oldHyperlinkAddress = hyperlinkAddress;
-		hyperlinkAddress = newHyperlinkAddress;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__HYPERLINK_ADDRESS, oldHyperlinkAddress, hyperlinkAddress));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHyperlinkSubAddress() {
-		return hyperlinkSubAddress;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHyperlinkSubAddress(String newHyperlinkSubAddress) {
-		String oldHyperlinkSubAddress = hyperlinkSubAddress;
-		hyperlinkSubAddress = newHyperlinkSubAddress;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__HYPERLINK_SUB_ADDRESS, oldHyperlinkSubAddress, hyperlinkSubAddress));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIgnoreResourceCalendar() {
-		return ignoreResourceCalendar;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIgnoreResourceCalendar(boolean newIgnoreResourceCalendar) {
-		boolean oldIgnoreResourceCalendar = ignoreResourceCalendar;
-		ignoreResourceCalendar = newIgnoreResourceCalendar;
-		boolean oldIgnoreResourceCalendarESet = ignoreResourceCalendarESet;
-		ignoreResourceCalendarESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__IGNORE_RESOURCE_CALENDAR, oldIgnoreResourceCalendar, ignoreResourceCalendar, !oldIgnoreResourceCalendarESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIgnoreResourceCalendar() {
-		boolean oldIgnoreResourceCalendar = ignoreResourceCalendar;
-		boolean oldIgnoreResourceCalendarESet = ignoreResourceCalendarESet;
-		ignoreResourceCalendar = IGNORE_RESOURCE_CALENDAR_EDEFAULT;
-		ignoreResourceCalendarESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__IGNORE_RESOURCE_CALENDAR, oldIgnoreResourceCalendar, IGNORE_RESOURCE_CALENDAR_EDEFAULT, oldIgnoreResourceCalendarESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIgnoreResourceCalendar() {
-		return ignoreResourceCalendarESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getNotes() {
-		return notes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNotes(String newNotes) {
-		String oldNotes = notes;
-		notes = newNotes;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__NOTES, oldNotes, notes));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isHideBar() {
-		return hideBar;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHideBar(boolean newHideBar) {
-		boolean oldHideBar = hideBar;
-		hideBar = newHideBar;
-		boolean oldHideBarESet = hideBarESet;
-		hideBarESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__HIDE_BAR, oldHideBar, hideBar, !oldHideBarESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetHideBar() {
-		boolean oldHideBar = hideBar;
-		boolean oldHideBarESet = hideBarESet;
-		hideBar = HIDE_BAR_EDEFAULT;
-		hideBarESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__HIDE_BAR, oldHideBar, HIDE_BAR_EDEFAULT, oldHideBarESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetHideBar() {
-		return hideBarESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isRollup() {
-		return rollup;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRollup(boolean newRollup) {
-		boolean oldRollup = rollup;
-		rollup = newRollup;
-		boolean oldRollupESet = rollupESet;
-		rollupESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__ROLLUP, oldRollup, rollup, !oldRollupESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetRollup() {
-		boolean oldRollup = rollup;
-		boolean oldRollupESet = rollupESet;
-		rollup = ROLLUP_EDEFAULT;
-		rollupESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__ROLLUP, oldRollup, ROLLUP_EDEFAULT, oldRollupESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetRollup() {
-		return rollupESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getBCWS() {
-		return bCWS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBCWS(float newBCWS) {
-		float oldBCWS = bCWS;
-		bCWS = newBCWS;
-		boolean oldBCWSESet = bCWSESet;
-		bCWSESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__BCWS, oldBCWS, bCWS, !oldBCWSESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBCWS() {
-		float oldBCWS = bCWS;
-		boolean oldBCWSESet = bCWSESet;
-		bCWS = BCWS_EDEFAULT;
-		bCWSESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__BCWS, oldBCWS, BCWS_EDEFAULT, oldBCWSESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBCWS() {
-		return bCWSESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getBCWP() {
-		return bCWP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBCWP(float newBCWP) {
-		float oldBCWP = bCWP;
-		bCWP = newBCWP;
-		boolean oldBCWPESet = bCWPESet;
-		bCWPESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__BCWP, oldBCWP, bCWP, !oldBCWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBCWP() {
-		float oldBCWP = bCWP;
-		boolean oldBCWPESet = bCWPESet;
-		bCWP = BCWP_EDEFAULT;
-		bCWPESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.TASK__BCWP, oldBCWP, BCWP_EDEFAULT, oldBCWPESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBCWP() {
-		return bCWPESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getPhysicalPercentComplete() {
-		return physicalPercentComplete;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPhysicalPercentComplete(BigInteger newPhysicalPercentComplete) {
-		BigInteger oldPhysicalPercentComplete = physicalPercentComplete;
-		physicalPercentComplete = newPhysicalPercentComplete;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__PHYSICAL_PERCENT_COMPLETE, oldPhysicalPercentComplete, physicalPercentComplete));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getEarnedValueMethod() {
-		return earnedValueMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEarnedValueMethod(BigInteger newEarnedValueMethod) {
-		BigInteger oldEarnedValueMethod = earnedValueMethod;
-		earnedValueMethod = newEarnedValueMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__EARNED_VALUE_METHOD, oldEarnedValueMethod, earnedValueMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getPredecessorLink() {
-		if (predecessorLink == null) {
-			predecessorLink = new EObjectContainmentEList(PredecessorLink.class, this, MsprojectPackage.TASK__PREDECESSOR_LINK);
-		}
-		return predecessorLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualWorkProtected() {
-		return actualWorkProtected;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualWorkProtected(Object newActualWorkProtected) {
-		Object oldActualWorkProtected = actualWorkProtected;
-		actualWorkProtected = newActualWorkProtected;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__ACTUAL_WORK_PROTECTED, oldActualWorkProtected, actualWorkProtected));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getActualOvertimeWorkProtected() {
-		return actualOvertimeWorkProtected;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualOvertimeWorkProtected(Object newActualOvertimeWorkProtected) {
-		Object oldActualOvertimeWorkProtected = actualOvertimeWorkProtected;
-		actualOvertimeWorkProtected = newActualOvertimeWorkProtected;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TASK__ACTUAL_OVERTIME_WORK_PROTECTED, oldActualOvertimeWorkProtected, actualOvertimeWorkProtected));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getExtendedAttribute() {
-		if (extendedAttribute == null) {
-			extendedAttribute = new EObjectContainmentEList(ExtendedAttribute2.class, this, MsprojectPackage.TASK__EXTENDED_ATTRIBUTE);
-		}
-		return extendedAttribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getBaseline() {
-		if (baseline == null) {
-			baseline = new EObjectContainmentEList(Baseline.class, this, MsprojectPackage.TASK__BASELINE);
-		}
-		return baseline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getOutlineCode() {
-		if (outlineCode == null) {
-			outlineCode = new EObjectContainmentEList(OutlineCode2.class, this, MsprojectPackage.TASK__OUTLINE_CODE);
-		}
-		return outlineCode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTimephasedData() {
-		if (timephasedData == null) {
-			timephasedData = new EObjectContainmentEList(TimephasedDataType.class, this, MsprojectPackage.TASK__TIMEPHASED_DATA);
-		}
-		return timephasedData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.TASK__PREDECESSOR_LINK:
-					return ((InternalEList)getPredecessorLink()).basicRemove(otherEnd, msgs);
-				case MsprojectPackage.TASK__EXTENDED_ATTRIBUTE:
-					return ((InternalEList)getExtendedAttribute()).basicRemove(otherEnd, msgs);
-				case MsprojectPackage.TASK__BASELINE:
-					return ((InternalEList)getBaseline()).basicRemove(otherEnd, msgs);
-				case MsprojectPackage.TASK__OUTLINE_CODE:
-					return ((InternalEList)getOutlineCode()).basicRemove(otherEnd, msgs);
-				case MsprojectPackage.TASK__TIMEPHASED_DATA:
-					return ((InternalEList)getTimephasedData()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TASK__UID:
-				return getUID();
-			case MsprojectPackage.TASK__ID:
-				return getID();
-			case MsprojectPackage.TASK__NAME:
-				return getName();
-			case MsprojectPackage.TASK__TYPE:
-				return getType();
-			case MsprojectPackage.TASK__IS_NULL:
-				return isIsNull() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__CREATE_DATE:
-				return getCreateDate();
-			case MsprojectPackage.TASK__CONTACT:
-				return getContact();
-			case MsprojectPackage.TASK__WBS:
-				return getWBS();
-			case MsprojectPackage.TASK__WBS_LEVEL:
-				return getWBSLevel();
-			case MsprojectPackage.TASK__OUTLINE_NUMBER:
-				return getOutlineNumber();
-			case MsprojectPackage.TASK__OUTLINE_LEVEL:
-				return getOutlineLevel();
-			case MsprojectPackage.TASK__PRIORITY:
-				return getPriority();
-			case MsprojectPackage.TASK__START:
-				return getStart();
-			case MsprojectPackage.TASK__FINISH:
-				return getFinish();
-			case MsprojectPackage.TASK__DURATION:
-				return getDuration();
-			case MsprojectPackage.TASK__DURATION_FORMAT:
-				return getDurationFormat();
-			case MsprojectPackage.TASK__WORK:
-				return getWork();
-			case MsprojectPackage.TASK__STOP:
-				return getStop();
-			case MsprojectPackage.TASK__RESUME:
-				return getResume();
-			case MsprojectPackage.TASK__RESUME_VALID:
-				return isResumeValid() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__EFFORT_DRIVEN:
-				return isEffortDriven() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__RECURRING:
-				return isRecurring() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__OVER_ALLOCATED:
-				return isOverAllocated() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__ESTIMATED:
-				return isEstimated() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__MILESTONE:
-				return isMilestone() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__SUMMARY:
-				return isSummary() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__CRITICAL:
-				return isCritical() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__IS_SUBPROJECT:
-				return isIsSubproject() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__IS_SUBPROJECT_READ_ONLY:
-				return isIsSubprojectReadOnly() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__SUBPROJECT_NAME:
-				return getSubprojectName();
-			case MsprojectPackage.TASK__EXTERNAL_TASK:
-				return isExternalTask() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__EXTERNAL_TASK_PROJECT:
-				return getExternalTaskProject();
-			case MsprojectPackage.TASK__EARLY_START:
-				return getEarlyStart();
-			case MsprojectPackage.TASK__EARLY_FINISH:
-				return getEarlyFinish();
-			case MsprojectPackage.TASK__LATE_START:
-				return getLateStart();
-			case MsprojectPackage.TASK__LATE_FINISH:
-				return getLateFinish();
-			case MsprojectPackage.TASK__START_VARIANCE:
-				return getStartVariance();
-			case MsprojectPackage.TASK__FINISH_VARIANCE:
-				return getFinishVariance();
-			case MsprojectPackage.TASK__WORK_VARIANCE:
-				return new Float(getWorkVariance());
-			case MsprojectPackage.TASK__FREE_SLACK:
-				return getFreeSlack();
-			case MsprojectPackage.TASK__TOTAL_SLACK:
-				return getTotalSlack();
-			case MsprojectPackage.TASK__FIXED_COST:
-				return new Float(getFixedCost());
-			case MsprojectPackage.TASK__FIXED_COST_ACCRUAL:
-				return getFixedCostAccrual();
-			case MsprojectPackage.TASK__PERCENT_COMPLETE:
-				return getPercentComplete();
-			case MsprojectPackage.TASK__PERCENT_WORK_COMPLETE:
-				return getPercentWorkComplete();
-			case MsprojectPackage.TASK__COST:
-				return getCost();
-			case MsprojectPackage.TASK__OVERTIME_COST:
-				return getOvertimeCost();
-			case MsprojectPackage.TASK__OVERTIME_WORK:
-				return getOvertimeWork();
-			case MsprojectPackage.TASK__ACTUAL_START:
-				return getActualStart();
-			case MsprojectPackage.TASK__ACTUAL_FINISH:
-				return getActualFinish();
-			case MsprojectPackage.TASK__ACTUAL_DURATION:
-				return getActualDuration();
-			case MsprojectPackage.TASK__ACTUAL_COST:
-				return getActualCost();
-			case MsprojectPackage.TASK__ACTUAL_OVERTIME_COST:
-				return getActualOvertimeCost();
-			case MsprojectPackage.TASK__ACTUAL_WORK:
-				return getActualWork();
-			case MsprojectPackage.TASK__ACTUAL_OVERTIME_WORK:
-				return getActualOvertimeWork();
-			case MsprojectPackage.TASK__REGULAR_WORK:
-				return getRegularWork();
-			case MsprojectPackage.TASK__REMAINING_DURATION:
-				return getRemainingDuration();
-			case MsprojectPackage.TASK__REMAINING_COST:
-				return getRemainingCost();
-			case MsprojectPackage.TASK__REMAINING_WORK:
-				return getRemainingWork();
-			case MsprojectPackage.TASK__REMAINING_OVERTIME_COST:
-				return getRemainingOvertimeCost();
-			case MsprojectPackage.TASK__REMAINING_OVERTIME_WORK:
-				return getRemainingOvertimeWork();
-			case MsprojectPackage.TASK__ACWP:
-				return new Float(getACWP());
-			case MsprojectPackage.TASK__CV:
-				return new Float(getCV());
-			case MsprojectPackage.TASK__CONSTRAINT_TYPE:
-				return getConstraintType();
-			case MsprojectPackage.TASK__CALENDAR_UID:
-				return getCalendarUID();
-			case MsprojectPackage.TASK__CONSTRAINT_DATE:
-				return getConstraintDate();
-			case MsprojectPackage.TASK__DEADLINE:
-				return getDeadline();
-			case MsprojectPackage.TASK__LEVEL_ASSIGNMENTS:
-				return isLevelAssignments() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__LEVELING_CAN_SPLIT:
-				return isLevelingCanSplit() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__LEVELING_DELAY:
-				return getLevelingDelay();
-			case MsprojectPackage.TASK__LEVELING_DELAY_FORMAT:
-				return getLevelingDelayFormat();
-			case MsprojectPackage.TASK__PRE_LEVELED_START:
-				return getPreLeveledStart();
-			case MsprojectPackage.TASK__PRE_LEVELED_FINISH:
-				return getPreLeveledFinish();
-			case MsprojectPackage.TASK__HYPERLINK:
-				return getHyperlink();
-			case MsprojectPackage.TASK__HYPERLINK_ADDRESS:
-				return getHyperlinkAddress();
-			case MsprojectPackage.TASK__HYPERLINK_SUB_ADDRESS:
-				return getHyperlinkSubAddress();
-			case MsprojectPackage.TASK__IGNORE_RESOURCE_CALENDAR:
-				return isIgnoreResourceCalendar() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__NOTES:
-				return getNotes();
-			case MsprojectPackage.TASK__HIDE_BAR:
-				return isHideBar() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__ROLLUP:
-				return isRollup() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.TASK__BCWS:
-				return new Float(getBCWS());
-			case MsprojectPackage.TASK__BCWP:
-				return new Float(getBCWP());
-			case MsprojectPackage.TASK__PHYSICAL_PERCENT_COMPLETE:
-				return getPhysicalPercentComplete();
-			case MsprojectPackage.TASK__EARNED_VALUE_METHOD:
-				return getEarnedValueMethod();
-			case MsprojectPackage.TASK__PREDECESSOR_LINK:
-				return getPredecessorLink();
-			case MsprojectPackage.TASK__ACTUAL_WORK_PROTECTED:
-				return getActualWorkProtected();
-			case MsprojectPackage.TASK__ACTUAL_OVERTIME_WORK_PROTECTED:
-				return getActualOvertimeWorkProtected();
-			case MsprojectPackage.TASK__EXTENDED_ATTRIBUTE:
-				return getExtendedAttribute();
-			case MsprojectPackage.TASK__BASELINE:
-				return getBaseline();
-			case MsprojectPackage.TASK__OUTLINE_CODE:
-				return getOutlineCode();
-			case MsprojectPackage.TASK__TIMEPHASED_DATA:
-				return getTimephasedData();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TASK__UID:
-				setUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__ID:
-				setID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__NAME:
-				setName((String)newValue);
-				return;
-			case MsprojectPackage.TASK__TYPE:
-				setType((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__IS_NULL:
-				setIsNull(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__CREATE_DATE:
-				setCreateDate((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__CONTACT:
-				setContact((String)newValue);
-				return;
-			case MsprojectPackage.TASK__WBS:
-				setWBS((String)newValue);
-				return;
-			case MsprojectPackage.TASK__WBS_LEVEL:
-				setWBSLevel((String)newValue);
-				return;
-			case MsprojectPackage.TASK__OUTLINE_NUMBER:
-				setOutlineNumber((String)newValue);
-				return;
-			case MsprojectPackage.TASK__OUTLINE_LEVEL:
-				setOutlineLevel((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__PRIORITY:
-				setPriority((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__START:
-				setStart((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__FINISH:
-				setFinish((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__DURATION:
-				setDuration((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__DURATION_FORMAT:
-				setDurationFormat((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__WORK:
-				setWork((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__STOP:
-				setStop((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__RESUME:
-				setResume((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__RESUME_VALID:
-				setResumeValid(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__EFFORT_DRIVEN:
-				setEffortDriven(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__RECURRING:
-				setRecurring(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__OVER_ALLOCATED:
-				setOverAllocated(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__ESTIMATED:
-				setEstimated(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__MILESTONE:
-				setMilestone(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__SUMMARY:
-				setSummary(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__CRITICAL:
-				setCritical(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__IS_SUBPROJECT:
-				setIsSubproject(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__IS_SUBPROJECT_READ_ONLY:
-				setIsSubprojectReadOnly(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__SUBPROJECT_NAME:
-				setSubprojectName((String)newValue);
-				return;
-			case MsprojectPackage.TASK__EXTERNAL_TASK:
-				setExternalTask(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__EXTERNAL_TASK_PROJECT:
-				setExternalTaskProject((String)newValue);
-				return;
-			case MsprojectPackage.TASK__EARLY_START:
-				setEarlyStart((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__EARLY_FINISH:
-				setEarlyFinish((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__LATE_START:
-				setLateStart((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__LATE_FINISH:
-				setLateFinish((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__START_VARIANCE:
-				setStartVariance((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__FINISH_VARIANCE:
-				setFinishVariance((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__WORK_VARIANCE:
-				setWorkVariance(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.TASK__FREE_SLACK:
-				setFreeSlack((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__TOTAL_SLACK:
-				setTotalSlack((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__FIXED_COST:
-				setFixedCost(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.TASK__FIXED_COST_ACCRUAL:
-				setFixedCostAccrual((String)newValue);
-				return;
-			case MsprojectPackage.TASK__PERCENT_COMPLETE:
-				setPercentComplete((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__PERCENT_WORK_COMPLETE:
-				setPercentWorkComplete((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__COST:
-				setCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.TASK__OVERTIME_COST:
-				setOvertimeCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.TASK__OVERTIME_WORK:
-				setOvertimeWork((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_START:
-				setActualStart((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_FINISH:
-				setActualFinish((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_DURATION:
-				setActualDuration((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_COST:
-				setActualCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_OVERTIME_COST:
-				setActualOvertimeCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_WORK:
-				setActualWork((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_OVERTIME_WORK:
-				setActualOvertimeWork((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__REGULAR_WORK:
-				setRegularWork((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__REMAINING_DURATION:
-				setRemainingDuration((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__REMAINING_COST:
-				setRemainingCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.TASK__REMAINING_WORK:
-				setRemainingWork((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__REMAINING_OVERTIME_COST:
-				setRemainingOvertimeCost((BigDecimal)newValue);
-				return;
-			case MsprojectPackage.TASK__REMAINING_OVERTIME_WORK:
-				setRemainingOvertimeWork((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__ACWP:
-				setACWP(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.TASK__CV:
-				setCV(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.TASK__CONSTRAINT_TYPE:
-				setConstraintType((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__CALENDAR_UID:
-				setCalendarUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__CONSTRAINT_DATE:
-				setConstraintDate((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__DEADLINE:
-				setDeadline((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__LEVEL_ASSIGNMENTS:
-				setLevelAssignments(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__LEVELING_CAN_SPLIT:
-				setLevelingCanSplit(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__LEVELING_DELAY:
-				setLevelingDelay((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__LEVELING_DELAY_FORMAT:
-				setLevelingDelayFormat((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__PRE_LEVELED_START:
-				setPreLeveledStart((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__PRE_LEVELED_FINISH:
-				setPreLeveledFinish((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__HYPERLINK:
-				setHyperlink((String)newValue);
-				return;
-			case MsprojectPackage.TASK__HYPERLINK_ADDRESS:
-				setHyperlinkAddress((String)newValue);
-				return;
-			case MsprojectPackage.TASK__HYPERLINK_SUB_ADDRESS:
-				setHyperlinkSubAddress((String)newValue);
-				return;
-			case MsprojectPackage.TASK__IGNORE_RESOURCE_CALENDAR:
-				setIgnoreResourceCalendar(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__NOTES:
-				setNotes((String)newValue);
-				return;
-			case MsprojectPackage.TASK__HIDE_BAR:
-				setHideBar(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__ROLLUP:
-				setRollup(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.TASK__BCWS:
-				setBCWS(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.TASK__BCWP:
-				setBCWP(((Float)newValue).floatValue());
-				return;
-			case MsprojectPackage.TASK__PHYSICAL_PERCENT_COMPLETE:
-				setPhysicalPercentComplete((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__EARNED_VALUE_METHOD:
-				setEarnedValueMethod((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TASK__PREDECESSOR_LINK:
-				getPredecessorLink().clear();
-				getPredecessorLink().addAll((Collection)newValue);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_WORK_PROTECTED:
-				setActualWorkProtected((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_OVERTIME_WORK_PROTECTED:
-				setActualOvertimeWorkProtected((Object)newValue);
-				return;
-			case MsprojectPackage.TASK__EXTENDED_ATTRIBUTE:
-				getExtendedAttribute().clear();
-				getExtendedAttribute().addAll((Collection)newValue);
-				return;
-			case MsprojectPackage.TASK__BASELINE:
-				getBaseline().clear();
-				getBaseline().addAll((Collection)newValue);
-				return;
-			case MsprojectPackage.TASK__OUTLINE_CODE:
-				getOutlineCode().clear();
-				getOutlineCode().addAll((Collection)newValue);
-				return;
-			case MsprojectPackage.TASK__TIMEPHASED_DATA:
-				getTimephasedData().clear();
-				getTimephasedData().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TASK__UID:
-				setUID(UID_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__ID:
-				setID(ID_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__IS_NULL:
-				unsetIsNull();
-				return;
-			case MsprojectPackage.TASK__CREATE_DATE:
-				setCreateDate(CREATE_DATE_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__CONTACT:
-				setContact(CONTACT_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__WBS:
-				setWBS(WBS_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__WBS_LEVEL:
-				setWBSLevel(WBS_LEVEL_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__OUTLINE_NUMBER:
-				setOutlineNumber(OUTLINE_NUMBER_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__OUTLINE_LEVEL:
-				setOutlineLevel(OUTLINE_LEVEL_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__PRIORITY:
-				setPriority(PRIORITY_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__START:
-				setStart(START_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__FINISH:
-				setFinish(FINISH_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__DURATION:
-				setDuration(DURATION_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__DURATION_FORMAT:
-				setDurationFormat(DURATION_FORMAT_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__WORK:
-				setWork(WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__STOP:
-				setStop(STOP_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__RESUME:
-				setResume(RESUME_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__RESUME_VALID:
-				unsetResumeValid();
-				return;
-			case MsprojectPackage.TASK__EFFORT_DRIVEN:
-				unsetEffortDriven();
-				return;
-			case MsprojectPackage.TASK__RECURRING:
-				unsetRecurring();
-				return;
-			case MsprojectPackage.TASK__OVER_ALLOCATED:
-				unsetOverAllocated();
-				return;
-			case MsprojectPackage.TASK__ESTIMATED:
-				unsetEstimated();
-				return;
-			case MsprojectPackage.TASK__MILESTONE:
-				unsetMilestone();
-				return;
-			case MsprojectPackage.TASK__SUMMARY:
-				unsetSummary();
-				return;
-			case MsprojectPackage.TASK__CRITICAL:
-				unsetCritical();
-				return;
-			case MsprojectPackage.TASK__IS_SUBPROJECT:
-				unsetIsSubproject();
-				return;
-			case MsprojectPackage.TASK__IS_SUBPROJECT_READ_ONLY:
-				unsetIsSubprojectReadOnly();
-				return;
-			case MsprojectPackage.TASK__SUBPROJECT_NAME:
-				setSubprojectName(SUBPROJECT_NAME_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__EXTERNAL_TASK:
-				unsetExternalTask();
-				return;
-			case MsprojectPackage.TASK__EXTERNAL_TASK_PROJECT:
-				setExternalTaskProject(EXTERNAL_TASK_PROJECT_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__EARLY_START:
-				setEarlyStart(EARLY_START_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__EARLY_FINISH:
-				setEarlyFinish(EARLY_FINISH_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__LATE_START:
-				setLateStart(LATE_START_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__LATE_FINISH:
-				setLateFinish(LATE_FINISH_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__START_VARIANCE:
-				setStartVariance(START_VARIANCE_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__FINISH_VARIANCE:
-				setFinishVariance(FINISH_VARIANCE_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__WORK_VARIANCE:
-				unsetWorkVariance();
-				return;
-			case MsprojectPackage.TASK__FREE_SLACK:
-				setFreeSlack(FREE_SLACK_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__TOTAL_SLACK:
-				setTotalSlack(TOTAL_SLACK_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__FIXED_COST:
-				unsetFixedCost();
-				return;
-			case MsprojectPackage.TASK__FIXED_COST_ACCRUAL:
-				setFixedCostAccrual(FIXED_COST_ACCRUAL_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__PERCENT_COMPLETE:
-				setPercentComplete(PERCENT_COMPLETE_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__PERCENT_WORK_COMPLETE:
-				setPercentWorkComplete(PERCENT_WORK_COMPLETE_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__COST:
-				setCost(COST_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__OVERTIME_COST:
-				setOvertimeCost(OVERTIME_COST_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__OVERTIME_WORK:
-				setOvertimeWork(OVERTIME_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_START:
-				setActualStart(ACTUAL_START_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_FINISH:
-				setActualFinish(ACTUAL_FINISH_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_DURATION:
-				setActualDuration(ACTUAL_DURATION_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_COST:
-				setActualCost(ACTUAL_COST_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_OVERTIME_COST:
-				setActualOvertimeCost(ACTUAL_OVERTIME_COST_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_WORK:
-				setActualWork(ACTUAL_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_OVERTIME_WORK:
-				setActualOvertimeWork(ACTUAL_OVERTIME_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__REGULAR_WORK:
-				setRegularWork(REGULAR_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__REMAINING_DURATION:
-				setRemainingDuration(REMAINING_DURATION_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__REMAINING_COST:
-				setRemainingCost(REMAINING_COST_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__REMAINING_WORK:
-				setRemainingWork(REMAINING_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__REMAINING_OVERTIME_COST:
-				setRemainingOvertimeCost(REMAINING_OVERTIME_COST_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__REMAINING_OVERTIME_WORK:
-				setRemainingOvertimeWork(REMAINING_OVERTIME_WORK_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__ACWP:
-				unsetACWP();
-				return;
-			case MsprojectPackage.TASK__CV:
-				unsetCV();
-				return;
-			case MsprojectPackage.TASK__CONSTRAINT_TYPE:
-				setConstraintType(CONSTRAINT_TYPE_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__CALENDAR_UID:
-				setCalendarUID(CALENDAR_UID_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__CONSTRAINT_DATE:
-				setConstraintDate(CONSTRAINT_DATE_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__DEADLINE:
-				setDeadline(DEADLINE_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__LEVEL_ASSIGNMENTS:
-				unsetLevelAssignments();
-				return;
-			case MsprojectPackage.TASK__LEVELING_CAN_SPLIT:
-				unsetLevelingCanSplit();
-				return;
-			case MsprojectPackage.TASK__LEVELING_DELAY:
-				setLevelingDelay(LEVELING_DELAY_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__LEVELING_DELAY_FORMAT:
-				setLevelingDelayFormat(LEVELING_DELAY_FORMAT_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__PRE_LEVELED_START:
-				setPreLeveledStart(PRE_LEVELED_START_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__PRE_LEVELED_FINISH:
-				setPreLeveledFinish(PRE_LEVELED_FINISH_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__HYPERLINK:
-				setHyperlink(HYPERLINK_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__HYPERLINK_ADDRESS:
-				setHyperlinkAddress(HYPERLINK_ADDRESS_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__HYPERLINK_SUB_ADDRESS:
-				setHyperlinkSubAddress(HYPERLINK_SUB_ADDRESS_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__IGNORE_RESOURCE_CALENDAR:
-				unsetIgnoreResourceCalendar();
-				return;
-			case MsprojectPackage.TASK__NOTES:
-				setNotes(NOTES_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__HIDE_BAR:
-				unsetHideBar();
-				return;
-			case MsprojectPackage.TASK__ROLLUP:
-				unsetRollup();
-				return;
-			case MsprojectPackage.TASK__BCWS:
-				unsetBCWS();
-				return;
-			case MsprojectPackage.TASK__BCWP:
-				unsetBCWP();
-				return;
-			case MsprojectPackage.TASK__PHYSICAL_PERCENT_COMPLETE:
-				setPhysicalPercentComplete(PHYSICAL_PERCENT_COMPLETE_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__EARNED_VALUE_METHOD:
-				setEarnedValueMethod(EARNED_VALUE_METHOD_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__PREDECESSOR_LINK:
-				getPredecessorLink().clear();
-				return;
-			case MsprojectPackage.TASK__ACTUAL_WORK_PROTECTED:
-				setActualWorkProtected(ACTUAL_WORK_PROTECTED_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__ACTUAL_OVERTIME_WORK_PROTECTED:
-				setActualOvertimeWorkProtected(ACTUAL_OVERTIME_WORK_PROTECTED_EDEFAULT);
-				return;
-			case MsprojectPackage.TASK__EXTENDED_ATTRIBUTE:
-				getExtendedAttribute().clear();
-				return;
-			case MsprojectPackage.TASK__BASELINE:
-				getBaseline().clear();
-				return;
-			case MsprojectPackage.TASK__OUTLINE_CODE:
-				getOutlineCode().clear();
-				return;
-			case MsprojectPackage.TASK__TIMEPHASED_DATA:
-				getTimephasedData().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TASK__UID:
-				return UID_EDEFAULT == null ? uID != null : !UID_EDEFAULT.equals(uID);
-			case MsprojectPackage.TASK__ID:
-				return ID_EDEFAULT == null ? iD != null : !ID_EDEFAULT.equals(iD);
-			case MsprojectPackage.TASK__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case MsprojectPackage.TASK__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case MsprojectPackage.TASK__IS_NULL:
-				return isSetIsNull();
-			case MsprojectPackage.TASK__CREATE_DATE:
-				return CREATE_DATE_EDEFAULT == null ? createDate != null : !CREATE_DATE_EDEFAULT.equals(createDate);
-			case MsprojectPackage.TASK__CONTACT:
-				return CONTACT_EDEFAULT == null ? contact != null : !CONTACT_EDEFAULT.equals(contact);
-			case MsprojectPackage.TASK__WBS:
-				return WBS_EDEFAULT == null ? wBS != null : !WBS_EDEFAULT.equals(wBS);
-			case MsprojectPackage.TASK__WBS_LEVEL:
-				return WBS_LEVEL_EDEFAULT == null ? wBSLevel != null : !WBS_LEVEL_EDEFAULT.equals(wBSLevel);
-			case MsprojectPackage.TASK__OUTLINE_NUMBER:
-				return OUTLINE_NUMBER_EDEFAULT == null ? outlineNumber != null : !OUTLINE_NUMBER_EDEFAULT.equals(outlineNumber);
-			case MsprojectPackage.TASK__OUTLINE_LEVEL:
-				return OUTLINE_LEVEL_EDEFAULT == null ? outlineLevel != null : !OUTLINE_LEVEL_EDEFAULT.equals(outlineLevel);
-			case MsprojectPackage.TASK__PRIORITY:
-				return PRIORITY_EDEFAULT == null ? priority != null : !PRIORITY_EDEFAULT.equals(priority);
-			case MsprojectPackage.TASK__START:
-				return START_EDEFAULT == null ? start != null : !START_EDEFAULT.equals(start);
-			case MsprojectPackage.TASK__FINISH:
-				return FINISH_EDEFAULT == null ? finish != null : !FINISH_EDEFAULT.equals(finish);
-			case MsprojectPackage.TASK__DURATION:
-				return DURATION_EDEFAULT == null ? duration != null : !DURATION_EDEFAULT.equals(duration);
-			case MsprojectPackage.TASK__DURATION_FORMAT:
-				return DURATION_FORMAT_EDEFAULT == null ? durationFormat != null : !DURATION_FORMAT_EDEFAULT.equals(durationFormat);
-			case MsprojectPackage.TASK__WORK:
-				return WORK_EDEFAULT == null ? work != null : !WORK_EDEFAULT.equals(work);
-			case MsprojectPackage.TASK__STOP:
-				return STOP_EDEFAULT == null ? stop != null : !STOP_EDEFAULT.equals(stop);
-			case MsprojectPackage.TASK__RESUME:
-				return RESUME_EDEFAULT == null ? resume != null : !RESUME_EDEFAULT.equals(resume);
-			case MsprojectPackage.TASK__RESUME_VALID:
-				return isSetResumeValid();
-			case MsprojectPackage.TASK__EFFORT_DRIVEN:
-				return isSetEffortDriven();
-			case MsprojectPackage.TASK__RECURRING:
-				return isSetRecurring();
-			case MsprojectPackage.TASK__OVER_ALLOCATED:
-				return isSetOverAllocated();
-			case MsprojectPackage.TASK__ESTIMATED:
-				return isSetEstimated();
-			case MsprojectPackage.TASK__MILESTONE:
-				return isSetMilestone();
-			case MsprojectPackage.TASK__SUMMARY:
-				return isSetSummary();
-			case MsprojectPackage.TASK__CRITICAL:
-				return isSetCritical();
-			case MsprojectPackage.TASK__IS_SUBPROJECT:
-				return isSetIsSubproject();
-			case MsprojectPackage.TASK__IS_SUBPROJECT_READ_ONLY:
-				return isSetIsSubprojectReadOnly();
-			case MsprojectPackage.TASK__SUBPROJECT_NAME:
-				return SUBPROJECT_NAME_EDEFAULT == null ? subprojectName != null : !SUBPROJECT_NAME_EDEFAULT.equals(subprojectName);
-			case MsprojectPackage.TASK__EXTERNAL_TASK:
-				return isSetExternalTask();
-			case MsprojectPackage.TASK__EXTERNAL_TASK_PROJECT:
-				return EXTERNAL_TASK_PROJECT_EDEFAULT == null ? externalTaskProject != null : !EXTERNAL_TASK_PROJECT_EDEFAULT.equals(externalTaskProject);
-			case MsprojectPackage.TASK__EARLY_START:
-				return EARLY_START_EDEFAULT == null ? earlyStart != null : !EARLY_START_EDEFAULT.equals(earlyStart);
-			case MsprojectPackage.TASK__EARLY_FINISH:
-				return EARLY_FINISH_EDEFAULT == null ? earlyFinish != null : !EARLY_FINISH_EDEFAULT.equals(earlyFinish);
-			case MsprojectPackage.TASK__LATE_START:
-				return LATE_START_EDEFAULT == null ? lateStart != null : !LATE_START_EDEFAULT.equals(lateStart);
-			case MsprojectPackage.TASK__LATE_FINISH:
-				return LATE_FINISH_EDEFAULT == null ? lateFinish != null : !LATE_FINISH_EDEFAULT.equals(lateFinish);
-			case MsprojectPackage.TASK__START_VARIANCE:
-				return START_VARIANCE_EDEFAULT == null ? startVariance != null : !START_VARIANCE_EDEFAULT.equals(startVariance);
-			case MsprojectPackage.TASK__FINISH_VARIANCE:
-				return FINISH_VARIANCE_EDEFAULT == null ? finishVariance != null : !FINISH_VARIANCE_EDEFAULT.equals(finishVariance);
-			case MsprojectPackage.TASK__WORK_VARIANCE:
-				return isSetWorkVariance();
-			case MsprojectPackage.TASK__FREE_SLACK:
-				return FREE_SLACK_EDEFAULT == null ? freeSlack != null : !FREE_SLACK_EDEFAULT.equals(freeSlack);
-			case MsprojectPackage.TASK__TOTAL_SLACK:
-				return TOTAL_SLACK_EDEFAULT == null ? totalSlack != null : !TOTAL_SLACK_EDEFAULT.equals(totalSlack);
-			case MsprojectPackage.TASK__FIXED_COST:
-				return isSetFixedCost();
-			case MsprojectPackage.TASK__FIXED_COST_ACCRUAL:
-				return FIXED_COST_ACCRUAL_EDEFAULT == null ? fixedCostAccrual != null : !FIXED_COST_ACCRUAL_EDEFAULT.equals(fixedCostAccrual);
-			case MsprojectPackage.TASK__PERCENT_COMPLETE:
-				return PERCENT_COMPLETE_EDEFAULT == null ? percentComplete != null : !PERCENT_COMPLETE_EDEFAULT.equals(percentComplete);
-			case MsprojectPackage.TASK__PERCENT_WORK_COMPLETE:
-				return PERCENT_WORK_COMPLETE_EDEFAULT == null ? percentWorkComplete != null : !PERCENT_WORK_COMPLETE_EDEFAULT.equals(percentWorkComplete);
-			case MsprojectPackage.TASK__COST:
-				return COST_EDEFAULT == null ? cost != null : !COST_EDEFAULT.equals(cost);
-			case MsprojectPackage.TASK__OVERTIME_COST:
-				return OVERTIME_COST_EDEFAULT == null ? overtimeCost != null : !OVERTIME_COST_EDEFAULT.equals(overtimeCost);
-			case MsprojectPackage.TASK__OVERTIME_WORK:
-				return OVERTIME_WORK_EDEFAULT == null ? overtimeWork != null : !OVERTIME_WORK_EDEFAULT.equals(overtimeWork);
-			case MsprojectPackage.TASK__ACTUAL_START:
-				return ACTUAL_START_EDEFAULT == null ? actualStart != null : !ACTUAL_START_EDEFAULT.equals(actualStart);
-			case MsprojectPackage.TASK__ACTUAL_FINISH:
-				return ACTUAL_FINISH_EDEFAULT == null ? actualFinish != null : !ACTUAL_FINISH_EDEFAULT.equals(actualFinish);
-			case MsprojectPackage.TASK__ACTUAL_DURATION:
-				return ACTUAL_DURATION_EDEFAULT == null ? actualDuration != null : !ACTUAL_DURATION_EDEFAULT.equals(actualDuration);
-			case MsprojectPackage.TASK__ACTUAL_COST:
-				return ACTUAL_COST_EDEFAULT == null ? actualCost != null : !ACTUAL_COST_EDEFAULT.equals(actualCost);
-			case MsprojectPackage.TASK__ACTUAL_OVERTIME_COST:
-				return ACTUAL_OVERTIME_COST_EDEFAULT == null ? actualOvertimeCost != null : !ACTUAL_OVERTIME_COST_EDEFAULT.equals(actualOvertimeCost);
-			case MsprojectPackage.TASK__ACTUAL_WORK:
-				return ACTUAL_WORK_EDEFAULT == null ? actualWork != null : !ACTUAL_WORK_EDEFAULT.equals(actualWork);
-			case MsprojectPackage.TASK__ACTUAL_OVERTIME_WORK:
-				return ACTUAL_OVERTIME_WORK_EDEFAULT == null ? actualOvertimeWork != null : !ACTUAL_OVERTIME_WORK_EDEFAULT.equals(actualOvertimeWork);
-			case MsprojectPackage.TASK__REGULAR_WORK:
-				return REGULAR_WORK_EDEFAULT == null ? regularWork != null : !REGULAR_WORK_EDEFAULT.equals(regularWork);
-			case MsprojectPackage.TASK__REMAINING_DURATION:
-				return REMAINING_DURATION_EDEFAULT == null ? remainingDuration != null : !REMAINING_DURATION_EDEFAULT.equals(remainingDuration);
-			case MsprojectPackage.TASK__REMAINING_COST:
-				return REMAINING_COST_EDEFAULT == null ? remainingCost != null : !REMAINING_COST_EDEFAULT.equals(remainingCost);
-			case MsprojectPackage.TASK__REMAINING_WORK:
-				return REMAINING_WORK_EDEFAULT == null ? remainingWork != null : !REMAINING_WORK_EDEFAULT.equals(remainingWork);
-			case MsprojectPackage.TASK__REMAINING_OVERTIME_COST:
-				return REMAINING_OVERTIME_COST_EDEFAULT == null ? remainingOvertimeCost != null : !REMAINING_OVERTIME_COST_EDEFAULT.equals(remainingOvertimeCost);
-			case MsprojectPackage.TASK__REMAINING_OVERTIME_WORK:
-				return REMAINING_OVERTIME_WORK_EDEFAULT == null ? remainingOvertimeWork != null : !REMAINING_OVERTIME_WORK_EDEFAULT.equals(remainingOvertimeWork);
-			case MsprojectPackage.TASK__ACWP:
-				return isSetACWP();
-			case MsprojectPackage.TASK__CV:
-				return isSetCV();
-			case MsprojectPackage.TASK__CONSTRAINT_TYPE:
-				return CONSTRAINT_TYPE_EDEFAULT == null ? constraintType != null : !CONSTRAINT_TYPE_EDEFAULT.equals(constraintType);
-			case MsprojectPackage.TASK__CALENDAR_UID:
-				return CALENDAR_UID_EDEFAULT == null ? calendarUID != null : !CALENDAR_UID_EDEFAULT.equals(calendarUID);
-			case MsprojectPackage.TASK__CONSTRAINT_DATE:
-				return CONSTRAINT_DATE_EDEFAULT == null ? constraintDate != null : !CONSTRAINT_DATE_EDEFAULT.equals(constraintDate);
-			case MsprojectPackage.TASK__DEADLINE:
-				return DEADLINE_EDEFAULT == null ? deadline != null : !DEADLINE_EDEFAULT.equals(deadline);
-			case MsprojectPackage.TASK__LEVEL_ASSIGNMENTS:
-				return isSetLevelAssignments();
-			case MsprojectPackage.TASK__LEVELING_CAN_SPLIT:
-				return isSetLevelingCanSplit();
-			case MsprojectPackage.TASK__LEVELING_DELAY:
-				return LEVELING_DELAY_EDEFAULT == null ? levelingDelay != null : !LEVELING_DELAY_EDEFAULT.equals(levelingDelay);
-			case MsprojectPackage.TASK__LEVELING_DELAY_FORMAT:
-				return LEVELING_DELAY_FORMAT_EDEFAULT == null ? levelingDelayFormat != null : !LEVELING_DELAY_FORMAT_EDEFAULT.equals(levelingDelayFormat);
-			case MsprojectPackage.TASK__PRE_LEVELED_START:
-				return PRE_LEVELED_START_EDEFAULT == null ? preLeveledStart != null : !PRE_LEVELED_START_EDEFAULT.equals(preLeveledStart);
-			case MsprojectPackage.TASK__PRE_LEVELED_FINISH:
-				return PRE_LEVELED_FINISH_EDEFAULT == null ? preLeveledFinish != null : !PRE_LEVELED_FINISH_EDEFAULT.equals(preLeveledFinish);
-			case MsprojectPackage.TASK__HYPERLINK:
-				return HYPERLINK_EDEFAULT == null ? hyperlink != null : !HYPERLINK_EDEFAULT.equals(hyperlink);
-			case MsprojectPackage.TASK__HYPERLINK_ADDRESS:
-				return HYPERLINK_ADDRESS_EDEFAULT == null ? hyperlinkAddress != null : !HYPERLINK_ADDRESS_EDEFAULT.equals(hyperlinkAddress);
-			case MsprojectPackage.TASK__HYPERLINK_SUB_ADDRESS:
-				return HYPERLINK_SUB_ADDRESS_EDEFAULT == null ? hyperlinkSubAddress != null : !HYPERLINK_SUB_ADDRESS_EDEFAULT.equals(hyperlinkSubAddress);
-			case MsprojectPackage.TASK__IGNORE_RESOURCE_CALENDAR:
-				return isSetIgnoreResourceCalendar();
-			case MsprojectPackage.TASK__NOTES:
-				return NOTES_EDEFAULT == null ? notes != null : !NOTES_EDEFAULT.equals(notes);
-			case MsprojectPackage.TASK__HIDE_BAR:
-				return isSetHideBar();
-			case MsprojectPackage.TASK__ROLLUP:
-				return isSetRollup();
-			case MsprojectPackage.TASK__BCWS:
-				return isSetBCWS();
-			case MsprojectPackage.TASK__BCWP:
-				return isSetBCWP();
-			case MsprojectPackage.TASK__PHYSICAL_PERCENT_COMPLETE:
-				return PHYSICAL_PERCENT_COMPLETE_EDEFAULT == null ? physicalPercentComplete != null : !PHYSICAL_PERCENT_COMPLETE_EDEFAULT.equals(physicalPercentComplete);
-			case MsprojectPackage.TASK__EARNED_VALUE_METHOD:
-				return EARNED_VALUE_METHOD_EDEFAULT == null ? earnedValueMethod != null : !EARNED_VALUE_METHOD_EDEFAULT.equals(earnedValueMethod);
-			case MsprojectPackage.TASK__PREDECESSOR_LINK:
-				return predecessorLink != null && !predecessorLink.isEmpty();
-			case MsprojectPackage.TASK__ACTUAL_WORK_PROTECTED:
-				return ACTUAL_WORK_PROTECTED_EDEFAULT == null ? actualWorkProtected != null : !ACTUAL_WORK_PROTECTED_EDEFAULT.equals(actualWorkProtected);
-			case MsprojectPackage.TASK__ACTUAL_OVERTIME_WORK_PROTECTED:
-				return ACTUAL_OVERTIME_WORK_PROTECTED_EDEFAULT == null ? actualOvertimeWorkProtected != null : !ACTUAL_OVERTIME_WORK_PROTECTED_EDEFAULT.equals(actualOvertimeWorkProtected);
-			case MsprojectPackage.TASK__EXTENDED_ATTRIBUTE:
-				return extendedAttribute != null && !extendedAttribute.isEmpty();
-			case MsprojectPackage.TASK__BASELINE:
-				return baseline != null && !baseline.isEmpty();
-			case MsprojectPackage.TASK__OUTLINE_CODE:
-				return outlineCode != null && !outlineCode.isEmpty();
-			case MsprojectPackage.TASK__TIMEPHASED_DATA:
-				return timephasedData != null && !timephasedData.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (uID: ");
-		result.append(uID);
-		result.append(", iD: ");
-		result.append(iD);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", type: ");
-		result.append(type);
-		result.append(", isNull: ");
-		if (isNullESet) result.append(isNull); else result.append("<unset>");
-		result.append(", createDate: ");
-		result.append(createDate);
-		result.append(", contact: ");
-		result.append(contact);
-		result.append(", wBS: ");
-		result.append(wBS);
-		result.append(", wBSLevel: ");
-		result.append(wBSLevel);
-		result.append(", outlineNumber: ");
-		result.append(outlineNumber);
-		result.append(", outlineLevel: ");
-		result.append(outlineLevel);
-		result.append(", priority: ");
-		result.append(priority);
-		result.append(", start: ");
-		result.append(start);
-		result.append(", finish: ");
-		result.append(finish);
-		result.append(", duration: ");
-		result.append(duration);
-		result.append(", durationFormat: ");
-		result.append(durationFormat);
-		result.append(", work: ");
-		result.append(work);
-		result.append(", stop: ");
-		result.append(stop);
-		result.append(", resume: ");
-		result.append(resume);
-		result.append(", resumeValid: ");
-		if (resumeValidESet) result.append(resumeValid); else result.append("<unset>");
-		result.append(", effortDriven: ");
-		if (effortDrivenESet) result.append(effortDriven); else result.append("<unset>");
-		result.append(", recurring: ");
-		if (recurringESet) result.append(recurring); else result.append("<unset>");
-		result.append(", overAllocated: ");
-		if (overAllocatedESet) result.append(overAllocated); else result.append("<unset>");
-		result.append(", estimated: ");
-		if (estimatedESet) result.append(estimated); else result.append("<unset>");
-		result.append(", milestone: ");
-		if (milestoneESet) result.append(milestone); else result.append("<unset>");
-		result.append(", summary: ");
-		if (summaryESet) result.append(summary); else result.append("<unset>");
-		result.append(", critical: ");
-		if (criticalESet) result.append(critical); else result.append("<unset>");
-		result.append(", isSubproject: ");
-		if (isSubprojectESet) result.append(isSubproject); else result.append("<unset>");
-		result.append(", isSubprojectReadOnly: ");
-		if (isSubprojectReadOnlyESet) result.append(isSubprojectReadOnly); else result.append("<unset>");
-		result.append(", subprojectName: ");
-		result.append(subprojectName);
-		result.append(", externalTask: ");
-		if (externalTaskESet) result.append(externalTask); else result.append("<unset>");
-		result.append(", externalTaskProject: ");
-		result.append(externalTaskProject);
-		result.append(", earlyStart: ");
-		result.append(earlyStart);
-		result.append(", earlyFinish: ");
-		result.append(earlyFinish);
-		result.append(", lateStart: ");
-		result.append(lateStart);
-		result.append(", lateFinish: ");
-		result.append(lateFinish);
-		result.append(", startVariance: ");
-		result.append(startVariance);
-		result.append(", finishVariance: ");
-		result.append(finishVariance);
-		result.append(", workVariance: ");
-		if (workVarianceESet) result.append(workVariance); else result.append("<unset>");
-		result.append(", freeSlack: ");
-		result.append(freeSlack);
-		result.append(", totalSlack: ");
-		result.append(totalSlack);
-		result.append(", fixedCost: ");
-		if (fixedCostESet) result.append(fixedCost); else result.append("<unset>");
-		result.append(", fixedCostAccrual: ");
-		result.append(fixedCostAccrual);
-		result.append(", percentComplete: ");
-		result.append(percentComplete);
-		result.append(", percentWorkComplete: ");
-		result.append(percentWorkComplete);
-		result.append(", cost: ");
-		result.append(cost);
-		result.append(", overtimeCost: ");
-		result.append(overtimeCost);
-		result.append(", overtimeWork: ");
-		result.append(overtimeWork);
-		result.append(", actualStart: ");
-		result.append(actualStart);
-		result.append(", actualFinish: ");
-		result.append(actualFinish);
-		result.append(", actualDuration: ");
-		result.append(actualDuration);
-		result.append(", actualCost: ");
-		result.append(actualCost);
-		result.append(", actualOvertimeCost: ");
-		result.append(actualOvertimeCost);
-		result.append(", actualWork: ");
-		result.append(actualWork);
-		result.append(", actualOvertimeWork: ");
-		result.append(actualOvertimeWork);
-		result.append(", regularWork: ");
-		result.append(regularWork);
-		result.append(", remainingDuration: ");
-		result.append(remainingDuration);
-		result.append(", remainingCost: ");
-		result.append(remainingCost);
-		result.append(", remainingWork: ");
-		result.append(remainingWork);
-		result.append(", remainingOvertimeCost: ");
-		result.append(remainingOvertimeCost);
-		result.append(", remainingOvertimeWork: ");
-		result.append(remainingOvertimeWork);
-		result.append(", aCWP: ");
-		if (aCWPESet) result.append(aCWP); else result.append("<unset>");
-		result.append(", cV: ");
-		if (cVESet) result.append(cV); else result.append("<unset>");
-		result.append(", constraintType: ");
-		result.append(constraintType);
-		result.append(", calendarUID: ");
-		result.append(calendarUID);
-		result.append(", constraintDate: ");
-		result.append(constraintDate);
-		result.append(", deadline: ");
-		result.append(deadline);
-		result.append(", levelAssignments: ");
-		if (levelAssignmentsESet) result.append(levelAssignments); else result.append("<unset>");
-		result.append(", levelingCanSplit: ");
-		if (levelingCanSplitESet) result.append(levelingCanSplit); else result.append("<unset>");
-		result.append(", levelingDelay: ");
-		result.append(levelingDelay);
-		result.append(", levelingDelayFormat: ");
-		result.append(levelingDelayFormat);
-		result.append(", preLeveledStart: ");
-		result.append(preLeveledStart);
-		result.append(", preLeveledFinish: ");
-		result.append(preLeveledFinish);
-		result.append(", hyperlink: ");
-		result.append(hyperlink);
-		result.append(", hyperlinkAddress: ");
-		result.append(hyperlinkAddress);
-		result.append(", hyperlinkSubAddress: ");
-		result.append(hyperlinkSubAddress);
-		result.append(", ignoreResourceCalendar: ");
-		if (ignoreResourceCalendarESet) result.append(ignoreResourceCalendar); else result.append("<unset>");
-		result.append(", notes: ");
-		result.append(notes);
-		result.append(", hideBar: ");
-		if (hideBarESet) result.append(hideBar); else result.append("<unset>");
-		result.append(", rollup: ");
-		if (rollupESet) result.append(rollup); else result.append("<unset>");
-		result.append(", bCWS: ");
-		if (bCWSESet) result.append(bCWS); else result.append("<unset>");
-		result.append(", bCWP: ");
-		if (bCWPESet) result.append(bCWP); else result.append("<unset>");
-		result.append(", physicalPercentComplete: ");
-		result.append(physicalPercentComplete);
-		result.append(", earnedValueMethod: ");
-		result.append(earnedValueMethod);
-		result.append(", actualWorkProtected: ");
-		result.append(actualWorkProtected);
-		result.append(", actualOvertimeWorkProtected: ");
-		result.append(actualOvertimeWorkProtected);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TaskImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/TasksImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/TasksImpl.java
deleted file mode 100755
index a5542c7..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/TasksImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TasksImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.Task;
-import org.eclipse.epf.msproject.Tasks;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tasks</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.TasksImpl#getTask <em>Task</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TasksImpl extends EObjectImpl implements Tasks {
-	/**
-	 * The cached value of the '{@link #getTask() <em>Task</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTask()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList task = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TasksImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getTasks();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTask() {
-		if (task == null) {
-			task = new EObjectContainmentEList(Task.class, this, MsprojectPackage.TASKS__TASK);
-		}
-		return task;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.TASKS__TASK:
-					return ((InternalEList)getTask()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TASKS__TASK:
-				return getTask();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TASKS__TASK:
-				getTask().clear();
-				getTask().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TASKS__TASK:
-				getTask().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TASKS__TASK:
-				return task != null && !task.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //TasksImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/TimePeriodImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/TimePeriodImpl.java
deleted file mode 100755
index bcef623..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/TimePeriodImpl.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TimePeriodImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.TimePeriod;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Time Period</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.TimePeriodImpl#getFromDate <em>From Date</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TimePeriodImpl#getToDate <em>To Date</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TimePeriodImpl extends EObjectImpl implements TimePeriod {
-	/**
-	 * The default value of the '{@link #getFromDate() <em>From Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFromDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object FROM_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFromDate() <em>From Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFromDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object fromDate = FROM_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getToDate() <em>To Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object TO_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getToDate() <em>To Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object toDate = TO_DATE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TimePeriodImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getTimePeriod();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getFromDate() {
-		return fromDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFromDate(Object newFromDate) {
-		Object oldFromDate = fromDate;
-		fromDate = newFromDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TIME_PERIOD__FROM_DATE, oldFromDate, fromDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getToDate() {
-		return toDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setToDate(Object newToDate) {
-		Object oldToDate = toDate;
-		toDate = newToDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TIME_PERIOD__TO_DATE, oldToDate, toDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TIME_PERIOD__FROM_DATE:
-				return getFromDate();
-			case MsprojectPackage.TIME_PERIOD__TO_DATE:
-				return getToDate();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TIME_PERIOD__FROM_DATE:
-				setFromDate((Object)newValue);
-				return;
-			case MsprojectPackage.TIME_PERIOD__TO_DATE:
-				setToDate((Object)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TIME_PERIOD__FROM_DATE:
-				setFromDate(FROM_DATE_EDEFAULT);
-				return;
-			case MsprojectPackage.TIME_PERIOD__TO_DATE:
-				setToDate(TO_DATE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TIME_PERIOD__FROM_DATE:
-				return FROM_DATE_EDEFAULT == null ? fromDate != null : !FROM_DATE_EDEFAULT.equals(fromDate);
-			case MsprojectPackage.TIME_PERIOD__TO_DATE:
-				return TO_DATE_EDEFAULT == null ? toDate != null : !TO_DATE_EDEFAULT.equals(toDate);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (fromDate: ");
-		result.append(fromDate);
-		result.append(", toDate: ");
-		result.append(toDate);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TimePeriodImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/TimephasedDataTypeImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/TimephasedDataTypeImpl.java
deleted file mode 100755
index a1587b1..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/TimephasedDataTypeImpl.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TimephasedDataTypeImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.TimephasedDataType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Timephased Data Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.TimephasedDataTypeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TimephasedDataTypeImpl#getUID <em>UID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TimephasedDataTypeImpl#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TimephasedDataTypeImpl#getFinish <em>Finish</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TimephasedDataTypeImpl#getUnit <em>Unit</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.TimephasedDataTypeImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TimephasedDataTypeImpl extends EObjectImpl implements TimephasedDataType {
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger type = TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger UID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUID() <em>UID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger uID = UID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStart() <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object START_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStart() <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object start = START_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFinish() <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object FINISH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFinish() <em>Finish</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinish()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object finish = FINISH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getUnit() <em>Unit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnit()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger UNIT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUnit() <em>Unit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnit()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger unit = UNIT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TimephasedDataTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getTimephasedDataType();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(BigInteger newType) {
-		BigInteger oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TIMEPHASED_DATA_TYPE__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getUID() {
-		return uID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUID(BigInteger newUID) {
-		BigInteger oldUID = uID;
-		uID = newUID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TIMEPHASED_DATA_TYPE__UID, oldUID, uID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getStart() {
-		return start;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStart(Object newStart) {
-		Object oldStart = start;
-		start = newStart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TIMEPHASED_DATA_TYPE__START, oldStart, start));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getFinish() {
-		return finish;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinish(Object newFinish) {
-		Object oldFinish = finish;
-		finish = newFinish;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TIMEPHASED_DATA_TYPE__FINISH, oldFinish, finish));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getUnit() {
-		return unit;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUnit(BigInteger newUnit) {
-		BigInteger oldUnit = unit;
-		unit = newUnit;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TIMEPHASED_DATA_TYPE__UNIT, oldUnit, unit));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.TIMEPHASED_DATA_TYPE__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__TYPE:
-				return getType();
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__UID:
-				return getUID();
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__START:
-				return getStart();
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__FINISH:
-				return getFinish();
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__UNIT:
-				return getUnit();
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__VALUE:
-				return getValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__TYPE:
-				setType((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__UID:
-				setUID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__START:
-				setStart((Object)newValue);
-				return;
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__FINISH:
-				setFinish((Object)newValue);
-				return;
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__UNIT:
-				setUnit((BigInteger)newValue);
-				return;
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__VALUE:
-				setValue((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__UID:
-				setUID(UID_EDEFAULT);
-				return;
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__START:
-				setStart(START_EDEFAULT);
-				return;
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__FINISH:
-				setFinish(FINISH_EDEFAULT);
-				return;
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__UNIT:
-				setUnit(UNIT_EDEFAULT);
-				return;
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__UID:
-				return UID_EDEFAULT == null ? uID != null : !UID_EDEFAULT.equals(uID);
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__START:
-				return START_EDEFAULT == null ? start != null : !START_EDEFAULT.equals(start);
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__FINISH:
-				return FINISH_EDEFAULT == null ? finish != null : !FINISH_EDEFAULT.equals(finish);
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__UNIT:
-				return UNIT_EDEFAULT == null ? unit != null : !UNIT_EDEFAULT.equals(unit);
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (type: ");
-		result.append(type);
-		result.append(", uID: ");
-		result.append(uID);
-		result.append(", start: ");
-		result.append(start);
-		result.append(", finish: ");
-		result.append(finish);
-		result.append(", unit: ");
-		result.append(unit);
-		result.append(", value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TimephasedDataTypeImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/Value2Impl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/Value2Impl.java
deleted file mode 100755
index 0e4f02a..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/Value2Impl.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Value2Impl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.Value2;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Value2</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.Value2Impl#getID <em>ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.Value2Impl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.Value2Impl#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class Value2Impl extends EObjectImpl implements Value2 {
-	/**
-	 * The default value of the '{@link #getID() <em>ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getID() <em>ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger iD = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Value2Impl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getValue2();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getID() {
-		return iD;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setID(BigInteger newID) {
-		BigInteger oldID = iD;
-		iD = newID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.VALUE2__ID, oldID, iD));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.VALUE2__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.VALUE2__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUE2__ID:
-				return getID();
-			case MsprojectPackage.VALUE2__VALUE:
-				return getValue();
-			case MsprojectPackage.VALUE2__DESCRIPTION:
-				return getDescription();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUE2__ID:
-				setID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.VALUE2__VALUE:
-				setValue((String)newValue);
-				return;
-			case MsprojectPackage.VALUE2__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUE2__ID:
-				setID(ID_EDEFAULT);
-				return;
-			case MsprojectPackage.VALUE2__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case MsprojectPackage.VALUE2__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUE2__ID:
-				return ID_EDEFAULT == null ? iD != null : !ID_EDEFAULT.equals(iD);
-			case MsprojectPackage.VALUE2__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case MsprojectPackage.VALUE2__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (iD: ");
-		result.append(iD);
-		result.append(", value: ");
-		result.append(value);
-		result.append(", description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-} //Value2Impl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ValueImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ValueImpl.java
deleted file mode 100755
index d103d04..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ValueImpl.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ValueImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.Value;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.ValueImpl#getValueID <em>Value ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ValueImpl#getParentValueID <em>Parent Value ID</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ValueImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ValueImpl#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ValueImpl extends EObjectImpl implements Value {
-	/**
-	 * The default value of the '{@link #getValueID() <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger VALUE_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValueID() <em>Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger valueID = VALUE_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getParentValueID() <em>Parent Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParentValueID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger PARENT_VALUE_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getParentValueID() <em>Parent Value ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParentValueID()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger parentValueID = PARENT_VALUE_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ValueImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getValue();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getValueID() {
-		return valueID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValueID(BigInteger newValueID) {
-		BigInteger oldValueID = valueID;
-		valueID = newValueID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.VALUE__VALUE_ID, oldValueID, valueID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getParentValueID() {
-		return parentValueID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentValueID(BigInteger newParentValueID) {
-		BigInteger oldParentValueID = parentValueID;
-		parentValueID = newParentValueID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.VALUE__PARENT_VALUE_ID, oldParentValueID, parentValueID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.VALUE__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.VALUE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUE__VALUE_ID:
-				return getValueID();
-			case MsprojectPackage.VALUE__PARENT_VALUE_ID:
-				return getParentValueID();
-			case MsprojectPackage.VALUE__VALUE:
-				return getValue();
-			case MsprojectPackage.VALUE__DESCRIPTION:
-				return getDescription();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUE__VALUE_ID:
-				setValueID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.VALUE__PARENT_VALUE_ID:
-				setParentValueID((BigInteger)newValue);
-				return;
-			case MsprojectPackage.VALUE__VALUE:
-				setValue((String)newValue);
-				return;
-			case MsprojectPackage.VALUE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUE__VALUE_ID:
-				setValueID(VALUE_ID_EDEFAULT);
-				return;
-			case MsprojectPackage.VALUE__PARENT_VALUE_ID:
-				setParentValueID(PARENT_VALUE_ID_EDEFAULT);
-				return;
-			case MsprojectPackage.VALUE__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case MsprojectPackage.VALUE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUE__VALUE_ID:
-				return VALUE_ID_EDEFAULT == null ? valueID != null : !VALUE_ID_EDEFAULT.equals(valueID);
-			case MsprojectPackage.VALUE__PARENT_VALUE_ID:
-				return PARENT_VALUE_ID_EDEFAULT == null ? parentValueID != null : !PARENT_VALUE_ID_EDEFAULT.equals(parentValueID);
-			case MsprojectPackage.VALUE__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case MsprojectPackage.VALUE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (valueID: ");
-		result.append(valueID);
-		result.append(", parentValueID: ");
-		result.append(parentValueID);
-		result.append(", value: ");
-		result.append(value);
-		result.append(", description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ValueImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ValueListImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ValueListImpl.java
deleted file mode 100755
index f6c1ce7..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ValueListImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ValueListImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.Value2;
-import org.eclipse.epf.msproject.ValueList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Value List</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.ValueListImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ValueListImpl extends EObjectImpl implements ValueList {
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList value = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ValueListImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getValueList();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getValue() {
-		if (value == null) {
-			value = new EObjectContainmentEList(Value2.class, this, MsprojectPackage.VALUE_LIST__VALUE);
-		}
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.VALUE_LIST__VALUE:
-					return ((InternalEList)getValue()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUE_LIST__VALUE:
-				return getValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUE_LIST__VALUE:
-				getValue().clear();
-				getValue().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUE_LIST__VALUE:
-				getValue().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUE_LIST__VALUE:
-				return value != null && !value.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //ValueListImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ValuesImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ValuesImpl.java
deleted file mode 100755
index 3c0f847..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/ValuesImpl.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ValuesImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.Values;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Values</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.ValuesImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.ValuesImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ValuesImpl extends EObjectImpl implements Values {
-	/**
-	 * The cached value of the '{@link #getGroup() <em>Group</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ValuesImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getValues();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup() {
-		if (group == null) {
-			group = new BasicFeatureMap(this, MsprojectPackage.VALUES__GROUP);
-		}
-		return group;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getValue() {
-		return ((FeatureMap)getGroup()).list(MsprojectPackage.eINSTANCE.getValues_Value());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.VALUES__GROUP:
-					return ((InternalEList)getGroup()).basicRemove(otherEnd, msgs);
-				case MsprojectPackage.VALUES__VALUE:
-					return ((InternalEList)getValue()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUES__GROUP:
-				return getGroup();
-			case MsprojectPackage.VALUES__VALUE:
-				return getValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUES__GROUP:
-				getGroup().clear();
-				getGroup().addAll((Collection)newValue);
-				return;
-			case MsprojectPackage.VALUES__VALUE:
-				getValue().clear();
-				getValue().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUES__GROUP:
-				getGroup().clear();
-				return;
-			case MsprojectPackage.VALUES__VALUE:
-				getValue().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.VALUES__GROUP:
-				return group != null && !group.isEmpty();
-			case MsprojectPackage.VALUES__VALUE:
-				return !getValue().isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group: ");
-		result.append(group);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ValuesImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WBSMaskImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WBSMaskImpl.java
deleted file mode 100755
index afd620e..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WBSMaskImpl.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WBSMaskImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.WBSMask;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WBS Mask</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.WBSMaskImpl#getLevel <em>Level</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.WBSMaskImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.WBSMaskImpl#getLength <em>Length</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.WBSMaskImpl#getSeparator <em>Separator</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WBSMaskImpl extends EObjectImpl implements WBSMask {
-	/**
-	 * The default value of the '{@link #getLevel() <em>Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevel()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger LEVEL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLevel() <em>Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevel()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger level = LEVEL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger type = TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLength() <em>Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLength()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LENGTH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLength() <em>Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLength()
-	 * @generated
-	 * @ordered
-	 */
-	protected String length = LENGTH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSeparator() <em>Separator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSeparator()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SEPARATOR_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSeparator() <em>Separator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSeparator()
-	 * @generated
-	 * @ordered
-	 */
-	protected String separator = SEPARATOR_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WBSMaskImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getWBSMask();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getLevel() {
-		return level;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLevel(BigInteger newLevel) {
-		BigInteger oldLevel = level;
-		level = newLevel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.WBS_MASK__LEVEL, oldLevel, level));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(BigInteger newType) {
-		BigInteger oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.WBS_MASK__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLength() {
-		return length;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLength(String newLength) {
-		String oldLength = length;
-		length = newLength;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.WBS_MASK__LENGTH, oldLength, length));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSeparator() {
-		return separator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSeparator(String newSeparator) {
-		String oldSeparator = separator;
-		separator = newSeparator;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.WBS_MASK__SEPARATOR, oldSeparator, separator));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WBS_MASK__LEVEL:
-				return getLevel();
-			case MsprojectPackage.WBS_MASK__TYPE:
-				return getType();
-			case MsprojectPackage.WBS_MASK__LENGTH:
-				return getLength();
-			case MsprojectPackage.WBS_MASK__SEPARATOR:
-				return getSeparator();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WBS_MASK__LEVEL:
-				setLevel((BigInteger)newValue);
-				return;
-			case MsprojectPackage.WBS_MASK__TYPE:
-				setType((BigInteger)newValue);
-				return;
-			case MsprojectPackage.WBS_MASK__LENGTH:
-				setLength((String)newValue);
-				return;
-			case MsprojectPackage.WBS_MASK__SEPARATOR:
-				setSeparator((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WBS_MASK__LEVEL:
-				setLevel(LEVEL_EDEFAULT);
-				return;
-			case MsprojectPackage.WBS_MASK__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case MsprojectPackage.WBS_MASK__LENGTH:
-				setLength(LENGTH_EDEFAULT);
-				return;
-			case MsprojectPackage.WBS_MASK__SEPARATOR:
-				setSeparator(SEPARATOR_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WBS_MASK__LEVEL:
-				return LEVEL_EDEFAULT == null ? level != null : !LEVEL_EDEFAULT.equals(level);
-			case MsprojectPackage.WBS_MASK__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case MsprojectPackage.WBS_MASK__LENGTH:
-				return LENGTH_EDEFAULT == null ? length != null : !LENGTH_EDEFAULT.equals(length);
-			case MsprojectPackage.WBS_MASK__SEPARATOR:
-				return SEPARATOR_EDEFAULT == null ? separator != null : !SEPARATOR_EDEFAULT.equals(separator);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (level: ");
-		result.append(level);
-		result.append(", type: ");
-		result.append(type);
-		result.append(", length: ");
-		result.append(length);
-		result.append(", separator: ");
-		result.append(separator);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WBSMaskImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WBSMasksImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WBSMasksImpl.java
deleted file mode 100755
index a91f517..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WBSMasksImpl.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WBSMasksImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.WBSMask;
-import org.eclipse.epf.msproject.WBSMasks;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WBS Masks</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.WBSMasksImpl#isVerifyUniqueCodes <em>Verify Unique Codes</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.WBSMasksImpl#isGenerateCodes <em>Generate Codes</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.WBSMasksImpl#getPrefix <em>Prefix</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.WBSMasksImpl#getWBSMask <em>WBS Mask</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WBSMasksImpl extends EObjectImpl implements WBSMasks {
-	/**
-	 * The default value of the '{@link #isVerifyUniqueCodes() <em>Verify Unique Codes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isVerifyUniqueCodes()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean VERIFY_UNIQUE_CODES_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isVerifyUniqueCodes() <em>Verify Unique Codes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isVerifyUniqueCodes()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean verifyUniqueCodes = VERIFY_UNIQUE_CODES_EDEFAULT;
-
-	/**
-	 * This is true if the Verify Unique Codes attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean verifyUniqueCodesESet = false;
-
-	/**
-	 * The default value of the '{@link #isGenerateCodes() <em>Generate Codes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isGenerateCodes()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean GENERATE_CODES_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isGenerateCodes() <em>Generate Codes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isGenerateCodes()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean generateCodes = GENERATE_CODES_EDEFAULT;
-
-	/**
-	 * This is true if the Generate Codes attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean generateCodesESet = false;
-
-	/**
-	 * The default value of the '{@link #getPrefix() <em>Prefix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrefix()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PREFIX_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPrefix() <em>Prefix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrefix()
-	 * @generated
-	 * @ordered
-	 */
-	protected String prefix = PREFIX_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getWBSMask() <em>WBS Mask</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWBSMask()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList wBSMask = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WBSMasksImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getWBSMasks();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isVerifyUniqueCodes() {
-		return verifyUniqueCodes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVerifyUniqueCodes(boolean newVerifyUniqueCodes) {
-		boolean oldVerifyUniqueCodes = verifyUniqueCodes;
-		verifyUniqueCodes = newVerifyUniqueCodes;
-		boolean oldVerifyUniqueCodesESet = verifyUniqueCodesESet;
-		verifyUniqueCodesESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.WBS_MASKS__VERIFY_UNIQUE_CODES, oldVerifyUniqueCodes, verifyUniqueCodes, !oldVerifyUniqueCodesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetVerifyUniqueCodes() {
-		boolean oldVerifyUniqueCodes = verifyUniqueCodes;
-		boolean oldVerifyUniqueCodesESet = verifyUniqueCodesESet;
-		verifyUniqueCodes = VERIFY_UNIQUE_CODES_EDEFAULT;
-		verifyUniqueCodesESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.WBS_MASKS__VERIFY_UNIQUE_CODES, oldVerifyUniqueCodes, VERIFY_UNIQUE_CODES_EDEFAULT, oldVerifyUniqueCodesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetVerifyUniqueCodes() {
-		return verifyUniqueCodesESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isGenerateCodes() {
-		return generateCodes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGenerateCodes(boolean newGenerateCodes) {
-		boolean oldGenerateCodes = generateCodes;
-		generateCodes = newGenerateCodes;
-		boolean oldGenerateCodesESet = generateCodesESet;
-		generateCodesESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.WBS_MASKS__GENERATE_CODES, oldGenerateCodes, generateCodes, !oldGenerateCodesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetGenerateCodes() {
-		boolean oldGenerateCodes = generateCodes;
-		boolean oldGenerateCodesESet = generateCodesESet;
-		generateCodes = GENERATE_CODES_EDEFAULT;
-		generateCodesESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.WBS_MASKS__GENERATE_CODES, oldGenerateCodes, GENERATE_CODES_EDEFAULT, oldGenerateCodesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetGenerateCodes() {
-		return generateCodesESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPrefix() {
-		return prefix;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPrefix(String newPrefix) {
-		String oldPrefix = prefix;
-		prefix = newPrefix;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.WBS_MASKS__PREFIX, oldPrefix, prefix));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getWBSMask() {
-		if (wBSMask == null) {
-			wBSMask = new EObjectContainmentEList(WBSMask.class, this, MsprojectPackage.WBS_MASKS__WBS_MASK);
-		}
-		return wBSMask;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.WBS_MASKS__WBS_MASK:
-					return ((InternalEList)getWBSMask()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WBS_MASKS__VERIFY_UNIQUE_CODES:
-				return isVerifyUniqueCodes() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.WBS_MASKS__GENERATE_CODES:
-				return isGenerateCodes() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.WBS_MASKS__PREFIX:
-				return getPrefix();
-			case MsprojectPackage.WBS_MASKS__WBS_MASK:
-				return getWBSMask();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WBS_MASKS__VERIFY_UNIQUE_CODES:
-				setVerifyUniqueCodes(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.WBS_MASKS__GENERATE_CODES:
-				setGenerateCodes(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.WBS_MASKS__PREFIX:
-				setPrefix((String)newValue);
-				return;
-			case MsprojectPackage.WBS_MASKS__WBS_MASK:
-				getWBSMask().clear();
-				getWBSMask().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WBS_MASKS__VERIFY_UNIQUE_CODES:
-				unsetVerifyUniqueCodes();
-				return;
-			case MsprojectPackage.WBS_MASKS__GENERATE_CODES:
-				unsetGenerateCodes();
-				return;
-			case MsprojectPackage.WBS_MASKS__PREFIX:
-				setPrefix(PREFIX_EDEFAULT);
-				return;
-			case MsprojectPackage.WBS_MASKS__WBS_MASK:
-				getWBSMask().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WBS_MASKS__VERIFY_UNIQUE_CODES:
-				return isSetVerifyUniqueCodes();
-			case MsprojectPackage.WBS_MASKS__GENERATE_CODES:
-				return isSetGenerateCodes();
-			case MsprojectPackage.WBS_MASKS__PREFIX:
-				return PREFIX_EDEFAULT == null ? prefix != null : !PREFIX_EDEFAULT.equals(prefix);
-			case MsprojectPackage.WBS_MASKS__WBS_MASK:
-				return wBSMask != null && !wBSMask.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (verifyUniqueCodes: ");
-		if (verifyUniqueCodesESet) result.append(verifyUniqueCodes); else result.append("<unset>");
-		result.append(", generateCodes: ");
-		if (generateCodesESet) result.append(generateCodes); else result.append("<unset>");
-		result.append(", prefix: ");
-		result.append(prefix);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WBSMasksImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WeekDayImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WeekDayImpl.java
deleted file mode 100755
index 6976da3..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WeekDayImpl.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WeekDayImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.TimePeriod;
-import org.eclipse.epf.msproject.WeekDay;
-import org.eclipse.epf.msproject.WorkingTimes;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Week Day</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.WeekDayImpl#getDayType <em>Day Type</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.WeekDayImpl#isDayWorking <em>Day Working</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.WeekDayImpl#getTimePeriod <em>Time Period</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.WeekDayImpl#getWorkingTimes <em>Working Times</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WeekDayImpl extends EObjectImpl implements WeekDay {
-	/**
-	 * The default value of the '{@link #getDayType() <em>Day Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDayType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger DAY_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDayType() <em>Day Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDayType()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger dayType = DAY_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isDayWorking() <em>Day Working</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDayWorking()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DAY_WORKING_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isDayWorking() <em>Day Working</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDayWorking()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean dayWorking = DAY_WORKING_EDEFAULT;
-
-	/**
-	 * This is true if the Day Working attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean dayWorkingESet = false;
-
-	/**
-	 * The cached value of the '{@link #getTimePeriod() <em>Time Period</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTimePeriod()
-	 * @generated
-	 * @ordered
-	 */
-	protected TimePeriod timePeriod = null;
-
-	/**
-	 * The cached value of the '{@link #getWorkingTimes() <em>Working Times</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkingTimes()
-	 * @generated
-	 * @ordered
-	 */
-	protected WorkingTimes workingTimes = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WeekDayImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getWeekDay();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getDayType() {
-		return dayType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDayType(BigInteger newDayType) {
-		BigInteger oldDayType = dayType;
-		dayType = newDayType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.WEEK_DAY__DAY_TYPE, oldDayType, dayType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDayWorking() {
-		return dayWorking;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDayWorking(boolean newDayWorking) {
-		boolean oldDayWorking = dayWorking;
-		dayWorking = newDayWorking;
-		boolean oldDayWorkingESet = dayWorkingESet;
-		dayWorkingESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.WEEK_DAY__DAY_WORKING, oldDayWorking, dayWorking, !oldDayWorkingESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetDayWorking() {
-		boolean oldDayWorking = dayWorking;
-		boolean oldDayWorkingESet = dayWorkingESet;
-		dayWorking = DAY_WORKING_EDEFAULT;
-		dayWorkingESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, MsprojectPackage.WEEK_DAY__DAY_WORKING, oldDayWorking, DAY_WORKING_EDEFAULT, oldDayWorkingESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetDayWorking() {
-		return dayWorkingESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TimePeriod getTimePeriod() {
-		return timePeriod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTimePeriod(TimePeriod newTimePeriod, NotificationChain msgs) {
-		TimePeriod oldTimePeriod = timePeriod;
-		timePeriod = newTimePeriod;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MsprojectPackage.WEEK_DAY__TIME_PERIOD, oldTimePeriod, newTimePeriod);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTimePeriod(TimePeriod newTimePeriod) {
-		if (newTimePeriod != timePeriod) {
-			NotificationChain msgs = null;
-			if (timePeriod != null)
-				msgs = ((InternalEObject)timePeriod).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.WEEK_DAY__TIME_PERIOD, null, msgs);
-			if (newTimePeriod != null)
-				msgs = ((InternalEObject)newTimePeriod).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.WEEK_DAY__TIME_PERIOD, null, msgs);
-			msgs = basicSetTimePeriod(newTimePeriod, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.WEEK_DAY__TIME_PERIOD, newTimePeriod, newTimePeriod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkingTimes getWorkingTimes() {
-		return workingTimes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWorkingTimes(WorkingTimes newWorkingTimes, NotificationChain msgs) {
-		WorkingTimes oldWorkingTimes = workingTimes;
-		workingTimes = newWorkingTimes;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MsprojectPackage.WEEK_DAY__WORKING_TIMES, oldWorkingTimes, newWorkingTimes);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWorkingTimes(WorkingTimes newWorkingTimes) {
-		if (newWorkingTimes != workingTimes) {
-			NotificationChain msgs = null;
-			if (workingTimes != null)
-				msgs = ((InternalEObject)workingTimes).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.WEEK_DAY__WORKING_TIMES, null, msgs);
-			if (newWorkingTimes != null)
-				msgs = ((InternalEObject)newWorkingTimes).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MsprojectPackage.WEEK_DAY__WORKING_TIMES, null, msgs);
-			msgs = basicSetWorkingTimes(newWorkingTimes, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.WEEK_DAY__WORKING_TIMES, newWorkingTimes, newWorkingTimes));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.WEEK_DAY__TIME_PERIOD:
-					return basicSetTimePeriod(null, msgs);
-				case MsprojectPackage.WEEK_DAY__WORKING_TIMES:
-					return basicSetWorkingTimes(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WEEK_DAY__DAY_TYPE:
-				return getDayType();
-			case MsprojectPackage.WEEK_DAY__DAY_WORKING:
-				return isDayWorking() ? Boolean.TRUE : Boolean.FALSE;
-			case MsprojectPackage.WEEK_DAY__TIME_PERIOD:
-				return getTimePeriod();
-			case MsprojectPackage.WEEK_DAY__WORKING_TIMES:
-				return getWorkingTimes();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WEEK_DAY__DAY_TYPE:
-				setDayType((BigInteger)newValue);
-				return;
-			case MsprojectPackage.WEEK_DAY__DAY_WORKING:
-				setDayWorking(((Boolean)newValue).booleanValue());
-				return;
-			case MsprojectPackage.WEEK_DAY__TIME_PERIOD:
-				setTimePeriod((TimePeriod)newValue);
-				return;
-			case MsprojectPackage.WEEK_DAY__WORKING_TIMES:
-				setWorkingTimes((WorkingTimes)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WEEK_DAY__DAY_TYPE:
-				setDayType(DAY_TYPE_EDEFAULT);
-				return;
-			case MsprojectPackage.WEEK_DAY__DAY_WORKING:
-				unsetDayWorking();
-				return;
-			case MsprojectPackage.WEEK_DAY__TIME_PERIOD:
-				setTimePeriod((TimePeriod)null);
-				return;
-			case MsprojectPackage.WEEK_DAY__WORKING_TIMES:
-				setWorkingTimes((WorkingTimes)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WEEK_DAY__DAY_TYPE:
-				return DAY_TYPE_EDEFAULT == null ? dayType != null : !DAY_TYPE_EDEFAULT.equals(dayType);
-			case MsprojectPackage.WEEK_DAY__DAY_WORKING:
-				return isSetDayWorking();
-			case MsprojectPackage.WEEK_DAY__TIME_PERIOD:
-				return timePeriod != null;
-			case MsprojectPackage.WEEK_DAY__WORKING_TIMES:
-				return workingTimes != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (dayType: ");
-		result.append(dayType);
-		result.append(", dayWorking: ");
-		if (dayWorkingESet) result.append(dayWorking); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //WeekDayImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WeekDaysImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WeekDaysImpl.java
deleted file mode 100755
index df4e7e2..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WeekDaysImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WeekDaysImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.WeekDay;
-import org.eclipse.epf.msproject.WeekDays;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Week Days</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.WeekDaysImpl#getWeekDay <em>Week Day</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WeekDaysImpl extends EObjectImpl implements WeekDays {
-	/**
-	 * The cached value of the '{@link #getWeekDay() <em>Week Day</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWeekDay()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList weekDay = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WeekDaysImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getWeekDays();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getWeekDay() {
-		if (weekDay == null) {
-			weekDay = new EObjectContainmentEList(WeekDay.class, this, MsprojectPackage.WEEK_DAYS__WEEK_DAY);
-		}
-		return weekDay;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.WEEK_DAYS__WEEK_DAY:
-					return ((InternalEList)getWeekDay()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WEEK_DAYS__WEEK_DAY:
-				return getWeekDay();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WEEK_DAYS__WEEK_DAY:
-				getWeekDay().clear();
-				getWeekDay().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WEEK_DAYS__WEEK_DAY:
-				getWeekDay().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WEEK_DAYS__WEEK_DAY:
-				return weekDay != null && !weekDay.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //WeekDaysImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WorkingTimeImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WorkingTimeImpl.java
deleted file mode 100755
index 8f27dd3..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WorkingTimeImpl.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkingTimeImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.WorkingTime;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Working Time</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.WorkingTimeImpl#getFromTime <em>From Time</em>}</li>
- *   <li>{@link org.eclipse.epf.msproject.impl.WorkingTimeImpl#getToTime <em>To Time</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkingTimeImpl extends EObjectImpl implements WorkingTime {
-	/**
-	 * The default value of the '{@link #getFromTime() <em>From Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFromTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object FROM_TIME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFromTime() <em>From Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFromTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object fromTime = FROM_TIME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getToTime() <em>To Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object TO_TIME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getToTime() <em>To Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object toTime = TO_TIME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkingTimeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getWorkingTime();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getFromTime() {
-		return fromTime;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFromTime(Object newFromTime) {
-		Object oldFromTime = fromTime;
-		fromTime = newFromTime;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.WORKING_TIME__FROM_TIME, oldFromTime, fromTime));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getToTime() {
-		return toTime;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setToTime(Object newToTime) {
-		Object oldToTime = toTime;
-		toTime = newToTime;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MsprojectPackage.WORKING_TIME__TO_TIME, oldToTime, toTime));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WORKING_TIME__FROM_TIME:
-				return getFromTime();
-			case MsprojectPackage.WORKING_TIME__TO_TIME:
-				return getToTime();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WORKING_TIME__FROM_TIME:
-				setFromTime((Object)newValue);
-				return;
-			case MsprojectPackage.WORKING_TIME__TO_TIME:
-				setToTime((Object)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WORKING_TIME__FROM_TIME:
-				setFromTime(FROM_TIME_EDEFAULT);
-				return;
-			case MsprojectPackage.WORKING_TIME__TO_TIME:
-				setToTime(TO_TIME_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WORKING_TIME__FROM_TIME:
-				return FROM_TIME_EDEFAULT == null ? fromTime != null : !FROM_TIME_EDEFAULT.equals(fromTime);
-			case MsprojectPackage.WORKING_TIME__TO_TIME:
-				return TO_TIME_EDEFAULT == null ? toTime != null : !TO_TIME_EDEFAULT.equals(toTime);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (fromTime: ");
-		result.append(fromTime);
-		result.append(", toTime: ");
-		result.append(toTime);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WorkingTimeImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WorkingTimesImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WorkingTimesImpl.java
deleted file mode 100755
index 8a42734..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/WorkingTimesImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkingTimesImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.WorkingTime;
-import org.eclipse.epf.msproject.WorkingTimes;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Working Times</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.msproject.impl.WorkingTimesImpl#getWorkingTime <em>Working Time</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkingTimesImpl extends EObjectImpl implements WorkingTimes {
-	/**
-	 * The cached value of the '{@link #getWorkingTime() <em>Working Time</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkingTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList workingTime = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkingTimesImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MsprojectPackage.eINSTANCE.getWorkingTimes();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getWorkingTime() {
-		if (workingTime == null) {
-			workingTime = new EObjectContainmentEList(WorkingTime.class, this, MsprojectPackage.WORKING_TIMES__WORKING_TIME);
-		}
-		return workingTime;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MsprojectPackage.WORKING_TIMES__WORKING_TIME:
-					return ((InternalEList)getWorkingTime()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WORKING_TIMES__WORKING_TIME:
-				return getWorkingTime();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WORKING_TIMES__WORKING_TIME:
-				getWorkingTime().clear();
-				getWorkingTime().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WORKING_TIMES__WORKING_TIME:
-				getWorkingTime().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MsprojectPackage.WORKING_TIMES__WORKING_TIME:
-				return workingTime != null && !workingTime.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //WorkingTimesImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/msproject.ecore b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/msproject.ecore
deleted file mode 100755
index c1ebd22..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/msproject.ecore
+++ /dev/null
@@ -1,5511 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="msproject"
-    nsURI="http://epf.eclipse.org/msproject" nsPrefix="msproject">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="The full project schema definition from the project level down, &#xD;&#xA;&#x9;&#x9;starting with data type definitions."/>
-  </eAnnotations>
-  <eAnnotations>
-    <details key="appinfo" value="The Microsoft Project Data Interchange Schema for Microsoft Project 10.&#xD;&#xA;&#x9;&#x9;"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EDataType" name="AccrueAt" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="AccrueAt_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ActiveDirectoryGUIDType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ActiveDirectoryGUID_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="16"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="AliasType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Alias_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="50"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Assignment">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Assignment_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="taskUID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the task.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TaskUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceUID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the resource.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ResourceUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentWorkComplete" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of work completed on the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PercentWorkComplete"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual cost incurred on the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualFinish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual finish date of the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualFinish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual overtime cost incurred on the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual amount of overtime work incurred on the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualStart" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual start date of the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualStart"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual amount of work incurred on the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="aCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual cost of work performed on the assignment to-date.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ACWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="confirmed" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the Resource has accepted all of his or her assignments.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Confirmed"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The projected or scheduled cost of the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Cost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="costRateTable" unique="false"
-        eType="#//CostRateTableType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The cost rate table used for the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CostRateTable"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="costVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The difference between the cost and baseline cost for a resource.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CostVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cV" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Earned value cost variance.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CV"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="delay" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount that the assignment is delayed.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Delay"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled finish date of the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Finish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finishVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The variance of the assignment finish date from the baseline finish date.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FinishVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlink" unique="false"
-        eType="#//HyperlinkType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The title of the hyperlink associated with the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Hyperlink"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlinkAddress" unique="false"
-        eType="#//HyperlinkAddressType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The hyperlink associated with the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HyperlinkAddress"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlinkSubAddress" unique="false"
-        eType="#//HyperlinkSubAddressType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The document bookmark of the hyperlink associated with the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HyperlinkSubAddress"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The variance of assignment work from the baseline work as minutes x 1000.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hasFixedRateUnits" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the Units are Fixed Rate.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HasFixedRateUnits"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fixedMaterial" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the consumption of the assigned material resource occurs in a single, fixed amount.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FixedMaterial"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelingDelay" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The delay caused by leveling.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LevelingDelay"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelingDelayFormat" unique="false"
-        eType="#//LevelingDelayFormatType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the duration of the delay.  &#xD;&#xA;                            Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 20=e%, 21=null, &#xD;&#xA;                            35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 43=mo?, 44=emo?, 51=%?, 52=e%? and 53=null.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LevelingDelayFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="linkedFields" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the Project is linked to another OLE object.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LinkedFields"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="milestone" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the assignment is a milestone.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Milestone"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="notes" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Text notes associated with the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Notes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overallocated" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the assignment is overallocated.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Overallocated"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The sum of the actual and remaining overtime cost of the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled overtime work scheduled for the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="regularWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of non-overtime work scheduled for the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RegularWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining projected cost of completing the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingOvertimeCost"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining projected overtime cost of completing the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingOvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingOvertimeWork"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining overtime work scheduled to complete the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingOvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining work scheduled to complete the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="responsePending" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="True if a response has not been received for a TeamAssign message. &#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ResponsePending"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled start date of the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Start"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stop" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the assignment was stopped.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Stop"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resume" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the assignment resumed.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Resume"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="startVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The variance of the assignment start date from the baseline start date.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StartVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="units" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The number of units for the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Units"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="updateNeeded" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="True if the resource assigned to a task needs to be updated as to the status of the task.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UpdateNeeded"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="vAC" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The difference between basline cost and total cost.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="VAC"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="work" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of scheduled work for the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Work"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workContour" unique="false"
-        eType="#//WorkContourType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The work contour of the assignment. &#xD;&#xA;                            Values are: 0=Flat, 1=Back Loaded, 2=Front Loaded, 3=Double Peak, 4=Early Peak, 5=Late Peak, &#xD;&#xA;                            6=Bell, 7=Turtle, 8=Contoured&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkContour"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWS" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work on the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWS"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work performed on the assignment to-date.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bookingType" unique="false"
-        eType="#//BookingTypeType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the booking type of the assignment. 1=Commited, 2=Proposed&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BookingType"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualWorkProtected" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the duration through which actual work is protected.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualWorkProtected"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeWorkProtected"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the duration through which actual overtime work is protected.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeWorkProtected"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the assignment was created."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CreationDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedAttribute" upperBound="-1"
-        eType="#//ExtendedAttribute4" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of an extended attribute.  Two pieces of data are necessary - &#xD;&#xA;                            a pointer back to the extended attribute table which is specified either by the unique ID or the &#xD;&#xA;                            Field ID, and the value which is specified either with the value, or a pointer back to the value list.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExtendedAttribute"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="baseline" upperBound="-1"
-        eType="#//Baseline3" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of baseline values associated with the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Baseline"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timephasedData" upperBound="-1"
-        eType="#//TimephasedDataType" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The time phased data associated with the assignment.&#xD;&#xA;                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TimephasedData"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Assignments">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Assignments_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="assignment" upperBound="-1"
-        eType="#//Assignment" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="There must be at least one assignment in each Assignments collection.&#xD;&#xA;                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Assignment"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="AuthorType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Author_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AvailabilityPeriod">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="AvailabilityPeriod_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="availableFrom" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the resource becomes available for the specified period.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AvailableFrom"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="availableTo" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The last date that the resource is available for the specified period.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AvailableTo"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="availableUnits" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The percentage that the resource is available during the specified period.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AvailableUnits"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AvailabilityPeriods">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="AvailabilityPeriods_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="availabilityPeriod" upperBound="-1"
-        eType="#//AvailabilityPeriod" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The period the resource is available.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AvailabilityPeriod"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Baseline">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Baseline_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timephasedData" upperBound="-1"
-        eType="#//TimephasedDataType" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The time phased data block associated with the task baseline.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TimephasedData"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="number" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique number of the baseline data record.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Number"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="interim" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether this is an Interim Baseline.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Interim"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled start date of the task when the baseline was saved.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Start"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled finish date of the task when the baseline was saved.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Finish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="duration" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled duration of the task when the baseline was saved.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Duration"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="durationFormat" unique="false"
-        eType="#//DurationFormatType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the Duration of the Task baseline.  &#xD;&#xA;                                            Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 20=e%, &#xD;&#xA;                                            21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 43=mo?, 44=emo?, &#xD;&#xA;                                            51=%?, 52=e%? and 53=null.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DurationFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="estimatedDuration" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the baseline duration of the task was estimated.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EstimatedDuration"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="work" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled work of the task when the baseline was saved.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Work"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The projected cost of the task when the baseline was saved.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Cost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWS" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work scheduled for the task.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWS"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work performed on the task to-date.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Baseline2">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Baseline_._1_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="number" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique number of the baseline data record.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Number"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="work" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The work assigned the resource when the baseline is saved.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Work"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The projected cost for the resource when the baseline was saved.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Cost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWS" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budget cost of work scheduled for the resource.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWS"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of of the work performed by the resource for the project to-date.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Baseline3">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Baseline_._2_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timephasedData" upperBound="-1"
-        eType="#//TimephasedDataType" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The time phased data associated with the Baseline.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TimephasedData"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="number" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique number of the baseline data record.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Number"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled start date of the assignment when the baseline was saved.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Start"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled finish date of the assignment when the baseline was saved.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Finish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="work" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The total amount of work scheduled on the assignment when the baseline was saved.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Work"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The total projected cost of the assignment when the baseline was saved.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Cost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWS" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work on the assignment.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWS"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work performed on the assignment to-date.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="BaselineForEarnedValueType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="BaselineForEarnedValue_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4 5 6 7 8 9 10"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="BookingTypeType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="BookingType_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="BookingTypeType1" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="BookingType_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="CalculationTypeType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="CalculationType_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Calendar">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Calendar_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the calendar.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="#//NameType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of the calendar."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Name"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isBaseCalendar" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the calendar is a base calendar.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsBaseCalendar"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseCalendarUID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the base calendar &#xD;&#xA;                                on which this calendar depends. Only applicable if the calendar is &#xD;&#xA;                                not a base calendar."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BaseCalendarUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="weekDays" eType="#//WeekDays"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of Weekdays that defines this calendar.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WeekDays"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Calendars">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Calendars_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="calendar" lowerBound="1"
-        upperBound="-1" eType="#//Calendar" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Calendars are used to define standard working and &#xD;&#xA;                    non-working times. Projects must have one base calendar. Tasks and resources &#xD;&#xA;                    may have their own non-base calendars which are based on a base calendar.&#xD;&#xA;                    "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Calendar"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="CategoryType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Category_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="CodeType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Code_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="CompanyType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Company_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ConstraintTypeType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ConstraintType_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4 5 6 7"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ContactType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Contact_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="CostRateTableType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="CostRateTable_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="CurrencySymbolPositionType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="CurrencySymbolPosition_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="CurrencySymbolType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="CurrencySymbol_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="20"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DayTypeType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DayType_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4 5 6 7"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DefaultFixedCostAccrualType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DefaultFixedCostAccrual_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DefaultTaskEVMethodType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DefaultTaskEVMethod_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DefaultTaskTypeType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DefaultTaskType_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DocumentRoot">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value=""/>
-      <details key="kind" value="mixed"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mixed" unique="false" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="elementWildcard"/>
-        <details key="name" value=":mixed"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="xMLNSPrefixMap" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
-        transient="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="xmlns:prefix"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="xSISchemaLocation" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
-        transient="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="xsi:schemaLocation"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="project" upperBound="-2"
-        eType="#//Project" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The project is the top level element of the document.&#xD;&#xA;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Project"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DurationFormatType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DurationFormat_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DurationFormatType1" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DurationFormat_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DurationFormatType2" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DurationFormat_._2_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DurationFormatType3" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DurationFormat_._3_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DurationFormatType4" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DurationFormat_._4_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DurationFormatType5" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DurationFormat_._5_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="EarnedValueMethodType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="EarnedValueMethod_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="EarnedValueMethodType1" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="EarnedValueMethod_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="EmailAddressType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="EmailAddress_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtendedAttribute">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ExtendedAttribute_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This corresponds to the PID of the custom field.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldName" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of the custom field."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldName"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias" unique="false" eType="#//AliasType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The alias of the custom field"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Alias"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="phoneticAlias" unique="false"
-        eType="#//PhoneticAliasType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The phonetic pronunciation of the alias of the &#xD;&#xA;                                custom field"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PhoneticAlias"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rollupType" unique="false"
-        eType="#//RollupTypeType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="How rollups are calculated. Values are: 0=Maximum &#xD;&#xA;                                (OR for flag fields), 1=Minimum (AND for flag fields), 2=Count all, 3=Sum, &#xD;&#xA;                                4=Average, 5=Average First Sublevel, 6=Count First Sublevel, 7=Count &#xD;&#xA;                                Nonsummaries"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RollupType"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="calculationType" unique="false"
-        eType="#//CalculationTypeType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether rollups are calculated for task and group summary rows. &#xD;&#xA;                                Values are: 0=None, 1=Rollup, 2=Calculation"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CalculationType"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="formula" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The formula that Microsoft Project uses to populate the &#xD;&#xA;                                custom task field."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Formula"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="restrictValues" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If RestrictValues=True then only values in the list are &#xD;&#xA;                                allowed in the file"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RestrictValues"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valuelistSortOrder" unique="false"
-        eType="#//ValuelistSortOrderType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="How value lists are sorted. Values are: &#xD;&#xA;                                0=Descending, 1=Ascending"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValuelistSortOrder"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="appendNewValues" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If AppendNewValues=True then any new values added in a project &#xD;&#xA;                                are automatically appended to the list."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AppendNewValues"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="default" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This points to the default value in the list. &#xD;&#xA;                                Not present if no default is set."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Default"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="valueList" eType="#//ValueList"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="When values of extended attributes are specified as &#xD;&#xA;                                properties of elements in the schema, they may either be specified by values &#xD;&#xA;                                or by references to the values contained in this list.  Applications may &#xD;&#xA;                                assume ordering of the list by ordering specified here."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValueList"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtendedAttribute2">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ExtendedAttribute_._1_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the value in the extended attribute collection.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The PID of the custom field.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual value of the extended attribute.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The ID of the value in the extended attribut lookup table.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValueID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="durationFormat" unique="false"
-        eType="#//DurationFormatType2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the bulk duration.  &#xD;&#xA;                                            Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, &#xD;&#xA;                                            19=%, 20=e%, 21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, &#xD;&#xA;                                            42=ew?, 43=mo?, 44=emo?, 51=%?, 52=e%? and 53=null.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DurationFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtendedAttribute3">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ExtendedAttribute_._2_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the value in the extended attribute collection.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The PID of the custom field.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual value of the extended attribute.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The ID of the value in the extended attribut lookup table.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValueID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="durationFormat" unique="false"
-        eType="#//DurationFormatType3">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the bulk duration.  &#xD;&#xA;                                            Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, &#xD;&#xA;                                            20=e%, 21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, &#xD;&#xA;                                            43=mo?, 44=emo?, 51=%?, 52=e%? and 53=null.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DurationFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtendedAttribute4">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ExtendedAttribute_._3_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the value in the extended attribute collection.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The field ID in the localised language.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual value of the extended attribute.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The ID of the value in the extended attribut lookup table.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValueID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="durationFormat" unique="false"
-        eType="#//DurationFormatType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the bulk duration.  &#xD;&#xA;                                        Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 20=e%, &#xD;&#xA;                                        21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 43=mo?, 44=emo?, &#xD;&#xA;                                        51=%?, 52=e%? and 53=null.&#xD;&#xA;                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DurationFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtendedAttributes">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ExtendedAttributes_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedAttribute" upperBound="-1"
-        eType="#//ExtendedAttribute" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Each of the individual entries in the extended attributes definition &#xD;&#xA;                    collection.  There are no limits to the number of children that may appear, but project &#xD;&#xA;                    will only understand Flag1-Flag10, etc.  This must appear once in each ExtendedAttributes &#xD;&#xA;                    collection."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExtendedAttribute"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ExternalTaskProjectType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ExternalTaskProject_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="FixedCostAccrualType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="FixedCostAccrual_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="enumeration" value="1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="FYStartDateType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="FYStartDate_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3 4 5 6 7 8 9 10 11 12"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="GroupType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Group_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkAddressType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="HyperlinkAddress_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkAddressType1" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="HyperlinkAddress_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkAddressType2" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="HyperlinkAddress_._2_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkSubAddressType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="HyperlinkSubAddress_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkSubAddressType1" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="HyperlinkSubAddress_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkSubAddressType2" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="HyperlinkSubAddress_._2_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Hyperlink_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkType1" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Hyperlink_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="HyperlinkType2" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Hyperlink_._2_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="InitialsType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Initials_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="LagFormatType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="LagFormat_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="LevelingDelayFormatType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="LevelingDelayFormat_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="LevelingDelayFormatType1" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="LevelingDelayFormat_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="3 4 5 6 7 8 9 10 11 12 19 20 21 35 36 37 38 39 40 41 42 43 44 51 52 53"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ManagerType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Manager_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Mask">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Mask_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="level" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The level of the mask."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Level"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" eType="#//TypeType5">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The type of mask. Values are: 0=Numbers, 1=Upper Case Letters, 2=Lower Case Letters, 3=Characters"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Type"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="length" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The maximum length in characters of the outline code values.  If length is any, the value is zero."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Length"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="separator" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The separator value of the code values."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Separator"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Masks">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Masks_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mask" upperBound="-1" eType="#//Mask"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The four elements of the mask constitute the format in which the outline code must appear."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Mask"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="MaterialLabelType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="MaterialLabel_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="NameType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Name_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="NameType1" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Name_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="NameType2" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Name_._2_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="NameType3" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Name_._3_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="255"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="NewTaskStartDateType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="NewTaskStartDate_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="NTAccountType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="NTAccount_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OutlineCode">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="OutlineCode_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Coresponds to the field number of outline code."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldName" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of the custom outline code."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldName"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The alias of the custom outline code."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Alias"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="phoneticAlias" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The phonetic pronunciation of the alias of the custom outline code."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PhoneticAlias"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="values" eType="#//Values"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The values of the table associated with this outline code."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Values"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enterprise" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Indicates whether the custom outline code is an enterprise custom outline code."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Enterprise"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enterpriseOutlineCodeAlias"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A reference to another custom field for which this is an alias."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EnterpriseOutlineCodeAlias"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceSubstitutionEnabled"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the custom outline code can be used by the Resource Substitution Wizard in Microsoft Project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ResourceSubstitutionEnabled"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="leafOnly" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether or not values specified in this outline code field must be leaf values."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LeafOnly"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="allLevelsRequired" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="New codes must have all levels present.  Not available for Enterprise Codes."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AllLevelsRequired"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="onlyTableValuesAllowed"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether values specified must come from values table."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OnlyTableValuesAllowed"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="masks" eType="#//Masks"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The table of entries that define the outline code mask."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Masks"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OutlineCode2">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="OutlineCode_._1_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the value in the outline code collection.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The field ID in the localised language.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID in the value list associated with the definition in the &#xD;&#xA;                                            outline code collection.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValueID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OutlineCode3">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="OutlineCode_._2_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the value in the outline code collection.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The field ID in the localised language.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FieldID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID in the value list associated with the definition &#xD;&#xA;                                            in the outline code collection."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValueID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OutlineCodes">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="OutlineCodes_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outlineCode" upperBound="-1"
-        eType="#//OutlineCode" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The individual outline codes."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OutlineCode"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="OutlineNumberType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="OutlineNumber_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="OvertimeRateFormatType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="OvertimeRateFormat_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3 4 5 7"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="OvertimeRateFormatType1" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="OvertimeRateFormat_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3 4 5 7"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="PhoneticAliasType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="PhoneticAlias_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="50"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="PhoneticsType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Phonetics_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PredecessorLink">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="PredecessorLink_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="predecessorUID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the predecessor task.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PredecessorUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" eType="#//TypeType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The link type.  Values are 0=FF, 1=FS, 2=SF and 3=SS&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Type"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="crossProject" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the predecessor is part of another project.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CrossProject"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="crossProjectName" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The external predecessor project.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CrossProjectName"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="linkLag" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of lag in tenths of a minute.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LinkLag"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lagFormat" unique="false"
-        eType="#//LagFormatType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the lag format.  &#xD;&#xA;                                            Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, &#xD;&#xA;                                            20=e%, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 43=mo?, &#xD;&#xA;                                            44=emo?, 51=%?, 52=e%? and 53=null.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LagFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="PrefixType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Prefix_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="50"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Project">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Project_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" eType="#//UIDType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="#//NameType3">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Name"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" unique="false" eType="#//TitleType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The title of the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Title"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="subject" unique="false"
-        eType="#//SubjectType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The subject of the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Subject"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" unique="false"
-        eType="#//CategoryType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The category of the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Category"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="company" unique="false"
-        eType="#//CompanyType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The company that owns the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Company"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="manager" unique="false"
-        eType="#//ManagerType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The manager of the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Manager"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="author" unique="false"
-        eType="#//AuthorType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The author of the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Author"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the project was created."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CreationDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="revision" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The number of times a project has been saved."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Revision"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastSaved" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the project was last saved."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LastSaved"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scheduleFromStart" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the project is schduled from the start date or finish date.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ScheduleFromStart"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="startDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The start date of the project. Required if ScheduleFromStart is true.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StartDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finishDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The finish date of the project. Required if ScheduleFromStart is false.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FinishDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fYStartDate" unique="false"
-        eType="#//FYStartDateType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Fiscal Year starting month. Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;1=January, 2=February, 3=March, 4=April, 5=May, 6=June, 7=July, &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;8=August, 9=September, 10=October, 11=November, 12=December "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FYStartDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="criticalSlackLimit" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The number of days past its end date that a task can go &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;before Microsoft Project marks that task as a critical task."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CriticalSlackLimit"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="currencyDigits" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The number of digits after the decimal symbol."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CurrencyDigits"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="currencySymbol" unique="false"
-        eType="#//CurrencySymbolType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The currency symbol used in the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CurrencySymbol"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="currencySymbolPosition"
-        unique="false" eType="#//CurrencySymbolPositionType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The position of the currency symbol.  Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;0=Before, 1=After, 2=Before With Space, 3=After with space."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CurrencySymbolPosition"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="calendarUID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The project calendar.  Refers to a valid UID in the &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;Calendars element of the Microsoft Project XML Schema."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CalendarUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultStartTime" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Time">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default start time of new tasks."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultStartTime"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultFinishTime" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Time">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default finish time of new tasks."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultFinishTime"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minutesPerDay" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The number of minutes per day."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MinutesPerDay"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minutesPerWeek" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The number of minutes per week."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MinutesPerWeek"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="daysPerMonth" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The number of days per month."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DaysPerMonth"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultTaskType" unique="false"
-        eType="#//DefaultTaskTypeType" defaultValueLiteral="1" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default type of new tasks. Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;0=Fixed Units, 1=Fixed Duration, 2=Fixed Work."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultTaskType"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultFixedCostAccrual"
-        unique="false" eType="#//DefaultFixedCostAccrualType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default from where fixed costs are accrued.  Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;1=Start, 2=Prorated, 3=End"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultFixedCostAccrual"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultStandardRate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default standard rate for new resources."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultStandardRate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultOvertimeRate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default overtime rate for new resources."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultOvertimeRate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="durationFormat" unique="false"
-        eType="#//DurationFormatType5">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the bulk duration.  Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, 20=e%, 21=null, &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, 43=mo?, 44=emo?, 51=%?, 52=e%? and &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;53=null."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DurationFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workFormat" unique="false"
-        eType="#//WorkFormatType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default work unit format. Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;1=m, 2=h, 3=d, 4=w, 5=mo"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editableActualCosts" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether or not actual costs are editable."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EditableActualCosts"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="honorConstraints" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether tasks honour their constraint dates."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HonorConstraints"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="earnedValueMethod" unique="false"
-        eType="#//EarnedValueMethodType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default method for calculating earned value. Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;0=Percent Complete, 1=Physical Percent Complete"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EarnedValueMethod"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="insertedProjectsLikeSummary"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether to calculate subtasks as summary tasks."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="InsertedProjectsLikeSummary"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multipleCriticalPaths"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether multiple critical paths are calculated."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MultipleCriticalPaths"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="newTasksEffortDriven" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether new tasks are effort driven."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="NewTasksEffortDriven"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="newTasksEstimated" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether to show the estimated duration by default."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="NewTasksEstimated"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="splitsInProgressTasks"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether in-progress tasks can be split."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SplitsInProgressTasks"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="spreadActualCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether actual costs are spread to the status date."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SpreadActualCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="spreadPercentComplete"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether percent complete is spread to the status date."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SpreadPercentComplete"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="taskUpdatesResource" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether updates to tasks update resources."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TaskUpdatesResource"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fiscalYearStart" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies whether to use fiscal year numbering"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FiscalYearStart"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="weekStartDay" unique="false"
-        eType="#//WeekStartDayType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Start day of the week. Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;0=Sunday, 1=Monday, 2=Tuesday, 3=Wednesday, 4=Thursday, 5=Friday, 6=Saturday"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WeekStartDay"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="moveCompletedEndsBack"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;Specifies whether the end of completed portions of tasks scheduled to begin after the &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;status date but begun early should be moved back to the status date.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MoveCompletedEndsBack"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="moveRemainingStartsBack"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;Specifies whether the beginning of remaining portions of tasks scheduled to begin after the &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;status date but begun early should be moved back to the status date.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MoveRemainingStartsBack"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="moveRemainingStartsForward"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;Specifies whether the beginning of remaining portions of tasks scheduled to have begun late &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;should be moved up to the status date.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MoveRemainingStartsForward"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="moveCompletedEndsForward"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;Specifies whether the end of completed portions of tasks scheduled to have been completed &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;before the status date but begun late should be moved up to the status date.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MoveCompletedEndsForward"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="baselineForEarnedValue"
-        unique="false" eType="#//BaselineForEarnedValueType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The specific baseline used to calculate Variance values.  Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;0=Baseline, 1=Baseline 1, 2=Baseline 2, 3=Baseline 3, 4=Baseline 4, 5=Baseline 5, 6=Baseline 6, &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;7=Baseline 7, 8=Baseline 8, 9=Baseline 9, 10=Baseline 10"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BaselineForEarnedValue"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="autoAddNewResourcesAndTasks"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="true" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether to automatically add new resources to the resource pool."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AutoAddNewResourcesAndTasks"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="statusDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Date used for calculation and reporting."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StatusDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="currentDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The system date that the XML was generated."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CurrentDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="microsoftProjectServerURL"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the project was created by a Project Server user as opposed to an NT user.&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MicrosoftProjectServerURL"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="autolink" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether to autolink inserted or moved tasks."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Autolink"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="newTaskStartDate" unique="false"
-        eType="#//NewTaskStartDateType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default date for new tasks start.  Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;0=Project Start Date, 1=Current Date"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="NewTaskStartDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultTaskEVMethod" unique="false"
-        eType="#//DefaultTaskEVMethodType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default earned value method for tasks.  Values are: &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;0=Percent Complete, 1=Physical Percent Complete"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultTaskEVMethod"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectExternallyEdited"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the project XML was edited."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ProjectExternallyEdited"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extendedCreationDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Date used for calculation and reporting."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExtendedCreationDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualsInSync" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether all actual work has been synchronized with the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualsInSync"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="removeFileProperties" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether to remove all file properties on save."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemoveFileProperties"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="adminProject" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the project is an administrative project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AdminProject"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outlineCodes" eType="#//OutlineCodes"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of outline code definitions associated with the project.  These codes may be associated only with this project, or may be common among several projects (enterprise codes)."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OutlineCodes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="wBSMasks" eType="#//WBSMasks"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The table of entries that define the outline code mask."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WBSMasks"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedAttributes" eType="#//ExtendedAttributes"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of extended attribute (custom field) definitions &#xD;&#xA;        associated with the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExtendedAttributes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="calendars" eType="#//Calendars"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of calendars that is associated with the &#xD;&#xA;        project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Calendars"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tasks" eType="#//Tasks"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of tasks that make up the project.&#xD;&#xA;        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Tasks"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="resources" eType="#//Resources"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of resources that make up the project.&#xD;&#xA;        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Resources"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="assignments" eType="#//Assignments"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of assignments that make up the project.&#xD;&#xA;    "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Assignments"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Rate">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Rate_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ratesFrom" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the rate becomes effective.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RatesFrom"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ratesTo" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The last date that the rate is effective.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RatesTo"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rateTable" unique="false"
-        eType="#//RateTableType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the rate table for the resource. &#xD;&#xA;                                                        Values are: 0=A, 1=B, 2=C, 3=D, 4=E"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RateTable"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="standardRate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The standard rate for the resource for the period specified.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StandardRate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="standardRateFormat" unique="false"
-        eType="#//StandardRateFormatType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The units used by Microsoft Project to display the standard rate.  &#xD;&#xA;                                                        1=m, 2=h, 3=d, 4=w, 5=mo, 7=y&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StandardRateFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeRate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The overtime rate for the resource for the period specified.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeRate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeRateFormat" unique="false"
-        eType="#//OvertimeRateFormatType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The units used by Microsoft Project to display the overtime rate.  &#xD;&#xA;                                                        1=m, 2=h, 3=d, 4=w, 5=mo, 7=y"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeRateFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="costPerUse" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The cost per use of the resource. &#xD;&#xA;                                                        This value is as of the current date if a rate table exists for the resource.&#xD;&#xA;                                                        "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CostPerUse"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Rates">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Rates_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rate" upperBound="25" eType="#//Rate"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The definition of a time period, and the rates applicable for &#xD;&#xA;                                            the resource during that period."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Rate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="RateTableType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="RateTable_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Resource">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Resource_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The position identifier of the resource within the list of resources.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="#//NameType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Name"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" eType="#//TypeType4">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The type of resource. Values are: 0=Material, 1=Work&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Type"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isNull" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies whether the resource is null.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsNull"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="initials" unique="false"
-        eType="#//InitialsType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The initials of the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Initials"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="phonetics" unique="false"
-        eType="#//PhoneticsType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The phonetic spelling of the resource name.  &#xD;&#xA;                                For use with Japanese only.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Phonetics"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nTAccount" unique="false"
-        eType="#//NTAccountType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The NT account associated with the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="NTAccount"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="materialLabel" unique="false"
-        eType="#//MaterialLabelType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unit of measure for the material resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MaterialLabel"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="code" unique="false" eType="#//CodeType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The code or other information about the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Code"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group" unique="false" eType="#//GroupType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The group to which the resource belongs.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Group"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workGroup" unique="false"
-        eType="#//WorkGroupType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The type of workgroup to which the resource belongs. &#xD;&#xA;                                Values are: 0=Default, 1=None, 2=Email, 3=Web&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkGroup"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emailAddress" unique="false"
-        eType="#//EmailAddressType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The email address of the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EmailAddress"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlink" unique="false"
-        eType="#//HyperlinkType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The title of the hyperlink associated with the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Hyperlink"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlinkAddress" unique="false"
-        eType="#//HyperlinkAddressType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The hyperlink associated with the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HyperlinkAddress"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlinkSubAddress" unique="false"
-        eType="#//HyperlinkSubAddressType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The document bookmark of the hyperlink associated with the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HyperlinkSubAddress"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxUnits" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" defaultValueLiteral="1.0"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The maximum number of units that the resource is available.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MaxUnits"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="peakUnits" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The largest number of units assigned to the resource at any time.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PeakUnits"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overAllocated" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the resource is overallocated.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OverAllocated"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="availableFrom" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The first date that the resource is available.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AvailableFrom"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="availableTo" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The last date the resource is available.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AvailableTo"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled start date of the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Start"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled finish date of the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Finish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="canLevel" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the resource can be leveled.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CanLevel"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="accrueAt" unique="false"
-        eType="#//AccrueAt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="How cost is accrued against the resource. &#xD;&#xA;                                Values are: 1=Start, 2=End, 3=Prorated&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AccrueAt"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="work" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The total work assigned to the resource across all assigned tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Work"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="regularWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of non-overtime work assigned to the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RegularWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of overtime work assigned to the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of actual work performed by the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of remaining work required to complete all assigned tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of actual overtime work performed by the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingOvertimeWork"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of remaining overtime work required to complete all tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingOvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentWorkComplete" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The percentage of work completed across all tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PercentWorkComplete"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="standardRate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The standard rate of the resource. &#xD;&#xA;                                This value is as of the current date if a rate table exists for the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StandardRate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="standardRateFormat" unique="false"
-        eType="#//StandardRateFormatType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The units used by Microsoft Project to display the standard rate.  &#xD;&#xA;                                1=m, 2=h, 3=d, 4=w, 5=mo, 7=y, 8=material resource rate (or blank symbol specified)&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StandardRateFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The total project cost for the resource across all assigned tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Cost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeRate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The overtime rate of the resource. &#xD;&#xA;                                This value is as of the current date if a rate table exists for the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeRate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeRateFormat" unique="false"
-        eType="#//OvertimeRateFormatType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The units used by Microsoft Project to display the overtime rate.  &#xD;&#xA;                                1=m, 2=h, 3=d, 4=w, 5=mo, 7=y&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeRateFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The total overtime cost for the resource including actual and remaining overtime costs.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="costPerUse" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The cost per use of the resource. This value is as of the current date if a rate table &#xD;&#xA;                                exists for the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CostPerUse"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual cost incurred by the resource across all assigned tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual overtime cost incurred by the resource across all assigned tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining projected cost of the resource to complete all assigned tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingOvertimeCost"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining projected overtime cost of the resource to complete all assigned tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingOvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The difference between the baseline work and the work as minutes x 1000.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="costVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The difference between the baseline cost and the cost.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CostVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sV" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Earned value schedule variance, through the project status date.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SV"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cV" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Earned value cost variance, through the project status date.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CV"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="aCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual cost of the work performed by the resource for the project to-date.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ACWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="calendarUID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The resource calendar.Refers to a valid UID in the Calendars element of &#xD;&#xA;                                the Microsoft Project XML Schema.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CalendarUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="notes" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Text notes associated with the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Notes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWS" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budget cost of work scheduled for the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWS"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of of the work performed by the resource for the project to-date.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isGeneric" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies whether the resource is generic.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsGeneric"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isInactive" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies whether the resource is set to inactive.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsInactive"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isEnterprise" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies whether the resource is an Enterprise resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsEnterprise"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bookingType" unique="false"
-        eType="#//BookingTypeType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the booking type of the resource. 1=Commited, 2=Proposed&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BookingType"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualWorkProtected" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the duration through which actual work is protected.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualWorkProtected"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeWorkProtected"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the duration through which actual overtime work is protected.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeWorkProtected"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activeDirectoryGUID" unique="false"
-        eType="#//ActiveDirectoryGUIDType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The Active Directory GUID for the resource.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActiveDirectoryGUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the resource was created.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CreationDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedAttribute" upperBound="-1"
-        eType="#//ExtendedAttribute3" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of an extended attribute.  Two pieces of data are necessary - &#xD;&#xA;                                a pointer back to the extended attribute table which is specified either by the unique ID or the Field ID, &#xD;&#xA;                                and the value which is specified either with the value, or a pointer back to the value list.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExtendedAttribute"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="baseline" upperBound="-1"
-        eType="#//Baseline2" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The baseline values for the resources.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Baseline"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outlineCode" upperBound="-1"
-        eType="#//OutlineCode3" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of an outline code.  Two pieces of data are necessary - a pointer back to &#xD;&#xA;                                the outline code table which is specified either by the unique ID or the Field ID, and the value which is &#xD;&#xA;                                specified either with the value, or a pointer back to the value list.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OutlineCode"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="availabilityPeriods" eType="#//AvailabilityPeriods"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A collection of periods during which the resource is available.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AvailabilityPeriods"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rates" eType="#//Rates"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A collection of periods and the rates associated with each one.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Rates"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timephasedData" upperBound="-1"
-        eType="#//TimephasedDataType" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The time phased data&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TimephasedData"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Resources">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Resources_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="resource" upperBound="-1"
-        eType="#//Resource" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="There must be at least one resource in each Resources collection.&#xD;&#xA;                    "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Resource"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="RollupTypeType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="RollupType_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4 5 6 7"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="StandardRateFormatType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="StandardRateFormat_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3 4 5 7"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="StandardRateFormatType1" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="StandardRateFormat_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3 4 5 7 8"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="SubjectType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Subject_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="SubprojectNameType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="SubprojectName_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Task">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Task_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The position identifier of the task within the list of tasks.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="#//NameType2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Name"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" eType="#//TypeType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The type of task. &#xD;&#xA;                                Values are: 0=Fixed Units, 1=Fixed Duration, 2=Fixed Work.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Type"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isNull" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies whether the task is null.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsNull"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="createDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the task was created.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CreateDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="contact" unique="false"
-        eType="#//ContactType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The contact person for the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Contact"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wBS" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The work breakdown structure code of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WBS"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wBSLevel" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The rightmost WBS level of the task. &#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WBSLevel"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="outlineNumber" unique="false"
-        eType="#//OutlineNumberType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The outline number of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OutlineNumber"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="outlineLevel" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The outline level of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OutlineLevel"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="priority" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The priority of the task from 0 to 1000.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Priority"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled start date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Start"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The scheduled finish date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Finish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="duration" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The planned duration of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Duration"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="durationFormat" unique="false"
-        eType="#//DurationFormatType4">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the Duration of the Task.  &#xD;&#xA;                                Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, &#xD;&#xA;                                20=e%, 21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, &#xD;&#xA;                                43=mo?, 44=emo?, 51=%?, 52=e%? and 53=null.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DurationFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="work" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of scheduled work for the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Work"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stop" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the task was stopped.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Stop"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resume" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date that the task resumed.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Resume"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resumeValid" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task can be resumed.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ResumeValid"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="effortDriven" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is effort-driven.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EffortDriven"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="recurring" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is a recurring task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Recurring"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overAllocated" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is overallocated. &#xD;&#xA;                                This element is informational only.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OverAllocated"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="estimated" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is estimated.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Estimated"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="milestone" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is a milestone.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Milestone"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="summary" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is a summary task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Summary"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="critical" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is in the critical chain.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Critical"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSubproject" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is an inserted project.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsSubproject"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSubprojectReadOnly" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the inserted project is read-only.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IsSubprojectReadOnly"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="subprojectName" unique="false"
-        eType="#//SubprojectNameType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The source location of the inserted project.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SubprojectName"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalTask" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is external.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExternalTask"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalTaskProject" unique="false"
-        eType="#//ExternalTaskProjectType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The source location and task identifier of the external task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExternalTaskProject"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="earlyStart" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The early start date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EarlyStart"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="earlyFinish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The early finish date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EarlyFinish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lateStart" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The late start date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LateStart"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lateFinish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The late finish date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LateFinish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="startVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The variance of the task start date from &#xD;&#xA;                                the baseline start date as minutes x 1000.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="StartVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finishVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The variance of the task finish date from &#xD;&#xA;                                the baseline finish date as minutes x 1000.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FinishVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workVariance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The variance of task work from the baseline &#xD;&#xA;                                task work as minutes x 1000.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkVariance"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="freeSlack" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of free slack.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FreeSlack"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="totalSlack" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of total slack.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TotalSlack"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fixedCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The fixed cost of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FixedCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fixedCostAccrual" unique="false"
-        eType="#//FixedCostAccrualType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="How the fixed cost is accrued against the task. &#xD;&#xA;                                Values are: 1=Start, 2=Prorated and 3=End.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FixedCostAccrual"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentComplete" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The percentage of the task duration completed.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PercentComplete"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentWorkComplete" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The percentage of the task work completed.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PercentWorkComplete"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The projected or scheduled cost of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Cost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The sum of the actual and remaining overtime cost of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overtimeWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of overtime work scheduled for the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualStart" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual start date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualStart"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualFinish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual finish date of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualFinish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualDuration" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual duration of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualDuration"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual cost of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual overtime cost of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual work for the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual overtime work for the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="regularWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of non-overtime work scheduled for the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RegularWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingDuration" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The amount of time required to complete the unfinished portion of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingDuration"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingCost" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining projected cost of completing the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingWork" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining work scheduled to complete the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingOvertimeCost"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining overtime cost projected to finish the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingOvertimeCost"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remainingOvertimeWork"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The remaining overtime work scheduled to finish the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RemainingOvertimeWork"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="aCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual cost of work performed on the task to-date.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ACWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cV" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Earned value cost variance.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CV"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="constraintType" unique="false"
-        eType="#//ConstraintTypeType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The constraint on the start or finish date of the task. &#xD;&#xA;                                Values are: 0=As Soon As Possible, 1=As Late As Possible, 2=Must Start On, 3=Must Finish On, &#xD;&#xA;                                4=Start No Earlier Than, 5=Start No Later Than, 6=Finish No Earlier Than and 7=Finish No Later Than&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ConstraintType"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="calendarUID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The task calendar.Refers to a valid UID in the Calendars element of &#xD;&#xA;                                the Microsoft Project XML Schema.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CalendarUID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="constraintDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date argument for the task constraint type.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ConstraintDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deadline" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The deadline for the task to be completed.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Deadline"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelAssignments" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether leveling can adjust assignments.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LevelAssignments"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelingCanSplit" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether leveling can split the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LevelingCanSplit"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelingDelay" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The delay caused by leveling the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LevelingDelay"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelingDelayFormat" unique="false"
-        eType="#//LevelingDelayFormatType1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The format for expressing the duration of the delay.  &#xD;&#xA;                                Values are: 3=m, 4=em, 5=h, 6=eh, 7=d, 8=ed, 9=w, 10=ew, 11=mo, 12=emo, 19=%, &#xD;&#xA;                                20=e%, 21=null, 35=m?, 36=em?, 37=h?, 38=eh?, 39=d?, 40=ed?, 41=w?, 42=ew?, &#xD;&#xA;                                43=mo?, 44=emo?, 51=%?, 52=e%? and 53=null.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LevelingDelayFormat"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="preLeveledStart" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The start date of the task before it was leveled.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PreLeveledStart"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="preLeveledFinish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The finish date of the task before it was leveled.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PreLeveledFinish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlink" unique="false"
-        eType="#//HyperlinkType2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The title of the hyperlink associated with the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Hyperlink"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlinkAddress" unique="false"
-        eType="#//HyperlinkAddressType2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The hyperlink associated with the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HyperlinkAddress"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hyperlinkSubAddress" unique="false"
-        eType="#//HyperlinkSubAddressType2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The document bookmark of the hyperlink associated with the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HyperlinkSubAddress"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ignoreResourceCalendar"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task ignores the resource calendar.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IgnoreResourceCalendar"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="notes" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Text notes associated with the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Notes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hideBar" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the GANTT bar of the task is hidden when displayed in Microsoft Project.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HideBar"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rollup" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the task is rolled up.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Rollup"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWS" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work scheduled for the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWS"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bCWP" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The budgeted cost of work performed on the task to-date.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BCWP"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="physicalPercentComplete"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The percentage complete value entered by the Project Manager.  &#xD;&#xA;                                This can be used as an alternative for calculating BCWP.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PhysicalPercentComplete"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="earnedValueMethod" unique="false"
-        eType="#//EarnedValueMethodType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The method for calculating earned value. &#xD;&#xA;                                Values are: 0=Percent Complete, 1=Physical Percent Complete&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EarnedValueMethod"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="predecessorLink" upperBound="-1"
-        eType="#//PredecessorLink" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the predecessor task of the task that contains it.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PredecessorLink"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualWorkProtected" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the duration through which actual work is protected.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualWorkProtected"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualOvertimeWorkProtected"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Duration">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the duration through which actual overtime work is protected.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActualOvertimeWorkProtected"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedAttribute" upperBound="-1"
-        eType="#//ExtendedAttribute2" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of an extended attribute.  Two pieces of data are necessary - &#xD;&#xA;                                a pointer back to the extended attribute table which is specified either by the unique ID or &#xD;&#xA;                                the Field ID, and the value which is specified either with the value, or a pointer back to the value list.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExtendedAttribute"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="baseline" upperBound="-1"
-        eType="#//Baseline" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of baseline values of the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Baseline"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outlineCode" upperBound="-1"
-        eType="#//OutlineCode2" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of an outline code.  Two pieces of data are necessary - &#xD;&#xA;                                a pointer back to the outline code table which is specified either by the unique ID or the Field ID, &#xD;&#xA;                                and the value which is specified either with the value, or a pointer back to the value list.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OutlineCode"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timephasedData" upperBound="-1"
-        eType="#//TimephasedDataType" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The time phased data block associated with the task.&#xD;&#xA;                                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TimephasedData"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Tasks">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Tasks_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="task" upperBound="-1" eType="#//Task"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="There must be at least one task in each Tasks collection.&#xD;&#xA;                    "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Task"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TimePeriod">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="TimePeriod_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fromDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The beginning of the exception time.&#xD;&#xA;                                                                     "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FromDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="toDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The end of the exception time.&#xD;&#xA;                                                                     "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ToDate"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TimephasedDataType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The definition of the time phased data block.&#xD;&#xA;&#x9;&#x9;        "/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="TimephasedDataType"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" eType="#//TypeType3">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&#xD;&#xA;                The type of task timephased data. Values are:&#xD;&#xA;                    1=Assignment Remaining Work&#xD;&#xA;                    2=Assignment Actual Work&#xD;&#xA;                    3=Assignment Actual Overtime Work&#xD;&#xA;                    4=Assignment Baseline Work&#xD;&#xA;                    5=Assignment Baseline Cost&#xD;&#xA;                    6=Assignment Actual Cost&#xD;&#xA;                    7=Resource Baseline Work&#xD;&#xA;                    8=Resource Baseline Cost&#xD;&#xA;                    9=Task Baseline Work&#xD;&#xA;                    10=Task Baseline Cost&#xD;&#xA;                    11=Task Percent Complete&#xD;&#xA;                    16=Assignment Baseline 1 Work&#xD;&#xA;                    17=Assignment Baseline 1 Cost&#xD;&#xA;                    18=Task Baseline 1 Work&#xD;&#xA;                    19=Task Baseline 1 Cost&#xD;&#xA;                    20=Resource Baseline 1 Work&#xD;&#xA;                    21=Resource Baseline 1 Cost&#xD;&#xA;                    22=Assignment Baseline 2 Work&#xD;&#xA;                    23=Assignment Baseline 2 Cost&#xD;&#xA;                    24=Task Baseline 2 Work&#xD;&#xA;                    25=Task Baseline 2 Cost&#xD;&#xA;                    26=Resource Baseline 2 Work&#xD;&#xA;                    27=Resource Baseline 2 Cost&#xD;&#xA;                    28=Assignment Baseline 3 Work&#xD;&#xA;                    29=Assignment Baseline 3 Cost&#xD;&#xA;                    30=Task Baseline 3 Work&#xD;&#xA;                    31=Task Baseline 3 Cost&#xD;&#xA;                    32=Resource Baseline 3 Work&#xD;&#xA;                    33=Resource Baseline 3 Cost&#xD;&#xA;                    34=Assignment Baseline 4 Work&#xD;&#xA;                    35=Assignment Baseline 4 Cost&#xD;&#xA;                    36=Task Baseline 4 Work&#xD;&#xA;                    37=Task Baseline 4 Cost&#xD;&#xA;                    38=Resource Baseline 4 Work&#xD;&#xA;                    39=Resource Baseline 4 Cost&#xD;&#xA;                    40=Assignment Baseline 5 Work&#xD;&#xA;                    41=Assignment Baseline 5 Cost&#xD;&#xA;                    42=Task Baseline 5 Work&#xD;&#xA;                    43=Task Baseline 5 Cost&#xD;&#xA;                    44=Resource Baseline 5 Work&#xD;&#xA;                    45=Resource Baseline 5 Cost&#xD;&#xA;                    46=Assignment Baseline 6 Work&#xD;&#xA;                    47=Assignment Baseline 6 Cost&#xD;&#xA;                    48=Task Baseline 6 Work&#xD;&#xA;                    49=Task Baseline 6 Cost&#xD;&#xA;                    50=Resource Baseline 6 Work&#xD;&#xA;                    51=Resource Baseline 6 Cost&#xD;&#xA;                    52=Assignment Baseline 7 Work&#xD;&#xA;                    53=Assignment Baseline 7 Cost&#xD;&#xA;                    54=Task Baseline 7 Work&#xD;&#xA;                    55=Task Baseline 7 Cost&#xD;&#xA;                    56=Resource Baseline 7 Work&#xD;&#xA;                    57=Resource Baseline 7 Cost&#xD;&#xA;                    58=Assignment Baseline 8 Work&#xD;&#xA;                    59=Assignment Baseline 8 Cost&#xD;&#xA;                    60=Task Baseline 8 Work&#xD;&#xA;                    61=Task Baseline 8 Cost&#xD;&#xA;                    62=Resource Baseline 8 Work&#xD;&#xA;                    63=Resource Baseline 8 Cost&#xD;&#xA;                    64=Assignment Baseline 9 Work&#xD;&#xA;                    65=Assignment Baseline 9 Cost&#xD;&#xA;                    66=Task Baseline 9 Work&#xD;&#xA;                    67=Task Baseline 9 Cost&#xD;&#xA;                    68=Resource Baseline 9 Work&#xD;&#xA;                    69=Resource Baseline 9 Cost&#xD;&#xA;                    70=Assignment Baseline 10 Work&#xD;&#xA;                    71=Assignment Baseline 10 Cost&#xD;&#xA;                    72=Task Baseline 10 Work&#xD;&#xA;                    73=Task Baseline 10 Cost&#xD;&#xA;                    74=Resource Baseline 10 Work&#xD;&#xA;                    75=Resource Baseline 10 Cost&#xD;&#xA;                    76=Physical Percent Complete&#xD;&#xA;                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Type"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uID" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique identifier of the timephased data record.&#xD;&#xA;                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The start date of the timephased data period.&#xD;&#xA;                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Start"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finish" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The finish date of the timephased data period.&#xD;&#xA;                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Finish"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unit" unique="false" eType="#//UnitType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The time unit of the timephased data period. &#xD;&#xA;                Values are: 0=m, 1=h, 2=d, 3=w, 5=mo, 8=y&#xD;&#xA;                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Unit"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value per unit of time for the timephased data period.&#xD;&#xA;                "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TitleType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Title_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="512"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TypeType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Type_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TypeType1" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Type_._1_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TypeType2" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Type_._2_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TypeType3" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Type_._3_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3 4 5 6 7 8 9 10 11 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TypeType4" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Type_._4_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="TypeType5" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Type_._5_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="UIDType" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="UID_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="maxLength" value="16"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="UnitType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Unit_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 5 8"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Value">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Value_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique ID of the outline code value across the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValueID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentValueID" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The value of the parent node of the outline code."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ParentValueID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual value."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A description of this value."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Description"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Value2">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Value_._1_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Unique ID of value across &#xD;&#xA;                                                        the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ID"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The actual value."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The description of the value &#xD;&#xA;                                                        in the list."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Description"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ValueList">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ValueList_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" upperBound="-1"
-        eType="#//Value2" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The values that make up the value list.&#xD;&#xA;                                            "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ValuelistSortOrderType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ValuelistSortOrder_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Values">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Values_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group" unique="false" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:0"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" upperBound="-1"
-        eType="#//Value" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The individual values."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Value"/>
-        <details key="namespace" value="##targetNamespace"/>
-        <details key="group" value="#group:0"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WBSMask">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WBSMask_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="level" unique="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The level of the mask."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Level"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" lowerBound="1"
-        eType="#//TypeType2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The type of the node value. &#xD;&#xA;                                The values are: 0=Numbers, 1=Uppercase Letters, 2=Lowercase Letters, 3=Characters."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Type"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="length" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The maximum length in characters.  &#xD;&#xA;                                This element is omitted when length is &quot;any&quot;."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Length"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="separator" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The separator character of the node."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Separator"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WBSMasks">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WBSMasks_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="verifyUniqueCodes" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether WBS codes are unique for new tasks."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="VerifyUniqueCodes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateCodes" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        defaultValueLiteral="false" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether WBS codes are generated for new tasks."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="GenerateCodes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" unique="false"
-        eType="#//PrefixType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The prefix for all WBS codes."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Prefix"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="wBSMask" upperBound="-1"
-        eType="#//WBSMask" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The WBS Mask that is applied to all tasks in the Project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WBSMask"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WeekDay">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WeekDay_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dayType" unique="false"
-        lowerBound="1" eType="#//DayTypeType">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The type of day. &#xD;&#xA;                                                         Values are: 0=Exception, 1=Monday, 2=Tuesday, &#xD;&#xA;                                                         3=Wednesday, 4=Thursday, 5=Friday, 6=Saturday, &#xD;&#xA;                                                         7=Sunday"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DayType"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dayWorking" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Whether the specified date or day &#xD;&#xA;                                                         type is working."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DayWorking"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timePeriod" eType="#//TimePeriod"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines a contiguous set of exception days.&#xD;&#xA;                                                         "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TimePeriod"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="workingTimes" eType="#//WorkingTimes"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The collection of working times that define the time worked &#xD;&#xA;                                                         on the weekday.  One of these must be present, and there may be no more than five.&#xD;&#xA;                                                         "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkingTimes"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WeekDays">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WeekDays_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="weekDay" upperBound="-1"
-        eType="#//WeekDay" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A weekday either defines regular days &#xD;&#xA;                                            of the week or exception days in the calendar."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WeekDay"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="WeekStartDayType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WeekStartDay_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4 5 6"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="WorkContourType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkContour_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3 4 5 6 7 8"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="WorkFormatType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkFormat_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="1 2 3 4 5"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="WorkGroupType" instanceClassName="java.math.BigInteger">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkGroup_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#integer"/>
-      <details key="enumeration" value="0 1 2 3"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkingTime">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkingTime_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fromTime" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Time">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The beginning of the working time.&#xD;&#xA;                                                                                     "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="FromTime"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="toTime" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Time">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The end of the working  time.&#xD;&#xA;                                                                                     "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ToTime"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkingTimes">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkingTimes_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="workingTime" upperBound="5"
-        eType="#//WorkingTime" containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the working time during the weekday.&#xD;&#xA;                                                                         "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkingTime"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/package.html b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/package.html
deleted file mode 100755
index c167fd8..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/impl/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the implementation for the Microsoft Project model objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/package.html b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/package.html
deleted file mode 100755
index 3e3b80c..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces for the Microsoft Project model objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectAdapterFactory.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectAdapterFactory.java
deleted file mode 100755
index 19bc6f1..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectAdapterFactory.java
+++ /dev/null
@@ -1,838 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MsprojectAdapterFactory.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.msproject.Assignment;
-import org.eclipse.epf.msproject.Assignments;
-import org.eclipse.epf.msproject.AvailabilityPeriod;
-import org.eclipse.epf.msproject.AvailabilityPeriods;
-import org.eclipse.epf.msproject.Baseline;
-import org.eclipse.epf.msproject.Baseline2;
-import org.eclipse.epf.msproject.Baseline3;
-import org.eclipse.epf.msproject.Calendar;
-import org.eclipse.epf.msproject.Calendars;
-import org.eclipse.epf.msproject.DocumentRoot;
-import org.eclipse.epf.msproject.ExtendedAttribute;
-import org.eclipse.epf.msproject.ExtendedAttribute2;
-import org.eclipse.epf.msproject.ExtendedAttribute3;
-import org.eclipse.epf.msproject.ExtendedAttribute4;
-import org.eclipse.epf.msproject.ExtendedAttributes;
-import org.eclipse.epf.msproject.Mask;
-import org.eclipse.epf.msproject.Masks;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.OutlineCode;
-import org.eclipse.epf.msproject.OutlineCode2;
-import org.eclipse.epf.msproject.OutlineCode3;
-import org.eclipse.epf.msproject.OutlineCodes;
-import org.eclipse.epf.msproject.PredecessorLink;
-import org.eclipse.epf.msproject.Project;
-import org.eclipse.epf.msproject.Rate;
-import org.eclipse.epf.msproject.Rates;
-import org.eclipse.epf.msproject.Resource;
-import org.eclipse.epf.msproject.Resources;
-import org.eclipse.epf.msproject.Task;
-import org.eclipse.epf.msproject.Tasks;
-import org.eclipse.epf.msproject.TimePeriod;
-import org.eclipse.epf.msproject.TimephasedDataType;
-import org.eclipse.epf.msproject.Value;
-import org.eclipse.epf.msproject.Value2;
-import org.eclipse.epf.msproject.ValueList;
-import org.eclipse.epf.msproject.Values;
-import org.eclipse.epf.msproject.WBSMask;
-import org.eclipse.epf.msproject.WBSMasks;
-import org.eclipse.epf.msproject.WeekDay;
-import org.eclipse.epf.msproject.WeekDays;
-import org.eclipse.epf.msproject.WorkingTime;
-import org.eclipse.epf.msproject.WorkingTimes;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.msproject.MsprojectPackage
- * @generated
- */
-public class MsprojectAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static MsprojectPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MsprojectAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = MsprojectPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MsprojectSwitch modelSwitch =
-		new MsprojectSwitch() {
-			public Object caseAssignment(Assignment object) {
-				return createAssignmentAdapter();
-			}
-			public Object caseAssignments(Assignments object) {
-				return createAssignmentsAdapter();
-			}
-			public Object caseAvailabilityPeriod(AvailabilityPeriod object) {
-				return createAvailabilityPeriodAdapter();
-			}
-			public Object caseAvailabilityPeriods(AvailabilityPeriods object) {
-				return createAvailabilityPeriodsAdapter();
-			}
-			public Object caseBaseline(Baseline object) {
-				return createBaselineAdapter();
-			}
-			public Object caseBaseline2(Baseline2 object) {
-				return createBaseline2Adapter();
-			}
-			public Object caseBaseline3(Baseline3 object) {
-				return createBaseline3Adapter();
-			}
-			public Object caseCalendar(Calendar object) {
-				return createCalendarAdapter();
-			}
-			public Object caseCalendars(Calendars object) {
-				return createCalendarsAdapter();
-			}
-			public Object caseDocumentRoot(DocumentRoot object) {
-				return createDocumentRootAdapter();
-			}
-			public Object caseExtendedAttribute(ExtendedAttribute object) {
-				return createExtendedAttributeAdapter();
-			}
-			public Object caseExtendedAttribute2(ExtendedAttribute2 object) {
-				return createExtendedAttribute2Adapter();
-			}
-			public Object caseExtendedAttribute3(ExtendedAttribute3 object) {
-				return createExtendedAttribute3Adapter();
-			}
-			public Object caseExtendedAttribute4(ExtendedAttribute4 object) {
-				return createExtendedAttribute4Adapter();
-			}
-			public Object caseExtendedAttributes(ExtendedAttributes object) {
-				return createExtendedAttributesAdapter();
-			}
-			public Object caseMask(Mask object) {
-				return createMaskAdapter();
-			}
-			public Object caseMasks(Masks object) {
-				return createMasksAdapter();
-			}
-			public Object caseOutlineCode(OutlineCode object) {
-				return createOutlineCodeAdapter();
-			}
-			public Object caseOutlineCode2(OutlineCode2 object) {
-				return createOutlineCode2Adapter();
-			}
-			public Object caseOutlineCode3(OutlineCode3 object) {
-				return createOutlineCode3Adapter();
-			}
-			public Object caseOutlineCodes(OutlineCodes object) {
-				return createOutlineCodesAdapter();
-			}
-			public Object casePredecessorLink(PredecessorLink object) {
-				return createPredecessorLinkAdapter();
-			}
-			public Object caseProject(Project object) {
-				return createProjectAdapter();
-			}
-			public Object caseRate(Rate object) {
-				return createRateAdapter();
-			}
-			public Object caseRates(Rates object) {
-				return createRatesAdapter();
-			}
-			public Object caseResource(Resource object) {
-				return createResourceAdapter();
-			}
-			public Object caseResources(Resources object) {
-				return createResourcesAdapter();
-			}
-			public Object caseTask(Task object) {
-				return createTaskAdapter();
-			}
-			public Object caseTasks(Tasks object) {
-				return createTasksAdapter();
-			}
-			public Object caseTimePeriod(TimePeriod object) {
-				return createTimePeriodAdapter();
-			}
-			public Object caseTimephasedDataType(TimephasedDataType object) {
-				return createTimephasedDataTypeAdapter();
-			}
-			public Object caseValue(Value object) {
-				return createValueAdapter();
-			}
-			public Object caseValue2(Value2 object) {
-				return createValue2Adapter();
-			}
-			public Object caseValueList(ValueList object) {
-				return createValueListAdapter();
-			}
-			public Object caseValues(Values object) {
-				return createValuesAdapter();
-			}
-			public Object caseWBSMask(WBSMask object) {
-				return createWBSMaskAdapter();
-			}
-			public Object caseWBSMasks(WBSMasks object) {
-				return createWBSMasksAdapter();
-			}
-			public Object caseWeekDay(WeekDay object) {
-				return createWeekDayAdapter();
-			}
-			public Object caseWeekDays(WeekDays object) {
-				return createWeekDaysAdapter();
-			}
-			public Object caseWorkingTime(WorkingTime object) {
-				return createWorkingTimeAdapter();
-			}
-			public Object caseWorkingTimes(WorkingTimes object) {
-				return createWorkingTimesAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Assignment <em>Assignment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Assignment
-	 * @generated
-	 */
-	public Adapter createAssignmentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Assignments <em>Assignments</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Assignments
-	 * @generated
-	 */
-	public Adapter createAssignmentsAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.AvailabilityPeriod <em>Availability Period</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.AvailabilityPeriod
-	 * @generated
-	 */
-	public Adapter createAvailabilityPeriodAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.AvailabilityPeriods <em>Availability Periods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.AvailabilityPeriods
-	 * @generated
-	 */
-	public Adapter createAvailabilityPeriodsAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Baseline <em>Baseline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Baseline
-	 * @generated
-	 */
-	public Adapter createBaselineAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Baseline2 <em>Baseline2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Baseline2
-	 * @generated
-	 */
-	public Adapter createBaseline2Adapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Baseline3 <em>Baseline3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Baseline3
-	 * @generated
-	 */
-	public Adapter createBaseline3Adapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Calendar <em>Calendar</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Calendar
-	 * @generated
-	 */
-	public Adapter createCalendarAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Calendars <em>Calendars</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Calendars
-	 * @generated
-	 */
-	public Adapter createCalendarsAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.DocumentRoot <em>Document Root</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.DocumentRoot
-	 * @generated
-	 */
-	public Adapter createDocumentRootAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.ExtendedAttribute <em>Extended Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute
-	 * @generated
-	 */
-	public Adapter createExtendedAttributeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.ExtendedAttribute2 <em>Extended Attribute2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute2
-	 * @generated
-	 */
-	public Adapter createExtendedAttribute2Adapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.ExtendedAttribute3 <em>Extended Attribute3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute3
-	 * @generated
-	 */
-	public Adapter createExtendedAttribute3Adapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.ExtendedAttribute4 <em>Extended Attribute4</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.ExtendedAttribute4
-	 * @generated
-	 */
-	public Adapter createExtendedAttribute4Adapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.ExtendedAttributes <em>Extended Attributes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.ExtendedAttributes
-	 * @generated
-	 */
-	public Adapter createExtendedAttributesAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Mask <em>Mask</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Mask
-	 * @generated
-	 */
-	public Adapter createMaskAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Masks <em>Masks</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Masks
-	 * @generated
-	 */
-	public Adapter createMasksAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.OutlineCode <em>Outline Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.OutlineCode
-	 * @generated
-	 */
-	public Adapter createOutlineCodeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.OutlineCode2 <em>Outline Code2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.OutlineCode2
-	 * @generated
-	 */
-	public Adapter createOutlineCode2Adapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.OutlineCode3 <em>Outline Code3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.OutlineCode3
-	 * @generated
-	 */
-	public Adapter createOutlineCode3Adapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.OutlineCodes <em>Outline Codes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.OutlineCodes
-	 * @generated
-	 */
-	public Adapter createOutlineCodesAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.PredecessorLink <em>Predecessor Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.PredecessorLink
-	 * @generated
-	 */
-	public Adapter createPredecessorLinkAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Project <em>Project</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Project
-	 * @generated
-	 */
-	public Adapter createProjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Rate <em>Rate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Rate
-	 * @generated
-	 */
-	public Adapter createRateAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Rates <em>Rates</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Rates
-	 * @generated
-	 */
-	public Adapter createRatesAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Resource <em>Resource</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Resource
-	 * @generated
-	 */
-	public Adapter createResourceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Resources <em>Resources</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Resources
-	 * @generated
-	 */
-	public Adapter createResourcesAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Task <em>Task</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Task
-	 * @generated
-	 */
-	public Adapter createTaskAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Tasks <em>Tasks</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Tasks
-	 * @generated
-	 */
-	public Adapter createTasksAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.TimePeriod <em>Time Period</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.TimePeriod
-	 * @generated
-	 */
-	public Adapter createTimePeriodAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.TimephasedDataType <em>Timephased Data Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.TimephasedDataType
-	 * @generated
-	 */
-	public Adapter createTimephasedDataTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Value <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Value
-	 * @generated
-	 */
-	public Adapter createValueAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Value2 <em>Value2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Value2
-	 * @generated
-	 */
-	public Adapter createValue2Adapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.ValueList <em>Value List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.ValueList
-	 * @generated
-	 */
-	public Adapter createValueListAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.Values <em>Values</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.Values
-	 * @generated
-	 */
-	public Adapter createValuesAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.WBSMask <em>WBS Mask</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.WBSMask
-	 * @generated
-	 */
-	public Adapter createWBSMaskAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.WBSMasks <em>WBS Masks</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.WBSMasks
-	 * @generated
-	 */
-	public Adapter createWBSMasksAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.WeekDay <em>Week Day</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.WeekDay
-	 * @generated
-	 */
-	public Adapter createWeekDayAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.WeekDays <em>Week Days</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.WeekDays
-	 * @generated
-	 */
-	public Adapter createWeekDaysAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.WorkingTime <em>Working Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.WorkingTime
-	 * @generated
-	 */
-	public Adapter createWorkingTimeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.msproject.WorkingTimes <em>Working Times</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.msproject.WorkingTimes
-	 * @generated
-	 */
-	public Adapter createWorkingTimesAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //MsprojectAdapterFactory
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectResourceFactoryImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectResourceFactoryImpl.java
deleted file mode 100755
index fd292d2..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectResourceFactoryImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MsprojectResourceFactoryImpl.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.msproject.util.MsprojectResourceImpl
- * @generated
- */
-public class MsprojectResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MsprojectResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Resource createResource(URI uri) {
-		XMLResource result = new MsprojectResourceImpl(uri);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
-		return result;
-	}
-
-} //MsprojectResourceFactoryImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectResourceImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectResourceImpl.java
deleted file mode 100755
index c8c2bb8..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectResourceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MsprojectResourceImpl.java,v 1.2 2006/04/11 15:29:55 jthario Exp $
- */
-package org.eclipse.epf.msproject.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.msproject.util.MsprojectResourceFactoryImpl
- * @generated
- */
-public class MsprojectResourceImpl extends XMLResourceImpl {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public MsprojectResourceImpl(URI uri) {
-		super(uri);
-	}
-
-	protected XMLHelper createXMLHelper(){
-	    return new MsprojectXMLHelperImpl(this);
-	}
-} //MsprojectResourceImpl
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectSwitch.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectSwitch.java
deleted file mode 100755
index d3c313c..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectSwitch.java
+++ /dev/null
@@ -1,1010 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MsprojectSwitch.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.msproject.Assignment;
-import org.eclipse.epf.msproject.Assignments;
-import org.eclipse.epf.msproject.AvailabilityPeriod;
-import org.eclipse.epf.msproject.AvailabilityPeriods;
-import org.eclipse.epf.msproject.Baseline;
-import org.eclipse.epf.msproject.Baseline2;
-import org.eclipse.epf.msproject.Baseline3;
-import org.eclipse.epf.msproject.Calendar;
-import org.eclipse.epf.msproject.Calendars;
-import org.eclipse.epf.msproject.DocumentRoot;
-import org.eclipse.epf.msproject.ExtendedAttribute;
-import org.eclipse.epf.msproject.ExtendedAttribute2;
-import org.eclipse.epf.msproject.ExtendedAttribute3;
-import org.eclipse.epf.msproject.ExtendedAttribute4;
-import org.eclipse.epf.msproject.ExtendedAttributes;
-import org.eclipse.epf.msproject.Mask;
-import org.eclipse.epf.msproject.Masks;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.OutlineCode;
-import org.eclipse.epf.msproject.OutlineCode2;
-import org.eclipse.epf.msproject.OutlineCode3;
-import org.eclipse.epf.msproject.OutlineCodes;
-import org.eclipse.epf.msproject.PredecessorLink;
-import org.eclipse.epf.msproject.Project;
-import org.eclipse.epf.msproject.Rate;
-import org.eclipse.epf.msproject.Rates;
-import org.eclipse.epf.msproject.Resource;
-import org.eclipse.epf.msproject.Resources;
-import org.eclipse.epf.msproject.Task;
-import org.eclipse.epf.msproject.Tasks;
-import org.eclipse.epf.msproject.TimePeriod;
-import org.eclipse.epf.msproject.TimephasedDataType;
-import org.eclipse.epf.msproject.Value;
-import org.eclipse.epf.msproject.Value2;
-import org.eclipse.epf.msproject.ValueList;
-import org.eclipse.epf.msproject.Values;
-import org.eclipse.epf.msproject.WBSMask;
-import org.eclipse.epf.msproject.WBSMasks;
-import org.eclipse.epf.msproject.WeekDay;
-import org.eclipse.epf.msproject.WeekDays;
-import org.eclipse.epf.msproject.WorkingTime;
-import org.eclipse.epf.msproject.WorkingTimes;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.msproject.MsprojectPackage
- * @generated
- */
-public class MsprojectSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static MsprojectPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MsprojectSwitch() {
-		if (modelPackage == null) {
-			modelPackage = MsprojectPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case MsprojectPackage.ASSIGNMENT: {
-				Assignment assignment = (Assignment)theEObject;
-				Object result = caseAssignment(assignment);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.ASSIGNMENTS: {
-				Assignments assignments = (Assignments)theEObject;
-				Object result = caseAssignments(assignments);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.AVAILABILITY_PERIOD: {
-				AvailabilityPeriod availabilityPeriod = (AvailabilityPeriod)theEObject;
-				Object result = caseAvailabilityPeriod(availabilityPeriod);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.AVAILABILITY_PERIODS: {
-				AvailabilityPeriods availabilityPeriods = (AvailabilityPeriods)theEObject;
-				Object result = caseAvailabilityPeriods(availabilityPeriods);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.BASELINE: {
-				Baseline baseline = (Baseline)theEObject;
-				Object result = caseBaseline(baseline);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.BASELINE2: {
-				Baseline2 baseline2 = (Baseline2)theEObject;
-				Object result = caseBaseline2(baseline2);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.BASELINE3: {
-				Baseline3 baseline3 = (Baseline3)theEObject;
-				Object result = caseBaseline3(baseline3);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.CALENDAR: {
-				Calendar calendar = (Calendar)theEObject;
-				Object result = caseCalendar(calendar);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.CALENDARS: {
-				Calendars calendars = (Calendars)theEObject;
-				Object result = caseCalendars(calendars);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.DOCUMENT_ROOT: {
-				DocumentRoot documentRoot = (DocumentRoot)theEObject;
-				Object result = caseDocumentRoot(documentRoot);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.EXTENDED_ATTRIBUTE: {
-				ExtendedAttribute extendedAttribute = (ExtendedAttribute)theEObject;
-				Object result = caseExtendedAttribute(extendedAttribute);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2: {
-				ExtendedAttribute2 extendedAttribute2 = (ExtendedAttribute2)theEObject;
-				Object result = caseExtendedAttribute2(extendedAttribute2);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3: {
-				ExtendedAttribute3 extendedAttribute3 = (ExtendedAttribute3)theEObject;
-				Object result = caseExtendedAttribute3(extendedAttribute3);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4: {
-				ExtendedAttribute4 extendedAttribute4 = (ExtendedAttribute4)theEObject;
-				Object result = caseExtendedAttribute4(extendedAttribute4);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.EXTENDED_ATTRIBUTES: {
-				ExtendedAttributes extendedAttributes = (ExtendedAttributes)theEObject;
-				Object result = caseExtendedAttributes(extendedAttributes);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.MASK: {
-				Mask mask = (Mask)theEObject;
-				Object result = caseMask(mask);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.MASKS: {
-				Masks masks = (Masks)theEObject;
-				Object result = caseMasks(masks);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.OUTLINE_CODE: {
-				OutlineCode outlineCode = (OutlineCode)theEObject;
-				Object result = caseOutlineCode(outlineCode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.OUTLINE_CODE2: {
-				OutlineCode2 outlineCode2 = (OutlineCode2)theEObject;
-				Object result = caseOutlineCode2(outlineCode2);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.OUTLINE_CODE3: {
-				OutlineCode3 outlineCode3 = (OutlineCode3)theEObject;
-				Object result = caseOutlineCode3(outlineCode3);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.OUTLINE_CODES: {
-				OutlineCodes outlineCodes = (OutlineCodes)theEObject;
-				Object result = caseOutlineCodes(outlineCodes);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.PREDECESSOR_LINK: {
-				PredecessorLink predecessorLink = (PredecessorLink)theEObject;
-				Object result = casePredecessorLink(predecessorLink);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.PROJECT: {
-				Project project = (Project)theEObject;
-				Object result = caseProject(project);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.RATE: {
-				Rate rate = (Rate)theEObject;
-				Object result = caseRate(rate);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.RATES: {
-				Rates rates = (Rates)theEObject;
-				Object result = caseRates(rates);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.RESOURCE: {
-				Resource resource = (Resource)theEObject;
-				Object result = caseResource(resource);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.RESOURCES: {
-				Resources resources = (Resources)theEObject;
-				Object result = caseResources(resources);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.TASK: {
-				Task task = (Task)theEObject;
-				Object result = caseTask(task);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.TASKS: {
-				Tasks tasks = (Tasks)theEObject;
-				Object result = caseTasks(tasks);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.TIME_PERIOD: {
-				TimePeriod timePeriod = (TimePeriod)theEObject;
-				Object result = caseTimePeriod(timePeriod);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE: {
-				TimephasedDataType timephasedDataType = (TimephasedDataType)theEObject;
-				Object result = caseTimephasedDataType(timephasedDataType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.VALUE: {
-				Value value = (Value)theEObject;
-				Object result = caseValue(value);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.VALUE2: {
-				Value2 value2 = (Value2)theEObject;
-				Object result = caseValue2(value2);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.VALUE_LIST: {
-				ValueList valueList = (ValueList)theEObject;
-				Object result = caseValueList(valueList);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.VALUES: {
-				Values values = (Values)theEObject;
-				Object result = caseValues(values);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.WBS_MASK: {
-				WBSMask wbsMask = (WBSMask)theEObject;
-				Object result = caseWBSMask(wbsMask);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.WBS_MASKS: {
-				WBSMasks wbsMasks = (WBSMasks)theEObject;
-				Object result = caseWBSMasks(wbsMasks);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.WEEK_DAY: {
-				WeekDay weekDay = (WeekDay)theEObject;
-				Object result = caseWeekDay(weekDay);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.WEEK_DAYS: {
-				WeekDays weekDays = (WeekDays)theEObject;
-				Object result = caseWeekDays(weekDays);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.WORKING_TIME: {
-				WorkingTime workingTime = (WorkingTime)theEObject;
-				Object result = caseWorkingTime(workingTime);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MsprojectPackage.WORKING_TIMES: {
-				WorkingTimes workingTimes = (WorkingTimes)theEObject;
-				Object result = caseWorkingTimes(workingTimes);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Assignment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Assignment</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAssignment(Assignment object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Assignments</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Assignments</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAssignments(Assignments object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Availability Period</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Availability Period</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAvailabilityPeriod(AvailabilityPeriod object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Availability Periods</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Availability Periods</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAvailabilityPeriods(AvailabilityPeriods object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Baseline</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Baseline</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseBaseline(Baseline object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Baseline2</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Baseline2</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseBaseline2(Baseline2 object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Baseline3</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Baseline3</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseBaseline3(Baseline3 object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Calendar</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Calendar</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCalendar(Calendar object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Calendars</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Calendars</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCalendars(Calendars object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Document Root</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Document Root</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDocumentRoot(DocumentRoot object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Extended Attribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Extended Attribute</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExtendedAttribute(ExtendedAttribute object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Extended Attribute2</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Extended Attribute2</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExtendedAttribute2(ExtendedAttribute2 object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Extended Attribute3</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Extended Attribute3</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExtendedAttribute3(ExtendedAttribute3 object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Extended Attribute4</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Extended Attribute4</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExtendedAttribute4(ExtendedAttribute4 object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Extended Attributes</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Extended Attributes</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExtendedAttributes(ExtendedAttributes object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Mask</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Mask</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMask(Mask object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Masks</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Masks</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMasks(Masks object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Outline Code</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Outline Code</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseOutlineCode(OutlineCode object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Outline Code2</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Outline Code2</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseOutlineCode2(OutlineCode2 object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Outline Code3</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Outline Code3</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseOutlineCode3(OutlineCode3 object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Outline Codes</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Outline Codes</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseOutlineCodes(OutlineCodes object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Predecessor Link</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Predecessor Link</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePredecessorLink(PredecessorLink object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Project</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Project</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProject(Project object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Rate</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Rate</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRate(Rate object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Rates</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Rates</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRates(Rates object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Resource</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Resource</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseResource(Resource object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Resources</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Resources</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseResources(Resources object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Task</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Task</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTask(Task object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Tasks</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Tasks</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTasks(Tasks object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Time Period</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Time Period</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTimePeriod(TimePeriod object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Timephased Data Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Timephased Data Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTimephasedDataType(TimephasedDataType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Value</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseValue(Value object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Value2</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Value2</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseValue2(Value2 object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Value List</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Value List</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseValueList(ValueList object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Values</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Values</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseValues(Values object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>WBS Mask</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>WBS Mask</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWBSMask(WBSMask object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>WBS Masks</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>WBS Masks</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWBSMasks(WBSMasks object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Week Day</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Week Day</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWeekDay(WeekDay object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Week Days</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Week Days</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWeekDays(WeekDays object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Working Time</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Working Time</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkingTime(WorkingTime object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Working Times</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Working Times</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkingTimes(WorkingTimes object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //MsprojectSwitch
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectValidator.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectValidator.java
deleted file mode 100755
index 55ba9d4..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectValidator.java
+++ /dev/null
@@ -1,3583 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MsprojectValidator.java,v 1.3 2006/09/07 00:06:12 klow Exp $
- */
-package org.eclipse.epf.msproject.util;
-
-import java.math.BigInteger;
-import java.util.Collection;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.DiagnosticChain;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.EObjectValidator;
-import org.eclipse.emf.ecore.xml.type.util.XMLTypeValidator;
-import org.eclipse.epf.msproject.Assignment;
-import org.eclipse.epf.msproject.Assignments;
-import org.eclipse.epf.msproject.AvailabilityPeriod;
-import org.eclipse.epf.msproject.AvailabilityPeriods;
-import org.eclipse.epf.msproject.Baseline;
-import org.eclipse.epf.msproject.Baseline2;
-import org.eclipse.epf.msproject.Baseline3;
-import org.eclipse.epf.msproject.Calendar;
-import org.eclipse.epf.msproject.Calendars;
-import org.eclipse.epf.msproject.DocumentRoot;
-import org.eclipse.epf.msproject.ExtendedAttribute;
-import org.eclipse.epf.msproject.ExtendedAttribute2;
-import org.eclipse.epf.msproject.ExtendedAttribute3;
-import org.eclipse.epf.msproject.ExtendedAttribute4;
-import org.eclipse.epf.msproject.ExtendedAttributes;
-import org.eclipse.epf.msproject.Mask;
-import org.eclipse.epf.msproject.Masks;
-import org.eclipse.epf.msproject.MsprojectPackage;
-import org.eclipse.epf.msproject.OutlineCode;
-import org.eclipse.epf.msproject.OutlineCode2;
-import org.eclipse.epf.msproject.OutlineCode3;
-import org.eclipse.epf.msproject.OutlineCodes;
-import org.eclipse.epf.msproject.PredecessorLink;
-import org.eclipse.epf.msproject.Project;
-import org.eclipse.epf.msproject.Rate;
-import org.eclipse.epf.msproject.Rates;
-import org.eclipse.epf.msproject.Resource;
-import org.eclipse.epf.msproject.Resources;
-import org.eclipse.epf.msproject.Task;
-import org.eclipse.epf.msproject.Tasks;
-import org.eclipse.epf.msproject.TimePeriod;
-import org.eclipse.epf.msproject.TimephasedDataType;
-import org.eclipse.epf.msproject.Value;
-import org.eclipse.epf.msproject.Value2;
-import org.eclipse.epf.msproject.ValueList;
-import org.eclipse.epf.msproject.Values;
-import org.eclipse.epf.msproject.WBSMask;
-import org.eclipse.epf.msproject.WBSMasks;
-import org.eclipse.epf.msproject.WeekDay;
-import org.eclipse.epf.msproject.WeekDays;
-import org.eclipse.epf.msproject.WorkingTime;
-import org.eclipse.epf.msproject.WorkingTimes;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Validator</b> for the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.msproject.MsprojectPackage
- * @generated
- */
-public class MsprojectValidator extends EObjectValidator {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final MsprojectValidator INSTANCE = new MsprojectValidator();
-
-	/**
-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
-	 * @generated
-	 */
-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.epf.msproject";
-
-	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;
-
-	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
-
-	/**
-	 * The cached base package validator.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XMLTypeValidator xmlTypeValidator;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MsprojectValidator() {
-		super();
-		xmlTypeValidator = XMLTypeValidator.INSTANCE;
-	}
-
-	/**
-	 * Returns the package of this validator switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EPackage getEPackage() {
-	  return MsprojectPackage.eINSTANCE;
-	}
-
-	/**
-	 * Calls <code>validateXXX</code> for the corresonding classifier of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map context) {
-		switch (classifierID) {
-			case MsprojectPackage.ASSIGNMENT:
-				return validateAssignment((Assignment)value, diagnostics, context);
-			case MsprojectPackage.ASSIGNMENTS:
-				return validateAssignments((Assignments)value, diagnostics, context);
-			case MsprojectPackage.AVAILABILITY_PERIOD:
-				return validateAvailabilityPeriod((AvailabilityPeriod)value, diagnostics, context);
-			case MsprojectPackage.AVAILABILITY_PERIODS:
-				return validateAvailabilityPeriods((AvailabilityPeriods)value, diagnostics, context);
-			case MsprojectPackage.BASELINE:
-				return validateBaseline((Baseline)value, diagnostics, context);
-			case MsprojectPackage.BASELINE2:
-				return validateBaseline2((Baseline2)value, diagnostics, context);
-			case MsprojectPackage.BASELINE3:
-				return validateBaseline3((Baseline3)value, diagnostics, context);
-			case MsprojectPackage.CALENDAR:
-				return validateCalendar((Calendar)value, diagnostics, context);
-			case MsprojectPackage.CALENDARS:
-				return validateCalendars((Calendars)value, diagnostics, context);
-			case MsprojectPackage.DOCUMENT_ROOT:
-				return validateDocumentRoot((DocumentRoot)value, diagnostics, context);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE:
-				return validateExtendedAttribute((ExtendedAttribute)value, diagnostics, context);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE2:
-				return validateExtendedAttribute2((ExtendedAttribute2)value, diagnostics, context);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE3:
-				return validateExtendedAttribute3((ExtendedAttribute3)value, diagnostics, context);
-			case MsprojectPackage.EXTENDED_ATTRIBUTE4:
-				return validateExtendedAttribute4((ExtendedAttribute4)value, diagnostics, context);
-			case MsprojectPackage.EXTENDED_ATTRIBUTES:
-				return validateExtendedAttributes((ExtendedAttributes)value, diagnostics, context);
-			case MsprojectPackage.MASK:
-				return validateMask((Mask)value, diagnostics, context);
-			case MsprojectPackage.MASKS:
-				return validateMasks((Masks)value, diagnostics, context);
-			case MsprojectPackage.OUTLINE_CODE:
-				return validateOutlineCode((OutlineCode)value, diagnostics, context);
-			case MsprojectPackage.OUTLINE_CODE2:
-				return validateOutlineCode2((OutlineCode2)value, diagnostics, context);
-			case MsprojectPackage.OUTLINE_CODE3:
-				return validateOutlineCode3((OutlineCode3)value, diagnostics, context);
-			case MsprojectPackage.OUTLINE_CODES:
-				return validateOutlineCodes((OutlineCodes)value, diagnostics, context);
-			case MsprojectPackage.PREDECESSOR_LINK:
-				return validatePredecessorLink((PredecessorLink)value, diagnostics, context);
-			case MsprojectPackage.PROJECT:
-				return validateProject((Project)value, diagnostics, context);
-			case MsprojectPackage.RATE:
-				return validateRate((Rate)value, diagnostics, context);
-			case MsprojectPackage.RATES:
-				return validateRates((Rates)value, diagnostics, context);
-			case MsprojectPackage.RESOURCE:
-				return validateResource((Resource)value, diagnostics, context);
-			case MsprojectPackage.RESOURCES:
-				return validateResources((Resources)value, diagnostics, context);
-			case MsprojectPackage.TASK:
-				return validateTask((Task)value, diagnostics, context);
-			case MsprojectPackage.TASKS:
-				return validateTasks((Tasks)value, diagnostics, context);
-			case MsprojectPackage.TIME_PERIOD:
-				return validateTimePeriod((TimePeriod)value, diagnostics, context);
-			case MsprojectPackage.TIMEPHASED_DATA_TYPE:
-				return validateTimephasedDataType((TimephasedDataType)value, diagnostics, context);
-			case MsprojectPackage.VALUE:
-				return validateValue((Value)value, diagnostics, context);
-			case MsprojectPackage.VALUE2:
-				return validateValue2((Value2)value, diagnostics, context);
-			case MsprojectPackage.VALUE_LIST:
-				return validateValueList((ValueList)value, diagnostics, context);
-			case MsprojectPackage.VALUES:
-				return validateValues((Values)value, diagnostics, context);
-			case MsprojectPackage.WBS_MASK:
-				return validateWBSMask((WBSMask)value, diagnostics, context);
-			case MsprojectPackage.WBS_MASKS:
-				return validateWBSMasks((WBSMasks)value, diagnostics, context);
-			case MsprojectPackage.WEEK_DAY:
-				return validateWeekDay((WeekDay)value, diagnostics, context);
-			case MsprojectPackage.WEEK_DAYS:
-				return validateWeekDays((WeekDays)value, diagnostics, context);
-			case MsprojectPackage.WORKING_TIME:
-				return validateWorkingTime((WorkingTime)value, diagnostics, context);
-			case MsprojectPackage.WORKING_TIMES:
-				return validateWorkingTimes((WorkingTimes)value, diagnostics, context);
-			case MsprojectPackage.ACCRUE_AT:
-				return validateAccrueAt((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.ACTIVE_DIRECTORY_GUID_TYPE:
-				return validateActiveDirectoryGUIDType((String)value, diagnostics, context);
-			case MsprojectPackage.ALIAS_TYPE:
-				return validateAliasType((String)value, diagnostics, context);
-			case MsprojectPackage.AUTHOR_TYPE:
-				return validateAuthorType((String)value, diagnostics, context);
-			case MsprojectPackage.BASELINE_FOR_EARNED_VALUE_TYPE:
-				return validateBaselineForEarnedValueType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.BOOKING_TYPE_TYPE:
-				return validateBookingTypeType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.BOOKING_TYPE_TYPE1:
-				return validateBookingTypeType1((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.CALCULATION_TYPE_TYPE:
-				return validateCalculationTypeType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.CATEGORY_TYPE:
-				return validateCategoryType((String)value, diagnostics, context);
-			case MsprojectPackage.CODE_TYPE:
-				return validateCodeType((String)value, diagnostics, context);
-			case MsprojectPackage.COMPANY_TYPE:
-				return validateCompanyType((String)value, diagnostics, context);
-			case MsprojectPackage.CONSTRAINT_TYPE_TYPE:
-				return validateConstraintTypeType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.CONTACT_TYPE:
-				return validateContactType((String)value, diagnostics, context);
-			case MsprojectPackage.COST_RATE_TABLE_TYPE:
-				return validateCostRateTableType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.CURRENCY_SYMBOL_POSITION_TYPE:
-				return validateCurrencySymbolPositionType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.CURRENCY_SYMBOL_TYPE:
-				return validateCurrencySymbolType((String)value, diagnostics, context);
-			case MsprojectPackage.DAY_TYPE_TYPE:
-				return validateDayTypeType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.DEFAULT_FIXED_COST_ACCRUAL_TYPE:
-				return validateDefaultFixedCostAccrualType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.DEFAULT_TASK_EV_METHOD_TYPE:
-				return validateDefaultTaskEVMethodType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.DEFAULT_TASK_TYPE_TYPE:
-				return validateDefaultTaskTypeType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.DURATION_FORMAT_TYPE:
-				return validateDurationFormatType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.DURATION_FORMAT_TYPE1:
-				return validateDurationFormatType1((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.DURATION_FORMAT_TYPE2:
-				return validateDurationFormatType2((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.DURATION_FORMAT_TYPE3:
-				return validateDurationFormatType3((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.DURATION_FORMAT_TYPE4:
-				return validateDurationFormatType4((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.DURATION_FORMAT_TYPE5:
-				return validateDurationFormatType5((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.EARNED_VALUE_METHOD_TYPE:
-				return validateEarnedValueMethodType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.EARNED_VALUE_METHOD_TYPE1:
-				return validateEarnedValueMethodType1((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.EMAIL_ADDRESS_TYPE:
-				return validateEmailAddressType((String)value, diagnostics, context);
-			case MsprojectPackage.EXTERNAL_TASK_PROJECT_TYPE:
-				return validateExternalTaskProjectType((String)value, diagnostics, context);
-			case MsprojectPackage.FIXED_COST_ACCRUAL_TYPE:
-				return validateFixedCostAccrualType((String)value, diagnostics, context);
-			case MsprojectPackage.FY_START_DATE_TYPE:
-				return validateFYStartDateType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.GROUP_TYPE:
-				return validateGroupType((String)value, diagnostics, context);
-			case MsprojectPackage.HYPERLINK_ADDRESS_TYPE:
-				return validateHyperlinkAddressType((String)value, diagnostics, context);
-			case MsprojectPackage.HYPERLINK_ADDRESS_TYPE1:
-				return validateHyperlinkAddressType1((String)value, diagnostics, context);
-			case MsprojectPackage.HYPERLINK_ADDRESS_TYPE2:
-				return validateHyperlinkAddressType2((String)value, diagnostics, context);
-			case MsprojectPackage.HYPERLINK_SUB_ADDRESS_TYPE:
-				return validateHyperlinkSubAddressType((String)value, diagnostics, context);
-			case MsprojectPackage.HYPERLINK_SUB_ADDRESS_TYPE1:
-				return validateHyperlinkSubAddressType1((String)value, diagnostics, context);
-			case MsprojectPackage.HYPERLINK_SUB_ADDRESS_TYPE2:
-				return validateHyperlinkSubAddressType2((String)value, diagnostics, context);
-			case MsprojectPackage.HYPERLINK_TYPE:
-				return validateHyperlinkType((String)value, diagnostics, context);
-			case MsprojectPackage.HYPERLINK_TYPE1:
-				return validateHyperlinkType1((String)value, diagnostics, context);
-			case MsprojectPackage.HYPERLINK_TYPE2:
-				return validateHyperlinkType2((String)value, diagnostics, context);
-			case MsprojectPackage.INITIALS_TYPE:
-				return validateInitialsType((String)value, diagnostics, context);
-			case MsprojectPackage.LAG_FORMAT_TYPE:
-				return validateLagFormatType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.LEVELING_DELAY_FORMAT_TYPE:
-				return validateLevelingDelayFormatType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.LEVELING_DELAY_FORMAT_TYPE1:
-				return validateLevelingDelayFormatType1((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.MANAGER_TYPE:
-				return validateManagerType((String)value, diagnostics, context);
-			case MsprojectPackage.MATERIAL_LABEL_TYPE:
-				return validateMaterialLabelType((String)value, diagnostics, context);
-			case MsprojectPackage.NAME_TYPE:
-				return validateNameType((String)value, diagnostics, context);
-			case MsprojectPackage.NAME_TYPE1:
-				return validateNameType1((String)value, diagnostics, context);
-			case MsprojectPackage.NAME_TYPE2:
-				return validateNameType2((String)value, diagnostics, context);
-			case MsprojectPackage.NAME_TYPE3:
-				return validateNameType3((String)value, diagnostics, context);
-			case MsprojectPackage.NEW_TASK_START_DATE_TYPE:
-				return validateNewTaskStartDateType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.NT_ACCOUNT_TYPE:
-				return validateNTAccountType((String)value, diagnostics, context);
-			case MsprojectPackage.OUTLINE_NUMBER_TYPE:
-				return validateOutlineNumberType((String)value, diagnostics, context);
-			case MsprojectPackage.OVERTIME_RATE_FORMAT_TYPE:
-				return validateOvertimeRateFormatType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.OVERTIME_RATE_FORMAT_TYPE1:
-				return validateOvertimeRateFormatType1((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.PHONETIC_ALIAS_TYPE:
-				return validatePhoneticAliasType((String)value, diagnostics, context);
-			case MsprojectPackage.PHONETICS_TYPE:
-				return validatePhoneticsType((String)value, diagnostics, context);
-			case MsprojectPackage.PREFIX_TYPE:
-				return validatePrefixType((String)value, diagnostics, context);
-			case MsprojectPackage.RATE_TABLE_TYPE:
-				return validateRateTableType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.ROLLUP_TYPE_TYPE:
-				return validateRollupTypeType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.STANDARD_RATE_FORMAT_TYPE:
-				return validateStandardRateFormatType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.STANDARD_RATE_FORMAT_TYPE1:
-				return validateStandardRateFormatType1((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.SUBJECT_TYPE:
-				return validateSubjectType((String)value, diagnostics, context);
-			case MsprojectPackage.SUBPROJECT_NAME_TYPE:
-				return validateSubprojectNameType((String)value, diagnostics, context);
-			case MsprojectPackage.TITLE_TYPE:
-				return validateTitleType((String)value, diagnostics, context);
-			case MsprojectPackage.TYPE_TYPE:
-				return validateTypeType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.TYPE_TYPE1:
-				return validateTypeType1((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.TYPE_TYPE2:
-				return validateTypeType2((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.TYPE_TYPE3:
-				return validateTypeType3((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.TYPE_TYPE4:
-				return validateTypeType4((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.TYPE_TYPE5:
-				return validateTypeType5((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.UID_TYPE:
-				return validateUIDType((String)value, diagnostics, context);
-			case MsprojectPackage.UNIT_TYPE:
-				return validateUnitType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.VALUELIST_SORT_ORDER_TYPE:
-				return validateValuelistSortOrderType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.WEEK_START_DAY_TYPE:
-				return validateWeekStartDayType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.WORK_CONTOUR_TYPE:
-				return validateWorkContourType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.WORK_FORMAT_TYPE:
-				return validateWorkFormatType((BigInteger)value, diagnostics, context);
-			case MsprojectPackage.WORK_GROUP_TYPE:
-				return validateWorkGroupType((BigInteger)value, diagnostics, context);
-			default: 
-				return true;
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateAssignment(Assignment assignment, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(assignment, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateAssignments(Assignments assignments, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(assignments, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateAvailabilityPeriod(AvailabilityPeriod availabilityPeriod, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(availabilityPeriod, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateAvailabilityPeriods(AvailabilityPeriods availabilityPeriods, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(availabilityPeriods, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateBaseline(Baseline baseline, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(baseline, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateBaseline2(Baseline2 baseline2, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(baseline2, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateBaseline3(Baseline3 baseline3, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(baseline3, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCalendar(Calendar calendar, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(calendar, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCalendars(Calendars calendars, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(calendars, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDocumentRoot(DocumentRoot documentRoot, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(documentRoot, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateExtendedAttribute(ExtendedAttribute extendedAttribute, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(extendedAttribute, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateExtendedAttribute2(ExtendedAttribute2 extendedAttribute2, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(extendedAttribute2, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateExtendedAttribute3(ExtendedAttribute3 extendedAttribute3, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(extendedAttribute3, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateExtendedAttribute4(ExtendedAttribute4 extendedAttribute4, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(extendedAttribute4, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateExtendedAttributes(ExtendedAttributes extendedAttributes, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(extendedAttributes, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateMask(Mask mask, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(mask, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateMasks(Masks masks, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(masks, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateOutlineCode(OutlineCode outlineCode, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(outlineCode, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateOutlineCode2(OutlineCode2 outlineCode2, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(outlineCode2, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateOutlineCode3(OutlineCode3 outlineCode3, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(outlineCode3, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateOutlineCodes(OutlineCodes outlineCodes, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(outlineCodes, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePredecessorLink(PredecessorLink predecessorLink, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(predecessorLink, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateProject(Project project, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(project, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateRate(Rate rate, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(rate, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateRates(Rates rates, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(rates, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateResource(Resource resource, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(resource, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateResources(Resources resources, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(resources, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTask(Task task, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(task, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTasks(Tasks tasks, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(tasks, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTimePeriod(TimePeriod timePeriod, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(timePeriod, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTimephasedDataType(TimephasedDataType timephasedDataType, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(timephasedDataType, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateValue(Value value, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(value, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateValue2(Value2 value2, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(value2, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateValueList(ValueList valueList, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(valueList, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateValues(Values values, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(values, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWBSMask(WBSMask wbsMask, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(wbsMask, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWBSMasks(WBSMasks wbsMasks, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(wbsMasks, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWeekDay(WeekDay weekDay, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(weekDay, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWeekDays(WeekDays weekDays, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(weekDays, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWorkingTime(WorkingTime workingTime, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(workingTime, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWorkingTimes(WorkingTimes workingTimes, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(workingTimes, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateAccrueAt(BigInteger accrueAt, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateAccrueAt_Enumeration(accrueAt, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateAccrueAt_Enumeration
-	 */
-	public static final Collection ACCRUE_AT__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Accrue At</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateAccrueAt_Enumeration(BigInteger accrueAt, DiagnosticChain diagnostics, Map context) {
-		boolean result = ACCRUE_AT__ENUMERATION__VALUES.contains(accrueAt);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getAccrueAt(), accrueAt, ACCRUE_AT__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateActiveDirectoryGUIDType(String activeDirectoryGUIDType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateActiveDirectoryGUIDType_MaxLength(activeDirectoryGUIDType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Active Directory GUID Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateActiveDirectoryGUIDType_MaxLength(String activeDirectoryGUIDType, DiagnosticChain diagnostics, Map context) {
-		int length = activeDirectoryGUIDType.length();  
-		boolean result = length <= 16;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getActiveDirectoryGUIDType(), activeDirectoryGUIDType, length, 16, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateAliasType(String aliasType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateAliasType_MaxLength(aliasType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Alias Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateAliasType_MaxLength(String aliasType, DiagnosticChain diagnostics, Map context) {
-		int length = aliasType.length();  
-		boolean result = length <= 50;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getAliasType(), aliasType, length, 50, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateAuthorType(String authorType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateAuthorType_MaxLength(authorType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Author Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateAuthorType_MaxLength(String authorType, DiagnosticChain diagnostics, Map context) {
-		int length = authorType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getAuthorType(), authorType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateBaselineForEarnedValueType(BigInteger baselineForEarnedValueType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateBaselineForEarnedValueType_Enumeration(baselineForEarnedValueType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateBaselineForEarnedValueType_Enumeration
-	 */
-	public static final Collection BASELINE_FOR_EARNED_VALUE_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7"),
-				 new BigInteger("8"),
-				 new BigInteger("9"),
-				 new BigInteger("10")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Baseline For Earned Value Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateBaselineForEarnedValueType_Enumeration(BigInteger baselineForEarnedValueType, DiagnosticChain diagnostics, Map context) {
-		boolean result = BASELINE_FOR_EARNED_VALUE_TYPE__ENUMERATION__VALUES.contains(baselineForEarnedValueType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getBaselineForEarnedValueType(), baselineForEarnedValueType, BASELINE_FOR_EARNED_VALUE_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateBookingTypeType(BigInteger bookingTypeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateBookingTypeType_Enumeration(bookingTypeType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateBookingTypeType_Enumeration
-	 */
-	public static final Collection BOOKING_TYPE_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Booking Type Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateBookingTypeType_Enumeration(BigInteger bookingTypeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = BOOKING_TYPE_TYPE__ENUMERATION__VALUES.contains(bookingTypeType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getBookingTypeType(), bookingTypeType, BOOKING_TYPE_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateBookingTypeType1(BigInteger bookingTypeType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateBookingTypeType1_Enumeration(bookingTypeType1, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateBookingTypeType1_Enumeration
-	 */
-	public static final Collection BOOKING_TYPE_TYPE1__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Booking Type Type1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateBookingTypeType1_Enumeration(BigInteger bookingTypeType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = BOOKING_TYPE_TYPE1__ENUMERATION__VALUES.contains(bookingTypeType1);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getBookingTypeType1(), bookingTypeType1, BOOKING_TYPE_TYPE1__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCalculationTypeType(BigInteger calculationTypeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateCalculationTypeType_Enumeration(calculationTypeType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateCalculationTypeType_Enumeration
-	 */
-	public static final Collection CALCULATION_TYPE_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Calculation Type Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCalculationTypeType_Enumeration(BigInteger calculationTypeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = CALCULATION_TYPE_TYPE__ENUMERATION__VALUES.contains(calculationTypeType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getCalculationTypeType(), calculationTypeType, CALCULATION_TYPE_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCategoryType(String categoryType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateCategoryType_MaxLength(categoryType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Category Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCategoryType_MaxLength(String categoryType, DiagnosticChain diagnostics, Map context) {
-		int length = categoryType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getCategoryType(), categoryType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCodeType(String codeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateCodeType_MaxLength(codeType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Code Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCodeType_MaxLength(String codeType, DiagnosticChain diagnostics, Map context) {
-		int length = codeType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getCodeType(), codeType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCompanyType(String companyType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateCompanyType_MaxLength(companyType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Company Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCompanyType_MaxLength(String companyType, DiagnosticChain diagnostics, Map context) {
-		int length = companyType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getCompanyType(), companyType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateConstraintTypeType(BigInteger constraintTypeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateConstraintTypeType_Enumeration(constraintTypeType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateConstraintTypeType_Enumeration
-	 */
-	public static final Collection CONSTRAINT_TYPE_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Constraint Type Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateConstraintTypeType_Enumeration(BigInteger constraintTypeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = CONSTRAINT_TYPE_TYPE__ENUMERATION__VALUES.contains(constraintTypeType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getConstraintTypeType(), constraintTypeType, CONSTRAINT_TYPE_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateContactType(String contactType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateContactType_MaxLength(contactType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Contact Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateContactType_MaxLength(String contactType, DiagnosticChain diagnostics, Map context) {
-		int length = contactType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getContactType(), contactType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCostRateTableType(BigInteger costRateTableType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateCostRateTableType_Enumeration(costRateTableType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateCostRateTableType_Enumeration
-	 */
-	public static final Collection COST_RATE_TABLE_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("4")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Cost Rate Table Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCostRateTableType_Enumeration(BigInteger costRateTableType, DiagnosticChain diagnostics, Map context) {
-		boolean result = COST_RATE_TABLE_TYPE__ENUMERATION__VALUES.contains(costRateTableType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getCostRateTableType(), costRateTableType, COST_RATE_TABLE_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCurrencySymbolPositionType(BigInteger currencySymbolPositionType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateCurrencySymbolPositionType_Enumeration(currencySymbolPositionType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateCurrencySymbolPositionType_Enumeration
-	 */
-	public static final Collection CURRENCY_SYMBOL_POSITION_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Currency Symbol Position Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCurrencySymbolPositionType_Enumeration(BigInteger currencySymbolPositionType, DiagnosticChain diagnostics, Map context) {
-		boolean result = CURRENCY_SYMBOL_POSITION_TYPE__ENUMERATION__VALUES.contains(currencySymbolPositionType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getCurrencySymbolPositionType(), currencySymbolPositionType, CURRENCY_SYMBOL_POSITION_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCurrencySymbolType(String currencySymbolType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateCurrencySymbolType_MaxLength(currencySymbolType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Currency Symbol Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCurrencySymbolType_MaxLength(String currencySymbolType, DiagnosticChain diagnostics, Map context) {
-		int length = currencySymbolType.length();  
-		boolean result = length <= 20;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getCurrencySymbolType(), currencySymbolType, length, 20, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDayTypeType(BigInteger dayTypeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateDayTypeType_Enumeration(dayTypeType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateDayTypeType_Enumeration
-	 */
-	public static final Collection DAY_TYPE_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Day Type Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDayTypeType_Enumeration(BigInteger dayTypeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = DAY_TYPE_TYPE__ENUMERATION__VALUES.contains(dayTypeType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getDayTypeType(), dayTypeType, DAY_TYPE_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDefaultFixedCostAccrualType(BigInteger defaultFixedCostAccrualType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateDefaultFixedCostAccrualType_Enumeration(defaultFixedCostAccrualType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateDefaultFixedCostAccrualType_Enumeration
-	 */
-	public static final Collection DEFAULT_FIXED_COST_ACCRUAL_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Default Fixed Cost Accrual Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDefaultFixedCostAccrualType_Enumeration(BigInteger defaultFixedCostAccrualType, DiagnosticChain diagnostics, Map context) {
-		boolean result = DEFAULT_FIXED_COST_ACCRUAL_TYPE__ENUMERATION__VALUES.contains(defaultFixedCostAccrualType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getDefaultFixedCostAccrualType(), defaultFixedCostAccrualType, DEFAULT_FIXED_COST_ACCRUAL_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDefaultTaskEVMethodType(BigInteger defaultTaskEVMethodType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateDefaultTaskEVMethodType_Enumeration(defaultTaskEVMethodType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateDefaultTaskEVMethodType_Enumeration
-	 */
-	public static final Collection DEFAULT_TASK_EV_METHOD_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Default Task EV Method Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDefaultTaskEVMethodType_Enumeration(BigInteger defaultTaskEVMethodType, DiagnosticChain diagnostics, Map context) {
-		boolean result = DEFAULT_TASK_EV_METHOD_TYPE__ENUMERATION__VALUES.contains(defaultTaskEVMethodType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getDefaultTaskEVMethodType(), defaultTaskEVMethodType, DEFAULT_TASK_EV_METHOD_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDefaultTaskTypeType(BigInteger defaultTaskTypeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateDefaultTaskTypeType_Enumeration(defaultTaskTypeType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateDefaultTaskTypeType_Enumeration
-	 */
-	public static final Collection DEFAULT_TASK_TYPE_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Default Task Type Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDefaultTaskTypeType_Enumeration(BigInteger defaultTaskTypeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = DEFAULT_TASK_TYPE_TYPE__ENUMERATION__VALUES.contains(defaultTaskTypeType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getDefaultTaskTypeType(), defaultTaskTypeType, DEFAULT_TASK_TYPE_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDurationFormatType(BigInteger durationFormatType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateDurationFormatType_Enumeration(durationFormatType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateDurationFormatType_Enumeration
-	 */
-	public static final Collection DURATION_FORMAT_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7"),
-				 new BigInteger("8"),
-				 new BigInteger("9"),
-				 new BigInteger("10"),
-				 new BigInteger("11"),
-				 new BigInteger("12"),
-				 new BigInteger("19"),
-				 new BigInteger("20"),
-				 new BigInteger("21"),
-				 new BigInteger("35"),
-				 new BigInteger("36"),
-				 new BigInteger("37"),
-				 new BigInteger("38"),
-				 new BigInteger("39"),
-				 new BigInteger("40"),
-				 new BigInteger("41"),
-				 new BigInteger("42"),
-				 new BigInteger("43"),
-				 new BigInteger("44"),
-				 new BigInteger("51"),
-				 new BigInteger("52"),
-				 new BigInteger("53")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Duration Format Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDurationFormatType_Enumeration(BigInteger durationFormatType, DiagnosticChain diagnostics, Map context) {
-		boolean result = DURATION_FORMAT_TYPE__ENUMERATION__VALUES.contains(durationFormatType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getDurationFormatType(), durationFormatType, DURATION_FORMAT_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDurationFormatType1(BigInteger durationFormatType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateDurationFormatType1_Enumeration(durationFormatType1, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateDurationFormatType1_Enumeration
-	 */
-	public static final Collection DURATION_FORMAT_TYPE1__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7"),
-				 new BigInteger("8"),
-				 new BigInteger("9"),
-				 new BigInteger("10"),
-				 new BigInteger("11"),
-				 new BigInteger("12"),
-				 new BigInteger("19"),
-				 new BigInteger("20"),
-				 new BigInteger("21"),
-				 new BigInteger("35"),
-				 new BigInteger("36"),
-				 new BigInteger("37"),
-				 new BigInteger("38"),
-				 new BigInteger("39"),
-				 new BigInteger("40"),
-				 new BigInteger("41"),
-				 new BigInteger("42"),
-				 new BigInteger("43"),
-				 new BigInteger("44"),
-				 new BigInteger("51"),
-				 new BigInteger("52"),
-				 new BigInteger("53")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Duration Format Type1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDurationFormatType1_Enumeration(BigInteger durationFormatType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = DURATION_FORMAT_TYPE1__ENUMERATION__VALUES.contains(durationFormatType1);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getDurationFormatType1(), durationFormatType1, DURATION_FORMAT_TYPE1__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDurationFormatType2(BigInteger durationFormatType2, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateDurationFormatType2_Enumeration(durationFormatType2, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateDurationFormatType2_Enumeration
-	 */
-	public static final Collection DURATION_FORMAT_TYPE2__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7"),
-				 new BigInteger("8"),
-				 new BigInteger("9"),
-				 new BigInteger("10"),
-				 new BigInteger("11"),
-				 new BigInteger("12"),
-				 new BigInteger("19"),
-				 new BigInteger("20"),
-				 new BigInteger("21"),
-				 new BigInteger("35"),
-				 new BigInteger("36"),
-				 new BigInteger("37"),
-				 new BigInteger("38"),
-				 new BigInteger("39"),
-				 new BigInteger("40"),
-				 new BigInteger("41"),
-				 new BigInteger("42"),
-				 new BigInteger("43"),
-				 new BigInteger("44"),
-				 new BigInteger("51"),
-				 new BigInteger("52"),
-				 new BigInteger("53")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Duration Format Type2</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDurationFormatType2_Enumeration(BigInteger durationFormatType2, DiagnosticChain diagnostics, Map context) {
-		boolean result = DURATION_FORMAT_TYPE2__ENUMERATION__VALUES.contains(durationFormatType2);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getDurationFormatType2(), durationFormatType2, DURATION_FORMAT_TYPE2__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDurationFormatType3(BigInteger durationFormatType3, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateDurationFormatType3_Enumeration(durationFormatType3, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateDurationFormatType3_Enumeration
-	 */
-	public static final Collection DURATION_FORMAT_TYPE3__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7"),
-				 new BigInteger("8"),
-				 new BigInteger("9"),
-				 new BigInteger("10"),
-				 new BigInteger("11"),
-				 new BigInteger("12"),
-				 new BigInteger("19"),
-				 new BigInteger("20"),
-				 new BigInteger("21"),
-				 new BigInteger("35"),
-				 new BigInteger("36"),
-				 new BigInteger("37"),
-				 new BigInteger("38"),
-				 new BigInteger("39"),
-				 new BigInteger("40"),
-				 new BigInteger("41"),
-				 new BigInteger("42"),
-				 new BigInteger("43"),
-				 new BigInteger("44"),
-				 new BigInteger("51"),
-				 new BigInteger("52"),
-				 new BigInteger("53")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Duration Format Type3</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDurationFormatType3_Enumeration(BigInteger durationFormatType3, DiagnosticChain diagnostics, Map context) {
-		boolean result = DURATION_FORMAT_TYPE3__ENUMERATION__VALUES.contains(durationFormatType3);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getDurationFormatType3(), durationFormatType3, DURATION_FORMAT_TYPE3__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDurationFormatType4(BigInteger durationFormatType4, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateDurationFormatType4_Enumeration(durationFormatType4, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateDurationFormatType4_Enumeration
-	 */
-	public static final Collection DURATION_FORMAT_TYPE4__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7"),
-				 new BigInteger("8"),
-				 new BigInteger("9"),
-				 new BigInteger("10"),
-				 new BigInteger("11"),
-				 new BigInteger("12"),
-				 new BigInteger("19"),
-				 new BigInteger("20"),
-				 new BigInteger("21"),
-				 new BigInteger("35"),
-				 new BigInteger("36"),
-				 new BigInteger("37"),
-				 new BigInteger("38"),
-				 new BigInteger("39"),
-				 new BigInteger("40"),
-				 new BigInteger("41"),
-				 new BigInteger("42"),
-				 new BigInteger("43"),
-				 new BigInteger("44"),
-				 new BigInteger("51"),
-				 new BigInteger("52"),
-				 new BigInteger("53")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Duration Format Type4</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDurationFormatType4_Enumeration(BigInteger durationFormatType4, DiagnosticChain diagnostics, Map context) {
-		boolean result = DURATION_FORMAT_TYPE4__ENUMERATION__VALUES.contains(durationFormatType4);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getDurationFormatType4(), durationFormatType4, DURATION_FORMAT_TYPE4__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDurationFormatType5(BigInteger durationFormatType5, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateDurationFormatType5_Enumeration(durationFormatType5, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateDurationFormatType5_Enumeration
-	 */
-	public static final Collection DURATION_FORMAT_TYPE5__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7"),
-				 new BigInteger("8"),
-				 new BigInteger("9"),
-				 new BigInteger("10"),
-				 new BigInteger("11"),
-				 new BigInteger("12"),
-				 new BigInteger("19"),
-				 new BigInteger("20"),
-				 new BigInteger("21"),
-				 new BigInteger("35"),
-				 new BigInteger("36"),
-				 new BigInteger("37"),
-				 new BigInteger("38"),
-				 new BigInteger("39"),
-				 new BigInteger("40"),
-				 new BigInteger("41"),
-				 new BigInteger("42"),
-				 new BigInteger("43"),
-				 new BigInteger("44"),
-				 new BigInteger("51"),
-				 new BigInteger("52"),
-				 new BigInteger("53")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Duration Format Type5</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDurationFormatType5_Enumeration(BigInteger durationFormatType5, DiagnosticChain diagnostics, Map context) {
-		boolean result = DURATION_FORMAT_TYPE5__ENUMERATION__VALUES.contains(durationFormatType5);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getDurationFormatType5(), durationFormatType5, DURATION_FORMAT_TYPE5__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEarnedValueMethodType(BigInteger earnedValueMethodType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateEarnedValueMethodType_Enumeration(earnedValueMethodType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateEarnedValueMethodType_Enumeration
-	 */
-	public static final Collection EARNED_VALUE_METHOD_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Earned Value Method Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEarnedValueMethodType_Enumeration(BigInteger earnedValueMethodType, DiagnosticChain diagnostics, Map context) {
-		boolean result = EARNED_VALUE_METHOD_TYPE__ENUMERATION__VALUES.contains(earnedValueMethodType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getEarnedValueMethodType(), earnedValueMethodType, EARNED_VALUE_METHOD_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEarnedValueMethodType1(BigInteger earnedValueMethodType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateEarnedValueMethodType1_Enumeration(earnedValueMethodType1, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateEarnedValueMethodType1_Enumeration
-	 */
-	public static final Collection EARNED_VALUE_METHOD_TYPE1__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Earned Value Method Type1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEarnedValueMethodType1_Enumeration(BigInteger earnedValueMethodType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = EARNED_VALUE_METHOD_TYPE1__ENUMERATION__VALUES.contains(earnedValueMethodType1);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getEarnedValueMethodType1(), earnedValueMethodType1, EARNED_VALUE_METHOD_TYPE1__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEmailAddressType(String emailAddressType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateEmailAddressType_MaxLength(emailAddressType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Email Address Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEmailAddressType_MaxLength(String emailAddressType, DiagnosticChain diagnostics, Map context) {
-		int length = emailAddressType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getEmailAddressType(), emailAddressType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateExternalTaskProjectType(String externalTaskProjectType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateExternalTaskProjectType_MaxLength(externalTaskProjectType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>External Task Project Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateExternalTaskProjectType_MaxLength(String externalTaskProjectType, DiagnosticChain diagnostics, Map context) {
-		int length = externalTaskProjectType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getExternalTaskProjectType(), externalTaskProjectType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateFixedCostAccrualType(String fixedCostAccrualType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateFixedCostAccrualType_Enumeration(fixedCostAccrualType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateFixedCostAccrualType_Enumeration
-	 */
-	public static final Collection FIXED_COST_ACCRUAL_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 "1",
-				 "2",
-				 "3"
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Fixed Cost Accrual Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateFixedCostAccrualType_Enumeration(String fixedCostAccrualType, DiagnosticChain diagnostics, Map context) {
-		boolean result = FIXED_COST_ACCRUAL_TYPE__ENUMERATION__VALUES.contains(fixedCostAccrualType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getFixedCostAccrualType(), fixedCostAccrualType, FIXED_COST_ACCRUAL_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateFYStartDateType(BigInteger fyStartDateType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateFYStartDateType_Enumeration(fyStartDateType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateFYStartDateType_Enumeration
-	 */
-	public static final Collection FY_START_DATE_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7"),
-				 new BigInteger("8"),
-				 new BigInteger("9"),
-				 new BigInteger("10"),
-				 new BigInteger("11"),
-				 new BigInteger("12")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>FY Start Date Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateFYStartDateType_Enumeration(BigInteger fyStartDateType, DiagnosticChain diagnostics, Map context) {
-		boolean result = FY_START_DATE_TYPE__ENUMERATION__VALUES.contains(fyStartDateType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getFYStartDateType(), fyStartDateType, FY_START_DATE_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateGroupType(String groupType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateGroupType_MaxLength(groupType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Group Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateGroupType_MaxLength(String groupType, DiagnosticChain diagnostics, Map context) {
-		int length = groupType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getGroupType(), groupType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkAddressType(String hyperlinkAddressType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateHyperlinkAddressType_MaxLength(hyperlinkAddressType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Hyperlink Address Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkAddressType_MaxLength(String hyperlinkAddressType, DiagnosticChain diagnostics, Map context) {
-		int length = hyperlinkAddressType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getHyperlinkAddressType(), hyperlinkAddressType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkAddressType1(String hyperlinkAddressType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateHyperlinkAddressType1_MaxLength(hyperlinkAddressType1, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Hyperlink Address Type1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkAddressType1_MaxLength(String hyperlinkAddressType1, DiagnosticChain diagnostics, Map context) {
-		int length = hyperlinkAddressType1.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getHyperlinkAddressType1(), hyperlinkAddressType1, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkAddressType2(String hyperlinkAddressType2, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateHyperlinkAddressType2_MaxLength(hyperlinkAddressType2, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Hyperlink Address Type2</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkAddressType2_MaxLength(String hyperlinkAddressType2, DiagnosticChain diagnostics, Map context) {
-		int length = hyperlinkAddressType2.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getHyperlinkAddressType2(), hyperlinkAddressType2, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkSubAddressType(String hyperlinkSubAddressType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateHyperlinkSubAddressType_MaxLength(hyperlinkSubAddressType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Hyperlink Sub Address Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkSubAddressType_MaxLength(String hyperlinkSubAddressType, DiagnosticChain diagnostics, Map context) {
-		int length = hyperlinkSubAddressType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getHyperlinkSubAddressType(), hyperlinkSubAddressType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkSubAddressType1(String hyperlinkSubAddressType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateHyperlinkSubAddressType1_MaxLength(hyperlinkSubAddressType1, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Hyperlink Sub Address Type1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkSubAddressType1_MaxLength(String hyperlinkSubAddressType1, DiagnosticChain diagnostics, Map context) {
-		int length = hyperlinkSubAddressType1.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getHyperlinkSubAddressType1(), hyperlinkSubAddressType1, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkSubAddressType2(String hyperlinkSubAddressType2, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateHyperlinkSubAddressType2_MaxLength(hyperlinkSubAddressType2, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Hyperlink Sub Address Type2</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkSubAddressType2_MaxLength(String hyperlinkSubAddressType2, DiagnosticChain diagnostics, Map context) {
-		int length = hyperlinkSubAddressType2.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getHyperlinkSubAddressType2(), hyperlinkSubAddressType2, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkType(String hyperlinkType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateHyperlinkType_MaxLength(hyperlinkType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Hyperlink Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkType_MaxLength(String hyperlinkType, DiagnosticChain diagnostics, Map context) {
-		int length = hyperlinkType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getHyperlinkType(), hyperlinkType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkType1(String hyperlinkType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateHyperlinkType1_MaxLength(hyperlinkType1, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Hyperlink Type1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkType1_MaxLength(String hyperlinkType1, DiagnosticChain diagnostics, Map context) {
-		int length = hyperlinkType1.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getHyperlinkType1(), hyperlinkType1, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkType2(String hyperlinkType2, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateHyperlinkType2_MaxLength(hyperlinkType2, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Hyperlink Type2</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateHyperlinkType2_MaxLength(String hyperlinkType2, DiagnosticChain diagnostics, Map context) {
-		int length = hyperlinkType2.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getHyperlinkType2(), hyperlinkType2, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateInitialsType(String initialsType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateInitialsType_MaxLength(initialsType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Initials Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateInitialsType_MaxLength(String initialsType, DiagnosticChain diagnostics, Map context) {
-		int length = initialsType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getInitialsType(), initialsType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLagFormatType(BigInteger lagFormatType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateLagFormatType_Enumeration(lagFormatType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateLagFormatType_Enumeration
-	 */
-	public static final Collection LAG_FORMAT_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7"),
-				 new BigInteger("8"),
-				 new BigInteger("9"),
-				 new BigInteger("10"),
-				 new BigInteger("11"),
-				 new BigInteger("12"),
-				 new BigInteger("19"),
-				 new BigInteger("20"),
-				 new BigInteger("35"),
-				 new BigInteger("36"),
-				 new BigInteger("37"),
-				 new BigInteger("38"),
-				 new BigInteger("39"),
-				 new BigInteger("40"),
-				 new BigInteger("41"),
-				 new BigInteger("42"),
-				 new BigInteger("43"),
-				 new BigInteger("44"),
-				 new BigInteger("51"),
-				 new BigInteger("52"),
-				 new BigInteger("53")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Lag Format Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLagFormatType_Enumeration(BigInteger lagFormatType, DiagnosticChain diagnostics, Map context) {
-		boolean result = LAG_FORMAT_TYPE__ENUMERATION__VALUES.contains(lagFormatType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getLagFormatType(), lagFormatType, LAG_FORMAT_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLevelingDelayFormatType(BigInteger levelingDelayFormatType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateLevelingDelayFormatType_Enumeration(levelingDelayFormatType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateLevelingDelayFormatType_Enumeration
-	 */
-	public static final Collection LEVELING_DELAY_FORMAT_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7"),
-				 new BigInteger("8"),
-				 new BigInteger("9"),
-				 new BigInteger("10"),
-				 new BigInteger("11"),
-				 new BigInteger("12"),
-				 new BigInteger("19"),
-				 new BigInteger("20"),
-				 new BigInteger("21"),
-				 new BigInteger("35"),
-				 new BigInteger("36"),
-				 new BigInteger("37"),
-				 new BigInteger("38"),
-				 new BigInteger("39"),
-				 new BigInteger("40"),
-				 new BigInteger("41"),
-				 new BigInteger("42"),
-				 new BigInteger("43"),
-				 new BigInteger("44"),
-				 new BigInteger("51"),
-				 new BigInteger("52"),
-				 new BigInteger("53")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Leveling Delay Format Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLevelingDelayFormatType_Enumeration(BigInteger levelingDelayFormatType, DiagnosticChain diagnostics, Map context) {
-		boolean result = LEVELING_DELAY_FORMAT_TYPE__ENUMERATION__VALUES.contains(levelingDelayFormatType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getLevelingDelayFormatType(), levelingDelayFormatType, LEVELING_DELAY_FORMAT_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLevelingDelayFormatType1(BigInteger levelingDelayFormatType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateLevelingDelayFormatType1_Enumeration(levelingDelayFormatType1, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateLevelingDelayFormatType1_Enumeration
-	 */
-	public static final Collection LEVELING_DELAY_FORMAT_TYPE1__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7"),
-				 new BigInteger("8"),
-				 new BigInteger("9"),
-				 new BigInteger("10"),
-				 new BigInteger("11"),
-				 new BigInteger("12"),
-				 new BigInteger("19"),
-				 new BigInteger("20"),
-				 new BigInteger("21"),
-				 new BigInteger("35"),
-				 new BigInteger("36"),
-				 new BigInteger("37"),
-				 new BigInteger("38"),
-				 new BigInteger("39"),
-				 new BigInteger("40"),
-				 new BigInteger("41"),
-				 new BigInteger("42"),
-				 new BigInteger("43"),
-				 new BigInteger("44"),
-				 new BigInteger("51"),
-				 new BigInteger("52"),
-				 new BigInteger("53")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Leveling Delay Format Type1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLevelingDelayFormatType1_Enumeration(BigInteger levelingDelayFormatType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = LEVELING_DELAY_FORMAT_TYPE1__ENUMERATION__VALUES.contains(levelingDelayFormatType1);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getLevelingDelayFormatType1(), levelingDelayFormatType1, LEVELING_DELAY_FORMAT_TYPE1__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateManagerType(String managerType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateManagerType_MaxLength(managerType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Manager Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateManagerType_MaxLength(String managerType, DiagnosticChain diagnostics, Map context) {
-		int length = managerType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getManagerType(), managerType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateMaterialLabelType(String materialLabelType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateMaterialLabelType_MaxLength(materialLabelType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Material Label Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateMaterialLabelType_MaxLength(String materialLabelType, DiagnosticChain diagnostics, Map context) {
-		int length = materialLabelType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getMaterialLabelType(), materialLabelType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNameType(String nameType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateNameType_MaxLength(nameType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Name Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNameType_MaxLength(String nameType, DiagnosticChain diagnostics, Map context) {
-		int length = nameType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getNameType(), nameType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNameType1(String nameType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateNameType1_MaxLength(nameType1, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Name Type1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNameType1_MaxLength(String nameType1, DiagnosticChain diagnostics, Map context) {
-		int length = nameType1.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getNameType1(), nameType1, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNameType2(String nameType2, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateNameType2_MaxLength(nameType2, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Name Type2</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNameType2_MaxLength(String nameType2, DiagnosticChain diagnostics, Map context) {
-		int length = nameType2.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getNameType2(), nameType2, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNameType3(String nameType3, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateNameType3_MaxLength(nameType3, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Name Type3</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNameType3_MaxLength(String nameType3, DiagnosticChain diagnostics, Map context) {
-		int length = nameType3.length();  
-		boolean result = length <= 255;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getNameType3(), nameType3, length, 255, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNewTaskStartDateType(BigInteger newTaskStartDateType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateNewTaskStartDateType_Enumeration(newTaskStartDateType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateNewTaskStartDateType_Enumeration
-	 */
-	public static final Collection NEW_TASK_START_DATE_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>New Task Start Date Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNewTaskStartDateType_Enumeration(BigInteger newTaskStartDateType, DiagnosticChain diagnostics, Map context) {
-		boolean result = NEW_TASK_START_DATE_TYPE__ENUMERATION__VALUES.contains(newTaskStartDateType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getNewTaskStartDateType(), newTaskStartDateType, NEW_TASK_START_DATE_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNTAccountType(String ntAccountType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateNTAccountType_MaxLength(ntAccountType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>NT Account Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateNTAccountType_MaxLength(String ntAccountType, DiagnosticChain diagnostics, Map context) {
-		int length = ntAccountType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getNTAccountType(), ntAccountType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateOutlineNumberType(String outlineNumberType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateOutlineNumberType_MaxLength(outlineNumberType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Outline Number Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateOutlineNumberType_MaxLength(String outlineNumberType, DiagnosticChain diagnostics, Map context) {
-		int length = outlineNumberType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getOutlineNumberType(), outlineNumberType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateOvertimeRateFormatType(BigInteger overtimeRateFormatType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateOvertimeRateFormatType_Enumeration(overtimeRateFormatType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateOvertimeRateFormatType_Enumeration
-	 */
-	public static final Collection OVERTIME_RATE_FORMAT_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("7")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Overtime Rate Format Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateOvertimeRateFormatType_Enumeration(BigInteger overtimeRateFormatType, DiagnosticChain diagnostics, Map context) {
-		boolean result = OVERTIME_RATE_FORMAT_TYPE__ENUMERATION__VALUES.contains(overtimeRateFormatType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getOvertimeRateFormatType(), overtimeRateFormatType, OVERTIME_RATE_FORMAT_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateOvertimeRateFormatType1(BigInteger overtimeRateFormatType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateOvertimeRateFormatType1_Enumeration(overtimeRateFormatType1, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateOvertimeRateFormatType1_Enumeration
-	 */
-	public static final Collection OVERTIME_RATE_FORMAT_TYPE1__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("7")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Overtime Rate Format Type1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateOvertimeRateFormatType1_Enumeration(BigInteger overtimeRateFormatType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = OVERTIME_RATE_FORMAT_TYPE1__ENUMERATION__VALUES.contains(overtimeRateFormatType1);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getOvertimeRateFormatType1(), overtimeRateFormatType1, OVERTIME_RATE_FORMAT_TYPE1__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePhoneticAliasType(String phoneticAliasType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validatePhoneticAliasType_MaxLength(phoneticAliasType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Phonetic Alias Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePhoneticAliasType_MaxLength(String phoneticAliasType, DiagnosticChain diagnostics, Map context) {
-		int length = phoneticAliasType.length();  
-		boolean result = length <= 50;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getPhoneticAliasType(), phoneticAliasType, length, 50, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePhoneticsType(String phoneticsType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validatePhoneticsType_MaxLength(phoneticsType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Phonetics Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePhoneticsType_MaxLength(String phoneticsType, DiagnosticChain diagnostics, Map context) {
-		int length = phoneticsType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getPhoneticsType(), phoneticsType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePrefixType(String prefixType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validatePrefixType_MaxLength(prefixType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Prefix Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePrefixType_MaxLength(String prefixType, DiagnosticChain diagnostics, Map context) {
-		int length = prefixType.length();  
-		boolean result = length <= 50;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getPrefixType(), prefixType, length, 50, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateRateTableType(BigInteger rateTableType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateRateTableType_Enumeration(rateTableType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateRateTableType_Enumeration
-	 */
-	public static final Collection RATE_TABLE_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("4")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Rate Table Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateRateTableType_Enumeration(BigInteger rateTableType, DiagnosticChain diagnostics, Map context) {
-		boolean result = RATE_TABLE_TYPE__ENUMERATION__VALUES.contains(rateTableType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getRateTableType(), rateTableType, RATE_TABLE_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateRollupTypeType(BigInteger rollupTypeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateRollupTypeType_Enumeration(rollupTypeType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateRollupTypeType_Enumeration
-	 */
-	public static final Collection ROLLUP_TYPE_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Rollup Type Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateRollupTypeType_Enumeration(BigInteger rollupTypeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = ROLLUP_TYPE_TYPE__ENUMERATION__VALUES.contains(rollupTypeType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getRollupTypeType(), rollupTypeType, ROLLUP_TYPE_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateStandardRateFormatType(BigInteger standardRateFormatType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateStandardRateFormatType_Enumeration(standardRateFormatType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateStandardRateFormatType_Enumeration
-	 */
-	public static final Collection STANDARD_RATE_FORMAT_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("7")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Standard Rate Format Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateStandardRateFormatType_Enumeration(BigInteger standardRateFormatType, DiagnosticChain diagnostics, Map context) {
-		boolean result = STANDARD_RATE_FORMAT_TYPE__ENUMERATION__VALUES.contains(standardRateFormatType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getStandardRateFormatType(), standardRateFormatType, STANDARD_RATE_FORMAT_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateStandardRateFormatType1(BigInteger standardRateFormatType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateStandardRateFormatType1_Enumeration(standardRateFormatType1, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateStandardRateFormatType1_Enumeration
-	 */
-	public static final Collection STANDARD_RATE_FORMAT_TYPE1__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("7"),
-				 new BigInteger("8")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Standard Rate Format Type1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateStandardRateFormatType1_Enumeration(BigInteger standardRateFormatType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = STANDARD_RATE_FORMAT_TYPE1__ENUMERATION__VALUES.contains(standardRateFormatType1);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getStandardRateFormatType1(), standardRateFormatType1, STANDARD_RATE_FORMAT_TYPE1__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateSubjectType(String subjectType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateSubjectType_MaxLength(subjectType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Subject Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateSubjectType_MaxLength(String subjectType, DiagnosticChain diagnostics, Map context) {
-		int length = subjectType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getSubjectType(), subjectType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateSubprojectNameType(String subprojectNameType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateSubprojectNameType_MaxLength(subprojectNameType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Subproject Name Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateSubprojectNameType_MaxLength(String subprojectNameType, DiagnosticChain diagnostics, Map context) {
-		int length = subprojectNameType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getSubprojectNameType(), subprojectNameType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTitleType(String titleType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateTitleType_MaxLength(titleType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>Title Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTitleType_MaxLength(String titleType, DiagnosticChain diagnostics, Map context) {
-		int length = titleType.length();  
-		boolean result = length <= 512;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getTitleType(), titleType, length, 512, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTypeType(BigInteger typeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateTypeType_Enumeration(typeType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateTypeType_Enumeration
-	 */
-	public static final Collection TYPE_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Type Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTypeType_Enumeration(BigInteger typeType, DiagnosticChain diagnostics, Map context) {
-		boolean result = TYPE_TYPE__ENUMERATION__VALUES.contains(typeType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getTypeType(), typeType, TYPE_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTypeType1(BigInteger typeType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateTypeType1_Enumeration(typeType1, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateTypeType1_Enumeration
-	 */
-	public static final Collection TYPE_TYPE1__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Type Type1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTypeType1_Enumeration(BigInteger typeType1, DiagnosticChain diagnostics, Map context) {
-		boolean result = TYPE_TYPE1__ENUMERATION__VALUES.contains(typeType1);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getTypeType1(), typeType1, TYPE_TYPE1__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTypeType2(BigInteger typeType2, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateTypeType2_Enumeration(typeType2, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateTypeType2_Enumeration
-	 */
-	public static final Collection TYPE_TYPE2__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Type Type2</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTypeType2_Enumeration(BigInteger typeType2, DiagnosticChain diagnostics, Map context) {
-		boolean result = TYPE_TYPE2__ENUMERATION__VALUES.contains(typeType2);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getTypeType2(), typeType2, TYPE_TYPE2__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTypeType3(BigInteger typeType3, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateTypeType3_Enumeration(typeType3, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateTypeType3_Enumeration
-	 */
-	public static final Collection TYPE_TYPE3__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7"),
-				 new BigInteger("8"),
-				 new BigInteger("9"),
-				 new BigInteger("10"),
-				 new BigInteger("11"),
-				 new BigInteger("16"),
-				 new BigInteger("17"),
-				 new BigInteger("18"),
-				 new BigInteger("19"),
-				 new BigInteger("20"),
-				 new BigInteger("21"),
-				 new BigInteger("22"),
-				 new BigInteger("23"),
-				 new BigInteger("24"),
-				 new BigInteger("25"),
-				 new BigInteger("26"),
-				 new BigInteger("27"),
-				 new BigInteger("28"),
-				 new BigInteger("29"),
-				 new BigInteger("30"),
-				 new BigInteger("31"),
-				 new BigInteger("32"),
-				 new BigInteger("33"),
-				 new BigInteger("34"),
-				 new BigInteger("35"),
-				 new BigInteger("36"),
-				 new BigInteger("37"),
-				 new BigInteger("38"),
-				 new BigInteger("39"),
-				 new BigInteger("40"),
-				 new BigInteger("41"),
-				 new BigInteger("42"),
-				 new BigInteger("43"),
-				 new BigInteger("44"),
-				 new BigInteger("45"),
-				 new BigInteger("46"),
-				 new BigInteger("47"),
-				 new BigInteger("48"),
-				 new BigInteger("49"),
-				 new BigInteger("50"),
-				 new BigInteger("51"),
-				 new BigInteger("52"),
-				 new BigInteger("53"),
-				 new BigInteger("54"),
-				 new BigInteger("55"),
-				 new BigInteger("56"),
-				 new BigInteger("57"),
-				 new BigInteger("58"),
-				 new BigInteger("59"),
-				 new BigInteger("60"),
-				 new BigInteger("61"),
-				 new BigInteger("62"),
-				 new BigInteger("63"),
-				 new BigInteger("64"),
-				 new BigInteger("65"),
-				 new BigInteger("66"),
-				 new BigInteger("67"),
-				 new BigInteger("68"),
-				 new BigInteger("69"),
-				 new BigInteger("70"),
-				 new BigInteger("71"),
-				 new BigInteger("72"),
-				 new BigInteger("73"),
-				 new BigInteger("74"),
-				 new BigInteger("75"),
-				 new BigInteger("76")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Type Type3</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTypeType3_Enumeration(BigInteger typeType3, DiagnosticChain diagnostics, Map context) {
-		boolean result = TYPE_TYPE3__ENUMERATION__VALUES.contains(typeType3);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getTypeType3(), typeType3, TYPE_TYPE3__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTypeType4(BigInteger typeType4, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateTypeType4_Enumeration(typeType4, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateTypeType4_Enumeration
-	 */
-	public static final Collection TYPE_TYPE4__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Type Type4</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTypeType4_Enumeration(BigInteger typeType4, DiagnosticChain diagnostics, Map context) {
-		boolean result = TYPE_TYPE4__ENUMERATION__VALUES.contains(typeType4);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getTypeType4(), typeType4, TYPE_TYPE4__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTypeType5(BigInteger typeType5, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateTypeType5_Enumeration(typeType5, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateTypeType5_Enumeration
-	 */
-	public static final Collection TYPE_TYPE5__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Type Type5</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateTypeType5_Enumeration(BigInteger typeType5, DiagnosticChain diagnostics, Map context) {
-		boolean result = TYPE_TYPE5__ENUMERATION__VALUES.contains(typeType5);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getTypeType5(), typeType5, TYPE_TYPE5__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateUIDType(String uidType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateUIDType_MaxLength(uidType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * Validates the MaxLength constraint of '<em>UID Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateUIDType_MaxLength(String uidType, DiagnosticChain diagnostics, Map context) {
-		int length = uidType.length();  
-		boolean result = length <= 16;
-		if (!result && diagnostics != null) 
-			reportMaxLengthViolation(MsprojectPackage.eINSTANCE.getUIDType(), uidType, length, 16, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateUnitType(BigInteger unitType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateUnitType_Enumeration(unitType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateUnitType_Enumeration
-	 */
-	public static final Collection UNIT_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("5"),
-				 new BigInteger("8")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Unit Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateUnitType_Enumeration(BigInteger unitType, DiagnosticChain diagnostics, Map context) {
-		boolean result = UNIT_TYPE__ENUMERATION__VALUES.contains(unitType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getUnitType(), unitType, UNIT_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateValuelistSortOrderType(BigInteger valuelistSortOrderType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateValuelistSortOrderType_Enumeration(valuelistSortOrderType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateValuelistSortOrderType_Enumeration
-	 */
-	public static final Collection VALUELIST_SORT_ORDER_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Valuelist Sort Order Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateValuelistSortOrderType_Enumeration(BigInteger valuelistSortOrderType, DiagnosticChain diagnostics, Map context) {
-		boolean result = VALUELIST_SORT_ORDER_TYPE__ENUMERATION__VALUES.contains(valuelistSortOrderType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getValuelistSortOrderType(), valuelistSortOrderType, VALUELIST_SORT_ORDER_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWeekStartDayType(BigInteger weekStartDayType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateWeekStartDayType_Enumeration(weekStartDayType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateWeekStartDayType_Enumeration
-	 */
-	public static final Collection WEEK_START_DAY_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Week Start Day Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWeekStartDayType_Enumeration(BigInteger weekStartDayType, DiagnosticChain diagnostics, Map context) {
-		boolean result = WEEK_START_DAY_TYPE__ENUMERATION__VALUES.contains(weekStartDayType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getWeekStartDayType(), weekStartDayType, WEEK_START_DAY_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWorkContourType(BigInteger workContourType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateWorkContourType_Enumeration(workContourType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateWorkContourType_Enumeration
-	 */
-	public static final Collection WORK_CONTOUR_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5"),
-				 new BigInteger("6"),
-				 new BigInteger("7"),
-				 new BigInteger("8")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Work Contour Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWorkContourType_Enumeration(BigInteger workContourType, DiagnosticChain diagnostics, Map context) {
-		boolean result = WORK_CONTOUR_TYPE__ENUMERATION__VALUES.contains(workContourType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getWorkContourType(), workContourType, WORK_CONTOUR_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWorkFormatType(BigInteger workFormatType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateWorkFormatType_Enumeration(workFormatType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateWorkFormatType_Enumeration
-	 */
-	public static final Collection WORK_FORMAT_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3"),
-				 new BigInteger("4"),
-				 new BigInteger("5")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Work Format Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWorkFormatType_Enumeration(BigInteger workFormatType, DiagnosticChain diagnostics, Map context) {
-		boolean result = WORK_FORMAT_TYPE__ENUMERATION__VALUES.contains(workFormatType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getWorkFormatType(), workFormatType, WORK_FORMAT_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWorkGroupType(BigInteger workGroupType, DiagnosticChain diagnostics, Map context) {
-		boolean result = validateWorkGroupType_Enumeration(workGroupType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateWorkGroupType_Enumeration
-	 */
-	public static final Collection WORK_GROUP_TYPE__ENUMERATION__VALUES =
-		wrapEnumerationValues
-			(new Object[] {
-				 new BigInteger("0"),
-				 new BigInteger("1"),
-				 new BigInteger("2"),
-				 new BigInteger("3")
-			 });
-
-	/**
-	 * Validates the Enumeration constraint of '<em>Work Group Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWorkGroupType_Enumeration(BigInteger workGroupType, DiagnosticChain diagnostics, Map context) {
-		boolean result = WORK_GROUP_TYPE__ENUMERATION__VALUES.contains(workGroupType);
-		if (!result && diagnostics != null) 
-			reportEnumerationViolation(MsprojectPackage.eINSTANCE.getWorkGroupType(), workGroupType, WORK_GROUP_TYPE__ENUMERATION__VALUES, diagnostics, context);
-		return result; 
-	}
-
-} //MsprojectValidator
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectXMLHelperImpl.java b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectXMLHelperImpl.java
deleted file mode 100755
index 65cd77d..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/MsprojectXMLHelperImpl.java
+++ /dev/null
@@ -1,147 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2004, 2005 IBM Corporation.  All Rights Reserved.
-//------------------------------------------------------------------------------
-package org.eclipse.epf.msproject.util;
-
-import java.text.FieldPosition;
-import java.text.ParseException;
-import java.util.Date;
-
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl;
-import org.eclipse.emf.ecore.xml.type.internal.XMLCalendar;
-import org.eclipse.emf.ecore.xml.type.util.XMLTypeUtil;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-
-/**
- * Create a slightly customized XMLHelperImpl class
- * 
- * @author Bingxue Xu
- * @since 1.0
- */
-public class MsprojectXMLHelperImpl extends XMLHelperImpl implements XMLHelper {
-
-	 protected static final DateFormat [] EDATE_FORMATS =
-	  {
-		new SafeSimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"),
-	    new SafeSimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ"),
-	    new SafeSimpleDateFormat("yyyy-MM-ddZ")
-	  };
-	 
-	 /**
-	  * Constructor
-	  * @param resource
-	  */
-	public MsprojectXMLHelperImpl(XMLResource resource) {
-		super(resource);
-	}
-	
-	/**
-	 * Convert boolean value to either "0" or "1"
-	 * Convert DateTime value to be compatible with MS project
-	 */
-	 public String convertToString(EFactory factory, EDataType dataType, Object value)
-	  {
-		 
-//		 org.eclipse.emf.ecore.xml.type.impl.XMLTypeFactoryImpl aFactory = new org.eclipse.emf.ecore.xml.type.impl.XMLTypeFactoryImpl();
-//		 System.out.println("$$$$$ dataType name = " + dataType.getName());
-		 
-		 if ("Boolean".equalsIgnoreCase(dataType.getName())) {
-//			 System.out.println("$$$ need to override the Boolean: " + value);
-			 if (value != null) {
-				 String rs = "0";
-				 try {
-					 Boolean bObject = (Boolean)value;
-					 if (bObject.booleanValue())
-						 rs = "1";
-				 } catch (Exception e) {}
-//				 System.out.println("$$$ converted string = " + rs);
-				 return rs;
-			 }
-			 return null; 
-		 } else if ("DateTime".equalsIgnoreCase(dataType.getName())) {
-//			 System.out.println("$$$ need to override the DateTime: " + value.getClass() + "," + value);
-			 if (value != null) {
-				   String rs = value.toString();
-				   if (value instanceof Date)
-				    {
-				      rs = EDATE_FORMATS[0].format((Date)value);
-				    } else if (value instanceof XMLCalendar){
-					  rs = ((XMLCalendar)value).toString();
-					  int idx = rs.indexOf('.');
-					  if (idx > 0)
-						  rs = rs.substring(0, idx);
-					}
-//				   System.out.println("$$$ converted string = " + rs);
-				   return rs;
-			 }
-			 return null; 
-		 }
-		 
-//		 System.out.println("$$$ EFactory, EDataType, value = " + factory + "," + dataType + "," + value);
-		 String rs = super.convertToString( factory,  dataType,  value);
-//		 System.out.println("$$$ converted string (out) = " + rs);
-		 return rs;
-	  }
-	 
-	 /**
-	  * Convert the 1 or 0 boolean value to an Boolean Object
-	  * convert the datetime string into XMLCalendar object.
-	  */
-	 protected Object createFromString(EFactory eFactory, EDataType eDataType, String value)
-	  {
-		 if ("Boolean".equalsIgnoreCase(eDataType.getName())) {
-//			 System.out.println("$$$ need to convert from Boolean: " + value);
-			 if (value != null) {
-				 if (value.equalsIgnoreCase("true") || value.equalsIgnoreCase("1"))
-					 return Boolean.TRUE;
-				 else
-					 return Boolean.FALSE;
-			 }
-			 return null; 
-		 } else if ("DateTime".equalsIgnoreCase(eDataType.getName())) {
-//			 System.out.println("$$$ need to convert from DateTime: " + value);
-			 if (value != null) {
-				   return new XMLCalendar(collapseWhiteSpace(value), XMLCalendar.DATETIME);
-			 }
-			 return null; 
-		 }
-		 
-//		 System.out.println("$$$ EFactory, EDataType, value = " + eFactory + "," + eDataType + "," + value);
-		 Object ro = super.createFromString( eFactory,  eDataType,  value);
-//		 System.out.println("$$$ converted object (in) = " + ro);
-		 return ro;
-	  }
-	 
-	 protected String collapseWhiteSpace(String value)
-	 {
-		 return XMLTypeUtil.normalize(value, true);
-	 }
-	  
-	 private static class SafeSimpleDateFormat extends SimpleDateFormat
-	 {
-		private static final long serialVersionUID = 1L;
-
-		public SafeSimpleDateFormat(String pattern)
-	    {
-	      super(pattern);
-	    }
-
-	    public synchronized Date parse(String source) throws ParseException
-	    {
-	      return super.parse(source);
-	    }
-
-	    public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition pos)
-	    {
-	      StringBuffer result = super.format(date, toAppendTo, pos);
-//	      result.insert(result.length() - 2, ":");
-	      return result;
-	    }
-	  }
-}
diff --git a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/package.html b/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/package.html
deleted file mode 100755
index 1f03d88..0000000
--- a/plugins/org.eclipse.epf.msproject/src/org/eclipse/epf/msproject/util/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides implementation support for accessing the Microsoft Project model objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.platform.feature/.project b/plugins/org.eclipse.epf.platform.feature/.project
deleted file mode 100755
index 7813d26..0000000
--- a/plugins/org.eclipse.epf.platform.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.platform.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.epf.platform.feature/build.properties b/plugins/org.eclipse.epf.platform.feature/build.properties
deleted file mode 100755
index cf5e618..0000000
--- a/plugins/org.eclipse.epf.platform.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               eclipse_update_120.jpg,\
-               en_license.html,\
-               license_en.html
diff --git a/plugins/org.eclipse.epf.platform.feature/eclipse_update_120.jpg b/plugins/org.eclipse.epf.platform.feature/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708..0000000
--- a/plugins/org.eclipse.epf.platform.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.platform.feature/feature.properties b/plugins/org.eclipse.epf.platform.feature/feature.properties
deleted file mode 100755
index 622cce9..0000000
--- a/plugins/org.eclipse.epf.platform.feature/feature.properties
+++ /dev/null
@@ -1,19 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-featureName=EPF Platform Feature
-providerName=Eclipse.org
-description=EPF Platform Feature.
-updateSiteName=EPF Feature Updates
-copyright=(c) Copyright Eclipse contributors and others 2004, 2006.  All Rights Reserved.
-licenseURL=license_en.html
-licenseText=Use of this feature is subject to the same terms and conditions which govern the use of the Product which included this feature.
diff --git a/plugins/org.eclipse.epf.platform.feature/feature.xml b/plugins/org.eclipse.epf.platform.feature/feature.xml
deleted file mode 100755
index 9b56caa..0000000
--- a/plugins/org.eclipse.epf.platform.feature/feature.xml
+++ /dev/null
@@ -1,920 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.epf.platform"
-      label="%featureName"
-      version="1.2.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.epf.platform"
-      os="linux,win32"
-      ws="gtk,win32"
-      arch="x86"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %licenseText
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://update.eclipse.org/updates/3.2"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.epf.platform"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="com.ibm.icu"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.jcraft.jsch"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.ant"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ant.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.lucene"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.compare"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.commands"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.contenttype"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.expressions"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.win32.x86"
-         os="win32"
-         ws="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.jobs"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.resources"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.resources.compatibility"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.update.core.linux"
-         os="linux"
-         ws="gtk"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.resources.win32"
-         os="win32"
-         ws="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.runtime.compatibility"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.runtime.compatibility.auth"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.variables"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.draw2d"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.common.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.commonj.sdo"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.ecore"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.ecore.change"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.ecore.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.ecore.sdo"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.ecore.xmi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.edit.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.mapping"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.mapping.ecore2ecore"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.mapping.ecore2xml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.validation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.preferences"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.registry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gef"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help.appserver"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help.base"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jface"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jface.text"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.swt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.text"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.cheatsheets"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.forms"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.ide"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.intro"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views.properties.tabbed"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.workbench"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.update.configurator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.update.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.update.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.win32"
-         os="win32"
-         ws="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.swt.win32.win32.x86"
-         os="win32"
-         ws="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.update.core.win32"
-         os="win32"
-         ws="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help.webapp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.tomcat"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.core.filebuffers"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.search"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.workbench.texteditor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.linux.x86"
-         os="linux"
-         ws="gtk"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.swt.gtk.linux.x86"
-         os="linux"
-         ws="gtk"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.cvs.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.cvs.ssh"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.cvs.ssh2"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.cvs.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.console"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.editors"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.navigator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.navigator.resources"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.resources.editor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.emf.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.transaction"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.workspace"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.ui.action"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.ui.action.ide"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.ui.services"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.ui.services.action"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.ui.services.properties"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.actions"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.properties"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.providers"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.providers.ide"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.render"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.draw2d.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.draw2d.ui.render"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.draw2d.ui.render.awt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.emf.clipboard.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.emf.commands.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.emf.type.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.emf.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.emf.ui.properties"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.gef.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.notation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.notation.providers"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.uml2.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.uml2.common.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.uml2.uml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.uml2.uml.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.xerces"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.geoshapes"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.runtime.compatibility.registry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.emf.transaction.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.printing.render"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.printing"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.ui.printing"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.ui.printing.win32"
-         os="win32"
-         ws="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-</feature>
diff --git a/plugins/org.eclipse.epf.platform.feature/license_en.html b/plugins/org.eclipse.epf.platform.feature/license_en.html
deleted file mode 100755
index c6af966..0000000
--- a/plugins/org.eclipse.epf.platform.feature/license_en.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.platform/.project b/plugins/org.eclipse.epf.platform/.project
deleted file mode 100755
index fee7404..0000000
--- a/plugins/org.eclipse.epf.platform/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.platform</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<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>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.epf.platform/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.platform/META-INF/MANIFEST.MF
deleted file mode 100755
index a3c8400..0000000
--- a/plugins/org.eclipse.epf.platform/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %featurePluginName
-Bundle-SymbolicName: org.eclipse.epf.platform; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.epf.platform/about.html b/plugins/org.eclipse.epf.platform/about.html
deleted file mode 100755
index 4c99086..0000000
--- a/plugins/org.eclipse.epf.platform/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.platform/about.ini b/plugins/org.eclipse.epf.platform/about.ini
deleted file mode 100755
index 77d496d..0000000
--- a/plugins/org.eclipse.epf.platform/about.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "appName" contains name of the application (translated)
-appName=%featureName
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# ($nl$/ prefix to permit locale-specific translations of entire file)
-welcomePage=$nl$/welcome.xml
-
diff --git a/plugins/org.eclipse.epf.platform/about.properties b/plugins/org.eclipse.epf.platform/about.properties
deleted file mode 100755
index 8c83423..0000000
--- a/plugins/org.eclipse.epf.platform/about.properties
+++ /dev/null
@@ -1,38 +0,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 implementationCorporation 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
-###############################################################################
-# NLS_MESSAGEFORMAT_VAR
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-featureName=Eclipse Platform 3.2.1 with EMF and GEF 
-
-blurb=Eclipse Platform\n\
-\n\
-Version: 3.2.1\n\
-Build id: M20060921-0945\n\
-\n\
-(c) Copyright Eclipse contributors and others 2000, 2006.  All rights reserved.\n\
-Visit http://www.eclipse.org/platform\n\
-\n\
-This product includes software developed by the\n\
-Apache Software Foundation http://www.apache.org/
diff --git a/plugins/org.eclipse.epf.platform/build.properties b/plugins/org.eclipse.epf.platform/build.properties
deleted file mode 100755
index bb00d42..0000000
--- a/plugins/org.eclipse.epf.platform/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = .,\
-               META-INF/,\
-               about.html,\
-               about.ini,\
-               about.properties,\
-               eclipse32.gif,\
-               welcome.xml,\
-               plugin.properties
diff --git a/plugins/org.eclipse.epf.platform/eclipse32.gif b/plugins/org.eclipse.epf.platform/eclipse32.gif
deleted file mode 100755
index e6ad7cc..0000000
--- a/plugins/org.eclipse.epf.platform/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.platform/plugin.properties b/plugins/org.eclipse.epf.platform/plugin.properties
deleted file mode 100755
index 7fa654a..0000000
--- a/plugins/org.eclipse.epf.platform/plugin.properties
+++ /dev/null
@@ -1,16 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-featurePluginName=EPF Platform Feature
-featurePluginNameNL=EPF Platform Feature (NL1)
-providerName=Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.platform/welcome.xml b/plugins/org.eclipse.epf.platform/welcome.xml
deleted file mode 100755
index a009245..0000000
--- a/plugins/org.eclipse.epf.platform/welcome.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<welcomePage 
-	title="Eclipse Modeling Framework (EMF)">
-
-<intro>EMF is a Java/XML framework for generating tools and other applications
-based on simple class models.
-</intro>
-
-<item><b>What is EMF?</b>
-	Read the <topic href="/org.eclipse.emf.doc/references/overview/EMF.html">overview</topic> article to learn about EMF.
-	Then, follow the <topic href="/org.eclipse.emf.doc/tutorials/clibmod/clibmod.html">tutorial</topic> to see how easy it is to generate a model.
-</item>
-
-<item><b>Learn More</b>
-	This is the official site of EMF: <topic href="http://www.eclipse.org/emf">http://www.eclipse.org/emf</topic>
-</item>
-
-</welcomePage>
diff --git a/plugins/org.eclipse.epf.publisher/.classpath b/plugins/org.eclipse.epf.publisher/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/plugins/org.eclipse.epf.publisher/.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/plugins/org.eclipse.epf.publisher/.cvsignore b/plugins/org.eclipse.epf.publisher/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.publisher/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.publisher/.project b/plugins/org.eclipse.epf.publisher/.project
deleted file mode 100755
index 6669260..0000000
--- a/plugins/org.eclipse.epf.publisher/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.publisher</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/plugins/org.eclipse.epf.publisher/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.epf.publisher/.settings/org.eclipse.pde.core.prefs
deleted file mode 100755
index b3e5144..0000000
--- a/plugins/org.eclipse.epf.publisher/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 23 11:06:00 PDT 2006
-eclipse.preferences.version=1
-pluginProject.extensions=true
diff --git a/plugins/org.eclipse.epf.publisher/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.publisher/META-INF/MANIFEST.MF
deleted file mode 100755
index 57daa68..0000000
--- a/plugins/org.eclipse.epf.publisher/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.publisher;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.epf.publisher.PublisherPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework;version="1.3.0"
-Require-Bundle: org.eclipse.epf.publishing,
- org.eclipse.epf.publishing.ui
-Export-Package: org.eclipse.epf.publisher
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.epf.publisher/build.properties b/plugins/org.eclipse.epf.publisher/build.properties
deleted file mode 100755
index 78b19f9..0000000
--- a/plugins/org.eclipse.epf.publisher/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = .,\
-			   META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/
-source.. = src/
-output.. = bin/
diff --git a/plugins/org.eclipse.epf.publisher/icons/WebPublish.gif b/plugins/org.eclipse.epf.publisher/icons/WebPublish.gif
deleted file mode 100755
index 76dcf0f..0000000
--- a/plugins/org.eclipse.epf.publisher/icons/WebPublish.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.publisher/plugin.properties b/plugins/org.eclipse.epf.publisher/plugin.properties
deleted file mode 100755
index 08dbe77..0000000
--- a/plugins/org.eclipse.epf.publisher/plugin.properties
+++ /dev/null
@@ -1,17 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Publisher Plug-in
-providerName=Eclipse.org
-
-publisherLabel=Publish
diff --git a/plugins/org.eclipse.epf.publisher/plugin.xml b/plugins/org.eclipse.epf.publisher/plugin.xml
deleted file mode 100755
index 26da07f..0000000
--- a/plugins/org.eclipse.epf.publisher/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.epf.publishing.ui.publishers">
-      <publisher
-            icon="icons/WebPublish.gif"
-            id="org.eclipse.epf.publisher"
-            managerClass="org.eclipse.epf.publisher.services.EPFPublishManager"
-            label="%publisherLabel"
-            wizardClass="org.eclipse.epf.publishing.wizards.PublishConfigurationWizard"/>
-   </extension>
-   
-</plugin>
diff --git a/plugins/org.eclipse.epf.publisher/src/org/eclipse/epf/publisher/PublisherPlugin.java b/plugins/org.eclipse.epf.publisher/src/org/eclipse/epf/publisher/PublisherPlugin.java
deleted file mode 100755
index 45fa432..0000000
--- a/plugins/org.eclipse.epf.publisher/src/org/eclipse/epf/publisher/PublisherPlugin.java
+++ /dev/null
@@ -1,60 +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.publisher;
-
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The EPF publisher plug-in activator.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class PublisherPlugin extends AbstractPlugin {
-
-	// The plug-in ID.
-	public static final String PLUGIN_ID = PublisherPlugin.class.getName();
-
-	// The shared plug-in instance.
-	private static PublisherPlugin plugin;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PublisherPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * @see org.eclipse.epf.common.plugin.AbstractPlugin#start(BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * @see org.eclipse.epf.common.plugin.AbstractPlugin#stop(BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared plug-in instance.
-	 */
-	public static PublisherPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.publisher/src/org/eclipse/epf/publisher/package.html b/plugins/org.eclipse.epf.publisher/src/org/eclipse/epf/publisher/package.html
deleted file mode 100755
index 2edbf5d..0000000
--- a/plugins/org.eclipse.epf.publisher/src/org/eclipse/epf/publisher/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the activator for managing the Publisher plug-in's life cycle.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.publisher/src/org/eclipse/epf/publisher/services/EPFPublishManager.java b/plugins/org.eclipse.epf.publisher/src/org/eclipse/epf/publisher/services/EPFPublishManager.java
deleted file mode 100755
index e57a038..0000000
--- a/plugins/org.eclipse.epf.publisher/src/org/eclipse/epf/publisher/services/EPFPublishManager.java
+++ /dev/null
@@ -1,30 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publisher.services;
-
-import org.eclipse.epf.publishing.services.PublishManager;
-import org.eclipse.epf.publishing.services.PublishOptions;
-import org.eclipse.epf.uma.MethodConfiguration;
-
-/**
- * The EPF publishing manager.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class EPFPublishManager extends PublishManager {
-
-	public void init(String pubDir, MethodConfiguration config,
-			PublishOptions options) {
-		super.init(pubDir, config, options);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.publisher/src/org/eclipse/epf/publisher/services/package.html b/plugins/org.eclipse.epf.publisher/src/org/eclipse/epf/publisher/services/package.html
deleted file mode 100755
index 2507bfb..0000000
--- a/plugins/org.eclipse.epf.publisher/src/org/eclipse/epf/publisher/services/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the implementation for publishing a method configuration.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.publishing.ui/.classpath b/plugins/org.eclipse.epf.publishing.ui/.classpath
deleted file mode 100755
index 065ac06..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.publishing.ui/.cvsignore b/plugins/org.eclipse.epf.publishing.ui/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.publishing.ui/.project b/plugins/org.eclipse.epf.publishing.ui/.project
deleted file mode 100755
index 3ce6e6c..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.publishing.ui</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/plugins/org.eclipse.epf.publishing.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.publishing.ui/META-INF/MANIFEST.MF
deleted file mode 100755
index bcc1c60..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.publishing.ui; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.epf.publishing.ui.PublishingUIPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.epf.authoring.ui;visibility:=reexport,
- org.eclipse.epf.publishing;visibility:=reexport,
- org.eclipse.jface.text,
- org.eclipse.help.base
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.publishing.ui,
- org.eclipse.epf.publishing.ui.preferences,
- org.eclipse.epf.publishing.ui.wizards,
- org.eclipse.epf.publishing.wizards
diff --git a/plugins/org.eclipse.epf.publishing.ui/build.properties b/plugins/org.eclipse.epf.publishing.ui/build.properties
deleted file mode 100755
index b4b8249..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               schema/
diff --git a/plugins/org.eclipse.epf.publishing.ui/icons/Reporting.gif b/plugins/org.eclipse.epf.publishing.ui/icons/Reporting.gif
deleted file mode 100755
index a38cc8a..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/icons/Reporting.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.publishing.ui/icons/WebPublish.gif b/plugins/org.eclipse.epf.publishing.ui/icons/WebPublish.gif
deleted file mode 100755
index 76dcf0f..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/icons/WebPublish.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.publishing.ui/icons/full/wizban/PublishConfiguration.gif b/plugins/org.eclipse.epf.publishing.ui/icons/full/wizban/PublishConfiguration.gif
deleted file mode 100755
index e249831..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/icons/full/wizban/PublishConfiguration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.publishing.ui/plugin.properties b/plugins/org.eclipse.epf.publishing.ui/plugin.properties
deleted file mode 100755
index bf8b30c..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/plugin.properties
+++ /dev/null
@@ -1,44 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Publishing UI
-providerName=Eclipse.org
-
-# Default feedback URL
-feedbackURL=http://www.published_website.com/feedback
-
-# Publish Configuration Action
-publishConfigAction=&Publish...
-publishConfigActionTooltip=Publish a web site for a configuration
-
-# Preference Page
-publishingOptions=Publishing Options
-
-# Publishing Actions
-configActionSet=Configuration
-configMenu=&Configuration
-
-# Print Configuration Action
-printConfigAction=Print
-
-# the title for the published site
-#don't define here, let user specify it.
-#title=OpenUP/Basic
-
-################################################################################
-# THE FOLLOWING PROPERTIES SHOULD NOT BE TRANSLATED!!!
-################################################################################
-
-# Default Publish Path
-publishPath=<user.home>/<app.name>/Publish
-
diff --git a/plugins/org.eclipse.epf.publishing.ui/plugin.xml b/plugins/org.eclipse.epf.publishing.ui/plugin.xml
deleted file mode 100755
index 22cf9d8..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/plugin.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension-point
-         id="publishConfigWizard"
-         name="Publish Method Configuraiton Wizard Extension"
-         schema="schema/PublishConfigWizard.exsd" />
-
-   <extension-point id="publishers" name="Publishers" schema="schema/publishers.exsd"/>
-
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            id="org.eclipse.epf.library.ConfigActionSet"
-            label="%configActionSet"
-            visible="true">
-         <menu
-               id="org.eclipse.epf.publishing.ui.menu.configuration"
-               label="%configMenu"
-               path="additions"/>  
-         <action
-               class="org.eclipse.epf.publishing.ui.actions.PublishConfigurationAction"
-               helpContextId="org.eclipse.epf.authoring.ui.configuration_publish_context"
-               icon="icons/WebPublish.gif"
-               id="org.eclipse.epf.library.actions.Publish"
-               label="%publishConfigAction"
-               menubarPath="org.eclipse.epf.publishing.ui.menu.configuration/additions"
-               style="push"/>
-      </actionSet>
-   </extension>
-
-   <extension point="org.eclipse.ui.preferencePages">
-      <page id="org.eclipse.epf.publishing.ui.preferences.PublishingPreferencePage"
-            class="org.eclipse.epf.publishing.ui.preferences.PublishingPreferencePage"
-            category="org.eclipse.epf.authoring.ui.preferences.rootprefpage"            
-            name="%publishingOptions"/>
-   </extension>   
-
-</plugin>
diff --git a/plugins/org.eclipse.epf.publishing.ui/schema/PublishConfigWizard.exsd b/plugins/org.eclipse.epf.publishing.ui/schema/PublishConfigWizard.exsd
deleted file mode 100755
index 5e5b896..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/schema/PublishConfigWizard.exsd
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.epf.publishing.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.epf.publishing.ui" id="publishConfigWizard" name="Publish Method Confguration Wizard Extension"/>
-      </appInfo>
-      <documentation>
-         Enables a plug-in to extend the Publish Method Configuration wizard by replacing existing wizard pages or adding new ones.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="wizardExtender" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A fully qualified identifier of the target extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  An optional identifier of the extension instance.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  An optional name of the extension instance.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="wizardExtender">
-      <complexType>
-         <sequence>
-            <element ref="wizardPage" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="publisher" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The Java class that implements the wizard extender. This class must implements &lt;code&gt;org.eclipse.epf.publishing.ui.wizards.IPublishConfigWizardExtender&lt;/code&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="wizardPage">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The Java class that implements the wizard page. This class must implements &lt;code&gt;org.eclipse.jface.wizard.IWizardPage&lt;/code&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="type" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The type of extension - &quot;replace&quot; or &quot;new&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="target" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The name of the base wizard page to be replaced or used as a reference for inserting a new wizard page.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="insert" type="string">
-            <annotation>
-               <documentation>
-                  The insertion type for a new wizard page - &quot;before&quot; or &quot;after&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="publisher">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The Java class that implements the configuration publisher. This class must extends &lt;code&gt;org.eclipse.epf.publishing.sefrvices.AbstractPublishManager&lt;/code&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         1.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of how the extension point can be used: 
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.epf.publishing.ui.publishConfigWizard&quot;&gt;
-      &lt;wizardExtender
-            class=&quot;org.eclipse.epf.publishing.ui.wizards.MyPublishConfigWizardExtender&quot;&gt;
-         &lt;wizardPage
-               class=&quot;org.eclipse.epf.publishing.ui.wizards.MySelectPublishOptionsPage&quot;
-               type=&quot;replace&quot;
-               target=&quot;org.eclipse.epf.publishing.ui.wizards.SelectPublishOptionsPage&quot;/&gt;
-         &lt;wizardPage
-               class=&quot;org.eclipse.epf.publishing.ui.wizards.MyNewPublishPage&quot;
-               type=&quot;new&quot;
-               target=&quot;org.eclipse.epf.publishing.ui.wizards.SelectPublishOptionsPage&quot;               
-               insert=&quot;after&quot;/&gt;               
-         &lt;publisher
-               class=&quot;org.eclipse.epf.publishing.MyConfigPublisher&quot;/&gt;
-      &lt;/wizardExtender&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005, 2006 IBM Corporation and others.&lt;br&gt;
-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 &lt;a 
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.epf.publishing.ui/schema/publishers.exsd b/plugins/org.eclipse.epf.publishing.ui/schema/publishers.exsd
deleted file mode 100755
index b5f23e1..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/schema/publishers.exsd
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.epf.publishing.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.epf.publishing.ui" id="publishers" name="publishers"/>
-      </appInfo>
-      <documentation>
-         define the extension point for publishers
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="publisher" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="publisher">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="wizardClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="managerClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         1.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/PublisherElement.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/PublisherElement.java
deleted file mode 100755
index 8dca7f8..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/PublisherElement.java
+++ /dev/null
@@ -1,114 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.ui;
-
-import java.net.URL;
-
-import org.eclipse.epf.publishing.services.AbstractPublishManager;
-import org.eclipse.epf.publishing.wizards.AbstractPublishWizard;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.Bundle;
-
-/**
- * This class defines the attributes for a publisher extension point
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public class PublisherElement {
-	Bundle bundle;
-	private String id;
-	private String label;
-	private String icon;
-	private String wizardClass;
-	private String managerClass;	
-	
-	/**
-	 * constructor for PublisherElement extension point
-	 * @param bundle Bundle the bundle that laod the element definition file
-	 * @param id String
-	 * @param label String
-	 * @param icon String icon path
-	 * @param wizardClass String the publishing wizard class. 
-	 * This class must extends org.eclipse.epf.publishing.wizards.AbstractPublishWizard class
-	 * @param managerClass String the publish mamager class. 
-	 * this class must extends the org.eclipse.epf.publishing.services.AbstractPublishManager class.
-	 */
-	public PublisherElement(Bundle bundle, String id, String label, String icon, String wizardClass, String managerClass) {
-		this.bundle = bundle; 
-		this.id = id;
-		this.label = label;
-		this.icon = icon;
-		this.wizardClass = wizardClass;
-		this.managerClass = managerClass;		
-	}
-	
-	/**
-	 * get the publish wizard
-	 * 
-	 * @return AbstractPublishWizard
-	 * @throws Exception
-	 */
-	public AbstractPublishWizard getPublishWizard() throws Exception {
-		Class clazz = bundle.loadClass(wizardClass);
-		return (AbstractPublishWizard) clazz.newInstance();
-	}
-	
-	/**
-	 * get the publish manager
-	 * 
-	 * @return AbstractPublishManager
-	 * @throws Exception
-	 */
-	public AbstractPublishManager getPublishManager() throws Exception {
-		Class clazz = bundle.loadClass(managerClass);
-		return (AbstractPublishManager) clazz.newInstance();
-	}
-	
-	/**
-	 * get the id of the publisher
-	 * 
-	 * @return String
-	 */
-	public String getId() { 
-		return id; 
-	}
-	
-	/**
-	 * get the label of the publisher
-	 * 
-	 * @return String
-	 */
-	public String getLabel() {
-		return label;
-	}
-	
-	/**
-	 * get the image descriptor for the publisher icon.
-	 * 
-	 * @return ImageDescriptor
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		if ( icon == null || icon.length() == 0 ) {
-			return null;
-		}
-		
-		try {
-			URL installURL = bundle.getEntry("/"); //$NON-NLS-1$
-			URL iconURL = new URL(installURL, icon);
-			return ImageDescriptor.createFromURL(iconURL);
-		} catch (Exception e) {
-		}
-		
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/PublisherFactory.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/PublisherFactory.java
deleted file mode 100755
index 7866d15..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/PublisherFactory.java
+++ /dev/null
@@ -1,158 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.ui;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.publishing.ui.actions.PublishAction;
-import org.eclipse.jface.action.Action;
-import org.osgi.framework.Bundle;
-
-/**
- * Manages the creation of Publisher instances by loading the publisher extensions.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class PublisherFactory {
-
-	/**
-	 * The extension point namespace.
-	 */
-	public static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.epf.publishing.ui"; //$NON-NLS-1$
-
-	/**
-	 * The extension point name.
-	 */
-	public static final String EXTENSION_POINT_NAME = "publishers"; //$NON-NLS-1$
-
-	// The shared instance.
-	private static PublisherFactory instance = null;
-
-	// A map of publisher configuration elements.
-	private Map publisherMap = new HashMap();
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static PublisherFactory getInstance() {
-		if (instance == null) {
-			synchronized (PublisherFactory.class) {
-				if (instance == null) {
-					instance = new PublisherFactory();
-				}
-			}
-		}
-		return instance;
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	private PublisherFactory() {
-		init();
-	}
-
-	/**
-	 * Performs the necessary initialization.
-	 */
-	protected void init() {
-		// Process the "org.eclipse.epf.publishing.ui.publishers" extension point
-		// contributors.
-		IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(
-				EXTENSION_POINT_NAMESPACE, EXTENSION_POINT_NAME);
-		if (extensionPoint != null) {
-			IExtension[] extensions = extensionPoint.getExtensions();
-			for (int i = 0; i < extensions.length; i++) {
-				IExtension extension = extensions[i];
-				String pluginId = extension.getNamespaceIdentifier();
-				Bundle bundle = Platform.getBundle(pluginId);
-				IConfigurationElement[] configElements = extension
-						.getConfigurationElements();
-				for (int j = 0; j < configElements.length; j++) {
-					IConfigurationElement configElement = configElements[j];
-					try {
-						String id = configElement.getAttribute("id"); //$NON-NLS-1$
-						String name = configElement.getAttribute("label"); //$NON-NLS-1$
-						String icon = configElement.getAttribute("icon"); //$NON-NLS-1$
-						String wizardClassName = configElement.getAttribute("wizardClass"); //$NON-NLS-1$
-						String managerClassName = configElement.getAttribute("managerClass"); //$NON-NLS-1$
-						if (	id != null && id.trim().length() > 0 
-								&& name != null && name.trim().length() > 0 
-								&& wizardClassName != null && wizardClassName.trim().length() > 0
-								&& managerClassName != null && managerClassName.trim().length() > 0 ) {
-							if (!publisherMap.containsKey(name)) {
-								PublisherElement provider = new PublisherElement(
-										bundle, id, name, icon, wizardClassName, managerClassName);
-								
-								publisherMap.put(id, provider);
-							}
-						}
-					} catch (Exception e) {
-						PublishingUIPlugin.getDefault().getLogger().logError(e);
-					}
-				}
-			}
-		}
-	}
-
-
-	/**
-	 * get the publisher element which defines the publisher extension
-	 * 
-	 * @param id String id of the publisher
-	 * 
-	 * @return PublisherElement
-	 */
-	public PublisherElement getPublisherElement(String id) {
-		return (PublisherElement)publisherMap.get(id);
-	}
- 
-	/**
-	 * get all publisher elements
-	 * 
-	 * @return List a list of PublisherElement objects
-	 */
-	public List getPublisherElements() {
-		return new ArrayList(publisherMap.values());
-	}
-	
-	/**
-	 * create the UI actions for the publishers
-	 * 
-	 * @return Action[]
-	 */
-	public Action[] createPublishActions() {
-		List items = new ArrayList();
-		for ( Iterator it = getPublisherElements().iterator(); it.hasNext(); ) {
-			PublisherElement e = (PublisherElement)it.next();
-			
-			Action action = new PublishAction(e.getId(), e.getLabel(), e.getImageDescriptor());
-			items.add(action);
-		} 
-
-		int size = items.size();
-		Action[] actions = new Action[size];
-		items.toArray(actions);
-		
-		return actions;
-	}
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/PublishingUIPlugin.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/PublishingUIPlugin.java
deleted file mode 100755
index 18848ad..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/PublishingUIPlugin.java
+++ /dev/null
@@ -1,58 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.ui;
-
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * The main plugin class for the publishing UI plugin.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class PublishingUIPlugin extends AbstractPlugin {
-
-	// The shared instance.
-	private static PublishingUIPlugin plugin;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PublishingUIPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * @see org.eclipse.epf.uma.core.plugin.AbstractPlugin#start(BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * @see org.eclipse.epf.uma.core.plugin.AbstractPlugin#start(BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static PublishingUIPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/PublishingUIResources.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/PublishingUIResources.java
deleted file mode 100755
index dce4f1e..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/PublishingUIResources.java
+++ /dev/null
@@ -1,124 +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
- *******************************************************************************/
-package org.eclipse.epf.publishing.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * class for publishing UI resources
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public final class PublishingUIResources extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.epf.publishing.ui.Resources";//$NON-NLS-1$
-
-	private PublishingUIResources() {
-		// Do not instantiate
-	}
-
-	public static String publishConfigWizard_title;
-	public static String publishConfigWizard_selectConfigPage_title;
-	public static String publishConfigWizard_selectConfigPage_text;
-	public static String publishConfigWizard_selectConfigPage_invalid_views;
-	public static String publishConfigWizard_selectConfigPage_invalid_view_contributor;
-	public static String publishConfigWizard_selectConfigPage_invalid_view_sameview;
-	public static String publishConfigWizard_selectConfigPage_invalid_view_invalid;
-	
-	public static String publishConfigWizard_selectOptionsPage_title;
-	public static String publishConfigWizard_selectOptionsPage_text;
-	public static String publishConfigWizard_methodConfig_text;
-	public static String publishConfigWizard_destinationGroup_text;
-	public static String publishConfigWizard_directory_text;
-	public static String publishConfigWizard_useDefaultFeedback_text;
-	public static String publishConfigWizard_useDefaultPath_text;
-	public static String publishConfigWizard_webSite_text;
-	public static String publishConfigWizard_title_text;
-	public static String publishConfigWizard_bannerImage_text;
-	public static String publishConfigWizard_aboutHTML_text;
-	public static String publishConfigWizard_feedbackURL_text;
-	public static String publishConfigWizard_includeIndex_text;
-	public static String publishConfigWizard_includeGlossary_text;
-	public static String publishConfigWizard_includeSearch_text;
-	public static String publishConfigWizard_includeSearches_text;
-	public static String publishConfigWizard_clientSideSearch_text;
-	public static String publishConfigWizard_serverSideSearch_text;
-	public static String publishConfigWizard_createWAR_text;
-	public static String publishConfigWizard_webApplicationName_text;
-	public static String publishConfigWizard_useApplet_text;
-	public static String publishConfigWizard_validationGroup_text;
-	public static String publishConfigWizard_checkHyperlinks_text;
-	public static String publishConfigWizard_diagramGroup_text;
-	public static String publishConfigWizard_publish_unopen_activity_dd_text;
-	public static String publishConfigWizard_publish_extend_activity_diagram;
-	public static String publishConfigWizard_convertBrokenLinks_text;
-	public static String publishConfigWizard_layout_text;
-	public static String publishConfigWizard_extraDescriptorInfo_text;
-	public static String publishConfigWizard_lightWeightTree_text;
-	public static String publishConfigWizard_includeEmptyCategories_text;
-	
-	public static String publishConfigWizard_siteCustomizationPage_title;
-	public static String publishConfigWizard_siteCustomizationPage_text;
-
-//	public static String publishConfigWizard_groupTheme_text;
-	public static String publishConfigWizard_groupSkin_text;
-	public static String publishConfigWizard_showBanner_text;
-	public static String publishConfigWizard_selectSkin_text;
-	
-	public static String PublishConfigSelectProcessPage_title;
-	public static String PublishConfigSelectProcessPage_text;
-	public static String PublishConfigSelectProcessPage_label_capability_pattern;
-	public static String PublishConfigSelectProcessPage_label_delivery_process;
-	public static String PublishConfigSelectProcessPage_label_selectType;
-	public static String PublishConfigSelectProcessPage_label_type_processes;
-	public static String PublishConfigSelectProcessPage_label_type_config;
-	public static String PublishConfigSelectProcessPage_label_publish_base_processes;
-	public static String preferencePage_defaultPath_text;
-	public static String publishConfigDialog_title;
-	public static String confirmPathDialog_text;
-	public static String overwriteDialog_text;
-	public static String cancelPublishConfig_msg;
-	public static String previewConfigError_title;
-	public static String viewReportError_title;
-	public static String missingViewError_msg;
-	public static String cannotPublishError_msg;
-	public static String invalidPathError_msg;
-	public static String invalidPathCharsError_msg;
-	public static String publishConfigError_msg;
-	public static String previewConfigError_msg;
-	public static String viewReportError_msg;
-	public static String publishConfigError_reason;
-	public static String deleteFilesError_reason;
-	public static String createDirError_reason;
-	public static String openBrowserError_reason;
-	public static String webAppNameError_msg;
-	public static String webAppNameCharsError_msg;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, PublishingUIResources.class);
-	}
-	
-	/**
-	 * Returns the localized string associated with a resource key and formatted
-	 * with a given object.
-	 * 
-	 * @param key
-	 *            A resource key.
-	 * @param data
-	 *            An object.
-	 * @return A formatted localized string.
-	 */
-	public static String bind(String key, Object data) {
-		return NLS.bind(key, new Object[] { data });
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/Resources.properties b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/Resources.properties
deleted file mode 100755
index e978d34..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/Resources.properties
+++ /dev/null
@@ -1,101 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Publish Method Configuration Wizard
-publishConfigWizard_title=Publish Method Configuration
-publishConfigWizard_selectConfigPage_title=Select Method Configuration
-publishConfigWizard_selectConfigPage_text=Select the method configuration you would like to publish.
-
-publishConfigWizard_selectOptionsPage_title=Specify Publishing Options
-publishConfigWizard_selectOptionsPage_text=Specify the destination directory and publishing options.
-publishConfigWizard_methodConfig_text=Method configuration:
-publishConfigWizard_destinationGroup_text=Destination directory
-publishConfigWizard_directory_text=Path:
-publishConfigWizard_useDefaultPath_text=Use default path
-publishConfigWizard_useDefaultFeedback_text=Use default feedback URL
-publishConfigWizard_webSite_text=Published website
-publishConfigWizard_title_text=Title:
-publishConfigWizard_bannerImage_text=Banner image:
-publishConfigWizard_aboutHTML_text=About content:
-publishConfigWizard_feedbackURL_text=Feedback URL:
-publishConfigWizard_includeIndex_text=Publish index page
-publishConfigWizard_includeGlossary_text=Publish glossary page
-publishConfigWizard_includeSearch_text=Include search capability (requires container for servlet)
-publishConfigWizard_includeSearches_text=Include search capability
-publishConfigWizard_clientSideSearch_text= Client side search (requires Java applet support in browser)
-publishConfigWizard_serverSideSearch_text= Server side search (requires Container for servlet)
-publishConfigWizard_createWAR_text=Generate WAR (Web ARchive) file
-publishConfigWizard_webApplicationName_text=Web application name:
-publishConfigWizard_useApplet_text=Support view customization (requires Java applet support in browser)
-publishConfigWizard_validationGroup_text=Validation
-publishConfigWizard_checkHyperlinks_text=Check external hyperlinks
-publishConfigWizard_diagramGroup_text=Diagrams
-publishConfigWizard_publish_unopen_activity_dd_text=Publish activity detail diagrams that have not been created in process editor
-publishConfigWizard_publish_extend_activity_diagram=Publish activity diagrams for unmodified activity extensions
-publishConfigWizard_convertBrokenLinks_text=Convert broken links to plain text
-publishConfigWizard_layout_text=Layout
-publishConfigWizard_extraDescriptorInfo_text=Publish descriptors with the complete content of the related method content element
-publishConfigWizard_lightWeightTree_text=Generate sub-tree structure for task, role, work product and discipline elements without using folders
-publishConfigWizard_includeEmptyCategories_text=Publish categories with no categorized elements
-
-publishConfigWizard_siteCustomizationPage_title=Customize Website
-publishConfigWizard_siteCustomizationPage_title=Customize Website look and feel
-#publishConfigWizard_groupTheme_text=Theme
-publishConfigWizard_groupSkin_text=Theme and Skin
-publishConfigWizard_showBanner_text=Show banner
-publishConfigWizard_selectSkin_text=Select skin:
-
-# publish process wizard page
-PublishConfigSelectProcessPage_title=Select publishing type
-PublishConfigSelectProcessPage_text=You can either publish the selected configuration or the specified processes in the configuration
-PublishConfigSelectProcessPage_label_capability_pattern=Capability Patterns
-PublishConfigSelectProcessPage_label_delivery_process=Delivery Processes
-PublishConfigSelectProcessPage_label_selectType=Select publishing type
-PublishConfigSelectProcessPage_label_type_processes=Publish the processes selected below:
-PublishConfigSelectProcessPage_label_type_config=Publish the selected configuration
-PublishConfigSelectProcessPage_label_publish_base_processes=Publish Referenced Base Processes
-
-# Publishing Preference Page
-preferencePage_defaultPath_text=Default path:
-
-# Confirmation Dialogs
-publishConfigDialog_title=Publish Method Configuration
-confirmPathDialog_text=The destination path has been resolved to ''{0}''. Do you want to proceed?
-overwriteDialog_text=The destination path ''{0}'' already exists. All files in the folder will be deleted. Do you want to proceed?
-cancelPublishConfig_msg=The publishing operation has been cancelled.
-
-#info message
-publishConfigWizard_selectConfigPage_invalid_views=The following view(s) in configuration ''{0}'' will not be published:
-publishConfigWizard_selectConfigPage_invalid_view_contributor={0}: The view is a contributor
-publishConfigWizard_selectConfigPage_invalid_view_sameview={0}: This view is a duplicate of another view
-publishConfigWizard_selectConfigPage_invalid_view_invalid={0}: This view is not a valid element in the configuration
- 
-# Error Dialogs
-previewConfigError_title=Preview Published Method Configuration
-viewReportError_title=View Publishing Report
-
-# Error Messages
-missingViewError_msg=IUPP0100W: The selected configuration does not contain a valid view. Edit the configuration and add a view, or select another configuration.
-cannotPublishError_msg=IUPP0101E: The selected configuration cannot be published.
-invalidPathError_msg=IUPP0102E: The destination path is blank or invalid.
-invalidPathCharsError_msg=IUPP0103E: The destination path cannot contain these characters: \\ # * ? " < > | ! % /
-publishConfigError_msg=IUPP0104E: The selected configuration was not published successfully.
-previewConfigError_msg=IUPP0105E: Unable to open a HTML browser to preview the published configuration.
-viewReportError_msg=IUPP0106E: Unable to open a HTML browser to view the publishing report.
-webAppNameError_msg=IUPP0107E: The web application name must be specified.
-webAppNameCharsError_msg=IUPP0108E: The web application name cannot contain these characters: \\ # * ? " < > | ! % /
-
-# Error Reasons & Recommended Actions
-publishConfigError_reason=IUPP0107E: An error has occurred. Select the Details button for more information.
-deleteFilesError_reason=The destination path ''{0}'' contains files that cannot be deleted.\n\nClose this dialog and specify another path.
-createDirError_reason=The destination path ''{0}'' cannot be created.\n\nClose this dialog and specify another path.
-openBrowserError_reason=The default HTML browser on this system cannot be detected or located.\n\nClose this dialog and open the file ''{0}'' manually with a HTML browser.
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/actions/Publish.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/actions/Publish.java
deleted file mode 100755
index 1a4ec7d..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/actions/Publish.java
+++ /dev/null
@@ -1,157 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.ui.actions;
-
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.library.prefs.LibraryPreferenceConstants;
-import org.eclipse.epf.publishing.services.AbstractPublishManager;
-import org.eclipse.epf.publishing.services.PublishOptions;
-import org.eclipse.epf.publishing.ui.PublisherElement;
-import org.eclipse.epf.publishing.ui.PublisherFactory;
-import org.eclipse.epf.publishing.ui.PublishingUIPlugin;
-import org.eclipse.epf.publishing.ui.PublishingUIResources;
-import org.eclipse.epf.publishing.wizards.AbstractPublishWizard;
-import org.eclipse.epf.publishing.wizards.PublishProgressMonitorDialog;
-import org.eclipse.epf.publishing.wizards.PublishingOperation;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Invokes the Publish Method Configuration wizard.
- * 
- * @author Bingxue Xu
- * @author Kelvin Low
- * @author Jinhua Xi
- * @since 1.0
- * 
- * TODO: Rename this class to PublishConfigurationAction
- */
-public class Publish implements IWorkbenchWindowActionDelegate {
-
-	private IStructuredSelection selection;
-
-	private PublishOptions publishDataModel;
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		
-		if ( !(action instanceof PublishAction) ) {
-			return;
-		}
-		
-		try {
-			String id = ((PublishAction)action).getId();
-			PublisherElement e = PublisherFactory.getInstance().getPublisherElement(id);		
-			if ( e == null ) {
-				// show error and return
-				return;
-			}
-			
-			startPublish(e);
-	
-		} catch (Exception ex ) {
-			PublishingUIPlugin.getDefault().getLogger()
-			.logError("Error publishing content", ex);	//$NON-NLS-1$
-		}
-	}
-	
-
-	private void startPublish(PublisherElement publisher) throws Exception {
-	
-//		PublishConfigurationWizard wizard = new PublishConfigurationWizard(
-//		publishDataModel);
-		AbstractPublishWizard wizard = publisher.getPublishWizard();
-		wizard.init(PlatformUI.getWorkbench(), selection);
-		publishDataModel = wizard.getPublishOptions();
-
-		//publishDataModel = new PublishOptions();
-
-		IPreferenceStore store = LibraryPlugin.getDefault()
-				.getPreferenceStore();
-		String lastPubPath = store
-				.getString(LibraryPreferenceConstants.PREF_LAST_PUBLISH_FOLDER);
-		if (lastPubPath != null && lastPubPath.length() > 0)
-			publishDataModel.setLastPublicationPath(lastPubPath);
-
-		// Instantiate the wizard container with the wizard and open it.
-		WizardDialog dialog = new WizardDialog(Display.getCurrent()
-				.getActiveShell(), wizard);
-		dialog.create();
-		dialog.open();
-
-		if (!publishDataModel.isFinishPressed()) {
-			return;
-		}
-
-		String publishDestFolder = publishDataModel.getPublicationPath();
-		store.setValue(LibraryPreferenceConstants.PREF_LAST_PUBLISH_FOLDER,
-				publishDestFolder);
-		LibraryPlugin.getDefault().savePluginPreferences();
-
-		AbstractPublishManager publishMgr = null;
-		try {
-			String selecedConfigName = publishDataModel.getSelectedConfig();
-			MethodConfiguration config = LibraryServiceUtil
-					.getMethodConfiguration(LibraryService.getInstance()
-							.getCurrentMethodLibrary(), selecedConfigName);
-
-			publishMgr = publisher.getPublishManager();
-			publishMgr.init(publishDestFolder, config, publishDataModel);
-			PublishingOperation operation = new PublishingOperation(publishMgr);
-
-			PublishProgressMonitorDialog dlg = new PublishProgressMonitorDialog(
-					Display.getCurrent().getActiveShell(), publishMgr.getViewBuilder());
-
-			UserInteractionHelper
-					.runWithProgress(
-							operation,
-							dlg,
-							true,
-							PublishingUIResources.publishConfigWizard_title); //$NON-NLS-1$
-		} finally {
-			if (publishMgr != null) {
-				publishMgr.dispose();
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/actions/PublishAction.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/actions/PublishAction.java
deleted file mode 100755
index b3dd8c1..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/actions/PublishAction.java
+++ /dev/null
@@ -1,51 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
- * define the Publish action
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class PublishAction extends Action {
-	private String id;
-	
-	/**
-	 * create a PublishAction instance
-	 * 
-	 * @param id String the id of the action
-	 * @param name String the name of the action
-	 * @param image ImageDescriptor the image descriptor for the action icon
-	 */
-	public PublishAction(String id,  String name, ImageDescriptor image) {
-		super(name, image);	
-		this.id = id;
-	}
-	
-	/**
-	 * get the id of the action
-	 * @return String
-	 */
-	public String getId() {
-		return id;
-	}
-	
-	/**
-	 * execute the action.
-	 */
-	public void run() {
-		new Publish().run(this);
-	}
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/actions/PublishConfigurationAction.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/actions/PublishConfigurationAction.java
deleted file mode 100755
index 2817d3e..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/actions/PublishConfigurationAction.java
+++ /dev/null
@@ -1,159 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.ui.actions;
-
-import java.util.List;
-
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.library.prefs.LibraryPreferenceConstants;
-import org.eclipse.epf.publishing.services.AbstractPublishManager;
-import org.eclipse.epf.publishing.services.PublishOptions;
-import org.eclipse.epf.publishing.ui.PublisherElement;
-import org.eclipse.epf.publishing.ui.PublisherFactory;
-import org.eclipse.epf.publishing.ui.PublishingUIPlugin;
-import org.eclipse.epf.publishing.ui.PublishingUIResources;
-import org.eclipse.epf.publishing.wizards.AbstractPublishWizard;
-import org.eclipse.epf.publishing.wizards.PublishProgressMonitorDialog;
-import org.eclipse.epf.publishing.wizards.PublishingOperation;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Invokes the Publish Method Configuration wizard.
- * 
- * @author Kelvin Low
- * @author Jinhua Xi
- * @since 1.0
- */
-public class PublishConfigurationAction implements
-		IWorkbenchWindowActionDelegate {
-	
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		try {
-			// this will not work, need to pick up the correct publisher
-			// Jinhua Xi 1/12/07
-			
-			/*
-			// Instantiate and initialize the Publish Method Configuraiton
-			// wizard.
-			PublishConfigWizard wizard = new PublishConfigWizard();
-			wizard.init(PlatformUI.getWorkbench(), null);
-
-			// Instantiate the wizard container with the wizard and open it.
-			WizardDialog dialog = new WizardDialog(Display.getCurrent()
-					.getActiveShell(), wizard);
-			dialog.create();
-			dialog.open();
-			*/
-			
-			List elements = PublisherFactory.getInstance().getPublisherElements();
-			if ( elements != null && elements.size() > 0 ) {
-				// show dialog to select publisher if more then one,
-				// TODO
-				PublisherElement e = (PublisherElement)elements.get(0);
-				startPublish(e);			
-			}
-		} catch (Exception ex) {
-			PublishingUIPlugin.getDefault().getLogger().logError(
-					"Error publishing content", ex); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-	}
-
-	private void startPublish(PublisherElement publisher) throws Exception {
-		
-		PublishOptions publishDataModel;
-
-		AbstractPublishWizard wizard = publisher.getPublishWizard();
-		wizard.init(PlatformUI.getWorkbench(), null);
-		publishDataModel = wizard.getPublishOptions();
-
-		//publishDataModel = new PublishOptions();
-
-		IPreferenceStore store = LibraryPlugin.getDefault()
-				.getPreferenceStore();
-		String lastPubPath = store
-				.getString(LibraryPreferenceConstants.PREF_LAST_PUBLISH_FOLDER);
-		if (lastPubPath != null && lastPubPath.length() > 0)
-			publishDataModel.setLastPublicationPath(lastPubPath);
-
-		// Instantiate the wizard container with the wizard and open it.
-		WizardDialog dialog = new WizardDialog(Display.getCurrent()
-				.getActiveShell(), wizard);
-		dialog.create();
-		dialog.open();
-
-		if (!publishDataModel.isFinishPressed()) {
-			return;
-		}
-
-		String publishDestFolder = publishDataModel.getPublicationPath();
-		store.setValue(LibraryPreferenceConstants.PREF_LAST_PUBLISH_FOLDER,
-				publishDestFolder);
-		LibraryPlugin.getDefault().savePluginPreferences();
-
-		AbstractPublishManager publishMgr = null;
-		try {
-			String selecedConfigName = publishDataModel.getSelectedConfig();
-			MethodConfiguration config = LibraryServiceUtil
-					.getMethodConfiguration(LibraryService.getInstance()
-							.getCurrentMethodLibrary(), selecedConfigName);
-
-			publishMgr = publisher.getPublishManager();
-			publishMgr.init(publishDestFolder, config, publishDataModel);
-			PublishingOperation operation = new PublishingOperation(publishMgr);
-
-			PublishProgressMonitorDialog dlg = new PublishProgressMonitorDialog(
-					Display.getCurrent().getActiveShell(), publishMgr.getViewBuilder());
-
-			UserInteractionHelper
-					.runWithProgress(
-							operation,
-							dlg,
-							true,
-							PublishingUIResources.publishConfigWizard_title); //$NON-NLS-1$
-		} finally {
-			if (publishMgr != null) {
-				publishMgr.dispose();
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/actions/package.html b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/actions/package.html
deleted file mode 100755
index d58ee07..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/actions/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides actions for the publishing UI.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/internal/wizards/PublishConfigOperation.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/internal/wizards/PublishConfigOperation.java
deleted file mode 100755
index f51c791..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/internal/wizards/PublishConfigOperation.java
+++ /dev/null
@@ -1,211 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.ui.internal.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.publishing.PublishingResources;
-import org.eclipse.epf.publishing.services.AbstractPublishManager;
-import org.eclipse.epf.publishing.services.AbstractViewBuilder;
-import org.eclipse.epf.publishing.ui.PublishingUIPlugin;
-import org.eclipse.epf.publishing.ui.PublishingUIResources;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The publish configuration operation.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class PublishConfigOperation implements IRunnableWithProgress {
-
-	private static final String PUBLISH_CONFIG_ERROR_TITLE = PublishingUIResources.publishConfigDialog_title; //$NON-NLS-1$
-
-	private static final String PUBLISH_CONFIG_ERROR_MSG = PublishingUIResources.publishConfigError_msg; //$NON-NLS-1$
-
-	private static final String PUBLISH_CONFIG_ERROR_REASON = PublishingUIResources.publishConfigError_reason; //$NON-NLS-1$
-
-	private static final String PREVIEW_CONFIG_ERROR_TITLE = PublishingUIResources.previewConfigError_title; //$NON-NLS-1$
-
-	private static final String PREVIEW_CONFIG_ERROR_MSG = PublishingUIResources.previewConfigError_msg; //$NON-NLS-1$
-
-	private static final String VIEW_REPORT_ERROR_TITLE = PublishingUIResources.viewReportError_title; //$NON-NLS-1$
-
-	private static final String VIEW_REPORT_ERROR_MSG = PublishingUIResources.viewReportError_msg; //$NON-NLS-1$	
-
-	private static final String OPEN_BROWSER_ERROR_REASON = PublishingUIResources.openBrowserError_reason; //$NON-NLS-1$
-
-	private static final String PUBLISH_CONFIG_CANCEL_MSG = PublishingUIResources.cancelPublishConfig_msg; //$NON-NLS-1$
-
-	private AbstractPublishManager publishMgr;
-
-	private String published_url;
-
-	private String report_url;
-
-	private MsgDialog msgDialog;
-
-	private Exception runException;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PublishConfigOperation(AbstractPublishManager publishMgr) {
-		super();
-		this.publishMgr = publishMgr;
-		this.msgDialog = PublishingUIPlugin.getDefault().getMsgDialog();
-	}
-
-	/**
-	 * get the view builder.
-	 * 
-	 * @return AbstractViewBuilder
-	 */
-	public AbstractViewBuilder getViewBuilder() {
-		return this.publishMgr.getViewBuilder();
-	}
-
-	/**
-	 * get the url for the published site
-	 * 
-	 * @return String
-	 */
-	public String getPublishedUrl() {
-		return published_url;
-	}
-
-	/**
-	 * run the operation to perform the publishing task.
-	 * @param monitor IProgressMonitor
-	 * @throws InvocationTargetException
-	 */
-	public void run(IProgressMonitor monitor) throws InvocationTargetException,
-			InterruptedException {
-		runException = null;
-		try {
-			monitor.setTaskName(PublishingResources.publishingConfigurationTask_name); //$NON-NLS-1$			
-			publishMgr.publish(monitor);
-
-			published_url = publishMgr.getPublishedUrl();
-			report_url = publishMgr.getPublishReportUrl();
-		} catch (Exception e) {
-			runException = e;
-		}
-
-		final boolean canceled = monitor.isCanceled();
-
-		SafeUpdateController.syncExec(new Runnable() {
-			public void run() {
-				if (canceled) {
-					msgDialog.displayInfo(PUBLISH_CONFIG_ERROR_TITLE,
-							PUBLISH_CONFIG_CANCEL_MSG);
-					return;
-				}
-
-				if (published_url == null || report_url == null) {
-					msgDialog.displayError(PUBLISH_CONFIG_ERROR_TITLE,
-							PUBLISH_CONFIG_ERROR_MSG,
-							PUBLISH_CONFIG_ERROR_REASON, runException);
-					return;
-				}
-
-				// Launch a HTML browser to view the published site.
-				if (openBrowser(published_url) == false) {
-					String reason = MessageFormat.format(
-							OPEN_BROWSER_ERROR_REASON,
-							new Object[] { published_url });
-					msgDialog.displayError(PREVIEW_CONFIG_ERROR_TITLE,
-							PREVIEW_CONFIG_ERROR_MSG, reason);
-				}
-
-				// Launch a HTML browser to view the report on the published
-				// site.
-				if (openBrowser(report_url) == false) {
-					String reason = MessageFormat.format(
-							OPEN_BROWSER_ERROR_REASON,
-							new Object[] { report_url });
-					msgDialog.displayError(VIEW_REPORT_ERROR_TITLE,
-							VIEW_REPORT_ERROR_MSG, reason);
-				}
-			}
-		});
-	}
-
-	/**
-	 * open a browser to show the published content.
-	 * @param url String the site url
-	 * @return boolean true if browser opened successfully.
-	 */
-	public boolean openBrowser(final String url) {
-		boolean success = false;
-		try {
-			// Launch the default HTML viewer to display the HTML page.
-			// On Linux, this can't launch urls, only local files can be
-			// launched.
-			// Sorry I have use internal class here.
-			// hope Eclipse.org can have a public api to do so.
-			if (SWT.getPlatform().equals("win32")) { //$NON-NLS-1$
-				success = Program.launch(url);
-			} else {
-//				IBrowser browser = org.eclipse.help.internal.browser.BrowserManager
-//						.getInstance().createBrowser(true);
-//				if (browser == null) {
-//					try {
-//						browser.displayURL(url);
-//						success = true;
-//					} catch (Exception e) {
-//						e.printStackTrace();
-//					}
-//				}
-				
-				// 155490 - Cannot detected default browser when preview published configuration on Linux
-				// changed to use swt browser
-				success = true;
-				Display.getCurrent().asyncExec(new Runnable()
-				{
-				    public void run()
-					{
-//							// open another swt browser since we have no (simple) way of creating a system default browser
-//							// the Eclipse guys hide all the good apis as internal
-							Shell shell = new Shell();
-							shell.setText(url);
-							GridLayout layout = new GridLayout();
-							layout.marginHeight = 0;
-							layout.marginWidth = 0;
-							shell.setLayout(layout);
-							Browser popup_browser = new Browser(shell, SWT.NONE);
-							popup_browser.setLayoutData(new GridData(GridData.FILL_BOTH|GridData.GRAB_HORIZONTAL|GridData.GRAB_VERTICAL));
-							popup_browser.setUrl(url);														
-							shell.open();
-					}
-				});			
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-			success = false;
-		}
-
-		return success;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/internal/wizards/PublishConfigWizardExtensionManager.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/internal/wizards/PublishConfigWizardExtensionManager.java
deleted file mode 100755
index 669c4f3..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/internal/wizards/PublishConfigWizardExtensionManager.java
+++ /dev/null
@@ -1,149 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.ui.internal.wizards;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.publishing.services.PublishManager;
-import org.eclipse.epf.publishing.ui.PublishingUIPlugin;
-import org.eclipse.epf.publishing.ui.wizards.IPublishConfigWizardExtender;
-import org.eclipse.epf.ui.wizards.NewWizardPageContribution;
-import org.eclipse.epf.ui.wizards.ReplaceWizardPageContribution;
-import org.eclipse.jface.wizard.IWizardPage;
-
-/**
- * Manages the "org.eclipse.epf.publishing.ui.publishConfigWizard" extension
- * point.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class PublishConfigWizardExtensionManager {
-
-	/**
-	 * The extension point namespace.
-	 */
-	public static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.epf.publishing.ui"; //$NON-NLS-1$
-
-	/**
-	 * The extension point name.
-	 */
-	public static final String EXTENSION_POINT_NAME = "publishConfigWizard"; //$NON-NLS-1$
-
-	// The shared instance.
-	private static PublishConfigWizardExtensionManager instance = new PublishConfigWizardExtensionManager();
-
-	// An extender of the Publish Method Configuration wizard.
-	private IPublishConfigWizardExtender wizardExtender;
-
-	/**
-	 * Creates a new instance.
-	 */
-	private PublishConfigWizardExtensionManager() {
-		processExtensionPoint();
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return the shared instance
-	 */
-	public static PublishConfigWizardExtensionManager getInstance() {
-		return instance;
-	}
-
-	/**
-	 * Processes the "org.eclipse.epf.publishing.ui.publishConfigWizard"
-	 * extension point.
-	 */
-	protected void processExtensionPoint() {
-		IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(
-				EXTENSION_POINT_NAMESPACE, EXTENSION_POINT_NAME);
-		if (extensionPoint != null) {
-			IExtension[] extensions = extensionPoint.getExtensions();
-			for (int i = 0; i < extensions.length; i++) {
-				IExtension extension = extensions[i];
-				IConfigurationElement[] configElements = extension
-						.getConfigurationElements();
-				for (int j = 0; j < configElements.length; j++) {
-					IConfigurationElement configElement = configElements[j];
-					try {
-						IPublishConfigWizardExtender extender = (IPublishConfigWizardExtender) configElement
-								.createExecutableExtension("class"); //$NON-NLS-1$
-						if (wizardExtender == null) {
-							wizardExtender = extender;
-
-							IConfigurationElement[] childConfigElements = configElement
-									.getChildren("wizardPage"); //$NON-NLS-1$
-							for (int k = 0; k < childConfigElements.length; k++) {
-								IConfigurationElement childConfigElement = childConfigElements[k];
-								IWizardPage wizardPage = (IWizardPage) childConfigElement
-										.createExecutableExtension("class"); //$NON-NLS-1$
-								String type = childConfigElement
-										.getAttribute("type"); //$NON-NLS-1$
-								String target = childConfigElement
-										.getAttribute("target"); //$NON-NLS-1$
-								String insert = childConfigElement
-										.getAttribute("insert"); //$NON-NLS-1$
-								if (wizardPage != null && type != null
-										&& type.length() > 0) {
-									if (type.equals("replace")) { //$NON-NLS-1$
-										wizardExtender
-												.addReplaceWizardPageContribution(new ReplaceWizardPageContribution(
-														wizardPage, target));
-									} else if (type.equals("new")) { //$NON-NLS-1$
-										boolean insertAfter = true;
-										if (insert != null
-												&& insert.equals("before")) { //$NON-NLS-1$
-											insertAfter = false;
-										}
-										wizardExtender
-												.addNewWizardPageContribution(new NewWizardPageContribution(
-														wizardPage, target,
-														insertAfter));
-									}
-								}
-							}
-
-							childConfigElements = configElement
-									.getChildren("publisher"); //$NON-NLS-1$
-							if (childConfigElements.length > 0) {
-								IConfigurationElement childConfigElement = childConfigElements[0];
-								PublishManager publisher = (PublishManager) childConfigElement
-										.createExecutableExtension("class"); //$NON-NLS-1$	
-								wizardExtender.setPublisher(publisher);
-							}
-
-							return;
-						}
-					} catch (Exception e) {
-						PublishingUIPlugin.getDefault().getLogger().logError(e);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Gets the Publish Method Configuration wizard extender loaded via the
-	 * "org.eclipse.epf.publishing.ui.publishConfigWizard" extension point.
-	 * 
-	 * @return an Export MSP wizard extender or <code>null</code>
-	 */
-	public IPublishConfigWizardExtender getWizardExtender() {
-		return wizardExtender;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/package.html b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/package.html
deleted file mode 100755
index cb738fc..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the implementation for managing the publishing UI.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/preferences/PublishingPreferencePage.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/preferences/PublishingPreferencePage.java
deleted file mode 100755
index c5fef0f..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/preferences/PublishingPreferencePage.java
+++ /dev/null
@@ -1,239 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.ui.preferences;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.authoring.ui.preferences.CommonPrefPage;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.LibraryPlugin;
-import org.eclipse.epf.library.layout.DefaultContentValidator;
-import org.eclipse.epf.publishing.PublishingPlugin;
-import org.eclipse.epf.publishing.ui.PublishingUIResources;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-/**
- * The Preference page for the Publishing UI.
- * 
- * @author Kelvin Low
- * @since 1.0
- * fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=156957
- */
-public class PublishingPreferencePage extends CommonPrefPage implements
-		IWorkbenchPreferencePage, SelectionListener, ModifyListener {
-
-	private Composite composite;
-
-	private Text destinationPathText;
-
-	private Text feedbackURLText;
-
-	private Button browseButton;
-
-	private Button extraDescriptorInfoCtr;
-	
-	public static final String EXTRA_DESCRIPTOR_INFO = "org.eclipse.epf.publishing.ui.preferences.extraDescriptorInfo"; //$NON-NLS-1$		
-	
-	protected Control createContents(Composite parent) {
-		composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout(1, false));
-
-		// Create the Destination Path group.
-		Group destinationGroup = new Group(composite, SWT.NULL);
-		destinationGroup.setLayout(new GridLayout(3, false));
-		destinationGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		destinationGroup
-				.setText(PublishingUIResources.publishConfigWizard_destinationGroup_text); //$NON-NLS-1$		
-
-		createLabel(destinationGroup, PublishingUIResources.preferencePage_defaultPath_text); //$NON-NLS-1$
-		destinationPathText = createEditableText(destinationGroup, ""); //$NON-NLS-1$
-		destinationPathText.setText(PublishingUIPreferences.getDefaultPublishPath());
-		browseButton = new Button(destinationGroup, SWT.NONE);
-		browseButton.setText(AuthoringUIText.BROWSE_BUTTON_TEXT);
-
-		// Create the Published Website group.
-		Group webSiteGroup = new Group(composite, SWT.NULL);
-		webSiteGroup.setLayout(new GridLayout(2, false));
-		webSiteGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		webSiteGroup.setText(PublishingUIResources.publishConfigWizard_webSite_text); //$NON-NLS-1$
-
-		createLabel(webSiteGroup, PublishingUIResources.publishConfigWizard_feedbackURL_text); //$NON-NLS-1$
-		feedbackURLText = createEditableText(webSiteGroup, ""); //$NON-NLS-1$
-		feedbackURLText.setText(PublishingUIPreferences.getDefaultFeedbackURL());
-		createLabel(webSiteGroup, ""); //$NON-NLS-1$
-
-		// Create the layout group.
-		Group layoutGroup = new Group(composite, SWT.NULL);
-		layoutGroup.setLayout(new GridLayout(2, false));
-		layoutGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		layoutGroup.setText(PublishingUIResources.publishConfigWizard_layout_text); //$NON-NLS-1$
-
-		extraDescriptorInfoCtr = new Button(layoutGroup, SWT.CHECK);
-		extraDescriptorInfoCtr.setText(PublishingUIResources.publishConfigWizard_extraDescriptorInfo_text);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		extraDescriptorInfoCtr.setLayoutData(gd);
-		extraDescriptorInfoCtr.setSelection(PublishingUIPreferences.getBooleanValue(EXTRA_DESCRIPTOR_INFO));
-
-		initializeValues();
-
-		destinationPathText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (!isPathValid(destinationPathText.getText())) {
-					setValid(false);
-				} else {
-					setValid(true);
-				}
-			}
-		});
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				openDirectoryDialog();
-			}
-		});
-
-		return composite;
-	}
-
-	public void init(IWorkbench workbench) {
-	}
-
-	public void widgetSelected(SelectionEvent e) {
-	}
-
-	public void widgetDefaultSelected(SelectionEvent e) {
-	}
-
-	public void modifyText(ModifyEvent e) {
-	}
-
-	/**
-	 * Method declared on PreferencePage
-	 */
-	protected void performDefaults() {
-		super.performDefaults();
-		initializeDefaults();
-	}
-
-	/**
-	 * Method declared on PreferencePage
-	 */
-	public boolean performOk() {
-		storeValues();
-		PublishingUIPreferences.saveAllPreferences();
-//		LibraryPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-
-	/**
-	 * Stores the values of the controls back to the preference store.
-	 */
-	private void storeValues() {
-		PublishingUIPreferences.setDefaultPublishPath(destinationPathText.getText()
-				.trim());
-		PublishingUIPreferences
-				.setDefaultFeedbackURL(feedbackURLText.getText().trim());
-		
-		PublishingUIPreferences.setValue(EXTRA_DESCRIPTOR_INFO, 
-				extraDescriptorInfoCtr.getSelection());
-		
-		// allow to pass the value to the library browsing
-//		System.setProperty(EXTRA_DESCRIPTOR_INFO, 
-//				extraDescriptorInfoCtr.getSelection() ? "true" : "false");
-		DefaultContentValidator.setDefaultShowExtraInfoForDescriptors(extraDescriptorInfoCtr.getSelection()); 
-		
-	}
-
-	private void initializeDefaults() {
-		destinationPathText.setText(PublishingUIPreferences.getInitDefaultPublishPath());
-		feedbackURLText.setText(PublishingUIPreferences.getInitDefaultFeedbackURL());
-		extraDescriptorInfoCtr.setSelection(PublishingUIPreferences.getBooleanValue(EXTRA_DESCRIPTOR_INFO));
-
-	}
-
-	/**
-	 * Initializes states of the controls from the preference store.
-	 */
-	private void initializeValues() {
-	}
-
-	protected IPreferenceStore doGetPreferenceStore() {
-		return PublishingPlugin.getDefault().getPreferenceStore();
-	}
-
-	protected Label createLabel(Composite parent, String text) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setLayoutData(new GridData());
-		label.setText(text);
-		return label;
-	}
-
-	protected Text createEditableText(Composite parent, String defaultText) {
-		Text text = new Text(parent, SWT.BORDER);
-		text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		return text;
-	}
-
-	private void openDirectoryDialog() {
-		try {
-			DirectoryDialog dd = new DirectoryDialog(composite.getShell(),
-					SWT.NONE);
-
-			String destination = dd.open();
-			if (destination != null) {
-				destinationPathText.setText(destination);
-			}
-
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-	}
-	
-	private boolean isPathValid(String path) {
-		if (path == null || path.length() <= 0) {
-			setErrorMessage(PublishingUIResources.invalidPathError_msg); //$NON-NLS-1$
-			return false;
-		}
-
-		
-		IPath ecPath = Path.fromOSString(path);
-		boolean isValid = ecPath.isValidPath(path);
-		if (!isValid) {
-			setErrorMessage(PublishingUIResources.invalidPathError_msg); //$NON-NLS-1$
-			return false;
-		} else if (!StrUtil.isValidPublishPath(path)) {
-			setErrorMessage(PublishingUIResources.invalidPathCharsError_msg); //$NON-NLS-1$
-			return false;
-		} 
-		
-		setErrorMessage(null);
-		return true;
-	}
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/preferences/PublishingUIPreferences.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/preferences/PublishingUIPreferences.java
deleted file mode 100755
index 6662526..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/preferences/PublishingUIPreferences.java
+++ /dev/null
@@ -1,600 +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.publishing.ui.preferences;
-
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.epf.publishing.services.PublishOptions;
-import org.eclipse.epf.publishing.ui.PublishingUIPlugin;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-
-/**
- * Manages the Publishing UI preferences.
- * 
- * @author Kelvin Low
- * @author Jinhua Xi
- * @since 1.0
- * fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=156630
- */
-public class PublishingUIPreferences {
-
-	/**
-	 * The Publishing UI preference keys.
-	 */
-//	public static final String PUBLISH_PATH = PublishOptions.PUBLISH_PATH;
-//	public static final String PUBLISH_PATH_DEFAULT = "publishPathDefault"; //$NON-NLS-1$
-//
-//	public static final String TITLE = "title"; //$NON-NLS-1$
-//
-//	public static final String BANNER_IMAGE = "bannerImage"; //$NON-NLS-1$
-//
-//	public static final String ABOUT_HTML = "aboutHTML"; //$NON-NLS-1$
-//
-//	public static final String FEEDBACK_URL = "feedbackURL"; //$NON-NLS-1$	
-//	public static final String FEEDBACK_URL_DEFAULT = "feedbackURLDefault"; //$NON-NLS-1$
-//
-//	public static final String INCLUDE_GLOSSARY = "includeGlossary"; //$NON-NLS-1$
-//
-//	public static final String INCLUDE_INDEX = "includeIndex"; //$NON-NLS-1$
-//
-//	public static final String INCLUDE_SEARCH = "includeSearch"; //$NON-NLS-1$
-//
-//	public static final String INCLUDE_PROCESS_CUSTOMIZATION = "includeProcessCustomization"; //$NON-NLS-1$	
-//
-//	public static final String CHECK_EXTERNAL_LINKS = "checkExternalLinks"; //$NON-NLS-1$
-
-	private static String defaultPublishPath = null;
-
-	private static String defaultTitle = null;
-
-	private static String defaultBannerImage = null;
-
-	private static String defaultAboutHTML = null;
-
-	private static String defaultFeedbackURL = null;
-
-	static {
-		// Initialize the default preference values.
-		MethodConfiguration[] configs = LibraryServiceUtil.getMethodConfigurations(
-				LibraryService.getInstance().getCurrentMethodLibrary());
-		IPreferenceStore store = PublishingUIPlugin.getDefault()
-				.getPreferenceStore();
-		store.setDefault(PublishOptions.PUBLISH_PATH_DEFAULT, getDefaultPublishPath()); //$NON-NLS-1$
-		store.setDefault(PublishOptions.FEEDBACK_URL_DEFAULT, getDefaultFeedbackURL()); //$NON-NLS-1$
-		store.setDefault(PublishOptions.EXTRA_DESCRIPTOR_INFO, getExtraDescriptorInfo(null)); //$NON-NLS-1$
-		for(int i=0;i<configs.length;i++){
-			String configName = configs[i].getName();
-			String prefix = getConfigPrefPrefix(configName);
-			store.setDefault(prefix+PublishOptions.PUBLISH_PATH, getPublishPath(configName)); //$NON-NLS-1$
-			store.setDefault(prefix+PublishOptions.TITLE, getDefaultTitle()); //$NON-NLS-1$	
-			store.setDefault(prefix+PublishOptions.BANNER_IMAGE, getDefaultBannerImage()); //$NON-NLS-1$
-			store.setDefault(prefix+PublishOptions.ABOUT_HTML, getDefaultAboutHTML()); //$NON-NLS-1$
-			store.setDefault(prefix+PublishOptions.FEEDBACK_URL, getFeedbackURL(configName)); //$NON-NLS-1$
-//			store.setDefault(prefix+PublishOptions.WEBAPP_NAME, getWebAppName(configName)); //$NON-NLS-1$
-			store.setDefault(prefix+PublishOptions.INCLUDE_GLOSSARY, getIncludeGlossary(configName)); //$NON-NLS-1$
-			store.setDefault(prefix+PublishOptions.INCLUDE_INDEX, getIncludeIndex(configName)); //$NON-NLS-1$
-//			store.setDefault(prefix+PublishOptions.INCLUDE_CREATE_WAR, getIncludeWAR(configName)); //$NON-NLS-1$
-//			store.setDefault(PublishOptions.INCLUDE_SEARCH, true); //$NON-NLS-1$
-//			store.setDefault(PublishOptions.INCLUDE_PROCESS_CUSTOMIZATION, true); //$NON-NLS-1$
-			store.setDefault(prefix+PublishOptions.CHECK_EXTERNAL_LINKS, getCheckExternalLinks(configName)); //$NON-NLS-1$
-			store.setDefault(prefix+PublishOptions.CONVERT_BROKEN_LINKS, getConvertBrokenLinks(configName)); //$NON-NLS-1$
-			store.setDefault(prefix+PublishOptions.LIGHT_WEIGHT_TREE, getLightWeightTree(configName)); //$NON-NLS-1$
-			store.setDefault(prefix+PublishOptions.EXTRA_DESCRIPTOR_INFO, getExtraDescriptorInfo(configName)); //$NON-NLS-1$
-			store.setDefault(prefix+LibraryUIPreferences.PUBLISH_UNOPEN_ACTIVITY_DD, 
-					getPublishUnopenActivitydd(configName)); //$NON-NLS-1$
-			store.setDefault(prefix+LibraryUIPreferences.PUBLISH_AD_FOR_ACTIVITY_EXTENSION, 
-					getPublishADForActivityExtension(configName)); //$NON-NLS-1$
-		}
-	}
-	
-	public static boolean getConvertBrokenLinks(String configName) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getBoolean(
-				getConfigPrefPrefix(configName)+PublishOptions.CONVERT_BROKEN_LINKS);
-	}
-
-	public static void setConvertBrokenLinks(String configName, boolean flag) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				getConfigPrefPrefix(configName)+PublishOptions.CONVERT_BROKEN_LINKS, flag);
-	}
-	
-	public static boolean getLightWeightTree(String configName) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getBoolean(
-				getConfigPrefPrefix(configName)+PublishOptions.LIGHT_WEIGHT_TREE);
-	}
-
-	public static void setLightWeightTree(String configName, boolean flag) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				getConfigPrefPrefix(configName)+PublishOptions.LIGHT_WEIGHT_TREE, flag);
-	}
-	public static boolean getExtraDescriptorInfo(String configName) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getBoolean(
-				getConfigPrefPrefix(configName)+PublishOptions.EXTRA_DESCRIPTOR_INFO);
-	}
-
-	public static void setExtraDescriptorInfo(String configName, boolean flag) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				getConfigPrefPrefix(configName)+PublishOptions.EXTRA_DESCRIPTOR_INFO, flag);
-	}
-	/**
-	 * Returns the publish path that was saved in a previous session.
-	 * 
-	 * @return The saved publish path.
-	 */
-	public static String getPublishPath(String configName) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getString(
-				getConfigPrefPrefix(configName)+PublishOptions.PUBLISH_PATH);
-	}
-
-	/**
-	 * Saves the current publish path to preference store.
-	 * 
-	 * @param path
-	 *            A publish path.
-	 */
-	public static void setPublishPath(String configName, String path) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				getConfigPrefPrefix(configName)+PublishOptions.PUBLISH_PATH, path);
-	}
-
-	/**
-	 * Returns the title that was saved in a previous session.
-	 * 
-	 * @return The saved title.
-	 */
-	public static String getTitle(String configName) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getString(
-				getConfigPrefPrefix(configName)+PublishOptions.TITLE);
-	}
-
-	/**
-	 * Saves the current title to preference store.
-	 * 
-	 * @param title
-	 *            A title.
-	 */
-	public static void setTitle(String configName, String title) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				getConfigPrefPrefix(configName)+PublishOptions.TITLE,
-				title);
-	}
-
-	/**
-	 * Returns the banner image that was saved in a previous session.
-	 * 
-	 * @return The saved banner image.
-	 */
-	public static String getBannerImage(String configName) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getString(
-				getConfigPrefPrefix(configName)+PublishOptions.BANNER_IMAGE);
-	}
-
-	/**
-	 * Saves the current banner image to preference store.
-	 * 
-	 * @param image
-	 *            The banner image.
-	 */
-	public static void setBannerImage(String configName, String image) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				getConfigPrefPrefix(configName)+PublishOptions.BANNER_IMAGE, image);
-	}
-
-	/**
-	 * Returns the about HTML that was saved in a previous session.
-	 * 
-	 * @return The saved about HTML.
-	 */
-	public static String getAboutHTML(String configName) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getString(
-				getConfigPrefPrefix(configName)+PublishOptions.ABOUT_HTML);
-	}
-
-	/**
-	 * Saves the current about HTML to preference store.
-	 * 
-	 * @param file
-	 *            A HTML file.
-	 */
-	public static void setAboutHTML(String configName, String file) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				getConfigPrefPrefix(configName)+PublishOptions.ABOUT_HTML, file);
-	}
-
-	/**
-	 * Returns the feedback URL that was saved in a previous session.
-	 * 
-	 * @return The saved feedback URL.
-	 */
-	public static String getFeedbackURL(String configName) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getString(
-				getConfigPrefPrefix(configName)+PublishOptions.FEEDBACK_URL);
-	}
-
-	/**
-	 * Saves the current feedback URL to preference store.
-	 * 
-	 * @param url
-	 *            A feedback URL.
-	 */
-	public static void setFeedbackURL(String configName, String url) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				getConfigPrefPrefix(configName)+PublishOptions.FEEDBACK_URL, url);
-	}
-	
-	/**
-	 * Returns the web app name that was saved in a previous session.
-	 * 
-	 * @return The saved web app name.
-	 */
-	public static String getWebAppName(String configName) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getString(
-				getConfigPrefPrefix(configName)+PublishOptions.WEBAPP_NAME);
-	}
-
-	/**
-	 * Saves the current web app name to preference store.
-	 * 
-	 * @param url
-	 *            A web app name.
-	 */
-	public static void setWebAppName(String configName, String name) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				getConfigPrefPrefix(configName)+PublishOptions.WEBAPP_NAME, name);
-	}
-
-	/**
-	 * Returns the include glossary flag that was saved in a previous session.
-	 * 
-	 * @return The saved include glossary flag.
-	 */
-	public static boolean getIncludeGlossary(String configName) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getBoolean(
-				getConfigPrefPrefix(configName)+PublishOptions.INCLUDE_GLOSSARY);
-	}
-
-	/**
-	 * Saves the current include glossary flag to preference store.
-	 * 
-	 * @param flag
-	 *            The include glossary flag.
-	 */
-	public static void setIncludeGlossary(String configName, boolean flag) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				getConfigPrefPrefix(configName)+PublishOptions.INCLUDE_GLOSSARY, flag);
-	}
-	
-	/**
-	 * Returns the include glossary flag that was saved in a previous session.
-	 * 
-	 * @return The saved include search flag.
-	 */
-	public static boolean getIncludeSearch(String configName) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getBoolean(
-				getConfigPrefPrefix(configName)+PublishOptions.INCLUDE_SEARCH);
-	}
-
-	/**
-	 * Saves the current include search flag to preference store.
-	 * 
-	 * @param flag
-	 *            The include search flag.
-	 */
-	public static void setIncludeSearch(String configName, boolean flag) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				getConfigPrefPrefix(configName)+PublishOptions.INCLUDE_SEARCH, flag);
-	}
-
-	/**
-	 * Returns the include index flag that was saved in a previous session.
-	 * 
-	 * @return The saved include index flag.
-	 */
-	public static boolean getIncludeIndex(String configName) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getBoolean(
-				getConfigPrefPrefix(configName)+PublishOptions.INCLUDE_INDEX);
-	}
-
-	/**
-	 * Saves the current include index flag to preference store.
-	 * 
-	 * @param flag
-	 *            The include index flag.
-	 */
-	public static void setIncludeIndex(String configName, boolean flag) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				getConfigPrefPrefix(configName)+PublishOptions.INCLUDE_INDEX, flag);
-	}
-
-//	/**
-//	 * Returns the include search that was saved in a previous session.
-//	 * 
-//	 * @return The saved include search flag.
-//	 */
-//	public static boolean getIncludeSearch() {
-//		return PublishingUIPlugin.getDefault().getPreferenceStore().getBoolean(
-//				PublishOptions.INCLUDE_SEARCH);
-//	}
-//
-//	/**
-//	 * Saves the current include search flag to preference store.
-//	 * 
-//	 * @param flag
-//	 *            The include search flag.
-//	 */
-//	public static void setIncludeSearch(boolean flag) {
-//		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-//				PublishOptions.INCLUDE_SEARCH, flag);
-//	}
-
-//	/**
-//	 * Returns the include process customization that was saved in a previous
-//	 * session.
-//	 * 
-//	 * @return The saved include process customization flag.
-//	 */
-//	public static boolean getIncludeProcessCustomization() {
-//		return PublishingUIPlugin.getDefault().getPreferenceStore().getBoolean(
-//				PublishOptions.INCLUDE_PROCESS_CUSTOMIZATION);
-//	}
-//
-//	/**
-//	 * Saves the current include process customization flag to preference store.
-//	 * 
-//	 * @param flag
-//	 *            The include process customization flag.
-//	 */
-//	public static void setIncludeProcessCustomization(boolean flag) {
-//		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-//				PublishOptions.INCLUDE_PROCESS_CUSTOMIZATION, flag);
-//	}
-
-	/**
-	 * Returns the check external links flag that was saved in a previous
-	 * session.
-	 * 
-	 * @return The saved check external links flag.
-	 */
-	public static boolean getCheckExternalLinks(String configName) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getBoolean(
-				getConfigPrefPrefix(configName)+PublishOptions.CHECK_EXTERNAL_LINKS);
-	}
-
-	/**
-	 * Saves the current include process customization flag to preference store.
-	 * 
-	 * @param flag
-	 *            The check external links flag.
-	 */
-	public static void setCheckExternalLinks(String configName, boolean flag) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				getConfigPrefPrefix(configName)+PublishOptions.CHECK_EXTERNAL_LINKS, flag);
-	}
-	
-	/**
-	 * Save current publish unopen activity dd flag to preference store
-	 * @param configName the configuration name this flag is for
-	 * @param flag the publish unopen activity dd flag
-	 */
-	public static void setPublishUnopenActivitydd(String configName, boolean flag){
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				getConfigPrefPrefix(configName)+LibraryUIPreferences.PUBLISH_UNOPEN_ACTIVITY_DD, flag);
-	}
-	
-	/**
-	 * return the publish unopen activity dd flag that was saved in previous session
-	 * @param configName the configuration name this flag is for
-	 * @return the publish unopen activity dd flag
-	 */
-	public static boolean getPublishUnopenActivitydd(String configName){
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getBoolean(
-				getConfigPrefPrefix(configName)+LibraryUIPreferences.PUBLISH_UNOPEN_ACTIVITY_DD);
-	}
-	
-	/**
-	 * Save current publish AD for activity extension flag to preference store
-	 * @param configName the configuration name this flag is for
-	 * @param flag the publish AD for activity extension flag
-	 */
-	public static void setPublishADForActivityExtension(String configName, boolean flag){
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				getConfigPrefPrefix(configName)+LibraryUIPreferences.PUBLISH_AD_FOR_ACTIVITY_EXTENSION, flag);
-	}
-	
-	/**
-	 * return the publish AD for activity extension flag that was saved in previous session
-	 * @param configName the configuration name this flag is for
-	 * @return the publish AD for activity extension flag
-	 */
-	public static boolean getPublishADForActivityExtension(String configName){
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getBoolean(
-				getConfigPrefPrefix(configName)+LibraryUIPreferences.PUBLISH_AD_FOR_ACTIVITY_EXTENSION);
-	}
-
-	/**
-	 * Returns the default publish path.
-	 * 
-	 * @return The default publish path.
-	 */
-	public static String getDefaultPublishPath() {
-		defaultPublishPath = PublishingUIPlugin.getDefault().getPreferenceStore().getString(
-				PublishOptions.PUBLISH_PATH_DEFAULT).trim();
-		if (defaultPublishPath == null || defaultPublishPath.length() <= 0) {
-			defaultPublishPath = getInitDefaultPublishPath();
-		}
-		return defaultPublishPath;
-	}
-	
-	public static String getInitDefaultPublishPath() {
-
-			String userHome = System
-					.getProperty("user.home").replace('\\', '/'); //$NON-NLS-1$
-			String path = PublishingUIPlugin.getDefault().getString(
-					"publishPath"); //$NON-NLS-1$
-			if (path == null || path.length() == 0 || path.startsWith("[")) { //$NON-NLS-1$
-				path = userHome + "/publish"; //$NON-NLS-1$
-			} else if (path.startsWith("<user.home>")) { //$NON-NLS-1$
-				path = userHome + path.substring(11);
-			}
-			if (System.getProperty("file.separator").equals("\\")) { //$NON-NLS-1$ //$NON-NLS-2$
-				path = path.replace('/', '\\');
-			}
-			
-			int idx = -1;
-			if ((idx=path.indexOf("<app.name>")) >= 0) { //$NON-NLS-1$
-//				String appNameProper = LibraryUIManager.getAppName();
-				String appNameProper = LibraryUIPreferences.getApplicationShortName();
-				path = path.substring(0, idx) + appNameProper + path.substring(idx+10);
-			}
-		
-		return path;
-	}
-
-	public static void setDefaultPublishPath(String path) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				PublishOptions.PUBLISH_PATH_DEFAULT, path);
-	}
-
-	/**
-	 * Returns the default title for the published website.
-	 * 
-	 * @return The default title for the published website.
-	 */
-	public static String getDefaultTitle() {
-		if (defaultTitle == null) {
-			String url = PublishingUIPlugin.getDefault().getString("title"); //$NON-NLS-1$
-			if (url == null || url.length() == 0 || url.startsWith("[")) { //$NON-NLS-1$
-				url = ""; //$NON-NLS-1$
-			}
-			defaultTitle = url;
-		}
-		return defaultTitle;
-	}
-
-	/**
-	 * Returns the default banner image for the published website.
-	 * 
-	 * @return The default banner image for the published website.
-	 */
-	public static String getDefaultBannerImage() {
-		if (defaultBannerImage == null) {
-			String image = PublishingUIPlugin.getDefault().getString(
-					"bannerImage"); //$NON-NLS-1$
-			if (image == null || image.length() == 0 || image.startsWith("[")) { //$NON-NLS-1$
-				image = ""; //$NON-NLS-1$
-			}
-			defaultBannerImage = image;
-		}
-		return defaultBannerImage;
-	}
-
-	/**
-	 * Returns the default about HTML for the published website.
-	 * 
-	 * @return The default about HTML for the published website.
-	 */
-	public static String getDefaultAboutHTML() {
-		if (defaultAboutHTML == null) {
-			String file = PublishingUIPlugin.getDefault()
-					.getString("aboutHTML"); //$NON-NLS-1$
-			if (file == null || file.length() == 0 || file.startsWith("[")) { //$NON-NLS-1$
-				file = ""; //$NON-NLS-1$
-			}
-			defaultAboutHTML = file;
-		}
-		return defaultAboutHTML;
-	}
-
-	/**
-	 * Returns the default feedback URL.
-	 * 
-	 * @return The default feedback URL.
-	 */
-	public static String getDefaultFeedbackURL() {
-		defaultFeedbackURL = PublishingUIPlugin.getDefault().getPreferenceStore().getString(
-				PublishOptions.FEEDBACK_URL_DEFAULT).trim();
-		if (defaultFeedbackURL == null || defaultFeedbackURL.length() <= 0) {
-			defaultFeedbackURL = getInitDefaultFeedbackURL();
-		}
-		return defaultFeedbackURL;
-	}
-	
-	public static String getInitDefaultFeedbackURL() {
-			String url = PublishingUIPlugin.getDefault().getString(
-					"feedbackURL"); //$NON-NLS-1$
-			if (url == null || url.length() == 0 || url.startsWith("[")) { //$NON-NLS-1$
-				url = "http://www.published_website.com/feedback"; //$NON-NLS-1$
-			}
-		
-		return url;
-	}
-	public static void setDefaultFeedbackURL(String path) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				PublishOptions.FEEDBACK_URL_DEFAULT, path);
-	}
-
-	// genaric method to get/set values
-	public static void setValue(String name, String value) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				name, value);
-		
-	}
-	
-	public static void setValue(String name, boolean value) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				name, value);
-		
-	}
-	
-	public static String getStringValue(String name) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getString(name);
-	}
-	
-	public static boolean getBooleanValue(String name) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getBoolean(name);
-	}
-	
-	public static void setDefaultValue(String name, String value) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				name, value);
-		
-	}
-	
-	public static void setDefaultValue(String name, boolean value) {
-		PublishingUIPlugin.getDefault().getPreferenceStore().setValue(
-				name, value);
-		
-	}
-	
-	public static String getDefaultStringValue(String name) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getString(name);
-	}
-	
-	public static boolean getDefaultBooleanValue(String name) {
-		return PublishingUIPlugin.getDefault().getPreferenceStore().getBoolean(name);
-	}
-	
-	public static String getConfigPrefPrefix(String configName){
-		try{
-			MethodConfiguration config = LibraryServiceUtil.getMethodConfiguration(
-					LibraryService.getInstance().getCurrentMethodLibrary(), configName);
-			return configName+"."+config.getGuid()+".";
-		} catch (Exception e){
-			return "";
-		}
-	}
-
-	public static void saveAllPreferences() {
-		PublishingUIPlugin.getDefault().savePluginPreferences();
-	}
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/preferences/package.html b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/preferences/package.html
deleted file mode 100755
index 9258c21..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/preferences/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides preference support for the publishing UI.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/IPublishConfigWizardExtender.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/IPublishConfigWizardExtender.java
deleted file mode 100755
index cb3b075..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/IPublishConfigWizardExtender.java
+++ /dev/null
@@ -1,49 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.ui.wizards;
-
-import org.eclipse.epf.publishing.services.PublishManager;
-import org.eclipse.epf.publishing.services.PublishOptions;
-import org.eclipse.epf.ui.wizards.IWizardExtender;
-
-/**
- * The interface for an extender of the Export Microsoft Project wizard.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public interface IPublishConfigWizardExtender extends IWizardExtender {
-
-	/**
-	 * Gets the name of the user selected method configuration.
-	 * 
-	 * @return the name of the user selected configuration or <code>null</code>
-	 */
-	public String getConfigName();
-
-	/**
-	 * Gets the user selected publishing options.
-	 * 
-	 * @return a <code>PublishOptions</code> object
-	 */
-	public PublishOptions getPublishingOptions();
-
-	/**
-	 * Sets the configuration publisher.
-	 */
-	public void setPublisher(PublishManager publisher);
-
-	/**
-	 * Gets the configuration publisher.
-	 */
-	public PublishManager getPublisher();
-
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/PublishConfigWizard.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/PublishConfigWizard.java
deleted file mode 100755
index 91a6d74..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/PublishConfigWizard.java
+++ /dev/null
@@ -1,355 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.ui.wizards;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.edit.ui.UserInteractionHelper;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.epf.publishing.services.PublishManager;
-import org.eclipse.epf.publishing.services.PublishOptions;
-import org.eclipse.epf.publishing.ui.PublishingUIPlugin;
-import org.eclipse.epf.publishing.ui.PublishingUIResources;
-import org.eclipse.epf.publishing.ui.internal.wizards.PublishConfigWizardExtensionManager;
-import org.eclipse.epf.publishing.ui.preferences.PublishingUIPreferences;
-import org.eclipse.epf.publishing.wizards.PublishProgressMonitorDialog;
-import org.eclipse.epf.publishing.wizards.PublishingOperation;
-import org.eclipse.epf.ui.wizards.NewWizardPageContribution;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWizard;
-
-/**
- * The Publish Method Configuration wizard.
- * 
- * @author Kelvin Low
- * @author Bingxue Xu
- * @author Jinhua Xi
- * @since 1.0
- */
-public class PublishConfigWizard extends Wizard implements INewWizard {
-
-	/**
-	 * The wizard ID.
-	 */
-	public static final String WIZARD_ID = PublishConfigWizard.class.getName();
-
-	// The select configuration wizard page.
-	protected SelectConfigPage selectConfigPage;
-
-	// The select publishing options wizard page.
-	protected SelectPublishingOptionsPage selectPublishingOptionsPage;
-
-	// An extender of this wizard.
-	protected IPublishConfigWizardExtender wizardExtender;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PublishConfigWizard() {
-		super();
-		setWindowTitle(PublishingUIResources.publishConfigWizard_title);
-	}
-
-	/**
-	 * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		wizardExtender = PublishConfigWizardExtensionManager.getInstance()
-				.getWizardExtender();
-		if (wizardExtender != null) {
-			wizardExtender.init(this);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.addPages()
-	 */
-	public void addPages() {
-		List wizardPages = new ArrayList();
-
-		if (wizardExtender == null) {
-			selectConfigPage = new SelectConfigPage();
-			selectPublishingOptionsPage = new SelectPublishingOptionsPage();
-			wizardPages.add(selectConfigPage);
-			wizardPages.add(selectPublishingOptionsPage);
-		} else {
-			IWizardPage page = wizardExtender
-					.getReplaceWizardPage(SelectConfigPage.PAGE_NAME);
-			if (page != null) {
-				wizardPages.add(page);
-			} else {
-				selectConfigPage = new SelectConfigPage();
-				wizardPages.add(selectConfigPage);
-			}
-
-			page = wizardExtender
-					.getReplaceWizardPage(SelectPublishingOptionsPage.PAGE_NAME);
-			if (page != null) {
-				wizardPages.add(page);
-			} else {
-				selectPublishingOptionsPage = new SelectPublishingOptionsPage();
-				wizardPages.add(selectPublishingOptionsPage);
-			}
-		}
-
-		if (wizardExtender != null) {
-			List contributions = wizardExtender.getNewWizardPageContributions();
-			if (contributions != null) {
-				for (Iterator it = contributions.iterator(); it.hasNext();) {
-					NewWizardPageContribution exetnsion = (NewWizardPageContribution) it
-							.next();
-					IWizardPage page = (IWizardPage) exetnsion.getWizardPage();
-					int index = wizardPages.indexOf(page.getName());
-					if (index == -1) {
-						wizardPages.add(page);
-					} else {
-						if (exetnsion.getInsertAfter()) {
-							wizardPages.add(index + 1, page);
-						} else {
-							wizardPages.add(index, page);
-						}
-					}
-				}
-			}
-		}
-
-		for (int i = 0; i < wizardPages.size(); i++) {
-			IWizardPage page = (IWizardPage) wizardPages.get(i);
-			super.addPage(page);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#createPageControls(Composite)
-	 */
-	public void createPageControls(Composite pageContainer) {
-		super.createPageControls(pageContainer);
-		pageContainer.getShell().setImage(
-				AuthoringUIPlugin.getDefault().getSharedImage(
-						"full/obj16/MethodConfiguration.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#canFinish()
-	 */
-	public boolean canFinish() {
-		if (wizardExtender != null && wizardExtender.canFinish()) {
-			return true;
-		}
-		return super.canFinish();
-		/*
-		 * return this.getContainer().getCurrentPage() ==
-		 * selectPublishingOptionsPage &&
-		 * selectPublishingOptionsPage.isPageComplete();
-		 */
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		String configName = (wizardExtender != null) ? wizardExtender
-				.getConfigName() : selectConfigPage.getConfigName();
-		PublishOptions options = (wizardExtender != null) ? wizardExtender
-				.getPublishingOptions() : selectPublishingOptionsPage
-				.getPublishingOptions();
-		options.selectedConfig = configName;
-
-		if (checkAndCreateDir(options)) {
-			PublishingUIPreferences
-					.setPublishPath(configName, options.getPublicationPath());
-			PublishingUIPreferences.setTitle(configName, options.getTitle());
-			PublishingUIPreferences.setBannerImage(configName, options.getBannerImage());
-			PublishingUIPreferences.setAboutHTML(configName, options.getAboutHTML());
-			PublishingUIPreferences.setFeedbackURL(configName, options.getFeedbackURL());
-			PublishingUIPreferences.setIncludeGlossary(configName, options
-					.isGenerateGlossary());
-			PublishingUIPreferences.setIncludeIndex(configName, options.isGenerateIndex());
-			PublishingUIPreferences.setCheckExternalLinks(configName, options
-					.isCheckExtLinks());
-			PublishingUIPreferences.setConvertBrokenLinks(configName, options
-					.isConvertBrokenLinks());
-			PublishingUIPreferences.setLightWeightTree(configName, options
-					.isGenerateLightWeightTree());
-			PublishingUIPreferences.setExtraDescriptorInfo(configName, options
-					.isShowExtraDescriptorInfo());
-
-			PublishingUIPreferences.setPublishUnopenActivitydd(configName, options
-					.isAutoGenerateActivityDiagrams());
-			PublishingUIPreferences.setPublishADForActivityExtension(configName, options
-					.isUnopenExtendedActivityDiagram());
-
-			PublishingUIPreferences.saveAllPreferences();
-//			LibraryUIPreferences.saveAllPreferences();
-
-			PublishManager publisher = (wizardExtender != null) ? wizardExtender
-					.getPublisher()
-					: new PublishManager();
-
-			MethodConfiguration config = LibraryServiceUtil
-					.getMethodConfiguration(LibraryService.getInstance()
-							.getCurrentMethodLibrary(), configName);
-
-			try {
-				publisher.init(options.getPublicationPath(), config, options);
-				PublishingOperation operation = new PublishingOperation(
-						publisher);
-
-				PublishProgressMonitorDialog dlg = new PublishProgressMonitorDialog(
-						Display.getCurrent().getActiveShell(), publisher
-								.getViewBuilder());
-
-				UserInteractionHelper.runWithProgress(operation, dlg, true,
-						PublishingUIResources.publishConfigWizard_title);
-			} finally {
-				if (publisher != null) {
-					publisher.dispose();
-				}
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Checks and creates the destination path where the method configuration
-	 * will be published.
-	 * 
-	 * @param options
-	 *            the publishing options
-	 * @return <code>true</code> if the destination path is valid,
-	 *         <code>false</code> otherwise
-	 */
-	protected boolean checkAndCreateDir(PublishOptions options) {
-		String dir = options.publicationPath;
-		String defaultPublishPath = PublishingUIPreferences
-				.getDefaultPublishPath();
-		boolean answer = false;
-
-		IPath ecPath = Path.fromOSString(dir);
-		if (!ecPath.isAbsolute()) {
-			String path = defaultPublishPath
-					+ System.getProperty("file.separator") + dir; //$NON-NLS-1$
-			answer = PublishingUIPlugin
-					.getDefault()
-					.getMsgDialog()
-					.displayPrompt(
-							PublishingUIResources.publishConfigDialog_title,
-							PublishingUIResources
-									.bind(
-											PublishingUIResources.confirmPathDialog_text,
-											path));
-
-			if (answer) {
-				options.setPublicationPath(dir);
-			} else {
-				return false;
-			}
-		}
-
-		File file = new File(dir);
-
-		if (file.exists()) {
-			File[] files = file.listFiles();
-			if (files != null && files.length > 0) {
-				answer = PublishingUIPlugin
-						.getDefault()
-						.getMsgDialog()
-						.displayConfirmation(
-								PublishingUIResources.publishConfigDialog_title,
-								PublishingUIResources
-										.bind(
-												PublishingUIResources.overwriteDialog_text,
-												dir));
-
-				if (answer == true) {
-					try {
-						answer = FileUtil
-								.deleteAllFiles(file.getAbsolutePath());
-						if (answer == false) {
-							PublishingUIPlugin
-									.getDefault()
-									.getMsgDialog()
-									.displayError(
-											PublishingUIResources.publishConfigDialog_title,
-											PublishingUIResources.cannotPublishError_msg,
-											PublishingUIResources
-													.bind(
-															PublishingUIResources.deleteFilesError_reason,
-															dir));
-							return false;
-
-						}
-					} catch (Exception e) {
-						PublishingUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayError(
-										PublishingUIResources.publishConfigDialog_title,
-										PublishingUIResources.cannotPublishError_msg,
-										PublishingUIResources
-												.bind(
-														PublishingUIResources.deleteFilesError_reason,
-														dir), e);
-						return false;
-					}
-				}
-			} else {
-				return true;
-			}
-		} else {
-			try {
-				answer = file.mkdirs();
-			} catch (Exception e) {
-				PublishingUIPlugin.getDefault().getMsgDialog().displayError(
-						PublishingUIResources.publishConfigDialog_title,
-						PublishingUIResources.cannotPublishError_msg,
-						PublishingUIResources.bind(
-								PublishingUIResources.createDirError_reason,
-								file.getAbsolutePath()), e);
-				return false;
-			}
-			if (!answer) {
-				PublishingUIPlugin.getDefault().getMsgDialog().displayError(
-						PublishingUIResources.publishConfigDialog_title,
-						PublishingUIResources.cannotPublishError_msg,
-						PublishingUIResources.bind(
-								PublishingUIResources.createDirError_reason,
-								file.getAbsolutePath()));
-				return false;
-			}
-		}
-
-		return answer;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/PublishOptionContribution.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/PublishOptionContribution.java
deleted file mode 100755
index 5f8b3b6..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/PublishOptionContribution.java
+++ /dev/null
@@ -1,72 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.ui.wizards;
-
-/**
- * Models a "publishOption" configuration element in the
- * "org.eclipse.epf.publishing.ui.publishConfigurationWizard" extension point.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class PublishOptionContribution {
-
-	private String name;
-
-	private String description;
-
-	private boolean defaultSelection;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param name
-	 *            the export option name
-	 * @param description
-	 *            the export option description
-	 * @param defaultSelection
-	 *            if <code>true</code>, this option is selected by default
-	 */
-	public PublishOptionContribution(String name, String description,
-			boolean defaultSelection) {
-		this.name = name;
-		this.description = description;
-		this.defaultSelection = defaultSelection;
-	}
-
-	/**
-	 * Returns the name of this export option.
-	 * 
-	 * @return the export option name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Returns the description of this export option.
-	 * 
-	 * @return the export option description
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * Returns the default seleciton of this export option.
-	 * 
-	 * @return <code>true</code> if this option should be selected by default
-	 */
-	public boolean getDefaultSelection() {
-		return defaultSelection;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/SelectConfigPage.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/SelectConfigPage.java
deleted file mode 100755
index 0b3b261..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/SelectConfigPage.java
+++ /dev/null
@@ -1,220 +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.publishing.ui.wizards;
-
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.publishing.ui.PublishingUIResources;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A wizard page that prompts the user to select a method configuration to
- * publish.
- * 
- * @author Kelvin Low
- * @author Bingxue Xu
- * @author Jinhua Xi
- * @since 1.0
- */
-public class SelectConfigPage extends BaseWizardPage {
-
-	/**
-	 * The wizard page name.
-	 */
-	public static final String PAGE_NAME = SelectConfigPage.class
-			.getName();
-
-	private Table table;
-
-	private TableViewer tableViewer;
-
-	private Text briefDescText;
-
-	private List processViews;
-
-	private String selectedConfigName;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SelectConfigPage() {
-		super(PAGE_NAME);
-		setTitle(PublishingUIResources.publishConfigWizard_selectConfigPage_title);
-		setDescription(PublishingUIResources.publishConfigWizard_selectConfigPage_text);
-		setImageDescriptor(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"full/wizban/PublishConfiguration.gif")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout(1, false));
-
-		createLabel(composite,
-				PublishingUIResources.publishConfigWizard_methodConfig_text);
-
-		table = new Table(composite, SWT.BORDER | SWT.V_SCROLL);
-		GridData gridData = new GridData(GridData.FILL_BOTH);
-		gridData.heightHint = 120;
-		gridData.widthHint = 280;
-		table.setLayoutData(gridData);
-
-		tableViewer = new TableViewer(table);
-		tableViewer.setLabelProvider(new ConfigurationTableLabelProvider());
-		tableViewer.setContentProvider(new ArrayContentProvider());
-		MethodConfiguration[] configs = LibraryServiceUtil
-				.getMethodConfigurations(LibraryService.getInstance()
-						.getCurrentMethodLibrary());
-		tableViewer.setInput(configs);
-
-		createLabel(composite, AuthoringUIText.DESCRIPTION_TEXT);
-
-		briefDescText = createTextMulti(composite, "", 360, 80, 1); //$NON-NLS-1$
-
-		// Select the first config and display its brief description.
-		if (configs.length > 0) {
-			table.select(0);
-			setBriefDescription(configs[0]);
-		}
-
-		addListeners();
-
-		setControl(composite);
-
-		PlatformUI
-				.getWorkbench()
-				.getHelpSystem()
-				.setHelp(
-						composite,
-						AuthoringUIHelpContexts.CONFIGURATION_PUBLISH_WIZARD_ALL_PAGES_CONTEXT);
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		IWizardPage page = getWizard().getNextPage(this);
-		try{
-			((BaseWizardPage)page).onEnterPage(getConfigName());
-		} catch (Exception e){}
-		return page;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isCompleted()
-	 */
-	public boolean isPageComplete() {
-		if (getErrorMessage() != null)
-			return false;
-
-		int count = table.getSelectionCount();
-
-		if (count > 0) {
-			TableItem[] items = table.getSelection();
-			selectedConfigName = items[0].getText();
-			MethodConfiguration config = LibraryServiceUtil
-					.getMethodConfiguration(LibraryService.getInstance()
-							.getCurrentMethodLibrary(), selectedConfigName);
-			processViews = null;
-			if (config != null) {
-				processViews = config.getProcessViews();
-			}
-
-			if (processViews != null && processViews.size() > 0) {
-				setErrorMessage(null);
-				setMessage(null);
-				return true;
-			} else {
-				setErrorMessage(null);
-				setMessage(PublishingUIResources.missingViewError_msg, //$NON-NLS-1$
-						WizardPage.WARNING);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Gets the user selected method configuration.
-	 * 
-	 * @return the name of the user selected configuration or <code>null</code>
-	 */
-	public String getConfigName() {
-		return selectedConfigName;
-	}
-
-	/**
-	 * Adds listeners to the wizard controls.
-	 */
-	private void addListeners() {
-		tableViewer
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-					public void selectionChanged(SelectionChangedEvent event) {
-						StructuredSelection selection = (StructuredSelection) event
-								.getSelection();
-						if (!selection.isEmpty()) {
-							Object[] configs = selection.toArray();
-							setBriefDescription((MethodConfiguration) configs[0]);
-						}
-						setPageComplete(isPageComplete());
-						getWizard().getContainer().updateButtons();
-					}
-				});
-	}
-
-	/**
-	 * Populates the Brief Description text control with the given
-	 * configuration's brief descripotion.
-	 */
-	private void setBriefDescription(MethodConfiguration config) {
-		briefDescText.setText(config.getBriefDescription());
-	}
-
-	class ConfigurationTableLabelProvider extends LabelProvider implements
-			ITableLabelProvider {
-
-		public Image getColumnImage(Object element, int index) {
-			return null;
-		}
-
-		public String getColumnText(Object element, int index) {
-			MethodConfiguration config = (MethodConfiguration) element;
-			return config.getName();
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/SelectPublishingOptionsPage.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/SelectPublishingOptionsPage.java
deleted file mode 100755
index 342a5c6..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/SelectPublishingOptionsPage.java
+++ /dev/null
@@ -1,501 +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.publishing.ui.wizards;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.publishing.services.PublishOptions;
-import org.eclipse.epf.publishing.ui.PublishingUIResources;
-import org.eclipse.epf.publishing.ui.preferences.PublishingPreferencePage;
-import org.eclipse.epf.publishing.ui.preferences.PublishingUIPreferences;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A wizard page that prompts the user to select the publishing options for a
- * method configuration.
- * 
- * @author Kelvin Low
- * @author Bingxue Xu
- * @author Jinhua Xi
- * @since 1.0
- */
-public class SelectPublishingOptionsPage extends BaseWizardPage {
-
-	/**
-	 * The wizard page name.
-	 */
-	public static final String PAGE_NAME = SelectPublishingOptionsPage.class
-			.getName();
-
-	private Text destinationPathText;
-
-	private Text titleText;
-
-	private Text bannerImageText;
-
-	private Text aboutHTMLText;
-
-	private Text feedbackURLText;
-
-	private Button browseButton;
-
-	private Button defaultPathCheckbox;
-
-	private Button selectImageButton;
-
-	private Button selectHTMLButton;
-
-	private Button includeGlossary;
-
-	private Button includeIndex;
-
-	private Button checkExternalLinks;
-
-	private Button convertBrokenLinks;
-
-	private Button autoGenerateActivityDiagrams;
-
-	private boolean displayDestinationGroup = true;
-
-	private Button extraDescriptorInfoCtr;
-
-	private Button lightWeightTreeCtr;
-
-	private Button publishUnOpenExtendActivityDiagram;
-	
-	private String configName = "";
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param name
-	 *            the name of the wizard page
-	 */
-	public SelectPublishingOptionsPage(String name) {
-		super(name);
-		setTitle(PublishingUIResources.publishConfigWizard_selectOptionsPage_title);
-		setDescription(PublishingUIResources.publishConfigWizard_selectOptionsPage_text);
-		setImageDescriptor(AuthoringUIPlugin.getDefault().getImageDescriptor(
-				"full/wizban/PublishConfiguration.gif")); //$NON-NLS-1$			
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SelectPublishingOptionsPage() {
-		this(PAGE_NAME);
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout(1, false));
-
-		createDestinationGroupUI(composite);
-		createPublishingOptionsUI(composite);
-		createPublishingMiscOptionsUI(composite);
-
-		initializeControls();
-
-		addListeners(composite);
-
-		setControl(composite);
-
-		PlatformUI
-				.getWorkbench()
-				.getHelpSystem()
-				.setHelp(
-						composite,
-						AuthoringUIHelpContexts.CONFIGURATION_PUBLISH_WIZARD_ALL_PAGES_CONTEXT);
-	}
-
-	protected void createDestinationGroupUI(Composite composite) {
-		if (displayDestinationGroup) {
-			// Create the Destination Path group.
-			Group destinationGroup = new Group(composite, SWT.NULL);
-			destinationGroup.setLayout(new GridLayout(3, false));
-			destinationGroup.setLayoutData(new GridData(
-					GridData.FILL_HORIZONTAL));
-			destinationGroup
-					.setText(PublishingUIResources.publishConfigWizard_destinationGroup_text);
-
-			createLabel(destinationGroup,
-					PublishingUIResources.publishConfigWizard_directory_text);
-			destinationPathText = createEditableText(destinationGroup,
-					"", 360, 1); //$NON-NLS-1$
-//			String initPath = PublishingUIPreferences.getPublishPath();
-//			if (initPath == null || initPath.length() <= 0)
-//				initPath = PublishingUIPreferences.getDefaultPublishPath();
-//			destinationPathText.setText(initPath);
-			browseButton = new Button(destinationGroup, SWT.NONE);
-			browseButton.setText(AuthoringUIText.BROWSE_BUTTON_TEXT);
-			browseButton.setEnabled(false);
-
-			createLabel(destinationGroup, ""); //$NON-NLS-1$
-			defaultPathCheckbox = createCheckbox(
-					destinationGroup,
-					PublishingUIResources.publishConfigWizard_useDefaultPath_text,
-					2);
-			defaultPathCheckbox.setSelection(destinationPathText.getText()
-					.equals(PublishingUIPreferences.getDefaultPublishPath()));
-			destinationPathText.setEnabled(!defaultPathCheckbox.getSelection());
-
-			if (!defaultPathCheckbox.getSelection()) {
-				browseButton.setEnabled(true);
-			}
-		}
-	}
-
-	protected void createPublishingOptionsUI(Composite composite) {
-		// Create the Published Website group.
-		Group webSiteGroup = new Group(composite, SWT.NULL);
-		webSiteGroup.setLayout(new GridLayout(3, false));
-		webSiteGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		webSiteGroup
-				.setText(PublishingUIResources.publishConfigWizard_webSite_text);
-
-		createLabel(webSiteGroup,
-				PublishingUIResources.publishConfigWizard_title_text);
-		titleText = createEditableText(webSiteGroup, "", 360, 1); //$NON-NLS-1$
-//		titleText.setText(PublishingUIPreferences.getTitle());
-		createLabel(webSiteGroup, ""); //$NON-NLS-1$
-
-		createLabel(webSiteGroup,
-				PublishingUIResources.publishConfigWizard_bannerImage_text);
-		bannerImageText = createEditableText(webSiteGroup, "", 360, 1); //$NON-NLS-1$
-//		bannerImageText.setText(PublishingUIPreferences.getBannerImage());
-		selectImageButton = new Button(webSiteGroup, SWT.NONE);
-		selectImageButton.setText(AuthoringUIText.SELECT_BUTTON_TEXT);
-
-		createLabel(webSiteGroup,
-				PublishingUIResources.publishConfigWizard_aboutHTML_text);
-		aboutHTMLText = createEditableText(webSiteGroup, "", 360, 1); //$NON-NLS-1$
-//		aboutHTMLText.setText(PublishingUIPreferences.getAboutHTML());
-		selectHTMLButton = new Button(webSiteGroup, SWT.NONE);
-		selectHTMLButton.setText(AuthoringUIText.SELECT_BUTTON_TEXT);
-
-		createLabel(webSiteGroup,
-				PublishingUIResources.publishConfigWizard_feedbackURL_text);
-		feedbackURLText = createEditableText(webSiteGroup, "", 360, 1); //$NON-NLS-1$
-//		String feedbackURL = PublishingUIPreferences.getFeedbackURL();
-//		if (feedbackURL == null || feedbackURL.length() <= 0)
-//			feedbackURL = PublishingUIPreferences.getDefaultFeedbackURL();
-//		feedbackURLText.setText(feedbackURL);
-		createLabel(webSiteGroup, ""); //$NON-NLS-1$
-
-		includeGlossary = createCheckbox(webSiteGroup,
-				PublishingUIResources.publishConfigWizard_includeGlossary_text,
-				3);
-		includeIndex = createCheckbox(webSiteGroup,
-				PublishingUIResources.publishConfigWizard_includeIndex_text, 3);
-
-		// override this method to add addtional options
-		includeAdditionalPublishingOptions(webSiteGroup);
-	}
-
-	protected void includeAdditionalPublishingOptions(Composite container) {
-	}
-
-	protected void createPublishingMiscOptionsUI(Composite composite) {
-		// Create the Misc group.
-		Group validationGroup = new Group(composite, SWT.NULL);
-		validationGroup.setLayout(new GridLayout(1, false));
-		validationGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		validationGroup
-				.setText(PublishingUIResources.publishConfigWizard_validationGroup_text);
-
-		checkExternalLinks = createCheckbox(validationGroup,
-				PublishingUIResources.publishConfigWizard_checkHyperlinks_text);
-
-		convertBrokenLinks = createCheckbox(
-				validationGroup,
-				PublishingUIResources.publishConfigWizard_convertBrokenLinks_text);
-
-		// Create the Misc group.
-		Group diagramGroup = new Group(composite, SWT.NULL);
-		diagramGroup.setLayout(new GridLayout(1, false));
-		diagramGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		diagramGroup
-				.setText(PublishingUIResources.publishConfigWizard_diagramGroup_text);
-
-		autoGenerateActivityDiagrams = createCheckbox(
-				diagramGroup,
-				PublishingUIResources.publishConfigWizard_publish_unopen_activity_dd_text);
-
-		publishUnOpenExtendActivityDiagram = createCheckbox(
-				diagramGroup,
-				PublishingUIResources.publishConfigWizard_publish_extend_activity_diagram);
-
-		// Create the layout group.
-		Group layoutGroup = new Group(composite, SWT.NULL);
-		layoutGroup.setLayout(new GridLayout());
-		layoutGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		layoutGroup
-				.setText(PublishingUIResources.publishConfigWizard_layout_text);
-
-		lightWeightTreeCtr = createCheckbox(layoutGroup,
-				PublishingUIResources.publishConfigWizard_lightWeightTree_text);
-
-		extraDescriptorInfoCtr = createCheckbox(
-				layoutGroup,
-				PublishingUIResources.publishConfigWizard_extraDescriptorInfo_text);
-		extraDescriptorInfoCtr
-				.setSelection(PublishingUIPreferences
-						.getBooleanValue(PublishingPreferencePage.EXTRA_DESCRIPTOR_INFO));
-	}
-
-	protected void initializeControls() {
-//		includeGlossary.setSelection(PublishingUIPreferences
-//				.getIncludeGlossary());
-//		includeIndex.setSelection(PublishingUIPreferences.getIncludeIndex());
-//		checkExternalLinks.setSelection(PublishingUIPreferences
-//				.getCheckExternalLinks());
-//		convertBrokenLinks.setSelection(PublishingUIPreferences
-//				.getConvertBrokenLinks());
-//		autoGenerateActivityDiagrams.setSelection(LibraryUIPreferences
-//				.getPublishUnopenActivitydd());
-//		publishUnOpenExtendActivityDiagram.setSelection(LibraryUIPreferences
-//				.getPublishADForActivityExtension());
-//		lightWeightTreeCtr.setSelection(PublishingUIPreferences
-//				.getLightWeightTree());
-//		extraDescriptorInfoCtr.setSelection(PublishingUIPreferences
-//				.getExtraDescriptorInfo());
-	}
-
-	public void onEnterPage(Object obj) {
-		super.onEnterPage(obj);
-		configName = (String)obj;
-		String initPath = PublishingUIPreferences.getPublishPath(configName);
-		if (initPath == null || initPath.length() <= 0)
-			initPath = PublishingUIPreferences.getDefaultPublishPath();
-		destinationPathText.setText(initPath);
-		defaultPathCheckbox.setSelection(destinationPathText.getText()
-				.equals(PublishingUIPreferences.getDefaultPublishPath()));
-		destinationPathText.setEnabled(!defaultPathCheckbox.getSelection());
-
-		if (!defaultPathCheckbox.getSelection()) {
-			browseButton.setEnabled(true);
-		}
-		titleText.setText(PublishingUIPreferences.getTitle(configName));
-		bannerImageText.setText(PublishingUIPreferences.getBannerImage(configName));
-		aboutHTMLText.setText(PublishingUIPreferences.getAboutHTML(configName));
-		String feedbackURL = PublishingUIPreferences.getFeedbackURL(configName);
-		if (feedbackURL == null || feedbackURL.length() <= 0)
-			feedbackURL = PublishingUIPreferences.getDefaultFeedbackURL();
-		feedbackURLText.setText(feedbackURL);
-		includeGlossary.setSelection(PublishingUIPreferences
-				.getIncludeGlossary(configName));
-		includeIndex.setSelection(PublishingUIPreferences.getIncludeIndex(configName));
-		checkExternalLinks.setSelection(PublishingUIPreferences
-				.getCheckExternalLinks(configName));
-		convertBrokenLinks.setSelection(PublishingUIPreferences
-				.getConvertBrokenLinks(configName));
-		autoGenerateActivityDiagrams.setSelection(PublishingUIPreferences
-				.getPublishUnopenActivitydd(configName));
-		publishUnOpenExtendActivityDiagram.setSelection(PublishingUIPreferences
-				.getPublishADForActivityExtension(configName));
-		lightWeightTreeCtr.setSelection(PublishingUIPreferences
-				.getLightWeightTree(configName));
-		extraDescriptorInfoCtr.setSelection(PublishingUIPreferences
-				.getExtraDescriptorInfo(configName));
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		if (!displayDestinationGroup) {
-			return true;
-		}
-
-		if (!isTextNonEmpty(destinationPathText)) {
-			setErrorMessage(PublishingUIResources.invalidPathError_msg);
-			return false;
-		}
-
-		String path = destinationPathText.getText();
-		IPath ecPath = Path.fromOSString(path);
-		boolean isValid = ecPath.isValidPath(path);
-		if (!isValid) {
-			setErrorMessage(PublishingUIResources.invalidPathError_msg);
-		} else if (!StrUtil.isValidPublishPath(path)) {
-			setErrorMessage(PublishingUIResources.invalidPathCharsError_msg);
-		} else {
-			setErrorMessage(null);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		return null;
-	}
-
-	/**
-	 * Adds the listeners for the controls on this page.
-	 */
-	private void addListeners(final Composite composite) {
-		if (displayDestinationGroup) {
-			destinationPathText.addModifyListener(new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					setPageComplete(isPageComplete());
-				}
-			});
-
-			browseButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent event) {
-					try {
-						DirectoryDialog dd = new DirectoryDialog(composite
-								.getShell(), SWT.NONE);
-						String destination = dd.open();
-						if (destination != null) {
-							destinationPathText.setText(destination);
-						}
-					} catch (Exception e) {
-						e.printStackTrace();
-					}
-				}
-			});
-
-			defaultPathCheckbox.addListener(SWT.Selection, new Listener() {
-				public void handleEvent(Event event) {
-					if (defaultPathCheckbox.getSelection()) {
-						destinationPathText.setText(PublishingUIPreferences
-								.getDefaultPublishPath());
-						destinationPathText.setEnabled(false);
-						browseButton.setEnabled(false);
-					} else {
-						String initPath = PublishingUIPreferences
-								.getPublishPath(configName);
-						if (initPath == null || initPath.length() <= 0)
-							initPath = PublishingUIPreferences
-									.getDefaultPublishPath();
-						destinationPathText.setText(initPath);
-						destinationPathText.setEnabled(true);
-						browseButton.setEnabled(true);
-					}
-				}
-			});
-		}
-
-		selectImageButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				try {
-					FileDialog dialog = new FileDialog(composite.getShell(),
-							SWT.OPEN);
-					dialog.setFilterExtensions(new String[] {
-							"*.gif", "*.jpg", "*.bmp" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					String imageFile = dialog.open();
-					if (imageFile != null) {
-						bannerImageText.setText(imageFile);
-					}
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-
-		selectHTMLButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				try {
-					FileDialog dialog = new FileDialog(composite.getShell(),
-							SWT.OPEN);
-					dialog
-							.setFilterExtensions(new String[] {
-									"*.htm", "*.html" }); //$NON-NLS-1$ //$NON-NLS-2$
-					String htmlFile = dialog.open();
-					if (htmlFile != null) {
-						aboutHTMLText.setText(htmlFile);
-					}
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#setVisible()
-	 */
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (visible) {
-			Display display = titleText.getDisplay();
-			if (!(display == null || display.isDisposed())) {
-				display.asyncExec(new Runnable() {
-					public void run() {
-						titleText.setFocus();
-					}
-				});
-			}
-		}
-	}
-
-	/**
-	 * Gets the user selected publishing options.
-	 * 
-	 * @return a <code>PublishOptions</code> object
-	 */
-	public PublishOptions getPublishingOptions() {
-		PublishOptions options = new PublishOptions();
-
-		options.publishConfiguration = true;
-		if (displayDestinationGroup) {
-			options.setPublicationPath(destinationPathText.getText().trim());
-		}
-		options.setTitle(titleText.getText().trim());
-		options.setBannerImage(bannerImageText.getText().trim());
-		options.aboutHTML = aboutHTMLText.getText().trim();
-		options.feedbackURL = feedbackURLText.getText().trim();
-		options.generateGlossary = includeGlossary.getSelection();
-		options.generateIndex = includeIndex.getSelection();
-		options.checkExtLinks = checkExternalLinks.getSelection();
-		options.autoGenerateActivityDiagrams = autoGenerateActivityDiagrams
-				.getSelection();
-		options
-				.setUnopenExtendedActivityDiagram(publishUnOpenExtendActivityDiagram
-						.getSelection());
-		options.convertBrokenLinks = convertBrokenLinks.getSelection();
-		options.showExtraDescriptorInfo = extraDescriptorInfoCtr.getSelection();
-		options.generateLightWeightTree = lightWeightTreeCtr.getSelection();
-
-		return options;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/AbstractPublishWizard.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/AbstractPublishWizard.java
deleted file mode 100755
index 79a6b66..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/AbstractPublishWizard.java
+++ /dev/null
@@ -1,62 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.wizards;
-
-import org.eclipse.epf.publishing.services.PublishOptions;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * Abstract publishing wizard class. 
- * use the org.eclipse.epf.publishing.ui.publishers extension point to extend this class 
- * if you need to customize the publishing ui.
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public abstract class AbstractPublishWizard extends Wizard implements INewWizard {
-
-	// The publishing options.
-	protected PublishOptions dataModel = null;
-
-	/**
-	 * constructor
-	 *
-	 */
-	public AbstractPublishWizard() {
-		super();
-	}
-	
-	/**
-	 * finish the wizard
-	 * 
-	 * @return boolean return true if successful
-	 */
-	public abstract boolean performFinish();
-
-	/**
-	 * initialize the wizard.
-	 * 
-	 * @param workbench IWorkbench
-	 * @param selection IStructuredSelection
-	 */
-	public abstract void init(IWorkbench workbench, IStructuredSelection selection);
-	
-	/**
-	 * get the publish options
-	 * 
-	 * @return PublishOptions
-	 */
-	public abstract PublishOptions getPublishOptions();
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishConfigPublishOptionsPage.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishConfigPublishOptionsPage.java
deleted file mode 100755
index 449b27f..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishConfigPublishOptionsPage.java
+++ /dev/null
@@ -1,572 +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.publishing.wizards;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.publishing.services.PublishOptions;
-import org.eclipse.epf.publishing.ui.PublishingUIResources;
-import org.eclipse.epf.publishing.ui.preferences.PublishingPreferencePage;
-import org.eclipse.epf.publishing.ui.preferences.PublishingUIPreferences;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The Select Publishing Options page in the Publish Method Configuration
- * wizard.
- * 
- * @author Kelvin Low
- * @author Bingxue Xu
- * @author Jinhua Xi
- * @since 1.0
- * 
- * TODO: Rename this class to PublishConfigSpecifyOptionsPage fix for
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=173817
- */
-public class PublishConfigPublishOptionsPage extends BaseWizardPage {
-
-	private Text destinationPathText;
-
-	private Text titleText;
-
-	private Text bannerImageText;
-
-	private Text aboutHTMLText;
-
-	private Text feedbackURLText;
-
-	private Button browseButton;
-
-	private Button defaultPathCheckbox;
-
-	private Button defaultFeedbackCheckbox;
-
-	private Button selectImageButton;
-
-	private Button selectHTMLButton;
-
-	private Button includeGlossary;
-
-	private Button includeIndex;
-
-	private Button checkExternalLinks;
-	private Button convertBrokenLinks;
-
-	private Button autoGenerateActivityDiagrams;
-
-	private boolean displayDestinationGroup = true;
-
-	private Button extraDescriptorInfoCtr;
-	private Button lightWeightTreeCtr;
-
-	// don't want to do this
-	// private Button includeEmptyCategoriesCtr;
-
-	protected PublishOptions dataModel = null;
-
-	protected String configName = ""; //$NON-NLS-1$
-
-	private Button publishUnOpenExtendActivityDiagram;
-
-//	private Button createWARCheckBox;
-//	private Text webAppNameText;
-//	private Label warLabel;
-//	private Button includeSearch;
-//	private Composite searchComposite;
-
-	// private boolean showSearchChoice = true;
-	// private boolean showAppletChoice = true;
-	/**
-	 * Creates a new instance.
-	 */
-	public PublishConfigPublishOptionsPage(String pageName,
-			boolean displayDestinationGroup, PublishOptions dataModel) {
-		super(pageName);
-		setTitle(PublishingUIResources.publishConfigWizard_selectOptionsPage_title); //$NON-NLS-1$
-		setDescription(PublishingUIResources.publishConfigWizard_selectOptionsPage_text); //$NON-NLS-1$
-		this.displayDestinationGroup = displayDestinationGroup;
-		this.dataModel = dataModel;
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PublishConfigPublishOptionsPage(String pageName, PublishOptions dataModel) {
-		this(pageName, true, dataModel);
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-
-		// if (PublishManager.getAppletSearchPath()==null) showSearchChoice =
-		// false;
-		// if (PublishManager.getAppletPath()==null) showAppletChoice = false;
-
-		// Create the composite to hold the widgets.
-		Composite composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout(1, false));
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite,
-				AuthoringUIHelpContexts.CONFIGURATION_PUBLISH_WIZARD_ALL_PAGES_CONTEXT);
-
-		createDestinationGroupUI(composite);
-		createPublishingOptionsUI(composite);
-		createPublishingMiscOptionsUI(composite);
-		initializeControls();
-		addListeners(composite);
-
-		setControl(composite);
-	}
-
-	protected void createDestinationGroupUI(Composite composite) {
-		if (displayDestinationGroup) {
-			// Create the Destination Path group.
-			Group destinationGroup = new Group(composite, SWT.NULL);
-			destinationGroup.setLayout(new GridLayout(3, false));
-			destinationGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			destinationGroup
-					.setText(PublishingUIResources.publishConfigWizard_destinationGroup_text); //$NON-NLS-1$		
-
-			createLabel(destinationGroup,
-					PublishingUIResources.publishConfigWizard_directory_text); //$NON-NLS-1$
-			destinationPathText = createEditableText(destinationGroup, "", 360, 1); //$NON-NLS-1$
-			// String initPath = PublishingUIPreferences.getPublishPath();
-			// if (initPath == null || initPath.length() <= 0)
-			// initPath = PublishingUIPreferences.getDefaultPublishPath();
-			// destinationPathText.setText(initPath);
-			browseButton = new Button(destinationGroup, SWT.NONE);
-			browseButton.setText(AuthoringUIText.BROWSE_BUTTON_TEXT);
-			browseButton.setEnabled(false);
-
-			createLabel(destinationGroup, ""); //$NON-NLS-1$
-			defaultPathCheckbox = createCheckbox(destinationGroup,
-					PublishingUIResources.publishConfigWizard_useDefaultPath_text, 2); //$NON-NLS-1$
-			defaultPathCheckbox.setSelection(destinationPathText.getText().equals(
-					PublishingUIPreferences.getDefaultPublishPath()));
-			destinationPathText.setEnabled(!defaultPathCheckbox.getSelection());
-
-			if (!defaultPathCheckbox.getSelection()) {
-				browseButton.setEnabled(true);
-			}
-		}
-	}
-
-	protected void createPublishingOptionsUI(Composite composite) {
-
-		// Create the Published Website group.
-		Group webSiteGroup = new Group(composite, SWT.NULL);
-		webSiteGroup.setLayout(new GridLayout(3, false));
-		webSiteGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		webSiteGroup.setText(PublishingUIResources.publishConfigWizard_webSite_text); //$NON-NLS-1$		
-
-		createLabel(webSiteGroup, PublishingUIResources.publishConfigWizard_title_text); //$NON-NLS-1$
-		titleText = createEditableText(webSiteGroup, "", 360, 1); //$NON-NLS-1$
-		// titleText.setText(PublishingUIPreferences.getTitle());
-		createLabel(webSiteGroup, ""); //$NON-NLS-1$
-
-		createLabel(webSiteGroup,
-				PublishingUIResources.publishConfigWizard_bannerImage_text); //$NON-NLS-1$
-		bannerImageText = createEditableText(webSiteGroup, "", 360, 1); //$NON-NLS-1$
-		// bannerImageText.setText(PublishingUIPreferences.getBannerImage());
-		selectImageButton = new Button(webSiteGroup, SWT.NONE);
-		selectImageButton.setText(AuthoringUIText.SELECT_BUTTON_TEXT);
-
-		createLabel(webSiteGroup,
-				PublishingUIResources.publishConfigWizard_aboutHTML_text); //$NON-NLS-1$
-		aboutHTMLText = createEditableText(webSiteGroup, "", 360, 1); //$NON-NLS-1$
-		// aboutHTMLText.setText(PublishingUIPreferences.getAboutHTML());
-		selectHTMLButton = new Button(webSiteGroup, SWT.NONE);
-		selectHTMLButton.setText(AuthoringUIText.SELECT_BUTTON_TEXT);
-
-		createLabel(webSiteGroup,
-				PublishingUIResources.publishConfigWizard_feedbackURL_text); //$NON-NLS-1$
-		feedbackURLText = createEditableText(webSiteGroup, "", 360, 1); //$NON-NLS-1$
-		createLabel(webSiteGroup, ""); //$NON-NLS-1$
-		createLabel(webSiteGroup, ""); //$NON-NLS-1$
-		defaultFeedbackCheckbox = createCheckbox(webSiteGroup,
-				PublishingUIResources.publishConfigWizard_useDefaultFeedback_text, 2);
-		// defaultFeedbackCheckbox.setSelection(feedbackURLText.getText()
-		// .equals(PublishingUIPreferences.getDefaultFeedbackURL()));
-		// feedbackURLText.setEnabled(!defaultFeedbackCheckbox.getSelection());
-
-		includeGlossary = createCheckbox(webSiteGroup,
-				PublishingUIResources.publishConfigWizard_includeGlossary_text, 3); //$NON-NLS-1$
-		includeIndex = createCheckbox(webSiteGroup,
-				PublishingUIResources.publishConfigWizard_includeIndex_text, 3); //$NON-NLS-1$
-
-		// override this method to add addtional options
-		includeAdditionalPublishingOptions(webSiteGroup);
-	}
-
-	protected void includeAdditionalPublishingOptions(Composite container) {
-
-//		Composite warComposite = new Composite(container, SWT.NONE);
-//		GridLayout warLayout = new GridLayout(2, false);
-//		warLayout.marginHeight = 0;
-//		warLayout.marginWidth = 0;
-//		warComposite.setLayout(warLayout);
-//		GridData gridData = new GridData();
-//		gridData.horizontalSpan = 3;
-//		warComposite.setLayoutData(gridData);
-//
-//		createWARCheckBox = createCheckbox(warComposite,
-//				PublishingUIResources.publishConfigWizard_createWAR_text, 2); //$NON-NLS-1$
-//
-//		warLabel = createLabel(warComposite,
-//				PublishingUIResources.publishConfigWizard_webApplicationName_text); //$NON-NLS-1$
-//		gridData = new GridData(GridData.BEGINNING);
-//		gridData.horizontalIndent = 30;
-//		warLabel.setLayoutData(gridData);
-//		webAppNameText = createEditableText(warComposite, "", 295, 1); //$NON-NLS-1$
-//
-//		searchComposite = new Composite(container, SWT.NONE);
-//		GridLayout searchLayout = new GridLayout();
-//		searchLayout.marginHeight = 0;
-//		searchLayout.marginWidth = 0;
-//		searchComposite.setLayout(searchLayout);
-//		gridData = new GridData();
-//		gridData.horizontalSpan = 3;
-//		searchComposite.setLayoutData(gridData);
-//
-//		includeSearch = createCheckbox(searchComposite,
-//				PublishingUIResources.publishConfigWizard_includeSearch_text, 1); //$NON-NLS-1$	
-	}
-
-	protected void createPublishingMiscOptionsUI(Composite composite) {
-
-		// Create the Misc group.
-		Group validationGroup = new Group(composite, SWT.NULL);
-		validationGroup.setLayout(new GridLayout(1, false));
-		validationGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		validationGroup
-				.setText(PublishingUIResources.publishConfigWizard_validationGroup_text); //$NON-NLS-1$	
-
-		checkExternalLinks = createCheckbox(validationGroup,
-				PublishingUIResources.publishConfigWizard_checkHyperlinks_text); //$NON-NLS-1$
-
-		convertBrokenLinks = createCheckbox(validationGroup,
-				PublishingUIResources.publishConfigWizard_convertBrokenLinks_text); //$NON-NLS-1$
-
-		// Create the Misc group.
-		Group diagramGroup = new Group(composite, SWT.NULL);
-		diagramGroup.setLayout(new GridLayout(1, false));
-		diagramGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		diagramGroup.setText(PublishingUIResources.publishConfigWizard_diagramGroup_text); //$NON-NLS-1$	
-
-		autoGenerateActivityDiagrams = createCheckbox(diagramGroup,
-				PublishingUIResources.publishConfigWizard_publish_unopen_activity_dd_text); //$NON-NLS-1$
-
-		publishUnOpenExtendActivityDiagram = createCheckbox(diagramGroup,
-				PublishingUIResources.publishConfigWizard_publish_extend_activity_diagram); //$NON-NLS-1$
-
-		// Create the layout group.
-		Group layoutGroup = new Group(composite, SWT.NULL);
-		layoutGroup.setLayout(new GridLayout());
-		layoutGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		layoutGroup.setText(PublishingUIResources.publishConfigWizard_layout_text); //$NON-NLS-1$
-
-		lightWeightTreeCtr = createCheckbox(layoutGroup,
-				PublishingUIResources.publishConfigWizard_lightWeightTree_text);
-
-		// includeEmptyCategoriesCtr = createCheckbox(
-		// layoutGroup,
-		// PublishingUIResources.publishConfigWizard_includeEmptyCategories_text);
-
-		extraDescriptorInfoCtr = createCheckbox(layoutGroup,
-				PublishingUIResources.publishConfigWizard_extraDescriptorInfo_text);
-		extraDescriptorInfoCtr.setSelection(PublishingUIPreferences
-				.getBooleanValue(PublishingPreferencePage.EXTRA_DESCRIPTOR_INFO));
-
-	}
-
-	protected void initializeControls() {
-		// includeGlossary.setSelection(PublishingUIPreferences
-		// .getIncludeGlossary());
-		// includeIndex.setSelection(PublishingUIPreferences.getIncludeIndex());
-		// checkExternalLinks.setSelection(PublishingUIPreferences
-		// .getCheckExternalLinks());
-		// convertBrokenLinks.setSelection(PublishingUIPreferences
-		// .getConvertBrokenLinks());
-		// autoGenerateActivityDiagrams.setSelection(LibraryUIPreferences
-		// .getPublishUnopenActivitydd());
-		// publishUnOpenExtendActivityDiagram.setSelection(LibraryUIPreferences
-		// .getPublishADForActivityExtension());
-		// lightWeightTreeCtr.setSelection(PublishingUIPreferences
-		// .getLightWeightTree());
-		// extraDescriptorInfoCtr.setSelection(PublishingUIPreferences
-		// .getExtraDescriptorInfo());
-	}
-
-	public void onEnterPage(Object obj) {
-		super.onEnterPage(obj);
-		configName = (String) obj;
-		try {
-			String initPath = PublishingUIPreferences.getPublishPath(configName);
-			if (initPath == null || initPath.length() <= 0)
-				initPath = PublishingUIPreferences.getDefaultPublishPath();
-			destinationPathText.setText(initPath);
-			defaultPathCheckbox.setSelection(destinationPathText.getText().equals(
-					PublishingUIPreferences.getDefaultPublishPath()));
-			destinationPathText.setEnabled(!defaultPathCheckbox.getSelection());
-
-			if (!defaultPathCheckbox.getSelection()) {
-				browseButton.setEnabled(true);
-			}
-		} catch (Exception e) {
-		}
-		titleText.setText(PublishingUIPreferences.getTitle(configName));
-		bannerImageText.setText(PublishingUIPreferences.getBannerImage(configName));
-		aboutHTMLText.setText(PublishingUIPreferences.getAboutHTML(configName));
-		String feedbackURL = PublishingUIPreferences.getFeedbackURL(configName);
-		if (feedbackURL == null || feedbackURL.length() <= 0)
-			feedbackURL = PublishingUIPreferences.getDefaultFeedbackURL();
-		feedbackURLText.setText(feedbackURL);
-		defaultFeedbackCheckbox.setSelection(feedbackURLText.getText().equals(
-				PublishingUIPreferences.getDefaultFeedbackURL()));
-		feedbackURLText.setEnabled(!defaultFeedbackCheckbox.getSelection());
-		includeGlossary.setSelection(PublishingUIPreferences
-				.getIncludeGlossary(configName));
-		includeIndex.setSelection(PublishingUIPreferences.getIncludeIndex(configName));
-		
-//		createWARCheckBox.setSelection(PublishingUIPreferences.getIncludeSearch(configName));
-//		String webAppName = PublishingUIPreferences.getWebAppName(configName);
-//		if (webAppName != null && webAppName.length() > 0) {
-//			webAppNameText.setText(webAppName);
-//		}		
-//		webAppNameText.setEnabled(createWARCheckBox.getSelection());
-//
-//		includeSearch.setSelection(PublishingUIPreferences.getIncludeSearch(configName));
-		
-		checkExternalLinks.setSelection(PublishingUIPreferences
-				.getCheckExternalLinks(configName));
-		convertBrokenLinks.setSelection(PublishingUIPreferences
-				.getConvertBrokenLinks(configName));
-		autoGenerateActivityDiagrams.setSelection(PublishingUIPreferences
-				.getPublishUnopenActivitydd(configName));
-		publishUnOpenExtendActivityDiagram.setSelection(PublishingUIPreferences
-				.getPublishADForActivityExtension(configName));
-		lightWeightTreeCtr.setSelection(PublishingUIPreferences
-				.getLightWeightTree(configName));
-		extraDescriptorInfoCtr.setSelection(PublishingUIPreferences
-				.getExtraDescriptorInfo(configName));
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		if (!displayDestinationGroup) {
-			return true;
-		}
-
-		if (!isTextNonEmpty(destinationPathText)) {
-			setErrorMessage(PublishingUIResources.invalidPathError_msg); //$NON-NLS-1$
-			return false;
-		}
-
-		String path = destinationPathText.getText();
-		IPath ecPath = Path.fromOSString(path);
-		boolean isValid = ecPath.isValidPath(path);
-		if (!isValid) {
-			setErrorMessage(PublishingUIResources.invalidPathError_msg); //$NON-NLS-1$
-		} else if (!StrUtil.isValidPublishPath(path)) {
-			setErrorMessage(PublishingUIResources.invalidPathCharsError_msg); //$NON-NLS-1$
-		} else {
-			setErrorMessage(null);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		return null;
-	}
-
-	/**
-	 * Adds the listeners for the controls on this page.
-	 */
-	private void addListeners(final Composite composite) {
-		if (displayDestinationGroup) {
-			destinationPathText.addModifyListener(new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					setPageComplete(isPageComplete());
-				}
-			});
-
-			browseButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent event) {
-					try {
-						DirectoryDialog dd = new DirectoryDialog(composite.getShell(),
-								SWT.NONE);
-						String destination = dd.open();
-						if (destination != null) {
-							destinationPathText.setText(destination);
-						}
-					} catch (Exception e) {
-						e.printStackTrace();
-					}
-				}
-			});
-
-			defaultPathCheckbox.addListener(SWT.Selection, new Listener() {
-				public void handleEvent(Event event) {
-					if (defaultPathCheckbox.getSelection()) {
-						destinationPathText.setText(PublishingUIPreferences
-								.getDefaultPublishPath());
-						destinationPathText.setEnabled(false);
-						browseButton.setEnabled(false);
-					} else {
-						String initPath = PublishingUIPreferences
-								.getPublishPath(configName);
-						if (initPath == null || initPath.length() <= 0)
-							initPath = PublishingUIPreferences.getDefaultPublishPath();
-						destinationPathText.setText(initPath);
-						destinationPathText.setEnabled(true);
-						browseButton.setEnabled(true);
-					}
-				}
-			});
-		}
-
-//		createWARCheckBox.addListener(SWT.Selection, new Listener() {
-//			public void handleEvent(Event event) {
-//				webAppNameText.setEnabled(createWARCheckBox.getSelection());
-//			}
-//		});
-		
-		defaultFeedbackCheckbox.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (defaultFeedbackCheckbox.getSelection()) {
-					feedbackURLText.setText(PublishingUIPreferences
-							.getDefaultFeedbackURL());
-					feedbackURLText.setEnabled(false);
-				} else {
-					String initUrl = PublishingUIPreferences.getFeedbackURL(configName);
-					if (initUrl == null || initUrl.length() <= 0)
-						initUrl = PublishingUIPreferences.getDefaultFeedbackURL();
-					feedbackURLText.setText(initUrl);
-					feedbackURLText.setEnabled(true);
-				}
-			}
-		});
-
-		selectImageButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				try {
-					FileDialog dialog = new FileDialog(composite.getShell(), SWT.OPEN);
-					dialog
-							.setFilterExtensions(new String[] { "*.gif", "*.jpg", "*.bmp" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					String imageFile = dialog.open();
-					if (imageFile != null) {
-						bannerImageText.setText(imageFile);
-					}
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-
-		selectHTMLButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				try {
-					FileDialog dialog = new FileDialog(composite.getShell(), SWT.OPEN);
-					dialog.setFilterExtensions(new String[] { "*.htm", "*.html" }); //$NON-NLS-1$ //$NON-NLS-2$
-					String htmlFile = dialog.open();
-					if (htmlFile != null) {
-						aboutHTMLText.setText(htmlFile);
-					}
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#setVisible()
-	 */
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (visible) {
-			Display display = titleText.getDisplay();
-			if (!(display == null || display.isDisposed())) {
-				display.asyncExec(new Runnable() {
-					public void run() {
-						titleText.setFocus();
-					}
-				});
-			}
-		}
-	}
-
-	/**
-	 * Returns the publishing options.
-	 */
-	public PublishOptions getPublishingOptions() {
-		if (displayDestinationGroup) {
-			dataModel.setPublicationPath(destinationPathText.getText().trim());
-		}
-		dataModel.setTitle(titleText.getText().trim());
-		dataModel.setBannerImage(bannerImageText.getText().trim());
-		dataModel.aboutHTML = aboutHTMLText.getText().trim();
-		dataModel.feedbackURL = feedbackURLText.getText().trim();
-		dataModel.generateGlossary = includeGlossary.getSelection();
-		dataModel.generateIndex = includeIndex.getSelection();
-//		dataModel.generateSearchDB = includeSearch.getSelection();
-		dataModel.checkExtLinks = checkExternalLinks.getSelection();
-		dataModel.autoGenerateActivityDiagrams = autoGenerateActivityDiagrams
-				.getSelection();
-		dataModel.setUnopenExtendedActivityDiagram(publishUnOpenExtendActivityDiagram
-				.getSelection());
-		dataModel.convertBrokenLinks = convertBrokenLinks.getSelection();
-		dataModel.showExtraDescriptorInfo = extraDescriptorInfoCtr.getSelection();
-		dataModel.generateLightWeightTree = lightWeightTreeCtr.getSelection();
-		// dataModel.includeEmptyCategories =
-		// includeEmptyCategoriesCtr.getSelection();
-
-		return dataModel;
-	}
-
-//	public Composite getSearchComposite() {
-//		return searchComposite;
-//	}
-//	
-//	public Button getIncludeSearch() {
-//		return includeSearch;
-//	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishConfigSelectConfigPage.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishConfigSelectConfigPage.java
deleted file mode 100755
index 42ad339..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishConfigSelectConfigPage.java
+++ /dev/null
@@ -1,275 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.wizards;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.authoring.ui.AuthoringUIHelpContexts;
-import org.eclipse.epf.authoring.ui.AuthoringUIText;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.configuration.ConfigurationHelper;
-import org.eclipse.epf.library.ui.LibraryUIImages;
-import org.eclipse.epf.publishing.services.PublishOptions;
-import org.eclipse.epf.publishing.ui.PublishingUIResources;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.epf.uma.ContentCategory;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The Select Method Configuration page in the Publish Method Configuration
- * wizard.
- * 
- * @author Kelvin Low
- * @author Bingxue Xu
- * @author Jinhua Xi
- * @since 1.0
- */
-public class PublishConfigSelectConfigPage extends BaseWizardPage implements
-		ISelectionChangedListener, Listener {
-
-	private Table table;
-
-	private TableViewer tableViewer;
-
-	private Text ctrl_briefDesc;
-
-	private PublishOptions dataModel = null;
-
-	private List vwList;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PublishConfigSelectConfigPage(String pageName,
-			PublishOptions dataModel) {
-		super(pageName);
-		setTitle(PublishingUIResources.publishConfigWizard_selectConfigPage_title); //$NON-NLS-1$
-		setDescription(PublishingUIResources.publishConfigWizard_selectConfigPage_text); //$NON-NLS-1$
-		this.dataModel = dataModel;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		// Create the composite to hold the widgets.
-		Composite composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout(1, false));
-
-		createLabel(
-				composite,
-				PublishingUIResources.publishConfigWizard_methodConfig_text); //$NON-NLS-1$
-
-		table = new Table(composite, SWT.BORDER | SWT.V_SCROLL);
-		GridData gridData = new GridData(GridData.FILL_BOTH);
-		gridData.heightHint = 120;
-		gridData.widthHint = 280;
-		table.setLayoutData(gridData);
-
-		tableViewer = new TableViewer(table);
-		tableViewer.setLabelProvider(new ConfigurationTableLabelProvider());
-		tableViewer.setContentProvider(new ArrayContentProvider());
-		MethodConfiguration[] configs = LibraryServiceUtil
-				.getMethodConfigurations(LibraryService.getInstance()
-						.getCurrentMethodLibrary());
-		tableViewer.setInput(configs);
-
-		createLabel(composite, AuthoringUIText.DESCRIPTION_TEXT);
-
-		ctrl_briefDesc = createTextMulti(composite, "", 360, 80, 1); //$NON-NLS-1$
-
-		// Select the first config and display its brief description.
-		if (configs.length > 0) {
-			table.select(0);
-			setDisplayAttributes(configs[0]);
-		}
-
-		// TODO: Shouldn't this be the application shell image?
-		PublishConfigurationWizard wizard = (PublishConfigurationWizard) getWizard();
-		Shell shell = wizard.getContainer().getShell();
-		shell.setImage(LibraryUIImages.IMG_METHOD_CONFIGURATON);
-
-		tableViewer.addSelectionChangedListener(this);
-
-		setControl(composite);
-
-		PlatformUI
-				.getWorkbench()
-				.getHelpSystem()
-				.setHelp(
-						composite,
-						AuthoringUIHelpContexts.CONFIGURATION_PUBLISH_WIZARD_ALL_PAGES_CONTEXT);
-	}
-
-	/**
-	 * handle the selection change event
-	 * @param event SelectionChangedEvent
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		StructuredSelection selection = (StructuredSelection) event
-				.getSelection();
-		if (!selection.isEmpty()) {
-			Object[] configs = selection.toArray();
-			setDisplayAttributes((MethodConfiguration) configs[0]);
-		}
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	/**
-	 * handle the event
-	 * @param event Event
-	 */
-	public void handleEvent(Event event) {
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	private void setDisplayAttributes(MethodConfiguration config) {
-		ctrl_briefDesc.setText(config.getBriefDescription());
-	}
-
-	/**
-	 * get the next wizard page
-	 * 
-	 * @return IWizardPage
-	 */
-	public IWizardPage getNextPage() {
-		dataModel.publishConfiguration = true;
-		// IWizardPage page = super.getNextPage();
-
-		IWizardPage page = getWizard().getNextPage(this);
-		return page;
-	}
-
-	/**
-	 * check if the page is completed or not
-	 * 
-	 * @return boolean
-	 */
-	public boolean isPageComplete() {
-		if (getErrorMessage() != null)
-			return false;
-
-		int count = table.getSelectionCount();
-
-		if (count > 0) {
-			TableItem[] items = table.getSelection();
-			dataModel.setSelectedConfig(items[0].getText());
-			MethodConfiguration config = LibraryServiceUtil
-					.getMethodConfiguration(LibraryService.getInstance()
-							.getCurrentMethodLibrary(),
-							dataModel.selectedConfig);
-			vwList = null;
-			if (config != null) {
-				vwList = getValidViews(config);
-			}
-			
-			
-			if (vwList != null && vwList.size() > 0) {
-				setErrorMessage(null);
-				setMessage(null);
-				return true;
-			} else {
-				setErrorMessage(null);
-				setMessage(PublishingUIResources.missingViewError_msg, //$NON-NLS-1$
-						WizardPage.WARNING);
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	private List getValidViews(MethodConfiguration config) {
-		
-		String msg;
-		boolean valid;
-		StringBuffer message = new StringBuffer();
-		List views = new ArrayList();
-		for ( Iterator it = config.getProcessViews().iterator(); it.hasNext(); ) {
-			ContentCategory view = (ContentCategory)it.next();
-			if ( ConfigurationHelper.isContributor(view) ) {
-				msg = PublishingUIResources.bind(
-						PublishingUIResources.publishConfigWizard_selectConfigPage_invalid_view_contributor,
-						view.getPresentationName());
-				message.append(StrUtil.TAB).append(msg).append(StrUtil.LINE_BREAK);			
-			} else {
-				view = (ContentCategory)ConfigurationHelper.getCalculatedElement(view, config);
-				if ( view == null ) {
-					msg = PublishingUIResources.bind(
-							PublishingUIResources.publishConfigWizard_selectConfigPage_invalid_view_invalid,
-							view.getPresentationName());
-					message.append(StrUtil.TAB).append(msg).append(StrUtil.LINE_BREAK);			
-
-				} else if ( views.contains(view) ) {
-					msg = PublishingUIResources.bind(
-							PublishingUIResources.publishConfigWizard_selectConfigPage_invalid_view_sameview,
-							view.getPresentationName());
-					message.append(StrUtil.TAB).append(msg).append(StrUtil.LINE_BREAK);			
-
-				} else {
-					views.add(view);
-				} 
-			}	
-		}
-		
-		if ( message.length() > 0 ) {		
-			msg = PublishingUIResources.bind(
-					PublishingUIResources.publishConfigWizard_selectConfigPage_invalid_views,
-					config.getName());
-			message.insert(0, msg + StrUtil.LINE_BREAK + StrUtil.LINE_BREAK);			
-
-			ctrl_briefDesc.setText(message.toString());
-		}
-		
-		return views;
-	}
-	
-	class ConfigurationTableLabelProvider extends LabelProvider
-			implements ITableLabelProvider {
-
-		public Image getColumnImage(Object element, int index) {
-			return null;
-		}
-
-		public String getColumnText(Object element, int index) {
-			MethodConfiguration config = (MethodConfiguration) element;
-			return config.getName();
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishConfigSelectProcessPage.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishConfigSelectProcessPage.java
deleted file mode 100755
index 226c8f8..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishConfigSelectProcessPage.java
+++ /dev/null
@@ -1,451 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.wizards;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.configuration.ConfigurationHelper;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.publishing.services.PublishOptions;
-import org.eclipse.epf.publishing.ui.PublishingUIResources;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * The Select publishing proceses wizard.
- * 
- * @author Jinhua Xi
- * @since 1.0
- */
-public class PublishConfigSelectProcessPage extends BaseWizardPage implements
-		Listener {
-
-	private Button radio_entireConfig;
-
-	private Button radio_processes;
-
-	private Composite processContainer;
-
-	private Button includeBaseProcesses;
-	
-	// private List check_processes = new ArrayList();
-
-	Map checkBoxTpProcMap = new HashMap();
-
-	CheckboxTreeViewer procViewer;
-
-	private PublishOptions dataModel = null;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PublishConfigSelectProcessPage(String pageName,
-			PublishOptions dataModel) {
-		super(pageName);
-		setTitle(PublishingUIResources.PublishConfigSelectProcessPage_title); //$NON-NLS-1$
-		setDescription(PublishingUIResources.PublishConfigSelectProcessPage_text); //$NON-NLS-1$
-		this.dataModel = dataModel;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		// Create the composite to hold the widgets.
-		Composite composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout(1, false));
-
-		createLabel(
-				composite,
-				PublishingUIResources.PublishConfigSelectProcessPage_label_selectType); //$NON-NLS-1$
-
-		radio_entireConfig = createRadioButton(
-				composite,
-				PublishingUIResources.PublishConfigSelectProcessPage_label_type_config, 1, true); //$NON-NLS-1$
-
-		radio_processes = createRadioButton(
-				composite,
-				PublishingUIResources.PublishConfigSelectProcessPage_label_type_processes, 1, false); //$NON-NLS-1$
-
-		processContainer = new Composite(composite, SWT.NONE);
-		processContainer.setLayoutData(new GridData(GridData.FILL_BOTH
-				| GridData.GRAB_VERTICAL));
-		GridLayout layout = new GridLayout();
-		layout.marginLeft = 13;
-		processContainer.setLayout(layout);
-
-		createProcessContainer(processContainer);
-
-		radio_entireConfig.addListener(SWT.Selection, this);
-		radio_processes.addListener(SWT.Selection, this);
-
-		processContainer.setVisible(radio_processes.getSelection());
-
-		setControl(composite);
-		setPageComplete(true);
-	}
-
-	private void createProcessContainer(Composite parent) {
-		createTreeViewer(parent);
-		includeBaseProcesses = createCheckbox(parent, 
-				PublishingUIResources.PublishConfigSelectProcessPage_label_publish_base_processes); 
-		includeBaseProcesses.addListener(SWT.Selection, this);
-	}
-	
-	private void createTreeViewer(Composite parent) {
-		procViewer = new CheckboxTreeViewer(parent);
-		{
-			GridData gridData = new GridData(GridData.FILL_BOTH
-					| GridData.GRAB_HORIZONTAL);
-			gridData.heightHint = 300;
-			procViewer.getTree().setLayoutData(gridData);
-		}
-		procViewer.setContentProvider(new ProcessContentProvider());
-		procViewer.setLabelProvider(new ProcessLabelProvider());
-
-		procViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				boolean checked = event.getChecked();
-				updateCheckStates(event.getElement(), checked);
-				selectbaseProcesses();
-				
-				setPageComplete(isPageComplete());
-				getWizard().getContainer().updateButtons();
-
-			}
-		});
-
-		String selecedConfigName = dataModel.getSelectedConfig();
-		MethodConfiguration config = LibraryServiceUtil.getMethodConfiguration(
-				LibraryService.getInstance().getCurrentMethodLibrary(),
-				selecedConfigName);
-
-		procViewer.setInput(config);
-
-		procViewer.expandAll();
-	}
-
-	private void updateCheckStates(Object element, boolean checked) {
-
-		// Object element = event.getElement();
-
-		if (checked == true) {
-			ITreeContentProvider cp = (ITreeContentProvider) procViewer
-					.getContentProvider();
-			checkParent(cp, element);
-		} else
-			procViewer.setChecked(element, false);
-
-		selectionChildren(element, checked);
-
-	}
-
-	private void checkParent(ITreeContentProvider cp, Object element) {
-		// if (element == null ) {
-		// return;
-		// }
-		// Object parent = cp.getParent(element);
-		// if (parent != null) {
-		// procViewer.setChecked(parent, true);
-		// checkParent(cp, parent);
-		// }
-
-	}
-
-	private void selectionChildren(Object element, boolean checked) {
-		ITreeContentProvider cp = (ITreeContentProvider) procViewer
-				.getContentProvider();
-		Object[] childs = cp.getChildren(element);
-		for (int i = 0; i < childs.length; i++) {
-			procViewer.setChecked(childs[i], checked);
-			selectionChildren(childs[i], checked);
-		}
-	}
-
-	/**
-	 * handle the event
-	 * @param event Event
-	 */
-	public void handleEvent(Event event) {
-
-		if ( event.widget == includeBaseProcesses ) {
-			// if selected, alto select all base processes
-			selectbaseProcesses();
-		}
-
-		processContainer.setVisible(radio_processes.getSelection());
-
-		setPageComplete(isPageComplete());
-		getWizard().getContainer().updateButtons();
-	}
-
-	/**
-	 * get the next Wizard page
-	 * 
-	 * @return IWizardPage
-	 */
-	public IWizardPage getNextPage() {
-
-		return super.getNextPage();
-	}
-
-	/**
-	 * check if the page is completed or not
-	 * @return boolean
-	 */
-	public boolean isPageComplete() {
-		if (getErrorMessage() != null)
-			return false;
-
-		dataModel.publishProcess = false;
-		if (radio_entireConfig.getSelection()) {
-			dataModel.publishConfiguration = true;
-			return true;
-		} else {
-			List procs = getSelectedProcesses();
-
-			// for (int i = 0; i < check_processes.size(); i++) {
-			// Button b = (Button) check_processes.get(i);
-			// if (b.getSelection()) {
-			//
-			// // set the selections
-			// procs.add(checkBoxTpProcMap.get(b));
-			// }
-			// }
-
-//			Object[] selected = procViewer.getCheckedElements();
-//			if (selected != null && selected.length > 0) {
-//				for (int i = 0; i < selected.length; i++) {
-//					if (selected[i] instanceof org.eclipse.epf.uma.Process) {
-//						procs.add(selected[i]);
-//					}
-//				}
-//			}
-			if (procs.size() > 0) {
-				dataModel.publishProcess = true;
-				dataModel.publishConfiguration = false;
-				dataModel.setDeliverProcessList(procs);
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	private List getSelectedProcesses() {
-		List procs = new ArrayList();
-
-		Object[] selected = procViewer.getCheckedElements();
-		if (selected != null && selected.length > 0) {
-			for (int i = 0; i < selected.length; i++) {
-				if (selected[i] instanceof org.eclipse.epf.uma.Process) {
-					procs.add(selected[i]);
-				}
-			}
-		}
-		
-		return procs;
-	}
-	
-	private void selectbaseProcesses() {
-		if ( !includeBaseProcesses.getSelection() ) {
-			return;
-		}
-		
-		String selecedConfigName = dataModel.getSelectedConfig();
-		MethodConfiguration config = LibraryServiceUtil.getMethodConfiguration(
-				LibraryService.getInstance().getCurrentMethodLibrary(),
-				selecedConfigName);
-
-		List procs = getSelectedProcesses();
-		List bases = new ArrayList();
-		for (Iterator it = procs.iterator(); it.hasNext(); ) {
-			ConfigurationHelper.getBaseProcesses((Activity)it.next(), config, bases);
-		}
-		
-		// update the selections
-		for (Iterator it = bases.iterator(); it.hasNext(); ) {
-			Object element = it.next();
-			procViewer.setChecked(element, true);
-			updateCheckStates(element, true);
-		}		
-	}
-	
-	private class ProcessContentProvider implements ITreeContentProvider {
-
-		MethodConfiguration input = null;
-
-		String NODE_CP = PublishingUIResources.PublishConfigSelectProcessPage_label_capability_pattern; //$NON-NLS-1$
-
-		String NODE_DP = PublishingUIResources.PublishConfigSelectProcessPage_label_delivery_process; //$NON-NLS-1$
-
-		String[] DPCP_NODES = new String[] { NODE_CP, NODE_DP };
-
-		public Object[] getChildren(Object parentElement) {
-			if (parentElement instanceof MethodConfiguration) {
-				return DPCP_NODES;
-			} else if (NODE_CP.equals(parentElement.toString())
-					|| NODE_DP.equals(parentElement.toString())) {
-				return getPlugins(parentElement).toArray();
-			} else if (parentElement instanceof PluginNode) {
-				Object parent = ((PluginNode) parentElement).parent;
-				if (NODE_CP.equals(parent.toString())) {
-					return ConfigurationHelper.getAllCapabilityPatterns(
-							((PluginNode) parentElement).plugin, input)
-							.toArray();
-				} else if (NODE_DP.equals(parent.toString())) {
-					return ConfigurationHelper.getAllDeliveryProcesses(
-							((PluginNode) parentElement).plugin, input)
-							.toArray();
-				}
-			}
-
-			return new Object[] {};
-		}
-
-		public Object getParent(Object element) {
-			if (element instanceof String) {
-				return null;
-			} else if (element instanceof PluginNode) {
-				return ((PluginNode) element).parent;
-			} else if (element instanceof org.eclipse.epf.uma.Process) {
-				EObject o = (EObject) element;
-				while ((o != null) && !(o instanceof MethodPlugin)) {
-					o = o.eContainer();
-				}
-
-				return o;
-			}
-
-			return null;
-		}
-
-		public boolean hasChildren(Object element) {
-			if (element instanceof PluginNode || element instanceof String) {
-				return true;
-			} else {
-				return false;
-			}
-		}
-
-		public Object[] getElements(Object inputElement) {
-			return getChildren(inputElement);
-		}
-
-		public void dispose() {
-			pluginNodeMap.clear();
-			input = null;
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			if (newInput instanceof MethodConfiguration) {
-				input = (MethodConfiguration) newInput;
-			} else {
-				input = null;
-			}
-
-			pluginNodeMap.clear();
-		}
-
-		private List getPlugins(Object parent) {
-			List validItems = new ArrayList();
-			if (input != null) {
-				List plugins = input.getMethodPluginSelection();
-				for (Iterator it = plugins.iterator(); it.hasNext();) {
-					MethodPlugin plugin = (MethodPlugin) it.next();
-					List procs = null;
-					if (NODE_CP.equals(parent.toString())) {
-						procs = ConfigurationHelper.getAllCapabilityPatterns(
-								plugin, input);
-					} else if (NODE_DP.equals(parent.toString())) {
-						procs = ConfigurationHelper.getAllDeliveryProcesses(
-								plugin, input);
-					}
-
-					if (procs != null && procs.size() > 0) {
-						validItems.add(getPluginNode(parent, plugin));
-					}
-				}
-			}
-			return validItems;
-		}
-
-		Map pluginNodeMap = new HashMap();
-
-		private PluginNode getPluginNode(Object parent, MethodPlugin plugin) {
-			String key = parent.toString() + ":" + plugin.getName(); //$NON-NLS-1$
-			PluginNode node = (PluginNode) pluginNodeMap.get(key);
-			if (node == null) {
-				node = new PluginNode(parent, plugin);
-				pluginNodeMap.put(key, node);
-			}
-
-			return node;
-		}
-
-		class PluginNode {
-			Object parent;
-
-			MethodPlugin plugin;
-
-			public PluginNode(Object parent, MethodPlugin plugin) {
-				this.parent = parent;
-				this.plugin = plugin;
-			}
-
-			public String toString() {
-				return plugin.getName();
-			}
-		}
-	}
-
-	private class ProcessLabelProvider extends LabelProvider {
-
-		public Image getImage(Object element) {
-			return null;
-		}
-
-		public String getText(Object element) {
-			if (element instanceof org.eclipse.epf.uma.Process) {
-				// ((org.eclipse.epf.uma.Process)element).getPresentationName()
-				org.eclipse.epf.uma.Process proc = (org.eclipse.epf.uma.Process) element;
-				return TngUtil.getPresentationName(proc);
-			} else {
-				return (element == null) ? "" : element.toString(); //$NON-NLS-1$
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishConfigurationWizard.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishConfigurationWizard.java
deleted file mode 100755
index 5b9ba78..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishConfigurationWizard.java
+++ /dev/null
@@ -1,315 +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.publishing.wizards;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.LibraryServiceUtil;
-import org.eclipse.epf.library.configuration.ConfigurationHelper;
-import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
-import org.eclipse.epf.publishing.services.PublishOptions;
-import org.eclipse.epf.publishing.ui.PublishingUIPlugin;
-import org.eclipse.epf.publishing.ui.PublishingUIResources;
-import org.eclipse.epf.publishing.ui.preferences.PublishingUIPreferences;
-import org.eclipse.epf.ui.wizards.BaseWizardPage;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWizard;
-
-/**
- * The Publish Method Configuration wizard.
- * 
- * @author Kelvin Low
- * @author Bingxue Xu
- * @author Jinhua Xi
- * @since 1.0
- * fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=177654
- */
-public class PublishConfigurationWizard extends AbstractPublishWizard {
-
-	// The wizard pages.
-	protected PublishConfigSelectConfigPage selectConfigPage;
-
-	protected PublishConfigPublishOptionsPage publishOptionsPage;
-
-	private Map configProcesspageMap = new HashMap();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PublishConfigurationWizard() {
-		super();
-		setWindowTitle(PublishingUIResources.publishConfigWizard_title); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-	}
-
-	protected ImageDescriptor getImageDescriptor() {
-		return 	PublishingUIPlugin.getDefault()
-		.getImageDescriptor("full/wizban/PublishConfiguration.gif"); //$NON-NLS-1$
-
-	}
-	
-	/**
-	 * get the publish options
-	 * @return PublishOptions
-	 */
-	public PublishOptions getPublishOptions() {
-		if ( super.dataModel == null ) {
-			super.dataModel = new PublishOptions();
-		}
-		
-		return super.dataModel;
-	}
-	
-	/**
-	 * @see org.eclipse.jface.wizard.addPages()
-	 */
-	public void addPages() {
-		ImageDescriptor imageDescriptor = getImageDescriptor();
-
-		selectConfigPage = new PublishConfigSelectConfigPage(
-				"PublishConfigSelectOverviewPage", dataModel); //$NON-NLS-1$
-		selectConfigPage.setImageDescriptor(imageDescriptor);
-		addPage(selectConfigPage);
-
-		publishOptionsPage = new PublishConfigPublishOptionsPage(
-				"PublishConfigPublishOptionsPage", dataModel); //$NON-NLS-1$
-		publishOptionsPage.setImageDescriptor(imageDescriptor);
-		addPage(publishOptionsPage);
-	}
-
-	/**
-	 * get the select process vizwrd page
-	 * 
-	 * @param configName String the configuration name
-	 * 
-	 * @return IWizardPage
-	 */
-	public IWizardPage getSelProcessPage(String configName) {
-
-		PublishConfigSelectProcessPage selectProcessPage = (PublishConfigSelectProcessPage) configProcesspageMap
-				.get(configName);
-
-		if (selectProcessPage == null) {
-			ImageDescriptor imageDescriptor = PublishingUIPlugin.getDefault()
-					.getImageDescriptor("full/wizban/PublishConfiguration.gif"); //$NON-NLS-1$
-
-			selectProcessPage = new PublishConfigSelectProcessPage(
-					"PublishConfigSelectProcessPage", dataModel); //$NON-NLS-1$
-			selectConfigPage.setImageDescriptor(imageDescriptor);
-			addPage(selectProcessPage);
-
-			configProcesspageMap.put(configName, selectProcessPage);
-		}
-
-		return selectProcessPage;
-	}
-
-	/**
-	 * get the next page for the given page
-	 * @param page IWizardPage
-	 * @return IWizardPage
-	 */
-	public IWizardPage getNextPage(IWizardPage page) {
-		if (page == selectConfigPage) {
-			if (dataModel.getSelectedConfig() != null) {
-				String configName = dataModel.getSelectedConfig();
-				MethodConfiguration config = LibraryServiceUtil
-						.getMethodConfiguration(LibraryService.getInstance()
-								.getCurrentMethodLibrary(), configName);
-				List procs = ConfigurationHelper.getAllProcesses(config);
-				if (procs != null && procs.size() > 0) {
-					return getSelProcessPage(configName);
-				} else {
-					((BaseWizardPage)publishOptionsPage).onEnterPage(
-							super.dataModel.getSelectedConfig());
-					return publishOptionsPage;
-				}
-			} else
-				return null;
-		} else if (page == publishOptionsPage) {
-			return null;
-		} else {
-			((BaseWizardPage)publishOptionsPage).onEnterPage(
-					super.dataModel.getSelectedConfig());
-			return publishOptionsPage;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#canFinish()
-	 */
-	public boolean canFinish() {
-		return (this.getContainer().getCurrentPage() == publishOptionsPage && publishOptionsPage
-				.isPageComplete());
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		dataModel = publishOptionsPage.getPublishingOptions();
-		boolean answer = checkAndCreateDir(dataModel.publicationPath);
-		if (answer) {
-			dataModel.setFinishPressed(true);
-			PublishingUIPreferences.setPublishPath(dataModel.getSelectedConfig(),dataModel
-					.getPublicationPath());
-			PublishingUIPreferences.setTitle(dataModel.getSelectedConfig(),dataModel.getTitle());
-			PublishingUIPreferences.setBannerImage(dataModel.getSelectedConfig(),dataModel.getBannerImage());
-			PublishingUIPreferences.setAboutHTML(dataModel.getSelectedConfig(),dataModel.getAboutHTML());
-			PublishingUIPreferences.setFeedbackURL(dataModel.getSelectedConfig(),dataModel.getFeedbackURL());
-			PublishingUIPreferences.setIncludeGlossary(dataModel.getSelectedConfig(),dataModel
-					.isGenerateGlossary());
-			PublishingUIPreferences
-					.setIncludeIndex(dataModel.getSelectedConfig(),dataModel.isGenerateIndex());
-//			PublishingUIPreferences.setIncludeSearch(dataModel
-//					.isGenerateSearchDB());
-//			PublishingUIPreferences.setIncludeProcessCustomization(dataModel
-//					.isUseApplet());
-			PublishingUIPreferences.setCheckExternalLinks(dataModel.getSelectedConfig(),dataModel
-					.isCheckExtLinks());
-			PublishingUIPreferences.setConvertBrokenLinks(dataModel.getSelectedConfig(),dataModel.isConvertBrokenLinks());
-			PublishingUIPreferences.setLightWeightTree(dataModel.getSelectedConfig(),dataModel.isGenerateLightWeightTree());
-			PublishingUIPreferences.setExtraDescriptorInfo(dataModel.getSelectedConfig(),dataModel.isShowExtraDescriptorInfo());
-			
-			PublishingUIPreferences.setPublishUnopenActivitydd(dataModel.getSelectedConfig(), 
-					dataModel.isAutoGenerateActivityDiagrams());
-			PublishingUIPreferences.setPublishADForActivityExtension(dataModel.getSelectedConfig(), 
-					dataModel.isUnopenExtendedActivityDiagram());
-			
-			PublishingUIPreferences.saveAllPreferences();
-			LibraryUIPreferences.saveAllPreferences();
-			
-			return true;
-		}
-		dataModel.setFinishPressed(false);
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performCancel()
-	 */
-	public boolean performCancel() {
-		dataModel.setFinishPressed(false);
-		return true;
-	}
-
-	/**
-	 * Checks and creates the destination path.
-	 */
-	protected boolean checkAndCreateDir(String dir) {
-		String defaultPublishPath = PublishingUIPreferences
-				.getDefaultPublishPath();
-		boolean answer = false;
-
-		IPath ecPath = Path.fromOSString(dir);
-		if (!ecPath.isAbsolute()) {
-			String path = defaultPublishPath
-					+ System.getProperty("file.separator") + dir; //$NON-NLS-1$
-			answer = PublishingUIPlugin
-					.getDefault()
-					.getMsgDialog()
-					.displayPrompt(
-							PublishingUIResources.publishConfigDialog_title, //$NON-NLS-1$
-							PublishingUIResources.bind(PublishingUIResources.confirmPathDialog_text, path)); //$NON-NLS-1$
-
-			if (answer) {
-				dataModel.setPublicationPath(dir);
-			} else {
-				return false;
-			}
-		}
-
-		File file = new File(dir);
-
-		if (file.exists()) {
-			File[] files = file.listFiles();
-			if (files != null && files.length > 0) {
-				answer = PublishingUIPlugin
-						.getDefault()
-						.getMsgDialog()
-						.displayConfirmation(
-								PublishingUIResources.publishConfigDialog_title, //$NON-NLS-1$
-								PublishingUIResources.bind(PublishingUIResources.overwriteDialog_text, dir)); //$NON-NLS-1$
-
-				if (answer == true) {
-					try {
-						answer = FileUtil
-								.deleteAllFiles(file.getAbsolutePath());
-						if (answer == false) {
-							PublishingUIPlugin
-									.getDefault()
-									.getMsgDialog()
-									.displayError(
-											PublishingUIResources.publishConfigDialog_title, //$NON-NLS-1$
-											PublishingUIResources.cannotPublishError_msg, //$NON-NLS-1$							
-											PublishingUIResources.bind(PublishingUIResources.deleteFilesError_reason, dir)); //$NON-NLS-1$
-							return false;
-
-						}
-					} catch (Exception e) {
-						PublishingUIPlugin
-								.getDefault()
-								.getMsgDialog()
-								.displayError(
-										PublishingUIResources.publishConfigDialog_title, //$NON-NLS-1$
-										PublishingUIResources.cannotPublishError_msg, //$NON-NLS-1$							
-										PublishingUIResources.bind(PublishingUIResources.deleteFilesError_reason, dir), e); //$NON-NLS-1$
-						return false;
-					}
-				}
-			} else {
-				return true;
-			}
-		} else {
-			try {
-				answer = file.mkdirs();
-			} catch (Exception e) {
-				PublishingUIPlugin
-						.getDefault()
-						.getMsgDialog()
-						.displayError(
-								PublishingUIResources.publishConfigDialog_title, //$NON-NLS-1$
-								PublishingUIResources.cannotPublishError_msg, //$NON-NLS-1$
-								PublishingUIResources.bind(PublishingUIResources.createDirError_reason, file.getAbsolutePath()), e); //$NON-NLS-1$
-				return false;
-			}
-			if (!answer) {
-				PublishingUIPlugin
-						.getDefault()
-						.getMsgDialog()
-						.displayError(
-								PublishingUIResources.publishConfigDialog_title, //$NON-NLS-1$
-								PublishingUIResources.cannotPublishError_msg, //$NON-NLS-1$
-								PublishingUIResources.bind(PublishingUIResources.createDirError_reason, file.getAbsolutePath())); //$NON-NLS-1$
-				return false;
-			}
-		}
-
-		return answer;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishProgressMonitorDialog.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishProgressMonitorDialog.java
deleted file mode 100755
index 4fb40d9..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishProgressMonitorDialog.java
+++ /dev/null
@@ -1,88 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.wizards;
-
-import java.io.File;
-
-import org.eclipse.epf.authoring.gef.viewer.ActivityDiagramService;
-import org.eclipse.epf.authoring.gef.viewer.NewActivityDiagramService;
-import org.eclipse.epf.authoring.ui.AuthoringUIPlugin;
-import org.eclipse.epf.library.layout.ElementLayoutManager;
-import org.eclipse.epf.publishing.services.AbstractViewBuilder;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The publish configuration progress dialog.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class PublishProgressMonitorDialog extends ProgressMonitorDialog {
-
-	private Composite diagramViewerHolder;
-
-	private AbstractViewBuilder viewBuilder;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PublishProgressMonitorDialog(Shell parent,
-			AbstractViewBuilder viewBuilder) {
-		super(parent);
-		this.viewBuilder = viewBuilder;
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Control ctrl = super.createDialogArea(parent);
-
-		if (viewBuilder != null) {
-			// Create the diagram viewer holder and the diagram service.
-			diagramViewerHolder = new Composite(parent, SWT.NONE);
-			diagramViewerHolder.setLayoutData(new GridData(1, 1));
-			diagramViewerHolder.setLayout(new GridLayout());
-			diagramViewerHolder.setVisible(false);
-
-			ElementLayoutManager layoutMgr = viewBuilder.getLayoutMgr();
-			String newDiagrams = AuthoringUIPlugin.getDefault().getPreferenceStore().getString("PUBLISH_NEW_DIAGRAM");
-			Boolean newDiagram = new Boolean(newDiagrams);
-			if (newDiagram.booleanValue()) {
-				NewActivityDiagramService diagramService = new NewActivityDiagramService(
-						diagramViewerHolder,
-						new File(layoutMgr.getPublishDir()));
-				diagramService.setPublishedUnCreatedADD(viewBuilder
-						.getOptions().isAutoGenerateActivityDiagrams());
-				diagramService.setPublishADForActivityExtension(viewBuilder
-						.getOptions().isUnopenExtendedActivityDiagram());
-				layoutMgr.setActivityDiagramService(diagramService);
-			} else {
-				ActivityDiagramService diagramService = new ActivityDiagramService(
-						diagramViewerHolder,
-						new File(layoutMgr.getPublishDir()));
-				diagramService.setPublishedUnCreatedADD(viewBuilder
-						.getOptions().isAutoGenerateActivityDiagrams());
-				diagramService.setPublishADForActivityExtension(viewBuilder
-						.getOptions().isUnopenExtendedActivityDiagram());
-				layoutMgr.setActivityDiagramService(diagramService);
-			}
-		}
-
-		return ctrl;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishingOperation.java b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishingOperation.java
deleted file mode 100755
index 8838a76..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/PublishingOperation.java
+++ /dev/null
@@ -1,212 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.publishing.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.epf.common.serviceability.MsgDialog;
-import org.eclipse.epf.library.services.SafeUpdateController;
-import org.eclipse.epf.publishing.PublishingResources;
-import org.eclipse.epf.publishing.services.AbstractPublishManager;
-import org.eclipse.epf.publishing.services.AbstractViewBuilder;
-import org.eclipse.epf.publishing.ui.PublishingUIPlugin;
-import org.eclipse.epf.publishing.ui.PublishingUIResources;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Performs the real work of publishing a Method Configuration.
- * 
- * @author Jinhua Xi
- * @author Kelvin Low
- * @since 1.0
- */
-public class PublishingOperation implements IRunnableWithProgress {
-
-	private static final String PUBLISH_CONFIG_ERROR_TITLE = PublishingUIResources.publishConfigDialog_title; //$NON-NLS-1$
-
-	private static final String PUBLISH_CONFIG_ERROR_MSG = PublishingUIResources.publishConfigError_msg; //$NON-NLS-1$
-
-	private static final String PUBLISH_CONFIG_ERROR_REASON = PublishingUIResources.publishConfigError_reason; //$NON-NLS-1$
-
-	private static final String PREVIEW_CONFIG_ERROR_TITLE = PublishingUIResources.previewConfigError_title; //$NON-NLS-1$
-
-	private static final String PREVIEW_CONFIG_ERROR_MSG = PublishingUIResources.previewConfigError_msg; //$NON-NLS-1$
-
-	private static final String VIEW_REPORT_ERROR_TITLE = PublishingUIResources.viewReportError_title; //$NON-NLS-1$
-
-	private static final String VIEW_REPORT_ERROR_MSG = PublishingUIResources.viewReportError_msg; //$NON-NLS-1$	
-
-	private static final String OPEN_BROWSER_ERROR_REASON = PublishingUIResources.openBrowserError_reason; //$NON-NLS-1$
-
-	private static final String PUBLISH_CONFIG_CANCEL_MSG = PublishingUIResources.cancelPublishConfig_msg; //$NON-NLS-1$
-
-	private AbstractPublishManager publishMgr;
-
-	private String published_url;
-
-	private String report_url;
-
-	private MsgDialog msgDialog;
-
-	private Exception runException;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PublishingOperation(AbstractPublishManager publishMgr) {
-		super();
-		this.publishMgr = publishMgr;
-		this.msgDialog = PublishingUIPlugin.getDefault().getMsgDialog();
-	}
-
-	/**
-	 * get the view builder.
-	 * 
-	 * @return AbstractViewBuilder
-	 */
-	public AbstractViewBuilder getViewBuilder() {
-		return this.publishMgr.getViewBuilder();
-	}
-
-	/**
-	 * get the url for the published site
-	 * 
-	 * @return String
-	 */
-	public String getPublishedUrl() {
-		return published_url;
-	}
-
-	/**
-	 * run the operation to perform the publishing task.
-	 * @param monitor IProgressMonitor
-	 * @throws InvocationTargetException
-	 */
-	public void run(IProgressMonitor monitor) throws InvocationTargetException,
-			InterruptedException {
-		runException = null;
-		try {
-			monitor.setTaskName(PublishingResources.publishingConfigurationTask_name); //$NON-NLS-1$			
-			publishMgr.publish(monitor);
-
-			published_url = publishMgr.getPublishedUrl();
-			report_url = publishMgr.getPublishReportUrl();
-		} catch (Exception e) {
-			runException = e;
-		}
-
-		final boolean canceled = monitor.isCanceled();
-
-		SafeUpdateController.syncExec(new Runnable() {
-			public void run() {
-				if (canceled) {
-					msgDialog.displayInfo(PUBLISH_CONFIG_ERROR_TITLE,
-							PUBLISH_CONFIG_CANCEL_MSG);
-					return;
-				}
-
-				if (published_url == null || report_url == null) {
-					msgDialog.displayError(PUBLISH_CONFIG_ERROR_TITLE,
-							PUBLISH_CONFIG_ERROR_MSG,
-							PUBLISH_CONFIG_ERROR_REASON, runException);
-					return;
-				}
-
-				// Launch a HTML browser to view the published site.
-				if (openBrowser(published_url) == false) {
-					String reason = MessageFormat.format(
-							OPEN_BROWSER_ERROR_REASON,
-							new Object[] { published_url });
-					msgDialog.displayError(PREVIEW_CONFIG_ERROR_TITLE,
-							PREVIEW_CONFIG_ERROR_MSG, reason);
-				}
-
-				// Launch a HTML browser to view the report on the published
-				// site.
-				if (openBrowser(report_url) == false) {
-					String reason = MessageFormat.format(
-							OPEN_BROWSER_ERROR_REASON,
-							new Object[] { report_url });
-					msgDialog.displayError(VIEW_REPORT_ERROR_TITLE,
-							VIEW_REPORT_ERROR_MSG, reason);
-				}
-			}
-		});
-	}
-
-	/**
-	 * open a browser to show the published content.
-	 * @param url String the site url
-	 * @return boolean true if browser opened successfully.
-	 */
-	public boolean openBrowser(final String url) {
-		boolean success = false;
-		try {
-			// Launch the default HTML viewer to display the HTML page.
-			// On Linux, this can't launch urls, only local files can be
-			// launched.
-			// Sorry I have use internal class here.
-			// hope Eclipse.org can have a public api to do so.
-			if (SWT.getPlatform().equals("win32")) { //$NON-NLS-1$
-				success = Program.launch(url);
-			} else {
-//				IBrowser browser = org.eclipse.help.internal.browser.BrowserManager
-//						.getInstance().createBrowser(true);
-//				if (browser == null) {
-//					try {
-//						browser.displayURL(url);
-//						success = true;
-//					} catch (Exception e) {
-//						e.printStackTrace();
-//					}
-//				}
-				
-				// 155490 - Cannot detected default browser when preview published configuration on Linux
-				// changed to use swt browser
-				success = true;
-				Display.getCurrent().asyncExec(new Runnable()
-				{
-				    public void run()
-					{
-//							// open another swt browser since we have no (simple) way of creating a system default browser
-//							// the Eclipse guys hide all the good apis as internal
-							Shell shell = new Shell();
-							shell.setText(url);
-							GridLayout layout = new GridLayout();
-							layout.marginHeight = 0;
-							layout.marginWidth = 0;
-							shell.setLayout(layout);
-							Browser popup_browser = new Browser(shell, SWT.NONE);
-							popup_browser.setLayoutData(new GridData(GridData.FILL_BOTH|GridData.GRAB_HORIZONTAL|GridData.GRAB_VERTICAL));
-							popup_browser.setUrl(url);														
-							shell.open();
-					}
-				});			
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-			success = false;
-		}
-
-		return success;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/package.html b/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/package.html
deleted file mode 100755
index 8fc8489..0000000
--- a/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/wizards/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides wizards for publishing a method configuration and process.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.rcp/.classpath b/plugins/org.eclipse.epf.rcp/.classpath
deleted file mode 100755
index ddf0f40..0000000
--- a/plugins/org.eclipse.epf.rcp/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.rcp/.cvsignore b/plugins/org.eclipse.epf.rcp/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.rcp/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.rcp/.project b/plugins/org.eclipse.epf.rcp/.project
deleted file mode 100755
index 245183a..0000000
--- a/plugins/org.eclipse.epf.rcp/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.rcp</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<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>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.epf.rcp/about.html b/plugins/org.eclipse.epf.rcp/about.html
deleted file mode 100755
index 4c99086..0000000
--- a/plugins/org.eclipse.epf.rcp/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.rcp/about.ini b/plugins/org.eclipse.epf.rcp/about.ini
deleted file mode 100755
index 604f4fa..0000000
--- a/plugins/org.eclipse.epf.rcp/about.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright (c) 2004, 2005 IBM Corporation.  All Rights Reserved.
-#-------------------------------------------------------------------------------
-
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%featureText
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=application_32.gif
-
-# Property "appName" contains name of the application (translated)
-appName=%featureName
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-welcomePage=$nl$/welcome.xml
diff --git a/plugins/org.eclipse.epf.rcp/about.mappings b/plugins/org.eclipse.epf.rcp/about.mappings
deleted file mode 100755
index aca952e..0000000
--- a/plugins/org.eclipse.epf.rcp/about.mappings
+++ /dev/null
@@ -1,8 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-# Usually generated at build time.
-
-0=@buildId@
-1=1.2.0
diff --git a/plugins/org.eclipse.epf.rcp/about.properties b/plugins/org.eclipse.epf.rcp/about.properties
deleted file mode 100755
index 5529093..0000000
--- a/plugins/org.eclipse.epf.rcp/about.properties
+++ /dev/null
@@ -1,39 +0,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
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-featureName=EPF RCP
-
-featureText=EPF RCP\n\
-\n\
-Version: {1} \n\
-Build Label: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2004, 2007.  All Rights Reserved.\n\
-\n\
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.epf.rcp/application_32.gif b/plugins/org.eclipse.epf.rcp/application_32.gif
deleted file mode 100755
index e6ad7cc..0000000
--- a/plugins/org.eclipse.epf.rcp/application_32.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.rcp/build.properties b/plugins/org.eclipse.epf.rcp/build.properties
deleted file mode 100755
index 5ccec53..0000000
--- a/plugins/org.eclipse.epf.rcp/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = .,\
-               META-INF/,\
-               about.html,\
-               about.ini,\
-               about.properties,\
-               application_32.gif,\
-               welcome.xml,\
-               plugin.properties,\
-               about.mappings
diff --git a/plugins/org.eclipse.epf.rcp/plugin.properties b/plugins/org.eclipse.epf.rcp/plugin.properties
deleted file mode 100755
index eb9fe1d..0000000
--- a/plugins/org.eclipse.epf.rcp/plugin.properties
+++ /dev/null
@@ -1,16 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-featurePluginName=EPF RCP Feature
-featurePluginNameNL=EPF RCP Feature (NL1)
-providerName=Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.rcp/welcome.xml b/plugins/org.eclipse.epf.rcp/welcome.xml
deleted file mode 100755
index b640d04..0000000
--- a/plugins/org.eclipse.epf.rcp/welcome.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
-    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
--->
-<welcomePage 
-	title="Eclipse Process Framework">
-
-<intro>Welcome to Eclipse Process Framework
-</intro>
-
-<item><b>What is Eclipse Process Framework?</b>
-	
-</item>
-
-<item><b>Learn More</b>
-
-</item>
-
-</welcomePage>
diff --git a/plugins/org.eclipse.epf.richtext/.classpath b/plugins/org.eclipse.epf.richtext/.classpath
deleted file mode 100755
index 8c4f20f..0000000
--- a/plugins/org.eclipse.epf.richtext/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.richtext/.cvsignore b/plugins/org.eclipse.epf.richtext/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.richtext/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.richtext/.options b/plugins/org.eclipse.epf.richtext/.options
deleted file mode 100755
index 90dd897..0000000
--- a/plugins/org.eclipse.epf.richtext/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-# Turn on debug trace for the Rich Text plug-in
-org.eclipse.epf.richtext/debug=true
diff --git a/plugins/org.eclipse.epf.richtext/.project b/plugins/org.eclipse.epf.richtext/.project
deleted file mode 100755
index 4b79a77..0000000
--- a/plugins/org.eclipse.epf.richtext/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.richtext</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/plugins/org.eclipse.epf.richtext/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.richtext/META-INF/MANIFEST.MF
deleted file mode 100755
index 079d590..0000000
--- a/plugins/org.eclipse.epf.richtext/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.richtext
-Bundle-Version: 1.2.0.qualifier
-Bundle-ClassPath: richtext.jar
-Bundle-Activator: org.eclipse.epf.richtext.RichTextPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.epf.common,
- org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.ui.forms
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.richtext,
- org.eclipse.epf.richtext.actions,
- org.eclipse.epf.richtext.dialogs,
- org.eclipse.epf.richtext.html,
- org.eclipse.epf.richtext.preferences
diff --git a/plugins/org.eclipse.epf.richtext/build.properties b/plugins/org.eclipse.epf.richtext/build.properties
deleted file mode 100755
index cffbf8f..0000000
--- a/plugins/org.eclipse.epf.richtext/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.richtext.jar = src/
-output.richtext.jar = bin/
-bin.includes = richtext.jar,\
-               icons/,\
-               META-INF/,\
-               rte/,\
-               plugin.xml,\
-               plugin.properties,\
-               .options
-
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/AddImage.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/AddImage.gif
deleted file mode 100755
index 4308a8a..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/AddImage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/AddLink.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/AddLink.gif
deleted file mode 100755
index 7b11196..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/AddLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/AddOrderedList.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/AddOrderedList.gif
deleted file mode 100755
index f9ae415..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/AddOrderedList.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/AddTable.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/AddTable.gif
deleted file mode 100755
index 2088462..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/AddTable.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/AddUnorderedList.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/AddUnorderedList.gif
deleted file mode 100755
index 9c44ec6..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/AddUnorderedList.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Bold.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Bold.gif
deleted file mode 100755
index 2dc5987..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Bold.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/ClearContent.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/ClearContent.gif
deleted file mode 100755
index 9ff6416..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/ClearContent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Copy.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Copy.gif
deleted file mode 100755
index e9bc65e..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Copy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Cut.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Cut.gif
deleted file mode 100755
index bd43144..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Cut.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/FindReplace.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/FindReplace.gif
deleted file mode 100755
index c8f8871..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/FindReplace.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Indent.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Indent.gif
deleted file mode 100755
index 436e153..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Indent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Italic.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Italic.gif
deleted file mode 100755
index c9b5a44..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Italic.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Outdent.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Outdent.gif
deleted file mode 100755
index edcda3e..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Outdent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Paste.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Paste.gif
deleted file mode 100755
index 1c7668d..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Paste.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Subscript.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Subscript.gif
deleted file mode 100755
index a7b31aa..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Subscript.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Superscript.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Superscript.gif
deleted file mode 100755
index e4b266c..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Superscript.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Underline.gif b/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Underline.gif
deleted file mode 100755
index e2a9646..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/dtool16/Underline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddImage.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddImage.gif
deleted file mode 100755
index 0545213..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddImage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddLine.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddLine.gif
deleted file mode 100755
index 7f08dcf..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddLine.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddLink.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddLink.gif
deleted file mode 100755
index e99194a..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddOrderedList.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddOrderedList.gif
deleted file mode 100755
index b6814c1..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddOrderedList.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddTable.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddTable.gif
deleted file mode 100755
index d368859..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddTable.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddUnorderedList.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddUnorderedList.gif
deleted file mode 100755
index a4fdfc9..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/AddUnorderedList.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Bold.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/Bold.gif
deleted file mode 100755
index 00df9e5..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Bold.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/ClearContent.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/ClearContent.gif
deleted file mode 100755
index 2558326..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/ClearContent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Copy.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/Copy.gif
deleted file mode 100755
index f32acee..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Copy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Cut.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/Cut.gif
deleted file mode 100755
index 7e8635c..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Cut.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/FindReplace.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/FindReplace.gif
deleted file mode 100755
index 11257ec..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/FindReplace.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Indent.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/Indent.gif
deleted file mode 100755
index 78195d0..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Indent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Italic.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/Italic.gif
deleted file mode 100755
index ad0cd11..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Italic.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/JustifyCenter.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/JustifyCenter.gif
deleted file mode 100755
index eeabf05..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/JustifyCenter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/JustifyFull.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/JustifyFull.gif
deleted file mode 100755
index a90a3b8..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/JustifyFull.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/JustifyLeft.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/JustifyLeft.gif
deleted file mode 100755
index e85469b..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/JustifyLeft.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/JustifyRight.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/JustifyRight.gif
deleted file mode 100755
index 0005af1..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/JustifyRight.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Outdent.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/Outdent.gif
deleted file mode 100755
index 406b94f..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Outdent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Paste.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/Paste.gif
deleted file mode 100755
index 94d39a1..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Paste.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/StrikeThrough.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/StrikeThrough.gif
deleted file mode 100755
index a103545..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/StrikeThrough.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Subscript.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/Subscript.gif
deleted file mode 100755
index 1c0f713..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Subscript.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Superscript.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/Superscript.gif
deleted file mode 100755
index 3286634..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Superscript.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Underline.gif b/plugins/org.eclipse.epf.richtext/icons/full/etool16/Underline.gif
deleted file mode 100755
index e6476d6..0000000
--- a/plugins/org.eclipse.epf.richtext/icons/full/etool16/Underline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.richtext/plugin.properties b/plugins/org.eclipse.epf.richtext/plugin.properties
deleted file mode 100755
index 937326c..0000000
--- a/plugins/org.eclipse.epf.richtext/plugin.properties
+++ /dev/null
@@ -1,24 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Rich Text
-providerName=Eclipse.org
-
-################################################################################
-# THE FOLLOWING PROPERTIES SHOULD NOT BE TRANSLATED!!!
-################################################################################
-
-# The HTML file used to render the Rich Text Editor.
-RichText.editorHTML=rte.htm
-
-
diff --git a/plugins/org.eclipse.epf.richtext/plugin.xml b/plugins/org.eclipse.epf.richtext/plugin.xml
deleted file mode 100755
index 8e49b52..0000000
--- a/plugins/org.eclipse.epf.richtext/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-</plugin>
diff --git a/plugins/org.eclipse.epf.richtext/rte/blank.htm b/plugins/org.eclipse.epf.richtext/rte/blank.htm
deleted file mode 100755
index 7d9727a..0000000
--- a/plugins/org.eclipse.epf.richtext/rte/blank.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
-<head>
-	<title></title>
-</head>
-<body>
-</body>
-</html>
diff --git a/plugins/org.eclipse.epf.richtext/rte/rte.css b/plugins/org.eclipse.epf.richtext/rte/rte.css
deleted file mode 100755
index f288df1..0000000
--- a/plugins/org.eclipse.epf.richtext/rte/rte.css
+++ /dev/null
@@ -1,517 +0,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
- */
-
-body
-{
-	background-image: none;
-	background-color: #ffffff;
- 	font-family: arial, helvetica, sans-serif;
- 	font-size: 10pt;
-	margin: 3px;
-	padding: 0px; 	
-}
-
-p
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-}
-
-h1
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: large;
-}
-
-h2
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 150%;
-}
-
-h3
-{
-	font-family: arial, helvetica, sans-serif;
-}
-
-h4, h5, h6
-{
-	font-family: arial, helvetica, sans-serif;
-}
-
-a:link
-{
-	color: #003399;
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	text-decoration: none;
-}
-
-a:active
-{
-	color: #003399;
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	text-decoration: underline;
-}
-
-a:visited
-{
-	color: #003399;
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	text-decoration: none;
-}
-
-a:hover
-{
-	color: #ff0000;
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	text-decoration: underline;
-}
-
-ol
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	list-style-type: decimal;
-	margin-left: 30px;
-}
-
-ol li
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	text-align: left
-}
-
-ul
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	list-style-type: disc;
-	margin-left: 30px;
-	margin-top: 5px;
-}
-
-ul li
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	text-align: left;
-}
-
-table
-{
-	background-image: none;
-	background: #ffffff;
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;	
-}
-
-tbody
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	valign: baseline;
-}
-
-th
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	text-align: left;
-}
-
-td
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-}
-
-td ul
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	margin-bottom: 0px;
-	margin-left: 30px;
-}
-
-.pageTitle
-{
-	background: #9999cc;
-	color: #ffffff;
-	font-size: 12pt;
-	font-weight: bold;
-	padding-bottom: 5px;
-	padding-left: 10px;
-	padding-right: 10px;
-	padding-top: 5px;
-	text-align: left;
-}
-
-.pageTitleSeparator
-{
-	background-color: #000000;
-	padding: 0px;
-}
-
-.tab
-{
-	background-color: #5c81a7;
-	color: #ffffff;
-	font-family: verdana, arial, sans-serif; 
-	font-size: 11px;
-	font-weight: bold;
-}
-
-.activeTab
-{
-	background-color: #c8d7e3;
-	color: #293d6b;	
-	font-family: verdana, arial, sans-serif; 
-	font-size: 11px;
-	font-weight: bold;
-}
-
-a.tab:link, a.tab:active, a.tab:visited
-{
-	color: #ffffff;
-	font-family: verdana, arial, sans-serif; 
-	font-size: 11px;
-	font-weight: bold;
-}
-
-a.tab:hover
-{
-	text-decoration: underline;	
-}
-
-.overview
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	font-weight: normal;
-	padding-bottom: 10px;
-	padding-left: 20px;
-	padding-right: 0px;
-	padding-top: 10px;
-}
-
-.overviewTable
-{
-	background: #ffffff;
-	width: 100%;	
-}
-
-.overviewTable td
-{
-	padding-bottom: 5px;
-	padding-left: 5px;
-	padding-right: 5px;
-	padding-top: 5px;
-}
-
-.overviewSeparator
-{
-	background-color: #000000;
-	padding: 0px;
-}
-
-.expandCollapseText
-{
-	font-family: verdana, arial, sans-serif;
-	font-size: 8pt;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.expandCollapseLink
-{
-	color: #333333;
-	padding-bottom: 5px;
-	text-decoration: none;
-}
-
-.expandCollapseLink:hover
-{
-	color: #0000ff;
-	text-decoration: underline;
-}
-
-.expandCollapseLink:visited
-{
-	color: #333333;
-}
-
-.sectionHeading
-{
-	background-color: #98b1c4;
-	color: #ffffff;
-	cursor: hand;
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	font-weight: bold;
-	padding-bottom: 2px;
-	padding-left: 2px;
-	padding-top: 2px;
-	text-decoration: none;
-}
-
-.sectionContent
-{
-	padding-bottom: 0px;
-	padding-left: 0px;
-	padding-right: 0px;
-	padding-top: 0px;
-	text-align: right;
-}
-
-.sectionTable
-{
-	border-bottom: #ccc solid 0px;
-	border-left: #ccc solid 1px;
-	border-right: #ccc solid 0px;
-	border-top: #ccc solid 1px;
-	padding-bottom: 10px;
-	padding-left: 10px;
-	padding-right: 10px;
-	padding-top: 10px;
-	width: 100%;
-}
-
-.sectionTableHeading
-{
-	background: #eee;
-	border-bottom: #ccc solid 1px;
-	border-left: #ccc solid 0px;
-	border-right: #ccc solid 1px;
-	border-top: #ccc solid 0px;
-	color: #333333;
-	height: 20;
-	text-align: left;
-	width: 20%;
-}
-
-.sectionTableCell
-{
-	border-bottom: #ccc solid 1px;
-	border-left: #ccc solid 0px;
-	border-right: #ccc solid 1px;
-	border-top: #ccc solid 0px;
-}
-
-.breakdownTable
-{
-	border-bottom: #ccc solid 0px;
-	border-left: #ccc solid 1px;
-	border-right: #ccc solid 0px;
-	border-top: #ccc solid 1px;
-	padding-bottom: 0px;
-	padding-left: 0px;
-	padding-right: 0px;
-	padding-top: 0px;
-	width: 100%;
-}
-
-.breakdownTable th
-{
-	background: #eee;
-	border-bottom: #ccc solid 1px;
-	border-left: #ccc solid 0px;
-	border-right: #ccc solid 1px;
-	border-top: #ccc solid 0px;
-	color: #333333;
-	height: 20;
-	text-align: left;
-}
-
-.breakdownTable td
-{
-	border-bottom: #ccc solid 1px;
-	border-left: #ccc solid 0px;
-	border-right: #ccc solid 1px;
-	border-top: #ccc solid 0px;
-}
-
-.defaultTable
-{
-	border-bottom: #ccc solid 0px;
-	border-left: #ccc solid 0px;
-	border-right: #ccc solid 0px;
-	border-top: #ccc solid 0px;
-	padding-bottom: 0px;
-	padding-left: 0px;
-	padding-right: 0px;
-	padding-top: 0px;
-	width: 100%;
-}
-
-.defaultTable td
-{
-	border-bottom: #ccc solid 0px;
-	border-left: #ccc solid 0px;
-	border-right: #ccc solid 0px;
-	border-top: #ccc solid 0px;
-	text-align: left;
-}
-
-.subSectionHeading
-{
-	color: #333333;
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	font-weight: bold;
-	text-decoration: none;
-}
-
-.subSectionContent
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	text-decoration: none;	
-}
-
-.stepHeading
-{
-	background-color: #ffffff;
-	color: #293d6b;
-	cursor: hand;
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	font-weight: bold;
-	padding-bottom: 2px;
-	padding-left: 2px;
-	padding-top: 2px;
-	text-decoration: none;
-}
-
-.stepContent
-{
-	border-bottom: #ccc solid 0px;
-	border-left: #ccc solid 0px;
-	border-right: #ccc solid 0px;
-	border-top: #ccc solid 0px;
-	padding-bottom: 5px;
-	padding-left: 0px;
-	padding-right: 0px;
-	padding-top: 0px;
-	text-align: right;
-}
-
-.stepTable
-{
-	border-bottom: #999999 solid 1px;
-	border-left: #999999 solid 0px;
-	border-right: #999999 solid 0px;
-	border-top: #999999 solid 0px;
-	padding-bottom: 20px;
-	padding-left: 10px;
-	padding-right: 10px;
-	padding-top: 10px;
-	width: 100%;
-}
-
-.stepTable td
-{
-	border: #ccc solid 0px;
-}
-
-.stepSeparator
-{
-	background-color: #cccccc;
-	padding: 0px;
-}
-
-.backToTopLink
-{
-	color: #fffff;
-	font-family: verdana, arial, sans-serif;
-	font-size: 8pt;
-	font-weight: normal;	
-	margin: 0px;
-	padding-bottom: 10px;
-	text-align: middle;	
-	text-decoration: none;
-}
-
-.backToTopLink:hover
-{
-	color: #969;
-	text-decoration: underline;
-}
-
-.backToTopLink:visited
-{
-	color: #5c81a7;
-	text-decoration: none;	
-}
-
-.copyright
-{
-	color: #7080b0;
-	font-family: verdana, arial, sans-serif;
-	font-size: 8pt;
-	font-weight: normal;
-	padding-left: 0px;
-	padding-right: 10px;
-	padding-top: 25px;
-	text-align: left;
-	width: 100%;
-}
-
-.versionInfo
-{
-	color: #7080b0;
-	font-family: verdana, arial, sans-serif;
-	font-size: 8pt;
-	font-weight: normal;
-	padding-left: 10px;
-	padding-right: 0px;
-	padding-top: 25px;
-	text-align: right;
-}
-
-.quote
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	font-style: italic;
-}
-
-.codeSample
-{
-	font-family: courier;
-	font-size: 10pt;		
-}
-
-.elementLink
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;	
-	color: #0000ff;
-}
-
-.elementLinkWithType
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	color: #0000ff;
-}
-
-.elementLinkWithUserText
-{
-	font-family: arial, helvetica, sans-serif;
-	font-size: 10pt;
-	color: #0000ff;
-}
diff --git a/plugins/org.eclipse.epf.richtext/rte/rte.html b/plugins/org.eclipse.epf.richtext/rte/rte.html
deleted file mode 100755
index 6451cb7..0000000
--- a/plugins/org.eclipse.epf.richtext/rte/rte.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<!-- 
-    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
--->
-	<head>
-		<script language="JavaScript" type="text/javascript" src="rte.js"></script>		
-	</head>
-	<body leftMargin="0" topMargin="0" marginheight="0" marginwidth="0" scroll="no" style="overflow: hidden">
-		<iframe id="rte" name="rte" style="border: none;" frameborder="0" scrolling="auto" width="100%" height="100%"></iframe>
-		<script type="text/javascript">
-			initEditor('rte', 'rte.css', null);
-		</script>
-	</body>
-</html>
diff --git a/plugins/org.eclipse.epf.richtext/rte/rte.js b/plugins/org.eclipse.epf.richtext/rte/rte.js
deleted file mode 100755
index 726e8df..0000000
--- a/plugins/org.eclipse.epf.richtext/rte/rte.js
+++ /dev/null
@@ -1,1120 +0,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
-//------------------------------------------------------------------------------
-// @author Kelvin Low
-// @since 1.0
-//------------------------------------------------------------------------------
-// Note: Mozilla/Firefox does not allow unprivileged scripts to invoke the cut,
-// copy and paste commands. The Javascript must either be signed
-// (see http://www.mozilla.org/projects/security/components/signed-scripts.html),
-// or the users must change their preferences
-// (see http://www.mozilla.org/editor/midasdemo/securityprefs.html).
-// Alternatively, the users can use the ctrl-x, ctrl-c and ctrl-v keys.
-//------------------------------------------------------------------------------
-
-var STATUS_NOP = 0;
-var STATUS_INITIALIZED = 1;
-var STATUS_MODIFIED = 2;
-var STATUS_GET_TEXT = 3;
-var STATUS_KEY_DOWN = 4;
-var STATUS_KEY_UP = 5;
-var STATUS_SELECT_TEXT = 6;
-var STATUS_SELECT_CONTROL = 7;
-var STATUS_SELECT_NONE = 8;
-var STATUS_EXEC_CMD = 9;
-
-var KEY_ARROW_DOWN = 40;
-var KEY_ARROW_LEFT = 37;
-var KEY_ARROW_RIGHT = 39;
-var KEY_ARROW_UP = 38;
-var KEY_BACKSPACE = 8;
-var KEY_END = 35;
-var KEY_HOME = 36;
-var KEY_PAGE_DOWN = 34;
-var KEY_PAGE_UP = 33;
-var KEY_TAB = 9;
-var KEY_C = 67;
-var KEY_F = 70;
-var KEY_S = 83;
-var KEY_V = 86;
-var KEY_X = 88;
-var KEY_Z = 90;
-
-var CMD_COPY = "copy";
-var CMD_CUT = "cut";
-var CMD_FIND_TEXT = "findText";
-var CMD_PASTE = "paste";
-var CMD_SAVE = "save";
-var CMD_SAVE_ALL = "saveAll";
-
-var TABLE_HEADERS_NONE = 0;
-var TABLE_HEADERS_COLS = 1;
-var TABLE_HEADERS_ROWS = 2;
-var TABLE_HEADERS_BOTH = 3;
-
-var BOLD = 1;
-var ITALIC = BOLD << 1;
-var UNDERLINE = ITALIC << 1;
-var SUBSCRIPT = UNDERLINE << 1;
-var SUPERSCRIPT = SUBSCRIPT << 1;
-
-
-var editorId;
-var editorCSS;
-var baseHREF;
-var supportRichTextEditing = true;
-var editorDoc;
-var selection;
-var selectionRange;
-var readOnly = false;
-var initialized = false;
-var modified = false;
-
-// Initializes the editor.
-function initEditor(id, css, baseURL) {
-	editorId = id;
-	editorCSS = css;
-	baseHREF = baseURL;
-	try {
-		enableRichTextEditing('');
-		initialized = true;
-		setStatus(STATUS_INITIALIZED, null);
-	}
-	catch (e) {
-		supportRichTextEditing = false;
-	}
-}
-
-// Handles the key events.
-function keyPressed(event) {
-	var keyCode = event.keyCode;
-	if (keyCode == 0 && !document.all) {
-		keyCode = event.charCode;
-		switch (keyCode) {
-			case 99:
-				keyCode = KEY_C;
-				break;
-			case 102:
-				keyCode = KEY_F;
-				break;
-			case 115:
-				keyCode = KEY_S;
-				break;
-			case 118:
-				keyCode = KEY_V;
-				break;
-			case 120:
-				keyCode = KEY_X;
-				break;
-			case 122:
-				keyCode = KEY_Z;
-				break;
-		}
-	}
-	var ctrlKey = event.ctrlKey;
-	var shiftKey = event.shiftKey;
-	
-	switch(keyCode) {
-		case KEY_ARROW_DOWN:
-		case KEY_ARROW_LEFT:
-		case KEY_ARROW_RIGHT:
-		case KEY_ARROW_UP:
-		case KEY_END:
-		case KEY_HOME:
-		case KEY_PAGE_DOWN:
-		case KEY_PAGE_UP:
-		case KEY_TAB:
-			break;
-		case KEY_BACKSPACE:
-			if (!readOnly) {
-				setTimeout("setStatus(STATUS_MODIFIED, null);", 10);
-			}
-			break;
-		case KEY_C:
-			if (ctrlKey) {
-				setStatus(STATUS_KEY_DOWN, CMD_COPY);
-			}
-			else if (!document.all && readOnly) {
-				event.preventDefault();
-			}
-			break;			
-		case KEY_F:
-			if (ctrlKey) {
-				if (document.all) {
-					event.keyCode = -1;
-					event.returnValue = false;
-				}
-				else {
-					event.preventDefault();
-				}
-				setStatus(STATUS_KEY_DOWN, CMD_FIND_TEXT);
-			}
-			else if (!document.all && readOnly) {
-				event.preventDefault();
-			}
-			break;
-		case KEY_S:
-			if (!readOnly && ctrlKey) {
-				if (document.all) {
-					event.keyCode = -1;
-					event.returnValue = false;
-				}
-				else {
-					event.preventDefault();
-				}
-				if (shiftKey) {
-					setStatus(STATUS_KEY_DOWN, CMD_SAVE_ALL);
-				}
-				else {
-					setStatus(STATUS_KEY_DOWN, CMD_SAVE);
-				}
-			}
-			else if (!document.all && readOnly) {
-				event.preventDefault();
-			}			
-			break;
-		case KEY_V:
-			if (ctrlKey) {		
-				if (document.all) {
-					event.keyCode = -1;
-					event.returnValue = false;
-					if (!readOnly) {
-						setStatus(STATUS_KEY_DOWN, CMD_PASTE);
-					}
-				}
-				else {
-					if (!readOnly) {
-						// Workaround Mozilla/Firefox paste issues.
-						setTimeout("setStatus(STATUS_KEY_DOWN, CMD_PASTE);", 10);
-					}
-					else {
-						event.preventDefault();
-					}
-				}
-			}
-			else if (!document.all && readOnly) {
-				event.preventDefault();
-			}
-			break;
-		case KEY_X:
-			if (ctrlKey) {
-				setStatus(STATUS_KEY_DOWN, CMD_CUT);
-			}
-			else if (!document.all && readOnly) {
-				event.preventDefault();
-			}
-			break;
-		case KEY_Z:
-			if (!readOnly && ctrlKey) {
-				setTimeout("setStatus(STATUS_MODIFIED, null);", 10);
-			}
-			else if (!document.all && readOnly) {
-				event.preventDefault();
-			}			
-			break;
-		default:
-			if (!document.all && readOnly) {
-				event.preventDefault();
-			}
-	}
-}
-
-function selChanged(event) {
-	updateSelection();
-}
-
-function enableRichTextEditing(html) {
-	var doc = document.getElementById(editorId).contentWindow.document;
-	doc.designMode = "on";
-	
-	var htmlSrc = '<html><head><title></title>';
-	
-	if (editorCSS != null && editorCSS != '') {
-		htmlSrc += '<link rel="StyleSheet" href="' + editorCSS + '" type="text/css"/>';
-	}
-	
-	if (baseHREF != null && baseHREF != '') {	
-		htmlSrc += '<base href="' + baseHREF + '"/>';
-	}
-	
-	if (!document.all && html == '') {
-		// Mozilla/Firefox will only display the caret if <br/> is added to the HTML body.
-		// Adding <br/> also enables the backspace and delete key by default. Otherwise, the
-		// user need to enter some text before these 2 keys start to function.
-		html = "<br/>";
-	}
-	
-	htmlSrc += '</head><body>' + html + '</body></html>';
-	
-	doc.open();
-	doc.write(htmlSrc);
-	doc.close();
-	
-	modified = false;
-
-	if ("attachEvent" in doc) {
-		doc.attachEvent("onkeydown", keyPressed);
-		doc.attachEvent("onselectionchange", selChanged);
-	}	
-	if ("addEventListener" in doc) {
-		doc.addEventListener("keypress", keyPressed, true);
-		doc.addEventListener("keypress", selChanged, false);
-		doc.addEventListener("mouseup", selChanged, false);
-	}
-
-
-	setStatus(STATUS_EXEC_CMD, 1);
-}
-
-// Sets the height of the editor.
-function setHeight(height) {
-	if (initialized) {
-		document.getElementById(editorId).height = height + "px";
-	}
-}
-
-// Sets the status.
-// Note: By default, Firefox disables changes to the status bar. For this to work, the user
-// must set the global preference "dom.disable_window_status_change" to false.
-// For Firefox 1.0.x, this setting can be made in /usr/firefox-1.0.7/defaults/pref/firefox.js.
-function setStatus(type, value) {
-	var status = '$$$' + type;
-	if (value != null && value != '') {
-		status += ('$' + value);		
-	}
-	window.status = status;
-	window.status = '$$$' + STATUS_NOP;
-}
-
-// Returns the HTML source.
-function getHTML() {
-	var html = document.getElementById(editorId).contentWindow.document.body.innerHTML;
-	if (html == "<P>&nbsp;</P>") {
-		html = "";
-	}
-	if (html != null && html != '') {
-		var regEx = new RegExp("\"file\:([^=]*)(/resources/)(.+)\"", 'g');
-		html = html.replace(regEx, "\"./resources/$3\"");
-		regEx = new RegExp("\"file\:([^=]*)/#(.+)\"", 'g');
-		html = html.replace(regEx, "\"#$2\"");
-	}
-	return html;
-}
-
-//Returns the HTML source to the Java layer
-function getText() {
-	var html = getHTML();
-	setStatus(STATUS_GET_TEXT, html);
-	return html;
-}
-
-function setInnerHTML(html) {
-	if (document.all) {
-		// IE has problem setting complex HTML set via doc.body.innerHTML.
-		enableRichTextEditing(html);
-	}
-	else {
-		if (html == '') {
-			// Mozilla/Firefox will only display the caret if <br/> is added to the HTML body.
-			html = "<br/>";
-		}
-		var doc = document.getElementById(editorId).contentWindow.document;
-		if (doc.body != null) {
-			doc.body.innerHTML = html;
-		}
-		else {
-			// Mozilla/Firefox can take a while to initialize document.body
-			// after document.write().
-			try {
-				setTimeout("setInnerHTML('" + html + "');", 10);
-			}
-			catch (e) {
-			}
-		}
-	}
-}
-
-// Sets the HTML source.
-function setText(html) {
-	if (supportRichTextEditing) {
-		html = decodeString(html);
-		setInnerHTML(html);
-		modified = false;
-		setStatus(STATUS_EXEC_CMD, 1);
-	}
-}
-
-// Decodes the HTML passed from the Java layer.
-function decodeString(str) {
-	if (str != null && str != '') {
-		if (document.all) {
-			str = str.replace(/%sq%/g, "'");
-			str = str.replace(/%EOL%/g, "\n");
-		}
-		else {
-			str = str.replace(/%sq%/g, "&apos;");
-			str = str.replace(/%EOL%/g, "");
-			str = str.replace(/\n/g, "");
-		}
-	}
-	return str;
-}
-
-// Updates the current selection and selection range.
-function updateSelection() {
-	if (!supportRichTextEditing) {
-		return false;
-	}	
-	
-	contentWindow = document.getElementById(editorId).contentWindow;
-	editorDoc = contentWindow.document;
-	
-//	contentWindow.focus();
-	
-	var tempSelRange;
-	var selOffsetStart = 0;
-	var selectedText = "";
-	var fontName = "";
-	var fontSize = "";
-	var blockStyle = "";
-	var textFlags = 0;
-	
-	
-	if (document.all) {
-		selection = editorDoc.selection;
-		if (selection != null) {
-			selectionRange = selection.createRange();
-			tempSelRange = selectionRange.duplicate();
-			reformatElementLinks();
-		}
-	}
-	else {
-		selection = contentWindow.getSelection();
-		if (selection != null) {
-			selectionRange = selection.getRangeAt(selection.rangeCount - 1).cloneRange();
-			tempSelRange = selectionRange.cloneRange();
-		}
-	}
-
-	//TODO: this is probably IE only
-	if (tempSelRange != null) {
-		if (document.all) {
-			selectedText = selectionRange.text;
-			/* for getting selection offset - commented because we can't select the
-			 * proper location in the HTML source tab because JTidy's reformatting of the HTML
-			var html = getHTML();
-            var tempSelLen = tempSelRange.htmlText.length;			
-            tempSelRange.moveStart('character', -html.length);
-            selOffsetStart = tempSelRange.htmlText.length - tempSelLen;
-            */
-			var selParent = tempSelRange.parentElement();
-			fontName = tempSelRange.queryCommandValue('fontName');
-			fontSize = tempSelRange.queryCommandValue('fontSize');
-			blockStyle = tempSelRange.queryCommandValue('formatBlock');
-			if (blockStyle == "Normal") {
-				if (selParent.className == "quote") {
-					blockStyle = "<quote>";
-				} else if (selParent.className == "codeSample") {
-					blockStyle = "<code>";
-				} else {
-					blockStyle = "<p>";
-				}
-			} else if (blockStyle == "Heading 3") {
-				blockStyle = "<h3>";
-			} else if (blockStyle == "Heading 4") {
-				blockStyle = "<h4>";
-			} else if (blockStyle == "Heading 5") {
-				blockStyle = "<h5>";
-			}
-			if (tempSelRange.queryCommandValue('bold') == true) {
-				textFlags |= BOLD;
-			}
-			if (tempSelRange.queryCommandValue('italic') == true) {
-				textFlags |= ITALIC;
-			}
-			if (tempSelRange.queryCommandValue('underline') == true) {
-				textFlags |= UNDERLINE;
-			}
-			if (tempSelRange.queryCommandValue('subscript') == true) {
-				textFlags |= SUBSCRIPT;
-			}
-			if (tempSelRange.queryCommandValue('superscript') == true) {
-				textFlags |= SUPERSCRIPT;
-			}
-		} else {
-			try {
-				if (selectionRange != null) {
-					selectedText = selectionRange.toString();
-				}
-				var selParent = selection.focusNode;
-				fontName = editorDoc.queryCommandValue('fontName');
-				if (fontName == "") {
-					fontName = "default";
-				}
-				fontSize = editorDoc.queryCommandValue('fontSize');
-				if (fontSize == "") {
-					fontSize = "default";
-				}
-				blockStyle = editorDoc.queryCommandValue('formatBlock');
-				if (blockStyle == "p") {
-					if (selParent.parentNode.className == "quote") {
-						blockStyle = "<quote>";
-					} else if (selParent.parentNode.className == "codeSample") {
-						blockStyle = "<code>";
-					} else {
-						blockStyle = "<p>";
-					}
-				} else if (blockStyle == "h3") {
-					blockStyle = "<h3>";
-				} else if (blockStyle == "h4") {
-					blockStyle = "<h4>";
-				} else if (blockStyle == "h5") {
-					blockStyle = "<h5>";
-				} else if (blockStyle == "") {
-					blockStyle = "<p>";
-				}
-				if (editorDoc.queryCommandState('bold') == true) {
-					textFlags |= BOLD;
-				}
-				if (editorDoc.queryCommandState('italic') == true) {
-					textFlags |= ITALIC;
-				}
-				if (editorDoc.queryCommandState('underline') == true) {
-					textFlags |= UNDERLINE;
-				}
-				if (editorDoc.queryCommandState('subscript') == true) {
-					textFlags |= SUBSCRIPT;
-				}
-				if (editorDoc.queryCommandState('superscript') == true) {
-					textFlags |= SUPERSCRIPT;
-				}
-			} catch (e) {  }
-			
-		}
-						
-		setStatus(STATUS_SELECT_TEXT, /* selOffsetStart + "$" + */
-				fontName + "$" + fontSize + "$" + blockStyle + "$" + textFlags + "$" + selectedText);
-	}	
-
-	return true;
-}
-
-// Sets focus to this editor.
-function setFocus() {
-	if (updateSelection()) {
-		setStatus(STATUS_EXEC_CMD, 1);	
-	}
-}
-
-// Reformats element links created via drag & drop.
-function reformatElementLinks() {
-	var linksReformatted = 0;
-	var elements = editorDoc.getElementsByTagName('A');
-	for (var i = 0; i < elements.length; i++) {
-		var element = elements[i];
-		if (element.className.toLowerCase() == 'elementlinkwithtype') {
- 			if (element.firstChild != null && element.firstChild.firstChild != null &&
- 				element.firstChild.firstChild.firstChild != null) {
- 				var linkText = element.firstChild.firstChild.firstChild.nodeValue;
- 				element.removeChild(element.firstChild);
- 				element.appendChild(editorDoc.createTextNode(linkText));
- 				linksReformatted++;
- 			}
-		}
-	}
-	if (linksReformatted > 0) {
-		setStatus(STATUS_MODIFIED, null);
-	}
-}
-
-// Formats the selected text.
-function formatText(command, option) {
-	if (!readOnly && updateSelection()) {
-		if (editorDoc.execCommand(command, false, option)) {
-			setStatus(STATUS_EXEC_CMD, 1);		
-			setStatus(STATUS_MODIFIED, null);
-		}
-	}
-}
-
-// Adds HTML.
-function addHTML(html) {
-	if (!readOnly && html != "")  {
-		html = decodeString(html);
-		if (updateSelection()) {
-			if (document.all) {
-				if (selectionRange.text != null) {
-					selectionRange.pasteHTML(html);
-					setStatus(STATUS_EXEC_CMD, 1);
-					setStatus(STATUS_MODIFIED, null);
-				}
-			}
-			else {
-				selectionRange.deleteContents();
-				var documentFragment = selectionRange.createContextualFragment(html);
-				selectionRange.insertNode(documentFragment);
-				setStatus(STATUS_EXEC_CMD, 1);
-				setStatus(STATUS_MODIFIED, null);
-			}
-		}
-	}
-}
-
-// Adds an image.
-function addImage(url, height, width, alt) {
-	if (url != null && url != '') {
-		formatText('insertimage', url);
-	}
-	if (updateSelection()) {	
-		if (selection != null && selection.type == 'Control' && selectionRange != null) {
-			if (height != null && height != '') selectionRange.item().height = height;
-			if (width != null && width != '') selectionRange.item().width = width;
-			if (alt != null) selectionRange.item().alt = alt;		
-		}
-	}
-}
-
-// Adds a horizontal line.
-function addLine() {
-	formatText('inserthorizontalrule', null);
-}
-
-// Adds a link.
-function addLink(url) {
-	if (!readOnly && url != null && url != '' && updateSelection()) {
-		if (document.all) {
-			if (selectionRange.text == null || selectionRange.text == '') {
-				selectionRange.text = url;
-				setStatus(STATUS_EXEC_CMD, 1);
-				setStatus(STATUS_MODIFIED, null);
-			}
-			else if (selectionRange.execCommand('createlink', false, url)) {
-				setStatus(STATUS_EXEC_CMD, 1);
-				setStatus(STATUS_MODIFIED, null);
-			}
-		}
-		else {
-			if (selection == null || selection == "") {		
-				var urlTextNode = editorDoc.createTextNode(url);
-				insertNodeAtSelection(document.getElementById(editorFrameId).contentWindow, urlTextNode);
-			}			
-			if (editorDoc.execCommand('createlink', false, url)) {
-				setStatus(STATUS_EXEC_CMD, 1);
-				setStatus(STATUS_MODIFIED, null);
-			}
-		}
-	}
-}
-
-// Adds an ordered list.
-function addOrderedList() {
-	formatText('insertorderedlist', null);
-}
-
-// Adds a table.
-function addTable(rows, cols, width, summary, caption, tableheaders) {
-	if (readOnly) return;
-	if (rows == 0) rows = 2;
-	if (cols == 0) cols = 2;
-	if (width == 0) width = "85%";
-	if (updateSelection()) {
-		var table = editorDoc.createElement("table");
-		table.cellPadding = "2";
-		table.cellSpacing = "0";
-		table.border = "1";
-		table.width = width;
-		if (summary != null && summary != '') {
-			table.summary = summary;
-		}
-		if (caption != null && caption != '') {
-			table.createCaption();
-			var captionNode = editorDoc.createTextNode(caption);
-			table.caption.appendChild(captionNode);
-		}
-		tbody = editorDoc.createElement("tbody");
-		for (var i = 0; i < rows; i++) {
-			tr = editorDoc.createElement("tr");
-				for (var j = 0; j < cols; j++) {
-					if (i == 0 && (tableheaders == TABLE_HEADERS_COLS || tableheaders == TABLE_HEADERS_BOTH)) {
-					th = editorDoc.createElement("th");
-					th.scope = "col";
-					if (!document.all) {
-						br = editorDoc.createElement("br");
-						th.appendChild(br);
-					}
-					tr.appendChild(th);
-				}
-				else if (j == 0 && (tableheaders == TABLE_HEADERS_ROWS || tableheaders == TABLE_HEADERS_BOTH)) {
-					th = editorDoc.createElement("th");
-					th.scope = "row";
-					if (!document.all) {
-						br = editorDoc.createElement("br");
-						th.appendChild(br);
-					}
-					tr.appendChild(th);
-				}
-				else {
-					td = editorDoc.createElement("td");
-					if (!document.all) {
-						br = editorDoc.createElement("br");
-						td.appendChild(br);
-					}
-					tr.appendChild(td);
-				}
-			}
-			tbody.appendChild(tr);
-    	}
-		table.appendChild(tbody);
-		if (document.all) {
-			selectionRange.parentElement().appendChild(table);
-		}
-		else {
-			selectionRange.insertNode(table);
-		}
-		setStatus(STATUS_EXEC_CMD, 1);
-		setStatus(STATUS_MODIFIED, null);			
-	}
-}
-
-// Adds an unordered list.
-function addUnorderedList() {
-	formatText('insertunorderedlist', null);
-}
-
-// Sets the background color of the selected text.
-function backColor(color) {
-	if (color != null && color != '') {
-		formatText('backcolor', color);
-	}
-}
-
-// Toggles the 'bold' attribute of the selected text.
-function bold() {
-	formatText('bold', null);
-}
-
-// Copies the selected text to the clipboard.
-function copy() {
-	if (updateSelection()) {
-		if (editorDoc.execCommand('copy', false, null)) {
-			setStatus(STATUS_EXEC_CMD, 1);
-		}
-	}
-}
-
-// Cuts the selected text to the clipboard.
-function cut() {
-	formatText('cut', null);
-}
-
-// Deletes the selected text.
-function deleteText() {
-	formatText('delete', null);
-}
-
-// Finds text.
-function findText(text, dir, options) {
-	if (text == null || text == "") {
-		return;
-	}
-	else {
-		text = decodeString(text);
-	}
-	
-	if (updateSelection()) {
-		if (document.all) {
-			selectionRange.collapse(dir < 0);
-			if (selectionRange.findText(text, dir, options)) {
-				selectionRange.scrollIntoView();
-				selectionRange.select();
-				selectionRange.collapse(dir < 0);
-				setStatus(STATUS_EXEC_CMD, 1);
-			}
-		}
-		else {	
-			// find(text, caseSensitive, backwards, wrapAround, wholeWord, searchInFrames, showDialog)
-			var caseSensitive = true;
-			var backwards = false;
-			var wholeWord = true;
-			if ((options & 4) == 0) caseSensitive = false;
-			if (dir == -1) backwards = true;
-			if ((options & 2) == 0) wholeWord = false;
-			if (contentWindow.find(text, caseSensitive, backwards, false, wholeWord, false, false)) {
-				setStatus(STATUS_EXEC_CMD, 1);
-			}
-		}
-	}
-}
-
-// Sets the foreground color of the selected text.
-function foreColor(color) {
-	if (color != null && color != '') {
-		formatText('forecolor', color);
-	}
-}
-
-// Formats the selected text using the given HTML heading tag.
-function formatBlock(tag) {
-	if (tag != null && tag != '') {
-		formatText('formatblock', tag);
-	}
-}
-
-// Indents the selected text.
-function indent() {
-	formatText('indent', null);
-}
-
-// Toggles the 'italic' attribute of the selected text.
-function italic() {
-	formatText('italic', null);
-}
-
-// Center justifies the selected text.
-function justifyCenter() {
-	formatText('justifycenter', null);
-}
-
-// Fully justifies the selected text.
-function justifyFull() {
-	formatText('justifyfull', null);
-}
-
-// Left justifies the selected text.
-function justifyLeft() {
-	formatText('justifyleft', null);
-}
-
-// Right justifies the selected text.
-function justifyRight() {
-	formatText('justifyright', null);
-}
-
-// Outdents the selected text.
-function outdent() {
-	formatText('outdent', null);
-}
-
-// Pastes text from the clipboard.
-function paste(sourceURL) {
-	if (sourceURL == null) {
-		sourceURL = "";
-	}
-	else {
-		sourceURL = decodeString(sourceURL);
-	}
-	if (document.all) {
-		var START_MARKER = "A_-_-_";
-		var END_MARKER = ":.:.:";
-		// mark img and <a /> links with START_MARKER + src/href + END_MARKER in the id, for later recovery
-		var elements = editorDoc.getElementsByTagName('img');
-		for (var i = 0; i < elements.length; i++) {
-			var element = elements[i];
-			var id = element.id;
-			element.id = START_MARKER + element.src + END_MARKER + id;
-		}
-		var elements = editorDoc.getElementsByTagName('a');
-		for (var i = 0; i < elements.length; i++) {
-			var element = elements[i];
-			var id = element.id;
-			element.id = START_MARKER + element.href + END_MARKER + id;
-		}
-
-		// change the <base> of the document
-		var oldBaseHREF = editorDoc.getElementsByTagName('base')[0].href;
-		editorDoc.getElementsByTagName('base')[0].href = sourceURL;
-
-		formatText('paste', null);
-		
-		// restore <base>
-		editorDoc.getElementsByTagName('base')[0].href = oldBaseHREF;
-	}
-	else {
-		setStatus(STATUS_EXEC_CMD, 1);
-		setStatus(STATUS_MODIFIED, null);
-	}
-	if (updateSelection()) {
-		try {
-			var regExRes = new RegExp("file\:([^=]+)(/resources/)(.+)", 'g');
-			var regEx = new RegExp("file\:([^=]+)/([^/]+)", 'g');	
-			var regExID = new RegExp(START_MARKER + "(.*?)" + END_MARKER + "(.*?)");
-			var elements = editorDoc.getElementsByTagName('img');
-			for (var i = 0; i < elements.length; i++) {
-				var element = elements[i];
-				var id = element.id;
-				if (id != null && id != '') {
-					RegExp.lastIndex=0;
-					var matchArray = id.match(regExID);
-					if (matchArray != null && matchArray.length > 1) {
-						element.src = matchArray[1];
-						if (matchArray.length > 2 && matchArray[2].length > 0) {
-							element.id = matchArray[2];
-						}
-						else {
-							element.removeAttribute('id');
-						}
-						continue;
-					}
-				}
-				var src = element.src;
-				if (src != null && src != '') {
-					if (src.indexOf('resources') != -1) {
-						element.src = src.replace(regExRes, "./resources/$3");
-					}
-					else {
-						element.src = src.replace(regEx, "./resources/$2");
-					}
-				}
-			}
-			var elements = editorDoc.getElementsByTagName('a');
-			for (var i = 0; i < elements.length; i++) {
-				var element = elements[i];
-				var id = element.id;
-				if (id != null && id != '') {
-					RegExp.lastIndex=0;
-					var matchArray = id.match(regExID);
-					if (matchArray != null && matchArray.length > 1) {
-						element.href = matchArray[1];
-						if (matchArray.length > 2 && matchArray[2].length > 0) {
-							element.id = matchArray[2];
-						}
-						else {
-							element.removeAttribute('id');
-						}
-						continue;
-					}
-				}
-				var href = element.href;
-				if (href != null && href != '') {
-					if (href.indexOf('resources') != -1) {
-						element.href = href.replace(regExRes, "./resources/$3");
-					}
-					else {
-						element.href = href.replace(regEx, "./resources/$2");
-					}
-				}
-			}
-		}
-		catch (e) {
-		}
-	}
-}
-
-// Redo the previous command.
-function redo() {
-	formatText('redo', null);
-}
-
-// Redo the previous command.
-function removeFormat() {
-	formatText('removeformat', null);
-}
-
-
-
-function _replaceAllText(findText, replaceText, options) {
-	// this is IE only
-	if (document.all) {
-		var tempRange =  document.getElementById(editorId).contentWindow.document.body.createTextRange();
-		tempRange.moveStart('character', -10000000000);
-		tempRange.collapse();
-		do {
-			if (tempRange.findText(findText, 10000000000, options)) {
-				tempRange.text = replaceText;
-				tempRange.select();
-			} else {		
-				break;
-			}
-		} while (true);
-	}
-}
-
-// Replaces all text.
-function replaceAllText(findText, replaceText, options) {
-	if (readOnly || findText == null || findText == "") {
-		return;
-	}
-	else {
-		findText = decodeString(findText);
-	}
-	if (replaceText == null) {
-		replaceText = "";
-	}
-	else {
-		replaceText = decodeString(replaceText);
-	}
-	
-	if (document.all) {
-		// TODO: Move the insertion point to the start of the HTML
-		// and perform a search and replace in the forward direction. 
-		_replaceAllText(findText, replaceText, options);
-	}
-	else {
-		// TODO: Emulate the IE implementation.
-		var html = document.getElementById(editorId).contentWindow.document.body.innerHTML;
-		var optionStr = "/g";
-		if ((options & 4) == 0) {
-			optionStr += "i";
-		}
-		var regExp = eval("/" + findText + optionStr);
-		html = html.replace(regExp, replaceText);
-		setText(html);
-	}
-	
-	setStatus(STATUS_EXEC_CMD, 1);
-	setStatus(STATUS_MODIFIED, null);
-}
-
-// Replaces text.
-function replaceText(replaceText, dir, options) {
-	if (readOnly || !updateSelection()) {
-		return;
-	}
-	if (replaceText == null) {
-		replaceText = "";
-	}
-	else {
-		replaceText = decodeString(replaceText);
-	}
-	if (document.all) {
-		selectionRange.text = replaceText;
-		if (replaceText != "") {
-			selectionRange.moveStart("word", -1);
-			selectionRange.select();
-			selectionRange.collapse(dir < 0);
-		}
-	}
-	else {
-		selectionRange.deleteContents();
-		selectionRange.insertNode(editorDoc.createTextNode(replaceText));
-	}
-	setStatus(STATUS_EXEC_CMD, 1);
-	setStatus(STATUS_MODIFIED, null);
-}
-
-// Selects all text.
-function selectAll() {
-	if (updateSelection()) {
-		if (editorDoc.execCommand('selectall', false, null)) {
-			setStatus(STATUS_EXEC_CMD, 1);
-		}
-	}
-}
-
-// Sets the font name for the selected text.
-function setFontName(name) {
-	if (updateSelection()) {
-		if (name != null) {
-			if (name == '') {
-				formatText('removeFormat');
-			} else {
-				formatText('fontname', name);
-			}
-		}
-	}
-}
-
-// Sets the font size for the selected text.
-function setFontSize(size) {
-	if (updateSelection()) {
-		if (size != null) {
-			if (size == '') {
-				formatText('removeFormat');
-			} else {
-				formatText('fontsize', size);
-			}
-		}
-	}
-}
-
-// Sets the font style for the selected text.
-function setFontStyle(style) { 
-	if (!readOnly && style != null && style != '' && updateSelection()) {
-		try {
-			if (document.all) {
-				selectionRange.execCommand("removeformat");
-				selectionRange.parentElement().removeAttribute("className");
-			}
-		}
-		catch (e) {
-		}
-		if (style == "<quote>") {
-			formatText('formatblock', '<p>');
-			if (document.all) {
-				selectionRange.parentElement().className = "quote";
-			}
-			else {
-				selection.focusNode.parentNode.className = "quote";
-			}
-		}
-		else if (style == "<code>") {
-			formatText('formatblock', '<p>');
-			if (document.all) {
-				selectionRange.parentElement().className = "codeSample";
-			}
-			else {
-				selection.focusNode.parentNode.className = "codeSample";
-			}
-		}
-		else {
-			if (!document.all && style == "<p>") {
-				// A hack to get rid of the "className" attribute in Mozilla/Firefox.
-				formatText('formatblock', '<h4>');
-			}
-			formatText('formatblock', style);
-		}
-	}
-}
-
-// Sets whether the content can be edited.
-function setEditable(editable) {
-	var doc = document.getElementById(editorId).contentWindow.document;
-    if (editable != null && editable == 'true') {
-		if (document.all) {
-			doc.body.contentEditable = "true";
-		}
-		else {
-			doc.designMode = "on";
-		}
-		readOnly = false;
-	}
-	else {
-		if (document.all) {		
-			doc.body.contentEditable = "false";
-		}
-		else {
-			doc.designMode = "off";
-		}
-		readOnly = true;
-	}
-	setStatus(STATUS_EXEC_CMD, 1);	
-}
-
-// Toggles the 'strike-through' attribute of the selected text.
-function strikeThrough() {
-	formatText('strikethrough', size);
-}
-
-// Toggles the 'subscript' attribute of the selected text.
-function subscript() {
-	formatText('subscript', null);
-}
-
-// Toggles the 'superscript' attribute of the selected text.
-function superscript() {
-	formatText('superscript', null);
-}
-
-// Toggles the 'underline' attribute of the selected text.
-function underline() {
-	formatText('underline', null);
-}
-
-// Converts a link to normal text.
-function unlink() {
-	formatText('unlink', null);
-}
diff --git a/plugins/org.eclipse.epf.richtext/rte/rte.xsl b/plugins/org.eclipse.epf.richtext/rte/rte.xsl
deleted file mode 100755
index 48914fc..0000000
--- a/plugins/org.eclipse.epf.richtext/rte/rte.xsl
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    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
--->
-
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-<xsl:template match="/rte">
-	<xsl:variable name="rte_id"><xsl:value-of select="@id"/></xsl:variable>
-	<xsl:variable name="rte_js"><xsl:value-of select="@js"/></xsl:variable>
-	<html>
-		<head>
-			<script language="JavaScript" type="text/javascript" src="{$rte_js}"></script>
-		</head>
-		<body leftMargin="0" topMargin="0" marginheight="0" marginwidth="0" scroll="no" style="overflow: hidden">
-			<iframe id="{$rte_id}" name="{$rte_id}" style="border: none;" frameborder="0" scrolling="auto" width="100%" height="100%"></iframe>
-			<script language="JavaScript" type="text/javascript">
-				initEditor('<xsl:value-of select="@id"/>', '<xsl:value-of select="@css"/>', '<xsl:value-of select="@baseURL"/>');
-			</script>
-		</body>
-	</html>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichText.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichText.java
deleted file mode 100755
index 9b6fe87..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichText.java
+++ /dev/null
@@ -1,349 +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.richtext;
-
-import java.net.URL;
-import java.util.Iterator;
-
-import org.eclipse.epf.richtext.actions.FindReplaceAction;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.HelpListener;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * The interface for a rich text control.
- * <p>
- * A rich text control is an editable user interface object that displays rich
- * text and images.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public interface IRichText {
-
-	public static final String PROPERTY_NAME = "richText"; //$NON-NLS-1$
-
-	/**
-	 * Returns this rich text control.
-	 * 
-	 * @return this rich text control
-	 */
-	public Control getControl();
-
-	/**
-	 * Sets the layout data.
-	 * 
-	 * @param layoutData
-	 *            the layout data to set
-	 */
-	public void setLayoutData(Object layoutData);
-
-	/**
-	 * Returns the layout data.
-	 * 
-	 * @return this control's layout data
-	 */
-	public Object getLayoutData();
-
-	/**
-	 * Sets focus to this control.
-	 */
-	public void setFocus();
-
-	/**
-	 * Tells the control it does not have focus.
-	 */
-	public void setBlur();
-
-	/**
-	 * Checks whether this control has focus.
-	 * 
-	 * @return <code>true</code> if this control has the user-interface focus
-	 */
-	public boolean hasFocus();
-
-	/**
-	 * Returns the base path used for resolving text and image links.
-	 * 
-	 * @return the base path used for resolving links in this control
-	 */
-	public String getBasePath();
-
-	/**
-	 * Returns the editable state.
-	 * 
-	 * @return <code>true</code> if the content is ediatble
-	 */
-	public boolean getEditable();
-
-	/**
-	 * Sets the editable state.
-	 * 
-	 * @param editable
-	 *            the editable state
-	 */
-	public void setEditable(boolean editable);
-
-	/**
-	 * Checks whether the content has been modified.
-	 * 
-	 * @return <code>true</code> if the content has been modified
-	 */
-	public boolean getModified();
-
-	/**
-	 * Sets the modified state.
-	 * 
-	 * @param modified
-	 *            the modified state
-	 */
-	public void setModified(boolean modified);
-
-	/**
-	 * Returns the rich text content.
-	 * 
-	 * @return the rich text content formatted in a markup language
-	 */
-	public String getText();
-
-	/**
-	 * Sets the rich text content.
-	 * 
-	 * @param text
-	 *            the rich text content formatted in a markup language
-	 */
-	public void setText(String text);
-
-	/**
-	 * Restores the rich text content back to the initial value.
-	 */
-	public void restoreText();
-
-	/**
-	 * Checks whether the editor content has been modified. If it has been
-	 * modified, notify the modify listeners.
-	 */
-	public void checkModify();
-
-	/**
-	 * Returns an object that describes the current selection
-	 * 
-	 * @return a <code>RichTextSelection</code> object
-	 */
-	public RichTextSelection getSelected();
-
-	/**
-	 * Returns an application specific property value.
-	 * 
-	 * @param key
-	 *            the name of the property
-	 * @return the value of the property or <code>null</code> if it has not
-	 *         been set
-	 */
-	public Object getData(String key);
-
-	/**
-	 * Sets an application specific property name and value.
-	 * 
-	 * @param key
-	 *            the name of the property
-	 * @param value
-	 *            the property value
-	 */
-	public void setData(String key, Object value);
-
-	/**
-	 * Executes the given rich text command. The supported command strings are
-	 * defined in <code>RichTextCommand<code>.
-	 * 
-	 * @param	command		a rich text command string
-	 * @return	a status code returned by the executed command
-	 */
-	public int executeCommand(String command);
-
-	/**
-	 * Executes the given rich text command with a single parameter. The
-	 * supported command strings are defined in <code>RichTextCommand<code>.
-	 * 
-	 * @param	command		a rich text command string
-	 * @param	param		a parameter for the command or <code>null</code>
-	 * @return	a status code returned by the executed command
-	 */
-	public int executeCommand(String command, String param);
-
-	/**
-	 * Executes the given rich text command with an array of parameters. The
-	 * supported command strings are defined in <code>RichTextCommand<code>.
-	 * 
-	 * @param	command		a rich text command string
-	 * @param	params		an array of parameters for the command or <code>null</code>
-	 * @return	a status code returned by the executed command
-	 */
-	public int executeCommand(String command, String[] params);
-
-	/**
-	 * Returns the modify listeners attached to this control.
-	 * 
-	 * @return an iterator for retrieving the modify listeners
-	 */
-	public Iterator getModifyListeners();
-
-	/**
-	 * Adds a listener to the collection of listeners who will be notified when
-	 * keys are pressed and released within this control.
-	 * 
-	 * @param listener
-	 *            the listener which should be notified
-	 */
-	public void addKeyListener(KeyListener listener);
-
-	/**
-	 * Removes a listener from the collection of listeners who will be notified
-	 * when keys are pressed and released within this control.
-	 * 
-	 * @param listener
-	 *            the listener which should no longer be notified
-	 */
-	public void removeKeyListener(KeyListener listener);
-
-	/**
-	 * Adds a listener to the collection of listeners who will be notified when
-	 * the content of this control is modified.
-	 * 
-	 * @param listener
-	 *            the listener which should be notified
-	 */
-	public void addModifyListener(ModifyListener listener);
-
-	/**
-	 * Removes a listener from the collection of listeners who will be notified
-	 * when the content of this control is modified.
-	 * 
-	 * @param listener
-	 *            the listener which should no longer be notified
-	 */
-	public void removeModifyListener(ModifyListener listener);
-
-	/**
-	 * Adds the listener to the collection of listeners who will be notifed when
-	 * this control is disposed.
-	 * 
-	 * @param listener
-	 *            the listener which should be notified
-	 */
-	public void addDisposeListener(DisposeListener listener);
-
-	/**
-	 * Removes a listener from the collection of listeners who will be notified
-	 * when this control is disposed.
-	 * 
-	 * @param listener
-	 *            the listener which should no longer be notified
-	 */
-	public void removeDisposeListener(DisposeListener listener);
-
-	/**
-	 * Adds a listener to the collection of listeners who will be notified when
-	 * help events are generated for this control.
-	 * 
-	 * @param listener
-	 *            the listener which should be notified
-	 */
-	public void addHelpListener(HelpListener listener);
-
-	/**
-	 * Removes a listener from the collection of listeners who will be notified
-	 * when help events are generated for this control.
-	 * 
-	 * @param listener
-	 *            the listener which should no longer be notified
-	 */
-	public void removeHelpListener(HelpListener listener);
-
-	/**
-	 * Adds the listener to the collection of listeners who will be notifed when
-	 * an event of the given type occurs within this control.
-	 * 
-	 * @param eventType
-	 *            the type of event to listen for
-	 * @param listener
-	 *            the listener which should be notified when the event occurs
-	 */
-	public void addListener(int eventType, Listener listener);
-
-	/**
-	 * Removes the listener from the collection of listeners who will be notifed
-	 * when an event of the given type occurs within this econtrol.
-	 * 
-	 * @param eventType
-	 *            the type of event to listen to
-	 * @param listener
-	 *            the listener which should no longer be notified when the event
-	 *            occurs
-	 */
-	public void removeListener(int eventType, Listener listener);
-	
-	/**
-	 * Notifies the modify listeners
-	 *
-	 */
-	public void notifyModifyListeners();
-
-	/**
-	 * Returns the event listeners attached to this control.
-	 * 
-	 * @return an iterator for retrieving the event listeners attached to this
-	 *         control
-	 */
-	public Iterator getListeners();
-
-	/**
-	 * Returns the base URL of the rich text control whose content was last
-	 * copied to the clipboard.
-	 * 
-	 * @return the base URL of a rich text control
-	 */
-	public URL getCopyURL();
-
-	/**
-	 * Sets the base URL of the rich text control whose content was last copied
-	 * to the clipboard.
-	 */
-	public void setCopyURL();
-
-	/**
-	 * Disposes the operating system resources allocated by this control.
-	 */
-	public void dispose();
-
-	/**
-	 * Checks whether this control has been disposed.
-	 * 
-	 * @return <code>true</code> if this control is disposed successfully
-	 */
-	public boolean isDisposed();
-	
-	/**
-	 * 
-	 * @return the control's FindReplaceAction
-	 */
-	public FindReplaceAction getFindReplaceAction();
-	
-	/**
-	 * Sets the FindReplaceAction to use
-	 * @param findReplaceAction
-	 */
-	public void setFindReplaceAction(FindReplaceAction findReplaceAction);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichTextEditor.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichTextEditor.java
deleted file mode 100755
index 055eaa6..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichTextEditor.java
+++ /dev/null
@@ -1,50 +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.richtext;
-
-import org.eclipse.epf.richtext.actions.FindReplaceAction;
-
-/**
- * The interface for a rich text editor.
- * <p>
- * A rich text editor is a composite user interface object that includes a tool
- * bar, a tab folder for entering the rich text content, and a tab folder for
- * viewing and modifying the rich text content in a markup language.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public interface IRichTextEditor extends IRichText {
-
-	/**
-	 * Fills the tool bar with rich text action items.
-	 * 
-	 * @param toolBar
-	 *            a rich text editor tool bar
-	 */
-	public void fillToolBar(IRichTextToolBar toolBar);
-
-	/**
-	 * Selects the rich text or the markup language tab.
-	 * 
-	 * @param index
-	 *            <code>0</code> for the rich text tab, <code>1</code> for
-	 *            the markup language tab
-	 */
-	public void setSelection(int index);
-	
-	/**
-	 * Sets the FindReplaceAction to use
-	 * @param findReplaceAction
-	 */
-	public void setFindReplaceAction(FindReplaceAction findReplaceAction);
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichTextToolBar.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichTextToolBar.java
deleted file mode 100755
index 36293fa..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichTextToolBar.java
+++ /dev/null
@@ -1,55 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import org.eclipse.epf.richtext.actions.IRichTextAction;
-import org.eclipse.epf.richtext.actions.IRichTextComboAction;
-
-/**
- * The interface for a rich text editor toolbar.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public interface IRichTextToolBar {
-
-	/**
-	 * Adds a button action to the tool bar.
-	 * 
-	 * @param action
-	 *            the button action to add
-	 */
-	public void addAction(IRichTextAction action);
-
-	/**
-	 * Adds a combo action to the tool bar.
-	 * 
-	 * @param action
-	 *            the combo action to add
-	 */
-	public void addAction(IRichTextComboAction action);
-
-	/**
-	 * Adds a separator to the tool bar.
-	 */
-	public void addSeparator();
-
-	/**
-	 * Updates the toolbar state.
-	 * <p>
-	 * Enables/disables actions depending on the currently selected
-	 * RichTextEditor tab (RichText vs. HTML)
-	 * 
-	 * @param editable specifies whether to enable non-ReadOnly commands
-	 */
-	public void updateToolBar(boolean enabled);
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/Resources.properties b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/Resources.properties
deleted file mode 100755
index b3ccdc6..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/Resources.properties
+++ /dev/null
@@ -1,133 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Font Style Names
-fontStyle_normal=Normal
-fontStyle_sectionHeading=Section Heading
-fontStyle_subsectionHeading=Subsection Heading
-fontStyle_subSubsectionHeading=Sub Subsection Heading
-fontStyle_quote=Quote
-fontStyle_codeSample=Code Sample
-
-# HTML Block Tags
-blockTag_paragraph=Paragraph
-blockTag_heading1=Heading 1
-blockTag_heading2=Heading 2
-blockTag_heading3=Heading 3
-blockTag_heading4=Heading 4
-blockTag_heading5=Heading 5
-blockTag_heading6=Heading 6
-blockTag_address=Address
-blockTag_preformattedText=Preformatted Text
-
-# HTML Font Names
-fontName_default=Default
-fontName_arial=Arial
-fontName_courierNew=Courier New
-fontName_timesNewRoman=Times New Roman
-fontName_verdana=Verdana
-
-# Rich Text Editor Tool Buttons
-addHorizontalBarAction_toolTipText=Add Horizontal Bar
-addImageAction_toolTipText=Add Image
-addLineAction_toolTipText=Add Line
-addLinkAction_toolTipText=Add Link
-addOrderedListAction_toolTipText=Add Ordered List
-addTableAction_toolTipText=Add Table
-addUnorderedListAction_toolTipText=Add Unordered List
-boldAction_toolTipText=Bold
-clearContentAction_toolTipText=Clear Content
-copyAction_toolTipText=Copy
-cutAction_toolTipText=Cut
-findReplaceAction_toolTipText=Find/Replace
-indentAction_toolTipText=Indent
-italicAction_toolTipText=Italic
-justifyCenterAction_toolTipText=Justify Center
-justifyFullAction_toolTipText=Justify Full
-justifyLeftAction_toolTipText=Justify Left
-justifyRightAction_toolTipText=Justify Right
-outdentAction_toolTipText=Outdent
-pasteAction_toolTipText=Paste
-pastePlainTextAction_toolTipText=Paste as plain text
-subscriptAction_toolTipText=Subscript
-superscriptAction_toolTipText=Superscript
-underlineAction_toolTipText=Underline
-
-# Rich Text Editor Comboboxes
-fontStyleAction_toolTipText=Set Font Style
-blockTagAction_toolTipText=Set Block Tag
-fontNameAction_toolTipText=
-fontNameAction_DefaultFontName=Default font
-fontSizeAction_toolTipText=Set Font Size
-
-# Rich Text Editor Context Menu Items
-cutAction_text=&Cut
-copyAction_text=C&opy
-pasteAction_text=&Paste
-pastePlainTextAction_text=Paste &as plain text
-
-# Rich Text Editor Tabs
-richTextTab_text=Rich Text
-richTextTab_toolTipText=Edit content in rich text
-htmlTab_text=HTML
-htmlTab_toolTipText=Edit content in HTML
-
-# Add Dialogs
-addImageDialog_title=Add Image
-addLinkDialog_title=Add Link
-addTableDialog_title=Add Table
-findReplaceDialog_title=Find/Replace
-urlLabel_text=URL:
-summaryLabel_text=Summary:
-captionLabel_text=Caption:
-rowsLabel_text=Rows:
-columnsLabel_text=Columns:
-widthLabel_text=Width:
-tableStyleLabel_text=Style:
-tableHeaderNone_text=Table with no headers
-tableHeaderCols_text=Table with column headers
-tableHeaderRows_text=Table with row headers
-tableHeaderBoth_text=Table with column and row headers
-browseButton_text=Browse...
-
-# Clear Editor Content Dialog
-clearContentDialog_title=Clear Editor Content Confirmation
-clearContentDialog_text=Do you really want to clear the content of this rich text editor?
-
-# Find/Replace Dialog
-findLabel_text=Find:
-replaceLabel_text=Replace with:
-optionsGroup_text=Options
-caseSensitiveCheckbox_text=Case sensitive
-wholeWordCheckbox_text=Whole word
-directionGroup_text=Direction
-forwardRadioButton_text=Forward
-backwardRadioButton_text=Backward
-findButton_text=Find
-replaceButton_text=Replace
-replaceFindButton_text=Replace/Find
-replaceallButton_text=Replace All
-# taken from org.eclipse.ui.workbench.texteditor
-FindReplace_Status_noMatch_label=String Not Found
-
-# Preference Page
-maxCharsPerLineLabel_text=Maximum characters per line:
-indentHTMLCheckbox_text=Indent HTML tags
-indentSizeLabel_text=Indent Size:
-urlDisplayNameLabel_text=URL Display Name:
-
-# DO NOT TRANSLATE BELOW THIS LINE
-# START NO-TRANSLATE
-fontNameAction_CSS_Default=arial, helvetica, sans-serif
-fontNameAction_CSS_Default_Mozilla=arial,helvetica,sans-serif
-# END NO-TRANSLATE
-
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichText.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichText.java
deleted file mode 100755
index c6ab8d9..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichText.java
+++ /dev/null
@@ -1,1499 +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.richtext;
-
-import java.io.File;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.common.html.HTMLFormatter;
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.common.utils.XMLUtil;
-import org.eclipse.epf.common.xml.XSLTProcessor;
-import org.eclipse.epf.richtext.actions.CopyAction;
-import org.eclipse.epf.richtext.actions.CutAction;
-import org.eclipse.epf.richtext.actions.FindReplaceAction;
-import org.eclipse.epf.richtext.actions.PasteAction;
-import org.eclipse.epf.richtext.actions.PastePlainTextAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.browser.LocationAdapter;
-import org.eclipse.swt.browser.LocationEvent;
-import org.eclipse.swt.browser.StatusTextEvent;
-import org.eclipse.swt.browser.StatusTextListener;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.HelpListener;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.events.MenuListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The default rich text control implementation.
- * <p>
- * The default rich text editor uses XHTML as the underlying markup language for
- * the rich text content. It is implemented using a SWT <code>Browser</code>
- * control and DHTML (HTML, CSS and JavaScript).
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class RichText implements IRichText {
-
-	// Encoded single quote. All single quotes need to be specially encoded to
-	// avoid JavaScript error when calling Browse.executeCommand().
-	private static final String ENCODED_SINGLE_QUOTE = "%sq%"; //$NON-NLS-1$
-
-	private static final String ENCODED_NEWLINE = "%EOL%"; //$NON-NLS-1$
-
-	private static final String STATUS_PREFIX = "$$$"; //$NON-NLS-1$
-
-	private static final int STATUS_PREFIX_LENGTH = STATUS_PREFIX.length();
-	
-	private static final int STATUS_NOP = 0;
-
-	private static final int STATUS_INITIALIZED = 1;
-
-	private static final int STATUS_MODIFIED = 2;
-
-	private static final int STATUS_GET_TEXT = 3;
-
-	private static final int STATUS_KEY_DOWN = 4;
-
-	private static final int STATUS_KEY_UP = 5;
-
-	private static final int STATUS_SELECT_TEXT = 6;
-
-	private static final int STATUS_SELECT_CONTROL = 7;
-
-	private static final int STATUS_SELECT_NONE = 8;
-
-	private static final int STATUS_EXEC_CMD = 9;
-
-	// The default base path used for resolving links (<href>, <img>, etc.)
-	private static final String DEFAULT_BASE_PATH = System
-			.getProperty("user.home") //$NON-NLS-1$
-			+ System.getProperty("file.separator") + "rte"; //$NON-NLS-1$ //$NON-NLS-2$
-
-	// If true, log debugging info.
-	protected boolean debug;
-
-	// The plug-in logger.
-	protected Logger logger;
-
-	// The underlying SWT Browser used for loading the JavaScript/DHTML editor.
-	protected Browser editor;
-
-	// The underlying OleControlSite for the SWT Browser (Win32 only).
-	protected Control editorControl;
-
-	// The base URL of the rich text control whose content was last
-	// copied to the clipboard.
-	protected static URL copyURL;
-
-	// The context menu associated with this control.
-	protected Menu contextMenu;
-
-	// The folder that contains the supporting CSS and JavaScript files
-	protected String rteFolder;
-
-	// The URL that points to the supporting CSS and JavaScript files.
-	protected String rteURL;
-
-	// The base path used for resolving links (<href>, <img>, etc.)
-	protected String basePath;
-
-	// The DHTML initialization flag.
-	protected boolean initialized;
-
-	// The initial focus.
-	protected boolean initializedWithFocus;
-
-	// The control's initial text. This is used to cache the HTML source passed
-	// in via setText()while the DHTML initialization is happening.
-	protected String initialText;
-
-	// The control's current text.
-	protected String currentText = ""; //$NON-NLS-1$
-
-	// The control's editable flag.
-	protected boolean editable = true;
-
-	// The control's modification flag.
-	protected boolean modified;
-
-	// The control's text and object selection flag.
-	protected boolean hasSelection;
-
-	// The control's text selection
-	protected RichTextSelection richTextSelection = new RichTextSelection();
-
-	// JavaScript command execution status code.
-	protected int status = 0;
-
-	// The HTML source formatter.
-	protected HTMLFormatter htmlFormatter;
-
-	// The SWT event listeners.
-	protected Map<Listener, RichTextListener> listeners;
-
-	// The modify listeners.
-	protected List<ModifyListener> modifyListeners;
-
-	// The control's edit flag.
-	protected boolean notifyingModifyListeners = false;
-
-	// The controls's focus flag.
-	protected boolean hasFocus = false;
-
-	// The control's find/replace text action
-	protected FindReplaceAction findReplaceAction;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param parent
-	 *            the parent composite
-	 * @param style
-	 *            the style for this control
-	 * @param basePath
-	 *            the path used for resolving links
-	 */
-	public RichText(Composite parent, int style, String basePath) {
-		debug = RichTextPlugin.getDefault().isDebugging();
-		logger = RichTextPlugin.getDefault().getLogger();
-		findReplaceAction = new FindReplaceAction();
-		rteFolder = RichTextPlugin.getDefault().getInstallPath() + "rte/"; //$NON-NLS-1$		
-		rteURL = XMLUtil.escape("file://" + rteFolder); //$NON-NLS-1$
-		setBasePath(basePath);
-
-		try {
-			editor = new Browser(parent, SWT.NONE);
-			if (debug) {
-				printDebugMessage("RichText", "basePath=" + basePath); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			editor.setLayoutData(new GridData(GridData.FILL_BOTH));
-			editor.setData(PROPERTY_NAME, this);
-			init(parent, style);
-		} catch (Exception e) {
-			editor = null;
-			String msg = "Failed to create RichText with basePath=" + basePath; //$NON-NLS-1$
-			logger.logError(msg, e);
-			if (debug) {
-				System.out.println(msg);
-				e.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param parent
-	 *            the parent composite
-	 * @param style
-	 *            the style for this control
-	 */
-	public RichText(Composite parent, int style) {
-		this(parent, style, null);
-	}
-
-	/**
-	 * Sets the base path for resolving links.
-	 */
-	protected void setBasePath(String path) {
-		if (path != null && path.length() > 0) {
-			if (path.startsWith(FileUtil.UNC_PATH_PREFIX)) {
-				basePath = FileUtil.UNC_PATH_PREFIX
-						+ FileUtil.appendSeparator(path.substring(
-								FileUtil.UNC_PATH_PREFIX_LENGTH).replace('\\',
-								'/'), "/"); //$NON-NLS-1$
-			} else {
-				basePath = FileUtil.appendSeparator(path).replace('\\', '/');
-			}
-		} else {
-			basePath = FileUtil.appendSeparator(DEFAULT_BASE_PATH).replace(
-					'\\', '/');
-		}
-	}
-
-	/**
-	 * Initializes this control.
-	 * 
-	 * @param parent
-	 *            the parent composite
-	 * @param style
-	 *            the style for this control
-	 * @throws Exception
-	 *             when an error has occurred while initialzing this control
-	 */
-	protected void init(Composite parent, int style) throws Exception {
-		try {
-			addStatusTextListener();
-			if (debug) {
-				printDebugMessage("init", "added status text listener"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-			String editorHTML = generateEditorHTML();
-			if (debug) {
-				printDebugMessage("init", "generated editor HTML"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-			editor.setText(editorHTML);
-			if (debug) {
-				printDebugMessage("init", "loaded editor HTML"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-			contextMenu = new Menu(parent.getShell(), SWT.POP_UP);
-			editor.setMenu(contextMenu);
-			fillContextMenu(contextMenu);
-			if (debug) {
-				printDebugMessage("init", "added context menu"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-			addListeners();
-			if (debug) {
-				printDebugMessage("init", "added listeners"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-			htmlFormatter = new HTMLFormatter();
-			if (debug) {
-				printDebugMessage("init", "instantiated HTMLFormatter"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		} catch (Exception e) {
-			editor = null;
-			dispose();
-			throw e;
-		}
-	}
-
-	/**
-	 * Returns this rich text control.
-	 * 
-	 * @return this rich text control
-	 */
-	public Control getControl() {
-		return editor;
-	}
-
-	/**
-	 * Sets the layout data.
-	 * 
-	 * @param layoutData
-	 *            the layout data to set
-	 */
-	public void setLayoutData(Object layoutData) {
-		if (editor != null) {
-			editor.setLayoutData(layoutData);
-		}
-	}
-
-	/**
-	 * Returns the layout data.
-	 * 
-	 * @return this control's layout data
-	 */
-	public Object getLayoutData() {
-		if (editor != null) {
-			return editor.getLayoutData();
-		}
-		return null;
-	}
-
-	/**
-	 * Sets focus to this control.
-	 */
-	public void setFocus() {
-		if (debug) {
-			printDebugMessage("setFocus, editable=" + editable); //$NON-NLS-1$
-		}
-		if (editor != null) {
-			if (initialized) {
-				if (!Platform.getOS().equals("win32")) { //$NON-NLS-1$
-					// Workaround for Mozilla and Firefox rich text editor focus
-					// issue.
-					editor.setFocus();
-				}
-				executeCommand(RichTextCommand.SET_FOCUS);
-				hasFocus = true;
-			} else {
-				initializedWithFocus = true;
-			}
-		}
-	}
-
-	/**
-	 * Tells the control it does not have focus.
-	 */
-	public void setBlur() {
-		if (debug) {
-			printDebugMessage("setBlur, editable=" + editable); //$NON-NLS-1$
-		}
-		if (editor != null) {
-			if (initialized) {
-				hasFocus = false;
-			} else {
-				initializedWithFocus = false;
-			}
-		}
-	}
-
-	/**
-	 * Checks whether this control has focus.
-	 * 
-	 * @return <code>true</code> if this control has the user-interface focus
-	 */
-	public boolean hasFocus() {
-		if (editor != null) {
-			return hasFocus;
-		}
-		return false;
-	}
-
-	/**
-	 * Returns the base path used for resolving text and image links.
-	 * 
-	 * @return the base path used for resolving links in this control
-	 */
-	public String getBasePath() {
-		return basePath;
-	}
-
-	/**
-	 * Returns the base URL of the rich text control whose content was last
-	 * copied to the clipboard.
-	 * 
-	 * @return the base URL of a rich text control
-	 */
-	public URL getCopyURL() {
-		return copyURL;
-	}
-
-	/**
-	 * Sets the base URL of the rich text control whose content was last copied
-	 * to the clipboard.
-	 */
-	public void setCopyURL() {
-		try {
-			copyURL = new File(basePath).toURL();
-		} catch (Exception e) {
-			copyURL = null;
-		}
-	}
-
-	/**
-	 * Returns the editable state.
-	 * 
-	 * @return <code>true</code> if the content is ediatble
-	 */
-	public boolean getEditable() {
-		return editable;
-	}
-
-	/**
-	 * Sets the editable state.
-	 * 
-	 * @param editable
-	 *            the editable state
-	 */
-	public void setEditable(boolean editable) {
-		this.editable = editable;
-		if (initialized) {
-			executeCommand(RichTextCommand.SET_EDITABLE, "" + editable); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Checks whether the content has been modified.
-	 * 
-	 * @return <code>true</code> if the content has been modified
-	 */
-	public boolean getModified() {
-		return modified;
-	}
-
-	/**
-	 * Sets the modified state.
-	 * 
-	 * @param modified
-	 *            the modified state
-	 */
-	public void setModified(boolean modified) {
-		this.modified = modified;
-	}
-
-	/**
-	 * Returns the rich text content.
-	 * 
-	 * @return the rich text content formatted in a markup language
-	 */
-	public String getText() {
-		if (editor != null && initialized) {
-			try {
-				executeCommand(RichTextCommand.GET_TEXT);
-				if (currentText != null && currentText.length() > 0) {
-					currentText = currentText.replaceAll(
-							"<P>&nbsp;</P>", "<br/>"); //$NON-NLS-1$ //$NON-NLS-2$			
-					currentText = formatHTML(currentText, true);
-					currentText = tidyText(currentText);
-					// Call JTidy to reformat the source again just in case
-					// tidyText() destroys the formatting.
-					currentText = formatHTML(currentText, false);
-				} else {
-					currentText = ""; //$NON-NLS-1$
-				}
-				if (debug) {
-					printDebugMessage("getText", "text=", currentText); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-				return currentText;
-			} catch (Exception e) {
-				logger.logError(e);
-			}
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	protected String formatHTML(String text, boolean ignoreErrors) {
-		String formattedText;
-		try {
-			// Call JTidy to format the source to XHTML.
-			formattedText = htmlFormatter.formatHTML(text);
-			if (htmlFormatter.getLastErrorStr() != null) {
-				if (!ignoreErrors) {
-					logger.logError(htmlFormatter.getLastErrorStr());
-				}
-			}
-			return formattedText;
-		} catch (UnsupportedEncodingException e) {
-			logger.logError(e);
-		}
-		return text;
-	}
-
-	/**
-	 * Sets the rich text content.
-	 * 
-	 * @param text
-	 *            the rich text content formatted in a markup language
-	 */
-	public void setText(String text) {
-		if (editor != null) {
-			if (debug) {
-				printDebugMessage("setText", "text=", text); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-			String newText = text;
-			if (newText != null && newText.length() > 0) {
-				// Call JTidy to format the source to XHTML.
-				newText = formatHTML(newText, true);
-				newText = tidyText(newText);
-				// Call JTidy to reformat the source again just in case
-				// tidyText() destroys the formatting.
-				newText = formatHTML(newText, false);
-			} else {
-				newText = ""; //$NON-NLS-1$
-			}
-
-			if (initialized) {
-				modified = !newText.equals(currentText);
-			}
-			initialText = newText;
-
-			if (debug) {
-				printDebugMessage(
-						"setText", "modified=" + modified + ", newText=", newText); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			}
-
-			if (initialized) {
-				try {
-					executeCommand(RichTextCommand.SET_TEXT, newText);
-					executeCommand(RichTextCommand.SET_EDITABLE, "" + editable); //$NON-NLS-1$				
-				} catch (Exception e) {
-					logger.logError(e);
-				}
-			}
-
-			currentText = newText;
-		}
-	}
-
-	/**
-	 * Restores the rich text content back to the initial value.
-	 */
-	public void restoreText() {
-		setText(initialText);
-	}
-
-	/**
-	 * Returns the currently selected text.
-	 * 
-	 * @return the selected text or <code>""</code> if there is no
-	 *         hasSelection
-	 */
-	public String getSelectedText() {
-		// executeCommand(RichTextCommand.GET_SELECTED_TEXT);
-		return richTextSelection.getText();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.richtext.IRichText#getSelected()
-	 */
-	public RichTextSelection getSelected() {
-		return richTextSelection;
-	}
-
-	/**
-	 * Returns an application specific property value.
-	 * 
-	 * @param key
-	 *            the name of the property
-	 * @return the value of the property or <code>null</code> if it has not
-	 *         been set
-	 */
-	public Object getData(String key) {
-		if (editor != null) {
-			editor.getData(key);
-		}
-		return null;
-	}
-
-	/**
-	 * Sets an application specific property name and value.
-	 * 
-	 * @param key
-	 *            the name of the property
-	 * @param value
-	 *            the property value
-	 */
-	public void setData(String key, Object value) {
-		if (editor != null) {
-			editor.setData(key, value);
-		}
-	}
-
-	/**
-	 * Executes the given JavaScript.
-	 * 
-	 * @param script
-	 *            the JavaScript to execute
-	 * @return a status code returned by the executed script
-	 */
-	protected int execute(String script) {
-		status = 0;
-		if (editor != null && script != null && script.length() > 0) {
-			try {
-				editor.execute(script);
-				if (debug) {
-					printDebugMessage("execute", script); //$NON-NLS-1$				
-				}
-			} catch (Exception e) {
-				String msg = "Failed to execute " + script; //$NON-NLS-1$
-				logger.logError(msg, e);
-				if (debug) {
-					printDebugMessage("execute", msg); //$NON-NLS-1$
-					e.printStackTrace();
-				}
-			}
-		}
-		return status;
-	}
-
-	/**
-	 * Executes the given rich text command. The supported command strings are
-	 * defined in <code>RichTextCommand<code>.
-	 * 
-	 * @param	command		a rich text command string.
-	 * @return	a status code returned by the executed command
-	 */
-	public int executeCommand(String command) {
-		status = 0;
-		if (command != null && command.equals(RichTextCommand.CLEAR_CONTENT)) {
-			String oldInitialText = initialText;
-			setText(""); //$NON-NLS-1$
-			initialText = oldInitialText;
-			status = 1;
-			modified = true;
-			notifyModifyListeners();
-		} else {
-			status = execute(command + "();"); //$NON-NLS-1$
-		}
-		return status;
-	}
-
-	/**
-	 * Executes the given rich text command with a single parameter. The
-	 * supported command strings are defined in <code>RichTextCommand<code>.
-	 * 
-	 * @param	command		a rich text command string
-	 * @param	param		a parameter for the command or <code>null</code>
-	 * @return	a status code returned by the executed command
-	 */
-	public int executeCommand(String command, String param) {
-		if (param == null) {
-			return executeCommand(command);
-		}
-		return execute(command + "('" + formatText(param) + "');"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * Executes the given rich text command with an array of parameters. The
-	 * supported command strings are defined in <code>RichTextCommand<code>.
-	 * 
-	 * @param	command		a rich text command string
-	 * @param	params		an array of parameters for the command or <code>null</code>
-	 * @return	a status code returned by the executed command
-	 */
-	public int executeCommand(String command, String[] params) {
-		if (params == null || params.length == 0) {
-			return executeCommand(command);
-		}
-		StringBuffer sb = new StringBuffer();
-		int paramsLength = params.length;
-		for (int i = 0; i < paramsLength; i++) {
-			sb.append('\'').append(formatText(params[i])).append('\'');
-			if (i < paramsLength - 1) {
-				sb.append(',');
-			}
-		}
-		String param = sb.toString();
-		return execute(command + "(" + param + ");"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * Disposes the operating system resources allocated by the control.
-	 */
-	public void dispose() {
-		if (contextMenu != null && !contextMenu.isDisposed()) {
-			contextMenu.dispose();
-			contextMenu = null;
-		}
-		if (listeners != null) {
-			listeners.clear();
-			listeners = null;
-		}
-		if (modifyListeners != null) {
-			modifyListeners.clear();
-			modifyListeners = null;
-		}
-		if (htmlFormatter != null) {
-			htmlFormatter = null;
-		}
-		if (this.findReplaceAction != null) {
-			this.findReplaceAction.dispose();
-			this.findReplaceAction = null;
-		}
-	}
-
-	/**
-	 * Checks whether this control has been disposed.
-	 * 
-	 * @return <code>true</code> if this control is disposed successfully
-	 */
-	public boolean isDisposed() {
-		return editor.isDisposed();
-	}
-
-	/**
-	 * Returns the modify listeners attached to this control.
-	 * 
-	 * @return an iterator for retrieving the modify listeners
-	 */
-	public Iterator getModifyListeners() {
-		return modifyListeners.iterator();
-	}
-
-	/**
-	 * Adds a listener to the collection of listeners who will be notified when
-	 * keys are pressed and released within this control.
-	 * 
-	 * @param listener
-	 *            the listener which should be notified
-	 */
-	public void addKeyListener(KeyListener listener) {
-		if (editor != null) {
-			editor.addKeyListener(listener);
-		}
-	}
-
-	/**
-	 * Removes a listener from the collection of listeners who will be notified
-	 * when keys are pressed and released within this control.
-	 * 
-	 * @param listener
-	 *            the listener which should no longer be notified
-	 */
-	public void removeKeyListener(KeyListener listener) {
-		if (editor != null) {
-			editor.removeKeyListener(listener);
-		}
-	}
-
-	/**
-	 * Adds a listener to the collection of listeners who will be notified when
-	 * the content of this control is modified.
-	 * 
-	 * @param listener
-	 *            the listener which should be notified
-	 */
-	public void addModifyListener(ModifyListener listener) {
-		if (editor != null && listener != null
-				&& !modifyListeners.contains(listener)) {
-			modifyListeners.add(listener);
-		}
-	}
-
-	/**
-	 * Removes a listener from the collection of listeners who will be notified
-	 * when the content of this control is modified.
-	 * 
-	 * @param listener
-	 *            the listener which should no longer be notified
-	 */
-	public void removeModifyListener(ModifyListener listener) {
-		if (editor != null && listener != null
-				&& modifyListeners.contains(listener)) {
-			modifyListeners.remove(listener);
-		}
-	}
-
-	/**
-	 * Adds the listener to the collection of listeners who will be notifed when
-	 * this control is disposed.
-	 * 
-	 * @param listener
-	 *            the listener which should be notified
-	 */
-	public void addDisposeListener(DisposeListener listener) {
-		if (editor != null) {
-			editor.addDisposeListener(listener);
-		}
-	}
-
-	/**
-	 * Removes a listener from the collection of listeners who will be notified
-	 * when this control is disposed.
-	 * 
-	 * @param listener
-	 *            the listener which should no longer be notified
-	 */
-	public void removeDisposeListener(DisposeListener listener) {
-		if (editor != null) {
-			editor.removeDisposeListener(listener);
-		}
-	}
-
-	/**
-	 * Adds a listener to the collection of listeners who will be notified when
-	 * help events are generated for this control.
-	 * 
-	 * @param listener
-	 *            the listener which should be notified
-	 */
-	public void addHelpListener(HelpListener listener) {
-		if (editor != null) {
-			editor.addHelpListener(listener);
-		}
-	}
-
-	/**
-	 * Removes a listener from the collection of listeners who will be notified
-	 * when help events are generated for this control.
-	 * 
-	 * @param listener
-	 *            the listener which should no longer be notified
-	 */
-	public void removeHelpListener(HelpListener listener) {
-		if (editor != null) {
-			editor.removeHelpListener(listener);
-		}
-	}
-
-	/**
-	 * Adds the listener to the collection of listeners who will be notifed when
-	 * an event of the given type occurs within this control.
-	 * 
-	 * @param eventType
-	 *            the type of event to listen for
-	 * @param listener
-	 *            the listener which should be notified when the event occurs
-	 */
-	public void addListener(int eventType, Listener listener) {
-		if (editor != null && !listeners.containsKey(listener)) {
-			if (eventType != SWT.SELECTED) {
-				if (editorControl == null
-						|| (eventType != SWT.Activate
-								&& eventType != SWT.Deactivate
-								&& eventType != SWT.FocusIn && eventType != SWT.FocusOut)) {
-					editor.addListener(eventType, listener);
-				}
-			}
-			listeners.put(listener, new RichTextListener(eventType, listener));
-		}
-	}
-
-	/**
-	 * Removes the listener from the collection of listeners who will be notifed
-	 * when an event of the given type occurs within this control.
-	 * 
-	 * @param eventType
-	 *            the type of event to listen for
-	 * @param listener
-	 *            the listener which should no longer be notified when the event
-	 *            occurs
-	 */
-	public void removeListener(int eventType, Listener listener) {
-		if (editor != null && listeners.containsKey(listener)) {
-			if (editorControl == null
-					|| (eventType != SWT.Activate
-							&& eventType != SWT.Deactivate
-							&& eventType != SWT.FocusIn && eventType != SWT.FocusOut)) {
-				editor.removeListener(eventType, listener);
-			}
-			listeners.remove(listener);
-		}
-	}
-
-	/**
-	 * Returns the event listeners attached to this control.
-	 * 
-	 * @return an iterator for retrieving the event listeners attached to this
-	 *         control
-	 */
-	public Iterator getListeners() {
-		return listeners.values().iterator();
-	}
-
-	/**
-	 * Adds the listener to monitor events and status sent by the underlying
-	 * DHTML editor.
-	 */
-	protected void addStatusTextListener() {
-		editor.addStatusTextListener(new StatusTextListener() {
-			public void changed(StatusTextEvent event) {
-				String eventText = event.text;
-				int eventTextLength = eventText.length();
-				if (eventText.startsWith(STATUS_PREFIX)
-						&& eventTextLength > STATUS_PREFIX_LENGTH) {
-					try {
-						int endStatusIndex = STATUS_PREFIX_LENGTH + 1;
-						if (eventText.length() > STATUS_PREFIX_LENGTH + 1
-								&& Character.isDigit(eventText
-										.charAt(endStatusIndex))) {
-							endStatusIndex++;
-						}
-						int statusType = Integer.parseInt(eventText.substring(
-								STATUS_PREFIX_LENGTH, endStatusIndex));
-						switch (statusType) {
-						case STATUS_NOP:
-							break;
-						case STATUS_INITIALIZED:
-							if (!initialized) {
-								initialized = true;
-								if (debug) {
-									printDebugMessage(
-											"statusTextListener", "STATUS_INITIALIZED"); //$NON-NLS-1$ //$NON-NLS-2$
-								}
-								if (!Platform.getOS().equals("win32")) { //$NON-NLS-1$
-									// Workaround Mozilla'a IFRAME height issue.
-									executeCommand(RichTextCommand.SET_HEIGHT,
-											"" + editor.getBounds().height); //$NON-NLS-1$
-								}
-								executeCommand(RichTextCommand.SET_TEXT,
-										currentText);
-								if (initializedWithFocus) {
-									setFocus();
-								}
-								if (!editable) {
-									executeCommand(
-											RichTextCommand.SET_EDITABLE,
-											"" + editable); //$NON-NLS-1$
-								}
-							}
-							break;
-						case STATUS_MODIFIED:
-							if (debug) {
-								printDebugMessage(
-										"statusTextListener", "STATUS_MODIFIED"); //$NON-NLS-1$ //$NON-NLS-2$
-							}
-							checkModify();
-							break;
-						case STATUS_GET_TEXT:
-							if (eventTextLength >= STATUS_PREFIX_LENGTH + 2) {
-								currentText = eventText
-										.substring(STATUS_PREFIX_LENGTH + 2);
-							} else {
-								currentText = ""; //$NON-NLS-1$
-							}
-							if (debug) {
-								printDebugMessage(
-										"statusTextListener", //$NON-NLS-1$
-										"STATUS_GET_TEXT, currentText=", currentText); //$NON-NLS-1$
-							}
-							break;
-						case STATUS_KEY_DOWN:
-							if (eventTextLength >= STATUS_PREFIX_LENGTH + 2) {
-								String cmd = eventText
-										.substring(STATUS_PREFIX_LENGTH + 2);
-								if (debug) {
-									printDebugMessage("statusTextListener", //$NON-NLS-1$
-											"STATUS_KEY_DOWN, cmd=" + cmd); //$NON-NLS-1$
-								}
-								if (cmd.equals(RichTextCommand.COPY)) {
-									setCopyURL();
-								} else if (cmd.equals(RichTextCommand.CUT)) {
-									setCopyURL();
-									CutAction action = new CutAction();
-									action.execute(RichText.this);
-								} else if (cmd
-										.equals(RichTextCommand.FIND_TEXT)) {
-									getFindReplaceAction().execute(RichText.this);
-								} else if (cmd.equals(RichTextCommand.PASTE)) {
-									PasteAction action = new PasteAction();
-									action.execute(RichText.this);
-								} else if (cmd.equals(RichTextCommand.SAVE)) {
-									PlatformUI.getWorkbench()
-											.getActiveWorkbenchWindow()
-											.getActivePage().getActiveEditor()
-											.doSave(null);
-								} else if (cmd.equals(RichTextCommand.SAVE_ALL)) {
-									PlatformUI.getWorkbench()
-											.getActiveWorkbenchWindow()
-											.getActivePage().saveAllEditors(
-													false);
-								}
-							}
-							break;
-						case STATUS_KEY_UP:
-							if (debug) {
-								printDebugMessage("statusTextListener", //$NON-NLS-1$
-										"STATUS_KEY_UP, modified=" + modified); //$NON-NLS-1$
-							}
-							checkModify();
-							break;
-						case STATUS_SELECT_TEXT:
-							if (eventTextLength >= STATUS_PREFIX_LENGTH + 2) {
-								String[] strings = eventText.substring(
-										STATUS_PREFIX_LENGTH + 2).split(
-										"\\$", 5); //$NON-NLS-1$
-								try {
-									// richTextSelection.setOffsetStart(Integer.parseInt(strings[0]));
-
-									richTextSelection.setFontName(strings[0]);
-									richTextSelection.setFontSize(strings[1]);
-									richTextSelection.setBlockStyle(strings[2]);
-									richTextSelection.setFlags(Integer
-											.parseInt(strings[3]));
-									richTextSelection.setText(strings[4]);
-								} catch (NumberFormatException e) {
-									logger.logError(e);
-								}
-								if (debug) {
-									printDebugMessage(
-											"selectionStatusListener", //$NON-NLS-1$
-											"current selection is=" + richTextSelection); //$NON-NLS-1$
-								}
-
-								hasSelection = true;
-								if (hasFocus())
-									notifyListeners(SWT.SELECTED, new Event());
-							} else {
-								richTextSelection.setText(""); //$NON-NLS-1$
-								hasSelection = false;
-							}
-							if (debug) {
-								printDebugMessage(
-										"statusTextListener", //$NON-NLS-1$
-										"STATUS_SELECT_TEXT, selectedText=", richTextSelection.getText()); //$NON-NLS-1$
-							}
-							break;
-						case STATUS_SELECT_CONTROL:
-							if (debug) {
-								printDebugMessage("statusTextListener", //$NON-NLS-1$
-										"STATUS_SELECT_CONTROL, control selected"); //$NON-NLS-1$
-							}
-							hasSelection = true;
-							break;
-						case STATUS_SELECT_NONE:
-							if (debug) {
-								printDebugMessage("statusTextListener", //$NON-NLS-1$
-										"STATUS_SELECT_NONE, no selection"); //$NON-NLS-1$
-							}
-							hasSelection = false;
-							break;
-						case STATUS_EXEC_CMD:
-							if (eventTextLength >= STATUS_PREFIX_LENGTH + 3) {
-								try {
-									status = Integer.parseInt(eventText
-											.substring(
-													STATUS_PREFIX_LENGTH + 2,
-													STATUS_PREFIX_LENGTH + 3));
-								} catch (Exception e) {
-									status = -1;
-								}
-							}
-							if (debug && status != 1) {
-								printDebugMessage("statusTextListener", //$NON-NLS-1$
-										"STATUS_EXEC_CMD, status=" + status); //$NON-NLS-1$
-							}
-							break;
-						}
-					} catch (Exception e) {
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * Generates the HTML source for the editor.
-	 * 
-	 * @return the HTML source for the editor
-	 */
-	protected String generateEditorHTML() throws Exception {
-		String escapedBasePath = basePath;
-		if (escapedBasePath.startsWith(FileUtil.UNC_PATH_PREFIX))
-			escapedBasePath = escapedBasePath.replaceFirst(
-					"^\\\\\\\\", "\\\\\\\\\\\\\\\\"); //$NON-NLS-1$ //$NON-NLS-2$
-		escapedBasePath = XMLUtil
-				.escape("file://" + escapedBasePath.replaceAll("'", "\\\\'")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		String escapedRteUTL = rteURL.replaceAll("&apos;", "%27"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		StringBuffer rteXML = new StringBuffer();
-		rteXML.append("<rte id=\"").append("rte") //$NON-NLS-1$ //$NON-NLS-2$
-				.append("\" css=\"").append(escapedRteUTL + "rte.css") //$NON-NLS-1$ //$NON-NLS-2$
-				.append("\" js=\"").append(escapedRteUTL + "rte.js") //$NON-NLS-1$ //$NON-NLS-2$
-				.append("\" baseURL=\"").append(escapedBasePath) //$NON-NLS-1$
-				.append("\"/>"); //$NON-NLS-1$
-		StringWriter result = new StringWriter();
-		XSLTProcessor.transform(
-				rteFolder + "rte.xsl", rteXML.toString(), result); //$NON-NLS-1$
-		return result.toString();
-	}
-
-	/**
-	 * Fills the context menu with menu items.
-	 * 
-	 * @param contextMenu
-	 *            a context menu containing rich text actions
-	 */
-	protected void fillContextMenu(Menu contextMenu) {
-		final MenuItem cutItem = new MenuItem(contextMenu, SWT.PUSH);
-		cutItem.setText(RichTextResources.cutAction_text);
-		cutItem.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				CutAction action = new CutAction();
-				action.execute(RichText.this);
-			}
-		});
-		final MenuItem copyItem = new MenuItem(contextMenu, SWT.PUSH);
-		copyItem.setText(RichTextResources.copyAction_text);
-		copyItem.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				CopyAction action = new CopyAction();
-				action.execute(RichText.this);
-			}
-		});
-		final MenuItem pasteItem = new MenuItem(contextMenu, SWT.PUSH);
-		pasteItem.setText(RichTextResources.pasteAction_text);
-		pasteItem.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				PasteAction action = new PasteAction();
-				action.execute(RichText.this);
-			}
-		});
-
-		final MenuItem pastePlainTextItem = new MenuItem(contextMenu, SWT.PUSH);
-		pastePlainTextItem.setText(RichTextResources.pastePlainTextAction_text);
-		pastePlainTextItem.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				PastePlainTextAction action = new PastePlainTextAction();
-				action.execute(RichText.this);
-			}
-		});
-
-		contextMenu.addMenuListener(new MenuListener() {
-			public void menuHidden(MenuEvent e) {
-			}
-
-			public void menuShown(MenuEvent e) {
-				getSelectedText();
-				cutItem.setEnabled(editable && hasSelection);
-				copyItem.setEnabled(hasSelection);
-				pasteItem.setEnabled(editable);
-				pastePlainTextItem.setEnabled(editable);
-			}
-		});
-	}
-
-	/**
-	 * Adds listeners to manage the activation and focus events.
-	 */
-	protected void addListeners() {
-		editorControl = getControlSite(editor);
-		if (editorControl != null) {
-			if (debug) {
-				printDebugMessage(
-						"init", "editorControl=" + editorControl.getClass().getName()); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-			editorControl.addListener(SWT.Activate, new Listener() {
-				public void handleEvent(Event event) {
-					if (debug) {
-						printDebugMessage("activateListener"); //$NON-NLS-1$
-					}
-					setFocus();
-					notifyListeners(SWT.Activate, event);
-				}
-			});
-
-			editorControl.addListener(SWT.Deactivate, new Listener() {
-				public void handleEvent(Event event) {
-					if (debug) {
-						printDebugMessage("deactivateListener"); //$NON-NLS-1$
-					}
-					setBlur();
-					notifyListeners(SWT.Deactivate, event);
-				}
-			});
-
-			editorControl.addListener(SWT.FocusIn, new Listener() {
-				public void handleEvent(Event event) {
-					if (debug) {
-						printDebugMessage("focusInListener"); //$NON-NLS-1$
-					}
-					executeCommand("updateSelection"); //$NON-NLS-1$					
-					notifyListeners(SWT.FocusIn, event);
-				}
-			});
-
-			editorControl.addListener(SWT.KeyUp, new Listener() {
-				public void handleEvent(Event event) {
-					int keyCode = event.keyCode;
-					int stateMask = event.stateMask;
-					if (debug) {
-						printDebugMessage(
-								"keyUpListener", "keyCode=" + keyCode //$NON-NLS-1$ //$NON-NLS-2$
-										+ ", stateMask=" + stateMask + ", editable=" + editable); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-					if ((stateMask & SWT.CTRL) > 0
-							|| (stateMask & SWT.ALT) > 0
-							|| ((stateMask & SWT.SHIFT) > 0 && keyCode == stateMask)) {
-						return;
-					}
-					if (editable) {
-						switch (event.keyCode) {
-						case SWT.ARROW_DOWN:
-						case SWT.ARROW_LEFT:
-						case SWT.ARROW_RIGHT:
-						case SWT.ARROW_UP:
-						case SWT.END:
-						case SWT.HOME:
-						case SWT.PAGE_DOWN:
-						case SWT.PAGE_UP:
-						case SWT.TAB:
-							return;
-						default:
-							checkModify();
-							break;
-						}
-					}
-				}
-			});
-
-			editor.addLocationListener(new LocationAdapter() {
-				public void changing(LocationEvent event) {
-					// Deactivate the links in the content page in readonly
-					// mode.
-					event.doit = editable;
-				}
-			});
-		} else {
-			editor.addListener(SWT.Activate, new Listener() {
-				public void handleEvent(Event event) {
-					if (debug) {
-						printDebugMessage("activateListener"); //$NON-NLS-1$
-					}
-					setFocus();
-				}
-			});
-
-			editor.addKeyListener(new KeyListener() {
-				public void keyPressed(KeyEvent e) {
-					if (e.keyCode == SWT.TAB) {
-						if ((e.stateMask & SWT.SHIFT) != 0) {
-							editor.traverse(SWT.TRAVERSE_TAB_PREVIOUS);
-						} else {
-							editor.traverse(SWT.TRAVERSE_TAB_NEXT);
-						}
-						return;
-					}
-					if (!editable) {
-						e.doit = false;
-					}
-				}
-
-				public void keyReleased(KeyEvent e) {
-					if ((e.stateMask & SWT.CTRL) > 0
-							|| (e.stateMask & SWT.ALT) > 0)
-						return;
-					if (editable) {
-						switch (e.keyCode) {
-						case SWT.ARROW_DOWN:
-						case SWT.ARROW_LEFT:
-						case SWT.ARROW_RIGHT:
-						case SWT.ARROW_UP:
-						case SWT.END:
-						case SWT.HOME:
-						case SWT.PAGE_DOWN:
-						case SWT.PAGE_UP:
-						case SWT.SHIFT:
-						case SWT.TAB:
-							break;
-						default:
-							checkModify();
-							break;
-						}
-					}
-				}
-			});
-		}
-
-		editor.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				if (debug) {
-					printDebugMessage("disposeListener"); //$NON-NLS-1$						
-				}
-				dispose();
-			}
-		});
-
-		listeners = new Hashtable<Listener, RichTextListener>();
-		modifyListeners = new ArrayList<ModifyListener>();
-	}
-
-	/**
-	 * Notifies the rich text event listeners.
-	 * 
-	 * @param eventType
-	 *            the event type
-	 * @param event
-	 *            the SWT event
-	 */
-	protected void notifyListeners(int eventType, Event event) {
-		if (notifyingModifyListeners) {
-			return;
-		}
-
-		event.display = Display.getCurrent();
-		event.widget = editor;
-
-		for (Iterator i = listeners.values().iterator(); i.hasNext();) {
-			RichTextListener listener = (RichTextListener) i.next();
-			if (listener.getEventType() == eventType) {
-				if (debug) {
-					printDebugMessage(
-							"notifyListeners", "notifying listener, " + listener + ", eventType=" + eventType); //$NON-NLS-1$ //$NON-NLS-2$	//$NON-NLS-3$	
-				}
-				listener.getListener().handleEvent(event);
-				if (debug) {
-					printDebugMessage(
-							"notifyListeners", "notified listener, " + listener + ", eventType=" + eventType); //$NON-NLS-1$ //$NON-NLS-2$	//$NON-NLS-3$	
-				}
-			}
-		}
-	}
-
-	/**
-	 * Notifies the modify listeners that the rich text editor content has
-	 * changed.
-	 */
-	public void notifyModifyListeners() {
-		notifyingModifyListeners = true;
-
-		Event event = new Event();
-		event.display = Display.getCurrent();
-		event.widget = editor;
-
-		for (Iterator i = modifyListeners.iterator(); i.hasNext();) {
-			ModifyListener listener = (ModifyListener) i.next();
-			if (debug) {
-				printDebugMessage(
-						"notifyModifyListeners", "notifying listener, " + listener); //$NON-NLS-1$ //$NON-NLS-2$	
-			}
-			listener.modifyText(new ModifyEvent(event));
-			if (debug) {
-				printDebugMessage(
-						"notifyModifyListeners", "notified listener, " + listener); //$NON-NLS-1$ //$NON-NLS-2$	
-			}
-		}
-
-		notifyingModifyListeners = false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.richtext.IRichText#checkModify()
-	 */
-	public void checkModify() {
-		if (modified) {
-			notifyModifyListeners();
-		} else {
-			if (!getText().equals(initialText)) {
-				modified = true;
-				notifyModifyListeners();
-			}
-		}
-		if (debug) {
-			printDebugMessage("checkModify", "modified=" + modified); //$NON-NLS-1$ //$NON-NLS-2$	
-		}
-	}
-
-	/**
-	 * This provides an opportunity for a sub class to tidy up the rich text.
-	 * 
-	 * @param text
-	 *            rich text encoded in HTML format
-	 */
-	protected String tidyText(String text) {
-		return text;
-	}
-
-	/**
-	 * Formats the text for consumption by the JavaScript/DHTML editor.
-	 * 
-	 * @param text
-	 *            rich text encoded in HTML format
-	 */
-	protected String formatText(String text) {
-		if (text == null || text.length() == 0) {
-			return text;
-		}
-		StringBuffer result = new StringBuffer();
-		int textSize = text.length();
-		for (int i = 0; i < textSize; i++) {
-			char ch = text.charAt(i);
-			switch (ch) {
-			case '\r':
-				break;
-			case '\t':
-				result.append(' ');
-				break;
-			case '\n':
-				result.append(ENCODED_NEWLINE);
-				break;
-			case '\'':
-				result.append(ENCODED_SINGLE_QUOTE);
-				break;
-			case '\\':
-				result.append("\\\\"); //$NON-NLS-1$
-				break;
-			default:
-				result.append(ch);
-			}
-		}
-		return result.toString();
-	}
-
-	/**
-	 * Returns the child <code>OleControlSite</code> contained within the
-	 * given <code>Composite</code>.
-	 * 
-	 * @param composite
-	 *            a <code>Composite</code> object, presumably a
-	 *            <code>Browser</code>
-	 * @return an <code>OleControlSite</code> object
-	 */
-	protected Control getControlSite(Composite composite) {
-		if (Platform.getOS().equals("win32")) { //$NON-NLS-1$
-			Control[] controls = composite.getChildren();
-			for (int i = 0; i < controls.length; i++) {
-				String controlClass = controls[i].getClass().getName();
-				if (controlClass.equals("org.eclipse.swt.browser.WebSite")) { //$NON-NLS-1$
-					return controls[i];
-				} else if (controls[i] instanceof Composite) {
-					return getControlSite((Composite) controls[i]);
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Displays the given debug message to the console.
-	 */
-	protected void printDebugMessage(String method, String msg, String text) {
-		StringBuffer strBuf = new StringBuffer();
-		strBuf.append("RichText[").append(editor.handle).append(']') //$NON-NLS-1$
-				.append('.').append(method);
-		if (msg != null && msg.length() > 0) {
-			strBuf.append(": ").append(msg); //$NON-NLS-1$
-		}
-		if (text != null && text.length() > 0) {
-			strBuf.append('\n').append(text);
-		}
-		System.out.println(strBuf);
-	}
-
-	/**
-	 * Displays the given debug message to the console.
-	 */
-	protected void printDebugMessage(String method, String msg) {
-		printDebugMessage(method, msg, null);
-	}
-
-	/**
-	 * Displays the given debug message to the console.
-	 */
-	protected void printDebugMessage(String method) {
-		printDebugMessage(method, null);
-	}
-
-	public FindReplaceAction getFindReplaceAction() {
-		return findReplaceAction;
-	}
-	
-	public void setFindReplaceAction(FindReplaceAction findReplaceAction) {
-		if (findReplaceAction != null) {
-			if (this.findReplaceAction != null && this.findReplaceAction != findReplaceAction) {
-				this.findReplaceAction.dispose();
-			}
-			this.findReplaceAction = findReplaceAction;
-			this.findReplaceAction.setRichText(this);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextCommand.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextCommand.java
deleted file mode 100755
index 769f7fa..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextCommand.java
+++ /dev/null
@@ -1,257 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-/**
- * Defines the editing commands supported by the default rich text control and
- * editor.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextCommand {
-
-	/**
-	 * Adds a HTML fragment.
-	 */
-	public static final String ADD_HTML = "addHTML"; //$NON-NLS-1$	
-
-	/**
-	 * Adds an image.
-	 */
-	public static final String ADD_IMAGE = "addImage"; //$NON-NLS-1$
-
-	/**
-	 * Adds a horizontal line.
-	 */
-	public static final String ADD_LINE = "addLine"; //$NON-NLS-1$
-
-	/**
-	 * Adds a link.
-	 */
-	public static final String ADD_LINK = "addLink"; //$NON-NLS-1$
-
-	/**
-	 * Inserts text over the current selection.
-	 */
-	public static final String INSERT_TEXT = "insertText"; //$NON-NLS-1$
-
-	/**
-	 * Adds an ordered list.
-	 */
-	public static final String ADD_ORDERED_LIST = "addOrderedList"; //$NON-NLS-1$
-
-	/**
-	 * Adds a table.
-	 */
-	public static final String ADD_TABLE = "addTable"; //$NON-NLS-1$
-
-	/**
-	 * Adds an unordered list.
-	 */
-	public static final String ADD_UNORDERED_LIST = "addUnorderedList"; //$NON-NLS-1$
-
-	/**
-	 * Sets the background color of the selected text.
-	 */
-	public static final String BACKGROUND_COLOR = "backColor"; //$NON-NLS-1$
-
-	/**
-	 * Toggles the 'bold' attribute of the selected text.
-	 */
-	public static final String BOLD = "bold"; //$NON-NLS-1$
-
-	/**
-	 * Clears the rich text content.
-	 */
-	public static final String CLEAR_CONTENT = "clearContent"; //$NON-NLS-1$
-
-	/**
-	 * Copies the selected text to the clipboard.
-	 */
-	public static final String COPY = "copy"; //$NON-NLS-1$
-
-	/**
-	 * Cuts the selected text to the clipboard.
-	 */
-	public static final String CUT = "cut"; //$NON-NLS-1$
-
-	/**
-	 * Deletes the selected text.
-	 */
-	public static final String DELETE = "deleteText"; //$NON-NLS-1$
-
-	/**
-	 * Finds text.
-	 */
-	public static final String FIND_TEXT = "findText"; //$NON-NLS-1$
-
-	/**
-	 * Gets the HTML source.
-	 */
-	public static final String GET_TEXT = "getText"; //$NON-NLS-1$	
-
-	/**
-	 * Sets the foreground color of the selected text.
-	 */
-	public static final String FORGROUND_COLOR = "foreColor"; //$NON-NLS-1$
-
-	/**
-	 * Formats the selected text.
-	 */
-	public static final String FORMAT_BLOCK = "formatBlock"; //$NON-NLS-1$
-
-	/**
-	 * Returns the selected text.
-	 */
-	public static final String GET_SELECTED_TEXT = "getSelectedText"; //$NON-NLS-1$
-
-	/**
-	 * Indents the selected text.
-	 */
-	public static final String INDENT = "indent"; //$NON-NLS-1$
-
-	/**
-	 * Toggles the 'italic' attribute of the selected text.
-	 */
-	public static final String ITALIC = "italic"; //$NON-NLS-1$
-
-	/**
-	 * Center justifies the selected text.
-	 */
-	public static final String JUSTIFY_CENTER = "justifyCenter"; //$NON-NLS-1$
-
-	/**
-	 * Fully justifies the selected text.
-	 */
-	public static final String JUSTIFY_FULL = "justifyFull"; //$NON-NLS-1$
-
-	/**
-	 * Left justifies the selected text.
-	 */
-	public static final String JUSTIFY_LEFT = "justifyLeft"; //$NON-NLS-1$
-
-	/**
-	 * Right justifies the selected text.
-	 */
-	public static final String JUSTIFY_RIGHT = "justifyRight"; //$NON-NLS-1$
-
-	/**
-	 * Outdents the selected text.
-	 */
-	public static final String OUTDENT = "outdent"; //$NON-NLS-1$
-
-	/**
-	 * Pastes text from the clipboard.
-	 */
-	public static final String PASTE = "paste"; //$NON-NLS-1$
-
-	/**
-	 * Replaces all text.
-	 */
-	public static final String REPLACE_ALL_TEXT = "replaceAllText"; //$NON-NLS-1$		
-
-	/**
-	 * Replaces the selected text.
-	 */
-	public static final String REPLACE_TEXT = "replaceText"; //$NON-NLS-1$		
-
-	/**
-	 * Redoes the previous command.
-	 */
-	public static final String REDO = "redo"; //$NON-NLS-1$
-
-	/**
-	 * Removes the current formatting of the selected text.
-	 */
-	public static final String REMOVE_FORMAT = "removeFormat"; //$NON-NLS-1$
-
-	/**
-	 * Saves the editor
-	 */
-	public static final String SAVE = "save"; //$NON-NLS-1$
-
-	/**
-	 * Saves all editors
-	 */
-	public static final String SAVE_ALL = "saveAll"; //$NON-NLS-1$
-
-	/**
-	 * Selects all text.
-	 */
-	public static final String SELECT_ALL = "selectAll"; //$NON-NLS-1$
-
-	/**
-	 * Sets the font name for the selected text.
-	 */
-	public static final String SET_FONT_NAME = "setFontName"; //$NON-NLS-1$
-
-	/**
-	 * Sets the font size for the selected text.
-	 */
-	public static final String SET_FONT_SIZE = "setFontSize"; //$NON-NLS-1$
-
-	/**
-	 * Sets the font style for the selected text.
-	 */
-	public static final String SET_FONT_STYLE = "setFontStyle"; //$NON-NLS-1$
-
-	/**
-	 * Sets whether the content can be edited.
-	 */
-	public static final String SET_EDITABLE = "setEditable"; //$NON-NLS-1$
-
-	/**
-	 * Sets focus to this control.
-	 */
-	public static final String SET_FOCUS = "setFocus"; //$NON-NLS-1$
-
-	/**
-	 * Sets the height of this control.
-	 */
-	public static final String SET_HEIGHT = "setHeight"; //$NON-NLS-1$
-
-	/**
-	 * Sets the HTML source.
-	 */
-	public static final String SET_TEXT = "setText"; //$NON-NLS-1$
-
-	/**
-	 * Toggles the 'strike-through' attribute of the selected text.
-	 */
-	public static final String STRIKE_THROUGH = "strikeThrough"; //$NON-NLS-1$
-
-	/**
-	 * Toggles the subscript attribute of the selected text.
-	 */
-	public static final String SUBSCRIPT = "subscript"; //$NON-NLS-1$
-
-	/**
-	 * Toggles the superscript attribute of the selected text.
-	 */
-	public static final String SUPERSCRIPT = "superscript"; //$NON-NLS-1$
-
-	/**
-	 * Toggles the underline attribute of the selected text.
-	 */
-	public static final String UNDERLINE = "underline"; //$NON-NLS-1$
-
-	/**
-	 * Undoes the previous command.
-	 */
-	public static final String UNDO = "undo"; //$NON-NLS-1$
-
-	/**
-	 * Converts a link to normal text.
-	 */
-	public static final String UNLINK = "unlink"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextEditor.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextEditor.java
deleted file mode 100755
index 6fa29ba..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextEditor.java
+++ /dev/null
@@ -1,1125 +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.richtext;
-
-import java.net.URL;
-import java.util.Iterator;
-
-import org.eclipse.core.commands.ParameterizedCommand;
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.epf.richtext.actions.CopyAction;
-import org.eclipse.epf.richtext.actions.CutAction;
-import org.eclipse.epf.richtext.actions.FindReplaceAction;
-import org.eclipse.epf.richtext.actions.PasteAction;
-import org.eclipse.epf.richtext.actions.PastePlainTextAction;
-import org.eclipse.jface.bindings.Binding;
-import org.eclipse.jface.bindings.keys.KeySequence;
-import org.eclipse.jface.bindings.keys.KeyStroke;
-import org.eclipse.jface.bindings.keys.SWTKeySupport;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTarget;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.DropTargetListener;
-import org.eclipse.swt.dnd.HTMLTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.HelpListener;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.events.MenuListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.keys.IBindingService;
-
-/**
- * The default rich text editor implementation.
- * <p>
- * The default rich text editor uses XHTML as the underlying markup language for
- * the rich text content. It is implemented using a <code>ViewForm</code>
- * control with a tool bar at the top, a tab folder that contains a
- * <code>RichText</code> control for entering the rich text content, and a tab
- * foler that contains a <code>StyleText</code> control for viewing and
- * modifying the XHTML representation of the rich text content.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class RichTextEditor implements IRichTextEditor {
-
-	// The HTML tab name.
-	protected static final String HTML_TAB_NAME = RichTextResources.htmlTab_text;
-
-	// If true, log debugging info.
-	protected boolean debug;
-
-	// The plug-in logger.
-	protected Logger logger;
-
-	// The base path used for resolving links (<href>, <img>, etc.).
-	protected String basePath;
-
-	// The editor form.
-	protected ViewForm form;
-
-	// The editor tool bar.
-	protected IRichTextToolBar toolBar;
-
-	// The editor content.
-	protected Composite content;
-
-	// The editor tab folder.
-	protected CTabFolder tabFolder;
-
-	// The rich text tab
-	protected CTabItem richTextTab;
-
-	// The HTML source tab
-	protected CTabItem htmlTab;
-
-	// The embedded rich text control.
-	protected IRichText richText;
-
-	// The underlying HTML text editor.
-	protected StyledText sourceEdit;
-	
-	// Drop support
-	DropTarget sourceEditDropTarget;
-
-	// HTML editor's context menu
-	protected Menu contextMenu;
-
-	// Has the HTML source been modified?
-	protected boolean sourceModified = false;
-
-	// The editor's editable flag.
-	protected boolean editable = true;
-
-	// The modify listener for the sourceEdit control.
-	protected ModifyListener sourceEditModifyListener = new ModifyListener() {
-		public void modifyText(ModifyEvent e) {
-			sourceModified = true;
-			if (richText != null && richText instanceof RichText) {
-				richText.notifyModifyListeners();
-			}
-		}
-	};
-
-	// The deactivate listener for the sourceEdit control.
-	protected Listener sourceEditDeactivateListener = new Listener() {
-		public void handleEvent(Event event) {
-			if (sourceModified) {
-				updateRichText(sourceEdit.getText());
-				setModified(true);
-				sourceModified = false;
-			}
-		}
-	};
-
-	// The key listener for the sourceEdit control.
-	protected KeyListener sourceEditKeyListener = new KeyListener() {
-		public void keyPressed(KeyEvent e) {
-			Object adapter = PlatformUI.getWorkbench().getAdapter(
-					IBindingService.class);
-			if (adapter != null && adapter instanceof IBindingService) {
-				int accel = SWTKeySupport
-						.convertEventToUnmodifiedAccelerator(e);
-				KeyStroke stroke = SWTKeySupport
-						.convertAcceleratorToKeyStroke(accel);
-				KeySequence seq = KeySequence.getInstance(stroke);
-				Binding bind = ((IBindingService) adapter).getPerfectMatch(seq);
-				if (bind != null) {
-					ParameterizedCommand command = bind
-							.getParameterizedCommand();
-					if (command != null) {
-						String cmdId = command.getId();
-						if (cmdId != null
-								&& cmdId
-										.equals("org.eclipse.ui.edit.findReplace")) { //$NON-NLS-1$
-							richText.getFindReplaceAction().execute(RichTextEditor.this);
-						}
-					}
-				}
-			}
-		}
-
-		public void keyReleased(KeyEvent e) {
-		}
-	};
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param parent
-	 *            the parent composite
-	 * @param style
-	 *            the editor style
-	 */
-	public RichTextEditor(Composite parent, int style) {
-		this(parent, style, null);
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param parent
-	 *            the parent composite
-	 * @param style
-	 *            the editor style
-	 * @param basePath
-	 *            the base path used for resolving links
-	 */
-	public RichTextEditor(Composite parent, int style, String basePath) {
-		this.basePath = basePath;
-		debug = RichTextPlugin.getDefault().isDebugging();
-		logger = RichTextPlugin.getDefault().getLogger();
-		init(parent, style);
-	}
-
-	/**
-	 * Initializes this editor.
-	 * 
-	 * @param parent
-	 *            the parent composite
-	 * @param style
-	 *            the editor style
-	 */
-	protected void init(Composite parent, int style) {
-		try {
-			form = new ViewForm(parent, style);
-			form.marginHeight = 0;
-			form.marginWidth = 0;
-
-			toolBar = new RichTextToolBar(form, SWT.FLAT, this);
-
-			content = new Composite(form, SWT.FLAT);
-			GridLayout layout = new GridLayout();
-			layout.marginHeight = 0;
-			layout.marginWidth = 0;
-			content.setLayout(layout);
-
-			tabFolder = createEditorTabFolder(content, style);
-
-			form.setTopLeft((Control) toolBar);
-			form.setContent(content);
-		} catch (Exception e) {
-			logger.logError(e);
-		}
-	}
-
-	/**
-	 * Returns the form control.
-	 * 
-	 * @return the form control
-	 */
-	public Control getControl() {
-		return form;
-	}
-
-	/**
-	 * Returns the rich text control embedded within this editor.
-	 */
-	public IRichText getRichTextControl() {
-		return richText;
-	}
-
-	/**
-	 * Sets the layout data.
-	 * 
-	 * @param layoutData
-	 *            the layout data to set
-	 */
-	public void setLayoutData(Object layoutData) {
-		if (form != null) {
-			form.setLayoutData(layoutData);
-		}
-	}
-
-	/**
-	 * Returns the layout data.
-	 * 
-	 * @return the editor's layout data
-	 */
-	public Object getLayoutData() {
-		if (form != null) {
-			return form.getLayoutData();
-		}
-		return null;
-	}
-
-	/**
-	 * Sets focus to this editor.
-	 */
-	public void setFocus() {
-		if (richText != null) {
-			richText.setFocus();
-		}
-		setSelection(0);
-	}
-
-	/**
-	 * Tells the control it does not have focus.
-	 */
-	public void setBlur() {
-		if (richText != null) {
-			richText.setBlur();
-		}
-	}
-	
-	/**
-	 * Checks whether this editor has focus.
-	 * 
-	 * @return <code>true</code> if this editor has the user-interface focus
-	 */
-	public boolean hasFocus() {
-		if (richText != null) {
-			return richText.hasFocus();
-		}
-		return false;
-	}
-
-	/**
-	 * Selects the Rich Text or HTML tab.
-	 * 
-	 * @param index
-	 *            <code>0</code> for the Rich Text tab, <code>1</code> for
-	 *            the HTML tab.
-	 */
-	public void setSelection(int index) {
-		if (tabFolder != null) {
-			tabFolder.setSelection(index);
-		}
-	}
-
-	/**
-	 * Returns the base path used for resolving text and image links.
-	 * 
-	 * @return the base path used for resolving links specified with <href>,
-	 *         <img>, etc.
-	 */
-	public String getBasePath() {
-		return basePath;
-	}
-
-	/**
-	 * Returns the base URL of the rich text control whose content was last
-	 * copied to the clipboard.
-	 * 
-	 * @return the base URL of a rich text control
-	 */
-	public URL getCopyURL() {
-		if (richText != null) {
-			return richText.getCopyURL();
-		}
-		return null;
-	}
-
-	/**
-	 * Sets the base URL of the rich text control whose content was last copied
-	 * to the clipboard.
-	 */
-	public void setCopyURL() {
-		if (richText != null) {
-			richText.setCopyURL();
-		}
-	}
-
-	/**
-	 * Returns the editable state.
-	 * 
-	 * @return <code>true</code> if the content can be edited
-	 */
-	public boolean getEditable() {
-		return editable;
-	}
-
-	/**
-	 * Sets the editable state.
-	 * 
-	 * @param editable
-	 *            the editable state
-	 */
-	public void setEditable(boolean editable) {
-		this.editable = editable;
-		if (toolBar != null && tabFolder != null) {
-			if (tabFolder.getSelection() == richTextTab) {
-				toolBar.updateToolBar(editable);
-			}
-		}
-		if (richText != null) {
-			richText.setEditable(editable);
-		}
-		if (sourceEdit != null) {
-			sourceEdit.setEditable(editable);
-			sourceEdit.getEditable();
-		}
-	}
-
-	/**
-	 * Checks whether the content has been modified.
-	 * 
-	 * @return <code>true</code> if the content has been modified
-	 */
-	public boolean getModified() {
-		if (richText != null) {
-			return richText.getModified();
-		}
-		return false;
-	}
-
-	/**
-	 * Sets the modified state.
-	 * 
-	 * @param modified
-	 *            the modified state
-	 */
-	public void setModified(boolean modified) {
-		if (richText != null) {
-			richText.setModified(modified);
-		}
-	}
-
-	/**
-	 * Returns the rich text content.
-	 * 
-	 * @return the rich text content formatted in XHTML
-	 */
-	public String getText() {
-		if (sourceModified) {
-			setText(sourceEdit.getText());
-			setModified(true);
-			sourceModified = false;
-		}
-		if (richText != null) {
-			return richText.getText();
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Sets the rich text content.
-	 * 
-	 * @param text
-	 *            the rich text content in XHTML format
-	 */
-	public void setText(String text) {
-		if (richText != null) {
-			richText.setText(text);
-		}
-		sourceModified = false;
-		if (tabFolder != null) {
-			if (toolBar != null) {
-				toolBar.updateToolBar(editable);
-			}
-			if (sourceEdit != null) {
-				sourceEdit.removeModifyListener(sourceEditModifyListener);
-				sourceEdit.setText(getText());
-				sourceEdit.addModifyListener(sourceEditModifyListener);
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.richtext.IRichText#checkModify()
-	 */
-	public void checkModify() {
-		richText.checkModify();
-		if (sourceModified) {
-			notifyModifyListeners();
-		}
-		if (debug) {
-			printDebugMessage("checkModify", "modified=" + sourceModified); //$NON-NLS-1$ //$NON-NLS-2$	
-		}
-	}
-
-	/**
-	 * Restores the rich text content back to the initial value.
-	 */
-	public void restoreText() {
-		if (richText != null) {
-			richText.restoreText();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.richtext.IRichText#getSelected()
-	 */
-	public RichTextSelection getSelected() {
-		if (tabFolder.getSelection() == htmlTab) {
-			String HTMLsource = sourceEdit.getText();
-			Point sel = sourceEdit.getSelectionRange();
-			int selStartIndex = sel.x;
-			int selEndIndex = sel.x + sel.y - 1;
-			richText.getSelected().clear();
-			richText.getSelected().setText(HTMLsource.substring(selStartIndex, selEndIndex + 1));
-		}
-		return richText.getSelected();
-	}
-
-	/**
-	 * Returns an application specific property value.
-	 * 
-	 * @param key
-	 *            the name of the property
-	 * @return the value of the property or <code>null</code> if it has not
-	 *         been set
-	 */
-	public Object getData(String key) {
-		if (richText != null) {
-			richText.getData(key);
-		}
-		return null;
-	}
-
-	/**
-	 * Sets an application specific property name and value.
-	 * 
-	 * @param key
-	 *            the name of the property
-	 * @param value
-	 *            the new value for the property
-	 */
-	public void setData(String key, Object value) {
-		if (richText != null) {
-			richText.setData(key, value);
-		}
-	}
-
-	/**
-	 * Executes the given rich text command. The supported command strings are
-	 * defined in <code>RichTextCommand<code>.
-	 * 
-	 * @param	command		a rich text command string
-	 * @return	a status code returned by the executed command
-	 */
-	public int executeCommand(String command) {
-		if (richText != null) {
-			return richText.executeCommand(command);
-		}
-		return 0;
-	}
-
-	/**
-	 * Executes the given rich text command with a single parameter. The
-	 * supported command strings are defined in <code>RichTextCommand<code>.
-	 * 
-	 * @param	command		a rich text command string
-	 * @param	param		a parameter for the command or <code>null</code>
-	 * @return	a status code returned by the executed command
-	 */
-	public int executeCommand(String command, String param) {
-		if (richText != null) {
-			return richText.executeCommand(command, param);
-		}
-		return 0;
-	}
-
-	/**
-	 * Executes the given rich text command with an array of parameters. The
-	 * supported command strings are defined in <code>RichTextCommand<code>.
-	 * 
-	 * @param	command		a rich text command string
-	 * @param	params		an array of parameters for the command or <code>null</code>
-	 * @return	a status code returned by the executed command
-	 */
-	public int executeCommand(String command, String[] params) {
-		if (richText != null) {
-			return richText.executeCommand(command, params);
-		}
-		return 0;
-	}
-
-	/**
-	 * Disposes the operating system resources allocated by this editor.
-	 */
-	public void dispose() {
-		if (contextMenu != null && !contextMenu.isDisposed()) {
-			contextMenu.dispose();
-			contextMenu = null;
-		}
-		if (sourceEditDropTarget != null) {
-			sourceEditDropTarget.dispose();
-			sourceEditDropTarget = null;
-		}
-		if (sourceEdit != null) {
-			sourceEdit.removeModifyListener(sourceEditModifyListener);
-			sourceEdit.removeListener(SWT.Deactivate,
-					sourceEditDeactivateListener);
-			sourceEdit.removeKeyListener(sourceEditKeyListener);
-			sourceEditModifyListener = null;
-			sourceEditDeactivateListener = null;
-			sourceEditKeyListener = null;
-		}
-		if (richText != null) {
-			richText.dispose();
-			richText = null;
-		}
-	}
-
-	/**
-	 * Checks whether this control has been disposed.
-	 * 
-	 * @return <code>true</code> if this control is disposed successfully
-	 */
-	public boolean isDisposed() {
-		if (richText != null) {
-			return richText.isDisposed();
-		}
-		return true;
-	}
-
-	/**
-	 * Returns the modify listeners attached to this editor.
-	 * 
-	 * @return an iterator for retrieving the modify listeners
-	 */
-	public Iterator getModifyListeners() {
-		if (richText != null) {
-			richText.getModifyListeners();
-		}
-		return null;
-	}
-
-	/**
-	 * Adds a listener to the collection of listeners who will be notified when
-	 * keys are pressed and released within this editor.
-	 * 
-	 * @param listener
-	 *            the listener which should be notified
-	 */
-	public void addKeyListener(KeyListener listener) {
-		if (richText != null) {
-			richText.addKeyListener(listener);
-		}
-	}
-
-	/**
-	 * Removes a listener from the collection of listeners who will be notified
-	 * when keys are pressed and released within this editor.
-	 * 
-	 * @param listener
-	 *            the listener which should no longer be notified
-	 */
-	public void removeKeyListener(KeyListener listener) {
-		if (richText != null) {
-			richText.removeKeyListener(listener);
-		}
-	}
-
-	/**
-	 * Adds a listener to the collection of listeners who will be notified when
-	 * the content of this editor is modified.
-	 * 
-	 * @param listener
-	 *            the listener which should be notified
-	 */
-	public void addModifyListener(ModifyListener listener) {
-		if (richText != null) {
-			richText.addModifyListener(listener);
-		}
-	}
-
-	/**
-	 * Removes a listener from the collection of listeners who will be notified
-	 * when the content of this editor is modified.
-	 * 
-	 * @param listener
-	 *            the listener which should no longer be notified
-	 */
-	public void removeModifyListener(ModifyListener listener) {
-		if (richText != null) {
-			richText.removeModifyListener(listener);
-		}
-	}
-
-	/**
-	 * Adds the listener to the collection of listeners who will be notifed when
-	 * this editor is disposed.
-	 * 
-	 * @param listener
-	 *            the listener which should be notified
-	 */
-	public void addDisposeListener(DisposeListener listener) {
-		if (richText != null) {
-			richText.addDisposeListener(listener);
-		}
-	}
-
-	/**
-	 * Removes a listener from the collection of listeners who will be notified
-	 * when this editor is disposed.
-	 * 
-	 * @param listener
-	 *            the listener which should no longer be notified
-	 */
-	public void removeDisposeListener(DisposeListener listener) {
-		if (richText != null) {
-			richText.removeDisposeListener(listener);
-		}
-	}
-
-	/**
-	 * Adds a listener to the collection of listeners who will be notified when
-	 * help events are generated for this editor.
-	 * 
-	 * @param listener
-	 *            the listener which should be notified
-	 */
-	public void addHelpListener(HelpListener listener) {
-		if (richText != null) {
-			richText.addHelpListener(listener);
-		}
-	}
-
-	/**
-	 * Removes a listener from the collection of listeners who will be notified
-	 * when help events are generated for this editor.
-	 * 
-	 * @param listener
-	 *            the listener which should no longer be notified
-	 */
-	public void removeHelpListener(HelpListener listener) {
-		if (richText != null) {
-			richText.removeHelpListener(listener);
-		}
-	}
-
-	/**
-	 * Adds the listener to the collection of listeners who will be notifed when
-	 * an event of the given type occurs within this editor.
-	 * 
-	 * @param eventType
-	 *            the type of event to listen for
-	 * @param listener
-	 *            the listener which should be notified when the event occurs
-	 */
-	public void addListener(int eventType, Listener listener) {
-		if (richText != null) {
-			richText.addListener(eventType, listener);
-		}
-	}
-
-	/**
-	 * Removes the listener from the collection of listeners who will be notifed
-	 * when an event of the given type occurs within this editor.
-	 * 
-	 * @param eventType
-	 *            the type of event to listen for
-	 * @param listener
-	 *            the listener which should no longer be notified when the event
-	 *            occurs
-	 */
-	public void removeListener(int eventType, Listener listener) {
-		if (richText != null) {
-			richText.removeListener(eventType, listener);
-		}
-	}
-
-	/**
-	 * Returns the event listeners attached to this editor.
-	 * 
-	 * @return an iterator for retrieving the event listeners attached to this
-	 *         editor
-	 */
-	public Iterator getListeners() {
-		if (richText != null) {
-			return richText.getListeners();
-		}
-		return null;
-	}
-
-	/**
-	 * Notifies the modify listeners that the rich text editor content has
-	 * changed.
-	 */
-	public void notifyModifyListeners() {
-		if (richText != null) {
-			Event event = new Event();
-			event.display = Display.getCurrent();
-			event.widget = richText.getControl();
-
-			for (Iterator i = getModifyListeners(); i != null && i.hasNext();) {
-				ModifyListener listener = (ModifyListener) i.next();
-				listener.modifyText(new ModifyEvent(event));
-			}
-		}
-	}
-
-	/**
-	 * Fills the tool bar with action items.
-	 * 
-	 * @param toolBar
-	 *            a tool bar contain rich text actions
-	 */
-	public void fillToolBar(IRichTextToolBar toolBar) {
-	}
-
-	/**
-	 * Creates the underlying rich text control.
-	 * 
-	 * @param parent
-	 *            the parent composite
-	 * @param style
-	 *            the style for the control
-	 * @param basePath
-	 *            the path used for resolving links
-	 */
-	protected IRichText createRichTextControl(Composite parent, int style,
-			String basePath) {
-		return new RichText(parent, style, basePath);
-	}
-
-	/**
-	 * Creates the editor tab folder.
-	 * 
-	 * @param parent
-	 *            the parent control
-	 * @param style
-	 *            the style for the control
-	 * @return a new editor toolbar
-	 */
-	protected CTabFolder createEditorTabFolder(Composite parent, int style) {
-		CTabFolder folder = new CTabFolder(parent, SWT.FLAT | SWT.BOTTOM);
-		folder.setLayout(new GridLayout(1, true));
-		folder.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		Composite richTextComposite = new Composite(folder, SWT.FLAT);
-		GridLayout richTextCompositeLayout = new GridLayout(1, false);
-		richTextCompositeLayout.marginHeight = 0;
-		richTextCompositeLayout.marginWidth = 0;
-		richTextComposite.setLayout(richTextCompositeLayout);
-		richTextComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		richText = createRichTextControl(richTextComposite, style, basePath);
-		richText.setData(PROPERTY_NAME, this);
-		richText.getFindReplaceAction().setRichText(this);
-
-		richTextTab = new CTabItem(folder, SWT.FLAT);
-		richTextTab.setText(RichTextResources.richTextTab_text);
-		richTextTab.setToolTipText(RichTextResources.richTextTab_toolTipText);
-		richTextTab.setControl(richTextComposite);
-
-		Composite htmlComposite = new Composite(folder, SWT.FLAT);
-		htmlComposite.setLayout(new FillLayout());
-
-		sourceEdit = new StyledText(htmlComposite, SWT.FLAT | SWT.MULTI
-				| SWT.WRAP | SWT.V_SCROLL);
-		sourceEdit.addModifyListener(sourceEditModifyListener);
-		sourceEdit.addListener(SWT.Deactivate, sourceEditDeactivateListener);
-		sourceEdit.addKeyListener(sourceEditKeyListener);
-		contextMenu = new Menu(parent.getShell(), SWT.POP_UP);
-		sourceEdit.setMenu(contextMenu);
-		addDropSupportToStyledText();
-		fillContextMenu(contextMenu);
-
-		htmlTab = new CTabItem(folder, SWT.NONE);
-		htmlTab.setText(HTML_TAB_NAME);
-		htmlTab.setToolTipText(RichTextResources.htmlTab_toolTipText); 
-		htmlTab.setControl(htmlComposite);
-
-		folder.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				CTabItem item = (CTabItem) event.item;
-				if (item.getText().equals(HTML_TAB_NAME)) {
-					sourceEdit.removeModifyListener(sourceEditModifyListener);
-					sourceEdit.setText(getText());
-					sourceModified = false;
-					sourceEdit.addModifyListener(sourceEditModifyListener);
-					if (toolBar != null) {
-						toolBar.updateToolBar(editable);
-					}
-					sourceEdit.setCaretOffset(richText.getSelected().getOffsetStart());
-				} else {
-					updateRichText(sourceEdit.getText());
-					setModified(true);
-					if (toolBar != null) {
-						toolBar.updateToolBar(editable);
-					}
-				}
-			}
-		});
-		fillToolBar(toolBar);
-
-		folder.setSelection(0);
-
-		return folder;
-	}
-
-	/**
-	 * Returns the HTML source edit control.
-	 * 
-	 * @return a <code>StyleText</code> object.
-	 */
-	public StyledText getSourceEdit() {
-		return sourceEdit;
-	}
-
-	/**
-	 * Inserts text at the selection (overwriting the selection).
-	 */
-	public void addHTML(String text) {
-		if (text == null || text.length() == 0) 
-			return;
-		if (tabFolder.getSelection() == richTextTab) {
-			executeCommand(RichTextCommand.ADD_HTML, text);
-		} else if (tabFolder.getSelection() == htmlTab) {
-			String oldHTML = sourceEdit.getText();
-			Point sel = sourceEdit.getSelectionRange();
-			int selStartIndex = sel.x;
-			int selEndIndex = sel.x + sel.y - 1;
-			String newHTML = oldHTML.substring(0, selStartIndex) + text
-					+ oldHTML.substring(selEndIndex + 1);
-			sourceEdit.removeModifyListener(sourceEditModifyListener);
-			sourceEdit.setText(newHTML);
-			sourceEdit.addModifyListener(sourceEditModifyListener);
-			updateRichText(newHTML);
-		}
-	}
-
-	
-	/**
-	 * Inserts an image at the selection (overwriting the selection).
-	 */
-	public void addImage(String imageURL, String height, String width, String altTag) {
-		if (tabFolder.getSelection() == richTextTab) {
-			executeCommand(
-					RichTextCommand.ADD_IMAGE,
-					new String[] {
-							imageURL,
-							height, width, altTag });
-		} else if (tabFolder.getSelection() == htmlTab) {
-			StringBuffer imageLink = new StringBuffer();
-			// order of these attributes is the same as JTidy'ed HTML
-			imageLink.append("<img"); //$NON-NLS-1$
-			if (height.length() > 0) {
-				imageLink.append(" height=\"" + height + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			if (altTag.length() > 0) {
-				imageLink.append(" alt=\"" + altTag + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			imageLink.append(" src=\"" + imageURL + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-			if (width.length() > 0) {
-				imageLink.append(" width=\"" + width + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			imageLink.append(" />"); //$NON-NLS-1$
-			String oldHTML = sourceEdit.getText();
-			Point sel = sourceEdit.getSelectionRange();
-			int selStartIndex = sel.x;
-			int selEndIndex = sel.x + sel.y - 1;
-			String newHTML = oldHTML.substring(0, selStartIndex) + imageLink.toString()
-					+ oldHTML.substring(selEndIndex + 1);
-			sourceEdit.removeModifyListener(sourceEditModifyListener);
-			sourceEdit.setText(newHTML);
-			sourceEdit.addModifyListener(sourceEditModifyListener);
-			updateRichText(newHTML);
-		}
-	}
-
-	/**
-	 * Checks whether the HTML tab is selected.
-	 * 
-	 * @return <code>true</code> if the HTML tab is selected.
-	 */
-	public boolean isHTMLTabSelected() {
-		return (tabFolder.getSelection() == htmlTab);
-	}
-
-	/**
-	 * Fills the context menu with menu items.
-	 * 
-	 * @param contextMenu
-	 *            a context menu containing rich text actions
-	 */
-	protected void fillContextMenu(Menu contextMenu) {
-		final MenuItem cutItem = new MenuItem(contextMenu, SWT.PUSH);
-		cutItem.setText(RichTextResources.cutAction_text);
-		cutItem.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				CutAction action = new CutAction();
-				action.execute(RichTextEditor.this);
-			}
-		});
-		final MenuItem copyItem = new MenuItem(contextMenu, SWT.PUSH);
-		copyItem.setText(RichTextResources.copyAction_text); 
-		copyItem.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				CopyAction action = new CopyAction();
-				action.execute(RichTextEditor.this);
-			}
-		});
-		final MenuItem pasteItem = new MenuItem(contextMenu, SWT.PUSH);
-		pasteItem.setText(RichTextResources.pasteAction_text); 
-		pasteItem.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				PasteAction action = new PasteAction();
-				action.execute(RichTextEditor.this);
-			}
-		});
-		
-		final MenuItem pastePlainTextItem = new MenuItem(contextMenu, SWT.PUSH);
-		pastePlainTextItem.setText(RichTextResources.pastePlainTextAction_text);
-		pastePlainTextItem.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				PastePlainTextAction action = new PastePlainTextAction();
-				action.execute(RichTextEditor.this);
-			}
-		});
-
-		contextMenu.addMenuListener(new MenuListener() {
-			public void menuHidden(MenuEvent e) {
-			}
-
-			public void menuShown(MenuEvent e) {
-				String selectedText = getSelected().getText();
-				boolean selection = selectedText.length() > 0;
-				cutItem.setEnabled(editable && selection);
-				copyItem.setEnabled(selection);
-				pasteItem.setEnabled(editable);
-				pastePlainTextItem.setEnabled(editable);
-			}
-		});
-	}
-
-	/**
-	 * Updates the content of the rich text control without updating the HTML
-	 * source editor.
-	 * <p>
-	 * This method should be called by the HTML source editor to sync up its
-	 * content with the rich text control.
-	 * 
-	 * @param text
-	 *            the rich text content in XHTML format
-	 */
-	private void updateRichText(String text) {
-		if (richText != null) {
-			richText.setText(text);
-			richText.checkModify();
-		}
-		sourceModified = false;
-		if (tabFolder != null) {
-			if (toolBar != null) {
-				toolBar.updateToolBar(editable);
-			}
-		}
-	}
-	
-	private void addDropSupportToStyledText() {
-		// this function based heavily on the example at:
-		// http://www.eclipse.org/articles/Article-SWT-DND/DND-in-SWT.html
-		
-		 	// Allow data to be copied to the drop target
-			int operations = DND.DROP_MOVE |  DND.DROP_COPY | DND.DROP_DEFAULT;
-			sourceEditDropTarget = new DropTarget(sourceEdit, operations);
-		 
-			// Receive data in Text or HTML format
-			final TextTransfer textTransfer = TextTransfer.getInstance();
-			final HTMLTransfer htmlTransfer = HTMLTransfer.getInstance();
-			Transfer[] types = new Transfer[] {htmlTransfer, textTransfer};
-			sourceEditDropTarget.setTransfer(types);
-			 
-			sourceEditDropTarget.addDropListener(new DropTargetListener() {
-			  public void dragEnter(DropTargetEvent event) {
-			     if (event.detail == DND.DROP_DEFAULT) {
-			         if ((event.operations & DND.DROP_COPY) != 0) {
-			             event.detail = DND.DROP_COPY;
-			         } else {
-			             event.detail = DND.DROP_NONE;
-			         }
-			     }
-			     // will accept text but prefer to have HTML dropped
-			     for (int i = 0; i < event.dataTypes.length; i++) {
-			         if (htmlTransfer.isSupportedType(event.dataTypes[i])){
-			             event.currentDataType = event.dataTypes[i];
-			             break;
-			         }
-			     }
-			   }
-			   public void dragOver(DropTargetEvent event) {
-			        event.feedback = DND.FEEDBACK_SELECT | DND.FEEDBACK_INSERT_AFTER | DND.FEEDBACK_SCROLL;
-			    }
-			    public void dragOperationChanged(DropTargetEvent event) {
-			        if (event.detail == DND.DROP_DEFAULT) {
-			            if ((event.operations & DND.DROP_COPY) != 0) {
-			                event.detail = DND.DROP_COPY;
-			            } else {
-			                event.detail = DND.DROP_NONE;
-			            }
-			        }
-			    }
-			    public void dragLeave(DropTargetEvent event) {
-			    }
-			    public void dropAccept(DropTargetEvent event) {
-			    }
-			    public void drop(DropTargetEvent event) {
-			        if (textTransfer.isSupportedType(event.currentDataType) || 
-			        		htmlTransfer.isSupportedType(event.currentDataType)) {
-			            String text = (String)event.data;
-			            addHTML(text);
-			        }
-			    }
-			});
-	}
-	
-	/**
-	 * Displays the given debug message to the console.
-	 */
-	private void printDebugMessage(String method, String msg, String text) {
-		StringBuffer strBuf = new StringBuffer();
-		strBuf.append("RichTextEditor[").append(richText.getControl().handle).append(']') //$NON-NLS-1$
-				.append('.').append(method);
-		if (msg != null && msg.length() > 0) {
-			strBuf.append(": ").append(msg); //$NON-NLS-1$
-		}
-		if (text != null && text.length() > 0) {
-			strBuf.append('\n').append(text);
-		}
-		System.out.println(strBuf);
-	}
-
-	/**
-	 * Displays the given debug message to the console.
-	 */
-	private void printDebugMessage(String method, String msg) {
-		printDebugMessage(method, msg, null);
-	}
-	
-	public FindReplaceAction getFindReplaceAction() {
-		return richText.getFindReplaceAction();
-	}
-
-	public void setFindReplaceAction(FindReplaceAction findReplaceAction) {
-		richText.setFindReplaceAction(findReplaceAction);
-		richText.getFindReplaceAction().setRichText(this);
-	}
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextEditorForm.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextEditorForm.java
deleted file mode 100755
index 1851a38..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextEditorForm.java
+++ /dev/null
@@ -1,49 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * A composite for laying out the default rich text editor in an Eclipse form.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextEditorForm extends ViewForm {
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param parent
-	 *            the parent control
-	 * @param style
-	 *            the style for this control
-	 */
-	public RichTextEditorForm(Composite parent, int style) {
-		super(parent, style);
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets#getData(String key)
-	 */
-	public Object getData(String key) {
-		if (key != null && key.equals(FormToolkit.KEY_DRAW_BORDER)) {
-			// Return a text border to get the FormToolkit's BorderPainter to
-			// paint a border for the rich text editor.
-			return FormToolkit.TEXT_BORDER;
-		}
-		return super.getData();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextFormToolkit.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextFormToolkit.java
deleted file mode 100755
index ddaa8b5..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextFormToolkit.java
+++ /dev/null
@@ -1,80 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * A helper toolkit for creating a rich text control and editor that can be
- * added to an Eclipse form.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextFormToolkit {
-
-	/**
-	 * Creates a rich text control and adapts it to be used in a form.
-	 * 
-	 * @param toolkit
-	 *            the form toolkit
-	 * @param parent
-	 *            the parent control
-	 * @param text
-	 *            the initial text for the viewer
-	 * @param style
-	 *            the initial style for the viewer
-	 * @param basePath
-	 *            the base path used for resolving hrefs
-	 * @return a new <code>IRichText</code> instance
-	 */
-	public static IRichText createRichText(FormToolkit toolkit,
-			Composite parent, String text, int style) {
-		IRichText richText = new RichText(parent, toolkit.getBorderStyle()
-				| style | toolkit.getOrientation());
-		richText.getControl().setData(FormToolkit.KEY_DRAW_BORDER,
-				FormToolkit.TEXT_BORDER);
-		if (text != null) {
-			richText.setText(text);
-		}
-		return richText;
-	}
-
-	/**
-	 * Creates a rich text editor and adapts it to be used in a form.
-	 * 
-	 * @param toolkit
-	 *            the form toolkit
-	 * @param parent
-	 *            the parent control
-	 * @param text
-	 *            the initial text for the viewer
-	 * @param style
-	 *            the initial style for the viewer
-	 * @param basePath
-	 *            the base path used for resolving hrefs
-	 * @return a new <code>IRichText</code> instance
-	 */
-	public static IRichTextEditor createRichTextEditor(FormToolkit toolkit,
-			Composite parent, String text, int style) {
-		IRichTextEditor richTextEditor = new RichTextEditor(parent, toolkit
-				.getBorderStyle()
-				| style | toolkit.getOrientation());
-		richTextEditor.getControl().setData(FormToolkit.KEY_DRAW_BORDER,
-				FormToolkit.TEXT_BORDER);
-		if (text != null) {
-			richTextEditor.setText(text);
-		}
-		return richTextEditor;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextImages.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextImages.java
deleted file mode 100755
index bc1bb23..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextImages.java
+++ /dev/null
@@ -1,428 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Shared images used by the default rich text editor.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextImages {
-
-	private static final String ETOOL16 = "full/etool16/"; //$NON-NLS-1$
-
-	private static final String DTOOL16 = "full/dtool16/"; //$NON-NLS-1$	
-
-	private static final RichTextPlugin richTextPlugin = RichTextPlugin
-			.getDefault();
-
-	public static final String IMG_PATH_ADD_IMAGE = ETOOL16 + "AddImage.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_ADD_LINE = ETOOL16 + "AddLine.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_ADD_LINK = ETOOL16 + "AddLink.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_ADD_ORDERED_LIST = ETOOL16
-			+ "AddOrderedList.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_ADD_TABLE = ETOOL16 + "AddTable.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_ADD_UNORDERED_LIST = ETOOL16
-			+ "AddUnorderedList.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_BOLD = ETOOL16 + "Bold.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_CLEAR_CONTENT = ETOOL16
-			+ "ClearContent.gif"; //$NON-NLS-1$	
-
-	public static final String IMG_PATH_COPY = ETOOL16 + "Copy.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_CUT = ETOOL16 + "Cut.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_FIND_REPLACE = ETOOL16
-			+ "FindReplace.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_INDENT = ETOOL16 + "Indent.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_ITALIC = ETOOL16 + "Italic.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_JUSTIFY_CENTER = ETOOL16
-			+ "JustifyCenter.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_JUSTIFY_FULL = ETOOL16
-			+ "JustifyFull.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_JUSTIFY_LEFT = ETOOL16
-			+ "JustifyLeft.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_JUSTIFY_RIGHT = ETOOL16
-			+ "JustifyRight.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_OUTDENT = ETOOL16 + "Outdent.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_PASTE = ETOOL16 + "Paste.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_STRIKE_THROUGH = ETOOL16
-			+ "StrikeThrough.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_SUBSCRIPT = ETOOL16 + "Subscript.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_SUPERSCRIPT = ETOOL16
-			+ "Superscript.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PATH_UNDERLINE = ETOOL16 + "Underline.gif"; //$NON-NLS-1$
-
-	public static final Image IMG_ADD_IMAGE = richTextPlugin
-			.getSharedImage(IMG_PATH_ADD_IMAGE);
-
-	public static final Image IMG_ADD_LINE = richTextPlugin
-			.getSharedImage(IMG_PATH_ADD_LINE);
-
-	public static final Image IMG_ADD_LINK = richTextPlugin
-			.getSharedImage(IMG_PATH_ADD_LINK);
-
-	public static final Image IMG_ADD_ORDERED_LIST = richTextPlugin
-			.getSharedImage(IMG_PATH_ADD_ORDERED_LIST);
-
-	public static final Image IMG_ADD_TABLE = richTextPlugin
-			.getSharedImage(IMG_PATH_ADD_TABLE);
-
-	public static final Image IMG_ADD_UNORDERED_LIST = richTextPlugin
-			.getSharedImage(IMG_PATH_ADD_UNORDERED_LIST);
-
-	public static final Image IMG_BOLD = richTextPlugin
-			.getSharedImage(IMG_PATH_BOLD);
-
-	public static final Image IMG_CLEAR_CONTENT = richTextPlugin
-			.getSharedImage(IMG_PATH_CLEAR_CONTENT);
-
-	public static final Image IMG_COPY = richTextPlugin
-			.getSharedImage(IMG_PATH_COPY);
-
-	public static final Image IMG_CUT = richTextPlugin
-			.getSharedImage(IMG_PATH_CUT);
-
-	public static final Image IMG_FIND_REPLACE = richTextPlugin
-			.getSharedImage(IMG_PATH_FIND_REPLACE);
-
-	public static final Image IMG_INDENT = richTextPlugin
-			.getSharedImage(IMG_PATH_INDENT);
-
-	public static final Image IMG_ITALIC = richTextPlugin
-			.getSharedImage(IMG_PATH_ITALIC);
-
-	public static final Image IMG_JUSTIFY_CENTER = richTextPlugin
-			.getSharedImage(IMG_PATH_JUSTIFY_CENTER);
-
-	public static final Image IMG_JUSTIFY_FULL = richTextPlugin
-			.getSharedImage(IMG_PATH_JUSTIFY_FULL);
-
-	public static final Image IMG_JUSTIFY_LEFT = richTextPlugin
-			.getSharedImage(IMG_PATH_JUSTIFY_LEFT);
-
-	public static final Image IMG_JUSTIFY_RIGHT = richTextPlugin
-			.getSharedImage(IMG_PATH_JUSTIFY_RIGHT);
-
-	public static final Image IMG_OUTDENT = richTextPlugin
-			.getSharedImage(IMG_PATH_OUTDENT);
-
-	public static final Image IMG_PASTE = richTextPlugin
-			.getSharedImage(IMG_PATH_PASTE);
-
-	public static final Image IMG_STRIKE_THROUGH = richTextPlugin
-			.getSharedImage(IMG_PATH_STRIKE_THROUGH);
-
-	public static final Image IMG_SUBSCRIPT = richTextPlugin
-			.getSharedImage(IMG_PATH_SUBSCRIPT);
-
-	public static final Image IMG_SUPERSCRIPT = richTextPlugin
-			.getSharedImage(IMG_PATH_SUPERSCRIPT);
-
-	public static final Image IMG_UNDERLINE = richTextPlugin
-			.getSharedImage(IMG_PATH_UNDERLINE);
-
-	public static final ImageDescriptor IMG_DESC_ADD_IMAGE = richTextPlugin
-			.getImageDescriptor(IMG_PATH_ADD_IMAGE);
-
-	public static final ImageDescriptor IMG_DESC_ADD_LINE = richTextPlugin
-			.getImageDescriptor(IMG_PATH_ADD_LINE);
-
-	public static final ImageDescriptor IMG_DESC_ADD_LINK = richTextPlugin
-			.getImageDescriptor(IMG_PATH_ADD_LINK);
-
-	public static final ImageDescriptor IMG_DESC_ADD_ORDERED_LIST = richTextPlugin
-			.getImageDescriptor(IMG_PATH_ADD_ORDERED_LIST);
-
-	public static final ImageDescriptor IMG_DESC_ADD_TABLE = richTextPlugin
-			.getImageDescriptor(IMG_PATH_ADD_TABLE);
-
-	public static final ImageDescriptor IMG_DESC_ADD_UNORDERED_LIST = richTextPlugin
-			.getImageDescriptor(IMG_PATH_ADD_UNORDERED_LIST);
-
-	public static final ImageDescriptor IMG_DESC_BOLD = richTextPlugin
-			.getImageDescriptor(IMG_PATH_BOLD);
-
-	public static final ImageDescriptor IMG_DESC_CLEAR_CONTENT = richTextPlugin
-			.getImageDescriptor(IMG_PATH_CLEAR_CONTENT);
-
-	public static final ImageDescriptor IMG_DESC_COPY = richTextPlugin
-			.getImageDescriptor(IMG_PATH_COPY);
-
-	public static final ImageDescriptor IMG_DESC_CUT = richTextPlugin
-			.getImageDescriptor(IMG_PATH_CUT);
-
-	public static final ImageDescriptor IMG_DESC_FIND_REPLACE = richTextPlugin
-			.getImageDescriptor(IMG_PATH_FIND_REPLACE);
-
-	public static final ImageDescriptor IMG_DESC_INDENT = richTextPlugin
-			.getImageDescriptor(IMG_PATH_INDENT);
-
-	public static final ImageDescriptor IMG_DESC_ITALIC = richTextPlugin
-			.getImageDescriptor(IMG_PATH_ITALIC);
-
-	public static final ImageDescriptor IMG_DESC_JUSTIFY_CENTER = richTextPlugin
-			.getImageDescriptor(IMG_PATH_JUSTIFY_CENTER);
-
-	public static final ImageDescriptor IMG_DESC_JUSTIFY_FULL = richTextPlugin
-			.getImageDescriptor(IMG_PATH_JUSTIFY_FULL);
-
-	public static final ImageDescriptor IMG_DESC_JUSTIFY_LEFT = richTextPlugin
-			.getImageDescriptor(IMG_PATH_JUSTIFY_LEFT);
-
-	public static final ImageDescriptor IMG_DESC_JUSTIFY_RIGHT = richTextPlugin
-			.getImageDescriptor(IMG_PATH_JUSTIFY_RIGHT);
-
-	public static final ImageDescriptor IMG_DESC_OUTDENT = richTextPlugin
-			.getImageDescriptor(IMG_PATH_OUTDENT);
-
-	public static final ImageDescriptor IMG_DESC_PASTE = richTextPlugin
-			.getImageDescriptor(IMG_PATH_PASTE);
-
-	public static final ImageDescriptor IMG_DESC_STRIKE_THROUGH = richTextPlugin
-			.getImageDescriptor(IMG_PATH_STRIKE_THROUGH);
-
-	public static final ImageDescriptor IMG_DESC_SUBSCRIPT = richTextPlugin
-			.getImageDescriptor(IMG_PATH_SUBSCRIPT);
-
-	public static final ImageDescriptor IMG_DESC_SUPERSCRIPT = richTextPlugin
-			.getImageDescriptor(IMG_PATH_SUPERSCRIPT);
-
-	public static final ImageDescriptor IMG_DESC_UNDERLINE = richTextPlugin
-			.getImageDescriptor(IMG_PATH_UNDERLINE);
-
-	public static final String DISABLED_IMG_PATH_ADD_IMAGE = DTOOL16
-			+ "AddImage.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_ADD_LINE = DTOOL16
-			+ "AddLine.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_ADD_LINK = DTOOL16
-			+ "AddLink.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_ADD_ORDERED_LIST = DTOOL16
-			+ "AddOrderedList.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_ADD_TABLE = DTOOL16
-			+ "AddTable.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_ADD_UNORDERED_LIST = DTOOL16
-			+ "AddUnorderedList.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_BOLD = DTOOL16 + "Bold.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_CLEAR_CONTENT = DTOOL16
-			+ "ClearContent.gif"; //$NON-NLS-1$	
-
-	public static final String DISABLED_IMG_PATH_COPY = DTOOL16 + "Copy.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_CUT = DTOOL16 + "Cut.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_FIND_REPLACE = DTOOL16
-			+ "FindReplace.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_INDENT = DTOOL16
-			+ "Indent.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_ITALIC = DTOOL16
-			+ "Italic.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_JUSTIFY_CENTER = DTOOL16
-			+ "JustifyCenter.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_JUSTIFY_FULL = DTOOL16
-			+ "JustifyFull.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_JUSTIFY_LEFT = DTOOL16
-			+ "JustifyLeft.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_JUSTIFY_RIGHT = DTOOL16
-			+ "JustifyRight.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_OUTDENT = DTOOL16
-			+ "Outdent.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_PASTE = DTOOL16 + "Paste.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_STRIKE_THROUGH = DTOOL16
-			+ "StrikeThrough.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_SUBSCRIPT = DTOOL16
-			+ "Subscript.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_SUPERSCRIPT = DTOOL16
-			+ "Superscript.gif"; //$NON-NLS-1$
-
-	public static final String DISABLED_IMG_PATH_UNDERLINE = DTOOL16
-			+ "Underline.gif"; //$NON-NLS-1$
-
-	public static final Image DISABLED_IMG_ADD_IMAGE = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_ADD_IMAGE);
-
-	public static final Image DISABLED_IMG_ADD_LINE = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_ADD_LINE);
-
-	public static final Image DISABLED_IMG_ADD_LINK = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_ADD_LINK);
-
-	public static final Image DISABLED_IMG_ADD_ORDERED_LIST = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_ADD_ORDERED_LIST);
-
-	public static final Image DISABLED_IMG_ADD_TABLE = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_ADD_TABLE);
-
-	public static final Image DISABLED_IMG_ADD_UNORDERED_LIST = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_ADD_UNORDERED_LIST);
-
-	public static final Image DISABLED_IMG_BOLD = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_BOLD);
-
-	public static final Image DISABLED_IMG_CLEAR_CONTENT = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_CLEAR_CONTENT);
-
-	public static final Image DISABLED_IMG_COPY = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_COPY);
-
-	public static final Image DISABLED_IMG_CUT = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_CUT);
-
-	public static final Image DISABLED_IMG_FIND_REPLACE = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_FIND_REPLACE);
-
-	public static final Image DISABLED_IMG_INDENT = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_INDENT);
-
-	public static final Image DISABLED_IMG_ITALIC = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_ITALIC);
-
-	public static final Image DISABLED_IMG_JUSTIFY_CENTER = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_JUSTIFY_CENTER);
-
-	public static final Image DISABLED_IMG_JUSTIFY_FULL = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_JUSTIFY_FULL);
-
-	public static final Image DISABLED_IMG_JUSTIFY_LEFT = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_JUSTIFY_LEFT);
-
-	public static final Image DISABLED_IMG_JUSTIFY_RIGHT = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_JUSTIFY_RIGHT);
-
-	public static final Image DISABLED_IMG_OUTDENT = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_OUTDENT);
-
-	public static final Image DISABLED_IMG_PASTE = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_PASTE);
-
-	public static final Image DISABLED_IMG_STRIKE_THROUGH = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_STRIKE_THROUGH);
-
-	public static final Image DISABLED_IMG_SUBSCRIPT = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_SUBSCRIPT);
-
-	public static final Image DISABLED_IMG_SUPERSCRIPT = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_SUPERSCRIPT);
-
-	public static final Image DISABLED_IMG_UNDERLINE = richTextPlugin
-			.getSharedImage(DISABLED_IMG_PATH_UNDERLINE);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_ADD_IMAGE = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_ADD_IMAGE);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_ADD_LINE = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_ADD_LINE);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_ADD_LINK = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_ADD_LINK);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_ADD_ORDERED_LIST = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_ADD_ORDERED_LIST);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_ADD_TABLE = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_ADD_TABLE);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_ADD_UNORDERED_LIST = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_ADD_UNORDERED_LIST);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_BOLD = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_BOLD);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_CLEAR_CONTENT = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_CLEAR_CONTENT);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_COPY = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_COPY);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_CUT = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_CUT);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_FIND_REPLACE = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_FIND_REPLACE);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_INDENT = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_INDENT);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_ITALIC = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_ITALIC);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_JUSTIFY_CENTER = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_JUSTIFY_CENTER);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_JUSTIFY_FULL = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_JUSTIFY_FULL);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_JUSTIFY_LEFT = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_JUSTIFY_LEFT);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_JUSTIFY_RIGHT = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_JUSTIFY_RIGHT);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_OUTDENT = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_OUTDENT);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_PASTE = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_PASTE);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_STRIKE_THROUGH = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_STRIKE_THROUGH);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_SUBSCRIPT = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_SUBSCRIPT);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_SUPERSCRIPT = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_SUPERSCRIPT);
-
-	public static final ImageDescriptor DISABLED_IMG_DESC_UNDERLINE = richTextPlugin
-			.getImageDescriptor(DISABLED_IMG_PATH_UNDERLINE);
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextListener.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextListener.java
deleted file mode 100755
index 1f22046..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextListener.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Listens to a rich text editing event.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextListener {
-
-	private int eventType;
-
-	private Listener listener;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param eventType
-	 *            the event type
-	 * @param listener
-	 *            the event listener
-	 */
-	public RichTextListener(int eventType, Listener listener) {
-		this.eventType = eventType;
-		this.listener = listener;
-	}
-
-	/**
-	 * Returns the event type.
-	 * 
-	 * @return the event type
-	 */
-	public int getEventType() {
-		return eventType;
-	}
-
-	/**
-	 * Returns the event listener.
-	 */
-	public Listener getListener() {
-		return listener;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextPlugin.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextPlugin.java
deleted file mode 100755
index 68e057d..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextPlugin.java
+++ /dev/null
@@ -1,70 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import java.util.Date;
-
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The Rich Text plug-in class.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextPlugin extends AbstractPlugin {
-
-	// The shared plug-in instance.
-	private static RichTextPlugin plugin;
-
-	// The date and time when this plug-in was started.
-	private Date startTime;
-
-	/**
-	 * Default constructor.
-	 */
-	public RichTextPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * @see AbstractPlugin#start(BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		startTime = new Date();
-	}
-
-	/**
-	 * @see AbstractPlugin#stop(BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared plug-in instance.
-	 */
-	public static RichTextPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the date and time when this plug-in was started.
-	 */
-	public Date getStartTime() {
-		return startTime;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextResources.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextResources.java
deleted file mode 100755
index ddf7c54..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextResources.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.richtext;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The RichText resources.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public final class RichTextResources extends NLS {
-
-	private static String BUNDLE_NAME = RichTextResources.class
-		.getPackage().getName() + ".Resources"; //$NON-NLS-1$	
-
-	private RichTextResources() {
-		// Do not instantiate.
-	}
-
-	public static String fontNameAction_CSS_Default;
-	public static String fontNameAction_CSS_Default_Mozilla;
-	public static String fontNameAction_DefaultFontName;
-	public static String fontStyle_normal;
-	public static String fontStyle_sectionHeading;
-	public static String fontStyle_subsectionHeading;
-	public static String fontStyle_subSubsectionHeading;
-	public static String fontStyle_quote;
-	public static String fontStyle_codeSample;
-	public static String blockTag_paragraph;
-	public static String blockTag_heading1;
-	public static String blockTag_heading2;
-	public static String blockTag_heading3;
-	public static String blockTag_heading4;
-	public static String blockTag_heading5;
-	public static String blockTag_heading6;
-	public static String blockTag_address;
-	public static String blockTag_preformattedText;
-	public static String fontName_default;
-	public static String fontName_arial;
-	public static String fontName_courierNew;
-	public static String fontName_timesNewRoman;
-	public static String fontName_verdana;
-	public static String addHorizontalBarAction_toolTipText;
-	public static String addImageAction_toolTipText;
-	public static String addLineAction_toolTipText;
-	public static String addLinkAction_toolTipText;
-	public static String addOrderedListAction_toolTipText;
-	public static String addTableAction_toolTipText;
-	public static String addUnorderedListAction_toolTipText;
-	public static String boldAction_toolTipText;
-	public static String clearContentAction_toolTipText;
-	public static String copyAction_toolTipText;
-	public static String cutAction_toolTipText;
-	public static String findReplaceAction_toolTipText;
-	public static String indentAction_toolTipText;
-	public static String italicAction_toolTipText;
-	public static String justifyCenterAction_toolTipText;
-	public static String justifyFullAction_toolTipText;
-	public static String justifyLeftAction_toolTipText;
-	public static String justifyRightAction_toolTipText;
-	public static String outdentAction_toolTipText;
-	public static String pasteAction_toolTipText;
-	public static String pastePlainTextAction_toolTipText;
-	public static String subscriptAction_toolTipText;
-	public static String superscriptAction_toolTipText;
-	public static String underlineAction_toolTipText;
-	public static String fontStyleAction_toolTipText;
-	public static String blockTagAction_toolTipText;
-	public static String fontNameAction_toolTipText;
-	public static String fontSizeAction_toolTipText;
-	public static String cutAction_text;
-	public static String copyAction_text;
-	public static String pasteAction_text;
-	public static String pastePlainTextAction_text;
-	public static String richTextTab_text;
-	public static String richTextTab_toolTipText;
-	public static String htmlTab_text;
-	public static String htmlTab_toolTipText;
-	public static String addImageDialog_title;
-	public static String addLinkDialog_title;
-	public static String addTableDialog_title;
-	public static String findReplaceDialog_title;
-	public static String urlDisplayNameLabel_text;
-	public static String urlLabel_text;
-	public static String summaryLabel_text;
-	public static String captionLabel_text;
-	public static String rowsLabel_text;
-	public static String columnsLabel_text;
-	public static String widthLabel_text;
-	public static String tableStyleLabel_text;
-	public static String tableHeaderNone_text;
-	public static String tableHeaderCols_text;
-	public static String tableHeaderRows_text;
-	public static String tableHeaderBoth_text;
-	public static String browseButton_text;
-	public static String clearContentDialog_title;
-	public static String clearContentDialog_text;
-	public static String findLabel_text;
-	public static String replaceLabel_text;
-	public static String optionsGroup_text;
-	public static String caseSensitiveCheckbox_text;
-	public static String wholeWordCheckbox_text;
-	public static String directionGroup_text;
-	public static String forwardRadioButton_text;
-	public static String backwardRadioButton_text;
-	public static String findButton_text;
-	public static String replaceButton_text;
-	public static String replaceFindButton_text;
-	public static String replaceallButton_text;
-	public static String FindReplace_Status_noMatch_label;
-	public static String maxCharsPerLineLabel_text;
-	public static String indentHTMLCheckbox_text;
-	public static String indentSizeLabel_text;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, RichTextResources.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextSelection.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextSelection.java
deleted file mode 100755
index 74b7f4c..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextSelection.java
+++ /dev/null
@@ -1,140 +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.richtext;
-
-/**
- * Models a text selection in a rich text control and editor.
- * 
- * @author Jeff Hardy
- * @since 1.2
- */
-public class RichTextSelection {
-
-	// The control's text selection.
-	protected String text = ""; //$NON-NLS-1$
-
-	// The control's text selection offset
-	protected int offsetStart = 0;
-
-	// The control's text selection font
-	protected String fontName = ""; //$NON-NLS-1$
-
-	// The control's text selection font size
-	// could be in point size (12pt), or HTML size (1-7)
-	protected String fontSize = ""; //$NON-NLS-1$
-
-	// The control's text current style
-	protected String blockStyle = ""; //$NON-NLS-1$
-
-	// The control's text current flags
-	protected int flags = 0;
-
-	// Text status flags
-	public static final int BOLD = 1;
-
-	public static final int ITALIC = BOLD << 1;
-
-	public static final int UNDERLINE = ITALIC << 1;
-
-	public static final int SUBSCRIPT = UNDERLINE << 1;
-
-	public static final int SUPERSCRIPT = SUBSCRIPT << 1;
-
-	public String getBlockStyle() {
-		return blockStyle;
-	}
-
-	public void setBlockStyle(String blockStyle) {
-		this.blockStyle = blockStyle;
-	}
-
-	public int getFlags() {
-		return flags;
-	}
-
-	public void setFlags(int flags) {
-		this.flags = flags;
-	}
-
-	public String getFontName() {
-		return fontName;
-	}
-
-	public void setFontName(String fontName) {
-		this.fontName = fontName;
-	}
-
-	public String getFontSize() {
-		return fontSize;
-	}
-
-	public void setFontSize(String fontSize) {
-		this.fontSize = fontSize;
-	}
-
-	public int getOffsetStart() {
-		return offsetStart;
-	}
-
-	public void setOffsetStart(int offsetStart) {
-		this.offsetStart = offsetStart;
-	}
-
-	public String getText() {
-		return text;
-	}
-
-	public void setText(String text) {
-		this.text = text;
-	}
-
-	public boolean isBold() {
-		return (flags & BOLD) != 0;
-	}
-
-	public boolean isItalic() {
-		return (flags & ITALIC) != 0;
-	}
-
-	public boolean isUnderLine() {
-		return (flags & UNDERLINE) != 0;
-	}
-
-	public boolean isSubscript() {
-		return (flags & SUBSCRIPT) != 0;
-	}
-
-	public boolean isSuperscript() {
-		return (flags & SUPERSCRIPT) != 0;
-	}
-
-	/**
-	 * Clears the selection info
-	 */
-	public void clear() {
-		text = ""; //$NON-NLS-1$
-		offsetStart = 0;
-		fontName = ""; //$NON-NLS-1$
-		fontSize = ""; //$NON-NLS-1$
-		blockStyle = ""; //$NON-NLS-1$
-		flags = 0;
-	}
-
-	public String toString() {
-		String str = "Text: " + text + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
-		str += "fontName: " + fontName + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
-		str += "fontSize: " + fontSize + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
-		str += "blockStyle: " + blockStyle + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
-		str += "flags: " + flags + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
-		return str;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextToolBar.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextToolBar.java
deleted file mode 100755
index 75fca2f..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextToolBar.java
+++ /dev/null
@@ -1,216 +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.richtext;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.richtext.actions.IRichTextAction;
-import org.eclipse.epf.richtext.actions.IRichTextComboAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-
-/**
- * The default rich text tool bar implementation.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class RichTextToolBar extends Composite implements IRichTextToolBar {
-	
-	private static final String LAST_KEY_CODE = "lastKeyCode"; //$NON-NLS-1$
-
-	// The parent rich text control.
-	private IRichText richText;
-
-	// If true, add a new tool bar.
-	private boolean addToolBar = true;
-
-	// The current tool bar used to populate the tool actions.
-	private ToolBar currentToolBar;
-
-	// The action items in the tool bar(s).
-	private List actionItems = new ArrayList();
-	
-	private static int lastWidth = -1;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param parent
-	 *            the parent composite
-	 * @param style
-	 *            the tool bar style
-	 * @param richText
-	 *            the parent rich text control
-	 */
-	public RichTextToolBar(Composite parent, int style, IRichText richText) {
-		super(parent, style);
-		this.richText = richText;
-
-		GridLayout layout = new GridLayout(10, false);
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		super.setLayout(layout);
-	}
-
-	/**
-	 * Adds a button action to the tool bar.
-	 * 
-	 * @param action
-	 *            the action to add
-	 */
-	public void addAction(final IRichTextAction action) {
-		if (action != null) {
-			addToolBar();
-			ToolItem item = new ToolItem(currentToolBar, action.getStyle());
-			item.setImage(action.getImage());
-			item.setDisabledImage(action.getDisabledImage());
-			item.setToolTipText(action.getToolTipText());
-			item.setEnabled(action.getEnabled());
-			item.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent event) {
-					// richText.setBlur();
-					action.execute(richText);
-				};
-			});
-			item.setData(action);
-			action.setToolItem(item);
-			actionItems.add(item);
-		}
-	}
-
-	/**
-	 * Adds a combo action to the tool bar.
-	 * 
-	 * @param action
-	 *            the action to add
-	 */
-	public void addAction(final IRichTextComboAction action) {
-		if (action != null) {
-			CCombo combo = new CCombo(this, SWT.READ_ONLY | SWT.FLAT
-					| SWT.BORDER);
-			String[] items = action.getItems();
-			for (int i = 0; i < items.length; i++) {
-				combo.add(items[i]);
-			}
-			combo.setVisibleItemCount(8);
-			combo.select(0);
-			combo.setToolTipText(action.getToolTipText());
-			combo.setEnabled(action.getEnabled());
-			combo.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent event) {
-					String lastKeyCode = (String) getData(LAST_KEY_CODE);
-					if (lastKeyCode == null || lastKeyCode.equals("" + SWT.CR)) { //$NON-NLS-1$
-						Object eventSrc = event.getSource();
-						if (eventSrc instanceof CCombo) {
-							action.execute(richText, ((CCombo) eventSrc)
-									.getSelectionIndex());
-						}
-					}
-					setData(LAST_KEY_CODE, null);
-				};
-			});
-			combo.addKeyListener(new KeyAdapter() {
-				public void keyPressed(KeyEvent event) {
-					if (event.keyCode == SWT.CR) {
-						Object eventSrc = event.getSource();
-						if (eventSrc instanceof CCombo) {
-							action.execute(richText, ((CCombo) eventSrc)
-									.getSelectionIndex());
-						}
-					}
-					setData(LAST_KEY_CODE, "" + event.keyCode); //$NON-NLS-1$
-				};
-			});
-			action.setCombo(combo);
-			actionItems.add(combo);
-			addToolBar = true;
-		}
-	}
-
-	/**
-	 * Adds a separator to the tool bar.
-	 */
-	public void addSeparator() {
-		addToolBar();
-		new ToolItem(currentToolBar, SWT.SEPARATOR);
-	}
-
-	/**
-	 * Updates the toolbar state.
-	 * <p>
-	 * Enables/disables actions depending on the currently selected
-	 * RichTextEditor tab (RichText vs. HTML)
-	 * 
-	 * @param editable
-	 *            specifies whether to enable non-ReadOnly commands
-	 */
-	public void updateToolBar(boolean editable) {
-		boolean richTextMode = true;
-		if (richText instanceof RichTextEditor
-				&& ((RichTextEditor) richText).isHTMLTabSelected()) {
-			richTextMode = false;
-		}
-		for (Iterator i = actionItems.iterator(); i.hasNext();) {
-			Object item = i.next();
-			if (item instanceof ToolItem) {
-				boolean enabledToolItem = true;
-				ToolItem toolItem = (ToolItem) item;
-				IRichTextAction action = (IRichTextAction) toolItem.getData();
-				if (action != null && !editable
-						&& action.disableInReadOnlyMode()) {
-					enabledToolItem = false;
-				}
-				if (action != null && !richTextMode
-						&& action.disableInSourceMode()) {
-					enabledToolItem = false;
-				}
-				toolItem.setEnabled(enabledToolItem);
-			} else if (item instanceof Combo) {
-				if (richTextMode && editable) {
-					((Combo) item).setEnabled(true);
-				} else {
-					((Combo) item).setEnabled(false);
-				}
-			}
-		}
-		lastWidth = getSize().x;
-	}
-
-	/**
-	 * Adds a tool bar, if necessary, to contain a button action or separator.
-	 */
-	protected void addToolBar() {
-		if (addToolBar) {
-			currentToolBar = new ToolBar(this, getStyle());
-			currentToolBar.setLayout(new FillLayout());
-			addToolBar = false;
-		}
-	}
-
-	public static int getLastWidth() {
-		return lastWidth;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddImageAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddImageAction.java
deleted file mode 100755
index 2948047..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddImageAction.java
+++ /dev/null
@@ -1,65 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.dialogs.AddImageDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Adds an image to a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddImageAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public AddImageAction() {
-		setImage(RichTextImages.IMG_ADD_IMAGE);
-		setDisabledImage(RichTextImages.DISABLED_IMG_ADD_IMAGE);
-		setToolTipText(RichTextResources.addImageAction_toolTipText); 
-		setEnabled(true);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			AddImageDialog dialog = new AddImageDialog(Display.getCurrent()
-					.getActiveShell());
-			dialog.open();
-			if (dialog.getReturnCode() == Window.OK) {
-				String imageURL = dialog.getImage().getURL();
-				if (imageURL.length() > 0) {
-					richText
-							.executeCommand(RichTextCommand.ADD_IMAGE, imageURL);
-				}
-			}
-		}
-	}
-	
-	public boolean disableInSourceMode() {
-		return false;
-	}
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddLineAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddLineAction.java
deleted file mode 100755
index 354e137..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddLineAction.java
+++ /dev/null
@@ -1,47 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Adds a horizontal bar to a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddLineAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public AddLineAction() {
-		setImage(RichTextImages.IMG_ADD_LINE);
-		setToolTipText(RichTextResources.addLineAction_toolTipText); 
-		setEnabled(true);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			richText.executeCommand(RichTextCommand.ADD_LINE);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddLinkAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddLinkAction.java
deleted file mode 100755
index ffe4c8f..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddLinkAction.java
+++ /dev/null
@@ -1,64 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.dialogs.AddLinkDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Adds a link to a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddLinkAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public AddLinkAction() {
-		super();
-		setImage(RichTextImages.IMG_ADD_LINK);
-		setDisabledImage(RichTextImages.DISABLED_IMG_ADD_LINK);
-		setToolTipText(RichTextResources.addLinkAction_toolTipText); 
-		setEnabled(true);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			AddLinkDialog dialog = new AddLinkDialog(Display.getCurrent()
-					.getActiveShell(), richText.getBasePath());
-			dialog.open();
-			if (dialog.getReturnCode() == Window.OK) {
-				String linkURL = dialog.getLink().getURL();
-				if (linkURL.length() > 0) {
-					richText.executeCommand(RichTextCommand.ADD_LINK, linkURL);
-				}
-			}
-		}
-	}
-	
-	public boolean disableInSourceMode() {
-		return false;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddOrderedListAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddOrderedListAction.java
deleted file mode 100755
index 855bc0d..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddOrderedListAction.java
+++ /dev/null
@@ -1,50 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Adds an ordered list to a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddOrderedListAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public AddOrderedListAction() {
-		super();
-		setImage(RichTextImages.IMG_ADD_ORDERED_LIST);
-		setDisabledImage(RichTextImages.DISABLED_IMG_ADD_ORDERED_LIST);
-		setToolTipText(RichTextResources.addOrderedListAction_toolTipText);
-		
-		setEnabled(true);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			richText.executeCommand(RichTextCommand.ADD_ORDERED_LIST);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddTableAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddTableAction.java
deleted file mode 100755
index cb2b3d1..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddTableAction.java
+++ /dev/null
@@ -1,71 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.dialogs.AddTableDialog;
-import org.eclipse.epf.richtext.html.Table;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Adds a table to a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddTableAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public AddTableAction() {
-		super();
-		setImage(RichTextImages.IMG_ADD_TABLE);
-		setDisabledImage(RichTextImages.DISABLED_IMG_ADD_TABLE);
-		setToolTipText(RichTextResources.addTableAction_toolTipText);
-		setEnabled(true);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			AddTableDialog dialog = new AddTableDialog(Display.getCurrent()
-					.getActiveShell());
-			dialog.open();
-			if (dialog.getReturnCode() == Window.OK) {
-				Table table = dialog.getTable();
-				int rows = table.getRows();
-				int cols = table.getColumns();
-				String width = table.getWidth();
-				int tableheaders = table.getTableHeaders();
-				String summary = table.getSummary();
-				String caption = table.getCaption();
-				if (rows > 0 && cols > 0) {
-					richText
-							.executeCommand(
-									RichTextCommand.ADD_TABLE,
-									new String[] {
-											"" + rows, "" + cols, "" + width, summary, caption, "" + tableheaders }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-				}
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddUnorderedListAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddUnorderedListAction.java
deleted file mode 100755
index c9f55bf..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddUnorderedListAction.java
+++ /dev/null
@@ -1,49 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Adds an unordered list to a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddUnorderedListAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public AddUnorderedListAction() {
-		super();
-		setImage(RichTextImages.IMG_ADD_UNORDERED_LIST);
-		setDisabledImage(RichTextImages.DISABLED_IMG_ADD_UNORDERED_LIST);
-		setToolTipText(RichTextResources.addUnorderedListAction_toolTipText);
-		setEnabled(true);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			richText.executeCommand(RichTextCommand.ADD_UNORDERED_LIST);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BaseRichTextAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BaseRichTextAction.java
deleted file mode 100755
index f69a610..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BaseRichTextAction.java
+++ /dev/null
@@ -1,73 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-/**
- * The abstract base class for all rich text action.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public abstract class BaseRichTextAction implements IBaseRichTextAction {
-
-	protected String toolTipText;
-
-	protected boolean enabled;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public BaseRichTextAction() {
-	}
-
-	/**
-	 * Returns the tool tip for the action.
-	 * 
-	 * @return the tool tip text
-	 */
-	public String getToolTipText() {
-		return toolTipText;
-	}
-
-	/**
-	 * Sets the tool tip for the action.
-	 * 
-	 * @param toolTipText
-	 *            the tool tip text
-	 */
-	public void setToolTipText(String toolTipText) {
-		this.toolTipText = toolTipText;
-	}
-
-	/**
-	 * Returns the enabled status of the action.
-	 * 
-	 * @return <code>true</code> if enabled, <code>false</code> if not
-	 */
-	public boolean getEnabled() {
-		return enabled;
-	}
-
-	/**
-	 * Enables or disables the action.
-	 * 
-	 * @param enabled
-	 *            if <code>true</code>, enable the action. if
-	 *            <code>false</code>, disable it.
-	 */
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BlockTagAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BlockTagAction.java
deleted file mode 100755
index b189334..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BlockTagAction.java
+++ /dev/null
@@ -1,58 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.html.BlockTag;
-
-/**
- * Sets the font name for the selected text in a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class BlockTagAction extends RichTextComboAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public BlockTagAction() {
-		setToolTipText(RichTextResources.blockTagAction_toolTipText); 
-		addItem(BlockTag.PARAGRAPH.getName());
-		addItem(BlockTag.HEADING_1.getName());
-		addItem(BlockTag.HEADING_2.getName());
-		addItem(BlockTag.HEADING_3.getName());
-		addItem(BlockTag.HEADING_4.getName());
-		addItem(BlockTag.HEADING_5.getName());
-		addItem(BlockTag.HEADING_6.getName());
-		addItem(BlockTag.ADDRESS.getName());
-		addItem(BlockTag.PREFORMATTED_TEXT.getName());
-		setEnabled(true);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 * @param index
-	 *            the index of the selected item
-	 */
-	public void execute(IRichText richText, int index) {
-		if (richText != null) {
-			String value = BlockTag.getBlockTag(index).getValue();
-			richText.executeCommand(RichTextCommand.FORMAT_BLOCK, value);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BoldAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BoldAction.java
deleted file mode 100755
index e47b41d..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BoldAction.java
+++ /dev/null
@@ -1,66 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Toggles the 'bold' attribute of the selected text in a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class BoldAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public BoldAction(final IRichText richText) {
-		super();
-		setImage(RichTextImages.IMG_BOLD);
-		setDisabledImage(RichTextImages.DISABLED_IMG_BOLD);
-		setToolTipText(RichTextResources.boldAction_toolTipText); 
-		setEnabled(true);
-		// add listener
-		richText.addListener(SWT.SELECTED, new Listener() {
-			public void handleEvent(Event event) {
-				toolItem.setSelection(richText.getSelected().isBold());
-			}
-		});
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			richText.executeCommand(RichTextCommand.BOLD);
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.epf.richtext.actions.RichTextAction#getStyle()
-	 */
-	public int getStyle() {
-		return SWT.CHECK;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/ClearContentAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/ClearContentAction.java
deleted file mode 100755
index 2bbbdd8..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/ClearContentAction.java
+++ /dev/null
@@ -1,54 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextPlugin;
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Clears the content of a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ClearContentAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ClearContentAction() {
-		super();
-		setImage(RichTextImages.IMG_CLEAR_CONTENT);
-		setDisabledImage(RichTextImages.DISABLED_IMG_CLEAR_CONTENT);
-		setToolTipText(RichTextResources.clearContentAction_toolTipText); 
-		setEnabled(true);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            s rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			if (RichTextPlugin.getDefault().getMsgDialog().displayPrompt(
-					RichTextResources.clearContentDialog_title,
-					RichTextResources.clearContentDialog_text)) {
-				richText.executeCommand(RichTextCommand.CLEAR_CONTENT);
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/CopyAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/CopyAction.java
deleted file mode 100755
index ce6a2d2..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/CopyAction.java
+++ /dev/null
@@ -1,74 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextEditor;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.swt.custom.StyledText;
-
-/**
- * Copies the selected text in a rich text control to the clipboard.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class CopyAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public CopyAction() {
-		super();
-		setImage(RichTextImages.IMG_COPY);
-		setDisabledImage(RichTextImages.DISABLED_IMG_COPY);
-		setToolTipText(RichTextResources.copyAction_toolTipText);
-		setEnabled(true);
-	}
-
-	/**
-	 * Returns <code>true</code> if this action should be disabled when the
-	 * rich text editor is in readonly mode.
-	 */
-	public boolean disableInReadOnlyMode() {
-		return false;
-	}
-	
-	/**
-	 * Returns <code>true</code> if this action should be disabled when the
-	 * rich text editor is in source edit mode.
-	 */
-	public boolean disableInSourceMode() {
-		return false;
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			if (richText instanceof RichTextEditor
-					&& ((RichTextEditor) richText).isHTMLTabSelected()) {
-				StyledText styledText = ((RichTextEditor) richText).getSourceEdit();
-				styledText.copy();
-			} else {
-				richText.setCopyURL();
-				richText.executeCommand(RichTextCommand.COPY);
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/CutAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/CutAction.java
deleted file mode 100755
index 78b0095..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/CutAction.java
+++ /dev/null
@@ -1,67 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextEditor;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.swt.custom.StyledText;
-
-/**
- * Cuts the selected text in the rich text control to the clipboard.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class CutAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public CutAction() {
-		super();
-		setImage(RichTextImages.IMG_CUT);
-		setDisabledImage(RichTextImages.DISABLED_IMG_CUT);
-		setToolTipText(RichTextResources.cutAction_toolTipText); 
-		setEnabled(true);
-	}
-
-	/**
-	 * Returns <code>true</code> if this action should be disabled when the
-	 * rich text editor is in source edit mode.
-	 */
-	public boolean disableInSourceMode() {
-		return false;
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			if (richText instanceof RichTextEditor
-					&& ((RichTextEditor) richText).isHTMLTabSelected()) {
-				StyledText styledText = ((RichTextEditor) richText)
-						.getSourceEdit();
-				styledText.cut();
-			} else {
-				richText.setCopyURL();
-				richText.executeCommand(RichTextCommand.CUT);
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FindReplaceAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FindReplaceAction.java
deleted file mode 100755
index f671bc2..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FindReplaceAction.java
+++ /dev/null
@@ -1,378 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.common.utils.XMLUtil;
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextEditor;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextPlugin;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.dialogs.FindReplaceDialog;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Finds and replaces text in a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class FindReplaceAction extends RichTextAction {
-
-	/**
-	 * Finds text sub action.
-	 */
-	public static final int FIND_TEXT = 1;
-
-	/**
-	 * Replaces text sub action.
-	 */
-	public static final int REPLACE_TEXT = 2;
-
-	/**
-	 * Replaces and finds text sub action.
-	 */
-	public static final int REPLACE_FIND_TEXT = 3;
-
-	/**
-	 * Replaces all sub action.
-	 */
-	public static final int REPLACE_ALL_TEXT = 4;
-
-	/**
-	 * Find match in a forward direction.
-	 */
-	public static final int FORWARD_MATCH = 1;
-
-	/**
-	 * Find match in a backward direction.
-	 */
-	public static final int BACKWARD_MATCH = -1;
-
-	/**
-	 * Whole word match.
-	 */
-	public static final int WHOLE_WORD_MATCH = 2;
-
-	/**
-	 * Case sensitive match.
-	 */
-	public static final int CASE_SENSITIVE_MATCH = 4;
-
-	// Encoded single quote.
-	private static final String ENCODED_SINGLE_QUOTE = "%sq%"; //$NON-NLS-1$
-
-	private IRichText richText;
-
-	private StyledText styledText;
-
-	protected boolean foundMatch = false;
-	
-	// the dialog instance
-	protected FindReplaceDialog dialog;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public FindReplaceAction() {
-		super();
-		setImage(RichTextImages.IMG_FIND_REPLACE);
-		setDisabledImage(RichTextImages.DISABLED_IMG_FIND_REPLACE);
-		setToolTipText(RichTextResources.findReplaceAction_toolTipText);
-		setEnabled(true);
-	}
-
-	/**
-	 * Returns <code>true</code> if this action should be disabled when the
-	 * rich text editor is in readonly mode.
-	 */
-	public boolean disableInReadOnlyMode() {
-		return false;
-	}
-
-	/**
-	 * Returns <code>true</code> if this action should be disabled when the
-	 * rich text editor is in source edit mode.
-	 */
-	public boolean disableInSourceMode() {
-		return false;
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (this.richText == null)
-			this.richText = richText;
-		if (this.richText != null) {
-			try {
-				if (dialog != null) {
-					dialog.setFindOnly(!this.richText.getEditable());
-					dialog.open();
-				} else {
-					dialog = new FindReplaceDialog(Display
-							.getCurrent().getActiveShell(), this, !this.richText
-							.getEditable());
-					dialog.open();
-				}
-			} catch (Exception e) {
-				RichTextPlugin.getDefault().getLogger().logError(e);
-			}
-		}
-	}
-
-	/**
-	 * Returns <code>true</code> if a match is found.
-	 * 
-	 * @return <code>true</code> if a match is found.
-	 */
-	public boolean getFoundMatch() {
-		return foundMatch;
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param subAction
-	 *            the sub action to execute
-	 * @param findText
-	 *            the find text
-	 * @param replaceText
-	 *            the replace text
-	 * @param matchDir
-	 *            the match direction; the value can either be
-	 *            <code>FIND_FORWARD</code> or <code>FIND_BACKWARD</code>.
-	 * @param matchOptions
-	 *            the match options
-	 */
-	public void run(int subAction, String findText, String replaceText,
-			int matchDir, int matchOptions) {
-		styledText = null;
-		if (richText instanceof RichTextEditor
-				&& ((RichTextEditor) richText).isHTMLTabSelected()) {
-			styledText = ((RichTextEditor) richText).getSourceEdit();
-		}
-		if (styledText == null) {
-			if (findText.indexOf("'") != -1) { //$NON-NLS-1$
-				findText = findText.replaceAll("'", ENCODED_SINGLE_QUOTE); //$NON-NLS-1$
-			}
-			if (replaceText.indexOf("'") != -1) { //$NON-NLS-1$
-				replaceText = replaceText.replaceAll("'", ENCODED_SINGLE_QUOTE); //$NON-NLS-1$
-			}
-		}
-		try {
-			foundMatch = false;
-			int status = 0;
-			switch (subAction) {
-			case FIND_TEXT:
-				status = findText(findText, matchDir, matchOptions);
-				break;
-			case REPLACE_TEXT:
-				status = replaceText(replaceText, matchDir, matchOptions);
-				break;
-			case REPLACE_FIND_TEXT:
-				status = replaceFindText(findText, replaceText, matchDir,
-						matchOptions);
-				break;
-			case REPLACE_ALL_TEXT:
-				replaceAll(findText, replaceText, matchOptions);
-				break;
-			}
-			if (status > 0)
-				foundMatch = true;
-		} catch (Exception e) {
-			RichTextPlugin.getDefault().getLogger().logError(e);
-		}
-	}
-
-	/**
-	 * Escapes the given text.
-	 * 
-	 * @param text
-	 *            text to be escaped
-	 */
-	private static String escape(String text) {
-		if (text == null || text.length() == 0)
-			return ""; //$NON-NLS-1$
-		StringBuffer sb = new StringBuffer();
-		int textSize = text.length();
-		for (int i = 0; i < textSize; i++) {
-			char ch = text.charAt(i);
-			switch (ch) {
-			case '<':
-				sb.append(XMLUtil.XML_LT);
-				break;
-			case '>':
-				sb.append(XMLUtil.XML_GT);
-				break;
-			case '&':
-				sb.append(XMLUtil.XML_AMP);
-				break;
-			default:
-				sb.append(ch);
-				break;
-			}
-		}
-		return sb.toString();
-	}
-
-	private int findText(String findText, int matchDir, int matchOptions) {
-		int status = 0;
-		if (styledText != null) {
-			status = styledTextFindTextAndSelect(findText, matchDir,
-					matchOptions);
-		} else {
-			status = richText
-					.executeCommand(RichTextCommand.FIND_TEXT, new String[] {
-							findText, "" + matchDir, "" + matchOptions }); //$NON-NLS-1$ //$NON-NLS-2$				
-		}
-		return status;
-	}
-
-	private int replaceText(String replaceText, int matchDir, int matchOptions) {
-		int status = 0;
-		if (styledText != null) {
-			status = styledTextReplaceTextAndSelect(replaceText);
-		} else {
-			status = richText.executeCommand(RichTextCommand.REPLACE_TEXT,
-					new String[] { replaceText,
-							"" + matchDir, "" + matchOptions }); //$NON-NLS-1$ //$NON-NLS-2$					
-		}
-		return status;
-	}
-
-	private int replaceFindText(String findText, String replaceText,
-			int matchDir, int matchOptions) {
-		int status = 0;
-		if (styledText != null) {
-			styledTextReplaceTextAndSelect(replaceText);
-			status = styledTextFindTextAndSelect(findText, matchDir,
-					matchOptions);
-		} else {
-			richText.executeCommand(RichTextCommand.REPLACE_TEXT, new String[] {
-					replaceText, "" + matchDir, "" + matchOptions }); //$NON-NLS-1$ //$NON-NLS-2$
-			status = richText
-					.executeCommand(RichTextCommand.FIND_TEXT, new String[] {
-							findText, "" + matchDir, "" + matchOptions }); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return status;
-	}
-
-	private void replaceAll(String findText, String replaceText,
-			int matchOptions) {
-		if (styledText != null) {
-			styledTextReplaceAll(findText, replaceText, matchOptions);
-		} else {
-			richText.executeCommand(RichTextCommand.REPLACE_ALL_TEXT,
-					new String[] { escape(findText), escape(replaceText),
-							"" + matchOptions }); //$NON-NLS-1$
-		}
-	}
-
-	private int styledTextFindTextAndSelect(String findText, int matchDir,
-			int matchOptions) {
-		Point selectionOffset = styledText.getSelectionRange();
-		int firstSelectedOffset = selectionOffset.x;
-		int lastSelectedOffset = selectionOffset.x + selectionOffset.y - 1;
-		String htmlText = styledText.getText();
-		int indexOfMatch = -1;
-		if ((matchOptions & CASE_SENSITIVE_MATCH) == 0) {
-			// TODO: use toUpperCase(Locale) once library has locale attribute
-			htmlText = htmlText.toUpperCase();
-			findText = findText.toUpperCase();
-		}
-		do {
-			if (indexOfMatch != -1) {
-				lastSelectedOffset = indexOfMatch + 1;
-				firstSelectedOffset = indexOfMatch - 1;
-			}
-			if (matchDir == FORWARD_MATCH) {
-				indexOfMatch = htmlText.indexOf(findText,
-						lastSelectedOffset + 1);
-			} else {
-				indexOfMatch = htmlText.lastIndexOf(findText,
-						firstSelectedOffset - 1);
-			}
-		} while (indexOfMatch != -1
-				&& ((matchOptions & WHOLE_WORD_MATCH) == WHOLE_WORD_MATCH)
-				&& isPartOfWord(htmlText, indexOfMatch, findText.length()));
-		if (indexOfMatch != -1) {
-			styledText.setSelectionRange(indexOfMatch, findText.length());
-			styledText.showSelection();
-		} else {
-			String selectedText = styledText.getSelectionText();
-			if ((matchOptions & CASE_SENSITIVE_MATCH) == 0) {
-				selectedText = selectedText.toUpperCase();
-			}
-			if (selectedText.equals(findText)) {
-				indexOfMatch = styledText.getSelectionRange().x;
-			}
-		}
-		return indexOfMatch;
-
-	}
-
-	private int styledTextReplaceTextAndSelect(String replaceText) {
-		Point selectionOffset = styledText.getSelectionRange();
-		styledText.replaceTextRange(selectionOffset.x, selectionOffset.y,
-				replaceText);
-		styledText.setSelectionRange(selectionOffset.x, replaceText.length());
-
-		return 1;
-	}
-
-	private void styledTextReplaceAll(String findText, String replaceText,
-			int matchOptions) {
-		styledText.setSelectionRange(0, 0);
-		while (styledTextFindTextAndSelect(findText, FORWARD_MATCH,
-				matchOptions) != -1) {
-			styledTextReplaceTextAndSelect(replaceText);
-		}
-	}
-
-	private boolean isWordChar(char c) {
-		if (Character.isLetterOrDigit(c))
-			return true;
-		return false;
-	}
-
-	private boolean isPartOfWord(String text, int index, int length) {
-		if (index > 0)
-			if (isWordChar(text.charAt(index - 1)))
-				return true;
-		if (text.length() >= index + length)
-			if (isWordChar(text.charAt(index + length)))
-				return true;
-		return false;
-	}
-
-	public IRichText getRichText() {
-		return richText;
-	}
-
-	public void setRichText(IRichText richText) {
-		this.richText = richText;
-	}
-	
-	public void dispose() {
-		if (dialog != null) {
-			dialog.close();
-			dialog = null;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontNameAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontNameAction.java
deleted file mode 100755
index 3098330..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontNameAction.java
+++ /dev/null
@@ -1,100 +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.richtext.actions;
-
-import java.util.Iterator;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Sets the font name for the selected text in a rich text control.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class FontNameAction extends RichTextComboAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public FontNameAction(final IRichText richText) {
-		setToolTipText(RichTextResources.fontNameAction_toolTipText);
-		// get system fonts
-		SortedSet fontSet = new TreeSet();
-		FontData[] fonts = Display.getCurrent().getFontList(null, true);
-		for (int i = 0; i < fonts.length; i++) {
-			fontSet.add(((FontData) fonts[i]).getName());
-		}
-		addItem(RichTextResources.fontNameAction_DefaultFontName);
-		for (Iterator iter = fontSet.iterator(); iter.hasNext();) {
-			String fontName = (String) iter.next();
-			addItem(fontName);
-		}
-		setEnabled(true);
-		// add listener
-		richText.addListener(SWT.SELECTED, new Listener() {
-			public void handleEvent(Event event) {
-				String fontName = richText.getSelected().getFontName();
-				if (fontName
-						.equals(RichTextResources.fontNameAction_CSS_Default)
-						|| fontName
-								.equals(RichTextResources.fontNameAction_CSS_Default_Mozilla)
-						|| fontName.equals("default")) { //$NON-NLS-1$
-					fontName = RichTextResources.fontNameAction_DefaultFontName;
-				}
-				int index = findFontNameInItems(fontName);
-				combo.select(index);
-			}
-		});
-	}
-
-	private int findFontNameInItems(String fontName) {
-		int index = -1;
-		for (Iterator iter = items.iterator(); iter.hasNext();) {
-			String font = (String) iter.next();
-			index++;
-			if (font.equalsIgnoreCase(fontName)) {
-				return index;
-			}
-		}
-		return -1;
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 * @param index
-	 *            the index of the selected item
-	 */
-	public void execute(IRichText richText, int index) {
-		if (richText != null) {
-			String value = (String) items.get(index);
-			if (value.equals(RichTextResources.fontNameAction_DefaultFontName)) {
-				richText.executeCommand(RichTextCommand.SET_FONT_NAME, ""); //$NON-NLS-1$
-			} else {
-				richText.executeCommand(RichTextCommand.SET_FONT_NAME, value);
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontSizeAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontSizeAction.java
deleted file mode 100755
index 70bcac0..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontSizeAction.java
+++ /dev/null
@@ -1,83 +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.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Sets the font size for the selected text in a rich text control.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class FontSizeAction extends RichTextComboAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public FontSizeAction(final IRichText richText) {
-		setToolTipText(RichTextResources.fontSizeAction_toolTipText);
-		addItem("Default"); //$NON-NLS-1$
-		addItem("1"); //$NON-NLS-1$
-		addItem("2"); //$NON-NLS-1$
-		addItem("3"); //$NON-NLS-1$
-		addItem("4"); //$NON-NLS-1$
-		addItem("5"); //$NON-NLS-1$
-		addItem("6"); //$NON-NLS-1$
-		addItem("7"); //$NON-NLS-1$		
-		setEnabled(true);
-		// add listener
-		richText.addListener(SWT.SELECTED, new Listener() {
-			public void handleEvent(Event event) {
-				// mozilla returns "default" if no size is applied
-				// IE returns 2 if no size is applied
-				String fontSize = richText.getSelected().getFontSize();
-				int index = -1;
-				if (fontSize.equals("default")) { //$NON-NLS-1$
-					index = 0;
-				} else {
-					try {
-						index = Integer.parseInt(fontSize);
-					} catch (NumberFormatException e) {
-						// leave index at -1 so nothing is selected
-					}
-				}
-				combo.select(index);
-			}
-		});
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 * @param index
-	 *            the index of the selected item
-	 */
-	public void execute(IRichText richText, int index) {
-		if (richText != null) {
-			if (index == 0) {
-				richText.executeCommand(RichTextCommand.SET_FONT_SIZE, ""); //$NON-NLS-1$
-			} else {
-				richText.executeCommand(RichTextCommand.SET_FONT_SIZE,
-						"" + (index)); //$NON-NLS-1$
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontStyleAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontStyleAction.java
deleted file mode 100755
index 57e6615..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontStyleAction.java
+++ /dev/null
@@ -1,72 +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.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.html.FontStyle;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Sets the font style for the selected text in a rich text control.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class FontStyleAction extends RichTextComboAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public FontStyleAction(IRichText richText) {
-		setToolTipText(RichTextResources.fontStyleAction_toolTipText);
-		addItem(FontStyle.NORMAL.getName());
-		addItem(FontStyle.SECTION_HEADING.getName());
-		addItem(FontStyle.SUBSECTION_HEADING.getName());
-		addItem(FontStyle.SUB_SUBSECTION_HEADING.getName());
-		addItem(FontStyle.QUOTE.getName());
-		addItem(FontStyle.CODE_SAMPLE.getName());
-		setEnabled(true);
-		// add listener
-		if (richText instanceof RichText) {
-			final RichText rte = (RichText) richText;
-			rte.addListener(SWT.SELECTED, new Listener() {
-				public void handleEvent(Event event) {
-					String blockStyle = rte.getSelected().getBlockStyle();
-					String name = FontStyle.getFontStyleName(blockStyle);
-					int index = items.indexOf(name);
-					combo.select(index);
-				}
-			});
-		}
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 * @param index
-	 *            the index of the selected item
-	 */
-	public void execute(IRichText richText, int index) {
-		if (richText != null) {
-			String value = FontStyle.getFontStyle(index).getValue();
-			richText.executeCommand(RichTextCommand.SET_FONT_STYLE, value);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IBaseRichTextAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IBaseRichTextAction.java
deleted file mode 100755
index e9bb042..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IBaseRichTextAction.java
+++ /dev/null
@@ -1,52 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-/**
- * The base interface for a rich text action.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public interface IBaseRichTextAction {
-
-	/**
-	 * Returns the tool tip for the action.
-	 * 
-	 * @return the tool tip text
-	 */
-	public String getToolTipText();
-
-	/**
-	 * Sets the tool tip for the action.
-	 * 
-	 * @param toolTipText
-	 *            the tool tip text
-	 */
-	public void setToolTipText(String toolTipText);
-
-	/**
-	 * Returns the enabled status of the action.
-	 * 
-	 * @return <code>true</code> if enabled, <code>false</code> if not
-	 */
-	public boolean getEnabled();
-
-	/**
-	 * Enables or disables the action.
-	 * 
-	 * @param enabled
-	 *            If <code>true</code>, enable the action. if
-	 *            <code>false</code>, disable it
-	 */
-	public void setEnabled(boolean enabled);
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IRichTextAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IRichTextAction.java
deleted file mode 100755
index dc0a51e..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IRichTextAction.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.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.ToolItem;
-
-/**
- * The interface for a rich text button action.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public interface IRichTextAction extends IBaseRichTextAction {
-
-	/**
-	 * Returns the image for the action.
-	 * 
-	 * @return the image for the action
-	 */
-	public Image getImage();
-
-	/**
-	 * Sets the image for the action.
-	 * 
-	 * @param image
-	 *            the image for the action
-	 */
-	public void setImage(Image image);
-
-	/**
-	 * Returns the disabled image for the action.
-	 * 
-	 * @return the disabled image for the action
-	 */
-	public Image getDisabledImage();
-
-	/**
-	 * Sets the disabled image for the action.
-	 * 
-	 * @param image
-	 *            the disabled image for the action
-	 */
-	public void setDisabledImage(Image image);
-
-	/**
-	 * Returns <code>true</code> if this action should be disabled when the
-	 * rich text editor is in readonly mode.
-	 */
-	public boolean disableInReadOnlyMode();
-
-	/**
-	 * Returns <code>true</code> if this action should be disabled when the
-	 * rich text editor is in source edit mode.
-	 */
-	public boolean disableInSourceMode();
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText);
-	
-	/**
-	 * Sets the action's ToolItem
-	 * @param toolItem
-	 */
-	public void setToolItem(ToolItem toolItem);
-	
-	/**
-	 * Gets the SWT ToolItem Style to be used for this action
-	 */
-	public int getStyle();
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IRichTextComboAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IRichTextComboAction.java
deleted file mode 100755
index 28e83ba..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IRichTextComboAction.java
+++ /dev/null
@@ -1,56 +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.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.swt.custom.CCombo;
-
-/**
- * The interface for a rich text combo action.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public interface IRichTextComboAction extends IBaseRichTextAction {
-
-	/**
-	 * Adds an item.
-	 * 
-	 * @param item
-	 *            the item to be added
-	 */
-	public void addItem(String item);
-
-	/**
-	 * Returns all items.
-	 * 
-	 * @return an array of items
-	 */
-	public String[] getItems();
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 * @param index
-	 *            the index of the selected item
-	 */
-	public void execute(IRichText richText, int index);
-
-	/**
-	 * Sets the action's CCombo widget
-	 * 
-	 */
-	public void setCombo(CCombo combo);
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IndentAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IndentAction.java
deleted file mode 100755
index a67f0e8..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IndentAction.java
+++ /dev/null
@@ -1,49 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Indents the selected text in a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class IndentAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public IndentAction() {
-		super();
-		setImage(RichTextImages.IMG_INDENT);
-		setDisabledImage(RichTextImages.DISABLED_IMG_INDENT);
-		setToolTipText(RichTextResources.indentAction_toolTipText); 
-		setEnabled(true);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			richText.executeCommand(RichTextCommand.INDENT);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/ItalicAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/ItalicAction.java
deleted file mode 100755
index 1f4bae0..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/ItalicAction.java
+++ /dev/null
@@ -1,67 +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.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Toggles the 'italic' attribute of the selected text in a rich text control.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class ItalicAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ItalicAction(final IRichText richText) {
-		super();
-		setImage(RichTextImages.IMG_ITALIC);
-		setToolTipText(RichTextResources.italicAction_toolTipText);
-		setEnabled(true);
-		// add listener
-		richText.addListener(SWT.SELECTED, new Listener() {
-			public void handleEvent(Event event) {
-				toolItem.setSelection(richText.getSelected().isItalic());
-			}
-		});
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			richText.executeCommand(RichTextCommand.ITALIC);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.richtext.actions.RichTextAction#getStyle()
-	 */
-	public int getStyle() {
-		return SWT.CHECK;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyCenterAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyCenterAction.java
deleted file mode 100755
index 1895396..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyCenterAction.java
+++ /dev/null
@@ -1,48 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Center justifies the selected text in a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class JustifyCenterAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public JustifyCenterAction() {
-		super();
-		setImage(RichTextImages.IMG_JUSTIFY_CENTER);
-		setToolTipText(RichTextResources.justifyCenterAction_toolTipText); 
-		setEnabled(true);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			richText.executeCommand(RichTextCommand.JUSTIFY_CENTER);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyFullAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyFullAction.java
deleted file mode 100755
index ca45c9a..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyFullAction.java
+++ /dev/null
@@ -1,48 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Fully justifies the selected text in a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class JustifyFullAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public JustifyFullAction() {
-		super();
-		setImage(RichTextImages.IMG_JUSTIFY_FULL);
-		setToolTipText(RichTextResources.justifyFullAction_toolTipText); 
-		setEnabled(true);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			richText.executeCommand(RichTextCommand.JUSTIFY_FULL);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyLeftAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyLeftAction.java
deleted file mode 100755
index 3268e31..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyLeftAction.java
+++ /dev/null
@@ -1,48 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Left justifies the selected text in a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class JustifyLeftAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public JustifyLeftAction() {
-		super();
-		setImage(RichTextImages.IMG_JUSTIFY_LEFT);
-		setToolTipText(RichTextResources.justifyLeftAction_toolTipText); 
-		setEnabled(true);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			richText.executeCommand(RichTextCommand.JUSTIFY_LEFT);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyRightAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyRightAction.java
deleted file mode 100755
index 98ee135..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyRightAction.java
+++ /dev/null
@@ -1,48 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Right justifies the selected text in a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class JustifyRightAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public JustifyRightAction() {
-		super();
-		setImage(RichTextImages.IMG_JUSTIFY_RIGHT);
-		setToolTipText(RichTextResources.justifyRightAction_toolTipText); 
-		setEnabled(true);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			richText.executeCommand(RichTextCommand.JUSTIFY_RIGHT);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/OutdentAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/OutdentAction.java
deleted file mode 100755
index aba3ddb..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/OutdentAction.java
+++ /dev/null
@@ -1,49 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Indents the selected text in a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class OutdentAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public OutdentAction() {
-		super();
-		setImage(RichTextImages.IMG_OUTDENT);
-		setDisabledImage(RichTextImages.DISABLED_IMG_OUTDENT);
-		setToolTipText(RichTextResources.outdentAction_toolTipText); 
-		setEnabled(true);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			richText.executeCommand(RichTextCommand.OUTDENT);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/PasteAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/PasteAction.java
deleted file mode 100755
index 8cc928a..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/PasteAction.java
+++ /dev/null
@@ -1,235 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import java.io.File;
-import java.net.URL;
-import java.util.Stack;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.epf.common.utils.ClipboardUtil;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.common.utils.NetUtil;
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextEditor;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextPlugin;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.HTMLTransfer;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Pastes text from the clipboard onto a rich text control.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class PasteAction extends RichTextAction {
-
-	private static final String SOURCE_URL = "SourceURL:"; //$NON-NLS-1$
-
-	private static final String HTM_EXT = ".htm"; //$NON-NLS-1$
-
-	private static final String HTML_EXT = ".html"; //$NON-NLS-1$
-
-	private static final Pattern HREF_REFERENCES = Pattern
-			.compile(
-					"href\\s*=\\s*\"(.*?)\"", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
-
-	protected static final Pattern p_image_ref = Pattern
-			.compile(
-					"(<(img|iframe).*?src\\s*=\\s*\")(.*?)(\")", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
-
-	protected static String sourceURLStr = ""; //$NON-NLS-1$
-
-	private Logger logger;
-	
-	private static String RESOURCES = "resources"; //$NON-NLS-1$
-
-	/**
-	 * Creates a new instance.
-	 */
-	public PasteAction() {
-		super();
-		setImage(RichTextImages.IMG_PASTE);
-		setDisabledImage(RichTextImages.DISABLED_IMG_PASTE);
-		setToolTipText(RichTextResources.pasteAction_toolTipText);
-		setEnabled(true);
-		logger = RichTextPlugin.getDefault().getLogger();
-	}
-
-	/**
-	 * Returns <code>true</code> if this action should be disabled when the
-	 * rich text editor is in source edit mode.
-	 */
-	public boolean disableInSourceMode() {
-		return false;
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			copyLinkResources(richText);
-			if (richText instanceof RichTextEditor
-					&& ((RichTextEditor) richText).isHTMLTabSelected()) {
-				StyledText styledText = ((RichTextEditor) richText)
-						.getSourceEdit();
-				styledText.paste();
-			} else {
-				richText.executeCommand(RichTextCommand.PASTE, sourceURLStr);
-			}
-		}
-	}
-
-	/**
-	 * Copies the link resources.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	protected void copyLinkResources(IRichText richText) {
-		try {
-			sourceURLStr = ClipboardUtil.getHTMLSourceURL();
-			Clipboard clipboard = new Clipboard(Display.getCurrent());
-			String html = (String) clipboard.getContents(HTMLTransfer
-					.getInstance());
-			if (html != null && html.length() > 0) {
-				String basePath = richText.getBasePath();
-				URL sourceURL = null;
-				if (sourceURLStr == null || sourceURLStr.length() == 0
-						|| sourceURLStr.equals("about:blank")) { //$NON-NLS-1$
-					sourceURL = richText.getCopyURL();
-				} else {
-					sourceURL = new URL(sourceURLStr);
-				}
-
-				Matcher matcher = HREF_REFERENCES.matcher(html);
-				while (matcher.find()) {
-					String href = NetUtil.decodeURL(matcher.group(1));
-					try {
-						URL hrefURL = new URL(sourceURL, href);
-						String scheme = hrefURL.getProtocol();
-						if (scheme != null
-								&& scheme
-										.equalsIgnoreCase(NetUtil.FILE_SCHEME)) {
-							String url = hrefURL.getPath();
-							File srcFile = new File(url);
-							File tgtFile = null;
-							File tgtDir = null;
-							if (href.startsWith(RESOURCES) || href.startsWith("./" + RESOURCES)) { //$NON-NLS-1$
-								tgtFile = new File(basePath, href);
-								tgtDir = tgtFile.getParentFile();
-							} else {
-								String resPath = getSubdirectoryOfResources(href);
-								tgtFile = new File(basePath + RESOURCES, resPath);
-								tgtDir = tgtFile;
-							}
-							tgtDir.mkdirs();
-							FileUtil.copyFile(srcFile, tgtDir);
-						}
-					} catch (Exception e) {
-						logger.logError(e);
-					}
-				}
-
-				matcher = p_image_ref.matcher(html);
-				while (matcher.find()) {
-					String src = NetUtil.decodeURL(matcher.group(3));
-					try {
-						URL srcURL = new URL(sourceURL, src);
-						String scheme = srcURL.getProtocol();
-						if (scheme != null
-								&& scheme.equalsIgnoreCase(NetUtil.FILE_SCHEME)) {
-							File srcFile = null;
-							String authority = srcURL.getAuthority();
-							if (authority != null) {
-								srcFile = new File(authority + srcURL.getPath());
-							} else {
-								srcFile = new File(srcURL.getPath());
-							}
-							File tgtFile = null;
-							File tgtDir = null;
-							if (src.startsWith(RESOURCES) || src.startsWith("./" + RESOURCES)) { //$NON-NLS-1$
-								tgtFile = new File(basePath, src);
-								tgtDir = tgtFile.getParentFile();
-							} else {
-								String resPath = getSubdirectoryOfResources(src);
-								tgtFile = new File(basePath + RESOURCES, resPath);
-								tgtDir = tgtFile;
-							}
-							tgtDir.mkdirs();
-							FileUtil.copyFile(srcFile, tgtDir);
-						}
-					} catch (Exception e) {
-						logger.logError(e);
-					}
-				}
-			}
-		} catch (Exception e) {
-			logger.logError(e);
-		}
-	}
-
-	/**
-	 * Parses the given HTML content from the clipboard and returns the source
-	 * URL.
-	 * 
-	 * @param htmlContent
-	 *            the HTML content from the clipboard
-	 * @return the source URL or <code>null</code>
-	 */
-	protected String getSourceURL(String htmlContent) {
-		String sourceURL = null;
-		int sourceURLIndex = htmlContent.indexOf(SOURCE_URL);
-		if (sourceURLIndex > 0) {
-			sourceURL = htmlContent.substring(sourceURLIndex
-					+ SOURCE_URL.length());
-			sourceURL = sourceURL.substring(0, sourceURL
-					.indexOf(FileUtil.LINE_SEP));
-			if (sourceURL.toLowerCase().endsWith(HTM_EXT)
-					|| sourceURL.toLowerCase().endsWith(HTML_EXT)) {
-				sourceURL = sourceURL.substring(0, sourceURL.indexOf(FileUtil
-						.getFileName(sourceURL)) - 1);
-				sourceURL = sourceURL.replace('\\', '/');
-			}
-			sourceURL = FileUtil.appendSeparator(sourceURL, "/"); //$NON-NLS-1$
-		}
-		return sourceURL;
-	}
-
-	protected String getSubdirectoryOfResources(String path) {
-		String result = ""; //$NON-NLS-1$
-		int res_idx = path.indexOf(RESOURCES);
-		if (res_idx != -1) {
-			Stack stack = new Stack();
-			File relative = new File(path).getParentFile();
-			while (!relative.getName().equals(RESOURCES)) {
-				stack.push(relative.getName());
-				relative = relative.getParentFile();
-			}
-			while (!stack.isEmpty()) {
-				result = result + (String)stack.pop() + File.separator;
-			}
-		} 
-		return result;
-	}
-	
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/PastePlainTextAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/PastePlainTextAction.java
deleted file mode 100755
index 565466c..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/PastePlainTextAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextEditor;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.widgets.Display;
-
-public class PastePlainTextAction extends RichTextAction {
-
-    protected final String LINE_FEED = System.getProperty("line.separator"); //$NON-NLS-1$
-
-    protected final String LINE_FEED_REGEX = LINE_FEED.replaceAll("\\\\", "\\\\"); //$NON-NLS-1$ //$NON-NLS-2$
-    
-    protected final String HTML_BREAK = "<br/>";//$NON-NLS-1$
-	
-	/**
-	 * Creates a new instance.
-	 */
-	public PastePlainTextAction() {
-		super();
-		// TODO need image
-		setImage(RichTextImages.IMG_PASTE);
-		// TODO need image
-		setDisabledImage(RichTextImages.DISABLED_IMG_PASTE);
-		setToolTipText(RichTextResources.pastePlainTextAction_toolTipText);
-		setEnabled(true);
-	}
-	
-	/**
-	 * Returns <code>true</code> if this action should be disabled when the
-	 * rich text editor is in source edit mode.
-	 */
-	public boolean disableInSourceMode() {
-		return false;
-	}
-	
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			// get text from clipboard
-			Clipboard clipboard = new Clipboard(Display.getCurrent());
-			String text = (String) clipboard.getContents(TextTransfer
-					.getInstance());
-			if (text != null && text.length() > 0) {
-				text = text.replaceAll(LINE_FEED_REGEX, HTML_BREAK + LINE_FEED);
-				if (richText instanceof RichTextEditor) {
-					((RichTextEditor)richText).addHTML(text);
-				} else {
-					richText.executeCommand(RichTextCommand.ADD_HTML, text);
-				}
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/RichTextAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/RichTextAction.java
deleted file mode 100755
index 821dd61..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/RichTextAction.java
+++ /dev/null
@@ -1,121 +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.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.ToolItem;
-
-/**
- * The abstract implementation of a rich text action.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public abstract class RichTextAction extends BaseRichTextAction implements
-		IRichTextAction {
-
-	protected Image image;
-
-	protected Image disabledImage;
-
-	protected ToolItem toolItem;
-
-	public RichTextAction() {
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public RichTextAction(IRichText richText) {
-	}
-
-	/**
-	 * Returns the image for the action.
-	 * 
-	 * @return the image for the action
-	 */
-	public Image getImage() {
-		return image;
-	}
-
-	/**
-	 * Sets the image for the action.
-	 * 
-	 * @param image
-	 *            the image for the action
-	 */
-	public void setImage(Image image) {
-		this.image = image;
-	}
-
-	/**
-	 * Returns the disabled image for the action.
-	 * 
-	 * @return the disabled image for the action
-	 */
-	public Image getDisabledImage() {
-		return disabledImage;
-	}
-
-	/**
-	 * Sets the disabled image for the action.
-	 * 
-	 * @param disabledImage
-	 *            the disabled image for the action
-	 */
-	public void setDisabledImage(Image disabledImage) {
-		this.disabledImage = disabledImage;
-	}
-
-	/**
-	 * Returns <code>true</code> if this action should be disabled when the
-	 * rich text editor is in readonly mode.
-	 */
-	public boolean disableInReadOnlyMode() {
-		return true;
-	}
-
-	/**
-	 * Returns <code>true</code> if this action should be disabled when the
-	 * rich text editor is in source edit mode.
-	 */
-	public boolean disableInSourceMode() {
-		return true;
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public abstract void execute(IRichText richText);
-
-	public void setToolItem(ToolItem toolItem) {
-		this.toolItem = toolItem;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.richtext.actions.IRichTextAction#getStyle()
-	 */
-	public int getStyle() {
-		return SWT.NONE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/RichTextComboAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/RichTextComboAction.java
deleted file mode 100755
index 65083cb..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/RichTextComboAction.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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.swt.custom.CCombo;
-
-/**
- * The abstract implementation of a rich text combo action.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public abstract class RichTextComboAction extends BaseRichTextAction implements
-		IRichTextComboAction {
-
-	protected List items = new ArrayList();
-
-	protected CCombo combo;
-
-	/**
-	 * Adds a combo item.
-	 * 
-	 * @param itemText
-	 *            the text for a combo item
-	 */
-	public void addItem(String itemText) {
-		items.add(itemText);
-	}
-
-	/**
-	 * Returns an array of combo items.
-	 * 
-	 * @return an array of combo items
-	 */
-	public String[] getItems() {
-		return (String[]) items.toArray(new String[items.size()]);
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 * @param index
-	 *            the index of the selected item
-	 */
-	public abstract void execute(IRichText richText, int index);
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.richtext.actions.IRichTextComboAction#setCombo(org.eclipse.swt.custom.CCombo)
-	 */
-	public void setCombo(CCombo combo) {
-		this.combo = combo;
-	}
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/SubscriptAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/SubscriptAction.java
deleted file mode 100755
index a634806..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/SubscriptAction.java
+++ /dev/null
@@ -1,68 +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.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Toggles the subscript attribute of the selected text in a rich text control.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class SubscriptAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SubscriptAction(final IRichText richText) {
-		super();
-		setImage(RichTextImages.IMG_SUBSCRIPT);
-		setDisabledImage(RichTextImages.DISABLED_IMG_SUBSCRIPT);
-		setToolTipText(RichTextResources.subscriptAction_toolTipText);
-		setEnabled(true);
-		// add listener
-		richText.addListener(SWT.SELECTED, new Listener() {
-			public void handleEvent(Event event) {
-				toolItem.setSelection(richText.getSelected().isSubscript());
-			}
-		});
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			richText.executeCommand(RichTextCommand.SUBSCRIPT);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.richtext.actions.RichTextAction#getStyle()
-	 */
-	public int getStyle() {
-		return SWT.CHECK;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/SuperscriptAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/SuperscriptAction.java
deleted file mode 100755
index 37df4b4..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/SuperscriptAction.java
+++ /dev/null
@@ -1,69 +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.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Toggles the superscript attribute of the selected text in a rich text
- * control.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class SuperscriptAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SuperscriptAction(final IRichText richText) {
-		super();
-		setImage(RichTextImages.IMG_SUPERSCRIPT);
-		setDisabledImage(RichTextImages.DISABLED_IMG_SUPERSCRIPT);
-		setToolTipText(RichTextResources.superscriptAction_toolTipText);
-		setEnabled(true);
-		// add listener
-		richText.addListener(SWT.SELECTED, new Listener() {
-			public void handleEvent(Event event) {
-				toolItem.setSelection(richText.getSelected().isSuperscript());
-			}
-		});
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			richText.executeCommand(RichTextCommand.SUPERSCRIPT);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.richtext.actions.RichTextAction#getStyle()
-	 */
-	public int getStyle() {
-		return SWT.CHECK;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/UnderlineAction.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/UnderlineAction.java
deleted file mode 100755
index 404690d..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/UnderlineAction.java
+++ /dev/null
@@ -1,68 +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.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Toggles the underline attribute of the selected text in a rich text control.
- * 
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class UnderlineAction extends RichTextAction {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public UnderlineAction(final IRichText richText) {
-		super();
-		setImage(RichTextImages.IMG_UNDERLINE);
-		setDisabledImage(RichTextImages.DISABLED_IMG_UNDERLINE);
-		setToolTipText(RichTextResources.underlineAction_toolTipText);
-		setEnabled(true);
-		// add listener
-		richText.addListener(SWT.SELECTED, new Listener() {
-			public void handleEvent(Event event) {
-				toolItem.setSelection(richText.getSelected().isUnderLine());
-			}
-		});
-	}
-
-	/**
-	 * Executes the action.
-	 * 
-	 * @param richText
-	 *            a rich text control
-	 */
-	public void execute(IRichText richText) {
-		if (richText != null) {
-			richText.executeCommand(RichTextCommand.UNDERLINE);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.epf.richtext.actions.RichTextAction#getStyle()
-	 */
-	public int getStyle() {
-		return SWT.CHECK;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/package.html b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/package.html
deleted file mode 100755
index 23d9e6e..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides editing actions for the rich text control and editor.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddImageDialog.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddImageDialog.java
deleted file mode 100755
index f3e1b1f..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddImageDialog.java
+++ /dev/null
@@ -1,137 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.dialogs;
-
-import java.io.File;
-
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.html.Image;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Prompts the user to specify the image that will be used to create a HTML
- * <img> tag in the rich text editor.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddImageDialog extends BaseDialog {
-
-	protected Image image = new Image();
-
-	protected Text urlText;
-
-	protected Button browseButton;
-
-	protected SelectionAdapter browseSelectionAdapter = new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent event) {
-			FileDialog dialog = new FileDialog(Display.getCurrent()
-					.getActiveShell(), SWT.OPEN);
-			dialog
-					.setFilterExtensions(new String[] {
-							"*.gif", "*.jpg", "*.bmp" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			String imageFile = dialog.open();
-			if (imageFile != null && imageFile.length() > 0) {
-				File file = new File(imageFile);
-				try {
-					String url = file.toURL().toExternalForm();
-					urlText.setText(url);
-				} catch (Exception e) {
-					logger.logError(e);
-				}
-			}
-		}
-	};
-
-	protected ModifyListener urlTextListener = new ModifyListener() {
-		public void modifyText(ModifyEvent e) {
-			if (okButton != null) {
-				okButton.setEnabled(urlText.getText().trim().length() > 0);
-			}
-		}
-	};
-
-	/**
-	 * Creates a new instance given the parent control.
-	 * 
-	 * @param parent
-	 *            the parent control
-	 */
-	public AddImageDialog(Shell parent) {
-		super(parent);
-	}
-
-	/**
-	 * @see BaseDialog#createDialogArea(Composite parent)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite) super.createDialogArea(parent);
-		GridLayout layout = (GridLayout) composite.getLayout();
-		layout.numColumns = 3;
-
-		Label urlLabel = new Label(composite, SWT.NONE);
-		urlLabel.setText(RichTextResources.urlLabel_text); 
-		urlText = new Text(composite, SWT.BORDER);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.widthHint = 300;
-		urlText.setLayoutData(gridData);
-		urlText.addModifyListener(urlTextListener);
-
-		browseButton = new Button(composite, SWT.NONE);
-		browseButton.setText(RichTextResources.browseButton_text);
-		browseButton.addSelectionListener(browseSelectionAdapter);
-
-		super.getShell().setText(
-				RichTextResources.addImageDialog_title); 
-
-		return composite;
-	}
-
-	/**
-	 * @see BaseDialog#createButtonsForButtonBar(Composite parent)
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		super.createButtonsForButtonBar(parent);
-		okButton.setEnabled(false);
-	}
-
-	/**
-	 * Called when the OK button is selected.
-	 */
-	protected void okPressed() {
-		String url = urlText.getText();
-		if (url != null && url.length() > 0) {
-			image.setURL(url);
-		}
-		super.okPressed();
-	}
-
-	/**
-	 * Returns the <code>Image</code> object.
-	 */
-	public Image getImage() {
-		return image;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddLinkDialog.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddLinkDialog.java
deleted file mode 100755
index 503e4e1..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddLinkDialog.java
+++ /dev/null
@@ -1,118 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.dialogs;
-
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.html.Link;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Prompts the user to specify the file that will be used to create a HTML <a>
- * tag in the rich text editor.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddLinkDialog extends BaseDialog {
-
-	protected Link link = new Link();
-
-	protected Text urlText;
-
-	protected String basePath;
-
-	protected Composite composite;
-
-	protected Label urlLabel;
-
-	protected Text urlDisplayNameText;
-
-	protected Label urlDisplayNameLabel;
-
-	/**
-	 * Creates a new instance given the parent control.
-	 * 
-	 * @param parent
-	 *            the parent control
-	 */
-	public AddLinkDialog(Shell parent, String basePath) {
-		super(parent);
-		this.basePath = basePath;
-	}
-
-	/**
-	 * @see BaseDialog#createDialogArea(Composite parent)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		composite = (Composite) super.createDialogArea(parent);
-
-		urlLabel = new Label(composite, SWT.NONE);
-		urlLabel.setText(RichTextResources.urlLabel_text); 
-		urlText = new Text(composite, SWT.BORDER);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.widthHint = 300;
-		urlText.setLayoutData(gridData);
-		urlText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (okButton != null) {
-					okButton.setEnabled(urlText.getText().trim().length() > 0);
-				}
-			}
-		});
-		
-		urlDisplayNameLabel = new Label(composite, SWT.NONE);
-		urlDisplayNameLabel.setText(RichTextResources.urlDisplayNameLabel_text); 
-		urlDisplayNameText = new Text(composite, SWT.BORDER);
-		GridData gridData2 = new GridData(GridData.FILL_HORIZONTAL);
-		gridData2.widthHint = 300;
-		urlDisplayNameText.setLayoutData(gridData2);
-
-		super.getShell().setText(
-				RichTextResources.addLinkDialog_title); 
-
-		return composite;
-	}
-
-	/**
-	 * @see BaseDialog#createButtonsForButtonBar(Composite parent)
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		super.createButtonsForButtonBar(parent);
-		okButton.setEnabled(false);
-	}
-
-	/**
-	 * Called when the OK button is selected.
-	 */
-	protected void okPressed() {
-		String url = urlText.getText();
-		if (url != null && url.length() > 0) {
-			link.setURL(url);
-			link.setName(urlDisplayNameText.getText());
-		}
-		super.okPressed();
-	}
-
-	/**
-	 * Returns the <code>Link</code> object.
-	 */
-	public Link getLink() {
-		return link;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddTableDialog.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddTableDialog.java
deleted file mode 100755
index f9cc15a..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddTableDialog.java
+++ /dev/null
@@ -1,214 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.dialogs;
-
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.html.Table;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Prompts the user to specify the attributes that will be used to create a HTML
- * <table> tag in the rich text editor.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddTableDialog extends BaseDialog {
-
-	private static final int DEFAULT_ROWS = 2;
-
-	private static final int DEFAULT_COLUMNS = 2;
-
-	private static final String DEFAULT_WIDTH = "85%";
-
-	private static final String[] TABLE_STYLE_LABELS = {
-			RichTextResources.tableHeaderNone_text, 
-			RichTextResources.tableHeaderCols_text, 
-			RichTextResources.tableHeaderRows_text, 
-			RichTextResources.tableHeaderBoth_text, 
-	};
-
-	private Table table = new Table();
-
-	private Text rowsText;
-
-	private Text colsText;
-
-	private Text widthText;
-
-	private Combo tableTypeCombo;
-
-	private Text summaryText;
-
-	private Text captionText;
-
-	private ModifyListener modifyListener = new ModifyListener() {
-		public void modifyText(ModifyEvent event) {
-			if (okButton != null) {
-				try {
-					int rows = Integer.parseInt(rowsText.getText().trim());
-					int cols = Integer.parseInt(colsText.getText().trim());
-					String width = widthText.getText().trim();
-					okButton.setEnabled(rows > 0 && cols > 0 && width.length() > 0);
-				} catch (Exception e) {
-					okButton.setEnabled(false);
-				}
-			}
-		}
-	};
-
-	/**
-	 * Creates a new instance given the parent control.
-	 * 
-	 * @param parent
-	 *            the parent control
-	 */
-	public AddTableDialog(Shell parent) {
-		super(parent);
-	}
-
-	/**
-	 * @see BaseDialog#createDialogArea(Composite parent)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite) super.createDialogArea(parent);
-
-		Label rowsLabel = new Label(composite, SWT.NONE);
-		rowsLabel.setText(RichTextResources.rowsLabel_text); 
-
-		rowsText = new Text(composite, SWT.BORDER);
-		rowsText.setTextLimit(2);
-		rowsText.setText("" + DEFAULT_ROWS); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-					| GridData.GRAB_HORIZONTAL);
-			rowsText.setLayoutData(gridData);
-		}
-		rowsText.addModifyListener(modifyListener);
-
-		Label colsLabel = new Label(composite, SWT.NONE);
-		colsLabel.setText(RichTextResources.columnsLabel_text); 
-
-		colsText = new Text(composite, SWT.BORDER);
-		colsText.setTextLimit(2);
-		colsText.setText("" + DEFAULT_COLUMNS); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-					| GridData.GRAB_HORIZONTAL);
-			colsText.setLayoutData(gridData);
-		}
-		colsText.addModifyListener(modifyListener);
-
-		Label widthLabel = new Label(composite, SWT.NONE);
-		widthLabel.setText(RichTextResources.widthLabel_text); 
-
-		widthText = new Text(composite, SWT.BORDER);
-		widthText.setText("" + DEFAULT_WIDTH); //$NON-NLS-1$
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-					| GridData.GRAB_HORIZONTAL);
-			widthText.setLayoutData(gridData);
-		}
-		widthText.addModifyListener(modifyListener);
-
-		Label headerTypeLabel = new Label(composite, SWT.NONE);
-		headerTypeLabel.setText(RichTextResources.tableStyleLabel_text); 
-
-		tableTypeCombo = new Combo(composite, SWT.BORDER | SWT.READ_ONLY);
-		tableTypeCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		tableTypeCombo.setItems(TABLE_STYLE_LABELS);
-		tableTypeCombo.setText(TABLE_STYLE_LABELS[0]);
-
-		Label summaryLabel = new Label(composite, SWT.NONE);
-		summaryLabel.setText(RichTextResources.summaryLabel_text); 
-		summaryText = new Text(composite, SWT.BORDER);
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-					| GridData.GRAB_HORIZONTAL);
-			summaryText.setLayoutData(gridData);
-		}
-
-		Label captionLabel = new Label(composite, SWT.NONE);
-		captionLabel.setText(RichTextResources.captionLabel_text); 
-		captionText = new Text(composite, SWT.BORDER);
-		{
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-					| GridData.GRAB_HORIZONTAL);
-			captionText.setLayoutData(gridData);
-		}
-
-		super.getShell().setText(
-				RichTextResources.addTableDialog_title); 
-
-		return composite;
-	}
-
-	/**
-	 * @see BaseDialog#createButtonsForButtonBar(Composite parent)
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		super.createButtonsForButtonBar(parent);
-	}
-
-	/**
-	 * Called when the OK button is selected.
-	 */
-	protected void okPressed() {
-		String rowsValue = rowsText.getText();
-		if (rowsValue != null && rowsValue.length() > 0) {
-			try {
-				int rows = Integer.parseInt(rowsValue);
-				table.setRows(rows);
-			} catch (Exception e) {
-				table.setRows(DEFAULT_ROWS);
-			}
-		}
-
-		String colsValue = colsText.getText();
-		if (colsValue != null && colsValue.length() > 0) {
-			try {
-				int cols = Integer.parseInt(colsValue);
-				table.setColumns(cols);
-			} catch (Exception e) {
-				table.setColumns(DEFAULT_COLUMNS);
-			}
-		}
-
-		String widthValue = widthText.getText();
-		if (widthValue != null && widthValue.length() > 0) {
-			table.setWidth(widthValue);
-		} else {
-			table.setWidth(DEFAULT_WIDTH);
-		}
-
-		table.setSummary(summaryText.getText().trim());
-		table.setCaption(captionText.getText().trim());
-		table.setTableHeaders(tableTypeCombo.getSelectionIndex());
-
-		super.okPressed();
-	}
-
-	/**
-	 * Returns the <code>Table</code> object.
-	 */
-	public Table getTable() {
-		return table;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/BaseDialog.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/BaseDialog.java
deleted file mode 100755
index df1f0d9..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/BaseDialog.java
+++ /dev/null
@@ -1,89 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.dialogs;
-
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.epf.richtext.RichTextPlugin;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The base class for all dialogs used by the rich text editor.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class BaseDialog extends Dialog {
-
-	// The plug-in logger.
-	protected Logger logger;
-
-	/**
-	 * The OK button.
-	 */
-	protected Button okButton;
-
-	/**
-	 * The Cancel button.
-	 */
-	protected Button cancelButton;
-
-	/**
-	 * Creates a <code>BaseDialog</code> given the parent control.
-	 * 
-	 * @param parent
-	 *            the parent control
-	 */
-	public BaseDialog(Shell parent) {
-		super(parent);
-		logger = RichTextPlugin.getDefault().getLogger();
-	}
-
-	/**
-	 * @see Dialog#createDialogArea(Composite parent)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite) super.createDialogArea(parent);
-		GridLayout layout = (GridLayout) composite.getLayout();
-		layout.marginWidth = 10;
-		layout.marginHeight = 10;
-		layout.numColumns = 2;
-		GridData gridData = (GridData) composite.getLayoutData();
-		gridData.verticalIndent = 10;
-		return composite;
-	}
-
-	/**
-	 * Creates the dialog buttons.
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		// Create the OK button.
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
-				true);
-
-		// Create the Cancel button.
-		createButton(parent, IDialogConstants.CANCEL_ID,
-				IDialogConstants.CANCEL_LABEL, false);
-
-		// Set help context for the OK button.
-		okButton = super.getButton(IDialogConstants.OK_ID);
-
-		// Set help context for the Cancel button.
-		cancelButton = super.getButton(IDialogConstants.CANCEL_ID);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/FindReplaceDialog.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/FindReplaceDialog.java
deleted file mode 100755
index ba89bca..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/FindReplaceDialog.java
+++ /dev/null
@@ -1,313 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.dialogs;
-
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.actions.FindReplaceAction;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Prompts the user to specify the search and replace strings/options.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class FindReplaceDialog extends BaseDialog {
-
-	private FindReplaceAction findReplaceAction;
-
-	private boolean findOnly;
-
-	private Text findText;
-
-	private Text replaceText;
-
-	private Button searchForwardRadioButton;
-
-	private Button searchBackwardRadioButton;
-
-	private Button caseSensitiveCheckbox;
-
-	private Button wholeWordCheckbox;
-
-	private Button findButton;
-
-	private Button replaceButton;
-
-	private Button replaceFindButton;
-
-	private Button replaceAllButton;
-
-	private Label statusLabel;
-
-	/**
-	 * Creates a new instance given the parent control.
-	 * 
-	 * @param parent
-	 *            the parent control
-	 * @param findReplaceAction
-	 *            the Find and Replace action
-	 * @param findOnly
-	 *            if <code>true</code>, disable the replace and replace all
-	 *            functionalities
-	 */
-	public FindReplaceDialog(Shell parent, FindReplaceAction findReplaceAction,
-			boolean findOnly) {
-		super(parent);
-		setShellStyle(SWT.DIALOG_TRIM | SWT.MODELESS
-				| getDefaultOrientation());
-		setBlockOnOpen(false);
-		this.findReplaceAction = findReplaceAction;
-		this.findOnly = findOnly;
-	}
-
-	/**
-	 * @see BaseDialog#createDialogArea(Composite parent)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite) super.createDialogArea(parent);
-		GridLayout layout = (GridLayout) composite.getLayout();
-		layout.numColumns = 1;
-
-		Composite textComposite = new Composite(composite, SWT.NONE);
-		textComposite.setLayout(new GridLayout(2, false));
-		textComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label findLabel = new Label(textComposite, SWT.NONE);
-		findLabel.setText(RichTextResources.findLabel_text); 
-		findText = new Text(textComposite, SWT.BORDER);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.widthHint = 200;
-		findText.setLayoutData(gridData);
-		findText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (findButton != null) {
-					findButton
-							.setEnabled(findText.getText().trim().length() > 0);
-				}
-				if (replaceAllButton != null && !findOnly) {
-					replaceAllButton.setEnabled(findText.getText().trim()
-							.length() > 0);
-				}
-			}
-		});
-
-		Label replaceLabel = new Label(textComposite, SWT.NONE);
-		replaceLabel.setText(RichTextResources.replaceLabel_text); 
-		replaceText = new Text(textComposite, SWT.BORDER);
-		replaceText.setLayoutData(gridData);
-		if (findOnly) {
-			replaceText.setEnabled(false);
-		} else {
-		replaceText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (replaceButton != null) {
-						replaceButton.setEnabled(findReplaceAction
-								.getFoundMatch());
-				}
-				if (replaceFindButton != null) {
-					replaceFindButton.setEnabled(findReplaceAction
-							.getFoundMatch());
-				}
-			}
-		});
-		}
-
-		Composite optionsComposite = new Composite(composite, SWT.NONE);
-		optionsComposite.setLayout(new GridLayout(2, true));
-		optionsComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Group directionGroup = new Group(optionsComposite, SWT.NONE);
-		directionGroup.setText(RichTextResources.directionGroup_text); 
-		directionGroup.setLayout(new GridLayout(1, false));
-		directionGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		searchForwardRadioButton = new Button(directionGroup, SWT.RADIO);
-		searchForwardRadioButton.setText(RichTextResources.forwardRadioButton_text); 
-		searchForwardRadioButton.setSelection(true);
-		searchBackwardRadioButton = new Button(directionGroup, SWT.RADIO);
-		searchBackwardRadioButton.setText(RichTextResources.backwardRadioButton_text); 
-
-		Group optionsGroup = new Group(optionsComposite, SWT.NONE);
-		optionsGroup.setText(RichTextResources.optionsGroup_text); 
-		optionsGroup.setLayout(new GridLayout(1, false));
-		optionsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		caseSensitiveCheckbox = new Button(optionsGroup, SWT.CHECK);
-		caseSensitiveCheckbox.setText(RichTextResources.caseSensitiveCheckbox_text); 
-		wholeWordCheckbox = new Button(optionsGroup, SWT.CHECK);
-		wholeWordCheckbox.setText(RichTextResources.wholeWordCheckbox_text); 
-
-		statusLabel = new Label(composite, SWT.NONE);
-		statusLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		super.getShell()
-				.setText(
-						RichTextResources.findReplaceDialog_title); 
-
-		return composite;
-	}
-
-	/**
-	 * @see BaseDialog#createButtonsForButtonBar(Composite parent)
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-
-		createButton(parent, IDialogConstants.CLIENT_ID + 1, RichTextResources.findButton_text, true); 
-		findButton = super.getButton(IDialogConstants.CLIENT_ID + 1);
-		findButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				findReplaceAction.run(FindReplaceAction.FIND_TEXT,
-						getFindText(), getReplaceText(), getMatchDirection(),
-						getMatchOptions());
-				if (!findOnly) {
-				replaceButton.setEnabled(findReplaceAction.getFoundMatch());
-					replaceFindButton.setEnabled(findReplaceAction
-							.getFoundMatch());
-				}
-				if (findReplaceAction.getFoundMatch()) {
-					statusLabel.setText("");  //$NON-NLS-1$
-				}
-				else {
-					statusLabel.setText(RichTextResources.FindReplace_Status_noMatch_label); 
-				}
-				findButton.setFocus();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		createButton(parent, IDialogConstants.CLIENT_ID + 2, RichTextResources.replaceButton_text, false); 
-		replaceButton = super.getButton(IDialogConstants.CLIENT_ID + 2);
-		if (!findOnly) {
-			replaceButton.addSelectionListener(new SelectionListener() {
-				public void widgetSelected(SelectionEvent event) {
-					findReplaceAction.run(FindReplaceAction.REPLACE_TEXT,
-							getFindText(), getReplaceText(),
-							getMatchDirection(), getMatchOptions());
-					replaceButton.setFocus();
-				}
-	
-				public void widgetDefaultSelected(SelectionEvent e) {
-				}
-			});
-		}
-
-		createButton(parent, IDialogConstants.CLIENT_ID + 3, RichTextResources.replaceFindButton_text, false); 
-		replaceFindButton = super.getButton(IDialogConstants.CLIENT_ID + 3);
-		if (!findOnly) {
-			replaceFindButton.addSelectionListener(new SelectionListener() {
-				public void widgetSelected(SelectionEvent event) {
-					findReplaceAction.run(FindReplaceAction.REPLACE_FIND_TEXT,
-							getFindText(), getReplaceText(),
-							getMatchDirection(), getMatchOptions());
-					replaceButton.setEnabled(findReplaceAction.getFoundMatch());
-					replaceFindButton.setEnabled(findReplaceAction
-							.getFoundMatch());
-					replaceFindButton.setFocus();
-				}
-	
-				public void widgetDefaultSelected(SelectionEvent e) {
-				}
-			});
-		}
-
-		createButton(parent, IDialogConstants.CLIENT_ID + 4, RichTextResources.replaceallButton_text, false); 
-		replaceAllButton = super.getButton(IDialogConstants.CLIENT_ID + 4);
-		if (!findOnly) {
-			replaceAllButton.addSelectionListener(new SelectionListener() {
-				public void widgetSelected(SelectionEvent event) {
-					findReplaceAction.run(FindReplaceAction.REPLACE_ALL_TEXT,
-							getFindText(), getReplaceText(),
-							getMatchDirection(), getMatchOptions());
-					replaceButton.setEnabled(false);
-					replaceFindButton.setEnabled(false);
-					replaceAllButton.setFocus();
-				}
-	
-				public void widgetDefaultSelected(SelectionEvent e) {
-				}
-			});
-		}
-
-		// Create the Cancel button.
-		createButton(parent, IDialogConstants.CANCEL_ID,
-				IDialogConstants.CANCEL_LABEL, false);
-		cancelButton = super.getButton(IDialogConstants.CANCEL_ID);
-
-		findButton.setEnabled(false);
-		replaceButton.setEnabled(false);
-		replaceFindButton.setEnabled(false);
-		replaceAllButton.setEnabled(false);
-	}
-
-	/**
-	 * Returns the find text.
-	 */
-	public String getFindText() {
-		return findText.getText();
-	}
-
-	/**
-	 * Returns the replace text.
-	 */
-	public String getReplaceText() {
-		return replaceText.getText();
-	}
-
-	/**
-	 * Returns the match direction.
-	 * 
-	 * @return <code>FIND_FORWARD</code> or <code>FIND_BACKWARD</code>
-	 */
-	public int getMatchDirection() {
-		return searchForwardRadioButton.getSelection() ? FindReplaceAction.FORWARD_MATCH
-				: FindReplaceAction.BACKWARD_MATCH;
-	}
-
-	/**
-	 * Returns the match options.
-	 * 
-	 * @return the match options
-	 */
-	public int getMatchOptions() {
-		int options = 0;
-		if (wholeWordCheckbox.getSelection() == true) {
-			options |= FindReplaceAction.WHOLE_WORD_MATCH;
-		}
-		if (caseSensitiveCheckbox.getSelection() == true) {
-			options |= FindReplaceAction.CASE_SENSITIVE_MATCH;
-		}
-		return options;
-	}
-
-	public boolean isFindOnly() {
-		return findOnly;
-	}
-
-	public void setFindOnly(boolean findOnly) {
-		this.findOnly = findOnly;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/package.html b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/package.html
deleted file mode 100755
index 2f5dd13..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides editing dialogs for the rich text control and editor.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/BlockTag.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/BlockTag.java
deleted file mode 100755
index a0902fd..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/BlockTag.java
+++ /dev/null
@@ -1,161 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.html;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Models a HTML block tag.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class BlockTag {
-
-	// The user friendly names.
-	private static final String NAME_PARAGRAPH = RichTextResources.blockTag_paragraph; 
-
-	private static final String NAME_HEADING_1 = RichTextResources.blockTag_heading1; 
-
-	private static final String NAME_HEADING_2 = RichTextResources.blockTag_heading2; 
-
-	private static final String NAME_HEADING_3 = RichTextResources.blockTag_heading3; 
-
-	private static final String NAME_HEADING_4 = RichTextResources.blockTag_heading4; 
-
-	private static final String NAME_HEADING_5 = RichTextResources.blockTag_heading5; 
-
-	private static final String NAME_HEADING_6 = RichTextResources.blockTag_heading6; 
-
-	private static final String NAME_ADDRESS = RichTextResources.blockTag_address; 
-
-	private static final String NAME_PREFORMATTED_TEXT = RichTextResources.blockTag_preformattedText; 
-
-	// The internal values.
-	private static final String VALUE_PARAGRAPH = "<p>"; //$NON-NLS-1$
-
-	private static final String VALUE_HEADING_1 = "<h1>"; //$NON-NLS-1$
-
-	private static final String VALUE_HEADING_2 = "<h2>"; //$NON-NLS-1$
-
-	private static final String VALUE_HEADING_3 = "<h3>"; //$NON-NLS-1$
-
-	private static final String VALUE_HEADING_4 = "<h4>"; //$NON-NLS-1$
-
-	private static final String VALUE_HEADING_5 = "<h5>"; //$NON-NLS-1$
-
-	private static final String VALUE_HEADING_6 = "<h6>"; //$NON-NLS-1$
-
-	private static final String VALUE_ADDRESS = "<address>"; //$NON-NLS-1$
-
-	private static final String VALUE_PREFORMATTED_TEXT = "<pre>"; //$NON-NLS-1$
-
-	/**
-	 * Enumeration of all supported <code>BlockTag</code>.
-	 */
-	static public final BlockTag PARAGRAPH = new BlockTag(NAME_PARAGRAPH,
-			VALUE_PARAGRAPH);
-
-	static public final BlockTag HEADING_1 = new BlockTag(NAME_HEADING_1,
-			VALUE_HEADING_1);
-
-	static public final BlockTag HEADING_2 = new BlockTag(NAME_HEADING_2,
-			VALUE_HEADING_2);
-
-	static public final BlockTag HEADING_3 = new BlockTag(NAME_HEADING_3,
-			VALUE_HEADING_3);
-
-	static public final BlockTag HEADING_4 = new BlockTag(NAME_HEADING_4,
-			VALUE_HEADING_4);
-
-	static public final BlockTag HEADING_5 = new BlockTag(NAME_HEADING_5,
-			VALUE_HEADING_5);
-
-	static public final BlockTag HEADING_6 = new BlockTag(NAME_HEADING_6,
-			VALUE_HEADING_6);
-
-	static public final BlockTag ADDRESS = new BlockTag(NAME_ADDRESS,
-			VALUE_ADDRESS);
-
-	static public final BlockTag PREFORMATTED_TEXT = new BlockTag(
-			NAME_PREFORMATTED_TEXT, VALUE_PREFORMATTED_TEXT);
-
-	// A list of <code>BlockTag</code> objects.
-	static private final List BLOCK_TAGS = new ArrayList();
-	static {
-		BLOCK_TAGS.add(PARAGRAPH);
-		BLOCK_TAGS.add(HEADING_1);
-		BLOCK_TAGS.add(HEADING_2);
-		BLOCK_TAGS.add(HEADING_3);
-		BLOCK_TAGS.add(HEADING_4);
-		BLOCK_TAGS.add(HEADING_5);
-		BLOCK_TAGS.add(HEADING_6);
-		BLOCK_TAGS.add(ADDRESS);
-		BLOCK_TAGS.add(PREFORMATTED_TEXT);
-	}
-
-	// The block tag name.
-	private String name;
-
-	// The block tag value.
-	private String value;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param name
-	 *            the block tag name
-	 * @param value
-	 *            the block tag value
-	 */
-	public BlockTag(String name, String value) {
-		this.name = name;
-		this.value = value;
-	}
-
-	/**
-	 * Returns the block tag name.
-	 * 
-	 * @return the block tag name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Returns the block tag value.
-	 * 
-	 * @return the block tag value
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * Returns the <code>BlockTag</code> object that is mapped to the given
-	 * index.
-	 * 
-	 * @param index
-	 *            an index into the <code>BlockTag</code> list
-	 * @return a <code>BlockTag</code> object
-	 */
-	public static BlockTag getBlockTag(int index) {
-		BlockTag result = (BlockTag) BLOCK_TAGS.get(index);
-		if (result != null) {
-			return result;
-		}
-		return PARAGRAPH;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/FontName.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/FontName.java
deleted file mode 100755
index 97167d3..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/FontName.java
+++ /dev/null
@@ -1,128 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.html;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Models a HTML font name.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class FontName {
-
-	// The user friendly names.
-	private static final String NAME_DEFAULT = RichTextResources.fontName_default; 
-
-	private static final String NAME_ARIAL = RichTextResources.fontName_arial; 
-
-	private static final String NAME_COURIER_NEW = RichTextResources.fontName_courierNew; 
-
-	private static final String NAME_TIMES_NEW_ROMAN = RichTextResources.fontName_timesNewRoman; 
-
-	private static final String NAME_VERDANA = RichTextResources.fontName_verdana; 
-
-	// The internal values.
-	private static final String VALUE_DEFAULT = ""; //$NON-NLS-1$
-
-	private static final String VALUE_ARIAL = "Arial, Helvetica, sans-serif"; //$NON-NLS-1$
-
-	private static final String VALUE_COURIER_NEW = "Courier New, Courier, mono"; //$NON-NLS-1$
-
-	private static final String VALUE_TIMES_NEW_ROMAN = "Times New Roman, Times, serif"; //$NON-NLS-1$
-
-	private static final String VALUE_VERDANA = "Verdana, Arial, Helvetica, sans-serif"; //$NON-NLS-1$
-
-	static public final FontName DEFAULT = new FontName(NAME_DEFAULT,
-			VALUE_DEFAULT);
-
-	/**
-	 * Enumeration of all supported <code>HTMLBlockTag</code>.
-	 */
-	static public final FontName ARIAL = new FontName(NAME_ARIAL, VALUE_ARIAL);
-
-	static public final FontName COURIER_NEW = new FontName(NAME_COURIER_NEW,
-			VALUE_COURIER_NEW);
-
-	static public final FontName TIMES_NEW_ROMAN = new FontName(
-			NAME_TIMES_NEW_ROMAN, VALUE_TIMES_NEW_ROMAN);
-
-	static public final FontName VERDANA = new FontName(NAME_VERDANA,
-			VALUE_VERDANA);
-
-	// A list of <code>FontName</code> objects.
-	static private final List FONT_NAMES = new ArrayList();
-	static {
-		FONT_NAMES.add(DEFAULT);
-		FONT_NAMES.add(ARIAL);
-		FONT_NAMES.add(COURIER_NEW);
-		FONT_NAMES.add(TIMES_NEW_ROMAN);
-		FONT_NAMES.add(VERDANA);
-	}
-
-	// The font name.
-	private String name;
-
-	// The font value.
-	private String value;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param name
-	 *            the font name
-	 * @param value
-	 *            the font value
-	 */
-	public FontName(String name, String value) {
-		this.name = name;
-		this.value = value;
-	}
-
-	/**
-	 * Returns the font name.
-	 * 
-	 * @return the font name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Returns the font value.
-	 * 
-	 * @return the font value
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * Returns the <code>FontName</code> object that is mapped to the given
-	 * index.
-	 * 
-	 * @param index
-	 *            an index into the <code>FontName</code> list
-	 * @return a <code>FontName</code> object
-	 */
-	public static FontName getFontName(int index) {
-		FontName result = (FontName) FONT_NAMES.get(index);
-		if (result != null) {
-			return result;
-		}
-		return DEFAULT;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/FontStyle.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/FontStyle.java
deleted file mode 100755
index 91fb31d..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/FontStyle.java
+++ /dev/null
@@ -1,155 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.html;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Models a HTML font style.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class FontStyle {
-
-	// The user friendly names.
-	private static final String NAME_NORMAL = RichTextResources.fontStyle_normal; 
-
-	private static final String NAME_SECTION_HEADING = RichTextResources.fontStyle_sectionHeading; 
-
-	private static final String NAME_SUBSECTION_HEADING = RichTextResources.fontStyle_subsectionHeading; 
-
-	private static final String NAME_SUB_SUBSECTION_HEADING = RichTextResources.fontStyle_subSubsectionHeading; 
-
-	private static final String NAME_QUOTE = RichTextResources.fontStyle_quote; 
-
-	private static final String NAME_CODE_SAMPLE = RichTextResources.fontStyle_codeSample; 
-
-	// The internal values.
-	private static final String VALUE_NORMAL = "<p>"; //$NON-NLS-1$
-
-	private static final String VALUE_SECTION_HEADING = "<h3>"; //$NON-NLS-1$
-
-	private static final String VALUE_SUBSECTION_HEADING = "<h4>"; //$NON-NLS-1$
-
-	private static final String VALUE_SUB_SUBSECTION_HEADING = "<h5>"; //$NON-NLS-1$
-
-	private static final String VALUE_QUOTE = "<quote>"; //$NON-NLS-1$
-
-	private static final String VALUE_CODE_SAMPLE = "<code>"; //$NON-NLS-1$
-	
-	/**
-	 * Enumeration of all supported <code>FontStyle</code>.
-	 */
-	static public final FontStyle NORMAL = new FontStyle(NAME_NORMAL,
-			VALUE_NORMAL);
-
-	static public final FontStyle SECTION_HEADING = new FontStyle(
-			NAME_SECTION_HEADING, VALUE_SECTION_HEADING);
-
-	static public final FontStyle SUBSECTION_HEADING = new FontStyle(
-			NAME_SUBSECTION_HEADING, VALUE_SUBSECTION_HEADING);
-
-	static public final FontStyle SUB_SUBSECTION_HEADING = new FontStyle(
-			NAME_SUB_SUBSECTION_HEADING, VALUE_SUB_SUBSECTION_HEADING);
-
-	static public final FontStyle QUOTE = new FontStyle(NAME_QUOTE, VALUE_QUOTE);
-
-	static public final FontStyle CODE_SAMPLE = new FontStyle(NAME_CODE_SAMPLE,
-			VALUE_CODE_SAMPLE);
-
-	// A list of <code>FontStyle</code> objects.
-	static private final List FONT_STYLES = new ArrayList();
-	static {
-		FONT_STYLES.add(NORMAL);
-		FONT_STYLES.add(SECTION_HEADING);
-		FONT_STYLES.add(SUBSECTION_HEADING);
-		FONT_STYLES.add(SUB_SUBSECTION_HEADING);
-		FONT_STYLES.add(QUOTE);
-		FONT_STYLES.add(CODE_SAMPLE);
-	}
-
-	// The font style name.
-	private String name;
-
-	// The font style value.
-	private String value;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param name
-	 *            the font style name
-	 * @param value
-	 *            the font style value
-	 */
-	public FontStyle(String name, String value) {
-		this.name = name;
-		this.value = value;
-	}
-
-	/**
-	 * Returns the font style name.
-	 * 
-	 * @return the font style name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Returns the font style value.
-	 * 
-	 * @return the font style value
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * Returns the <code>FontStyle</code> object that is mapped to the given
-	 * index.
-	 * 
-	 * @param index
-	 *            an index into the <code>FontStyle</code> list
-	 * @return a <code>FontStyle</code> object
-	 */
-	public static FontStyle getFontStyle(int index) {
-		FontStyle result = (FontStyle) FONT_STYLES.get(index);
-		if (result != null) {
-			return result;
-		}
-		return NORMAL;
-	}
-
-	/**
-	 * Returns the display name of the <code>FontStyle</code> object with the given
-	 * value.
-	 * 
-	 * @param value
-	 *            one of the FontStyles
-	 * @return a display name of a FontStyle, or null if none found
-	 */
-	public static String getFontStyleName(String value) {
-		for (Iterator iter = FONT_STYLES.iterator();iter.hasNext();){ 
-			FontStyle style = (FontStyle)iter.next();
-			if (style.getValue().equals(value)) {
-				return style.getName();
-			}
-		}
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Image.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Image.java
deleted file mode 100755
index b30d886..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Image.java
+++ /dev/null
@@ -1,44 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.html;
-
-/**
- * Models a simplified HTML Image tag (<img>).
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class Image {
-
-	// The image URL.
-	private String url = ""; //$NON-NLS-1$
-
-	/**
-	 * Creates a new <code>Image</code>.
-	 */
-	public Image() {
-	}
-
-	/**
-	 * Returns the image URL.
-	 */
-	public String getURL() {
-		return url;
-	}
-
-	/**
-	 * Sets the image URL.
-	 */
-	public void setURL(String url) {
-		this.url = url;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Link.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Link.java
deleted file mode 100755
index ed06289..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Link.java
+++ /dev/null
@@ -1,67 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.html;
-
-/**
- * Models a simplified HTML Link tag (<a>).
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class Link {
-
-	// The link name.
-	private String name = ""; //$NON-NLS-1$
-
-	// The link URL.
-	private String url = ""; //$NON-NLS-1$
-
-	/**
-	 * Creates a new <code>Link</code>.
-	 */
-	public Link() {
-	}
-
-	/**
-	 * Returns the link name.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Sets the link name.
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Returns the link URL.
-	 */
-	public String getURL() {
-		return url;
-	}
-
-	/**
-	 * Sets the hyperlink URL.
-	 */
-	public void setURL(String url) {
-		this.url = url;
-	}
-
-	/**
-	 * Returns the HTML representation of the hyperlink.
-	 */
-	public String toHTML() {
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Table.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Table.java
deleted file mode 100755
index 28e9f0f..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Table.java
+++ /dev/null
@@ -1,140 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.html;
-
-/**
- * Models a simplified HTML Table tag (<a>).
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class Table {
-
-	// The number of rows.
-	private int rows = 2;
-
-	// The number of columns.
-	private int cols = 2;
-
-	// The table width.
-	private String width = "85%";
-
-	// The type of tableheaders for this table.
-	private int tableHeaders = 0;
-
-	// The table summary.
-	private String summary;
-
-	// The table caption.
-	private String caption;
-
-	// Javascript constants
-	public static final int TABLE_HEADERS_NONE = 0;
-
-	public static final int TABLE_HEADERS_COLS = 1;
-
-	public static final int TABLE_HEADERS_ROWS = 2;
-
-	public static final int TABLE_HEADERS_BOTH = 3;
-
-	/**
-	 * Creates a new <code>Table</code>.
-	 */
-	public Table() {
-	}
-
-	/**
-	 * Returns the number of rows.
-	 */
-	public int getRows() {
-		return rows;
-	}
-
-	/**
-	 * Sets the number of rows.
-	 */
-	public void setRows(int rows) {
-		this.rows = rows;
-	}
-
-	/**
-	 * Returns the number of columns.
-	 */
-	public int getColumns() {
-		return cols;
-	}
-
-	/**
-	 * Sets the number of columns.
-	 */
-	public void setColumns(int cols) {
-		this.cols = cols;
-	}
-
-	/**
-	 * Returns the table width.
-	 */
-	public String getWidth() {
-		return width;
-	}
-
-	/**
-	 * Sets the table width.
-	 */
-	public void setWidth(String width) {
-		this.width = width;
-	}
-
-	/**
-	 * Returns the table caption.
-	 */
-	public String getCaption() {
-		return caption;
-	}
-
-	/**
-	 * Sets the table caption.
-	 */
-	public void setCaption(String caption) {
-		this.caption = caption;
-	}
-
-	/**
-	 * Returns the table summary.
-	 */
-	public String getSummary() {
-		return summary;
-	}
-
-	/**
-	 * Sets the table summary.
-	 */
-	public void setSummary(String summary) {
-		this.summary = summary;
-	}
-
-	/**
-	 * Returns the table headers type. <br />
-	 * One of: 	TABLE_HEADERS_NONE,v TABLE_HEADERS_COLS, TABLE_HEADERS_ROWS, TABLE_HEADERS_BOTH
-	 */
-	public int getTableHeaders() {
-		return tableHeaders;
-	}
-
-	/**
-	 * Sets the table headers type. <br />
-	 * One of: 	TABLE_HEADERS_NONE,v TABLE_HEADERS_COLS, TABLE_HEADERS_ROWS, TABLE_HEADERS_BOTH
-	 */
-	public void setTableHeaders(int tableHeaders) {
-		this.tableHeaders = tableHeaders;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/package.html b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/package.html
deleted file mode 100755
index 9bd707a..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides implementation support for the rich text control and editor.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/package.html b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/package.html
deleted file mode 100755
index 604ddc5..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces and implementation for the rich text control and editor.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferencePage.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferencePage.java
deleted file mode 100755
index ef91b05..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferencePage.java
+++ /dev/null
@@ -1,173 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.preferences;
-
-import org.eclipse.epf.richtext.RichTextPlugin;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * The Preference page for the rich text editor.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextPreferencePage extends PreferencePage implements
-		IWorkbenchPreferencePage, SelectionListener, ModifyListener {
-
-	private IPreferenceStore store;
-
-	private Text lineWidthText;
-
-	private Button indentCheckbox;
-
-	private Text indentSizeText;
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-		store = RichTextPlugin.getDefault().getPreferenceStore();
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(1, false));
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Composite widthComposite = new Composite(composite, SWT.NONE);
-		widthComposite.setLayout(new GridLayout(2, false));
-		widthComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label lineWidthLabel = new Label(widthComposite, SWT.NONE);
-		lineWidthLabel.setText(RichTextResources.maxCharsPerLineLabel_text); 
-
-		lineWidthText = new Text(widthComposite, SWT.BORDER);
-		lineWidthText.setText(store.getString(RichTextPreferences.LINE_WIDTH));
-		lineWidthText.setTextLimit(3);
-		GridData gridData = new GridData();
-		gridData.widthHint = 25;
-		lineWidthText.setLayoutData(gridData);
-		lineWidthText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-			}
-		});
-
-		Composite indentComposite = new Composite(composite, SWT.NONE);
-		indentComposite.setLayout(new GridLayout(2, false));
-		indentComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		indentCheckbox = new Button(indentComposite, SWT.CHECK);
-		indentCheckbox.setText(RichTextResources.indentHTMLCheckbox_text); 
-		indentCheckbox.setSelection(store
-				.getBoolean(RichTextPreferences.INDENT));
-
-		new Label(indentComposite, SWT.NONE);
-
-		Label indentSizeLabel = new Label(indentComposite, SWT.NONE);
-		gridData = new GridData();
-		gridData.horizontalIndent = 20;
-		indentSizeLabel.setLayoutData(gridData);
-		indentSizeLabel.setText(RichTextResources.indentSizeLabel_text); 
-
-		indentSizeText = new Text(indentComposite, SWT.BORDER);
-		indentSizeText
-				.setText(store.getString(RichTextPreferences.INDENT_SIZE));
-		indentSizeText.setTextLimit(1);
-		gridData = new GridData();
-		gridData.widthHint = 10;
-		indentSizeText.setLayoutData(gridData);
-		indentSizeText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-			}
-		});
-
-		return composite;
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.PreferencePage.performDefaults
-	 */
-	protected void performDefaults() {
-		super.performDefaults();
-		lineWidthText.setText(store
-				.getDefaultString(RichTextPreferences.LINE_WIDTH));
-		indentCheckbox.setSelection(store
-				.getDefaultBoolean(RichTextPreferences.INDENT));
-		indentSizeText.setText(store
-				.getDefaultString(RichTextPreferences.INDENT_SIZE));
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.PreferencePage.performOk
-	 */
-	public boolean performOk() {
-		String lineWidthValue = lineWidthText.getText();
-		if (lineWidthValue != null && lineWidthValue.length() > 0) {
-			try {
-				int lineWidth = Integer.parseInt(lineWidthValue);
-				store.setValue(RichTextPreferences.LINE_WIDTH, lineWidth);
-			} catch (Exception e) {
-			}
-		}
-
-		boolean indentValue = indentCheckbox.getSelection();
-		store.setValue(RichTextPreferences.INDENT, indentValue);
-
-		String indentSizeValue = indentSizeText.getText();
-		if (indentSizeValue != null && indentSizeValue.length() > 0) {
-			try {
-				int indentSize = Integer.parseInt(indentSizeValue);
-				store.setValue(RichTextPreferences.INDENT_SIZE, indentSize);
-			} catch (Exception e) {
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-	 */
-	public void widgetSelected(SelectionEvent e) {
-	}
-
-	/**
-	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
-	 */
-	public void widgetDefaultSelected(SelectionEvent e) {
-	}
-
-	/**
-	 * @see org.eclipse.swt.events.ModifyListener#modifyText(ModifyEvent)
-	 */
-	public void modifyText(ModifyEvent e) {
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferences.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferences.java
deleted file mode 100755
index 042eae7..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferences.java
+++ /dev/null
@@ -1,41 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * Preferences for the rich text editor.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextPreferences {
-
-	/**
-	 * rich text Editor preference keys.
-	 */
-	public static final String LINE_WIDTH = "htmlEditor.lineWidth"; //$NON-NLS-1$
-
-	public static final String INDENT = "htmlEditor.indent"; //$NON-NLS-1$
-
-	public static final String INDENT_SIZE = "htmlEditor.indentSize"; //$NON-NLS-1$
-
-	/**
-	 * Initializes the default preferences.
-	 */
-	public static void initializeDefaultPreferences(IPreferenceStore store) {
-		store.setDefault(LINE_WIDTH, 120);
-		store.setDefault(INDENT, true);
-		store.setDefault(INDENT_SIZE, 4);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferencesInitializer.java b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferencesInitializer.java
deleted file mode 100755
index 15956db..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferencesInitializer.java
+++ /dev/null
@@ -1,35 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.epf.richtext.RichTextPlugin;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * The rich text preferences initializer.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextPreferencesInitializer extends
-		AbstractPreferenceInitializer {
-
-	/**
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = RichTextPlugin.getDefault()
-				.getPreferenceStore();
-		RichTextPreferences.initializeDefaultPreferences(store);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/package.html b/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/package.html
deleted file mode 100755
index 45a75f1..0000000
--- a/plugins/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides preference support for the rich text control and editor.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search.ui/.classpath b/plugins/org.eclipse.epf.search.ui/.classpath
deleted file mode 100755
index 065ac06..0000000
--- a/plugins/org.eclipse.epf.search.ui/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.search.ui/.cvsignore b/plugins/org.eclipse.epf.search.ui/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.search.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.search.ui/.options b/plugins/org.eclipse.epf.search.ui/.options
deleted file mode 100755
index cac96c5..0000000
--- a/plugins/org.eclipse.epf.search.ui/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-# Turn on debug trace for the Search UI plug-in
-org.eclipse.epf.search.ui/debug=true
diff --git a/plugins/org.eclipse.epf.search.ui/.project b/plugins/org.eclipse.epf.search.ui/.project
deleted file mode 100755
index 5fa5524..0000000
--- a/plugins/org.eclipse.epf.search.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.search.ui</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/plugins/org.eclipse.epf.search.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.search.ui/META-INF/MANIFEST.MF
deleted file mode 100755
index ab1c39f..0000000
--- a/plugins/org.eclipse.epf.search.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.search.ui; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.epf.search.ui.SearchUIPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.epf.authoring.ui,
- org.eclipse.core.runtime,
- org.eclipse.jface.text,
- org.eclipse.search
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.search.ui
diff --git a/plugins/org.eclipse.epf.search.ui/build.properties b/plugins/org.eclipse.epf.search.ui/build.properties
deleted file mode 100755
index 321dc6b..0000000
--- a/plugins/org.eclipse.epf.search.ui/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               .options,\
-               META-INF/,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml
-
diff --git a/plugins/org.eclipse.epf.search.ui/icons/full/obj16/MethodSearch.gif b/plugins/org.eclipse.epf.search.ui/icons/full/obj16/MethodSearch.gif
deleted file mode 100755
index 83c0f44..0000000
--- a/plugins/org.eclipse.epf.search.ui/icons/full/obj16/MethodSearch.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.search.ui/plugin.properties b/plugins/org.eclipse.epf.search.ui/plugin.properties
deleted file mode 100755
index 9a9a609..0000000
--- a/plugins/org.eclipse.epf.search.ui/plugin.properties
+++ /dev/null
@@ -1,20 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Search UI
-providerName=Eclipse.org
-
-# Method Search Dialog
-methodSearchDialogLabel=Method Search
-
-               
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search.ui/plugin.xml b/plugins/org.eclipse.epf.search.ui/plugin.xml
deleted file mode 100755
index f4dee4b..0000000
--- a/plugins/org.eclipse.epf.search.ui/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   
-   <extension point="org.eclipse.search.searchPages">
-      <page id="org.eclipse.epf.search.ui.MethodSearchPage"
-            class="org.eclipse.epf.search.ui.MethodSearchPage"      
-            label="%methodSearchDialogLabel"
-            icon="icons/full/obj16/MethodSearch.gif"
-            sizeHint="250,160"
-            tabPosition="0"
-            extensions="*:1"
-            showScopeSection="false"		
-            canSearchEnclosingProjects="false">
-      </page>    
-   </extension>
-   
-   <extension
-         id="MethodSearchPage"
-         point="org.eclipse.search.searchResultViewPages">
-      <viewPage
-            id="org.eclipse.epf.search.ui.MethodSearchResultPage"
-			searchResultClass="org.eclipse.epf.search.ui.internal.MethodSearchResult"
-			class="org.eclipse.epf.search.ui.MethodSearchResultPage">
-      </viewPage>
-   </extension>   
-
-</plugin>
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/MethodSearchPage.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/MethodSearchPage.java
deleted file mode 100755
index e4f1951..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/MethodSearchPage.java
+++ /dev/null
@@ -1,196 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui;
-
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.search.ui.internal.MethodSearchInput;
-import org.eclipse.epf.search.ui.internal.MethodSearchQuery;
-import org.eclipse.epf.search.ui.internal.MethodSearchScope;
-import org.eclipse.epf.search.ui.internal.MethodSearchScopeViewer;
-import org.eclipse.epf.search.ui.preferences.SearchUIPreferences;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.search.ui.ISearchPage;
-import org.eclipse.search.ui.ISearchPageContainer;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * Displays the Method Search page in the Search dialog.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodSearchPage extends DialogPage implements ISearchPage {
-
-	public static final String SEARCH_PAGE_ID = MethodSearchPage.class
-			.getName();
-
-	private Combo searchStringCombo;
-
-	private Combo namePatternCombo;
-
-	private Button caseSensitiveCheckbox;
-
-	private MethodSearchScopeViewer searchScopeViewer;
-
-	private ISearchPageContainer container;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public MethodSearchPage() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		initializeDialogUnits(parent);
-
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		layout.horizontalSpacing = 10;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label searchStringLabel = new Label(composite, SWT.NONE);
-		searchStringLabel.setText(SearchUIResources.searchStringLabel_text); //$NON-NLS-1$
-
-		new Label(composite, SWT.NONE);
-
-		searchStringCombo = new Combo(composite, SWT.NONE);
-		searchStringCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		String savedSearchString = SearchUIPreferences.getSearchString();
-		if (savedSearchString != null && savedSearchString.length() > 0) {
-			searchStringCombo.setText(savedSearchString);
-		}
-
-		caseSensitiveCheckbox = new Button(composite, SWT.CHECK);
-		caseSensitiveCheckbox.setText(SearchUIResources.caseSensitiveCheckbox_text); //$NON-NLS-1$
-		caseSensitiveCheckbox.setSelection(SearchUIPreferences
-				.getCaseSensitive());
-
-		Label elementNameLabel = new Label(composite, SWT.NONE);
-		elementNameLabel.setText(SearchUIResources.elementNameLabel_text); //$NON-NLS-1$
-
-		new Label(composite, SWT.NONE);
-
-		namePatternCombo = new Combo(composite, SWT.NONE);
-		namePatternCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		String savedNamePattern = SearchUIPreferences.getNamePattern();
-		if (savedNamePattern != null && savedNamePattern.length() > 0) {
-			namePatternCombo.setText(savedNamePattern);
-		} else {
-			namePatternCombo.setText("*"); //$NON-NLS-1$
-		}
-
-		namePatternCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				container.setPerformActionEnabled(getSearchButtonEnabled());
-			}
-		});
-		namePatternCombo.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent event) {
-				container.setPerformActionEnabled(getSearchButtonEnabled());
-			}
-		});
-
-		new Label(composite, SWT.NONE);
-
-		Group searchScopeGroup = new Group(composite, SWT.NONE);
-		searchScopeGroup.setLayout(new GridLayout(1, false));
-		GridData searchScopeGroupGridData = new GridData(GridData.FILL_BOTH);
-		searchScopeGroupGridData.heightHint = 200;
-		searchScopeGroup.setLayoutData(searchScopeGroupGridData);
-		searchScopeGroup.setText(SearchUIResources.scopeGroup_text); //$NON-NLS-1$
-
-		searchScopeViewer = new MethodSearchScopeViewer(searchScopeGroup,
-				SWT.NONE);
-
-		container.setPerformActionEnabled(getSearchButtonEnabled());
-
-		setControl(composite);
-		Dialog.applyDialogFont(composite);
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.ISearchPage#performAction()
-	 */
-	public boolean performAction() {
-		MethodLibrary library = LibraryService.getInstance().getCurrentMethodLibrary();
-		if (library == null) {
-			SearchUIPlugin.getDefault().getMsgDialog().displayError(
-					SearchUIResources.searchError_title, 
-					SearchUIResources.searchError_msg, 
-					SearchUIResources.searchError_reason); 
-			return false;
-		}
-		String searchString = searchStringCombo.getText();
-		String namePattern = namePatternCombo.getText();
-		MethodSearchScope searchScope = searchScopeViewer.getSearchScope();
-		MethodSearchInput searchInput = new MethodSearchInput(searchString,
-				namePattern, caseSensitiveCheckbox.getSelection(), false,
-				false, searchScope);
-		MethodSearchQuery searchQuery = new MethodSearchQuery(searchInput);
-		NewSearchUI.activateSearchResultView();
-		NewSearchUI.runQueryInBackground(searchQuery);
-		SearchUIPreferences.setSearchString(searchStringCombo.getText());
-		SearchUIPreferences.setNamePattern(namePatternCombo.getText());
-		SearchUIPreferences.setCaseSensitive(caseSensitiveCheckbox
-				.getSelection());
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.ISearchPage#setContainer(ISearchPageContainer)
-	 */
-	public void setContainer(ISearchPageContainer container) {
-		this.container = container;
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.IReplacePage#performReplace()
-	 */
-	public boolean performReplace() {
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-	}
-
-	/**
-	 * Gets the enabled status of the Search button.
-	 * 
-	 * @return <code>true<code> if the Search button should be enabled
-	 */
-	private boolean getSearchButtonEnabled() {
-		return namePatternCombo.getText().trim().length() > 0;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/MethodSearchResultPage.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/MethodSearchResultPage.java
deleted file mode 100755
index 65de961..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/MethodSearchResultPage.java
+++ /dev/null
@@ -1,207 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui;
-
-import org.eclipse.epf.authoring.ui.AuthoringPerspective;
-import org.eclipse.epf.authoring.ui.BrowsingPerspective;
-import org.eclipse.epf.authoring.ui.editors.EditorChooser;
-import org.eclipse.epf.authoring.ui.views.ContentView;
-import org.eclipse.epf.common.utils.PerspectiveUtil;
-import org.eclipse.epf.search.ui.internal.MethodElementViewSorter;
-import org.eclipse.epf.search.ui.internal.SearchResultLabelProvider;
-import org.eclipse.epf.search.ui.internal.SearchResultTableContentProvider;
-import org.eclipse.epf.search.ui.internal.SearchResultTreeContentProvider;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.ProcessElement;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.search.ui.text.AbstractTextSearchViewPage;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Displays the Method Search result in the Search view. The search result
- * can be displayed in a hierarchical or flat view.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodSearchResultPage extends AbstractTextSearchViewPage
-		implements ISelectionChangedListener {
-
-	private IStructuredContentProvider contentProvider;
-
-	private SearchResultLabelProvider labelProvider;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public MethodSearchResultPage() {
-		super();
-		labelProvider = new SearchResultLabelProvider();
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#isLayoutSupported(int)
-	 */
-	public boolean isLayoutSupported(int layout) {
-		return ((layout & FLAG_LAYOUT_FLAT) != 0 || (layout & FLAG_LAYOUT_TREE) != 0);
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#configureTreeViewer(TreeViewer)
-	 */
-	protected void configureTreeViewer(TreeViewer viewer) {
-		contentProvider = new SearchResultTreeContentProvider();
-		viewer.setContentProvider(contentProvider);
-		viewer.setLabelProvider(labelProvider);
-		viewer.setSorter(new MethodElementViewSorter());
-		viewer.addSelectionChangedListener(this);
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#configureTableViewer(TableViewer)
-	 */
-	protected void configureTableViewer(TableViewer viewer) {
-		contentProvider = new SearchResultTableContentProvider();
-		viewer.setContentProvider(contentProvider);
-		viewer.setLabelProvider(labelProvider);
-		viewer.setSorter(new MethodElementViewSorter());
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#elementsChanged(Object[])
-	 */
-	protected void elementsChanged(Object[] objects) {
-		if (contentProvider != null) {
-			if (contentProvider instanceof SearchResultTreeContentProvider) {
-				((SearchResultTreeContentProvider) contentProvider)
-						.elementsChanged(objects);
-			} else if (contentProvider instanceof SearchResultTableContentProvider) {
-				((SearchResultTableContentProvider) contentProvider)
-						.elementsChanged(objects);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#clear()
-	 */
-	protected void clear() {
-		if (contentProvider != null) {
-			if (contentProvider instanceof SearchResultTreeContentProvider) {
-				((SearchResultTreeContentProvider) contentProvider).clear();
-			} else if (contentProvider instanceof SearchResultTableContentProvider) {
-				((SearchResultTableContentProvider) contentProvider).clear();
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#showMatch(Match,
-	 *      int, int, boolean)
-	 */
-	protected void showMatch(Match match, int currentOffset, int currentLength,
-			boolean activate) throws PartInitException {
-		if (match.getElement() instanceof MethodElement && activate) {
-			MethodElement element = (MethodElement) match.getElement();
-			if (PerspectiveUtil
-					.isActivePerspective(BrowsingPerspective.PERSPECTIVE_ID)) {
-				PerspectiveUtil
-						.openPerspective(AuthoringPerspective.PERSPECTIVE_ID);
-				IWorkbenchPage activePage = PlatformUI.getWorkbench()
-						.getActiveWorkbenchWindow().getActivePage();
-				if (activePage != null) {
-					IViewPart view = activePage
-							.findView(NewSearchUI.SEARCH_VIEW_ID);
-					if (view != null) {
-						activePage.showView(NewSearchUI.SEARCH_VIEW_ID);
-					}
-				}
-			}
-			displayEditor(element);
-		}
-	}
-
-	/**
-	 * Displays the Method editor for the selected Method element.
-	 */
-	protected void displayEditor(MethodElement element) {
-		if (element instanceof ProcessElement) {
-			EditorChooser.getInstance().openEditor(
-					UmaUtil.getProcessComponent(element));
-		} else {
-			EditorChooser.getInstance().openEditor(element);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		if (PerspectiveUtil
-				.isActivePerspective(BrowsingPerspective.PERSPECTIVE_ID)) {
-			ISelection selection = event.getSelection();
-			if (selection instanceof IStructuredSelection) {
-				IStructuredSelection sel = (IStructuredSelection) selection;
-				Object[] selectedElements = sel.toArray();
-				if (selectedElements != null && selectedElements.length > 0) {
-					if (selectedElements[0] instanceof MethodElement) {
-						try {
-							displayHTMLPage((MethodElement) selectedElements[0]);
-						} catch (PartInitException e) {
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Displays the HTML content page for the selected method element.
-	 * 
-	 * @param element
-	 *            a method element
-	 * @throws PartInitException
-	 *             if the Content view cannot be displayed
-	 */
-	protected void displayHTMLPage(MethodElement element)
-			throws PartInitException {
-		if (element instanceof MethodPlugin
-				|| element instanceof ContentPackage) {
-			return;
-		}
-		IWorkbenchPage activePage = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getActivePage();
-		if (activePage != null) {
-			IViewPart view = activePage.findView(ContentView.VIEW_ID);
-			if (view == null) {
-				view = activePage.showView(ContentView.VIEW_ID);
-			}
-			if (view != null) {
-				((ContentView) view).displayHTMLContentPage(element);
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/Resources.properties b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/Resources.properties
deleted file mode 100755
index 83339bb..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/Resources.properties
+++ /dev/null
@@ -1,48 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Method Search Page
-searchStringLabel_text=Text (* = any string, ? = any character):
-caseSensitiveCheckbox_text=Case sensitive
-elementNameLabel_text=Method element name or presentation name pattern:
-scopeGroup_text=Scope
-roleCheckbox_text=Role
-taskCheckbox_text=Task
-workProductCheckbox_text=Work Product
-
-# Method Search Query
-searchQuery_text=Method Search
-
-# Method Search Progress Dialog
-scanLibraryTask_name=Scanning method library...
-scanElementTask_name=Scanning method element ''{0}''...
-
-# Method Search Error Dialog
-searchError_title=Method Search
-searchError_msg=IUPS0100E: Search operation cannot proceed.
-searchError_reason=No method library is currently opened.\n\nOpen a method library and try again.
-
-# Method Search Result
-searchResult_methodContent=Method Content
-searchResult_contentPackages=Content Packages
-searchResult_standardCategories=Standard Categories
-searchResult_disciplines=Disciplines
-searchResult_domains=Domains
-searchResult_workProductTypes=Work Product Types
-searchResult_roleSets=Role Sets
-searchResult_tools=Tools
-searchResult_customCategories=Custom Categories
-searchResult_processes=Processes
-searchResult_capabilityPatterns=Capability Patterns
-searchResult_deliveryProcesses=Delivery Processes
-searchResult_match=''{0}'' - 1 match
-searchResult_matches=''{0}'' - {1} matches
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/SearchUIPlugin.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/SearchUIPlugin.java
deleted file mode 100755
index bfe468c..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/SearchUIPlugin.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui;
-
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The Search UI plug-in activator.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class SearchUIPlugin extends AbstractPlugin {
-
-	// The shared plug-in instance.
-	private static SearchUIPlugin plugin;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SearchUIPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * @see AbstractPlugin#start(BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * @see AbstractPlugin#start(BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared plug-in instance.
-	 */
-	public static SearchUIPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/SearchUIResources.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/SearchUIResources.java
deleted file mode 100755
index 430d32a..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/SearchUIResources.java
+++ /dev/null
@@ -1,89 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The Search UI resource bundle.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public final class SearchUIResources extends NLS {
-
-	private static String BUNDLE_NAME = SearchUIResources.class.getPackage()
-			.getName()
-			+ ".Resources"; //$NON-NLS-1$
-
-	public static String searchStringLabel_text;
-
-	public static String caseSensitiveCheckbox_text;
-
-	public static String elementNameLabel_text;
-
-	public static String scopeGroup_text;
-
-	public static String roleCheckbox_text;
-
-	public static String taskCheckbox_text;
-
-	public static String workProductCheckbox_text;
-
-	public static String searchQuery_text;
-
-	public static String scanLibraryTask_name;
-
-	public static String scanElementTask_name;
-
-	public static String searchError_title;
-
-	public static String searchError_msg;
-
-	public static String searchError_reason;
-
-	public static String searchResult_methodContent;
-
-	public static String searchResult_contentPackages;
-
-	public static String searchResult_standardCategories;
-
-	public static String searchResult_disciplines;
-
-	public static String searchResult_domains;
-
-	public static String searchResult_workProductTypes;
-
-	public static String searchResult_roleSets;
-
-	public static String searchResult_tools;
-
-	public static String searchResult_customCategories;
-
-	public static String searchResult_processes;
-
-	public static String searchResult_capabilityPatterns;
-
-	public static String searchResult_deliveryProcesses;
-
-	public static String searchResult_match;
-
-	public static String searchResult_matches;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, SearchUIResources.class);
-	}
-
-	private SearchUIResources() {
-		// Do not instantiate.
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/IMethodSearchQuery.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/IMethodSearchQuery.java
deleted file mode 100755
index 3c8edac..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/IMethodSearchQuery.java
+++ /dev/null
@@ -1,23 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui.internal;
-
-import org.eclipse.search.ui.ISearchQuery;
-
-/**
- * The interface for a method search query.
- * 
- * @author Kelvin Low
- * @since  1.0
- */
-public interface IMethodSearchQuery extends ISearchQuery {
-	
-}
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/ISearchResultCollector.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/ISearchResultCollector.java
deleted file mode 100755
index 000b501..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/ISearchResultCollector.java
+++ /dev/null
@@ -1,30 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui.internal;
-
-/**
- * The interface for a method search result collector.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public interface ISearchResultCollector {
-
-	/**
-	 * Evaluates the given object to see if there is a match in the search
-	 * criteria.
-	 * 
-	 * @param match
-	 *            an object containing the method element to match
-	 */
-	void accept(Object match);
-
-}
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodElementViewSorter.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodElementViewSorter.java
deleted file mode 100755
index 5bc41cf..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodElementViewSorter.java
+++ /dev/null
@@ -1,199 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui.internal;
-
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.ContentCategory;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.Iteration;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.Phase;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessElement;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-
-/**
- * Sorts the method elements in a specific order for display in the Search
- * view.
- * <p>
- * The method elements are sorted by types. Within each type, the elements are
- * sorted alphabetically by names.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodElementViewSorter extends ViewerSorter {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public MethodElementViewSorter() {
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ViewerSorter#compare(Viewer, Object,
-	 *      Object)
-	 */
-	public int compare(Viewer viewer, Object e1, Object e2) {
-		if (e1 instanceof MethodPlugin) {
-			if (!(e2 instanceof MethodPlugin)) {
-				return -1;
-			}
-		} else if (e1 instanceof ContentPackage) {
-			if (e2 instanceof MethodPlugin) {
-				return 1;
-			} else if (!(e2 instanceof ContentPackage)) {
-				return -1;
-			}
-		} else if (e1 instanceof Role) {
-			if (e2 instanceof MethodPlugin || e2 instanceof ContentPackage) {
-				return 1;
-			} else if (!(e2 instanceof Role)) {
-				return -1;
-			}
-		} else if (e1 instanceof Task) {
-			if (e2 instanceof MethodPlugin || e2 instanceof ContentPackage
-					|| e2 instanceof Role) {
-				return 1;
-			} else if (!(e2 instanceof Task)) {
-				return -1;
-			}
-		} else if (e1 instanceof WorkProduct) {
-			if (e2 instanceof MethodPlugin || e2 instanceof ContentPackage
-					|| e2 instanceof Role || e2 instanceof Task) {
-				return 1;
-			} else if (!(e2 instanceof WorkProduct)) {
-				return -1;
-			}
-		} else if (e1 instanceof Guidance) {
-			if (e2 instanceof MethodPlugin || e2 instanceof ContentPackage
-					|| e2 instanceof Role || e2 instanceof Task
-					|| e2 instanceof WorkProduct) {
-				return 1;
-			} else if (e2 instanceof Guidance) {
-				String name1 = e1.getClass().getName();
-				String name2 = e2.getClass().getName();
-				if (!name1.equals(name2)) {
-					return collator.compare(name1, name2);
-				}
-			} else {
-				return -1;
-			}
-		} else if (e1 instanceof ContentCategory) {
-			if (e2 instanceof MethodPlugin || e2 instanceof ContentPackage
-					|| e2 instanceof Role || e2 instanceof Task
-					|| e2 instanceof WorkProduct || e2 instanceof Guidance) {
-				return 1;
-			} else if (e1 instanceof CustomCategory
-					&& !(e2 instanceof CustomCategory)) {
-				return 1;
-			} else if (!(e1 instanceof CustomCategory)
-					&& e2 instanceof CustomCategory) {
-				return -1;
-			} else if (e2 instanceof ContentCategory) {
-				String name1 = e1.getClass().getName();
-				String name2 = e2.getClass().getName();
-				if (!name1.equals(name2)) {
-					return collator.compare(name1, name2);
-				}
-			} else {
-				return -1;
-			}
-		} else if (e1 instanceof Process) {
-			if (e2 instanceof MethodPlugin || e2 instanceof ContentPackage
-					|| e2 instanceof ContentElement) {
-				return 1;
-			} else if (e2 instanceof ProcessPackage && !(e2 instanceof Process)) {
-				return 1;
-			} else if (!(e2 instanceof Process)) {
-				return -1;
-			}
-		} else if (e1 instanceof ProcessPackage) {
-			if (e2 instanceof MethodPlugin || e2 instanceof ContentPackage
-					|| e2 instanceof ContentElement) {
-				return 1;
-			} else if (e2 instanceof Process && !(e1 instanceof Process)) {
-				return -1;
-			} else if (!(e2 instanceof ProcessPackage)) {
-				return -1;
-			}
-		} else if (e1 instanceof ProcessElement) {
-			if (e2 instanceof MethodPlugin || e2 instanceof MethodPackage
-					|| e2 instanceof ContentElement || e2 instanceof Process) {
-				return 1;
-			} else if (e1 instanceof Phase) {
-				if (!(e2 instanceof Phase)) {
-					return -1;
-				}
-			} else if (e1 instanceof Iteration) {
-				if (e2 instanceof Phase) {
-					return 1;
-				}
-				if (!(e2 instanceof Iteration)) {
-					return -1;
-				}
-			} else if (e1 instanceof Activity) {
-				if (e2 instanceof Phase || e2 instanceof Iteration) {
-					return 1;
-				}
-				if (!(e2 instanceof Activity)) {
-					return -1;
-				}
-			} else if (e1 instanceof Milestone) {
-				if (e2 instanceof Activity) {
-					return 1;
-				}
-				if (!(e2 instanceof Milestone)) {
-					return -1;
-				}
-			} else if (e1 instanceof RoleDescriptor) {
-				if (e2 instanceof Activity || e2 instanceof Milestone) {
-					return 1;
-				}
-				if (!(e2 instanceof RoleDescriptor)) {
-					return -1;
-				}
-			} else if (e1 instanceof TaskDescriptor) {
-				if (e2 instanceof Activity || e2 instanceof Milestone
-						|| e2 instanceof RoleDescriptor) {
-					return 1;
-				}
-				if (!(e2 instanceof TaskDescriptor)) {
-					return -1;
-				}
-			} else if (e1 instanceof WorkProductDescriptor) {
-				if (e2 instanceof Activity || e2 instanceof Milestone
-						|| e2 instanceof RoleDescriptor
-						|| e2 instanceof TaskDescriptor) {
-					return 1;
-				}
-				if (!(e2 instanceof WorkProductDescriptor)) {
-					return -1;
-				}
-			}
-		}
-		return super.compare(viewer, e1, e2);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchInput.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchInput.java
deleted file mode 100755
index 914d076..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchInput.java
+++ /dev/null
@@ -1,115 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui.internal;
-
-/**
- * Encapsulates the search strings and options that are used as inputs to a
- * method search.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodSearchInput {
-
-	private String searchString;
-
-	private String namePattern;
-
-	private boolean caseSensitive;
-
-	private boolean wholeWord;
-
-	private boolean regExp;
-
-	private MethodSearchScope searchScope;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param searchString
-	 *            a search string
-	 * @param namePattern
-	 *            a method element name pattern
-	 * @param caseSensitive
-	 *            if <code>true</code>, make the search case sensitive
-	 * @param wholeWord
-	 *            if <code>true</code>, search for whole word only
-	 * @param regExp
-	 *            if <code>true</code>, search using regular expression
-	 * @param searchScope
-	 *            a search scope
-	 */
-	public MethodSearchInput(String searchString, String namePattern,
-			boolean caseSensitive, boolean wholeWord, boolean regExp,
-			MethodSearchScope searchScope) {
-		this.searchString = searchString;
-		this.namePattern = namePattern;
-		this.caseSensitive = caseSensitive;
-		this.wholeWord = wholeWord;
-		this.regExp = regExp;
-		this.searchScope = searchScope;
-	}
-
-	/**
-	 * Returns the search string.
-	 * 
-	 * @return the search string to look for the Method element content
-	 */
-	public String getSearchString() {
-		return searchString;
-	}
-
-	/**
-	 * Returns the name pattern.
-	 * 
-	 * @return the name pattern used to match the Method element names
-	 */
-	public String getNamePattern() {
-		return namePattern;
-	}
-
-	/**
-	 * Returns the case sensitivity of the search.
-	 * 
-	 * @return <code>true</code> if the search is case sensitive
-	 */
-	public boolean getCaseSensitive() {
-		return caseSensitive;
-	}
-
-	/**
-	 * Returns the whole word option of the search.
-	 * 
-	 * @return <code>true</code> if the search is based on whole word
-	 */
-	public boolean getWholeWord() {
-		return wholeWord;
-	}
-
-	/**
-	 * Returns the regular expression option of the search.
-	 * 
-	 * @return <code>true</code> if the search is based on regular expression
-	 */
-	public boolean getRegularExpression() {
-		return regExp;
-	}
-
-	/**
-	 * Returns the search scope.
-	 * 
-	 * @return the search scope
-	 */
-	public MethodSearchScope getSearchScope() {
-		return searchScope;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchOperation.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchOperation.java
deleted file mode 100755
index a33939c..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchOperation.java
+++ /dev/null
@@ -1,471 +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.search.ui.internal;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.epf.common.xml.AbstractSAXParser;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.util.ModelStructure;
-import org.eclipse.epf.library.util.LibraryUtil;
-import org.eclipse.epf.search.ui.SearchUIPlugin;
-import org.eclipse.epf.search.ui.SearchUIResources;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Artifact;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessElement;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.xml.sax.Attributes;
-
-/**
- * Performs a method search by iterating the current method library and parsing
- * the content element XMI files where necessary.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodSearchOperation {
-
-	private static final String SCAN_LIBRARY_TEXT = SearchUIResources.scanLibraryTask_name; //$NON-NLS-1$
-
-	private static final String SCAN_ELEMENT_TEXT = SearchUIResources.scanElementTask_name; //$NON-NLS-1$
-
-	private boolean debug;
-
-	private MethodSearchInput searchInput;
-
-	private ISearchResultCollector result;
-
-	private String searchString;
-
-	private boolean caseSensitive;
-
-	private boolean regExp;
-
-	private Pattern searchStringPattern;
-
-	private Pattern elementNamePattern;
-
-	private MethodElementScanner elementScanner;
-
-	private List parsedFiles = new ArrayList();
-
-	private IProgressMonitor progressMonitor;
-
-	// Scans the content element XMI file associated with a Method element to
-	// look for the search string.
-	private class MethodElementScanner extends AbstractSAXParser {
-
-		private MethodElement element;
-
-		/**
-		 * Creates a new instance.
-		 */
-		public MethodElementScanner() {
-			super(null, false);
-		}
-
-		/**
-		 * Parses the content XMI file associated with the given Method element.
-		 * 
-		 * @param element
-		 *            a method element
-		 */
-		public void parse(MethodElement element) {
-			this.element = element;
-			String elementContentPath = getElementPath(element);
-			String briefDescription = element.getBriefDescription();
-			if (searchStringPattern.matcher(briefDescription).find()) {
-				result.accept(element);
-			}
-			if (elementContentPath != null
-					&& !parsedFiles.contains(elementContentPath)) {
-				super.parse(elementContentPath);
-				parsedFiles.add(elementContentPath);
-			}
-		}
-
-		/**
-		 * @see AbstractSAXParser#startElement(String, String, String,
-		 *      Attributes)
-		 */
-		public void startElement(String namespaceURL, String localName,
-				String qname, Attributes attributes) {
-			for (int i = 0; i < attributes.getLength(); i++) {
-				String name = attributes.getQName(i);
-				if (!name.equals("briefDescription")) { //$NON-NLS-1$
-					String value = attributes.getValue(i);
-					if (searchStringPattern.matcher(value).find()) {
-						result.accept(element);
-					}
-				}
-			}
-		}
-
-		/**
-		 * @see AbstractSAXParser#endElement(String, String, String)
-		 */
-		public void endElement(String namespaceURL, String localName,
-				String qname) {
-			String value = strBuf.toString();
-			if (searchStringPattern.matcher(value).find()) {
-				result.accept(element);
-			}
-			strBuf.setLength(0);
-		}
-
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param searchString
-	 *            a search string
-	 * @param namePattern
-	 *            a name pattern
-	 * @param result
-	 *            a search result collector
-	 */
-	public MethodSearchOperation(MethodSearchInput searchInput,
-			ISearchResultCollector result) {
-		this.searchInput = searchInput;
-		this.result = result;
-
-		caseSensitive = searchInput.getCaseSensitive();
-		regExp = searchInput.getRegularExpression();
-		elementNamePattern = MethodSearchPattern.createPattern(searchInput
-				.getNamePattern(), false, false);
-
-		debug = SearchUIPlugin.getDefault().isDebugging();
-
-		searchString = searchInput.getSearchString();
-		if (searchString == null)
-			searchString = ""; //$NON-NLS-1$
-		if (searchString.length() > 0) {
-			elementScanner = new MethodElementScanner();
-			searchStringPattern = MethodSearchPattern.createPattern(
-					searchString, caseSensitive, regExp);
-		}
-
-		if (debug) {
-			System.out
-					.println("MethodSearchOperation constructor: searchString=" //$NON-NLS-1$
-							+ searchString
-							+ ", elementNamePattern=" //$NON-NLS-1$
-							+ searchInput.getNamePattern()
-							+ ", caseSensitive=" + caseSensitive); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Executes the search operation.
-	 * 
-	 * @param progressMonitor
-	 *            a progress monitor
-	 */
-	public void execute(IProgressMonitor progressMonitor) {
-		this.progressMonitor = progressMonitor;
-		this.progressMonitor.beginTask(SCAN_LIBRARY_TEXT, 7500);
-
-		// Iterate the Method Library to look for elements that match the name
-		// pattern.
-		MethodLibrary library = LibraryService.getInstance()
-				.getCurrentMethodLibrary();
-		List methodPlugins = LibraryUtil.getMethodPlugins(library);
-		for (Iterator i = methodPlugins.iterator(); i.hasNext()
-				&& !progressMonitor.isCanceled();) {
-			MethodPlugin methodPlugin = (MethodPlugin) i.next();
-			matchPattern(methodPlugin);
-
-			MethodPackage methodPackage;
-			if (searchInput.getSearchScope().includeCoreContent()) {
-				methodPackage = UmaUtil.findMethodPackage(methodPlugin,
-						ModelStructure.DEFAULT.coreContentPath);
-				searchMethodPackages(methodPackage);
-			}
-
-			if (searchInput.getSearchScope().include(
-					MethodSearchScope.STANDARD_CATEGORY)) {
-				methodPackage = UmaUtil.findMethodPackage(methodPlugin,
-						ModelStructure.DEFAULT.disciplineDefinitionPath);
-				searchMethodPackages(methodPackage);
-				methodPackage = UmaUtil.findMethodPackage(methodPlugin,
-						ModelStructure.DEFAULT.domainPath);
-				searchMethodPackages(methodPackage);
-				methodPackage = UmaUtil.findMethodPackage(methodPlugin,
-						ModelStructure.DEFAULT.workProductTypePath);
-				searchMethodPackages(methodPackage);
-				methodPackage = UmaUtil.findMethodPackage(methodPlugin,
-						ModelStructure.DEFAULT.roleSetPath);
-				searchMethodPackages(methodPackage);
-				methodPackage = UmaUtil.findMethodPackage(methodPlugin,
-						ModelStructure.DEFAULT.toolPath);
-				searchMethodPackages(methodPackage);
-			}
-
-			if (searchInput.getSearchScope().include(
-					MethodSearchScope.CUSTOM_CATEGORY)) {
-				methodPackage = UmaUtil.findMethodPackage(methodPlugin,
-						ModelStructure.DEFAULT.customCategoryPath);
-				searchMethodPackages(methodPackage);
-			}
-
-			if (searchInput.getSearchScope().include(
-					MethodSearchScope.CAPABILITY_PATTERN)) {
-				methodPackage = UmaUtil.findMethodPackage(methodPlugin,
-						ModelStructure.DEFAULT.capabilityPatternPath);
-				searchMethodPackages(methodPackage);
-			}
-
-			if (searchInput.getSearchScope().include(
-					MethodSearchScope.DELIVERY_PROCESS)) {
-				methodPackage = UmaUtil.findMethodPackage(methodPlugin,
-						ModelStructure.DEFAULT.deliveryProcessPath);
-				searchMethodPackages(methodPackage);
-			}
-		}
-	}
-
-	/**
-	 * Searches a Method Package.
-	 * 
-	 * @param methodPackage
-	 *            a method package
-	 */
-	protected void searchMethodPackages(MethodPackage methodPackage) {
-		if (methodPackage == null
-				|| methodPackage.getName().equals(
-						ModelStructure.HIDDEN_PACKAGE_NAME)) {
-			return;
-		}
-		if (methodPackage instanceof ProcessComponent) {
-			// Add the associated CapabilityPattern or DeliveryProcess to the
-			// search result.
-			ProcessComponent processComponent = (ProcessComponent) methodPackage;
-			matchPattern(processComponent.getProcess());
-		} else if (!isInternalProcessPackage(methodPackage)) {
-			matchPattern(methodPackage);
-		}
-
-		List childPackages = methodPackage.getChildPackages();
-		for (Iterator i = childPackages.iterator(); i.hasNext()
-				&& !progressMonitor.isCanceled();) {
-			searchMethodPackages((MethodPackage) i.next());
-		}
-		if (methodPackage instanceof ContentPackage) {
-			ContentPackage contentPackage = (ContentPackage) methodPackage;
-			List contentElements = contentPackage.getContentElements();
-			for (Iterator j = contentElements.iterator(); j.hasNext()
-					&& !progressMonitor.isCanceled();) {
-				ContentElement contentElement = (ContentElement) j.next();
-				matchPattern(contentElement);
-				if (contentElement instanceof Artifact) {
-					searchContainedArtifacts((Artifact) contentElement);
-				} else if (contentElement instanceof Discipline) {
-					searchSubDisciplines((Discipline) contentElement);
-				} else if (contentElement instanceof Practice) {
-					searchSubPractices((Practice) contentElement);
-				} else if (contentElement instanceof Domain) {
-					searchSubDomains((Domain) contentElement);
-				}
-			}
-		} else if (methodPackage instanceof ProcessPackage) {
-			ProcessPackage processPackage = (ProcessPackage) methodPackage;
-			List processElements = processPackage.getProcessElements();
-			for (Iterator j = processElements.iterator(); j.hasNext()
-					&& !progressMonitor.isCanceled();) {
-				ProcessElement processElement = (ProcessElement) j.next();
-				if (!(processElement instanceof Activity)) {
-					matchPattern(processElement);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns <code>true</code> if the given package is an internal Process
-	 * Package.
-	 * 
-	 * @param methodPackage
-	 *            a method or process package
-	 * @return <code>true</code> if the given package is an internal process
-	 *         package
-	 */
-	protected boolean isInternalProcessPackage(MethodPackage methodPackage) {
-		if (methodPackage instanceof ProcessPackage) {
-			if (UmaUtil.getProcessComponent(methodPackage) != null) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Searches the contained artifacts of an artifact.
-	 * 
-	 * @param artifact
-	 *            an artifact
-	 */
-	protected void searchContainedArtifacts(Artifact artifact) {
-		if (artifact != null) {
-			for (Iterator i = artifact.getContainedArtifacts().iterator(); i
-					.hasNext()
-					&& !progressMonitor.isCanceled();) {
-				Artifact containedArtifact = (Artifact) i.next();
-				matchPattern(containedArtifact);
-				searchContainedArtifacts(containedArtifact);
-			}
-		}
-	}
-
-	/**
-	 * Searches the sub disciplines of a discipline.
-	 * 
-	 * @param discipline
-	 *            a discipline
-	 */
-	protected void searchSubDisciplines(Discipline discipline) {
-		if (discipline != null) {
-			for (Iterator i = discipline.getSubdiscipline().iterator(); i
-					.hasNext()
-					&& !progressMonitor.isCanceled();) {
-				Discipline subDiscipline = (Discipline) i.next();
-				matchPattern(subDiscipline);
-				searchSubDisciplines(subDiscipline);
-			}
-		}
-	}
-
-	/**
-	 * Searches the sub practices of a practice.
-	 * 
-	 * @param practice
-	 *            a practice
-	 */
-	protected void searchSubPractices(Practice practice) {
-		if (practice != null) {
-			for (Iterator i = practice.getSubPractices().iterator(); i
-					.hasNext()
-					&& !progressMonitor.isCanceled();) {
-				Practice subPractice = (Practice) i.next();
-				matchPattern(subPractice);
-				searchSubPractices(subPractice);
-			}
-		}
-	}
-
-	/**
-	 * Searches the sub domains of a domain.
-	 * 
-	 * @param domain
-	 *            a domain
-	 */
-	protected void searchSubDomains(Domain domain) {
-		if (domain != null) {
-			for (Iterator i = domain.getSubdomains().iterator(); i.hasNext()
-					&& !progressMonitor.isCanceled();) {
-				Domain subDomain = (Domain) i.next();
-				matchPattern(subDomain);
-				searchSubDomains(subDomain);
-			}
-		}
-	}
-
-	/**
-	 * Adds the given method element to the search result collection if its name
-	 * or presentation name matches the name pattern.
-	 * 
-	 * @param element
-	 *            a method element
-	 */
-	protected void matchPattern(MethodElement element) {
-		try {
-			if (searchInput.getSearchScope().include(element)) {
-				String name = element.getName();
-				String taskName = MessageFormat.format(SCAN_ELEMENT_TEXT,
-						new String[] { name });
-				progressMonitor.setTaskName(taskName);
-				boolean foundMatch = false;
-				if (element instanceof DescribableElement) {
-					String presentationName = ((DescribableElement) element)
-							.getPresentationName();
-					foundMatch = (name != null && elementNamePattern.matcher(
-							name).matches())
-							|| (presentationName != null && elementNamePattern
-									.matcher(presentationName).matches());
-				} else {
-					foundMatch = (name != null && elementNamePattern.matcher(
-							name).matches());
-				}
-				if (foundMatch) {
-					if (searchString.length() == 0) {
-						result.accept(element);
-					} else {
-						try {
-							elementScanner.parse(element);
-						} catch (Exception e) {
-							e.printStackTrace();
-						}
-					}
-				}
-				progressMonitor.worked(1);
-			}
-		} catch (Exception e) {
-			SearchUIPlugin.getDefault().getLogger().logError(e);
-		}
-	}
-
-	/**
-	 * Returns the path of the content XML file associated with a method
-	 * element.
-	 */
-	protected String getElementPath(MethodElement element) {
-		Resource resource = null;
-		if (element instanceof DescribableElement) {
-			DescribableElement describableElement = (DescribableElement) element;
-			ContentDescription contentDescription = describableElement
-					.getPresentation();
-			if (contentDescription == null) {
-				return null;
-			}
-			resource = contentDescription.eResource();
-		} else {
-			resource = element.eResource();
-		}
-		if (resource != null) {
-			URI resourceURI = resource.getURI();
-			if (resourceURI != null) {
-				return resourceURI.toFileString();
-			}
-		}
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchPattern.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchPattern.java
deleted file mode 100755
index 0976111..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchPattern.java
+++ /dev/null
@@ -1,129 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui.internal;
-
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-/**
- * Pattern contructor for a method search.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodSearchPattern {
-
-	/**
-	 * Private constructor to prevent this class from being instantiated. All
-	 * methods in this class should be static.
-	 */
-	private MethodSearchPattern() {
-	}
-
-	/**
-	 * Creates a
-	 * <code>Pattern<code> object from the pattern string used in Method Search.
-	 * 
-	 * @param pattern
-	 *            a search pattern string
-	 * @param isCaseSensitive
-	 *            if <code>true</code>, create a case insensitve pattern
-	 * @param isRegexSearch
-	 *            if <code>true</code>, treat the pattern as a regular expression pattern
-	 * @return a new <code>Pattern<code> object
-	 * @throws <code>PatternSyntaxException</code> if the specified pattern has a syntax error
-	 */
-	public static Pattern createPattern(String pattern,
-			boolean isCaseSensitive, boolean isRegexSearch)
-			throws PatternSyntaxException {
-		if (!isRegexSearch) {
-			pattern = toRegexPattern(pattern);
-		}
-
-		if (!isCaseSensitive) {
-			return Pattern.compile(pattern, Pattern.CASE_INSENSITIVE
-					| Pattern.UNICODE_CASE | Pattern.MULTILINE);
-		}
-
-		return Pattern.compile(pattern, Pattern.MULTILINE);
-	}
-
-	/**
-	 * Converts a pattern string with '*' and '?' into a regular expression
-	 * pattern string.
-	 * 
-	 * @param pattern
-	 *            a pattern string
-	 * @return a regular expression pattern string
-	 */
-	private static String toRegexPattern(String pattern) {
-		int patternLength = pattern.length();
-		StringBuffer result = new StringBuffer(patternLength);
-
-		boolean escaped = false;
-		boolean quoting = false;
-
-		for (int i = 0; i < patternLength; i++) {
-			char ch = pattern.charAt(i);
-			switch (ch) {
-			case '*':
-				if (!escaped) {
-					if (quoting) {
-						result.append("\\E"); //$NON-NLS-1$
-						quoting = false;
-					}
-				}
-				result.append(".*"); //$NON-NLS-1$
-				escaped = false;
-				break;
-			case '?':
-				if (!escaped) {
-					if (quoting) {
-						result.append("\\E"); //$NON-NLS-1$
-						quoting = false;
-					}
-				}
-				result.append("."); //$NON-NLS-1$
-				escaped = false;
-				break;
-			case '\\':
-				if (!escaped) {
-					escaped = true;
-				} else {
-					escaped = false;
-					if (quoting) {
-						result.append("\\E"); //$NON-NLS-1$
-						quoting = false;
-					}
-					result.append("\\\\"); //$NON-NLS-1$
-				}
-				break;
-			default:
-				if (!quoting) {
-					result.append("\\Q"); //$NON-NLS-1$
-					quoting = true;
-				}
-				if (escaped && ch != '*' && ch != '?' && ch != '\\') {
-					result.append('\\');
-				}
-				result.append(ch);
-				escaped = (ch == '\\');
-			}
-		}
-
-		if (quoting) {
-			result.append("\\E"); //$NON-NLS-1$
-		}
-
-		return result.toString();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchQuery.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchQuery.java
deleted file mode 100755
index 2410049..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchQuery.java
+++ /dev/null
@@ -1,107 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui.internal;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.search.ui.SearchUIResources;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.ISearchResult;
-import org.eclipse.search.ui.text.Match;
-
-/**
- * Encapsulates the search strings and options for a method search.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodSearchQuery implements ISearchQuery {
-
-	private MethodSearchInput searchInput;
-
-	private MethodSearchResult searchResult;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param searchString
-	 *            a search string
-	 * @param namePattern
-	 *            a method element name pattern
-	 */
-	public MethodSearchQuery(MethodSearchInput searchInput) {
-		this.searchInput = searchInput;
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.ISearchQuery#run(IProgressMonitor)
-	 */
-	public IStatus run(IProgressMonitor processMonitor) {
-		final MethodSearchResult searchResult = (MethodSearchResult) getSearchResult();
-		searchResult.removeAll();
-		ISearchResultCollector result = new ISearchResultCollector() {
-			public void accept(Object match) {
-				if (match instanceof MethodElement
-						&& !TngUtil.isPredefined((MethodElement) match)) {
-					searchResult.addMatch(new Match(match, Match.UNIT_LINE, 1,
-							1));
-				}
-			}
-		};
-		MethodSearchOperation operation = new MethodSearchOperation(
-				searchInput, result);
-		operation.execute(processMonitor);
-		processMonitor.done();
-		return Status.OK_STATUS;
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.ISearchQuery#getLabel()
-	 */
-	public String getLabel() {
-		return SearchUIResources.searchQuery_text; 
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.ISearchQuery#canRerun()
-	 */
-	public boolean canRerun() {
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.ISearchQuery#canRunInBackground()
-	 */
-	public boolean canRunInBackground() {
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.ISearchQuery#getSearchResult()
-	 */
-	public ISearchResult getSearchResult() {
-		if (searchResult == null) {
-			searchResult = new MethodSearchResult(this);
-		}
-		return searchResult;
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.ISearchQuery#getSearchResult()
-	 */
-	public MethodSearchInput getSearchInput() {
-		return searchInput;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchResult.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchResult.java
deleted file mode 100755
index c7fe2d6..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchResult.java
+++ /dev/null
@@ -1,121 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui.internal;
-
-import java.text.MessageFormat;
-
-import org.eclipse.epf.search.ui.SearchUIPlugin;
-import org.eclipse.epf.search.ui.SearchUIResources;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.search.ui.text.IEditorMatchAdapter;
-import org.eclipse.search.ui.text.IFileMatchAdapter;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * The method search result.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodSearchResult extends AbstractTextSearchResult implements
-		IEditorMatchAdapter {
-
-	private static final String MATCH_LABEL = SearchUIResources.searchResult_match; //$NON-NLS-1$
-
-	private static final String MATCHES_LABEL = SearchUIResources.searchResult_matches; //$NON-NLS-1$
-
-	// The search query.
-	private MethodSearchQuery searchQuery;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param searchQuery
-	 *            a method search query
-	 */
-	public MethodSearchResult(MethodSearchQuery searchQuery) {
-		this.searchQuery = searchQuery;
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.ISearchResult#getQuery()
-	 */
-	public ISearchQuery getQuery() {
-		return searchQuery;
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.ISearchResult#getImageDescriptor()
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		return SearchUIPlugin.getDefault().getImageDescriptor(
-				"full/obj16/MethodSearch.gif"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.ISearchResult#getLabel()
-	 */
-	public String getLabel() {
-		// TODO: Display search result in the form:
-		//    'candidate' - 6 matches in 4 elements.
-		String searchString = searchQuery.getSearchInput().getSearchString();
-		int matchCount = getMatchCount();
-		if (matchCount == 1) {
-			return MessageFormat.format(MATCH_LABEL,
-					new Object[] { searchString });		
-		} else {
-			return MessageFormat.format(MATCHES_LABEL, new Object[] {
-					searchString, "" + matchCount }); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.ISearchResult#getTooltip()
-	 */
-	public String getTooltip() {
-		return getLabel();
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchResult#getEditorMatchAdapter()
-	 */
-	public IEditorMatchAdapter getEditorMatchAdapter() {
-		return this;
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchResult#getFileMatchAdapter()
-	 */
-	public IFileMatchAdapter getFileMatchAdapter() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.text.IEditorMatchAdapter#isShownInEditor(Match,
-	 *      IEditorPart)
-	 */
-	public boolean isShownInEditor(Match match, IEditorPart editor) {
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.search.ui.text.IEditorMatchAdapter#computeContainedMatches(AbstractTextSearchResult,
-	 *      IEditorPart)
-	 */
-	public Match[] computeContainedMatches(AbstractTextSearchResult result,
-			IEditorPart editor) {
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchScope.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchScope.java
deleted file mode 100755
index d4755ad..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchScope.java
+++ /dev/null
@@ -1,236 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.epf.library.ui.LibraryUIText;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.impl.ActivityImpl;
-import org.eclipse.epf.uma.impl.ArtifactImpl;
-import org.eclipse.epf.uma.impl.CapabilityPatternImpl;
-import org.eclipse.epf.uma.impl.ChecklistImpl;
-import org.eclipse.epf.uma.impl.ConceptImpl;
-import org.eclipse.epf.uma.impl.ContentCategoryImpl;
-import org.eclipse.epf.uma.impl.ContentPackageImpl;
-import org.eclipse.epf.uma.impl.CustomCategoryImpl;
-import org.eclipse.epf.uma.impl.DeliverableImpl;
-import org.eclipse.epf.uma.impl.DeliveryProcessImpl;
-import org.eclipse.epf.uma.impl.DisciplineGroupingImpl;
-import org.eclipse.epf.uma.impl.DisciplineImpl;
-import org.eclipse.epf.uma.impl.DomainImpl;
-import org.eclipse.epf.uma.impl.EstimationConsiderationsImpl;
-import org.eclipse.epf.uma.impl.ExampleImpl;
-import org.eclipse.epf.uma.impl.GuidanceImpl;
-import org.eclipse.epf.uma.impl.GuidelineImpl;
-import org.eclipse.epf.uma.impl.IterationImpl;
-import org.eclipse.epf.uma.impl.MethodPluginImpl;
-import org.eclipse.epf.uma.impl.MilestoneImpl;
-import org.eclipse.epf.uma.impl.OutcomeImpl;
-import org.eclipse.epf.uma.impl.PhaseImpl;
-import org.eclipse.epf.uma.impl.PracticeImpl;
-import org.eclipse.epf.uma.impl.ProcessComponentImpl;
-import org.eclipse.epf.uma.impl.ProcessPackageImpl;
-import org.eclipse.epf.uma.impl.ReportImpl;
-import org.eclipse.epf.uma.impl.ReusableAssetImpl;
-import org.eclipse.epf.uma.impl.RoadmapImpl;
-import org.eclipse.epf.uma.impl.RoleDescriptorImpl;
-import org.eclipse.epf.uma.impl.RoleImpl;
-import org.eclipse.epf.uma.impl.RoleSetGroupingImpl;
-import org.eclipse.epf.uma.impl.RoleSetImpl;
-import org.eclipse.epf.uma.impl.SupportingMaterialImpl;
-import org.eclipse.epf.uma.impl.TaskDescriptorImpl;
-import org.eclipse.epf.uma.impl.TaskImpl;
-import org.eclipse.epf.uma.impl.TemplateImpl;
-import org.eclipse.epf.uma.impl.TermDefinitionImpl;
-import org.eclipse.epf.uma.impl.ToolImpl;
-import org.eclipse.epf.uma.impl.ToolMentorImpl;
-import org.eclipse.epf.uma.impl.WhitepaperImpl;
-import org.eclipse.epf.uma.impl.WorkProductDescriptorImpl;
-import org.eclipse.epf.uma.impl.WorkProductTypeImpl;
-
-/**
- * The method search scope.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodSearchScope {
-
-	public static final String ROOT = "Root"; //$NON-NLS-1$
-
-	public static final String METHOD_CONTENT = LibraryUIText.TEXT_METHOD_CONTENT;
-
-	public static final String ROLE = LibraryUIText.TEXT_ROLE;
-
-	public static final String TASK = LibraryUIText.TEXT_TASK;
-
-	public static final String WORK_PRODUCT = LibraryUIText.TEXT_WORK_PRODUCT;
-
-	public static final String GUIDANCE = LibraryUIText.TEXT_GUIDANCE;
-
-	public static final String CHECKLIST = LibraryUIText.TEXT_CHECKLIST;
-
-	public static final String CONCEPT = LibraryUIText.TEXT_CONCEPT;
-
-	public static final String ESTIMATION_CONSIDERATIONS = LibraryUIText.TEXT_ESTIMATION_CONSIDERATIONS;
-
-	public static final String EXAMPLE = LibraryUIText.TEXT_EXAMPLE;
-
-	public static final String GUIDELINE = LibraryUIText.TEXT_GUIDELINE;
-
-	public static final String PRACTICE = LibraryUIText.TEXT_PRACTICE;
-
-	public static final String REPORT = LibraryUIText.TEXT_REPORT;
-
-	public static final String REUSABLE_ASSET = LibraryUIText.TEXT_REUSABLE_ASSET;
-
-	public static final String ROADMAP = LibraryUIText.TEXT_ROADMAP;
-
-	public static final String SUPPORTING_MATERIAL = LibraryUIText.TEXT_SUPPORTING_MATERIAL;
-
-	public static final String TEMPLATE = LibraryUIText.TEXT_TEMPLATE;
-
-	public static final String TERM_DEFINITION = LibraryUIText.TEXT_TERM_DEFINITION;
-
-	public static final String TOOL_MENTOR = LibraryUIText.TEXT_TOOL_MENTOR;
-
-	public static final String WHITEPAPER = LibraryUIText.TEXT_WHITEPAPER;
-
-	public static final String STANDARD_CATEGORY = LibraryUIText.TEXT_STANDARD_CATEGORY;
-
-	public static final String CUSTOM_CATEGORY = LibraryUIText.TEXT_CUSTOM_CATEGORY;
-
-	public static final String PROCESS = LibraryUIText.TEXT_PROCESS;
-
-	public static final String CAPABILITY_PATTERN = LibraryUIText.TEXT_CAPABILITY_PATTERN;
-
-	public static final String DELIVERY_PROCESS = LibraryUIText.TEXT_DELIVERY_PROCESS;
-
-	private static Map elementSearchScope = new HashMap();
-
-	static {
-		elementSearchScope.put(MethodPluginImpl.class, ROOT);
-		elementSearchScope.put(ContentPackageImpl.class, METHOD_CONTENT);
-		elementSearchScope.put(RoleImpl.class, ROLE);
-		elementSearchScope.put(TaskImpl.class, TASK);
-		elementSearchScope.put(ArtifactImpl.class, WORK_PRODUCT);
-		elementSearchScope.put(DeliverableImpl.class, WORK_PRODUCT);
-		elementSearchScope.put(OutcomeImpl.class, WORK_PRODUCT);
-		elementSearchScope.put(GuidanceImpl.class, GUIDANCE);
-		elementSearchScope.put(ChecklistImpl.class, CHECKLIST);
-		elementSearchScope.put(ConceptImpl.class, CONCEPT);
-		elementSearchScope.put(EstimationConsiderationsImpl.class,
-				ESTIMATION_CONSIDERATIONS);
-		elementSearchScope.put(ExampleImpl.class, EXAMPLE);
-		elementSearchScope.put(GuidelineImpl.class, GUIDELINE);
-		elementSearchScope.put(PracticeImpl.class, PRACTICE);
-		elementSearchScope.put(ReportImpl.class, REPORT);
-		elementSearchScope.put(ReusableAssetImpl.class, REUSABLE_ASSET);
-		elementSearchScope.put(RoadmapImpl.class, ROADMAP);
-		elementSearchScope.put(SupportingMaterialImpl.class,
-				SUPPORTING_MATERIAL);
-		elementSearchScope.put(TemplateImpl.class, TEMPLATE);
-		elementSearchScope.put(TermDefinitionImpl.class, TERM_DEFINITION);
-		elementSearchScope.put(ToolMentorImpl.class, TOOL_MENTOR);
-		elementSearchScope.put(WhitepaperImpl.class, WHITEPAPER);
-		elementSearchScope.put(ContentCategoryImpl.class, STANDARD_CATEGORY);
-		elementSearchScope.put(DisciplineImpl.class, STANDARD_CATEGORY);
-		elementSearchScope.put(DisciplineGroupingImpl.class, STANDARD_CATEGORY);
-		elementSearchScope.put(DomainImpl.class, STANDARD_CATEGORY);
-		elementSearchScope.put(WorkProductTypeImpl.class, STANDARD_CATEGORY);
-		elementSearchScope.put(RoleSetImpl.class, STANDARD_CATEGORY);
-		elementSearchScope.put(RoleSetGroupingImpl.class, STANDARD_CATEGORY);
-		elementSearchScope.put(ToolImpl.class, STANDARD_CATEGORY);
-		elementSearchScope.put(CustomCategoryImpl.class, CUSTOM_CATEGORY);
-		elementSearchScope.put(ProcessPackageImpl.class, PROCESS);
-		elementSearchScope.put(ProcessComponentImpl.class, PROCESS);
-		elementSearchScope.put(PhaseImpl.class, PROCESS);
-		elementSearchScope.put(IterationImpl.class, PROCESS);
-		elementSearchScope.put(MilestoneImpl.class, PROCESS);
-		elementSearchScope.put(ActivityImpl.class, PROCESS);
-		elementSearchScope.put(RoleDescriptorImpl.class, PROCESS);
-		elementSearchScope.put(TaskDescriptorImpl.class, PROCESS);
-		elementSearchScope.put(WorkProductDescriptorImpl.class, PROCESS);
-		elementSearchScope.put(CapabilityPatternImpl.class, CAPABILITY_PATTERN);
-		elementSearchScope.put(DeliveryProcessImpl.class, DELIVERY_PROCESS);
-	}
-
-	private List searchScope = new ArrayList();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public MethodSearchScope(Object[] elementTypes) {
-		searchScope.add(ROOT);
-		for (int i = 0; i < elementTypes.length; i++) {
-			Object elementType = elementTypes[i];
-			searchScope.add(elementType);
-		}
-	}
-
-	/**
-	 * Checks whether a core method element is included in the search scope.
-	 * 
-	 * @return <code>true</code> if a core method element is included in the
-	 *         search scope, <code>false</code> otherwise
-	 */
-	public boolean includeCoreContent() {
-		return searchScope.contains(ROLE) || searchScope.contains(TASK)
-				|| searchScope.contains(WORK_PRODUCT)
-				|| searchScope.contains(GUIDANCE)
-				|| searchScope.contains(CHECKLIST)
-				|| searchScope.contains(CONCEPT)
-				|| searchScope.contains(ESTIMATION_CONSIDERATIONS)
-				|| searchScope.contains(EXAMPLE)
-				|| searchScope.contains(GUIDELINE)
-				|| searchScope.contains(PRACTICE)
-				|| searchScope.contains(REPORT)
-				|| searchScope.contains(REUSABLE_ASSET)
-				|| searchScope.contains(ROADMAP)
-				|| searchScope.contains(SUPPORTING_MATERIAL)
-				|| searchScope.contains(TEMPLATE)
-				|| searchScope.contains(TERM_DEFINITION)
-				|| searchScope.contains(TOOL_MENTOR)
-				|| searchScope.contains(WHITEPAPER);
-	}
-
-	/**
-	 * Checks whether the given Method element is included in the search scope.
-	 * 
-	 * @param element
-	 *            a method element
-	 * @return <code>true</code> if the method element is included in the
-	 *         search scope, <code>false</code> otherwise
-	 */
-	public boolean include(MethodElement element) {
-		if (element == null)
-			return false;
-		String searchScopeName = (String) elementSearchScope.get(element
-				.getClass());
-		return searchScope.contains(searchScopeName);
-	}
-
-	/**
-	 * Checks whether the given method element type is included in the search
-	 * scope.
-	 * 
-	 * @return <code>true</code> if the given method element type is included
-	 *         in the search scope, <code>false</code> otherwise
-	 */
-	public boolean include(String searchScopeName) {
-		return searchScope.contains(searchScopeName);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchScopeViewer.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchScopeViewer.java
deleted file mode 100755
index b1d995f..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/MethodSearchScopeViewer.java
+++ /dev/null
@@ -1,238 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Displays the searchable method elements, organized by types, in a tree view.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class MethodSearchScopeViewer {
-
-	private static final String ROOT = MethodSearchScope.ROOT;
-
-	private static final String METHOD_CONTENT = MethodSearchScope.METHOD_CONTENT;
-
-	private static final String ROLE = MethodSearchScope.ROLE;
-
-	private static final String TASK = MethodSearchScope.TASK;
-
-	private static final String WORK_PRODUCT = MethodSearchScope.WORK_PRODUCT;
-
-	private static final String GUIDANCE = MethodSearchScope.GUIDANCE;
-
-	private static final String CHECKLIST = MethodSearchScope.CHECKLIST;
-
-	private static final String CONCEPT = MethodSearchScope.CONCEPT;
-
-	private static final String ESTIMATION_CONSIDERATIONS = MethodSearchScope.ESTIMATION_CONSIDERATIONS;
-
-	private static final String EXAMPLE = MethodSearchScope.EXAMPLE;
-
-	private static final String GUIDELINE = MethodSearchScope.GUIDELINE;
-
-	private static final String PRACTICE = MethodSearchScope.PRACTICE;
-
-	private static final String REPORT = MethodSearchScope.REPORT;
-
-	private static final String REUSABLE_ASSET = MethodSearchScope.REUSABLE_ASSET;
-
-	private static final String ROADMAP = MethodSearchScope.ROADMAP;
-
-	private static final String SUPPORTING_MATERIAL = MethodSearchScope.SUPPORTING_MATERIAL;
-
-	private static final String TEMPLATE = MethodSearchScope.TEMPLATE;
-
-	private static final String TERM_DEFINITION = MethodSearchScope.TERM_DEFINITION;
-
-	private static final String TOOL_MENTOR = MethodSearchScope.TOOL_MENTOR;
-
-	private static final String WHITEPAPER = MethodSearchScope.WHITEPAPER;
-
-	private static final String STANDARD_CATEGORY = MethodSearchScope.STANDARD_CATEGORY;
-
-	private static final String CUSTOM_CATEGORY = MethodSearchScope.CUSTOM_CATEGORY;
-
-	private static final String PROCESS = MethodSearchScope.PROCESS;
-
-	private static final String CAPABILITY_PATTERN = MethodSearchScope.CAPABILITY_PATTERN;
-
-	private static final String DELIVERY_PROCESS = MethodSearchScope.DELIVERY_PROCESS;
-
-	private static List rootList = new ArrayList();
-	static {
-		rootList.add(METHOD_CONTENT);
-		rootList.add(PROCESS);
-	}
-
-	private static List methodContentList = new ArrayList();
-	static {
-		methodContentList.add(ROLE);
-		methodContentList.add(TASK);
-		methodContentList.add(WORK_PRODUCT);
-		methodContentList.add(GUIDANCE);
-		methodContentList.add(STANDARD_CATEGORY);
-		methodContentList.add(CUSTOM_CATEGORY);
-	}
-
-	private static List guidanceList = new ArrayList();
-	static {
-		guidanceList.add(CHECKLIST);
-		guidanceList.add(CONCEPT);
-		guidanceList.add(ESTIMATION_CONSIDERATIONS);
-		guidanceList.add(EXAMPLE);
-		guidanceList.add(GUIDELINE);
-		guidanceList.add(PRACTICE);
-		guidanceList.add(REPORT);
-		guidanceList.add(REUSABLE_ASSET);
-		guidanceList.add(ROADMAP);
-		guidanceList.add(SUPPORTING_MATERIAL);
-		guidanceList.add(TEMPLATE);
-		guidanceList.add(TERM_DEFINITION);
-		guidanceList.add(TOOL_MENTOR);
-		guidanceList.add(WHITEPAPER);
-	}
-
-	private static List processList = new ArrayList();
-	static {
-		processList.add(CAPABILITY_PATTERN);
-		processList.add(DELIVERY_PROCESS);
-	}
-
-	private static List hasChildrenList = new ArrayList();
-	static {
-		hasChildrenList.add(ROOT);
-		hasChildrenList.add(METHOD_CONTENT);
-		hasChildrenList.add(GUIDANCE);
-		hasChildrenList.add(PROCESS);
-	}
-
-	private CheckboxTreeViewer viewer;
-
-	/**
-	 * The content provider for the viewer.
-	 */
-	private static class ViewerContentProvider implements ITreeContentProvider {
-
-		private final Object[] EMPTY_LIST = new Object[0];
-
-		public Object[] getElements(Object parent) {
-			if (parent == ROOT) {
-				return getChildren(ROOT);
-			}
-			return getChildren(parent);
-		}
-
-		public Object[] getChildren(Object parent) {
-			if (parent == ROOT) {
-				return rootList.toArray();
-			} else if (parent == METHOD_CONTENT) {
-				return methodContentList.toArray();
-			} else if (parent == GUIDANCE) {
-				return guidanceList.toArray();
-			} else if (parent == PROCESS) {
-				return processList.toArray();
-			}
-			return EMPTY_LIST;
-		}
-
-		public Object getParent(Object child) {
-			if (rootList.contains(child)) {
-				return ROOT;
-			}
-			if (methodContentList.contains(child)) {
-				return METHOD_CONTENT;
-			} else if (guidanceList.contains(child)) {
-				return GUIDANCE;
-			} else if (processList.contains(child)) {
-				return PROCESS;
-			}
-			return EMPTY_LIST;
-		}
-
-		public boolean hasChildren(Object parent) {
-			return hasChildrenList.contains(parent);
-		}
-
-		public void inputChanged(Viewer arg0, Object arg1, Object arg2) {
-		}
-
-		public void dispose() {
-		}
-
-	}
-
-	/**
-	 * The label provider for the viewer.
-	 */
-	private static class ViewerLabelProvider extends LabelProvider {
-
-		public String getText(Object obj) {
-			return obj.toString();
-		}
-
-		public Image getImage(Object obj) {
-			return null;
-		}
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	public MethodSearchScopeViewer(Composite parent, int style) {
-		viewer = new CheckboxTreeViewer(parent, style);
-		viewer.getTree().setLayout(new GridLayout(1, false));
-		viewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
-		viewer.setContentProvider(new ViewerContentProvider());
-		viewer.setLabelProvider(new ViewerLabelProvider());
-		viewer.setInput(ROOT);
-		viewer.expandToLevel(2);
-		viewer.setSubtreeChecked(METHOD_CONTENT, true);
-		viewer.setSubtreeChecked(PROCESS, true);
-		viewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				Object selectedElement = event.getElement();
-				viewer.setSubtreeChecked(selectedElement, event.getChecked());
-				if (!event.getChecked()) {
-					viewer.setParentsGrayed(selectedElement, true);
-					viewer.setGrayChecked(selectedElement, false);
-				} else {
-					viewer.setParentsGrayed(selectedElement, false);
-				}
-			}
-		});
-	}
-
-	/**
-	 * Returns the selected method element types.
-	 * 
-	 * @return an array of selected method element types
-	 */
-	public MethodSearchScope getSearchScope() {
-		return new MethodSearchScope(viewer.getCheckedElements());
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/SearchResultLabelProvider.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/SearchResultLabelProvider.java
deleted file mode 100755
index 84fb2cf..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/SearchResultLabelProvider.java
+++ /dev/null
@@ -1,60 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui.internal;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.provider.UmaItemProviderAdapterFactory;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The label provider for the method search result tree and table viewers.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class SearchResultLabelProvider extends LabelProvider {
-
-	private static ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-			new UmaItemProviderAdapterFactory());
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SearchResultLabelProvider() {
-		super();
-	}
-
-	/**
-	 * @see LabelProvider#getText(Object)
-	 */
-	public String getText(Object obj) {
-		if (obj instanceof SearchResultUIFolder) {
-			return ((SearchResultUIFolder) obj).getName();
-		} else if (obj instanceof MethodElement) {
-			return ((MethodElement) obj).getName();
-		}
-		return labelProvider.getText(obj);
-	}
-
-	/**
-	 * @see LabelProvider#getImage(Object)
-	 */
-	public Image getImage(Object obj) {
-		if (obj instanceof SearchResultUIFolder) {
-			return ((SearchResultUIFolder) obj).getImage();
-		}
-		return labelProvider.getImage(obj);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/SearchResultTableContentProvider.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/SearchResultTableContentProvider.java
deleted file mode 100755
index ec10342..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/SearchResultTableContentProvider.java
+++ /dev/null
@@ -1,71 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui.internal;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * The content provider for the method search result table viewer.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class SearchResultTableContentProvider implements
-		IStructuredContentProvider {
-
-	private static final Object[] EMPTY_LIST = new Object[0];
-
-	private TableViewer tableViewer;
-
-	private MethodSearchResult searchResult;
-
-	/**
-	 * @see IStructuredContentProvider#getElements(Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		if (inputElement instanceof MethodSearchResult) {
-			return ((MethodSearchResult) inputElement).getElements();
-		}
-		return EMPTY_LIST;
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		if (newInput != null && newInput instanceof MethodSearchResult) {
-			tableViewer = (TableViewer) viewer;
-			searchResult = (MethodSearchResult) newInput;
-		}
-	}
-
-	public void elementsChanged(Object[] updatedElements) {
-		for (int i = 0; i < updatedElements.length; i++) {
-			if (searchResult.getMatchCount(updatedElements[i]) > 0) {
-				if (tableViewer.testFindItem(updatedElements[i]) != null) {
-					tableViewer.refresh(updatedElements[i]);
-				} else {
-					tableViewer.add(updatedElements[i]);
-				}
-			} else {
-				tableViewer.remove(updatedElements[i]);
-			}
-		}
-		tableViewer.refresh();
-	}
-
-	public void clear() {
-		tableViewer.refresh();
-	}
-
-	public void dispose() {
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/SearchResultTreeContentProvider.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/SearchResultTreeContentProvider.java
deleted file mode 100755
index 7ee5a4b..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/SearchResultTreeContentProvider.java
+++ /dev/null
@@ -1,494 +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.search.ui.internal;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.epf.library.edit.LibraryEditPlugin;
-import org.eclipse.epf.search.ui.SearchUIResources;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Artifact;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessElement;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * The content provider for the method search result tree viewer.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class SearchResultTreeContentProvider implements ITreeContentProvider {
-
-	private static final String PKG_NAME_CONTENT = "Content"; //$NON-NLS-1$
-
-	private static final String PKG_NAME_CORE_CONTENT = "CoreContent"; //$NON-NLS-1$
-
-	private static final String PKG_NAME_CATEGORIES = "Categories"; //$NON-NLS-1$
-
-	private static final String PKG_NAME_DISCIPLINES = "Disciplines"; //$NON-NLS-1$
-
-	private static final String PKG_NAME_DOMAINS = "Domains"; //$NON-NLS-1$
-
-	private static final String PKG_NAME_WORK_PRODUCT_TYPES = "WP Types"; //$NON-NLS-1$
-
-	private static final String PKG_NAME_ROLESETS = "RoleSets"; //$NON-NLS-1$
-
-	private static final String PKG_NAME_TOOLS = "Tools"; //$NON-NLS-1$
-
-	private static final String PKG_NAME_CUSTOM_CATEGORIES = "CustomCategories"; //$NON-NLS-1$
-
-	private static final String PKG_NAME_CAPABILITY_PATTERNS = "CapabilityPatterns"; //$NON-NLS-1$
-
-	private static final String PKG_NAME_DELIVERY_PROCESSES = "DeliveryProcesses"; //$NON-NLS-1$
-
-	private static final String METHOD_CONTENT = SearchUIResources.searchResult_methodContent; //$NON-NLS-1$	
-
-	private static final String CONTENT_PACKAGES = SearchUIResources.searchResult_contentPackages; //$NON-NLS-1$
-
-	private static final String STANDARD_CATEGORIES = SearchUIResources.searchResult_standardCategories; //$NON-NLS-1$
-
-	private static final String DISCIPLINES = SearchUIResources.searchResult_disciplines; //$NON-NLS-1$
-
-	private static final String DOMAINS = SearchUIResources.searchResult_domains; //$NON-NLS-1$
-
-	private static final String WORK_PRODUCT_TYPES = SearchUIResources.searchResult_workProductTypes; //$NON-NLS-1$
-
-	private static final String ROLESETS = SearchUIResources.searchResult_roleSets; //$NON-NLS-1$
-
-	private static final String TOOLS = SearchUIResources.searchResult_tools; //$NON-NLS-1$
-
-	private static final String CUSTOM_CATEGORIES = SearchUIResources.searchResult_customCategories; //$NON-NLS-1$
-
-	private static final String PROCESSES = SearchUIResources.searchResult_processes; //$NON-NLS-1$
-
-	private static final String CAPABILITY_PATTERNS = SearchUIResources.searchResult_capabilityPatterns; //$NON-NLS-1$
-
-	private static final String DELIVERY_PROCESSES = SearchUIResources.searchResult_deliveryProcesses; //$NON-NLS-1$
-
-	private static final Object[] EMPTY_LIST = new Object[0];
-
-	private TreeViewer treeViewer;
-
-	private MethodSearchResult searchResult;
-
-	private Map elementMap;
-
-	/**
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		if (inputElement instanceof MethodSearchResult) {
-			Object[] elements = ((MethodSearchResult) inputElement)
-					.getElements();
-			if (elements.length == 0) {
-				return EMPTY_LIST;
-			}
-			elementMap = new HashMap();
-			for (int i = 0; i < elements.length; i++) {
-				insert(elements[i], false);
-			}
-
-			insertUIFolders(inputElement);
-		}
-		return getChildren(inputElement);
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		if (newInput != null && newInput instanceof MethodSearchResult) {
-			treeViewer = (TreeViewer) viewer;
-			searchResult = (MethodSearchResult) newInput;
-		}
-	}
-
-	public void elementsChanged(Object[] updatedElements) {
-		for (int i = 0; i < updatedElements.length; i++) {
-			if (searchResult.getMatchCount(updatedElements[i]) > 0) {
-				if (treeViewer.testFindItem(updatedElements[i]) != null) {
-					insert(updatedElements[i], true);
-				} else {
-					remove(updatedElements[i], true);
-				}
-			} else {
-				treeViewer.remove(updatedElements[i]);
-			}
-		}
-		treeViewer.refresh();
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		if (elementMap == null) {
-			return EMPTY_LIST;
-		}
-		Set children = (Set) elementMap.get(parentElement);
-		if (children == null) {
-			return EMPTY_LIST;
-		}
-		return children.toArray();
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(Object)
-	 */
-	public Object getParent(Object element) {
-		if (element instanceof MethodPlugin) {
-			return null;
-		} else if (element instanceof SearchResultUIFolder) {
-			return ((SearchResultUIFolder) element).getParent();
-		} else if (element instanceof ProcessPackage) {
-			ProcessPackage processPackage = (ProcessPackage) element;
-			Object parent = processPackage.eContainer();
-			if (parent instanceof ProcessComponent) {
-				ProcessComponent processComponent = (ProcessComponent) parent;
-				return processComponent.getProcess();
-			} else {
-				return parent;
-			}
-		} else if (element instanceof MethodPackage) {
-			MethodPackage methodPackage = (MethodPackage) element;
-			Object parent = methodPackage.eContainer();
-			if (parent instanceof MethodPlugin) {
-				return parent;
-			}
-			MethodPackage parentPackage = methodPackage.getParentPackage();
-			return parentPackage;
-		} else if (element instanceof Artifact) {
-			Artifact artifact = (Artifact) element;
-			Artifact containerArtifact = artifact.getContainerArtifact();
-			if (containerArtifact != null) {
-				return containerArtifact;
-			} else {
-				return UmaUtil.getContentPackage(artifact);
-			}
-		} else if (element instanceof Practice) {
-			Practice practice = (Practice) element;
-			return practice.getContainer();
-		} else if (element instanceof Discipline) {
-			Discipline discipline = (Discipline) element;
-			return discipline.getContainer();			
-		} else if (element instanceof Domain) {
-			Domain domain = (Domain) element;
-			return domain.getContainer();
-		} else if (element instanceof ContentElement) {
-			return UmaUtil.getContentPackage((ContentElement) element);
-		} else if (element instanceof Process) {
-			Process process = (Process) element;
-			ProcessPackage parent = (ProcessPackage) process.eContainer();
-			if (parent != null) {
-				return parent.eContainer();
-			}
-		} else if (element instanceof Activity) {
-			ProcessPackage processPackage = UmaUtil
-					.getProcessPackage((ProcessElement) element);
-			if (processPackage != null) {
-				ProcessPackage parentPackage = (ProcessPackage) processPackage
-						.getParentPackage();
-				if (parentPackage != null) {
-					if (parentPackage instanceof ProcessComponent) {
-						ProcessComponent processComponent = (ProcessComponent) parentPackage;
-						return processComponent.getProcess();
-					}
-					List processElements = parentPackage.getProcessElements();
-					for (Iterator i = processElements.iterator(); i.hasNext();) {
-						ProcessElement processElement = (ProcessElement) i
-								.next();
-						if (processElement instanceof Activity
-								&& processElement.getName().equals(
-										parentPackage.getName())) {
-							return processElement;
-						}
-					}
-				}
-			}
-		} else if (element instanceof ProcessElement) {
-			ProcessPackage processPackage = UmaUtil
-					.getProcessPackage((ProcessElement) element);
-			if (processPackage != null) {
-				if (processPackage instanceof ProcessComponent) {
-					ProcessComponent processComponent = (ProcessComponent) processPackage;
-					return processComponent.getProcess();
-				}
-				List processElements = processPackage.getProcessElements();
-				for (Iterator i = processElements.iterator(); i.hasNext();) {
-					ProcessElement processElement = (ProcessElement) i.next();
-					if (processElement instanceof Activity
-							&& processElement.getName().equals(
-									processPackage.getName())) {
-						return processElement;
-					}
-				}
-				return processPackage;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(Object)
-	 */
-	public boolean hasChildren(Object element) {
-		return getChildren(element).length > 0;
-	}
-
-	public void clear() {
-		treeViewer.refresh();
-	}
-
-	public void dispose() {
-	}
-
-	protected void insert(Object child, boolean refreshViewer) {
-		Object parent = getParent(child);
-		while (parent != null) {
-			if (insertChild(parent, child)) {
-				if (refreshViewer) {
-					treeViewer.add(parent, child);
-				}
-			} else {
-				if (refreshViewer) {
-					treeViewer.refresh(parent);
-				}
-				return;
-			}
-			child = parent;
-			parent = getParent(child);
-		}
-		if (insertChild(searchResult, child)) {
-			if (refreshViewer) {
-				treeViewer.add(searchResult, child);
-			}
-		}
-	}
-
-	protected boolean insertChild(Object parent, Object child) {
-		Set children = (Set) elementMap.get(parent);
-		if (children == null) {
-			children = new HashSet();
-			elementMap.put(parent, children);
-		}
-		return children.add(child);
-	}
-
-	protected void replace(Object parent, Object child, Object newChild) {
-		insert(newChild, false);
-		elementMap.put(newChild, (Set) elementMap.get(child));
-		elementMap.remove(child);
-		Set children = (Set) elementMap.get(parent);
-		children.remove(child);
-	}
-
-	protected void remove(Object element, boolean refreshViewer) {
-		if (hasChildren(element)) {
-			if (refreshViewer) {
-				treeViewer.refresh(element);
-			}
-		} else {
-			if (searchResult.getMatchCount(element) == 0) {
-				elementMap.remove(element);
-				Object parent = getParent(element);
-				if (parent != null) {
-					removeFromSiblings(element, parent);
-					remove(parent, refreshViewer);
-				} else {
-					removeFromSiblings(element, searchResult);
-					if (refreshViewer) {
-						treeViewer.refresh();
-					}
-				}
-			} else {
-				if (refreshViewer) {
-					treeViewer.refresh(element);
-				}
-			}
-		}
-	}
-
-	protected void removeFromSiblings(Object element, Object parent) {
-		Set siblings = (Set) elementMap.get(parent);
-		if (siblings != null) {
-			siblings.remove(element);
-		}
-	}
-
-	/**
-	 * Inserts the UI folders into the search result tree.
-	 */
-	protected void insertUIFolders(Object inputElement) {
-		Object[] elements = getChildren(inputElement);
-		for (int i = 0; i < elements.length; i++) {
-			Object element = elements[i];
-			if (element instanceof MethodPlugin) {
-				SearchResultUIFolder methodContentFolder = new SearchResultUIFolder(
-						METHOD_CONTENT, LibraryEditPlugin.INSTANCE
-								.getImage("full/obj16/Content"), element); //$NON-NLS-1$
-				SearchResultUIFolder processesFolder = new SearchResultUIFolder(
-						PROCESSES, LibraryEditPlugin.INSTANCE
-								.getImage("full/obj16/Processes"), element); //$NON-NLS-1$
-				Object[] methodPackages = getChildren(element);
-				for (int j = 0; j < methodPackages.length; j++) {
-					Object methodPackage = methodPackages[j];
-					if (methodPackage instanceof ContentPackage
-							&& ((ContentPackage) methodPackage).getName()
-									.equals(PKG_NAME_CONTENT)) {
-						Object[] packages = getChildren(methodPackage);
-						for (int k = 0; k < packages.length; k++) {
-							Object pkg = packages[k];
-							if (pkg instanceof ContentPackage) {
-								if (((ContentPackage) pkg).getName().equals(
-										PKG_NAME_CORE_CONTENT)) {
-									replace(
-											element,
-											pkg,
-											new SearchResultUIFolder(
-													CONTENT_PACKAGES,
-													LibraryEditPlugin.INSTANCE
-															.getImage("full/obj16/MethodPackages"), methodContentFolder)); //$NON-NLS-1$
-								} else if (((ContentPackage) pkg).getName()
-										.equals(PKG_NAME_CATEGORIES)) {
-									SearchResultUIFolder standardCategoriesFolder = new SearchResultUIFolder(
-											STANDARD_CATEGORIES,
-											LibraryEditPlugin.INSTANCE
-													.getImage("full/obj16/StandardCategories"), methodContentFolder); //$NON-NLS-1$
-									SearchResultUIFolder customCategoriesFolder = new SearchResultUIFolder(
-											CUSTOM_CATEGORIES,
-											LibraryEditPlugin.INSTANCE
-													.getImage("full/obj16/CustomCategories"), methodContentFolder); //$NON-NLS-1$
-									Object[] contentPackages = getChildren(pkg);
-									for (int l = 0; l < contentPackages.length; l++) {
-										Object contentPackage = contentPackages[l];
-										if (contentPackage instanceof ContentPackage) {
-											String pkgName = ((ContentPackage) contentPackage)
-													.getName();
-											if (pkgName
-													.equals(PKG_NAME_CUSTOM_CATEGORIES)) {
-												insert(customCategoriesFolder,
-														false);
-												elementMap
-														.put(
-																customCategoriesFolder,
-																(Set) elementMap
-																		.get(contentPackage));
-											} else if (pkgName
-													.equals(PKG_NAME_DISCIPLINES)) {
-												insert(
-														standardCategoriesFolder,
-														false);
-												replace(
-														element,
-														contentPackage,
-														new SearchResultUIFolder(
-																DISCIPLINES,
-																LibraryEditPlugin.INSTANCE
-																		.getImage("full/obj16/Disciplines"), standardCategoriesFolder)); //$NON-NLS-1$
-											} else if (pkgName
-													.equals(PKG_NAME_DOMAINS)) {
-												insert(
-														standardCategoriesFolder,
-														false);
-												replace(
-														element,
-														contentPackage,
-														new SearchResultUIFolder(
-																DOMAINS,
-																LibraryEditPlugin.INSTANCE
-																		.getImage("full/obj16/Domains"), standardCategoriesFolder)); //$NON-NLS-1$
-											} else if (pkgName
-													.equals(PKG_NAME_WORK_PRODUCT_TYPES)) {
-												insert(
-														standardCategoriesFolder,
-														false);
-												replace(
-														element,
-														contentPackage,
-														new SearchResultUIFolder(
-																WORK_PRODUCT_TYPES,
-																LibraryEditPlugin.INSTANCE
-																		.getImage("full/obj16/WorkProductTypes"), standardCategoriesFolder)); //$NON-NLS-1$
-											} else if (pkgName
-													.equals(PKG_NAME_ROLESETS)) {
-												insert(
-														standardCategoriesFolder,
-														false);
-												replace(
-														element,
-														contentPackage,
-														new SearchResultUIFolder(
-																ROLESETS,
-																LibraryEditPlugin.INSTANCE
-																		.getImage("full/obj16/Roles"), standardCategoriesFolder)); //$NON-NLS-1$
-											} else if (pkgName
-													.equals(PKG_NAME_TOOLS)) {
-												insert(
-														standardCategoriesFolder,
-														false);
-												replace(
-														element,
-														contentPackage,
-														new SearchResultUIFolder(
-																TOOLS,
-																LibraryEditPlugin.INSTANCE
-																		.getImage("full/obj16/Tools"), standardCategoriesFolder)); //$NON-NLS-1$
-											}
-										}
-									}
-									elementMap.remove(pkg);
-								}
-							} else if (pkg instanceof ProcessPackage
-									&& ((ProcessPackage) pkg).getName().equals(
-											PKG_NAME_CAPABILITY_PATTERNS)) {
-								replace(
-										element,
-										pkg,
-										new SearchResultUIFolder(
-												CAPABILITY_PATTERNS,
-												LibraryEditPlugin.INSTANCE
-														.getImage("full/obj16/CapabilityPatterns"), processesFolder)); //$NON-NLS-1$
-							}
-						}
-						Set children = (Set) elementMap.get(element);
-						children.remove(methodPackage);
-					} else if (methodPackage instanceof ProcessPackage
-							&& ((ProcessPackage) methodPackage).getName()
-									.equals(PKG_NAME_DELIVERY_PROCESSES)) {
-						replace(
-								element,
-								methodPackage,
-								new SearchResultUIFolder(
-										DELIVERY_PROCESSES,
-										LibraryEditPlugin.INSTANCE
-												.getImage("full/obj16/DeliveryProcesses"), processesFolder)); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/SearchResultUIFolder.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/SearchResultUIFolder.java
deleted file mode 100755
index 9cc90bb..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/SearchResultUIFolder.java
+++ /dev/null
@@ -1,118 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui.internal;
-
-import org.eclipse.epf.library.edit.LibraryEditPlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Models a UI folder in the method search result tree view.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class SearchResultUIFolder {
-
-	private static final Image DEFAULT_IMAGE = LibraryEditPlugin.INSTANCE
-			.getImage("full/obj16/Folder"); //$NON-NLS-1$
-
-	private String name;
-
-	private Image image;
-
-	private Object parent;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param name
-	 *            The name for the folder.
-	 */
-	public SearchResultUIFolder(String name) {
-		this(name, DEFAULT_IMAGE, null);
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param name
-	 *            a name for the folder
-	 * @param parent
-	 *            the parent object
-	 */
-	public SearchResultUIFolder(String name, Object parent) {
-		this(name, DEFAULT_IMAGE, parent);
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param name
-	 *            a name for the folder
-	 * @param image
-	 *            an image for the folder
-	 * @param parent
-	 *            the parent object
-	 */
-	public SearchResultUIFolder(String name, Image image, Object parent) {
-		this.name = name;
-		this.image = image;
-		this.parent = parent;
-	}
-
-	/**
-	 * Returns the name.
-	 * 
-	 * @return the folder name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Returns the image.
-	 * 
-	 * @return the image for a UI folder
-	 */
-	public Image getImage() {
-		return image;
-	}
-
-	/**
-	 * Returns the parent object.
-	 * 
-	 * @return the parent object for the folder
-	 */
-	public Object getParent() {
-		return parent;
-	}
-
-	/**
-	 * Sets the parent object.
-	 * 
-	 * @param parent
-	 *            the parent object
-	 * @return the given parent object
-	 */
-	public Object setParent(Object parent) {
-		return this.parent = parent;
-	}
-
-	/**
-	 * Returns the string representation of this object.
-	 * 
-	 * @return the folder name
-	 */
-	public String toString() {
-		return name;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/package.html b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/package.html
deleted file mode 100755
index 3fcbc2e..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/internal/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides implementation support for searching a method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/package.html b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/package.html
deleted file mode 100755
index 4d56121..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the implementation for searching a method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/preferences/SearchUIPreferences.java b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/preferences/SearchUIPreferences.java
deleted file mode 100755
index 9556145..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/preferences/SearchUIPreferences.java
+++ /dev/null
@@ -1,80 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.ui.preferences;
-
-import org.eclipse.epf.search.ui.SearchUIPlugin;
-
-/**
- * Manages the Search UI preferences.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class SearchUIPreferences {
-
-	/**
-	 * The Search UI preference keys.
-	 */
-	public static final String SEARCH_STRING = "searchString"; //$NON-NLS-1$
-
-	public static final String NAME_PATTERN = "namePattern"; //$NON-NLS-1$
-
-	public static final String CASE_SENSITIVE = "caseSensitive"; //$NON-NLS-1$	
-
-	/**
-	 * Returns the saved search string.
-	 */
-	public static String getSearchString() {
-		return SearchUIPlugin.getDefault().getPreferenceStore().getString(
-				SEARCH_STRING);
-	}
-
-	/**
-	 * Saves the current search string.
-	 */
-	public static void setSearchString(String searchString) {
-		SearchUIPlugin.getDefault().getPreferenceStore().setValue(
-				SEARCH_STRING, searchString);
-	}
-
-	/**
-	 * Returns the saved name pattern string.
-	 */
-	public static String getNamePattern() {
-		return SearchUIPlugin.getDefault().getPreferenceStore().getString(
-				NAME_PATTERN);
-	}
-
-	/**
-	 * Saves the current name pattern string.
-	 */
-	public static void setNamePattern(String namePattern) {
-		SearchUIPlugin.getDefault().getPreferenceStore().setValue(NAME_PATTERN,
-				namePattern);
-	}
-
-	/**
-	 * Returns the saved ase sensitive option.
-	 */
-	public static boolean getCaseSensitive() {
-		return SearchUIPlugin.getDefault().getPreferenceStore().getBoolean(
-				CASE_SENSITIVE);
-	}
-
-	/**
-	 * Saves the current case sensitive option.
-	 */
-	public static void setCaseSensitive(boolean caseSensitive) {
-		SearchUIPlugin.getDefault().getPreferenceStore().setValue(
-				CASE_SENSITIVE, caseSensitive);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/preferences/package.html b/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/preferences/package.html
deleted file mode 100755
index 51039ed..0000000
--- a/plugins/org.eclipse.epf.search.ui/src/org/eclipse/epf/search/ui/preferences/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides preference support for searching a method library.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/.classpath b/plugins/org.eclipse.epf.search/.classpath
deleted file mode 100755
index 065ac06..0000000
--- a/plugins/org.eclipse.epf.search/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.search/.cvsignore b/plugins/org.eclipse.epf.search/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.search/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.search/.project b/plugins/org.eclipse.epf.search/.project
deleted file mode 100755
index bda53ad..0000000
--- a/plugins/org.eclipse.epf.search/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.search</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/plugins/org.eclipse.epf.search/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.search/META-INF/MANIFEST.MF
deleted file mode 100755
index b20d6c6..0000000
--- a/plugins/org.eclipse.epf.search/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.search
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.epf.search.SearchPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: com.ibm.icu,
- org.eclipse.core.runtime,
- org.eclipse.epf.library;visibility:=reexport,
- org.apache.lucene;visibility:=reexport,
- org.eclipse.search,
- org.eclipse.ui
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.search,
- org.eclipse.epf.search.analysis,
- org.eclipse.epf.search.configuration
diff --git a/plugins/org.eclipse.epf.search/build.properties b/plugins/org.eclipse.epf.search/build.properties
deleted file mode 100755
index 97d6f55..0000000
--- a/plugins/org.eclipse.epf.search/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               plugin.properties
-
diff --git a/plugins/org.eclipse.epf.search/plugin.properties b/plugins/org.eclipse.epf.search/plugin.properties
deleted file mode 100755
index 6fc7031..0000000
--- a/plugins/org.eclipse.epf.search/plugin.properties
+++ /dev/null
@@ -1,16 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Search
-providerName=Eclipse.org
-               
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/GenerateSearchIndexException.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/GenerateSearchIndexException.java
deleted file mode 100755
index cf6e7c1..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/GenerateSearchIndexException.java
+++ /dev/null
@@ -1,63 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search;
-
-/**
- * Signals that a search index generation operation has failed.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class GenerateSearchIndexException extends SearchServiceException {
-
-	private static final long serialVersionUID = 6537405211451177110L;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public GenerateSearchIndexException() {
-		super();
-	}
-
-	/**
-	 * Creates a new instance given the root cause of the exception.
-	 * 
-	 * @param rootCause
-	 *            the root cause of the exception
-	 */
-	public GenerateSearchIndexException(Throwable rootCause) {
-		super(rootCause);
-	}
-
-	/**
-	 * Creates a new instance given the error message.
-	 * 
-	 * @param errorMsg
-	 *            the error message
-	 */
-	public GenerateSearchIndexException(String errorMsg) {
-		super(errorMsg);
-	}
-
-	/**
-	 * Creates a new instance given the root cause of the exception and the
-	 * error message.
-	 * 
-	 * @param rootCause
-	 *            the root cause of the exception
-	 * @param errorMsg
-	 *            the error message
-	 */
-	public GenerateSearchIndexException(Throwable rootCause, String errorMsg) {
-		super(rootCause, errorMsg);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/ISearchService.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/ISearchService.java
deleted file mode 100755
index b09a215..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/ISearchService.java
+++ /dev/null
@@ -1,38 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search;
-
-import org.eclipse.epf.search.configuration.ConfigurationHitEntry;
-import org.eclipse.epf.search.configuration.ConfigurationSearchQuery;
-
-/**
- * The Search Service API.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public interface ISearchService {
-
-	/**
-	 * Searches a published configuration.
-	 * 
-	 * @param path
-	 *            an absolute path to a published configuration
-	 * @param searchQuery
-	 *            a configuration search query
-	 * @return an array of <code>ConfigurationHitEntry</code> objects
-	 * @throws SearchServiceException
-	 *             if an error occurs while executing the operation
-	 */
-	public ConfigurationHitEntry[] searchConfiguration(String path,
-			ConfigurationSearchQuery searchQuery) throws SearchServiceException;
-
-}
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/IndexBuilder.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/IndexBuilder.java
deleted file mode 100755
index ae82ff1..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/IndexBuilder.java
+++ /dev/null
@@ -1,365 +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.search;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.store.RAMDirectory;
-import org.eclipse.epf.search.analysis.TextAnalyzer;
-import org.eclipse.epf.search.utils.LHTMLParser;
-import org.eclipse.epf.search.utils.JarCreator;
-import org.eclipse.epf.search.utils.UNCUtil;
-
-/**
- * This class is the main class that creates the Index from the file
- * associations in the process layout.
- */
-public class IndexBuilder {
-	static final String VERSION_FILE_NAME = "version.txt"; //$NON-NLS-1$
-	static final String VERSION_DELIMITER = "*"; //$NON-NLS-1$
-
-	/**
-	 * Document fields.
-	 */
-	public static final String BRIEF_DESCRIPTION_FIELD = "briefDescription"; //$NON-NLS-1$
-	public static final String CONTENT_FIELD = "contents"; //$NON-NLS-1$
-	public static final String ID_FIELD = "id"; //$NON-NLS-1$
-	public static final String MODIFIED_FIELD = "modified"; //$NON-NLS-1$
-	public static final String NAME_FIELD = "name"; //$NON-NLS-1$
-	public static final String ROLE_FIELD = "role"; //$NON-NLS-1$
-	public static final String SUMMARY_FIELD = "summary"; //$NON-NLS-1$
-	public static final String TYPE_FIELD = "type"; //$NON-NLS-1$
-	public static final String URL_FIELD = "url"; //$NON-NLS-1$
-	private static final String TITLE_FIELD = "title"; //$NON-NLS-1$
-	private static final String UMA_ELEMENT_TYPE_FIELD = "uma.type"; //$NON-NLS-1$
-	public static final String GENERAL_CONTENT = "general_content"; //$NON-NLS-1$
-
-	// List of UMA elements that should be included in the search index.
-	private static List NO_SEARCHEABLE_UMA_ELEMENTS = new ArrayList();
-	static {
-		NO_SEARCHEABLE_UMA_ELEMENTS.add("summary");
-		NO_SEARCHEABLE_UMA_ELEMENTS.add("workproductdescriptor");
-		NO_SEARCHEABLE_UMA_ELEMENTS.add("taskdescriptor");
-		NO_SEARCHEABLE_UMA_ELEMENTS.add("roledescriptor");
-	}
-
-	// A list of top level directories that should be excluded from the search
-	// index.
-	private java.util.List dirsToSkip = new ArrayList();
-	private String pDirectory = null;
-	private StringBuffer indexFolder = null;
-	private String productName = null;
-
-	public IndexBuilder(String publishDir) {
-		int appletIndex = -1;
-		if (publishDir == null)
-			return;
-
-		appletIndex = publishDir.indexOf(File.separator + "applet");
-
-		pDirectory = UNCUtil.convertFilename((appletIndex > -1) ? publishDir
-				.substring(0, appletIndex + 1) : publishDir);
-		String siteName = pDirectory.replace(File.separatorChar, '/');
-		int index = siteName.length();
-		if (siteName.endsWith("/")) //$NON-NLS-1$
-		{
-			index = index - 1;
-		}
-
-		int index2 = siteName.lastIndexOf("/", index - 1); //$NON-NLS-1$
-
-		productName = siteName.substring(index2 + 1, index);
-
-		// create the index
-		StringBuffer searchFolder = new StringBuffer(pDirectory);
-		if (!searchFolder.toString().endsWith(File.separator)) {
-			searchFolder.append(File.separator);
-		}
-		searchFolder.append("search"); //$NON-NLS-2$
-
-		indexFolder = new StringBuffer(searchFolder.toString());
-		indexFolder.append(File.separator).append("index"); //$NON-NLS-1$
-
-		dirsToSkip.add(pDirectory + "applet"); //$NON-NLS-1$
-		dirsToSkip.add(pDirectory + "css"); //$NON-NLS-1$
-		dirsToSkip.add(pDirectory + "ext_help"); //$NON-NLS-1$		
-		dirsToSkip.add(pDirectory + "icons"); //$NON-NLS-1$
-		dirsToSkip.add(pDirectory + "images"); //$NON-NLS-1$
-		dirsToSkip.add(pDirectory + "index"); //$NON-NLS-1$
-		dirsToSkip.add(pDirectory + "logs"); //$NON-NLS-1$
-		dirsToSkip.add(pDirectory + "manuals"); //$NON-NLS-1$		
-		dirsToSkip.add(pDirectory + "noapplet"); //$NON-NLS-1$
-		dirsToSkip.add(pDirectory + "pages_not_installed"); //$NON-NLS-1$
-		dirsToSkip.add(pDirectory + "process"); //$NON-NLS-1$		
-		dirsToSkip.add(pDirectory + "scripts"); //$NON-NLS-1$
-		dirsToSkip.add(pDirectory + "stylesheets"); //$NON-NLS-1$
-		dirsToSkip.add(pDirectory + "xml"); //$NON-NLS-1$
-		dirsToSkip.add(pDirectory + "search"); //$NON-NLS-1$
-	}
-
-	public boolean createIndex(boolean jarIt) throws SearchServiceException {
-		synchronized (IndexBuilder.class) {
-
-			if (indexFolder == null || pDirectory == null) {
-				throw new IllegalStateException(
-						"Invalid indexFolder or pDirectory"); //$NON-NLS-1$
-			}
-
-			try {
-				RAMDirectory ramDir = new RAMDirectory();
-
-				IndexWriter fsWriter = new IndexWriter(FSDirectory
-						.getDirectory(indexFolder.toString(), true),
-						new TextAnalyzer(), true);
-
-				IndexWriter ramWriter = new IndexWriter(ramDir,
-						new TextAnalyzer(), true);
-
-				if ((fsWriter != null)) {
-					// fsWriter.mergeFactor = 1000;
-					// fsWriter.maxMergeDocs = 10000;
-					fsWriter.maxFieldLength = 1000000;
-
-					indexDocs(new File(pDirectory), ramWriter);
-
-					fsWriter.addIndexes(new Directory[] { ramDir });
-					fsWriter.optimize();
-					ramWriter.close();
-					fsWriter.close();
-				}
-			} catch (Exception e) {
-				System.out.println(e.getMessage());
-				System.out.println("createIndex");
-				e.printStackTrace();
-			}
-
-			System.out.println("index created successfully"); //$NON-NLS-1$
-			
-			// create the version file.
-			Date today = new Date();
-			long milliseconds = today.getTime();
-			
-			if (!jarIt) {
-				try {
-					FileWriter fw = new FileWriter(indexFolder + File.separator
-							+ VERSION_FILE_NAME);
-					BufferedWriter bw = new BufferedWriter(fw);
-					bw.write(productName + VERSION_DELIMITER + milliseconds +
-							"\n"); //$NON-NLS-1$
-					bw.close();
-					fw.close();
-				} catch (IOException ioe) {
-					throw new SearchServiceException(
-							SearchResources.createSearchIndexError);
-				}
-				
-				return true;
-			}
-
-			// jar up the created index.
-			JarCreator.jarFolder(indexFolder.toString());
-
-			System.out.println("index Jarred successfully"); //$NON-NLS-1$
-
-			try {
-				// delete the files now that they've been jarred.
-				File indexDir = new File(indexFolder.toString());
-				File[] files = indexDir.listFiles();
-				for (int i = 0; i < files.length; i++) {
-					File tempFile = files[i];
-					if (!tempFile.getName().equals(JarCreator.INDEX_JAR)) {
-						tempFile.delete();
-					}
-				}	
-
-				// String rupName = publishDir.substring(index);
-				File newIndexJar = new File(indexFolder + File.separator
-						+ JarCreator.INDEX_JAR);
-				if (newIndexJar.exists()) {
-					String fileSize = "" + newIndexJar.length(); //$NON-NLS-1$
-					FileWriter fw = new FileWriter(indexFolder + File.separator
-							+ VERSION_FILE_NAME);
-					BufferedWriter bw = new BufferedWriter(fw);
-					bw.write(productName + VERSION_DELIMITER + milliseconds
-							+ VERSION_DELIMITER + fileSize + "\n"); //$NON-NLS-1$
-					bw.close();
-					fw.close();
-				} else {
-					throw new SearchServiceException(
-							SearchResources.createSearchIndexError);
-				}
-			} catch (IOException ioe) {
-				throw new SearchServiceException(
-						SearchResources.createSearchIndexError);
-			}
-
-			return true;
-		}
-	}
-
-	/**
-	 * Index the actual documents specified by the files and recursively get all
-	 * file in the specified folder file
-	 * 
-	 */
-	private void indexDocs(File file, IndexWriter writer) throws Exception {
-		if (dirsToSkip.contains(file.getAbsolutePath())) {
-			return;
-		}
-		if (file.isDirectory()) {
-			String[] files = file.list();
-			for (int i = 0; i < files.length; i++) {
-				indexDocs(new File(file, files[i]), writer);
-			}
-		} else if (isHtmlDoc(file)) {
-			if (shouldBeExcluded(file)) {
-				return;
-			}
-			try {
-				Document doc = getHTMLDocument(file);
-
-				if (doc != null) {
-					writer.addDocument(doc);
-				}
-			} catch (Exception e1) {
-				System.out.println(file.getName());
-				System.out.println("indexDocs");
-				e1.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * Checks whether the given file should be excluded from the search index.
-	 * 
-	 * @param file
-	 *            The file to be verified.
-	 * @return <code>true</code> if the given file should be excluded from the
-	 *         search index.
-	 */
-	private boolean shouldBeExcluded(File file) {
-		String path = file.getParentFile().getAbsolutePath();
-		if (pDirectory.startsWith(path)) {
-			return true;
-		}
-
-		return false;
-	}
-
-	private static boolean isHtmlDoc(File file) {
-		String path = file.getPath();
-		return path.endsWith(".html") || path.endsWith(".htm"); //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	private Document getHTMLDocument(File file) {
-		Document luceneDocument = new Document();
-
-		String url = file.getPath().replace(File.pathSeparatorChar, '/');
-		luceneDocument.add(Field.UnIndexed(URL_FIELD, url));
-
-		try {
-			LHTMLParser parser = new LHTMLParser(new InputStreamReader(
-					new FileInputStream(file), "UTF-8")); //$NON-NLS-1$
-
-			Reader reader = parser.getReader();
-			if (reader != null) {
-				luceneDocument.add(Field.Text(CONTENT_FIELD, reader));
-			} else {
-				return null;
-			}
-
-			String title = parser.getTitle();
-			if (title != null && title.length() > 0) {
-				// Workaround a Linux specific issue.
-				title = title.replaceAll("\\xa0", " "); //$NON-NLS-1$ //$NON-NLS-2$
-				luceneDocument.add(Field.Text(TITLE_FIELD, title));
-			} else {
-				return null;
-			}
-
-			String summary = parser.getSummary();
-			if (summary.startsWith(title)) {
-				luceneDocument.add(Field.UnIndexed(SUMMARY_FIELD, summary
-						.substring(title.length() + 1)));
-			} else
-				luceneDocument.add(Field.UnIndexed(SUMMARY_FIELD, parser
-						.getSummary()));
-
-			Properties metaTags = parser.getMetaTags();
-			for (Enumeration names = metaTags.propertyNames(); names
-					.hasMoreElements();) {
-				String tagName = (String) names.nextElement();
-				if (tagName != null) {
-					if (tagName.equals(ROLE_FIELD)) {
-						String roleName = metaTags.getProperty(tagName);
-						if (roleName != null) {
-							luceneDocument.add(Field.Text(tagName, roleName));
-						}
-					} else {
-						String tagValue = metaTags.getProperty(tagName);
-						if (tagValue != null) {
-							luceneDocument.add(Field.Text(tagName, tagValue));
-						}
-					}
-				}
-			}
-
-			if (luceneDocument.getField(ROLE_FIELD) == null) {
-				// Default to "na" to support searching for files without
-				// role meta tags.
-				luceneDocument.add(Field.Text(ROLE_FIELD, "NORUPROLE")); //$NON-NLS-1$
-			}
-
-			Field umaTypeField = luceneDocument
-					.getField(UMA_ELEMENT_TYPE_FIELD);
-			if (umaTypeField == null) {
-				// Default to general content.
-				luceneDocument.add(Field.Text(UMA_ELEMENT_TYPE_FIELD,
-						GENERAL_CONTENT));
-			} else if (NO_SEARCHEABLE_UMA_ELEMENTS.contains(umaTypeField
-					.stringValue())) {
-				// Exclude non-searcheable elements from the search
-				// index.
-				return null;
-			}
-
-			parser = null;
-
-		} catch (Exception e) {
-			luceneDocument = null;
-			System.out.println("getHTMLDocument");
-			e.printStackTrace();
-		}
-
-		return luceneDocument;
-	}
-
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/Resources.properties b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/Resources.properties
deleted file mode 100755
index fe6ab62..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/Resources.properties
+++ /dev/null
@@ -1,19 +0,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 implementationCorporation. All Rights Reserved.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Indexing progress monitor
-indexConfigFilesTask_name=Indexing configuration files...
-
-# Error Details
-createSearchIndexError=The search index file was not created.
-
-
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/SearchConfigurationException.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/SearchConfigurationException.java
deleted file mode 100755
index 692a91d..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/SearchConfigurationException.java
+++ /dev/null
@@ -1,63 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search;
-
-/**
- * Signals that a search configuration operation has failed.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class SearchConfigurationException extends SearchServiceException {
-
-	private static final long serialVersionUID = 6537405211451177110L;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SearchConfigurationException() {
-		super();
-	}
-
-	/**
-	 * Creates a new instance given the root cause of the exception.
-	 * 
-	 * @param rootCause
-	 *            the root cause of the exception
-	 */
-	public SearchConfigurationException(Throwable rootCause) {
-		super(rootCause);
-	}
-
-	/**
-	 * Creates a new instance given the error message.
-	 * 
-	 * @param errorMsg
-	 *            the error message
-	 */
-	public SearchConfigurationException(String errorMsg) {
-		super(errorMsg);
-	}
-
-	/**
-	 * Creates a new instance given the root cause of the exception and the
-	 * error message.
-	 * 
-	 * @param rootCause
-	 *            the root cause of the exception
-	 * @param errorMsg
-	 *            the error message
-	 */
-	public SearchConfigurationException(Throwable rootCause, String errorMsg) {
-		super(rootCause, errorMsg);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/SearchPlugin.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/SearchPlugin.java
deleted file mode 100755
index 9b6eab6..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/SearchPlugin.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search;
-
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The Search plug-in activator.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public final class SearchPlugin extends AbstractPlugin {
-
-	// The shared plug-in instance.
-	private static SearchPlugin plugin;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SearchPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * @see AbstractPlugin#start(BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * @see AbstractPlugin#start(BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared plug-in instance.
-	 */
-	public static SearchPlugin getDefault() {	
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/SearchResources.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/SearchResources.java
deleted file mode 100755
index e1b7b79..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/SearchResources.java
+++ /dev/null
@@ -1,38 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The Search resource bundle.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public final class SearchResources extends NLS {
-
-	private static String BUNDLE_NAME = SearchResources.class.getPackage()
-			.getName()
-			+ ".Resources"; //$NON-NLS-1$
-
-	public static String indexConfigFilesTask_name;
-	public static String createSearchIndexError;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, SearchResources.class);
-	}
-
-	private SearchResources() {
-		// Do not instantiate
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/SearchService.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/SearchService.java
deleted file mode 100755
index 468de94..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/SearchService.java
+++ /dev/null
@@ -1,103 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search;
-
-import java.io.File;
-
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.common.utils.ZipUtil;
-import org.eclipse.epf.search.configuration.ConfigurationHitEntry;
-import org.eclipse.epf.search.configuration.ConfigurationSearchQuery;
-import org.eclipse.epf.search.configuration.internal.ConfigurationSearchService;
-
-
-/**
- * The Search Service implementation.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class SearchService implements ISearchService {
-
-	// The shared instance.
-	private static SearchService instance = null;
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static SearchService getInstance() {
-		if (instance == null) {
-			synchronized (SearchService.class) {
-				if (instance == null) {
-					instance = new SearchService();
-				}
-			}
-		}
-		return instance;
-	}
-
-	/**
-	 * Private constructor to prevent this class from being instantiated.
-	 */
-	private SearchService() {
-	}
-
-	/**
-	 * Searches a published Configuration.
-	 * 
-	 * @param path
-	 *            the absolute path to the published configuration
-	 * @param searchQuery
-	 *            the configuration search query
-	 * @return an array of <code>ConfigurationHitEntry</code> objects
-	 * @throws SearchServiceException
-	 *             if an error occurs while executing the operation
-	 */
-	public ConfigurationHitEntry[] searchConfiguration(String path,
-			ConfigurationSearchQuery searchQuery) throws SearchServiceException {
-		ConfigurationSearchService service = new ConfigurationSearchService(
-				path);
-		service.index();
-		return service.search(searchQuery);
-	}
-	
-	public boolean createIndex(String publishDir) throws SearchServiceException {
-		IndexBuilder service = new IndexBuilder(publishDir);
-		return service.createIndex(true);
-	}
-	
-	public boolean createIndex(String publishDir, boolean jarIt) throws SearchServiceException {
-		IndexBuilder service = new IndexBuilder(publishDir);
-		return service.createIndex(jarIt);
-	}
-	
-	public void createWAR(String publishDir, String webAppName) {
-		try {
-			StringBuffer dir2war = new StringBuffer((publishDir.endsWith(File.separator)) ? 
-					publishDir.substring(0, publishDir.length()-1) :
-						publishDir);
-			
-			dir2war.append("_WAR").append(File.separator);
-			File warDir = new File(dir2war.toString());
-			if (!warDir.exists()) {
-				warDir.mkdirs();
-			} else {
-				FileUtil.deleteAllFiles(warDir.getAbsolutePath());
-			}
-			
-			String warFile = dir2war.append(webAppName).append(".war").toString();
-				
-			ZipUtil.createZipFile(warFile, publishDir, null);
-		} catch(Exception e) {
-			
-		}
-	}	
-}
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/SearchServiceException.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/SearchServiceException.java
deleted file mode 100755
index 125a2c2..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/SearchServiceException.java
+++ /dev/null
@@ -1,84 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search;
-
-/**
- * Signals that a Search Service operation has failed.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class SearchServiceException extends Exception {
-
-	private static final long serialVersionUID = -9063302180869157316L;
-
-	/**
-	 * The root cause of the exception.
-	 */
-	protected Throwable rootCause;
-
-	/**
-	 * The error message associated with the exception.
-	 */
-	protected String errorMsg;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public SearchServiceException() {
-		super();
-	}
-
-	/**
-	 * Creates a new instance given the root cause of the exception.
-	 * 
-	 * @param rootCause
-	 *            the root cause of the exception
-	 */
-	public SearchServiceException(Throwable rootCause) {
-		this(rootCause, rootCause.getMessage());
-	}
-
-	/**
-	 * Creates a new instance given the error message.
-	 * 
-	 * @param errorMsg
-	 *            the error message
-	 */
-	public SearchServiceException(String errorMsg) {
-		this(null, errorMsg);
-	}
-
-	/**
-	 * Creates a new instance given the root cause of the exception and the
-	 * error message.
-	 * 
-	 * @param rootCause
-	 *            the root cause of the exception
-	 * @param errorMsg
-	 *            the error message
-	 */
-	public SearchServiceException(Throwable rootCause, String errorMsg) {
-		super();
-		this.rootCause = rootCause;
-		this.errorMsg = errorMsg;
-	}
-
-	/**
-	 * Returns the root cause of the exception.
-	 * 
-	 * @return the root cause of the exception
-	 */
-	public Throwable getRootCause() {
-		return rootCause;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/analysis/StopWords.properties b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/analysis/StopWords.properties
deleted file mode 100755
index 005fa2d..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/analysis/StopWords.properties
+++ /dev/null
@@ -1,20 +0,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 implementationCorporation. All Rights Reserved.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Search Stop Words
-Search.stopWords=\
-a, about, an, and, are, as, at, be, but, by, for, from, how, \
-i, if, in, into, is, it, no, not, of, on, or, s, such, \
-t, that, the, their, then, there, these, they, this, to, \
-was, what, when, where, who, will, with
-
-
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/analysis/TextAnalyzer.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/analysis/TextAnalyzer.java
deleted file mode 100755
index ee803e1..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/analysis/TextAnalyzer.java
+++ /dev/null
@@ -1,41 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.analysis;
-
-import java.io.Reader;
-
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.TokenStream;
-
-/**
- * A text analyzer that handles Unicode 4.1 characters.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class TextAnalyzer extends Analyzer {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public TextAnalyzer() {
-		super();
-	}
-
-	/**
-	 * @see org.apache.lucene.analysis.Analyzer#tokenStream(String, Reader)
-	 */
-	public final TokenStream tokenStream(String fieldName, Reader reader) {
-		TokenStream result = new TextTokenizer(reader);
-		return new TextFilter(result);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/analysis/TextFilter.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/analysis/TextFilter.java
deleted file mode 100755
index e19dddd..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/analysis/TextFilter.java
+++ /dev/null
@@ -1,74 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.analysis;
-
-import java.io.IOException;
-import java.util.ResourceBundle;
-import java.util.Set;
-
-import org.apache.lucene.analysis.StopAnalyzer;
-import org.apache.lucene.analysis.StopFilter;
-import org.apache.lucene.analysis.Token;
-import org.apache.lucene.analysis.TokenFilter;
-import org.apache.lucene.analysis.TokenStream;
-import org.eclipse.epf.common.utils.StrUtil;
-
-/**
- * A text filter that handles Unicode 4.1 characters.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public final class TextFilter extends TokenFilter {
-
-	private static Set stopWords = null;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public TextFilter(TokenStream in) {
-		super(in);
-		if (stopWords == null) {
-			loadStopWords();
-		}
-	}
-
-	/**
-	 * @see org.apache.lucene.analysis.TokenStream#next()
-	 */
-	public final Token next() throws IOException {
-		for (Token token = input.next(); token != null; token = input.next()) {
-			String tokenText = token.termText();
-			if (!stopWords.contains(tokenText)) {
-				return token;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Loads the stop words defined in the StopWords.properties file.
-	 */
-	private void loadStopWords() {
-		String[] words = null;
-		try {
-			ResourceBundle bundle = ResourceBundle.getBundle(TextFilter.class
-					.getPackage().getName()
-					+ ".StopWords"); //$NON-NLS-1$				
-			String property = bundle.getString("Search.stopWords"); //$NON-NLS-1$
-			words = StrUtil.split(property, " ,"); //$NON-NLS-1$		
-		} catch (Exception e) {
-			words = StopAnalyzer.ENGLISH_STOP_WORDS;
-		}
-		stopWords = StopFilter.makeStopSet(words);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/analysis/TextTokenizer.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/analysis/TextTokenizer.java
deleted file mode 100755
index a5f335b..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/analysis/TextTokenizer.java
+++ /dev/null
@@ -1,83 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.analysis;
-
-import java.io.IOException;
-import java.io.Reader;
-
-import org.apache.lucene.analysis.Token;
-import org.apache.lucene.analysis.Tokenizer;
-
-import com.ibm.icu.text.BreakIterator;
-
-/**
- * A text tokenizer that uses ICU4J to segment text into words.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public final class TextTokenizer extends Tokenizer {
-
-	private final static int BUFFER_SIZE = 4096;
-
-	private String text;
-
-	private BreakIterator iterator;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param reader
-	 *            the text source
-	 */
-	public TextTokenizer(Reader reader) {
-		super(reader);
-		StringBuffer textBuffer = new StringBuffer(BUFFER_SIZE);
-		char[] buffer = new char[BUFFER_SIZE];
-		int charsRead;
-		try {
-			while ((charsRead = reader.read(buffer, 0, BUFFER_SIZE)) > 0) {
-				textBuffer.append(buffer, 0, charsRead);
-			}
-			text = textBuffer.toString();
-			iterator = BreakIterator.getWordInstance();
-			iterator.setText(text);
-		} catch (IOException e) {
-			iterator = null;
-		}
-	}
-
-	/**
-	 * @see org.apache.lucene.analysis.TokenStream#next()
-	 */
-	public final Token next() throws IOException {
-		if (iterator != null) {
-			while (true) {
-				int start = iterator.current();
-				int end = iterator.next();
-				if (end != BreakIterator.DONE) {
-					String tokenText = text.substring(start, end).toLowerCase();
-					if (!tokenText.equals(" ")) { //$NON-NLS-1$
-						if (tokenText.endsWith("'s")) { //$NON-NLS-1$
-							tokenText = tokenText.substring(0, tokenText
-									.length() - 2);
-						}
-						return new Token(tokenText, 0, tokenText.length());
-					}
-				} else {
-					return null;
-				}
-			}
-		}
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/analysis/package.html b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/analysis/package.html
deleted file mode 100755
index d4f42f9..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/analysis/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the text analyser, tokenizer and filter for indexing a published configuration.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/configuration/ConfigurationHitEntry.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/configuration/ConfigurationHitEntry.java
deleted file mode 100755
index 1748152..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/configuration/ConfigurationHitEntry.java
+++ /dev/null
@@ -1,126 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.configuration;
-
-/**
- * A published configuration search hit entry.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ConfigurationHitEntry {
-
-	private String id;
-
-	private String name;
-
-	private String type;
-
-	private String briefDesc;
-
-	private String url;
-
-	/**
-	 * Returns the ID.
-	 * 
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * Sets the ID.
-	 * 
-	 * @param id
-	 *            the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	/**
-	 * Returns the type.
-	 * 
-	 * @return the type.
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * Sets the type.
-	 * 
-	 * @param type
-	 *            the type to set
-	 */
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	/**
-	 * Returns the breif description.
-	 * 
-	 * @return the brief description
-	 */
-	public String getBriefDesc() {
-		return briefDesc;
-	}
-
-	/**
-	 * Sets the brief description.
-	 * 
-	 * @param briefDesc
-	 *            the brief description to set
-	 */
-	public void setBriefDesc(String briefDesc) {
-		this.briefDesc = briefDesc;
-	}
-
-	/**
-	 * Returns the name.
-	 * 
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Sets the name.
-	 * 
-	 * @param name
-	 *            the name to set
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Returns the URL.
-	 * 
-	 * @return the URL
-	 */
-	public String getUrl() {
-		return url;
-	}
-
-	/**
-	 * Sets the URL.
-	 * 
-	 * @param url
-	 *            the URL to set
-	 */
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/configuration/ConfigurationSearchQuery.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/configuration/ConfigurationSearchQuery.java
deleted file mode 100755
index cfff4d2..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/configuration/ConfigurationSearchQuery.java
+++ /dev/null
@@ -1,82 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.configuration;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-/**
- * The published configuration search query.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ConfigurationSearchQuery {
-
-	private final static String CATEGORY_NAME = "name"; //$NON-NLS-1$
-
-	private final static String CATEGORY_BRIEF_DESC = "briefDescription"; //$NON-NLS-1$
-
-	private final static String CATEGORY_FULL_DESC = "fullDescription"; //$NON-NLS-1$
-
-	private final static String CATEGORY_TYPE = "type"; //$NON-NLS-1$
-
-	private Hashtable query;
-
-	/**
-	 * Creates a new instance.
-	 */
-	public ConfigurationSearchQuery() {
-		query = new Hashtable();
-		query.clear();
-	}
-
-	/**
-	 * Returns the search query string.
-	 * 
-	 * @return the search query string
-	 */
-	public String getQueryString() {
-		StringBuffer sb = new StringBuffer();
-		Enumeration keys = query.keys();
-
-		while (keys.hasMoreElements()) {
-			String key = (String) keys.nextElement();
-			sb.append(key + ":(" + query.get(key) + ") "); //$NON-NLS-1$ //$NON-NLS-2$
-			if (keys.hasMoreElements()) {
-				sb.append("AND "); //$NON-NLS-1$
-			}
-		}
-
-		return sb.toString();
-	}
-
-	private void setTerm(String term, String crit) {
-		query.put(crit, term);
-	}
-
-	public void setType(String type) {
-		setTerm(type, CATEGORY_TYPE);
-	}
-
-	public void setName(String name) {
-		setTerm(name, CATEGORY_NAME);
-	}
-
-	public void setBriefDesc(String desc) {
-		setTerm(desc, CATEGORY_BRIEF_DESC);
-	}
-
-	public void setFullDesc(String desc) {
-		setTerm(desc, CATEGORY_FULL_DESC);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/configuration/internal/ConfigurationSearchService.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/configuration/internal/ConfigurationSearchService.java
deleted file mode 100755
index 4db1fdf..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/configuration/internal/ConfigurationSearchService.java
+++ /dev/null
@@ -1,402 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.search.configuration.internal;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Properties;
-
-import org.apache.lucene.document.DateField;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.search.Hits;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Searcher;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.epf.common.html.HTMLParser;
-import org.eclipse.epf.search.GenerateSearchIndexException;
-import org.eclipse.epf.search.SearchConfigurationException;
-import org.eclipse.epf.search.SearchResources;
-import org.eclipse.epf.search.SearchServiceException;
-import org.eclipse.epf.search.analysis.TextAnalyzer;
-import org.eclipse.epf.search.configuration.ConfigurationHitEntry;
-import org.eclipse.epf.search.configuration.ConfigurationSearchQuery;
-
-/**
- * The default implementation for searching a published configuration.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public class ConfigurationSearchService {
-
-	/**
-	 * Document fields.
-	 */
-	public static final String BRIEF_DESCRIPTION_FIELD = "briefDescription"; //$NON-NLS-1$
-
-	public static final String CONTENT_FIELD = "content"; //$NON-NLS-1$
-
-	public static final String ID_FIELD = "id"; //$NON-NLS-1$
-
-	public static final String MODIFIED_FIELD = "modified"; //$NON-NLS-1$
-
-	public static final String NAME_FIELD = "name"; //$NON-NLS-1$
-
-	public static final String ROLE_FIELD = "role"; //$NON-NLS-1$
-
-	public static final String SUMMARY_FIELD = "summary"; //$NON-NLS-1$
-
-	public static final String TYPE_FIELD = "type"; //$NON-NLS-1$
-
-	public static final String URL_FIELD = "url"; //$NON-NLS-1$
-
-	// The HTML parser.
-	private HTMLParser parser;
-
-	// The directory containing the documents to be indexed.
-	private String docDir = null;
-
-	// The directory where the index files will be generated.
-	private String indexDir = null;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param docDir
-	 *            the absolute path to a published configuration
-	 */
-	public ConfigurationSearchService(String docDir) {
-		String userHome = System.getProperty("user.home"); //$NON-NLS-1$
-		int hashCode = Math.abs(docDir.hashCode());
-		String indexPath = userHome + File.separator
-				+ "rup" + File.separator + hashCode + File.separator + "index"; //$NON-NLS-1$ //$NON-NLS-2$
-		setDirs(docDir, indexPath);
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param docDir
-	 *            the absolute path to a published configuration
-	 * @param indexDir
-	 *            the absolute path to the indexes
-	 */
-	public ConfigurationSearchService(String docDir, String indexDir) {
-		setDirs(docDir, indexDir);
-	}
-
-	/**
-	 * Sets up the configuration and index directory.
-	 * 
-	 * @param docDir
-	 *            the absolute path to a published configuration
-	 * @param indexDir
-	 *            the absolute path to the indexes
-	 */
-	public void setDirs(String docDir, String indexDir) {
-		this.docDir = docDir;
-		this.indexDir = indexDir;
-	}
-
-	/**
-	 * Performs a search based on the given search query.
-	 * 
-	 * @param query
-	 *            the search query string
-	 * @return an array of <code>ConfigurationHitEntry</code> objects
-	 * @throws SearchServiceException
-	 *             if an error occurs while executing the operation
-	 */
-	public ConfigurationHitEntry[] search(ConfigurationSearchQuery query)
-			throws SearchServiceException {
-		return search(query.getQueryString());
-	}
-
-	/**
-	 * Performs a search on the given query string.
-	 * 
-	 * @param qstr
-	 *            a Lucene compatible query string
-	 * @return an array of <code>ConfigurationHitEntry</code> objects
-	 * @throws SearchServiceException
-	 *             if an error occurs while executing the operation
-	 */
-	public ConfigurationHitEntry[] search(String qstr)
-			throws SearchServiceException {
-		Searcher searcher = null;
-		try {
-			searcher = new IndexSearcher(indexDir);
-			Query query = QueryParser.parse(qstr, CONTENT_FIELD,
-					new TextAnalyzer());
-
-			Hits lhits = searcher.search(query);
-			ConfigurationHitEntry[] hits = new ConfigurationHitEntry[lhits
-					.length()];
-
-			for (int i = 0; i < hits.length; i++) {
-				Document doc = lhits.doc(i);
-				hits[i] = new ConfigurationHitEntry();
-				hits[i].setName(doc.get(NAME_FIELD));
-				hits[i].setUrl(doc.get(URL_FIELD));
-				hits[i].setBriefDesc(doc.get(BRIEF_DESCRIPTION_FIELD));
-				hits[i].setId(doc.get(ID_FIELD));
-				hits[i].setType(doc.get(TYPE_FIELD));
-			}
-			return hits;
-		} catch (Exception e) {
-			throw new SearchConfigurationException(e);
-		} finally {
-			if (searcher != null) {
-				try {
-					searcher.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns true of the index database already exists.
-	 * 
-	 * @return <code>true</code> if the index database already exists
-	 */
-	public boolean indexExists() {
-		File[] files = new File(indexDir).listFiles();
-		return (files != null && files.length != 0);
-	}
-
-	/**
-	 * Creates the search index.
-	 * 
-	 * @throws SearchServiceException
-	 *             if an error occurs while executing the operation
-	 */
-	public void index() throws SearchServiceException {
-		index(null, false);
-	}
-
-	/**
-	 * Creates the search index.
-	 * 
-	 * @param reindex
-	 *            if <code>true</code>, performs a reindex
-	 * @throws SearchServiceException
-	 *             if an error occurs while executing the operation
-	 */
-	public void index(boolean reindex) throws SearchServiceException {
-		index(null, reindex);
-	}
-
-	/**
-	 * Creates the index database.
-	 * 
-	 * @param pm
-	 *            a progress monitor
-	 * @param reindex
-	 *            if <code>true</code>, performs a reindex
-	 * @throws SearchServiceException
-	 *             if an error occurs while executing the operation
-	 */
-	public void index(IProgressMonitor pm, boolean reindex)
-			throws SearchServiceException {
-		synchronized (ConfigurationSearchService.class) {
-			if (indexDir == null || docDir == null) {
-				throw new IllegalStateException("Invalid indexDir or docDir"); //$NON-NLS-1$
-			}
-
-			if (!reindex && indexExists()) {
-				return;
-			}
-
-			if (pm != null) {
-				pm.beginTask(SearchResources.indexConfigFilesTask_name,
-						getTotalDocsToIndex(docDir)); //$NON-NLS-1$
-			}
-
-			try {
-				deleteAllIndexDirs();
-				new File(indexDir).mkdirs();
-				IndexWriter writer = new IndexWriter(indexDir,
-						new TextAnalyzer(), true);
-				writer.maxFieldLength = 1000000;
-				parser = new HTMLParser();
-				indexDocs(new File(docDir), writer, pm);
-				writer.optimize();
-				writer.close();
-			} catch (Exception e) {
-				throw new GenerateSearchIndexException(e);
-			} finally {
-				if (pm != null) {
-					pm.done();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Deletes all existing index databases.
-	 */
-	public void deleteAllIndexDirs() {
-		File parent = new File(indexDir).getParentFile();
-		File[] files = parent.listFiles();
-		if (files != null) {
-			for (int i = 0; i < files.length; i++) {
-				if (files[i].getName().startsWith("index")) { //$NON-NLS-1$
-					File[] file = files[i].listFiles();
-					for (int j = 0; j < file.length; j++) {
-						file[j].delete();
-					}
-					files[i].delete();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns the total number of files that will be added to the search index.
-	 * 
-	 * @param dir
-	 *            the directory name
-	 * @return the number of files that will be added to the search index,
-	 *         including all sub-directories
-	 */
-	public static int getTotalDocsToIndex(String dir) {
-		int total = 0;
-		File dirFile = new File(dir);
-		File files[] = dirFile.listFiles();
-		if (files == null) {
-			return total;
-		}
-		for (int i = 0; i < files.length; i++) {
-			if (isXMIDoc(files[i])) {
-				total++;
-			} else if (files[i].isDirectory()) {
-				total += getTotalDocsToIndex(files[i].getAbsolutePath());
-			}
-		}
-		return total;
-	}
-
-	/**
-	 * Returns true if the file needs to be indexed.
-	 * 
-	 * @param file
-	 *            the file to be verified
-	 * @return <code>true</code> if the file needs to be indexed
-	 */
-	private static boolean isXMIDoc(File file) {
-		return file.getPath().endsWith(".xmi"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns true if the file needs to be indexed.
-	 * 
-	 * @param file
-	 *            the file to be verified
-	 * @return <code>true</code> if the file needs to be indexed
-	 */
-	private static boolean isHtmlOrTextDoc(File file) {
-		String path = file.getPath();
-		return path.endsWith(".html") || path.endsWith(".htm") || path.endsWith(".txt"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	/**
-	 * A recursive function to index files.
-	 * 
-	 * @param file
-	 *            a directory or file to be indexed
-	 * @param writer
-	 *            the index writer
-	 * @param pm
-	 *            a progress monitor
-	 * @throws Exception
-	 */
-	private void indexDocs(File file, IndexWriter writer, IProgressMonitor pm)
-			throws Exception {
-		if (file.isDirectory()) {
-			if (file.getName().equalsIgnoreCase("applet")) { //$NON-NLS-1$
-				return;
-			}
-			String[] files = file.list();
-			for (int i = 0; i < files.length; i++) {
-				indexDocs(new File(file, files[i]), writer, pm);
-			}
-		} else if (isHtmlOrTextDoc(file)) {
-			if (pm != null) {
-				pm.subTask(file.getName());
-				pm.worked(1);
-			}
-			if (shouldBeExcluded(file)) {
-				return;
-			}
-			Document doc = getHTMLDocument(file);
-			writer.addDocument(doc);
-		}
-	}
-
-	/**
-	 * Returns <ocde>true</code> if the file should be excluded from indexing.
-	 * 
-	 * @param file
-	 *            a file
-	 * @return <code>true</code> if the file should be excluded from indexing
-	 */
-	public boolean shouldBeExcluded(File file) {
-		String p = file.getParentFile().getAbsolutePath();
-		return docDir.startsWith(p);
-	}
-
-	/**
-	 * Gets the document object of a HTML file.
-	 * 
-	 * @param file
-	 *            the HTML file to be indexed
-	 * @return a document object
-	 * @throws IOException
-	 *             if an I/O error occurs while parsing the HTML file
-	 * @throws InterruptedException
-	 *             if the operation is interrupted by a user
-	 */
-	public Document getHTMLDocument(File file) throws IOException,
-			InterruptedException {
-		Document doc = new Document();
-		doc.add(Field.UnIndexed(URL_FIELD, file.getPath().replace(
-				File.pathSeparatorChar, '/')));
-		doc.add(Field.Keyword(MODIFIED_FIELD, DateField.timeToString(file
-				.lastModified())));
-
-		try {
-			parser.parse(file);
-		} catch (Exception e) {
-		}
-
-		doc.add(Field.Text(CONTENT_FIELD, parser.getText()));
-		doc.add(Field.UnIndexed(SUMMARY_FIELD, parser.getSummary()));
-
-		Properties metaTags = parser.getMetaTags();
-		for (Enumeration e = metaTags.propertyNames(); e.hasMoreElements();) {
-			String tagName = (String) e.nextElement();
-			doc.add(Field.Text(tagName, metaTags.getProperty(tagName)));
-		}
-
-		if (doc.getField(ROLE_FIELD) == null) {
-			doc.add(Field.Text(ROLE_FIELD, "NORUPROLE")); //$NON-NLS-1$
-		}
-
-		return doc;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/configuration/internal/package.html b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/configuration/internal/package.html
deleted file mode 100755
index be07ac5..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/configuration/internal/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the implementation for searching a published configuration.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/configuration/package.html b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/configuration/package.html
deleted file mode 100755
index 1d7c4b0..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/configuration/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides implementation support for searching a published configuration.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/package.html b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/package.html
deleted file mode 100755
index c0fca96..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces for the search service.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/utils/JarCreator.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/utils/JarCreator.java
deleted file mode 100755
index cb157d9..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/utils/JarCreator.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.search.utils;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-public class JarCreator {
-
-	public static final String INDEX_JAR = "index.jar"; //$NON-NLS-1$
-
-	public static void main(String[] args) {
-		jarFolder(args[0]);
-	}
-
-	public static void jarFolder(String foldername) {
-		try {
-			System.out.println("attempting to jar stuff"); //$NON-NLS-1$
-			File jarDir = new File(foldername);
-			File jarFile = new File(foldername + File.separator + INDEX_JAR);
-
-			jarFiles(jarDir, jarFile);
-		} catch (Exception e1) {
-			System.out.println("Exception in the jar thingy"); //$NON-NLS-1$
-			e1.printStackTrace();
-		}
-	}
-
-	/**
-	 * method to jar the specified dir into a jar file. non-sub-folders will be
-	 * jared.
-	 * 
-	 * @param jarDir
-	 * @param jarFile
-	 * @throws IOException
-	 */
-	public static void jarFiles(File jarDir, File jarFile) throws IOException {
-		File[] files = jarDir.listFiles();
-		if (jarFile.exists()) {
-			jarFile.delete();
-		}
-		BufferedOutputStream bStream = new BufferedOutputStream(new FileOutputStream(
-				jarFile));
-		ZipOutputStream zipperStream = new ZipOutputStream(bStream);
-
-		byte[] bytes = new byte[4096];
-		for (int i = 0; i < files.length; i++) {
-			File currentFile = files[i];
-			if (currentFile.isDirectory()) {
-				continue;
-			}
-			ZipEntry currEntry = new ZipEntry(currentFile.getName());
-			zipperStream.putNextEntry(currEntry);
-			BufferedInputStream biStream = new BufferedInputStream(new FileInputStream(
-					currentFile));
-			while (biStream.available() > 0) {
-				int num = biStream.read(bytes);
-				zipperStream.write(bytes, 0, num);
-			}
-			biStream.close();
-			zipperStream.closeEntry();
-		}
-		zipperStream.close();
-		bStream.close();
-	}	
-}
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/utils/LHTMLParser.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/utils/LHTMLParser.java
deleted file mode 100755
index 7669b19..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/utils/LHTMLParser.java
+++ /dev/null
@@ -1,76 +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.search.utils;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.util.Properties;
-
-/**
- * A HTML parser used for extracting the meta tags and text from a HTML
- * document.
- * 
- * TODO: Implement our own HTML parser.
- */
-public class LHTMLParser extends org.apache.lucene.demo.html.HTMLParser {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public LHTMLParser(File file) throws FileNotFoundException {
-		super(file);
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	public LHTMLParser(InputStream stream) throws FileNotFoundException {
-		super(stream);
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	public LHTMLParser(Reader stream) throws FileNotFoundException {
-		super(stream);
-	}
-
-	/**
-	 * Gets the HTML meta tags.
-	 */
-	public Properties getMetaTags() throws IOException, InterruptedException {
-		return super.getMetaTags();
-	}
-
-	/**
-	 * Gets the reader for the HTML content.
-	 */
-	public Reader getReader() throws IOException {
-		return super.getReader();
-	}
-
-	/**
-	 * Gets the HTML title.
-	 */
-	public String getTitle() throws IOException, InterruptedException {
-		return super.getTitle();
-	}
-	
-	/**
-	 * Gets a summary of the HTL document.
-	 */
-	public String getSummary() throws IOException, InterruptedException {
-		return super.getSummary();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/utils/UNCUtil.java b/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/utils/UNCUtil.java
deleted file mode 100755
index 6a949ea..0000000
--- a/plugins/org.eclipse.epf.search/src/org/eclipse/epf/search/utils/UNCUtil.java
+++ /dev/null
@@ -1,315 +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.search.utils;
-
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.NoSuchElementException;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-
-public class UNCUtil {
-	public static final String UNC_FILE_PREFIX = "file:/";
-	public static final String ALTERNATE_UNC_FILE_PREFIX = "file://";
-	public static final String NETSCAPE_UNC_FILE_PREFIX = "file:///";
-	public static final String UNC_FILE_ONLY = "file:";
-	public static final String UNC_SEPARATOR = "/";
-
-
-	/**
-	 * Accounts for netscape unc file prefix. Converts to standard one.
-	 * If not Netscape, nothing changes.
-	 */
-	public static String handleNetscapeFilePrefix(String filename)
-	{
-		String convertedName = null;
-
-		if (filename.startsWith(NETSCAPE_UNC_FILE_PREFIX))
-		{
-			convertedName =
-				ALTERNATE_UNC_FILE_PREFIX
-					+ filename.substring(
-						NETSCAPE_UNC_FILE_PREFIX.length(),
-						filename.length());
-		}
-		else
-		{
-			convertedName = filename;
-		}
-
-		return (convertedName);
-	}
-
-	/**
-	 * Handles URL paths for Mozilla (and other browsers) over UNC.
-	 */
-	public static URL handleURLForUNC(URL originalUrl)
-	{
-		// handle special case for Mozilla over UNC
-		URL newUrl = null;
-		try
-		{
-			if (originalUrl.toString().startsWith("file://"))
-			{
-				// change "file://" to "file://///"
-				String extractedString = originalUrl.toString().substring(5);
-				newUrl = new URL("file", "", "///" + extractedString);
-			}
-			else
-			{
-				newUrl = originalUrl;
-			}
-		}
-		catch (java.net.MalformedURLException mue)
-		{
-			newUrl = originalUrl;
-		}
-
-		return (newUrl);
-	}
-
-	/**
-	 * Converts the UNC file to a regular, platform-dependent one.
-	 */
-	public static String convertFilename(String filename)
-	{
-		String convertedName = null;
-
-		// remove any URL prefixes
-		String tempName = null;
-		if (filename.startsWith(UNC_FILE_PREFIX))
-		{
-			tempName = filename.substring(UNC_FILE_PREFIX.length(), filename.length());
-			int index = tempName.indexOf(":");
-			if (index == -1)
-			{
-				// on Unix, add separator back to first character
-				tempName = UNC_SEPARATOR + tempName;
-			}
-		}
-		else
-		{
-			tempName = filename;
-		}
-
-		// convert any UNC separators to the system default one
-		convertedName =
-			tempName.replace(UNC_SEPARATOR.charAt(0), File.separator.charAt(0));
-
-		return (convertedName);
-	}
-
-	/**
-	 * Converts the filename to a UNC filename.
-	 */
-	public static String convertFilenameToUNC(String filename)
-	{
-		// convert any UNC separators to the system default one
-		String convertedName =
-			filename.replace(File.separator.charAt(0), UNC_SEPARATOR.charAt(0));
-		String finalName = convertFileSeparator(convertedName);
-		return (finalName);
-	}
-
-	/**
-	 * Converts the URL to one which can that matches a UNC convention.
-	 */
-	public static String convertToUNC(String url)
-	{
-		String convertedUrl = null;
-		if (url.startsWith(ALTERNATE_UNC_FILE_PREFIX))
-		{
-			convertedUrl =
-				UNC_FILE_PREFIX
-					+ url.substring(ALTERNATE_UNC_FILE_PREFIX.length(), url.length());
-		}
-		else
-		{
-			convertedUrl = url;
-		}
-		return (convertedUrl);
-
-	}
-
-	/**
-	 * Removes the "%20" that is used by some browsers for spaces
-	 */
-	public static String convertFileSpacing(String filename)
-	{
-		// now remove any "%20"
-		int start = 0;
-		String newFilename = "";
-		while (start < filename.length())
-		{
-			int index = filename.indexOf("%20", start);
-			if (index == -1)
-			{
-				index = filename.length();
-			}
-			newFilename += filename.substring(start, index);
-			newFilename += " ";
-			start = index + 3;
-		}
-
-		newFilename = newFilename.trim();
-
-		return (newFilename);
-	}
-
-	/**
-	 * Removes the "%5C" that is used by some browsers for file separator.
-	 */
-	public static String convertFileSeparator(String filename)
-	{
-		// remove any "%5C"
-		int start = 0;
-		String newFilename = "";
-		while (start < filename.length())
-		{
-			int index = filename.indexOf("%5C", start);
-			if (index == -1)
-			{
-				//index = filename.length();
-				newFilename = filename.trim();
-				break;
-			}
-			newFilename += filename.substring(start, index);
-			newFilename += UNC_SEPARATOR;
-			start = index + 3;
-		}
-
-		newFilename = newFilename.trim();
-
-		// also if file separator equals unc separator, remove any Windows
-		// specific "\"
-		String windowsFileSeparator = "\\";
-		if (!File.separator.equals(windowsFileSeparator)
-			&& File.separator.equals(UNC_SEPARATOR))
-		{
-			// on Unix
-			newFilename =
-				newFilename.replace(
-					windowsFileSeparator.charAt(0),
-					UNC_SEPARATOR.charAt(0));
-		}
-		return (newFilename);
-	}
-
-	/**
-	 * Retrieves the file names from the specified directory
-	 * that matches the given suffix.  An example of a 
-	 * suffix is ".dat".
-	 */
-	public static Vector getFileList(String directory, String suffix)
-	{
-		if (directory.startsWith("http"))
-		{
-			// remote directory, use this instead
-			return (getFileListFromRemote(directory, suffix));
-		}
-
-		String tempDir = UNCUtil.convertFilename(directory);
-		File documentDirectory = new File(UNCUtil.convertFileSpacing(tempDir));
-		String[] fileNameList = documentDirectory.list();
-
-		// now parse and only take those that end with the proper suffix
-		Vector finalList = new Vector();
-		for (int i = 0; i < fileNameList.length; i++)
-		{
-			if (fileNameList[i].endsWith(suffix))
-			{
-				finalList.addElement(fileNameList[i]);
-			}
-		}
-
-		return (finalList);
-	}
-
-	/**
-	 * Retrieves the applicable default rup files from remote directory.
-	 */
-	private static Vector getFileListFromRemote(String directory, String suffix)
-	{
-		Vector filenames = new Vector();
-		try
-		{
-			// get the listing using a URL
-			URL remoteUrl = new URL(directory);
-			InputStream inStream = remoteUrl.openStream();
-			StringBuffer result = new StringBuffer();
-			int c;
-			while ((c = inStream.read()) != -1)
-			{
-				result.append((char) c);
-			}
-			inStream.close();
-
-			// convert string to upper case to handle multiple server types such as Apache
-			String directoryResult = result.toString();
-			directoryResult = directoryResult.replaceAll("href", "HREF");
-			directoryResult = directoryResult.replaceAll("</a", "</A");
-			directoryResult = directoryResult.replaceAll("<tt>", "");
-			directoryResult = directoryResult.replaceAll("</tt>", "");
-			directoryResult = directoryResult.replaceAll("<TT>", "");
-			directoryResult = directoryResult.replaceAll("</TT>", "");
-
-			// parse the content
-			//StringTokenizer lineTokenizer = new StringTokenizer( result.toString() );
-			StringTokenizer lineTokenizer = new StringTokenizer(directoryResult);
-			Vector lines = new Vector();
-			try
-			{
-				while (true)
-				{
-					lineTokenizer.nextToken("REF");
-					lineTokenizer.nextToken("\"");
-					String line = lineTokenizer.nextToken("\"");
-
-					// strip out "</A"; needed this because StringTokenizer
-					// has problems parsing filenames that being with "A"
-					int index = line.indexOf("</A");
-					if (index != -1 && index != 0)
-					{
-						String filename = line.substring(0, index);
-						lines.addElement(filename);
-					}
-					else
-					{
-						lines.addElement(line);
-					}
-				}
-			}
-			catch (NoSuchElementException ne)
-			{
-				// do nothing, end of content
-			}
-
-			// parse each line
-			for (int i = 0; i < lines.size(); i++)
-			{
-				String line = (String) lines.elementAt(i);
-
-				if (line.endsWith(suffix))
-				{
-					// we want this
-					filenames.addElement(line);
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-		return (filenames);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma.ecore/.classpath b/plugins/org.eclipse.epf.uma.ecore/.classpath
deleted file mode 100755
index 065ac06..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.uma.ecore/.cvsignore b/plugins/org.eclipse.epf.uma.ecore/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.uma.ecore/.project b/plugins/org.eclipse.epf.uma.ecore/.project
deleted file mode 100755
index 5859a7c..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.uma.ecore</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/plugins/org.eclipse.epf.uma.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.uma.ecore/META-INF/MANIFEST.MF
deleted file mode 100755
index 2e47daa..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.uma.ecore
-Bundle-Version: 1.2.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.sdo;visibility:=reexport
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.uma.ecore,
- org.eclipse.epf.uma.ecore.impl,
- org.eclipse.epf.uma.ecore.util
diff --git a/plugins/org.eclipse.epf.uma.ecore/build.properties b/plugins/org.eclipse.epf.uma.ecore/build.properties
deleted file mode 100755
index 37d9849..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               plugin.properties
diff --git a/plugins/org.eclipse.epf.uma.ecore/plugin.properties b/plugins/org.eclipse.epf.uma.ecore/plugin.properties
deleted file mode 100755
index 9d4f4c1..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/plugin.properties
+++ /dev/null
@@ -1,16 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF UMA Ecore Extension
-providerName=Eclipse.org
-
diff --git a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/IModelObject.java b/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/IModelObject.java
deleted file mode 100755
index 4508dd7..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/IModelObject.java
+++ /dev/null
@@ -1,59 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.ecore;
-
-import java.util.Collection;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.sdo.EDataObject;
-import org.eclipse.epf.uma.ecore.util.OppositeFeature;
-
-/**
- * An interface supported by all UMA model objects.
- * <p>
- * This interface provides dynamic bidirectional relationships support between
- * model objects through the use of opposite features. It also allows the
- * default value of a feature, as defined in a metal model, to be overwritten.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface IModelObject extends EDataObject {
-
-	/**
-	 * Gets the default value of a feature.
-	 * <p>
-	 * This method provides a way to override the default value defined in the
-	 * meta-model for a UMA class.
-	 * 
-	 * @param feature
-	 *            a feature
-	 * @return the default value for the specified feature
-	 */
-	public Object getDefaultValue(EStructuralFeature feature);
-
-	/**
-	 * Gets the value of an opposite feature.
-	 * 
-	 * @param feature
-	 *            an opposite feature
-	 * @return the value for the specified opposite feature
-	 */
-	public Object getOppositeFeatureValue(OppositeFeature feature);
-
-	/**
-	 * Gets all the opposite features associated with this model object.
-	 * 
-	 * @return a collection of opposite features
-	 */
-	public Collection getOppositeFeatures();
-
-}
diff --git a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/IProxyResolutionListener.java b/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/IProxyResolutionListener.java
deleted file mode 100755
index 20b07f8..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/IProxyResolutionListener.java
+++ /dev/null
@@ -1,40 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.ecore;
-
-/**
- * The interface for a proxy resolution listener attached to a UMA resource set.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface IProxyResolutionListener {
-
-	/**
-	 * Receives notification of an exception that has occurred while resolving a
-	 * proxy object.
-	 * 
-	 * @param e
-	 *            the exception that has occurred
-	 */
-	void notifyException(Exception e);
-
-	/**
-	 * Receives notification that a proxy has been resolved successfully.
-	 * 
-	 * @param proxy
-	 *            a proxy object
-	 * @param resolved
-	 *            the resolved object
-	 */
-	void proxyResolved(Object proxy, Object resolved);
-
-}
diff --git a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/IUmaResourceSet.java b/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/IUmaResourceSet.java
deleted file mode 100755
index 57075a3..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/IUmaResourceSet.java
+++ /dev/null
@@ -1,40 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.ecore;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-/**
- * The interface for a UMA resource set.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public interface IUmaResourceSet extends ResourceSet {
-
-	/**
-	 * Gets the model object resolved by a URI.
-	 * 
-	 * @param resolver
-	 *            the proxy resolver
-	 * @param uri
-	 *            the URI used to resolve the proxy
-	 * @param loadOnDemand
-	 *            if <code>true</code>, create and load the resource if it
-	 *            does not exists
-	 * @return the model object resolved by the URI
-	 * @see org.eclipse.emf.ecore.resource.ResourceSet#getEObject(EObject, URI, boolean)
-	 */
-	EObject getEObject(EObject resolver, URI uri, boolean loadOnDemand);
-
-}
diff --git a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/ResolveException.java b/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/ResolveException.java
deleted file mode 100755
index 71ac72b..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/ResolveException.java
+++ /dev/null
@@ -1,102 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.ecore;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-
-/**
- * Signals that an error has occurred while resolving a proxy object.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class ResolveException extends WrappedException {
-
-	private static final long serialVersionUID = 3258412815814636081L;
-
-	private EObject proxy;
-
-	private EObject resolver;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param proxy
-	 *            a proxy object
-	 * @param msg
-	 *            an error message
-	 * @param resolver
-	 *            the proxy resolver
-	 */
-	public ResolveException(EObject proxy, String msg, EObject resolver) {
-		super(msg, null);
-		this.proxy = proxy;
-		this.resolver = resolver;
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param proxy
-	 *            a proxy object
-	 * @param exception
-	 *            the exception that was thrown
-	 */
-	public ResolveException(EObject proxy, Exception exception, EObject resolver) {
-		super(exception);
-		this.proxy = proxy;
-		this.resolver = resolver;
-	}
-
-	/**
-	 * Returns the proxy object.
-	 * 
-	 * @return the proxy object
-	 */
-	public EObject getProxy() {
-		return proxy;
-	}
-
-	/**
-	 * Returns the proxy resolver.
-	 * 
-	 * @return the proxy resolver
-	 */
-	public EObject getResolver() {
-		return resolver;
-	}
-
-	/**
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (obj instanceof ResolveException) {
-			ResolveException re = (ResolveException) obj;
-			if (resolver == re.resolver) {
-				if (proxy == re.proxy) {
-					return true;
-				}
-				if (proxy instanceof InternalEObject) {
-					URI uri = ((InternalEObject) proxy).eProxyURI();
-					if (uri != null && re.proxy instanceof InternalEObject) {
-						return uri.equals(((InternalEObject) re.proxy)
-								.eProxyURI());
-					}
-				}
-			}
-		}
-		return super.equals(obj);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/impl/MultiResourceEObject.java b/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/impl/MultiResourceEObject.java
deleted file mode 100755
index 260379a..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/impl/MultiResourceEObject.java
+++ /dev/null
@@ -1,917 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.ecore.impl;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.Resource.Internal;
-import org.eclipse.emf.ecore.sdo.impl.EDataObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.ecore.IModelObject;
-import org.eclipse.epf.uma.ecore.IProxyResolutionListener;
-import org.eclipse.epf.uma.ecore.IUmaResourceSet;
-import org.eclipse.epf.uma.ecore.ResolveException;
-import org.eclipse.epf.uma.ecore.util.OppositeFeature;
-import org.eclipse.epf.uma.ecore.util.OppositeFeatureResolvingEList;
-
-/**
- * The base class for all UMA model objects.
- * <p>
- * By default, EMF stores model objects related via a containment relationship
- * in a single XMI file. This class extends the default EMF persistence behavior
- * by providing a mechanism for the containing and contained objects to be
- * stored in separate XMI files. Contained objects are lazy loaded, when
- * required, similar to the proxy object behavior of EMF's standard resource
- * implementation.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MultiResourceEObject extends EDataObjectImpl implements
-		IModelObject {
-
-	private static final long serialVersionUID = 3258126947153097273L;
-
-	private static final Map featureToDefaultValueMap = new HashMap();
-	
-	/**
-	 * Sets the default value for a feature.
-	 * <p>
-	 * Note: This method is designed for migration use only. Do not call this
-	 * method to override the default value of a feature since it will slow down
-	 * the loading of a method library.
-	 * 
-	 * @param feature
-	 *            a feature
-	 * @param defaultValue
-	 *            the default value for the feature
-	 */
-	public static final void setDefaultValue(EStructuralFeature feature,
-			Object defaultValue) {
-		featureToDefaultValueMap.put(feature, defaultValue);
-	}
-	
-	/**
-	 * Removes the default value for a feature.
-	 * <p>
-	 * Note: This method is designed for migration use only. Do not call this
-	 * method to override the default value of a feature since it will slow down
-	 * the loading of a method library.
-	 * 
-	 * @param feature
-	 *            a feature
-	 */
-	public static final void removeDefaultValue(EStructuralFeature feature) {
-		featureToDefaultValueMap.remove(feature);
-	}
-	
-	/**
-	 * A map of entries of OppositeFeature / OppositeFeature's value
-	 */
-	private Map oppositeFeatureMap;
-
-	private boolean hasOppositeFeature = true;
-
-	private Boolean notifyOpposite = null;
-
-	private boolean valid = true;
-
-	private List featuresWithOverridenDefaultValue;
-
-	/**
-	 * Checks the validity of this object.
-	 * 
-	 * @return <code>true</code> if this object is valid
-	 */
-	public boolean isValid() {
-		return valid;
-	}
-
-	private void oppositeAdd(OppositeFeature oppositeFeature, Object object) {
-		List list = (List) getOppositeFeatureMap().get(oppositeFeature);
-		if (list == null) {
-			list = new OppositeFeatureResolvingEList(this, oppositeFeature);
-			getOppositeFeatureMap().put(oppositeFeature, list);
-		}
-		if (!list.contains(object)) {
-			list.add(object);
-		}
-	}
-
-	private void oppositeRemove(OppositeFeature oppositeFeature, Object object) {
-		List list = (List) getOppositeFeatureMap().get(oppositeFeature);
-		if (list == null) {
-			list = new OppositeFeatureResolvingEList(this, oppositeFeature);
-			getOppositeFeatureMap().put(oppositeFeature, list);
-		}
-		list.remove(object);
-	}
-
-	/**
-	 * Resolves the given proxy object.
-	 * 
-	 * @param object
-	 *            a proxy object to resolve
-	 * @return the resolved object
-	 */
-	public Object resolve(Object object) {
-		if (object instanceof InternalEObject
-				&& ((InternalEObject) object).eIsProxy()) {
-			return eResolveProxy((InternalEObject) object);
-		}
-		return object;
-	}
-
-	private void replace(EStructuralFeature feature, Object oldValue,
-			InternalEObject newValue) {
-		if (newValue != null && !newValue.eIsProxy() && newValue != oldValue) {
-			boolean notify = eDeliver();
-			try {
-				eSetDeliver(false);
-				EcoreUtil.replace(this, feature, oldValue, newValue);
-			} catch (Exception e) {
-				CommonPlugin.INSTANCE.log(e);
-				e.printStackTrace();
-				System.out.println("MultiResourceEObject.replace():");
-				System.out.println("  object: " + this);
-				System.out.println("  feature: " + feature);
-				System.out.println("  proxy: " + oldValue);
-				System.out.println("  resolved: " + newValue);
-			} finally {
-				eSetDeliver(notify);
-			}
-		}
-
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.notify.impl.BasicNotifierImpl#eNotify(org.eclipse.emf.common.notify.Notification)
-	 */
-	public void eNotify(Notification msg) {
-		/*
-		 * if(!OppositeFeature.isDeliverOnResolve() && msg.getEventType() ==
-		 * Notification.RESOLVE) { return; }
-		 */
-
-		if (msg.getEventType() == Notification.RESOLVE) {
-			return;
-		}
-		
-		Object f = msg.getFeature();
-		if (f instanceof EStructuralFeature) {
-			EStructuralFeature feature = (EStructuralFeature) f;
-			OppositeFeature oppositeFeature = OppositeFeature
-					.getOppositeFeature(feature);
-			if (oppositeFeature != null) {
-				MultiResourceEObject oldOtherEnd;
-				MultiResourceEObject otherEnd;
-				if (oppositeFeature.isMany()) {
-					switch (msg.getEventType()) {
-					case Notification.SET:
-						oldOtherEnd = (MultiResourceEObject) msg.getOldValue();
-						if (oppositeFeature.resolveOwner()) {
-							oldOtherEnd = (MultiResourceEObject) resolve(oldOtherEnd);
-						}
-						if (oldOtherEnd != null) {
-							oldOtherEnd.oppositeRemove(oppositeFeature, msg
-									.getNotifier());
-						}
-					case Notification.ADD:
-						otherEnd = (MultiResourceEObject) msg.getNewValue();
-						if (oppositeFeature.resolveOwner()) {
-							otherEnd = (MultiResourceEObject) resolve(otherEnd);
-							replace(feature, msg.getNewValue(), otherEnd);
-						}
-						if (otherEnd != null) {
-							otherEnd.oppositeAdd(oppositeFeature, msg
-									.getNotifier());
-						}
-						break;
-					case Notification.ADD_MANY:
-						for (Iterator iter = ((Collection) msg.getNewValue())
-								.iterator(); iter.hasNext();) {
-							Object obj = iter.next();
-							otherEnd = (MultiResourceEObject) obj;
-							if (oppositeFeature.resolveOwner()) {
-								otherEnd = (MultiResourceEObject) resolve(otherEnd);
-								replace(feature, obj, otherEnd);
-							}
-							otherEnd.oppositeAdd(oppositeFeature, msg
-									.getNotifier());
-						}
-						break;
-					case Notification.REMOVE:
-						otherEnd = (MultiResourceEObject) msg.getOldValue();
-						if (oppositeFeature.resolveOwner()) {
-							otherEnd = (MultiResourceEObject) resolve(otherEnd);
-						}
-						if (otherEnd != null)
-							otherEnd.oppositeRemove(oppositeFeature, msg
-									.getNotifier());
-						break;
-					case Notification.REMOVE_MANY:
-						for (Iterator iter = ((Collection) msg.getOldValue())
-								.iterator(); iter.hasNext();) {
-							otherEnd = (MultiResourceEObject) iter.next();
-							if (oppositeFeature.resolveOwner()) {
-								otherEnd = (MultiResourceEObject) resolve(otherEnd);
-							}
-							otherEnd.oppositeRemove(oppositeFeature, msg
-									.getNotifier());
-						}
-						break;
-					}
-				} else {
-					switch (msg.getEventType()) {
-					case Notification.ADD_MANY:
-						for (Iterator iter = ((Collection) msg.getNewValue())
-								.iterator(); iter.hasNext();) {
-							Object obj = iter.next();
-							otherEnd = (MultiResourceEObject) obj;
-							if (oppositeFeature.resolveOwner()) {
-								otherEnd = (MultiResourceEObject) resolve(otherEnd);
-								replace(feature, obj, otherEnd);
-							}
-							if (otherEnd != null) {
-								EObject oldValue = (EObject) otherEnd
-										.getOppositeFeatureMap().get(
-												oppositeFeature);
-								if (oldValue != null) {
-									// remove otherEnd from target feature of
-									// oldValue
-									((Collection) oldValue
-											.eGet((EStructuralFeature) f))
-											.remove(otherEnd);
-								}
-								otherEnd.getOppositeFeatureMap().put(
-										oppositeFeature, msg.getNotifier());
-							}
-						}
-						break;
-					case Notification.REMOVE_MANY:
-						for (Iterator iter = ((Collection) msg.getOldValue())
-								.iterator(); iter.hasNext();) {
-							otherEnd = (MultiResourceEObject) iter.next();
-							if (oppositeFeature.resolveOwner()) {
-								otherEnd = (MultiResourceEObject) resolve(otherEnd);
-							}
-							otherEnd.getOppositeFeatureMap().put(
-									oppositeFeature, null);
-						}
-						break;
-					case Notification.ADD:
-						otherEnd = (MultiResourceEObject) msg.getNewValue();
-						if (oppositeFeature.resolveOwner()) {
-							otherEnd = (MultiResourceEObject) resolve(otherEnd);
-							replace(feature, msg.getNewValue(), otherEnd);
-						}
-						if (otherEnd != null) {
-							EObject oldValue = (EObject) otherEnd
-									.getOppositeFeatureMap().get(
-											oppositeFeature);
-							if (oldValue != null) {
-								// remove otherEnd from target feature of
-								// oldValue
-								((Collection) oldValue
-										.eGet((EStructuralFeature) f))
-										.remove(otherEnd);
-							}
-							otherEnd.getOppositeFeatureMap().put(
-									oppositeFeature, msg.getNotifier());
-						}
-						break;
-					case Notification.SET:
-						otherEnd = (MultiResourceEObject) msg.getNewValue();
-						if (oppositeFeature.resolveOwner()) {
-							otherEnd = (MultiResourceEObject) resolve(otherEnd);
-							replace(feature, msg.getNewValue(), otherEnd);
-						}
-						if (otherEnd != null) {
-							EObject oldValue = (EObject) otherEnd
-									.getOppositeFeatureMap().get(
-											oppositeFeature);
-							if (oldValue != null) {
-								// set the target feature of oldValue to null
-								oldValue.eSet((EStructuralFeature) f, null);
-							}
-							otherEnd.getOppositeFeatureMap().put(
-									oppositeFeature, msg.getNotifier());
-						}
-						else {
-							EStructuralFeature targetFeature = (EStructuralFeature) f;
-							if(!targetFeature.isMany()) {
-								oldOtherEnd = (MultiResourceEObject) msg.getOldValue();
-								if(oldOtherEnd != null) {
-									oldOtherEnd.getOppositeFeatureMap().put(oppositeFeature, null);
-								}
-							}
-						}
-						break;
-					case Notification.REMOVE:
-						// case Notification.UNSET:
-						otherEnd = (MultiResourceEObject) msg.getOldValue();
-						if (oppositeFeature.resolveOwner()) {
-							otherEnd = (MultiResourceEObject) resolve(otherEnd);
-						}
-						if (otherEnd != null)
-							otherEnd.getOppositeFeatureMap().put(
-									oppositeFeature, null);
-						break;
-
-					}
-				}
-			}
-		}
-
-		super.eNotify(msg);
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.notify.impl.BasicNotifierImpl#eNotificationRequired()
-	 */
-	public boolean eNotificationRequired() {
-		if (!eDeliver())
-			return false;
-
-		Resource resource = eResource();
-		if (resource != null && !resource.eDeliver())
-			return false;
-
-		if (notifyOpposite == null) {
-			if (OppositeFeature.featureOppositeFeatureMap.isEmpty()) {
-				notifyOpposite = Boolean.FALSE;
-			} else {
-				Collection features = OppositeFeature.featureOppositeFeatureMap
-						.keySet();
-				for (Iterator iter = eClass().getEAllReferences().iterator(); iter
-						.hasNext();) {
-					if (features.contains(iter.next())) {
-						notifyOpposite = Boolean.TRUE;
-						break;
-					}
-				}
-				if (notifyOpposite == null) {
-					notifyOpposite = Boolean.FALSE;
-				}
-			}
-		}
-		if (notifyOpposite.booleanValue())
-			return true;
-		return super.eNotificationRequired();
-	}
-
-	/*
-	 * private void removeChildResources() { List children = eContents(); int
-	 * size = children.size(); for (int i = 0; i < size; i++) {
-	 * MultiResourceEObject child = (MultiResourceEObject) children.get(i);
-	 * Resource resource = child.eResource(); if (resource != null && resource !=
-	 * eResource()) { child.removeChildResources(); } ((InternalEList)
-	 * resource.getContents()).basicRemove(this, null);
-	 * child.eProperties().setEResource(null); } }
-	*/
-
-	/**
-	 * @see org.eclipse.emf.ecore.InternalEObject#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject,
-	 *      int, org.eclipse.emf.common.notify.NotificationChain)
-	 */
-	public NotificationChain eBasicSetContainer(InternalEObject newContainer,
-			int newContainerFeatureID, NotificationChain msgs) {
-		Resource.Internal oldResource = this.eDirectResource();
-		Resource.Internal newResource = newContainer == null ? null
-				: newContainer.eInternalResource();
-		// if (oldResource != newResource && oldResource != null) {
-		// removeChildResources();
-		// }
-
-		int oldIndex = -1;
-		int oldSize = -1;
-		if (oldResource != null) {
-			oldIndex = oldResource.getContents().indexOf(this);
-			oldSize = oldResource.getContents().size();
-		}
-
-		NotificationChain messages = super.eBasicSetContainer(newContainer,
-				newContainerFeatureID, msgs);
-		if (oldResource != newResource && oldResource != null) {
-			// remove any newly added ModificationTrackingAdapters from this
-			// object's adapter list
-			//
-			if (newResource != null)
-				newResource.detached(this);
-
-			// Override the default semantic: MultiResourceEObject is allowed to
-			// be owned by both container and resource.
-			// Add this object back to the old resource.
-			//
-			BasicEList contents = ((BasicEList) oldResource.getContents());
-			if (oldSize != contents.size()) {
-				// this object has been removed from the resource's contents
-				// add it back
-				//
-				if (contents.isEmpty()) {
-					// this will flag resource as loaded
-					//
-					contents.clear();
-					contents.setData(1, new Object[] { this });
-				} else {
-					Object[] data = contents.toArray();
-					Object[] newData = new Object[data.length + 1];
-					if (oldIndex > 0) {
-						System.arraycopy(data, 0, newData, 0, oldIndex);
-					}
-					newData[oldIndex] = this;
-					if (oldIndex < data.length) {
-						System.arraycopy(data, oldIndex, newData, oldIndex + 1,
-								data.length - oldIndex);
-					}
-					contents.setData(newData.length, newData);
-				}
-			}
-			eSetResource(oldResource);
-			// don't have to re-attach this object to oldResource since it was
-			// not dettached in super method
-			//
-			// oldResource.attached(this);
-
-			// if(newResource != null) newResource.attached(this);
-		}
-		return messages;
-	}
-
-	/**
-	 * Sets the container and container feature ID for this object only if it is
-	 * not contained by any container.
-	 * 
-	 * @see org.eclipse.emf.ecore.impl.BasicEObjectImpl#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject,
-	 *      int)
-	 */
-	public void eSetContainer(InternalEObject newContainer,
-			int newContainerFeatureID) {
-		if (eContainer() != null)
-			return;
-		super.eBasicSetContainer(newContainer, newContainerFeatureID);
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.impl.BasicEObjectImpl#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject,
-	 *      int)
-	 */
-	public void eBasicSetContainer(InternalEObject newContainer,
-			int newContainerFeatureID) {
-		super.eBasicSetContainer(newContainer, newContainerFeatureID);
-	}
-
-	/**
-	 * Sets the containing resource for this object.
-	 * 
-	 * @param res
-	 *            a resource
-	 */
-	public void eSetResource(Resource.Internal res) {
-		eProperties().setEResource(res);
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.impl.BasicEObjectImpl#eDirectResource()
-	 */
-	public Internal eDirectResource() {
-		return super.eDirectResource();
-	}
-
-	/**
-	 * Returns the resolved object represented by proxy. Proxy chains are
-	 * followed. If resourceSet is null, the global package registry is
-	 * consulted to obtain a package registered against the proxy URI, less its
-	 * fragment, in the same manner as the default resource set implementation's
-	 * fallback behaviour.
-	 * 
-	 * @param proxy
-	 *            the proxy to be resolved.
-	 * @param resourceSet
-	 *            the resource set in which to resolve.
-	 * @return the resolved object, or the proxy if unable to resolve.
-	 * @see org.eclipse.emf.ecore.util.EcoreUtil#resolve(org.eclipse.emf.ecore.EObject,
-	 *      org.eclipse.emf.ecore.resource.ResourceSet)
-	 */
-	private EObject resolveProxy(EObject proxy) {
-		ResourceSet resourceSet = eResource() != null ? eResource()
-				.getResourceSet() : null;
-
-		URI proxyURI = ((InternalEObject) proxy).eProxyURI();
-		if (proxyURI != null) {
-			try {
-				EObject resolvedObject = null;
-
-				if (resourceSet != null) {
-					if (resourceSet instanceof IUmaResourceSet) {
-						resolvedObject = ((IUmaResourceSet) resourceSet)
-								.getEObject(this, proxyURI, true);
-					} else {
-						resolvedObject = resourceSet.getEObject(proxyURI, true);
-					}
-				} else {
-					EPackage ePackage = EPackage.Registry.INSTANCE
-							.getEPackage(proxyURI.trimFragment().toString());
-					if (ePackage != null) {
-						Resource resource = ePackage.eResource();
-						if (resource != null) {
-							resolvedObject = resource.getEObject(proxyURI
-									.fragment().toString());
-						}
-					}
-				}
-
-				if (resolvedObject != null) {
-					if(resolvedObject != proxy) {
-//						return resolveProxy(resolvedObject);
-						return resolvedObject;
-					}
-				} else {
-					if (resourceSet instanceof IProxyResolutionListener) {
-						((IProxyResolutionListener) resourceSet)
-								.notifyException(new ResolveException(proxy,
-										(String) null, this));
-					}
-				}
-			} catch (RuntimeException exception) {
-				if (resourceSet instanceof IProxyResolutionListener) {
-					((IProxyResolutionListener) resourceSet)
-							.notifyException(new ResolveException(proxy,
-									exception, this));
-				}
-			}
-		}
-		return proxy;
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.InternalEObject#eResolveProxy(org.eclipse.emf.ecore.InternalEObject)
-	 */
-	public EObject eResolveProxy(InternalEObject proxy) {
-		EObject container = proxy.eContainer();
-		int featureID = proxy.eContainerFeatureID();
-		EObject result = null;
-
-		result = resolveProxy(proxy);
-
-		if (result != null && result instanceof MultiResourceEObject) {
-			if (proxy.eIsProxy() && result == proxy) {
-				// proxy could not be resolved
-				//
-				((MultiResourceEObject) result).valid = false;
-			} else {
-				((MultiResourceEObject) result).valid = true;
-
-				if (container != null) {
-					((MultiResourceEObject) result).eSetContainer(
-							(InternalEObject) container, featureID);
-				}
-
-				// merge the opposite feature map
-				//
-				if (result != proxy) {
-					if(proxy instanceof MultiResourceEObject) {
-						MultiResourceEObject myObj = (MultiResourceEObject) proxy;
-
-						if (myObj.oppositeFeatureMap != null
-								&& !myObj.oppositeFeatureMap.isEmpty()) {
-							Map newMap = ((MultiResourceEObject) result)
-							.getOppositeFeatureMap();
-							for (Iterator iter = myObj.getOppositeFeatureMap()
-									.entrySet().iterator(); iter.hasNext();) {
-								Map.Entry entry = (Map.Entry) iter.next();
-								if (entry.getValue() != null) {
-									OppositeFeature oppositeFeature = (OppositeFeature) entry
-									.getKey();
-									if (oppositeFeature.isMany()) {
-										List values = (List) newMap
-										.get(oppositeFeature);
-										if (values == null) {
-											newMap.put(oppositeFeature, entry
-													.getValue());
-										} else {
-											values.addAll((Collection) entry
-													.getValue());
-										}
-									} else {
-										newMap.put(oppositeFeature, entry
-												.getValue());
-									}
-								}
-							}
-							myObj.getOppositeFeatureMap().clear();
-						}
-					}
-					
-					ResourceSet resourceSet = eResource() != null ? eResource()
-							.getResourceSet() : null;
-					if (resourceSet instanceof IProxyResolutionListener) {
-						((IProxyResolutionListener) resourceSet).proxyResolved(
-								proxy, result);
-					}
-				}
-			}
-
-		}
-
-		return result;
-	}
-
-	private Map createOppositeFeatureMap() {
-		Map map = new HashMap();
-		for (Iterator iter = OppositeFeature.classOppositeFeaturesMap
-				.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry = (Map.Entry) iter.next();
-			Class cls = (Class) entry.getKey();
-			if (cls.isInstance(this)) {
-				for (Iterator iterator = ((Collection) entry.getValue())
-						.iterator(); iterator.hasNext();) {
-					map.put(iterator.next(), null);
-				}
-			}
-		}
-		if (map.isEmpty()) {
-			hasOppositeFeature = false;
-			return Collections.EMPTY_MAP;
-		}
-		return map;
-	}
-
-	/**
-	 * Gets the opposite feature map.
-	 * 
-	 * @return a map containing the opposite features mapped to their values
-	 */
-	public Map getOppositeFeatureMap() {
-		if (oppositeFeatureMap == null && hasOppositeFeature) {
-			oppositeFeatureMap = createOppositeFeatureMap();
-		}
-		if(oppositeFeatureMap == null) {
-			return Collections.EMPTY_MAP;
-		}
-		return oppositeFeatureMap;
-	}
-
-	/**
-	 * Gets the opposite feature map.
-	 * 
-	 * @return a map containing the opposite features mapped to their values or
-	 *         <code>null</code> if this object does not have any opposite
-	 *         feature or the map has not been created
-	 */
-	public Map basicGetOppositeFeatureMap() {
-		return oppositeFeatureMap;
-	}
-
-	/**
-	 * Gets the value of an opposite feature.
-	 * 
-	 * @param feature
-	 *            an opposite feature
-	 * @return the value for the opposite feature
-	 */
-	public Object getOppositeFeatureValue(OppositeFeature feature) {
-		Object value = getOppositeFeatureMap().get(feature);
-
-		// System.out.println("MultiResourceEObject.getOppositeFeatureValue():");
-		// System.out.println(" feature: " + feature);
-		// System.out.println(" value: " + value);
-		// System.out.println(" this: " + this);
-
-		if (feature.isMany()) {
-			if (value == null) {
-				return Collections.EMPTY_LIST;
-			}
-
-			return ((OppositeFeatureResolvingEList) value)
-					.getUnmodifiableList();
-		} else if (value instanceof EObject
-				&& ((EObject) value).eResource() == null) {
-			getOppositeFeatureMap().put(feature, null);
-			return null;
-		}
-
-		if (value instanceof InternalEObject
-				&& ((InternalEObject) value).eIsProxy()) {
-			EObject resolved = eResolveProxy((InternalEObject) value);
-			if (resolved != value) {
-				getOppositeFeatureMap().put(feature, resolved);
-				value = resolved;
-			}
-		}
-		return value;
-	}
-
-	/**
-	 * Gets the resource at a given location.
-	 * 
-	 * @param location
-	 *            the resource location
-	 * @return a resource in the workspace
-	 */
-	public static IResource getResourceForLocation(String location) {
-		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-		IPath path = new Path(location);
-		IResource resource;
-		File file =  new File(location);
-		if (file.isFile()) {
-			resource = workspaceRoot.getFileForLocation(path);
-			if(resource == null) {
-				IResource parentResource = getResourceForLocation(file
-						.getParent());
-				if(parentResource != null) {
-					try {
-						parentResource.refreshLocal(IResource.DEPTH_ONE, null);
-					} catch (CoreException e) {
-						CommonPlugin.INSTANCE.log(e);
-					}
-					resource = workspaceRoot.getFileForLocation(path);
-				}
-			}
-		} else {
-			resource = workspaceRoot.getContainerForLocation(path);
-		}
-		return resource;
-	}
-
-//	/* (non-Javadoc)
-//	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-//	 */
-//	public Object getAdapter(Class adapter) {
-//		if(adapter == IResource.class) {
-//			Resource resource = eResource();
-//			if(resource != null) {
-//				return getResourceForLocation(resource.getURI().toFileString());
-//			}
-//		}
-//		return null;
-//	}
-	
-	/**
-	 * Removes all opposite features registered with the system.
-	 */
-	public void removeFromAllOppositeFeatures() {
-		// find all features that have opposite features and clear those
-		// features. This will remove the references to
-		// unloaded object by those opposite features
-		//
-		for (Iterator iter = eClass().getEAllReferences().iterator(); iter
-				.hasNext();) {
-			EReference ref = (EReference) iter.next();
-			OppositeFeature oppositeFeature = OppositeFeature.getOppositeFeature(ref);
-			if(oppositeFeature != null) {
-				if(ref.isMany()) {
-					List list = (List) eGet(ref, false);					
-					if(!list.isEmpty()) {
-						if(!oppositeFeature.resolveOwner()) {
-							list.clear();
-						}
-						else if(list instanceof InternalEList) {
-							List basicList = ((InternalEList)list).basicList();
-							for(int i = basicList.size() - 1; i > -1; i--) {
-								EObject e = (EObject) basicList.get(i);
-								if(!e.eIsProxy()) {
-									list.remove(e);
-								}
-							}
-						}
-					}
-				}
-				else {
-					EObject e = (EObject) eGet(ref, false);
-					if(e != null && !e.eIsProxy()) {
-						eSet(ref, null);
-					}
-				}
-			}
-		}
-
-	}
-
-	/**
-	 * @see org.eclipse.epf.uma.ecore.IModelObject#getOppositeFeatures()
-	 */
-	public Collection getOppositeFeatures() {
-		return getOppositeFeatureMap().keySet();
-	}
-
-	/**
-	 * @see org.eclipse.epf.uma.ecore.IModelObject#getDefaultValue(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public Object getDefaultValue(EStructuralFeature feature) {
-		return featureToDefaultValueMap.get(feature);
-	}
-	
-	protected Collection getFeaturesWithOverridenDefaultValue() {
-		if (featureToDefaultValueMap.isEmpty())
-			return Collections.EMPTY_LIST;
-		
-		if(featuresWithOverridenDefaultValue == null) {
-			featuresWithOverridenDefaultValue = new ArrayList();
-			for (Iterator iter = featureToDefaultValueMap.keySet().iterator(); iter
-					.hasNext();) {
-				EStructuralFeature feature = (EStructuralFeature) iter.next();
-				if(eClass().getFeatureID(feature) != -1) {
-					featuresWithOverridenDefaultValue.add(feature);
-				}
-			}
-			if(featuresWithOverridenDefaultValue.isEmpty()) {
-				featuresWithOverridenDefaultValue = Collections.EMPTY_LIST;
-			}
-		}
-		return featuresWithOverridenDefaultValue;
-	}
-	
-	/**
-	 * Unregisters a feature whose default value has been overriden.
-	 * 
-	 * @param feature
-	 *            a feature
-	 */
-	public void removeFeatureWithOverridenDefaultValue(
-			EStructuralFeature feature) {
-		if(featuresWithOverridenDefaultValue != null) {
-			try {
-				featuresWithOverridenDefaultValue.remove(feature);
-			} catch (Exception e) {
-				//
-			}
-		}
-	}
-
-	/**
-	 * Check all features if 
-	 *
-	 */
-	protected void reassignDefaultValues() {
-		Collection features = getFeaturesWithOverridenDefaultValue();
-		if(features.isEmpty()) {
-			return;
-		}
-		
-		for (Iterator iter = features.iterator(); iter.hasNext();) {
-			EStructuralFeature feature = (EStructuralFeature) iter.next();
-			eSet(feature, getDefaultValue(feature));
-		}
-	}
-	
-	protected EStructuralFeature getFeatureWithOverridenDefaultValue(
-			int featureID) {
-		Collection features = getFeaturesWithOverridenDefaultValue();
-		if(!features.isEmpty()) {
-			EStructuralFeature feature = eClass().getEStructuralFeature(
-					featureID);
-			if(feature != null && features.contains(feature)) {
-				return feature;
-			}
-		}
-		return null;
-	}
-	
-	protected boolean isFeatureWithOverridenDefaultValueSet(
-			EStructuralFeature feature) {
-		Object defaultValue = getDefaultValue(feature);
-		Object value = eGet(feature, false);
-		if(feature.isMany()) {
-			return value != null && !((Collection) value).isEmpty()
-					&& value != defaultValue;
-		} else {
-			return defaultValue == null ? value != null : !defaultValue
-					.equals(value);
-		}
-		}
-	}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/impl/package.html b/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/impl/package.html
deleted file mode 100755
index 02e6225..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/impl/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the implementation for the UMA Ecore extension.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/package.html b/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/package.html
deleted file mode 100755
index c5ca906..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces for the UMA Ecore extension.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/EObjectContainmentResolvingEList.java b/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/EObjectContainmentResolvingEList.java
deleted file mode 100755
index fcbe6dc..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/EObjectContainmentResolvingEList.java
+++ /dev/null
@@ -1,99 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.ecore.util;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- * @deprecated
- */
-public class EObjectContainmentResolvingEList extends EObjectContainmentEList {
-
-	private static final long serialVersionUID = 5349833630551976488L;
-
-	public static class Unsettable extends EObjectContainmentResolvingEList {
-
-		private static final long serialVersionUID = -5117004151476522719L;
-
-		protected boolean isSet;
-
-		public Unsettable(Class dataClass, InternalEObject owner, int featureID) {
-			super(dataClass, owner, featureID);
-		}
-
-		protected void didChange() {
-			isSet = true;
-		}
-
-		public boolean isSet() {
-			return isSet;
-		}
-
-		public void unset() {
-			super.unset();
-			if (isNotificationRequired()) {
-				boolean oldIsSet = isSet;
-				isSet = false;
-				owner.eNotify(createNotification(Notification.UNSET, oldIsSet,
-						false));
-			} else {
-				isSet = false;
-			}
-		}
-	}
-
-	public EObjectContainmentResolvingEList(Class dataClass,
-			InternalEObject owner, int featureID) {
-		super(dataClass, owner, featureID);
-	}
-
-	protected boolean hasProxies() {
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.util.BasicEList#resolve(int,
-	 *      java.lang.Object)
-	 */
-	protected Object resolve(int index, Object object) {
-		MultiResourceEObject eObj = (MultiResourceEObject) resolve(index,
-				(EObject) object);
-		eObj.eSetContainer(owner, InternalEObject.EOPPOSITE_FEATURE_BASE
-				- getFeatureID());
-		return eObj;
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.util.EcoreEList#contains(java.lang.Object)
-	 */
-	public boolean contains(Object object) {
-		if (isEObject()) {
-			boolean result = super.contains(object);
-			if (hasProxies() && !result) {
-				for (int i = 0; i < size; ++i) {
-					EObject eObject = resolveProxy((EObject) data[i]);
-					if (eObject == object) {
-						return true;
-					}
-				}
-			}
-			return result;
-		}
-		return super.contains(object);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/EObjectContainmentResolvingWithInverseEList.java b/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/EObjectContainmentResolvingWithInverseEList.java
deleted file mode 100755
index bb03d13..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/EObjectContainmentResolvingWithInverseEList.java
+++ /dev/null
@@ -1,79 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.ecore.util;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.InternalEObject;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- * @deprecated
- */
-public class EObjectContainmentResolvingWithInverseEList extends
-		EObjectContainmentResolvingEList {
-
-	private static final long serialVersionUID = -122177081657171857L;
-
-	public static class Unsettable extends
-			EObjectContainmentResolvingWithInverseEList {
-
-		private static final long serialVersionUID = -8239294568676270078L;
-
-		protected boolean isSet;
-
-		public Unsettable(Class dataClass, InternalEObject owner,
-				int featureID, int inverseFeatureID) {
-			super(dataClass, owner, featureID, inverseFeatureID);
-		}
-
-		protected void didChange() {
-			isSet = true;
-		}
-
-		public boolean isSet() {
-			return isSet;
-		}
-
-		public void unset() {
-			super.unset();
-			if (isNotificationRequired()) {
-				boolean oldIsSet = isSet;
-				isSet = false;
-				owner.eNotify(createNotification(Notification.UNSET, oldIsSet,
-						false));
-			} else {
-				isSet = false;
-			}
-		}
-	}
-
-	protected final int inverseFeatureID;
-
-	public EObjectContainmentResolvingWithInverseEList(Class dataClass,
-			InternalEObject owner, int featureID, int inverseFeatureID) {
-		super(dataClass, owner, featureID);
-		this.inverseFeatureID = inverseFeatureID;
-	}
-
-	protected boolean hasNavigableInverse() {
-		return true;
-	}
-
-	public int getInverseFeatureID() {
-		return inverseFeatureID;
-	}
-
-	public Class getInverseFeatureClass() {
-		return dataClass;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/EventTypes.java b/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/EventTypes.java
deleted file mode 100755
index 2621536..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/EventTypes.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.ecore.util;
-
-import org.eclipse.emf.common.notify.Notification;
-
-/**
- * Defines additional notification event types.
- * <p>
- * This class is reserved for future use.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- * @see org.eclipse.emf.common.notify.Notification
- */
-public final class EventTypes {
-
-	public static final int MAKE_PROXY = Notification.EVENT_TYPE_COUNT + 1;
-
-}
diff --git a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/OppositeFeature.java b/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/OppositeFeature.java
deleted file mode 100755
index e1462a5..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/OppositeFeature.java
+++ /dev/null
@@ -1,215 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.ecore.util;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * Supports the reverse traversal of an association between two model objects.
- * 
- * @author Phong Nguyen Le
- * @author Kelvin Low
- * @since 1.0
- */
-public class OppositeFeature {
-
-	private String name;
-
-	private EStructuralFeature targetFeature;
-
-	private boolean isMany;
-
-	private boolean resolveOwner = true;
-
-	private Class ownerClass;
-
-	//private static boolean deliverOnResolve;
-
-	/**
-	 * Maps source model objects to OppositeFeature objects.
-	 */
-	public static final Map classOppositeFeaturesMap = new HashMap();
-
-	/**
-	 * Maps EStructuralFeature objects to OppositeFeature objects.
-	 */
-	public static final Map featureOppositeFeatureMap = new HashMap();
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param ownerClass
-	 *            the model class that owns this opposite feature
-	 * @param name
-	 *            the name of this opposite feature
-	 * @param targetFeature
-	 *            the feature which this opposite feature is based on
-	 * @param isMany
-	 *            if <true>, the multiplicity of the association is unbounded
-	 * @param resolveOwner
-	 *            if <true>, resolve the owner class if it is a proxy
-	 */
-	public OppositeFeature(Class ownerClass, String name,
-			EStructuralFeature targetFeature, boolean isMany,
-			boolean resolveOwner) {
-		this.ownerClass = ownerClass;
-		this.name = name;
-		this.targetFeature = targetFeature;
-		this.isMany = isMany;
-		this.resolveOwner = resolveOwner;
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param ownerClass
-	 *            the model class that owns this opposite feature
-	 * @param name
-	 *            the name of this opposite feature
-	 * @param targetFeature
-	 *            the feature which this opposite feature is based on
-	 * @param isMany
-	 *            if <true>, the multiplicity of the association is unbounded
-	 */
-	public OppositeFeature(Class ownerClass, String name,
-			EStructuralFeature targetFeature, boolean isMany) {
-		this(ownerClass, name, targetFeature, isMany, true);
-	}
-
-	/**
-	 * Gets the modal class that owns this opposite feature.
-	 * 
-	 * @return the modal class that owns this opposite feature
-	 */
-	public Class getOwnerClass() {
-		return ownerClass;
-	}
-
-	/**
-	 * Checks whether the association is unbounded.
-	 * 
-	 * @return <code>true</code> if the association is unbounded
-	 */
-	public boolean isMany() {
-		return isMany;
-	}
-
-	/**
-	 * Gets the name of this opposite feature.
-	 * 
-	 * @return the opposite feature name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Gets the feature which this opposite feature is based on.
-	 * 
-	 * @return the original feature generated by EMF
-	 */
-	public EStructuralFeature getTargetFeature() {
-		return targetFeature;
-	}
-
-	/**
-	 * Gets the ID of this opposite feature.
-	 * 
-	 * @return the opposite feature ID
-	 */
-	public int getFeatureID() {
-		return -1 - targetFeature.getFeatureID();
-	}
-
-	/**
-	 * Checks whether the owner class of this opposite feature, if proxied,
-	 * should be resolved when the target feature is set.
-	 * 
-	 * @return <true> if the owner class, if proxied, should be resolved
-	 */
-	public boolean resolveOwner() {
-		return resolveOwner;
-	}
-
-	/**
-	 * Gets a string representation of this opposite feature.
-	 * 
-	 * @return A <code>String</code> containing the key attributes of this
-	 *         opposite feature.
-	 */
-	public String toString() {
-		return name + "[targetFeature=" + targetFeature //$NON-NLS-1$
-				+ ", isMany=" + isMany + "]"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * Registers the given opposite feature.
-	 * 
-	 * @param oppositeFeature
-	 *            the opposite feature to register
-	 */
-	public static final void registerOppositeFeature(
-			OppositeFeature oppositeFeature) {
-		Class cls = oppositeFeature.getOwnerClass();
-		Set features = (Set) classOppositeFeaturesMap.get(cls);
-		if (features == null) {
-			features = new HashSet();
-			classOppositeFeaturesMap.put(cls, features);
-		}
-		features.add(oppositeFeature);
-
-		featureOppositeFeatureMap.put(oppositeFeature.getTargetFeature(),
-				oppositeFeature);
-	}
-
-	/**
-	 * Checks whether notification is sent when a proxy owner class is resolved.
-	 * 
-	 * @return <code>true</code> if notification is being sent when a proxy
-	 *         owner class is resolved
-	 */
-	/*
-	public static final boolean isDeliverOnResolve() {
-		return deliverOnResolve;
-	}
-	*/
-
-	/**
-	 * Enables notification when a proxy owner class is resolved.
-	 * 
-	 * @param enableNotification
-	 *            if <code>true</code>, send notification when a proxy owner
-	 *            class is resolved
-	 */
-	/*
-	public static final void setDeliverOnResolve(boolean enableNotification) {
-		deliverOnResolve = enableNotification;
-	}
-	*/
-
-	/**
-	 * Gets the opposite feature for the given feature.
-	 * 
-	 * @param feature
-	 *            an EMF <code>EStructuralFeature</code> feature
-	 * @return an opposite feature that is based on the given feature
-	 */
-	public static final OppositeFeature getOppositeFeature(
-			EStructuralFeature feature) {
-		return (OppositeFeature) featureOppositeFeatureMap.get(feature);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/OppositeFeatureNotification.java b/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/OppositeFeatureNotification.java
deleted file mode 100755
index f221be5..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/OppositeFeatureNotification.java
+++ /dev/null
@@ -1,64 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.ecore.util;
-
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-
-/**
- * Notification associated with an opposite feature.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class OppositeFeatureNotification extends NotificationImpl {
-
-	private OppositeFeature oppositeFeature;
-
-	private Object notifier;
-
-	/**
-	 * @param eventType
-	 *            the type of event
-	 * @param oppositeFeature
-	 *            the opposite feature associated with this notification
-	 * @param oldValue
-	 *            the old value
-	 * @param newValue
-	 *            the new value
-	 * @param position
-	 *            the positition at which the change occurred
-	 * @param wasSet
-	 */
-	public OppositeFeatureNotification(Object notifier, int eventType,
-			OppositeFeature oppositeFeature, Object oldValue, Object newValue,
-			int position, boolean wasSet) {
-		super(eventType, oldValue, newValue, position, wasSet);
-		this.notifier = notifier;
-		this.oppositeFeature = oppositeFeature;
-	}
-
-	/**
-	 * Gets the opposite feature that is associated with this notification.
-	 * 
-	 * @return the opposite feature associated with this notification
-	 */
-	public OppositeFeature getOppsiteFeature() {
-		return oppositeFeature;
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.notify.impl.NotificationImpl#getNotifier()
-	 */
-	public Object getNotifier() {
-		return notifier;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/OppositeFeatureResolvingEList.java b/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/OppositeFeatureResolvingEList.java
deleted file mode 100755
index db534fe..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/OppositeFeatureResolvingEList.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.ecore.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.emf.common.notify.impl.NotifyingListImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-
-/**
- * A list for resolving multi-valued opposite features.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class OppositeFeatureResolvingEList extends NotifyingListImpl {
-
-	private static final long serialVersionUID = 3690198763000051768L;
-
-	private MultiResourceEObject owner;
-
-	private OppositeFeature oppositeFeature;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param owner
-	 *            the owner of an opposite feature
-	 * @param oppositeFeature
-	 *            an opposite feature
-	 */
-	public OppositeFeatureResolvingEList(MultiResourceEObject owner,
-			OppositeFeature oppositeFeature) {
-		super();
-		this.owner = owner;
-		this.oppositeFeature = oppositeFeature;
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#getNotifier()
-	 */
-	public Object getNotifier() {
-		return owner;
-	}
-
-	protected EObject resolveProxy(EObject eObject) {
-		return eObject.eIsProxy() ? owner
-				.eResolveProxy((InternalEObject) eObject) : eObject;
-	}
-
-	protected NotificationImpl createNotification(int eventType,
-			Object oldObject, Object newObject, int index, boolean wasSet) {
-		return new OppositeFeatureNotification(owner, eventType,
-				oppositeFeature, oldObject, newObject, index, wasSet);
-	}
-
-	protected boolean isNotificationRequired() {
-		return owner.eNotificationRequired();
-	}
-
-	protected Object resolve(int index, Object object) {
-		if (!(object instanceof EObject))
-			return object;
-		EObject eObject = (EObject) object;
-		EObject resolved = resolveProxy(eObject);
-		if (resolved != eObject) {
-			Object oldObject = data[index];
-			assign(index, validate(index, resolved));
-
-			didSet(index, resolved, oldObject);
-
-			// if (isNotificationRequired())
-			// {
-			// owner.eNotify(createNotification(Notification.RESOLVE, eObject,
-			// resolved, index, false));
-			// }
-
-			return resolved;
-		} else {
-			return eObject;
-		}
-
-	}
-
-	private void removeDanglingObjects() {
-		for (Iterator iter = iterator(); iter.hasNext();) {
-			EObject obj = (EObject) iter.next();
-			if (obj.eResource() == null) {
-				iter.remove();
-			}
-		}
-	}
-
-	/**
-	 * Returns an unmodifiable list that stores the opposite feature values.
-	 * 
-	 * @return an unmodifiable list
-	 */
-	public List getUnmodifiableList() {
-		removeDanglingObjects();
-		return new UnmodifiableEList(size, data);
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/package.html b/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/package.html
deleted file mode 100755
index 0aefe51..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/util/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides implementation support for the UMA Ecore extension.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma.ecore/templates/Header.javajetinc b/plugins/org.eclipse.epf.uma.ecore/templates/Header.javajetinc
deleted file mode 100755
index 410569b..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/templates/Header.javajetinc
+++ /dev/null
@@ -1,10 +0,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
-//------------------------------------------------------------------------------
diff --git a/plugins/org.eclipse.epf.uma.ecore/templates/model/Class.javajet b/plugins/org.eclipse.epf.uma.ecore/templates/model/Class.javajet
deleted file mode 100755
index 87e9556..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/templates/model/Class.javajet
+++ /dev/null
@@ -1,1821 +0,0 @@
-<%@ jet package="org.eclipse.emf.codegen.ecore.templates.model" imports="java.util.* org.eclipse.emf.codegen.ecore.genmodel.*" class="Class" version="$Id: Class.javajet,v 1.4 2006/07/18 00:56:09 bxu Exp $" %>
-<%
-/**
- * <copyright>
- *
- * Copyright (c) 2002-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 - Initial API and implementation
- *
- * </copyright>
- */
-%>
-<%final GenClass genClass = (GenClass)((Object[])argument)[0]; final GenPackage genPackage = genClass.getGenPackage(); final GenModel genModel=genPackage.getGenModel();%>
-<%final boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); final boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]);%>
-<%final String publicStaticFinalFlag = isImplementation ? "public static final " : "";%>
-<%@ include file="../Header.javajetinc"%>
-<%if (isInterface) {%>
-package <%=genPackage.getInterfacePackageName()%>;
-<%} else {%>
-package <%=genPackage.getClassPackageName()%>;
-<%}%>
-
-<%genModel.markImportLocation(stringBuffer, genPackage);%>
-
-<%if (isInterface) {%>
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b><%=genClass.getFormattedName()%></b></em>'.
- * <!-- end-user-doc -->
-<%if (genClass.hasDocumentation()) {%>
- *
- * <!-- begin-model-doc -->
- * <%=genClass.getDocumentation(genModel.getIndentation(stringBuffer))%>
- * <!-- end-model-doc -->
-<%}%>
- *
-<%if (!genClass.getGenFeatures().isEmpty()) {%>
- * <p>
- * The following features are supported:
- * <ul>
-<%for (Iterator i=genClass.getGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%if (!genFeature.isSuppressedGetVisibility()) {%>
- *   <li>{@link <%=genClass.getQualifiedInterfaceName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}</li>
-  <%}%>
-<%}%>
- * </ul>
- * </p>
-<%}%>
- *
-<%if (!genModel.isSuppressEMFMetaData()) {%>
- * @see <%=genPackage.getQualifiedPackageInterfaceName()%>#get<%=genClass.getClassifierAccessorName()%>()
-<%}%>
-<%if (!genModel.isSuppressEMFModelTags()) { boolean first = true; for (StringTokenizer stringTokenizer = new StringTokenizer(genClass.getModelInfo(), "\n\r"); stringTokenizer.hasMoreTokens(); ) { String modelInfo = stringTokenizer.nextToken(); if (first) { first = false;%>
- * @model <%=modelInfo%>
-<%} else {%>
- *        <%=modelInfo%>
-<%}} if (first) {%>
- * @model
-<%}}%>
-<%if (genClass.needsRootExtendsInterfaceExtendsTag()) {%>
- * @extends <%=genModel.getImportedName(genModel.getRootExtendsInterface())%>
-<%}%>
- * @generated
- */
-<%} else {%>
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b><%=genClass.getFormattedName()%></b></em>'.
- * <!-- end-user-doc -->
- * <p>
-<%if (!genClass.getImplementedGenFeatures().isEmpty()) {%>
- * The following features are implemented:
- * <ul>
-<%for (Iterator i=genClass.getImplementedGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
- *   <li>{@link <%=genClass.getQualifiedClassName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}</li>
-<%}%>
- * </ul>
-<%}%>
- * </p>
- *
- * @generated
- */
-<%}%>
-<%if (isImplementation) {%>
-public<%if (genClass.isAbstract()) {%> abstract<%}%> class <%=genClass.getClassName()%><%=genClass.getClassExtends()%><%=genClass.getClassImplements()%>
-<%} else {%>
-public interface <%=genClass.getInterfaceName()%><%=genClass.getInterfaceExtends()%>
-<%}%>
-{
-<%if (genModel.getCopyrightText() != null) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	<%=publicStaticFinalFlag%><%=genModel.getImportedName("java.lang.String")%> copyright = "<%=genModel.getCopyrightText()%>";<%=genModel.getNonNLS()%>
-
-<%}%>
-<%if (isImplementation && genModel.getDriverNumber() != null) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final <%=genModel.getImportedName("java.lang.String")%> mofDriverNumber = "<%=genModel.getDriverNumber()%>";<%=genModel.getNonNLS()%>
-
-<%}%>
-<%if (isImplementation && genClass.isJavaIOSerializable()) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-<%}%>
-<%if (isImplementation && genModel.isVirtualDelegation()) { String eVirtualValuesField = genClass.getEVirtualValuesField();%>
-  <%if (eVirtualValuesField != null) {%>
-	/**
-	 * An array of objects representing the values of non-primitive features.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Object[] <%=eVirtualValuesField%> = null;
-
-  <%}%>
-  <%{ List eVirtualIndexBitFields = genClass.getEVirtualIndexBitFields(new ArrayList());%>
-    <%if (!eVirtualIndexBitFields.isEmpty()) {%>
-      <%for (Iterator i = eVirtualIndexBitFields.iterator(); i.hasNext();) { String eVirtualIndexBitField = (String)i.next();%>
-	/**
-	 * A bit field representing the indices of non-primitive feature values.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected int <%=eVirtualIndexBitField%> = 0;
-
-      <%}%>
-    <%}%>
-  <%}%>
-<%}%>
-<%if (isImplementation && genClass.isModelRoot() && genModel.isBooleanFlagsEnabled() && genModel.getBooleanFlagsReservedBits() == -1) {%>
-	/**
-	 * A set of bit flags representing the values of boolean attributes and whether unsettable features have been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected int <%=genModel.getBooleanFlagsField()%> = 0;
-
-<%}%>
-<%if (isImplementation && !genModel.isReflectiveDelegation()) {%>
-  <%for (Iterator i=genClass.getDeclaredFieldGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-<%@ include file="Class/declaredFieldGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-    <%if (genFeature.isListType() || genFeature.isReferenceType()) {%>
-      <%if (genClass.isField(genFeature)) {%>
-	/**
-	 * The cached value of the '{@link #<%=genFeature.getGetAccessor()%>() <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #<%=genFeature.getGetAccessor()%>()
-	 * @generated
-	 * @ordered
-	 */
-	protected <%=genFeature.getImportedInternalType()%> <%=genFeature.getSafeName()%> = null;
-
-      <%}%>
-      <%if (genModel.isArrayAccessors() && !genFeature.isFeatureMapType() && !genFeature.isMapType()) {%>
-	/**
-	 * The empty value for the '{@link #<%=genFeature.getGetArrayAccessor()%>() <em><%=genFeature.getFormattedName()%></em>}' array accessor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #<%=genFeature.getGetArrayAccessor()%>()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final <%=genFeature.getListItemType()%>[] <%=genFeature.getUpperName()%>_EEMPTY_ARRAY = new <%=genFeature.getListItemType()%> [0];
-
-      <%}%>
-    <%} else {%>
-      <%if (!genFeature.isVolatile() || !genModel.isReflectiveDelegation() && (!genFeature.hasDelegateFeature() || !genFeature.isUnsettable())) {%>
-	/**
-	 * The default value of the '{@link #<%=genFeature.getGetAccessor()%>() <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #<%=genFeature.getGetAccessor()%>()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final <%=genFeature.getImportedType()%> <%=genFeature.getUpperName()%>_EDEFAULT = <%=genFeature.getStaticDefaultValue()%>;<%=genModel.getNonNLS(genFeature.getStaticDefaultValue())%>
-
-      <%}%>
-      <%if (genClass.isField(genFeature)) {%>
-        <%if (genClass.isFlag(genFeature)) {%>
-          <%if (genClass.getFlagIndex(genFeature) > 31 && genClass.getFlagIndex(genFeature) % 32 == 0) {%>
-	/**
-	 * An additional set of bit flags representing the values of boolean attributes and whether unsettable features have been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected int <%=genClass.getFlagsField(genFeature)%> = 0;
-
-          <%}%>
-	/**
-	 * The flag representing the value of the '{@link #<%=genFeature.getGetAccessor()%>() <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #<%=genFeature.getGetAccessor()%>()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int <%=genFeature.getUpperName()%>_EFLAG = 1 <%="<< " + genClass.getFlagIndex(genFeature) % 32 %>;
-
-        <%} else {%>
-	/**
-	 * The cached value of the '{@link #<%=genFeature.getGetAccessor()%>() <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #<%=genFeature.getGetAccessor()%>()
-	 * @generated
-	 * @ordered
-	 */
-	protected <%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = <%=genFeature.getUpperName()%>_EDEFAULT;
-
-        <%}%>
-      <%}%>
-    <%}%>
-    <%if (genClass.isESetField(genFeature)) {%>
-      <%if (genClass.isESetFlag(genFeature)) {%>
-        <%if (genClass.getESetFlagIndex(genFeature) > 31 && genClass.getESetFlagIndex(genFeature) % 32 == 0) {%>
-	/**
-	 * An additional set of bit flags representing the values of boolean attributes and whether unsettable features have been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected int <%=genClass.getESetFlagsField(genFeature)%> = 0;
-
-        <%}%>
-	/**
-	 * The flag representing whether the <%=genFeature.getFormattedName()%> <%=genFeature.getFeatureKind()%> has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int <%=genFeature.getUpperName()%>_ESETFLAG = 1 <%="<< " + genClass.getESetFlagIndex(genFeature) % 32 %>;
-
-      <%} else {%>
-	/**
-	 * This is true if the <%=genFeature.getFormattedName()%> <%=genFeature.getFeatureKind()%> has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean <%=genFeature.getUncapName()%>ESet = false;
-
-      <%}%>
-    <%}%>
-  <%}%>
-<%@ include file="Class/declaredFieldGenFeature.insert.javajetinc" fail="silent" %>
-<%@ end %><%//Class/declaredFieldGenFeature.override.javajetinc%>
-<%}%>
-<%if (isImplementation) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected <%=genClass.getClassName()%>()
-	{
-		super();
-  <%for (Iterator i=genClass.getFlagGenFeatures("true").iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-		<%=genClass.getFlagsField(genFeature)%> |= <%=genFeature.getUpperName()%>_EFLAG;
-  <%}%>
-  
- //UMA-->
- 		reassignDefaultValues();
- //UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected <%=genModel.getImportedName("org.eclipse.emf.ecore.EClass")%> eStaticClass()
-	{
-		return <%=genClass.getQualifiedClassifierAccessor()%>;
-	}
-
-<%}%>
-<%new Runnable() { public void run() {%>
-<%for (Iterator i=(isImplementation ? genClass.getImplementedGenFeatures() : genClass.getDeclaredGenFeatures()).iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-<%@ include file="Class/genFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-  <%if (genModel.isArrayAccessors() && genFeature.isListType() && !genFeature.isFeatureMapType() && !genFeature.isMapType()) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    <%if (!isImplementation) {%>
-	<%=genFeature.getListItemType()%>[] <%=genFeature.getGetArrayAccessor()%>();
-
-    <%} else {%>
-	public <%=genFeature.getListItemType()%>[] <%=genFeature.getGetArrayAccessor()%>()
-	{
-      <%if (genFeature.isVolatile()) {%>
-		<%=genModel.getImportedName("org.eclipse.emf.common.util.BasicEList")%> list = (<%=genModel.getImportedName("org.eclipse.emf.common.util.BasicEList")%>)<%=genFeature.getGetAccessor()%>();
-		if (list.isEmpty()) return <%=genFeature.getUpperName()%>_EEMPTY_ARRAY;
-      <%} else {%>
-		if (<%=genFeature.getSafeName()%> == null || <%=genFeature.getSafeName()%>.isEmpty()) return <%=genFeature.getUpperName()%>_EEMPTY_ARRAY;
-		<%=genModel.getImportedName("org.eclipse.emf.common.util.BasicEList")%> list = (<%=genModel.getImportedName("org.eclipse.emf.common.util.BasicEList")%>)<%=genFeature.getSafeName()%>;
-      <%}%>
-		list.shrink();
-		return (<%=genFeature.getListItemType()%>[])list.data();
-	}
-
-    <%}%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    <%if (!isImplementation) {%>
-	<%=genFeature.getListItemType()%> get<%=genFeature.getAccessorName()%>(int index);
-
-    <%} else {%>
-	public <%=genFeature.getListItemType()%> get<%=genFeature.getAccessorName()%>(int index)
-	{
-		return (<%=genFeature.getListItemType()%>)<%=genFeature.getGetAccessor()%>().get(index);
-	}
-
-    <%}%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    <%if (!isImplementation) {%>
-	int get<%=genFeature.getAccessorName()%>Length();
-
-    <%} else {%>
-	public int get<%=genFeature.getAccessorName()%>Length()
-	{
-      <%if (genFeature.isVolatile()) {%>
-		return <%=genFeature.getGetAccessor()%>().size();
-      <%} else {%>
-		return <%=genFeature.getSafeName()%> == null ? 0 : <%=genFeature.getSafeName()%>.size();
-      <%}%>
-	}
-
-    <%}%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    <%if (!isImplementation) {%>
-	void set<%=genFeature.getAccessorName()%>(<%=genFeature.getListItemType()%>[] new<%=genFeature.getCapName()%>);
-
-    <%} else {%>
-	public void set<%=genFeature.getAccessorName()%>(<%=genFeature.getListItemType()%>[] new<%=genFeature.getCapName()%>)
-	{
-		((<%=genModel.getImportedName("org.eclipse.emf.common.util.BasicEList")%>)<%=genFeature.getGetAccessor()%>()).setData(new<%=genFeature.getCapName()%>.length, new<%=genFeature.getCapName()%>);
-	}
-
-    <%}%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    <%if (!isImplementation) {%>
-	void set<%=genFeature.getAccessorName()%>(int index, <%=genFeature.getListItemType()%> element);
-
-    <%} else {%>
-	public void set<%=genFeature.getAccessorName()%>(int index, <%=genFeature.getListItemType()%> element)
-	{
-		<%=genFeature.getGetAccessor()%>().set(index, element);
-	}
-
-    <%}%>
-  <%}%>
-  <%if (genFeature.isGet() && (isImplementation || !genFeature.isSuppressedGetVisibility())) {%>
-<%@ include file="Class/getGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-<%if (isInterface) {%>
-	/**
-	 * Returns the value of the '<em><b><%=genFeature.getFormattedName()%></b></em>' <%=genFeature.getFeatureKind()%>.
-    <%if (genFeature.isListType()) {%>
-      <%if (genFeature.isMapType()) { GenFeature keyFeature = genFeature.getMapEntryTypeGenClass().getMapEntryKeyFeature(); GenFeature valueFeature = genFeature.getMapEntryTypeGenClass().getMapEntryValueFeature(); %>
-	 * The key is of type <%if (keyFeature.isListType()) {%>list of {@link <%=keyFeature.getQualifiedListItemType()%>}<%} else {%>{@link <%=keyFeature.getType()%>}<%}%>,
-	 * and the value is of type <%if (valueFeature.isListType()) {%>list of {@link <%=valueFeature.getQualifiedListItemType()%>}<%} else {%>{@link <%=valueFeature.getType()%>}<%}%>,
-      <%} else if (!genFeature.isWrappedFeatureMapType() && !(genModel.isSuppressEMFMetaData() && "org.eclipse.emf.ecore.EObject".equals(genFeature.getQualifiedListItemType()))) {%>
-	 * The list contents are of type {@link <%=genFeature.getQualifiedListItemType()%>}.
-      <%}%>
-    <%} else if (genFeature.isSetDefaultValue()) {%>
-	 * The default value is <code><%=genFeature.getDefaultValue()%></code>.
-    <%}%>
-    <%if (genFeature.getTypeGenEnum() != null) {%>
-	 * The literals are from the enumeration {@link <%=genFeature.getTypeGenEnum().getQualifiedName()%>}.
-    <%}%>
-    <%if (genFeature.isBidirectional() && !genFeature.getReverse().getGenClass().isMapEntry()) { GenFeature reverseGenFeature = genFeature.getReverse(); %>
-      <%if (!reverseGenFeature.isSuppressedGetVisibility()) {%>
-	 * It is bidirectional and its opposite is '{@link <%=reverseGenFeature.getGenClass().getQualifiedInterfaceName()%>#<%=reverseGenFeature.getGetAccessor()%> <em><%=reverseGenFeature.getFormattedName()%></em>}'.
-      <%}%>
-    <%}%>
-	 * <!-- begin-user-doc -->
-    <%if (!genFeature.hasDocumentation()) {%>
-	 * <p>
-	 * If the meaning of the '<em><%=genFeature.getFormattedName()%></em>' <%=genFeature.getFeatureKind()%> isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-    <%}%>
-	 * <!-- end-user-doc -->
-    <%if (genFeature.hasDocumentation()) {%>
-	 * <!-- begin-model-doc -->
-	 * <%=genFeature.getDocumentation(genModel.getIndentation(stringBuffer))%>
-	 * <!-- end-model-doc -->
-    <%}%>
-	 * @return the value of the '<em><%=genFeature.getFormattedName()%></em>' <%=genFeature.getFeatureKind()%>.
-    <%if (genFeature.getTypeGenEnum() != null) {%>
-	 * @see <%=genFeature.getTypeGenEnum().getQualifiedName()%>
-    <%}%>
-    <%if (genFeature.isUnsettable()) {%>
-      <%if (!genFeature.isSuppressedIsSetVisibility()) {%>
-	 * @see #isSet<%=genFeature.getAccessorName()%>()
-      <%}%>
-      <%if (genFeature.isChangeable() && !genFeature.isSuppressedUnsetVisibility()) {%>
-	 * @see #unset<%=genFeature.getAccessorName()%>()
-      <%}%>
-    <%}%>
-    <%if (genFeature.isChangeable() && !genFeature.isListType() && !genFeature.isSuppressedSetVisibility()) {%>
-	 * @see #set<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedType()%>)
-    <%}%>
-    <%if (!genModel.isSuppressEMFMetaData()) {%>
-	 * @see <%=genPackage.getQualifiedPackageInterfaceName()%>#get<%=genFeature.getFeatureAccessorName()%>()
-    <%}%>
-    <%if (genFeature.isBidirectional() && !genFeature.getReverse().getGenClass().isMapEntry()) { GenFeature reverseGenFeature = genFeature.getReverse(); %>
-      <%if (!reverseGenFeature.isSuppressedGetVisibility()) {%>
-	 * @see <%=reverseGenFeature.getGenClass().getQualifiedInterfaceName()%>#<%=reverseGenFeature.getGetAccessor()%>
-      <%}%>
-    <%}%>
-    <%if (!genModel.isSuppressEMFModelTags()) { boolean first = true; for (StringTokenizer stringTokenizer = new StringTokenizer(genFeature.getModelInfo(), "\n\r"); stringTokenizer.hasMoreTokens(); ) { String modelInfo = stringTokenizer.nextToken(); if (first) { first = false;%>
-	 * @model <%=modelInfo%>
-    <%} else {%>
-	 *        <%=modelInfo%>
-    <%}} if (first) {%>
-	 * @model
-    <%}}%>
-	 * @generated
-	 */
-<%} else {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-<%}%>
-<%if (!isImplementation) {%>
-	<%=genFeature.getImportedType()%> <%=genFeature.getGetAccessor()%>();
-
-<%} else {%>
-	public <%=genFeature.getImportedType()%> <%=genFeature.getGetAccessor()%>()
-	{
-<%@ include file="Class/getGenFeature.pre.insert.javajetinc" fail="silent" %>
-    <%if (genModel.isReflectiveDelegation()) {%>
-		return <%if (genFeature.isPrimitiveType()) {%>(<%}%>(<%=genFeature.getObjectType()%>)eGet(<%=genFeature.getQualifiedFeatureAccessor()%>, true)<%if (genFeature.isPrimitiveType()) {%>).<%=genFeature.getPrimitiveValueFunction()%>()<%}%>;
-    <%} else if (!genFeature.isVolatile()) {%>
-      <%if (genFeature.isListType()) {%>
-        <%if (genModel.isVirtualDelegation()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%}%>
-		if (<%=genFeature.getSafeName()%> == null)
-		{
-        <%if (genModel.isVirtualDelegation()) {%>
-			eVirtualSet(<%=genClass.getQualifiedFeatureID(genFeature)%>, <%=genFeature.getSafeName()%> = new <%=genClass.getListConstructor(genFeature)%>);
-        <%} else {%>
-			<%=genFeature.getSafeName()%> = new <%=genClass.getListConstructor(genFeature)%>;
-        <%}%>
-		}
-		return <%=genFeature.getSafeName()%><%=genFeature.isMapType() && genFeature.isEffectiveSuppressEMFTypes() ? ".map()" : ""%>;
-      <%} else if (genFeature.isContainer()) {%>
-		if (eContainerFeatureID != <%=genClass.getQualifiedFeatureID(genFeature)%>) return null;
-		return (<%=genFeature.getImportedType()%>)eContainer();
-      <%} else {%>
-        <%if (genFeature.isResolveProxies()) {%>
-          <%if (genModel.isVirtualDelegation()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%><%if (!genFeature.isReferenceType()) {%>, <%=genFeature.getUpperName()%>_EDEFAULT<%}%>);
-          <%}%>
-		if (<%=genFeature.getSafeName()%> != null && <%=genFeature.getSafeNameAsEObject()%>.eIsProxy())
-		{
-			<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> old<%=genFeature.getCapName()%> = (<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>;
-			<%=genFeature.getSafeName()%> = <%=genFeature.getNonEObjectInternalTypeCast()%>eResolveProxy(old<%=genFeature.getCapName()%>);
-			if (<%=genFeature.getSafeName()%> != old<%=genFeature.getCapName()%>)
-			{
-          <%if (genFeature.isEffectiveContains()) {%>
-				<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> new<%=genFeature.getCapName()%> = (<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>;
-          <%if (!genFeature.isBidirectional()) {%>
-				<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = old<%=genFeature.getCapName()%>.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%>, null, null);
-          <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
-				<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs =  old<%=genFeature.getCapName()%>.eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, null);
-          <%}%>
-				if (new<%=genFeature.getCapName()%>.eInternalContainer() == null)
-				{
-          <%if (!genFeature.isBidirectional()) {%>
-					msgs = new<%=genFeature.getCapName()%>.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%>, null, msgs);
-          <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
-					msgs =  new<%=genFeature.getCapName()%>.eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, msgs);
-          <%}%>
-				}
-				if (msgs != null) msgs.dispatch();
-          <%} else if (genModel.isVirtualDelegation()) {%>
-				eVirtualSet(<%=genClass.getQualifiedFeatureID(genFeature)%>, <%=genFeature.getSafeName()%>);
-          <%}%>
-          <%if (!genModel.isSuppressNotification()) {%>
-				if (eNotificationRequired())
-					eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.RESOLVE, <%=genClass.getQualifiedFeatureID(genFeature)%>, old<%=genFeature.getCapName()%>, <%=genFeature.getSafeName()%>));
-          <%}%>
-			}
-		}
-        <%}%>
-        <%if (!genFeature.isResolveProxies() && genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		return (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%><%if (!genFeature.isReferenceType()) {%>, <%=genFeature.getUpperName()%>_EDEFAULT<%}%>);
-        <%} else if (genClass.isFlag(genFeature)) {%>
-		return (<%=genClass.getFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_EFLAG) != 0;
-        <%} else {%>
-		return <%=genFeature.getSafeName()%>;
-        <%}%>
-      <%}%>
-    <%} else {//volatile%>
-      <%if (genFeature.isResolveProxies() && !genFeature.isListType()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = basicGet<%=genFeature.getAccessorName()%>();
-		return <%=genFeature.getSafeName()%> != null && <%=genFeature.getSafeName()%>.eIsProxy() ? <%=genFeature.getNonEObjectInternalTypeCast()%>eResolveProxy((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>) : <%=genFeature.getSafeName()%>;
-      <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
-        <%if (genFeature.isFeatureMapType()) {%>
-          <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		return new <%=genFeature.getImportedEffectiveFeatureMapWrapperClass()%>((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap().list(<%=genFeature.getQualifiedFeatureAccessor()%>));
-          <%} else {%>
-		return (<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>)get<%=delegateFeature.getAccessorName()%>()).list(<%=genFeature.getQualifiedFeatureAccessor()%>);
-          <%}%>
-        <%} else if (genFeature.isListType()) {%>
-          <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap().list(<%=genFeature.getQualifiedFeatureAccessor()%>);
-          <%} else {%>
-		return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>)get<%=delegateFeature.getAccessorName()%>()).list(<%=genFeature.getQualifiedFeatureAccessor()%>);
-          <%}%>
-        <%} else {%>
-          <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		return <%if (genFeature.isPrimitiveType()) {%>(<%}%>(<%=genFeature.getObjectType()%>)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap().get(<%=genFeature.getQualifiedFeatureAccessor()%>, true)<%if (genFeature.isPrimitiveType()) {%>).<%=genFeature.getPrimitiveValueFunction()%>()<%}%>;
-          <%} else {%>
-		return <%if (genFeature.isPrimitiveType()) {%>(<%}%>(<%=genFeature.getObjectType()%>)get<%=delegateFeature.getAccessorName()%>().get(<%=genFeature.getQualifiedFeatureAccessor()%>, true)<%if (genFeature.isPrimitiveType()) {%>).<%=genFeature.getPrimitiveValueFunction()%>()<%}%>;
-          <%}%>
-        <%}%>
-      <%} else {%>
-<%@ include file="Class/getGenFeature.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method to return the '<%=genFeature.getFormattedName()%>' <%=genFeature.getFeatureKind()%>
-		// Ensure that you remove @generated or mark it @generated NOT
-        <%if (genFeature.isListType()) {%>
-		// The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting
-		// so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.<%if (genFeature.isMapType()) {%>EcoreEMap<%} else if (genFeature.isFeatureMapType()) {%>BasicFeatureMap<%} else {%>EcoreEList<%}%> should be used.
-        <%}%>
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/getGenFeature.todo.override.javajetinc%>
-      <%}%>
-    <%}%>
-	}
-
-<%}%>
-<%@ end %><%//Class/getGenFeature.override.javajetinc%>
-  <%}%>
-  <%if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicGet()) {%>
-<%@ include file="Class/basicGetGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <%=genFeature.getImportedType()%> basicGet<%=genFeature.getAccessorName()%>()
-	{
-<%@ include file="Class/basicGetGenFeature.pre.insert.javajetinc" fail="silent" %>
-    <%if (genFeature.isContainer()) {%>
-		if (eContainerFeatureID != <%=genClass.getQualifiedFeatureID(genFeature)%>) return null;
-		return (<%=genFeature.getImportedType()%>)eInternalContainer();
-    <%} else if (!genFeature.isVolatile()) {%>
-      <%if (genModel.isVirtualDelegation()) {%>
-		return (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-      <%} else {%>
-		return <%=genFeature.getSafeName()%>;
-      <%}%>
-    <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
-      <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		return (<%=genFeature.getImportedType()%>)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap().get(<%=genFeature.getQualifiedFeatureAccessor()%>, false);
-      <%} else {%>
-		return (<%=genFeature.getImportedType()%>)get<%=delegateFeature.getAccessorName()%>().get(<%=genFeature.getQualifiedFeatureAccessor()%>, false);
-      <%}%>
-    <%} else {%>
-<%@ include file="Class/basicGetGenFeature.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method to return the '<%=genFeature.getFormattedName()%>' <%=genFeature.getFeatureKind()%>
-		// -> do not perform proxy resolution
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/basicGetGenFeature.todo.override.javajetinc%>
-    <%}%>
-	}
-
-<%@ end %><%//Class/basicGetGenFeature.override.javajetinc%>
-  <%}%>
-  <%if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicSet()) {%>
-<%@ include file="Class/basicSetGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> basicSet<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedInternalType()%> new<%=genFeature.getCapName()%>, <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs)
-	{
-    <%if (genFeature.isContainer()) {%>
-<%@ include file="Class/basicSetGenFeature.pre.insert.javajetinc" fail="silent" %>
-		msgs = eBasicSetContainer((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>, <%=genClass.getQualifiedFeatureID(genFeature)%>, msgs);
-<%@ include file="Class/basicSetGenFeature.post.insert.javajetinc" fail="silent" %>
-		return msgs;
-    <%} else if (!genFeature.isVolatile()) {%>
-<%@ include file="Class/basicSetGenFeature.pre.insert.javajetinc" fail="silent" %>
-      <%if (genModel.isVirtualDelegation()) {%>
-		Object old<%=genFeature.getCapName()%> = eVirtualSet(<%=genClass.getQualifiedFeatureID(genFeature)%>, new<%=genFeature.getCapName()%>);
-      <%} else {%>
-		<%=genFeature.getImportedType()%> old<%=genFeature.getCapName()%> = <%=genFeature.getSafeName()%>;
-		<%=genFeature.getSafeName()%> = new<%=genFeature.getCapName()%>;
-      <%}%>
-      <%if (genFeature.isUnsettable()) {%>
-        <%if (genModel.isVirtualDelegation()) {%>
-		boolean isSetChange = old<%=genFeature.getCapName()%> == EVIRTUAL_NO_VALUE;
-        <%} else if (genClass.isESetFlag(genFeature)) {%>
-		boolean old<%=genFeature.getCapName()%>ESet = (<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0;
-		<%=genClass.getESetFlagsField(genFeature)%> |= <%=genFeature.getUpperName()%>_ESETFLAG;
-        <%} else {%>
-		boolean old<%=genFeature.getCapName()%>ESet = <%=genFeature.getUncapName()%>ESet;
-		<%=genFeature.getUncapName()%>ESet = true;
-        <%}%>
-      <%}%>
-      <%if (!genModel.isSuppressNotification()) {%>
-		if (eNotificationRequired())
-		{
-        <%if (genFeature.isUnsettable()) {%>
-			<%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%> notification = new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.SET, <%=genClass.getQualifiedFeatureID(genFeature)%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange ? null : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, new<%=genFeature.getCapName()%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange<%} else {%>!old<%=genFeature.getCapName()%>ESet<%}%>);
-        <%} else {%>
-			<%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%> notification = new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.SET, <%=genClass.getQualifiedFeatureID(genFeature)%>, <%if (genModel.isVirtualDelegation()) {%>old<%=genFeature.getCapName()%> == EVIRTUAL_NO_VALUE ? null : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, new<%=genFeature.getCapName()%>);
-        <%}%>
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-      <%}%>
-<%@ include file="Class/basicSetGenFeature.post.insert.javajetinc" fail="silent" %>
-		return msgs;
-    <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
-      <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap()).basicAdd(<%=genFeature.getQualifiedFeatureAccessor()%>, new<%=genFeature.getCapName()%>, msgs);
-      <%} else {%>
-		return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)get<%=delegateFeature.getAccessorName()%>()).basicAdd(<%=genFeature.getQualifiedFeatureAccessor()%>, new<%=genFeature.getCapName()%>, msgs);
-      <%}%>
-    <%} else {%>
-<%@ include file="Class/basicSetGenFeature.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method to set the contained '<%=genFeature.getFormattedName()%>' <%=genFeature.getFeatureKind()%>
-		// -> this method is automatically invoked to keep the containment relationship in synch
-		// -> do not modify other features
-		// -> return msgs, after adding any generated Notification to it (if it is null, a NotificationChain object must be created first)
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/basicSetGenFeature.todo.override.javajetinc%>
-    <%}%>
-	}
-
-<%@ end %><%//Class/basicSetGenFeature.override.javajetinc%>
-  <%}%>
-  <%if (genFeature.isSet() && (isImplementation || !genFeature.isSuppressedSetVisibility())) {%>
-<%@ include file="Class/setGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-<%if (isInterface) { %>
-	/**
-	 * Sets the value of the '{@link <%=genClass.getQualifiedInterfaceName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em><%=genFeature.getFormattedName()%></em>' <%=genFeature.getFeatureKind()%>.
-    <%if (genFeature.isEnumType()) {%>
-	 * @see <%=genFeature.getTypeGenEnum().getQualifiedName()%>
-    <%}%>
-    <%if (genFeature.isUnsettable()) {%>
-      <%if (!genFeature.isSuppressedIsSetVisibility()) {%>
-	 * @see #isSet<%=genFeature.getAccessorName()%>()
-      <%}%>
-      <%if (!genFeature.isSuppressedUnsetVisibility()) {%>
-	 * @see #unset<%=genFeature.getAccessorName()%>()
-      <%}%>
-    <%}%>
-	 * @see #<%=genFeature.getGetAccessor()%>()
-	 * @generated
-	 */
-<%} else {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-<%}%>
-<%if (!isImplementation) { %>
-	void set<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedType()%> value);
-
-<%} else {%>
-	public void set<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedType()%> new<%=genFeature.getCapName()%>)
-	{
-<%@ include file="Class/setGenFeature.pre.insert.javajetinc" fail="silent" %>
-    <%if (genModel.isReflectiveDelegation()) {%>
-		eSet(<%=genFeature.getQualifiedFeatureAccessor()%>, <%if (genFeature.isPrimitiveType()) {%>new <%=genFeature.getObjectType()%>(<%}%>new<%=genFeature.getCapName()%><%if (genFeature.isPrimitiveType()) {%>)<%}%>);
-    <%} else if (!genFeature.isVolatile()) {%>
-      <%if (genFeature.isContainer()) { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
-		if (new<%=genFeature.getCapName()%> != eInternalContainer() || (eContainerFeatureID != <%=genClass.getQualifiedFeatureID(genFeature)%> && new<%=genFeature.getCapName()%> != null))
-		{
-			if (<%=genModel.getImportedName("org.eclipse.emf.ecore.util.EcoreUtil")%>.isAncestor(this, <%=genFeature.getEObjectCast()%>new<%=genFeature.getCapName()%>))
-				throw new <%=genModel.getImportedName("java.lang.IllegalArgumentException")%>("Recursive containment not allowed for " + toString());<%=genModel.getNonNLS()%>
-			<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (new<%=genFeature.getCapName()%> != null)
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>).eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, msgs);
-			msgs = basicSet<%=genFeature.getAccessorName()%>(<%=genFeature.getInternalTypeCast()%>new<%=genFeature.getCapName()%>, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-        <%if (!genModel.isSuppressNotification()) {%>
-		else if (eNotificationRequired())
-			eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.SET, <%=genClass.getQualifiedFeatureID(genFeature)%>, new<%=genFeature.getCapName()%>, new<%=genFeature.getCapName()%>));
-        <%}%>
-      <%} else if (genFeature.isBidirectional() || genFeature.isEffectiveContains()) {%>
-        <%if (genModel.isVirtualDelegation()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%}%>
-		if (new<%=genFeature.getCapName()%> != <%=genFeature.getSafeName()%>)
-		{
-			<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = null;
-			if (<%=genFeature.getSafeName()%> != null)
-        <%if (!genFeature.isBidirectional()) {%>
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%>, null, msgs);
-			if (new<%=genFeature.getCapName()%> != null)
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%>, null, msgs);
-        <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, msgs);
-			if (new<%=genFeature.getCapName()%> != null)
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>).eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, msgs);
-        <%}%>
-			msgs = basicSet<%=genFeature.getAccessorName()%>(<%=genFeature.getInternalTypeCast()%>new<%=genFeature.getCapName()%>, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-        <%if (genFeature.isUnsettable()) {%>
-		else
-    	{
-          <%if (genModel.isVirtualDelegation()) {%>
-			boolean old<%=genFeature.getCapName()%>ESet = eVirtualIsSet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-          <%} else if (genClass.isESetFlag(genFeature)) {%>
-            <%if (!genModel.isSuppressNotification()) {%>
-			boolean old<%=genFeature.getCapName()%>ESet = (<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0;
-            <%}%>
-			<%=genClass.getESetFlagsField(genFeature)%> |= <%=genFeature.getUpperName()%>_ESETFLAG;
-          <%} else {%>
-            <%if (!genModel.isSuppressNotification()) {%>
-			boolean old<%=genFeature.getCapName()%>ESet = <%=genFeature.getUncapName()%>ESet;
-            <%}%>
-			<%=genFeature.getUncapName()%>ESet = true;
-          <%}%>
-          <%if (!genModel.isSuppressNotification()) {%>
-			if (eNotificationRequired())
-				eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.SET, <%=genClass.getQualifiedFeatureID(genFeature)%>, new<%=genFeature.getCapName()%>, new<%=genFeature.getCapName()%>, !old<%=genFeature.getCapName()%>ESet));
-          <%}%>
-    	}
-        <%} else {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		else if (eNotificationRequired())
-			eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.SET, <%=genClass.getQualifiedFeatureID(genFeature)%>, new<%=genFeature.getCapName()%>, new<%=genFeature.getCapName()%>));
-          <%}%>
-        <%}%>
-      <%} else {%>
-        <%if (genClass.isFlag(genFeature)) {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		<%=genFeature.getImportedType()%> old<%=genFeature.getCapName()%> = (<%=genClass.getFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_EFLAG) != 0;
-          <%}%>
-		if (new<%=genFeature.getCapName()%>) <%=genClass.getFlagsField(genFeature)%> |= <%=genFeature.getUpperName()%>_EFLAG; else <%=genClass.getFlagsField(genFeature)%> &= ~<%=genFeature.getUpperName()%>_EFLAG;
-        <%} else {%>
-          <%if (!genModel.isVirtualDelegation() || genFeature.isPrimitiveType()) {%>
-            <%if (!genModel.isSuppressNotification()) {%>
-		<%=genFeature.getImportedType()%> old<%=genFeature.getCapName()%> = <%=genFeature.getSafeName()%>;
-            <%}%>
-          <%}%>
-          <%if (genFeature.isEnumType()) {%>
-            <%if (genModel.isVirtualDelegation()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = new<%=genFeature.getCapName()%> == null ? <%=genFeature.getUpperName()%>_EDEFAULT : new<%=genFeature.getCapName()%>;
-            <%} else {%>
-		<%=genFeature.getSafeName()%> = new<%=genFeature.getCapName()%> == null ? <%=genFeature.getUpperName()%>_EDEFAULT : new<%=genFeature.getCapName()%>;
-            <%}%>
-          <%} else {%>
-            <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = <%=genFeature.getInternalTypeCast()%>new<%=genFeature.getCapName()%>;
-            <%} else {%>
-		<%=genFeature.getSafeName()%> = <%=genFeature.getInternalTypeCast()%>new<%=genFeature.getCapName()%>;
-            <%}%>
-          <%}%>
-          <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		Object old<%=genFeature.getCapName()%> = eVirtualSet(<%=genClass.getQualifiedFeatureID(genFeature)%>, <%=genFeature.getSafeName()%>);
-          <%}%>
-        <%}%>
-        <%if (genFeature.isUnsettable()) {%>
-          <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		boolean isSetChange = old<%=genFeature.getCapName()%> == EVIRTUAL_NO_VALUE;
-          <%} else if (genClass.isESetFlag(genFeature)) {%>
-            <%if (!genModel.isSuppressNotification()) {%>
-		boolean old<%=genFeature.getCapName()%>ESet = (<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0;
-            <%}%>
-		<%=genClass.getESetFlagsField(genFeature)%> |= <%=genFeature.getUpperName()%>_ESETFLAG;
-          <%} else {%>
-            <%if (!genModel.isSuppressNotification()) {%>
-		boolean old<%=genFeature.getCapName()%>ESet = <%=genFeature.getUncapName()%>ESet;
-            <%}%>
-		<%=genFeature.getUncapName()%>ESet = true;
-          <%}%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		if (eNotificationRequired())
-			eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.SET, <%=genClass.getQualifiedFeatureID(genFeature)%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange ? <%if (genFeature.isReferenceType()) {%>null<%} else {%><%=genFeature.getUpperName()%>_EDEFAULT<%}%> : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, <%if (genClass.isFlag(genFeature)) {%>new<%=genFeature.getCapName()%><%} else {%><%=genFeature.getSafeName()%><%}%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange<%} else {%>!old<%=genFeature.getCapName()%>ESet<%}%>));
-          <%}%>
-        <%} else {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		if (eNotificationRequired())
-			eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.SET, <%=genClass.getQualifiedFeatureID(genFeature)%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>old<%=genFeature.getCapName()%> == EVIRTUAL_NO_VALUE ? <%if (genFeature.isReferenceType()) {%>null<%} else {%><%=genFeature.getUpperName()%>_EDEFAULT<%}%> : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, <%if (genClass.isFlag(genFeature)) {%>new<%=genFeature.getCapName()%><%} else {%><%=genFeature.getSafeName()%><%}%>));
-          <%}%>
-        <%}%>
-      <%}%>
-<%@ include file="Class/setGenFeature.post.insert.javajetinc" fail="silent" %>
-    <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
-      <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap()).set(<%=genFeature.getQualifiedFeatureAccessor()%>, <%if (genFeature.isPrimitiveType()) {%>new <%=genFeature.getObjectType()%>(<%}%>new<%=genFeature.getCapName()%><%if (genFeature.isPrimitiveType()) {%>)<%}%>);
-      <%} else {%>
-		((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)get<%=delegateFeature.getAccessorName()%>()).set(<%=genFeature.getQualifiedFeatureAccessor()%>, <%if (genFeature.isPrimitiveType()) {%>new <%=genFeature.getObjectType()%>(<%}%>new<%=genFeature.getCapName()%><%if (genFeature.isPrimitiveType()) {%>)<%}%>);
-      <%}%>
-    <%} else {%>
-<%@ include file="Class/setGenFeature.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method to set the '<%=genFeature.getFormattedName()%>' <%=genFeature.getFeatureKind()%>
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/setGenFeature.todo.override.javajetinc%>
-    <%}%>
-	}
-
-<%}%>
-<%@ end %><%//Class/setGenFeature.override.javajetinc%>
-  <%}%>
-  <%if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicUnset()) {%>
-<%@ include file="Class/basicUnsetGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> basicUnset<%=genFeature.getAccessorName()%>(<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs)
-	{
-    <%if (!genFeature.isVolatile()) {%>
-      <%if (genModel.isVirtualDelegation()) {%>
-		Object old<%=genFeature.getCapName()%> = eVirtualUnset(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-      <%} else {%>
-		<%=genFeature.getImportedType()%> old<%=genFeature.getCapName()%> = <%=genFeature.getSafeName()%>;
-		<%=genFeature.getSafeName()%> = null;
-      <%}%>
-      <%if (genModel.isVirtualDelegation()) {%>
-		boolean isSetChange = old<%=genFeature.getCapName()%> != EVIRTUAL_NO_VALUE;
-      <%} else if (genClass.isESetFlag(genFeature)) {%>
-		boolean old<%=genFeature.getCapName()%>ESet = (<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0;
-		<%=genClass.getESetFlagsField(genFeature)%> &= ~<%=genFeature.getUpperName()%>_ESETFLAG;
-      <%} else {%>
-		boolean old<%=genFeature.getCapName()%>ESet = <%=genFeature.getUncapName()%>ESet;
-		<%=genFeature.getUncapName()%>ESet = false;
-      <%}%>
-        <%if (!genModel.isSuppressNotification()) {%>
-		if (eNotificationRequired())
-		{
-			<%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%> notification = new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.UNSET, <%=genClass.getQualifiedFeatureID(genFeature)%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange ? old<%=genFeature.getCapName()%> : null<%} else {%>old<%=genFeature.getCapName()%><%}%>, null, <%if (genModel.isVirtualDelegation()) {%>isSetChange<%} else {%>old<%=genFeature.getCapName()%>ESet<%}%>);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-        <%}%>
-    <%} else {%>
-<%@ include file="Class/basicUnsetGenFeature.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method to unset the contained '<%=genFeature.getFormattedName()%>' <%=genFeature.getFeatureKind()%>
-		// -> this method is automatically invoked to keep the containment relationship in synch
-		// -> do not modify other features
-		// -> return msgs, after adding any generated Notification to it (if it is null, a NotificationChain object must be created first)
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/basicUnsetGenFeature.todo.override.javajetinc%>
-    <%}%>
-	}
-
-<%@ end %><%//Class.basicUnsetGenFeature.override.javajetinc%>
-  <%}%>
-  <%if (genFeature.isUnset() && (isImplementation || !genFeature.isSuppressedUnsetVisibility())) {%>
-<%@ include file="Class/unsetGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-<%if (isInterface) {%>
-	/**
-	 * Unsets the value of the '{@link <%=genClass.getQualifiedInterfaceName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-  <%if (!genFeature.isSuppressedIsSetVisibility()) {%>
-	 * @see #isSet<%=genFeature.getAccessorName()%>()
-  <%}%>
-	 * @see #<%=genFeature.getGetAccessor()%>()
-  <%if (!genFeature.isListType() && !genFeature.isSuppressedSetVisibility()) {%>
-	 * @see #set<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedType()%>)
-  <%}%>
-	 * @generated
-	 */
-<%} else {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-<%}%>
-<%if (!isImplementation) {%>
-	void unset<%=genFeature.getAccessorName()%>();
-
-<%} else {%>
-	public void unset<%=genFeature.getAccessorName()%>()
-	{
-    <%if (genModel.isReflectiveDelegation()) {%>
-		eUnset(<%=genFeature.getQualifiedFeatureAccessor()%>);
-    <%} else if (!genFeature.isVolatile()) {%>
-      <%if (genFeature.isListType()) {%>
-        <%if (genModel.isVirtualDelegation()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%}%>
-		if (<%=genFeature.getSafeName()%> != null) ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList")%>.Unsettable)<%=genFeature.getSafeName()%>).unset();
-      <%} else if (genFeature.isBidirectional() || genFeature.isEffectiveContains()) {%>
-        <%if (genModel.isVirtualDelegation()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%}%>
-		if (<%=genFeature.getSafeName()%> != null)
-		{
-			<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = null;
-        <%if (!genFeature.isBidirectional()) {%>
-			msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%>, null, msgs);
-        <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
-			msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, msgs);
-        <%}%>
-			msgs = basicUnset<%=genFeature.getAccessorName()%>(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else
-    	{
-        <%if (genModel.isVirtualDelegation()) {%>
-			boolean old<%=genFeature.getCapName()%>ESet = eVirtualIsSet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%} else if (genClass.isESetFlag(genFeature)) {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-			boolean old<%=genFeature.getCapName()%>ESet = (<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0;
-          <%}%>
-			<%=genClass.getESetFlagsField(genFeature)%> &= ~<%=genFeature.getUpperName()%>_ESETFLAG;
-        <%} else {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-			boolean old<%=genFeature.getCapName()%>ESet = <%=genFeature.getUncapName()%>ESet;
-          <%}%>
-			<%=genFeature.getUncapName()%>ESet = false;
-        <%}%>
-        <%if (!genModel.isSuppressNotification()) {%>
-			if (eNotificationRequired())
-				eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.UNSET, <%=genClass.getQualifiedFeatureID(genFeature)%>, null, null, old<%=genFeature.getCapName()%>ESet));
-        <%}%>
-    	}
-      <%} else {%>
-        <%if (genClass.isFlag(genFeature)) {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		<%=genFeature.getImportedType()%> old<%=genFeature.getCapName()%> = (<%=genClass.getFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_EFLAG) != 0;
-          <%}%>
-        <%} else if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		Object old<%=genFeature.getCapName()%> = eVirtualUnset(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%} else {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		<%=genFeature.getImportedType()%> old<%=genFeature.getCapName()%> = <%=genFeature.getSafeName()%>;
-          <%}%>
-        <%}%>
-        <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		boolean isSetChange = old<%=genFeature.getCapName()%> != EVIRTUAL_NO_VALUE;
-        <%} else if (genClass.isESetFlag(genFeature)) {%>
-		boolean old<%=genFeature.getCapName()%>ESet = (<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0;
-        <%} else {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		boolean old<%=genFeature.getCapName()%>ESet = <%=genFeature.getUncapName()%>ESet;
-          <%}%>
-        <%}%>
-        <%if (genFeature.isReferenceType()) {%>
-		<%=genFeature.getSafeName()%> = null;
-          <%if (!genModel.isVirtualDelegation()) {%>
-            <%if (genClass.isESetFlag(genFeature)) {%>
-		<%=genClass.getESetFlagsField(genFeature)%> &= ~<%=genFeature.getUpperName()%>_ESETFLAG;
-            <%} else {%>
-		<%=genFeature.getUncapName()%>ESet = false;
-            <%}%>
-          <%}%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		if (eNotificationRequired())
-			eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.UNSET, <%=genClass.getQualifiedFeatureID(genFeature)%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange ? old<%=genFeature.getCapName()%> : null<%} else {%>old<%=genFeature.getCapName()%><%}%>, null, <%if (genModel.isVirtualDelegation()) {%>isSetChange<%} else {%>old<%=genFeature.getCapName()%>ESet<%}%>));
-          <%}%>
-        <%} else {%>
-          <%if (genClass.isFlag(genFeature)) {%>
-		if (<%=genFeature.getUpperName()%>_EDEFAULT) <%=genClass.getFlagsField(genFeature)%> |= <%=genFeature.getUpperName()%>_EFLAG; else <%=genClass.getFlagsField(genFeature)%> &= ~<%=genFeature.getUpperName()%>_EFLAG;
-          <%} else if (!genModel.isVirtualDelegation() || genFeature.isPrimitiveType()) {%>
-		<%=genFeature.getSafeName()%> = <%=genFeature.getUpperName()%>_EDEFAULT;
-          <%}%>
-          <%if (!genModel.isVirtualDelegation() || genFeature.isPrimitiveType()) {%>
-            <%if (genClass.isESetFlag(genFeature)) {%>
-		<%=genClass.getESetFlagsField(genFeature)%> &= ~<%=genFeature.getUpperName()%>_ESETFLAG;
-            <%} else {%>
-		<%=genFeature.getUncapName()%>ESet = false;
-            <%}%>
-          <%}%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		if (eNotificationRequired())
-			eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.UNSET, <%=genClass.getQualifiedFeatureID(genFeature)%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange ? old<%=genFeature.getCapName()%> : <%=genFeature.getUpperName()%>_EDEFAULT<%} else {%>old<%=genFeature.getCapName()%><%}%>, <%=genFeature.getUpperName()%>_EDEFAULT, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange<%} else {%>old<%=genFeature.getCapName()%>ESet<%}%>));
-          <%}%>
-        <%}%>
-      <%}%>
-    <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
-      <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap()).clear(<%=genFeature.getQualifiedFeatureAccessor()%>);
-      <%} else {%>
-		((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)get<%=delegateFeature.getAccessorName()%>()).clear(<%=genFeature.getQualifiedFeatureAccessor()%>);
-      <%}%>
-    <%} else {%>
-<%@ include file="Class/unsetGenFeature.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method to unset the '<%=genFeature.getFormattedName()%>' <%=genFeature.getFeatureKind()%>
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/unsetGenFeature.todo.override.javajetinc%>
-    <%}%>
-	}
-
-<%}%>
-<%@ end %><%//Class/unsetGenFeature.override.javajetinc%>
-  <%}%>
-  <%if (genFeature.isIsSet() && (isImplementation || !genFeature.isSuppressedIsSetVisibility())) {%>
-<%@ include file="Class/isSetGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-<%if (isInterface) {%>
-	/**
-	 * Returns whether the value of the '{@link <%=genClass.getQualifiedInterfaceName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%> is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em><%=genFeature.getFormattedName()%></em>' <%=genFeature.getFeatureKind()%> is set.
-    <%if (genFeature.isChangeable() && !genFeature.isSuppressedUnsetVisibility()) {%>
-	 * @see #unset<%=genFeature.getAccessorName()%>()
-    <%}%>
-	 * @see #<%=genFeature.getGetAccessor()%>()
-    <%if (!genFeature.isListType() && genFeature.isChangeable() && !genFeature.isSuppressedSetVisibility()) {%>
-	 * @see #set<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedType()%>)
-    <%}%>
-	 * @generated
-	 */
-<%} else {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-<%}%>
-<%if (!isImplementation) {%>
-	boolean isSet<%=genFeature.getAccessorName()%>();
-
-<%} else {%>
-	public boolean isSet<%=genFeature.getAccessorName()%>()
-	{
-    <%if (genModel.isReflectiveDelegation()) {%>
-		return eIsSet(<%=genFeature.getQualifiedFeatureAccessor()%>);
-    <%} else if (!genFeature.isVolatile()) {%>
-      <%if (genFeature.isListType()) {%>
-        <%if (genModel.isVirtualDelegation()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%}%>
-		return <%=genFeature.getSafeName()%> != null && ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList")%>.Unsettable)<%=genFeature.getSafeName()%>).isSet();
-      <%} else {%>
-        <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		return eVirtualIsSet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%} else if (genClass.isESetFlag(genFeature)) {%>
-		return (<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0;
-        <%} else {%>
-		return <%=genFeature.getUncapName()%>ESet;
-        <%}%>
-      <%}%>
-    <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
-      <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		return !((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap()).isEmpty(<%=genFeature.getQualifiedFeatureAccessor()%>);
-      <%} else {%>
-		return !((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)get<%=delegateFeature.getAccessorName()%>()).isEmpty(<%=genFeature.getQualifiedFeatureAccessor()%>);
-      <%}%>
-    <%} else {%>
-<%@ include file="Class/isSetGenFeature.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method to return whether the '<%=genFeature.getFormattedName()%>' <%=genFeature.getFeatureKind()%> is set
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/isSetGenFeature.todo.override.javajetinc%>
-    <%}%>
-	}
-
-<%}%>
-<%@ end %><%//Class/isSetGenFeature.override.javajetinc%>
-  <%}%>
-<%@ include file="Class/genFeature.insert.javajetinc" fail="silent" %>
-<%@ end %><%//Class/genFeature.override.javajetinc%>
-<%}//for%>
-<%}}.run();%>
-<%for (Iterator i= (isImplementation ? genClass.getImplementedGenOperations() : genClass.getDeclaredGenOperations()).iterator(); i.hasNext();) { GenOperation genOperation = (GenOperation)i.next();%>
-<%@ include file="Class/genOperation.override.javajetinc" fail="alternative" %>
-<%@ start %>
-<%if (isInterface) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-  <%if (genOperation.hasDocumentation()) {%>
-	 * <!-- begin-model-doc -->
-	 * <%=genOperation.getDocumentation(genModel.getIndentation(stringBuffer))%>
-	 * <!-- end-model-doc -->
-  <%}%>
-  <%if (!genModel.isSuppressEMFModelTags()) { boolean first = true; for (StringTokenizer stringTokenizer = new StringTokenizer(genOperation.getModelInfo(), "\n\r"); stringTokenizer.hasMoreTokens(); ) { String modelInfo = stringTokenizer.nextToken(); if (first) { first = false;%>
-	 * @model <%=modelInfo%>
-  <%} else {%>
-	 *        <%=modelInfo%>
-  <%}} if (first) {%>
-	 * @model
-  <%}}%>
-	 * @generated
-	 */
-<%} else {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-<%}%>
-<%if (!isImplementation) {%>
-	<%=genOperation.getImportedType()%> <%=genOperation.getName()%>(<%=genOperation.getParameters()%>)<%=genOperation.getThrows()%>;
-
-<%} else {%>
-	public <%=genOperation.getImportedType()%> <%=genOperation.getName()%>(<%=genOperation.getParameters()%>)<%=genOperation.getThrows()%>
-	{
-  <%if (genOperation.hasBody()) {%>
-		<%=genOperation.getBody(genModel.getIndentation(stringBuffer))%>
-  <%} else if (genOperation.isInvariant()) {GenClass opClass = genOperation.getGenClass(); String diagnostics = ((GenParameter)genOperation.getGenParameters().get(0)).getName(); String context = ((GenParameter)genOperation.getGenParameters().get(1)).getName();%>
-		// TODO: implement this method
-		// -> specify the condition that violates the invariant
-		// -> verify the details of the diagnostic, including severity and message
-		// Ensure that you remove @generated or mark it @generated NOT
-		if (false)
-		{
-			if (<%=diagnostics%> != null)
-			{
-				<%=diagnostics%>.add
-					(new <%=genModel.getImportedName("org.eclipse.emf.common.util.BasicDiagnostic")%>
-						(<%=genModel.getImportedName("org.eclipse.emf.common.util.Diagnostic")%>.ERROR,
-						 <%=opClass.getGenPackage().getImportedValidatorClassName()%>.DIAGNOSTIC_SOURCE,
-						 <%=opClass.getGenPackage().getImportedValidatorClassName()%>.<%=opClass.getOperationID(genOperation)%>,
-						 <%=genModel.getImportedName("org.eclipse.emf.ecore.plugin.EcorePlugin")%>.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "<%=genOperation.getName()%>", <%=genModel.getImportedName("org.eclipse.emf.ecore.util.EObjectValidator")%>.getObjectLabel(this, <%=context%>) }),<%=genModel.getNonNLS()%><%=genModel.getNonNLS(2)%>
-						 new Object [] { this }));
-			}
-			return false;
-		}
-		return true;
-  <%} else {%>
-<%@ include file="Class/implementedGenOperation.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/implementedGenOperation.todo.override.javajetinc%>
-  <%}%>
-	}
-
-<%}%>
-<%@ include file="Class/genOperation.insert.javajetinc" fail="silent" %>
-<%@ end %><%//Class/implementedGenOperation.override.javajetinc%>
-<%}//for%>
-<%if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEInverseAddGenFeatures())) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> eInverseAdd(<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> otherEnd, int featureID, <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs)
-	{
-		switch (featureID)
-		{
-<%for (Iterator i=genClass.getEInverseAddGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%if (!genModel.isMinimalReflectiveMethods() || genClass.getImplementedGenFeatures().contains(genFeature)) {%>
-			case <%=genClass.getQualifiedFeatureID(genFeature)%>:
-    <%if (genFeature.isListType()) {%>
-      <%if (genFeature.isMapType() && genFeature.isEffectiveSuppressEMFTypes()) {%>
-				return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList")%>)((<%=genModel.getImportedName("org.eclipse.emf.common.util.EMap")%>.InternalMapView)<%=genFeature.getGetAccessor()%>()).eMap()).basicAdd(otherEnd, msgs);
-      <%} else {%>
-				return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList")%>)<%=genFeature.getGetAccessor()%>()).basicAdd(otherEnd, msgs);
-      <%}%>
-    <%} else if (genFeature.isContainer()) {%>
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-      <%if (genFeature.isBasicSet()) {%>
-				return basicSet<%=genFeature.getAccessorName()%>((<%=genFeature.getImportedType()%>)otherEnd, msgs);
-      <%} else {%>
-				return eBasicSetContainer(otherEnd, <%=genClass.getQualifiedFeatureID(genFeature)%>, msgs);
-      <%}%>
-    <%} else {%>
-      <%if (genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {%>
-				<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-      <%}%>
-				if (<%=genFeature.getSafeName()%> != null)
-      <%if (genFeature.isEffectiveContains()) {%>
-					msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%>, null, msgs);
-      <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
-					msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, msgs);
-      <%}%>
-				return basicSet<%=genFeature.getAccessorName()%>((<%=genFeature.getImportedType()%>)otherEnd, msgs);
-    <%}%>
-  <%}%>
-<%}%>
-		}
-<%if (genModel.isMinimalReflectiveMethods()) {%>
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-<%} else {%>
-		return eDynamicInverseAdd(otherEnd, featureID, msgs);
-<%}%>
-	}
-
-<%}%>
-<%if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEInverseRemoveGenFeatures())) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> eInverseRemove(<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> otherEnd, int featureID, <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs)
-	{
-		switch (featureID)
-		{
-<%for (Iterator i=genClass.getEInverseRemoveGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%if (!genModel.isMinimalReflectiveMethods() || genClass.getImplementedGenFeatures().contains(genFeature)) {%>
-			case <%=genClass.getQualifiedFeatureID(genFeature)%>:
-    <%if (genFeature.isListType()) {%>
-      <%if (genFeature.isMapType() && genFeature.isEffectiveSuppressEMFTypes()) {%>
-				return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList")%>)((<%=genModel.getImportedName("org.eclipse.emf.common.util.EMap")%>.InternalMapView)<%=genFeature.getGetAccessor()%>()).eMap()).basicRemove(otherEnd, msgs);
-      <%} else if (genFeature.isWrappedFeatureMapType()) {%>
-				return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList")%>)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)<%=genFeature.getGetAccessor()%>()).featureMap()).basicRemove(otherEnd, msgs);
-      <%} else {%>
-				return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList")%>)<%=genFeature.getGetAccessor()%>()).basicRemove(otherEnd, msgs);
-      <%}%>
-    <%} else if (genFeature.isContainer() && !genFeature.isBasicSet()) {%>
-				return eBasicSetContainer(null, <%=genClass.getQualifiedFeatureID(genFeature)%>, msgs);
-    <%} else if (genFeature.isUnsettable()) {%>
-				return basicUnset<%=genFeature.getAccessorName()%>(msgs);
-    <%} else {%>
-				return basicSet<%=genFeature.getAccessorName()%>(null, msgs);
-    <%}%>
-  <%}%>
-<%}%>
-		}
-<%if (genModel.isMinimalReflectiveMethods()) {%>
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-<%} else {%>
-		return eDynamicInverseRemove(otherEnd, featureID, msgs);
-<%}%>
-	}
-
-<%}%>
-<%if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEBasicRemoveFromContainerGenFeatures())) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> eBasicRemoveFromContainerFeature(<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs)
-	{
-		switch (eContainerFeatureID)
-		{
-<%for (Iterator i=genClass.getEBasicRemoveFromContainerGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
-  <%if (!genModel.isMinimalReflectiveMethods() || genClass.getImplementedGenFeatures().contains(genFeature)) {%>
-			case <%=genClass.getQualifiedFeatureID(genFeature)%>:
-				return eInternalContainer().eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, msgs);
-  <%}%>
-<%}%>
-		}
-<%if (genModel.isMinimalReflectiveMethods()) {%>
-		return super.eBasicRemoveFromContainerFeature(msgs);
-<%} else {%>
-		return eDynamicBasicRemoveFromContainer(msgs);
-<%}%>
-	}
-
-<%}%>
-<%if (isImplementation && !genModel.isReflectiveDelegation() && !genClass.getImplementedGenFeatures().isEmpty()) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-<%for (Iterator i=genClass.getAllGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%if (!genModel.isMinimalReflectiveMethods() || genClass.getImplementedGenFeatures().contains(genFeature)) {%>
-			case <%=genClass.getQualifiedFeatureID(genFeature)%>:
-    <%if (genFeature.isPrimitiveType()) {%>
-      <%if (genFeature.isBooleanType()) {%>
-				return <%=genFeature.getGetAccessor()%>() ? Boolean.TRUE : Boolean.FALSE;
-      <%} else {%>
-				return new <%=genFeature.getObjectType()%>(<%=genFeature.getGetAccessor()%>());
-      <%}%>
-    <%} else if (genFeature.isResolveProxies() && !genFeature.isListType()) {%>
-				if (resolve) return <%=genFeature.getGetAccessor()%>();
-				return basicGet<%=genFeature.getAccessorName()%>();
-    <%} else if (genFeature.isMapType()) {%>
-      <%if (genFeature.isEffectiveSuppressEMFTypes()) {%>
-				if (coreType) return ((<%=genModel.getImportedName("org.eclipse.emf.common.util.EMap")%>.InternalMapView)<%=genFeature.getGetAccessor()%>()).eMap();
-				else return <%=genFeature.getGetAccessor()%>();
-      <%} else {%>
-				if (coreType) return <%=genFeature.getGetAccessor()%>();
-				else return <%=genFeature.getGetAccessor()%>().map();
-      <%}%>
-    <%} else if (genFeature.isWrappedFeatureMapType()) {%>
-				if (coreType) return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)<%=genFeature.getGetAccessor()%>()).featureMap();
-				return <%=genFeature.getGetAccessor()%>();
-    <%} else if (genFeature.isFeatureMapType()) {%>
-				if (coreType) return <%=genFeature.getGetAccessor()%>();
-				return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)<%=genFeature.getGetAccessor()%>()).getWrapper();
-    <%} else {%>
-				return <%=genFeature.getGetAccessor()%>();
-    <%}%>
-  <%}%>
-<%}%>
-		}
-<%if (genModel.isMinimalReflectiveMethods()) {%>
-		return super.eGet(featureID, resolve, coreType);
-<%} else {%>
-		return eDynamicGet(featureID, resolve, coreType);
-<%}%>
-	}
-
-<%}%>
-<%if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getESetGenFeatures())) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-<%for (Iterator i=genClass.getESetGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%if (!genModel.isMinimalReflectiveMethods() || genClass.getImplementedGenFeatures().contains(genFeature)) {%>
-			case <%=genClass.getQualifiedFeatureID(genFeature)%>:
-    <%if (genFeature.isListType()) {%>
-      <%if (genFeature.isWrappedFeatureMapType()) {%>
-				((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)<%=genFeature.getGetAccessor()%>()).featureMap()).set(newValue);
-      <%} else if (genFeature.isFeatureMapType()) {%>
-				((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)<%=genFeature.getGetAccessor()%>()).set(newValue);
-      <%} else if (genFeature.isMapType()) {%>
-        <%if (genFeature.isEffectiveSuppressEMFTypes()) {%>
-				((<%=genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature")%>.Setting)((<%=genModel.getImportedName("org.eclipse.emf.common.util.EMap")%>.InternalMapView)<%=genFeature.getGetAccessor()%>()).eMap()).set(newValue);
-        <%} else {%>
-				((<%=genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature")%>.Setting)<%=genFeature.getGetAccessor()%>()).set(newValue);
-        <%}%>
-      <%} else {%>
-				<%=genFeature.getGetAccessor()%>().clear();
-				<%=genFeature.getGetAccessor()%>().addAll((<%=genModel.getImportedName("java.util.Collection")%>)newValue);
-      <%}%>
-    <%} else if (genFeature.isPrimitiveType()) {%>
-				set<%=genFeature.getAccessorName()%>(((<%=genFeature.getObjectType()%>)newValue).<%=genFeature.getPrimitiveValueFunction()%>());
-    <%} else {%>
-				set<%=genFeature.getAccessorName()%>((<%=genFeature.getImportedType()%>)newValue);
-    <%}%>
-				return;
-  <%}%>
-<%}%>
-		}
-<%if (genModel.isMinimalReflectiveMethods()) {%>
-		super.eSet(featureID, newValue);
-<%} else {%>
-		eDynamicSet(featureID, newValue);
-<%}%>
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-<%for (Iterator i=genClass.getESetGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%if (!genModel.isMinimalReflectiveMethods() || genClass.getImplementedGenFeatures().contains(genFeature)) {%>
-			case <%=genClass.getQualifiedFeatureID(genFeature)%>:
-    <%if (genFeature.isListType() && !genFeature.isUnsettable()) {%>
-      <%if (genFeature.isWrappedFeatureMapType()) {%>
-				((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)<%=genFeature.getGetAccessor()%>()).featureMap().clear();
-      <%} else {%>
-				<%=genFeature.getGetAccessor()%>().clear();
-      <%}%>
-    <%} else if (genFeature.isUnsettable()) {%>
-				unset<%=genFeature.getAccessorName()%>();
-    <%} else if (genFeature.isReferenceType()) {%>
-				set<%=genFeature.getAccessorName()%>((<%=genFeature.getImportedType()%>)null);
-    <%} else {%>
-				set<%=genFeature.getAccessorName()%>(<%=genFeature.getUpperName()%>_EDEFAULT);
-    <%}%>
-				return;
-  <%}%>
-<%}%>
-		}
-<%if (genModel.isMinimalReflectiveMethods()) {%>
-		super.eUnset(featureID);
-<%} else {%>
-		eDynamicUnset(featureID);
-<%}%>
-	}
-
-<%}%>
-<%if (isImplementation && !genModel.isReflectiveDelegation() && !genClass.getImplementedGenFeatures().isEmpty()) {%>
-<%@ include file="Class/eIsSet.override.javajetinc" fail="alternative" %>
-<%@ start %>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID)
-	{	
-//UMA-->
-		<%=genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature")%> feature = getFeatureWithOverridenDefaultValue(featureID);
-		if(feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-//UMA<--		
-		switch (featureID)
-		{
-<%for (Iterator i=genClass.getAllGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%if (!genModel.isMinimalReflectiveMethods() || genClass.getImplementedGenFeatures().contains(genFeature)) {%>
-			case <%=genClass.getQualifiedFeatureID(genFeature)%>:
-    <%if (genFeature.isListType() && !genFeature.isUnsettable()) {%>
-      <%if (genFeature.isWrappedFeatureMapType()) {%>
-        <%if (genFeature.isVolatile()) {%>
-				return !((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)<%=genFeature.getGetAccessor()%>()).featureMap().isEmpty();
-        <%} else {%>
-				return <%=genFeature.getSafeName()%> != null && !<%=genFeature.getSafeName()%>.featureMap().isEmpty();
-        <%}%>
-      <%} else {%>
-        <%if (genClass.isField(genFeature)) {%>
-				return <%=genFeature.getSafeName()%> != null && !<%=genFeature.getSafeName()%>.isEmpty();
-        <%} else {%>
-          <%if (genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {%>
-				<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-				return <%=genFeature.getSafeName()%> != null && !<%=genFeature.getSafeName()%>.isEmpty();
-          <%} else {%>
-				return !<%=genFeature.getGetAccessor()%>().isEmpty();
-          <%}%>
-        <%}%>
-      <%}%>
-    <%} else if (genFeature.isUnsettable()) {%>
-				return isSet<%=genFeature.getAccessorName()%>();
-    <%} else if (genFeature.isResolveProxies()) {%>
-      <%if (genClass.isField(genFeature)) {%>
-				return <%=genFeature.getSafeName()%> != null;
-      <%} else {%>
-        <%if (genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {%>
-				return eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>) != null;
-        <%} else {%>
-				return basicGet<%=genFeature.getAccessorName()%>() != null;
-        <%}%>
-      <%}%>
-    <%} else if (genFeature.isReferenceType()) {%>
-      <%if (genClass.isField(genFeature)) {%>
-				return <%=genFeature.getSafeName()%> != null;
-      <%} else {%>
-        <%if (genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {%>
-				return eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>) != null;
-        <%} else {%>
-				return <%=genFeature.getGetAccessor()%>() != null;
-        <%}%>
-      <%}%>
-    <%} else if (genFeature.isPrimitiveType() || genFeature.isEnumType()) {%>
-      <%if (genClass.isField(genFeature)) {%>
-        <%if (genClass.isFlag(genFeature)) {%>
-				return ((<%=genClass.getFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_EFLAG) != 0) != <%=genFeature.getUpperName()%>_EDEFAULT;
-        <%} else {%>
-				return <%=genFeature.getSafeName()%> != <%=genFeature.getUpperName()%>_EDEFAULT;
-        <%}%>
-      <%} else {%>
-        <%if (genFeature.isEnumType() && genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {%>
-				return eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>, <%=genFeature.getUpperName()%>_EDEFAULT) != <%=genFeature.getUpperName()%>_EDEFAULT;
-        <%} else {%>
-				return <%=genFeature.getGetAccessor()%>() != <%=genFeature.getUpperName()%>_EDEFAULT;
-        <%}%>
-      <%}%>
-    <%} else {//datatype%>
-      <%if (genClass.isField(genFeature)) {%>
-				return <%=genFeature.getUpperName()%>_EDEFAULT == null ? <%=genFeature.getSafeName()%> != null : !<%=genFeature.getUpperName()%>_EDEFAULT.equals(<%=genFeature.getSafeName()%>);
-      <%} else {%>
-        <%if (genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {%>
-				<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>, <%=genFeature.getUpperName()%>_EDEFAULT);
-				return <%=genFeature.getUpperName()%>_EDEFAULT == null ? <%=genFeature.getSafeName()%> != null : !<%=genFeature.getUpperName()%>_EDEFAULT.equals(<%=genFeature.getSafeName()%>);
-        <%} else {%>
-				return <%=genFeature.getUpperName()%>_EDEFAULT == null ? <%=genFeature.getGetAccessor()%>() != null : !<%=genFeature.getUpperName()%>_EDEFAULT.equals(<%=genFeature.getGetAccessor()%>());
-        <%}%>
-      <%}%>
-    <%}%>
-  <%}%>
-<%}%>
-		}
-<%if (genModel.isMinimalReflectiveMethods()) {%>
-		return super.eIsSet(featureID);
-<%} else {%>
-		return eDynamicIsSet(featureID);
-<%}%>
-	}
-
-<%@ end %><%//Class/eIsSet.override.javajetinc%>
-<%}%>
-<%if (isImplementation && !genClass.getMixinGenFeatures().isEmpty()) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass)
-	{
-  <%for (Iterator m=genClass.getMixinGenClasses().iterator(); m.hasNext();) { GenClass mixinGenClass = (GenClass)m.next(); %>
-		if (baseClass == <%=mixinGenClass.getImportedInterfaceName()%>.class)
-		{
-			switch (derivedFeatureID)
-			{
-    <%for (Iterator f=mixinGenClass.getGenFeatures().iterator(); f.hasNext();) { GenFeature genFeature = (GenFeature)f.next(); %>
-				case <%=genClass.getQualifiedFeatureID(genFeature)%>: return <%=mixinGenClass.getQualifiedFeatureID(genFeature)%>;
-    <%}%>
-				default: return -1;
-			}
-		}
-  <%}%>
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass)
-	{
-  <%for (Iterator m=genClass.getMixinGenClasses().iterator(); m.hasNext();) { GenClass mixinGenClass = (GenClass)m.next(); %>
-		if (baseClass == <%=mixinGenClass.getImportedInterfaceName()%>.class)
-		{
-			switch (baseFeatureID)
-			{
-    <%for (Iterator f=mixinGenClass.getGenFeatures().iterator(); f.hasNext();) { GenFeature genFeature = (GenFeature)f.next(); %>
-				case <%=mixinGenClass.getQualifiedFeatureID(genFeature)%>: return <%=genClass.getQualifiedFeatureID(genFeature)%>;
-    <%}%>
-				default: return -1;
-			}
-		}
-  <%}%>
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-<%}%>
-<%if (isImplementation && genModel.isVirtualDelegation()) { String eVirtualValuesField = genClass.getEVirtualValuesField();%>
-  <%if (eVirtualValuesField != null) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Object[] eVirtualValues()
-	{
-		return <%=eVirtualValuesField%>;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void eSetVirtualValues(Object[] newValues)
-	{
-		<%=eVirtualValuesField%> = newValues;
-	}
-
-  <%}%>
-  <%{ List eVirtualIndexBitFields = genClass.getEVirtualIndexBitFields(new ArrayList());%>
-    <%if (!eVirtualIndexBitFields.isEmpty()) { List allEVirtualIndexBitFields = genClass.getAllEVirtualIndexBitFields(new ArrayList());%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected int eVirtualIndexBits(int offset)
-	{
-		switch (offset)
-		{
-      <%for (int i = 0; i < allEVirtualIndexBitFields.size(); i++) {%>
-			case <%=i%> :
-				return <%=allEVirtualIndexBitFields.get(i)%>;
-      <%}%>
-			default :
-				throw new IndexOutOfBoundsException();
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void eSetVirtualIndexBits(int offset, int newIndexBits)
-	{
-		switch (offset)
-		{
-      <%for (int i = 0; i < allEVirtualIndexBitFields.size(); i++) {%>
-			case <%=i%> :
-				<%=allEVirtualIndexBitFields.get(i)%> = newIndexBits;
-				break;
-      <%}%>
-			default :
-				throw new IndexOutOfBoundsException();
-		}
-	}
-
-    <%}%>
-  <%}%>
-<%}%>
-<%if (isImplementation && !genModel.isReflectiveDelegation() && !genClass.getToStringGenFeatures().isEmpty()) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-  <%{ boolean first = true;%>
-    <%for (Iterator i=genClass.getToStringGenFeatures().iterator(); i.hasNext(); ) { GenFeature genFeature = (GenFeature)i.next();%>
-      <%if (first) { first = false;%>
-		result.append(" (<%=genFeature.getName()%>: ");<%=genModel.getNonNLS()%>
-      <%} else {%>
-		result.append(", <%=genFeature.getName()%>: ");<%=genModel.getNonNLS()%>
-      <%}%>
-      <%if (genFeature.isUnsettable() && !genFeature.isListType()) {%>
-        <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		if (eVirtualIsSet(<%=genClass.getQualifiedFeatureID(genFeature)%>)) result.append(eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>)); else result.append("<unset>");<%=genModel.getNonNLS()%>
-        <%} else {%>
-          <%if (genClass.isFlag(genFeature)) {%>
-		if (<%if (genClass.isESetFlag(genFeature)) {%>(<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0<%} else {%><%=genFeature.getUncapName()%>ESet<%}%>) result.append((<%=genClass.getFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_EFLAG) != 0); else result.append("<unset>");<%=genModel.getNonNLS()%>
-          <%} else {%>
-		if (<%if (genClass.isESetFlag(genFeature)) {%>(<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0<%} else {%><%=genFeature.getUncapName()%>ESet<%}%>) result.append(<%=genFeature.getSafeName()%>); else result.append("<unset>");<%=genModel.getNonNLS()%>
-          <%}%>
-        <%}%>
-      <%} else {%>
-        <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		result.append(eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%><%if (!genFeature.isListType() && !genFeature.isReferenceType()){%>, <%=genFeature.getUpperName()%>_EDEFAULT<%}%>));
-        <%} else {%>
-          <%if (genClass.isFlag(genFeature)) {%>
-		result.append((<%=genClass.getFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_EFLAG) != 0);
-          <%} else {%>
-		result.append(<%=genFeature.getSafeName()%>);
-          <%}%>
-        <%}%>
-      <%}%>
-    <%}%>
-  <%}%>
-		result.append(')');
-		return result.toString();
-	}
-
-<%}%>
-<%if (isImplementation && genClass.isMapEntry()) { GenFeature keyFeature = genClass.getMapEntryKeyFeature(); GenFeature valueFeature = genClass.getMapEntryValueFeature();%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected int hash = -1;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getHash()
-	{
-		if (hash == -1)
-		{
-			Object theKey = getKey();
-			hash = (theKey == null ? 0 : theKey.hashCode());
-		}
-		return hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHash(int hash)
-	{
-		this.hash = hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getKey()
-	{
-  <%if (keyFeature.isPrimitiveType()) {%>
-		return new <%=keyFeature.getObjectType()%>(getTypedKey());
-  <%} else {%>
-		return getTypedKey();
-  <%}%>
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKey(Object key)
-	{
-  <%if (keyFeature.isListType()) {%>
-		getTypedKey().addAll((<%=genModel.getImportedName("java.util.Collection")%>)key);
-  <%} else if (keyFeature.isPrimitiveType()) {%>
-		setTypedKey(((<%=keyFeature.getObjectType()%>)key).<%=keyFeature.getPrimitiveValueFunction()%>());
-  <%} else {%>
-		setTypedKey((<%=keyFeature.getImportedType()%>)key);
-  <%}%>
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getValue()
-	{
-  <%if (valueFeature.isPrimitiveType()) {%>
-		return new <%=valueFeature.getObjectType()%>(getTypedValue());
-  <%} else {%>
-		return getTypedValue();
-  <%}%>
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object setValue(Object value)
-	{
-		Object oldValue = getValue();
-  <%if (valueFeature.isListType()) {%>
-		getTypedValue().clear();
-		getTypedValue().addAll((<%=genModel.getImportedName("java.util.Collection")%>)value);
-  <%} else if (valueFeature.isPrimitiveType()) {%>
-		setTypedValue(((<%=valueFeature.getObjectType()%>)value).<%=valueFeature.getPrimitiveValueFunction()%>());
-  <%} else {%>
-		setTypedValue((<%=valueFeature.getImportedType()%>)value);
-  <%}%>
-		return oldValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <%=genModel.getImportedName("org.eclipse.emf.common.util.EMap")%> getEMap()
-	{
-		<%=genModel.getImportedName("org.eclipse.emf.ecore.EObject")%> container = eContainer();
-		return container == null ? null : (<%=genModel.getImportedName("org.eclipse.emf.common.util.EMap")%>)container.eGet(eContainmentFeature());
-	}
-
-<%}%>
-<%@ include file="Class/insert.javajetinc" fail="silent" %>
-} //<%=isInterface ? " " + genClass.getInterfaceName() : genClass.getClassName()%>
-<%// TODO fix the space above%>
-<%genModel.emitSortedImports();%>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma.ecore/templates/model/Class.javajet.org b/plugins/org.eclipse.epf.uma.ecore/templates/model/Class.javajet.org
deleted file mode 100755
index c9f6f00..0000000
--- a/plugins/org.eclipse.epf.uma.ecore/templates/model/Class.javajet.org
+++ /dev/null
@@ -1,1811 +0,0 @@
-<%@ jet package="org.eclipse.emf.codegen.ecore.templates.model" imports="java.util.* org.eclipse.emf.codegen.ecore.genmodel.*" class="Class" version="$Id$" %>
-<%
-/**
- * <copyright>
- *
- * Copyright (c) 2002-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 - Initial API and implementation
- *
- * </copyright>
- */
-%>
-<%final GenClass genClass = (GenClass)((Object[])argument)[0]; final GenPackage genPackage = genClass.getGenPackage(); final GenModel genModel=genPackage.getGenModel();%>
-<%final boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); final boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]);%>
-<%final String publicStaticFinalFlag = isImplementation ? "public static final " : "";%>
-<%@ include file="../Header.javajetinc"%>
-<%if (isInterface) {%>
-package <%=genPackage.getInterfacePackageName()%>;
-<%} else {%>
-package <%=genPackage.getClassPackageName()%>;
-<%}%>
-
-<%genModel.markImportLocation(stringBuffer, genPackage);%>
-
-<%if (isInterface) {%>
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b><%=genClass.getFormattedName()%></b></em>'.
- * <!-- end-user-doc -->
-<%if (genClass.hasDocumentation()) {%>
- *
- * <!-- begin-model-doc -->
- * <%=genClass.getDocumentation(genModel.getIndentation(stringBuffer))%>
- * <!-- end-model-doc -->
-<%}%>
- *
-<%if (!genClass.getGenFeatures().isEmpty()) {%>
- * <p>
- * The following features are supported:
- * <ul>
-<%for (Iterator i=genClass.getGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%if (!genFeature.isSuppressedGetVisibility()) {%>
- *   <li>{@link <%=genClass.getQualifiedInterfaceName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}</li>
-  <%}%>
-<%}%>
- * </ul>
- * </p>
-<%}%>
- *
-<%if (!genModel.isSuppressEMFMetaData()) {%>
- * @see <%=genPackage.getQualifiedPackageInterfaceName()%>#get<%=genClass.getClassifierAccessorName()%>()
-<%}%>
-<%if (!genModel.isSuppressEMFModelTags()) { boolean first = true; for (StringTokenizer stringTokenizer = new StringTokenizer(genClass.getModelInfo(), "\n\r"); stringTokenizer.hasMoreTokens(); ) { String modelInfo = stringTokenizer.nextToken(); if (first) { first = false;%>
- * @model <%=modelInfo%>
-<%} else {%>
- *        <%=modelInfo%>
-<%}} if (first) {%>
- * @model
-<%}}%>
-<%if (genClass.needsRootExtendsInterfaceExtendsTag()) {%>
- * @extends <%=genModel.getImportedName(genModel.getRootExtendsInterface())%>
-<%}%>
- * @generated
- */
-<%} else {%>
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b><%=genClass.getFormattedName()%></b></em>'.
- * <!-- end-user-doc -->
- * <p>
-<%if (!genClass.getImplementedGenFeatures().isEmpty()) {%>
- * The following features are implemented:
- * <ul>
-<%for (Iterator i=genClass.getImplementedGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
- *   <li>{@link <%=genClass.getQualifiedClassName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}</li>
-<%}%>
- * </ul>
-<%}%>
- * </p>
- *
- * @generated
- */
-<%}%>
-<%if (isImplementation) {%>
-public<%if (genClass.isAbstract()) {%> abstract<%}%> class <%=genClass.getClassName()%><%=genClass.getClassExtends()%><%=genClass.getClassImplements()%>
-<%} else {%>
-public interface <%=genClass.getInterfaceName()%><%=genClass.getInterfaceExtends()%>
-<%}%>
-{
-<%if (genModel.getCopyrightText() != null) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	<%=publicStaticFinalFlag%><%=genModel.getImportedName("java.lang.String")%> copyright = "<%=genModel.getCopyrightText()%>";<%=genModel.getNonNLS()%>
-
-<%}%>
-<%if (isImplementation && genModel.getDriverNumber() != null) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final <%=genModel.getImportedName("java.lang.String")%> mofDriverNumber = "<%=genModel.getDriverNumber()%>";<%=genModel.getNonNLS()%>
-
-<%}%>
-<%if (isImplementation && genClass.isJavaIOSerializable()) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-<%}%>
-<%if (isImplementation && genModel.isVirtualDelegation()) { String eVirtualValuesField = genClass.getEVirtualValuesField();%>
-  <%if (eVirtualValuesField != null) {%>
-	/**
-	 * An array of objects representing the values of non-primitive features.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Object[] <%=eVirtualValuesField%> = null;
-
-  <%}%>
-  <%{ List eVirtualIndexBitFields = genClass.getEVirtualIndexBitFields(new ArrayList());%>
-    <%if (!eVirtualIndexBitFields.isEmpty()) {%>
-      <%for (Iterator i = eVirtualIndexBitFields.iterator(); i.hasNext();) { String eVirtualIndexBitField = (String)i.next();%>
-	/**
-	 * A bit field representing the indices of non-primitive feature values.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected int <%=eVirtualIndexBitField%> = 0;
-
-      <%}%>
-    <%}%>
-  <%}%>
-<%}%>
-<%if (isImplementation && genClass.isModelRoot() && genModel.isBooleanFlagsEnabled() && genModel.getBooleanFlagsReservedBits() == -1) {%>
-	/**
-	 * A set of bit flags representing the values of boolean attributes and whether unsettable features have been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected int <%=genModel.getBooleanFlagsField()%> = 0;
-
-<%}%>
-<%if (isImplementation && !genModel.isReflectiveDelegation()) {%>
-  <%for (Iterator i=genClass.getDeclaredFieldGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-<%@ include file="Class/declaredFieldGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-    <%if (genFeature.isListType() || genFeature.isReferenceType()) {%>
-      <%if (genClass.isField(genFeature)) {%>
-	/**
-	 * The cached value of the '{@link #<%=genFeature.getGetAccessor()%>() <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #<%=genFeature.getGetAccessor()%>()
-	 * @generated
-	 * @ordered
-	 */
-	protected <%=genFeature.getImportedInternalType()%> <%=genFeature.getSafeName()%> = null;
-
-      <%}%>
-      <%if (genModel.isArrayAccessors() && !genFeature.isFeatureMapType() && !genFeature.isMapType()) {%>
-	/**
-	 * The empty value for the '{@link #<%=genFeature.getGetArrayAccessor()%>() <em><%=genFeature.getFormattedName()%></em>}' array accessor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #<%=genFeature.getGetArrayAccessor()%>()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final <%=genFeature.getListItemType()%>[] <%=genFeature.getUpperName()%>_EEMPTY_ARRAY = new <%=genFeature.getListItemType()%> [0];
-
-      <%}%>
-    <%} else {%>
-      <%if (!genFeature.isVolatile() || !genModel.isReflectiveDelegation() && (!genFeature.hasDelegateFeature() || !genFeature.isUnsettable())) {%>
-	/**
-	 * The default value of the '{@link #<%=genFeature.getGetAccessor()%>() <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #<%=genFeature.getGetAccessor()%>()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final <%=genFeature.getImportedType()%> <%=genFeature.getUpperName()%>_EDEFAULT = <%=genFeature.getStaticDefaultValue()%>;<%=genModel.getNonNLS(genFeature.getStaticDefaultValue())%>
-
-      <%}%>
-      <%if (genClass.isField(genFeature)) {%>
-        <%if (genClass.isFlag(genFeature)) {%>
-          <%if (genClass.getFlagIndex(genFeature) > 31 && genClass.getFlagIndex(genFeature) % 32 == 0) {%>
-	/**
-	 * An additional set of bit flags representing the values of boolean attributes and whether unsettable features have been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected int <%=genClass.getFlagsField(genFeature)%> = 0;
-
-          <%}%>
-	/**
-	 * The flag representing the value of the '{@link #<%=genFeature.getGetAccessor()%>() <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #<%=genFeature.getGetAccessor()%>()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int <%=genFeature.getUpperName()%>_EFLAG = 1 <%="<< " + genClass.getFlagIndex(genFeature) % 32 %>;
-
-        <%} else {%>
-	/**
-	 * The cached value of the '{@link #<%=genFeature.getGetAccessor()%>() <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #<%=genFeature.getGetAccessor()%>()
-	 * @generated
-	 * @ordered
-	 */
-	protected <%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = <%=genFeature.getUpperName()%>_EDEFAULT;
-
-        <%}%>
-      <%}%>
-    <%}%>
-    <%if (genClass.isESetField(genFeature)) {%>
-      <%if (genClass.isESetFlag(genFeature)) {%>
-        <%if (genClass.getESetFlagIndex(genFeature) > 31 && genClass.getESetFlagIndex(genFeature) % 32 == 0) {%>
-	/**
-	 * An additional set of bit flags representing the values of boolean attributes and whether unsettable features have been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected int <%=genClass.getESetFlagsField(genFeature)%> = 0;
-
-        <%}%>
-	/**
-	 * The flag representing whether the <%=genFeature.getFormattedName()%> <%=genFeature.getFeatureKind()%> has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int <%=genFeature.getUpperName()%>_ESETFLAG = 1 <%="<< " + genClass.getESetFlagIndex(genFeature) % 32 %>;
-
-      <%} else {%>
-	/**
-	 * This is true if the <%=genFeature.getFormattedName()%> <%=genFeature.getFeatureKind()%> has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean <%=genFeature.getUncapName()%>ESet = false;
-
-      <%}%>
-    <%}%>
-  <%}%>
-<%@ include file="Class/declaredFieldGenFeature.insert.javajetinc" fail="silent" %>
-<%@ end %><%//Class/declaredFieldGenFeature.override.javajetinc%>
-<%}%>
-<%if (isImplementation) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected <%=genClass.getClassName()%>()
-	{
-		super();
-  <%for (Iterator i=genClass.getFlagGenFeatures("true").iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-		<%=genClass.getFlagsField(genFeature)%> |= <%=genFeature.getUpperName()%>_EFLAG;
-  <%}%>
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected <%=genModel.getImportedName("org.eclipse.emf.ecore.EClass")%> eStaticClass()
-	{
-		return <%=genClass.getQualifiedClassifierAccessor()%>;
-	}
-
-<%}%>
-<%new Runnable() { public void run() {%>
-<%for (Iterator i=(isImplementation ? genClass.getImplementedGenFeatures() : genClass.getDeclaredGenFeatures()).iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-<%@ include file="Class/genFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-  <%if (genModel.isArrayAccessors() && genFeature.isListType() && !genFeature.isFeatureMapType() && !genFeature.isMapType()) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    <%if (!isImplementation) {%>
-	<%=genFeature.getListItemType()%>[] <%=genFeature.getGetArrayAccessor()%>();
-
-    <%} else {%>
-	public <%=genFeature.getListItemType()%>[] <%=genFeature.getGetArrayAccessor()%>()
-	{
-      <%if (genFeature.isVolatile()) {%>
-		<%=genModel.getImportedName("org.eclipse.emf.common.util.BasicEList")%> list = (<%=genModel.getImportedName("org.eclipse.emf.common.util.BasicEList")%>)<%=genFeature.getGetAccessor()%>();
-		if (list.isEmpty()) return <%=genFeature.getUpperName()%>_EEMPTY_ARRAY;
-      <%} else {%>
-		if (<%=genFeature.getSafeName()%> == null || <%=genFeature.getSafeName()%>.isEmpty()) return <%=genFeature.getUpperName()%>_EEMPTY_ARRAY;
-		<%=genModel.getImportedName("org.eclipse.emf.common.util.BasicEList")%> list = (<%=genModel.getImportedName("org.eclipse.emf.common.util.BasicEList")%>)<%=genFeature.getSafeName()%>;
-      <%}%>
-		list.shrink();
-		return (<%=genFeature.getListItemType()%>[])list.data();
-	}
-
-    <%}%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    <%if (!isImplementation) {%>
-	<%=genFeature.getListItemType()%> get<%=genFeature.getAccessorName()%>(int index);
-
-    <%} else {%>
-	public <%=genFeature.getListItemType()%> get<%=genFeature.getAccessorName()%>(int index)
-	{
-		return (<%=genFeature.getListItemType()%>)<%=genFeature.getGetAccessor()%>().get(index);
-	}
-
-    <%}%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    <%if (!isImplementation) {%>
-	int get<%=genFeature.getAccessorName()%>Length();
-
-    <%} else {%>
-	public int get<%=genFeature.getAccessorName()%>Length()
-	{
-      <%if (genFeature.isVolatile()) {%>
-		return <%=genFeature.getGetAccessor()%>().size();
-      <%} else {%>
-		return <%=genFeature.getSafeName()%> == null ? 0 : <%=genFeature.getSafeName()%>.size();
-      <%}%>
-	}
-
-    <%}%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    <%if (!isImplementation) {%>
-	void set<%=genFeature.getAccessorName()%>(<%=genFeature.getListItemType()%>[] new<%=genFeature.getCapName()%>);
-
-    <%} else {%>
-	public void set<%=genFeature.getAccessorName()%>(<%=genFeature.getListItemType()%>[] new<%=genFeature.getCapName()%>)
-	{
-		((<%=genModel.getImportedName("org.eclipse.emf.common.util.BasicEList")%>)<%=genFeature.getGetAccessor()%>()).setData(new<%=genFeature.getCapName()%>.length, new<%=genFeature.getCapName()%>);
-	}
-
-    <%}%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    <%if (!isImplementation) {%>
-	void set<%=genFeature.getAccessorName()%>(int index, <%=genFeature.getListItemType()%> element);
-
-    <%} else {%>
-	public void set<%=genFeature.getAccessorName()%>(int index, <%=genFeature.getListItemType()%> element)
-	{
-		<%=genFeature.getGetAccessor()%>().set(index, element);
-	}
-
-    <%}%>
-  <%}%>
-  <%if (genFeature.isGet() && (isImplementation || !genFeature.isSuppressedGetVisibility())) {%>
-<%@ include file="Class/getGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-<%if (isInterface) {%>
-	/**
-	 * Returns the value of the '<em><b><%=genFeature.getFormattedName()%></b></em>' <%=genFeature.getFeatureKind()%>.
-    <%if (genFeature.isListType()) {%>
-      <%if (genFeature.isMapType()) { GenFeature keyFeature = genFeature.getMapEntryTypeGenClass().getMapEntryKeyFeature(); GenFeature valueFeature = genFeature.getMapEntryTypeGenClass().getMapEntryValueFeature(); %>
-	 * The key is of type <%if (keyFeature.isListType()) {%>list of {@link <%=keyFeature.getQualifiedListItemType()%>}<%} else {%>{@link <%=keyFeature.getType()%>}<%}%>,
-	 * and the value is of type <%if (valueFeature.isListType()) {%>list of {@link <%=valueFeature.getQualifiedListItemType()%>}<%} else {%>{@link <%=valueFeature.getType()%>}<%}%>,
-      <%} else if (!genFeature.isWrappedFeatureMapType() && !(genModel.isSuppressEMFMetaData() && "org.eclipse.emf.ecore.EObject".equals(genFeature.getQualifiedListItemType()))) {%>
-	 * The list contents are of type {@link <%=genFeature.getQualifiedListItemType()%>}.
-      <%}%>
-    <%} else if (genFeature.isSetDefaultValue()) {%>
-	 * The default value is <code><%=genFeature.getDefaultValue()%></code>.
-    <%}%>
-    <%if (genFeature.getTypeGenEnum() != null) {%>
-	 * The literals are from the enumeration {@link <%=genFeature.getTypeGenEnum().getQualifiedName()%>}.
-    <%}%>
-    <%if (genFeature.isBidirectional() && !genFeature.getReverse().getGenClass().isMapEntry()) { GenFeature reverseGenFeature = genFeature.getReverse(); %>
-      <%if (!reverseGenFeature.isSuppressedGetVisibility()) {%>
-	 * It is bidirectional and its opposite is '{@link <%=reverseGenFeature.getGenClass().getQualifiedInterfaceName()%>#<%=reverseGenFeature.getGetAccessor()%> <em><%=reverseGenFeature.getFormattedName()%></em>}'.
-      <%}%>
-    <%}%>
-	 * <!-- begin-user-doc -->
-    <%if (!genFeature.hasDocumentation()) {%>
-	 * <p>
-	 * If the meaning of the '<em><%=genFeature.getFormattedName()%></em>' <%=genFeature.getFeatureKind()%> isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-    <%}%>
-	 * <!-- end-user-doc -->
-    <%if (genFeature.hasDocumentation()) {%>
-	 * <!-- begin-model-doc -->
-	 * <%=genFeature.getDocumentation(genModel.getIndentation(stringBuffer))%>
-	 * <!-- end-model-doc -->
-    <%}%>
-	 * @return the value of the '<em><%=genFeature.getFormattedName()%></em>' <%=genFeature.getFeatureKind()%>.
-    <%if (genFeature.getTypeGenEnum() != null) {%>
-	 * @see <%=genFeature.getTypeGenEnum().getQualifiedName()%>
-    <%}%>
-    <%if (genFeature.isUnsettable()) {%>
-      <%if (!genFeature.isSuppressedIsSetVisibility()) {%>
-	 * @see #isSet<%=genFeature.getAccessorName()%>()
-      <%}%>
-      <%if (genFeature.isChangeable() && !genFeature.isSuppressedUnsetVisibility()) {%>
-	 * @see #unset<%=genFeature.getAccessorName()%>()
-      <%}%>
-    <%}%>
-    <%if (genFeature.isChangeable() && !genFeature.isListType() && !genFeature.isSuppressedSetVisibility()) {%>
-	 * @see #set<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedType()%>)
-    <%}%>
-    <%if (!genModel.isSuppressEMFMetaData()) {%>
-	 * @see <%=genPackage.getQualifiedPackageInterfaceName()%>#get<%=genFeature.getFeatureAccessorName()%>()
-    <%}%>
-    <%if (genFeature.isBidirectional() && !genFeature.getReverse().getGenClass().isMapEntry()) { GenFeature reverseGenFeature = genFeature.getReverse(); %>
-      <%if (!reverseGenFeature.isSuppressedGetVisibility()) {%>
-	 * @see <%=reverseGenFeature.getGenClass().getQualifiedInterfaceName()%>#<%=reverseGenFeature.getGetAccessor()%>
-      <%}%>
-    <%}%>
-    <%if (!genModel.isSuppressEMFModelTags()) { boolean first = true; for (StringTokenizer stringTokenizer = new StringTokenizer(genFeature.getModelInfo(), "\n\r"); stringTokenizer.hasMoreTokens(); ) { String modelInfo = stringTokenizer.nextToken(); if (first) { first = false;%>
-	 * @model <%=modelInfo%>
-    <%} else {%>
-	 *        <%=modelInfo%>
-    <%}} if (first) {%>
-	 * @model
-    <%}}%>
-	 * @generated
-	 */
-<%} else {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-<%}%>
-<%if (!isImplementation) {%>
-	<%=genFeature.getImportedType()%> <%=genFeature.getGetAccessor()%>();
-
-<%} else {%>
-	public <%=genFeature.getImportedType()%> <%=genFeature.getGetAccessor()%>()
-	{
-<%@ include file="Class/getGenFeature.pre.insert.javajetinc" fail="silent" %>
-    <%if (genModel.isReflectiveDelegation()) {%>
-		return <%if (genFeature.isPrimitiveType()) {%>(<%}%>(<%=genFeature.getObjectType()%>)eGet(<%=genFeature.getQualifiedFeatureAccessor()%>, true)<%if (genFeature.isPrimitiveType()) {%>).<%=genFeature.getPrimitiveValueFunction()%>()<%}%>;
-    <%} else if (!genFeature.isVolatile()) {%>
-      <%if (genFeature.isListType()) {%>
-        <%if (genModel.isVirtualDelegation()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%}%>
-		if (<%=genFeature.getSafeName()%> == null)
-		{
-        <%if (genModel.isVirtualDelegation()) {%>
-			eVirtualSet(<%=genClass.getQualifiedFeatureID(genFeature)%>, <%=genFeature.getSafeName()%> = new <%=genClass.getListConstructor(genFeature)%>);
-        <%} else {%>
-			<%=genFeature.getSafeName()%> = new <%=genClass.getListConstructor(genFeature)%>;
-        <%}%>
-		}
-		return <%=genFeature.getSafeName()%><%=genFeature.isMapType() && genFeature.isEffectiveSuppressEMFTypes() ? ".map()" : ""%>;
-      <%} else if (genFeature.isContainer()) {%>
-		if (eContainerFeatureID != <%=genClass.getQualifiedFeatureID(genFeature)%>) return null;
-		return (<%=genFeature.getImportedType()%>)eContainer();
-      <%} else {%>
-        <%if (genFeature.isResolveProxies()) {%>
-          <%if (genModel.isVirtualDelegation()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%><%if (!genFeature.isReferenceType()) {%>, <%=genFeature.getUpperName()%>_EDEFAULT<%}%>);
-          <%}%>
-		if (<%=genFeature.getSafeName()%> != null && <%=genFeature.getSafeNameAsEObject()%>.eIsProxy())
-		{
-			<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> old<%=genFeature.getCapName()%> = (<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>;
-			<%=genFeature.getSafeName()%> = <%=genFeature.getNonEObjectInternalTypeCast()%>eResolveProxy(old<%=genFeature.getCapName()%>);
-			if (<%=genFeature.getSafeName()%> != old<%=genFeature.getCapName()%>)
-			{
-          <%if (genFeature.isEffectiveContains()) {%>
-				<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> new<%=genFeature.getCapName()%> = (<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>;
-          <%if (!genFeature.isBidirectional()) {%>
-				<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = old<%=genFeature.getCapName()%>.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%>, null, null);
-          <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
-				<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs =  old<%=genFeature.getCapName()%>.eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, null);
-          <%}%>
-				if (new<%=genFeature.getCapName()%>.eInternalContainer() == null)
-				{
-          <%if (!genFeature.isBidirectional()) {%>
-					msgs = new<%=genFeature.getCapName()%>.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%>, null, msgs);
-          <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
-					msgs =  new<%=genFeature.getCapName()%>.eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, msgs);
-          <%}%>
-				}
-				if (msgs != null) msgs.dispatch();
-          <%} else if (genModel.isVirtualDelegation()) {%>
-				eVirtualSet(<%=genClass.getQualifiedFeatureID(genFeature)%>, <%=genFeature.getSafeName()%>);
-          <%}%>
-          <%if (!genModel.isSuppressNotification()) {%>
-				if (eNotificationRequired())
-					eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.RESOLVE, <%=genClass.getQualifiedFeatureID(genFeature)%>, old<%=genFeature.getCapName()%>, <%=genFeature.getSafeName()%>));
-          <%}%>
-			}
-		}
-        <%}%>
-        <%if (!genFeature.isResolveProxies() && genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		return (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%><%if (!genFeature.isReferenceType()) {%>, <%=genFeature.getUpperName()%>_EDEFAULT<%}%>);
-        <%} else if (genClass.isFlag(genFeature)) {%>
-		return (<%=genClass.getFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_EFLAG) != 0;
-        <%} else {%>
-		return <%=genFeature.getSafeName()%>;
-        <%}%>
-      <%}%>
-    <%} else {//volatile%>
-      <%if (genFeature.isResolveProxies() && !genFeature.isListType()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = basicGet<%=genFeature.getAccessorName()%>();
-		return <%=genFeature.getSafeName()%> != null && <%=genFeature.getSafeName()%>.eIsProxy() ? <%=genFeature.getNonEObjectInternalTypeCast()%>eResolveProxy((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>) : <%=genFeature.getSafeName()%>;
-      <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
-        <%if (genFeature.isFeatureMapType()) {%>
-          <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		return new <%=genFeature.getImportedEffectiveFeatureMapWrapperClass()%>((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap().list(<%=genFeature.getQualifiedFeatureAccessor()%>));
-          <%} else {%>
-		return (<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>)get<%=delegateFeature.getAccessorName()%>()).list(<%=genFeature.getQualifiedFeatureAccessor()%>);
-          <%}%>
-        <%} else if (genFeature.isListType()) {%>
-          <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap().list(<%=genFeature.getQualifiedFeatureAccessor()%>);
-          <%} else {%>
-		return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>)get<%=delegateFeature.getAccessorName()%>()).list(<%=genFeature.getQualifiedFeatureAccessor()%>);
-          <%}%>
-        <%} else {%>
-          <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		return <%if (genFeature.isPrimitiveType()) {%>(<%}%>(<%=genFeature.getObjectType()%>)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap().get(<%=genFeature.getQualifiedFeatureAccessor()%>, true)<%if (genFeature.isPrimitiveType()) {%>).<%=genFeature.getPrimitiveValueFunction()%>()<%}%>;
-          <%} else {%>
-		return <%if (genFeature.isPrimitiveType()) {%>(<%}%>(<%=genFeature.getObjectType()%>)get<%=delegateFeature.getAccessorName()%>().get(<%=genFeature.getQualifiedFeatureAccessor()%>, true)<%if (genFeature.isPrimitiveType()) {%>).<%=genFeature.getPrimitiveValueFunction()%>()<%}%>;
-          <%}%>
-        <%}%>
-      <%} else {%>
-<%@ include file="Class/getGenFeature.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method to return the '<%=genFeature.getFormattedName()%>' <%=genFeature.getFeatureKind()%>
-		// Ensure that you remove @generated or mark it @generated NOT
-        <%if (genFeature.isListType()) {%>
-		// The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting
-		// so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.<%if (genFeature.isMapType()) {%>EcoreEMap<%} else if (genFeature.isFeatureMapType()) {%>BasicFeatureMap<%} else {%>EcoreEList<%}%> should be used.
-        <%}%>
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/getGenFeature.todo.override.javajetinc%>
-      <%}%>
-    <%}%>
-	}
-
-<%}%>
-<%@ end %><%//Class/getGenFeature.override.javajetinc%>
-  <%}%>
-  <%if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicGet()) {%>
-<%@ include file="Class/basicGetGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <%=genFeature.getImportedType()%> basicGet<%=genFeature.getAccessorName()%>()
-	{
-<%@ include file="Class/basicGetGenFeature.pre.insert.javajetinc" fail="silent" %>
-    <%if (genFeature.isContainer()) {%>
-		if (eContainerFeatureID != <%=genClass.getQualifiedFeatureID(genFeature)%>) return null;
-		return (<%=genFeature.getImportedType()%>)eInternalContainer();
-    <%} else if (!genFeature.isVolatile()) {%>
-      <%if (genModel.isVirtualDelegation()) {%>
-		return (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-      <%} else {%>
-		return <%=genFeature.getSafeName()%>;
-      <%}%>
-    <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
-      <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		return (<%=genFeature.getImportedType()%>)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap().get(<%=genFeature.getQualifiedFeatureAccessor()%>, false);
-      <%} else {%>
-		return (<%=genFeature.getImportedType()%>)get<%=delegateFeature.getAccessorName()%>().get(<%=genFeature.getQualifiedFeatureAccessor()%>, false);
-      <%}%>
-    <%} else {%>
-<%@ include file="Class/basicGetGenFeature.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method to return the '<%=genFeature.getFormattedName()%>' <%=genFeature.getFeatureKind()%>
-		// -> do not perform proxy resolution
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/basicGetGenFeature.todo.override.javajetinc%>
-    <%}%>
-	}
-
-<%@ end %><%//Class/basicGetGenFeature.override.javajetinc%>
-  <%}%>
-  <%if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicSet()) {%>
-<%@ include file="Class/basicSetGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> basicSet<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedInternalType()%> new<%=genFeature.getCapName()%>, <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs)
-	{
-    <%if (genFeature.isContainer()) {%>
-<%@ include file="Class/basicSetGenFeature.pre.insert.javajetinc" fail="silent" %>
-		msgs = eBasicSetContainer((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>, <%=genClass.getQualifiedFeatureID(genFeature)%>, msgs);
-<%@ include file="Class/basicSetGenFeature.post.insert.javajetinc" fail="silent" %>
-		return msgs;
-    <%} else if (!genFeature.isVolatile()) {%>
-<%@ include file="Class/basicSetGenFeature.pre.insert.javajetinc" fail="silent" %>
-      <%if (genModel.isVirtualDelegation()) {%>
-		Object old<%=genFeature.getCapName()%> = eVirtualSet(<%=genClass.getQualifiedFeatureID(genFeature)%>, new<%=genFeature.getCapName()%>);
-      <%} else {%>
-		<%=genFeature.getImportedType()%> old<%=genFeature.getCapName()%> = <%=genFeature.getSafeName()%>;
-		<%=genFeature.getSafeName()%> = new<%=genFeature.getCapName()%>;
-      <%}%>
-      <%if (genFeature.isUnsettable()) {%>
-        <%if (genModel.isVirtualDelegation()) {%>
-		boolean isSetChange = old<%=genFeature.getCapName()%> == EVIRTUAL_NO_VALUE;
-        <%} else if (genClass.isESetFlag(genFeature)) {%>
-		boolean old<%=genFeature.getCapName()%>ESet = (<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0;
-		<%=genClass.getESetFlagsField(genFeature)%> |= <%=genFeature.getUpperName()%>_ESETFLAG;
-        <%} else {%>
-		boolean old<%=genFeature.getCapName()%>ESet = <%=genFeature.getUncapName()%>ESet;
-		<%=genFeature.getUncapName()%>ESet = true;
-        <%}%>
-      <%}%>
-      <%if (!genModel.isSuppressNotification()) {%>
-		if (eNotificationRequired())
-		{
-        <%if (genFeature.isUnsettable()) {%>
-			<%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%> notification = new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.SET, <%=genClass.getQualifiedFeatureID(genFeature)%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange ? null : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, new<%=genFeature.getCapName()%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange<%} else {%>!old<%=genFeature.getCapName()%>ESet<%}%>);
-        <%} else {%>
-			<%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%> notification = new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.SET, <%=genClass.getQualifiedFeatureID(genFeature)%>, <%if (genModel.isVirtualDelegation()) {%>old<%=genFeature.getCapName()%> == EVIRTUAL_NO_VALUE ? null : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, new<%=genFeature.getCapName()%>);
-        <%}%>
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-      <%}%>
-<%@ include file="Class/basicSetGenFeature.post.insert.javajetinc" fail="silent" %>
-		return msgs;
-    <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
-      <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap()).basicAdd(<%=genFeature.getQualifiedFeatureAccessor()%>, new<%=genFeature.getCapName()%>, msgs);
-      <%} else {%>
-		return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)get<%=delegateFeature.getAccessorName()%>()).basicAdd(<%=genFeature.getQualifiedFeatureAccessor()%>, new<%=genFeature.getCapName()%>, msgs);
-      <%}%>
-    <%} else {%>
-<%@ include file="Class/basicSetGenFeature.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method to set the contained '<%=genFeature.getFormattedName()%>' <%=genFeature.getFeatureKind()%>
-		// -> this method is automatically invoked to keep the containment relationship in synch
-		// -> do not modify other features
-		// -> return msgs, after adding any generated Notification to it (if it is null, a NotificationChain object must be created first)
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/basicSetGenFeature.todo.override.javajetinc%>
-    <%}%>
-	}
-
-<%@ end %><%//Class/basicSetGenFeature.override.javajetinc%>
-  <%}%>
-  <%if (genFeature.isSet() && (isImplementation || !genFeature.isSuppressedSetVisibility())) {%>
-<%@ include file="Class/setGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-<%if (isInterface) { %>
-	/**
-	 * Sets the value of the '{@link <%=genClass.getQualifiedInterfaceName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em><%=genFeature.getFormattedName()%></em>' <%=genFeature.getFeatureKind()%>.
-    <%if (genFeature.isEnumType()) {%>
-	 * @see <%=genFeature.getTypeGenEnum().getQualifiedName()%>
-    <%}%>
-    <%if (genFeature.isUnsettable()) {%>
-      <%if (!genFeature.isSuppressedIsSetVisibility()) {%>
-	 * @see #isSet<%=genFeature.getAccessorName()%>()
-      <%}%>
-      <%if (!genFeature.isSuppressedUnsetVisibility()) {%>
-	 * @see #unset<%=genFeature.getAccessorName()%>()
-      <%}%>
-    <%}%>
-	 * @see #<%=genFeature.getGetAccessor()%>()
-	 * @generated
-	 */
-<%} else {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-<%}%>
-<%if (!isImplementation) { %>
-	void set<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedType()%> value);
-
-<%} else {%>
-	public void set<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedType()%> new<%=genFeature.getCapName()%>)
-	{
-<%@ include file="Class/setGenFeature.pre.insert.javajetinc" fail="silent" %>
-    <%if (genModel.isReflectiveDelegation()) {%>
-		eSet(<%=genFeature.getQualifiedFeatureAccessor()%>, <%if (genFeature.isPrimitiveType()) {%>new <%=genFeature.getObjectType()%>(<%}%>new<%=genFeature.getCapName()%><%if (genFeature.isPrimitiveType()) {%>)<%}%>);
-    <%} else if (!genFeature.isVolatile()) {%>
-      <%if (genFeature.isContainer()) { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
-		if (new<%=genFeature.getCapName()%> != eInternalContainer() || (eContainerFeatureID != <%=genClass.getQualifiedFeatureID(genFeature)%> && new<%=genFeature.getCapName()%> != null))
-		{
-			if (<%=genModel.getImportedName("org.eclipse.emf.ecore.util.EcoreUtil")%>.isAncestor(this, <%=genFeature.getEObjectCast()%>new<%=genFeature.getCapName()%>))
-				throw new <%=genModel.getImportedName("java.lang.IllegalArgumentException")%>("Recursive containment not allowed for " + toString());<%=genModel.getNonNLS()%>
-			<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (new<%=genFeature.getCapName()%> != null)
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>).eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, msgs);
-			msgs = basicSet<%=genFeature.getAccessorName()%>(<%=genFeature.getInternalTypeCast()%>new<%=genFeature.getCapName()%>, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-        <%if (!genModel.isSuppressNotification()) {%>
-		else if (eNotificationRequired())
-			eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.SET, <%=genClass.getQualifiedFeatureID(genFeature)%>, new<%=genFeature.getCapName()%>, new<%=genFeature.getCapName()%>));
-        <%}%>
-      <%} else if (genFeature.isBidirectional() || genFeature.isEffectiveContains()) {%>
-        <%if (genModel.isVirtualDelegation()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%}%>
-		if (new<%=genFeature.getCapName()%> != <%=genFeature.getSafeName()%>)
-		{
-			<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = null;
-			if (<%=genFeature.getSafeName()%> != null)
-        <%if (!genFeature.isBidirectional()) {%>
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%>, null, msgs);
-			if (new<%=genFeature.getCapName()%> != null)
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%>, null, msgs);
-        <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, msgs);
-			if (new<%=genFeature.getCapName()%> != null)
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>).eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, msgs);
-        <%}%>
-			msgs = basicSet<%=genFeature.getAccessorName()%>(<%=genFeature.getInternalTypeCast()%>new<%=genFeature.getCapName()%>, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-        <%if (genFeature.isUnsettable()) {%>
-		else
-    	{
-          <%if (genModel.isVirtualDelegation()) {%>
-			boolean old<%=genFeature.getCapName()%>ESet = eVirtualIsSet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-          <%} else if (genClass.isESetFlag(genFeature)) {%>
-            <%if (!genModel.isSuppressNotification()) {%>
-			boolean old<%=genFeature.getCapName()%>ESet = (<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0;
-            <%}%>
-			<%=genClass.getESetFlagsField(genFeature)%> |= <%=genFeature.getUpperName()%>_ESETFLAG;
-          <%} else {%>
-            <%if (!genModel.isSuppressNotification()) {%>
-			boolean old<%=genFeature.getCapName()%>ESet = <%=genFeature.getUncapName()%>ESet;
-            <%}%>
-			<%=genFeature.getUncapName()%>ESet = true;
-          <%}%>
-          <%if (!genModel.isSuppressNotification()) {%>
-			if (eNotificationRequired())
-				eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.SET, <%=genClass.getQualifiedFeatureID(genFeature)%>, new<%=genFeature.getCapName()%>, new<%=genFeature.getCapName()%>, !old<%=genFeature.getCapName()%>ESet));
-          <%}%>
-    	}
-        <%} else {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		else if (eNotificationRequired())
-			eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.SET, <%=genClass.getQualifiedFeatureID(genFeature)%>, new<%=genFeature.getCapName()%>, new<%=genFeature.getCapName()%>));
-          <%}%>
-        <%}%>
-      <%} else {%>
-        <%if (genClass.isFlag(genFeature)) {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		<%=genFeature.getImportedType()%> old<%=genFeature.getCapName()%> = (<%=genClass.getFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_EFLAG) != 0;
-          <%}%>
-		if (new<%=genFeature.getCapName()%>) <%=genClass.getFlagsField(genFeature)%> |= <%=genFeature.getUpperName()%>_EFLAG; else <%=genClass.getFlagsField(genFeature)%> &= ~<%=genFeature.getUpperName()%>_EFLAG;
-        <%} else {%>
-          <%if (!genModel.isVirtualDelegation() || genFeature.isPrimitiveType()) {%>
-            <%if (!genModel.isSuppressNotification()) {%>
-		<%=genFeature.getImportedType()%> old<%=genFeature.getCapName()%> = <%=genFeature.getSafeName()%>;
-            <%}%>
-          <%}%>
-          <%if (genFeature.isEnumType()) {%>
-            <%if (genModel.isVirtualDelegation()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = new<%=genFeature.getCapName()%> == null ? <%=genFeature.getUpperName()%>_EDEFAULT : new<%=genFeature.getCapName()%>;
-            <%} else {%>
-		<%=genFeature.getSafeName()%> = new<%=genFeature.getCapName()%> == null ? <%=genFeature.getUpperName()%>_EDEFAULT : new<%=genFeature.getCapName()%>;
-            <%}%>
-          <%} else {%>
-            <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = <%=genFeature.getInternalTypeCast()%>new<%=genFeature.getCapName()%>;
-            <%} else {%>
-		<%=genFeature.getSafeName()%> = <%=genFeature.getInternalTypeCast()%>new<%=genFeature.getCapName()%>;
-            <%}%>
-          <%}%>
-          <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		Object old<%=genFeature.getCapName()%> = eVirtualSet(<%=genClass.getQualifiedFeatureID(genFeature)%>, <%=genFeature.getSafeName()%>);
-          <%}%>
-        <%}%>
-        <%if (genFeature.isUnsettable()) {%>
-          <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		boolean isSetChange = old<%=genFeature.getCapName()%> == EVIRTUAL_NO_VALUE;
-          <%} else if (genClass.isESetFlag(genFeature)) {%>
-            <%if (!genModel.isSuppressNotification()) {%>
-		boolean old<%=genFeature.getCapName()%>ESet = (<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0;
-            <%}%>
-		<%=genClass.getESetFlagsField(genFeature)%> |= <%=genFeature.getUpperName()%>_ESETFLAG;
-          <%} else {%>
-            <%if (!genModel.isSuppressNotification()) {%>
-		boolean old<%=genFeature.getCapName()%>ESet = <%=genFeature.getUncapName()%>ESet;
-            <%}%>
-		<%=genFeature.getUncapName()%>ESet = true;
-          <%}%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		if (eNotificationRequired())
-			eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.SET, <%=genClass.getQualifiedFeatureID(genFeature)%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange ? <%if (genFeature.isReferenceType()) {%>null<%} else {%><%=genFeature.getUpperName()%>_EDEFAULT<%}%> : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, <%if (genClass.isFlag(genFeature)) {%>new<%=genFeature.getCapName()%><%} else {%><%=genFeature.getSafeName()%><%}%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange<%} else {%>!old<%=genFeature.getCapName()%>ESet<%}%>));
-          <%}%>
-        <%} else {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		if (eNotificationRequired())
-			eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.SET, <%=genClass.getQualifiedFeatureID(genFeature)%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>old<%=genFeature.getCapName()%> == EVIRTUAL_NO_VALUE ? <%if (genFeature.isReferenceType()) {%>null<%} else {%><%=genFeature.getUpperName()%>_EDEFAULT<%}%> : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, <%if (genClass.isFlag(genFeature)) {%>new<%=genFeature.getCapName()%><%} else {%><%=genFeature.getSafeName()%><%}%>));
-          <%}%>
-        <%}%>
-      <%}%>
-<%@ include file="Class/setGenFeature.post.insert.javajetinc" fail="silent" %>
-    <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
-      <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap()).set(<%=genFeature.getQualifiedFeatureAccessor()%>, <%if (genFeature.isPrimitiveType()) {%>new <%=genFeature.getObjectType()%>(<%}%>new<%=genFeature.getCapName()%><%if (genFeature.isPrimitiveType()) {%>)<%}%>);
-      <%} else {%>
-		((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)get<%=delegateFeature.getAccessorName()%>()).set(<%=genFeature.getQualifiedFeatureAccessor()%>, <%if (genFeature.isPrimitiveType()) {%>new <%=genFeature.getObjectType()%>(<%}%>new<%=genFeature.getCapName()%><%if (genFeature.isPrimitiveType()) {%>)<%}%>);
-      <%}%>
-    <%} else {%>
-<%@ include file="Class/setGenFeature.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method to set the '<%=genFeature.getFormattedName()%>' <%=genFeature.getFeatureKind()%>
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/setGenFeature.todo.override.javajetinc%>
-    <%}%>
-	}
-
-<%}%>
-<%@ end %><%//Class/setGenFeature.override.javajetinc%>
-  <%}%>
-  <%if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicUnset()) {%>
-<%@ include file="Class/basicUnsetGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> basicUnset<%=genFeature.getAccessorName()%>(<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs)
-	{
-    <%if (!genFeature.isVolatile()) {%>
-      <%if (genModel.isVirtualDelegation()) {%>
-		Object old<%=genFeature.getCapName()%> = eVirtualUnset(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-      <%} else {%>
-		<%=genFeature.getImportedType()%> old<%=genFeature.getCapName()%> = <%=genFeature.getSafeName()%>;
-		<%=genFeature.getSafeName()%> = null;
-      <%}%>
-      <%if (genModel.isVirtualDelegation()) {%>
-		boolean isSetChange = old<%=genFeature.getCapName()%> != EVIRTUAL_NO_VALUE;
-      <%} else if (genClass.isESetFlag(genFeature)) {%>
-		boolean old<%=genFeature.getCapName()%>ESet = (<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0;
-		<%=genClass.getESetFlagsField(genFeature)%> &= ~<%=genFeature.getUpperName()%>_ESETFLAG;
-      <%} else {%>
-		boolean old<%=genFeature.getCapName()%>ESet = <%=genFeature.getUncapName()%>ESet;
-		<%=genFeature.getUncapName()%>ESet = false;
-      <%}%>
-        <%if (!genModel.isSuppressNotification()) {%>
-		if (eNotificationRequired())
-		{
-			<%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%> notification = new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.UNSET, <%=genClass.getQualifiedFeatureID(genFeature)%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange ? old<%=genFeature.getCapName()%> : null<%} else {%>old<%=genFeature.getCapName()%><%}%>, null, <%if (genModel.isVirtualDelegation()) {%>isSetChange<%} else {%>old<%=genFeature.getCapName()%>ESet<%}%>);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-        <%}%>
-    <%} else {%>
-<%@ include file="Class/basicUnsetGenFeature.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method to unset the contained '<%=genFeature.getFormattedName()%>' <%=genFeature.getFeatureKind()%>
-		// -> this method is automatically invoked to keep the containment relationship in synch
-		// -> do not modify other features
-		// -> return msgs, after adding any generated Notification to it (if it is null, a NotificationChain object must be created first)
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/basicUnsetGenFeature.todo.override.javajetinc%>
-    <%}%>
-	}
-
-<%@ end %><%//Class.basicUnsetGenFeature.override.javajetinc%>
-  <%}%>
-  <%if (genFeature.isUnset() && (isImplementation || !genFeature.isSuppressedUnsetVisibility())) {%>
-<%@ include file="Class/unsetGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-<%if (isInterface) {%>
-	/**
-	 * Unsets the value of the '{@link <%=genClass.getQualifiedInterfaceName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-  <%if (!genFeature.isSuppressedIsSetVisibility()) {%>
-	 * @see #isSet<%=genFeature.getAccessorName()%>()
-  <%}%>
-	 * @see #<%=genFeature.getGetAccessor()%>()
-  <%if (!genFeature.isListType() && !genFeature.isSuppressedSetVisibility()) {%>
-	 * @see #set<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedType()%>)
-  <%}%>
-	 * @generated
-	 */
-<%} else {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-<%}%>
-<%if (!isImplementation) {%>
-	void unset<%=genFeature.getAccessorName()%>();
-
-<%} else {%>
-	public void unset<%=genFeature.getAccessorName()%>()
-	{
-    <%if (genModel.isReflectiveDelegation()) {%>
-		eUnset(<%=genFeature.getQualifiedFeatureAccessor()%>);
-    <%} else if (!genFeature.isVolatile()) {%>
-      <%if (genFeature.isListType()) {%>
-        <%if (genModel.isVirtualDelegation()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%}%>
-		if (<%=genFeature.getSafeName()%> != null) ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList")%>.Unsettable)<%=genFeature.getSafeName()%>).unset();
-      <%} else if (genFeature.isBidirectional() || genFeature.isEffectiveContains()) {%>
-        <%if (genModel.isVirtualDelegation()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%}%>
-		if (<%=genFeature.getSafeName()%> != null)
-		{
-			<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = null;
-        <%if (!genFeature.isBidirectional()) {%>
-			msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%>, null, msgs);
-        <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
-			msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, msgs);
-        <%}%>
-			msgs = basicUnset<%=genFeature.getAccessorName()%>(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else
-    	{
-        <%if (genModel.isVirtualDelegation()) {%>
-			boolean old<%=genFeature.getCapName()%>ESet = eVirtualIsSet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%} else if (genClass.isESetFlag(genFeature)) {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-			boolean old<%=genFeature.getCapName()%>ESet = (<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0;
-          <%}%>
-			<%=genClass.getESetFlagsField(genFeature)%> &= ~<%=genFeature.getUpperName()%>_ESETFLAG;
-        <%} else {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-			boolean old<%=genFeature.getCapName()%>ESet = <%=genFeature.getUncapName()%>ESet;
-          <%}%>
-			<%=genFeature.getUncapName()%>ESet = false;
-        <%}%>
-        <%if (!genModel.isSuppressNotification()) {%>
-			if (eNotificationRequired())
-				eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.UNSET, <%=genClass.getQualifiedFeatureID(genFeature)%>, null, null, old<%=genFeature.getCapName()%>ESet));
-        <%}%>
-    	}
-      <%} else {%>
-        <%if (genClass.isFlag(genFeature)) {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		<%=genFeature.getImportedType()%> old<%=genFeature.getCapName()%> = (<%=genClass.getFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_EFLAG) != 0;
-          <%}%>
-        <%} else if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		Object old<%=genFeature.getCapName()%> = eVirtualUnset(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%} else {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		<%=genFeature.getImportedType()%> old<%=genFeature.getCapName()%> = <%=genFeature.getSafeName()%>;
-          <%}%>
-        <%}%>
-        <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		boolean isSetChange = old<%=genFeature.getCapName()%> != EVIRTUAL_NO_VALUE;
-        <%} else if (genClass.isESetFlag(genFeature)) {%>
-		boolean old<%=genFeature.getCapName()%>ESet = (<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0;
-        <%} else {%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		boolean old<%=genFeature.getCapName()%>ESet = <%=genFeature.getUncapName()%>ESet;
-          <%}%>
-        <%}%>
-        <%if (genFeature.isReferenceType()) {%>
-		<%=genFeature.getSafeName()%> = null;
-          <%if (!genModel.isVirtualDelegation()) {%>
-            <%if (genClass.isESetFlag(genFeature)) {%>
-		<%=genClass.getESetFlagsField(genFeature)%> &= ~<%=genFeature.getUpperName()%>_ESETFLAG;
-            <%} else {%>
-		<%=genFeature.getUncapName()%>ESet = false;
-            <%}%>
-          <%}%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		if (eNotificationRequired())
-			eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.UNSET, <%=genClass.getQualifiedFeatureID(genFeature)%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange ? old<%=genFeature.getCapName()%> : null<%} else {%>old<%=genFeature.getCapName()%><%}%>, null, <%if (genModel.isVirtualDelegation()) {%>isSetChange<%} else {%>old<%=genFeature.getCapName()%>ESet<%}%>));
-          <%}%>
-        <%} else {%>
-          <%if (genClass.isFlag(genFeature)) {%>
-		if (<%=genFeature.getUpperName()%>_EDEFAULT) <%=genClass.getFlagsField(genFeature)%> |= <%=genFeature.getUpperName()%>_EFLAG; else <%=genClass.getFlagsField(genFeature)%> &= ~<%=genFeature.getUpperName()%>_EFLAG;
-          <%} else if (!genModel.isVirtualDelegation() || genFeature.isPrimitiveType()) {%>
-		<%=genFeature.getSafeName()%> = <%=genFeature.getUpperName()%>_EDEFAULT;
-          <%}%>
-          <%if (!genModel.isVirtualDelegation() || genFeature.isPrimitiveType()) {%>
-            <%if (genClass.isESetFlag(genFeature)) {%>
-		<%=genClass.getESetFlagsField(genFeature)%> &= ~<%=genFeature.getUpperName()%>_ESETFLAG;
-            <%} else {%>
-		<%=genFeature.getUncapName()%>ESet = false;
-            <%}%>
-          <%}%>
-          <%if (!genModel.isSuppressNotification()) {%>
-		if (eNotificationRequired())
-			eNotify(new <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl")%>(this, <%=genModel.getImportedName("org.eclipse.emf.common.notify.Notification")%>.UNSET, <%=genClass.getQualifiedFeatureID(genFeature)%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange ? old<%=genFeature.getCapName()%> : <%=genFeature.getUpperName()%>_EDEFAULT<%} else {%>old<%=genFeature.getCapName()%><%}%>, <%=genFeature.getUpperName()%>_EDEFAULT, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange<%} else {%>old<%=genFeature.getCapName()%>ESet<%}%>));
-          <%}%>
-        <%}%>
-      <%}%>
-    <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
-      <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap()).clear(<%=genFeature.getQualifiedFeatureAccessor()%>);
-      <%} else {%>
-		((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)get<%=delegateFeature.getAccessorName()%>()).clear(<%=genFeature.getQualifiedFeatureAccessor()%>);
-      <%}%>
-    <%} else {%>
-<%@ include file="Class/unsetGenFeature.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method to unset the '<%=genFeature.getFormattedName()%>' <%=genFeature.getFeatureKind()%>
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/unsetGenFeature.todo.override.javajetinc%>
-    <%}%>
-	}
-
-<%}%>
-<%@ end %><%//Class/unsetGenFeature.override.javajetinc%>
-  <%}%>
-  <%if (genFeature.isIsSet() && (isImplementation || !genFeature.isSuppressedIsSetVisibility())) {%>
-<%@ include file="Class/isSetGenFeature.override.javajetinc" fail="alternative" %>
-<%@ start %>
-<%if (isInterface) {%>
-	/**
-	 * Returns whether the value of the '{@link <%=genClass.getQualifiedInterfaceName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%> is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em><%=genFeature.getFormattedName()%></em>' <%=genFeature.getFeatureKind()%> is set.
-    <%if (genFeature.isChangeable() && !genFeature.isSuppressedUnsetVisibility()) {%>
-	 * @see #unset<%=genFeature.getAccessorName()%>()
-    <%}%>
-	 * @see #<%=genFeature.getGetAccessor()%>()
-    <%if (!genFeature.isListType() && genFeature.isChangeable() && !genFeature.isSuppressedSetVisibility()) {%>
-	 * @see #set<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedType()%>)
-    <%}%>
-	 * @generated
-	 */
-<%} else {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-<%}%>
-<%if (!isImplementation) {%>
-	boolean isSet<%=genFeature.getAccessorName()%>();
-
-<%} else {%>
-	public boolean isSet<%=genFeature.getAccessorName()%>()
-	{
-    <%if (genModel.isReflectiveDelegation()) {%>
-		return eIsSet(<%=genFeature.getQualifiedFeatureAccessor()%>);
-    <%} else if (!genFeature.isVolatile()) {%>
-      <%if (genFeature.isListType()) {%>
-        <%if (genModel.isVirtualDelegation()) {%>
-		<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%}%>
-		return <%=genFeature.getSafeName()%> != null && ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList")%>.Unsettable)<%=genFeature.getSafeName()%>).isSet();
-      <%} else {%>
-        <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		return eVirtualIsSet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-        <%} else if (genClass.isESetFlag(genFeature)) {%>
-		return (<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0;
-        <%} else {%>
-		return <%=genFeature.getUncapName()%>ESet;
-        <%}%>
-      <%}%>
-    <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
-      <%if (delegateFeature.isWrappedFeatureMapType()) {%>
-		return !((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap()).isEmpty(<%=genFeature.getQualifiedFeatureAccessor()%>);
-      <%} else {%>
-		return !((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)get<%=delegateFeature.getAccessorName()%>()).isEmpty(<%=genFeature.getQualifiedFeatureAccessor()%>);
-      <%}%>
-    <%} else {%>
-<%@ include file="Class/isSetGenFeature.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method to return whether the '<%=genFeature.getFormattedName()%>' <%=genFeature.getFeatureKind()%> is set
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/isSetGenFeature.todo.override.javajetinc%>
-    <%}%>
-	}
-
-<%}%>
-<%@ end %><%//Class/isSetGenFeature.override.javajetinc%>
-  <%}%>
-<%@ include file="Class/genFeature.insert.javajetinc" fail="silent" %>
-<%@ end %><%//Class/genFeature.override.javajetinc%>
-<%}//for%>
-<%}}.run();%>
-<%for (Iterator i= (isImplementation ? genClass.getImplementedGenOperations() : genClass.getDeclaredGenOperations()).iterator(); i.hasNext();) { GenOperation genOperation = (GenOperation)i.next();%>
-<%@ include file="Class/genOperation.override.javajetinc" fail="alternative" %>
-<%@ start %>
-<%if (isInterface) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-  <%if (genOperation.hasDocumentation()) {%>
-	 * <!-- begin-model-doc -->
-	 * <%=genOperation.getDocumentation(genModel.getIndentation(stringBuffer))%>
-	 * <!-- end-model-doc -->
-  <%}%>
-  <%if (!genModel.isSuppressEMFModelTags()) { boolean first = true; for (StringTokenizer stringTokenizer = new StringTokenizer(genOperation.getModelInfo(), "\n\r"); stringTokenizer.hasMoreTokens(); ) { String modelInfo = stringTokenizer.nextToken(); if (first) { first = false;%>
-	 * @model <%=modelInfo%>
-  <%} else {%>
-	 *        <%=modelInfo%>
-  <%}} if (first) {%>
-	 * @model
-  <%}}%>
-	 * @generated
-	 */
-<%} else {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-<%}%>
-<%if (!isImplementation) {%>
-	<%=genOperation.getImportedType()%> <%=genOperation.getName()%>(<%=genOperation.getParameters()%>)<%=genOperation.getThrows()%>;
-
-<%} else {%>
-	public <%=genOperation.getImportedType()%> <%=genOperation.getName()%>(<%=genOperation.getParameters()%>)<%=genOperation.getThrows()%>
-	{
-  <%if (genOperation.hasBody()) {%>
-		<%=genOperation.getBody(genModel.getIndentation(stringBuffer))%>
-  <%} else if (genOperation.isInvariant()) {GenClass opClass = genOperation.getGenClass(); String diagnostics = ((GenParameter)genOperation.getGenParameters().get(0)).getName(); String context = ((GenParameter)genOperation.getGenParameters().get(1)).getName();%>
-		// TODO: implement this method
-		// -> specify the condition that violates the invariant
-		// -> verify the details of the diagnostic, including severity and message
-		// Ensure that you remove @generated or mark it @generated NOT
-		if (false)
-		{
-			if (<%=diagnostics%> != null)
-			{
-				<%=diagnostics%>.add
-					(new <%=genModel.getImportedName("org.eclipse.emf.common.util.BasicDiagnostic")%>
-						(<%=genModel.getImportedName("org.eclipse.emf.common.util.Diagnostic")%>.ERROR,
-						 <%=opClass.getGenPackage().getImportedValidatorClassName()%>.DIAGNOSTIC_SOURCE,
-						 <%=opClass.getGenPackage().getImportedValidatorClassName()%>.<%=opClass.getOperationID(genOperation)%>,
-						 <%=genModel.getImportedName("org.eclipse.emf.ecore.plugin.EcorePlugin")%>.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "<%=genOperation.getName()%>", <%=genModel.getImportedName("org.eclipse.emf.ecore.util.EObjectValidator")%>.getObjectLabel(this, <%=context%>) }),<%=genModel.getNonNLS()%><%=genModel.getNonNLS(2)%>
-						 new Object [] { this }));
-			}
-			return false;
-		}
-		return true;
-  <%} else {%>
-<%@ include file="Class/implementedGenOperation.TODO.override.javajetinc" fail="alternative" %>
-<%@ start %>
-		// TODO: implement this method
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-<%@ end %><%//Class/implementedGenOperation.todo.override.javajetinc%>
-  <%}%>
-	}
-
-<%}%>
-<%@ include file="Class/genOperation.insert.javajetinc" fail="silent" %>
-<%@ end %><%//Class/implementedGenOperation.override.javajetinc%>
-<%}//for%>
-<%if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEInverseAddGenFeatures())) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> eInverseAdd(<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> otherEnd, int featureID, <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs)
-	{
-		switch (featureID)
-		{
-<%for (Iterator i=genClass.getEInverseAddGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%if (!genModel.isMinimalReflectiveMethods() || genClass.getImplementedGenFeatures().contains(genFeature)) {%>
-			case <%=genClass.getQualifiedFeatureID(genFeature)%>:
-    <%if (genFeature.isListType()) {%>
-      <%if (genFeature.isMapType() && genFeature.isEffectiveSuppressEMFTypes()) {%>
-				return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList")%>)((<%=genModel.getImportedName("org.eclipse.emf.common.util.EMap")%>.InternalMapView)<%=genFeature.getGetAccessor()%>()).eMap()).basicAdd(otherEnd, msgs);
-      <%} else {%>
-				return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList")%>)<%=genFeature.getGetAccessor()%>()).basicAdd(otherEnd, msgs);
-      <%}%>
-    <%} else if (genFeature.isContainer()) {%>
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-      <%if (genFeature.isBasicSet()) {%>
-				return basicSet<%=genFeature.getAccessorName()%>((<%=genFeature.getImportedType()%>)otherEnd, msgs);
-      <%} else {%>
-				return eBasicSetContainer(otherEnd, <%=genClass.getQualifiedFeatureID(genFeature)%>, msgs);
-      <%}%>
-    <%} else {%>
-      <%if (genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {%>
-				<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-      <%}%>
-				if (<%=genFeature.getSafeName()%> != null)
-      <%if (genFeature.isEffectiveContains()) {%>
-					msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%>, null, msgs);
-      <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
-					msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, msgs);
-      <%}%>
-				return basicSet<%=genFeature.getAccessorName()%>((<%=genFeature.getImportedType()%>)otherEnd, msgs);
-    <%}%>
-  <%}%>
-<%}%>
-		}
-<%if (genModel.isMinimalReflectiveMethods()) {%>
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-<%} else {%>
-		return eDynamicInverseAdd(otherEnd, featureID, msgs);
-<%}%>
-	}
-
-<%}%>
-<%if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEInverseRemoveGenFeatures())) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> eInverseRemove(<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> otherEnd, int featureID, <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs)
-	{
-		switch (featureID)
-		{
-<%for (Iterator i=genClass.getEInverseRemoveGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%if (!genModel.isMinimalReflectiveMethods() || genClass.getImplementedGenFeatures().contains(genFeature)) {%>
-			case <%=genClass.getQualifiedFeatureID(genFeature)%>:
-    <%if (genFeature.isListType()) {%>
-      <%if (genFeature.isMapType() && genFeature.isEffectiveSuppressEMFTypes()) {%>
-				return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList")%>)((<%=genModel.getImportedName("org.eclipse.emf.common.util.EMap")%>.InternalMapView)<%=genFeature.getGetAccessor()%>()).eMap()).basicRemove(otherEnd, msgs);
-      <%} else if (genFeature.isWrappedFeatureMapType()) {%>
-				return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList")%>)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)<%=genFeature.getGetAccessor()%>()).featureMap()).basicRemove(otherEnd, msgs);
-      <%} else {%>
-				return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList")%>)<%=genFeature.getGetAccessor()%>()).basicRemove(otherEnd, msgs);
-      <%}%>
-    <%} else if (genFeature.isContainer() && !genFeature.isBasicSet()) {%>
-				return eBasicSetContainer(null, <%=genClass.getQualifiedFeatureID(genFeature)%>, msgs);
-    <%} else if (genFeature.isUnsettable()) {%>
-				return basicUnset<%=genFeature.getAccessorName()%>(msgs);
-    <%} else {%>
-				return basicSet<%=genFeature.getAccessorName()%>(null, msgs);
-    <%}%>
-  <%}%>
-<%}%>
-		}
-<%if (genModel.isMinimalReflectiveMethods()) {%>
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-<%} else {%>
-		return eDynamicInverseRemove(otherEnd, featureID, msgs);
-<%}%>
-	}
-
-<%}%>
-<%if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEBasicRemoveFromContainerGenFeatures())) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> eBasicRemoveFromContainerFeature(<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs)
-	{
-		switch (eContainerFeatureID)
-		{
-<%for (Iterator i=genClass.getEBasicRemoveFromContainerGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
-  <%if (!genModel.isMinimalReflectiveMethods() || genClass.getImplementedGenFeatures().contains(genFeature)) {%>
-			case <%=genClass.getQualifiedFeatureID(genFeature)%>:
-				return eInternalContainer().eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, msgs);
-  <%}%>
-<%}%>
-		}
-<%if (genModel.isMinimalReflectiveMethods()) {%>
-		return super.eBasicRemoveFromContainerFeature(msgs);
-<%} else {%>
-		return eDynamicBasicRemoveFromContainer(msgs);
-<%}%>
-	}
-
-<%}%>
-<%if (isImplementation && !genModel.isReflectiveDelegation() && !genClass.getImplementedGenFeatures().isEmpty()) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-<%for (Iterator i=genClass.getAllGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%if (!genModel.isMinimalReflectiveMethods() || genClass.getImplementedGenFeatures().contains(genFeature)) {%>
-			case <%=genClass.getQualifiedFeatureID(genFeature)%>:
-    <%if (genFeature.isPrimitiveType()) {%>
-      <%if (genFeature.isBooleanType()) {%>
-				return <%=genFeature.getGetAccessor()%>() ? Boolean.TRUE : Boolean.FALSE;
-      <%} else {%>
-				return new <%=genFeature.getObjectType()%>(<%=genFeature.getGetAccessor()%>());
-      <%}%>
-    <%} else if (genFeature.isResolveProxies() && !genFeature.isListType()) {%>
-				if (resolve) return <%=genFeature.getGetAccessor()%>();
-				return basicGet<%=genFeature.getAccessorName()%>();
-    <%} else if (genFeature.isMapType()) {%>
-      <%if (genFeature.isEffectiveSuppressEMFTypes()) {%>
-				if (coreType) return ((<%=genModel.getImportedName("org.eclipse.emf.common.util.EMap")%>.InternalMapView)<%=genFeature.getGetAccessor()%>()).eMap();
-				else return <%=genFeature.getGetAccessor()%>();
-      <%} else {%>
-				if (coreType) return <%=genFeature.getGetAccessor()%>();
-				else return <%=genFeature.getGetAccessor()%>().map();
-      <%}%>
-    <%} else if (genFeature.isWrappedFeatureMapType()) {%>
-				if (coreType) return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)<%=genFeature.getGetAccessor()%>()).featureMap();
-				return <%=genFeature.getGetAccessor()%>();
-    <%} else if (genFeature.isFeatureMapType()) {%>
-				if (coreType) return <%=genFeature.getGetAccessor()%>();
-				return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)<%=genFeature.getGetAccessor()%>()).getWrapper();
-    <%} else {%>
-				return <%=genFeature.getGetAccessor()%>();
-    <%}%>
-  <%}%>
-<%}%>
-		}
-<%if (genModel.isMinimalReflectiveMethods()) {%>
-		return super.eGet(featureID, resolve, coreType);
-<%} else {%>
-		return eDynamicGet(featureID, resolve, coreType);
-<%}%>
-	}
-
-<%}%>
-<%if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getESetGenFeatures())) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-<%for (Iterator i=genClass.getESetGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%if (!genModel.isMinimalReflectiveMethods() || genClass.getImplementedGenFeatures().contains(genFeature)) {%>
-			case <%=genClass.getQualifiedFeatureID(genFeature)%>:
-    <%if (genFeature.isListType()) {%>
-      <%if (genFeature.isWrappedFeatureMapType()) {%>
-				((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)<%=genFeature.getGetAccessor()%>()).featureMap()).set(newValue);
-      <%} else if (genFeature.isFeatureMapType()) {%>
-				((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)<%=genFeature.getGetAccessor()%>()).set(newValue);
-      <%} else if (genFeature.isMapType()) {%>
-        <%if (genFeature.isEffectiveSuppressEMFTypes()) {%>
-				((<%=genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature")%>.Setting)((<%=genModel.getImportedName("org.eclipse.emf.common.util.EMap")%>.InternalMapView)<%=genFeature.getGetAccessor()%>()).eMap()).set(newValue);
-        <%} else {%>
-				((<%=genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature")%>.Setting)<%=genFeature.getGetAccessor()%>()).set(newValue);
-        <%}%>
-      <%} else {%>
-				<%=genFeature.getGetAccessor()%>().clear();
-				<%=genFeature.getGetAccessor()%>().addAll((<%=genModel.getImportedName("java.util.Collection")%>)newValue);
-      <%}%>
-    <%} else if (genFeature.isPrimitiveType()) {%>
-				set<%=genFeature.getAccessorName()%>(((<%=genFeature.getObjectType()%>)newValue).<%=genFeature.getPrimitiveValueFunction()%>());
-    <%} else {%>
-				set<%=genFeature.getAccessorName()%>((<%=genFeature.getImportedType()%>)newValue);
-    <%}%>
-				return;
-  <%}%>
-<%}%>
-		}
-<%if (genModel.isMinimalReflectiveMethods()) {%>
-		super.eSet(featureID, newValue);
-<%} else {%>
-		eDynamicSet(featureID, newValue);
-<%}%>
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-<%for (Iterator i=genClass.getESetGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%if (!genModel.isMinimalReflectiveMethods() || genClass.getImplementedGenFeatures().contains(genFeature)) {%>
-			case <%=genClass.getQualifiedFeatureID(genFeature)%>:
-    <%if (genFeature.isListType() && !genFeature.isUnsettable()) {%>
-      <%if (genFeature.isWrappedFeatureMapType()) {%>
-				((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)<%=genFeature.getGetAccessor()%>()).featureMap().clear();
-      <%} else {%>
-				<%=genFeature.getGetAccessor()%>().clear();
-      <%}%>
-    <%} else if (genFeature.isUnsettable()) {%>
-				unset<%=genFeature.getAccessorName()%>();
-    <%} else if (genFeature.isReferenceType()) {%>
-				set<%=genFeature.getAccessorName()%>((<%=genFeature.getImportedType()%>)null);
-    <%} else {%>
-				set<%=genFeature.getAccessorName()%>(<%=genFeature.getUpperName()%>_EDEFAULT);
-    <%}%>
-				return;
-  <%}%>
-<%}%>
-		}
-<%if (genModel.isMinimalReflectiveMethods()) {%>
-		super.eUnset(featureID);
-<%} else {%>
-		eDynamicUnset(featureID);
-<%}%>
-	}
-
-<%}%>
-<%if (isImplementation && !genModel.isReflectiveDelegation() && !genClass.getImplementedGenFeatures().isEmpty()) {%>
-<%@ include file="Class/eIsSet.override.javajetinc" fail="alternative" %>
-<%@ start %>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-<%for (Iterator i=genClass.getAllGenFeatures().iterator(); i.hasNext();) { GenFeature genFeature = (GenFeature)i.next();%>
-  <%if (!genModel.isMinimalReflectiveMethods() || genClass.getImplementedGenFeatures().contains(genFeature)) {%>
-			case <%=genClass.getQualifiedFeatureID(genFeature)%>:
-    <%if (genFeature.isListType() && !genFeature.isUnsettable()) {%>
-      <%if (genFeature.isWrappedFeatureMapType()) {%>
-        <%if (genFeature.isVolatile()) {%>
-				return !((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)<%=genFeature.getGetAccessor()%>()).featureMap().isEmpty();
-        <%} else {%>
-				return <%=genFeature.getSafeName()%> != null && !<%=genFeature.getSafeName()%>.featureMap().isEmpty();
-        <%}%>
-      <%} else {%>
-        <%if (genClass.isField(genFeature)) {%>
-				return <%=genFeature.getSafeName()%> != null && !<%=genFeature.getSafeName()%>.isEmpty();
-        <%} else {%>
-          <%if (genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {%>
-				<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>);
-				return <%=genFeature.getSafeName()%> != null && !<%=genFeature.getSafeName()%>.isEmpty();
-          <%} else {%>
-				return !<%=genFeature.getGetAccessor()%>().isEmpty();
-          <%}%>
-        <%}%>
-      <%}%>
-    <%} else if (genFeature.isUnsettable()) {%>
-				return isSet<%=genFeature.getAccessorName()%>();
-    <%} else if (genFeature.isResolveProxies()) {%>
-      <%if (genClass.isField(genFeature)) {%>
-				return <%=genFeature.getSafeName()%> != null;
-      <%} else {%>
-        <%if (genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {%>
-				return eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>) != null;
-        <%} else {%>
-				return basicGet<%=genFeature.getAccessorName()%>() != null;
-        <%}%>
-      <%}%>
-    <%} else if (genFeature.isReferenceType()) {%>
-      <%if (genClass.isField(genFeature)) {%>
-				return <%=genFeature.getSafeName()%> != null;
-      <%} else {%>
-        <%if (genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {%>
-				return eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>) != null;
-        <%} else {%>
-				return <%=genFeature.getGetAccessor()%>() != null;
-        <%}%>
-      <%}%>
-    <%} else if (genFeature.isPrimitiveType() || genFeature.isEnumType()) {%>
-      <%if (genClass.isField(genFeature)) {%>
-        <%if (genClass.isFlag(genFeature)) {%>
-				return ((<%=genClass.getFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_EFLAG) != 0) != <%=genFeature.getUpperName()%>_EDEFAULT;
-        <%} else {%>
-				return <%=genFeature.getSafeName()%> != <%=genFeature.getUpperName()%>_EDEFAULT;
-        <%}%>
-      <%} else {%>
-        <%if (genFeature.isEnumType() && genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {%>
-				return eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>, <%=genFeature.getUpperName()%>_EDEFAULT) != <%=genFeature.getUpperName()%>_EDEFAULT;
-        <%} else {%>
-				return <%=genFeature.getGetAccessor()%>() != <%=genFeature.getUpperName()%>_EDEFAULT;
-        <%}%>
-      <%}%>
-    <%} else {//datatype%>
-      <%if (genClass.isField(genFeature)) {%>
-				return <%=genFeature.getUpperName()%>_EDEFAULT == null ? <%=genFeature.getSafeName()%> != null : !<%=genFeature.getUpperName()%>_EDEFAULT.equals(<%=genFeature.getSafeName()%>);
-      <%} else {%>
-        <%if (genFeature.isField() && genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) {%>
-				<%=genFeature.getImportedType()%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType()%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>, <%=genFeature.getUpperName()%>_EDEFAULT);
-				return <%=genFeature.getUpperName()%>_EDEFAULT == null ? <%=genFeature.getSafeName()%> != null : !<%=genFeature.getUpperName()%>_EDEFAULT.equals(<%=genFeature.getSafeName()%>);
-        <%} else {%>
-				return <%=genFeature.getUpperName()%>_EDEFAULT == null ? <%=genFeature.getGetAccessor()%>() != null : !<%=genFeature.getUpperName()%>_EDEFAULT.equals(<%=genFeature.getGetAccessor()%>());
-        <%}%>
-      <%}%>
-    <%}%>
-  <%}%>
-<%}%>
-		}
-<%if (genModel.isMinimalReflectiveMethods()) {%>
-		return super.eIsSet(featureID);
-<%} else {%>
-		return eDynamicIsSet(featureID);
-<%}%>
-	}
-
-<%@ end %><%//Class/eIsSet.override.javajetinc%>
-<%}%>
-<%if (isImplementation && !genClass.getMixinGenFeatures().isEmpty()) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass)
-	{
-  <%for (Iterator m=genClass.getMixinGenClasses().iterator(); m.hasNext();) { GenClass mixinGenClass = (GenClass)m.next(); %>
-		if (baseClass == <%=mixinGenClass.getImportedInterfaceName()%>.class)
-		{
-			switch (derivedFeatureID)
-			{
-    <%for (Iterator f=mixinGenClass.getGenFeatures().iterator(); f.hasNext();) { GenFeature genFeature = (GenFeature)f.next(); %>
-				case <%=genClass.getQualifiedFeatureID(genFeature)%>: return <%=mixinGenClass.getQualifiedFeatureID(genFeature)%>;
-    <%}%>
-				default: return -1;
-			}
-		}
-  <%}%>
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass)
-	{
-  <%for (Iterator m=genClass.getMixinGenClasses().iterator(); m.hasNext();) { GenClass mixinGenClass = (GenClass)m.next(); %>
-		if (baseClass == <%=mixinGenClass.getImportedInterfaceName()%>.class)
-		{
-			switch (baseFeatureID)
-			{
-    <%for (Iterator f=mixinGenClass.getGenFeatures().iterator(); f.hasNext();) { GenFeature genFeature = (GenFeature)f.next(); %>
-				case <%=mixinGenClass.getQualifiedFeatureID(genFeature)%>: return <%=genClass.getQualifiedFeatureID(genFeature)%>;
-    <%}%>
-				default: return -1;
-			}
-		}
-  <%}%>
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-<%}%>
-<%if (isImplementation && genModel.isVirtualDelegation()) { String eVirtualValuesField = genClass.getEVirtualValuesField();%>
-  <%if (eVirtualValuesField != null) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Object[] eVirtualValues()
-	{
-		return <%=eVirtualValuesField%>;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void eSetVirtualValues(Object[] newValues)
-	{
-		<%=eVirtualValuesField%> = newValues;
-	}
-
-  <%}%>
-  <%{ List eVirtualIndexBitFields = genClass.getEVirtualIndexBitFields(new ArrayList());%>
-    <%if (!eVirtualIndexBitFields.isEmpty()) { List allEVirtualIndexBitFields = genClass.getAllEVirtualIndexBitFields(new ArrayList());%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected int eVirtualIndexBits(int offset)
-	{
-		switch (offset)
-		{
-      <%for (int i = 0; i < allEVirtualIndexBitFields.size(); i++) {%>
-			case <%=i%> :
-				return <%=allEVirtualIndexBitFields.get(i)%>;
-      <%}%>
-			default :
-				throw new IndexOutOfBoundsException();
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void eSetVirtualIndexBits(int offset, int newIndexBits)
-	{
-		switch (offset)
-		{
-      <%for (int i = 0; i < allEVirtualIndexBitFields.size(); i++) {%>
-			case <%=i%> :
-				<%=allEVirtualIndexBitFields.get(i)%> = newIndexBits;
-				break;
-      <%}%>
-			default :
-				throw new IndexOutOfBoundsException();
-		}
-	}
-
-    <%}%>
-  <%}%>
-<%}%>
-<%if (isImplementation && !genModel.isReflectiveDelegation() && !genClass.getToStringGenFeatures().isEmpty()) {%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-  <%{ boolean first = true;%>
-    <%for (Iterator i=genClass.getToStringGenFeatures().iterator(); i.hasNext(); ) { GenFeature genFeature = (GenFeature)i.next();%>
-      <%if (first) { first = false;%>
-		result.append(" (<%=genFeature.getName()%>: ");<%=genModel.getNonNLS()%>
-      <%} else {%>
-		result.append(", <%=genFeature.getName()%>: ");<%=genModel.getNonNLS()%>
-      <%}%>
-      <%if (genFeature.isUnsettable() && !genFeature.isListType()) {%>
-        <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		if (eVirtualIsSet(<%=genClass.getQualifiedFeatureID(genFeature)%>)) result.append(eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%>)); else result.append("<unset>");<%=genModel.getNonNLS()%>
-        <%} else {%>
-          <%if (genClass.isFlag(genFeature)) {%>
-		if (<%if (genClass.isESetFlag(genFeature)) {%>(<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0<%} else {%><%=genFeature.getUncapName()%>ESet<%}%>) result.append((<%=genClass.getFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_EFLAG) != 0); else result.append("<unset>");<%=genModel.getNonNLS()%>
-          <%} else {%>
-		if (<%if (genClass.isESetFlag(genFeature)) {%>(<%=genClass.getESetFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_ESETFLAG) != 0<%} else {%><%=genFeature.getUncapName()%>ESet<%}%>) result.append(<%=genFeature.getSafeName()%>); else result.append("<unset>");<%=genModel.getNonNLS()%>
-          <%}%>
-        <%}%>
-      <%} else {%>
-        <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>
-		result.append(eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%><%if (!genFeature.isListType() && !genFeature.isReferenceType()){%>, <%=genFeature.getUpperName()%>_EDEFAULT<%}%>));
-        <%} else {%>
-          <%if (genClass.isFlag(genFeature)) {%>
-		result.append((<%=genClass.getFlagsField(genFeature)%> & <%=genFeature.getUpperName()%>_EFLAG) != 0);
-          <%} else {%>
-		result.append(<%=genFeature.getSafeName()%>);
-          <%}%>
-        <%}%>
-      <%}%>
-    <%}%>
-  <%}%>
-		result.append(')');
-		return result.toString();
-	}
-
-<%}%>
-<%if (isImplementation && genClass.isMapEntry()) { GenFeature keyFeature = genClass.getMapEntryKeyFeature(); GenFeature valueFeature = genClass.getMapEntryValueFeature();%>
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected int hash = -1;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getHash()
-	{
-		if (hash == -1)
-		{
-			Object theKey = getKey();
-			hash = (theKey == null ? 0 : theKey.hashCode());
-		}
-		return hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHash(int hash)
-	{
-		this.hash = hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getKey()
-	{
-  <%if (keyFeature.isPrimitiveType()) {%>
-		return new <%=keyFeature.getObjectType()%>(getTypedKey());
-  <%} else {%>
-		return getTypedKey();
-  <%}%>
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKey(Object key)
-	{
-  <%if (keyFeature.isListType()) {%>
-		getTypedKey().addAll((<%=genModel.getImportedName("java.util.Collection")%>)key);
-  <%} else if (keyFeature.isPrimitiveType()) {%>
-		setTypedKey(((<%=keyFeature.getObjectType()%>)key).<%=keyFeature.getPrimitiveValueFunction()%>());
-  <%} else {%>
-		setTypedKey((<%=keyFeature.getImportedType()%>)key);
-  <%}%>
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getValue()
-	{
-  <%if (valueFeature.isPrimitiveType()) {%>
-		return new <%=valueFeature.getObjectType()%>(getTypedValue());
-  <%} else {%>
-		return getTypedValue();
-  <%}%>
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object setValue(Object value)
-	{
-		Object oldValue = getValue();
-  <%if (valueFeature.isListType()) {%>
-		getTypedValue().clear();
-		getTypedValue().addAll((<%=genModel.getImportedName("java.util.Collection")%>)value);
-  <%} else if (valueFeature.isPrimitiveType()) {%>
-		setTypedValue(((<%=valueFeature.getObjectType()%>)value).<%=valueFeature.getPrimitiveValueFunction()%>());
-  <%} else {%>
-		setTypedValue((<%=valueFeature.getImportedType()%>)value);
-  <%}%>
-		return oldValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public <%=genModel.getImportedName("org.eclipse.emf.common.util.EMap")%> getEMap()
-	{
-		<%=genModel.getImportedName("org.eclipse.emf.ecore.EObject")%> container = eContainer();
-		return container == null ? null : (<%=genModel.getImportedName("org.eclipse.emf.common.util.EMap")%>)container.eGet(eContainmentFeature());
-	}
-
-<%}%>
-<%@ include file="Class/insert.javajetinc" fail="silent" %>
-} //<%=isInterface ? " " + genClass.getInterfaceName() : genClass.getClassName()%>
-<%// TODO fix the space above%>
-<%genModel.emitSortedImports();%>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma.edit/.classpath b/plugins/org.eclipse.epf.uma.edit/.classpath
deleted file mode 100755
index 065ac06..0000000
--- a/plugins/org.eclipse.epf.uma.edit/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.uma.edit/.cvsignore b/plugins/org.eclipse.epf.uma.edit/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.uma.edit/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.uma.edit/.project b/plugins/org.eclipse.epf.uma.edit/.project
deleted file mode 100755
index 5259efc..0000000
--- a/plugins/org.eclipse.epf.uma.edit/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.uma.edit</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/plugins/org.eclipse.epf.uma.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.uma.edit/META-INF/MANIFEST.MF
deleted file mode 100755
index 69b637a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.uma.edit;singleton:=true
-Bundle-ClassPath: umaedit.jar
-Bundle-Version: 1.2.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.epf.uma;visibility:=reexport
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.uma.edit.command,
- org.eclipse.epf.uma.edit.domain,
- org.eclipse.epf.uma.provider
-Bundle-Activator: org.eclipse.epf.uma.provider.UmaEditPlugin$Implementation
diff --git a/plugins/org.eclipse.epf.uma.edit/build.properties b/plugins/org.eclipse.epf.uma.edit/build.properties
deleted file mode 100755
index 8282e0a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.umaedit.jar = src/
-output.umaedit.jar = bin/
-bin.includes = umaedit.jar,\
-               META-INF/,\
-               plugin.xml,\
-               icons/,\
-               plugin.properties
-
-
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateArtifact_containedArtifacts_Artifact.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateArtifact_containedArtifacts_Artifact.gif
deleted file mode 100755
index 501d219..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateArtifact_containedArtifacts_Artifact.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateBreakdownElement_planningData_PlanningData.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateBreakdownElement_planningData_PlanningData.gif
deleted file mode 100755
index 9029e24..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateBreakdownElement_planningData_PlanningData.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentDescription_sections_Section.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentDescription_sections_Section.gif
deleted file mode 100755
index 5206c2e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentDescription_sections_Section.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentDescription_sections_Step.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentDescription_sections_Step.gif
deleted file mode 100755
index 278cd8a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentDescription_sections_Step.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_ActivityDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_ActivityDescription.gif
deleted file mode 100755
index cf20deb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_ActivityDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_ArtifactDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_ArtifactDescription.gif
deleted file mode 100755
index 501d219..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_ArtifactDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_ContentDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_ContentDescription.gif
deleted file mode 100755
index a06b0ff..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_ContentDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_DeliverableDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_DeliverableDescription.gif
deleted file mode 100755
index ca10563..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_DeliverableDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_DeliveryProcessDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_DeliveryProcessDescription.gif
deleted file mode 100755
index 7b40362..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_DeliveryProcessDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_GuidanceDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_GuidanceDescription.gif
deleted file mode 100755
index 66f44f5..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_GuidanceDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_PracticeDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_PracticeDescription.gif
deleted file mode 100755
index 67209cb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_PracticeDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_RoleDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_RoleDescription.gif
deleted file mode 100755
index 76e8896..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_RoleDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_TaskDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_TaskDescription.gif
deleted file mode 100755
index 5c3b2b8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_TaskDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_WorkProductDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_WorkProductDescription.gif
deleted file mode 100755
index 1540f3d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentElement_presentation_WorkProductDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_Discipline.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_Discipline.gif
deleted file mode 100755
index 35bd476..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_Discipline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_DisciplineCategory.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_DisciplineCategory.gif
deleted file mode 100755
index 5553c1d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_DisciplineCategory.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_DisciplineGrouping.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_DisciplineGrouping.gif
deleted file mode 100755
index 5553c1d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_DisciplineGrouping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_Domain.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_Domain.gif
deleted file mode 100755
index cf28926..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_Domain.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_RoleSet.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_RoleSet.gif
deleted file mode 100755
index 5099fea..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_RoleSet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_RoleSetCategory.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_RoleSetCategory.gif
deleted file mode 100755
index 54a3f67..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_RoleSetCategory.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_RoleSetGrouping.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_RoleSetGrouping.gif
deleted file mode 100755
index 54a3f67..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_RoleSetGrouping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_Tool.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_Tool.gif
deleted file mode 100755
index 4f1b85a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_Tool.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_UserDefinedCategory.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_UserDefinedCategory.gif
deleted file mode 100755
index d39e9f1..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_UserDefinedCategory.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_WorkProductType.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_WorkProductType.gif
deleted file mode 100755
index a7ecac0..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentCategories_WorkProductType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Activity.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Activity.gif
deleted file mode 100755
index cf20deb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Activity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Artifact.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Artifact.gif
deleted file mode 100755
index 501d219..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Artifact.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Attachment.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Attachment.gif
deleted file mode 100755
index e75685c..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Attachment.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_CapabilityPattern.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_CapabilityPattern.gif
deleted file mode 100755
index 15ffbb0..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_CapabilityPattern.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Checklist.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Checklist.gif
deleted file mode 100755
index 0a65f23..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Checklist.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Concept.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Concept.gif
deleted file mode 100755
index 1df84da..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Concept.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_CustomCategory.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_CustomCategory.gif
deleted file mode 100755
index df47980..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_CustomCategory.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Deliverable.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Deliverable.gif
deleted file mode 100755
index ca10563..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Deliverable.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_DeliveryProcess.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_DeliveryProcess.gif
deleted file mode 100755
index 7b40362..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_DeliveryProcess.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Discipline.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Discipline.gif
deleted file mode 100755
index 35bd476..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Discipline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_DisciplineGrouping.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_DisciplineGrouping.gif
deleted file mode 100755
index 5553c1d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_DisciplineGrouping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Domain.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Domain.gif
deleted file mode 100755
index cf28926..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Domain.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Estimate.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Estimate.gif
deleted file mode 100755
index c2554c2..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Estimate.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_EstimatingConsiderations.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_EstimatingConsiderations.gif
deleted file mode 100755
index 8ab34c6..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_EstimatingConsiderations.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_EstimatingMetric.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_EstimatingMetric.gif
deleted file mode 100755
index 731f83d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_EstimatingMetric.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_EstimatingModel.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_EstimatingModel.gif
deleted file mode 100755
index 758dafb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_EstimatingModel.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_EstimationConsiderations.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_EstimationConsiderations.gif
deleted file mode 100755
index 4fc84e4..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_EstimationConsiderations.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Example.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Example.gif
deleted file mode 100755
index 1b944fd..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Example.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Guideline.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Guideline.gif
deleted file mode 100755
index 66f44f5..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Guideline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Iteration.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Iteration.gif
deleted file mode 100755
index 4311e46..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Iteration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Outcome.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Outcome.gif
deleted file mode 100755
index e703518..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Outcome.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Phase.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Phase.gif
deleted file mode 100755
index ad60bd9..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Phase.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Practice.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Practice.gif
deleted file mode 100755
index 67209cb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Practice.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_ProcessContribution.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_ProcessContribution.gif
deleted file mode 100755
index 2b095d8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_ProcessContribution.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_ProcessPlanningTemplate.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_ProcessPlanningTemplate.gif
deleted file mode 100755
index c763251..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_ProcessPlanningTemplate.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Report.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Report.gif
deleted file mode 100755
index 95f3e0c..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Report.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_ReusableAsset.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_ReusableAsset.gif
deleted file mode 100755
index b52cffe..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_ReusableAsset.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Roadmap.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Roadmap.gif
deleted file mode 100755
index f11bc5d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Roadmap.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Role.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Role.gif
deleted file mode 100755
index 76e8896..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Role.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_RoleSet.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_RoleSet.gif
deleted file mode 100755
index 5099fea..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_RoleSet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_RoleSetGrouping.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_RoleSetGrouping.gif
deleted file mode 100755
index 54a3f67..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_RoleSetGrouping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Step.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Step.gif
deleted file mode 100755
index 4e47629..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Step.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_SupportingMaterial.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_SupportingMaterial.gif
deleted file mode 100755
index 05a21ec..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_SupportingMaterial.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Task.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Task.gif
deleted file mode 100755
index 5c3b2b8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Task.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Technique.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Technique.gif
deleted file mode 100755
index 1edc5b9..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Technique.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Template.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Template.gif
deleted file mode 100755
index c763251..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Template.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_TermDefinition.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_TermDefinition.gif
deleted file mode 100755
index e21bfe0..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_TermDefinition.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Tool.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Tool.gif
deleted file mode 100755
index 4f1b85a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Tool.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_ToolMentor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_ToolMentor.gif
deleted file mode 100755
index 4f1b85a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_ToolMentor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_TrainingClass.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_TrainingClass.gif
deleted file mode 100755
index 0132953..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_TrainingClass.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_TrainingModule.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_TrainingModule.gif
deleted file mode 100755
index f4f7152..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_TrainingModule.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_UserDefinedCategory.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_UserDefinedCategory.gif
deleted file mode 100755
index df47980..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_UserDefinedCategory.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Whitepaper.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Whitepaper.gif
deleted file mode 100755
index e5b4800..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_Whitepaper.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_WorkProductGuideline.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_WorkProductGuideline.gif
deleted file mode 100755
index 66f44f5..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_WorkProductGuideline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_WorkProductType.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_WorkProductType.gif
deleted file mode 100755
index a7ecac0..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateContentPackage_contentElements_WorkProductType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateCustomCategory_subCategories_CustomCategory.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateCustomCategory_subCategories_CustomCategory.gif
deleted file mode 100755
index df47980..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateCustomCategory_subCategories_CustomCategory.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_ActivityDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_ActivityDescription.gif
deleted file mode 100755
index cf20deb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_ActivityDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_ArtifactDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_ArtifactDescription.gif
deleted file mode 100755
index 501d219..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_ArtifactDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_BreakdownElementDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_BreakdownElementDescription.gif
deleted file mode 100755
index 8d18ec2..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_BreakdownElementDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_ContentDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_ContentDescription.gif
deleted file mode 100755
index a06b0ff..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_ContentDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_DeliverableDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_DeliverableDescription.gif
deleted file mode 100755
index ca10563..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_DeliverableDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_DeliveryProcessDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_DeliveryProcessDescription.gif
deleted file mode 100755
index 7b40362..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_DeliveryProcessDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_DescriptorDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_DescriptorDescription.gif
deleted file mode 100755
index 89ed2c9..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_DescriptorDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_GuidanceDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_GuidanceDescription.gif
deleted file mode 100755
index 66f44f5..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_GuidanceDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_PracticeDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_PracticeDescription.gif
deleted file mode 100755
index 67209cb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_PracticeDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_ProcessDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_ProcessDescription.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_ProcessDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_RoleDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_RoleDescription.gif
deleted file mode 100755
index 76e8896..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_RoleDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_TaskDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_TaskDescription.gif
deleted file mode 100755
index 5c3b2b8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_TaskDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_WorkProductDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_WorkProductDescription.gif
deleted file mode 100755
index 1540f3d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDescribableElement_presentation_WorkProductDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagramElement_property_Property.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagramElement_property_Property.gif
deleted file mode 100755
index a32a7b5..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagramElement_property_Property.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagramLink_viewport_Point.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagramLink_viewport_Point.gif
deleted file mode 100755
index fe734c7..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagramLink_viewport_Point.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagram_namespace_CoreSemanticModelBridge.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagram_namespace_CoreSemanticModelBridge.gif
deleted file mode 100755
index 845e9f4..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagram_namespace_CoreSemanticModelBridge.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagram_namespace_SimpleSemanticModelElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagram_namespace_SimpleSemanticModelElement.gif
deleted file mode 100755
index d82f226..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagram_namespace_SimpleSemanticModelElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagram_namespace_UMASemanticModelBridge.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagram_namespace_UMASemanticModelBridge.gif
deleted file mode 100755
index 889f3af..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagram_namespace_UMASemanticModelBridge.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagram_viewpoint_Point.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagram_viewpoint_Point.gif
deleted file mode 100755
index 1dd58e1..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiagram_viewpoint_Point.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiscipline_subdiscipline_Discipline.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiscipline_subdiscipline_Discipline.gif
deleted file mode 100755
index e29b313..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDiscipline_subdiscipline_Discipline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDomain_subdomain_Domain.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDomain_subdomain_Domain.gif
deleted file mode 100755
index cf28926..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDomain_subdomain_Domain.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDomain_subdomains_Domain.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDomain_subdomains_Domain.gif
deleted file mode 100755
index cf28926..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateDomain_subdomains_Domain.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEllipse_center_Point.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEllipse_center_Point.gif
deleted file mode 100755
index 3a4e9ad..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEllipse_center_Point.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimate_estimationConderations_EstimatingConsiderations.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimate_estimationConderations_EstimatingConsiderations.gif
deleted file mode 100755
index e951689..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimate_estimationConderations_EstimatingConsiderations.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimate_estimationConderations_EstimationConsiderations.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimate_estimationConderations_EstimationConsiderations.gif
deleted file mode 100755
index 4fc84e4..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimate_estimationConderations_EstimationConsiderations.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimate_estimationMetric_EstimatingMetric.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimate_estimationMetric_EstimatingMetric.gif
deleted file mode 100755
index bad30bb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimate_estimationMetric_EstimatingMetric.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimate_usedEstimatingParameter_SummitEstimatingParameter.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimate_usedEstimatingParameter_SummitEstimatingParameter.gif
deleted file mode 100755
index 391d0b3..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimate_usedEstimatingParameter_SummitEstimatingParameter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimatedMethodElement_estimate_Estimate.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimatedMethodElement_estimate_Estimate.gif
deleted file mode 100755
index 6844bf8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimatedMethodElement_estimate_Estimate.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimatingModel_ownedEstimatingParameter_SummitEstimatingParameter.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimatingModel_ownedEstimatingParameter_SummitEstimatingParameter.gif
deleted file mode 100755
index ce3b99f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimatingModel_ownedEstimatingParameter_SummitEstimatingParameter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimatingParameterOwner_ownedEstimatingParameter_EstimatingParameter.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimatingParameterOwner_ownedEstimatingParameter_EstimatingParameter.gif
deleted file mode 100755
index 407220b..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateEstimatingParameterOwner_ownedEstimatingParameter_EstimatingParameter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphConnector_position_Point.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphConnector_position_Point.gif
deleted file mode 100755
index 1c7362a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphConnector_position_Point.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphEdge_waypoints_Point.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphEdge_waypoints_Point.gif
deleted file mode 100755
index 4154e57..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphEdge_waypoints_Point.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_anchorage_GraphConnector.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_anchorage_GraphConnector.gif
deleted file mode 100755
index a303761..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_anchorage_GraphConnector.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_CoreSemanticModelBridge.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_CoreSemanticModelBridge.gif
deleted file mode 100755
index 5fe40c4..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_CoreSemanticModelBridge.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Diagram.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Diagram.gif
deleted file mode 100755
index b9cd878..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Diagram.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_DiagramLink.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_DiagramLink.gif
deleted file mode 100755
index 4f7ee52..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_DiagramLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Ellipse.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Ellipse.gif
deleted file mode 100755
index de6e628..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Ellipse.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_GraphConnector.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_GraphConnector.gif
deleted file mode 100755
index a303761..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_GraphConnector.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_GraphEdge.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_GraphEdge.gif
deleted file mode 100755
index 3891882..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_GraphEdge.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_GraphNode.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_GraphNode.gif
deleted file mode 100755
index d065203..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_GraphNode.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Image.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Image.gif
deleted file mode 100755
index 84f99e6..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Image.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Polyline.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Polyline.gif
deleted file mode 100755
index 08f15c5..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Polyline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Property.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Property.gif
deleted file mode 100755
index a32a7b5..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Property.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Reference.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Reference.gif
deleted file mode 100755
index a303761..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_Reference.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_SimpleSemanticModelElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_SimpleSemanticModelElement.gif
deleted file mode 100755
index f420604..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_SimpleSemanticModelElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_TextElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_TextElement.gif
deleted file mode 100755
index d065203..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_TextElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_UMASemanticModelBridge.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_UMASemanticModelBridge.gif
deleted file mode 100755
index 0cf27b2..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_contained_UMASemanticModelBridge.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_link_DiagramLink.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_link_DiagramLink.gif
deleted file mode 100755
index 4f7ee52..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_link_DiagramLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_position_Point.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_position_Point.gif
deleted file mode 100755
index 92d407e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_position_Point.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_semanticModel_CoreSemanticModelBridge.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_semanticModel_CoreSemanticModelBridge.gif
deleted file mode 100755
index 5fe40c4..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_semanticModel_CoreSemanticModelBridge.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_semanticModel_SimpleSemanticModelElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_semanticModel_SimpleSemanticModelElement.gif
deleted file mode 100755
index f420604..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_semanticModel_SimpleSemanticModelElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_semanticModel_UMASemanticModelBridge.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_semanticModel_UMASemanticModelBridge.gif
deleted file mode 100755
index 0cf27b2..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphElement_semanticModel_UMASemanticModelBridge.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphNode_size_Dimension.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphNode_size_Dimension.gif
deleted file mode 100755
index ccd9289..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateGraphNode_size_Dimension.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodElement_methodElementProperty_MethodElementProperty.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodElement_methodElementProperty_MethodElementProperty.gif
deleted file mode 100755
index 6b2c3eb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodElement_methodElementProperty_MethodElementProperty.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodElement_ownedRules_Constraint.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodElement_ownedRules_Constraint.gif
deleted file mode 100755
index bcd32f7..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodElement_ownedRules_Constraint.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodLibrary_methodModels_MethodModel.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodLibrary_methodModels_MethodModel.gif
deleted file mode 100755
index bb82c39..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodLibrary_methodModels_MethodModel.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodLibrary_methodPlugins_MethodPlugin.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodLibrary_methodPlugins_MethodPlugin.gif
deleted file mode 100755
index bb82c39..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodLibrary_methodPlugins_MethodPlugin.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodLibrary_predefinedConfigurations_MethodConfiguration.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodLibrary_predefinedConfigurations_MethodConfiguration.gif
deleted file mode 100755
index de89602..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodLibrary_predefinedConfigurations_MethodConfiguration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodLibrary_predefinedConfigurations_ProcessFamily.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodLibrary_predefinedConfigurations_ProcessFamily.gif
deleted file mode 100755
index 6467d42..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodLibrary_predefinedConfigurations_ProcessFamily.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodModel_methodPackages_ContentPackage.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodModel_methodPackages_ContentPackage.gif
deleted file mode 100755
index 00a311e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodModel_methodPackages_ContentPackage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodModel_methodPackages_ProcessComponent.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodModel_methodPackages_ProcessComponent.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodModel_methodPackages_ProcessComponent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodModel_methodPackages_ProcessPackage.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodModel_methodPackages_ProcessPackage.gif
deleted file mode 100755
index 08d8c2d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodModel_methodPackages_ProcessPackage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPackage_childPackages_ContentPackage.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPackage_childPackages_ContentPackage.gif
deleted file mode 100755
index 00a311e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPackage_childPackages_ContentPackage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPackage_childPackages_ProcessComponent.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPackage_childPackages_ProcessComponent.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPackage_childPackages_ProcessComponent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPackage_childPackages_ProcessPackage.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPackage_childPackages_ProcessPackage.gif
deleted file mode 100755
index 08d8c2d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPackage_childPackages_ProcessPackage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPlugin_methodPackages_ContentPackage.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPlugin_methodPackages_ContentPackage.gif
deleted file mode 100755
index 00a311e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPlugin_methodPackages_ContentPackage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPlugin_methodPackages_ProcessComponent.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPlugin_methodPackages_ProcessComponent.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPlugin_methodPackages_ProcessComponent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPlugin_methodPackages_ProcessPackage.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPlugin_methodPackages_ProcessPackage.gif
deleted file mode 100755
index 08d8c2d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateMethodPlugin_methodPackages_ProcessPackage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreatePolyline_waypoints_Point.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreatePolyline_waypoints_Point.gif
deleted file mode 100755
index 43703db..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreatePolyline_waypoints_Point.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreatePractice_subPractice_Practice.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreatePractice_subPractice_Practice.gif
deleted file mode 100755
index 67209cb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreatePractice_subPractice_Practice.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreatePractice_subPractices_Practice.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreatePractice_subPractices_Practice.gif
deleted file mode 100755
index 67209cb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreatePractice_subPractices_Practice.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponentInterface_interfaceIO_WorkProductDescriptor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponentInterface_interfaceIO_WorkProductDescriptor.gif
deleted file mode 100755
index 6218229..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponentInterface_interfaceIO_WorkProductDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponentInterface_interfaceSpecifications_TaskDescriptor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponentInterface_interfaceSpecifications_TaskDescriptor.gif
deleted file mode 100755
index 554e26e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponentInterface_interfaceSpecifications_TaskDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponent_process_CapabilityPattern.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponent_process_CapabilityPattern.gif
deleted file mode 100755
index 15ffbb0..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponent_process_CapabilityPattern.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponent_process_DeliveryProcess.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponent_process_DeliveryProcess.gif
deleted file mode 100755
index 7b40362..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponent_process_DeliveryProcess.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponent_process_ProcessContribution.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponent_process_ProcessContribution.gif
deleted file mode 100755
index 2b095d8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponent_process_ProcessContribution.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponent_process_ProcessPlanningTemplate.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponent_process_ProcessPlanningTemplate.gif
deleted file mode 100755
index e9c1a08..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessComponent_process_ProcessPlanningTemplate.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_ActivityDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_ActivityDescription.gif
deleted file mode 100755
index cf20deb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_ActivityDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_ArtifactDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_ArtifactDescription.gif
deleted file mode 100755
index 501d219..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_ArtifactDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_ContentDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_ContentDescription.gif
deleted file mode 100755
index 9ff2342..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_ContentDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_DeliverableDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_DeliverableDescription.gif
deleted file mode 100755
index ca10563..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_DeliverableDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_DeliveryProcessDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_DeliveryProcessDescription.gif
deleted file mode 100755
index 7b40362..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_DeliveryProcessDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_GuidanceDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_GuidanceDescription.gif
deleted file mode 100755
index 66f44f5..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_GuidanceDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_PracticeDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_PracticeDescription.gif
deleted file mode 100755
index 67209cb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_PracticeDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_RoleDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_RoleDescription.gif
deleted file mode 100755
index 76e8896..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_RoleDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_TaskDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_TaskDescription.gif
deleted file mode 100755
index 5c3b2b8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_TaskDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_WorkProductDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_WorkProductDescription.gif
deleted file mode 100755
index 1540f3d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessElement_presentation_WorkProductDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_OBS_OBS.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_OBS_OBS.gif
deleted file mode 100755
index 33e8a61..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_OBS_OBS.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_PBS_PBS.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_PBS_PBS.gif
deleted file mode 100755
index 5a3ab4a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_PBS_PBS.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_WBS_WBS.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_WBS_WBS.gif
deleted file mode 100755
index 0a2cc52..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_WBS_WBS.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_WorkOrder_WorkOrder.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_WorkOrder_WorkOrder.gif
deleted file mode 100755
index 3cfac31..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_WorkOrder_WorkOrder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Activity.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Activity.gif
deleted file mode 100755
index cf20deb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Activity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_CapabilityPattern.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_CapabilityPattern.gif
deleted file mode 100755
index 15ffbb0..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_CapabilityPattern.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_DeliveryProcess.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_DeliveryProcess.gif
deleted file mode 100755
index 7b40362..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_DeliveryProcess.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Iteration.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Iteration.gif
deleted file mode 100755
index 4311e46..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Iteration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Milestone.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Milestone.gif
deleted file mode 100755
index d9615eb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Milestone.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Milestones.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Milestones.gif
deleted file mode 100755
index d9615eb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Milestones.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Phase.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Phase.gif
deleted file mode 100755
index ad60bd9..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Phase.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_ProcessComponentDescriptor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_ProcessComponentDescriptor.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_ProcessComponentDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_ProcessComponentInterface.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_ProcessComponentInterface.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_ProcessComponentInterface.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_ProcessContribution.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_ProcessContribution.gif
deleted file mode 100755
index 2b095d8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_ProcessContribution.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_ProcessPlanningTemplate.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_ProcessPlanningTemplate.gif
deleted file mode 100755
index 2f9b78f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_ProcessPlanningTemplate.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_ResourceDefinition.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_ResourceDefinition.gif
deleted file mode 100755
index 37a86d1..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_ResourceDefinition.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_RoleDescriptor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_RoleDescriptor.gif
deleted file mode 100755
index 368c7b8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_RoleDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_TaskDescriptor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_TaskDescriptor.gif
deleted file mode 100755
index 554e26e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_TaskDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Team.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Team.gif
deleted file mode 100755
index 5099fea..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_Team.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_TeamProfile.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_TeamProfile.gif
deleted file mode 100755
index 5099fea..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_TeamProfile.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_WorkProductDescriptor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_WorkProductDescriptor.gif
deleted file mode 100755
index 6218229..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_breakdownElements_WorkProductDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_diagrams_Diagram.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_diagrams_Diagram.gif
deleted file mode 100755
index a6d8558..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_diagrams_Diagram.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_Activity.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_Activity.gif
deleted file mode 100755
index cf20deb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_Activity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_CapabilityPattern.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_CapabilityPattern.gif
deleted file mode 100755
index 15ffbb0..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_CapabilityPattern.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_CompositeRole.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_CompositeRole.gif
deleted file mode 100755
index 3f02915..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_CompositeRole.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_DeliveryProcess.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_DeliveryProcess.gif
deleted file mode 100755
index 7b40362..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_DeliveryProcess.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_Iteration.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_Iteration.gif
deleted file mode 100755
index 4311e46..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_Iteration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_Milestone.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_Milestone.gif
deleted file mode 100755
index d9615eb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_Milestone.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_Phase.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_Phase.gif
deleted file mode 100755
index ad60bd9..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_Phase.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_PlanningData.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_PlanningData.gif
deleted file mode 100755
index 72ce260..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_PlanningData.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_ProcessComponentDescriptor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_ProcessComponentDescriptor.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_ProcessComponentDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_ProcessComponentInterface.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_ProcessComponentInterface.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_ProcessComponentInterface.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_ProcessContribution.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_ProcessContribution.gif
deleted file mode 100755
index 2b095d8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_ProcessContribution.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_ProcessPlanningTemplate.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_ProcessPlanningTemplate.gif
deleted file mode 100755
index e9c1a08..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_ProcessPlanningTemplate.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_RoleDescriptor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_RoleDescriptor.gif
deleted file mode 100755
index 368c7b8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_RoleDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_TaskDescriptor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_TaskDescriptor.gif
deleted file mode 100755
index 554e26e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_TaskDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_TeamProfile.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_TeamProfile.gif
deleted file mode 100755
index 5099fea..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_TeamProfile.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_WorkOrder.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_WorkOrder.gif
deleted file mode 100755
index db41f3b..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_WorkOrder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_WorkProductDescriptor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_WorkProductDescriptor.gif
deleted file mode 100755
index 6218229..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_processElements_WorkProductDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_process_CapabilityPattern.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_process_CapabilityPattern.gif
deleted file mode 100755
index 15ffbb0..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_process_CapabilityPattern.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_process_DeliveryProcess.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_process_DeliveryProcess.gif
deleted file mode 100755
index 7b40362..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_process_DeliveryProcess.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_process_ProcessContribution.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_process_ProcessContribution.gif
deleted file mode 100755
index 2b095d8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_process_ProcessContribution.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_process_ProcessPlan.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_process_ProcessPlan.gif
deleted file mode 100755
index afda55d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_process_ProcessPlan.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_process_ProcessPlanningTemplate.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_process_ProcessPlanningTemplate.gif
deleted file mode 100755
index 2f9b78f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateProcessPackage_process_ProcessPlanningTemplate.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateRegion_Transition_Transition.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateRegion_Transition_Transition.gif
deleted file mode 100755
index c431c59..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateRegion_Transition_Transition.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateRegion_Vertex_PseudoState.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateRegion_Vertex_PseudoState.gif
deleted file mode 100755
index 4368e6a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateRegion_Vertex_PseudoState.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateRegion_Vertex_State.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateRegion_Vertex_State.gif
deleted file mode 100755
index 1cf5062..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateRegion_Vertex_State.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateRegion_Vertex_Vertex.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateRegion_Vertex_Vertex.gif
deleted file mode 100755
index bca376f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateRegion_Vertex_Vertex.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateSection_subSections_Section.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateSection_subSections_Section.gif
deleted file mode 100755
index 883ce93..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateSection_subSections_Section.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateSection_subSections_Step.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateSection_subSections_Step.gif
deleted file mode 100755
index 9c7efc4..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateSection_subSections_Step.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateStateMachine_Region_Region.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateStateMachine_Region_Region.gif
deleted file mode 100755
index b6ab7ef..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateStateMachine_Region_Region.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateState_Region_Region.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateState_Region_Region.gif
deleted file mode 100755
index f676db8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateState_Region_Region.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateTask_estimate_Estimate.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateTask_estimate_Estimate.gif
deleted file mode 100755
index 6844bf8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateTask_estimate_Estimate.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateTask_steps_Step.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateTask_steps_Step.gif
deleted file mode 100755
index bda49d2..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateTask_steps_Step.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateTeamProfile_subTeam_TeamProfile.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateTeamProfile_subTeam_TeamProfile.gif
deleted file mode 100755
index 5099fea..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateTeamProfile_subTeam_TeamProfile.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateTrainingClass_trainingModules_TrainingModule.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateTrainingClass_trainingModules_TrainingModule.gif
deleted file mode 100755
index 0ef5eff..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateTrainingClass_trainingModules_TrainingModule.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateWorkDefinition_postcondition_Constraint.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateWorkDefinition_postcondition_Constraint.gif
deleted file mode 100755
index 6d944d7..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateWorkDefinition_postcondition_Constraint.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateWorkDefinition_precondition_Constraint.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateWorkDefinition_precondition_Constraint.gif
deleted file mode 100755
index 6d944d7..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateWorkDefinition_precondition_Constraint.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateWorkProduct_estimate_Estimate.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateWorkProduct_estimate_Estimate.gif
deleted file mode 100755
index 676eb1d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/ctool16/CreateWorkProduct_estimate_Estimate.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Activity.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Activity.gif
deleted file mode 100755
index cf20deb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Activity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ActivityDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ActivityDescription.gif
deleted file mode 100755
index cf20deb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ActivityDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Aggregate.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Aggregate.gif
deleted file mode 100755
index d3dc5a9..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Aggregate.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Artifact.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Artifact.gif
deleted file mode 100755
index 501d219..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Artifact.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ArtifactDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ArtifactDescription.gif
deleted file mode 100755
index 501d219..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ArtifactDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Attachment.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Attachment.gif
deleted file mode 100755
index c4a8af4..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Attachment.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/BreakdownElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/BreakdownElement.gif
deleted file mode 100755
index badaab0..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/BreakdownElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/BreakdownElementDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/BreakdownElementDescription.gif
deleted file mode 100755
index 35ef84e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/BreakdownElementDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/CapabilityPattern.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/CapabilityPattern.gif
deleted file mode 100755
index 15ffbb0..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/CapabilityPattern.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Checklist.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Checklist.gif
deleted file mode 100755
index 88f6d8b..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Checklist.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Classifier.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Classifier.gif
deleted file mode 100755
index a17dc7d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Classifier.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/CompositeRole.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/CompositeRole.gif
deleted file mode 100755
index 76e8896..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/CompositeRole.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Concept.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Concept.gif
deleted file mode 100755
index 1df84da..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Concept.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Constraint.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Constraint.gif
deleted file mode 100755
index db7414e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Constraint.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ContentCategory.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ContentCategory.gif
deleted file mode 100755
index 45731fe..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ContentCategory.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ContentDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ContentDescription.gif
deleted file mode 100755
index be22463..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ContentDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ContentElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ContentElement.gif
deleted file mode 100755
index 5915591..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ContentElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ContentPackage.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ContentPackage.gif
deleted file mode 100755
index 00a311e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ContentPackage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/CoreElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/CoreElement.gif
deleted file mode 100755
index c3370c7..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/CoreElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/CoreSemanticModelBridge.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/CoreSemanticModelBridge.gif
deleted file mode 100755
index a17dc7d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/CoreSemanticModelBridge.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/CustomCategory.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/CustomCategory.gif
deleted file mode 100755
index df47980..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/CustomCategory.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Deliverable.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Deliverable.gif
deleted file mode 100755
index ca10563..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Deliverable.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DeliverableDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DeliverableDescription.gif
deleted file mode 100755
index ca10563..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DeliverableDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DeliveryProcess.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DeliveryProcess.gif
deleted file mode 100755
index 7b40362..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DeliveryProcess.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DeliveryProcessDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DeliveryProcessDescription.gif
deleted file mode 100755
index 7b40362..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DeliveryProcessDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DescribableElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DescribableElement.gif
deleted file mode 100755
index 14af8aa..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DescribableElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Descriptor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Descriptor.gif
deleted file mode 100755
index 136e3b2..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Descriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DescriptorDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DescriptorDescription.gif
deleted file mode 100755
index 2b69256..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DescriptorDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Diagram.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Diagram.gif
deleted file mode 100755
index c4a8af4..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Diagram.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DiagramElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DiagramElement.gif
deleted file mode 100755
index 45731fe..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DiagramElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DiagramLink.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DiagramLink.gif
deleted file mode 100755
index c673a52..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DiagramLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Dimension.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Dimension.gif
deleted file mode 100755
index cdd3b76..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Dimension.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Discipline.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Discipline.gif
deleted file mode 100755
index 35bd476..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Discipline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DisciplineGrouping.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DisciplineGrouping.gif
deleted file mode 100755
index 5553c1d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/DisciplineGrouping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Domain.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Domain.gif
deleted file mode 100755
index cf28926..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Domain.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Element.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Element.gif
deleted file mode 100755
index f8041d2..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Element.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Ellipse.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Ellipse.gif
deleted file mode 100755
index 106881e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Ellipse.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Estimate.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Estimate.gif
deleted file mode 100755
index 982d21c..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Estimate.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatedMethodElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatedMethodElement.gif
deleted file mode 100755
index 14af8aa..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatedMethodElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatingConsiderations.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatingConsiderations.gif
deleted file mode 100755
index 4fc84e4..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatingConsiderations.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatingMetric.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatingMetric.gif
deleted file mode 100755
index e940975..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatingMetric.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatingModel.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatingModel.gif
deleted file mode 100755
index caf2804..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatingModel.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatingParameter.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatingParameter.gif
deleted file mode 100755
index 94c953e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatingParameter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatingParameterOwner.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatingParameterOwner.gif
deleted file mode 100755
index 5915591..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimatingParameterOwner.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimationConsiderations.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimationConsiderations.gif
deleted file mode 100755
index 4fc84e4..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/EstimationConsiderations.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Example.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Example.gif
deleted file mode 100755
index 1b944fd..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Example.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GraphConnector.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GraphConnector.gif
deleted file mode 100755
index 739ebbf..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GraphConnector.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GraphEdge.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GraphEdge.gif
deleted file mode 100755
index 5a9bc75..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GraphEdge.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GraphElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GraphElement.gif
deleted file mode 100755
index 338fb8d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GraphElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GraphNode.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GraphNode.gif
deleted file mode 100755
index 134551b..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GraphNode.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GraphicPrimitive.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GraphicPrimitive.gif
deleted file mode 100755
index 10d2229..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GraphicPrimitive.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Guidance.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Guidance.gif
deleted file mode 100755
index 66f44f5..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Guidance.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GuidanceDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GuidanceDescription.gif
deleted file mode 100755
index 66f44f5..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/GuidanceDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Guideline.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Guideline.gif
deleted file mode 100755
index 66f44f5..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Guideline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Image.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Image.gif
deleted file mode 100755
index ef56c14..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Image.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Iteration.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Iteration.gif
deleted file mode 100755
index 4311e46..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Iteration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/LeafElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/LeafElement.gif
deleted file mode 100755
index 106881e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/LeafElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodConfiguration.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodConfiguration.gif
deleted file mode 100755
index de89602..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodConfiguration.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodElement.gif
deleted file mode 100755
index c4fb30e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodElementProperty.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodElementProperty.gif
deleted file mode 100755
index c414fe9..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodElementProperty.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodLibrary.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodLibrary.gif
deleted file mode 100755
index 00a311e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodLibrary.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodPackage.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodPackage.gif
deleted file mode 100755
index 00a311e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodPackage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodPlugin.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodPlugin.gif
deleted file mode 100755
index bb82c39..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodPlugin.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodPlugin_grey.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodPlugin_grey.gif
deleted file mode 100755
index de63ade..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodPlugin_grey.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodUnit.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodUnit.gif
deleted file mode 100755
index 5a9bc75..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/MethodUnit.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Milestone.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Milestone.gif
deleted file mode 100755
index d9615eb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Milestone.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Milestones.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Milestones.gif
deleted file mode 100755
index d9615eb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Milestones.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/NamedElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/NamedElement.gif
deleted file mode 100755
index 14af8aa..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/NamedElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Namespace.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Namespace.gif
deleted file mode 100755
index 498364f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Namespace.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/OBS.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/OBS.gif
deleted file mode 100755
index afb82ea..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/OBS.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Outcome.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Outcome.gif
deleted file mode 100755
index e703518..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Outcome.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/PBS.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/PBS.gif
deleted file mode 100755
index 498364f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/PBS.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Package.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Package.gif
deleted file mode 100755
index c00aedf..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Package.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/PackageableElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/PackageableElement.gif
deleted file mode 100755
index 106881e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/PackageableElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Phase.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Phase.gif
deleted file mode 100755
index ad60bd9..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Phase.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/PlanningData.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/PlanningData.gif
deleted file mode 100755
index 94c953e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/PlanningData.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Point.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Point.gif
deleted file mode 100755
index 53500da..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Point.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Polyline.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Polyline.gif
deleted file mode 100755
index 7c2aaac..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Polyline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Practice.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Practice.gif
deleted file mode 100755
index 67209cb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Practice.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/PracticeDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/PracticeDescription.gif
deleted file mode 100755
index 67209cb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/PracticeDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Process.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Process.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Process.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessComponent.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessComponent.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessComponent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessComponentDescriptor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessComponentDescriptor.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessComponentDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessComponentInterface.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessComponentInterface.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessComponentInterface.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessContext.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessContext.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessContext.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessContribution.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessContribution.gif
deleted file mode 100755
index 2b095d8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessContribution.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessDescription.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessElement.gif
deleted file mode 100755
index 0eac59f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessFamily.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessFamily.gif
deleted file mode 100755
index 2b69256..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessFamily.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessPackage.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessPackage.gif
deleted file mode 100755
index 08d8c2d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessPackage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessPlan.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessPlan.gif
deleted file mode 100755
index b1f8afa..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessPlan.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessPlanningTemplate.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessPlanningTemplate.gif
deleted file mode 100755
index 136e3b2..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ProcessPlanningTemplate.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Property.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Property.gif
deleted file mode 100755
index 136e3b2..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Property.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/PseudoState.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/PseudoState.gif
deleted file mode 100755
index c4fb30e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/PseudoState.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Reference.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Reference.gif
deleted file mode 100755
index 739ebbf..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Reference.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Region.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Region.gif
deleted file mode 100755
index 4365960..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Region.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Report.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Report.gif
deleted file mode 100755
index c22c85e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Report.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ResourceDefinition.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ResourceDefinition.gif
deleted file mode 100755
index 98b351f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ResourceDefinition.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ReusableAsset.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ReusableAsset.gif
deleted file mode 100755
index b52cffe..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ReusableAsset.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Roadmap.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Roadmap.gif
deleted file mode 100755
index f11bc5d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Roadmap.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Role.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Role.gif
deleted file mode 100755
index 76e8896..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Role.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/RoleDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/RoleDescription.gif
deleted file mode 100755
index 76e8896..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/RoleDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/RoleDescriptor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/RoleDescriptor.gif
deleted file mode 100755
index 368c7b8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/RoleDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/RoleSet.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/RoleSet.gif
deleted file mode 100755
index 5099fea..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/RoleSet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/RoleSetCategory.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/RoleSetCategory.gif
deleted file mode 100755
index 54a3f67..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/RoleSetCategory.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/RoleSetGrouping.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/RoleSetGrouping.gif
deleted file mode 100755
index 54a3f67..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/RoleSetGrouping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Section.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Section.gif
deleted file mode 100755
index 739ebbf..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Section.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/SemanticModelBridge.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/SemanticModelBridge.gif
deleted file mode 100755
index 33854e9..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/SemanticModelBridge.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/SimpleSemanticModelElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/SimpleSemanticModelElement.gif
deleted file mode 100755
index cb1755a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/SimpleSemanticModelElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/State.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/State.gif
deleted file mode 100755
index cb1755a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/State.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/StateMachine.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/StateMachine.gif
deleted file mode 100755
index badaab0..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/StateMachine.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Step.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Step.gif
deleted file mode 100755
index 35ef84e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Step.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/SummitEstimatingParameter.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/SummitEstimatingParameter.gif
deleted file mode 100755
index 45731fe..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/SummitEstimatingParameter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/SupportingMaterial.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/SupportingMaterial.gif
deleted file mode 100755
index 05a21ec..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/SupportingMaterial.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Task.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Task.gif
deleted file mode 100755
index 5c3b2b8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Task.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TaskDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TaskDescription.gif
deleted file mode 100755
index 5c3b2b8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TaskDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TaskDescriptor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TaskDescriptor.gif
deleted file mode 100755
index 554e26e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TaskDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Team.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Team.gif
deleted file mode 100755
index 5099fea..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Team.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TeamProfile.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TeamProfile.gif
deleted file mode 100755
index 5099fea..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TeamProfile.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Technique.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Technique.gif
deleted file mode 100755
index 36866d9..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Technique.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Template.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Template.gif
deleted file mode 100755
index c763251..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Template.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TemplateDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TemplateDescription.gif
deleted file mode 100755
index c763251..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TemplateDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TermDefinition.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TermDefinition.gif
deleted file mode 100755
index e21bfe0..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TermDefinition.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TextElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TextElement.gif
deleted file mode 100755
index 134551b..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TextElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Tool.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Tool.gif
deleted file mode 100755
index 4f1b85a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Tool.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ToolMentor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ToolMentor.gif
deleted file mode 100755
index 4f1b85a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/ToolMentor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TrainingClass.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TrainingClass.gif
deleted file mode 100755
index 90d10f9..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TrainingClass.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TrainingModule.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TrainingModule.gif
deleted file mode 100755
index ef56c14..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/TrainingModule.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Transition.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Transition.gif
deleted file mode 100755
index 7bac4fd..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Transition.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Type.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Type.gif
deleted file mode 100755
index b1f8afa..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Type.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/UMASemanticModelBridge.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/UMASemanticModelBridge.gif
deleted file mode 100755
index 89ad5da..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/UMASemanticModelBridge.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/UserDefinedCategory.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/UserDefinedCategory.gif
deleted file mode 100755
index df47980..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/UserDefinedCategory.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/VariabilityElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/VariabilityElement.gif
deleted file mode 100755
index db7414e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/VariabilityElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Vertex.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Vertex.gif
deleted file mode 100755
index 8a5c70c..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Vertex.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WBS.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WBS.gif
deleted file mode 100755
index ef56c14..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WBS.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Whitepaper.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Whitepaper.gif
deleted file mode 100755
index e5b4800..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/Whitepaper.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkBreakdownElement.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkBreakdownElement.gif
deleted file mode 100755
index 7bac4fd..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkBreakdownElement.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkDefinition.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkDefinition.gif
deleted file mode 100755
index 2124f3e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkDefinition.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkOrder.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkOrder.gif
deleted file mode 100755
index badaab0..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkOrder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProduct.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProduct.gif
deleted file mode 100755
index 1540f3d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProduct.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProductDescription.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProductDescription.gif
deleted file mode 100755
index 1540f3d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProductDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProductDescriptor.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProductDescriptor.gif
deleted file mode 100755
index 6218229..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProductDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProductGuideline.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProductGuideline.gif
deleted file mode 100755
index 957fa65..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProductGuideline.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProductShape.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProductShape.gif
deleted file mode 100755
index 1540f3d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProductShape.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProductType.gif b/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProductType.gif
deleted file mode 100755
index a7ecac0..0000000
--- a/plugins/org.eclipse.epf.uma.edit/icons/full/obj16/WorkProductType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.epf.uma.edit/plugin.properties b/plugins/org.eclipse.epf.uma.edit/plugin.properties
deleted file mode 100755
index 6945e6e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/plugin.properties
+++ /dev/null
@@ -1,423 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = EMF UMA Edit Support
-providerName = Eclipse.org
-
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-_UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_Classifier_type = Classifier
-_UI_Type_type = Type
-_UI_Element_type = Element
-_UI_NamedElement_type = Named Element
-_UI_PackageableElement_type = Packageable Element
-_UI_Package_type = Package
-_UI_Namespace_type = Namespace
-_UI_MethodElement_type = Method Element
-_UI_Constraint_type = Constraint
-_UI_ContentElement_type = Content Element
-_UI_DescribableElement_type = Describable Element
-_UI_ContentDescription_type = Content Description
-_UI_Section_type = Section
-_UI_Role_type = Role
-_UI_WorkProduct_type = Work Product
-_UI_Task_type = Task
-_UI_WorkDefinition_type = Work Definition
-_UI_Step_type = Step
-_UI_Guidance_type = Guidance
-_UI_Artifact_type = Artifact
-_UI_Deliverable_type = Deliverable
-_UI_Outcome_type = Outcome
-_UI_MethodPackage_type = Method Package
-_UI_ContentPackage_type = Content Package
-_UI_ArtifactDescription_type = Artifact Description
-_UI_WorkProductDescription_type = Work Product Description
-_UI_DeliverableDescription_type = Deliverable Description
-_UI_RoleDescription_type = Role Description
-_UI_TaskDescription_type = Task Description
-_UI_GuidanceDescription_type = Guidance Description
-_UI_PracticeDescription_type = Practice Description
-_UI_Point_type = Point
-_UI_GraphElement_type = Graph Element
-_UI_DiagramElement_type = Diagram Element
-_UI_DiagramLink_type = Diagram Link
-_UI_GraphConnector_type = Graph Connector
-_UI_SemanticModelBridge_type = Semantic Model Bridge
-_UI_Dimension_type = Dimension
-_UI_Reference_type = Reference
-_UI_Property_type = Property
-_UI_GraphEdge_type = Graph Edge
-_UI_Diagram_type = Diagram
-_UI_GraphNode_type = Graph Node
-_UI_SimpleSemanticModelElement_type = Simple Semantic Model Element
-_UI_UMASemanticModelBridge_type = UMA Semantic Model Bridge
-_UI_CoreSemanticModelBridge_type = Core Semantic Model Bridge
-_UI_LeafElement_type = Leaf Element
-_UI_TextElement_type = Text Element
-_UI_Image_type = Image
-_UI_GraphicPrimitive_type = Graphic Primitive
-_UI_Polyline_type = Polyline
-_UI_Ellipse_type = Ellipse
-_UI_Activity_type = Activity
-_UI_WorkBreakdownElement_type = Work Breakdown Element
-_UI_BreakdownElement_type = Breakdown Element
-_UI_Milestone_type = Milestone
-_UI_Iteration_type = Iteration
-_UI_Phase_type = Phase
-_UI_TeamProfile_type = Team Profile
-_UI_RoleDescriptor_type = Role Descriptor
-_UI_WorkOrder_type = Work Order
-_UI_ProcessElement_type = Process Element
-_UI_PlanningData_type = Planning Data
-_UI_Descriptor_type = Descriptor
-_UI_WorkProductDescriptor_type = Work Product Descriptor
-_UI_TaskDescriptor_type = Task Descriptor
-_UI_CompositeRole_type = Composite Role
-_UI_BreakdownElementDescription_type = Breakdown Element Description
-_UI_ActivityDescription_type = Activity Description
-_UI_DeliveryProcessDescription_type = Delivery Process Description
-_UI_ProcessDescription_type = Process Description
-_UI_DescriptorDescription_type = Descriptor Description
-_UI_Concept_type = Concept
-_UI_Checklist_type = Checklist
-_UI_Example_type = Example
-_UI_Guideline_type = Guideline
-_UI_Report_type = Report
-_UI_Template_type = Template
-_UI_SupportingMaterial_type = Supporting Material
-_UI_ToolMentor_type = Tool Mentor
-_UI_Whitepaper_type = Whitepaper
-_UI_TermDefinition_type = Term Definition
-_UI_Practice_type = Practice
-_UI_EstimationConsiderations_type = Estimation Considerations
-_UI_ReusableAsset_type = Reusable Asset
-_UI_State_type = State
-_UI_Vertex_type = Vertex
-_UI_Region_type = Region
-_UI_StateMachine_type = State Machine
-_UI_Transition_type = Transition
-_UI_PseudoState_type = Pseudo State
-_UI_Discipline_type = Discipline
-_UI_ContentCategory_type = Content Category
-_UI_RoleSet_type = Role Set
-_UI_Domain_type = Domain
-_UI_WorkProductType_type = Work Product Kind
-_UI_DisciplineGrouping_type = Discipline Grouping
-_UI_Tool_type = Tool
-_UI_RoleSetGrouping_type = Role Set Grouping
-_UI_CustomCategory_type = Custom Category
-_UI_DeliveryProcess_type = Delivery Process
-_UI_Process_type = Process
-_UI_CapabilityPattern_type = Capability Pattern
-_UI_ProcessPlanningTemplate_type = Process Planning Template
-_UI_Roadmap_type = Roadmap
-_UI_ProcessComponent_type = Process Component
-_UI_ProcessPackage_type = Process Package
-_UI_ProcessComponentInterface_type = Process Component Interface
-_UI_ProcessComponentDescriptor_type = Process Component Descriptor
-_UI_MethodPlugin_type = Method Plug-in
-_UI_VariabilityElement_type = Variability Element
-_UI_MethodUnit_type = Method Unit
-_UI_MethodConfiguration_type = Method Configuration
-_UI_ProcessFamily_type = Process Family
-_UI_MethodLibrary_type = Method Library
-_UI_Unknown_type = Object
-
-_UI_Unknown_datatype= Value
-
-_UI_NamedElement_name_feature = Name
-_UI_MethodElement_guid_feature = Guid
-_UI_MethodElement_briefDescription_feature = Brief Description
-_UI_MethodElement_ownedRules_feature = Owned Rules
-_UI_MethodElement_suppressed_feature = Suppressed
-_UI_MethodElement_orderingGuide_feature = Ordering Guide
-_UI_Constraint_body_feature = Body
-_UI_ContentElement_supportingMaterials_feature = Supporting Materials
-_UI_ContentElement_conceptsAndPapers_feature = Concepts And Papers
-_UI_ContentElement_checklists_feature = Checklists
-_UI_ContentElement_guidelines_feature = Guidelines
-_UI_ContentElement_examples_feature = Examples
-_UI_ContentElement_assets_feature = Assets
-_UI_DescribableElement_presentationName_feature = Presentation Name
-_UI_DescribableElement_presentation_feature = Presentation
-_UI_DescribableElement_shapeicon_feature = Shapeicon
-_UI_DescribableElement_nodeicon_feature = Nodeicon
-_UI_ContentDescription_mainDescription_feature = Main Description
-_UI_ContentDescription_sections_feature = Sections
-_UI_ContentDescription_keyConsiderations_feature = Key Considerations
-_UI_Section_sectionName_feature = Section Name
-_UI_Section_sectionDescription_feature = Section Description
-_UI_Section_subSections_feature = Sub Sections
-_UI_Section_predecessor_feature = Predecessor
-_UI_Role_modifies_feature = Modifies
-_UI_Role_responsibleFor_feature = Responsible For
-_UI_WorkProduct_reports_feature = Reports
-_UI_WorkProduct_templates_feature = Templates
-_UI_WorkProduct_toolMentors_feature = Tool Mentors
-_UI_WorkProduct_estimationConsiderations_feature = Estimation Considerations
-_UI_Task_performedBy_feature = Performed By
-_UI_Task_mandatoryInput_feature = Mandatory Input
-_UI_Task_output_feature = Output
-_UI_Task_additionallyPerformedBy_feature = Additionally Performed By
-_UI_Task_optionalInput_feature = Optional Input
-_UI_Task_steps_feature = Steps
-_UI_Task_toolMentors_feature = Tool Mentors
-_UI_Task_estimationConsiderations_feature = Estimation Considerations
-_UI_WorkDefinition_precondition_feature = Precondition
-_UI_WorkDefinition_postcondition_feature = Postcondition
-_UI_Artifact_containerArtifact_feature = Container Artifact
-_UI_Artifact_containedArtifacts_feature = Contained Artifacts
-_UI_Deliverable_deliveredWorkProducts_feature = Delivered Work Products
-_UI_MethodPackage_global_feature = Global
-_UI_MethodPackage_reusedPackages_feature = Reused Packages
-_UI_MethodPackage_parentPackage_feature = Parent Package
-_UI_MethodPackage_childPackages_feature = Child Packages
-_UI_ContentPackage_contentElements_feature = Content Elements
-_UI_ArtifactDescription_briefOutline_feature = Brief Outline
-_UI_ArtifactDescription_representationOptions_feature = Representation Options
-_UI_WorkProductDescription_externalId_feature = External Id
-_UI_WorkProductDescription_purpose_feature = Purpose
-_UI_WorkProductDescription_impactOfNotHaving_feature = Impact Of Not Having
-_UI_WorkProductDescription_reasonsForNotNeeding_feature = Reasons For Not Needing
-_UI_DeliverableDescription_externalDescription_feature = External Description
-_UI_DeliverableDescription_packagingGuidance_feature = Packaging Guidance
-_UI_RoleDescription_skills_feature = Skills
-_UI_RoleDescription_assignmentApproaches_feature = Assignment Approaches
-_UI_RoleDescription_synonyms_feature = Synonyms
-_UI_TaskDescription_purpose_feature = Purpose
-_UI_TaskDescription_alternatives_feature = Alternatives
-_UI_GuidanceDescription_attachments_feature = Attachments
-_UI_PracticeDescription_additionalInfo_feature = Additional Info
-_UI_PracticeDescription_problem_feature = Problem
-_UI_PracticeDescription_background_feature = Background
-_UI_PracticeDescription_goals_feature = Goals
-_UI_PracticeDescription_application_feature = Application
-_UI_PracticeDescription_levelsOfAdoption_feature = Levels Of Adoption
-_UI_Point_x_feature = X
-_UI_Point_y_feature = Y
-_UI_GraphElement_position_feature = Position
-_UI_GraphElement_contained_feature = Contained
-_UI_GraphElement_link_feature = Link
-_UI_GraphElement_anchorage_feature = Anchorage
-_UI_GraphElement_semanticModel_feature = Semantic Model
-_UI_DiagramElement_isVisible_feature = Is Visible
-_UI_DiagramElement_container_feature = Container
-_UI_DiagramElement_reference_feature = Reference
-_UI_DiagramElement_property_feature = Property
-_UI_DiagramLink_zoom_feature = Zoom
-_UI_DiagramLink_viewport_feature = Viewport
-_UI_DiagramLink_graphElement_feature = Graph Element
-_UI_DiagramLink_diagram_feature = Diagram
-_UI_GraphConnector_graphElement_feature = Graph Element
-_UI_GraphConnector_graphEdge_feature = Graph Edge
-_UI_SemanticModelBridge_presentation_feature = Presentation
-_UI_SemanticModelBridge_graphElement_feature = Graph Element
-_UI_SemanticModelBridge_diagram_feature = Diagram
-_UI_Dimension_width_feature = Width
-_UI_Dimension_height_feature = Height
-_UI_Reference_isIndividualRepresentation_feature = Is Individual Representation
-_UI_Reference_referenced_feature = Referenced
-_UI_Property_key_feature = Key
-_UI_Property_value_feature = Value
-_UI_GraphEdge_anchor_feature = Anchor
-_UI_GraphEdge_waypoints_feature = Waypoints
-_UI_Diagram_zoom_feature = Zoom
-_UI_Diagram_viewpoint_feature = Viewpoint
-_UI_Diagram_diagramLink_feature = Diagram Link
-_UI_Diagram_namespace_feature = Namespace
-_UI_GraphNode_size_feature = Size
-_UI_SimpleSemanticModelElement_typeInfo_feature = Type Info
-_UI_UMASemanticModelBridge_element_feature = Element
-_UI_CoreSemanticModelBridge_element_feature = Element
-_UI_TextElement_text_feature = Text
-_UI_Image_uri_feature = Uri
-_UI_Image_mimeType_feature = Mime Type
-_UI_Polyline_closed_feature = Closed
-_UI_Polyline_waypoints_feature = Waypoints
-_UI_Ellipse_radiusX_feature = Radius X
-_UI_Ellipse_radiusY_feature = Radius Y
-_UI_Ellipse_rotation_feature = Rotation
-_UI_Ellipse_startAngle_feature = Start Angle
-_UI_Ellipse_endAngle_feature = End Angle
-_UI_Ellipse_center_feature = Center
-_UI_Activity_breakdownElements_feature = Breakdown Elements
-_UI_Activity_roadmaps_feature = Roadmaps
-_UI_Activity_supportingMaterials_feature = Supporting Materials
-_UI_Activity_checklists_feature = Checklists
-_UI_Activity_concepts_feature = Concepts
-_UI_Activity_examples_feature = Examples
-_UI_Activity_guidelines_feature = Guidelines
-_UI_Activity_reusableAssets_feature = Reusable Assets
-_UI_Activity_isEnactable_feature = Is Enactable
-_UI_WorkBreakdownElement_isRepeatable_feature = Is Repeatable
-_UI_WorkBreakdownElement_isOngoing_feature = Is Ongoing
-_UI_WorkBreakdownElement_isEventDriven_feature = Is Event Driven
-_UI_WorkBreakdownElement_linkToPredecessor_feature = Link To Predecessor
-_UI_BreakdownElement_prefix_feature = Prefix
-_UI_BreakdownElement_isPlanned_feature = Is Planned
-_UI_BreakdownElement_hasMultipleOccurrences_feature = Has Multiple Occurrences
-_UI_BreakdownElement_isOptional_feature = Is Optional
-_UI_BreakdownElement_presentedAfter_feature = Presented After
-_UI_BreakdownElement_presentedBefore_feature = Presented Before
-_UI_BreakdownElement_planningData_feature = Planning Data
-_UI_BreakdownElement_superActivities_feature = Super Activities
-_UI_TeamProfile_teamRoles_feature = Team Roles
-_UI_TeamProfile_superTeam_feature = Super Team
-_UI_TeamProfile_subTeam_feature = Sub Team
-_UI_RoleDescriptor_Role_feature = Role
-_UI_RoleDescriptor_modifies_feature = Modifies
-_UI_RoleDescriptor_responsibleFor_feature = Responsible For
-_UI_WorkOrder_linkType_feature = Link Type
-_UI_WorkOrder_pred_feature = Pred
-_UI_PlanningData_startDate_feature = Start Date
-_UI_PlanningData_finishDate_feature = Finish Date
-_UI_PlanningData_rank_feature = Rank
-_UI_Descriptor_isSynchronizedWithSource_feature = Is Synchronized With Source
-_UI_WorkProductDescriptor_activityEntryState_feature = Activity Entry State
-_UI_WorkProductDescriptor_activityExitState_feature = Activity Exit State
-_UI_WorkProductDescriptor_WorkProduct_feature = Work Product
-_UI_WorkProductDescriptor_impactedBy_feature = Impacted By
-_UI_WorkProductDescriptor_impacts_feature = Impacts
-_UI_WorkProductDescriptor_deliverableParts_feature = Deliverable Parts
-_UI_TaskDescriptor_Task_feature = Task
-_UI_TaskDescriptor_additionallyPerformedBy_feature = Secondary Performer
-_UI_TaskDescriptor_assistedBy_feature = Assisted By
-_UI_TaskDescriptor_externalInput_feature = External Input
-_UI_TaskDescriptor_mandatoryInput_feature = Mandatory Input
-_UI_TaskDescriptor_optionalInput_feature = Optional Input
-_UI_TaskDescriptor_output_feature = Output
-_UI_TaskDescriptor_performedPrimarilyBy_feature = Primary Performer
-_UI_TaskDescriptor_selectedSteps_feature = Selected Steps
-_UI_CompositeRole_aggregatedRoles_feature = Aggregated Roles
-_UI_BreakdownElementDescription_usageGuidance_feature = Usage Guidance
-_UI_ActivityDescription_purpose_feature = Purpose
-_UI_ActivityDescription_alternatives_feature = Alternatives
-_UI_ActivityDescription_howtoStaff_feature = Howto Staff
-_UI_DeliveryProcessDescription_scale_feature = Scale
-_UI_DeliveryProcessDescription_projectCharacteristics_feature = Project Characteristics
-_UI_DeliveryProcessDescription_riskLevel_feature = Risk Level
-_UI_DeliveryProcessDescription_estimatingTechnique_feature = Estimating Technique
-_UI_DeliveryProcessDescription_projectMemberExpertise_feature = Project Member Expertise
-_UI_DeliveryProcessDescription_typeOfContract_feature = Type Of Contract
-_UI_ProcessDescription_externalId_feature = External Id
-_UI_ProcessDescription_scope_feature = Scope
-_UI_ProcessDescription_usageNotes_feature = Usage Notes
-_UI_DescriptorDescription_refinedDescription_feature = Refined Description
-_UI_Practice_subPractices_feature = Sub Practices
-_UI_Practice_contentReferences_feature = Content References
-_UI_Practice_activityReferences_feature = Activity References
-_UI_State_WorkProduct_feature = Work Product
-_UI_State_Region_feature = Region
-_UI_State_submachine_feature = Submachine
-_UI_Vertex_container_feature = Container
-_UI_Vertex_outgoing_feature = Outgoing
-_UI_Vertex_incoming_feature = Incoming
-_UI_Region_Vertex_feature = Vertex
-_UI_Region_Transition_feature = Transition
-_UI_Region_State_feature = State
-_UI_Region_StateMachine_feature = State Machine
-_UI_StateMachine_Region_feature = Region
-_UI_Transition_WorkDefinition_feature = Work Definition
-_UI_Transition_container_feature = Container
-_UI_Transition_source_feature = Source
-_UI_Transition_target_feature = Target
-_UI_Discipline_tasks_feature = Tasks
-_UI_Discipline_subdiscipline_feature = Subdiscipline
-_UI_Discipline_referenceWorkflows_feature = Reference Workflows
-_UI_RoleSet_roles_feature = Roles
-_UI_Domain_workProducts_feature = Work Products
-_UI_Domain_subdomains_feature = Subdomains
-_UI_WorkProductType_workProducts_feature = Work Products
-_UI_DisciplineGrouping_disciplines_feature = Disciplines
-_UI_Tool_toolMentors_feature = Tool Mentors
-_UI_RoleSetGrouping_roleSets_feature = Role Sets
-_UI_CustomCategory_categorizedElements_feature = Categorized Elements
-_UI_CustomCategory_subCategories_feature = Sub Categories
-_UI_DeliveryProcess_educationMaterials_feature = Education Materials
-_UI_DeliveryProcess_communicationsMaterials_feature = Communications Materials
-_UI_Process_includesPatterns_feature = Includes Patterns
-_UI_Process_defaultContext_feature = Default Context
-_UI_Process_validContext_feature = Valid Context
-_UI_ProcessPlanningTemplate_basedOnProcesses_feature = Based On Processes
-_UI_ProcessComponent_interfaces_feature = Interfaces
-_UI_ProcessComponent_process_feature = Process
-_UI_ProcessPackage_processElements_feature = Process Elements
-_UI_ProcessPackage_diagrams_feature = Diagrams
-_UI_ProcessComponentInterface_interfaceSpecifications_feature = Interface Specifications
-_UI_ProcessComponentInterface_interfaceIO_feature = Interface IO
-_UI_ProcessComponentDescriptor_ProcessComponent_feature = Process Component
-_UI_MethodPlugin_userChangeable_feature = User Changeable
-_UI_MethodPlugin_methodPackages_feature = Method Packages
-_UI_MethodPlugin_bases_feature = Bases
-_UI_VariabilityElement_variabilityType_feature = Variability Type
-_UI_VariabilityElement_variabilityBasedOnElement_feature = Variability Based On Element
-_UI_MethodUnit_authors_feature = Authors
-_UI_MethodUnit_changeDate_feature = Change Date
-_UI_MethodUnit_changeDescription_feature = Change Description
-_UI_MethodUnit_version_feature = Version
-_UI_MethodUnit_copyrightStatement_feature = Copyright Statement
-_UI_MethodConfiguration_methodPluginSelection_feature = Method Plug-in Selection
-_UI_MethodConfiguration_methodPackageSelection_feature = Method Package Selection
-_UI_MethodConfiguration_processViews_feature = Process Views
-_UI_MethodConfiguration_defaultView_feature = Default View
-_UI_MethodConfiguration_baseConfigurations_feature = Base Configurations
-_UI_ProcessFamily_deliveryProcesses_feature = Delivery Processes
-_UI_MethodLibrary_methodPlugins_feature = Method Plug-ins
-_UI_MethodLibrary_predefinedConfigurations_feature = Predefined Configurations
-_UI_Unknown_feature = Unspecified
-
-_UI_WorkOrderType_finishToStart_literal = finishToStart
-_UI_WorkOrderType_finishToFinish_literal = finishToFinish
-_UI_WorkOrderType_startToStart_literal = startToStart
-_UI_WorkOrderType_startToFinish_literal = startToFinish
-_UI_PseudoStateKind_initial_literal = initial
-_UI_PseudoStateKind_join_literal = join
-_UI_PseudoStateKind_fork_literal = fork
-_UI_PseudoStateKind_junction_literal = junction
-_UI_PseudoStateKind_choice_literal = choice
-_UI_PseudoStateKind_entryPoint_literal = entryPoint
-_UI_PseudoStateKind_exitPoint_literal = exitPoint
-_UI_PseudoStateKind_terminate_literal = terminate
-_UI_VariabilityType_na_literal = na
-_UI_VariabilityType_contributes_literal = contributes
-_UI_VariabilityType_extends_literal = extends
-_UI_VariabilityType_replaces_literal = replaces
-_UI_VariabilityType_localContribution_literal = localContribution
-_UI_VariabilityType_localReplacement_literal = localReplacement
-_UI_ArtifactDescriptor_type = Artifact Descriptor
-_UI_DeliverableDescriptor_type = Deliverable Descriptor
-_UI_OutcomeDescriptor_type = Outcome Descriptor
-_UI_MethodElementProperty_type = Method Element Property
-_UI_MethodElement_methodElementProperty_feature = Method Element Property
-_UI_MethodElementProperty_value_feature = Value
-_UI_MethodConfiguration_subtractedCategory_feature = Subtracted Category
-_UI_MethodConfiguration_addedCategory_feature = Added Category
-_UI_VariabilityType_extendsReplaces_literal = extendsReplaces
diff --git a/plugins/org.eclipse.epf.uma.edit/plugin.xml b/plugins/org.eclipse.epf.uma.edit/plugin.xml
deleted file mode 100755
index b4f7689..0000000
--- a/plugins/org.eclipse.epf.uma.edit/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-    
-  <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-    <factory 
-       uri = "http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" 
-       class = "org.eclipse.epf.uma.provider.UmaItemProviderAdapterFactory" 
-       supportedTypes = 
-         "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-          org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-          org.eclipse.emf.edit.provider.ITreeItemContentProvider
-          org.eclipse.emf.edit.provider.IItemLabelProvider
-          org.eclipse.emf.edit.provider.IItemPropertySource" />
-  </extension>
-
-</plugin>
-
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/edit/command/MethodElementCreateCopyCommand.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/edit/command/MethodElementCreateCopyCommand.java
deleted file mode 100755
index 0d79ee3..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/edit/command/MethodElementCreateCopyCommand.java
+++ /dev/null
@@ -1,63 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.edit.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.CreateCopyCommand;
-import org.eclipse.emf.edit.command.CopyCommand.Helper;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.epf.uma.edit.domain.TraceableAdapterFactoryEditingDomain;
-
-/**
- * A command that creates an uninitialized copy of a method element. The
- * necessary initialization will be executed using
- * {@link MethodElementInitializeCopyCommand}.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MethodElementCreateCopyCommand extends CreateCopyCommand {
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param domain
-	 *            the editing domain
-	 * @param owner
-	 *            the object being copied
-	 * @param copyHelper
-	 *            a helper class that is used to keep track of copied objects
-	 *            and their associated copies
-	 */
-	public MethodElementCreateCopyCommand(EditingDomain domain, EObject owner,
-			Helper copyHelper) {
-		super(domain, owner, copyHelper);
-	}
-
-	/**
-	 * Gets the result of the copy operation.
-	 * 
-	 * @return a collection containing the copied method element.
-	 */
-	public Collection doGetResult() {
-		Collection collection = super.doGetResult();
-
-		if (domain instanceof TraceableAdapterFactoryEditingDomain) {
-			((TraceableAdapterFactoryEditingDomain) domain).addCopyInfo(
-					collection, copyHelper);
-		}
-
-		return collection;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/edit/command/MethodElementInitializeCopyCommand.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/edit/command/MethodElementInitializeCopyCommand.java
deleted file mode 100755
index 91a3217..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/edit/command/MethodElementInitializeCopyCommand.java
+++ /dev/null
@@ -1,156 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.edit.command;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.InitializeCopyCommand;
-import org.eclipse.emf.edit.command.CopyCommand.Helper;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.ecore.util.OppositeFeature;
-import org.eclipse.epf.uma.provider.UmaEditPlugin;
-import org.eclipse.epf.uma.util.UmaUtil;
-
-/**
- * A command that takes an uninitialized copy of a method element and sets a new
- * GUID. If the original element is a <code>ContentElement</code> with a valid
- * <code>ContentDescription</code>, a copy of the
- * <code>ContentDescription</code> is also created.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MethodElementInitializeCopyCommand extends InitializeCopyCommand {
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param domain
-	 *            the editing domain
-	 * @param owner
-	 *            the object being copied
-	 * @param copyHelper
-	 *            a helper class that is used to keep track of copied objects
-	 *            and their associated copies
-	 */
-	public MethodElementInitializeCopyCommand(EditingDomain domain,
-			EObject owner, Helper copyHelper) {
-		super(domain, owner, copyHelper);
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.command.InitializeCopyCommand#doExecute()
-	 */
-	public void doExecute() {
-		super.doExecute();
-
-		// generate new GUID for the copy
-		//
-		if (copy instanceof MethodElement) {
-			MethodElement e = ((MethodElement) copy);
-			if (e instanceof ContentDescription) {
-				EObject eContainer = e.eContainer();
-				if (eContainer instanceof MethodElement) {
-					e.setGuid(UmaUtil.generateGUID(((MethodElement) eContainer)
-							.getGuid()));
-				} else {
-					e.setGuid(UmaUtil.generateGUID());
-					UmaEditPlugin.INSTANCE
-							.log("MethodElementInitializeCopyCommand: eContainer not initialized for " + e); //$NON-NLS-1$
-				}
-			} else {
-				e.setGuid(UmaUtil.generateGUID());
-			}
-		}
-	}
-
-	/**
-	 * Iterates over the references of the owner object and sets them
-	 * accordingly in the copy. Includes coping of opposite features.
-	 */
-	private void doCopyReferences() {
-		if (owner instanceof ContentDescription) {
-			super.copyReferences();
-			return;
-		}
-		for (Iterator references = getReferencesToCopy().iterator(); references
-				.hasNext();) {
-			EReference reference = (EReference) references.next();
-			if (!reference.isChangeable() || reference.isDerived()) {
-				continue;
-			}
-
-			EReference reverseReference = reference.getEOpposite();
-
-			Object value = owner.eGet(reference);
-			if (value == null) {
-				continue;
-			}
-
-			OppositeFeature oppositeFeature = OppositeFeature
-					.getOppositeFeature(reference);
-			boolean copiedTargetRequired = reverseReference != null
-					|| reference.isContainment()
-					|| (oppositeFeature != null && !oppositeFeature.isMany());
-			// "many" opposite feature does not require copied target, it is
-			// treated as a regular non-containment reference
-			// TODO: bidirectional relationships are not automatically copied in
-			// EMF implementation
-			if (reference.isMany()) {
-				List valueList = (List) value;
-				if (!valueList.isEmpty()) {
-					EList copyList = (EList) copy.eGet(reference);
-					int index = 0;
-					for (Iterator valueIter = valueList.iterator(); valueIter
-							.hasNext(); ++index) {
-						EObject object = null;
-						try {
-							object = (EObject) valueIter.next();
-						} catch (Exception e) {
-							UmaEditPlugin.INSTANCE.log(e);
-						}
-						EObject target = copyHelper.getCopyTarget(object,
-								copiedTargetRequired);
-						if (target == null)
-							break; // if one is null, they'll all be null
-						if (reverseReference != null) {
-							int position = copyList.indexOf(target);
-							if (position == -1) {
-								copyList.add(index, target);
-							} else {
-								copyList.move(index, target);
-							}
-						} else {
-							copyList.add(target);
-						}
-					}
-				}
-			} else {
-				EObject target = copyHelper.getCopyTarget((EObject) value,
-						copiedTargetRequired);
-				if (target != null) {
-					copy.eSet(reference, target);
-				}
-			}
-		}
-	}
-
-	protected void copyReferences() {
-		doCopyReferences();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/edit/command/package.html b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/edit/command/package.html
deleted file mode 100755
index 701eb8a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/edit/command/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides commands for copying the UMA model objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/edit/domain/TraceableAdapterFactoryEditingDomain.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/edit/domain/TraceableAdapterFactoryEditingDomain.java
deleted file mode 100755
index d861c7a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/edit/domain/TraceableAdapterFactoryEditingDomain.java
+++ /dev/null
@@ -1,205 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.edit.domain;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.command.CopyCommand.Helper;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.epf.uma.MethodElement;
-
-/**
- * A traceable adapter factory editing domain used for copying method elements.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class TraceableAdapterFactoryEditingDomain extends
-		AdapterFactoryEditingDomain {
-
-	// Maps copied method elements to their original counterparts.
-	// Note: Copied elements are copies of the clipboard copies.
-	private HashMap copyToOriginalMap = null;
-
-	// Maps original elements to their clipboard copies.
-	private Map originalToClipboardMap = null;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param adapterFactory
-	 *            an adapter factory used to create the adapter to which calls
-	 *            are delegated
-	 * @param commandStack
-	 *            a command stack
-	 */
-	public TraceableAdapterFactoryEditingDomain(AdapterFactory adapterFactory,
-			CommandStack commandStack) {
-		super(adapterFactory, commandStack);
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param adapterFactory
-	 *            an adapter factory used to create the adapter to which calls
-	 *            are delegated
-	 * @param commandStack
-	 *            a command stack
-	 * @param resourceToReadOnlyMap
-	 *            controls whether the domain is read only
-	 */
-	public TraceableAdapterFactoryEditingDomain(AdapterFactory adapterFactory,
-			CommandStack commandStack, Map resourceToReadOnlyMap) {
-		super(adapterFactory, commandStack, resourceToReadOnlyMap);
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param adapterFactory
-	 *            an adapter factory used to create the adapter to which calls
-	 *            are delegated
-	 * @param commandStack
-	 *            a command stack
-	 * @param resourceSet
-	 *            a resource set
-	 */
-	public TraceableAdapterFactoryEditingDomain(AdapterFactory adapterFactory,
-			CommandStack commandStack, ResourceSet resourceSet) {
-		super(adapterFactory, commandStack, resourceSet);
-	}
-
-	/**
-	 * Returns a map containing the copied elements mapped to their original
-	 * counterparts.
-	 * 
-	 * @return a map containing the copied elements mapped to their original
-	 *         counterparts
-	 */
-	public Map getCopyToOriginalMap() {
-		if (copyToOriginalMap == null) {
-			copyToOriginalMap = new HashMap();
-		}
-		return copyToOriginalMap;
-	}
-	
-	
-	/**
-	 * Returns a map containing the original elements mapped to their copied 
-	 * counterparts on clipboard
-	 * 
-	 * @return a map containing the original elements mapped to their copied 
-	 *         counterparts
-	 */
-	public Map getOriginalToClipboardMap() {
-		if (originalToClipboardMap == null) {
-			originalToClipboardMap = new HashMap();
-		}
-		return originalToClipboardMap;
-	}
-
-	/**
-	 * Used by the CreateCopyCommand. Adds infomation to construct maps that
-	 * keep track of the original method elements and their copies.
-	 * 
-	 * @param c
-	 *            a collection to store the mapping info
-	 * @param copyHelper
-	 *            a helper class that is used to keep track of copied objects
-	 *            and their associated copies
-	 */
-	public void addCopyInfo(Collection c, Helper copyHelper) {
-		if (isNewCopy(c, copyHelper)) {
-			addNewCopy(c, copyHelper);
-			return;
-		} else {
-			chainCopy(c, copyHelper);
-			return;
-		}
-	}
-
-	/**
-	 * Adds a new element that is being copied to the clipboard.
-	 */
-	private void addNewCopy(Collection c, Helper copyHelper) {
-		// this means we are copying the Collection c to the clipboard
-		if (originalToClipboardMap == null)
-			originalToClipboardMap = new HashMap();
-		Iterator iter = copyHelper.keySet().iterator();
-		while (iter.hasNext()) {
-			Object key = iter.next();
-			Object value = copyHelper.get(key);
-			originalToClipboardMap.put(key, value);
-		}
-	}
-
-	/**
-	 * Creates a map from the copied elements to their original counterparts.
-	 */
-	private void chainCopy(Collection c, Helper copyHelper) {
-		// chain the maps - change the copyToOriginalMap
-		if (originalToClipboardMap != null) {
-			if (copyToOriginalMap == null)
-				copyToOriginalMap = new HashMap();
-			Iterator iter = originalToClipboardMap.keySet().iterator();
-			while (iter.hasNext()) {
-				Object o2CKey = iter.next();
-				Object o2CValue = originalToClipboardMap.get(o2CKey);
-				Object copyValue = copyHelper.get(o2CValue);
-				if (copyValue == null) {
-					// error
-					continue;
-				}
-				if (o2CKey instanceof MethodElement)
-					copyToOriginalMap.put(copyValue, o2CKey);
-			}
-		}
-	}
-
-	private boolean isNewCopy(Collection c, Helper copyHelper) {
-		// originalToClipboardMap was set to null at start of copy command
-		if (originalToClipboardMap == null)
-			return true;
-
-		// iterate through copyHelper map, see if any copyHelper keys are o2C
-		// values, which means we are copying clipboard
-		Iterator iter = copyHelper.keySet().iterator();
-		while (iter.hasNext()) {
-			Object clipKey = iter.next();
-			if (!originalToClipboardMap.containsValue(clipKey))
-				return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Initializes the copy maps. It should be called within the copy action.
-	 */
-	public void resetCopyMaps() {
-		if (originalToClipboardMap != null) {
-			originalToClipboardMap.clear();
-			originalToClipboardMap = null;
-		}
-		if (copyToOriginalMap != null) {
-			copyToOriginalMap.clear();
-			copyToOriginalMap = null;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/edit/domain/package.html b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/edit/domain/package.html
deleted file mode 100755
index e29ea73..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/edit/domain/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the default editing domain for the UMA model objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ActivityDescriptionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ActivityDescriptionItemProvider.java
deleted file mode 100755
index ac159ad..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ActivityDescriptionItemProvider.java
+++ /dev/null
@@ -1,193 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.ActivityDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ActivityDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ActivityDescriptionItemProvider extends
-		BreakdownElementDescriptionItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivityDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addPurposePropertyDescriptor(object);
-			addAlternativesPropertyDescriptor(object);
-			addHowtoStaffPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Purpose feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPurposePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ActivityDescription_purpose_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ActivityDescription_purpose_feature", "_UI_ActivityDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ACTIVITY_DESCRIPTION__PURPOSE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Alternatives feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAlternativesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ActivityDescription_alternatives_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ActivityDescription_alternatives_feature", "_UI_ActivityDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ACTIVITY_DESCRIPTION__ALTERNATIVES,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Howto Staff feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addHowtoStaffPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ActivityDescription_howtoStaff_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ActivityDescription_howtoStaff_feature", "_UI_ActivityDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ACTIVITY_DESCRIPTION__HOWTO_STAFF,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns ActivityDescription.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ActivityDescription")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ActivityDescription) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ActivityDescription_type") : //$NON-NLS-1$
-				getString("_UI_ActivityDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ActivityDescription.class)) {
-		case UmaPackage.ACTIVITY_DESCRIPTION__PURPOSE:
-		case UmaPackage.ACTIVITY_DESCRIPTION__ALTERNATIVES:
-		case UmaPackage.ACTIVITY_DESCRIPTION__HOWTO_STAFF:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ActivityItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ActivityItemProvider.java
deleted file mode 100755
index 4b5cd89..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ActivityItemProvider.java
+++ /dev/null
@@ -1,419 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Activity} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ActivityItemProvider extends WorkBreakdownElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivityItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addVariabilityTypePropertyDescriptor(object);
-			addVariabilityBasedOnElementPropertyDescriptor(object);
-			addBreakdownElementsPropertyDescriptor(object);
-			addRoadmapsPropertyDescriptor(object);
-			addSupportingMaterialsPropertyDescriptor(object);
-			addChecklistsPropertyDescriptor(object);
-			addConceptsPropertyDescriptor(object);
-			addExamplesPropertyDescriptor(object);
-			addGuidelinesPropertyDescriptor(object);
-			addReusableAssetsPropertyDescriptor(object);
-			addIsEnactablePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Variability Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addVariabilityTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_VariabilityElement_variabilityType_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_VariabilityElement_variabilityType_feature", "_UI_VariabilityElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.VARIABILITY_ELEMENT__VARIABILITY_TYPE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Variability Based On Element feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addVariabilityBasedOnElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_VariabilityElement_variabilityBasedOnElement_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_VariabilityElement_variabilityBasedOnElement_feature", "_UI_VariabilityElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Checklists feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addChecklistsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Activity_checklists_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Activity_checklists_feature", "_UI_Activity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ACTIVITY__CHECKLISTS, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Concepts feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addConceptsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Activity_concepts_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Activity_concepts_feature", "_UI_Activity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ACTIVITY__CONCEPTS, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Examples feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addExamplesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Activity_examples_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Activity_examples_feature", "_UI_Activity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ACTIVITY__EXAMPLES, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Guidelines feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addGuidelinesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Activity_guidelines_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Activity_guidelines_feature", "_UI_Activity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ACTIVITY__GUIDELINES, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Reusable Assets feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addReusableAssetsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Activity_reusableAssets_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Activity_reusableAssets_feature", "_UI_Activity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ACTIVITY__REUSABLE_ASSETS, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Is Enactable feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIsEnactablePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Activity_isEnactable_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Activity_isEnactable_feature", "_UI_Activity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ACTIVITY__IS_ENACTABLE, true,
-						false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.WORK_DEFINITION__PRECONDITION);
-			childrenFeatures
-					.add(UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This adds a property descriptor for the Breakdown Elements feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBreakdownElementsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Activity_breakdownElements_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Activity_breakdownElements_feature", "_UI_Activity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ACTIVITY__BREAKDOWN_ELEMENTS, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Roadmaps feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRoadmapsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Activity_roadmaps_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Activity_roadmaps_feature", "_UI_Activity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ACTIVITY__ROADMAPS, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Supporting Materials feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSupportingMaterialsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Activity_supportingMaterials_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Activity_supportingMaterials_feature", "_UI_Activity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ACTIVITY__SUPPORTING_MATERIALS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns Activity.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Activity")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Activity) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Activity_type") : //$NON-NLS-1$
-				getString("_UI_Activity_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Activity.class)) {
-		case UmaPackage.ACTIVITY__VARIABILITY_TYPE:
-		case UmaPackage.ACTIVITY__IS_ENACTABLE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		case UmaPackage.ACTIVITY__PRECONDITION:
-		case UmaPackage.ACTIVITY__POSTCONDITION:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.WORK_DEFINITION__PRECONDITION,
-				UmaFactory.eINSTANCE.createConstraint()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION,
-				UmaFactory.eINSTANCE.createConstraint()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.METHOD_ELEMENT__OWNED_RULES
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__PRECONDITION
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ArtifactDescriptionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ArtifactDescriptionItemProvider.java
deleted file mode 100755
index 52e474f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ArtifactDescriptionItemProvider.java
+++ /dev/null
@@ -1,171 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.ArtifactDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ArtifactDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ArtifactDescriptionItemProvider extends
-		WorkProductDescriptionItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ArtifactDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addBriefOutlinePropertyDescriptor(object);
-			addRepresentationOptionsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Brief Outline feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBriefOutlinePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ArtifactDescription_briefOutline_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ArtifactDescription_briefOutline_feature", "_UI_ArtifactDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ARTIFACT_DESCRIPTION__BRIEF_OUTLINE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Representation Options feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRepresentationOptionsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ArtifactDescription_representationOptions_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ArtifactDescription_representationOptions_feature", "_UI_ArtifactDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns ArtifactDescription.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ArtifactDescription")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ArtifactDescription) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ArtifactDescription_type") : //$NON-NLS-1$
-				getString("_UI_ArtifactDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ArtifactDescription.class)) {
-		case UmaPackage.ARTIFACT_DESCRIPTION__BRIEF_OUTLINE:
-		case UmaPackage.ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ArtifactItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ArtifactItemProvider.java
deleted file mode 100755
index 7389fa7..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ArtifactItemProvider.java
+++ /dev/null
@@ -1,147 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Artifact;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Artifact} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ArtifactItemProvider extends WorkProductItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ArtifactItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.ARTIFACT__CONTAINED_ARTIFACTS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns Artifact.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Artifact")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Artifact) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Artifact_type") : //$NON-NLS-1$
-				getString("_UI_Artifact_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Artifact.class)) {
-		case UmaPackage.ARTIFACT__CONTAINED_ARTIFACTS:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.ARTIFACT__CONTAINED_ARTIFACTS,
-				UmaFactory.eINSTANCE.createArtifact()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/BreakdownElementDescriptionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/BreakdownElementDescriptionItemProvider.java
deleted file mode 100755
index f0a782f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/BreakdownElementDescriptionItemProvider.java
+++ /dev/null
@@ -1,149 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.BreakdownElementDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.BreakdownElementDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BreakdownElementDescriptionItemProvider extends
-		ContentDescriptionItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider,
-		IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BreakdownElementDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addUsageGuidancePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Usage Guidance feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addUsageGuidancePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_BreakdownElementDescription_usageGuidance_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_BreakdownElementDescription_usageGuidance_feature", "_UI_BreakdownElementDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns BreakdownElementDescription.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/BreakdownElementDescription")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((BreakdownElementDescription) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_BreakdownElementDescription_type") : //$NON-NLS-1$
-				getString("_UI_BreakdownElementDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(BreakdownElementDescription.class)) {
-		case UmaPackage.BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/BreakdownElementItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/BreakdownElementItemProvider.java
deleted file mode 100755
index eea0f1b..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/BreakdownElementItemProvider.java
+++ /dev/null
@@ -1,300 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.BreakdownElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BreakdownElementItemProvider extends ProcessElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BreakdownElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addPrefixPropertyDescriptor(object);
-			addIsPlannedPropertyDescriptor(object);
-			addHasMultipleOccurrencesPropertyDescriptor(object);
-			addIsOptionalPropertyDescriptor(object);
-			addPresentedAfterPropertyDescriptor(object);
-			addPresentedBeforePropertyDescriptor(object);
-			addSuperActivitiesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Prefix feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPrefixPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_BreakdownElement_prefix_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_BreakdownElement_prefix_feature", "_UI_BreakdownElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.BREAKDOWN_ELEMENT__PREFIX, true,
-						false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Is Planned feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIsPlannedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_BreakdownElement_isPlanned_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_BreakdownElement_isPlanned_feature", "_UI_BreakdownElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.BREAKDOWN_ELEMENT__IS_PLANNED,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Has Multiple Occurrences feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addHasMultipleOccurrencesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_BreakdownElement_hasMultipleOccurrences_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_BreakdownElement_hasMultipleOccurrences_feature", "_UI_BreakdownElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Is Optional feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIsOptionalPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_BreakdownElement_isOptional_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_BreakdownElement_isOptional_feature", "_UI_BreakdownElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.BREAKDOWN_ELEMENT__IS_OPTIONAL,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Presented After feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPresentedAfterPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_BreakdownElement_presentedAfter_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_BreakdownElement_presentedAfter_feature", "_UI_BreakdownElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.BREAKDOWN_ELEMENT__PRESENTED_AFTER,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Presented Before feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPresentedBeforePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_BreakdownElement_presentedBefore_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_BreakdownElement_presentedBefore_feature", "_UI_BreakdownElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.BREAKDOWN_ELEMENT__PRESENTED_BEFORE,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Super Activities feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSuperActivitiesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_BreakdownElement_superActivities_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_BreakdownElement_superActivities_feature", "_UI_BreakdownElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.BREAKDOWN_ELEMENT__SUPER_ACTIVITIES,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.BREAKDOWN_ELEMENT__PLANNING_DATA);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns BreakdownElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/BreakdownElement")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((BreakdownElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_BreakdownElement_type") : //$NON-NLS-1$
-				getString("_UI_BreakdownElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(BreakdownElement.class)) {
-		case UmaPackage.BREAKDOWN_ELEMENT__PREFIX:
-		case UmaPackage.BREAKDOWN_ELEMENT__IS_PLANNED:
-		case UmaPackage.BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES:
-		case UmaPackage.BREAKDOWN_ELEMENT__IS_OPTIONAL:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		case UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.BREAKDOWN_ELEMENT__PLANNING_DATA,
-				UmaFactory.eINSTANCE.createPlanningData()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/CapabilityPatternItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/CapabilityPatternItemProvider.java
deleted file mode 100755
index 401bd66..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/CapabilityPatternItemProvider.java
+++ /dev/null
@@ -1,140 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.CapabilityPattern} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CapabilityPatternItemProvider extends ProcessItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CapabilityPatternItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns CapabilityPattern.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/CapabilityPattern")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((CapabilityPattern) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_CapabilityPattern_type") : //$NON-NLS-1$
-				getString("_UI_CapabilityPattern_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.METHOD_ELEMENT__OWNED_RULES
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__PRECONDITION
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ChecklistItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ChecklistItemProvider.java
deleted file mode 100755
index ee33920..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ChecklistItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Checklist;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Checklist} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ChecklistItemProvider extends GuidanceItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChecklistItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Checklist.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Checklist")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Checklist) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Checklist_type") : //$NON-NLS-1$
-				getString("_UI_Checklist_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ClassifierItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ClassifierItemProvider.java
deleted file mode 100755
index c4dca56..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ClassifierItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Classifier;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Classifier} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ClassifierItemProvider extends TypeItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ClassifierItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Classifier.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Classifier")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Classifier) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Classifier_type") : //$NON-NLS-1$
-				getString("_UI_Classifier_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/CompositeRoleItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/CompositeRoleItemProvider.java
deleted file mode 100755
index ec32f0c..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/CompositeRoleItemProvider.java
+++ /dev/null
@@ -1,138 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.CompositeRole;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.CompositeRole} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CompositeRoleItemProvider extends RoleDescriptorItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CompositeRoleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAggregatedRolesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Aggregated Roles feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAggregatedRolesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_CompositeRole_aggregatedRoles_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_CompositeRole_aggregatedRoles_feature", "_UI_CompositeRole_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.COMPOSITE_ROLE__AGGREGATED_ROLES,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns CompositeRole.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/CompositeRole")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((CompositeRole) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_CompositeRole_type") : //$NON-NLS-1$
-				getString("_UI_CompositeRole_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ConceptItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ConceptItemProvider.java
deleted file mode 100755
index 7c1842a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ConceptItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Concept;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Concept} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConceptItemProvider extends GuidanceItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConceptItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Concept.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Concept")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Concept) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Concept_type") : //$NON-NLS-1$
-				getString("_UI_Concept_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ConstraintItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ConstraintItemProvider.java
deleted file mode 100755
index 2de46c8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ConstraintItemProvider.java
+++ /dev/null
@@ -1,148 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Constraint;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Constraint} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConstraintItemProvider extends MethodElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConstraintItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addBodyPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Body feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBodyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Constraint_body_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Constraint_body_feature", "_UI_Constraint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.CONSTRAINT__BODY, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This returns Constraint.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Constraint")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Constraint) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Constraint_type") : //$NON-NLS-1$
-				getString("_UI_Constraint_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Constraint.class)) {
-		case UmaPackage.CONSTRAINT__BODY:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ContentCategoryItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ContentCategoryItemProvider.java
deleted file mode 100755
index 673f38c..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ContentCategoryItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.ContentCategory;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ContentCategory} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ContentCategoryItemProvider extends ContentElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContentCategoryItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns ContentCategory.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ContentCategory")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ContentCategory) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ContentCategory_type") : //$NON-NLS-1$
-				getString("_UI_ContentCategory_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ContentDescriptionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ContentDescriptionItemProvider.java
deleted file mode 100755
index 2d6fe3a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ContentDescriptionItemProvider.java
+++ /dev/null
@@ -1,200 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ContentDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ContentDescriptionItemProvider extends MethodUnitItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContentDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addMainDescriptionPropertyDescriptor(object);
-			addKeyConsiderationsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Main Description feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMainDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ContentDescription_mainDescription_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ContentDescription_mainDescription_feature", "_UI_ContentDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.CONTENT_DESCRIPTION__MAIN_DESCRIPTION,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Key Considerations feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addKeyConsiderationsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ContentDescription_keyConsiderations_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ContentDescription_keyConsiderations_feature", "_UI_ContentDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.CONTENT_DESCRIPTION__KEY_CONSIDERATIONS,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.CONTENT_DESCRIPTION__SECTIONS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns ContentDescription.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ContentDescription")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ContentDescription) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ContentDescription_type") : //$NON-NLS-1$
-				getString("_UI_ContentDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ContentDescription.class)) {
-		case UmaPackage.CONTENT_DESCRIPTION__MAIN_DESCRIPTION:
-		case UmaPackage.CONTENT_DESCRIPTION__KEY_CONSIDERATIONS:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		case UmaPackage.CONTENT_DESCRIPTION__SECTIONS:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_DESCRIPTION__SECTIONS,
-				UmaFactory.eINSTANCE.createSection()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_DESCRIPTION__SECTIONS,
-				UmaFactory.eINSTANCE.createStep()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ContentElementItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ContentElementItemProvider.java
deleted file mode 100755
index 30d096f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ContentElementItemProvider.java
+++ /dev/null
@@ -1,288 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ContentElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ContentElementItemProvider extends DescribableElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContentElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addVariabilityTypePropertyDescriptor(object);
-			addVariabilityBasedOnElementPropertyDescriptor(object);
-			addSupportingMaterialsPropertyDescriptor(object);
-			addConceptsAndPapersPropertyDescriptor(object);
-			addChecklistsPropertyDescriptor(object);
-			addGuidelinesPropertyDescriptor(object);
-			addExamplesPropertyDescriptor(object);
-			addAssetsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Variability Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addVariabilityTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_VariabilityElement_variabilityType_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_VariabilityElement_variabilityType_feature", "_UI_VariabilityElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.VARIABILITY_ELEMENT__VARIABILITY_TYPE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Variability Based On Element feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addVariabilityBasedOnElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_VariabilityElement_variabilityBasedOnElement_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_VariabilityElement_variabilityBasedOnElement_feature", "_UI_VariabilityElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Concepts And Papers feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addConceptsAndPapersPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ContentElement_conceptsAndPapers_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ContentElement_conceptsAndPapers_feature", "_UI_ContentElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.CONTENT_ELEMENT__CONCEPTS_AND_PAPERS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Checklists feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addChecklistsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ContentElement_checklists_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ContentElement_checklists_feature", "_UI_ContentElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.CONTENT_ELEMENT__CHECKLISTS, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Guidelines feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addGuidelinesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ContentElement_guidelines_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ContentElement_guidelines_feature", "_UI_ContentElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.CONTENT_ELEMENT__GUIDELINES, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Examples feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addExamplesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ContentElement_examples_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ContentElement_examples_feature", "_UI_ContentElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.CONTENT_ELEMENT__EXAMPLES, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Assets feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAssetsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ContentElement_assets_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ContentElement_assets_feature", "_UI_ContentElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.CONTENT_ELEMENT__ASSETS, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Supporting Materials feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSupportingMaterialsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ContentElement_supportingMaterials_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ContentElement_supportingMaterials_feature", "_UI_ContentElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.CONTENT_ELEMENT__SUPPORTING_MATERIALS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns ContentElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ContentElement")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ContentElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ContentElement_type") : //$NON-NLS-1$
-				getString("_UI_ContentElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ContentElement.class)) {
-		case UmaPackage.CONTENT_ELEMENT__VARIABILITY_TYPE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ContentPackageItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ContentPackageItemProvider.java
deleted file mode 100755
index ddc2578..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ContentPackageItemProvider.java
+++ /dev/null
@@ -1,251 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ContentPackage} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ContentPackageItemProvider extends MethodPackageItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContentPackageItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns ContentPackage.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ContentPackage")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ContentPackage) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ContentPackage_type") : //$NON-NLS-1$
-				getString("_UI_ContentPackage_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ContentPackage.class)) {
-		case UmaPackage.CONTENT_PACKAGE__CONTENT_ELEMENTS:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createRole()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createTask()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createArtifact()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createDeliverable()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createOutcome()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createConcept()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createChecklist()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createExample()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createGuideline()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createReport()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createTemplate()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createSupportingMaterial()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createToolMentor()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createWhitepaper()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createTermDefinition()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createPractice()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createEstimationConsiderations()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createReusableAsset()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createDiscipline()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createRoleSet()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createDomain()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createWorkProductType()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createDisciplineGrouping()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createTool()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createRoleSetGrouping()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createCustomCategory()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENTS,
-				UmaFactory.eINSTANCE.createRoadmap()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/CoreSemanticModelBridgeItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/CoreSemanticModelBridgeItemProvider.java
deleted file mode 100755
index 6149e01..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/CoreSemanticModelBridgeItemProvider.java
+++ /dev/null
@@ -1,139 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.CoreSemanticModelBridge;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.CoreSemanticModelBridge} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CoreSemanticModelBridgeItemProvider extends
-		SemanticModelBridgeItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider,
-		IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CoreSemanticModelBridgeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addElementPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Element feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_CoreSemanticModelBridge_element_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_CoreSemanticModelBridge_element_feature", "_UI_CoreSemanticModelBridge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.CORE_SEMANTIC_MODEL_BRIDGE__ELEMENT,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns CoreSemanticModelBridge.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/CoreSemanticModelBridge")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((CoreSemanticModelBridge) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_CoreSemanticModelBridge_type") : //$NON-NLS-1$
-				getString("_UI_CoreSemanticModelBridge_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/CustomCategoryItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/CustomCategoryItemProvider.java
deleted file mode 100755
index 6a786e5..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/CustomCategoryItemProvider.java
+++ /dev/null
@@ -1,158 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.CustomCategory} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CustomCategoryItemProvider extends ContentCategoryItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomCategoryItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addCategorizedElementsPropertyDescriptor(object);
-			addSubCategoriesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Categorized Elements feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCategorizedElementsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_CustomCategory_categorizedElements_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_CustomCategory_categorizedElements_feature", "_UI_CustomCategory_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.CUSTOM_CATEGORY__CATEGORIZED_ELEMENTS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Sub Categories feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSubCategoriesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_CustomCategory_subCategories_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_CustomCategory_subCategories_feature", "_UI_CustomCategory_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.CUSTOM_CATEGORY__SUB_CATEGORIES,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns CustomCategory.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/CustomCategory")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((CustomCategory) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_CustomCategory_type") : //$NON-NLS-1$
-				getString("_UI_CustomCategory_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DeliverableDescriptionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DeliverableDescriptionItemProvider.java
deleted file mode 100755
index 4094f56..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DeliverableDescriptionItemProvider.java
+++ /dev/null
@@ -1,171 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.DeliverableDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.DeliverableDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DeliverableDescriptionItemProvider extends
-		WorkProductDescriptionItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DeliverableDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addExternalDescriptionPropertyDescriptor(object);
-			addPackagingGuidancePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the External Description feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addExternalDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DeliverableDescription_externalDescription_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DeliverableDescription_externalDescription_feature", "_UI_DeliverableDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Packaging Guidance feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPackagingGuidancePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DeliverableDescription_packagingGuidance_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DeliverableDescription_packagingGuidance_feature", "_UI_DeliverableDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns DeliverableDescription.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/DeliverableDescription")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((DeliverableDescription) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_DeliverableDescription_type") : //$NON-NLS-1$
-				getString("_UI_DeliverableDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(DeliverableDescription.class)) {
-		case UmaPackage.DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION:
-		case UmaPackage.DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DeliverableItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DeliverableItemProvider.java
deleted file mode 100755
index 96e4d01..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DeliverableItemProvider.java
+++ /dev/null
@@ -1,138 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Deliverable;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Deliverable} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DeliverableItemProvider extends WorkProductItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DeliverableItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDeliveredWorkProductsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Delivered Work Products feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDeliveredWorkProductsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Deliverable_deliveredWorkProducts_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Deliverable_deliveredWorkProducts_feature", "_UI_Deliverable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DELIVERABLE__DELIVERED_WORK_PRODUCTS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns Deliverable.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Deliverable")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Deliverable) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Deliverable_type") : //$NON-NLS-1$
-				getString("_UI_Deliverable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DeliveryProcessDescriptionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DeliveryProcessDescriptionItemProvider.java
deleted file mode 100755
index 8ad07b4..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DeliveryProcessDescriptionItemProvider.java
+++ /dev/null
@@ -1,259 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.DeliveryProcessDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.DeliveryProcessDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DeliveryProcessDescriptionItemProvider extends
-		ProcessDescriptionItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider,
-		IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DeliveryProcessDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addScalePropertyDescriptor(object);
-			addProjectCharacteristicsPropertyDescriptor(object);
-			addRiskLevelPropertyDescriptor(object);
-			addEstimatingTechniquePropertyDescriptor(object);
-			addProjectMemberExpertisePropertyDescriptor(object);
-			addTypeOfContractPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Scale feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addScalePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DeliveryProcessDescription_scale_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DeliveryProcessDescription_scale_feature", "_UI_DeliveryProcessDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DELIVERY_PROCESS_DESCRIPTION__SCALE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Project Characteristics feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProjectCharacteristicsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DeliveryProcessDescription_projectCharacteristics_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DeliveryProcessDescription_projectCharacteristics_feature", "_UI_DeliveryProcessDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Risk Level feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRiskLevelPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DeliveryProcessDescription_riskLevel_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DeliveryProcessDescription_riskLevel_feature", "_UI_DeliveryProcessDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Estimating Technique feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addEstimatingTechniquePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DeliveryProcessDescription_estimatingTechnique_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DeliveryProcessDescription_estimatingTechnique_feature", "_UI_DeliveryProcessDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Project Member Expertise feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProjectMemberExpertisePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DeliveryProcessDescription_projectMemberExpertise_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DeliveryProcessDescription_projectMemberExpertise_feature", "_UI_DeliveryProcessDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Type Of Contract feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTypeOfContractPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DeliveryProcessDescription_typeOfContract_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DeliveryProcessDescription_typeOfContract_feature", "_UI_DeliveryProcessDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns DeliveryProcessDescription.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/DeliveryProcessDescription")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((DeliveryProcessDescription) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_DeliveryProcessDescription_type") : //$NON-NLS-1$
-				getString("_UI_DeliveryProcessDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(DeliveryProcessDescription.class)) {
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__SCALE:
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS:
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL:
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE:
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE:
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DeliveryProcessItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DeliveryProcessItemProvider.java
deleted file mode 100755
index 0524be1..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DeliveryProcessItemProvider.java
+++ /dev/null
@@ -1,181 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.DeliveryProcess} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DeliveryProcessItemProvider extends ProcessItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DeliveryProcessItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addEducationMaterialsPropertyDescriptor(object);
-			addCommunicationsMaterialsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Education Materials feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addEducationMaterialsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DeliveryProcess_educationMaterials_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DeliveryProcess_educationMaterials_feature", "_UI_DeliveryProcess_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DELIVERY_PROCESS__EDUCATION_MATERIALS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Communications Materials feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCommunicationsMaterialsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DeliveryProcess_communicationsMaterials_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DeliveryProcess_communicationsMaterials_feature", "_UI_DeliveryProcess_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DELIVERY_PROCESS__COMMUNICATIONS_MATERIALS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns DeliveryProcess.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/DeliveryProcess")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((DeliveryProcess) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_DeliveryProcess_type") : //$NON-NLS-1$
-				getString("_UI_DeliveryProcess_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.METHOD_ELEMENT__OWNED_RULES
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__PRECONDITION
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DescribableElementItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DescribableElementItemProvider.java
deleted file mode 100755
index 2150b8b..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DescribableElementItemProvider.java
+++ /dev/null
@@ -1,266 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.DescribableElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DescribableElementItemProvider extends MethodElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DescribableElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addPresentationNamePropertyDescriptor(object);
-			addShapeiconPropertyDescriptor(object);
-			addNodeiconPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Presentation Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPresentationNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DescribableElement_presentationName_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DescribableElement_presentationName_feature", "_UI_DescribableElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DESCRIBABLE_ELEMENT__PRESENTATION_NAME,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Shapeicon feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addShapeiconPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DescribableElement_shapeicon_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DescribableElement_shapeicon_feature", "_UI_DescribableElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DESCRIBABLE_ELEMENT__SHAPEICON,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Nodeicon feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNodeiconPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DescribableElement_nodeicon_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DescribableElement_nodeicon_feature", "_UI_DescribableElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DESCRIBABLE_ELEMENT__NODEICON,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.DESCRIBABLE_ELEMENT__PRESENTATION);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns DescribableElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/DescribableElement")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((DescribableElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_DescribableElement_type") : //$NON-NLS-1$
-				getString("_UI_DescribableElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(DescribableElement.class)) {
-		case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION_NAME:
-		case UmaPackage.DESCRIBABLE_ELEMENT__SHAPEICON:
-		case UmaPackage.DESCRIBABLE_ELEMENT__NODEICON:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DESCRIBABLE_ELEMENT__PRESENTATION,
-				UmaFactory.eINSTANCE.createContentDescription()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DESCRIBABLE_ELEMENT__PRESENTATION,
-				UmaFactory.eINSTANCE.createWorkProductDescription()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DESCRIBABLE_ELEMENT__PRESENTATION,
-				UmaFactory.eINSTANCE.createArtifactDescription()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DESCRIBABLE_ELEMENT__PRESENTATION,
-				UmaFactory.eINSTANCE.createDeliverableDescription()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DESCRIBABLE_ELEMENT__PRESENTATION,
-				UmaFactory.eINSTANCE.createRoleDescription()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DESCRIBABLE_ELEMENT__PRESENTATION,
-				UmaFactory.eINSTANCE.createTaskDescription()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DESCRIBABLE_ELEMENT__PRESENTATION,
-				UmaFactory.eINSTANCE.createGuidanceDescription()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DESCRIBABLE_ELEMENT__PRESENTATION,
-				UmaFactory.eINSTANCE.createPracticeDescription()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DESCRIBABLE_ELEMENT__PRESENTATION,
-				UmaFactory.eINSTANCE.createBreakdownElementDescription()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DESCRIBABLE_ELEMENT__PRESENTATION,
-				UmaFactory.eINSTANCE.createActivityDescription()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DESCRIBABLE_ELEMENT__PRESENTATION,
-				UmaFactory.eINSTANCE.createProcessDescription()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DESCRIBABLE_ELEMENT__PRESENTATION,
-				UmaFactory.eINSTANCE.createDeliveryProcessDescription()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DESCRIBABLE_ELEMENT__PRESENTATION,
-				UmaFactory.eINSTANCE.createDescriptorDescription()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DescriptorDescriptionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DescriptorDescriptionItemProvider.java
deleted file mode 100755
index db6bdb6..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DescriptorDescriptionItemProvider.java
+++ /dev/null
@@ -1,149 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.DescriptorDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.DescriptorDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DescriptorDescriptionItemProvider extends
-		BreakdownElementDescriptionItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DescriptorDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addRefinedDescriptionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Refined Description feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRefinedDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DescriptorDescription_refinedDescription_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DescriptorDescription_refinedDescription_feature", "_UI_DescriptorDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns DescriptorDescription.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/DescriptorDescription")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((DescriptorDescription) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_DescriptorDescription_type") : //$NON-NLS-1$
-				getString("_UI_DescriptorDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(DescriptorDescription.class)) {
-		case UmaPackage.DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DescriptorItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DescriptorItemProvider.java
deleted file mode 100755
index d752cc7..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DescriptorItemProvider.java
+++ /dev/null
@@ -1,148 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Descriptor;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Descriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DescriptorItemProvider extends BreakdownElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DescriptorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIsSynchronizedWithSourcePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Is Synchronized With Source feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIsSynchronizedWithSourcePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Descriptor_isSynchronizedWithSource_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Descriptor_isSynchronizedWithSource_feature", "_UI_Descriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns Descriptor.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Descriptor")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Descriptor) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Descriptor_type") : //$NON-NLS-1$
-				getString("_UI_Descriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Descriptor.class)) {
-		case UmaPackage.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DiagramElementItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DiagramElementItemProvider.java
deleted file mode 100755
index beb35a6..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DiagramElementItemProvider.java
+++ /dev/null
@@ -1,193 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.DiagramElement;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.DiagramElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DiagramElementItemProvider extends MethodElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DiagramElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIsVisiblePropertyDescriptor(object);
-			addReferencePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Is Visible feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIsVisiblePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DiagramElement_isVisible_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DiagramElement_isVisible_feature", "_UI_DiagramElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DIAGRAM_ELEMENT__IS_VISIBLE, true,
-						false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Reference feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addReferencePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DiagramElement_reference_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DiagramElement_reference_feature", "_UI_DiagramElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DIAGRAM_ELEMENT__REFERENCE, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(UmaPackage.Literals.DIAGRAM_ELEMENT__PROPERTY);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns DiagramElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/DiagramElement")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((DiagramElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_DiagramElement_type") : //$NON-NLS-1$
-				getString("_UI_DiagramElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(DiagramElement.class)) {
-		case UmaPackage.DIAGRAM_ELEMENT__IS_VISIBLE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		case UmaPackage.DIAGRAM_ELEMENT__PROPERTY:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DIAGRAM_ELEMENT__PROPERTY,
-				UmaFactory.eINSTANCE.createProperty()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DiagramItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DiagramItemProvider.java
deleted file mode 100755
index 2a7110f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DiagramItemProvider.java
+++ /dev/null
@@ -1,247 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Diagram} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DiagramItemProvider extends GraphNodeItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DiagramItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addZoomPropertyDescriptor(object);
-			addDiagramLinkPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Zoom feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addZoomPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Diagram_zoom_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Diagram_zoom_feature", "_UI_Diagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DIAGRAM__ZOOM, true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Diagram Link feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDiagramLinkPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Diagram_diagramLink_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Diagram_diagramLink_feature", "_UI_Diagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DIAGRAM__DIAGRAM_LINK, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(UmaPackage.Literals.DIAGRAM__VIEWPOINT);
-			childrenFeatures.add(UmaPackage.Literals.DIAGRAM__NAMESPACE);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns Diagram.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Diagram")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Diagram) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Diagram_type") : //$NON-NLS-1$
-				getString("_UI_Diagram_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Diagram.class)) {
-		case UmaPackage.DIAGRAM__ZOOM:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		case UmaPackage.DIAGRAM__VIEWPOINT:
-		case UmaPackage.DIAGRAM__NAMESPACE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DIAGRAM__VIEWPOINT, UmaFactory.eINSTANCE
-						.createPoint()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DIAGRAM__NAMESPACE, UmaFactory.eINSTANCE
-						.createSimpleSemanticModelElement()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DIAGRAM__NAMESPACE, UmaFactory.eINSTANCE
-						.createUMASemanticModelBridge()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DIAGRAM__NAMESPACE, UmaFactory.eINSTANCE
-						.createCoreSemanticModelBridge()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.DIAGRAM_ELEMENT__PROPERTY
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__POSITION
-				|| childFeature == UmaPackage.Literals.DIAGRAM__VIEWPOINT
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__LINK
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__ANCHORAGE
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__SEMANTIC_MODEL
-				|| childFeature == UmaPackage.Literals.DIAGRAM__NAMESPACE;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DiagramLinkItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DiagramLinkItemProvider.java
deleted file mode 100755
index bfef7e7..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DiagramLinkItemProvider.java
+++ /dev/null
@@ -1,193 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.DiagramLink;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.DiagramLink} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DiagramLinkItemProvider extends DiagramElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DiagramLinkItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addZoomPropertyDescriptor(object);
-			addDiagramPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Zoom feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addZoomPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DiagramLink_zoom_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DiagramLink_zoom_feature", "_UI_DiagramLink_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DIAGRAM_LINK__ZOOM, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Diagram feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDiagramPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DiagramLink_diagram_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DiagramLink_diagram_feature", "_UI_DiagramLink_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DIAGRAM_LINK__DIAGRAM, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(UmaPackage.Literals.DIAGRAM_LINK__VIEWPORT);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns DiagramLink.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/DiagramLink")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((DiagramLink) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_DiagramLink_type") : //$NON-NLS-1$
-				getString("_UI_DiagramLink_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(DiagramLink.class)) {
-		case UmaPackage.DIAGRAM_LINK__ZOOM:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		case UmaPackage.DIAGRAM_LINK__VIEWPORT:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DIAGRAM_LINK__VIEWPORT,
-				UmaFactory.eINSTANCE.createPoint()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DimensionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DimensionItemProvider.java
deleted file mode 100755
index 8a37e48..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DimensionItemProvider.java
+++ /dev/null
@@ -1,172 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Dimension;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Dimension} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DimensionItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DimensionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addWidthPropertyDescriptor(object);
-			addHeightPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Width feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Dimension_width_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Dimension_width_feature", "_UI_Dimension_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DIMENSION__WIDTH, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Height feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addHeightPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Dimension_height_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Dimension_height_feature", "_UI_Dimension_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DIMENSION__HEIGHT, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This returns Dimension.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Dimension")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		Double labelValue = ((Dimension) object).getWidth();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ? getString("_UI_Dimension_type") : //$NON-NLS-1$
-				getString("_UI_Dimension_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Dimension.class)) {
-		case UmaPackage.DIMENSION__WIDTH:
-		case UmaPackage.DIMENSION__HEIGHT:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DisciplineGroupingItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DisciplineGroupingItemProvider.java
deleted file mode 100755
index 4791e37..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DisciplineGroupingItemProvider.java
+++ /dev/null
@@ -1,138 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.DisciplineGrouping} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DisciplineGroupingItemProvider extends ContentCategoryItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DisciplineGroupingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDisciplinesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Disciplines feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDisciplinesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_DisciplineGrouping_disciplines_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_DisciplineGrouping_disciplines_feature", "_UI_DisciplineGrouping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DISCIPLINE_GROUPING__DISCIPLINES,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns DisciplineGrouping.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/DisciplineGrouping")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((DisciplineGrouping) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_DisciplineGrouping_type") : //$NON-NLS-1$
-				getString("_UI_DisciplineGrouping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DisciplineItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DisciplineItemProvider.java
deleted file mode 100755
index 33d9fe1..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DisciplineItemProvider.java
+++ /dev/null
@@ -1,187 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Discipline} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DisciplineItemProvider extends ContentCategoryItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DisciplineItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addTasksPropertyDescriptor(object);
-			addReferenceWorkflowsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Tasks feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTasksPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Discipline_tasks_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Discipline_tasks_feature", "_UI_Discipline_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DISCIPLINE__TASKS, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Reference Workflows feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addReferenceWorkflowsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Discipline_referenceWorkflows_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Discipline_referenceWorkflows_feature", "_UI_Discipline_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DISCIPLINE__REFERENCE_WORKFLOWS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(UmaPackage.Literals.DISCIPLINE__SUBDISCIPLINE);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns Discipline.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Discipline")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Discipline) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Discipline_type") : //$NON-NLS-1$
-				getString("_UI_Discipline_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Discipline.class)) {
-		case UmaPackage.DISCIPLINE__SUBDISCIPLINE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DISCIPLINE__SUBDISCIPLINE,
-				UmaFactory.eINSTANCE.createDiscipline()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DomainItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DomainItemProvider.java
deleted file mode 100755
index f224055..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/DomainItemProvider.java
+++ /dev/null
@@ -1,167 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Domain} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DomainItemProvider extends ContentCategoryItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DomainItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addWorkProductsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Work Products feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addWorkProductsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Domain_workProducts_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Domain_workProducts_feature", "_UI_Domain_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DOMAIN__WORK_PRODUCTS, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(UmaPackage.Literals.DOMAIN__SUBDOMAINS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns Domain.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Domain")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Domain) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Domain_type") : //$NON-NLS-1$
-				getString("_UI_Domain_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Domain.class)) {
-		case UmaPackage.DOMAIN__SUBDOMAINS:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.DOMAIN__SUBDOMAINS, UmaFactory.eINSTANCE
-						.createDomain()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ElementItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ElementItemProvider.java
deleted file mode 100755
index 5c70405..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ElementItemProvider.java
+++ /dev/null
@@ -1,114 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Element} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ElementItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Element.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Element")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_Element_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/EllipseItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/EllipseItemProvider.java
deleted file mode 100755
index 7c6495d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/EllipseItemProvider.java
+++ /dev/null
@@ -1,261 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Ellipse;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Ellipse} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class EllipseItemProvider extends GraphicPrimitiveItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EllipseItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addRadiusXPropertyDescriptor(object);
-			addRadiusYPropertyDescriptor(object);
-			addRotationPropertyDescriptor(object);
-			addStartAnglePropertyDescriptor(object);
-			addEndAnglePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Radius X feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRadiusXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Ellipse_radiusX_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Ellipse_radiusX_feature", "_UI_Ellipse_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ELLIPSE__RADIUS_X, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Radius Y feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRadiusYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Ellipse_radiusY_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Ellipse_radiusY_feature", "_UI_Ellipse_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ELLIPSE__RADIUS_Y, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Rotation feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRotationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Ellipse_rotation_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Ellipse_rotation_feature", "_UI_Ellipse_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ELLIPSE__ROTATION, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Start Angle feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addStartAnglePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Ellipse_startAngle_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Ellipse_startAngle_feature", "_UI_Ellipse_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ELLIPSE__START_ANGLE, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the End Angle feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addEndAnglePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Ellipse_endAngle_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Ellipse_endAngle_feature", "_UI_Ellipse_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ELLIPSE__END_ANGLE, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(UmaPackage.Literals.ELLIPSE__CENTER);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns Ellipse.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Ellipse")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Ellipse) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Ellipse_type") : //$NON-NLS-1$
-				getString("_UI_Ellipse_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Ellipse.class)) {
-		case UmaPackage.ELLIPSE__RADIUS_X:
-		case UmaPackage.ELLIPSE__RADIUS_Y:
-		case UmaPackage.ELLIPSE__ROTATION:
-		case UmaPackage.ELLIPSE__START_ANGLE:
-		case UmaPackage.ELLIPSE__END_ANGLE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		case UmaPackage.ELLIPSE__CENTER:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.ELLIPSE__CENTER, UmaFactory.eINSTANCE
-						.createPoint()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/EstimationConsiderationsItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/EstimationConsiderationsItemProvider.java
deleted file mode 100755
index e0d829f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/EstimationConsiderationsItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.EstimationConsiderations;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.EstimationConsiderations} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class EstimationConsiderationsItemProvider extends GuidanceItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EstimationConsiderationsItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns EstimationConsiderations.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/EstimationConsiderations")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((EstimationConsiderations) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_EstimationConsiderations_type") : //$NON-NLS-1$
-				getString("_UI_EstimationConsiderations_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ExampleItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ExampleItemProvider.java
deleted file mode 100755
index 82ef44c..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ExampleItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Example;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Example} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ExampleItemProvider extends GuidanceItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExampleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Example.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Example")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Example) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Example_type") : //$NON-NLS-1$
-				getString("_UI_Example_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GraphConnectorItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GraphConnectorItemProvider.java
deleted file mode 100755
index b68b5b3..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GraphConnectorItemProvider.java
+++ /dev/null
@@ -1,163 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.GraphConnector;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.GraphConnector} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GraphConnectorItemProvider extends GraphElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphConnectorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addGraphEdgePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Graph Edge feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addGraphEdgePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_GraphConnector_graphEdge_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_GraphConnector_graphEdge_feature", "_UI_GraphConnector_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.GRAPH_CONNECTOR__GRAPH_EDGE, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This returns GraphConnector.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/GraphConnector")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((GraphConnector) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_GraphConnector_type") : //$NON-NLS-1$
-				getString("_UI_GraphConnector_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.DIAGRAM_ELEMENT__PROPERTY
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__LINK
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__ANCHORAGE
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__SEMANTIC_MODEL;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GraphEdgeItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GraphEdgeItemProvider.java
deleted file mode 100755
index 4128525..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GraphEdgeItemProvider.java
+++ /dev/null
@@ -1,194 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.GraphEdge;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.GraphEdge} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GraphEdgeItemProvider extends GraphElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphEdgeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAnchorPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Anchor feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAnchorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_GraphEdge_anchor_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_GraphEdge_anchor_feature", "_UI_GraphEdge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.GRAPH_EDGE__ANCHOR, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(UmaPackage.Literals.GRAPH_EDGE__WAYPOINTS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns GraphEdge.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/GraphEdge")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((GraphEdge) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_GraphEdge_type") : //$NON-NLS-1$
-				getString("_UI_GraphEdge_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(GraphEdge.class)) {
-		case UmaPackage.GRAPH_EDGE__WAYPOINTS:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_EDGE__WAYPOINTS, UmaFactory.eINSTANCE
-						.createPoint()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.DIAGRAM_ELEMENT__PROPERTY
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__POSITION
-				|| childFeature == UmaPackage.Literals.GRAPH_EDGE__WAYPOINTS
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__LINK
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__ANCHORAGE
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__SEMANTIC_MODEL;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GraphElementItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GraphElementItemProvider.java
deleted file mode 100755
index 1dd8bf6..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GraphElementItemProvider.java
+++ /dev/null
@@ -1,269 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.GraphElement;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.GraphElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GraphElementItemProvider extends DiagramElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(UmaPackage.Literals.GRAPH_ELEMENT__POSITION);
-			childrenFeatures.add(UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED);
-			childrenFeatures.add(UmaPackage.Literals.GRAPH_ELEMENT__LINK);
-			childrenFeatures.add(UmaPackage.Literals.GRAPH_ELEMENT__ANCHORAGE);
-			childrenFeatures
-					.add(UmaPackage.Literals.GRAPH_ELEMENT__SEMANTIC_MODEL);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns GraphElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/GraphElement")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((GraphElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_GraphElement_type") : //$NON-NLS-1$
-				getString("_UI_GraphElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(GraphElement.class)) {
-		case UmaPackage.GRAPH_ELEMENT__POSITION:
-		case UmaPackage.GRAPH_ELEMENT__CONTAINED:
-		case UmaPackage.GRAPH_ELEMENT__LINK:
-		case UmaPackage.GRAPH_ELEMENT__ANCHORAGE:
-		case UmaPackage.GRAPH_ELEMENT__SEMANTIC_MODEL:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__POSITION,
-				UmaFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED,
-				UmaFactory.eINSTANCE.createDiagramLink()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED,
-				UmaFactory.eINSTANCE.createGraphConnector()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED,
-				UmaFactory.eINSTANCE.createReference()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED,
-				UmaFactory.eINSTANCE.createProperty()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED,
-				UmaFactory.eINSTANCE.createGraphEdge()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED,
-				UmaFactory.eINSTANCE.createGraphNode()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED,
-				UmaFactory.eINSTANCE.createDiagram()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED,
-				UmaFactory.eINSTANCE.createSimpleSemanticModelElement()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED,
-				UmaFactory.eINSTANCE.createUMASemanticModelBridge()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED,
-				UmaFactory.eINSTANCE.createCoreSemanticModelBridge()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED,
-				UmaFactory.eINSTANCE.createTextElement()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED,
-				UmaFactory.eINSTANCE.createImage()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED,
-				UmaFactory.eINSTANCE.createPolyline()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED,
-				UmaFactory.eINSTANCE.createEllipse()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__LINK, UmaFactory.eINSTANCE
-						.createDiagramLink()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__ANCHORAGE,
-				UmaFactory.eINSTANCE.createGraphConnector()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__SEMANTIC_MODEL,
-				UmaFactory.eINSTANCE.createSimpleSemanticModelElement()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__SEMANTIC_MODEL,
-				UmaFactory.eINSTANCE.createUMASemanticModelBridge()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_ELEMENT__SEMANTIC_MODEL,
-				UmaFactory.eINSTANCE.createCoreSemanticModelBridge()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.DIAGRAM_ELEMENT__PROPERTY
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__LINK
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__ANCHORAGE
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__SEMANTIC_MODEL;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GraphNodeItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GraphNodeItemProvider.java
deleted file mode 100755
index 81369b6..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GraphNodeItemProvider.java
+++ /dev/null
@@ -1,171 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.GraphNode} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GraphNodeItemProvider extends GraphElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphNodeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(UmaPackage.Literals.GRAPH_NODE__SIZE);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns GraphNode.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/GraphNode")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((GraphNode) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_GraphNode_type") : //$NON-NLS-1$
-				getString("_UI_GraphNode_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(GraphNode.class)) {
-		case UmaPackage.GRAPH_NODE__SIZE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.GRAPH_NODE__SIZE, UmaFactory.eINSTANCE
-						.createDimension()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.DIAGRAM_ELEMENT__PROPERTY
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__CONTAINED
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__LINK
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__ANCHORAGE
-				|| childFeature == UmaPackage.Literals.GRAPH_ELEMENT__SEMANTIC_MODEL;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GraphicPrimitiveItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GraphicPrimitiveItemProvider.java
deleted file mode 100755
index f43a5eb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GraphicPrimitiveItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.GraphicPrimitive;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.GraphicPrimitive} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GraphicPrimitiveItemProvider extends LeafElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphicPrimitiveItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns GraphicPrimitive.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/GraphicPrimitive")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((GraphicPrimitive) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_GraphicPrimitive_type") : //$NON-NLS-1$
-				getString("_UI_GraphicPrimitive_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GuidanceDescriptionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GuidanceDescriptionItemProvider.java
deleted file mode 100755
index c7f0fa6..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GuidanceDescriptionItemProvider.java
+++ /dev/null
@@ -1,149 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.GuidanceDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.GuidanceDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GuidanceDescriptionItemProvider extends
-		ContentDescriptionItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider,
-		IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GuidanceDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAttachmentsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Attachments feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAttachmentsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_GuidanceDescription_attachments_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_GuidanceDescription_attachments_feature", "_UI_GuidanceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.GUIDANCE_DESCRIPTION__ATTACHMENTS,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns GuidanceDescription.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/GuidanceDescription")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((GuidanceDescription) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_GuidanceDescription_type") : //$NON-NLS-1$
-				getString("_UI_GuidanceDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(GuidanceDescription.class)) {
-		case UmaPackage.GUIDANCE_DESCRIPTION__ATTACHMENTS:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GuidanceItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GuidanceItemProvider.java
deleted file mode 100755
index 3bc16e6..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GuidanceItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Guidance;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Guidance} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GuidanceItemProvider extends ContentElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GuidanceItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Guidance.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Guidance")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Guidance) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Guidance_type") : //$NON-NLS-1$
-				getString("_UI_Guidance_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GuidelineItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GuidelineItemProvider.java
deleted file mode 100755
index bd4f333..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/GuidelineItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Guideline;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Guideline} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GuidelineItemProvider extends GuidanceItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GuidelineItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Guideline.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Guideline")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Guideline) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Guideline_type") : //$NON-NLS-1$
-				getString("_UI_Guideline_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ImageItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ImageItemProvider.java
deleted file mode 100755
index 66e781d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ImageItemProvider.java
+++ /dev/null
@@ -1,169 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Image;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Image} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ImageItemProvider extends LeafElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ImageItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addUriPropertyDescriptor(object);
-			addMimeTypePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Uri feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addUriPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Image_uri_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Image_uri_feature", "_UI_Image_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.IMAGE__URI, true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Mime Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMimeTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Image_mimeType_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Image_mimeType_feature", "_UI_Image_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.IMAGE__MIME_TYPE, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This returns Image.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Image")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Image) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Image_type") : //$NON-NLS-1$
-				getString("_UI_Image_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Image.class)) {
-		case UmaPackage.IMAGE__URI:
-		case UmaPackage.IMAGE__MIME_TYPE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/IterationItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/IterationItemProvider.java
deleted file mode 100755
index aa0db78..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/IterationItemProvider.java
+++ /dev/null
@@ -1,140 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Iteration;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Iteration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IterationItemProvider extends ActivityItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IterationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Iteration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Iteration")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Iteration) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Iteration_type") : //$NON-NLS-1$
-				getString("_UI_Iteration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.METHOD_ELEMENT__OWNED_RULES
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__PRECONDITION
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/LeafElementItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/LeafElementItemProvider.java
deleted file mode 100755
index 08c6ab5..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/LeafElementItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.LeafElement;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.LeafElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class LeafElementItemProvider extends DiagramElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LeafElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns LeafElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/LeafElement")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((LeafElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_LeafElement_type") : //$NON-NLS-1$
-				getString("_UI_LeafElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodConfigurationItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodConfigurationItemProvider.java
deleted file mode 100755
index 7825dd8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodConfigurationItemProvider.java
+++ /dev/null
@@ -1,258 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.MethodConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MethodConfigurationItemProvider extends MethodUnitItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addMethodPluginSelectionPropertyDescriptor(object);
-			addMethodPackageSelectionPropertyDescriptor(object);
-			addProcessViewsPropertyDescriptor(object);
-			addDefaultViewPropertyDescriptor(object);
-			addBaseConfigurationsPropertyDescriptor(object);
-			addSubtractedCategoryPropertyDescriptor(object);
-			addAddedCategoryPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Method Plugin Selection feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMethodPluginSelectionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodConfiguration_methodPluginSelection_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodConfiguration_methodPluginSelection_feature", "_UI_MethodConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Method Package Selection feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMethodPackageSelectionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodConfiguration_methodPackageSelection_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodConfiguration_methodPackageSelection_feature", "_UI_MethodConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Process Views feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProcessViewsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodConfiguration_processViews_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodConfiguration_processViews_feature", "_UI_MethodConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_CONFIGURATION__PROCESS_VIEWS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Default View feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDefaultViewPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodConfiguration_defaultView_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodConfiguration_defaultView_feature", "_UI_MethodConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_CONFIGURATION__DEFAULT_VIEW,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Base Configurations feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBaseConfigurationsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodConfiguration_baseConfigurations_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodConfiguration_baseConfigurations_feature", "_UI_MethodConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_CONFIGURATION__BASE_CONFIGURATIONS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Subtracted Category feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSubtractedCategoryPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodConfiguration_subtractedCategory_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodConfiguration_subtractedCategory_feature", "_UI_MethodConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_CONFIGURATION__SUBTRACTED_CATEGORY,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Added Category feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAddedCategoryPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodConfiguration_addedCategory_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodConfiguration_addedCategory_feature", "_UI_MethodConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_CONFIGURATION__ADDED_CATEGORY,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns MethodConfiguration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/MethodConfiguration")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((MethodConfiguration) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_MethodConfiguration_type") : //$NON-NLS-1$
-				getString("_UI_MethodConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodElementItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodElementItemProvider.java
deleted file mode 100755
index 0305381..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodElementItemProvider.java
+++ /dev/null
@@ -1,280 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.CopyCommand.Helper;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.edit.command.MethodElementCreateCopyCommand;
-import org.eclipse.epf.uma.edit.command.MethodElementInitializeCopyCommand;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.MethodElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MethodElementItemProvider extends PackageableElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addGuidPropertyDescriptor(object);
-			addBriefDescriptionPropertyDescriptor(object);
-			addSuppressedPropertyDescriptor(object);
-			addOrderingGuidePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Guid feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addGuidPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodElement_guid_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodElement_guid_feature", "_UI_MethodElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_ELEMENT__GUID, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Brief Description feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBriefDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodElement_briefDescription_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodElement_briefDescription_feature", "_UI_MethodElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_ELEMENT__BRIEF_DESCRIPTION,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Suppressed feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSuppressedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodElement_suppressed_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodElement_suppressed_feature", "_UI_MethodElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_ELEMENT__SUPPRESSED, true,
-						false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Ordering Guide feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOrderingGuidePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodElement_orderingGuide_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodElement_orderingGuide_feature", "_UI_MethodElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_ELEMENT__ORDERING_GUIDE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.METHOD_ELEMENT__OWNED_RULES);
-			childrenFeatures
-					.add(UmaPackage.Literals.METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns MethodElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/MethodElement")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((MethodElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_MethodElement_type") : //$NON-NLS-1$
-				getString("_UI_MethodElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(MethodElement.class)) {
-		case UmaPackage.METHOD_ELEMENT__GUID:
-		case UmaPackage.METHOD_ELEMENT__BRIEF_DESCRIPTION:
-		case UmaPackage.METHOD_ELEMENT__SUPPRESSED:
-		case UmaPackage.METHOD_ELEMENT__ORDERING_GUIDE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		case UmaPackage.METHOD_ELEMENT__OWNED_RULES:
-		case UmaPackage.METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.METHOD_ELEMENT__OWNED_RULES,
-				UmaFactory.eINSTANCE.createConstraint()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY,
-				UmaFactory.eINSTANCE.createMethodElementProperty()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-	//-------------------//
-	// Start custom code //
-	//-------------------//
-
-	protected Command createInitializeCopyCommand(EditingDomain domain,
-			EObject owner, Helper helper) {
-		return new MethodElementInitializeCopyCommand(domain, owner, helper);
-	}
-
-	protected Command createCreateCopyCommand(EditingDomain domain,
-			EObject owner, Helper helper) {
-		return new MethodElementCreateCopyCommand(domain, owner, helper);
-	}
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodElementPropertyItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodElementPropertyItemProvider.java
deleted file mode 100755
index e6cb58d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodElementPropertyItemProvider.java
+++ /dev/null
@@ -1,152 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.epf.uma.MethodElementProperty;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.MethodElementProperty} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MethodElementPropertyItemProvider extends
-		PackageableElementItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider,
-		IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodElementPropertyItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodElementProperty_value_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodElementProperty_value_feature", "_UI_MethodElementProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_ELEMENT_PROPERTY__VALUE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns MethodElementProperty.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/MethodElementProperty")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((MethodElementProperty) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_MethodElementProperty_type") : //$NON-NLS-1$
-				getString("_UI_MethodElementProperty_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(MethodElementProperty.class)) {
-		case UmaPackage.METHOD_ELEMENT_PROPERTY__VALUE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodLibraryItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodLibraryItemProvider.java
deleted file mode 100755
index 1895335..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodLibraryItemProvider.java
+++ /dev/null
@@ -1,171 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.MethodLibrary} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MethodLibraryItemProvider extends MethodUnitItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodLibraryItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.METHOD_LIBRARY__METHOD_PLUGINS);
-			childrenFeatures
-					.add(UmaPackage.Literals.METHOD_LIBRARY__PREDEFINED_CONFIGURATIONS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns MethodLibrary.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/MethodLibrary")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((MethodLibrary) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_MethodLibrary_type") : //$NON-NLS-1$
-				getString("_UI_MethodLibrary_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(MethodLibrary.class)) {
-		case UmaPackage.METHOD_LIBRARY__METHOD_PLUGINS:
-		case UmaPackage.METHOD_LIBRARY__PREDEFINED_CONFIGURATIONS:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.METHOD_LIBRARY__METHOD_PLUGINS,
-				UmaFactory.eINSTANCE.createMethodPlugin()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.METHOD_LIBRARY__PREDEFINED_CONFIGURATIONS,
-				UmaFactory.eINSTANCE.createMethodConfiguration()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.METHOD_LIBRARY__PREDEFINED_CONFIGURATIONS,
-				UmaFactory.eINSTANCE.createProcessFamily()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodPackageItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodPackageItemProvider.java
deleted file mode 100755
index 9022d38..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodPackageItemProvider.java
+++ /dev/null
@@ -1,202 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.MethodPackage} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MethodPackageItemProvider extends MethodElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodPackageItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addGlobalPropertyDescriptor(object);
-			addReusedPackagesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Global feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addGlobalPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodPackage_global_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodPackage_global_feature", "_UI_MethodPackage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_PACKAGE__GLOBAL, true,
-						false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Reused Packages feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addReusedPackagesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodPackage_reusedPackages_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodPackage_reusedPackages_feature", "_UI_MethodPackage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_PACKAGE__REUSED_PACKAGES,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.METHOD_PACKAGE__CHILD_PACKAGES);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns MethodPackage.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/MethodPackage")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((MethodPackage) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_MethodPackage_type") : //$NON-NLS-1$
-				getString("_UI_MethodPackage_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(MethodPackage.class)) {
-		case UmaPackage.METHOD_PACKAGE__GLOBAL:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		case UmaPackage.METHOD_PACKAGE__CHILD_PACKAGES:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.METHOD_PACKAGE__CHILD_PACKAGES,
-				UmaFactory.eINSTANCE.createContentPackage()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.METHOD_PACKAGE__CHILD_PACKAGES,
-				UmaFactory.eINSTANCE.createProcessPackage()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.METHOD_PACKAGE__CHILD_PACKAGES,
-				UmaFactory.eINSTANCE.createProcessComponent()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodPluginItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodPluginItemProvider.java
deleted file mode 100755
index d996018..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodPluginItemProvider.java
+++ /dev/null
@@ -1,202 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.MethodPlugin} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MethodPluginItemProvider extends MethodUnitItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodPluginItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addUserChangeablePropertyDescriptor(object);
-			addBasesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the User Changeable feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addUserChangeablePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodPlugin_userChangeable_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodPlugin_userChangeable_feature", "_UI_MethodPlugin_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_PLUGIN__USER_CHANGEABLE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Bases feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBasesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodPlugin_bases_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodPlugin_bases_feature", "_UI_MethodPlugin_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_PLUGIN__BASES, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.METHOD_PLUGIN__METHOD_PACKAGES);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns MethodPlugin.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/MethodPlugin")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((MethodPlugin) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_MethodPlugin_type") : //$NON-NLS-1$
-				getString("_UI_MethodPlugin_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(MethodPlugin.class)) {
-		case UmaPackage.METHOD_PLUGIN__USER_CHANGEABLE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		case UmaPackage.METHOD_PLUGIN__METHOD_PACKAGES:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.METHOD_PLUGIN__METHOD_PACKAGES,
-				UmaFactory.eINSTANCE.createContentPackage()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.METHOD_PLUGIN__METHOD_PACKAGES,
-				UmaFactory.eINSTANCE.createProcessPackage()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.METHOD_PLUGIN__METHOD_PACKAGES,
-				UmaFactory.eINSTANCE.createProcessComponent()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodUnitItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodUnitItemProvider.java
deleted file mode 100755
index 440b2e8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MethodUnitItemProvider.java
+++ /dev/null
@@ -1,234 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.MethodUnit;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.MethodUnit} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MethodUnitItemProvider extends MethodElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodUnitItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAuthorsPropertyDescriptor(object);
-			addChangeDatePropertyDescriptor(object);
-			addChangeDescriptionPropertyDescriptor(object);
-			addVersionPropertyDescriptor(object);
-			addCopyrightStatementPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Authors feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAuthorsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodUnit_authors_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodUnit_authors_feature", "_UI_MethodUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_UNIT__AUTHORS, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Change Date feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addChangeDatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodUnit_changeDate_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodUnit_changeDate_feature", "_UI_MethodUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_UNIT__CHANGE_DATE, true,
-						false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Change Description feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addChangeDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodUnit_changeDescription_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodUnit_changeDescription_feature", "_UI_MethodUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_UNIT__CHANGE_DESCRIPTION,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Version feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodUnit_version_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodUnit_version_feature", "_UI_MethodUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_UNIT__VERSION, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Copyright Statement feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCopyrightStatementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodUnit_copyrightStatement_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodUnit_copyrightStatement_feature", "_UI_MethodUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_UNIT__COPYRIGHT_STATEMENT,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns MethodUnit.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/MethodUnit")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((MethodUnit) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_MethodUnit_type") : //$NON-NLS-1$
-				getString("_UI_MethodUnit_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(MethodUnit.class)) {
-		case UmaPackage.METHOD_UNIT__AUTHORS:
-		case UmaPackage.METHOD_UNIT__CHANGE_DATE:
-		case UmaPackage.METHOD_UNIT__CHANGE_DESCRIPTION:
-		case UmaPackage.METHOD_UNIT__VERSION:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MilestoneItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MilestoneItemProvider.java
deleted file mode 100755
index 54c073b..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/MilestoneItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Milestone;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Milestone} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MilestoneItemProvider extends WorkBreakdownElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MilestoneItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Milestone.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Milestone")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Milestone) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Milestone_type") : //$NON-NLS-1$
-				getString("_UI_Milestone_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/NamedElementItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/NamedElementItemProvider.java
deleted file mode 100755
index 1b4fcd6..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/NamedElementItemProvider.java
+++ /dev/null
@@ -1,148 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.NamedElement;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.NamedElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class NamedElementItemProvider extends ElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NamedElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_NamedElement_name_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_NamedElement_name_feature", "_UI_NamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.NAMED_ELEMENT__NAME, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This returns NamedElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/NamedElement")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((NamedElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_NamedElement_type") : //$NON-NLS-1$
-				getString("_UI_NamedElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(NamedElement.class)) {
-		case UmaPackage.NAMED_ELEMENT__NAME:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/NamespaceItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/NamespaceItemProvider.java
deleted file mode 100755
index 33ef164..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/NamespaceItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Namespace;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Namespace} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class NamespaceItemProvider extends NamedElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NamespaceItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Namespace.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Namespace")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Namespace) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Namespace_type") : //$NON-NLS-1$
-				getString("_UI_Namespace_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/OutcomeItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/OutcomeItemProvider.java
deleted file mode 100755
index c965e3d..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/OutcomeItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Outcome;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Outcome} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class OutcomeItemProvider extends WorkProductItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OutcomeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Outcome.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Outcome")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Outcome) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Outcome_type") : //$NON-NLS-1$
-				getString("_UI_Outcome_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PackageItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PackageItemProvider.java
deleted file mode 100755
index 3f225e1..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PackageItemProvider.java
+++ /dev/null
@@ -1,115 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Package} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PackageItemProvider extends NamespaceItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PackageItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Package.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Package")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((org.eclipse.epf.uma.Package) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Package_type") : //$NON-NLS-1$
-				getString("_UI_Package_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PackageableElementItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PackageableElementItemProvider.java
deleted file mode 100755
index 06b408e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PackageableElementItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.PackageableElement;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.PackageableElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PackageableElementItemProvider extends NamedElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PackageableElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns PackageableElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/PackageableElement")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((PackageableElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_PackageableElement_type") : //$NON-NLS-1$
-				getString("_UI_PackageableElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PhaseItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PhaseItemProvider.java
deleted file mode 100755
index 745f092..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PhaseItemProvider.java
+++ /dev/null
@@ -1,140 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Phase;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Phase} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PhaseItemProvider extends ActivityItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PhaseItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Phase.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Phase")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Phase) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Phase_type") : //$NON-NLS-1$
-				getString("_UI_Phase_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.METHOD_ELEMENT__OWNED_RULES
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__PRECONDITION
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PlanningDataItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PlanningDataItemProvider.java
deleted file mode 100755
index dc2e6ec..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PlanningDataItemProvider.java
+++ /dev/null
@@ -1,192 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.PlanningData;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.PlanningData} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PlanningDataItemProvider extends ProcessElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PlanningDataItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addStartDatePropertyDescriptor(object);
-			addFinishDatePropertyDescriptor(object);
-			addRankPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Start Date feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addStartDatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_PlanningData_startDate_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_PlanningData_startDate_feature", "_UI_PlanningData_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PLANNING_DATA__START_DATE, true,
-						false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Finish Date feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addFinishDatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_PlanningData_finishDate_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_PlanningData_finishDate_feature", "_UI_PlanningData_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PLANNING_DATA__FINISH_DATE, true,
-						false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Rank feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRankPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_PlanningData_rank_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_PlanningData_rank_feature", "_UI_PlanningData_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PLANNING_DATA__RANK, true, false,
-						false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This returns PlanningData.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/PlanningData")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((PlanningData) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_PlanningData_type") : //$NON-NLS-1$
-				getString("_UI_PlanningData_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(PlanningData.class)) {
-		case UmaPackage.PLANNING_DATA__START_DATE:
-		case UmaPackage.PLANNING_DATA__FINISH_DATE:
-		case UmaPackage.PLANNING_DATA__RANK:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PointItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PointItemProvider.java
deleted file mode 100755
index 90153ef..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PointItemProvider.java
+++ /dev/null
@@ -1,170 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Point;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Point} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PointItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PointItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addXPropertyDescriptor(object);
-			addYPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the X feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Point_x_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Point_x_feature", "_UI_Point_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.POINT__X, true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Y feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Point_y_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Point_y_feature", "_UI_Point_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.POINT__Y, true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns Point.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Point")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		Double labelValue = ((Point) object).getX();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ? getString("_UI_Point_type") : //$NON-NLS-1$
-				getString("_UI_Point_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Point.class)) {
-		case UmaPackage.POINT__X:
-		case UmaPackage.POINT__Y:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PolylineItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PolylineItemProvider.java
deleted file mode 100755
index afa95f7..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PolylineItemProvider.java
+++ /dev/null
@@ -1,173 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Polyline;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Polyline} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PolylineItemProvider extends GraphicPrimitiveItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PolylineItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addClosedPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Closed feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addClosedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Polyline_closed_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Polyline_closed_feature", "_UI_Polyline_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.POLYLINE__CLOSED, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(UmaPackage.Literals.POLYLINE__WAYPOINTS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns Polyline.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Polyline")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Polyline) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Polyline_type") : //$NON-NLS-1$
-				getString("_UI_Polyline_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Polyline.class)) {
-		case UmaPackage.POLYLINE__CLOSED:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		case UmaPackage.POLYLINE__WAYPOINTS:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.POLYLINE__WAYPOINTS, UmaFactory.eINSTANCE
-						.createPoint()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PracticeDescriptionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PracticeDescriptionItemProvider.java
deleted file mode 100755
index 740d498..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PracticeDescriptionItemProvider.java
+++ /dev/null
@@ -1,259 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.PracticeDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.PracticeDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PracticeDescriptionItemProvider extends
-		ContentDescriptionItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider,
-		IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PracticeDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAdditionalInfoPropertyDescriptor(object);
-			addProblemPropertyDescriptor(object);
-			addBackgroundPropertyDescriptor(object);
-			addGoalsPropertyDescriptor(object);
-			addApplicationPropertyDescriptor(object);
-			addLevelsOfAdoptionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Additional Info feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAdditionalInfoPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_PracticeDescription_additionalInfo_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_PracticeDescription_additionalInfo_feature", "_UI_PracticeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PRACTICE_DESCRIPTION__ADDITIONAL_INFO,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Problem feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProblemPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_PracticeDescription_problem_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_PracticeDescription_problem_feature", "_UI_PracticeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PRACTICE_DESCRIPTION__PROBLEM,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Background feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBackgroundPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_PracticeDescription_background_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_PracticeDescription_background_feature", "_UI_PracticeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PRACTICE_DESCRIPTION__BACKGROUND,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Goals feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addGoalsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_PracticeDescription_goals_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_PracticeDescription_goals_feature", "_UI_PracticeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PRACTICE_DESCRIPTION__GOALS, true,
-						false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Application feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addApplicationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_PracticeDescription_application_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_PracticeDescription_application_feature", "_UI_PracticeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PRACTICE_DESCRIPTION__APPLICATION,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Levels Of Adoption feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addLevelsOfAdoptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_PracticeDescription_levelsOfAdoption_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_PracticeDescription_levelsOfAdoption_feature", "_UI_PracticeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns PracticeDescription.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/PracticeDescription")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((PracticeDescription) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_PracticeDescription_type") : //$NON-NLS-1$
-				getString("_UI_PracticeDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(PracticeDescription.class)) {
-		case UmaPackage.PRACTICE_DESCRIPTION__ADDITIONAL_INFO:
-		case UmaPackage.PRACTICE_DESCRIPTION__PROBLEM:
-		case UmaPackage.PRACTICE_DESCRIPTION__BACKGROUND:
-		case UmaPackage.PRACTICE_DESCRIPTION__GOALS:
-		case UmaPackage.PRACTICE_DESCRIPTION__APPLICATION:
-		case UmaPackage.PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PracticeItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PracticeItemProvider.java
deleted file mode 100755
index a109024..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PracticeItemProvider.java
+++ /dev/null
@@ -1,187 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Practice} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PracticeItemProvider extends GuidanceItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PracticeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addContentReferencesPropertyDescriptor(object);
-			addActivityReferencesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Content References feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addContentReferencesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Practice_contentReferences_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Practice_contentReferences_feature", "_UI_Practice_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PRACTICE__CONTENT_REFERENCES, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Activity References feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addActivityReferencesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Practice_activityReferences_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Practice_activityReferences_feature", "_UI_Practice_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PRACTICE__ACTIVITY_REFERENCES,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(UmaPackage.Literals.PRACTICE__SUB_PRACTICES);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns Practice.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Practice")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Practice) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Practice_type") : //$NON-NLS-1$
-				getString("_UI_Practice_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Practice.class)) {
-		case UmaPackage.PRACTICE__SUB_PRACTICES:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PRACTICE__SUB_PRACTICES,
-				UmaFactory.eINSTANCE.createPractice()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessComponentDescriptorItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessComponentDescriptorItemProvider.java
deleted file mode 100755
index 6a2bf1b..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessComponentDescriptorItemProvider.java
+++ /dev/null
@@ -1,139 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.ProcessComponentDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ProcessComponentDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ProcessComponentDescriptorItemProvider extends
-		DescriptorItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider,
-		IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessComponentDescriptorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addProcessComponentPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Process Component feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProcessComponentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ProcessComponentDescriptor_ProcessComponent_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ProcessComponentDescriptor_ProcessComponent_feature", "_UI_ProcessComponentDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PROCESS_COMPONENT_DESCRIPTOR__PROCESS_COMPONENT,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns ProcessComponentDescriptor.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ProcessComponentDescriptor")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ProcessComponentDescriptor) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ProcessComponentDescriptor_type") : //$NON-NLS-1$
-				getString("_UI_ProcessComponentDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessComponentInterfaceItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessComponentInterfaceItemProvider.java
deleted file mode 100755
index 69fa0ca..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessComponentInterfaceItemProvider.java
+++ /dev/null
@@ -1,169 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.ProcessComponentInterface;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ProcessComponentInterface} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ProcessComponentInterfaceItemProvider extends
-		BreakdownElementItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider,
-		IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessComponentInterfaceItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATIONS);
-			childrenFeatures
-					.add(UmaPackage.Literals.PROCESS_COMPONENT_INTERFACE__INTERFACE_IO);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns ProcessComponentInterface.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ProcessComponentInterface")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ProcessComponentInterface) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ProcessComponentInterface_type") : //$NON-NLS-1$
-				getString("_UI_ProcessComponentInterface_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ProcessComponentInterface.class)) {
-		case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATIONS:
-		case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_IO:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors
-				.add(createChildParameter(
-						UmaPackage.Literals.PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATIONS,
-						UmaFactory.eINSTANCE.createTaskDescriptor()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_COMPONENT_INTERFACE__INTERFACE_IO,
-				UmaFactory.eINSTANCE.createWorkProductDescriptor()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessComponentItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessComponentItemProvider.java
deleted file mode 100755
index b0b21e0..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessComponentItemProvider.java
+++ /dev/null
@@ -1,310 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ProcessComponent} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ProcessComponentItemProvider extends ProcessPackageItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessComponentItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAuthorsPropertyDescriptor(object);
-			addChangeDatePropertyDescriptor(object);
-			addChangeDescriptionPropertyDescriptor(object);
-			addVersionPropertyDescriptor(object);
-			addCopyrightStatementPropertyDescriptor(object);
-			addInterfacesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Authors feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAuthorsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodUnit_authors_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodUnit_authors_feature", "_UI_MethodUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_UNIT__AUTHORS, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Change Date feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addChangeDatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodUnit_changeDate_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodUnit_changeDate_feature", "_UI_MethodUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_UNIT__CHANGE_DATE, true,
-						false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Change Description feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addChangeDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodUnit_changeDescription_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodUnit_changeDescription_feature", "_UI_MethodUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_UNIT__CHANGE_DESCRIPTION,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Version feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodUnit_version_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodUnit_version_feature", "_UI_MethodUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_UNIT__VERSION, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Copyright Statement feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCopyrightStatementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_MethodUnit_copyrightStatement_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_MethodUnit_copyrightStatement_feature", "_UI_MethodUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.METHOD_UNIT__COPYRIGHT_STATEMENT,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Interfaces feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addInterfacesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ProcessComponent_interfaces_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ProcessComponent_interfaces_feature", "_UI_ProcessComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PROCESS_COMPONENT__INTERFACES,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.PROCESS_COMPONENT__PROCESS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns ProcessComponent.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ProcessComponent")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ProcessComponent) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ProcessComponent_type") : //$NON-NLS-1$
-				getString("_UI_ProcessComponent_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ProcessComponent.class)) {
-		case UmaPackage.PROCESS_COMPONENT__AUTHORS:
-		case UmaPackage.PROCESS_COMPONENT__CHANGE_DATE:
-		case UmaPackage.PROCESS_COMPONENT__CHANGE_DESCRIPTION:
-		case UmaPackage.PROCESS_COMPONENT__VERSION:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		case UmaPackage.PROCESS_COMPONENT__PROCESS:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_COMPONENT__PROCESS,
-				UmaFactory.eINSTANCE.createDeliveryProcess()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_COMPONENT__PROCESS,
-				UmaFactory.eINSTANCE.createCapabilityPattern()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_COMPONENT__PROCESS,
-				UmaFactory.eINSTANCE.createProcessPlanningTemplate()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS
-				|| childFeature == UmaPackage.Literals.PROCESS_COMPONENT__PROCESS;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessDescriptionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessDescriptionItemProvider.java
deleted file mode 100755
index 3ad0924..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessDescriptionItemProvider.java
+++ /dev/null
@@ -1,193 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.ProcessDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ProcessDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ProcessDescriptionItemProvider extends
-		ActivityDescriptionItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider,
-		IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addExternalIdPropertyDescriptor(object);
-			addScopePropertyDescriptor(object);
-			addUsageNotesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the External Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addExternalIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ProcessDescription_externalId_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ProcessDescription_externalId_feature", "_UI_ProcessDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PROCESS_DESCRIPTION__EXTERNAL_ID,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Scope feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addScopePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ProcessDescription_scope_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ProcessDescription_scope_feature", "_UI_ProcessDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PROCESS_DESCRIPTION__SCOPE, true,
-						false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Usage Notes feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addUsageNotesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ProcessDescription_usageNotes_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ProcessDescription_usageNotes_feature", "_UI_ProcessDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PROCESS_DESCRIPTION__USAGE_NOTES,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns ProcessDescription.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ProcessDescription")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ProcessDescription) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ProcessDescription_type") : //$NON-NLS-1$
-				getString("_UI_ProcessDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ProcessDescription.class)) {
-		case UmaPackage.PROCESS_DESCRIPTION__EXTERNAL_ID:
-		case UmaPackage.PROCESS_DESCRIPTION__SCOPE:
-		case UmaPackage.PROCESS_DESCRIPTION__USAGE_NOTES:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessElementItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessElementItemProvider.java
deleted file mode 100755
index 56dc1d5..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessElementItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.ProcessElement;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ProcessElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ProcessElementItemProvider extends DescribableElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns ProcessElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ProcessElement")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ProcessElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ProcessElement_type") : //$NON-NLS-1$
-				getString("_UI_ProcessElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessFamilyItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessFamilyItemProvider.java
deleted file mode 100755
index c86abc8..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessFamilyItemProvider.java
+++ /dev/null
@@ -1,138 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.ProcessFamily;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ProcessFamily} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ProcessFamilyItemProvider extends MethodConfigurationItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessFamilyItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDeliveryProcessesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Delivery Processes feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDeliveryProcessesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ProcessFamily_deliveryProcesses_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ProcessFamily_deliveryProcesses_feature", "_UI_ProcessFamily_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PROCESS_FAMILY__DELIVERY_PROCESSES,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns ProcessFamily.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ProcessFamily")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ProcessFamily) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ProcessFamily_type") : //$NON-NLS-1$
-				getString("_UI_ProcessFamily_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessItemProvider.java
deleted file mode 100755
index ec22856..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessItemProvider.java
+++ /dev/null
@@ -1,200 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Process} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ProcessItemProvider extends ActivityItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIncludesPatternsPropertyDescriptor(object);
-			addDefaultContextPropertyDescriptor(object);
-			addValidContextPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Includes Patterns feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIncludesPatternsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Process_includesPatterns_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Process_includesPatterns_feature", "_UI_Process_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PROCESS__INCLUDES_PATTERNS, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Default Context feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDefaultContextPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Process_defaultContext_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Process_defaultContext_feature", "_UI_Process_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PROCESS__DEFAULT_CONTEXT, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Valid Context feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValidContextPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Process_validContext_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Process_validContext_feature", "_UI_Process_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PROCESS__VALID_CONTEXT, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This returns Process.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Process")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((org.eclipse.epf.uma.Process) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Process_type") : //$NON-NLS-1$
-				getString("_UI_Process_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.METHOD_ELEMENT__OWNED_RULES
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__PRECONDITION
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessPackageItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessPackageItemProvider.java
deleted file mode 100755
index 1176a4f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessPackageItemProvider.java
+++ /dev/null
@@ -1,226 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ProcessPackage} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ProcessPackageItemProvider extends MethodPackageItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessPackageItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS);
-			childrenFeatures.add(UmaPackage.Literals.PROCESS_PACKAGE__DIAGRAMS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns ProcessPackage.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ProcessPackage")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ProcessPackage) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ProcessPackage_type") : //$NON-NLS-1$
-				getString("_UI_ProcessPackage_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ProcessPackage.class)) {
-		case UmaPackage.PROCESS_PACKAGE__PROCESS_ELEMENTS:
-		case UmaPackage.PROCESS_PACKAGE__DIAGRAMS:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createActivity()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createMilestone()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createIteration()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createPhase()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createTeamProfile()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createRoleDescriptor()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createWorkOrder()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createPlanningData()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createWorkProductDescriptor()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createTaskDescriptor()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createCompositeRole()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createDeliveryProcess()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createCapabilityPattern()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createProcessPlanningTemplate()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createProcessComponentInterface()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENTS,
-				UmaFactory.eINSTANCE.createProcessComponentDescriptor()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.PROCESS_PACKAGE__DIAGRAMS,
-				UmaFactory.eINSTANCE.createDiagram()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessPlanningTemplateItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessPlanningTemplateItemProvider.java
deleted file mode 100755
index 58c4422..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ProcessPlanningTemplateItemProvider.java
+++ /dev/null
@@ -1,161 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.ProcessPlanningTemplate;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ProcessPlanningTemplate} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ProcessPlanningTemplateItemProvider extends ProcessItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessPlanningTemplateItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addBasedOnProcessesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Based On Processes feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBasedOnProcessesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ProcessPlanningTemplate_basedOnProcesses_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_ProcessPlanningTemplate_basedOnProcesses_feature", "_UI_ProcessPlanningTemplate_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PROCESS_PLANNING_TEMPLATE__BASED_ON_PROCESSES,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns ProcessPlanningTemplate.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ProcessPlanningTemplate")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ProcessPlanningTemplate) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ProcessPlanningTemplate_type") : //$NON-NLS-1$
-				getString("_UI_ProcessPlanningTemplate_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.METHOD_ELEMENT__OWNED_RULES
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__PRECONDITION
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PropertyItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PropertyItemProvider.java
deleted file mode 100755
index 6318920..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PropertyItemProvider.java
+++ /dev/null
@@ -1,169 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Property} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PropertyItemProvider extends DiagramElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PropertyItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addKeyPropertyDescriptor(object);
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Key feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addKeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Property_key_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Property_key_feature", "_UI_Property_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PROPERTY__KEY, true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Property_value_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Property_value_feature", "_UI_Property_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.PROPERTY__VALUE, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This returns Property.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Property")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Property) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Property_type") : //$NON-NLS-1$
-				getString("_UI_Property_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Property.class)) {
-		case UmaPackage.PROPERTY__KEY:
-		case UmaPackage.PROPERTY__VALUE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PseudoStateItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PseudoStateItemProvider.java
deleted file mode 100755
index 55d424a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/PseudoStateItemProvider.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PseudoStateItemProvider.java,v 1.3 2006/09/07 00:06:39 klow Exp $
- */
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.PseudoState} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PseudoStateItemProvider extends VertexItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PseudoStateItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns PseudoState.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/PseudoState")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_PseudoState_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ReferenceItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ReferenceItemProvider.java
deleted file mode 100755
index f2a83e2..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ReferenceItemProvider.java
+++ /dev/null
@@ -1,168 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Reference;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Reference} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ReferenceItemProvider extends DiagramElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReferenceItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIsIndividualRepresentationPropertyDescriptor(object);
-			addReferencedPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Is Individual Representation feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIsIndividualRepresentationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Reference_isIndividualRepresentation_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Reference_isIndividualRepresentation_feature", "_UI_Reference_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.REFERENCE__IS_INDIVIDUAL_REPRESENTATION,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Referenced feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addReferencedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Reference_referenced_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Reference_referenced_feature", "_UI_Reference_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.REFERENCE__REFERENCED, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This returns Reference.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Reference")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Reference) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Reference_type") : //$NON-NLS-1$
-				getString("_UI_Reference_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Reference.class)) {
-		case UmaPackage.REFERENCE__IS_INDIVIDUAL_REPRESENTATION:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RegionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RegionItemProvider.java
deleted file mode 100755
index 03121ec..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RegionItemProvider.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RegionItemProvider.java,v 1.3 2006/09/07 00:06:39 klow Exp $
- */
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Region;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Region} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RegionItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RegionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(UmaPackage.Literals.REGION__VERTEX);
-			childrenFeatures.add(UmaPackage.Literals.REGION__TRANSITION);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns Region.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Region")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_Region_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Region.class)) {
-		case UmaPackage.REGION__VERTEX:
-		case UmaPackage.REGION__TRANSITION:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.REGION__VERTEX, UmaFactory.eINSTANCE
-						.createVertex()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.REGION__VERTEX, UmaFactory.eINSTANCE
-						.createState()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.REGION__VERTEX, UmaFactory.eINSTANCE
-						.createPseudoState()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.REGION__TRANSITION, UmaFactory.eINSTANCE
-						.createTransition()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ReportItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ReportItemProvider.java
deleted file mode 100755
index b05e809..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ReportItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Report;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Report} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ReportItemProvider extends GuidanceItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReportItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Report.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Report")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Report) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Report_type") : //$NON-NLS-1$
-				getString("_UI_Report_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ReusableAssetItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ReusableAssetItemProvider.java
deleted file mode 100755
index 06001dc..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ReusableAssetItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.ReusableAsset;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ReusableAsset} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ReusableAssetItemProvider extends GuidanceItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReusableAssetItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns ReusableAsset.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ReusableAsset")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ReusableAsset) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ReusableAsset_type") : //$NON-NLS-1$
-				getString("_UI_ReusableAsset_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoadmapItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoadmapItemProvider.java
deleted file mode 100755
index f91d77b..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoadmapItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Roadmap;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Roadmap} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RoadmapItemProvider extends GuidanceItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoadmapItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Roadmap.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Roadmap")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Roadmap) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Roadmap_type") : //$NON-NLS-1$
-				getString("_UI_Roadmap_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoleDescriptionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoleDescriptionItemProvider.java
deleted file mode 100755
index 5e29b62..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoleDescriptionItemProvider.java
+++ /dev/null
@@ -1,192 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.RoleDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.RoleDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RoleDescriptionItemProvider extends ContentDescriptionItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addSkillsPropertyDescriptor(object);
-			addAssignmentApproachesPropertyDescriptor(object);
-			addSynonymsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Skills feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSkillsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_RoleDescription_skills_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_RoleDescription_skills_feature", "_UI_RoleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ROLE_DESCRIPTION__SKILLS, true,
-						false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Assignment Approaches feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAssignmentApproachesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_RoleDescription_assignmentApproaches_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_RoleDescription_assignmentApproaches_feature", "_UI_RoleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Synonyms feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSynonymsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_RoleDescription_synonyms_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_RoleDescription_synonyms_feature", "_UI_RoleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ROLE_DESCRIPTION__SYNONYMS, true,
-						false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns RoleDescription.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/RoleDescription")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((RoleDescription) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_RoleDescription_type") : //$NON-NLS-1$
-				getString("_UI_RoleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(RoleDescription.class)) {
-		case UmaPackage.ROLE_DESCRIPTION__SKILLS:
-		case UmaPackage.ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES:
-		case UmaPackage.ROLE_DESCRIPTION__SYNONYMS:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoleDescriptorItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoleDescriptorItemProvider.java
deleted file mode 100755
index b59eb1b..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoleDescriptorItemProvider.java
+++ /dev/null
@@ -1,178 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.RoleDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RoleDescriptorItemProvider extends DescriptorItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleDescriptorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addRolePropertyDescriptor(object);
-			addModifiesPropertyDescriptor(object);
-			addResponsibleForPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Role feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRolePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_RoleDescriptor_Role_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_RoleDescriptor_Role_feature", "_UI_RoleDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ROLE_DESCRIPTOR__ROLE, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Modifies feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addModifiesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_RoleDescriptor_modifies_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_RoleDescriptor_modifies_feature", "_UI_RoleDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ROLE_DESCRIPTOR__MODIFIES, false,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Responsible For feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addResponsibleForPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_RoleDescriptor_responsibleFor_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_RoleDescriptor_responsibleFor_feature", "_UI_RoleDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ROLE_DESCRIPTOR__RESPONSIBLE_FOR,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns RoleDescriptor.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/RoleDescriptor")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((RoleDescriptor) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_RoleDescriptor_type") : //$NON-NLS-1$
-				getString("_UI_RoleDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoleItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoleItemProvider.java
deleted file mode 100755
index df25019..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoleItemProvider.java
+++ /dev/null
@@ -1,158 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Role} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RoleItemProvider extends ContentElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addModifiesPropertyDescriptor(object);
-			addResponsibleForPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Modifies feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addModifiesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Role_modifies_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Role_modifies_feature", "_UI_Role_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ROLE__MODIFIES, false, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Responsible For feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addResponsibleForPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Role_responsibleFor_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Role_responsibleFor_feature", "_UI_Role_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ROLE__RESPONSIBLE_FOR, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This returns Role.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Role")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Role) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Role_type") : //$NON-NLS-1$
-				getString("_UI_Role_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoleSetGroupingItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoleSetGroupingItemProvider.java
deleted file mode 100755
index fb104c7..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoleSetGroupingItemProvider.java
+++ /dev/null
@@ -1,138 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.RoleSetGrouping} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RoleSetGroupingItemProvider extends ContentCategoryItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleSetGroupingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addRoleSetsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Role Sets feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRoleSetsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_RoleSetGrouping_roleSets_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_RoleSetGrouping_roleSets_feature", "_UI_RoleSetGrouping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ROLE_SET_GROUPING__ROLE_SETS, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This returns RoleSetGrouping.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/RoleSetGrouping")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((RoleSetGrouping) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_RoleSetGrouping_type") : //$NON-NLS-1$
-				getString("_UI_RoleSetGrouping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoleSetItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoleSetItemProvider.java
deleted file mode 100755
index 46172d4..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/RoleSetItemProvider.java
+++ /dev/null
@@ -1,138 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.RoleSet} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RoleSetItemProvider extends ContentCategoryItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleSetItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addRolesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Roles feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRolesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_RoleSet_roles_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_RoleSet_roles_feature", "_UI_RoleSet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.ROLE_SET__ROLES, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This returns RoleSet.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/RoleSet")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((RoleSet) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_RoleSet_type") : //$NON-NLS-1$
-				getString("_UI_RoleSet_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/SectionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/SectionItemProvider.java
deleted file mode 100755
index e6e00b2..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/SectionItemProvider.java
+++ /dev/null
@@ -1,219 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Section;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Section} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SectionItemProvider extends VariabilityElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SectionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addSectionNamePropertyDescriptor(object);
-			addSectionDescriptionPropertyDescriptor(object);
-			addPredecessorPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Section Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSectionNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Section_sectionName_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Section_sectionName_feature", "_UI_Section_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.SECTION__SECTION_NAME, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Section Description feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSectionDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Section_sectionDescription_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Section_sectionDescription_feature", "_UI_Section_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.SECTION__SECTION_DESCRIPTION, true,
-						false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Predecessor feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPredecessorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Section_predecessor_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Section_predecessor_feature", "_UI_Section_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.SECTION__PREDECESSOR, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(UmaPackage.Literals.SECTION__SUB_SECTIONS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns Section.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Section")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Section) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Section_type") : //$NON-NLS-1$
-				getString("_UI_Section_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Section.class)) {
-		case UmaPackage.SECTION__SECTION_NAME:
-		case UmaPackage.SECTION__SECTION_DESCRIPTION:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		case UmaPackage.SECTION__SUB_SECTIONS:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.SECTION__SUB_SECTIONS, UmaFactory.eINSTANCE
-						.createSection()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.SECTION__SUB_SECTIONS, UmaFactory.eINSTANCE
-						.createStep()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/SemanticModelBridgeItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/SemanticModelBridgeItemProvider.java
deleted file mode 100755
index 4c2d800..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/SemanticModelBridgeItemProvider.java
+++ /dev/null
@@ -1,148 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.SemanticModelBridge;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.SemanticModelBridge} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SemanticModelBridgeItemProvider extends DiagramElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SemanticModelBridgeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addPresentationPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Presentation feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPresentationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_SemanticModelBridge_presentation_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_SemanticModelBridge_presentation_feature", "_UI_SemanticModelBridge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.SEMANTIC_MODEL_BRIDGE__PRESENTATION,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns SemanticModelBridge.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/SemanticModelBridge")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((SemanticModelBridge) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_SemanticModelBridge_type") : //$NON-NLS-1$
-				getString("_UI_SemanticModelBridge_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(SemanticModelBridge.class)) {
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__PRESENTATION:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/SimpleSemanticModelElementItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/SimpleSemanticModelElementItemProvider.java
deleted file mode 100755
index 71dd317..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/SimpleSemanticModelElementItemProvider.java
+++ /dev/null
@@ -1,149 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.SimpleSemanticModelElement;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.SimpleSemanticModelElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SimpleSemanticModelElementItemProvider extends
-		SemanticModelBridgeItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider,
-		IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SimpleSemanticModelElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addTypeInfoPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Type Info feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTypeInfoPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_SimpleSemanticModelElement_typeInfo_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_SimpleSemanticModelElement_typeInfo_feature", "_UI_SimpleSemanticModelElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.SIMPLE_SEMANTIC_MODEL_ELEMENT__TYPE_INFO,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns SimpleSemanticModelElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/SimpleSemanticModelElement")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((SimpleSemanticModelElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_SimpleSemanticModelElement_type") : //$NON-NLS-1$
-				getString("_UI_SimpleSemanticModelElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(SimpleSemanticModelElement.class)) {
-		case UmaPackage.SIMPLE_SEMANTIC_MODEL_ELEMENT__TYPE_INFO:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/StateItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/StateItemProvider.java
deleted file mode 100755
index 32ff211..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/StateItemProvider.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: StateItemProvider.java,v 1.4 2006/09/07 00:06:39 klow Exp $
- */
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.State;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.State} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class StateItemProvider extends VertexItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StateItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addWorkProductPropertyDescriptor(object);
-			addSubmachinePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Work Product feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addWorkProductPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_State_WorkProduct_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_State_WorkProduct_feature", "_UI_State_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.STATE__WORK_PRODUCT, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Submachine feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSubmachinePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_State_submachine_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_State_submachine_feature", "_UI_State_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.STATE__SUBMACHINE, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(UmaPackage.Literals.STATE__REGION);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns State.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/State")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_State_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(State.class)) {
-		case UmaPackage.STATE__REGION:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.STATE__REGION, UmaFactory.eINSTANCE
-						.createRegion()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/StateMachineItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/StateMachineItemProvider.java
deleted file mode 100755
index 6425868..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/StateMachineItemProvider.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: StateMachineItemProvider.java,v 1.3 2006/09/07 00:06:39 klow Exp $
- */
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.StateMachine;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.StateMachine} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class StateMachineItemProvider extends WorkDefinitionItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StateMachineItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(UmaPackage.Literals.STATE_MACHINE__REGION);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns StateMachine.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/StateMachine")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((StateMachine) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_StateMachine_type") : //$NON-NLS-1$
-				getString("_UI_StateMachine_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(StateMachine.class)) {
-		case UmaPackage.STATE_MACHINE__REGION:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.STATE_MACHINE__REGION, UmaFactory.eINSTANCE
-						.createRegion()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.METHOD_ELEMENT__OWNED_RULES
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__PRECONDITION
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/StepItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/StepItemProvider.java
deleted file mode 100755
index ed86c5e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/StepItemProvider.java
+++ /dev/null
@@ -1,190 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Step;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Step} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class StepItemProvider extends SectionItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StepItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.WORK_DEFINITION__PRECONDITION);
-			childrenFeatures
-					.add(UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns Step.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Step")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Step) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Step_type") : //$NON-NLS-1$
-				getString("_UI_Step_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Step.class)) {
-		case UmaPackage.STEP__PRECONDITION:
-		case UmaPackage.STEP__POSTCONDITION:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.WORK_DEFINITION__PRECONDITION,
-				UmaFactory.eINSTANCE.createConstraint()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION,
-				UmaFactory.eINSTANCE.createConstraint()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.METHOD_ELEMENT__OWNED_RULES
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__PRECONDITION
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/SupportingMaterialItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/SupportingMaterialItemProvider.java
deleted file mode 100755
index 37c9a4f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/SupportingMaterialItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.SupportingMaterial;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.SupportingMaterial} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SupportingMaterialItemProvider extends GuidanceItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SupportingMaterialItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns SupportingMaterial.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/SupportingMaterial")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((SupportingMaterial) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_SupportingMaterial_type") : //$NON-NLS-1$
-				getString("_UI_SupportingMaterial_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TaskDescriptionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TaskDescriptionItemProvider.java
deleted file mode 100755
index b9b2c4b..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TaskDescriptionItemProvider.java
+++ /dev/null
@@ -1,170 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.TaskDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.TaskDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TaskDescriptionItemProvider extends ContentDescriptionItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addPurposePropertyDescriptor(object);
-			addAlternativesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Purpose feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPurposePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_TaskDescription_purpose_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_TaskDescription_purpose_feature", "_UI_TaskDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK_DESCRIPTION__PURPOSE, true,
-						false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Alternatives feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAlternativesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_TaskDescription_alternatives_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_TaskDescription_alternatives_feature", "_UI_TaskDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK_DESCRIPTION__ALTERNATIVES,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns TaskDescription.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/TaskDescription")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((TaskDescription) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_TaskDescription_type") : //$NON-NLS-1$
-				getString("_UI_TaskDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(TaskDescription.class)) {
-		case UmaPackage.TASK_DESCRIPTION__PURPOSE:
-		case UmaPackage.TASK_DESCRIPTION__ALTERNATIVES:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TaskDescriptorItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TaskDescriptorItemProvider.java
deleted file mode 100755
index 26ea383..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TaskDescriptorItemProvider.java
+++ /dev/null
@@ -1,329 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.TaskDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TaskDescriptorItemProvider extends
-		WorkBreakdownElementItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider,
-		IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskDescriptorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIsSynchronizedWithSourcePropertyDescriptor(object);
-			addTaskPropertyDescriptor(object);
-			addAdditionallyPerformedByPropertyDescriptor(object);
-			addAssistedByPropertyDescriptor(object);
-			addExternalInputPropertyDescriptor(object);
-			addMandatoryInputPropertyDescriptor(object);
-			addOptionalInputPropertyDescriptor(object);
-			addOutputPropertyDescriptor(object);
-			addPerformedPrimarilyByPropertyDescriptor(object);
-			addSelectedStepsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Is Synchronized With Source feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIsSynchronizedWithSourcePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Descriptor_isSynchronizedWithSource_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Descriptor_isSynchronizedWithSource_feature", "_UI_Descriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Task feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTaskPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_TaskDescriptor_Task_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_TaskDescriptor_Task_feature", "_UI_TaskDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK_DESCRIPTOR__TASK, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Additionally Performed By feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAdditionallyPerformedByPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_TaskDescriptor_additionallyPerformedBy_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_TaskDescriptor_additionallyPerformedBy_feature", "_UI_TaskDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Assisted By feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAssistedByPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_TaskDescriptor_assistedBy_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_TaskDescriptor_assistedBy_feature", "_UI_TaskDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK_DESCRIPTOR__ASSISTED_BY, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the External Input feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addExternalInputPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_TaskDescriptor_externalInput_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_TaskDescriptor_externalInput_feature", "_UI_TaskDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK_DESCRIPTOR__EXTERNAL_INPUT,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Mandatory Input feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMandatoryInputPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_TaskDescriptor_mandatoryInput_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_TaskDescriptor_mandatoryInput_feature", "_UI_TaskDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK_DESCRIPTOR__MANDATORY_INPUT,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Optional Input feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOptionalInputPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_TaskDescriptor_optionalInput_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_TaskDescriptor_optionalInput_feature", "_UI_TaskDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK_DESCRIPTOR__OPTIONAL_INPUT,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Output feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOutputPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_TaskDescriptor_output_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_TaskDescriptor_output_feature", "_UI_TaskDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK_DESCRIPTOR__OUTPUT, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Performed Primarily By feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPerformedPrimarilyByPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_TaskDescriptor_performedPrimarilyBy_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_TaskDescriptor_performedPrimarilyBy_feature", "_UI_TaskDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Selected Steps feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSelectedStepsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_TaskDescriptor_selectedSteps_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_TaskDescriptor_selectedSteps_feature", "_UI_TaskDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK_DESCRIPTOR__SELECTED_STEPS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns TaskDescriptor.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/TaskDescriptor")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((TaskDescriptor) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_TaskDescriptor_type") : //$NON-NLS-1$
-				getString("_UI_TaskDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(TaskDescriptor.class)) {
-		case UmaPackage.TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TaskItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TaskItemProvider.java
deleted file mode 100755
index 8f5fd42..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TaskItemProvider.java
+++ /dev/null
@@ -1,351 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Task} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TaskItemProvider extends ContentElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addPerformedByPropertyDescriptor(object);
-			addMandatoryInputPropertyDescriptor(object);
-			addOutputPropertyDescriptor(object);
-			addAdditionallyPerformedByPropertyDescriptor(object);
-			addOptionalInputPropertyDescriptor(object);
-			addStepsPropertyDescriptor(object);
-			addToolMentorsPropertyDescriptor(object);
-			addEstimationConsiderationsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Performed By feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPerformedByPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Task_performedBy_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Task_performedBy_feature", "_UI_Task_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK__PERFORMED_BY, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Mandatory Input feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMandatoryInputPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Task_mandatoryInput_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Task_mandatoryInput_feature", "_UI_Task_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK__MANDATORY_INPUT, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Output feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOutputPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Task_output_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Task_output_feature", "_UI_Task_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK__OUTPUT, true, false, false,
-						null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Additionally Performed By feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAdditionallyPerformedByPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Task_additionallyPerformedBy_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Task_additionallyPerformedBy_feature", "_UI_Task_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK__ADDITIONALLY_PERFORMED_BY,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Optional Input feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOptionalInputPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Task_optionalInput_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Task_optionalInput_feature", "_UI_Task_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK__OPTIONAL_INPUT, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Steps feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addStepsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Task_steps_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Task_steps_feature", "_UI_Task_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK__STEPS, false, false, false,
-						null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Tool Mentors feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addToolMentorsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Task_toolMentors_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Task_toolMentors_feature", "_UI_Task_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK__TOOL_MENTORS, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Estimation Considerations feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addEstimationConsiderationsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Task_estimationConsiderations_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Task_estimationConsiderations_feature", "_UI_Task_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TASK__ESTIMATION_CONSIDERATIONS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.WORK_DEFINITION__PRECONDITION);
-			childrenFeatures
-					.add(UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns Task.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Task")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Task) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Task_type") : //$NON-NLS-1$
-				getString("_UI_Task_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Task.class)) {
-		case UmaPackage.TASK__PRECONDITION:
-		case UmaPackage.TASK__POSTCONDITION:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.WORK_DEFINITION__PRECONDITION,
-				UmaFactory.eINSTANCE.createConstraint()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION,
-				UmaFactory.eINSTANCE.createConstraint()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.METHOD_ELEMENT__OWNED_RULES
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__PRECONDITION
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TeamProfileItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TeamProfileItemProvider.java
deleted file mode 100755
index d5bb56e..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TeamProfileItemProvider.java
+++ /dev/null
@@ -1,178 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.TeamProfile;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.TeamProfile} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TeamProfileItemProvider extends BreakdownElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TeamProfileItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addTeamRolesPropertyDescriptor(object);
-			addSuperTeamPropertyDescriptor(object);
-			addSubTeamPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Team Roles feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTeamRolesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_TeamProfile_teamRoles_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_TeamProfile_teamRoles_feature", "_UI_TeamProfile_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TEAM_PROFILE__TEAM_ROLES, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Super Team feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSuperTeamPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_TeamProfile_superTeam_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_TeamProfile_superTeam_feature", "_UI_TeamProfile_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TEAM_PROFILE__SUPER_TEAM, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Sub Team feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSubTeamPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_TeamProfile_subTeam_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_TeamProfile_subTeam_feature", "_UI_TeamProfile_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TEAM_PROFILE__SUB_TEAM, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This returns TeamProfile.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/TeamProfile")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((TeamProfile) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_TeamProfile_type") : //$NON-NLS-1$
-				getString("_UI_TeamProfile_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TemplateItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TemplateItemProvider.java
deleted file mode 100755
index 7861deb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TemplateItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Template;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Template} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TemplateItemProvider extends GuidanceItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TemplateItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Template.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Template")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Template) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Template_type") : //$NON-NLS-1$
-				getString("_UI_Template_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TermDefinitionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TermDefinitionItemProvider.java
deleted file mode 100755
index 9c9810c..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TermDefinitionItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.TermDefinition;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.TermDefinition} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TermDefinitionItemProvider extends GuidanceItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TermDefinitionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns TermDefinition.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/TermDefinition")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((TermDefinition) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_TermDefinition_type") : //$NON-NLS-1$
-				getString("_UI_TermDefinition_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TextElementItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TextElementItemProvider.java
deleted file mode 100755
index e00c37a..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TextElementItemProvider.java
+++ /dev/null
@@ -1,148 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.TextElement;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.TextElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TextElementItemProvider extends LeafElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TextElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addTextPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Text feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTextPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_TextElement_text_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_TextElement_text_feature", "_UI_TextElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TEXT_ELEMENT__TEXT, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This returns TextElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/TextElement")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((TextElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_TextElement_type") : //$NON-NLS-1$
-				getString("_UI_TextElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(TextElement.class)) {
-		case UmaPackage.TEXT_ELEMENT__TEXT:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ToolItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ToolItemProvider.java
deleted file mode 100755
index fe20bc2..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ToolItemProvider.java
+++ /dev/null
@@ -1,138 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Tool} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ToolItemProvider extends ContentCategoryItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ToolItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addToolMentorsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Tool Mentors feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addToolMentorsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Tool_toolMentors_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Tool_toolMentors_feature", "_UI_Tool_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TOOL__TOOL_MENTORS, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This returns Tool.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Tool")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Tool) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Tool_type") : //$NON-NLS-1$
-				getString("_UI_Tool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ToolMentorItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ToolMentorItemProvider.java
deleted file mode 100755
index e772907..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/ToolMentorItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.ToolMentor;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.ToolMentor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ToolMentorItemProvider extends GuidanceItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ToolMentorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns ToolMentor.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ToolMentor")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ToolMentor) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ToolMentor_type") : //$NON-NLS-1$
-				getString("_UI_ToolMentor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TransitionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TransitionItemProvider.java
deleted file mode 100755
index 3624bb7..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TransitionItemProvider.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TransitionItemProvider.java,v 1.4 2006/09/07 00:06:38 klow Exp $
- */
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Transition} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TransitionItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransitionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addWorkDefinitionPropertyDescriptor(object);
-			addSourcePropertyDescriptor(object);
-			addTargetPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Work Definition feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addWorkDefinitionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Transition_WorkDefinition_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Transition_WorkDefinition_feature", "_UI_Transition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TRANSITION__WORK_DEFINITION, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Source feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSourcePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Transition_source_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Transition_source_feature", "_UI_Transition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TRANSITION__SOURCE, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Target feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTargetPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Transition_target_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Transition_target_feature", "_UI_Transition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.TRANSITION__TARGET, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This returns Transition.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Transition")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_Transition_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TypeItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TypeItemProvider.java
deleted file mode 100755
index 9c3d80c..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/TypeItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Type;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Type} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TypeItemProvider extends PackageableElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Type.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Type")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Type) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Type_type") : //$NON-NLS-1$
-				getString("_UI_Type_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/UMASemanticModelBridgeItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/UMASemanticModelBridgeItemProvider.java
deleted file mode 100755
index 9af3069..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/UMASemanticModelBridgeItemProvider.java
+++ /dev/null
@@ -1,139 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.UMASemanticModelBridge;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.UMASemanticModelBridge} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class UMASemanticModelBridgeItemProvider extends
-		SemanticModelBridgeItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider,
-		IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UMASemanticModelBridgeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addElementPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Element feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_UMASemanticModelBridge_element_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_UMASemanticModelBridge_element_feature", "_UI_UMASemanticModelBridge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.UMA_SEMANTIC_MODEL_BRIDGE__ELEMENT,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns UMASemanticModelBridge.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/UMASemanticModelBridge")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((UMASemanticModelBridge) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_UMASemanticModelBridge_type") : //$NON-NLS-1$
-				getString("_UI_UMASemanticModelBridge_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/UmaEditPlugin.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/UmaEditPlugin.java
deleted file mode 100755
index 7f259be..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/UmaEditPlugin.java
+++ /dev/null
@@ -1,93 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the Uma edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class UmaEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final UmaEditPlugin INSTANCE = new UmaEditPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UmaEditPlugin() {
-		super(new ResourceLocator[] {});
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static class Implementation extends EclipsePlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/UmaItemProviderAdapterFactory.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/UmaItemProviderAdapterFactory.java
deleted file mode 100755
index eb34fac..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/UmaItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,2367 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.util.UmaAdapterFactory;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class UmaItemProviderAdapterFactory extends UmaAdapterFactory implements
-		ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection supportedTypes = new ArrayList();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UmaItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Package} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PackageItemProvider packageItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Package}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createPackageAdapter() {
-		if (packageItemProvider == null) {
-			packageItemProvider = new PackageItemProvider(this);
-		}
-
-		return packageItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Constraint} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConstraintItemProvider constraintItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Constraint}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createConstraintAdapter() {
-		if (constraintItemProvider == null) {
-			constraintItemProvider = new ConstraintItemProvider(this);
-		}
-
-		return constraintItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.MethodElementProperty} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodElementPropertyItemProvider methodElementPropertyItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.MethodElementProperty}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createMethodElementPropertyAdapter() {
-		if (methodElementPropertyItemProvider == null) {
-			methodElementPropertyItemProvider = new MethodElementPropertyItemProvider(
-					this);
-		}
-
-		return methodElementPropertyItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Role} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoleItemProvider roleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Role}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createRoleAdapter() {
-		if (roleItemProvider == null) {
-			roleItemProvider = new RoleItemProvider(this);
-		}
-
-		return roleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Task} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaskItemProvider taskItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Task}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createTaskAdapter() {
-		if (taskItemProvider == null) {
-			taskItemProvider = new TaskItemProvider(this);
-		}
-
-		return taskItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Step} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StepItemProvider stepItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Step}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createStepAdapter() {
-		if (stepItemProvider == null) {
-			stepItemProvider = new StepItemProvider(this);
-		}
-
-		return stepItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Artifact} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ArtifactItemProvider artifactItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Artifact}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createArtifactAdapter() {
-		if (artifactItemProvider == null) {
-			artifactItemProvider = new ArtifactItemProvider(this);
-		}
-
-		return artifactItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Deliverable} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DeliverableItemProvider deliverableItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Deliverable}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createDeliverableAdapter() {
-		if (deliverableItemProvider == null) {
-			deliverableItemProvider = new DeliverableItemProvider(this);
-		}
-
-		return deliverableItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Outcome} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OutcomeItemProvider outcomeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Outcome}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createOutcomeAdapter() {
-		if (outcomeItemProvider == null) {
-			outcomeItemProvider = new OutcomeItemProvider(this);
-		}
-
-		return outcomeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Point} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PointItemProvider pointItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Point}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createPointAdapter() {
-		if (pointItemProvider == null) {
-			pointItemProvider = new PointItemProvider(this);
-		}
-
-		return pointItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.DiagramLink} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DiagramLinkItemProvider diagramLinkItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.DiagramLink}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createDiagramLinkAdapter() {
-		if (diagramLinkItemProvider == null) {
-			diagramLinkItemProvider = new DiagramLinkItemProvider(this);
-		}
-
-		return diagramLinkItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.GraphConnector} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GraphConnectorItemProvider graphConnectorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.GraphConnector}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createGraphConnectorAdapter() {
-		if (graphConnectorItemProvider == null) {
-			graphConnectorItemProvider = new GraphConnectorItemProvider(this);
-		}
-
-		return graphConnectorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Dimension} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DimensionItemProvider dimensionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Dimension}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createDimensionAdapter() {
-		if (dimensionItemProvider == null) {
-			dimensionItemProvider = new DimensionItemProvider(this);
-		}
-
-		return dimensionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Reference} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReferenceItemProvider referenceItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Reference}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createReferenceAdapter() {
-		if (referenceItemProvider == null) {
-			referenceItemProvider = new ReferenceItemProvider(this);
-		}
-
-		return referenceItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Property} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PropertyItemProvider propertyItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Property}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createPropertyAdapter() {
-		if (propertyItemProvider == null) {
-			propertyItemProvider = new PropertyItemProvider(this);
-		}
-
-		return propertyItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.GraphEdge} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GraphEdgeItemProvider graphEdgeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.GraphEdge}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createGraphEdgeAdapter() {
-		if (graphEdgeItemProvider == null) {
-			graphEdgeItemProvider = new GraphEdgeItemProvider(this);
-		}
-
-		return graphEdgeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Diagram} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DiagramItemProvider diagramItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Diagram}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createDiagramAdapter() {
-		if (diagramItemProvider == null) {
-			diagramItemProvider = new DiagramItemProvider(this);
-		}
-
-		return diagramItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.GraphNode} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GraphNodeItemProvider graphNodeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.GraphNode}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createGraphNodeAdapter() {
-		if (graphNodeItemProvider == null) {
-			graphNodeItemProvider = new GraphNodeItemProvider(this);
-		}
-
-		return graphNodeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.SimpleSemanticModelElement} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SimpleSemanticModelElementItemProvider simpleSemanticModelElementItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.SimpleSemanticModelElement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createSimpleSemanticModelElementAdapter() {
-		if (simpleSemanticModelElementItemProvider == null) {
-			simpleSemanticModelElementItemProvider = new SimpleSemanticModelElementItemProvider(
-					this);
-		}
-
-		return simpleSemanticModelElementItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.UMASemanticModelBridge} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UMASemanticModelBridgeItemProvider umaSemanticModelBridgeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.UMASemanticModelBridge}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createUMASemanticModelBridgeAdapter() {
-		if (umaSemanticModelBridgeItemProvider == null) {
-			umaSemanticModelBridgeItemProvider = new UMASemanticModelBridgeItemProvider(
-					this);
-		}
-
-		return umaSemanticModelBridgeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.CoreSemanticModelBridge} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CoreSemanticModelBridgeItemProvider coreSemanticModelBridgeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.CoreSemanticModelBridge}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createCoreSemanticModelBridgeAdapter() {
-		if (coreSemanticModelBridgeItemProvider == null) {
-			coreSemanticModelBridgeItemProvider = new CoreSemanticModelBridgeItemProvider(
-					this);
-		}
-
-		return coreSemanticModelBridgeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.TextElement} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TextElementItemProvider textElementItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.TextElement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createTextElementAdapter() {
-		if (textElementItemProvider == null) {
-			textElementItemProvider = new TextElementItemProvider(this);
-		}
-
-		return textElementItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Image} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ImageItemProvider imageItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Image}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createImageAdapter() {
-		if (imageItemProvider == null) {
-			imageItemProvider = new ImageItemProvider(this);
-		}
-
-		return imageItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Polyline} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PolylineItemProvider polylineItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Polyline}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createPolylineAdapter() {
-		if (polylineItemProvider == null) {
-			polylineItemProvider = new PolylineItemProvider(this);
-		}
-
-		return polylineItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Ellipse} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EllipseItemProvider ellipseItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Ellipse}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createEllipseAdapter() {
-		if (ellipseItemProvider == null) {
-			ellipseItemProvider = new EllipseItemProvider(this);
-		}
-
-		return ellipseItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Activity} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ActivityItemProvider activityItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Activity}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createActivityAdapter() {
-		if (activityItemProvider == null) {
-			activityItemProvider = new ActivityItemProvider(this);
-		}
-
-		return activityItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Milestone} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MilestoneItemProvider milestoneItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Milestone}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createMilestoneAdapter() {
-		if (milestoneItemProvider == null) {
-			milestoneItemProvider = new MilestoneItemProvider(this);
-		}
-
-		return milestoneItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Iteration} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IterationItemProvider iterationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Iteration}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createIterationAdapter() {
-		if (iterationItemProvider == null) {
-			iterationItemProvider = new IterationItemProvider(this);
-		}
-
-		return iterationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Phase} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PhaseItemProvider phaseItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Phase}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createPhaseAdapter() {
-		if (phaseItemProvider == null) {
-			phaseItemProvider = new PhaseItemProvider(this);
-		}
-
-		return phaseItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.TeamProfile} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TeamProfileItemProvider teamProfileItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.TeamProfile}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createTeamProfileAdapter() {
-		if (teamProfileItemProvider == null) {
-			teamProfileItemProvider = new TeamProfileItemProvider(this);
-		}
-
-		return teamProfileItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.RoleDescriptor} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoleDescriptorItemProvider roleDescriptorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.RoleDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createRoleDescriptorAdapter() {
-		if (roleDescriptorItemProvider == null) {
-			roleDescriptorItemProvider = new RoleDescriptorItemProvider(this);
-		}
-
-		return roleDescriptorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.WorkOrder} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkOrderItemProvider workOrderItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.WorkOrder}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createWorkOrderAdapter() {
-		if (workOrderItemProvider == null) {
-			workOrderItemProvider = new WorkOrderItemProvider(this);
-		}
-
-		return workOrderItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.PlanningData} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PlanningDataItemProvider planningDataItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.PlanningData}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createPlanningDataAdapter() {
-		if (planningDataItemProvider == null) {
-			planningDataItemProvider = new PlanningDataItemProvider(this);
-		}
-
-		return planningDataItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.TaskDescriptor} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaskDescriptorItemProvider taskDescriptorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.TaskDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createTaskDescriptorAdapter() {
-		if (taskDescriptorItemProvider == null) {
-			taskDescriptorItemProvider = new TaskDescriptorItemProvider(this);
-		}
-
-		return taskDescriptorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.WorkProductDescriptor} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkProductDescriptorItemProvider workProductDescriptorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.WorkProductDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createWorkProductDescriptorAdapter() {
-		if (workProductDescriptorItemProvider == null) {
-			workProductDescriptorItemProvider = new WorkProductDescriptorItemProvider(
-					this);
-		}
-
-		return workProductDescriptorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.CompositeRole} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CompositeRoleItemProvider compositeRoleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.CompositeRole}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createCompositeRoleAdapter() {
-		if (compositeRoleItemProvider == null) {
-			compositeRoleItemProvider = new CompositeRoleItemProvider(this);
-		}
-
-		return compositeRoleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.BreakdownElementDescription} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BreakdownElementDescriptionItemProvider breakdownElementDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.BreakdownElementDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createBreakdownElementDescriptionAdapter() {
-		if (breakdownElementDescriptionItemProvider == null) {
-			breakdownElementDescriptionItemProvider = new BreakdownElementDescriptionItemProvider(
-					this);
-		}
-
-		return breakdownElementDescriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.ActivityDescription} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ActivityDescriptionItemProvider activityDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.ActivityDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createActivityDescriptionAdapter() {
-		if (activityDescriptionItemProvider == null) {
-			activityDescriptionItemProvider = new ActivityDescriptionItemProvider(
-					this);
-		}
-
-		return activityDescriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.DeliveryProcessDescription} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DeliveryProcessDescriptionItemProvider deliveryProcessDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.DeliveryProcessDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createDeliveryProcessDescriptionAdapter() {
-		if (deliveryProcessDescriptionItemProvider == null) {
-			deliveryProcessDescriptionItemProvider = new DeliveryProcessDescriptionItemProvider(
-					this);
-		}
-
-		return deliveryProcessDescriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.ProcessDescription} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessDescriptionItemProvider processDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.ProcessDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createProcessDescriptionAdapter() {
-		if (processDescriptionItemProvider == null) {
-			processDescriptionItemProvider = new ProcessDescriptionItemProvider(
-					this);
-		}
-
-		return processDescriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.DescriptorDescription} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DescriptorDescriptionItemProvider descriptorDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.DescriptorDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createDescriptorDescriptionAdapter() {
-		if (descriptorDescriptionItemProvider == null) {
-			descriptorDescriptionItemProvider = new DescriptorDescriptionItemProvider(
-					this);
-		}
-
-		return descriptorDescriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Concept} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConceptItemProvider conceptItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Concept}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createConceptAdapter() {
-		if (conceptItemProvider == null) {
-			conceptItemProvider = new ConceptItemProvider(this);
-		}
-
-		return conceptItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Checklist} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ChecklistItemProvider checklistItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Checklist}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createChecklistAdapter() {
-		if (checklistItemProvider == null) {
-			checklistItemProvider = new ChecklistItemProvider(this);
-		}
-
-		return checklistItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Example} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExampleItemProvider exampleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Example}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createExampleAdapter() {
-		if (exampleItemProvider == null) {
-			exampleItemProvider = new ExampleItemProvider(this);
-		}
-
-		return exampleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Guideline} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GuidelineItemProvider guidelineItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Guideline}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createGuidelineAdapter() {
-		if (guidelineItemProvider == null) {
-			guidelineItemProvider = new GuidelineItemProvider(this);
-		}
-
-		return guidelineItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.EstimationConsiderations} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EstimationConsiderationsItemProvider estimationConsiderationsItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.EstimationConsiderations}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createEstimationConsiderationsAdapter() {
-		if (estimationConsiderationsItemProvider == null) {
-			estimationConsiderationsItemProvider = new EstimationConsiderationsItemProvider(
-					this);
-		}
-
-		return estimationConsiderationsItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Report} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReportItemProvider reportItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Report}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createReportAdapter() {
-		if (reportItemProvider == null) {
-			reportItemProvider = new ReportItemProvider(this);
-		}
-
-		return reportItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Template} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TemplateItemProvider templateItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Template}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createTemplateAdapter() {
-		if (templateItemProvider == null) {
-			templateItemProvider = new TemplateItemProvider(this);
-		}
-
-		return templateItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.SupportingMaterial} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SupportingMaterialItemProvider supportingMaterialItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.SupportingMaterial}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createSupportingMaterialAdapter() {
-		if (supportingMaterialItemProvider == null) {
-			supportingMaterialItemProvider = new SupportingMaterialItemProvider(
-					this);
-		}
-
-		return supportingMaterialItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.ToolMentor} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ToolMentorItemProvider toolMentorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.ToolMentor}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createToolMentorAdapter() {
-		if (toolMentorItemProvider == null) {
-			toolMentorItemProvider = new ToolMentorItemProvider(this);
-		}
-
-		return toolMentorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Whitepaper} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WhitepaperItemProvider whitepaperItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Whitepaper}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createWhitepaperAdapter() {
-		if (whitepaperItemProvider == null) {
-			whitepaperItemProvider = new WhitepaperItemProvider(this);
-		}
-
-		return whitepaperItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.TermDefinition} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TermDefinitionItemProvider termDefinitionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.TermDefinition}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createTermDefinitionAdapter() {
-		if (termDefinitionItemProvider == null) {
-			termDefinitionItemProvider = new TermDefinitionItemProvider(this);
-		}
-
-		return termDefinitionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Practice} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PracticeItemProvider practiceItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Practice}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createPracticeAdapter() {
-		if (practiceItemProvider == null) {
-			practiceItemProvider = new PracticeItemProvider(this);
-		}
-
-		return practiceItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.ReusableAsset} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReusableAssetItemProvider reusableAssetItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.ReusableAsset}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createReusableAssetAdapter() {
-		if (reusableAssetItemProvider == null) {
-			reusableAssetItemProvider = new ReusableAssetItemProvider(this);
-		}
-
-		return reusableAssetItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.State} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StateItemProvider stateItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.State}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createStateAdapter() {
-		if (stateItemProvider == null) {
-			stateItemProvider = new StateItemProvider(this);
-		}
-
-		return stateItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Vertex} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected VertexItemProvider vertexItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Vertex}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createVertexAdapter() {
-		if (vertexItemProvider == null) {
-			vertexItemProvider = new VertexItemProvider(this);
-		}
-
-		return vertexItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Region} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RegionItemProvider regionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Region}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createRegionAdapter() {
-		if (regionItemProvider == null) {
-			regionItemProvider = new RegionItemProvider(this);
-		}
-
-		return regionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.StateMachine} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StateMachineItemProvider stateMachineItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.StateMachine}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createStateMachineAdapter() {
-		if (stateMachineItemProvider == null) {
-			stateMachineItemProvider = new StateMachineItemProvider(this);
-		}
-
-		return stateMachineItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Transition} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TransitionItemProvider transitionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Transition}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createTransitionAdapter() {
-		if (transitionItemProvider == null) {
-			transitionItemProvider = new TransitionItemProvider(this);
-		}
-
-		return transitionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.PseudoState} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PseudoStateItemProvider pseudoStateItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.PseudoState}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createPseudoStateAdapter() {
-		if (pseudoStateItemProvider == null) {
-			pseudoStateItemProvider = new PseudoStateItemProvider(this);
-		}
-
-		return pseudoStateItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Discipline} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DisciplineItemProvider disciplineItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Discipline}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createDisciplineAdapter() {
-		if (disciplineItemProvider == null) {
-			disciplineItemProvider = new DisciplineItemProvider(this);
-		}
-
-		return disciplineItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.RoleSet} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoleSetItemProvider roleSetItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.RoleSet}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createRoleSetAdapter() {
-		if (roleSetItemProvider == null) {
-			roleSetItemProvider = new RoleSetItemProvider(this);
-		}
-
-		return roleSetItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Domain} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DomainItemProvider domainItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Domain}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createDomainAdapter() {
-		if (domainItemProvider == null) {
-			domainItemProvider = new DomainItemProvider(this);
-		}
-
-		return domainItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.WorkProductType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkProductTypeItemProvider workProductTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.WorkProductType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createWorkProductTypeAdapter() {
-		if (workProductTypeItemProvider == null) {
-			workProductTypeItemProvider = new WorkProductTypeItemProvider(this);
-		}
-
-		return workProductTypeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.DisciplineGrouping} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DisciplineGroupingItemProvider disciplineGroupingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.DisciplineGrouping}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createDisciplineGroupingAdapter() {
-		if (disciplineGroupingItemProvider == null) {
-			disciplineGroupingItemProvider = new DisciplineGroupingItemProvider(
-					this);
-		}
-
-		return disciplineGroupingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Tool} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ToolItemProvider toolItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Tool}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createToolAdapter() {
-		if (toolItemProvider == null) {
-			toolItemProvider = new ToolItemProvider(this);
-		}
-
-		return toolItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.RoleSetGrouping} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoleSetGroupingItemProvider roleSetGroupingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.RoleSetGrouping}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createRoleSetGroupingAdapter() {
-		if (roleSetGroupingItemProvider == null) {
-			roleSetGroupingItemProvider = new RoleSetGroupingItemProvider(this);
-		}
-
-		return roleSetGroupingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.CustomCategory} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomCategoryItemProvider customCategoryItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.CustomCategory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createCustomCategoryAdapter() {
-		if (customCategoryItemProvider == null) {
-			customCategoryItemProvider = new CustomCategoryItemProvider(this);
-		}
-
-		return customCategoryItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.CapabilityPattern} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CapabilityPatternItemProvider capabilityPatternItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.CapabilityPattern}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createCapabilityPatternAdapter() {
-		if (capabilityPatternItemProvider == null) {
-			capabilityPatternItemProvider = new CapabilityPatternItemProvider(
-					this);
-		}
-
-		return capabilityPatternItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.DeliveryProcess} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DeliveryProcessItemProvider deliveryProcessItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.DeliveryProcess}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createDeliveryProcessAdapter() {
-		if (deliveryProcessItemProvider == null) {
-			deliveryProcessItemProvider = new DeliveryProcessItemProvider(this);
-		}
-
-		return deliveryProcessItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.ProcessPlanningTemplate} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessPlanningTemplateItemProvider processPlanningTemplateItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.ProcessPlanningTemplate}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createProcessPlanningTemplateAdapter() {
-		if (processPlanningTemplateItemProvider == null) {
-			processPlanningTemplateItemProvider = new ProcessPlanningTemplateItemProvider(
-					this);
-		}
-
-		return processPlanningTemplateItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Roadmap} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoadmapItemProvider roadmapItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Roadmap}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createRoadmapAdapter() {
-		if (roadmapItemProvider == null) {
-			roadmapItemProvider = new RoadmapItemProvider(this);
-		}
-
-		return roadmapItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.ContentPackage} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContentPackageItemProvider contentPackageItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.ContentPackage}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createContentPackageAdapter() {
-		if (contentPackageItemProvider == null) {
-			contentPackageItemProvider = new ContentPackageItemProvider(this);
-		}
-
-		return contentPackageItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.ProcessComponent} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessComponentItemProvider processComponentItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.ProcessComponent}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createProcessComponentAdapter() {
-		if (processComponentItemProvider == null) {
-			processComponentItemProvider = new ProcessComponentItemProvider(
-					this);
-		}
-
-		return processComponentItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.ProcessPackage} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessPackageItemProvider processPackageItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.ProcessPackage}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createProcessPackageAdapter() {
-		if (processPackageItemProvider == null) {
-			processPackageItemProvider = new ProcessPackageItemProvider(this);
-		}
-
-		return processPackageItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.ProcessComponentInterface} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessComponentInterfaceItemProvider processComponentInterfaceItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.ProcessComponentInterface}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createProcessComponentInterfaceAdapter() {
-		if (processComponentInterfaceItemProvider == null) {
-			processComponentInterfaceItemProvider = new ProcessComponentInterfaceItemProvider(
-					this);
-		}
-
-		return processComponentInterfaceItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.ProcessComponentDescriptor} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessComponentDescriptorItemProvider processComponentDescriptorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.ProcessComponentDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createProcessComponentDescriptorAdapter() {
-		if (processComponentDescriptorItemProvider == null) {
-			processComponentDescriptorItemProvider = new ProcessComponentDescriptorItemProvider(
-					this);
-		}
-
-		return processComponentDescriptorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.MethodPlugin} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodPluginItemProvider methodPluginItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.MethodPlugin}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createMethodPluginAdapter() {
-		if (methodPluginItemProvider == null) {
-			methodPluginItemProvider = new MethodPluginItemProvider(this);
-		}
-
-		return methodPluginItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.ContentDescription} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContentDescriptionItemProvider contentDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.ContentDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createContentDescriptionAdapter() {
-		if (contentDescriptionItemProvider == null) {
-			contentDescriptionItemProvider = new ContentDescriptionItemProvider(
-					this);
-		}
-
-		return contentDescriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.Section} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SectionItemProvider sectionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.Section}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createSectionAdapter() {
-		if (sectionItemProvider == null) {
-			sectionItemProvider = new SectionItemProvider(this);
-		}
-
-		return sectionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.ArtifactDescription} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ArtifactDescriptionItemProvider artifactDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.ArtifactDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createArtifactDescriptionAdapter() {
-		if (artifactDescriptionItemProvider == null) {
-			artifactDescriptionItemProvider = new ArtifactDescriptionItemProvider(
-					this);
-		}
-
-		return artifactDescriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.WorkProductDescription} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkProductDescriptionItemProvider workProductDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.WorkProductDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createWorkProductDescriptionAdapter() {
-		if (workProductDescriptionItemProvider == null) {
-			workProductDescriptionItemProvider = new WorkProductDescriptionItemProvider(
-					this);
-		}
-
-		return workProductDescriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.DeliverableDescription} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DeliverableDescriptionItemProvider deliverableDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.DeliverableDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createDeliverableDescriptionAdapter() {
-		if (deliverableDescriptionItemProvider == null) {
-			deliverableDescriptionItemProvider = new DeliverableDescriptionItemProvider(
-					this);
-		}
-
-		return deliverableDescriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.RoleDescription} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoleDescriptionItemProvider roleDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.RoleDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createRoleDescriptionAdapter() {
-		if (roleDescriptionItemProvider == null) {
-			roleDescriptionItemProvider = new RoleDescriptionItemProvider(this);
-		}
-
-		return roleDescriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.TaskDescription} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaskDescriptionItemProvider taskDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.TaskDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createTaskDescriptionAdapter() {
-		if (taskDescriptionItemProvider == null) {
-			taskDescriptionItemProvider = new TaskDescriptionItemProvider(this);
-		}
-
-		return taskDescriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.GuidanceDescription} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GuidanceDescriptionItemProvider guidanceDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.GuidanceDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createGuidanceDescriptionAdapter() {
-		if (guidanceDescriptionItemProvider == null) {
-			guidanceDescriptionItemProvider = new GuidanceDescriptionItemProvider(
-					this);
-		}
-
-		return guidanceDescriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.PracticeDescription} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PracticeDescriptionItemProvider practiceDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.PracticeDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createPracticeDescriptionAdapter() {
-		if (practiceDescriptionItemProvider == null) {
-			practiceDescriptionItemProvider = new PracticeDescriptionItemProvider(
-					this);
-		}
-
-		return practiceDescriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.MethodConfiguration} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodConfigurationItemProvider methodConfigurationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.MethodConfiguration}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createMethodConfigurationAdapter() {
-		if (methodConfigurationItemProvider == null) {
-			methodConfigurationItemProvider = new MethodConfigurationItemProvider(
-					this);
-		}
-
-		return methodConfigurationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.ProcessFamily} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessFamilyItemProvider processFamilyItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.ProcessFamily}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createProcessFamilyAdapter() {
-		if (processFamilyItemProvider == null) {
-			processFamilyItemProvider = new ProcessFamilyItemProvider(this);
-		}
-
-		return processFamilyItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.epf.uma.MethodLibrary} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodLibraryItemProvider methodLibraryItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.epf.uma.MethodLibrary}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createMethodLibraryAdapter() {
-		if (methodLibraryItemProvider == null) {
-			methodLibraryItemProvider = new MethodLibraryItemProvider(this);
-		}
-
-		return methodLibraryItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory
-				.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentAdapterFactory(
-			ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class)
-					|| (((Class) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void dispose() {
-		if (packageItemProvider != null)
-			packageItemProvider.dispose();
-		if (constraintItemProvider != null)
-			constraintItemProvider.dispose();
-		if (methodElementPropertyItemProvider != null)
-			methodElementPropertyItemProvider.dispose();
-		if (contentDescriptionItemProvider != null)
-			contentDescriptionItemProvider.dispose();
-		if (sectionItemProvider != null)
-			sectionItemProvider.dispose();
-		if (roleItemProvider != null)
-			roleItemProvider.dispose();
-		if (taskItemProvider != null)
-			taskItemProvider.dispose();
-		if (stepItemProvider != null)
-			stepItemProvider.dispose();
-		if (artifactItemProvider != null)
-			artifactItemProvider.dispose();
-		if (deliverableItemProvider != null)
-			deliverableItemProvider.dispose();
-		if (outcomeItemProvider != null)
-			outcomeItemProvider.dispose();
-		if (contentPackageItemProvider != null)
-			contentPackageItemProvider.dispose();
-		if (artifactDescriptionItemProvider != null)
-			artifactDescriptionItemProvider.dispose();
-		if (workProductDescriptionItemProvider != null)
-			workProductDescriptionItemProvider.dispose();
-		if (deliverableDescriptionItemProvider != null)
-			deliverableDescriptionItemProvider.dispose();
-		if (roleDescriptionItemProvider != null)
-			roleDescriptionItemProvider.dispose();
-		if (taskDescriptionItemProvider != null)
-			taskDescriptionItemProvider.dispose();
-		if (guidanceDescriptionItemProvider != null)
-			guidanceDescriptionItemProvider.dispose();
-		if (practiceDescriptionItemProvider != null)
-			practiceDescriptionItemProvider.dispose();
-		if (pointItemProvider != null)
-			pointItemProvider.dispose();
-		if (diagramLinkItemProvider != null)
-			diagramLinkItemProvider.dispose();
-		if (graphConnectorItemProvider != null)
-			graphConnectorItemProvider.dispose();
-		if (dimensionItemProvider != null)
-			dimensionItemProvider.dispose();
-		if (referenceItemProvider != null)
-			referenceItemProvider.dispose();
-		if (propertyItemProvider != null)
-			propertyItemProvider.dispose();
-		if (graphEdgeItemProvider != null)
-			graphEdgeItemProvider.dispose();
-		if (diagramItemProvider != null)
-			diagramItemProvider.dispose();
-		if (graphNodeItemProvider != null)
-			graphNodeItemProvider.dispose();
-		if (simpleSemanticModelElementItemProvider != null)
-			simpleSemanticModelElementItemProvider.dispose();
-		if (umaSemanticModelBridgeItemProvider != null)
-			umaSemanticModelBridgeItemProvider.dispose();
-		if (coreSemanticModelBridgeItemProvider != null)
-			coreSemanticModelBridgeItemProvider.dispose();
-		if (textElementItemProvider != null)
-			textElementItemProvider.dispose();
-		if (imageItemProvider != null)
-			imageItemProvider.dispose();
-		if (polylineItemProvider != null)
-			polylineItemProvider.dispose();
-		if (ellipseItemProvider != null)
-			ellipseItemProvider.dispose();
-		if (activityItemProvider != null)
-			activityItemProvider.dispose();
-		if (milestoneItemProvider != null)
-			milestoneItemProvider.dispose();
-		if (iterationItemProvider != null)
-			iterationItemProvider.dispose();
-		if (phaseItemProvider != null)
-			phaseItemProvider.dispose();
-		if (teamProfileItemProvider != null)
-			teamProfileItemProvider.dispose();
-		if (roleDescriptorItemProvider != null)
-			roleDescriptorItemProvider.dispose();
-		if (workOrderItemProvider != null)
-			workOrderItemProvider.dispose();
-		if (planningDataItemProvider != null)
-			planningDataItemProvider.dispose();
-		if (workProductDescriptorItemProvider != null)
-			workProductDescriptorItemProvider.dispose();
-		if (taskDescriptorItemProvider != null)
-			taskDescriptorItemProvider.dispose();
-		if (compositeRoleItemProvider != null)
-			compositeRoleItemProvider.dispose();
-		if (breakdownElementDescriptionItemProvider != null)
-			breakdownElementDescriptionItemProvider.dispose();
-		if (activityDescriptionItemProvider != null)
-			activityDescriptionItemProvider.dispose();
-		if (deliveryProcessDescriptionItemProvider != null)
-			deliveryProcessDescriptionItemProvider.dispose();
-		if (processDescriptionItemProvider != null)
-			processDescriptionItemProvider.dispose();
-		if (descriptorDescriptionItemProvider != null)
-			descriptorDescriptionItemProvider.dispose();
-		if (conceptItemProvider != null)
-			conceptItemProvider.dispose();
-		if (checklistItemProvider != null)
-			checklistItemProvider.dispose();
-		if (exampleItemProvider != null)
-			exampleItemProvider.dispose();
-		if (guidelineItemProvider != null)
-			guidelineItemProvider.dispose();
-		if (reportItemProvider != null)
-			reportItemProvider.dispose();
-		if (templateItemProvider != null)
-			templateItemProvider.dispose();
-		if (supportingMaterialItemProvider != null)
-			supportingMaterialItemProvider.dispose();
-		if (toolMentorItemProvider != null)
-			toolMentorItemProvider.dispose();
-		if (whitepaperItemProvider != null)
-			whitepaperItemProvider.dispose();
-		if (termDefinitionItemProvider != null)
-			termDefinitionItemProvider.dispose();
-		if (practiceItemProvider != null)
-			practiceItemProvider.dispose();
-		if (estimationConsiderationsItemProvider != null)
-			estimationConsiderationsItemProvider.dispose();
-		if (reusableAssetItemProvider != null)
-			reusableAssetItemProvider.dispose();
-		if (stateItemProvider != null)
-			stateItemProvider.dispose();
-		if (vertexItemProvider != null)
-			vertexItemProvider.dispose();
-		if (regionItemProvider != null)
-			regionItemProvider.dispose();
-		if (stateMachineItemProvider != null)
-			stateMachineItemProvider.dispose();
-		if (transitionItemProvider != null)
-			transitionItemProvider.dispose();
-		if (pseudoStateItemProvider != null)
-			pseudoStateItemProvider.dispose();
-		if (disciplineItemProvider != null)
-			disciplineItemProvider.dispose();
-		if (roleSetItemProvider != null)
-			roleSetItemProvider.dispose();
-		if (domainItemProvider != null)
-			domainItemProvider.dispose();
-		if (workProductTypeItemProvider != null)
-			workProductTypeItemProvider.dispose();
-		if (disciplineGroupingItemProvider != null)
-			disciplineGroupingItemProvider.dispose();
-		if (toolItemProvider != null)
-			toolItemProvider.dispose();
-		if (roleSetGroupingItemProvider != null)
-			roleSetGroupingItemProvider.dispose();
-		if (customCategoryItemProvider != null)
-			customCategoryItemProvider.dispose();
-		if (deliveryProcessItemProvider != null)
-			deliveryProcessItemProvider.dispose();
-		if (capabilityPatternItemProvider != null)
-			capabilityPatternItemProvider.dispose();
-		if (processPlanningTemplateItemProvider != null)
-			processPlanningTemplateItemProvider.dispose();
-		if (roadmapItemProvider != null)
-			roadmapItemProvider.dispose();
-		if (processComponentItemProvider != null)
-			processComponentItemProvider.dispose();
-		if (processPackageItemProvider != null)
-			processPackageItemProvider.dispose();
-		if (processComponentInterfaceItemProvider != null)
-			processComponentInterfaceItemProvider.dispose();
-		if (processComponentDescriptorItemProvider != null)
-			processComponentDescriptorItemProvider.dispose();
-		if (methodPluginItemProvider != null)
-			methodPluginItemProvider.dispose();
-		if (methodConfigurationItemProvider != null)
-			methodConfigurationItemProvider.dispose();
-		if (processFamilyItemProvider != null)
-			processFamilyItemProvider.dispose();
-		if (methodLibraryItemProvider != null)
-			methodLibraryItemProvider.dispose();
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/VariabilityElementItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/VariabilityElementItemProvider.java
deleted file mode 100755
index 6f3a101..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/VariabilityElementItemProvider.java
+++ /dev/null
@@ -1,168 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.VariabilityElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class VariabilityElementItemProvider extends MethodElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addVariabilityTypePropertyDescriptor(object);
-			addVariabilityBasedOnElementPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Variability Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addVariabilityTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_VariabilityElement_variabilityType_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_VariabilityElement_variabilityType_feature", "_UI_VariabilityElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.VARIABILITY_ELEMENT__VARIABILITY_TYPE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Variability Based On Element feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addVariabilityBasedOnElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_VariabilityElement_variabilityBasedOnElement_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_VariabilityElement_variabilityBasedOnElement_feature", "_UI_VariabilityElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns VariabilityElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/VariabilityElement")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((VariabilityElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_VariabilityElement_type") : //$NON-NLS-1$
-				getString("_UI_VariabilityElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(VariabilityElement.class)) {
-		case UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_TYPE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/VertexItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/VertexItemProvider.java
deleted file mode 100755
index 5d2328f..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/VertexItemProvider.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: VertexItemProvider.java,v 1.4 2006/09/07 00:06:39 klow Exp $
- */
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Vertex} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class VertexItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VertexItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addOutgoingPropertyDescriptor(object);
-			addIncomingPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Outgoing feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOutgoingPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Vertex_outgoing_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Vertex_outgoing_feature", "_UI_Vertex_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.VERTEX__OUTGOING, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Incoming feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIncomingPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Vertex_incoming_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_Vertex_incoming_feature", "_UI_Vertex_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.VERTEX__INCOMING, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This returns Vertex.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Vertex")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_Vertex_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WhitepaperItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WhitepaperItemProvider.java
deleted file mode 100755
index c217cf3..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WhitepaperItemProvider.java
+++ /dev/null
@@ -1,116 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.Whitepaper;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.Whitepaper} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class WhitepaperItemProvider extends ConceptItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WhitepaperItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Whitepaper.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/Whitepaper")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Whitepaper) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Whitepaper_type") : //$NON-NLS-1$
-				getString("_UI_Whitepaper_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkBreakdownElementItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkBreakdownElementItemProvider.java
deleted file mode 100755
index 40bd1bb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkBreakdownElementItemProvider.java
+++ /dev/null
@@ -1,213 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.WorkBreakdownElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class WorkBreakdownElementItemProvider extends
-		BreakdownElementItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider,
-		IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkBreakdownElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIsRepeatablePropertyDescriptor(object);
-			addIsOngoingPropertyDescriptor(object);
-			addIsEventDrivenPropertyDescriptor(object);
-			addLinkToPredecessorPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Is Repeatable feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIsRepeatablePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkBreakdownElement_isRepeatable_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkBreakdownElement_isRepeatable_feature", "_UI_WorkBreakdownElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Is Ongoing feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIsOngoingPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkBreakdownElement_isOngoing_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkBreakdownElement_isOngoing_feature", "_UI_WorkBreakdownElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_BREAKDOWN_ELEMENT__IS_ONGOING,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Is Event Driven feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIsEventDrivenPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkBreakdownElement_isEventDriven_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkBreakdownElement_isEventDriven_feature", "_UI_WorkBreakdownElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Link To Predecessor feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addLinkToPredecessorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkBreakdownElement_linkToPredecessor_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkBreakdownElement_linkToPredecessor_feature", "_UI_WorkBreakdownElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_BREAKDOWN_ELEMENT__LINK_TO_PREDECESSOR,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns WorkBreakdownElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/WorkBreakdownElement")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WorkBreakdownElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_WorkBreakdownElement_type") : //$NON-NLS-1$
-				getString("_UI_WorkBreakdownElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(WorkBreakdownElement.class)) {
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE:
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_ONGOING:
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkDefinitionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkDefinitionItemProvider.java
deleted file mode 100755
index 1973e63..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkDefinitionItemProvider.java
+++ /dev/null
@@ -1,190 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkDefinition;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.WorkDefinition} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class WorkDefinitionItemProvider extends MethodElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkDefinitionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(UmaPackage.Literals.WORK_DEFINITION__PRECONDITION);
-			childrenFeatures
-					.add(UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns WorkDefinition.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/WorkDefinition")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WorkDefinition) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_WorkDefinition_type") : //$NON-NLS-1$
-				getString("_UI_WorkDefinition_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(WorkDefinition.class)) {
-		case UmaPackage.WORK_DEFINITION__PRECONDITION:
-		case UmaPackage.WORK_DEFINITION__POSTCONDITION:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.WORK_DEFINITION__PRECONDITION,
-				UmaFactory.eINSTANCE.createConstraint()));
-
-		newChildDescriptors.add(createChildParameter(
-				UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION,
-				UmaFactory.eINSTANCE.createConstraint()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == UmaPackage.Literals.METHOD_ELEMENT__OWNED_RULES
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__PRECONDITION
-				|| childFeature == UmaPackage.Literals.WORK_DEFINITION__POSTCONDITION;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
-					new Object[] { getTypeText(childObject),
-							getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkOrderItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkOrderItemProvider.java
deleted file mode 100755
index 4d0f6af..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkOrderItemProvider.java
+++ /dev/null
@@ -1,168 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkOrder;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.WorkOrder} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class WorkOrderItemProvider extends ProcessElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkOrderItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addLinkTypePropertyDescriptor(object);
-			addPredPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Link Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addLinkTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkOrder_linkType_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkOrder_linkType_feature", "_UI_WorkOrder_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_ORDER__LINK_TYPE, true, false,
-						false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Pred feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPredPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkOrder_pred_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkOrder_pred_feature", "_UI_WorkOrder_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_ORDER__PRED, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This returns WorkOrder.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/WorkOrder")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WorkOrder) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_WorkOrder_type") : //$NON-NLS-1$
-				getString("_UI_WorkOrder_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(WorkOrder.class)) {
-		case UmaPackage.WORK_ORDER__LINK_TYPE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkProductDescriptionItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkProductDescriptionItemProvider.java
deleted file mode 100755
index 294b9a9..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkProductDescriptionItemProvider.java
+++ /dev/null
@@ -1,215 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProductDescription;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.WorkProductDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class WorkProductDescriptionItemProvider extends
-		ContentDescriptionItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider,
-		IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProductDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addExternalIdPropertyDescriptor(object);
-			addPurposePropertyDescriptor(object);
-			addImpactOfNotHavingPropertyDescriptor(object);
-			addReasonsForNotNeedingPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the External Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addExternalIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkProductDescription_externalId_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkProductDescription_externalId_feature", "_UI_WorkProductDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Purpose feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPurposePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkProductDescription_purpose_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkProductDescription_purpose_feature", "_UI_WorkProductDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_PRODUCT_DESCRIPTION__PURPOSE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Impact Of Not Having feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addImpactOfNotHavingPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkProductDescription_impactOfNotHaving_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkProductDescription_impactOfNotHaving_feature", "_UI_WorkProductDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Reasons For Not Needing feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addReasonsForNotNeedingPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkProductDescription_reasonsForNotNeeding_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkProductDescription_reasonsForNotNeeding_feature", "_UI_WorkProductDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns WorkProductDescription.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/WorkProductDescription")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WorkProductDescription) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_WorkProductDescription_type") : //$NON-NLS-1$
-				getString("_UI_WorkProductDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(WorkProductDescription.class)) {
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID:
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__PURPOSE:
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING:
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkProductDescriptorItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkProductDescriptorItemProvider.java
deleted file mode 100755
index b1cef87..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkProductDescriptorItemProvider.java
+++ /dev/null
@@ -1,250 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.WorkProductDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class WorkProductDescriptorItemProvider extends DescriptorItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProductDescriptorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addActivityEntryStatePropertyDescriptor(object);
-			addActivityExitStatePropertyDescriptor(object);
-			addWorkProductPropertyDescriptor(object);
-			addImpactedByPropertyDescriptor(object);
-			addImpactsPropertyDescriptor(object);
-			addDeliverablePartsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Activity Entry State feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addActivityEntryStatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkProductDescriptor_activityEntryState_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkProductDescriptor_activityEntryState_feature", "_UI_WorkProductDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Activity Exit State feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addActivityExitStatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkProductDescriptor_activityExitState_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkProductDescriptor_activityExitState_feature", "_UI_WorkProductDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE,
-						true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Work Product feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addWorkProductPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkProductDescriptor_WorkProduct_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkProductDescriptor_WorkProduct_feature", "_UI_WorkProductDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Impacted By feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addImpactedByPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkProductDescriptor_impactedBy_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkProductDescriptor_impactedBy_feature", "_UI_WorkProductDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Impacts feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addImpactsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkProductDescriptor_impacts_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkProductDescriptor_impacts_feature", "_UI_WorkProductDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_PRODUCT_DESCRIPTOR__IMPACTS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Deliverable Parts feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDeliverablePartsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkProductDescriptor_deliverableParts_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkProductDescriptor_deliverableParts_feature", "_UI_WorkProductDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns WorkProductDescriptor.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/WorkProductDescriptor")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WorkProductDescriptor) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_WorkProductDescriptor_type") : //$NON-NLS-1$
-				getString("_UI_WorkProductDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(WorkProductDescriptor.class)) {
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE:
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE:
-			fireNotifyChanged(new ViewerNotification(notification, notification
-					.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkProductItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkProductItemProvider.java
deleted file mode 100755
index 08aab61..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkProductItemProvider.java
+++ /dev/null
@@ -1,198 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.WorkProduct} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class WorkProductItemProvider extends ContentElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProductItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addReportsPropertyDescriptor(object);
-			addTemplatesPropertyDescriptor(object);
-			addToolMentorsPropertyDescriptor(object);
-			addEstimationConsiderationsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Reports feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addReportsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkProduct_reports_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkProduct_reports_feature", "_UI_WorkProduct_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_PRODUCT__REPORTS, true, false,
-						false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Templates feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTemplatesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkProduct_templates_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkProduct_templates_feature", "_UI_WorkProduct_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_PRODUCT__TEMPLATES, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Tool Mentors feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addToolMentorsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkProduct_toolMentors_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkProduct_toolMentors_feature", "_UI_WorkProduct_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_PRODUCT__TOOL_MENTORS, true,
-						false, false, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Estimation Considerations feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addEstimationConsiderationsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkProduct_estimationConsiderations_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkProduct_estimationConsiderations_feature", "_UI_WorkProduct_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_PRODUCT__ESTIMATION_CONSIDERATIONS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns WorkProduct.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/WorkProduct")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WorkProduct) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_WorkProduct_type") : //$NON-NLS-1$
-				getString("_UI_WorkProduct_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkProductTypeItemProvider.java b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkProductTypeItemProvider.java
deleted file mode 100755
index 6e1c5cb..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/WorkProductTypeItemProvider.java
+++ /dev/null
@@ -1,138 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProductType;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.epf.uma.WorkProductType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class WorkProductTypeItemProvider extends ContentCategoryItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProductTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addWorkProductsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Work Products feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addWorkProductsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory)
-								.getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_WorkProductType_workProducts_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_WorkProductType_workProducts_feature", "_UI_WorkProductType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						UmaPackage.Literals.WORK_PRODUCT_TYPE__WORK_PRODUCTS,
-						true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns WorkProductType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/WorkProductType")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((WorkProductType) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_WorkProductType_type") : //$NON-NLS-1$
-				getString("_UI_WorkProductType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors,
-			Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return UmaEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/package.html b/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/package.html
deleted file mode 100755
index d3f8ebc..0000000
--- a/plugins/org.eclipse.epf.uma.edit/src/org/eclipse/epf/uma/provider/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides item providers for displaying and editing the UMA model objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/.classpath b/plugins/org.eclipse.epf.uma/.classpath
deleted file mode 100755
index 065ac06..0000000
--- a/plugins/org.eclipse.epf.uma/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.uma/.cvsignore b/plugins/org.eclipse.epf.uma/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.uma/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.uma/.project b/plugins/org.eclipse.epf.uma/.project
deleted file mode 100755
index 66e27fb..0000000
--- a/plugins/org.eclipse.epf.uma/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.uma</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/plugins/org.eclipse.epf.uma/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.uma/META-INF/MANIFEST.MF
deleted file mode 100755
index 93462e7..0000000
--- a/plugins/org.eclipse.epf.uma/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.uma;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.epf.uma.ecore;visibility:=reexport
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.uma,
- org.eclipse.epf.uma.impl,
- org.eclipse.epf.uma.util
diff --git a/plugins/org.eclipse.epf.uma/build.properties b/plugins/org.eclipse.epf.uma/build.properties
deleted file mode 100755
index c2bafd5..0000000
--- a/plugins/org.eclipse.epf.uma/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               plugin.properties,\
-               plugin.xml
diff --git a/plugins/org.eclipse.epf.uma/model/1.0.2/uma.ecore b/plugins/org.eclipse.epf.uma/model/1.0.2/uma.ecore
deleted file mode 100755
index 4a58099..0000000
--- a/plugins/org.eclipse.epf.uma/model/1.0.2/uma.ecore
+++ /dev/null
@@ -1,1214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="uma"
-    nsURI="http://www.ibm.com/uma/1.0.2/uma.ecore" nsPrefix="com.ibm.uma">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="03"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EDataType" name="Date" instanceClassName="java.util.Date">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Data type used for attributes of meta-model classes of the type Date."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="Uri" instanceClassName="java.net.URI">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Data type used for attributes of meta-model classes that point to resources such as files."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="UnlimitedNatural" instanceClassName="int"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="String" instanceClassName="java.lang.String"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Set" instanceClassName="java.util.Set"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Sequence" instanceClassName="java.util.List"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Integer" instanceClassName="int"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Classifier" abstract="true" eSuperTypes="#//Type">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Classifier."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Type" abstract="true" eSuperTypes="#//PackageableElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Type."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Element" abstract="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Element."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NamedElement" abstract="true" eSuperTypes="#//Element">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Named Element.  Defined that every element has a name."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PackageableElement" abstract="true"
-      eSuperTypes="#//NamedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Packagable Element."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Package" eSuperTypes="#//Namespace #//PackageableElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Package."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Namespace" abstract="true" eSuperTypes="#//NamedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Namespace."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodElement" abstract="true" eSuperTypes="#//PackageableElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Every class defined in this specification is derived from Method Element.  In other words Method Element is the root generalization for all UMA classes and defines a common set of attributes inherited by every other element type of this model.  Method Element itself is derived from Packageable Element from the UML 2.0 Infrastructure.  Method Element inherits the Name attribute from Packageable Element's super class.  Every element defined as a UMA instance is derived from Model Element.  Every Method Element in-stance is at least defined by a unique id, a name, as well as brief description."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="guid" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every instance of Method Element has a global unique id."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="briefDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every instance of Method Element shall be briefly described with one or two sentences summarizing the element."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedRules" ordered="false"
-        upperBound="-1" eType="#//Constraint" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="suppressed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If a Variability Element is derived from another Variability Element using the Extends Variability Specialization then this attribute can be used to suppress inherited Method Elements that were part of the based-on Variability Element, which can be any type of Method Element.  In other words, if this attribute is set to true on a Method Element that has the same name than an inherited method element then it will not be regarded as inherited at all."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="orderingGuide" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute is used for CASE tool realizations of this model to contain information about layout and ordering of the method element and its parts."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Constraint" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Constraint is a Method Element that represents a condition or restriction expressed in natural language text or in a machine readable language for the purpose of declaring some of the semantics of a Method Element."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute stores the definition of the constraint."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentElement" abstract="true" eSuperTypes="#//DescribableElement #//VariabilityElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Content Element is a Describable Element that represents an abstract generalization for all elements that are considered to be and managed as Method Content.&#xD;&#xA;Content Elements represents reusable Method Content that is supposed to be managed in Content Packages.  The separation of Content Element from Process Element allows to clearly distinguish between pure method content from content that is represented in processes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="supportingMaterials" ordered="false"
-        upperBound="-1" eType="#//SupportingMaterial"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="conceptsAndPapers" ordered="false"
-        upperBound="-1" eType="#//Concept"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="checklists" ordered="false"
-        upperBound="-1" eType="#//Checklist"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="guidelines" ordered="false"
-        upperBound="-1" eType="#//Guideline"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="examples" ordered="false"
-        upperBound="-1" eType="#//Example"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="assets" ordered="false"
-        upperBound="-1" eType="#//ReusableAsset"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DescribableElement" abstract="true"
-      eSuperTypes="#//MethodElement #//Classifier">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Describable Element is an abstract generalization of Method Elements for which external presentation names as well as content descriptions have been defined, such as Roles or Work Products.  Presentation Name and Content Descriptions are typically localized using a resource allocation mechanism for its String type attributes.&#xD;&#xA;This abstraction represents all elements in the Method Content as well as Process space for which concrete textual descriptions are defined in the form of documenting attributes grouped in a matching Content Description instance (see Section 4.1.4).  Describable Elements are intended to be published in method or process publications (similar to the IBM Rational Unified Process web).  Describable Element defines that the element it represents will have content 'attached' to it.  Content Description is the abstraction for the actual places in which the content is being represented.  This separation allows a distinction between core method model elements describing the structure of the model from the actual description container providing, for example, the documentation of the content element in different alternatives languages, audiences, licensing levels, etc."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presentationName" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Describable Element has a presentation name, which is used for external presentation of the element.  For example, name (the internal representation) might be set to &quot;rup_architecture_document&quot; to differentiate from a &quot;j2ee_architcture_document&quot; whereas the external presentation would always be &quot;Architecture Document&quot;."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="presentation" eType="#//ContentDescription"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="shapeicon" eType="#//Uri">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A reference to an icon that can be used for modeling with specific Content Element instances (as graphical stereotypes, e.g. a use case symbol for a use case artifact) as well as publication of content."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nodeicon" eType="#//Uri">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A reference to an icon that can be used in tree browser presentations and breakdown structures."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentDescription" eSuperTypes="#//MethodUnit">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Content Description is a Method Element that is used to store the textual description for a Content Element.  It defines standard attributes applicable for all Content Element types.  Specific Content Element sub-types can define their own matching Content Description sub-types. "/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mainDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute store the main descriptive text for the Content Element.  All text that is not part of any of the more specific attributes shall be stored here.  If the Content Description is divided into sections using the Section class, then only the text from the 'start' of the content description to the first section will be stored here (similar to a normal document where you can place text between its beginning to its first diction heading)."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sections" ordered="false"
-        upperBound="-1" eType="#//Section" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="keyConsiderations" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Key Considerations provides advise and guidance of a critical nature for the content element as well as warnings, cautions, pitfalls, dangers."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Section" eSuperTypes="#//VariabilityElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Section is a special Method Element that represents structural subsections of a Content Description's sectionDescription attribute.  It is used for either large scale documentation of Content Elements organized into sections as well as to flexibly add new Sections to Content Elements using contribution variability added to the Section concept for Method Plug-ins."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sectionName" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Section has a name used for external presentation of the section, e.g. when published or when section heading are listed in a table of contents.  This attribute is similar to Presentation Name for Content Elements."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sectionDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attributes store the description text for a Content Description's Section."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subSections" ordered="false"
-        upperBound="-1" eType="#//Section" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="predecessor" eType="#//Section"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Role" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Role is a content element that defines a set of related skills, competencies, and responsibilities.  Roles are used by Tasks to define who performs them as well as define a set of work products they are responsible for.  &#xD;&#xA;A Role defines a set of related skills, competencies, and responsibilities of an individual or a set of individuals.  Roles are not individuals or resources.  Individual members of the development organization will wear different hats, or perform different roles. The mapping from individual to role, performed by the project manager when planning and staffing for a project, allows different individuals to act as several different roles, and for a role to be played by several individuals."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="modifies" ordered="false"
-        upperBound="-1" eType="#//WorkProduct" changeable="false" volatile="true"
-        transient="true" derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="responsibleFor" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProduct" abstract="true" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Work Product is an abstract class which provides a generalization for the content element types Artifact, Outcome, and Deliverable.  The meta-model class Work Product actually represents work product types, i.e. an instance of Work Product is a description of a specific type of work product and not an individual work product instance.  However, for simplicity reasons and because of low risk of misinterpretation we did not append the word 'type' to every meta-class.&#xD;&#xA;A work product is an abstraction for descriptions of content elements that are used to define anything used, produced, or modified by a task."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="estimate" eType="#//Estimate"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reports" ordered="false"
-        upperBound="-1" eType="#//Report"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="templates" ordered="false"
-        upperBound="-1" eType="#//Template"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toolMentors" ordered="false"
-        upperBound="-1" eType="#//ToolMentor"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Task" eSuperTypes="#//ContentElement #//WorkDefinition">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Task is a content element that describes work being performed by Roles.  It defines one default performing Role as well as many additional performers.  A Task is associated to input and output work products.  Inputs are differentiated in mandatory versus optional inputs.  The associations to Work Products are not instantiatable/variable-like parameters.  They rather express (hyper-)links to the descriptions of the work products types that are related to the Task as inputs and outputs.  In other words, these associations are not intended to be used to capture which concrete instances will be passed when instantiating the method in a project.  All of the Task's default associations can be overridden in an actual process definition.&#xD;&#xA;A Task describes an assignable unit of work.  Every Task is assigned to specific Roles.  The granularity of a Task is generally a few hours to a few days.  It usually affects one or only a small number of work products. A Task is used as an element of defining a process. Tasks are further used for planning and tracking progress; therefore, if they are defined too fine-grained, they will be neglected, and if they are too large, progress would have to be expressed in terms of a Task's parts (e.g. Steps, which is not recommended). &#xD;&#xA;A Task has a clear purpose in which the performing roles achieve a well defined goal.  It provides complete step-by-step explanations of doing all the work that needs to be done to achieve this goal.  This description is complete, independent of when in a process lifecycle the work would actually be done.  It therefore does not describe when you do what work at what point of time, but describes all the work that gets done throughout the development lifecycle that contributes to the achievement of this goal.  When the Task is being applied in a process then this process application (defined as Task Descriptor) provides the information of which pieces of the Task will actually be performed at any particular point in time. This assumes that the Task will be performed in the process over and over again, but each time with a slightly different emphasis on different steps or aspects of the task description. &#xD;&#xA;For example, a Task such as &quot;Develop Use Case Model&quot; describes all the work that needs to be done to develop a complete use case model. This would comprise of the identification and naming of use cases and actors, the writing of a brief description, the modeling of use cases and their relationships in diagrams, the detailed description of a basic flow, the detailed description of alternatives flows, performing of walkthroughs workshops and reviews, etc.  All of these parts contribute to the development goal of developing the use case model, but the parts will be performed at different points in time in a process.  Identification, naming, and brief descriptions would be performed early in a typical development process versus the writing of detailed alternative flows which would be performed much later.  All these parts or steps within the same Task define the &quot;method&quot; of Developing a Use Case Model.  Applying such a method in a lifecycle (i.e. in a process) is defining which steps are done when going from one iteration to the next."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="performedBy" eType="#//Role"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mandatoryInput" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="output" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="additionallyPerformedBy"
-        ordered="false" upperBound="-1" eType="#//Role"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="optionalInput" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="steps" ordered="false"
-        upperBound="-1" eType="#//Step" changeable="false" volatile="true" transient="true"
-        derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toolMentors" ordered="false"
-        upperBound="-1" eType="#//ToolMentor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="estimate" eType="#//Estimate"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkDefinition" abstract="true" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Work Definition is an abstract Method Element that generalizes all descriptions of work within the Unified Method Architecture.  This package introduces two concrete types of Work Definitions: Task and Step.  Work Definitions can contain sets of pre- and post-conditions defining constraints that need to be valid before the described work can begin or before it can be declared as finished.  Note that general ownedRules can be used to define additional constraints and rules for Work Definitions.&#xD;&#xA;Work Definitions represent behavioral descriptions for doing work.  These behavioral descriptions are not bound to one specific classifier, but represent an arbitrary definition of work.  For example, a Work Definition could represent work that is being performed by a specific Role (e.g. a Role performing a specific Task or Steps of a Task), by many Roles working in close collaboration (many Roles all working together on the same interdisciplinary Task), or complex work that is performed throughout the lifecycle (e.g. a process defining a breakdown structure for organizing larger composite units of work performed by many Roles working in collaboration)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="precondition" eType="#//Constraint"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="postcondition" eType="#//Constraint"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Step" eSuperTypes="#//Section #//WorkDefinition">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Step is a Section and Work Definition that is used to organize Tasks into parts or subunits of work.  Steps inherit the subSections decomposition from Section and can therefore describe Sub-Steps nested into Steps.&#xD;&#xA;A Step describes a meaningful and consist part of the overall work described for a Task.  The collection of Steps defined for a Task represents all the work that should be done to achieve the overall development goal of the Task.  Not all steps are necessarily performed each time a Task is invoked in a Process (see Task Descriptor), so they can also be expressed in the form of alternate 'flows' of work.  Different ways of achieving the same development goal can then be 'assembled' by selecting different combinations of steps when applying the Task in a Process.  Typical kinds of steps a Task author should consider are: Thinking steps: where the individual roles understand the nature of the task, gathers and examines the input artifacts, and formulates the outcome. Performing steps: where the individual roles create or update some artifacts. Reviewing steps: where the individual roles inspects the results against some criteria."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Guidance" abstract="true" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Guidance is an abstract generalization of additional information related to content elements such as Roles, Tasks, and Work Products.  Examples for Guidance are Guidelines, Templates, Checklists, Tool Mentors, Estimates, Supporting Materials, Reports, Concepts, etc.  This package only contains the definition of the abstract Guidance class.  The package Guidance Types defines concrete guidance types."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Artifact" eSuperTypes="#//WorkProduct">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Artifact is a Work Product that provides a description and definition for tangible work product types. Artifacts may be composed of other artifacts. For example, a model artifact can be composed of model elements, which are also artifacts.&#xD;&#xA;Artifacts are tangible work products consumed, produced, or modified by Tasks.  It may serve as a basis for defining reusable assets.  Roles use Artifacts to perform Tasks and produce Artifacts in the course of performing Tasks.  Artifacts are the responsibility of a single Role, making responsibility easy to identify and understand, and promoting the idea that every piece of information produced in the method requires the appropriate set of skills. Even though one role might &quot;own&quot; a specific type of Artifacts, other roles can still use the Artifacts; perhaps even update them if the Role has been given permission to do so."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="containerArtifact" eType="#//Artifact"
-        transient="true" eOpposite="#//Artifact/containedArtifacts"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="containedArtifacts" ordered="false"
-        upperBound="-1" eType="#//Artifact" containment="true" eOpposite="#//Artifact/containerArtifact"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Deliverable" eSuperTypes="#//WorkProduct">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A deliverable is a Work Product that provides a description and definition for packaging other Work Products, and may be delivered to an internal or external party.  Therefore, a Deliverable aggregates other Work Products. Therefore, a Deliverable aggregates other Work Products.  A Deliverable is used to pre-define typical or recommended content in the form or work products that would be packaged for delivery.  The actual packaging of the Deliverable in an actual process or even project could be a modification of this recommendation.  Deliverables are used to represent an output from a process that has value, material or otherwise, to a client, customer or other stakeholder. "/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deliveredWorkProducts"
-        ordered="false" upperBound="-1" eType="#//WorkProduct"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Outcome" eSuperTypes="#//WorkProduct">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An outcome describes intangible work products that are a result or state. Outcomes may also be used to describe work products that are not formally defined.  A key differentiator for outcomes against artifacts is that outcomes are not candidates for harvesting as reusable assets."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodPackage" abstract="true" eSuperTypes="#//MethodElement #//Package">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Package is an abstract class for packaging Method Elements.  All Method Elements shall be located in exactly one of Method Package's concrete specializations (e.g. Content Package).   Method Package defines common properties for all of its specializations. Elements are organized in Method Packages to structure large scale of method content and processes as well as to define a mechanism for reuse.  Method Elements from one package can reuse element from other packages by defining a reusedPackages link.  For example, a work product defined in one package can be used as an input for Tasks defined in other packages.  By reusing it from one common place (i.e. the package in which it has been defined) ensures that no redundant definitions of the same elements are required.  Also maintenance of method content is greatly improved as changes can be performed in only one place.  Note, that other packages will introduce more specializations of Method Package, e.g. Process Package and Process Component."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="global" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Method Packages can have a global scope.  This means that every element of every other Method Package can see the global package's contents.  Global Method Packages are primarily used to store commonly used category definitions such as for Disciplines or Domains, which are used by many Task and Work Products respectively."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reusedPackages" ordered="false"
-        upperBound="-1" eType="#//MethodPackage"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parentPackage" eType="#//MethodPackage"
-        transient="true" eOpposite="#//MethodPackage/childPackages"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="childPackages" ordered="false"
-        upperBound="-1" eType="#//MethodPackage" containment="true" eOpposite="#//MethodPackage/parentPackage"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentPackage" eSuperTypes="#//MethodPackage">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Content Package is special Method Package that contains Content Elements and Content Elements, only.  Examples for Content Element are Artifacts, Tasks, Roles, etc.  A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contentElements" ordered="false"
-        upperBound="-1" eType="#//ContentElement" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ArtifactDescription" eSuperTypes="#//WorkProductDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="briefOutline" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides a brief description of the information that can be found in this artifact. For example, discusses the contents for key chapters of a document artifact or the key packages and modules of a model artifact."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="representationOptions"
-        eType="#//String" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Discusses different possible alternative representations for the artifact. For example a design model can be represented as a UML model or an informal block diagram or by textual description only."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalId" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="An external visible number that is used to reference this artifact. Used like a synonym."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="purpose" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes why the work product is produced and to what use it will be put."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="impactOfNotHaving" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the consequences of not producing the work product.  This is intended to aid in the tailoring the method/process to the needs of a specific project."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="reasonsForNotNeeding" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the circumstances in which it is reasonable not to produce the work product.  This is intended to aid in the tailoring of the method/process to the needs of a specific project."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DeliverableDescription" eSuperTypes="#//WorkProductDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The description of the Deliverable used for client documents (proposal, statements of work or contractual agreements).  It might use a different language and follow legal constraints."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="packagingGuidance" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides guidance on how to assemble the deliverable from all its required inputs.  This section describes the most common content medium and format.  Distribution of the deliverable is addressed in this section, if necessary."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="skills" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Lists of set of required skills a person needs to possess to fulfill that Role."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="assignmentApproaches" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides guidance on for assigning individuals to the Role in terms of what other roles these individuals could perform and what responsibility different individuals assigned to this role might have.  The guidance can also describe different assignment approaches for different types of projects, e.g. for large versus small teams where individuals could be allocated to roles full time versus sharing roles within the team."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="synonyms" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Lists synonyms, i.e. other names the Role might be referred by.  Tool support for the meta-model might support that a Role name can be consistently be replaced with one of its synonyms throught a Process."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TaskDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="purpose" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Summarizes the main reason for performing this Task and what is intended to be achieved."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alternatives" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Comprises of summaries describing important exceptional and non-standard ways of achieving this Task's development goals that were not covered by the Task's Steps."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GuidanceDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="attachments" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This field is primarily used for attachments augmenting the information provided for guidance.  In particular the attribute is used for Templates, Examples, and Reusable Assets to contain the actual attachment described in the mainDescription.  It can additionally contain representations of the guidance in just a third party format, e.g. PDF, MS Word, or Word Perfect."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PracticeDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="additionalInfo" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Any additional Information not covered by the other attributes."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="problem" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A description of the problem the Practice addresses."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="background" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Elaboration on the background and the context in which the problem occurs and where the solution described by this Practice will fit in."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="goals" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A summary of the overall goals to be addressed by the Practice."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="application" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes how the Practice is being applied or introduced into the context described in background."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelsOfAdoption" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Outlines the different forms or variants in which the practice could be realized. (e.g. full adoption verus a partial adoption of the Practice)"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Point">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphElement" abstract="true" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="position" eType="#//Point"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contained" ordered="false"
-        upperBound="-1" eType="#//DiagramElement" containment="true" eOpposite="#//DiagramElement/container"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="link" ordered="false" upperBound="-1"
-        eType="#//DiagramLink" containment="true" eOpposite="#//DiagramLink/graphElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="anchorage" ordered="false"
-        upperBound="-1" eType="#//GraphConnector" containment="true" eOpposite="#//GraphConnector/graphElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="semanticModel" lowerBound="1"
-        eType="#//SemanticModelBridge" containment="true" eOpposite="#//SemanticModelBridge/graphElement"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DiagramElement" abstract="true" eSuperTypes="#//MethodElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isVisible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="container" eType="#//GraphElement"
-        transient="true" eOpposite="#//GraphElement/contained"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" ordered="false"
-        upperBound="-1" eType="#//Reference" eOpposite="#//Reference/referenced"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="property" ordered="false"
-        upperBound="-1" eType="#//Property" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DiagramLink" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="zoom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewport" eType="#//Point"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="graphElement" lowerBound="1"
-        eType="#//GraphElement" transient="true" eOpposite="#//GraphElement/link"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" lowerBound="1"
-        eType="#//Diagram" eOpposite="#//Diagram/diagramLink"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphConnector" eSuperTypes="#//GraphElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="graphElement" lowerBound="1"
-        eType="#//GraphElement" transient="true" eOpposite="#//GraphElement/anchorage"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="graphEdge" ordered="false"
-        upperBound="-1" eType="#//GraphEdge" eOpposite="#//GraphEdge/anchor"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SemanticModelBridge" abstract="true"
-      eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presentation" eType="#//String"
-        defaultValueLiteral=""/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="graphElement" eType="#//GraphElement"
-        transient="true" eOpposite="#//GraphElement/semanticModel"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" eType="#//Diagram"
-        transient="true" eOpposite="#//Diagram/namespace"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Dimension">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Reference" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isIndividualRepresentation"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referenced" lowerBound="1"
-        eType="#//DiagramElement" eOpposite="#//DiagramElement/reference"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Property" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="#//String"
-        defaultValueLiteral=""/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphEdge" eSuperTypes="#//GraphElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="anchor" ordered="false"
-        lowerBound="2" upperBound="2" eType="#//GraphConnector" eOpposite="#//GraphConnector/graphEdge"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="waypoints" ordered="false"
-        lowerBound="2" upperBound="-1" eType="#//Point" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Diagram" eSuperTypes="#//GraphNode">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="zoom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewpoint" eType="#//Point"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagramLink" ordered="false"
-        upperBound="-1" eType="#//DiagramLink" eOpposite="#//DiagramLink/diagram"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="namespace" lowerBound="1"
-        eType="#//SemanticModelBridge" containment="true" eOpposite="#//SemanticModelBridge/diagram"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphNode" eSuperTypes="#//GraphElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="size" eType="#//Dimension"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SimpleSemanticModelElement" eSuperTypes="#//SemanticModelBridge">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeInfo" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UMASemanticModelBridge" eSuperTypes="#//SemanticModelBridge">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
-        eType="#//MethodElement"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CoreSemanticModelBridge" eSuperTypes="#//SemanticModelBridge">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
-        eType="#//Element"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LeafElement" abstract="true" eSuperTypes="#//DiagramElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="TextElement" eSuperTypes="#//LeafElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="text" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Image" eSuperTypes="#//LeafElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" eType="#//Uri"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mimeType" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphicPrimitive" abstract="true" eSuperTypes="#//LeafElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Polyline" eSuperTypes="#//GraphicPrimitive">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="closed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="waypoints" ordered="false"
-        lowerBound="2" upperBound="-1" eType="#//Point" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Ellipse" eSuperTypes="#//GraphicPrimitive">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="radiusX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="radiusY" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rotation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="startAngle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="endAngle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="center" eType="#//Point"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Activity" eSuperTypes="#//WorkBreakdownElement #//VariabilityElement #//WorkDefinition">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An Activity is a Work Breakdown Element and Work Definition which supports the nesting and logical grouping of related Breakdown Elements forming breakdown structures.  Although Activity is a concrete meta-class, other classes which represent breakdown structures derive from it; such as Phase, Iteration, Delivery Process, or Capability Pattern.&#xD;&#xA;Activity represents a grouping element for other Breakdown Elements such as Activities, Descriptors, Milestones, etc.  It is not per-se a 'high-level' grouping of only work as in other meta-models, but groups any kind of Breakdown Elements.  For example, one can define valid Activities that group only Work Products Descriptors without any matching Task Descriptors.  Activities also inherit all properties from Work Breakdown Element and indirectly from Process Element; i.e. Activity is ready to have a full content description attached to it."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="breakdownElements" ordered="false"
-        upperBound="-1" eType="#//BreakdownElement" eOpposite="#//BreakdownElement/superActivities"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="roadmaps" ordered="false"
-        upperBound="-1" eType="#//Roadmap"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="supportingMaterials" ordered="false"
-        upperBound="-1" eType="#//SupportingMaterial"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="checklists" ordered="false"
-        upperBound="-1" eType="#//Checklist"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="concepts" ordered="false"
-        upperBound="-1" eType="#//Concept"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="examples" ordered="false"
-        upperBound="-1" eType="#//Example"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="guidelines" ordered="false"
-        upperBound="-1" eType="#//Guideline"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reusableAssets" ordered="false"
-        upperBound="-1" eType="#//ReusableAsset"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkBreakdownElement" abstract="true"
-      eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Work Breakdown Element is a special Breakdown Element that provides specific properties for Breakdown Elements that represent or refer to Work Definitions.  For example its subclass Activity defines work as it is also a subclass of Work Definition.  Its subclass Task Descriptor does not define work by itself, but refers to a Work Definition and therefore can have the same common properties and Work Breakdown Element has."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isRepeatable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute is used to define repetition of work, e.g. iterations.  A Process Work Definition with this attribute set to True shall be repeated more than once on the same set of artifacts.  For example, for an instance of Iteration (defined as a special Process Work Definition below) this attribute is set to True by default indicating that every sub-Activity will be repeated more than once.  However, any Process Work Definition can set this attribute to True to define iterations (e.g. to iterate one Activity consisting of many sub-activities or even Phases, but to iterate just one Task)."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isOngoing" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If the isOngoing attribute is set to True for a Process Work Definition instance, then the element describes an ongoing piece of work without a fixed duration or end state.  For example, the Process Work Definition could represent work of an administrator continuously (e.g. 3h a day) working to ensure that systems are kept in a certain state.  Another example would be program management work overseeing many different projects being scheduled for one particular project at specific reoccurring intervals during the whole lifecycle of the project."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isEventDriven" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The isEventDriven attribute indicates that the Process Work Definition describes an instance of work which is not started because it has been scheduled to start at a certain point of time, because preceding work is being completed, or input work products are available, but because another specific event has occurred.  Examples for such events are exceptions or problem situations which require specific work to be performed as a result.  Also change management work can be modeled as event driven work analyzing a change request or defect and allocating work dynamically to resources to deal with it following the work described with such Process Work Definition.  The events themselves are not modeled in this version of the specification.  They shall be described as part of the normal descriptions fields available.&#xD;&#xA;&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="linkToPredecessor" ordered="false"
-        upperBound="-1" eType="#//WorkOrder"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BreakdownElement" abstract="true" eSuperTypes="#//ProcessElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Breakdown Element is an abstract generalization for any type of Method Element that is part of a breakdown structure.  It defines a set of properties available to all of its specializations."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Prefix represents an additional label that will be presented as a prefix to any Breakdown Element to indicate a user-defined sub-type for the element.  For example, if the process engineer would like to distinguish his Activities by 'Module' (as done in the IBM Rational Summit Ascendant Method), he can define a different prefix for every model to be used in addition to naming Activities, e.g. &quot;SRA.Establish Requirements&quot; with SRA indicating that this Activity belongs to the &quot;Software Requirements Analysis&quot; module.  Another common application for prefix is to qualify roles in Role Descriptors.  For example, &quot;Customer.Architect&quot; would define a &quot;Customer&quot; prefix for the Role Descriptor &quot;Architect&quot; expressing that this is an architect on the customer side and not the development team side."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isPlanned" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A key application for Development Processes expressed with Breakdown structures is to generate a project plan from it.  A process as defined in UMA (cf. with Sections XX and 5.2) is a multi-dimensional structure defining what work is being performed at what time by which roles using which input and producing what outputs.  A project plan as it is represented in project planning tools such as IBM Rational Portfolio Manager or Microsoft Project normally does not need all this information and is normally limited to just representing a subset.  For example, a typical MS Project plan only represents the work breakdown consisting of Tasks and Activities (sometimes referred to as summary tasks).  It does not show the input and output Work Products for a Task, but it can show which roles shall be staffed for performing the Task.  However, such role allocation need to be replaced with concrete resources when instantiating the plan for a concrete project.  Sometimes project plans can then again be organized differently by organizing work by deliverables in which Work Products are mapped to the plan's summary tasks and Task that have these work products as output mapped below such as summary task.  Therefore, a process can make recommendations about which elements to include and which to exclude when generating a plan.  When the isPlanned attribute is set to False for an instance of a Breakdown Element, then this element shall not be not included when a concrete project plan is being generated from the breakdown structure that contains this element.&#xD;&#xA;&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hasMultipleOccurrences"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Just as the isPlanned attribute the hasMultipleOccurrences attribute has an impact on generating plans from a Process.  When this attribute is set to True for a Breakdown Element then it will typically occur multiple times within the same Activity.  For example, a Task such as &quot;Detail Use Case&quot; would be performed for every use case identified for a particular Iteration or Activity.  Generating a plan would list one Task instance per use case."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isOptional" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The isOptional attribute indicates that the Breakdown Element describes work, a work result, or even work resources, which inclusion is not mandatory when performing a project that is planned based on a process containing this element."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="presentedAfter" eType="#//BreakdownElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="presentedBefore" eType="#//BreakdownElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="planningData" eType="#//PlanningData"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="superActivities" ordered="false"
-        upperBound="-1" eType="#//Activity" eOpposite="#//Activity/breakdownElements"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Milestone" eSuperTypes="#//WorkBreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Milestone describes a significant event in a development project, such as a major decision, completion of a deliverable, or meeting of a major dependency (like completion of a project phase).  Because, Milestone is commonly used to refer to both the event itself and the point in time at which the event is scheduled to happen, it is modeled as a Breakdown Element (i.e. it appears as part of a breakdown structure)."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Iteration" eSuperTypes="#//Activity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Iteration is a special Activity, which prescribes pre-defined values for its instances for the attributes prefix ('Iteration') and isRepeatable ('True').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.&#xD;&#xA;Iteration groups a set of nested Activities that are repeated more than once.  It represents an important structuring element to organize work in repetitive cycles.  The concept of Iteration can be associated with different rules in different methods.  For example, the IBM Rational Unified Process method framework (RUP) defines a rule that Iterations are not allowed to span across Phases.  In contrast IBM Global Services Method (GSMethod) based method frameworks this rule does not apply and Iteration can be defined which nest Phases.  Rules like these, which play an important role for each individual method and are therefore not enforced by this meta-model.  Instead, process authors are expected to follow and check these rules manually.  (Note: Any Breakdown Element can be repeated; however, Iterations has been introduced as a special meta-model concept, because of its important role for many methods.)"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Phase" eSuperTypes="#//Activity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Phase is a special Activity, which prescribes pre-defined values for its instances for the attributes prefix ('Phase') and isRepeatable ('False').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.&#xD;&#xA;Phase represent a significant period in a project, ending with major management checkpoint, milestone or set of Deliverables.  It is included in the model as a predefined special Activity, because of its significance in defining breakdowns."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TeamProfile" eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Team Profile is a Breakdown Element that groups Role Descriptors or Resource Definitions defining a nested hierarchy of teams and team members.&#xD;&#xA;Work assignments and Work Product responsibilities can be different from Activity to Activity in a development project. Different phases require different staffing profiles, i.e. different skills and resources doing different types of work.  Therefore, a process needs to define such different profiles in a flexible manner.  Whereas Core Method Content defines standard responsibilities and assignments, a process express by a breakdown structures needs to be able refine and redefine these throughout its definition.  Role Descriptors, Resource Definitions, as well as Team Profiles provide the data structure necessary to achieve this flexibility and to provide a process user with the capability to define different teams and role relationships for every Activity (including Activities on any nesting-level as well as Iterations or Phases).&#xD;&#xA;Hence, in addition to the work breakdown and work product breakdown structures defined so far, Team Profiles are used to define a third type of breakdown structure: team breakdown structures.  These are created as an Activity specific hierarchy of Team Profiles comprising of Role Descriptors and Resource Definitions.  These structures can be presented as well-known Org-Charts.  Just as with any other Breakdown Element and Descriptors, Team Profiles can be defined within the scope of any Activity in a breakdown structure.  In other words every Activity can define its own Team Profiles consisting of Activity specific Role Descriptors and Resource Definitions.  Typically, Team Profiles are defined on the level of Iterations or Phases or other higher-level Activity."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="teamRoles" ordered="false"
-        upperBound="-1" eType="#//RoleDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="superTeam" lowerBound="1"
-        eType="#//TeamProfile" eOpposite="#//TeamProfile/subTeam"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subTeam" ordered="false"
-        upperBound="-1" eType="#//TeamProfile" eOpposite="#//TeamProfile/superTeam"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleDescriptor" eSuperTypes="#//Descriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Role Descriptor represents a Role in the context of one specific Activity.  Every breakdown structure can define different relationships of Role Descriptors to Task Descriptors and Work Product Descriptors.  Therefore one Role can be represented by many Role Descriptors each within the context of an Activity with its own set of relationships."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Role" eType="#//Role"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="performsAdditionally" ordered="false"
-        upperBound="-1" eType="#//TaskDescriptor" eOpposite="#//TaskDescriptor/additionallyPerformedBy"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="assistsIn" ordered="false"
-        upperBound="-1" eType="#//TaskDescriptor" eOpposite="#//TaskDescriptor/assistedBy"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="modifies" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" changeable="false" volatile="true"
-        transient="true" derived="true" eOpposite="#//WorkProductDescriptor/workedOnBy"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="performsAsOwner" ordered="false"
-        upperBound="-1" eType="#//TaskDescriptor" eOpposite="#//TaskDescriptor/performedPrimarilyBy"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="responsibleFor" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" eOpposite="#//WorkProductDescriptor/responsibleRole"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="WorkOrderType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Work Order represents a relationship between two Breakdown Element in which one Breakdown Element (referred to as (B) below) depends on the start or finish of another Breakdown Element (referred to as (A) below) in order to begin or end. This enumeration defines the different types of Work Order relationships available in UMA and is used to provide values for Work Order's linkType attribute."/>
-    </eAnnotations>
-    <eLiterals name="finishToStart"/>
-    <eLiterals name="finishToFinish" value="1"/>
-    <eLiterals name="startToStart" value="2"/>
-    <eLiterals name="startToFinish" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkOrder" eSuperTypes="#//ProcessElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Work Order is a Method Element that represents a relationship between two Breakdown Elements in which one Breakdown Elements depends on the start or finish of another Breakdown Elements in order to begin or end.  &#xD;&#xA;(Note, Work Order is not modeled as an Association Class to provide a straightforward mapping  to XMI and EMF.)&#xD;&#xA;The Work Order class defines predecessor and successor relations amongst Breakdown Elements.  This information is in particular critical for planning applications.  See more details on different types of Work Order relationships at Work Order Type."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="linkType" eType="#//WorkOrderType"
-        defaultValueLiteral="finishToStart">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute expresses the type of the Work Order relationship by assigning a value from the Work Order Type enumeration."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="pred" lowerBound="1" eType="#//WorkBreakdownElement"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessElement" abstract="true" eSuperTypes="#//DescribableElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Process Element is a Describable Element that represents an abstract generalization for all elements defined in the Process package.&#xD;&#xA;Process Elements represents Process specific elements that are supposed to be managed in Process Packages.  The separation of Process Element from Content Element allows to clearly distinguish between pure method content from content that is represented in processes. "/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PlanningData" eSuperTypes="#//ProcessElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Planning Data is a Method Element that adds planning data to Breakdown Elements when it is used for a Process Planning Template.  For Delivery Processes and Capability Patterns this class can either not be instantiated or populated with default data.&#xD;&#xA;Planning Data factors out specific optional data needed for representing planning templates.  This association allows to access planning data if it is stored for the Breakdown Element.&#xD;&#xA;(NOTE, THE ATTRIBUTES FOR THIS CLASS ARE NOT COMPLETE, YET)"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="startDate" eType="#//Date">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default start date for a planed Task."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finishDate" eType="#//Date">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default finish date for a planed Task."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rank" eType="#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default rank for a planed Task."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Descriptor" abstract="true" eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Descriptor is an abstract generalization for special Breakdown Elements that references one concrete Content Element.  A descriptor provides a representation of a Content Element within breakdown structures.  In addition to just referencing Content Elements it allows overriding the Content Elements structural relationships by defining its own sets of associations.&#xD;&#xA;Descriptors are the key concept for realizing the separation of processes from method content.  A Descriptor can be characterized as a reference object for one particular Content Element, which has its own relationships and properties.  When a Descriptor is created it shall be provided with congruent copies of the relationships defined for the referenced content element.  However, a user can modify these relationships for the particular process situation for which the descriptor has been created. "/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSynchronizedWithSource"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TaskDescriptor" eSuperTypes="#//WorkBreakdownElement #//Descriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Task Descriptor is a Descriptor and Work Breakdown Element that represents a proxy for a Task in the context of one specific Activity.  Every breakdown structure can define different relationships of Task Descriptors to Work Product Descriptors and Role Descriptors. Therefore one Task can be represented by many Task Descriptors each within the context of an Activity with its own set of relationships.&#xD;&#xA;A key difference between Method Content and Process is that a Content Element such as Task describes all aspects of doing work defined around this Task.  This description is managed in steps, which are modeled as Sections of the Tasks' Content Descriptions.  When applying a Task in a Process' Activity with a Task Descriptor a Process Engineer needs to indicate that at that particular point in time in the Process definition for which the Task Descriptor has been created, only a subset of steps shall be performed.  He defines this selection using the selectedSteps association.  If he wants to add steps to a Task Descriptor, he can describe these either pragmatically in the refinedDescription attribute or 'properly' create a contributing Task to the Task the Task Descriptor refers to.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Task" eType="#//Task"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="additionallyPerformedBy"
-        ordered="false" upperBound="-1" eType="#//RoleDescriptor" eOpposite="#//RoleDescriptor/performsAdditionally"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="assistedBy" ordered="false"
-        upperBound="-1" eType="#//RoleDescriptor" eOpposite="#//RoleDescriptor/assistsIn"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="externalInput" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" eOpposite="#//WorkProductDescriptor/externalInputTo"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mandatoryInput" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" eOpposite="#//WorkProductDescriptor/mandatoryInputTo"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="optionalInput" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" eOpposite="#//WorkProductDescriptor/OptionalInputTo"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="output" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" eOpposite="#//WorkProductDescriptor/outputFrom"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="performedPrimarilyBy" eType="#//RoleDescriptor"
-        eOpposite="#//RoleDescriptor/performsAsOwner"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="selectedSteps" ordered="false"
-        upperBound="-1" eType="#//Section"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductDescriptor" eSuperTypes="#//Descriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Work Product Descriptor represents a Work Product in the context of one specific Activity.  Every breakdown structure can define different relationships of Work Product Descriptors to Task Descriptors and Role Descriptors.  Therefore one Work Product can be represented by many Work Product Descriptors each within the context of an Activity with its own set of relationships."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activityEntryState" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Entry State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is initiated (i.e. work on the Activity's Task Descriptors is being initiated that use this Work Product Descriptor as input).  &#xD;&#xA;For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested]."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activityExitState" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Exist State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is finished (i.e. work on the Activity's Task Descriptors has finished that have this Work Product Descriptor as output).&#xD;&#xA;For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested]."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="WorkProduct" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="externalInputTo" ordered="false"
-        upperBound="-1" eType="#//TaskDescriptor" eOpposite="#//TaskDescriptor/externalInput"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="impactedBy" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" eOpposite="#//WorkProductDescriptor/impacts"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="impacts" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" eOpposite="#//WorkProductDescriptor/impactedBy"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mandatoryInputTo" ordered="false"
-        upperBound="-1" eType="#//TaskDescriptor" eOpposite="#//TaskDescriptor/mandatoryInput"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="workedOnBy" ordered="false"
-        upperBound="-1" eType="#//RoleDescriptor" changeable="false" volatile="true"
-        transient="true" derived="true" eOpposite="#//RoleDescriptor/modifies"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="OptionalInputTo" ordered="false"
-        upperBound="-1" eType="#//TaskDescriptor" eOpposite="#//TaskDescriptor/optionalInput"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outputFrom" ordered="false"
-        upperBound="-1" eType="#//TaskDescriptor" eOpposite="#//TaskDescriptor/output"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deliverableParts" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="responsibleRole" eType="#//RoleDescriptor"
-        eOpposite="#//RoleDescriptor/responsibleFor"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CompositeRole" eSuperTypes="#//RoleDescriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Composite Role is a special Role Descriptor that relates to more then one Role.  It represents a grouping of Roles with the main purpose of simplification, i.e. reducing the number of roles for a process.&#xD;&#xA;A Composite Role is a grouping of Roles that can be used in an Activity or Process to reduce the number of Roles.  A typical application would be a process for a small team in which a standard set of roles from the method content would be all performed by one or more resource.  By using Composite Role the process would suggest a typical clustering of Roles to Resources.  A Composite Role could perform all Tasks defined for the Roles it refers to."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="aggregatedRoles" ordered="false"
-        upperBound="-1" eType="#//Role"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BreakdownElementDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="usageGuidance" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides information and guidance on the meaning of the Boolean flag values and under what circumstances they should be overridden. For example, it describes why the breakdown element is optional or considerations for repeating it and differences in the individual occurrences of this Breakdown Element across the lifecycle."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ActivityDescription" eSuperTypes="#//BreakdownElementDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="purpose" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Summarizes the main reason for performing this Activity, describes what the activity as a whole is intended to achieve."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alternatives" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Comprises of summaries describing important exceptional and non-standard ways of doing the work of this Activity not covered by the Activity's Tasks."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="howtoStaff" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides background on who should be involved in this activity what are the required skills, experience,  and perhaps attitudes."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DeliveryProcessDescription" eSuperTypes="#//ProcessDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scale" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Outlines characteristics about the size of a typical project that performs this project expressed in team size, man years, etc."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectCharacteristics"
-        eType="#//String" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Characterizes the project that would typically perform this Process"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="riskLevel" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Outlines typical project risks that are addressed with this process."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="estimatingTechnique" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the Estimation Techniques provided for this Process."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectMemberExpertise"
-        eType="#//String" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides a profile of a typical project team, the distribution of roles, skills required for a team performs a project based on this process."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeOfContract" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides background information about the contracts that need to be established between a project team that performs this process and a client (e.g. for an IGS engagement)."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessDescription" eSuperTypes="#//ActivityDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalId" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="An external visible number that is used to reference this delivery patterns and models. It is used like a synonym."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scope" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the scope of the Process, i.e. which types of projects does it address and which not."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="usageNotes" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Any additional notes on how to apply and instantiate this process for a project."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DescriptorDescription" eSuperTypes="#//BreakdownElementDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="refinedDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A Descriptor might add refinements to the main description of the Content Element it refers to.  For example, it could provide additional information about a Work Product relevant for the specific point in time in the process this Work Product type is being used.  It could describe additional skills needed for a Role at that particular point in time in a process, etc. "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Concept" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Concept is a specific type of guidance that outlines key ideas associated with basic principles underlying the referenced item. Concepts normally address more general topics than Guidelines and span across sev-eral work product and/or tasks/activities."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Checklist" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Checklist is a specific type of guidance that identifies a series of items that need to be completed or veri-fied.  Checklists are often used in reviews such as walkthroughs or inspections. "/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Example" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An Example is a specific type of Guidance that represents a typical, partially completed, sample instance of one or more work products or scenario like descriptions of how Task may be performed. Examples can be related to Work Products as well as Tasks that produce them as well as any other Content Element."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Guideline" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Guideline is a specific type of guidance that provides additional detail on how to perform a particular task or grouping of tasks (e.g. grouped together as activities) or that provides additional detail, rules, and recommendations on work products and their properties.  Amongst others, it can include details about best practices and different approaches for doing work, how to use particular types of work products, information on different subtypes and variants of the work product and how they evolve throughout a lifecycle, discussions on skills the performing roles should acquire or improve upon, measurements for progress and maturity, etc."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Estimate" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An Estimate is a specific type of Guidance that provides sizing measures, or standards for sizing the work effort associated with performing a particular piece of work and instructions for their successful use. It may be comprised of estimation considerations and estimation metrics."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="estimationMetric" eType="#//EstimatingMetric"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="estimationConderations"
-        eType="#//EstimationConsiderations" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EstimatingMetric" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Estimation Metric describes a metric or measure that is associated with an element and which is used to calculate the size of the work effort as well as a range of potential labor."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EstimationConsiderations" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Estimation Considerations qualify the usage and application of estimation metrics in the development of an actual estimate."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Report" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Report is a predefined template of a result that is generated on the basis of other work products as an output from some form of tool automation. An example for a report would be a use case model survey, which is generated by extracting diagram information from a graphical model and textual information from documents and combines these two types of information into a report."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Template" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Template is a specific type of guidance that provides for a work product a pre-defined table of contents, sections, packages, and/or headings, a standardized format, as well as descriptions how the sections and packages are supposed to be used and completed. Templates cannot only be provided for documents, but also for conceptual models or physical data stores."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SupportingMaterial" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Supporting Materials is catchall for other types of guidance not specifically defined elsewhere. It can be related to all kinds of Content Elements, i.e. including other guidance elements."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ToolMentor" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Tool Mentor is a specific type of guidance that shows how to use a specific tool to accomplish some piece of work a Work Product either in the context of or independent from a Task or Activity."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Whitepaper" eSuperTypes="#//Concept">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Whitepapers are a special Concept guidance that have been externally reviewed or published and can be read and understood in isolation of other content elements and guidance."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TermDefinition" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="TermDefinitions define concepts and are used to build up the Glossary. They are not directly related to ContentElements, but their relationship is being derived when the Term is used in the ContentElements description text."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Practice" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Practice represents a proven way or strategy of doing work to achieve a goal that has a positive impact on work product or process quality.  Practices are defined orthogonal to methods and processes.  They could summarize aspects that impact many different parts of a method or specific processes.  Examples for practices would be &quot;Manage Risks&quot;, &quot;Continuously verify quality&quot;, &quot;Architecture-centric and component-based development&quot;, etc."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subPractices" ordered="false"
-        upperBound="-1" eType="#//Practice" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contentReferences" ordered="false"
-        upperBound="-1" eType="#//ContentElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="activityReferences" ordered="false"
-        upperBound="-1" eType="#//Activity"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ReusableAsset" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Reusable Asset provides a solution to a problem for a given context. The asset may have a variability point, which is a location in the asset that may have a value provided or customized by the asset consumer. The asset has rules for usage which are the instructions describing&#xD;&#xA;how the asset should be used."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Discipline" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Discipline is a categorization of work (i.e. Tasks for Method Content), based upon similarity of concerns and cooperation of work effort.&#xD;&#xA;A discipline is a collection of Tasks that are related to a major 'area of concern' within the overall project. The grouping of Tasks into disciplines is mainly an aid to understanding the project from a 'traditional' waterfall perspective. However, typically, for example, it is more common to perform certain requirements activities in close coordination with analysis and design activities. Separating these activities into separate disciplines makes the activities easier to comprehend."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tasks" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Task"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referenceWorkflows" ordered="false"
-        upperBound="-1" eType="#//Activity"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentCategory" abstract="true" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Content Category is an abstract class generalizing content category types."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleSet" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Role Set organizes Roles into categories.  It is used to group roles together that have certain commonalities.  For example, the &quot;Analysts&quot; Role Set could group the &quot;Business Process Analyst&quot;, &quot;System Analyst&quot;, as well as &quot;Requirements Specifier&quot; roles.  All of these work with similar techniques and have overlapping skills, but are required as distinct roles for a method (e.g. the method the IBM Rational Unified Process is based on)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="roles" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Role"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Domain" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Domain is a refineable hierarchy grouping related work products.  In other words, Domains can be further divided into sub-domains, with work product elements to be categorized only at the leaf-level of this hierarchy.&#xD;&#xA;Domain is a logical grouping of work products that have an affinity to each other based on resources, timing, or relationship.  A Domain may be divided into subdomains.  For example, GS Method uses six predefined Domains for Work Products: Application, Architecture, Business, Engagement, Operations and Organization."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="workProducts" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subdomains" ordered="false"
-        upperBound="-1" eType="#//Domain" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductType" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Work Product Type is a second category for work products, which in contrast to Domain is more presentation oriented.  A work product can have many Work Product Types.  Examples, for a Work Product Type is &quot;Class Diagram&quot;, which categorizes the Artifacts Analysis Model, Design Model, User Experience Model, or &quot;Specification&quot;, which categorizes requirements specifications that define a system with a well-defined system boundary, such as use case or functional requirements specification.  A Work Product can be categorized to be of many Work Product Types.  For example, a use case model can be categorized as a Specification as well as Diagram Work Product Type."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="workProducts" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DisciplineGrouping" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Discipline Groupings are used to group Disciplines.  For example, the Discipline Grouping &quot;Software Disciplines&quot; would be the group of all disciplines related to developing software such as &quot;Requirements Management&quot; or &quot;Testing&quot;; &quot;IT Infrastructure Management&quot; would be a Disciplines Grouping for disciplines such as &quot;IT Operational Services&quot;, &quot;IT Customer Relationships&quot;, or &quot;IT Enabling Services&quot;.  Disciplines can be associated to more than one Discipline Grouping."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="disciplines" ordered="false"
-        upperBound="-1" eType="#//Discipline"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Tool" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Tool is a container/aggregate for ToolMentors.  It can also provide general descriptions of the tool and its general capabilities."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toolMentors" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ToolMentor"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleSetGrouping" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Role Sets can be categorized into Role Set Groupings.  For example, different methods might define similar Role Sets, which however need to be distinguished from each other on a global scale.  Thus, Role Set Groupings allow distinguishing, for example, Software Services Manager Role Sets from Software Development Organization Manager Role Sets."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="roleSets" ordered="false"
-        upperBound="-1" eType="#//RoleSet"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomCategory" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Custom Category is a category introduced by a method content author to structure any number of method Content Elements of any subtype based on user-defined criteria.  Because Content Categories (and therefore Custom Categories, too) are Content Elements themselves, Custom Categories can be used to recursively categorize Content Categories as well.  Custom Categories can also be nested with any Content Category.  Custom categories can be used to categorize content based on the user's criteria as well as to define whole tree-structures of nested categories allowing the user to systematically navigate and browse method content and processes based on these categories.  For example, one could create a custom category to logically organize content relevant for the user's development organization departments; e.g. a &quot;Testing&quot; category that groups together all roles, work products, tasks, and guidance element relevant to testing.  Another example would be categories that express licensing levels of the content grouping freely distributable method content versus content that represent intellectual property and requires a license to be purchased to be able to use it."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="categorizedElements" ordered="false"
-        upperBound="-1" eType="#//DescribableElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subCategories" ordered="false"
-        upperBound="-1" eType="#//ContentCategory"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DeliveryProcess" eSuperTypes="#//Process">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Delivery Processes is a special Process describing a complete and integrated approach for performing a specific project type.  It describes a complete project lifecycle end-to-end and shall be used as a reference for running projects with similar characteristics as defined for the process.  A Delivery Process is related to specific supporting information such as Roadmaps (inherited via Activity) as well as Communications and Education Material.&#xD;&#xA;A Delivery Process is a Process that covers a whole development lifecycle from beginning to end.  A Delivery Process shall be used as a template for planning and running a project.  It provides a complete lifecycle model with predefined phases, iterations, and activities that have been detailed by sequencing referencing method content in breakdown structures.  It is defined on the basis of experience with past projects or engagements, and/or the best practice use of a development or delivery approach.  It defines what gets produced, how those items are produced, and the required staffing in the form of integrated Work, Work Product, and Team Breakdown Structures.  For example, a process engineer can define alternative Delivery Processes for software development projects that differ in the scale of the engagement and staffing necessary, the type of the software application to be developed, the development methods and technologies to be used, etc.  Although, the Delivery Process aims to cover a whole project it keeps certain decision that are too project specific open.  For example, the breakdown structure defines which Breakdown Elements have multiple occurrences or is repeatable via it respective attributes, but does not say how many occurrences and how many repeats/iterations it will have.  These decisions have to be done by a project manager when planning a concrete project, project phase, or project iterations.  A Delivery Process is always a complete description of a process in terms of completeness of the lifecycle, as well as in terms of all three views on the process which are the Work Breakdown Structure, Work Product Breakdown Structure, and Team Breakdown Structure have to be fully and consistently populated.  Consistency of a Delivery Process is actually ensured by the fact that all three breakdowns are represented by one single data structure and one particular breakdown such as Team Breakdown is just a view on that data structure."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="educationMaterials" ordered="false"
-        upperBound="-1" eType="#//SupportingMaterial"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="communicationsMaterials"
-        ordered="false" upperBound="-1" eType="#//SupportingMaterial"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Process" abstract="true" eSuperTypes="#//Activity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process is a special Activity that describes a structure for particular types of development projects.  To perform such a development project a Processes would be 'instantiated' and adapted for the specific situation.  Process is an abstract class and this meta-model defines different special types of Processes for different process management applications and different situations of process reuse.  Every Process comprises of and is the top-level element of an n-level breakdown structure using the Nesting association defined on Activity.&#xD;&#xA;Core Method Content provides step-by-step explanations, describing how very specific development goals are achieved independent of the placement of these steps within a development lifecycle.  Processes take these method elements and relate them into semi-ordered sequences that are customized to specific types of projects.  Thus, a process is a set of partially ordered work descriptions intended to reach a higher development goal, such as the release of a specific software system.  A process and the process meta-model structure defined in this specification focuses on the lifecycle and the sequencing of work in breakdown structures.  To achieve this it uses the Descriptor concept referencing method content and allowing defining time-specific customizations of the referenced content (e.g. defining a focus on different steps of the same Task and providing input Work Products in different states within the different Phases of a process lifecycle in which the same Task is performed)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="includesPatterns" ordered="false"
-        upperBound="-1" eType="#//CapabilityPattern"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultContext" lowerBound="1"
-        eType="#//MethodConfiguration"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="validContext" ordered="false"
-        upperBound="-1" eType="#//MethodConfiguration"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CapabilityPattern" eSuperTypes="#//Process">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Capability Pattern is a special Process that describes a reusable cluster of doing work in common process areas.  Capabilities Patterns express and communicate process knowledge for a key area of interest such as a Discipline and can be directly used by process practitioner to guide his work.  They are also used as building blocks to assemble Delivery Processes or larger Capability Patterns ensuring optimal reuse and application of the key practices they express.&#xD;&#xA;A Capability Pattern is a special Process that describes a reusable cluster of doing work in a general process area that provides a consistent development approach to common problems.  Examples for Capability Pattern could be 'use case-based requirements management', 'use case analysis', or 'unit testing'. Typically but not necessarily, Capability Patterns have the scope of one discipline providing a breakdown of reusable complex Activities, relationships to the Roles which perform Tasks within these Activities, as well as to the Work Products that are used and produced.  A capability pattern does not relate to any specific phase or iteration of a development lifecycle, and should not imply any.  In other words, a pattern should be designed in a way that it is applicable anywhere in a Delivery Process.  This enables its Activities to be flexibly assigned to whatever phases there are in the Delivery Process to which it is being applied.  It is a good practice to design a Capability Pattern to produce one or more generic Deliverables.  The typical configuration is that each Activity in the Capability Pattern produces one Deliverable, and the last Task Descriptor in the Activity explicitly outputs just this Deliverable.  This enables the process engineer to select Patterns or just Activities by deciding which Deliverables are required.  It also offers a simple integration approach: an Activity from a capability pattern is linked to the Phase or Iteration which is required to produce the Activity's Deliverable.  Key applications areas of / areas of reuse for Capability Patterns are:&#xD;&#xA;- To serve as building blocks for assembling Delivery Processes or larger Capability Patterns.  Normally developing a Delivery Process is not done from scratch but by systematically applying and binding patterns.  In addition to the standard pattern application of 'copy-and-modify', which allows the process engineer to individually customize the pattern's content to the particular situation it is applied for, the Plugin meta-model package (Section 6.1) introduces even more sophisticated inheritance relationships that support dynamic binding of patterns (i.e. the pattern is referenced and not copied).  This unique new way of reusing process knowledge allows to factor out commonly reoccurring Activities into patterns and to apply them over and over again for a process.  When the pattern is being revised or updated, all changes will be automatically reflected in all pattern application in all processes because of the dynamic binding.&#xD;&#xA;- To support direct execution in a development project that does not work following a well-defined process, but works based on loosely connected process fragments of best practices in a flexible manner (e.g. Agile Development).&#xD;&#xA;- To support process education by describing knowledge for a key area such as best practices on how to perform the work for a Discipline (e.g. Requirements Management), for a specific development technique (aspect-oriented development), or a specific technical area (e.g. relational database design), which is used for education and teaching."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessPlanningTemplate" eSuperTypes="#//Process">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process Planning Template is a special Process that is prepared for instantiation by a project planning tool.  Typically, it is created based on a Process such as a Delivery Process as a whole (e.g. in case of a waterfall-based development approach) or in parts (e.g. in case of an iterative development approach).&#xD;&#xA;A Process Planning Template represents a partially finished plan for a concrete project.  It uses the same information structures as all other Process Types to represent templates for project plans.  However, certain planning decisions have already been applied to the template as well as information has been removed and/or reformatted to be ready for export to a specific planning tool.  Examples for such decisions are: a template has been created to represent a plan for a particular Iteration in an iterative development project, which fr example distinguishes early from late iterations in the Elaboration phase of a project; if the targeted planning tool cannot represent input and output of Task, then these have been removed from the structure; certain repetitions have been already applied, e.g. stating that a cycle of specific Task grouped in an Activity have to be repeated n-times; etc."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="basedOnProcesses" ordered="false"
-        upperBound="-1" eType="#//Process"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Roadmap" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Roadmap is a special Guidance Type which is only related to Activates and therefore has been added by this package to the list of Guidance Types rather than listed in the Guidance Types package.  A Roadmap represents a linear walkthrough of an Activity, typically a Process.&#xD;&#xA;An instance of a Roadmap represents important documentation for the Activity or Process it is related to.  Often a complex Activity such as a Process can be much easier understood by providing a walkthrough with a linear thread of a typical instantiation of this Activity.  In addition to making the process practitioner understand how work in the process is being performed, a Roadmap provides additional information about how Activities and Tasks relate to each other over time.  Roadmaps are also used to show how specific aspects are distributed over a whole process providing a kind of filter on the process for this information."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessComponent" eSuperTypes="#//ProcessPackage #//MethodUnit">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process Component is a special Process Package that applies the principles of encapsulation.  A Process Component realizes one or more Interfaces which specify inputs and outputs of the component. There might be many components realizing the same interfaces, but using different techniques to achieve similar outputs for similar inputs.  Whereas the Component Interfaces represent component specifications (black box descriptions of the component), good candidates for component realizations can be found in Capability Patterns (white box descriptions for the component).&#xD;&#xA;UMA supports replaceable and reusable Process Components realizing the principles of encapsulation. Certain situations in a software development project might require that concrete realizations of parts of the process remain undecided or will be decided by the executing team itself (e.g. in outsourcing situations).  UMA provides a unique component concept defining interfaces for work product input and output, allowing treating the actual definition of the work that produces the outputs as a &quot;black box&quot;.  At any point during a project the component &quot;realization&quot; detailing the work can be added to the process.  The component approach also allows that different styles or techniques of doing work can be replaced with one another.  For example, a software code output of a component could be produced with a model-driven development or a code-centric technique.  The component concept encapsulates the actual work and lets the development team choose the appropriate technique and fill the component's realization with their choice of Activities that produce the required outputs."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="interfaces" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ProcessComponentInterface"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="process" lowerBound="1"
-        eType="#//Process" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessPackage" eSuperTypes="#//MethodPackage">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Process Package is a special Method Package that contains Process Elements, only.&#xD;&#xA;A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="processElements" ordered="false"
-        upperBound="-1" eType="#//ProcessElement" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagrams" ordered="false"
-        upperBound="-1" eType="#//Diagram" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessComponentInterface" eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process Component Interface comprises of a list of interface specifications (similar to operation declarations) that express inputs and outputs for a process component.  These interface specifications are expressed using Task Descriptors which are not linked to Tasks that are related to Work Product Descriptors as well as optional a Role Descriptor."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="interfaceSpecifications"
-        ordered="false" upperBound="-1" eType="#//TaskDescriptor" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="interfaceIO" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessComponentDescriptor" eSuperTypes="#//Descriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process Component Descriptor represents a Process Component application in a Process, i.e. the breakdown structure defining the Process.  The Process Component Descriptor is used to encapsulate the details of the component in a breakdown structure and to provide its own set of relationships such as it own predecessors and successors."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ProcessComponent" lowerBound="1"
-        eType="#//ProcessComponent"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodPlugin" eSuperTypes="#//MethodUnit #//Package">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Plugin is a Method Element that represents a physical container for Method Packages.  It defines a granularity level for the modularization and organization of method content and processes.  A Method Plugin can extend many other Method Plugins and it can be extended by many Method Plugins.  It can also be used stand-alone, i.e. with no Extension relationship to other plug-ins.&#xD;&#xA;Method Plugin conceptually represents a unit for configuration, modularization, extension, packaging, and deployment of method content and processes.  A Process Engineer shall design his Plugins and allocate his content to these Plugins with requirements for extensibility, modularity, reuse, and maintainability in mind.&#xD;&#xA;Special extensibility mechanisms defined for the meta-classes Variability Element and Process Contribution allow Plugin content to directly contribute new content, replace existing content, or to cross-reference to any Content Element or Process within another Plugin that it extends.  Similar to UML 2.0's 'package merge' mechanism transformation interpretations, interpreting these Method Plugin mechanisms results into new extended Method Content and Processes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="userChangeable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPackages" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//MethodPackage" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="bases" ordered="false"
-        upperBound="-1" eType="#//MethodPlugin"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="VariabilityElement" abstract="true"
-      eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Variability Element is an abstract class derived from Method Element that provides new capabilities for content variation and extension to Content Elements or any other Method Element that derives from it.  It has been placed in-between the classes Method Element and Content Element in the overall UMA taxonomy of classes using the UML 2.0 package merge mechanism.  The association Variability Specialization shall only be instantiated between two subclasses of Variability Element of the same type.  The element on varaibilitySpecialElement side of the relationship defines a value for the attribute variabilityType defining the nature of the relationship using a literal from the enumeration Variability Type.&#xD;&#xA;Variability Element of the meta-model package Method Plugins adds the capabilities of variation and extension to Method Elements that derive from it.  By default all Content Elements such as Role, Task, Guidance Types, or Activities are defined to be Variability Elements.&#xD;&#xA;Variability and extension provides unique mechanisms for customizing method content without actually directly modifying the original content, but by just be able to describe with separate objects the differences (additions, changes, omissions) relative to the original.  This plug-in concept allows users to factor their method content and processes in interrelated units and even to architect method content and processes in layers that extend each other with new capabilities.  The resulting method and process design can be dynamically combined and applied on demand using the interpretation rules defined for Variability Element Specializations assembling to process practitioners the most accurate method and process descriptions possible.  It also allows process practitioners to extends and tailor method content and processes they do not own and to easily upgrade to newer versions by simply reapply their personal changes to these upgrades.&#xD;&#xA;Variability Element defines two types of variability and one type of extension which are formally defined for the enumeration Variability Type."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="variabilityType" eType="#//VariabilityType"
-        defaultValueLiteral="na">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If in instance of the variabilitySpecialization association between two Variability Elements of the same type exists, then the variabilityType attribute specifies how the element at the variabilitySpecialElement end of the association changes the Content Element at the variabilityBasedOnElement end. See the Variability Type enumeration class for definitions for the different types of variability."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variabilityBasedOnElement"
-        lowerBound="1" eType="#//VariabilityElement"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="VariabilityType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Variability Type is an Enumeration used for values for instances of Variability Element's attribute variabilityType.  It defines the nature of how a Variability Element extends another Variability Element. See enumeration literals for definitions for each type."/>
-    </eAnnotations>
-    <eLiterals name="na"/>
-    <eLiterals name="contributes" value="1"/>
-    <eLiterals name="extends" value="2"/>
-    <eLiterals name="replaces" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessContribution" eSuperTypes="#//Process">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process Contribution is a special Process that externally defines additions and changes to an existing Process without directly modifying the existing Process.  It achieves this by describing these additions and changes in a separate Process structure.  This structure's elements relate to the other Process' elements using Contributes and Replace Variability Specializations.  Process Contributions are normally packaged with Method Plugins that extend existing Method Plugin with new capabilities.&#xD;&#xA;A Process Contribution is a special Process that applies the semantics of the Contributes and Replaces Variability Specialization on Processes.  A Process Contribution is a kind of 'process plug-in' that 'plugs' additional breakdown structures into an exiting process and therefore updates it a-posteriori with new or changed capabilities.  Typical applications of Process Contributions are Method Plugins that add content from specific areas to an existing domain.  In addition to just contributing new method content to content elements such as Task and Work Products, Process Contributions can also define where in the Processes that have been defined with this method content those new additions should be applied.  Moreover, it allows defining whole new or changed Activities within these processes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="baseProcess" lowerBound="1"
-        eType="#//Process"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodUnit" abstract="true" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Unit is a special Method Element that shall be maintained in a Method Library as a separate unit of control."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="authors" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Method Unit is being created and owned by an author or authoring team."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="changeDate" eType="#//Date">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date the last change that resulted into this version has been made."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="changeDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The description of the last change that resulted into this version."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Package has a version number used to track changes."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="copyrightStatement" lowerBound="1"
-        eType="#//SupportingMaterial"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodConfiguration" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Configuration is a collection of selected Method Models and MethodPackages. A configuration can be exported into its own standalone library when it includes the full transitive closure of all elements all other elements depend on."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPluginSelection"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//MethodPlugin"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPackageSelection"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//MethodPackage"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="processViews" ordered="false"
-        upperBound="-1" eType="#//ContentCategory"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultView" lowerBound="1"
-        eType="#//ContentCategory"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="baseConfigurations" ordered="false"
-        upperBound="-1" eType="#//MethodConfiguration"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessFamily" eSuperTypes="#//MethodConfiguration">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Delivery Model Family is a convenient grouping of Delivery Processes and Capability Patterns of interest to some specific user community."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deliveryProcesses" ordered="false"
-        upperBound="-1" eType="#//DeliveryProcess"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodLibrary" eSuperTypes="#//MethodUnit #//Package">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Library is a physical container for Method Plugins and Method Configuration definitions.  All Method Elements are stored in a Method Library."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPlugins" ordered="false"
-        upperBound="-1" eType="#//MethodPlugin" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="predefinedConfigurations"
-        ordered="false" upperBound="-1" eType="#//MethodConfiguration" containment="true"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.epf.uma/model/1.0.2/uma.genmodel b/plugins/org.eclipse.epf.uma/model/1.0.2/uma.genmodel
deleted file mode 100755
index ca69058..0000000
--- a/plugins/org.eclipse.epf.uma/model/1.0.2/uma.genmodel
+++ /dev/null
@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="IBM Rational Software"
-    modelDirectory="/com.ibm.uma/src" editDirectory="/com.ibm.uma.edit/src" editorDirectory="/com.ibm.uma.editor/src"
-    modelPluginID="com.ibm.uma" templateDirectory="/com.ibm.uma.ecore/templates" runtimeJar="true"
-    dynamicTemplates="true" modelName="Uma" editPluginClass="com.ibm.uma.provider.UmaEditPlugin"
-    editorPluginClass="com.ibm.uma.presentation.UmaEditorPlugin" nonNLSMarkers="true"
-    rootExtendsInterface="org.eclipse.emf.ecore.sdo.EDataObject" rootExtendsClass="com.ibm.umaf.ecore.impl.MultiResourceEObject"
-    rootImplementsInterface="org.eclipse.emf.ecore.sdo.InternalEDataObject" suppressEMFTypes="true"
-    featureMapWrapperInterface="commonj.sdo.Sequence" featureMapWrapperInternalInterface="org.eclipse.emf.ecore.sdo.util.ESequence"
-    featureMapWrapperClass="org.eclipse.emf.ecore.sdo.util.BasicESequence">
-  <foreignModel>C:\Home\phTNG\TNG_docs\OOAD\ContentArchitecture\Models\UMA02\UnifiedMethodArchitecture.mdl</foreignModel>
-  <staticPackages>http://www.eclipse.org/emf/2003/SDO</staticPackages>
-  <modelPluginVariables>EMF_COMMONJ_SDO=org.eclipse.emf.commonj.sdo</modelPluginVariables>
-  <modelPluginVariables>EMF_ECORE_SDO=org.eclipse.emf.ecore.sdo</modelPluginVariables>
-  <genPackages prefix="Uma" basePackage="com.ibm" disposableProviderFactory="true"
-      ecorePackage="uma.ecore#/">
-    <genEnums ecoreEnum="uma.ecore#//WorkOrderType">
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//WorkOrderType/finishToStart"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//WorkOrderType/finishToFinish"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//WorkOrderType/startToStart"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//WorkOrderType/startToFinish"/>
-    </genEnums>
-    <genEnums ecoreEnum="uma.ecore#//VariabilityType">
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/na"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/contributes"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/extends"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/replaces"/>
-    </genEnums>
-    <genDataTypes ecoreDataType="uma.ecore#//Date"/>
-    <genDataTypes ecoreDataType="uma.ecore#//Uri"/>
-    <genDataTypes ecoreDataType="uma.ecore#//UnlimitedNatural"/>
-    <genDataTypes ecoreDataType="uma.ecore#//String"/>
-    <genDataTypes ecoreDataType="uma.ecore#//Set"/>
-    <genDataTypes ecoreDataType="uma.ecore#//Sequence"/>
-    <genDataTypes ecoreDataType="uma.ecore#//Integer"/>
-    <genClasses ecoreClass="uma.ecore#//Classifier"/>
-    <genClasses ecoreClass="uma.ecore#//Type"/>
-    <genClasses ecoreClass="uma.ecore#//Element"/>
-    <genClasses ecoreClass="uma.ecore#//NamedElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//NamedElement/name"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//PackageableElement"/>
-    <genClasses ecoreClass="uma.ecore#//Package"/>
-    <genClasses ecoreClass="uma.ecore#//Namespace"/>
-    <genClasses ecoreClass="uma.ecore#//MethodElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodElement/guid"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodElement/briefDescription"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodElement/ownedRules"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodElement/suppressed"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodElement/orderingGuide"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Constraint">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Constraint/body"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ContentElement">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/supportingMaterials"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/conceptsAndPapers"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/checklists"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/guidelines"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/examples"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/assets"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DescribableElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DescribableElement/presentationName"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//DescribableElement/presentation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DescribableElement/shapeicon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DescribableElement/nodeicon"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ContentDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ContentDescription/mainDescription"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ContentDescription/sections"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ContentDescription/keyConsiderations"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Section">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Section/sectionName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Section/sectionDescription"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Section/subSections"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Section/predecessor"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Role">
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Role/modifies"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Role/responsibleFor"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkProduct">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//WorkProduct/estimate"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProduct/reports"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProduct/templates"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProduct/toolMentors"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Task">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/performedBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/mandatoryInput"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/output"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/additionallyPerformedBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/optionalInput"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/steps"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/toolMentors"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Task/estimate"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkDefinition">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//WorkDefinition/precondition"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//WorkDefinition/postcondition"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Step"/>
-    <genClasses ecoreClass="uma.ecore#//Guidance"/>
-    <genClasses ecoreClass="uma.ecore#//Artifact">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Artifact/containerArtifact"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Artifact/containedArtifacts"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Deliverable">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Deliverable/deliveredWorkProducts"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Outcome"/>
-    <genClasses ecoreClass="uma.ecore#//MethodPackage">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodPackage/global"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodPackage/reusedPackages"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodPackage/parentPackage"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodPackage/childPackages"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ContentPackage">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ContentPackage/contentElements"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ArtifactDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ArtifactDescription/briefOutline"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ArtifactDescription/representationOptions"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkProductDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescription/externalId"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescription/purpose"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescription/impactOfNotHaving"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescription/reasonsForNotNeeding"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DeliverableDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliverableDescription/externalDescription"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliverableDescription/packagingGuidance"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//RoleDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//RoleDescription/skills"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//RoleDescription/assignmentApproaches"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//RoleDescription/synonyms"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//TaskDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//TaskDescription/purpose"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//TaskDescription/alternatives"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GuidanceDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//GuidanceDescription/attachments"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//PracticeDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/additionalInfo"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/problem"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/background"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/goals"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/application"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/levelsOfAdoption"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Point">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Point/x"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Point/y"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GraphElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphElement/position"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphElement/contained"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphElement/link"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphElement/anchorage"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphElement/semanticModel"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DiagramElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DiagramElement/isVisible"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DiagramElement/container"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DiagramElement/reference"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//DiagramElement/property"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DiagramLink">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DiagramLink/zoom"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//DiagramLink/viewport"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DiagramLink/graphElement"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DiagramLink/diagram"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GraphConnector">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//GraphConnector/graphElement"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//GraphConnector/graphEdge"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//SemanticModelBridge">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//SemanticModelBridge/presentation"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//SemanticModelBridge/graphElement"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//SemanticModelBridge/diagram"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Dimension">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Dimension/width"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Dimension/height"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Reference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Reference/isIndividualRepresentation"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Reference/referenced"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Property">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Property/key"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Property/value"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GraphEdge">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//GraphEdge/anchor"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphEdge/waypoints"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Diagram">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Diagram/zoom"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Diagram/viewpoint"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Diagram/diagramLink"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Diagram/namespace"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GraphNode">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphNode/size"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//SimpleSemanticModelElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//SimpleSemanticModelElement/typeInfo"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//UMASemanticModelBridge">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//UMASemanticModelBridge/element"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//CoreSemanticModelBridge">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//CoreSemanticModelBridge/element"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//LeafElement"/>
-    <genClasses ecoreClass="uma.ecore#//TextElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//TextElement/text"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Image">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Image/uri"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Image/mimeType"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GraphicPrimitive"/>
-    <genClasses ecoreClass="uma.ecore#//Polyline">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Polyline/closed"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Polyline/waypoints"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Ellipse">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Ellipse/radiusX"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Ellipse/radiusY"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Ellipse/rotation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Ellipse/startAngle"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Ellipse/endAngle"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Ellipse/center"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Activity">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/breakdownElements"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/roadmaps"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/supportingMaterials"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/checklists"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/concepts"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/examples"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/guidelines"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/reusableAssets"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkBreakdownElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkBreakdownElement/isRepeatable"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkBreakdownElement/isOngoing"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkBreakdownElement/isEventDriven"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkBreakdownElement/linkToPredecessor"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//BreakdownElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//BreakdownElement/prefix"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//BreakdownElement/isPlanned"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//BreakdownElement/hasMultipleOccurrences"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//BreakdownElement/isOptional"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//BreakdownElement/presentedAfter"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//BreakdownElement/presentedBefore"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//BreakdownElement/planningData"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//BreakdownElement/superActivities"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Milestone"/>
-    <genClasses ecoreClass="uma.ecore#//Iteration"/>
-    <genClasses ecoreClass="uma.ecore#//Phase"/>
-    <genClasses ecoreClass="uma.ecore#//TeamProfile">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TeamProfile/teamRoles"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TeamProfile/superTeam"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TeamProfile/subTeam"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//RoleDescriptor">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleDescriptor/Role"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleDescriptor/performsAdditionally"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleDescriptor/assistsIn"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleDescriptor/modifies"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleDescriptor/performsAsOwner"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleDescriptor/responsibleFor"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkOrder">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkOrder/linkType"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkOrder/pred"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessElement"/>
-    <genClasses ecoreClass="uma.ecore#//PlanningData">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PlanningData/startDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PlanningData/finishDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PlanningData/rank"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Descriptor">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Descriptor/isSynchronizedWithSource"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//TaskDescriptor">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/Task"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/additionallyPerformedBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/assistedBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/externalInput"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/mandatoryInput"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/optionalInput"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/output"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/performedPrimarilyBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/selectedSteps"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkProductDescriptor">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescriptor/activityEntryState"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescriptor/activityExitState"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/WorkProduct"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/externalInputTo"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/impactedBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/impacts"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/mandatoryInputTo"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/workedOnBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/OptionalInputTo"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/outputFrom"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/deliverableParts"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/responsibleRole"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//CompositeRole">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//CompositeRole/aggregatedRoles"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//BreakdownElementDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//BreakdownElementDescription/usageGuidance"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ActivityDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ActivityDescription/purpose"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ActivityDescription/alternatives"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ActivityDescription/howtoStaff"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DeliveryProcessDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/scale"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/projectCharacteristics"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/riskLevel"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/estimatingTechnique"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/projectMemberExpertise"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/typeOfContract"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ProcessDescription/externalId"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ProcessDescription/scope"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ProcessDescription/usageNotes"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DescriptorDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DescriptorDescription/refinedDescription"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Concept"/>
-    <genClasses ecoreClass="uma.ecore#//Checklist"/>
-    <genClasses ecoreClass="uma.ecore#//Example"/>
-    <genClasses ecoreClass="uma.ecore#//Guideline"/>
-    <genClasses ecoreClass="uma.ecore#//Estimate">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Estimate/estimationMetric"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Estimate/estimationConderations"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//EstimatingMetric"/>
-    <genClasses ecoreClass="uma.ecore#//EstimationConsiderations"/>
-    <genClasses ecoreClass="uma.ecore#//Report"/>
-    <genClasses ecoreClass="uma.ecore#//Template"/>
-    <genClasses ecoreClass="uma.ecore#//SupportingMaterial"/>
-    <genClasses ecoreClass="uma.ecore#//ToolMentor"/>
-    <genClasses ecoreClass="uma.ecore#//Whitepaper"/>
-    <genClasses ecoreClass="uma.ecore#//TermDefinition"/>
-    <genClasses ecoreClass="uma.ecore#//Practice">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Practice/subPractices"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Practice/contentReferences"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Practice/activityReferences"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ReusableAsset"/>
-    <genClasses ecoreClass="uma.ecore#//Discipline">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Discipline/tasks"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Discipline/referenceWorkflows"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ContentCategory"/>
-    <genClasses ecoreClass="uma.ecore#//RoleSet">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleSet/roles"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Domain">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Domain/workProducts"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Domain/subdomains"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkProductType">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductType/workProducts"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DisciplineGrouping">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DisciplineGrouping/disciplines"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Tool">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Tool/toolMentors"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//RoleSetGrouping">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleSetGrouping/roleSets"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//CustomCategory">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//CustomCategory/categorizedElements"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//CustomCategory/subCategories"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DeliveryProcess">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DeliveryProcess/educationMaterials"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DeliveryProcess/communicationsMaterials"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Process">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Process/includesPatterns"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Process/defaultContext"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Process/validContext"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//CapabilityPattern"/>
-    <genClasses ecoreClass="uma.ecore#//ProcessPlanningTemplate">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ProcessPlanningTemplate/basedOnProcesses"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Roadmap"/>
-    <genClasses ecoreClass="uma.ecore#//ProcessComponent">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ProcessComponent/interfaces"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ProcessComponent/process"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessPackage">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ProcessPackage/processElements"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ProcessPackage/diagrams"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessComponentInterface">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ProcessComponentInterface/interfaceSpecifications"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ProcessComponentInterface/interfaceIO"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessComponentDescriptor">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ProcessComponentDescriptor/ProcessComponent"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//MethodPlugin">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodPlugin/userChangeable"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodPlugin/methodPackages"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodPlugin/bases"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//VariabilityElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//VariabilityElement/variabilityType"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//VariabilityElement/variabilityBasedOnElement"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessContribution">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ProcessContribution/baseProcess"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//MethodUnit">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodUnit/authors"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodUnit/changeDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodUnit/changeDescription"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodUnit/version"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodUnit/copyrightStatement"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//MethodConfiguration">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/methodPluginSelection"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/methodPackageSelection"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/processViews"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/defaultView"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/baseConfigurations"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessFamily">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ProcessFamily/deliveryProcesses"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//MethodLibrary">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodLibrary/methodPlugins"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodLibrary/predefinedConfigurations"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.epf.uma/model/1.0.3/properties.txt b/plugins/org.eclipse.epf.uma/model/1.0.3/properties.txt
deleted file mode 100755
index 6fb3f9c..0000000
--- a/plugins/org.eclipse.epf.uma/model/1.0.3/properties.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Non-NLS Markers:	true
-Containment Proxies:	true
-Suppress EMF Metadata:	false
-Root Extends Class:	org.eclipse.epf.uma.ecore.impl.MultiResourceEObject
-Root Extends Interface:	org.eclipse.epf.uma.ecore.IModelObject
-Code Formatting:	true
-Dynamic Templates:	true
-Template Directory:	/org.eclipse.epf.uma.ecore/templates
diff --git a/plugins/org.eclipse.epf.uma/model/1.0.3/uma.ecore b/plugins/org.eclipse.epf.uma/model/1.0.3/uma.ecore
deleted file mode 100755
index 9dc5770..0000000
--- a/plugins/org.eclipse.epf.uma/model/1.0.3/uma.ecore
+++ /dev/null
@@ -1,1229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="uma"
-    nsURI="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" nsPrefix="org.eclipse.epf.uma">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="03"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EDataType" name="Date" instanceClassName="java.util.Date">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Data type used for attributes of meta-model classes of the type Date."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="Uri" instanceClassName="java.net.URI">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Data type used for attributes of meta-model classes that point to resources such as files."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="UnlimitedNatural" instanceClassName="int"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="String" instanceClassName="java.lang.String"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Set" instanceClassName="java.util.Set"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Sequence" instanceClassName="java.util.List"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Integer" instanceClassName="int"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Float" instanceClassName="java.lang.Float"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Classifier" abstract="true" eSuperTypes="#//Type">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Classifier."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Type" abstract="true" eSuperTypes="#//PackageableElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Type."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Element" abstract="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Element."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NamedElement" abstract="true" eSuperTypes="#//Element">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Named Element.  Defined that every element has a name."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PackageableElement" abstract="true"
-      eSuperTypes="#//NamedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Packagable Element."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Package" eSuperTypes="#//Namespace #//PackageableElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Package."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Namespace" abstract="true" eSuperTypes="#//NamedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Namespace."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodElement" abstract="true" eSuperTypes="#//PackageableElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Every class defined in this specification is derived from Method Element.  In other words Method Element is the root generalization for all UMA classes and defines a common set of attributes inherited by every other element type of this model.  Method Element itself is derived from Packageable Element from the UML 2.0 Infrastructure.  Method Element inherits the Name attribute from Packageable Element's super class.  Every element defined as a UMA instance is derived from Model Element.  Every Method Element in-stance is at least defined by a unique id, a name, as well as brief description."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="guid" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every instance of Method Element has a global unique id."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="briefDescription" unique="false"
-        eType="#//String" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every instance of Method Element shall be briefly described with one or two sentences summarizing the element."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedRules" ordered="false"
-        upperBound="-1" eType="#//Constraint" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="suppressed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If a Variability Element is derived from another Variability Element using the Extends Variability Specialization then this attribute can be used to suppress inherited Method Elements that were part of the based-on Variability Element, which can be any type of Method Element.  In other words, if this attribute is set to true on a Method Element that has the same name than an inherited method element then it will not be regarded as inherited at all."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="orderingGuide" unique="false"
-        eType="#//String" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute is used for CASE tool realizations of this model to contain information about layout and ordering of the method element and its parts."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Constraint" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Constraint is a Method Element that represents a condition or restriction expressed in natural language text or in a machine readable language for the purpose of declaring some of the semantics of a Method Element."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" unique="false" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute stores the definition of the constraint."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentElement" abstract="true" eSuperTypes="#//DescribableElement #//VariabilityElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Content Element is a Describable Element that represents an abstract generalization for all elements that are considered to be and managed as Method Content.&#xD;&#xA;Content Elements represents reusable Method Content that is supposed to be managed in Content Packages.  The separation of Content Element from Process Element allows to clearly distinguish between pure method content from content that is represented in processes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="supportingMaterials" ordered="false"
-        upperBound="-1" eType="#//SupportingMaterial"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="conceptsAndPapers" ordered="false"
-        upperBound="-1" eType="#//Concept"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="checklists" ordered="false"
-        upperBound="-1" eType="#//Checklist"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="guidelines" ordered="false"
-        upperBound="-1" eType="#//Guideline"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="examples" ordered="false"
-        upperBound="-1" eType="#//Example"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="assets" ordered="false"
-        upperBound="-1" eType="#//ReusableAsset"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DescribableElement" abstract="true"
-      eSuperTypes="#//MethodElement #//Classifier">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Describable Element is an abstract generalization of Method Elements for which external presentation names as well as content descriptions have been defined, such as Roles or Work Products.  Presentation Name and Content Descriptions are typically localized using a resource allocation mechanism for its String type attributes.&#xD;&#xA;This abstraction represents all elements in the Method Content as well as Process space for which concrete textual descriptions are defined in the form of documenting attributes grouped in a matching Content Description instance (see Section 4.1.4).  Describable Elements are intended to be published in method or process publications (similar to the IBM Rational Unified Process web).  Describable Element defines that the element it represents will have content 'attached' to it.  Content Description is the abstraction for the actual places in which the content is being represented.  This separation allows a distinction between core method model elements describing the structure of the model from the actual description container providing, for example, the documentation of the content element in different alternatives languages, audiences, licensing levels, etc."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presentationName" unique="false"
-        eType="#//String" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Describable Element has a presentation name, which is used for external presentation of the element.  For example, name (the internal representation) might be set to &quot;rup_architecture_document&quot; to differentiate from a &quot;j2ee_architcture_document&quot; whereas the external presentation would always be &quot;Architecture Document&quot;."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="presentation" eType="#//ContentDescription"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="shapeicon" unique="false"
-        eType="#//Uri">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A reference to an icon that can be used for modeling with specific Content Element instances (as graphical stereotypes, e.g. a use case symbol for a use case artifact) as well as publication of content."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nodeicon" eType="#//Uri">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A reference to an icon that can be used in tree browser presentations and breakdown structures."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentDescription" eSuperTypes="#//MethodUnit">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Content Description is a Method Element that is used to store the textual description for a Content Element.  It defines standard attributes applicable for all Content Element types.  Specific Content Element sub-types can define their own matching Content Description sub-types. "/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mainDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute store the main descriptive text for the Content Element.  All text that is not part of any of the more specific attributes shall be stored here.  If the Content Description is divided into sections using the Section class, then only the text from the 'start' of the content description to the first section will be stored here (similar to a normal document where you can place text between its beginning to its first diction heading)."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sections" ordered="false"
-        upperBound="-1" eType="#//Section" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="keyConsiderations" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Key Considerations provides advise and guidance of a critical nature for the content element as well as warnings, cautions, pitfalls, dangers."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Section" eSuperTypes="#//VariabilityElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Section is a special Method Element that represents structural subsections of a Content Description's sectionDescription attribute.  It is used for either large scale documentation of Content Elements organized into sections as well as to flexibly add new Sections to Content Elements using contribution variability added to the Section concept for Method Plug-ins."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sectionName" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Section has a name used for external presentation of the section, e.g. when published or when section heading are listed in a table of contents.  This attribute is similar to Presentation Name for Content Elements."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sectionDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attributes store the description text for a Content Description's Section."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subSections" ordered="false"
-        upperBound="-1" eType="#//Section" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="predecessor" eType="#//Section"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Role" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Role is a content element that defines a set of related skills, competencies, and responsibilities.  Roles are used by Tasks to define who performs them as well as define a set of work products they are responsible for.  &#xD;&#xA;A Role defines a set of related skills, competencies, and responsibilities of an individual or a set of individuals.  Roles are not individuals or resources.  Individual members of the development organization will wear different hats, or perform different roles. The mapping from individual to role, performed by the project manager when planning and staffing for a project, allows different individuals to act as several different roles, and for a role to be played by several individuals."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="modifies" ordered="false"
-        upperBound="-1" eType="#//WorkProduct" changeable="false" volatile="true"
-        transient="true" derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="responsibleFor" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProduct" abstract="true" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Work Product is an abstract class which provides a generalization for the content element types Artifact, Outcome, and Deliverable.  The meta-model class Work Product actually represents work product types, i.e. an instance of Work Product is a description of a specific type of work product and not an individual work product instance.  However, for simplicity reasons and because of low risk of misinterpretation we did not append the word 'type' to every meta-class.&#xD;&#xA;A work product is an abstraction for descriptions of content elements that are used to define anything used, produced, or modified by a task."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reports" ordered="false"
-        upperBound="-1" eType="#//Report"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="templates" ordered="false"
-        upperBound="-1" eType="#//Template"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toolMentors" ordered="false"
-        upperBound="-1" eType="#//ToolMentor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="estimationConsiderations"
-        ordered="false" upperBound="-1" eType="#//EstimationConsiderations"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Task" eSuperTypes="#//ContentElement #//WorkDefinition">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Task is a content element that describes work being performed by Roles.  It defines one default performing Role as well as many additional performers.  A Task is associated to input and output work products.  Inputs are differentiated in mandatory versus optional inputs.  The associations to Work Products are not instantiatable/variable-like parameters.  They rather express (hyper-)links to the descriptions of the work products types that are related to the Task as inputs and outputs.  In other words, these associations are not intended to be used to capture which concrete instances will be passed when instantiating the method in a project.  All of the Task's default associations can be overridden in an actual process definition.&#xD;&#xA;A Task describes an assignable unit of work.  Every Task is assigned to specific Roles.  The granularity of a Task is generally a few hours to a few days.  It usually affects one or only a small number of work products. A Task is used as an element of defining a process. Tasks are further used for planning and tracking progress; therefore, if they are defined too fine-grained, they will be neglected, and if they are too large, progress would have to be expressed in terms of a Task's parts (e.g. Steps, which is not recommended). &#xD;&#xA;A Task has a clear purpose in which the performing roles achieve a well defined goal.  It provides complete step-by-step explanations of doing all the work that needs to be done to achieve this goal.  This description is complete, independent of when in a process lifecycle the work would actually be done.  It therefore does not describe when you do what work at what point of time, but describes all the work that gets done throughout the development lifecycle that contributes to the achievement of this goal.  When the Task is being applied in a process then this process application (defined as Task Descriptor) provides the information of which pieces of the Task will actually be performed at any particular point in time. This assumes that the Task will be performed in the process over and over again, but each time with a slightly different emphasis on different steps or aspects of the task description. &#xD;&#xA;For example, a Task such as &quot;Develop Use Case Model&quot; describes all the work that needs to be done to develop a complete use case model. This would comprise of the identification and naming of use cases and actors, the writing of a brief description, the modeling of use cases and their relationships in diagrams, the detailed description of a basic flow, the detailed description of alternatives flows, performing of walkthroughs workshops and reviews, etc.  All of these parts contribute to the development goal of developing the use case model, but the parts will be performed at different points in time in a process.  Identification, naming, and brief descriptions would be performed early in a typical development process versus the writing of detailed alternative flows which would be performed much later.  All these parts or steps within the same Task define the &quot;method&quot; of Developing a Use Case Model.  Applying such a method in a lifecycle (i.e. in a process) is defining which steps are done when going from one iteration to the next."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="performedBy" eType="#//Role"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mandatoryInput" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="output" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="additionallyPerformedBy"
-        ordered="false" upperBound="-1" eType="#//Role"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="optionalInput" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="steps" ordered="false"
-        upperBound="-1" eType="#//Step" changeable="false" volatile="true" transient="true"
-        derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toolMentors" ordered="false"
-        upperBound="-1" eType="#//ToolMentor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="estimationConsiderations"
-        ordered="false" upperBound="-1" eType="#//EstimationConsiderations"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkDefinition" abstract="true" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Work Definition is an abstract Method Element that generalizes all descriptions of work within the Unified Method Architecture.  This package introduces two concrete types of Work Definitions: Task and Step.  Work Definitions can contain sets of pre- and post-conditions defining constraints that need to be valid before the described work can begin or before it can be declared as finished.  Note that general ownedRules can be used to define additional constraints and rules for Work Definitions.&#xD;&#xA;Work Definitions represent behavioral descriptions for doing work.  These behavioral descriptions are not bound to one specific classifier, but represent an arbitrary definition of work.  For example, a Work Definition could represent work that is being performed by a specific Role (e.g. a Role performing a specific Task or Steps of a Task), by many Roles working in close collaboration (many Roles all working together on the same interdisciplinary Task), or complex work that is performed throughout the lifecycle (e.g. a process defining a breakdown structure for organizing larger composite units of work performed by many Roles working in collaboration)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="precondition" eType="#//Constraint"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="postcondition" eType="#//Constraint"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Step" eSuperTypes="#//Section #//WorkDefinition">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Step is a Section and Work Definition that is used to organize Tasks into parts or subunits of work.  Steps inherit the subSections decomposition from Section and can therefore describe Sub-Steps nested into Steps.&#xD;&#xA;A Step describes a meaningful and consist part of the overall work described for a Task.  The collection of Steps defined for a Task represents all the work that should be done to achieve the overall development goal of the Task.  Not all steps are necessarily performed each time a Task is invoked in a Process (see Task Descriptor), so they can also be expressed in the form of alternate 'flows' of work.  Different ways of achieving the same development goal can then be 'assembled' by selecting different combinations of steps when applying the Task in a Process.  Typical kinds of steps a Task author should consider are: Thinking steps: where the individual roles understand the nature of the task, gathers and examines the input artifacts, and formulates the outcome. Performing steps: where the individual roles create or update some artifacts. Reviewing steps: where the individual roles inspects the results against some criteria."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Guidance" abstract="true" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Guidance is an abstract generalization of additional information related to content elements such as Roles, Tasks, and Work Products.  Examples for Guidance are Guidelines, Templates, Checklists, Tool Mentors, Estimates, Supporting Materials, Reports, Concepts, etc.  This package only contains the definition of the abstract Guidance class.  The package Guidance Types defines concrete guidance types."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Artifact" eSuperTypes="#//WorkProduct">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Artifact is a Work Product that provides a description and definition for tangible work product types. Artifacts may be composed of other artifacts. For example, a model artifact can be composed of model elements, which are also artifacts.&#xD;&#xA;Artifacts are tangible work products consumed, produced, or modified by Tasks.  It may serve as a basis for defining reusable assets.  Roles use Artifacts to perform Tasks and produce Artifacts in the course of performing Tasks.  Artifacts are the responsibility of a single Role, making responsibility easy to identify and understand, and promoting the idea that every piece of information produced in the method requires the appropriate set of skills. Even though one role might &quot;own&quot; a specific type of Artifacts, other roles can still use the Artifacts; perhaps even update them if the Role has been given permission to do so."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="containerArtifact" eType="#//Artifact"
-        transient="true" eOpposite="#//Artifact/containedArtifacts"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="containedArtifacts" ordered="false"
-        upperBound="-1" eType="#//Artifact" containment="true" eOpposite="#//Artifact/containerArtifact"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Deliverable" eSuperTypes="#//WorkProduct">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A deliverable is a Work Product that provides a description and definition for packaging other Work Products, and may be delivered to an internal or external party.  Therefore, a Deliverable aggregates other Work Products. Therefore, a Deliverable aggregates other Work Products.  A Deliverable is used to pre-define typical or recommended content in the form or work products that would be packaged for delivery.  The actual packaging of the Deliverable in an actual process or even project could be a modification of this recommendation.  Deliverables are used to represent an output from a process that has value, material or otherwise, to a client, customer or other stakeholder. "/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deliveredWorkProducts"
-        ordered="false" upperBound="-1" eType="#//WorkProduct"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Outcome" eSuperTypes="#//WorkProduct">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An outcome describes intangible work products that are a result or state. Outcomes may also be used to describe work products that are not formally defined.  A key differentiator for outcomes against artifacts is that outcomes are not candidates for harvesting as reusable assets."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodPackage" abstract="true" eSuperTypes="#//MethodElement #//Package">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Package is an abstract class for packaging Method Elements.  All Method Elements shall be located in exactly one of Method Package's concrete specializations (e.g. Content Package).   Method Package defines common properties for all of its specializations. Elements are organized in Method Packages to structure large scale of method content and processes as well as to define a mechanism for reuse.  Method Elements from one package can reuse element from other packages by defining a reusedPackages link.  For example, a work product defined in one package can be used as an input for Tasks defined in other packages.  By reusing it from one common place (i.e. the package in which it has been defined) ensures that no redundant definitions of the same elements are required.  Also maintenance of method content is greatly improved as changes can be performed in only one place.  Note, that other packages will introduce more specializations of Method Package, e.g. Process Package and Process Component."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="global" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Method Packages can have a global scope.  This means that every element of every other Method Package can see the global package's contents.  Global Method Packages are primarily used to store commonly used category definitions such as for Disciplines or Domains, which are used by many Task and Work Products respectively."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reusedPackages" ordered="false"
-        upperBound="-1" eType="#//MethodPackage"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="childPackages" ordered="false"
-        upperBound="-1" eType="#//MethodPackage" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentPackage" eSuperTypes="#//MethodPackage">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Content Package is special Method Package that contains Content Elements and Content Elements, only.  Examples for Content Element are Artifacts, Tasks, Roles, etc.  A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contentElements" ordered="false"
-        upperBound="-1" eType="#//ContentElement" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ArtifactDescription" eSuperTypes="#//WorkProductDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="briefOutline" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides a brief description of the information that can be found in this artifact. For example, discusses the contents for key chapters of a document artifact or the key packages and modules of a model artifact."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="representationOptions"
-        eType="#//String" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Discusses different possible alternative representations for the artifact. For example a design model can be represented as a UML model or an informal block diagram or by textual description only."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalId" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="An external visible number that is used to reference this artifact. Used like a synonym."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="purpose" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes why the work product is produced and to what use it will be put."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="impactOfNotHaving" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the consequences of not producing the work product.  This is intended to aid in the tailoring the method/process to the needs of a specific project."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="reasonsForNotNeeding" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the circumstances in which it is reasonable not to produce the work product.  This is intended to aid in the tailoring of the method/process to the needs of a specific project."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DeliverableDescription" eSuperTypes="#//WorkProductDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The description of the Deliverable used for client documents (proposal, statements of work or contractual agreements).  It might use a different language and follow legal constraints."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="packagingGuidance" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides guidance on how to assemble the deliverable from all its required inputs.  This section describes the most common content medium and format.  Distribution of the deliverable is addressed in this section, if necessary."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="skills" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Lists of set of required skills a person needs to possess to fulfill that Role."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="assignmentApproaches" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides guidance on for assigning individuals to the Role in terms of what other roles these individuals could perform and what responsibility different individuals assigned to this role might have.  The guidance can also describe different assignment approaches for different types of projects, e.g. for large versus small teams where individuals could be allocated to roles full time versus sharing roles within the team."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="synonyms" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Lists synonyms, i.e. other names the Role might be referred by.  Tool support for the meta-model might support that a Role name can be consistently be replaced with one of its synonyms throught a Process."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TaskDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="purpose" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Summarizes the main reason for performing this Task and what is intended to be achieved."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alternatives" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Comprises of summaries describing important exceptional and non-standard ways of achieving this Task's development goals that were not covered by the Task's Steps."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GuidanceDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="attachments" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This field is primarily used for attachments augmenting the information provided for guidance.  In particular the attribute is used for Templates, Examples, and Reusable Assets to contain the actual attachment described in the mainDescription.  It can additionally contain representations of the guidance in just a third party format, e.g. PDF, MS Word, or Word Perfect."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PracticeDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="additionalInfo" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Any additional Information not covered by the other attributes."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="problem" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A description of the problem the Practice addresses."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="background" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Elaboration on the background and the context in which the problem occurs and where the solution described by this Practice will fit in."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="goals" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A summary of the overall goals to be addressed by the Practice."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="application" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes how the Practice is being applied or introduced into the context described in background."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelsOfAdoption" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Outlines the different forms or variants in which the practice could be realized. (e.g. full adoption verus a partial adoption of the Practice)"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Point">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphElement" abstract="true" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="position" eType="#//Point"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contained" ordered="false"
-        upperBound="-1" eType="#//DiagramElement" containment="true" eOpposite="#//DiagramElement/container"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="link" ordered="false" upperBound="-1"
-        eType="#//DiagramLink" containment="true" eOpposite="#//DiagramLink/graphElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="anchorage" ordered="false"
-        upperBound="-1" eType="#//GraphConnector" containment="true" eOpposite="#//GraphConnector/graphElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="semanticModel" unique="false"
-        eType="#//SemanticModelBridge" containment="true" eOpposite="#//SemanticModelBridge/graphElement"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DiagramElement" abstract="true" eSuperTypes="#//MethodElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isVisible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="container" eType="#//GraphElement"
-        transient="true" eOpposite="#//GraphElement/contained"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" ordered="false"
-        upperBound="-1" eType="#//Reference" eOpposite="#//Reference/referenced"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="property" ordered="false"
-        upperBound="-1" eType="#//Property" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DiagramLink" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="zoom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewport" eType="#//Point"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="graphElement" lowerBound="1"
-        eType="#//GraphElement" transient="true" eOpposite="#//GraphElement/link"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" lowerBound="1"
-        eType="#//Diagram" eOpposite="#//Diagram/diagramLink"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphConnector" eSuperTypes="#//GraphElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="graphElement" lowerBound="1"
-        eType="#//GraphElement" transient="true" eOpposite="#//GraphElement/anchorage"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="graphEdge" ordered="false"
-        upperBound="-1" eType="#//GraphEdge" eOpposite="#//GraphEdge/anchor"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SemanticModelBridge" abstract="true"
-      eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presentation" eType="#//String"
-        defaultValueLiteral=""/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="graphElement" eType="#//GraphElement"
-        transient="true" eOpposite="#//GraphElement/semanticModel"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" eType="#//Diagram"
-        transient="true" eOpposite="#//Diagram/namespace"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Dimension">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Reference" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isIndividualRepresentation"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referenced" lowerBound="1"
-        eType="#//DiagramElement" eOpposite="#//DiagramElement/reference"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Property" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="#//String"
-        defaultValueLiteral=""/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphEdge" eSuperTypes="#//GraphElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="anchor" ordered="false"
-        upperBound="2" eType="#//GraphConnector" eOpposite="#//GraphConnector/graphEdge"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="waypoints" ordered="false"
-        upperBound="-1" eType="#//Point" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Diagram" eSuperTypes="#//GraphNode">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="zoom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewpoint" eType="#//Point"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagramLink" ordered="false"
-        upperBound="-1" eType="#//DiagramLink" eOpposite="#//DiagramLink/diagram"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="namespace" unique="false"
-        eType="#//SemanticModelBridge" containment="true" eOpposite="#//SemanticModelBridge/diagram"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphNode" eSuperTypes="#//GraphElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="size" eType="#//Dimension"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SimpleSemanticModelElement" eSuperTypes="#//SemanticModelBridge">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeInfo" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UMASemanticModelBridge" eSuperTypes="#//SemanticModelBridge">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="#//MethodElement"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CoreSemanticModelBridge" eSuperTypes="#//SemanticModelBridge">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
-        eType="#//Element"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LeafElement" abstract="true" eSuperTypes="#//DiagramElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="TextElement" eSuperTypes="#//LeafElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="text" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Image" eSuperTypes="#//LeafElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" eType="#//Uri"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mimeType" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphicPrimitive" abstract="true" eSuperTypes="#//LeafElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Polyline" eSuperTypes="#//GraphicPrimitive">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="closed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="waypoints" ordered="false"
-        lowerBound="2" upperBound="-1" eType="#//Point" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Ellipse" eSuperTypes="#//GraphicPrimitive">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="radiusX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="radiusY" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rotation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="startAngle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="endAngle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="center" eType="#//Point"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Activity" eSuperTypes="#//WorkBreakdownElement #//VariabilityElement #//WorkDefinition">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An Activity is a Work Breakdown Element and Work Definition which supports the nesting and logical grouping of related Breakdown Elements forming breakdown structures.  Although Activity is a concrete meta-class, other classes which represent breakdown structures derive from it; such as Phase, Iteration, Delivery Process, or Capability Pattern.&#xD;&#xA;Activity represents a grouping element for other Breakdown Elements such as Activities, Descriptors, Milestones, etc.  It is not per-se a 'high-level' grouping of only work as in other meta-models, but groups any kind of Breakdown Elements.  For example, one can define valid Activities that group only Work Products Descriptors without any matching Task Descriptors.  Activities also inherit all properties from Work Breakdown Element and indirectly from Process Element; i.e. Activity is ready to have a full content description attached to it."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="breakdownElements" ordered="false"
-        upperBound="-1" eType="#//BreakdownElement" eOpposite="#//BreakdownElement/superActivities"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="roadmaps" ordered="false"
-        upperBound="-1" eType="#//Roadmap"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="supportingMaterials" ordered="false"
-        upperBound="-1" eType="#//SupportingMaterial"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="checklists" ordered="false"
-        upperBound="-1" eType="#//Checklist"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="concepts" ordered="false"
-        upperBound="-1" eType="#//Concept"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="examples" ordered="false"
-        upperBound="-1" eType="#//Example"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="guidelines" ordered="false"
-        upperBound="-1" eType="#//Guideline"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reusableAssets" ordered="false"
-        upperBound="-1" eType="#//ReusableAsset"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isEnactable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkBreakdownElement" abstract="true"
-      eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Work Breakdown Element is a special Breakdown Element that provides specific properties for Breakdown Elements that represent or refer to Work Definitions.  For example its subclass Activity defines work as it is also a subclass of Work Definition.  Its subclass Task Descriptor does not define work by itself, but refers to a Work Definition and therefore can have the same common properties and Work Breakdown Element has."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isRepeatable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute is used to define repetition of work, e.g. iterations.  A Process Work Definition with this attribute set to True shall be repeated more than once on the same set of artifacts.  For example, for an instance of Iteration (defined as a special Process Work Definition below) this attribute is set to True by default indicating that every sub-Activity will be repeated more than once.  However, any Process Work Definition can set this attribute to True to define iterations (e.g. to iterate one Activity consisting of many sub-activities or even Phases, but to iterate just one Task)."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isOngoing" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If the isOngoing attribute is set to True for a Process Work Definition instance, then the element describes an ongoing piece of work without a fixed duration or end state.  For example, the Process Work Definition could represent work of an administrator continuously (e.g. 3h a day) working to ensure that systems are kept in a certain state.  Another example would be program management work overseeing many different projects being scheduled for one particular project at specific reoccurring intervals during the whole lifecycle of the project."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isEventDriven" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The isEventDriven attribute indicates that the Process Work Definition describes an instance of work which is not started because it has been scheduled to start at a certain point of time, because preceding work is being completed, or input work products are available, but because another specific event has occurred.  Examples for such events are exceptions or problem situations which require specific work to be performed as a result.  Also change management work can be modeled as event driven work analyzing a change request or defect and allocating work dynamically to resources to deal with it following the work described with such Process Work Definition.  The events themselves are not modeled in this version of the specification.  They shall be described as part of the normal descriptions fields available.&#xD;&#xA;&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="linkToPredecessor" ordered="false"
-        upperBound="-1" eType="#//WorkOrder"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BreakdownElement" abstract="true" eSuperTypes="#//ProcessElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Breakdown Element is an abstract generalization for any type of Method Element that is part of a breakdown structure.  It defines a set of properties available to all of its specializations."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Prefix represents an additional label that will be presented as a prefix to any Breakdown Element to indicate a user-defined sub-type for the element.  For example, if the process engineer would like to distinguish his Activities by 'Module' (as done in the IBM Rational Summit Ascendant Method), he can define a different prefix for every model to be used in addition to naming Activities, e.g. &quot;SRA.Establish Requirements&quot; with SRA indicating that this Activity belongs to the &quot;Software Requirements Analysis&quot; module.  Another common application for prefix is to qualify roles in Role Descriptors.  For example, &quot;Customer.Architect&quot; would define a &quot;Customer&quot; prefix for the Role Descriptor &quot;Architect&quot; expressing that this is an architect on the customer side and not the development team side."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isPlanned" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A key application for Development Processes expressed with Breakdown structures is to generate a project plan from it.  A process as defined in UMA (cf. with Sections XX and 5.2) is a multi-dimensional structure defining what work is being performed at what time by which roles using which input and producing what outputs.  A project plan as it is represented in project planning tools such as IBM Rational Portfolio Manager or Microsoft Project normally does not need all this information and is normally limited to just representing a subset.  For example, a typical MS Project plan only represents the work breakdown consisting of Tasks and Activities (sometimes referred to as summary tasks).  It does not show the input and output Work Products for a Task, but it can show which roles shall be staffed for performing the Task.  However, such role allocation need to be replaced with concrete resources when instantiating the plan for a concrete project.  Sometimes project plans can then again be organized differently by organizing work by deliverables in which Work Products are mapped to the plan's summary tasks and Task that have these work products as output mapped below such as summary task.  Therefore, a process can make recommendations about which elements to include and which to exclude when generating a plan.  When the isPlanned attribute is set to False for an instance of a Breakdown Element, then this element shall not be not included when a concrete project plan is being generated from the breakdown structure that contains this element.&#xD;&#xA;&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hasMultipleOccurrences"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Just as the isPlanned attribute the hasMultipleOccurrences attribute has an impact on generating plans from a Process.  When this attribute is set to True for a Breakdown Element then it will typically occur multiple times within the same Activity.  For example, a Task such as &quot;Detail Use Case&quot; would be performed for every use case identified for a particular Iteration or Activity.  Generating a plan would list one Task instance per use case."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isOptional" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The isOptional attribute indicates that the Breakdown Element describes work, a work result, or even work resources, which inclusion is not mandatory when performing a project that is planned based on a process containing this element."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="presentedAfter" eType="#//BreakdownElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="presentedBefore" eType="#//BreakdownElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="planningData" eType="#//PlanningData"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="superActivities" eType="#//Activity"
-        eOpposite="#//Activity/breakdownElements"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Milestone" eSuperTypes="#//WorkBreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Milestone describes a significant event in a development project, such as a major decision, completion of a deliverable, or meeting of a major dependency (like completion of a project phase).  Because, Milestone is commonly used to refer to both the event itself and the point in time at which the event is scheduled to happen, it is modeled as a Breakdown Element (i.e. it appears as part of a breakdown structure)."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Iteration" eSuperTypes="#//Activity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Iteration is a special Activity, which prescribes pre-defined values for its instances for the attributes prefix ('Iteration') and isRepeatable ('True').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.&#xD;&#xA;Iteration groups a set of nested Activities that are repeated more than once.  It represents an important structuring element to organize work in repetitive cycles.  The concept of Iteration can be associated with different rules in different methods.  For example, the IBM Rational Unified Process method framework (RUP) defines a rule that Iterations are not allowed to span across Phases.  In contrast IBM Global Services Method (GSMethod) based method frameworks this rule does not apply and Iteration can be defined which nest Phases.  Rules like these, which play an important role for each individual method and are therefore not enforced by this meta-model.  Instead, process authors are expected to follow and check these rules manually.  (Note: Any Breakdown Element can be repeated; however, Iterations has been introduced as a special meta-model concept, because of its important role for many methods.)"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Phase" eSuperTypes="#//Activity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Phase is a special Activity, which prescribes pre-defined values for its instances for the attributes prefix ('Phase') and isRepeatable ('False').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.&#xD;&#xA;Phase represent a significant period in a project, ending with major management checkpoint, milestone or set of Deliverables.  It is included in the model as a predefined special Activity, because of its significance in defining breakdowns."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TeamProfile" eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Team Profile is a Breakdown Element that groups Role Descriptors or Resource Definitions defining a nested hierarchy of teams and team members.&#xD;&#xA;Work assignments and Work Product responsibilities can be different from Activity to Activity in a development project. Different phases require different staffing profiles, i.e. different skills and resources doing different types of work.  Therefore, a process needs to define such different profiles in a flexible manner.  Whereas Core Method Content defines standard responsibilities and assignments, a process express by a breakdown structures needs to be able refine and redefine these throughout its definition.  Role Descriptors, Resource Definitions, as well as Team Profiles provide the data structure necessary to achieve this flexibility and to provide a process user with the capability to define different teams and role relationships for every Activity (including Activities on any nesting-level as well as Iterations or Phases).&#xD;&#xA;Hence, in addition to the work breakdown and work product breakdown structures defined so far, Team Profiles are used to define a third type of breakdown structure: team breakdown structures.  These are created as an Activity specific hierarchy of Team Profiles comprising of Role Descriptors and Resource Definitions.  These structures can be presented as well-known Org-Charts.  Just as with any other Breakdown Element and Descriptors, Team Profiles can be defined within the scope of any Activity in a breakdown structure.  In other words every Activity can define its own Team Profiles consisting of Activity specific Role Descriptors and Resource Definitions.  Typically, Team Profiles are defined on the level of Iterations or Phases or other higher-level Activity."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="teamRoles" ordered="false"
-        upperBound="-1" eType="#//RoleDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="superTeam" lowerBound="1"
-        eType="#//TeamProfile" eOpposite="#//TeamProfile/subTeam"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subTeam" ordered="false"
-        upperBound="-1" eType="#//TeamProfile" eOpposite="#//TeamProfile/superTeam"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleDescriptor" eSuperTypes="#//Descriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Role Descriptor represents a Role in the context of one specific Activity.  Every breakdown structure can define different relationships of Role Descriptors to Task Descriptors and Work Product Descriptors.  Therefore one Role can be represented by many Role Descriptors each within the context of an Activity with its own set of relationships."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Role" eType="#//Role"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="modifies" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" changeable="false" volatile="true"
-        transient="true" derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="responsibleFor" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="WorkOrderType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Work Order represents a relationship between two Breakdown Element in which one Breakdown Element (referred to as (B) below) depends on the start or finish of another Breakdown Element (referred to as (A) below) in order to begin or end. This enumeration defines the different types of Work Order relationships available in UMA and is used to provide values for Work Order's linkType attribute."/>
-    </eAnnotations>
-    <eLiterals name="finishToStart"/>
-    <eLiterals name="finishToFinish" value="1"/>
-    <eLiterals name="startToStart" value="2"/>
-    <eLiterals name="startToFinish" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkOrder" eSuperTypes="#//ProcessElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Work Order is a Method Element that represents a relationship between two Breakdown Elements in which one Breakdown Elements depends on the start or finish of another Breakdown Elements in order to begin or end.  &#xD;&#xA;(Note, Work Order is not modeled as an Association Class to provide a straightforward mapping  to XMI and EMF.)&#xD;&#xA;The Work Order class defines predecessor and successor relations amongst Breakdown Elements.  This information is in particular critical for planning applications.  See more details on different types of Work Order relationships at Work Order Type."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="linkType" unique="false"
-        eType="#//WorkOrderType" defaultValueLiteral="finishToStart">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute expresses the type of the Work Order relationship by assigning a value from the Work Order Type enumeration."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="pred" lowerBound="1" eType="#//WorkBreakdownElement"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessElement" abstract="true" eSuperTypes="#//DescribableElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Process Element is a Describable Element that represents an abstract generalization for all elements defined in the Process package.&#xD;&#xA;Process Elements represents Process specific elements that are supposed to be managed in Process Packages.  The separation of Process Element from Content Element allows to clearly distinguish between pure method content from content that is represented in processes. "/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PlanningData" eSuperTypes="#//ProcessElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Planning Data is a Method Element that adds planning data to Breakdown Elements when it is used for a Process Planning Template.  For Delivery Processes and Capability Patterns this class can either not be instantiated or populated with default data.&#xD;&#xA;Planning Data factors out specific optional data needed for representing planning templates.  This association allows to access planning data if it is stored for the Breakdown Element.&#xD;&#xA;(NOTE, THE ATTRIBUTES FOR THIS CLASS ARE NOT COMPLETE, YET)"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="startDate" unique="false"
-        eType="#//Date">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default start date for a planed Task."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finishDate" unique="false"
-        eType="#//Date">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default finish date for a planed Task."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rank" unique="false" eType="#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default rank for a planed Task."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Descriptor" abstract="true" eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Descriptor is an abstract generalization for special Breakdown Elements that references one concrete Content Element.  A descriptor provides a representation of a Content Element within breakdown structures.  In addition to just referencing Content Elements it allows overriding the Content Elements structural relationships by defining its own sets of associations.&#xD;&#xA;Descriptors are the key concept for realizing the separation of processes from method content.  A Descriptor can be characterized as a reference object for one particular Content Element, which has its own relationships and properties.  When a Descriptor is created it shall be provided with congruent copies of the relationships defined for the referenced content element.  However, a user can modify these relationships for the particular process situation for which the descriptor has been created. "/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSynchronizedWithSource"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductDescriptor" eSuperTypes="#//Descriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Work Product Descriptor represents a Work Product in the context of one specific Activity.  Every breakdown structure can define different relationships of Work Product Descriptors to Task Descriptors and Role Descriptors.  Therefore one Work Product can be represented by many Work Product Descriptors each within the context of an Activity with its own set of relationships."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activityEntryState" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Entry State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is initiated (i.e. work on the Activity's Task Descriptors is being initiated that use this Work Product Descriptor as input).  &#xD;&#xA;For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested]."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activityExitState" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Exist State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is finished (i.e. work on the Activity's Task Descriptors has finished that have this Work Product Descriptor as output).&#xD;&#xA;For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested]."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="WorkProduct" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="impactedBy" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" eOpposite="#//WorkProductDescriptor/impacts"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="impacts" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" eOpposite="#//WorkProductDescriptor/impactedBy"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deliverableParts" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TaskDescriptor" eSuperTypes="#//WorkBreakdownElement #//Descriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Task Descriptor is a Descriptor and Work Breakdown Element that represents a proxy for a Task in the context of one specific Activity.  Every breakdown structure can define different relationships of Task Descriptors to Work Product Descriptors and Role Descriptors. Therefore one Task can be represented by many Task Descriptors each within the context of an Activity with its own set of relationships.&#xD;&#xA;A key difference between Method Content and Process is that a Content Element such as Task describes all aspects of doing work defined around this Task.  This description is managed in steps, which are modeled as Sections of the Tasks' Content Descriptions.  When applying a Task in a Process' Activity with a Task Descriptor a Process Engineer needs to indicate that at that particular point in time in the Process definition for which the Task Descriptor has been created, only a subset of steps shall be performed.  He defines this selection using the selectedSteps association.  If he wants to add steps to a Task Descriptor, he can describe these either pragmatically in the refinedDescription attribute or 'properly' create a contributing Task to the Task the Task Descriptor refers to.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Task" eType="#//Task"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="additionallyPerformedBy"
-        ordered="false" upperBound="-1" eType="#//RoleDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="assistedBy" ordered="false"
-        upperBound="-1" eType="#//RoleDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="externalInput" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mandatoryInput" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="optionalInput" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="output" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="performedPrimarilyBy" eType="#//RoleDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="selectedSteps" ordered="false"
-        upperBound="-1" eType="#//Section"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CompositeRole" eSuperTypes="#//RoleDescriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Composite Role is a special Role Descriptor that relates to more then one Role.  It represents a grouping of Roles with the main purpose of simplification, i.e. reducing the number of roles for a process.&#xD;&#xA;A Composite Role is a grouping of Roles that can be used in an Activity or Process to reduce the number of Roles.  A typical application would be a process for a small team in which a standard set of roles from the method content would be all performed by one or more resource.  By using Composite Role the process would suggest a typical clustering of Roles to Resources.  A Composite Role could perform all Tasks defined for the Roles it refers to."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="aggregatedRoles" ordered="false"
-        upperBound="-1" eType="#//Role"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BreakdownElementDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="usageGuidance" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides information and guidance on the meaning of the Boolean flag values and under what circumstances they should be overridden. For example, it describes why the breakdown element is optional or considerations for repeating it and differences in the individual occurrences of this Breakdown Element across the lifecycle."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ActivityDescription" eSuperTypes="#//BreakdownElementDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="purpose" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Summarizes the main reason for performing this Activity, describes what the activity as a whole is intended to achieve."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alternatives" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Comprises of summaries describing important exceptional and non-standard ways of doing the work of this Activity not covered by the Activity's Tasks."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="howtoStaff" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides background on who should be involved in this activity what are the required skills, experience,  and perhaps attitudes."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DeliveryProcessDescription" eSuperTypes="#//ProcessDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scale" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Outlines characteristics about the size of a typical project that performs this project expressed in team size, man years, etc."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectCharacteristics"
-        eType="#//String" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Characterizes the project that would typically perform this Process"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="riskLevel" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Outlines typical project risks that are addressed with this process."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="estimatingTechnique" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the Estimation Techniques provided for this Process."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectMemberExpertise"
-        eType="#//String" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides a profile of a typical project team, the distribution of roles, skills required for a team performs a project based on this process."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeOfContract" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides background information about the contracts that need to be established between a project team that performs this process and a client (e.g. for an IGS engagement)."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessDescription" eSuperTypes="#//ActivityDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalId" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="An external visible number that is used to reference this delivery patterns and models. It is used like a synonym."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scope" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the scope of the Process, i.e. which types of projects does it address and which not."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="usageNotes" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Any additional notes on how to apply and instantiate this process for a project."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DescriptorDescription" eSuperTypes="#//BreakdownElementDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="refinedDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A Descriptor might add refinements to the main description of the Content Element it refers to.  For example, it could provide additional information about a Work Product relevant for the specific point in time in the process this Work Product type is being used.  It could describe additional skills needed for a Role at that particular point in time in a process, etc. "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Concept" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Concept is a specific type of guidance that outlines key ideas associated with basic principles underlying the referenced item. Concepts normally address more general topics than Guidelines and span across sev-eral work product and/or tasks/activities."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Checklist" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Checklist is a specific type of guidance that identifies a series of items that need to be completed or veri-fied.  Checklists are often used in reviews such as walkthroughs or inspections. "/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Example" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An Example is a specific type of Guidance that represents a typical, partially completed, sample instance of one or more work products or scenario like descriptions of how Task may be performed. Examples can be related to Work Products as well as Tasks that produce them as well as any other Content Element."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Guideline" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Guideline is a specific type of guidance that provides additional detail on how to perform a particular task or grouping of tasks (e.g. grouped together as activities) or that provides additional detail, rules, and recommendations on work products and their properties.  Amongst others, it can include details about best practices and different approaches for doing work, how to use particular types of work products, information on different subtypes and variants of the work product and how they evolve throughout a lifecycle, discussions on skills the performing roles should acquire or improve upon, measurements for progress and maturity, etc."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Report" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Report is a predefined template of a result that is generated on the basis of other work products as an output from some form of tool automation. An example for a report would be a use case model survey, which is generated by extracting diagram information from a graphical model and textual information from documents and combines these two types of information into a report."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Template" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Template is a specific type of guidance that provides for a work product a pre-defined table of contents, sections, packages, and/or headings, a standardized format, as well as descriptions how the sections and packages are supposed to be used and completed. Templates cannot only be provided for documents, but also for conceptual models or physical data stores."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SupportingMaterial" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Supporting Materials is catchall for other types of guidance not specifically defined elsewhere. It can be related to all kinds of Content Elements, i.e. including other guidance elements."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ToolMentor" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Tool Mentor is a specific type of guidance that shows how to use a specific tool to accomplish some piece of work a Work Product either in the context of or independent from a Task or Activity."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Whitepaper" eSuperTypes="#//Concept">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Whitepapers are a special Concept guidance that have been externally reviewed or published and can be read and understood in isolation of other content elements and guidance."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TermDefinition" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="TermDefinitions define concepts and are used to build up the Glossary. They are not directly related to ContentElements, but their relationship is being derived when the Term is used in the ContentElements description text."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Practice" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Practice represents a proven way or strategy of doing work to achieve a goal that has a positive impact on work product or process quality.  Practices are defined orthogonal to methods and processes.  They could summarize aspects that impact many different parts of a method or specific processes.  Examples for practices would be &quot;Manage Risks&quot;, &quot;Continuously verify quality&quot;, &quot;Architecture-centric and component-based development&quot;, etc."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subPractices" ordered="false"
-        upperBound="-1" eType="#//Practice" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contentReferences" ordered="false"
-        upperBound="-1" eType="#//ContentElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="activityReferences" ordered="false"
-        upperBound="-1" eType="#//Activity"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EstimationConsiderations" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Estimation Considerations qualify the usage and application of estimation metrics in the development of an actual estimate."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ReusableAsset" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Reusable Asset provides a solution to a problem for a given context. The asset may have a variability point, which is a location in the asset that may have a value provided or customized by the asset consumer. The asset has rules for usage which are the instructions describing&#xD;&#xA;how the asset should be used."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="State" eSuperTypes="#//Vertex">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="WorkProduct" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Region" ordered="false"
-        upperBound="-1" eType="#//Region" containment="true" eOpposite="#//Region/State"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="submachine" eType="#//StateMachine"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Vertex">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="container" eType="#//Region"
-        transient="true" eOpposite="#//Region/Vertex"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoing" ordered="false"
-        upperBound="-1" eType="#//Transition" eOpposite="#//Transition/source"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" ordered="false"
-        upperBound="-1" eType="#//Transition" eOpposite="#//Transition/target"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Region">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Vertex" ordered="false"
-        upperBound="-1" eType="#//Vertex" containment="true" eOpposite="#//Vertex/container"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Transition" ordered="false"
-        upperBound="-1" eType="#//Transition" containment="true" eOpposite="#//Transition/container"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="State" eType="#//State"
-        transient="true" eOpposite="#//State/Region"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="StateMachine" eType="#//StateMachine"
-        transient="true" eOpposite="#//StateMachine/Region"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="StateMachine" eSuperTypes="#//WorkDefinition">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Region" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Region" containment="true" eOpposite="#//Region/StateMachine"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Transition">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="WorkDefinition" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//WorkDefinition"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="container" lowerBound="1"
-        eType="#//Region" transient="true" eOpposite="#//Region/Transition"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" lowerBound="1"
-        eType="#//Vertex" eOpposite="#//Vertex/outgoing"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
-        eType="#//Vertex" eOpposite="#//Vertex/incoming"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PseudoState" eSuperTypes="#//Vertex"/>
-  <eClassifiers xsi:type="ecore:EEnum" name="PseudoStateKind">
-    <eLiterals name="initial"/>
-    <eLiterals name="join" value="1"/>
-    <eLiterals name="fork" value="2"/>
-    <eLiterals name="junction" value="3"/>
-    <eLiterals name="choice" value="4"/>
-    <eLiterals name="entryPoint" value="5"/>
-    <eLiterals name="exitPoint" value="6"/>
-    <eLiterals name="terminate" value="7"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Discipline" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Discipline is a categorization of work (i.e. Tasks for Method Content), based upon similarity of concerns and cooperation of work effort.&#xD;&#xA;A discipline is a collection of Tasks that are related to a major 'area of concern' within the overall project. The grouping of Tasks into disciplines is mainly an aid to understanding the project from a 'traditional' waterfall perspective. However, typically, for example, it is more common to perform certain requirements activities in close coordination with analysis and design activities. Separating these activities into separate disciplines makes the activities easier to comprehend."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tasks" ordered="false"
-        upperBound="-1" eType="#//Task"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subdiscipline" ordered="false"
-        upperBound="-1" eType="#//Discipline" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referenceWorkflows" ordered="false"
-        upperBound="-1" eType="#//Activity"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentCategory" abstract="true" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Content Category is an abstract class generalizing content category types."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleSet" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Role Set organizes Roles into categories.  It is used to group roles together that have certain commonalities.  For example, the &quot;Analysts&quot; Role Set could group the &quot;Business Process Analyst&quot;, &quot;System Analyst&quot;, as well as &quot;Requirements Specifier&quot; roles.  All of these work with similar techniques and have overlapping skills, but are required as distinct roles for a method (e.g. the method the IBM Rational Unified Process is based on)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="roles" ordered="false"
-        upperBound="-1" eType="#//Role"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Domain" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Domain is a refineable hierarchy grouping related work products.  In other words, Domains can be further divided into sub-domains, with work product elements to be categorized only at the leaf-level of this hierarchy.&#xD;&#xA;Domain is a logical grouping of work products that have an affinity to each other based on resources, timing, or relationship.  A Domain may be divided into subdomains.  For example, GS Method uses six predefined Domains for Work Products: Application, Architecture, Business, Engagement, Operations and Organization."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="workProducts" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subdomains" ordered="false"
-        upperBound="-1" eType="#//Domain" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductType" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Work Product Type is a second category for work products, which in contrast to Domain is more presentation oriented.  A work product can have many Work Product Types.  Examples, for a Work Product Type is &quot;Class Diagram&quot;, which categorizes the Artifacts Analysis Model, Design Model, User Experience Model, or &quot;Specification&quot;, which categorizes requirements specifications that define a system with a well-defined system boundary, such as use case or functional requirements specification.  A Work Product can be categorized to be of many Work Product Types.  For example, a use case model can be categorized as a Specification as well as Diagram Work Product Type."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="workProducts" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DisciplineGrouping" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Discipline Groupings are used to group Disciplines.  For example, the Discipline Grouping &quot;Software Disciplines&quot; would be the group of all disciplines related to developing software such as &quot;Requirements Management&quot; or &quot;Testing&quot;; &quot;IT Infrastructure Management&quot; would be a Disciplines Grouping for disciplines such as &quot;IT Operational Services&quot;, &quot;IT Customer Relationships&quot;, or &quot;IT Enabling Services&quot;.  Disciplines can be associated to more than one Discipline Grouping."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="disciplines" ordered="false"
-        upperBound="-1" eType="#//Discipline"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Tool" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Tool is a container/aggregate for ToolMentors.  It can also provide general descriptions of the tool and its general capabilities."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toolMentors" ordered="false"
-        upperBound="-1" eType="#//ToolMentor"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleSetGrouping" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Role Sets can be categorized into Role Set Groupings.  For example, different methods might define similar Role Sets, which however need to be distinguished from each other on a global scale.  Thus, Role Set Groupings allow distinguishing, for example, Software Services Manager Role Sets from Software Development Organization Manager Role Sets."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="roleSets" ordered="false"
-        upperBound="-1" eType="#//RoleSet"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomCategory" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Custom Category is a category introduced by a method content author to structure any number of method Content Elements of any subtype based on user-defined criteria.  Because Content Categories (and therefore Custom Categories, too) are Content Elements themselves, Custom Categories can be used to recursively categorize Content Categories as well.  Custom Categories can also be nested with any Content Category.  Custom categories can be used to categorize content based on the user's criteria as well as to define whole tree-structures of nested categories allowing the user to systematically navigate and browse method content and processes based on these categories.  For example, one could create a custom category to logically organize content relevant for the user's development organization departments; e.g. a &quot;Testing&quot; category that groups together all roles, work products, tasks, and guidance element relevant to testing.  Another example would be categories that express licensing levels of the content grouping freely distributable method content versus content that represent intellectual property and requires a license to be purchased to be able to use it."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="categorizedElements" ordered="false"
-        upperBound="-1" eType="#//DescribableElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subCategories" ordered="false"
-        upperBound="-1" eType="#//ContentCategory"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DeliveryProcess" eSuperTypes="#//Process">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Delivery Processes is a special Process describing a complete and integrated approach for performing a specific project type.  It describes a complete project lifecycle end-to-end and shall be used as a reference for running projects with similar characteristics as defined for the process.  A Delivery Process is related to specific supporting information such as Roadmaps (inherited via Activity) as well as Communications and Education Material.&#xD;&#xA;A Delivery Process is a Process that covers a whole development lifecycle from beginning to end.  A Delivery Process shall be used as a template for planning and running a project.  It provides a complete lifecycle model with predefined phases, iterations, and activities that have been detailed by sequencing referencing method content in breakdown structures.  It is defined on the basis of experience with past projects or engagements, and/or the best practice use of a development or delivery approach.  It defines what gets produced, how those items are produced, and the required staffing in the form of integrated Work, Work Product, and Team Breakdown Structures.  For example, a process engineer can define alternative Delivery Processes for software development projects that differ in the scale of the engagement and staffing necessary, the type of the software application to be developed, the development methods and technologies to be used, etc.  Although, the Delivery Process aims to cover a whole project it keeps certain decision that are too project specific open.  For example, the breakdown structure defines which Breakdown Elements have multiple occurrences or is repeatable via it respective attributes, but does not say how many occurrences and how many repeats/iterations it will have.  These decisions have to be done by a project manager when planning a concrete project, project phase, or project iterations.  A Delivery Process is always a complete description of a process in terms of completeness of the lifecycle, as well as in terms of all three views on the process which are the Work Breakdown Structure, Work Product Breakdown Structure, and Team Breakdown Structure have to be fully and consistently populated.  Consistency of a Delivery Process is actually ensured by the fact that all three breakdowns are represented by one single data structure and one particular breakdown such as Team Breakdown is just a view on that data structure."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="educationMaterials" ordered="false"
-        upperBound="-1" eType="#//SupportingMaterial"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="communicationsMaterials"
-        ordered="false" upperBound="-1" eType="#//SupportingMaterial"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Process" abstract="true" eSuperTypes="#//Activity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process is a special Activity that describes a structure for particular types of development projects.  To perform such a development project a Processes would be 'instantiated' and adapted for the specific situation.  Process is an abstract class and this meta-model defines different special types of Processes for different process management applications and different situations of process reuse.  Every Process comprises of and is the top-level element of an n-level breakdown structure using the Nesting association defined on Activity.&#xD;&#xA;Core Method Content provides step-by-step explanations, describing how very specific development goals are achieved independent of the placement of these steps within a development lifecycle.  Processes take these method elements and relate them into semi-ordered sequences that are customized to specific types of projects.  Thus, a process is a set of partially ordered work descriptions intended to reach a higher development goal, such as the release of a specific software system.  A process and the process meta-model structure defined in this specification focuses on the lifecycle and the sequencing of work in breakdown structures.  To achieve this it uses the Descriptor concept referencing method content and allowing defining time-specific customizations of the referenced content (e.g. defining a focus on different steps of the same Task and providing input Work Products in different states within the different Phases of a process lifecycle in which the same Task is performed)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="includesPatterns" ordered="false"
-        upperBound="-1" eType="#//CapabilityPattern"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultContext" lowerBound="1"
-        eType="#//MethodConfiguration"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="validContext" ordered="false"
-        upperBound="-1" eType="#//MethodConfiguration"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CapabilityPattern" eSuperTypes="#//Process">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Capability Pattern is a special Process that describes a reusable cluster of doing work in common process areas.  Capabilities Patterns express and communicate process knowledge for a key area of interest such as a Discipline and can be directly used by process practitioner to guide his work.  They are also used as building blocks to assemble Delivery Processes or larger Capability Patterns ensuring optimal reuse and application of the key practices they express.&#xD;&#xA;A Capability Pattern is a special Process that describes a reusable cluster of doing work in a general process area that provides a consistent development approach to common problems.  Examples for Capability Pattern could be 'use case-based requirements management', 'use case analysis', or 'unit testing'. Typically but not necessarily, Capability Patterns have the scope of one discipline providing a breakdown of reusable complex Activities, relationships to the Roles which perform Tasks within these Activities, as well as to the Work Products that are used and produced.  A capability pattern does not relate to any specific phase or iteration of a development lifecycle, and should not imply any.  In other words, a pattern should be designed in a way that it is applicable anywhere in a Delivery Process.  This enables its Activities to be flexibly assigned to whatever phases there are in the Delivery Process to which it is being applied.  It is a good practice to design a Capability Pattern to produce one or more generic Deliverables.  The typical configuration is that each Activity in the Capability Pattern produces one Deliverable, and the last Task Descriptor in the Activity explicitly outputs just this Deliverable.  This enables the process engineer to select Patterns or just Activities by deciding which Deliverables are required.  It also offers a simple integration approach: an Activity from a capability pattern is linked to the Phase or Iteration which is required to produce the Activity's Deliverable.  Key applications areas of / areas of reuse for Capability Patterns are:&#xD;&#xA;- To serve as building blocks for assembling Delivery Processes or larger Capability Patterns.  Normally developing a Delivery Process is not done from scratch but by systematically applying and binding patterns.  In addition to the standard pattern application of 'copy-and-modify', which allows the process engineer to individually customize the pattern's content to the particular situation it is applied for, the Plugin meta-model package (Section 6.1) introduces even more sophisticated inheritance relationships that support dynamic binding of patterns (i.e. the pattern is referenced and not copied).  This unique new way of reusing process knowledge allows to factor out commonly reoccurring Activities into patterns and to apply them over and over again for a process.  When the pattern is being revised or updated, all changes will be automatically reflected in all pattern application in all processes because of the dynamic binding.&#xD;&#xA;- To support direct execution in a development project that does not work following a well-defined process, but works based on loosely connected process fragments of best practices in a flexible manner (e.g. Agile Development).&#xD;&#xA;- To support process education by describing knowledge for a key area such as best practices on how to perform the work for a Discipline (e.g. Requirements Management), for a specific development technique (aspect-oriented development), or a specific technical area (e.g. relational database design), which is used for education and teaching."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessPlanningTemplate" eSuperTypes="#//Process">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process Planning Template is a special Process that is prepared for instantiation by a project planning tool.  Typically, it is created based on a Process such as a Delivery Process as a whole (e.g. in case of a waterfall-based development approach) or in parts (e.g. in case of an iterative development approach).&#xD;&#xA;A Process Planning Template represents a partially finished plan for a concrete project.  It uses the same information structures as all other Process Types to represent templates for project plans.  However, certain planning decisions have already been applied to the template as well as information has been removed and/or reformatted to be ready for export to a specific planning tool.  Examples for such decisions are: a template has been created to represent a plan for a particular Iteration in an iterative development project, which fr example distinguishes early from late iterations in the Elaboration phase of a project; if the targeted planning tool cannot represent input and output of Task, then these have been removed from the structure; certain repetitions have been already applied, e.g. stating that a cycle of specific Task grouped in an Activity have to be repeated n-times; etc."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="basedOnProcesses" ordered="false"
-        upperBound="-1" eType="#//Process"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Roadmap" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Roadmap is a special Guidance Type which is only related to Activates and therefore has been added by this package to the list of Guidance Types rather than listed in the Guidance Types package.  A Roadmap represents a linear walkthrough of an Activity, typically a Process.&#xD;&#xA;An instance of a Roadmap represents important documentation for the Activity or Process it is related to.  Often a complex Activity such as a Process can be much easier understood by providing a walkthrough with a linear thread of a typical instantiation of this Activity.  In addition to making the process practitioner understand how work in the process is being performed, a Roadmap provides additional information about how Activities and Tasks relate to each other over time.  Roadmaps are also used to show how specific aspects are distributed over a whole process providing a kind of filter on the process for this information."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessComponent" eSuperTypes="#//ProcessPackage #//MethodUnit">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process Component is a special Process Package that applies the principles of encapsulation.  A Process Component realizes one or more Interfaces which specify inputs and outputs of the component. There might be many components realizing the same interfaces, but using different techniques to achieve similar outputs for similar inputs.  Whereas the Component Interfaces represent component specifications (black box descriptions of the component), good candidates for component realizations can be found in Capability Patterns (white box descriptions for the component).&#xD;&#xA;UMA supports replaceable and reusable Process Components realizing the principles of encapsulation. Certain situations in a software development project might require that concrete realizations of parts of the process remain undecided or will be decided by the executing team itself (e.g. in outsourcing situations).  UMA provides a unique component concept defining interfaces for work product input and output, allowing treating the actual definition of the work that produces the outputs as a &quot;black box&quot;.  At any point during a project the component &quot;realization&quot; detailing the work can be added to the process.  The component approach also allows that different styles or techniques of doing work can be replaced with one another.  For example, a software code output of a component could be produced with a model-driven development or a code-centric technique.  The component concept encapsulates the actual work and lets the development team choose the appropriate technique and fill the component's realization with their choice of Activities that produce the required outputs."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="interfaces" ordered="false"
-        upperBound="-1" eType="#//ProcessComponentInterface"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="process" lowerBound="1"
-        eType="#//Process" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessPackage" eSuperTypes="#//MethodPackage">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Process Package is a special Method Package that contains Process Elements, only.&#xD;&#xA;A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="processElements" ordered="false"
-        upperBound="-1" eType="#//ProcessElement" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagrams" ordered="false"
-        upperBound="-1" eType="#//Diagram" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessComponentInterface" eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process Component Interface comprises of a list of interface specifications (similar to operation declarations) that express inputs and outputs for a process component.  These interface specifications are expressed using Task Descriptors which are not linked to Tasks that are related to Work Product Descriptors as well as optional a Role Descriptor."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="interfaceSpecifications"
-        ordered="false" upperBound="-1" eType="#//TaskDescriptor" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="interfaceIO" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessComponentDescriptor" eSuperTypes="#//Descriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process Component Descriptor represents a Process Component application in a Process, i.e. the breakdown structure defining the Process.  The Process Component Descriptor is used to encapsulate the details of the component in a breakdown structure and to provide its own set of relationships such as it own predecessors and successors."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ProcessComponent" lowerBound="1"
-        eType="#//ProcessComponent"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodPlugin" eSuperTypes="#//MethodUnit #//Package">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Plugin is a Method Element that represents a physical container for Method Packages.  It defines a granularity level for the modularization and organization of method content and processes.  A Method Plugin can extend many other Method Plugins and it can be extended by many Method Plugins.  It can also be used stand-alone, i.e. with no Extension relationship to other plug-ins.&#xD;&#xA;Method Plugin conceptually represents a unit for configuration, modularization, extension, packaging, and deployment of method content and processes.  A Process Engineer shall design his Plugins and allocate his content to these Plugins with requirements for extensibility, modularity, reuse, and maintainability in mind.&#xD;&#xA;Special extensibility mechanisms defined for the meta-classes Variability Element and Process Contribution allow Plugin content to directly contribute new content, replace existing content, or to cross-reference to any Content Element or Process within another Plugin that it extends.  Similar to UML 2.0's 'package merge' mechanism transformation interpretations, interpreting these Method Plugin mechanisms results into new extended Method Content and Processes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="userChangeable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPackages" ordered="false"
-        upperBound="-1" eType="#//MethodPackage" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="bases" ordered="false"
-        upperBound="-1" eType="#//MethodPlugin"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="VariabilityElement" abstract="true"
-      eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Variability Element is an abstract class derived from Method Element that provides new capabilities for content variation and extension to Content Elements or any other Method Element that derives from it.  It has been placed in-between the classes Method Element and Content Element in the overall UMA taxonomy of classes using the UML 2.0 package merge mechanism.  The association Variability Specialization shall only be instantiated between two subclasses of Variability Element of the same type.  The element on varaibilitySpecialElement side of the relationship defines a value for the attribute variabilityType defining the nature of the relationship using a literal from the enumeration Variability Type.&#xD;&#xA;Variability Element of the meta-model package Method Plugins adds the capabilities of variation and extension to Method Elements that derive from it.  By default all Content Elements such as Role, Task, Guidance Types, or Activities are defined to be Variability Elements.&#xD;&#xA;Variability and extension provides unique mechanisms for customizing method content without actually directly modifying the original content, but by just be able to describe with separate objects the differences (additions, changes, omissions) relative to the original.  This plug-in concept allows users to factor their method content and processes in interrelated units and even to architect method content and processes in layers that extend each other with new capabilities.  The resulting method and process design can be dynamically combined and applied on demand using the interpretation rules defined for Variability Element Specializations assembling to process practitioners the most accurate method and process descriptions possible.  It also allows process practitioners to extends and tailor method content and processes they do not own and to easily upgrade to newer versions by simply reapply their personal changes to these upgrades.&#xD;&#xA;Variability Element defines two types of variability and one type of extension which are formally defined for the enumeration Variability Type."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="variabilityType" unique="false"
-        eType="#//VariabilityType" defaultValueLiteral="na">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If in instance of the variabilitySpecialization association between two Variability Elements of the same type exists, then the variabilityType attribute specifies how the element at the variabilitySpecialElement end of the association changes the Content Element at the variabilityBasedOnElement end. See the Variability Type enumeration class for definitions for the different types of variability."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variabilityBasedOnElement"
-        unique="false" eType="#//VariabilityElement"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="VariabilityType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Variability Type is an Enumeration used for values for instances of Variability Element's attribute variabilityType.  It defines the nature of how a Variability Element extends another Variability Element. See enumeration literals for definitions for each type."/>
-    </eAnnotations>
-    <eLiterals name="na"/>
-    <eLiterals name="contributes" value="1"/>
-    <eLiterals name="extends" value="2"/>
-    <eLiterals name="replaces" value="3"/>
-    <eLiterals name="localContribution" value="4"/>
-    <eLiterals name="localReplacement" value="5"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodUnit" abstract="true" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Unit is a special Method Element that shall be maintained in a Method Library as a separate unit of control."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="authors" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Method Unit is being created and owned by an author or authoring team."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="changeDate" unique="false"
-        eType="#//Date">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date the last change that resulted into this version has been made."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="changeDescription" unique="false"
-        eType="#//String" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The description of the last change that resulted into this version."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Package has a version number used to track changes."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="copyrightStatement" eType="#//SupportingMaterial"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodConfiguration" eSuperTypes="#//MethodUnit">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Configuration is a collection of selected Method Models and MethodPackages. A configuration can be exported into its own standalone library when it includes the full transitive closure of all elements all other elements depend on."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPluginSelection"
-        ordered="false" upperBound="-1" eType="#//MethodPlugin"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPackageSelection"
-        ordered="false" upperBound="-1" eType="#//MethodPackage"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="processViews" ordered="false"
-        upperBound="-1" eType="#//ContentCategory"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultView" eType="#//ContentCategory"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="baseConfigurations" ordered="false"
-        upperBound="-1" eType="#//MethodConfiguration"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessFamily" eSuperTypes="#//MethodConfiguration">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Delivery Model Family is a convenient grouping of Delivery Processes and Capability Patterns of interest to some specific user community."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deliveryProcesses" ordered="false"
-        upperBound="-1" eType="#//DeliveryProcess"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodLibrary" eSuperTypes="#//MethodUnit #//Package">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Library is a physical container for Method Plugins and Method Configuration definitions.  All Method Elements are stored in a Method Library."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPlugins" ordered="false"
-        upperBound="-1" eType="#//MethodPlugin" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="predefinedConfigurations"
-        ordered="false" upperBound="-1" eType="#//MethodConfiguration" containment="true"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.epf.uma/model/1.0.3/uma.genmodel b/plugins/org.eclipse.epf.uma/model/1.0.3/uma.genmodel
deleted file mode 100755
index 2970e57..0000000
--- a/plugins/org.eclipse.epf.uma/model/1.0.3/uma.genmodel
+++ /dev/null
@@ -1,491 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.epf.uma/src"
-    editDirectory="/org.eclipse.epf.uma.edit/src" editorDirectory="/org.eclipse.epf.uma.editor/src"
-    modelPluginID="org.eclipse.epf.uma" templateDirectory="/org.eclipse.epf.uma.ecore/templates"
-    runtimeJar="true" dynamicTemplates="true" modelName="Uma" editPluginClass="org.eclipse.epf.uma.provider.UmaEditPlugin"
-    editorPluginClass="org.eclipse.epf.uma.presentation.UmaEditorPlugin" nonNLSMarkers="true"
-    rootExtendsInterface="org.eclipse.epf.uma.ecore.IModelObject" rootExtendsClass="org.eclipse.epf.uma.ecore.impl.MultiResourceEObject"
-    rootImplementsInterface="org.eclipse.emf.ecore.sdo.InternalEDataObject" suppressEMFTypes="true"
-    featureMapWrapperInterface="commonj.sdo.Sequence" featureMapWrapperInternalInterface="org.eclipse.emf.ecore.sdo.util.ESequence"
-    featureMapWrapperClass="org.eclipse.emf.ecore.sdo.util.BasicESequence" codeFormatting="true"
-    containmentProxies="true">
-  <foreignModel>C:\Home\phTNG\TNG_docs\OOAD\ContentArchitecture\Models\UMA03\UnifiedMethodArchitecture.mdl</foreignModel>
-  <staticPackages>http://www.eclipse.org/emf/2003/SDO</staticPackages>
-  <modelPluginVariables>EMF_COMMONJ_SDO=org.eclipse.emf.commonj.sdo</modelPluginVariables>
-  <modelPluginVariables>EMF_ECORE_SDO=org.eclipse.emf.ecore.sdo</modelPluginVariables>
-  <genPackages prefix="Uma" basePackage="org.eclipse.epf" disposableProviderFactory="true"
-      ecorePackage="uma.ecore#/">
-    <genEnums ecoreEnum="uma.ecore#//WorkOrderType">
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//WorkOrderType/finishToStart"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//WorkOrderType/finishToFinish"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//WorkOrderType/startToStart"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//WorkOrderType/startToFinish"/>
-    </genEnums>
-    <genEnums ecoreEnum="uma.ecore#//PseudoStateKind">
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/initial"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/join"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/fork"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/junction"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/choice"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/entryPoint"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/exitPoint"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/terminate"/>
-    </genEnums>
-    <genEnums ecoreEnum="uma.ecore#//VariabilityType">
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/na"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/contributes"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/extends"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/replaces"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/localContribution"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/localReplacement"/>
-    </genEnums>
-    <genDataTypes ecoreDataType="uma.ecore#//Date"/>
-    <genDataTypes ecoreDataType="uma.ecore#//Uri"/>
-    <genDataTypes ecoreDataType="uma.ecore#//UnlimitedNatural"/>
-    <genDataTypes ecoreDataType="uma.ecore#//String"/>
-    <genDataTypes ecoreDataType="uma.ecore#//Set"/>
-    <genDataTypes ecoreDataType="uma.ecore#//Sequence"/>
-    <genDataTypes ecoreDataType="uma.ecore#//Integer"/>
-    <genDataTypes ecoreDataType="uma.ecore#//Float"/>
-    <genClasses ecoreClass="uma.ecore#//Classifier"/>
-    <genClasses ecoreClass="uma.ecore#//Type"/>
-    <genClasses ecoreClass="uma.ecore#//Element"/>
-    <genClasses ecoreClass="uma.ecore#//NamedElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//NamedElement/name"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//PackageableElement"/>
-    <genClasses ecoreClass="uma.ecore#//Package"/>
-    <genClasses ecoreClass="uma.ecore#//Namespace"/>
-    <genClasses ecoreClass="uma.ecore#//MethodElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodElement/guid"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodElement/briefDescription"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodElement/ownedRules"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodElement/suppressed"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodElement/orderingGuide"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Constraint">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Constraint/body"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ContentElement">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/supportingMaterials"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/conceptsAndPapers"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/checklists"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/guidelines"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/examples"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/assets"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DescribableElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DescribableElement/presentationName"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//DescribableElement/presentation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DescribableElement/shapeicon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DescribableElement/nodeicon"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ContentDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ContentDescription/mainDescription"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ContentDescription/sections"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ContentDescription/keyConsiderations"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Section">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Section/sectionName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Section/sectionDescription"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Section/subSections"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Section/predecessor"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Role">
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Role/modifies"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Role/responsibleFor"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkProduct">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProduct/reports"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProduct/templates"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProduct/toolMentors"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProduct/estimationConsiderations"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Task">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/performedBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/mandatoryInput"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/output"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/additionallyPerformedBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/optionalInput"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/steps"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/toolMentors"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/estimationConsiderations"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkDefinition">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//WorkDefinition/precondition"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//WorkDefinition/postcondition"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Step"/>
-    <genClasses ecoreClass="uma.ecore#//Guidance"/>
-    <genClasses ecoreClass="uma.ecore#//Artifact">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Artifact/containerArtifact"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Artifact/containedArtifacts"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Deliverable">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Deliverable/deliveredWorkProducts"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Outcome"/>
-    <genClasses ecoreClass="uma.ecore#//MethodPackage">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodPackage/global"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodPackage/reusedPackages"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodPackage/parentPackage"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodPackage/childPackages"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ContentPackage">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ContentPackage/contentElements"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ArtifactDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ArtifactDescription/briefOutline"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ArtifactDescription/representationOptions"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkProductDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescription/externalId"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescription/purpose"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescription/impactOfNotHaving"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescription/reasonsForNotNeeding"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DeliverableDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliverableDescription/externalDescription"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliverableDescription/packagingGuidance"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//RoleDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//RoleDescription/skills"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//RoleDescription/assignmentApproaches"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//RoleDescription/synonyms"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//TaskDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//TaskDescription/purpose"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//TaskDescription/alternatives"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GuidanceDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//GuidanceDescription/attachments"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//PracticeDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/additionalInfo"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/problem"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/background"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/goals"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/application"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/levelsOfAdoption"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Point">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Point/x"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Point/y"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GraphElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphElement/position"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphElement/contained"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphElement/link"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphElement/anchorage"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphElement/semanticModel"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DiagramElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DiagramElement/isVisible"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DiagramElement/container"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DiagramElement/reference"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//DiagramElement/property"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DiagramLink">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DiagramLink/zoom"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//DiagramLink/viewport"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DiagramLink/graphElement"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DiagramLink/diagram"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GraphConnector">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//GraphConnector/graphElement"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//GraphConnector/graphEdge"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//SemanticModelBridge">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//SemanticModelBridge/presentation"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//SemanticModelBridge/graphElement"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//SemanticModelBridge/diagram"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Dimension">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Dimension/width"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Dimension/height"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Reference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Reference/isIndividualRepresentation"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Reference/referenced"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Property">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Property/key"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Property/value"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GraphEdge">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//GraphEdge/anchor"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphEdge/waypoints"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Diagram">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Diagram/zoom"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Diagram/viewpoint"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Diagram/diagramLink"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Diagram/namespace"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GraphNode">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphNode/size"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//SimpleSemanticModelElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//SimpleSemanticModelElement/typeInfo"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//UMASemanticModelBridge">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//UMASemanticModelBridge/element"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//CoreSemanticModelBridge">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//CoreSemanticModelBridge/element"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//LeafElement"/>
-    <genClasses ecoreClass="uma.ecore#//TextElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//TextElement/text"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Image">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Image/uri"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Image/mimeType"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GraphicPrimitive"/>
-    <genClasses ecoreClass="uma.ecore#//Polyline">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Polyline/closed"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Polyline/waypoints"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Ellipse">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Ellipse/radiusX"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Ellipse/radiusY"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Ellipse/rotation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Ellipse/startAngle"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Ellipse/endAngle"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Ellipse/center"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Activity">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/breakdownElements"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/roadmaps"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/supportingMaterials"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/checklists"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/concepts"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/examples"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/guidelines"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/reusableAssets"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Activity/isEnactable"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkBreakdownElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkBreakdownElement/isRepeatable"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkBreakdownElement/isOngoing"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkBreakdownElement/isEventDriven"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkBreakdownElement/linkToPredecessor"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//BreakdownElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//BreakdownElement/prefix"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//BreakdownElement/isPlanned"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//BreakdownElement/hasMultipleOccurrences"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//BreakdownElement/isOptional"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//BreakdownElement/presentedAfter"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//BreakdownElement/presentedBefore"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//BreakdownElement/planningData"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//BreakdownElement/superActivities"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Milestone"/>
-    <genClasses ecoreClass="uma.ecore#//Iteration"/>
-    <genClasses ecoreClass="uma.ecore#//Phase"/>
-    <genClasses ecoreClass="uma.ecore#//TeamProfile">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TeamProfile/teamRoles"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TeamProfile/superTeam"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TeamProfile/subTeam"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//RoleDescriptor">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleDescriptor/Role"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleDescriptor/modifies"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleDescriptor/responsibleFor"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkOrder">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkOrder/linkType"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkOrder/pred"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessElement"/>
-    <genClasses ecoreClass="uma.ecore#//PlanningData">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PlanningData/startDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PlanningData/finishDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PlanningData/rank"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Descriptor">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Descriptor/isSynchronizedWithSource"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkProductDescriptor">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescriptor/activityEntryState"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescriptor/activityExitState"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/WorkProduct"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/impactedBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/impacts"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/deliverableParts"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//TaskDescriptor">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/Task"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/additionallyPerformedBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/assistedBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/externalInput"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/mandatoryInput"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/optionalInput"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/output"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/performedPrimarilyBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/selectedSteps"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//CompositeRole">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//CompositeRole/aggregatedRoles"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//BreakdownElementDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//BreakdownElementDescription/usageGuidance"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ActivityDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ActivityDescription/purpose"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ActivityDescription/alternatives"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ActivityDescription/howtoStaff"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DeliveryProcessDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/scale"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/projectCharacteristics"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/riskLevel"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/estimatingTechnique"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/projectMemberExpertise"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/typeOfContract"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ProcessDescription/externalId"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ProcessDescription/scope"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ProcessDescription/usageNotes"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DescriptorDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DescriptorDescription/refinedDescription"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Concept"/>
-    <genClasses ecoreClass="uma.ecore#//Checklist"/>
-    <genClasses ecoreClass="uma.ecore#//Example"/>
-    <genClasses ecoreClass="uma.ecore#//Guideline"/>
-    <genClasses ecoreClass="uma.ecore#//Report"/>
-    <genClasses ecoreClass="uma.ecore#//Template"/>
-    <genClasses ecoreClass="uma.ecore#//SupportingMaterial"/>
-    <genClasses ecoreClass="uma.ecore#//ToolMentor"/>
-    <genClasses ecoreClass="uma.ecore#//Whitepaper"/>
-    <genClasses ecoreClass="uma.ecore#//TermDefinition"/>
-    <genClasses ecoreClass="uma.ecore#//Practice">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Practice/subPractices"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Practice/contentReferences"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Practice/activityReferences"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//EstimationConsiderations"/>
-    <genClasses ecoreClass="uma.ecore#//ReusableAsset"/>
-    <genClasses ecoreClass="uma.ecore#//State">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//State/WorkProduct"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//State/Region"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//State/submachine"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Vertex">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Vertex/container"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Vertex/outgoing"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Vertex/incoming"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Region">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Region/Vertex"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Region/Transition"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Region/State"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Region/StateMachine"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//StateMachine">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//StateMachine/Region"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Transition">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Transition/WorkDefinition"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Transition/container"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Transition/source"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Transition/target"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//PseudoState"/>
-    <genClasses ecoreClass="uma.ecore#//Discipline">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Discipline/tasks"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Discipline/subdiscipline"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Discipline/referenceWorkflows"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ContentCategory"/>
-    <genClasses ecoreClass="uma.ecore#//RoleSet">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleSet/roles"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Domain">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Domain/workProducts"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Domain/subdomains"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkProductType">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductType/workProducts"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DisciplineGrouping">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DisciplineGrouping/disciplines"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Tool">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Tool/toolMentors"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//RoleSetGrouping">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleSetGrouping/roleSets"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//CustomCategory">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//CustomCategory/categorizedElements"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//CustomCategory/subCategories"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DeliveryProcess">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DeliveryProcess/educationMaterials"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DeliveryProcess/communicationsMaterials"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Process">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Process/includesPatterns"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Process/defaultContext"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Process/validContext"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//CapabilityPattern"/>
-    <genClasses ecoreClass="uma.ecore#//ProcessPlanningTemplate">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ProcessPlanningTemplate/basedOnProcesses"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Roadmap"/>
-    <genClasses ecoreClass="uma.ecore#//ProcessComponent">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ProcessComponent/interfaces"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ProcessComponent/process"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessPackage">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ProcessPackage/processElements"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ProcessPackage/diagrams"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessComponentInterface">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ProcessComponentInterface/interfaceSpecifications"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ProcessComponentInterface/interfaceIO"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessComponentDescriptor">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ProcessComponentDescriptor/ProcessComponent"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//MethodPlugin">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodPlugin/userChangeable"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodPlugin/methodPackages"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodPlugin/bases"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//VariabilityElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//VariabilityElement/variabilityType"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//VariabilityElement/variabilityBasedOnElement"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//MethodUnit">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodUnit/authors"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodUnit/changeDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodUnit/changeDescription"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodUnit/version"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodUnit/copyrightStatement"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//MethodConfiguration">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/methodPluginSelection"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/methodPackageSelection"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/processViews"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/defaultView"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/baseConfigurations"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessFamily">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ProcessFamily/deliveryProcesses"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//MethodLibrary">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodLibrary/methodPlugins"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodLibrary/predefinedConfigurations"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.epf.uma/model/1.0.4/uma.ecore b/plugins/org.eclipse.epf.uma/model/1.0.4/uma.ecore
deleted file mode 100755
index 4acd33a..0000000
--- a/plugins/org.eclipse.epf.uma/model/1.0.4/uma.ecore
+++ /dev/null
@@ -1,1239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="uma"
-    nsURI="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" nsPrefix="org.eclipse.epf.uma">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="03"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EDataType" name="Date" instanceClassName="java.util.Date">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Data type used for attributes of meta-model classes of the type Date."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="Uri" instanceClassName="java.net.URI">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Data type used for attributes of meta-model classes that point to resources such as files."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="UnlimitedNatural" instanceClassName="int"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="String" instanceClassName="java.lang.String"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Set" instanceClassName="java.util.Set"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Sequence" instanceClassName="java.util.List"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Integer" instanceClassName="int"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Float" instanceClassName="java.lang.Float"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Classifier" abstract="true" eSuperTypes="#//Type">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Classifier."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Type" abstract="true" eSuperTypes="#//PackageableElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Type."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Element" abstract="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Element."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NamedElement" abstract="true" eSuperTypes="#//Element">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Named Element.  Defined that every element has a name."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PackageableElement" abstract="true"
-      eSuperTypes="#//NamedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Packagable Element."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Package" eSuperTypes="#//Namespace #//PackageableElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Package."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Namespace" abstract="true" eSuperTypes="#//NamedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="UML 2.0 meta-class Namespace."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodElement" abstract="true" eSuperTypes="#//PackageableElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Every class defined in this specification is derived from Method Element.  In other words Method Element is the root generalization for all UMA classes and defines a common set of attributes inherited by every other element type of this model.  Method Element itself is derived from Packageable Element from the UML 2.0 Infrastructure.  Method Element inherits the Name attribute from Packageable Element's super class.  Every element defined as a UMA instance is derived from Model Element.  Every Method Element in-stance is at least defined by a unique id, a name, as well as brief description."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="guid" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every instance of Method Element has a global unique id."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="briefDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every instance of Method Element shall be briefly described with one or two sentences summarizing the element."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedRules" ordered="false"
-        upperBound="-1" eType="#//Constraint" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodElementProperty"
-        ordered="false" upperBound="-1" eType="#//MethodElementProperty" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="suppressed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If a Variability Element is derived from another Variability Element using the Extends Variability Specialization then this attribute can be used to suppress inherited Method Elements that were part of the based-on Variability Element, which can be any type of Method Element.  In other words, if this attribute is set to true on a Method Element that has the same name than an inherited method element then it will not be regarded as inherited at all."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="orderingGuide" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute is used for CASE tool realizations of this model to contain information about layout and ordering of the method element and its parts."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Constraint" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Constraint is a Method Element that represents a condition or restriction expressed in natural language text or in a machine readable language for the purpose of declaring some of the semantics of a Method Element."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute stores the definition of the constraint."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodElementProperty" eSuperTypes="#//PackageableElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentElement" abstract="true" eSuperTypes="#//DescribableElement #//VariabilityElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Content Element is a Describable Element that represents an abstract generalization for all elements that are considered to be and managed as Method Content.&#xD;&#xA;Content Elements represents reusable Method Content that is supposed to be managed in Content Packages.  The separation of Content Element from Process Element allows to clearly distinguish between pure method content from content that is represented in processes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="supportingMaterials" ordered="false"
-        upperBound="-1" eType="#//SupportingMaterial"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="conceptsAndPapers" ordered="false"
-        upperBound="-1" eType="#//Concept"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="checklists" ordered="false"
-        upperBound="-1" eType="#//Checklist"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="guidelines" ordered="false"
-        upperBound="-1" eType="#//Guideline"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="examples" ordered="false"
-        upperBound="-1" eType="#//Example"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="assets" ordered="false"
-        upperBound="-1" eType="#//ReusableAsset"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DescribableElement" abstract="true"
-      eSuperTypes="#//MethodElement #//Classifier">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Describable Element is an abstract generalization of Method Elements for which external presentation names as well as content descriptions have been defined, such as Roles or Work Products.  Presentation Name and Content Descriptions are typically localized using a resource allocation mechanism for its String type attributes.&#xD;&#xA;This abstraction represents all elements in the Method Content as well as Process space for which concrete textual descriptions are defined in the form of documenting attributes grouped in a matching Content Description instance (see Section 4.1.4).  Describable Elements are intended to be published in method or process publications (similar to the IBM Rational Unified Process web).  Describable Element defines that the element it represents will have content 'attached' to it.  Content Description is the abstraction for the actual places in which the content is being represented.  This separation allows a distinction between core method model elements describing the structure of the model from the actual description container providing, for example, the documentation of the content element in different alternatives languages, audiences, licensing levels, etc."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presentationName" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Describable Element has a presentation name, which is used for external presentation of the element.  For example, name (the internal representation) might be set to &quot;rup_architecture_document&quot; to differentiate from a &quot;j2ee_architcture_document&quot; whereas the external presentation would always be &quot;Architecture Document&quot;."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="presentation" eType="#//ContentDescription"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="shapeicon" eType="#//Uri">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A reference to an icon that can be used for modeling with specific Content Element instances (as graphical stereotypes, e.g. a use case symbol for a use case artifact) as well as publication of content."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nodeicon" eType="#//Uri">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A reference to an icon that can be used in tree browser presentations and breakdown structures."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentDescription" eSuperTypes="#//MethodUnit">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Content Description is a Method Element that is used to store the textual description for a Content Element.  It defines standard attributes applicable for all Content Element types.  Specific Content Element sub-types can define their own matching Content Description sub-types. "/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mainDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute store the main descriptive text for the Content Element.  All text that is not part of any of the more specific attributes shall be stored here.  If the Content Description is divided into sections using the Section class, then only the text from the 'start' of the content description to the first section will be stored here (similar to a normal document where you can place text between its beginning to its first diction heading)."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sections" ordered="false"
-        upperBound="-1" eType="#//Section" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="keyConsiderations" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Key Considerations provides advise and guidance of a critical nature for the content element as well as warnings, cautions, pitfalls, dangers."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Section" eSuperTypes="#//VariabilityElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Section is a special Method Element that represents structural subsections of a Content Description's sectionDescription attribute.  It is used for either large scale documentation of Content Elements organized into sections as well as to flexibly add new Sections to Content Elements using contribution variability added to the Section concept for Method Plug-ins."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sectionName" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Section has a name used for external presentation of the section, e.g. when published or when section heading are listed in a table of contents.  This attribute is similar to Presentation Name for Content Elements."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sectionDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attributes store the description text for a Content Description's Section."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subSections" ordered="false"
-        upperBound="-1" eType="#//Section" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="predecessor" eType="#//Section"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Role" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Role is a content element that defines a set of related skills, competencies, and responsibilities.  Roles are used by Tasks to define who performs them as well as define a set of work products they are responsible for.  &#xD;&#xA;A Role defines a set of related skills, competencies, and responsibilities of an individual or a set of individuals.  Roles are not individuals or resources.  Individual members of the development organization will wear different hats, or perform different roles. The mapping from individual to role, performed by the project manager when planning and staffing for a project, allows different individuals to act as several different roles, and for a role to be played by several individuals."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="modifies" ordered="false"
-        upperBound="-1" eType="#//WorkProduct" changeable="false" volatile="true"
-        transient="true" derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="responsibleFor" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProduct" abstract="true" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Work Product is an abstract class which provides a generalization for the content element types Artifact, Outcome, and Deliverable.  The meta-model class Work Product actually represents work product types, i.e. an instance of Work Product is a description of a specific type of work product and not an individual work product instance.  However, for simplicity reasons and because of low risk of misinterpretation we did not append the word 'type' to every meta-class.&#xD;&#xA;A work product is an abstraction for descriptions of content elements that are used to define anything used, produced, or modified by a task."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reports" ordered="false"
-        upperBound="-1" eType="#//Report"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="templates" ordered="false"
-        upperBound="-1" eType="#//Template"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toolMentors" ordered="false"
-        upperBound="-1" eType="#//ToolMentor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="estimationConsiderations"
-        ordered="false" upperBound="-1" eType="#//EstimationConsiderations"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Task" eSuperTypes="#//ContentElement #//WorkDefinition">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Task is a content element that describes work being performed by Roles.  It defines one default performing Role as well as many additional performers.  A Task is associated to input and output work products.  Inputs are differentiated in mandatory versus optional inputs.  The associations to Work Products are not instantiatable/variable-like parameters.  They rather express (hyper-)links to the descriptions of the work products types that are related to the Task as inputs and outputs.  In other words, these associations are not intended to be used to capture which concrete instances will be passed when instantiating the method in a project.  All of the Task's default associations can be overridden in an actual process definition.&#xD;&#xA;A Task describes an assignable unit of work.  Every Task is assigned to specific Roles.  The granularity of a Task is generally a few hours to a few days.  It usually affects one or only a small number of work products. A Task is used as an element of defining a process. Tasks are further used for planning and tracking progress; therefore, if they are defined too fine-grained, they will be neglected, and if they are too large, progress would have to be expressed in terms of a Task's parts (e.g. Steps, which is not recommended). &#xD;&#xA;A Task has a clear purpose in which the performing roles achieve a well defined goal.  It provides complete step-by-step explanations of doing all the work that needs to be done to achieve this goal.  This description is complete, independent of when in a process lifecycle the work would actually be done.  It therefore does not describe when you do what work at what point of time, but describes all the work that gets done throughout the development lifecycle that contributes to the achievement of this goal.  When the Task is being applied in a process then this process application (defined as Task Descriptor) provides the information of which pieces of the Task will actually be performed at any particular point in time. This assumes that the Task will be performed in the process over and over again, but each time with a slightly different emphasis on different steps or aspects of the task description. &#xD;&#xA;For example, a Task such as &quot;Develop Use Case Model&quot; describes all the work that needs to be done to develop a complete use case model. This would comprise of the identification and naming of use cases and actors, the writing of a brief description, the modeling of use cases and their relationships in diagrams, the detailed description of a basic flow, the detailed description of alternatives flows, performing of walkthroughs workshops and reviews, etc.  All of these parts contribute to the development goal of developing the use case model, but the parts will be performed at different points in time in a process.  Identification, naming, and brief descriptions would be performed early in a typical development process versus the writing of detailed alternative flows which would be performed much later.  All these parts or steps within the same Task define the &quot;method&quot; of Developing a Use Case Model.  Applying such a method in a lifecycle (i.e. in a process) is defining which steps are done when going from one iteration to the next."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="performedBy" eType="#//Role"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mandatoryInput" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="output" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="additionallyPerformedBy"
-        ordered="false" upperBound="-1" eType="#//Role"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="optionalInput" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="steps" ordered="false"
-        upperBound="-1" eType="#//Step" changeable="false" volatile="true" transient="true"
-        derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toolMentors" ordered="false"
-        upperBound="-1" eType="#//ToolMentor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="estimationConsiderations"
-        ordered="false" upperBound="-1" eType="#//EstimationConsiderations"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkDefinition" abstract="true" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Work Definition is an abstract Method Element that generalizes all descriptions of work within the Unified Method Architecture.  This package introduces two concrete types of Work Definitions: Task and Step.  Work Definitions can contain sets of pre- and post-conditions defining constraints that need to be valid before the described work can begin or before it can be declared as finished.  Note that general ownedRules can be used to define additional constraints and rules for Work Definitions.&#xD;&#xA;Work Definitions represent behavioral descriptions for doing work.  These behavioral descriptions are not bound to one specific classifier, but represent an arbitrary definition of work.  For example, a Work Definition could represent work that is being performed by a specific Role (e.g. a Role performing a specific Task or Steps of a Task), by many Roles working in close collaboration (many Roles all working together on the same interdisciplinary Task), or complex work that is performed throughout the lifecycle (e.g. a process defining a breakdown structure for organizing larger composite units of work performed by many Roles working in collaboration)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="precondition" eType="#//Constraint"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="postcondition" eType="#//Constraint"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Step" eSuperTypes="#//Section #//WorkDefinition">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Step is a Section and Work Definition that is used to organize Tasks into parts or subunits of work.  Steps inherit the subSections decomposition from Section and can therefore describe Sub-Steps nested into Steps.&#xD;&#xA;A Step describes a meaningful and consist part of the overall work described for a Task.  The collection of Steps defined for a Task represents all the work that should be done to achieve the overall development goal of the Task.  Not all steps are necessarily performed each time a Task is invoked in a Process (see Task Descriptor), so they can also be expressed in the form of alternate 'flows' of work.  Different ways of achieving the same development goal can then be 'assembled' by selecting different combinations of steps when applying the Task in a Process.  Typical kinds of steps a Task author should consider are: Thinking steps: where the individual roles understand the nature of the task, gathers and examines the input artifacts, and formulates the outcome. Performing steps: where the individual roles create or update some artifacts. Reviewing steps: where the individual roles inspects the results against some criteria."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Guidance" abstract="true" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Guidance is an abstract generalization of additional information related to content elements such as Roles, Tasks, and Work Products.  Examples for Guidance are Guidelines, Templates, Checklists, Tool Mentors, Estimates, Supporting Materials, Reports, Concepts, etc.  This package only contains the definition of the abstract Guidance class.  The package Guidance Types defines concrete guidance types."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Artifact" eSuperTypes="#//WorkProduct">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Artifact is a Work Product that provides a description and definition for tangible work product types. Artifacts may be composed of other artifacts. For example, a model artifact can be composed of model elements, which are also artifacts.&#xD;&#xA;Artifacts are tangible work products consumed, produced, or modified by Tasks.  It may serve as a basis for defining reusable assets.  Roles use Artifacts to perform Tasks and produce Artifacts in the course of performing Tasks.  Artifacts are the responsibility of a single Role, making responsibility easy to identify and understand, and promoting the idea that every piece of information produced in the method requires the appropriate set of skills. Even though one role might &quot;own&quot; a specific type of Artifacts, other roles can still use the Artifacts; perhaps even update them if the Role has been given permission to do so."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="containerArtifact" eType="#//Artifact"
-        transient="true" eOpposite="#//Artifact/containedArtifacts"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="containedArtifacts" ordered="false"
-        upperBound="-1" eType="#//Artifact" containment="true" eOpposite="#//Artifact/containerArtifact"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Deliverable" eSuperTypes="#//WorkProduct">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A deliverable is a Work Product that provides a description and definition for packaging other Work Products, and may be delivered to an internal or external party.  Therefore, a Deliverable aggregates other Work Products. Therefore, a Deliverable aggregates other Work Products.  A Deliverable is used to pre-define typical or recommended content in the form or work products that would be packaged for delivery.  The actual packaging of the Deliverable in an actual process or even project could be a modification of this recommendation.  Deliverables are used to represent an output from a process that has value, material or otherwise, to a client, customer or other stakeholder. "/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deliveredWorkProducts"
-        ordered="false" upperBound="-1" eType="#//WorkProduct"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Outcome" eSuperTypes="#//WorkProduct">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An outcome describes intangible work products that are a result or state. Outcomes may also be used to describe work products that are not formally defined.  A key differentiator for outcomes against artifacts is that outcomes are not candidates for harvesting as reusable assets."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodPackage" abstract="true" eSuperTypes="#//MethodElement #//Package">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Package is an abstract class for packaging Method Elements.  All Method Elements shall be located in exactly one of Method Package's concrete specializations (e.g. Content Package).   Method Package defines common properties for all of its specializations. Elements are organized in Method Packages to structure large scale of method content and processes as well as to define a mechanism for reuse.  Method Elements from one package can reuse element from other packages by defining a reusedPackages link.  For example, a work product defined in one package can be used as an input for Tasks defined in other packages.  By reusing it from one common place (i.e. the package in which it has been defined) ensures that no redundant definitions of the same elements are required.  Also maintenance of method content is greatly improved as changes can be performed in only one place.  Note, that other packages will introduce more specializations of Method Package, e.g. Process Package and Process Component."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="global" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Method Packages can have a global scope.  This means that every element of every other Method Package can see the global package's contents.  Global Method Packages are primarily used to store commonly used category definitions such as for Disciplines or Domains, which are used by many Task and Work Products respectively."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reusedPackages" ordered="false"
-        upperBound="-1" eType="#//MethodPackage"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="childPackages" ordered="false"
-        upperBound="-1" eType="#//MethodPackage" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentPackage" eSuperTypes="#//MethodPackage">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Content Package is special Method Package that contains Content Elements and Content Elements, only.  Examples for Content Element are Artifacts, Tasks, Roles, etc.  A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contentElements" ordered="false"
-        upperBound="-1" eType="#//ContentElement" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ArtifactDescription" eSuperTypes="#//WorkProductDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="briefOutline" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides a brief description of the information that can be found in this artifact. For example, discusses the contents for key chapters of a document artifact or the key packages and modules of a model artifact."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="representationOptions"
-        eType="#//String" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Discusses different possible alternative representations for the artifact. For example a design model can be represented as a UML model or an informal block diagram or by textual description only."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalId" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="An external visible number that is used to reference this artifact. Used like a synonym."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="purpose" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes why the work product is produced and to what use it will be put."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="impactOfNotHaving" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the consequences of not producing the work product.  This is intended to aid in the tailoring the method/process to the needs of a specific project."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="reasonsForNotNeeding" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the circumstances in which it is reasonable not to produce the work product.  This is intended to aid in the tailoring of the method/process to the needs of a specific project."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DeliverableDescription" eSuperTypes="#//WorkProductDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The description of the Deliverable used for client documents (proposal, statements of work or contractual agreements).  It might use a different language and follow legal constraints."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="packagingGuidance" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides guidance on how to assemble the deliverable from all its required inputs.  This section describes the most common content medium and format.  Distribution of the deliverable is addressed in this section, if necessary."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="skills" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Lists of set of required skills a person needs to possess to fulfill that Role."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="assignmentApproaches" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides guidance on for assigning individuals to the Role in terms of what other roles these individuals could perform and what responsibility different individuals assigned to this role might have.  The guidance can also describe different assignment approaches for different types of projects, e.g. for large versus small teams where individuals could be allocated to roles full time versus sharing roles within the team."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="synonyms" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Lists synonyms, i.e. other names the Role might be referred by.  Tool support for the meta-model might support that a Role name can be consistently be replaced with one of its synonyms throught a Process."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TaskDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="purpose" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Summarizes the main reason for performing this Task and what is intended to be achieved."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alternatives" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Comprises of summaries describing important exceptional and non-standard ways of achieving this Task's development goals that were not covered by the Task's Steps."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GuidanceDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="attachments" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This field is primarily used for attachments augmenting the information provided for guidance.  In particular the attribute is used for Templates, Examples, and Reusable Assets to contain the actual attachment described in the mainDescription.  It can additionally contain representations of the guidance in just a third party format, e.g. PDF, MS Word, or Word Perfect."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PracticeDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="additionalInfo" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Any additional Information not covered by the other attributes."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="problem" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A description of the problem the Practice addresses."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="background" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Elaboration on the background and the context in which the problem occurs and where the solution described by this Practice will fit in."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="goals" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A summary of the overall goals to be addressed by the Practice."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="application" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes how the Practice is being applied or introduced into the context described in background."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelsOfAdoption" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Outlines the different forms or variants in which the practice could be realized. (e.g. full adoption verus a partial adoption of the Practice)"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Point">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphElement" abstract="true" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="position" eType="#//Point"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contained" ordered="false"
-        upperBound="-1" eType="#//DiagramElement" containment="true" eOpposite="#//DiagramElement/container"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="link" ordered="false" upperBound="-1"
-        eType="#//DiagramLink" containment="true" eOpposite="#//DiagramLink/graphElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="anchorage" ordered="false"
-        upperBound="-1" eType="#//GraphConnector" containment="true" eOpposite="#//GraphConnector/graphElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="semanticModel" lowerBound="1"
-        eType="#//SemanticModelBridge" containment="true" eOpposite="#//SemanticModelBridge/graphElement"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DiagramElement" abstract="true" eSuperTypes="#//MethodElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isVisible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="container" eType="#//GraphElement"
-        transient="true" eOpposite="#//GraphElement/contained"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" ordered="false"
-        upperBound="-1" eType="#//Reference" eOpposite="#//Reference/referenced"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="property" ordered="false"
-        upperBound="-1" eType="#//Property" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DiagramLink" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="zoom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewport" eType="#//Point"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="graphElement" lowerBound="1"
-        eType="#//GraphElement" transient="true" eOpposite="#//GraphElement/link"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" lowerBound="1"
-        eType="#//Diagram" eOpposite="#//Diagram/diagramLink"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphConnector" eSuperTypes="#//GraphElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="graphElement" lowerBound="1"
-        eType="#//GraphElement" transient="true" eOpposite="#//GraphElement/anchorage"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="graphEdge" ordered="false"
-        upperBound="-1" eType="#//GraphEdge" eOpposite="#//GraphEdge/anchor"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SemanticModelBridge" abstract="true"
-      eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presentation" eType="#//String"
-        defaultValueLiteral=""/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="graphElement" eType="#//GraphElement"
-        transient="true" eOpposite="#//GraphElement/semanticModel"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" eType="#//Diagram"
-        transient="true" eOpposite="#//Diagram/namespace"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Dimension">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Reference" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isIndividualRepresentation"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referenced" lowerBound="1"
-        eType="#//DiagramElement" eOpposite="#//DiagramElement/reference"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Property" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="#//String"
-        defaultValueLiteral=""/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphEdge" eSuperTypes="#//GraphElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="anchor" ordered="false"
-        lowerBound="2" upperBound="2" eType="#//GraphConnector" eOpposite="#//GraphConnector/graphEdge"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="waypoints" ordered="false"
-        lowerBound="2" upperBound="-1" eType="#//Point" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Diagram" eSuperTypes="#//GraphNode">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="zoom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewpoint" eType="#//Point"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagramLink" ordered="false"
-        upperBound="-1" eType="#//DiagramLink" eOpposite="#//DiagramLink/diagram"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="namespace" lowerBound="1"
-        eType="#//SemanticModelBridge" containment="true" eOpposite="#//SemanticModelBridge/diagram"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphNode" eSuperTypes="#//GraphElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="size" eType="#//Dimension"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SimpleSemanticModelElement" eSuperTypes="#//SemanticModelBridge">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeInfo" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UMASemanticModelBridge" eSuperTypes="#//SemanticModelBridge">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
-        eType="#//MethodElement"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CoreSemanticModelBridge" eSuperTypes="#//SemanticModelBridge">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
-        eType="#//Element"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LeafElement" abstract="true" eSuperTypes="#//DiagramElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="TextElement" eSuperTypes="#//LeafElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="text" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Image" eSuperTypes="#//LeafElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" eType="#//Uri"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mimeType" eType="#//String"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphicPrimitive" abstract="true" eSuperTypes="#//LeafElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Polyline" eSuperTypes="#//GraphicPrimitive">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="closed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="waypoints" ordered="false"
-        lowerBound="2" upperBound="-1" eType="#//Point" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Ellipse" eSuperTypes="#//GraphicPrimitive">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="radiusX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="radiusY" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rotation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="startAngle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="endAngle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="center" eType="#//Point"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Activity" eSuperTypes="#//WorkBreakdownElement #//VariabilityElement #//WorkDefinition">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An Activity is a Work Breakdown Element and Work Definition which supports the nesting and logical grouping of related Breakdown Elements forming breakdown structures.  Although Activity is a concrete meta-class, other classes which represent breakdown structures derive from it; such as Phase, Iteration, Delivery Process, or Capability Pattern.&#xD;&#xA;Activity represents a grouping element for other Breakdown Elements such as Activities, Descriptors, Milestones, etc.  It is not per-se a 'high-level' grouping of only work as in other meta-models, but groups any kind of Breakdown Elements.  For example, one can define valid Activities that group only Work Products Descriptors without any matching Task Descriptors.  Activities also inherit all properties from Work Breakdown Element and indirectly from Process Element; i.e. Activity is ready to have a full content description attached to it."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="breakdownElements" ordered="false"
-        upperBound="-1" eType="#//BreakdownElement" eOpposite="#//BreakdownElement/superActivities"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="roadmaps" ordered="false"
-        upperBound="-1" eType="#//Roadmap"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="supportingMaterials" ordered="false"
-        upperBound="-1" eType="#//SupportingMaterial"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="checklists" ordered="false"
-        upperBound="-1" eType="#//Checklist"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="concepts" ordered="false"
-        upperBound="-1" eType="#//Concept"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="examples" ordered="false"
-        upperBound="-1" eType="#//Example"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="guidelines" ordered="false"
-        upperBound="-1" eType="#//Guideline"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reusableAssets" ordered="false"
-        upperBound="-1" eType="#//ReusableAsset"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isEnactable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkBreakdownElement" abstract="true"
-      eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Work Breakdown Element is a special Breakdown Element that provides specific properties for Breakdown Elements that represent or refer to Work Definitions.  For example its subclass Activity defines work as it is also a subclass of Work Definition.  Its subclass Task Descriptor does not define work by itself, but refers to a Work Definition and therefore can have the same common properties and Work Breakdown Element has."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isRepeatable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute is used to define repetition of work, e.g. iterations.  A Process Work Definition with this attribute set to True shall be repeated more than once on the same set of artifacts.  For example, for an instance of Iteration (defined as a special Process Work Definition below) this attribute is set to True by default indicating that every sub-Activity will be repeated more than once.  However, any Process Work Definition can set this attribute to True to define iterations (e.g. to iterate one Activity consisting of many sub-activities or even Phases, but to iterate just one Task)."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isOngoing" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If the isOngoing attribute is set to True for a Process Work Definition instance, then the element describes an ongoing piece of work without a fixed duration or end state.  For example, the Process Work Definition could represent work of an administrator continuously (e.g. 3h a day) working to ensure that systems are kept in a certain state.  Another example would be program management work overseeing many different projects being scheduled for one particular project at specific reoccurring intervals during the whole lifecycle of the project."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isEventDriven" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The isEventDriven attribute indicates that the Process Work Definition describes an instance of work which is not started because it has been scheduled to start at a certain point of time, because preceding work is being completed, or input work products are available, but because another specific event has occurred.  Examples for such events are exceptions or problem situations which require specific work to be performed as a result.  Also change management work can be modeled as event driven work analyzing a change request or defect and allocating work dynamically to resources to deal with it following the work described with such Process Work Definition.  The events themselves are not modeled in this version of the specification.  They shall be described as part of the normal descriptions fields available.&#xD;&#xA;&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="linkToPredecessor" ordered="false"
-        upperBound="-1" eType="#//WorkOrder"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BreakdownElement" abstract="true" eSuperTypes="#//ProcessElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Breakdown Element is an abstract generalization for any type of Method Element that is part of a breakdown structure.  It defines a set of properties available to all of its specializations."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Prefix represents an additional label that will be presented as a prefix to any Breakdown Element to indicate a user-defined sub-type for the element.  For example, if the process engineer would like to distinguish his Activities by 'Module' (as done in the IBM Rational Summit Ascendant Method), he can define a different prefix for every model to be used in addition to naming Activities, e.g. &quot;SRA.Establish Requirements&quot; with SRA indicating that this Activity belongs to the &quot;Software Requirements Analysis&quot; module.  Another common application for prefix is to qualify roles in Role Descriptors.  For example, &quot;Customer.Architect&quot; would define a &quot;Customer&quot; prefix for the Role Descriptor &quot;Architect&quot; expressing that this is an architect on the customer side and not the development team side."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isPlanned" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A key application for Development Processes expressed with Breakdown structures is to generate a project plan from it.  A process as defined in UMA (cf. with Sections XX and 5.2) is a multi-dimensional structure defining what work is being performed at what time by which roles using which input and producing what outputs.  A project plan as it is represented in project planning tools such as IBM Rational Portfolio Manager or Microsoft Project normally does not need all this information and is normally limited to just representing a subset.  For example, a typical MS Project plan only represents the work breakdown consisting of Tasks and Activities (sometimes referred to as summary tasks).  It does not show the input and output Work Products for a Task, but it can show which roles shall be staffed for performing the Task.  However, such role allocation need to be replaced with concrete resources when instantiating the plan for a concrete project.  Sometimes project plans can then again be organized differently by organizing work by deliverables in which Work Products are mapped to the plan's summary tasks and Task that have these work products as output mapped below such as summary task.  Therefore, a process can make recommendations about which elements to include and which to exclude when generating a plan.  When the isPlanned attribute is set to False for an instance of a Breakdown Element, then this element shall not be not included when a concrete project plan is being generated from the breakdown structure that contains this element.&#xD;&#xA;&#xD;&#xA;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hasMultipleOccurrences"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Just as the isPlanned attribute the hasMultipleOccurrences attribute has an impact on generating plans from a Process.  When this attribute is set to True for a Breakdown Element then it will typically occur multiple times within the same Activity.  For example, a Task such as &quot;Detail Use Case&quot; would be performed for every use case identified for a particular Iteration or Activity.  Generating a plan would list one Task instance per use case."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isOptional" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The isOptional attribute indicates that the Breakdown Element describes work, a work result, or even work resources, which inclusion is not mandatory when performing a project that is planned based on a process containing this element."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="presentedAfter" eType="#//BreakdownElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="presentedBefore" eType="#//BreakdownElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="planningData" eType="#//PlanningData"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="superActivities" lowerBound="1"
-        eType="#//Activity" eOpposite="#//Activity/breakdownElements"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Milestone" eSuperTypes="#//WorkBreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Milestone describes a significant event in a development project, such as a major decision, completion of a deliverable, or meeting of a major dependency (like completion of a project phase).  Because, Milestone is commonly used to refer to both the event itself and the point in time at which the event is scheduled to happen, it is modeled as a Breakdown Element (i.e. it appears as part of a breakdown structure)."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Iteration" eSuperTypes="#//Activity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Iteration is a special Activity, which prescribes pre-defined values for its instances for the attributes prefix ('Iteration') and isRepeatable ('True').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.&#xD;&#xA;Iteration groups a set of nested Activities that are repeated more than once.  It represents an important structuring element to organize work in repetitive cycles.  The concept of Iteration can be associated with different rules in different methods.  For example, the IBM Rational Unified Process method framework (RUP) defines a rule that Iterations are not allowed to span across Phases.  In contrast IBM Global Services Method (GSMethod) based method frameworks this rule does not apply and Iteration can be defined which nest Phases.  Rules like these, which play an important role for each individual method and are therefore not enforced by this meta-model.  Instead, process authors are expected to follow and check these rules manually.  (Note: Any Breakdown Element can be repeated; however, Iterations has been introduced as a special meta-model concept, because of its important role for many methods.)"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Phase" eSuperTypes="#//Activity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Phase is a special Activity, which prescribes pre-defined values for its instances for the attributes prefix ('Phase') and isRepeatable ('False').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.&#xD;&#xA;Phase represent a significant period in a project, ending with major management checkpoint, milestone or set of Deliverables.  It is included in the model as a predefined special Activity, because of its significance in defining breakdowns."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TeamProfile" eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Team Profile is a Breakdown Element that groups Role Descriptors or Resource Definitions defining a nested hierarchy of teams and team members.&#xD;&#xA;Work assignments and Work Product responsibilities can be different from Activity to Activity in a development project. Different phases require different staffing profiles, i.e. different skills and resources doing different types of work.  Therefore, a process needs to define such different profiles in a flexible manner.  Whereas Core Method Content defines standard responsibilities and assignments, a process express by a breakdown structures needs to be able refine and redefine these throughout its definition.  Role Descriptors, Resource Definitions, as well as Team Profiles provide the data structure necessary to achieve this flexibility and to provide a process user with the capability to define different teams and role relationships for every Activity (including Activities on any nesting-level as well as Iterations or Phases).&#xD;&#xA;Hence, in addition to the work breakdown and work product breakdown structures defined so far, Team Profiles are used to define a third type of breakdown structure: team breakdown structures.  These are created as an Activity specific hierarchy of Team Profiles comprising of Role Descriptors and Resource Definitions.  These structures can be presented as well-known Org-Charts.  Just as with any other Breakdown Element and Descriptors, Team Profiles can be defined within the scope of any Activity in a breakdown structure.  In other words every Activity can define its own Team Profiles consisting of Activity specific Role Descriptors and Resource Definitions.  Typically, Team Profiles are defined on the level of Iterations or Phases or other higher-level Activity."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="teamRoles" ordered="false"
-        upperBound="-1" eType="#//RoleDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="superTeam" lowerBound="1"
-        eType="#//TeamProfile" eOpposite="#//TeamProfile/subTeam"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subTeam" ordered="false"
-        upperBound="-1" eType="#//TeamProfile" eOpposite="#//TeamProfile/superTeam"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleDescriptor" eSuperTypes="#//Descriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Role Descriptor represents a Role in the context of one specific Activity.  Every breakdown structure can define different relationships of Role Descriptors to Task Descriptors and Work Product Descriptors.  Therefore one Role can be represented by many Role Descriptors each within the context of an Activity with its own set of relationships."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Role" eType="#//Role"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="modifies" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" changeable="false" volatile="true"
-        transient="true" derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="responsibleFor" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="WorkOrderType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Work Order represents a relationship between two Breakdown Element in which one Breakdown Element (referred to as (B) below) depends on the start or finish of another Breakdown Element (referred to as (A) below) in order to begin or end. This enumeration defines the different types of Work Order relationships available in UMA and is used to provide values for Work Order's linkType attribute."/>
-    </eAnnotations>
-    <eLiterals name="finishToStart"/>
-    <eLiterals name="finishToFinish" value="1"/>
-    <eLiterals name="startToStart" value="2"/>
-    <eLiterals name="startToFinish" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkOrder" eSuperTypes="#//ProcessElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Work Order is a Method Element that represents a relationship between two Breakdown Elements in which one Breakdown Elements depends on the start or finish of another Breakdown Elements in order to begin or end.  &#xD;&#xA;(Note, Work Order is not modeled as an Association Class to provide a straightforward mapping  to XMI and EMF.)&#xD;&#xA;The Work Order class defines predecessor and successor relations amongst Breakdown Elements.  This information is in particular critical for planning applications.  See more details on different types of Work Order relationships at Work Order Type."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="linkType" eType="#//WorkOrderType"
-        defaultValueLiteral="finishToStart">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute expresses the type of the Work Order relationship by assigning a value from the Work Order Type enumeration."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="pred" lowerBound="1" eType="#//WorkBreakdownElement"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessElement" abstract="true" eSuperTypes="#//DescribableElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Process Element is a Describable Element that represents an abstract generalization for all elements defined in the Process package.&#xD;&#xA;Process Elements represents Process specific elements that are supposed to be managed in Process Packages.  The separation of Process Element from Content Element allows to clearly distinguish between pure method content from content that is represented in processes. "/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PlanningData" eSuperTypes="#//ProcessElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Planning Data is a Method Element that adds planning data to Breakdown Elements when it is used for a Process Planning Template.  For Delivery Processes and Capability Patterns this class can either not be instantiated or populated with default data.&#xD;&#xA;Planning Data factors out specific optional data needed for representing planning templates.  This association allows to access planning data if it is stored for the Breakdown Element.&#xD;&#xA;(NOTE, THE ATTRIBUTES FOR THIS CLASS ARE NOT COMPLETE, YET)"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="startDate" eType="#//Date">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default start date for a planed Task."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finishDate" eType="#//Date">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default finish date for a planed Task."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rank" eType="#//Integer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default rank for a planed Task."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Descriptor" abstract="true" eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Descriptor is an abstract generalization for special Breakdown Elements that references one concrete Content Element.  A descriptor provides a representation of a Content Element within breakdown structures.  In addition to just referencing Content Elements it allows overriding the Content Elements structural relationships by defining its own sets of associations.&#xD;&#xA;Descriptors are the key concept for realizing the separation of processes from method content.  A Descriptor can be characterized as a reference object for one particular Content Element, which has its own relationships and properties.  When a Descriptor is created it shall be provided with congruent copies of the relationships defined for the referenced content element.  However, a user can modify these relationships for the particular process situation for which the descriptor has been created. "/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSynchronizedWithSource"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductDescriptor" eSuperTypes="#//Descriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Work Product Descriptor represents a Work Product in the context of one specific Activity.  Every breakdown structure can define different relationships of Work Product Descriptors to Task Descriptors and Role Descriptors.  Therefore one Work Product can be represented by many Work Product Descriptors each within the context of an Activity with its own set of relationships."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activityEntryState" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Entry State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is initiated (i.e. work on the Activity's Task Descriptors is being initiated that use this Work Product Descriptor as input).  &#xD;&#xA;For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested]."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activityExitState" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Exist State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is finished (i.e. work on the Activity's Task Descriptors has finished that have this Work Product Descriptor as output).&#xD;&#xA;For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested]."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="WorkProduct" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="impactedBy" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" eOpposite="#//WorkProductDescriptor/impacts"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="impacts" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" eOpposite="#//WorkProductDescriptor/impactedBy"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deliverableParts" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TaskDescriptor" eSuperTypes="#//WorkBreakdownElement #//Descriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Task Descriptor is a Descriptor and Work Breakdown Element that represents a proxy for a Task in the context of one specific Activity.  Every breakdown structure can define different relationships of Task Descriptors to Work Product Descriptors and Role Descriptors. Therefore one Task can be represented by many Task Descriptors each within the context of an Activity with its own set of relationships.&#xD;&#xA;A key difference between Method Content and Process is that a Content Element such as Task describes all aspects of doing work defined around this Task.  This description is managed in steps, which are modeled as Sections of the Tasks' Content Descriptions.  When applying a Task in a Process' Activity with a Task Descriptor a Process Engineer needs to indicate that at that particular point in time in the Process definition for which the Task Descriptor has been created, only a subset of steps shall be performed.  He defines this selection using the selectedSteps association.  If he wants to add steps to a Task Descriptor, he can describe these either pragmatically in the refinedDescription attribute or 'properly' create a contributing Task to the Task the Task Descriptor refers to.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Task" eType="#//Task"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="additionallyPerformedBy"
-        ordered="false" upperBound="-1" eType="#//RoleDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="assistedBy" ordered="false"
-        upperBound="-1" eType="#//RoleDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="externalInput" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mandatoryInput" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="optionalInput" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="output" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="performedPrimarilyBy" eType="#//RoleDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="selectedSteps" ordered="false"
-        upperBound="-1" eType="#//Section"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CompositeRole" eSuperTypes="#//RoleDescriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Composite Role is a special Role Descriptor that relates to more then one Role.  It represents a grouping of Roles with the main purpose of simplification, i.e. reducing the number of roles for a process.&#xD;&#xA;A Composite Role is a grouping of Roles that can be used in an Activity or Process to reduce the number of Roles.  A typical application would be a process for a small team in which a standard set of roles from the method content would be all performed by one or more resource.  By using Composite Role the process would suggest a typical clustering of Roles to Resources.  A Composite Role could perform all Tasks defined for the Roles it refers to."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="aggregatedRoles" ordered="false"
-        upperBound="-1" eType="#//Role"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BreakdownElementDescription" eSuperTypes="#//ContentDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="usageGuidance" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides information and guidance on the meaning of the Boolean flag values and under what circumstances they should be overridden. For example, it describes why the breakdown element is optional or considerations for repeating it and differences in the individual occurrences of this Breakdown Element across the lifecycle."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ActivityDescription" eSuperTypes="#//BreakdownElementDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="purpose" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Summarizes the main reason for performing this Activity, describes what the activity as a whole is intended to achieve."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alternatives" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Comprises of summaries describing important exceptional and non-standard ways of doing the work of this Activity not covered by the Activity's Tasks."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="howtoStaff" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides background on who should be involved in this activity what are the required skills, experience,  and perhaps attitudes."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DeliveryProcessDescription" eSuperTypes="#//ProcessDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scale" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Outlines characteristics about the size of a typical project that performs this project expressed in team size, man years, etc."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectCharacteristics"
-        eType="#//String" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Characterizes the project that would typically perform this Process"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="riskLevel" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Outlines typical project risks that are addressed with this process."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="estimatingTechnique" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the Estimation Techniques provided for this Process."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectMemberExpertise"
-        eType="#//String" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides a profile of a typical project team, the distribution of roles, skills required for a team performs a project based on this process."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeOfContract" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides background information about the contracts that need to be established between a project team that performs this process and a client (e.g. for an IGS engagement)."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessDescription" eSuperTypes="#//ActivityDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalId" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="An external visible number that is used to reference this delivery patterns and models. It is used like a synonym."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scope" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the scope of the Process, i.e. which types of projects does it address and which not."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="usageNotes" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Any additional notes on how to apply and instantiate this process for a project."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DescriptorDescription" eSuperTypes="#//BreakdownElementDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="refinedDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A Descriptor might add refinements to the main description of the Content Element it refers to.  For example, it could provide additional information about a Work Product relevant for the specific point in time in the process this Work Product type is being used.  It could describe additional skills needed for a Role at that particular point in time in a process, etc. "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Concept" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Concept is a specific type of guidance that outlines key ideas associated with basic principles underlying the referenced item. Concepts normally address more general topics than Guidelines and span across sev-eral work product and/or tasks/activities."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Checklist" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Checklist is a specific type of guidance that identifies a series of items that need to be completed or veri-fied.  Checklists are often used in reviews such as walkthroughs or inspections. "/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Example" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An Example is a specific type of Guidance that represents a typical, partially completed, sample instance of one or more work products or scenario like descriptions of how Task may be performed. Examples can be related to Work Products as well as Tasks that produce them as well as any other Content Element."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Guideline" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Guideline is a specific type of guidance that provides additional detail on how to perform a particular task or grouping of tasks (e.g. grouped together as activities) or that provides additional detail, rules, and recommendations on work products and their properties.  Amongst others, it can include details about best practices and different approaches for doing work, how to use particular types of work products, information on different subtypes and variants of the work product and how they evolve throughout a lifecycle, discussions on skills the performing roles should acquire or improve upon, measurements for progress and maturity, etc."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Report" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Report is a predefined template of a result that is generated on the basis of other work products as an output from some form of tool automation. An example for a report would be a use case model survey, which is generated by extracting diagram information from a graphical model and textual information from documents and combines these two types of information into a report."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Template" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Template is a specific type of guidance that provides for a work product a pre-defined table of contents, sections, packages, and/or headings, a standardized format, as well as descriptions how the sections and packages are supposed to be used and completed. Templates cannot only be provided for documents, but also for conceptual models or physical data stores."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SupportingMaterial" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Supporting Materials is catchall for other types of guidance not specifically defined elsewhere. It can be related to all kinds of Content Elements, i.e. including other guidance elements."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ToolMentor" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Tool Mentor is a specific type of guidance that shows how to use a specific tool to accomplish some piece of work a Work Product either in the context of or independent from a Task or Activity."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Whitepaper" eSuperTypes="#//Concept">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Whitepapers are a special Concept guidance that have been externally reviewed or published and can be read and understood in isolation of other content elements and guidance."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TermDefinition" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="TermDefinitions define concepts and are used to build up the Glossary. They are not directly related to ContentElements, but their relationship is being derived when the Term is used in the ContentElements description text."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Practice" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Practice represents a proven way or strategy of doing work to achieve a goal that has a positive impact on work product or process quality.  Practices are defined orthogonal to methods and processes.  They could summarize aspects that impact many different parts of a method or specific processes.  Examples for practices would be &quot;Manage Risks&quot;, &quot;Continuously verify quality&quot;, &quot;Architecture-centric and component-based development&quot;, etc."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subPractices" ordered="false"
-        upperBound="-1" eType="#//Practice" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contentReferences" ordered="false"
-        upperBound="-1" eType="#//ContentElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="activityReferences" ordered="false"
-        upperBound="-1" eType="#//Activity"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EstimationConsiderations" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Estimation Considerations qualify the usage and application of estimation metrics in the development of an actual estimate."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ReusableAsset" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Reusable Asset provides a solution to a problem for a given context. The asset may have a variability point, which is a location in the asset that may have a value provided or customized by the asset consumer. The asset has rules for usage which are the instructions describing&#xD;&#xA;how the asset should be used."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="State" eSuperTypes="#//Vertex">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="WorkProduct" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Region" ordered="false"
-        upperBound="-1" eType="#//Region" containment="true" eOpposite="#//Region/State"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="submachine" eType="#//StateMachine"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Vertex">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="container" eType="#//Region"
-        transient="true" eOpposite="#//Region/Vertex"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoing" ordered="false"
-        upperBound="-1" eType="#//Transition" eOpposite="#//Transition/source"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" ordered="false"
-        upperBound="-1" eType="#//Transition" eOpposite="#//Transition/target"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Region">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Vertex" ordered="false"
-        upperBound="-1" eType="#//Vertex" containment="true" eOpposite="#//Vertex/container"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Transition" ordered="false"
-        upperBound="-1" eType="#//Transition" containment="true" eOpposite="#//Transition/container"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="State" eType="#//State"
-        transient="true" eOpposite="#//State/Region"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="StateMachine" eType="#//StateMachine"
-        transient="true" eOpposite="#//StateMachine/Region"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="StateMachine" eSuperTypes="#//WorkDefinition">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Region" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Region" containment="true" eOpposite="#//Region/StateMachine"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Transition">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="WorkDefinition" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//WorkDefinition"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="container" lowerBound="1"
-        eType="#//Region" transient="true" eOpposite="#//Region/Transition"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" lowerBound="1"
-        eType="#//Vertex" eOpposite="#//Vertex/outgoing"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
-        eType="#//Vertex" eOpposite="#//Vertex/incoming"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PseudoState" eSuperTypes="#//Vertex"/>
-  <eClassifiers xsi:type="ecore:EEnum" name="PseudoStateKind">
-    <eLiterals name="initial"/>
-    <eLiterals name="join" value="1"/>
-    <eLiterals name="fork" value="2"/>
-    <eLiterals name="junction" value="3"/>
-    <eLiterals name="choice" value="4"/>
-    <eLiterals name="entryPoint" value="5"/>
-    <eLiterals name="exitPoint" value="6"/>
-    <eLiterals name="terminate" value="7"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Discipline" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Discipline is a categorization of work (i.e. Tasks for Method Content), based upon similarity of concerns and cooperation of work effort.&#xD;&#xA;A discipline is a collection of Tasks that are related to a major 'area of concern' within the overall project. The grouping of Tasks into disciplines is mainly an aid to understanding the project from a 'traditional' waterfall perspective. However, typically, for example, it is more common to perform certain requirements activities in close coordination with analysis and design activities. Separating these activities into separate disciplines makes the activities easier to comprehend."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tasks" ordered="false"
-        upperBound="-1" eType="#//Task"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subdiscipline" ordered="false"
-        upperBound="-1" eType="#//Discipline" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referenceWorkflows" ordered="false"
-        upperBound="-1" eType="#//Activity"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentCategory" abstract="true" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Content Category is an abstract class generalizing content category types."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleSet" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Role Set organizes Roles into categories.  It is used to group roles together that have certain commonalities.  For example, the &quot;Analysts&quot; Role Set could group the &quot;Business Process Analyst&quot;, &quot;System Analyst&quot;, as well as &quot;Requirements Specifier&quot; roles.  All of these work with similar techniques and have overlapping skills, but are required as distinct roles for a method (e.g. the method the IBM Rational Unified Process is based on)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="roles" ordered="false"
-        upperBound="-1" eType="#//Role"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Domain" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Domain is a refineable hierarchy grouping related work products.  In other words, Domains can be further divided into sub-domains, with work product elements to be categorized only at the leaf-level of this hierarchy.&#xD;&#xA;Domain is a logical grouping of work products that have an affinity to each other based on resources, timing, or relationship.  A Domain may be divided into subdomains.  For example, GS Method uses six predefined Domains for Work Products: Application, Architecture, Business, Engagement, Operations and Organization."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="workProducts" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subdomains" ordered="false"
-        upperBound="-1" eType="#//Domain" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductType" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Work Product Type is a second category for work products, which in contrast to Domain is more presentation oriented.  A work product can have many Work Product Types.  Examples, for a Work Product Type is &quot;Class Diagram&quot;, which categorizes the Artifacts Analysis Model, Design Model, User Experience Model, or &quot;Specification&quot;, which categorizes requirements specifications that define a system with a well-defined system boundary, such as use case or functional requirements specification.  A Work Product can be categorized to be of many Work Product Types.  For example, a use case model can be categorized as a Specification as well as Diagram Work Product Type."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="workProducts" ordered="false"
-        upperBound="-1" eType="#//WorkProduct"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DisciplineGrouping" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Discipline Groupings are used to group Disciplines.  For example, the Discipline Grouping &quot;Software Disciplines&quot; would be the group of all disciplines related to developing software such as &quot;Requirements Management&quot; or &quot;Testing&quot;; &quot;IT Infrastructure Management&quot; would be a Disciplines Grouping for disciplines such as &quot;IT Operational Services&quot;, &quot;IT Customer Relationships&quot;, or &quot;IT Enabling Services&quot;.  Disciplines can be associated to more than one Discipline Grouping."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="disciplines" ordered="false"
-        upperBound="-1" eType="#//Discipline"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Tool" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Tool is a container/aggregate for ToolMentors.  It can also provide general descriptions of the tool and its general capabilities."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toolMentors" ordered="false"
-        upperBound="-1" eType="#//ToolMentor"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleSetGrouping" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Role Sets can be categorized into Role Set Groupings.  For example, different methods might define similar Role Sets, which however need to be distinguished from each other on a global scale.  Thus, Role Set Groupings allow distinguishing, for example, Software Services Manager Role Sets from Software Development Organization Manager Role Sets."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="roleSets" ordered="false"
-        upperBound="-1" eType="#//RoleSet"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomCategory" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Custom Category is a category introduced by a method content author to structure any number of method Content Elements of any subtype based on user-defined criteria.  Because Content Categories (and therefore Custom Categories, too) are Content Elements themselves, Custom Categories can be used to recursively categorize Content Categories as well.  Custom Categories can also be nested with any Content Category.  Custom categories can be used to categorize content based on the user's criteria as well as to define whole tree-structures of nested categories allowing the user to systematically navigate and browse method content and processes based on these categories.  For example, one could create a custom category to logically organize content relevant for the user's development organization departments; e.g. a &quot;Testing&quot; category that groups together all roles, work products, tasks, and guidance element relevant to testing.  Another example would be categories that express licensing levels of the content grouping freely distributable method content versus content that represent intellectual property and requires a license to be purchased to be able to use it."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="categorizedElements" ordered="false"
-        upperBound="-1" eType="#//DescribableElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subCategories" ordered="false"
-        upperBound="-1" eType="#//ContentCategory"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DeliveryProcess" eSuperTypes="#//Process">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Delivery Processes is a special Process describing a complete and integrated approach for performing a specific project type.  It describes a complete project lifecycle end-to-end and shall be used as a reference for running projects with similar characteristics as defined for the process.  A Delivery Process is related to specific supporting information such as Roadmaps (inherited via Activity) as well as Communications and Education Material.&#xD;&#xA;A Delivery Process is a Process that covers a whole development lifecycle from beginning to end.  A Delivery Process shall be used as a template for planning and running a project.  It provides a complete lifecycle model with predefined phases, iterations, and activities that have been detailed by sequencing referencing method content in breakdown structures.  It is defined on the basis of experience with past projects or engagements, and/or the best practice use of a development or delivery approach.  It defines what gets produced, how those items are produced, and the required staffing in the form of integrated Work, Work Product, and Team Breakdown Structures.  For example, a process engineer can define alternative Delivery Processes for software development projects that differ in the scale of the engagement and staffing necessary, the type of the software application to be developed, the development methods and technologies to be used, etc.  Although, the Delivery Process aims to cover a whole project it keeps certain decision that are too project specific open.  For example, the breakdown structure defines which Breakdown Elements have multiple occurrences or is repeatable via it respective attributes, but does not say how many occurrences and how many repeats/iterations it will have.  These decisions have to be done by a project manager when planning a concrete project, project phase, or project iterations.  A Delivery Process is always a complete description of a process in terms of completeness of the lifecycle, as well as in terms of all three views on the process which are the Work Breakdown Structure, Work Product Breakdown Structure, and Team Breakdown Structure have to be fully and consistently populated.  Consistency of a Delivery Process is actually ensured by the fact that all three breakdowns are represented by one single data structure and one particular breakdown such as Team Breakdown is just a view on that data structure."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="educationMaterials" ordered="false"
-        upperBound="-1" eType="#//SupportingMaterial"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="communicationsMaterials"
-        ordered="false" upperBound="-1" eType="#//SupportingMaterial"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Process" abstract="true" eSuperTypes="#//Activity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process is a special Activity that describes a structure for particular types of development projects.  To perform such a development project a Processes would be 'instantiated' and adapted for the specific situation.  Process is an abstract class and this meta-model defines different special types of Processes for different process management applications and different situations of process reuse.  Every Process comprises of and is the top-level element of an n-level breakdown structure using the Nesting association defined on Activity.&#xD;&#xA;Core Method Content provides step-by-step explanations, describing how very specific development goals are achieved independent of the placement of these steps within a development lifecycle.  Processes take these method elements and relate them into semi-ordered sequences that are customized to specific types of projects.  Thus, a process is a set of partially ordered work descriptions intended to reach a higher development goal, such as the release of a specific software system.  A process and the process meta-model structure defined in this specification focuses on the lifecycle and the sequencing of work in breakdown structures.  To achieve this it uses the Descriptor concept referencing method content and allowing defining time-specific customizations of the referenced content (e.g. defining a focus on different steps of the same Task and providing input Work Products in different states within the different Phases of a process lifecycle in which the same Task is performed)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="includesPatterns" ordered="false"
-        upperBound="-1" eType="#//CapabilityPattern"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultContext" lowerBound="1"
-        eType="#//MethodConfiguration"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="validContext" ordered="false"
-        upperBound="-1" eType="#//MethodConfiguration"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CapabilityPattern" eSuperTypes="#//Process">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Capability Pattern is a special Process that describes a reusable cluster of doing work in common process areas.  Capabilities Patterns express and communicate process knowledge for a key area of interest such as a Discipline and can be directly used by process practitioner to guide his work.  They are also used as building blocks to assemble Delivery Processes or larger Capability Patterns ensuring optimal reuse and application of the key practices they express.&#xD;&#xA;A Capability Pattern is a special Process that describes a reusable cluster of doing work in a general process area that provides a consistent development approach to common problems.  Examples for Capability Pattern could be 'use case-based requirements management', 'use case analysis', or 'unit testing'. Typically but not necessarily, Capability Patterns have the scope of one discipline providing a breakdown of reusable complex Activities, relationships to the Roles which perform Tasks within these Activities, as well as to the Work Products that are used and produced.  A capability pattern does not relate to any specific phase or iteration of a development lifecycle, and should not imply any.  In other words, a pattern should be designed in a way that it is applicable anywhere in a Delivery Process.  This enables its Activities to be flexibly assigned to whatever phases there are in the Delivery Process to which it is being applied.  It is a good practice to design a Capability Pattern to produce one or more generic Deliverables.  The typical configuration is that each Activity in the Capability Pattern produces one Deliverable, and the last Task Descriptor in the Activity explicitly outputs just this Deliverable.  This enables the process engineer to select Patterns or just Activities by deciding which Deliverables are required.  It also offers a simple integration approach: an Activity from a capability pattern is linked to the Phase or Iteration which is required to produce the Activity's Deliverable.  Key applications areas of / areas of reuse for Capability Patterns are:&#xD;&#xA;- To serve as building blocks for assembling Delivery Processes or larger Capability Patterns.  Normally developing a Delivery Process is not done from scratch but by systematically applying and binding patterns.  In addition to the standard pattern application of 'copy-and-modify', which allows the process engineer to individually customize the pattern's content to the particular situation it is applied for, the Plugin meta-model package (Section 6.1) introduces even more sophisticated inheritance relationships that support dynamic binding of patterns (i.e. the pattern is referenced and not copied).  This unique new way of reusing process knowledge allows to factor out commonly reoccurring Activities into patterns and to apply them over and over again for a process.  When the pattern is being revised or updated, all changes will be automatically reflected in all pattern application in all processes because of the dynamic binding.&#xD;&#xA;- To support direct execution in a development project that does not work following a well-defined process, but works based on loosely connected process fragments of best practices in a flexible manner (e.g. Agile Development).&#xD;&#xA;- To support process education by describing knowledge for a key area such as best practices on how to perform the work for a Discipline (e.g. Requirements Management), for a specific development technique (aspect-oriented development), or a specific technical area (e.g. relational database design), which is used for education and teaching."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessPlanningTemplate" eSuperTypes="#//Process">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process Planning Template is a special Process that is prepared for instantiation by a project planning tool.  Typically, it is created based on a Process such as a Delivery Process as a whole (e.g. in case of a waterfall-based development approach) or in parts (e.g. in case of an iterative development approach).&#xD;&#xA;A Process Planning Template represents a partially finished plan for a concrete project.  It uses the same information structures as all other Process Types to represent templates for project plans.  However, certain planning decisions have already been applied to the template as well as information has been removed and/or reformatted to be ready for export to a specific planning tool.  Examples for such decisions are: a template has been created to represent a plan for a particular Iteration in an iterative development project, which fr example distinguishes early from late iterations in the Elaboration phase of a project; if the targeted planning tool cannot represent input and output of Task, then these have been removed from the structure; certain repetitions have been already applied, e.g. stating that a cycle of specific Task grouped in an Activity have to be repeated n-times; etc."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="basedOnProcesses" ordered="false"
-        upperBound="-1" eType="#//Process"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Roadmap" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Roadmap is a special Guidance Type which is only related to Activates and therefore has been added by this package to the list of Guidance Types rather than listed in the Guidance Types package.  A Roadmap represents a linear walkthrough of an Activity, typically a Process.&#xD;&#xA;An instance of a Roadmap represents important documentation for the Activity or Process it is related to.  Often a complex Activity such as a Process can be much easier understood by providing a walkthrough with a linear thread of a typical instantiation of this Activity.  In addition to making the process practitioner understand how work in the process is being performed, a Roadmap provides additional information about how Activities and Tasks relate to each other over time.  Roadmaps are also used to show how specific aspects are distributed over a whole process providing a kind of filter on the process for this information."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessComponent" eSuperTypes="#//ProcessPackage #//MethodUnit">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process Component is a special Process Package that applies the principles of encapsulation.  A Process Component realizes one or more Interfaces which specify inputs and outputs of the component. There might be many components realizing the same interfaces, but using different techniques to achieve similar outputs for similar inputs.  Whereas the Component Interfaces represent component specifications (black box descriptions of the component), good candidates for component realizations can be found in Capability Patterns (white box descriptions for the component).&#xD;&#xA;UMA supports replaceable and reusable Process Components realizing the principles of encapsulation. Certain situations in a software development project might require that concrete realizations of parts of the process remain undecided or will be decided by the executing team itself (e.g. in outsourcing situations).  UMA provides a unique component concept defining interfaces for work product input and output, allowing treating the actual definition of the work that produces the outputs as a &quot;black box&quot;.  At any point during a project the component &quot;realization&quot; detailing the work can be added to the process.  The component approach also allows that different styles or techniques of doing work can be replaced with one another.  For example, a software code output of a component could be produced with a model-driven development or a code-centric technique.  The component concept encapsulates the actual work and lets the development team choose the appropriate technique and fill the component's realization with their choice of Activities that produce the required outputs."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="interfaces" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ProcessComponentInterface"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="process" lowerBound="1"
-        eType="#//Process" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessPackage" eSuperTypes="#//MethodPackage">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Process Package is a special Method Package that contains Process Elements, only.&#xD;&#xA;A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="processElements" ordered="false"
-        upperBound="-1" eType="#//ProcessElement" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagrams" ordered="false"
-        upperBound="-1" eType="#//Diagram" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessComponentInterface" eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process Component Interface comprises of a list of interface specifications (similar to operation declarations) that express inputs and outputs for a process component.  These interface specifications are expressed using Task Descriptors which are not linked to Tasks that are related to Work Product Descriptors as well as optional a Role Descriptor."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="interfaceSpecifications"
-        ordered="false" upperBound="-1" eType="#//TaskDescriptor" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="interfaceIO" ordered="false"
-        upperBound="-1" eType="#//WorkProductDescriptor" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessComponentDescriptor" eSuperTypes="#//Descriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process Component Descriptor represents a Process Component application in a Process, i.e. the breakdown structure defining the Process.  The Process Component Descriptor is used to encapsulate the details of the component in a breakdown structure and to provide its own set of relationships such as it own predecessors and successors."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ProcessComponent" lowerBound="1"
-        eType="#//ProcessComponent"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodPlugin" eSuperTypes="#//MethodUnit #//Package">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Plugin is a Method Element that represents a physical container for Method Packages.  It defines a granularity level for the modularization and organization of method content and processes.  A Method Plugin can extend many other Method Plugins and it can be extended by many Method Plugins.  It can also be used stand-alone, i.e. with no Extension relationship to other plug-ins.&#xD;&#xA;Method Plugin conceptually represents a unit for configuration, modularization, extension, packaging, and deployment of method content and processes.  A Process Engineer shall design his Plugins and allocate his content to these Plugins with requirements for extensibility, modularity, reuse, and maintainability in mind.&#xD;&#xA;Special extensibility mechanisms defined for the meta-classes Variability Element and Process Contribution allow Plugin content to directly contribute new content, replace existing content, or to cross-reference to any Content Element or Process within another Plugin that it extends.  Similar to UML 2.0's 'package merge' mechanism transformation interpretations, interpreting these Method Plugin mechanisms results into new extended Method Content and Processes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="userChangeable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPackages" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//MethodPackage" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="bases" ordered="false"
-        upperBound="-1" eType="#//MethodPlugin"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="VariabilityElement" abstract="true"
-      eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Variability Element is an abstract class derived from Method Element that provides new capabilities for content variation and extension to Content Elements or any other Method Element that derives from it.  It has been placed in-between the classes Method Element and Content Element in the overall UMA taxonomy of classes using the UML 2.0 package merge mechanism.  The association Variability Specialization shall only be instantiated between two subclasses of Variability Element of the same type.  The element on varaibilitySpecialElement side of the relationship defines a value for the attribute variabilityType defining the nature of the relationship using a literal from the enumeration Variability Type.&#xD;&#xA;Variability Element of the meta-model package Method Plugins adds the capabilities of variation and extension to Method Elements that derive from it.  By default all Content Elements such as Role, Task, Guidance Types, or Activities are defined to be Variability Elements.&#xD;&#xA;Variability and extension provides unique mechanisms for customizing method content without actually directly modifying the original content, but by just be able to describe with separate objects the differences (additions, changes, omissions) relative to the original.  This plug-in concept allows users to factor their method content and processes in interrelated units and even to architect method content and processes in layers that extend each other with new capabilities.  The resulting method and process design can be dynamically combined and applied on demand using the interpretation rules defined for Variability Element Specializations assembling to process practitioners the most accurate method and process descriptions possible.  It also allows process practitioners to extends and tailor method content and processes they do not own and to easily upgrade to newer versions by simply reapply their personal changes to these upgrades.&#xD;&#xA;Variability Element defines two types of variability and one type of extension which are formally defined for the enumeration Variability Type."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="variabilityType" eType="#//VariabilityType"
-        defaultValueLiteral="na">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If in instance of the variabilitySpecialization association between two Variability Elements of the same type exists, then the variabilityType attribute specifies how the element at the variabilitySpecialElement end of the association changes the Content Element at the variabilityBasedOnElement end. See the Variability Type enumeration class for definitions for the different types of variability."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variabilityBasedOnElement"
-        lowerBound="1" eType="#//VariabilityElement"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="VariabilityType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Variability Type is an Enumeration used for values for instances of Variability Element's attribute variabilityType.  It defines the nature of how a Variability Element extends another Variability Element. See enumeration literals for definitions for each type."/>
-    </eAnnotations>
-    <eLiterals name="na"/>
-    <eLiterals name="contributes" value="1"/>
-    <eLiterals name="extends" value="2"/>
-    <eLiterals name="replaces" value="3"/>
-    <eLiterals name="localContribution" value="4"/>
-    <eLiterals name="localReplacement" value="5"/>
-    <eLiterals name="extendsReplaces" value="6"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodUnit" abstract="true" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Unit is a special Method Element that shall be maintained in a Method Library as a separate unit of control."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="authors" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Method Unit is being created and owned by an author or authoring team."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="changeDate" eType="#//Date">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date the last change that resulted into this version has been made."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="changeDescription" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The description of the last change that resulted into this version."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="#//String"
-        defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Package has a version number used to track changes."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="copyrightStatement" lowerBound="1"
-        eType="#//SupportingMaterial"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodConfiguration" eSuperTypes="#//MethodUnit">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Configuration is a collection of selected Method Models and MethodPackages. A configuration can be exported into its own standalone library when it includes the full transitive closure of all elements all other elements depend on."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPluginSelection"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//MethodPlugin"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPackageSelection"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//MethodPackage"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="processViews" ordered="false"
-        upperBound="-1" eType="#//ContentCategory"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultView" lowerBound="1"
-        eType="#//ContentCategory"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="baseConfigurations" ordered="false"
-        upperBound="-1" eType="#//MethodConfiguration"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subtractedCategory" ordered="false"
-        upperBound="-1" eType="#//ContentCategory"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="addedCategory" ordered="false"
-        upperBound="-1" eType="#//ContentCategory"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessFamily" eSuperTypes="#//MethodConfiguration">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Delivery Model Family is a convenient grouping of Delivery Processes and Capability Patterns of interest to some specific user community."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deliveryProcesses" ordered="false"
-        upperBound="-1" eType="#//DeliveryProcess"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodLibrary" eSuperTypes="#//MethodUnit #//Package">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Library is a physical container for Method Plugins and Method Configuration definitions.  All Method Elements are stored in a Method Library."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPlugins" ordered="false"
-        upperBound="-1" eType="#//MethodPlugin" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="predefinedConfigurations"
-        ordered="false" upperBound="-1" eType="#//MethodConfiguration" containment="true"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.epf.uma/model/1.0.4/uma.genmodel b/plugins/org.eclipse.epf.uma/model/1.0.4/uma.genmodel
deleted file mode 100755
index 60d43f3..0000000
--- a/plugins/org.eclipse.epf.uma/model/1.0.4/uma.genmodel
+++ /dev/null
@@ -1,497 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.epf.uma/src"
-    editDirectory="/org.eclipse.epf.uma.edit/src" editorDirectory="/org.eclipse.epf.uma.editor/src"
-    modelPluginID="org.eclipse.epf.uma" templateDirectory="/org.eclipse.epf.uma.ecore/templates"
-    runtimeJar="true" dynamicTemplates="true" modelName="Uma" editPluginClass="org.eclipse.epf.uma.provider.UmaEditPlugin"
-    editorPluginClass="org.eclipse.epf.uma.presentation.UmaEditorPlugin" nonNLSMarkers="true"
-    rootExtendsInterface="org.eclipse.epf.uma.ecore.IModelObject" rootExtendsClass="org.eclipse.epf.uma.ecore.impl.MultiResourceEObject"
-    rootImplementsInterface="org.eclipse.emf.ecore.sdo.InternalEDataObject" suppressEMFTypes="true"
-    featureMapWrapperInterface="commonj.sdo.Sequence" featureMapWrapperInternalInterface="org.eclipse.emf.ecore.sdo.util.ESequence"
-    featureMapWrapperClass="org.eclipse.emf.ecore.sdo.util.BasicESequence" codeFormatting="true"
-    containmentProxies="true">
-  <foreignModel>C:\Home\phTNG\TNG_docs\OOAD\ContentArchitecture\Models\UMA04\UnifiedMethodArchitecture.mdl</foreignModel>
-  <staticPackages>http://www.eclipse.org/emf/2003/SDO</staticPackages>
-  <modelPluginVariables>EMF_COMMONJ_SDO=org.eclipse.emf.commonj.sdo</modelPluginVariables>
-  <modelPluginVariables>EMF_ECORE_SDO=org.eclipse.emf.ecore.sdo</modelPluginVariables>
-  <genPackages prefix="Uma" basePackage="org.eclipse.epf" disposableProviderFactory="true"
-      ecorePackage="uma.ecore#/">
-    <genEnums ecoreEnum="uma.ecore#//WorkOrderType">
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//WorkOrderType/finishToStart"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//WorkOrderType/finishToFinish"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//WorkOrderType/startToStart"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//WorkOrderType/startToFinish"/>
-    </genEnums>
-    <genEnums ecoreEnum="uma.ecore#//PseudoStateKind">
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/initial"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/join"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/fork"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/junction"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/choice"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/entryPoint"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/exitPoint"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//PseudoStateKind/terminate"/>
-    </genEnums>
-    <genEnums ecoreEnum="uma.ecore#//VariabilityType">
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/na"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/contributes"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/extends"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/replaces"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/localContribution"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/localReplacement"/>
-      <genEnumLiterals ecoreEnumLiteral="uma.ecore#//VariabilityType/extendsReplaces"/>
-    </genEnums>
-    <genDataTypes ecoreDataType="uma.ecore#//Date"/>
-    <genDataTypes ecoreDataType="uma.ecore#//Uri"/>
-    <genDataTypes ecoreDataType="uma.ecore#//UnlimitedNatural"/>
-    <genDataTypes ecoreDataType="uma.ecore#//String"/>
-    <genDataTypes ecoreDataType="uma.ecore#//Set"/>
-    <genDataTypes ecoreDataType="uma.ecore#//Sequence"/>
-    <genDataTypes ecoreDataType="uma.ecore#//Integer"/>
-    <genDataTypes ecoreDataType="uma.ecore#//Float"/>
-    <genClasses ecoreClass="uma.ecore#//Classifier"/>
-    <genClasses ecoreClass="uma.ecore#//Type"/>
-    <genClasses ecoreClass="uma.ecore#//Element"/>
-    <genClasses ecoreClass="uma.ecore#//NamedElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//NamedElement/name"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//PackageableElement"/>
-    <genClasses ecoreClass="uma.ecore#//Package"/>
-    <genClasses ecoreClass="uma.ecore#//Namespace"/>
-    <genClasses ecoreClass="uma.ecore#//MethodElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodElement/guid"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodElement/briefDescription"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodElement/ownedRules"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodElement/methodElementProperty"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodElement/suppressed"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodElement/orderingGuide"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Constraint">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Constraint/body"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//MethodElementProperty">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodElementProperty/value"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ContentElement">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/supportingMaterials"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/conceptsAndPapers"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/checklists"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/guidelines"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/examples"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ContentElement/assets"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DescribableElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DescribableElement/presentationName"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//DescribableElement/presentation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DescribableElement/shapeicon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DescribableElement/nodeicon"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ContentDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ContentDescription/mainDescription"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ContentDescription/sections"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ContentDescription/keyConsiderations"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Section">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Section/sectionName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Section/sectionDescription"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Section/subSections"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Section/predecessor"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Role">
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Role/modifies"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Role/responsibleFor"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkProduct">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProduct/reports"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProduct/templates"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProduct/toolMentors"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProduct/estimationConsiderations"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Task">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/performedBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/mandatoryInput"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/output"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/additionallyPerformedBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/optionalInput"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/steps"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/toolMentors"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Task/estimationConsiderations"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkDefinition">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//WorkDefinition/precondition"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//WorkDefinition/postcondition"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Step"/>
-    <genClasses ecoreClass="uma.ecore#//Guidance"/>
-    <genClasses ecoreClass="uma.ecore#//Artifact">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Artifact/containerArtifact"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Artifact/containedArtifacts"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Deliverable">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Deliverable/deliveredWorkProducts"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Outcome"/>
-    <genClasses ecoreClass="uma.ecore#//MethodPackage">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodPackage/global"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodPackage/reusedPackages"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodPackage/childPackages"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ContentPackage">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ContentPackage/contentElements"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ArtifactDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ArtifactDescription/briefOutline"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ArtifactDescription/representationOptions"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkProductDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescription/externalId"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescription/purpose"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescription/impactOfNotHaving"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescription/reasonsForNotNeeding"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DeliverableDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliverableDescription/externalDescription"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliverableDescription/packagingGuidance"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//RoleDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//RoleDescription/skills"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//RoleDescription/assignmentApproaches"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//RoleDescription/synonyms"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//TaskDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//TaskDescription/purpose"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//TaskDescription/alternatives"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GuidanceDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//GuidanceDescription/attachments"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//PracticeDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/additionalInfo"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/problem"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/background"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/goals"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/application"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PracticeDescription/levelsOfAdoption"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Point">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Point/x"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Point/y"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GraphElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphElement/position"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphElement/contained"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphElement/link"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphElement/anchorage"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphElement/semanticModel"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DiagramElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DiagramElement/isVisible"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DiagramElement/container"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DiagramElement/reference"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//DiagramElement/property"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DiagramLink">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DiagramLink/zoom"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//DiagramLink/viewport"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DiagramLink/graphElement"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DiagramLink/diagram"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GraphConnector">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//GraphConnector/graphElement"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//GraphConnector/graphEdge"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//SemanticModelBridge">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//SemanticModelBridge/presentation"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//SemanticModelBridge/graphElement"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//SemanticModelBridge/diagram"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Dimension">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Dimension/width"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Dimension/height"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Reference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Reference/isIndividualRepresentation"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Reference/referenced"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Property">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Property/key"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Property/value"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GraphEdge">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//GraphEdge/anchor"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphEdge/waypoints"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Diagram">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Diagram/zoom"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Diagram/viewpoint"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Diagram/diagramLink"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Diagram/namespace"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GraphNode">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//GraphNode/size"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//SimpleSemanticModelElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//SimpleSemanticModelElement/typeInfo"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//UMASemanticModelBridge">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//UMASemanticModelBridge/element"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//CoreSemanticModelBridge">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//CoreSemanticModelBridge/element"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//LeafElement"/>
-    <genClasses ecoreClass="uma.ecore#//TextElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//TextElement/text"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Image">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Image/uri"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Image/mimeType"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//GraphicPrimitive"/>
-    <genClasses ecoreClass="uma.ecore#//Polyline">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Polyline/closed"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Polyline/waypoints"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Ellipse">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Ellipse/radiusX"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Ellipse/radiusY"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Ellipse/rotation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Ellipse/startAngle"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Ellipse/endAngle"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Ellipse/center"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Activity">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/breakdownElements"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/roadmaps"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/supportingMaterials"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/checklists"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/concepts"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/examples"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/guidelines"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Activity/reusableAssets"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Activity/isEnactable"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkBreakdownElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkBreakdownElement/isRepeatable"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkBreakdownElement/isOngoing"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkBreakdownElement/isEventDriven"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkBreakdownElement/linkToPredecessor"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//BreakdownElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//BreakdownElement/prefix"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//BreakdownElement/isPlanned"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//BreakdownElement/hasMultipleOccurrences"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//BreakdownElement/isOptional"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//BreakdownElement/presentedAfter"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//BreakdownElement/presentedBefore"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//BreakdownElement/planningData"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//BreakdownElement/superActivities"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Milestone"/>
-    <genClasses ecoreClass="uma.ecore#//Iteration"/>
-    <genClasses ecoreClass="uma.ecore#//Phase"/>
-    <genClasses ecoreClass="uma.ecore#//TeamProfile">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TeamProfile/teamRoles"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TeamProfile/superTeam"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TeamProfile/subTeam"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//RoleDescriptor">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleDescriptor/Role"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleDescriptor/modifies"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleDescriptor/responsibleFor"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkOrder">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkOrder/linkType"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkOrder/pred"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessElement"/>
-    <genClasses ecoreClass="uma.ecore#//PlanningData">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PlanningData/startDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PlanningData/finishDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//PlanningData/rank"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Descriptor">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//Descriptor/isSynchronizedWithSource"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkProductDescriptor">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescriptor/activityEntryState"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//WorkProductDescriptor/activityExitState"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/WorkProduct"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/impactedBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/impacts"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductDescriptor/deliverableParts"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//TaskDescriptor">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/Task"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/additionallyPerformedBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/assistedBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/externalInput"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/mandatoryInput"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/optionalInput"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/output"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/performedPrimarilyBy"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//TaskDescriptor/selectedSteps"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//CompositeRole">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//CompositeRole/aggregatedRoles"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//BreakdownElementDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//BreakdownElementDescription/usageGuidance"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ActivityDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ActivityDescription/purpose"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ActivityDescription/alternatives"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ActivityDescription/howtoStaff"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DeliveryProcessDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/scale"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/projectCharacteristics"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/riskLevel"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/estimatingTechnique"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/projectMemberExpertise"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DeliveryProcessDescription/typeOfContract"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ProcessDescription/externalId"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ProcessDescription/scope"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//ProcessDescription/usageNotes"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DescriptorDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//DescriptorDescription/refinedDescription"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Concept"/>
-    <genClasses ecoreClass="uma.ecore#//Checklist"/>
-    <genClasses ecoreClass="uma.ecore#//Example"/>
-    <genClasses ecoreClass="uma.ecore#//Guideline"/>
-    <genClasses ecoreClass="uma.ecore#//Report"/>
-    <genClasses ecoreClass="uma.ecore#//Template"/>
-    <genClasses ecoreClass="uma.ecore#//SupportingMaterial"/>
-    <genClasses ecoreClass="uma.ecore#//ToolMentor"/>
-    <genClasses ecoreClass="uma.ecore#//Whitepaper"/>
-    <genClasses ecoreClass="uma.ecore#//TermDefinition"/>
-    <genClasses ecoreClass="uma.ecore#//Practice">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Practice/subPractices"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Practice/contentReferences"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Practice/activityReferences"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//EstimationConsiderations"/>
-    <genClasses ecoreClass="uma.ecore#//ReusableAsset"/>
-    <genClasses ecoreClass="uma.ecore#//State">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//State/WorkProduct"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//State/Region"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//State/submachine"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Vertex">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Vertex/container"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Vertex/outgoing"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Vertex/incoming"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Region">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Region/Vertex"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Region/Transition"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Region/State"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Region/StateMachine"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//StateMachine">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//StateMachine/Region"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Transition">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Transition/WorkDefinition"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Transition/container"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Transition/source"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Transition/target"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//PseudoState"/>
-    <genClasses ecoreClass="uma.ecore#//Discipline">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Discipline/tasks"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Discipline/subdiscipline"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Discipline/referenceWorkflows"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ContentCategory"/>
-    <genClasses ecoreClass="uma.ecore#//RoleSet">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleSet/roles"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Domain">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Domain/workProducts"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//Domain/subdomains"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//WorkProductType">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//WorkProductType/workProducts"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DisciplineGrouping">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DisciplineGrouping/disciplines"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Tool">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Tool/toolMentors"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//RoleSetGrouping">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//RoleSetGrouping/roleSets"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//CustomCategory">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//CustomCategory/categorizedElements"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//CustomCategory/subCategories"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//DeliveryProcess">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DeliveryProcess/educationMaterials"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//DeliveryProcess/communicationsMaterials"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Process">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Process/includesPatterns"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Process/defaultContext"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//Process/validContext"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//CapabilityPattern"/>
-    <genClasses ecoreClass="uma.ecore#//ProcessPlanningTemplate">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ProcessPlanningTemplate/basedOnProcesses"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//Roadmap"/>
-    <genClasses ecoreClass="uma.ecore#//ProcessComponent">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ProcessComponent/interfaces"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ProcessComponent/process"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessPackage">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ProcessPackage/processElements"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ProcessPackage/diagrams"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessComponentInterface">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ProcessComponentInterface/interfaceSpecifications"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//ProcessComponentInterface/interfaceIO"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessComponentDescriptor">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ProcessComponentDescriptor/ProcessComponent"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//MethodPlugin">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodPlugin/userChangeable"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodPlugin/methodPackages"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodPlugin/bases"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//VariabilityElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//VariabilityElement/variabilityType"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//VariabilityElement/variabilityBasedOnElement"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//MethodUnit">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodUnit/authors"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodUnit/changeDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodUnit/changeDescription"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uma.ecore#//MethodUnit/version"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodUnit/copyrightStatement"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//MethodConfiguration">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/methodPluginSelection"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/methodPackageSelection"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/processViews"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/defaultView"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/baseConfigurations"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/subtractedCategory"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//MethodConfiguration/addedCategory"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//ProcessFamily">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference uma.ecore#//ProcessFamily/deliveryProcesses"/>
-    </genClasses>
-    <genClasses ecoreClass="uma.ecore#//MethodLibrary">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodLibrary/methodPlugins"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference uma.ecore#//MethodLibrary/predefinedConfigurations"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.epf.uma/plugin.properties b/plugins/org.eclipse.epf.uma/plugin.properties
deleted file mode 100755
index c7539f7..0000000
--- a/plugins/org.eclipse.epf.uma/plugin.properties
+++ /dev/null
@@ -1,18 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF UMA
-providerName=Eclipse.org
-
-# ====================================================================
-

diff --git a/plugins/org.eclipse.epf.uma/plugin.xml b/plugins/org.eclipse.epf.uma/plugin.xml
deleted file mode 100755
index 1eb2dd9..0000000
--- a/plugins/org.eclipse.epf.uma/plugin.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <package 
-            uri = "http://www.ibm.com/uma/1.0.2/uma.ecore" 
-            class = "org.eclipse.epf.uma.UmaPackage" />
-      <package
-            class="org.eclipse.epf.uma.UmaPackage"
-            uri="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore"/>
-  </extension>
-
-</plugin>
-
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Activity.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Activity.java
deleted file mode 100755
index f46d8ae..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Activity.java
+++ /dev/null
@@ -1,203 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Activity</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An Activity is a Work Breakdown Element and Work Definition which supports the nesting and logical grouping of related Breakdown Elements forming breakdown structures.  Although Activity is a concrete meta-class, other classes which represent breakdown structures derive from it; such as Phase, Iteration, Delivery Process, or Capability Pattern.
- * Activity represents a grouping element for other Breakdown Elements such as Activities, Descriptors, Milestones, etc.  It is not per-se a 'high-level' grouping of only work as in other meta-models, but groups any kind of Breakdown Elements.  For example, one can define valid Activities that group only Work Products Descriptors without any matching Task Descriptors.  Activities also inherit all properties from Work Breakdown Element and indirectly from Process Element; i.e. Activity is ready to have a full content description attached to it.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Activity#getBreakdownElements <em>Breakdown Elements</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Activity#getRoadmaps <em>Roadmaps</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Activity#getSupportingMaterials <em>Supporting Materials</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Activity#getChecklists <em>Checklists</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Activity#getConcepts <em>Concepts</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Activity#getExamples <em>Examples</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Activity#getGuidelines <em>Guidelines</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Activity#getReusableAssets <em>Reusable Assets</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Activity#getIsEnactable <em>Is Enactable</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getActivity()
- * @model
- * @generated
- */
-public interface Activity extends WorkBreakdownElement, VariabilityElement,
-		WorkDefinition {
-	/**
-	 * Returns the value of the '<em><b>Breakdown Elements</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.BreakdownElement}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.BreakdownElement#getSuperActivities <em>Super Activities</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Breakdown Elements</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Breakdown Elements</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getActivity_BreakdownElements()
-	 * @see org.eclipse.epf.uma.BreakdownElement#getSuperActivities
-	 * @model type="org.eclipse.epf.uma.BreakdownElement" opposite="superActivities" ordered="false"
-	 * @generated
-	 */
-	List getBreakdownElements();
-
-	/**
-	 * Returns the value of the '<em><b>Roadmaps</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Roadmap}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Roadmaps</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Roadmaps</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getActivity_Roadmaps()
-	 * @model type="org.eclipse.epf.uma.Roadmap" ordered="false"
-	 * @generated
-	 */
-	List getRoadmaps();
-
-	/**
-	 * Returns the value of the '<em><b>Supporting Materials</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.SupportingMaterial}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Supporting Materials</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Supporting Materials</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getActivity_SupportingMaterials()
-	 * @model type="org.eclipse.epf.uma.SupportingMaterial" ordered="false"
-	 * @generated
-	 */
-	List getSupportingMaterials();
-
-	/**
-	 * Returns the value of the '<em><b>Checklists</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Checklist}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Checklists</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Checklists</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getActivity_Checklists()
-	 * @model type="org.eclipse.epf.uma.Checklist" ordered="false"
-	 * @generated
-	 */
-	List getChecklists();
-
-	/**
-	 * Returns the value of the '<em><b>Concepts</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Concept}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Concepts</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Concepts</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getActivity_Concepts()
-	 * @model type="org.eclipse.epf.uma.Concept" ordered="false"
-	 * @generated
-	 */
-	List getConcepts();
-
-	/**
-	 * Returns the value of the '<em><b>Examples</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Example}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Examples</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Examples</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getActivity_Examples()
-	 * @model type="org.eclipse.epf.uma.Example" ordered="false"
-	 * @generated
-	 */
-	List getExamples();
-
-	/**
-	 * Returns the value of the '<em><b>Guidelines</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Guideline}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Guidelines</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Guidelines</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getActivity_Guidelines()
-	 * @model type="org.eclipse.epf.uma.Guideline" ordered="false"
-	 * @generated
-	 */
-	List getGuidelines();
-
-	/**
-	 * Returns the value of the '<em><b>Reusable Assets</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.ReusableAsset}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Reusable Assets</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Reusable Assets</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getActivity_ReusableAssets()
-	 * @model type="org.eclipse.epf.uma.ReusableAsset" ordered="false"
-	 * @generated
-	 */
-	List getReusableAssets();
-
-	/**
-	 * Returns the value of the '<em><b>Is Enactable</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Is Enactable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Is Enactable</em>' attribute.
-	 * @see #setIsEnactable(Boolean)
-	 * @see org.eclipse.epf.uma.UmaPackage#getActivity_IsEnactable()
-	 * @model default="false"
-	 * @generated
-	 */
-	Boolean getIsEnactable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Activity#getIsEnactable <em>Is Enactable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Enactable</em>' attribute.
-	 * @see #getIsEnactable()
-	 * @generated
-	 */
-	void setIsEnactable(Boolean value);
-
-} // Activity
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ActivityDescription.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ActivityDescription.java
deleted file mode 100755
index 2db6130..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ActivityDescription.java
+++ /dev/null
@@ -1,110 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Activity Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.ActivityDescription#getPurpose <em>Purpose</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.ActivityDescription#getAlternatives <em>Alternatives</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.ActivityDescription#getHowtoStaff <em>Howto Staff</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getActivityDescription()
- * @model
- * @generated
- */
-public interface ActivityDescription extends BreakdownElementDescription {
-	/**
-	 * Returns the value of the '<em><b>Purpose</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Summarizes the main reason for performing this Activity, describes what the activity as a whole is intended to achieve.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Purpose</em>' attribute.
-	 * @see #setPurpose(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getActivityDescription_Purpose()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getPurpose();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.ActivityDescription#getPurpose <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Purpose</em>' attribute.
-	 * @see #getPurpose()
-	 * @generated
-	 */
-	void setPurpose(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Alternatives</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Comprises of summaries describing important exceptional and non-standard ways of doing the work of this Activity not covered by the Activity's Tasks.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Alternatives</em>' attribute.
-	 * @see #setAlternatives(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getActivityDescription_Alternatives()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getAlternatives();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.ActivityDescription#getAlternatives <em>Alternatives</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Alternatives</em>' attribute.
-	 * @see #getAlternatives()
-	 * @generated
-	 */
-	void setAlternatives(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Howto Staff</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides background on who should be involved in this activity what are the required skills, experience,  and perhaps attitudes.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Howto Staff</em>' attribute.
-	 * @see #setHowtoStaff(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getActivityDescription_HowtoStaff()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getHowtoStaff();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.ActivityDescription#getHowtoStaff <em>Howto Staff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Howto Staff</em>' attribute.
-	 * @see #getHowtoStaff()
-	 * @generated
-	 */
-	void setHowtoStaff(String value);
-
-} // ActivityDescription
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Artifact.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Artifact.java
deleted file mode 100755
index 7412ae2..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Artifact.java
+++ /dev/null
@@ -1,84 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Artifact</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Artifact is a Work Product that provides a description and definition for tangible work product types. Artifacts may be composed of other artifacts. For example, a model artifact can be composed of model elements, which are also artifacts.
- * Artifacts are tangible work products consumed, produced, or modified by Tasks.  It may serve as a basis for defining reusable assets.  Roles use Artifacts to perform Tasks and produce Artifacts in the course of performing Tasks.  Artifacts are the responsibility of a single Role, making responsibility easy to identify and understand, and promoting the idea that every piece of information produced in the method requires the appropriate set of skills. Even though one role might "own" a specific type of Artifacts, other roles can still use the Artifacts; perhaps even update them if the Role has been given permission to do so.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Artifact#getContainerArtifact <em>Container Artifact</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Artifact#getContainedArtifacts <em>Contained Artifacts</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getArtifact()
- * @model
- * @generated
- */
-public interface Artifact extends WorkProduct {
-	/**
-	 * Returns the value of the '<em><b>Container Artifact</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Artifact#getContainedArtifacts <em>Contained Artifacts</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Container Artifact</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Container Artifact</em>' container reference.
-	 * @see #setContainerArtifact(Artifact)
-	 * @see org.eclipse.epf.uma.UmaPackage#getArtifact_ContainerArtifact()
-	 * @see org.eclipse.epf.uma.Artifact#getContainedArtifacts
-	 * @model opposite="containedArtifacts"
-	 * @generated
-	 */
-	Artifact getContainerArtifact();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Artifact#getContainerArtifact <em>Container Artifact</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Container Artifact</em>' container reference.
-	 * @see #getContainerArtifact()
-	 * @generated
-	 */
-	void setContainerArtifact(Artifact value);
-
-	/**
-	 * Returns the value of the '<em><b>Contained Artifacts</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Artifact}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Artifact#getContainerArtifact <em>Container Artifact</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Contained Artifacts</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Contained Artifacts</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getArtifact_ContainedArtifacts()
-	 * @see org.eclipse.epf.uma.Artifact#getContainerArtifact
-	 * @model type="org.eclipse.epf.uma.Artifact" opposite="containerArtifact" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getContainedArtifacts();
-
-} // Artifact
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ArtifactDescription.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ArtifactDescription.java
deleted file mode 100755
index 403a3b8..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ArtifactDescription.java
+++ /dev/null
@@ -1,83 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Artifact Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.ArtifactDescription#getBriefOutline <em>Brief Outline</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.ArtifactDescription#getRepresentationOptions <em>Representation Options</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getArtifactDescription()
- * @model
- * @generated
- */
-public interface ArtifactDescription extends WorkProductDescription {
-	/**
-	 * Returns the value of the '<em><b>Brief Outline</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides a brief description of the information that can be found in this artifact. For example, discusses the contents for key chapters of a document artifact or the key packages and modules of a model artifact.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Brief Outline</em>' attribute.
-	 * @see #setBriefOutline(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getArtifactDescription_BriefOutline()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getBriefOutline();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.ArtifactDescription#getBriefOutline <em>Brief Outline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Brief Outline</em>' attribute.
-	 * @see #getBriefOutline()
-	 * @generated
-	 */
-	void setBriefOutline(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Representation Options</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Discusses different possible alternative representations for the artifact. For example a design model can be represented as a UML model or an informal block diagram or by textual description only.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Representation Options</em>' attribute.
-	 * @see #setRepresentationOptions(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getArtifactDescription_RepresentationOptions()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getRepresentationOptions();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.ArtifactDescription#getRepresentationOptions <em>Representation Options</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Representation Options</em>' attribute.
-	 * @see #getRepresentationOptions()
-	 * @generated
-	 */
-	void setRepresentationOptions(String value);
-
-} // ArtifactDescription
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/BreakdownElement.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/BreakdownElement.java
deleted file mode 100755
index 68976ee..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/BreakdownElement.java
+++ /dev/null
@@ -1,253 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Breakdown Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Breakdown Element is an abstract generalization for any type of Method Element that is part of a breakdown structure.  It defines a set of properties available to all of its specializations.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.BreakdownElement#getPrefix <em>Prefix</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.BreakdownElement#getIsPlanned <em>Is Planned</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.BreakdownElement#getHasMultipleOccurrences <em>Has Multiple Occurrences</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.BreakdownElement#getIsOptional <em>Is Optional</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.BreakdownElement#getPresentedAfter <em>Presented After</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.BreakdownElement#getPresentedBefore <em>Presented Before</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.BreakdownElement#getPlanningData <em>Planning Data</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.BreakdownElement#getSuperActivities <em>Super Activities</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getBreakdownElement()
- * @model abstract="true"
- * @generated
- */
-public interface BreakdownElement extends ProcessElement {
-	/**
-	 * Returns the value of the '<em><b>Prefix</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Prefix represents an additional label that will be presented as a prefix to any Breakdown Element to indicate a user-defined sub-type for the element.  For example, if the process engineer would like to distinguish his Activities by 'Module' (as done in the IBM Rational Summit Ascendant Method), he can define a different prefix for every model to be used in addition to naming Activities, e.g. "SRA.Establish Requirements" with SRA indicating that this Activity belongs to the "Software Requirements Analysis" module.  Another common application for prefix is to qualify roles in Role Descriptors.  For example, "Customer.Architect" would define a "Customer" prefix for the Role Descriptor "Architect" expressing that this is an architect on the customer side and not the development team side.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Prefix</em>' attribute.
-	 * @see #setPrefix(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getBreakdownElement_Prefix()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getPrefix();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.BreakdownElement#getPrefix <em>Prefix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Prefix</em>' attribute.
-	 * @see #getPrefix()
-	 * @generated
-	 */
-	void setPrefix(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Is Planned</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A key application for Development Processes expressed with Breakdown structures is to generate a project plan from it.  A process as defined in UMA (cf. with Sections XX and 5.2) is a multi-dimensional structure defining what work is being performed at what time by which roles using which input and producing what outputs.  A project plan as it is represented in project planning tools such as IBM Rational Portfolio Manager or Microsoft Project normally does not need all this information and is normally limited to just representing a subset.  For example, a typical MS Project plan only represents the work breakdown consisting of Tasks and Activities (sometimes referred to as summary tasks).  It does not show the input and output Work Products for a Task, but it can show which roles shall be staffed for performing the Task.  However, such role allocation need to be replaced with concrete resources when instantiating the plan for a concrete project.  Sometimes project plans can then again be organized differently by organizing work by deliverables in which Work Products are mapped to the plan's summary tasks and Task that have these work products as output mapped below such as summary task.  Therefore, a process can make recommendations about which elements to include and which to exclude when generating a plan.  When the isPlanned attribute is set to False for an instance of a Breakdown Element, then this element shall not be not included when a concrete project plan is being generated from the breakdown structure that contains this element.
-	 * 
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Planned</em>' attribute.
-	 * @see #setIsPlanned(Boolean)
-	 * @see org.eclipse.epf.uma.UmaPackage#getBreakdownElement_IsPlanned()
-	 * @model default="true"
-	 * @generated
-	 */
-	Boolean getIsPlanned();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.BreakdownElement#getIsPlanned <em>Is Planned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Planned</em>' attribute.
-	 * @see #getIsPlanned()
-	 * @generated
-	 */
-	void setIsPlanned(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Just as the isPlanned attribute the hasMultipleOccurrences attribute has an impact on generating plans from a Process.  When this attribute is set to True for a Breakdown Element then it will typically occur multiple times within the same Activity.  For example, a Task such as "Detail Use Case" would be performed for every use case identified for a particular Iteration or Activity.  Generating a plan would list one Task instance per use case.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Has Multiple Occurrences</em>' attribute.
-	 * @see #setHasMultipleOccurrences(Boolean)
-	 * @see org.eclipse.epf.uma.UmaPackage#getBreakdownElement_HasMultipleOccurrences()
-	 * @model default="false"
-	 * @generated
-	 */
-	Boolean getHasMultipleOccurrences();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.BreakdownElement#getHasMultipleOccurrences <em>Has Multiple Occurrences</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Has Multiple Occurrences</em>' attribute.
-	 * @see #getHasMultipleOccurrences()
-	 * @generated
-	 */
-	void setHasMultipleOccurrences(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Is Optional</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The isOptional attribute indicates that the Breakdown Element describes work, a work result, or even work resources, which inclusion is not mandatory when performing a project that is planned based on a process containing this element.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Optional</em>' attribute.
-	 * @see #setIsOptional(Boolean)
-	 * @see org.eclipse.epf.uma.UmaPackage#getBreakdownElement_IsOptional()
-	 * @model default="false"
-	 * @generated
-	 */
-	Boolean getIsOptional();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.BreakdownElement#getIsOptional <em>Is Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Optional</em>' attribute.
-	 * @see #getIsOptional()
-	 * @generated
-	 */
-	void setIsOptional(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Presented After</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Presented After</em>' reference.
-	 * @see #setPresentedAfter(BreakdownElement)
-	 * @see org.eclipse.epf.uma.UmaPackage#getBreakdownElement_PresentedAfter()
-	 * @model
-	 * @generated
-	 */
-	BreakdownElement getPresentedAfter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.BreakdownElement#getPresentedAfter <em>Presented After</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Presented After</em>' reference.
-	 * @see #getPresentedAfter()
-	 * @generated
-	 */
-	void setPresentedAfter(BreakdownElement value);
-
-	/**
-	 * Returns the value of the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Presented Before</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Presented Before</em>' reference.
-	 * @see #setPresentedBefore(BreakdownElement)
-	 * @see org.eclipse.epf.uma.UmaPackage#getBreakdownElement_PresentedBefore()
-	 * @model
-	 * @generated
-	 */
-	BreakdownElement getPresentedBefore();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.BreakdownElement#getPresentedBefore <em>Presented Before</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Presented Before</em>' reference.
-	 * @see #getPresentedBefore()
-	 * @generated
-	 */
-	void setPresentedBefore(BreakdownElement value);
-
-	/**
-	 * Returns the value of the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Planning Data</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Planning Data</em>' containment reference.
-	 * @see #setPlanningData(PlanningData)
-	 * @see org.eclipse.epf.uma.UmaPackage#getBreakdownElement_PlanningData()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	PlanningData getPlanningData();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.BreakdownElement#getPlanningData <em>Planning Data</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Planning Data</em>' containment reference.
-	 * @see #getPlanningData()
-	 * @generated
-	 */
-	void setPlanningData(PlanningData value);
-
-	/**
-	 * Returns the value of the '<em><b>Super Activities</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Activity#getBreakdownElements <em>Breakdown Elements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Super Activities</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Super Activities</em>' reference.
-	 * @see #setSuperActivities(Activity)
-	 * @see org.eclipse.epf.uma.UmaPackage#getBreakdownElement_SuperActivities()
-	 * @see org.eclipse.epf.uma.Activity#getBreakdownElements
-	 * @model opposite="breakdownElements"
-	 * @generated
-	 */
-	Activity getSuperActivities();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.BreakdownElement#getSuperActivities <em>Super Activities</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Super Activities</em>' reference.
-	 * @see #getSuperActivities()
-	 * @generated
-	 */
-	void setSuperActivities(Activity value);
-
-} // BreakdownElement
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/BreakdownElementDescription.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/BreakdownElementDescription.java
deleted file mode 100755
index aa98e9b..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/BreakdownElementDescription.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Breakdown Element Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.BreakdownElementDescription#getUsageGuidance <em>Usage Guidance</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getBreakdownElementDescription()
- * @model
- * @generated
- */
-public interface BreakdownElementDescription extends ContentDescription {
-	/**
-	 * Returns the value of the '<em><b>Usage Guidance</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides information and guidance on the meaning of the Boolean flag values and under what circumstances they should be overridden. For example, it describes why the breakdown element is optional or considerations for repeating it and differences in the individual occurrences of this Breakdown Element across the lifecycle.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Usage Guidance</em>' attribute.
-	 * @see #setUsageGuidance(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getBreakdownElementDescription_UsageGuidance()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getUsageGuidance();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.BreakdownElementDescription#getUsageGuidance <em>Usage Guidance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Usage Guidance</em>' attribute.
-	 * @see #getUsageGuidance()
-	 * @generated
-	 */
-	void setUsageGuidance(String value);
-
-} // BreakdownElementDescription
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/CapabilityPattern.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/CapabilityPattern.java
deleted file mode 100755
index b30fd84..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/CapabilityPattern.java
+++ /dev/null
@@ -1,32 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Capability Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Capability Pattern is a special Process that describes a reusable cluster of doing work in common process areas.  Capabilities Patterns express and communicate process knowledge for a key area of interest such as a Discipline and can be directly used by process practitioner to guide his work.  They are also used as building blocks to assemble Delivery Processes or larger Capability Patterns ensuring optimal reuse and application of the key practices they express.
- * A Capability Pattern is a special Process that describes a reusable cluster of doing work in a general process area that provides a consistent development approach to common problems.  Examples for Capability Pattern could be 'use case-based requirements management', 'use case analysis', or 'unit testing'. Typically but not necessarily, Capability Patterns have the scope of one discipline providing a breakdown of reusable complex Activities, relationships to the Roles which perform Tasks within these Activities, as well as to the Work Products that are used and produced.  A capability pattern does not relate to any specific phase or iteration of a development lifecycle, and should not imply any.  In other words, a pattern should be designed in a way that it is applicable anywhere in a Delivery Process.  This enables its Activities to be flexibly assigned to whatever phases there are in the Delivery Process to which it is being applied.  It is a good practice to design a Capability Pattern to produce one or more generic Deliverables.  The typical configuration is that each Activity in the Capability Pattern produces one Deliverable, and the last Task Descriptor in the Activity explicitly outputs just this Deliverable.  This enables the process engineer to select Patterns or just Activities by deciding which Deliverables are required.  It also offers a simple integration approach: an Activity from a capability pattern is linked to the Phase or Iteration which is required to produce the Activity's Deliverable.  Key applications areas of / areas of reuse for Capability Patterns are:
- * - To serve as building blocks for assembling Delivery Processes or larger Capability Patterns.  Normally developing a Delivery Process is not done from scratch but by systematically applying and binding patterns.  In addition to the standard pattern application of 'copy-and-modify', which allows the process engineer to individually customize the pattern's content to the particular situation it is applied for, the Plugin meta-model package (Section 6.1) introduces even more sophisticated inheritance relationships that support dynamic binding of patterns (i.e. the pattern is referenced and not copied).  This unique new way of reusing process knowledge allows to factor out commonly reoccurring Activities into patterns and to apply them over and over again for a process.  When the pattern is being revised or updated, all changes will be automatically reflected in all pattern application in all processes because of the dynamic binding.
- * - To support direct execution in a development project that does not work following a well-defined process, but works based on loosely connected process fragments of best practices in a flexible manner (e.g. Agile Development).
- * - To support process education by describing knowledge for a key area such as best practices on how to perform the work for a Discipline (e.g. Requirements Management), for a specific development technique (aspect-oriented development), or a specific technical area (e.g. relational database design), which is used for education and teaching.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getCapabilityPattern()
- * @model
- * @generated
- */
-public interface CapabilityPattern extends org.eclipse.epf.uma.Process {
-} // CapabilityPattern
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Checklist.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Checklist.java
deleted file mode 100755
index 22f8e1e..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Checklist.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Checklist</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Checklist is a specific type of guidance that identifies a series of items that need to be completed or veri-fied.  Checklists are often used in reviews such as walkthroughs or inspections. 
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getChecklist()
- * @model
- * @generated
- */
-public interface Checklist extends Guidance {
-} // Checklist
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Classifier.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Classifier.java
deleted file mode 100755
index b154b90..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Classifier.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Classifier</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * UML 2.0 meta-class Classifier.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getClassifier()
- * @model abstract="true"
- * @generated
- */
-public interface Classifier extends Type {
-} // Classifier
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/CompositeRole.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/CompositeRole.java
deleted file mode 100755
index 06bda71..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/CompositeRole.java
+++ /dev/null
@@ -1,53 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Composite Role</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Composite Role is a special Role Descriptor that relates to more then one Role.  It represents a grouping of Roles with the main purpose of simplification, i.e. reducing the number of roles for a process.
- * A Composite Role is a grouping of Roles that can be used in an Activity or Process to reduce the number of Roles.  A typical application would be a process for a small team in which a standard set of roles from the method content would be all performed by one or more resource.  By using Composite Role the process would suggest a typical clustering of Roles to Resources.  A Composite Role could perform all Tasks defined for the Roles it refers to.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.CompositeRole#getAggregatedRoles <em>Aggregated Roles</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getCompositeRole()
- * @model
- * @generated
- */
-public interface CompositeRole extends RoleDescriptor {
-	/**
-	 * Returns the value of the '<em><b>Aggregated Roles</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Role}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Aggregated Roles</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Aggregated Roles</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getCompositeRole_AggregatedRoles()
-	 * @model type="org.eclipse.epf.uma.Role" ordered="false"
-	 * @generated
-	 */
-	List getAggregatedRoles();
-
-} // CompositeRole
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Concept.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Concept.java
deleted file mode 100755
index 9092134..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Concept.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Concept</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Concept is a specific type of guidance that outlines key ideas associated with basic principles underlying the referenced item. Concepts normally address more general topics than Guidelines and span across sev-eral work product and/or tasks/activities.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getConcept()
- * @model
- * @generated
- */
-public interface Concept extends Guidance {
-} // Concept
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Constraint.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Constraint.java
deleted file mode 100755
index 6a3c9ac..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Constraint.java
+++ /dev/null
@@ -1,60 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Constraint is a Method Element that represents a condition or restriction expressed in natural language text or in a machine readable language for the purpose of declaring some of the semantics of a Method Element.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Constraint#getBody <em>Body</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getConstraint()
- * @model
- * @generated
- */
-public interface Constraint extends MethodElement {
-	/**
-	 * Returns the value of the '<em><b>Body</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This attribute stores the definition of the constraint.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Body</em>' attribute.
-	 * @see #setBody(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getConstraint_Body()
-	 * @model default="" unique="false" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getBody();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Constraint#getBody <em>Body</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Body</em>' attribute.
-	 * @see #getBody()
-	 * @generated
-	 */
-	void setBody(String value);
-
-} // Constraint
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ContentCategory.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ContentCategory.java
deleted file mode 100755
index 75b13a2..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ContentCategory.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Content Category</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Content Category is an abstract class generalizing content category types.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getContentCategory()
- * @model abstract="true"
- * @generated
- */
-public interface ContentCategory extends ContentElement {
-} // ContentCategory
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ContentDescription.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ContentDescription.java
deleted file mode 100755
index 3dc8b34..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ContentDescription.java
+++ /dev/null
@@ -1,106 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Content Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Content Description is a Method Element that is used to store the textual description for a Content Element.  It defines standard attributes applicable for all Content Element types.  Specific Content Element sub-types can define their own matching Content Description sub-types. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.ContentDescription#getMainDescription <em>Main Description</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.ContentDescription#getSections <em>Sections</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.ContentDescription#getKeyConsiderations <em>Key Considerations</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getContentDescription()
- * @model
- * @generated
- */
-public interface ContentDescription extends MethodUnit {
-	/**
-	 * Returns the value of the '<em><b>Main Description</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This attribute store the main descriptive text for the Content Element.  All text that is not part of any of the more specific attributes shall be stored here.  If the Content Description is divided into sections using the Section class, then only the text from the 'start' of the content description to the first section will be stored here (similar to a normal document where you can place text between its beginning to its first diction heading).
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Main Description</em>' attribute.
-	 * @see #setMainDescription(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getContentDescription_MainDescription()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getMainDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.ContentDescription#getMainDescription <em>Main Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Main Description</em>' attribute.
-	 * @see #getMainDescription()
-	 * @generated
-	 */
-	void setMainDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Sections</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Section}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sections</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sections</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getContentDescription_Sections()
-	 * @model type="org.eclipse.epf.uma.Section" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getSections();
-
-	/**
-	 * Returns the value of the '<em><b>Key Considerations</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Key Considerations provides advise and guidance of a critical nature for the content element as well as warnings, cautions, pitfalls, dangers.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Key Considerations</em>' attribute.
-	 * @see #setKeyConsiderations(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getContentDescription_KeyConsiderations()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getKeyConsiderations();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.ContentDescription#getKeyConsiderations <em>Key Considerations</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Key Considerations</em>' attribute.
-	 * @see #getKeyConsiderations()
-	 * @generated
-	 */
-	void setKeyConsiderations(String value);
-
-} // ContentDescription
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ContentElement.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ContentElement.java
deleted file mode 100755
index 7c40ce8..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ContentElement.java
+++ /dev/null
@@ -1,138 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Content Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Content Element is a Describable Element that represents an abstract generalization for all elements that are considered to be and managed as Method Content.
- * Content Elements represents reusable Method Content that is supposed to be managed in Content Packages.  The separation of Content Element from Process Element allows to clearly distinguish between pure method content from content that is represented in processes.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.ContentElement#getSupportingMaterials <em>Supporting Materials</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.ContentElement#getConceptsAndPapers <em>Concepts And Papers</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.ContentElement#getChecklists <em>Checklists</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.ContentElement#getGuidelines <em>Guidelines</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.ContentElement#getExamples <em>Examples</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.ContentElement#getAssets <em>Assets</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getContentElement()
- * @model abstract="true"
- * @generated
- */
-public interface ContentElement extends DescribableElement, VariabilityElement {
-	/**
-	 * Returns the value of the '<em><b>Supporting Materials</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.SupportingMaterial}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Supporting Materials</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Supporting Materials</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getContentElement_SupportingMaterials()
-	 * @model type="org.eclipse.epf.uma.SupportingMaterial" ordered="false"
-	 * @generated
-	 */
-	List getSupportingMaterials();
-
-	/**
-	 * Returns the value of the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Concept}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Concepts And Papers</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Concepts And Papers</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getContentElement_ConceptsAndPapers()
-	 * @model type="org.eclipse.epf.uma.Concept" ordered="false"
-	 * @generated
-	 */
-	List getConceptsAndPapers();
-
-	/**
-	 * Returns the value of the '<em><b>Checklists</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Checklist}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Checklists</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Checklists</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getContentElement_Checklists()
-	 * @model type="org.eclipse.epf.uma.Checklist" ordered="false"
-	 * @generated
-	 */
-	List getChecklists();
-
-	/**
-	 * Returns the value of the '<em><b>Guidelines</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Guideline}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Guidelines</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Guidelines</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getContentElement_Guidelines()
-	 * @model type="org.eclipse.epf.uma.Guideline" ordered="false"
-	 * @generated
-	 */
-	List getGuidelines();
-
-	/**
-	 * Returns the value of the '<em><b>Examples</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Example}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Examples</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Examples</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getContentElement_Examples()
-	 * @model type="org.eclipse.epf.uma.Example" ordered="false"
-	 * @generated
-	 */
-	List getExamples();
-
-	/**
-	 * Returns the value of the '<em><b>Assets</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.ReusableAsset}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Assets</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Assets</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getContentElement_Assets()
-	 * @model type="org.eclipse.epf.uma.ReusableAsset" ordered="false"
-	 * @generated
-	 */
-	List getAssets();
-
-} // ContentElement
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ContentPackage.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ContentPackage.java
deleted file mode 100755
index 57a3f2a..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ContentPackage.java
+++ /dev/null
@@ -1,52 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Content Package</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Content Package is special Method Package that contains Content Elements and Content Elements, only.  Examples for Content Element are Artifacts, Tasks, Roles, etc.  A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.ContentPackage#getContentElements <em>Content Elements</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getContentPackage()
- * @model
- * @generated
- */
-public interface ContentPackage extends MethodPackage {
-	/**
-	 * Returns the value of the '<em><b>Content Elements</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.ContentElement}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Content Elements</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Content Elements</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getContentPackage_ContentElements()
-	 * @model type="org.eclipse.epf.uma.ContentElement" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getContentElements();
-
-} // ContentPackage
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/CoreSemanticModelBridge.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/CoreSemanticModelBridge.java
deleted file mode 100755
index 585ffc9..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/CoreSemanticModelBridge.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Core Semantic Model Bridge</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.CoreSemanticModelBridge#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getCoreSemanticModelBridge()
- * @model
- * @generated
- */
-public interface CoreSemanticModelBridge extends SemanticModelBridge {
-	/**
-	 * Returns the value of the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Element</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Element</em>' reference.
-	 * @see #setElement(Element)
-	 * @see org.eclipse.epf.uma.UmaPackage#getCoreSemanticModelBridge_Element()
-	 * @model required="true"
-	 * @generated
-	 */
-	Element getElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.CoreSemanticModelBridge#getElement <em>Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Element</em>' reference.
-	 * @see #getElement()
-	 * @generated
-	 */
-	void setElement(Element value);
-
-} // CoreSemanticModelBridge
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/CustomCategory.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/CustomCategory.java
deleted file mode 100755
index a222795..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/CustomCategory.java
+++ /dev/null
@@ -1,69 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Custom Category</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Custom Category is a category introduced by a method content author to structure any number of method Content Elements of any subtype based on user-defined criteria.  Because Content Categories (and therefore Custom Categories, too) are Content Elements themselves, Custom Categories can be used to recursively categorize Content Categories as well.  Custom Categories can also be nested with any Content Category.  Custom categories can be used to categorize content based on the user's criteria as well as to define whole tree-structures of nested categories allowing the user to systematically navigate and browse method content and processes based on these categories.  For example, one could create a custom category to logically organize content relevant for the user's development organization departments; e.g. a "Testing" category that groups together all roles, work products, tasks, and guidance element relevant to testing.  Another example would be categories that express licensing levels of the content grouping freely distributable method content versus content that represent intellectual property and requires a license to be purchased to be able to use it.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.CustomCategory#getCategorizedElements <em>Categorized Elements</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.CustomCategory#getSubCategories <em>Sub Categories</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getCustomCategory()
- * @model
- * @generated
- */
-public interface CustomCategory extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Categorized Elements</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.DescribableElement}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Categorized Elements</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Categorized Elements</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getCustomCategory_CategorizedElements()
-	 * @model type="org.eclipse.epf.uma.DescribableElement" ordered="false"
-	 * @generated
-	 */
-	List getCategorizedElements();
-
-	/**
-	 * Returns the value of the '<em><b>Sub Categories</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.ContentCategory}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sub Categories</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sub Categories</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getCustomCategory_SubCategories()
-	 * @model type="org.eclipse.epf.uma.ContentCategory" ordered="false"
-	 * @generated
-	 */
-	List getSubCategories();
-
-} // CustomCategory
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Deliverable.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Deliverable.java
deleted file mode 100755
index c120c37..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Deliverable.java
+++ /dev/null
@@ -1,52 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Deliverable</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A deliverable is a Work Product that provides a description and definition for packaging other Work Products, and may be delivered to an internal or external party.  Therefore, a Deliverable aggregates other Work Products. Therefore, a Deliverable aggregates other Work Products.  A Deliverable is used to pre-define typical or recommended content in the form or work products that would be packaged for delivery.  The actual packaging of the Deliverable in an actual process or even project could be a modification of this recommendation.  Deliverables are used to represent an output from a process that has value, material or otherwise, to a client, customer or other stakeholder. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Deliverable#getDeliveredWorkProducts <em>Delivered Work Products</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getDeliverable()
- * @model
- * @generated
- */
-public interface Deliverable extends WorkProduct {
-	/**
-	 * Returns the value of the '<em><b>Delivered Work Products</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProduct}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Delivered Work Products</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Delivered Work Products</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getDeliverable_DeliveredWorkProducts()
-	 * @model type="org.eclipse.epf.uma.WorkProduct" ordered="false"
-	 * @generated
-	 */
-	List getDeliveredWorkProducts();
-
-} // Deliverable
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DeliverableDescription.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DeliverableDescription.java
deleted file mode 100755
index 0094dd8..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DeliverableDescription.java
+++ /dev/null
@@ -1,83 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Deliverable Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.DeliverableDescription#getExternalDescription <em>External Description</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DeliverableDescription#getPackagingGuidance <em>Packaging Guidance</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getDeliverableDescription()
- * @model
- * @generated
- */
-public interface DeliverableDescription extends WorkProductDescription {
-	/**
-	 * Returns the value of the '<em><b>External Description</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The description of the Deliverable used for client documents (proposal, statements of work or contractual agreements).  It might use a different language and follow legal constraints.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>External Description</em>' attribute.
-	 * @see #setExternalDescription(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDeliverableDescription_ExternalDescription()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getExternalDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DeliverableDescription#getExternalDescription <em>External Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>External Description</em>' attribute.
-	 * @see #getExternalDescription()
-	 * @generated
-	 */
-	void setExternalDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Packaging Guidance</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides guidance on how to assemble the deliverable from all its required inputs.  This section describes the most common content medium and format.  Distribution of the deliverable is addressed in this section, if necessary.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Packaging Guidance</em>' attribute.
-	 * @see #setPackagingGuidance(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDeliverableDescription_PackagingGuidance()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getPackagingGuidance();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DeliverableDescription#getPackagingGuidance <em>Packaging Guidance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Packaging Guidance</em>' attribute.
-	 * @see #getPackagingGuidance()
-	 * @generated
-	 */
-	void setPackagingGuidance(String value);
-
-} // DeliverableDescription
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DeliveryProcess.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DeliveryProcess.java
deleted file mode 100755
index 7893ea4..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DeliveryProcess.java
+++ /dev/null
@@ -1,70 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Delivery Process</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Delivery Processes is a special Process describing a complete and integrated approach for performing a specific project type.  It describes a complete project lifecycle end-to-end and shall be used as a reference for running projects with similar characteristics as defined for the process.  A Delivery Process is related to specific supporting information such as Roadmaps (inherited via Activity) as well as Communications and Education Material.
- * A Delivery Process is a Process that covers a whole development lifecycle from beginning to end.  A Delivery Process shall be used as a template for planning and running a project.  It provides a complete lifecycle model with predefined phases, iterations, and activities that have been detailed by sequencing referencing method content in breakdown structures.  It is defined on the basis of experience with past projects or engagements, and/or the best practice use of a development or delivery approach.  It defines what gets produced, how those items are produced, and the required staffing in the form of integrated Work, Work Product, and Team Breakdown Structures.  For example, a process engineer can define alternative Delivery Processes for software development projects that differ in the scale of the engagement and staffing necessary, the type of the software application to be developed, the development methods and technologies to be used, etc.  Although, the Delivery Process aims to cover a whole project it keeps certain decision that are too project specific open.  For example, the breakdown structure defines which Breakdown Elements have multiple occurrences or is repeatable via it respective attributes, but does not say how many occurrences and how many repeats/iterations it will have.  These decisions have to be done by a project manager when planning a concrete project, project phase, or project iterations.  A Delivery Process is always a complete description of a process in terms of completeness of the lifecycle, as well as in terms of all three views on the process which are the Work Breakdown Structure, Work Product Breakdown Structure, and Team Breakdown Structure have to be fully and consistently populated.  Consistency of a Delivery Process is actually ensured by the fact that all three breakdowns are represented by one single data structure and one particular breakdown such as Team Breakdown is just a view on that data structure.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.DeliveryProcess#getEducationMaterials <em>Education Materials</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DeliveryProcess#getCommunicationsMaterials <em>Communications Materials</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getDeliveryProcess()
- * @model
- * @generated
- */
-public interface DeliveryProcess extends org.eclipse.epf.uma.Process {
-	/**
-	 * Returns the value of the '<em><b>Education Materials</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.SupportingMaterial}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Education Materials</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Education Materials</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getDeliveryProcess_EducationMaterials()
-	 * @model type="org.eclipse.epf.uma.SupportingMaterial" ordered="false"
-	 * @generated
-	 */
-	List getEducationMaterials();
-
-	/**
-	 * Returns the value of the '<em><b>Communications Materials</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.SupportingMaterial}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Communications Materials</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Communications Materials</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getDeliveryProcess_CommunicationsMaterials()
-	 * @model type="org.eclipse.epf.uma.SupportingMaterial" ordered="false"
-	 * @generated
-	 */
-	List getCommunicationsMaterials();
-
-} // DeliveryProcess
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DeliveryProcessDescription.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DeliveryProcessDescription.java
deleted file mode 100755
index 09a169e..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DeliveryProcessDescription.java
+++ /dev/null
@@ -1,191 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Delivery Process Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.DeliveryProcessDescription#getScale <em>Scale</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DeliveryProcessDescription#getProjectCharacteristics <em>Project Characteristics</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DeliveryProcessDescription#getRiskLevel <em>Risk Level</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DeliveryProcessDescription#getEstimatingTechnique <em>Estimating Technique</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DeliveryProcessDescription#getProjectMemberExpertise <em>Project Member Expertise</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DeliveryProcessDescription#getTypeOfContract <em>Type Of Contract</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getDeliveryProcessDescription()
- * @model
- * @generated
- */
-public interface DeliveryProcessDescription extends ProcessDescription {
-	/**
-	 * Returns the value of the '<em><b>Scale</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Outlines characteristics about the size of a typical project that performs this project expressed in team size, man years, etc.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Scale</em>' attribute.
-	 * @see #setScale(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDeliveryProcessDescription_Scale()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getScale();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DeliveryProcessDescription#getScale <em>Scale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scale</em>' attribute.
-	 * @see #getScale()
-	 * @generated
-	 */
-	void setScale(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Project Characteristics</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Characterizes the project that would typically perform this Process
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Project Characteristics</em>' attribute.
-	 * @see #setProjectCharacteristics(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDeliveryProcessDescription_ProjectCharacteristics()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getProjectCharacteristics();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DeliveryProcessDescription#getProjectCharacteristics <em>Project Characteristics</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Project Characteristics</em>' attribute.
-	 * @see #getProjectCharacteristics()
-	 * @generated
-	 */
-	void setProjectCharacteristics(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Risk Level</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Outlines typical project risks that are addressed with this process.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Risk Level</em>' attribute.
-	 * @see #setRiskLevel(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDeliveryProcessDescription_RiskLevel()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getRiskLevel();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DeliveryProcessDescription#getRiskLevel <em>Risk Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Risk Level</em>' attribute.
-	 * @see #getRiskLevel()
-	 * @generated
-	 */
-	void setRiskLevel(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Estimating Technique</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Describes the Estimation Techniques provided for this Process.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Estimating Technique</em>' attribute.
-	 * @see #setEstimatingTechnique(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDeliveryProcessDescription_EstimatingTechnique()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getEstimatingTechnique();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DeliveryProcessDescription#getEstimatingTechnique <em>Estimating Technique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Estimating Technique</em>' attribute.
-	 * @see #getEstimatingTechnique()
-	 * @generated
-	 */
-	void setEstimatingTechnique(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Project Member Expertise</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides a profile of a typical project team, the distribution of roles, skills required for a team performs a project based on this process.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Project Member Expertise</em>' attribute.
-	 * @see #setProjectMemberExpertise(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDeliveryProcessDescription_ProjectMemberExpertise()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getProjectMemberExpertise();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DeliveryProcessDescription#getProjectMemberExpertise <em>Project Member Expertise</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Project Member Expertise</em>' attribute.
-	 * @see #getProjectMemberExpertise()
-	 * @generated
-	 */
-	void setProjectMemberExpertise(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Type Of Contract</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides background information about the contracts that need to be established between a project team that performs this process and a client (e.g. for an IGS engagement).
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Type Of Contract</em>' attribute.
-	 * @see #setTypeOfContract(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDeliveryProcessDescription_TypeOfContract()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getTypeOfContract();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DeliveryProcessDescription#getTypeOfContract <em>Type Of Contract</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type Of Contract</em>' attribute.
-	 * @see #getTypeOfContract()
-	 * @generated
-	 */
-	void setTypeOfContract(String value);
-
-} // DeliveryProcessDescription
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DescribableElement.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DescribableElement.java
deleted file mode 100755
index 70f80ae..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DescribableElement.java
+++ /dev/null
@@ -1,142 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.net.URI;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Describable Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Describable Element is an abstract generalization of Method Elements for which external presentation names as well as content descriptions have been defined, such as Roles or Work Products.  Presentation Name and Content Descriptions are typically localized using a resource allocation mechanism for its String type attributes.
- * This abstraction represents all elements in the Method Content as well as Process space for which concrete textual descriptions are defined in the form of documenting attributes grouped in a matching Content Description instance (see Section 4.1.4).  Describable Elements are intended to be published in method or process publications (similar to the IBM Rational Unified Process web).  Describable Element defines that the element it represents will have content 'attached' to it.  Content Description is the abstraction for the actual places in which the content is being represented.  This separation allows a distinction between core method model elements describing the structure of the model from the actual description container providing, for example, the documentation of the content element in different alternatives languages, audiences, licensing levels, etc.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.DescribableElement#getPresentationName <em>Presentation Name</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DescribableElement#getPresentation <em>Presentation</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DescribableElement#getShapeicon <em>Shapeicon</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DescribableElement#getNodeicon <em>Nodeicon</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getDescribableElement()
- * @model abstract="true"
- * @generated
- */
-public interface DescribableElement extends MethodElement, Classifier {
-	/**
-	 * Returns the value of the '<em><b>Presentation Name</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Every Describable Element has a presentation name, which is used for external presentation of the element.  For example, name (the internal representation) might be set to "rup_architecture_document" to differentiate from a "j2ee_architcture_document" whereas the external presentation would always be "Architecture Document".
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Presentation Name</em>' attribute.
-	 * @see #setPresentationName(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDescribableElement_PresentationName()
-	 * @model default="" unique="false" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getPresentationName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DescribableElement#getPresentationName <em>Presentation Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Presentation Name</em>' attribute.
-	 * @see #getPresentationName()
-	 * @generated
-	 */
-	void setPresentationName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Presentation</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Presentation</em>' containment reference.
-	 * @see #setPresentation(ContentDescription)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDescribableElement_Presentation()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	ContentDescription getPresentation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DescribableElement#getPresentation <em>Presentation</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Presentation</em>' containment reference.
-	 * @see #getPresentation()
-	 * @generated
-	 */
-	void setPresentation(ContentDescription value);
-
-	/**
-	 * Returns the value of the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A reference to an icon that can be used for modeling with specific Content Element instances (as graphical stereotypes, e.g. a use case symbol for a use case artifact) as well as publication of content.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Shapeicon</em>' attribute.
-	 * @see #setShapeicon(URI)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDescribableElement_Shapeicon()
-	 * @model unique="false" dataType="org.eclipse.epf.uma.Uri"
-	 * @generated
-	 */
-	URI getShapeicon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DescribableElement#getShapeicon <em>Shapeicon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Shapeicon</em>' attribute.
-	 * @see #getShapeicon()
-	 * @generated
-	 */
-	void setShapeicon(URI value);
-
-	/**
-	 * Returns the value of the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A reference to an icon that can be used in tree browser presentations and breakdown structures.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Nodeicon</em>' attribute.
-	 * @see #setNodeicon(URI)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDescribableElement_Nodeicon()
-	 * @model dataType="org.eclipse.epf.uma.Uri"
-	 * @generated
-	 */
-	URI getNodeicon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DescribableElement#getNodeicon <em>Nodeicon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Nodeicon</em>' attribute.
-	 * @see #getNodeicon()
-	 * @generated
-	 */
-	void setNodeicon(URI value);
-
-} // DescribableElement
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Descriptor.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Descriptor.java
deleted file mode 100755
index f091f9c..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Descriptor.java
+++ /dev/null
@@ -1,62 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Descriptor is an abstract generalization for special Breakdown Elements that references one concrete Content Element.  A descriptor provides a representation of a Content Element within breakdown structures.  In addition to just referencing Content Elements it allows overriding the Content Elements structural relationships by defining its own sets of associations.
- * Descriptors are the key concept for realizing the separation of processes from method content.  A Descriptor can be characterized as a reference object for one particular Content Element, which has its own relationships and properties.  When a Descriptor is created it shall be provided with congruent copies of the relationships defined for the referenced content element.  However, a user can modify these relationships for the particular process situation for which the descriptor has been created. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Descriptor#getIsSynchronizedWithSource <em>Is Synchronized With Source</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getDescriptor()
- * @model abstract="true"
- * @generated
- */
-public interface Descriptor extends BreakdownElement {
-	/**
-	 * Returns the value of the '<em><b>Is Synchronized With Source</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Is Synchronized With Source</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Is Synchronized With Source</em>' attribute.
-	 * @see #setIsSynchronizedWithSource(Boolean)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDescriptor_IsSynchronizedWithSource()
-	 * @model default="true"
-	 * @generated
-	 */
-	Boolean getIsSynchronizedWithSource();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Descriptor#getIsSynchronizedWithSource <em>Is Synchronized With Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Synchronized With Source</em>' attribute.
-	 * @see #getIsSynchronizedWithSource()
-	 * @generated
-	 */
-	void setIsSynchronizedWithSource(Boolean value);
-
-} // Descriptor
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DescriptorDescription.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DescriptorDescription.java
deleted file mode 100755
index b56687a..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DescriptorDescription.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Descriptor Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.DescriptorDescription#getRefinedDescription <em>Refined Description</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getDescriptorDescription()
- * @model
- * @generated
- */
-public interface DescriptorDescription extends BreakdownElementDescription {
-	/**
-	 * Returns the value of the '<em><b>Refined Description</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A Descriptor might add refinements to the main description of the Content Element it refers to.  For example, it could provide additional information about a Work Product relevant for the specific point in time in the process this Work Product type is being used.  It could describe additional skills needed for a Role at that particular point in time in a process, etc. 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Refined Description</em>' attribute.
-	 * @see #setRefinedDescription(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDescriptorDescription_RefinedDescription()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getRefinedDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DescriptorDescription#getRefinedDescription <em>Refined Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Refined Description</em>' attribute.
-	 * @see #getRefinedDescription()
-	 * @generated
-	 */
-	void setRefinedDescription(String value);
-
-} // DescriptorDescription
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Diagram.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Diagram.java
deleted file mode 100755
index 1404d99..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Diagram.java
+++ /dev/null
@@ -1,133 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Diagram</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Diagram#getZoom <em>Zoom</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Diagram#getViewpoint <em>Viewpoint</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Diagram#getDiagramLink <em>Diagram Link</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Diagram#getNamespace <em>Namespace</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getDiagram()
- * @model
- * @generated
- */
-public interface Diagram extends GraphNode {
-	/**
-	 * Returns the value of the '<em><b>Zoom</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Zoom</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Zoom</em>' attribute.
-	 * @see #setZoom(Double)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDiagram_Zoom()
-	 * @model
-	 * @generated
-	 */
-	Double getZoom();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Diagram#getZoom <em>Zoom</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Zoom</em>' attribute.
-	 * @see #getZoom()
-	 * @generated
-	 */
-	void setZoom(Double value);
-
-	/**
-	 * Returns the value of the '<em><b>Viewpoint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Viewpoint</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Viewpoint</em>' containment reference.
-	 * @see #setViewpoint(Point)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDiagram_Viewpoint()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	Point getViewpoint();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Diagram#getViewpoint <em>Viewpoint</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Viewpoint</em>' containment reference.
-	 * @see #getViewpoint()
-	 * @generated
-	 */
-	void setViewpoint(Point value);
-
-	/**
-	 * Returns the value of the '<em><b>Diagram Link</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.DiagramLink}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.DiagramLink#getDiagram <em>Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Diagram Link</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Diagram Link</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getDiagram_DiagramLink()
-	 * @see org.eclipse.epf.uma.DiagramLink#getDiagram
-	 * @model type="org.eclipse.epf.uma.DiagramLink" opposite="diagram" ordered="false"
-	 * @generated
-	 */
-	List getDiagramLink();
-
-	/**
-	 * Returns the value of the '<em><b>Namespace</b></em>' containment reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.SemanticModelBridge#getDiagram <em>Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Namespace</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Namespace</em>' containment reference.
-	 * @see #setNamespace(SemanticModelBridge)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDiagram_Namespace()
-	 * @see org.eclipse.epf.uma.SemanticModelBridge#getDiagram
-	 * @model opposite="diagram" containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	SemanticModelBridge getNamespace();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Diagram#getNamespace <em>Namespace</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Namespace</em>' containment reference.
-	 * @see #getNamespace()
-	 * @generated
-	 */
-	void setNamespace(SemanticModelBridge value);
-
-} // Diagram
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DiagramElement.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DiagramElement.java
deleted file mode 100755
index a888a57..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DiagramElement.java
+++ /dev/null
@@ -1,124 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Diagram Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.DiagramElement#getIsVisible <em>Is Visible</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DiagramElement#getContainer_ <em>Container</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DiagramElement#getReference <em>Reference</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DiagramElement#getProperty <em>Property</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getDiagramElement()
- * @model abstract="true"
- * @generated
- */
-public interface DiagramElement extends MethodElement {
-	/**
-	 * Returns the value of the '<em><b>Is Visible</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Is Visible</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Is Visible</em>' attribute.
-	 * @see #setIsVisible(Boolean)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDiagramElement_IsVisible()
-	 * @model default="true"
-	 * @generated
-	 */
-	Boolean getIsVisible();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DiagramElement#getIsVisible <em>Is Visible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Visible</em>' attribute.
-	 * @see #getIsVisible()
-	 * @generated
-	 */
-	void setIsVisible(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Container</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.GraphElement#getContained <em>Contained</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Container</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Container</em>' container reference.
-	 * @see #setContainer(GraphElement)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDiagramElement_Container()
-	 * @see org.eclipse.epf.uma.GraphElement#getContained
-	 * @model opposite="contained"
-	 * @generated
-	 */
-	GraphElement getContainer_();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DiagramElement#getContainer_ <em>Container</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Container</em>' container reference.
-	 * @see #getContainer_()
-	 * @generated
-	 */
-	void setContainer(GraphElement value);
-
-	/**
-	 * Returns the value of the '<em><b>Reference</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Reference}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Reference#getReferenced <em>Referenced</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Reference</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Reference</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getDiagramElement_Reference()
-	 * @see org.eclipse.epf.uma.Reference#getReferenced
-	 * @model type="org.eclipse.epf.uma.Reference" opposite="referenced" ordered="false"
-	 * @generated
-	 */
-	List getReference();
-
-	/**
-	 * Returns the value of the '<em><b>Property</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Property}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Property</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Property</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getDiagramElement_Property()
-	 * @model type="org.eclipse.epf.uma.Property" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getProperty();
-
-} // DiagramElement
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DiagramLink.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DiagramLink.java
deleted file mode 100755
index d67b587..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DiagramLink.java
+++ /dev/null
@@ -1,141 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Diagram Link</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.DiagramLink#getZoom <em>Zoom</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DiagramLink#getViewport <em>Viewport</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DiagramLink#getGraphElement <em>Graph Element</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.DiagramLink#getDiagram <em>Diagram</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getDiagramLink()
- * @model
- * @generated
- */
-public interface DiagramLink extends DiagramElement {
-	/**
-	 * Returns the value of the '<em><b>Zoom</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Zoom</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Zoom</em>' attribute.
-	 * @see #setZoom(Double)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDiagramLink_Zoom()
-	 * @model
-	 * @generated
-	 */
-	Double getZoom();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DiagramLink#getZoom <em>Zoom</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Zoom</em>' attribute.
-	 * @see #getZoom()
-	 * @generated
-	 */
-	void setZoom(Double value);
-
-	/**
-	 * Returns the value of the '<em><b>Viewport</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Viewport</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Viewport</em>' containment reference.
-	 * @see #setViewport(Point)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDiagramLink_Viewport()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	Point getViewport();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DiagramLink#getViewport <em>Viewport</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Viewport</em>' containment reference.
-	 * @see #getViewport()
-	 * @generated
-	 */
-	void setViewport(Point value);
-
-	/**
-	 * Returns the value of the '<em><b>Graph Element</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.GraphElement#getLink <em>Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Graph Element</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Graph Element</em>' container reference.
-	 * @see #setGraphElement(GraphElement)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDiagramLink_GraphElement()
-	 * @see org.eclipse.epf.uma.GraphElement#getLink
-	 * @model opposite="link" required="true"
-	 * @generated
-	 */
-	GraphElement getGraphElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DiagramLink#getGraphElement <em>Graph Element</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Graph Element</em>' container reference.
-	 * @see #getGraphElement()
-	 * @generated
-	 */
-	void setGraphElement(GraphElement value);
-
-	/**
-	 * Returns the value of the '<em><b>Diagram</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Diagram#getDiagramLink <em>Diagram Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Diagram</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Diagram</em>' reference.
-	 * @see #setDiagram(Diagram)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDiagramLink_Diagram()
-	 * @see org.eclipse.epf.uma.Diagram#getDiagramLink
-	 * @model opposite="diagramLink" required="true"
-	 * @generated
-	 */
-	Diagram getDiagram();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.DiagramLink#getDiagram <em>Diagram</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Diagram</em>' reference.
-	 * @see #getDiagram()
-	 * @generated
-	 */
-	void setDiagram(Diagram value);
-
-} // DiagramLink
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Dimension.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Dimension.java
deleted file mode 100755
index 81acbcf..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Dimension.java
+++ /dev/null
@@ -1,86 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import org.eclipse.epf.uma.ecore.IModelObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dimension</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Dimension#getWidth <em>Width</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Dimension#getHeight <em>Height</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getDimension()
- * @model
- * @extends IModelObject
- * @generated
- */
-public interface Dimension extends IModelObject {
-	/**
-	 * Returns the value of the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Width</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Width</em>' attribute.
-	 * @see #setWidth(Double)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDimension_Width()
-	 * @model
-	 * @generated
-	 */
-	Double getWidth();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Dimension#getWidth <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Width</em>' attribute.
-	 * @see #getWidth()
-	 * @generated
-	 */
-	void setWidth(Double value);
-
-	/**
-	 * Returns the value of the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Height</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Height</em>' attribute.
-	 * @see #setHeight(Double)
-	 * @see org.eclipse.epf.uma.UmaPackage#getDimension_Height()
-	 * @model
-	 * @generated
-	 */
-	Double getHeight();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Dimension#getHeight <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Height</em>' attribute.
-	 * @see #getHeight()
-	 * @generated
-	 */
-	void setHeight(Double value);
-
-} // Dimension
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Discipline.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Discipline.java
deleted file mode 100755
index 91652d2..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Discipline.java
+++ /dev/null
@@ -1,87 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Discipline</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Discipline is a categorization of work (i.e. Tasks for Method Content), based upon similarity of concerns and cooperation of work effort.
- * A discipline is a collection of Tasks that are related to a major 'area of concern' within the overall project. The grouping of Tasks into disciplines is mainly an aid to understanding the project from a 'traditional' waterfall perspective. However, typically, for example, it is more common to perform certain requirements activities in close coordination with analysis and design activities. Separating these activities into separate disciplines makes the activities easier to comprehend.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Discipline#getTasks <em>Tasks</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Discipline#getSubdiscipline <em>Subdiscipline</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Discipline#getReferenceWorkflows <em>Reference Workflows</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getDiscipline()
- * @model
- * @generated
- */
-public interface Discipline extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Tasks</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Task}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tasks</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tasks</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getDiscipline_Tasks()
-	 * @model type="org.eclipse.epf.uma.Task" ordered="false"
-	 * @generated
-	 */
-	List getTasks();
-
-	/**
-	 * Returns the value of the '<em><b>Subdiscipline</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Discipline}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Subdiscipline</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Subdiscipline</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getDiscipline_Subdiscipline()
-	 * @model type="org.eclipse.epf.uma.Discipline" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getSubdiscipline();
-
-	/**
-	 * Returns the value of the '<em><b>Reference Workflows</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Activity}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Reference Workflows</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Reference Workflows</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getDiscipline_ReferenceWorkflows()
-	 * @model type="org.eclipse.epf.uma.Activity" ordered="false"
-	 * @generated
-	 */
-	List getReferenceWorkflows();
-
-} // Discipline
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DisciplineGrouping.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DisciplineGrouping.java
deleted file mode 100755
index 0623f21..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/DisciplineGrouping.java
+++ /dev/null
@@ -1,52 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Discipline Grouping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Discipline Groupings are used to group Disciplines.  For example, the Discipline Grouping "Software Disciplines" would be the group of all disciplines related to developing software such as "Requirements Management" or "Testing"; "IT Infrastructure Management" would be a Disciplines Grouping for disciplines such as "IT Operational Services", "IT Customer Relationships", or "IT Enabling Services".  Disciplines can be associated to more than one Discipline Grouping.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.DisciplineGrouping#getDisciplines <em>Disciplines</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getDisciplineGrouping()
- * @model
- * @generated
- */
-public interface DisciplineGrouping extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Disciplines</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Discipline}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Disciplines</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Disciplines</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getDisciplineGrouping_Disciplines()
-	 * @model type="org.eclipse.epf.uma.Discipline" ordered="false"
-	 * @generated
-	 */
-	List getDisciplines();
-
-} // DisciplineGrouping
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Domain.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Domain.java
deleted file mode 100755
index 1689009..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Domain.java
+++ /dev/null
@@ -1,70 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Domain</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Domain is a refineable hierarchy grouping related work products.  In other words, Domains can be further divided into sub-domains, with work product elements to be categorized only at the leaf-level of this hierarchy.
- * Domain is a logical grouping of work products that have an affinity to each other based on resources, timing, or relationship.  A Domain may be divided into subdomains.  For example, GS Method uses six predefined Domains for Work Products: Application, Architecture, Business, Engagement, Operations and Organization.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Domain#getWorkProducts <em>Work Products</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Domain#getSubdomains <em>Subdomains</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getDomain()
- * @model
- * @generated
- */
-public interface Domain extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Work Products</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProduct}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Work Products</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Work Products</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getDomain_WorkProducts()
-	 * @model type="org.eclipse.epf.uma.WorkProduct" ordered="false"
-	 * @generated
-	 */
-	List getWorkProducts();
-
-	/**
-	 * Returns the value of the '<em><b>Subdomains</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Domain}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Subdomains</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Subdomains</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getDomain_Subdomains()
-	 * @model type="org.eclipse.epf.uma.Domain" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getSubdomains();
-
-} // Domain
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Element.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Element.java
deleted file mode 100755
index 6614af9..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Element.java
+++ /dev/null
@@ -1,31 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import org.eclipse.epf.uma.ecore.IModelObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * UML 2.0 meta-class Element.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getElement()
- * @model abstract="true"
- * @extends IModelObject
- * @generated
- */
-public interface Element extends IModelObject {
-} // Element
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Ellipse.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Ellipse.java
deleted file mode 100755
index 59cadcb..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Ellipse.java
+++ /dev/null
@@ -1,191 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Ellipse</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Ellipse#getRadiusX <em>Radius X</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Ellipse#getRadiusY <em>Radius Y</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Ellipse#getRotation <em>Rotation</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Ellipse#getStartAngle <em>Start Angle</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Ellipse#getEndAngle <em>End Angle</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Ellipse#getCenter <em>Center</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getEllipse()
- * @model
- * @generated
- */
-public interface Ellipse extends GraphicPrimitive {
-	/**
-	 * Returns the value of the '<em><b>Radius X</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Radius X</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Radius X</em>' attribute.
-	 * @see #setRadiusX(Double)
-	 * @see org.eclipse.epf.uma.UmaPackage#getEllipse_RadiusX()
-	 * @model
-	 * @generated
-	 */
-	Double getRadiusX();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Ellipse#getRadiusX <em>Radius X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Radius X</em>' attribute.
-	 * @see #getRadiusX()
-	 * @generated
-	 */
-	void setRadiusX(Double value);
-
-	/**
-	 * Returns the value of the '<em><b>Radius Y</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Radius Y</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Radius Y</em>' attribute.
-	 * @see #setRadiusY(Double)
-	 * @see org.eclipse.epf.uma.UmaPackage#getEllipse_RadiusY()
-	 * @model
-	 * @generated
-	 */
-	Double getRadiusY();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Ellipse#getRadiusY <em>Radius Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Radius Y</em>' attribute.
-	 * @see #getRadiusY()
-	 * @generated
-	 */
-	void setRadiusY(Double value);
-
-	/**
-	 * Returns the value of the '<em><b>Rotation</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Rotation</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Rotation</em>' attribute.
-	 * @see #setRotation(Double)
-	 * @see org.eclipse.epf.uma.UmaPackage#getEllipse_Rotation()
-	 * @model
-	 * @generated
-	 */
-	Double getRotation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Ellipse#getRotation <em>Rotation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rotation</em>' attribute.
-	 * @see #getRotation()
-	 * @generated
-	 */
-	void setRotation(Double value);
-
-	/**
-	 * Returns the value of the '<em><b>Start Angle</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Start Angle</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Start Angle</em>' attribute.
-	 * @see #setStartAngle(Double)
-	 * @see org.eclipse.epf.uma.UmaPackage#getEllipse_StartAngle()
-	 * @model
-	 * @generated
-	 */
-	Double getStartAngle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Ellipse#getStartAngle <em>Start Angle</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start Angle</em>' attribute.
-	 * @see #getStartAngle()
-	 * @generated
-	 */
-	void setStartAngle(Double value);
-
-	/**
-	 * Returns the value of the '<em><b>End Angle</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>End Angle</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>End Angle</em>' attribute.
-	 * @see #setEndAngle(Double)
-	 * @see org.eclipse.epf.uma.UmaPackage#getEllipse_EndAngle()
-	 * @model
-	 * @generated
-	 */
-	Double getEndAngle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Ellipse#getEndAngle <em>End Angle</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>End Angle</em>' attribute.
-	 * @see #getEndAngle()
-	 * @generated
-	 */
-	void setEndAngle(Double value);
-
-	/**
-	 * Returns the value of the '<em><b>Center</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Center</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Center</em>' containment reference.
-	 * @see #setCenter(Point)
-	 * @see org.eclipse.epf.uma.UmaPackage#getEllipse_Center()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	Point getCenter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Ellipse#getCenter <em>Center</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Center</em>' containment reference.
-	 * @see #getCenter()
-	 * @generated
-	 */
-	void setCenter(Point value);
-
-} // Ellipse
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/EstimationConsiderations.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/EstimationConsiderations.java
deleted file mode 100755
index 71215de..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/EstimationConsiderations.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Estimation Considerations</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Estimation Considerations qualify the usage and application of estimation metrics in the development of an actual estimate.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getEstimationConsiderations()
- * @model
- * @generated
- */
-public interface EstimationConsiderations extends Guidance {
-} // EstimationConsiderations
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Example.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Example.java
deleted file mode 100755
index f6b874b..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Example.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Example</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An Example is a specific type of Guidance that represents a typical, partially completed, sample instance of one or more work products or scenario like descriptions of how Task may be performed. Examples can be related to Work Products as well as Tasks that produce them as well as any other Content Element.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getExample()
- * @model
- * @generated
- */
-public interface Example extends Guidance {
-} // Example
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GraphConnector.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GraphConnector.java
deleted file mode 100755
index 7813778..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GraphConnector.java
+++ /dev/null
@@ -1,79 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Graph Connector</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.GraphConnector#getGraphElement <em>Graph Element</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.GraphConnector#getGraphEdge <em>Graph Edge</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getGraphConnector()
- * @model
- * @generated
- */
-public interface GraphConnector extends GraphElement {
-	/**
-	 * Returns the value of the '<em><b>Graph Element</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.GraphElement#getAnchorage <em>Anchorage</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Graph Element</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Graph Element</em>' container reference.
-	 * @see #setGraphElement(GraphElement)
-	 * @see org.eclipse.epf.uma.UmaPackage#getGraphConnector_GraphElement()
-	 * @see org.eclipse.epf.uma.GraphElement#getAnchorage
-	 * @model opposite="anchorage" required="true"
-	 * @generated
-	 */
-	GraphElement getGraphElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.GraphConnector#getGraphElement <em>Graph Element</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Graph Element</em>' container reference.
-	 * @see #getGraphElement()
-	 * @generated
-	 */
-	void setGraphElement(GraphElement value);
-
-	/**
-	 * Returns the value of the '<em><b>Graph Edge</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.GraphEdge}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.GraphEdge#getAnchor <em>Anchor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Graph Edge</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Graph Edge</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getGraphConnector_GraphEdge()
-	 * @see org.eclipse.epf.uma.GraphEdge#getAnchor
-	 * @model type="org.eclipse.epf.uma.GraphEdge" opposite="anchor" ordered="false"
-	 * @generated
-	 */
-	List getGraphEdge();
-
-} // GraphConnector
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GraphEdge.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GraphEdge.java
deleted file mode 100755
index 5a67524..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GraphEdge.java
+++ /dev/null
@@ -1,67 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Graph Edge</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.GraphEdge#getAnchor <em>Anchor</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.GraphEdge#getWaypoints <em>Waypoints</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getGraphEdge()
- * @model
- * @generated
- */
-public interface GraphEdge extends GraphElement {
-	/**
-	 * Returns the value of the '<em><b>Anchor</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.GraphConnector}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.GraphConnector#getGraphEdge <em>Graph Edge</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Anchor</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Anchor</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getGraphEdge_Anchor()
-	 * @see org.eclipse.epf.uma.GraphConnector#getGraphEdge
-	 * @model type="org.eclipse.epf.uma.GraphConnector" opposite="graphEdge" upper="2" ordered="false"
-	 * @generated
-	 */
-	List getAnchor();
-
-	/**
-	 * Returns the value of the '<em><b>Waypoints</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Point}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Waypoints</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Waypoints</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getGraphEdge_Waypoints()
-	 * @model type="org.eclipse.epf.uma.Point" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getWaypoints();
-
-} // GraphEdge
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GraphElement.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GraphElement.java
deleted file mode 100755
index 3eec81b..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GraphElement.java
+++ /dev/null
@@ -1,144 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Graph Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.GraphElement#getPosition <em>Position</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.GraphElement#getContained <em>Contained</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.GraphElement#getLink <em>Link</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.GraphElement#getAnchorage <em>Anchorage</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.GraphElement#getSemanticModel <em>Semantic Model</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getGraphElement()
- * @model abstract="true"
- * @generated
- */
-public interface GraphElement extends DiagramElement {
-	/**
-	 * Returns the value of the '<em><b>Position</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Position</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Position</em>' containment reference.
-	 * @see #setPosition(Point)
-	 * @see org.eclipse.epf.uma.UmaPackage#getGraphElement_Position()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	Point getPosition();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.GraphElement#getPosition <em>Position</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Position</em>' containment reference.
-	 * @see #getPosition()
-	 * @generated
-	 */
-	void setPosition(Point value);
-
-	/**
-	 * Returns the value of the '<em><b>Contained</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.DiagramElement}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.DiagramElement#getContainer_ <em>Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Contained</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Contained</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getGraphElement_Contained()
-	 * @see org.eclipse.epf.uma.DiagramElement#getContainer_
-	 * @model type="org.eclipse.epf.uma.DiagramElement" opposite="container" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getContained();
-
-	/**
-	 * Returns the value of the '<em><b>Link</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.DiagramLink}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.DiagramLink#getGraphElement <em>Graph Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Link</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Link</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getGraphElement_Link()
-	 * @see org.eclipse.epf.uma.DiagramLink#getGraphElement
-	 * @model type="org.eclipse.epf.uma.DiagramLink" opposite="graphElement" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getLink();
-
-	/**
-	 * Returns the value of the '<em><b>Anchorage</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.GraphConnector}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.GraphConnector#getGraphElement <em>Graph Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Anchorage</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Anchorage</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getGraphElement_Anchorage()
-	 * @see org.eclipse.epf.uma.GraphConnector#getGraphElement
-	 * @model type="org.eclipse.epf.uma.GraphConnector" opposite="graphElement" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getAnchorage();
-
-	/**
-	 * Returns the value of the '<em><b>Semantic Model</b></em>' containment reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.SemanticModelBridge#getGraphElement <em>Graph Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Semantic Model</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Semantic Model</em>' containment reference.
-	 * @see #setSemanticModel(SemanticModelBridge)
-	 * @see org.eclipse.epf.uma.UmaPackage#getGraphElement_SemanticModel()
-	 * @see org.eclipse.epf.uma.SemanticModelBridge#getGraphElement
-	 * @model opposite="graphElement" containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	SemanticModelBridge getSemanticModel();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.GraphElement#getSemanticModel <em>Semantic Model</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Semantic Model</em>' containment reference.
-	 * @see #getSemanticModel()
-	 * @generated
-	 */
-	void setSemanticModel(SemanticModelBridge value);
-
-} // GraphElement
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GraphNode.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GraphNode.java
deleted file mode 100755
index 3978d44..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GraphNode.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Graph Node</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.GraphNode#getSize <em>Size</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getGraphNode()
- * @model
- * @generated
- */
-public interface GraphNode extends GraphElement {
-	/**
-	 * Returns the value of the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Size</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Size</em>' containment reference.
-	 * @see #setSize(Dimension)
-	 * @see org.eclipse.epf.uma.UmaPackage#getGraphNode_Size()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	Dimension getSize();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.GraphNode#getSize <em>Size</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Size</em>' containment reference.
-	 * @see #getSize()
-	 * @generated
-	 */
-	void setSize(Dimension value);
-
-} // GraphNode
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GraphicPrimitive.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GraphicPrimitive.java
deleted file mode 100755
index b40c8cd..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GraphicPrimitive.java
+++ /dev/null
@@ -1,24 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Graphic Primitive</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getGraphicPrimitive()
- * @model abstract="true"
- * @generated
- */
-public interface GraphicPrimitive extends LeafElement {
-} // GraphicPrimitive
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Guidance.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Guidance.java
deleted file mode 100755
index 6f6c460..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Guidance.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Guidance</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Guidance is an abstract generalization of additional information related to content elements such as Roles, Tasks, and Work Products.  Examples for Guidance are Guidelines, Templates, Checklists, Tool Mentors, Estimates, Supporting Materials, Reports, Concepts, etc.  This package only contains the definition of the abstract Guidance class.  The package Guidance Types defines concrete guidance types.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getGuidance()
- * @model abstract="true"
- * @generated
- */
-public interface Guidance extends ContentElement {
-} // Guidance
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GuidanceDescription.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GuidanceDescription.java
deleted file mode 100755
index 8314294..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/GuidanceDescription.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Guidance Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.GuidanceDescription#getAttachments <em>Attachments</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getGuidanceDescription()
- * @model
- * @generated
- */
-public interface GuidanceDescription extends ContentDescription {
-	/**
-	 * Returns the value of the '<em><b>Attachments</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This field is primarily used for attachments augmenting the information provided for guidance.  In particular the attribute is used for Templates, Examples, and Reusable Assets to contain the actual attachment described in the mainDescription.  It can additionally contain representations of the guidance in just a third party format, e.g. PDF, MS Word, or Word Perfect.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Attachments</em>' attribute.
-	 * @see #setAttachments(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getGuidanceDescription_Attachments()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getAttachments();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.GuidanceDescription#getAttachments <em>Attachments</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attachments</em>' attribute.
-	 * @see #getAttachments()
-	 * @generated
-	 */
-	void setAttachments(String value);
-
-} // GuidanceDescription
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Guideline.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Guideline.java
deleted file mode 100755
index 3db18d0..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Guideline.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Guideline</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Guideline is a specific type of guidance that provides additional detail on how to perform a particular task or grouping of tasks (e.g. grouped together as activities) or that provides additional detail, rules, and recommendations on work products and their properties.  Amongst others, it can include details about best practices and different approaches for doing work, how to use particular types of work products, information on different subtypes and variants of the work product and how they evolve throughout a lifecycle, discussions on skills the performing roles should acquire or improve upon, measurements for progress and maturity, etc.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getGuideline()
- * @model
- * @generated
- */
-public interface Guideline extends Guidance {
-} // Guideline
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Image.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Image.java
deleted file mode 100755
index c362e69..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Image.java
+++ /dev/null
@@ -1,86 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.net.URI;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Image</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Image#getUri <em>Uri</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Image#getMimeType <em>Mime Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getImage()
- * @model
- * @generated
- */
-public interface Image extends LeafElement {
-	/**
-	 * Returns the value of the '<em><b>Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Uri</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Uri</em>' attribute.
-	 * @see #setUri(URI)
-	 * @see org.eclipse.epf.uma.UmaPackage#getImage_Uri()
-	 * @model dataType="org.eclipse.epf.uma.Uri"
-	 * @generated
-	 */
-	URI getUri();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Image#getUri <em>Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Uri</em>' attribute.
-	 * @see #getUri()
-	 * @generated
-	 */
-	void setUri(URI value);
-
-	/**
-	 * Returns the value of the '<em><b>Mime Type</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mime Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mime Type</em>' attribute.
-	 * @see #setMimeType(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getImage_MimeType()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getMimeType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Image#getMimeType <em>Mime Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mime Type</em>' attribute.
-	 * @see #getMimeType()
-	 * @generated
-	 */
-	void setMimeType(String value);
-
-} // Image
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Iteration.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Iteration.java
deleted file mode 100755
index 85bc672..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Iteration.java
+++ /dev/null
@@ -1,29 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Iteration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Iteration is a special Activity, which prescribes pre-defined values for its instances for the attributes prefix ('Iteration') and isRepeatable ('True').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.
- * Iteration groups a set of nested Activities that are repeated more than once.  It represents an important structuring element to organize work in repetitive cycles.  The concept of Iteration can be associated with different rules in different methods.  For example, the IBM Rational Unified Process method framework (RUP) defines a rule that Iterations are not allowed to span across Phases.  In contrast IBM Global Services Method (GSMethod) based method frameworks this rule does not apply and Iteration can be defined which nest Phases.  Rules like these, which play an important role for each individual method and are therefore not enforced by this meta-model.  Instead, process authors are expected to follow and check these rules manually.  (Note: Any Breakdown Element can be repeated; however, Iterations has been introduced as a special meta-model concept, because of its important role for many methods.)
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getIteration()
- * @model
- * @generated
- */
-public interface Iteration extends Activity {
-} // Iteration
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/LeafElement.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/LeafElement.java
deleted file mode 100755
index 9b8f9e0..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/LeafElement.java
+++ /dev/null
@@ -1,24 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Leaf Element</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getLeafElement()
- * @model abstract="true"
- * @generated
- */
-public interface LeafElement extends DiagramElement {
-} // LeafElement
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodConfiguration.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodConfiguration.java
deleted file mode 100755
index da52fdb..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodConfiguration.java
+++ /dev/null
@@ -1,164 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Method Configuration is a collection of selected Method Models and MethodPackages. A configuration can be exported into its own standalone library when it includes the full transitive closure of all elements all other elements depend on.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.MethodConfiguration#getMethodPluginSelection <em>Method Plugin Selection</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodConfiguration#getMethodPackageSelection <em>Method Package Selection</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodConfiguration#getProcessViews <em>Process Views</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodConfiguration#getDefaultView <em>Default View</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodConfiguration#getBaseConfigurations <em>Base Configurations</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodConfiguration#getSubtractedCategory <em>Subtracted Category</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodConfiguration#getAddedCategory <em>Added Category</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getMethodConfiguration()
- * @model
- * @generated
- */
-public interface MethodConfiguration extends MethodUnit {
-	/**
-	 * Returns the value of the '<em><b>Method Plugin Selection</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.MethodPlugin}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Plugin Selection</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Plugin Selection</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodConfiguration_MethodPluginSelection()
-	 * @model type="org.eclipse.epf.uma.MethodPlugin" ordered="false"
-	 * @generated
-	 */
-	List getMethodPluginSelection();
-
-	/**
-	 * Returns the value of the '<em><b>Method Package Selection</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.MethodPackage}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Package Selection</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Package Selection</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodConfiguration_MethodPackageSelection()
-	 * @model type="org.eclipse.epf.uma.MethodPackage" ordered="false"
-	 * @generated
-	 */
-	List getMethodPackageSelection();
-
-	/**
-	 * Returns the value of the '<em><b>Process Views</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.ContentCategory}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Process Views</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Process Views</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodConfiguration_ProcessViews()
-	 * @model type="org.eclipse.epf.uma.ContentCategory" ordered="false"
-	 * @generated
-	 */
-	List getProcessViews();
-
-	/**
-	 * Returns the value of the '<em><b>Default View</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default View</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default View</em>' reference.
-	 * @see #setDefaultView(ContentCategory)
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodConfiguration_DefaultView()
-	 * @model
-	 * @generated
-	 */
-	ContentCategory getDefaultView();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.MethodConfiguration#getDefaultView <em>Default View</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default View</em>' reference.
-	 * @see #getDefaultView()
-	 * @generated
-	 */
-	void setDefaultView(ContentCategory value);
-
-	/**
-	 * Returns the value of the '<em><b>Base Configurations</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.MethodConfiguration}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Base Configurations</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Base Configurations</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodConfiguration_BaseConfigurations()
-	 * @model type="org.eclipse.epf.uma.MethodConfiguration" ordered="false"
-	 * @generated
-	 */
-	List getBaseConfigurations();
-
-	/**
-	 * Returns the value of the '<em><b>Subtracted Category</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.ContentCategory}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Subtracted Category</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Subtracted Category</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodConfiguration_SubtractedCategory()
-	 * @model type="org.eclipse.epf.uma.ContentCategory" ordered="false"
-	 * @generated
-	 */
-	List getSubtractedCategory();
-
-	/**
-	 * Returns the value of the '<em><b>Added Category</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.ContentCategory}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Added Category</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Added Category</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodConfiguration_AddedCategory()
-	 * @model type="org.eclipse.epf.uma.ContentCategory" ordered="false"
-	 * @generated
-	 */
-	List getAddedCategory();
-
-} // MethodConfiguration
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodElement.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodElement.java
deleted file mode 100755
index 48309ee..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodElement.java
+++ /dev/null
@@ -1,177 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Every class defined in this specification is derived from Method Element.  In other words Method Element is the root generalization for all UMA classes and defines a common set of attributes inherited by every other element type of this model.  Method Element itself is derived from Packageable Element from the UML 2.0 Infrastructure.  Method Element inherits the Name attribute from Packageable Element's super class.  Every element defined as a UMA instance is derived from Model Element.  Every Method Element in-stance is at least defined by a unique id, a name, as well as brief description.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.MethodElement#getGuid <em>Guid</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodElement#getBriefDescription <em>Brief Description</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodElement#getOwnedRules <em>Owned Rules</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodElement#getMethodElementProperty <em>Method Element Property</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodElement#getSuppressed <em>Suppressed</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodElement#getOrderingGuide <em>Ordering Guide</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getMethodElement()
- * @model abstract="true"
- * @generated
- */
-public interface MethodElement extends PackageableElement {
-	/**
-	 * Returns the value of the '<em><b>Guid</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Every instance of Method Element has a global unique id.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Guid</em>' attribute.
-	 * @see #setGuid(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodElement_Guid()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getGuid();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.MethodElement#getGuid <em>Guid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Guid</em>' attribute.
-	 * @see #getGuid()
-	 * @generated
-	 */
-	void setGuid(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Brief Description</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Every instance of Method Element shall be briefly described with one or two sentences summarizing the element.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Brief Description</em>' attribute.
-	 * @see #setBriefDescription(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodElement_BriefDescription()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getBriefDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.MethodElement#getBriefDescription <em>Brief Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Brief Description</em>' attribute.
-	 * @see #getBriefDescription()
-	 * @generated
-	 */
-	void setBriefDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Constraint}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Owned Rules</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Owned Rules</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodElement_OwnedRules()
-	 * @model type="org.eclipse.epf.uma.Constraint" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getOwnedRules();
-
-	/**
-	 * Returns the value of the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.MethodElementProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Element Property</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Element Property</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodElement_MethodElementProperty()
-	 * @model type="org.eclipse.epf.uma.MethodElementProperty" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getMethodElementProperty();
-
-	/**
-	 * Returns the value of the '<em><b>Suppressed</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If a Variability Element is derived from another Variability Element using the Extends Variability Specialization then this attribute can be used to suppress inherited Method Elements that were part of the based-on Variability Element, which can be any type of Method Element.  In other words, if this attribute is set to true on a Method Element that has the same name than an inherited method element then it will not be regarded as inherited at all.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Suppressed</em>' attribute.
-	 * @see #setSuppressed(Boolean)
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodElement_Suppressed()
-	 * @model default="false"
-	 * @generated
-	 */
-	Boolean getSuppressed();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.MethodElement#getSuppressed <em>Suppressed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Suppressed</em>' attribute.
-	 * @see #getSuppressed()
-	 * @generated
-	 */
-	void setSuppressed(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Ordering Guide</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This attribute is used for CASE tool realizations of this model to contain information about layout and ordering of the method element and its parts.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ordering Guide</em>' attribute.
-	 * @see #setOrderingGuide(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodElement_OrderingGuide()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getOrderingGuide();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.MethodElement#getOrderingGuide <em>Ordering Guide</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ordering Guide</em>' attribute.
-	 * @see #getOrderingGuide()
-	 * @generated
-	 */
-	void setOrderingGuide(String value);
-
-} // MethodElement
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodElementProperty.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodElementProperty.java
deleted file mode 100755
index f26ad7a..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodElementProperty.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Element Property</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.MethodElementProperty#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getMethodElementProperty()
- * @model
- * @generated
- */
-public interface MethodElementProperty extends PackageableElement {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodElementProperty_Value()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.MethodElementProperty#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-} // MethodElementProperty
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodLibrary.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodLibrary.java
deleted file mode 100755
index c34f6c1..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodLibrary.java
+++ /dev/null
@@ -1,69 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Library</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Method Library is a physical container for Method Plugins and Method Configuration definitions.  All Method Elements are stored in a Method Library.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.MethodLibrary#getMethodPlugins <em>Method Plugins</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodLibrary#getPredefinedConfigurations <em>Predefined Configurations</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getMethodLibrary()
- * @model
- * @generated
- */
-public interface MethodLibrary extends MethodUnit, org.eclipse.epf.uma.Package {
-	/**
-	 * Returns the value of the '<em><b>Method Plugins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.MethodPlugin}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Plugins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Plugins</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodLibrary_MethodPlugins()
-	 * @model type="org.eclipse.epf.uma.MethodPlugin" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getMethodPlugins();
-
-	/**
-	 * Returns the value of the '<em><b>Predefined Configurations</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.MethodConfiguration}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Predefined Configurations</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Predefined Configurations</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodLibrary_PredefinedConfigurations()
-	 * @model type="org.eclipse.epf.uma.MethodConfiguration" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getPredefinedConfigurations();
-
-} // MethodLibrary
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodPackage.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodPackage.java
deleted file mode 100755
index 98e4d7c..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodPackage.java
+++ /dev/null
@@ -1,99 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Package</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Method Package is an abstract class for packaging Method Elements.  All Method Elements shall be located in exactly one of Method Package's concrete specializations (e.g. Content Package).   Method Package defines common properties for all of its specializations. Elements are organized in Method Packages to structure large scale of method content and processes as well as to define a mechanism for reuse.  Method Elements from one package can reuse element from other packages by defining a reusedPackages link.  For example, a work product defined in one package can be used as an input for Tasks defined in other packages.  By reusing it from one common place (i.e. the package in which it has been defined) ensures that no redundant definitions of the same elements are required.  Also maintenance of method content is greatly improved as changes can be performed in only one place.  Note, that other packages will introduce more specializations of Method Package, e.g. Process Package and Process Component.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.MethodPackage#getGlobal <em>Global</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodPackage#getReusedPackages <em>Reused Packages</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodPackage#getChildPackages <em>Child Packages</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getMethodPackage()
- * @model abstract="true"
- * @generated
- */
-public interface MethodPackage extends MethodElement,
-		org.eclipse.epf.uma.Package {
-	/**
-	 * Returns the value of the '<em><b>Global</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Method Packages can have a global scope.  This means that every element of every other Method Package can see the global package's contents.  Global Method Packages are primarily used to store commonly used category definitions such as for Disciplines or Domains, which are used by many Task and Work Products respectively.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Global</em>' attribute.
-	 * @see #setGlobal(Boolean)
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodPackage_Global()
-	 * @model default="false"
-	 * @generated
-	 */
-	Boolean getGlobal();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.MethodPackage#getGlobal <em>Global</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Global</em>' attribute.
-	 * @see #getGlobal()
-	 * @generated
-	 */
-	void setGlobal(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Reused Packages</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.MethodPackage}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Reused Packages</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Reused Packages</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodPackage_ReusedPackages()
-	 * @model type="org.eclipse.epf.uma.MethodPackage" ordered="false"
-	 * @generated
-	 */
-	List getReusedPackages();
-
-	/**
-	 * Returns the value of the '<em><b>Child Packages</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.MethodPackage}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Child Packages</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Child Packages</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodPackage_ChildPackages()
-	 * @model type="org.eclipse.epf.uma.MethodPackage" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getChildPackages();
-
-	MethodPackage getParentPackage();
-
-} // MethodPackage
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodPlugin.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodPlugin.java
deleted file mode 100755
index d23f6bc..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodPlugin.java
+++ /dev/null
@@ -1,99 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Plugin</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Method Plugin is a Method Element that represents a physical container for Method Packages.  It defines a granularity level for the modularization and organization of method content and processes.  A Method Plugin can extend many other Method Plugins and it can be extended by many Method Plugins.  It can also be used stand-alone, i.e. with no Extension relationship to other plug-ins.
- * Method Plugin conceptually represents a unit for configuration, modularization, extension, packaging, and deployment of method content and processes.  A Process Engineer shall design his Plugins and allocate his content to these Plugins with requirements for extensibility, modularity, reuse, and maintainability in mind.
- * Special extensibility mechanisms defined for the meta-classes Variability Element and Process Contribution allow Plugin content to directly contribute new content, replace existing content, or to cross-reference to any Content Element or Process within another Plugin that it extends.  Similar to UML 2.0's 'package merge' mechanism transformation interpretations, interpreting these Method Plugin mechanisms results into new extended Method Content and Processes.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.MethodPlugin#getUserChangeable <em>User Changeable</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodPlugin#getMethodPackages <em>Method Packages</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodPlugin#getBases <em>Bases</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getMethodPlugin()
- * @model
- * @generated
- */
-public interface MethodPlugin extends MethodUnit, org.eclipse.epf.uma.Package {
-	/**
-	 * Returns the value of the '<em><b>User Changeable</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>User Changeable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>User Changeable</em>' attribute.
-	 * @see #setUserChangeable(Boolean)
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodPlugin_UserChangeable()
-	 * @model default="true"
-	 * @generated
-	 */
-	Boolean getUserChangeable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.MethodPlugin#getUserChangeable <em>User Changeable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>User Changeable</em>' attribute.
-	 * @see #getUserChangeable()
-	 * @generated
-	 */
-	void setUserChangeable(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Method Packages</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.MethodPackage}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Packages</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Packages</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodPlugin_MethodPackages()
-	 * @model type="org.eclipse.epf.uma.MethodPackage" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getMethodPackages();
-
-	/**
-	 * Returns the value of the '<em><b>Bases</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.MethodPlugin}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Bases</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Bases</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodPlugin_Bases()
-	 * @model type="org.eclipse.epf.uma.MethodPlugin" ordered="false"
-	 * @generated
-	 */
-	List getBases();
-
-} // MethodPlugin
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodUnit.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodUnit.java
deleted file mode 100755
index f3a7cfa..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/MethodUnit.java
+++ /dev/null
@@ -1,165 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.Date;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Unit</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Method Unit is a special Method Element that shall be maintained in a Method Library as a separate unit of control.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.MethodUnit#getAuthors <em>Authors</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodUnit#getChangeDate <em>Change Date</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodUnit#getChangeDescription <em>Change Description</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodUnit#getVersion <em>Version</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.MethodUnit#getCopyrightStatement <em>Copyright Statement</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getMethodUnit()
- * @model abstract="true"
- * @generated
- */
-public interface MethodUnit extends MethodElement {
-	/**
-	 * Returns the value of the '<em><b>Authors</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Every Method Unit is being created and owned by an author or authoring team.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Authors</em>' attribute.
-	 * @see #setAuthors(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodUnit_Authors()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getAuthors();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.MethodUnit#getAuthors <em>Authors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Authors</em>' attribute.
-	 * @see #getAuthors()
-	 * @generated
-	 */
-	void setAuthors(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The date the last change that resulted into this version has been made.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Change Date</em>' attribute.
-	 * @see #setChangeDate(Date)
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodUnit_ChangeDate()
-	 * @model unique="false" dataType="org.eclipse.epf.uma.Date"
-	 * @generated
-	 */
-	Date getChangeDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.MethodUnit#getChangeDate <em>Change Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Change Date</em>' attribute.
-	 * @see #getChangeDate()
-	 * @generated
-	 */
-	void setChangeDate(Date value);
-
-	/**
-	 * Returns the value of the '<em><b>Change Description</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The description of the last change that resulted into this version.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Change Description</em>' attribute.
-	 * @see #setChangeDescription(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodUnit_ChangeDescription()
-	 * @model default="" unique="false" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getChangeDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.MethodUnit#getChangeDescription <em>Change Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Change Description</em>' attribute.
-	 * @see #getChangeDescription()
-	 * @generated
-	 */
-	void setChangeDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Every Package has a version number used to track changes.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #setVersion(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodUnit_Version()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getVersion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.MethodUnit#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #getVersion()
-	 * @generated
-	 */
-	void setVersion(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Copyright Statement</em>' reference.
-	 * @see #setCopyrightStatement(SupportingMaterial)
-	 * @see org.eclipse.epf.uma.UmaPackage#getMethodUnit_CopyrightStatement()
-	 * @model
-	 * @generated
-	 */
-	SupportingMaterial getCopyrightStatement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.MethodUnit#getCopyrightStatement <em>Copyright Statement</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Copyright Statement</em>' reference.
-	 * @see #getCopyrightStatement()
-	 * @generated
-	 */
-	void setCopyrightStatement(SupportingMaterial value);
-
-} // MethodUnit
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Milestone.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Milestone.java
deleted file mode 100755
index 50efa29..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Milestone.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Milestone</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Milestone describes a significant event in a development project, such as a major decision, completion of a deliverable, or meeting of a major dependency (like completion of a project phase).  Because, Milestone is commonly used to refer to both the event itself and the point in time at which the event is scheduled to happen, it is modeled as a Breakdown Element (i.e. it appears as part of a breakdown structure).
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getMilestone()
- * @model
- * @generated
- */
-public interface Milestone extends WorkBreakdownElement {
-} // Milestone
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/NamedElement.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/NamedElement.java
deleted file mode 100755
index 81e334c..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/NamedElement.java
+++ /dev/null
@@ -1,61 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Named Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * UML 2.0 meta-class Named Element.  Defined that every element has a name.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.NamedElement#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getNamedElement()
- * @model abstract="true"
- * @generated
- */
-public interface NamedElement extends Element {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getNamedElement_Name()
-	 * @model default="" unique="false" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.NamedElement#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // NamedElement
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Namespace.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Namespace.java
deleted file mode 100755
index 7ceaa26..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Namespace.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Namespace</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * UML 2.0 meta-class Namespace.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getNamespace()
- * @model abstract="true"
- * @generated
- */
-public interface Namespace extends NamedElement {
-} // Namespace
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Outcome.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Outcome.java
deleted file mode 100755
index 913596f..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Outcome.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Outcome</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An outcome describes intangible work products that are a result or state. Outcomes may also be used to describe work products that are not formally defined.  A key differentiator for outcomes against artifacts is that outcomes are not candidates for harvesting as reusable assets.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getOutcome()
- * @model
- * @generated
- */
-public interface Outcome extends WorkProduct {
-} // Outcome
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Package.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Package.java
deleted file mode 100755
index 374463d..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Package.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Package</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * UML 2.0 meta-class Package.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getPackage()
- * @model
- * @generated
- */
-public interface Package extends Namespace, PackageableElement {
-} // Package
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/PackageableElement.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/PackageableElement.java
deleted file mode 100755
index 4c947e5..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/PackageableElement.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Packageable Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * UML 2.0 meta-class Packagable Element.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getPackageableElement()
- * @model abstract="true"
- * @generated
- */
-public interface PackageableElement extends NamedElement {
-} // PackageableElement
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Phase.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Phase.java
deleted file mode 100755
index 38175eb..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Phase.java
+++ /dev/null
@@ -1,29 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Phase</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Phase is a special Activity, which prescribes pre-defined values for its instances for the attributes prefix ('Phase') and isRepeatable ('False').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.
- * Phase represent a significant period in a project, ending with major management checkpoint, milestone or set of Deliverables.  It is included in the model as a predefined special Activity, because of its significance in defining breakdowns.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getPhase()
- * @model
- * @generated
- */
-public interface Phase extends Activity {
-} // Phase
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/PlanningData.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/PlanningData.java
deleted file mode 100755
index e7ec58d..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/PlanningData.java
+++ /dev/null
@@ -1,115 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.Date;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Planning Data</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Planning Data is a Method Element that adds planning data to Breakdown Elements when it is used for a Process Planning Template.  For Delivery Processes and Capability Patterns this class can either not be instantiated or populated with default data.
- * Planning Data factors out specific optional data needed for representing planning templates.  This association allows to access planning data if it is stored for the Breakdown Element.
- * (NOTE, THE ATTRIBUTES FOR THIS CLASS ARE NOT COMPLETE, YET)
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.PlanningData#getStartDate <em>Start Date</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.PlanningData#getFinishDate <em>Finish Date</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.PlanningData#getRank <em>Rank</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getPlanningData()
- * @model
- * @generated
- */
-public interface PlanningData extends ProcessElement {
-	/**
-	 * Returns the value of the '<em><b>Start Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default start date for a planed Task.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Start Date</em>' attribute.
-	 * @see #setStartDate(Date)
-	 * @see org.eclipse.epf.uma.UmaPackage#getPlanningData_StartDate()
-	 * @model unique="false" dataType="org.eclipse.epf.uma.Date"
-	 * @generated
-	 */
-	Date getStartDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.PlanningData#getStartDate <em>Start Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start Date</em>' attribute.
-	 * @see #getStartDate()
-	 * @generated
-	 */
-	void setStartDate(Date value);
-
-	/**
-	 * Returns the value of the '<em><b>Finish Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default finish date for a planed Task.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Finish Date</em>' attribute.
-	 * @see #setFinishDate(Date)
-	 * @see org.eclipse.epf.uma.UmaPackage#getPlanningData_FinishDate()
-	 * @model unique="false" dataType="org.eclipse.epf.uma.Date"
-	 * @generated
-	 */
-	Date getFinishDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.PlanningData#getFinishDate <em>Finish Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Finish Date</em>' attribute.
-	 * @see #getFinishDate()
-	 * @generated
-	 */
-	void setFinishDate(Date value);
-
-	/**
-	 * Returns the value of the '<em><b>Rank</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default rank for a planed Task.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Rank</em>' attribute.
-	 * @see #setRank(int)
-	 * @see org.eclipse.epf.uma.UmaPackage#getPlanningData_Rank()
-	 * @model unique="false" dataType="org.eclipse.epf.uma.Integer"
-	 * @generated
-	 */
-	int getRank();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.PlanningData#getRank <em>Rank</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rank</em>' attribute.
-	 * @see #getRank()
-	 * @generated
-	 */
-	void setRank(int value);
-
-} // PlanningData
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Point.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Point.java
deleted file mode 100755
index af09264..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Point.java
+++ /dev/null
@@ -1,86 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import org.eclipse.epf.uma.ecore.IModelObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Point</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Point#getX <em>X</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Point#getY <em>Y</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getPoint()
- * @model
- * @extends IModelObject
- * @generated
- */
-public interface Point extends IModelObject {
-	/**
-	 * Returns the value of the '<em><b>X</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>X</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>X</em>' attribute.
-	 * @see #setX(Double)
-	 * @see org.eclipse.epf.uma.UmaPackage#getPoint_X()
-	 * @model
-	 * @generated
-	 */
-	Double getX();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Point#getX <em>X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>X</em>' attribute.
-	 * @see #getX()
-	 * @generated
-	 */
-	void setX(Double value);
-
-	/**
-	 * Returns the value of the '<em><b>Y</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Y</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Y</em>' attribute.
-	 * @see #setY(Double)
-	 * @see org.eclipse.epf.uma.UmaPackage#getPoint_Y()
-	 * @model
-	 * @generated
-	 */
-	Double getY();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Point#getY <em>Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Y</em>' attribute.
-	 * @see #getY()
-	 * @generated
-	 */
-	void setY(Double value);
-
-} // Point
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Polyline.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Polyline.java
deleted file mode 100755
index 7682819..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Polyline.java
+++ /dev/null
@@ -1,76 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Polyline</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Polyline#getClosed <em>Closed</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Polyline#getWaypoints <em>Waypoints</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getPolyline()
- * @model
- * @generated
- */
-public interface Polyline extends GraphicPrimitive {
-	/**
-	 * Returns the value of the '<em><b>Closed</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Closed</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Closed</em>' attribute.
-	 * @see #setClosed(Boolean)
-	 * @see org.eclipse.epf.uma.UmaPackage#getPolyline_Closed()
-	 * @model default="true"
-	 * @generated
-	 */
-	Boolean getClosed();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Polyline#getClosed <em>Closed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Closed</em>' attribute.
-	 * @see #getClosed()
-	 * @generated
-	 */
-	void setClosed(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Waypoints</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Point}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Waypoints</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Waypoints</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getPolyline_Waypoints()
-	 * @model type="org.eclipse.epf.uma.Point" containment="true" resolveProxies="true" lower="2" ordered="false"
-	 * @generated
-	 */
-	List getWaypoints();
-
-} // Polyline
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Practice.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Practice.java
deleted file mode 100755
index e8be486..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Practice.java
+++ /dev/null
@@ -1,86 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Practice</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Practice represents a proven way or strategy of doing work to achieve a goal that has a positive impact on work product or process quality.  Practices are defined orthogonal to methods and processes.  They could summarize aspects that impact many different parts of a method or specific processes.  Examples for practices would be "Manage Risks", "Continuously verify quality", "Architecture-centric and component-based development", etc.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Practice#getSubPractices <em>Sub Practices</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Practice#getContentReferences <em>Content References</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Practice#getActivityReferences <em>Activity References</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getPractice()
- * @model
- * @generated
- */
-public interface Practice extends Guidance {
-	/**
-	 * Returns the value of the '<em><b>Sub Practices</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Practice}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sub Practices</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sub Practices</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getPractice_SubPractices()
-	 * @model type="org.eclipse.epf.uma.Practice" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getSubPractices();
-
-	/**
-	 * Returns the value of the '<em><b>Content References</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.ContentElement}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Content References</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Content References</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getPractice_ContentReferences()
-	 * @model type="org.eclipse.epf.uma.ContentElement" ordered="false"
-	 * @generated
-	 */
-	List getContentReferences();
-
-	/**
-	 * Returns the value of the '<em><b>Activity References</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Activity}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Activity References</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Activity References</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getPractice_ActivityReferences()
-	 * @model type="org.eclipse.epf.uma.Activity" ordered="false"
-	 * @generated
-	 */
-	List getActivityReferences();
-
-} // Practice
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/PracticeDescription.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/PracticeDescription.java
deleted file mode 100755
index f3f6094..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/PracticeDescription.java
+++ /dev/null
@@ -1,191 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Practice Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.PracticeDescription#getAdditionalInfo <em>Additional Info</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.PracticeDescription#getProblem <em>Problem</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.PracticeDescription#getBackground <em>Background</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.PracticeDescription#getGoals <em>Goals</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.PracticeDescription#getApplication <em>Application</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.PracticeDescription#getLevelsOfAdoption <em>Levels Of Adoption</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getPracticeDescription()
- * @model
- * @generated
- */
-public interface PracticeDescription extends ContentDescription {
-	/**
-	 * Returns the value of the '<em><b>Additional Info</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Any additional Information not covered by the other attributes.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Additional Info</em>' attribute.
-	 * @see #setAdditionalInfo(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getPracticeDescription_AdditionalInfo()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getAdditionalInfo();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.PracticeDescription#getAdditionalInfo <em>Additional Info</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Additional Info</em>' attribute.
-	 * @see #getAdditionalInfo()
-	 * @generated
-	 */
-	void setAdditionalInfo(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Problem</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A description of the problem the Practice addresses.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Problem</em>' attribute.
-	 * @see #setProblem(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getPracticeDescription_Problem()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getProblem();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.PracticeDescription#getProblem <em>Problem</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Problem</em>' attribute.
-	 * @see #getProblem()
-	 * @generated
-	 */
-	void setProblem(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Background</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Elaboration on the background and the context in which the problem occurs and where the solution described by this Practice will fit in.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Background</em>' attribute.
-	 * @see #setBackground(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getPracticeDescription_Background()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getBackground();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.PracticeDescription#getBackground <em>Background</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Background</em>' attribute.
-	 * @see #getBackground()
-	 * @generated
-	 */
-	void setBackground(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Goals</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A summary of the overall goals to be addressed by the Practice.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Goals</em>' attribute.
-	 * @see #setGoals(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getPracticeDescription_Goals()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getGoals();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.PracticeDescription#getGoals <em>Goals</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Goals</em>' attribute.
-	 * @see #getGoals()
-	 * @generated
-	 */
-	void setGoals(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Application</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Describes how the Practice is being applied or introduced into the context described in background.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Application</em>' attribute.
-	 * @see #setApplication(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getPracticeDescription_Application()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getApplication();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.PracticeDescription#getApplication <em>Application</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Application</em>' attribute.
-	 * @see #getApplication()
-	 * @generated
-	 */
-	void setApplication(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Levels Of Adoption</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Outlines the different forms or variants in which the practice could be realized. (e.g. full adoption verus a partial adoption of the Practice)
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Levels Of Adoption</em>' attribute.
-	 * @see #setLevelsOfAdoption(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getPracticeDescription_LevelsOfAdoption()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getLevelsOfAdoption();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.PracticeDescription#getLevelsOfAdoption <em>Levels Of Adoption</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Levels Of Adoption</em>' attribute.
-	 * @see #getLevelsOfAdoption()
-	 * @generated
-	 */
-	void setLevelsOfAdoption(String value);
-
-} // PracticeDescription
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Process.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Process.java
deleted file mode 100755
index 1df6324..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Process.java
+++ /dev/null
@@ -1,97 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Process is a special Activity that describes a structure for particular types of development projects.  To perform such a development project a Processes would be 'instantiated' and adapted for the specific situation.  Process is an abstract class and this meta-model defines different special types of Processes for different process management applications and different situations of process reuse.  Every Process comprises of and is the top-level element of an n-level breakdown structure using the Nesting association defined on Activity.
- * Core Method Content provides step-by-step explanations, describing how very specific development goals are achieved independent of the placement of these steps within a development lifecycle.  Processes take these method elements and relate them into semi-ordered sequences that are customized to specific types of projects.  Thus, a process is a set of partially ordered work descriptions intended to reach a higher development goal, such as the release of a specific software system.  A process and the process meta-model structure defined in this specification focuses on the lifecycle and the sequencing of work in breakdown structures.  To achieve this it uses the Descriptor concept referencing method content and allowing defining time-specific customizations of the referenced content (e.g. defining a focus on different steps of the same Task and providing input Work Products in different states within the different Phases of a process lifecycle in which the same Task is performed).
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Process#getIncludesPatterns <em>Includes Patterns</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Process#getDefaultContext <em>Default Context</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Process#getValidContext <em>Valid Context</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getProcess()
- * @model abstract="true"
- * @generated
- */
-public interface Process extends Activity {
-	/**
-	 * Returns the value of the '<em><b>Includes Patterns</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.CapabilityPattern}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Includes Patterns</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Includes Patterns</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getProcess_IncludesPatterns()
-	 * @model type="org.eclipse.epf.uma.CapabilityPattern" ordered="false"
-	 * @generated
-	 */
-	List getIncludesPatterns();
-
-	/**
-	 * Returns the value of the '<em><b>Default Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Context</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default Context</em>' reference.
-	 * @see #setDefaultContext(MethodConfiguration)
-	 * @see org.eclipse.epf.uma.UmaPackage#getProcess_DefaultContext()
-	 * @model required="true"
-	 * @generated
-	 */
-	MethodConfiguration getDefaultContext();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Process#getDefaultContext <em>Default Context</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Context</em>' reference.
-	 * @see #getDefaultContext()
-	 * @generated
-	 */
-	void setDefaultContext(MethodConfiguration value);
-
-	/**
-	 * Returns the value of the '<em><b>Valid Context</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.MethodConfiguration}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Valid Context</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Valid Context</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getProcess_ValidContext()
-	 * @model type="org.eclipse.epf.uma.MethodConfiguration" ordered="false"
-	 * @generated
-	 */
-	List getValidContext();
-
-} // Process
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessComponent.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessComponent.java
deleted file mode 100755
index 57470d4..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessComponent.java
+++ /dev/null
@@ -1,80 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process Component</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Process Component is a special Process Package that applies the principles of encapsulation.  A Process Component realizes one or more Interfaces which specify inputs and outputs of the component. There might be many components realizing the same interfaces, but using different techniques to achieve similar outputs for similar inputs.  Whereas the Component Interfaces represent component specifications (black box descriptions of the component), good candidates for component realizations can be found in Capability Patterns (white box descriptions for the component).
- * UMA supports replaceable and reusable Process Components realizing the principles of encapsulation. Certain situations in a software development project might require that concrete realizations of parts of the process remain undecided or will be decided by the executing team itself (e.g. in outsourcing situations).  UMA provides a unique component concept defining interfaces for work product input and output, allowing treating the actual definition of the work that produces the outputs as a "black box".  At any point during a project the component "realization" detailing the work can be added to the process.  The component approach also allows that different styles or techniques of doing work can be replaced with one another.  For example, a software code output of a component could be produced with a model-driven development or a code-centric technique.  The component concept encapsulates the actual work and lets the development team choose the appropriate technique and fill the component's realization with their choice of Activities that produce the required outputs.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.ProcessComponent#getInterfaces <em>Interfaces</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.ProcessComponent#getProcess <em>Process</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getProcessComponent()
- * @model
- * @generated
- */
-public interface ProcessComponent extends ProcessPackage, MethodUnit {
-	/**
-	 * Returns the value of the '<em><b>Interfaces</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.ProcessComponentInterface}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Interfaces</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interfaces</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getProcessComponent_Interfaces()
-	 * @model type="org.eclipse.epf.uma.ProcessComponentInterface" ordered="false"
-	 * @generated
-	 */
-	List getInterfaces();
-
-	/**
-	 * Returns the value of the '<em><b>Process</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Process</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Process</em>' containment reference.
-	 * @see #setProcess(org.eclipse.epf.uma.Process)
-	 * @see org.eclipse.epf.uma.UmaPackage#getProcessComponent_Process()
-	 * @model containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
-	org.eclipse.epf.uma.Process getProcess();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.ProcessComponent#getProcess <em>Process</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Process</em>' containment reference.
-	 * @see #getProcess()
-	 * @generated
-	 */
-	void setProcess(org.eclipse.epf.uma.Process value);
-
-} // ProcessComponent
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessComponentDescriptor.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessComponentDescriptor.java
deleted file mode 100755
index c5481c1..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessComponentDescriptor.java
+++ /dev/null
@@ -1,60 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process Component Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Process Component Descriptor represents a Process Component application in a Process, i.e. the breakdown structure defining the Process.  The Process Component Descriptor is used to encapsulate the details of the component in a breakdown structure and to provide its own set of relationships such as it own predecessors and successors.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.ProcessComponentDescriptor#getProcessComponent <em>Process Component</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getProcessComponentDescriptor()
- * @model
- * @generated
- */
-public interface ProcessComponentDescriptor extends Descriptor {
-	/**
-	 * Returns the value of the '<em><b>Process Component</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Process Component</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Process Component</em>' reference.
-	 * @see #setProcessComponent(ProcessComponent)
-	 * @see org.eclipse.epf.uma.UmaPackage#getProcessComponentDescriptor_ProcessComponent()
-	 * @model required="true"
-	 * @generated
-	 */
-	ProcessComponent getProcessComponent();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.ProcessComponentDescriptor#getProcessComponent <em>Process Component</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Process Component</em>' reference.
-	 * @see #getProcessComponent()
-	 * @generated
-	 */
-	void setProcessComponent(ProcessComponent value);
-
-} // ProcessComponentDescriptor
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessComponentInterface.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessComponentInterface.java
deleted file mode 100755
index eb9e672..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessComponentInterface.java
+++ /dev/null
@@ -1,69 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process Component Interface</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Process Component Interface comprises of a list of interface specifications (similar to operation declarations) that express inputs and outputs for a process component.  These interface specifications are expressed using Task Descriptors which are not linked to Tasks that are related to Work Product Descriptors as well as optional a Role Descriptor.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.ProcessComponentInterface#getInterfaceSpecifications <em>Interface Specifications</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.ProcessComponentInterface#getInterfaceIO <em>Interface IO</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getProcessComponentInterface()
- * @model
- * @generated
- */
-public interface ProcessComponentInterface extends BreakdownElement {
-	/**
-	 * Returns the value of the '<em><b>Interface Specifications</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.TaskDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Interface Specifications</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interface Specifications</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getProcessComponentInterface_InterfaceSpecifications()
-	 * @model type="org.eclipse.epf.uma.TaskDescriptor" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getInterfaceSpecifications();
-
-	/**
-	 * Returns the value of the '<em><b>Interface IO</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProductDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Interface IO</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interface IO</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getProcessComponentInterface_InterfaceIO()
-	 * @model type="org.eclipse.epf.uma.WorkProductDescriptor" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getInterfaceIO();
-
-} // ProcessComponentInterface
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessDescription.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessDescription.java
deleted file mode 100755
index 921b5b2..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessDescription.java
+++ /dev/null
@@ -1,110 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.ProcessDescription#getExternalId <em>External Id</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.ProcessDescription#getScope <em>Scope</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.ProcessDescription#getUsageNotes <em>Usage Notes</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getProcessDescription()
- * @model
- * @generated
- */
-public interface ProcessDescription extends ActivityDescription {
-	/**
-	 * Returns the value of the '<em><b>External Id</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * An external visible number that is used to reference this delivery patterns and models. It is used like a synonym.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>External Id</em>' attribute.
-	 * @see #setExternalId(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getProcessDescription_ExternalId()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getExternalId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.ProcessDescription#getExternalId <em>External Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>External Id</em>' attribute.
-	 * @see #getExternalId()
-	 * @generated
-	 */
-	void setExternalId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Scope</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the scope of the Process, i.e. which types of projects does it address and which not.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Scope</em>' attribute.
-	 * @see #setScope(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getProcessDescription_Scope()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getScope();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.ProcessDescription#getScope <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scope</em>' attribute.
-	 * @see #getScope()
-	 * @generated
-	 */
-	void setScope(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Usage Notes</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Any additional notes on how to apply and instantiate this process for a project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Usage Notes</em>' attribute.
-	 * @see #setUsageNotes(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getProcessDescription_UsageNotes()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getUsageNotes();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.ProcessDescription#getUsageNotes <em>Usage Notes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Usage Notes</em>' attribute.
-	 * @see #getUsageNotes()
-	 * @generated
-	 */
-	void setUsageNotes(String value);
-
-} // ProcessDescription
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessElement.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessElement.java
deleted file mode 100755
index 07d33b4..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessElement.java
+++ /dev/null
@@ -1,29 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Process Element is a Describable Element that represents an abstract generalization for all elements defined in the Process package.
- * Process Elements represents Process specific elements that are supposed to be managed in Process Packages.  The separation of Process Element from Content Element allows to clearly distinguish between pure method content from content that is represented in processes. 
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getProcessElement()
- * @model abstract="true"
- * @generated
- */
-public interface ProcessElement extends DescribableElement {
-} // ProcessElement
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessFamily.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessFamily.java
deleted file mode 100755
index e0f1989..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessFamily.java
+++ /dev/null
@@ -1,52 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process Family</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Delivery Model Family is a convenient grouping of Delivery Processes and Capability Patterns of interest to some specific user community.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.ProcessFamily#getDeliveryProcesses <em>Delivery Processes</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getProcessFamily()
- * @model
- * @generated
- */
-public interface ProcessFamily extends MethodConfiguration {
-	/**
-	 * Returns the value of the '<em><b>Delivery Processes</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.DeliveryProcess}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Delivery Processes</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Delivery Processes</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getProcessFamily_DeliveryProcesses()
-	 * @model type="org.eclipse.epf.uma.DeliveryProcess" ordered="false"
-	 * @generated
-	 */
-	List getDeliveryProcesses();
-
-} // ProcessFamily
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessPackage.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessPackage.java
deleted file mode 100755
index 463fb5f..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessPackage.java
+++ /dev/null
@@ -1,70 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process Package</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Process Package is a special Method Package that contains Process Elements, only.
- * A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.ProcessPackage#getProcessElements <em>Process Elements</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.ProcessPackage#getDiagrams <em>Diagrams</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getProcessPackage()
- * @model
- * @generated
- */
-public interface ProcessPackage extends MethodPackage {
-	/**
-	 * Returns the value of the '<em><b>Process Elements</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.ProcessElement}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Process Elements</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Process Elements</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getProcessPackage_ProcessElements()
-	 * @model type="org.eclipse.epf.uma.ProcessElement" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getProcessElements();
-
-	/**
-	 * Returns the value of the '<em><b>Diagrams</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Diagram}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Diagrams</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Diagrams</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getProcessPackage_Diagrams()
-	 * @model type="org.eclipse.epf.uma.Diagram" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getDiagrams();
-
-} // ProcessPackage
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessPlanningTemplate.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessPlanningTemplate.java
deleted file mode 100755
index 91f428f..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ProcessPlanningTemplate.java
+++ /dev/null
@@ -1,53 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process Planning Template</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Process Planning Template is a special Process that is prepared for instantiation by a project planning tool.  Typically, it is created based on a Process such as a Delivery Process as a whole (e.g. in case of a waterfall-based development approach) or in parts (e.g. in case of an iterative development approach).
- * A Process Planning Template represents a partially finished plan for a concrete project.  It uses the same information structures as all other Process Types to represent templates for project plans.  However, certain planning decisions have already been applied to the template as well as information has been removed and/or reformatted to be ready for export to a specific planning tool.  Examples for such decisions are: a template has been created to represent a plan for a particular Iteration in an iterative development project, which fr example distinguishes early from late iterations in the Elaboration phase of a project; if the targeted planning tool cannot represent input and output of Task, then these have been removed from the structure; certain repetitions have been already applied, e.g. stating that a cycle of specific Task grouped in an Activity have to be repeated n-times; etc.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.ProcessPlanningTemplate#getBasedOnProcesses <em>Based On Processes</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getProcessPlanningTemplate()
- * @model
- * @generated
- */
-public interface ProcessPlanningTemplate extends org.eclipse.epf.uma.Process {
-	/**
-	 * Returns the value of the '<em><b>Based On Processes</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Process}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Based On Processes</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Based On Processes</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getProcessPlanningTemplate_BasedOnProcesses()
-	 * @model type="org.eclipse.epf.uma.Process" ordered="false"
-	 * @generated
-	 */
-	List getBasedOnProcesses();
-
-} // ProcessPlanningTemplate
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Property.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Property.java
deleted file mode 100755
index 79271f4..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Property.java
+++ /dev/null
@@ -1,85 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Property</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Property#getKey <em>Key</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Property#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getProperty()
- * @model
- * @generated
- */
-public interface Property extends DiagramElement {
-	/**
-	 * Returns the value of the '<em><b>Key</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Key</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Key</em>' attribute.
-	 * @see #setKey(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getProperty_Key()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getKey();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Property#getKey <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Key</em>' attribute.
-	 * @see #getKey()
-	 * @generated
-	 */
-	void setKey(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getProperty_Value()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Property#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-} // Property
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/PseudoState.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/PseudoState.java
deleted file mode 100755
index e314dd6..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/PseudoState.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PseudoState.java,v 1.3 2006/07/24 23:34:09 bxu Exp $
- */
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Pseudo State</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getPseudoState()
- * @model
- * @generated
- */
-public interface PseudoState extends Vertex {
-} // PseudoState
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/PseudoStateKind.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/PseudoStateKind.java
deleted file mode 100755
index 83e8243..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/PseudoStateKind.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PseudoStateKind.java,v 1.3 2006/07/24 23:34:08 bxu Exp $
- */
-package org.eclipse.epf.uma;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Pseudo State Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.uma.UmaPackage#getPseudoStateKind()
- * @model
- * @generated
- */
-public final class PseudoStateKind extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Initial</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Initial</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INITIAL_LITERAL
-	 * @model name="initial"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INITIAL = 0;
-
-	/**
-	 * The '<em><b>Join</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Join</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JOIN_LITERAL
-	 * @model name="join"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JOIN = 1;
-
-	/**
-	 * The '<em><b>Fork</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Fork</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FORK_LITERAL
-	 * @model name="fork"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FORK = 2;
-
-	/**
-	 * The '<em><b>Junction</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Junction</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JUNCTION_LITERAL
-	 * @model name="junction"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JUNCTION = 3;
-
-	/**
-	 * The '<em><b>Choice</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Choice</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CHOICE_LITERAL
-	 * @model name="choice"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CHOICE = 4;
-
-	/**
-	 * The '<em><b>Entry Point</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Entry Point</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ENTRY_POINT_LITERAL
-	 * @model name="entryPoint"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ENTRY_POINT = 5;
-
-	/**
-	 * The '<em><b>Exit Point</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Exit Point</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EXIT_POINT_LITERAL
-	 * @model name="exitPoint"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EXIT_POINT = 6;
-
-	/**
-	 * The '<em><b>Terminate</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Terminate</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TERMINATE_LITERAL
-	 * @model name="terminate"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TERMINATE = 7;
-
-	/**
-	 * The '<em><b>Initial</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INITIAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final PseudoStateKind INITIAL_LITERAL = new PseudoStateKind(
-			INITIAL, "initial", "initial"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Join</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JOIN
-	 * @generated
-	 * @ordered
-	 */
-	public static final PseudoStateKind JOIN_LITERAL = new PseudoStateKind(
-			JOIN, "join", "join"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Fork</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FORK
-	 * @generated
-	 * @ordered
-	 */
-	public static final PseudoStateKind FORK_LITERAL = new PseudoStateKind(
-			FORK, "fork", "fork"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Junction</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JUNCTION
-	 * @generated
-	 * @ordered
-	 */
-	public static final PseudoStateKind JUNCTION_LITERAL = new PseudoStateKind(
-			JUNCTION, "junction", "junction"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Choice</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CHOICE
-	 * @generated
-	 * @ordered
-	 */
-	public static final PseudoStateKind CHOICE_LITERAL = new PseudoStateKind(
-			CHOICE, "choice", "choice"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Entry Point</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ENTRY_POINT
-	 * @generated
-	 * @ordered
-	 */
-	public static final PseudoStateKind ENTRY_POINT_LITERAL = new PseudoStateKind(
-			ENTRY_POINT, "entryPoint", "entryPoint"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Exit Point</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EXIT_POINT
-	 * @generated
-	 * @ordered
-	 */
-	public static final PseudoStateKind EXIT_POINT_LITERAL = new PseudoStateKind(
-			EXIT_POINT, "exitPoint", "exitPoint"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Terminate</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TERMINATE
-	 * @generated
-	 * @ordered
-	 */
-	public static final PseudoStateKind TERMINATE_LITERAL = new PseudoStateKind(
-			TERMINATE, "terminate", "terminate"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Pseudo State Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final PseudoStateKind[] VALUES_ARRAY = new PseudoStateKind[] {
-			INITIAL_LITERAL, JOIN_LITERAL, FORK_LITERAL, JUNCTION_LITERAL,
-			CHOICE_LITERAL, ENTRY_POINT_LITERAL, EXIT_POINT_LITERAL,
-			TERMINATE_LITERAL, };
-
-	/**
-	 * A public read-only list of all the '<em><b>Pseudo State Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays
-			.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Pseudo State Kind</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PseudoStateKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			PseudoStateKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Pseudo State Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PseudoStateKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			PseudoStateKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Pseudo State Kind</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PseudoStateKind get(int value) {
-		switch (value) {
-		case INITIAL:
-			return INITIAL_LITERAL;
-		case JOIN:
-			return JOIN_LITERAL;
-		case FORK:
-			return FORK_LITERAL;
-		case JUNCTION:
-			return JUNCTION_LITERAL;
-		case CHOICE:
-			return CHOICE_LITERAL;
-		case ENTRY_POINT:
-			return ENTRY_POINT_LITERAL;
-		case EXIT_POINT:
-			return EXIT_POINT_LITERAL;
-		case TERMINATE:
-			return TERMINATE_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private PseudoStateKind(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //PseudoStateKind
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Reference.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Reference.java
deleted file mode 100755
index ad05a39..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Reference.java
+++ /dev/null
@@ -1,85 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Reference</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Reference#getIsIndividualRepresentation <em>Is Individual Representation</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Reference#getReferenced <em>Referenced</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getReference()
- * @model
- * @generated
- */
-public interface Reference extends DiagramElement {
-	/**
-	 * Returns the value of the '<em><b>Is Individual Representation</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Is Individual Representation</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Is Individual Representation</em>' attribute.
-	 * @see #setIsIndividualRepresentation(Boolean)
-	 * @see org.eclipse.epf.uma.UmaPackage#getReference_IsIndividualRepresentation()
-	 * @model
-	 * @generated
-	 */
-	Boolean getIsIndividualRepresentation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Reference#getIsIndividualRepresentation <em>Is Individual Representation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Individual Representation</em>' attribute.
-	 * @see #getIsIndividualRepresentation()
-	 * @generated
-	 */
-	void setIsIndividualRepresentation(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Referenced</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.DiagramElement#getReference <em>Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Referenced</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Referenced</em>' reference.
-	 * @see #setReferenced(DiagramElement)
-	 * @see org.eclipse.epf.uma.UmaPackage#getReference_Referenced()
-	 * @see org.eclipse.epf.uma.DiagramElement#getReference
-	 * @model opposite="reference" required="true"
-	 * @generated
-	 */
-	DiagramElement getReferenced();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Reference#getReferenced <em>Referenced</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Referenced</em>' reference.
-	 * @see #getReferenced()
-	 * @generated
-	 */
-	void setReferenced(DiagramElement value);
-
-} // Reference
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Region.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Region.java
deleted file mode 100755
index 93d6f7e..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Region.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Region.java,v 1.4 2006/07/24 23:34:09 bxu Exp $
- */
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-import org.eclipse.epf.uma.ecore.IModelObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Region</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Region#getVertex <em>Vertex</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Region#getTransition <em>Transition</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Region#getState <em>State</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Region#getStateMachine <em>State Machine</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getRegion()
- * @model
- * @extends IModelObject
- * @generated
- */
-public interface Region extends IModelObject {
-	/**
-	 * Returns the value of the '<em><b>Vertex</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Vertex}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Vertex#getContainer_ <em>Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Vertex</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Vertex</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getRegion_Vertex()
-	 * @see org.eclipse.epf.uma.Vertex#getContainer_
-	 * @model type="org.eclipse.epf.uma.Vertex" opposite="container" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getVertex();
-
-	/**
-	 * Returns the value of the '<em><b>Transition</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Transition}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Transition#getContainer_ <em>Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Transition</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Transition</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getRegion_Transition()
-	 * @see org.eclipse.epf.uma.Transition#getContainer_
-	 * @model type="org.eclipse.epf.uma.Transition" opposite="container" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getTransition();
-
-	/**
-	 * Returns the value of the '<em><b>State</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.State#getRegion <em>Region</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>State</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>State</em>' container reference.
-	 * @see #setState(State)
-	 * @see org.eclipse.epf.uma.UmaPackage#getRegion_State()
-	 * @see org.eclipse.epf.uma.State#getRegion
-	 * @model opposite="Region"
-	 * @generated
-	 */
-	State getState();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Region#getState <em>State</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>State</em>' container reference.
-	 * @see #getState()
-	 * @generated
-	 */
-	void setState(State value);
-
-	/**
-	 * Returns the value of the '<em><b>State Machine</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.StateMachine#getRegion <em>Region</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>State Machine</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>State Machine</em>' container reference.
-	 * @see #setStateMachine(StateMachine)
-	 * @see org.eclipse.epf.uma.UmaPackage#getRegion_StateMachine()
-	 * @see org.eclipse.epf.uma.StateMachine#getRegion
-	 * @model opposite="Region"
-	 * @generated
-	 */
-	StateMachine getStateMachine();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Region#getStateMachine <em>State Machine</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>State Machine</em>' container reference.
-	 * @see #getStateMachine()
-	 * @generated
-	 */
-	void setStateMachine(StateMachine value);
-
-} // Region
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Report.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Report.java
deleted file mode 100755
index 8887d44..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Report.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Report</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Report is a predefined template of a result that is generated on the basis of other work products as an output from some form of tool automation. An example for a report would be a use case model survey, which is generated by extracting diagram information from a graphical model and textual information from documents and combines these two types of information into a report.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getReport()
- * @model
- * @generated
- */
-public interface Report extends Guidance {
-} // Report
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ReusableAsset.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ReusableAsset.java
deleted file mode 100755
index 308b646..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ReusableAsset.java
+++ /dev/null
@@ -1,29 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Reusable Asset</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Reusable Asset provides a solution to a problem for a given context. The asset may have a variability point, which is a location in the asset that may have a value provided or customized by the asset consumer. The asset has rules for usage which are the instructions describing
- * how the asset should be used.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getReusableAsset()
- * @model
- * @generated
- */
-public interface ReusableAsset extends Guidance {
-} // ReusableAsset
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Roadmap.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Roadmap.java
deleted file mode 100755
index 2ce9b47..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Roadmap.java
+++ /dev/null
@@ -1,29 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Roadmap</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Roadmap is a special Guidance Type which is only related to Activates and therefore has been added by this package to the list of Guidance Types rather than listed in the Guidance Types package.  A Roadmap represents a linear walkthrough of an Activity, typically a Process.
- * An instance of a Roadmap represents important documentation for the Activity or Process it is related to.  Often a complex Activity such as a Process can be much easier understood by providing a walkthrough with a linear thread of a typical instantiation of this Activity.  In addition to making the process practitioner understand how work in the process is being performed, a Roadmap provides additional information about how Activities and Tasks relate to each other over time.  Roadmaps are also used to show how specific aspects are distributed over a whole process providing a kind of filter on the process for this information.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getRoadmap()
- * @model
- * @generated
- */
-public interface Roadmap extends Guidance {
-} // Roadmap
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Role.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Role.java
deleted file mode 100755
index a157766..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Role.java
+++ /dev/null
@@ -1,70 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Role</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Role is a content element that defines a set of related skills, competencies, and responsibilities.  Roles are used by Tasks to define who performs them as well as define a set of work products they are responsible for.  
- * A Role defines a set of related skills, competencies, and responsibilities of an individual or a set of individuals.  Roles are not individuals or resources.  Individual members of the development organization will wear different hats, or perform different roles. The mapping from individual to role, performed by the project manager when planning and staffing for a project, allows different individuals to act as several different roles, and for a role to be played by several individuals.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Role#getModifies <em>Modifies</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Role#getResponsibleFor <em>Responsible For</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getRole()
- * @model
- * @generated
- */
-public interface Role extends ContentElement {
-	/**
-	 * Returns the value of the '<em><b>Modifies</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProduct}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Modifies</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Modifies</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getRole_Modifies()
-	 * @model type="org.eclipse.epf.uma.WorkProduct" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
-	 * @generated
-	 */
-	List getModifies();
-
-	/**
-	 * Returns the value of the '<em><b>Responsible For</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProduct}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Responsible For</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Responsible For</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getRole_ResponsibleFor()
-	 * @model type="org.eclipse.epf.uma.WorkProduct" ordered="false"
-	 * @generated
-	 */
-	List getResponsibleFor();
-
-} // Role
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/RoleDescription.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/RoleDescription.java
deleted file mode 100755
index e6f9b3c..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/RoleDescription.java
+++ /dev/null
@@ -1,110 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Role Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.RoleDescription#getSkills <em>Skills</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.RoleDescription#getAssignmentApproaches <em>Assignment Approaches</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.RoleDescription#getSynonyms <em>Synonyms</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getRoleDescription()
- * @model
- * @generated
- */
-public interface RoleDescription extends ContentDescription {
-	/**
-	 * Returns the value of the '<em><b>Skills</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Lists of set of required skills a person needs to possess to fulfill that Role.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Skills</em>' attribute.
-	 * @see #setSkills(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getRoleDescription_Skills()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getSkills();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.RoleDescription#getSkills <em>Skills</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Skills</em>' attribute.
-	 * @see #getSkills()
-	 * @generated
-	 */
-	void setSkills(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Assignment Approaches</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides guidance on for assigning individuals to the Role in terms of what other roles these individuals could perform and what responsibility different individuals assigned to this role might have.  The guidance can also describe different assignment approaches for different types of projects, e.g. for large versus small teams where individuals could be allocated to roles full time versus sharing roles within the team.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Assignment Approaches</em>' attribute.
-	 * @see #setAssignmentApproaches(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getRoleDescription_AssignmentApproaches()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getAssignmentApproaches();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.RoleDescription#getAssignmentApproaches <em>Assignment Approaches</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Assignment Approaches</em>' attribute.
-	 * @see #getAssignmentApproaches()
-	 * @generated
-	 */
-	void setAssignmentApproaches(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Synonyms</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Lists synonyms, i.e. other names the Role might be referred by.  Tool support for the meta-model might support that a Role name can be consistently be replaced with one of its synonyms throught a Process.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Synonyms</em>' attribute.
-	 * @see #setSynonyms(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getRoleDescription_Synonyms()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getSynonyms();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.RoleDescription#getSynonyms <em>Synonyms</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Synonyms</em>' attribute.
-	 * @see #getSynonyms()
-	 * @generated
-	 */
-	void setSynonyms(String value);
-
-} // RoleDescription
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/RoleDescriptor.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/RoleDescriptor.java
deleted file mode 100755
index bb8294f..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/RoleDescriptor.java
+++ /dev/null
@@ -1,96 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Role Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Role Descriptor represents a Role in the context of one specific Activity.  Every breakdown structure can define different relationships of Role Descriptors to Task Descriptors and Work Product Descriptors.  Therefore one Role can be represented by many Role Descriptors each within the context of an Activity with its own set of relationships.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.RoleDescriptor#getRole <em>Role</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.RoleDescriptor#getModifies <em>Modifies</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.RoleDescriptor#getResponsibleFor <em>Responsible For</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getRoleDescriptor()
- * @model
- * @generated
- */
-public interface RoleDescriptor extends Descriptor {
-	/**
-	 * Returns the value of the '<em><b>Role</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Role</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Role</em>' reference.
-	 * @see #setRole(Role)
-	 * @see org.eclipse.epf.uma.UmaPackage#getRoleDescriptor_Role()
-	 * @model
-	 * @generated
-	 */
-	Role getRole();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.RoleDescriptor#getRole <em>Role</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Role</em>' reference.
-	 * @see #getRole()
-	 * @generated
-	 */
-	void setRole(Role value);
-
-	/**
-	 * Returns the value of the '<em><b>Modifies</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProductDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Modifies</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Modifies</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getRoleDescriptor_Modifies()
-	 * @model type="org.eclipse.epf.uma.WorkProductDescriptor" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
-	 * @generated
-	 */
-	List getModifies();
-
-	/**
-	 * Returns the value of the '<em><b>Responsible For</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProductDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Responsible For</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Responsible For</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getRoleDescriptor_ResponsibleFor()
-	 * @model type="org.eclipse.epf.uma.WorkProductDescriptor" ordered="false"
-	 * @generated
-	 */
-	List getResponsibleFor();
-
-} // RoleDescriptor
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/RoleSet.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/RoleSet.java
deleted file mode 100755
index 6e6a94a..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/RoleSet.java
+++ /dev/null
@@ -1,52 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Role Set</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Role Set organizes Roles into categories.  It is used to group roles together that have certain commonalities.  For example, the "Analysts" Role Set could group the "Business Process Analyst", "System Analyst", as well as "Requirements Specifier" roles.  All of these work with similar techniques and have overlapping skills, but are required as distinct roles for a method (e.g. the method the IBM Rational Unified Process is based on).
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.RoleSet#getRoles <em>Roles</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getRoleSet()
- * @model
- * @generated
- */
-public interface RoleSet extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Roles</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Role}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Roles</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Roles</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getRoleSet_Roles()
-	 * @model type="org.eclipse.epf.uma.Role" ordered="false"
-	 * @generated
-	 */
-	List getRoles();
-
-} // RoleSet
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/RoleSetGrouping.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/RoleSetGrouping.java
deleted file mode 100755
index cfe29a6..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/RoleSetGrouping.java
+++ /dev/null
@@ -1,52 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Role Set Grouping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Role Sets can be categorized into Role Set Groupings.  For example, different methods might define similar Role Sets, which however need to be distinguished from each other on a global scale.  Thus, Role Set Groupings allow distinguishing, for example, Software Services Manager Role Sets from Software Development Organization Manager Role Sets.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.RoleSetGrouping#getRoleSets <em>Role Sets</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getRoleSetGrouping()
- * @model
- * @generated
- */
-public interface RoleSetGrouping extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Role Sets</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.RoleSet}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Role Sets</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Role Sets</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getRoleSetGrouping_RoleSets()
-	 * @model type="org.eclipse.epf.uma.RoleSet" ordered="false"
-	 * @generated
-	 */
-	List getRoleSets();
-
-} // RoleSetGrouping
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Section.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Section.java
deleted file mode 100755
index ee7cb42..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Section.java
+++ /dev/null
@@ -1,133 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Section</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Section is a special Method Element that represents structural subsections of a Content Description's sectionDescription attribute.  It is used for either large scale documentation of Content Elements organized into sections as well as to flexibly add new Sections to Content Elements using contribution variability added to the Section concept for Method Plug-ins.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Section#getSectionName <em>Section Name</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Section#getSectionDescription <em>Section Description</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Section#getSubSections <em>Sub Sections</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Section#getPredecessor <em>Predecessor</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getSection()
- * @model
- * @generated
- */
-public interface Section extends VariabilityElement {
-	/**
-	 * Returns the value of the '<em><b>Section Name</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Every Section has a name used for external presentation of the section, e.g. when published or when section heading are listed in a table of contents.  This attribute is similar to Presentation Name for Content Elements.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Section Name</em>' attribute.
-	 * @see #setSectionName(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getSection_SectionName()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getSectionName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Section#getSectionName <em>Section Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Section Name</em>' attribute.
-	 * @see #getSectionName()
-	 * @generated
-	 */
-	void setSectionName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Section Description</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This attributes store the description text for a Content Description's Section.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Section Description</em>' attribute.
-	 * @see #setSectionDescription(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getSection_SectionDescription()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getSectionDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Section#getSectionDescription <em>Section Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Section Description</em>' attribute.
-	 * @see #getSectionDescription()
-	 * @generated
-	 */
-	void setSectionDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Sub Sections</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Section}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sub Sections</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sub Sections</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getSection_SubSections()
-	 * @model type="org.eclipse.epf.uma.Section" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getSubSections();
-
-	/**
-	 * Returns the value of the '<em><b>Predecessor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Predecessor</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Predecessor</em>' reference.
-	 * @see #setPredecessor(Section)
-	 * @see org.eclipse.epf.uma.UmaPackage#getSection_Predecessor()
-	 * @model
-	 * @generated
-	 */
-	Section getPredecessor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Section#getPredecessor <em>Predecessor</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Predecessor</em>' reference.
-	 * @see #getPredecessor()
-	 * @generated
-	 */
-	void setPredecessor(Section value);
-
-} // Section
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/SemanticModelBridge.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/SemanticModelBridge.java
deleted file mode 100755
index 04160e6..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/SemanticModelBridge.java
+++ /dev/null
@@ -1,115 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Semantic Model Bridge</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.SemanticModelBridge#getPresentation <em>Presentation</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.SemanticModelBridge#getGraphElement <em>Graph Element</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.SemanticModelBridge#getDiagram <em>Diagram</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getSemanticModelBridge()
- * @model abstract="true"
- * @generated
- */
-public interface SemanticModelBridge extends DiagramElement {
-	/**
-	 * Returns the value of the '<em><b>Presentation</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Presentation</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Presentation</em>' attribute.
-	 * @see #setPresentation(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getSemanticModelBridge_Presentation()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getPresentation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.SemanticModelBridge#getPresentation <em>Presentation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Presentation</em>' attribute.
-	 * @see #getPresentation()
-	 * @generated
-	 */
-	void setPresentation(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Graph Element</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.GraphElement#getSemanticModel <em>Semantic Model</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Graph Element</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Graph Element</em>' container reference.
-	 * @see #setGraphElement(GraphElement)
-	 * @see org.eclipse.epf.uma.UmaPackage#getSemanticModelBridge_GraphElement()
-	 * @see org.eclipse.epf.uma.GraphElement#getSemanticModel
-	 * @model opposite="semanticModel"
-	 * @generated
-	 */
-	GraphElement getGraphElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.SemanticModelBridge#getGraphElement <em>Graph Element</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Graph Element</em>' container reference.
-	 * @see #getGraphElement()
-	 * @generated
-	 */
-	void setGraphElement(GraphElement value);
-
-	/**
-	 * Returns the value of the '<em><b>Diagram</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Diagram#getNamespace <em>Namespace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Diagram</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Diagram</em>' container reference.
-	 * @see #setDiagram(Diagram)
-	 * @see org.eclipse.epf.uma.UmaPackage#getSemanticModelBridge_Diagram()
-	 * @see org.eclipse.epf.uma.Diagram#getNamespace
-	 * @model opposite="namespace"
-	 * @generated
-	 */
-	Diagram getDiagram();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.SemanticModelBridge#getDiagram <em>Diagram</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Diagram</em>' container reference.
-	 * @see #getDiagram()
-	 * @generated
-	 */
-	void setDiagram(Diagram value);
-
-} // SemanticModelBridge
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/SimpleSemanticModelElement.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/SimpleSemanticModelElement.java
deleted file mode 100755
index 3c7b30c..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/SimpleSemanticModelElement.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Simple Semantic Model Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.SimpleSemanticModelElement#getTypeInfo <em>Type Info</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getSimpleSemanticModelElement()
- * @model
- * @generated
- */
-public interface SimpleSemanticModelElement extends SemanticModelBridge {
-	/**
-	 * Returns the value of the '<em><b>Type Info</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type Info</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type Info</em>' attribute.
-	 * @see #setTypeInfo(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getSimpleSemanticModelElement_TypeInfo()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getTypeInfo();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.SimpleSemanticModelElement#getTypeInfo <em>Type Info</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type Info</em>' attribute.
-	 * @see #getTypeInfo()
-	 * @generated
-	 */
-	void setTypeInfo(String value);
-
-} // SimpleSemanticModelElement
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/State.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/State.java
deleted file mode 100755
index 22df88b..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/State.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: State.java,v 1.3 2006/07/24 23:34:08 bxu Exp $
- */
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>State</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.State#getWorkProduct <em>Work Product</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.State#getRegion <em>Region</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.State#getSubmachine <em>Submachine</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getState()
- * @model
- * @generated
- */
-public interface State extends Vertex {
-	/**
-	 * Returns the value of the '<em><b>Work Product</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProduct}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Work Product</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Work Product</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getState_WorkProduct()
-	 * @model type="org.eclipse.epf.uma.WorkProduct" required="true" ordered="false"
-	 * @generated
-	 */
-	List getWorkProduct();
-
-	/**
-	 * Returns the value of the '<em><b>Region</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Region}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Region#getState <em>State</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Region</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Region</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getState_Region()
-	 * @see org.eclipse.epf.uma.Region#getState
-	 * @model type="org.eclipse.epf.uma.Region" opposite="State" containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	List getRegion();
-
-	/**
-	 * Returns the value of the '<em><b>Submachine</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Submachine</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Submachine</em>' reference.
-	 * @see #setSubmachine(StateMachine)
-	 * @see org.eclipse.epf.uma.UmaPackage#getState_Submachine()
-	 * @model
-	 * @generated
-	 */
-	StateMachine getSubmachine();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.State#getSubmachine <em>Submachine</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Submachine</em>' reference.
-	 * @see #getSubmachine()
-	 * @generated
-	 */
-	void setSubmachine(StateMachine value);
-
-} // State
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/StateMachine.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/StateMachine.java
deleted file mode 100755
index 52650b9..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/StateMachine.java
+++ /dev/null
@@ -1,50 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>State Machine</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.StateMachine#getRegion <em>Region</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getStateMachine()
- * @model
- * @generated
- */
-public interface StateMachine extends WorkDefinition {
-	/**
-	 * Returns the value of the '<em><b>Region</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Region}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Region#getStateMachine <em>State Machine</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Region</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Region</em>' containment reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getStateMachine_Region()
-	 * @see org.eclipse.epf.uma.Region#getStateMachine
-	 * @model type="org.eclipse.epf.uma.Region" opposite="StateMachine" containment="true" resolveProxies="true" required="true" ordered="false"
-	 * @generated
-	 */
-	List getRegion();
-
-} // StateMachine
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Step.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Step.java
deleted file mode 100755
index e3b5a28..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Step.java
+++ /dev/null
@@ -1,29 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Step</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Step is a Section and Work Definition that is used to organize Tasks into parts or subunits of work.  Steps inherit the subSections decomposition from Section and can therefore describe Sub-Steps nested into Steps.
- * A Step describes a meaningful and consist part of the overall work described for a Task.  The collection of Steps defined for a Task represents all the work that should be done to achieve the overall development goal of the Task.  Not all steps are necessarily performed each time a Task is invoked in a Process (see Task Descriptor), so they can also be expressed in the form of alternate 'flows' of work.  Different ways of achieving the same development goal can then be 'assembled' by selecting different combinations of steps when applying the Task in a Process.  Typical kinds of steps a Task author should consider are: Thinking steps: where the individual roles understand the nature of the task, gathers and examines the input artifacts, and formulates the outcome. Performing steps: where the individual roles create or update some artifacts. Reviewing steps: where the individual roles inspects the results against some criteria.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getStep()
- * @model
- * @generated
- */
-public interface Step extends Section, WorkDefinition {
-} // Step
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/SupportingMaterial.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/SupportingMaterial.java
deleted file mode 100755
index 8612a3f..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/SupportingMaterial.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Supporting Material</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Supporting Materials is catchall for other types of guidance not specifically defined elsewhere. It can be related to all kinds of Content Elements, i.e. including other guidance elements.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getSupportingMaterial()
- * @model
- * @generated
- */
-public interface SupportingMaterial extends Guidance {
-} // SupportingMaterial
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Task.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Task.java
deleted file mode 100755
index c934ad3..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Task.java
+++ /dev/null
@@ -1,184 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Task</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Task is a content element that describes work being performed by Roles.  It defines one default performing Role as well as many additional performers.  A Task is associated to input and output work products.  Inputs are differentiated in mandatory versus optional inputs.  The associations to Work Products are not instantiatable/variable-like parameters.  They rather express (hyper-)links to the descriptions of the work products types that are related to the Task as inputs and outputs.  In other words, these associations are not intended to be used to capture which concrete instances will be passed when instantiating the method in a project.  All of the Task's default associations can be overridden in an actual process definition.
- * A Task describes an assignable unit of work.  Every Task is assigned to specific Roles.  The granularity of a Task is generally a few hours to a few days.  It usually affects one or only a small number of work products. A Task is used as an element of defining a process. Tasks are further used for planning and tracking progress; therefore, if they are defined too fine-grained, they will be neglected, and if they are too large, progress would have to be expressed in terms of a Task's parts (e.g. Steps, which is not recommended). 
- * A Task has a clear purpose in which the performing roles achieve a well defined goal.  It provides complete step-by-step explanations of doing all the work that needs to be done to achieve this goal.  This description is complete, independent of when in a process lifecycle the work would actually be done.  It therefore does not describe when you do what work at what point of time, but describes all the work that gets done throughout the development lifecycle that contributes to the achievement of this goal.  When the Task is being applied in a process then this process application (defined as Task Descriptor) provides the information of which pieces of the Task will actually be performed at any particular point in time. This assumes that the Task will be performed in the process over and over again, but each time with a slightly different emphasis on different steps or aspects of the task description. 
- * For example, a Task such as "Develop Use Case Model" describes all the work that needs to be done to develop a complete use case model. This would comprise of the identification and naming of use cases and actors, the writing of a brief description, the modeling of use cases and their relationships in diagrams, the detailed description of a basic flow, the detailed description of alternatives flows, performing of walkthroughs workshops and reviews, etc.  All of these parts contribute to the development goal of developing the use case model, but the parts will be performed at different points in time in a process.  Identification, naming, and brief descriptions would be performed early in a typical development process versus the writing of detailed alternative flows which would be performed much later.  All these parts or steps within the same Task define the "method" of Developing a Use Case Model.  Applying such a method in a lifecycle (i.e. in a process) is defining which steps are done when going from one iteration to the next.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Task#getPerformedBy <em>Performed By</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Task#getMandatoryInput <em>Mandatory Input</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Task#getOutput <em>Output</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Task#getAdditionallyPerformedBy <em>Additionally Performed By</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Task#getOptionalInput <em>Optional Input</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Task#getSteps <em>Steps</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Task#getToolMentors <em>Tool Mentors</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Task#getEstimationConsiderations <em>Estimation Considerations</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getTask()
- * @model
- * @generated
- */
-public interface Task extends ContentElement, WorkDefinition {
-	/**
-	 * Returns the value of the '<em><b>Performed By</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Performed By</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Performed By</em>' reference.
-	 * @see #setPerformedBy(Role)
-	 * @see org.eclipse.epf.uma.UmaPackage#getTask_PerformedBy()
-	 * @model
-	 * @generated
-	 */
-	Role getPerformedBy();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Task#getPerformedBy <em>Performed By</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Performed By</em>' reference.
-	 * @see #getPerformedBy()
-	 * @generated
-	 */
-	void setPerformedBy(Role value);
-
-	/**
-	 * Returns the value of the '<em><b>Mandatory Input</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProduct}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mandatory Input</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mandatory Input</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTask_MandatoryInput()
-	 * @model type="org.eclipse.epf.uma.WorkProduct" ordered="false"
-	 * @generated
-	 */
-	List getMandatoryInput();
-
-	/**
-	 * Returns the value of the '<em><b>Output</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProduct}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Output</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Output</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTask_Output()
-	 * @model type="org.eclipse.epf.uma.WorkProduct" ordered="false"
-	 * @generated
-	 */
-	List getOutput();
-
-	/**
-	 * Returns the value of the '<em><b>Additionally Performed By</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Role}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Additionally Performed By</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Additionally Performed By</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTask_AdditionallyPerformedBy()
-	 * @model type="org.eclipse.epf.uma.Role" ordered="false"
-	 * @generated
-	 */
-	List getAdditionallyPerformedBy();
-
-	/**
-	 * Returns the value of the '<em><b>Optional Input</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProduct}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Optional Input</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Optional Input</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTask_OptionalInput()
-	 * @model type="org.eclipse.epf.uma.WorkProduct" ordered="false"
-	 * @generated
-	 */
-	List getOptionalInput();
-
-	/**
-	 * Returns the value of the '<em><b>Steps</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Step}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Steps</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Steps</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTask_Steps()
-	 * @model type="org.eclipse.epf.uma.Step" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
-	 * @generated
-	 */
-	List getSteps();
-
-	/**
-	 * Returns the value of the '<em><b>Tool Mentors</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.ToolMentor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tool Mentors</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tool Mentors</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTask_ToolMentors()
-	 * @model type="org.eclipse.epf.uma.ToolMentor" ordered="false"
-	 * @generated
-	 */
-	List getToolMentors();
-
-	/**
-	 * Returns the value of the '<em><b>Estimation Considerations</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.EstimationConsiderations}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Estimation Considerations</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Estimation Considerations</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTask_EstimationConsiderations()
-	 * @model type="org.eclipse.epf.uma.EstimationConsiderations" ordered="false"
-	 * @generated
-	 */
-	List getEstimationConsiderations();
-
-} // Task
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/TaskDescription.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/TaskDescription.java
deleted file mode 100755
index ac35633..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/TaskDescription.java
+++ /dev/null
@@ -1,83 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Task Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.TaskDescription#getPurpose <em>Purpose</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.TaskDescription#getAlternatives <em>Alternatives</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getTaskDescription()
- * @model
- * @generated
- */
-public interface TaskDescription extends ContentDescription {
-	/**
-	 * Returns the value of the '<em><b>Purpose</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Summarizes the main reason for performing this Task and what is intended to be achieved.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Purpose</em>' attribute.
-	 * @see #setPurpose(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getTaskDescription_Purpose()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getPurpose();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.TaskDescription#getPurpose <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Purpose</em>' attribute.
-	 * @see #getPurpose()
-	 * @generated
-	 */
-	void setPurpose(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Alternatives</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Comprises of summaries describing important exceptional and non-standard ways of achieving this Task's development goals that were not covered by the Task's Steps.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Alternatives</em>' attribute.
-	 * @see #setAlternatives(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getTaskDescription_Alternatives()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getAlternatives();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.TaskDescription#getAlternatives <em>Alternatives</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Alternatives</em>' attribute.
-	 * @see #getAlternatives()
-	 * @generated
-	 */
-	void setAlternatives(String value);
-
-} // TaskDescription
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/TaskDescriptor.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/TaskDescriptor.java
deleted file mode 100755
index 4b401a9..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/TaskDescriptor.java
+++ /dev/null
@@ -1,210 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Task Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Task Descriptor is a Descriptor and Work Breakdown Element that represents a proxy for a Task in the context of one specific Activity.  Every breakdown structure can define different relationships of Task Descriptors to Work Product Descriptors and Role Descriptors. Therefore one Task can be represented by many Task Descriptors each within the context of an Activity with its own set of relationships.
- * A key difference between Method Content and Process is that a Content Element such as Task describes all aspects of doing work defined around this Task.  This description is managed in steps, which are modeled as Sections of the Tasks' Content Descriptions.  When applying a Task in a Process' Activity with a Task Descriptor a Process Engineer needs to indicate that at that particular point in time in the Process definition for which the Task Descriptor has been created, only a subset of steps shall be performed.  He defines this selection using the selectedSteps association.  If he wants to add steps to a Task Descriptor, he can describe these either pragmatically in the refinedDescription attribute or 'properly' create a contributing Task to the Task the Task Descriptor refers to.
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.TaskDescriptor#getTask <em>Task</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.TaskDescriptor#getAdditionallyPerformedBy <em>Additionally Performed By</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.TaskDescriptor#getAssistedBy <em>Assisted By</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.TaskDescriptor#getExternalInput <em>External Input</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.TaskDescriptor#getMandatoryInput <em>Mandatory Input</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.TaskDescriptor#getOptionalInput <em>Optional Input</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.TaskDescriptor#getOutput <em>Output</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.TaskDescriptor#getPerformedPrimarilyBy <em>Performed Primarily By</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.TaskDescriptor#getSelectedSteps <em>Selected Steps</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getTaskDescriptor()
- * @model
- * @generated
- */
-public interface TaskDescriptor extends WorkBreakdownElement, Descriptor {
-	/**
-	 * Returns the value of the '<em><b>Task</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Task</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Task</em>' reference.
-	 * @see #setTask(Task)
-	 * @see org.eclipse.epf.uma.UmaPackage#getTaskDescriptor_Task()
-	 * @model
-	 * @generated
-	 */
-	Task getTask();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.TaskDescriptor#getTask <em>Task</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Task</em>' reference.
-	 * @see #getTask()
-	 * @generated
-	 */
-	void setTask(Task value);
-
-	/**
-	 * Returns the value of the '<em><b>Additionally Performed By</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.RoleDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Additionally Performed By</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Additionally Performed By</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTaskDescriptor_AdditionallyPerformedBy()
-	 * @model type="org.eclipse.epf.uma.RoleDescriptor" ordered="false"
-	 * @generated
-	 */
-	List getAdditionallyPerformedBy();
-
-	/**
-	 * Returns the value of the '<em><b>Assisted By</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.RoleDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Assisted By</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Assisted By</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTaskDescriptor_AssistedBy()
-	 * @model type="org.eclipse.epf.uma.RoleDescriptor" ordered="false"
-	 * @generated
-	 */
-	List getAssistedBy();
-
-	/**
-	 * Returns the value of the '<em><b>External Input</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProductDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>External Input</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>External Input</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTaskDescriptor_ExternalInput()
-	 * @model type="org.eclipse.epf.uma.WorkProductDescriptor" ordered="false"
-	 * @generated
-	 */
-	List getExternalInput();
-
-	/**
-	 * Returns the value of the '<em><b>Mandatory Input</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProductDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mandatory Input</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mandatory Input</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTaskDescriptor_MandatoryInput()
-	 * @model type="org.eclipse.epf.uma.WorkProductDescriptor" ordered="false"
-	 * @generated
-	 */
-	List getMandatoryInput();
-
-	/**
-	 * Returns the value of the '<em><b>Optional Input</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProductDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Optional Input</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Optional Input</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTaskDescriptor_OptionalInput()
-	 * @model type="org.eclipse.epf.uma.WorkProductDescriptor" ordered="false"
-	 * @generated
-	 */
-	List getOptionalInput();
-
-	/**
-	 * Returns the value of the '<em><b>Output</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProductDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Output</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Output</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTaskDescriptor_Output()
-	 * @model type="org.eclipse.epf.uma.WorkProductDescriptor" ordered="false"
-	 * @generated
-	 */
-	List getOutput();
-
-	/**
-	 * Returns the value of the '<em><b>Performed Primarily By</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Performed Primarily By</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Performed Primarily By</em>' reference.
-	 * @see #setPerformedPrimarilyBy(RoleDescriptor)
-	 * @see org.eclipse.epf.uma.UmaPackage#getTaskDescriptor_PerformedPrimarilyBy()
-	 * @model
-	 * @generated
-	 */
-	RoleDescriptor getPerformedPrimarilyBy();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.TaskDescriptor#getPerformedPrimarilyBy <em>Performed Primarily By</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Performed Primarily By</em>' reference.
-	 * @see #getPerformedPrimarilyBy()
-	 * @generated
-	 */
-	void setPerformedPrimarilyBy(RoleDescriptor value);
-
-	/**
-	 * Returns the value of the '<em><b>Selected Steps</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Section}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Selected Steps</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Selected Steps</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTaskDescriptor_SelectedSteps()
-	 * @model type="org.eclipse.epf.uma.Section" ordered="false"
-	 * @generated
-	 */
-	List getSelectedSteps();
-
-} // TaskDescriptor
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/TeamProfile.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/TeamProfile.java
deleted file mode 100755
index 98833d7..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/TeamProfile.java
+++ /dev/null
@@ -1,102 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Team Profile</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Team Profile is a Breakdown Element that groups Role Descriptors or Resource Definitions defining a nested hierarchy of teams and team members.
- * Work assignments and Work Product responsibilities can be different from Activity to Activity in a development project. Different phases require different staffing profiles, i.e. different skills and resources doing different types of work.  Therefore, a process needs to define such different profiles in a flexible manner.  Whereas Core Method Content defines standard responsibilities and assignments, a process express by a breakdown structures needs to be able refine and redefine these throughout its definition.  Role Descriptors, Resource Definitions, as well as Team Profiles provide the data structure necessary to achieve this flexibility and to provide a process user with the capability to define different teams and role relationships for every Activity (including Activities on any nesting-level as well as Iterations or Phases).
- * Hence, in addition to the work breakdown and work product breakdown structures defined so far, Team Profiles are used to define a third type of breakdown structure: team breakdown structures.  These are created as an Activity specific hierarchy of Team Profiles comprising of Role Descriptors and Resource Definitions.  These structures can be presented as well-known Org-Charts.  Just as with any other Breakdown Element and Descriptors, Team Profiles can be defined within the scope of any Activity in a breakdown structure.  In other words every Activity can define its own Team Profiles consisting of Activity specific Role Descriptors and Resource Definitions.  Typically, Team Profiles are defined on the level of Iterations or Phases or other higher-level Activity.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.TeamProfile#getTeamRoles <em>Team Roles</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.TeamProfile#getSuperTeam <em>Super Team</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.TeamProfile#getSubTeam <em>Sub Team</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getTeamProfile()
- * @model
- * @generated
- */
-public interface TeamProfile extends BreakdownElement {
-	/**
-	 * Returns the value of the '<em><b>Team Roles</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.RoleDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Team Roles</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Team Roles</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTeamProfile_TeamRoles()
-	 * @model type="org.eclipse.epf.uma.RoleDescriptor" ordered="false"
-	 * @generated
-	 */
-	List getTeamRoles();
-
-	/**
-	 * Returns the value of the '<em><b>Super Team</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.TeamProfile#getSubTeam <em>Sub Team</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Super Team</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Super Team</em>' reference.
-	 * @see #setSuperTeam(TeamProfile)
-	 * @see org.eclipse.epf.uma.UmaPackage#getTeamProfile_SuperTeam()
-	 * @see org.eclipse.epf.uma.TeamProfile#getSubTeam
-	 * @model opposite="subTeam" required="true"
-	 * @generated
-	 */
-	TeamProfile getSuperTeam();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.TeamProfile#getSuperTeam <em>Super Team</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Super Team</em>' reference.
-	 * @see #getSuperTeam()
-	 * @generated
-	 */
-	void setSuperTeam(TeamProfile value);
-
-	/**
-	 * Returns the value of the '<em><b>Sub Team</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.TeamProfile}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.TeamProfile#getSuperTeam <em>Super Team</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sub Team</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sub Team</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTeamProfile_SubTeam()
-	 * @see org.eclipse.epf.uma.TeamProfile#getSuperTeam
-	 * @model type="org.eclipse.epf.uma.TeamProfile" opposite="superTeam" ordered="false"
-	 * @generated
-	 */
-	List getSubTeam();
-
-} // TeamProfile
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Template.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Template.java
deleted file mode 100755
index 40adc49..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Template.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Template</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Template is a specific type of guidance that provides for a work product a pre-defined table of contents, sections, packages, and/or headings, a standardized format, as well as descriptions how the sections and packages are supposed to be used and completed. Templates cannot only be provided for documents, but also for conceptual models or physical data stores.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getTemplate()
- * @model
- * @generated
- */
-public interface Template extends Guidance {
-} // Template
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/TermDefinition.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/TermDefinition.java
deleted file mode 100755
index c73edcb..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/TermDefinition.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Term Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * TermDefinitions define concepts and are used to build up the Glossary. They are not directly related to ContentElements, but their relationship is being derived when the Term is used in the ContentElements description text.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getTermDefinition()
- * @model
- * @generated
- */
-public interface TermDefinition extends Guidance {
-} // TermDefinition
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/TextElement.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/TextElement.java
deleted file mode 100755
index a041835..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/TextElement.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Text Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.TextElement#getText <em>Text</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getTextElement()
- * @model
- * @generated
- */
-public interface TextElement extends LeafElement {
-	/**
-	 * Returns the value of the '<em><b>Text</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Text</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Text</em>' attribute.
-	 * @see #setText(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getTextElement_Text()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getText();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.TextElement#getText <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Text</em>' attribute.
-	 * @see #getText()
-	 * @generated
-	 */
-	void setText(String value);
-
-} // TextElement
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Tool.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Tool.java
deleted file mode 100755
index e75a09c..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Tool.java
+++ /dev/null
@@ -1,52 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tool</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Tool is a container/aggregate for ToolMentors.  It can also provide general descriptions of the tool and its general capabilities.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Tool#getToolMentors <em>Tool Mentors</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getTool()
- * @model
- * @generated
- */
-public interface Tool extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Tool Mentors</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.ToolMentor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tool Mentors</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tool Mentors</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTool_ToolMentors()
-	 * @model type="org.eclipse.epf.uma.ToolMentor" ordered="false"
-	 * @generated
-	 */
-	List getToolMentors();
-
-} // Tool
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ToolMentor.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ToolMentor.java
deleted file mode 100755
index 4f6e959..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/ToolMentor.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tool Mentor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Tool Mentor is a specific type of guidance that shows how to use a specific tool to accomplish some piece of work a Work Product either in the context of or independent from a Task or Activity.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getToolMentor()
- * @model
- * @generated
- */
-public interface ToolMentor extends Guidance {
-} // ToolMentor
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Transition.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Transition.java
deleted file mode 100755
index 7e8f1eb..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Transition.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Transition.java,v 1.3 2006/07/24 23:34:08 bxu Exp $
- */
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-import org.eclipse.epf.uma.ecore.IModelObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Transition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Transition#getWorkDefinition <em>Work Definition</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Transition#getContainer_ <em>Container</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Transition#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Transition#getTarget <em>Target</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getTransition()
- * @model
- * @extends IModelObject
- * @generated
- */
-public interface Transition extends IModelObject {
-	/**
-	 * Returns the value of the '<em><b>Work Definition</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkDefinition}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Work Definition</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Work Definition</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getTransition_WorkDefinition()
-	 * @model type="org.eclipse.epf.uma.WorkDefinition" required="true" ordered="false"
-	 * @generated
-	 */
-	List getWorkDefinition();
-
-	/**
-	 * Returns the value of the '<em><b>Container</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Region#getTransition <em>Transition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Container</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Container</em>' container reference.
-	 * @see #setContainer(Region)
-	 * @see org.eclipse.epf.uma.UmaPackage#getTransition_Container()
-	 * @see org.eclipse.epf.uma.Region#getTransition
-	 * @model opposite="Transition" required="true"
-	 * @generated
-	 */
-	Region getContainer_();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Transition#getContainer_ <em>Container</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Container</em>' container reference.
-	 * @see #getContainer_()
-	 * @generated
-	 */
-	void setContainer(Region value);
-
-	/**
-	 * Returns the value of the '<em><b>Source</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Vertex#getOutgoing <em>Outgoing</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Source</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Source</em>' reference.
-	 * @see #setSource(Vertex)
-	 * @see org.eclipse.epf.uma.UmaPackage#getTransition_Source()
-	 * @see org.eclipse.epf.uma.Vertex#getOutgoing
-	 * @model opposite="outgoing" required="true"
-	 * @generated
-	 */
-	Vertex getSource();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Transition#getSource <em>Source</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source</em>' reference.
-	 * @see #getSource()
-	 * @generated
-	 */
-	void setSource(Vertex value);
-
-	/**
-	 * Returns the value of the '<em><b>Target</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Vertex#getIncoming <em>Incoming</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Target</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Target</em>' reference.
-	 * @see #setTarget(Vertex)
-	 * @see org.eclipse.epf.uma.UmaPackage#getTransition_Target()
-	 * @see org.eclipse.epf.uma.Vertex#getIncoming
-	 * @model opposite="incoming" required="true"
-	 * @generated
-	 */
-	Vertex getTarget();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Transition#getTarget <em>Target</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target</em>' reference.
-	 * @see #getTarget()
-	 * @generated
-	 */
-	void setTarget(Vertex value);
-
-} // Transition
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Type.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Type.java
deleted file mode 100755
index 0a3ceac..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Type.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * UML 2.0 meta-class Type.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getType()
- * @model abstract="true"
- * @generated
- */
-public interface Type extends PackageableElement {
-} // Type
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/UMASemanticModelBridge.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/UMASemanticModelBridge.java
deleted file mode 100755
index 01a8958..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/UMASemanticModelBridge.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>UMA Semantic Model Bridge</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.UMASemanticModelBridge#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getUMASemanticModelBridge()
- * @model
- * @generated
- */
-public interface UMASemanticModelBridge extends SemanticModelBridge {
-	/**
-	 * Returns the value of the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Element</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Element</em>' reference.
-	 * @see #setElement(MethodElement)
-	 * @see org.eclipse.epf.uma.UmaPackage#getUMASemanticModelBridge_Element()
-	 * @model
-	 * @generated
-	 */
-	MethodElement getElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.UMASemanticModelBridge#getElement <em>Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Element</em>' reference.
-	 * @see #getElement()
-	 * @generated
-	 */
-	void setElement(MethodElement value);
-
-} // UMASemanticModelBridge
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/UmaFactory.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/UmaFactory.java
deleted file mode 100755
index 0488cee..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/UmaFactory.java
+++ /dev/null
@@ -1,851 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.uma.UmaPackage
- * @generated
- */
-public interface UmaFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	UmaFactory eINSTANCE = org.eclipse.epf.uma.impl.UmaFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Package</em>'.
-	 * @generated
-	 */
-	org.eclipse.epf.uma.Package createPackage();
-
-	/**
-	 * Returns a new object of class '<em>Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Constraint</em>'.
-	 * @generated
-	 */
-	Constraint createConstraint();
-
-	/**
-	 * Returns a new object of class '<em>Method Element Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Element Property</em>'.
-	 * @generated
-	 */
-	MethodElementProperty createMethodElementProperty();
-
-	/**
-	 * Returns a new object of class '<em>Content Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Content Description</em>'.
-	 * @generated
-	 */
-	ContentDescription createContentDescription();
-
-	/**
-	 * Returns a new object of class '<em>Section</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Section</em>'.
-	 * @generated
-	 */
-	Section createSection();
-
-	/**
-	 * Returns a new object of class '<em>Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Role</em>'.
-	 * @generated
-	 */
-	Role createRole();
-
-	/**
-	 * Returns a new object of class '<em>Task</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Task</em>'.
-	 * @generated
-	 */
-	Task createTask();
-
-	/**
-	 * Returns a new object of class '<em>Step</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Step</em>'.
-	 * @generated
-	 */
-	Step createStep();
-
-	/**
-	 * Returns a new object of class '<em>Artifact</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Artifact</em>'.
-	 * @generated
-	 */
-	Artifact createArtifact();
-
-	/**
-	 * Returns a new object of class '<em>Deliverable</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Deliverable</em>'.
-	 * @generated
-	 */
-	Deliverable createDeliverable();
-
-	/**
-	 * Returns a new object of class '<em>Outcome</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Outcome</em>'.
-	 * @generated
-	 */
-	Outcome createOutcome();
-
-	/**
-	 * Returns a new object of class '<em>Content Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Content Package</em>'.
-	 * @generated
-	 */
-	ContentPackage createContentPackage();
-
-	/**
-	 * Returns a new object of class '<em>Artifact Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Artifact Description</em>'.
-	 * @generated
-	 */
-	ArtifactDescription createArtifactDescription();
-
-	/**
-	 * Returns a new object of class '<em>Work Product Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Product Description</em>'.
-	 * @generated
-	 */
-	WorkProductDescription createWorkProductDescription();
-
-	/**
-	 * Returns a new object of class '<em>Deliverable Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Deliverable Description</em>'.
-	 * @generated
-	 */
-	DeliverableDescription createDeliverableDescription();
-
-	/**
-	 * Returns a new object of class '<em>Role Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Role Description</em>'.
-	 * @generated
-	 */
-	RoleDescription createRoleDescription();
-
-	/**
-	 * Returns a new object of class '<em>Task Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Task Description</em>'.
-	 * @generated
-	 */
-	TaskDescription createTaskDescription();
-
-	/**
-	 * Returns a new object of class '<em>Guidance Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Guidance Description</em>'.
-	 * @generated
-	 */
-	GuidanceDescription createGuidanceDescription();
-
-	/**
-	 * Returns a new object of class '<em>Practice Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Practice Description</em>'.
-	 * @generated
-	 */
-	PracticeDescription createPracticeDescription();
-
-	/**
-	 * Returns a new object of class '<em>Point</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Point</em>'.
-	 * @generated
-	 */
-	Point createPoint();
-
-	/**
-	 * Returns a new object of class '<em>Diagram Link</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Diagram Link</em>'.
-	 * @generated
-	 */
-	DiagramLink createDiagramLink();
-
-	/**
-	 * Returns a new object of class '<em>Graph Connector</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Graph Connector</em>'.
-	 * @generated
-	 */
-	GraphConnector createGraphConnector();
-
-	/**
-	 * Returns a new object of class '<em>Dimension</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Dimension</em>'.
-	 * @generated
-	 */
-	Dimension createDimension();
-
-	/**
-	 * Returns a new object of class '<em>Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Reference</em>'.
-	 * @generated
-	 */
-	Reference createReference();
-
-	/**
-	 * Returns a new object of class '<em>Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Property</em>'.
-	 * @generated
-	 */
-	Property createProperty();
-
-	/**
-	 * Returns a new object of class '<em>Graph Edge</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Graph Edge</em>'.
-	 * @generated
-	 */
-	GraphEdge createGraphEdge();
-
-	/**
-	 * Returns a new object of class '<em>Diagram</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Diagram</em>'.
-	 * @generated
-	 */
-	Diagram createDiagram();
-
-	/**
-	 * Returns a new object of class '<em>Graph Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Graph Node</em>'.
-	 * @generated
-	 */
-	GraphNode createGraphNode();
-
-	/**
-	 * Returns a new object of class '<em>Simple Semantic Model Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Simple Semantic Model Element</em>'.
-	 * @generated
-	 */
-	SimpleSemanticModelElement createSimpleSemanticModelElement();
-
-	/**
-	 * Returns a new object of class '<em>UMA Semantic Model Bridge</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>UMA Semantic Model Bridge</em>'.
-	 * @generated
-	 */
-	UMASemanticModelBridge createUMASemanticModelBridge();
-
-	/**
-	 * Returns a new object of class '<em>Core Semantic Model Bridge</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Core Semantic Model Bridge</em>'.
-	 * @generated
-	 */
-	CoreSemanticModelBridge createCoreSemanticModelBridge();
-
-	/**
-	 * Returns a new object of class '<em>Text Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Text Element</em>'.
-	 * @generated
-	 */
-	TextElement createTextElement();
-
-	/**
-	 * Returns a new object of class '<em>Image</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Image</em>'.
-	 * @generated
-	 */
-	Image createImage();
-
-	/**
-	 * Returns a new object of class '<em>Polyline</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Polyline</em>'.
-	 * @generated
-	 */
-	Polyline createPolyline();
-
-	/**
-	 * Returns a new object of class '<em>Ellipse</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Ellipse</em>'.
-	 * @generated
-	 */
-	Ellipse createEllipse();
-
-	/**
-	 * Returns a new object of class '<em>Activity</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Activity</em>'.
-	 * @generated
-	 */
-	Activity createActivity();
-
-	/**
-	 * Returns a new object of class '<em>Milestone</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Milestone</em>'.
-	 * @generated
-	 */
-	Milestone createMilestone();
-
-	/**
-	 * Returns a new object of class '<em>Iteration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Iteration</em>'.
-	 * @generated
-	 */
-	Iteration createIteration();
-
-	/**
-	 * Returns a new object of class '<em>Phase</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Phase</em>'.
-	 * @generated
-	 */
-	Phase createPhase();
-
-	/**
-	 * Returns a new object of class '<em>Team Profile</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Team Profile</em>'.
-	 * @generated
-	 */
-	TeamProfile createTeamProfile();
-
-	/**
-	 * Returns a new object of class '<em>Role Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Role Descriptor</em>'.
-	 * @generated
-	 */
-	RoleDescriptor createRoleDescriptor();
-
-	/**
-	 * Returns a new object of class '<em>Work Order</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Order</em>'.
-	 * @generated
-	 */
-	WorkOrder createWorkOrder();
-
-	/**
-	 * Returns a new object of class '<em>Planning Data</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Planning Data</em>'.
-	 * @generated
-	 */
-	PlanningData createPlanningData();
-
-	/**
-	 * Returns a new object of class '<em>Task Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Task Descriptor</em>'.
-	 * @generated
-	 */
-	TaskDescriptor createTaskDescriptor();
-
-	/**
-	 * Returns a new object of class '<em>Work Product Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Product Descriptor</em>'.
-	 * @generated
-	 */
-	WorkProductDescriptor createWorkProductDescriptor();
-
-	/**
-	 * Returns a new object of class '<em>Composite Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Composite Role</em>'.
-	 * @generated
-	 */
-	CompositeRole createCompositeRole();
-
-	/**
-	 * Returns a new object of class '<em>Breakdown Element Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Breakdown Element Description</em>'.
-	 * @generated
-	 */
-	BreakdownElementDescription createBreakdownElementDescription();
-
-	/**
-	 * Returns a new object of class '<em>Activity Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Activity Description</em>'.
-	 * @generated
-	 */
-	ActivityDescription createActivityDescription();
-
-	/**
-	 * Returns a new object of class '<em>Delivery Process Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Delivery Process Description</em>'.
-	 * @generated
-	 */
-	DeliveryProcessDescription createDeliveryProcessDescription();
-
-	/**
-	 * Returns a new object of class '<em>Process Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Process Description</em>'.
-	 * @generated
-	 */
-	ProcessDescription createProcessDescription();
-
-	/**
-	 * Returns a new object of class '<em>Descriptor Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Descriptor Description</em>'.
-	 * @generated
-	 */
-	DescriptorDescription createDescriptorDescription();
-
-	/**
-	 * Returns a new object of class '<em>Concept</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Concept</em>'.
-	 * @generated
-	 */
-	Concept createConcept();
-
-	/**
-	 * Returns a new object of class '<em>Checklist</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Checklist</em>'.
-	 * @generated
-	 */
-	Checklist createChecklist();
-
-	/**
-	 * Returns a new object of class '<em>Example</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Example</em>'.
-	 * @generated
-	 */
-	Example createExample();
-
-	/**
-	 * Returns a new object of class '<em>Guideline</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Guideline</em>'.
-	 * @generated
-	 */
-	Guideline createGuideline();
-
-	/**
-	 * Returns a new object of class '<em>Estimation Considerations</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Estimation Considerations</em>'.
-	 * @generated
-	 */
-	EstimationConsiderations createEstimationConsiderations();
-
-	/**
-	 * Returns a new object of class '<em>Report</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Report</em>'.
-	 * @generated
-	 */
-	Report createReport();
-
-	/**
-	 * Returns a new object of class '<em>Template</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Template</em>'.
-	 * @generated
-	 */
-	Template createTemplate();
-
-	/**
-	 * Returns a new object of class '<em>Supporting Material</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Supporting Material</em>'.
-	 * @generated
-	 */
-	SupportingMaterial createSupportingMaterial();
-
-	/**
-	 * Returns a new object of class '<em>Tool Mentor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tool Mentor</em>'.
-	 * @generated
-	 */
-	ToolMentor createToolMentor();
-
-	/**
-	 * Returns a new object of class '<em>Whitepaper</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Whitepaper</em>'.
-	 * @generated
-	 */
-	Whitepaper createWhitepaper();
-
-	/**
-	 * Returns a new object of class '<em>Term Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Term Definition</em>'.
-	 * @generated
-	 */
-	TermDefinition createTermDefinition();
-
-	/**
-	 * Returns a new object of class '<em>Practice</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Practice</em>'.
-	 * @generated
-	 */
-	Practice createPractice();
-
-	/**
-	 * Returns a new object of class '<em>Reusable Asset</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Reusable Asset</em>'.
-	 * @generated
-	 */
-	ReusableAsset createReusableAsset();
-
-	/**
-	 * Returns a new object of class '<em>State</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>State</em>'.
-	 * @generated
-	 */
-	State createState();
-
-	/**
-	 * Returns a new object of class '<em>Vertex</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Vertex</em>'.
-	 * @generated
-	 */
-	Vertex createVertex();
-
-	/**
-	 * Returns a new object of class '<em>Region</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Region</em>'.
-	 * @generated
-	 */
-	Region createRegion();
-
-	/**
-	 * Returns a new object of class '<em>State Machine</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>State Machine</em>'.
-	 * @generated
-	 */
-	StateMachine createStateMachine();
-
-	/**
-	 * Returns a new object of class '<em>Transition</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Transition</em>'.
-	 * @generated
-	 */
-	Transition createTransition();
-
-	/**
-	 * Returns a new object of class '<em>Pseudo State</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Pseudo State</em>'.
-	 * @generated
-	 */
-	PseudoState createPseudoState();
-
-	/**
-	 * Returns a new object of class '<em>Discipline</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Discipline</em>'.
-	 * @generated
-	 */
-	Discipline createDiscipline();
-
-	/**
-	 * Returns a new object of class '<em>Role Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Role Set</em>'.
-	 * @generated
-	 */
-	RoleSet createRoleSet();
-
-	/**
-	 * Returns a new object of class '<em>Domain</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Domain</em>'.
-	 * @generated
-	 */
-	Domain createDomain();
-
-	/**
-	 * Returns a new object of class '<em>Work Product Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Product Type</em>'.
-	 * @generated
-	 */
-	WorkProductType createWorkProductType();
-
-	/**
-	 * Returns a new object of class '<em>Discipline Grouping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Discipline Grouping</em>'.
-	 * @generated
-	 */
-	DisciplineGrouping createDisciplineGrouping();
-
-	/**
-	 * Returns a new object of class '<em>Tool</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tool</em>'.
-	 * @generated
-	 */
-	Tool createTool();
-
-	/**
-	 * Returns a new object of class '<em>Role Set Grouping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Role Set Grouping</em>'.
-	 * @generated
-	 */
-	RoleSetGrouping createRoleSetGrouping();
-
-	/**
-	 * Returns a new object of class '<em>Custom Category</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Custom Category</em>'.
-	 * @generated
-	 */
-	CustomCategory createCustomCategory();
-
-	/**
-	 * Returns a new object of class '<em>Delivery Process</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Delivery Process</em>'.
-	 * @generated
-	 */
-	DeliveryProcess createDeliveryProcess();
-
-	/**
-	 * Returns a new object of class '<em>Capability Pattern</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Capability Pattern</em>'.
-	 * @generated
-	 */
-	CapabilityPattern createCapabilityPattern();
-
-	/**
-	 * Returns a new object of class '<em>Process Planning Template</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Process Planning Template</em>'.
-	 * @generated
-	 */
-	ProcessPlanningTemplate createProcessPlanningTemplate();
-
-	/**
-	 * Returns a new object of class '<em>Roadmap</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Roadmap</em>'.
-	 * @generated
-	 */
-	Roadmap createRoadmap();
-
-	/**
-	 * Returns a new object of class '<em>Process Component</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Process Component</em>'.
-	 * @generated
-	 */
-	ProcessComponent createProcessComponent();
-
-	/**
-	 * Returns a new object of class '<em>Process Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Process Package</em>'.
-	 * @generated
-	 */
-	ProcessPackage createProcessPackage();
-
-	/**
-	 * Returns a new object of class '<em>Process Component Interface</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Process Component Interface</em>'.
-	 * @generated
-	 */
-	ProcessComponentInterface createProcessComponentInterface();
-
-	/**
-	 * Returns a new object of class '<em>Process Component Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Process Component Descriptor</em>'.
-	 * @generated
-	 */
-	ProcessComponentDescriptor createProcessComponentDescriptor();
-
-	/**
-	 * Returns a new object of class '<em>Method Plugin</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Plugin</em>'.
-	 * @generated
-	 */
-	MethodPlugin createMethodPlugin();
-
-	/**
-	 * Returns a new object of class '<em>Method Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Configuration</em>'.
-	 * @generated
-	 */
-	MethodConfiguration createMethodConfiguration();
-
-	/**
-	 * Returns a new object of class '<em>Process Family</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Process Family</em>'.
-	 * @generated
-	 */
-	ProcessFamily createProcessFamily();
-
-	/**
-	 * Returns a new object of class '<em>Method Library</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Library</em>'.
-	 * @generated
-	 */
-	MethodLibrary createMethodLibrary();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	UmaPackage getUmaPackage();
-
-} //UmaFactory
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/UmaPackage.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/UmaPackage.java
deleted file mode 100755
index 2d9504a..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/UmaPackage.java
+++ /dev/null
@@ -1,27441 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * 03
- * <!-- end-model-doc -->
- * @see org.eclipse.epf.uma.UmaFactory
- * @model kind="package"
- * @generated
- */
-public interface UmaPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "uma";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/epf/uma/1.0.4/uma.ecore";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.epf.uma";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	UmaPackage eINSTANCE = org.eclipse.epf.uma.impl.UmaPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ElementImpl <em>Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ElementImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getElement()
-	 * @generated
-	 */
-	int ELEMENT = 2;
-
-	/**
-	 * The number of structural features of the '<em>Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.NamedElementImpl <em>Named Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.NamedElementImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getNamedElement()
-	 * @generated
-	 */
-	int NAMED_ELEMENT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMED_ELEMENT__NAME = ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Named Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMED_ELEMENT_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.PackageableElementImpl <em>Packageable Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.PackageableElementImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPackageableElement()
-	 * @generated
-	 */
-	int PACKAGEABLE_ELEMENT = 4;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PACKAGEABLE_ELEMENT__NAME = NAMED_ELEMENT__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Packageable Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PACKAGEABLE_ELEMENT_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.TypeImpl <em>Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.TypeImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getType()
-	 * @generated
-	 */
-	int TYPE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TYPE__NAME = PACKAGEABLE_ELEMENT__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TYPE_FEATURE_COUNT = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ClassifierImpl <em>Classifier</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ClassifierImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getClassifier()
-	 * @generated
-	 */
-	int CLASSIFIER = 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLASSIFIER__NAME = TYPE__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Classifier</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLASSIFIER_FEATURE_COUNT = TYPE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.NamespaceImpl <em>Namespace</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.NamespaceImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getNamespace()
-	 * @generated
-	 */
-	int NAMESPACE = 6;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__NAME = NAMED_ELEMENT__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Namespace</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.PackageImpl <em>Package</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.PackageImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPackage()
-	 * @generated
-	 */
-	int PACKAGE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PACKAGE__NAME = NAMESPACE__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Package</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PACKAGE_FEATURE_COUNT = NAMESPACE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.MethodElementImpl <em>Method Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.MethodElementImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMethodElement()
-	 * @generated
-	 */
-	int METHOD_ELEMENT = 7;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__NAME = PACKAGEABLE_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__GUID = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__BRIEF_DESCRIPTION = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__OWNED_RULES = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__SUPPRESSED = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__ORDERING_GUIDE = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Method Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT_FEATURE_COUNT = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ConstraintImpl <em>Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ConstraintImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getConstraint()
-	 * @generated
-	 */
-	int CONSTRAINT = 8;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__NAME = METHOD_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__GUID = METHOD_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__BRIEF_DESCRIPTION = METHOD_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__OWNED_RULES = METHOD_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__METHOD_ELEMENT_PROPERTY = METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__SUPPRESSED = METHOD_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__ORDERING_GUIDE = METHOD_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Body</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__BODY = METHOD_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT_FEATURE_COUNT = METHOD_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.MethodElementPropertyImpl <em>Method Element Property</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.MethodElementPropertyImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMethodElementProperty()
-	 * @generated
-	 */
-	int METHOD_ELEMENT_PROPERTY = 9;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT_PROPERTY__NAME = PACKAGEABLE_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT_PROPERTY__VALUE = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Method Element Property</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT_PROPERTY_FEATURE_COUNT = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.DescribableElementImpl <em>Describable Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.DescribableElementImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDescribableElement()
-	 * @generated
-	 */
-	int DESCRIBABLE_ELEMENT = 11;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__NAME = METHOD_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__GUID = METHOD_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__BRIEF_DESCRIPTION = METHOD_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__OWNED_RULES = METHOD_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__METHOD_ELEMENT_PROPERTY = METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__SUPPRESSED = METHOD_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__ORDERING_GUIDE = METHOD_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__PRESENTATION_NAME = METHOD_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__PRESENTATION = METHOD_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__SHAPEICON = METHOD_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__NODEICON = METHOD_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Describable Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT_FEATURE_COUNT = METHOD_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.VariabilityElementImpl <em>Variability Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.VariabilityElementImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getVariabilityElement()
-	 * @generated
-	 */
-	int VARIABILITY_ELEMENT = 111;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ContentElementImpl <em>Content Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ContentElementImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getContentElement()
-	 * @generated
-	 */
-	int CONTENT_ELEMENT = 10;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__NAME = DESCRIBABLE_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__GUID = DESCRIBABLE_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__BRIEF_DESCRIPTION = DESCRIBABLE_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__OWNED_RULES = DESCRIBABLE_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__METHOD_ELEMENT_PROPERTY = DESCRIBABLE_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__SUPPRESSED = DESCRIBABLE_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__ORDERING_GUIDE = DESCRIBABLE_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__PRESENTATION_NAME = DESCRIBABLE_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__PRESENTATION = DESCRIBABLE_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__SHAPEICON = DESCRIBABLE_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__NODEICON = DESCRIBABLE_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__VARIABILITY_TYPE = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__SUPPORTING_MATERIALS = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__CONCEPTS_AND_PAPERS = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__CHECKLISTS = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__GUIDELINES = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__EXAMPLES = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__ASSETS = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the '<em>Content Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT_FEATURE_COUNT = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.MethodUnitImpl <em>Method Unit</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.MethodUnitImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMethodUnit()
-	 * @generated
-	 */
-	int METHOD_UNIT = 112;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__NAME = METHOD_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__GUID = METHOD_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__BRIEF_DESCRIPTION = METHOD_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__OWNED_RULES = METHOD_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__METHOD_ELEMENT_PROPERTY = METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__SUPPRESSED = METHOD_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__ORDERING_GUIDE = METHOD_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__AUTHORS = METHOD_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__CHANGE_DATE = METHOD_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__CHANGE_DESCRIPTION = METHOD_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__VERSION = METHOD_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__COPYRIGHT_STATEMENT = METHOD_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Method Unit</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT_FEATURE_COUNT = METHOD_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ContentDescriptionImpl <em>Content Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ContentDescriptionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getContentDescription()
-	 * @generated
-	 */
-	int CONTENT_DESCRIPTION = 12;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__NAME = METHOD_UNIT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__GUID = METHOD_UNIT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__BRIEF_DESCRIPTION = METHOD_UNIT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__OWNED_RULES = METHOD_UNIT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__METHOD_ELEMENT_PROPERTY = METHOD_UNIT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__SUPPRESSED = METHOD_UNIT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__ORDERING_GUIDE = METHOD_UNIT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__AUTHORS = METHOD_UNIT__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__CHANGE_DATE = METHOD_UNIT__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__CHANGE_DESCRIPTION = METHOD_UNIT__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__VERSION = METHOD_UNIT__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__COPYRIGHT_STATEMENT = METHOD_UNIT__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__MAIN_DESCRIPTION = METHOD_UNIT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Sections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__SECTIONS = METHOD_UNIT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__KEY_CONSIDERATIONS = METHOD_UNIT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Content Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION_FEATURE_COUNT = METHOD_UNIT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABILITY_ELEMENT__NAME = METHOD_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABILITY_ELEMENT__GUID = METHOD_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABILITY_ELEMENT__BRIEF_DESCRIPTION = METHOD_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABILITY_ELEMENT__OWNED_RULES = METHOD_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABILITY_ELEMENT__METHOD_ELEMENT_PROPERTY = METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABILITY_ELEMENT__SUPPRESSED = METHOD_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABILITY_ELEMENT__ORDERING_GUIDE = METHOD_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABILITY_ELEMENT__VARIABILITY_TYPE = METHOD_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT = METHOD_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Variability Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABILITY_ELEMENT_FEATURE_COUNT = METHOD_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.SectionImpl <em>Section</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.SectionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getSection()
-	 * @generated
-	 */
-	int SECTION = 13;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__NAME = VARIABILITY_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__GUID = VARIABILITY_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__BRIEF_DESCRIPTION = VARIABILITY_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__OWNED_RULES = VARIABILITY_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__METHOD_ELEMENT_PROPERTY = VARIABILITY_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__SUPPRESSED = VARIABILITY_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__ORDERING_GUIDE = VARIABILITY_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__VARIABILITY_TYPE = VARIABILITY_ELEMENT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__VARIABILITY_BASED_ON_ELEMENT = VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Section Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__SECTION_NAME = VARIABILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Section Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__SECTION_DESCRIPTION = VARIABILITY_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Sub Sections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__SUB_SECTIONS = VARIABILITY_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__PREDECESSOR = VARIABILITY_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Section</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION_FEATURE_COUNT = VARIABILITY_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.RoleImpl <em>Role</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.RoleImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getRole()
-	 * @generated
-	 */
-	int ROLE = 14;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__NAME = CONTENT_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__GUID = CONTENT_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__BRIEF_DESCRIPTION = CONTENT_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__OWNED_RULES = CONTENT_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__METHOD_ELEMENT_PROPERTY = CONTENT_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__SUPPRESSED = CONTENT_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__ORDERING_GUIDE = CONTENT_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__PRESENTATION_NAME = CONTENT_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__PRESENTATION = CONTENT_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__SHAPEICON = CONTENT_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__NODEICON = CONTENT_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__VARIABILITY_TYPE = CONTENT_ELEMENT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__VARIABILITY_BASED_ON_ELEMENT = CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__SUPPORTING_MATERIALS = CONTENT_ELEMENT__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__CONCEPTS_AND_PAPERS = CONTENT_ELEMENT__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__CHECKLISTS = CONTENT_ELEMENT__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__GUIDELINES = CONTENT_ELEMENT__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__EXAMPLES = CONTENT_ELEMENT__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__ASSETS = CONTENT_ELEMENT__ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Modifies</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__MODIFIES = CONTENT_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Responsible For</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__RESPONSIBLE_FOR = CONTENT_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Role</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_FEATURE_COUNT = CONTENT_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.WorkProductImpl <em>Work Product</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.WorkProductImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkProduct()
-	 * @generated
-	 */
-	int WORK_PRODUCT = 15;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__NAME = CONTENT_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__GUID = CONTENT_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__BRIEF_DESCRIPTION = CONTENT_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__OWNED_RULES = CONTENT_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__METHOD_ELEMENT_PROPERTY = CONTENT_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__SUPPRESSED = CONTENT_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__ORDERING_GUIDE = CONTENT_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__PRESENTATION_NAME = CONTENT_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__PRESENTATION = CONTENT_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__SHAPEICON = CONTENT_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__NODEICON = CONTENT_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__VARIABILITY_TYPE = CONTENT_ELEMENT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__VARIABILITY_BASED_ON_ELEMENT = CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__SUPPORTING_MATERIALS = CONTENT_ELEMENT__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__CONCEPTS_AND_PAPERS = CONTENT_ELEMENT__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__CHECKLISTS = CONTENT_ELEMENT__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__GUIDELINES = CONTENT_ELEMENT__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__EXAMPLES = CONTENT_ELEMENT__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__ASSETS = CONTENT_ELEMENT__ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Reports</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__REPORTS = CONTENT_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Templates</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__TEMPLATES = CONTENT_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Tool Mentors</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__TOOL_MENTORS = CONTENT_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Estimation Considerations</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__ESTIMATION_CONSIDERATIONS = CONTENT_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Work Product</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_FEATURE_COUNT = CONTENT_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.TaskImpl <em>Task</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.TaskImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTask()
-	 * @generated
-	 */
-	int TASK = 16;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__NAME = CONTENT_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__GUID = CONTENT_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__BRIEF_DESCRIPTION = CONTENT_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__OWNED_RULES = CONTENT_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__METHOD_ELEMENT_PROPERTY = CONTENT_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__SUPPRESSED = CONTENT_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ORDERING_GUIDE = CONTENT_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__PRESENTATION_NAME = CONTENT_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__PRESENTATION = CONTENT_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__SHAPEICON = CONTENT_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__NODEICON = CONTENT_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__VARIABILITY_TYPE = CONTENT_ELEMENT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__VARIABILITY_BASED_ON_ELEMENT = CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__SUPPORTING_MATERIALS = CONTENT_ELEMENT__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__CONCEPTS_AND_PAPERS = CONTENT_ELEMENT__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__CHECKLISTS = CONTENT_ELEMENT__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__GUIDELINES = CONTENT_ELEMENT__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__EXAMPLES = CONTENT_ELEMENT__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ASSETS = CONTENT_ELEMENT__ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__PRECONDITION = CONTENT_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__POSTCONDITION = CONTENT_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Performed By</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__PERFORMED_BY = CONTENT_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Mandatory Input</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__MANDATORY_INPUT = CONTENT_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Output</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__OUTPUT = CONTENT_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Additionally Performed By</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ADDITIONALLY_PERFORMED_BY = CONTENT_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Optional Input</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__OPTIONAL_INPUT = CONTENT_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Steps</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__STEPS = CONTENT_ELEMENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Tool Mentors</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__TOOL_MENTORS = CONTENT_ELEMENT_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Estimation Considerations</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ESTIMATION_CONSIDERATIONS = CONTENT_ELEMENT_FEATURE_COUNT + 9;
-
-	/**
-	 * The number of structural features of the '<em>Task</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_FEATURE_COUNT = CONTENT_ELEMENT_FEATURE_COUNT + 10;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.WorkDefinitionImpl <em>Work Definition</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.WorkDefinitionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkDefinition()
-	 * @generated
-	 */
-	int WORK_DEFINITION = 17;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__NAME = METHOD_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__GUID = METHOD_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__BRIEF_DESCRIPTION = METHOD_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__OWNED_RULES = METHOD_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__METHOD_ELEMENT_PROPERTY = METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__SUPPRESSED = METHOD_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__ORDERING_GUIDE = METHOD_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__PRECONDITION = METHOD_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__POSTCONDITION = METHOD_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Work Definition</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION_FEATURE_COUNT = METHOD_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.StepImpl <em>Step</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.StepImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getStep()
-	 * @generated
-	 */
-	int STEP = 18;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP__NAME = SECTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP__GUID = SECTION__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP__BRIEF_DESCRIPTION = SECTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP__OWNED_RULES = SECTION__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP__METHOD_ELEMENT_PROPERTY = SECTION__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP__SUPPRESSED = SECTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP__ORDERING_GUIDE = SECTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP__VARIABILITY_TYPE = SECTION__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP__VARIABILITY_BASED_ON_ELEMENT = SECTION__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Section Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP__SECTION_NAME = SECTION__SECTION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Section Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP__SECTION_DESCRIPTION = SECTION__SECTION_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Sub Sections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP__SUB_SECTIONS = SECTION__SUB_SECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP__PREDECESSOR = SECTION__PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP__PRECONDITION = SECTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP__POSTCONDITION = SECTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Step</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STEP_FEATURE_COUNT = SECTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.GuidanceImpl <em>Guidance</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.GuidanceImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGuidance()
-	 * @generated
-	 */
-	int GUIDANCE = 19;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__NAME = CONTENT_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__GUID = CONTENT_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__BRIEF_DESCRIPTION = CONTENT_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__OWNED_RULES = CONTENT_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__METHOD_ELEMENT_PROPERTY = CONTENT_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__SUPPRESSED = CONTENT_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__ORDERING_GUIDE = CONTENT_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__PRESENTATION_NAME = CONTENT_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__PRESENTATION = CONTENT_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__SHAPEICON = CONTENT_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__NODEICON = CONTENT_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__VARIABILITY_TYPE = CONTENT_ELEMENT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__VARIABILITY_BASED_ON_ELEMENT = CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__SUPPORTING_MATERIALS = CONTENT_ELEMENT__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__CONCEPTS_AND_PAPERS = CONTENT_ELEMENT__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__CHECKLISTS = CONTENT_ELEMENT__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__GUIDELINES = CONTENT_ELEMENT__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__EXAMPLES = CONTENT_ELEMENT__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__ASSETS = CONTENT_ELEMENT__ASSETS;
-
-	/**
-	 * The number of structural features of the '<em>Guidance</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_FEATURE_COUNT = CONTENT_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ArtifactImpl <em>Artifact</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ArtifactImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getArtifact()
-	 * @generated
-	 */
-	int ARTIFACT = 20;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__NAME = WORK_PRODUCT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__GUID = WORK_PRODUCT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__BRIEF_DESCRIPTION = WORK_PRODUCT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__OWNED_RULES = WORK_PRODUCT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__METHOD_ELEMENT_PROPERTY = WORK_PRODUCT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__SUPPRESSED = WORK_PRODUCT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__ORDERING_GUIDE = WORK_PRODUCT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__PRESENTATION_NAME = WORK_PRODUCT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__PRESENTATION = WORK_PRODUCT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__SHAPEICON = WORK_PRODUCT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__NODEICON = WORK_PRODUCT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__VARIABILITY_TYPE = WORK_PRODUCT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__VARIABILITY_BASED_ON_ELEMENT = WORK_PRODUCT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__SUPPORTING_MATERIALS = WORK_PRODUCT__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__CONCEPTS_AND_PAPERS = WORK_PRODUCT__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__CHECKLISTS = WORK_PRODUCT__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__GUIDELINES = WORK_PRODUCT__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__EXAMPLES = WORK_PRODUCT__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__ASSETS = WORK_PRODUCT__ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Reports</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__REPORTS = WORK_PRODUCT__REPORTS;
-
-	/**
-	 * The feature id for the '<em><b>Templates</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__TEMPLATES = WORK_PRODUCT__TEMPLATES;
-
-	/**
-	 * The feature id for the '<em><b>Tool Mentors</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__TOOL_MENTORS = WORK_PRODUCT__TOOL_MENTORS;
-
-	/**
-	 * The feature id for the '<em><b>Estimation Considerations</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__ESTIMATION_CONSIDERATIONS = WORK_PRODUCT__ESTIMATION_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Container Artifact</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__CONTAINER_ARTIFACT = WORK_PRODUCT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Contained Artifacts</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__CONTAINED_ARTIFACTS = WORK_PRODUCT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Artifact</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_FEATURE_COUNT = WORK_PRODUCT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.DeliverableImpl <em>Deliverable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.DeliverableImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDeliverable()
-	 * @generated
-	 */
-	int DELIVERABLE = 21;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__NAME = WORK_PRODUCT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__GUID = WORK_PRODUCT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__BRIEF_DESCRIPTION = WORK_PRODUCT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__OWNED_RULES = WORK_PRODUCT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__METHOD_ELEMENT_PROPERTY = WORK_PRODUCT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__SUPPRESSED = WORK_PRODUCT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__ORDERING_GUIDE = WORK_PRODUCT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__PRESENTATION_NAME = WORK_PRODUCT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__PRESENTATION = WORK_PRODUCT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__SHAPEICON = WORK_PRODUCT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__NODEICON = WORK_PRODUCT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__VARIABILITY_TYPE = WORK_PRODUCT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__VARIABILITY_BASED_ON_ELEMENT = WORK_PRODUCT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__SUPPORTING_MATERIALS = WORK_PRODUCT__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__CONCEPTS_AND_PAPERS = WORK_PRODUCT__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__CHECKLISTS = WORK_PRODUCT__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__GUIDELINES = WORK_PRODUCT__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__EXAMPLES = WORK_PRODUCT__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__ASSETS = WORK_PRODUCT__ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Reports</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__REPORTS = WORK_PRODUCT__REPORTS;
-
-	/**
-	 * The feature id for the '<em><b>Templates</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__TEMPLATES = WORK_PRODUCT__TEMPLATES;
-
-	/**
-	 * The feature id for the '<em><b>Tool Mentors</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__TOOL_MENTORS = WORK_PRODUCT__TOOL_MENTORS;
-
-	/**
-	 * The feature id for the '<em><b>Estimation Considerations</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__ESTIMATION_CONSIDERATIONS = WORK_PRODUCT__ESTIMATION_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Delivered Work Products</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__DELIVERED_WORK_PRODUCTS = WORK_PRODUCT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Deliverable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_FEATURE_COUNT = WORK_PRODUCT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.OutcomeImpl <em>Outcome</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.OutcomeImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getOutcome()
-	 * @generated
-	 */
-	int OUTCOME = 22;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__NAME = WORK_PRODUCT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__GUID = WORK_PRODUCT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__BRIEF_DESCRIPTION = WORK_PRODUCT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__OWNED_RULES = WORK_PRODUCT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__METHOD_ELEMENT_PROPERTY = WORK_PRODUCT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__SUPPRESSED = WORK_PRODUCT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__ORDERING_GUIDE = WORK_PRODUCT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__PRESENTATION_NAME = WORK_PRODUCT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__PRESENTATION = WORK_PRODUCT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__SHAPEICON = WORK_PRODUCT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__NODEICON = WORK_PRODUCT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__VARIABILITY_TYPE = WORK_PRODUCT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__VARIABILITY_BASED_ON_ELEMENT = WORK_PRODUCT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__SUPPORTING_MATERIALS = WORK_PRODUCT__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__CONCEPTS_AND_PAPERS = WORK_PRODUCT__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__CHECKLISTS = WORK_PRODUCT__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__GUIDELINES = WORK_PRODUCT__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__EXAMPLES = WORK_PRODUCT__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__ASSETS = WORK_PRODUCT__ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Reports</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__REPORTS = WORK_PRODUCT__REPORTS;
-
-	/**
-	 * The feature id for the '<em><b>Templates</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__TEMPLATES = WORK_PRODUCT__TEMPLATES;
-
-	/**
-	 * The feature id for the '<em><b>Tool Mentors</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__TOOL_MENTORS = WORK_PRODUCT__TOOL_MENTORS;
-
-	/**
-	 * The feature id for the '<em><b>Estimation Considerations</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__ESTIMATION_CONSIDERATIONS = WORK_PRODUCT__ESTIMATION_CONSIDERATIONS;
-
-	/**
-	 * The number of structural features of the '<em>Outcome</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME_FEATURE_COUNT = WORK_PRODUCT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.MethodPackageImpl <em>Method Package</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.MethodPackageImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMethodPackage()
-	 * @generated
-	 */
-	int METHOD_PACKAGE = 23;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__NAME = METHOD_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__GUID = METHOD_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__BRIEF_DESCRIPTION = METHOD_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__OWNED_RULES = METHOD_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__METHOD_ELEMENT_PROPERTY = METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__SUPPRESSED = METHOD_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__ORDERING_GUIDE = METHOD_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Global</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__GLOBAL = METHOD_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Reused Packages</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__REUSED_PACKAGES = METHOD_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Child Packages</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__CHILD_PACKAGES = METHOD_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Method Package</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE_FEATURE_COUNT = METHOD_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ContentPackageImpl <em>Content Package</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ContentPackageImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getContentPackage()
-	 * @generated
-	 */
-	int CONTENT_PACKAGE = 24;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__NAME = METHOD_PACKAGE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__GUID = METHOD_PACKAGE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__BRIEF_DESCRIPTION = METHOD_PACKAGE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__OWNED_RULES = METHOD_PACKAGE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__METHOD_ELEMENT_PROPERTY = METHOD_PACKAGE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__SUPPRESSED = METHOD_PACKAGE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__ORDERING_GUIDE = METHOD_PACKAGE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Global</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__GLOBAL = METHOD_PACKAGE__GLOBAL;
-
-	/**
-	 * The feature id for the '<em><b>Reused Packages</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__REUSED_PACKAGES = METHOD_PACKAGE__REUSED_PACKAGES;
-
-	/**
-	 * The feature id for the '<em><b>Child Packages</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__CHILD_PACKAGES = METHOD_PACKAGE__CHILD_PACKAGES;
-
-	/**
-	 * The feature id for the '<em><b>Content Elements</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__CONTENT_ELEMENTS = METHOD_PACKAGE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Content Package</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE_FEATURE_COUNT = METHOD_PACKAGE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.WorkProductDescriptionImpl <em>Work Product Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.WorkProductDescriptionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkProductDescription()
-	 * @generated
-	 */
-	int WORK_PRODUCT_DESCRIPTION = 26;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__NAME = CONTENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__GUID = CONTENT_DESCRIPTION__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__BRIEF_DESCRIPTION = CONTENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__OWNED_RULES = CONTENT_DESCRIPTION__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__METHOD_ELEMENT_PROPERTY = CONTENT_DESCRIPTION__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__SUPPRESSED = CONTENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__ORDERING_GUIDE = CONTENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__AUTHORS = CONTENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__CHANGE_DATE = CONTENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__CHANGE_DESCRIPTION = CONTENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__VERSION = CONTENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__COPYRIGHT_STATEMENT = CONTENT_DESCRIPTION__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__MAIN_DESCRIPTION = CONTENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Sections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__SECTIONS = CONTENT_DESCRIPTION__SECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__KEY_CONSIDERATIONS = CONTENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>External Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID = CONTENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__PURPOSE = CONTENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Impact Of Not Having</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING = CONTENT_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Reasons For Not Needing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING = CONTENT_DESCRIPTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Work Product Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION_FEATURE_COUNT = CONTENT_DESCRIPTION_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ArtifactDescriptionImpl <em>Artifact Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ArtifactDescriptionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getArtifactDescription()
-	 * @generated
-	 */
-	int ARTIFACT_DESCRIPTION = 25;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__NAME = WORK_PRODUCT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__GUID = WORK_PRODUCT_DESCRIPTION__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__BRIEF_DESCRIPTION = WORK_PRODUCT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__OWNED_RULES = WORK_PRODUCT_DESCRIPTION__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__METHOD_ELEMENT_PROPERTY = WORK_PRODUCT_DESCRIPTION__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__SUPPRESSED = WORK_PRODUCT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__ORDERING_GUIDE = WORK_PRODUCT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__AUTHORS = WORK_PRODUCT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__CHANGE_DATE = WORK_PRODUCT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__CHANGE_DESCRIPTION = WORK_PRODUCT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__VERSION = WORK_PRODUCT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__COPYRIGHT_STATEMENT = WORK_PRODUCT_DESCRIPTION__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__MAIN_DESCRIPTION = WORK_PRODUCT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Sections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__SECTIONS = WORK_PRODUCT_DESCRIPTION__SECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__KEY_CONSIDERATIONS = WORK_PRODUCT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>External Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__EXTERNAL_ID = WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID;
-
-	/**
-	 * The feature id for the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__PURPOSE = WORK_PRODUCT_DESCRIPTION__PURPOSE;
-
-	/**
-	 * The feature id for the '<em><b>Impact Of Not Having</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__IMPACT_OF_NOT_HAVING = WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING;
-
-	/**
-	 * The feature id for the '<em><b>Reasons For Not Needing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__REASONS_FOR_NOT_NEEDING = WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING;
-
-	/**
-	 * The feature id for the '<em><b>Brief Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__BRIEF_OUTLINE = WORK_PRODUCT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Representation Options</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS = WORK_PRODUCT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Artifact Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION_FEATURE_COUNT = WORK_PRODUCT_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.DeliverableDescriptionImpl <em>Deliverable Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.DeliverableDescriptionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDeliverableDescription()
-	 * @generated
-	 */
-	int DELIVERABLE_DESCRIPTION = 27;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__NAME = WORK_PRODUCT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__GUID = WORK_PRODUCT_DESCRIPTION__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__BRIEF_DESCRIPTION = WORK_PRODUCT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__OWNED_RULES = WORK_PRODUCT_DESCRIPTION__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__METHOD_ELEMENT_PROPERTY = WORK_PRODUCT_DESCRIPTION__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__SUPPRESSED = WORK_PRODUCT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__ORDERING_GUIDE = WORK_PRODUCT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__AUTHORS = WORK_PRODUCT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__CHANGE_DATE = WORK_PRODUCT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__CHANGE_DESCRIPTION = WORK_PRODUCT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__VERSION = WORK_PRODUCT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__COPYRIGHT_STATEMENT = WORK_PRODUCT_DESCRIPTION__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__MAIN_DESCRIPTION = WORK_PRODUCT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Sections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__SECTIONS = WORK_PRODUCT_DESCRIPTION__SECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__KEY_CONSIDERATIONS = WORK_PRODUCT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>External Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__EXTERNAL_ID = WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID;
-
-	/**
-	 * The feature id for the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__PURPOSE = WORK_PRODUCT_DESCRIPTION__PURPOSE;
-
-	/**
-	 * The feature id for the '<em><b>Impact Of Not Having</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__IMPACT_OF_NOT_HAVING = WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING;
-
-	/**
-	 * The feature id for the '<em><b>Reasons For Not Needing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__REASONS_FOR_NOT_NEEDING = WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING;
-
-	/**
-	 * The feature id for the '<em><b>External Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION = WORK_PRODUCT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Packaging Guidance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE = WORK_PRODUCT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Deliverable Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION_FEATURE_COUNT = WORK_PRODUCT_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.RoleDescriptionImpl <em>Role Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.RoleDescriptionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getRoleDescription()
-	 * @generated
-	 */
-	int ROLE_DESCRIPTION = 28;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__NAME = CONTENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__GUID = CONTENT_DESCRIPTION__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__BRIEF_DESCRIPTION = CONTENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__OWNED_RULES = CONTENT_DESCRIPTION__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__METHOD_ELEMENT_PROPERTY = CONTENT_DESCRIPTION__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__SUPPRESSED = CONTENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__ORDERING_GUIDE = CONTENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__AUTHORS = CONTENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__CHANGE_DATE = CONTENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__CHANGE_DESCRIPTION = CONTENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__VERSION = CONTENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__COPYRIGHT_STATEMENT = CONTENT_DESCRIPTION__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__MAIN_DESCRIPTION = CONTENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Sections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__SECTIONS = CONTENT_DESCRIPTION__SECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__KEY_CONSIDERATIONS = CONTENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Skills</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__SKILLS = CONTENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Assignment Approaches</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES = CONTENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Synonyms</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__SYNONYMS = CONTENT_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Role Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION_FEATURE_COUNT = CONTENT_DESCRIPTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.TaskDescriptionImpl <em>Task Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.TaskDescriptionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTaskDescription()
-	 * @generated
-	 */
-	int TASK_DESCRIPTION = 29;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__NAME = CONTENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__GUID = CONTENT_DESCRIPTION__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__BRIEF_DESCRIPTION = CONTENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__OWNED_RULES = CONTENT_DESCRIPTION__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__METHOD_ELEMENT_PROPERTY = CONTENT_DESCRIPTION__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__SUPPRESSED = CONTENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__ORDERING_GUIDE = CONTENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__AUTHORS = CONTENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__CHANGE_DATE = CONTENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__CHANGE_DESCRIPTION = CONTENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__VERSION = CONTENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__COPYRIGHT_STATEMENT = CONTENT_DESCRIPTION__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__MAIN_DESCRIPTION = CONTENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Sections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__SECTIONS = CONTENT_DESCRIPTION__SECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__KEY_CONSIDERATIONS = CONTENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__PURPOSE = CONTENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Alternatives</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__ALTERNATIVES = CONTENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Task Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION_FEATURE_COUNT = CONTENT_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.GuidanceDescriptionImpl <em>Guidance Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.GuidanceDescriptionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGuidanceDescription()
-	 * @generated
-	 */
-	int GUIDANCE_DESCRIPTION = 30;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__NAME = CONTENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__GUID = CONTENT_DESCRIPTION__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__BRIEF_DESCRIPTION = CONTENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__OWNED_RULES = CONTENT_DESCRIPTION__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__METHOD_ELEMENT_PROPERTY = CONTENT_DESCRIPTION__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__SUPPRESSED = CONTENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__ORDERING_GUIDE = CONTENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__AUTHORS = CONTENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__CHANGE_DATE = CONTENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__CHANGE_DESCRIPTION = CONTENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__VERSION = CONTENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__COPYRIGHT_STATEMENT = CONTENT_DESCRIPTION__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__MAIN_DESCRIPTION = CONTENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Sections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__SECTIONS = CONTENT_DESCRIPTION__SECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__KEY_CONSIDERATIONS = CONTENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Attachments</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__ATTACHMENTS = CONTENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Guidance Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION_FEATURE_COUNT = CONTENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.PracticeDescriptionImpl <em>Practice Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.PracticeDescriptionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPracticeDescription()
-	 * @generated
-	 */
-	int PRACTICE_DESCRIPTION = 31;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__NAME = CONTENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__GUID = CONTENT_DESCRIPTION__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__BRIEF_DESCRIPTION = CONTENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__OWNED_RULES = CONTENT_DESCRIPTION__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__METHOD_ELEMENT_PROPERTY = CONTENT_DESCRIPTION__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__SUPPRESSED = CONTENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__ORDERING_GUIDE = CONTENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__AUTHORS = CONTENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__CHANGE_DATE = CONTENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__CHANGE_DESCRIPTION = CONTENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__VERSION = CONTENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__COPYRIGHT_STATEMENT = CONTENT_DESCRIPTION__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__MAIN_DESCRIPTION = CONTENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Sections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__SECTIONS = CONTENT_DESCRIPTION__SECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__KEY_CONSIDERATIONS = CONTENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Additional Info</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__ADDITIONAL_INFO = CONTENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Problem</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__PROBLEM = CONTENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Background</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__BACKGROUND = CONTENT_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Goals</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__GOALS = CONTENT_DESCRIPTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Application</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__APPLICATION = CONTENT_DESCRIPTION_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Levels Of Adoption</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION = CONTENT_DESCRIPTION_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Practice Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION_FEATURE_COUNT = CONTENT_DESCRIPTION_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.PointImpl <em>Point</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.PointImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPoint()
-	 * @generated
-	 */
-	int POINT = 32;
-
-	/**
-	 * The feature id for the '<em><b>X</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POINT__X = 0;
-
-	/**
-	 * The feature id for the '<em><b>Y</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POINT__Y = 1;
-
-	/**
-	 * The number of structural features of the '<em>Point</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POINT_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.DiagramElementImpl <em>Diagram Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.DiagramElementImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDiagramElement()
-	 * @generated
-	 */
-	int DIAGRAM_ELEMENT = 34;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT__NAME = METHOD_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT__GUID = METHOD_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT__BRIEF_DESCRIPTION = METHOD_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT__OWNED_RULES = METHOD_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT__METHOD_ELEMENT_PROPERTY = METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT__SUPPRESSED = METHOD_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT__ORDERING_GUIDE = METHOD_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT__IS_VISIBLE = METHOD_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT__CONTAINER = METHOD_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT__REFERENCE = METHOD_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT__PROPERTY = METHOD_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Diagram Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT_FEATURE_COUNT = METHOD_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.GraphElementImpl <em>Graph Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.GraphElementImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGraphElement()
-	 * @generated
-	 */
-	int GRAPH_ELEMENT = 33;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__NAME = DIAGRAM_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__GUID = DIAGRAM_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__BRIEF_DESCRIPTION = DIAGRAM_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__OWNED_RULES = DIAGRAM_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__METHOD_ELEMENT_PROPERTY = DIAGRAM_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__SUPPRESSED = DIAGRAM_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__ORDERING_GUIDE = DIAGRAM_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__IS_VISIBLE = DIAGRAM_ELEMENT__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__CONTAINER = DIAGRAM_ELEMENT__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__REFERENCE = DIAGRAM_ELEMENT__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__PROPERTY = DIAGRAM_ELEMENT__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Position</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__POSITION = DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Contained</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__CONTAINED = DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Link</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__LINK = DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Anchorage</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__ANCHORAGE = DIAGRAM_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Semantic Model</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT__SEMANTIC_MODEL = DIAGRAM_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Graph Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_ELEMENT_FEATURE_COUNT = DIAGRAM_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.DiagramLinkImpl <em>Diagram Link</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.DiagramLinkImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDiagramLink()
-	 * @generated
-	 */
-	int DIAGRAM_LINK = 35;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK__NAME = DIAGRAM_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK__GUID = DIAGRAM_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK__BRIEF_DESCRIPTION = DIAGRAM_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK__OWNED_RULES = DIAGRAM_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK__METHOD_ELEMENT_PROPERTY = DIAGRAM_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK__SUPPRESSED = DIAGRAM_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK__ORDERING_GUIDE = DIAGRAM_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK__IS_VISIBLE = DIAGRAM_ELEMENT__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK__CONTAINER = DIAGRAM_ELEMENT__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK__REFERENCE = DIAGRAM_ELEMENT__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK__PROPERTY = DIAGRAM_ELEMENT__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Zoom</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK__ZOOM = DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Viewport</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK__VIEWPORT = DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Graph Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK__GRAPH_ELEMENT = DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK__DIAGRAM = DIAGRAM_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Diagram Link</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LINK_FEATURE_COUNT = DIAGRAM_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.GraphConnectorImpl <em>Graph Connector</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.GraphConnectorImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGraphConnector()
-	 * @generated
-	 */
-	int GRAPH_CONNECTOR = 36;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__NAME = GRAPH_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__GUID = GRAPH_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__BRIEF_DESCRIPTION = GRAPH_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__OWNED_RULES = GRAPH_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__METHOD_ELEMENT_PROPERTY = GRAPH_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__SUPPRESSED = GRAPH_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__ORDERING_GUIDE = GRAPH_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__IS_VISIBLE = GRAPH_ELEMENT__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__CONTAINER = GRAPH_ELEMENT__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__REFERENCE = GRAPH_ELEMENT__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__PROPERTY = GRAPH_ELEMENT__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Position</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__POSITION = GRAPH_ELEMENT__POSITION;
-
-	/**
-	 * The feature id for the '<em><b>Contained</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__CONTAINED = GRAPH_ELEMENT__CONTAINED;
-
-	/**
-	 * The feature id for the '<em><b>Link</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__LINK = GRAPH_ELEMENT__LINK;
-
-	/**
-	 * The feature id for the '<em><b>Anchorage</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__ANCHORAGE = GRAPH_ELEMENT__ANCHORAGE;
-
-	/**
-	 * The feature id for the '<em><b>Semantic Model</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__SEMANTIC_MODEL = GRAPH_ELEMENT__SEMANTIC_MODEL;
-
-	/**
-	 * The feature id for the '<em><b>Graph Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__GRAPH_ELEMENT = GRAPH_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Graph Edge</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR__GRAPH_EDGE = GRAPH_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Graph Connector</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_CONNECTOR_FEATURE_COUNT = GRAPH_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.SemanticModelBridgeImpl <em>Semantic Model Bridge</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.SemanticModelBridgeImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getSemanticModelBridge()
-	 * @generated
-	 */
-	int SEMANTIC_MODEL_BRIDGE = 37;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_MODEL_BRIDGE__NAME = DIAGRAM_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_MODEL_BRIDGE__GUID = DIAGRAM_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_MODEL_BRIDGE__BRIEF_DESCRIPTION = DIAGRAM_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_MODEL_BRIDGE__OWNED_RULES = DIAGRAM_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_MODEL_BRIDGE__METHOD_ELEMENT_PROPERTY = DIAGRAM_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_MODEL_BRIDGE__SUPPRESSED = DIAGRAM_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_MODEL_BRIDGE__ORDERING_GUIDE = DIAGRAM_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_MODEL_BRIDGE__IS_VISIBLE = DIAGRAM_ELEMENT__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_MODEL_BRIDGE__CONTAINER = DIAGRAM_ELEMENT__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_MODEL_BRIDGE__REFERENCE = DIAGRAM_ELEMENT__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_MODEL_BRIDGE__PROPERTY = DIAGRAM_ELEMENT__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_MODEL_BRIDGE__PRESENTATION = DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Graph Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT = DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_MODEL_BRIDGE__DIAGRAM = DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Semantic Model Bridge</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_MODEL_BRIDGE_FEATURE_COUNT = DIAGRAM_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.DimensionImpl <em>Dimension</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.DimensionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDimension()
-	 * @generated
-	 */
-	int DIMENSION = 38;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIMENSION__WIDTH = 0;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIMENSION__HEIGHT = 1;
-
-	/**
-	 * The number of structural features of the '<em>Dimension</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIMENSION_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ReferenceImpl <em>Reference</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ReferenceImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getReference()
-	 * @generated
-	 */
-	int REFERENCE = 39;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE__NAME = DIAGRAM_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE__GUID = DIAGRAM_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE__BRIEF_DESCRIPTION = DIAGRAM_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE__OWNED_RULES = DIAGRAM_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE__METHOD_ELEMENT_PROPERTY = DIAGRAM_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE__SUPPRESSED = DIAGRAM_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE__ORDERING_GUIDE = DIAGRAM_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE__IS_VISIBLE = DIAGRAM_ELEMENT__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE__CONTAINER = DIAGRAM_ELEMENT__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE__REFERENCE = DIAGRAM_ELEMENT__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE__PROPERTY = DIAGRAM_ELEMENT__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Is Individual Representation</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE__IS_INDIVIDUAL_REPRESENTATION = DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Referenced</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE__REFERENCED = DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Reference</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE_FEATURE_COUNT = DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.PropertyImpl <em>Property</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.PropertyImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProperty()
-	 * @generated
-	 */
-	int PROPERTY = 40;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY__NAME = DIAGRAM_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY__GUID = DIAGRAM_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY__BRIEF_DESCRIPTION = DIAGRAM_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY__OWNED_RULES = DIAGRAM_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY__METHOD_ELEMENT_PROPERTY = DIAGRAM_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY__SUPPRESSED = DIAGRAM_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY__ORDERING_GUIDE = DIAGRAM_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY__IS_VISIBLE = DIAGRAM_ELEMENT__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY__CONTAINER = DIAGRAM_ELEMENT__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY__REFERENCE = DIAGRAM_ELEMENT__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY__PROPERTY = DIAGRAM_ELEMENT__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY__KEY = DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY__VALUE = DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Property</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_FEATURE_COUNT = DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.GraphEdgeImpl <em>Graph Edge</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.GraphEdgeImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGraphEdge()
-	 * @generated
-	 */
-	int GRAPH_EDGE = 41;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__NAME = GRAPH_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__GUID = GRAPH_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__BRIEF_DESCRIPTION = GRAPH_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__OWNED_RULES = GRAPH_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__METHOD_ELEMENT_PROPERTY = GRAPH_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__SUPPRESSED = GRAPH_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__ORDERING_GUIDE = GRAPH_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__IS_VISIBLE = GRAPH_ELEMENT__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__CONTAINER = GRAPH_ELEMENT__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__REFERENCE = GRAPH_ELEMENT__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__PROPERTY = GRAPH_ELEMENT__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Position</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__POSITION = GRAPH_ELEMENT__POSITION;
-
-	/**
-	 * The feature id for the '<em><b>Contained</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__CONTAINED = GRAPH_ELEMENT__CONTAINED;
-
-	/**
-	 * The feature id for the '<em><b>Link</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__LINK = GRAPH_ELEMENT__LINK;
-
-	/**
-	 * The feature id for the '<em><b>Anchorage</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__ANCHORAGE = GRAPH_ELEMENT__ANCHORAGE;
-
-	/**
-	 * The feature id for the '<em><b>Semantic Model</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__SEMANTIC_MODEL = GRAPH_ELEMENT__SEMANTIC_MODEL;
-
-	/**
-	 * The feature id for the '<em><b>Anchor</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__ANCHOR = GRAPH_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Waypoints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE__WAYPOINTS = GRAPH_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Graph Edge</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_EDGE_FEATURE_COUNT = GRAPH_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.GraphNodeImpl <em>Graph Node</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.GraphNodeImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGraphNode()
-	 * @generated
-	 */
-	int GRAPH_NODE = 43;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__NAME = GRAPH_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__GUID = GRAPH_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__BRIEF_DESCRIPTION = GRAPH_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__OWNED_RULES = GRAPH_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__METHOD_ELEMENT_PROPERTY = GRAPH_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__SUPPRESSED = GRAPH_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__ORDERING_GUIDE = GRAPH_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__IS_VISIBLE = GRAPH_ELEMENT__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__CONTAINER = GRAPH_ELEMENT__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__REFERENCE = GRAPH_ELEMENT__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__PROPERTY = GRAPH_ELEMENT__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Position</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__POSITION = GRAPH_ELEMENT__POSITION;
-
-	/**
-	 * The feature id for the '<em><b>Contained</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__CONTAINED = GRAPH_ELEMENT__CONTAINED;
-
-	/**
-	 * The feature id for the '<em><b>Link</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__LINK = GRAPH_ELEMENT__LINK;
-
-	/**
-	 * The feature id for the '<em><b>Anchorage</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__ANCHORAGE = GRAPH_ELEMENT__ANCHORAGE;
-
-	/**
-	 * The feature id for the '<em><b>Semantic Model</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__SEMANTIC_MODEL = GRAPH_ELEMENT__SEMANTIC_MODEL;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE__SIZE = GRAPH_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Graph Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPH_NODE_FEATURE_COUNT = GRAPH_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.DiagramImpl <em>Diagram</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.DiagramImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDiagram()
-	 * @generated
-	 */
-	int DIAGRAM = 42;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__NAME = GRAPH_NODE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__GUID = GRAPH_NODE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__BRIEF_DESCRIPTION = GRAPH_NODE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__OWNED_RULES = GRAPH_NODE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__METHOD_ELEMENT_PROPERTY = GRAPH_NODE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__SUPPRESSED = GRAPH_NODE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__ORDERING_GUIDE = GRAPH_NODE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__IS_VISIBLE = GRAPH_NODE__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__CONTAINER = GRAPH_NODE__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__REFERENCE = GRAPH_NODE__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__PROPERTY = GRAPH_NODE__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Position</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__POSITION = GRAPH_NODE__POSITION;
-
-	/**
-	 * The feature id for the '<em><b>Contained</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__CONTAINED = GRAPH_NODE__CONTAINED;
-
-	/**
-	 * The feature id for the '<em><b>Link</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__LINK = GRAPH_NODE__LINK;
-
-	/**
-	 * The feature id for the '<em><b>Anchorage</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__ANCHORAGE = GRAPH_NODE__ANCHORAGE;
-
-	/**
-	 * The feature id for the '<em><b>Semantic Model</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__SEMANTIC_MODEL = GRAPH_NODE__SEMANTIC_MODEL;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__SIZE = GRAPH_NODE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Zoom</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__ZOOM = GRAPH_NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Viewpoint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__VIEWPOINT = GRAPH_NODE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Diagram Link</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__DIAGRAM_LINK = GRAPH_NODE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Namespace</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM__NAMESPACE = GRAPH_NODE_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Diagram</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_FEATURE_COUNT = GRAPH_NODE_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.SimpleSemanticModelElementImpl <em>Simple Semantic Model Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.SimpleSemanticModelElementImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getSimpleSemanticModelElement()
-	 * @generated
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT = 44;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT__NAME = SEMANTIC_MODEL_BRIDGE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT__GUID = SEMANTIC_MODEL_BRIDGE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT__BRIEF_DESCRIPTION = SEMANTIC_MODEL_BRIDGE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT__OWNED_RULES = SEMANTIC_MODEL_BRIDGE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT__METHOD_ELEMENT_PROPERTY = SEMANTIC_MODEL_BRIDGE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT__SUPPRESSED = SEMANTIC_MODEL_BRIDGE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT__ORDERING_GUIDE = SEMANTIC_MODEL_BRIDGE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT__IS_VISIBLE = SEMANTIC_MODEL_BRIDGE__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT__CONTAINER = SEMANTIC_MODEL_BRIDGE__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT__REFERENCE = SEMANTIC_MODEL_BRIDGE__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT__PROPERTY = SEMANTIC_MODEL_BRIDGE__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT__PRESENTATION = SEMANTIC_MODEL_BRIDGE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Graph Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT__GRAPH_ELEMENT = SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT__DIAGRAM = SEMANTIC_MODEL_BRIDGE__DIAGRAM;
-
-	/**
-	 * The feature id for the '<em><b>Type Info</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT__TYPE_INFO = SEMANTIC_MODEL_BRIDGE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Simple Semantic Model Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIMPLE_SEMANTIC_MODEL_ELEMENT_FEATURE_COUNT = SEMANTIC_MODEL_BRIDGE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.UMASemanticModelBridgeImpl <em>UMA Semantic Model Bridge</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.UMASemanticModelBridgeImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getUMASemanticModelBridge()
-	 * @generated
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE = 45;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE__NAME = SEMANTIC_MODEL_BRIDGE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE__GUID = SEMANTIC_MODEL_BRIDGE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE__BRIEF_DESCRIPTION = SEMANTIC_MODEL_BRIDGE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE__OWNED_RULES = SEMANTIC_MODEL_BRIDGE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE__METHOD_ELEMENT_PROPERTY = SEMANTIC_MODEL_BRIDGE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE__SUPPRESSED = SEMANTIC_MODEL_BRIDGE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE__ORDERING_GUIDE = SEMANTIC_MODEL_BRIDGE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE__IS_VISIBLE = SEMANTIC_MODEL_BRIDGE__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE__CONTAINER = SEMANTIC_MODEL_BRIDGE__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE__REFERENCE = SEMANTIC_MODEL_BRIDGE__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE__PROPERTY = SEMANTIC_MODEL_BRIDGE__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE__PRESENTATION = SEMANTIC_MODEL_BRIDGE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Graph Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT = SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE__DIAGRAM = SEMANTIC_MODEL_BRIDGE__DIAGRAM;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE__ELEMENT = SEMANTIC_MODEL_BRIDGE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>UMA Semantic Model Bridge</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UMA_SEMANTIC_MODEL_BRIDGE_FEATURE_COUNT = SEMANTIC_MODEL_BRIDGE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.CoreSemanticModelBridgeImpl <em>Core Semantic Model Bridge</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.CoreSemanticModelBridgeImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getCoreSemanticModelBridge()
-	 * @generated
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE = 46;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE__NAME = SEMANTIC_MODEL_BRIDGE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE__GUID = SEMANTIC_MODEL_BRIDGE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE__BRIEF_DESCRIPTION = SEMANTIC_MODEL_BRIDGE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE__OWNED_RULES = SEMANTIC_MODEL_BRIDGE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE__METHOD_ELEMENT_PROPERTY = SEMANTIC_MODEL_BRIDGE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE__SUPPRESSED = SEMANTIC_MODEL_BRIDGE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE__ORDERING_GUIDE = SEMANTIC_MODEL_BRIDGE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE__IS_VISIBLE = SEMANTIC_MODEL_BRIDGE__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE__CONTAINER = SEMANTIC_MODEL_BRIDGE__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE__REFERENCE = SEMANTIC_MODEL_BRIDGE__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE__PROPERTY = SEMANTIC_MODEL_BRIDGE__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE__PRESENTATION = SEMANTIC_MODEL_BRIDGE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Graph Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT = SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE__DIAGRAM = SEMANTIC_MODEL_BRIDGE__DIAGRAM;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE__ELEMENT = SEMANTIC_MODEL_BRIDGE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Core Semantic Model Bridge</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_SEMANTIC_MODEL_BRIDGE_FEATURE_COUNT = SEMANTIC_MODEL_BRIDGE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.LeafElementImpl <em>Leaf Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.LeafElementImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getLeafElement()
-	 * @generated
-	 */
-	int LEAF_ELEMENT = 47;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LEAF_ELEMENT__NAME = DIAGRAM_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LEAF_ELEMENT__GUID = DIAGRAM_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LEAF_ELEMENT__BRIEF_DESCRIPTION = DIAGRAM_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LEAF_ELEMENT__OWNED_RULES = DIAGRAM_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LEAF_ELEMENT__METHOD_ELEMENT_PROPERTY = DIAGRAM_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LEAF_ELEMENT__SUPPRESSED = DIAGRAM_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LEAF_ELEMENT__ORDERING_GUIDE = DIAGRAM_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LEAF_ELEMENT__IS_VISIBLE = DIAGRAM_ELEMENT__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LEAF_ELEMENT__CONTAINER = DIAGRAM_ELEMENT__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LEAF_ELEMENT__REFERENCE = DIAGRAM_ELEMENT__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LEAF_ELEMENT__PROPERTY = DIAGRAM_ELEMENT__PROPERTY;
-
-	/**
-	 * The number of structural features of the '<em>Leaf Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LEAF_ELEMENT_FEATURE_COUNT = DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.TextElementImpl <em>Text Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.TextElementImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTextElement()
-	 * @generated
-	 */
-	int TEXT_ELEMENT = 48;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEXT_ELEMENT__NAME = LEAF_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEXT_ELEMENT__GUID = LEAF_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEXT_ELEMENT__BRIEF_DESCRIPTION = LEAF_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEXT_ELEMENT__OWNED_RULES = LEAF_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEXT_ELEMENT__METHOD_ELEMENT_PROPERTY = LEAF_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEXT_ELEMENT__SUPPRESSED = LEAF_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEXT_ELEMENT__ORDERING_GUIDE = LEAF_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEXT_ELEMENT__IS_VISIBLE = LEAF_ELEMENT__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEXT_ELEMENT__CONTAINER = LEAF_ELEMENT__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEXT_ELEMENT__REFERENCE = LEAF_ELEMENT__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEXT_ELEMENT__PROPERTY = LEAF_ELEMENT__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEXT_ELEMENT__TEXT = LEAF_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Text Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEXT_ELEMENT_FEATURE_COUNT = LEAF_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ImageImpl <em>Image</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ImageImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getImage()
-	 * @generated
-	 */
-	int IMAGE = 49;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMAGE__NAME = LEAF_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMAGE__GUID = LEAF_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMAGE__BRIEF_DESCRIPTION = LEAF_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMAGE__OWNED_RULES = LEAF_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMAGE__METHOD_ELEMENT_PROPERTY = LEAF_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMAGE__SUPPRESSED = LEAF_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMAGE__ORDERING_GUIDE = LEAF_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMAGE__IS_VISIBLE = LEAF_ELEMENT__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMAGE__CONTAINER = LEAF_ELEMENT__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMAGE__REFERENCE = LEAF_ELEMENT__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMAGE__PROPERTY = LEAF_ELEMENT__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMAGE__URI = LEAF_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Mime Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMAGE__MIME_TYPE = LEAF_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Image</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMAGE_FEATURE_COUNT = LEAF_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.GraphicPrimitiveImpl <em>Graphic Primitive</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.GraphicPrimitiveImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGraphicPrimitive()
-	 * @generated
-	 */
-	int GRAPHIC_PRIMITIVE = 50;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPHIC_PRIMITIVE__NAME = LEAF_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPHIC_PRIMITIVE__GUID = LEAF_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPHIC_PRIMITIVE__BRIEF_DESCRIPTION = LEAF_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPHIC_PRIMITIVE__OWNED_RULES = LEAF_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPHIC_PRIMITIVE__METHOD_ELEMENT_PROPERTY = LEAF_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPHIC_PRIMITIVE__SUPPRESSED = LEAF_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPHIC_PRIMITIVE__ORDERING_GUIDE = LEAF_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPHIC_PRIMITIVE__IS_VISIBLE = LEAF_ELEMENT__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPHIC_PRIMITIVE__CONTAINER = LEAF_ELEMENT__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPHIC_PRIMITIVE__REFERENCE = LEAF_ELEMENT__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPHIC_PRIMITIVE__PROPERTY = LEAF_ELEMENT__PROPERTY;
-
-	/**
-	 * The number of structural features of the '<em>Graphic Primitive</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRAPHIC_PRIMITIVE_FEATURE_COUNT = LEAF_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.PolylineImpl <em>Polyline</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.PolylineImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPolyline()
-	 * @generated
-	 */
-	int POLYLINE = 51;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__NAME = GRAPHIC_PRIMITIVE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__GUID = GRAPHIC_PRIMITIVE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__BRIEF_DESCRIPTION = GRAPHIC_PRIMITIVE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__OWNED_RULES = GRAPHIC_PRIMITIVE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__METHOD_ELEMENT_PROPERTY = GRAPHIC_PRIMITIVE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__SUPPRESSED = GRAPHIC_PRIMITIVE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__ORDERING_GUIDE = GRAPHIC_PRIMITIVE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__IS_VISIBLE = GRAPHIC_PRIMITIVE__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__CONTAINER = GRAPHIC_PRIMITIVE__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__REFERENCE = GRAPHIC_PRIMITIVE__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__PROPERTY = GRAPHIC_PRIMITIVE__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Closed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__CLOSED = GRAPHIC_PRIMITIVE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Waypoints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__WAYPOINTS = GRAPHIC_PRIMITIVE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Polyline</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_FEATURE_COUNT = GRAPHIC_PRIMITIVE_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.EllipseImpl <em>Ellipse</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.EllipseImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getEllipse()
-	 * @generated
-	 */
-	int ELLIPSE = 52;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__NAME = GRAPHIC_PRIMITIVE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__GUID = GRAPHIC_PRIMITIVE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__BRIEF_DESCRIPTION = GRAPHIC_PRIMITIVE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__OWNED_RULES = GRAPHIC_PRIMITIVE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__METHOD_ELEMENT_PROPERTY = GRAPHIC_PRIMITIVE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__SUPPRESSED = GRAPHIC_PRIMITIVE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__ORDERING_GUIDE = GRAPHIC_PRIMITIVE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Is Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__IS_VISIBLE = GRAPHIC_PRIMITIVE__IS_VISIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__CONTAINER = GRAPHIC_PRIMITIVE__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Reference</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__REFERENCE = GRAPHIC_PRIMITIVE__REFERENCE;
-
-	/**
-	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__PROPERTY = GRAPHIC_PRIMITIVE__PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Radius X</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__RADIUS_X = GRAPHIC_PRIMITIVE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Radius Y</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__RADIUS_Y = GRAPHIC_PRIMITIVE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Rotation</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__ROTATION = GRAPHIC_PRIMITIVE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Start Angle</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__START_ANGLE = GRAPHIC_PRIMITIVE_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>End Angle</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__END_ANGLE = GRAPHIC_PRIMITIVE_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Center</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__CENTER = GRAPHIC_PRIMITIVE_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Ellipse</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE_FEATURE_COUNT = GRAPHIC_PRIMITIVE_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ProcessElementImpl <em>Process Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ProcessElementImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessElement()
-	 * @generated
-	 */
-	int PROCESS_ELEMENT = 62;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__NAME = DESCRIBABLE_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__GUID = DESCRIBABLE_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__BRIEF_DESCRIPTION = DESCRIBABLE_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__OWNED_RULES = DESCRIBABLE_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__METHOD_ELEMENT_PROPERTY = DESCRIBABLE_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__SUPPRESSED = DESCRIBABLE_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__ORDERING_GUIDE = DESCRIBABLE_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__PRESENTATION_NAME = DESCRIBABLE_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__PRESENTATION = DESCRIBABLE_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__SHAPEICON = DESCRIBABLE_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__NODEICON = DESCRIBABLE_ELEMENT__NODEICON;
-
-	/**
-	 * The number of structural features of the '<em>Process Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT_FEATURE_COUNT = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.BreakdownElementImpl <em>Breakdown Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.BreakdownElementImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getBreakdownElement()
-	 * @generated
-	 */
-	int BREAKDOWN_ELEMENT = 55;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__NAME = PROCESS_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__GUID = PROCESS_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION = PROCESS_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__OWNED_RULES = PROCESS_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__METHOD_ELEMENT_PROPERTY = PROCESS_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__SUPPRESSED = PROCESS_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__ORDERING_GUIDE = PROCESS_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__PRESENTATION_NAME = PROCESS_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__PRESENTATION = PROCESS_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__SHAPEICON = PROCESS_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__NODEICON = PROCESS_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__PREFIX = PROCESS_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__IS_PLANNED = PROCESS_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES = PROCESS_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__IS_OPTIONAL = PROCESS_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__PRESENTED_AFTER = PROCESS_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__PRESENTED_BEFORE = PROCESS_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__PLANNING_DATA = PROCESS_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__SUPER_ACTIVITIES = PROCESS_ELEMENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the '<em>Breakdown Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_FEATURE_COUNT = PROCESS_ELEMENT_FEATURE_COUNT + 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.WorkBreakdownElementImpl <em>Work Breakdown Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.WorkBreakdownElementImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkBreakdownElement()
-	 * @generated
-	 */
-	int WORK_BREAKDOWN_ELEMENT = 54;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__NAME = BREAKDOWN_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__GUID = BREAKDOWN_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION = BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__OWNED_RULES = BREAKDOWN_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__METHOD_ELEMENT_PROPERTY = BREAKDOWN_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__SUPPRESSED = BREAKDOWN_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__ORDERING_GUIDE = BREAKDOWN_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__PRESENTATION_NAME = BREAKDOWN_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__PRESENTATION = BREAKDOWN_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__SHAPEICON = BREAKDOWN_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__NODEICON = BREAKDOWN_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__PREFIX = BREAKDOWN_ELEMENT__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__IS_PLANNED = BREAKDOWN_ELEMENT__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES = BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__IS_OPTIONAL = BREAKDOWN_ELEMENT__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__PRESENTED_AFTER = BREAKDOWN_ELEMENT__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__PRESENTED_BEFORE = BREAKDOWN_ELEMENT__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__PLANNING_DATA = BREAKDOWN_ELEMENT__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__SUPER_ACTIVITIES = BREAKDOWN_ELEMENT__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE = BREAKDOWN_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__IS_ONGOING = BREAKDOWN_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN = BREAKDOWN_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Link To Predecessor</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__LINK_TO_PREDECESSOR = BREAKDOWN_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Work Breakdown Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT = BREAKDOWN_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ActivityImpl <em>Activity</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ActivityImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getActivity()
-	 * @generated
-	 */
-	int ACTIVITY = 53;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__NAME = WORK_BREAKDOWN_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__GUID = WORK_BREAKDOWN_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__BRIEF_DESCRIPTION = WORK_BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__OWNED_RULES = WORK_BREAKDOWN_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__METHOD_ELEMENT_PROPERTY = WORK_BREAKDOWN_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__SUPPRESSED = WORK_BREAKDOWN_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__ORDERING_GUIDE = WORK_BREAKDOWN_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__PRESENTATION_NAME = WORK_BREAKDOWN_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__PRESENTATION = WORK_BREAKDOWN_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__SHAPEICON = WORK_BREAKDOWN_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__NODEICON = WORK_BREAKDOWN_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__PREFIX = WORK_BREAKDOWN_ELEMENT__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__IS_PLANNED = WORK_BREAKDOWN_ELEMENT__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__HAS_MULTIPLE_OCCURRENCES = WORK_BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__IS_OPTIONAL = WORK_BREAKDOWN_ELEMENT__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__PRESENTED_AFTER = WORK_BREAKDOWN_ELEMENT__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__PRESENTED_BEFORE = WORK_BREAKDOWN_ELEMENT__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__PLANNING_DATA = WORK_BREAKDOWN_ELEMENT__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__SUPER_ACTIVITIES = WORK_BREAKDOWN_ELEMENT__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__IS_REPEATABLE = WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__IS_ONGOING = WORK_BREAKDOWN_ELEMENT__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__IS_EVENT_DRIVEN = WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Link To Predecessor</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__LINK_TO_PREDECESSOR = WORK_BREAKDOWN_ELEMENT__LINK_TO_PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__VARIABILITY_TYPE = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__VARIABILITY_BASED_ON_ELEMENT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__PRECONDITION = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__POSTCONDITION = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Breakdown Elements</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__BREAKDOWN_ELEMENTS = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Roadmaps</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__ROADMAPS = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__SUPPORTING_MATERIALS = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__CHECKLISTS = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Concepts</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__CONCEPTS = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__EXAMPLES = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__GUIDELINES = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 10;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__REUSABLE_ASSETS = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 11;
-
-	/**
-	 * The feature id for the '<em><b>Is Enactable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__IS_ENACTABLE = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 12;
-
-	/**
-	 * The number of structural features of the '<em>Activity</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_FEATURE_COUNT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 13;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.MilestoneImpl <em>Milestone</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.MilestoneImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMilestone()
-	 * @generated
-	 */
-	int MILESTONE = 56;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__NAME = WORK_BREAKDOWN_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__GUID = WORK_BREAKDOWN_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__BRIEF_DESCRIPTION = WORK_BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__OWNED_RULES = WORK_BREAKDOWN_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__METHOD_ELEMENT_PROPERTY = WORK_BREAKDOWN_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__SUPPRESSED = WORK_BREAKDOWN_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__ORDERING_GUIDE = WORK_BREAKDOWN_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__PRESENTATION_NAME = WORK_BREAKDOWN_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__PRESENTATION = WORK_BREAKDOWN_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__SHAPEICON = WORK_BREAKDOWN_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__NODEICON = WORK_BREAKDOWN_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__PREFIX = WORK_BREAKDOWN_ELEMENT__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__IS_PLANNED = WORK_BREAKDOWN_ELEMENT__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__HAS_MULTIPLE_OCCURRENCES = WORK_BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__IS_OPTIONAL = WORK_BREAKDOWN_ELEMENT__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__PRESENTED_AFTER = WORK_BREAKDOWN_ELEMENT__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__PRESENTED_BEFORE = WORK_BREAKDOWN_ELEMENT__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__PLANNING_DATA = WORK_BREAKDOWN_ELEMENT__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__SUPER_ACTIVITIES = WORK_BREAKDOWN_ELEMENT__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__IS_REPEATABLE = WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__IS_ONGOING = WORK_BREAKDOWN_ELEMENT__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__IS_EVENT_DRIVEN = WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Link To Predecessor</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__LINK_TO_PREDECESSOR = WORK_BREAKDOWN_ELEMENT__LINK_TO_PREDECESSOR;
-
-	/**
-	 * The number of structural features of the '<em>Milestone</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE_FEATURE_COUNT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.IterationImpl <em>Iteration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.IterationImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getIteration()
-	 * @generated
-	 */
-	int ITERATION = 57;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__NAME = ACTIVITY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__GUID = ACTIVITY__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__BRIEF_DESCRIPTION = ACTIVITY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__OWNED_RULES = ACTIVITY__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__METHOD_ELEMENT_PROPERTY = ACTIVITY__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__SUPPRESSED = ACTIVITY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__ORDERING_GUIDE = ACTIVITY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__PRESENTATION_NAME = ACTIVITY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__PRESENTATION = ACTIVITY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__SHAPEICON = ACTIVITY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__NODEICON = ACTIVITY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__PREFIX = ACTIVITY__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__IS_PLANNED = ACTIVITY__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__HAS_MULTIPLE_OCCURRENCES = ACTIVITY__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__IS_OPTIONAL = ACTIVITY__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__PRESENTED_AFTER = ACTIVITY__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__PRESENTED_BEFORE = ACTIVITY__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__PLANNING_DATA = ACTIVITY__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__SUPER_ACTIVITIES = ACTIVITY__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__IS_REPEATABLE = ACTIVITY__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__IS_ONGOING = ACTIVITY__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__IS_EVENT_DRIVEN = ACTIVITY__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Link To Predecessor</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__LINK_TO_PREDECESSOR = ACTIVITY__LINK_TO_PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__VARIABILITY_TYPE = ACTIVITY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__VARIABILITY_BASED_ON_ELEMENT = ACTIVITY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__PRECONDITION = ACTIVITY__PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__POSTCONDITION = ACTIVITY__POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Breakdown Elements</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__BREAKDOWN_ELEMENTS = ACTIVITY__BREAKDOWN_ELEMENTS;
-
-	/**
-	 * The feature id for the '<em><b>Roadmaps</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__ROADMAPS = ACTIVITY__ROADMAPS;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__SUPPORTING_MATERIALS = ACTIVITY__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__CHECKLISTS = ACTIVITY__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__CONCEPTS = ACTIVITY__CONCEPTS;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__EXAMPLES = ACTIVITY__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__GUIDELINES = ACTIVITY__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__REUSABLE_ASSETS = ACTIVITY__REUSABLE_ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Is Enactable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__IS_ENACTABLE = ACTIVITY__IS_ENACTABLE;
-
-	/**
-	 * The number of structural features of the '<em>Iteration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION_FEATURE_COUNT = ACTIVITY_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.PhaseImpl <em>Phase</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.PhaseImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPhase()
-	 * @generated
-	 */
-	int PHASE = 58;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__NAME = ACTIVITY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__GUID = ACTIVITY__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__BRIEF_DESCRIPTION = ACTIVITY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__OWNED_RULES = ACTIVITY__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__METHOD_ELEMENT_PROPERTY = ACTIVITY__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__SUPPRESSED = ACTIVITY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__ORDERING_GUIDE = ACTIVITY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__PRESENTATION_NAME = ACTIVITY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__PRESENTATION = ACTIVITY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__SHAPEICON = ACTIVITY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__NODEICON = ACTIVITY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__PREFIX = ACTIVITY__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__IS_PLANNED = ACTIVITY__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__HAS_MULTIPLE_OCCURRENCES = ACTIVITY__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__IS_OPTIONAL = ACTIVITY__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__PRESENTED_AFTER = ACTIVITY__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__PRESENTED_BEFORE = ACTIVITY__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__PLANNING_DATA = ACTIVITY__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__SUPER_ACTIVITIES = ACTIVITY__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__IS_REPEATABLE = ACTIVITY__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__IS_ONGOING = ACTIVITY__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__IS_EVENT_DRIVEN = ACTIVITY__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Link To Predecessor</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__LINK_TO_PREDECESSOR = ACTIVITY__LINK_TO_PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__VARIABILITY_TYPE = ACTIVITY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__VARIABILITY_BASED_ON_ELEMENT = ACTIVITY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__PRECONDITION = ACTIVITY__PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__POSTCONDITION = ACTIVITY__POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Breakdown Elements</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__BREAKDOWN_ELEMENTS = ACTIVITY__BREAKDOWN_ELEMENTS;
-
-	/**
-	 * The feature id for the '<em><b>Roadmaps</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__ROADMAPS = ACTIVITY__ROADMAPS;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__SUPPORTING_MATERIALS = ACTIVITY__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__CHECKLISTS = ACTIVITY__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__CONCEPTS = ACTIVITY__CONCEPTS;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__EXAMPLES = ACTIVITY__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__GUIDELINES = ACTIVITY__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__REUSABLE_ASSETS = ACTIVITY__REUSABLE_ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Is Enactable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__IS_ENACTABLE = ACTIVITY__IS_ENACTABLE;
-
-	/**
-	 * The number of structural features of the '<em>Phase</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE_FEATURE_COUNT = ACTIVITY_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.TeamProfileImpl <em>Team Profile</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.TeamProfileImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTeamProfile()
-	 * @generated
-	 */
-	int TEAM_PROFILE = 59;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__NAME = BREAKDOWN_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__GUID = BREAKDOWN_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__BRIEF_DESCRIPTION = BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__OWNED_RULES = BREAKDOWN_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__METHOD_ELEMENT_PROPERTY = BREAKDOWN_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__SUPPRESSED = BREAKDOWN_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__ORDERING_GUIDE = BREAKDOWN_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__PRESENTATION_NAME = BREAKDOWN_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__PRESENTATION = BREAKDOWN_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__SHAPEICON = BREAKDOWN_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__NODEICON = BREAKDOWN_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__PREFIX = BREAKDOWN_ELEMENT__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__IS_PLANNED = BREAKDOWN_ELEMENT__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__HAS_MULTIPLE_OCCURRENCES = BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__IS_OPTIONAL = BREAKDOWN_ELEMENT__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__PRESENTED_AFTER = BREAKDOWN_ELEMENT__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__PRESENTED_BEFORE = BREAKDOWN_ELEMENT__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__PLANNING_DATA = BREAKDOWN_ELEMENT__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__SUPER_ACTIVITIES = BREAKDOWN_ELEMENT__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Team Roles</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__TEAM_ROLES = BREAKDOWN_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Super Team</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__SUPER_TEAM = BREAKDOWN_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Sub Team</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__SUB_TEAM = BREAKDOWN_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Team Profile</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE_FEATURE_COUNT = BREAKDOWN_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.DescriptorImpl <em>Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.DescriptorImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDescriptor()
-	 * @generated
-	 */
-	int DESCRIPTOR = 64;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__NAME = BREAKDOWN_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__GUID = BREAKDOWN_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__BRIEF_DESCRIPTION = BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__OWNED_RULES = BREAKDOWN_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__METHOD_ELEMENT_PROPERTY = BREAKDOWN_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__SUPPRESSED = BREAKDOWN_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__ORDERING_GUIDE = BREAKDOWN_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__PRESENTATION_NAME = BREAKDOWN_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__PRESENTATION = BREAKDOWN_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__SHAPEICON = BREAKDOWN_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__NODEICON = BREAKDOWN_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__PREFIX = BREAKDOWN_ELEMENT__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__IS_PLANNED = BREAKDOWN_ELEMENT__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES = BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__IS_OPTIONAL = BREAKDOWN_ELEMENT__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__PRESENTED_AFTER = BREAKDOWN_ELEMENT__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__PRESENTED_BEFORE = BREAKDOWN_ELEMENT__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__PLANNING_DATA = BREAKDOWN_ELEMENT__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__SUPER_ACTIVITIES = BREAKDOWN_ELEMENT__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Is Synchronized With Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE = BREAKDOWN_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_FEATURE_COUNT = BREAKDOWN_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.RoleDescriptorImpl <em>Role Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.RoleDescriptorImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getRoleDescriptor()
-	 * @generated
-	 */
-	int ROLE_DESCRIPTOR = 60;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__NAME = DESCRIPTOR__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__GUID = DESCRIPTOR__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__BRIEF_DESCRIPTION = DESCRIPTOR__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__OWNED_RULES = DESCRIPTOR__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__METHOD_ELEMENT_PROPERTY = DESCRIPTOR__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__SUPPRESSED = DESCRIPTOR__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__ORDERING_GUIDE = DESCRIPTOR__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__PRESENTATION_NAME = DESCRIPTOR__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__PRESENTATION = DESCRIPTOR__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__SHAPEICON = DESCRIPTOR__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__NODEICON = DESCRIPTOR__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__PREFIX = DESCRIPTOR__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__IS_PLANNED = DESCRIPTOR__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES = DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__IS_OPTIONAL = DESCRIPTOR__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__PRESENTED_AFTER = DESCRIPTOR__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__PRESENTED_BEFORE = DESCRIPTOR__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__PLANNING_DATA = DESCRIPTOR__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__SUPER_ACTIVITIES = DESCRIPTOR__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Is Synchronized With Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE = DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Role</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__ROLE = DESCRIPTOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Modifies</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__MODIFIES = DESCRIPTOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Responsible For</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__RESPONSIBLE_FOR = DESCRIPTOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Role Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR_FEATURE_COUNT = DESCRIPTOR_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.WorkOrderImpl <em>Work Order</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.WorkOrderImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkOrder()
-	 * @generated
-	 */
-	int WORK_ORDER = 61;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__NAME = PROCESS_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__GUID = PROCESS_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__BRIEF_DESCRIPTION = PROCESS_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__OWNED_RULES = PROCESS_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__METHOD_ELEMENT_PROPERTY = PROCESS_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__SUPPRESSED = PROCESS_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__ORDERING_GUIDE = PROCESS_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__PRESENTATION_NAME = PROCESS_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__PRESENTATION = PROCESS_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__SHAPEICON = PROCESS_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__NODEICON = PROCESS_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Link Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__LINK_TYPE = PROCESS_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Pred</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__PRED = PROCESS_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Work Order</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER_FEATURE_COUNT = PROCESS_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.PlanningDataImpl <em>Planning Data</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.PlanningDataImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPlanningData()
-	 * @generated
-	 */
-	int PLANNING_DATA = 63;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__NAME = PROCESS_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__GUID = PROCESS_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__BRIEF_DESCRIPTION = PROCESS_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__OWNED_RULES = PROCESS_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__METHOD_ELEMENT_PROPERTY = PROCESS_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__SUPPRESSED = PROCESS_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__ORDERING_GUIDE = PROCESS_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__PRESENTATION_NAME = PROCESS_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__PRESENTATION = PROCESS_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__SHAPEICON = PROCESS_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__NODEICON = PROCESS_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Start Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__START_DATE = PROCESS_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Finish Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__FINISH_DATE = PROCESS_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Rank</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__RANK = PROCESS_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Planning Data</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA_FEATURE_COUNT = PROCESS_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.TaskDescriptorImpl <em>Task Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.TaskDescriptorImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTaskDescriptor()
-	 * @generated
-	 */
-	int TASK_DESCRIPTOR = 66;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.WorkProductDescriptorImpl <em>Work Product Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.WorkProductDescriptorImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkProductDescriptor()
-	 * @generated
-	 */
-	int WORK_PRODUCT_DESCRIPTOR = 65;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__NAME = DESCRIPTOR__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__GUID = DESCRIPTOR__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__BRIEF_DESCRIPTION = DESCRIPTOR__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__OWNED_RULES = DESCRIPTOR__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__METHOD_ELEMENT_PROPERTY = DESCRIPTOR__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__SUPPRESSED = DESCRIPTOR__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__ORDERING_GUIDE = DESCRIPTOR__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__PRESENTATION_NAME = DESCRIPTOR__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__PRESENTATION = DESCRIPTOR__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__SHAPEICON = DESCRIPTOR__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__NODEICON = DESCRIPTOR__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__PREFIX = DESCRIPTOR__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__IS_PLANNED = DESCRIPTOR__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES = DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__IS_OPTIONAL = DESCRIPTOR__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__PRESENTED_AFTER = DESCRIPTOR__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__PRESENTED_BEFORE = DESCRIPTOR__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__PLANNING_DATA = DESCRIPTOR__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__SUPER_ACTIVITIES = DESCRIPTOR__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Is Synchronized With Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE = DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Activity Entry State</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE = DESCRIPTOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Activity Exit State</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE = DESCRIPTOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Work Product</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT = DESCRIPTOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Impacted By</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY = DESCRIPTOR_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Impacts</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__IMPACTS = DESCRIPTOR_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Deliverable Parts</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS = DESCRIPTOR_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Work Product Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR_FEATURE_COUNT = DESCRIPTOR_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__NAME = WORK_BREAKDOWN_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__GUID = WORK_BREAKDOWN_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__BRIEF_DESCRIPTION = WORK_BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__OWNED_RULES = WORK_BREAKDOWN_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__METHOD_ELEMENT_PROPERTY = WORK_BREAKDOWN_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__SUPPRESSED = WORK_BREAKDOWN_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__ORDERING_GUIDE = WORK_BREAKDOWN_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__PRESENTATION_NAME = WORK_BREAKDOWN_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__PRESENTATION = WORK_BREAKDOWN_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__SHAPEICON = WORK_BREAKDOWN_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__NODEICON = WORK_BREAKDOWN_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__PREFIX = WORK_BREAKDOWN_ELEMENT__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__IS_PLANNED = WORK_BREAKDOWN_ELEMENT__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES = WORK_BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__IS_OPTIONAL = WORK_BREAKDOWN_ELEMENT__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__PRESENTED_AFTER = WORK_BREAKDOWN_ELEMENT__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__PRESENTED_BEFORE = WORK_BREAKDOWN_ELEMENT__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__PLANNING_DATA = WORK_BREAKDOWN_ELEMENT__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__SUPER_ACTIVITIES = WORK_BREAKDOWN_ELEMENT__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__IS_REPEATABLE = WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__IS_ONGOING = WORK_BREAKDOWN_ELEMENT__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__IS_EVENT_DRIVEN = WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Link To Predecessor</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__LINK_TO_PREDECESSOR = WORK_BREAKDOWN_ELEMENT__LINK_TO_PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Is Synchronized With Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Task</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__TASK = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Additionally Performed By</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Assisted By</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__ASSISTED_BY = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>External Input</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__EXTERNAL_INPUT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Mandatory Input</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__MANDATORY_INPUT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Optional Input</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__OPTIONAL_INPUT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Output</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__OUTPUT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Performed Primarily By</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Selected Steps</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__SELECTED_STEPS = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 9;
-
-	/**
-	 * The number of structural features of the '<em>Task Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR_FEATURE_COUNT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 10;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.CompositeRoleImpl <em>Composite Role</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.CompositeRoleImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getCompositeRole()
-	 * @generated
-	 */
-	int COMPOSITE_ROLE = 67;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__NAME = ROLE_DESCRIPTOR__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__GUID = ROLE_DESCRIPTOR__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__BRIEF_DESCRIPTION = ROLE_DESCRIPTOR__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__OWNED_RULES = ROLE_DESCRIPTOR__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__METHOD_ELEMENT_PROPERTY = ROLE_DESCRIPTOR__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__SUPPRESSED = ROLE_DESCRIPTOR__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__ORDERING_GUIDE = ROLE_DESCRIPTOR__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__PRESENTATION_NAME = ROLE_DESCRIPTOR__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__PRESENTATION = ROLE_DESCRIPTOR__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__SHAPEICON = ROLE_DESCRIPTOR__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__NODEICON = ROLE_DESCRIPTOR__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__PREFIX = ROLE_DESCRIPTOR__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__IS_PLANNED = ROLE_DESCRIPTOR__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__HAS_MULTIPLE_OCCURRENCES = ROLE_DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__IS_OPTIONAL = ROLE_DESCRIPTOR__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__PRESENTED_AFTER = ROLE_DESCRIPTOR__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__PRESENTED_BEFORE = ROLE_DESCRIPTOR__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__PLANNING_DATA = ROLE_DESCRIPTOR__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__SUPER_ACTIVITIES = ROLE_DESCRIPTOR__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Is Synchronized With Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__IS_SYNCHRONIZED_WITH_SOURCE = ROLE_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Role</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__ROLE = ROLE_DESCRIPTOR__ROLE;
-
-	/**
-	 * The feature id for the '<em><b>Modifies</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__MODIFIES = ROLE_DESCRIPTOR__MODIFIES;
-
-	/**
-	 * The feature id for the '<em><b>Responsible For</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__RESPONSIBLE_FOR = ROLE_DESCRIPTOR__RESPONSIBLE_FOR;
-
-	/**
-	 * The feature id for the '<em><b>Aggregated Roles</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__AGGREGATED_ROLES = ROLE_DESCRIPTOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Composite Role</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE_FEATURE_COUNT = ROLE_DESCRIPTOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.BreakdownElementDescriptionImpl <em>Breakdown Element Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.BreakdownElementDescriptionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getBreakdownElementDescription()
-	 * @generated
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION = 68;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__NAME = CONTENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__GUID = CONTENT_DESCRIPTION__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__BRIEF_DESCRIPTION = CONTENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__OWNED_RULES = CONTENT_DESCRIPTION__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__METHOD_ELEMENT_PROPERTY = CONTENT_DESCRIPTION__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__SUPPRESSED = CONTENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__ORDERING_GUIDE = CONTENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__AUTHORS = CONTENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__CHANGE_DATE = CONTENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__CHANGE_DESCRIPTION = CONTENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__VERSION = CONTENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__COPYRIGHT_STATEMENT = CONTENT_DESCRIPTION__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__MAIN_DESCRIPTION = CONTENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Sections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__SECTIONS = CONTENT_DESCRIPTION__SECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__KEY_CONSIDERATIONS = CONTENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Usage Guidance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE = CONTENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Breakdown Element Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION_FEATURE_COUNT = CONTENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ActivityDescriptionImpl <em>Activity Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ActivityDescriptionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getActivityDescription()
-	 * @generated
-	 */
-	int ACTIVITY_DESCRIPTION = 69;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__NAME = BREAKDOWN_ELEMENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__GUID = BREAKDOWN_ELEMENT_DESCRIPTION__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__BRIEF_DESCRIPTION = BREAKDOWN_ELEMENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__OWNED_RULES = BREAKDOWN_ELEMENT_DESCRIPTION__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__METHOD_ELEMENT_PROPERTY = BREAKDOWN_ELEMENT_DESCRIPTION__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__SUPPRESSED = BREAKDOWN_ELEMENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__ORDERING_GUIDE = BREAKDOWN_ELEMENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__AUTHORS = BREAKDOWN_ELEMENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__CHANGE_DATE = BREAKDOWN_ELEMENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__CHANGE_DESCRIPTION = BREAKDOWN_ELEMENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__VERSION = BREAKDOWN_ELEMENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__COPYRIGHT_STATEMENT = BREAKDOWN_ELEMENT_DESCRIPTION__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__MAIN_DESCRIPTION = BREAKDOWN_ELEMENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Sections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__SECTIONS = BREAKDOWN_ELEMENT_DESCRIPTION__SECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__KEY_CONSIDERATIONS = BREAKDOWN_ELEMENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Usage Guidance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__USAGE_GUIDANCE = BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE;
-
-	/**
-	 * The feature id for the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__PURPOSE = BREAKDOWN_ELEMENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Alternatives</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__ALTERNATIVES = BREAKDOWN_ELEMENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Howto Staff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__HOWTO_STAFF = BREAKDOWN_ELEMENT_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Activity Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION_FEATURE_COUNT = BREAKDOWN_ELEMENT_DESCRIPTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ProcessDescriptionImpl <em>Process Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ProcessDescriptionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessDescription()
-	 * @generated
-	 */
-	int PROCESS_DESCRIPTION = 71;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__NAME = ACTIVITY_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__GUID = ACTIVITY_DESCRIPTION__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__BRIEF_DESCRIPTION = ACTIVITY_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__OWNED_RULES = ACTIVITY_DESCRIPTION__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__METHOD_ELEMENT_PROPERTY = ACTIVITY_DESCRIPTION__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__SUPPRESSED = ACTIVITY_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__ORDERING_GUIDE = ACTIVITY_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__AUTHORS = ACTIVITY_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__CHANGE_DATE = ACTIVITY_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__CHANGE_DESCRIPTION = ACTIVITY_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__VERSION = ACTIVITY_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__COPYRIGHT_STATEMENT = ACTIVITY_DESCRIPTION__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__MAIN_DESCRIPTION = ACTIVITY_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Sections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__SECTIONS = ACTIVITY_DESCRIPTION__SECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__KEY_CONSIDERATIONS = ACTIVITY_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Usage Guidance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__USAGE_GUIDANCE = ACTIVITY_DESCRIPTION__USAGE_GUIDANCE;
-
-	/**
-	 * The feature id for the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__PURPOSE = ACTIVITY_DESCRIPTION__PURPOSE;
-
-	/**
-	 * The feature id for the '<em><b>Alternatives</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__ALTERNATIVES = ACTIVITY_DESCRIPTION__ALTERNATIVES;
-
-	/**
-	 * The feature id for the '<em><b>Howto Staff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__HOWTO_STAFF = ACTIVITY_DESCRIPTION__HOWTO_STAFF;
-
-	/**
-	 * The feature id for the '<em><b>External Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__EXTERNAL_ID = ACTIVITY_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Scope</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__SCOPE = ACTIVITY_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Usage Notes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__USAGE_NOTES = ACTIVITY_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Process Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION_FEATURE_COUNT = ACTIVITY_DESCRIPTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.DeliveryProcessDescriptionImpl <em>Delivery Process Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.DeliveryProcessDescriptionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDeliveryProcessDescription()
-	 * @generated
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION = 70;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__NAME = PROCESS_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__GUID = PROCESS_DESCRIPTION__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__BRIEF_DESCRIPTION = PROCESS_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__OWNED_RULES = PROCESS_DESCRIPTION__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__METHOD_ELEMENT_PROPERTY = PROCESS_DESCRIPTION__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__SUPPRESSED = PROCESS_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__ORDERING_GUIDE = PROCESS_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__AUTHORS = PROCESS_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__CHANGE_DATE = PROCESS_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__CHANGE_DESCRIPTION = PROCESS_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__VERSION = PROCESS_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__COPYRIGHT_STATEMENT = PROCESS_DESCRIPTION__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__MAIN_DESCRIPTION = PROCESS_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Sections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__SECTIONS = PROCESS_DESCRIPTION__SECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__KEY_CONSIDERATIONS = PROCESS_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Usage Guidance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__USAGE_GUIDANCE = PROCESS_DESCRIPTION__USAGE_GUIDANCE;
-
-	/**
-	 * The feature id for the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__PURPOSE = PROCESS_DESCRIPTION__PURPOSE;
-
-	/**
-	 * The feature id for the '<em><b>Alternatives</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__ALTERNATIVES = PROCESS_DESCRIPTION__ALTERNATIVES;
-
-	/**
-	 * The feature id for the '<em><b>Howto Staff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__HOWTO_STAFF = PROCESS_DESCRIPTION__HOWTO_STAFF;
-
-	/**
-	 * The feature id for the '<em><b>External Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__EXTERNAL_ID = PROCESS_DESCRIPTION__EXTERNAL_ID;
-
-	/**
-	 * The feature id for the '<em><b>Scope</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__SCOPE = PROCESS_DESCRIPTION__SCOPE;
-
-	/**
-	 * The feature id for the '<em><b>Usage Notes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__USAGE_NOTES = PROCESS_DESCRIPTION__USAGE_NOTES;
-
-	/**
-	 * The feature id for the '<em><b>Scale</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__SCALE = PROCESS_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Project Characteristics</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS = PROCESS_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Risk Level</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL = PROCESS_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Estimating Technique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE = PROCESS_DESCRIPTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Project Member Expertise</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE = PROCESS_DESCRIPTION_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Type Of Contract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT = PROCESS_DESCRIPTION_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Delivery Process Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION_FEATURE_COUNT = PROCESS_DESCRIPTION_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.DescriptorDescriptionImpl <em>Descriptor Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.DescriptorDescriptionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDescriptorDescription()
-	 * @generated
-	 */
-	int DESCRIPTOR_DESCRIPTION = 72;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__NAME = BREAKDOWN_ELEMENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__GUID = BREAKDOWN_ELEMENT_DESCRIPTION__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__BRIEF_DESCRIPTION = BREAKDOWN_ELEMENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__OWNED_RULES = BREAKDOWN_ELEMENT_DESCRIPTION__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__METHOD_ELEMENT_PROPERTY = BREAKDOWN_ELEMENT_DESCRIPTION__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__SUPPRESSED = BREAKDOWN_ELEMENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__ORDERING_GUIDE = BREAKDOWN_ELEMENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__AUTHORS = BREAKDOWN_ELEMENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__CHANGE_DATE = BREAKDOWN_ELEMENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__CHANGE_DESCRIPTION = BREAKDOWN_ELEMENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__VERSION = BREAKDOWN_ELEMENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__COPYRIGHT_STATEMENT = BREAKDOWN_ELEMENT_DESCRIPTION__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__MAIN_DESCRIPTION = BREAKDOWN_ELEMENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Sections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__SECTIONS = BREAKDOWN_ELEMENT_DESCRIPTION__SECTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__KEY_CONSIDERATIONS = BREAKDOWN_ELEMENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Usage Guidance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__USAGE_GUIDANCE = BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE;
-
-	/**
-	 * The feature id for the '<em><b>Refined Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION = BREAKDOWN_ELEMENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Descriptor Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION_FEATURE_COUNT = BREAKDOWN_ELEMENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ConceptImpl <em>Concept</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ConceptImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getConcept()
-	 * @generated
-	 */
-	int CONCEPT = 73;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__GUID = GUIDANCE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__OWNED_RULES = GUIDANCE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__METHOD_ELEMENT_PROPERTY = GUIDANCE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__SUPPORTING_MATERIALS = GUIDANCE__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__CONCEPTS_AND_PAPERS = GUIDANCE__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__CHECKLISTS = GUIDANCE__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__GUIDELINES = GUIDANCE__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__EXAMPLES = GUIDANCE__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__ASSETS = GUIDANCE__ASSETS;
-
-	/**
-	 * The number of structural features of the '<em>Concept</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ChecklistImpl <em>Checklist</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ChecklistImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getChecklist()
-	 * @generated
-	 */
-	int CHECKLIST = 74;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__GUID = GUIDANCE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__OWNED_RULES = GUIDANCE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__METHOD_ELEMENT_PROPERTY = GUIDANCE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__SUPPORTING_MATERIALS = GUIDANCE__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__CONCEPTS_AND_PAPERS = GUIDANCE__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__CHECKLISTS = GUIDANCE__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__GUIDELINES = GUIDANCE__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__EXAMPLES = GUIDANCE__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__ASSETS = GUIDANCE__ASSETS;
-
-	/**
-	 * The number of structural features of the '<em>Checklist</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ExampleImpl <em>Example</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ExampleImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getExample()
-	 * @generated
-	 */
-	int EXAMPLE = 75;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__GUID = GUIDANCE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__OWNED_RULES = GUIDANCE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__METHOD_ELEMENT_PROPERTY = GUIDANCE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__SUPPORTING_MATERIALS = GUIDANCE__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__CONCEPTS_AND_PAPERS = GUIDANCE__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__CHECKLISTS = GUIDANCE__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__GUIDELINES = GUIDANCE__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__EXAMPLES = GUIDANCE__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__ASSETS = GUIDANCE__ASSETS;
-
-	/**
-	 * The number of structural features of the '<em>Example</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.GuidelineImpl <em>Guideline</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.GuidelineImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGuideline()
-	 * @generated
-	 */
-	int GUIDELINE = 76;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__GUID = GUIDANCE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__OWNED_RULES = GUIDANCE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__METHOD_ELEMENT_PROPERTY = GUIDANCE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__SUPPORTING_MATERIALS = GUIDANCE__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__CONCEPTS_AND_PAPERS = GUIDANCE__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__CHECKLISTS = GUIDANCE__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__GUIDELINES = GUIDANCE__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__EXAMPLES = GUIDANCE__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__ASSETS = GUIDANCE__ASSETS;
-
-	/**
-	 * The number of structural features of the '<em>Guideline</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.EstimationConsiderationsImpl <em>Estimation Considerations</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.EstimationConsiderationsImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getEstimationConsiderations()
-	 * @generated
-	 */
-	int ESTIMATION_CONSIDERATIONS = 84;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ReportImpl <em>Report</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ReportImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getReport()
-	 * @generated
-	 */
-	int REPORT = 77;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__GUID = GUIDANCE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__OWNED_RULES = GUIDANCE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__METHOD_ELEMENT_PROPERTY = GUIDANCE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__SUPPORTING_MATERIALS = GUIDANCE__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__CONCEPTS_AND_PAPERS = GUIDANCE__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__CHECKLISTS = GUIDANCE__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__GUIDELINES = GUIDANCE__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__EXAMPLES = GUIDANCE__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__ASSETS = GUIDANCE__ASSETS;
-
-	/**
-	 * The number of structural features of the '<em>Report</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.TemplateImpl <em>Template</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.TemplateImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTemplate()
-	 * @generated
-	 */
-	int TEMPLATE = 78;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__GUID = GUIDANCE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__OWNED_RULES = GUIDANCE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__METHOD_ELEMENT_PROPERTY = GUIDANCE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__SUPPORTING_MATERIALS = GUIDANCE__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__CONCEPTS_AND_PAPERS = GUIDANCE__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__CHECKLISTS = GUIDANCE__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__GUIDELINES = GUIDANCE__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__EXAMPLES = GUIDANCE__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__ASSETS = GUIDANCE__ASSETS;
-
-	/**
-	 * The number of structural features of the '<em>Template</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.SupportingMaterialImpl <em>Supporting Material</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.SupportingMaterialImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getSupportingMaterial()
-	 * @generated
-	 */
-	int SUPPORTING_MATERIAL = 79;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__GUID = GUIDANCE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__OWNED_RULES = GUIDANCE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__METHOD_ELEMENT_PROPERTY = GUIDANCE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__SUPPORTING_MATERIALS = GUIDANCE__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__CONCEPTS_AND_PAPERS = GUIDANCE__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__CHECKLISTS = GUIDANCE__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__GUIDELINES = GUIDANCE__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__EXAMPLES = GUIDANCE__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__ASSETS = GUIDANCE__ASSETS;
-
-	/**
-	 * The number of structural features of the '<em>Supporting Material</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ToolMentorImpl <em>Tool Mentor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ToolMentorImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getToolMentor()
-	 * @generated
-	 */
-	int TOOL_MENTOR = 80;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__GUID = GUIDANCE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__OWNED_RULES = GUIDANCE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__METHOD_ELEMENT_PROPERTY = GUIDANCE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__SUPPORTING_MATERIALS = GUIDANCE__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__CONCEPTS_AND_PAPERS = GUIDANCE__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__CHECKLISTS = GUIDANCE__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__GUIDELINES = GUIDANCE__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__EXAMPLES = GUIDANCE__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__ASSETS = GUIDANCE__ASSETS;
-
-	/**
-	 * The number of structural features of the '<em>Tool Mentor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.WhitepaperImpl <em>Whitepaper</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.WhitepaperImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWhitepaper()
-	 * @generated
-	 */
-	int WHITEPAPER = 81;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__NAME = CONCEPT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__GUID = CONCEPT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__BRIEF_DESCRIPTION = CONCEPT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__OWNED_RULES = CONCEPT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__METHOD_ELEMENT_PROPERTY = CONCEPT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__SUPPRESSED = CONCEPT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__ORDERING_GUIDE = CONCEPT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__PRESENTATION_NAME = CONCEPT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__PRESENTATION = CONCEPT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__SHAPEICON = CONCEPT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__NODEICON = CONCEPT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__VARIABILITY_TYPE = CONCEPT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__VARIABILITY_BASED_ON_ELEMENT = CONCEPT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__SUPPORTING_MATERIALS = CONCEPT__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__CONCEPTS_AND_PAPERS = CONCEPT__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__CHECKLISTS = CONCEPT__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__GUIDELINES = CONCEPT__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__EXAMPLES = CONCEPT__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__ASSETS = CONCEPT__ASSETS;
-
-	/**
-	 * The number of structural features of the '<em>Whitepaper</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER_FEATURE_COUNT = CONCEPT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.TermDefinitionImpl <em>Term Definition</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.TermDefinitionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTermDefinition()
-	 * @generated
-	 */
-	int TERM_DEFINITION = 82;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__GUID = GUIDANCE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__OWNED_RULES = GUIDANCE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__METHOD_ELEMENT_PROPERTY = GUIDANCE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__SUPPORTING_MATERIALS = GUIDANCE__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__CONCEPTS_AND_PAPERS = GUIDANCE__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__CHECKLISTS = GUIDANCE__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__GUIDELINES = GUIDANCE__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__EXAMPLES = GUIDANCE__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__ASSETS = GUIDANCE__ASSETS;
-
-	/**
-	 * The number of structural features of the '<em>Term Definition</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.PracticeImpl <em>Practice</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.PracticeImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPractice()
-	 * @generated
-	 */
-	int PRACTICE = 83;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__GUID = GUIDANCE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__OWNED_RULES = GUIDANCE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__METHOD_ELEMENT_PROPERTY = GUIDANCE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__SUPPORTING_MATERIALS = GUIDANCE__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__CONCEPTS_AND_PAPERS = GUIDANCE__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__CHECKLISTS = GUIDANCE__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__GUIDELINES = GUIDANCE__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__EXAMPLES = GUIDANCE__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__ASSETS = GUIDANCE__ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Sub Practices</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__SUB_PRACTICES = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Content References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__CONTENT_REFERENCES = GUIDANCE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Activity References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__ACTIVITY_REFERENCES = GUIDANCE_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Practice</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ReusableAssetImpl <em>Reusable Asset</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ReusableAssetImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getReusableAsset()
-	 * @generated
-	 */
-	int REUSABLE_ASSET = 85;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.VertexImpl <em>Vertex</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.VertexImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getVertex()
-	 * @generated
-	 */
-	int VERTEX = 87;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.StateImpl <em>State</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.StateImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getState()
-	 * @generated
-	 */
-	int STATE = 86;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.RegionImpl <em>Region</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.RegionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getRegion()
-	 * @generated
-	 */
-	int REGION = 88;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.StateMachineImpl <em>State Machine</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.StateMachineImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getStateMachine()
-	 * @generated
-	 */
-	int STATE_MACHINE = 89;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.TransitionImpl <em>Transition</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.TransitionImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTransition()
-	 * @generated
-	 */
-	int TRANSITION = 90;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.PseudoStateImpl <em>Pseudo State</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.PseudoStateImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPseudoState()
-	 * @generated
-	 */
-	int PSEUDO_STATE = 91;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ContentCategoryImpl <em>Content Category</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ContentCategoryImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getContentCategory()
-	 * @generated
-	 */
-	int CONTENT_CATEGORY = 93;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.DisciplineImpl <em>Discipline</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.DisciplineImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDiscipline()
-	 * @generated
-	 */
-	int DISCIPLINE = 92;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.RoleSetImpl <em>Role Set</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.RoleSetImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getRoleSet()
-	 * @generated
-	 */
-	int ROLE_SET = 94;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.DomainImpl <em>Domain</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.DomainImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDomain()
-	 * @generated
-	 */
-	int DOMAIN = 95;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.WorkProductTypeImpl <em>Work Product Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.WorkProductTypeImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkProductType()
-	 * @generated
-	 */
-	int WORK_PRODUCT_TYPE = 96;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.DisciplineGroupingImpl <em>Discipline Grouping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.DisciplineGroupingImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDisciplineGrouping()
-	 * @generated
-	 */
-	int DISCIPLINE_GROUPING = 97;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ToolImpl <em>Tool</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ToolImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTool()
-	 * @generated
-	 */
-	int TOOL = 98;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.RoleSetGroupingImpl <em>Role Set Grouping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.RoleSetGroupingImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getRoleSetGrouping()
-	 * @generated
-	 */
-	int ROLE_SET_GROUPING = 99;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.CustomCategoryImpl <em>Custom Category</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.CustomCategoryImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getCustomCategory()
-	 * @generated
-	 */
-	int CUSTOM_CATEGORY = 100;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ProcessImpl <em>Process</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ProcessImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcess()
-	 * @generated
-	 */
-	int PROCESS = 102;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.DeliveryProcessImpl <em>Delivery Process</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.DeliveryProcessImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDeliveryProcess()
-	 * @generated
-	 */
-	int DELIVERY_PROCESS = 101;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.CapabilityPatternImpl <em>Capability Pattern</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.CapabilityPatternImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getCapabilityPattern()
-	 * @generated
-	 */
-	int CAPABILITY_PATTERN = 103;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ProcessPlanningTemplateImpl <em>Process Planning Template</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ProcessPlanningTemplateImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessPlanningTemplate()
-	 * @generated
-	 */
-	int PROCESS_PLANNING_TEMPLATE = 104;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.RoadmapImpl <em>Roadmap</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.RoadmapImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getRoadmap()
-	 * @generated
-	 */
-	int ROADMAP = 105;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ProcessPackageImpl <em>Process Package</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ProcessPackageImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessPackage()
-	 * @generated
-	 */
-	int PROCESS_PACKAGE = 107;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ProcessComponentImpl <em>Process Component</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ProcessComponentImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessComponent()
-	 * @generated
-	 */
-	int PROCESS_COMPONENT = 106;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ProcessComponentInterfaceImpl <em>Process Component Interface</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ProcessComponentInterfaceImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessComponentInterface()
-	 * @generated
-	 */
-	int PROCESS_COMPONENT_INTERFACE = 108;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ProcessComponentDescriptorImpl <em>Process Component Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ProcessComponentDescriptorImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessComponentDescriptor()
-	 * @generated
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR = 109;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.MethodPluginImpl <em>Method Plugin</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.MethodPluginImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMethodPlugin()
-	 * @generated
-	 */
-	int METHOD_PLUGIN = 110;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__GUID = GUIDANCE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__OWNED_RULES = GUIDANCE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__METHOD_ELEMENT_PROPERTY = GUIDANCE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__SUPPORTING_MATERIALS = GUIDANCE__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__CONCEPTS_AND_PAPERS = GUIDANCE__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__CHECKLISTS = GUIDANCE__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__GUIDELINES = GUIDANCE__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__EXAMPLES = GUIDANCE__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__ASSETS = GUIDANCE__ASSETS;
-
-	/**
-	 * The number of structural features of the '<em>Estimation Considerations</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__GUID = GUIDANCE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__OWNED_RULES = GUIDANCE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__METHOD_ELEMENT_PROPERTY = GUIDANCE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__SUPPORTING_MATERIALS = GUIDANCE__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__CONCEPTS_AND_PAPERS = GUIDANCE__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__CHECKLISTS = GUIDANCE__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__GUIDELINES = GUIDANCE__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__EXAMPLES = GUIDANCE__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__ASSETS = GUIDANCE__ASSETS;
-
-	/**
-	 * The number of structural features of the '<em>Reusable Asset</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__CONTAINER = 0;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__OUTGOING = 1;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__INCOMING = 2;
-
-	/**
-	 * The number of structural features of the '<em>Vertex</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX_FEATURE_COUNT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__CONTAINER = VERTEX__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__OUTGOING = VERTEX__OUTGOING;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__INCOMING = VERTEX__INCOMING;
-
-	/**
-	 * The feature id for the '<em><b>Work Product</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__WORK_PRODUCT = VERTEX_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Region</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__REGION = VERTEX_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Submachine</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__SUBMACHINE = VERTEX_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>State</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_FEATURE_COUNT = VERTEX_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Vertex</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__VERTEX = 0;
-
-	/**
-	 * The feature id for the '<em><b>Transition</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__TRANSITION = 1;
-
-	/**
-	 * The feature id for the '<em><b>State</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__STATE = 2;
-
-	/**
-	 * The feature id for the '<em><b>State Machine</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__STATE_MACHINE = 3;
-
-	/**
-	 * The number of structural features of the '<em>Region</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION_FEATURE_COUNT = 4;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__NAME = WORK_DEFINITION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__GUID = WORK_DEFINITION__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__BRIEF_DESCRIPTION = WORK_DEFINITION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__OWNED_RULES = WORK_DEFINITION__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__METHOD_ELEMENT_PROPERTY = WORK_DEFINITION__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__SUPPRESSED = WORK_DEFINITION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__ORDERING_GUIDE = WORK_DEFINITION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__PRECONDITION = WORK_DEFINITION__PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__POSTCONDITION = WORK_DEFINITION__POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Region</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__REGION = WORK_DEFINITION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>State Machine</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE_FEATURE_COUNT = WORK_DEFINITION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Work Definition</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__WORK_DEFINITION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__CONTAINER = 1;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__SOURCE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__TARGET = 3;
-
-	/**
-	 * The number of structural features of the '<em>Transition</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION_FEATURE_COUNT = 4;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDO_STATE__CONTAINER = VERTEX__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDO_STATE__OUTGOING = VERTEX__OUTGOING;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDO_STATE__INCOMING = VERTEX__INCOMING;
-
-	/**
-	 * The number of structural features of the '<em>Pseudo State</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDO_STATE_FEATURE_COUNT = VERTEX_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__NAME = CONTENT_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__GUID = CONTENT_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__BRIEF_DESCRIPTION = CONTENT_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__OWNED_RULES = CONTENT_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__METHOD_ELEMENT_PROPERTY = CONTENT_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__SUPPRESSED = CONTENT_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__ORDERING_GUIDE = CONTENT_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__PRESENTATION_NAME = CONTENT_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__PRESENTATION = CONTENT_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__SHAPEICON = CONTENT_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__NODEICON = CONTENT_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__VARIABILITY_TYPE = CONTENT_ELEMENT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT = CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__SUPPORTING_MATERIALS = CONTENT_ELEMENT__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__CONCEPTS_AND_PAPERS = CONTENT_ELEMENT__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__CHECKLISTS = CONTENT_ELEMENT__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__GUIDELINES = CONTENT_ELEMENT__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__EXAMPLES = CONTENT_ELEMENT__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__ASSETS = CONTENT_ELEMENT__ASSETS;
-
-	/**
-	 * The number of structural features of the '<em>Content Category</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_FEATURE_COUNT = CONTENT_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__GUID = CONTENT_CATEGORY__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__OWNED_RULES = CONTENT_CATEGORY__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__METHOD_ELEMENT_PROPERTY = CONTENT_CATEGORY__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__SUPPORTING_MATERIALS = CONTENT_CATEGORY__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__CONCEPTS_AND_PAPERS = CONTENT_CATEGORY__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__CHECKLISTS = CONTENT_CATEGORY__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__GUIDELINES = CONTENT_CATEGORY__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__EXAMPLES = CONTENT_CATEGORY__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__ASSETS = CONTENT_CATEGORY__ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Tasks</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__TASKS = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Subdiscipline</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__SUBDISCIPLINE = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Reference Workflows</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__REFERENCE_WORKFLOWS = CONTENT_CATEGORY_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Discipline</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__GUID = CONTENT_CATEGORY__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__OWNED_RULES = CONTENT_CATEGORY__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__METHOD_ELEMENT_PROPERTY = CONTENT_CATEGORY__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__SUPPORTING_MATERIALS = CONTENT_CATEGORY__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__CONCEPTS_AND_PAPERS = CONTENT_CATEGORY__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__CHECKLISTS = CONTENT_CATEGORY__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__GUIDELINES = CONTENT_CATEGORY__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__EXAMPLES = CONTENT_CATEGORY__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__ASSETS = CONTENT_CATEGORY__ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Roles</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__ROLES = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Role Set</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__GUID = CONTENT_CATEGORY__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__OWNED_RULES = CONTENT_CATEGORY__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__METHOD_ELEMENT_PROPERTY = CONTENT_CATEGORY__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__SUPPORTING_MATERIALS = CONTENT_CATEGORY__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__CONCEPTS_AND_PAPERS = CONTENT_CATEGORY__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__CHECKLISTS = CONTENT_CATEGORY__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__GUIDELINES = CONTENT_CATEGORY__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__EXAMPLES = CONTENT_CATEGORY__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__ASSETS = CONTENT_CATEGORY__ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Work Products</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__WORK_PRODUCTS = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Subdomains</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__SUBDOMAINS = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Domain</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__GUID = CONTENT_CATEGORY__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__OWNED_RULES = CONTENT_CATEGORY__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__METHOD_ELEMENT_PROPERTY = CONTENT_CATEGORY__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__SUPPORTING_MATERIALS = CONTENT_CATEGORY__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__CONCEPTS_AND_PAPERS = CONTENT_CATEGORY__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__CHECKLISTS = CONTENT_CATEGORY__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__GUIDELINES = CONTENT_CATEGORY__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__EXAMPLES = CONTENT_CATEGORY__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__ASSETS = CONTENT_CATEGORY__ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Work Products</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__WORK_PRODUCTS = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Work Product Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__GUID = CONTENT_CATEGORY__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__OWNED_RULES = CONTENT_CATEGORY__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__METHOD_ELEMENT_PROPERTY = CONTENT_CATEGORY__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__SUPPORTING_MATERIALS = CONTENT_CATEGORY__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__CONCEPTS_AND_PAPERS = CONTENT_CATEGORY__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__CHECKLISTS = CONTENT_CATEGORY__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__GUIDELINES = CONTENT_CATEGORY__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__EXAMPLES = CONTENT_CATEGORY__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__ASSETS = CONTENT_CATEGORY__ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Disciplines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__DISCIPLINES = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Discipline Grouping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__GUID = CONTENT_CATEGORY__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__OWNED_RULES = CONTENT_CATEGORY__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__METHOD_ELEMENT_PROPERTY = CONTENT_CATEGORY__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__SUPPORTING_MATERIALS = CONTENT_CATEGORY__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__CONCEPTS_AND_PAPERS = CONTENT_CATEGORY__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__CHECKLISTS = CONTENT_CATEGORY__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__GUIDELINES = CONTENT_CATEGORY__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__EXAMPLES = CONTENT_CATEGORY__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__ASSETS = CONTENT_CATEGORY__ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Tool Mentors</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__TOOL_MENTORS = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Tool</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__GUID = CONTENT_CATEGORY__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__OWNED_RULES = CONTENT_CATEGORY__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__METHOD_ELEMENT_PROPERTY = CONTENT_CATEGORY__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__SUPPORTING_MATERIALS = CONTENT_CATEGORY__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__CONCEPTS_AND_PAPERS = CONTENT_CATEGORY__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__CHECKLISTS = CONTENT_CATEGORY__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__GUIDELINES = CONTENT_CATEGORY__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__EXAMPLES = CONTENT_CATEGORY__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__ASSETS = CONTENT_CATEGORY__ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Role Sets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__ROLE_SETS = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Role Set Grouping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__GUID = CONTENT_CATEGORY__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__OWNED_RULES = CONTENT_CATEGORY__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__METHOD_ELEMENT_PROPERTY = CONTENT_CATEGORY__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__SUPPORTING_MATERIALS = CONTENT_CATEGORY__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__CONCEPTS_AND_PAPERS = CONTENT_CATEGORY__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__CHECKLISTS = CONTENT_CATEGORY__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__GUIDELINES = CONTENT_CATEGORY__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__EXAMPLES = CONTENT_CATEGORY__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__ASSETS = CONTENT_CATEGORY__ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Categorized Elements</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__CATEGORIZED_ELEMENTS = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Sub Categories</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__SUB_CATEGORIES = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Custom Category</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__NAME = ACTIVITY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__GUID = ACTIVITY__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__BRIEF_DESCRIPTION = ACTIVITY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__OWNED_RULES = ACTIVITY__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__METHOD_ELEMENT_PROPERTY = ACTIVITY__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__SUPPRESSED = ACTIVITY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__ORDERING_GUIDE = ACTIVITY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__PRESENTATION_NAME = ACTIVITY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__PRESENTATION = ACTIVITY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__SHAPEICON = ACTIVITY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__NODEICON = ACTIVITY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__PREFIX = ACTIVITY__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__IS_PLANNED = ACTIVITY__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__HAS_MULTIPLE_OCCURRENCES = ACTIVITY__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__IS_OPTIONAL = ACTIVITY__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__PRESENTED_AFTER = ACTIVITY__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__PRESENTED_BEFORE = ACTIVITY__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__PLANNING_DATA = ACTIVITY__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__SUPER_ACTIVITIES = ACTIVITY__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__IS_REPEATABLE = ACTIVITY__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__IS_ONGOING = ACTIVITY__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__IS_EVENT_DRIVEN = ACTIVITY__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Link To Predecessor</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__LINK_TO_PREDECESSOR = ACTIVITY__LINK_TO_PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__VARIABILITY_TYPE = ACTIVITY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__VARIABILITY_BASED_ON_ELEMENT = ACTIVITY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__PRECONDITION = ACTIVITY__PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__POSTCONDITION = ACTIVITY__POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Breakdown Elements</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__BREAKDOWN_ELEMENTS = ACTIVITY__BREAKDOWN_ELEMENTS;
-
-	/**
-	 * The feature id for the '<em><b>Roadmaps</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__ROADMAPS = ACTIVITY__ROADMAPS;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__SUPPORTING_MATERIALS = ACTIVITY__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__CHECKLISTS = ACTIVITY__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__CONCEPTS = ACTIVITY__CONCEPTS;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__EXAMPLES = ACTIVITY__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__GUIDELINES = ACTIVITY__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__REUSABLE_ASSETS = ACTIVITY__REUSABLE_ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Is Enactable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__IS_ENACTABLE = ACTIVITY__IS_ENACTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Includes Patterns</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__INCLUDES_PATTERNS = ACTIVITY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Default Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__DEFAULT_CONTEXT = ACTIVITY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Valid Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__VALID_CONTEXT = ACTIVITY_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Process</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FEATURE_COUNT = ACTIVITY_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__NAME = PROCESS__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__GUID = PROCESS__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__BRIEF_DESCRIPTION = PROCESS__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__OWNED_RULES = PROCESS__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__METHOD_ELEMENT_PROPERTY = PROCESS__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__SUPPRESSED = PROCESS__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__ORDERING_GUIDE = PROCESS__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__PRESENTATION_NAME = PROCESS__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__PRESENTATION = PROCESS__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__SHAPEICON = PROCESS__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__NODEICON = PROCESS__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__PREFIX = PROCESS__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__IS_PLANNED = PROCESS__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__HAS_MULTIPLE_OCCURRENCES = PROCESS__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__IS_OPTIONAL = PROCESS__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__PRESENTED_AFTER = PROCESS__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__PRESENTED_BEFORE = PROCESS__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__PLANNING_DATA = PROCESS__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__SUPER_ACTIVITIES = PROCESS__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__IS_REPEATABLE = PROCESS__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__IS_ONGOING = PROCESS__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__IS_EVENT_DRIVEN = PROCESS__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Link To Predecessor</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__LINK_TO_PREDECESSOR = PROCESS__LINK_TO_PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__VARIABILITY_TYPE = PROCESS__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__VARIABILITY_BASED_ON_ELEMENT = PROCESS__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__PRECONDITION = PROCESS__PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__POSTCONDITION = PROCESS__POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Breakdown Elements</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__BREAKDOWN_ELEMENTS = PROCESS__BREAKDOWN_ELEMENTS;
-
-	/**
-	 * The feature id for the '<em><b>Roadmaps</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__ROADMAPS = PROCESS__ROADMAPS;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__SUPPORTING_MATERIALS = PROCESS__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__CHECKLISTS = PROCESS__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__CONCEPTS = PROCESS__CONCEPTS;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__EXAMPLES = PROCESS__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__GUIDELINES = PROCESS__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__REUSABLE_ASSETS = PROCESS__REUSABLE_ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Is Enactable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__IS_ENACTABLE = PROCESS__IS_ENACTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Includes Patterns</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__INCLUDES_PATTERNS = PROCESS__INCLUDES_PATTERNS;
-
-	/**
-	 * The feature id for the '<em><b>Default Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__DEFAULT_CONTEXT = PROCESS__DEFAULT_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Valid Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__VALID_CONTEXT = PROCESS__VALID_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Education Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__EDUCATION_MATERIALS = PROCESS_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Communications Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__COMMUNICATIONS_MATERIALS = PROCESS_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Delivery Process</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_FEATURE_COUNT = PROCESS_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__NAME = PROCESS__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__GUID = PROCESS__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__BRIEF_DESCRIPTION = PROCESS__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__OWNED_RULES = PROCESS__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__METHOD_ELEMENT_PROPERTY = PROCESS__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__SUPPRESSED = PROCESS__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__ORDERING_GUIDE = PROCESS__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__PRESENTATION_NAME = PROCESS__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__PRESENTATION = PROCESS__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__SHAPEICON = PROCESS__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__NODEICON = PROCESS__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__PREFIX = PROCESS__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__IS_PLANNED = PROCESS__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__HAS_MULTIPLE_OCCURRENCES = PROCESS__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__IS_OPTIONAL = PROCESS__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__PRESENTED_AFTER = PROCESS__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__PRESENTED_BEFORE = PROCESS__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__PLANNING_DATA = PROCESS__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__SUPER_ACTIVITIES = PROCESS__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__IS_REPEATABLE = PROCESS__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__IS_ONGOING = PROCESS__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__IS_EVENT_DRIVEN = PROCESS__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Link To Predecessor</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__LINK_TO_PREDECESSOR = PROCESS__LINK_TO_PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__VARIABILITY_TYPE = PROCESS__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__VARIABILITY_BASED_ON_ELEMENT = PROCESS__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__PRECONDITION = PROCESS__PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__POSTCONDITION = PROCESS__POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Breakdown Elements</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__BREAKDOWN_ELEMENTS = PROCESS__BREAKDOWN_ELEMENTS;
-
-	/**
-	 * The feature id for the '<em><b>Roadmaps</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__ROADMAPS = PROCESS__ROADMAPS;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__SUPPORTING_MATERIALS = PROCESS__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__CHECKLISTS = PROCESS__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__CONCEPTS = PROCESS__CONCEPTS;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__EXAMPLES = PROCESS__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__GUIDELINES = PROCESS__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__REUSABLE_ASSETS = PROCESS__REUSABLE_ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Is Enactable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__IS_ENACTABLE = PROCESS__IS_ENACTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Includes Patterns</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__INCLUDES_PATTERNS = PROCESS__INCLUDES_PATTERNS;
-
-	/**
-	 * The feature id for the '<em><b>Default Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__DEFAULT_CONTEXT = PROCESS__DEFAULT_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Valid Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__VALID_CONTEXT = PROCESS__VALID_CONTEXT;
-
-	/**
-	 * The number of structural features of the '<em>Capability Pattern</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN_FEATURE_COUNT = PROCESS_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__NAME = PROCESS__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__GUID = PROCESS__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__BRIEF_DESCRIPTION = PROCESS__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__OWNED_RULES = PROCESS__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__METHOD_ELEMENT_PROPERTY = PROCESS__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__SUPPRESSED = PROCESS__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__ORDERING_GUIDE = PROCESS__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__PRESENTATION_NAME = PROCESS__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__PRESENTATION = PROCESS__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__SHAPEICON = PROCESS__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__NODEICON = PROCESS__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__PREFIX = PROCESS__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__IS_PLANNED = PROCESS__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__HAS_MULTIPLE_OCCURRENCES = PROCESS__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__IS_OPTIONAL = PROCESS__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__PRESENTED_AFTER = PROCESS__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__PRESENTED_BEFORE = PROCESS__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__PLANNING_DATA = PROCESS__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__SUPER_ACTIVITIES = PROCESS__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__IS_REPEATABLE = PROCESS__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__IS_ONGOING = PROCESS__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__IS_EVENT_DRIVEN = PROCESS__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Link To Predecessor</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__LINK_TO_PREDECESSOR = PROCESS__LINK_TO_PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__VARIABILITY_TYPE = PROCESS__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__VARIABILITY_BASED_ON_ELEMENT = PROCESS__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__PRECONDITION = PROCESS__PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__POSTCONDITION = PROCESS__POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Breakdown Elements</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__BREAKDOWN_ELEMENTS = PROCESS__BREAKDOWN_ELEMENTS;
-
-	/**
-	 * The feature id for the '<em><b>Roadmaps</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__ROADMAPS = PROCESS__ROADMAPS;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__SUPPORTING_MATERIALS = PROCESS__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__CHECKLISTS = PROCESS__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__CONCEPTS = PROCESS__CONCEPTS;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__EXAMPLES = PROCESS__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__GUIDELINES = PROCESS__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__REUSABLE_ASSETS = PROCESS__REUSABLE_ASSETS;
-
-	/**
-	 * The feature id for the '<em><b>Is Enactable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__IS_ENACTABLE = PROCESS__IS_ENACTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Includes Patterns</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__INCLUDES_PATTERNS = PROCESS__INCLUDES_PATTERNS;
-
-	/**
-	 * The feature id for the '<em><b>Default Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__DEFAULT_CONTEXT = PROCESS__DEFAULT_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Valid Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__VALID_CONTEXT = PROCESS__VALID_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Based On Processes</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__BASED_ON_PROCESSES = PROCESS_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Process Planning Template</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE_FEATURE_COUNT = PROCESS_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__GUID = GUIDANCE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__OWNED_RULES = GUIDANCE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__METHOD_ELEMENT_PROPERTY = GUIDANCE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Materials</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__SUPPORTING_MATERIALS = GUIDANCE__SUPPORTING_MATERIALS;
-
-	/**
-	 * The feature id for the '<em><b>Concepts And Papers</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__CONCEPTS_AND_PAPERS = GUIDANCE__CONCEPTS_AND_PAPERS;
-
-	/**
-	 * The feature id for the '<em><b>Checklists</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__CHECKLISTS = GUIDANCE__CHECKLISTS;
-
-	/**
-	 * The feature id for the '<em><b>Guidelines</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__GUIDELINES = GUIDANCE__GUIDELINES;
-
-	/**
-	 * The feature id for the '<em><b>Examples</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__EXAMPLES = GUIDANCE__EXAMPLES;
-
-	/**
-	 * The feature id for the '<em><b>Assets</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__ASSETS = GUIDANCE__ASSETS;
-
-	/**
-	 * The number of structural features of the '<em>Roadmap</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__NAME = METHOD_PACKAGE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__GUID = METHOD_PACKAGE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__BRIEF_DESCRIPTION = METHOD_PACKAGE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__OWNED_RULES = METHOD_PACKAGE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__METHOD_ELEMENT_PROPERTY = METHOD_PACKAGE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__SUPPRESSED = METHOD_PACKAGE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__ORDERING_GUIDE = METHOD_PACKAGE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Global</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__GLOBAL = METHOD_PACKAGE__GLOBAL;
-
-	/**
-	 * The feature id for the '<em><b>Reused Packages</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__REUSED_PACKAGES = METHOD_PACKAGE__REUSED_PACKAGES;
-
-	/**
-	 * The feature id for the '<em><b>Child Packages</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__CHILD_PACKAGES = METHOD_PACKAGE__CHILD_PACKAGES;
-
-	/**
-	 * The feature id for the '<em><b>Process Elements</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__PROCESS_ELEMENTS = METHOD_PACKAGE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Diagrams</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__DIAGRAMS = METHOD_PACKAGE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Process Package</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE_FEATURE_COUNT = METHOD_PACKAGE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__NAME = PROCESS_PACKAGE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__GUID = PROCESS_PACKAGE__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__BRIEF_DESCRIPTION = PROCESS_PACKAGE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__OWNED_RULES = PROCESS_PACKAGE__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__METHOD_ELEMENT_PROPERTY = PROCESS_PACKAGE__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__SUPPRESSED = PROCESS_PACKAGE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__ORDERING_GUIDE = PROCESS_PACKAGE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Global</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__GLOBAL = PROCESS_PACKAGE__GLOBAL;
-
-	/**
-	 * The feature id for the '<em><b>Reused Packages</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__REUSED_PACKAGES = PROCESS_PACKAGE__REUSED_PACKAGES;
-
-	/**
-	 * The feature id for the '<em><b>Child Packages</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__CHILD_PACKAGES = PROCESS_PACKAGE__CHILD_PACKAGES;
-
-	/**
-	 * The feature id for the '<em><b>Process Elements</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__PROCESS_ELEMENTS = PROCESS_PACKAGE__PROCESS_ELEMENTS;
-
-	/**
-	 * The feature id for the '<em><b>Diagrams</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__DIAGRAMS = PROCESS_PACKAGE__DIAGRAMS;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__AUTHORS = PROCESS_PACKAGE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__CHANGE_DATE = PROCESS_PACKAGE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__CHANGE_DESCRIPTION = PROCESS_PACKAGE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__VERSION = PROCESS_PACKAGE_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__COPYRIGHT_STATEMENT = PROCESS_PACKAGE_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Interfaces</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__INTERFACES = PROCESS_PACKAGE_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Process</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__PROCESS = PROCESS_PACKAGE_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Process Component</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_FEATURE_COUNT = PROCESS_PACKAGE_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__NAME = BREAKDOWN_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__GUID = BREAKDOWN_ELEMENT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__BRIEF_DESCRIPTION = BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__OWNED_RULES = BREAKDOWN_ELEMENT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__METHOD_ELEMENT_PROPERTY = BREAKDOWN_ELEMENT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__SUPPRESSED = BREAKDOWN_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__ORDERING_GUIDE = BREAKDOWN_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__PRESENTATION_NAME = BREAKDOWN_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__PRESENTATION = BREAKDOWN_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__SHAPEICON = BREAKDOWN_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__NODEICON = BREAKDOWN_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__PREFIX = BREAKDOWN_ELEMENT__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__IS_PLANNED = BREAKDOWN_ELEMENT__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__HAS_MULTIPLE_OCCURRENCES = BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__IS_OPTIONAL = BREAKDOWN_ELEMENT__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__PRESENTED_AFTER = BREAKDOWN_ELEMENT__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__PRESENTED_BEFORE = BREAKDOWN_ELEMENT__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__PLANNING_DATA = BREAKDOWN_ELEMENT__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__SUPER_ACTIVITIES = BREAKDOWN_ELEMENT__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Interface Specifications</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATIONS = BREAKDOWN_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Interface IO</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__INTERFACE_IO = BREAKDOWN_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Process Component Interface</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE_FEATURE_COUNT = BREAKDOWN_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__NAME = DESCRIPTOR__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__GUID = DESCRIPTOR__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__BRIEF_DESCRIPTION = DESCRIPTOR__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__OWNED_RULES = DESCRIPTOR__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__METHOD_ELEMENT_PROPERTY = DESCRIPTOR__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__SUPPRESSED = DESCRIPTOR__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__ORDERING_GUIDE = DESCRIPTOR__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__PRESENTATION_NAME = DESCRIPTOR__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__PRESENTATION = DESCRIPTOR__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__SHAPEICON = DESCRIPTOR__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__NODEICON = DESCRIPTOR__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__PREFIX = DESCRIPTOR__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__IS_PLANNED = DESCRIPTOR__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES = DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__IS_OPTIONAL = DESCRIPTOR__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__PRESENTED_AFTER = DESCRIPTOR__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__PRESENTED_BEFORE = DESCRIPTOR__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__PLANNING_DATA = DESCRIPTOR__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activities</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__SUPER_ACTIVITIES = DESCRIPTOR__SUPER_ACTIVITIES;
-
-	/**
-	 * The feature id for the '<em><b>Is Synchronized With Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE = DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Process Component</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR__PROCESS_COMPONENT = DESCRIPTOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Process Component Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_DESCRIPTOR_FEATURE_COUNT = DESCRIPTOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__NAME = METHOD_UNIT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__GUID = METHOD_UNIT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__BRIEF_DESCRIPTION = METHOD_UNIT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__OWNED_RULES = METHOD_UNIT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__METHOD_ELEMENT_PROPERTY = METHOD_UNIT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__SUPPRESSED = METHOD_UNIT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__ORDERING_GUIDE = METHOD_UNIT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__AUTHORS = METHOD_UNIT__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__CHANGE_DATE = METHOD_UNIT__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__CHANGE_DESCRIPTION = METHOD_UNIT__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__VERSION = METHOD_UNIT__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__COPYRIGHT_STATEMENT = METHOD_UNIT__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>User Changeable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__USER_CHANGEABLE = METHOD_UNIT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Method Packages</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__METHOD_PACKAGES = METHOD_UNIT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Bases</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__BASES = METHOD_UNIT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Method Plugin</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN_FEATURE_COUNT = METHOD_UNIT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.MethodConfigurationImpl <em>Method Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.MethodConfigurationImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMethodConfiguration()
-	 * @generated
-	 */
-	int METHOD_CONFIGURATION = 113;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__NAME = METHOD_UNIT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__GUID = METHOD_UNIT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__BRIEF_DESCRIPTION = METHOD_UNIT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__OWNED_RULES = METHOD_UNIT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__METHOD_ELEMENT_PROPERTY = METHOD_UNIT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__SUPPRESSED = METHOD_UNIT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__ORDERING_GUIDE = METHOD_UNIT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__AUTHORS = METHOD_UNIT__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__CHANGE_DATE = METHOD_UNIT__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__CHANGE_DESCRIPTION = METHOD_UNIT__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__VERSION = METHOD_UNIT__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__COPYRIGHT_STATEMENT = METHOD_UNIT__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Method Plugin Selection</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION = METHOD_UNIT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Method Package Selection</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION = METHOD_UNIT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Process Views</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__PROCESS_VIEWS = METHOD_UNIT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Default View</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__DEFAULT_VIEW = METHOD_UNIT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Base Configurations</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__BASE_CONFIGURATIONS = METHOD_UNIT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Subtracted Category</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__SUBTRACTED_CATEGORY = METHOD_UNIT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Added Category</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__ADDED_CATEGORY = METHOD_UNIT_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Method Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION_FEATURE_COUNT = METHOD_UNIT_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.ProcessFamilyImpl <em>Process Family</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.ProcessFamilyImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessFamily()
-	 * @generated
-	 */
-	int PROCESS_FAMILY = 114;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__NAME = METHOD_CONFIGURATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__GUID = METHOD_CONFIGURATION__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__BRIEF_DESCRIPTION = METHOD_CONFIGURATION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__OWNED_RULES = METHOD_CONFIGURATION__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__METHOD_ELEMENT_PROPERTY = METHOD_CONFIGURATION__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__SUPPRESSED = METHOD_CONFIGURATION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__ORDERING_GUIDE = METHOD_CONFIGURATION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__AUTHORS = METHOD_CONFIGURATION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__CHANGE_DATE = METHOD_CONFIGURATION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__CHANGE_DESCRIPTION = METHOD_CONFIGURATION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__VERSION = METHOD_CONFIGURATION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__COPYRIGHT_STATEMENT = METHOD_CONFIGURATION__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Method Plugin Selection</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__METHOD_PLUGIN_SELECTION = METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION;
-
-	/**
-	 * The feature id for the '<em><b>Method Package Selection</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__METHOD_PACKAGE_SELECTION = METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION;
-
-	/**
-	 * The feature id for the '<em><b>Process Views</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__PROCESS_VIEWS = METHOD_CONFIGURATION__PROCESS_VIEWS;
-
-	/**
-	 * The feature id for the '<em><b>Default View</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__DEFAULT_VIEW = METHOD_CONFIGURATION__DEFAULT_VIEW;
-
-	/**
-	 * The feature id for the '<em><b>Base Configurations</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__BASE_CONFIGURATIONS = METHOD_CONFIGURATION__BASE_CONFIGURATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Subtracted Category</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__SUBTRACTED_CATEGORY = METHOD_CONFIGURATION__SUBTRACTED_CATEGORY;
-
-	/**
-	 * The feature id for the '<em><b>Added Category</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__ADDED_CATEGORY = METHOD_CONFIGURATION__ADDED_CATEGORY;
-
-	/**
-	 * The feature id for the '<em><b>Delivery Processes</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY__DELIVERY_PROCESSES = METHOD_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Process Family</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FAMILY_FEATURE_COUNT = METHOD_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.impl.MethodLibraryImpl <em>Method Library</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.MethodLibraryImpl
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMethodLibrary()
-	 * @generated
-	 */
-	int METHOD_LIBRARY = 115;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__NAME = METHOD_UNIT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Guid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__GUID = METHOD_UNIT__GUID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__BRIEF_DESCRIPTION = METHOD_UNIT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__OWNED_RULES = METHOD_UNIT__OWNED_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Method Element Property</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__METHOD_ELEMENT_PROPERTY = METHOD_UNIT__METHOD_ELEMENT_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__SUPPRESSED = METHOD_UNIT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__ORDERING_GUIDE = METHOD_UNIT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__AUTHORS = METHOD_UNIT__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__CHANGE_DATE = METHOD_UNIT__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__CHANGE_DESCRIPTION = METHOD_UNIT__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__VERSION = METHOD_UNIT__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Copyright Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__COPYRIGHT_STATEMENT = METHOD_UNIT__COPYRIGHT_STATEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Method Plugins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__METHOD_PLUGINS = METHOD_UNIT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Predefined Configurations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__PREDEFINED_CONFIGURATIONS = METHOD_UNIT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Method Library</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY_FEATURE_COUNT = METHOD_UNIT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.WorkOrderType <em>Work Order Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.WorkOrderType
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkOrderType()
-	 * @generated
-	 */
-	int WORK_ORDER_TYPE = 116;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.PseudoStateKind <em>Pseudo State Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.PseudoStateKind
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPseudoStateKind()
-	 * @generated
-	 */
-	int PSEUDO_STATE_KIND = 117;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.uma.VariabilityType <em>Variability Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.VariabilityType
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getVariabilityType()
-	 * @generated
-	 */
-	int VARIABILITY_TYPE = 118;
-
-	/**
-	 * The meta object id for the '<em>Date</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.util.Date
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDate()
-	 * @generated
-	 */
-	int DATE = 119;
-
-	/**
-	 * The meta object id for the '<em>Uri</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.net.URI
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getUri()
-	 * @generated
-	 */
-	int URI = 120;
-
-	/**
-	 * The meta object id for the '<em>Unlimited Natural</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getUnlimitedNatural()
-	 * @generated
-	 */
-	int UNLIMITED_NATURAL = 121;
-
-	/**
-	 * The meta object id for the '<em>String</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getString()
-	 * @generated
-	 */
-	int STRING = 122;
-
-	/**
-	 * The meta object id for the '<em>Set</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.util.Set
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getSet()
-	 * @generated
-	 */
-	int SET = 123;
-
-	/**
-	 * The meta object id for the '<em>Sequence</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.util.List
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getSequence()
-	 * @generated
-	 */
-	int SEQUENCE = 124;
-
-	/**
-	 * The meta object id for the '<em>Integer</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getInteger()
-	 * @generated
-	 */
-	int INTEGER = 125;
-
-	/**
-	 * The meta object id for the '<em>Float</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.Float
-	 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getFloat()
-	 * @generated
-	 */
-	int FLOAT = 126;
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Classifier <em>Classifier</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Classifier</em>'.
-	 * @see org.eclipse.epf.uma.Classifier
-	 * @generated
-	 */
-	EClass getClassifier();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Type <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Type</em>'.
-	 * @see org.eclipse.epf.uma.Type
-	 * @generated
-	 */
-	EClass getType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Element <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Element</em>'.
-	 * @see org.eclipse.epf.uma.Element
-	 * @generated
-	 */
-	EClass getElement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.NamedElement <em>Named Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Named Element</em>'.
-	 * @see org.eclipse.epf.uma.NamedElement
-	 * @generated
-	 */
-	EClass getNamedElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.NamedElement#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.epf.uma.NamedElement#getName()
-	 * @see #getNamedElement()
-	 * @generated
-	 */
-	EAttribute getNamedElement_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.PackageableElement <em>Packageable Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Packageable Element</em>'.
-	 * @see org.eclipse.epf.uma.PackageableElement
-	 * @generated
-	 */
-	EClass getPackageableElement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Package <em>Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Package</em>'.
-	 * @see org.eclipse.epf.uma.Package
-	 * @generated
-	 */
-	EClass getPackage();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Namespace <em>Namespace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Namespace</em>'.
-	 * @see org.eclipse.epf.uma.Namespace
-	 * @generated
-	 */
-	EClass getNamespace();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.MethodElement <em>Method Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Element</em>'.
-	 * @see org.eclipse.epf.uma.MethodElement
-	 * @generated
-	 */
-	EClass getMethodElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.MethodElement#getGuid <em>Guid</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Guid</em>'.
-	 * @see org.eclipse.epf.uma.MethodElement#getGuid()
-	 * @see #getMethodElement()
-	 * @generated
-	 */
-	EAttribute getMethodElement_Guid();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.MethodElement#getBriefDescription <em>Brief Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Brief Description</em>'.
-	 * @see org.eclipse.epf.uma.MethodElement#getBriefDescription()
-	 * @see #getMethodElement()
-	 * @generated
-	 */
-	EAttribute getMethodElement_BriefDescription();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.MethodElement#getOwnedRules <em>Owned Rules</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Owned Rules</em>'.
-	 * @see org.eclipse.epf.uma.MethodElement#getOwnedRules()
-	 * @see #getMethodElement()
-	 * @generated
-	 */
-	EReference getMethodElement_OwnedRules();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.MethodElement#getMethodElementProperty <em>Method Element Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Method Element Property</em>'.
-	 * @see org.eclipse.epf.uma.MethodElement#getMethodElementProperty()
-	 * @see #getMethodElement()
-	 * @generated
-	 */
-	EReference getMethodElement_MethodElementProperty();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.MethodElement#getSuppressed <em>Suppressed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Suppressed</em>'.
-	 * @see org.eclipse.epf.uma.MethodElement#getSuppressed()
-	 * @see #getMethodElement()
-	 * @generated
-	 */
-	EAttribute getMethodElement_Suppressed();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.MethodElement#getOrderingGuide <em>Ordering Guide</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ordering Guide</em>'.
-	 * @see org.eclipse.epf.uma.MethodElement#getOrderingGuide()
-	 * @see #getMethodElement()
-	 * @generated
-	 */
-	EAttribute getMethodElement_OrderingGuide();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Constraint <em>Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Constraint</em>'.
-	 * @see org.eclipse.epf.uma.Constraint
-	 * @generated
-	 */
-	EClass getConstraint();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Constraint#getBody <em>Body</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Body</em>'.
-	 * @see org.eclipse.epf.uma.Constraint#getBody()
-	 * @see #getConstraint()
-	 * @generated
-	 */
-	EAttribute getConstraint_Body();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.MethodElementProperty <em>Method Element Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Element Property</em>'.
-	 * @see org.eclipse.epf.uma.MethodElementProperty
-	 * @generated
-	 */
-	EClass getMethodElementProperty();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.MethodElementProperty#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.epf.uma.MethodElementProperty#getValue()
-	 * @see #getMethodElementProperty()
-	 * @generated
-	 */
-	EAttribute getMethodElementProperty_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ContentElement <em>Content Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Content Element</em>'.
-	 * @see org.eclipse.epf.uma.ContentElement
-	 * @generated
-	 */
-	EClass getContentElement();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.ContentElement#getSupportingMaterials <em>Supporting Materials</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Supporting Materials</em>'.
-	 * @see org.eclipse.epf.uma.ContentElement#getSupportingMaterials()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EReference getContentElement_SupportingMaterials();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.ContentElement#getConceptsAndPapers <em>Concepts And Papers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Concepts And Papers</em>'.
-	 * @see org.eclipse.epf.uma.ContentElement#getConceptsAndPapers()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EReference getContentElement_ConceptsAndPapers();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.ContentElement#getChecklists <em>Checklists</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Checklists</em>'.
-	 * @see org.eclipse.epf.uma.ContentElement#getChecklists()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EReference getContentElement_Checklists();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.ContentElement#getGuidelines <em>Guidelines</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Guidelines</em>'.
-	 * @see org.eclipse.epf.uma.ContentElement#getGuidelines()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EReference getContentElement_Guidelines();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.ContentElement#getExamples <em>Examples</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Examples</em>'.
-	 * @see org.eclipse.epf.uma.ContentElement#getExamples()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EReference getContentElement_Examples();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.ContentElement#getAssets <em>Assets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Assets</em>'.
-	 * @see org.eclipse.epf.uma.ContentElement#getAssets()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EReference getContentElement_Assets();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.DescribableElement <em>Describable Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Describable Element</em>'.
-	 * @see org.eclipse.epf.uma.DescribableElement
-	 * @generated
-	 */
-	EClass getDescribableElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.DescribableElement#getPresentationName <em>Presentation Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Presentation Name</em>'.
-	 * @see org.eclipse.epf.uma.DescribableElement#getPresentationName()
-	 * @see #getDescribableElement()
-	 * @generated
-	 */
-	EAttribute getDescribableElement_PresentationName();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.uma.DescribableElement#getPresentation <em>Presentation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Presentation</em>'.
-	 * @see org.eclipse.epf.uma.DescribableElement#getPresentation()
-	 * @see #getDescribableElement()
-	 * @generated
-	 */
-	EReference getDescribableElement_Presentation();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.DescribableElement#getShapeicon <em>Shapeicon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Shapeicon</em>'.
-	 * @see org.eclipse.epf.uma.DescribableElement#getShapeicon()
-	 * @see #getDescribableElement()
-	 * @generated
-	 */
-	EAttribute getDescribableElement_Shapeicon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.DescribableElement#getNodeicon <em>Nodeicon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Nodeicon</em>'.
-	 * @see org.eclipse.epf.uma.DescribableElement#getNodeicon()
-	 * @see #getDescribableElement()
-	 * @generated
-	 */
-	EAttribute getDescribableElement_Nodeicon();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ContentDescription <em>Content Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Content Description</em>'.
-	 * @see org.eclipse.epf.uma.ContentDescription
-	 * @generated
-	 */
-	EClass getContentDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.ContentDescription#getMainDescription <em>Main Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Main Description</em>'.
-	 * @see org.eclipse.epf.uma.ContentDescription#getMainDescription()
-	 * @see #getContentDescription()
-	 * @generated
-	 */
-	EAttribute getContentDescription_MainDescription();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.ContentDescription#getSections <em>Sections</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Sections</em>'.
-	 * @see org.eclipse.epf.uma.ContentDescription#getSections()
-	 * @see #getContentDescription()
-	 * @generated
-	 */
-	EReference getContentDescription_Sections();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.ContentDescription#getKeyConsiderations <em>Key Considerations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Key Considerations</em>'.
-	 * @see org.eclipse.epf.uma.ContentDescription#getKeyConsiderations()
-	 * @see #getContentDescription()
-	 * @generated
-	 */
-	EAttribute getContentDescription_KeyConsiderations();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Section <em>Section</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Section</em>'.
-	 * @see org.eclipse.epf.uma.Section
-	 * @generated
-	 */
-	EClass getSection();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Section#getSectionName <em>Section Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Section Name</em>'.
-	 * @see org.eclipse.epf.uma.Section#getSectionName()
-	 * @see #getSection()
-	 * @generated
-	 */
-	EAttribute getSection_SectionName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Section#getSectionDescription <em>Section Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Section Description</em>'.
-	 * @see org.eclipse.epf.uma.Section#getSectionDescription()
-	 * @see #getSection()
-	 * @generated
-	 */
-	EAttribute getSection_SectionDescription();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.Section#getSubSections <em>Sub Sections</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Sub Sections</em>'.
-	 * @see org.eclipse.epf.uma.Section#getSubSections()
-	 * @see #getSection()
-	 * @generated
-	 */
-	EReference getSection_SubSections();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.Section#getPredecessor <em>Predecessor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Predecessor</em>'.
-	 * @see org.eclipse.epf.uma.Section#getPredecessor()
-	 * @see #getSection()
-	 * @generated
-	 */
-	EReference getSection_Predecessor();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Role <em>Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Role</em>'.
-	 * @see org.eclipse.epf.uma.Role
-	 * @generated
-	 */
-	EClass getRole();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Role#getModifies <em>Modifies</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Modifies</em>'.
-	 * @see org.eclipse.epf.uma.Role#getModifies()
-	 * @see #getRole()
-	 * @generated
-	 */
-	EReference getRole_Modifies();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Role#getResponsibleFor <em>Responsible For</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Responsible For</em>'.
-	 * @see org.eclipse.epf.uma.Role#getResponsibleFor()
-	 * @see #getRole()
-	 * @generated
-	 */
-	EReference getRole_ResponsibleFor();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.WorkProduct <em>Work Product</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Product</em>'.
-	 * @see org.eclipse.epf.uma.WorkProduct
-	 * @generated
-	 */
-	EClass getWorkProduct();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.WorkProduct#getReports <em>Reports</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Reports</em>'.
-	 * @see org.eclipse.epf.uma.WorkProduct#getReports()
-	 * @see #getWorkProduct()
-	 * @generated
-	 */
-	EReference getWorkProduct_Reports();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.WorkProduct#getTemplates <em>Templates</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Templates</em>'.
-	 * @see org.eclipse.epf.uma.WorkProduct#getTemplates()
-	 * @see #getWorkProduct()
-	 * @generated
-	 */
-	EReference getWorkProduct_Templates();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.WorkProduct#getToolMentors <em>Tool Mentors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Tool Mentors</em>'.
-	 * @see org.eclipse.epf.uma.WorkProduct#getToolMentors()
-	 * @see #getWorkProduct()
-	 * @generated
-	 */
-	EReference getWorkProduct_ToolMentors();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.WorkProduct#getEstimationConsiderations <em>Estimation Considerations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Estimation Considerations</em>'.
-	 * @see org.eclipse.epf.uma.WorkProduct#getEstimationConsiderations()
-	 * @see #getWorkProduct()
-	 * @generated
-	 */
-	EReference getWorkProduct_EstimationConsiderations();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Task <em>Task</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Task</em>'.
-	 * @see org.eclipse.epf.uma.Task
-	 * @generated
-	 */
-	EClass getTask();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.Task#getPerformedBy <em>Performed By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Performed By</em>'.
-	 * @see org.eclipse.epf.uma.Task#getPerformedBy()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EReference getTask_PerformedBy();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Task#getMandatoryInput <em>Mandatory Input</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Mandatory Input</em>'.
-	 * @see org.eclipse.epf.uma.Task#getMandatoryInput()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EReference getTask_MandatoryInput();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Task#getOutput <em>Output</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Output</em>'.
-	 * @see org.eclipse.epf.uma.Task#getOutput()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EReference getTask_Output();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Task#getAdditionallyPerformedBy <em>Additionally Performed By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Additionally Performed By</em>'.
-	 * @see org.eclipse.epf.uma.Task#getAdditionallyPerformedBy()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EReference getTask_AdditionallyPerformedBy();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Task#getOptionalInput <em>Optional Input</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Optional Input</em>'.
-	 * @see org.eclipse.epf.uma.Task#getOptionalInput()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EReference getTask_OptionalInput();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Task#getSteps <em>Steps</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Steps</em>'.
-	 * @see org.eclipse.epf.uma.Task#getSteps()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EReference getTask_Steps();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Task#getToolMentors <em>Tool Mentors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Tool Mentors</em>'.
-	 * @see org.eclipse.epf.uma.Task#getToolMentors()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EReference getTask_ToolMentors();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Task#getEstimationConsiderations <em>Estimation Considerations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Estimation Considerations</em>'.
-	 * @see org.eclipse.epf.uma.Task#getEstimationConsiderations()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EReference getTask_EstimationConsiderations();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.WorkDefinition <em>Work Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Definition</em>'.
-	 * @see org.eclipse.epf.uma.WorkDefinition
-	 * @generated
-	 */
-	EClass getWorkDefinition();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.uma.WorkDefinition#getPrecondition <em>Precondition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Precondition</em>'.
-	 * @see org.eclipse.epf.uma.WorkDefinition#getPrecondition()
-	 * @see #getWorkDefinition()
-	 * @generated
-	 */
-	EReference getWorkDefinition_Precondition();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.uma.WorkDefinition#getPostcondition <em>Postcondition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Postcondition</em>'.
-	 * @see org.eclipse.epf.uma.WorkDefinition#getPostcondition()
-	 * @see #getWorkDefinition()
-	 * @generated
-	 */
-	EReference getWorkDefinition_Postcondition();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Step <em>Step</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Step</em>'.
-	 * @see org.eclipse.epf.uma.Step
-	 * @generated
-	 */
-	EClass getStep();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Guidance <em>Guidance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Guidance</em>'.
-	 * @see org.eclipse.epf.uma.Guidance
-	 * @generated
-	 */
-	EClass getGuidance();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Artifact <em>Artifact</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Artifact</em>'.
-	 * @see org.eclipse.epf.uma.Artifact
-	 * @generated
-	 */
-	EClass getArtifact();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.epf.uma.Artifact#getContainerArtifact <em>Container Artifact</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Container Artifact</em>'.
-	 * @see org.eclipse.epf.uma.Artifact#getContainerArtifact()
-	 * @see #getArtifact()
-	 * @generated
-	 */
-	EReference getArtifact_ContainerArtifact();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.Artifact#getContainedArtifacts <em>Contained Artifacts</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Contained Artifacts</em>'.
-	 * @see org.eclipse.epf.uma.Artifact#getContainedArtifacts()
-	 * @see #getArtifact()
-	 * @generated
-	 */
-	EReference getArtifact_ContainedArtifacts();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Deliverable <em>Deliverable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Deliverable</em>'.
-	 * @see org.eclipse.epf.uma.Deliverable
-	 * @generated
-	 */
-	EClass getDeliverable();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Deliverable#getDeliveredWorkProducts <em>Delivered Work Products</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Delivered Work Products</em>'.
-	 * @see org.eclipse.epf.uma.Deliverable#getDeliveredWorkProducts()
-	 * @see #getDeliverable()
-	 * @generated
-	 */
-	EReference getDeliverable_DeliveredWorkProducts();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Outcome <em>Outcome</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Outcome</em>'.
-	 * @see org.eclipse.epf.uma.Outcome
-	 * @generated
-	 */
-	EClass getOutcome();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.MethodPackage <em>Method Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Package</em>'.
-	 * @see org.eclipse.epf.uma.MethodPackage
-	 * @generated
-	 */
-	EClass getMethodPackage();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.MethodPackage#getGlobal <em>Global</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Global</em>'.
-	 * @see org.eclipse.epf.uma.MethodPackage#getGlobal()
-	 * @see #getMethodPackage()
-	 * @generated
-	 */
-	EAttribute getMethodPackage_Global();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.MethodPackage#getReusedPackages <em>Reused Packages</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Reused Packages</em>'.
-	 * @see org.eclipse.epf.uma.MethodPackage#getReusedPackages()
-	 * @see #getMethodPackage()
-	 * @generated
-	 */
-	EReference getMethodPackage_ReusedPackages();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.MethodPackage#getChildPackages <em>Child Packages</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Child Packages</em>'.
-	 * @see org.eclipse.epf.uma.MethodPackage#getChildPackages()
-	 * @see #getMethodPackage()
-	 * @generated
-	 */
-	EReference getMethodPackage_ChildPackages();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ContentPackage <em>Content Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Content Package</em>'.
-	 * @see org.eclipse.epf.uma.ContentPackage
-	 * @generated
-	 */
-	EClass getContentPackage();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.ContentPackage#getContentElements <em>Content Elements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Content Elements</em>'.
-	 * @see org.eclipse.epf.uma.ContentPackage#getContentElements()
-	 * @see #getContentPackage()
-	 * @generated
-	 */
-	EReference getContentPackage_ContentElements();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ArtifactDescription <em>Artifact Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Artifact Description</em>'.
-	 * @see org.eclipse.epf.uma.ArtifactDescription
-	 * @generated
-	 */
-	EClass getArtifactDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.ArtifactDescription#getBriefOutline <em>Brief Outline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Brief Outline</em>'.
-	 * @see org.eclipse.epf.uma.ArtifactDescription#getBriefOutline()
-	 * @see #getArtifactDescription()
-	 * @generated
-	 */
-	EAttribute getArtifactDescription_BriefOutline();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.ArtifactDescription#getRepresentationOptions <em>Representation Options</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Representation Options</em>'.
-	 * @see org.eclipse.epf.uma.ArtifactDescription#getRepresentationOptions()
-	 * @see #getArtifactDescription()
-	 * @generated
-	 */
-	EAttribute getArtifactDescription_RepresentationOptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.WorkProductDescription <em>Work Product Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Product Description</em>'.
-	 * @see org.eclipse.epf.uma.WorkProductDescription
-	 * @generated
-	 */
-	EClass getWorkProductDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.WorkProductDescription#getExternalId <em>External Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>External Id</em>'.
-	 * @see org.eclipse.epf.uma.WorkProductDescription#getExternalId()
-	 * @see #getWorkProductDescription()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescription_ExternalId();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.WorkProductDescription#getPurpose <em>Purpose</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Purpose</em>'.
-	 * @see org.eclipse.epf.uma.WorkProductDescription#getPurpose()
-	 * @see #getWorkProductDescription()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescription_Purpose();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.WorkProductDescription#getImpactOfNotHaving <em>Impact Of Not Having</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Impact Of Not Having</em>'.
-	 * @see org.eclipse.epf.uma.WorkProductDescription#getImpactOfNotHaving()
-	 * @see #getWorkProductDescription()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescription_ImpactOfNotHaving();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.WorkProductDescription#getReasonsForNotNeeding <em>Reasons For Not Needing</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Reasons For Not Needing</em>'.
-	 * @see org.eclipse.epf.uma.WorkProductDescription#getReasonsForNotNeeding()
-	 * @see #getWorkProductDescription()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescription_ReasonsForNotNeeding();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.DeliverableDescription <em>Deliverable Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Deliverable Description</em>'.
-	 * @see org.eclipse.epf.uma.DeliverableDescription
-	 * @generated
-	 */
-	EClass getDeliverableDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.DeliverableDescription#getExternalDescription <em>External Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>External Description</em>'.
-	 * @see org.eclipse.epf.uma.DeliverableDescription#getExternalDescription()
-	 * @see #getDeliverableDescription()
-	 * @generated
-	 */
-	EAttribute getDeliverableDescription_ExternalDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.DeliverableDescription#getPackagingGuidance <em>Packaging Guidance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Packaging Guidance</em>'.
-	 * @see org.eclipse.epf.uma.DeliverableDescription#getPackagingGuidance()
-	 * @see #getDeliverableDescription()
-	 * @generated
-	 */
-	EAttribute getDeliverableDescription_PackagingGuidance();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.RoleDescription <em>Role Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Role Description</em>'.
-	 * @see org.eclipse.epf.uma.RoleDescription
-	 * @generated
-	 */
-	EClass getRoleDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.RoleDescription#getSkills <em>Skills</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Skills</em>'.
-	 * @see org.eclipse.epf.uma.RoleDescription#getSkills()
-	 * @see #getRoleDescription()
-	 * @generated
-	 */
-	EAttribute getRoleDescription_Skills();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.RoleDescription#getAssignmentApproaches <em>Assignment Approaches</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Assignment Approaches</em>'.
-	 * @see org.eclipse.epf.uma.RoleDescription#getAssignmentApproaches()
-	 * @see #getRoleDescription()
-	 * @generated
-	 */
-	EAttribute getRoleDescription_AssignmentApproaches();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.RoleDescription#getSynonyms <em>Synonyms</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Synonyms</em>'.
-	 * @see org.eclipse.epf.uma.RoleDescription#getSynonyms()
-	 * @see #getRoleDescription()
-	 * @generated
-	 */
-	EAttribute getRoleDescription_Synonyms();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.TaskDescription <em>Task Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Task Description</em>'.
-	 * @see org.eclipse.epf.uma.TaskDescription
-	 * @generated
-	 */
-	EClass getTaskDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.TaskDescription#getPurpose <em>Purpose</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Purpose</em>'.
-	 * @see org.eclipse.epf.uma.TaskDescription#getPurpose()
-	 * @see #getTaskDescription()
-	 * @generated
-	 */
-	EAttribute getTaskDescription_Purpose();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.TaskDescription#getAlternatives <em>Alternatives</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Alternatives</em>'.
-	 * @see org.eclipse.epf.uma.TaskDescription#getAlternatives()
-	 * @see #getTaskDescription()
-	 * @generated
-	 */
-	EAttribute getTaskDescription_Alternatives();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.GuidanceDescription <em>Guidance Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Guidance Description</em>'.
-	 * @see org.eclipse.epf.uma.GuidanceDescription
-	 * @generated
-	 */
-	EClass getGuidanceDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.GuidanceDescription#getAttachments <em>Attachments</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Attachments</em>'.
-	 * @see org.eclipse.epf.uma.GuidanceDescription#getAttachments()
-	 * @see #getGuidanceDescription()
-	 * @generated
-	 */
-	EAttribute getGuidanceDescription_Attachments();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.PracticeDescription <em>Practice Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Practice Description</em>'.
-	 * @see org.eclipse.epf.uma.PracticeDescription
-	 * @generated
-	 */
-	EClass getPracticeDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.PracticeDescription#getAdditionalInfo <em>Additional Info</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Additional Info</em>'.
-	 * @see org.eclipse.epf.uma.PracticeDescription#getAdditionalInfo()
-	 * @see #getPracticeDescription()
-	 * @generated
-	 */
-	EAttribute getPracticeDescription_AdditionalInfo();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.PracticeDescription#getProblem <em>Problem</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Problem</em>'.
-	 * @see org.eclipse.epf.uma.PracticeDescription#getProblem()
-	 * @see #getPracticeDescription()
-	 * @generated
-	 */
-	EAttribute getPracticeDescription_Problem();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.PracticeDescription#getBackground <em>Background</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Background</em>'.
-	 * @see org.eclipse.epf.uma.PracticeDescription#getBackground()
-	 * @see #getPracticeDescription()
-	 * @generated
-	 */
-	EAttribute getPracticeDescription_Background();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.PracticeDescription#getGoals <em>Goals</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Goals</em>'.
-	 * @see org.eclipse.epf.uma.PracticeDescription#getGoals()
-	 * @see #getPracticeDescription()
-	 * @generated
-	 */
-	EAttribute getPracticeDescription_Goals();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.PracticeDescription#getApplication <em>Application</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Application</em>'.
-	 * @see org.eclipse.epf.uma.PracticeDescription#getApplication()
-	 * @see #getPracticeDescription()
-	 * @generated
-	 */
-	EAttribute getPracticeDescription_Application();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.PracticeDescription#getLevelsOfAdoption <em>Levels Of Adoption</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Levels Of Adoption</em>'.
-	 * @see org.eclipse.epf.uma.PracticeDescription#getLevelsOfAdoption()
-	 * @see #getPracticeDescription()
-	 * @generated
-	 */
-	EAttribute getPracticeDescription_LevelsOfAdoption();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Point <em>Point</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Point</em>'.
-	 * @see org.eclipse.epf.uma.Point
-	 * @generated
-	 */
-	EClass getPoint();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Point#getX <em>X</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>X</em>'.
-	 * @see org.eclipse.epf.uma.Point#getX()
-	 * @see #getPoint()
-	 * @generated
-	 */
-	EAttribute getPoint_X();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Point#getY <em>Y</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Y</em>'.
-	 * @see org.eclipse.epf.uma.Point#getY()
-	 * @see #getPoint()
-	 * @generated
-	 */
-	EAttribute getPoint_Y();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.GraphElement <em>Graph Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Graph Element</em>'.
-	 * @see org.eclipse.epf.uma.GraphElement
-	 * @generated
-	 */
-	EClass getGraphElement();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.uma.GraphElement#getPosition <em>Position</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Position</em>'.
-	 * @see org.eclipse.epf.uma.GraphElement#getPosition()
-	 * @see #getGraphElement()
-	 * @generated
-	 */
-	EReference getGraphElement_Position();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.GraphElement#getContained <em>Contained</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Contained</em>'.
-	 * @see org.eclipse.epf.uma.GraphElement#getContained()
-	 * @see #getGraphElement()
-	 * @generated
-	 */
-	EReference getGraphElement_Contained();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.GraphElement#getLink <em>Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Link</em>'.
-	 * @see org.eclipse.epf.uma.GraphElement#getLink()
-	 * @see #getGraphElement()
-	 * @generated
-	 */
-	EReference getGraphElement_Link();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.GraphElement#getAnchorage <em>Anchorage</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Anchorage</em>'.
-	 * @see org.eclipse.epf.uma.GraphElement#getAnchorage()
-	 * @see #getGraphElement()
-	 * @generated
-	 */
-	EReference getGraphElement_Anchorage();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.uma.GraphElement#getSemanticModel <em>Semantic Model</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Semantic Model</em>'.
-	 * @see org.eclipse.epf.uma.GraphElement#getSemanticModel()
-	 * @see #getGraphElement()
-	 * @generated
-	 */
-	EReference getGraphElement_SemanticModel();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.DiagramElement <em>Diagram Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Diagram Element</em>'.
-	 * @see org.eclipse.epf.uma.DiagramElement
-	 * @generated
-	 */
-	EClass getDiagramElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.DiagramElement#getIsVisible <em>Is Visible</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Visible</em>'.
-	 * @see org.eclipse.epf.uma.DiagramElement#getIsVisible()
-	 * @see #getDiagramElement()
-	 * @generated
-	 */
-	EAttribute getDiagramElement_IsVisible();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.epf.uma.DiagramElement#getContainer_ <em>Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Container</em>'.
-	 * @see org.eclipse.epf.uma.DiagramElement#getContainer_()
-	 * @see #getDiagramElement()
-	 * @generated
-	 */
-	EReference getDiagramElement_Container();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.DiagramElement#getReference <em>Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Reference</em>'.
-	 * @see org.eclipse.epf.uma.DiagramElement#getReference()
-	 * @see #getDiagramElement()
-	 * @generated
-	 */
-	EReference getDiagramElement_Reference();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.DiagramElement#getProperty <em>Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Property</em>'.
-	 * @see org.eclipse.epf.uma.DiagramElement#getProperty()
-	 * @see #getDiagramElement()
-	 * @generated
-	 */
-	EReference getDiagramElement_Property();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.DiagramLink <em>Diagram Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Diagram Link</em>'.
-	 * @see org.eclipse.epf.uma.DiagramLink
-	 * @generated
-	 */
-	EClass getDiagramLink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.DiagramLink#getZoom <em>Zoom</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Zoom</em>'.
-	 * @see org.eclipse.epf.uma.DiagramLink#getZoom()
-	 * @see #getDiagramLink()
-	 * @generated
-	 */
-	EAttribute getDiagramLink_Zoom();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.uma.DiagramLink#getViewport <em>Viewport</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Viewport</em>'.
-	 * @see org.eclipse.epf.uma.DiagramLink#getViewport()
-	 * @see #getDiagramLink()
-	 * @generated
-	 */
-	EReference getDiagramLink_Viewport();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.epf.uma.DiagramLink#getGraphElement <em>Graph Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Graph Element</em>'.
-	 * @see org.eclipse.epf.uma.DiagramLink#getGraphElement()
-	 * @see #getDiagramLink()
-	 * @generated
-	 */
-	EReference getDiagramLink_GraphElement();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.DiagramLink#getDiagram <em>Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Diagram</em>'.
-	 * @see org.eclipse.epf.uma.DiagramLink#getDiagram()
-	 * @see #getDiagramLink()
-	 * @generated
-	 */
-	EReference getDiagramLink_Diagram();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.GraphConnector <em>Graph Connector</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Graph Connector</em>'.
-	 * @see org.eclipse.epf.uma.GraphConnector
-	 * @generated
-	 */
-	EClass getGraphConnector();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.epf.uma.GraphConnector#getGraphElement <em>Graph Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Graph Element</em>'.
-	 * @see org.eclipse.epf.uma.GraphConnector#getGraphElement()
-	 * @see #getGraphConnector()
-	 * @generated
-	 */
-	EReference getGraphConnector_GraphElement();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.GraphConnector#getGraphEdge <em>Graph Edge</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Graph Edge</em>'.
-	 * @see org.eclipse.epf.uma.GraphConnector#getGraphEdge()
-	 * @see #getGraphConnector()
-	 * @generated
-	 */
-	EReference getGraphConnector_GraphEdge();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.SemanticModelBridge <em>Semantic Model Bridge</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Semantic Model Bridge</em>'.
-	 * @see org.eclipse.epf.uma.SemanticModelBridge
-	 * @generated
-	 */
-	EClass getSemanticModelBridge();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.SemanticModelBridge#getPresentation <em>Presentation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Presentation</em>'.
-	 * @see org.eclipse.epf.uma.SemanticModelBridge#getPresentation()
-	 * @see #getSemanticModelBridge()
-	 * @generated
-	 */
-	EAttribute getSemanticModelBridge_Presentation();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.epf.uma.SemanticModelBridge#getGraphElement <em>Graph Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Graph Element</em>'.
-	 * @see org.eclipse.epf.uma.SemanticModelBridge#getGraphElement()
-	 * @see #getSemanticModelBridge()
-	 * @generated
-	 */
-	EReference getSemanticModelBridge_GraphElement();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.epf.uma.SemanticModelBridge#getDiagram <em>Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Diagram</em>'.
-	 * @see org.eclipse.epf.uma.SemanticModelBridge#getDiagram()
-	 * @see #getSemanticModelBridge()
-	 * @generated
-	 */
-	EReference getSemanticModelBridge_Diagram();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Dimension <em>Dimension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Dimension</em>'.
-	 * @see org.eclipse.epf.uma.Dimension
-	 * @generated
-	 */
-	EClass getDimension();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Dimension#getWidth <em>Width</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Width</em>'.
-	 * @see org.eclipse.epf.uma.Dimension#getWidth()
-	 * @see #getDimension()
-	 * @generated
-	 */
-	EAttribute getDimension_Width();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Dimension#getHeight <em>Height</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Height</em>'.
-	 * @see org.eclipse.epf.uma.Dimension#getHeight()
-	 * @see #getDimension()
-	 * @generated
-	 */
-	EAttribute getDimension_Height();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Reference <em>Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Reference</em>'.
-	 * @see org.eclipse.epf.uma.Reference
-	 * @generated
-	 */
-	EClass getReference();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Reference#getIsIndividualRepresentation <em>Is Individual Representation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Individual Representation</em>'.
-	 * @see org.eclipse.epf.uma.Reference#getIsIndividualRepresentation()
-	 * @see #getReference()
-	 * @generated
-	 */
-	EAttribute getReference_IsIndividualRepresentation();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.Reference#getReferenced <em>Referenced</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Referenced</em>'.
-	 * @see org.eclipse.epf.uma.Reference#getReferenced()
-	 * @see #getReference()
-	 * @generated
-	 */
-	EReference getReference_Referenced();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Property <em>Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Property</em>'.
-	 * @see org.eclipse.epf.uma.Property
-	 * @generated
-	 */
-	EClass getProperty();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Property#getKey <em>Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Key</em>'.
-	 * @see org.eclipse.epf.uma.Property#getKey()
-	 * @see #getProperty()
-	 * @generated
-	 */
-	EAttribute getProperty_Key();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Property#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.epf.uma.Property#getValue()
-	 * @see #getProperty()
-	 * @generated
-	 */
-	EAttribute getProperty_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.GraphEdge <em>Graph Edge</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Graph Edge</em>'.
-	 * @see org.eclipse.epf.uma.GraphEdge
-	 * @generated
-	 */
-	EClass getGraphEdge();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.GraphEdge#getAnchor <em>Anchor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Anchor</em>'.
-	 * @see org.eclipse.epf.uma.GraphEdge#getAnchor()
-	 * @see #getGraphEdge()
-	 * @generated
-	 */
-	EReference getGraphEdge_Anchor();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.GraphEdge#getWaypoints <em>Waypoints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Waypoints</em>'.
-	 * @see org.eclipse.epf.uma.GraphEdge#getWaypoints()
-	 * @see #getGraphEdge()
-	 * @generated
-	 */
-	EReference getGraphEdge_Waypoints();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Diagram <em>Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Diagram</em>'.
-	 * @see org.eclipse.epf.uma.Diagram
-	 * @generated
-	 */
-	EClass getDiagram();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Diagram#getZoom <em>Zoom</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Zoom</em>'.
-	 * @see org.eclipse.epf.uma.Diagram#getZoom()
-	 * @see #getDiagram()
-	 * @generated
-	 */
-	EAttribute getDiagram_Zoom();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.uma.Diagram#getViewpoint <em>Viewpoint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Viewpoint</em>'.
-	 * @see org.eclipse.epf.uma.Diagram#getViewpoint()
-	 * @see #getDiagram()
-	 * @generated
-	 */
-	EReference getDiagram_Viewpoint();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Diagram#getDiagramLink <em>Diagram Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Diagram Link</em>'.
-	 * @see org.eclipse.epf.uma.Diagram#getDiagramLink()
-	 * @see #getDiagram()
-	 * @generated
-	 */
-	EReference getDiagram_DiagramLink();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.uma.Diagram#getNamespace <em>Namespace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Namespace</em>'.
-	 * @see org.eclipse.epf.uma.Diagram#getNamespace()
-	 * @see #getDiagram()
-	 * @generated
-	 */
-	EReference getDiagram_Namespace();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.GraphNode <em>Graph Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Graph Node</em>'.
-	 * @see org.eclipse.epf.uma.GraphNode
-	 * @generated
-	 */
-	EClass getGraphNode();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.uma.GraphNode#getSize <em>Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Size</em>'.
-	 * @see org.eclipse.epf.uma.GraphNode#getSize()
-	 * @see #getGraphNode()
-	 * @generated
-	 */
-	EReference getGraphNode_Size();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.SimpleSemanticModelElement <em>Simple Semantic Model Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Simple Semantic Model Element</em>'.
-	 * @see org.eclipse.epf.uma.SimpleSemanticModelElement
-	 * @generated
-	 */
-	EClass getSimpleSemanticModelElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.SimpleSemanticModelElement#getTypeInfo <em>Type Info</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type Info</em>'.
-	 * @see org.eclipse.epf.uma.SimpleSemanticModelElement#getTypeInfo()
-	 * @see #getSimpleSemanticModelElement()
-	 * @generated
-	 */
-	EAttribute getSimpleSemanticModelElement_TypeInfo();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.UMASemanticModelBridge <em>UMA Semantic Model Bridge</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>UMA Semantic Model Bridge</em>'.
-	 * @see org.eclipse.epf.uma.UMASemanticModelBridge
-	 * @generated
-	 */
-	EClass getUMASemanticModelBridge();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.UMASemanticModelBridge#getElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Element</em>'.
-	 * @see org.eclipse.epf.uma.UMASemanticModelBridge#getElement()
-	 * @see #getUMASemanticModelBridge()
-	 * @generated
-	 */
-	EReference getUMASemanticModelBridge_Element();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.CoreSemanticModelBridge <em>Core Semantic Model Bridge</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Core Semantic Model Bridge</em>'.
-	 * @see org.eclipse.epf.uma.CoreSemanticModelBridge
-	 * @generated
-	 */
-	EClass getCoreSemanticModelBridge();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.CoreSemanticModelBridge#getElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Element</em>'.
-	 * @see org.eclipse.epf.uma.CoreSemanticModelBridge#getElement()
-	 * @see #getCoreSemanticModelBridge()
-	 * @generated
-	 */
-	EReference getCoreSemanticModelBridge_Element();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.LeafElement <em>Leaf Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Leaf Element</em>'.
-	 * @see org.eclipse.epf.uma.LeafElement
-	 * @generated
-	 */
-	EClass getLeafElement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.TextElement <em>Text Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Text Element</em>'.
-	 * @see org.eclipse.epf.uma.TextElement
-	 * @generated
-	 */
-	EClass getTextElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.TextElement#getText <em>Text</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Text</em>'.
-	 * @see org.eclipse.epf.uma.TextElement#getText()
-	 * @see #getTextElement()
-	 * @generated
-	 */
-	EAttribute getTextElement_Text();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Image <em>Image</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Image</em>'.
-	 * @see org.eclipse.epf.uma.Image
-	 * @generated
-	 */
-	EClass getImage();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Image#getUri <em>Uri</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Uri</em>'.
-	 * @see org.eclipse.epf.uma.Image#getUri()
-	 * @see #getImage()
-	 * @generated
-	 */
-	EAttribute getImage_Uri();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Image#getMimeType <em>Mime Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mime Type</em>'.
-	 * @see org.eclipse.epf.uma.Image#getMimeType()
-	 * @see #getImage()
-	 * @generated
-	 */
-	EAttribute getImage_MimeType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.GraphicPrimitive <em>Graphic Primitive</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Graphic Primitive</em>'.
-	 * @see org.eclipse.epf.uma.GraphicPrimitive
-	 * @generated
-	 */
-	EClass getGraphicPrimitive();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Polyline <em>Polyline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Polyline</em>'.
-	 * @see org.eclipse.epf.uma.Polyline
-	 * @generated
-	 */
-	EClass getPolyline();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Polyline#getClosed <em>Closed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Closed</em>'.
-	 * @see org.eclipse.epf.uma.Polyline#getClosed()
-	 * @see #getPolyline()
-	 * @generated
-	 */
-	EAttribute getPolyline_Closed();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.Polyline#getWaypoints <em>Waypoints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Waypoints</em>'.
-	 * @see org.eclipse.epf.uma.Polyline#getWaypoints()
-	 * @see #getPolyline()
-	 * @generated
-	 */
-	EReference getPolyline_Waypoints();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Ellipse <em>Ellipse</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Ellipse</em>'.
-	 * @see org.eclipse.epf.uma.Ellipse
-	 * @generated
-	 */
-	EClass getEllipse();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Ellipse#getRadiusX <em>Radius X</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Radius X</em>'.
-	 * @see org.eclipse.epf.uma.Ellipse#getRadiusX()
-	 * @see #getEllipse()
-	 * @generated
-	 */
-	EAttribute getEllipse_RadiusX();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Ellipse#getRadiusY <em>Radius Y</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Radius Y</em>'.
-	 * @see org.eclipse.epf.uma.Ellipse#getRadiusY()
-	 * @see #getEllipse()
-	 * @generated
-	 */
-	EAttribute getEllipse_RadiusY();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Ellipse#getRotation <em>Rotation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Rotation</em>'.
-	 * @see org.eclipse.epf.uma.Ellipse#getRotation()
-	 * @see #getEllipse()
-	 * @generated
-	 */
-	EAttribute getEllipse_Rotation();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Ellipse#getStartAngle <em>Start Angle</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Start Angle</em>'.
-	 * @see org.eclipse.epf.uma.Ellipse#getStartAngle()
-	 * @see #getEllipse()
-	 * @generated
-	 */
-	EAttribute getEllipse_StartAngle();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Ellipse#getEndAngle <em>End Angle</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>End Angle</em>'.
-	 * @see org.eclipse.epf.uma.Ellipse#getEndAngle()
-	 * @see #getEllipse()
-	 * @generated
-	 */
-	EAttribute getEllipse_EndAngle();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.uma.Ellipse#getCenter <em>Center</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Center</em>'.
-	 * @see org.eclipse.epf.uma.Ellipse#getCenter()
-	 * @see #getEllipse()
-	 * @generated
-	 */
-	EReference getEllipse_Center();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Activity <em>Activity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Activity</em>'.
-	 * @see org.eclipse.epf.uma.Activity
-	 * @generated
-	 */
-	EClass getActivity();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Activity#getBreakdownElements <em>Breakdown Elements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Breakdown Elements</em>'.
-	 * @see org.eclipse.epf.uma.Activity#getBreakdownElements()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EReference getActivity_BreakdownElements();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Activity#getRoadmaps <em>Roadmaps</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Roadmaps</em>'.
-	 * @see org.eclipse.epf.uma.Activity#getRoadmaps()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EReference getActivity_Roadmaps();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Activity#getSupportingMaterials <em>Supporting Materials</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Supporting Materials</em>'.
-	 * @see org.eclipse.epf.uma.Activity#getSupportingMaterials()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EReference getActivity_SupportingMaterials();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Activity#getChecklists <em>Checklists</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Checklists</em>'.
-	 * @see org.eclipse.epf.uma.Activity#getChecklists()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EReference getActivity_Checklists();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Activity#getConcepts <em>Concepts</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Concepts</em>'.
-	 * @see org.eclipse.epf.uma.Activity#getConcepts()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EReference getActivity_Concepts();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Activity#getExamples <em>Examples</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Examples</em>'.
-	 * @see org.eclipse.epf.uma.Activity#getExamples()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EReference getActivity_Examples();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Activity#getGuidelines <em>Guidelines</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Guidelines</em>'.
-	 * @see org.eclipse.epf.uma.Activity#getGuidelines()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EReference getActivity_Guidelines();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Activity#getReusableAssets <em>Reusable Assets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Reusable Assets</em>'.
-	 * @see org.eclipse.epf.uma.Activity#getReusableAssets()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EReference getActivity_ReusableAssets();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Activity#getIsEnactable <em>Is Enactable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Enactable</em>'.
-	 * @see org.eclipse.epf.uma.Activity#getIsEnactable()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EAttribute getActivity_IsEnactable();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.WorkBreakdownElement <em>Work Breakdown Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Breakdown Element</em>'.
-	 * @see org.eclipse.epf.uma.WorkBreakdownElement
-	 * @generated
-	 */
-	EClass getWorkBreakdownElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.WorkBreakdownElement#getIsRepeatable <em>Is Repeatable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Repeatable</em>'.
-	 * @see org.eclipse.epf.uma.WorkBreakdownElement#getIsRepeatable()
-	 * @see #getWorkBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getWorkBreakdownElement_IsRepeatable();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.WorkBreakdownElement#getIsOngoing <em>Is Ongoing</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Ongoing</em>'.
-	 * @see org.eclipse.epf.uma.WorkBreakdownElement#getIsOngoing()
-	 * @see #getWorkBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getWorkBreakdownElement_IsOngoing();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.WorkBreakdownElement#getIsEventDriven <em>Is Event Driven</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Event Driven</em>'.
-	 * @see org.eclipse.epf.uma.WorkBreakdownElement#getIsEventDriven()
-	 * @see #getWorkBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getWorkBreakdownElement_IsEventDriven();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.WorkBreakdownElement#getLinkToPredecessor <em>Link To Predecessor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Link To Predecessor</em>'.
-	 * @see org.eclipse.epf.uma.WorkBreakdownElement#getLinkToPredecessor()
-	 * @see #getWorkBreakdownElement()
-	 * @generated
-	 */
-	EReference getWorkBreakdownElement_LinkToPredecessor();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.BreakdownElement <em>Breakdown Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Breakdown Element</em>'.
-	 * @see org.eclipse.epf.uma.BreakdownElement
-	 * @generated
-	 */
-	EClass getBreakdownElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.BreakdownElement#getPrefix <em>Prefix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Prefix</em>'.
-	 * @see org.eclipse.epf.uma.BreakdownElement#getPrefix()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getBreakdownElement_Prefix();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.BreakdownElement#getIsPlanned <em>Is Planned</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Planned</em>'.
-	 * @see org.eclipse.epf.uma.BreakdownElement#getIsPlanned()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getBreakdownElement_IsPlanned();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.BreakdownElement#getHasMultipleOccurrences <em>Has Multiple Occurrences</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Has Multiple Occurrences</em>'.
-	 * @see org.eclipse.epf.uma.BreakdownElement#getHasMultipleOccurrences()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getBreakdownElement_HasMultipleOccurrences();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.BreakdownElement#getIsOptional <em>Is Optional</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Optional</em>'.
-	 * @see org.eclipse.epf.uma.BreakdownElement#getIsOptional()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getBreakdownElement_IsOptional();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.BreakdownElement#getPresentedAfter <em>Presented After</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Presented After</em>'.
-	 * @see org.eclipse.epf.uma.BreakdownElement#getPresentedAfter()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EReference getBreakdownElement_PresentedAfter();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.BreakdownElement#getPresentedBefore <em>Presented Before</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Presented Before</em>'.
-	 * @see org.eclipse.epf.uma.BreakdownElement#getPresentedBefore()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EReference getBreakdownElement_PresentedBefore();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.uma.BreakdownElement#getPlanningData <em>Planning Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Planning Data</em>'.
-	 * @see org.eclipse.epf.uma.BreakdownElement#getPlanningData()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EReference getBreakdownElement_PlanningData();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.BreakdownElement#getSuperActivities <em>Super Activities</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Super Activities</em>'.
-	 * @see org.eclipse.epf.uma.BreakdownElement#getSuperActivities()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EReference getBreakdownElement_SuperActivities();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Milestone <em>Milestone</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Milestone</em>'.
-	 * @see org.eclipse.epf.uma.Milestone
-	 * @generated
-	 */
-	EClass getMilestone();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Iteration <em>Iteration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Iteration</em>'.
-	 * @see org.eclipse.epf.uma.Iteration
-	 * @generated
-	 */
-	EClass getIteration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Phase <em>Phase</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Phase</em>'.
-	 * @see org.eclipse.epf.uma.Phase
-	 * @generated
-	 */
-	EClass getPhase();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.TeamProfile <em>Team Profile</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Team Profile</em>'.
-	 * @see org.eclipse.epf.uma.TeamProfile
-	 * @generated
-	 */
-	EClass getTeamProfile();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.TeamProfile#getTeamRoles <em>Team Roles</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Team Roles</em>'.
-	 * @see org.eclipse.epf.uma.TeamProfile#getTeamRoles()
-	 * @see #getTeamProfile()
-	 * @generated
-	 */
-	EReference getTeamProfile_TeamRoles();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.TeamProfile#getSuperTeam <em>Super Team</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Super Team</em>'.
-	 * @see org.eclipse.epf.uma.TeamProfile#getSuperTeam()
-	 * @see #getTeamProfile()
-	 * @generated
-	 */
-	EReference getTeamProfile_SuperTeam();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.TeamProfile#getSubTeam <em>Sub Team</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Sub Team</em>'.
-	 * @see org.eclipse.epf.uma.TeamProfile#getSubTeam()
-	 * @see #getTeamProfile()
-	 * @generated
-	 */
-	EReference getTeamProfile_SubTeam();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.RoleDescriptor <em>Role Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Role Descriptor</em>'.
-	 * @see org.eclipse.epf.uma.RoleDescriptor
-	 * @generated
-	 */
-	EClass getRoleDescriptor();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.RoleDescriptor#getRole <em>Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Role</em>'.
-	 * @see org.eclipse.epf.uma.RoleDescriptor#getRole()
-	 * @see #getRoleDescriptor()
-	 * @generated
-	 */
-	EReference getRoleDescriptor_Role();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.RoleDescriptor#getModifies <em>Modifies</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Modifies</em>'.
-	 * @see org.eclipse.epf.uma.RoleDescriptor#getModifies()
-	 * @see #getRoleDescriptor()
-	 * @generated
-	 */
-	EReference getRoleDescriptor_Modifies();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.RoleDescriptor#getResponsibleFor <em>Responsible For</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Responsible For</em>'.
-	 * @see org.eclipse.epf.uma.RoleDescriptor#getResponsibleFor()
-	 * @see #getRoleDescriptor()
-	 * @generated
-	 */
-	EReference getRoleDescriptor_ResponsibleFor();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.WorkOrder <em>Work Order</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Order</em>'.
-	 * @see org.eclipse.epf.uma.WorkOrder
-	 * @generated
-	 */
-	EClass getWorkOrder();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.WorkOrder#getLinkType <em>Link Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Link Type</em>'.
-	 * @see org.eclipse.epf.uma.WorkOrder#getLinkType()
-	 * @see #getWorkOrder()
-	 * @generated
-	 */
-	EAttribute getWorkOrder_LinkType();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.WorkOrder#getPred <em>Pred</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Pred</em>'.
-	 * @see org.eclipse.epf.uma.WorkOrder#getPred()
-	 * @see #getWorkOrder()
-	 * @generated
-	 */
-	EReference getWorkOrder_Pred();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ProcessElement <em>Process Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process Element</em>'.
-	 * @see org.eclipse.epf.uma.ProcessElement
-	 * @generated
-	 */
-	EClass getProcessElement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.PlanningData <em>Planning Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Planning Data</em>'.
-	 * @see org.eclipse.epf.uma.PlanningData
-	 * @generated
-	 */
-	EClass getPlanningData();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.PlanningData#getStartDate <em>Start Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Start Date</em>'.
-	 * @see org.eclipse.epf.uma.PlanningData#getStartDate()
-	 * @see #getPlanningData()
-	 * @generated
-	 */
-	EAttribute getPlanningData_StartDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.PlanningData#getFinishDate <em>Finish Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Finish Date</em>'.
-	 * @see org.eclipse.epf.uma.PlanningData#getFinishDate()
-	 * @see #getPlanningData()
-	 * @generated
-	 */
-	EAttribute getPlanningData_FinishDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.PlanningData#getRank <em>Rank</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Rank</em>'.
-	 * @see org.eclipse.epf.uma.PlanningData#getRank()
-	 * @see #getPlanningData()
-	 * @generated
-	 */
-	EAttribute getPlanningData_Rank();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Descriptor <em>Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Descriptor</em>'.
-	 * @see org.eclipse.epf.uma.Descriptor
-	 * @generated
-	 */
-	EClass getDescriptor();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.Descriptor#getIsSynchronizedWithSource <em>Is Synchronized With Source</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Synchronized With Source</em>'.
-	 * @see org.eclipse.epf.uma.Descriptor#getIsSynchronizedWithSource()
-	 * @see #getDescriptor()
-	 * @generated
-	 */
-	EAttribute getDescriptor_IsSynchronizedWithSource();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.TaskDescriptor <em>Task Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Task Descriptor</em>'.
-	 * @see org.eclipse.epf.uma.TaskDescriptor
-	 * @generated
-	 */
-	EClass getTaskDescriptor();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.TaskDescriptor#getTask <em>Task</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Task</em>'.
-	 * @see org.eclipse.epf.uma.TaskDescriptor#getTask()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EReference getTaskDescriptor_Task();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.TaskDescriptor#getAdditionallyPerformedBy <em>Additionally Performed By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Additionally Performed By</em>'.
-	 * @see org.eclipse.epf.uma.TaskDescriptor#getAdditionallyPerformedBy()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EReference getTaskDescriptor_AdditionallyPerformedBy();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.TaskDescriptor#getAssistedBy <em>Assisted By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Assisted By</em>'.
-	 * @see org.eclipse.epf.uma.TaskDescriptor#getAssistedBy()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EReference getTaskDescriptor_AssistedBy();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.TaskDescriptor#getExternalInput <em>External Input</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>External Input</em>'.
-	 * @see org.eclipse.epf.uma.TaskDescriptor#getExternalInput()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EReference getTaskDescriptor_ExternalInput();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.TaskDescriptor#getMandatoryInput <em>Mandatory Input</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Mandatory Input</em>'.
-	 * @see org.eclipse.epf.uma.TaskDescriptor#getMandatoryInput()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EReference getTaskDescriptor_MandatoryInput();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.TaskDescriptor#getOptionalInput <em>Optional Input</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Optional Input</em>'.
-	 * @see org.eclipse.epf.uma.TaskDescriptor#getOptionalInput()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EReference getTaskDescriptor_OptionalInput();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.TaskDescriptor#getOutput <em>Output</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Output</em>'.
-	 * @see org.eclipse.epf.uma.TaskDescriptor#getOutput()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EReference getTaskDescriptor_Output();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.TaskDescriptor#getPerformedPrimarilyBy <em>Performed Primarily By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Performed Primarily By</em>'.
-	 * @see org.eclipse.epf.uma.TaskDescriptor#getPerformedPrimarilyBy()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EReference getTaskDescriptor_PerformedPrimarilyBy();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.TaskDescriptor#getSelectedSteps <em>Selected Steps</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Selected Steps</em>'.
-	 * @see org.eclipse.epf.uma.TaskDescriptor#getSelectedSteps()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EReference getTaskDescriptor_SelectedSteps();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.WorkProductDescriptor <em>Work Product Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Product Descriptor</em>'.
-	 * @see org.eclipse.epf.uma.WorkProductDescriptor
-	 * @generated
-	 */
-	EClass getWorkProductDescriptor();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.WorkProductDescriptor#getActivityEntryState <em>Activity Entry State</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Activity Entry State</em>'.
-	 * @see org.eclipse.epf.uma.WorkProductDescriptor#getActivityEntryState()
-	 * @see #getWorkProductDescriptor()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescriptor_ActivityEntryState();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.WorkProductDescriptor#getActivityExitState <em>Activity Exit State</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Activity Exit State</em>'.
-	 * @see org.eclipse.epf.uma.WorkProductDescriptor#getActivityExitState()
-	 * @see #getWorkProductDescriptor()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescriptor_ActivityExitState();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.WorkProductDescriptor#getWorkProduct <em>Work Product</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Work Product</em>'.
-	 * @see org.eclipse.epf.uma.WorkProductDescriptor#getWorkProduct()
-	 * @see #getWorkProductDescriptor()
-	 * @generated
-	 */
-	EReference getWorkProductDescriptor_WorkProduct();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.WorkProductDescriptor#getImpactedBy <em>Impacted By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Impacted By</em>'.
-	 * @see org.eclipse.epf.uma.WorkProductDescriptor#getImpactedBy()
-	 * @see #getWorkProductDescriptor()
-	 * @generated
-	 */
-	EReference getWorkProductDescriptor_ImpactedBy();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.WorkProductDescriptor#getImpacts <em>Impacts</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Impacts</em>'.
-	 * @see org.eclipse.epf.uma.WorkProductDescriptor#getImpacts()
-	 * @see #getWorkProductDescriptor()
-	 * @generated
-	 */
-	EReference getWorkProductDescriptor_Impacts();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.WorkProductDescriptor#getDeliverableParts <em>Deliverable Parts</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Deliverable Parts</em>'.
-	 * @see org.eclipse.epf.uma.WorkProductDescriptor#getDeliverableParts()
-	 * @see #getWorkProductDescriptor()
-	 * @generated
-	 */
-	EReference getWorkProductDescriptor_DeliverableParts();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.CompositeRole <em>Composite Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Composite Role</em>'.
-	 * @see org.eclipse.epf.uma.CompositeRole
-	 * @generated
-	 */
-	EClass getCompositeRole();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.CompositeRole#getAggregatedRoles <em>Aggregated Roles</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Aggregated Roles</em>'.
-	 * @see org.eclipse.epf.uma.CompositeRole#getAggregatedRoles()
-	 * @see #getCompositeRole()
-	 * @generated
-	 */
-	EReference getCompositeRole_AggregatedRoles();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.BreakdownElementDescription <em>Breakdown Element Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Breakdown Element Description</em>'.
-	 * @see org.eclipse.epf.uma.BreakdownElementDescription
-	 * @generated
-	 */
-	EClass getBreakdownElementDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.BreakdownElementDescription#getUsageGuidance <em>Usage Guidance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Usage Guidance</em>'.
-	 * @see org.eclipse.epf.uma.BreakdownElementDescription#getUsageGuidance()
-	 * @see #getBreakdownElementDescription()
-	 * @generated
-	 */
-	EAttribute getBreakdownElementDescription_UsageGuidance();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ActivityDescription <em>Activity Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Activity Description</em>'.
-	 * @see org.eclipse.epf.uma.ActivityDescription
-	 * @generated
-	 */
-	EClass getActivityDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.ActivityDescription#getPurpose <em>Purpose</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Purpose</em>'.
-	 * @see org.eclipse.epf.uma.ActivityDescription#getPurpose()
-	 * @see #getActivityDescription()
-	 * @generated
-	 */
-	EAttribute getActivityDescription_Purpose();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.ActivityDescription#getAlternatives <em>Alternatives</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Alternatives</em>'.
-	 * @see org.eclipse.epf.uma.ActivityDescription#getAlternatives()
-	 * @see #getActivityDescription()
-	 * @generated
-	 */
-	EAttribute getActivityDescription_Alternatives();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.ActivityDescription#getHowtoStaff <em>Howto Staff</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Howto Staff</em>'.
-	 * @see org.eclipse.epf.uma.ActivityDescription#getHowtoStaff()
-	 * @see #getActivityDescription()
-	 * @generated
-	 */
-	EAttribute getActivityDescription_HowtoStaff();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.DeliveryProcessDescription <em>Delivery Process Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Delivery Process Description</em>'.
-	 * @see org.eclipse.epf.uma.DeliveryProcessDescription
-	 * @generated
-	 */
-	EClass getDeliveryProcessDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.DeliveryProcessDescription#getScale <em>Scale</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Scale</em>'.
-	 * @see org.eclipse.epf.uma.DeliveryProcessDescription#getScale()
-	 * @see #getDeliveryProcessDescription()
-	 * @generated
-	 */
-	EAttribute getDeliveryProcessDescription_Scale();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.DeliveryProcessDescription#getProjectCharacteristics <em>Project Characteristics</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Project Characteristics</em>'.
-	 * @see org.eclipse.epf.uma.DeliveryProcessDescription#getProjectCharacteristics()
-	 * @see #getDeliveryProcessDescription()
-	 * @generated
-	 */
-	EAttribute getDeliveryProcessDescription_ProjectCharacteristics();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.DeliveryProcessDescription#getRiskLevel <em>Risk Level</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Risk Level</em>'.
-	 * @see org.eclipse.epf.uma.DeliveryProcessDescription#getRiskLevel()
-	 * @see #getDeliveryProcessDescription()
-	 * @generated
-	 */
-	EAttribute getDeliveryProcessDescription_RiskLevel();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.DeliveryProcessDescription#getEstimatingTechnique <em>Estimating Technique</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Estimating Technique</em>'.
-	 * @see org.eclipse.epf.uma.DeliveryProcessDescription#getEstimatingTechnique()
-	 * @see #getDeliveryProcessDescription()
-	 * @generated
-	 */
-	EAttribute getDeliveryProcessDescription_EstimatingTechnique();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.DeliveryProcessDescription#getProjectMemberExpertise <em>Project Member Expertise</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Project Member Expertise</em>'.
-	 * @see org.eclipse.epf.uma.DeliveryProcessDescription#getProjectMemberExpertise()
-	 * @see #getDeliveryProcessDescription()
-	 * @generated
-	 */
-	EAttribute getDeliveryProcessDescription_ProjectMemberExpertise();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.DeliveryProcessDescription#getTypeOfContract <em>Type Of Contract</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type Of Contract</em>'.
-	 * @see org.eclipse.epf.uma.DeliveryProcessDescription#getTypeOfContract()
-	 * @see #getDeliveryProcessDescription()
-	 * @generated
-	 */
-	EAttribute getDeliveryProcessDescription_TypeOfContract();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ProcessDescription <em>Process Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process Description</em>'.
-	 * @see org.eclipse.epf.uma.ProcessDescription
-	 * @generated
-	 */
-	EClass getProcessDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.ProcessDescription#getExternalId <em>External Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>External Id</em>'.
-	 * @see org.eclipse.epf.uma.ProcessDescription#getExternalId()
-	 * @see #getProcessDescription()
-	 * @generated
-	 */
-	EAttribute getProcessDescription_ExternalId();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.ProcessDescription#getScope <em>Scope</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Scope</em>'.
-	 * @see org.eclipse.epf.uma.ProcessDescription#getScope()
-	 * @see #getProcessDescription()
-	 * @generated
-	 */
-	EAttribute getProcessDescription_Scope();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.ProcessDescription#getUsageNotes <em>Usage Notes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Usage Notes</em>'.
-	 * @see org.eclipse.epf.uma.ProcessDescription#getUsageNotes()
-	 * @see #getProcessDescription()
-	 * @generated
-	 */
-	EAttribute getProcessDescription_UsageNotes();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.DescriptorDescription <em>Descriptor Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Descriptor Description</em>'.
-	 * @see org.eclipse.epf.uma.DescriptorDescription
-	 * @generated
-	 */
-	EClass getDescriptorDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.DescriptorDescription#getRefinedDescription <em>Refined Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Refined Description</em>'.
-	 * @see org.eclipse.epf.uma.DescriptorDescription#getRefinedDescription()
-	 * @see #getDescriptorDescription()
-	 * @generated
-	 */
-	EAttribute getDescriptorDescription_RefinedDescription();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Concept <em>Concept</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Concept</em>'.
-	 * @see org.eclipse.epf.uma.Concept
-	 * @generated
-	 */
-	EClass getConcept();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Checklist <em>Checklist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Checklist</em>'.
-	 * @see org.eclipse.epf.uma.Checklist
-	 * @generated
-	 */
-	EClass getChecklist();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Example <em>Example</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Example</em>'.
-	 * @see org.eclipse.epf.uma.Example
-	 * @generated
-	 */
-	EClass getExample();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Guideline <em>Guideline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Guideline</em>'.
-	 * @see org.eclipse.epf.uma.Guideline
-	 * @generated
-	 */
-	EClass getGuideline();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.EstimationConsiderations <em>Estimation Considerations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Estimation Considerations</em>'.
-	 * @see org.eclipse.epf.uma.EstimationConsiderations
-	 * @generated
-	 */
-	EClass getEstimationConsiderations();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Report <em>Report</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Report</em>'.
-	 * @see org.eclipse.epf.uma.Report
-	 * @generated
-	 */
-	EClass getReport();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Template <em>Template</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Template</em>'.
-	 * @see org.eclipse.epf.uma.Template
-	 * @generated
-	 */
-	EClass getTemplate();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.SupportingMaterial <em>Supporting Material</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Supporting Material</em>'.
-	 * @see org.eclipse.epf.uma.SupportingMaterial
-	 * @generated
-	 */
-	EClass getSupportingMaterial();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ToolMentor <em>Tool Mentor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tool Mentor</em>'.
-	 * @see org.eclipse.epf.uma.ToolMentor
-	 * @generated
-	 */
-	EClass getToolMentor();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Whitepaper <em>Whitepaper</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Whitepaper</em>'.
-	 * @see org.eclipse.epf.uma.Whitepaper
-	 * @generated
-	 */
-	EClass getWhitepaper();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.TermDefinition <em>Term Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Term Definition</em>'.
-	 * @see org.eclipse.epf.uma.TermDefinition
-	 * @generated
-	 */
-	EClass getTermDefinition();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Practice <em>Practice</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Practice</em>'.
-	 * @see org.eclipse.epf.uma.Practice
-	 * @generated
-	 */
-	EClass getPractice();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.Practice#getSubPractices <em>Sub Practices</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Sub Practices</em>'.
-	 * @see org.eclipse.epf.uma.Practice#getSubPractices()
-	 * @see #getPractice()
-	 * @generated
-	 */
-	EReference getPractice_SubPractices();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Practice#getContentReferences <em>Content References</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Content References</em>'.
-	 * @see org.eclipse.epf.uma.Practice#getContentReferences()
-	 * @see #getPractice()
-	 * @generated
-	 */
-	EReference getPractice_ContentReferences();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Practice#getActivityReferences <em>Activity References</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Activity References</em>'.
-	 * @see org.eclipse.epf.uma.Practice#getActivityReferences()
-	 * @see #getPractice()
-	 * @generated
-	 */
-	EReference getPractice_ActivityReferences();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ReusableAsset <em>Reusable Asset</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Reusable Asset</em>'.
-	 * @see org.eclipse.epf.uma.ReusableAsset
-	 * @generated
-	 */
-	EClass getReusableAsset();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.State <em>State</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>State</em>'.
-	 * @see org.eclipse.epf.uma.State
-	 * @generated
-	 */
-	EClass getState();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.State#getWorkProduct <em>Work Product</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Work Product</em>'.
-	 * @see org.eclipse.epf.uma.State#getWorkProduct()
-	 * @see #getState()
-	 * @generated
-	 */
-	EReference getState_WorkProduct();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.State#getRegion <em>Region</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Region</em>'.
-	 * @see org.eclipse.epf.uma.State#getRegion()
-	 * @see #getState()
-	 * @generated
-	 */
-	EReference getState_Region();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.State#getSubmachine <em>Submachine</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Submachine</em>'.
-	 * @see org.eclipse.epf.uma.State#getSubmachine()
-	 * @see #getState()
-	 * @generated
-	 */
-	EReference getState_Submachine();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Vertex <em>Vertex</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Vertex</em>'.
-	 * @see org.eclipse.epf.uma.Vertex
-	 * @generated
-	 */
-	EClass getVertex();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.epf.uma.Vertex#getContainer_ <em>Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Container</em>'.
-	 * @see org.eclipse.epf.uma.Vertex#getContainer_()
-	 * @see #getVertex()
-	 * @generated
-	 */
-	EReference getVertex_Container();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Vertex#getOutgoing <em>Outgoing</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Outgoing</em>'.
-	 * @see org.eclipse.epf.uma.Vertex#getOutgoing()
-	 * @see #getVertex()
-	 * @generated
-	 */
-	EReference getVertex_Outgoing();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Vertex#getIncoming <em>Incoming</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Incoming</em>'.
-	 * @see org.eclipse.epf.uma.Vertex#getIncoming()
-	 * @see #getVertex()
-	 * @generated
-	 */
-	EReference getVertex_Incoming();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Region <em>Region</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Region</em>'.
-	 * @see org.eclipse.epf.uma.Region
-	 * @generated
-	 */
-	EClass getRegion();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.Region#getVertex <em>Vertex</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Vertex</em>'.
-	 * @see org.eclipse.epf.uma.Region#getVertex()
-	 * @see #getRegion()
-	 * @generated
-	 */
-	EReference getRegion_Vertex();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.Region#getTransition <em>Transition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Transition</em>'.
-	 * @see org.eclipse.epf.uma.Region#getTransition()
-	 * @see #getRegion()
-	 * @generated
-	 */
-	EReference getRegion_Transition();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.epf.uma.Region#getState <em>State</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>State</em>'.
-	 * @see org.eclipse.epf.uma.Region#getState()
-	 * @see #getRegion()
-	 * @generated
-	 */
-	EReference getRegion_State();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.epf.uma.Region#getStateMachine <em>State Machine</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>State Machine</em>'.
-	 * @see org.eclipse.epf.uma.Region#getStateMachine()
-	 * @see #getRegion()
-	 * @generated
-	 */
-	EReference getRegion_StateMachine();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.StateMachine <em>State Machine</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>State Machine</em>'.
-	 * @see org.eclipse.epf.uma.StateMachine
-	 * @generated
-	 */
-	EClass getStateMachine();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.StateMachine#getRegion <em>Region</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Region</em>'.
-	 * @see org.eclipse.epf.uma.StateMachine#getRegion()
-	 * @see #getStateMachine()
-	 * @generated
-	 */
-	EReference getStateMachine_Region();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Transition <em>Transition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Transition</em>'.
-	 * @see org.eclipse.epf.uma.Transition
-	 * @generated
-	 */
-	EClass getTransition();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Transition#getWorkDefinition <em>Work Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Work Definition</em>'.
-	 * @see org.eclipse.epf.uma.Transition#getWorkDefinition()
-	 * @see #getTransition()
-	 * @generated
-	 */
-	EReference getTransition_WorkDefinition();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.epf.uma.Transition#getContainer_ <em>Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Container</em>'.
-	 * @see org.eclipse.epf.uma.Transition#getContainer_()
-	 * @see #getTransition()
-	 * @generated
-	 */
-	EReference getTransition_Container();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.Transition#getSource <em>Source</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Source</em>'.
-	 * @see org.eclipse.epf.uma.Transition#getSource()
-	 * @see #getTransition()
-	 * @generated
-	 */
-	EReference getTransition_Source();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.Transition#getTarget <em>Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Target</em>'.
-	 * @see org.eclipse.epf.uma.Transition#getTarget()
-	 * @see #getTransition()
-	 * @generated
-	 */
-	EReference getTransition_Target();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.PseudoState <em>Pseudo State</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Pseudo State</em>'.
-	 * @see org.eclipse.epf.uma.PseudoState
-	 * @generated
-	 */
-	EClass getPseudoState();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Discipline <em>Discipline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Discipline</em>'.
-	 * @see org.eclipse.epf.uma.Discipline
-	 * @generated
-	 */
-	EClass getDiscipline();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Discipline#getTasks <em>Tasks</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Tasks</em>'.
-	 * @see org.eclipse.epf.uma.Discipline#getTasks()
-	 * @see #getDiscipline()
-	 * @generated
-	 */
-	EReference getDiscipline_Tasks();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.Discipline#getSubdiscipline <em>Subdiscipline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Subdiscipline</em>'.
-	 * @see org.eclipse.epf.uma.Discipline#getSubdiscipline()
-	 * @see #getDiscipline()
-	 * @generated
-	 */
-	EReference getDiscipline_Subdiscipline();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Discipline#getReferenceWorkflows <em>Reference Workflows</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Reference Workflows</em>'.
-	 * @see org.eclipse.epf.uma.Discipline#getReferenceWorkflows()
-	 * @see #getDiscipline()
-	 * @generated
-	 */
-	EReference getDiscipline_ReferenceWorkflows();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ContentCategory <em>Content Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Content Category</em>'.
-	 * @see org.eclipse.epf.uma.ContentCategory
-	 * @generated
-	 */
-	EClass getContentCategory();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.RoleSet <em>Role Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Role Set</em>'.
-	 * @see org.eclipse.epf.uma.RoleSet
-	 * @generated
-	 */
-	EClass getRoleSet();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.RoleSet#getRoles <em>Roles</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Roles</em>'.
-	 * @see org.eclipse.epf.uma.RoleSet#getRoles()
-	 * @see #getRoleSet()
-	 * @generated
-	 */
-	EReference getRoleSet_Roles();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Domain <em>Domain</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Domain</em>'.
-	 * @see org.eclipse.epf.uma.Domain
-	 * @generated
-	 */
-	EClass getDomain();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Domain#getWorkProducts <em>Work Products</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Work Products</em>'.
-	 * @see org.eclipse.epf.uma.Domain#getWorkProducts()
-	 * @see #getDomain()
-	 * @generated
-	 */
-	EReference getDomain_WorkProducts();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.Domain#getSubdomains <em>Subdomains</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Subdomains</em>'.
-	 * @see org.eclipse.epf.uma.Domain#getSubdomains()
-	 * @see #getDomain()
-	 * @generated
-	 */
-	EReference getDomain_Subdomains();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.WorkProductType <em>Work Product Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Product Type</em>'.
-	 * @see org.eclipse.epf.uma.WorkProductType
-	 * @generated
-	 */
-	EClass getWorkProductType();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.WorkProductType#getWorkProducts <em>Work Products</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Work Products</em>'.
-	 * @see org.eclipse.epf.uma.WorkProductType#getWorkProducts()
-	 * @see #getWorkProductType()
-	 * @generated
-	 */
-	EReference getWorkProductType_WorkProducts();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.DisciplineGrouping <em>Discipline Grouping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Discipline Grouping</em>'.
-	 * @see org.eclipse.epf.uma.DisciplineGrouping
-	 * @generated
-	 */
-	EClass getDisciplineGrouping();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.DisciplineGrouping#getDisciplines <em>Disciplines</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Disciplines</em>'.
-	 * @see org.eclipse.epf.uma.DisciplineGrouping#getDisciplines()
-	 * @see #getDisciplineGrouping()
-	 * @generated
-	 */
-	EReference getDisciplineGrouping_Disciplines();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Tool <em>Tool</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tool</em>'.
-	 * @see org.eclipse.epf.uma.Tool
-	 * @generated
-	 */
-	EClass getTool();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Tool#getToolMentors <em>Tool Mentors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Tool Mentors</em>'.
-	 * @see org.eclipse.epf.uma.Tool#getToolMentors()
-	 * @see #getTool()
-	 * @generated
-	 */
-	EReference getTool_ToolMentors();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.RoleSetGrouping <em>Role Set Grouping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Role Set Grouping</em>'.
-	 * @see org.eclipse.epf.uma.RoleSetGrouping
-	 * @generated
-	 */
-	EClass getRoleSetGrouping();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.RoleSetGrouping#getRoleSets <em>Role Sets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Role Sets</em>'.
-	 * @see org.eclipse.epf.uma.RoleSetGrouping#getRoleSets()
-	 * @see #getRoleSetGrouping()
-	 * @generated
-	 */
-	EReference getRoleSetGrouping_RoleSets();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.CustomCategory <em>Custom Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Custom Category</em>'.
-	 * @see org.eclipse.epf.uma.CustomCategory
-	 * @generated
-	 */
-	EClass getCustomCategory();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.CustomCategory#getCategorizedElements <em>Categorized Elements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Categorized Elements</em>'.
-	 * @see org.eclipse.epf.uma.CustomCategory#getCategorizedElements()
-	 * @see #getCustomCategory()
-	 * @generated
-	 */
-	EReference getCustomCategory_CategorizedElements();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.CustomCategory#getSubCategories <em>Sub Categories</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Sub Categories</em>'.
-	 * @see org.eclipse.epf.uma.CustomCategory#getSubCategories()
-	 * @see #getCustomCategory()
-	 * @generated
-	 */
-	EReference getCustomCategory_SubCategories();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.DeliveryProcess <em>Delivery Process</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Delivery Process</em>'.
-	 * @see org.eclipse.epf.uma.DeliveryProcess
-	 * @generated
-	 */
-	EClass getDeliveryProcess();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.DeliveryProcess#getEducationMaterials <em>Education Materials</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Education Materials</em>'.
-	 * @see org.eclipse.epf.uma.DeliveryProcess#getEducationMaterials()
-	 * @see #getDeliveryProcess()
-	 * @generated
-	 */
-	EReference getDeliveryProcess_EducationMaterials();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.DeliveryProcess#getCommunicationsMaterials <em>Communications Materials</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Communications Materials</em>'.
-	 * @see org.eclipse.epf.uma.DeliveryProcess#getCommunicationsMaterials()
-	 * @see #getDeliveryProcess()
-	 * @generated
-	 */
-	EReference getDeliveryProcess_CommunicationsMaterials();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Process <em>Process</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process</em>'.
-	 * @see org.eclipse.epf.uma.Process
-	 * @generated
-	 */
-	EClass getProcess();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Process#getIncludesPatterns <em>Includes Patterns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Includes Patterns</em>'.
-	 * @see org.eclipse.epf.uma.Process#getIncludesPatterns()
-	 * @see #getProcess()
-	 * @generated
-	 */
-	EReference getProcess_IncludesPatterns();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.Process#getDefaultContext <em>Default Context</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Default Context</em>'.
-	 * @see org.eclipse.epf.uma.Process#getDefaultContext()
-	 * @see #getProcess()
-	 * @generated
-	 */
-	EReference getProcess_DefaultContext();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.Process#getValidContext <em>Valid Context</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Valid Context</em>'.
-	 * @see org.eclipse.epf.uma.Process#getValidContext()
-	 * @see #getProcess()
-	 * @generated
-	 */
-	EReference getProcess_ValidContext();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.CapabilityPattern <em>Capability Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Capability Pattern</em>'.
-	 * @see org.eclipse.epf.uma.CapabilityPattern
-	 * @generated
-	 */
-	EClass getCapabilityPattern();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ProcessPlanningTemplate <em>Process Planning Template</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process Planning Template</em>'.
-	 * @see org.eclipse.epf.uma.ProcessPlanningTemplate
-	 * @generated
-	 */
-	EClass getProcessPlanningTemplate();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.ProcessPlanningTemplate#getBasedOnProcesses <em>Based On Processes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Based On Processes</em>'.
-	 * @see org.eclipse.epf.uma.ProcessPlanningTemplate#getBasedOnProcesses()
-	 * @see #getProcessPlanningTemplate()
-	 * @generated
-	 */
-	EReference getProcessPlanningTemplate_BasedOnProcesses();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.Roadmap <em>Roadmap</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Roadmap</em>'.
-	 * @see org.eclipse.epf.uma.Roadmap
-	 * @generated
-	 */
-	EClass getRoadmap();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ProcessComponent <em>Process Component</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process Component</em>'.
-	 * @see org.eclipse.epf.uma.ProcessComponent
-	 * @generated
-	 */
-	EClass getProcessComponent();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.ProcessComponent#getInterfaces <em>Interfaces</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Interfaces</em>'.
-	 * @see org.eclipse.epf.uma.ProcessComponent#getInterfaces()
-	 * @see #getProcessComponent()
-	 * @generated
-	 */
-	EReference getProcessComponent_Interfaces();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.uma.ProcessComponent#getProcess <em>Process</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Process</em>'.
-	 * @see org.eclipse.epf.uma.ProcessComponent#getProcess()
-	 * @see #getProcessComponent()
-	 * @generated
-	 */
-	EReference getProcessComponent_Process();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ProcessPackage <em>Process Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process Package</em>'.
-	 * @see org.eclipse.epf.uma.ProcessPackage
-	 * @generated
-	 */
-	EClass getProcessPackage();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.ProcessPackage#getProcessElements <em>Process Elements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Process Elements</em>'.
-	 * @see org.eclipse.epf.uma.ProcessPackage#getProcessElements()
-	 * @see #getProcessPackage()
-	 * @generated
-	 */
-	EReference getProcessPackage_ProcessElements();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.ProcessPackage#getDiagrams <em>Diagrams</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Diagrams</em>'.
-	 * @see org.eclipse.epf.uma.ProcessPackage#getDiagrams()
-	 * @see #getProcessPackage()
-	 * @generated
-	 */
-	EReference getProcessPackage_Diagrams();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ProcessComponentInterface <em>Process Component Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process Component Interface</em>'.
-	 * @see org.eclipse.epf.uma.ProcessComponentInterface
-	 * @generated
-	 */
-	EClass getProcessComponentInterface();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.ProcessComponentInterface#getInterfaceSpecifications <em>Interface Specifications</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Interface Specifications</em>'.
-	 * @see org.eclipse.epf.uma.ProcessComponentInterface#getInterfaceSpecifications()
-	 * @see #getProcessComponentInterface()
-	 * @generated
-	 */
-	EReference getProcessComponentInterface_InterfaceSpecifications();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.ProcessComponentInterface#getInterfaceIO <em>Interface IO</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Interface IO</em>'.
-	 * @see org.eclipse.epf.uma.ProcessComponentInterface#getInterfaceIO()
-	 * @see #getProcessComponentInterface()
-	 * @generated
-	 */
-	EReference getProcessComponentInterface_InterfaceIO();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ProcessComponentDescriptor <em>Process Component Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process Component Descriptor</em>'.
-	 * @see org.eclipse.epf.uma.ProcessComponentDescriptor
-	 * @generated
-	 */
-	EClass getProcessComponentDescriptor();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.ProcessComponentDescriptor#getProcessComponent <em>Process Component</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Process Component</em>'.
-	 * @see org.eclipse.epf.uma.ProcessComponentDescriptor#getProcessComponent()
-	 * @see #getProcessComponentDescriptor()
-	 * @generated
-	 */
-	EReference getProcessComponentDescriptor_ProcessComponent();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.MethodPlugin <em>Method Plugin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Plugin</em>'.
-	 * @see org.eclipse.epf.uma.MethodPlugin
-	 * @generated
-	 */
-	EClass getMethodPlugin();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.MethodPlugin#getUserChangeable <em>User Changeable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>User Changeable</em>'.
-	 * @see org.eclipse.epf.uma.MethodPlugin#getUserChangeable()
-	 * @see #getMethodPlugin()
-	 * @generated
-	 */
-	EAttribute getMethodPlugin_UserChangeable();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.MethodPlugin#getMethodPackages <em>Method Packages</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Method Packages</em>'.
-	 * @see org.eclipse.epf.uma.MethodPlugin#getMethodPackages()
-	 * @see #getMethodPlugin()
-	 * @generated
-	 */
-	EReference getMethodPlugin_MethodPackages();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.MethodPlugin#getBases <em>Bases</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Bases</em>'.
-	 * @see org.eclipse.epf.uma.MethodPlugin#getBases()
-	 * @see #getMethodPlugin()
-	 * @generated
-	 */
-	EReference getMethodPlugin_Bases();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.VariabilityElement <em>Variability Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Variability Element</em>'.
-	 * @see org.eclipse.epf.uma.VariabilityElement
-	 * @generated
-	 */
-	EClass getVariabilityElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.VariabilityElement#getVariabilityType <em>Variability Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Variability Type</em>'.
-	 * @see org.eclipse.epf.uma.VariabilityElement#getVariabilityType()
-	 * @see #getVariabilityElement()
-	 * @generated
-	 */
-	EAttribute getVariabilityElement_VariabilityType();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.VariabilityElement#getVariabilityBasedOnElement <em>Variability Based On Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Variability Based On Element</em>'.
-	 * @see org.eclipse.epf.uma.VariabilityElement#getVariabilityBasedOnElement()
-	 * @see #getVariabilityElement()
-	 * @generated
-	 */
-	EReference getVariabilityElement_VariabilityBasedOnElement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.MethodUnit <em>Method Unit</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Unit</em>'.
-	 * @see org.eclipse.epf.uma.MethodUnit
-	 * @generated
-	 */
-	EClass getMethodUnit();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.MethodUnit#getAuthors <em>Authors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Authors</em>'.
-	 * @see org.eclipse.epf.uma.MethodUnit#getAuthors()
-	 * @see #getMethodUnit()
-	 * @generated
-	 */
-	EAttribute getMethodUnit_Authors();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.MethodUnit#getChangeDate <em>Change Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Change Date</em>'.
-	 * @see org.eclipse.epf.uma.MethodUnit#getChangeDate()
-	 * @see #getMethodUnit()
-	 * @generated
-	 */
-	EAttribute getMethodUnit_ChangeDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.MethodUnit#getChangeDescription <em>Change Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Change Description</em>'.
-	 * @see org.eclipse.epf.uma.MethodUnit#getChangeDescription()
-	 * @see #getMethodUnit()
-	 * @generated
-	 */
-	EAttribute getMethodUnit_ChangeDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.uma.MethodUnit#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.epf.uma.MethodUnit#getVersion()
-	 * @see #getMethodUnit()
-	 * @generated
-	 */
-	EAttribute getMethodUnit_Version();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.MethodUnit#getCopyrightStatement <em>Copyright Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Copyright Statement</em>'.
-	 * @see org.eclipse.epf.uma.MethodUnit#getCopyrightStatement()
-	 * @see #getMethodUnit()
-	 * @generated
-	 */
-	EReference getMethodUnit_CopyrightStatement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.MethodConfiguration <em>Method Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Configuration</em>'.
-	 * @see org.eclipse.epf.uma.MethodConfiguration
-	 * @generated
-	 */
-	EClass getMethodConfiguration();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.MethodConfiguration#getMethodPluginSelection <em>Method Plugin Selection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Method Plugin Selection</em>'.
-	 * @see org.eclipse.epf.uma.MethodConfiguration#getMethodPluginSelection()
-	 * @see #getMethodConfiguration()
-	 * @generated
-	 */
-	EReference getMethodConfiguration_MethodPluginSelection();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.MethodConfiguration#getMethodPackageSelection <em>Method Package Selection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Method Package Selection</em>'.
-	 * @see org.eclipse.epf.uma.MethodConfiguration#getMethodPackageSelection()
-	 * @see #getMethodConfiguration()
-	 * @generated
-	 */
-	EReference getMethodConfiguration_MethodPackageSelection();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.MethodConfiguration#getProcessViews <em>Process Views</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Process Views</em>'.
-	 * @see org.eclipse.epf.uma.MethodConfiguration#getProcessViews()
-	 * @see #getMethodConfiguration()
-	 * @generated
-	 */
-	EReference getMethodConfiguration_ProcessViews();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.epf.uma.MethodConfiguration#getDefaultView <em>Default View</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Default View</em>'.
-	 * @see org.eclipse.epf.uma.MethodConfiguration#getDefaultView()
-	 * @see #getMethodConfiguration()
-	 * @generated
-	 */
-	EReference getMethodConfiguration_DefaultView();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.MethodConfiguration#getBaseConfigurations <em>Base Configurations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Base Configurations</em>'.
-	 * @see org.eclipse.epf.uma.MethodConfiguration#getBaseConfigurations()
-	 * @see #getMethodConfiguration()
-	 * @generated
-	 */
-	EReference getMethodConfiguration_BaseConfigurations();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.MethodConfiguration#getSubtractedCategory <em>Subtracted Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Subtracted Category</em>'.
-	 * @see org.eclipse.epf.uma.MethodConfiguration#getSubtractedCategory()
-	 * @see #getMethodConfiguration()
-	 * @generated
-	 */
-	EReference getMethodConfiguration_SubtractedCategory();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.MethodConfiguration#getAddedCategory <em>Added Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Added Category</em>'.
-	 * @see org.eclipse.epf.uma.MethodConfiguration#getAddedCategory()
-	 * @see #getMethodConfiguration()
-	 * @generated
-	 */
-	EReference getMethodConfiguration_AddedCategory();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.ProcessFamily <em>Process Family</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process Family</em>'.
-	 * @see org.eclipse.epf.uma.ProcessFamily
-	 * @generated
-	 */
-	EClass getProcessFamily();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.epf.uma.ProcessFamily#getDeliveryProcesses <em>Delivery Processes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Delivery Processes</em>'.
-	 * @see org.eclipse.epf.uma.ProcessFamily#getDeliveryProcesses()
-	 * @see #getProcessFamily()
-	 * @generated
-	 */
-	EReference getProcessFamily_DeliveryProcesses();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.uma.MethodLibrary <em>Method Library</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Library</em>'.
-	 * @see org.eclipse.epf.uma.MethodLibrary
-	 * @generated
-	 */
-	EClass getMethodLibrary();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.MethodLibrary#getMethodPlugins <em>Method Plugins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Method Plugins</em>'.
-	 * @see org.eclipse.epf.uma.MethodLibrary#getMethodPlugins()
-	 * @see #getMethodLibrary()
-	 * @generated
-	 */
-	EReference getMethodLibrary_MethodPlugins();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.uma.MethodLibrary#getPredefinedConfigurations <em>Predefined Configurations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Predefined Configurations</em>'.
-	 * @see org.eclipse.epf.uma.MethodLibrary#getPredefinedConfigurations()
-	 * @see #getMethodLibrary()
-	 * @generated
-	 */
-	EReference getMethodLibrary_PredefinedConfigurations();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.epf.uma.WorkOrderType <em>Work Order Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Work Order Type</em>'.
-	 * @see org.eclipse.epf.uma.WorkOrderType
-	 * @generated
-	 */
-	EEnum getWorkOrderType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.epf.uma.PseudoStateKind <em>Pseudo State Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Pseudo State Kind</em>'.
-	 * @see org.eclipse.epf.uma.PseudoStateKind
-	 * @generated
-	 */
-	EEnum getPseudoStateKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.epf.uma.VariabilityType <em>Variability Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Variability Type</em>'.
-	 * @see org.eclipse.epf.uma.VariabilityType
-	 * @generated
-	 */
-	EEnum getVariabilityType();
-
-	/**
-	 * Returns the meta object for data type '{@link java.util.Date <em>Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Date</em>'.
-	 * @see java.util.Date
-	 * @model instanceClass="java.util.Date"
-	 * @generated
-	 */
-	EDataType getDate();
-
-	/**
-	 * Returns the meta object for data type '{@link java.net.URI <em>Uri</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Uri</em>'.
-	 * @see java.net.URI
-	 * @model instanceClass="java.net.URI"
-	 * @generated
-	 */
-	EDataType getUri();
-
-	/**
-	 * Returns the meta object for data type '<em>Unlimited Natural</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Unlimited Natural</em>'.
-	 * @model instanceClass="int"
-	 * @generated
-	 */
-	EDataType getUnlimitedNatural();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>String</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>String</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 * @generated
-	 */
-	EDataType getString();
-
-	/**
-	 * Returns the meta object for data type '{@link java.util.Set <em>Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Set</em>'.
-	 * @see java.util.Set
-	 * @model instanceClass="java.util.Set"
-	 * @generated
-	 */
-	EDataType getSet();
-
-	/**
-	 * Returns the meta object for data type '{@link java.util.List <em>Sequence</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Sequence</em>'.
-	 * @see java.util.List
-	 * @model instanceClass="java.util.List"
-	 * @generated
-	 */
-	EDataType getSequence();
-
-	/**
-	 * Returns the meta object for data type '<em>Integer</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Integer</em>'.
-	 * @model instanceClass="int"
-	 * @generated
-	 */
-	EDataType getInteger();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.Float <em>Float</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Float</em>'.
-	 * @see java.lang.Float
-	 * @model instanceClass="java.lang.Float"
-	 * @generated
-	 */
-	EDataType getFloat();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	UmaFactory getUmaFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ClassifierImpl <em>Classifier</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ClassifierImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getClassifier()
-		 * @generated
-		 */
-		EClass CLASSIFIER = eINSTANCE.getClassifier();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.TypeImpl <em>Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.TypeImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getType()
-		 * @generated
-		 */
-		EClass TYPE = eINSTANCE.getType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ElementImpl <em>Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ElementImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getElement()
-		 * @generated
-		 */
-		EClass ELEMENT = eINSTANCE.getElement();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.NamedElementImpl <em>Named Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.NamedElementImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getNamedElement()
-		 * @generated
-		 */
-		EClass NAMED_ELEMENT = eINSTANCE.getNamedElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute NAMED_ELEMENT__NAME = eINSTANCE.getNamedElement_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.PackageableElementImpl <em>Packageable Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.PackageableElementImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPackageableElement()
-		 * @generated
-		 */
-		EClass PACKAGEABLE_ELEMENT = eINSTANCE.getPackageableElement();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.PackageImpl <em>Package</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.PackageImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPackage()
-		 * @generated
-		 */
-		EClass PACKAGE = eINSTANCE.getPackage();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.NamespaceImpl <em>Namespace</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.NamespaceImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getNamespace()
-		 * @generated
-		 */
-		EClass NAMESPACE = eINSTANCE.getNamespace();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.MethodElementImpl <em>Method Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.MethodElementImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMethodElement()
-		 * @generated
-		 */
-		EClass METHOD_ELEMENT = eINSTANCE.getMethodElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Guid</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_ELEMENT__GUID = eINSTANCE.getMethodElement_Guid();
-
-		/**
-		 * The meta object literal for the '<em><b>Brief Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_ELEMENT__BRIEF_DESCRIPTION = eINSTANCE
-				.getMethodElement_BriefDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Owned Rules</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_ELEMENT__OWNED_RULES = eINSTANCE
-				.getMethodElement_OwnedRules();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Element Property</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY = eINSTANCE
-				.getMethodElement_MethodElementProperty();
-
-		/**
-		 * The meta object literal for the '<em><b>Suppressed</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_ELEMENT__SUPPRESSED = eINSTANCE
-				.getMethodElement_Suppressed();
-
-		/**
-		 * The meta object literal for the '<em><b>Ordering Guide</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_ELEMENT__ORDERING_GUIDE = eINSTANCE
-				.getMethodElement_OrderingGuide();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ConstraintImpl <em>Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ConstraintImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getConstraint()
-		 * @generated
-		 */
-		EClass CONSTRAINT = eINSTANCE.getConstraint();
-
-		/**
-		 * The meta object literal for the '<em><b>Body</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONSTRAINT__BODY = eINSTANCE.getConstraint_Body();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.MethodElementPropertyImpl <em>Method Element Property</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.MethodElementPropertyImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMethodElementProperty()
-		 * @generated
-		 */
-		EClass METHOD_ELEMENT_PROPERTY = eINSTANCE.getMethodElementProperty();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_ELEMENT_PROPERTY__VALUE = eINSTANCE
-				.getMethodElementProperty_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ContentElementImpl <em>Content Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ContentElementImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getContentElement()
-		 * @generated
-		 */
-		EClass CONTENT_ELEMENT = eINSTANCE.getContentElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Supporting Materials</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTENT_ELEMENT__SUPPORTING_MATERIALS = eINSTANCE
-				.getContentElement_SupportingMaterials();
-
-		/**
-		 * The meta object literal for the '<em><b>Concepts And Papers</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTENT_ELEMENT__CONCEPTS_AND_PAPERS = eINSTANCE
-				.getContentElement_ConceptsAndPapers();
-
-		/**
-		 * The meta object literal for the '<em><b>Checklists</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTENT_ELEMENT__CHECKLISTS = eINSTANCE
-				.getContentElement_Checklists();
-
-		/**
-		 * The meta object literal for the '<em><b>Guidelines</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTENT_ELEMENT__GUIDELINES = eINSTANCE
-				.getContentElement_Guidelines();
-
-		/**
-		 * The meta object literal for the '<em><b>Examples</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTENT_ELEMENT__EXAMPLES = eINSTANCE
-				.getContentElement_Examples();
-
-		/**
-		 * The meta object literal for the '<em><b>Assets</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTENT_ELEMENT__ASSETS = eINSTANCE
-				.getContentElement_Assets();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.DescribableElementImpl <em>Describable Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.DescribableElementImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDescribableElement()
-		 * @generated
-		 */
-		EClass DESCRIBABLE_ELEMENT = eINSTANCE.getDescribableElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Presentation Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DESCRIBABLE_ELEMENT__PRESENTATION_NAME = eINSTANCE
-				.getDescribableElement_PresentationName();
-
-		/**
-		 * The meta object literal for the '<em><b>Presentation</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DESCRIBABLE_ELEMENT__PRESENTATION = eINSTANCE
-				.getDescribableElement_Presentation();
-
-		/**
-		 * The meta object literal for the '<em><b>Shapeicon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DESCRIBABLE_ELEMENT__SHAPEICON = eINSTANCE
-				.getDescribableElement_Shapeicon();
-
-		/**
-		 * The meta object literal for the '<em><b>Nodeicon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DESCRIBABLE_ELEMENT__NODEICON = eINSTANCE
-				.getDescribableElement_Nodeicon();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ContentDescriptionImpl <em>Content Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ContentDescriptionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getContentDescription()
-		 * @generated
-		 */
-		EClass CONTENT_DESCRIPTION = eINSTANCE.getContentDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Main Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_DESCRIPTION__MAIN_DESCRIPTION = eINSTANCE
-				.getContentDescription_MainDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Sections</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTENT_DESCRIPTION__SECTIONS = eINSTANCE
-				.getContentDescription_Sections();
-
-		/**
-		 * The meta object literal for the '<em><b>Key Considerations</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_DESCRIPTION__KEY_CONSIDERATIONS = eINSTANCE
-				.getContentDescription_KeyConsiderations();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.SectionImpl <em>Section</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.SectionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getSection()
-		 * @generated
-		 */
-		EClass SECTION = eINSTANCE.getSection();
-
-		/**
-		 * The meta object literal for the '<em><b>Section Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECTION__SECTION_NAME = eINSTANCE.getSection_SectionName();
-
-		/**
-		 * The meta object literal for the '<em><b>Section Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECTION__SECTION_DESCRIPTION = eINSTANCE
-				.getSection_SectionDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Sub Sections</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECTION__SUB_SECTIONS = eINSTANCE.getSection_SubSections();
-
-		/**
-		 * The meta object literal for the '<em><b>Predecessor</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECTION__PREDECESSOR = eINSTANCE.getSection_Predecessor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.RoleImpl <em>Role</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.RoleImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getRole()
-		 * @generated
-		 */
-		EClass ROLE = eINSTANCE.getRole();
-
-		/**
-		 * The meta object literal for the '<em><b>Modifies</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ROLE__MODIFIES = eINSTANCE.getRole_Modifies();
-
-		/**
-		 * The meta object literal for the '<em><b>Responsible For</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ROLE__RESPONSIBLE_FOR = eINSTANCE.getRole_ResponsibleFor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.WorkProductImpl <em>Work Product</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.WorkProductImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkProduct()
-		 * @generated
-		 */
-		EClass WORK_PRODUCT = eINSTANCE.getWorkProduct();
-
-		/**
-		 * The meta object literal for the '<em><b>Reports</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORK_PRODUCT__REPORTS = eINSTANCE.getWorkProduct_Reports();
-
-		/**
-		 * The meta object literal for the '<em><b>Templates</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORK_PRODUCT__TEMPLATES = eINSTANCE
-				.getWorkProduct_Templates();
-
-		/**
-		 * The meta object literal for the '<em><b>Tool Mentors</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORK_PRODUCT__TOOL_MENTORS = eINSTANCE
-				.getWorkProduct_ToolMentors();
-
-		/**
-		 * The meta object literal for the '<em><b>Estimation Considerations</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORK_PRODUCT__ESTIMATION_CONSIDERATIONS = eINSTANCE
-				.getWorkProduct_EstimationConsiderations();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.TaskImpl <em>Task</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.TaskImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTask()
-		 * @generated
-		 */
-		EClass TASK = eINSTANCE.getTask();
-
-		/**
-		 * The meta object literal for the '<em><b>Performed By</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK__PERFORMED_BY = eINSTANCE.getTask_PerformedBy();
-
-		/**
-		 * The meta object literal for the '<em><b>Mandatory Input</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK__MANDATORY_INPUT = eINSTANCE.getTask_MandatoryInput();
-
-		/**
-		 * The meta object literal for the '<em><b>Output</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK__OUTPUT = eINSTANCE.getTask_Output();
-
-		/**
-		 * The meta object literal for the '<em><b>Additionally Performed By</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK__ADDITIONALLY_PERFORMED_BY = eINSTANCE
-				.getTask_AdditionallyPerformedBy();
-
-		/**
-		 * The meta object literal for the '<em><b>Optional Input</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK__OPTIONAL_INPUT = eINSTANCE.getTask_OptionalInput();
-
-		/**
-		 * The meta object literal for the '<em><b>Steps</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK__STEPS = eINSTANCE.getTask_Steps();
-
-		/**
-		 * The meta object literal for the '<em><b>Tool Mentors</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK__TOOL_MENTORS = eINSTANCE.getTask_ToolMentors();
-
-		/**
-		 * The meta object literal for the '<em><b>Estimation Considerations</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK__ESTIMATION_CONSIDERATIONS = eINSTANCE
-				.getTask_EstimationConsiderations();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.WorkDefinitionImpl <em>Work Definition</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.WorkDefinitionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkDefinition()
-		 * @generated
-		 */
-		EClass WORK_DEFINITION = eINSTANCE.getWorkDefinition();
-
-		/**
-		 * The meta object literal for the '<em><b>Precondition</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORK_DEFINITION__PRECONDITION = eINSTANCE
-				.getWorkDefinition_Precondition();
-
-		/**
-		 * The meta object literal for the '<em><b>Postcondition</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORK_DEFINITION__POSTCONDITION = eINSTANCE
-				.getWorkDefinition_Postcondition();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.StepImpl <em>Step</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.StepImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getStep()
-		 * @generated
-		 */
-		EClass STEP = eINSTANCE.getStep();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.GuidanceImpl <em>Guidance</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.GuidanceImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGuidance()
-		 * @generated
-		 */
-		EClass GUIDANCE = eINSTANCE.getGuidance();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ArtifactImpl <em>Artifact</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ArtifactImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getArtifact()
-		 * @generated
-		 */
-		EClass ARTIFACT = eINSTANCE.getArtifact();
-
-		/**
-		 * The meta object literal for the '<em><b>Container Artifact</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ARTIFACT__CONTAINER_ARTIFACT = eINSTANCE
-				.getArtifact_ContainerArtifact();
-
-		/**
-		 * The meta object literal for the '<em><b>Contained Artifacts</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ARTIFACT__CONTAINED_ARTIFACTS = eINSTANCE
-				.getArtifact_ContainedArtifacts();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.DeliverableImpl <em>Deliverable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.DeliverableImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDeliverable()
-		 * @generated
-		 */
-		EClass DELIVERABLE = eINSTANCE.getDeliverable();
-
-		/**
-		 * The meta object literal for the '<em><b>Delivered Work Products</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DELIVERABLE__DELIVERED_WORK_PRODUCTS = eINSTANCE
-				.getDeliverable_DeliveredWorkProducts();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.OutcomeImpl <em>Outcome</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.OutcomeImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getOutcome()
-		 * @generated
-		 */
-		EClass OUTCOME = eINSTANCE.getOutcome();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.MethodPackageImpl <em>Method Package</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.MethodPackageImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMethodPackage()
-		 * @generated
-		 */
-		EClass METHOD_PACKAGE = eINSTANCE.getMethodPackage();
-
-		/**
-		 * The meta object literal for the '<em><b>Global</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PACKAGE__GLOBAL = eINSTANCE.getMethodPackage_Global();
-
-		/**
-		 * The meta object literal for the '<em><b>Reused Packages</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PACKAGE__REUSED_PACKAGES = eINSTANCE
-				.getMethodPackage_ReusedPackages();
-
-		/**
-		 * The meta object literal for the '<em><b>Child Packages</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PACKAGE__CHILD_PACKAGES = eINSTANCE
-				.getMethodPackage_ChildPackages();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ContentPackageImpl <em>Content Package</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ContentPackageImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getContentPackage()
-		 * @generated
-		 */
-		EClass CONTENT_PACKAGE = eINSTANCE.getContentPackage();
-
-		/**
-		 * The meta object literal for the '<em><b>Content Elements</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTENT_PACKAGE__CONTENT_ELEMENTS = eINSTANCE
-				.getContentPackage_ContentElements();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ArtifactDescriptionImpl <em>Artifact Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ArtifactDescriptionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getArtifactDescription()
-		 * @generated
-		 */
-		EClass ARTIFACT_DESCRIPTION = eINSTANCE.getArtifactDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Brief Outline</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ARTIFACT_DESCRIPTION__BRIEF_OUTLINE = eINSTANCE
-				.getArtifactDescription_BriefOutline();
-
-		/**
-		 * The meta object literal for the '<em><b>Representation Options</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS = eINSTANCE
-				.getArtifactDescription_RepresentationOptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.WorkProductDescriptionImpl <em>Work Product Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.WorkProductDescriptionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkProductDescription()
-		 * @generated
-		 */
-		EClass WORK_PRODUCT_DESCRIPTION = eINSTANCE.getWorkProductDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>External Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID = eINSTANCE
-				.getWorkProductDescription_ExternalId();
-
-		/**
-		 * The meta object literal for the '<em><b>Purpose</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTION__PURPOSE = eINSTANCE
-				.getWorkProductDescription_Purpose();
-
-		/**
-		 * The meta object literal for the '<em><b>Impact Of Not Having</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING = eINSTANCE
-				.getWorkProductDescription_ImpactOfNotHaving();
-
-		/**
-		 * The meta object literal for the '<em><b>Reasons For Not Needing</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING = eINSTANCE
-				.getWorkProductDescription_ReasonsForNotNeeding();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.DeliverableDescriptionImpl <em>Deliverable Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.DeliverableDescriptionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDeliverableDescription()
-		 * @generated
-		 */
-		EClass DELIVERABLE_DESCRIPTION = eINSTANCE.getDeliverableDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>External Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION = eINSTANCE
-				.getDeliverableDescription_ExternalDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Packaging Guidance</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE = eINSTANCE
-				.getDeliverableDescription_PackagingGuidance();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.RoleDescriptionImpl <em>Role Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.RoleDescriptionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getRoleDescription()
-		 * @generated
-		 */
-		EClass ROLE_DESCRIPTION = eINSTANCE.getRoleDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Skills</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE_DESCRIPTION__SKILLS = eINSTANCE
-				.getRoleDescription_Skills();
-
-		/**
-		 * The meta object literal for the '<em><b>Assignment Approaches</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES = eINSTANCE
-				.getRoleDescription_AssignmentApproaches();
-
-		/**
-		 * The meta object literal for the '<em><b>Synonyms</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE_DESCRIPTION__SYNONYMS = eINSTANCE
-				.getRoleDescription_Synonyms();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.TaskDescriptionImpl <em>Task Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.TaskDescriptionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTaskDescription()
-		 * @generated
-		 */
-		EClass TASK_DESCRIPTION = eINSTANCE.getTaskDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Purpose</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_DESCRIPTION__PURPOSE = eINSTANCE
-				.getTaskDescription_Purpose();
-
-		/**
-		 * The meta object literal for the '<em><b>Alternatives</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_DESCRIPTION__ALTERNATIVES = eINSTANCE
-				.getTaskDescription_Alternatives();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.GuidanceDescriptionImpl <em>Guidance Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.GuidanceDescriptionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGuidanceDescription()
-		 * @generated
-		 */
-		EClass GUIDANCE_DESCRIPTION = eINSTANCE.getGuidanceDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Attachments</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute GUIDANCE_DESCRIPTION__ATTACHMENTS = eINSTANCE
-				.getGuidanceDescription_Attachments();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.PracticeDescriptionImpl <em>Practice Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.PracticeDescriptionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPracticeDescription()
-		 * @generated
-		 */
-		EClass PRACTICE_DESCRIPTION = eINSTANCE.getPracticeDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Additional Info</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PRACTICE_DESCRIPTION__ADDITIONAL_INFO = eINSTANCE
-				.getPracticeDescription_AdditionalInfo();
-
-		/**
-		 * The meta object literal for the '<em><b>Problem</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PRACTICE_DESCRIPTION__PROBLEM = eINSTANCE
-				.getPracticeDescription_Problem();
-
-		/**
-		 * The meta object literal for the '<em><b>Background</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PRACTICE_DESCRIPTION__BACKGROUND = eINSTANCE
-				.getPracticeDescription_Background();
-
-		/**
-		 * The meta object literal for the '<em><b>Goals</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PRACTICE_DESCRIPTION__GOALS = eINSTANCE
-				.getPracticeDescription_Goals();
-
-		/**
-		 * The meta object literal for the '<em><b>Application</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PRACTICE_DESCRIPTION__APPLICATION = eINSTANCE
-				.getPracticeDescription_Application();
-
-		/**
-		 * The meta object literal for the '<em><b>Levels Of Adoption</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION = eINSTANCE
-				.getPracticeDescription_LevelsOfAdoption();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.PointImpl <em>Point</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.PointImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPoint()
-		 * @generated
-		 */
-		EClass POINT = eINSTANCE.getPoint();
-
-		/**
-		 * The meta object literal for the '<em><b>X</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute POINT__X = eINSTANCE.getPoint_X();
-
-		/**
-		 * The meta object literal for the '<em><b>Y</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute POINT__Y = eINSTANCE.getPoint_Y();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.GraphElementImpl <em>Graph Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.GraphElementImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGraphElement()
-		 * @generated
-		 */
-		EClass GRAPH_ELEMENT = eINSTANCE.getGraphElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Position</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference GRAPH_ELEMENT__POSITION = eINSTANCE
-				.getGraphElement_Position();
-
-		/**
-		 * The meta object literal for the '<em><b>Contained</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference GRAPH_ELEMENT__CONTAINED = eINSTANCE
-				.getGraphElement_Contained();
-
-		/**
-		 * The meta object literal for the '<em><b>Link</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference GRAPH_ELEMENT__LINK = eINSTANCE.getGraphElement_Link();
-
-		/**
-		 * The meta object literal for the '<em><b>Anchorage</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference GRAPH_ELEMENT__ANCHORAGE = eINSTANCE
-				.getGraphElement_Anchorage();
-
-		/**
-		 * The meta object literal for the '<em><b>Semantic Model</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference GRAPH_ELEMENT__SEMANTIC_MODEL = eINSTANCE
-				.getGraphElement_SemanticModel();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.DiagramElementImpl <em>Diagram Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.DiagramElementImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDiagramElement()
-		 * @generated
-		 */
-		EClass DIAGRAM_ELEMENT = eINSTANCE.getDiagramElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Visible</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DIAGRAM_ELEMENT__IS_VISIBLE = eINSTANCE
-				.getDiagramElement_IsVisible();
-
-		/**
-		 * The meta object literal for the '<em><b>Container</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DIAGRAM_ELEMENT__CONTAINER = eINSTANCE
-				.getDiagramElement_Container();
-
-		/**
-		 * The meta object literal for the '<em><b>Reference</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DIAGRAM_ELEMENT__REFERENCE = eINSTANCE
-				.getDiagramElement_Reference();
-
-		/**
-		 * The meta object literal for the '<em><b>Property</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DIAGRAM_ELEMENT__PROPERTY = eINSTANCE
-				.getDiagramElement_Property();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.DiagramLinkImpl <em>Diagram Link</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.DiagramLinkImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDiagramLink()
-		 * @generated
-		 */
-		EClass DIAGRAM_LINK = eINSTANCE.getDiagramLink();
-
-		/**
-		 * The meta object literal for the '<em><b>Zoom</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DIAGRAM_LINK__ZOOM = eINSTANCE.getDiagramLink_Zoom();
-
-		/**
-		 * The meta object literal for the '<em><b>Viewport</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DIAGRAM_LINK__VIEWPORT = eINSTANCE.getDiagramLink_Viewport();
-
-		/**
-		 * The meta object literal for the '<em><b>Graph Element</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DIAGRAM_LINK__GRAPH_ELEMENT = eINSTANCE
-				.getDiagramLink_GraphElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Diagram</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DIAGRAM_LINK__DIAGRAM = eINSTANCE.getDiagramLink_Diagram();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.GraphConnectorImpl <em>Graph Connector</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.GraphConnectorImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGraphConnector()
-		 * @generated
-		 */
-		EClass GRAPH_CONNECTOR = eINSTANCE.getGraphConnector();
-
-		/**
-		 * The meta object literal for the '<em><b>Graph Element</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference GRAPH_CONNECTOR__GRAPH_ELEMENT = eINSTANCE
-				.getGraphConnector_GraphElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Graph Edge</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference GRAPH_CONNECTOR__GRAPH_EDGE = eINSTANCE
-				.getGraphConnector_GraphEdge();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.SemanticModelBridgeImpl <em>Semantic Model Bridge</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.SemanticModelBridgeImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getSemanticModelBridge()
-		 * @generated
-		 */
-		EClass SEMANTIC_MODEL_BRIDGE = eINSTANCE.getSemanticModelBridge();
-
-		/**
-		 * The meta object literal for the '<em><b>Presentation</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SEMANTIC_MODEL_BRIDGE__PRESENTATION = eINSTANCE
-				.getSemanticModelBridge_Presentation();
-
-		/**
-		 * The meta object literal for the '<em><b>Graph Element</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT = eINSTANCE
-				.getSemanticModelBridge_GraphElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Diagram</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SEMANTIC_MODEL_BRIDGE__DIAGRAM = eINSTANCE
-				.getSemanticModelBridge_Diagram();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.DimensionImpl <em>Dimension</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.DimensionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDimension()
-		 * @generated
-		 */
-		EClass DIMENSION = eINSTANCE.getDimension();
-
-		/**
-		 * The meta object literal for the '<em><b>Width</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DIMENSION__WIDTH = eINSTANCE.getDimension_Width();
-
-		/**
-		 * The meta object literal for the '<em><b>Height</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DIMENSION__HEIGHT = eINSTANCE.getDimension_Height();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ReferenceImpl <em>Reference</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ReferenceImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getReference()
-		 * @generated
-		 */
-		EClass REFERENCE = eINSTANCE.getReference();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Individual Representation</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute REFERENCE__IS_INDIVIDUAL_REPRESENTATION = eINSTANCE
-				.getReference_IsIndividualRepresentation();
-
-		/**
-		 * The meta object literal for the '<em><b>Referenced</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference REFERENCE__REFERENCED = eINSTANCE.getReference_Referenced();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.PropertyImpl <em>Property</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.PropertyImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProperty()
-		 * @generated
-		 */
-		EClass PROPERTY = eINSTANCE.getProperty();
-
-		/**
-		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY__KEY = eINSTANCE.getProperty_Key();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROPERTY__VALUE = eINSTANCE.getProperty_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.GraphEdgeImpl <em>Graph Edge</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.GraphEdgeImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGraphEdge()
-		 * @generated
-		 */
-		EClass GRAPH_EDGE = eINSTANCE.getGraphEdge();
-
-		/**
-		 * The meta object literal for the '<em><b>Anchor</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference GRAPH_EDGE__ANCHOR = eINSTANCE.getGraphEdge_Anchor();
-
-		/**
-		 * The meta object literal for the '<em><b>Waypoints</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference GRAPH_EDGE__WAYPOINTS = eINSTANCE.getGraphEdge_Waypoints();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.DiagramImpl <em>Diagram</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.DiagramImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDiagram()
-		 * @generated
-		 */
-		EClass DIAGRAM = eINSTANCE.getDiagram();
-
-		/**
-		 * The meta object literal for the '<em><b>Zoom</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DIAGRAM__ZOOM = eINSTANCE.getDiagram_Zoom();
-
-		/**
-		 * The meta object literal for the '<em><b>Viewpoint</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DIAGRAM__VIEWPOINT = eINSTANCE.getDiagram_Viewpoint();
-
-		/**
-		 * The meta object literal for the '<em><b>Diagram Link</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DIAGRAM__DIAGRAM_LINK = eINSTANCE.getDiagram_DiagramLink();
-
-		/**
-		 * The meta object literal for the '<em><b>Namespace</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DIAGRAM__NAMESPACE = eINSTANCE.getDiagram_Namespace();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.GraphNodeImpl <em>Graph Node</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.GraphNodeImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGraphNode()
-		 * @generated
-		 */
-		EClass GRAPH_NODE = eINSTANCE.getGraphNode();
-
-		/**
-		 * The meta object literal for the '<em><b>Size</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference GRAPH_NODE__SIZE = eINSTANCE.getGraphNode_Size();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.SimpleSemanticModelElementImpl <em>Simple Semantic Model Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.SimpleSemanticModelElementImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getSimpleSemanticModelElement()
-		 * @generated
-		 */
-		EClass SIMPLE_SEMANTIC_MODEL_ELEMENT = eINSTANCE
-				.getSimpleSemanticModelElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Type Info</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SIMPLE_SEMANTIC_MODEL_ELEMENT__TYPE_INFO = eINSTANCE
-				.getSimpleSemanticModelElement_TypeInfo();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.UMASemanticModelBridgeImpl <em>UMA Semantic Model Bridge</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.UMASemanticModelBridgeImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getUMASemanticModelBridge()
-		 * @generated
-		 */
-		EClass UMA_SEMANTIC_MODEL_BRIDGE = eINSTANCE
-				.getUMASemanticModelBridge();
-
-		/**
-		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference UMA_SEMANTIC_MODEL_BRIDGE__ELEMENT = eINSTANCE
-				.getUMASemanticModelBridge_Element();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.CoreSemanticModelBridgeImpl <em>Core Semantic Model Bridge</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.CoreSemanticModelBridgeImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getCoreSemanticModelBridge()
-		 * @generated
-		 */
-		EClass CORE_SEMANTIC_MODEL_BRIDGE = eINSTANCE
-				.getCoreSemanticModelBridge();
-
-		/**
-		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CORE_SEMANTIC_MODEL_BRIDGE__ELEMENT = eINSTANCE
-				.getCoreSemanticModelBridge_Element();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.LeafElementImpl <em>Leaf Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.LeafElementImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getLeafElement()
-		 * @generated
-		 */
-		EClass LEAF_ELEMENT = eINSTANCE.getLeafElement();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.TextElementImpl <em>Text Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.TextElementImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTextElement()
-		 * @generated
-		 */
-		EClass TEXT_ELEMENT = eINSTANCE.getTextElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Text</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TEXT_ELEMENT__TEXT = eINSTANCE.getTextElement_Text();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ImageImpl <em>Image</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ImageImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getImage()
-		 * @generated
-		 */
-		EClass IMAGE = eINSTANCE.getImage();
-
-		/**
-		 * The meta object literal for the '<em><b>Uri</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute IMAGE__URI = eINSTANCE.getImage_Uri();
-
-		/**
-		 * The meta object literal for the '<em><b>Mime Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute IMAGE__MIME_TYPE = eINSTANCE.getImage_MimeType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.GraphicPrimitiveImpl <em>Graphic Primitive</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.GraphicPrimitiveImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGraphicPrimitive()
-		 * @generated
-		 */
-		EClass GRAPHIC_PRIMITIVE = eINSTANCE.getGraphicPrimitive();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.PolylineImpl <em>Polyline</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.PolylineImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPolyline()
-		 * @generated
-		 */
-		EClass POLYLINE = eINSTANCE.getPolyline();
-
-		/**
-		 * The meta object literal for the '<em><b>Closed</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute POLYLINE__CLOSED = eINSTANCE.getPolyline_Closed();
-
-		/**
-		 * The meta object literal for the '<em><b>Waypoints</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference POLYLINE__WAYPOINTS = eINSTANCE.getPolyline_Waypoints();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.EllipseImpl <em>Ellipse</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.EllipseImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getEllipse()
-		 * @generated
-		 */
-		EClass ELLIPSE = eINSTANCE.getEllipse();
-
-		/**
-		 * The meta object literal for the '<em><b>Radius X</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ELLIPSE__RADIUS_X = eINSTANCE.getEllipse_RadiusX();
-
-		/**
-		 * The meta object literal for the '<em><b>Radius Y</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ELLIPSE__RADIUS_Y = eINSTANCE.getEllipse_RadiusY();
-
-		/**
-		 * The meta object literal for the '<em><b>Rotation</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ELLIPSE__ROTATION = eINSTANCE.getEllipse_Rotation();
-
-		/**
-		 * The meta object literal for the '<em><b>Start Angle</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ELLIPSE__START_ANGLE = eINSTANCE.getEllipse_StartAngle();
-
-		/**
-		 * The meta object literal for the '<em><b>End Angle</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ELLIPSE__END_ANGLE = eINSTANCE.getEllipse_EndAngle();
-
-		/**
-		 * The meta object literal for the '<em><b>Center</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ELLIPSE__CENTER = eINSTANCE.getEllipse_Center();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ActivityImpl <em>Activity</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ActivityImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getActivity()
-		 * @generated
-		 */
-		EClass ACTIVITY = eINSTANCE.getActivity();
-
-		/**
-		 * The meta object literal for the '<em><b>Breakdown Elements</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACTIVITY__BREAKDOWN_ELEMENTS = eINSTANCE
-				.getActivity_BreakdownElements();
-
-		/**
-		 * The meta object literal for the '<em><b>Roadmaps</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACTIVITY__ROADMAPS = eINSTANCE.getActivity_Roadmaps();
-
-		/**
-		 * The meta object literal for the '<em><b>Supporting Materials</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACTIVITY__SUPPORTING_MATERIALS = eINSTANCE
-				.getActivity_SupportingMaterials();
-
-		/**
-		 * The meta object literal for the '<em><b>Checklists</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACTIVITY__CHECKLISTS = eINSTANCE.getActivity_Checklists();
-
-		/**
-		 * The meta object literal for the '<em><b>Concepts</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACTIVITY__CONCEPTS = eINSTANCE.getActivity_Concepts();
-
-		/**
-		 * The meta object literal for the '<em><b>Examples</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACTIVITY__EXAMPLES = eINSTANCE.getActivity_Examples();
-
-		/**
-		 * The meta object literal for the '<em><b>Guidelines</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACTIVITY__GUIDELINES = eINSTANCE.getActivity_Guidelines();
-
-		/**
-		 * The meta object literal for the '<em><b>Reusable Assets</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACTIVITY__REUSABLE_ASSETS = eINSTANCE
-				.getActivity_ReusableAssets();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Enactable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY__IS_ENACTABLE = eINSTANCE.getActivity_IsEnactable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.WorkBreakdownElementImpl <em>Work Breakdown Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.WorkBreakdownElementImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkBreakdownElement()
-		 * @generated
-		 */
-		EClass WORK_BREAKDOWN_ELEMENT = eINSTANCE.getWorkBreakdownElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Repeatable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE = eINSTANCE
-				.getWorkBreakdownElement_IsRepeatable();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Ongoing</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_BREAKDOWN_ELEMENT__IS_ONGOING = eINSTANCE
-				.getWorkBreakdownElement_IsOngoing();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Event Driven</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN = eINSTANCE
-				.getWorkBreakdownElement_IsEventDriven();
-
-		/**
-		 * The meta object literal for the '<em><b>Link To Predecessor</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORK_BREAKDOWN_ELEMENT__LINK_TO_PREDECESSOR = eINSTANCE
-				.getWorkBreakdownElement_LinkToPredecessor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.BreakdownElementImpl <em>Breakdown Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.BreakdownElementImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getBreakdownElement()
-		 * @generated
-		 */
-		EClass BREAKDOWN_ELEMENT = eINSTANCE.getBreakdownElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Prefix</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BREAKDOWN_ELEMENT__PREFIX = eINSTANCE
-				.getBreakdownElement_Prefix();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Planned</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BREAKDOWN_ELEMENT__IS_PLANNED = eINSTANCE
-				.getBreakdownElement_IsPlanned();
-
-		/**
-		 * The meta object literal for the '<em><b>Has Multiple Occurrences</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES = eINSTANCE
-				.getBreakdownElement_HasMultipleOccurrences();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Optional</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BREAKDOWN_ELEMENT__IS_OPTIONAL = eINSTANCE
-				.getBreakdownElement_IsOptional();
-
-		/**
-		 * The meta object literal for the '<em><b>Presented After</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BREAKDOWN_ELEMENT__PRESENTED_AFTER = eINSTANCE
-				.getBreakdownElement_PresentedAfter();
-
-		/**
-		 * The meta object literal for the '<em><b>Presented Before</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BREAKDOWN_ELEMENT__PRESENTED_BEFORE = eINSTANCE
-				.getBreakdownElement_PresentedBefore();
-
-		/**
-		 * The meta object literal for the '<em><b>Planning Data</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BREAKDOWN_ELEMENT__PLANNING_DATA = eINSTANCE
-				.getBreakdownElement_PlanningData();
-
-		/**
-		 * The meta object literal for the '<em><b>Super Activities</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BREAKDOWN_ELEMENT__SUPER_ACTIVITIES = eINSTANCE
-				.getBreakdownElement_SuperActivities();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.MilestoneImpl <em>Milestone</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.MilestoneImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMilestone()
-		 * @generated
-		 */
-		EClass MILESTONE = eINSTANCE.getMilestone();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.IterationImpl <em>Iteration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.IterationImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getIteration()
-		 * @generated
-		 */
-		EClass ITERATION = eINSTANCE.getIteration();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.PhaseImpl <em>Phase</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.PhaseImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPhase()
-		 * @generated
-		 */
-		EClass PHASE = eINSTANCE.getPhase();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.TeamProfileImpl <em>Team Profile</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.TeamProfileImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTeamProfile()
-		 * @generated
-		 */
-		EClass TEAM_PROFILE = eINSTANCE.getTeamProfile();
-
-		/**
-		 * The meta object literal for the '<em><b>Team Roles</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TEAM_PROFILE__TEAM_ROLES = eINSTANCE
-				.getTeamProfile_TeamRoles();
-
-		/**
-		 * The meta object literal for the '<em><b>Super Team</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TEAM_PROFILE__SUPER_TEAM = eINSTANCE
-				.getTeamProfile_SuperTeam();
-
-		/**
-		 * The meta object literal for the '<em><b>Sub Team</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TEAM_PROFILE__SUB_TEAM = eINSTANCE.getTeamProfile_SubTeam();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.RoleDescriptorImpl <em>Role Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.RoleDescriptorImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getRoleDescriptor()
-		 * @generated
-		 */
-		EClass ROLE_DESCRIPTOR = eINSTANCE.getRoleDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Role</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ROLE_DESCRIPTOR__ROLE = eINSTANCE.getRoleDescriptor_Role();
-
-		/**
-		 * The meta object literal for the '<em><b>Modifies</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ROLE_DESCRIPTOR__MODIFIES = eINSTANCE
-				.getRoleDescriptor_Modifies();
-
-		/**
-		 * The meta object literal for the '<em><b>Responsible For</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ROLE_DESCRIPTOR__RESPONSIBLE_FOR = eINSTANCE
-				.getRoleDescriptor_ResponsibleFor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.WorkOrderImpl <em>Work Order</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.WorkOrderImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkOrder()
-		 * @generated
-		 */
-		EClass WORK_ORDER = eINSTANCE.getWorkOrder();
-
-		/**
-		 * The meta object literal for the '<em><b>Link Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_ORDER__LINK_TYPE = eINSTANCE.getWorkOrder_LinkType();
-
-		/**
-		 * The meta object literal for the '<em><b>Pred</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORK_ORDER__PRED = eINSTANCE.getWorkOrder_Pred();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ProcessElementImpl <em>Process Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ProcessElementImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessElement()
-		 * @generated
-		 */
-		EClass PROCESS_ELEMENT = eINSTANCE.getProcessElement();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.PlanningDataImpl <em>Planning Data</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.PlanningDataImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPlanningData()
-		 * @generated
-		 */
-		EClass PLANNING_DATA = eINSTANCE.getPlanningData();
-
-		/**
-		 * The meta object literal for the '<em><b>Start Date</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PLANNING_DATA__START_DATE = eINSTANCE
-				.getPlanningData_StartDate();
-
-		/**
-		 * The meta object literal for the '<em><b>Finish Date</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PLANNING_DATA__FINISH_DATE = eINSTANCE
-				.getPlanningData_FinishDate();
-
-		/**
-		 * The meta object literal for the '<em><b>Rank</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PLANNING_DATA__RANK = eINSTANCE.getPlanningData_Rank();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.DescriptorImpl <em>Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.DescriptorImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDescriptor()
-		 * @generated
-		 */
-		EClass DESCRIPTOR = eINSTANCE.getDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Synchronized With Source</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE = eINSTANCE
-				.getDescriptor_IsSynchronizedWithSource();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.TaskDescriptorImpl <em>Task Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.TaskDescriptorImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTaskDescriptor()
-		 * @generated
-		 */
-		EClass TASK_DESCRIPTOR = eINSTANCE.getTaskDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Task</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK_DESCRIPTOR__TASK = eINSTANCE.getTaskDescriptor_Task();
-
-		/**
-		 * The meta object literal for the '<em><b>Additionally Performed By</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY = eINSTANCE
-				.getTaskDescriptor_AdditionallyPerformedBy();
-
-		/**
-		 * The meta object literal for the '<em><b>Assisted By</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK_DESCRIPTOR__ASSISTED_BY = eINSTANCE
-				.getTaskDescriptor_AssistedBy();
-
-		/**
-		 * The meta object literal for the '<em><b>External Input</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK_DESCRIPTOR__EXTERNAL_INPUT = eINSTANCE
-				.getTaskDescriptor_ExternalInput();
-
-		/**
-		 * The meta object literal for the '<em><b>Mandatory Input</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK_DESCRIPTOR__MANDATORY_INPUT = eINSTANCE
-				.getTaskDescriptor_MandatoryInput();
-
-		/**
-		 * The meta object literal for the '<em><b>Optional Input</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK_DESCRIPTOR__OPTIONAL_INPUT = eINSTANCE
-				.getTaskDescriptor_OptionalInput();
-
-		/**
-		 * The meta object literal for the '<em><b>Output</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK_DESCRIPTOR__OUTPUT = eINSTANCE
-				.getTaskDescriptor_Output();
-
-		/**
-		 * The meta object literal for the '<em><b>Performed Primarily By</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY = eINSTANCE
-				.getTaskDescriptor_PerformedPrimarilyBy();
-
-		/**
-		 * The meta object literal for the '<em><b>Selected Steps</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK_DESCRIPTOR__SELECTED_STEPS = eINSTANCE
-				.getTaskDescriptor_SelectedSteps();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.WorkProductDescriptorImpl <em>Work Product Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.WorkProductDescriptorImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkProductDescriptor()
-		 * @generated
-		 */
-		EClass WORK_PRODUCT_DESCRIPTOR = eINSTANCE.getWorkProductDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Activity Entry State</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE = eINSTANCE
-				.getWorkProductDescriptor_ActivityEntryState();
-
-		/**
-		 * The meta object literal for the '<em><b>Activity Exit State</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE = eINSTANCE
-				.getWorkProductDescriptor_ActivityExitState();
-
-		/**
-		 * The meta object literal for the '<em><b>Work Product</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT = eINSTANCE
-				.getWorkProductDescriptor_WorkProduct();
-
-		/**
-		 * The meta object literal for the '<em><b>Impacted By</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY = eINSTANCE
-				.getWorkProductDescriptor_ImpactedBy();
-
-		/**
-		 * The meta object literal for the '<em><b>Impacts</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORK_PRODUCT_DESCRIPTOR__IMPACTS = eINSTANCE
-				.getWorkProductDescriptor_Impacts();
-
-		/**
-		 * The meta object literal for the '<em><b>Deliverable Parts</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS = eINSTANCE
-				.getWorkProductDescriptor_DeliverableParts();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.CompositeRoleImpl <em>Composite Role</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.CompositeRoleImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getCompositeRole()
-		 * @generated
-		 */
-		EClass COMPOSITE_ROLE = eINSTANCE.getCompositeRole();
-
-		/**
-		 * The meta object literal for the '<em><b>Aggregated Roles</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference COMPOSITE_ROLE__AGGREGATED_ROLES = eINSTANCE
-				.getCompositeRole_AggregatedRoles();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.BreakdownElementDescriptionImpl <em>Breakdown Element Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.BreakdownElementDescriptionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getBreakdownElementDescription()
-		 * @generated
-		 */
-		EClass BREAKDOWN_ELEMENT_DESCRIPTION = eINSTANCE
-				.getBreakdownElementDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Usage Guidance</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE = eINSTANCE
-				.getBreakdownElementDescription_UsageGuidance();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ActivityDescriptionImpl <em>Activity Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ActivityDescriptionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getActivityDescription()
-		 * @generated
-		 */
-		EClass ACTIVITY_DESCRIPTION = eINSTANCE.getActivityDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Purpose</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY_DESCRIPTION__PURPOSE = eINSTANCE
-				.getActivityDescription_Purpose();
-
-		/**
-		 * The meta object literal for the '<em><b>Alternatives</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY_DESCRIPTION__ALTERNATIVES = eINSTANCE
-				.getActivityDescription_Alternatives();
-
-		/**
-		 * The meta object literal for the '<em><b>Howto Staff</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY_DESCRIPTION__HOWTO_STAFF = eINSTANCE
-				.getActivityDescription_HowtoStaff();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.DeliveryProcessDescriptionImpl <em>Delivery Process Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.DeliveryProcessDescriptionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDeliveryProcessDescription()
-		 * @generated
-		 */
-		EClass DELIVERY_PROCESS_DESCRIPTION = eINSTANCE
-				.getDeliveryProcessDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Scale</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERY_PROCESS_DESCRIPTION__SCALE = eINSTANCE
-				.getDeliveryProcessDescription_Scale();
-
-		/**
-		 * The meta object literal for the '<em><b>Project Characteristics</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS = eINSTANCE
-				.getDeliveryProcessDescription_ProjectCharacteristics();
-
-		/**
-		 * The meta object literal for the '<em><b>Risk Level</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL = eINSTANCE
-				.getDeliveryProcessDescription_RiskLevel();
-
-		/**
-		 * The meta object literal for the '<em><b>Estimating Technique</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE = eINSTANCE
-				.getDeliveryProcessDescription_EstimatingTechnique();
-
-		/**
-		 * The meta object literal for the '<em><b>Project Member Expertise</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE = eINSTANCE
-				.getDeliveryProcessDescription_ProjectMemberExpertise();
-
-		/**
-		 * The meta object literal for the '<em><b>Type Of Contract</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT = eINSTANCE
-				.getDeliveryProcessDescription_TypeOfContract();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ProcessDescriptionImpl <em>Process Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ProcessDescriptionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessDescription()
-		 * @generated
-		 */
-		EClass PROCESS_DESCRIPTION = eINSTANCE.getProcessDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>External Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS_DESCRIPTION__EXTERNAL_ID = eINSTANCE
-				.getProcessDescription_ExternalId();
-
-		/**
-		 * The meta object literal for the '<em><b>Scope</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS_DESCRIPTION__SCOPE = eINSTANCE
-				.getProcessDescription_Scope();
-
-		/**
-		 * The meta object literal for the '<em><b>Usage Notes</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS_DESCRIPTION__USAGE_NOTES = eINSTANCE
-				.getProcessDescription_UsageNotes();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.DescriptorDescriptionImpl <em>Descriptor Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.DescriptorDescriptionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDescriptorDescription()
-		 * @generated
-		 */
-		EClass DESCRIPTOR_DESCRIPTION = eINSTANCE.getDescriptorDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Refined Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION = eINSTANCE
-				.getDescriptorDescription_RefinedDescription();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ConceptImpl <em>Concept</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ConceptImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getConcept()
-		 * @generated
-		 */
-		EClass CONCEPT = eINSTANCE.getConcept();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ChecklistImpl <em>Checklist</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ChecklistImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getChecklist()
-		 * @generated
-		 */
-		EClass CHECKLIST = eINSTANCE.getChecklist();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ExampleImpl <em>Example</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ExampleImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getExample()
-		 * @generated
-		 */
-		EClass EXAMPLE = eINSTANCE.getExample();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.GuidelineImpl <em>Guideline</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.GuidelineImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getGuideline()
-		 * @generated
-		 */
-		EClass GUIDELINE = eINSTANCE.getGuideline();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.EstimationConsiderationsImpl <em>Estimation Considerations</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.EstimationConsiderationsImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getEstimationConsiderations()
-		 * @generated
-		 */
-		EClass ESTIMATION_CONSIDERATIONS = eINSTANCE
-				.getEstimationConsiderations();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ReportImpl <em>Report</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ReportImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getReport()
-		 * @generated
-		 */
-		EClass REPORT = eINSTANCE.getReport();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.TemplateImpl <em>Template</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.TemplateImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTemplate()
-		 * @generated
-		 */
-		EClass TEMPLATE = eINSTANCE.getTemplate();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.SupportingMaterialImpl <em>Supporting Material</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.SupportingMaterialImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getSupportingMaterial()
-		 * @generated
-		 */
-		EClass SUPPORTING_MATERIAL = eINSTANCE.getSupportingMaterial();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ToolMentorImpl <em>Tool Mentor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ToolMentorImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getToolMentor()
-		 * @generated
-		 */
-		EClass TOOL_MENTOR = eINSTANCE.getToolMentor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.WhitepaperImpl <em>Whitepaper</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.WhitepaperImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWhitepaper()
-		 * @generated
-		 */
-		EClass WHITEPAPER = eINSTANCE.getWhitepaper();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.TermDefinitionImpl <em>Term Definition</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.TermDefinitionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTermDefinition()
-		 * @generated
-		 */
-		EClass TERM_DEFINITION = eINSTANCE.getTermDefinition();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.PracticeImpl <em>Practice</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.PracticeImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPractice()
-		 * @generated
-		 */
-		EClass PRACTICE = eINSTANCE.getPractice();
-
-		/**
-		 * The meta object literal for the '<em><b>Sub Practices</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PRACTICE__SUB_PRACTICES = eINSTANCE
-				.getPractice_SubPractices();
-
-		/**
-		 * The meta object literal for the '<em><b>Content References</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PRACTICE__CONTENT_REFERENCES = eINSTANCE
-				.getPractice_ContentReferences();
-
-		/**
-		 * The meta object literal for the '<em><b>Activity References</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PRACTICE__ACTIVITY_REFERENCES = eINSTANCE
-				.getPractice_ActivityReferences();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ReusableAssetImpl <em>Reusable Asset</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ReusableAssetImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getReusableAsset()
-		 * @generated
-		 */
-		EClass REUSABLE_ASSET = eINSTANCE.getReusableAsset();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.StateImpl <em>State</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.StateImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getState()
-		 * @generated
-		 */
-		EClass STATE = eINSTANCE.getState();
-
-		/**
-		 * The meta object literal for the '<em><b>Work Product</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference STATE__WORK_PRODUCT = eINSTANCE.getState_WorkProduct();
-
-		/**
-		 * The meta object literal for the '<em><b>Region</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference STATE__REGION = eINSTANCE.getState_Region();
-
-		/**
-		 * The meta object literal for the '<em><b>Submachine</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference STATE__SUBMACHINE = eINSTANCE.getState_Submachine();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.VertexImpl <em>Vertex</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.VertexImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getVertex()
-		 * @generated
-		 */
-		EClass VERTEX = eINSTANCE.getVertex();
-
-		/**
-		 * The meta object literal for the '<em><b>Container</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference VERTEX__CONTAINER = eINSTANCE.getVertex_Container();
-
-		/**
-		 * The meta object literal for the '<em><b>Outgoing</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference VERTEX__OUTGOING = eINSTANCE.getVertex_Outgoing();
-
-		/**
-		 * The meta object literal for the '<em><b>Incoming</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference VERTEX__INCOMING = eINSTANCE.getVertex_Incoming();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.RegionImpl <em>Region</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.RegionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getRegion()
-		 * @generated
-		 */
-		EClass REGION = eINSTANCE.getRegion();
-
-		/**
-		 * The meta object literal for the '<em><b>Vertex</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference REGION__VERTEX = eINSTANCE.getRegion_Vertex();
-
-		/**
-		 * The meta object literal for the '<em><b>Transition</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference REGION__TRANSITION = eINSTANCE.getRegion_Transition();
-
-		/**
-		 * The meta object literal for the '<em><b>State</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference REGION__STATE = eINSTANCE.getRegion_State();
-
-		/**
-		 * The meta object literal for the '<em><b>State Machine</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference REGION__STATE_MACHINE = eINSTANCE.getRegion_StateMachine();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.StateMachineImpl <em>State Machine</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.StateMachineImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getStateMachine()
-		 * @generated
-		 */
-		EClass STATE_MACHINE = eINSTANCE.getStateMachine();
-
-		/**
-		 * The meta object literal for the '<em><b>Region</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference STATE_MACHINE__REGION = eINSTANCE.getStateMachine_Region();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.TransitionImpl <em>Transition</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.TransitionImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTransition()
-		 * @generated
-		 */
-		EClass TRANSITION = eINSTANCE.getTransition();
-
-		/**
-		 * The meta object literal for the '<em><b>Work Definition</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TRANSITION__WORK_DEFINITION = eINSTANCE
-				.getTransition_WorkDefinition();
-
-		/**
-		 * The meta object literal for the '<em><b>Container</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TRANSITION__CONTAINER = eINSTANCE.getTransition_Container();
-
-		/**
-		 * The meta object literal for the '<em><b>Source</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TRANSITION__SOURCE = eINSTANCE.getTransition_Source();
-
-		/**
-		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TRANSITION__TARGET = eINSTANCE.getTransition_Target();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.PseudoStateImpl <em>Pseudo State</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.PseudoStateImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPseudoState()
-		 * @generated
-		 */
-		EClass PSEUDO_STATE = eINSTANCE.getPseudoState();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.DisciplineImpl <em>Discipline</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.DisciplineImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDiscipline()
-		 * @generated
-		 */
-		EClass DISCIPLINE = eINSTANCE.getDiscipline();
-
-		/**
-		 * The meta object literal for the '<em><b>Tasks</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DISCIPLINE__TASKS = eINSTANCE.getDiscipline_Tasks();
-
-		/**
-		 * The meta object literal for the '<em><b>Subdiscipline</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DISCIPLINE__SUBDISCIPLINE = eINSTANCE
-				.getDiscipline_Subdiscipline();
-
-		/**
-		 * The meta object literal for the '<em><b>Reference Workflows</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DISCIPLINE__REFERENCE_WORKFLOWS = eINSTANCE
-				.getDiscipline_ReferenceWorkflows();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ContentCategoryImpl <em>Content Category</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ContentCategoryImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getContentCategory()
-		 * @generated
-		 */
-		EClass CONTENT_CATEGORY = eINSTANCE.getContentCategory();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.RoleSetImpl <em>Role Set</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.RoleSetImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getRoleSet()
-		 * @generated
-		 */
-		EClass ROLE_SET = eINSTANCE.getRoleSet();
-
-		/**
-		 * The meta object literal for the '<em><b>Roles</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ROLE_SET__ROLES = eINSTANCE.getRoleSet_Roles();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.DomainImpl <em>Domain</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.DomainImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDomain()
-		 * @generated
-		 */
-		EClass DOMAIN = eINSTANCE.getDomain();
-
-		/**
-		 * The meta object literal for the '<em><b>Work Products</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DOMAIN__WORK_PRODUCTS = eINSTANCE.getDomain_WorkProducts();
-
-		/**
-		 * The meta object literal for the '<em><b>Subdomains</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DOMAIN__SUBDOMAINS = eINSTANCE.getDomain_Subdomains();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.WorkProductTypeImpl <em>Work Product Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.WorkProductTypeImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkProductType()
-		 * @generated
-		 */
-		EClass WORK_PRODUCT_TYPE = eINSTANCE.getWorkProductType();
-
-		/**
-		 * The meta object literal for the '<em><b>Work Products</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORK_PRODUCT_TYPE__WORK_PRODUCTS = eINSTANCE
-				.getWorkProductType_WorkProducts();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.DisciplineGroupingImpl <em>Discipline Grouping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.DisciplineGroupingImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDisciplineGrouping()
-		 * @generated
-		 */
-		EClass DISCIPLINE_GROUPING = eINSTANCE.getDisciplineGrouping();
-
-		/**
-		 * The meta object literal for the '<em><b>Disciplines</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DISCIPLINE_GROUPING__DISCIPLINES = eINSTANCE
-				.getDisciplineGrouping_Disciplines();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ToolImpl <em>Tool</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ToolImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getTool()
-		 * @generated
-		 */
-		EClass TOOL = eINSTANCE.getTool();
-
-		/**
-		 * The meta object literal for the '<em><b>Tool Mentors</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TOOL__TOOL_MENTORS = eINSTANCE.getTool_ToolMentors();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.RoleSetGroupingImpl <em>Role Set Grouping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.RoleSetGroupingImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getRoleSetGrouping()
-		 * @generated
-		 */
-		EClass ROLE_SET_GROUPING = eINSTANCE.getRoleSetGrouping();
-
-		/**
-		 * The meta object literal for the '<em><b>Role Sets</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ROLE_SET_GROUPING__ROLE_SETS = eINSTANCE
-				.getRoleSetGrouping_RoleSets();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.CustomCategoryImpl <em>Custom Category</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.CustomCategoryImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getCustomCategory()
-		 * @generated
-		 */
-		EClass CUSTOM_CATEGORY = eINSTANCE.getCustomCategory();
-
-		/**
-		 * The meta object literal for the '<em><b>Categorized Elements</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CUSTOM_CATEGORY__CATEGORIZED_ELEMENTS = eINSTANCE
-				.getCustomCategory_CategorizedElements();
-
-		/**
-		 * The meta object literal for the '<em><b>Sub Categories</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CUSTOM_CATEGORY__SUB_CATEGORIES = eINSTANCE
-				.getCustomCategory_SubCategories();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.DeliveryProcessImpl <em>Delivery Process</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.DeliveryProcessImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDeliveryProcess()
-		 * @generated
-		 */
-		EClass DELIVERY_PROCESS = eINSTANCE.getDeliveryProcess();
-
-		/**
-		 * The meta object literal for the '<em><b>Education Materials</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DELIVERY_PROCESS__EDUCATION_MATERIALS = eINSTANCE
-				.getDeliveryProcess_EducationMaterials();
-
-		/**
-		 * The meta object literal for the '<em><b>Communications Materials</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DELIVERY_PROCESS__COMMUNICATIONS_MATERIALS = eINSTANCE
-				.getDeliveryProcess_CommunicationsMaterials();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ProcessImpl <em>Process</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ProcessImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcess()
-		 * @generated
-		 */
-		EClass PROCESS = eINSTANCE.getProcess();
-
-		/**
-		 * The meta object literal for the '<em><b>Includes Patterns</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS__INCLUDES_PATTERNS = eINSTANCE
-				.getProcess_IncludesPatterns();
-
-		/**
-		 * The meta object literal for the '<em><b>Default Context</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS__DEFAULT_CONTEXT = eINSTANCE
-				.getProcess_DefaultContext();
-
-		/**
-		 * The meta object literal for the '<em><b>Valid Context</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS__VALID_CONTEXT = eINSTANCE.getProcess_ValidContext();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.CapabilityPatternImpl <em>Capability Pattern</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.CapabilityPatternImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getCapabilityPattern()
-		 * @generated
-		 */
-		EClass CAPABILITY_PATTERN = eINSTANCE.getCapabilityPattern();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ProcessPlanningTemplateImpl <em>Process Planning Template</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ProcessPlanningTemplateImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessPlanningTemplate()
-		 * @generated
-		 */
-		EClass PROCESS_PLANNING_TEMPLATE = eINSTANCE
-				.getProcessPlanningTemplate();
-
-		/**
-		 * The meta object literal for the '<em><b>Based On Processes</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS_PLANNING_TEMPLATE__BASED_ON_PROCESSES = eINSTANCE
-				.getProcessPlanningTemplate_BasedOnProcesses();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.RoadmapImpl <em>Roadmap</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.RoadmapImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getRoadmap()
-		 * @generated
-		 */
-		EClass ROADMAP = eINSTANCE.getRoadmap();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ProcessComponentImpl <em>Process Component</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ProcessComponentImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessComponent()
-		 * @generated
-		 */
-		EClass PROCESS_COMPONENT = eINSTANCE.getProcessComponent();
-
-		/**
-		 * The meta object literal for the '<em><b>Interfaces</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS_COMPONENT__INTERFACES = eINSTANCE
-				.getProcessComponent_Interfaces();
-
-		/**
-		 * The meta object literal for the '<em><b>Process</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS_COMPONENT__PROCESS = eINSTANCE
-				.getProcessComponent_Process();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ProcessPackageImpl <em>Process Package</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ProcessPackageImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessPackage()
-		 * @generated
-		 */
-		EClass PROCESS_PACKAGE = eINSTANCE.getProcessPackage();
-
-		/**
-		 * The meta object literal for the '<em><b>Process Elements</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS_PACKAGE__PROCESS_ELEMENTS = eINSTANCE
-				.getProcessPackage_ProcessElements();
-
-		/**
-		 * The meta object literal for the '<em><b>Diagrams</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS_PACKAGE__DIAGRAMS = eINSTANCE
-				.getProcessPackage_Diagrams();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ProcessComponentInterfaceImpl <em>Process Component Interface</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ProcessComponentInterfaceImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessComponentInterface()
-		 * @generated
-		 */
-		EClass PROCESS_COMPONENT_INTERFACE = eINSTANCE
-				.getProcessComponentInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Interface Specifications</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATIONS = eINSTANCE
-				.getProcessComponentInterface_InterfaceSpecifications();
-
-		/**
-		 * The meta object literal for the '<em><b>Interface IO</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS_COMPONENT_INTERFACE__INTERFACE_IO = eINSTANCE
-				.getProcessComponentInterface_InterfaceIO();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ProcessComponentDescriptorImpl <em>Process Component Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ProcessComponentDescriptorImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessComponentDescriptor()
-		 * @generated
-		 */
-		EClass PROCESS_COMPONENT_DESCRIPTOR = eINSTANCE
-				.getProcessComponentDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Process Component</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS_COMPONENT_DESCRIPTOR__PROCESS_COMPONENT = eINSTANCE
-				.getProcessComponentDescriptor_ProcessComponent();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.MethodPluginImpl <em>Method Plugin</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.MethodPluginImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMethodPlugin()
-		 * @generated
-		 */
-		EClass METHOD_PLUGIN = eINSTANCE.getMethodPlugin();
-
-		/**
-		 * The meta object literal for the '<em><b>User Changeable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PLUGIN__USER_CHANGEABLE = eINSTANCE
-				.getMethodPlugin_UserChangeable();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Packages</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PLUGIN__METHOD_PACKAGES = eINSTANCE
-				.getMethodPlugin_MethodPackages();
-
-		/**
-		 * The meta object literal for the '<em><b>Bases</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PLUGIN__BASES = eINSTANCE.getMethodPlugin_Bases();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.VariabilityElementImpl <em>Variability Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.VariabilityElementImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getVariabilityElement()
-		 * @generated
-		 */
-		EClass VARIABILITY_ELEMENT = eINSTANCE.getVariabilityElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Variability Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VARIABILITY_ELEMENT__VARIABILITY_TYPE = eINSTANCE
-				.getVariabilityElement_VariabilityType();
-
-		/**
-		 * The meta object literal for the '<em><b>Variability Based On Element</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT = eINSTANCE
-				.getVariabilityElement_VariabilityBasedOnElement();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.MethodUnitImpl <em>Method Unit</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.MethodUnitImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMethodUnit()
-		 * @generated
-		 */
-		EClass METHOD_UNIT = eINSTANCE.getMethodUnit();
-
-		/**
-		 * The meta object literal for the '<em><b>Authors</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_UNIT__AUTHORS = eINSTANCE.getMethodUnit_Authors();
-
-		/**
-		 * The meta object literal for the '<em><b>Change Date</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_UNIT__CHANGE_DATE = eINSTANCE
-				.getMethodUnit_ChangeDate();
-
-		/**
-		 * The meta object literal for the '<em><b>Change Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_UNIT__CHANGE_DESCRIPTION = eINSTANCE
-				.getMethodUnit_ChangeDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_UNIT__VERSION = eINSTANCE.getMethodUnit_Version();
-
-		/**
-		 * The meta object literal for the '<em><b>Copyright Statement</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_UNIT__COPYRIGHT_STATEMENT = eINSTANCE
-				.getMethodUnit_CopyrightStatement();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.MethodConfigurationImpl <em>Method Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.MethodConfigurationImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMethodConfiguration()
-		 * @generated
-		 */
-		EClass METHOD_CONFIGURATION = eINSTANCE.getMethodConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Plugin Selection</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION = eINSTANCE
-				.getMethodConfiguration_MethodPluginSelection();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Package Selection</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION = eINSTANCE
-				.getMethodConfiguration_MethodPackageSelection();
-
-		/**
-		 * The meta object literal for the '<em><b>Process Views</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_CONFIGURATION__PROCESS_VIEWS = eINSTANCE
-				.getMethodConfiguration_ProcessViews();
-
-		/**
-		 * The meta object literal for the '<em><b>Default View</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_CONFIGURATION__DEFAULT_VIEW = eINSTANCE
-				.getMethodConfiguration_DefaultView();
-
-		/**
-		 * The meta object literal for the '<em><b>Base Configurations</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_CONFIGURATION__BASE_CONFIGURATIONS = eINSTANCE
-				.getMethodConfiguration_BaseConfigurations();
-
-		/**
-		 * The meta object literal for the '<em><b>Subtracted Category</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_CONFIGURATION__SUBTRACTED_CATEGORY = eINSTANCE
-				.getMethodConfiguration_SubtractedCategory();
-
-		/**
-		 * The meta object literal for the '<em><b>Added Category</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_CONFIGURATION__ADDED_CATEGORY = eINSTANCE
-				.getMethodConfiguration_AddedCategory();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.ProcessFamilyImpl <em>Process Family</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.ProcessFamilyImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getProcessFamily()
-		 * @generated
-		 */
-		EClass PROCESS_FAMILY = eINSTANCE.getProcessFamily();
-
-		/**
-		 * The meta object literal for the '<em><b>Delivery Processes</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS_FAMILY__DELIVERY_PROCESSES = eINSTANCE
-				.getProcessFamily_DeliveryProcesses();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.impl.MethodLibraryImpl <em>Method Library</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.MethodLibraryImpl
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getMethodLibrary()
-		 * @generated
-		 */
-		EClass METHOD_LIBRARY = eINSTANCE.getMethodLibrary();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Plugins</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_LIBRARY__METHOD_PLUGINS = eINSTANCE
-				.getMethodLibrary_MethodPlugins();
-
-		/**
-		 * The meta object literal for the '<em><b>Predefined Configurations</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_LIBRARY__PREDEFINED_CONFIGURATIONS = eINSTANCE
-				.getMethodLibrary_PredefinedConfigurations();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.WorkOrderType <em>Work Order Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.WorkOrderType
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getWorkOrderType()
-		 * @generated
-		 */
-		EEnum WORK_ORDER_TYPE = eINSTANCE.getWorkOrderType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.PseudoStateKind <em>Pseudo State Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.PseudoStateKind
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getPseudoStateKind()
-		 * @generated
-		 */
-		EEnum PSEUDO_STATE_KIND = eINSTANCE.getPseudoStateKind();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.uma.VariabilityType <em>Variability Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.VariabilityType
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getVariabilityType()
-		 * @generated
-		 */
-		EEnum VARIABILITY_TYPE = eINSTANCE.getVariabilityType();
-
-		/**
-		 * The meta object literal for the '<em>Date</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.util.Date
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getDate()
-		 * @generated
-		 */
-		EDataType DATE = eINSTANCE.getDate();
-
-		/**
-		 * The meta object literal for the '<em>Uri</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.net.URI
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getUri()
-		 * @generated
-		 */
-		EDataType URI = eINSTANCE.getUri();
-
-		/**
-		 * The meta object literal for the '<em>Unlimited Natural</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getUnlimitedNatural()
-		 * @generated
-		 */
-		EDataType UNLIMITED_NATURAL = eINSTANCE.getUnlimitedNatural();
-
-		/**
-		 * The meta object literal for the '<em>String</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getString()
-		 * @generated
-		 */
-		EDataType STRING = eINSTANCE.getString();
-
-		/**
-		 * The meta object literal for the '<em>Set</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.util.Set
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getSet()
-		 * @generated
-		 */
-		EDataType SET = eINSTANCE.getSet();
-
-		/**
-		 * The meta object literal for the '<em>Sequence</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.util.List
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getSequence()
-		 * @generated
-		 */
-		EDataType SEQUENCE = eINSTANCE.getSequence();
-
-		/**
-		 * The meta object literal for the '<em>Integer</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getInteger()
-		 * @generated
-		 */
-		EDataType INTEGER = eINSTANCE.getInteger();
-
-		/**
-		 * The meta object literal for the '<em>Float</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.Float
-		 * @see org.eclipse.epf.uma.impl.UmaPackageImpl#getFloat()
-		 * @generated
-		 */
-		EDataType FLOAT = eINSTANCE.getFloat();
-
-	}
-
-} //UmaPackage
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/VariabilityElement.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/VariabilityElement.java
deleted file mode 100755
index 3edda93..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/VariabilityElement.java
+++ /dev/null
@@ -1,93 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Variability Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Variability Element is an abstract class derived from Method Element that provides new capabilities for content variation and extension to Content Elements or any other Method Element that derives from it.  It has been placed in-between the classes Method Element and Content Element in the overall UMA taxonomy of classes using the UML 2.0 package merge mechanism.  The association Variability Specialization shall only be instantiated between two subclasses of Variability Element of the same type.  The element on varaibilitySpecialElement side of the relationship defines a value for the attribute variabilityType defining the nature of the relationship using a literal from the enumeration Variability Type.
- * Variability Element of the meta-model package Method Plugins adds the capabilities of variation and extension to Method Elements that derive from it.  By default all Content Elements such as Role, Task, Guidance Types, or Activities are defined to be Variability Elements.
- * Variability and extension provides unique mechanisms for customizing method content without actually directly modifying the original content, but by just be able to describe with separate objects the differences (additions, changes, omissions) relative to the original.  This plug-in concept allows users to factor their method content and processes in interrelated units and even to architect method content and processes in layers that extend each other with new capabilities.  The resulting method and process design can be dynamically combined and applied on demand using the interpretation rules defined for Variability Element Specializations assembling to process practitioners the most accurate method and process descriptions possible.  It also allows process practitioners to extends and tailor method content and processes they do not own and to easily upgrade to newer versions by simply reapply their personal changes to these upgrades.
- * Variability Element defines two types of variability and one type of extension which are formally defined for the enumeration Variability Type.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.VariabilityElement#getVariabilityType <em>Variability Type</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.VariabilityElement#getVariabilityBasedOnElement <em>Variability Based On Element</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getVariabilityElement()
- * @model abstract="true"
- * @generated
- */
-public interface VariabilityElement extends MethodElement {
-	/**
-	 * Returns the value of the '<em><b>Variability Type</b></em>' attribute.
-	 * The default value is <code>"na"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.epf.uma.VariabilityType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If in instance of the variabilitySpecialization association between two Variability Elements of the same type exists, then the variabilityType attribute specifies how the element at the variabilitySpecialElement end of the association changes the Content Element at the variabilityBasedOnElement end. See the Variability Type enumeration class for definitions for the different types of variability.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Variability Type</em>' attribute.
-	 * @see org.eclipse.epf.uma.VariabilityType
-	 * @see #setVariabilityType(VariabilityType)
-	 * @see org.eclipse.epf.uma.UmaPackage#getVariabilityElement_VariabilityType()
-	 * @model default="na" unique="false"
-	 * @generated
-	 */
-	VariabilityType getVariabilityType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.VariabilityElement#getVariabilityType <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Variability Type</em>' attribute.
-	 * @see org.eclipse.epf.uma.VariabilityType
-	 * @see #getVariabilityType()
-	 * @generated
-	 */
-	void setVariabilityType(VariabilityType value);
-
-	/**
-	 * Returns the value of the '<em><b>Variability Based On Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Variability Based On Element</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Variability Based On Element</em>' reference.
-	 * @see #setVariabilityBasedOnElement(VariabilityElement)
-	 * @see org.eclipse.epf.uma.UmaPackage#getVariabilityElement_VariabilityBasedOnElement()
-	 * @model
-	 * @generated
-	 */
-	VariabilityElement getVariabilityBasedOnElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.VariabilityElement#getVariabilityBasedOnElement <em>Variability Based On Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Variability Based On Element</em>' reference.
-	 * @see #getVariabilityBasedOnElement()
-	 * @generated
-	 */
-	void setVariabilityBasedOnElement(VariabilityElement value);
-
-} // VariabilityElement
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/VariabilityType.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/VariabilityType.java
deleted file mode 100755
index f9a04c9..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/VariabilityType.java
+++ /dev/null
@@ -1,302 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Variability Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Variability Type is an Enumeration used for values for instances of Variability Element's attribute variabilityType.  It defines the nature of how a Variability Element extends another Variability Element. See enumeration literals for definitions for each type.
- * <!-- end-model-doc -->
- * @see org.eclipse.epf.uma.UmaPackage#getVariabilityType()
- * @model
- * @generated
- */
-public final class VariabilityType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Na</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Na</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NA_LITERAL
-	 * @model name="na"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NA = 0;
-
-	/**
-	 * The '<em><b>Contributes</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Contributes</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONTRIBUTES_LITERAL
-	 * @model name="contributes"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CONTRIBUTES = 1;
-
-	/**
-	 * The '<em><b>Extends</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Extends</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EXTENDS_LITERAL
-	 * @model name="extends"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EXTENDS = 2;
-
-	/**
-	 * The '<em><b>Replaces</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Replaces</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REPLACES_LITERAL
-	 * @model name="replaces"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REPLACES = 3;
-
-	/**
-	 * The '<em><b>Local Contribution</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Local Contribution</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_CONTRIBUTION_LITERAL
-	 * @model name="localContribution"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOCAL_CONTRIBUTION = 4;
-
-	/**
-	 * The '<em><b>Local Replacement</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Local Replacement</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_REPLACEMENT_LITERAL
-	 * @model name="localReplacement"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOCAL_REPLACEMENT = 5;
-
-	/**
-	 * The '<em><b>Extends Replaces</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Extends Replaces</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EXTENDS_REPLACES_LITERAL
-	 * @model name="extendsReplaces"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EXTENDS_REPLACES = 6;
-
-	/**
-	 * The '<em><b>Na</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NA
-	 * @generated
-	 * @ordered
-	 */
-	public static final VariabilityType NA_LITERAL = new VariabilityType(NA,
-			"na", "na");
-
-	/**
-	 * The '<em><b>Contributes</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CONTRIBUTES
-	 * @generated
-	 * @ordered
-	 */
-	public static final VariabilityType CONTRIBUTES_LITERAL = new VariabilityType(
-			CONTRIBUTES, "contributes", "contributes");
-
-	/**
-	 * The '<em><b>Extends</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EXTENDS
-	 * @generated
-	 * @ordered
-	 */
-	public static final VariabilityType EXTENDS_LITERAL = new VariabilityType(
-			EXTENDS, "extends", "extends");
-
-	/**
-	 * The '<em><b>Replaces</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REPLACES
-	 * @generated
-	 * @ordered
-	 */
-	public static final VariabilityType REPLACES_LITERAL = new VariabilityType(
-			REPLACES, "replaces", "replaces");
-
-	/**
-	 * The '<em><b>Local Contribution</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_CONTRIBUTION
-	 * @generated
-	 * @ordered
-	 */
-	public static final VariabilityType LOCAL_CONTRIBUTION_LITERAL = new VariabilityType(
-			LOCAL_CONTRIBUTION, "localContribution", "localContribution"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Local Replacement</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_REPLACEMENT
-	 * @generated
-	 * @ordered
-	 */
-	public static final VariabilityType LOCAL_REPLACEMENT_LITERAL = new VariabilityType(
-			LOCAL_REPLACEMENT, "localReplacement", "localReplacement"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Extends Replaces</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EXTENDS_REPLACES
-	 * @generated
-	 * @ordered
-	 */
-	public static final VariabilityType EXTENDS_REPLACES_LITERAL = new VariabilityType(
-			EXTENDS_REPLACES, "extendsReplaces", "extendsReplaces"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Variability Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final VariabilityType[] VALUES_ARRAY = new VariabilityType[] {
-			NA_LITERAL, CONTRIBUTES_LITERAL, EXTENDS_LITERAL, REPLACES_LITERAL,
-			LOCAL_CONTRIBUTION_LITERAL, LOCAL_REPLACEMENT_LITERAL,
-			EXTENDS_REPLACES_LITERAL, };
-
-	/**
-	 * A public read-only list of all the '<em><b>Variability Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays
-			.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Variability Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static VariabilityType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			VariabilityType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Variability Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static VariabilityType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			VariabilityType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Variability Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static VariabilityType get(int value) {
-		switch (value) {
-		case NA:
-			return NA_LITERAL;
-		case CONTRIBUTES:
-			return CONTRIBUTES_LITERAL;
-		case EXTENDS:
-			return EXTENDS_LITERAL;
-		case REPLACES:
-			return REPLACES_LITERAL;
-		case LOCAL_CONTRIBUTION:
-			return LOCAL_CONTRIBUTION_LITERAL;
-		case LOCAL_REPLACEMENT:
-			return LOCAL_REPLACEMENT_LITERAL;
-		case EXTENDS_REPLACES:
-			return EXTENDS_REPLACES_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private VariabilityType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //VariabilityType
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Vertex.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Vertex.java
deleted file mode 100755
index 6cb2b57..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Vertex.java
+++ /dev/null
@@ -1,101 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-import org.eclipse.epf.uma.ecore.IModelObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Vertex</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.Vertex#getContainer_ <em>Container</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Vertex#getOutgoing <em>Outgoing</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.Vertex#getIncoming <em>Incoming</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getVertex()
- * @model
- * @extends IModelObject
- * @generated
- */
-public interface Vertex extends IModelObject {
-	/**
-	 * Returns the value of the '<em><b>Container</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Region#getVertex <em>Vertex</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Container</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Container</em>' container reference.
-	 * @see #setContainer(Region)
-	 * @see org.eclipse.epf.uma.UmaPackage#getVertex_Container()
-	 * @see org.eclipse.epf.uma.Region#getVertex
-	 * @model opposite="Vertex"
-	 * @generated
-	 */
-	Region getContainer_();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.Vertex#getContainer_ <em>Container</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Container</em>' container reference.
-	 * @see #getContainer_()
-	 * @generated
-	 */
-	void setContainer(Region value);
-
-	/**
-	 * Returns the value of the '<em><b>Outgoing</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Transition}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Transition#getSource <em>Source</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Outgoing</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Outgoing</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getVertex_Outgoing()
-	 * @see org.eclipse.epf.uma.Transition#getSource
-	 * @model type="org.eclipse.epf.uma.Transition" opposite="source" ordered="false"
-	 * @generated
-	 */
-	List getOutgoing();
-
-	/**
-	 * Returns the value of the '<em><b>Incoming</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Transition}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.Transition#getTarget <em>Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Incoming</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Incoming</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getVertex_Incoming()
-	 * @see org.eclipse.epf.uma.Transition#getTarget
-	 * @model type="org.eclipse.epf.uma.Transition" opposite="target" ordered="false"
-	 * @generated
-	 */
-	List getIncoming();
-
-} // Vertex
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Whitepaper.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Whitepaper.java
deleted file mode 100755
index b1e6d28..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/Whitepaper.java
+++ /dev/null
@@ -1,28 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Whitepaper</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Whitepapers are a special Concept guidance that have been externally reviewed or published and can be read and understood in isolation of other content elements and guidance.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.uma.UmaPackage#getWhitepaper()
- * @model
- * @generated
- */
-public interface Whitepaper extends Concept {
-} // Whitepaper
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkBreakdownElement.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkBreakdownElement.java
deleted file mode 100755
index fd1a998..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkBreakdownElement.java
+++ /dev/null
@@ -1,135 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Work Breakdown Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Work Breakdown Element is a special Breakdown Element that provides specific properties for Breakdown Elements that represent or refer to Work Definitions.  For example its subclass Activity defines work as it is also a subclass of Work Definition.  Its subclass Task Descriptor does not define work by itself, but refers to a Work Definition and therefore can have the same common properties and Work Breakdown Element has.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.WorkBreakdownElement#getIsRepeatable <em>Is Repeatable</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkBreakdownElement#getIsOngoing <em>Is Ongoing</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkBreakdownElement#getIsEventDriven <em>Is Event Driven</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkBreakdownElement#getLinkToPredecessor <em>Link To Predecessor</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getWorkBreakdownElement()
- * @model abstract="true"
- * @generated
- */
-public interface WorkBreakdownElement extends BreakdownElement {
-	/**
-	 * Returns the value of the '<em><b>Is Repeatable</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This attribute is used to define repetition of work, e.g. iterations.  A Process Work Definition with this attribute set to True shall be repeated more than once on the same set of artifacts.  For example, for an instance of Iteration (defined as a special Process Work Definition below) this attribute is set to True by default indicating that every sub-Activity will be repeated more than once.  However, any Process Work Definition can set this attribute to True to define iterations (e.g. to iterate one Activity consisting of many sub-activities or even Phases, but to iterate just one Task).
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Repeatable</em>' attribute.
-	 * @see #setIsRepeatable(Boolean)
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkBreakdownElement_IsRepeatable()
-	 * @model default="false"
-	 * @generated
-	 */
-	Boolean getIsRepeatable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.WorkBreakdownElement#getIsRepeatable <em>Is Repeatable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Repeatable</em>' attribute.
-	 * @see #getIsRepeatable()
-	 * @generated
-	 */
-	void setIsRepeatable(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Is Ongoing</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If the isOngoing attribute is set to True for a Process Work Definition instance, then the element describes an ongoing piece of work without a fixed duration or end state.  For example, the Process Work Definition could represent work of an administrator continuously (e.g. 3h a day) working to ensure that systems are kept in a certain state.  Another example would be program management work overseeing many different projects being scheduled for one particular project at specific reoccurring intervals during the whole lifecycle of the project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Ongoing</em>' attribute.
-	 * @see #setIsOngoing(Boolean)
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkBreakdownElement_IsOngoing()
-	 * @model default="false"
-	 * @generated
-	 */
-	Boolean getIsOngoing();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.WorkBreakdownElement#getIsOngoing <em>Is Ongoing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Ongoing</em>' attribute.
-	 * @see #getIsOngoing()
-	 * @generated
-	 */
-	void setIsOngoing(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Is Event Driven</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The isEventDriven attribute indicates that the Process Work Definition describes an instance of work which is not started because it has been scheduled to start at a certain point of time, because preceding work is being completed, or input work products are available, but because another specific event has occurred.  Examples for such events are exceptions or problem situations which require specific work to be performed as a result.  Also change management work can be modeled as event driven work analyzing a change request or defect and allocating work dynamically to resources to deal with it following the work described with such Process Work Definition.  The events themselves are not modeled in this version of the specification.  They shall be described as part of the normal descriptions fields available.
-	 * 
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Event Driven</em>' attribute.
-	 * @see #setIsEventDriven(Boolean)
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkBreakdownElement_IsEventDriven()
-	 * @model default="false"
-	 * @generated
-	 */
-	Boolean getIsEventDriven();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.WorkBreakdownElement#getIsEventDriven <em>Is Event Driven</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Event Driven</em>' attribute.
-	 * @see #getIsEventDriven()
-	 * @generated
-	 */
-	void setIsEventDriven(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Link To Predecessor</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkOrder}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Link To Predecessor</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Link To Predecessor</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkBreakdownElement_LinkToPredecessor()
-	 * @model type="org.eclipse.epf.uma.WorkOrder" ordered="false"
-	 * @generated
-	 */
-	List getLinkToPredecessor();
-
-} // WorkBreakdownElement
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkDefinition.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkDefinition.java
deleted file mode 100755
index bcb9871..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkDefinition.java
+++ /dev/null
@@ -1,88 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Work Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Work Definition is an abstract Method Element that generalizes all descriptions of work within the Unified Method Architecture.  This package introduces two concrete types of Work Definitions: Task and Step.  Work Definitions can contain sets of pre- and post-conditions defining constraints that need to be valid before the described work can begin or before it can be declared as finished.  Note that general ownedRules can be used to define additional constraints and rules for Work Definitions.
- * Work Definitions represent behavioral descriptions for doing work.  These behavioral descriptions are not bound to one specific classifier, but represent an arbitrary definition of work.  For example, a Work Definition could represent work that is being performed by a specific Role (e.g. a Role performing a specific Task or Steps of a Task), by many Roles working in close collaboration (many Roles all working together on the same interdisciplinary Task), or complex work that is performed throughout the lifecycle (e.g. a process defining a breakdown structure for organizing larger composite units of work performed by many Roles working in collaboration).
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.WorkDefinition#getPrecondition <em>Precondition</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkDefinition#getPostcondition <em>Postcondition</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getWorkDefinition()
- * @model abstract="true"
- * @generated
- */
-public interface WorkDefinition extends MethodElement {
-	/**
-	 * Returns the value of the '<em><b>Precondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Precondition</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Precondition</em>' containment reference.
-	 * @see #setPrecondition(Constraint)
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkDefinition_Precondition()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	Constraint getPrecondition();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.WorkDefinition#getPrecondition <em>Precondition</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Precondition</em>' containment reference.
-	 * @see #getPrecondition()
-	 * @generated
-	 */
-	void setPrecondition(Constraint value);
-
-	/**
-	 * Returns the value of the '<em><b>Postcondition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Postcondition</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Postcondition</em>' containment reference.
-	 * @see #setPostcondition(Constraint)
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkDefinition_Postcondition()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	Constraint getPostcondition();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.WorkDefinition#getPostcondition <em>Postcondition</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Postcondition</em>' containment reference.
-	 * @see #getPostcondition()
-	 * @generated
-	 */
-	void setPostcondition(Constraint value);
-
-} // WorkDefinition
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkOrder.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkOrder.java
deleted file mode 100755
index 12b9ac6..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkOrder.java
+++ /dev/null
@@ -1,92 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Work Order</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Work Order is a Method Element that represents a relationship between two Breakdown Elements in which one Breakdown Elements depends on the start or finish of another Breakdown Elements in order to begin or end.  
- * (Note, Work Order is not modeled as an Association Class to provide a straightforward mapping  to XMI and EMF.)
- * The Work Order class defines predecessor and successor relations amongst Breakdown Elements.  This information is in particular critical for planning applications.  See more details on different types of Work Order relationships at Work Order Type.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.WorkOrder#getLinkType <em>Link Type</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkOrder#getPred <em>Pred</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getWorkOrder()
- * @model
- * @generated
- */
-public interface WorkOrder extends ProcessElement {
-	/**
-	 * Returns the value of the '<em><b>Link Type</b></em>' attribute.
-	 * The default value is <code>"finishToStart"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.epf.uma.WorkOrderType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This attribute expresses the type of the Work Order relationship by assigning a value from the Work Order Type enumeration.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Link Type</em>' attribute.
-	 * @see org.eclipse.epf.uma.WorkOrderType
-	 * @see #setLinkType(WorkOrderType)
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkOrder_LinkType()
-	 * @model default="finishToStart" unique="false"
-	 * @generated
-	 */
-	WorkOrderType getLinkType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.WorkOrder#getLinkType <em>Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Link Type</em>' attribute.
-	 * @see org.eclipse.epf.uma.WorkOrderType
-	 * @see #getLinkType()
-	 * @generated
-	 */
-	void setLinkType(WorkOrderType value);
-
-	/**
-	 * Returns the value of the '<em><b>Pred</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pred</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pred</em>' reference.
-	 * @see #setPred(WorkBreakdownElement)
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkOrder_Pred()
-	 * @model required="true"
-	 * @generated
-	 */
-	WorkBreakdownElement getPred();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.WorkOrder#getPred <em>Pred</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pred</em>' reference.
-	 * @see #getPred()
-	 * @generated
-	 */
-	void setPred(WorkBreakdownElement value);
-
-} // WorkOrder
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkOrderType.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkOrderType.java
deleted file mode 100755
index 141d392..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkOrderType.java
+++ /dev/null
@@ -1,217 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Work Order Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Work Order represents a relationship between two Breakdown Element in which one Breakdown Element (referred to as (B) below) depends on the start or finish of another Breakdown Element (referred to as (A) below) in order to begin or end. This enumeration defines the different types of Work Order relationships available in UMA and is used to provide values for Work Order's linkType attribute.
- * <!-- end-model-doc -->
- * @see org.eclipse.epf.uma.UmaPackage#getWorkOrderType()
- * @model
- * @generated
- */
-public final class WorkOrderType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Finish To Start</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Finish To Start</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FINISH_TO_START_LITERAL
-	 * @model name="finishToStart"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FINISH_TO_START = 0;
-
-	/**
-	 * The '<em><b>Finish To Finish</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Finish To Finish</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FINISH_TO_FINISH_LITERAL
-	 * @model name="finishToFinish"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FINISH_TO_FINISH = 1;
-
-	/**
-	 * The '<em><b>Start To Start</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Start To Start</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #START_TO_START_LITERAL
-	 * @model name="startToStart"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int START_TO_START = 2;
-
-	/**
-	 * The '<em><b>Start To Finish</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Start To Finish</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #START_TO_FINISH_LITERAL
-	 * @model name="startToFinish"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int START_TO_FINISH = 3;
-
-	/**
-	 * The '<em><b>Finish To Start</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FINISH_TO_START
-	 * @generated
-	 * @ordered
-	 */
-	public static final WorkOrderType FINISH_TO_START_LITERAL = new WorkOrderType(
-			FINISH_TO_START, "finishToStart", "finishToStart");
-
-	/**
-	 * The '<em><b>Finish To Finish</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FINISH_TO_FINISH
-	 * @generated
-	 * @ordered
-	 */
-	public static final WorkOrderType FINISH_TO_FINISH_LITERAL = new WorkOrderType(
-			FINISH_TO_FINISH, "finishToFinish", "finishToFinish");
-
-	/**
-	 * The '<em><b>Start To Start</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #START_TO_START
-	 * @generated
-	 * @ordered
-	 */
-	public static final WorkOrderType START_TO_START_LITERAL = new WorkOrderType(
-			START_TO_START, "startToStart", "startToStart");
-
-	/**
-	 * The '<em><b>Start To Finish</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #START_TO_FINISH
-	 * @generated
-	 * @ordered
-	 */
-	public static final WorkOrderType START_TO_FINISH_LITERAL = new WorkOrderType(
-			START_TO_FINISH, "startToFinish", "startToFinish");
-
-	/**
-	 * An array of all the '<em><b>Work Order Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final WorkOrderType[] VALUES_ARRAY = new WorkOrderType[] {
-			FINISH_TO_START_LITERAL, FINISH_TO_FINISH_LITERAL,
-			START_TO_START_LITERAL, START_TO_FINISH_LITERAL, };
-
-	/**
-	 * A public read-only list of all the '<em><b>Work Order Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays
-			.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Work Order Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static WorkOrderType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			WorkOrderType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Work Order Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static WorkOrderType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			WorkOrderType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Work Order Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static WorkOrderType get(int value) {
-		switch (value) {
-		case FINISH_TO_START:
-			return FINISH_TO_START_LITERAL;
-		case FINISH_TO_FINISH:
-			return FINISH_TO_FINISH_LITERAL;
-		case START_TO_START:
-			return START_TO_START_LITERAL;
-		case START_TO_FINISH:
-			return START_TO_FINISH_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private WorkOrderType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //WorkOrderType
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkProduct.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkProduct.java
deleted file mode 100755
index 18683a9..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkProduct.java
+++ /dev/null
@@ -1,104 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Work Product</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Work Product is an abstract class which provides a generalization for the content element types Artifact, Outcome, and Deliverable.  The meta-model class Work Product actually represents work product types, i.e. an instance of Work Product is a description of a specific type of work product and not an individual work product instance.  However, for simplicity reasons and because of low risk of misinterpretation we did not append the word 'type' to every meta-class.
- * A work product is an abstraction for descriptions of content elements that are used to define anything used, produced, or modified by a task.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.WorkProduct#getReports <em>Reports</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkProduct#getTemplates <em>Templates</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkProduct#getToolMentors <em>Tool Mentors</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkProduct#getEstimationConsiderations <em>Estimation Considerations</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getWorkProduct()
- * @model abstract="true"
- * @generated
- */
-public interface WorkProduct extends ContentElement {
-	/**
-	 * Returns the value of the '<em><b>Reports</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Report}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Reports</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Reports</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkProduct_Reports()
-	 * @model type="org.eclipse.epf.uma.Report" ordered="false"
-	 * @generated
-	 */
-	List getReports();
-
-	/**
-	 * Returns the value of the '<em><b>Templates</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.Template}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Templates</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Templates</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkProduct_Templates()
-	 * @model type="org.eclipse.epf.uma.Template" ordered="false"
-	 * @generated
-	 */
-	List getTemplates();
-
-	/**
-	 * Returns the value of the '<em><b>Tool Mentors</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.ToolMentor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tool Mentors</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tool Mentors</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkProduct_ToolMentors()
-	 * @model type="org.eclipse.epf.uma.ToolMentor" ordered="false"
-	 * @generated
-	 */
-	List getToolMentors();
-
-	/**
-	 * Returns the value of the '<em><b>Estimation Considerations</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.EstimationConsiderations}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Estimation Considerations</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Estimation Considerations</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkProduct_EstimationConsiderations()
-	 * @model type="org.eclipse.epf.uma.EstimationConsiderations" ordered="false"
-	 * @generated
-	 */
-	List getEstimationConsiderations();
-
-} // WorkProduct
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkProductDescription.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkProductDescription.java
deleted file mode 100755
index 932251a..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkProductDescription.java
+++ /dev/null
@@ -1,137 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Work Product Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.WorkProductDescription#getExternalId <em>External Id</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkProductDescription#getPurpose <em>Purpose</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkProductDescription#getImpactOfNotHaving <em>Impact Of Not Having</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkProductDescription#getReasonsForNotNeeding <em>Reasons For Not Needing</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getWorkProductDescription()
- * @model
- * @generated
- */
-public interface WorkProductDescription extends ContentDescription {
-	/**
-	 * Returns the value of the '<em><b>External Id</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * An external visible number that is used to reference this artifact. Used like a synonym.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>External Id</em>' attribute.
-	 * @see #setExternalId(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkProductDescription_ExternalId()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getExternalId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.WorkProductDescription#getExternalId <em>External Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>External Id</em>' attribute.
-	 * @see #getExternalId()
-	 * @generated
-	 */
-	void setExternalId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Purpose</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Describes why the work product is produced and to what use it will be put.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Purpose</em>' attribute.
-	 * @see #setPurpose(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkProductDescription_Purpose()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getPurpose();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.WorkProductDescription#getPurpose <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Purpose</em>' attribute.
-	 * @see #getPurpose()
-	 * @generated
-	 */
-	void setPurpose(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Impact Of Not Having</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Describes the consequences of not producing the work product.  This is intended to aid in the tailoring the method/process to the needs of a specific project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Impact Of Not Having</em>' attribute.
-	 * @see #setImpactOfNotHaving(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkProductDescription_ImpactOfNotHaving()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getImpactOfNotHaving();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.WorkProductDescription#getImpactOfNotHaving <em>Impact Of Not Having</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Impact Of Not Having</em>' attribute.
-	 * @see #getImpactOfNotHaving()
-	 * @generated
-	 */
-	void setImpactOfNotHaving(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Reasons For Not Needing</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Describes the circumstances in which it is reasonable not to produce the work product.  This is intended to aid in the tailoring of the method/process to the needs of a specific project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Reasons For Not Needing</em>' attribute.
-	 * @see #setReasonsForNotNeeding(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkProductDescription_ReasonsForNotNeeding()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getReasonsForNotNeeding();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.WorkProductDescription#getReasonsForNotNeeding <em>Reasons For Not Needing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Reasons For Not Needing</em>' attribute.
-	 * @see #getReasonsForNotNeeding()
-	 * @generated
-	 */
-	void setReasonsForNotNeeding(String value);
-
-} // WorkProductDescription
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkProductDescriptor.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkProductDescriptor.java
deleted file mode 100755
index 383dd27..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkProductDescriptor.java
+++ /dev/null
@@ -1,173 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Work Product Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Work Product Descriptor represents a Work Product in the context of one specific Activity.  Every breakdown structure can define different relationships of Work Product Descriptors to Task Descriptors and Role Descriptors.  Therefore one Work Product can be represented by many Work Product Descriptors each within the context of an Activity with its own set of relationships.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.WorkProductDescriptor#getActivityEntryState <em>Activity Entry State</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkProductDescriptor#getActivityExitState <em>Activity Exit State</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkProductDescriptor#getWorkProduct <em>Work Product</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkProductDescriptor#getImpactedBy <em>Impacted By</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkProductDescriptor#getImpacts <em>Impacts</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.WorkProductDescriptor#getDeliverableParts <em>Deliverable Parts</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getWorkProductDescriptor()
- * @model
- * @generated
- */
-public interface WorkProductDescriptor extends Descriptor {
-	/**
-	 * Returns the value of the '<em><b>Activity Entry State</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Entry State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is initiated (i.e. work on the Activity's Task Descriptors is being initiated that use this Work Product Descriptor as input).  
-	 * For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested].
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Activity Entry State</em>' attribute.
-	 * @see #setActivityEntryState(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkProductDescriptor_ActivityEntryState()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getActivityEntryState();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.WorkProductDescriptor#getActivityEntryState <em>Activity Entry State</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Activity Entry State</em>' attribute.
-	 * @see #getActivityEntryState()
-	 * @generated
-	 */
-	void setActivityEntryState(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Activity Exit State</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Exist State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is finished (i.e. work on the Activity's Task Descriptors has finished that have this Work Product Descriptor as output).
-	 * For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested].
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Activity Exit State</em>' attribute.
-	 * @see #setActivityExitState(String)
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkProductDescriptor_ActivityExitState()
-	 * @model default="" dataType="org.eclipse.epf.uma.String"
-	 * @generated
-	 */
-	String getActivityExitState();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.WorkProductDescriptor#getActivityExitState <em>Activity Exit State</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Activity Exit State</em>' attribute.
-	 * @see #getActivityExitState()
-	 * @generated
-	 */
-	void setActivityExitState(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Work Product</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Work Product</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Work Product</em>' reference.
-	 * @see #setWorkProduct(WorkProduct)
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkProductDescriptor_WorkProduct()
-	 * @model
-	 * @generated
-	 */
-	WorkProduct getWorkProduct();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.uma.WorkProductDescriptor#getWorkProduct <em>Work Product</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Work Product</em>' reference.
-	 * @see #getWorkProduct()
-	 * @generated
-	 */
-	void setWorkProduct(WorkProduct value);
-
-	/**
-	 * Returns the value of the '<em><b>Impacted By</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProductDescriptor}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.WorkProductDescriptor#getImpacts <em>Impacts</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Impacted By</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Impacted By</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkProductDescriptor_ImpactedBy()
-	 * @see org.eclipse.epf.uma.WorkProductDescriptor#getImpacts
-	 * @model type="org.eclipse.epf.uma.WorkProductDescriptor" opposite="impacts" ordered="false"
-	 * @generated
-	 */
-	List getImpactedBy();
-
-	/**
-	 * Returns the value of the '<em><b>Impacts</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProductDescriptor}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.epf.uma.WorkProductDescriptor#getImpactedBy <em>Impacted By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Impacts</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Impacts</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkProductDescriptor_Impacts()
-	 * @see org.eclipse.epf.uma.WorkProductDescriptor#getImpactedBy
-	 * @model type="org.eclipse.epf.uma.WorkProductDescriptor" opposite="impactedBy" ordered="false"
-	 * @generated
-	 */
-	List getImpacts();
-
-	/**
-	 * Returns the value of the '<em><b>Deliverable Parts</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProductDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Deliverable Parts</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Deliverable Parts</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkProductDescriptor_DeliverableParts()
-	 * @model type="org.eclipse.epf.uma.WorkProductDescriptor" ordered="false"
-	 * @generated
-	 */
-	List getDeliverableParts();
-
-} // WorkProductDescriptor
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkProductType.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkProductType.java
deleted file mode 100755
index aa459d7..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/WorkProductType.java
+++ /dev/null
@@ -1,52 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Work Product Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Work Product Type is a second category for work products, which in contrast to Domain is more presentation oriented.  A work product can have many Work Product Types.  Examples, for a Work Product Type is "Class Diagram", which categorizes the Artifacts Analysis Model, Design Model, User Experience Model, or "Specification", which categorizes requirements specifications that define a system with a well-defined system boundary, such as use case or functional requirements specification.  A Work Product can be categorized to be of many Work Product Types.  For example, a use case model can be categorized as a Specification as well as Diagram Work Product Type.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.WorkProductType#getWorkProducts <em>Work Products</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.uma.UmaPackage#getWorkProductType()
- * @model
- * @generated
- */
-public interface WorkProductType extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Work Products</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.epf.uma.WorkProduct}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Work Products</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Work Products</em>' reference list.
-	 * @see org.eclipse.epf.uma.UmaPackage#getWorkProductType_WorkProducts()
-	 * @model type="org.eclipse.epf.uma.WorkProduct" ordered="false"
-	 * @generated
-	 */
-	List getWorkProducts();
-
-} // WorkProductType
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ActivityDescriptionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ActivityDescriptionImpl.java
deleted file mode 100755
index 065fcec..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ActivityDescriptionImpl.java
+++ /dev/null
@@ -1,298 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.ActivityDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Activity Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityDescriptionImpl#getPurpose <em>Purpose</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityDescriptionImpl#getAlternatives <em>Alternatives</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityDescriptionImpl#getHowtoStaff <em>Howto Staff</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ActivityDescriptionImpl extends BreakdownElementDescriptionImpl
-		implements ActivityDescription {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPurpose()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PURPOSE_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPurpose()
-	 * @generated
-	 * @ordered
-	 */
-	protected String purpose = PURPOSE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAlternatives() <em>Alternatives</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlternatives()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ALTERNATIVES_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getAlternatives() <em>Alternatives</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlternatives()
-	 * @generated
-	 * @ordered
-	 */
-	protected String alternatives = ALTERNATIVES_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHowtoStaff() <em>Howto Staff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHowtoStaff()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HOWTO_STAFF_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getHowtoStaff() <em>Howto Staff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHowtoStaff()
-	 * @generated
-	 * @ordered
-	 */
-	protected String howtoStaff = HOWTO_STAFF_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ActivityDescriptionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ACTIVITY_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPurpose() {
-		return purpose;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPurpose(String newPurpose) {
-		String oldPurpose = purpose;
-		purpose = newPurpose;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ACTIVITY_DESCRIPTION__PURPOSE, oldPurpose,
-					purpose));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAlternatives() {
-		return alternatives;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAlternatives(String newAlternatives) {
-		String oldAlternatives = alternatives;
-		alternatives = newAlternatives;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ACTIVITY_DESCRIPTION__ALTERNATIVES,
-					oldAlternatives, alternatives));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHowtoStaff() {
-		return howtoStaff;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHowtoStaff(String newHowtoStaff) {
-		String oldHowtoStaff = howtoStaff;
-		howtoStaff = newHowtoStaff;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ACTIVITY_DESCRIPTION__HOWTO_STAFF,
-					oldHowtoStaff, howtoStaff));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.ACTIVITY_DESCRIPTION__PURPOSE:
-			return getPurpose();
-		case UmaPackage.ACTIVITY_DESCRIPTION__ALTERNATIVES:
-			return getAlternatives();
-		case UmaPackage.ACTIVITY_DESCRIPTION__HOWTO_STAFF:
-			return getHowtoStaff();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.ACTIVITY_DESCRIPTION__PURPOSE:
-			setPurpose((String) newValue);
-			return;
-		case UmaPackage.ACTIVITY_DESCRIPTION__ALTERNATIVES:
-			setAlternatives((String) newValue);
-			return;
-		case UmaPackage.ACTIVITY_DESCRIPTION__HOWTO_STAFF:
-			setHowtoStaff((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.ACTIVITY_DESCRIPTION__PURPOSE:
-			setPurpose(PURPOSE_EDEFAULT);
-			return;
-		case UmaPackage.ACTIVITY_DESCRIPTION__ALTERNATIVES:
-			setAlternatives(ALTERNATIVES_EDEFAULT);
-			return;
-		case UmaPackage.ACTIVITY_DESCRIPTION__HOWTO_STAFF:
-			setHowtoStaff(HOWTO_STAFF_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.ACTIVITY_DESCRIPTION__PURPOSE:
-			return PURPOSE_EDEFAULT == null ? purpose != null
-					: !PURPOSE_EDEFAULT.equals(purpose);
-		case UmaPackage.ACTIVITY_DESCRIPTION__ALTERNATIVES:
-			return ALTERNATIVES_EDEFAULT == null ? alternatives != null
-					: !ALTERNATIVES_EDEFAULT.equals(alternatives);
-		case UmaPackage.ACTIVITY_DESCRIPTION__HOWTO_STAFF:
-			return HOWTO_STAFF_EDEFAULT == null ? howtoStaff != null
-					: !HOWTO_STAFF_EDEFAULT.equals(howtoStaff);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (purpose: "); //$NON-NLS-1$
-		result.append(purpose);
-		result.append(", alternatives: "); //$NON-NLS-1$
-		result.append(alternatives);
-		result.append(", howtoStaff: "); //$NON-NLS-1$
-		result.append(howtoStaff);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ActivityDescriptionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ActivityImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ActivityImpl.java
deleted file mode 100755
index 4dff918..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ActivityImpl.java
+++ /dev/null
@@ -1,927 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.Constraint;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.Roadmap;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.epf.uma.WorkDefinition;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Activity</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityImpl#getVariabilityType <em>Variability Type</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityImpl#getVariabilityBasedOnElement <em>Variability Based On Element</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityImpl#getPrecondition <em>Precondition</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityImpl#getPostcondition <em>Postcondition</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityImpl#getBreakdownElements <em>Breakdown Elements</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityImpl#getRoadmaps <em>Roadmaps</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityImpl#getSupportingMaterials <em>Supporting Materials</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityImpl#getChecklists <em>Checklists</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityImpl#getConcepts <em>Concepts</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityImpl#getExamples <em>Examples</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityImpl#getGuidelines <em>Guidelines</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityImpl#getReusableAssets <em>Reusable Assets</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ActivityImpl#getIsEnactable <em>Is Enactable</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ActivityImpl extends WorkBreakdownElementImpl implements Activity {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getVariabilityType() <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final VariabilityType VARIABILITY_TYPE_EDEFAULT = VariabilityType.NA_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getVariabilityType() <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityType()
-	 * @generated
-	 * @ordered
-	 */
-	protected VariabilityType variabilityType = VARIABILITY_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getVariabilityBasedOnElement() <em>Variability Based On Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityBasedOnElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected VariabilityElement variabilityBasedOnElement = null;
-
-	/**
-	 * The cached value of the '{@link #getPrecondition() <em>Precondition</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrecondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected Constraint precondition = null;
-
-	/**
-	 * The cached value of the '{@link #getPostcondition() <em>Postcondition</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostcondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected Constraint postcondition = null;
-
-	/**
-	 * The cached value of the '{@link #getBreakdownElements() <em>Breakdown Elements</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBreakdownElements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList breakdownElements = null;
-
-	/**
-	 * The cached value of the '{@link #getRoadmaps() <em>Roadmaps</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoadmaps()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList roadmaps = null;
-
-	/**
-	 * The cached value of the '{@link #getSupportingMaterials() <em>Supporting Materials</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSupportingMaterials()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList supportingMaterials = null;
-
-	/**
-	 * The cached value of the '{@link #getChecklists() <em>Checklists</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChecklists()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList checklists = null;
-
-	/**
-	 * The cached value of the '{@link #getConcepts() <em>Concepts</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConcepts()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList concepts = null;
-
-	/**
-	 * The cached value of the '{@link #getExamples() <em>Examples</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExamples()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList examples = null;
-
-	/**
-	 * The cached value of the '{@link #getGuidelines() <em>Guidelines</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGuidelines()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList guidelines = null;
-
-	/**
-	 * The cached value of the '{@link #getReusableAssets() <em>Reusable Assets</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReusableAssets()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList reusableAssets = null;
-
-	/**
-	 * The default value of the '{@link #getIsEnactable() <em>Is Enactable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsEnactable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean IS_ENACTABLE_EDEFAULT = Boolean.FALSE;
-
-	/**
-	 * The cached value of the '{@link #getIsEnactable() <em>Is Enactable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsEnactable()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean isEnactable = IS_ENACTABLE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ActivityImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ACTIVITY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getChecklists() {
-		if (checklists == null) {
-			checklists = new EObjectResolvingEList(Checklist.class, this,
-					UmaPackage.ACTIVITY__CHECKLISTS);
-		}
-		return checklists;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getConcepts() {
-		if (concepts == null) {
-			concepts = new EObjectResolvingEList(Concept.class, this,
-					UmaPackage.ACTIVITY__CONCEPTS);
-		}
-		return concepts;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityType getVariabilityType() {
-		return variabilityType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVariabilityType(VariabilityType newVariabilityType) {
-		VariabilityType oldVariabilityType = variabilityType;
-		variabilityType = newVariabilityType == null ? VARIABILITY_TYPE_EDEFAULT
-				: newVariabilityType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ACTIVITY__VARIABILITY_TYPE, oldVariabilityType,
-					variabilityType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityElement getVariabilityBasedOnElement() {
-		if (variabilityBasedOnElement != null
-				&& ((EObject) variabilityBasedOnElement).eIsProxy()) {
-			InternalEObject oldVariabilityBasedOnElement = (InternalEObject) variabilityBasedOnElement;
-			variabilityBasedOnElement = (VariabilityElement) eResolveProxy(oldVariabilityBasedOnElement);
-			if (variabilityBasedOnElement != oldVariabilityBasedOnElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.ACTIVITY__VARIABILITY_BASED_ON_ELEMENT,
-							oldVariabilityBasedOnElement,
-							variabilityBasedOnElement));
-			}
-		}
-		return variabilityBasedOnElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityElement basicGetVariabilityBasedOnElement() {
-		return variabilityBasedOnElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVariabilityBasedOnElement(
-			VariabilityElement newVariabilityBasedOnElement) {
-		VariabilityElement oldVariabilityBasedOnElement = variabilityBasedOnElement;
-		variabilityBasedOnElement = newVariabilityBasedOnElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ACTIVITY__VARIABILITY_BASED_ON_ELEMENT,
-					oldVariabilityBasedOnElement, variabilityBasedOnElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint getPrecondition() {
-		if (precondition != null && ((EObject) precondition).eIsProxy()) {
-			InternalEObject oldPrecondition = (InternalEObject) precondition;
-			precondition = (Constraint) eResolveProxy(oldPrecondition);
-			if (precondition != oldPrecondition) {
-				InternalEObject newPrecondition = (InternalEObject) precondition;
-				NotificationChain msgs = oldPrecondition
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-								- UmaPackage.ACTIVITY__PRECONDITION, null, null);
-				if (newPrecondition.eInternalContainer() == null) {
-					msgs = newPrecondition.eInverseAdd(this,
-							EOPPOSITE_FEATURE_BASE
-									- UmaPackage.ACTIVITY__PRECONDITION, null,
-							msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.ACTIVITY__PRECONDITION, oldPrecondition,
-							precondition));
-			}
-		}
-		return precondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint basicGetPrecondition() {
-		return precondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPrecondition(Constraint newPrecondition,
-			NotificationChain msgs) {
-		Constraint oldPrecondition = precondition;
-		precondition = newPrecondition;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.ACTIVITY__PRECONDITION,
-					oldPrecondition, newPrecondition);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPrecondition(Constraint newPrecondition) {
-		if (newPrecondition != precondition) {
-			NotificationChain msgs = null;
-			if (precondition != null)
-				msgs = ((InternalEObject) precondition)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-								- UmaPackage.ACTIVITY__PRECONDITION, null, msgs);
-			if (newPrecondition != null)
-				msgs = ((InternalEObject) newPrecondition)
-						.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-								- UmaPackage.ACTIVITY__PRECONDITION, null, msgs);
-			msgs = basicSetPrecondition(newPrecondition, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ACTIVITY__PRECONDITION, newPrecondition,
-					newPrecondition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint getPostcondition() {
-		if (postcondition != null && ((EObject) postcondition).eIsProxy()) {
-			InternalEObject oldPostcondition = (InternalEObject) postcondition;
-			postcondition = (Constraint) eResolveProxy(oldPostcondition);
-			if (postcondition != oldPostcondition) {
-				InternalEObject newPostcondition = (InternalEObject) postcondition;
-				NotificationChain msgs = oldPostcondition.eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.ACTIVITY__POSTCONDITION, null,
-						null);
-				if (newPostcondition.eInternalContainer() == null) {
-					msgs = newPostcondition.eInverseAdd(this,
-							EOPPOSITE_FEATURE_BASE
-									- UmaPackage.ACTIVITY__POSTCONDITION, null,
-							msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.ACTIVITY__POSTCONDITION,
-							oldPostcondition, postcondition));
-			}
-		}
-		return postcondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint basicGetPostcondition() {
-		return postcondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostcondition(Constraint newPostcondition,
-			NotificationChain msgs) {
-		Constraint oldPostcondition = postcondition;
-		postcondition = newPostcondition;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.ACTIVITY__POSTCONDITION,
-					oldPostcondition, newPostcondition);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPostcondition(Constraint newPostcondition) {
-		if (newPostcondition != postcondition) {
-			NotificationChain msgs = null;
-			if (postcondition != null)
-				msgs = ((InternalEObject) postcondition).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.ACTIVITY__POSTCONDITION, null,
-						msgs);
-			if (newPostcondition != null)
-				msgs = ((InternalEObject) newPostcondition).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.ACTIVITY__POSTCONDITION, null,
-						msgs);
-			msgs = basicSetPostcondition(newPostcondition, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ACTIVITY__POSTCONDITION, newPostcondition,
-					newPostcondition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getBreakdownElements() {
-		if (breakdownElements == null) {
-			breakdownElements = new EObjectWithInverseResolvingEList(
-					BreakdownElement.class, this,
-					UmaPackage.ACTIVITY__BREAKDOWN_ELEMENTS,
-					UmaPackage.BREAKDOWN_ELEMENT__SUPER_ACTIVITIES);
-		}
-		return breakdownElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getRoadmaps() {
-		if (roadmaps == null) {
-			roadmaps = new EObjectResolvingEList(Roadmap.class, this,
-					UmaPackage.ACTIVITY__ROADMAPS);
-		}
-		return roadmaps;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSupportingMaterials() {
-		if (supportingMaterials == null) {
-			supportingMaterials = new EObjectResolvingEList(
-					SupportingMaterial.class, this,
-					UmaPackage.ACTIVITY__SUPPORTING_MATERIALS);
-		}
-		return supportingMaterials;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getExamples() {
-		if (examples == null) {
-			examples = new EObjectResolvingEList(Example.class, this,
-					UmaPackage.ACTIVITY__EXAMPLES);
-		}
-		return examples;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getGuidelines() {
-		if (guidelines == null) {
-			guidelines = new EObjectResolvingEList(Guideline.class, this,
-					UmaPackage.ACTIVITY__GUIDELINES);
-		}
-		return guidelines;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getReusableAssets() {
-		if (reusableAssets == null) {
-			reusableAssets = new EObjectResolvingEList(ReusableAsset.class,
-					this, UmaPackage.ACTIVITY__REUSABLE_ASSETS);
-		}
-		return reusableAssets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean getIsEnactable() {
-		return isEnactable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsEnactable(Boolean newIsEnactable) {
-		Boolean oldIsEnactable = isEnactable;
-		isEnactable = newIsEnactable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ACTIVITY__IS_ENACTABLE, oldIsEnactable,
-					isEnactable));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.ACTIVITY__BREAKDOWN_ELEMENTS:
-			return ((InternalEList) getBreakdownElements()).basicAdd(otherEnd,
-					msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.ACTIVITY__PRECONDITION:
-			return basicSetPrecondition(null, msgs);
-		case UmaPackage.ACTIVITY__POSTCONDITION:
-			return basicSetPostcondition(null, msgs);
-		case UmaPackage.ACTIVITY__BREAKDOWN_ELEMENTS:
-			return ((InternalEList) getBreakdownElements()).basicRemove(
-					otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.ACTIVITY__VARIABILITY_TYPE:
-			return getVariabilityType();
-		case UmaPackage.ACTIVITY__VARIABILITY_BASED_ON_ELEMENT:
-			if (resolve)
-				return getVariabilityBasedOnElement();
-			return basicGetVariabilityBasedOnElement();
-		case UmaPackage.ACTIVITY__PRECONDITION:
-			if (resolve)
-				return getPrecondition();
-			return basicGetPrecondition();
-		case UmaPackage.ACTIVITY__POSTCONDITION:
-			if (resolve)
-				return getPostcondition();
-			return basicGetPostcondition();
-		case UmaPackage.ACTIVITY__BREAKDOWN_ELEMENTS:
-			return getBreakdownElements();
-		case UmaPackage.ACTIVITY__ROADMAPS:
-			return getRoadmaps();
-		case UmaPackage.ACTIVITY__SUPPORTING_MATERIALS:
-			return getSupportingMaterials();
-		case UmaPackage.ACTIVITY__CHECKLISTS:
-			return getChecklists();
-		case UmaPackage.ACTIVITY__CONCEPTS:
-			return getConcepts();
-		case UmaPackage.ACTIVITY__EXAMPLES:
-			return getExamples();
-		case UmaPackage.ACTIVITY__GUIDELINES:
-			return getGuidelines();
-		case UmaPackage.ACTIVITY__REUSABLE_ASSETS:
-			return getReusableAssets();
-		case UmaPackage.ACTIVITY__IS_ENACTABLE:
-			return getIsEnactable();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.ACTIVITY__VARIABILITY_TYPE:
-			setVariabilityType((VariabilityType) newValue);
-			return;
-		case UmaPackage.ACTIVITY__VARIABILITY_BASED_ON_ELEMENT:
-			setVariabilityBasedOnElement((VariabilityElement) newValue);
-			return;
-		case UmaPackage.ACTIVITY__PRECONDITION:
-			setPrecondition((Constraint) newValue);
-			return;
-		case UmaPackage.ACTIVITY__POSTCONDITION:
-			setPostcondition((Constraint) newValue);
-			return;
-		case UmaPackage.ACTIVITY__BREAKDOWN_ELEMENTS:
-			getBreakdownElements().clear();
-			getBreakdownElements().addAll((Collection) newValue);
-			return;
-		case UmaPackage.ACTIVITY__ROADMAPS:
-			getRoadmaps().clear();
-			getRoadmaps().addAll((Collection) newValue);
-			return;
-		case UmaPackage.ACTIVITY__SUPPORTING_MATERIALS:
-			getSupportingMaterials().clear();
-			getSupportingMaterials().addAll((Collection) newValue);
-			return;
-		case UmaPackage.ACTIVITY__CHECKLISTS:
-			getChecklists().clear();
-			getChecklists().addAll((Collection) newValue);
-			return;
-		case UmaPackage.ACTIVITY__CONCEPTS:
-			getConcepts().clear();
-			getConcepts().addAll((Collection) newValue);
-			return;
-		case UmaPackage.ACTIVITY__EXAMPLES:
-			getExamples().clear();
-			getExamples().addAll((Collection) newValue);
-			return;
-		case UmaPackage.ACTIVITY__GUIDELINES:
-			getGuidelines().clear();
-			getGuidelines().addAll((Collection) newValue);
-			return;
-		case UmaPackage.ACTIVITY__REUSABLE_ASSETS:
-			getReusableAssets().clear();
-			getReusableAssets().addAll((Collection) newValue);
-			return;
-		case UmaPackage.ACTIVITY__IS_ENACTABLE:
-			setIsEnactable((Boolean) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.ACTIVITY__VARIABILITY_TYPE:
-			setVariabilityType(VARIABILITY_TYPE_EDEFAULT);
-			return;
-		case UmaPackage.ACTIVITY__VARIABILITY_BASED_ON_ELEMENT:
-			setVariabilityBasedOnElement((VariabilityElement) null);
-			return;
-		case UmaPackage.ACTIVITY__PRECONDITION:
-			setPrecondition((Constraint) null);
-			return;
-		case UmaPackage.ACTIVITY__POSTCONDITION:
-			setPostcondition((Constraint) null);
-			return;
-		case UmaPackage.ACTIVITY__BREAKDOWN_ELEMENTS:
-			getBreakdownElements().clear();
-			return;
-		case UmaPackage.ACTIVITY__ROADMAPS:
-			getRoadmaps().clear();
-			return;
-		case UmaPackage.ACTIVITY__SUPPORTING_MATERIALS:
-			getSupportingMaterials().clear();
-			return;
-		case UmaPackage.ACTIVITY__CHECKLISTS:
-			getChecklists().clear();
-			return;
-		case UmaPackage.ACTIVITY__CONCEPTS:
-			getConcepts().clear();
-			return;
-		case UmaPackage.ACTIVITY__EXAMPLES:
-			getExamples().clear();
-			return;
-		case UmaPackage.ACTIVITY__GUIDELINES:
-			getGuidelines().clear();
-			return;
-		case UmaPackage.ACTIVITY__REUSABLE_ASSETS:
-			getReusableAssets().clear();
-			return;
-		case UmaPackage.ACTIVITY__IS_ENACTABLE:
-			setIsEnactable(IS_ENACTABLE_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.ACTIVITY__VARIABILITY_TYPE:
-			return variabilityType != VARIABILITY_TYPE_EDEFAULT;
-		case UmaPackage.ACTIVITY__VARIABILITY_BASED_ON_ELEMENT:
-			return variabilityBasedOnElement != null;
-		case UmaPackage.ACTIVITY__PRECONDITION:
-			return precondition != null;
-		case UmaPackage.ACTIVITY__POSTCONDITION:
-			return postcondition != null;
-		case UmaPackage.ACTIVITY__BREAKDOWN_ELEMENTS:
-			return breakdownElements != null && !breakdownElements.isEmpty();
-		case UmaPackage.ACTIVITY__ROADMAPS:
-			return roadmaps != null && !roadmaps.isEmpty();
-		case UmaPackage.ACTIVITY__SUPPORTING_MATERIALS:
-			return supportingMaterials != null
-					&& !supportingMaterials.isEmpty();
-		case UmaPackage.ACTIVITY__CHECKLISTS:
-			return checklists != null && !checklists.isEmpty();
-		case UmaPackage.ACTIVITY__CONCEPTS:
-			return concepts != null && !concepts.isEmpty();
-		case UmaPackage.ACTIVITY__EXAMPLES:
-			return examples != null && !examples.isEmpty();
-		case UmaPackage.ACTIVITY__GUIDELINES:
-			return guidelines != null && !guidelines.isEmpty();
-		case UmaPackage.ACTIVITY__REUSABLE_ASSETS:
-			return reusableAssets != null && !reusableAssets.isEmpty();
-		case UmaPackage.ACTIVITY__IS_ENACTABLE:
-			return IS_ENACTABLE_EDEFAULT == null ? isEnactable != null
-					: !IS_ENACTABLE_EDEFAULT.equals(isEnactable);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
-		if (baseClass == VariabilityElement.class) {
-			switch (derivedFeatureID) {
-			case UmaPackage.ACTIVITY__VARIABILITY_TYPE:
-				return UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_TYPE;
-			case UmaPackage.ACTIVITY__VARIABILITY_BASED_ON_ELEMENT:
-				return UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT;
-			default:
-				return -1;
-			}
-		}
-		if (baseClass == WorkDefinition.class) {
-			switch (derivedFeatureID) {
-			case UmaPackage.ACTIVITY__PRECONDITION:
-				return UmaPackage.WORK_DEFINITION__PRECONDITION;
-			case UmaPackage.ACTIVITY__POSTCONDITION:
-				return UmaPackage.WORK_DEFINITION__POSTCONDITION;
-			default:
-				return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
-		if (baseClass == VariabilityElement.class) {
-			switch (baseFeatureID) {
-			case UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_TYPE:
-				return UmaPackage.ACTIVITY__VARIABILITY_TYPE;
-			case UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-				return UmaPackage.ACTIVITY__VARIABILITY_BASED_ON_ELEMENT;
-			default:
-				return -1;
-			}
-		}
-		if (baseClass == WorkDefinition.class) {
-			switch (baseFeatureID) {
-			case UmaPackage.WORK_DEFINITION__PRECONDITION:
-				return UmaPackage.ACTIVITY__PRECONDITION;
-			case UmaPackage.WORK_DEFINITION__POSTCONDITION:
-				return UmaPackage.ACTIVITY__POSTCONDITION;
-			default:
-				return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (variabilityType: "); //$NON-NLS-1$
-		result.append(variabilityType);
-		result.append(", isEnactable: "); //$NON-NLS-1$
-		result.append(isEnactable);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ActivityImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ArtifactDescriptionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ArtifactDescriptionImpl.java
deleted file mode 100755
index 851b380..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ArtifactDescriptionImpl.java
+++ /dev/null
@@ -1,242 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.ArtifactDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Artifact Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ArtifactDescriptionImpl#getBriefOutline <em>Brief Outline</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ArtifactDescriptionImpl#getRepresentationOptions <em>Representation Options</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ArtifactDescriptionImpl extends WorkProductDescriptionImpl
-		implements ArtifactDescription {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getBriefOutline() <em>Brief Outline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBriefOutline()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String BRIEF_OUTLINE_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getBriefOutline() <em>Brief Outline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBriefOutline()
-	 * @generated
-	 * @ordered
-	 */
-	protected String briefOutline = BRIEF_OUTLINE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRepresentationOptions() <em>Representation Options</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRepresentationOptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REPRESENTATION_OPTIONS_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getRepresentationOptions() <em>Representation Options</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRepresentationOptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected String representationOptions = REPRESENTATION_OPTIONS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ArtifactDescriptionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ARTIFACT_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getBriefOutline() {
-		return briefOutline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBriefOutline(String newBriefOutline) {
-		String oldBriefOutline = briefOutline;
-		briefOutline = newBriefOutline;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ARTIFACT_DESCRIPTION__BRIEF_OUTLINE,
-					oldBriefOutline, briefOutline));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRepresentationOptions() {
-		return representationOptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRepresentationOptions(String newRepresentationOptions) {
-		String oldRepresentationOptions = representationOptions;
-		representationOptions = newRepresentationOptions;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS,
-					oldRepresentationOptions, representationOptions));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.ARTIFACT_DESCRIPTION__BRIEF_OUTLINE:
-			return getBriefOutline();
-		case UmaPackage.ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS:
-			return getRepresentationOptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.ARTIFACT_DESCRIPTION__BRIEF_OUTLINE:
-			setBriefOutline((String) newValue);
-			return;
-		case UmaPackage.ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS:
-			setRepresentationOptions((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.ARTIFACT_DESCRIPTION__BRIEF_OUTLINE:
-			setBriefOutline(BRIEF_OUTLINE_EDEFAULT);
-			return;
-		case UmaPackage.ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS:
-			setRepresentationOptions(REPRESENTATION_OPTIONS_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.ARTIFACT_DESCRIPTION__BRIEF_OUTLINE:
-			return BRIEF_OUTLINE_EDEFAULT == null ? briefOutline != null
-					: !BRIEF_OUTLINE_EDEFAULT.equals(briefOutline);
-		case UmaPackage.ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS:
-			return REPRESENTATION_OPTIONS_EDEFAULT == null ? representationOptions != null
-					: !REPRESENTATION_OPTIONS_EDEFAULT
-							.equals(representationOptions);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (briefOutline: "); //$NON-NLS-1$
-		result.append(briefOutline);
-		result.append(", representationOptions: "); //$NON-NLS-1$
-		result.append(representationOptions);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ArtifactDescriptionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ArtifactImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ArtifactImpl.java
deleted file mode 100755
index 87e0aae..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ArtifactImpl.java
+++ /dev/null
@@ -1,285 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.Artifact;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Artifact</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ArtifactImpl#getContainerArtifact <em>Container Artifact</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ArtifactImpl#getContainedArtifacts <em>Contained Artifacts</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ArtifactImpl extends WorkProductImpl implements Artifact {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getContainedArtifacts() <em>Contained Artifacts</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContainedArtifacts()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList containedArtifacts = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ArtifactImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ARTIFACT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Artifact getContainerArtifact() {
-		if (eContainerFeatureID != UmaPackage.ARTIFACT__CONTAINER_ARTIFACT)
-			return null;
-		return (Artifact) eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Artifact basicGetContainerArtifact() {
-		if (eContainerFeatureID != UmaPackage.ARTIFACT__CONTAINER_ARTIFACT)
-			return null;
-		return (Artifact) eInternalContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetContainerArtifact(
-			Artifact newContainerArtifact, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject) newContainerArtifact,
-				UmaPackage.ARTIFACT__CONTAINER_ARTIFACT, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContainerArtifact(Artifact newContainerArtifact) {
-		if (newContainerArtifact != eInternalContainer()
-				|| (eContainerFeatureID != UmaPackage.ARTIFACT__CONTAINER_ARTIFACT && newContainerArtifact != null)) {
-			if (EcoreUtil.isAncestor(this, (EObject) newContainerArtifact))
-				throw new IllegalArgumentException(
-						"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newContainerArtifact != null)
-				msgs = ((InternalEObject) newContainerArtifact).eInverseAdd(
-						this, UmaPackage.ARTIFACT__CONTAINED_ARTIFACTS,
-						Artifact.class, msgs);
-			msgs = basicSetContainerArtifact(newContainerArtifact, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ARTIFACT__CONTAINER_ARTIFACT,
-					newContainerArtifact, newContainerArtifact));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getContainedArtifacts() {
-		if (containedArtifacts == null) {
-			containedArtifacts = new EObjectContainmentWithInverseEList.Resolving(
-					Artifact.class, this,
-					UmaPackage.ARTIFACT__CONTAINED_ARTIFACTS,
-					UmaPackage.ARTIFACT__CONTAINER_ARTIFACT);
-		}
-		return containedArtifacts;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.ARTIFACT__CONTAINER_ARTIFACT:
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetContainerArtifact((Artifact) otherEnd, msgs);
-		case UmaPackage.ARTIFACT__CONTAINED_ARTIFACTS:
-			return ((InternalEList) getContainedArtifacts()).basicAdd(otherEnd,
-					msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.ARTIFACT__CONTAINER_ARTIFACT:
-			return basicSetContainerArtifact(null, msgs);
-		case UmaPackage.ARTIFACT__CONTAINED_ARTIFACTS:
-			return ((InternalEList) getContainedArtifacts()).basicRemove(
-					otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(
-			NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-		case UmaPackage.ARTIFACT__CONTAINER_ARTIFACT:
-			return eInternalContainer().eInverseRemove(this,
-					UmaPackage.ARTIFACT__CONTAINED_ARTIFACTS, Artifact.class,
-					msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.ARTIFACT__CONTAINER_ARTIFACT:
-			if (resolve)
-				return getContainerArtifact();
-			return basicGetContainerArtifact();
-		case UmaPackage.ARTIFACT__CONTAINED_ARTIFACTS:
-			return getContainedArtifacts();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.ARTIFACT__CONTAINER_ARTIFACT:
-			setContainerArtifact((Artifact) newValue);
-			return;
-		case UmaPackage.ARTIFACT__CONTAINED_ARTIFACTS:
-			getContainedArtifacts().clear();
-			getContainedArtifacts().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.ARTIFACT__CONTAINER_ARTIFACT:
-			setContainerArtifact((Artifact) null);
-			return;
-		case UmaPackage.ARTIFACT__CONTAINED_ARTIFACTS:
-			getContainedArtifacts().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.ARTIFACT__CONTAINER_ARTIFACT:
-			return basicGetContainerArtifact() != null;
-		case UmaPackage.ARTIFACT__CONTAINED_ARTIFACTS:
-			return containedArtifacts != null && !containedArtifacts.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ArtifactImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/BreakdownElementDescriptionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/BreakdownElementDescriptionImpl.java
deleted file mode 100755
index b497815..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/BreakdownElementDescriptionImpl.java
+++ /dev/null
@@ -1,184 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.BreakdownElementDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Breakdown Element Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.BreakdownElementDescriptionImpl#getUsageGuidance <em>Usage Guidance</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BreakdownElementDescriptionImpl extends ContentDescriptionImpl
-		implements BreakdownElementDescription {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getUsageGuidance() <em>Usage Guidance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUsageGuidance()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String USAGE_GUIDANCE_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getUsageGuidance() <em>Usage Guidance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUsageGuidance()
-	 * @generated
-	 * @ordered
-	 */
-	protected String usageGuidance = USAGE_GUIDANCE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BreakdownElementDescriptionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.BREAKDOWN_ELEMENT_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getUsageGuidance() {
-		return usageGuidance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUsageGuidance(String newUsageGuidance) {
-		String oldUsageGuidance = usageGuidance;
-		usageGuidance = newUsageGuidance;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE,
-					oldUsageGuidance, usageGuidance));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE:
-			return getUsageGuidance();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE:
-			setUsageGuidance((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE:
-			setUsageGuidance(USAGE_GUIDANCE_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE:
-			return USAGE_GUIDANCE_EDEFAULT == null ? usageGuidance != null
-					: !USAGE_GUIDANCE_EDEFAULT.equals(usageGuidance);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (usageGuidance: "); //$NON-NLS-1$
-		result.append(usageGuidance);
-		result.append(')');
-		return result.toString();
-	}
-
-} //BreakdownElementDescriptionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/BreakdownElementImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/BreakdownElementImpl.java
deleted file mode 100755
index 6dc9579..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/BreakdownElementImpl.java
+++ /dev/null
@@ -1,737 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.PlanningData;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Breakdown Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.BreakdownElementImpl#getPrefix <em>Prefix</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.BreakdownElementImpl#getIsPlanned <em>Is Planned</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.BreakdownElementImpl#getHasMultipleOccurrences <em>Has Multiple Occurrences</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.BreakdownElementImpl#getIsOptional <em>Is Optional</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.BreakdownElementImpl#getPresentedAfter <em>Presented After</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.BreakdownElementImpl#getPresentedBefore <em>Presented Before</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.BreakdownElementImpl#getPlanningData <em>Planning Data</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.BreakdownElementImpl#getSuperActivities <em>Super Activities</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class BreakdownElementImpl extends ProcessElementImpl implements
-		BreakdownElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getPrefix() <em>Prefix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrefix()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PREFIX_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getPrefix() <em>Prefix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrefix()
-	 * @generated
-	 * @ordered
-	 */
-	protected String prefix = PREFIX_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getIsPlanned() <em>Is Planned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsPlanned()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean IS_PLANNED_EDEFAULT = Boolean.TRUE;
-
-	/**
-	 * The cached value of the '{@link #getIsPlanned() <em>Is Planned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsPlanned()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean isPlanned = IS_PLANNED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHasMultipleOccurrences() <em>Has Multiple Occurrences</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHasMultipleOccurrences()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean HAS_MULTIPLE_OCCURRENCES_EDEFAULT = Boolean.FALSE;
-
-	/**
-	 * The cached value of the '{@link #getHasMultipleOccurrences() <em>Has Multiple Occurrences</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHasMultipleOccurrences()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean hasMultipleOccurrences = HAS_MULTIPLE_OCCURRENCES_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getIsOptional() <em>Is Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsOptional()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean IS_OPTIONAL_EDEFAULT = Boolean.FALSE;
-
-	/**
-	 * The cached value of the '{@link #getIsOptional() <em>Is Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsOptional()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean isOptional = IS_OPTIONAL_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPresentedAfter() <em>Presented After</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPresentedAfter()
-	 * @generated
-	 * @ordered
-	 */
-	protected BreakdownElement presentedAfter = null;
-
-	/**
-	 * The cached value of the '{@link #getPresentedBefore() <em>Presented Before</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPresentedBefore()
-	 * @generated
-	 * @ordered
-	 */
-	protected BreakdownElement presentedBefore = null;
-
-	/**
-	 * The cached value of the '{@link #getPlanningData() <em>Planning Data</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPlanningData()
-	 * @generated
-	 * @ordered
-	 */
-	protected PlanningData planningData = null;
-
-	/**
-	 * The cached value of the '{@link #getSuperActivities() <em>Super Activities</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSuperActivities()
-	 * @generated
-	 * @ordered
-	 */
-	protected Activity superActivities = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BreakdownElementImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.BREAKDOWN_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPrefix() {
-		return prefix;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPrefix(String newPrefix) {
-		String oldPrefix = prefix;
-		prefix = newPrefix;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.BREAKDOWN_ELEMENT__PREFIX, oldPrefix, prefix));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean getIsPlanned() {
-		return isPlanned;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsPlanned(Boolean newIsPlanned) {
-		Boolean oldIsPlanned = isPlanned;
-		isPlanned = newIsPlanned;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.BREAKDOWN_ELEMENT__IS_PLANNED, oldIsPlanned,
-					isPlanned));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean getHasMultipleOccurrences() {
-		return hasMultipleOccurrences;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHasMultipleOccurrences(Boolean newHasMultipleOccurrences) {
-		Boolean oldHasMultipleOccurrences = hasMultipleOccurrences;
-		hasMultipleOccurrences = newHasMultipleOccurrences;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES,
-					oldHasMultipleOccurrences, hasMultipleOccurrences));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean getIsOptional() {
-		return isOptional;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsOptional(Boolean newIsOptional) {
-		Boolean oldIsOptional = isOptional;
-		isOptional = newIsOptional;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.BREAKDOWN_ELEMENT__IS_OPTIONAL, oldIsOptional,
-					isOptional));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BreakdownElement getPresentedAfter() {
-		if (presentedAfter != null && ((EObject) presentedAfter).eIsProxy()) {
-			InternalEObject oldPresentedAfter = (InternalEObject) presentedAfter;
-			presentedAfter = (BreakdownElement) eResolveProxy(oldPresentedAfter);
-			if (presentedAfter != oldPresentedAfter) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_AFTER,
-							oldPresentedAfter, presentedAfter));
-			}
-		}
-		return presentedAfter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BreakdownElement basicGetPresentedAfter() {
-		return presentedAfter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPresentedAfter(BreakdownElement newPresentedAfter) {
-		BreakdownElement oldPresentedAfter = presentedAfter;
-		presentedAfter = newPresentedAfter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_AFTER,
-					oldPresentedAfter, presentedAfter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BreakdownElement getPresentedBefore() {
-		if (presentedBefore != null && ((EObject) presentedBefore).eIsProxy()) {
-			InternalEObject oldPresentedBefore = (InternalEObject) presentedBefore;
-			presentedBefore = (BreakdownElement) eResolveProxy(oldPresentedBefore);
-			if (presentedBefore != oldPresentedBefore) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_BEFORE,
-							oldPresentedBefore, presentedBefore));
-			}
-		}
-		return presentedBefore;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BreakdownElement basicGetPresentedBefore() {
-		return presentedBefore;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPresentedBefore(BreakdownElement newPresentedBefore) {
-		BreakdownElement oldPresentedBefore = presentedBefore;
-		presentedBefore = newPresentedBefore;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_BEFORE,
-					oldPresentedBefore, presentedBefore));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PlanningData getPlanningData() {
-		if (planningData != null && ((EObject) planningData).eIsProxy()) {
-			InternalEObject oldPlanningData = (InternalEObject) planningData;
-			planningData = (PlanningData) eResolveProxy(oldPlanningData);
-			if (planningData != oldPlanningData) {
-				InternalEObject newPlanningData = (InternalEObject) planningData;
-				NotificationChain msgs = oldPlanningData.eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA,
-						null, null);
-				if (newPlanningData.eInternalContainer() == null) {
-					msgs = newPlanningData
-							.eInverseAdd(
-									this,
-									EOPPOSITE_FEATURE_BASE
-											- UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA,
-									null, msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA,
-							oldPlanningData, planningData));
-			}
-		}
-		return planningData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PlanningData basicGetPlanningData() {
-		return planningData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPlanningData(PlanningData newPlanningData,
-			NotificationChain msgs) {
-		PlanningData oldPlanningData = planningData;
-		planningData = newPlanningData;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET,
-					UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA,
-					oldPlanningData, newPlanningData);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPlanningData(PlanningData newPlanningData) {
-		if (newPlanningData != planningData) {
-			NotificationChain msgs = null;
-			if (planningData != null)
-				msgs = ((InternalEObject) planningData).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA,
-						null, msgs);
-			if (newPlanningData != null)
-				msgs = ((InternalEObject) newPlanningData).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA,
-						null, msgs);
-			msgs = basicSetPlanningData(newPlanningData, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA,
-					newPlanningData, newPlanningData));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Activity getSuperActivities() {
-		if (superActivities != null && ((EObject) superActivities).eIsProxy()) {
-			InternalEObject oldSuperActivities = (InternalEObject) superActivities;
-			superActivities = (Activity) eResolveProxy(oldSuperActivities);
-			if (superActivities != oldSuperActivities) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.BREAKDOWN_ELEMENT__SUPER_ACTIVITIES,
-							oldSuperActivities, superActivities));
-			}
-		}
-		return superActivities;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Activity basicGetSuperActivities() {
-		return superActivities;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSuperActivities(
-			Activity newSuperActivities, NotificationChain msgs) {
-		Activity oldSuperActivities = superActivities;
-		superActivities = newSuperActivities;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET,
-					UmaPackage.BREAKDOWN_ELEMENT__SUPER_ACTIVITIES,
-					oldSuperActivities, newSuperActivities);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSuperActivities(Activity newSuperActivities) {
-		if (newSuperActivities != superActivities) {
-			NotificationChain msgs = null;
-			if (superActivities != null)
-				msgs = ((InternalEObject) superActivities).eInverseRemove(this,
-						UmaPackage.ACTIVITY__BREAKDOWN_ELEMENTS,
-						Activity.class, msgs);
-			if (newSuperActivities != null)
-				msgs = ((InternalEObject) newSuperActivities).eInverseAdd(this,
-						UmaPackage.ACTIVITY__BREAKDOWN_ELEMENTS,
-						Activity.class, msgs);
-			msgs = basicSetSuperActivities(newSuperActivities, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.BREAKDOWN_ELEMENT__SUPER_ACTIVITIES,
-					newSuperActivities, newSuperActivities));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.BREAKDOWN_ELEMENT__SUPER_ACTIVITIES:
-			if (superActivities != null)
-				msgs = ((InternalEObject) superActivities).eInverseRemove(this,
-						UmaPackage.ACTIVITY__BREAKDOWN_ELEMENTS,
-						Activity.class, msgs);
-			return basicSetSuperActivities((Activity) otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA:
-			return basicSetPlanningData(null, msgs);
-		case UmaPackage.BREAKDOWN_ELEMENT__SUPER_ACTIVITIES:
-			return basicSetSuperActivities(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.BREAKDOWN_ELEMENT__PREFIX:
-			return getPrefix();
-		case UmaPackage.BREAKDOWN_ELEMENT__IS_PLANNED:
-			return getIsPlanned();
-		case UmaPackage.BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES:
-			return getHasMultipleOccurrences();
-		case UmaPackage.BREAKDOWN_ELEMENT__IS_OPTIONAL:
-			return getIsOptional();
-		case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_AFTER:
-			if (resolve)
-				return getPresentedAfter();
-			return basicGetPresentedAfter();
-		case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_BEFORE:
-			if (resolve)
-				return getPresentedBefore();
-			return basicGetPresentedBefore();
-		case UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA:
-			if (resolve)
-				return getPlanningData();
-			return basicGetPlanningData();
-		case UmaPackage.BREAKDOWN_ELEMENT__SUPER_ACTIVITIES:
-			if (resolve)
-				return getSuperActivities();
-			return basicGetSuperActivities();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.BREAKDOWN_ELEMENT__PREFIX:
-			setPrefix((String) newValue);
-			return;
-		case UmaPackage.BREAKDOWN_ELEMENT__IS_PLANNED:
-			setIsPlanned((Boolean) newValue);
-			return;
-		case UmaPackage.BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES:
-			setHasMultipleOccurrences((Boolean) newValue);
-			return;
-		case UmaPackage.BREAKDOWN_ELEMENT__IS_OPTIONAL:
-			setIsOptional((Boolean) newValue);
-			return;
-		case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_AFTER:
-			setPresentedAfter((BreakdownElement) newValue);
-			return;
-		case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_BEFORE:
-			setPresentedBefore((BreakdownElement) newValue);
-			return;
-		case UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA:
-			setPlanningData((PlanningData) newValue);
-			return;
-		case UmaPackage.BREAKDOWN_ELEMENT__SUPER_ACTIVITIES:
-			setSuperActivities((Activity) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.BREAKDOWN_ELEMENT__PREFIX:
-			setPrefix(PREFIX_EDEFAULT);
-			return;
-		case UmaPackage.BREAKDOWN_ELEMENT__IS_PLANNED:
-			setIsPlanned(IS_PLANNED_EDEFAULT);
-			return;
-		case UmaPackage.BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES:
-			setHasMultipleOccurrences(HAS_MULTIPLE_OCCURRENCES_EDEFAULT);
-			return;
-		case UmaPackage.BREAKDOWN_ELEMENT__IS_OPTIONAL:
-			setIsOptional(IS_OPTIONAL_EDEFAULT);
-			return;
-		case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_AFTER:
-			setPresentedAfter((BreakdownElement) null);
-			return;
-		case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_BEFORE:
-			setPresentedBefore((BreakdownElement) null);
-			return;
-		case UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA:
-			setPlanningData((PlanningData) null);
-			return;
-		case UmaPackage.BREAKDOWN_ELEMENT__SUPER_ACTIVITIES:
-			setSuperActivities((Activity) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.BREAKDOWN_ELEMENT__PREFIX:
-			return PREFIX_EDEFAULT == null ? prefix != null : !PREFIX_EDEFAULT
-					.equals(prefix);
-		case UmaPackage.BREAKDOWN_ELEMENT__IS_PLANNED:
-			return IS_PLANNED_EDEFAULT == null ? isPlanned != null
-					: !IS_PLANNED_EDEFAULT.equals(isPlanned);
-		case UmaPackage.BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES:
-			return HAS_MULTIPLE_OCCURRENCES_EDEFAULT == null ? hasMultipleOccurrences != null
-					: !HAS_MULTIPLE_OCCURRENCES_EDEFAULT
-							.equals(hasMultipleOccurrences);
-		case UmaPackage.BREAKDOWN_ELEMENT__IS_OPTIONAL:
-			return IS_OPTIONAL_EDEFAULT == null ? isOptional != null
-					: !IS_OPTIONAL_EDEFAULT.equals(isOptional);
-		case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_AFTER:
-			return presentedAfter != null;
-		case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_BEFORE:
-			return presentedBefore != null;
-		case UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA:
-			return planningData != null;
-		case UmaPackage.BREAKDOWN_ELEMENT__SUPER_ACTIVITIES:
-			return superActivities != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (prefix: "); //$NON-NLS-1$
-		result.append(prefix);
-		result.append(", isPlanned: "); //$NON-NLS-1$
-		result.append(isPlanned);
-		result.append(", hasMultipleOccurrences: "); //$NON-NLS-1$
-		result.append(hasMultipleOccurrences);
-		result.append(", isOptional: "); //$NON-NLS-1$
-		result.append(isOptional);
-		result.append(')');
-		return result.toString();
-	}
-
-} //BreakdownElementImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/CapabilityPatternImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/CapabilityPatternImpl.java
deleted file mode 100755
index 5f5739a..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/CapabilityPatternImpl.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Capability Pattern</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class CapabilityPatternImpl extends ProcessImpl implements
-		CapabilityPattern {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CapabilityPatternImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CAPABILITY_PATTERN;
-	}
-
-} //CapabilityPatternImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ChecklistImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ChecklistImpl.java
deleted file mode 100755
index 7265421..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ChecklistImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Checklist</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ChecklistImpl extends GuidanceImpl implements Checklist {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ChecklistImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CHECKLIST;
-	}
-
-} //ChecklistImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ClassifierImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ClassifierImpl.java
deleted file mode 100755
index 7c033ff..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ClassifierImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Classifier;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Classifier</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class ClassifierImpl extends TypeImpl implements Classifier {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ClassifierImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CLASSIFIER;
-	}
-
-} //ClassifierImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/CompositeRoleImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/CompositeRoleImpl.java
deleted file mode 100755
index c2bb13a..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/CompositeRoleImpl.java
+++ /dev/null
@@ -1,152 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.CompositeRole;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Composite Role</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.CompositeRoleImpl#getAggregatedRoles <em>Aggregated Roles</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CompositeRoleImpl extends RoleDescriptorImpl implements
-		CompositeRole {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getAggregatedRoles() <em>Aggregated Roles</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAggregatedRoles()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList aggregatedRoles = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CompositeRoleImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.COMPOSITE_ROLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getAggregatedRoles() {
-		if (aggregatedRoles == null) {
-			aggregatedRoles = new EObjectResolvingEList(Role.class, this,
-					UmaPackage.COMPOSITE_ROLE__AGGREGATED_ROLES);
-		}
-		return aggregatedRoles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.COMPOSITE_ROLE__AGGREGATED_ROLES:
-			return getAggregatedRoles();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.COMPOSITE_ROLE__AGGREGATED_ROLES:
-			getAggregatedRoles().clear();
-			getAggregatedRoles().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.COMPOSITE_ROLE__AGGREGATED_ROLES:
-			getAggregatedRoles().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.COMPOSITE_ROLE__AGGREGATED_ROLES:
-			return aggregatedRoles != null && !aggregatedRoles.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //CompositeRoleImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ConceptImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ConceptImpl.java
deleted file mode 100755
index 90353ee..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ConceptImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Concept</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ConceptImpl extends GuidanceImpl implements Concept {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConceptImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CONCEPT;
-	}
-
-} //ConceptImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ConstraintImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ConstraintImpl.java
deleted file mode 100755
index de8d691..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ConstraintImpl.java
+++ /dev/null
@@ -1,182 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.Constraint;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ConstraintImpl#getBody <em>Body</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ConstraintImpl extends MethodElementImpl implements Constraint {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getBody() <em>Body</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBody()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String BODY_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBody()
-	 * @generated
-	 * @ordered
-	 */
-	protected String body = BODY_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConstraintImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CONSTRAINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getBody() {
-		return body;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBody(String newBody) {
-		String oldBody = body;
-		body = newBody;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.CONSTRAINT__BODY, oldBody, body));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.CONSTRAINT__BODY:
-			return getBody();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.CONSTRAINT__BODY:
-			setBody((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.CONSTRAINT__BODY:
-			setBody(BODY_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.CONSTRAINT__BODY:
-			return BODY_EDEFAULT == null ? body != null : !BODY_EDEFAULT
-					.equals(body);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (body: "); //$NON-NLS-1$
-		result.append(body);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ConstraintImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ContentCategoryImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ContentCategoryImpl.java
deleted file mode 100755
index 0658a74..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ContentCategoryImpl.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.ContentCategory;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Content Category</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class ContentCategoryImpl extends ContentElementImpl implements
-		ContentCategory {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContentCategoryImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CONTENT_CATEGORY;
-	}
-
-} //ContentCategoryImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ContentDescriptionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ContentDescriptionImpl.java
deleted file mode 100755
index 219f1ae..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ContentDescriptionImpl.java
+++ /dev/null
@@ -1,299 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.Section;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Content Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ContentDescriptionImpl#getMainDescription <em>Main Description</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ContentDescriptionImpl#getSections <em>Sections</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ContentDescriptionImpl#getKeyConsiderations <em>Key Considerations</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ContentDescriptionImpl extends MethodUnitImpl implements
-		ContentDescription {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getMainDescription() <em>Main Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMainDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAIN_DESCRIPTION_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getMainDescription() <em>Main Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMainDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mainDescription = MAIN_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getSections() <em>Sections</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSections()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList sections = null;
-
-	/**
-	 * The default value of the '{@link #getKeyConsiderations() <em>Key Considerations</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getKeyConsiderations()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String KEY_CONSIDERATIONS_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getKeyConsiderations() <em>Key Considerations</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getKeyConsiderations()
-	 * @generated
-	 * @ordered
-	 */
-	protected String keyConsiderations = KEY_CONSIDERATIONS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContentDescriptionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CONTENT_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMainDescription() {
-		return mainDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMainDescription(String newMainDescription) {
-		String oldMainDescription = mainDescription;
-		mainDescription = newMainDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.CONTENT_DESCRIPTION__MAIN_DESCRIPTION,
-					oldMainDescription, mainDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSections() {
-		if (sections == null) {
-			sections = new EObjectContainmentEList.Resolving(Section.class,
-					this, UmaPackage.CONTENT_DESCRIPTION__SECTIONS);
-		}
-		return sections;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getKeyConsiderations() {
-		return keyConsiderations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKeyConsiderations(String newKeyConsiderations) {
-		String oldKeyConsiderations = keyConsiderations;
-		keyConsiderations = newKeyConsiderations;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.CONTENT_DESCRIPTION__KEY_CONSIDERATIONS,
-					oldKeyConsiderations, keyConsiderations));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.CONTENT_DESCRIPTION__SECTIONS:
-			return ((InternalEList) getSections()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.CONTENT_DESCRIPTION__MAIN_DESCRIPTION:
-			return getMainDescription();
-		case UmaPackage.CONTENT_DESCRIPTION__SECTIONS:
-			return getSections();
-		case UmaPackage.CONTENT_DESCRIPTION__KEY_CONSIDERATIONS:
-			return getKeyConsiderations();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.CONTENT_DESCRIPTION__MAIN_DESCRIPTION:
-			setMainDescription((String) newValue);
-			return;
-		case UmaPackage.CONTENT_DESCRIPTION__SECTIONS:
-			getSections().clear();
-			getSections().addAll((Collection) newValue);
-			return;
-		case UmaPackage.CONTENT_DESCRIPTION__KEY_CONSIDERATIONS:
-			setKeyConsiderations((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.CONTENT_DESCRIPTION__MAIN_DESCRIPTION:
-			setMainDescription(MAIN_DESCRIPTION_EDEFAULT);
-			return;
-		case UmaPackage.CONTENT_DESCRIPTION__SECTIONS:
-			getSections().clear();
-			return;
-		case UmaPackage.CONTENT_DESCRIPTION__KEY_CONSIDERATIONS:
-			setKeyConsiderations(KEY_CONSIDERATIONS_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.CONTENT_DESCRIPTION__MAIN_DESCRIPTION:
-			return MAIN_DESCRIPTION_EDEFAULT == null ? mainDescription != null
-					: !MAIN_DESCRIPTION_EDEFAULT.equals(mainDescription);
-		case UmaPackage.CONTENT_DESCRIPTION__SECTIONS:
-			return sections != null && !sections.isEmpty();
-		case UmaPackage.CONTENT_DESCRIPTION__KEY_CONSIDERATIONS:
-			return KEY_CONSIDERATIONS_EDEFAULT == null ? keyConsiderations != null
-					: !KEY_CONSIDERATIONS_EDEFAULT.equals(keyConsiderations);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mainDescription: "); //$NON-NLS-1$
-		result.append(mainDescription);
-		result.append(", keyConsiderations: "); //$NON-NLS-1$
-		result.append(keyConsiderations);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ContentDescriptionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ContentElementImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ContentElementImpl.java
deleted file mode 100755
index 7fba60a..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ContentElementImpl.java
+++ /dev/null
@@ -1,540 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.epf.uma.util.UmaUtil;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Content Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ContentElementImpl#getVariabilityType <em>Variability Type</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ContentElementImpl#getVariabilityBasedOnElement <em>Variability Based On Element</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ContentElementImpl#getSupportingMaterials <em>Supporting Materials</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ContentElementImpl#getConceptsAndPapers <em>Concepts And Papers</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ContentElementImpl#getChecklists <em>Checklists</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ContentElementImpl#getGuidelines <em>Guidelines</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ContentElementImpl#getExamples <em>Examples</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ContentElementImpl#getAssets <em>Assets</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ContentElementImpl extends DescribableElementImpl
-		implements ContentElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getVariabilityType() <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final VariabilityType VARIABILITY_TYPE_EDEFAULT = VariabilityType.NA_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getVariabilityType() <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityType()
-	 * @generated
-	 * @ordered
-	 */
-	protected VariabilityType variabilityType = VARIABILITY_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getVariabilityBasedOnElement() <em>Variability Based On Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityBasedOnElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected VariabilityElement variabilityBasedOnElement = null;
-
-	/**
-	 * The cached value of the '{@link #getSupportingMaterials() <em>Supporting Materials</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSupportingMaterials()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList supportingMaterials = null;
-
-	/**
-	 * The cached value of the '{@link #getConceptsAndPapers() <em>Concepts And Papers</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConceptsAndPapers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList conceptsAndPapers = null;
-
-	/**
-	 * The cached value of the '{@link #getChecklists() <em>Checklists</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChecklists()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList checklists = null;
-
-	/**
-	 * The cached value of the '{@link #getGuidelines() <em>Guidelines</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGuidelines()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList guidelines = null;
-
-	/**
-	 * The cached value of the '{@link #getExamples() <em>Examples</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExamples()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList examples = null;
-
-	/**
-	 * The cached value of the '{@link #getAssets() <em>Assets</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAssets()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList assets = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContentElementImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CONTENT_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityType getVariabilityType() {
-		return variabilityType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVariabilityType(VariabilityType newVariabilityType) {
-		VariabilityType oldVariabilityType = variabilityType;
-		variabilityType = newVariabilityType == null ? VARIABILITY_TYPE_EDEFAULT
-				: newVariabilityType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.CONTENT_ELEMENT__VARIABILITY_TYPE,
-					oldVariabilityType, variabilityType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityElement getVariabilityBasedOnElement() {
-		if (variabilityBasedOnElement != null
-				&& ((EObject) variabilityBasedOnElement).eIsProxy()) {
-			InternalEObject oldVariabilityBasedOnElement = (InternalEObject) variabilityBasedOnElement;
-			variabilityBasedOnElement = (VariabilityElement) eResolveProxy(oldVariabilityBasedOnElement);
-			if (variabilityBasedOnElement != oldVariabilityBasedOnElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-							this,
-							Notification.RESOLVE,
-							UmaPackage.CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT,
-							oldVariabilityBasedOnElement,
-							variabilityBasedOnElement));
-			}
-		}
-		return variabilityBasedOnElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityElement basicGetVariabilityBasedOnElement() {
-		return variabilityBasedOnElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVariabilityBasedOnElement(
-			VariabilityElement newVariabilityBasedOnElement) {
-		VariabilityElement oldVariabilityBasedOnElement = variabilityBasedOnElement;
-		variabilityBasedOnElement = newVariabilityBasedOnElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT,
-					oldVariabilityBasedOnElement, variabilityBasedOnElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getConceptsAndPapers() {
-		if (conceptsAndPapers == null) {
-			conceptsAndPapers = new EObjectResolvingEList(Concept.class, this,
-					UmaPackage.CONTENT_ELEMENT__CONCEPTS_AND_PAPERS);
-		}
-		return conceptsAndPapers;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getChecklists() {
-		if (checklists == null) {
-			checklists = new EObjectResolvingEList(Checklist.class, this,
-					UmaPackage.CONTENT_ELEMENT__CHECKLISTS);
-		}
-		return checklists;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getGuidelines() {
-		if (guidelines == null) {
-			guidelines = new EObjectResolvingEList(Guideline.class, this,
-					UmaPackage.CONTENT_ELEMENT__GUIDELINES);
-		}
-		return guidelines;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getExamples() {
-		if (examples == null) {
-			examples = new EObjectResolvingEList(Example.class, this,
-					UmaPackage.CONTENT_ELEMENT__EXAMPLES);
-		}
-		return examples;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getAssets() {
-		if (assets == null) {
-			assets = new EObjectResolvingEList(ReusableAsset.class, this,
-					UmaPackage.CONTENT_ELEMENT__ASSETS);
-		}
-		return assets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.CONTENT_ELEMENT__VARIABILITY_TYPE:
-			return getVariabilityType();
-		case UmaPackage.CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-			if (resolve)
-				return getVariabilityBasedOnElement();
-			return basicGetVariabilityBasedOnElement();
-		case UmaPackage.CONTENT_ELEMENT__SUPPORTING_MATERIALS:
-			return getSupportingMaterials();
-		case UmaPackage.CONTENT_ELEMENT__CONCEPTS_AND_PAPERS:
-			return getConceptsAndPapers();
-		case UmaPackage.CONTENT_ELEMENT__CHECKLISTS:
-			return getChecklists();
-		case UmaPackage.CONTENT_ELEMENT__GUIDELINES:
-			return getGuidelines();
-		case UmaPackage.CONTENT_ELEMENT__EXAMPLES:
-			return getExamples();
-		case UmaPackage.CONTENT_ELEMENT__ASSETS:
-			return getAssets();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.CONTENT_ELEMENT__VARIABILITY_TYPE:
-			setVariabilityType((VariabilityType) newValue);
-			return;
-		case UmaPackage.CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-			setVariabilityBasedOnElement((VariabilityElement) newValue);
-			return;
-		case UmaPackage.CONTENT_ELEMENT__SUPPORTING_MATERIALS:
-			getSupportingMaterials().clear();
-			getSupportingMaterials().addAll((Collection) newValue);
-			return;
-		case UmaPackage.CONTENT_ELEMENT__CONCEPTS_AND_PAPERS:
-			getConceptsAndPapers().clear();
-			getConceptsAndPapers().addAll((Collection) newValue);
-			return;
-		case UmaPackage.CONTENT_ELEMENT__CHECKLISTS:
-			getChecklists().clear();
-			getChecklists().addAll((Collection) newValue);
-			return;
-		case UmaPackage.CONTENT_ELEMENT__GUIDELINES:
-			getGuidelines().clear();
-			getGuidelines().addAll((Collection) newValue);
-			return;
-		case UmaPackage.CONTENT_ELEMENT__EXAMPLES:
-			getExamples().clear();
-			getExamples().addAll((Collection) newValue);
-			return;
-		case UmaPackage.CONTENT_ELEMENT__ASSETS:
-			getAssets().clear();
-			getAssets().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.CONTENT_ELEMENT__VARIABILITY_TYPE:
-			setVariabilityType(VARIABILITY_TYPE_EDEFAULT);
-			return;
-		case UmaPackage.CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-			setVariabilityBasedOnElement((VariabilityElement) null);
-			return;
-		case UmaPackage.CONTENT_ELEMENT__SUPPORTING_MATERIALS:
-			getSupportingMaterials().clear();
-			return;
-		case UmaPackage.CONTENT_ELEMENT__CONCEPTS_AND_PAPERS:
-			getConceptsAndPapers().clear();
-			return;
-		case UmaPackage.CONTENT_ELEMENT__CHECKLISTS:
-			getChecklists().clear();
-			return;
-		case UmaPackage.CONTENT_ELEMENT__GUIDELINES:
-			getGuidelines().clear();
-			return;
-		case UmaPackage.CONTENT_ELEMENT__EXAMPLES:
-			getExamples().clear();
-			return;
-		case UmaPackage.CONTENT_ELEMENT__ASSETS:
-			getAssets().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.CONTENT_ELEMENT__VARIABILITY_TYPE:
-			return variabilityType != VARIABILITY_TYPE_EDEFAULT;
-		case UmaPackage.CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-			return variabilityBasedOnElement != null;
-		case UmaPackage.CONTENT_ELEMENT__SUPPORTING_MATERIALS:
-			return supportingMaterials != null
-					&& !supportingMaterials.isEmpty();
-		case UmaPackage.CONTENT_ELEMENT__CONCEPTS_AND_PAPERS:
-			return conceptsAndPapers != null && !conceptsAndPapers.isEmpty();
-		case UmaPackage.CONTENT_ELEMENT__CHECKLISTS:
-			return checklists != null && !checklists.isEmpty();
-		case UmaPackage.CONTENT_ELEMENT__GUIDELINES:
-			return guidelines != null && !guidelines.isEmpty();
-		case UmaPackage.CONTENT_ELEMENT__EXAMPLES:
-			return examples != null && !examples.isEmpty();
-		case UmaPackage.CONTENT_ELEMENT__ASSETS:
-			return assets != null && !assets.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSupportingMaterials() {
-		if (supportingMaterials == null) {
-			supportingMaterials = new EObjectResolvingEList(
-					SupportingMaterial.class, this,
-					UmaPackage.CONTENT_ELEMENT__SUPPORTING_MATERIALS);
-		}
-		return supportingMaterials;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
-		if (baseClass == VariabilityElement.class) {
-			switch (derivedFeatureID) {
-			case UmaPackage.CONTENT_ELEMENT__VARIABILITY_TYPE:
-				return UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_TYPE;
-			case UmaPackage.CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-				return UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT;
-			default:
-				return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
-		if (baseClass == VariabilityElement.class) {
-			switch (baseFeatureID) {
-			case UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_TYPE:
-				return UmaPackage.CONTENT_ELEMENT__VARIABILITY_TYPE;
-			case UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-				return UmaPackage.CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT;
-			default:
-				return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (variabilityType: "); //$NON-NLS-1$
-		result.append(variabilityType);
-		result.append(')');
-		return result.toString();
-	}
-
-	//
-	// Start custom code
-	//
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.impl.NamedElementImpl#setName(java.lang.String)
-	 */
-	public void setName(String newName) {
-		if (presentation == null) {
-			super.setName(newName);
-			return;
-		}
-
-		String oldName = name;
-		super.setName(newName);
-		if (newName != null && !newName.equals(oldName)) {
-			presentation.setName(UmaUtil.createContentDescriptionName(this));
-		}
-	}
-
-} //ContentElementImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ContentPackageImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ContentPackageImpl.java
deleted file mode 100755
index 8e70c0c..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ContentPackageImpl.java
+++ /dev/null
@@ -1,171 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Content Package</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ContentPackageImpl#getContentElements <em>Content Elements</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ContentPackageImpl extends MethodPackageImpl implements
-		ContentPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getContentElements() <em>Content Elements</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContentElements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList contentElements = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContentPackageImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CONTENT_PACKAGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getContentElements() {
-		if (contentElements == null) {
-			contentElements = new EObjectContainmentEList.Resolving(
-					ContentElement.class, this,
-					UmaPackage.CONTENT_PACKAGE__CONTENT_ELEMENTS);
-		}
-		return contentElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.CONTENT_PACKAGE__CONTENT_ELEMENTS:
-			return ((InternalEList) getContentElements()).basicRemove(otherEnd,
-					msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.CONTENT_PACKAGE__CONTENT_ELEMENTS:
-			return getContentElements();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.CONTENT_PACKAGE__CONTENT_ELEMENTS:
-			getContentElements().clear();
-			getContentElements().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.CONTENT_PACKAGE__CONTENT_ELEMENTS:
-			getContentElements().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.CONTENT_PACKAGE__CONTENT_ELEMENTS:
-			return contentElements != null && !contentElements.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ContentPackageImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/CoreSemanticModelBridgeImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/CoreSemanticModelBridgeImpl.java
deleted file mode 100755
index 2b3f614..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/CoreSemanticModelBridgeImpl.java
+++ /dev/null
@@ -1,181 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.CoreSemanticModelBridge;
-import org.eclipse.epf.uma.Element;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Core Semantic Model Bridge</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.CoreSemanticModelBridgeImpl#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CoreSemanticModelBridgeImpl extends SemanticModelBridgeImpl
-		implements CoreSemanticModelBridge {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected Element element = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CoreSemanticModelBridgeImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CORE_SEMANTIC_MODEL_BRIDGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Element getElement() {
-		if (element != null && ((EObject) element).eIsProxy()) {
-			InternalEObject oldElement = (InternalEObject) element;
-			element = (Element) eResolveProxy(oldElement);
-			if (element != oldElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.CORE_SEMANTIC_MODEL_BRIDGE__ELEMENT,
-							oldElement, element));
-			}
-		}
-		return element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Element basicGetElement() {
-		return element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setElement(Element newElement) {
-		Element oldElement = element;
-		element = newElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.CORE_SEMANTIC_MODEL_BRIDGE__ELEMENT, oldElement,
-					element));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.CORE_SEMANTIC_MODEL_BRIDGE__ELEMENT:
-			if (resolve)
-				return getElement();
-			return basicGetElement();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.CORE_SEMANTIC_MODEL_BRIDGE__ELEMENT:
-			setElement((Element) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.CORE_SEMANTIC_MODEL_BRIDGE__ELEMENT:
-			setElement((Element) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.CORE_SEMANTIC_MODEL_BRIDGE__ELEMENT:
-			return element != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //CoreSemanticModelBridgeImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/CustomCategoryImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/CustomCategoryImpl.java
deleted file mode 100755
index 2a478f3..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/CustomCategoryImpl.java
+++ /dev/null
@@ -1,190 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.ContentCategory;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Custom Category</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.CustomCategoryImpl#getCategorizedElements <em>Categorized Elements</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.CustomCategoryImpl#getSubCategories <em>Sub Categories</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CustomCategoryImpl extends ContentCategoryImpl implements
-		CustomCategory {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getCategorizedElements() <em>Categorized Elements</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCategorizedElements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList categorizedElements = null;
-
-	/**
-	 * The cached value of the '{@link #getSubCategories() <em>Sub Categories</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubCategories()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList subCategories = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomCategoryImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CUSTOM_CATEGORY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getCategorizedElements() {
-		if (categorizedElements == null) {
-			categorizedElements = new EObjectResolvingEList(
-					DescribableElement.class, this,
-					UmaPackage.CUSTOM_CATEGORY__CATEGORIZED_ELEMENTS);
-		}
-		return categorizedElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSubCategories() {
-		if (subCategories == null) {
-			subCategories = new EObjectResolvingEList(ContentCategory.class,
-					this, UmaPackage.CUSTOM_CATEGORY__SUB_CATEGORIES);
-		}
-		return subCategories;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.CUSTOM_CATEGORY__CATEGORIZED_ELEMENTS:
-			return getCategorizedElements();
-		case UmaPackage.CUSTOM_CATEGORY__SUB_CATEGORIES:
-			return getSubCategories();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.CUSTOM_CATEGORY__CATEGORIZED_ELEMENTS:
-			getCategorizedElements().clear();
-			getCategorizedElements().addAll((Collection) newValue);
-			return;
-		case UmaPackage.CUSTOM_CATEGORY__SUB_CATEGORIES:
-			getSubCategories().clear();
-			getSubCategories().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.CUSTOM_CATEGORY__CATEGORIZED_ELEMENTS:
-			getCategorizedElements().clear();
-			return;
-		case UmaPackage.CUSTOM_CATEGORY__SUB_CATEGORIES:
-			getSubCategories().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.CUSTOM_CATEGORY__CATEGORIZED_ELEMENTS:
-			return categorizedElements != null
-					&& !categorizedElements.isEmpty();
-		case UmaPackage.CUSTOM_CATEGORY__SUB_CATEGORIES:
-			return subCategories != null && !subCategories.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //CustomCategoryImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DeliverableDescriptionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DeliverableDescriptionImpl.java
deleted file mode 100755
index 17d2dc4..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DeliverableDescriptionImpl.java
+++ /dev/null
@@ -1,242 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.DeliverableDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Deliverable Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.DeliverableDescriptionImpl#getExternalDescription <em>External Description</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DeliverableDescriptionImpl#getPackagingGuidance <em>Packaging Guidance</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DeliverableDescriptionImpl extends WorkProductDescriptionImpl
-		implements DeliverableDescription {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getExternalDescription() <em>External Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExternalDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXTERNAL_DESCRIPTION_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getExternalDescription() <em>External Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExternalDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String externalDescription = EXTERNAL_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPackagingGuidance() <em>Packaging Guidance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPackagingGuidance()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PACKAGING_GUIDANCE_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getPackagingGuidance() <em>Packaging Guidance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPackagingGuidance()
-	 * @generated
-	 * @ordered
-	 */
-	protected String packagingGuidance = PACKAGING_GUIDANCE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DeliverableDescriptionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DELIVERABLE_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getExternalDescription() {
-		return externalDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExternalDescription(String newExternalDescription) {
-		String oldExternalDescription = externalDescription;
-		externalDescription = newExternalDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION,
-					oldExternalDescription, externalDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPackagingGuidance() {
-		return packagingGuidance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPackagingGuidance(String newPackagingGuidance) {
-		String oldPackagingGuidance = packagingGuidance;
-		packagingGuidance = newPackagingGuidance;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE,
-					oldPackagingGuidance, packagingGuidance));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION:
-			return getExternalDescription();
-		case UmaPackage.DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE:
-			return getPackagingGuidance();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION:
-			setExternalDescription((String) newValue);
-			return;
-		case UmaPackage.DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE:
-			setPackagingGuidance((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION:
-			setExternalDescription(EXTERNAL_DESCRIPTION_EDEFAULT);
-			return;
-		case UmaPackage.DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE:
-			setPackagingGuidance(PACKAGING_GUIDANCE_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION:
-			return EXTERNAL_DESCRIPTION_EDEFAULT == null ? externalDescription != null
-					: !EXTERNAL_DESCRIPTION_EDEFAULT
-							.equals(externalDescription);
-		case UmaPackage.DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE:
-			return PACKAGING_GUIDANCE_EDEFAULT == null ? packagingGuidance != null
-					: !PACKAGING_GUIDANCE_EDEFAULT.equals(packagingGuidance);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (externalDescription: "); //$NON-NLS-1$
-		result.append(externalDescription);
-		result.append(", packagingGuidance: "); //$NON-NLS-1$
-		result.append(packagingGuidance);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DeliverableDescriptionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DeliverableImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DeliverableImpl.java
deleted file mode 100755
index 4a00f47..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DeliverableImpl.java
+++ /dev/null
@@ -1,153 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.Deliverable;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Deliverable</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.DeliverableImpl#getDeliveredWorkProducts <em>Delivered Work Products</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DeliverableImpl extends WorkProductImpl implements Deliverable {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getDeliveredWorkProducts() <em>Delivered Work Products</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDeliveredWorkProducts()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList deliveredWorkProducts = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DeliverableImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DELIVERABLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDeliveredWorkProducts() {
-		if (deliveredWorkProducts == null) {
-			deliveredWorkProducts = new EObjectResolvingEList(
-					WorkProduct.class, this,
-					UmaPackage.DELIVERABLE__DELIVERED_WORK_PRODUCTS);
-		}
-		return deliveredWorkProducts;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.DELIVERABLE__DELIVERED_WORK_PRODUCTS:
-			return getDeliveredWorkProducts();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.DELIVERABLE__DELIVERED_WORK_PRODUCTS:
-			getDeliveredWorkProducts().clear();
-			getDeliveredWorkProducts().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.DELIVERABLE__DELIVERED_WORK_PRODUCTS:
-			getDeliveredWorkProducts().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.DELIVERABLE__DELIVERED_WORK_PRODUCTS:
-			return deliveredWorkProducts != null
-					&& !deliveredWorkProducts.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //DeliverableImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DeliveryProcessDescriptionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DeliveryProcessDescriptionImpl.java
deleted file mode 100755
index f6b0e6b..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DeliveryProcessDescriptionImpl.java
+++ /dev/null
@@ -1,478 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.DeliveryProcessDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Delivery Process Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.DeliveryProcessDescriptionImpl#getScale <em>Scale</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DeliveryProcessDescriptionImpl#getProjectCharacteristics <em>Project Characteristics</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DeliveryProcessDescriptionImpl#getRiskLevel <em>Risk Level</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DeliveryProcessDescriptionImpl#getEstimatingTechnique <em>Estimating Technique</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DeliveryProcessDescriptionImpl#getProjectMemberExpertise <em>Project Member Expertise</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DeliveryProcessDescriptionImpl#getTypeOfContract <em>Type Of Contract</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DeliveryProcessDescriptionImpl extends ProcessDescriptionImpl
-		implements DeliveryProcessDescription {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getScale() <em>Scale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getScale()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SCALE_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getScale() <em>Scale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getScale()
-	 * @generated
-	 * @ordered
-	 */
-	protected String scale = SCALE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getProjectCharacteristics() <em>Project Characteristics</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProjectCharacteristics()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PROJECT_CHARACTERISTICS_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getProjectCharacteristics() <em>Project Characteristics</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProjectCharacteristics()
-	 * @generated
-	 * @ordered
-	 */
-	protected String projectCharacteristics = PROJECT_CHARACTERISTICS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRiskLevel() <em>Risk Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRiskLevel()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String RISK_LEVEL_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getRiskLevel() <em>Risk Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRiskLevel()
-	 * @generated
-	 * @ordered
-	 */
-	protected String riskLevel = RISK_LEVEL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEstimatingTechnique() <em>Estimating Technique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEstimatingTechnique()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ESTIMATING_TECHNIQUE_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getEstimatingTechnique() <em>Estimating Technique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEstimatingTechnique()
-	 * @generated
-	 * @ordered
-	 */
-	protected String estimatingTechnique = ESTIMATING_TECHNIQUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getProjectMemberExpertise() <em>Project Member Expertise</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProjectMemberExpertise()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PROJECT_MEMBER_EXPERTISE_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getProjectMemberExpertise() <em>Project Member Expertise</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProjectMemberExpertise()
-	 * @generated
-	 * @ordered
-	 */
-	protected String projectMemberExpertise = PROJECT_MEMBER_EXPERTISE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTypeOfContract() <em>Type Of Contract</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeOfContract()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_OF_CONTRACT_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getTypeOfContract() <em>Type Of Contract</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeOfContract()
-	 * @generated
-	 * @ordered
-	 */
-	protected String typeOfContract = TYPE_OF_CONTRACT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DeliveryProcessDescriptionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DELIVERY_PROCESS_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getScale() {
-		return scale;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setScale(String newScale) {
-		String oldScale = scale;
-		scale = newScale;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DELIVERY_PROCESS_DESCRIPTION__SCALE, oldScale,
-					scale));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getProjectCharacteristics() {
-		return projectCharacteristics;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setProjectCharacteristics(String newProjectCharacteristics) {
-		String oldProjectCharacteristics = projectCharacteristics;
-		projectCharacteristics = newProjectCharacteristics;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(
-					this,
-					Notification.SET,
-					UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS,
-					oldProjectCharacteristics, projectCharacteristics));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRiskLevel() {
-		return riskLevel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRiskLevel(String newRiskLevel) {
-		String oldRiskLevel = riskLevel;
-		riskLevel = newRiskLevel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL,
-					oldRiskLevel, riskLevel));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEstimatingTechnique() {
-		return estimatingTechnique;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEstimatingTechnique(String newEstimatingTechnique) {
-		String oldEstimatingTechnique = estimatingTechnique;
-		estimatingTechnique = newEstimatingTechnique;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(
-					this,
-					Notification.SET,
-					UmaPackage.DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE,
-					oldEstimatingTechnique, estimatingTechnique));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getProjectMemberExpertise() {
-		return projectMemberExpertise;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setProjectMemberExpertise(String newProjectMemberExpertise) {
-		String oldProjectMemberExpertise = projectMemberExpertise;
-		projectMemberExpertise = newProjectMemberExpertise;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(
-					this,
-					Notification.SET,
-					UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE,
-					oldProjectMemberExpertise, projectMemberExpertise));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTypeOfContract() {
-		return typeOfContract;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypeOfContract(String newTypeOfContract) {
-		String oldTypeOfContract = typeOfContract;
-		typeOfContract = newTypeOfContract;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT,
-					oldTypeOfContract, typeOfContract));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__SCALE:
-			return getScale();
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS:
-			return getProjectCharacteristics();
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL:
-			return getRiskLevel();
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE:
-			return getEstimatingTechnique();
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE:
-			return getProjectMemberExpertise();
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT:
-			return getTypeOfContract();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__SCALE:
-			setScale((String) newValue);
-			return;
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS:
-			setProjectCharacteristics((String) newValue);
-			return;
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL:
-			setRiskLevel((String) newValue);
-			return;
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE:
-			setEstimatingTechnique((String) newValue);
-			return;
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE:
-			setProjectMemberExpertise((String) newValue);
-			return;
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT:
-			setTypeOfContract((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__SCALE:
-			setScale(SCALE_EDEFAULT);
-			return;
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS:
-			setProjectCharacteristics(PROJECT_CHARACTERISTICS_EDEFAULT);
-			return;
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL:
-			setRiskLevel(RISK_LEVEL_EDEFAULT);
-			return;
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE:
-			setEstimatingTechnique(ESTIMATING_TECHNIQUE_EDEFAULT);
-			return;
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE:
-			setProjectMemberExpertise(PROJECT_MEMBER_EXPERTISE_EDEFAULT);
-			return;
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT:
-			setTypeOfContract(TYPE_OF_CONTRACT_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__SCALE:
-			return SCALE_EDEFAULT == null ? scale != null : !SCALE_EDEFAULT
-					.equals(scale);
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS:
-			return PROJECT_CHARACTERISTICS_EDEFAULT == null ? projectCharacteristics != null
-					: !PROJECT_CHARACTERISTICS_EDEFAULT
-							.equals(projectCharacteristics);
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL:
-			return RISK_LEVEL_EDEFAULT == null ? riskLevel != null
-					: !RISK_LEVEL_EDEFAULT.equals(riskLevel);
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE:
-			return ESTIMATING_TECHNIQUE_EDEFAULT == null ? estimatingTechnique != null
-					: !ESTIMATING_TECHNIQUE_EDEFAULT
-							.equals(estimatingTechnique);
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE:
-			return PROJECT_MEMBER_EXPERTISE_EDEFAULT == null ? projectMemberExpertise != null
-					: !PROJECT_MEMBER_EXPERTISE_EDEFAULT
-							.equals(projectMemberExpertise);
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT:
-			return TYPE_OF_CONTRACT_EDEFAULT == null ? typeOfContract != null
-					: !TYPE_OF_CONTRACT_EDEFAULT.equals(typeOfContract);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (scale: "); //$NON-NLS-1$
-		result.append(scale);
-		result.append(", projectCharacteristics: "); //$NON-NLS-1$
-		result.append(projectCharacteristics);
-		result.append(", riskLevel: "); //$NON-NLS-1$
-		result.append(riskLevel);
-		result.append(", estimatingTechnique: "); //$NON-NLS-1$
-		result.append(estimatingTechnique);
-		result.append(", projectMemberExpertise: "); //$NON-NLS-1$
-		result.append(projectMemberExpertise);
-		result.append(", typeOfContract: "); //$NON-NLS-1$
-		result.append(typeOfContract);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DeliveryProcessDescriptionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DeliveryProcessImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DeliveryProcessImpl.java
deleted file mode 100755
index d3ebef9..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DeliveryProcessImpl.java
+++ /dev/null
@@ -1,189 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Delivery Process</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.DeliveryProcessImpl#getEducationMaterials <em>Education Materials</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DeliveryProcessImpl#getCommunicationsMaterials <em>Communications Materials</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DeliveryProcessImpl extends ProcessImpl implements DeliveryProcess {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getEducationMaterials() <em>Education Materials</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEducationMaterials()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList educationMaterials = null;
-
-	/**
-	 * The cached value of the '{@link #getCommunicationsMaterials() <em>Communications Materials</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCommunicationsMaterials()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList communicationsMaterials = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DeliveryProcessImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DELIVERY_PROCESS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEducationMaterials() {
-		if (educationMaterials == null) {
-			educationMaterials = new EObjectResolvingEList(
-					SupportingMaterial.class, this,
-					UmaPackage.DELIVERY_PROCESS__EDUCATION_MATERIALS);
-		}
-		return educationMaterials;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getCommunicationsMaterials() {
-		if (communicationsMaterials == null) {
-			communicationsMaterials = new EObjectResolvingEList(
-					SupportingMaterial.class, this,
-					UmaPackage.DELIVERY_PROCESS__COMMUNICATIONS_MATERIALS);
-		}
-		return communicationsMaterials;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.DELIVERY_PROCESS__EDUCATION_MATERIALS:
-			return getEducationMaterials();
-		case UmaPackage.DELIVERY_PROCESS__COMMUNICATIONS_MATERIALS:
-			return getCommunicationsMaterials();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.DELIVERY_PROCESS__EDUCATION_MATERIALS:
-			getEducationMaterials().clear();
-			getEducationMaterials().addAll((Collection) newValue);
-			return;
-		case UmaPackage.DELIVERY_PROCESS__COMMUNICATIONS_MATERIALS:
-			getCommunicationsMaterials().clear();
-			getCommunicationsMaterials().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.DELIVERY_PROCESS__EDUCATION_MATERIALS:
-			getEducationMaterials().clear();
-			return;
-		case UmaPackage.DELIVERY_PROCESS__COMMUNICATIONS_MATERIALS:
-			getCommunicationsMaterials().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.DELIVERY_PROCESS__EDUCATION_MATERIALS:
-			return educationMaterials != null && !educationMaterials.isEmpty();
-		case UmaPackage.DELIVERY_PROCESS__COMMUNICATIONS_MATERIALS:
-			return communicationsMaterials != null
-					&& !communicationsMaterials.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //DeliveryProcessImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DescribableElementImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DescribableElementImpl.java
deleted file mode 100755
index bdaf29b..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DescribableElementImpl.java
+++ /dev/null
@@ -1,452 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.net.URI;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.util.ContentDescriptionFactory;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Describable Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.DescribableElementImpl#getPresentationName <em>Presentation Name</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DescribableElementImpl#getPresentation <em>Presentation</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DescribableElementImpl#getShapeicon <em>Shapeicon</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DescribableElementImpl#getNodeicon <em>Nodeicon</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class DescribableElementImpl extends MethodElementImpl
-		implements DescribableElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getPresentationName() <em>Presentation Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPresentationName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PRESENTATION_NAME_EDEFAULT = ""; //$NON-NLS-1$
-
-	/**
-	 * The cached value of the '{@link #getPresentationName() <em>Presentation Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPresentationName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String presentationName = PRESENTATION_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPresentation() <em>Presentation</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPresentation()
-	 * @generated
-	 * @ordered
-	 */
-	protected ContentDescription presentation = null;
-
-	/**
-	 * The default value of the '{@link #getShapeicon() <em>Shapeicon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getShapeicon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final URI SHAPEICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getShapeicon() <em>Shapeicon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getShapeicon()
-	 * @generated
-	 * @ordered
-	 */
-	protected URI shapeicon = SHAPEICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getNodeicon() <em>Nodeicon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNodeicon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final URI NODEICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNodeicon() <em>Nodeicon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNodeicon()
-	 * @generated
-	 * @ordered
-	 */
-	protected URI nodeicon = NODEICON_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DescribableElementImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DESCRIBABLE_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPresentationName() {
-		return presentationName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPresentationName(String newPresentationName) {
-		String oldPresentationName = presentationName;
-		presentationName = newPresentationName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION_NAME,
-					oldPresentationName, presentationName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPresentation(
-			ContentDescription newPresentation, NotificationChain msgs) {
-		ContentDescription oldPresentation = presentation;
-		presentation = newPresentation;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET,
-					UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION,
-					oldPresentation, newPresentation);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public URI getShapeicon() {
-		return shapeicon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setShapeicon(URI newShapeicon) {
-		URI oldShapeicon = shapeicon;
-		shapeicon = newShapeicon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DESCRIBABLE_ELEMENT__SHAPEICON, oldShapeicon,
-					shapeicon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public URI getNodeicon() {
-		return nodeicon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNodeicon(URI newNodeicon) {
-		URI oldNodeicon = nodeicon;
-		nodeicon = newNodeicon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DESCRIBABLE_ELEMENT__NODEICON, oldNodeicon,
-					nodeicon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION:
-			return basicSetPresentation(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION_NAME:
-			return getPresentationName();
-		case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION:
-			if (resolve)
-				return getPresentation();
-			return basicGetPresentation();
-		case UmaPackage.DESCRIBABLE_ELEMENT__SHAPEICON:
-			return getShapeicon();
-		case UmaPackage.DESCRIBABLE_ELEMENT__NODEICON:
-			return getNodeicon();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION_NAME:
-			setPresentationName((String) newValue);
-			return;
-		case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION:
-			setPresentation((ContentDescription) newValue);
-			return;
-		case UmaPackage.DESCRIBABLE_ELEMENT__SHAPEICON:
-			setShapeicon((URI) newValue);
-			return;
-		case UmaPackage.DESCRIBABLE_ELEMENT__NODEICON:
-			setNodeicon((URI) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION_NAME:
-			setPresentationName(PRESENTATION_NAME_EDEFAULT);
-			return;
-		case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION:
-			setPresentation((ContentDescription) null);
-			return;
-		case UmaPackage.DESCRIBABLE_ELEMENT__SHAPEICON:
-			setShapeicon(SHAPEICON_EDEFAULT);
-			return;
-		case UmaPackage.DESCRIBABLE_ELEMENT__NODEICON:
-			setNodeicon(NODEICON_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION_NAME:
-			return PRESENTATION_NAME_EDEFAULT == null ? presentationName != null
-					: !PRESENTATION_NAME_EDEFAULT.equals(presentationName);
-		case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION:
-			return presentation != null;
-		case UmaPackage.DESCRIBABLE_ELEMENT__SHAPEICON:
-			return SHAPEICON_EDEFAULT == null ? shapeicon != null
-					: !SHAPEICON_EDEFAULT.equals(shapeicon);
-		case UmaPackage.DESCRIBABLE_ELEMENT__NODEICON:
-			return NODEICON_EDEFAULT == null ? nodeicon != null
-					: !NODEICON_EDEFAULT.equals(nodeicon);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (presentationName: "); //$NON-NLS-1$
-		result.append(presentationName);
-		result.append(", shapeicon: "); //$NON-NLS-1$
-		result.append(shapeicon);
-		result.append(", nodeicon: "); //$NON-NLS-1$
-		result.append(nodeicon);
-		result.append(')');
-		return result.toString();
-	}
-
-	//
-	// Start custom code
-	//
-
-	public ContentDescription basicGetPresentation() {
-		return presentation;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.impl.DescribableElementImpl#getPresentation()
-	 */
-	public ContentDescription getPresentation() {
-		if (presentation instanceof EObject
-				&& ((EObject) presentation).eIsProxy()) {
-			ContentDescription oldPresentation = presentation;
-			presentation = (ContentDescription) eResolveProxy((InternalEObject) presentation);
-			if (presentation != oldPresentation) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION,
-							oldPresentation, presentation));
-			}
-		} else if (presentation == null) {
-			//			setPresentation(ContentDescriptionFactory.createContentDescription(this));
-			if (emptyPresentation == null) {
-				emptyPresentation = ContentDescriptionFactory
-						.createContentDescription(this);
-				emptyPresentation.eAdapters().add(changeListener);
-			}
-			return emptyPresentation;
-		}
-
-		return presentation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public void setPresentation(ContentDescription newPresentation) {
-		if (newPresentation != presentation) {
-			NotificationChain msgs = null;
-			if (presentation != null)
-				msgs = ((InternalEObject) presentation).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION,
-						null, msgs);
-			if (newPresentation != null)
-				msgs = ((InternalEObject) newPresentation).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION,
-						null, msgs);
-			msgs = basicSetPresentation(newPresentation, msgs);
-
-			// custom code
-			//
-			emptyPresentation = null;
-
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION,
-					newPresentation, newPresentation));
-	}
-
-	private ContentDescription emptyPresentation;
-
-	private Adapter changeListener = new AdapterImpl() {
-		public void notifyChanged(Notification msg) {
-			switch (msg.getEventType()) {
-			case Notification.ADD:
-			case Notification.ADD_MANY:
-			case Notification.SET:
-				ContentDescription content = (ContentDescription) getTarget();
-				content.eAdapters().remove(this);
-
-				// emptyPresentation is modified, convert it to real presentation if no presentation is set yet 
-				// for the ProcessElement
-				//
-				if (presentation == null) {
-					setPresentation(content);
-				}
-			}
-		}
-	};
-} //DescribableElementImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DescriptorDescriptionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DescriptorDescriptionImpl.java
deleted file mode 100755
index 708982e..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DescriptorDescriptionImpl.java
+++ /dev/null
@@ -1,184 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.DescriptorDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Descriptor Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.DescriptorDescriptionImpl#getRefinedDescription <em>Refined Description</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DescriptorDescriptionImpl extends BreakdownElementDescriptionImpl
-		implements DescriptorDescription {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getRefinedDescription() <em>Refined Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRefinedDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REFINED_DESCRIPTION_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getRefinedDescription() <em>Refined Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRefinedDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String refinedDescription = REFINED_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DescriptorDescriptionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DESCRIPTOR_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRefinedDescription() {
-		return refinedDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRefinedDescription(String newRefinedDescription) {
-		String oldRefinedDescription = refinedDescription;
-		refinedDescription = newRefinedDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION,
-					oldRefinedDescription, refinedDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION:
-			return getRefinedDescription();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION:
-			setRefinedDescription((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION:
-			setRefinedDescription(REFINED_DESCRIPTION_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION:
-			return REFINED_DESCRIPTION_EDEFAULT == null ? refinedDescription != null
-					: !REFINED_DESCRIPTION_EDEFAULT.equals(refinedDescription);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (refinedDescription: "); //$NON-NLS-1$
-		result.append(refinedDescription);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DescriptorDescriptionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DescriptorImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DescriptorImpl.java
deleted file mode 100755
index dfc3beb..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DescriptorImpl.java
+++ /dev/null
@@ -1,185 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.Descriptor;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.DescriptorImpl#getIsSynchronizedWithSource <em>Is Synchronized With Source</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class DescriptorImpl extends BreakdownElementImpl implements
-		Descriptor {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getIsSynchronizedWithSource() <em>Is Synchronized With Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsSynchronizedWithSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT = Boolean.TRUE;
-
-	/**
-	 * The cached value of the '{@link #getIsSynchronizedWithSource() <em>Is Synchronized With Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsSynchronizedWithSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean isSynchronizedWithSource = IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DescriptorImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DESCRIPTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean getIsSynchronizedWithSource() {
-		return isSynchronizedWithSource;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsSynchronizedWithSource(Boolean newIsSynchronizedWithSource) {
-		Boolean oldIsSynchronizedWithSource = isSynchronizedWithSource;
-		isSynchronizedWithSource = newIsSynchronizedWithSource;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE,
-					oldIsSynchronizedWithSource, isSynchronizedWithSource));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-			return getIsSynchronizedWithSource();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-			setIsSynchronizedWithSource((Boolean) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-			setIsSynchronizedWithSource(IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-			return IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT == null ? isSynchronizedWithSource != null
-					: !IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT
-							.equals(isSynchronizedWithSource);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (isSynchronizedWithSource: "); //$NON-NLS-1$
-		result.append(isSynchronizedWithSource);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DescriptorImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DiagramElementImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DiagramElementImpl.java
deleted file mode 100755
index 99c0aa6..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DiagramElementImpl.java
+++ /dev/null
@@ -1,395 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.DiagramElement;
-import org.eclipse.epf.uma.GraphElement;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.epf.uma.Reference;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Diagram Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.DiagramElementImpl#getIsVisible <em>Is Visible</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DiagramElementImpl#getContainer_ <em>Container</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DiagramElementImpl#getReference <em>Reference</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DiagramElementImpl#getProperty <em>Property</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class DiagramElementImpl extends MethodElementImpl implements
-		DiagramElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getIsVisible() <em>Is Visible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsVisible()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean IS_VISIBLE_EDEFAULT = Boolean.TRUE;
-
-	/**
-	 * The cached value of the '{@link #getIsVisible() <em>Is Visible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsVisible()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean isVisible = IS_VISIBLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getReference() <em>Reference</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReference()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList reference = null;
-
-	/**
-	 * The cached value of the '{@link #getProperty() <em>Property</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperty()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList property = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DiagramElementImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DIAGRAM_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean getIsVisible() {
-		return isVisible;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsVisible(Boolean newIsVisible) {
-		Boolean oldIsVisible = isVisible;
-		isVisible = newIsVisible;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DIAGRAM_ELEMENT__IS_VISIBLE, oldIsVisible,
-					isVisible));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphElement getContainer_() {
-		if (eContainerFeatureID != UmaPackage.DIAGRAM_ELEMENT__CONTAINER)
-			return null;
-		return (GraphElement) eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphElement basicGetContainer() {
-		if (eContainerFeatureID != UmaPackage.DIAGRAM_ELEMENT__CONTAINER)
-			return null;
-		return (GraphElement) eInternalContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetContainer(GraphElement newContainer,
-			NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject) newContainer,
-				UmaPackage.DIAGRAM_ELEMENT__CONTAINER, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContainer(GraphElement newContainer) {
-		if (newContainer != eInternalContainer()
-				|| (eContainerFeatureID != UmaPackage.DIAGRAM_ELEMENT__CONTAINER && newContainer != null)) {
-			if (EcoreUtil.isAncestor(this, (EObject) newContainer))
-				throw new IllegalArgumentException(
-						"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newContainer != null)
-				msgs = ((InternalEObject) newContainer).eInverseAdd(this,
-						UmaPackage.GRAPH_ELEMENT__CONTAINED,
-						GraphElement.class, msgs);
-			msgs = basicSetContainer(newContainer, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DIAGRAM_ELEMENT__CONTAINER, newContainer,
-					newContainer));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getReference() {
-		if (reference == null) {
-			reference = new EObjectWithInverseResolvingEList(Reference.class,
-					this, UmaPackage.DIAGRAM_ELEMENT__REFERENCE,
-					UmaPackage.REFERENCE__REFERENCED);
-		}
-		return reference;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getProperty() {
-		if (property == null) {
-			property = new EObjectContainmentEList.Resolving(Property.class,
-					this, UmaPackage.DIAGRAM_ELEMENT__PROPERTY);
-		}
-		return property;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.DIAGRAM_ELEMENT__CONTAINER:
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetContainer((GraphElement) otherEnd, msgs);
-		case UmaPackage.DIAGRAM_ELEMENT__REFERENCE:
-			return ((InternalEList) getReference()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.DIAGRAM_ELEMENT__CONTAINER:
-			return basicSetContainer(null, msgs);
-		case UmaPackage.DIAGRAM_ELEMENT__REFERENCE:
-			return ((InternalEList) getReference()).basicRemove(otherEnd, msgs);
-		case UmaPackage.DIAGRAM_ELEMENT__PROPERTY:
-			return ((InternalEList) getProperty()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(
-			NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-		case UmaPackage.DIAGRAM_ELEMENT__CONTAINER:
-			return eInternalContainer().eInverseRemove(this,
-					UmaPackage.GRAPH_ELEMENT__CONTAINED, GraphElement.class,
-					msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.DIAGRAM_ELEMENT__IS_VISIBLE:
-			return getIsVisible();
-		case UmaPackage.DIAGRAM_ELEMENT__CONTAINER:
-			if (resolve)
-				return getContainer_();
-			return basicGetContainer();
-		case UmaPackage.DIAGRAM_ELEMENT__REFERENCE:
-			return getReference();
-		case UmaPackage.DIAGRAM_ELEMENT__PROPERTY:
-			return getProperty();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.DIAGRAM_ELEMENT__IS_VISIBLE:
-			setIsVisible((Boolean) newValue);
-			return;
-		case UmaPackage.DIAGRAM_ELEMENT__CONTAINER:
-			setContainer((GraphElement) newValue);
-			return;
-		case UmaPackage.DIAGRAM_ELEMENT__REFERENCE:
-			getReference().clear();
-			getReference().addAll((Collection) newValue);
-			return;
-		case UmaPackage.DIAGRAM_ELEMENT__PROPERTY:
-			getProperty().clear();
-			getProperty().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.DIAGRAM_ELEMENT__IS_VISIBLE:
-			setIsVisible(IS_VISIBLE_EDEFAULT);
-			return;
-		case UmaPackage.DIAGRAM_ELEMENT__CONTAINER:
-			setContainer((GraphElement) null);
-			return;
-		case UmaPackage.DIAGRAM_ELEMENT__REFERENCE:
-			getReference().clear();
-			return;
-		case UmaPackage.DIAGRAM_ELEMENT__PROPERTY:
-			getProperty().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.DIAGRAM_ELEMENT__IS_VISIBLE:
-			return IS_VISIBLE_EDEFAULT == null ? isVisible != null
-					: !IS_VISIBLE_EDEFAULT.equals(isVisible);
-		case UmaPackage.DIAGRAM_ELEMENT__CONTAINER:
-			return basicGetContainer() != null;
-		case UmaPackage.DIAGRAM_ELEMENT__REFERENCE:
-			return reference != null && !reference.isEmpty();
-		case UmaPackage.DIAGRAM_ELEMENT__PROPERTY:
-			return property != null && !property.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (isVisible: "); //$NON-NLS-1$
-		result.append(isVisible);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DiagramElementImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DiagramImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DiagramImpl.java
deleted file mode 100755
index 5a6a4cf..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DiagramImpl.java
+++ /dev/null
@@ -1,483 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.DiagramLink;
-import org.eclipse.epf.uma.Point;
-import org.eclipse.epf.uma.SemanticModelBridge;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Diagram</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.DiagramImpl#getZoom <em>Zoom</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DiagramImpl#getViewpoint <em>Viewpoint</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DiagramImpl#getDiagramLink <em>Diagram Link</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DiagramImpl#getNamespace <em>Namespace</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DiagramImpl extends GraphNodeImpl implements Diagram {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getZoom() <em>Zoom</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getZoom()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Double ZOOM_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getZoom() <em>Zoom</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getZoom()
-	 * @generated
-	 * @ordered
-	 */
-	protected Double zoom = ZOOM_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getViewpoint() <em>Viewpoint</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getViewpoint()
-	 * @generated
-	 * @ordered
-	 */
-	protected Point viewpoint = null;
-
-	/**
-	 * The cached value of the '{@link #getDiagramLink() <em>Diagram Link</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiagramLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList diagramLink = null;
-
-	/**
-	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamespace()
-	 * @generated
-	 * @ordered
-	 */
-	protected SemanticModelBridge namespace = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DiagramImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DIAGRAM;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getZoom() {
-		return zoom;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setZoom(Double newZoom) {
-		Double oldZoom = zoom;
-		zoom = newZoom;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DIAGRAM__ZOOM, oldZoom, zoom));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point getViewpoint() {
-		if (viewpoint != null && ((EObject) viewpoint).eIsProxy()) {
-			InternalEObject oldViewpoint = (InternalEObject) viewpoint;
-			viewpoint = (Point) eResolveProxy(oldViewpoint);
-			if (viewpoint != oldViewpoint) {
-				InternalEObject newViewpoint = (InternalEObject) viewpoint;
-				NotificationChain msgs = oldViewpoint.eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.DIAGRAM__VIEWPOINT,
-						null, null);
-				if (newViewpoint.eInternalContainer() == null) {
-					msgs = newViewpoint
-							.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-									- UmaPackage.DIAGRAM__VIEWPOINT, null, msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.DIAGRAM__VIEWPOINT, oldViewpoint,
-							viewpoint));
-			}
-		}
-		return viewpoint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point basicGetViewpoint() {
-		return viewpoint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetViewpoint(Point newViewpoint,
-			NotificationChain msgs) {
-		Point oldViewpoint = viewpoint;
-		viewpoint = newViewpoint;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.DIAGRAM__VIEWPOINT,
-					oldViewpoint, newViewpoint);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setViewpoint(Point newViewpoint) {
-		if (newViewpoint != viewpoint) {
-			NotificationChain msgs = null;
-			if (viewpoint != null)
-				msgs = ((InternalEObject) viewpoint).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.DIAGRAM__VIEWPOINT,
-						null, msgs);
-			if (newViewpoint != null)
-				msgs = ((InternalEObject) newViewpoint).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.DIAGRAM__VIEWPOINT,
-						null, msgs);
-			msgs = basicSetViewpoint(newViewpoint, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DIAGRAM__VIEWPOINT, newViewpoint, newViewpoint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDiagramLink() {
-		if (diagramLink == null) {
-			diagramLink = new EObjectWithInverseResolvingEList(
-					DiagramLink.class, this, UmaPackage.DIAGRAM__DIAGRAM_LINK,
-					UmaPackage.DIAGRAM_LINK__DIAGRAM);
-		}
-		return diagramLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SemanticModelBridge getNamespace() {
-		if (namespace != null && ((EObject) namespace).eIsProxy()) {
-			InternalEObject oldNamespace = (InternalEObject) namespace;
-			namespace = (SemanticModelBridge) eResolveProxy(oldNamespace);
-			if (namespace != oldNamespace) {
-				InternalEObject newNamespace = (InternalEObject) namespace;
-				NotificationChain msgs = oldNamespace.eInverseRemove(this,
-						UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM,
-						SemanticModelBridge.class, null);
-				if (newNamespace.eInternalContainer() == null) {
-					msgs = newNamespace.eInverseAdd(this,
-							UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM,
-							SemanticModelBridge.class, msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.DIAGRAM__NAMESPACE, oldNamespace,
-							namespace));
-			}
-		}
-		return namespace;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SemanticModelBridge basicGetNamespace() {
-		return namespace;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetNamespace(
-			SemanticModelBridge newNamespace, NotificationChain msgs) {
-		SemanticModelBridge oldNamespace = namespace;
-		namespace = newNamespace;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.DIAGRAM__NAMESPACE,
-					oldNamespace, newNamespace);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNamespace(SemanticModelBridge newNamespace) {
-		if (newNamespace != namespace) {
-			NotificationChain msgs = null;
-			if (namespace != null)
-				msgs = ((InternalEObject) namespace).eInverseRemove(this,
-						UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM,
-						SemanticModelBridge.class, msgs);
-			if (newNamespace != null)
-				msgs = ((InternalEObject) newNamespace).eInverseAdd(this,
-						UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM,
-						SemanticModelBridge.class, msgs);
-			msgs = basicSetNamespace(newNamespace, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DIAGRAM__NAMESPACE, newNamespace, newNamespace));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.DIAGRAM__DIAGRAM_LINK:
-			return ((InternalEList) getDiagramLink()).basicAdd(otherEnd, msgs);
-		case UmaPackage.DIAGRAM__NAMESPACE:
-			if (namespace != null)
-				msgs = ((InternalEObject) namespace).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.DIAGRAM__NAMESPACE,
-						null, msgs);
-			return basicSetNamespace((SemanticModelBridge) otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.DIAGRAM__VIEWPOINT:
-			return basicSetViewpoint(null, msgs);
-		case UmaPackage.DIAGRAM__DIAGRAM_LINK:
-			return ((InternalEList) getDiagramLink()).basicRemove(otherEnd,
-					msgs);
-		case UmaPackage.DIAGRAM__NAMESPACE:
-			return basicSetNamespace(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.DIAGRAM__ZOOM:
-			return getZoom();
-		case UmaPackage.DIAGRAM__VIEWPOINT:
-			if (resolve)
-				return getViewpoint();
-			return basicGetViewpoint();
-		case UmaPackage.DIAGRAM__DIAGRAM_LINK:
-			return getDiagramLink();
-		case UmaPackage.DIAGRAM__NAMESPACE:
-			if (resolve)
-				return getNamespace();
-			return basicGetNamespace();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.DIAGRAM__ZOOM:
-			setZoom((Double) newValue);
-			return;
-		case UmaPackage.DIAGRAM__VIEWPOINT:
-			setViewpoint((Point) newValue);
-			return;
-		case UmaPackage.DIAGRAM__DIAGRAM_LINK:
-			getDiagramLink().clear();
-			getDiagramLink().addAll((Collection) newValue);
-			return;
-		case UmaPackage.DIAGRAM__NAMESPACE:
-			setNamespace((SemanticModelBridge) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.DIAGRAM__ZOOM:
-			setZoom(ZOOM_EDEFAULT);
-			return;
-		case UmaPackage.DIAGRAM__VIEWPOINT:
-			setViewpoint((Point) null);
-			return;
-		case UmaPackage.DIAGRAM__DIAGRAM_LINK:
-			getDiagramLink().clear();
-			return;
-		case UmaPackage.DIAGRAM__NAMESPACE:
-			setNamespace((SemanticModelBridge) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.DIAGRAM__ZOOM:
-			return ZOOM_EDEFAULT == null ? zoom != null : !ZOOM_EDEFAULT
-					.equals(zoom);
-		case UmaPackage.DIAGRAM__VIEWPOINT:
-			return viewpoint != null;
-		case UmaPackage.DIAGRAM__DIAGRAM_LINK:
-			return diagramLink != null && !diagramLink.isEmpty();
-		case UmaPackage.DIAGRAM__NAMESPACE:
-			return namespace != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (zoom: "); //$NON-NLS-1$
-		result.append(zoom);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DiagramImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DiagramLinkImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DiagramLinkImpl.java
deleted file mode 100755
index ebaad31..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DiagramLinkImpl.java
+++ /dev/null
@@ -1,517 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.DiagramLink;
-import org.eclipse.epf.uma.GraphElement;
-import org.eclipse.epf.uma.Point;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Diagram Link</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.DiagramLinkImpl#getZoom <em>Zoom</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DiagramLinkImpl#getViewport <em>Viewport</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DiagramLinkImpl#getGraphElement <em>Graph Element</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DiagramLinkImpl#getDiagram <em>Diagram</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DiagramLinkImpl extends DiagramElementImpl implements DiagramLink {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getZoom() <em>Zoom</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getZoom()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Double ZOOM_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getZoom() <em>Zoom</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getZoom()
-	 * @generated
-	 * @ordered
-	 */
-	protected Double zoom = ZOOM_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getViewport() <em>Viewport</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getViewport()
-	 * @generated
-	 * @ordered
-	 */
-	protected Point viewport = null;
-
-	/**
-	 * The cached value of the '{@link #getDiagram() <em>Diagram</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiagram()
-	 * @generated
-	 * @ordered
-	 */
-	protected Diagram diagram = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DiagramLinkImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DIAGRAM_LINK;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getZoom() {
-		return zoom;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setZoom(Double newZoom) {
-		Double oldZoom = zoom;
-		zoom = newZoom;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DIAGRAM_LINK__ZOOM, oldZoom, zoom));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point getViewport() {
-		if (viewport != null && ((EObject) viewport).eIsProxy()) {
-			InternalEObject oldViewport = (InternalEObject) viewport;
-			viewport = (Point) eResolveProxy(oldViewport);
-			if (viewport != oldViewport) {
-				InternalEObject newViewport = (InternalEObject) viewport;
-				NotificationChain msgs = oldViewport
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-								- UmaPackage.DIAGRAM_LINK__VIEWPORT, null, null);
-				if (newViewport.eInternalContainer() == null) {
-					msgs = newViewport.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-							- UmaPackage.DIAGRAM_LINK__VIEWPORT, null, msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.DIAGRAM_LINK__VIEWPORT, oldViewport,
-							viewport));
-			}
-		}
-		return viewport;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point basicGetViewport() {
-		return viewport;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetViewport(Point newViewport,
-			NotificationChain msgs) {
-		Point oldViewport = viewport;
-		viewport = newViewport;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.DIAGRAM_LINK__VIEWPORT,
-					oldViewport, newViewport);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setViewport(Point newViewport) {
-		if (newViewport != viewport) {
-			NotificationChain msgs = null;
-			if (viewport != null)
-				msgs = ((InternalEObject) viewport)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-								- UmaPackage.DIAGRAM_LINK__VIEWPORT, null, msgs);
-			if (newViewport != null)
-				msgs = ((InternalEObject) newViewport)
-						.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-								- UmaPackage.DIAGRAM_LINK__VIEWPORT, null, msgs);
-			msgs = basicSetViewport(newViewport, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DIAGRAM_LINK__VIEWPORT, newViewport, newViewport));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphElement getGraphElement() {
-		if (eContainerFeatureID != UmaPackage.DIAGRAM_LINK__GRAPH_ELEMENT)
-			return null;
-		return (GraphElement) eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphElement basicGetGraphElement() {
-		if (eContainerFeatureID != UmaPackage.DIAGRAM_LINK__GRAPH_ELEMENT)
-			return null;
-		return (GraphElement) eInternalContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetGraphElement(GraphElement newGraphElement,
-			NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject) newGraphElement,
-				UmaPackage.DIAGRAM_LINK__GRAPH_ELEMENT, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGraphElement(GraphElement newGraphElement) {
-		if (newGraphElement != eInternalContainer()
-				|| (eContainerFeatureID != UmaPackage.DIAGRAM_LINK__GRAPH_ELEMENT && newGraphElement != null)) {
-			if (EcoreUtil.isAncestor(this, (EObject) newGraphElement))
-				throw new IllegalArgumentException(
-						"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newGraphElement != null)
-				msgs = ((InternalEObject) newGraphElement).eInverseAdd(this,
-						UmaPackage.GRAPH_ELEMENT__LINK, GraphElement.class,
-						msgs);
-			msgs = basicSetGraphElement(newGraphElement, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DIAGRAM_LINK__GRAPH_ELEMENT, newGraphElement,
-					newGraphElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Diagram getDiagram() {
-		if (diagram != null && ((EObject) diagram).eIsProxy()) {
-			InternalEObject oldDiagram = (InternalEObject) diagram;
-			diagram = (Diagram) eResolveProxy(oldDiagram);
-			if (diagram != oldDiagram) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.DIAGRAM_LINK__DIAGRAM, oldDiagram,
-							diagram));
-			}
-		}
-		return diagram;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Diagram basicGetDiagram() {
-		return diagram;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetDiagram(Diagram newDiagram,
-			NotificationChain msgs) {
-		Diagram oldDiagram = diagram;
-		diagram = newDiagram;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.DIAGRAM_LINK__DIAGRAM,
-					oldDiagram, newDiagram);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDiagram(Diagram newDiagram) {
-		if (newDiagram != diagram) {
-			NotificationChain msgs = null;
-			if (diagram != null)
-				msgs = ((InternalEObject) diagram).eInverseRemove(this,
-						UmaPackage.DIAGRAM__DIAGRAM_LINK, Diagram.class, msgs);
-			if (newDiagram != null)
-				msgs = ((InternalEObject) newDiagram).eInverseAdd(this,
-						UmaPackage.DIAGRAM__DIAGRAM_LINK, Diagram.class, msgs);
-			msgs = basicSetDiagram(newDiagram, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DIAGRAM_LINK__DIAGRAM, newDiagram, newDiagram));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.DIAGRAM_LINK__GRAPH_ELEMENT:
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetGraphElement((GraphElement) otherEnd, msgs);
-		case UmaPackage.DIAGRAM_LINK__DIAGRAM:
-			if (diagram != null)
-				msgs = ((InternalEObject) diagram).eInverseRemove(this,
-						UmaPackage.DIAGRAM__DIAGRAM_LINK, Diagram.class, msgs);
-			return basicSetDiagram((Diagram) otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.DIAGRAM_LINK__VIEWPORT:
-			return basicSetViewport(null, msgs);
-		case UmaPackage.DIAGRAM_LINK__GRAPH_ELEMENT:
-			return basicSetGraphElement(null, msgs);
-		case UmaPackage.DIAGRAM_LINK__DIAGRAM:
-			return basicSetDiagram(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(
-			NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-		case UmaPackage.DIAGRAM_LINK__GRAPH_ELEMENT:
-			return eInternalContainer().eInverseRemove(this,
-					UmaPackage.GRAPH_ELEMENT__LINK, GraphElement.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.DIAGRAM_LINK__ZOOM:
-			return getZoom();
-		case UmaPackage.DIAGRAM_LINK__VIEWPORT:
-			if (resolve)
-				return getViewport();
-			return basicGetViewport();
-		case UmaPackage.DIAGRAM_LINK__GRAPH_ELEMENT:
-			if (resolve)
-				return getGraphElement();
-			return basicGetGraphElement();
-		case UmaPackage.DIAGRAM_LINK__DIAGRAM:
-			if (resolve)
-				return getDiagram();
-			return basicGetDiagram();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.DIAGRAM_LINK__ZOOM:
-			setZoom((Double) newValue);
-			return;
-		case UmaPackage.DIAGRAM_LINK__VIEWPORT:
-			setViewport((Point) newValue);
-			return;
-		case UmaPackage.DIAGRAM_LINK__GRAPH_ELEMENT:
-			setGraphElement((GraphElement) newValue);
-			return;
-		case UmaPackage.DIAGRAM_LINK__DIAGRAM:
-			setDiagram((Diagram) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.DIAGRAM_LINK__ZOOM:
-			setZoom(ZOOM_EDEFAULT);
-			return;
-		case UmaPackage.DIAGRAM_LINK__VIEWPORT:
-			setViewport((Point) null);
-			return;
-		case UmaPackage.DIAGRAM_LINK__GRAPH_ELEMENT:
-			setGraphElement((GraphElement) null);
-			return;
-		case UmaPackage.DIAGRAM_LINK__DIAGRAM:
-			setDiagram((Diagram) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.DIAGRAM_LINK__ZOOM:
-			return ZOOM_EDEFAULT == null ? zoom != null : !ZOOM_EDEFAULT
-					.equals(zoom);
-		case UmaPackage.DIAGRAM_LINK__VIEWPORT:
-			return viewport != null;
-		case UmaPackage.DIAGRAM_LINK__GRAPH_ELEMENT:
-			return basicGetGraphElement() != null;
-		case UmaPackage.DIAGRAM_LINK__DIAGRAM:
-			return diagram != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (zoom: "); //$NON-NLS-1$
-		result.append(zoom);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DiagramLinkImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DimensionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DimensionImpl.java
deleted file mode 100755
index 3db4e1d..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DimensionImpl.java
+++ /dev/null
@@ -1,239 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.Dimension;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dimension</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.DimensionImpl#getWidth <em>Width</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DimensionImpl#getHeight <em>Height</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DimensionImpl extends MultiResourceEObject implements Dimension {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Double WIDTH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected Double width = WIDTH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHeight()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Double HEIGHT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHeight()
-	 * @generated
-	 * @ordered
-	 */
-	protected Double height = HEIGHT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DimensionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DIMENSION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getWidth() {
-		return width;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWidth(Double newWidth) {
-		Double oldWidth = width;
-		width = newWidth;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DIMENSION__WIDTH, oldWidth, width));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getHeight() {
-		return height;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHeight(Double newHeight) {
-		Double oldHeight = height;
-		height = newHeight;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.DIMENSION__HEIGHT, oldHeight, height));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.DIMENSION__WIDTH:
-			return getWidth();
-		case UmaPackage.DIMENSION__HEIGHT:
-			return getHeight();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.DIMENSION__WIDTH:
-			setWidth((Double) newValue);
-			return;
-		case UmaPackage.DIMENSION__HEIGHT:
-			setHeight((Double) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.DIMENSION__WIDTH:
-			setWidth(WIDTH_EDEFAULT);
-			return;
-		case UmaPackage.DIMENSION__HEIGHT:
-			setHeight(HEIGHT_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.DIMENSION__WIDTH:
-			return WIDTH_EDEFAULT == null ? width != null : !WIDTH_EDEFAULT
-					.equals(width);
-		case UmaPackage.DIMENSION__HEIGHT:
-			return HEIGHT_EDEFAULT == null ? height != null : !HEIGHT_EDEFAULT
-					.equals(height);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (width: "); //$NON-NLS-1$
-		result.append(width);
-		result.append(", height: "); //$NON-NLS-1$
-		result.append(height);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DimensionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DisciplineGroupingImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DisciplineGroupingImpl.java
deleted file mode 100755
index caa77e4..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DisciplineGroupingImpl.java
+++ /dev/null
@@ -1,152 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Discipline Grouping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.DisciplineGroupingImpl#getDisciplines <em>Disciplines</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DisciplineGroupingImpl extends ContentCategoryImpl implements
-		DisciplineGrouping {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getDisciplines() <em>Disciplines</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisciplines()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList disciplines = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DisciplineGroupingImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DISCIPLINE_GROUPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDisciplines() {
-		if (disciplines == null) {
-			disciplines = new EObjectResolvingEList(Discipline.class, this,
-					UmaPackage.DISCIPLINE_GROUPING__DISCIPLINES);
-		}
-		return disciplines;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.DISCIPLINE_GROUPING__DISCIPLINES:
-			return getDisciplines();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.DISCIPLINE_GROUPING__DISCIPLINES:
-			getDisciplines().clear();
-			getDisciplines().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.DISCIPLINE_GROUPING__DISCIPLINES:
-			getDisciplines().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.DISCIPLINE_GROUPING__DISCIPLINES:
-			return disciplines != null && !disciplines.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //DisciplineGroupingImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DisciplineImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DisciplineImpl.java
deleted file mode 100755
index bf3ca96..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DisciplineImpl.java
+++ /dev/null
@@ -1,242 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Discipline</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.DisciplineImpl#getTasks <em>Tasks</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DisciplineImpl#getSubdiscipline <em>Subdiscipline</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DisciplineImpl#getReferenceWorkflows <em>Reference Workflows</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DisciplineImpl extends ContentCategoryImpl implements Discipline {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getTasks() <em>Tasks</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTasks()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList tasks = null;
-
-	/**
-	 * The cached value of the '{@link #getSubdiscipline() <em>Subdiscipline</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubdiscipline()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList subdiscipline = null;
-
-	/**
-	 * The cached value of the '{@link #getReferenceWorkflows() <em>Reference Workflows</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReferenceWorkflows()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList referenceWorkflows = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DisciplineImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DISCIPLINE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getTasks() {
-		if (tasks == null) {
-			tasks = new EObjectResolvingEList(Task.class, this,
-					UmaPackage.DISCIPLINE__TASKS);
-		}
-		return tasks;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSubdiscipline() {
-		if (subdiscipline == null) {
-			subdiscipline = new EObjectContainmentEList.Resolving(
-					Discipline.class, this,
-					UmaPackage.DISCIPLINE__SUBDISCIPLINE);
-		}
-		return subdiscipline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getReferenceWorkflows() {
-		if (referenceWorkflows == null) {
-			referenceWorkflows = new EObjectResolvingEList(Activity.class,
-					this, UmaPackage.DISCIPLINE__REFERENCE_WORKFLOWS);
-		}
-		return referenceWorkflows;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.DISCIPLINE__SUBDISCIPLINE:
-			return ((InternalEList) getSubdiscipline()).basicRemove(otherEnd,
-					msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.DISCIPLINE__TASKS:
-			return getTasks();
-		case UmaPackage.DISCIPLINE__SUBDISCIPLINE:
-			return getSubdiscipline();
-		case UmaPackage.DISCIPLINE__REFERENCE_WORKFLOWS:
-			return getReferenceWorkflows();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.DISCIPLINE__TASKS:
-			getTasks().clear();
-			getTasks().addAll((Collection) newValue);
-			return;
-		case UmaPackage.DISCIPLINE__SUBDISCIPLINE:
-			getSubdiscipline().clear();
-			getSubdiscipline().addAll((Collection) newValue);
-			return;
-		case UmaPackage.DISCIPLINE__REFERENCE_WORKFLOWS:
-			getReferenceWorkflows().clear();
-			getReferenceWorkflows().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.DISCIPLINE__TASKS:
-			getTasks().clear();
-			return;
-		case UmaPackage.DISCIPLINE__SUBDISCIPLINE:
-			getSubdiscipline().clear();
-			return;
-		case UmaPackage.DISCIPLINE__REFERENCE_WORKFLOWS:
-			getReferenceWorkflows().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.DISCIPLINE__TASKS:
-			return tasks != null && !tasks.isEmpty();
-		case UmaPackage.DISCIPLINE__SUBDISCIPLINE:
-			return subdiscipline != null && !subdiscipline.isEmpty();
-		case UmaPackage.DISCIPLINE__REFERENCE_WORKFLOWS:
-			return referenceWorkflows != null && !referenceWorkflows.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //DisciplineImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DomainImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DomainImpl.java
deleted file mode 100755
index a3dad4d..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/DomainImpl.java
+++ /dev/null
@@ -1,205 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Domain</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.DomainImpl#getWorkProducts <em>Work Products</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.DomainImpl#getSubdomains <em>Subdomains</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DomainImpl extends ContentCategoryImpl implements Domain {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getWorkProducts() <em>Work Products</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkProducts()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList workProducts = null;
-
-	/**
-	 * The cached value of the '{@link #getSubdomains() <em>Subdomains</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubdomains()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList subdomains = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DomainImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DOMAIN;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getWorkProducts() {
-		if (workProducts == null) {
-			workProducts = new EObjectResolvingEList(WorkProduct.class, this,
-					UmaPackage.DOMAIN__WORK_PRODUCTS);
-		}
-		return workProducts;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSubdomains() {
-		if (subdomains == null) {
-			subdomains = new EObjectContainmentEList.Resolving(Domain.class,
-					this, UmaPackage.DOMAIN__SUBDOMAINS);
-		}
-		return subdomains;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.DOMAIN__SUBDOMAINS:
-			return ((InternalEList) getSubdomains())
-					.basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.DOMAIN__WORK_PRODUCTS:
-			return getWorkProducts();
-		case UmaPackage.DOMAIN__SUBDOMAINS:
-			return getSubdomains();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.DOMAIN__WORK_PRODUCTS:
-			getWorkProducts().clear();
-			getWorkProducts().addAll((Collection) newValue);
-			return;
-		case UmaPackage.DOMAIN__SUBDOMAINS:
-			getSubdomains().clear();
-			getSubdomains().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.DOMAIN__WORK_PRODUCTS:
-			getWorkProducts().clear();
-			return;
-		case UmaPackage.DOMAIN__SUBDOMAINS:
-			getSubdomains().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.DOMAIN__WORK_PRODUCTS:
-			return workProducts != null && !workProducts.isEmpty();
-		case UmaPackage.DOMAIN__SUBDOMAINS:
-			return subdomains != null && !subdomains.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //DomainImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ElementImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ElementImpl.java
deleted file mode 100755
index 1067139..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ElementImpl.java
+++ /dev/null
@@ -1,58 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Element;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class ElementImpl extends MultiResourceEObject implements
-		Element {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ElementImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ELEMENT;
-	}
-
-} //ElementImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/EllipseImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/EllipseImpl.java
deleted file mode 100755
index 7a7ee93..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/EllipseImpl.java
+++ /dev/null
@@ -1,529 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.Ellipse;
-import org.eclipse.epf.uma.Point;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Ellipse</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.EllipseImpl#getRadiusX <em>Radius X</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.EllipseImpl#getRadiusY <em>Radius Y</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.EllipseImpl#getRotation <em>Rotation</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.EllipseImpl#getStartAngle <em>Start Angle</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.EllipseImpl#getEndAngle <em>End Angle</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.EllipseImpl#getCenter <em>Center</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EllipseImpl extends GraphicPrimitiveImpl implements Ellipse {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getRadiusX() <em>Radius X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRadiusX()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Double RADIUS_X_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRadiusX() <em>Radius X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRadiusX()
-	 * @generated
-	 * @ordered
-	 */
-	protected Double radiusX = RADIUS_X_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRadiusY() <em>Radius Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRadiusY()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Double RADIUS_Y_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRadiusY() <em>Radius Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRadiusY()
-	 * @generated
-	 * @ordered
-	 */
-	protected Double radiusY = RADIUS_Y_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRotation() <em>Rotation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRotation()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Double ROTATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRotation() <em>Rotation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRotation()
-	 * @generated
-	 * @ordered
-	 */
-	protected Double rotation = ROTATION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStartAngle() <em>Start Angle</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStartAngle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Double START_ANGLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStartAngle() <em>Start Angle</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStartAngle()
-	 * @generated
-	 * @ordered
-	 */
-	protected Double startAngle = START_ANGLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEndAngle() <em>End Angle</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEndAngle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Double END_ANGLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEndAngle() <em>End Angle</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEndAngle()
-	 * @generated
-	 * @ordered
-	 */
-	protected Double endAngle = END_ANGLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getCenter() <em>Center</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCenter()
-	 * @generated
-	 * @ordered
-	 */
-	protected Point center = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EllipseImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ELLIPSE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getRadiusX() {
-		return radiusX;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRadiusX(Double newRadiusX) {
-		Double oldRadiusX = radiusX;
-		radiusX = newRadiusX;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ELLIPSE__RADIUS_X, oldRadiusX, radiusX));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getRadiusY() {
-		return radiusY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRadiusY(Double newRadiusY) {
-		Double oldRadiusY = radiusY;
-		radiusY = newRadiusY;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ELLIPSE__RADIUS_Y, oldRadiusY, radiusY));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getRotation() {
-		return rotation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRotation(Double newRotation) {
-		Double oldRotation = rotation;
-		rotation = newRotation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ELLIPSE__ROTATION, oldRotation, rotation));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getStartAngle() {
-		return startAngle;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStartAngle(Double newStartAngle) {
-		Double oldStartAngle = startAngle;
-		startAngle = newStartAngle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ELLIPSE__START_ANGLE, oldStartAngle, startAngle));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getEndAngle() {
-		return endAngle;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEndAngle(Double newEndAngle) {
-		Double oldEndAngle = endAngle;
-		endAngle = newEndAngle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ELLIPSE__END_ANGLE, oldEndAngle, endAngle));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point getCenter() {
-		if (center != null && ((EObject) center).eIsProxy()) {
-			InternalEObject oldCenter = (InternalEObject) center;
-			center = (Point) eResolveProxy(oldCenter);
-			if (center != oldCenter) {
-				InternalEObject newCenter = (InternalEObject) center;
-				NotificationChain msgs = oldCenter.eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.ELLIPSE__CENTER,
-						null, null);
-				if (newCenter.eInternalContainer() == null) {
-					msgs = newCenter.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-							- UmaPackage.ELLIPSE__CENTER, null, msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.ELLIPSE__CENTER, oldCenter, center));
-			}
-		}
-		return center;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point basicGetCenter() {
-		return center;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCenter(Point newCenter,
-			NotificationChain msgs) {
-		Point oldCenter = center;
-		center = newCenter;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.ELLIPSE__CENTER, oldCenter,
-					newCenter);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCenter(Point newCenter) {
-		if (newCenter != center) {
-			NotificationChain msgs = null;
-			if (center != null)
-				msgs = ((InternalEObject) center).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.ELLIPSE__CENTER,
-						null, msgs);
-			if (newCenter != null)
-				msgs = ((InternalEObject) newCenter).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.ELLIPSE__CENTER,
-						null, msgs);
-			msgs = basicSetCenter(newCenter, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ELLIPSE__CENTER, newCenter, newCenter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.ELLIPSE__CENTER:
-			return basicSetCenter(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.ELLIPSE__RADIUS_X:
-			return getRadiusX();
-		case UmaPackage.ELLIPSE__RADIUS_Y:
-			return getRadiusY();
-		case UmaPackage.ELLIPSE__ROTATION:
-			return getRotation();
-		case UmaPackage.ELLIPSE__START_ANGLE:
-			return getStartAngle();
-		case UmaPackage.ELLIPSE__END_ANGLE:
-			return getEndAngle();
-		case UmaPackage.ELLIPSE__CENTER:
-			if (resolve)
-				return getCenter();
-			return basicGetCenter();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.ELLIPSE__RADIUS_X:
-			setRadiusX((Double) newValue);
-			return;
-		case UmaPackage.ELLIPSE__RADIUS_Y:
-			setRadiusY((Double) newValue);
-			return;
-		case UmaPackage.ELLIPSE__ROTATION:
-			setRotation((Double) newValue);
-			return;
-		case UmaPackage.ELLIPSE__START_ANGLE:
-			setStartAngle((Double) newValue);
-			return;
-		case UmaPackage.ELLIPSE__END_ANGLE:
-			setEndAngle((Double) newValue);
-			return;
-		case UmaPackage.ELLIPSE__CENTER:
-			setCenter((Point) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.ELLIPSE__RADIUS_X:
-			setRadiusX(RADIUS_X_EDEFAULT);
-			return;
-		case UmaPackage.ELLIPSE__RADIUS_Y:
-			setRadiusY(RADIUS_Y_EDEFAULT);
-			return;
-		case UmaPackage.ELLIPSE__ROTATION:
-			setRotation(ROTATION_EDEFAULT);
-			return;
-		case UmaPackage.ELLIPSE__START_ANGLE:
-			setStartAngle(START_ANGLE_EDEFAULT);
-			return;
-		case UmaPackage.ELLIPSE__END_ANGLE:
-			setEndAngle(END_ANGLE_EDEFAULT);
-			return;
-		case UmaPackage.ELLIPSE__CENTER:
-			setCenter((Point) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.ELLIPSE__RADIUS_X:
-			return RADIUS_X_EDEFAULT == null ? radiusX != null
-					: !RADIUS_X_EDEFAULT.equals(radiusX);
-		case UmaPackage.ELLIPSE__RADIUS_Y:
-			return RADIUS_Y_EDEFAULT == null ? radiusY != null
-					: !RADIUS_Y_EDEFAULT.equals(radiusY);
-		case UmaPackage.ELLIPSE__ROTATION:
-			return ROTATION_EDEFAULT == null ? rotation != null
-					: !ROTATION_EDEFAULT.equals(rotation);
-		case UmaPackage.ELLIPSE__START_ANGLE:
-			return START_ANGLE_EDEFAULT == null ? startAngle != null
-					: !START_ANGLE_EDEFAULT.equals(startAngle);
-		case UmaPackage.ELLIPSE__END_ANGLE:
-			return END_ANGLE_EDEFAULT == null ? endAngle != null
-					: !END_ANGLE_EDEFAULT.equals(endAngle);
-		case UmaPackage.ELLIPSE__CENTER:
-			return center != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (radiusX: "); //$NON-NLS-1$
-		result.append(radiusX);
-		result.append(", radiusY: "); //$NON-NLS-1$
-		result.append(radiusY);
-		result.append(", rotation: "); //$NON-NLS-1$
-		result.append(rotation);
-		result.append(", startAngle: "); //$NON-NLS-1$
-		result.append(startAngle);
-		result.append(", endAngle: "); //$NON-NLS-1$
-		result.append(endAngle);
-		result.append(')');
-		return result.toString();
-	}
-
-} //EllipseImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/EstimationConsiderationsImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/EstimationConsiderationsImpl.java
deleted file mode 100755
index 31aebe9..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/EstimationConsiderationsImpl.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.EstimationConsiderations;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Estimation Considerations</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class EstimationConsiderationsImpl extends GuidanceImpl implements
-		EstimationConsiderations {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EstimationConsiderationsImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ESTIMATION_CONSIDERATIONS;
-	}
-
-} //EstimationConsiderationsImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ExampleImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ExampleImpl.java
deleted file mode 100755
index d7476ac..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ExampleImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Example</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ExampleImpl extends GuidanceImpl implements Example {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExampleImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.EXAMPLE;
-	}
-
-} //ExampleImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GraphConnectorImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GraphConnectorImpl.java
deleted file mode 100755
index 6974c9a..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GraphConnectorImpl.java
+++ /dev/null
@@ -1,286 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.GraphConnector;
-import org.eclipse.epf.uma.GraphEdge;
-import org.eclipse.epf.uma.GraphElement;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Graph Connector</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.GraphConnectorImpl#getGraphElement <em>Graph Element</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.GraphConnectorImpl#getGraphEdge <em>Graph Edge</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class GraphConnectorImpl extends GraphElementImpl implements
-		GraphConnector {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getGraphEdge() <em>Graph Edge</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGraphEdge()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList graphEdge = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GraphConnectorImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.GRAPH_CONNECTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphElement getGraphElement() {
-		if (eContainerFeatureID != UmaPackage.GRAPH_CONNECTOR__GRAPH_ELEMENT)
-			return null;
-		return (GraphElement) eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphElement basicGetGraphElement() {
-		if (eContainerFeatureID != UmaPackage.GRAPH_CONNECTOR__GRAPH_ELEMENT)
-			return null;
-		return (GraphElement) eInternalContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetGraphElement(GraphElement newGraphElement,
-			NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject) newGraphElement,
-				UmaPackage.GRAPH_CONNECTOR__GRAPH_ELEMENT, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGraphElement(GraphElement newGraphElement) {
-		if (newGraphElement != eInternalContainer()
-				|| (eContainerFeatureID != UmaPackage.GRAPH_CONNECTOR__GRAPH_ELEMENT && newGraphElement != null)) {
-			if (EcoreUtil.isAncestor(this, (EObject) newGraphElement))
-				throw new IllegalArgumentException(
-						"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newGraphElement != null)
-				msgs = ((InternalEObject) newGraphElement).eInverseAdd(this,
-						UmaPackage.GRAPH_ELEMENT__ANCHORAGE,
-						GraphElement.class, msgs);
-			msgs = basicSetGraphElement(newGraphElement, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.GRAPH_CONNECTOR__GRAPH_ELEMENT, newGraphElement,
-					newGraphElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getGraphEdge() {
-		if (graphEdge == null) {
-			graphEdge = new EObjectWithInverseResolvingEList.ManyInverse(
-					GraphEdge.class, this,
-					UmaPackage.GRAPH_CONNECTOR__GRAPH_EDGE,
-					UmaPackage.GRAPH_EDGE__ANCHOR);
-		}
-		return graphEdge;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_CONNECTOR__GRAPH_ELEMENT:
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetGraphElement((GraphElement) otherEnd, msgs);
-		case UmaPackage.GRAPH_CONNECTOR__GRAPH_EDGE:
-			return ((InternalEList) getGraphEdge()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_CONNECTOR__GRAPH_ELEMENT:
-			return basicSetGraphElement(null, msgs);
-		case UmaPackage.GRAPH_CONNECTOR__GRAPH_EDGE:
-			return ((InternalEList) getGraphEdge()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(
-			NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-		case UmaPackage.GRAPH_CONNECTOR__GRAPH_ELEMENT:
-			return eInternalContainer().eInverseRemove(this,
-					UmaPackage.GRAPH_ELEMENT__ANCHORAGE, GraphElement.class,
-					msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_CONNECTOR__GRAPH_ELEMENT:
-			if (resolve)
-				return getGraphElement();
-			return basicGetGraphElement();
-		case UmaPackage.GRAPH_CONNECTOR__GRAPH_EDGE:
-			return getGraphEdge();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_CONNECTOR__GRAPH_ELEMENT:
-			setGraphElement((GraphElement) newValue);
-			return;
-		case UmaPackage.GRAPH_CONNECTOR__GRAPH_EDGE:
-			getGraphEdge().clear();
-			getGraphEdge().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_CONNECTOR__GRAPH_ELEMENT:
-			setGraphElement((GraphElement) null);
-			return;
-		case UmaPackage.GRAPH_CONNECTOR__GRAPH_EDGE:
-			getGraphEdge().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.GRAPH_CONNECTOR__GRAPH_ELEMENT:
-			return basicGetGraphElement() != null;
-		case UmaPackage.GRAPH_CONNECTOR__GRAPH_EDGE:
-			return graphEdge != null && !graphEdge.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //GraphConnectorImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GraphEdgeImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GraphEdgeImpl.java
deleted file mode 100755
index 7b2c909..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GraphEdgeImpl.java
+++ /dev/null
@@ -1,222 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.GraphConnector;
-import org.eclipse.epf.uma.GraphEdge;
-import org.eclipse.epf.uma.Point;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Graph Edge</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.GraphEdgeImpl#getAnchor <em>Anchor</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.GraphEdgeImpl#getWaypoints <em>Waypoints</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class GraphEdgeImpl extends GraphElementImpl implements GraphEdge {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getAnchor() <em>Anchor</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAnchor()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList anchor = null;
-
-	/**
-	 * The cached value of the '{@link #getWaypoints() <em>Waypoints</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWaypoints()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList waypoints = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GraphEdgeImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.GRAPH_EDGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getAnchor() {
-		if (anchor == null) {
-			anchor = new EObjectWithInverseResolvingEList.ManyInverse(
-					GraphConnector.class, this, UmaPackage.GRAPH_EDGE__ANCHOR,
-					UmaPackage.GRAPH_CONNECTOR__GRAPH_EDGE);
-		}
-		return anchor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getWaypoints() {
-		if (waypoints == null) {
-			waypoints = new EObjectContainmentEList.Resolving(Point.class,
-					this, UmaPackage.GRAPH_EDGE__WAYPOINTS);
-		}
-		return waypoints;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_EDGE__ANCHOR:
-			return ((InternalEList) getAnchor()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_EDGE__ANCHOR:
-			return ((InternalEList) getAnchor()).basicRemove(otherEnd, msgs);
-		case UmaPackage.GRAPH_EDGE__WAYPOINTS:
-			return ((InternalEList) getWaypoints()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_EDGE__ANCHOR:
-			return getAnchor();
-		case UmaPackage.GRAPH_EDGE__WAYPOINTS:
-			return getWaypoints();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_EDGE__ANCHOR:
-			getAnchor().clear();
-			getAnchor().addAll((Collection) newValue);
-			return;
-		case UmaPackage.GRAPH_EDGE__WAYPOINTS:
-			getWaypoints().clear();
-			getWaypoints().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_EDGE__ANCHOR:
-			getAnchor().clear();
-			return;
-		case UmaPackage.GRAPH_EDGE__WAYPOINTS:
-			getWaypoints().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.GRAPH_EDGE__ANCHOR:
-			return anchor != null && !anchor.isEmpty();
-		case UmaPackage.GRAPH_EDGE__WAYPOINTS:
-			return waypoints != null && !waypoints.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //GraphEdgeImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GraphElementImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GraphElementImpl.java
deleted file mode 100755
index a6e36e4..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GraphElementImpl.java
+++ /dev/null
@@ -1,502 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.DiagramElement;
-import org.eclipse.epf.uma.DiagramLink;
-import org.eclipse.epf.uma.GraphConnector;
-import org.eclipse.epf.uma.GraphElement;
-import org.eclipse.epf.uma.Point;
-import org.eclipse.epf.uma.SemanticModelBridge;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Graph Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.GraphElementImpl#getPosition <em>Position</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.GraphElementImpl#getContained <em>Contained</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.GraphElementImpl#getLink <em>Link</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.GraphElementImpl#getAnchorage <em>Anchorage</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.GraphElementImpl#getSemanticModel <em>Semantic Model</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class GraphElementImpl extends DiagramElementImpl implements
-		GraphElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getPosition() <em>Position</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPosition()
-	 * @generated
-	 * @ordered
-	 */
-	protected Point position = null;
-
-	/**
-	 * The cached value of the '{@link #getContained() <em>Contained</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContained()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList contained = null;
-
-	/**
-	 * The cached value of the '{@link #getLink() <em>Link</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList link = null;
-
-	/**
-	 * The cached value of the '{@link #getAnchorage() <em>Anchorage</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAnchorage()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList anchorage = null;
-
-	/**
-	 * The cached value of the '{@link #getSemanticModel() <em>Semantic Model</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSemanticModel()
-	 * @generated
-	 * @ordered
-	 */
-	protected SemanticModelBridge semanticModel = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GraphElementImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.GRAPH_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point getPosition() {
-		if (position != null && ((EObject) position).eIsProxy()) {
-			InternalEObject oldPosition = (InternalEObject) position;
-			position = (Point) eResolveProxy(oldPosition);
-			if (position != oldPosition) {
-				InternalEObject newPosition = (InternalEObject) position;
-				NotificationChain msgs = oldPosition.eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.GRAPH_ELEMENT__POSITION, null,
-						null);
-				if (newPosition.eInternalContainer() == null) {
-					msgs = newPosition.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-							- UmaPackage.GRAPH_ELEMENT__POSITION, null, msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.GRAPH_ELEMENT__POSITION, oldPosition,
-							position));
-			}
-		}
-		return position;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point basicGetPosition() {
-		return position;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPosition(Point newPosition,
-			NotificationChain msgs) {
-		Point oldPosition = position;
-		position = newPosition;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.GRAPH_ELEMENT__POSITION,
-					oldPosition, newPosition);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPosition(Point newPosition) {
-		if (newPosition != position) {
-			NotificationChain msgs = null;
-			if (position != null)
-				msgs = ((InternalEObject) position).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.GRAPH_ELEMENT__POSITION, null,
-						msgs);
-			if (newPosition != null)
-				msgs = ((InternalEObject) newPosition).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.GRAPH_ELEMENT__POSITION, null,
-						msgs);
-			msgs = basicSetPosition(newPosition, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.GRAPH_ELEMENT__POSITION, newPosition,
-					newPosition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getContained() {
-		if (contained == null) {
-			contained = new EObjectContainmentWithInverseEList.Resolving(
-					DiagramElement.class, this,
-					UmaPackage.GRAPH_ELEMENT__CONTAINED,
-					UmaPackage.DIAGRAM_ELEMENT__CONTAINER);
-		}
-		return contained;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getLink() {
-		if (link == null) {
-			link = new EObjectContainmentWithInverseEList.Resolving(
-					DiagramLink.class, this, UmaPackage.GRAPH_ELEMENT__LINK,
-					UmaPackage.DIAGRAM_LINK__GRAPH_ELEMENT);
-		}
-		return link;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getAnchorage() {
-		if (anchorage == null) {
-			anchorage = new EObjectContainmentWithInverseEList.Resolving(
-					GraphConnector.class, this,
-					UmaPackage.GRAPH_ELEMENT__ANCHORAGE,
-					UmaPackage.GRAPH_CONNECTOR__GRAPH_ELEMENT);
-		}
-		return anchorage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SemanticModelBridge getSemanticModel() {
-		if (semanticModel != null && ((EObject) semanticModel).eIsProxy()) {
-			InternalEObject oldSemanticModel = (InternalEObject) semanticModel;
-			semanticModel = (SemanticModelBridge) eResolveProxy(oldSemanticModel);
-			if (semanticModel != oldSemanticModel) {
-				InternalEObject newSemanticModel = (InternalEObject) semanticModel;
-				NotificationChain msgs = oldSemanticModel.eInverseRemove(this,
-						UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT,
-						SemanticModelBridge.class, null);
-				if (newSemanticModel.eInternalContainer() == null) {
-					msgs = newSemanticModel.eInverseAdd(this,
-							UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT,
-							SemanticModelBridge.class, msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.GRAPH_ELEMENT__SEMANTIC_MODEL,
-							oldSemanticModel, semanticModel));
-			}
-		}
-		return semanticModel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SemanticModelBridge basicGetSemanticModel() {
-		return semanticModel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSemanticModel(
-			SemanticModelBridge newSemanticModel, NotificationChain msgs) {
-		SemanticModelBridge oldSemanticModel = semanticModel;
-		semanticModel = newSemanticModel;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.GRAPH_ELEMENT__SEMANTIC_MODEL,
-					oldSemanticModel, newSemanticModel);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSemanticModel(SemanticModelBridge newSemanticModel) {
-		if (newSemanticModel != semanticModel) {
-			NotificationChain msgs = null;
-			if (semanticModel != null)
-				msgs = ((InternalEObject) semanticModel).eInverseRemove(this,
-						UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT,
-						SemanticModelBridge.class, msgs);
-			if (newSemanticModel != null)
-				msgs = ((InternalEObject) newSemanticModel).eInverseAdd(this,
-						UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT,
-						SemanticModelBridge.class, msgs);
-			msgs = basicSetSemanticModel(newSemanticModel, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.GRAPH_ELEMENT__SEMANTIC_MODEL, newSemanticModel,
-					newSemanticModel));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_ELEMENT__CONTAINED:
-			return ((InternalEList) getContained()).basicAdd(otherEnd, msgs);
-		case UmaPackage.GRAPH_ELEMENT__LINK:
-			return ((InternalEList) getLink()).basicAdd(otherEnd, msgs);
-		case UmaPackage.GRAPH_ELEMENT__ANCHORAGE:
-			return ((InternalEList) getAnchorage()).basicAdd(otherEnd, msgs);
-		case UmaPackage.GRAPH_ELEMENT__SEMANTIC_MODEL:
-			if (semanticModel != null)
-				msgs = ((InternalEObject) semanticModel).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.GRAPH_ELEMENT__SEMANTIC_MODEL,
-						null, msgs);
-			return basicSetSemanticModel((SemanticModelBridge) otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_ELEMENT__POSITION:
-			return basicSetPosition(null, msgs);
-		case UmaPackage.GRAPH_ELEMENT__CONTAINED:
-			return ((InternalEList) getContained()).basicRemove(otherEnd, msgs);
-		case UmaPackage.GRAPH_ELEMENT__LINK:
-			return ((InternalEList) getLink()).basicRemove(otherEnd, msgs);
-		case UmaPackage.GRAPH_ELEMENT__ANCHORAGE:
-			return ((InternalEList) getAnchorage()).basicRemove(otherEnd, msgs);
-		case UmaPackage.GRAPH_ELEMENT__SEMANTIC_MODEL:
-			return basicSetSemanticModel(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_ELEMENT__POSITION:
-			if (resolve)
-				return getPosition();
-			return basicGetPosition();
-		case UmaPackage.GRAPH_ELEMENT__CONTAINED:
-			return getContained();
-		case UmaPackage.GRAPH_ELEMENT__LINK:
-			return getLink();
-		case UmaPackage.GRAPH_ELEMENT__ANCHORAGE:
-			return getAnchorage();
-		case UmaPackage.GRAPH_ELEMENT__SEMANTIC_MODEL:
-			if (resolve)
-				return getSemanticModel();
-			return basicGetSemanticModel();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_ELEMENT__POSITION:
-			setPosition((Point) newValue);
-			return;
-		case UmaPackage.GRAPH_ELEMENT__CONTAINED:
-			getContained().clear();
-			getContained().addAll((Collection) newValue);
-			return;
-		case UmaPackage.GRAPH_ELEMENT__LINK:
-			getLink().clear();
-			getLink().addAll((Collection) newValue);
-			return;
-		case UmaPackage.GRAPH_ELEMENT__ANCHORAGE:
-			getAnchorage().clear();
-			getAnchorage().addAll((Collection) newValue);
-			return;
-		case UmaPackage.GRAPH_ELEMENT__SEMANTIC_MODEL:
-			setSemanticModel((SemanticModelBridge) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_ELEMENT__POSITION:
-			setPosition((Point) null);
-			return;
-		case UmaPackage.GRAPH_ELEMENT__CONTAINED:
-			getContained().clear();
-			return;
-		case UmaPackage.GRAPH_ELEMENT__LINK:
-			getLink().clear();
-			return;
-		case UmaPackage.GRAPH_ELEMENT__ANCHORAGE:
-			getAnchorage().clear();
-			return;
-		case UmaPackage.GRAPH_ELEMENT__SEMANTIC_MODEL:
-			setSemanticModel((SemanticModelBridge) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.GRAPH_ELEMENT__POSITION:
-			return position != null;
-		case UmaPackage.GRAPH_ELEMENT__CONTAINED:
-			return contained != null && !contained.isEmpty();
-		case UmaPackage.GRAPH_ELEMENT__LINK:
-			return link != null && !link.isEmpty();
-		case UmaPackage.GRAPH_ELEMENT__ANCHORAGE:
-			return anchorage != null && !anchorage.isEmpty();
-		case UmaPackage.GRAPH_ELEMENT__SEMANTIC_MODEL:
-			return semanticModel != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //GraphElementImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GraphNodeImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GraphNodeImpl.java
deleted file mode 100755
index 98a0a8e..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GraphNodeImpl.java
+++ /dev/null
@@ -1,235 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.Dimension;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Graph Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.GraphNodeImpl#getSize <em>Size</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class GraphNodeImpl extends GraphElementImpl implements GraphNode {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getSize() <em>Size</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected Dimension size = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GraphNodeImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.GRAPH_NODE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Dimension getSize() {
-		if (size != null && ((EObject) size).eIsProxy()) {
-			InternalEObject oldSize = (InternalEObject) size;
-			size = (Dimension) eResolveProxy(oldSize);
-			if (size != oldSize) {
-				InternalEObject newSize = (InternalEObject) size;
-				NotificationChain msgs = oldSize.eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.GRAPH_NODE__SIZE,
-						null, null);
-				if (newSize.eInternalContainer() == null) {
-					msgs = newSize.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-							- UmaPackage.GRAPH_NODE__SIZE, null, msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.GRAPH_NODE__SIZE, oldSize, size));
-			}
-		}
-		return size;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Dimension basicGetSize() {
-		return size;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSize(Dimension newSize,
-			NotificationChain msgs) {
-		Dimension oldSize = size;
-		size = newSize;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.GRAPH_NODE__SIZE, oldSize,
-					newSize);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSize(Dimension newSize) {
-		if (newSize != size) {
-			NotificationChain msgs = null;
-			if (size != null)
-				msgs = ((InternalEObject) size).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.GRAPH_NODE__SIZE,
-						null, msgs);
-			if (newSize != null)
-				msgs = ((InternalEObject) newSize).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.GRAPH_NODE__SIZE,
-						null, msgs);
-			msgs = basicSetSize(newSize, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.GRAPH_NODE__SIZE, newSize, newSize));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_NODE__SIZE:
-			return basicSetSize(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_NODE__SIZE:
-			if (resolve)
-				return getSize();
-			return basicGetSize();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_NODE__SIZE:
-			setSize((Dimension) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.GRAPH_NODE__SIZE:
-			setSize((Dimension) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.GRAPH_NODE__SIZE:
-			return size != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //GraphNodeImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GraphicPrimitiveImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GraphicPrimitiveImpl.java
deleted file mode 100755
index c5a12d7..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GraphicPrimitiveImpl.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.GraphicPrimitive;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Graphic Primitive</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class GraphicPrimitiveImpl extends LeafElementImpl implements
-		GraphicPrimitive {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GraphicPrimitiveImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.GRAPHIC_PRIMITIVE;
-	}
-
-} //GraphicPrimitiveImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GuidanceDescriptionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GuidanceDescriptionImpl.java
deleted file mode 100755
index e8d6120..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GuidanceDescriptionImpl.java
+++ /dev/null
@@ -1,184 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.GuidanceDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Guidance Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.GuidanceDescriptionImpl#getAttachments <em>Attachments</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class GuidanceDescriptionImpl extends ContentDescriptionImpl implements
-		GuidanceDescription {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getAttachments() <em>Attachments</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttachments()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ATTACHMENTS_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getAttachments() <em>Attachments</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttachments()
-	 * @generated
-	 * @ordered
-	 */
-	protected String attachments = ATTACHMENTS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GuidanceDescriptionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.GUIDANCE_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAttachments() {
-		return attachments;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAttachments(String newAttachments) {
-		String oldAttachments = attachments;
-		attachments = newAttachments;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.GUIDANCE_DESCRIPTION__ATTACHMENTS,
-					oldAttachments, attachments));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.GUIDANCE_DESCRIPTION__ATTACHMENTS:
-			return getAttachments();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.GUIDANCE_DESCRIPTION__ATTACHMENTS:
-			setAttachments((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.GUIDANCE_DESCRIPTION__ATTACHMENTS:
-			setAttachments(ATTACHMENTS_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.GUIDANCE_DESCRIPTION__ATTACHMENTS:
-			return ATTACHMENTS_EDEFAULT == null ? attachments != null
-					: !ATTACHMENTS_EDEFAULT.equals(attachments);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (attachments: "); //$NON-NLS-1$
-		result.append(attachments);
-		result.append(')');
-		return result.toString();
-	}
-
-} //GuidanceDescriptionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GuidanceImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GuidanceImpl.java
deleted file mode 100755
index e5abbfb..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GuidanceImpl.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Guidance</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class GuidanceImpl extends ContentElementImpl implements
-		Guidance {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GuidanceImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.GUIDANCE;
-	}
-
-} //GuidanceImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GuidelineImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GuidelineImpl.java
deleted file mode 100755
index 9ee19a4..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/GuidelineImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Guideline</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class GuidelineImpl extends GuidanceImpl implements Guideline {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GuidelineImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.GUIDELINE;
-	}
-
-} //GuidelineImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ImageImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ImageImpl.java
deleted file mode 100755
index a1e119a..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ImageImpl.java
+++ /dev/null
@@ -1,240 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.net.URI;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.Image;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Image</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ImageImpl#getUri <em>Uri</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ImageImpl#getMimeType <em>Mime Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ImageImpl extends LeafElementImpl implements Image {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getUri() <em>Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUri()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final URI URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUri() <em>Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUri()
-	 * @generated
-	 * @ordered
-	 */
-	protected URI uri = URI_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMimeType() <em>Mime Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMimeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MIME_TYPE_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getMimeType() <em>Mime Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMimeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mimeType = MIME_TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ImageImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.IMAGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public URI getUri() {
-		return uri;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUri(URI newUri) {
-		URI oldUri = uri;
-		uri = newUri;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.IMAGE__URI, oldUri, uri));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMimeType() {
-		return mimeType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMimeType(String newMimeType) {
-		String oldMimeType = mimeType;
-		mimeType = newMimeType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.IMAGE__MIME_TYPE, oldMimeType, mimeType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.IMAGE__URI:
-			return getUri();
-		case UmaPackage.IMAGE__MIME_TYPE:
-			return getMimeType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.IMAGE__URI:
-			setUri((URI) newValue);
-			return;
-		case UmaPackage.IMAGE__MIME_TYPE:
-			setMimeType((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.IMAGE__URI:
-			setUri(URI_EDEFAULT);
-			return;
-		case UmaPackage.IMAGE__MIME_TYPE:
-			setMimeType(MIME_TYPE_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.IMAGE__URI:
-			return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT
-					.equals(uri);
-		case UmaPackage.IMAGE__MIME_TYPE:
-			return MIME_TYPE_EDEFAULT == null ? mimeType != null
-					: !MIME_TYPE_EDEFAULT.equals(mimeType);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (uri: "); //$NON-NLS-1$
-		result.append(uri);
-		result.append(", mimeType: "); //$NON-NLS-1$
-		result.append(mimeType);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ImageImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/IterationImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/IterationImpl.java
deleted file mode 100755
index cd2238b..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/IterationImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Iteration;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Iteration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class IterationImpl extends ActivityImpl implements Iteration {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IterationImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ITERATION;
-	}
-
-} //IterationImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/LeafElementImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/LeafElementImpl.java
deleted file mode 100755
index 7757a28..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/LeafElementImpl.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.LeafElement;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Leaf Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class LeafElementImpl extends DiagramElementImpl implements
-		LeafElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LeafElementImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.LEAF_ELEMENT;
-	}
-
-} //LeafElementImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodConfigurationImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodConfigurationImpl.java
deleted file mode 100755
index 08a852b..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodConfigurationImpl.java
+++ /dev/null
@@ -1,404 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.ContentCategory;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodConfigurationImpl#getMethodPluginSelection <em>Method Plugin Selection</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodConfigurationImpl#getMethodPackageSelection <em>Method Package Selection</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodConfigurationImpl#getProcessViews <em>Process Views</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodConfigurationImpl#getDefaultView <em>Default View</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodConfigurationImpl#getBaseConfigurations <em>Base Configurations</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodConfigurationImpl#getSubtractedCategory <em>Subtracted Category</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodConfigurationImpl#getAddedCategory <em>Added Category</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodConfigurationImpl extends MethodUnitImpl implements
-		MethodConfiguration {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getMethodPluginSelection() <em>Method Plugin Selection</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodPluginSelection()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methodPluginSelection = null;
-
-	/**
-	 * The cached value of the '{@link #getMethodPackageSelection() <em>Method Package Selection</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodPackageSelection()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methodPackageSelection = null;
-
-	/**
-	 * The cached value of the '{@link #getProcessViews() <em>Process Views</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProcessViews()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList processViews = null;
-
-	/**
-	 * The cached value of the '{@link #getDefaultView() <em>Default View</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultView()
-	 * @generated
-	 * @ordered
-	 */
-	protected ContentCategory defaultView = null;
-
-	/**
-	 * The cached value of the '{@link #getBaseConfigurations() <em>Base Configurations</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBaseConfigurations()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList baseConfigurations = null;
-
-	/**
-	 * The cached value of the '{@link #getSubtractedCategory() <em>Subtracted Category</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubtractedCategory()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList subtractedCategory = null;
-
-	/**
-	 * The cached value of the '{@link #getAddedCategory() <em>Added Category</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAddedCategory()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList addedCategory = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodConfigurationImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.METHOD_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMethodPluginSelection() {
-		if (methodPluginSelection == null) {
-			methodPluginSelection = new EObjectResolvingEList(
-					MethodPlugin.class, this,
-					UmaPackage.METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION);
-		}
-		return methodPluginSelection;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMethodPackageSelection() {
-		if (methodPackageSelection == null) {
-			methodPackageSelection = new EObjectResolvingEList(
-					MethodPackage.class, this,
-					UmaPackage.METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION);
-		}
-		return methodPackageSelection;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getProcessViews() {
-		if (processViews == null) {
-			processViews = new EObjectResolvingEList(ContentCategory.class,
-					this, UmaPackage.METHOD_CONFIGURATION__PROCESS_VIEWS);
-		}
-		return processViews;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContentCategory getDefaultView() {
-		if (defaultView != null && ((EObject) defaultView).eIsProxy()) {
-			InternalEObject oldDefaultView = (InternalEObject) defaultView;
-			defaultView = (ContentCategory) eResolveProxy(oldDefaultView);
-			if (defaultView != oldDefaultView) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.METHOD_CONFIGURATION__DEFAULT_VIEW,
-							oldDefaultView, defaultView));
-			}
-		}
-		return defaultView;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContentCategory basicGetDefaultView() {
-		return defaultView;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultView(ContentCategory newDefaultView) {
-		ContentCategory oldDefaultView = defaultView;
-		defaultView = newDefaultView;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.METHOD_CONFIGURATION__DEFAULT_VIEW,
-					oldDefaultView, defaultView));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getBaseConfigurations() {
-		if (baseConfigurations == null) {
-			baseConfigurations = new EObjectResolvingEList(
-					MethodConfiguration.class, this,
-					UmaPackage.METHOD_CONFIGURATION__BASE_CONFIGURATIONS);
-		}
-		return baseConfigurations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSubtractedCategory() {
-		if (subtractedCategory == null) {
-			subtractedCategory = new EObjectResolvingEList(
-					ContentCategory.class, this,
-					UmaPackage.METHOD_CONFIGURATION__SUBTRACTED_CATEGORY);
-		}
-		return subtractedCategory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getAddedCategory() {
-		if (addedCategory == null) {
-			addedCategory = new EObjectResolvingEList(ContentCategory.class,
-					this, UmaPackage.METHOD_CONFIGURATION__ADDED_CATEGORY);
-		}
-		return addedCategory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION:
-			return getMethodPluginSelection();
-		case UmaPackage.METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION:
-			return getMethodPackageSelection();
-		case UmaPackage.METHOD_CONFIGURATION__PROCESS_VIEWS:
-			return getProcessViews();
-		case UmaPackage.METHOD_CONFIGURATION__DEFAULT_VIEW:
-			if (resolve)
-				return getDefaultView();
-			return basicGetDefaultView();
-		case UmaPackage.METHOD_CONFIGURATION__BASE_CONFIGURATIONS:
-			return getBaseConfigurations();
-		case UmaPackage.METHOD_CONFIGURATION__SUBTRACTED_CATEGORY:
-			return getSubtractedCategory();
-		case UmaPackage.METHOD_CONFIGURATION__ADDED_CATEGORY:
-			return getAddedCategory();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION:
-			getMethodPluginSelection().clear();
-			getMethodPluginSelection().addAll((Collection) newValue);
-			return;
-		case UmaPackage.METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION:
-			getMethodPackageSelection().clear();
-			getMethodPackageSelection().addAll((Collection) newValue);
-			return;
-		case UmaPackage.METHOD_CONFIGURATION__PROCESS_VIEWS:
-			getProcessViews().clear();
-			getProcessViews().addAll((Collection) newValue);
-			return;
-		case UmaPackage.METHOD_CONFIGURATION__DEFAULT_VIEW:
-			setDefaultView((ContentCategory) newValue);
-			return;
-		case UmaPackage.METHOD_CONFIGURATION__BASE_CONFIGURATIONS:
-			getBaseConfigurations().clear();
-			getBaseConfigurations().addAll((Collection) newValue);
-			return;
-		case UmaPackage.METHOD_CONFIGURATION__SUBTRACTED_CATEGORY:
-			getSubtractedCategory().clear();
-			getSubtractedCategory().addAll((Collection) newValue);
-			return;
-		case UmaPackage.METHOD_CONFIGURATION__ADDED_CATEGORY:
-			getAddedCategory().clear();
-			getAddedCategory().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION:
-			getMethodPluginSelection().clear();
-			return;
-		case UmaPackage.METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION:
-			getMethodPackageSelection().clear();
-			return;
-		case UmaPackage.METHOD_CONFIGURATION__PROCESS_VIEWS:
-			getProcessViews().clear();
-			return;
-		case UmaPackage.METHOD_CONFIGURATION__DEFAULT_VIEW:
-			setDefaultView((ContentCategory) null);
-			return;
-		case UmaPackage.METHOD_CONFIGURATION__BASE_CONFIGURATIONS:
-			getBaseConfigurations().clear();
-			return;
-		case UmaPackage.METHOD_CONFIGURATION__SUBTRACTED_CATEGORY:
-			getSubtractedCategory().clear();
-			return;
-		case UmaPackage.METHOD_CONFIGURATION__ADDED_CATEGORY:
-			getAddedCategory().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION:
-			return methodPluginSelection != null
-					&& !methodPluginSelection.isEmpty();
-		case UmaPackage.METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION:
-			return methodPackageSelection != null
-					&& !methodPackageSelection.isEmpty();
-		case UmaPackage.METHOD_CONFIGURATION__PROCESS_VIEWS:
-			return processViews != null && !processViews.isEmpty();
-		case UmaPackage.METHOD_CONFIGURATION__DEFAULT_VIEW:
-			return defaultView != null;
-		case UmaPackage.METHOD_CONFIGURATION__BASE_CONFIGURATIONS:
-			return baseConfigurations != null && !baseConfigurations.isEmpty();
-		case UmaPackage.METHOD_CONFIGURATION__SUBTRACTED_CATEGORY:
-			return subtractedCategory != null && !subtractedCategory.isEmpty();
-		case UmaPackage.METHOD_CONFIGURATION__ADDED_CATEGORY:
-			return addedCategory != null && !addedCategory.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //MethodConfigurationImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodElementImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodElementImpl.java
deleted file mode 100755
index 7ca51e1..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodElementImpl.java
+++ /dev/null
@@ -1,465 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.epf.uma.Constraint;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodElementProperty;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.util.UmaUtil;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodElementImpl#getGuid <em>Guid</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodElementImpl#getBriefDescription <em>Brief Description</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodElementImpl#getOwnedRules <em>Owned Rules</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodElementImpl#getMethodElementProperty <em>Method Element Property</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodElementImpl#getSuppressed <em>Suppressed</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodElementImpl#getOrderingGuide <em>Ordering Guide</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class MethodElementImpl extends PackageableElementImpl
-		implements MethodElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getGuid() <em>Guid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGuid()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String GUID_EDEFAULT = ""; //$NON-NLS-1$
-
-	/**
-	 * The cached value of the '{@link #getGuid() <em>Guid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGuid()
-	 * @generated
-	 * @ordered
-	 */
-	protected String guid = GUID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getBriefDescription() <em>Brief Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBriefDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String BRIEF_DESCRIPTION_EDEFAULT = ""; //$NON-NLS-1$
-
-	/**
-	 * The cached value of the '{@link #getBriefDescription() <em>Brief Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBriefDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String briefDescription = BRIEF_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getOwnedRules() <em>Owned Rules</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOwnedRules()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ownedRules = null;
-
-	/**
-	 * The cached value of the '{@link #getMethodElementProperty() <em>Method Element Property</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodElementProperty()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methodElementProperty = null;
-
-	/**
-	 * The default value of the '{@link #getSuppressed() <em>Suppressed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSuppressed()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean SUPPRESSED_EDEFAULT = Boolean.FALSE;
-
-	/**
-	 * The cached value of the '{@link #getSuppressed() <em>Suppressed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSuppressed()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean suppressed = SUPPRESSED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOrderingGuide() <em>Ordering Guide</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOrderingGuide()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ORDERING_GUIDE_EDEFAULT = ""; //$NON-NLS-1$
-
-	/**
-	 * The cached value of the '{@link #getOrderingGuide() <em>Ordering Guide</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOrderingGuide()
-	 * @generated
-	 * @ordered
-	 */
-	protected String orderingGuide = ORDERING_GUIDE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodElementImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.METHOD_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public String getGuid() {
-		if (guid == null || guid.length() == 0) {
-			guid = UmaUtil.generateGUID();
-		}
-		return guid;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public void setGuid(String newGuid) {
-		String oldGuid = guid;
-		guid = newGuid;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.METHOD_ELEMENT__GUID, oldGuid, guid));
-
-		// synch up the resource's IDToEObjectMap and EObjectToIDMap with newGuid
-		//
-		if (eResource() instanceof XMLResource) {
-			XMLResource resource = ((XMLResource) eResource());
-			resource.setID(this, newGuid);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getBriefDescription() {
-		return briefDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBriefDescription(String newBriefDescription) {
-		String oldBriefDescription = briefDescription;
-		briefDescription = newBriefDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.METHOD_ELEMENT__BRIEF_DESCRIPTION,
-					oldBriefDescription, briefDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getOwnedRules() {
-		if (ownedRules == null) {
-			ownedRules = new EObjectContainmentEList.Resolving(
-					Constraint.class, this,
-					UmaPackage.METHOD_ELEMENT__OWNED_RULES);
-		}
-		return ownedRules;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMethodElementProperty() {
-		if (methodElementProperty == null) {
-			methodElementProperty = new EObjectContainmentEList.Resolving(
-					MethodElementProperty.class, this,
-					UmaPackage.METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY);
-		}
-		return methodElementProperty;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean getSuppressed() {
-		return suppressed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSuppressed(Boolean newSuppressed) {
-		Boolean oldSuppressed = suppressed;
-		suppressed = newSuppressed;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.METHOD_ELEMENT__SUPPRESSED, oldSuppressed,
-					suppressed));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getOrderingGuide() {
-		return orderingGuide;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOrderingGuide(String newOrderingGuide) {
-		String oldOrderingGuide = orderingGuide;
-		orderingGuide = newOrderingGuide;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.METHOD_ELEMENT__ORDERING_GUIDE,
-					oldOrderingGuide, orderingGuide));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.METHOD_ELEMENT__OWNED_RULES:
-			return ((InternalEList) getOwnedRules())
-					.basicRemove(otherEnd, msgs);
-		case UmaPackage.METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY:
-			return ((InternalEList) getMethodElementProperty()).basicRemove(
-					otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.METHOD_ELEMENT__GUID:
-			return getGuid();
-		case UmaPackage.METHOD_ELEMENT__BRIEF_DESCRIPTION:
-			return getBriefDescription();
-		case UmaPackage.METHOD_ELEMENT__OWNED_RULES:
-			return getOwnedRules();
-		case UmaPackage.METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY:
-			return getMethodElementProperty();
-		case UmaPackage.METHOD_ELEMENT__SUPPRESSED:
-			return getSuppressed();
-		case UmaPackage.METHOD_ELEMENT__ORDERING_GUIDE:
-			return getOrderingGuide();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.METHOD_ELEMENT__GUID:
-			setGuid((String) newValue);
-			return;
-		case UmaPackage.METHOD_ELEMENT__BRIEF_DESCRIPTION:
-			setBriefDescription((String) newValue);
-			return;
-		case UmaPackage.METHOD_ELEMENT__OWNED_RULES:
-			getOwnedRules().clear();
-			getOwnedRules().addAll((Collection) newValue);
-			return;
-		case UmaPackage.METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY:
-			getMethodElementProperty().clear();
-			getMethodElementProperty().addAll((Collection) newValue);
-			return;
-		case UmaPackage.METHOD_ELEMENT__SUPPRESSED:
-			setSuppressed((Boolean) newValue);
-			return;
-		case UmaPackage.METHOD_ELEMENT__ORDERING_GUIDE:
-			setOrderingGuide((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.METHOD_ELEMENT__GUID:
-			setGuid(GUID_EDEFAULT);
-			return;
-		case UmaPackage.METHOD_ELEMENT__BRIEF_DESCRIPTION:
-			setBriefDescription(BRIEF_DESCRIPTION_EDEFAULT);
-			return;
-		case UmaPackage.METHOD_ELEMENT__OWNED_RULES:
-			getOwnedRules().clear();
-			return;
-		case UmaPackage.METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY:
-			getMethodElementProperty().clear();
-			return;
-		case UmaPackage.METHOD_ELEMENT__SUPPRESSED:
-			setSuppressed(SUPPRESSED_EDEFAULT);
-			return;
-		case UmaPackage.METHOD_ELEMENT__ORDERING_GUIDE:
-			setOrderingGuide(ORDERING_GUIDE_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.METHOD_ELEMENT__GUID:
-			return GUID_EDEFAULT == null ? guid != null : !GUID_EDEFAULT
-					.equals(guid);
-		case UmaPackage.METHOD_ELEMENT__BRIEF_DESCRIPTION:
-			return BRIEF_DESCRIPTION_EDEFAULT == null ? briefDescription != null
-					: !BRIEF_DESCRIPTION_EDEFAULT.equals(briefDescription);
-		case UmaPackage.METHOD_ELEMENT__OWNED_RULES:
-			return ownedRules != null && !ownedRules.isEmpty();
-		case UmaPackage.METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY:
-			return methodElementProperty != null
-					&& !methodElementProperty.isEmpty();
-		case UmaPackage.METHOD_ELEMENT__SUPPRESSED:
-			return SUPPRESSED_EDEFAULT == null ? suppressed != null
-					: !SUPPRESSED_EDEFAULT.equals(suppressed);
-		case UmaPackage.METHOD_ELEMENT__ORDERING_GUIDE:
-			return ORDERING_GUIDE_EDEFAULT == null ? orderingGuide != null
-					: !ORDERING_GUIDE_EDEFAULT.equals(orderingGuide);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (guid: "); //$NON-NLS-1$
-		result.append(guid);
-		result.append(", briefDescription: "); //$NON-NLS-1$
-		result.append(briefDescription);
-		result.append(", suppressed: "); //$NON-NLS-1$
-		result.append(suppressed);
-		result.append(", orderingGuide: "); //$NON-NLS-1$
-		result.append(orderingGuide);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MethodElementImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodElementPropertyImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodElementPropertyImpl.java
deleted file mode 100755
index 64ad3b5..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodElementPropertyImpl.java
+++ /dev/null
@@ -1,186 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.epf.uma.MethodElementProperty;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Element Property</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodElementPropertyImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodElementPropertyImpl extends PackageableElementImpl implements
-		MethodElementProperty {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = ""; //$NON-NLS-1$
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodElementPropertyImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.METHOD_ELEMENT_PROPERTY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.METHOD_ELEMENT_PROPERTY__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.METHOD_ELEMENT_PROPERTY__VALUE:
-			return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.METHOD_ELEMENT_PROPERTY__VALUE:
-			setValue((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.METHOD_ELEMENT_PROPERTY__VALUE:
-			setValue(VALUE_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.METHOD_ELEMENT_PROPERTY__VALUE:
-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT
-					.equals(value);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: "); //$NON-NLS-1$
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MethodElementPropertyImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodLibraryImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodLibraryImpl.java
deleted file mode 100755
index cc4626c..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodLibraryImpl.java
+++ /dev/null
@@ -1,211 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Library</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodLibraryImpl#getMethodPlugins <em>Method Plugins</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodLibraryImpl#getPredefinedConfigurations <em>Predefined Configurations</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodLibraryImpl extends MethodUnitImpl implements MethodLibrary {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getMethodPlugins() <em>Method Plugins</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodPlugins()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methodPlugins = null;
-
-	/**
-	 * The cached value of the '{@link #getPredefinedConfigurations() <em>Predefined Configurations</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPredefinedConfigurations()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList predefinedConfigurations = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodLibraryImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.METHOD_LIBRARY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMethodPlugins() {
-		if (methodPlugins == null) {
-			methodPlugins = new EObjectContainmentEList.Resolving(
-					MethodPlugin.class, this,
-					UmaPackage.METHOD_LIBRARY__METHOD_PLUGINS);
-		}
-		return methodPlugins;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getPredefinedConfigurations() {
-		if (predefinedConfigurations == null) {
-			predefinedConfigurations = new EObjectContainmentEList.Resolving(
-					MethodConfiguration.class, this,
-					UmaPackage.METHOD_LIBRARY__PREDEFINED_CONFIGURATIONS);
-		}
-		return predefinedConfigurations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.METHOD_LIBRARY__METHOD_PLUGINS:
-			return ((InternalEList) getMethodPlugins()).basicRemove(otherEnd,
-					msgs);
-		case UmaPackage.METHOD_LIBRARY__PREDEFINED_CONFIGURATIONS:
-			return ((InternalEList) getPredefinedConfigurations()).basicRemove(
-					otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.METHOD_LIBRARY__METHOD_PLUGINS:
-			return getMethodPlugins();
-		case UmaPackage.METHOD_LIBRARY__PREDEFINED_CONFIGURATIONS:
-			return getPredefinedConfigurations();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.METHOD_LIBRARY__METHOD_PLUGINS:
-			getMethodPlugins().clear();
-			getMethodPlugins().addAll((Collection) newValue);
-			return;
-		case UmaPackage.METHOD_LIBRARY__PREDEFINED_CONFIGURATIONS:
-			getPredefinedConfigurations().clear();
-			getPredefinedConfigurations().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.METHOD_LIBRARY__METHOD_PLUGINS:
-			getMethodPlugins().clear();
-			return;
-		case UmaPackage.METHOD_LIBRARY__PREDEFINED_CONFIGURATIONS:
-			getPredefinedConfigurations().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.METHOD_LIBRARY__METHOD_PLUGINS:
-			return methodPlugins != null && !methodPlugins.isEmpty();
-		case UmaPackage.METHOD_LIBRARY__PREDEFINED_CONFIGURATIONS:
-			return predefinedConfigurations != null
-					&& !predefinedConfigurations.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //MethodLibraryImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodPackageImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodPackageImpl.java
deleted file mode 100755
index 908847c..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodPackageImpl.java
+++ /dev/null
@@ -1,290 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Package</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodPackageImpl#getGlobal <em>Global</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodPackageImpl#getReusedPackages <em>Reused Packages</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodPackageImpl#getChildPackages <em>Child Packages</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class MethodPackageImpl extends MethodElementImpl implements
-		MethodPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getGlobal() <em>Global</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGlobal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean GLOBAL_EDEFAULT = Boolean.FALSE;
-
-	/**
-	 * The cached value of the '{@link #getGlobal() <em>Global</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGlobal()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean global = GLOBAL_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getReusedPackages() <em>Reused Packages</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReusedPackages()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList reusedPackages = null;
-
-	/**
-	 * The cached value of the '{@link #getChildPackages() <em>Child Packages</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChildPackages()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList childPackages = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodPackageImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.METHOD_PACKAGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean getGlobal() {
-		return global;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGlobal(Boolean newGlobal) {
-		Boolean oldGlobal = global;
-		global = newGlobal;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.METHOD_PACKAGE__GLOBAL, oldGlobal, global));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getReusedPackages() {
-		if (reusedPackages == null) {
-			reusedPackages = new EObjectResolvingEList(MethodPackage.class,
-					this, UmaPackage.METHOD_PACKAGE__REUSED_PACKAGES);
-		}
-		return reusedPackages;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getChildPackages() {
-		if (childPackages == null) {
-			childPackages = new EObjectContainmentEList.Resolving(
-					MethodPackage.class, this,
-					UmaPackage.METHOD_PACKAGE__CHILD_PACKAGES);
-		}
-		return childPackages;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.METHOD_PACKAGE__CHILD_PACKAGES:
-			return ((InternalEList) getChildPackages()).basicRemove(otherEnd,
-					msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.METHOD_PACKAGE__GLOBAL:
-			return getGlobal();
-		case UmaPackage.METHOD_PACKAGE__REUSED_PACKAGES:
-			return getReusedPackages();
-		case UmaPackage.METHOD_PACKAGE__CHILD_PACKAGES:
-			return getChildPackages();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.METHOD_PACKAGE__GLOBAL:
-			setGlobal((Boolean) newValue);
-			return;
-		case UmaPackage.METHOD_PACKAGE__REUSED_PACKAGES:
-			getReusedPackages().clear();
-			getReusedPackages().addAll((Collection) newValue);
-			return;
-		case UmaPackage.METHOD_PACKAGE__CHILD_PACKAGES:
-			getChildPackages().clear();
-			getChildPackages().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.METHOD_PACKAGE__GLOBAL:
-			setGlobal(GLOBAL_EDEFAULT);
-			return;
-		case UmaPackage.METHOD_PACKAGE__REUSED_PACKAGES:
-			getReusedPackages().clear();
-			return;
-		case UmaPackage.METHOD_PACKAGE__CHILD_PACKAGES:
-			getChildPackages().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.METHOD_PACKAGE__GLOBAL:
-			return GLOBAL_EDEFAULT == null ? global != null : !GLOBAL_EDEFAULT
-					.equals(global);
-		case UmaPackage.METHOD_PACKAGE__REUSED_PACKAGES:
-			return reusedPackages != null && !reusedPackages.isEmpty();
-		case UmaPackage.METHOD_PACKAGE__CHILD_PACKAGES:
-			return childPackages != null && !childPackages.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (global: "); //$NON-NLS-1$
-		result.append(global);
-		result.append(')');
-		return result.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.MethodPackage#getParentPackage()
-	 */
-	public MethodPackage getParentPackage() {
-		EObject parent = eContainer();
-		if (parent instanceof MethodPackage) {
-			return (MethodPackage) parent;
-		}
-		return null;
-	}
-
-} //MethodPackageImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodPluginImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodPluginImpl.java
deleted file mode 100755
index ab86c42..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodPluginImpl.java
+++ /dev/null
@@ -1,279 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Plugin</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodPluginImpl#getUserChangeable <em>User Changeable</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodPluginImpl#getMethodPackages <em>Method Packages</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodPluginImpl#getBases <em>Bases</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodPluginImpl extends MethodUnitImpl implements MethodPlugin {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getUserChangeable() <em>User Changeable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUserChangeable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean USER_CHANGEABLE_EDEFAULT = Boolean.TRUE;
-
-	/**
-	 * The cached value of the '{@link #getUserChangeable() <em>User Changeable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUserChangeable()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean userChangeable = USER_CHANGEABLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getMethodPackages() <em>Method Packages</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodPackages()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methodPackages = null;
-
-	/**
-	 * The cached value of the '{@link #getBases() <em>Bases</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBases()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList bases = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodPluginImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.METHOD_PLUGIN;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean getUserChangeable() {
-		return userChangeable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUserChangeable(Boolean newUserChangeable) {
-		Boolean oldUserChangeable = userChangeable;
-		userChangeable = newUserChangeable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.METHOD_PLUGIN__USER_CHANGEABLE,
-					oldUserChangeable, userChangeable));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMethodPackages() {
-		if (methodPackages == null) {
-			methodPackages = new EObjectContainmentEList.Resolving(
-					MethodPackage.class, this,
-					UmaPackage.METHOD_PLUGIN__METHOD_PACKAGES);
-		}
-		return methodPackages;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getBases() {
-		if (bases == null) {
-			bases = new EObjectResolvingEList(MethodPlugin.class, this,
-					UmaPackage.METHOD_PLUGIN__BASES);
-		}
-		return bases;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.METHOD_PLUGIN__METHOD_PACKAGES:
-			return ((InternalEList) getMethodPackages()).basicRemove(otherEnd,
-					msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.METHOD_PLUGIN__USER_CHANGEABLE:
-			return getUserChangeable();
-		case UmaPackage.METHOD_PLUGIN__METHOD_PACKAGES:
-			return getMethodPackages();
-		case UmaPackage.METHOD_PLUGIN__BASES:
-			return getBases();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.METHOD_PLUGIN__USER_CHANGEABLE:
-			setUserChangeable((Boolean) newValue);
-			return;
-		case UmaPackage.METHOD_PLUGIN__METHOD_PACKAGES:
-			getMethodPackages().clear();
-			getMethodPackages().addAll((Collection) newValue);
-			return;
-		case UmaPackage.METHOD_PLUGIN__BASES:
-			getBases().clear();
-			getBases().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.METHOD_PLUGIN__USER_CHANGEABLE:
-			setUserChangeable(USER_CHANGEABLE_EDEFAULT);
-			return;
-		case UmaPackage.METHOD_PLUGIN__METHOD_PACKAGES:
-			getMethodPackages().clear();
-			return;
-		case UmaPackage.METHOD_PLUGIN__BASES:
-			getBases().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.METHOD_PLUGIN__USER_CHANGEABLE:
-			return USER_CHANGEABLE_EDEFAULT == null ? userChangeable != null
-					: !USER_CHANGEABLE_EDEFAULT.equals(userChangeable);
-		case UmaPackage.METHOD_PLUGIN__METHOD_PACKAGES:
-			return methodPackages != null && !methodPackages.isEmpty();
-		case UmaPackage.METHOD_PLUGIN__BASES:
-			return bases != null && !bases.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (userChangeable: "); //$NON-NLS-1$
-		result.append(userChangeable);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MethodPluginImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodUnitImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodUnitImpl.java
deleted file mode 100755
index f25d048..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MethodUnitImpl.java
+++ /dev/null
@@ -1,424 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Date;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.MethodUnit;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Unit</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodUnitImpl#getAuthors <em>Authors</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodUnitImpl#getChangeDate <em>Change Date</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodUnitImpl#getChangeDescription <em>Change Description</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodUnitImpl#getVersion <em>Version</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.MethodUnitImpl#getCopyrightStatement <em>Copyright Statement</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class MethodUnitImpl extends MethodElementImpl implements
-		MethodUnit {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getAuthors() <em>Authors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthors()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String AUTHORS_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getAuthors() <em>Authors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthors()
-	 * @generated
-	 * @ordered
-	 */
-	protected String authors = AUTHORS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getChangeDate() <em>Change Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Date CHANGE_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getChangeDate() <em>Change Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Date changeDate = CHANGE_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getChangeDescription() <em>Change Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CHANGE_DESCRIPTION_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getChangeDescription() <em>Change Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String changeDescription = CHANGE_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getCopyrightStatement() <em>Copyright Statement</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCopyrightStatement()
-	 * @generated
-	 * @ordered
-	 */
-	protected SupportingMaterial copyrightStatement = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodUnitImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.METHOD_UNIT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAuthors() {
-		return authors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthors(String newAuthors) {
-		String oldAuthors = authors;
-		authors = newAuthors;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.METHOD_UNIT__AUTHORS, oldAuthors, authors));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Date getChangeDate() {
-		return changeDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setChangeDate(Date newChangeDate) {
-		Date oldChangeDate = changeDate;
-		changeDate = newChangeDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.METHOD_UNIT__CHANGE_DATE, oldChangeDate,
-					changeDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getChangeDescription() {
-		return changeDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setChangeDescription(String newChangeDescription) {
-		String oldChangeDescription = changeDescription;
-		changeDescription = newChangeDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.METHOD_UNIT__CHANGE_DESCRIPTION,
-					oldChangeDescription, changeDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.METHOD_UNIT__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SupportingMaterial getCopyrightStatement() {
-		if (copyrightStatement != null
-				&& ((EObject) copyrightStatement).eIsProxy()) {
-			InternalEObject oldCopyrightStatement = (InternalEObject) copyrightStatement;
-			copyrightStatement = (SupportingMaterial) eResolveProxy(oldCopyrightStatement);
-			if (copyrightStatement != oldCopyrightStatement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.METHOD_UNIT__COPYRIGHT_STATEMENT,
-							oldCopyrightStatement, copyrightStatement));
-			}
-		}
-		return copyrightStatement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SupportingMaterial basicGetCopyrightStatement() {
-		return copyrightStatement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCopyrightStatement(SupportingMaterial newCopyrightStatement) {
-		SupportingMaterial oldCopyrightStatement = copyrightStatement;
-		copyrightStatement = newCopyrightStatement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.METHOD_UNIT__COPYRIGHT_STATEMENT,
-					oldCopyrightStatement, copyrightStatement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.METHOD_UNIT__AUTHORS:
-			return getAuthors();
-		case UmaPackage.METHOD_UNIT__CHANGE_DATE:
-			return getChangeDate();
-		case UmaPackage.METHOD_UNIT__CHANGE_DESCRIPTION:
-			return getChangeDescription();
-		case UmaPackage.METHOD_UNIT__VERSION:
-			return getVersion();
-		case UmaPackage.METHOD_UNIT__COPYRIGHT_STATEMENT:
-			if (resolve)
-				return getCopyrightStatement();
-			return basicGetCopyrightStatement();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.METHOD_UNIT__AUTHORS:
-			setAuthors((String) newValue);
-			return;
-		case UmaPackage.METHOD_UNIT__CHANGE_DATE:
-			setChangeDate((Date) newValue);
-			return;
-		case UmaPackage.METHOD_UNIT__CHANGE_DESCRIPTION:
-			setChangeDescription((String) newValue);
-			return;
-		case UmaPackage.METHOD_UNIT__VERSION:
-			setVersion((String) newValue);
-			return;
-		case UmaPackage.METHOD_UNIT__COPYRIGHT_STATEMENT:
-			setCopyrightStatement((SupportingMaterial) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.METHOD_UNIT__AUTHORS:
-			setAuthors(AUTHORS_EDEFAULT);
-			return;
-		case UmaPackage.METHOD_UNIT__CHANGE_DATE:
-			setChangeDate(CHANGE_DATE_EDEFAULT);
-			return;
-		case UmaPackage.METHOD_UNIT__CHANGE_DESCRIPTION:
-			setChangeDescription(CHANGE_DESCRIPTION_EDEFAULT);
-			return;
-		case UmaPackage.METHOD_UNIT__VERSION:
-			setVersion(VERSION_EDEFAULT);
-			return;
-		case UmaPackage.METHOD_UNIT__COPYRIGHT_STATEMENT:
-			setCopyrightStatement((SupportingMaterial) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.METHOD_UNIT__AUTHORS:
-			return AUTHORS_EDEFAULT == null ? authors != null
-					: !AUTHORS_EDEFAULT.equals(authors);
-		case UmaPackage.METHOD_UNIT__CHANGE_DATE:
-			return CHANGE_DATE_EDEFAULT == null ? changeDate != null
-					: !CHANGE_DATE_EDEFAULT.equals(changeDate);
-		case UmaPackage.METHOD_UNIT__CHANGE_DESCRIPTION:
-			return CHANGE_DESCRIPTION_EDEFAULT == null ? changeDescription != null
-					: !CHANGE_DESCRIPTION_EDEFAULT.equals(changeDescription);
-		case UmaPackage.METHOD_UNIT__VERSION:
-			return VERSION_EDEFAULT == null ? version != null
-					: !VERSION_EDEFAULT.equals(version);
-		case UmaPackage.METHOD_UNIT__COPYRIGHT_STATEMENT:
-			return copyrightStatement != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (authors: "); //$NON-NLS-1$
-		result.append(authors);
-		result.append(", changeDate: "); //$NON-NLS-1$
-		result.append(changeDate);
-		result.append(", changeDescription: "); //$NON-NLS-1$
-		result.append(changeDescription);
-		result.append(", version: "); //$NON-NLS-1$
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MethodUnitImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MilestoneImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MilestoneImpl.java
deleted file mode 100755
index 52e7208..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/MilestoneImpl.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Milestone</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class MilestoneImpl extends WorkBreakdownElementImpl implements
-		Milestone {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MilestoneImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.MILESTONE;
-	}
-
-} //MilestoneImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/NamedElementImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/NamedElementImpl.java
deleted file mode 100755
index 2fd8dd9..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/NamedElementImpl.java
+++ /dev/null
@@ -1,183 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.NamedElement;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Named Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.NamedElementImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class NamedElementImpl extends ElementImpl implements
-		NamedElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NamedElementImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.NAMED_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.NAMED_ELEMENT__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.NAMED_ELEMENT__NAME:
-			return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.NAMED_ELEMENT__NAME:
-			setName((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.NAMED_ELEMENT__NAME:
-			setName(NAME_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.NAMED_ELEMENT__NAME:
-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT
-					.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //NamedElementImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/NamespaceImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/NamespaceImpl.java
deleted file mode 100755
index 10b2317..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/NamespaceImpl.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Namespace;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Namespace</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class NamespaceImpl extends NamedElementImpl implements
-		Namespace {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NamespaceImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.NAMESPACE;
-	}
-
-} //NamespaceImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/OutcomeImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/OutcomeImpl.java
deleted file mode 100755
index 969f9ac..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/OutcomeImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Outcome;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Outcome</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class OutcomeImpl extends WorkProductImpl implements Outcome {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OutcomeImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.OUTCOME;
-	}
-
-} //OutcomeImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PackageImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PackageImpl.java
deleted file mode 100755
index 216ecdb..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PackageImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Package</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PackageImpl extends NamespaceImpl implements
-		org.eclipse.epf.uma.Package {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PackageImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PACKAGE;
-	}
-
-} //PackageImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PackageableElementImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PackageableElementImpl.java
deleted file mode 100755
index 73ace8b..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PackageableElementImpl.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.PackageableElement;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Packageable Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class PackageableElementImpl extends NamedElementImpl implements
-		PackageableElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PackageableElementImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PACKAGEABLE_ELEMENT;
-	}
-
-} //PackageableElementImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PhaseImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PhaseImpl.java
deleted file mode 100755
index 9548e8b..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PhaseImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Phase;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Phase</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PhaseImpl extends ActivityImpl implements Phase {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PhaseImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PHASE;
-	}
-
-} //PhaseImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PlanningDataImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PlanningDataImpl.java
deleted file mode 100755
index af276b6..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PlanningDataImpl.java
+++ /dev/null
@@ -1,298 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Date;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.PlanningData;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Planning Data</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.PlanningDataImpl#getStartDate <em>Start Date</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.PlanningDataImpl#getFinishDate <em>Finish Date</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.PlanningDataImpl#getRank <em>Rank</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PlanningDataImpl extends ProcessElementImpl implements
-		PlanningData {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getStartDate() <em>Start Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStartDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Date START_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStartDate() <em>Start Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStartDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Date startDate = START_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getFinishDate() <em>Finish Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinishDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Date FINISH_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFinishDate() <em>Finish Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinishDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Date finishDate = FINISH_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRank() <em>Rank</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRank()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int RANK_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getRank() <em>Rank</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRank()
-	 * @generated
-	 * @ordered
-	 */
-	protected int rank = RANK_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PlanningDataImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PLANNING_DATA;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Date getStartDate() {
-		return startDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStartDate(Date newStartDate) {
-		Date oldStartDate = startDate;
-		startDate = newStartDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PLANNING_DATA__START_DATE, oldStartDate,
-					startDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Date getFinishDate() {
-		return finishDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinishDate(Date newFinishDate) {
-		Date oldFinishDate = finishDate;
-		finishDate = newFinishDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PLANNING_DATA__FINISH_DATE, oldFinishDate,
-					finishDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getRank() {
-		return rank;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRank(int newRank) {
-		int oldRank = rank;
-		rank = newRank;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PLANNING_DATA__RANK, oldRank, rank));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.PLANNING_DATA__START_DATE:
-			return getStartDate();
-		case UmaPackage.PLANNING_DATA__FINISH_DATE:
-			return getFinishDate();
-		case UmaPackage.PLANNING_DATA__RANK:
-			return new Integer(getRank());
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.PLANNING_DATA__START_DATE:
-			setStartDate((Date) newValue);
-			return;
-		case UmaPackage.PLANNING_DATA__FINISH_DATE:
-			setFinishDate((Date) newValue);
-			return;
-		case UmaPackage.PLANNING_DATA__RANK:
-			setRank(((Integer) newValue).intValue());
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.PLANNING_DATA__START_DATE:
-			setStartDate(START_DATE_EDEFAULT);
-			return;
-		case UmaPackage.PLANNING_DATA__FINISH_DATE:
-			setFinishDate(FINISH_DATE_EDEFAULT);
-			return;
-		case UmaPackage.PLANNING_DATA__RANK:
-			setRank(RANK_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.PLANNING_DATA__START_DATE:
-			return START_DATE_EDEFAULT == null ? startDate != null
-					: !START_DATE_EDEFAULT.equals(startDate);
-		case UmaPackage.PLANNING_DATA__FINISH_DATE:
-			return FINISH_DATE_EDEFAULT == null ? finishDate != null
-					: !FINISH_DATE_EDEFAULT.equals(finishDate);
-		case UmaPackage.PLANNING_DATA__RANK:
-			return rank != RANK_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (startDate: "); //$NON-NLS-1$
-		result.append(startDate);
-		result.append(", finishDate: "); //$NON-NLS-1$
-		result.append(finishDate);
-		result.append(", rank: "); //$NON-NLS-1$
-		result.append(rank);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PlanningDataImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PointImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PointImpl.java
deleted file mode 100755
index 6623376..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PointImpl.java
+++ /dev/null
@@ -1,237 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.Point;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Point</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.PointImpl#getX <em>X</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.PointImpl#getY <em>Y</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PointImpl extends MultiResourceEObject implements Point {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getX() <em>X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getX()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Double X_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getX() <em>X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getX()
-	 * @generated
-	 * @ordered
-	 */
-	protected Double x = X_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getY() <em>Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getY()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Double Y_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getY() <em>Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getY()
-	 * @generated
-	 * @ordered
-	 */
-	protected Double y = Y_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PointImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.POINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getX() {
-		return x;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setX(Double newX) {
-		Double oldX = x;
-		x = newX;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.POINT__X, oldX, x));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getY() {
-		return y;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setY(Double newY) {
-		Double oldY = y;
-		y = newY;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.POINT__Y, oldY, y));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.POINT__X:
-			return getX();
-		case UmaPackage.POINT__Y:
-			return getY();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.POINT__X:
-			setX((Double) newValue);
-			return;
-		case UmaPackage.POINT__Y:
-			setY((Double) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.POINT__X:
-			setX(X_EDEFAULT);
-			return;
-		case UmaPackage.POINT__Y:
-			setY(Y_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.POINT__X:
-			return X_EDEFAULT == null ? x != null : !X_EDEFAULT.equals(x);
-		case UmaPackage.POINT__Y:
-			return Y_EDEFAULT == null ? y != null : !Y_EDEFAULT.equals(y);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (x: "); //$NON-NLS-1$
-		result.append(x);
-		result.append(", y: "); //$NON-NLS-1$
-		result.append(y);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PointImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PolylineImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PolylineImpl.java
deleted file mode 100755
index 2f78fcd..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PolylineImpl.java
+++ /dev/null
@@ -1,240 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.Point;
-import org.eclipse.epf.uma.Polyline;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Polyline</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.PolylineImpl#getClosed <em>Closed</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.PolylineImpl#getWaypoints <em>Waypoints</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PolylineImpl extends GraphicPrimitiveImpl implements Polyline {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getClosed() <em>Closed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClosed()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean CLOSED_EDEFAULT = Boolean.TRUE;
-
-	/**
-	 * The cached value of the '{@link #getClosed() <em>Closed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClosed()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean closed = CLOSED_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getWaypoints() <em>Waypoints</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWaypoints()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList waypoints = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PolylineImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.POLYLINE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean getClosed() {
-		return closed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setClosed(Boolean newClosed) {
-		Boolean oldClosed = closed;
-		closed = newClosed;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.POLYLINE__CLOSED, oldClosed, closed));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getWaypoints() {
-		if (waypoints == null) {
-			waypoints = new EObjectContainmentEList.Resolving(Point.class,
-					this, UmaPackage.POLYLINE__WAYPOINTS);
-		}
-		return waypoints;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.POLYLINE__WAYPOINTS:
-			return ((InternalEList) getWaypoints()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.POLYLINE__CLOSED:
-			return getClosed();
-		case UmaPackage.POLYLINE__WAYPOINTS:
-			return getWaypoints();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.POLYLINE__CLOSED:
-			setClosed((Boolean) newValue);
-			return;
-		case UmaPackage.POLYLINE__WAYPOINTS:
-			getWaypoints().clear();
-			getWaypoints().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.POLYLINE__CLOSED:
-			setClosed(CLOSED_EDEFAULT);
-			return;
-		case UmaPackage.POLYLINE__WAYPOINTS:
-			getWaypoints().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.POLYLINE__CLOSED:
-			return CLOSED_EDEFAULT == null ? closed != null : !CLOSED_EDEFAULT
-					.equals(closed);
-		case UmaPackage.POLYLINE__WAYPOINTS:
-			return waypoints != null && !waypoints.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (closed: "); //$NON-NLS-1$
-		result.append(closed);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PolylineImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PracticeDescriptionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PracticeDescriptionImpl.java
deleted file mode 100755
index 0cbe17c..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PracticeDescriptionImpl.java
+++ /dev/null
@@ -1,468 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.PracticeDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Practice Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.PracticeDescriptionImpl#getAdditionalInfo <em>Additional Info</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.PracticeDescriptionImpl#getProblem <em>Problem</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.PracticeDescriptionImpl#getBackground <em>Background</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.PracticeDescriptionImpl#getGoals <em>Goals</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.PracticeDescriptionImpl#getApplication <em>Application</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.PracticeDescriptionImpl#getLevelsOfAdoption <em>Levels Of Adoption</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PracticeDescriptionImpl extends ContentDescriptionImpl implements
-		PracticeDescription {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getAdditionalInfo() <em>Additional Info</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdditionalInfo()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ADDITIONAL_INFO_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getAdditionalInfo() <em>Additional Info</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdditionalInfo()
-	 * @generated
-	 * @ordered
-	 */
-	protected String additionalInfo = ADDITIONAL_INFO_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getProblem() <em>Problem</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProblem()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PROBLEM_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getProblem() <em>Problem</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProblem()
-	 * @generated
-	 * @ordered
-	 */
-	protected String problem = PROBLEM_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getBackground() <em>Background</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBackground()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String BACKGROUND_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getBackground() <em>Background</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBackground()
-	 * @generated
-	 * @ordered
-	 */
-	protected String background = BACKGROUND_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getGoals() <em>Goals</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGoals()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String GOALS_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getGoals() <em>Goals</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGoals()
-	 * @generated
-	 * @ordered
-	 */
-	protected String goals = GOALS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getApplication() <em>Application</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getApplication()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String APPLICATION_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getApplication() <em>Application</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getApplication()
-	 * @generated
-	 * @ordered
-	 */
-	protected String application = APPLICATION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLevelsOfAdoption() <em>Levels Of Adoption</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevelsOfAdoption()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LEVELS_OF_ADOPTION_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getLevelsOfAdoption() <em>Levels Of Adoption</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevelsOfAdoption()
-	 * @generated
-	 * @ordered
-	 */
-	protected String levelsOfAdoption = LEVELS_OF_ADOPTION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PracticeDescriptionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PRACTICE_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAdditionalInfo() {
-		return additionalInfo;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAdditionalInfo(String newAdditionalInfo) {
-		String oldAdditionalInfo = additionalInfo;
-		additionalInfo = newAdditionalInfo;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PRACTICE_DESCRIPTION__ADDITIONAL_INFO,
-					oldAdditionalInfo, additionalInfo));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getProblem() {
-		return problem;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setProblem(String newProblem) {
-		String oldProblem = problem;
-		problem = newProblem;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PRACTICE_DESCRIPTION__PROBLEM, oldProblem,
-					problem));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getBackground() {
-		return background;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBackground(String newBackground) {
-		String oldBackground = background;
-		background = newBackground;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PRACTICE_DESCRIPTION__BACKGROUND, oldBackground,
-					background));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getGoals() {
-		return goals;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGoals(String newGoals) {
-		String oldGoals = goals;
-		goals = newGoals;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PRACTICE_DESCRIPTION__GOALS, oldGoals, goals));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getApplication() {
-		return application;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setApplication(String newApplication) {
-		String oldApplication = application;
-		application = newApplication;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PRACTICE_DESCRIPTION__APPLICATION,
-					oldApplication, application));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLevelsOfAdoption() {
-		return levelsOfAdoption;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLevelsOfAdoption(String newLevelsOfAdoption) {
-		String oldLevelsOfAdoption = levelsOfAdoption;
-		levelsOfAdoption = newLevelsOfAdoption;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION,
-					oldLevelsOfAdoption, levelsOfAdoption));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.PRACTICE_DESCRIPTION__ADDITIONAL_INFO:
-			return getAdditionalInfo();
-		case UmaPackage.PRACTICE_DESCRIPTION__PROBLEM:
-			return getProblem();
-		case UmaPackage.PRACTICE_DESCRIPTION__BACKGROUND:
-			return getBackground();
-		case UmaPackage.PRACTICE_DESCRIPTION__GOALS:
-			return getGoals();
-		case UmaPackage.PRACTICE_DESCRIPTION__APPLICATION:
-			return getApplication();
-		case UmaPackage.PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION:
-			return getLevelsOfAdoption();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.PRACTICE_DESCRIPTION__ADDITIONAL_INFO:
-			setAdditionalInfo((String) newValue);
-			return;
-		case UmaPackage.PRACTICE_DESCRIPTION__PROBLEM:
-			setProblem((String) newValue);
-			return;
-		case UmaPackage.PRACTICE_DESCRIPTION__BACKGROUND:
-			setBackground((String) newValue);
-			return;
-		case UmaPackage.PRACTICE_DESCRIPTION__GOALS:
-			setGoals((String) newValue);
-			return;
-		case UmaPackage.PRACTICE_DESCRIPTION__APPLICATION:
-			setApplication((String) newValue);
-			return;
-		case UmaPackage.PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION:
-			setLevelsOfAdoption((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.PRACTICE_DESCRIPTION__ADDITIONAL_INFO:
-			setAdditionalInfo(ADDITIONAL_INFO_EDEFAULT);
-			return;
-		case UmaPackage.PRACTICE_DESCRIPTION__PROBLEM:
-			setProblem(PROBLEM_EDEFAULT);
-			return;
-		case UmaPackage.PRACTICE_DESCRIPTION__BACKGROUND:
-			setBackground(BACKGROUND_EDEFAULT);
-			return;
-		case UmaPackage.PRACTICE_DESCRIPTION__GOALS:
-			setGoals(GOALS_EDEFAULT);
-			return;
-		case UmaPackage.PRACTICE_DESCRIPTION__APPLICATION:
-			setApplication(APPLICATION_EDEFAULT);
-			return;
-		case UmaPackage.PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION:
-			setLevelsOfAdoption(LEVELS_OF_ADOPTION_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.PRACTICE_DESCRIPTION__ADDITIONAL_INFO:
-			return ADDITIONAL_INFO_EDEFAULT == null ? additionalInfo != null
-					: !ADDITIONAL_INFO_EDEFAULT.equals(additionalInfo);
-		case UmaPackage.PRACTICE_DESCRIPTION__PROBLEM:
-			return PROBLEM_EDEFAULT == null ? problem != null
-					: !PROBLEM_EDEFAULT.equals(problem);
-		case UmaPackage.PRACTICE_DESCRIPTION__BACKGROUND:
-			return BACKGROUND_EDEFAULT == null ? background != null
-					: !BACKGROUND_EDEFAULT.equals(background);
-		case UmaPackage.PRACTICE_DESCRIPTION__GOALS:
-			return GOALS_EDEFAULT == null ? goals != null : !GOALS_EDEFAULT
-					.equals(goals);
-		case UmaPackage.PRACTICE_DESCRIPTION__APPLICATION:
-			return APPLICATION_EDEFAULT == null ? application != null
-					: !APPLICATION_EDEFAULT.equals(application);
-		case UmaPackage.PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION:
-			return LEVELS_OF_ADOPTION_EDEFAULT == null ? levelsOfAdoption != null
-					: !LEVELS_OF_ADOPTION_EDEFAULT.equals(levelsOfAdoption);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (additionalInfo: "); //$NON-NLS-1$
-		result.append(additionalInfo);
-		result.append(", problem: "); //$NON-NLS-1$
-		result.append(problem);
-		result.append(", background: "); //$NON-NLS-1$
-		result.append(background);
-		result.append(", goals: "); //$NON-NLS-1$
-		result.append(goals);
-		result.append(", application: "); //$NON-NLS-1$
-		result.append(application);
-		result.append(", levelsOfAdoption: "); //$NON-NLS-1$
-		result.append(levelsOfAdoption);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PracticeDescriptionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PracticeImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PracticeImpl.java
deleted file mode 100755
index e1965a0..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PracticeImpl.java
+++ /dev/null
@@ -1,241 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Practice</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.PracticeImpl#getSubPractices <em>Sub Practices</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.PracticeImpl#getContentReferences <em>Content References</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.PracticeImpl#getActivityReferences <em>Activity References</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PracticeImpl extends GuidanceImpl implements Practice {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getSubPractices() <em>Sub Practices</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubPractices()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList subPractices = null;
-
-	/**
-	 * The cached value of the '{@link #getContentReferences() <em>Content References</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContentReferences()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList contentReferences = null;
-
-	/**
-	 * The cached value of the '{@link #getActivityReferences() <em>Activity References</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivityReferences()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList activityReferences = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PracticeImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PRACTICE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSubPractices() {
-		if (subPractices == null) {
-			subPractices = new EObjectContainmentEList.Resolving(
-					Practice.class, this, UmaPackage.PRACTICE__SUB_PRACTICES);
-		}
-		return subPractices;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getContentReferences() {
-		if (contentReferences == null) {
-			contentReferences = new EObjectResolvingEList(ContentElement.class,
-					this, UmaPackage.PRACTICE__CONTENT_REFERENCES);
-		}
-		return contentReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getActivityReferences() {
-		if (activityReferences == null) {
-			activityReferences = new EObjectResolvingEList(Activity.class,
-					this, UmaPackage.PRACTICE__ACTIVITY_REFERENCES);
-		}
-		return activityReferences;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.PRACTICE__SUB_PRACTICES:
-			return ((InternalEList) getSubPractices()).basicRemove(otherEnd,
-					msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.PRACTICE__SUB_PRACTICES:
-			return getSubPractices();
-		case UmaPackage.PRACTICE__CONTENT_REFERENCES:
-			return getContentReferences();
-		case UmaPackage.PRACTICE__ACTIVITY_REFERENCES:
-			return getActivityReferences();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.PRACTICE__SUB_PRACTICES:
-			getSubPractices().clear();
-			getSubPractices().addAll((Collection) newValue);
-			return;
-		case UmaPackage.PRACTICE__CONTENT_REFERENCES:
-			getContentReferences().clear();
-			getContentReferences().addAll((Collection) newValue);
-			return;
-		case UmaPackage.PRACTICE__ACTIVITY_REFERENCES:
-			getActivityReferences().clear();
-			getActivityReferences().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.PRACTICE__SUB_PRACTICES:
-			getSubPractices().clear();
-			return;
-		case UmaPackage.PRACTICE__CONTENT_REFERENCES:
-			getContentReferences().clear();
-			return;
-		case UmaPackage.PRACTICE__ACTIVITY_REFERENCES:
-			getActivityReferences().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.PRACTICE__SUB_PRACTICES:
-			return subPractices != null && !subPractices.isEmpty();
-		case UmaPackage.PRACTICE__CONTENT_REFERENCES:
-			return contentReferences != null && !contentReferences.isEmpty();
-		case UmaPackage.PRACTICE__ACTIVITY_REFERENCES:
-			return activityReferences != null && !activityReferences.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //PracticeImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessComponentDescriptorImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessComponentDescriptorImpl.java
deleted file mode 100755
index 4de4719..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessComponentDescriptorImpl.java
+++ /dev/null
@@ -1,183 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessComponentDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process Component Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessComponentDescriptorImpl#getProcessComponent <em>Process Component</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ProcessComponentDescriptorImpl extends DescriptorImpl implements
-		ProcessComponentDescriptor {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getProcessComponent() <em>Process Component</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProcessComponent()
-	 * @generated
-	 * @ordered
-	 */
-	protected ProcessComponent processComponent = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessComponentDescriptorImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS_COMPONENT_DESCRIPTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessComponent getProcessComponent() {
-		if (processComponent != null && ((EObject) processComponent).eIsProxy()) {
-			InternalEObject oldProcessComponent = (InternalEObject) processComponent;
-			processComponent = (ProcessComponent) eResolveProxy(oldProcessComponent);
-			if (processComponent != oldProcessComponent) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-							this,
-							Notification.RESOLVE,
-							UmaPackage.PROCESS_COMPONENT_DESCRIPTOR__PROCESS_COMPONENT,
-							oldProcessComponent, processComponent));
-			}
-		}
-		return processComponent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessComponent basicGetProcessComponent() {
-		return processComponent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setProcessComponent(ProcessComponent newProcessComponent) {
-		ProcessComponent oldProcessComponent = processComponent;
-		processComponent = newProcessComponent;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PROCESS_COMPONENT_DESCRIPTOR__PROCESS_COMPONENT,
-					oldProcessComponent, processComponent));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_COMPONENT_DESCRIPTOR__PROCESS_COMPONENT:
-			if (resolve)
-				return getProcessComponent();
-			return basicGetProcessComponent();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_COMPONENT_DESCRIPTOR__PROCESS_COMPONENT:
-			setProcessComponent((ProcessComponent) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_COMPONENT_DESCRIPTOR__PROCESS_COMPONENT:
-			setProcessComponent((ProcessComponent) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.PROCESS_COMPONENT_DESCRIPTOR__PROCESS_COMPONENT:
-			return processComponent != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ProcessComponentDescriptorImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessComponentImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessComponentImpl.java
deleted file mode 100755
index 429bffb..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessComponentImpl.java
+++ /dev/null
@@ -1,643 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.MethodUnit;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessComponentInterface;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process Component</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessComponentImpl#getAuthors <em>Authors</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessComponentImpl#getChangeDate <em>Change Date</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessComponentImpl#getChangeDescription <em>Change Description</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessComponentImpl#getVersion <em>Version</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessComponentImpl#getCopyrightStatement <em>Copyright Statement</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessComponentImpl#getInterfaces <em>Interfaces</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessComponentImpl#getProcess <em>Process</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ProcessComponentImpl extends ProcessPackageImpl implements
-		ProcessComponent {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getAuthors() <em>Authors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthors()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String AUTHORS_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getAuthors() <em>Authors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthors()
-	 * @generated
-	 * @ordered
-	 */
-	protected String authors = AUTHORS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getChangeDate() <em>Change Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Date CHANGE_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getChangeDate() <em>Change Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Date changeDate = CHANGE_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getChangeDescription() <em>Change Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CHANGE_DESCRIPTION_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getChangeDescription() <em>Change Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String changeDescription = CHANGE_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getCopyrightStatement() <em>Copyright Statement</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCopyrightStatement()
-	 * @generated
-	 * @ordered
-	 */
-	protected SupportingMaterial copyrightStatement = null;
-
-	/**
-	 * The cached value of the '{@link #getInterfaces() <em>Interfaces</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInterfaces()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList interfaces = null;
-
-	/**
-	 * The cached value of the '{@link #getProcess() <em>Process</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProcess()
-	 * @generated
-	 * @ordered
-	 */
-	protected org.eclipse.epf.uma.Process process = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessComponentImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS_COMPONENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAuthors() {
-		return authors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthors(String newAuthors) {
-		String oldAuthors = authors;
-		authors = newAuthors;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PROCESS_COMPONENT__AUTHORS, oldAuthors, authors));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Date getChangeDate() {
-		return changeDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setChangeDate(Date newChangeDate) {
-		Date oldChangeDate = changeDate;
-		changeDate = newChangeDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PROCESS_COMPONENT__CHANGE_DATE, oldChangeDate,
-					changeDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getChangeDescription() {
-		return changeDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setChangeDescription(String newChangeDescription) {
-		String oldChangeDescription = changeDescription;
-		changeDescription = newChangeDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PROCESS_COMPONENT__CHANGE_DESCRIPTION,
-					oldChangeDescription, changeDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PROCESS_COMPONENT__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SupportingMaterial getCopyrightStatement() {
-		if (copyrightStatement != null
-				&& ((EObject) copyrightStatement).eIsProxy()) {
-			InternalEObject oldCopyrightStatement = (InternalEObject) copyrightStatement;
-			copyrightStatement = (SupportingMaterial) eResolveProxy(oldCopyrightStatement);
-			if (copyrightStatement != oldCopyrightStatement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.PROCESS_COMPONENT__COPYRIGHT_STATEMENT,
-							oldCopyrightStatement, copyrightStatement));
-			}
-		}
-		return copyrightStatement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SupportingMaterial basicGetCopyrightStatement() {
-		return copyrightStatement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCopyrightStatement(SupportingMaterial newCopyrightStatement) {
-		SupportingMaterial oldCopyrightStatement = copyrightStatement;
-		copyrightStatement = newCopyrightStatement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PROCESS_COMPONENT__COPYRIGHT_STATEMENT,
-					oldCopyrightStatement, copyrightStatement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInterfaces() {
-		if (interfaces == null) {
-			interfaces = new EObjectResolvingEList(
-					ProcessComponentInterface.class, this,
-					UmaPackage.PROCESS_COMPONENT__INTERFACES);
-		}
-		return interfaces;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public org.eclipse.epf.uma.Process getProcess() {
-		if (process != null && ((EObject) process).eIsProxy()) {
-			InternalEObject oldProcess = (InternalEObject) process;
-			process = (org.eclipse.epf.uma.Process) eResolveProxy(oldProcess);
-			if (process != oldProcess) {
-				InternalEObject newProcess = (InternalEObject) process;
-				NotificationChain msgs = oldProcess.eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.PROCESS_COMPONENT__PROCESS, null,
-						null);
-				if (newProcess.eInternalContainer() == null) {
-					msgs = newProcess
-							.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-									- UmaPackage.PROCESS_COMPONENT__PROCESS,
-									null, msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.PROCESS_COMPONENT__PROCESS, oldProcess,
-							process));
-			}
-		}
-		return process;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public org.eclipse.epf.uma.Process basicGetProcess() {
-		return process;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetProcess(
-			org.eclipse.epf.uma.Process newProcess, NotificationChain msgs) {
-		org.eclipse.epf.uma.Process oldProcess = process;
-		process = newProcess;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.PROCESS_COMPONENT__PROCESS,
-					oldProcess, newProcess);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setProcess(org.eclipse.epf.uma.Process newProcess) {
-		if (newProcess != process) {
-			NotificationChain msgs = null;
-			if (process != null)
-				msgs = ((InternalEObject) process).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.PROCESS_COMPONENT__PROCESS, null,
-						msgs);
-			if (newProcess != null)
-				msgs = ((InternalEObject) newProcess).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.PROCESS_COMPONENT__PROCESS, null,
-						msgs);
-			msgs = basicSetProcess(newProcess, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PROCESS_COMPONENT__PROCESS, newProcess,
-					newProcess));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_COMPONENT__PROCESS:
-			return basicSetProcess(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_COMPONENT__AUTHORS:
-			return getAuthors();
-		case UmaPackage.PROCESS_COMPONENT__CHANGE_DATE:
-			return getChangeDate();
-		case UmaPackage.PROCESS_COMPONENT__CHANGE_DESCRIPTION:
-			return getChangeDescription();
-		case UmaPackage.PROCESS_COMPONENT__VERSION:
-			return getVersion();
-		case UmaPackage.PROCESS_COMPONENT__COPYRIGHT_STATEMENT:
-			if (resolve)
-				return getCopyrightStatement();
-			return basicGetCopyrightStatement();
-		case UmaPackage.PROCESS_COMPONENT__INTERFACES:
-			return getInterfaces();
-		case UmaPackage.PROCESS_COMPONENT__PROCESS:
-			if (resolve)
-				return getProcess();
-			return basicGetProcess();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_COMPONENT__AUTHORS:
-			setAuthors((String) newValue);
-			return;
-		case UmaPackage.PROCESS_COMPONENT__CHANGE_DATE:
-			setChangeDate((Date) newValue);
-			return;
-		case UmaPackage.PROCESS_COMPONENT__CHANGE_DESCRIPTION:
-			setChangeDescription((String) newValue);
-			return;
-		case UmaPackage.PROCESS_COMPONENT__VERSION:
-			setVersion((String) newValue);
-			return;
-		case UmaPackage.PROCESS_COMPONENT__COPYRIGHT_STATEMENT:
-			setCopyrightStatement((SupportingMaterial) newValue);
-			return;
-		case UmaPackage.PROCESS_COMPONENT__INTERFACES:
-			getInterfaces().clear();
-			getInterfaces().addAll((Collection) newValue);
-			return;
-		case UmaPackage.PROCESS_COMPONENT__PROCESS:
-			setProcess((org.eclipse.epf.uma.Process) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_COMPONENT__AUTHORS:
-			setAuthors(AUTHORS_EDEFAULT);
-			return;
-		case UmaPackage.PROCESS_COMPONENT__CHANGE_DATE:
-			setChangeDate(CHANGE_DATE_EDEFAULT);
-			return;
-		case UmaPackage.PROCESS_COMPONENT__CHANGE_DESCRIPTION:
-			setChangeDescription(CHANGE_DESCRIPTION_EDEFAULT);
-			return;
-		case UmaPackage.PROCESS_COMPONENT__VERSION:
-			setVersion(VERSION_EDEFAULT);
-			return;
-		case UmaPackage.PROCESS_COMPONENT__COPYRIGHT_STATEMENT:
-			setCopyrightStatement((SupportingMaterial) null);
-			return;
-		case UmaPackage.PROCESS_COMPONENT__INTERFACES:
-			getInterfaces().clear();
-			return;
-		case UmaPackage.PROCESS_COMPONENT__PROCESS:
-			setProcess((org.eclipse.epf.uma.Process) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.PROCESS_COMPONENT__AUTHORS:
-			return AUTHORS_EDEFAULT == null ? authors != null
-					: !AUTHORS_EDEFAULT.equals(authors);
-		case UmaPackage.PROCESS_COMPONENT__CHANGE_DATE:
-			return CHANGE_DATE_EDEFAULT == null ? changeDate != null
-					: !CHANGE_DATE_EDEFAULT.equals(changeDate);
-		case UmaPackage.PROCESS_COMPONENT__CHANGE_DESCRIPTION:
-			return CHANGE_DESCRIPTION_EDEFAULT == null ? changeDescription != null
-					: !CHANGE_DESCRIPTION_EDEFAULT.equals(changeDescription);
-		case UmaPackage.PROCESS_COMPONENT__VERSION:
-			return VERSION_EDEFAULT == null ? version != null
-					: !VERSION_EDEFAULT.equals(version);
-		case UmaPackage.PROCESS_COMPONENT__COPYRIGHT_STATEMENT:
-			return copyrightStatement != null;
-		case UmaPackage.PROCESS_COMPONENT__INTERFACES:
-			return interfaces != null && !interfaces.isEmpty();
-		case UmaPackage.PROCESS_COMPONENT__PROCESS:
-			return process != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
-		if (baseClass == MethodUnit.class) {
-			switch (derivedFeatureID) {
-			case UmaPackage.PROCESS_COMPONENT__AUTHORS:
-				return UmaPackage.METHOD_UNIT__AUTHORS;
-			case UmaPackage.PROCESS_COMPONENT__CHANGE_DATE:
-				return UmaPackage.METHOD_UNIT__CHANGE_DATE;
-			case UmaPackage.PROCESS_COMPONENT__CHANGE_DESCRIPTION:
-				return UmaPackage.METHOD_UNIT__CHANGE_DESCRIPTION;
-			case UmaPackage.PROCESS_COMPONENT__VERSION:
-				return UmaPackage.METHOD_UNIT__VERSION;
-			case UmaPackage.PROCESS_COMPONENT__COPYRIGHT_STATEMENT:
-				return UmaPackage.METHOD_UNIT__COPYRIGHT_STATEMENT;
-			default:
-				return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
-		if (baseClass == MethodUnit.class) {
-			switch (baseFeatureID) {
-			case UmaPackage.METHOD_UNIT__AUTHORS:
-				return UmaPackage.PROCESS_COMPONENT__AUTHORS;
-			case UmaPackage.METHOD_UNIT__CHANGE_DATE:
-				return UmaPackage.PROCESS_COMPONENT__CHANGE_DATE;
-			case UmaPackage.METHOD_UNIT__CHANGE_DESCRIPTION:
-				return UmaPackage.PROCESS_COMPONENT__CHANGE_DESCRIPTION;
-			case UmaPackage.METHOD_UNIT__VERSION:
-				return UmaPackage.PROCESS_COMPONENT__VERSION;
-			case UmaPackage.METHOD_UNIT__COPYRIGHT_STATEMENT:
-				return UmaPackage.PROCESS_COMPONENT__COPYRIGHT_STATEMENT;
-			default:
-				return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (authors: "); //$NON-NLS-1$
-		result.append(authors);
-		result.append(", changeDate: "); //$NON-NLS-1$
-		result.append(changeDate);
-		result.append(", changeDescription: "); //$NON-NLS-1$
-		result.append(changeDescription);
-		result.append(", version: "); //$NON-NLS-1$
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ProcessComponentImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessComponentInterfaceImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessComponentInterfaceImpl.java
deleted file mode 100755
index 1eea5d4..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessComponentInterfaceImpl.java
+++ /dev/null
@@ -1,213 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.ProcessComponentInterface;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process Component Interface</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessComponentInterfaceImpl#getInterfaceSpecifications <em>Interface Specifications</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessComponentInterfaceImpl#getInterfaceIO <em>Interface IO</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ProcessComponentInterfaceImpl extends BreakdownElementImpl
-		implements ProcessComponentInterface {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getInterfaceSpecifications() <em>Interface Specifications</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInterfaceSpecifications()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList interfaceSpecifications = null;
-
-	/**
-	 * The cached value of the '{@link #getInterfaceIO() <em>Interface IO</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInterfaceIO()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList interfaceIO = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessComponentInterfaceImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS_COMPONENT_INTERFACE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInterfaceSpecifications() {
-		if (interfaceSpecifications == null) {
-			interfaceSpecifications = new EObjectContainmentEList.Resolving(
-					TaskDescriptor.class,
-					this,
-					UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATIONS);
-		}
-		return interfaceSpecifications;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getInterfaceIO() {
-		if (interfaceIO == null) {
-			interfaceIO = new EObjectContainmentEList.Resolving(
-					WorkProductDescriptor.class, this,
-					UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_IO);
-		}
-		return interfaceIO;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATIONS:
-			return ((InternalEList) getInterfaceSpecifications()).basicRemove(
-					otherEnd, msgs);
-		case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_IO:
-			return ((InternalEList) getInterfaceIO()).basicRemove(otherEnd,
-					msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATIONS:
-			return getInterfaceSpecifications();
-		case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_IO:
-			return getInterfaceIO();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATIONS:
-			getInterfaceSpecifications().clear();
-			getInterfaceSpecifications().addAll((Collection) newValue);
-			return;
-		case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_IO:
-			getInterfaceIO().clear();
-			getInterfaceIO().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATIONS:
-			getInterfaceSpecifications().clear();
-			return;
-		case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_IO:
-			getInterfaceIO().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATIONS:
-			return interfaceSpecifications != null
-					&& !interfaceSpecifications.isEmpty();
-		case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_IO:
-			return interfaceIO != null && !interfaceIO.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ProcessComponentInterfaceImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessDescriptionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessDescriptionImpl.java
deleted file mode 100755
index 47c128c..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessDescriptionImpl.java
+++ /dev/null
@@ -1,297 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.ProcessDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessDescriptionImpl#getExternalId <em>External Id</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessDescriptionImpl#getScope <em>Scope</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessDescriptionImpl#getUsageNotes <em>Usage Notes</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ProcessDescriptionImpl extends ActivityDescriptionImpl implements
-		ProcessDescription {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getExternalId() <em>External Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExternalId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXTERNAL_ID_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getExternalId() <em>External Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExternalId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String externalId = EXTERNAL_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getScope() <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getScope()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SCOPE_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getScope() <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getScope()
-	 * @generated
-	 * @ordered
-	 */
-	protected String scope = SCOPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getUsageNotes() <em>Usage Notes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUsageNotes()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String USAGE_NOTES_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getUsageNotes() <em>Usage Notes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUsageNotes()
-	 * @generated
-	 * @ordered
-	 */
-	protected String usageNotes = USAGE_NOTES_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessDescriptionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getExternalId() {
-		return externalId;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExternalId(String newExternalId) {
-		String oldExternalId = externalId;
-		externalId = newExternalId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PROCESS_DESCRIPTION__EXTERNAL_ID, oldExternalId,
-					externalId));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getScope() {
-		return scope;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setScope(String newScope) {
-		String oldScope = scope;
-		scope = newScope;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PROCESS_DESCRIPTION__SCOPE, oldScope, scope));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getUsageNotes() {
-		return usageNotes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUsageNotes(String newUsageNotes) {
-		String oldUsageNotes = usageNotes;
-		usageNotes = newUsageNotes;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PROCESS_DESCRIPTION__USAGE_NOTES, oldUsageNotes,
-					usageNotes));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_DESCRIPTION__EXTERNAL_ID:
-			return getExternalId();
-		case UmaPackage.PROCESS_DESCRIPTION__SCOPE:
-			return getScope();
-		case UmaPackage.PROCESS_DESCRIPTION__USAGE_NOTES:
-			return getUsageNotes();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_DESCRIPTION__EXTERNAL_ID:
-			setExternalId((String) newValue);
-			return;
-		case UmaPackage.PROCESS_DESCRIPTION__SCOPE:
-			setScope((String) newValue);
-			return;
-		case UmaPackage.PROCESS_DESCRIPTION__USAGE_NOTES:
-			setUsageNotes((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_DESCRIPTION__EXTERNAL_ID:
-			setExternalId(EXTERNAL_ID_EDEFAULT);
-			return;
-		case UmaPackage.PROCESS_DESCRIPTION__SCOPE:
-			setScope(SCOPE_EDEFAULT);
-			return;
-		case UmaPackage.PROCESS_DESCRIPTION__USAGE_NOTES:
-			setUsageNotes(USAGE_NOTES_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.PROCESS_DESCRIPTION__EXTERNAL_ID:
-			return EXTERNAL_ID_EDEFAULT == null ? externalId != null
-					: !EXTERNAL_ID_EDEFAULT.equals(externalId);
-		case UmaPackage.PROCESS_DESCRIPTION__SCOPE:
-			return SCOPE_EDEFAULT == null ? scope != null : !SCOPE_EDEFAULT
-					.equals(scope);
-		case UmaPackage.PROCESS_DESCRIPTION__USAGE_NOTES:
-			return USAGE_NOTES_EDEFAULT == null ? usageNotes != null
-					: !USAGE_NOTES_EDEFAULT.equals(usageNotes);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (externalId: "); //$NON-NLS-1$
-		result.append(externalId);
-		result.append(", scope: "); //$NON-NLS-1$
-		result.append(scope);
-		result.append(", usageNotes: "); //$NON-NLS-1$
-		result.append(usageNotes);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ProcessDescriptionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessElementImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessElementImpl.java
deleted file mode 100755
index 3f13c4c..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessElementImpl.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.ProcessElement;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class ProcessElementImpl extends DescribableElementImpl
-		implements ProcessElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessElementImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS_ELEMENT;
-	}
-
-} //ProcessElementImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessFamilyImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessFamilyImpl.java
deleted file mode 100755
index b1fbc22..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessFamilyImpl.java
+++ /dev/null
@@ -1,153 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.ProcessFamily;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process Family</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessFamilyImpl#getDeliveryProcesses <em>Delivery Processes</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ProcessFamilyImpl extends MethodConfigurationImpl implements
-		ProcessFamily {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getDeliveryProcesses() <em>Delivery Processes</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDeliveryProcesses()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList deliveryProcesses = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessFamilyImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS_FAMILY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDeliveryProcesses() {
-		if (deliveryProcesses == null) {
-			deliveryProcesses = new EObjectResolvingEList(
-					DeliveryProcess.class, this,
-					UmaPackage.PROCESS_FAMILY__DELIVERY_PROCESSES);
-		}
-		return deliveryProcesses;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_FAMILY__DELIVERY_PROCESSES:
-			return getDeliveryProcesses();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_FAMILY__DELIVERY_PROCESSES:
-			getDeliveryProcesses().clear();
-			getDeliveryProcesses().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_FAMILY__DELIVERY_PROCESSES:
-			getDeliveryProcesses().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.PROCESS_FAMILY__DELIVERY_PROCESSES:
-			return deliveryProcesses != null && !deliveryProcesses.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ProcessFamilyImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessImpl.java
deleted file mode 100755
index c6050bb..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessImpl.java
+++ /dev/null
@@ -1,257 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessImpl#getIncludesPatterns <em>Includes Patterns</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessImpl#getDefaultContext <em>Default Context</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessImpl#getValidContext <em>Valid Context</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ProcessImpl extends ActivityImpl implements
-		org.eclipse.epf.uma.Process {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getIncludesPatterns() <em>Includes Patterns</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIncludesPatterns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList includesPatterns = null;
-
-	/**
-	 * The cached value of the '{@link #getDefaultContext() <em>Default Context</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultContext()
-	 * @generated
-	 * @ordered
-	 */
-	protected MethodConfiguration defaultContext = null;
-
-	/**
-	 * The cached value of the '{@link #getValidContext() <em>Valid Context</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValidContext()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList validContext = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIncludesPatterns() {
-		if (includesPatterns == null) {
-			includesPatterns = new EObjectResolvingEList(
-					CapabilityPattern.class, this,
-					UmaPackage.PROCESS__INCLUDES_PATTERNS);
-		}
-		return includesPatterns;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodConfiguration getDefaultContext() {
-		if (defaultContext != null && ((EObject) defaultContext).eIsProxy()) {
-			InternalEObject oldDefaultContext = (InternalEObject) defaultContext;
-			defaultContext = (MethodConfiguration) eResolveProxy(oldDefaultContext);
-			if (defaultContext != oldDefaultContext) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.PROCESS__DEFAULT_CONTEXT,
-							oldDefaultContext, defaultContext));
-			}
-		}
-		return defaultContext;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodConfiguration basicGetDefaultContext() {
-		return defaultContext;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultContext(MethodConfiguration newDefaultContext) {
-		MethodConfiguration oldDefaultContext = defaultContext;
-		defaultContext = newDefaultContext;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PROCESS__DEFAULT_CONTEXT, oldDefaultContext,
-					defaultContext));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getValidContext() {
-		if (validContext == null) {
-			validContext = new EObjectResolvingEList(MethodConfiguration.class,
-					this, UmaPackage.PROCESS__VALID_CONTEXT);
-		}
-		return validContext;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.PROCESS__INCLUDES_PATTERNS:
-			return getIncludesPatterns();
-		case UmaPackage.PROCESS__DEFAULT_CONTEXT:
-			if (resolve)
-				return getDefaultContext();
-			return basicGetDefaultContext();
-		case UmaPackage.PROCESS__VALID_CONTEXT:
-			return getValidContext();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.PROCESS__INCLUDES_PATTERNS:
-			getIncludesPatterns().clear();
-			getIncludesPatterns().addAll((Collection) newValue);
-			return;
-		case UmaPackage.PROCESS__DEFAULT_CONTEXT:
-			setDefaultContext((MethodConfiguration) newValue);
-			return;
-		case UmaPackage.PROCESS__VALID_CONTEXT:
-			getValidContext().clear();
-			getValidContext().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.PROCESS__INCLUDES_PATTERNS:
-			getIncludesPatterns().clear();
-			return;
-		case UmaPackage.PROCESS__DEFAULT_CONTEXT:
-			setDefaultContext((MethodConfiguration) null);
-			return;
-		case UmaPackage.PROCESS__VALID_CONTEXT:
-			getValidContext().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.PROCESS__INCLUDES_PATTERNS:
-			return includesPatterns != null && !includesPatterns.isEmpty();
-		case UmaPackage.PROCESS__DEFAULT_CONTEXT:
-			return defaultContext != null;
-		case UmaPackage.PROCESS__VALID_CONTEXT:
-			return validContext != null && !validContext.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ProcessImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessPackageImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessPackageImpl.java
deleted file mode 100755
index b632d8d..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessPackageImpl.java
+++ /dev/null
@@ -1,209 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.ProcessElement;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process Package</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessPackageImpl#getProcessElements <em>Process Elements</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessPackageImpl#getDiagrams <em>Diagrams</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ProcessPackageImpl extends MethodPackageImpl implements
-		ProcessPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getProcessElements() <em>Process Elements</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProcessElements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList processElements = null;
-
-	/**
-	 * The cached value of the '{@link #getDiagrams() <em>Diagrams</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiagrams()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList diagrams = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessPackageImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS_PACKAGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getProcessElements() {
-		if (processElements == null) {
-			processElements = new EObjectContainmentEList.Resolving(
-					ProcessElement.class, this,
-					UmaPackage.PROCESS_PACKAGE__PROCESS_ELEMENTS);
-		}
-		return processElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDiagrams() {
-		if (diagrams == null) {
-			diagrams = new EObjectContainmentEList.Resolving(Diagram.class,
-					this, UmaPackage.PROCESS_PACKAGE__DIAGRAMS);
-		}
-		return diagrams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_PACKAGE__PROCESS_ELEMENTS:
-			return ((InternalEList) getProcessElements()).basicRemove(otherEnd,
-					msgs);
-		case UmaPackage.PROCESS_PACKAGE__DIAGRAMS:
-			return ((InternalEList) getDiagrams()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_PACKAGE__PROCESS_ELEMENTS:
-			return getProcessElements();
-		case UmaPackage.PROCESS_PACKAGE__DIAGRAMS:
-			return getDiagrams();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_PACKAGE__PROCESS_ELEMENTS:
-			getProcessElements().clear();
-			getProcessElements().addAll((Collection) newValue);
-			return;
-		case UmaPackage.PROCESS_PACKAGE__DIAGRAMS:
-			getDiagrams().clear();
-			getDiagrams().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_PACKAGE__PROCESS_ELEMENTS:
-			getProcessElements().clear();
-			return;
-		case UmaPackage.PROCESS_PACKAGE__DIAGRAMS:
-			getDiagrams().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.PROCESS_PACKAGE__PROCESS_ELEMENTS:
-			return processElements != null && !processElements.isEmpty();
-		case UmaPackage.PROCESS_PACKAGE__DIAGRAMS:
-			return diagrams != null && !diagrams.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ProcessPackageImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessPlanningTemplateImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessPlanningTemplateImpl.java
deleted file mode 100755
index 8cfc57c..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ProcessPlanningTemplateImpl.java
+++ /dev/null
@@ -1,152 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.ProcessPlanningTemplate;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process Planning Template</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ProcessPlanningTemplateImpl#getBasedOnProcesses <em>Based On Processes</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ProcessPlanningTemplateImpl extends ProcessImpl implements
-		ProcessPlanningTemplate {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getBasedOnProcesses() <em>Based On Processes</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBasedOnProcesses()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList basedOnProcesses = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessPlanningTemplateImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS_PLANNING_TEMPLATE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getBasedOnProcesses() {
-		if (basedOnProcesses == null) {
-			basedOnProcesses = new EObjectResolvingEList(
-					org.eclipse.epf.uma.Process.class, this,
-					UmaPackage.PROCESS_PLANNING_TEMPLATE__BASED_ON_PROCESSES);
-		}
-		return basedOnProcesses;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_PLANNING_TEMPLATE__BASED_ON_PROCESSES:
-			return getBasedOnProcesses();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_PLANNING_TEMPLATE__BASED_ON_PROCESSES:
-			getBasedOnProcesses().clear();
-			getBasedOnProcesses().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.PROCESS_PLANNING_TEMPLATE__BASED_ON_PROCESSES:
-			getBasedOnProcesses().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.PROCESS_PLANNING_TEMPLATE__BASED_ON_PROCESSES:
-			return basedOnProcesses != null && !basedOnProcesses.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ProcessPlanningTemplateImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PropertyImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PropertyImpl.java
deleted file mode 100755
index ce80e51..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PropertyImpl.java
+++ /dev/null
@@ -1,238 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Property</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.PropertyImpl#getKey <em>Key</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.PropertyImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PropertyImpl extends DiagramElementImpl implements Property {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String KEY_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected String key = KEY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PropertyImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROPERTY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getKey() {
-		return key;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKey(String newKey) {
-		String oldKey = key;
-		key = newKey;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PROPERTY__KEY, oldKey, key));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.PROPERTY__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.PROPERTY__KEY:
-			return getKey();
-		case UmaPackage.PROPERTY__VALUE:
-			return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.PROPERTY__KEY:
-			setKey((String) newValue);
-			return;
-		case UmaPackage.PROPERTY__VALUE:
-			setValue((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.PROPERTY__KEY:
-			setKey(KEY_EDEFAULT);
-			return;
-		case UmaPackage.PROPERTY__VALUE:
-			setValue(VALUE_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.PROPERTY__KEY:
-			return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT
-					.equals(key);
-		case UmaPackage.PROPERTY__VALUE:
-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT
-					.equals(value);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (key: "); //$NON-NLS-1$
-		result.append(key);
-		result.append(", value: "); //$NON-NLS-1$
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PropertyImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PseudoStateImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PseudoStateImpl.java
deleted file mode 100755
index b150963..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/PseudoStateImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PseudoStateImpl.java,v 1.4 2006/09/07 00:06:20 klow Exp $
- */
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.PseudoState;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Pseudo State</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PseudoStateImpl extends VertexImpl implements PseudoState {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PseudoStateImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PSEUDO_STATE;
-	}
-
-} //PseudoStateImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ReferenceImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ReferenceImpl.java
deleted file mode 100755
index 2275ee4..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ReferenceImpl.java
+++ /dev/null
@@ -1,318 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.DiagramElement;
-import org.eclipse.epf.uma.Reference;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Reference</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ReferenceImpl#getIsIndividualRepresentation <em>Is Individual Representation</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.ReferenceImpl#getReferenced <em>Referenced</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ReferenceImpl extends DiagramElementImpl implements Reference {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getIsIndividualRepresentation() <em>Is Individual Representation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsIndividualRepresentation()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean IS_INDIVIDUAL_REPRESENTATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getIsIndividualRepresentation() <em>Is Individual Representation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsIndividualRepresentation()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean isIndividualRepresentation = IS_INDIVIDUAL_REPRESENTATION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getReferenced() <em>Referenced</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReferenced()
-	 * @generated
-	 * @ordered
-	 */
-	protected DiagramElement referenced = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReferenceImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.REFERENCE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean getIsIndividualRepresentation() {
-		return isIndividualRepresentation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsIndividualRepresentation(
-			Boolean newIsIndividualRepresentation) {
-		Boolean oldIsIndividualRepresentation = isIndividualRepresentation;
-		isIndividualRepresentation = newIsIndividualRepresentation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.REFERENCE__IS_INDIVIDUAL_REPRESENTATION,
-					oldIsIndividualRepresentation, isIndividualRepresentation));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DiagramElement getReferenced() {
-		if (referenced != null && ((EObject) referenced).eIsProxy()) {
-			InternalEObject oldReferenced = (InternalEObject) referenced;
-			referenced = (DiagramElement) eResolveProxy(oldReferenced);
-			if (referenced != oldReferenced) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.REFERENCE__REFERENCED, oldReferenced,
-							referenced));
-			}
-		}
-		return referenced;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DiagramElement basicGetReferenced() {
-		return referenced;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetReferenced(DiagramElement newReferenced,
-			NotificationChain msgs) {
-		DiagramElement oldReferenced = referenced;
-		referenced = newReferenced;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.REFERENCE__REFERENCED,
-					oldReferenced, newReferenced);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReferenced(DiagramElement newReferenced) {
-		if (newReferenced != referenced) {
-			NotificationChain msgs = null;
-			if (referenced != null)
-				msgs = ((InternalEObject) referenced).eInverseRemove(this,
-						UmaPackage.DIAGRAM_ELEMENT__REFERENCE,
-						DiagramElement.class, msgs);
-			if (newReferenced != null)
-				msgs = ((InternalEObject) newReferenced).eInverseAdd(this,
-						UmaPackage.DIAGRAM_ELEMENT__REFERENCE,
-						DiagramElement.class, msgs);
-			msgs = basicSetReferenced(newReferenced, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.REFERENCE__REFERENCED, newReferenced,
-					newReferenced));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.REFERENCE__REFERENCED:
-			if (referenced != null)
-				msgs = ((InternalEObject) referenced).eInverseRemove(this,
-						UmaPackage.DIAGRAM_ELEMENT__REFERENCE,
-						DiagramElement.class, msgs);
-			return basicSetReferenced((DiagramElement) otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.REFERENCE__REFERENCED:
-			return basicSetReferenced(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.REFERENCE__IS_INDIVIDUAL_REPRESENTATION:
-			return getIsIndividualRepresentation();
-		case UmaPackage.REFERENCE__REFERENCED:
-			if (resolve)
-				return getReferenced();
-			return basicGetReferenced();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.REFERENCE__IS_INDIVIDUAL_REPRESENTATION:
-			setIsIndividualRepresentation((Boolean) newValue);
-			return;
-		case UmaPackage.REFERENCE__REFERENCED:
-			setReferenced((DiagramElement) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.REFERENCE__IS_INDIVIDUAL_REPRESENTATION:
-			setIsIndividualRepresentation(IS_INDIVIDUAL_REPRESENTATION_EDEFAULT);
-			return;
-		case UmaPackage.REFERENCE__REFERENCED:
-			setReferenced((DiagramElement) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.REFERENCE__IS_INDIVIDUAL_REPRESENTATION:
-			return IS_INDIVIDUAL_REPRESENTATION_EDEFAULT == null ? isIndividualRepresentation != null
-					: !IS_INDIVIDUAL_REPRESENTATION_EDEFAULT
-							.equals(isIndividualRepresentation);
-		case UmaPackage.REFERENCE__REFERENCED:
-			return referenced != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (isIndividualRepresentation: "); //$NON-NLS-1$
-		result.append(isIndividualRepresentation);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ReferenceImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RegionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RegionImpl.java
deleted file mode 100755
index 4461ff4..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RegionImpl.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RegionImpl.java,v 1.5 2006/09/07 00:06:20 klow Exp $
- */
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.Region;
-import org.eclipse.epf.uma.State;
-import org.eclipse.epf.uma.StateMachine;
-import org.eclipse.epf.uma.Transition;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.Vertex;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Region</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.RegionImpl#getVertex <em>Vertex</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.RegionImpl#getTransition <em>Transition</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.RegionImpl#getState <em>State</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.RegionImpl#getStateMachine <em>State Machine</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RegionImpl extends MultiResourceEObject implements Region {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getVertex() <em>Vertex</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVertex()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList vertex = null;
-
-	/**
-	 * The cached value of the '{@link #getTransition() <em>Transition</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransition()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList transition = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RegionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.REGION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getVertex() {
-		if (vertex == null) {
-			vertex = new EObjectContainmentWithInverseEList.Resolving(
-					Vertex.class, this, UmaPackage.REGION__VERTEX,
-					UmaPackage.VERTEX__CONTAINER);
-		}
-		return vertex;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getTransition() {
-		if (transition == null) {
-			transition = new EObjectContainmentWithInverseEList.Resolving(
-					Transition.class, this, UmaPackage.REGION__TRANSITION,
-					UmaPackage.TRANSITION__CONTAINER);
-		}
-		return transition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public State getState() {
-		if (eContainerFeatureID != UmaPackage.REGION__STATE)
-			return null;
-		return (State) eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public State basicGetState() {
-		if (eContainerFeatureID != UmaPackage.REGION__STATE)
-			return null;
-		return (State) eInternalContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetState(State newState,
-			NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject) newState,
-				UmaPackage.REGION__STATE, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setState(State newState) {
-		if (newState != eInternalContainer()
-				|| (eContainerFeatureID != UmaPackage.REGION__STATE && newState != null)) {
-			if (EcoreUtil.isAncestor(this, (EObject) newState))
-				throw new IllegalArgumentException(
-						"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newState != null)
-				msgs = ((InternalEObject) newState).eInverseAdd(this,
-						UmaPackage.STATE__REGION, State.class, msgs);
-			msgs = basicSetState(newState, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.REGION__STATE, newState, newState));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StateMachine getStateMachine() {
-		if (eContainerFeatureID != UmaPackage.REGION__STATE_MACHINE)
-			return null;
-		return (StateMachine) eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StateMachine basicGetStateMachine() {
-		if (eContainerFeatureID != UmaPackage.REGION__STATE_MACHINE)
-			return null;
-		return (StateMachine) eInternalContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetStateMachine(StateMachine newStateMachine,
-			NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject) newStateMachine,
-				UmaPackage.REGION__STATE_MACHINE, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStateMachine(StateMachine newStateMachine) {
-		if (newStateMachine != eInternalContainer()
-				|| (eContainerFeatureID != UmaPackage.REGION__STATE_MACHINE && newStateMachine != null)) {
-			if (EcoreUtil.isAncestor(this, (EObject) newStateMachine))
-				throw new IllegalArgumentException(
-						"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newStateMachine != null)
-				msgs = ((InternalEObject) newStateMachine).eInverseAdd(this,
-						UmaPackage.STATE_MACHINE__REGION, StateMachine.class,
-						msgs);
-			msgs = basicSetStateMachine(newStateMachine, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.REGION__STATE_MACHINE, newStateMachine,
-					newStateMachine));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.REGION__VERTEX:
-			return ((InternalEList) getVertex()).basicAdd(otherEnd, msgs);
-		case UmaPackage.REGION__TRANSITION:
-			return ((InternalEList) getTransition()).basicAdd(otherEnd, msgs);
-		case UmaPackage.REGION__STATE:
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetState((State) otherEnd, msgs);
-		case UmaPackage.REGION__STATE_MACHINE:
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetStateMachine((StateMachine) otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.REGION__VERTEX:
-			return ((InternalEList) getVertex()).basicRemove(otherEnd, msgs);
-		case UmaPackage.REGION__TRANSITION:
-			return ((InternalEList) getTransition())
-					.basicRemove(otherEnd, msgs);
-		case UmaPackage.REGION__STATE:
-			return basicSetState(null, msgs);
-		case UmaPackage.REGION__STATE_MACHINE:
-			return basicSetStateMachine(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(
-			NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-		case UmaPackage.REGION__STATE:
-			return eInternalContainer().eInverseRemove(this,
-					UmaPackage.STATE__REGION, State.class, msgs);
-		case UmaPackage.REGION__STATE_MACHINE:
-			return eInternalContainer().eInverseRemove(this,
-					UmaPackage.STATE_MACHINE__REGION, StateMachine.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.REGION__VERTEX:
-			return getVertex();
-		case UmaPackage.REGION__TRANSITION:
-			return getTransition();
-		case UmaPackage.REGION__STATE:
-			if (resolve)
-				return getState();
-			return basicGetState();
-		case UmaPackage.REGION__STATE_MACHINE:
-			if (resolve)
-				return getStateMachine();
-			return basicGetStateMachine();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.REGION__VERTEX:
-			getVertex().clear();
-			getVertex().addAll((Collection) newValue);
-			return;
-		case UmaPackage.REGION__TRANSITION:
-			getTransition().clear();
-			getTransition().addAll((Collection) newValue);
-			return;
-		case UmaPackage.REGION__STATE:
-			setState((State) newValue);
-			return;
-		case UmaPackage.REGION__STATE_MACHINE:
-			setStateMachine((StateMachine) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.REGION__VERTEX:
-			getVertex().clear();
-			return;
-		case UmaPackage.REGION__TRANSITION:
-			getTransition().clear();
-			return;
-		case UmaPackage.REGION__STATE:
-			setState((State) null);
-			return;
-		case UmaPackage.REGION__STATE_MACHINE:
-			setStateMachine((StateMachine) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.REGION__VERTEX:
-			return vertex != null && !vertex.isEmpty();
-		case UmaPackage.REGION__TRANSITION:
-			return transition != null && !transition.isEmpty();
-		case UmaPackage.REGION__STATE:
-			return basicGetState() != null;
-		case UmaPackage.REGION__STATE_MACHINE:
-			return basicGetStateMachine() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //RegionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ReportImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ReportImpl.java
deleted file mode 100755
index 374995e..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ReportImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Report;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Report</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ReportImpl extends GuidanceImpl implements Report {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReportImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.REPORT;
-	}
-
-} //ReportImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ReusableAssetImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ReusableAssetImpl.java
deleted file mode 100755
index 9b1e52d..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ReusableAssetImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Reusable Asset</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ReusableAssetImpl extends GuidanceImpl implements ReusableAsset {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReusableAssetImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.REUSABLE_ASSET;
-	}
-
-} //ReusableAssetImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoadmapImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoadmapImpl.java
deleted file mode 100755
index 9060e8b..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoadmapImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Roadmap;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Roadmap</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class RoadmapImpl extends GuidanceImpl implements Roadmap {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoadmapImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ROADMAP;
-	}
-
-} //RoadmapImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoleDescriptionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoleDescriptionImpl.java
deleted file mode 100755
index 14070f0..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoleDescriptionImpl.java
+++ /dev/null
@@ -1,298 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.RoleDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Role Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.RoleDescriptionImpl#getSkills <em>Skills</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.RoleDescriptionImpl#getAssignmentApproaches <em>Assignment Approaches</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.RoleDescriptionImpl#getSynonyms <em>Synonyms</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RoleDescriptionImpl extends ContentDescriptionImpl implements
-		RoleDescription {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getSkills() <em>Skills</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSkills()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SKILLS_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getSkills() <em>Skills</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSkills()
-	 * @generated
-	 * @ordered
-	 */
-	protected String skills = SKILLS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAssignmentApproaches() <em>Assignment Approaches</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAssignmentApproaches()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ASSIGNMENT_APPROACHES_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getAssignmentApproaches() <em>Assignment Approaches</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAssignmentApproaches()
-	 * @generated
-	 * @ordered
-	 */
-	protected String assignmentApproaches = ASSIGNMENT_APPROACHES_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSynonyms() <em>Synonyms</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSynonyms()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SYNONYMS_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getSynonyms() <em>Synonyms</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSynonyms()
-	 * @generated
-	 * @ordered
-	 */
-	protected String synonyms = SYNONYMS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoleDescriptionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ROLE_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSkills() {
-		return skills;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSkills(String newSkills) {
-		String oldSkills = skills;
-		skills = newSkills;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ROLE_DESCRIPTION__SKILLS, oldSkills, skills));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAssignmentApproaches() {
-		return assignmentApproaches;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAssignmentApproaches(String newAssignmentApproaches) {
-		String oldAssignmentApproaches = assignmentApproaches;
-		assignmentApproaches = newAssignmentApproaches;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES,
-					oldAssignmentApproaches, assignmentApproaches));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSynonyms() {
-		return synonyms;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSynonyms(String newSynonyms) {
-		String oldSynonyms = synonyms;
-		synonyms = newSynonyms;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ROLE_DESCRIPTION__SYNONYMS, oldSynonyms,
-					synonyms));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.ROLE_DESCRIPTION__SKILLS:
-			return getSkills();
-		case UmaPackage.ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES:
-			return getAssignmentApproaches();
-		case UmaPackage.ROLE_DESCRIPTION__SYNONYMS:
-			return getSynonyms();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.ROLE_DESCRIPTION__SKILLS:
-			setSkills((String) newValue);
-			return;
-		case UmaPackage.ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES:
-			setAssignmentApproaches((String) newValue);
-			return;
-		case UmaPackage.ROLE_DESCRIPTION__SYNONYMS:
-			setSynonyms((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.ROLE_DESCRIPTION__SKILLS:
-			setSkills(SKILLS_EDEFAULT);
-			return;
-		case UmaPackage.ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES:
-			setAssignmentApproaches(ASSIGNMENT_APPROACHES_EDEFAULT);
-			return;
-		case UmaPackage.ROLE_DESCRIPTION__SYNONYMS:
-			setSynonyms(SYNONYMS_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.ROLE_DESCRIPTION__SKILLS:
-			return SKILLS_EDEFAULT == null ? skills != null : !SKILLS_EDEFAULT
-					.equals(skills);
-		case UmaPackage.ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES:
-			return ASSIGNMENT_APPROACHES_EDEFAULT == null ? assignmentApproaches != null
-					: !ASSIGNMENT_APPROACHES_EDEFAULT
-							.equals(assignmentApproaches);
-		case UmaPackage.ROLE_DESCRIPTION__SYNONYMS:
-			return SYNONYMS_EDEFAULT == null ? synonyms != null
-					: !SYNONYMS_EDEFAULT.equals(synonyms);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (skills: "); //$NON-NLS-1$
-		result.append(skills);
-		result.append(", assignmentApproaches: "); //$NON-NLS-1$
-		result.append(assignmentApproaches);
-		result.append(", synonyms: "); //$NON-NLS-1$
-		result.append(synonyms);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RoleDescriptionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoleDescriptorImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoleDescriptorImpl.java
deleted file mode 100755
index 04793b5..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoleDescriptorImpl.java
+++ /dev/null
@@ -1,261 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.BasicInternalEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.epf.uma.util.AssociationHelper;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Role Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.RoleDescriptorImpl#getRole <em>Role</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.RoleDescriptorImpl#getModifies <em>Modifies</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.RoleDescriptorImpl#getResponsibleFor <em>Responsible For</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RoleDescriptorImpl extends DescriptorImpl implements
-		RoleDescriptor {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getRole() <em>Role</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRole()
-	 * @generated
-	 * @ordered
-	 */
-	protected Role role = null;
-
-	/**
-	 * The cached value of the '{@link #getResponsibleFor() <em>Responsible For</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResponsibleFor()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList responsibleFor = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoleDescriptorImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ROLE_DESCRIPTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Role getRole() {
-		if (role != null && ((EObject) role).eIsProxy()) {
-			InternalEObject oldRole = (InternalEObject) role;
-			role = (Role) eResolveProxy(oldRole);
-			if (role != oldRole) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.ROLE_DESCRIPTOR__ROLE, oldRole, role));
-			}
-		}
-		return role;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Role basicGetRole() {
-		return role;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRole(Role newRole) {
-		Role oldRole = role;
-		role = newRole;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.ROLE_DESCRIPTOR__ROLE, oldRole, role));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public List getModifies() {
-		List performs = AssociationHelper.getPrimaryTaskDescriptors(this);
-		InternalEList modifies = new BasicInternalEList(
-				WorkProductDescriptor.class);
-		if (performs != null && performs.size() > 0) {
-			for (Iterator i = performs.iterator(); i.hasNext();) {
-				TaskDescriptor td = (TaskDescriptor) i.next();
-
-				// for each task, get output work product;
-				List outputWPs = td.getOutput();
-				if (outputWPs != null && outputWPs.size() > 0) {
-					for (Iterator it = outputWPs.iterator(); it.hasNext();) {
-						WorkProductDescriptor wpd = (WorkProductDescriptor) it
-								.next();
-						if (wpd != null) {
-							if (!modifies.contains(wpd)) {
-								modifies.add(wpd);
-							}
-						}
-					}
-				}
-			}
-		}
-		return modifies;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getResponsibleFor() {
-		if (responsibleFor == null) {
-			responsibleFor = new EObjectResolvingEList(
-					WorkProductDescriptor.class, this,
-					UmaPackage.ROLE_DESCRIPTOR__RESPONSIBLE_FOR);
-		}
-		return responsibleFor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.ROLE_DESCRIPTOR__ROLE:
-			if (resolve)
-				return getRole();
-			return basicGetRole();
-		case UmaPackage.ROLE_DESCRIPTOR__MODIFIES:
-			return getModifies();
-		case UmaPackage.ROLE_DESCRIPTOR__RESPONSIBLE_FOR:
-			return getResponsibleFor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.ROLE_DESCRIPTOR__ROLE:
-			setRole((Role) newValue);
-			return;
-		case UmaPackage.ROLE_DESCRIPTOR__RESPONSIBLE_FOR:
-			getResponsibleFor().clear();
-			getResponsibleFor().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.ROLE_DESCRIPTOR__ROLE:
-			setRole((Role) null);
-			return;
-		case UmaPackage.ROLE_DESCRIPTOR__RESPONSIBLE_FOR:
-			getResponsibleFor().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.ROLE_DESCRIPTOR__ROLE:
-			return role != null;
-		case UmaPackage.ROLE_DESCRIPTOR__MODIFIES:
-			return !getModifies().isEmpty();
-		case UmaPackage.ROLE_DESCRIPTOR__RESPONSIBLE_FOR:
-			return responsibleFor != null && !responsibleFor.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //RoleDescriptorImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoleImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoleImpl.java
deleted file mode 100755
index 0c867db..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoleImpl.java
+++ /dev/null
@@ -1,165 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.util.AssociationHelper;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Role</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.RoleImpl#getModifies <em>Modifies</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.RoleImpl#getResponsibleFor <em>Responsible For</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RoleImpl extends ContentElementImpl implements Role {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getResponsibleFor() <em>Responsible For</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResponsibleFor()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList responsibleFor = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoleImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ROLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public List getModifies() {
-		return AssociationHelper.getModifiedWorkProducts(this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getResponsibleFor() {
-		if (responsibleFor == null) {
-			responsibleFor = new EObjectResolvingEList(WorkProduct.class, this,
-					UmaPackage.ROLE__RESPONSIBLE_FOR);
-		}
-		return responsibleFor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.ROLE__MODIFIES:
-			return getModifies();
-		case UmaPackage.ROLE__RESPONSIBLE_FOR:
-			return getResponsibleFor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.ROLE__RESPONSIBLE_FOR:
-			getResponsibleFor().clear();
-			getResponsibleFor().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.ROLE__RESPONSIBLE_FOR:
-			getResponsibleFor().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.ROLE__MODIFIES:
-			return !getModifies().isEmpty();
-		case UmaPackage.ROLE__RESPONSIBLE_FOR:
-			return responsibleFor != null && !responsibleFor.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //RoleImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoleSetGroupingImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoleSetGroupingImpl.java
deleted file mode 100755
index 0611a29..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoleSetGroupingImpl.java
+++ /dev/null
@@ -1,152 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Role Set Grouping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.RoleSetGroupingImpl#getRoleSets <em>Role Sets</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RoleSetGroupingImpl extends ContentCategoryImpl implements
-		RoleSetGrouping {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getRoleSets() <em>Role Sets</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleSets()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList roleSets = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoleSetGroupingImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ROLE_SET_GROUPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getRoleSets() {
-		if (roleSets == null) {
-			roleSets = new EObjectResolvingEList(RoleSet.class, this,
-					UmaPackage.ROLE_SET_GROUPING__ROLE_SETS);
-		}
-		return roleSets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.ROLE_SET_GROUPING__ROLE_SETS:
-			return getRoleSets();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.ROLE_SET_GROUPING__ROLE_SETS:
-			getRoleSets().clear();
-			getRoleSets().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.ROLE_SET_GROUPING__ROLE_SETS:
-			getRoleSets().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.ROLE_SET_GROUPING__ROLE_SETS:
-			return roleSets != null && !roleSets.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //RoleSetGroupingImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoleSetImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoleSetImpl.java
deleted file mode 100755
index c61d316..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/RoleSetImpl.java
+++ /dev/null
@@ -1,151 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Role Set</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.RoleSetImpl#getRoles <em>Roles</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RoleSetImpl extends ContentCategoryImpl implements RoleSet {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getRoles() <em>Roles</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoles()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList roles = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoleSetImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ROLE_SET;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getRoles() {
-		if (roles == null) {
-			roles = new EObjectResolvingEList(Role.class, this,
-					UmaPackage.ROLE_SET__ROLES);
-		}
-		return roles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.ROLE_SET__ROLES:
-			return getRoles();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.ROLE_SET__ROLES:
-			getRoles().clear();
-			getRoles().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.ROLE_SET__ROLES:
-			getRoles().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.ROLE_SET__ROLES:
-			return roles != null && !roles.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //RoleSetImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/SectionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/SectionImpl.java
deleted file mode 100755
index 3bb1a65..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/SectionImpl.java
+++ /dev/null
@@ -1,364 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.Section;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Section</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.SectionImpl#getSectionName <em>Section Name</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.SectionImpl#getSectionDescription <em>Section Description</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.SectionImpl#getSubSections <em>Sub Sections</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.SectionImpl#getPredecessor <em>Predecessor</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SectionImpl extends VariabilityElementImpl implements Section {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getSectionName() <em>Section Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSectionName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SECTION_NAME_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getSectionName() <em>Section Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSectionName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String sectionName = SECTION_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSectionDescription() <em>Section Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSectionDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SECTION_DESCRIPTION_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getSectionDescription() <em>Section Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSectionDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String sectionDescription = SECTION_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getSubSections() <em>Sub Sections</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubSections()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList subSections = null;
-
-	/**
-	 * The cached value of the '{@link #getPredecessor() <em>Predecessor</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPredecessor()
-	 * @generated
-	 * @ordered
-	 */
-	protected Section predecessor = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SectionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.SECTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSectionName() {
-		return sectionName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSectionName(String newSectionName) {
-		String oldSectionName = sectionName;
-		sectionName = newSectionName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.SECTION__SECTION_NAME, oldSectionName,
-					sectionName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSectionDescription() {
-		return sectionDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSectionDescription(String newSectionDescription) {
-		String oldSectionDescription = sectionDescription;
-		sectionDescription = newSectionDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.SECTION__SECTION_DESCRIPTION,
-					oldSectionDescription, sectionDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSubSections() {
-		if (subSections == null) {
-			subSections = new EObjectContainmentEList.Resolving(Section.class,
-					this, UmaPackage.SECTION__SUB_SECTIONS);
-		}
-		return subSections;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Section getPredecessor() {
-		if (predecessor != null && ((EObject) predecessor).eIsProxy()) {
-			InternalEObject oldPredecessor = (InternalEObject) predecessor;
-			predecessor = (Section) eResolveProxy(oldPredecessor);
-			if (predecessor != oldPredecessor) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.SECTION__PREDECESSOR, oldPredecessor,
-							predecessor));
-			}
-		}
-		return predecessor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Section basicGetPredecessor() {
-		return predecessor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPredecessor(Section newPredecessor) {
-		Section oldPredecessor = predecessor;
-		predecessor = newPredecessor;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.SECTION__PREDECESSOR, oldPredecessor,
-					predecessor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.SECTION__SUB_SECTIONS:
-			return ((InternalEList) getSubSections()).basicRemove(otherEnd,
-					msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.SECTION__SECTION_NAME:
-			return getSectionName();
-		case UmaPackage.SECTION__SECTION_DESCRIPTION:
-			return getSectionDescription();
-		case UmaPackage.SECTION__SUB_SECTIONS:
-			return getSubSections();
-		case UmaPackage.SECTION__PREDECESSOR:
-			if (resolve)
-				return getPredecessor();
-			return basicGetPredecessor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.SECTION__SECTION_NAME:
-			setSectionName((String) newValue);
-			return;
-		case UmaPackage.SECTION__SECTION_DESCRIPTION:
-			setSectionDescription((String) newValue);
-			return;
-		case UmaPackage.SECTION__SUB_SECTIONS:
-			getSubSections().clear();
-			getSubSections().addAll((Collection) newValue);
-			return;
-		case UmaPackage.SECTION__PREDECESSOR:
-			setPredecessor((Section) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.SECTION__SECTION_NAME:
-			setSectionName(SECTION_NAME_EDEFAULT);
-			return;
-		case UmaPackage.SECTION__SECTION_DESCRIPTION:
-			setSectionDescription(SECTION_DESCRIPTION_EDEFAULT);
-			return;
-		case UmaPackage.SECTION__SUB_SECTIONS:
-			getSubSections().clear();
-			return;
-		case UmaPackage.SECTION__PREDECESSOR:
-			setPredecessor((Section) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.SECTION__SECTION_NAME:
-			return SECTION_NAME_EDEFAULT == null ? sectionName != null
-					: !SECTION_NAME_EDEFAULT.equals(sectionName);
-		case UmaPackage.SECTION__SECTION_DESCRIPTION:
-			return SECTION_DESCRIPTION_EDEFAULT == null ? sectionDescription != null
-					: !SECTION_DESCRIPTION_EDEFAULT.equals(sectionDescription);
-		case UmaPackage.SECTION__SUB_SECTIONS:
-			return subSections != null && !subSections.isEmpty();
-		case UmaPackage.SECTION__PREDECESSOR:
-			return predecessor != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (sectionName: "); //$NON-NLS-1$
-		result.append(sectionName);
-		result.append(", sectionDescription: "); //$NON-NLS-1$
-		result.append(sectionDescription);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SectionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/SemanticModelBridgeImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/SemanticModelBridgeImpl.java
deleted file mode 100755
index 6ee0637..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/SemanticModelBridgeImpl.java
+++ /dev/null
@@ -1,392 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.GraphElement;
-import org.eclipse.epf.uma.SemanticModelBridge;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Semantic Model Bridge</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.SemanticModelBridgeImpl#getPresentation <em>Presentation</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.SemanticModelBridgeImpl#getGraphElement <em>Graph Element</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.SemanticModelBridgeImpl#getDiagram <em>Diagram</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class SemanticModelBridgeImpl extends DiagramElementImpl
-		implements SemanticModelBridge {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getPresentation() <em>Presentation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPresentation()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PRESENTATION_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getPresentation() <em>Presentation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPresentation()
-	 * @generated
-	 * @ordered
-	 */
-	protected String presentation = PRESENTATION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SemanticModelBridgeImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.SEMANTIC_MODEL_BRIDGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPresentation() {
-		return presentation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPresentation(String newPresentation) {
-		String oldPresentation = presentation;
-		presentation = newPresentation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.SEMANTIC_MODEL_BRIDGE__PRESENTATION,
-					oldPresentation, presentation));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphElement getGraphElement() {
-		if (eContainerFeatureID != UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT)
-			return null;
-		return (GraphElement) eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphElement basicGetGraphElement() {
-		if (eContainerFeatureID != UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT)
-			return null;
-		return (GraphElement) eInternalContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetGraphElement(GraphElement newGraphElement,
-			NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject) newGraphElement,
-				UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGraphElement(GraphElement newGraphElement) {
-		if (newGraphElement != eInternalContainer()
-				|| (eContainerFeatureID != UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT && newGraphElement != null)) {
-			if (EcoreUtil.isAncestor(this, (EObject) newGraphElement))
-				throw new IllegalArgumentException(
-						"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newGraphElement != null)
-				msgs = ((InternalEObject) newGraphElement).eInverseAdd(this,
-						UmaPackage.GRAPH_ELEMENT__SEMANTIC_MODEL,
-						GraphElement.class, msgs);
-			msgs = basicSetGraphElement(newGraphElement, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT,
-					newGraphElement, newGraphElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Diagram getDiagram() {
-		if (eContainerFeatureID != UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM)
-			return null;
-		return (Diagram) eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Diagram basicGetDiagram() {
-		if (eContainerFeatureID != UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM)
-			return null;
-		return (Diagram) eInternalContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetDiagram(Diagram newDiagram,
-			NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject) newDiagram,
-				UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDiagram(Diagram newDiagram) {
-		if (newDiagram != eInternalContainer()
-				|| (eContainerFeatureID != UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM && newDiagram != null)) {
-			if (EcoreUtil.isAncestor(this, (EObject) newDiagram))
-				throw new IllegalArgumentException(
-						"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newDiagram != null)
-				msgs = ((InternalEObject) newDiagram).eInverseAdd(this,
-						UmaPackage.DIAGRAM__NAMESPACE, Diagram.class, msgs);
-			msgs = basicSetDiagram(newDiagram, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM, newDiagram,
-					newDiagram));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT:
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetGraphElement((GraphElement) otherEnd, msgs);
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM:
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetDiagram((Diagram) otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT:
-			return basicSetGraphElement(null, msgs);
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM:
-			return basicSetDiagram(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(
-			NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT:
-			return eInternalContainer().eInverseRemove(this,
-					UmaPackage.GRAPH_ELEMENT__SEMANTIC_MODEL,
-					GraphElement.class, msgs);
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM:
-			return eInternalContainer().eInverseRemove(this,
-					UmaPackage.DIAGRAM__NAMESPACE, Diagram.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__PRESENTATION:
-			return getPresentation();
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT:
-			if (resolve)
-				return getGraphElement();
-			return basicGetGraphElement();
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM:
-			if (resolve)
-				return getDiagram();
-			return basicGetDiagram();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__PRESENTATION:
-			setPresentation((String) newValue);
-			return;
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT:
-			setGraphElement((GraphElement) newValue);
-			return;
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM:
-			setDiagram((Diagram) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__PRESENTATION:
-			setPresentation(PRESENTATION_EDEFAULT);
-			return;
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT:
-			setGraphElement((GraphElement) null);
-			return;
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM:
-			setDiagram((Diagram) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__PRESENTATION:
-			return PRESENTATION_EDEFAULT == null ? presentation != null
-					: !PRESENTATION_EDEFAULT.equals(presentation);
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT:
-			return basicGetGraphElement() != null;
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE__DIAGRAM:
-			return basicGetDiagram() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (presentation: "); //$NON-NLS-1$
-		result.append(presentation);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SemanticModelBridgeImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/SimpleSemanticModelElementImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/SimpleSemanticModelElementImpl.java
deleted file mode 100755
index ba5a32b..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/SimpleSemanticModelElementImpl.java
+++ /dev/null
@@ -1,184 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.SimpleSemanticModelElement;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Simple Semantic Model Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.SimpleSemanticModelElementImpl#getTypeInfo <em>Type Info</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SimpleSemanticModelElementImpl extends SemanticModelBridgeImpl
-		implements SimpleSemanticModelElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getTypeInfo() <em>Type Info</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeInfo()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_INFO_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getTypeInfo() <em>Type Info</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeInfo()
-	 * @generated
-	 * @ordered
-	 */
-	protected String typeInfo = TYPE_INFO_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SimpleSemanticModelElementImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.SIMPLE_SEMANTIC_MODEL_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTypeInfo() {
-		return typeInfo;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypeInfo(String newTypeInfo) {
-		String oldTypeInfo = typeInfo;
-		typeInfo = newTypeInfo;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.SIMPLE_SEMANTIC_MODEL_ELEMENT__TYPE_INFO,
-					oldTypeInfo, typeInfo));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.SIMPLE_SEMANTIC_MODEL_ELEMENT__TYPE_INFO:
-			return getTypeInfo();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.SIMPLE_SEMANTIC_MODEL_ELEMENT__TYPE_INFO:
-			setTypeInfo((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.SIMPLE_SEMANTIC_MODEL_ELEMENT__TYPE_INFO:
-			setTypeInfo(TYPE_INFO_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.SIMPLE_SEMANTIC_MODEL_ELEMENT__TYPE_INFO:
-			return TYPE_INFO_EDEFAULT == null ? typeInfo != null
-					: !TYPE_INFO_EDEFAULT.equals(typeInfo);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (typeInfo: "); //$NON-NLS-1$
-		result.append(typeInfo);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SimpleSemanticModelElementImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/StateImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/StateImpl.java
deleted file mode 100755
index 102a61e..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/StateImpl.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: StateImpl.java,v 1.5 2006/09/07 00:06:20 klow Exp $
- */
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.Region;
-import org.eclipse.epf.uma.State;
-import org.eclipse.epf.uma.StateMachine;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>State</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.StateImpl#getWorkProduct <em>Work Product</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.StateImpl#getRegion <em>Region</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.StateImpl#getSubmachine <em>Submachine</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class StateImpl extends VertexImpl implements State {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getWorkProduct() <em>Work Product</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkProduct()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList workProduct = null;
-
-	/**
-	 * The cached value of the '{@link #getRegion() <em>Region</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRegion()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList region = null;
-
-	/**
-	 * The cached value of the '{@link #getSubmachine() <em>Submachine</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubmachine()
-	 * @generated
-	 * @ordered
-	 */
-	protected StateMachine submachine = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StateImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.STATE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getWorkProduct() {
-		if (workProduct == null) {
-			workProduct = new EObjectResolvingEList(WorkProduct.class, this,
-					UmaPackage.STATE__WORK_PRODUCT);
-		}
-		return workProduct;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getRegion() {
-		if (region == null) {
-			region = new EObjectContainmentWithInverseEList.Resolving(
-					Region.class, this, UmaPackage.STATE__REGION,
-					UmaPackage.REGION__STATE);
-		}
-		return region;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StateMachine getSubmachine() {
-		if (submachine != null && ((EObject) submachine).eIsProxy()) {
-			InternalEObject oldSubmachine = (InternalEObject) submachine;
-			submachine = (StateMachine) eResolveProxy(oldSubmachine);
-			if (submachine != oldSubmachine) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.STATE__SUBMACHINE, oldSubmachine,
-							submachine));
-			}
-		}
-		return submachine;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StateMachine basicGetSubmachine() {
-		return submachine;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSubmachine(StateMachine newSubmachine) {
-		StateMachine oldSubmachine = submachine;
-		submachine = newSubmachine;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.STATE__SUBMACHINE, oldSubmachine, submachine));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.STATE__REGION:
-			return ((InternalEList) getRegion()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.STATE__REGION:
-			return ((InternalEList) getRegion()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.STATE__WORK_PRODUCT:
-			return getWorkProduct();
-		case UmaPackage.STATE__REGION:
-			return getRegion();
-		case UmaPackage.STATE__SUBMACHINE:
-			if (resolve)
-				return getSubmachine();
-			return basicGetSubmachine();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.STATE__WORK_PRODUCT:
-			getWorkProduct().clear();
-			getWorkProduct().addAll((Collection) newValue);
-			return;
-		case UmaPackage.STATE__REGION:
-			getRegion().clear();
-			getRegion().addAll((Collection) newValue);
-			return;
-		case UmaPackage.STATE__SUBMACHINE:
-			setSubmachine((StateMachine) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.STATE__WORK_PRODUCT:
-			getWorkProduct().clear();
-			return;
-		case UmaPackage.STATE__REGION:
-			getRegion().clear();
-			return;
-		case UmaPackage.STATE__SUBMACHINE:
-			setSubmachine((StateMachine) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.STATE__WORK_PRODUCT:
-			return workProduct != null && !workProduct.isEmpty();
-		case UmaPackage.STATE__REGION:
-			return region != null && !region.isEmpty();
-		case UmaPackage.STATE__SUBMACHINE:
-			return submachine != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //StateImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/StateMachineImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/StateMachineImpl.java
deleted file mode 100755
index 4b014e0..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/StateMachineImpl.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: StateMachineImpl.java,v 1.5 2006/09/07 00:06:20 klow Exp $
- */
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.Region;
-import org.eclipse.epf.uma.StateMachine;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>State Machine</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.StateMachineImpl#getRegion <em>Region</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class StateMachineImpl extends WorkDefinitionImpl implements
-		StateMachine {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getRegion() <em>Region</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRegion()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList region = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StateMachineImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.STATE_MACHINE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getRegion() {
-		if (region == null) {
-			region = new EObjectContainmentWithInverseEList.Resolving(
-					Region.class, this, UmaPackage.STATE_MACHINE__REGION,
-					UmaPackage.REGION__STATE_MACHINE);
-		}
-		return region;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.STATE_MACHINE__REGION:
-			return ((InternalEList) getRegion()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.STATE_MACHINE__REGION:
-			return ((InternalEList) getRegion()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.STATE_MACHINE__REGION:
-			return getRegion();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.STATE_MACHINE__REGION:
-			getRegion().clear();
-			getRegion().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.STATE_MACHINE__REGION:
-			getRegion().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.STATE_MACHINE__REGION:
-			return region != null && !region.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //StateMachineImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/StepImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/StepImpl.java
deleted file mode 100755
index 80876ea..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/StepImpl.java
+++ /dev/null
@@ -1,388 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.Constraint;
-import org.eclipse.epf.uma.Step;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkDefinition;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Step</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.StepImpl#getPrecondition <em>Precondition</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.StepImpl#getPostcondition <em>Postcondition</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class StepImpl extends SectionImpl implements Step {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getPrecondition() <em>Precondition</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrecondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected Constraint precondition = null;
-
-	/**
-	 * The cached value of the '{@link #getPostcondition() <em>Postcondition</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostcondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected Constraint postcondition = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StepImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.STEP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint getPrecondition() {
-		if (precondition != null && ((EObject) precondition).eIsProxy()) {
-			InternalEObject oldPrecondition = (InternalEObject) precondition;
-			precondition = (Constraint) eResolveProxy(oldPrecondition);
-			if (precondition != oldPrecondition) {
-				InternalEObject newPrecondition = (InternalEObject) precondition;
-				NotificationChain msgs = oldPrecondition.eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.STEP__PRECONDITION,
-						null, null);
-				if (newPrecondition.eInternalContainer() == null) {
-					msgs = newPrecondition
-							.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-									- UmaPackage.STEP__PRECONDITION, null, msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.STEP__PRECONDITION, oldPrecondition,
-							precondition));
-			}
-		}
-		return precondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint basicGetPrecondition() {
-		return precondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPrecondition(Constraint newPrecondition,
-			NotificationChain msgs) {
-		Constraint oldPrecondition = precondition;
-		precondition = newPrecondition;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.STEP__PRECONDITION,
-					oldPrecondition, newPrecondition);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPrecondition(Constraint newPrecondition) {
-		if (newPrecondition != precondition) {
-			NotificationChain msgs = null;
-			if (precondition != null)
-				msgs = ((InternalEObject) precondition).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.STEP__PRECONDITION,
-						null, msgs);
-			if (newPrecondition != null)
-				msgs = ((InternalEObject) newPrecondition).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.STEP__PRECONDITION,
-						null, msgs);
-			msgs = basicSetPrecondition(newPrecondition, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.STEP__PRECONDITION, newPrecondition,
-					newPrecondition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint getPostcondition() {
-		if (postcondition != null && ((EObject) postcondition).eIsProxy()) {
-			InternalEObject oldPostcondition = (InternalEObject) postcondition;
-			postcondition = (Constraint) eResolveProxy(oldPostcondition);
-			if (postcondition != oldPostcondition) {
-				InternalEObject newPostcondition = (InternalEObject) postcondition;
-				NotificationChain msgs = oldPostcondition
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-								- UmaPackage.STEP__POSTCONDITION, null, null);
-				if (newPostcondition.eInternalContainer() == null) {
-					msgs = newPostcondition.eInverseAdd(this,
-							EOPPOSITE_FEATURE_BASE
-									- UmaPackage.STEP__POSTCONDITION, null,
-							msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.STEP__POSTCONDITION, oldPostcondition,
-							postcondition));
-			}
-		}
-		return postcondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint basicGetPostcondition() {
-		return postcondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostcondition(Constraint newPostcondition,
-			NotificationChain msgs) {
-		Constraint oldPostcondition = postcondition;
-		postcondition = newPostcondition;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.STEP__POSTCONDITION,
-					oldPostcondition, newPostcondition);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPostcondition(Constraint newPostcondition) {
-		if (newPostcondition != postcondition) {
-			NotificationChain msgs = null;
-			if (postcondition != null)
-				msgs = ((InternalEObject) postcondition)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-								- UmaPackage.STEP__POSTCONDITION, null, msgs);
-			if (newPostcondition != null)
-				msgs = ((InternalEObject) newPostcondition)
-						.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-								- UmaPackage.STEP__POSTCONDITION, null, msgs);
-			msgs = basicSetPostcondition(newPostcondition, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.STEP__POSTCONDITION, newPostcondition,
-					newPostcondition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.STEP__PRECONDITION:
-			return basicSetPrecondition(null, msgs);
-		case UmaPackage.STEP__POSTCONDITION:
-			return basicSetPostcondition(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.STEP__PRECONDITION:
-			if (resolve)
-				return getPrecondition();
-			return basicGetPrecondition();
-		case UmaPackage.STEP__POSTCONDITION:
-			if (resolve)
-				return getPostcondition();
-			return basicGetPostcondition();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.STEP__PRECONDITION:
-			setPrecondition((Constraint) newValue);
-			return;
-		case UmaPackage.STEP__POSTCONDITION:
-			setPostcondition((Constraint) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.STEP__PRECONDITION:
-			setPrecondition((Constraint) null);
-			return;
-		case UmaPackage.STEP__POSTCONDITION:
-			setPostcondition((Constraint) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.STEP__PRECONDITION:
-			return precondition != null;
-		case UmaPackage.STEP__POSTCONDITION:
-			return postcondition != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
-		if (baseClass == WorkDefinition.class) {
-			switch (derivedFeatureID) {
-			case UmaPackage.STEP__PRECONDITION:
-				return UmaPackage.WORK_DEFINITION__PRECONDITION;
-			case UmaPackage.STEP__POSTCONDITION:
-				return UmaPackage.WORK_DEFINITION__POSTCONDITION;
-			default:
-				return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
-		if (baseClass == WorkDefinition.class) {
-			switch (baseFeatureID) {
-			case UmaPackage.WORK_DEFINITION__PRECONDITION:
-				return UmaPackage.STEP__PRECONDITION;
-			case UmaPackage.WORK_DEFINITION__POSTCONDITION:
-				return UmaPackage.STEP__POSTCONDITION;
-			default:
-				return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-} //StepImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/SupportingMaterialImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/SupportingMaterialImpl.java
deleted file mode 100755
index da57da7..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/SupportingMaterialImpl.java
+++ /dev/null
@@ -1,57 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Supporting Material</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class SupportingMaterialImpl extends GuidanceImpl implements
-		SupportingMaterial {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SupportingMaterialImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.SUPPORTING_MATERIAL;
-	}
-
-} //SupportingMaterialImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TaskDescriptionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TaskDescriptionImpl.java
deleted file mode 100755
index f50b3a9..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TaskDescriptionImpl.java
+++ /dev/null
@@ -1,240 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.TaskDescription;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Task Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskDescriptionImpl#getPurpose <em>Purpose</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskDescriptionImpl#getAlternatives <em>Alternatives</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TaskDescriptionImpl extends ContentDescriptionImpl implements
-		TaskDescription {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPurpose()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PURPOSE_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPurpose()
-	 * @generated
-	 * @ordered
-	 */
-	protected String purpose = PURPOSE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAlternatives() <em>Alternatives</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlternatives()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ALTERNATIVES_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getAlternatives() <em>Alternatives</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlternatives()
-	 * @generated
-	 * @ordered
-	 */
-	protected String alternatives = ALTERNATIVES_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaskDescriptionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TASK_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPurpose() {
-		return purpose;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPurpose(String newPurpose) {
-		String oldPurpose = purpose;
-		purpose = newPurpose;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.TASK_DESCRIPTION__PURPOSE, oldPurpose, purpose));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAlternatives() {
-		return alternatives;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAlternatives(String newAlternatives) {
-		String oldAlternatives = alternatives;
-		alternatives = newAlternatives;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.TASK_DESCRIPTION__ALTERNATIVES, oldAlternatives,
-					alternatives));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.TASK_DESCRIPTION__PURPOSE:
-			return getPurpose();
-		case UmaPackage.TASK_DESCRIPTION__ALTERNATIVES:
-			return getAlternatives();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.TASK_DESCRIPTION__PURPOSE:
-			setPurpose((String) newValue);
-			return;
-		case UmaPackage.TASK_DESCRIPTION__ALTERNATIVES:
-			setAlternatives((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.TASK_DESCRIPTION__PURPOSE:
-			setPurpose(PURPOSE_EDEFAULT);
-			return;
-		case UmaPackage.TASK_DESCRIPTION__ALTERNATIVES:
-			setAlternatives(ALTERNATIVES_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.TASK_DESCRIPTION__PURPOSE:
-			return PURPOSE_EDEFAULT == null ? purpose != null
-					: !PURPOSE_EDEFAULT.equals(purpose);
-		case UmaPackage.TASK_DESCRIPTION__ALTERNATIVES:
-			return ALTERNATIVES_EDEFAULT == null ? alternatives != null
-					: !ALTERNATIVES_EDEFAULT.equals(alternatives);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (purpose: "); //$NON-NLS-1$
-		result.append(purpose);
-		result.append(", alternatives: "); //$NON-NLS-1$
-		result.append(alternatives);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TaskDescriptionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TaskDescriptorImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TaskDescriptorImpl.java
deleted file mode 100755
index 7d4bf43..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TaskDescriptorImpl.java
+++ /dev/null
@@ -1,636 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.Descriptor;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.Section;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Task Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskDescriptorImpl#getIsSynchronizedWithSource <em>Is Synchronized With Source</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskDescriptorImpl#getTask <em>Task</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskDescriptorImpl#getAdditionallyPerformedBy <em>Additionally Performed By</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskDescriptorImpl#getAssistedBy <em>Assisted By</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskDescriptorImpl#getExternalInput <em>External Input</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskDescriptorImpl#getMandatoryInput <em>Mandatory Input</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskDescriptorImpl#getOptionalInput <em>Optional Input</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskDescriptorImpl#getOutput <em>Output</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskDescriptorImpl#getPerformedPrimarilyBy <em>Performed Primarily By</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskDescriptorImpl#getSelectedSteps <em>Selected Steps</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TaskDescriptorImpl extends WorkBreakdownElementImpl implements
-		TaskDescriptor {
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = -4419414664273910863L;
-
-	/**
-	 * The default value of the '{@link #getIsSynchronizedWithSource() <em>Is Synchronized With Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsSynchronizedWithSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT = Boolean.TRUE;
-
-	/**
-	 * The cached value of the '{@link #getIsSynchronizedWithSource() <em>Is Synchronized With Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsSynchronizedWithSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean isSynchronizedWithSource = IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getTask() <em>Task</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTask()
-	 * @generated
-	 * @ordered
-	 */
-	protected Task task = null;
-
-	/**
-	 * The cached value of the '{@link #getAdditionallyPerformedBy() <em>Additionally Performed By</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdditionallyPerformedBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList additionallyPerformedBy = null;
-
-	/**
-	 * The cached value of the '{@link #getAssistedBy() <em>Assisted By</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAssistedBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList assistedBy = null;
-
-	/**
-	 * The cached value of the '{@link #getExternalInput() <em>External Input</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExternalInput()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList externalInput = null;
-
-	/**
-	 * The cached value of the '{@link #getMandatoryInput() <em>Mandatory Input</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMandatoryInput()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList mandatoryInput = null;
-
-	/**
-	 * The cached value of the '{@link #getOptionalInput() <em>Optional Input</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOptionalInput()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList optionalInput = null;
-
-	/**
-	 * The cached value of the '{@link #getOutput() <em>Output</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutput()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList output = null;
-
-	/**
-	 * The cached value of the '{@link #getPerformedPrimarilyBy() <em>Performed Primarily By</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPerformedPrimarilyBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected RoleDescriptor performedPrimarilyBy = null;
-
-	/**
-	 * The cached value of the '{@link #getSelectedSteps() <em>Selected Steps</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSelectedSteps()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList selectedSteps = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaskDescriptorImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TASK_DESCRIPTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean getIsSynchronizedWithSource() {
-		return isSynchronizedWithSource;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsSynchronizedWithSource(Boolean newIsSynchronizedWithSource) {
-		Boolean oldIsSynchronizedWithSource = isSynchronizedWithSource;
-		isSynchronizedWithSource = newIsSynchronizedWithSource;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE,
-					oldIsSynchronizedWithSource, isSynchronizedWithSource));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Task getTask() {
-		if (task != null && ((EObject) task).eIsProxy()) {
-			InternalEObject oldTask = (InternalEObject) task;
-			task = (Task) eResolveProxy(oldTask);
-			if (task != oldTask) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.TASK_DESCRIPTOR__TASK, oldTask, task));
-			}
-		}
-		return task;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Task basicGetTask() {
-		return task;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTask(Task newTask) {
-		Task oldTask = task;
-		task = newTask;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.TASK_DESCRIPTOR__TASK, oldTask, task));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getAdditionallyPerformedBy() {
-		if (additionallyPerformedBy == null) {
-			additionallyPerformedBy = new EObjectResolvingEList(
-					RoleDescriptor.class, this,
-					UmaPackage.TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY);
-		}
-		return additionallyPerformedBy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getAssistedBy() {
-		if (assistedBy == null) {
-			assistedBy = new EObjectResolvingEList(RoleDescriptor.class, this,
-					UmaPackage.TASK_DESCRIPTOR__ASSISTED_BY);
-		}
-		return assistedBy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getExternalInput() {
-		if (externalInput == null) {
-			externalInput = new EObjectResolvingEList(
-					WorkProductDescriptor.class, this,
-					UmaPackage.TASK_DESCRIPTOR__EXTERNAL_INPUT);
-		}
-		return externalInput;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMandatoryInput() {
-		if (mandatoryInput == null) {
-			mandatoryInput = new EObjectResolvingEList(
-					WorkProductDescriptor.class, this,
-					UmaPackage.TASK_DESCRIPTOR__MANDATORY_INPUT);
-		}
-		return mandatoryInput;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getOptionalInput() {
-		if (optionalInput == null) {
-			optionalInput = new EObjectResolvingEList(
-					WorkProductDescriptor.class, this,
-					UmaPackage.TASK_DESCRIPTOR__OPTIONAL_INPUT);
-		}
-		return optionalInput;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getOutput() {
-		if (output == null) {
-			output = new EObjectResolvingEList(WorkProductDescriptor.class,
-					this, UmaPackage.TASK_DESCRIPTOR__OUTPUT);
-		}
-		return output;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleDescriptor getPerformedPrimarilyBy() {
-		if (performedPrimarilyBy != null
-				&& ((EObject) performedPrimarilyBy).eIsProxy()) {
-			InternalEObject oldPerformedPrimarilyBy = (InternalEObject) performedPrimarilyBy;
-			performedPrimarilyBy = (RoleDescriptor) eResolveProxy(oldPerformedPrimarilyBy);
-			if (performedPrimarilyBy != oldPerformedPrimarilyBy) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY,
-							oldPerformedPrimarilyBy, performedPrimarilyBy));
-			}
-		}
-		return performedPrimarilyBy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleDescriptor basicGetPerformedPrimarilyBy() {
-		return performedPrimarilyBy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPerformedPrimarilyBy(RoleDescriptor newPerformedPrimarilyBy) {
-		RoleDescriptor oldPerformedPrimarilyBy = performedPrimarilyBy;
-		performedPrimarilyBy = newPerformedPrimarilyBy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY,
-					oldPerformedPrimarilyBy, performedPrimarilyBy));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSelectedSteps() {
-		if (selectedSteps == null) {
-			selectedSteps = new EObjectResolvingEList(Section.class, this,
-					UmaPackage.TASK_DESCRIPTOR__SELECTED_STEPS);
-		}
-		return selectedSteps;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-			return getIsSynchronizedWithSource();
-		case UmaPackage.TASK_DESCRIPTOR__TASK:
-			if (resolve)
-				return getTask();
-			return basicGetTask();
-		case UmaPackage.TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY:
-			return getAdditionallyPerformedBy();
-		case UmaPackage.TASK_DESCRIPTOR__ASSISTED_BY:
-			return getAssistedBy();
-		case UmaPackage.TASK_DESCRIPTOR__EXTERNAL_INPUT:
-			return getExternalInput();
-		case UmaPackage.TASK_DESCRIPTOR__MANDATORY_INPUT:
-			return getMandatoryInput();
-		case UmaPackage.TASK_DESCRIPTOR__OPTIONAL_INPUT:
-			return getOptionalInput();
-		case UmaPackage.TASK_DESCRIPTOR__OUTPUT:
-			return getOutput();
-		case UmaPackage.TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY:
-			if (resolve)
-				return getPerformedPrimarilyBy();
-			return basicGetPerformedPrimarilyBy();
-		case UmaPackage.TASK_DESCRIPTOR__SELECTED_STEPS:
-			return getSelectedSteps();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-			setIsSynchronizedWithSource((Boolean) newValue);
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__TASK:
-			setTask((Task) newValue);
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY:
-			getAdditionallyPerformedBy().clear();
-			getAdditionallyPerformedBy().addAll((Collection) newValue);
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__ASSISTED_BY:
-			getAssistedBy().clear();
-			getAssistedBy().addAll((Collection) newValue);
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__EXTERNAL_INPUT:
-			getExternalInput().clear();
-			getExternalInput().addAll((Collection) newValue);
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__MANDATORY_INPUT:
-			getMandatoryInput().clear();
-			getMandatoryInput().addAll((Collection) newValue);
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__OPTIONAL_INPUT:
-			getOptionalInput().clear();
-			getOptionalInput().addAll((Collection) newValue);
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__OUTPUT:
-			getOutput().clear();
-			getOutput().addAll((Collection) newValue);
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY:
-			setPerformedPrimarilyBy((RoleDescriptor) newValue);
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__SELECTED_STEPS:
-			getSelectedSteps().clear();
-			getSelectedSteps().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-			setIsSynchronizedWithSource(IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT);
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__TASK:
-			setTask((Task) null);
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY:
-			getAdditionallyPerformedBy().clear();
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__ASSISTED_BY:
-			getAssistedBy().clear();
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__EXTERNAL_INPUT:
-			getExternalInput().clear();
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__MANDATORY_INPUT:
-			getMandatoryInput().clear();
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__OPTIONAL_INPUT:
-			getOptionalInput().clear();
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__OUTPUT:
-			getOutput().clear();
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY:
-			setPerformedPrimarilyBy((RoleDescriptor) null);
-			return;
-		case UmaPackage.TASK_DESCRIPTOR__SELECTED_STEPS:
-			getSelectedSteps().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-			return IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT == null ? isSynchronizedWithSource != null
-					: !IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT
-							.equals(isSynchronizedWithSource);
-		case UmaPackage.TASK_DESCRIPTOR__TASK:
-			return task != null;
-		case UmaPackage.TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY:
-			return additionallyPerformedBy != null
-					&& !additionallyPerformedBy.isEmpty();
-		case UmaPackage.TASK_DESCRIPTOR__ASSISTED_BY:
-			return assistedBy != null && !assistedBy.isEmpty();
-		case UmaPackage.TASK_DESCRIPTOR__EXTERNAL_INPUT:
-			return externalInput != null && !externalInput.isEmpty();
-		case UmaPackage.TASK_DESCRIPTOR__MANDATORY_INPUT:
-			return mandatoryInput != null && !mandatoryInput.isEmpty();
-		case UmaPackage.TASK_DESCRIPTOR__OPTIONAL_INPUT:
-			return optionalInput != null && !optionalInput.isEmpty();
-		case UmaPackage.TASK_DESCRIPTOR__OUTPUT:
-			return output != null && !output.isEmpty();
-		case UmaPackage.TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY:
-			return performedPrimarilyBy != null;
-		case UmaPackage.TASK_DESCRIPTOR__SELECTED_STEPS:
-			return selectedSteps != null && !selectedSteps.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
-		if (baseClass == Descriptor.class) {
-			switch (derivedFeatureID) {
-			case UmaPackage.TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-				return UmaPackage.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE;
-			default:
-				return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
-		if (baseClass == Descriptor.class) {
-			switch (baseFeatureID) {
-			case UmaPackage.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-				return UmaPackage.TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE;
-			default:
-				return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (isSynchronizedWithSource: "); //$NON-NLS-1$
-		result.append(isSynchronizedWithSource);
-		result.append(')');
-		return result.toString();
-	}
-
-	////////////////////////
-	// Begin of custom code 
-	////////////////////////
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.ecore.impl.MultiResourceEObject#getFeaturesWithOverridenDefaulValue()
-	 */
-	protected Collection getFeaturesWithOverridenDefaultValue() {
-		return featuresWithOverridenDefaultValue;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.uma.ecore.impl.MultiResourceEObject#getDefaultValue(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public Object getDefaultValue(EStructuralFeature feature) {
-		switch (eDerivedStructuralFeatureID(feature)) {
-		case UmaPackage.TASK_DESCRIPTOR__IS_PLANNED:
-			return IS_PLANNED_DEFAULT;
-		}
-		return null;
-	}
-
-	private static final Collection featuresWithOverridenDefaultValue = Collections
-			.singleton(UmaPackage.eINSTANCE.getBreakdownElement_IsPlanned());
-
-	protected static final Boolean IS_PLANNED_DEFAULT = Boolean.FALSE;
-
-} //TaskDescriptorImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TaskImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TaskImpl.java
deleted file mode 100755
index 1e78db4..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TaskImpl.java
+++ /dev/null
@@ -1,687 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.Constraint;
-import org.eclipse.epf.uma.EstimationConsiderations;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkDefinition;
-import org.eclipse.epf.uma.WorkProduct;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Task</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskImpl#getPrecondition <em>Precondition</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskImpl#getPostcondition <em>Postcondition</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskImpl#getPerformedBy <em>Performed By</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskImpl#getMandatoryInput <em>Mandatory Input</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskImpl#getOutput <em>Output</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskImpl#getAdditionallyPerformedBy <em>Additionally Performed By</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskImpl#getOptionalInput <em>Optional Input</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskImpl#getSteps <em>Steps</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskImpl#getToolMentors <em>Tool Mentors</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TaskImpl#getEstimationConsiderations <em>Estimation Considerations</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TaskImpl extends ContentElementImpl implements Task {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getPrecondition() <em>Precondition</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrecondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected Constraint precondition = null;
-
-	/**
-	 * The cached value of the '{@link #getPostcondition() <em>Postcondition</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostcondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected Constraint postcondition = null;
-
-	/**
-	 * The cached value of the '{@link #getPerformedBy() <em>Performed By</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPerformedBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected Role performedBy = null;
-
-	/**
-	 * The cached value of the '{@link #getMandatoryInput() <em>Mandatory Input</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMandatoryInput()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList mandatoryInput = null;
-
-	/**
-	 * The cached value of the '{@link #getOutput() <em>Output</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutput()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList output = null;
-
-	/**
-	 * The cached value of the '{@link #getAdditionallyPerformedBy() <em>Additionally Performed By</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdditionallyPerformedBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList additionallyPerformedBy = null;
-
-	/**
-	 * The cached value of the '{@link #getOptionalInput() <em>Optional Input</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOptionalInput()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList optionalInput = null;
-
-	/**
-	 * The cached value of the '{@link #getToolMentors() <em>Tool Mentors</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToolMentors()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList toolMentors = null;
-
-	/**
-	 * The cached value of the '{@link #getEstimationConsiderations() <em>Estimation Considerations</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEstimationConsiderations()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList estimationConsiderations = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaskImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TASK;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint getPrecondition() {
-		if (precondition != null && ((EObject) precondition).eIsProxy()) {
-			InternalEObject oldPrecondition = (InternalEObject) precondition;
-			precondition = (Constraint) eResolveProxy(oldPrecondition);
-			if (precondition != oldPrecondition) {
-				InternalEObject newPrecondition = (InternalEObject) precondition;
-				NotificationChain msgs = oldPrecondition.eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.TASK__PRECONDITION,
-						null, null);
-				if (newPrecondition.eInternalContainer() == null) {
-					msgs = newPrecondition
-							.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-									- UmaPackage.TASK__PRECONDITION, null, msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.TASK__PRECONDITION, oldPrecondition,
-							precondition));
-			}
-		}
-		return precondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint basicGetPrecondition() {
-		return precondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPrecondition(Constraint newPrecondition,
-			NotificationChain msgs) {
-		Constraint oldPrecondition = precondition;
-		precondition = newPrecondition;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.TASK__PRECONDITION,
-					oldPrecondition, newPrecondition);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPrecondition(Constraint newPrecondition) {
-		if (newPrecondition != precondition) {
-			NotificationChain msgs = null;
-			if (precondition != null)
-				msgs = ((InternalEObject) precondition).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.TASK__PRECONDITION,
-						null, msgs);
-			if (newPrecondition != null)
-				msgs = ((InternalEObject) newPrecondition).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - UmaPackage.TASK__PRECONDITION,
-						null, msgs);
-			msgs = basicSetPrecondition(newPrecondition, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.TASK__PRECONDITION, newPrecondition,
-					newPrecondition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint getPostcondition() {
-		if (postcondition != null && ((EObject) postcondition).eIsProxy()) {
-			InternalEObject oldPostcondition = (InternalEObject) postcondition;
-			postcondition = (Constraint) eResolveProxy(oldPostcondition);
-			if (postcondition != oldPostcondition) {
-				InternalEObject newPostcondition = (InternalEObject) postcondition;
-				NotificationChain msgs = oldPostcondition
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-								- UmaPackage.TASK__POSTCONDITION, null, null);
-				if (newPostcondition.eInternalContainer() == null) {
-					msgs = newPostcondition.eInverseAdd(this,
-							EOPPOSITE_FEATURE_BASE
-									- UmaPackage.TASK__POSTCONDITION, null,
-							msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.TASK__POSTCONDITION, oldPostcondition,
-							postcondition));
-			}
-		}
-		return postcondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint basicGetPostcondition() {
-		return postcondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostcondition(Constraint newPostcondition,
-			NotificationChain msgs) {
-		Constraint oldPostcondition = postcondition;
-		postcondition = newPostcondition;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.TASK__POSTCONDITION,
-					oldPostcondition, newPostcondition);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPostcondition(Constraint newPostcondition) {
-		if (newPostcondition != postcondition) {
-			NotificationChain msgs = null;
-			if (postcondition != null)
-				msgs = ((InternalEObject) postcondition)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-								- UmaPackage.TASK__POSTCONDITION, null, msgs);
-			if (newPostcondition != null)
-				msgs = ((InternalEObject) newPostcondition)
-						.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-								- UmaPackage.TASK__POSTCONDITION, null, msgs);
-			msgs = basicSetPostcondition(newPostcondition, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.TASK__POSTCONDITION, newPostcondition,
-					newPostcondition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Role getPerformedBy() {
-		if (performedBy != null && ((EObject) performedBy).eIsProxy()) {
-			InternalEObject oldPerformedBy = (InternalEObject) performedBy;
-			performedBy = (Role) eResolveProxy(oldPerformedBy);
-			if (performedBy != oldPerformedBy) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.TASK__PERFORMED_BY, oldPerformedBy,
-							performedBy));
-			}
-		}
-		return performedBy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Role basicGetPerformedBy() {
-		return performedBy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPerformedBy(Role newPerformedBy) {
-		Role oldPerformedBy = performedBy;
-		performedBy = newPerformedBy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.TASK__PERFORMED_BY, oldPerformedBy, performedBy));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMandatoryInput() {
-		if (mandatoryInput == null) {
-			mandatoryInput = new EObjectResolvingEList(WorkProduct.class, this,
-					UmaPackage.TASK__MANDATORY_INPUT);
-		}
-		return mandatoryInput;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getOutput() {
-		if (output == null) {
-			output = new EObjectResolvingEList(WorkProduct.class, this,
-					UmaPackage.TASK__OUTPUT);
-		}
-		return output;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getAdditionallyPerformedBy() {
-		if (additionallyPerformedBy == null) {
-			additionallyPerformedBy = new EObjectResolvingEList(Role.class,
-					this, UmaPackage.TASK__ADDITIONALLY_PERFORMED_BY);
-		}
-		return additionallyPerformedBy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getOptionalInput() {
-		if (optionalInput == null) {
-			optionalInput = new EObjectResolvingEList(WorkProduct.class, this,
-					UmaPackage.TASK__OPTIONAL_INPUT);
-		}
-		return optionalInput;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public List getSteps() {
-		return getPresentation().getSections();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getToolMentors() {
-		if (toolMentors == null) {
-			toolMentors = new EObjectResolvingEList(ToolMentor.class, this,
-					UmaPackage.TASK__TOOL_MENTORS);
-		}
-		return toolMentors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEstimationConsiderations() {
-		if (estimationConsiderations == null) {
-			estimationConsiderations = new EObjectResolvingEList(
-					EstimationConsiderations.class, this,
-					UmaPackage.TASK__ESTIMATION_CONSIDERATIONS);
-		}
-		return estimationConsiderations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.TASK__PRECONDITION:
-			return basicSetPrecondition(null, msgs);
-		case UmaPackage.TASK__POSTCONDITION:
-			return basicSetPostcondition(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.TASK__PRECONDITION:
-			if (resolve)
-				return getPrecondition();
-			return basicGetPrecondition();
-		case UmaPackage.TASK__POSTCONDITION:
-			if (resolve)
-				return getPostcondition();
-			return basicGetPostcondition();
-		case UmaPackage.TASK__PERFORMED_BY:
-			if (resolve)
-				return getPerformedBy();
-			return basicGetPerformedBy();
-		case UmaPackage.TASK__MANDATORY_INPUT:
-			return getMandatoryInput();
-		case UmaPackage.TASK__OUTPUT:
-			return getOutput();
-		case UmaPackage.TASK__ADDITIONALLY_PERFORMED_BY:
-			return getAdditionallyPerformedBy();
-		case UmaPackage.TASK__OPTIONAL_INPUT:
-			return getOptionalInput();
-		case UmaPackage.TASK__STEPS:
-			return getSteps();
-		case UmaPackage.TASK__TOOL_MENTORS:
-			return getToolMentors();
-		case UmaPackage.TASK__ESTIMATION_CONSIDERATIONS:
-			return getEstimationConsiderations();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.TASK__PRECONDITION:
-			setPrecondition((Constraint) newValue);
-			return;
-		case UmaPackage.TASK__POSTCONDITION:
-			setPostcondition((Constraint) newValue);
-			return;
-		case UmaPackage.TASK__PERFORMED_BY:
-			setPerformedBy((Role) newValue);
-			return;
-		case UmaPackage.TASK__MANDATORY_INPUT:
-			getMandatoryInput().clear();
-			getMandatoryInput().addAll((Collection) newValue);
-			return;
-		case UmaPackage.TASK__OUTPUT:
-			getOutput().clear();
-			getOutput().addAll((Collection) newValue);
-			return;
-		case UmaPackage.TASK__ADDITIONALLY_PERFORMED_BY:
-			getAdditionallyPerformedBy().clear();
-			getAdditionallyPerformedBy().addAll((Collection) newValue);
-			return;
-		case UmaPackage.TASK__OPTIONAL_INPUT:
-			getOptionalInput().clear();
-			getOptionalInput().addAll((Collection) newValue);
-			return;
-		case UmaPackage.TASK__TOOL_MENTORS:
-			getToolMentors().clear();
-			getToolMentors().addAll((Collection) newValue);
-			return;
-		case UmaPackage.TASK__ESTIMATION_CONSIDERATIONS:
-			getEstimationConsiderations().clear();
-			getEstimationConsiderations().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.TASK__PRECONDITION:
-			setPrecondition((Constraint) null);
-			return;
-		case UmaPackage.TASK__POSTCONDITION:
-			setPostcondition((Constraint) null);
-			return;
-		case UmaPackage.TASK__PERFORMED_BY:
-			setPerformedBy((Role) null);
-			return;
-		case UmaPackage.TASK__MANDATORY_INPUT:
-			getMandatoryInput().clear();
-			return;
-		case UmaPackage.TASK__OUTPUT:
-			getOutput().clear();
-			return;
-		case UmaPackage.TASK__ADDITIONALLY_PERFORMED_BY:
-			getAdditionallyPerformedBy().clear();
-			return;
-		case UmaPackage.TASK__OPTIONAL_INPUT:
-			getOptionalInput().clear();
-			return;
-		case UmaPackage.TASK__TOOL_MENTORS:
-			getToolMentors().clear();
-			return;
-		case UmaPackage.TASK__ESTIMATION_CONSIDERATIONS:
-			getEstimationConsiderations().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.TASK__PRECONDITION:
-			return precondition != null;
-		case UmaPackage.TASK__POSTCONDITION:
-			return postcondition != null;
-		case UmaPackage.TASK__PERFORMED_BY:
-			return performedBy != null;
-		case UmaPackage.TASK__MANDATORY_INPUT:
-			return mandatoryInput != null && !mandatoryInput.isEmpty();
-		case UmaPackage.TASK__OUTPUT:
-			return output != null && !output.isEmpty();
-		case UmaPackage.TASK__ADDITIONALLY_PERFORMED_BY:
-			return additionallyPerformedBy != null
-					&& !additionallyPerformedBy.isEmpty();
-		case UmaPackage.TASK__OPTIONAL_INPUT:
-			return optionalInput != null && !optionalInput.isEmpty();
-		case UmaPackage.TASK__STEPS:
-			return !getSteps().isEmpty();
-		case UmaPackage.TASK__TOOL_MENTORS:
-			return toolMentors != null && !toolMentors.isEmpty();
-		case UmaPackage.TASK__ESTIMATION_CONSIDERATIONS:
-			return estimationConsiderations != null
-					&& !estimationConsiderations.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
-		if (baseClass == WorkDefinition.class) {
-			switch (derivedFeatureID) {
-			case UmaPackage.TASK__PRECONDITION:
-				return UmaPackage.WORK_DEFINITION__PRECONDITION;
-			case UmaPackage.TASK__POSTCONDITION:
-				return UmaPackage.WORK_DEFINITION__POSTCONDITION;
-			default:
-				return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
-		if (baseClass == WorkDefinition.class) {
-			switch (baseFeatureID) {
-			case UmaPackage.WORK_DEFINITION__PRECONDITION:
-				return UmaPackage.TASK__PRECONDITION;
-			case UmaPackage.WORK_DEFINITION__POSTCONDITION:
-				return UmaPackage.TASK__POSTCONDITION;
-			default:
-				return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-} //TaskImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TeamProfileImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TeamProfileImpl.java
deleted file mode 100755
index e5e2d69..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TeamProfileImpl.java
+++ /dev/null
@@ -1,328 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.TeamProfile;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Team Profile</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.TeamProfileImpl#getTeamRoles <em>Team Roles</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TeamProfileImpl#getSuperTeam <em>Super Team</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TeamProfileImpl#getSubTeam <em>Sub Team</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TeamProfileImpl extends BreakdownElementImpl implements
-		TeamProfile {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getTeamRoles() <em>Team Roles</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTeamRoles()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList teamRoles = null;
-
-	/**
-	 * The cached value of the '{@link #getSuperTeam() <em>Super Team</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSuperTeam()
-	 * @generated
-	 * @ordered
-	 */
-	protected TeamProfile superTeam = null;
-
-	/**
-	 * The cached value of the '{@link #getSubTeam() <em>Sub Team</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubTeam()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList subTeam = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TeamProfileImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TEAM_PROFILE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getTeamRoles() {
-		if (teamRoles == null) {
-			teamRoles = new EObjectResolvingEList(RoleDescriptor.class, this,
-					UmaPackage.TEAM_PROFILE__TEAM_ROLES);
-		}
-		return teamRoles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TeamProfile getSuperTeam() {
-		if (superTeam != null && ((EObject) superTeam).eIsProxy()) {
-			InternalEObject oldSuperTeam = (InternalEObject) superTeam;
-			superTeam = (TeamProfile) eResolveProxy(oldSuperTeam);
-			if (superTeam != oldSuperTeam) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.TEAM_PROFILE__SUPER_TEAM, oldSuperTeam,
-							superTeam));
-			}
-		}
-		return superTeam;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TeamProfile basicGetSuperTeam() {
-		return superTeam;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSuperTeam(TeamProfile newSuperTeam,
-			NotificationChain msgs) {
-		TeamProfile oldSuperTeam = superTeam;
-		superTeam = newSuperTeam;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.TEAM_PROFILE__SUPER_TEAM,
-					oldSuperTeam, newSuperTeam);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSuperTeam(TeamProfile newSuperTeam) {
-		if (newSuperTeam != superTeam) {
-			NotificationChain msgs = null;
-			if (superTeam != null)
-				msgs = ((InternalEObject) superTeam).eInverseRemove(this,
-						UmaPackage.TEAM_PROFILE__SUB_TEAM, TeamProfile.class,
-						msgs);
-			if (newSuperTeam != null)
-				msgs = ((InternalEObject) newSuperTeam).eInverseAdd(this,
-						UmaPackage.TEAM_PROFILE__SUB_TEAM, TeamProfile.class,
-						msgs);
-			msgs = basicSetSuperTeam(newSuperTeam, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.TEAM_PROFILE__SUPER_TEAM, newSuperTeam,
-					newSuperTeam));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getSubTeam() {
-		if (subTeam == null) {
-			subTeam = new EObjectWithInverseResolvingEList(TeamProfile.class,
-					this, UmaPackage.TEAM_PROFILE__SUB_TEAM,
-					UmaPackage.TEAM_PROFILE__SUPER_TEAM);
-		}
-		return subTeam;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.TEAM_PROFILE__SUPER_TEAM:
-			if (superTeam != null)
-				msgs = ((InternalEObject) superTeam).eInverseRemove(this,
-						UmaPackage.TEAM_PROFILE__SUB_TEAM, TeamProfile.class,
-						msgs);
-			return basicSetSuperTeam((TeamProfile) otherEnd, msgs);
-		case UmaPackage.TEAM_PROFILE__SUB_TEAM:
-			return ((InternalEList) getSubTeam()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.TEAM_PROFILE__SUPER_TEAM:
-			return basicSetSuperTeam(null, msgs);
-		case UmaPackage.TEAM_PROFILE__SUB_TEAM:
-			return ((InternalEList) getSubTeam()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.TEAM_PROFILE__TEAM_ROLES:
-			return getTeamRoles();
-		case UmaPackage.TEAM_PROFILE__SUPER_TEAM:
-			if (resolve)
-				return getSuperTeam();
-			return basicGetSuperTeam();
-		case UmaPackage.TEAM_PROFILE__SUB_TEAM:
-			return getSubTeam();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.TEAM_PROFILE__TEAM_ROLES:
-			getTeamRoles().clear();
-			getTeamRoles().addAll((Collection) newValue);
-			return;
-		case UmaPackage.TEAM_PROFILE__SUPER_TEAM:
-			setSuperTeam((TeamProfile) newValue);
-			return;
-		case UmaPackage.TEAM_PROFILE__SUB_TEAM:
-			getSubTeam().clear();
-			getSubTeam().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.TEAM_PROFILE__TEAM_ROLES:
-			getTeamRoles().clear();
-			return;
-		case UmaPackage.TEAM_PROFILE__SUPER_TEAM:
-			setSuperTeam((TeamProfile) null);
-			return;
-		case UmaPackage.TEAM_PROFILE__SUB_TEAM:
-			getSubTeam().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.TEAM_PROFILE__TEAM_ROLES:
-			return teamRoles != null && !teamRoles.isEmpty();
-		case UmaPackage.TEAM_PROFILE__SUPER_TEAM:
-			return superTeam != null;
-		case UmaPackage.TEAM_PROFILE__SUB_TEAM:
-			return subTeam != null && !subTeam.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //TeamProfileImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TemplateImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TemplateImpl.java
deleted file mode 100755
index f92aa2a..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TemplateImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Template;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Template</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class TemplateImpl extends GuidanceImpl implements Template {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TemplateImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TEMPLATE;
-	}
-
-} //TemplateImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TermDefinitionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TermDefinitionImpl.java
deleted file mode 100755
index e19b6c9..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TermDefinitionImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.TermDefinition;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Term Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class TermDefinitionImpl extends GuidanceImpl implements TermDefinition {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TermDefinitionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TERM_DEFINITION;
-	}
-
-} //TermDefinitionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TextElementImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TextElementImpl.java
deleted file mode 100755
index 2b127da..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TextElementImpl.java
+++ /dev/null
@@ -1,182 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.TextElement;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Text Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.TextElementImpl#getText <em>Text</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TextElementImpl extends LeafElementImpl implements TextElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getText() <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getText()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TEXT_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getText() <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getText()
-	 * @generated
-	 * @ordered
-	 */
-	protected String text = TEXT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TextElementImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TEXT_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText() {
-		return text;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setText(String newText) {
-		String oldText = text;
-		text = newText;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.TEXT_ELEMENT__TEXT, oldText, text));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.TEXT_ELEMENT__TEXT:
-			return getText();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.TEXT_ELEMENT__TEXT:
-			setText((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.TEXT_ELEMENT__TEXT:
-			setText(TEXT_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.TEXT_ELEMENT__TEXT:
-			return TEXT_EDEFAULT == null ? text != null : !TEXT_EDEFAULT
-					.equals(text);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (text: "); //$NON-NLS-1$
-		result.append(text);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TextElementImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ToolImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ToolImpl.java
deleted file mode 100755
index f634c07..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ToolImpl.java
+++ /dev/null
@@ -1,151 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tool</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.ToolImpl#getToolMentors <em>Tool Mentors</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ToolImpl extends ContentCategoryImpl implements Tool {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getToolMentors() <em>Tool Mentors</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToolMentors()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList toolMentors = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ToolImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TOOL;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getToolMentors() {
-		if (toolMentors == null) {
-			toolMentors = new EObjectResolvingEList(ToolMentor.class, this,
-					UmaPackage.TOOL__TOOL_MENTORS);
-		}
-		return toolMentors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.TOOL__TOOL_MENTORS:
-			return getToolMentors();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.TOOL__TOOL_MENTORS:
-			getToolMentors().clear();
-			getToolMentors().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.TOOL__TOOL_MENTORS:
-			getToolMentors().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.TOOL__TOOL_MENTORS:
-			return toolMentors != null && !toolMentors.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ToolImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ToolMentorImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ToolMentorImpl.java
deleted file mode 100755
index fe80d85..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/ToolMentorImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tool Mentor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ToolMentorImpl extends GuidanceImpl implements ToolMentor {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ToolMentorImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TOOL_MENTOR;
-	}
-
-} //ToolMentorImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TransitionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TransitionImpl.java
deleted file mode 100755
index 5a3ed48..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TransitionImpl.java
+++ /dev/null
@@ -1,474 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TransitionImpl.java,v 1.5 2006/09/07 00:06:20 klow Exp $
- */
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.epf.uma.Region;
-import org.eclipse.epf.uma.Transition;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.Vertex;
-import org.eclipse.epf.uma.WorkDefinition;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Transition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.TransitionImpl#getWorkDefinition <em>Work Definition</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TransitionImpl#getContainer_ <em>Container</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TransitionImpl#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.TransitionImpl#getTarget <em>Target</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TransitionImpl extends MultiResourceEObject implements Transition {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getWorkDefinition() <em>Work Definition</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkDefinition()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList workDefinition = null;
-
-	/**
-	 * The cached value of the '{@link #getSource() <em>Source</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected Vertex source = null;
-
-	/**
-	 * The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTarget()
-	 * @generated
-	 * @ordered
-	 */
-	protected Vertex target = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TransitionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TRANSITION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getWorkDefinition() {
-		if (workDefinition == null) {
-			workDefinition = new EObjectResolvingEList(WorkDefinition.class,
-					this, UmaPackage.TRANSITION__WORK_DEFINITION);
-		}
-		return workDefinition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Region getContainer_() {
-		if (eContainerFeatureID != UmaPackage.TRANSITION__CONTAINER)
-			return null;
-		return (Region) eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Region basicGetContainer() {
-		if (eContainerFeatureID != UmaPackage.TRANSITION__CONTAINER)
-			return null;
-		return (Region) eInternalContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetContainer(Region newContainer,
-			NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject) newContainer,
-				UmaPackage.TRANSITION__CONTAINER, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContainer(Region newContainer) {
-		if (newContainer != eInternalContainer()
-				|| (eContainerFeatureID != UmaPackage.TRANSITION__CONTAINER && newContainer != null)) {
-			if (EcoreUtil.isAncestor(this, (EObject) newContainer))
-				throw new IllegalArgumentException(
-						"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newContainer != null)
-				msgs = ((InternalEObject) newContainer).eInverseAdd(this,
-						UmaPackage.REGION__TRANSITION, Region.class, msgs);
-			msgs = basicSetContainer(newContainer, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.TRANSITION__CONTAINER, newContainer,
-					newContainer));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Vertex getSource() {
-		if (source != null && ((EObject) source).eIsProxy()) {
-			InternalEObject oldSource = (InternalEObject) source;
-			source = (Vertex) eResolveProxy(oldSource);
-			if (source != oldSource) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.TRANSITION__SOURCE, oldSource, source));
-			}
-		}
-		return source;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Vertex basicGetSource() {
-		return source;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSource(Vertex newSource,
-			NotificationChain msgs) {
-		Vertex oldSource = source;
-		source = newSource;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.TRANSITION__SOURCE, oldSource,
-					newSource);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSource(Vertex newSource) {
-		if (newSource != source) {
-			NotificationChain msgs = null;
-			if (source != null)
-				msgs = ((InternalEObject) source).eInverseRemove(this,
-						UmaPackage.VERTEX__OUTGOING, Vertex.class, msgs);
-			if (newSource != null)
-				msgs = ((InternalEObject) newSource).eInverseAdd(this,
-						UmaPackage.VERTEX__OUTGOING, Vertex.class, msgs);
-			msgs = basicSetSource(newSource, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.TRANSITION__SOURCE, newSource, newSource));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Vertex getTarget() {
-		if (target != null && ((EObject) target).eIsProxy()) {
-			InternalEObject oldTarget = (InternalEObject) target;
-			target = (Vertex) eResolveProxy(oldTarget);
-			if (target != oldTarget) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.TRANSITION__TARGET, oldTarget, target));
-			}
-		}
-		return target;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Vertex basicGetTarget() {
-		return target;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTarget(Vertex newTarget,
-			NotificationChain msgs) {
-		Vertex oldTarget = target;
-		target = newTarget;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.TRANSITION__TARGET, oldTarget,
-					newTarget);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTarget(Vertex newTarget) {
-		if (newTarget != target) {
-			NotificationChain msgs = null;
-			if (target != null)
-				msgs = ((InternalEObject) target).eInverseRemove(this,
-						UmaPackage.VERTEX__INCOMING, Vertex.class, msgs);
-			if (newTarget != null)
-				msgs = ((InternalEObject) newTarget).eInverseAdd(this,
-						UmaPackage.VERTEX__INCOMING, Vertex.class, msgs);
-			msgs = basicSetTarget(newTarget, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.TRANSITION__TARGET, newTarget, newTarget));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.TRANSITION__CONTAINER:
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetContainer((Region) otherEnd, msgs);
-		case UmaPackage.TRANSITION__SOURCE:
-			if (source != null)
-				msgs = ((InternalEObject) source).eInverseRemove(this,
-						UmaPackage.VERTEX__OUTGOING, Vertex.class, msgs);
-			return basicSetSource((Vertex) otherEnd, msgs);
-		case UmaPackage.TRANSITION__TARGET:
-			if (target != null)
-				msgs = ((InternalEObject) target).eInverseRemove(this,
-						UmaPackage.VERTEX__INCOMING, Vertex.class, msgs);
-			return basicSetTarget((Vertex) otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.TRANSITION__CONTAINER:
-			return basicSetContainer(null, msgs);
-		case UmaPackage.TRANSITION__SOURCE:
-			return basicSetSource(null, msgs);
-		case UmaPackage.TRANSITION__TARGET:
-			return basicSetTarget(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(
-			NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-		case UmaPackage.TRANSITION__CONTAINER:
-			return eInternalContainer().eInverseRemove(this,
-					UmaPackage.REGION__TRANSITION, Region.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.TRANSITION__WORK_DEFINITION:
-			return getWorkDefinition();
-		case UmaPackage.TRANSITION__CONTAINER:
-			if (resolve)
-				return getContainer_();
-			return basicGetContainer();
-		case UmaPackage.TRANSITION__SOURCE:
-			if (resolve)
-				return getSource();
-			return basicGetSource();
-		case UmaPackage.TRANSITION__TARGET:
-			if (resolve)
-				return getTarget();
-			return basicGetTarget();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.TRANSITION__WORK_DEFINITION:
-			getWorkDefinition().clear();
-			getWorkDefinition().addAll((Collection) newValue);
-			return;
-		case UmaPackage.TRANSITION__CONTAINER:
-			setContainer((Region) newValue);
-			return;
-		case UmaPackage.TRANSITION__SOURCE:
-			setSource((Vertex) newValue);
-			return;
-		case UmaPackage.TRANSITION__TARGET:
-			setTarget((Vertex) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.TRANSITION__WORK_DEFINITION:
-			getWorkDefinition().clear();
-			return;
-		case UmaPackage.TRANSITION__CONTAINER:
-			setContainer((Region) null);
-			return;
-		case UmaPackage.TRANSITION__SOURCE:
-			setSource((Vertex) null);
-			return;
-		case UmaPackage.TRANSITION__TARGET:
-			setTarget((Vertex) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.TRANSITION__WORK_DEFINITION:
-			return workDefinition != null && !workDefinition.isEmpty();
-		case UmaPackage.TRANSITION__CONTAINER:
-			return basicGetContainer() != null;
-		case UmaPackage.TRANSITION__SOURCE:
-			return source != null;
-		case UmaPackage.TRANSITION__TARGET:
-			return target != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //TransitionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TypeImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TypeImpl.java
deleted file mode 100755
index 33d73e4..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/TypeImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.Type;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class TypeImpl extends PackageableElementImpl implements Type {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TypeImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TYPE;
-	}
-
-} //TypeImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/UMASemanticModelBridgeImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/UMASemanticModelBridgeImpl.java
deleted file mode 100755
index 9c357cf..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/UMASemanticModelBridgeImpl.java
+++ /dev/null
@@ -1,181 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.UMASemanticModelBridge;
-import org.eclipse.epf.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>UMA Semantic Model Bridge</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.UMASemanticModelBridgeImpl#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class UMASemanticModelBridgeImpl extends SemanticModelBridgeImpl
-		implements UMASemanticModelBridge {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected MethodElement element = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UMASemanticModelBridgeImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.UMA_SEMANTIC_MODEL_BRIDGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodElement getElement() {
-		if (element != null && ((EObject) element).eIsProxy()) {
-			InternalEObject oldElement = (InternalEObject) element;
-			element = (MethodElement) eResolveProxy(oldElement);
-			if (element != oldElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.UMA_SEMANTIC_MODEL_BRIDGE__ELEMENT,
-							oldElement, element));
-			}
-		}
-		return element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodElement basicGetElement() {
-		return element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setElement(MethodElement newElement) {
-		MethodElement oldElement = element;
-		element = newElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.UMA_SEMANTIC_MODEL_BRIDGE__ELEMENT, oldElement,
-					element));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.UMA_SEMANTIC_MODEL_BRIDGE__ELEMENT:
-			if (resolve)
-				return getElement();
-			return basicGetElement();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.UMA_SEMANTIC_MODEL_BRIDGE__ELEMENT:
-			setElement((MethodElement) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.UMA_SEMANTIC_MODEL_BRIDGE__ELEMENT:
-			setElement((MethodElement) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.UMA_SEMANTIC_MODEL_BRIDGE__ELEMENT:
-			return element != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //UMASemanticModelBridgeImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/UmaFactoryImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/UmaFactoryImpl.java
deleted file mode 100755
index 23ba80d..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/UmaFactoryImpl.java
+++ /dev/null
@@ -1,1561 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.net.URI;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.ActivityDescription;
-import org.eclipse.epf.uma.Artifact;
-import org.eclipse.epf.uma.ArtifactDescription;
-import org.eclipse.epf.uma.BreakdownElementDescription;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.CompositeRole;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.Constraint;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CoreSemanticModelBridge;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Deliverable;
-import org.eclipse.epf.uma.DeliverableDescription;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.DeliveryProcessDescription;
-import org.eclipse.epf.uma.DescriptorDescription;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.DiagramLink;
-import org.eclipse.epf.uma.Dimension;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.Ellipse;
-import org.eclipse.epf.uma.EstimationConsiderations;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.GraphConnector;
-import org.eclipse.epf.uma.GraphEdge;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.GuidanceDescription;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.Image;
-import org.eclipse.epf.uma.Iteration;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElementProperty;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.Outcome;
-import org.eclipse.epf.uma.Phase;
-import org.eclipse.epf.uma.PlanningData;
-import org.eclipse.epf.uma.Point;
-import org.eclipse.epf.uma.Polyline;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.PracticeDescription;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessComponentDescriptor;
-import org.eclipse.epf.uma.ProcessComponentInterface;
-import org.eclipse.epf.uma.ProcessDescription;
-import org.eclipse.epf.uma.ProcessFamily;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.ProcessPlanningTemplate;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.epf.uma.PseudoState;
-import org.eclipse.epf.uma.PseudoStateKind;
-import org.eclipse.epf.uma.Reference;
-import org.eclipse.epf.uma.Region;
-import org.eclipse.epf.uma.Report;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.Roadmap;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleDescription;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.Section;
-import org.eclipse.epf.uma.SimpleSemanticModelElement;
-import org.eclipse.epf.uma.State;
-import org.eclipse.epf.uma.StateMachine;
-import org.eclipse.epf.uma.Step;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.TaskDescription;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.TeamProfile;
-import org.eclipse.epf.uma.Template;
-import org.eclipse.epf.uma.TermDefinition;
-import org.eclipse.epf.uma.TextElement;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.Transition;
-import org.eclipse.epf.uma.UMASemanticModelBridge;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.epf.uma.Vertex;
-import org.eclipse.epf.uma.Whitepaper;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkOrderType;
-import org.eclipse.epf.uma.WorkProductDescription;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.epf.uma.WorkProductType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class UmaFactoryImpl extends EFactoryImpl implements UmaFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static UmaFactory init() {
-		try {
-			UmaFactory theUmaFactory = (UmaFactory) EPackage.Registry.INSTANCE
-					.getEFactory("http://www.eclipse.org/epf/uma/1.0.4/uma.ecore"); //$NON-NLS-1$ 
-			if (theUmaFactory != null) {
-				return theUmaFactory;
-			}
-		} catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new UmaFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UmaFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-		case UmaPackage.PACKAGE:
-			return (EObject) createPackage();
-		case UmaPackage.CONSTRAINT:
-			return (EObject) createConstraint();
-		case UmaPackage.METHOD_ELEMENT_PROPERTY:
-			return (EObject) createMethodElementProperty();
-		case UmaPackage.CONTENT_DESCRIPTION:
-			return (EObject) createContentDescription();
-		case UmaPackage.SECTION:
-			return (EObject) createSection();
-		case UmaPackage.ROLE:
-			return (EObject) createRole();
-		case UmaPackage.TASK:
-			return (EObject) createTask();
-		case UmaPackage.STEP:
-			return (EObject) createStep();
-		case UmaPackage.ARTIFACT:
-			return (EObject) createArtifact();
-		case UmaPackage.DELIVERABLE:
-			return (EObject) createDeliverable();
-		case UmaPackage.OUTCOME:
-			return (EObject) createOutcome();
-		case UmaPackage.CONTENT_PACKAGE:
-			return (EObject) createContentPackage();
-		case UmaPackage.ARTIFACT_DESCRIPTION:
-			return (EObject) createArtifactDescription();
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION:
-			return (EObject) createWorkProductDescription();
-		case UmaPackage.DELIVERABLE_DESCRIPTION:
-			return (EObject) createDeliverableDescription();
-		case UmaPackage.ROLE_DESCRIPTION:
-			return (EObject) createRoleDescription();
-		case UmaPackage.TASK_DESCRIPTION:
-			return (EObject) createTaskDescription();
-		case UmaPackage.GUIDANCE_DESCRIPTION:
-			return (EObject) createGuidanceDescription();
-		case UmaPackage.PRACTICE_DESCRIPTION:
-			return (EObject) createPracticeDescription();
-		case UmaPackage.POINT:
-			return (EObject) createPoint();
-		case UmaPackage.DIAGRAM_LINK:
-			return (EObject) createDiagramLink();
-		case UmaPackage.GRAPH_CONNECTOR:
-			return (EObject) createGraphConnector();
-		case UmaPackage.DIMENSION:
-			return (EObject) createDimension();
-		case UmaPackage.REFERENCE:
-			return (EObject) createReference();
-		case UmaPackage.PROPERTY:
-			return (EObject) createProperty();
-		case UmaPackage.GRAPH_EDGE:
-			return (EObject) createGraphEdge();
-		case UmaPackage.DIAGRAM:
-			return (EObject) createDiagram();
-		case UmaPackage.GRAPH_NODE:
-			return (EObject) createGraphNode();
-		case UmaPackage.SIMPLE_SEMANTIC_MODEL_ELEMENT:
-			return (EObject) createSimpleSemanticModelElement();
-		case UmaPackage.UMA_SEMANTIC_MODEL_BRIDGE:
-			return (EObject) createUMASemanticModelBridge();
-		case UmaPackage.CORE_SEMANTIC_MODEL_BRIDGE:
-			return (EObject) createCoreSemanticModelBridge();
-		case UmaPackage.TEXT_ELEMENT:
-			return (EObject) createTextElement();
-		case UmaPackage.IMAGE:
-			return (EObject) createImage();
-		case UmaPackage.POLYLINE:
-			return (EObject) createPolyline();
-		case UmaPackage.ELLIPSE:
-			return (EObject) createEllipse();
-		case UmaPackage.ACTIVITY:
-			return (EObject) createActivity();
-		case UmaPackage.MILESTONE:
-			return (EObject) createMilestone();
-		case UmaPackage.ITERATION:
-			return (EObject) createIteration();
-		case UmaPackage.PHASE:
-			return (EObject) createPhase();
-		case UmaPackage.TEAM_PROFILE:
-			return (EObject) createTeamProfile();
-		case UmaPackage.ROLE_DESCRIPTOR:
-			return (EObject) createRoleDescriptor();
-		case UmaPackage.WORK_ORDER:
-			return (EObject) createWorkOrder();
-		case UmaPackage.PLANNING_DATA:
-			return (EObject) createPlanningData();
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR:
-			return (EObject) createWorkProductDescriptor();
-		case UmaPackage.TASK_DESCRIPTOR:
-			return (EObject) createTaskDescriptor();
-		case UmaPackage.COMPOSITE_ROLE:
-			return (EObject) createCompositeRole();
-		case UmaPackage.BREAKDOWN_ELEMENT_DESCRIPTION:
-			return (EObject) createBreakdownElementDescription();
-		case UmaPackage.ACTIVITY_DESCRIPTION:
-			return (EObject) createActivityDescription();
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION:
-			return (EObject) createDeliveryProcessDescription();
-		case UmaPackage.PROCESS_DESCRIPTION:
-			return (EObject) createProcessDescription();
-		case UmaPackage.DESCRIPTOR_DESCRIPTION:
-			return (EObject) createDescriptorDescription();
-		case UmaPackage.CONCEPT:
-			return (EObject) createConcept();
-		case UmaPackage.CHECKLIST:
-			return (EObject) createChecklist();
-		case UmaPackage.EXAMPLE:
-			return (EObject) createExample();
-		case UmaPackage.GUIDELINE:
-			return (EObject) createGuideline();
-		case UmaPackage.REPORT:
-			return (EObject) createReport();
-		case UmaPackage.TEMPLATE:
-			return (EObject) createTemplate();
-		case UmaPackage.SUPPORTING_MATERIAL:
-			return (EObject) createSupportingMaterial();
-		case UmaPackage.TOOL_MENTOR:
-			return (EObject) createToolMentor();
-		case UmaPackage.WHITEPAPER:
-			return (EObject) createWhitepaper();
-		case UmaPackage.TERM_DEFINITION:
-			return (EObject) createTermDefinition();
-		case UmaPackage.PRACTICE:
-			return (EObject) createPractice();
-		case UmaPackage.ESTIMATION_CONSIDERATIONS:
-			return (EObject) createEstimationConsiderations();
-		case UmaPackage.REUSABLE_ASSET:
-			return (EObject) createReusableAsset();
-		case UmaPackage.STATE:
-			return (EObject) createState();
-		case UmaPackage.VERTEX:
-			return (EObject) createVertex();
-		case UmaPackage.REGION:
-			return (EObject) createRegion();
-		case UmaPackage.STATE_MACHINE:
-			return (EObject) createStateMachine();
-		case UmaPackage.TRANSITION:
-			return (EObject) createTransition();
-		case UmaPackage.PSEUDO_STATE:
-			return (EObject) createPseudoState();
-		case UmaPackage.DISCIPLINE:
-			return (EObject) createDiscipline();
-		case UmaPackage.ROLE_SET:
-			return (EObject) createRoleSet();
-		case UmaPackage.DOMAIN:
-			return (EObject) createDomain();
-		case UmaPackage.WORK_PRODUCT_TYPE:
-			return (EObject) createWorkProductType();
-		case UmaPackage.DISCIPLINE_GROUPING:
-			return (EObject) createDisciplineGrouping();
-		case UmaPackage.TOOL:
-			return (EObject) createTool();
-		case UmaPackage.ROLE_SET_GROUPING:
-			return (EObject) createRoleSetGrouping();
-		case UmaPackage.CUSTOM_CATEGORY:
-			return (EObject) createCustomCategory();
-		case UmaPackage.DELIVERY_PROCESS:
-			return (EObject) createDeliveryProcess();
-		case UmaPackage.CAPABILITY_PATTERN:
-			return (EObject) createCapabilityPattern();
-		case UmaPackage.PROCESS_PLANNING_TEMPLATE:
-			return (EObject) createProcessPlanningTemplate();
-		case UmaPackage.ROADMAP:
-			return (EObject) createRoadmap();
-		case UmaPackage.PROCESS_COMPONENT:
-			return (EObject) createProcessComponent();
-		case UmaPackage.PROCESS_PACKAGE:
-			return (EObject) createProcessPackage();
-		case UmaPackage.PROCESS_COMPONENT_INTERFACE:
-			return (EObject) createProcessComponentInterface();
-		case UmaPackage.PROCESS_COMPONENT_DESCRIPTOR:
-			return (EObject) createProcessComponentDescriptor();
-		case UmaPackage.METHOD_PLUGIN:
-			return (EObject) createMethodPlugin();
-		case UmaPackage.METHOD_CONFIGURATION:
-			return (EObject) createMethodConfiguration();
-		case UmaPackage.PROCESS_FAMILY:
-			return (EObject) createProcessFamily();
-		case UmaPackage.METHOD_LIBRARY:
-			return (EObject) createMethodLibrary();
-		default:
-			throw new IllegalArgumentException(
-					"The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-		case UmaPackage.WORK_ORDER_TYPE:
-			return createWorkOrderTypeFromString(eDataType, initialValue);
-		case UmaPackage.PSEUDO_STATE_KIND:
-			return createPseudoStateKindFromString(eDataType, initialValue);
-		case UmaPackage.VARIABILITY_TYPE:
-			return createVariabilityTypeFromString(eDataType, initialValue);
-		case UmaPackage.DATE:
-			return createDateFromString(eDataType, initialValue);
-		case UmaPackage.URI:
-			return createUriFromString(eDataType, initialValue);
-		case UmaPackage.UNLIMITED_NATURAL:
-			return createUnlimitedNaturalFromString(eDataType, initialValue);
-		case UmaPackage.STRING:
-			return createStringFromString(eDataType, initialValue);
-		case UmaPackage.SET:
-			return createSetFromString(eDataType, initialValue);
-		case UmaPackage.SEQUENCE:
-			return createSequenceFromString(eDataType, initialValue);
-		case UmaPackage.INTEGER:
-			return createIntegerFromString(eDataType, initialValue);
-		case UmaPackage.FLOAT:
-			return createFloatFromString(eDataType, initialValue);
-		default:
-			throw new IllegalArgumentException(
-					"The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-		case UmaPackage.WORK_ORDER_TYPE:
-			return convertWorkOrderTypeToString(eDataType, instanceValue);
-		case UmaPackage.PSEUDO_STATE_KIND:
-			return convertPseudoStateKindToString(eDataType, instanceValue);
-		case UmaPackage.VARIABILITY_TYPE:
-			return convertVariabilityTypeToString(eDataType, instanceValue);
-		case UmaPackage.DATE:
-			return convertDateToString(eDataType, instanceValue);
-		case UmaPackage.URI:
-			return convertUriToString(eDataType, instanceValue);
-		case UmaPackage.UNLIMITED_NATURAL:
-			return convertUnlimitedNaturalToString(eDataType, instanceValue);
-		case UmaPackage.STRING:
-			return convertStringToString(eDataType, instanceValue);
-		case UmaPackage.SET:
-			return convertSetToString(eDataType, instanceValue);
-		case UmaPackage.SEQUENCE:
-			return convertSequenceToString(eDataType, instanceValue);
-		case UmaPackage.INTEGER:
-			return convertIntegerToString(eDataType, instanceValue);
-		case UmaPackage.FLOAT:
-			return convertFloatToString(eDataType, instanceValue);
-		default:
-			throw new IllegalArgumentException(
-					"The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public org.eclipse.epf.uma.Package createPackage() {
-		PackageImpl package_ = new PackageImpl();
-		return package_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint createConstraint() {
-		ConstraintImpl constraint = new ConstraintImpl();
-		return constraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodElementProperty createMethodElementProperty() {
-		MethodElementPropertyImpl methodElementProperty = new MethodElementPropertyImpl();
-		return methodElementProperty;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContentDescription createContentDescription() {
-		ContentDescriptionImpl contentDescription = new ContentDescriptionImpl();
-		return contentDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Section createSection() {
-		SectionImpl section = new SectionImpl();
-		return section;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Role createRole() {
-		RoleImpl role = new RoleImpl();
-		return role;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Task createTask() {
-		TaskImpl task = new TaskImpl();
-		return task;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Step createStep() {
-		StepImpl step = new StepImpl();
-		return step;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Artifact createArtifact() {
-		ArtifactImpl artifact = new ArtifactImpl();
-		return artifact;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Deliverable createDeliverable() {
-		DeliverableImpl deliverable = new DeliverableImpl();
-		return deliverable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Outcome createOutcome() {
-		OutcomeImpl outcome = new OutcomeImpl();
-		return outcome;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContentPackage createContentPackage() {
-		ContentPackageImpl contentPackage = new ContentPackageImpl();
-		return contentPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ArtifactDescription createArtifactDescription() {
-		ArtifactDescriptionImpl artifactDescription = new ArtifactDescriptionImpl();
-		return artifactDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProductDescription createWorkProductDescription() {
-		WorkProductDescriptionImpl workProductDescription = new WorkProductDescriptionImpl();
-		return workProductDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DeliverableDescription createDeliverableDescription() {
-		DeliverableDescriptionImpl deliverableDescription = new DeliverableDescriptionImpl();
-		return deliverableDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleDescription createRoleDescription() {
-		RoleDescriptionImpl roleDescription = new RoleDescriptionImpl();
-		return roleDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskDescription createTaskDescription() {
-		TaskDescriptionImpl taskDescription = new TaskDescriptionImpl();
-		return taskDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GuidanceDescription createGuidanceDescription() {
-		GuidanceDescriptionImpl guidanceDescription = new GuidanceDescriptionImpl();
-		return guidanceDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PracticeDescription createPracticeDescription() {
-		PracticeDescriptionImpl practiceDescription = new PracticeDescriptionImpl();
-		return practiceDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point createPoint() {
-		PointImpl point = new PointImpl();
-		return point;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DiagramLink createDiagramLink() {
-		DiagramLinkImpl diagramLink = new DiagramLinkImpl();
-		return diagramLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphConnector createGraphConnector() {
-		GraphConnectorImpl graphConnector = new GraphConnectorImpl();
-		return graphConnector;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Dimension createDimension() {
-		DimensionImpl dimension = new DimensionImpl();
-		return dimension;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Reference createReference() {
-		ReferenceImpl reference = new ReferenceImpl();
-		return reference;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Property createProperty() {
-		PropertyImpl property = new PropertyImpl();
-		return property;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphEdge createGraphEdge() {
-		GraphEdgeImpl graphEdge = new GraphEdgeImpl();
-		return graphEdge;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Diagram createDiagram() {
-		DiagramImpl diagram = new DiagramImpl();
-		return diagram;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GraphNode createGraphNode() {
-		GraphNodeImpl graphNode = new GraphNodeImpl();
-		return graphNode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SimpleSemanticModelElement createSimpleSemanticModelElement() {
-		SimpleSemanticModelElementImpl simpleSemanticModelElement = new SimpleSemanticModelElementImpl();
-		return simpleSemanticModelElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UMASemanticModelBridge createUMASemanticModelBridge() {
-		UMASemanticModelBridgeImpl umaSemanticModelBridge = new UMASemanticModelBridgeImpl();
-		return umaSemanticModelBridge;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CoreSemanticModelBridge createCoreSemanticModelBridge() {
-		CoreSemanticModelBridgeImpl coreSemanticModelBridge = new CoreSemanticModelBridgeImpl();
-		return coreSemanticModelBridge;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TextElement createTextElement() {
-		TextElementImpl textElement = new TextElementImpl();
-		return textElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Image createImage() {
-		ImageImpl image = new ImageImpl();
-		return image;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Polyline createPolyline() {
-		PolylineImpl polyline = new PolylineImpl();
-		return polyline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Ellipse createEllipse() {
-		EllipseImpl ellipse = new EllipseImpl();
-		return ellipse;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Activity createActivity() {
-		ActivityImpl activity = new ActivityImpl();
-		return activity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Milestone createMilestone() {
-		MilestoneImpl milestone = new MilestoneImpl();
-		return milestone;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Iteration createIteration() {
-		IterationImpl iteration = new IterationImpl();
-		return iteration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Phase createPhase() {
-		PhaseImpl phase = new PhaseImpl();
-		return phase;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TeamProfile createTeamProfile() {
-		TeamProfileImpl teamProfile = new TeamProfileImpl();
-		return teamProfile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleDescriptor createRoleDescriptor() {
-		RoleDescriptorImpl roleDescriptor = new RoleDescriptorImpl();
-		return roleDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkOrder createWorkOrder() {
-		WorkOrderImpl workOrder = new WorkOrderImpl();
-		return workOrder;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PlanningData createPlanningData() {
-		PlanningDataImpl planningData = new PlanningDataImpl();
-		return planningData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskDescriptor createTaskDescriptor() {
-		TaskDescriptorImpl taskDescriptor = new TaskDescriptorImpl();
-		return taskDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProductDescriptor createWorkProductDescriptor() {
-		WorkProductDescriptorImpl workProductDescriptor = new WorkProductDescriptorImpl();
-		return workProductDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CompositeRole createCompositeRole() {
-		CompositeRoleImpl compositeRole = new CompositeRoleImpl();
-		return compositeRole;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BreakdownElementDescription createBreakdownElementDescription() {
-		BreakdownElementDescriptionImpl breakdownElementDescription = new BreakdownElementDescriptionImpl();
-		return breakdownElementDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivityDescription createActivityDescription() {
-		ActivityDescriptionImpl activityDescription = new ActivityDescriptionImpl();
-		return activityDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DeliveryProcessDescription createDeliveryProcessDescription() {
-		DeliveryProcessDescriptionImpl deliveryProcessDescription = new DeliveryProcessDescriptionImpl();
-		return deliveryProcessDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessDescription createProcessDescription() {
-		ProcessDescriptionImpl processDescription = new ProcessDescriptionImpl();
-		return processDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DescriptorDescription createDescriptorDescription() {
-		DescriptorDescriptionImpl descriptorDescription = new DescriptorDescriptionImpl();
-		return descriptorDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Concept createConcept() {
-		ConceptImpl concept = new ConceptImpl();
-		return concept;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Checklist createChecklist() {
-		ChecklistImpl checklist = new ChecklistImpl();
-		return checklist;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Example createExample() {
-		ExampleImpl example = new ExampleImpl();
-		return example;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Guideline createGuideline() {
-		GuidelineImpl guideline = new GuidelineImpl();
-		return guideline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EstimationConsiderations createEstimationConsiderations() {
-		EstimationConsiderationsImpl estimationConsiderations = new EstimationConsiderationsImpl();
-		return estimationConsiderations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Report createReport() {
-		ReportImpl report = new ReportImpl();
-		return report;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Template createTemplate() {
-		TemplateImpl template = new TemplateImpl();
-		return template;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SupportingMaterial createSupportingMaterial() {
-		SupportingMaterialImpl supportingMaterial = new SupportingMaterialImpl();
-		return supportingMaterial;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ToolMentor createToolMentor() {
-		ToolMentorImpl toolMentor = new ToolMentorImpl();
-		return toolMentor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Whitepaper createWhitepaper() {
-		WhitepaperImpl whitepaper = new WhitepaperImpl();
-		return whitepaper;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TermDefinition createTermDefinition() {
-		TermDefinitionImpl termDefinition = new TermDefinitionImpl();
-		return termDefinition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Practice createPractice() {
-		PracticeImpl practice = new PracticeImpl();
-		return practice;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReusableAsset createReusableAsset() {
-		ReusableAssetImpl reusableAsset = new ReusableAssetImpl();
-		return reusableAsset;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public State createState() {
-		StateImpl state = new StateImpl();
-		return state;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Vertex createVertex() {
-		VertexImpl vertex = new VertexImpl();
-		return vertex;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Region createRegion() {
-		RegionImpl region = new RegionImpl();
-		return region;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StateMachine createStateMachine() {
-		StateMachineImpl stateMachine = new StateMachineImpl();
-		return stateMachine;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Transition createTransition() {
-		TransitionImpl transition = new TransitionImpl();
-		return transition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PseudoState createPseudoState() {
-		PseudoStateImpl pseudoState = new PseudoStateImpl();
-		return pseudoState;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Discipline createDiscipline() {
-		DisciplineImpl discipline = new DisciplineImpl();
-		return discipline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleSet createRoleSet() {
-		RoleSetImpl roleSet = new RoleSetImpl();
-		return roleSet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Domain createDomain() {
-		DomainImpl domain = new DomainImpl();
-		return domain;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProductType createWorkProductType() {
-		WorkProductTypeImpl workProductType = new WorkProductTypeImpl();
-		return workProductType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DisciplineGrouping createDisciplineGrouping() {
-		DisciplineGroupingImpl disciplineGrouping = new DisciplineGroupingImpl();
-		return disciplineGrouping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Tool createTool() {
-		ToolImpl tool = new ToolImpl();
-		return tool;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleSetGrouping createRoleSetGrouping() {
-		RoleSetGroupingImpl roleSetGrouping = new RoleSetGroupingImpl();
-		return roleSetGrouping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomCategory createCustomCategory() {
-		CustomCategoryImpl customCategory = new CustomCategoryImpl();
-		return customCategory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DeliveryProcess createDeliveryProcess() {
-		DeliveryProcessImpl deliveryProcess = new DeliveryProcessImpl();
-		return deliveryProcess;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CapabilityPattern createCapabilityPattern() {
-		CapabilityPatternImpl capabilityPattern = new CapabilityPatternImpl();
-		return capabilityPattern;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessPlanningTemplate createProcessPlanningTemplate() {
-		ProcessPlanningTemplateImpl processPlanningTemplate = new ProcessPlanningTemplateImpl();
-		return processPlanningTemplate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Roadmap createRoadmap() {
-		RoadmapImpl roadmap = new RoadmapImpl();
-		return roadmap;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessComponent createProcessComponent() {
-		ProcessComponentImpl processComponent = new ProcessComponentImpl();
-		return processComponent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessPackage createProcessPackage() {
-		ProcessPackageImpl processPackage = new ProcessPackageImpl();
-		return processPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessComponentInterface createProcessComponentInterface() {
-		ProcessComponentInterfaceImpl processComponentInterface = new ProcessComponentInterfaceImpl();
-		return processComponentInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessComponentDescriptor createProcessComponentDescriptor() {
-		ProcessComponentDescriptorImpl processComponentDescriptor = new ProcessComponentDescriptorImpl();
-		return processComponentDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodPlugin createMethodPlugin() {
-		MethodPluginImpl methodPlugin = new MethodPluginImpl();
-		return methodPlugin;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodConfiguration createMethodConfiguration() {
-		MethodConfigurationImpl methodConfiguration = new MethodConfigurationImpl();
-		return methodConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessFamily createProcessFamily() {
-		ProcessFamilyImpl processFamily = new ProcessFamilyImpl();
-		return processFamily;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodLibrary createMethodLibrary() {
-		MethodLibraryImpl methodLibrary = new MethodLibraryImpl();
-		return methodLibrary;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkOrderType createWorkOrderTypeFromString(EDataType eDataType,
-			String initialValue) {
-		WorkOrderType result = WorkOrderType.get(initialValue);
-		if (result == null)
-			throw new IllegalArgumentException(
-					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertWorkOrderTypeToString(EDataType eDataType,
-			Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PseudoStateKind createPseudoStateKindFromString(EDataType eDataType,
-			String initialValue) {
-		PseudoStateKind result = PseudoStateKind.get(initialValue);
-		if (result == null)
-			throw new IllegalArgumentException(
-					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertPseudoStateKindToString(EDataType eDataType,
-			Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityType createVariabilityTypeFromString(EDataType eDataType,
-			String initialValue) {
-		VariabilityType result = VariabilityType.get(initialValue);
-		if (result == null)
-			throw new IllegalArgumentException(
-					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertVariabilityTypeToString(EDataType eDataType,
-			Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Date createDateFromString(EDataType eDataType, String initialValue) {
-		return (Date) super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDateToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public URI createUriFromString(EDataType eDataType, String initialValue) {
-		return (URI) super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertUriToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Integer createUnlimitedNaturalFromString(EDataType eDataType,
-			String initialValue) {
-		return (Integer) super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertUnlimitedNaturalToString(EDataType eDataType,
-			Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createStringFromString(EDataType eDataType,
-			String initialValue) {
-		return (String) super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertStringToString(EDataType eDataType,
-			Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Set createSetFromString(EDataType eDataType, String initialValue) {
-		return (Set) super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertSetToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List createSequenceFromString(EDataType eDataType,
-			String initialValue) {
-		return (List) super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertSequenceToString(EDataType eDataType,
-			Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Integer createIntegerFromString(EDataType eDataType,
-			String initialValue) {
-		return (Integer) super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertIntegerToString(EDataType eDataType,
-			Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Float createFloatFromString(EDataType eDataType, String initialValue) {
-		return (Float) super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertFloatToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UmaPackage getUmaPackage() {
-		return (UmaPackage) getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static UmaPackage getPackage() {
-		return UmaPackage.eINSTANCE;
-	}
-
-} //UmaFactoryImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/UmaPackageImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/UmaPackageImpl.java
deleted file mode 100755
index 8f9bd41..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/UmaPackageImpl.java
+++ /dev/null
@@ -1,7089 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.ActivityDescription;
-import org.eclipse.epf.uma.Artifact;
-import org.eclipse.epf.uma.ArtifactDescription;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.BreakdownElementDescription;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Classifier;
-import org.eclipse.epf.uma.CompositeRole;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.Constraint;
-import org.eclipse.epf.uma.ContentCategory;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CoreSemanticModelBridge;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Deliverable;
-import org.eclipse.epf.uma.DeliverableDescription;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.DeliveryProcessDescription;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.DescriptorDescription;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.DiagramElement;
-import org.eclipse.epf.uma.DiagramLink;
-import org.eclipse.epf.uma.Dimension;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.Element;
-import org.eclipse.epf.uma.Ellipse;
-import org.eclipse.epf.uma.EstimationConsiderations;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.GraphConnector;
-import org.eclipse.epf.uma.GraphEdge;
-import org.eclipse.epf.uma.GraphElement;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.GraphicPrimitive;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.GuidanceDescription;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.Image;
-import org.eclipse.epf.uma.Iteration;
-import org.eclipse.epf.uma.LeafElement;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodElementProperty;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.MethodUnit;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.NamedElement;
-import org.eclipse.epf.uma.Namespace;
-import org.eclipse.epf.uma.Outcome;
-import org.eclipse.epf.uma.PackageableElement;
-import org.eclipse.epf.uma.Phase;
-import org.eclipse.epf.uma.PlanningData;
-import org.eclipse.epf.uma.Point;
-import org.eclipse.epf.uma.Polyline;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.PracticeDescription;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessComponentDescriptor;
-import org.eclipse.epf.uma.ProcessComponentInterface;
-import org.eclipse.epf.uma.ProcessDescription;
-import org.eclipse.epf.uma.ProcessElement;
-import org.eclipse.epf.uma.ProcessFamily;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.ProcessPlanningTemplate;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.epf.uma.PseudoState;
-import org.eclipse.epf.uma.PseudoStateKind;
-import org.eclipse.epf.uma.Reference;
-import org.eclipse.epf.uma.Region;
-import org.eclipse.epf.uma.Report;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.Roadmap;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleDescription;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.Section;
-import org.eclipse.epf.uma.SemanticModelBridge;
-import org.eclipse.epf.uma.SimpleSemanticModelElement;
-import org.eclipse.epf.uma.State;
-import org.eclipse.epf.uma.StateMachine;
-import org.eclipse.epf.uma.Step;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.TaskDescription;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.TeamProfile;
-import org.eclipse.epf.uma.Template;
-import org.eclipse.epf.uma.TermDefinition;
-import org.eclipse.epf.uma.TextElement;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.Transition;
-import org.eclipse.epf.uma.Type;
-import org.eclipse.epf.uma.UMASemanticModelBridge;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.epf.uma.Vertex;
-import org.eclipse.epf.uma.Whitepaper;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkDefinition;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkOrderType;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductDescription;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.epf.uma.WorkProductType;
-
-import org.eclipse.epf.uma.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class UmaPackageImpl extends EPackageImpl implements UmaPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass classifierEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass typeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass elementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass namedElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass packageableElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass packageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass namespaceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass constraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodElementPropertyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass contentElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass describableElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass contentDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass sectionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workProductEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass taskEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workDefinitionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass stepEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass guidanceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass artifactEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass deliverableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass outcomeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodPackageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass contentPackageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass artifactDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workProductDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass deliverableDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass taskDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass guidanceDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass practiceDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass pointEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass graphElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass diagramElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass diagramLinkEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass graphConnectorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass semanticModelBridgeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass dimensionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass referenceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass propertyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass graphEdgeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass diagramEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass graphNodeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass simpleSemanticModelElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass umaSemanticModelBridgeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass coreSemanticModelBridgeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass leafElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass textElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass imageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass graphicPrimitiveEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass polylineEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ellipseEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass activityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workBreakdownElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass breakdownElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass milestoneEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass iterationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass phaseEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass teamProfileEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleDescriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workOrderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass planningDataEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass descriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass taskDescriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workProductDescriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass compositeRoleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass breakdownElementDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass activityDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass deliveryProcessDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass descriptorDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass conceptEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass checklistEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass exampleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass guidelineEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass estimationConsiderationsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass reportEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass templateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass supportingMaterialEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass toolMentorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass whitepaperEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass termDefinitionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass practiceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass reusableAssetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass stateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass vertexEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass regionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass stateMachineEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass transitionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass pseudoStateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass disciplineEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass contentCategoryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleSetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass domainEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workProductTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass disciplineGroupingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass toolEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleSetGroupingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass customCategoryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass deliveryProcessEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass capabilityPatternEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processPlanningTemplateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roadmapEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processComponentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processPackageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processComponentInterfaceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processComponentDescriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodPluginEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass variabilityElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodUnitEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processFamilyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodLibraryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum workOrderTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum pseudoStateKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum variabilityTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType dateEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType uriEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType unlimitedNaturalEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType stringEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType setEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType sequenceEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType integerEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType floatEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.epf.uma.UmaPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private UmaPackageImpl() {
-		super(eNS_URI, UmaFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static UmaPackage init() {
-		if (isInited)
-			return (UmaPackage) EPackage.Registry.INSTANCE
-					.getEPackage(UmaPackage.eNS_URI);
-
-		// Obtain or create and register package
-		UmaPackageImpl theUmaPackage = (UmaPackageImpl) (EPackage.Registry.INSTANCE
-				.getEPackage(eNS_URI) instanceof UmaPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(eNS_URI)
-				: new UmaPackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theUmaPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theUmaPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theUmaPackage.freeze();
-
-		return theUmaPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getClassifier() {
-		return classifierEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getType() {
-		return typeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getElement() {
-		return elementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getNamedElement() {
-		return namedElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getNamedElement_Name() {
-		return (EAttribute) namedElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPackageableElement() {
-		return packageableElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPackage() {
-		return packageEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getNamespace() {
-		return namespaceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodElement() {
-		return methodElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodElement_Guid() {
-		return (EAttribute) methodElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodElement_BriefDescription() {
-		return (EAttribute) methodElementEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodElement_OwnedRules() {
-		return (EReference) methodElementEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodElement_MethodElementProperty() {
-		return (EReference) methodElementEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodElement_Suppressed() {
-		return (EAttribute) methodElementEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodElement_OrderingGuide() {
-		return (EAttribute) methodElementEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getConstraint() {
-		return constraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getConstraint_Body() {
-		return (EAttribute) constraintEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodElementProperty() {
-		return methodElementPropertyEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodElementProperty_Value() {
-		return (EAttribute) methodElementPropertyEClass
-				.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getContentElement() {
-		return contentElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContentElement_SupportingMaterials() {
-		return (EReference) contentElementEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContentElement_ConceptsAndPapers() {
-		return (EReference) contentElementEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContentElement_Checklists() {
-		return (EReference) contentElementEClass.getEStructuralFeatures()
-				.get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContentElement_Guidelines() {
-		return (EReference) contentElementEClass.getEStructuralFeatures()
-				.get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContentElement_Examples() {
-		return (EReference) contentElementEClass.getEStructuralFeatures()
-				.get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContentElement_Assets() {
-		return (EReference) contentElementEClass.getEStructuralFeatures()
-				.get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDescribableElement() {
-		return describableElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescribableElement_PresentationName() {
-		return (EAttribute) describableElementEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDescribableElement_Presentation() {
-		return (EReference) describableElementEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescribableElement_Shapeicon() {
-		return (EAttribute) describableElementEClass.getEStructuralFeatures()
-				.get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescribableElement_Nodeicon() {
-		return (EAttribute) describableElementEClass.getEStructuralFeatures()
-				.get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getContentDescription() {
-		return contentDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentDescription_MainDescription() {
-		return (EAttribute) contentDescriptionEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContentDescription_Sections() {
-		return (EReference) contentDescriptionEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentDescription_KeyConsiderations() {
-		return (EAttribute) contentDescriptionEClass.getEStructuralFeatures()
-				.get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSection() {
-		return sectionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSection_SectionName() {
-		return (EAttribute) sectionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSection_SectionDescription() {
-		return (EAttribute) sectionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSection_SubSections() {
-		return (EReference) sectionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSection_Predecessor() {
-		return (EReference) sectionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRole() {
-		return roleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRole_Modifies() {
-		return (EReference) roleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRole_ResponsibleFor() {
-		return (EReference) roleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkProduct() {
-		return workProductEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkProduct_Reports() {
-		return (EReference) workProductEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkProduct_Templates() {
-		return (EReference) workProductEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkProduct_ToolMentors() {
-		return (EReference) workProductEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkProduct_EstimationConsiderations() {
-		return (EReference) workProductEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTask() {
-		return taskEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTask_PerformedBy() {
-		return (EReference) taskEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTask_MandatoryInput() {
-		return (EReference) taskEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTask_Output() {
-		return (EReference) taskEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTask_AdditionallyPerformedBy() {
-		return (EReference) taskEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTask_OptionalInput() {
-		return (EReference) taskEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTask_Steps() {
-		return (EReference) taskEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTask_ToolMentors() {
-		return (EReference) taskEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTask_EstimationConsiderations() {
-		return (EReference) taskEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkDefinition() {
-		return workDefinitionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkDefinition_Precondition() {
-		return (EReference) workDefinitionEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkDefinition_Postcondition() {
-		return (EReference) workDefinitionEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getStep() {
-		return stepEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGuidance() {
-		return guidanceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getArtifact() {
-		return artifactEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getArtifact_ContainerArtifact() {
-		return (EReference) artifactEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getArtifact_ContainedArtifacts() {
-		return (EReference) artifactEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDeliverable() {
-		return deliverableEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDeliverable_DeliveredWorkProducts() {
-		return (EReference) deliverableEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOutcome() {
-		return outcomeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodPackage() {
-		return methodPackageEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodPackage_Global() {
-		return (EAttribute) methodPackageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodPackage_ReusedPackages() {
-		return (EReference) methodPackageEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodPackage_ChildPackages() {
-		return (EReference) methodPackageEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getContentPackage() {
-		return contentPackageEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContentPackage_ContentElements() {
-		return (EReference) contentPackageEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getArtifactDescription() {
-		return artifactDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getArtifactDescription_BriefOutline() {
-		return (EAttribute) artifactDescriptionEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getArtifactDescription_RepresentationOptions() {
-		return (EAttribute) artifactDescriptionEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkProductDescription() {
-		return workProductDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescription_ExternalId() {
-		return (EAttribute) workProductDescriptionEClass
-				.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescription_Purpose() {
-		return (EAttribute) workProductDescriptionEClass
-				.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescription_ImpactOfNotHaving() {
-		return (EAttribute) workProductDescriptionEClass
-				.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescription_ReasonsForNotNeeding() {
-		return (EAttribute) workProductDescriptionEClass
-				.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDeliverableDescription() {
-		return deliverableDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliverableDescription_ExternalDescription() {
-		return (EAttribute) deliverableDescriptionEClass
-				.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliverableDescription_PackagingGuidance() {
-		return (EAttribute) deliverableDescriptionEClass
-				.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRoleDescription() {
-		return roleDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRoleDescription_Skills() {
-		return (EAttribute) roleDescriptionEClass.getEStructuralFeatures().get(
-				0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRoleDescription_AssignmentApproaches() {
-		return (EAttribute) roleDescriptionEClass.getEStructuralFeatures().get(
-				1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRoleDescription_Synonyms() {
-		return (EAttribute) roleDescriptionEClass.getEStructuralFeatures().get(
-				2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTaskDescription() {
-		return taskDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskDescription_Purpose() {
-		return (EAttribute) taskDescriptionEClass.getEStructuralFeatures().get(
-				0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskDescription_Alternatives() {
-		return (EAttribute) taskDescriptionEClass.getEStructuralFeatures().get(
-				1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGuidanceDescription() {
-		return guidanceDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGuidanceDescription_Attachments() {
-		return (EAttribute) guidanceDescriptionEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPracticeDescription() {
-		return practiceDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPracticeDescription_AdditionalInfo() {
-		return (EAttribute) practiceDescriptionEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPracticeDescription_Problem() {
-		return (EAttribute) practiceDescriptionEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPracticeDescription_Background() {
-		return (EAttribute) practiceDescriptionEClass.getEStructuralFeatures()
-				.get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPracticeDescription_Goals() {
-		return (EAttribute) practiceDescriptionEClass.getEStructuralFeatures()
-				.get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPracticeDescription_Application() {
-		return (EAttribute) practiceDescriptionEClass.getEStructuralFeatures()
-				.get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPracticeDescription_LevelsOfAdoption() {
-		return (EAttribute) practiceDescriptionEClass.getEStructuralFeatures()
-				.get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPoint() {
-		return pointEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPoint_X() {
-		return (EAttribute) pointEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPoint_Y() {
-		return (EAttribute) pointEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGraphElement() {
-		return graphElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGraphElement_Position() {
-		return (EReference) graphElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGraphElement_Contained() {
-		return (EReference) graphElementEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGraphElement_Link() {
-		return (EReference) graphElementEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGraphElement_Anchorage() {
-		return (EReference) graphElementEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGraphElement_SemanticModel() {
-		return (EReference) graphElementEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDiagramElement() {
-		return diagramElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDiagramElement_IsVisible() {
-		return (EAttribute) diagramElementEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiagramElement_Container() {
-		return (EReference) diagramElementEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiagramElement_Reference() {
-		return (EReference) diagramElementEClass.getEStructuralFeatures()
-				.get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiagramElement_Property() {
-		return (EReference) diagramElementEClass.getEStructuralFeatures()
-				.get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDiagramLink() {
-		return diagramLinkEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDiagramLink_Zoom() {
-		return (EAttribute) diagramLinkEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiagramLink_Viewport() {
-		return (EReference) diagramLinkEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiagramLink_GraphElement() {
-		return (EReference) diagramLinkEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiagramLink_Diagram() {
-		return (EReference) diagramLinkEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGraphConnector() {
-		return graphConnectorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGraphConnector_GraphElement() {
-		return (EReference) graphConnectorEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGraphConnector_GraphEdge() {
-		return (EReference) graphConnectorEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSemanticModelBridge() {
-		return semanticModelBridgeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSemanticModelBridge_Presentation() {
-		return (EAttribute) semanticModelBridgeEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSemanticModelBridge_GraphElement() {
-		return (EReference) semanticModelBridgeEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSemanticModelBridge_Diagram() {
-		return (EReference) semanticModelBridgeEClass.getEStructuralFeatures()
-				.get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDimension() {
-		return dimensionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDimension_Width() {
-		return (EAttribute) dimensionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDimension_Height() {
-		return (EAttribute) dimensionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getReference() {
-		return referenceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getReference_IsIndividualRepresentation() {
-		return (EAttribute) referenceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getReference_Referenced() {
-		return (EReference) referenceEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProperty() {
-		return propertyEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProperty_Key() {
-		return (EAttribute) propertyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProperty_Value() {
-		return (EAttribute) propertyEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGraphEdge() {
-		return graphEdgeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGraphEdge_Anchor() {
-		return (EReference) graphEdgeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGraphEdge_Waypoints() {
-		return (EReference) graphEdgeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDiagram() {
-		return diagramEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDiagram_Zoom() {
-		return (EAttribute) diagramEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiagram_Viewpoint() {
-		return (EReference) diagramEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiagram_DiagramLink() {
-		return (EReference) diagramEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiagram_Namespace() {
-		return (EReference) diagramEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGraphNode() {
-		return graphNodeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGraphNode_Size() {
-		return (EReference) graphNodeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSimpleSemanticModelElement() {
-		return simpleSemanticModelElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSimpleSemanticModelElement_TypeInfo() {
-		return (EAttribute) simpleSemanticModelElementEClass
-				.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getUMASemanticModelBridge() {
-		return umaSemanticModelBridgeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getUMASemanticModelBridge_Element() {
-		return (EReference) umaSemanticModelBridgeEClass
-				.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCoreSemanticModelBridge() {
-		return coreSemanticModelBridgeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCoreSemanticModelBridge_Element() {
-		return (EReference) coreSemanticModelBridgeEClass
-				.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLeafElement() {
-		return leafElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTextElement() {
-		return textElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTextElement_Text() {
-		return (EAttribute) textElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getImage() {
-		return imageEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getImage_Uri() {
-		return (EAttribute) imageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getImage_MimeType() {
-		return (EAttribute) imageEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGraphicPrimitive() {
-		return graphicPrimitiveEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPolyline() {
-		return polylineEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPolyline_Closed() {
-		return (EAttribute) polylineEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPolyline_Waypoints() {
-		return (EReference) polylineEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEllipse() {
-		return ellipseEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEllipse_RadiusX() {
-		return (EAttribute) ellipseEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEllipse_RadiusY() {
-		return (EAttribute) ellipseEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEllipse_Rotation() {
-		return (EAttribute) ellipseEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEllipse_StartAngle() {
-		return (EAttribute) ellipseEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEllipse_EndAngle() {
-		return (EAttribute) ellipseEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEllipse_Center() {
-		return (EReference) ellipseEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getActivity() {
-		return activityEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivity_BreakdownElements() {
-		return (EReference) activityEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivity_Roadmaps() {
-		return (EReference) activityEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivity_SupportingMaterials() {
-		return (EReference) activityEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivity_Checklists() {
-		return (EReference) activityEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivity_Concepts() {
-		return (EReference) activityEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivity_Examples() {
-		return (EReference) activityEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivity_Guidelines() {
-		return (EReference) activityEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivity_ReusableAssets() {
-		return (EReference) activityEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivity_IsEnactable() {
-		return (EAttribute) activityEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkBreakdownElement() {
-		return workBreakdownElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkBreakdownElement_IsRepeatable() {
-		return (EAttribute) workBreakdownElementEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkBreakdownElement_IsOngoing() {
-		return (EAttribute) workBreakdownElementEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkBreakdownElement_IsEventDriven() {
-		return (EAttribute) workBreakdownElementEClass.getEStructuralFeatures()
-				.get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkBreakdownElement_LinkToPredecessor() {
-		return (EReference) workBreakdownElementEClass.getEStructuralFeatures()
-				.get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBreakdownElement() {
-		return breakdownElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBreakdownElement_Prefix() {
-		return (EAttribute) breakdownElementEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBreakdownElement_IsPlanned() {
-		return (EAttribute) breakdownElementEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBreakdownElement_HasMultipleOccurrences() {
-		return (EAttribute) breakdownElementEClass.getEStructuralFeatures()
-				.get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBreakdownElement_IsOptional() {
-		return (EAttribute) breakdownElementEClass.getEStructuralFeatures()
-				.get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBreakdownElement_PresentedAfter() {
-		return (EReference) breakdownElementEClass.getEStructuralFeatures()
-				.get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBreakdownElement_PresentedBefore() {
-		return (EReference) breakdownElementEClass.getEStructuralFeatures()
-				.get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBreakdownElement_PlanningData() {
-		return (EReference) breakdownElementEClass.getEStructuralFeatures()
-				.get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBreakdownElement_SuperActivities() {
-		return (EReference) breakdownElementEClass.getEStructuralFeatures()
-				.get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMilestone() {
-		return milestoneEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIteration() {
-		return iterationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPhase() {
-		return phaseEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTeamProfile() {
-		return teamProfileEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTeamProfile_TeamRoles() {
-		return (EReference) teamProfileEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTeamProfile_SuperTeam() {
-		return (EReference) teamProfileEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTeamProfile_SubTeam() {
-		return (EReference) teamProfileEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRoleDescriptor() {
-		return roleDescriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRoleDescriptor_Role() {
-		return (EReference) roleDescriptorEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRoleDescriptor_Modifies() {
-		return (EReference) roleDescriptorEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRoleDescriptor_ResponsibleFor() {
-		return (EReference) roleDescriptorEClass.getEStructuralFeatures()
-				.get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkOrder() {
-		return workOrderEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkOrder_LinkType() {
-		return (EAttribute) workOrderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkOrder_Pred() {
-		return (EReference) workOrderEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcessElement() {
-		return processElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPlanningData() {
-		return planningDataEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPlanningData_StartDate() {
-		return (EAttribute) planningDataEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPlanningData_FinishDate() {
-		return (EAttribute) planningDataEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPlanningData_Rank() {
-		return (EAttribute) planningDataEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDescriptor() {
-		return descriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescriptor_IsSynchronizedWithSource() {
-		return (EAttribute) descriptorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTaskDescriptor() {
-		return taskDescriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTaskDescriptor_Task() {
-		return (EReference) taskDescriptorEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTaskDescriptor_AdditionallyPerformedBy() {
-		return (EReference) taskDescriptorEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTaskDescriptor_AssistedBy() {
-		return (EReference) taskDescriptorEClass.getEStructuralFeatures()
-				.get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTaskDescriptor_ExternalInput() {
-		return (EReference) taskDescriptorEClass.getEStructuralFeatures()
-				.get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTaskDescriptor_MandatoryInput() {
-		return (EReference) taskDescriptorEClass.getEStructuralFeatures()
-				.get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTaskDescriptor_OptionalInput() {
-		return (EReference) taskDescriptorEClass.getEStructuralFeatures()
-				.get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTaskDescriptor_Output() {
-		return (EReference) taskDescriptorEClass.getEStructuralFeatures()
-				.get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTaskDescriptor_PerformedPrimarilyBy() {
-		return (EReference) taskDescriptorEClass.getEStructuralFeatures()
-				.get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTaskDescriptor_SelectedSteps() {
-		return (EReference) taskDescriptorEClass.getEStructuralFeatures()
-				.get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkProductDescriptor() {
-		return workProductDescriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescriptor_ActivityEntryState() {
-		return (EAttribute) workProductDescriptorEClass
-				.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescriptor_ActivityExitState() {
-		return (EAttribute) workProductDescriptorEClass
-				.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkProductDescriptor_WorkProduct() {
-		return (EReference) workProductDescriptorEClass
-				.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkProductDescriptor_ImpactedBy() {
-		return (EReference) workProductDescriptorEClass
-				.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkProductDescriptor_Impacts() {
-		return (EReference) workProductDescriptorEClass
-				.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkProductDescriptor_DeliverableParts() {
-		return (EReference) workProductDescriptorEClass
-				.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCompositeRole() {
-		return compositeRoleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCompositeRole_AggregatedRoles() {
-		return (EReference) compositeRoleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBreakdownElementDescription() {
-		return breakdownElementDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBreakdownElementDescription_UsageGuidance() {
-		return (EAttribute) breakdownElementDescriptionEClass
-				.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getActivityDescription() {
-		return activityDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivityDescription_Purpose() {
-		return (EAttribute) activityDescriptionEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivityDescription_Alternatives() {
-		return (EAttribute) activityDescriptionEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivityDescription_HowtoStaff() {
-		return (EAttribute) activityDescriptionEClass.getEStructuralFeatures()
-				.get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDeliveryProcessDescription() {
-		return deliveryProcessDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliveryProcessDescription_Scale() {
-		return (EAttribute) deliveryProcessDescriptionEClass
-				.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliveryProcessDescription_ProjectCharacteristics() {
-		return (EAttribute) deliveryProcessDescriptionEClass
-				.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliveryProcessDescription_RiskLevel() {
-		return (EAttribute) deliveryProcessDescriptionEClass
-				.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliveryProcessDescription_EstimatingTechnique() {
-		return (EAttribute) deliveryProcessDescriptionEClass
-				.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliveryProcessDescription_ProjectMemberExpertise() {
-		return (EAttribute) deliveryProcessDescriptionEClass
-				.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliveryProcessDescription_TypeOfContract() {
-		return (EAttribute) deliveryProcessDescriptionEClass
-				.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcessDescription() {
-		return processDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessDescription_ExternalId() {
-		return (EAttribute) processDescriptionEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessDescription_Scope() {
-		return (EAttribute) processDescriptionEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessDescription_UsageNotes() {
-		return (EAttribute) processDescriptionEClass.getEStructuralFeatures()
-				.get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDescriptorDescription() {
-		return descriptorDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescriptorDescription_RefinedDescription() {
-		return (EAttribute) descriptorDescriptionEClass
-				.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getConcept() {
-		return conceptEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getChecklist() {
-		return checklistEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExample() {
-		return exampleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGuideline() {
-		return guidelineEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEstimationConsiderations() {
-		return estimationConsiderationsEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getReport() {
-		return reportEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTemplate() {
-		return templateEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSupportingMaterial() {
-		return supportingMaterialEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getToolMentor() {
-		return toolMentorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWhitepaper() {
-		return whitepaperEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTermDefinition() {
-		return termDefinitionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPractice() {
-		return practiceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPractice_SubPractices() {
-		return (EReference) practiceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPractice_ContentReferences() {
-		return (EReference) practiceEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPractice_ActivityReferences() {
-		return (EReference) practiceEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getReusableAsset() {
-		return reusableAssetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getState() {
-		return stateEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getState_WorkProduct() {
-		return (EReference) stateEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getState_Region() {
-		return (EReference) stateEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getState_Submachine() {
-		return (EReference) stateEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getVertex() {
-		return vertexEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getVertex_Container() {
-		return (EReference) vertexEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getVertex_Outgoing() {
-		return (EReference) vertexEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getVertex_Incoming() {
-		return (EReference) vertexEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRegion() {
-		return regionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRegion_Vertex() {
-		return (EReference) regionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRegion_Transition() {
-		return (EReference) regionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRegion_State() {
-		return (EReference) regionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRegion_StateMachine() {
-		return (EReference) regionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getStateMachine() {
-		return stateMachineEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getStateMachine_Region() {
-		return (EReference) stateMachineEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTransition() {
-		return transitionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTransition_WorkDefinition() {
-		return (EReference) transitionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTransition_Container() {
-		return (EReference) transitionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTransition_Source() {
-		return (EReference) transitionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTransition_Target() {
-		return (EReference) transitionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPseudoState() {
-		return pseudoStateEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDiscipline() {
-		return disciplineEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiscipline_Tasks() {
-		return (EReference) disciplineEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiscipline_Subdiscipline() {
-		return (EReference) disciplineEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiscipline_ReferenceWorkflows() {
-		return (EReference) disciplineEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getContentCategory() {
-		return contentCategoryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRoleSet() {
-		return roleSetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRoleSet_Roles() {
-		return (EReference) roleSetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDomain() {
-		return domainEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDomain_WorkProducts() {
-		return (EReference) domainEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDomain_Subdomains() {
-		return (EReference) domainEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkProductType() {
-		return workProductTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkProductType_WorkProducts() {
-		return (EReference) workProductTypeEClass.getEStructuralFeatures().get(
-				0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDisciplineGrouping() {
-		return disciplineGroupingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDisciplineGrouping_Disciplines() {
-		return (EReference) disciplineGroupingEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTool() {
-		return toolEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTool_ToolMentors() {
-		return (EReference) toolEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRoleSetGrouping() {
-		return roleSetGroupingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRoleSetGrouping_RoleSets() {
-		return (EReference) roleSetGroupingEClass.getEStructuralFeatures().get(
-				0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCustomCategory() {
-		return customCategoryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCustomCategory_CategorizedElements() {
-		return (EReference) customCategoryEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCustomCategory_SubCategories() {
-		return (EReference) customCategoryEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDeliveryProcess() {
-		return deliveryProcessEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDeliveryProcess_EducationMaterials() {
-		return (EReference) deliveryProcessEClass.getEStructuralFeatures().get(
-				0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDeliveryProcess_CommunicationsMaterials() {
-		return (EReference) deliveryProcessEClass.getEStructuralFeatures().get(
-				1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcess() {
-		return processEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcess_IncludesPatterns() {
-		return (EReference) processEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcess_DefaultContext() {
-		return (EReference) processEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcess_ValidContext() {
-		return (EReference) processEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCapabilityPattern() {
-		return capabilityPatternEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcessPlanningTemplate() {
-		return processPlanningTemplateEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcessPlanningTemplate_BasedOnProcesses() {
-		return (EReference) processPlanningTemplateEClass
-				.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRoadmap() {
-		return roadmapEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcessComponent() {
-		return processComponentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcessComponent_Interfaces() {
-		return (EReference) processComponentEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcessComponent_Process() {
-		return (EReference) processComponentEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcessPackage() {
-		return processPackageEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcessPackage_ProcessElements() {
-		return (EReference) processPackageEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcessPackage_Diagrams() {
-		return (EReference) processPackageEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcessComponentInterface() {
-		return processComponentInterfaceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcessComponentInterface_InterfaceSpecifications() {
-		return (EReference) processComponentInterfaceEClass
-				.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcessComponentInterface_InterfaceIO() {
-		return (EReference) processComponentInterfaceEClass
-				.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcessComponentDescriptor() {
-		return processComponentDescriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcessComponentDescriptor_ProcessComponent() {
-		return (EReference) processComponentDescriptorEClass
-				.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodPlugin() {
-		return methodPluginEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodPlugin_UserChangeable() {
-		return (EAttribute) methodPluginEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodPlugin_MethodPackages() {
-		return (EReference) methodPluginEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodPlugin_Bases() {
-		return (EReference) methodPluginEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getVariabilityElement() {
-		return variabilityElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getVariabilityElement_VariabilityType() {
-		return (EAttribute) variabilityElementEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getVariabilityElement_VariabilityBasedOnElement() {
-		return (EReference) variabilityElementEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodUnit() {
-		return methodUnitEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodUnit_Authors() {
-		return (EAttribute) methodUnitEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodUnit_ChangeDate() {
-		return (EAttribute) methodUnitEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodUnit_ChangeDescription() {
-		return (EAttribute) methodUnitEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodUnit_Version() {
-		return (EAttribute) methodUnitEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodUnit_CopyrightStatement() {
-		return (EReference) methodUnitEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodConfiguration() {
-		return methodConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodConfiguration_MethodPluginSelection() {
-		return (EReference) methodConfigurationEClass.getEStructuralFeatures()
-				.get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodConfiguration_MethodPackageSelection() {
-		return (EReference) methodConfigurationEClass.getEStructuralFeatures()
-				.get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodConfiguration_ProcessViews() {
-		return (EReference) methodConfigurationEClass.getEStructuralFeatures()
-				.get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodConfiguration_DefaultView() {
-		return (EReference) methodConfigurationEClass.getEStructuralFeatures()
-				.get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodConfiguration_BaseConfigurations() {
-		return (EReference) methodConfigurationEClass.getEStructuralFeatures()
-				.get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodConfiguration_SubtractedCategory() {
-		return (EReference) methodConfigurationEClass.getEStructuralFeatures()
-				.get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodConfiguration_AddedCategory() {
-		return (EReference) methodConfigurationEClass.getEStructuralFeatures()
-				.get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcessFamily() {
-		return processFamilyEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcessFamily_DeliveryProcesses() {
-		return (EReference) processFamilyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodLibrary() {
-		return methodLibraryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodLibrary_MethodPlugins() {
-		return (EReference) methodLibraryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodLibrary_PredefinedConfigurations() {
-		return (EReference) methodLibraryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getWorkOrderType() {
-		return workOrderTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getPseudoStateKind() {
-		return pseudoStateKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getVariabilityType() {
-		return variabilityTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getDate() {
-		return dateEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getUri() {
-		return uriEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getUnlimitedNatural() {
-		return unlimitedNaturalEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getString() {
-		return stringEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getSet() {
-		return setEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getSequence() {
-		return sequenceEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getInteger() {
-		return integerEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getFloat() {
-		return floatEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UmaFactory getUmaFactory() {
-		return (UmaFactory) getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated)
-			return;
-		isCreated = true;
-
-		// Create classes and their features
-		classifierEClass = createEClass(CLASSIFIER);
-
-		typeEClass = createEClass(TYPE);
-
-		elementEClass = createEClass(ELEMENT);
-
-		namedElementEClass = createEClass(NAMED_ELEMENT);
-		createEAttribute(namedElementEClass, NAMED_ELEMENT__NAME);
-
-		packageableElementEClass = createEClass(PACKAGEABLE_ELEMENT);
-
-		packageEClass = createEClass(PACKAGE);
-
-		namespaceEClass = createEClass(NAMESPACE);
-
-		methodElementEClass = createEClass(METHOD_ELEMENT);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__GUID);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__BRIEF_DESCRIPTION);
-		createEReference(methodElementEClass, METHOD_ELEMENT__OWNED_RULES);
-		createEReference(methodElementEClass,
-				METHOD_ELEMENT__METHOD_ELEMENT_PROPERTY);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__SUPPRESSED);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__ORDERING_GUIDE);
-
-		constraintEClass = createEClass(CONSTRAINT);
-		createEAttribute(constraintEClass, CONSTRAINT__BODY);
-
-		methodElementPropertyEClass = createEClass(METHOD_ELEMENT_PROPERTY);
-		createEAttribute(methodElementPropertyEClass,
-				METHOD_ELEMENT_PROPERTY__VALUE);
-
-		contentElementEClass = createEClass(CONTENT_ELEMENT);
-		createEReference(contentElementEClass,
-				CONTENT_ELEMENT__SUPPORTING_MATERIALS);
-		createEReference(contentElementEClass,
-				CONTENT_ELEMENT__CONCEPTS_AND_PAPERS);
-		createEReference(contentElementEClass, CONTENT_ELEMENT__CHECKLISTS);
-		createEReference(contentElementEClass, CONTENT_ELEMENT__GUIDELINES);
-		createEReference(contentElementEClass, CONTENT_ELEMENT__EXAMPLES);
-		createEReference(contentElementEClass, CONTENT_ELEMENT__ASSETS);
-
-		describableElementEClass = createEClass(DESCRIBABLE_ELEMENT);
-		createEAttribute(describableElementEClass,
-				DESCRIBABLE_ELEMENT__PRESENTATION_NAME);
-		createEReference(describableElementEClass,
-				DESCRIBABLE_ELEMENT__PRESENTATION);
-		createEAttribute(describableElementEClass,
-				DESCRIBABLE_ELEMENT__SHAPEICON);
-		createEAttribute(describableElementEClass,
-				DESCRIBABLE_ELEMENT__NODEICON);
-
-		contentDescriptionEClass = createEClass(CONTENT_DESCRIPTION);
-		createEAttribute(contentDescriptionEClass,
-				CONTENT_DESCRIPTION__MAIN_DESCRIPTION);
-		createEReference(contentDescriptionEClass,
-				CONTENT_DESCRIPTION__SECTIONS);
-		createEAttribute(contentDescriptionEClass,
-				CONTENT_DESCRIPTION__KEY_CONSIDERATIONS);
-
-		sectionEClass = createEClass(SECTION);
-		createEAttribute(sectionEClass, SECTION__SECTION_NAME);
-		createEAttribute(sectionEClass, SECTION__SECTION_DESCRIPTION);
-		createEReference(sectionEClass, SECTION__SUB_SECTIONS);
-		createEReference(sectionEClass, SECTION__PREDECESSOR);
-
-		roleEClass = createEClass(ROLE);
-		createEReference(roleEClass, ROLE__MODIFIES);
-		createEReference(roleEClass, ROLE__RESPONSIBLE_FOR);
-
-		workProductEClass = createEClass(WORK_PRODUCT);
-		createEReference(workProductEClass, WORK_PRODUCT__REPORTS);
-		createEReference(workProductEClass, WORK_PRODUCT__TEMPLATES);
-		createEReference(workProductEClass, WORK_PRODUCT__TOOL_MENTORS);
-		createEReference(workProductEClass,
-				WORK_PRODUCT__ESTIMATION_CONSIDERATIONS);
-
-		taskEClass = createEClass(TASK);
-		createEReference(taskEClass, TASK__PERFORMED_BY);
-		createEReference(taskEClass, TASK__MANDATORY_INPUT);
-		createEReference(taskEClass, TASK__OUTPUT);
-		createEReference(taskEClass, TASK__ADDITIONALLY_PERFORMED_BY);
-		createEReference(taskEClass, TASK__OPTIONAL_INPUT);
-		createEReference(taskEClass, TASK__STEPS);
-		createEReference(taskEClass, TASK__TOOL_MENTORS);
-		createEReference(taskEClass, TASK__ESTIMATION_CONSIDERATIONS);
-
-		workDefinitionEClass = createEClass(WORK_DEFINITION);
-		createEReference(workDefinitionEClass, WORK_DEFINITION__PRECONDITION);
-		createEReference(workDefinitionEClass, WORK_DEFINITION__POSTCONDITION);
-
-		stepEClass = createEClass(STEP);
-
-		guidanceEClass = createEClass(GUIDANCE);
-
-		artifactEClass = createEClass(ARTIFACT);
-		createEReference(artifactEClass, ARTIFACT__CONTAINER_ARTIFACT);
-		createEReference(artifactEClass, ARTIFACT__CONTAINED_ARTIFACTS);
-
-		deliverableEClass = createEClass(DELIVERABLE);
-		createEReference(deliverableEClass,
-				DELIVERABLE__DELIVERED_WORK_PRODUCTS);
-
-		outcomeEClass = createEClass(OUTCOME);
-
-		methodPackageEClass = createEClass(METHOD_PACKAGE);
-		createEAttribute(methodPackageEClass, METHOD_PACKAGE__GLOBAL);
-		createEReference(methodPackageEClass, METHOD_PACKAGE__REUSED_PACKAGES);
-		createEReference(methodPackageEClass, METHOD_PACKAGE__CHILD_PACKAGES);
-
-		contentPackageEClass = createEClass(CONTENT_PACKAGE);
-		createEReference(contentPackageEClass,
-				CONTENT_PACKAGE__CONTENT_ELEMENTS);
-
-		artifactDescriptionEClass = createEClass(ARTIFACT_DESCRIPTION);
-		createEAttribute(artifactDescriptionEClass,
-				ARTIFACT_DESCRIPTION__BRIEF_OUTLINE);
-		createEAttribute(artifactDescriptionEClass,
-				ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS);
-
-		workProductDescriptionEClass = createEClass(WORK_PRODUCT_DESCRIPTION);
-		createEAttribute(workProductDescriptionEClass,
-				WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID);
-		createEAttribute(workProductDescriptionEClass,
-				WORK_PRODUCT_DESCRIPTION__PURPOSE);
-		createEAttribute(workProductDescriptionEClass,
-				WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING);
-		createEAttribute(workProductDescriptionEClass,
-				WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING);
-
-		deliverableDescriptionEClass = createEClass(DELIVERABLE_DESCRIPTION);
-		createEAttribute(deliverableDescriptionEClass,
-				DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION);
-		createEAttribute(deliverableDescriptionEClass,
-				DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE);
-
-		roleDescriptionEClass = createEClass(ROLE_DESCRIPTION);
-		createEAttribute(roleDescriptionEClass, ROLE_DESCRIPTION__SKILLS);
-		createEAttribute(roleDescriptionEClass,
-				ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES);
-		createEAttribute(roleDescriptionEClass, ROLE_DESCRIPTION__SYNONYMS);
-
-		taskDescriptionEClass = createEClass(TASK_DESCRIPTION);
-		createEAttribute(taskDescriptionEClass, TASK_DESCRIPTION__PURPOSE);
-		createEAttribute(taskDescriptionEClass, TASK_DESCRIPTION__ALTERNATIVES);
-
-		guidanceDescriptionEClass = createEClass(GUIDANCE_DESCRIPTION);
-		createEAttribute(guidanceDescriptionEClass,
-				GUIDANCE_DESCRIPTION__ATTACHMENTS);
-
-		practiceDescriptionEClass = createEClass(PRACTICE_DESCRIPTION);
-		createEAttribute(practiceDescriptionEClass,
-				PRACTICE_DESCRIPTION__ADDITIONAL_INFO);
-		createEAttribute(practiceDescriptionEClass,
-				PRACTICE_DESCRIPTION__PROBLEM);
-		createEAttribute(practiceDescriptionEClass,
-				PRACTICE_DESCRIPTION__BACKGROUND);
-		createEAttribute(practiceDescriptionEClass, PRACTICE_DESCRIPTION__GOALS);
-		createEAttribute(practiceDescriptionEClass,
-				PRACTICE_DESCRIPTION__APPLICATION);
-		createEAttribute(practiceDescriptionEClass,
-				PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION);
-
-		pointEClass = createEClass(POINT);
-		createEAttribute(pointEClass, POINT__X);
-		createEAttribute(pointEClass, POINT__Y);
-
-		graphElementEClass = createEClass(GRAPH_ELEMENT);
-		createEReference(graphElementEClass, GRAPH_ELEMENT__POSITION);
-		createEReference(graphElementEClass, GRAPH_ELEMENT__CONTAINED);
-		createEReference(graphElementEClass, GRAPH_ELEMENT__LINK);
-		createEReference(graphElementEClass, GRAPH_ELEMENT__ANCHORAGE);
-		createEReference(graphElementEClass, GRAPH_ELEMENT__SEMANTIC_MODEL);
-
-		diagramElementEClass = createEClass(DIAGRAM_ELEMENT);
-		createEAttribute(diagramElementEClass, DIAGRAM_ELEMENT__IS_VISIBLE);
-		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__CONTAINER);
-		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__REFERENCE);
-		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__PROPERTY);
-
-		diagramLinkEClass = createEClass(DIAGRAM_LINK);
-		createEAttribute(diagramLinkEClass, DIAGRAM_LINK__ZOOM);
-		createEReference(diagramLinkEClass, DIAGRAM_LINK__VIEWPORT);
-		createEReference(diagramLinkEClass, DIAGRAM_LINK__GRAPH_ELEMENT);
-		createEReference(diagramLinkEClass, DIAGRAM_LINK__DIAGRAM);
-
-		graphConnectorEClass = createEClass(GRAPH_CONNECTOR);
-		createEReference(graphConnectorEClass, GRAPH_CONNECTOR__GRAPH_ELEMENT);
-		createEReference(graphConnectorEClass, GRAPH_CONNECTOR__GRAPH_EDGE);
-
-		semanticModelBridgeEClass = createEClass(SEMANTIC_MODEL_BRIDGE);
-		createEAttribute(semanticModelBridgeEClass,
-				SEMANTIC_MODEL_BRIDGE__PRESENTATION);
-		createEReference(semanticModelBridgeEClass,
-				SEMANTIC_MODEL_BRIDGE__GRAPH_ELEMENT);
-		createEReference(semanticModelBridgeEClass,
-				SEMANTIC_MODEL_BRIDGE__DIAGRAM);
-
-		dimensionEClass = createEClass(DIMENSION);
-		createEAttribute(dimensionEClass, DIMENSION__WIDTH);
-		createEAttribute(dimensionEClass, DIMENSION__HEIGHT);
-
-		referenceEClass = createEClass(REFERENCE);
-		createEAttribute(referenceEClass,
-				REFERENCE__IS_INDIVIDUAL_REPRESENTATION);
-		createEReference(referenceEClass, REFERENCE__REFERENCED);
-
-		propertyEClass = createEClass(PROPERTY);
-		createEAttribute(propertyEClass, PROPERTY__KEY);
-		createEAttribute(propertyEClass, PROPERTY__VALUE);
-
-		graphEdgeEClass = createEClass(GRAPH_EDGE);
-		createEReference(graphEdgeEClass, GRAPH_EDGE__ANCHOR);
-		createEReference(graphEdgeEClass, GRAPH_EDGE__WAYPOINTS);
-
-		diagramEClass = createEClass(DIAGRAM);
-		createEAttribute(diagramEClass, DIAGRAM__ZOOM);
-		createEReference(diagramEClass, DIAGRAM__VIEWPOINT);
-		createEReference(diagramEClass, DIAGRAM__DIAGRAM_LINK);
-		createEReference(diagramEClass, DIAGRAM__NAMESPACE);
-
-		graphNodeEClass = createEClass(GRAPH_NODE);
-		createEReference(graphNodeEClass, GRAPH_NODE__SIZE);
-
-		simpleSemanticModelElementEClass = createEClass(SIMPLE_SEMANTIC_MODEL_ELEMENT);
-		createEAttribute(simpleSemanticModelElementEClass,
-				SIMPLE_SEMANTIC_MODEL_ELEMENT__TYPE_INFO);
-
-		umaSemanticModelBridgeEClass = createEClass(UMA_SEMANTIC_MODEL_BRIDGE);
-		createEReference(umaSemanticModelBridgeEClass,
-				UMA_SEMANTIC_MODEL_BRIDGE__ELEMENT);
-
-		coreSemanticModelBridgeEClass = createEClass(CORE_SEMANTIC_MODEL_BRIDGE);
-		createEReference(coreSemanticModelBridgeEClass,
-				CORE_SEMANTIC_MODEL_BRIDGE__ELEMENT);
-
-		leafElementEClass = createEClass(LEAF_ELEMENT);
-
-		textElementEClass = createEClass(TEXT_ELEMENT);
-		createEAttribute(textElementEClass, TEXT_ELEMENT__TEXT);
-
-		imageEClass = createEClass(IMAGE);
-		createEAttribute(imageEClass, IMAGE__URI);
-		createEAttribute(imageEClass, IMAGE__MIME_TYPE);
-
-		graphicPrimitiveEClass = createEClass(GRAPHIC_PRIMITIVE);
-
-		polylineEClass = createEClass(POLYLINE);
-		createEAttribute(polylineEClass, POLYLINE__CLOSED);
-		createEReference(polylineEClass, POLYLINE__WAYPOINTS);
-
-		ellipseEClass = createEClass(ELLIPSE);
-		createEAttribute(ellipseEClass, ELLIPSE__RADIUS_X);
-		createEAttribute(ellipseEClass, ELLIPSE__RADIUS_Y);
-		createEAttribute(ellipseEClass, ELLIPSE__ROTATION);
-		createEAttribute(ellipseEClass, ELLIPSE__START_ANGLE);
-		createEAttribute(ellipseEClass, ELLIPSE__END_ANGLE);
-		createEReference(ellipseEClass, ELLIPSE__CENTER);
-
-		activityEClass = createEClass(ACTIVITY);
-		createEReference(activityEClass, ACTIVITY__BREAKDOWN_ELEMENTS);
-		createEReference(activityEClass, ACTIVITY__ROADMAPS);
-		createEReference(activityEClass, ACTIVITY__SUPPORTING_MATERIALS);
-		createEReference(activityEClass, ACTIVITY__CHECKLISTS);
-		createEReference(activityEClass, ACTIVITY__CONCEPTS);
-		createEReference(activityEClass, ACTIVITY__EXAMPLES);
-		createEReference(activityEClass, ACTIVITY__GUIDELINES);
-		createEReference(activityEClass, ACTIVITY__REUSABLE_ASSETS);
-		createEAttribute(activityEClass, ACTIVITY__IS_ENACTABLE);
-
-		workBreakdownElementEClass = createEClass(WORK_BREAKDOWN_ELEMENT);
-		createEAttribute(workBreakdownElementEClass,
-				WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE);
-		createEAttribute(workBreakdownElementEClass,
-				WORK_BREAKDOWN_ELEMENT__IS_ONGOING);
-		createEAttribute(workBreakdownElementEClass,
-				WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN);
-		createEReference(workBreakdownElementEClass,
-				WORK_BREAKDOWN_ELEMENT__LINK_TO_PREDECESSOR);
-
-		breakdownElementEClass = createEClass(BREAKDOWN_ELEMENT);
-		createEAttribute(breakdownElementEClass, BREAKDOWN_ELEMENT__PREFIX);
-		createEAttribute(breakdownElementEClass, BREAKDOWN_ELEMENT__IS_PLANNED);
-		createEAttribute(breakdownElementEClass,
-				BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES);
-		createEAttribute(breakdownElementEClass, BREAKDOWN_ELEMENT__IS_OPTIONAL);
-		createEReference(breakdownElementEClass,
-				BREAKDOWN_ELEMENT__PRESENTED_AFTER);
-		createEReference(breakdownElementEClass,
-				BREAKDOWN_ELEMENT__PRESENTED_BEFORE);
-		createEReference(breakdownElementEClass,
-				BREAKDOWN_ELEMENT__PLANNING_DATA);
-		createEReference(breakdownElementEClass,
-				BREAKDOWN_ELEMENT__SUPER_ACTIVITIES);
-
-		milestoneEClass = createEClass(MILESTONE);
-
-		iterationEClass = createEClass(ITERATION);
-
-		phaseEClass = createEClass(PHASE);
-
-		teamProfileEClass = createEClass(TEAM_PROFILE);
-		createEReference(teamProfileEClass, TEAM_PROFILE__TEAM_ROLES);
-		createEReference(teamProfileEClass, TEAM_PROFILE__SUPER_TEAM);
-		createEReference(teamProfileEClass, TEAM_PROFILE__SUB_TEAM);
-
-		roleDescriptorEClass = createEClass(ROLE_DESCRIPTOR);
-		createEReference(roleDescriptorEClass, ROLE_DESCRIPTOR__ROLE);
-		createEReference(roleDescriptorEClass, ROLE_DESCRIPTOR__MODIFIES);
-		createEReference(roleDescriptorEClass, ROLE_DESCRIPTOR__RESPONSIBLE_FOR);
-
-		workOrderEClass = createEClass(WORK_ORDER);
-		createEAttribute(workOrderEClass, WORK_ORDER__LINK_TYPE);
-		createEReference(workOrderEClass, WORK_ORDER__PRED);
-
-		processElementEClass = createEClass(PROCESS_ELEMENT);
-
-		planningDataEClass = createEClass(PLANNING_DATA);
-		createEAttribute(planningDataEClass, PLANNING_DATA__START_DATE);
-		createEAttribute(planningDataEClass, PLANNING_DATA__FINISH_DATE);
-		createEAttribute(planningDataEClass, PLANNING_DATA__RANK);
-
-		descriptorEClass = createEClass(DESCRIPTOR);
-		createEAttribute(descriptorEClass,
-				DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE);
-
-		workProductDescriptorEClass = createEClass(WORK_PRODUCT_DESCRIPTOR);
-		createEAttribute(workProductDescriptorEClass,
-				WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE);
-		createEAttribute(workProductDescriptorEClass,
-				WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE);
-		createEReference(workProductDescriptorEClass,
-				WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT);
-		createEReference(workProductDescriptorEClass,
-				WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY);
-		createEReference(workProductDescriptorEClass,
-				WORK_PRODUCT_DESCRIPTOR__IMPACTS);
-		createEReference(workProductDescriptorEClass,
-				WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS);
-
-		taskDescriptorEClass = createEClass(TASK_DESCRIPTOR);
-		createEReference(taskDescriptorEClass, TASK_DESCRIPTOR__TASK);
-		createEReference(taskDescriptorEClass,
-				TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY);
-		createEReference(taskDescriptorEClass, TASK_DESCRIPTOR__ASSISTED_BY);
-		createEReference(taskDescriptorEClass, TASK_DESCRIPTOR__EXTERNAL_INPUT);
-		createEReference(taskDescriptorEClass, TASK_DESCRIPTOR__MANDATORY_INPUT);
-		createEReference(taskDescriptorEClass, TASK_DESCRIPTOR__OPTIONAL_INPUT);
-		createEReference(taskDescriptorEClass, TASK_DESCRIPTOR__OUTPUT);
-		createEReference(taskDescriptorEClass,
-				TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY);
-		createEReference(taskDescriptorEClass, TASK_DESCRIPTOR__SELECTED_STEPS);
-
-		compositeRoleEClass = createEClass(COMPOSITE_ROLE);
-		createEReference(compositeRoleEClass, COMPOSITE_ROLE__AGGREGATED_ROLES);
-
-		breakdownElementDescriptionEClass = createEClass(BREAKDOWN_ELEMENT_DESCRIPTION);
-		createEAttribute(breakdownElementDescriptionEClass,
-				BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE);
-
-		activityDescriptionEClass = createEClass(ACTIVITY_DESCRIPTION);
-		createEAttribute(activityDescriptionEClass,
-				ACTIVITY_DESCRIPTION__PURPOSE);
-		createEAttribute(activityDescriptionEClass,
-				ACTIVITY_DESCRIPTION__ALTERNATIVES);
-		createEAttribute(activityDescriptionEClass,
-				ACTIVITY_DESCRIPTION__HOWTO_STAFF);
-
-		deliveryProcessDescriptionEClass = createEClass(DELIVERY_PROCESS_DESCRIPTION);
-		createEAttribute(deliveryProcessDescriptionEClass,
-				DELIVERY_PROCESS_DESCRIPTION__SCALE);
-		createEAttribute(deliveryProcessDescriptionEClass,
-				DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS);
-		createEAttribute(deliveryProcessDescriptionEClass,
-				DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL);
-		createEAttribute(deliveryProcessDescriptionEClass,
-				DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE);
-		createEAttribute(deliveryProcessDescriptionEClass,
-				DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE);
-		createEAttribute(deliveryProcessDescriptionEClass,
-				DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT);
-
-		processDescriptionEClass = createEClass(PROCESS_DESCRIPTION);
-		createEAttribute(processDescriptionEClass,
-				PROCESS_DESCRIPTION__EXTERNAL_ID);
-		createEAttribute(processDescriptionEClass, PROCESS_DESCRIPTION__SCOPE);
-		createEAttribute(processDescriptionEClass,
-				PROCESS_DESCRIPTION__USAGE_NOTES);
-
-		descriptorDescriptionEClass = createEClass(DESCRIPTOR_DESCRIPTION);
-		createEAttribute(descriptorDescriptionEClass,
-				DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION);
-
-		conceptEClass = createEClass(CONCEPT);
-
-		checklistEClass = createEClass(CHECKLIST);
-
-		exampleEClass = createEClass(EXAMPLE);
-
-		guidelineEClass = createEClass(GUIDELINE);
-
-		reportEClass = createEClass(REPORT);
-
-		templateEClass = createEClass(TEMPLATE);
-
-		supportingMaterialEClass = createEClass(SUPPORTING_MATERIAL);
-
-		toolMentorEClass = createEClass(TOOL_MENTOR);
-
-		whitepaperEClass = createEClass(WHITEPAPER);
-
-		termDefinitionEClass = createEClass(TERM_DEFINITION);
-
-		practiceEClass = createEClass(PRACTICE);
-		createEReference(practiceEClass, PRACTICE__SUB_PRACTICES);
-		createEReference(practiceEClass, PRACTICE__CONTENT_REFERENCES);
-		createEReference(practiceEClass, PRACTICE__ACTIVITY_REFERENCES);
-
-		estimationConsiderationsEClass = createEClass(ESTIMATION_CONSIDERATIONS);
-
-		reusableAssetEClass = createEClass(REUSABLE_ASSET);
-
-		stateEClass = createEClass(STATE);
-		createEReference(stateEClass, STATE__WORK_PRODUCT);
-		createEReference(stateEClass, STATE__REGION);
-		createEReference(stateEClass, STATE__SUBMACHINE);
-
-		vertexEClass = createEClass(VERTEX);
-		createEReference(vertexEClass, VERTEX__CONTAINER);
-		createEReference(vertexEClass, VERTEX__OUTGOING);
-		createEReference(vertexEClass, VERTEX__INCOMING);
-
-		regionEClass = createEClass(REGION);
-		createEReference(regionEClass, REGION__VERTEX);
-		createEReference(regionEClass, REGION__TRANSITION);
-		createEReference(regionEClass, REGION__STATE);
-		createEReference(regionEClass, REGION__STATE_MACHINE);
-
-		stateMachineEClass = createEClass(STATE_MACHINE);
-		createEReference(stateMachineEClass, STATE_MACHINE__REGION);
-
-		transitionEClass = createEClass(TRANSITION);
-		createEReference(transitionEClass, TRANSITION__WORK_DEFINITION);
-		createEReference(transitionEClass, TRANSITION__CONTAINER);
-		createEReference(transitionEClass, TRANSITION__SOURCE);
-		createEReference(transitionEClass, TRANSITION__TARGET);
-
-		pseudoStateEClass = createEClass(PSEUDO_STATE);
-
-		disciplineEClass = createEClass(DISCIPLINE);
-		createEReference(disciplineEClass, DISCIPLINE__TASKS);
-		createEReference(disciplineEClass, DISCIPLINE__SUBDISCIPLINE);
-		createEReference(disciplineEClass, DISCIPLINE__REFERENCE_WORKFLOWS);
-
-		contentCategoryEClass = createEClass(CONTENT_CATEGORY);
-
-		roleSetEClass = createEClass(ROLE_SET);
-		createEReference(roleSetEClass, ROLE_SET__ROLES);
-
-		domainEClass = createEClass(DOMAIN);
-		createEReference(domainEClass, DOMAIN__WORK_PRODUCTS);
-		createEReference(domainEClass, DOMAIN__SUBDOMAINS);
-
-		workProductTypeEClass = createEClass(WORK_PRODUCT_TYPE);
-		createEReference(workProductTypeEClass,
-				WORK_PRODUCT_TYPE__WORK_PRODUCTS);
-
-		disciplineGroupingEClass = createEClass(DISCIPLINE_GROUPING);
-		createEReference(disciplineGroupingEClass,
-				DISCIPLINE_GROUPING__DISCIPLINES);
-
-		toolEClass = createEClass(TOOL);
-		createEReference(toolEClass, TOOL__TOOL_MENTORS);
-
-		roleSetGroupingEClass = createEClass(ROLE_SET_GROUPING);
-		createEReference(roleSetGroupingEClass, ROLE_SET_GROUPING__ROLE_SETS);
-
-		customCategoryEClass = createEClass(CUSTOM_CATEGORY);
-		createEReference(customCategoryEClass,
-				CUSTOM_CATEGORY__CATEGORIZED_ELEMENTS);
-		createEReference(customCategoryEClass, CUSTOM_CATEGORY__SUB_CATEGORIES);
-
-		deliveryProcessEClass = createEClass(DELIVERY_PROCESS);
-		createEReference(deliveryProcessEClass,
-				DELIVERY_PROCESS__EDUCATION_MATERIALS);
-		createEReference(deliveryProcessEClass,
-				DELIVERY_PROCESS__COMMUNICATIONS_MATERIALS);
-
-		processEClass = createEClass(PROCESS);
-		createEReference(processEClass, PROCESS__INCLUDES_PATTERNS);
-		createEReference(processEClass, PROCESS__DEFAULT_CONTEXT);
-		createEReference(processEClass, PROCESS__VALID_CONTEXT);
-
-		capabilityPatternEClass = createEClass(CAPABILITY_PATTERN);
-
-		processPlanningTemplateEClass = createEClass(PROCESS_PLANNING_TEMPLATE);
-		createEReference(processPlanningTemplateEClass,
-				PROCESS_PLANNING_TEMPLATE__BASED_ON_PROCESSES);
-
-		roadmapEClass = createEClass(ROADMAP);
-
-		processComponentEClass = createEClass(PROCESS_COMPONENT);
-		createEReference(processComponentEClass, PROCESS_COMPONENT__INTERFACES);
-		createEReference(processComponentEClass, PROCESS_COMPONENT__PROCESS);
-
-		processPackageEClass = createEClass(PROCESS_PACKAGE);
-		createEReference(processPackageEClass,
-				PROCESS_PACKAGE__PROCESS_ELEMENTS);
-		createEReference(processPackageEClass, PROCESS_PACKAGE__DIAGRAMS);
-
-		processComponentInterfaceEClass = createEClass(PROCESS_COMPONENT_INTERFACE);
-		createEReference(processComponentInterfaceEClass,
-				PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATIONS);
-		createEReference(processComponentInterfaceEClass,
-				PROCESS_COMPONENT_INTERFACE__INTERFACE_IO);
-
-		processComponentDescriptorEClass = createEClass(PROCESS_COMPONENT_DESCRIPTOR);
-		createEReference(processComponentDescriptorEClass,
-				PROCESS_COMPONENT_DESCRIPTOR__PROCESS_COMPONENT);
-
-		methodPluginEClass = createEClass(METHOD_PLUGIN);
-		createEAttribute(methodPluginEClass, METHOD_PLUGIN__USER_CHANGEABLE);
-		createEReference(methodPluginEClass, METHOD_PLUGIN__METHOD_PACKAGES);
-		createEReference(methodPluginEClass, METHOD_PLUGIN__BASES);
-
-		variabilityElementEClass = createEClass(VARIABILITY_ELEMENT);
-		createEAttribute(variabilityElementEClass,
-				VARIABILITY_ELEMENT__VARIABILITY_TYPE);
-		createEReference(variabilityElementEClass,
-				VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT);
-
-		methodUnitEClass = createEClass(METHOD_UNIT);
-		createEAttribute(methodUnitEClass, METHOD_UNIT__AUTHORS);
-		createEAttribute(methodUnitEClass, METHOD_UNIT__CHANGE_DATE);
-		createEAttribute(methodUnitEClass, METHOD_UNIT__CHANGE_DESCRIPTION);
-		createEAttribute(methodUnitEClass, METHOD_UNIT__VERSION);
-		createEReference(methodUnitEClass, METHOD_UNIT__COPYRIGHT_STATEMENT);
-
-		methodConfigurationEClass = createEClass(METHOD_CONFIGURATION);
-		createEReference(methodConfigurationEClass,
-				METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION);
-		createEReference(methodConfigurationEClass,
-				METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION);
-		createEReference(methodConfigurationEClass,
-				METHOD_CONFIGURATION__PROCESS_VIEWS);
-		createEReference(methodConfigurationEClass,
-				METHOD_CONFIGURATION__DEFAULT_VIEW);
-		createEReference(methodConfigurationEClass,
-				METHOD_CONFIGURATION__BASE_CONFIGURATIONS);
-		createEReference(methodConfigurationEClass,
-				METHOD_CONFIGURATION__SUBTRACTED_CATEGORY);
-		createEReference(methodConfigurationEClass,
-				METHOD_CONFIGURATION__ADDED_CATEGORY);
-
-		processFamilyEClass = createEClass(PROCESS_FAMILY);
-		createEReference(processFamilyEClass,
-				PROCESS_FAMILY__DELIVERY_PROCESSES);
-
-		methodLibraryEClass = createEClass(METHOD_LIBRARY);
-		createEReference(methodLibraryEClass, METHOD_LIBRARY__METHOD_PLUGINS);
-		createEReference(methodLibraryEClass,
-				METHOD_LIBRARY__PREDEFINED_CONFIGURATIONS);
-
-		// Create enums
-		workOrderTypeEEnum = createEEnum(WORK_ORDER_TYPE);
-		pseudoStateKindEEnum = createEEnum(PSEUDO_STATE_KIND);
-		variabilityTypeEEnum = createEEnum(VARIABILITY_TYPE);
-
-		// Create data types
-		dateEDataType = createEDataType(DATE);
-		uriEDataType = createEDataType(URI);
-		unlimitedNaturalEDataType = createEDataType(UNLIMITED_NATURAL);
-		stringEDataType = createEDataType(STRING);
-		setEDataType = createEDataType(SET);
-		sequenceEDataType = createEDataType(SEQUENCE);
-		integerEDataType = createEDataType(INTEGER);
-		floatEDataType = createEDataType(FLOAT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized)
-			return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Add supertypes to classes
-		classifierEClass.getESuperTypes().add(this.getType());
-		typeEClass.getESuperTypes().add(this.getPackageableElement());
-		namedElementEClass.getESuperTypes().add(this.getElement());
-		packageableElementEClass.getESuperTypes().add(this.getNamedElement());
-		packageEClass.getESuperTypes().add(this.getNamespace());
-		packageEClass.getESuperTypes().add(this.getPackageableElement());
-		namespaceEClass.getESuperTypes().add(this.getNamedElement());
-		methodElementEClass.getESuperTypes().add(this.getPackageableElement());
-		constraintEClass.getESuperTypes().add(this.getMethodElement());
-		methodElementPropertyEClass.getESuperTypes().add(
-				this.getPackageableElement());
-		contentElementEClass.getESuperTypes().add(this.getDescribableElement());
-		contentElementEClass.getESuperTypes().add(this.getVariabilityElement());
-		describableElementEClass.getESuperTypes().add(this.getMethodElement());
-		describableElementEClass.getESuperTypes().add(this.getClassifier());
-		contentDescriptionEClass.getESuperTypes().add(this.getMethodUnit());
-		sectionEClass.getESuperTypes().add(this.getVariabilityElement());
-		roleEClass.getESuperTypes().add(this.getContentElement());
-		workProductEClass.getESuperTypes().add(this.getContentElement());
-		taskEClass.getESuperTypes().add(this.getContentElement());
-		taskEClass.getESuperTypes().add(this.getWorkDefinition());
-		workDefinitionEClass.getESuperTypes().add(this.getMethodElement());
-		stepEClass.getESuperTypes().add(this.getSection());
-		stepEClass.getESuperTypes().add(this.getWorkDefinition());
-		guidanceEClass.getESuperTypes().add(this.getContentElement());
-		artifactEClass.getESuperTypes().add(this.getWorkProduct());
-		deliverableEClass.getESuperTypes().add(this.getWorkProduct());
-		outcomeEClass.getESuperTypes().add(this.getWorkProduct());
-		methodPackageEClass.getESuperTypes().add(this.getMethodElement());
-		methodPackageEClass.getESuperTypes().add(this.getPackage());
-		contentPackageEClass.getESuperTypes().add(this.getMethodPackage());
-		artifactDescriptionEClass.getESuperTypes().add(
-				this.getWorkProductDescription());
-		workProductDescriptionEClass.getESuperTypes().add(
-				this.getContentDescription());
-		deliverableDescriptionEClass.getESuperTypes().add(
-				this.getWorkProductDescription());
-		roleDescriptionEClass.getESuperTypes()
-				.add(this.getContentDescription());
-		taskDescriptionEClass.getESuperTypes()
-				.add(this.getContentDescription());
-		guidanceDescriptionEClass.getESuperTypes().add(
-				this.getContentDescription());
-		practiceDescriptionEClass.getESuperTypes().add(
-				this.getContentDescription());
-		graphElementEClass.getESuperTypes().add(this.getDiagramElement());
-		diagramElementEClass.getESuperTypes().add(this.getMethodElement());
-		diagramLinkEClass.getESuperTypes().add(this.getDiagramElement());
-		graphConnectorEClass.getESuperTypes().add(this.getGraphElement());
-		semanticModelBridgeEClass.getESuperTypes()
-				.add(this.getDiagramElement());
-		referenceEClass.getESuperTypes().add(this.getDiagramElement());
-		propertyEClass.getESuperTypes().add(this.getDiagramElement());
-		graphEdgeEClass.getESuperTypes().add(this.getGraphElement());
-		diagramEClass.getESuperTypes().add(this.getGraphNode());
-		graphNodeEClass.getESuperTypes().add(this.getGraphElement());
-		simpleSemanticModelElementEClass.getESuperTypes().add(
-				this.getSemanticModelBridge());
-		umaSemanticModelBridgeEClass.getESuperTypes().add(
-				this.getSemanticModelBridge());
-		coreSemanticModelBridgeEClass.getESuperTypes().add(
-				this.getSemanticModelBridge());
-		leafElementEClass.getESuperTypes().add(this.getDiagramElement());
-		textElementEClass.getESuperTypes().add(this.getLeafElement());
-		imageEClass.getESuperTypes().add(this.getLeafElement());
-		graphicPrimitiveEClass.getESuperTypes().add(this.getLeafElement());
-		polylineEClass.getESuperTypes().add(this.getGraphicPrimitive());
-		ellipseEClass.getESuperTypes().add(this.getGraphicPrimitive());
-		activityEClass.getESuperTypes().add(this.getWorkBreakdownElement());
-		activityEClass.getESuperTypes().add(this.getVariabilityElement());
-		activityEClass.getESuperTypes().add(this.getWorkDefinition());
-		workBreakdownElementEClass.getESuperTypes().add(
-				this.getBreakdownElement());
-		breakdownElementEClass.getESuperTypes().add(this.getProcessElement());
-		milestoneEClass.getESuperTypes().add(this.getWorkBreakdownElement());
-		iterationEClass.getESuperTypes().add(this.getActivity());
-		phaseEClass.getESuperTypes().add(this.getActivity());
-		teamProfileEClass.getESuperTypes().add(this.getBreakdownElement());
-		roleDescriptorEClass.getESuperTypes().add(this.getDescriptor());
-		workOrderEClass.getESuperTypes().add(this.getProcessElement());
-		processElementEClass.getESuperTypes().add(this.getDescribableElement());
-		planningDataEClass.getESuperTypes().add(this.getProcessElement());
-		descriptorEClass.getESuperTypes().add(this.getBreakdownElement());
-		workProductDescriptorEClass.getESuperTypes().add(this.getDescriptor());
-		taskDescriptorEClass.getESuperTypes().add(
-				this.getWorkBreakdownElement());
-		taskDescriptorEClass.getESuperTypes().add(this.getDescriptor());
-		compositeRoleEClass.getESuperTypes().add(this.getRoleDescriptor());
-		breakdownElementDescriptionEClass.getESuperTypes().add(
-				this.getContentDescription());
-		activityDescriptionEClass.getESuperTypes().add(
-				this.getBreakdownElementDescription());
-		deliveryProcessDescriptionEClass.getESuperTypes().add(
-				this.getProcessDescription());
-		processDescriptionEClass.getESuperTypes().add(
-				this.getActivityDescription());
-		descriptorDescriptionEClass.getESuperTypes().add(
-				this.getBreakdownElementDescription());
-		conceptEClass.getESuperTypes().add(this.getGuidance());
-		checklistEClass.getESuperTypes().add(this.getGuidance());
-		exampleEClass.getESuperTypes().add(this.getGuidance());
-		guidelineEClass.getESuperTypes().add(this.getGuidance());
-		reportEClass.getESuperTypes().add(this.getGuidance());
-		templateEClass.getESuperTypes().add(this.getGuidance());
-		supportingMaterialEClass.getESuperTypes().add(this.getGuidance());
-		toolMentorEClass.getESuperTypes().add(this.getGuidance());
-		whitepaperEClass.getESuperTypes().add(this.getConcept());
-		termDefinitionEClass.getESuperTypes().add(this.getGuidance());
-		practiceEClass.getESuperTypes().add(this.getGuidance());
-		estimationConsiderationsEClass.getESuperTypes().add(this.getGuidance());
-		reusableAssetEClass.getESuperTypes().add(this.getGuidance());
-		stateEClass.getESuperTypes().add(this.getVertex());
-		stateMachineEClass.getESuperTypes().add(this.getWorkDefinition());
-		pseudoStateEClass.getESuperTypes().add(this.getVertex());
-		disciplineEClass.getESuperTypes().add(this.getContentCategory());
-		contentCategoryEClass.getESuperTypes().add(this.getContentElement());
-		roleSetEClass.getESuperTypes().add(this.getContentCategory());
-		domainEClass.getESuperTypes().add(this.getContentCategory());
-		workProductTypeEClass.getESuperTypes().add(this.getContentCategory());
-		disciplineGroupingEClass.getESuperTypes()
-				.add(this.getContentCategory());
-		toolEClass.getESuperTypes().add(this.getContentCategory());
-		roleSetGroupingEClass.getESuperTypes().add(this.getContentCategory());
-		customCategoryEClass.getESuperTypes().add(this.getContentCategory());
-		deliveryProcessEClass.getESuperTypes().add(this.getProcess());
-		processEClass.getESuperTypes().add(this.getActivity());
-		capabilityPatternEClass.getESuperTypes().add(this.getProcess());
-		processPlanningTemplateEClass.getESuperTypes().add(this.getProcess());
-		roadmapEClass.getESuperTypes().add(this.getGuidance());
-		processComponentEClass.getESuperTypes().add(this.getProcessPackage());
-		processComponentEClass.getESuperTypes().add(this.getMethodUnit());
-		processPackageEClass.getESuperTypes().add(this.getMethodPackage());
-		processComponentInterfaceEClass.getESuperTypes().add(
-				this.getBreakdownElement());
-		processComponentDescriptorEClass.getESuperTypes().add(
-				this.getDescriptor());
-		methodPluginEClass.getESuperTypes().add(this.getMethodUnit());
-		methodPluginEClass.getESuperTypes().add(this.getPackage());
-		variabilityElementEClass.getESuperTypes().add(this.getMethodElement());
-		methodUnitEClass.getESuperTypes().add(this.getMethodElement());
-		methodConfigurationEClass.getESuperTypes().add(this.getMethodUnit());
-		processFamilyEClass.getESuperTypes().add(this.getMethodConfiguration());
-		methodLibraryEClass.getESuperTypes().add(this.getMethodUnit());
-		methodLibraryEClass.getESuperTypes().add(this.getPackage());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(
-				classifierEClass,
-				Classifier.class,
-				"Classifier", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(typeEClass, Type.class,
-				"Type", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				elementEClass,
-				Element.class,
-				"Element", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				namedElementEClass,
-				NamedElement.class,
-				"NamedElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getNamedElement_Name(),
-				this.getString(),
-				"name", "", 0, 1, NamedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				packageableElementEClass,
-				PackageableElement.class,
-				"PackageableElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				packageEClass,
-				org.eclipse.epf.uma.Package.class,
-				"Package", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				namespaceEClass,
-				Namespace.class,
-				"Namespace", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				methodElementEClass,
-				MethodElement.class,
-				"MethodElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getMethodElement_Guid(),
-				this.getString(),
-				"guid", "", 0, 1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getMethodElement_BriefDescription(),
-				this.getString(),
-				"briefDescription", "", 0, 1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-				getMethodElement_OwnedRules(),
-				this.getConstraint(),
-				null,
-				"ownedRules", null, 0, -1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getMethodElement_MethodElementProperty(),
-				this.getMethodElementProperty(),
-				null,
-				"methodElementProperty", null, 0, -1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getMethodElement_Suppressed(),
-				ecorePackage.getEBooleanObject(),
-				"suppressed", "false", 0, 1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getMethodElement_OrderingGuide(),
-				this.getString(),
-				"orderingGuide", "", 0, 1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				constraintEClass,
-				Constraint.class,
-				"Constraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getConstraint_Body(),
-				this.getString(),
-				"body", "", 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				methodElementPropertyEClass,
-				MethodElementProperty.class,
-				"MethodElementProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getMethodElementProperty_Value(),
-				this.getString(),
-				"value", "", 0, 1, MethodElementProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				contentElementEClass,
-				ContentElement.class,
-				"ContentElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getContentElement_SupportingMaterials(),
-				this.getSupportingMaterial(),
-				null,
-				"supportingMaterials", null, 0, -1, ContentElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getContentElement_ConceptsAndPapers(),
-				this.getConcept(),
-				null,
-				"conceptsAndPapers", null, 0, -1, ContentElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getContentElement_Checklists(),
-				this.getChecklist(),
-				null,
-				"checklists", null, 0, -1, ContentElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getContentElement_Guidelines(),
-				this.getGuideline(),
-				null,
-				"guidelines", null, 0, -1, ContentElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getContentElement_Examples(),
-				this.getExample(),
-				null,
-				"examples", null, 0, -1, ContentElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getContentElement_Assets(),
-				this.getReusableAsset(),
-				null,
-				"assets", null, 0, -1, ContentElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				describableElementEClass,
-				DescribableElement.class,
-				"DescribableElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getDescribableElement_PresentationName(),
-				this.getString(),
-				"presentationName", "", 0, 1, DescribableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-				getDescribableElement_Presentation(),
-				this.getContentDescription(),
-				null,
-				"presentation", null, 0, 1, DescribableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getDescribableElement_Shapeicon(),
-				this.getUri(),
-				"shapeicon", null, 0, 1, DescribableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getDescribableElement_Nodeicon(),
-				this.getUri(),
-				"nodeicon", null, 0, 1, DescribableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				contentDescriptionEClass,
-				ContentDescription.class,
-				"ContentDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getContentDescription_MainDescription(),
-				this.getString(),
-				"mainDescription", "", 0, 1, ContentDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-				getContentDescription_Sections(),
-				this.getSection(),
-				null,
-				"sections", null, 0, -1, ContentDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getContentDescription_KeyConsiderations(),
-				this.getString(),
-				"keyConsiderations", "", 0, 1, ContentDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				sectionEClass,
-				Section.class,
-				"Section", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getSection_SectionName(),
-				this.getString(),
-				"sectionName", "", 0, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getSection_SectionDescription(),
-				this.getString(),
-				"sectionDescription", "", 0, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-				getSection_SubSections(),
-				this.getSection(),
-				null,
-				"subSections", null, 0, -1, Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getSection_Predecessor(),
-				this.getSection(),
-				null,
-				"predecessor", null, 0, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				roleEClass,
-				Role.class,
-				"Role", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getRole_Modifies(),
-				this.getWorkProduct(),
-				null,
-				"modifies", null, 0, -1, Role.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getRole_ResponsibleFor(),
-				this.getWorkProduct(),
-				null,
-				"responsibleFor", null, 0, -1, Role.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				workProductEClass,
-				WorkProduct.class,
-				"WorkProduct", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getWorkProduct_Reports(),
-				this.getReport(),
-				null,
-				"reports", null, 0, -1, WorkProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getWorkProduct_Templates(),
-				this.getTemplate(),
-				null,
-				"templates", null, 0, -1, WorkProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getWorkProduct_ToolMentors(),
-				this.getToolMentor(),
-				null,
-				"toolMentors", null, 0, -1, WorkProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getWorkProduct_EstimationConsiderations(),
-				this.getEstimationConsiderations(),
-				null,
-				"estimationConsiderations", null, 0, -1, WorkProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				taskEClass,
-				Task.class,
-				"Task", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getTask_PerformedBy(),
-				this.getRole(),
-				null,
-				"performedBy", null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTask_MandatoryInput(),
-				this.getWorkProduct(),
-				null,
-				"mandatoryInput", null, 0, -1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTask_Output(),
-				this.getWorkProduct(),
-				null,
-				"output", null, 0, -1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTask_AdditionallyPerformedBy(),
-				this.getRole(),
-				null,
-				"additionallyPerformedBy", null, 0, -1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTask_OptionalInput(),
-				this.getWorkProduct(),
-				null,
-				"optionalInput", null, 0, -1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTask_Steps(),
-				this.getStep(),
-				null,
-				"steps", null, 0, -1, Task.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTask_ToolMentors(),
-				this.getToolMentor(),
-				null,
-				"toolMentors", null, 0, -1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTask_EstimationConsiderations(),
-				this.getEstimationConsiderations(),
-				null,
-				"estimationConsiderations", null, 0, -1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				workDefinitionEClass,
-				WorkDefinition.class,
-				"WorkDefinition", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getWorkDefinition_Precondition(),
-				this.getConstraint(),
-				null,
-				"precondition", null, 0, 1, WorkDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getWorkDefinition_Postcondition(),
-				this.getConstraint(),
-				null,
-				"postcondition", null, 0, 1, WorkDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				stepEClass,
-				Step.class,
-				"Step", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				guidanceEClass,
-				Guidance.class,
-				"Guidance", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				artifactEClass,
-				Artifact.class,
-				"Artifact", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getArtifact_ContainerArtifact(),
-				this.getArtifact(),
-				this.getArtifact_ContainedArtifacts(),
-				"containerArtifact", null, 0, 1, Artifact.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getArtifact_ContainedArtifacts(),
-				this.getArtifact(),
-				this.getArtifact_ContainerArtifact(),
-				"containedArtifacts", null, 0, -1, Artifact.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				deliverableEClass,
-				Deliverable.class,
-				"Deliverable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getDeliverable_DeliveredWorkProducts(),
-				this.getWorkProduct(),
-				null,
-				"deliveredWorkProducts", null, 0, -1, Deliverable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				outcomeEClass,
-				Outcome.class,
-				"Outcome", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				methodPackageEClass,
-				MethodPackage.class,
-				"MethodPackage", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getMethodPackage_Global(),
-				ecorePackage.getEBooleanObject(),
-				"global", "false", 0, 1, MethodPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-				getMethodPackage_ReusedPackages(),
-				this.getMethodPackage(),
-				null,
-				"reusedPackages", null, 0, -1, MethodPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getMethodPackage_ChildPackages(),
-				this.getMethodPackage(),
-				null,
-				"childPackages", null, 0, -1, MethodPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				contentPackageEClass,
-				ContentPackage.class,
-				"ContentPackage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getContentPackage_ContentElements(),
-				this.getContentElement(),
-				null,
-				"contentElements", null, 0, -1, ContentPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				artifactDescriptionEClass,
-				ArtifactDescription.class,
-				"ArtifactDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getArtifactDescription_BriefOutline(),
-				this.getString(),
-				"briefOutline", "", 0, 1, ArtifactDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getArtifactDescription_RepresentationOptions(),
-				this.getString(),
-				"representationOptions", "", 0, 1, ArtifactDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				workProductDescriptionEClass,
-				WorkProductDescription.class,
-				"WorkProductDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getWorkProductDescription_ExternalId(),
-				this.getString(),
-				"externalId", "", 0, 1, WorkProductDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getWorkProductDescription_Purpose(),
-				this.getString(),
-				"purpose", "", 0, 1, WorkProductDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getWorkProductDescription_ImpactOfNotHaving(),
-				this.getString(),
-				"impactOfNotHaving", "", 0, 1, WorkProductDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getWorkProductDescription_ReasonsForNotNeeding(),
-				this.getString(),
-				"reasonsForNotNeeding", "", 0, 1, WorkProductDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				deliverableDescriptionEClass,
-				DeliverableDescription.class,
-				"DeliverableDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getDeliverableDescription_ExternalDescription(),
-				this.getString(),
-				"externalDescription", "", 0, 1, DeliverableDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getDeliverableDescription_PackagingGuidance(),
-				this.getString(),
-				"packagingGuidance", "", 0, 1, DeliverableDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				roleDescriptionEClass,
-				RoleDescription.class,
-				"RoleDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getRoleDescription_Skills(),
-				this.getString(),
-				"skills", "", 0, 1, RoleDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getRoleDescription_AssignmentApproaches(),
-				this.getString(),
-				"assignmentApproaches", "", 0, 1, RoleDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getRoleDescription_Synonyms(),
-				this.getString(),
-				"synonyms", "", 0, 1, RoleDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				taskDescriptionEClass,
-				TaskDescription.class,
-				"TaskDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getTaskDescription_Purpose(),
-				this.getString(),
-				"purpose", "", 0, 1, TaskDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getTaskDescription_Alternatives(),
-				this.getString(),
-				"alternatives", "", 0, 1, TaskDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				guidanceDescriptionEClass,
-				GuidanceDescription.class,
-				"GuidanceDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getGuidanceDescription_Attachments(),
-				this.getString(),
-				"attachments", "", 0, 1, GuidanceDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				practiceDescriptionEClass,
-				PracticeDescription.class,
-				"PracticeDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getPracticeDescription_AdditionalInfo(),
-				this.getString(),
-				"additionalInfo", "", 0, 1, PracticeDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getPracticeDescription_Problem(),
-				this.getString(),
-				"problem", "", 0, 1, PracticeDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getPracticeDescription_Background(),
-				this.getString(),
-				"background", "", 0, 1, PracticeDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getPracticeDescription_Goals(),
-				this.getString(),
-				"goals", "", 0, 1, PracticeDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getPracticeDescription_Application(),
-				this.getString(),
-				"application", "", 0, 1, PracticeDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getPracticeDescription_LevelsOfAdoption(),
-				this.getString(),
-				"levelsOfAdoption", "", 0, 1, PracticeDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				pointEClass,
-				Point.class,
-				"Point", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getPoint_X(),
-				ecorePackage.getEDoubleObject(),
-				"x", null, 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getPoint_Y(),
-				ecorePackage.getEDoubleObject(),
-				"y", null, 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				graphElementEClass,
-				GraphElement.class,
-				"GraphElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getGraphElement_Position(),
-				this.getPoint(),
-				null,
-				"position", null, 0, 1, GraphElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getGraphElement_Contained(),
-				this.getDiagramElement(),
-				this.getDiagramElement_Container(),
-				"contained", null, 0, -1, GraphElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getGraphElement_Link(),
-				this.getDiagramLink(),
-				this.getDiagramLink_GraphElement(),
-				"link", null, 0, -1, GraphElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getGraphElement_Anchorage(),
-				this.getGraphConnector(),
-				this.getGraphConnector_GraphElement(),
-				"anchorage", null, 0, -1, GraphElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getGraphElement_SemanticModel(),
-				this.getSemanticModelBridge(),
-				this.getSemanticModelBridge_GraphElement(),
-				"semanticModel", null, 1, 1, GraphElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				diagramElementEClass,
-				DiagramElement.class,
-				"DiagramElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getDiagramElement_IsVisible(),
-				ecorePackage.getEBooleanObject(),
-				"isVisible", "true", 0, 1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-				getDiagramElement_Container(),
-				this.getGraphElement(),
-				this.getGraphElement_Contained(),
-				"container", null, 0, 1, DiagramElement.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getDiagramElement_Reference(),
-				this.getReference(),
-				this.getReference_Referenced(),
-				"reference", null, 0, -1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getDiagramElement_Property(),
-				this.getProperty(),
-				null,
-				"property", null, 0, -1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				diagramLinkEClass,
-				DiagramLink.class,
-				"DiagramLink", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getDiagramLink_Zoom(),
-				ecorePackage.getEDoubleObject(),
-				"zoom", null, 0, 1, DiagramLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getDiagramLink_Viewport(),
-				this.getPoint(),
-				null,
-				"viewport", null, 0, 1, DiagramLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getDiagramLink_GraphElement(),
-				this.getGraphElement(),
-				this.getGraphElement_Link(),
-				"graphElement", null, 1, 1, DiagramLink.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getDiagramLink_Diagram(),
-				this.getDiagram(),
-				this.getDiagram_DiagramLink(),
-				"diagram", null, 1, 1, DiagramLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				graphConnectorEClass,
-				GraphConnector.class,
-				"GraphConnector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getGraphConnector_GraphElement(),
-				this.getGraphElement(),
-				this.getGraphElement_Anchorage(),
-				"graphElement", null, 1, 1, GraphConnector.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getGraphConnector_GraphEdge(),
-				this.getGraphEdge(),
-				this.getGraphEdge_Anchor(),
-				"graphEdge", null, 0, -1, GraphConnector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				semanticModelBridgeEClass,
-				SemanticModelBridge.class,
-				"SemanticModelBridge", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getSemanticModelBridge_Presentation(),
-				this.getString(),
-				"presentation", "", 0, 1, SemanticModelBridge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-				getSemanticModelBridge_GraphElement(),
-				this.getGraphElement(),
-				this.getGraphElement_SemanticModel(),
-				"graphElement", null, 0, 1, SemanticModelBridge.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getSemanticModelBridge_Diagram(),
-				this.getDiagram(),
-				this.getDiagram_Namespace(),
-				"diagram", null, 0, 1, SemanticModelBridge.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				dimensionEClass,
-				Dimension.class,
-				"Dimension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getDimension_Width(),
-				ecorePackage.getEDoubleObject(),
-				"width", null, 0, 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getDimension_Height(),
-				ecorePackage.getEDoubleObject(),
-				"height", null, 0, 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				referenceEClass,
-				Reference.class,
-				"Reference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getReference_IsIndividualRepresentation(),
-				ecorePackage.getEBooleanObject(),
-				"isIndividualRepresentation", null, 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getReference_Referenced(),
-				this.getDiagramElement(),
-				this.getDiagramElement_Reference(),
-				"referenced", null, 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				propertyEClass,
-				Property.class,
-				"Property", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getProperty_Key(),
-				this.getString(),
-				"key", "", 0, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getProperty_Value(),
-				this.getString(),
-				"value", "", 0, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				graphEdgeEClass,
-				GraphEdge.class,
-				"GraphEdge", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getGraphEdge_Anchor(),
-				this.getGraphConnector(),
-				this.getGraphConnector_GraphEdge(),
-				"anchor", null, 2, 2, GraphEdge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getGraphEdge_Waypoints(),
-				this.getPoint(),
-				null,
-				"waypoints", null, 2, -1, GraphEdge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				diagramEClass,
-				Diagram.class,
-				"Diagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getDiagram_Zoom(),
-				ecorePackage.getEDoubleObject(),
-				"zoom", null, 0, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getDiagram_Viewpoint(),
-				this.getPoint(),
-				null,
-				"viewpoint", null, 0, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getDiagram_DiagramLink(),
-				this.getDiagramLink(),
-				this.getDiagramLink_Diagram(),
-				"diagramLink", null, 0, -1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getDiagram_Namespace(),
-				this.getSemanticModelBridge(),
-				this.getSemanticModelBridge_Diagram(),
-				"namespace", null, 1, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				graphNodeEClass,
-				GraphNode.class,
-				"GraphNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getGraphNode_Size(),
-				this.getDimension(),
-				null,
-				"size", null, 0, 1, GraphNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				simpleSemanticModelElementEClass,
-				SimpleSemanticModelElement.class,
-				"SimpleSemanticModelElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getSimpleSemanticModelElement_TypeInfo(),
-				this.getString(),
-				"typeInfo", "", 0, 1, SimpleSemanticModelElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				umaSemanticModelBridgeEClass,
-				UMASemanticModelBridge.class,
-				"UMASemanticModelBridge", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getUMASemanticModelBridge_Element(),
-				this.getMethodElement(),
-				null,
-				"element", null, 1, 1, UMASemanticModelBridge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				coreSemanticModelBridgeEClass,
-				CoreSemanticModelBridge.class,
-				"CoreSemanticModelBridge", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getCoreSemanticModelBridge_Element(),
-				this.getElement(),
-				null,
-				"element", null, 1, 1, CoreSemanticModelBridge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				leafElementEClass,
-				LeafElement.class,
-				"LeafElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				textElementEClass,
-				TextElement.class,
-				"TextElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getTextElement_Text(),
-				this.getString(),
-				"text", "", 0, 1, TextElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				imageEClass,
-				Image.class,
-				"Image", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getImage_Uri(),
-				this.getUri(),
-				"uri", null, 0, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getImage_MimeType(),
-				this.getString(),
-				"mimeType", "", 0, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				graphicPrimitiveEClass,
-				GraphicPrimitive.class,
-				"GraphicPrimitive", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				polylineEClass,
-				Polyline.class,
-				"Polyline", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getPolyline_Closed(),
-				ecorePackage.getEBooleanObject(),
-				"closed", "true", 0, 1, Polyline.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-				getPolyline_Waypoints(),
-				this.getPoint(),
-				null,
-				"waypoints", null, 2, -1, Polyline.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				ellipseEClass,
-				Ellipse.class,
-				"Ellipse", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getEllipse_RadiusX(),
-				ecorePackage.getEDoubleObject(),
-				"radiusX", null, 0, 1, Ellipse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getEllipse_RadiusY(),
-				ecorePackage.getEDoubleObject(),
-				"radiusY", null, 0, 1, Ellipse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getEllipse_Rotation(),
-				ecorePackage.getEDoubleObject(),
-				"rotation", null, 0, 1, Ellipse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getEllipse_StartAngle(),
-				ecorePackage.getEDoubleObject(),
-				"startAngle", null, 0, 1, Ellipse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getEllipse_EndAngle(),
-				ecorePackage.getEDoubleObject(),
-				"endAngle", null, 0, 1, Ellipse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getEllipse_Center(),
-				this.getPoint(),
-				null,
-				"center", null, 0, 1, Ellipse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				activityEClass,
-				Activity.class,
-				"Activity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getActivity_BreakdownElements(),
-				this.getBreakdownElement(),
-				this.getBreakdownElement_SuperActivities(),
-				"breakdownElements", null, 0, -1, Activity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getActivity_Roadmaps(),
-				this.getRoadmap(),
-				null,
-				"roadmaps", null, 0, -1, Activity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getActivity_SupportingMaterials(),
-				this.getSupportingMaterial(),
-				null,
-				"supportingMaterials", null, 0, -1, Activity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getActivity_Checklists(),
-				this.getChecklist(),
-				null,
-				"checklists", null, 0, -1, Activity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getActivity_Concepts(),
-				this.getConcept(),
-				null,
-				"concepts", null, 0, -1, Activity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getActivity_Examples(),
-				this.getExample(),
-				null,
-				"examples", null, 0, -1, Activity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getActivity_Guidelines(),
-				this.getGuideline(),
-				null,
-				"guidelines", null, 0, -1, Activity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getActivity_ReusableAssets(),
-				this.getReusableAsset(),
-				null,
-				"reusableAssets", null, 0, -1, Activity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getActivity_IsEnactable(),
-				ecorePackage.getEBooleanObject(),
-				"isEnactable", "false", 0, 1, Activity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				workBreakdownElementEClass,
-				WorkBreakdownElement.class,
-				"WorkBreakdownElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getWorkBreakdownElement_IsRepeatable(),
-				ecorePackage.getEBooleanObject(),
-				"isRepeatable", "false", 0, 1, WorkBreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getWorkBreakdownElement_IsOngoing(),
-				ecorePackage.getEBooleanObject(),
-				"isOngoing", "false", 0, 1, WorkBreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getWorkBreakdownElement_IsEventDriven(),
-				ecorePackage.getEBooleanObject(),
-				"isEventDriven", "false", 0, 1, WorkBreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-				getWorkBreakdownElement_LinkToPredecessor(),
-				this.getWorkOrder(),
-				null,
-				"linkToPredecessor", null, 0, -1, WorkBreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				breakdownElementEClass,
-				BreakdownElement.class,
-				"BreakdownElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getBreakdownElement_Prefix(),
-				this.getString(),
-				"prefix", "", 0, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getBreakdownElement_IsPlanned(),
-				ecorePackage.getEBooleanObject(),
-				"isPlanned", "true", 0, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getBreakdownElement_HasMultipleOccurrences(),
-				ecorePackage.getEBooleanObject(),
-				"hasMultipleOccurrences", "false", 0, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getBreakdownElement_IsOptional(),
-				ecorePackage.getEBooleanObject(),
-				"isOptional", "false", 0, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-				getBreakdownElement_PresentedAfter(),
-				this.getBreakdownElement(),
-				null,
-				"presentedAfter", null, 0, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getBreakdownElement_PresentedBefore(),
-				this.getBreakdownElement(),
-				null,
-				"presentedBefore", null, 0, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getBreakdownElement_PlanningData(),
-				this.getPlanningData(),
-				null,
-				"planningData", null, 0, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getBreakdownElement_SuperActivities(),
-				this.getActivity(),
-				this.getActivity_BreakdownElements(),
-				"superActivities", null, 1, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				milestoneEClass,
-				Milestone.class,
-				"Milestone", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				iterationEClass,
-				Iteration.class,
-				"Iteration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				phaseEClass,
-				Phase.class,
-				"Phase", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				teamProfileEClass,
-				TeamProfile.class,
-				"TeamProfile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getTeamProfile_TeamRoles(),
-				this.getRoleDescriptor(),
-				null,
-				"teamRoles", null, 0, -1, TeamProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTeamProfile_SuperTeam(),
-				this.getTeamProfile(),
-				this.getTeamProfile_SubTeam(),
-				"superTeam", null, 1, 1, TeamProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTeamProfile_SubTeam(),
-				this.getTeamProfile(),
-				this.getTeamProfile_SuperTeam(),
-				"subTeam", null, 0, -1, TeamProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				roleDescriptorEClass,
-				RoleDescriptor.class,
-				"RoleDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getRoleDescriptor_Role(),
-				this.getRole(),
-				null,
-				"Role", null, 0, 1, RoleDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getRoleDescriptor_Modifies(),
-				this.getWorkProductDescriptor(),
-				null,
-				"modifies", null, 0, -1, RoleDescriptor.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getRoleDescriptor_ResponsibleFor(),
-				this.getWorkProductDescriptor(),
-				null,
-				"responsibleFor", null, 0, -1, RoleDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				workOrderEClass,
-				WorkOrder.class,
-				"WorkOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getWorkOrder_LinkType(),
-				this.getWorkOrderType(),
-				"linkType", "finishToStart", 0, 1, WorkOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-				getWorkOrder_Pred(),
-				this.getWorkBreakdownElement(),
-				null,
-				"pred", null, 1, 1, WorkOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				processElementEClass,
-				ProcessElement.class,
-				"ProcessElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				planningDataEClass,
-				PlanningData.class,
-				"PlanningData", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getPlanningData_StartDate(),
-				this.getDate(),
-				"startDate", null, 0, 1, PlanningData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getPlanningData_FinishDate(),
-				this.getDate(),
-				"finishDate", null, 0, 1, PlanningData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getPlanningData_Rank(),
-				this.getInteger(),
-				"rank", null, 0, 1, PlanningData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				descriptorEClass,
-				org.eclipse.epf.uma.Descriptor.class,
-				"Descriptor", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getDescriptor_IsSynchronizedWithSource(),
-				ecorePackage.getEBooleanObject(),
-				"isSynchronizedWithSource", "true", 0, 1, org.eclipse.epf.uma.Descriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				workProductDescriptorEClass,
-				WorkProductDescriptor.class,
-				"WorkProductDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getWorkProductDescriptor_ActivityEntryState(),
-				this.getString(),
-				"activityEntryState", "", 0, 1, WorkProductDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getWorkProductDescriptor_ActivityExitState(),
-				this.getString(),
-				"activityExitState", "", 0, 1, WorkProductDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-				getWorkProductDescriptor_WorkProduct(),
-				this.getWorkProduct(),
-				null,
-				"WorkProduct", null, 0, 1, WorkProductDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getWorkProductDescriptor_ImpactedBy(),
-				this.getWorkProductDescriptor(),
-				this.getWorkProductDescriptor_Impacts(),
-				"impactedBy", null, 0, -1, WorkProductDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getWorkProductDescriptor_Impacts(),
-				this.getWorkProductDescriptor(),
-				this.getWorkProductDescriptor_ImpactedBy(),
-				"impacts", null, 0, -1, WorkProductDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getWorkProductDescriptor_DeliverableParts(),
-				this.getWorkProductDescriptor(),
-				null,
-				"deliverableParts", null, 0, -1, WorkProductDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				taskDescriptorEClass,
-				TaskDescriptor.class,
-				"TaskDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getTaskDescriptor_Task(),
-				this.getTask(),
-				null,
-				"Task", null, 0, 1, TaskDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTaskDescriptor_AdditionallyPerformedBy(),
-				this.getRoleDescriptor(),
-				null,
-				"additionallyPerformedBy", null, 0, -1, TaskDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTaskDescriptor_AssistedBy(),
-				this.getRoleDescriptor(),
-				null,
-				"assistedBy", null, 0, -1, TaskDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTaskDescriptor_ExternalInput(),
-				this.getWorkProductDescriptor(),
-				null,
-				"externalInput", null, 0, -1, TaskDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTaskDescriptor_MandatoryInput(),
-				this.getWorkProductDescriptor(),
-				null,
-				"mandatoryInput", null, 0, -1, TaskDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTaskDescriptor_OptionalInput(),
-				this.getWorkProductDescriptor(),
-				null,
-				"optionalInput", null, 0, -1, TaskDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTaskDescriptor_Output(),
-				this.getWorkProductDescriptor(),
-				null,
-				"output", null, 0, -1, TaskDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTaskDescriptor_PerformedPrimarilyBy(),
-				this.getRoleDescriptor(),
-				null,
-				"performedPrimarilyBy", null, 0, 1, TaskDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTaskDescriptor_SelectedSteps(),
-				this.getSection(),
-				null,
-				"selectedSteps", null, 0, -1, TaskDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				compositeRoleEClass,
-				CompositeRole.class,
-				"CompositeRole", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getCompositeRole_AggregatedRoles(),
-				this.getRole(),
-				null,
-				"aggregatedRoles", null, 0, -1, CompositeRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				breakdownElementDescriptionEClass,
-				BreakdownElementDescription.class,
-				"BreakdownElementDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getBreakdownElementDescription_UsageGuidance(),
-				this.getString(),
-				"usageGuidance", "", 0, 1, BreakdownElementDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				activityDescriptionEClass,
-				ActivityDescription.class,
-				"ActivityDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getActivityDescription_Purpose(),
-				this.getString(),
-				"purpose", "", 0, 1, ActivityDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getActivityDescription_Alternatives(),
-				this.getString(),
-				"alternatives", "", 0, 1, ActivityDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getActivityDescription_HowtoStaff(),
-				this.getString(),
-				"howtoStaff", "", 0, 1, ActivityDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				deliveryProcessDescriptionEClass,
-				DeliveryProcessDescription.class,
-				"DeliveryProcessDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getDeliveryProcessDescription_Scale(),
-				this.getString(),
-				"scale", "", 0, 1, DeliveryProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getDeliveryProcessDescription_ProjectCharacteristics(),
-				this.getString(),
-				"projectCharacteristics", "", 0, 1, DeliveryProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getDeliveryProcessDescription_RiskLevel(),
-				this.getString(),
-				"riskLevel", "", 0, 1, DeliveryProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getDeliveryProcessDescription_EstimatingTechnique(),
-				this.getString(),
-				"estimatingTechnique", "", 0, 1, DeliveryProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getDeliveryProcessDescription_ProjectMemberExpertise(),
-				this.getString(),
-				"projectMemberExpertise", "", 0, 1, DeliveryProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getDeliveryProcessDescription_TypeOfContract(),
-				this.getString(),
-				"typeOfContract", "", 0, 1, DeliveryProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				processDescriptionEClass,
-				ProcessDescription.class,
-				"ProcessDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getProcessDescription_ExternalId(),
-				this.getString(),
-				"externalId", "", 0, 1, ProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getProcessDescription_Scope(),
-				this.getString(),
-				"scope", "", 0, 1, ProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getProcessDescription_UsageNotes(),
-				this.getString(),
-				"usageNotes", "", 0, 1, ProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				descriptorDescriptionEClass,
-				DescriptorDescription.class,
-				"DescriptorDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getDescriptorDescription_RefinedDescription(),
-				this.getString(),
-				"refinedDescription", "", 0, 1, DescriptorDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(
-				conceptEClass,
-				Concept.class,
-				"Concept", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				checklistEClass,
-				Checklist.class,
-				"Checklist", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				exampleEClass,
-				Example.class,
-				"Example", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				guidelineEClass,
-				Guideline.class,
-				"Guideline", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				reportEClass,
-				Report.class,
-				"Report", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				templateEClass,
-				Template.class,
-				"Template", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				supportingMaterialEClass,
-				SupportingMaterial.class,
-				"SupportingMaterial", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				toolMentorEClass,
-				ToolMentor.class,
-				"ToolMentor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				whitepaperEClass,
-				Whitepaper.class,
-				"Whitepaper", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				termDefinitionEClass,
-				TermDefinition.class,
-				"TermDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				practiceEClass,
-				Practice.class,
-				"Practice", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getPractice_SubPractices(),
-				this.getPractice(),
-				null,
-				"subPractices", null, 0, -1, Practice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getPractice_ContentReferences(),
-				this.getContentElement(),
-				null,
-				"contentReferences", null, 0, -1, Practice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getPractice_ActivityReferences(),
-				this.getActivity(),
-				null,
-				"activityReferences", null, 0, -1, Practice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				estimationConsiderationsEClass,
-				EstimationConsiderations.class,
-				"EstimationConsiderations", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				reusableAssetEClass,
-				ReusableAsset.class,
-				"ReusableAsset", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				stateEClass,
-				State.class,
-				"State", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getState_WorkProduct(),
-				this.getWorkProduct(),
-				null,
-				"WorkProduct", null, 1, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getState_Region(),
-				this.getRegion(),
-				this.getRegion_State(),
-				"Region", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getState_Submachine(),
-				this.getStateMachine(),
-				null,
-				"submachine", null, 0, 1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				vertexEClass,
-				Vertex.class,
-				"Vertex", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getVertex_Container(),
-				this.getRegion(),
-				this.getRegion_Vertex(),
-				"container", null, 0, 1, Vertex.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getVertex_Outgoing(),
-				this.getTransition(),
-				this.getTransition_Source(),
-				"outgoing", null, 0, -1, Vertex.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getVertex_Incoming(),
-				this.getTransition(),
-				this.getTransition_Target(),
-				"incoming", null, 0, -1, Vertex.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				regionEClass,
-				Region.class,
-				"Region", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getRegion_Vertex(),
-				this.getVertex(),
-				this.getVertex_Container(),
-				"Vertex", null, 0, -1, Region.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getRegion_Transition(),
-				this.getTransition(),
-				this.getTransition_Container(),
-				"Transition", null, 0, -1, Region.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getRegion_State(),
-				this.getState(),
-				this.getState_Region(),
-				"State", null, 0, 1, Region.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getRegion_StateMachine(),
-				this.getStateMachine(),
-				this.getStateMachine_Region(),
-				"StateMachine", null, 0, 1, Region.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				stateMachineEClass,
-				StateMachine.class,
-				"StateMachine", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getStateMachine_Region(),
-				this.getRegion(),
-				this.getRegion_StateMachine(),
-				"Region", null, 1, -1, StateMachine.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				transitionEClass,
-				Transition.class,
-				"Transition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getTransition_WorkDefinition(),
-				this.getWorkDefinition(),
-				null,
-				"WorkDefinition", null, 1, -1, Transition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTransition_Container(),
-				this.getRegion(),
-				this.getRegion_Transition(),
-				"container", null, 1, 1, Transition.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTransition_Source(),
-				this.getVertex(),
-				this.getVertex_Outgoing(),
-				"source", null, 1, 1, Transition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTransition_Target(),
-				this.getVertex(),
-				this.getVertex_Incoming(),
-				"target", null, 1, 1, Transition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				pseudoStateEClass,
-				PseudoState.class,
-				"PseudoState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				disciplineEClass,
-				Discipline.class,
-				"Discipline", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getDiscipline_Tasks(),
-				this.getTask(),
-				null,
-				"tasks", null, 0, -1, Discipline.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getDiscipline_Subdiscipline(),
-				this.getDiscipline(),
-				null,
-				"subdiscipline", null, 0, -1, Discipline.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getDiscipline_ReferenceWorkflows(),
-				this.getActivity(),
-				null,
-				"referenceWorkflows", null, 0, -1, Discipline.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				contentCategoryEClass,
-				ContentCategory.class,
-				"ContentCategory", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				roleSetEClass,
-				RoleSet.class,
-				"RoleSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getRoleSet_Roles(),
-				this.getRole(),
-				null,
-				"roles", null, 0, -1, RoleSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				domainEClass,
-				Domain.class,
-				"Domain", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getDomain_WorkProducts(),
-				this.getWorkProduct(),
-				null,
-				"workProducts", null, 0, -1, Domain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getDomain_Subdomains(),
-				this.getDomain(),
-				null,
-				"subdomains", null, 0, -1, Domain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				workProductTypeEClass,
-				WorkProductType.class,
-				"WorkProductType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getWorkProductType_WorkProducts(),
-				this.getWorkProduct(),
-				null,
-				"workProducts", null, 0, -1, WorkProductType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				disciplineGroupingEClass,
-				DisciplineGrouping.class,
-				"DisciplineGrouping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getDisciplineGrouping_Disciplines(),
-				this.getDiscipline(),
-				null,
-				"disciplines", null, 0, -1, DisciplineGrouping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				toolEClass,
-				Tool.class,
-				"Tool", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getTool_ToolMentors(),
-				this.getToolMentor(),
-				null,
-				"toolMentors", null, 0, -1, Tool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				roleSetGroupingEClass,
-				RoleSetGrouping.class,
-				"RoleSetGrouping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getRoleSetGrouping_RoleSets(),
-				this.getRoleSet(),
-				null,
-				"roleSets", null, 0, -1, RoleSetGrouping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				customCategoryEClass,
-				CustomCategory.class,
-				"CustomCategory", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getCustomCategory_CategorizedElements(),
-				this.getDescribableElement(),
-				null,
-				"categorizedElements", null, 0, -1, CustomCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getCustomCategory_SubCategories(),
-				this.getContentCategory(),
-				null,
-				"subCategories", null, 0, -1, CustomCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				deliveryProcessEClass,
-				DeliveryProcess.class,
-				"DeliveryProcess", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getDeliveryProcess_EducationMaterials(),
-				this.getSupportingMaterial(),
-				null,
-				"educationMaterials", null, 0, -1, DeliveryProcess.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getDeliveryProcess_CommunicationsMaterials(),
-				this.getSupportingMaterial(),
-				null,
-				"communicationsMaterials", null, 0, -1, DeliveryProcess.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				processEClass,
-				org.eclipse.epf.uma.Process.class,
-				"Process", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getProcess_IncludesPatterns(),
-				this.getCapabilityPattern(),
-				null,
-				"includesPatterns", null, 0, -1, org.eclipse.epf.uma.Process.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getProcess_DefaultContext(),
-				this.getMethodConfiguration(),
-				null,
-				"defaultContext", null, 1, 1, org.eclipse.epf.uma.Process.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getProcess_ValidContext(),
-				this.getMethodConfiguration(),
-				null,
-				"validContext", null, 0, -1, org.eclipse.epf.uma.Process.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				capabilityPatternEClass,
-				CapabilityPattern.class,
-				"CapabilityPattern", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				processPlanningTemplateEClass,
-				ProcessPlanningTemplate.class,
-				"ProcessPlanningTemplate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getProcessPlanningTemplate_BasedOnProcesses(),
-				this.getProcess(),
-				null,
-				"basedOnProcesses", null, 0, -1, ProcessPlanningTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				roadmapEClass,
-				Roadmap.class,
-				"Roadmap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				processComponentEClass,
-				ProcessComponent.class,
-				"ProcessComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getProcessComponent_Interfaces(),
-				this.getProcessComponentInterface(),
-				null,
-				"interfaces", null, 1, -1, ProcessComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getProcessComponent_Process(),
-				this.getProcess(),
-				null,
-				"process", null, 1, 1, ProcessComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				processPackageEClass,
-				ProcessPackage.class,
-				"ProcessPackage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getProcessPackage_ProcessElements(),
-				this.getProcessElement(),
-				null,
-				"processElements", null, 0, -1, ProcessPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getProcessPackage_Diagrams(),
-				this.getDiagram(),
-				null,
-				"diagrams", null, 0, -1, ProcessPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				processComponentInterfaceEClass,
-				ProcessComponentInterface.class,
-				"ProcessComponentInterface", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getProcessComponentInterface_InterfaceSpecifications(),
-				this.getTaskDescriptor(),
-				null,
-				"interfaceSpecifications", null, 0, -1, ProcessComponentInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getProcessComponentInterface_InterfaceIO(),
-				this.getWorkProductDescriptor(),
-				null,
-				"interfaceIO", null, 0, -1, ProcessComponentInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				processComponentDescriptorEClass,
-				ProcessComponentDescriptor.class,
-				"ProcessComponentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getProcessComponentDescriptor_ProcessComponent(),
-				this.getProcessComponent(),
-				null,
-				"ProcessComponent", null, 1, 1, ProcessComponentDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				methodPluginEClass,
-				MethodPlugin.class,
-				"MethodPlugin", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getMethodPlugin_UserChangeable(),
-				ecorePackage.getEBooleanObject(),
-				"userChangeable", "true", 0, 1, MethodPlugin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-				getMethodPlugin_MethodPackages(),
-				this.getMethodPackage(),
-				null,
-				"methodPackages", null, 1, -1, MethodPlugin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getMethodPlugin_Bases(),
-				this.getMethodPlugin(),
-				null,
-				"bases", null, 0, -1, MethodPlugin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				variabilityElementEClass,
-				VariabilityElement.class,
-				"VariabilityElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getVariabilityElement_VariabilityType(),
-				this.getVariabilityType(),
-				"variabilityType", "na", 0, 1, VariabilityElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-				getVariabilityElement_VariabilityBasedOnElement(),
-				this.getVariabilityElement(),
-				null,
-				"variabilityBasedOnElement", null, 1, 1, VariabilityElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				methodUnitEClass,
-				MethodUnit.class,
-				"MethodUnit", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getMethodUnit_Authors(),
-				this.getString(),
-				"authors", "", 0, 1, MethodUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getMethodUnit_ChangeDate(),
-				this.getDate(),
-				"changeDate", null, 0, 1, MethodUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getMethodUnit_ChangeDescription(),
-				this.getString(),
-				"changeDescription", "", 0, 1, MethodUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-				getMethodUnit_Version(),
-				this.getString(),
-				"version", "", 0, 1, MethodUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-				getMethodUnit_CopyrightStatement(),
-				this.getSupportingMaterial(),
-				null,
-				"copyrightStatement", null, 1, 1, MethodUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				methodConfigurationEClass,
-				MethodConfiguration.class,
-				"MethodConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getMethodConfiguration_MethodPluginSelection(),
-				this.getMethodPlugin(),
-				null,
-				"methodPluginSelection", null, 1, -1, MethodConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getMethodConfiguration_MethodPackageSelection(),
-				this.getMethodPackage(),
-				null,
-				"methodPackageSelection", null, 1, -1, MethodConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getMethodConfiguration_ProcessViews(),
-				this.getContentCategory(),
-				null,
-				"processViews", null, 0, -1, MethodConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getMethodConfiguration_DefaultView(),
-				this.getContentCategory(),
-				null,
-				"defaultView", null, 1, 1, MethodConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getMethodConfiguration_BaseConfigurations(),
-				this.getMethodConfiguration(),
-				null,
-				"baseConfigurations", null, 0, -1, MethodConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getMethodConfiguration_SubtractedCategory(),
-				this.getContentCategory(),
-				null,
-				"subtractedCategory", null, 0, -1, MethodConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getMethodConfiguration_AddedCategory(),
-				this.getContentCategory(),
-				null,
-				"addedCategory", null, 0, -1, MethodConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				processFamilyEClass,
-				ProcessFamily.class,
-				"ProcessFamily", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getProcessFamily_DeliveryProcesses(),
-				this.getDeliveryProcess(),
-				null,
-				"deliveryProcesses", null, 0, -1, ProcessFamily.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				methodLibraryEClass,
-				MethodLibrary.class,
-				"MethodLibrary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getMethodLibrary_MethodPlugins(),
-				this.getMethodPlugin(),
-				null,
-				"methodPlugins", null, 0, -1, MethodLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getMethodLibrary_PredefinedConfigurations(),
-				this.getMethodConfiguration(),
-				null,
-				"predefinedConfigurations", null, 0, -1, MethodLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		// Initialize enums and add enum literals
-		initEEnum(workOrderTypeEEnum, WorkOrderType.class, "WorkOrderType"); //$NON-NLS-1$
-		addEEnumLiteral(workOrderTypeEEnum,
-				WorkOrderType.FINISH_TO_START_LITERAL);
-		addEEnumLiteral(workOrderTypeEEnum,
-				WorkOrderType.FINISH_TO_FINISH_LITERAL);
-		addEEnumLiteral(workOrderTypeEEnum,
-				WorkOrderType.START_TO_START_LITERAL);
-		addEEnumLiteral(workOrderTypeEEnum,
-				WorkOrderType.START_TO_FINISH_LITERAL);
-
-		initEEnum(pseudoStateKindEEnum, PseudoStateKind.class,
-				"PseudoStateKind"); //$NON-NLS-1$
-		addEEnumLiteral(pseudoStateKindEEnum, PseudoStateKind.INITIAL_LITERAL);
-		addEEnumLiteral(pseudoStateKindEEnum, PseudoStateKind.JOIN_LITERAL);
-		addEEnumLiteral(pseudoStateKindEEnum, PseudoStateKind.FORK_LITERAL);
-		addEEnumLiteral(pseudoStateKindEEnum, PseudoStateKind.JUNCTION_LITERAL);
-		addEEnumLiteral(pseudoStateKindEEnum, PseudoStateKind.CHOICE_LITERAL);
-		addEEnumLiteral(pseudoStateKindEEnum,
-				PseudoStateKind.ENTRY_POINT_LITERAL);
-		addEEnumLiteral(pseudoStateKindEEnum,
-				PseudoStateKind.EXIT_POINT_LITERAL);
-		addEEnumLiteral(pseudoStateKindEEnum, PseudoStateKind.TERMINATE_LITERAL);
-
-		initEEnum(variabilityTypeEEnum, VariabilityType.class,
-				"VariabilityType"); //$NON-NLS-1$
-		addEEnumLiteral(variabilityTypeEEnum, VariabilityType.NA_LITERAL);
-		addEEnumLiteral(variabilityTypeEEnum,
-				VariabilityType.CONTRIBUTES_LITERAL);
-		addEEnumLiteral(variabilityTypeEEnum, VariabilityType.EXTENDS_LITERAL);
-		addEEnumLiteral(variabilityTypeEEnum, VariabilityType.REPLACES_LITERAL);
-		addEEnumLiteral(variabilityTypeEEnum,
-				VariabilityType.LOCAL_CONTRIBUTION_LITERAL);
-		addEEnumLiteral(variabilityTypeEEnum,
-				VariabilityType.LOCAL_REPLACEMENT_LITERAL);
-		addEEnumLiteral(variabilityTypeEEnum,
-				VariabilityType.EXTENDS_REPLACES_LITERAL);
-
-		// Initialize data types
-		initEDataType(dateEDataType, Date.class,
-				"Date", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(uriEDataType, java.net.URI.class,
-				"Uri", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(
-				unlimitedNaturalEDataType,
-				int.class,
-				"UnlimitedNatural", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(stringEDataType, String.class,
-				"String", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(setEDataType, Set.class,
-				"Set", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(sequenceEDataType, List.class,
-				"Sequence", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(integerEDataType, int.class,
-				"Integer", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(floatEDataType, Float.class,
-				"Float", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //UmaPackageImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/VariabilityElementImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/VariabilityElementImpl.java
deleted file mode 100755
index 1788296..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/VariabilityElementImpl.java
+++ /dev/null
@@ -1,259 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.VariabilityType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Variability Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.VariabilityElementImpl#getVariabilityType <em>Variability Type</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.VariabilityElementImpl#getVariabilityBasedOnElement <em>Variability Based On Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class VariabilityElementImpl extends MethodElementImpl
-		implements VariabilityElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getVariabilityType() <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final VariabilityType VARIABILITY_TYPE_EDEFAULT = VariabilityType.NA_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getVariabilityType() <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityType()
-	 * @generated
-	 * @ordered
-	 */
-	protected VariabilityType variabilityType = VARIABILITY_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getVariabilityBasedOnElement() <em>Variability Based On Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityBasedOnElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected VariabilityElement variabilityBasedOnElement = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected VariabilityElementImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.VARIABILITY_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityType getVariabilityType() {
-		return variabilityType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVariabilityType(VariabilityType newVariabilityType) {
-		VariabilityType oldVariabilityType = variabilityType;
-		variabilityType = newVariabilityType == null ? VARIABILITY_TYPE_EDEFAULT
-				: newVariabilityType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_TYPE,
-					oldVariabilityType, variabilityType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityElement getVariabilityBasedOnElement() {
-		if (variabilityBasedOnElement != null
-				&& ((EObject) variabilityBasedOnElement).eIsProxy()) {
-			InternalEObject oldVariabilityBasedOnElement = (InternalEObject) variabilityBasedOnElement;
-			variabilityBasedOnElement = (VariabilityElement) eResolveProxy(oldVariabilityBasedOnElement);
-			if (variabilityBasedOnElement != oldVariabilityBasedOnElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-							this,
-							Notification.RESOLVE,
-							UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT,
-							oldVariabilityBasedOnElement,
-							variabilityBasedOnElement));
-			}
-		}
-		return variabilityBasedOnElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityElement basicGetVariabilityBasedOnElement() {
-		return variabilityBasedOnElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVariabilityBasedOnElement(
-			VariabilityElement newVariabilityBasedOnElement) {
-		VariabilityElement oldVariabilityBasedOnElement = variabilityBasedOnElement;
-		variabilityBasedOnElement = newVariabilityBasedOnElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(
-					this,
-					Notification.SET,
-					UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT,
-					oldVariabilityBasedOnElement, variabilityBasedOnElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_TYPE:
-			return getVariabilityType();
-		case UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-			if (resolve)
-				return getVariabilityBasedOnElement();
-			return basicGetVariabilityBasedOnElement();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_TYPE:
-			setVariabilityType((VariabilityType) newValue);
-			return;
-		case UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-			setVariabilityBasedOnElement((VariabilityElement) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_TYPE:
-			setVariabilityType(VARIABILITY_TYPE_EDEFAULT);
-			return;
-		case UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-			setVariabilityBasedOnElement((VariabilityElement) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_TYPE:
-			return variabilityType != VARIABILITY_TYPE_EDEFAULT;
-		case UmaPackage.VARIABILITY_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-			return variabilityBasedOnElement != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (variabilityType: "); //$NON-NLS-1$
-		result.append(variabilityType);
-		result.append(')');
-		return result.toString();
-	}
-
-} //VariabilityElementImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/VertexImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/VertexImpl.java
deleted file mode 100755
index d119e9a..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/VertexImpl.java
+++ /dev/null
@@ -1,322 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.Region;
-import org.eclipse.epf.uma.Transition;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.Vertex;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Vertex</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.VertexImpl#getContainer_ <em>Container</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.VertexImpl#getOutgoing <em>Outgoing</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.VertexImpl#getIncoming <em>Incoming</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class VertexImpl extends MultiResourceEObject implements Vertex {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getOutgoing() <em>Outgoing</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutgoing()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList outgoing = null;
-
-	/**
-	 * The cached value of the '{@link #getIncoming() <em>Incoming</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIncoming()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList incoming = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected VertexImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.VERTEX;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Region getContainer_() {
-		if (eContainerFeatureID != UmaPackage.VERTEX__CONTAINER)
-			return null;
-		return (Region) eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Region basicGetContainer() {
-		if (eContainerFeatureID != UmaPackage.VERTEX__CONTAINER)
-			return null;
-		return (Region) eInternalContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetContainer(Region newContainer,
-			NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject) newContainer,
-				UmaPackage.VERTEX__CONTAINER, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContainer(Region newContainer) {
-		if (newContainer != eInternalContainer()
-				|| (eContainerFeatureID != UmaPackage.VERTEX__CONTAINER && newContainer != null)) {
-			if (EcoreUtil.isAncestor(this, (EObject) newContainer))
-				throw new IllegalArgumentException(
-						"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newContainer != null)
-				msgs = ((InternalEObject) newContainer).eInverseAdd(this,
-						UmaPackage.REGION__VERTEX, Region.class, msgs);
-			msgs = basicSetContainer(newContainer, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.VERTEX__CONTAINER, newContainer, newContainer));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getOutgoing() {
-		if (outgoing == null) {
-			outgoing = new EObjectWithInverseResolvingEList(Transition.class,
-					this, UmaPackage.VERTEX__OUTGOING,
-					UmaPackage.TRANSITION__SOURCE);
-		}
-		return outgoing;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getIncoming() {
-		if (incoming == null) {
-			incoming = new EObjectWithInverseResolvingEList(Transition.class,
-					this, UmaPackage.VERTEX__INCOMING,
-					UmaPackage.TRANSITION__TARGET);
-		}
-		return incoming;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.VERTEX__CONTAINER:
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetContainer((Region) otherEnd, msgs);
-		case UmaPackage.VERTEX__OUTGOING:
-			return ((InternalEList) getOutgoing()).basicAdd(otherEnd, msgs);
-		case UmaPackage.VERTEX__INCOMING:
-			return ((InternalEList) getIncoming()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.VERTEX__CONTAINER:
-			return basicSetContainer(null, msgs);
-		case UmaPackage.VERTEX__OUTGOING:
-			return ((InternalEList) getOutgoing()).basicRemove(otherEnd, msgs);
-		case UmaPackage.VERTEX__INCOMING:
-			return ((InternalEList) getIncoming()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(
-			NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-		case UmaPackage.VERTEX__CONTAINER:
-			return eInternalContainer().eInverseRemove(this,
-					UmaPackage.REGION__VERTEX, Region.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.VERTEX__CONTAINER:
-			if (resolve)
-				return getContainer_();
-			return basicGetContainer();
-		case UmaPackage.VERTEX__OUTGOING:
-			return getOutgoing();
-		case UmaPackage.VERTEX__INCOMING:
-			return getIncoming();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.VERTEX__CONTAINER:
-			setContainer((Region) newValue);
-			return;
-		case UmaPackage.VERTEX__OUTGOING:
-			getOutgoing().clear();
-			getOutgoing().addAll((Collection) newValue);
-			return;
-		case UmaPackage.VERTEX__INCOMING:
-			getIncoming().clear();
-			getIncoming().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.VERTEX__CONTAINER:
-			setContainer((Region) null);
-			return;
-		case UmaPackage.VERTEX__OUTGOING:
-			getOutgoing().clear();
-			return;
-		case UmaPackage.VERTEX__INCOMING:
-			getIncoming().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.VERTEX__CONTAINER:
-			return basicGetContainer() != null;
-		case UmaPackage.VERTEX__OUTGOING:
-			return outgoing != null && !outgoing.isEmpty();
-		case UmaPackage.VERTEX__INCOMING:
-			return incoming != null && !incoming.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //VertexImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WhitepaperImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WhitepaperImpl.java
deleted file mode 100755
index 00cd5a1..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WhitepaperImpl.java
+++ /dev/null
@@ -1,56 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.Whitepaper;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Whitepaper</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class WhitepaperImpl extends ConceptImpl implements Whitepaper {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WhitepaperImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WHITEPAPER;
-	}
-
-} //WhitepaperImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkBreakdownElementImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkBreakdownElementImpl.java
deleted file mode 100755
index 307ae1b..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkBreakdownElementImpl.java
+++ /dev/null
@@ -1,340 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkOrder;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Work Breakdown Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkBreakdownElementImpl#getIsRepeatable <em>Is Repeatable</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkBreakdownElementImpl#getIsOngoing <em>Is Ongoing</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkBreakdownElementImpl#getIsEventDriven <em>Is Event Driven</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkBreakdownElementImpl#getLinkToPredecessor <em>Link To Predecessor</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class WorkBreakdownElementImpl extends BreakdownElementImpl
-		implements WorkBreakdownElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getIsRepeatable() <em>Is Repeatable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsRepeatable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean IS_REPEATABLE_EDEFAULT = Boolean.FALSE;
-
-	/**
-	 * The cached value of the '{@link #getIsRepeatable() <em>Is Repeatable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsRepeatable()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean isRepeatable = IS_REPEATABLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getIsOngoing() <em>Is Ongoing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsOngoing()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean IS_ONGOING_EDEFAULT = Boolean.FALSE;
-
-	/**
-	 * The cached value of the '{@link #getIsOngoing() <em>Is Ongoing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsOngoing()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean isOngoing = IS_ONGOING_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getIsEventDriven() <em>Is Event Driven</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsEventDriven()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean IS_EVENT_DRIVEN_EDEFAULT = Boolean.FALSE;
-
-	/**
-	 * The cached value of the '{@link #getIsEventDriven() <em>Is Event Driven</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIsEventDriven()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean isEventDriven = IS_EVENT_DRIVEN_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getLinkToPredecessor() <em>Link To Predecessor</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLinkToPredecessor()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList linkToPredecessor = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkBreakdownElementImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WORK_BREAKDOWN_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean getIsRepeatable() {
-		return isRepeatable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsRepeatable(Boolean newIsRepeatable) {
-		Boolean oldIsRepeatable = isRepeatable;
-		isRepeatable = newIsRepeatable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE,
-					oldIsRepeatable, isRepeatable));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean getIsOngoing() {
-		return isOngoing;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsOngoing(Boolean newIsOngoing) {
-		Boolean oldIsOngoing = isOngoing;
-		isOngoing = newIsOngoing;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_ONGOING,
-					oldIsOngoing, isOngoing));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Boolean getIsEventDriven() {
-		return isEventDriven;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsEventDriven(Boolean newIsEventDriven) {
-		Boolean oldIsEventDriven = isEventDriven;
-		isEventDriven = newIsEventDriven;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN,
-					oldIsEventDriven, isEventDriven));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getLinkToPredecessor() {
-		if (linkToPredecessor == null) {
-			linkToPredecessor = new EObjectResolvingEList(WorkOrder.class,
-					this,
-					UmaPackage.WORK_BREAKDOWN_ELEMENT__LINK_TO_PREDECESSOR);
-		}
-		return linkToPredecessor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE:
-			return getIsRepeatable();
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_ONGOING:
-			return getIsOngoing();
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN:
-			return getIsEventDriven();
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__LINK_TO_PREDECESSOR:
-			return getLinkToPredecessor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE:
-			setIsRepeatable((Boolean) newValue);
-			return;
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_ONGOING:
-			setIsOngoing((Boolean) newValue);
-			return;
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN:
-			setIsEventDriven((Boolean) newValue);
-			return;
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__LINK_TO_PREDECESSOR:
-			getLinkToPredecessor().clear();
-			getLinkToPredecessor().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE:
-			setIsRepeatable(IS_REPEATABLE_EDEFAULT);
-			return;
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_ONGOING:
-			setIsOngoing(IS_ONGOING_EDEFAULT);
-			return;
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN:
-			setIsEventDriven(IS_EVENT_DRIVEN_EDEFAULT);
-			return;
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__LINK_TO_PREDECESSOR:
-			getLinkToPredecessor().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE:
-			return IS_REPEATABLE_EDEFAULT == null ? isRepeatable != null
-					: !IS_REPEATABLE_EDEFAULT.equals(isRepeatable);
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_ONGOING:
-			return IS_ONGOING_EDEFAULT == null ? isOngoing != null
-					: !IS_ONGOING_EDEFAULT.equals(isOngoing);
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN:
-			return IS_EVENT_DRIVEN_EDEFAULT == null ? isEventDriven != null
-					: !IS_EVENT_DRIVEN_EDEFAULT.equals(isEventDriven);
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT__LINK_TO_PREDECESSOR:
-			return linkToPredecessor != null && !linkToPredecessor.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (isRepeatable: "); //$NON-NLS-1$
-		result.append(isRepeatable);
-		result.append(", isOngoing: "); //$NON-NLS-1$
-		result.append(isOngoing);
-		result.append(", isEventDriven: "); //$NON-NLS-1$
-		result.append(isEventDriven);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WorkBreakdownElementImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkDefinitionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkDefinitionImpl.java
deleted file mode 100755
index 54ae44a..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkDefinitionImpl.java
+++ /dev/null
@@ -1,360 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.Constraint;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkDefinition;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Work Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkDefinitionImpl#getPrecondition <em>Precondition</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkDefinitionImpl#getPostcondition <em>Postcondition</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class WorkDefinitionImpl extends MethodElementImpl implements
-		WorkDefinition {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getPrecondition() <em>Precondition</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrecondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected Constraint precondition = null;
-
-	/**
-	 * The cached value of the '{@link #getPostcondition() <em>Postcondition</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostcondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected Constraint postcondition = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkDefinitionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WORK_DEFINITION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint getPrecondition() {
-		if (precondition != null && ((EObject) precondition).eIsProxy()) {
-			InternalEObject oldPrecondition = (InternalEObject) precondition;
-			precondition = (Constraint) eResolveProxy(oldPrecondition);
-			if (precondition != oldPrecondition) {
-				InternalEObject newPrecondition = (InternalEObject) precondition;
-				NotificationChain msgs = oldPrecondition.eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.WORK_DEFINITION__PRECONDITION,
-						null, null);
-				if (newPrecondition.eInternalContainer() == null) {
-					msgs = newPrecondition.eInverseAdd(this,
-							EOPPOSITE_FEATURE_BASE
-									- UmaPackage.WORK_DEFINITION__PRECONDITION,
-							null, msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.WORK_DEFINITION__PRECONDITION,
-							oldPrecondition, precondition));
-			}
-		}
-		return precondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint basicGetPrecondition() {
-		return precondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPrecondition(Constraint newPrecondition,
-			NotificationChain msgs) {
-		Constraint oldPrecondition = precondition;
-		precondition = newPrecondition;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, UmaPackage.WORK_DEFINITION__PRECONDITION,
-					oldPrecondition, newPrecondition);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPrecondition(Constraint newPrecondition) {
-		if (newPrecondition != precondition) {
-			NotificationChain msgs = null;
-			if (precondition != null)
-				msgs = ((InternalEObject) precondition).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.WORK_DEFINITION__PRECONDITION,
-						null, msgs);
-			if (newPrecondition != null)
-				msgs = ((InternalEObject) newPrecondition).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.WORK_DEFINITION__PRECONDITION,
-						null, msgs);
-			msgs = basicSetPrecondition(newPrecondition, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.WORK_DEFINITION__PRECONDITION, newPrecondition,
-					newPrecondition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint getPostcondition() {
-		if (postcondition != null && ((EObject) postcondition).eIsProxy()) {
-			InternalEObject oldPostcondition = (InternalEObject) postcondition;
-			postcondition = (Constraint) eResolveProxy(oldPostcondition);
-			if (postcondition != oldPostcondition) {
-				InternalEObject newPostcondition = (InternalEObject) postcondition;
-				NotificationChain msgs = oldPostcondition.eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.WORK_DEFINITION__POSTCONDITION,
-						null, null);
-				if (newPostcondition.eInternalContainer() == null) {
-					msgs = newPostcondition
-							.eInverseAdd(
-									this,
-									EOPPOSITE_FEATURE_BASE
-											- UmaPackage.WORK_DEFINITION__POSTCONDITION,
-									null, msgs);
-				}
-				if (msgs != null)
-					msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.WORK_DEFINITION__POSTCONDITION,
-							oldPostcondition, postcondition));
-			}
-		}
-		return postcondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint basicGetPostcondition() {
-		return postcondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostcondition(Constraint newPostcondition,
-			NotificationChain msgs) {
-		Constraint oldPostcondition = postcondition;
-		postcondition = newPostcondition;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET,
-					UmaPackage.WORK_DEFINITION__POSTCONDITION,
-					oldPostcondition, newPostcondition);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPostcondition(Constraint newPostcondition) {
-		if (newPostcondition != postcondition) {
-			NotificationChain msgs = null;
-			if (postcondition != null)
-				msgs = ((InternalEObject) postcondition).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.WORK_DEFINITION__POSTCONDITION,
-						null, msgs);
-			if (newPostcondition != null)
-				msgs = ((InternalEObject) newPostcondition).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- UmaPackage.WORK_DEFINITION__POSTCONDITION,
-						null, msgs);
-			msgs = basicSetPostcondition(newPostcondition, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.WORK_DEFINITION__POSTCONDITION,
-					newPostcondition, newPostcondition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.WORK_DEFINITION__PRECONDITION:
-			return basicSetPrecondition(null, msgs);
-		case UmaPackage.WORK_DEFINITION__POSTCONDITION:
-			return basicSetPostcondition(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.WORK_DEFINITION__PRECONDITION:
-			if (resolve)
-				return getPrecondition();
-			return basicGetPrecondition();
-		case UmaPackage.WORK_DEFINITION__POSTCONDITION:
-			if (resolve)
-				return getPostcondition();
-			return basicGetPostcondition();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.WORK_DEFINITION__PRECONDITION:
-			setPrecondition((Constraint) newValue);
-			return;
-		case UmaPackage.WORK_DEFINITION__POSTCONDITION:
-			setPostcondition((Constraint) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.WORK_DEFINITION__PRECONDITION:
-			setPrecondition((Constraint) null);
-			return;
-		case UmaPackage.WORK_DEFINITION__POSTCONDITION:
-			setPostcondition((Constraint) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.WORK_DEFINITION__PRECONDITION:
-			return precondition != null;
-		case UmaPackage.WORK_DEFINITION__POSTCONDITION:
-			return postcondition != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //WorkDefinitionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkOrderImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkOrderImpl.java
deleted file mode 100755
index 71458e1..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkOrderImpl.java
+++ /dev/null
@@ -1,248 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkOrderType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Work Order</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkOrderImpl#getLinkType <em>Link Type</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkOrderImpl#getPred <em>Pred</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkOrderImpl extends ProcessElementImpl implements WorkOrder {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getLinkType() <em>Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLinkType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final WorkOrderType LINK_TYPE_EDEFAULT = WorkOrderType.FINISH_TO_START_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getLinkType() <em>Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLinkType()
-	 * @generated
-	 * @ordered
-	 */
-	protected WorkOrderType linkType = LINK_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPred() <em>Pred</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPred()
-	 * @generated
-	 * @ordered
-	 */
-	protected WorkBreakdownElement pred = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkOrderImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WORK_ORDER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkOrderType getLinkType() {
-		return linkType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLinkType(WorkOrderType newLinkType) {
-		WorkOrderType oldLinkType = linkType;
-		linkType = newLinkType == null ? LINK_TYPE_EDEFAULT : newLinkType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.WORK_ORDER__LINK_TYPE, oldLinkType, linkType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkBreakdownElement getPred() {
-		if (pred != null && ((EObject) pred).eIsProxy()) {
-			InternalEObject oldPred = (InternalEObject) pred;
-			pred = (WorkBreakdownElement) eResolveProxy(oldPred);
-			if (pred != oldPred) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.WORK_ORDER__PRED, oldPred, pred));
-			}
-		}
-		return pred;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkBreakdownElement basicGetPred() {
-		return pred;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPred(WorkBreakdownElement newPred) {
-		WorkBreakdownElement oldPred = pred;
-		pred = newPred;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.WORK_ORDER__PRED, oldPred, pred));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.WORK_ORDER__LINK_TYPE:
-			return getLinkType();
-		case UmaPackage.WORK_ORDER__PRED:
-			if (resolve)
-				return getPred();
-			return basicGetPred();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.WORK_ORDER__LINK_TYPE:
-			setLinkType((WorkOrderType) newValue);
-			return;
-		case UmaPackage.WORK_ORDER__PRED:
-			setPred((WorkBreakdownElement) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.WORK_ORDER__LINK_TYPE:
-			setLinkType(LINK_TYPE_EDEFAULT);
-			return;
-		case UmaPackage.WORK_ORDER__PRED:
-			setPred((WorkBreakdownElement) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.WORK_ORDER__LINK_TYPE:
-			return linkType != LINK_TYPE_EDEFAULT;
-		case UmaPackage.WORK_ORDER__PRED:
-			return pred != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (linkType: "); //$NON-NLS-1$
-		result.append(linkType);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WorkOrderImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkProductDescriptionImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkProductDescriptionImpl.java
deleted file mode 100755
index 74b4e47..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkProductDescriptionImpl.java
+++ /dev/null
@@ -1,358 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProductDescription;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Work Product Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkProductDescriptionImpl#getExternalId <em>External Id</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkProductDescriptionImpl#getPurpose <em>Purpose</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkProductDescriptionImpl#getImpactOfNotHaving <em>Impact Of Not Having</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkProductDescriptionImpl#getReasonsForNotNeeding <em>Reasons For Not Needing</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkProductDescriptionImpl extends ContentDescriptionImpl
-		implements WorkProductDescription {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getExternalId() <em>External Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExternalId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXTERNAL_ID_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getExternalId() <em>External Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExternalId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String externalId = EXTERNAL_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPurpose()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PURPOSE_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPurpose()
-	 * @generated
-	 * @ordered
-	 */
-	protected String purpose = PURPOSE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getImpactOfNotHaving() <em>Impact Of Not Having</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImpactOfNotHaving()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String IMPACT_OF_NOT_HAVING_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getImpactOfNotHaving() <em>Impact Of Not Having</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImpactOfNotHaving()
-	 * @generated
-	 * @ordered
-	 */
-	protected String impactOfNotHaving = IMPACT_OF_NOT_HAVING_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getReasonsForNotNeeding() <em>Reasons For Not Needing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReasonsForNotNeeding()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REASONS_FOR_NOT_NEEDING_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getReasonsForNotNeeding() <em>Reasons For Not Needing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReasonsForNotNeeding()
-	 * @generated
-	 * @ordered
-	 */
-	protected String reasonsForNotNeeding = REASONS_FOR_NOT_NEEDING_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkProductDescriptionImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WORK_PRODUCT_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getExternalId() {
-		return externalId;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExternalId(String newExternalId) {
-		String oldExternalId = externalId;
-		externalId = newExternalId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID,
-					oldExternalId, externalId));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPurpose() {
-		return purpose;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPurpose(String newPurpose) {
-		String oldPurpose = purpose;
-		purpose = newPurpose;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.WORK_PRODUCT_DESCRIPTION__PURPOSE, oldPurpose,
-					purpose));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getImpactOfNotHaving() {
-		return impactOfNotHaving;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImpactOfNotHaving(String newImpactOfNotHaving) {
-		String oldImpactOfNotHaving = impactOfNotHaving;
-		impactOfNotHaving = newImpactOfNotHaving;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING,
-					oldImpactOfNotHaving, impactOfNotHaving));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getReasonsForNotNeeding() {
-		return reasonsForNotNeeding;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReasonsForNotNeeding(String newReasonsForNotNeeding) {
-		String oldReasonsForNotNeeding = reasonsForNotNeeding;
-		reasonsForNotNeeding = newReasonsForNotNeeding;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(
-					this,
-					Notification.SET,
-					UmaPackage.WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING,
-					oldReasonsForNotNeeding, reasonsForNotNeeding));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID:
-			return getExternalId();
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__PURPOSE:
-			return getPurpose();
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING:
-			return getImpactOfNotHaving();
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING:
-			return getReasonsForNotNeeding();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID:
-			setExternalId((String) newValue);
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__PURPOSE:
-			setPurpose((String) newValue);
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING:
-			setImpactOfNotHaving((String) newValue);
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING:
-			setReasonsForNotNeeding((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID:
-			setExternalId(EXTERNAL_ID_EDEFAULT);
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__PURPOSE:
-			setPurpose(PURPOSE_EDEFAULT);
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING:
-			setImpactOfNotHaving(IMPACT_OF_NOT_HAVING_EDEFAULT);
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING:
-			setReasonsForNotNeeding(REASONS_FOR_NOT_NEEDING_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID:
-			return EXTERNAL_ID_EDEFAULT == null ? externalId != null
-					: !EXTERNAL_ID_EDEFAULT.equals(externalId);
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__PURPOSE:
-			return PURPOSE_EDEFAULT == null ? purpose != null
-					: !PURPOSE_EDEFAULT.equals(purpose);
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING:
-			return IMPACT_OF_NOT_HAVING_EDEFAULT == null ? impactOfNotHaving != null
-					: !IMPACT_OF_NOT_HAVING_EDEFAULT.equals(impactOfNotHaving);
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING:
-			return REASONS_FOR_NOT_NEEDING_EDEFAULT == null ? reasonsForNotNeeding != null
-					: !REASONS_FOR_NOT_NEEDING_EDEFAULT
-							.equals(reasonsForNotNeeding);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (externalId: "); //$NON-NLS-1$
-		result.append(externalId);
-		result.append(", purpose: "); //$NON-NLS-1$
-		result.append(purpose);
-		result.append(", impactOfNotHaving: "); //$NON-NLS-1$
-		result.append(impactOfNotHaving);
-		result.append(", reasonsForNotNeeding: "); //$NON-NLS-1$
-		result.append(reasonsForNotNeeding);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WorkProductDescriptionImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkProductDescriptorImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkProductDescriptorImpl.java
deleted file mode 100755
index e894301..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkProductDescriptorImpl.java
+++ /dev/null
@@ -1,460 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Work Product Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkProductDescriptorImpl#getActivityEntryState <em>Activity Entry State</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkProductDescriptorImpl#getActivityExitState <em>Activity Exit State</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkProductDescriptorImpl#getWorkProduct <em>Work Product</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkProductDescriptorImpl#getImpactedBy <em>Impacted By</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkProductDescriptorImpl#getImpacts <em>Impacts</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkProductDescriptorImpl#getDeliverableParts <em>Deliverable Parts</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkProductDescriptorImpl extends DescriptorImpl implements
-		WorkProductDescriptor {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The default value of the '{@link #getActivityEntryState() <em>Activity Entry State</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivityEntryState()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ACTIVITY_ENTRY_STATE_EDEFAULT = ""; //$NON-NLS-1$
-
-	/**
-	 * The cached value of the '{@link #getActivityEntryState() <em>Activity Entry State</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivityEntryState()
-	 * @generated
-	 * @ordered
-	 */
-	protected String activityEntryState = ACTIVITY_ENTRY_STATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActivityExitState() <em>Activity Exit State</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivityExitState()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ACTIVITY_EXIT_STATE_EDEFAULT = ""; //$NON-NLS-1$
-
-	/**
-	 * The cached value of the '{@link #getActivityExitState() <em>Activity Exit State</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivityExitState()
-	 * @generated
-	 * @ordered
-	 */
-	protected String activityExitState = ACTIVITY_EXIT_STATE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getWorkProduct() <em>Work Product</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkProduct()
-	 * @generated
-	 * @ordered
-	 */
-	protected WorkProduct workProduct = null;
-
-	/**
-	 * The cached value of the '{@link #getImpactedBy() <em>Impacted By</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImpactedBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList impactedBy = null;
-
-	/**
-	 * The cached value of the '{@link #getImpacts() <em>Impacts</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImpacts()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList impacts = null;
-
-	/**
-	 * The cached value of the '{@link #getDeliverableParts() <em>Deliverable Parts</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDeliverableParts()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList deliverableParts = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkProductDescriptorImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WORK_PRODUCT_DESCRIPTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getActivityEntryState() {
-		return activityEntryState;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActivityEntryState(String newActivityEntryState) {
-		String oldActivityEntryState = activityEntryState;
-		activityEntryState = newActivityEntryState;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE,
-					oldActivityEntryState, activityEntryState));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getActivityExitState() {
-		return activityExitState;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActivityExitState(String newActivityExitState) {
-		String oldActivityExitState = activityExitState;
-		activityExitState = newActivityExitState;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE,
-					oldActivityExitState, activityExitState));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProduct getWorkProduct() {
-		if (workProduct != null && ((EObject) workProduct).eIsProxy()) {
-			InternalEObject oldWorkProduct = (InternalEObject) workProduct;
-			workProduct = (WorkProduct) eResolveProxy(oldWorkProduct);
-			if (workProduct != oldWorkProduct) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							UmaPackage.WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT,
-							oldWorkProduct, workProduct));
-			}
-		}
-		return workProduct;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProduct basicGetWorkProduct() {
-		return workProduct;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWorkProduct(WorkProduct newWorkProduct) {
-		WorkProduct oldWorkProduct = workProduct;
-		workProduct = newWorkProduct;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					UmaPackage.WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT,
-					oldWorkProduct, workProduct));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getImpactedBy() {
-		if (impactedBy == null) {
-			impactedBy = new EObjectWithInverseResolvingEList.ManyInverse(
-					WorkProductDescriptor.class, this,
-					UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY,
-					UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTS);
-		}
-		return impactedBy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getImpacts() {
-		if (impacts == null) {
-			impacts = new EObjectWithInverseResolvingEList.ManyInverse(
-					WorkProductDescriptor.class, this,
-					UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTS,
-					UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY);
-		}
-		return impacts;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getDeliverableParts() {
-		if (deliverableParts == null) {
-			deliverableParts = new EObjectResolvingEList(
-					WorkProductDescriptor.class, this,
-					UmaPackage.WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS);
-		}
-		return deliverableParts;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY:
-			return ((InternalEList) getImpactedBy()).basicAdd(otherEnd, msgs);
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTS:
-			return ((InternalEList) getImpacts()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY:
-			return ((InternalEList) getImpactedBy())
-					.basicRemove(otherEnd, msgs);
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTS:
-			return ((InternalEList) getImpacts()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE:
-			return getActivityEntryState();
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE:
-			return getActivityExitState();
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT:
-			if (resolve)
-				return getWorkProduct();
-			return basicGetWorkProduct();
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY:
-			return getImpactedBy();
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTS:
-			return getImpacts();
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS:
-			return getDeliverableParts();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE:
-			setActivityEntryState((String) newValue);
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE:
-			setActivityExitState((String) newValue);
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT:
-			setWorkProduct((WorkProduct) newValue);
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY:
-			getImpactedBy().clear();
-			getImpactedBy().addAll((Collection) newValue);
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTS:
-			getImpacts().clear();
-			getImpacts().addAll((Collection) newValue);
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS:
-			getDeliverableParts().clear();
-			getDeliverableParts().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE:
-			setActivityEntryState(ACTIVITY_ENTRY_STATE_EDEFAULT);
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE:
-			setActivityExitState(ACTIVITY_EXIT_STATE_EDEFAULT);
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT:
-			setWorkProduct((WorkProduct) null);
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY:
-			getImpactedBy().clear();
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTS:
-			getImpacts().clear();
-			return;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS:
-			getDeliverableParts().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE:
-			return ACTIVITY_ENTRY_STATE_EDEFAULT == null ? activityEntryState != null
-					: !ACTIVITY_ENTRY_STATE_EDEFAULT.equals(activityEntryState);
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE:
-			return ACTIVITY_EXIT_STATE_EDEFAULT == null ? activityExitState != null
-					: !ACTIVITY_EXIT_STATE_EDEFAULT.equals(activityExitState);
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT:
-			return workProduct != null;
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY:
-			return impactedBy != null && !impactedBy.isEmpty();
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTS:
-			return impacts != null && !impacts.isEmpty();
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS:
-			return deliverableParts != null && !deliverableParts.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (activityEntryState: "); //$NON-NLS-1$
-		result.append(activityEntryState);
-		result.append(", activityExitState: "); //$NON-NLS-1$
-		result.append(activityExitState);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WorkProductDescriptorImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkProductImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkProductImpl.java
deleted file mode 100755
index d37cd7e..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkProductImpl.java
+++ /dev/null
@@ -1,289 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.EstimationConsiderations;
-import org.eclipse.epf.uma.Report;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.Template;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.util.AssociationHelper;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Work Product</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkProductImpl#getReports <em>Reports</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkProductImpl#getTemplates <em>Templates</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkProductImpl#getToolMentors <em>Tool Mentors</em>}</li>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkProductImpl#getEstimationConsiderations <em>Estimation Considerations</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class WorkProductImpl extends ContentElementImpl implements
-		WorkProduct {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getReports() <em>Reports</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReports()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList reports = null;
-
-	/**
-	 * The cached value of the '{@link #getTemplates() <em>Templates</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTemplates()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList templates = null;
-
-	/**
-	 * The cached value of the '{@link #getToolMentors() <em>Tool Mentors</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToolMentors()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList toolMentors = null;
-
-	/**
-	 * The cached value of the '{@link #getEstimationConsiderations() <em>Estimation Considerations</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEstimationConsiderations()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList estimationConsiderations = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkProductImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WORK_PRODUCT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public List getModifiedBy() {
-		List outputFrom = AssociationHelper.getOutputtingTasks(this); //this.getOutputFrom();
-		List modifies = new BasicEList();
-		if (outputFrom != null && outputFrom.size() > 0) {
-			for (Iterator it = outputFrom.iterator(); it.hasNext();) {
-				//	for each task get, get primary performer role
-				Task task = (Task) it.next();
-				Role modifiedByRole = task.getPerformedBy();
-				if (modifiedByRole != null) {
-					if (!modifies.contains(modifiedByRole)) {
-						modifies.add(modifiedByRole);
-					}
-				}
-			}
-		}
-		return modifies;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getReports() {
-		if (reports == null) {
-			reports = new EObjectResolvingEList(Report.class, this,
-					UmaPackage.WORK_PRODUCT__REPORTS);
-		}
-		return reports;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getTemplates() {
-		if (templates == null) {
-			templates = new EObjectResolvingEList(Template.class, this,
-					UmaPackage.WORK_PRODUCT__TEMPLATES);
-		}
-		return templates;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getToolMentors() {
-		if (toolMentors == null) {
-			toolMentors = new EObjectResolvingEList(ToolMentor.class, this,
-					UmaPackage.WORK_PRODUCT__TOOL_MENTORS);
-		}
-		return toolMentors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getEstimationConsiderations() {
-		if (estimationConsiderations == null) {
-			estimationConsiderations = new EObjectResolvingEList(
-					EstimationConsiderations.class, this,
-					UmaPackage.WORK_PRODUCT__ESTIMATION_CONSIDERATIONS);
-		}
-		return estimationConsiderations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT__REPORTS:
-			return getReports();
-		case UmaPackage.WORK_PRODUCT__TEMPLATES:
-			return getTemplates();
-		case UmaPackage.WORK_PRODUCT__TOOL_MENTORS:
-			return getToolMentors();
-		case UmaPackage.WORK_PRODUCT__ESTIMATION_CONSIDERATIONS:
-			return getEstimationConsiderations();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT__REPORTS:
-			getReports().clear();
-			getReports().addAll((Collection) newValue);
-			return;
-		case UmaPackage.WORK_PRODUCT__TEMPLATES:
-			getTemplates().clear();
-			getTemplates().addAll((Collection) newValue);
-			return;
-		case UmaPackage.WORK_PRODUCT__TOOL_MENTORS:
-			getToolMentors().clear();
-			getToolMentors().addAll((Collection) newValue);
-			return;
-		case UmaPackage.WORK_PRODUCT__ESTIMATION_CONSIDERATIONS:
-			getEstimationConsiderations().clear();
-			getEstimationConsiderations().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT__REPORTS:
-			getReports().clear();
-			return;
-		case UmaPackage.WORK_PRODUCT__TEMPLATES:
-			getTemplates().clear();
-			return;
-		case UmaPackage.WORK_PRODUCT__TOOL_MENTORS:
-			getToolMentors().clear();
-			return;
-		case UmaPackage.WORK_PRODUCT__ESTIMATION_CONSIDERATIONS:
-			getEstimationConsiderations().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT__REPORTS:
-			return reports != null && !reports.isEmpty();
-		case UmaPackage.WORK_PRODUCT__TEMPLATES:
-			return templates != null && !templates.isEmpty();
-		case UmaPackage.WORK_PRODUCT__TOOL_MENTORS:
-			return toolMentors != null && !toolMentors.isEmpty();
-		case UmaPackage.WORK_PRODUCT__ESTIMATION_CONSIDERATIONS:
-			return estimationConsiderations != null
-					&& !estimationConsiderations.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //WorkProductImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkProductTypeImpl.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkProductTypeImpl.java
deleted file mode 100755
index 07f426b..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/WorkProductTypeImpl.java
+++ /dev/null
@@ -1,152 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Work Product Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.uma.impl.WorkProductTypeImpl#getWorkProducts <em>Work Products</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkProductTypeImpl extends ContentCategoryImpl implements
-		WorkProductType {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * The cached value of the '{@link #getWorkProducts() <em>Work Products</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkProducts()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList workProducts = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkProductTypeImpl() {
-		super();
-
-		//UMA-->
-		reassignDefaultValues();
-		//UMA<--
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WORK_PRODUCT_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getWorkProducts() {
-		if (workProducts == null) {
-			workProducts = new EObjectResolvingEList(WorkProduct.class, this,
-					UmaPackage.WORK_PRODUCT_TYPE__WORK_PRODUCTS);
-		}
-		return workProducts;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT_TYPE__WORK_PRODUCTS:
-			return getWorkProducts();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT_TYPE__WORK_PRODUCTS:
-			getWorkProducts().clear();
-			getWorkProducts().addAll((Collection) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT_TYPE__WORK_PRODUCTS:
-			getWorkProducts().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		//UMA-->
-		EStructuralFeature feature = getFeatureWithOverridenDefaultValue(featureID);
-		if (feature != null) {
-			return isFeatureWithOverridenDefaultValueSet(feature);
-		}
-		//UMA<--		
-		switch (featureID) {
-		case UmaPackage.WORK_PRODUCT_TYPE__WORK_PRODUCTS:
-			return workProducts != null && !workProducts.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //WorkProductTypeImpl
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/package.html b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/package.html
deleted file mode 100755
index ef0fb75..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/impl/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the implementation for the UMA model objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/package.html b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/package.html
deleted file mode 100755
index fc44385..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces for the UMA model objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/AssociationHelper.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/AssociationHelper.java
deleted file mode 100755
index 8d1f926..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/AssociationHelper.java
+++ /dev/null
@@ -1,1247 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.util;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Report;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.Roadmap;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.Section;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.Template;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.epf.uma.ecore.impl.MultiResourceEObject;
-import org.eclipse.epf.uma.ecore.util.OppositeFeature;
-
-/**
- * A helper class for navigating and querying bidirectional associations among
- * the model objects.
- * 
- * @author Phong Nguyen Le
- * @author Kelvin Low
- * @since 1.0
- */
-public final class AssociationHelper {
-
-	/**
-	 * An opposite feature used for retrieving the disciplines which a task is
-	 * categorized under.
-	 */
-	public static final OppositeFeature Task_Disciplines = new OppositeFeature(
-			Task.class,
-			"Task_Disciplines", UmaPackage.eINSTANCE.getDiscipline_Tasks(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the task descriptors which are
-	 * created from a specific task.
-	 */
-	public static final OppositeFeature Task_TaskDescriptors = new OppositeFeature(
-			Task.class,
-			"Task_TaskDescriptors", UmaPackage.eINSTANCE.getTaskDescriptor_Task(), true, false); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the domains which a work product
-	 * is categorized under.
-	 */
-	public static final OppositeFeature WorkProduct_Domains = new OppositeFeature(
-			WorkProduct.class,
-			"WorkProduct_Domains", UmaPackage.eINSTANCE.getDomain_WorkProducts(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the tasks which produce a work
-	 * product as an output.
-	 */
-	public static final OppositeFeature WorkProduct_OutputFrom_Tasks = new OppositeFeature(
-			WorkProduct.class,
-			"WorkProduct_OutputFrom_Tasks", UmaPackage.eINSTANCE.getTask_Output(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the tasks which use a work
-	 * product as a mandatory input.
-	 */
-	public static final OppositeFeature WorkProduct_MandatoryInputTo_Tasks = new OppositeFeature(
-			WorkProduct.class,
-			"WorkProduct_InputTo_Tasks", UmaPackage.eINSTANCE.getTask_MandatoryInput(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the work product types which a
-	 * work product is categorized under.
-	 */
-	public static final OppositeFeature WorkProduct_WorkProductTypes = new OppositeFeature(
-			WorkProduct.class,
-			"WorkProduct_WorkProductTypes", UmaPackage.eINSTANCE.getWorkProductType_WorkProducts(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the responsible roles for a work
-	 * product.
-	 */
-	public static final OppositeFeature WorkProduct_ResponsibleRoles = new OppositeFeature(
-			WorkProduct.class,
-			"WorkProduct_ResponsibleRoles", UmaPackage.eINSTANCE.getRole_ResponsibleFor(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the deliverables which a work
-	 * product is contained in.
-	 */
-	public static final OppositeFeature WorkProduct_Deliverables = new OppositeFeature(
-			WorkProduct.class,
-			"WorkProduct_Deliverables", UmaPackage.eINSTANCE.getDeliverable_DeliveredWorkProducts(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the tasks that use a work product
-	 * as an optional input.
-	 */
-	public static final OppositeFeature WorkProduct_OptionalInputTo_Tasks = new OppositeFeature(
-			WorkProduct.class,
-			"WorkProduct_OptionalInputTo_Tasks", UmaPackage.eINSTANCE.getTask_OptionalInput(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the work product descriptors
-	 * which are created from a work product.
-	 */
-	public static final OppositeFeature WorkProduct_WorkProductDescriptors = new OppositeFeature(
-			WorkProduct.class,
-			"WorkProduct_WorkProductDescriptors", UmaPackage.eINSTANCE.getWorkProductDescriptor_WorkProduct(), true, false); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the primary tasks of a role.
-	 */
-	public static final OppositeFeature Role_Primary_Tasks = new OppositeFeature(
-			Role.class,
-			"Role_Primary_Tasks", UmaPackage.eINSTANCE.getTask_PerformedBy(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the secondary tasks of a role.
-	 */
-	public static final OppositeFeature Role_Secondary_Tasks = new OppositeFeature(
-			Role.class,
-			"Role_Secondary_Tasks", UmaPackage.eINSTANCE.getTask_AdditionallyPerformedBy(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the role sets which a role is
-	 * categorized under.
-	 */
-	public static final OppositeFeature Role_RoleSets = new OppositeFeature(
-			Role.class,
-			"Role_RoleSets", UmaPackage.eINSTANCE.getRoleSet_Roles(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the composite roles which
-	 * includes a role.
-	 */
-	public static final OppositeFeature Role_ResourceDefinitions = new OppositeFeature(
-			Role.class,
-			"Role_ResourceDefinitions", UmaPackage.eINSTANCE.getCompositeRole_AggregatedRoles(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the role descriptors which are
-	 * created from a role.
-	 */
-	public static final OppositeFeature Role_RoleDescriptors = new OppositeFeature(
-			Role.class,
-			"Role_RoleDescriptors", UmaPackage.eINSTANCE.getRoleDescriptor_Role(), true, false); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the content elements which a
-	 * checklist is associated with.
-	 */
-	public static final OppositeFeature Checklist_ContentElements = new OppositeFeature(
-			Checklist.class,
-			"Checklist_ContentElements", UmaPackage.eINSTANCE.getContentElement_Checklists(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the activities which a concept is
-	 * associated with.
-	 */
-	public static final OppositeFeature Concept_Activities = new OppositeFeature(
-			Concept.class,
-			"Concept_Activities", UmaPackage.eINSTANCE.getActivity_Concepts(), true, false); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the content elements which a
-	 * concept is associated with.
-	 */
-	public static final OppositeFeature Concept_ContentElements = new OppositeFeature(
-			Concept.class,
-			"Concept_ContentElements", UmaPackage.eINSTANCE.getContentElement_ConceptsAndPapers(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the content elements which an
-	 * example is associated with.
-	 */
-	public static final OppositeFeature Example_ContentElements = new OppositeFeature(
-			Example.class,
-			"Example_ContentElements", UmaPackage.eINSTANCE.getContentElement_Examples(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the content elements which a
-	 * report is associated with.
-	 */
-	public static final OppositeFeature Report_WorkProducts = new OppositeFeature(
-			Report.class,
-			"Report_WorkProducts", UmaPackage.eINSTANCE.getWorkProduct_Reports(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the content elements which a
-	 * reusable asset is associated with.
-	 */
-	public static final OppositeFeature ReusableAsset_ContentElements = new OppositeFeature(
-			ReusableAsset.class,
-			"ReusableAsset_ContentElements", UmaPackage.eINSTANCE.getContentElement_Assets(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the activities which a roadmap is
-	 * associated with.
-	 */
-	public static final OppositeFeature Roadmap_Activites = new OppositeFeature(
-			Roadmap.class,
-			"Roadmap_Activites", UmaPackage.eINSTANCE.getActivity_Roadmaps(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the activities which a supporting
-	 * material is associated with.
-	 */
-	public static final OppositeFeature SupportingMaterial_Activities = new OppositeFeature(
-			SupportingMaterial.class,
-			"SupportingMaterial_Activities", UmaPackage.eINSTANCE.getActivity_SupportingMaterials(), true, false); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the content elements which a
-	 * supporting material is associated with.
-	 */
-	public static final OppositeFeature SupportingMaterial_ContentElements = new OppositeFeature(
-			SupportingMaterial.class,
-			"SupportingMaterial_ContentElements", UmaPackage.eINSTANCE.getContentElement_SupportingMaterials(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the delivery processes which a
-	 * communication supporting material is associated with.
-	 */
-	public static final OppositeFeature SupportingMaterial_Communications_DeliveryProcesses = new OppositeFeature(
-			SupportingMaterial.class,
-			"SupportingMaterial_Communications_DeliveryProcesses", UmaPackage.eINSTANCE.getDeliveryProcess_CommunicationsMaterials(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the delivery processes which an
-	 * education supporting material is associated with.
-	 */
-	public static final OppositeFeature SupportingMaterial_Education_DeliveryProcesses = new OppositeFeature(
-			SupportingMaterial.class,
-			"SupportingMaterial_Education_DeliveryProcesses", UmaPackage.eINSTANCE.getDeliveryProcess_EducationMaterials(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the method units which a
-	 * copyright supporting material is associated with.
-	 */
-	public static final OppositeFeature SupportingMaterial_CopyrightStatement_MethodUnits = new OppositeFeature(
-			SupportingMaterial.class,
-			"SupportingMaterial_CopyrightStatement_MethodPlugins", UmaPackage.eINSTANCE.getMethodUnit_CopyrightStatement(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the content elements which a
-	 * guideline is associated with.
-	 */
-	public static final OppositeFeature Guideline_ContentElements = new OppositeFeature(
-			Guideline.class,
-			"Guideline_ContentElements", UmaPackage.eINSTANCE.getContentElement_Guidelines(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the activities which a guideline
-	 * is associated with.
-	 */
-	public static final OppositeFeature Guideline_Activities = new OppositeFeature(
-			Guideline.class,
-			"Guideline_Activities", UmaPackage.eINSTANCE.getActivity_Guidelines(), true, false); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the work products which a
-	 * template is associated with.
-	 */
-	public static final OppositeFeature Template_WorkProducts = new OppositeFeature(
-			Template.class,
-			"Template_WorkProducts", UmaPackage.eINSTANCE.getWorkProduct_Templates(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the tool which a tool mentor is
-	 * categorized under.
-	 */
-	public static final OppositeFeature ToolMentor_Tool = new OppositeFeature(
-			ToolMentor.class,
-			"ToolMentor_Tool", UmaPackage.eINSTANCE.getTool_ToolMentors(), false); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the tasks which a tool mentor is
-	 * associated with.
-	 */
-	public static final OppositeFeature ToolMentor_Tasks = new OppositeFeature(
-			ToolMentor.class,
-			"ToolMentor_Tasks", UmaPackage.eINSTANCE.getTask_ToolMentors(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the work products which a tool
-	 * mentor is associated with.
-	 */
-	public static final OppositeFeature ToolMentor_WorkProducts = new OppositeFeature(
-			Template.class,
-			"ToolMentor_WorkProducts", UmaPackage.eINSTANCE.getWorkProduct_ToolMentors(), true); //$NON-NLS-1$	
-
-	/**
-	 * An opposite feature used for retrieving the custom categories which a
-	 * describable element is associated with.
-	 */
-	public static final OppositeFeature DescribableElement_CustomCategories = new OppositeFeature(
-			DescribableElement.class,
-			"ContentElement_CustomCategories", UmaPackage.eINSTANCE.getCustomCategory_CategorizedElements(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the practices referenced by a
-	 * content element.
-	 */
-	public static final OppositeFeature ContentElement_Practices = new OppositeFeature(
-			ContentElement.class,
-			"ContentElement_Practices", UmaPackage.eINSTANCE.getPractice_ContentReferences(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the method plug-ins referenced by
-	 * a method plug-in.
-	 */
-	public static final OppositeFeature MethodPlugin_DirectExtensions = new OppositeFeature(
-			MethodPlugin.class,
-			"MethodPlugin_DirectExtensions", UmaPackage.eINSTANCE.getMethodPlugin_Bases(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the method configurations which
-	 * contain a reference to a method plug-in.
-	 */
-	public static final OppositeFeature MethodPlugin_MethodConfigurations = new OppositeFeature(
-			MethodPlugin.class,
-			"MethodPlugin_MethodConfigurations", UmaPackage.eINSTANCE.getMethodConfiguration_MethodPluginSelection(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the method packages
-	 * used/referenced by a method package.
-	 */
-	public static final OppositeFeature MethodPackage_UsingPackages = new OppositeFeature(
-			MethodPackage.class,
-			"MethodPackage_UsingPackages", UmaPackage.eINSTANCE.getMethodPackage_ReusedPackages(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the method configurations which
-	 * contain a reference to a method package.
-	 */
-	public static final OppositeFeature MethodPackage_MethodConfigurations = new OppositeFeature(
-			MethodPackage.class,
-			"MethodPackage_MethodConfigurations", UmaPackage.eINSTANCE.getMethodConfiguration_MethodPackageSelection(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the method configurations which
-	 * contain a reference to a CustomCategory.
-	 */
-	public static final OppositeFeature CustomCategory_MethodConfigurations = new OppositeFeature(
-			CustomCategory.class,
-			"CustomCategory_MethodConfigurations", UmaPackage.eINSTANCE.getMethodConfiguration_ProcessViews(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the discipline groupings which
-	 * contain a reference to a discipline.
-	 */
-	public static final OppositeFeature Discipline_DisciplineGroupings = new OppositeFeature(
-			Discipline.class,
-			"Discipline_DisciplineGroupings", UmaPackage.eINSTANCE.getDisciplineGrouping_Disciplines(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the role set groupings which
-	 * contain a reference to a role set.
-	 */
-	public static final OppositeFeature RoleSet_RoleSetGrouppings = new OppositeFeature(
-			RoleSet.class,
-			"RoleSet_RoleSetGrouppings", UmaPackage.eINSTANCE.getRoleSetGrouping_RoleSets(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the successor of a work order.
-	 */
-	public static final OppositeFeature WorkOrder_Successor = new OppositeFeature(
-			WorkOrder.class,
-			"WorkOrder_Successor", UmaPackage.eINSTANCE.getWorkBreakdownElement_LinkToPredecessor(), false); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the successor link of a work
-	 * breakdown element.
-	 */
-	public static final OppositeFeature WorkBreakdownElement_LinkToSuccessor = new OppositeFeature(
-			WorkBreakdownElement.class,
-			"WorkBreakdownElement_LinkToSuccessor", UmaPackage.eINSTANCE.getWorkOrder_Pred(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the immediate variaties of a
-	 * variability element.
-	 */
-	public static final OppositeFeature VariabilityElement_ImmediateVarieties = new OppositeFeature(
-			VariabilityElement.class,
-			"VariabilityElement_ImmediateVarieties", UmaPackage.eINSTANCE.getVariabilityElement_VariabilityBasedOnElement(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the successors to a section.
-	 */
-	public static final OppositeFeature Section_Successors = new OppositeFeature(
-			Section.class,
-			"Section_Successors", UmaPackage.eINSTANCE.getSection_Predecessor(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the task descriptors which a
-	 * section is associated with.
-	 */
-	public static final OppositeFeature Section_TaskDescriptors = new OppositeFeature(
-			Section.class,
-			"Section_TaskDescriptors", UmaPackage.eINSTANCE.getTaskDescriptor_SelectedSteps(), true, false); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the team profiles which includes
-	 * a specific role descriptor.
-	 */
-	public static final OppositeFeature RoleDescriptor_TeamProfiles = new OppositeFeature(
-			RoleDescriptor.class,
-			"RoleDescriptor_TeamProfiles", UmaPackage.eINSTANCE.getTeamProfile_TeamRoles(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the primary task descriptors
-	 * performed by a role descriptor.
-	 */
-	public static final OppositeFeature RoleDescriptor_PrimaryTaskDescriptors = new OppositeFeature(
-			RoleDescriptor.class,
-			"RoleDescriptor_PrimaryTaskDescriptors", UmaPackage.eINSTANCE.getTaskDescriptor_PerformedPrimarilyBy(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the additional task descriptors
-	 * performed by a role descriptor.
-	 */
-	public static final OppositeFeature RoleDescriptor_AdditionalTaskDescriptors = new OppositeFeature(
-			RoleDescriptor.class,
-			"RoleDescriptor_AdditionalTaskDescriptors", UmaPackage.eINSTANCE.getTaskDescriptor_AdditionallyPerformedBy(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the assisting task descriptors
-	 * performed by a role descriptor.
-	 */
-	public static final OppositeFeature RoleDescriptor_AssistsIn_TaskDescriptors = new OppositeFeature(
-			RoleDescriptor.class,
-			"RoleDescriptor_AssistsIn_TaskDescriptors", UmaPackage.eINSTANCE.getTaskDescriptor_AssistedBy(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the dependent processes
-	 * referenced in a method configuration.
-	 */
-	public static final OppositeFeature MethodConfiguration_DependentProcesses = new OppositeFeature(
-			MethodConfiguration.class,
-			"MethodConfiguration_DependentProcesses", UmaPackage.eINSTANCE.getProcess_DefaultContext(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the valid processes referenced in
-	 * a method configuration.
-	 */
-	public static final OppositeFeature MethodConfiguration_ValidContext_Processes = new OppositeFeature(
-			MethodConfiguration.class,
-			"MethodConfiguration_ValidContext_Processes", UmaPackage.eINSTANCE.getProcess_ValidContext(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the task descriptors which
-	 * produce a work product descriptor as an output.
-	 */
-	public static final OppositeFeature WorkProductDescriptor_OutputFrom_TaskDescriptors = new OppositeFeature(
-			WorkProductDescriptor.class,
-			"WorkProductDescriptor_OutputFrom_TaskDescriptors", UmaPackage.eINSTANCE.getTaskDescriptor_Output(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the task descriptors which use a
-	 * work product descriptor as an optional input.
-	 */
-	public static final OppositeFeature WorkProductDescriptor_OptionalInputTo_TaskDescriptors = new OppositeFeature(
-			WorkProductDescriptor.class,
-			"WorkProductDescriptor_OptionalInputTo_TaskDescriptors", UmaPackage.eINSTANCE.getTaskDescriptor_OptionalInput(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the task descriptors which use a
-	 * work product descriptor as an mandatory input.
-	 */
-	public static final OppositeFeature WorkProductDescriptor_MandatoryInputTo_TaskDescriptors = new OppositeFeature(
-			WorkProductDescriptor.class,
-			"WorkProductDescriptor_MandatoryInputTo_TaskDescriptors", //$NON-NLS-1$
-			UmaPackage.eINSTANCE.getTaskDescriptor_MandatoryInput(), true);
-
-	/**
-	 * An opposite feature used for retrieving the task descriptors which use a
-	 * work product descriptor as an external input.
-	 */
-	public static final OppositeFeature WorkProductDescriptor_ExternalInputTo_TaskDescriptors = new OppositeFeature(
-			WorkProductDescriptor.class,
-			"WorkProductDescriptor_ExternalInputTo_TaskDescriptors", //$NON-NLS-1$
-			UmaPackage.eINSTANCE.getTaskDescriptor_ExternalInput(), true);
-
-	/**
-	 * An opposite feature used for retrieving the role descriptors which are
-	 * responsible for a work product descriptor.
-	 */
-	public static final OppositeFeature WorkProductDescriptor_ResponsibleRoleDescriptors = new OppositeFeature(
-			WorkProductDescriptor.class,
-			"WorkProductDescriptor_ResponsibleRoleDescriptors", //$NON-NLS-1$
-			UmaPackage.eINSTANCE.getRoleDescriptor_ResponsibleFor(), true);
-
-	/**
-	 * An opposite feature used for retrieving the deliverable descriptors which
-	 * contain a specific work product descriptor.
-	 */
-	public static final OppositeFeature WorkProductDescriptor_DeliverableDescriptors = new OppositeFeature(
-			WorkProductDescriptor.class,
-			"WorkProductDescriptor_DeliverableDescriptors", UmaPackage.eINSTANCE.getWorkProductDescriptor_DeliverableParts(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the disciplines which an activity
-	 * is associated with.
-	 */
-	public static final OppositeFeature Activity_Disciplines = new OppositeFeature(
-			Activity.class,
-			"Activity_Disciplines", UmaPackage.eINSTANCE.getDiscipline_ReferenceWorkflows(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the practices which an activity
-	 * is associated with.
-	 */
-	public static final OppositeFeature Activity_Pratices = new OppositeFeature(
-			Activity.class,
-			"Activity_Pratices", UmaPackage.eINSTANCE.getPractice_ActivityReferences(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the process planning templates
-	 * which a process is associated with.
-	 */
-	public static final OppositeFeature Process_ProcessPlanningTemplates = new OppositeFeature(
-			Process.class,
-			"Process_ProcessPlanningTemplates", UmaPackage.eINSTANCE.getProcessPlanningTemplate_BasedOnProcesses(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the procesess which references a
-	 * capability pattern.
-	 */
-	public static final OppositeFeature CapabilityPattern_ConsumingProcesses = new OppositeFeature(
-			CapabilityPattern.class,
-			"CapabilityPattern_ConsumingProcesses", UmaPackage.eINSTANCE.getProcess_IncludesPatterns(), true); //$NON-NLS-1$
-
-	/**
-	 * An opposite feature used for retrieving the breakdown element which is
-	 * displayed before a breakdown element.
-	 */
-	public static final OppositeFeature BreakdownElement_PresentedBefore = new OppositeFeature(
-			BreakdownElement.class,
-			"BreakdownElement_PresentedBefore", //$NON-NLS-1$
-			UmaPackage.eINSTANCE.getBreakdownElement_PresentedAfter(), true,
-			false);
-
-	/**
-	 * An opposite feature used for retrieving the breakdown element which is
-	 * displayed after a breakdown element.
-	 */
-	public static final OppositeFeature BreakdownElement_PresentedAfter = new OppositeFeature(
-			BreakdownElement.class,
-			"BreakdownElement_PresentedAfter", //$NON-NLS-1$
-			UmaPackage.eINSTANCE.getBreakdownElement_PresentedBefore(), true,
-			false);
-
-	/**
-	 * An opposite feature used for retrieving the UMA sematic model bridges
-	 * referenced by a method element.
-	 */
-	public static final OppositeFeature MethodElement_UMASematicModelBridges = new OppositeFeature(
-			MethodElement.class,
-			"MethodElement_UMASematicModelBridges", //$NON-NLS-1$
-			UmaPackage.eINSTANCE.getUMASemanticModelBridge_Element(), true,
-			false);
-
-	private static ArrayList predefinedOppositeFeatures;
-
-	static {
-		registerPredefinedOppositeFeatures();
-	}
-
-	/**
-	 * Registers the predefined opposite features.
-	 */
-	public static final void registerPredefinedOppositeFeatures() {
-		predefinedOppositeFeatures = new ArrayList();
-		AssociationHelper object = new AssociationHelper();
-		Field[] fields = object.getClass().getDeclaredFields();
-		for (int i = 0; i < fields.length; i++) {
-			Field field = fields[i];
-			int mod = field.getModifiers();
-			if (Modifier.isPublic(mod) && Modifier.isStatic(mod)
-					&& Modifier.isFinal(mod)
-					&& field.getType() == OppositeFeature.class) {
-				try {
-					predefinedOppositeFeatures.add(field.get(object));
-				} catch (IllegalArgumentException e) {
-					e.printStackTrace();
-				} catch (IllegalAccessException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-
-		/*
-		 * System.out
-		 * .println("AssociationHelper.registerPredefinedOppositeFeatures():
-		 * defined opposite features: " + predefinedOppositeFeatures.size());
-		 * //$NON-NLS-1$ System.out.println(predefinedOppositeFeatures);
-		 */
-
-		for (Iterator iter = predefinedOppositeFeatures.iterator(); iter
-				.hasNext();) {
-			OppositeFeature feature = (OppositeFeature) iter.next();
-			OppositeFeature.registerOppositeFeature(feature);
-		}
-	}
-
-	/**
-	 * Gets the predefined opposite features.
-	 * 
-	 * @return the predefined opposite features
-	 */
-	public static Collection getPredefinedOppositeFeatures() {
-		return predefinedOppositeFeatures;
-	}
-
-	/**
-	 * Gets the deliverable descriptors which contain the given work product
-	 * descriptor.
-	 * 
-	 * @param wpd
-	 *            a work descriptor
-	 * @return a list of deliverable descriptors
-	 */
-	public static List getDeliverableDescriptors(WorkProductDescriptor wpd) {
-		return (List) ((MultiResourceEObject) wpd)
-				.getOppositeFeatureValue(WorkProductDescriptor_DeliverableDescriptors);
-	}
-
-	/**
-	 * Gets the task descriptors which use a work product descriptor as an
-	 * external input.
-	 * 
-	 * @param wpd
-	 *            a work descriptor
-	 * @return a list of task descriptors
-	 */
-	public static List getExternalInputTo(WorkProductDescriptor wpd) {
-		return (List) ((MultiResourceEObject) wpd)
-				.getOppositeFeatureValue(WorkProductDescriptor_ExternalInputTo_TaskDescriptors);
-	}
-
-	/**
-	 * Gets the task descriptors which use a work product descriptor as a
-	 * mandatory input.
-	 * 
-	 * @param wpd
-	 *            a work descriptor
-	 * @return a list of task descriptors
-	 */
-	public static List getMandatoryInputTo(WorkProductDescriptor wpd) {
-		return (List) ((MultiResourceEObject) wpd)
-				.getOppositeFeatureValue(WorkProductDescriptor_MandatoryInputTo_TaskDescriptors);
-	}
-
-	/**
-	 * Gets the task descriptors which use a work product descriptor as an
-	 * optional input.
-	 * 
-	 * @param wpd
-	 *            a work descriptor
-	 * @return a list of task descriptors
-	 */
-	public static List getOptionalInputTo(WorkProductDescriptor wpd) {
-		return (List) ((MultiResourceEObject) wpd)
-				.getOppositeFeatureValue(WorkProductDescriptor_OptionalInputTo_TaskDescriptors);
-	}
-
-	/**
-	 * Gets the task descriptors which which produce a work product descriptor
-	 * as an output.
-	 * 
-	 * @param wpd
-	 *            a work descriptor
-	 * @return a list of task descriptors
-	 */
-	public static List getOutputFrom(WorkProductDescriptor wpd) {
-		return (List) ((MultiResourceEObject) wpd)
-				.getOppositeFeatureValue(WorkProductDescriptor_OutputFrom_TaskDescriptors);
-	}
-
-	/**
-	 * Gets the role descriptors which are responsible for a work product
-	 * descriptor.
-	 * 
-	 * @param wpd
-	 *            a work descriptor
-	 * @return a list of role descriptors
-	 */
-	public static List getResponsibleRoleDescriptors(WorkProductDescriptor wpd) {
-		return (List) wpd
-				.getOppositeFeatureValue(WorkProductDescriptor_ResponsibleRoleDescriptors);
-	}
-
-	/**
-	 * Gets the the dependent processes referenced in a method configuration.
-	 * 
-	 * @param e
-	 *            a method configuration
-	 * @return a list of processes
-	 */
-	public static List getDependentProcesses(MethodConfiguration e) {
-		return (List) ((MultiResourceEObject) e)
-				.getOppositeFeatureValue(MethodConfiguration_DependentProcesses);
-	}
-
-	/**
-	 * Gets the team profiles which includes a specific role descriptor.
-	 * 
-	 * @param e
-	 *            a role descriptor
-	 * @return a list of team profiles
-	 */
-	public static List getTeamProfiles(RoleDescriptor e) {
-		return (List) ((MultiResourceEObject) e)
-				.getOppositeFeatureValue(RoleDescriptor_TeamProfiles);
-	}
-
-	/**
-	 * Gets the practices referenced by a content element.
-	 * 
-	 * @param e
-	 *            a content element
-	 * @return a list of practices
-	 */
-	public static List getPractices(ContentElement e) {
-		return (List) ((MultiResourceEObject) e)
-				.getOppositeFeatureValue(ContentElement_Practices);
-	}
-
-	/**
-	 * Gets the tool which a tool mentor is categorized under.
-	 * 
-	 * @param e
-	 *            a tool mentor
-	 * @return a tool
-	 */
-	public static Tool getTool(ToolMentor toolMentor) {
-		return (Tool) ((MultiResourceEObject) toolMentor)
-				.getOppositeFeatureValue(ToolMentor_Tool);
-	}
-
-	/**
-	 * Gets the successors to a section.
-	 * 
-	 * @param e
-	 *            a section
-	 * @return a list of sections that are postioned after the given section
-	 */
-	public static List getSuccessors(Section section) {
-		return (List) ((MultiResourceEObject) section)
-				.getOppositeFeatureValue(Section_Successors);
-	}
-
-	/**
-	 * Gets the immediate variaties of a variability element.
-	 * 
-	 * @param e
-	 *            a variability element
-	 * @return a list of immediate variaties
-	 */
-	public static List getImmediateVarieties(VariabilityElement e) {
-		return (List) ((MultiResourceEObject) e)
-				.getOppositeFeatureValue(VariabilityElement_ImmediateVarieties);
-	}
-
-	/**
-	 * Gets the primary tasks of a role.
-	 * 
-	 * @param role
-	 *            a role
-	 * @return a list of tasks
-	 */
-	public static List getPrimaryTasks(Role role) {
-		return (List) ((MultiResourceEObject) role)
-				.getOppositeFeatureValue(Role_Primary_Tasks);
-	}
-
-	/**
-	 * Gets the secondary tasks of a role.
-	 * 
-	 * @param role
-	 *            a role
-	 * @return a list of tasks
-	 */
-	public static List getSecondaryTasks(Role role) {
-		return (List) ((MultiResourceEObject) role)
-				.getOppositeFeatureValue(Role_Secondary_Tasks);
-	}
-
-	/**
-	 * Gets the successor link of a work breakdown element.
-	 * 
-	 * @param e
-	 *            a break down element
-	 * @return a list of links to work breakdown elements
-	 */
-	public static List getLinkToSuccessor(BreakdownElement e) {
-		return (List) ((MultiResourceEObject) e)
-				.getOppositeFeatureValue(WorkBreakdownElement_LinkToSuccessor);
-	}
-
-	/**
-	 * Gets the successor of a work order.
-	 * 
-	 * @param workOrder
-	 *            a work order
-	 * @return a work breakdown element
-	 */
-	public static WorkBreakdownElement getSuccessor(WorkOrder workOrder) {
-		return (WorkBreakdownElement) ((MultiResourceEObject) workOrder)
-				.getOppositeFeatureValue(WorkOrder_Successor);
-	}
-
-	/**
-	 * Gets the tasks which produce a work product as an output.
-	 * 
-	 * @param wp
-	 *            a work product
-	 * @return a list of tasks
-	 */
-	public static List getOutputtingTasks(WorkProduct wp) {
-		return (List) ((MultiResourceEObject) wp)
-				.getOppositeFeatureValue(WorkProduct_OutputFrom_Tasks);
-	}
-
-	/**
-	 * Gets the tasks which use a work product as a mandatory input.
-	 * 
-	 * @param wp
-	 *            a work product
-	 * @return a list of tasks
-	 */
-	public static List getMandatoryInputToTasks(WorkProduct wp) {
-		return (List) ((MultiResourceEObject) wp)
-				.getOppositeFeatureValue(WorkProduct_MandatoryInputTo_Tasks);
-	}
-
-	/**
-	 * Gets the responsible roles for a work product.
-	 * 
-	 * @param wp
-	 *            a work product
-	 * @return a list of roles
-	 */
-	public static List getResponsibleRoles(WorkProduct wp) {
-		return (List) wp.getOppositeFeatureValue(WorkProduct_ResponsibleRoles);
-	}
-
-	/**
-	 * Gets the work products modified by a role.
-	 * 
-	 * @param role
-	 *            a role
-	 * @return a list of work products
-	 */
-	public static List getModifiedWorkProducts(Role role) {
-		List performs = getPrimaryTasks(role);
-		List modifies = new BasicEList();
-		if (performs != null && performs.size() > 0) {
-			for (Iterator i = performs.iterator(); i.hasNext();) {
-				Task task = (Task) i.next();
-
-				// for each task, get output work product;
-				List outputWPs = task.getOutput();
-				if (outputWPs != null && outputWPs.size() > 0) {
-					for (Iterator it = outputWPs.iterator(); it.hasNext();) {
-						WorkProduct wp = (WorkProduct) it.next();
-						if (wp != null) {
-							if (!modifies.contains(wp)) {
-								modifies.add(wp);
-							}
-						}
-					}
-				}
-			}
-		}
-		return modifies;
-
-	}
-
-	/**
-	 * Gets the roles that modify a work product.
-	 * 
-	 * @param wp
-	 *            a work product
-	 * @return a list of roles
-	 */
-	public static List getModifiedBy(WorkProduct wp) {
-		List outputFrom = AssociationHelper.getOutputtingTasks(wp); // this.getOutputFrom();
-		java.util.ArrayList modifies = new java.util.ArrayList();
-		if (outputFrom != null && outputFrom.size() > 0) {
-			for (Iterator it = outputFrom.iterator(); it.hasNext();) {
-				// for each task get, get primary performer role
-				Task task = (Task) it.next();
-				Role modifiedByRole = task.getPerformedBy();
-				if (modifiedByRole != null) {
-					if (!modifies.contains(modifiedByRole)) {
-						modifies.add(modifiedByRole);
-					}
-				}
-			}
-		}
-		return modifies;
-	}
-
-	/**
-	 * Gets the discipline groupings which contain a reference to a discipline.
-	 * 
-	 * @param discipline
-	 *            a discipline
-	 * @return a list of discipline groupings
-	 */
-	public static List getDisciplineGroups(Discipline discipline) {
-		return (List) ((MultiResourceEObject) discipline)
-				.getOppositeFeatureValue(Discipline_DisciplineGroupings);
-	}
-
-	/**
-	 * Gets the domains which a work product is categorized under.
-	 * 
-	 * @param wp
-	 *            a work product
-	 * @return a domain
-	 */
-	public static List getDomains(WorkProduct wp) {
-		return (List) ((MultiResourceEObject) wp)
-				.getOppositeFeatureValue(WorkProduct_Domains);
-	}
-
-	/**
-	 * Gets the role set groupings which contain a reference to a role set.
-	 * 
-	 * @param roleSet
-	 *            a role set
-	 * @return a list of role set groupings
-	 */
-	public static List getRoleSetGroups(RoleSet roleSet) {
-		return (List) ((MultiResourceEObject) roleSet)
-				.getOppositeFeatureValue(RoleSet_RoleSetGrouppings);
-	}
-
-	/**
-	 * Gets the role sets which a role is categorized under.
-	 * 
-	 * @param role
-	 *            a role
-	 * @return a list of role sets
-	 */
-	public static List getRoleSets(Role role) {
-		return (List) ((MultiResourceEObject) role)
-				.getOppositeFeatureValue(Role_RoleSets);
-	}
-
-	/**
-	 * Gets the task descriptors which have been created from a task.
-	 * 
-	 * @param task
-	 *            a task
-	 * @return a list of task descriptors
-	 */
-	public static List getTaskDescriptors(Task task) {
-		return (List) task.getOppositeFeatureValue(Task_TaskDescriptors);
-	}
-
-	/**
-	 * Gets the disciplines which a task is categorized under.
-	 * 
-	 * @param task
-	 *            a task
-	 * @return a list of disciplines
-	 */
-	public static List getDisciplines(Task task) {
-		return (List) task.getOppositeFeatureValue(Task_Disciplines);
-	}
-
-	/**
-	 * Gets the disciplines which an activity is associated with.
-	 * 
-	 * @param activity
-	 *            an activity
-	 * @return a list of disciplines
-	 */
-	public static List getDisciplines(Activity activity) {
-		return (List) activity.getOppositeFeatureValue(Activity_Disciplines);
-	}
-
-	/**
-	 * Gets the primary task descriptors performed by a role descriptor.
-	 * 
-	 * @param roleDesc
-	 *            a role descriptor
-	 * @return a list of task descriptors
-	 */
-	public static List getPrimaryTaskDescriptors(RoleDescriptor roleDesc) {
-		return (List) ((MultiResourceEObject) roleDesc)
-				.getOppositeFeatureValue(RoleDescriptor_PrimaryTaskDescriptors);
-	}
-
-	/**
-	 * Gets the additional task descriptors performed by a role descriptor.
-	 * 
-	 * @param roleDesc
-	 *            a role descriptor
-	 * @return a list of task descriptors
-	 */
-	public static List getAdditionalTaskDescriptors(RoleDescriptor roleDesc) {
-		return (List) ((MultiResourceEObject) roleDesc)
-				.getOppositeFeatureValue(RoleDescriptor_AdditionalTaskDescriptors);
-	}
-
-	/**
-	 * Gets the assisting task descriptors performed by a role descriptor.
-	 * 
-	 * @param roleDesc
-	 *            a role descriptor
-	 * @return a list of task descriptors
-	 */
-	public static List getAssistedTaskDescriptors(RoleDescriptor roleDesc) {
-		return (List) ((MultiResourceEObject) roleDesc)
-				.getOppositeFeatureValue(RoleDescriptor_AssistsIn_TaskDescriptors);
-	}
-
-	/**
-	 * Gets the work product types which a work product is categorized under.
-	 * 
-	 * @param wp
-	 *            a work product
-	 * @return a list of work product types
-	 */
-	public static List getWorkProductTypes(WorkProduct wp) {
-		return (List) ((MultiResourceEObject) wp)
-				.getOppositeFeatureValue(WorkProduct_WorkProductTypes);
-	}
-
-	/**
-	 * Gets the custom categories which a describable element is associated
-	 * with.
-	 * 
-	 * @param wp
-	 *            a describable element
-	 * @return a list of custom categories
-	 */
-	public static List getCustomCategories(DescribableElement element) {
-		return (List) ((MultiResourceEObject) element)
-				.getOppositeFeatureValue(DescribableElement_CustomCategories);
-	}
-
-	/**
-	 * Gets the Deliverables which a WorkProduct element is associated with.
-	 * 
-	 * @param wp
-	 *            a WorkProduct element
-	 * @return a list of Deliverables
-	 */
-	public static List getDeliverables(WorkProduct element) {
-		return (List) ((MultiResourceEObject) element)
-				.getOppositeFeatureValue(WorkProduct_Deliverables);
-	}
-
-	/**
-	 * Gets the method plug-ins referenced by a method plug-in.
-	 * 
-	 * @param plugin
-	 *            a method plug-in
-	 * @return a list of method plug-ins
-	 */
-	public static List getPluginDirectExtensions(MethodPlugin plugin) {
-		return (List) ((MultiResourceEObject) plugin)
-				.getOppositeFeatureValue(MethodPlugin_DirectExtensions);
-	}
-
-	/**
-	 * Gets all the references to a method element.
-	 * 
-	 * @param element
-	 *            a method element
-	 * @return a collection of method element references
-	 */
-	public static Collection getReferences(MethodElement element) {
-		Set references = new HashSet();
-		MultiResourceEObject eObj = (MultiResourceEObject) element;
-
-		if (eObj.basicGetOppositeFeatureMap() == null)
-			return references;
-
-		for (Iterator iter = eObj.getOppositeFeatureMap().entrySet().iterator(); iter
-				.hasNext();) {
-			Map.Entry entry = (Map.Entry) iter.next();
-			OppositeFeature oppositeFeature = ((OppositeFeature) entry.getKey());
-			oppositeFeature.getTargetFeature();
-			if (oppositeFeature.isMany()) {
-				references.addAll((Collection) eObj
-						.getOppositeFeatureValue(oppositeFeature));
-			} else {
-				EObject obj = (EObject) eObj
-						.getOppositeFeatureValue(oppositeFeature);
-				if (obj != null) {
-					references.add(obj);
-				}
-			}
-		}
-
-		return references;
-	}
-
-	/**
-	 * Gets all the references to a method element.
-	 * 
-	 * @param element
-	 *            a method element
-	 * @return a map containing method element references
-	 */
-	public static Map getReferenceMap(MethodElement element) {
-		Map objectToFeaturesMap = new HashMap();
-
-		MultiResourceEObject eObj = (MultiResourceEObject) element;
-
-		if (eObj.basicGetOppositeFeatureMap() == null) {
-			return objectToFeaturesMap;
-		}
-
-		for (Iterator iter = eObj.getOppositeFeatureMap().entrySet().iterator(); iter
-				.hasNext();) {
-			Map.Entry entry = (Map.Entry) iter.next();
-			OppositeFeature oppositeFeature = ((OppositeFeature) entry.getKey());
-			EStructuralFeature feature = oppositeFeature.getTargetFeature();
-			if (oppositeFeature.isMany()) {
-				for (Iterator iterator = ((Collection) eObj
-						.getOppositeFeatureValue(oppositeFeature)).iterator(); iterator
-						.hasNext();) {
-					EObject object = (EObject) iterator.next();
-					Collection features = (Collection) objectToFeaturesMap
-							.get(object);
-					if (features == null) {
-						features = new ArrayList();
-						objectToFeaturesMap.put(object, features);
-					}
-					features.add(feature);
-				}
-				;
-			} else {
-				EObject object = (EObject) eObj
-						.getOppositeFeatureValue(oppositeFeature);
-				if (object != null) {
-					Collection features = (Collection) objectToFeaturesMap
-							.get(object);
-					if (features == null) {
-						features = new ArrayList();
-						objectToFeaturesMap.put(object, features);
-					}
-					features.add(feature);
-				}
-			}
-		}
-
-		return objectToFeaturesMap;
-	}
-
-	public static final void init() {
-	}
-
-	/**
-	 * Given a set of elements, returns the set of those elements plus any
-	 * variability elements associated with them.
-	 * 
-	 * @param elementSet
-	 *            a set of method elements for which to retrieve the variability
-	 *            elements
-	 * @param getBases
-	 *            if <code>true</code>, recurse into the variability base
-	 *            elements ("up the tree")
-	 * @param getChildren
-	 *            if <code>true</code>, recurse into the varieties ("down the
-	 *            tree")
-	 * @return a collective set of method elements plus the associated
-	 *         variability elements
-	 */
-	public static Set getVariabilityElements(Set elementSet, boolean getBases,
-			boolean getChildren) {
-		if (elementSet != null && !elementSet.isEmpty()) {
-			Set varSet = new HashSet();
-			for (Iterator iter = elementSet.iterator(); iter.hasNext();) {
-				Object o = iter.next();
-				if (o instanceof VariabilityElement) {
-					VariabilityElement element = (VariabilityElement) o;
-					if (getChildren)
-						varSet.addAll(getImmediateVarieties(element));
-					if (getBases
-							&& element.getVariabilityBasedOnElement() != null)
-						varSet.add(element.getVariabilityBasedOnElement());
-				}
-			}
-			if (varSet.isEmpty())
-				return elementSet;
-			if (elementSet.containsAll(varSet))
-				return elementSet;
-			elementSet.addAll(varSet);
-			elementSet.addAll(getVariabilityElements(elementSet, getBases,
-					getChildren));
-		}
-		return elementSet;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/ContentDescriptionFactory.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/ContentDescriptionFactory.java
deleted file mode 100755
index 8c895ce..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/ContentDescriptionFactory.java
+++ /dev/null
@@ -1,188 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.impl.ContentElementImpl;
-import org.eclipse.epf.uma.impl.ProcessElementImpl;
-
-/**
- * Manages the creation of content descriptions.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public final class ContentDescriptionFactory {
-
-	// Maps ContentElement implementation Class to ContentDesciptionInfo.
-	private static final Map contentDescClassMap = new HashMap();
-
-	static {
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getPractice(),
-				UmaPackage.eINSTANCE.getPracticeDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getRole(),
-				UmaPackage.eINSTANCE.getRoleDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getTask(),
-				UmaPackage.eINSTANCE.getTaskDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getTemplate(),
-				UmaPackage.eINSTANCE.getGuidanceDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getExample(),
-				UmaPackage.eINSTANCE.getGuidanceDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getReusableAsset(),
-				UmaPackage.eINSTANCE.getGuidanceDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getWhitepaper(),
-				UmaPackage.eINSTANCE.getGuidanceDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getArtifact(),
-				UmaPackage.eINSTANCE.getArtifactDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getDeliverable(),
-				UmaPackage.eINSTANCE.getDeliverableDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getOutcome(),
-				UmaPackage.eINSTANCE.getWorkProductDescription());
-
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getRoleDescriptor(),
-				UmaPackage.eINSTANCE.getDescriptorDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getCompositeRole(),
-				UmaPackage.eINSTANCE.getDescriptorDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getTaskDescriptor(),
-				UmaPackage.eINSTANCE.getDescriptorDescription());
-		contentDescClassMap.put(
-				UmaPackage.eINSTANCE.getWorkProductDescriptor(),
-				UmaPackage.eINSTANCE.getDescriptorDescription());
-
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getMilestone(),
-				UmaPackage.eINSTANCE.getBreakdownElementDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getTeamProfile(),
-				UmaPackage.eINSTANCE.getBreakdownElementDescription());
-
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getActivity(),
-				UmaPackage.eINSTANCE.getActivityDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getIteration(),
-				UmaPackage.eINSTANCE.getActivityDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getPhase(),
-				UmaPackage.eINSTANCE.getActivityDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getCapabilityPattern(),
-				UmaPackage.eINSTANCE.getProcessDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE.getDeliveryProcess(),
-				UmaPackage.eINSTANCE.getDeliveryProcessDescription());
-		contentDescClassMap.put(UmaPackage.eINSTANCE
-				.getProcessPlanningTemplate(), UmaPackage.eINSTANCE
-				.getProcessDescription());
-	}
-
-	public static EClass getContentDescriptionType(EClass describableElementType) {
-		return (EClass) contentDescClassMap.get(describableElementType);
-	}
-
-	public static final ContentDescription createContentDescription(
-			DescribableElement e) {
-		EClass eClass = (EClass) contentDescClassMap.get(e.eClass());
-		if (eClass == null) {
-			eClass = UmaPackage.eINSTANCE.getContentDescription();
-		}
-		ContentDescription content = (ContentDescription) UmaFactory.eINSTANCE
-				.create(eClass);
-		content.setName(UmaUtil.createContentDescriptionName(e));
-		content.setGuid(UmaUtil.generateGUID(e.getGuid()));
-		return content;
-	}
-
-	/**
-	 * Creates a new ContentDescription object for the given ContentElement and
-	 * save it to a file
-	 * 
-	 * @param e
-	 * @return
-	 * @deprecated use createContentDescription(DescribableElement e) instead
-	 */
-	public static ContentDescription createContentDescription(ContentElement e) {
-		return createContentDescription(e, false);
-	}
-
-	/**
-	 * 
-	 * @param e
-	 * @param saveContentOnly
-	 * @return
-	 * @deprecated use createContentDescription(DescribableElement e) instead
-	 */
-	public static ContentDescription createContentDescription(
-			DescribableElement e, boolean saveContentOnly) {
-		// if ( e instanceof ContentElement)
-		// {
-		// return createContentDescription((ContentElement)e, saveContentOnly);
-		// }
-		//		
-		// return createContentDescription(e);
-
-		return createContentDescription(e);
-	}
-
-	public static ContentDescription createContentDescription(ContentElement e,
-			boolean saveContentOnly) {
-		ContentDescription description = createContentDescription((DescribableElement) e);
-
-		// Set descriptions = (Set)
-		// contentDescriptionsMap.get(descInfo.packageName);
-		// if(descriptions == null) {
-		// descriptions = new HashSet();
-		// contentDescriptionsMap.put(descInfo.packageName, descriptions);
-		// }
-		// descriptions.add(description);
-
-		// saving ContentDescription right after its creation it no longer
-		// needed since ContentDescription is
-		// now contained by a DescribableElement
-		//
-		// if(libPersister != null) {
-		// libPersister.save(e, description, saveContentOnly);
-		// }
-		return description;
-	}
-
-	// public static final Map getContentDescriptionsMap() {
-	// return contentDescriptionsMap;
-	// }
-
-	public static boolean hasPresentation(MethodElement e) {
-		if (e instanceof ContentElementImpl) {
-			return ((ContentElementImpl) e).basicGetPresentation() != null;
-		} else if (e instanceof ProcessElementImpl) {
-			return ((ProcessElementImpl) e).basicGetPresentation() != null;
-		}
-		return false;
-	}
-
-	public static EClass getContentDescriptionEClass(DescribableElement e) {
-		return (EClass) contentDescClassMap.get(e.eClass());
-	}
-
-	public static void main(String[] args) throws Exception {
-		// MessageDigest md5 = MessageDigest.getInstance("MD5");
-		String input = args[0];
-		// byte[] hash = md5.digest(input.getBytes());
-		System.out.println("input: '" + input + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println("Java's hash code: " + input.hashCode()); //$NON-NLS-1$
-		// System.out.println("hash length: " + hash.length);
-		// System.out.println("base64 encoded: " +
-		// DataValue.Base64.encode(hash));
-		System.out.println("new GUID: " + UmaUtil.generateGUID(input)); //$NON-NLS-1$
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/MessageException.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/MessageException.java
deleted file mode 100755
index b4a88bb..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/MessageException.java
+++ /dev/null
@@ -1,49 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.util;
-
-import org.eclipse.emf.common.util.WrappedException;
-
-/**
- * Signals that a method library persistence operation has failed.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MessageException extends WrappedException {
-
-	private static final Exception DUMMY_EXCEPTION = new Exception();
-
-	private static final long serialVersionUID = 3904682656683013433L;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param message
-	 *            an error message
-	 */
-	public MessageException(String msg) {
-		super(msg, DUMMY_EXCEPTION);
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param message
-	 *            an error message
-	 * @param exception
-	 *            an exception object
-	 */
-	public MessageException(String message, Exception exception) {
-		super(message, exception);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/Resources.properties b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/Resources.properties
deleted file mode 100755
index 502862b..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/Resources.properties
+++ /dev/null
@@ -1,14 +0,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.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-copyright=IBM Corporation
-err_cannotModify0=Cannot modify ''{0}''
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/UmaAdapterFactory.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/UmaAdapterFactory.java
deleted file mode 100755
index 4f42e5e..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/UmaAdapterFactory.java
+++ /dev/null
@@ -1,2313 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.ActivityDescription;
-import org.eclipse.epf.uma.Artifact;
-import org.eclipse.epf.uma.ArtifactDescription;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.BreakdownElementDescription;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Classifier;
-import org.eclipse.epf.uma.CompositeRole;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.Constraint;
-import org.eclipse.epf.uma.ContentCategory;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CoreSemanticModelBridge;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Deliverable;
-import org.eclipse.epf.uma.DeliverableDescription;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.DeliveryProcessDescription;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.Descriptor;
-import org.eclipse.epf.uma.DescriptorDescription;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.DiagramElement;
-import org.eclipse.epf.uma.DiagramLink;
-import org.eclipse.epf.uma.Dimension;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.Element;
-import org.eclipse.epf.uma.Ellipse;
-import org.eclipse.epf.uma.EstimationConsiderations;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.GraphConnector;
-import org.eclipse.epf.uma.GraphEdge;
-import org.eclipse.epf.uma.GraphElement;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.GraphicPrimitive;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.GuidanceDescription;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.Image;
-import org.eclipse.epf.uma.Iteration;
-import org.eclipse.epf.uma.LeafElement;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodElementProperty;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.MethodUnit;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.NamedElement;
-import org.eclipse.epf.uma.Namespace;
-import org.eclipse.epf.uma.Outcome;
-import org.eclipse.epf.uma.PackageableElement;
-import org.eclipse.epf.uma.Phase;
-import org.eclipse.epf.uma.PlanningData;
-import org.eclipse.epf.uma.Point;
-import org.eclipse.epf.uma.Polyline;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.PracticeDescription;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessComponentDescriptor;
-import org.eclipse.epf.uma.ProcessComponentInterface;
-import org.eclipse.epf.uma.ProcessDescription;
-import org.eclipse.epf.uma.ProcessElement;
-import org.eclipse.epf.uma.ProcessFamily;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.ProcessPlanningTemplate;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.epf.uma.PseudoState;
-import org.eclipse.epf.uma.Reference;
-import org.eclipse.epf.uma.Region;
-import org.eclipse.epf.uma.Report;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.Roadmap;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleDescription;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.Section;
-import org.eclipse.epf.uma.SemanticModelBridge;
-import org.eclipse.epf.uma.SimpleSemanticModelElement;
-import org.eclipse.epf.uma.State;
-import org.eclipse.epf.uma.StateMachine;
-import org.eclipse.epf.uma.Step;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.TaskDescription;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.TeamProfile;
-import org.eclipse.epf.uma.Template;
-import org.eclipse.epf.uma.TermDefinition;
-import org.eclipse.epf.uma.TextElement;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.Transition;
-import org.eclipse.epf.uma.Type;
-import org.eclipse.epf.uma.UMASemanticModelBridge;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.Vertex;
-import org.eclipse.epf.uma.Whitepaper;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkDefinition;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductDescription;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.epf.uma.WorkProductType;
-
-import org.eclipse.epf.uma.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.uma.UmaPackage
- * @generated
- */
-public class UmaAdapterFactory extends AdapterFactoryImpl {
-
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static UmaPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UmaAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = UmaPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UmaSwitch modelSwitch = new UmaSwitch() {
-		public Object caseClassifier(Classifier object) {
-			return createClassifierAdapter();
-		}
-
-		public Object caseType(Type object) {
-			return createTypeAdapter();
-		}
-
-		public Object caseElement(Element object) {
-			return createElementAdapter();
-		}
-
-		public Object caseNamedElement(NamedElement object) {
-			return createNamedElementAdapter();
-		}
-
-		public Object casePackageableElement(PackageableElement object) {
-			return createPackageableElementAdapter();
-		}
-
-		public Object casePackage(org.eclipse.epf.uma.Package object) {
-			return createPackageAdapter();
-		}
-
-		public Object caseNamespace(Namespace object) {
-			return createNamespaceAdapter();
-		}
-
-		public Object caseMethodElement(MethodElement object) {
-			return createMethodElementAdapter();
-		}
-
-		public Object caseConstraint(Constraint object) {
-			return createConstraintAdapter();
-		}
-
-		public Object caseMethodElementProperty(MethodElementProperty object) {
-			return createMethodElementPropertyAdapter();
-		}
-
-		public Object caseContentElement(ContentElement object) {
-			return createContentElementAdapter();
-		}
-
-		public Object caseDescribableElement(DescribableElement object) {
-			return createDescribableElementAdapter();
-		}
-
-		public Object caseContentDescription(ContentDescription object) {
-			return createContentDescriptionAdapter();
-		}
-
-		public Object caseSection(Section object) {
-			return createSectionAdapter();
-		}
-
-		public Object caseRole(Role object) {
-			return createRoleAdapter();
-		}
-
-		public Object caseWorkProduct(WorkProduct object) {
-			return createWorkProductAdapter();
-		}
-
-		public Object caseTask(Task object) {
-			return createTaskAdapter();
-		}
-
-		public Object caseWorkDefinition(WorkDefinition object) {
-			return createWorkDefinitionAdapter();
-		}
-
-		public Object caseStep(Step object) {
-			return createStepAdapter();
-		}
-
-		public Object caseGuidance(Guidance object) {
-			return createGuidanceAdapter();
-		}
-
-		public Object caseArtifact(Artifact object) {
-			return createArtifactAdapter();
-		}
-
-		public Object caseDeliverable(Deliverable object) {
-			return createDeliverableAdapter();
-		}
-
-		public Object caseOutcome(Outcome object) {
-			return createOutcomeAdapter();
-		}
-
-		public Object caseMethodPackage(MethodPackage object) {
-			return createMethodPackageAdapter();
-		}
-
-		public Object caseContentPackage(ContentPackage object) {
-			return createContentPackageAdapter();
-		}
-
-		public Object caseArtifactDescription(ArtifactDescription object) {
-			return createArtifactDescriptionAdapter();
-		}
-
-		public Object caseWorkProductDescription(WorkProductDescription object) {
-			return createWorkProductDescriptionAdapter();
-		}
-
-		public Object caseDeliverableDescription(DeliverableDescription object) {
-			return createDeliverableDescriptionAdapter();
-		}
-
-		public Object caseRoleDescription(RoleDescription object) {
-			return createRoleDescriptionAdapter();
-		}
-
-		public Object caseTaskDescription(TaskDescription object) {
-			return createTaskDescriptionAdapter();
-		}
-
-		public Object caseGuidanceDescription(GuidanceDescription object) {
-			return createGuidanceDescriptionAdapter();
-		}
-
-		public Object casePracticeDescription(PracticeDescription object) {
-			return createPracticeDescriptionAdapter();
-		}
-
-		public Object casePoint(Point object) {
-			return createPointAdapter();
-		}
-
-		public Object caseGraphElement(GraphElement object) {
-			return createGraphElementAdapter();
-		}
-
-		public Object caseDiagramElement(DiagramElement object) {
-			return createDiagramElementAdapter();
-		}
-
-		public Object caseDiagramLink(DiagramLink object) {
-			return createDiagramLinkAdapter();
-		}
-
-		public Object caseGraphConnector(GraphConnector object) {
-			return createGraphConnectorAdapter();
-		}
-
-		public Object caseSemanticModelBridge(SemanticModelBridge object) {
-			return createSemanticModelBridgeAdapter();
-		}
-
-		public Object caseDimension(Dimension object) {
-			return createDimensionAdapter();
-		}
-
-		public Object caseReference(Reference object) {
-			return createReferenceAdapter();
-		}
-
-		public Object caseProperty(Property object) {
-			return createPropertyAdapter();
-		}
-
-		public Object caseGraphEdge(GraphEdge object) {
-			return createGraphEdgeAdapter();
-		}
-
-		public Object caseDiagram(Diagram object) {
-			return createDiagramAdapter();
-		}
-
-		public Object caseGraphNode(GraphNode object) {
-			return createGraphNodeAdapter();
-		}
-
-		public Object caseSimpleSemanticModelElement(
-				SimpleSemanticModelElement object) {
-			return createSimpleSemanticModelElementAdapter();
-		}
-
-		public Object caseUMASemanticModelBridge(UMASemanticModelBridge object) {
-			return createUMASemanticModelBridgeAdapter();
-		}
-
-		public Object caseCoreSemanticModelBridge(CoreSemanticModelBridge object) {
-			return createCoreSemanticModelBridgeAdapter();
-		}
-
-		public Object caseLeafElement(LeafElement object) {
-			return createLeafElementAdapter();
-		}
-
-		public Object caseTextElement(TextElement object) {
-			return createTextElementAdapter();
-		}
-
-		public Object caseImage(Image object) {
-			return createImageAdapter();
-		}
-
-		public Object caseGraphicPrimitive(GraphicPrimitive object) {
-			return createGraphicPrimitiveAdapter();
-		}
-
-		public Object casePolyline(Polyline object) {
-			return createPolylineAdapter();
-		}
-
-		public Object caseEllipse(Ellipse object) {
-			return createEllipseAdapter();
-		}
-
-		public Object caseActivity(Activity object) {
-			return createActivityAdapter();
-		}
-
-		public Object caseWorkBreakdownElement(WorkBreakdownElement object) {
-			return createWorkBreakdownElementAdapter();
-		}
-
-		public Object caseBreakdownElement(BreakdownElement object) {
-			return createBreakdownElementAdapter();
-		}
-
-		public Object caseMilestone(Milestone object) {
-			return createMilestoneAdapter();
-		}
-
-		public Object caseIteration(Iteration object) {
-			return createIterationAdapter();
-		}
-
-		public Object casePhase(Phase object) {
-			return createPhaseAdapter();
-		}
-
-		public Object caseTeamProfile(TeamProfile object) {
-			return createTeamProfileAdapter();
-		}
-
-		public Object caseRoleDescriptor(RoleDescriptor object) {
-			return createRoleDescriptorAdapter();
-		}
-
-		public Object caseWorkOrder(WorkOrder object) {
-			return createWorkOrderAdapter();
-		}
-
-		public Object caseProcessElement(ProcessElement object) {
-			return createProcessElementAdapter();
-		}
-
-		public Object casePlanningData(PlanningData object) {
-			return createPlanningDataAdapter();
-		}
-
-		public Object caseDescriptor(Descriptor object) {
-			return createDescriptorAdapter();
-		}
-
-		public Object caseWorkProductDescriptor(WorkProductDescriptor object) {
-			return createWorkProductDescriptorAdapter();
-		}
-
-		public Object caseTaskDescriptor(TaskDescriptor object) {
-			return createTaskDescriptorAdapter();
-		}
-
-		public Object caseCompositeRole(CompositeRole object) {
-			return createCompositeRoleAdapter();
-		}
-
-		public Object caseBreakdownElementDescription(
-				BreakdownElementDescription object) {
-			return createBreakdownElementDescriptionAdapter();
-		}
-
-		public Object caseActivityDescription(ActivityDescription object) {
-			return createActivityDescriptionAdapter();
-		}
-
-		public Object caseDeliveryProcessDescription(
-				DeliveryProcessDescription object) {
-			return createDeliveryProcessDescriptionAdapter();
-		}
-
-		public Object caseProcessDescription(ProcessDescription object) {
-			return createProcessDescriptionAdapter();
-		}
-
-		public Object caseDescriptorDescription(DescriptorDescription object) {
-			return createDescriptorDescriptionAdapter();
-		}
-
-		public Object caseConcept(Concept object) {
-			return createConceptAdapter();
-		}
-
-		public Object caseChecklist(Checklist object) {
-			return createChecklistAdapter();
-		}
-
-		public Object caseExample(Example object) {
-			return createExampleAdapter();
-		}
-
-		public Object caseGuideline(Guideline object) {
-			return createGuidelineAdapter();
-		}
-
-		public Object caseReport(Report object) {
-			return createReportAdapter();
-		}
-
-		public Object caseTemplate(Template object) {
-			return createTemplateAdapter();
-		}
-
-		public Object caseSupportingMaterial(SupportingMaterial object) {
-			return createSupportingMaterialAdapter();
-		}
-
-		public Object caseToolMentor(ToolMentor object) {
-			return createToolMentorAdapter();
-		}
-
-		public Object caseWhitepaper(Whitepaper object) {
-			return createWhitepaperAdapter();
-		}
-
-		public Object caseTermDefinition(TermDefinition object) {
-			return createTermDefinitionAdapter();
-		}
-
-		public Object casePractice(Practice object) {
-			return createPracticeAdapter();
-		}
-
-		public Object caseEstimationConsiderations(
-				EstimationConsiderations object) {
-			return createEstimationConsiderationsAdapter();
-		}
-
-		public Object caseReusableAsset(ReusableAsset object) {
-			return createReusableAssetAdapter();
-		}
-
-		public Object caseState(State object) {
-			return createStateAdapter();
-		}
-
-		public Object caseVertex(Vertex object) {
-			return createVertexAdapter();
-		}
-
-		public Object caseRegion(Region object) {
-			return createRegionAdapter();
-		}
-
-		public Object caseStateMachine(StateMachine object) {
-			return createStateMachineAdapter();
-		}
-
-		public Object caseTransition(Transition object) {
-			return createTransitionAdapter();
-		}
-
-		public Object casePseudoState(PseudoState object) {
-			return createPseudoStateAdapter();
-		}
-
-		public Object caseDiscipline(Discipline object) {
-			return createDisciplineAdapter();
-		}
-
-		public Object caseContentCategory(ContentCategory object) {
-			return createContentCategoryAdapter();
-		}
-
-		public Object caseRoleSet(RoleSet object) {
-			return createRoleSetAdapter();
-		}
-
-		public Object caseDomain(Domain object) {
-			return createDomainAdapter();
-		}
-
-		public Object caseWorkProductType(WorkProductType object) {
-			return createWorkProductTypeAdapter();
-		}
-
-		public Object caseDisciplineGrouping(DisciplineGrouping object) {
-			return createDisciplineGroupingAdapter();
-		}
-
-		public Object caseTool(Tool object) {
-			return createToolAdapter();
-		}
-
-		public Object caseRoleSetGrouping(RoleSetGrouping object) {
-			return createRoleSetGroupingAdapter();
-		}
-
-		public Object caseCustomCategory(CustomCategory object) {
-			return createCustomCategoryAdapter();
-		}
-
-		public Object caseDeliveryProcess(DeliveryProcess object) {
-			return createDeliveryProcessAdapter();
-		}
-
-		public Object caseProcess(org.eclipse.epf.uma.Process object) {
-			return createProcessAdapter();
-		}
-
-		public Object caseCapabilityPattern(CapabilityPattern object) {
-			return createCapabilityPatternAdapter();
-		}
-
-		public Object caseProcessPlanningTemplate(ProcessPlanningTemplate object) {
-			return createProcessPlanningTemplateAdapter();
-		}
-
-		public Object caseRoadmap(Roadmap object) {
-			return createRoadmapAdapter();
-		}
-
-		public Object caseProcessComponent(ProcessComponent object) {
-			return createProcessComponentAdapter();
-		}
-
-		public Object caseProcessPackage(ProcessPackage object) {
-			return createProcessPackageAdapter();
-		}
-
-		public Object caseProcessComponentInterface(
-				ProcessComponentInterface object) {
-			return createProcessComponentInterfaceAdapter();
-		}
-
-		public Object caseProcessComponentDescriptor(
-				ProcessComponentDescriptor object) {
-			return createProcessComponentDescriptorAdapter();
-		}
-
-		public Object caseMethodPlugin(MethodPlugin object) {
-			return createMethodPluginAdapter();
-		}
-
-		public Object caseVariabilityElement(VariabilityElement object) {
-			return createVariabilityElementAdapter();
-		}
-
-		public Object caseMethodUnit(MethodUnit object) {
-			return createMethodUnitAdapter();
-		}
-
-		public Object caseMethodConfiguration(MethodConfiguration object) {
-			return createMethodConfigurationAdapter();
-		}
-
-		public Object caseProcessFamily(ProcessFamily object) {
-			return createProcessFamilyAdapter();
-		}
-
-		public Object caseMethodLibrary(MethodLibrary object) {
-			return createMethodLibraryAdapter();
-		}
-
-		public Object defaultCase(EObject object) {
-			return createEObjectAdapter();
-		}
-	};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter) modelSwitch.doSwitch((EObject) target);
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Classifier <em>Classifier</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Classifier
-	 * @generated
-	 */
-	public Adapter createClassifierAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Type <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Type
-	 * @generated
-	 */
-	public Adapter createTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Element <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Element
-	 * @generated
-	 */
-	public Adapter createElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.NamedElement <em>Named Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.NamedElement
-	 * @generated
-	 */
-	public Adapter createNamedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.PackageableElement <em>Packageable Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.PackageableElement
-	 * @generated
-	 */
-	public Adapter createPackageableElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Package <em>Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Package
-	 * @generated
-	 */
-	public Adapter createPackageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Namespace <em>Namespace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Namespace
-	 * @generated
-	 */
-	public Adapter createNamespaceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.MethodElement <em>Method Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.MethodElement
-	 * @generated
-	 */
-	public Adapter createMethodElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Constraint <em>Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Constraint
-	 * @generated
-	 */
-	public Adapter createConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.MethodElementProperty <em>Method Element Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.MethodElementProperty
-	 * @generated
-	 */
-	public Adapter createMethodElementPropertyAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ContentElement <em>Content Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ContentElement
-	 * @generated
-	 */
-	public Adapter createContentElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.DescribableElement <em>Describable Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.DescribableElement
-	 * @generated
-	 */
-	public Adapter createDescribableElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ContentDescription <em>Content Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ContentDescription
-	 * @generated
-	 */
-	public Adapter createContentDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Section <em>Section</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Section
-	 * @generated
-	 */
-	public Adapter createSectionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Role <em>Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Role
-	 * @generated
-	 */
-	public Adapter createRoleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.WorkProduct <em>Work Product</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.WorkProduct
-	 * @generated
-	 */
-	public Adapter createWorkProductAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Task <em>Task</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Task
-	 * @generated
-	 */
-	public Adapter createTaskAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.WorkDefinition <em>Work Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.WorkDefinition
-	 * @generated
-	 */
-	public Adapter createWorkDefinitionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Step <em>Step</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Step
-	 * @generated
-	 */
-	public Adapter createStepAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Guidance <em>Guidance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Guidance
-	 * @generated
-	 */
-	public Adapter createGuidanceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Artifact <em>Artifact</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Artifact
-	 * @generated
-	 */
-	public Adapter createArtifactAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Deliverable <em>Deliverable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Deliverable
-	 * @generated
-	 */
-	public Adapter createDeliverableAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Outcome <em>Outcome</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Outcome
-	 * @generated
-	 */
-	public Adapter createOutcomeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.MethodPackage <em>Method Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.MethodPackage
-	 * @generated
-	 */
-	public Adapter createMethodPackageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ContentPackage <em>Content Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ContentPackage
-	 * @generated
-	 */
-	public Adapter createContentPackageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ArtifactDescription <em>Artifact Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ArtifactDescription
-	 * @generated
-	 */
-	public Adapter createArtifactDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.WorkProductDescription <em>Work Product Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.WorkProductDescription
-	 * @generated
-	 */
-	public Adapter createWorkProductDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.DeliverableDescription <em>Deliverable Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.DeliverableDescription
-	 * @generated
-	 */
-	public Adapter createDeliverableDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.RoleDescription <em>Role Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.RoleDescription
-	 * @generated
-	 */
-	public Adapter createRoleDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.TaskDescription <em>Task Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.TaskDescription
-	 * @generated
-	 */
-	public Adapter createTaskDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.GuidanceDescription <em>Guidance Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.GuidanceDescription
-	 * @generated
-	 */
-	public Adapter createGuidanceDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.PracticeDescription <em>Practice Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.PracticeDescription
-	 * @generated
-	 */
-	public Adapter createPracticeDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Point <em>Point</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Point
-	 * @generated
-	 */
-	public Adapter createPointAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.GraphElement <em>Graph Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.GraphElement
-	 * @generated
-	 */
-	public Adapter createGraphElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.DiagramElement <em>Diagram Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.DiagramElement
-	 * @generated
-	 */
-	public Adapter createDiagramElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.DiagramLink <em>Diagram Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.DiagramLink
-	 * @generated
-	 */
-	public Adapter createDiagramLinkAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.GraphConnector <em>Graph Connector</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.GraphConnector
-	 * @generated
-	 */
-	public Adapter createGraphConnectorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.SemanticModelBridge <em>Semantic Model Bridge</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.SemanticModelBridge
-	 * @generated
-	 */
-	public Adapter createSemanticModelBridgeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Dimension <em>Dimension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Dimension
-	 * @generated
-	 */
-	public Adapter createDimensionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Reference <em>Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Reference
-	 * @generated
-	 */
-	public Adapter createReferenceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Property <em>Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Property
-	 * @generated
-	 */
-	public Adapter createPropertyAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.GraphEdge <em>Graph Edge</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.GraphEdge
-	 * @generated
-	 */
-	public Adapter createGraphEdgeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Diagram <em>Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Diagram
-	 * @generated
-	 */
-	public Adapter createDiagramAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.GraphNode <em>Graph Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.GraphNode
-	 * @generated
-	 */
-	public Adapter createGraphNodeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.SimpleSemanticModelElement <em>Simple Semantic Model Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.SimpleSemanticModelElement
-	 * @generated
-	 */
-	public Adapter createSimpleSemanticModelElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.UMASemanticModelBridge <em>UMA Semantic Model Bridge</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.UMASemanticModelBridge
-	 * @generated
-	 */
-	public Adapter createUMASemanticModelBridgeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.CoreSemanticModelBridge <em>Core Semantic Model Bridge</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.CoreSemanticModelBridge
-	 * @generated
-	 */
-	public Adapter createCoreSemanticModelBridgeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.LeafElement <em>Leaf Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.LeafElement
-	 * @generated
-	 */
-	public Adapter createLeafElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.TextElement <em>Text Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.TextElement
-	 * @generated
-	 */
-	public Adapter createTextElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Image <em>Image</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Image
-	 * @generated
-	 */
-	public Adapter createImageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.GraphicPrimitive <em>Graphic Primitive</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.GraphicPrimitive
-	 * @generated
-	 */
-	public Adapter createGraphicPrimitiveAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Polyline <em>Polyline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Polyline
-	 * @generated
-	 */
-	public Adapter createPolylineAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Ellipse <em>Ellipse</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Ellipse
-	 * @generated
-	 */
-	public Adapter createEllipseAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Activity <em>Activity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Activity
-	 * @generated
-	 */
-	public Adapter createActivityAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.WorkBreakdownElement <em>Work Breakdown Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.WorkBreakdownElement
-	 * @generated
-	 */
-	public Adapter createWorkBreakdownElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.BreakdownElement <em>Breakdown Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.BreakdownElement
-	 * @generated
-	 */
-	public Adapter createBreakdownElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Milestone <em>Milestone</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Milestone
-	 * @generated
-	 */
-	public Adapter createMilestoneAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Iteration <em>Iteration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Iteration
-	 * @generated
-	 */
-	public Adapter createIterationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Phase <em>Phase</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Phase
-	 * @generated
-	 */
-	public Adapter createPhaseAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.TeamProfile <em>Team Profile</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.TeamProfile
-	 * @generated
-	 */
-	public Adapter createTeamProfileAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.RoleDescriptor <em>Role Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.RoleDescriptor
-	 * @generated
-	 */
-	public Adapter createRoleDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.WorkOrder <em>Work Order</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.WorkOrder
-	 * @generated
-	 */
-	public Adapter createWorkOrderAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ProcessElement <em>Process Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ProcessElement
-	 * @generated
-	 */
-	public Adapter createProcessElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.PlanningData <em>Planning Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.PlanningData
-	 * @generated
-	 */
-	public Adapter createPlanningDataAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Descriptor <em>Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Descriptor
-	 * @generated
-	 */
-	public Adapter createDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.TaskDescriptor <em>Task Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.TaskDescriptor
-	 * @generated
-	 */
-	public Adapter createTaskDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.WorkProductDescriptor <em>Work Product Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.WorkProductDescriptor
-	 * @generated
-	 */
-	public Adapter createWorkProductDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.CompositeRole <em>Composite Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.CompositeRole
-	 * @generated
-	 */
-	public Adapter createCompositeRoleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.BreakdownElementDescription <em>Breakdown Element Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.BreakdownElementDescription
-	 * @generated
-	 */
-	public Adapter createBreakdownElementDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ActivityDescription <em>Activity Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ActivityDescription
-	 * @generated
-	 */
-	public Adapter createActivityDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.DeliveryProcessDescription <em>Delivery Process Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.DeliveryProcessDescription
-	 * @generated
-	 */
-	public Adapter createDeliveryProcessDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ProcessDescription <em>Process Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ProcessDescription
-	 * @generated
-	 */
-	public Adapter createProcessDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.DescriptorDescription <em>Descriptor Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.DescriptorDescription
-	 * @generated
-	 */
-	public Adapter createDescriptorDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Concept <em>Concept</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Concept
-	 * @generated
-	 */
-	public Adapter createConceptAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Checklist <em>Checklist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Checklist
-	 * @generated
-	 */
-	public Adapter createChecklistAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Example <em>Example</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Example
-	 * @generated
-	 */
-	public Adapter createExampleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Guideline <em>Guideline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Guideline
-	 * @generated
-	 */
-	public Adapter createGuidelineAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.EstimationConsiderations <em>Estimation Considerations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.EstimationConsiderations
-	 * @generated
-	 */
-	public Adapter createEstimationConsiderationsAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Report <em>Report</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Report
-	 * @generated
-	 */
-	public Adapter createReportAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Template <em>Template</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Template
-	 * @generated
-	 */
-	public Adapter createTemplateAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.SupportingMaterial <em>Supporting Material</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.SupportingMaterial
-	 * @generated
-	 */
-	public Adapter createSupportingMaterialAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ToolMentor <em>Tool Mentor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ToolMentor
-	 * @generated
-	 */
-	public Adapter createToolMentorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Whitepaper <em>Whitepaper</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Whitepaper
-	 * @generated
-	 */
-	public Adapter createWhitepaperAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.TermDefinition <em>Term Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.TermDefinition
-	 * @generated
-	 */
-	public Adapter createTermDefinitionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Practice <em>Practice</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Practice
-	 * @generated
-	 */
-	public Adapter createPracticeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ReusableAsset <em>Reusable Asset</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ReusableAsset
-	 * @generated
-	 */
-	public Adapter createReusableAssetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.State <em>State</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.State
-	 * @generated
-	 */
-	public Adapter createStateAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Vertex <em>Vertex</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Vertex
-	 * @generated
-	 */
-	public Adapter createVertexAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Region <em>Region</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Region
-	 * @generated
-	 */
-	public Adapter createRegionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.StateMachine <em>State Machine</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.StateMachine
-	 * @generated
-	 */
-	public Adapter createStateMachineAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Transition <em>Transition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Transition
-	 * @generated
-	 */
-	public Adapter createTransitionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.PseudoState <em>Pseudo State</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.PseudoState
-	 * @generated
-	 */
-	public Adapter createPseudoStateAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Discipline <em>Discipline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Discipline
-	 * @generated
-	 */
-	public Adapter createDisciplineAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ContentCategory <em>Content Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ContentCategory
-	 * @generated
-	 */
-	public Adapter createContentCategoryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.RoleSet <em>Role Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.RoleSet
-	 * @generated
-	 */
-	public Adapter createRoleSetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Domain <em>Domain</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Domain
-	 * @generated
-	 */
-	public Adapter createDomainAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.WorkProductType <em>Work Product Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.WorkProductType
-	 * @generated
-	 */
-	public Adapter createWorkProductTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.DisciplineGrouping <em>Discipline Grouping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.DisciplineGrouping
-	 * @generated
-	 */
-	public Adapter createDisciplineGroupingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Tool <em>Tool</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Tool
-	 * @generated
-	 */
-	public Adapter createToolAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.RoleSetGrouping <em>Role Set Grouping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.RoleSetGrouping
-	 * @generated
-	 */
-	public Adapter createRoleSetGroupingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.CustomCategory <em>Custom Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.CustomCategory
-	 * @generated
-	 */
-	public Adapter createCustomCategoryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.DeliveryProcess <em>Delivery Process</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.DeliveryProcess
-	 * @generated
-	 */
-	public Adapter createDeliveryProcessAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Process <em>Process</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Process
-	 * @generated
-	 */
-	public Adapter createProcessAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.CapabilityPattern <em>Capability Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.CapabilityPattern
-	 * @generated
-	 */
-	public Adapter createCapabilityPatternAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ProcessPlanningTemplate <em>Process Planning Template</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ProcessPlanningTemplate
-	 * @generated
-	 */
-	public Adapter createProcessPlanningTemplateAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.Roadmap <em>Roadmap</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.Roadmap
-	 * @generated
-	 */
-	public Adapter createRoadmapAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ProcessComponent <em>Process Component</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ProcessComponent
-	 * @generated
-	 */
-	public Adapter createProcessComponentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ProcessPackage <em>Process Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ProcessPackage
-	 * @generated
-	 */
-	public Adapter createProcessPackageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ProcessComponentInterface <em>Process Component Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ProcessComponentInterface
-	 * @generated
-	 */
-	public Adapter createProcessComponentInterfaceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ProcessComponentDescriptor <em>Process Component Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ProcessComponentDescriptor
-	 * @generated
-	 */
-	public Adapter createProcessComponentDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.MethodPlugin <em>Method Plugin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.MethodPlugin
-	 * @generated
-	 */
-	public Adapter createMethodPluginAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.VariabilityElement <em>Variability Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.VariabilityElement
-	 * @generated
-	 */
-	public Adapter createVariabilityElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.MethodUnit <em>Method Unit</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.MethodUnit
-	 * @generated
-	 */
-	public Adapter createMethodUnitAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.MethodConfiguration <em>Method Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.MethodConfiguration
-	 * @generated
-	 */
-	public Adapter createMethodConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.ProcessFamily <em>Process Family</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.ProcessFamily
-	 * @generated
-	 */
-	public Adapter createProcessFamilyAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.uma.MethodLibrary <em>Method Library</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.uma.MethodLibrary
-	 * @generated
-	 */
-	public Adapter createMethodLibraryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //UmaAdapterFactory
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/UmaResources.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/UmaResources.java
deleted file mode 100755
index 5afc847..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/UmaResources.java
+++ /dev/null
@@ -1,38 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.util;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The UMA resource bundle.
- * 
- * @author Kelvin Low
- * @since 1.0
- */
-public final class UmaResources extends NLS {
-
-	private static String BUNDLE_NAME = UmaResources.class.getPackage()
-			.getName()
-			+ ".Resources"; //$NON-NLS-1$
-
-	private UmaResources() {
-		// Do not instantiate
-	}
-
-	public static String copyright;
-
-	public static String err_cannotModify0;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, UmaResources.class);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/UmaSwitch.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/UmaSwitch.java
deleted file mode 100755
index f6d5d72..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/UmaSwitch.java
+++ /dev/null
@@ -1,4460 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.ActivityDescription;
-import org.eclipse.epf.uma.Artifact;
-import org.eclipse.epf.uma.ArtifactDescription;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.BreakdownElementDescription;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.Checklist;
-import org.eclipse.epf.uma.Classifier;
-import org.eclipse.epf.uma.CompositeRole;
-import org.eclipse.epf.uma.Concept;
-import org.eclipse.epf.uma.Constraint;
-import org.eclipse.epf.uma.ContentCategory;
-import org.eclipse.epf.uma.ContentDescription;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.CoreSemanticModelBridge;
-import org.eclipse.epf.uma.CustomCategory;
-import org.eclipse.epf.uma.Deliverable;
-import org.eclipse.epf.uma.DeliverableDescription;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.DeliveryProcessDescription;
-import org.eclipse.epf.uma.DescribableElement;
-import org.eclipse.epf.uma.Descriptor;
-import org.eclipse.epf.uma.DescriptorDescription;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.DiagramElement;
-import org.eclipse.epf.uma.DiagramLink;
-import org.eclipse.epf.uma.Dimension;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.Element;
-import org.eclipse.epf.uma.Ellipse;
-import org.eclipse.epf.uma.EstimationConsiderations;
-import org.eclipse.epf.uma.Example;
-import org.eclipse.epf.uma.GraphConnector;
-import org.eclipse.epf.uma.GraphEdge;
-import org.eclipse.epf.uma.GraphElement;
-import org.eclipse.epf.uma.GraphNode;
-import org.eclipse.epf.uma.GraphicPrimitive;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.GuidanceDescription;
-import org.eclipse.epf.uma.Guideline;
-import org.eclipse.epf.uma.Image;
-import org.eclipse.epf.uma.Iteration;
-import org.eclipse.epf.uma.LeafElement;
-import org.eclipse.epf.uma.MethodConfiguration;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodElementProperty;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.MethodUnit;
-import org.eclipse.epf.uma.Milestone;
-import org.eclipse.epf.uma.NamedElement;
-import org.eclipse.epf.uma.Namespace;
-import org.eclipse.epf.uma.Outcome;
-import org.eclipse.epf.uma.PackageableElement;
-import org.eclipse.epf.uma.Phase;
-import org.eclipse.epf.uma.PlanningData;
-import org.eclipse.epf.uma.Point;
-import org.eclipse.epf.uma.Polyline;
-import org.eclipse.epf.uma.Practice;
-import org.eclipse.epf.uma.PracticeDescription;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessComponentDescriptor;
-import org.eclipse.epf.uma.ProcessComponentInterface;
-import org.eclipse.epf.uma.ProcessDescription;
-import org.eclipse.epf.uma.ProcessElement;
-import org.eclipse.epf.uma.ProcessFamily;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.ProcessPlanningTemplate;
-import org.eclipse.epf.uma.Property;
-import org.eclipse.epf.uma.PseudoState;
-import org.eclipse.epf.uma.Reference;
-import org.eclipse.epf.uma.Region;
-import org.eclipse.epf.uma.Report;
-import org.eclipse.epf.uma.ReusableAsset;
-import org.eclipse.epf.uma.Roadmap;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleDescription;
-import org.eclipse.epf.uma.RoleDescriptor;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.Section;
-import org.eclipse.epf.uma.SemanticModelBridge;
-import org.eclipse.epf.uma.SimpleSemanticModelElement;
-import org.eclipse.epf.uma.State;
-import org.eclipse.epf.uma.StateMachine;
-import org.eclipse.epf.uma.Step;
-import org.eclipse.epf.uma.SupportingMaterial;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.TaskDescription;
-import org.eclipse.epf.uma.TaskDescriptor;
-import org.eclipse.epf.uma.TeamProfile;
-import org.eclipse.epf.uma.Template;
-import org.eclipse.epf.uma.TermDefinition;
-import org.eclipse.epf.uma.TextElement;
-import org.eclipse.epf.uma.Tool;
-import org.eclipse.epf.uma.ToolMentor;
-import org.eclipse.epf.uma.Transition;
-import org.eclipse.epf.uma.Type;
-import org.eclipse.epf.uma.UMASemanticModelBridge;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.Vertex;
-import org.eclipse.epf.uma.Whitepaper;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkDefinition;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductDescription;
-import org.eclipse.epf.uma.WorkProductDescriptor;
-import org.eclipse.epf.uma.WorkProductType;
-
-import org.eclipse.epf.uma.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.uma.UmaPackage
- * @generated
- */
-public class UmaSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static UmaPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UmaSwitch() {
-		if (modelPackage == null) {
-			modelPackage = UmaPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		} else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(
-					(EClass) eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-		case UmaPackage.CLASSIFIER: {
-			Classifier classifier = (Classifier) theEObject;
-			Object result = caseClassifier(classifier);
-			if (result == null)
-				result = caseType(classifier);
-			if (result == null)
-				result = casePackageableElement(classifier);
-			if (result == null)
-				result = caseNamedElement(classifier);
-			if (result == null)
-				result = caseElement(classifier);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.TYPE: {
-			Type type = (Type) theEObject;
-			Object result = caseType(type);
-			if (result == null)
-				result = casePackageableElement(type);
-			if (result == null)
-				result = caseNamedElement(type);
-			if (result == null)
-				result = caseElement(type);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.ELEMENT: {
-			Element element = (Element) theEObject;
-			Object result = caseElement(element);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.NAMED_ELEMENT: {
-			NamedElement namedElement = (NamedElement) theEObject;
-			Object result = caseNamedElement(namedElement);
-			if (result == null)
-				result = caseElement(namedElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PACKAGEABLE_ELEMENT: {
-			PackageableElement packageableElement = (PackageableElement) theEObject;
-			Object result = casePackageableElement(packageableElement);
-			if (result == null)
-				result = caseNamedElement(packageableElement);
-			if (result == null)
-				result = caseElement(packageableElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PACKAGE: {
-			org.eclipse.epf.uma.Package package_ = (org.eclipse.epf.uma.Package) theEObject;
-			Object result = casePackage(package_);
-			if (result == null)
-				result = caseNamespace(package_);
-			if (result == null)
-				result = casePackageableElement(package_);
-			if (result == null)
-				result = caseNamedElement(package_);
-			if (result == null)
-				result = caseElement(package_);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.NAMESPACE: {
-			Namespace namespace = (Namespace) theEObject;
-			Object result = caseNamespace(namespace);
-			if (result == null)
-				result = caseNamedElement(namespace);
-			if (result == null)
-				result = caseElement(namespace);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.METHOD_ELEMENT: {
-			MethodElement methodElement = (MethodElement) theEObject;
-			Object result = caseMethodElement(methodElement);
-			if (result == null)
-				result = casePackageableElement(methodElement);
-			if (result == null)
-				result = caseNamedElement(methodElement);
-			if (result == null)
-				result = caseElement(methodElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.CONSTRAINT: {
-			Constraint constraint = (Constraint) theEObject;
-			Object result = caseConstraint(constraint);
-			if (result == null)
-				result = caseMethodElement(constraint);
-			if (result == null)
-				result = casePackageableElement(constraint);
-			if (result == null)
-				result = caseNamedElement(constraint);
-			if (result == null)
-				result = caseElement(constraint);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.METHOD_ELEMENT_PROPERTY: {
-			MethodElementProperty methodElementProperty = (MethodElementProperty) theEObject;
-			Object result = caseMethodElementProperty(methodElementProperty);
-			if (result == null)
-				result = casePackageableElement(methodElementProperty);
-			if (result == null)
-				result = caseNamedElement(methodElementProperty);
-			if (result == null)
-				result = caseElement(methodElementProperty);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.CONTENT_ELEMENT: {
-			ContentElement contentElement = (ContentElement) theEObject;
-			Object result = caseContentElement(contentElement);
-			if (result == null)
-				result = caseDescribableElement(contentElement);
-			if (result == null)
-				result = caseVariabilityElement(contentElement);
-			if (result == null)
-				result = caseMethodElement(contentElement);
-			if (result == null)
-				result = caseClassifier(contentElement);
-			if (result == null)
-				result = casePackageableElement(contentElement);
-			if (result == null)
-				result = caseType(contentElement);
-			if (result == null)
-				result = caseNamedElement(contentElement);
-			if (result == null)
-				result = caseElement(contentElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.DESCRIBABLE_ELEMENT: {
-			DescribableElement describableElement = (DescribableElement) theEObject;
-			Object result = caseDescribableElement(describableElement);
-			if (result == null)
-				result = caseMethodElement(describableElement);
-			if (result == null)
-				result = caseClassifier(describableElement);
-			if (result == null)
-				result = casePackageableElement(describableElement);
-			if (result == null)
-				result = caseType(describableElement);
-			if (result == null)
-				result = caseNamedElement(describableElement);
-			if (result == null)
-				result = caseElement(describableElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.CONTENT_DESCRIPTION: {
-			ContentDescription contentDescription = (ContentDescription) theEObject;
-			Object result = caseContentDescription(contentDescription);
-			if (result == null)
-				result = caseMethodUnit(contentDescription);
-			if (result == null)
-				result = caseMethodElement(contentDescription);
-			if (result == null)
-				result = casePackageableElement(contentDescription);
-			if (result == null)
-				result = caseNamedElement(contentDescription);
-			if (result == null)
-				result = caseElement(contentDescription);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.SECTION: {
-			Section section = (Section) theEObject;
-			Object result = caseSection(section);
-			if (result == null)
-				result = caseVariabilityElement(section);
-			if (result == null)
-				result = caseMethodElement(section);
-			if (result == null)
-				result = casePackageableElement(section);
-			if (result == null)
-				result = caseNamedElement(section);
-			if (result == null)
-				result = caseElement(section);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.ROLE: {
-			Role role = (Role) theEObject;
-			Object result = caseRole(role);
-			if (result == null)
-				result = caseContentElement(role);
-			if (result == null)
-				result = caseDescribableElement(role);
-			if (result == null)
-				result = caseVariabilityElement(role);
-			if (result == null)
-				result = caseMethodElement(role);
-			if (result == null)
-				result = caseClassifier(role);
-			if (result == null)
-				result = casePackageableElement(role);
-			if (result == null)
-				result = caseType(role);
-			if (result == null)
-				result = caseNamedElement(role);
-			if (result == null)
-				result = caseElement(role);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.WORK_PRODUCT: {
-			WorkProduct workProduct = (WorkProduct) theEObject;
-			Object result = caseWorkProduct(workProduct);
-			if (result == null)
-				result = caseContentElement(workProduct);
-			if (result == null)
-				result = caseDescribableElement(workProduct);
-			if (result == null)
-				result = caseVariabilityElement(workProduct);
-			if (result == null)
-				result = caseMethodElement(workProduct);
-			if (result == null)
-				result = caseClassifier(workProduct);
-			if (result == null)
-				result = casePackageableElement(workProduct);
-			if (result == null)
-				result = caseType(workProduct);
-			if (result == null)
-				result = caseNamedElement(workProduct);
-			if (result == null)
-				result = caseElement(workProduct);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.TASK: {
-			Task task = (Task) theEObject;
-			Object result = caseTask(task);
-			if (result == null)
-				result = caseContentElement(task);
-			if (result == null)
-				result = caseWorkDefinition(task);
-			if (result == null)
-				result = caseDescribableElement(task);
-			if (result == null)
-				result = caseVariabilityElement(task);
-			if (result == null)
-				result = caseMethodElement(task);
-			if (result == null)
-				result = caseClassifier(task);
-			if (result == null)
-				result = casePackageableElement(task);
-			if (result == null)
-				result = caseType(task);
-			if (result == null)
-				result = caseNamedElement(task);
-			if (result == null)
-				result = caseElement(task);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.WORK_DEFINITION: {
-			WorkDefinition workDefinition = (WorkDefinition) theEObject;
-			Object result = caseWorkDefinition(workDefinition);
-			if (result == null)
-				result = caseMethodElement(workDefinition);
-			if (result == null)
-				result = casePackageableElement(workDefinition);
-			if (result == null)
-				result = caseNamedElement(workDefinition);
-			if (result == null)
-				result = caseElement(workDefinition);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.STEP: {
-			Step step = (Step) theEObject;
-			Object result = caseStep(step);
-			if (result == null)
-				result = caseSection(step);
-			if (result == null)
-				result = caseWorkDefinition(step);
-			if (result == null)
-				result = caseVariabilityElement(step);
-			if (result == null)
-				result = caseMethodElement(step);
-			if (result == null)
-				result = casePackageableElement(step);
-			if (result == null)
-				result = caseNamedElement(step);
-			if (result == null)
-				result = caseElement(step);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.GUIDANCE: {
-			Guidance guidance = (Guidance) theEObject;
-			Object result = caseGuidance(guidance);
-			if (result == null)
-				result = caseContentElement(guidance);
-			if (result == null)
-				result = caseDescribableElement(guidance);
-			if (result == null)
-				result = caseVariabilityElement(guidance);
-			if (result == null)
-				result = caseMethodElement(guidance);
-			if (result == null)
-				result = caseClassifier(guidance);
-			if (result == null)
-				result = casePackageableElement(guidance);
-			if (result == null)
-				result = caseType(guidance);
-			if (result == null)
-				result = caseNamedElement(guidance);
-			if (result == null)
-				result = caseElement(guidance);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.ARTIFACT: {
-			Artifact artifact = (Artifact) theEObject;
-			Object result = caseArtifact(artifact);
-			if (result == null)
-				result = caseWorkProduct(artifact);
-			if (result == null)
-				result = caseContentElement(artifact);
-			if (result == null)
-				result = caseDescribableElement(artifact);
-			if (result == null)
-				result = caseVariabilityElement(artifact);
-			if (result == null)
-				result = caseMethodElement(artifact);
-			if (result == null)
-				result = caseClassifier(artifact);
-			if (result == null)
-				result = casePackageableElement(artifact);
-			if (result == null)
-				result = caseType(artifact);
-			if (result == null)
-				result = caseNamedElement(artifact);
-			if (result == null)
-				result = caseElement(artifact);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.DELIVERABLE: {
-			Deliverable deliverable = (Deliverable) theEObject;
-			Object result = caseDeliverable(deliverable);
-			if (result == null)
-				result = caseWorkProduct(deliverable);
-			if (result == null)
-				result = caseContentElement(deliverable);
-			if (result == null)
-				result = caseDescribableElement(deliverable);
-			if (result == null)
-				result = caseVariabilityElement(deliverable);
-			if (result == null)
-				result = caseMethodElement(deliverable);
-			if (result == null)
-				result = caseClassifier(deliverable);
-			if (result == null)
-				result = casePackageableElement(deliverable);
-			if (result == null)
-				result = caseType(deliverable);
-			if (result == null)
-				result = caseNamedElement(deliverable);
-			if (result == null)
-				result = caseElement(deliverable);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.OUTCOME: {
-			Outcome outcome = (Outcome) theEObject;
-			Object result = caseOutcome(outcome);
-			if (result == null)
-				result = caseWorkProduct(outcome);
-			if (result == null)
-				result = caseContentElement(outcome);
-			if (result == null)
-				result = caseDescribableElement(outcome);
-			if (result == null)
-				result = caseVariabilityElement(outcome);
-			if (result == null)
-				result = caseMethodElement(outcome);
-			if (result == null)
-				result = caseClassifier(outcome);
-			if (result == null)
-				result = casePackageableElement(outcome);
-			if (result == null)
-				result = caseType(outcome);
-			if (result == null)
-				result = caseNamedElement(outcome);
-			if (result == null)
-				result = caseElement(outcome);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.METHOD_PACKAGE: {
-			MethodPackage methodPackage = (MethodPackage) theEObject;
-			Object result = caseMethodPackage(methodPackage);
-			if (result == null)
-				result = caseMethodElement(methodPackage);
-			if (result == null)
-				result = casePackage(methodPackage);
-			if (result == null)
-				result = casePackageableElement(methodPackage);
-			if (result == null)
-				result = caseNamespace(methodPackage);
-			if (result == null)
-				result = caseNamedElement(methodPackage);
-			if (result == null)
-				result = caseElement(methodPackage);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.CONTENT_PACKAGE: {
-			ContentPackage contentPackage = (ContentPackage) theEObject;
-			Object result = caseContentPackage(contentPackage);
-			if (result == null)
-				result = caseMethodPackage(contentPackage);
-			if (result == null)
-				result = caseMethodElement(contentPackage);
-			if (result == null)
-				result = casePackage(contentPackage);
-			if (result == null)
-				result = casePackageableElement(contentPackage);
-			if (result == null)
-				result = caseNamespace(contentPackage);
-			if (result == null)
-				result = caseNamedElement(contentPackage);
-			if (result == null)
-				result = caseElement(contentPackage);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.ARTIFACT_DESCRIPTION: {
-			ArtifactDescription artifactDescription = (ArtifactDescription) theEObject;
-			Object result = caseArtifactDescription(artifactDescription);
-			if (result == null)
-				result = caseWorkProductDescription(artifactDescription);
-			if (result == null)
-				result = caseContentDescription(artifactDescription);
-			if (result == null)
-				result = caseMethodUnit(artifactDescription);
-			if (result == null)
-				result = caseMethodElement(artifactDescription);
-			if (result == null)
-				result = casePackageableElement(artifactDescription);
-			if (result == null)
-				result = caseNamedElement(artifactDescription);
-			if (result == null)
-				result = caseElement(artifactDescription);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.WORK_PRODUCT_DESCRIPTION: {
-			WorkProductDescription workProductDescription = (WorkProductDescription) theEObject;
-			Object result = caseWorkProductDescription(workProductDescription);
-			if (result == null)
-				result = caseContentDescription(workProductDescription);
-			if (result == null)
-				result = caseMethodUnit(workProductDescription);
-			if (result == null)
-				result = caseMethodElement(workProductDescription);
-			if (result == null)
-				result = casePackageableElement(workProductDescription);
-			if (result == null)
-				result = caseNamedElement(workProductDescription);
-			if (result == null)
-				result = caseElement(workProductDescription);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.DELIVERABLE_DESCRIPTION: {
-			DeliverableDescription deliverableDescription = (DeliverableDescription) theEObject;
-			Object result = caseDeliverableDescription(deliverableDescription);
-			if (result == null)
-				result = caseWorkProductDescription(deliverableDescription);
-			if (result == null)
-				result = caseContentDescription(deliverableDescription);
-			if (result == null)
-				result = caseMethodUnit(deliverableDescription);
-			if (result == null)
-				result = caseMethodElement(deliverableDescription);
-			if (result == null)
-				result = casePackageableElement(deliverableDescription);
-			if (result == null)
-				result = caseNamedElement(deliverableDescription);
-			if (result == null)
-				result = caseElement(deliverableDescription);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.ROLE_DESCRIPTION: {
-			RoleDescription roleDescription = (RoleDescription) theEObject;
-			Object result = caseRoleDescription(roleDescription);
-			if (result == null)
-				result = caseContentDescription(roleDescription);
-			if (result == null)
-				result = caseMethodUnit(roleDescription);
-			if (result == null)
-				result = caseMethodElement(roleDescription);
-			if (result == null)
-				result = casePackageableElement(roleDescription);
-			if (result == null)
-				result = caseNamedElement(roleDescription);
-			if (result == null)
-				result = caseElement(roleDescription);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.TASK_DESCRIPTION: {
-			TaskDescription taskDescription = (TaskDescription) theEObject;
-			Object result = caseTaskDescription(taskDescription);
-			if (result == null)
-				result = caseContentDescription(taskDescription);
-			if (result == null)
-				result = caseMethodUnit(taskDescription);
-			if (result == null)
-				result = caseMethodElement(taskDescription);
-			if (result == null)
-				result = casePackageableElement(taskDescription);
-			if (result == null)
-				result = caseNamedElement(taskDescription);
-			if (result == null)
-				result = caseElement(taskDescription);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.GUIDANCE_DESCRIPTION: {
-			GuidanceDescription guidanceDescription = (GuidanceDescription) theEObject;
-			Object result = caseGuidanceDescription(guidanceDescription);
-			if (result == null)
-				result = caseContentDescription(guidanceDescription);
-			if (result == null)
-				result = caseMethodUnit(guidanceDescription);
-			if (result == null)
-				result = caseMethodElement(guidanceDescription);
-			if (result == null)
-				result = casePackageableElement(guidanceDescription);
-			if (result == null)
-				result = caseNamedElement(guidanceDescription);
-			if (result == null)
-				result = caseElement(guidanceDescription);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PRACTICE_DESCRIPTION: {
-			PracticeDescription practiceDescription = (PracticeDescription) theEObject;
-			Object result = casePracticeDescription(practiceDescription);
-			if (result == null)
-				result = caseContentDescription(practiceDescription);
-			if (result == null)
-				result = caseMethodUnit(practiceDescription);
-			if (result == null)
-				result = caseMethodElement(practiceDescription);
-			if (result == null)
-				result = casePackageableElement(practiceDescription);
-			if (result == null)
-				result = caseNamedElement(practiceDescription);
-			if (result == null)
-				result = caseElement(practiceDescription);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.POINT: {
-			Point point = (Point) theEObject;
-			Object result = casePoint(point);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.GRAPH_ELEMENT: {
-			GraphElement graphElement = (GraphElement) theEObject;
-			Object result = caseGraphElement(graphElement);
-			if (result == null)
-				result = caseDiagramElement(graphElement);
-			if (result == null)
-				result = caseMethodElement(graphElement);
-			if (result == null)
-				result = casePackageableElement(graphElement);
-			if (result == null)
-				result = caseNamedElement(graphElement);
-			if (result == null)
-				result = caseElement(graphElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.DIAGRAM_ELEMENT: {
-			DiagramElement diagramElement = (DiagramElement) theEObject;
-			Object result = caseDiagramElement(diagramElement);
-			if (result == null)
-				result = caseMethodElement(diagramElement);
-			if (result == null)
-				result = casePackageableElement(diagramElement);
-			if (result == null)
-				result = caseNamedElement(diagramElement);
-			if (result == null)
-				result = caseElement(diagramElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.DIAGRAM_LINK: {
-			DiagramLink diagramLink = (DiagramLink) theEObject;
-			Object result = caseDiagramLink(diagramLink);
-			if (result == null)
-				result = caseDiagramElement(diagramLink);
-			if (result == null)
-				result = caseMethodElement(diagramLink);
-			if (result == null)
-				result = casePackageableElement(diagramLink);
-			if (result == null)
-				result = caseNamedElement(diagramLink);
-			if (result == null)
-				result = caseElement(diagramLink);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.GRAPH_CONNECTOR: {
-			GraphConnector graphConnector = (GraphConnector) theEObject;
-			Object result = caseGraphConnector(graphConnector);
-			if (result == null)
-				result = caseGraphElement(graphConnector);
-			if (result == null)
-				result = caseDiagramElement(graphConnector);
-			if (result == null)
-				result = caseMethodElement(graphConnector);
-			if (result == null)
-				result = casePackageableElement(graphConnector);
-			if (result == null)
-				result = caseNamedElement(graphConnector);
-			if (result == null)
-				result = caseElement(graphConnector);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.SEMANTIC_MODEL_BRIDGE: {
-			SemanticModelBridge semanticModelBridge = (SemanticModelBridge) theEObject;
-			Object result = caseSemanticModelBridge(semanticModelBridge);
-			if (result == null)
-				result = caseDiagramElement(semanticModelBridge);
-			if (result == null)
-				result = caseMethodElement(semanticModelBridge);
-			if (result == null)
-				result = casePackageableElement(semanticModelBridge);
-			if (result == null)
-				result = caseNamedElement(semanticModelBridge);
-			if (result == null)
-				result = caseElement(semanticModelBridge);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.DIMENSION: {
-			Dimension dimension = (Dimension) theEObject;
-			Object result = caseDimension(dimension);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.REFERENCE: {
-			Reference reference = (Reference) theEObject;
-			Object result = caseReference(reference);
-			if (result == null)
-				result = caseDiagramElement(reference);
-			if (result == null)
-				result = caseMethodElement(reference);
-			if (result == null)
-				result = casePackageableElement(reference);
-			if (result == null)
-				result = caseNamedElement(reference);
-			if (result == null)
-				result = caseElement(reference);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PROPERTY: {
-			Property property = (Property) theEObject;
-			Object result = caseProperty(property);
-			if (result == null)
-				result = caseDiagramElement(property);
-			if (result == null)
-				result = caseMethodElement(property);
-			if (result == null)
-				result = casePackageableElement(property);
-			if (result == null)
-				result = caseNamedElement(property);
-			if (result == null)
-				result = caseElement(property);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.GRAPH_EDGE: {
-			GraphEdge graphEdge = (GraphEdge) theEObject;
-			Object result = caseGraphEdge(graphEdge);
-			if (result == null)
-				result = caseGraphElement(graphEdge);
-			if (result == null)
-				result = caseDiagramElement(graphEdge);
-			if (result == null)
-				result = caseMethodElement(graphEdge);
-			if (result == null)
-				result = casePackageableElement(graphEdge);
-			if (result == null)
-				result = caseNamedElement(graphEdge);
-			if (result == null)
-				result = caseElement(graphEdge);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.DIAGRAM: {
-			Diagram diagram = (Diagram) theEObject;
-			Object result = caseDiagram(diagram);
-			if (result == null)
-				result = caseGraphNode(diagram);
-			if (result == null)
-				result = caseGraphElement(diagram);
-			if (result == null)
-				result = caseDiagramElement(diagram);
-			if (result == null)
-				result = caseMethodElement(diagram);
-			if (result == null)
-				result = casePackageableElement(diagram);
-			if (result == null)
-				result = caseNamedElement(diagram);
-			if (result == null)
-				result = caseElement(diagram);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.GRAPH_NODE: {
-			GraphNode graphNode = (GraphNode) theEObject;
-			Object result = caseGraphNode(graphNode);
-			if (result == null)
-				result = caseGraphElement(graphNode);
-			if (result == null)
-				result = caseDiagramElement(graphNode);
-			if (result == null)
-				result = caseMethodElement(graphNode);
-			if (result == null)
-				result = casePackageableElement(graphNode);
-			if (result == null)
-				result = caseNamedElement(graphNode);
-			if (result == null)
-				result = caseElement(graphNode);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.SIMPLE_SEMANTIC_MODEL_ELEMENT: {
-			SimpleSemanticModelElement simpleSemanticModelElement = (SimpleSemanticModelElement) theEObject;
-			Object result = caseSimpleSemanticModelElement(simpleSemanticModelElement);
-			if (result == null)
-				result = caseSemanticModelBridge(simpleSemanticModelElement);
-			if (result == null)
-				result = caseDiagramElement(simpleSemanticModelElement);
-			if (result == null)
-				result = caseMethodElement(simpleSemanticModelElement);
-			if (result == null)
-				result = casePackageableElement(simpleSemanticModelElement);
-			if (result == null)
-				result = caseNamedElement(simpleSemanticModelElement);
-			if (result == null)
-				result = caseElement(simpleSemanticModelElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.UMA_SEMANTIC_MODEL_BRIDGE: {
-			UMASemanticModelBridge umaSemanticModelBridge = (UMASemanticModelBridge) theEObject;
-			Object result = caseUMASemanticModelBridge(umaSemanticModelBridge);
-			if (result == null)
-				result = caseSemanticModelBridge(umaSemanticModelBridge);
-			if (result == null)
-				result = caseDiagramElement(umaSemanticModelBridge);
-			if (result == null)
-				result = caseMethodElement(umaSemanticModelBridge);
-			if (result == null)
-				result = casePackageableElement(umaSemanticModelBridge);
-			if (result == null)
-				result = caseNamedElement(umaSemanticModelBridge);
-			if (result == null)
-				result = caseElement(umaSemanticModelBridge);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.CORE_SEMANTIC_MODEL_BRIDGE: {
-			CoreSemanticModelBridge coreSemanticModelBridge = (CoreSemanticModelBridge) theEObject;
-			Object result = caseCoreSemanticModelBridge(coreSemanticModelBridge);
-			if (result == null)
-				result = caseSemanticModelBridge(coreSemanticModelBridge);
-			if (result == null)
-				result = caseDiagramElement(coreSemanticModelBridge);
-			if (result == null)
-				result = caseMethodElement(coreSemanticModelBridge);
-			if (result == null)
-				result = casePackageableElement(coreSemanticModelBridge);
-			if (result == null)
-				result = caseNamedElement(coreSemanticModelBridge);
-			if (result == null)
-				result = caseElement(coreSemanticModelBridge);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.LEAF_ELEMENT: {
-			LeafElement leafElement = (LeafElement) theEObject;
-			Object result = caseLeafElement(leafElement);
-			if (result == null)
-				result = caseDiagramElement(leafElement);
-			if (result == null)
-				result = caseMethodElement(leafElement);
-			if (result == null)
-				result = casePackageableElement(leafElement);
-			if (result == null)
-				result = caseNamedElement(leafElement);
-			if (result == null)
-				result = caseElement(leafElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.TEXT_ELEMENT: {
-			TextElement textElement = (TextElement) theEObject;
-			Object result = caseTextElement(textElement);
-			if (result == null)
-				result = caseLeafElement(textElement);
-			if (result == null)
-				result = caseDiagramElement(textElement);
-			if (result == null)
-				result = caseMethodElement(textElement);
-			if (result == null)
-				result = casePackageableElement(textElement);
-			if (result == null)
-				result = caseNamedElement(textElement);
-			if (result == null)
-				result = caseElement(textElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.IMAGE: {
-			Image image = (Image) theEObject;
-			Object result = caseImage(image);
-			if (result == null)
-				result = caseLeafElement(image);
-			if (result == null)
-				result = caseDiagramElement(image);
-			if (result == null)
-				result = caseMethodElement(image);
-			if (result == null)
-				result = casePackageableElement(image);
-			if (result == null)
-				result = caseNamedElement(image);
-			if (result == null)
-				result = caseElement(image);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.GRAPHIC_PRIMITIVE: {
-			GraphicPrimitive graphicPrimitive = (GraphicPrimitive) theEObject;
-			Object result = caseGraphicPrimitive(graphicPrimitive);
-			if (result == null)
-				result = caseLeafElement(graphicPrimitive);
-			if (result == null)
-				result = caseDiagramElement(graphicPrimitive);
-			if (result == null)
-				result = caseMethodElement(graphicPrimitive);
-			if (result == null)
-				result = casePackageableElement(graphicPrimitive);
-			if (result == null)
-				result = caseNamedElement(graphicPrimitive);
-			if (result == null)
-				result = caseElement(graphicPrimitive);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.POLYLINE: {
-			Polyline polyline = (Polyline) theEObject;
-			Object result = casePolyline(polyline);
-			if (result == null)
-				result = caseGraphicPrimitive(polyline);
-			if (result == null)
-				result = caseLeafElement(polyline);
-			if (result == null)
-				result = caseDiagramElement(polyline);
-			if (result == null)
-				result = caseMethodElement(polyline);
-			if (result == null)
-				result = casePackageableElement(polyline);
-			if (result == null)
-				result = caseNamedElement(polyline);
-			if (result == null)
-				result = caseElement(polyline);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.ELLIPSE: {
-			Ellipse ellipse = (Ellipse) theEObject;
-			Object result = caseEllipse(ellipse);
-			if (result == null)
-				result = caseGraphicPrimitive(ellipse);
-			if (result == null)
-				result = caseLeafElement(ellipse);
-			if (result == null)
-				result = caseDiagramElement(ellipse);
-			if (result == null)
-				result = caseMethodElement(ellipse);
-			if (result == null)
-				result = casePackageableElement(ellipse);
-			if (result == null)
-				result = caseNamedElement(ellipse);
-			if (result == null)
-				result = caseElement(ellipse);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.ACTIVITY: {
-			Activity activity = (Activity) theEObject;
-			Object result = caseActivity(activity);
-			if (result == null)
-				result = caseWorkBreakdownElement(activity);
-			if (result == null)
-				result = caseVariabilityElement(activity);
-			if (result == null)
-				result = caseWorkDefinition(activity);
-			if (result == null)
-				result = caseBreakdownElement(activity);
-			if (result == null)
-				result = caseMethodElement(activity);
-			if (result == null)
-				result = caseProcessElement(activity);
-			if (result == null)
-				result = casePackageableElement(activity);
-			if (result == null)
-				result = caseDescribableElement(activity);
-			if (result == null)
-				result = caseNamedElement(activity);
-			if (result == null)
-				result = caseClassifier(activity);
-			if (result == null)
-				result = caseElement(activity);
-			if (result == null)
-				result = caseType(activity);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.WORK_BREAKDOWN_ELEMENT: {
-			WorkBreakdownElement workBreakdownElement = (WorkBreakdownElement) theEObject;
-			Object result = caseWorkBreakdownElement(workBreakdownElement);
-			if (result == null)
-				result = caseBreakdownElement(workBreakdownElement);
-			if (result == null)
-				result = caseProcessElement(workBreakdownElement);
-			if (result == null)
-				result = caseDescribableElement(workBreakdownElement);
-			if (result == null)
-				result = caseMethodElement(workBreakdownElement);
-			if (result == null)
-				result = caseClassifier(workBreakdownElement);
-			if (result == null)
-				result = casePackageableElement(workBreakdownElement);
-			if (result == null)
-				result = caseType(workBreakdownElement);
-			if (result == null)
-				result = caseNamedElement(workBreakdownElement);
-			if (result == null)
-				result = caseElement(workBreakdownElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.BREAKDOWN_ELEMENT: {
-			BreakdownElement breakdownElement = (BreakdownElement) theEObject;
-			Object result = caseBreakdownElement(breakdownElement);
-			if (result == null)
-				result = caseProcessElement(breakdownElement);
-			if (result == null)
-				result = caseDescribableElement(breakdownElement);
-			if (result == null)
-				result = caseMethodElement(breakdownElement);
-			if (result == null)
-				result = caseClassifier(breakdownElement);
-			if (result == null)
-				result = casePackageableElement(breakdownElement);
-			if (result == null)
-				result = caseType(breakdownElement);
-			if (result == null)
-				result = caseNamedElement(breakdownElement);
-			if (result == null)
-				result = caseElement(breakdownElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.MILESTONE: {
-			Milestone milestone = (Milestone) theEObject;
-			Object result = caseMilestone(milestone);
-			if (result == null)
-				result = caseWorkBreakdownElement(milestone);
-			if (result == null)
-				result = caseBreakdownElement(milestone);
-			if (result == null)
-				result = caseProcessElement(milestone);
-			if (result == null)
-				result = caseDescribableElement(milestone);
-			if (result == null)
-				result = caseMethodElement(milestone);
-			if (result == null)
-				result = caseClassifier(milestone);
-			if (result == null)
-				result = casePackageableElement(milestone);
-			if (result == null)
-				result = caseType(milestone);
-			if (result == null)
-				result = caseNamedElement(milestone);
-			if (result == null)
-				result = caseElement(milestone);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.ITERATION: {
-			Iteration iteration = (Iteration) theEObject;
-			Object result = caseIteration(iteration);
-			if (result == null)
-				result = caseActivity(iteration);
-			if (result == null)
-				result = caseWorkBreakdownElement(iteration);
-			if (result == null)
-				result = caseVariabilityElement(iteration);
-			if (result == null)
-				result = caseWorkDefinition(iteration);
-			if (result == null)
-				result = caseBreakdownElement(iteration);
-			if (result == null)
-				result = caseMethodElement(iteration);
-			if (result == null)
-				result = caseProcessElement(iteration);
-			if (result == null)
-				result = casePackageableElement(iteration);
-			if (result == null)
-				result = caseDescribableElement(iteration);
-			if (result == null)
-				result = caseNamedElement(iteration);
-			if (result == null)
-				result = caseClassifier(iteration);
-			if (result == null)
-				result = caseElement(iteration);
-			if (result == null)
-				result = caseType(iteration);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PHASE: {
-			Phase phase = (Phase) theEObject;
-			Object result = casePhase(phase);
-			if (result == null)
-				result = caseActivity(phase);
-			if (result == null)
-				result = caseWorkBreakdownElement(phase);
-			if (result == null)
-				result = caseVariabilityElement(phase);
-			if (result == null)
-				result = caseWorkDefinition(phase);
-			if (result == null)
-				result = caseBreakdownElement(phase);
-			if (result == null)
-				result = caseMethodElement(phase);
-			if (result == null)
-				result = caseProcessElement(phase);
-			if (result == null)
-				result = casePackageableElement(phase);
-			if (result == null)
-				result = caseDescribableElement(phase);
-			if (result == null)
-				result = caseNamedElement(phase);
-			if (result == null)
-				result = caseClassifier(phase);
-			if (result == null)
-				result = caseElement(phase);
-			if (result == null)
-				result = caseType(phase);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.TEAM_PROFILE: {
-			TeamProfile teamProfile = (TeamProfile) theEObject;
-			Object result = caseTeamProfile(teamProfile);
-			if (result == null)
-				result = caseBreakdownElement(teamProfile);
-			if (result == null)
-				result = caseProcessElement(teamProfile);
-			if (result == null)
-				result = caseDescribableElement(teamProfile);
-			if (result == null)
-				result = caseMethodElement(teamProfile);
-			if (result == null)
-				result = caseClassifier(teamProfile);
-			if (result == null)
-				result = casePackageableElement(teamProfile);
-			if (result == null)
-				result = caseType(teamProfile);
-			if (result == null)
-				result = caseNamedElement(teamProfile);
-			if (result == null)
-				result = caseElement(teamProfile);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.ROLE_DESCRIPTOR: {
-			RoleDescriptor roleDescriptor = (RoleDescriptor) theEObject;
-			Object result = caseRoleDescriptor(roleDescriptor);
-			if (result == null)
-				result = caseDescriptor(roleDescriptor);
-			if (result == null)
-				result = caseBreakdownElement(roleDescriptor);
-			if (result == null)
-				result = caseProcessElement(roleDescriptor);
-			if (result == null)
-				result = caseDescribableElement(roleDescriptor);
-			if (result == null)
-				result = caseMethodElement(roleDescriptor);
-			if (result == null)
-				result = caseClassifier(roleDescriptor);
-			if (result == null)
-				result = casePackageableElement(roleDescriptor);
-			if (result == null)
-				result = caseType(roleDescriptor);
-			if (result == null)
-				result = caseNamedElement(roleDescriptor);
-			if (result == null)
-				result = caseElement(roleDescriptor);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.WORK_ORDER: {
-			WorkOrder workOrder = (WorkOrder) theEObject;
-			Object result = caseWorkOrder(workOrder);
-			if (result == null)
-				result = caseProcessElement(workOrder);
-			if (result == null)
-				result = caseDescribableElement(workOrder);
-			if (result == null)
-				result = caseMethodElement(workOrder);
-			if (result == null)
-				result = caseClassifier(workOrder);
-			if (result == null)
-				result = casePackageableElement(workOrder);
-			if (result == null)
-				result = caseType(workOrder);
-			if (result == null)
-				result = caseNamedElement(workOrder);
-			if (result == null)
-				result = caseElement(workOrder);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PROCESS_ELEMENT: {
-			ProcessElement processElement = (ProcessElement) theEObject;
-			Object result = caseProcessElement(processElement);
-			if (result == null)
-				result = caseDescribableElement(processElement);
-			if (result == null)
-				result = caseMethodElement(processElement);
-			if (result == null)
-				result = caseClassifier(processElement);
-			if (result == null)
-				result = casePackageableElement(processElement);
-			if (result == null)
-				result = caseType(processElement);
-			if (result == null)
-				result = caseNamedElement(processElement);
-			if (result == null)
-				result = caseElement(processElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PLANNING_DATA: {
-			PlanningData planningData = (PlanningData) theEObject;
-			Object result = casePlanningData(planningData);
-			if (result == null)
-				result = caseProcessElement(planningData);
-			if (result == null)
-				result = caseDescribableElement(planningData);
-			if (result == null)
-				result = caseMethodElement(planningData);
-			if (result == null)
-				result = caseClassifier(planningData);
-			if (result == null)
-				result = casePackageableElement(planningData);
-			if (result == null)
-				result = caseType(planningData);
-			if (result == null)
-				result = caseNamedElement(planningData);
-			if (result == null)
-				result = caseElement(planningData);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.DESCRIPTOR: {
-			Descriptor descriptor = (Descriptor) theEObject;
-			Object result = caseDescriptor(descriptor);
-			if (result == null)
-				result = caseBreakdownElement(descriptor);
-			if (result == null)
-				result = caseProcessElement(descriptor);
-			if (result == null)
-				result = caseDescribableElement(descriptor);
-			if (result == null)
-				result = caseMethodElement(descriptor);
-			if (result == null)
-				result = caseClassifier(descriptor);
-			if (result == null)
-				result = casePackageableElement(descriptor);
-			if (result == null)
-				result = caseType(descriptor);
-			if (result == null)
-				result = caseNamedElement(descriptor);
-			if (result == null)
-				result = caseElement(descriptor);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.WORK_PRODUCT_DESCRIPTOR: {
-			WorkProductDescriptor workProductDescriptor = (WorkProductDescriptor) theEObject;
-			Object result = caseWorkProductDescriptor(workProductDescriptor);
-			if (result == null)
-				result = caseDescriptor(workProductDescriptor);
-			if (result == null)
-				result = caseBreakdownElement(workProductDescriptor);
-			if (result == null)
-				result = caseProcessElement(workProductDescriptor);
-			if (result == null)
-				result = caseDescribableElement(workProductDescriptor);
-			if (result == null)
-				result = caseMethodElement(workProductDescriptor);
-			if (result == null)
-				result = caseClassifier(workProductDescriptor);
-			if (result == null)
-				result = casePackageableElement(workProductDescriptor);
-			if (result == null)
-				result = caseType(workProductDescriptor);
-			if (result == null)
-				result = caseNamedElement(workProductDescriptor);
-			if (result == null)
-				result = caseElement(workProductDescriptor);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.TASK_DESCRIPTOR: {
-			TaskDescriptor taskDescriptor = (TaskDescriptor) theEObject;
-			Object result = caseTaskDescriptor(taskDescriptor);
-			if (result == null)
-				result = caseWorkBreakdownElement(taskDescriptor);
-			if (result == null)
-				result = caseDescriptor(taskDescriptor);
-			if (result == null)
-				result = caseBreakdownElement(taskDescriptor);
-			if (result == null)
-				result = caseProcessElement(taskDescriptor);
-			if (result == null)
-				result = caseDescribableElement(taskDescriptor);
-			if (result == null)
-				result = caseMethodElement(taskDescriptor);
-			if (result == null)
-				result = caseClassifier(taskDescriptor);
-			if (result == null)
-				result = casePackageableElement(taskDescriptor);
-			if (result == null)
-				result = caseType(taskDescriptor);
-			if (result == null)
-				result = caseNamedElement(taskDescriptor);
-			if (result == null)
-				result = caseElement(taskDescriptor);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.COMPOSITE_ROLE: {
-			CompositeRole compositeRole = (CompositeRole) theEObject;
-			Object result = caseCompositeRole(compositeRole);
-			if (result == null)
-				result = caseRoleDescriptor(compositeRole);
-			if (result == null)
-				result = caseDescriptor(compositeRole);
-			if (result == null)
-				result = caseBreakdownElement(compositeRole);
-			if (result == null)
-				result = caseProcessElement(compositeRole);
-			if (result == null)
-				result = caseDescribableElement(compositeRole);
-			if (result == null)
-				result = caseMethodElement(compositeRole);
-			if (result == null)
-				result = caseClassifier(compositeRole);
-			if (result == null)
-				result = casePackageableElement(compositeRole);
-			if (result == null)
-				result = caseType(compositeRole);
-			if (result == null)
-				result = caseNamedElement(compositeRole);
-			if (result == null)
-				result = caseElement(compositeRole);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.BREAKDOWN_ELEMENT_DESCRIPTION: {
-			BreakdownElementDescription breakdownElementDescription = (BreakdownElementDescription) theEObject;
-			Object result = caseBreakdownElementDescription(breakdownElementDescription);
-			if (result == null)
-				result = caseContentDescription(breakdownElementDescription);
-			if (result == null)
-				result = caseMethodUnit(breakdownElementDescription);
-			if (result == null)
-				result = caseMethodElement(breakdownElementDescription);
-			if (result == null)
-				result = casePackageableElement(breakdownElementDescription);
-			if (result == null)
-				result = caseNamedElement(breakdownElementDescription);
-			if (result == null)
-				result = caseElement(breakdownElementDescription);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.ACTIVITY_DESCRIPTION: {
-			ActivityDescription activityDescription = (ActivityDescription) theEObject;
-			Object result = caseActivityDescription(activityDescription);
-			if (result == null)
-				result = caseBreakdownElementDescription(activityDescription);
-			if (result == null)
-				result = caseContentDescription(activityDescription);
-			if (result == null)
-				result = caseMethodUnit(activityDescription);
-			if (result == null)
-				result = caseMethodElement(activityDescription);
-			if (result == null)
-				result = casePackageableElement(activityDescription);
-			if (result == null)
-				result = caseNamedElement(activityDescription);
-			if (result == null)
-				result = caseElement(activityDescription);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.DELIVERY_PROCESS_DESCRIPTION: {
-			DeliveryProcessDescription deliveryProcessDescription = (DeliveryProcessDescription) theEObject;
-			Object result = caseDeliveryProcessDescription(deliveryProcessDescription);
-			if (result == null)
-				result = caseProcessDescription(deliveryProcessDescription);
-			if (result == null)
-				result = caseActivityDescription(deliveryProcessDescription);
-			if (result == null)
-				result = caseBreakdownElementDescription(deliveryProcessDescription);
-			if (result == null)
-				result = caseContentDescription(deliveryProcessDescription);
-			if (result == null)
-				result = caseMethodUnit(deliveryProcessDescription);
-			if (result == null)
-				result = caseMethodElement(deliveryProcessDescription);
-			if (result == null)
-				result = casePackageableElement(deliveryProcessDescription);
-			if (result == null)
-				result = caseNamedElement(deliveryProcessDescription);
-			if (result == null)
-				result = caseElement(deliveryProcessDescription);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PROCESS_DESCRIPTION: {
-			ProcessDescription processDescription = (ProcessDescription) theEObject;
-			Object result = caseProcessDescription(processDescription);
-			if (result == null)
-				result = caseActivityDescription(processDescription);
-			if (result == null)
-				result = caseBreakdownElementDescription(processDescription);
-			if (result == null)
-				result = caseContentDescription(processDescription);
-			if (result == null)
-				result = caseMethodUnit(processDescription);
-			if (result == null)
-				result = caseMethodElement(processDescription);
-			if (result == null)
-				result = casePackageableElement(processDescription);
-			if (result == null)
-				result = caseNamedElement(processDescription);
-			if (result == null)
-				result = caseElement(processDescription);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.DESCRIPTOR_DESCRIPTION: {
-			DescriptorDescription descriptorDescription = (DescriptorDescription) theEObject;
-			Object result = caseDescriptorDescription(descriptorDescription);
-			if (result == null)
-				result = caseBreakdownElementDescription(descriptorDescription);
-			if (result == null)
-				result = caseContentDescription(descriptorDescription);
-			if (result == null)
-				result = caseMethodUnit(descriptorDescription);
-			if (result == null)
-				result = caseMethodElement(descriptorDescription);
-			if (result == null)
-				result = casePackageableElement(descriptorDescription);
-			if (result == null)
-				result = caseNamedElement(descriptorDescription);
-			if (result == null)
-				result = caseElement(descriptorDescription);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.CONCEPT: {
-			Concept concept = (Concept) theEObject;
-			Object result = caseConcept(concept);
-			if (result == null)
-				result = caseGuidance(concept);
-			if (result == null)
-				result = caseContentElement(concept);
-			if (result == null)
-				result = caseDescribableElement(concept);
-			if (result == null)
-				result = caseVariabilityElement(concept);
-			if (result == null)
-				result = caseMethodElement(concept);
-			if (result == null)
-				result = caseClassifier(concept);
-			if (result == null)
-				result = casePackageableElement(concept);
-			if (result == null)
-				result = caseType(concept);
-			if (result == null)
-				result = caseNamedElement(concept);
-			if (result == null)
-				result = caseElement(concept);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.CHECKLIST: {
-			Checklist checklist = (Checklist) theEObject;
-			Object result = caseChecklist(checklist);
-			if (result == null)
-				result = caseGuidance(checklist);
-			if (result == null)
-				result = caseContentElement(checklist);
-			if (result == null)
-				result = caseDescribableElement(checklist);
-			if (result == null)
-				result = caseVariabilityElement(checklist);
-			if (result == null)
-				result = caseMethodElement(checklist);
-			if (result == null)
-				result = caseClassifier(checklist);
-			if (result == null)
-				result = casePackageableElement(checklist);
-			if (result == null)
-				result = caseType(checklist);
-			if (result == null)
-				result = caseNamedElement(checklist);
-			if (result == null)
-				result = caseElement(checklist);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.EXAMPLE: {
-			Example example = (Example) theEObject;
-			Object result = caseExample(example);
-			if (result == null)
-				result = caseGuidance(example);
-			if (result == null)
-				result = caseContentElement(example);
-			if (result == null)
-				result = caseDescribableElement(example);
-			if (result == null)
-				result = caseVariabilityElement(example);
-			if (result == null)
-				result = caseMethodElement(example);
-			if (result == null)
-				result = caseClassifier(example);
-			if (result == null)
-				result = casePackageableElement(example);
-			if (result == null)
-				result = caseType(example);
-			if (result == null)
-				result = caseNamedElement(example);
-			if (result == null)
-				result = caseElement(example);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.GUIDELINE: {
-			Guideline guideline = (Guideline) theEObject;
-			Object result = caseGuideline(guideline);
-			if (result == null)
-				result = caseGuidance(guideline);
-			if (result == null)
-				result = caseContentElement(guideline);
-			if (result == null)
-				result = caseDescribableElement(guideline);
-			if (result == null)
-				result = caseVariabilityElement(guideline);
-			if (result == null)
-				result = caseMethodElement(guideline);
-			if (result == null)
-				result = caseClassifier(guideline);
-			if (result == null)
-				result = casePackageableElement(guideline);
-			if (result == null)
-				result = caseType(guideline);
-			if (result == null)
-				result = caseNamedElement(guideline);
-			if (result == null)
-				result = caseElement(guideline);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.REPORT: {
-			Report report = (Report) theEObject;
-			Object result = caseReport(report);
-			if (result == null)
-				result = caseGuidance(report);
-			if (result == null)
-				result = caseContentElement(report);
-			if (result == null)
-				result = caseDescribableElement(report);
-			if (result == null)
-				result = caseVariabilityElement(report);
-			if (result == null)
-				result = caseMethodElement(report);
-			if (result == null)
-				result = caseClassifier(report);
-			if (result == null)
-				result = casePackageableElement(report);
-			if (result == null)
-				result = caseType(report);
-			if (result == null)
-				result = caseNamedElement(report);
-			if (result == null)
-				result = caseElement(report);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.TEMPLATE: {
-			Template template = (Template) theEObject;
-			Object result = caseTemplate(template);
-			if (result == null)
-				result = caseGuidance(template);
-			if (result == null)
-				result = caseContentElement(template);
-			if (result == null)
-				result = caseDescribableElement(template);
-			if (result == null)
-				result = caseVariabilityElement(template);
-			if (result == null)
-				result = caseMethodElement(template);
-			if (result == null)
-				result = caseClassifier(template);
-			if (result == null)
-				result = casePackageableElement(template);
-			if (result == null)
-				result = caseType(template);
-			if (result == null)
-				result = caseNamedElement(template);
-			if (result == null)
-				result = caseElement(template);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.SUPPORTING_MATERIAL: {
-			SupportingMaterial supportingMaterial = (SupportingMaterial) theEObject;
-			Object result = caseSupportingMaterial(supportingMaterial);
-			if (result == null)
-				result = caseGuidance(supportingMaterial);
-			if (result == null)
-				result = caseContentElement(supportingMaterial);
-			if (result == null)
-				result = caseDescribableElement(supportingMaterial);
-			if (result == null)
-				result = caseVariabilityElement(supportingMaterial);
-			if (result == null)
-				result = caseMethodElement(supportingMaterial);
-			if (result == null)
-				result = caseClassifier(supportingMaterial);
-			if (result == null)
-				result = casePackageableElement(supportingMaterial);
-			if (result == null)
-				result = caseType(supportingMaterial);
-			if (result == null)
-				result = caseNamedElement(supportingMaterial);
-			if (result == null)
-				result = caseElement(supportingMaterial);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.TOOL_MENTOR: {
-			ToolMentor toolMentor = (ToolMentor) theEObject;
-			Object result = caseToolMentor(toolMentor);
-			if (result == null)
-				result = caseGuidance(toolMentor);
-			if (result == null)
-				result = caseContentElement(toolMentor);
-			if (result == null)
-				result = caseDescribableElement(toolMentor);
-			if (result == null)
-				result = caseVariabilityElement(toolMentor);
-			if (result == null)
-				result = caseMethodElement(toolMentor);
-			if (result == null)
-				result = caseClassifier(toolMentor);
-			if (result == null)
-				result = casePackageableElement(toolMentor);
-			if (result == null)
-				result = caseType(toolMentor);
-			if (result == null)
-				result = caseNamedElement(toolMentor);
-			if (result == null)
-				result = caseElement(toolMentor);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.WHITEPAPER: {
-			Whitepaper whitepaper = (Whitepaper) theEObject;
-			Object result = caseWhitepaper(whitepaper);
-			if (result == null)
-				result = caseConcept(whitepaper);
-			if (result == null)
-				result = caseGuidance(whitepaper);
-			if (result == null)
-				result = caseContentElement(whitepaper);
-			if (result == null)
-				result = caseDescribableElement(whitepaper);
-			if (result == null)
-				result = caseVariabilityElement(whitepaper);
-			if (result == null)
-				result = caseMethodElement(whitepaper);
-			if (result == null)
-				result = caseClassifier(whitepaper);
-			if (result == null)
-				result = casePackageableElement(whitepaper);
-			if (result == null)
-				result = caseType(whitepaper);
-			if (result == null)
-				result = caseNamedElement(whitepaper);
-			if (result == null)
-				result = caseElement(whitepaper);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.TERM_DEFINITION: {
-			TermDefinition termDefinition = (TermDefinition) theEObject;
-			Object result = caseTermDefinition(termDefinition);
-			if (result == null)
-				result = caseGuidance(termDefinition);
-			if (result == null)
-				result = caseContentElement(termDefinition);
-			if (result == null)
-				result = caseDescribableElement(termDefinition);
-			if (result == null)
-				result = caseVariabilityElement(termDefinition);
-			if (result == null)
-				result = caseMethodElement(termDefinition);
-			if (result == null)
-				result = caseClassifier(termDefinition);
-			if (result == null)
-				result = casePackageableElement(termDefinition);
-			if (result == null)
-				result = caseType(termDefinition);
-			if (result == null)
-				result = caseNamedElement(termDefinition);
-			if (result == null)
-				result = caseElement(termDefinition);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PRACTICE: {
-			Practice practice = (Practice) theEObject;
-			Object result = casePractice(practice);
-			if (result == null)
-				result = caseGuidance(practice);
-			if (result == null)
-				result = caseContentElement(practice);
-			if (result == null)
-				result = caseDescribableElement(practice);
-			if (result == null)
-				result = caseVariabilityElement(practice);
-			if (result == null)
-				result = caseMethodElement(practice);
-			if (result == null)
-				result = caseClassifier(practice);
-			if (result == null)
-				result = casePackageableElement(practice);
-			if (result == null)
-				result = caseType(practice);
-			if (result == null)
-				result = caseNamedElement(practice);
-			if (result == null)
-				result = caseElement(practice);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.ESTIMATION_CONSIDERATIONS: {
-			EstimationConsiderations estimationConsiderations = (EstimationConsiderations) theEObject;
-			Object result = caseEstimationConsiderations(estimationConsiderations);
-			if (result == null)
-				result = caseGuidance(estimationConsiderations);
-			if (result == null)
-				result = caseContentElement(estimationConsiderations);
-			if (result == null)
-				result = caseDescribableElement(estimationConsiderations);
-			if (result == null)
-				result = caseVariabilityElement(estimationConsiderations);
-			if (result == null)
-				result = caseMethodElement(estimationConsiderations);
-			if (result == null)
-				result = caseClassifier(estimationConsiderations);
-			if (result == null)
-				result = casePackageableElement(estimationConsiderations);
-			if (result == null)
-				result = caseType(estimationConsiderations);
-			if (result == null)
-				result = caseNamedElement(estimationConsiderations);
-			if (result == null)
-				result = caseElement(estimationConsiderations);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.REUSABLE_ASSET: {
-			ReusableAsset reusableAsset = (ReusableAsset) theEObject;
-			Object result = caseReusableAsset(reusableAsset);
-			if (result == null)
-				result = caseGuidance(reusableAsset);
-			if (result == null)
-				result = caseContentElement(reusableAsset);
-			if (result == null)
-				result = caseDescribableElement(reusableAsset);
-			if (result == null)
-				result = caseVariabilityElement(reusableAsset);
-			if (result == null)
-				result = caseMethodElement(reusableAsset);
-			if (result == null)
-				result = caseClassifier(reusableAsset);
-			if (result == null)
-				result = casePackageableElement(reusableAsset);
-			if (result == null)
-				result = caseType(reusableAsset);
-			if (result == null)
-				result = caseNamedElement(reusableAsset);
-			if (result == null)
-				result = caseElement(reusableAsset);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.STATE: {
-			State state = (State) theEObject;
-			Object result = caseState(state);
-			if (result == null)
-				result = caseVertex(state);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.VERTEX: {
-			Vertex vertex = (Vertex) theEObject;
-			Object result = caseVertex(vertex);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.REGION: {
-			Region region = (Region) theEObject;
-			Object result = caseRegion(region);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.STATE_MACHINE: {
-			StateMachine stateMachine = (StateMachine) theEObject;
-			Object result = caseStateMachine(stateMachine);
-			if (result == null)
-				result = caseWorkDefinition(stateMachine);
-			if (result == null)
-				result = caseMethodElement(stateMachine);
-			if (result == null)
-				result = casePackageableElement(stateMachine);
-			if (result == null)
-				result = caseNamedElement(stateMachine);
-			if (result == null)
-				result = caseElement(stateMachine);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.TRANSITION: {
-			Transition transition = (Transition) theEObject;
-			Object result = caseTransition(transition);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PSEUDO_STATE: {
-			PseudoState pseudoState = (PseudoState) theEObject;
-			Object result = casePseudoState(pseudoState);
-			if (result == null)
-				result = caseVertex(pseudoState);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.DISCIPLINE: {
-			Discipline discipline = (Discipline) theEObject;
-			Object result = caseDiscipline(discipline);
-			if (result == null)
-				result = caseContentCategory(discipline);
-			if (result == null)
-				result = caseContentElement(discipline);
-			if (result == null)
-				result = caseDescribableElement(discipline);
-			if (result == null)
-				result = caseVariabilityElement(discipline);
-			if (result == null)
-				result = caseMethodElement(discipline);
-			if (result == null)
-				result = caseClassifier(discipline);
-			if (result == null)
-				result = casePackageableElement(discipline);
-			if (result == null)
-				result = caseType(discipline);
-			if (result == null)
-				result = caseNamedElement(discipline);
-			if (result == null)
-				result = caseElement(discipline);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.CONTENT_CATEGORY: {
-			ContentCategory contentCategory = (ContentCategory) theEObject;
-			Object result = caseContentCategory(contentCategory);
-			if (result == null)
-				result = caseContentElement(contentCategory);
-			if (result == null)
-				result = caseDescribableElement(contentCategory);
-			if (result == null)
-				result = caseVariabilityElement(contentCategory);
-			if (result == null)
-				result = caseMethodElement(contentCategory);
-			if (result == null)
-				result = caseClassifier(contentCategory);
-			if (result == null)
-				result = casePackageableElement(contentCategory);
-			if (result == null)
-				result = caseType(contentCategory);
-			if (result == null)
-				result = caseNamedElement(contentCategory);
-			if (result == null)
-				result = caseElement(contentCategory);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.ROLE_SET: {
-			RoleSet roleSet = (RoleSet) theEObject;
-			Object result = caseRoleSet(roleSet);
-			if (result == null)
-				result = caseContentCategory(roleSet);
-			if (result == null)
-				result = caseContentElement(roleSet);
-			if (result == null)
-				result = caseDescribableElement(roleSet);
-			if (result == null)
-				result = caseVariabilityElement(roleSet);
-			if (result == null)
-				result = caseMethodElement(roleSet);
-			if (result == null)
-				result = caseClassifier(roleSet);
-			if (result == null)
-				result = casePackageableElement(roleSet);
-			if (result == null)
-				result = caseType(roleSet);
-			if (result == null)
-				result = caseNamedElement(roleSet);
-			if (result == null)
-				result = caseElement(roleSet);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.DOMAIN: {
-			Domain domain = (Domain) theEObject;
-			Object result = caseDomain(domain);
-			if (result == null)
-				result = caseContentCategory(domain);
-			if (result == null)
-				result = caseContentElement(domain);
-			if (result == null)
-				result = caseDescribableElement(domain);
-			if (result == null)
-				result = caseVariabilityElement(domain);
-			if (result == null)
-				result = caseMethodElement(domain);
-			if (result == null)
-				result = caseClassifier(domain);
-			if (result == null)
-				result = casePackageableElement(domain);
-			if (result == null)
-				result = caseType(domain);
-			if (result == null)
-				result = caseNamedElement(domain);
-			if (result == null)
-				result = caseElement(domain);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.WORK_PRODUCT_TYPE: {
-			WorkProductType workProductType = (WorkProductType) theEObject;
-			Object result = caseWorkProductType(workProductType);
-			if (result == null)
-				result = caseContentCategory(workProductType);
-			if (result == null)
-				result = caseContentElement(workProductType);
-			if (result == null)
-				result = caseDescribableElement(workProductType);
-			if (result == null)
-				result = caseVariabilityElement(workProductType);
-			if (result == null)
-				result = caseMethodElement(workProductType);
-			if (result == null)
-				result = caseClassifier(workProductType);
-			if (result == null)
-				result = casePackageableElement(workProductType);
-			if (result == null)
-				result = caseType(workProductType);
-			if (result == null)
-				result = caseNamedElement(workProductType);
-			if (result == null)
-				result = caseElement(workProductType);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.DISCIPLINE_GROUPING: {
-			DisciplineGrouping disciplineGrouping = (DisciplineGrouping) theEObject;
-			Object result = caseDisciplineGrouping(disciplineGrouping);
-			if (result == null)
-				result = caseContentCategory(disciplineGrouping);
-			if (result == null)
-				result = caseContentElement(disciplineGrouping);
-			if (result == null)
-				result = caseDescribableElement(disciplineGrouping);
-			if (result == null)
-				result = caseVariabilityElement(disciplineGrouping);
-			if (result == null)
-				result = caseMethodElement(disciplineGrouping);
-			if (result == null)
-				result = caseClassifier(disciplineGrouping);
-			if (result == null)
-				result = casePackageableElement(disciplineGrouping);
-			if (result == null)
-				result = caseType(disciplineGrouping);
-			if (result == null)
-				result = caseNamedElement(disciplineGrouping);
-			if (result == null)
-				result = caseElement(disciplineGrouping);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.TOOL: {
-			Tool tool = (Tool) theEObject;
-			Object result = caseTool(tool);
-			if (result == null)
-				result = caseContentCategory(tool);
-			if (result == null)
-				result = caseContentElement(tool);
-			if (result == null)
-				result = caseDescribableElement(tool);
-			if (result == null)
-				result = caseVariabilityElement(tool);
-			if (result == null)
-				result = caseMethodElement(tool);
-			if (result == null)
-				result = caseClassifier(tool);
-			if (result == null)
-				result = casePackageableElement(tool);
-			if (result == null)
-				result = caseType(tool);
-			if (result == null)
-				result = caseNamedElement(tool);
-			if (result == null)
-				result = caseElement(tool);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.ROLE_SET_GROUPING: {
-			RoleSetGrouping roleSetGrouping = (RoleSetGrouping) theEObject;
-			Object result = caseRoleSetGrouping(roleSetGrouping);
-			if (result == null)
-				result = caseContentCategory(roleSetGrouping);
-			if (result == null)
-				result = caseContentElement(roleSetGrouping);
-			if (result == null)
-				result = caseDescribableElement(roleSetGrouping);
-			if (result == null)
-				result = caseVariabilityElement(roleSetGrouping);
-			if (result == null)
-				result = caseMethodElement(roleSetGrouping);
-			if (result == null)
-				result = caseClassifier(roleSetGrouping);
-			if (result == null)
-				result = casePackageableElement(roleSetGrouping);
-			if (result == null)
-				result = caseType(roleSetGrouping);
-			if (result == null)
-				result = caseNamedElement(roleSetGrouping);
-			if (result == null)
-				result = caseElement(roleSetGrouping);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.CUSTOM_CATEGORY: {
-			CustomCategory customCategory = (CustomCategory) theEObject;
-			Object result = caseCustomCategory(customCategory);
-			if (result == null)
-				result = caseContentCategory(customCategory);
-			if (result == null)
-				result = caseContentElement(customCategory);
-			if (result == null)
-				result = caseDescribableElement(customCategory);
-			if (result == null)
-				result = caseVariabilityElement(customCategory);
-			if (result == null)
-				result = caseMethodElement(customCategory);
-			if (result == null)
-				result = caseClassifier(customCategory);
-			if (result == null)
-				result = casePackageableElement(customCategory);
-			if (result == null)
-				result = caseType(customCategory);
-			if (result == null)
-				result = caseNamedElement(customCategory);
-			if (result == null)
-				result = caseElement(customCategory);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.DELIVERY_PROCESS: {
-			DeliveryProcess deliveryProcess = (DeliveryProcess) theEObject;
-			Object result = caseDeliveryProcess(deliveryProcess);
-			if (result == null)
-				result = caseProcess(deliveryProcess);
-			if (result == null)
-				result = caseActivity(deliveryProcess);
-			if (result == null)
-				result = caseWorkBreakdownElement(deliveryProcess);
-			if (result == null)
-				result = caseVariabilityElement(deliveryProcess);
-			if (result == null)
-				result = caseWorkDefinition(deliveryProcess);
-			if (result == null)
-				result = caseBreakdownElement(deliveryProcess);
-			if (result == null)
-				result = caseMethodElement(deliveryProcess);
-			if (result == null)
-				result = caseProcessElement(deliveryProcess);
-			if (result == null)
-				result = casePackageableElement(deliveryProcess);
-			if (result == null)
-				result = caseDescribableElement(deliveryProcess);
-			if (result == null)
-				result = caseNamedElement(deliveryProcess);
-			if (result == null)
-				result = caseClassifier(deliveryProcess);
-			if (result == null)
-				result = caseElement(deliveryProcess);
-			if (result == null)
-				result = caseType(deliveryProcess);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PROCESS: {
-			org.eclipse.epf.uma.Process process = (org.eclipse.epf.uma.Process) theEObject;
-			Object result = caseProcess(process);
-			if (result == null)
-				result = caseActivity(process);
-			if (result == null)
-				result = caseWorkBreakdownElement(process);
-			if (result == null)
-				result = caseVariabilityElement(process);
-			if (result == null)
-				result = caseWorkDefinition(process);
-			if (result == null)
-				result = caseBreakdownElement(process);
-			if (result == null)
-				result = caseMethodElement(process);
-			if (result == null)
-				result = caseProcessElement(process);
-			if (result == null)
-				result = casePackageableElement(process);
-			if (result == null)
-				result = caseDescribableElement(process);
-			if (result == null)
-				result = caseNamedElement(process);
-			if (result == null)
-				result = caseClassifier(process);
-			if (result == null)
-				result = caseElement(process);
-			if (result == null)
-				result = caseType(process);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.CAPABILITY_PATTERN: {
-			CapabilityPattern capabilityPattern = (CapabilityPattern) theEObject;
-			Object result = caseCapabilityPattern(capabilityPattern);
-			if (result == null)
-				result = caseProcess(capabilityPattern);
-			if (result == null)
-				result = caseActivity(capabilityPattern);
-			if (result == null)
-				result = caseWorkBreakdownElement(capabilityPattern);
-			if (result == null)
-				result = caseVariabilityElement(capabilityPattern);
-			if (result == null)
-				result = caseWorkDefinition(capabilityPattern);
-			if (result == null)
-				result = caseBreakdownElement(capabilityPattern);
-			if (result == null)
-				result = caseMethodElement(capabilityPattern);
-			if (result == null)
-				result = caseProcessElement(capabilityPattern);
-			if (result == null)
-				result = casePackageableElement(capabilityPattern);
-			if (result == null)
-				result = caseDescribableElement(capabilityPattern);
-			if (result == null)
-				result = caseNamedElement(capabilityPattern);
-			if (result == null)
-				result = caseClassifier(capabilityPattern);
-			if (result == null)
-				result = caseElement(capabilityPattern);
-			if (result == null)
-				result = caseType(capabilityPattern);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PROCESS_PLANNING_TEMPLATE: {
-			ProcessPlanningTemplate processPlanningTemplate = (ProcessPlanningTemplate) theEObject;
-			Object result = caseProcessPlanningTemplate(processPlanningTemplate);
-			if (result == null)
-				result = caseProcess(processPlanningTemplate);
-			if (result == null)
-				result = caseActivity(processPlanningTemplate);
-			if (result == null)
-				result = caseWorkBreakdownElement(processPlanningTemplate);
-			if (result == null)
-				result = caseVariabilityElement(processPlanningTemplate);
-			if (result == null)
-				result = caseWorkDefinition(processPlanningTemplate);
-			if (result == null)
-				result = caseBreakdownElement(processPlanningTemplate);
-			if (result == null)
-				result = caseMethodElement(processPlanningTemplate);
-			if (result == null)
-				result = caseProcessElement(processPlanningTemplate);
-			if (result == null)
-				result = casePackageableElement(processPlanningTemplate);
-			if (result == null)
-				result = caseDescribableElement(processPlanningTemplate);
-			if (result == null)
-				result = caseNamedElement(processPlanningTemplate);
-			if (result == null)
-				result = caseClassifier(processPlanningTemplate);
-			if (result == null)
-				result = caseElement(processPlanningTemplate);
-			if (result == null)
-				result = caseType(processPlanningTemplate);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.ROADMAP: {
-			Roadmap roadmap = (Roadmap) theEObject;
-			Object result = caseRoadmap(roadmap);
-			if (result == null)
-				result = caseGuidance(roadmap);
-			if (result == null)
-				result = caseContentElement(roadmap);
-			if (result == null)
-				result = caseDescribableElement(roadmap);
-			if (result == null)
-				result = caseVariabilityElement(roadmap);
-			if (result == null)
-				result = caseMethodElement(roadmap);
-			if (result == null)
-				result = caseClassifier(roadmap);
-			if (result == null)
-				result = casePackageableElement(roadmap);
-			if (result == null)
-				result = caseType(roadmap);
-			if (result == null)
-				result = caseNamedElement(roadmap);
-			if (result == null)
-				result = caseElement(roadmap);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PROCESS_COMPONENT: {
-			ProcessComponent processComponent = (ProcessComponent) theEObject;
-			Object result = caseProcessComponent(processComponent);
-			if (result == null)
-				result = caseProcessPackage(processComponent);
-			if (result == null)
-				result = caseMethodUnit(processComponent);
-			if (result == null)
-				result = caseMethodPackage(processComponent);
-			if (result == null)
-				result = caseMethodElement(processComponent);
-			if (result == null)
-				result = casePackage(processComponent);
-			if (result == null)
-				result = casePackageableElement(processComponent);
-			if (result == null)
-				result = caseNamespace(processComponent);
-			if (result == null)
-				result = caseNamedElement(processComponent);
-			if (result == null)
-				result = caseElement(processComponent);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PROCESS_PACKAGE: {
-			ProcessPackage processPackage = (ProcessPackage) theEObject;
-			Object result = caseProcessPackage(processPackage);
-			if (result == null)
-				result = caseMethodPackage(processPackage);
-			if (result == null)
-				result = caseMethodElement(processPackage);
-			if (result == null)
-				result = casePackage(processPackage);
-			if (result == null)
-				result = casePackageableElement(processPackage);
-			if (result == null)
-				result = caseNamespace(processPackage);
-			if (result == null)
-				result = caseNamedElement(processPackage);
-			if (result == null)
-				result = caseElement(processPackage);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PROCESS_COMPONENT_INTERFACE: {
-			ProcessComponentInterface processComponentInterface = (ProcessComponentInterface) theEObject;
-			Object result = caseProcessComponentInterface(processComponentInterface);
-			if (result == null)
-				result = caseBreakdownElement(processComponentInterface);
-			if (result == null)
-				result = caseProcessElement(processComponentInterface);
-			if (result == null)
-				result = caseDescribableElement(processComponentInterface);
-			if (result == null)
-				result = caseMethodElement(processComponentInterface);
-			if (result == null)
-				result = caseClassifier(processComponentInterface);
-			if (result == null)
-				result = casePackageableElement(processComponentInterface);
-			if (result == null)
-				result = caseType(processComponentInterface);
-			if (result == null)
-				result = caseNamedElement(processComponentInterface);
-			if (result == null)
-				result = caseElement(processComponentInterface);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PROCESS_COMPONENT_DESCRIPTOR: {
-			ProcessComponentDescriptor processComponentDescriptor = (ProcessComponentDescriptor) theEObject;
-			Object result = caseProcessComponentDescriptor(processComponentDescriptor);
-			if (result == null)
-				result = caseDescriptor(processComponentDescriptor);
-			if (result == null)
-				result = caseBreakdownElement(processComponentDescriptor);
-			if (result == null)
-				result = caseProcessElement(processComponentDescriptor);
-			if (result == null)
-				result = caseDescribableElement(processComponentDescriptor);
-			if (result == null)
-				result = caseMethodElement(processComponentDescriptor);
-			if (result == null)
-				result = caseClassifier(processComponentDescriptor);
-			if (result == null)
-				result = casePackageableElement(processComponentDescriptor);
-			if (result == null)
-				result = caseType(processComponentDescriptor);
-			if (result == null)
-				result = caseNamedElement(processComponentDescriptor);
-			if (result == null)
-				result = caseElement(processComponentDescriptor);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.METHOD_PLUGIN: {
-			MethodPlugin methodPlugin = (MethodPlugin) theEObject;
-			Object result = caseMethodPlugin(methodPlugin);
-			if (result == null)
-				result = caseMethodUnit(methodPlugin);
-			if (result == null)
-				result = casePackage(methodPlugin);
-			if (result == null)
-				result = caseMethodElement(methodPlugin);
-			if (result == null)
-				result = caseNamespace(methodPlugin);
-			if (result == null)
-				result = casePackageableElement(methodPlugin);
-			if (result == null)
-				result = caseNamedElement(methodPlugin);
-			if (result == null)
-				result = caseElement(methodPlugin);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.VARIABILITY_ELEMENT: {
-			VariabilityElement variabilityElement = (VariabilityElement) theEObject;
-			Object result = caseVariabilityElement(variabilityElement);
-			if (result == null)
-				result = caseMethodElement(variabilityElement);
-			if (result == null)
-				result = casePackageableElement(variabilityElement);
-			if (result == null)
-				result = caseNamedElement(variabilityElement);
-			if (result == null)
-				result = caseElement(variabilityElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.METHOD_UNIT: {
-			MethodUnit methodUnit = (MethodUnit) theEObject;
-			Object result = caseMethodUnit(methodUnit);
-			if (result == null)
-				result = caseMethodElement(methodUnit);
-			if (result == null)
-				result = casePackageableElement(methodUnit);
-			if (result == null)
-				result = caseNamedElement(methodUnit);
-			if (result == null)
-				result = caseElement(methodUnit);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.METHOD_CONFIGURATION: {
-			MethodConfiguration methodConfiguration = (MethodConfiguration) theEObject;
-			Object result = caseMethodConfiguration(methodConfiguration);
-			if (result == null)
-				result = caseMethodUnit(methodConfiguration);
-			if (result == null)
-				result = caseMethodElement(methodConfiguration);
-			if (result == null)
-				result = casePackageableElement(methodConfiguration);
-			if (result == null)
-				result = caseNamedElement(methodConfiguration);
-			if (result == null)
-				result = caseElement(methodConfiguration);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.PROCESS_FAMILY: {
-			ProcessFamily processFamily = (ProcessFamily) theEObject;
-			Object result = caseProcessFamily(processFamily);
-			if (result == null)
-				result = caseMethodConfiguration(processFamily);
-			if (result == null)
-				result = caseMethodUnit(processFamily);
-			if (result == null)
-				result = caseMethodElement(processFamily);
-			if (result == null)
-				result = casePackageableElement(processFamily);
-			if (result == null)
-				result = caseNamedElement(processFamily);
-			if (result == null)
-				result = caseElement(processFamily);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case UmaPackage.METHOD_LIBRARY: {
-			MethodLibrary methodLibrary = (MethodLibrary) theEObject;
-			Object result = caseMethodLibrary(methodLibrary);
-			if (result == null)
-				result = caseMethodUnit(methodLibrary);
-			if (result == null)
-				result = casePackage(methodLibrary);
-			if (result == null)
-				result = caseMethodElement(methodLibrary);
-			if (result == null)
-				result = caseNamespace(methodLibrary);
-			if (result == null)
-				result = casePackageableElement(methodLibrary);
-			if (result == null)
-				result = caseNamedElement(methodLibrary);
-			if (result == null)
-				result = caseElement(methodLibrary);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Classifier</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Classifier</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseClassifier(Classifier object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseType(Type object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseElement(Element object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Named Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Named Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseNamedElement(NamedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Packageable Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Packageable Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePackageableElement(PackageableElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Package</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePackage(org.eclipse.epf.uma.Package object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Namespace</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Namespace</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseNamespace(Namespace object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodElement(MethodElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseConstraint(Constraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Element Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Element Property</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodElementProperty(MethodElementProperty object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Content Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Content Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseContentElement(ContentElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Describable Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Describable Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescribableElement(DescribableElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Content Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Content Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseContentDescription(ContentDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Section</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Section</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSection(Section object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRole(Role object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Product</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Product</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkProduct(WorkProduct object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Task</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Task</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTask(Task object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Definition</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkDefinition(WorkDefinition object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Step</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Step</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseStep(Step object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Guidance</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Guidance</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseGuidance(Guidance object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Artifact</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Artifact</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseArtifact(Artifact object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Deliverable</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Deliverable</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDeliverable(Deliverable object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Outcome</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Outcome</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseOutcome(Outcome object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Package</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodPackage(MethodPackage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Content Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Content Package</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseContentPackage(ContentPackage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Artifact Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Artifact Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseArtifactDescription(ArtifactDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Product Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Product Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkProductDescription(WorkProductDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Deliverable Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Deliverable Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDeliverableDescription(DeliverableDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoleDescription(RoleDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Task Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Task Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTaskDescription(TaskDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Guidance Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Guidance Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseGuidanceDescription(GuidanceDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Practice Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Practice Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePracticeDescription(PracticeDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Point</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Point</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePoint(Point object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Graph Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Graph Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseGraphElement(GraphElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Diagram Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Diagram Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDiagramElement(DiagramElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Diagram Link</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Diagram Link</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDiagramLink(DiagramLink object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Graph Connector</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Graph Connector</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseGraphConnector(GraphConnector object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Semantic Model Bridge</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Semantic Model Bridge</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSemanticModelBridge(SemanticModelBridge object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Dimension</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Dimension</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDimension(Dimension object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Reference</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseReference(Reference object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Property</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProperty(Property object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Graph Edge</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Graph Edge</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseGraphEdge(GraphEdge object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Diagram</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Diagram</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDiagram(Diagram object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Graph Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Graph Node</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseGraphNode(GraphNode object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Simple Semantic Model Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Simple Semantic Model Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSimpleSemanticModelElement(
-			SimpleSemanticModelElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>UMA Semantic Model Bridge</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>UMA Semantic Model Bridge</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseUMASemanticModelBridge(UMASemanticModelBridge object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Core Semantic Model Bridge</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Core Semantic Model Bridge</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCoreSemanticModelBridge(CoreSemanticModelBridge object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Leaf Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Leaf Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseLeafElement(LeafElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Text Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Text Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTextElement(TextElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Image</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Image</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseImage(Image object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Graphic Primitive</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Graphic Primitive</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseGraphicPrimitive(GraphicPrimitive object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Polyline</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Polyline</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePolyline(Polyline object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Ellipse</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Ellipse</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEllipse(Ellipse object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Activity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Activity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseActivity(Activity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Breakdown Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Breakdown Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkBreakdownElement(WorkBreakdownElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Breakdown Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Breakdown Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseBreakdownElement(BreakdownElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Milestone</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Milestone</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMilestone(Milestone object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Iteration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Iteration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIteration(Iteration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Phase</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Phase</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePhase(Phase object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Team Profile</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Team Profile</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTeamProfile(TeamProfile object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoleDescriptor(RoleDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Order</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Order</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkOrder(WorkOrder object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcessElement(ProcessElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Planning Data</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Planning Data</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePlanningData(PlanningData object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptor(Descriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Task Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Task Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTaskDescriptor(TaskDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Product Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Product Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkProductDescriptor(WorkProductDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Composite Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Composite Role</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompositeRole(CompositeRole object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Breakdown Element Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Breakdown Element Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseBreakdownElementDescription(
-			BreakdownElementDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Activity Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Activity Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseActivityDescription(ActivityDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Delivery Process Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Delivery Process Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDeliveryProcessDescription(
-			DeliveryProcessDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcessDescription(ProcessDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Descriptor Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Descriptor Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptorDescription(DescriptorDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Concept</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Concept</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseConcept(Concept object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Checklist</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Checklist</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseChecklist(Checklist object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Example</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Example</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExample(Example object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Guideline</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Guideline</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseGuideline(Guideline object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Estimation Considerations</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Estimation Considerations</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEstimationConsiderations(EstimationConsiderations object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Report</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Report</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseReport(Report object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Template</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Template</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTemplate(Template object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Supporting Material</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Supporting Material</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSupportingMaterial(SupportingMaterial object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Tool Mentor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Tool Mentor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseToolMentor(ToolMentor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Whitepaper</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Whitepaper</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWhitepaper(Whitepaper object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Term Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Term Definition</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTermDefinition(TermDefinition object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Practice</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Practice</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePractice(Practice object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Reusable Asset</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Reusable Asset</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseReusableAsset(ReusableAsset object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>State</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>State</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseState(State object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Vertex</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Vertex</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseVertex(Vertex object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Region</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Region</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRegion(Region object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>State Machine</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>State Machine</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseStateMachine(StateMachine object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Transition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Transition</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTransition(Transition object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Pseudo State</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Pseudo State</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePseudoState(PseudoState object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Discipline</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Discipline</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDiscipline(Discipline object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Content Category</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Content Category</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseContentCategory(ContentCategory object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role Set</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoleSet(RoleSet object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Domain</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Domain</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDomain(Domain object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Product Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Product Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkProductType(WorkProductType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Discipline Grouping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Discipline Grouping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDisciplineGrouping(DisciplineGrouping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Tool</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Tool</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTool(Tool object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role Set Grouping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role Set Grouping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoleSetGrouping(RoleSetGrouping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Custom Category</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Custom Category</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCustomCategory(CustomCategory object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Delivery Process</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Delivery Process</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDeliveryProcess(DeliveryProcess object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcess(org.eclipse.epf.uma.Process object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Capability Pattern</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Capability Pattern</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCapabilityPattern(CapabilityPattern object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process Planning Template</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process Planning Template</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcessPlanningTemplate(ProcessPlanningTemplate object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Roadmap</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Roadmap</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoadmap(Roadmap object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process Component</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process Component</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcessComponent(ProcessComponent object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process Package</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcessPackage(ProcessPackage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process Component Interface</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process Component Interface</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcessComponentInterface(ProcessComponentInterface object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process Component Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process Component Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcessComponentDescriptor(
-			ProcessComponentDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Plugin</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Plugin</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodPlugin(MethodPlugin object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Variability Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Variability Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseVariabilityElement(VariabilityElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Unit</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Unit</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodUnit(MethodUnit object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodConfiguration(MethodConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process Family</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process Family</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcessFamily(ProcessFamily object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Library</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Library</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodLibrary(MethodLibrary object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //UmaSwitch
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/UmaUtil.java b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/UmaUtil.java
deleted file mode 100755
index 2745cf1..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/UmaUtil.java
+++ /dev/null
@@ -1,745 +0,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
-//------------------------------------------------------------------------------
-package org.eclipse.epf.uma.util;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EContentsEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.ContentElement;
-import org.eclipse.epf.uma.ContentPackage;
-import org.eclipse.epf.uma.Diagram;
-import org.eclipse.epf.uma.Discipline;
-import org.eclipse.epf.uma.DisciplineGrouping;
-import org.eclipse.epf.uma.Domain;
-import org.eclipse.epf.uma.Guidance;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodLibrary;
-import org.eclipse.epf.uma.MethodPackage;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.MethodUnit;
-import org.eclipse.epf.uma.ProcessComponent;
-import org.eclipse.epf.uma.ProcessElement;
-import org.eclipse.epf.uma.ProcessPackage;
-import org.eclipse.epf.uma.Role;
-import org.eclipse.epf.uma.RoleSet;
-import org.eclipse.epf.uma.RoleSetGrouping;
-import org.eclipse.epf.uma.Task;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.epf.uma.WorkBreakdownElement;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.epf.uma.WorkOrderType;
-import org.eclipse.epf.uma.WorkProduct;
-import org.eclipse.epf.uma.WorkProductType;
-
-/**
- * Utility class for accessing and updating the UMA model objects.
- * 
- * @author Phong Nguyen Le
- * @author Kelvin Low
- * @since 1.0
- */
-public class UmaUtil {
-
-	/**
-	 * Replaces the feature values of an old method element with the
-	 * corresponding feature values of a new method element.
-	 * <p>
-	 * Note: All features are updated except for the GUID feature.
-	 * 
-	 * @param oldElement
-	 *            the old method element
-	 * @param newElement
-	 *            the new method element
-	 */
-	public static void replace(MethodElement oldElement,
-			MethodElement newElement) {
-		List features = oldElement.eClass().getEAllStructuralFeatures();
-		if (features != null) {
-			int size = features.size();
-			for (int i = 0; i < size; i++) {
-				EStructuralFeature feature = (EStructuralFeature) features
-						.get(i);
-				if (feature != UmaPackage.eINSTANCE.getMethodElement_Guid()) {
-					// don't replace GUID
-					Object newValue = newElement.eGet(feature);
-					oldElement.eSet(feature, newValue);
-				}
-			}
-		}
-
-	}
-
-	/**
-	 * Checks whether a model object has a direct resource.
-	 * 
-	 * @param e
-	 *            a model object
-	 * @return <code>true</code> if the specified model object is contained by
-	 *         a resource
-	 */
-	public static boolean hasDirectResource(EObject e) {
-		Resource resource = e.eResource();
-		return (resource != null && resource.getContents().contains(e));
-	}
-	
-	/**
-	 * Gets all resources owned by the specified object.
-	 * 
-	 * @param e
-	 * @return
-	 */
-	public static Collection<Resource> getResources(EObject e) {
-		HashSet<Resource> resources = new HashSet<Resource>();
-		getResources(e, resources);
-		return resources;
-	}
-	
-	public static void getResources(EObject e, Collection<Resource> resources) {
-		if (UmaUtil.hasDirectResource(e)) {
-			resources.add(e.eResource());
-		} else {
-			for (Iterator iter = e.eContents().iterator(); iter.hasNext();) {
-				getResources((EObject) iter.next(), resources);
-			}
-		}
-	}
-
-	/**
-	 * Gets a specific type of adapter associated with a notifier.
-	 * 
-	 * @param eObj
-	 *            a notifier
-	 * @param cls
-	 *            the adapter class
-	 * @return an <code>Adapter<code> object or <code>null</code>
-	 */
-	public static Object getAdapter(EObject eObj, Class cls) {
-		for (Iterator adapters = eObj.eAdapters().iterator(); adapters
-				.hasNext();) {
-			Adapter adapter = (Adapter) adapters.next();
-			if (cls.isInstance(adapter)) {
-				return adapter;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the method package with a specific name.
-	 * 
-	 * @param methodPackages
-	 *            a list of method packages
-	 * @param name
-	 *            a method package name
-	 * @return a method package with the matching name or <code>null</code>
-	 */
-	public static MethodPackage findMethodPackage(List methodPackages,
-			String name) {
-		for (int i = methodPackages.size() - 1; i > -1; i--) {
-			Object obj = methodPackages.get(i);
-			if (obj instanceof MethodPackage) {
-				MethodPackage pkg = (MethodPackage) obj;
-				if (name.equals(pkg.getName())) {
-					return pkg;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the method package with a specific path.
-	 * 
-	 * @param methodPlugin
-	 *            a method plug-in
-	 * @param path
-	 *            an array of method element path fragments
-	 * @return a method package with the matching path or <code>null</code>
-	 */
-	public static MethodPackage findMethodPackage(MethodPlugin methodPlugin,
-			String[] path) {
-		MethodPackage pkg = null;
-		List list = methodPlugin.getMethodPackages();
-		for (int i = 0; i < path.length; i++) {
-			pkg = findMethodPackage(list, path[i]);
-			if (pkg == null) {
-				return null;
-			}
-			list = pkg.getChildPackages();
-		}
-		return pkg;
-	}
-
-	/**
-	 * Gets the parent activity of a breakdown element.
-	 * 
-	 * @param e
-	 *            a breakdown element
-	 * @return the parent activity or <code>null</code>
-	 */
-	public static Activity getParentActivity(BreakdownElement e) {
-		return e.getSuperActivities();
-	}
-
-	/**
-	 * Gets the parent activity of a work order.
-	 * 
-	 * @param workOrder
-	 *            a work order
-	 * @return the parent activity or <code>null</code>
-	 */
-	public static Activity getOwningActivity(WorkOrder workOrder) {
-		ProcessPackage pkg = (ProcessPackage) workOrder.eContainer();
-		for (Iterator iter = pkg.getProcessElements().iterator(); iter
-				.hasNext();) {
-			Object element = iter.next();
-			if (element instanceof Activity) {
-				return (Activity) element;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the content package with a specific name.
-	 * 
-	 * @param methodPackages
-	 *            a list of method packages
-	 * @param name
-	 *            a content package name
-	 * @return a content package with the mathcing name or <code>null</code>
-	 */
-	public static ContentPackage findContentPackage(List methodPackages,
-			String name) {
-		for (int i = methodPackages.size() - 1; i > -1; i--) {
-			Object obj = methodPackages.get(i);
-			if (obj instanceof ContentPackage) {
-				ContentPackage pkg = (ContentPackage) obj;
-				if (name.equals(pkg.getName())) {
-					return pkg;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the content package with a specific path.
-	 * 
-	 * @param methodPlugin
-	 *            a method plug-in
-	 * @param path
-	 *            an array of method element path fragments
-	 * @return a content package with the matching path or <code>null</code>
-	 */
-	public static ContentPackage findContentPackage(MethodPlugin methodPlugin,
-			String[] path) {
-		ContentPackage pkg = null;
-		List list = methodPlugin.getMethodPackages();
-		for (int i = 0; i < path.length; i++) {
-			pkg = findContentPackage(list, path[i]);
-			if (pkg == null) {
-				return null;
-			}
-			list = pkg.getChildPackages();
-		}
-		return pkg;
-	}
-
-	/**
-	 * Gets the parent method plug-in of a method element.
-	 * 
-	 * @param element
-	 *            a Method element
-	 * @return the parent method plug-in or <code>null</code>
-	 */
-	public static MethodPlugin getMethodPlugin(EObject element) {
-		for (EObject obj = element; obj != null; obj = obj.eContainer()) {
-			if (obj instanceof MethodPlugin) {
-				return (MethodPlugin) obj;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the parent method library of a method element.
-	 * 
-	 * @param element
-	 *            a method element
-	 * @return the parent method library or <code>null</code>
-	 */
-	public static MethodLibrary getMethodLibrary(EObject element) {
-		for (EObject obj = element; obj != null; obj = obj.eContainer()) {
-			if (obj instanceof MethodLibrary) {
-				return (MethodLibrary) obj;
-			}
-		}
-		return null;
-	}
-	
-	public static EObject getTopContainer(EObject element) {
-		EObject container = null;
-		for (EObject obj = element.eContainer(); obj != null; obj = obj.eContainer()) {
-			container = obj;
-		}
-		return container;		
-	}
-
-	/**
-	 * Gets the parent content package of a content element.
-	 * 
-	 * @param element
-	 *            a content element
-	 * @return the parent content package or <code>null</code>
-	 */
-	public static ContentPackage getContentPackage(EObject element) {
-		for (EObject obj = element; obj != null; obj = obj.eContainer()) {
-			if (obj instanceof ContentPackage) {
-				return (ContentPackage) obj;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the parent process package of a process element.
-	 * 
-	 * @param element
-	 *            a Process element
-	 * @return the parent process package or <code>null</code>
-	 */
-	public static ProcessPackage getProcessPackage(EObject element) {
-		for (EObject obj = element; obj != null; obj = obj.eContainer()) {
-			if (obj instanceof ProcessPackage) {
-				return (ProcessPackage) obj;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the parent diagram of a diagram element.
-	 * 
-	 * @param element
-	 *            a diagram element
-	 * @return the parent diagram or <code>null</code>
-	 */
-	public static Diagram getDiagram(EObject element) {
-		for (EObject obj = element; obj != null; obj = obj.eContainer()) {
-			if (obj instanceof Diagram) {
-				return (Diagram) obj;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Checks whether a method element is contained by a specific content
-	 * package.
-	 * 
-	 * @param element
-	 *            a method element
-	 * @param contentPackage
-	 *            a content package
-	 * @return <code>true</code> if the method element is contained by the
-	 *         content package
-	 */
-	public static boolean isContainedByContentPackage(EObject element,
-			ContentPackage contentPackage) {
-		return isContainedBy(element, contentPackage);
-	}
-
-	/**
-	 * Checks whether a model object is contained by a specific container.
-	 * 
-	 * @param eObj
-	 *            a model object
-	 * @param container
-	 *            a container
-	 * @return <code>true</code> if the model object is contained by the
-	 *         container
-	 */
-	public static boolean isContainedBy(EObject eObj, Object container) {
-		if (eObj == null) {
-			return false;
-		}
-		for (EObject obj = eObj.eContainer(); obj != null; obj = obj
-				.eContainer()) {
-			if (obj == container) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Generates and returns a unique ID.
-	 * 
-	 * @return a unique ID
-	 */
-	public static String generateGUID() {
-		return EcoreUtil.generateUUID();
-	}
-
-	/**
-	 * Creates and returns the content description name of a given method
-	 * element.
-	 * 
-	 * @param element
-	 *            a method element
-	 * @return a suitable content description name
-	 */
-	public static String createContentDescriptionName(MethodElement e) {
-		return e.getName() + ',' + e.getGuid();
-	}
-
-	public static void getAllSupers(List supers, VariabilityElement e,
-			VariabilityType type) {
-		VariabilityElement base = e.getVariabilityBasedOnElement();
-		if (base != null && e.getVariabilityType() == type
-				&& !supers.contains(base)) {
-			supers.add(base);
-			getAllSupers(supers, base, type);
-		}
-	}
-
-	public static void getAllSupersBoth(List supers, VariabilityElement e,
-			VariabilityType type1, VariabilityType type2) {
-		VariabilityElement base = e.getVariabilityBasedOnElement();
-		if (base != null
-				&& (e.getVariabilityType() == type1 || e.getVariabilityType() == type2)
-				&& !supers.contains(base)) {
-			supers.add(base);
-			getAllSupersBoth(supers, base, type1, type2);
-		}
-	}
-
-	/**
-	 * Gets the class of a content element.
-	 * 
-	 * @param contentElement
-	 *            a content element
-	 * @return the content element class
-	 */
-	public static Class getClassOfContentElement(ContentElement contentElement) {
-		if (contentElement instanceof Role)
-			return Role.class;
-		if (contentElement instanceof Task)
-			return Task.class;
-		if (contentElement instanceof WorkProduct)
-			return WorkProduct.class;
-		if (contentElement instanceof Guidance)
-			return Guidance.class;
-		if (contentElement instanceof Domain)
-			return Domain.class;
-		if (contentElement instanceof Discipline)
-			return Discipline.class;
-		if (contentElement instanceof DisciplineGrouping)
-			return DisciplineGrouping.class;
-		if (contentElement instanceof RoleSet)
-			return RoleSet.class;
-		if (contentElement instanceof RoleSetGrouping)
-			return RoleSetGrouping.class;
-		if (contentElement instanceof WorkProductType)
-			return WorkProductType.class;
-		return Object.class;
-	}
-
-	/**
-	 * Creates a default work order for two work breakdown elements.
-	 * 
-	 * @param e
-	 *            a work breakdown element
-	 * @param predecessor
-	 *            the predecessor work breakdown element
-	 * @return the newly created work order
-	 */
-	public static WorkOrder createDefaultWorkOrder(WorkBreakdownElement succ,
-			WorkBreakdownElement pred) {
-		return createDefaultWorkOrder(succ, pred, true);
-	}
-	
-	public static WorkOrder createDefaultWorkOrder(WorkBreakdownElement succ,
-			WorkBreakdownElement pred, boolean link) {
-		WorkOrder wo = UmaFactory.eINSTANCE.createWorkOrder();
-		wo.setPred(pred);
-		wo.setLinkType(WorkOrderType.FINISH_TO_FINISH_LITERAL);
-		if(link) {
-			succ.getLinkToPredecessor().add(wo);
-		}
-		return wo;
-	}	
-
-	/**
-	 * Locates the work order associated with two work breakdown elements.
-	 * 
-	 * @param e
-	 *            a work breakdown element
-	 * @param predecessor
-	 *            the predecessor work breakdown element
-	 * @return a work order or <code>null</code>
-	 */
-	public static WorkOrder findWorkOrder(WorkBreakdownElement e,
-			Object predecessor) {
-		for (Iterator iter = e.getLinkToPredecessor().iterator(); iter
-				.hasNext();) {
-			WorkOrder workOrder = (WorkOrder) iter.next();
-			if (workOrder.getPred() == predecessor)
-				return workOrder;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Removes the work order associated with two work breakdown elements.
-	 * 
-	 * @param e
-	 *            a work breakdown element
-	 * @param predecessor
-	 *            the predecessor work breakdown element
-	 * @return the removed work order or <code>null</code>
-	 */
-	public static WorkOrder removeWorkOrder(WorkBreakdownElement e,
-			Object predecessor) {
-		for (Iterator iterator = e.getLinkToPredecessor().iterator(); iterator
-				.hasNext();) {
-			WorkOrder order = (WorkOrder) iterator.next();
-			if (order.getPred() == predecessor) {
-				iterator.remove();
-				return order;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the parent process component of a method element.
-	 * 
-	 * @param e
-	 *            a method element, typically a process element
-	 * @return the parent process component or <code>null</code>
-	 */
-	public static ProcessComponent getProcessComponent(MethodElement e) {
-		EObject container;
-		for (container = e; container != null
-				&& !(container instanceof ProcessComponent); container = container
-				.eContainer())
-			;
-		if (container != null) {
-			return ((ProcessComponent) container);
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the parent method unit of a method element.
-	 * 
-	 * @param e
-	 *            a method element
-	 * @return the parent method unit or <code>null</code>
-	 */
-	public static MethodUnit getMethodUnit(MethodElement e) {
-		EObject container;
-		for (container = e; container != null
-				&& !(container instanceof MethodUnit); container = container
-				.eContainer())
-			;
-		if (container != null) {
-			return ((MethodUnit) container);
-		}
-		return null;
-
-	}
-
-	/**
-	 * Checks whether a method plug-in has method elements that reference
-	 * elements in a base plug-in.
-	 * <p>
-	 * Note: This is a expensive call to make for a large method plug-in.
-	 * 
-	 * @param plugin
-	 *            a method plug-in
-	 * @param base
-	 *            a base method plug-in
-	 * @return <code>true</code> if the specified method plug-in contain
-	 *         method elements that reference elements in a base plug-in.
-	 */
-	public static boolean hasReference(MethodPlugin plugin, MethodPlugin base) {
-		for (EContentsEList.FeatureIterator featureIterator = (EContentsEList.FeatureIterator) plugin
-				.eCrossReferences().iterator(); featureIterator.hasNext();) {
-			EObject ref = (EObject) featureIterator.next();
-			EStructuralFeature f = featureIterator.feature();
-
-			if (f != UmaPackage.eINSTANCE.getMethodPlugin_Bases()
-					&& UmaUtil.getMethodPlugin(ref) == base) {
-				return true;
-			}
-		}
-
-		for (Iterator iter = plugin.eAllContents(); iter.hasNext();) {
-			EObject element = (EObject) iter.next();
-
-			// ignore ProcessElement b/c it can references anything
-			//
-			if (element instanceof ProcessElement) {
-				continue;
-			}
-
-			for (Iterator iterator = element.eCrossReferences().iterator(); iterator
-					.hasNext();) {
-				EObject ref = (EObject) iterator.next();
-				if (getMethodPlugin(ref) == base) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Removes all element references in a method plug-in that point to elements
-	 * in a base plug-in.
-	 * <p>
-	 * Note: This is a expensive call to make for a large method plug-in.
-	 * 
-	 * @param plugin
-	 *            a method plug-in
-	 * @param base
-	 *            the base method plug-in
-	 * @return <code>true</code> if the operation is successful
-	 */
-	public static boolean removeReferences(MethodPlugin plugin,
-			MethodPlugin base) {
-		for (Iterator iter = plugin.eAllContents(); iter.hasNext();) {
-			EObject element = (EObject) iter.next();
-
-			// ignore ProcessElement b/c it can references anything
-			//
-			if (element instanceof ProcessElement) {
-				continue;
-			}
-
-			for (EContentsEList.FeatureIterator featureIterator = (EContentsEList.FeatureIterator) element
-					.eCrossReferences().iterator(); featureIterator.hasNext();) {
-				EObject ref = (EObject) featureIterator.next();
-
-				if (getMethodPlugin(ref) == base) {
-					EStructuralFeature f = featureIterator.feature();
-					if (f.isMany()) {
-						((Collection) element.eGet(f)).remove(ref);
-					} else {
-						element.eSet(f, null);
-					}
-				}
-			}
-		}
-
-		return false;
-	}
-
-	public static String getMessage(IStatus status) {
-		String msg = status.getMessage();
-		if (status.isMultiStatus()) {
-			StringBuffer strBuf = new StringBuffer(msg);
-			IStatus statuses[] = status.getChildren();
-			for (int i = 0; i < statuses.length; i++) {
-				strBuf.append('\n').append(statuses[i].getMessage());
-			}
-			msg = strBuf.toString();
-		}
-		if (msg != null && msg.trim().length() == 0) {
-			msg = null;
-		}
-		return msg;
-	}
-
-	/**
-	 * Generates a GUID using a base GUID.
-	 * 
-	 * @param baseGUID
-	 *            a base GUID
-	 * @return a unique ID
-	 */
-	public static final String generateGUID(String baseGUID) {
-		return GUID.generate(baseGUID);
-	}
-
-	private static class GUID {
-		private static MessageDigest md5 = null;
-
-		private static MessageDigest getMD5() {
-			if (md5 == null) {
-				synchronized (GUID.class) {
-					if (md5 == null) {
-						try {
-							md5 = MessageDigest.getInstance("MD5"); //$NON-NLS-1$
-						} catch (NoSuchAlgorithmException e) {
-							e.printStackTrace();
-						}
-					}
-				}
-			}
-			return md5;
-		}
-
-		public static final String generate(String baseGUID) {
-			MessageDigest md5 = getMD5();
-			md5.update(baseGUID.getBytes());
-			byte[] hash = md5.digest();
-			char[] buffer = new char[23];
-			buffer[0] = '-';
-
-			// Do a base 64 conversion by turning every 3 bytes into 4 base 64
-			// characters
-			//
-			for (int i = 0; i < 5; ++i) {
-				buffer[4 * i + 1] = BASE64_DIGITS[(hash[i * 3] >> 2) & 0x3F];
-				buffer[4 * i + 2] = BASE64_DIGITS[((hash[i * 3] << 4) & 0x30)
-						| ((hash[i * 3 + 1] >> 4) & 0xF)];
-				buffer[4 * i + 3] = BASE64_DIGITS[((hash[i * 3 + 1] << 2) & 0x3C)
-						| ((hash[i * 3 + 2] >> 6) & 0x3)];
-				buffer[4 * i + 4] = BASE64_DIGITS[hash[i * 3 + 2] & 0x3F];
-			}
-
-			// Handle the last byte at the end.
-			//
-			buffer[21] = BASE64_DIGITS[(hash[15] >> 2) & 0x3F];
-			buffer[22] = BASE64_DIGITS[(hash[15] << 4) & 0x30];
-
-			return new String(buffer);
-		}
-
-		private static final char[] BASE64_DIGITS = { 'A', 'B', 'C', 'D', 'E',
-				'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q',
-				'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c',
-				'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
-				'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0',
-				'1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '_' };
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/package.html b/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/package.html
deleted file mode 100755
index 83776eb..0000000
--- a/plugins/org.eclipse.epf.uma/src/org/eclipse/epf/uma/util/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides implementation support for accessing the UMA model objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/.classpath b/plugins/org.eclipse.epf.xml.uma/.classpath
deleted file mode 100755
index 0b164b9..0000000
--- a/plugins/org.eclipse.epf.xml.uma/.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="runtime"/>
-</classpath>
diff --git a/plugins/org.eclipse.epf.xml.uma/.cvsignore b/plugins/org.eclipse.epf.xml.uma/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/plugins/org.eclipse.epf.xml.uma/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.epf.xml.uma/.project b/plugins/org.eclipse.epf.xml.uma/.project
deleted file mode 100755
index 1c32a9a..0000000
--- a/plugins/org.eclipse.epf.xml.uma/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.epf.xml.uma</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.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.epf.xml.uma/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.epf.xml.uma/.settings/org.eclipse.core.resources.prefs
deleted file mode 100755
index 5d0bde5..0000000
--- a/plugins/org.eclipse.epf.xml.uma/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 24 13:18:25 PDT 2006
-eclipse.preferences.version=1
-encoding//src/model/UMA.xsd=UTF8
diff --git a/plugins/org.eclipse.epf.xml.uma/META-INF/MANIFEST.MF b/plugins/org.eclipse.epf.xml.uma/META-INF/MANIFEST.MF
deleted file mode 100755
index 8291710..0000000
--- a/plugins/org.eclipse.epf.xml.uma/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.xml.uma; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.epf.xml.uma,
- org.eclipse.epf.xml.uma.impl,
- org.eclipse.epf.xml.uma.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.ecore.sdo
-Eclipse-LazyStart: true
-Import-Package: org.eclipse.epf.common.serviceability
diff --git a/plugins/org.eclipse.epf.xml.uma/build.properties b/plugins/org.eclipse.epf.xml.uma/build.properties
deleted file mode 100755
index fb14bf8..0000000
--- a/plugins/org.eclipse.epf.xml.uma/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# <copyright>
-# </copyright>
-#
-# $Id: build.properties,v 1.6 2006/06/24 00:05:17 jxi Exp $
-
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               plugin.properties,\
-               plugin.xml
-
diff --git a/plugins/org.eclipse.epf.xml.uma/plugin.properties b/plugins/org.eclipse.epf.xml.uma/plugin.properties
deleted file mode 100755
index e92b671..0000000
--- a/plugins/org.eclipse.epf.xml.uma/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# <copyright>
-# </copyright>
-#
-# $Id: plugin.properties,v 1.4 2007/03/06 21:04:44 skannoori Exp $
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-# NLS_MESSAGEFORMAT_VAR
-
-pluginName = EPF Xml UMA Model
-providerName=Eclipse.org
-
diff --git a/plugins/org.eclipse.epf.xml.uma/plugin.xml b/plugins/org.eclipse.epf.xml.uma/plugin.xml
deleted file mode 100755
index 9ed3b5b..0000000
--- a/plugins/org.eclipse.epf.xml.uma/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id: plugin.xml,v 1.4 2006/06/23 00:01:27 jxi Exp $
--->
-
-<plugin>
-
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "http://www.eclipse.org/epf/uma/1.0.3" 
-       class = "org.eclipse.epf.xml.uma.UmaPackage" />
-  </extension>
-
-  <extension point="org.eclipse.emf.ecore.extension_parser">
-    <parser 
-       type="uma" 
-       class="org.eclipse.epf.xml.uma.util.UmaResourceFactoryImpl" />
-  </extension>
-
-</plugin>
-
diff --git a/plugins/org.eclipse.epf.xml.uma/src/model/EPF_Schema_200608300736.xsd b/plugins/org.eclipse.epf.xml.uma/src/model/EPF_Schema_200608300736.xsd
deleted file mode 100755
index e7bc451..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/model/EPF_Schema_200608300736.xsd
+++ /dev/null
@@ -1,1398 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- EPF UMA XML Data Interchange Schema -->
-<xsd:schema targetNamespace="http://www.eclipse.org/epf/uma/1.0.3" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:uma="http://www.eclipse.org/epf/uma/1.0.3">
-	<xsd:simpleType name="WorkOrderType">
-		<xsd:annotation>
-			<xsd:documentation>Represents a relationship between two Breakdown Element in which one Breakdown Element depends on the start or finish of another Breakdown Element in order to begin or end. This enumeration defines the different types of Work Order relationships available in UMA and is used to provide values for Work Order's linkType attribute.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NCName">
-			<xsd:enumeration value="finishToStart"/>
-			<xsd:enumeration value="finishToFinish"/>
-			<xsd:enumeration value="startToStart"/>
-			<xsd:enumeration value="startToFinish"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="VariabilityType">
-		<xsd:annotation>
-			<xsd:documentation>An Enumeration used for values for instances of Variability Element's attribute variabilityType.  It defines the nature of how a Variability Element extends another Variability Element. See enumeration literals for definitions for each type.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NCName">
-			<xsd:enumeration value="na"/>
-			<xsd:enumeration value="contributes"/>
-			<xsd:enumeration value="extends"/>
-			<xsd:enumeration value="replaces"/>
-			<xsd:enumeration value="localContribution"/>
-			<xsd:enumeration value="localReplacement"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:complexType name="Element">
-		<xsd:annotation>
-			<xsd:documentation>A UML 2.0 meta-class Element.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:complexType>
-	<xsd:complexType name="NamedElement">
-		<xsd:annotation>
-			<xsd:documentation>A UML 2.0 meta-class Named Element.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Element">
-				<xsd:attribute name="name" type="xsd:string"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="PackageableElement">
-		<xsd:annotation>
-			<xsd:documentation>A UML 2.0 meta-class Packagable Element.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:NamedElement"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="MethodElement">
-		<xsd:annotation>
-			<xsd:documentation>The root generalization for all UMA Method Elements.  Defines a common set of attributes inherited by all UMA Method Elements.  Method Element itself is derived from Packageable Element from the UML 2.0 Infrastructure.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:PackageableElement">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="OwnedRule" type="uma:Constraint">
-						<xsd:annotation>
-							<xsd:documentation>Defines the packaging rules for this Method Element.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:choice>
-				<xsd:attribute name="id" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every instance of Method Element has a global unique id.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="briefDescription" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every instance of Method Element shall be briefly described with one or two sentences summarizing the element.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="suppressed" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>If a Variability Element is derived from another Variability Element using the "extends" Variability Specialization, then this attribute can be used to suppress inherited Method Elements that were part of the based-on Variability Element, which can be any type of Method Element.  In other words, if this attribute is set to true on a Method Element that has the same name than an inherited method element then it will not be regarded as inherited at all.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="orderingGuide" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Used for CASE tool realizations of this model to contain information about layout and ordering of the method element and its parts.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Constraint">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Method Element that represents a condition or restriction expressed in natural language text or in a machine readable language for the purpose of declaring some of the semantics of a Method Element.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:attribute name="mainDescription" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Stores the main definition of the constraint.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Section">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Element that represents structural subsections of a Content Description's sectionDescription attribute.  It is used for either large scale documentation of Content Elements organized into sections as well as to flexibly add new Sections to Content Elements using contribution variability added to the Section concept for Method Plug-ins.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:sequence>
-					<xsd:element name="SubSection" type="uma:Section" minOccurs="0"/>
-					<xsd:element name="Predecessor" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="Description" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>This attributes store the description text for a Content Description's Section.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-				<xsd:attribute name="sectionName" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Section has a name used for external presentation of the section, e.g. when published or when section heading are listed in a table of contents.  This attribute is similar to Presentation Name for Content Elements.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="predecessor" type="xsd:string"/>
-				<xsd:attribute name="variabilityType" type="uma:VariabilityType"/>
-				<xsd:attribute name="variabilityBasedOnElement" type="xsd:string"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="MethodUnit">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Element that shall be maintained in a Method Library as a separate unit of control.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:sequence>
-					<xsd:element name="Copyright" type="xsd:string" minOccurs="0"/>
-				</xsd:sequence>
-				<xsd:attribute name="authors" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Method Unit is being created and owned by an author or authoring team.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="changeDate" type="xsd:dateTime">
-					<xsd:annotation>
-						<xsd:documentation>The date the last change that resulted into this version has been made.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="changeDescription" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>The description of the last change that resulted into this version.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="version" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Package has a version number used to track changes.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ContentDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Method Element that is used to store the textual description for a Content Element.  It defines standard attributes applicable for all Content Element types.  Specific Content Element sub-types can define their own matching Content Description sub-types. </xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodUnit">
-				<xsd:sequence>
-					<xsd:element name="MainDescription" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Stores the main descriptive text for the Content Element.  All text that is not part of any of the more specific attributes shall be stored here.  If the Content Description is divided into sections using the Section class, then only the text from the 'start' of the content description to the first section will be stored here (similar to a normal document where you can place text between its beginning to its first diction heading).</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="KeyConsiderations" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Provides advise and guidance of a critical nature for the content element as well as warnings, cautions, pitfalls, dangers.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Section" type="uma:Section" minOccurs="0" maxOccurs="unbounded"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="GuidanceDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Guidance.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:choice minOccurs="0">
-					<xsd:element name="Attachment" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>This field is primarily used for attachments augmenting the information provided for guidance.  In particular the attribute is used for Templates, Examples, and Reusable Assets to contain the actual attachment described in the mainDescription.  It can additionally contain representations of the guidance in just a third party format, e.g. PDF, MS Word, or Word Perfect.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="PracticeDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Practice.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:sequence>
-					<xsd:element name="AdditionalInfo" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Any additional Information not covered by the other attributes.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Application" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Describes how the Practice is being applied or introduced into the context described in background.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Background" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Elaboration on the background and the context in which the problem occurs and where the solution described by this Practice will fit in.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Goals" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>A summary of the overall goals to be addressed by the Practice.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="LevelsOfAdoption" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Outlines the different forms or variants in which the practice could be realized. (e.g. full adoption verus a partial adoption of the Practice)</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Problem" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>A description of the problem the Practice addresses.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkProductDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Work Product.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:sequence>
-					<xsd:element name="ImpactOfNotHaving" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Describes the consequences of not producing the work product.  This is intended to aid in the tailoring the method/process to the needs of a specific project.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Purpose" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Describes why the work product is produced and to what use it will be put.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="ReasonsForNotNeeding" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Describes the circumstances in which it is reasonable not to produce the work product.  This is intended to aid in the tailoring of the method/process to the needs of a specific project.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-				<xsd:attribute name="externalId" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>An external visible number that is used to reference this artifact. Used like a synonym.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ArtifactDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Work Product Description that is used to store the textual description for an Artifact.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkProductDescription">
-				<xsd:sequence>
-					<xsd:element name="BriefOutline" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Provides a brief description of the information that can be found in this artifact. For example, discusses the contents for key chapters of a document artifact or the key packages and modules of a model artifact.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="RepresentationOptions" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Discusses different possible alternative representations for the artifact. For example a design model can be represented as a UML model or an informal block diagram or by textual description only.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DeliverableDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Work Product Description that is used to store the textual description for a Deliverable.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkProductDescription">
-				<xsd:sequence>
-					<xsd:element name="ExternalDescription" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>The description of the Deliverable used for client documents (proposal, statements of work or contractual agreements).  It might use a different language and follow legal constraints.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="PackagingGuidance" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Provides guidance on how to assemble the deliverable from all its required inputs.  This section describes the most common content medium and format.  Distribution of the deliverable is addressed in this section, if necessary.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="RoleDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Role.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:sequence>
-					<xsd:element name="AssignmentApproaches" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Provides guidance on for assigning individuals to the Role in terms of what other roles these individuals could perform and what responsibility different individuals assigned to this role might have.  The guidance can also describe different assignment approaches for different types of projects, e.g. for large versus small teams where individuals could be allocated to roles full time versus sharing roles within the team.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Skills" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Lists of set of required skills a person needs to possess to fulfill that Role.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Synonyms" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Lists synonyms, i.e. other names the Role might be referred by.  Tool support for the meta-model might support that a Role name can be consistently be replaced with one of its synonyms throught a Process.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="TaskDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Task.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:sequence>
-					<xsd:element name="Alternatives" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Comprises of summaries describing important exceptional and non-standard ways of achieving this Task's development goals that were not covered by the Task's Steps.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Purpose" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Summarizes the main reason for performing this Task and what is intended to be achieved.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DescribableElement">
-		<xsd:annotation>
-			<xsd:documentation>An abstract generalization of Method Elements for which external presentation names as well as content descriptions have been defined, such as Roles or Work Products.  Presentation Name and Content Descriptions are typically localized using a resource allocation mechanism for its String type attributes.
-This abstraction represents all elements in the Method Content as well as Process space for which concrete textual descriptions are defined in the form of documenting attributes grouped in a matching Content Description instance.  Describable Elements are intended to be published in method or process publications (similar to the IBM Rational Unified Process web).  Describable Element defines that the element it represents will have content 'attached' to it.  Content Description is the abstraction for the actual places in which the content is being represented.  This separation allows a distinction between core method model elements describing the structure of the model from the actual description container providing, for example, the documentation of the content element in different alternatives languages, audiences, licensing levels, etc.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:choice minOccurs="0">
-					<xsd:element name="Presentation" type="uma:ContentDescription"/>
-				</xsd:choice>
-				<xsd:attribute name="presentationName" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Describable Element has a presentation name, which is used for external presentation of the element.  For example, name (the internal representation) might be set to "rup_architecture_document" to differentiate from a "j2ee_architcture_document" whereas the external presentation would always be "Architecture Document".</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="shapeicon" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>A reference to an icon that can be used for modeling with specific Content Element instances (as graphical stereotypes, e.g. a use case symbol for a use case artifact) as well as publication of content.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="nodeicon" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>A reference to an icon that can be used in tree browser presentations and breakdown structures.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ContentElement">
-		<xsd:annotation>
-			<xsd:documentation>A Describable Element that represents an abstract generalization for all elements that are considered to be and managed as Method Content.
-Content Elements represents reusable Method Content that is supposed to be managed in Content Packages.  The separation of Content Element from Process Element allows to clearly distinguish between pure method content from content that is represented in processes.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:DescribableElement">
-				<xsd:sequence>
-					<xsd:choice minOccurs="0" maxOccurs="unbounded">
-						<xsd:element name="Checklist" type="xsd:string"/>
-						<xsd:element name="Concept" type="xsd:string"/>
-						<xsd:element name="Example" type="xsd:string"/>
-						<xsd:element name="Guideline" type="xsd:string"/>
-						<xsd:element name="ReusableAsset" type="xsd:string"/>
-						<xsd:element name="SupportingMaterial" type="xsd:string"/>
-						<xsd:element name="Whitepaper" type="xsd:string"/>
-					</xsd:choice>
-				</xsd:sequence>
-				<xsd:attribute name="variabilityType" type="uma:VariabilityType"/>
-				<xsd:attribute name="variabilityBasedOnElement" type="xsd:string"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Guidance">
-		<xsd:annotation>
-			<xsd:documentation>Guidance is an abstract generalization of additional information related to content elements such as Roles, Tasks, and Work Products.  Examples for Guidance are Guidelines, Templates, Checklists, Tool Mentors, Estimates, Supporting Materials, Reports, Concepts, etc.  This package only contains the definition of the abstract Guidance class.  The package Guidance Types defines concrete guidance types.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentElement"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Concept">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that outlines key ideas associated with basic principles underlying the referenced item. Concepts normally address more general topics than Guidelines and span across sev-eral work product and/or tasks/activities.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Checklist">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that identifies a series of items that need to be completed or veri-fied.  Checklists are often used in reviews such as walkthroughs or inspections. </xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Example">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of Guidance that represents a typical, partially completed, sample instance of one or more work products or scenario like descriptions of how Task may be performed. Examples can be related to Work Products as well as Tasks that produce them as well as any other Content Element.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Guideline">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that provides additional detail on how to perform a particular task or grouping of tasks (e.g. grouped together as activities) or that provides additional detail, rules, and recommendations on work products and their properties.  Amongst others, it can include details about best practices and different approaches for doing work, how to use particular types of work products, information on different subtypes and variants of the work product and how they evolve throughout a lifecycle, discussions on skills the performing roles should acquire or improve upon, measurements for progress and maturity, etc.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Estimate">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of Guidance that provides sizing measures, or standards for sizing the work effort associated with performing a particular piece of work and instructions for their successful use. It may be comprised of estimation considerations and estimation metrics.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="EstimationMetric" type="xsd:string"/>
-					<xsd:element name="EstimationConsiderations" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="EstimatingMetric">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of Guidance that describes a metric or measure that is associated with an element and which is used to calculate the size of the work effort as well as a range of potential labor.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="EstimationConsiderations">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of Guidance that qualifies the usage and application of estimation metrics in the development of an actual estimate.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Roadmap">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of Guidance which is only related to Activates and therefore has been added by this package to the list of Guidance Types rather than listed in the Guidance Types package.  A Roadmap represents a linear walkthrough of an Activity, typically a Process.
-An instance of a Roadmap represents important documentation for the Activity or Process it is related to.  Often a complex Activity such as a Process can be much easier understood by providing a walkthrough with a linear thread of a typical instantiation of this Activity.  In addition to making the process practitioner understand how work in the process is being performed, a Roadmap provides additional information about how Activities and Tasks relate to each other over time.  Roadmaps are also used to show how specific aspects are distributed over a whole process providing a kind of filter on the process for this information.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Report">
-		<xsd:annotation>
-			<xsd:documentation>A predefined template of a result that is generated on the basis of other work products as an output from some form of tool automation. An example for a report would be a use case model survey, which is generated by extracting diagram information from a graphical model and textual information from documents and combines these two types of information into a report.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Template">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that provides for a work product a pre-defined table of contents, sections, packages, and/or headings, a standardized format, as well as descriptions how the sections and packages are supposed to be used and completed. Templates cannot only be provided for documents, but also for conceptual models or physical data stores.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="SupportingMaterial">
-		<xsd:annotation>
-			<xsd:documentation>A catchall for other types of guidance not specifically defined elsewhere. It can be related to all kinds of Content Elements, i.e. including other guidance elements.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ToolMentor">
-		<xsd:annotation>
-			<xsd:documentation>A  specific type of guidance that shows how to use a specific tool to accomplish some piece of work a Work Product either in the context of or independent from a Task or Activity.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Whitepaper">
-		<xsd:annotation>
-			<xsd:documentation>A special Concept guidance that have been externally reviewed or published and can be read and understood in isolation of other content elements and guidance.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Concept"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="TermDefinition">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that defines concepts and are used to build up the Glossary. TermDefinitions are not directly related to ContentElements, but their relationship is being derived when the Term is used in the ContentElements description text.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Practice">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that represents a proven way or strategy of doing work to achieve a goal that has a positive impact on work product or process quality.  Practices are defined orthogonal to methods and processes.  They could summarize aspects that impact many different parts of a method or specific processes.  Examples for practices would be "Manage Risks", "Continuously verify quality", "Architecture-centric and component-based development", etc.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ActivityReference" type="xsd:string"/>
-					<xsd:element name="ContentReference" type="xsd:string"/>
-					<xsd:element name="SubPractice" type="uma:Practice"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ReusableAsset">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that provides a solution to a problem for a given context. The asset may have a variability point, which is a location in the asset that may have a value provided or customized by the asset consumer. The asset has rules for usage which are the instructions describing
-how the asset should be used.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkProduct">
-		<xsd:annotation>
-			<xsd:documentation>An abstract class which provides a generalization for the content element types Artifact, Outcome, and Deliverable.  The meta-model class Work Product actually represents work product types, i.e. an instance of Work Product is a description of a specific type of work product and not an individual work product instance.  However, for simplicity reasons and because of low risk of misinterpretation we did not append the word 'type' to every meta-class.
-A work product is an abstraction for descriptions of content elements that are used to define anything used, produced, or modified by a task.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentElement">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="Estimate" type="xsd:string"/>
-					<xsd:element name="EstimationConsiderations" type="xsd:string"/>
-					<xsd:element name="Report" type="xsd:string"/>
-					<xsd:element name="Template" type="xsd:string"/>
-					<xsd:element name="ToolMentor" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Artifact">
-		<xsd:annotation>
-			<xsd:documentation>A Work Product that provides a description and definition for tangible work product types. Artifacts may be composed of other artifacts. For example, a model artifact can be composed of model elements, which are also artifacts.
-Artifacts are tangible work products consumed, produced, or modified by Tasks.  It may serve as a basis for defining reusable assets.  Roles use Artifacts to perform Tasks and produce Artifacts in the course of performing Tasks.  Artifacts are the responsibility of a single Role, making responsibility easy to identify and understand, and promoting the idea that every piece of information produced in the method requires the appropriate set of skills. Even though one role might "own" a specific type of Artifacts, other roles can still use the Artifacts; perhaps even update them if the Role has been given permission to do so.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkProduct">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ContainedArtifact" type="uma:Artifact"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Deliverable">
-		<xsd:annotation>
-			<xsd:documentation>A Work Product that provides a description and definition for packaging other Work Products, and may be delivered to an internal or external party.  Therefore, a Deliverable aggregates other Work Products. Therefore, a Deliverable aggregates other Work Products.  A Deliverable is used to pre-define typical or recommended content in the form or work products that would be packaged for delivery.  The actual packaging of the Deliverable in an actual process or even project could be a modification of this recommendation.  Deliverables are used to represent an output from a process that has value, material or otherwise, to a client, customer or other stakeholder. </xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkProduct">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="DeliveredWorkProduct" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Outcome">
-		<xsd:annotation>
-			<xsd:documentation>A Work Product that describes intangible work products that are a result or state. Outcomes may also be used to describe work products that are not formally defined.  A key differentiator for outcomes against artifacts is that outcomes are not candidates for harvesting as reusable assets.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkProduct"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Role">
-		<xsd:annotation>
-			<xsd:documentation>A Content Element that defines a set of related skills, competencies, and responsibilities.  Roles are used by Tasks to define who performs them as well as define a set of work products they are responsible for.  
-A Role defines a set of related skills, competencies, and responsibilities of an individual or a set of individuals.  Roles are not individuals or resources.  Individual members of the development organization will wear different hats, or perform different roles. The mapping from individual to role, performed by the project manager when planning and staffing for a project, allows different individuals to act as several different roles, and for a role to be played by several individuals.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentElement">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ResponsibleFor" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Task">
-		<xsd:annotation>
-			<xsd:documentation>A Content Element that describes work being performed by Roles.  It defines one default performing Role as well as many additional performers.  A Task is associated to input and output work products.  Inputs are differentiated in mandatory versus optional inputs.  The associations to Work Products are not instantiatable/variable-like parameters.  They rather express (hyper-)links to the descriptions of the work products types that are related to the Task as inputs and outputs.  In other words, these associations are not intended to be used to capture which concrete instances will be passed when instantiating the method in a project.  All of the Task's default associations can be overridden in an actual process definition.
-A Task describes an assignable unit of work.  Every Task is assigned to specific Roles.  The granularity of a Task is generally a few hours to a few days.  It usually affects one or only a small number of work products. A Task is used as an element of defining a process. Tasks are further used for planning and tracking progress; therefore, if they are defined too fine-grained, they will be neglected, and if they are too large, progress would have to be expressed in terms of a Task's parts (e.g. Steps, which is not recommended). 
-A Task has a clear purpose in which the performing roles achieve a well defined goal.  It provides complete step-by-step explanations of doing all the work that needs to be done to achieve this goal.  This description is complete, independent of when in a process lifecycle the work would actually be done.  It therefore does not describe when you do what work at what point of time, but describes all the work that gets done throughout the development lifecycle that contributes to the achievement of this goal.  When the Task is being applied in a process then this process application (defined as Task Descriptor) provides the information of which pieces of the Task will actually be performed at any particular point in time. This assumes that the Task will be performed in the process over and over again, but each time with a slightly different emphasis on different steps or aspects of the task description. 
-For example, a Task such as "Develop Use Case Model" describes all the work that needs to be done to develop a complete use case model. This would comprise of the identification and naming of use cases and actors, the writing of a brief description, the modeling of use cases and their relationships in diagrams, the detailed description of a basic flow, the detailed description of alternatives flows, performing of walkthroughs workshops and reviews, etc.  All of these parts contribute to the development goal of developing the use case model, but the parts will be performed at different points in time in a process.  Identification, naming, and brief descriptions would be performed early in a typical development process versus the writing of detailed alternative flows which would be performed much later.  All these parts or steps within the same Task define the "method" of Developing a Use Case Model.  Applying such a method in a lifecycle (i.e. in a process) is defining which steps are done when going from one iteration to the next.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentElement">
-				<xsd:sequence>
-					<xsd:element name="Precondition" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="Postcondition" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="PerformedBy" type="xsd:string" minOccurs="0"/>
-					<xsd:choice minOccurs="0" maxOccurs="unbounded">
-						<xsd:element name="MandatoryInput" type="xsd:string"/>
-						<xsd:element name="Output" type="xsd:string"/>
-						<xsd:element name="AdditionallyPerformedBy" type="xsd:string"/>
-						<xsd:element name="OptionalInput" type="xsd:string"/>
-						<xsd:element name="Estimate" type="xsd:string"/>
-						<xsd:element name="EstimationConsiderations" type="xsd:string"/>
-						<xsd:element name="ToolMentor" type="xsd:string"/>
-					</xsd:choice>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkDefinition">
-		<xsd:annotation>
-			<xsd:documentation>An abstract Method Element that generalizes all descriptions of work within the Unified Method Architecture.  This package introduces two concrete types of Work Definitions: Task and Step.  Work Definitions can contain sets of pre- and post-conditions defining constraints that need to be valid before the described work can begin or before it can be declared as finished.  Note that general ownedRules can be used to define additional constraints and rules for Work Definitions.
-Work Definitions represent behavioral descriptions for doing work.  These behavioral descriptions are not bound to one specific classifier, but represent an arbitrary definition of work.  For example, a Work Definition could represent work that is being performed by a specific Role (e.g. a Role performing a specific Task or Steps of a Task), by many Roles working in close collaboration (many Roles all working together on the same interdisciplinary Task), or complex work that is performed throughout the lifecycle (e.g. a process defining a breakdown structure for organizing larger composite units of work performed by many Roles working in collaboration).</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:sequence>
-					<xsd:element name="Precondition" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="Postcondition" type="xsd:string" minOccurs="0"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ContentCategory">
-		<xsd:annotation>
-			<xsd:documentation>An abstract class generalizing content category types.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentElement"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Discipline">
-		<xsd:annotation>
-			<xsd:documentation>A categorization of work (i.e. Tasks for Method Content), based upon similarity of concerns and cooperation of work effort.
-A discipline is a collection of Tasks that are related to a major 'area of concern' within the overall project. The grouping of Tasks into disciplines is mainly an aid to understanding the project from a 'traditional' waterfall perspective. However, typically, for example, it is more common to perform certain requirements activities in close coordination with analysis and design activities. Separating these activities into separate disciplines makes the activities easier to comprehend.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="Task" type="xsd:string"/>
-					<xsd:element name="SubDiscipline" type="uma:Discipline"/>
-					<xsd:element name="ReferenceWorkflow" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DisciplineGrouping">
-		<xsd:annotation>
-			<xsd:documentation>Used to group Disciplines.  For example, the Discipline Grouping "Software Disciplines" would be the group of all disciplines related to developing software such as "Requirements Management" or "Testing"; "IT Infrastructure Management" would be a Disciplines Grouping for disciplines such as "IT Operational Services", "IT Customer Relationships", or "IT Enabling Services".  Disciplines can be associated to more than one Discipline Grouping.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="Discipline" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Domain">
-		<xsd:annotation>
-			<xsd:documentation>A refineable hierarchy grouping related work products.  In other words, Domains can be further divided into sub-domains, with work product elements to be categorized only at the leaf-level of this hierarchy.
-Domain is a logical grouping of work products that have an affinity to each other based on resources, timing, or relationship.  A Domain may be divided into subdomains.  For example, GS Method uses six predefined Domains for Work Products: Application, Architecture, Business, Engagement, Operations and Organization.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="WorkProduct" type="xsd:string"/>
-					<xsd:element name="Subdomain" type="uma:Domain"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="RoleSet">
-		<xsd:annotation>
-			<xsd:documentation>Organizes Roles into categories.  It is used to group roles together that have certain commonalities.  For example, the "Analysts" Role Set could group the "Business Process Analyst", "System Analyst", as well as "Requirements Specifier" roles.  All of these work with similar techniques and have overlapping skills, but are required as distinct roles for a method (e.g. the method the IBM Rational Unified Process is based on).</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="Role" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="RoleSetGrouping">
-		<xsd:annotation>
-			<xsd:documentation>Role Sets can be categorized into Role Set Groupings.  For example, different methods might define similar Role Sets, which however need to be distinguished from each other on a global scale.  Thus, Role Set Groupings allow distinguishing, for example, Software Services Manager Role Sets from Software Development Organization Manager Role Sets.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="RoleSet" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Tool">
-		<xsd:annotation>
-			<xsd:documentation>A container/aggregate for ToolMentors.  It can also provide general descriptions of the tool and its general capabilities.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ToolMentor" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkProductType">
-		<xsd:annotation>
-			<xsd:documentation>A second category for work products, which in contrast to Domain is more presentation oriented.  A work product can have many Work Product Types.  Examples, for a Work Product Type is "Class Diagram", which categorizes the Artifacts Analysis Model, Design Model, User Experience Model, or "Specification", which categorizes requirements specifications that define a system with a well-defined system boundary, such as use case or functional requirements specification.  A Work Product can be categorized to be of many Work Product Types.  For example, a use case model can be categorized as a Specification as well as Diagram Work Product Type.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="WorkProduct" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="CustomCategory">
-		<xsd:annotation>
-			<xsd:documentation>A category introduced by a method content author to structure any number of method Content Elements of any subtype based on user-defined criteria.  Because Content Categories (and therefore Custom Categories, too) are Content Elements themselves, Custom Categories can be used to recursively categorize Content Categories as well.  Custom Categories can also be nested with any Content Category.  Custom categories can be used to categorize content based on the user's criteria as well as to define whole tree-structures of nested categories allowing the user to systematically navigate and browse method content and processes based on these categories.  For example, one could create a custom category to logically organize content relevant for the user's development organization departments; e.g. a "Testing" category that groups together all roles, work products, tasks, and guidance element relevant to testing.  Another example would be categories that express licensing levels of the content grouping freely distributable method content versus content that represent intellectual property and requires a license to be purchased to be able to use it.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="CategorizedElement" type="xsd:string"/>
-					<xsd:element name="SubCategory" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="MethodPackage">
-		<xsd:annotation>
-			<xsd:documentation>An abstract class for packaging Method Elements.  All Method Elements shall be located in exactly one of Method Package's concrete specializations (e.g. Content Package).   Method Package defines common properties for all of its specializations. Elements are organized in Method Packages to structure large scale of method content and processes as well as to define a mechanism for reuse.  Method Elements from one package can reuse element from other packages by defining a reusedPackages link.  For example, a work product defined in one package can be used as an input for Tasks defined in other packages.  By reusing it from one common place (i.e. the package in which it has been defined) ensures that no redundant definitions of the same elements are required.  Also maintenance of method content is greatly improved as changes can be performed in only one place.  Note, that other packages will introduce more specializations of Method Package, e.g. Process Package and Process Component.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ReusedPackage" type="xsd:string"/>
-					<xsd:element name="MethodPackage" type="uma:MethodPackage"/>
-				</xsd:choice>
-				<xsd:attribute name="global" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>Method Packages can have a global scope.  This means that every element of every other Method Package can see the global package's contents.  Global Method Packages are primarily used to store commonly used category definitions such as for Disciplines or Domains, which are used by many Task and Work Products respectively.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ContentPackage">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Package that contains Content Elements and Content Elements, only.  Examples for Content Element are Artifacts, Tasks, Roles, etc.  A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodPackage">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ContentElement" type="uma:ContentElement"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ContentCategoryPackage">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Package that only contains Content Category Elements.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodPackage">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ContentCategory" type="uma:ContentCategory"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessElement">
-		<xsd:annotation>
-			<xsd:documentation>A Describable Element that represents an abstract generalization for all elements defined in the Process package.
-Process Elements represents Process specific elements that are supposed to be managed in Process Packages.  The separation of Process Element from Content Element allows to clearly distinguish between pure method content from content that is represented in processes. </xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:DescribableElement"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="PlanningData">
-		<xsd:annotation>
-			<xsd:documentation>A Process Element that adds planning data to Breakdown Elements when it is used for a Process Planning Template.  For Delivery Processes and Capability Patterns this class can either not be instantiated or populated with default data.
-Planning Data factors out specific optional data needed for representing planning templates.  This association allows to access planning data if it is stored for the Breakdown Element.
-(NOTE, THE ATTRIBUTES FOR THIS CLASS ARE NOT COMPLETE, YET)</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ProcessElement">
-				<xsd:attribute name="startDate" type="xsd:dateTime">
-					<xsd:annotation>
-						<xsd:documentation>The default start date for a planed Task.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="finishDate" type="xsd:dateTime">
-					<xsd:annotation>
-						<xsd:documentation>The default finish date for a planed Task.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="rank" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>The default rank for a planed Task.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="BreakdownElement">
-		<xsd:annotation>
-			<xsd:documentation>An abstract generalization for any type of Method Element that is part of a breakdown structure.  It defines a set of properties available to all of its specializations.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ProcessElement">
-				<xsd:sequence>
-					<xsd:element name="PresentedAfter" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="PresentedBefore" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="PlanningData" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="SuperActivity" type="xsd:string" minOccurs="0"/>
-				</xsd:sequence>
-				<xsd:attribute name="prefix" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Prefix represents an additional label that will be presented as a prefix to any Breakdown Element to indicate a user-defined sub-type for the element.  For example, if the process engineer would like to distinguish his Activities by 'Module' (as done in the IBM Rational Summit Ascendant Method), he can define a different prefix for every model to be used in addition to naming Activities, e.g. "SRA.Establish Requirements" with SRA indicating that this Activity belongs to the "Software Requirements Analysis" module.  Another common application for prefix is to qualify roles in Role Descriptors.  For example, "Customer.Architect" would define a "Customer" prefix for the Role Descriptor "Architect" expressing that this is an architect on the customer side and not the development team side.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="isPlanned" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>A key application for Development Processes expressed with Breakdown structures is to generate a project plan from it.  A process as defined in UMA (cf. with Sections XX and 5.2) is a multi-dimensional structure defining what work is being performed at what time by which roles using which input and producing what outputs.  A project plan as it is represented in project planning tools such as IBM Rational Portfolio Manager or Microsoft Project normally does not need all this information and is normally limited to just representing a subset.  For example, a typical MS Project plan only represents the work breakdown consisting of Tasks and Activities (sometimes referred to as summary tasks).  It does not show the input and output Work Products for a Task, but it can show which roles shall be staffed for performing the Task.  However, such role allocation need to be replaced with concrete resources when instantiating the plan for a concrete project.  Sometimes project plans can then again be organized differently by organizing work by deliverables in which Work Products are mapped to the plan's summary tasks and Task that have these work products as output mapped below such as summary task.  Therefore, a process can make recommendations about which elements to include and which to exclude when generating a plan.  When the isPlanned attribute is set to False for an instance of a Breakdown Element, then this element shall not be not included when a concrete project plan is being generated from the breakdown structure that contains this element.
-</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="hasMultipleOccurrences" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>Just as the isPlanned attribute the hasMultipleOccurrences attribute has an impact on generating plans from a Process.  When this attribute is set to True for a Breakdown Element then it will typically occur multiple times within the same Activity.  For example, a Task such as "Detail Use Case" would be performed for every use case identified for a particular Iteration or Activity.  Generating a plan would list one Task instance per use case.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="isOptional" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>Indicates that the Breakdown Element describes work, a work result, or even work resources, which inclusion is not mandatory when performing a project that is planned based on a process containing this element.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkOrder">
-		<xsd:annotation>
-			<xsd:documentation>Represents a relationship between two Breakdown Elements in which one Breakdown Elements depends on the start or finish of another Breakdown Elements in order to begin or end.  
-The Work Order class defines predecessor and successor relations amongst Breakdown Elements.  This information is in particular critical for planning applications.  See more details on different types of Work Order relationships at Work Order Type.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attribute name="id" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Defines a global unique id for a work order.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="linkType" type="uma:WorkOrderType">
-					<xsd:annotation>
-						<xsd:documentation>This attribute expresses the type of the Work Order relationship by assigning a value from the Work Order Type enumeration.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkBreakdownElement">
-		<xsd:annotation>
-			<xsd:documentation>A special Breakdown Element that provides specific properties for Breakdown Elements that represent or refer to Work Definitions.  For example its subclass Activity defines work as it is also a subclass of Work Definition.  Its subclass Task Descriptor does not define work by itself, but refers to a Work Definition and therefore can have the same common properties and Work Breakdown Element has.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElement">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="Predecessor" type="uma:WorkOrder"/>
-				</xsd:choice>
-				<xsd:attribute name="isRepeatable" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>This attribute is used to define repetition of work, e.g. iterations.  A Process Work Definition with this attribute set to True shall be repeated more than once on the same set of artifacts.  For example, for an instance of Iteration (defined as a special Process Work Definition below) this attribute is set to True by default indicating that every sub-Activity will be repeated more than once.  However, any Process Work Definition can set this attribute to True to define iterations (e.g. to iterate one Activity consisting of many sub-activities or even Phases, but to iterate just one Task).</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="isOngoing" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>If the isOngoing attribute is set to True for a Process Work Definition instance, then the element describes an ongoing piece of work without a fixed duration or end state.  For example, the Process Work Definition could represent work of an administrator continuously (e.g. 3h a day) working to ensure that systems are kept in a certain state.  Another example would be program management work overseeing many different projects being scheduled for one particular project at specific reoccurring intervals during the whole lifecycle of the project.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="isEventDriven" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>The isEventDriven attribute indicates that the Process Work Definition describes an instance of work which is not started because it has been scheduled to start at a certain point of time, because preceding work is being completed, or input work products are available, but because another specific event has occurred.  Examples for such events are exceptions or problem situations which require specific work to be performed as a result.  Also change management work can be modeled as event driven work analyzing a change request or defect and allocating work dynamically to resources to deal with it following the work described with such Process Work Definition.  The events themselves are not modeled in this version of the specification.  They shall be described as part of the normal descriptions fields available.
-</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Milestone">
-		<xsd:annotation>
-			<xsd:documentation>A special Breakdown Element that describes a significant event in a development project, such as a major decision, completion of a deliverable, or meeting of a major dependency (like completion of a project phase).  Because, Milestone is commonly used to refer to both the event itself and the point in time at which the event is scheduled to happen, it is modeled as a Breakdown Element (i.e. it appears as part of a breakdown structure).</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkBreakdownElement"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Activity">
-		<xsd:annotation>
-			<xsd:documentation>A Work Breakdown Element and Work Definition which supports the nesting and logical grouping of related Breakdown Elements forming breakdown structures.  Although Activity is a concrete meta-class, other classes which represent breakdown structures derive from it; such as Phase, Iteration, Delivery Process, or Capability Pattern.
-Activity represents a grouping element for other Breakdown Elements such as Activities, Descriptors, Milestones, etc.  It is not per-se a 'high-level' grouping of only work as in other meta-models, but groups any kind of Breakdown Elements.  For example, one can define valid Activities that group only Work Products Descriptors without any matching Task Descriptors.  Activities also inherit all properties from Work Breakdown Element and indirectly from Process Element; i.e. Activity is ready to have a full content description attached to it.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkBreakdownElement">
-				<xsd:sequence>
-					<xsd:element name="Precondition" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="Postcondition" type="xsd:string" minOccurs="0"/>
-					<xsd:choice minOccurs="0" maxOccurs="unbounded">
-						<xsd:element name="BreakdownElement" type="uma:BreakdownElement"/>
-						<xsd:element name="Checklist" type="xsd:string"/>
-						<xsd:element name="Concept" type="xsd:string"/>
-						<xsd:element name="Example" type="xsd:string"/>
-						<xsd:element name="Guideline" type="xsd:string"/>
-						<xsd:element name="Roadmap" type="xsd:string"/>
-						<xsd:element name="ReusableAsset" type="xsd:string"/>
-						<xsd:element name="SupportingMaterial" type="xsd:string"/>
-						<xsd:element name="Whitepaper" type="xsd:string"/>
-					</xsd:choice>
-				</xsd:sequence>
-				<xsd:attribute name="variabilityType" type="uma:VariabilityType"/>
-				<xsd:attribute name="variabilityBasedOnElement" type="xsd:string"/>
-				<xsd:attribute name="IsEnactable" type="xsd:boolean"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Phase">
-		<xsd:annotation>
-			<xsd:documentation>A special Activity which prescribes pre-defined values for its instances for the attributes prefix ('Phase') and isRepeatable ('False').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.
-Phase represent a significant period in a project, ending with major management checkpoint, milestone or set of Deliverables.  It is included in the model as a predefined special Activity, because of its significance in defining breakdowns.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Activity"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Iteration">
-		<xsd:annotation>
-			<xsd:documentation>A special Activity which prescribes pre-defined values for its instances for the attributes prefix ('Iteration') and isRepeatable ('True').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.
-Iteration groups a set of nested Activities that are repeated more than once.  It represents an important structuring element to organize work in repetitive cycles.  The concept of Iteration can be associated with different rules in different methods.  For example, the IBM Rational Unified Process method framework (RUP) defines a rule that Iterations are not allowed to span across Phases.  In contrast IBM Global Services Method (GSMethod) based method frameworks this rule does not apply and Iteration can be defined which nest Phases.  Rules like these, which play an important role for each individual method and are therefore not enforced by this meta-model.  Instead, process authors are expected to follow and check these rules manually.  (Note: Any Breakdown Element can be repeated; however, Iterations has been introduced as a special meta-model concept, because of its important role for many methods.)</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Activity"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="BreakdownElementDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Breakdown Element.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:attribute name="usageGuidance" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Provides information and guidance on the meaning of the Boolean flag values and under what circumstances they should be overridden. For example, it describes why the breakdown element is optional or considerations for repeating it and differences in the individual occurrences of this Breakdown Element across the lifecycle.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ActivityDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Breakdown Element Description that is used to store the textual description for an Activity.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElementDescription">
-				<xsd:sequence>
-					<xsd:element name="Alternatives" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Comprises of summaries describing important exceptional and non-standard ways of doing the work of this Activity not covered by the Activity's Tasks.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="HowToStaff" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Provides background on who should be involved in this activity what are the required skills, experience,  and perhaps attitudes.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Purpose" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Summarizes the main reason for performing this Activity, describes what the activity as a whole is intended to achieve.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DescriptorDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Breakdown Element Description that is used to store the textual description for a Descriptor.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElementDescription">
-				<xsd:choice minOccurs="0">
-					<xsd:element name="RefinedDescription" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>A Descriptor might add refinements to the main description of the Content Element it refers to.  For example, it could provide additional information about a Work Product relevant for the specific point in time in the process this Work Product type is being used.  It could describe additional skills needed for a Role at that particular point in time in a process, etc. </xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Activity Description that is used to store the textual description for a Process.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ActivityDescription">
-				<xsd:sequence>
-					<xsd:element name="Scope" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Defines the scope of the Process, i.e. which types of projects does it address and which not.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="UsageNotes" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Any additional notes on how to apply and instantiate this process for a project.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-				<xsd:attribute name="externalId" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>An external visible number that is used to reference this delivery patterns and models. It is used like a synonym.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DeliveryProcessDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Process Description that is used to store the textual description for a Delivery Process.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ProcessDescription">
-				<xsd:sequence>
-					<xsd:element name="Scale" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Outlines characteristics about the size of a typical project that performs this project expressed in team size, man years, etc.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="ProjectCharacteristics" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Characterizes the project that would typically perform this Process</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="RiskLevel" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Outlines typical project risks that are addressed with this process.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="EstimatingTechnique" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Describes the Estimation Techniques provided for this Process.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="ProjectMemberExpertise" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Provides a profile of a typical project team, the distribution of roles, skills required for a team performs a project based on this process.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="TypeOfContract" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Provides background information about the coI'm chaI'm ntracts that need to be established between a project team that performs this process and a client (e.g. for an IGS engagement).</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Descriptor">
-		<xsd:annotation>
-			<xsd:documentation>An abstract generalization for special Breakdown Elements that references one concrete Content Element.  A descriptor provides a representation of a Content Element within breakdown structures.  In addition to just referencing Content Elements it allows overriding the Content Elements structural relationships by defining its own sets of associations.
-Descriptors are the key concept for realizing the separation of processes from method content.  A Descriptor can be characterized as a reference object for one particular Content Element, which has its own relationships and properties.  When a Descriptor is created it shall be provided with congruent copies of the relationships defined for the referenced content element.  However, a user can modify these relationships for the particular process situation for which the descriptor has been created. </xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElement">
-				<xsd:attribute name="isSynchronizedWithSource" type="xsd:boolean"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkProductDescriptor">
-		<xsd:annotation>
-			<xsd:documentation>A special Descriptor that represents a Work Product in the context of one specific Activity.  Every breakdown structure can define different relationships of Work Product Descriptors to Task Descriptors and Role Descriptors.  Therefore one Work Product can be represented by many Work Product Descriptors each within the context of an Activity with its own set of relationships.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Descriptor">
-				<xsd:sequence>
-					<xsd:element name="WorkProduct" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="ResponsibleRole" type="xsd:string" minOccurs="0"/>
-					<xsd:choice minOccurs="0" maxOccurs="unbounded">
-						<xsd:element name="ExternalInputTo" type="xsd:string"/>
-						<xsd:element name="ImpactedBy" type="xsd:string"/>
-						<xsd:element name="Impacts" type="xsd:string"/>
-						<xsd:element name="MandatoryInputTo" type="xsd:string"/>
-						<xsd:element name="OptionalInputTo" type="xsd:string"/>
-						<xsd:element name="OutputFrom" type="xsd:string"/>
-						<xsd:element name="DeliverableParts" type="xsd:string"/>
-					</xsd:choice>
-				</xsd:sequence>
-				<xsd:attribute name="activityEntryState" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Entry State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is initiated (i.e. work on the Activity's Task Descriptors is being initiated that use this Work Product Descriptor as input).  
-For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested].</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="activityExitState" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Exist State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is finished (i.e. work on the Activity's Task Descriptors has finished that have this Work Product Descriptor as output).
-For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested].</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="RoleDescriptor">
-		<xsd:annotation>
-			<xsd:documentation>A special Descriptor that represents a Role in the context of one specific Activity.  Every breakdown structure can define different relationships of Role Descriptors to Task Descriptors and Work Product Descriptors.  Therefore one Role can be represented by many Role Descriptors each within the context of an Activity with its own set of relationships.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Descriptor">
-				<xsd:sequence>
-					<xsd:element name="Role" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="ResponsibleFor" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="TaskDescriptor">
-		<xsd:annotation>
-			<xsd:documentation>A special Descriptor that represents a proxy for a Task in the context of one specific Activity.  Every breakdown structure can define different relationships of Task Descriptors to Work Product Descriptors and Role Descriptors. Therefore one Task can be represented by many Task Descriptors each within the context of an Activity with its own set of relationships.
-A key difference between Method Content and Process is that a Content Element such as Task describes all aspects of doing work defined around this Task.  This description is managed in steps, which are modeled as Sections of the Tasks' Content Descriptions.  When applying a Task in a Process' Activity with a Task Descriptor a Process Engineer needs to indicate that at that particular point in time in the Process definition for which the Task Descriptor has been created, only a subset of steps shall be performed.  He defines this selection using the selectedSteps association.  If he wants to add steps to a Task Descriptor, he can describe these either pragmatically in the refinedDescription attribute or 'properly' create a contributing Task to the Task the Task Descriptor refers to.
-</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkBreakdownElement">
-				<xsd:sequence>
-					<xsd:element name="Task" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="PerformedPrimarilyBy" type="xsd:string" minOccurs="0"/>
-					<xsd:choice minOccurs="0" maxOccurs="unbounded">
-						<xsd:element name="AdditionallyPerformedBy" type="xsd:string"/>
-						<xsd:element name="AssistedBy" type="xsd:string"/>
-						<xsd:element name="ExternalInput" type="xsd:string"/>
-						<xsd:element name="MandatoryInput" type="xsd:string"/>
-						<xsd:element name="OptionalInput" type="xsd:string"/>
-						<xsd:element name="Output" type="xsd:string"/>
-					</xsd:choice>
-					<xsd:element name="Step" type="uma:Section" minOccurs="0" maxOccurs="unbounded"/>
-				</xsd:sequence>
-				<xsd:attribute name="isSynchronizedWithSource" type="xsd:boolean"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="CompositeRole">
-		<xsd:annotation>
-			<xsd:documentation>A special Role Descriptor that relates to more then one Role.  It represents a grouping of Roles with the main purpose of simplification, i.e. reducing the number of roles for a process.
-A Composite Role is a grouping of Roles that can be used in an Activity or Process to reduce the number of Roles.  A typical application would be a process for a small team in which a standard set of roles from the method content would be all performed by one or more resource.  By using Composite Role the process would suggest a typical clustering of Roles to Resources.  A Composite Role could perform all Tasks defined for the Roles it refers to.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:RoleDescriptor">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="AggregatedRole" type="uma:Role"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="TeamProfile">
-		<xsd:annotation>
-			<xsd:documentation>A Breakdown Element that groups Role Descriptors or Resource Definitions defining a nested hierarchy of teams and team members.
-Work assignments and Work Product responsibilities can be different from Activity to Activity in a development project. Different phases require different staffing profiles, i.e. different skills and resources doing different types of work.  Therefore, a process needs to define such different profiles in a flexible manner.  Whereas Core Method Content defines standard responsibilities and assignments, a process express by a breakdown structures needs to be able refine and redefine these throughout its definition.  Role Descriptors, Resource Definitions, as well as Team Profiles provide the data structure necessary to achieve this flexibility and to provide a process user with the capability to define different teams and role relationships for every Activity (including Activities on any nesting-level as well as Iterations or Phases).
-Hence, in addition to the work breakdown and work product breakdown structures defined so far, Team Profiles are used to define a third type of breakdown structure: team breakdown structures.  These are created as an Activity specific hierarchy of Team Profiles comprising of Role Descriptors and Resource Definitions.  These structures can be presented as well-known Org-Charts.  Just as with any other Breakdown Element and Descriptors, Team Profiles can be defined within the scope of any Activity in a breakdown structure.  In other words every Activity can define its own Team Profiles consisting of Activity specific Role Descriptors and Resource Definitions.  Typically, Team Profiles are defined on the level of Iterations or Phases or other higher-level Activity.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElement">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="Role" type="xsd:string"/>
-					<xsd:element name="SuperTeam" type="xsd:string"/>
-					<xsd:element name="SubTeam" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Process">
-		<xsd:annotation>
-			<xsd:documentation>A special Activity that describes a structure for particular types of development projects.  To perform such a development project a Processes would be 'instantiated' and adapted for the specific situation.  Process is an abstract class and this meta-model defines different special types of Processes for different process management applications and different situations of process reuse.  Every Process comprises of and is the top-level element of an n-level breakdown structure using the Nesting association defined on Activity.
-Core Method Content provides step-by-step explanations, describing how very specific development goals are achieved independent of the placement of these steps within a development lifecycle.  Processes take these method elements and relate them into semi-ordered sequences that are customized to specific types of projects.  Thus, a process is a set of partially ordered work descriptions intended to reach a higher development goal, such as the release of a specific software system.  A process and the process meta-model structure defined in this specification focuses on the lifecycle and the sequencing of work in breakdown structures.  To achieve this it uses the Descriptor concept referencing method content and allowing defining time-specific customizations of the referenced content (e.g. defining a focus on different steps of the same Task and providing input Work Products in different states within the different Phases of a process lifecycle in which the same Task is performed).</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Activity">
-				<xsd:sequence>
-					<xsd:element name="IncludesPattern" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xsd:element name="DefaultContext" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="ValidContext" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DeliveryProcess">
-		<xsd:annotation>
-			<xsd:documentation>A special Process describing a complete and integrated approach for performing a specific project type.  It describes a complete project lifecycle end-to-end and shall be used as a reference for running projects with similar characteristics as defined for the process.  A Delivery Process is related to specific supporting information such as Roadmaps (inherited via Activity) as well as Communications and Education Material.
-A Delivery Process is a Process that covers a whole development lifecycle from beginning to end.  A Delivery Process shall be used as a template for planning and running a project.  It provides a complete lifecycle model with predefined phases, iterations, and activities that have been detailed by sequencing referencing method content in breakdown structures.  It is defined on the basis of experience with past projects or engagements, and/or the best practice use of a development or delivery approach.  It defines what gets produced, how those items are produced, and the required staffing in the form of integrated Work, Work Product, and Team Breakdown Structures.  For example, a process engineer can define alternative Delivery Processes for software development projects that differ in the scale of the engagement and staffing necessary, the type of the software application to be developed, the development methods and technologies to be used, etc.  Although, the Delivery Process aims to cover a whole project it keeps certain decision that are too project specific open.  For example, the breakdown structure defines which Breakdown Elements have multiple occurrences or is repeatable via it respective attributes, but does not say how many occurrences and how many repeats/iterations it will have.  These decisions have to be done by a project manager when planning a concrete project, project phase, or project iterations.  A Delivery Process is always a complete description of a process in terms of completeness of the lifecycle, as well as in terms of all three views on the process which are the Work Breakdown Structure, Work Product Breakdown Structure, and Team Breakdown Structure have to be fully and consistently populated.  Consistency of a Delivery Process is actually ensured by the fact that all three breakdowns are represented by one single data structure and one particular breakdown such as Team Breakdown is just a view on that data structure.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Process">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="CommunicationsMaterial" type="xsd:string"/>
-					<xsd:element name="EducationMaterial" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="CapabilityPattern">
-		<xsd:annotation>
-			<xsd:documentation>A special Process that describes a reusable cluster of doing work in common process areas.  Capabilities Patterns express and communicate process knowledge for a key area of interest such as a Discipline and can be directly used by process practitioner to guide his work.  They are also used as building blocks to assemble Delivery Processes or larger Capability Patterns ensuring optimal reuse and application of the key practices they express.
-A Capability Pattern is a special Process that describes a reusable cluster of doing work in a general process area that provides a consistent development approach to common problems.  Examples for Capability Pattern could be 'use case-based requirements management', 'use case analysis', or 'unit testing'. Typically but not necessarily, Capability Patterns have the scope of one discipline providing a breakdown of reusable complex Activities, relationships to the Roles which perform Tasks within these Activities, as well as to the Work Products that are used and produced.  A capability pattern does not relate to any specific phase or iteration of a development lifecycle, and should not imply any.  In other words, a pattern should be designed in a way that it is applicable anywhere in a Delivery Process.  This enables its Activities to be flexibly assigned to whatever phases there are in the Delivery Process to which it is being applied.  It is a good practice to design a Capability Pattern to produce one or more generic Deliverables.  The typical configuration is that each Activity in the Capability Pattern produces one Deliverable, and the last Task Descriptor in the Activity explicitly outputs just this Deliverable.  This enables the process engineer to select Patterns or just Activities by deciding which Deliverables are required.  It also offers a simple integration approach: an Activity from a capability pattern is linked to the Phase or Iteration which is required to produce the Activity's Deliverable.  Key applications areas of / areas of reuse for Capability Patterns are:
-- To serve as building blocks for assembling Delivery Processes or larger Capability Patterns.  Normally developing a Delivery Process is not done from scratch but by systematically applying and binding patterns.  In addition to the standard pattern application of 'copy-and-modify', which allows the process engineer to individually customize the pattern's content to the particular situation it is applied for, the Plugin meta-model package (Section 6.1) introduces even more sophisticated inheritance relationships that support dynamic binding of patterns (i.e. the pattern is referenced and not copied).  This unique new way of reusing process knowledge allows to factor out commonly reoccurring Activities into patterns and to apply them over and over again for a process.  When the pattern is being revised or updated, all changes will be automatically reflected in all pattern application in all processes because of the dynamic binding.
-- To support direct execution in a development project that does not work following a well-defined process, but works based on loosely connected process fragments of best practices in a flexible manner (e.g. Agile Development).
-- To support process education by describing knowledge for a key area such as best practices on how to perform the work for a Discipline (e.g. Requirements Management), for a specific development technique (aspect-oriented development), or a specific technical area (e.g. relational database design), which is used for education and teaching.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Process"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessPlanningTemplate">
-		<xsd:annotation>
-			<xsd:documentation>A special Process that is prepared for instantiation by a project planning tool.  Typically, it is created based on a Process such as a Delivery Process as a whole (e.g. in case of a waterfall-based development approach) or in parts (e.g. in case of an iterative development approach).
-A Process Planning Template represents a partially finished plan for a concrete project.  It uses the same information structures as all other Process Types to represent templates for project plans.  However, certain planning decisions have already been applied to the template as well as information has been removed and/or reformatted to be ready for export to a specific planning tool.  Examples for such decisions are: a template has been created to represent a plan for a particular Iteration in an iterative development project, which fr example distinguishes early from late iterations in the Elaboration phase of a project; if the targeted planning tool cannot represent input and output of Task, then these have been removed from the structure; certain repetitions have been already applied, e.g. stating that a cycle of specific Task grouped in an Activity have to be repeated n-times; etc.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Process">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="BaseProcess" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessPackage">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Package that contains Process Elements, only.
-A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodPackage">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ProcessElement" type="uma:ProcessElement"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessComponentInterface">
-		<xsd:annotation>
-			<xsd:documentation>Comprises of a list of interface specifications (similar to operation declarations) that express inputs and outputs for a process component.  These interface specifications are expressed using Task Descriptors which are not linked to Tasks that are related to Work Product Descriptors as well as optional a Role Descriptor.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElement">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="InterfaceSpecification" type="uma:TaskDescriptor"/>
-					<xsd:element name="InterfaceIO" type="uma:WorkProductDescriptor"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessComponent">
-		<xsd:annotation>
-			<xsd:documentation>A special Process Package that applies the principles of encapsulation.  A Process Component realizes one or more Interfaces which specify inputs and outputs of the component. There might be many components realizing the same interfaces, but using different techniques to achieve similar outputs for similar inputs.  Whereas the Component Interfaces represent component specifications (black box descriptions of the component), good candidates for component realizations can be found in Capability Patterns (white box descriptions for the component).
-UMA supports replaceable and reusable Process Components realizing the principles of encapsulation. Certain situations in a software development project might require that concrete realizations of parts of the process remain undecided or will be decided by the executing team itself (e.g. in outsourcing situations).  UMA provides a unique component concept defining interfaces for work product input and output, allowing treating the actual definition of the work that produces the outputs as a "black box".  At any point during a project the component "realization" detailing the work can be added to the process.  The component approach also allows that different styles or techniques of doing work can be replaced with one another.  For example, a software code output of a component could be produced with a model-driven development or a code-centric technique.  The component concept encapsulates the actual work and lets the development team choose the appropriate technique and fill the component's realization with their choice of Activities that produce the required outputs.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ProcessPackage">
-				<xsd:sequence>
-					<xsd:element name="Copyright" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="Interface" type="uma:ProcessComponentInterface" minOccurs="0"/>
-					<xsd:element name="Process" type="uma:Process"/>
-				</xsd:sequence>
-				<xsd:attribute name="authors" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Method Unit is being created and owned by an author or authoring team.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="changeDate" type="xsd:dateTime">
-					<xsd:annotation>
-						<xsd:documentation>The date the last change that resulted into this version has been made.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="changeDescription" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>The description of the last change that resulted into this version.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="version" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Package has a version number used to track changes.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="MethodPlugin">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Unit that represents a physical container for Method Packages.  It defines a granularity level for the modularization and organization of method content and processes.  A Method Plugin can extend many other Method Plugins and it can be extended by many Method Plugins.  It can also be used stand-alone, i.e. with no Extension relationship to other plug-ins.
-Method Plugin conceptually represents a unit for configuration, modularization, extension, packaging, and deployment of method content and processes.  A Process Engineer shall design his Plugins and allocate his content to these Plugins with requirements for extensibility, modularity, reuse, and maintainability in mind.
-Special extensibility mechanisms defined for the meta-classes Variability Element and Process Contribution allow Plugin content to directly contribute new content, replace existing content, or to cross-reference to any Content Element or Process within another Plugin that it extends.  Similar to UML 2.0's 'package merge' mechanism transformation interpretations, interpreting these Method Plugin mechanisms results into new extended Method Content and Processes.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodUnit">
-				<xsd:sequence>
-					<xsd:element name="ReferencedMethodPlugin" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xsd:element name="MethodPackage" type="uma:MethodPackage" minOccurs="0" maxOccurs="unbounded"/>
-				</xsd:sequence>
-				<xsd:attribute name="userChangeable" type="xsd:boolean"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:element name="MethodPlugin" type="uma:MethodPlugin">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Unit that represents a physical container for Method Packages.  It defines a granularity level for the modularization and organization of method content and processes.  A Method Plugin can extend many other Method Plugins and it can be extended by many Method Plugins.  It can also be used stand-alone, i.e. with no Extension relationship to other plug-ins.
-Method Plugin conceptually represents a unit for configuration, modularization, extension, packaging, and deployment of method content and processes.  A Process Engineer shall design his Plugins and allocate his content to these Plugins with requirements for extensibility, modularity, reuse, and maintainability in mind.
-Special extensibility mechanisms defined for the meta-classes Variability Element and Process Contribution allow Plugin content to directly contribute new content, replace existing content, or to cross-reference to any Content Element or Process within another Plugin that it extends.  Similar to UML 2.0's 'package merge' mechanism transformation interpretations, interpreting these Method Plugin mechanisms results into new extended Method Content and Processes.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:complexType name="MethodConfiguration">
-		<xsd:annotation>
-			<xsd:documentation>A collection of selected Method Models and MethodPackages. A configuration can be exported into its own standalone library when it includes the full transitive closure of all elements all other elements depend on.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodUnit">
-				<xsd:sequence>
-					<xsd:element name="BaseConfiguration" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xsd:element name="MethodPluginSelection" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xsd:element name="MethodPackageSelection" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xsd:element name="DefaultView" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="ProcessView" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:element name="MethodConfiguration" type="uma:MethodConfiguration">
-		<xsd:annotation>
-			<xsd:documentation>A collection of selected Method Models and MethodPackages. A configuration can be exported into its own standalone library when it includes the full transitive closure of all elements all other elements depend on.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:complexType name="MethodLibrary">
-		<xsd:annotation>
-			<xsd:documentation>A Method Library is a physical container for Method Plugins and Method Configuration definitions.  All Method Elements are stored in a Method Library.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodUnit">
-				<xsd:sequence>
-					<xsd:element name="MethodPlugin" type="uma:MethodPlugin" minOccurs="0" maxOccurs="unbounded"/>
-					<xsd:element name="MethodConfiguration" type="uma:MethodConfiguration" minOccurs="0" maxOccurs="unbounded"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:element name="MethodLibrary" type="uma:MethodLibrary">
-		<xsd:annotation>
-			<xsd:documentation>A Method Library is a physical container for Method Plugins and Method Configuration definitions.  All Method Elements are stored in a Method Library.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-</xsd:schema>
diff --git a/plugins/org.eclipse.epf.xml.uma/src/model/EPF_Schema_200609071334.xsd b/plugins/org.eclipse.epf.xml.uma/src/model/EPF_Schema_200609071334.xsd
deleted file mode 100755
index cc09ff2..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/model/EPF_Schema_200609071334.xsd
+++ /dev/null
@@ -1,1403 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- EPF UMA XML Data Interchange Schema -->
-<xsd:schema targetNamespace="http://www.eclipse.org/epf/uma/1.0.3" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:uma="http://www.eclipse.org/epf/uma/1.0.3">
-	<xsd:simpleType name="WorkOrderType">
-		<xsd:annotation>
-			<xsd:documentation>Represents a relationship between two Breakdown Element in which one Breakdown Element depends on the start or finish of another Breakdown Element in order to begin or end. This enumeration defines the different types of Work Order relationships available in UMA and is used to provide values for Work Order's linkType attribute.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NCName">
-			<xsd:enumeration value="finishToStart"/>
-			<xsd:enumeration value="finishToFinish"/>
-			<xsd:enumeration value="startToStart"/>
-			<xsd:enumeration value="startToFinish"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="VariabilityType">
-		<xsd:annotation>
-			<xsd:documentation>An Enumeration used for values for instances of Variability Element's attribute variabilityType.  It defines the nature of how a Variability Element extends another Variability Element. See enumeration literals for definitions for each type.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NCName">
-			<xsd:enumeration value="na"/>
-			<xsd:enumeration value="contributes"/>
-			<xsd:enumeration value="extends"/>
-			<xsd:enumeration value="replaces"/>
-			<xsd:enumeration value="localContribution"/>
-			<xsd:enumeration value="localReplacement"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:complexType name="Element">
-		<xsd:annotation>
-			<xsd:documentation>A UML 2.0 meta-class Element.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:complexType>
-	<xsd:complexType name="NamedElement">
-		<xsd:annotation>
-			<xsd:documentation>A UML 2.0 meta-class Named Element.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Element">
-				<xsd:attribute name="name" type="xsd:string"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="PackageableElement">
-		<xsd:annotation>
-			<xsd:documentation>A UML 2.0 meta-class Packagable Element.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:NamedElement"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="MethodElement">
-		<xsd:annotation>
-			<xsd:documentation>The root generalization for all UMA Method Elements.  Defines a common set of attributes inherited by all UMA Method Elements.  Method Element itself is derived from Packageable Element from the UML 2.0 Infrastructure.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:PackageableElement">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="OwnedRule" type="uma:Constraint">
-						<xsd:annotation>
-							<xsd:documentation>Defines the packaging rules for this Method Element.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:choice>
-				<xsd:attribute name="id" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every instance of Method Element has a global unique id.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="briefDescription" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every instance of Method Element shall be briefly described with one or two sentences summarizing the element.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="suppressed" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>If a Variability Element is derived from another Variability Element using the "extends" Variability Specialization, then this attribute can be used to suppress inherited Method Elements that were part of the based-on Variability Element, which can be any type of Method Element.  In other words, if this attribute is set to true on a Method Element that has the same name than an inherited method element then it will not be regarded as inherited at all.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="orderingGuide" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Used for CASE tool realizations of this model to contain information about layout and ordering of the method element and its parts.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Constraint">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Method Element that represents a condition or restriction expressed in natural language text or in a machine readable language for the purpose of declaring some of the semantics of a Method Element.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:attribute name="mainDescription" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Stores the main definition of the constraint.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Section">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Element that represents structural subsections of a Content Description's sectionDescription attribute.  It is used for either large scale documentation of Content Elements organized into sections as well as to flexibly add new Sections to Content Elements using contribution variability added to the Section concept for Method Plug-ins.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:sequence>
-					<xsd:element name="SubSection" type="uma:Section" minOccurs="0"/>
-					<xsd:element name="Predecessor" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="Description" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>This attributes store the description text for a Content Description's Section.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-				<xsd:attribute name="sectionName" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Section has a name used for external presentation of the section, e.g. when published or when section heading are listed in a table of contents.  This attribute is similar to Presentation Name for Content Elements.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="predecessor" type="xsd:string"/>
-				<xsd:attribute name="variabilityType" type="uma:VariabilityType"/>
-				<xsd:attribute name="variabilityBasedOnElement" type="xsd:string"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="MethodUnit">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Element that shall be maintained in a Method Library as a separate unit of control.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:sequence>
-					<xsd:element name="Copyright" type="xsd:string" minOccurs="0"/>
-				</xsd:sequence>
-				<xsd:attribute name="authors" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Method Unit is being created and owned by an author or authoring team.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="changeDate" type="xsd:dateTime">
-					<xsd:annotation>
-						<xsd:documentation>The date the last change that resulted into this version has been made.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="changeDescription" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>The description of the last change that resulted into this version.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="version" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Package has a version number used to track changes.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ContentDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Method Element that is used to store the textual description for a Content Element.  It defines standard attributes applicable for all Content Element types.  Specific Content Element sub-types can define their own matching Content Description sub-types. </xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodUnit">
-				<xsd:sequence>
-					<xsd:element name="MainDescription" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Stores the main descriptive text for the Content Element.  All text that is not part of any of the more specific attributes shall be stored here.  If the Content Description is divided into sections using the Section class, then only the text from the 'start' of the content description to the first section will be stored here (similar to a normal document where you can place text between its beginning to its first diction heading).</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="KeyConsiderations" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Provides advise and guidance of a critical nature for the content element as well as warnings, cautions, pitfalls, dangers.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Section" type="uma:Section" minOccurs="0" maxOccurs="unbounded"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="GuidanceDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Guidance.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:choice minOccurs="0">
-					<xsd:element name="Attachment" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>This field is primarily used for attachments augmenting the information provided for guidance.  In particular the attribute is used for Templates, Examples, and Reusable Assets to contain the actual attachment described in the mainDescription.  It can additionally contain representations of the guidance in just a third party format, e.g. PDF, MS Word, or Word Perfect.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="PracticeDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Practice.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:sequence>
-					<xsd:element name="AdditionalInfo" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Any additional Information not covered by the other attributes.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Application" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Describes how the Practice is being applied or introduced into the context described in background.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Background" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Elaboration on the background and the context in which the problem occurs and where the solution described by this Practice will fit in.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Goals" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>A summary of the overall goals to be addressed by the Practice.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="LevelsOfAdoption" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Outlines the different forms or variants in which the practice could be realized. (e.g. full adoption verus a partial adoption of the Practice)</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Problem" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>A description of the problem the Practice addresses.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkProductDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Work Product.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:sequence>
-					<xsd:element name="ImpactOfNotHaving" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Describes the consequences of not producing the work product.  This is intended to aid in the tailoring the method/process to the needs of a specific project.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Purpose" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Describes why the work product is produced and to what use it will be put.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="ReasonsForNotNeeding" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Describes the circumstances in which it is reasonable not to produce the work product.  This is intended to aid in the tailoring of the method/process to the needs of a specific project.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-				<xsd:attribute name="externalId" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>An external visible number that is used to reference this artifact. Used like a synonym.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ArtifactDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Work Product Description that is used to store the textual description for an Artifact.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkProductDescription">
-				<xsd:sequence>
-					<xsd:element name="BriefOutline" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Provides a brief description of the information that can be found in this artifact. For example, discusses the contents for key chapters of a document artifact or the key packages and modules of a model artifact.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="RepresentationOptions" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Discusses different possible alternative representations for the artifact. For example a design model can be represented as a UML model or an informal block diagram or by textual description only.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DeliverableDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Work Product Description that is used to store the textual description for a Deliverable.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkProductDescription">
-				<xsd:sequence>
-					<xsd:element name="ExternalDescription" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>The description of the Deliverable used for client documents (proposal, statements of work or contractual agreements).  It might use a different language and follow legal constraints.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="PackagingGuidance" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Provides guidance on how to assemble the deliverable from all its required inputs.  This section describes the most common content medium and format.  Distribution of the deliverable is addressed in this section, if necessary.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="RoleDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Role.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:sequence>
-					<xsd:element name="AssignmentApproaches" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Provides guidance on for assigning individuals to the Role in terms of what other roles these individuals could perform and what responsibility different individuals assigned to this role might have.  The guidance can also describe different assignment approaches for different types of projects, e.g. for large versus small teams where individuals could be allocated to roles full time versus sharing roles within the team.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Skills" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Lists of set of required skills a person needs to possess to fulfill that Role.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Synonyms" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Lists synonyms, i.e. other names the Role might be referred by.  Tool support for the meta-model might support that a Role name can be consistently be replaced with one of its synonyms throught a Process.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="TaskDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Task.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:sequence>
-					<xsd:element name="Alternatives" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Comprises of summaries describing important exceptional and non-standard ways of achieving this Task's development goals that were not covered by the Task's Steps.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Purpose" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Summarizes the main reason for performing this Task and what is intended to be achieved.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DescribableElement">
-		<xsd:annotation>
-			<xsd:documentation>An abstract generalization of Method Elements for which external presentation names as well as content descriptions have been defined, such as Roles or Work Products.  Presentation Name and Content Descriptions are typically localized using a resource allocation mechanism for its String type attributes.
-This abstraction represents all elements in the Method Content as well as Process space for which concrete textual descriptions are defined in the form of documenting attributes grouped in a matching Content Description instance.  Describable Elements are intended to be published in method or process publications (similar to the IBM Rational Unified Process web).  Describable Element defines that the element it represents will have content 'attached' to it.  Content Description is the abstraction for the actual places in which the content is being represented.  This separation allows a distinction between core method model elements describing the structure of the model from the actual description container providing, for example, the documentation of the content element in different alternatives languages, audiences, licensing levels, etc.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:choice minOccurs="0">
-					<xsd:element name="Presentation" type="uma:ContentDescription"/>
-				</xsd:choice>
-				<xsd:attribute name="presentationName" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Describable Element has a presentation name, which is used for external presentation of the element.  For example, name (the internal representation) might be set to "rup_architecture_document" to differentiate from a "j2ee_architcture_document" whereas the external presentation would always be "Architecture Document".</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="shapeicon" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>A reference to an icon that can be used for modeling with specific Content Element instances (as graphical stereotypes, e.g. a use case symbol for a use case artifact) as well as publication of content.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="nodeicon" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>A reference to an icon that can be used in tree browser presentations and breakdown structures.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ContentElement">
-		<xsd:annotation>
-			<xsd:documentation>A Describable Element that represents an abstract generalization for all elements that are considered to be and managed as Method Content.
-Content Elements represents reusable Method Content that is supposed to be managed in Content Packages.  The separation of Content Element from Process Element allows to clearly distinguish between pure method content from content that is represented in processes.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:DescribableElement">
-				<xsd:sequence>
-					<xsd:choice minOccurs="0" maxOccurs="unbounded">
-						<xsd:element name="Checklist" type="xsd:string"/>
-						<xsd:element name="Concept" type="xsd:string"/>
-						<xsd:element name="Example" type="xsd:string"/>
-						<xsd:element name="Guideline" type="xsd:string"/>
-						<xsd:element name="ReusableAsset" type="xsd:string"/>
-						<xsd:element name="SupportingMaterial" type="xsd:string"/>
-						<xsd:element name="Whitepaper" type="xsd:string"/>
-					</xsd:choice>
-				</xsd:sequence>
-				<xsd:attribute name="variabilityType" type="uma:VariabilityType"/>
-				<xsd:attribute name="variabilityBasedOnElement" type="xsd:string"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Guidance">
-		<xsd:annotation>
-			<xsd:documentation>Guidance is an abstract generalization of additional information related to content elements such as Roles, Tasks, and Work Products.  Examples for Guidance are Guidelines, Templates, Checklists, Tool Mentors, Estimates, Supporting Materials, Reports, Concepts, etc.  This package only contains the definition of the abstract Guidance class.  The package Guidance Types defines concrete guidance types.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentElement"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Concept">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that outlines key ideas associated with basic principles underlying the referenced item. Concepts normally address more general topics than Guidelines and span across sev-eral work product and/or tasks/activities.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Checklist">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that identifies a series of items that need to be completed or veri-fied.  Checklists are often used in reviews such as walkthroughs or inspections. </xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Example">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of Guidance that represents a typical, partially completed, sample instance of one or more work products or scenario like descriptions of how Task may be performed. Examples can be related to Work Products as well as Tasks that produce them as well as any other Content Element.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Guideline">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that provides additional detail on how to perform a particular task or grouping of tasks (e.g. grouped together as activities) or that provides additional detail, rules, and recommendations on work products and their properties.  Amongst others, it can include details about best practices and different approaches for doing work, how to use particular types of work products, information on different subtypes and variants of the work product and how they evolve throughout a lifecycle, discussions on skills the performing roles should acquire or improve upon, measurements for progress and maturity, etc.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Estimate">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of Guidance that provides sizing measures, or standards for sizing the work effort associated with performing a particular piece of work and instructions for their successful use. It may be comprised of estimation considerations and estimation metrics.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="EstimationMetric" type="xsd:string"/>
-					<xsd:element name="EstimationConsiderations" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="EstimatingMetric">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of Guidance that describes a metric or measure that is associated with an element and which is used to calculate the size of the work effort as well as a range of potential labor.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="EstimationConsiderations">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of Guidance that qualifies the usage and application of estimation metrics in the development of an actual estimate.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Roadmap">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of Guidance which is only related to Activates and therefore has been added by this package to the list of Guidance Types rather than listed in the Guidance Types package.  A Roadmap represents a linear walkthrough of an Activity, typically a Process.
-An instance of a Roadmap represents important documentation for the Activity or Process it is related to.  Often a complex Activity such as a Process can be much easier understood by providing a walkthrough with a linear thread of a typical instantiation of this Activity.  In addition to making the process practitioner understand how work in the process is being performed, a Roadmap provides additional information about how Activities and Tasks relate to each other over time.  Roadmaps are also used to show how specific aspects are distributed over a whole process providing a kind of filter on the process for this information.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Report">
-		<xsd:annotation>
-			<xsd:documentation>A predefined template of a result that is generated on the basis of other work products as an output from some form of tool automation. An example for a report would be a use case model survey, which is generated by extracting diagram information from a graphical model and textual information from documents and combines these two types of information into a report.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Template">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that provides for a work product a pre-defined table of contents, sections, packages, and/or headings, a standardized format, as well as descriptions how the sections and packages are supposed to be used and completed. Templates cannot only be provided for documents, but also for conceptual models or physical data stores.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="SupportingMaterial">
-		<xsd:annotation>
-			<xsd:documentation>A catchall for other types of guidance not specifically defined elsewhere. It can be related to all kinds of Content Elements, i.e. including other guidance elements.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ToolMentor">
-		<xsd:annotation>
-			<xsd:documentation>A  specific type of guidance that shows how to use a specific tool to accomplish some piece of work a Work Product either in the context of or independent from a Task or Activity.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Whitepaper">
-		<xsd:annotation>
-			<xsd:documentation>A special Concept guidance that have been externally reviewed or published and can be read and understood in isolation of other content elements and guidance.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Concept"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="TermDefinition">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that defines concepts and are used to build up the Glossary. TermDefinitions are not directly related to ContentElements, but their relationship is being derived when the Term is used in the ContentElements description text.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Practice">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that represents a proven way or strategy of doing work to achieve a goal that has a positive impact on work product or process quality.  Practices are defined orthogonal to methods and processes.  They could summarize aspects that impact many different parts of a method or specific processes.  Examples for practices would be "Manage Risks", "Continuously verify quality", "Architecture-centric and component-based development", etc.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ActivityReference" type="xsd:string"/>
-					<xsd:element name="ContentReference" type="xsd:string"/>
-					<xsd:element name="SubPractice" type="uma:Practice"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ReusableAsset">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that provides a solution to a problem for a given context. The asset may have a variability point, which is a location in the asset that may have a value provided or customized by the asset consumer. The asset has rules for usage which are the instructions describing
-how the asset should be used.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkProduct">
-		<xsd:annotation>
-			<xsd:documentation>An abstract class which provides a generalization for the content element types Artifact, Outcome, and Deliverable.  The meta-model class Work Product actually represents work product types, i.e. an instance of Work Product is a description of a specific type of work product and not an individual work product instance.  However, for simplicity reasons and because of low risk of misinterpretation we did not append the word 'type' to every meta-class.
-A work product is an abstraction for descriptions of content elements that are used to define anything used, produced, or modified by a task.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentElement">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="Estimate" type="xsd:string"/>
-					<xsd:element name="EstimationConsiderations" type="xsd:string"/>
-					<xsd:element name="Report" type="xsd:string"/>
-					<xsd:element name="Template" type="xsd:string"/>
-					<xsd:element name="ToolMentor" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Artifact">
-		<xsd:annotation>
-			<xsd:documentation>A Work Product that provides a description and definition for tangible work product types. Artifacts may be composed of other artifacts. For example, a model artifact can be composed of model elements, which are also artifacts.
-Artifacts are tangible work products consumed, produced, or modified by Tasks.  It may serve as a basis for defining reusable assets.  Roles use Artifacts to perform Tasks and produce Artifacts in the course of performing Tasks.  Artifacts are the responsibility of a single Role, making responsibility easy to identify and understand, and promoting the idea that every piece of information produced in the method requires the appropriate set of skills. Even though one role might "own" a specific type of Artifacts, other roles can still use the Artifacts; perhaps even update them if the Role has been given permission to do so.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkProduct">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ContainedArtifact" type="uma:Artifact"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Deliverable">
-		<xsd:annotation>
-			<xsd:documentation>A Work Product that provides a description and definition for packaging other Work Products, and may be delivered to an internal or external party.  Therefore, a Deliverable aggregates other Work Products. Therefore, a Deliverable aggregates other Work Products.  A Deliverable is used to pre-define typical or recommended content in the form or work products that would be packaged for delivery.  The actual packaging of the Deliverable in an actual process or even project could be a modification of this recommendation.  Deliverables are used to represent an output from a process that has value, material or otherwise, to a client, customer or other stakeholder. </xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkProduct">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="DeliveredWorkProduct" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Outcome">
-		<xsd:annotation>
-			<xsd:documentation>A Work Product that describes intangible work products that are a result or state. Outcomes may also be used to describe work products that are not formally defined.  A key differentiator for outcomes against artifacts is that outcomes are not candidates for harvesting as reusable assets.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkProduct"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Role">
-		<xsd:annotation>
-			<xsd:documentation>A Content Element that defines a set of related skills, competencies, and responsibilities.  Roles are used by Tasks to define who performs them as well as define a set of work products they are responsible for.  
-A Role defines a set of related skills, competencies, and responsibilities of an individual or a set of individuals.  Roles are not individuals or resources.  Individual members of the development organization will wear different hats, or perform different roles. The mapping from individual to role, performed by the project manager when planning and staffing for a project, allows different individuals to act as several different roles, and for a role to be played by several individuals.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentElement">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ResponsibleFor" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Task">
-		<xsd:annotation>
-			<xsd:documentation>A Content Element that describes work being performed by Roles.  It defines one default performing Role as well as many additional performers.  A Task is associated to input and output work products.  Inputs are differentiated in mandatory versus optional inputs.  The associations to Work Products are not instantiatable/variable-like parameters.  They rather express (hyper-)links to the descriptions of the work products types that are related to the Task as inputs and outputs.  In other words, these associations are not intended to be used to capture which concrete instances will be passed when instantiating the method in a project.  All of the Task's default associations can be overridden in an actual process definition.
-A Task describes an assignable unit of work.  Every Task is assigned to specific Roles.  The granularity of a Task is generally a few hours to a few days.  It usually affects one or only a small number of work products. A Task is used as an element of defining a process. Tasks are further used for planning and tracking progress; therefore, if they are defined too fine-grained, they will be neglected, and if they are too large, progress would have to be expressed in terms of a Task's parts (e.g. Steps, which is not recommended). 
-A Task has a clear purpose in which the performing roles achieve a well defined goal.  It provides complete step-by-step explanations of doing all the work that needs to be done to achieve this goal.  This description is complete, independent of when in a process lifecycle the work would actually be done.  It therefore does not describe when you do what work at what point of time, but describes all the work that gets done throughout the development lifecycle that contributes to the achievement of this goal.  When the Task is being applied in a process then this process application (defined as Task Descriptor) provides the information of which pieces of the Task will actually be performed at any particular point in time. This assumes that the Task will be performed in the process over and over again, but each time with a slightly different emphasis on different steps or aspects of the task description. 
-For example, a Task such as "Develop Use Case Model" describes all the work that needs to be done to develop a complete use case model. This would comprise of the identification and naming of use cases and actors, the writing of a brief description, the modeling of use cases and their relationships in diagrams, the detailed description of a basic flow, the detailed description of alternatives flows, performing of walkthroughs workshops and reviews, etc.  All of these parts contribute to the development goal of developing the use case model, but the parts will be performed at different points in time in a process.  Identification, naming, and brief descriptions would be performed early in a typical development process versus the writing of detailed alternative flows which would be performed much later.  All these parts or steps within the same Task define the "method" of Developing a Use Case Model.  Applying such a method in a lifecycle (i.e. in a process) is defining which steps are done when going from one iteration to the next.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentElement">
-				<xsd:sequence>
-					<xsd:element name="Precondition" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="Postcondition" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="PerformedBy" type="xsd:string" minOccurs="0"/>
-					<xsd:choice minOccurs="0" maxOccurs="unbounded">
-						<xsd:element name="MandatoryInput" type="xsd:string"/>
-						<xsd:element name="Output" type="xsd:string"/>
-						<xsd:element name="AdditionallyPerformedBy" type="xsd:string"/>
-						<xsd:element name="OptionalInput" type="xsd:string"/>
-						<xsd:element name="Estimate" type="xsd:string"/>
-						<xsd:element name="EstimationConsiderations" type="xsd:string"/>
-						<xsd:element name="ToolMentor" type="xsd:string"/>
-					</xsd:choice>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkDefinition">
-		<xsd:annotation>
-			<xsd:documentation>An abstract Method Element that generalizes all descriptions of work within the Unified Method Architecture.  This package introduces two concrete types of Work Definitions: Task and Step.  Work Definitions can contain sets of pre- and post-conditions defining constraints that need to be valid before the described work can begin or before it can be declared as finished.  Note that general ownedRules can be used to define additional constraints and rules for Work Definitions.
-Work Definitions represent behavioral descriptions for doing work.  These behavioral descriptions are not bound to one specific classifier, but represent an arbitrary definition of work.  For example, a Work Definition could represent work that is being performed by a specific Role (e.g. a Role performing a specific Task or Steps of a Task), by many Roles working in close collaboration (many Roles all working together on the same interdisciplinary Task), or complex work that is performed throughout the lifecycle (e.g. a process defining a breakdown structure for organizing larger composite units of work performed by many Roles working in collaboration).</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:sequence>
-					<xsd:element name="Precondition" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="Postcondition" type="xsd:string" minOccurs="0"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ContentCategory">
-		<xsd:annotation>
-			<xsd:documentation>An abstract class generalizing content category types.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentElement"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Discipline">
-		<xsd:annotation>
-			<xsd:documentation>A categorization of work (i.e. Tasks for Method Content), based upon similarity of concerns and cooperation of work effort.
-A discipline is a collection of Tasks that are related to a major 'area of concern' within the overall project. The grouping of Tasks into disciplines is mainly an aid to understanding the project from a 'traditional' waterfall perspective. However, typically, for example, it is more common to perform certain requirements activities in close coordination with analysis and design activities. Separating these activities into separate disciplines makes the activities easier to comprehend.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="Task" type="xsd:string"/>
-					<xsd:element name="SubDiscipline" type="uma:Discipline"/>
-					<xsd:element name="ReferenceWorkflow" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DisciplineGrouping">
-		<xsd:annotation>
-			<xsd:documentation>Used to group Disciplines.  For example, the Discipline Grouping "Software Disciplines" would be the group of all disciplines related to developing software such as "Requirements Management" or "Testing"; "IT Infrastructure Management" would be a Disciplines Grouping for disciplines such as "IT Operational Services", "IT Customer Relationships", or "IT Enabling Services".  Disciplines can be associated to more than one Discipline Grouping.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="Discipline" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Domain">
-		<xsd:annotation>
-			<xsd:documentation>A refineable hierarchy grouping related work products.  In other words, Domains can be further divided into sub-domains, with work product elements to be categorized only at the leaf-level of this hierarchy.
-Domain is a logical grouping of work products that have an affinity to each other based on resources, timing, or relationship.  A Domain may be divided into subdomains.  For example, GS Method uses six predefined Domains for Work Products: Application, Architecture, Business, Engagement, Operations and Organization.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="WorkProduct" type="xsd:string"/>
-					<xsd:element name="Subdomain" type="uma:Domain"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="RoleSet">
-		<xsd:annotation>
-			<xsd:documentation>Organizes Roles into categories.  It is used to group roles together that have certain commonalities.  For example, the "Analysts" Role Set could group the "Business Process Analyst", "System Analyst", as well as "Requirements Specifier" roles.  All of these work with similar techniques and have overlapping skills, but are required as distinct roles for a method (e.g. the method the IBM Rational Unified Process is based on).</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="Role" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="RoleSetGrouping">
-		<xsd:annotation>
-			<xsd:documentation>Role Sets can be categorized into Role Set Groupings.  For example, different methods might define similar Role Sets, which however need to be distinguished from each other on a global scale.  Thus, Role Set Groupings allow distinguishing, for example, Software Services Manager Role Sets from Software Development Organization Manager Role Sets.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="RoleSet" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Tool">
-		<xsd:annotation>
-			<xsd:documentation>A container/aggregate for ToolMentors.  It can also provide general descriptions of the tool and its general capabilities.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ToolMentor" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkProductType">
-		<xsd:annotation>
-			<xsd:documentation>A second category for work products, which in contrast to Domain is more presentation oriented.  A work product can have many Work Product Types.  Examples, for a Work Product Type is "Class Diagram", which categorizes the Artifacts Analysis Model, Design Model, User Experience Model, or "Specification", which categorizes requirements specifications that define a system with a well-defined system boundary, such as use case or functional requirements specification.  A Work Product can be categorized to be of many Work Product Types.  For example, a use case model can be categorized as a Specification as well as Diagram Work Product Type.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="WorkProduct" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="CustomCategory">
-		<xsd:annotation>
-			<xsd:documentation>A category introduced by a method content author to structure any number of method Content Elements of any subtype based on user-defined criteria.  Because Content Categories (and therefore Custom Categories, too) are Content Elements themselves, Custom Categories can be used to recursively categorize Content Categories as well.  Custom Categories can also be nested with any Content Category.  Custom categories can be used to categorize content based on the user's criteria as well as to define whole tree-structures of nested categories allowing the user to systematically navigate and browse method content and processes based on these categories.  For example, one could create a custom category to logically organize content relevant for the user's development organization departments; e.g. a "Testing" category that groups together all roles, work products, tasks, and guidance element relevant to testing.  Another example would be categories that express licensing levels of the content grouping freely distributable method content versus content that represent intellectual property and requires a license to be purchased to be able to use it.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="CategorizedElement" type="xsd:string"/>
-					<xsd:element name="SubCategory" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="MethodPackage">
-		<xsd:annotation>
-			<xsd:documentation>An abstract class for packaging Method Elements.  All Method Elements shall be located in exactly one of Method Package's concrete specializations (e.g. Content Package).   Method Package defines common properties for all of its specializations. Elements are organized in Method Packages to structure large scale of method content and processes as well as to define a mechanism for reuse.  Method Elements from one package can reuse element from other packages by defining a reusedPackages link.  For example, a work product defined in one package can be used as an input for Tasks defined in other packages.  By reusing it from one common place (i.e. the package in which it has been defined) ensures that no redundant definitions of the same elements are required.  Also maintenance of method content is greatly improved as changes can be performed in only one place.  Note, that other packages will introduce more specializations of Method Package, e.g. Process Package and Process Component.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ReusedPackage" type="xsd:string"/>
-					<xsd:element name="MethodPackage" type="uma:MethodPackage"/>
-				</xsd:choice>
-				<xsd:attribute name="global" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>Method Packages can have a global scope.  This means that every element of every other Method Package can see the global package's contents.  Global Method Packages are primarily used to store commonly used category definitions such as for Disciplines or Domains, which are used by many Task and Work Products respectively.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ContentPackage">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Package that contains Content Elements and Content Elements, only.  Examples for Content Element are Artifacts, Tasks, Roles, etc.  A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodPackage">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ContentElement" type="uma:ContentElement"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ContentCategoryPackage">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Package that only contains Content Category Elements.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodPackage">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ContentCategory" type="uma:ContentCategory"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessElement">
-		<xsd:annotation>
-			<xsd:documentation>A Describable Element that represents an abstract generalization for all elements defined in the Process package.
-Process Elements represents Process specific elements that are supposed to be managed in Process Packages.  The separation of Process Element from Content Element allows to clearly distinguish between pure method content from content that is represented in processes. </xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:DescribableElement"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="PlanningData">
-		<xsd:annotation>
-			<xsd:documentation>A Process Element that adds planning data to Breakdown Elements when it is used for a Process Planning Template.  For Delivery Processes and Capability Patterns this class can either not be instantiated or populated with default data.
-Planning Data factors out specific optional data needed for representing planning templates.  This association allows to access planning data if it is stored for the Breakdown Element.
-(NOTE, THE ATTRIBUTES FOR THIS CLASS ARE NOT COMPLETE, YET)</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ProcessElement">
-				<xsd:attribute name="startDate" type="xsd:dateTime">
-					<xsd:annotation>
-						<xsd:documentation>The default start date for a planed Task.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="finishDate" type="xsd:dateTime">
-					<xsd:annotation>
-						<xsd:documentation>The default finish date for a planed Task.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="rank" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>The default rank for a planed Task.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="BreakdownElement">
-		<xsd:annotation>
-			<xsd:documentation>An abstract generalization for any type of Method Element that is part of a breakdown structure.  It defines a set of properties available to all of its specializations.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ProcessElement">
-				<xsd:sequence>
-					<xsd:element name="PresentedAfter" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="PresentedBefore" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="PlanningData" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="SuperActivity" type="xsd:string" minOccurs="0"/>
-				</xsd:sequence>
-				<xsd:attribute name="prefix" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Prefix represents an additional label that will be presented as a prefix to any Breakdown Element to indicate a user-defined sub-type for the element.  For example, if the process engineer would like to distinguish his Activities by 'Module' (as done in the IBM Rational Summit Ascendant Method), he can define a different prefix for every model to be used in addition to naming Activities, e.g. "SRA.Establish Requirements" with SRA indicating that this Activity belongs to the "Software Requirements Analysis" module.  Another common application for prefix is to qualify roles in Role Descriptors.  For example, "Customer.Architect" would define a "Customer" prefix for the Role Descriptor "Architect" expressing that this is an architect on the customer side and not the development team side.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="isPlanned" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>A key application for Development Processes expressed with Breakdown structures is to generate a project plan from it.  A process as defined in UMA (cf. with Sections XX and 5.2) is a multi-dimensional structure defining what work is being performed at what time by which roles using which input and producing what outputs.  A project plan as it is represented in project planning tools such as IBM Rational Portfolio Manager or Microsoft Project normally does not need all this information and is normally limited to just representing a subset.  For example, a typical MS Project plan only represents the work breakdown consisting of Tasks and Activities (sometimes referred to as summary tasks).  It does not show the input and output Work Products for a Task, but it can show which roles shall be staffed for performing the Task.  However, such role allocation need to be replaced with concrete resources when instantiating the plan for a concrete project.  Sometimes project plans can then again be organized differently by organizing work by deliverables in which Work Products are mapped to the plan's summary tasks and Task that have these work products as output mapped below such as summary task.  Therefore, a process can make recommendations about which elements to include and which to exclude when generating a plan.  When the isPlanned attribute is set to False for an instance of a Breakdown Element, then this element shall not be not included when a concrete project plan is being generated from the breakdown structure that contains this element.
-</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="hasMultipleOccurrences" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>Just as the isPlanned attribute the hasMultipleOccurrences attribute has an impact on generating plans from a Process.  When this attribute is set to True for a Breakdown Element then it will typically occur multiple times within the same Activity.  For example, a Task such as "Detail Use Case" would be performed for every use case identified for a particular Iteration or Activity.  Generating a plan would list one Task instance per use case.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="isOptional" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>Indicates that the Breakdown Element describes work, a work result, or even work resources, which inclusion is not mandatory when performing a project that is planned based on a process containing this element.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkOrder">
-		<xsd:annotation>
-			<xsd:documentation>Represents a relationship between two Breakdown Elements in which one Breakdown Elements depends on the start or finish of another Breakdown Elements in order to begin or end.  
-The Work Order class defines predecessor and successor relations amongst Breakdown Elements.  This information is in particular critical for planning applications.  See more details on different types of Work Order relationships at Work Order Type.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attribute name="id" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Defines a global unique id for a work order.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="linkType" type="uma:WorkOrderType">
-					<xsd:annotation>
-						<xsd:documentation>This attribute expresses the type of the Work Order relationship by assigning a value from the Work Order Type enumeration.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkBreakdownElement">
-		<xsd:annotation>
-			<xsd:documentation>A special Breakdown Element that provides specific properties for Breakdown Elements that represent or refer to Work Definitions.  For example its subclass Activity defines work as it is also a subclass of Work Definition.  Its subclass Task Descriptor does not define work by itself, but refers to a Work Definition and therefore can have the same common properties and Work Breakdown Element has.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElement">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="Predecessor" type="uma:WorkOrder"/>
-				</xsd:choice>
-				<xsd:attribute name="isRepeatable" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>This attribute is used to define repetition of work, e.g. iterations.  A Process Work Definition with this attribute set to True shall be repeated more than once on the same set of artifacts.  For example, for an instance of Iteration (defined as a special Process Work Definition below) this attribute is set to True by default indicating that every sub-Activity will be repeated more than once.  However, any Process Work Definition can set this attribute to True to define iterations (e.g. to iterate one Activity consisting of many sub-activities or even Phases, but to iterate just one Task).</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="isOngoing" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>If the isOngoing attribute is set to True for a Process Work Definition instance, then the element describes an ongoing piece of work without a fixed duration or end state.  For example, the Process Work Definition could represent work of an administrator continuously (e.g. 3h a day) working to ensure that systems are kept in a certain state.  Another example would be program management work overseeing many different projects being scheduled for one particular project at specific reoccurring intervals during the whole lifecycle of the project.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="isEventDriven" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>The isEventDriven attribute indicates that the Process Work Definition describes an instance of work which is not started because it has been scheduled to start at a certain point of time, because preceding work is being completed, or input work products are available, but because another specific event has occurred.  Examples for such events are exceptions or problem situations which require specific work to be performed as a result.  Also change management work can be modeled as event driven work analyzing a change request or defect and allocating work dynamically to resources to deal with it following the work described with such Process Work Definition.  The events themselves are not modeled in this version of the specification.  They shall be described as part of the normal descriptions fields available.
-</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Milestone">
-		<xsd:annotation>
-			<xsd:documentation>A special Breakdown Element that describes a significant event in a development project, such as a major decision, completion of a deliverable, or meeting of a major dependency (like completion of a project phase).  Because, Milestone is commonly used to refer to both the event itself and the point in time at which the event is scheduled to happen, it is modeled as a Breakdown Element (i.e. it appears as part of a breakdown structure).</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkBreakdownElement"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Activity">
-		<xsd:annotation>
-			<xsd:documentation>A Work Breakdown Element and Work Definition which supports the nesting and logical grouping of related Breakdown Elements forming breakdown structures.  Although Activity is a concrete meta-class, other classes which represent breakdown structures derive from it; such as Phase, Iteration, Delivery Process, or Capability Pattern.
-Activity represents a grouping element for other Breakdown Elements such as Activities, Descriptors, Milestones, etc.  It is not per-se a 'high-level' grouping of only work as in other meta-models, but groups any kind of Breakdown Elements.  For example, one can define valid Activities that group only Work Products Descriptors without any matching Task Descriptors.  Activities also inherit all properties from Work Breakdown Element and indirectly from Process Element; i.e. Activity is ready to have a full content description attached to it.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkBreakdownElement">
-				<xsd:sequence>
-					<xsd:element name="Precondition" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="Postcondition" type="xsd:string" minOccurs="0"/>
-					<xsd:choice minOccurs="0" maxOccurs="unbounded">
-						<xsd:element name="BreakdownElement" type="uma:BreakdownElement"/>
-						<xsd:element name="Checklist" type="xsd:string"/>
-						<xsd:element name="Concept" type="xsd:string"/>
-						<xsd:element name="Example" type="xsd:string"/>
-						<xsd:element name="Guideline" type="xsd:string"/>
-						<xsd:element name="Roadmap" type="xsd:string"/>
-						<xsd:element name="ReusableAsset" type="xsd:string"/>
-						<xsd:element name="SupportingMaterial" type="xsd:string"/>
-						<xsd:element name="Whitepaper" type="xsd:string"/>
-					</xsd:choice>
-				</xsd:sequence>
-				<xsd:attribute name="variabilityType" type="uma:VariabilityType"/>
-				<xsd:attribute name="variabilityBasedOnElement" type="xsd:string"/>
-				<xsd:attribute name="IsEnactable" type="xsd:boolean"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Phase">
-		<xsd:annotation>
-			<xsd:documentation>A special Activity which prescribes pre-defined values for its instances for the attributes prefix ('Phase') and isRepeatable ('False').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.
-Phase represent a significant period in a project, ending with major management checkpoint, milestone or set of Deliverables.  It is included in the model as a predefined special Activity, because of its significance in defining breakdowns.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Activity"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Iteration">
-		<xsd:annotation>
-			<xsd:documentation>A special Activity which prescribes pre-defined values for its instances for the attributes prefix ('Iteration') and isRepeatable ('True').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.
-Iteration groups a set of nested Activities that are repeated more than once.  It represents an important structuring element to organize work in repetitive cycles.  The concept of Iteration can be associated with different rules in different methods.  For example, the IBM Rational Unified Process method framework (RUP) defines a rule that Iterations are not allowed to span across Phases.  In contrast IBM Global Services Method (GSMethod) based method frameworks this rule does not apply and Iteration can be defined which nest Phases.  Rules like these, which play an important role for each individual method and are therefore not enforced by this meta-model.  Instead, process authors are expected to follow and check these rules manually.  (Note: Any Breakdown Element can be repeated; however, Iterations has been introduced as a special meta-model concept, because of its important role for many methods.)</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Activity"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="BreakdownElementDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Breakdown Element.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:attribute name="usageGuidance" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Provides information and guidance on the meaning of the Boolean flag values and under what circumstances they should be overridden. For example, it describes why the breakdown element is optional or considerations for repeating it and differences in the individual occurrences of this Breakdown Element across the lifecycle.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ActivityDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Breakdown Element Description that is used to store the textual description for an Activity.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElementDescription">
-				<xsd:sequence>
-					<xsd:element name="Alternatives" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Comprises of summaries describing important exceptional and non-standard ways of doing the work of this Activity not covered by the Activity's Tasks.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="HowToStaff" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Provides background on who should be involved in this activity what are the required skills, experience,  and perhaps attitudes.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="Purpose" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Summarizes the main reason for performing this Activity, describes what the activity as a whole is intended to achieve.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DescriptorDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Breakdown Element Description that is used to store the textual description for a Descriptor.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElementDescription">
-				<xsd:choice minOccurs="0">
-					<xsd:element name="RefinedDescription" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>A Descriptor might add refinements to the main description of the Content Element it refers to.  For example, it could provide additional information about a Work Product relevant for the specific point in time in the process this Work Product type is being used.  It could describe additional skills needed for a Role at that particular point in time in a process, etc. </xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Activity Description that is used to store the textual description for a Process.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ActivityDescription">
-				<xsd:sequence>
-					<xsd:element name="Scope" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Defines the scope of the Process, i.e. which types of projects does it address and which not.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="UsageNotes" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Any additional notes on how to apply and instantiate this process for a project.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-				<xsd:attribute name="externalId" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>An external visible number that is used to reference this delivery patterns and models. It is used like a synonym.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DeliveryProcessDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Process Description that is used to store the textual description for a Delivery Process.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ProcessDescription">
-				<xsd:sequence>
-					<xsd:element name="Scale" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Outlines characteristics about the size of a typical project that performs this project expressed in team size, man years, etc.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="ProjectCharacteristics" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Characterizes the project that would typically perform this Process</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="RiskLevel" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Outlines typical project risks that are addressed with this process.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="EstimatingTechnique" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Describes the Estimation Techniques provided for this Process.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="ProjectMemberExpertise" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Provides a profile of a typical project team, the distribution of roles, skills required for a team performs a project based on this process.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="TypeOfContract" type="xsd:string" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>Provides background information about the coI'm chaI'm ntracts that need to be established between a project team that performs this process and a client (e.g. for an IGS engagement).</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Descriptor">
-		<xsd:annotation>
-			<xsd:documentation>An abstract generalization for special Breakdown Elements that references one concrete Content Element.  A descriptor provides a representation of a Content Element within breakdown structures.  In addition to just referencing Content Elements it allows overriding the Content Elements structural relationships by defining its own sets of associations.
-Descriptors are the key concept for realizing the separation of processes from method content.  A Descriptor can be characterized as a reference object for one particular Content Element, which has its own relationships and properties.  When a Descriptor is created it shall be provided with congruent copies of the relationships defined for the referenced content element.  However, a user can modify these relationships for the particular process situation for which the descriptor has been created. </xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElement">
-				<xsd:attribute name="isSynchronizedWithSource" type="xsd:boolean"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkProductDescriptor">
-		<xsd:annotation>
-			<xsd:documentation>A special Descriptor that represents a Work Product in the context of one specific Activity.  Every breakdown structure can define different relationships of Work Product Descriptors to Task Descriptors and Role Descriptors.  Therefore one Work Product can be represented by many Work Product Descriptors each within the context of an Activity with its own set of relationships.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Descriptor">
-				<xsd:sequence>
-					<xsd:element name="WorkProduct" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="ResponsibleRole" type="xsd:string" minOccurs="0"/>
-					<xsd:choice minOccurs="0" maxOccurs="unbounded">
-						<xsd:element name="ExternalInputTo" type="xsd:string"/>
-						<xsd:element name="ImpactedBy" type="xsd:string"/>
-						<xsd:element name="Impacts" type="xsd:string"/>
-						<xsd:element name="MandatoryInputTo" type="xsd:string"/>
-						<xsd:element name="OptionalInputTo" type="xsd:string"/>
-						<xsd:element name="OutputFrom" type="xsd:string"/>
-						<xsd:element name="DeliverableParts" type="xsd:string"/>
-					</xsd:choice>
-				</xsd:sequence>
-				<xsd:attribute name="activityEntryState" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Entry State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is initiated (i.e. work on the Activity's Task Descriptors is being initiated that use this Work Product Descriptor as input).  
-For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested].</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="activityExitState" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Exist State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is finished (i.e. work on the Activity's Task Descriptors has finished that have this Work Product Descriptor as output).
-For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested].</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="RoleDescriptor">
-		<xsd:annotation>
-			<xsd:documentation>A special Descriptor that represents a Role in the context of one specific Activity.  Every breakdown structure can define different relationships of Role Descriptors to Task Descriptors and Work Product Descriptors.  Therefore one Role can be represented by many Role Descriptors each within the context of an Activity with its own set of relationships.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Descriptor">
-				<xsd:sequence>
-					<xsd:element name="Role" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="ResponsibleFor" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="TaskDescriptor">
-		<xsd:annotation>
-			<xsd:documentation>A special Descriptor that represents a proxy for a Task in the context of one specific Activity.  Every breakdown structure can define different relationships of Task Descriptors to Work Product Descriptors and Role Descriptors. Therefore one Task can be represented by many Task Descriptors each within the context of an Activity with its own set of relationships.
-A key difference between Method Content and Process is that a Content Element such as Task describes all aspects of doing work defined around this Task.  This description is managed in steps, which are modeled as Sections of the Tasks' Content Descriptions.  When applying a Task in a Process' Activity with a Task Descriptor a Process Engineer needs to indicate that at that particular point in time in the Process definition for which the Task Descriptor has been created, only a subset of steps shall be performed.  He defines this selection using the selectedSteps association.  If he wants to add steps to a Task Descriptor, he can describe these either pragmatically in the refinedDescription attribute or 'properly' create a contributing Task to the Task the Task Descriptor refers to.
-</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkBreakdownElement">
-				<xsd:sequence>
-					<xsd:element name="Task" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="PerformedPrimarilyBy" type="xsd:string" minOccurs="0"/>
-					<xsd:choice minOccurs="0" maxOccurs="unbounded">
-						<xsd:element name="AdditionallyPerformedBy" type="xsd:string"/>
-						<xsd:element name="AssistedBy" type="xsd:string"/>
-						<xsd:element name="ExternalInput" type="xsd:string"/>
-						<xsd:element name="MandatoryInput" type="xsd:string"/>
-						<xsd:element name="OptionalInput" type="xsd:string"/>
-						<xsd:element name="Output" type="xsd:string"/>
-					</xsd:choice>
-					<xsd:element name="Step" type="uma:Section" minOccurs="0" maxOccurs="unbounded"/>
-				</xsd:sequence>
-				<xsd:attribute name="isSynchronizedWithSource" type="xsd:boolean"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="CompositeRole">
-		<xsd:annotation>
-			<xsd:documentation>A special Role Descriptor that relates to more then one Role.  It represents a grouping of Roles with the main purpose of simplification, i.e. reducing the number of roles for a process.
-A Composite Role is a grouping of Roles that can be used in an Activity or Process to reduce the number of Roles.  A typical application would be a process for a small team in which a standard set of roles from the method content would be all performed by one or more resource.  By using Composite Role the process would suggest a typical clustering of Roles to Resources.  A Composite Role could perform all Tasks defined for the Roles it refers to.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:RoleDescriptor">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="AggregatedRole" type="uma:Role"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="TeamProfile">
-		<xsd:annotation>
-			<xsd:documentation>A Breakdown Element that groups Role Descriptors or Resource Definitions defining a nested hierarchy of teams and team members.
-Work assignments and Work Product responsibilities can be different from Activity to Activity in a development project. Different phases require different staffing profiles, i.e. different skills and resources doing different types of work.  Therefore, a process needs to define such different profiles in a flexible manner.  Whereas Core Method Content defines standard responsibilities and assignments, a process express by a breakdown structures needs to be able refine and redefine these throughout its definition.  Role Descriptors, Resource Definitions, as well as Team Profiles provide the data structure necessary to achieve this flexibility and to provide a process user with the capability to define different teams and role relationships for every Activity (including Activities on any nesting-level as well as Iterations or Phases).
-Hence, in addition to the work breakdown and work product breakdown structures defined so far, Team Profiles are used to define a third type of breakdown structure: team breakdown structures.  These are created as an Activity specific hierarchy of Team Profiles comprising of Role Descriptors and Resource Definitions.  These structures can be presented as well-known Org-Charts.  Just as with any other Breakdown Element and Descriptors, Team Profiles can be defined within the scope of any Activity in a breakdown structure.  In other words every Activity can define its own Team Profiles consisting of Activity specific Role Descriptors and Resource Definitions.  Typically, Team Profiles are defined on the level of Iterations or Phases or other higher-level Activity.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElement">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="Role" type="xsd:string"/>
-					<xsd:element name="SuperTeam" type="xsd:string"/>
-					<xsd:element name="SubTeam" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Process">
-		<xsd:annotation>
-			<xsd:documentation>A special Activity that describes a structure for particular types of development projects.  To perform such a development project a Processes would be 'instantiated' and adapted for the specific situation.  Process is an abstract class and this meta-model defines different special types of Processes for different process management applications and different situations of process reuse.  Every Process comprises of and is the top-level element of an n-level breakdown structure using the Nesting association defined on Activity.
-Core Method Content provides step-by-step explanations, describing how very specific development goals are achieved independent of the placement of these steps within a development lifecycle.  Processes take these method elements and relate them into semi-ordered sequences that are customized to specific types of projects.  Thus, a process is a set of partially ordered work descriptions intended to reach a higher development goal, such as the release of a specific software system.  A process and the process meta-model structure defined in this specification focuses on the lifecycle and the sequencing of work in breakdown structures.  To achieve this it uses the Descriptor concept referencing method content and allowing defining time-specific customizations of the referenced content (e.g. defining a focus on different steps of the same Task and providing input Work Products in different states within the different Phases of a process lifecycle in which the same Task is performed).</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Activity">
-				<xsd:sequence>
-					<xsd:element name="IncludesPattern" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xsd:element name="DefaultContext" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="ValidContext" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DeliveryProcess">
-		<xsd:annotation>
-			<xsd:documentation>A special Process describing a complete and integrated approach for performing a specific project type.  It describes a complete project lifecycle end-to-end and shall be used as a reference for running projects with similar characteristics as defined for the process.  A Delivery Process is related to specific supporting information such as Roadmaps (inherited via Activity) as well as Communications and Education Material.
-A Delivery Process is a Process that covers a whole development lifecycle from beginning to end.  A Delivery Process shall be used as a template for planning and running a project.  It provides a complete lifecycle model with predefined phases, iterations, and activities that have been detailed by sequencing referencing method content in breakdown structures.  It is defined on the basis of experience with past projects or engagements, and/or the best practice use of a development or delivery approach.  It defines what gets produced, how those items are produced, and the required staffing in the form of integrated Work, Work Product, and Team Breakdown Structures.  For example, a process engineer can define alternative Delivery Processes for software development projects that differ in the scale of the engagement and staffing necessary, the type of the software application to be developed, the development methods and technologies to be used, etc.  Although, the Delivery Process aims to cover a whole project it keeps certain decision that are too project specific open.  For example, the breakdown structure defines which Breakdown Elements have multiple occurrences or is repeatable via it respective attributes, but does not say how many occurrences and how many repeats/iterations it will have.  These decisions have to be done by a project manager when planning a concrete project, project phase, or project iterations.  A Delivery Process is always a complete description of a process in terms of completeness of the lifecycle, as well as in terms of all three views on the process which are the Work Breakdown Structure, Work Product Breakdown Structure, and Team Breakdown Structure have to be fully and consistently populated.  Consistency of a Delivery Process is actually ensured by the fact that all three breakdowns are represented by one single data structure and one particular breakdown such as Team Breakdown is just a view on that data structure.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Process">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="CommunicationsMaterial" type="xsd:string"/>
-					<xsd:element name="EducationMaterial" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="CapabilityPattern">
-		<xsd:annotation>
-			<xsd:documentation>A special Process that describes a reusable cluster of doing work in common process areas.  Capabilities Patterns express and communicate process knowledge for a key area of interest such as a Discipline and can be directly used by process practitioner to guide his work.  They are also used as building blocks to assemble Delivery Processes or larger Capability Patterns ensuring optimal reuse and application of the key practices they express.
-A Capability Pattern is a special Process that describes a reusable cluster of doing work in a general process area that provides a consistent development approach to common problems.  Examples for Capability Pattern could be 'use case-based requirements management', 'use case analysis', or 'unit testing'. Typically but not necessarily, Capability Patterns have the scope of one discipline providing a breakdown of reusable complex Activities, relationships to the Roles which perform Tasks within these Activities, as well as to the Work Products that are used and produced.  A capability pattern does not relate to any specific phase or iteration of a development lifecycle, and should not imply any.  In other words, a pattern should be designed in a way that it is applicable anywhere in a Delivery Process.  This enables its Activities to be flexibly assigned to whatever phases there are in the Delivery Process to which it is being applied.  It is a good practice to design a Capability Pattern to produce one or more generic Deliverables.  The typical configuration is that each Activity in the Capability Pattern produces one Deliverable, and the last Task Descriptor in the Activity explicitly outputs just this Deliverable.  This enables the process engineer to select Patterns or just Activities by deciding which Deliverables are required.  It also offers a simple integration approach: an Activity from a capability pattern is linked to the Phase or Iteration which is required to produce the Activity's Deliverable.  Key applications areas of / areas of reuse for Capability Patterns are:
-- To serve as building blocks for assembling Delivery Processes or larger Capability Patterns.  Normally developing a Delivery Process is not done from scratch but by systematically applying and binding patterns.  In addition to the standard pattern application of 'copy-and-modify', which allows the process engineer to individually customize the pattern's content to the particular situation it is applied for, the Plugin meta-model package (Section 6.1) introduces even more sophisticated inheritance relationships that support dynamic binding of patterns (i.e. the pattern is referenced and not copied).  This unique new way of reusing process knowledge allows to factor out commonly reoccurring Activities into patterns and to apply them over and over again for a process.  When the pattern is being revised or updated, all changes will be automatically reflected in all pattern application in all processes because of the dynamic binding.
-- To support direct execution in a development project that does not work following a well-defined process, but works based on loosely connected process fragments of best practices in a flexible manner (e.g. Agile Development).
-- To support process education by describing knowledge for a key area such as best practices on how to perform the work for a Discipline (e.g. Requirements Management), for a specific development technique (aspect-oriented development), or a specific technical area (e.g. relational database design), which is used for education and teaching.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Process"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessPlanningTemplate">
-		<xsd:annotation>
-			<xsd:documentation>A special Process that is prepared for instantiation by a project planning tool.  Typically, it is created based on a Process such as a Delivery Process as a whole (e.g. in case of a waterfall-based development approach) or in parts (e.g. in case of an iterative development approach).
-A Process Planning Template represents a partially finished plan for a concrete project.  It uses the same information structures as all other Process Types to represent templates for project plans.  However, certain planning decisions have already been applied to the template as well as information has been removed and/or reformatted to be ready for export to a specific planning tool.  Examples for such decisions are: a template has been created to represent a plan for a particular Iteration in an iterative development project, which fr example distinguishes early from late iterations in the Elaboration phase of a project; if the targeted planning tool cannot represent input and output of Task, then these have been removed from the structure; certain repetitions have been already applied, e.g. stating that a cycle of specific Task grouped in an Activity have to be repeated n-times; etc.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Process">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="BaseProcess" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessPackage">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Package that contains Process Elements, only.
-A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodPackage">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="ProcessElement" type="uma:ProcessElement"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessComponentInterface">
-		<xsd:annotation>
-			<xsd:documentation>Comprises of a list of interface specifications (similar to operation declarations) that express inputs and outputs for a process component.  These interface specifications are expressed using Task Descriptors which are not linked to Tasks that are related to Work Product Descriptors as well as optional a Role Descriptor.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElement">
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:element name="InterfaceSpecification" type="uma:TaskDescriptor"/>
-					<xsd:element name="InterfaceIO" type="uma:WorkProductDescriptor"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessComponent">
-		<xsd:annotation>
-			<xsd:documentation>A special Process Package that applies the principles of encapsulation.  A Process Component realizes one or more Interfaces which specify inputs and outputs of the component. There might be many components realizing the same interfaces, but using different techniques to achieve similar outputs for similar inputs.  Whereas the Component Interfaces represent component specifications (black box descriptions of the component), good candidates for component realizations can be found in Capability Patterns (white box descriptions for the component).
-UMA supports replaceable and reusable Process Components realizing the principles of encapsulation. Certain situations in a software development project might require that concrete realizations of parts of the process remain undecided or will be decided by the executing team itself (e.g. in outsourcing situations).  UMA provides a unique component concept defining interfaces for work product input and output, allowing treating the actual definition of the work that produces the outputs as a "black box".  At any point during a project the component "realization" detailing the work can be added to the process.  The component approach also allows that different styles or techniques of doing work can be replaced with one another.  For example, a software code output of a component could be produced with a model-driven development or a code-centric technique.  The component concept encapsulates the actual work and lets the development team choose the appropriate technique and fill the component's realization with their choice of Activities that produce the required outputs.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ProcessPackage">
-				<xsd:sequence>
-					<xsd:element name="Copyright" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="Interface" type="uma:ProcessComponentInterface" minOccurs="0"/>
-					<xsd:element name="Process" type="uma:Process"/>
-				</xsd:sequence>
-				<xsd:attribute name="authors" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Method Unit is being created and owned by an author or authoring team.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="changeDate" type="xsd:dateTime">
-					<xsd:annotation>
-						<xsd:documentation>The date the last change that resulted into this version has been made.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="changeDescription" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>The description of the last change that resulted into this version.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="version" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Package has a version number used to track changes.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="MethodPlugin">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Unit that represents a physical container for Method Packages.  It defines a granularity level for the modularization and organization of method content and processes.  A Method Plugin can extend many other Method Plugins and it can be extended by many Method Plugins.  It can also be used stand-alone, i.e. with no Extension relationship to other plug-ins.
-Method Plugin conceptually represents a unit for configuration, modularization, extension, packaging, and deployment of method content and processes.  A Process Engineer shall design his Plugins and allocate his content to these Plugins with requirements for extensibility, modularity, reuse, and maintainability in mind.
-Special extensibility mechanisms defined for the meta-classes Variability Element and Process Contribution allow Plugin content to directly contribute new content, replace existing content, or to cross-reference to any Content Element or Process within another Plugin that it extends.  Similar to UML 2.0's 'package merge' mechanism transformation interpretations, interpreting these Method Plugin mechanisms results into new extended Method Content and Processes.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodUnit">
-				<xsd:sequence>
-					<xsd:element name="ReferencedMethodPlugin" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xsd:element name="MethodPackage" type="uma:MethodPackage" minOccurs="0" maxOccurs="unbounded"/>
-				</xsd:sequence>
-				<xsd:attribute name="userChangeable" type="xsd:boolean"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:element name="MethodPlugin" type="uma:MethodPlugin">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Unit that represents a physical container for Method Packages.  It defines a granularity level for the modularization and organization of method content and processes.  A Method Plugin can extend many other Method Plugins and it can be extended by many Method Plugins.  It can also be used stand-alone, i.e. with no Extension relationship to other plug-ins.
-Method Plugin conceptually represents a unit for configuration, modularization, extension, packaging, and deployment of method content and processes.  A Process Engineer shall design his Plugins and allocate his content to these Plugins with requirements for extensibility, modularity, reuse, and maintainability in mind.
-Special extensibility mechanisms defined for the meta-classes Variability Element and Process Contribution allow Plugin content to directly contribute new content, replace existing content, or to cross-reference to any Content Element or Process within another Plugin that it extends.  Similar to UML 2.0's 'package merge' mechanism transformation interpretations, interpreting these Method Plugin mechanisms results into new extended Method Content and Processes.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:complexType name="MethodConfiguration">
-		<xsd:annotation>
-			<xsd:documentation>A collection of selected Method Models and MethodPackages. A configuration can be exported into its own standalone library when it includes the full transitive closure of all elements all other elements depend on.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodUnit">
-				<xsd:sequence>
-					<xsd:element name="BaseConfiguration" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xsd:element name="MethodPluginSelection" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xsd:element name="MethodPackageSelection" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-					<xsd:element name="DefaultView" type="xsd:string" minOccurs="0"/>
-					<xsd:element name="ProcessView" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:element name="MethodConfiguration" type="uma:MethodConfiguration">
-		<xsd:annotation>
-			<xsd:documentation>A collection of selected Method Models and MethodPackages. A configuration can be exported into its own standalone library when it includes the full transitive closure of all elements all other elements depend on.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:complexType name="MethodLibrary">
-		<xsd:annotation>
-			<xsd:documentation>A Method Library is a physical container for Method Plugins and Method Configuration definitions.  All Method Elements are stored in a Method Library.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodUnit">
-				<xsd:sequence>
-					<xsd:element name="MethodPlugin" type="uma:MethodPlugin" minOccurs="0" maxOccurs="unbounded"/>
-					<xsd:element name="MethodConfiguration" type="uma:MethodConfiguration" minOccurs="0" maxOccurs="unbounded"/>
-				</xsd:sequence>
-				<xsd:attribute name="tool" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>The tool that generated the XML file.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:element name="MethodLibrary" type="uma:MethodLibrary">
-		<xsd:annotation>
-			<xsd:documentation>A Method Library is a physical container for Method Plugins and Method Configuration definitions.  All Method Elements are stored in a Method Library.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-</xsd:schema>
diff --git a/plugins/org.eclipse.epf.xml.uma/src/model/UMA.ecore b/plugins/org.eclipse.epf.xml.uma/src/model/UMA.ecore
deleted file mode 100755
index e19371b..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/model/UMA.ecore
+++ /dev/null
@@ -1,2754 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="uma"
-    nsURI="http://www.eclipse.org/epf/uma/1.0.3" nsPrefix="uma">
-  <eClassifiers xsi:type="ecore:EClass" name="Activity" eSuperTypes="#//WorkBreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Work Breakdown Element and Work Definition which supports the nesting and logical grouping of related Breakdown Elements forming breakdown structures.  Although Activity is a concrete meta-class, other classes which represent breakdown structures derive from it; such as Phase, Iteration, Delivery Process, or Capability Pattern.&#xD;&#xA;Activity represents a grouping element for other Breakdown Elements such as Activities, Descriptors, Milestones, etc.  It is not per-se a 'high-level' grouping of only work as in other meta-models, but groups any kind of Breakdown Elements.  For example, one can define valid Activities that group only Work Products Descriptors without any matching Task Descriptors.  Activities also inherit all properties from Work Breakdown Element and indirectly from Process Element; i.e. Activity is ready to have a full content description attached to it."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Activity"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="precondition" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Precondition"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="postcondition" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Postcondition"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="breakdownElement" upperBound="-1"
-        eType="#//BreakdownElement" volatile="true" transient="true" derived="true"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BreakdownElement"/>
-        <details key="group" value="#group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="checklist" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Checklist"/>
-        <details key="group" value="#group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="concept" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Concept"/>
-        <details key="group" value="#group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="example" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Example"/>
-        <details key="group" value="#group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="guideline" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Guideline"/>
-        <details key="group" value="#group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="roadmap" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Roadmap"/>
-        <details key="group" value="#group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="reusableAsset" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ReusableAsset"/>
-        <details key="group" value="#group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="supportingMaterial" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SupportingMaterial"/>
-        <details key="group" value="#group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="whitepaper" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Whitepaper"/>
-        <details key="group" value="#group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isEnactable" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="IsEnactable"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="variabilityBasedOnElement"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="variabilityBasedOnElement"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="variabilityType" unique="false"
-        eType="#//VariabilityType" defaultValueLiteral="na" unsettable="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="variabilityType"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ActivityDescription" eSuperTypes="#//BreakdownElementDescription">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A generalized Breakdown Element Description that is used to store the textual description for an Activity."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ActivityDescription"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alternatives" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Comprises of summaries describing important exceptional and non-standard ways of doing the work of this Activity not covered by the Activity's Tasks."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Alternatives"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="howToStaff" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides background on who should be involved in this activity what are the required skills, experience,  and perhaps attitudes."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="HowToStaff"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="purpose" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Summarizes the main reason for performing this Activity, describes what the activity as a whole is intended to achieve."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Purpose"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Artifact" eSuperTypes="#//WorkProduct">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Work Product that provides a description and definition for tangible work product types. Artifacts may be composed of other artifacts. For example, a model artifact can be composed of model elements, which are also artifacts.&#xD;&#xA;Artifacts are tangible work products consumed, produced, or modified by Tasks.  It may serve as a basis for defining reusable assets.  Roles use Artifacts to perform Tasks and produce Artifacts in the course of performing Tasks.  Artifacts are the responsibility of a single Role, making responsibility easy to identify and understand, and promoting the idea that every piece of information produced in the method requires the appropriate set of skills. Even though one role might &quot;own&quot; a specific type of Artifacts, other roles can still use the Artifacts; perhaps even update them if the Role has been given permission to do so."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Artifact"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group3" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:27"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="containedArtifact" upperBound="-1"
-        eType="#//Artifact" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ContainedArtifact"/>
-        <details key="group" value="#group:27"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ArtifactDescription" eSuperTypes="#//WorkProductDescription">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A generalized Work Product Description that is used to store the textual description for an Artifact."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ArtifactDescription"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="briefOutline" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides a brief description of the information that can be found in this artifact. For example, discusses the contents for key chapters of a document artifact or the key packages and modules of a model artifact."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BriefOutline"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="representationOptions"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Discusses different possible alternative representations for the artifact. For example a design model can be represented as a UML model or an informal block diagram or by textual description only."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RepresentationOptions"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BreakdownElement" eSuperTypes="#//ProcessElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An abstract generalization for any type of Method Element that is part of a breakdown structure.  It defines a set of properties available to all of its specializations."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="BreakdownElement"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presentedAfter" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PresentedAfter"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presentedBefore" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PresentedBefore"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="planningData" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PlanningData"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="superActivity" unique="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SuperActivity"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hasMultipleOccurrences"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Just as the isPlanned attribute the hasMultipleOccurrences attribute has an impact on generating plans from a Process.  When this attribute is set to True for a Breakdown Element then it will typically occur multiple times within the same Activity.  For example, a Task such as &quot;Detail Use Case&quot; would be performed for every use case identified for a particular Iteration or Activity.  Generating a plan would list one Task instance per use case."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="hasMultipleOccurrences"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isOptional" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Indicates that the Breakdown Element describes work, a work result, or even work resources, which inclusion is not mandatory when performing a project that is planned based on a process containing this element."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="isOptional"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isPlanned" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A key application for Development Processes expressed with Breakdown structures is to generate a project plan from it.  A process as defined in UMA (cf. with Sections XX and 5.2) is a multi-dimensional structure defining what work is being performed at what time by which roles using which input and producing what outputs.  A project plan as it is represented in project planning tools such as IBM Rational Portfolio Manager or Microsoft Project normally does not need all this information and is normally limited to just representing a subset.  For example, a typical MS Project plan only represents the work breakdown consisting of Tasks and Activities (sometimes referred to as summary tasks).  It does not show the input and output Work Products for a Task, but it can show which roles shall be staffed for performing the Task.  However, such role allocation need to be replaced with concrete resources when instantiating the plan for a concrete project.  Sometimes project plans can then again be organized differently by organizing work by deliverables in which Work Products are mapped to the plan's summary tasks and Task that have these work products as output mapped below such as summary task.  Therefore, a process can make recommendations about which elements to include and which to exclude when generating a plan.  When the isPlanned attribute is set to False for an instance of a Breakdown Element, then this element shall not be not included when a concrete project plan is being generated from the breakdown structure that contains this element.&#xD;&#xA;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="isPlanned"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Prefix represents an additional label that will be presented as a prefix to any Breakdown Element to indicate a user-defined sub-type for the element.  For example, if the process engineer would like to distinguish his Activities by 'Module' (as done in the IBM Rational Summit Ascendant Method), he can define a different prefix for every model to be used in addition to naming Activities, e.g. &quot;SRA.Establish Requirements&quot; with SRA indicating that this Activity belongs to the &quot;Software Requirements Analysis&quot; module.  Another common application for prefix is to qualify roles in Role Descriptors.  For example, &quot;Customer.Architect&quot; would define a &quot;Customer&quot; prefix for the Role Descriptor &quot;Architect&quot; expressing that this is an architect on the customer side and not the development team side."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="prefix"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BreakdownElementDescription" eSuperTypes="#//ContentDescription">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A generalized Content Description that is used to store the textual description for a Breakdown Element."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="BreakdownElementDescription"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="usageGuidance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides information and guidance on the meaning of the Boolean flag values and under what circumstances they should be overridden. For example, it describes why the breakdown element is optional or considerations for repeating it and differences in the individual occurrences of this Breakdown Element across the lifecycle."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="usageGuidance"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CapabilityPattern" eSuperTypes="#//Process">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Process that describes a reusable cluster of doing work in common process areas.  Capabilities Patterns express and communicate process knowledge for a key area of interest such as a Discipline and can be directly used by process practitioner to guide his work.  They are also used as building blocks to assemble Delivery Processes or larger Capability Patterns ensuring optimal reuse and application of the key practices they express.&#xD;&#xA;A Capability Pattern is a special Process that describes a reusable cluster of doing work in a general process area that provides a consistent development approach to common problems.  Examples for Capability Pattern could be 'use case-based requirements management', 'use case analysis', or 'unit testing'. Typically but not necessarily, Capability Patterns have the scope of one discipline providing a breakdown of reusable complex Activities, relationships to the Roles which perform Tasks within these Activities, as well as to the Work Products that are used and produced.  A capability pattern does not relate to any specific phase or iteration of a development lifecycle, and should not imply any.  In other words, a pattern should be designed in a way that it is applicable anywhere in a Delivery Process.  This enables its Activities to be flexibly assigned to whatever phases there are in the Delivery Process to which it is being applied.  It is a good practice to design a Capability Pattern to produce one or more generic Deliverables.  The typical configuration is that each Activity in the Capability Pattern produces one Deliverable, and the last Task Descriptor in the Activity explicitly outputs just this Deliverable.  This enables the process engineer to select Patterns or just Activities by deciding which Deliverables are required.  It also offers a simple integration approach: an Activity from a capability pattern is linked to the Phase or Iteration which is required to produce the Activity's Deliverable.  Key applications areas of / areas of reuse for Capability Patterns are:&#xD;&#xA;- To serve as building blocks for assembling Delivery Processes or larger Capability Patterns.  Normally developing a Delivery Process is not done from scratch but by systematically applying and binding patterns.  In addition to the standard pattern application of 'copy-and-modify', which allows the process engineer to individually customize the pattern's content to the particular situation it is applied for, the Plugin meta-model package (Section 6.1) introduces even more sophisticated inheritance relationships that support dynamic binding of patterns (i.e. the pattern is referenced and not copied).  This unique new way of reusing process knowledge allows to factor out commonly reoccurring Activities into patterns and to apply them over and over again for a process.  When the pattern is being revised or updated, all changes will be automatically reflected in all pattern application in all processes because of the dynamic binding.&#xD;&#xA;- To support direct execution in a development project that does not work following a well-defined process, but works based on loosely connected process fragments of best practices in a flexible manner (e.g. Agile Development).&#xD;&#xA;- To support process education by describing knowledge for a key area such as best practices on how to perform the work for a Discipline (e.g. Requirements Management), for a specific development technique (aspect-oriented development), or a specific technical area (e.g. relational database design), which is used for education and teaching."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="CapabilityPattern"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Checklist" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A specific type of guidance that identifies a series of items that need to be completed or veri-fied.  Checklists are often used in reviews such as walkthroughs or inspections. "/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Checklist"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CompositeRole" eSuperTypes="#//RoleDescriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Role Descriptor that relates to more then one Role.  It represents a grouping of Roles with the main purpose of simplification, i.e. reducing the number of roles for a process.&#xD;&#xA;A Composite Role is a grouping of Roles that can be used in an Activity or Process to reduce the number of Roles.  A typical application would be a process for a small team in which a standard set of roles from the method content would be all performed by one or more resource.  By using Composite Role the process would suggest a typical clustering of Roles to Resources.  A Composite Role could perform all Tasks defined for the Roles it refers to."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="CompositeRole"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group1" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:22"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="aggregatedRole" upperBound="-1"
-        eType="#//Role" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AggregatedRole"/>
-        <details key="group" value="#group:22"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Concept" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A specific type of guidance that outlines key ideas associated with basic principles underlying the referenced item. Concepts normally address more general topics than Guidelines and span across sev-eral work product and/or tasks/activities."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Concept"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Constraint" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A generalized Method Element that represents a condition or restriction expressed in natural language text or in a machine readable language for the purpose of declaring some of the semantics of a Method Element."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Constraint"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mainDescription" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Stores the main definition of the constraint."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="mainDescription"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentCategory" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An abstract class generalizing content category types."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ContentCategory"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentCategoryPackage" eSuperTypes="#//MethodPackage">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Method Package that only contains Content Category Elements."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ContentCategoryPackage"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:11"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contentCategory" upperBound="-1"
-        eType="#//ContentCategory" volatile="true" transient="true" derived="true"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ContentCategory"/>
-        <details key="group" value="#group:11"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentDescription" eSuperTypes="#//MethodUnit">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A generalized Method Element that is used to store the textual description for a Content Element.  It defines standard attributes applicable for all Content Element types.  Specific Content Element sub-types can define their own matching Content Description sub-types. "/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ContentDescription"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mainDescription" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Stores the main descriptive text for the Content Element.  All text that is not part of any of the more specific attributes shall be stored here.  If the Content Description is divided into sections using the Section class, then only the text from the 'start' of the content description to the first section will be stored here (similar to a normal document where you can place text between its beginning to its first diction heading)."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MainDescription"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="keyConsiderations" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides advise and guidance of a critical nature for the content element as well as warnings, cautions, pitfalls, dangers."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="KeyConsiderations"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="section" upperBound="-1"
-        eType="#//Section" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Section"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentElement" eSuperTypes="#//DescribableElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Describable Element that represents an abstract generalization for all elements that are considered to be and managed as Method Content.&#xD;&#xA;Content Elements represents reusable Method Content that is supposed to be managed in Content Packages.  The separation of Content Element from Process Element allows to clearly distinguish between pure method content from content that is represented in processes."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ContentElement"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group1" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:11"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="checklist" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Checklist"/>
-        <details key="group" value="#group:11"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="concept" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Concept"/>
-        <details key="group" value="#group:11"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="example" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Example"/>
-        <details key="group" value="#group:11"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="guideline" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Guideline"/>
-        <details key="group" value="#group:11"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="reusableAsset" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ReusableAsset"/>
-        <details key="group" value="#group:11"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="supportingMaterial" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SupportingMaterial"/>
-        <details key="group" value="#group:11"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="whitepaper" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Whitepaper"/>
-        <details key="group" value="#group:11"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="variabilityBasedOnElement"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="variabilityBasedOnElement"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="variabilityType" unique="false"
-        eType="#//VariabilityType" defaultValueLiteral="na" unsettable="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="variabilityType"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContentPackage" eSuperTypes="#//MethodPackage">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Method Package that contains Content Elements and Content Elements, only.  Examples for Content Element are Artifacts, Tasks, Roles, etc.  A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ContentPackage"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:11"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contentElement" upperBound="-1"
-        eType="#//ContentElement" volatile="true" transient="true" derived="true"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ContentElement"/>
-        <details key="group" value="#group:11"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomCategory" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A category introduced by a method content author to structure any number of method Content Elements of any subtype based on user-defined criteria.  Because Content Categories (and therefore Custom Categories, too) are Content Elements themselves, Custom Categories can be used to recursively categorize Content Categories as well.  Custom Categories can also be nested with any Content Category.  Custom categories can be used to categorize content based on the user's criteria as well as to define whole tree-structures of nested categories allowing the user to systematically navigate and browse method content and processes based on these categories.  For example, one could create a custom category to logically organize content relevant for the user's development organization departments; e.g. a &quot;Testing&quot; category that groups together all roles, work products, tasks, and guidance element relevant to testing.  Another example would be categories that express licensing levels of the content grouping freely distributable method content versus content that represent intellectual property and requires a license to be purchased to be able to use it."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="CustomCategory"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="categorizedElement" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CategorizedElement"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="subCategory" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SubCategory"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Deliverable" eSuperTypes="#//WorkProduct">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Work Product that provides a description and definition for packaging other Work Products, and may be delivered to an internal or external party.  Therefore, a Deliverable aggregates other Work Products. Therefore, a Deliverable aggregates other Work Products.  A Deliverable is used to pre-define typical or recommended content in the form or work products that would be packaged for delivery.  The actual packaging of the Deliverable in an actual process or even project could be a modification of this recommendation.  Deliverables are used to represent an output from a process that has value, material or otherwise, to a client, customer or other stakeholder. "/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Deliverable"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group3" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:27"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deliveredWorkProduct" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DeliveredWorkProduct"/>
-        <details key="group" value="#group:27"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DeliverableDescription" eSuperTypes="#//WorkProductDescription">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A generalized Work Product Description that is used to store the textual description for a Deliverable."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DeliverableDescription"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalDescription" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The description of the Deliverable used for client documents (proposal, statements of work or contractual agreements).  It might use a different language and follow legal constraints."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExternalDescription"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="packagingGuidance" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides guidance on how to assemble the deliverable from all its required inputs.  This section describes the most common content medium and format.  Distribution of the deliverable is addressed in this section, if necessary."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PackagingGuidance"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DeliveryProcess" eSuperTypes="#//Process">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Process describing a complete and integrated approach for performing a specific project type.  It describes a complete project lifecycle end-to-end and shall be used as a reference for running projects with similar characteristics as defined for the process.  A Delivery Process is related to specific supporting information such as Roadmaps (inherited via Activity) as well as Communications and Education Material.&#xD;&#xA;A Delivery Process is a Process that covers a whole development lifecycle from beginning to end.  A Delivery Process shall be used as a template for planning and running a project.  It provides a complete lifecycle model with predefined phases, iterations, and activities that have been detailed by sequencing referencing method content in breakdown structures.  It is defined on the basis of experience with past projects or engagements, and/or the best practice use of a development or delivery approach.  It defines what gets produced, how those items are produced, and the required staffing in the form of integrated Work, Work Product, and Team Breakdown Structures.  For example, a process engineer can define alternative Delivery Processes for software development projects that differ in the scale of the engagement and staffing necessary, the type of the software application to be developed, the development methods and technologies to be used, etc.  Although, the Delivery Process aims to cover a whole project it keeps certain decision that are too project specific open.  For example, the breakdown structure defines which Breakdown Elements have multiple occurrences or is repeatable via it respective attributes, but does not say how many occurrences and how many repeats/iterations it will have.  These decisions have to be done by a project manager when planning a concrete project, project phase, or project iterations.  A Delivery Process is always a complete description of a process in terms of completeness of the lifecycle, as well as in terms of all three views on the process which are the Work Breakdown Structure, Work Product Breakdown Structure, and Team Breakdown Structure have to be fully and consistently populated.  Consistency of a Delivery Process is actually ensured by the fact that all three breakdowns are represented by one single data structure and one particular breakdown such as Team Breakdown is just a view on that data structure."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DeliveryProcess"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group3" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:42"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="communicationsMaterial"
-        unique="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="CommunicationsMaterial"/>
-        <details key="group" value="#group:42"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="educationMaterial" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EducationMaterial"/>
-        <details key="group" value="#group:42"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DeliveryProcessDescription" eSuperTypes="#//ProcessDescription">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A generalized Process Description that is used to store the textual description for a Delivery Process."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DeliveryProcessDescription"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scale" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Outlines characteristics about the size of a typical project that performs this project expressed in team size, man years, etc."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Scale"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectCharacteristics"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Characterizes the project that would typically perform this Process"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ProjectCharacteristics"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="riskLevel" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Outlines typical project risks that are addressed with this process."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RiskLevel"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="estimatingTechnique" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the Estimation Techniques provided for this Process."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EstimatingTechnique"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectMemberExpertise"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides a profile of a typical project team, the distribution of roles, skills required for a team performs a project based on this process."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ProjectMemberExpertise"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeOfContract" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides background information about the coI'm chaI'm ntracts that need to be established between a project team that performs this process and a client (e.g. for an IGS engagement)."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="TypeOfContract"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DescribableElement" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An abstract generalization of Method Elements for which external presentation names as well as content descriptions have been defined, such as Roles or Work Products.  Presentation Name and Content Descriptions are typically localized using a resource allocation mechanism for its String type attributes.&#xD;&#xA;This abstraction represents all elements in the Method Content as well as Process space for which concrete textual descriptions are defined in the form of documenting attributes grouped in a matching Content Description instance.  Describable Elements are intended to be published in method or process publications (similar to the IBM Rational Unified Process web).  Describable Element defines that the element it represents will have content 'attached' to it.  Content Description is the abstraction for the actual places in which the content is being represented.  This separation allows a distinction between core method model elements describing the structure of the model from the actual description container providing, for example, the documentation of the content element in different alternatives languages, audiences, licensing levels, etc."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DescribableElement"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="presentation" eType="#//ContentDescription"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Presentation"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nodeicon" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A reference to an icon that can be used in tree browser presentations and breakdown structures."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="nodeicon"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="presentationName" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Describable Element has a presentation name, which is used for external presentation of the element.  For example, name (the internal representation) might be set to &quot;rup_architecture_document&quot; to differentiate from a &quot;j2ee_architcture_document&quot; whereas the external presentation would always be &quot;Architecture Document&quot;."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="presentationName"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="shapeicon" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A reference to an icon that can be used for modeling with specific Content Element instances (as graphical stereotypes, e.g. a use case symbol for a use case artifact) as well as publication of content."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="shapeicon"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Descriptor" eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An abstract generalization for special Breakdown Elements that references one concrete Content Element.  A descriptor provides a representation of a Content Element within breakdown structures.  In addition to just referencing Content Elements it allows overriding the Content Elements structural relationships by defining its own sets of associations.&#xD;&#xA;Descriptors are the key concept for realizing the separation of processes from method content.  A Descriptor can be characterized as a reference object for one particular Content Element, which has its own relationships and properties.  When a Descriptor is created it shall be provided with congruent copies of the relationships defined for the referenced content element.  However, a user can modify these relationships for the particular process situation for which the descriptor has been created. "/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Descriptor"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSynchronizedWithSource"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="isSynchronizedWithSource"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DescriptorDescription" eSuperTypes="#//BreakdownElementDescription">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A generalized Breakdown Element Description that is used to store the textual description for a Descriptor."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DescriptorDescription"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="refinedDescription" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A Descriptor might add refinements to the main description of the Content Element it refers to.  For example, it could provide additional information about a Work Product relevant for the specific point in time in the process this Work Product type is being used.  It could describe additional skills needed for a Role at that particular point in time in a process, etc. "/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RefinedDescription"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Discipline" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A categorization of work (i.e. Tasks for Method Content), based upon similarity of concerns and cooperation of work effort.&#xD;&#xA;A discipline is a collection of Tasks that are related to a major 'area of concern' within the overall project. The grouping of Tasks into disciplines is mainly an aid to understanding the project from a 'traditional' waterfall perspective. However, typically, for example, it is more common to perform certain requirements activities in close coordination with analysis and design activities. Separating these activities into separate disciplines makes the activities easier to comprehend."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Discipline"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="task" unique="false" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String" volatile="true"
-        transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Task"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subDiscipline" upperBound="-1"
-        eType="#//Discipline" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SubDiscipline"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="referenceWorkflow" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ReferenceWorkflow"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DisciplineGrouping" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Used to group Disciplines.  For example, the Discipline Grouping &quot;Software Disciplines&quot; would be the group of all disciplines related to developing software such as &quot;Requirements Management&quot; or &quot;Testing&quot;; &quot;IT Infrastructure Management&quot; would be a Disciplines Grouping for disciplines such as &quot;IT Operational Services&quot;, &quot;IT Customer Relationships&quot;, or &quot;IT Enabling Services&quot;.  Disciplines can be associated to more than one Discipline Grouping."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="DisciplineGrouping"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="discipline" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Discipline"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DocumentRoot">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value=""/>
-      <details key="kind" value="mixed"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mixed" unique="false" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="elementWildcard"/>
-        <details key="name" value=":mixed"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="xMLNSPrefixMap" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
-        transient="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="xmlns:prefix"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="xSISchemaLocation" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
-        transient="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="xsi:schemaLocation"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodConfiguration" upperBound="-2"
-        eType="#//MethodConfiguration" volatile="true" transient="true" derived="true"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A collection of selected Method Models and MethodPackages. A configuration can be exported into its own standalone library when it includes the full transitive closure of all elements all other elements depend on."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MethodConfiguration"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodLibrary" upperBound="-2"
-        eType="#//MethodLibrary" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A Method Library is a physical container for Method Plugins and Method Configuration definitions.  All Method Elements are stored in a Method Library."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MethodLibrary"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPlugin" upperBound="-2"
-        eType="#//MethodPlugin" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A special Method Unit that represents a physical container for Method Packages.  It defines a granularity level for the modularization and organization of method content and processes.  A Method Plugin can extend many other Method Plugins and it can be extended by many Method Plugins.  It can also be used stand-alone, i.e. with no Extension relationship to other plug-ins.&#xD;&#xA;Method Plugin conceptually represents a unit for configuration, modularization, extension, packaging, and deployment of method content and processes.  A Process Engineer shall design his Plugins and allocate his content to these Plugins with requirements for extensibility, modularity, reuse, and maintainability in mind.&#xD;&#xA;Special extensibility mechanisms defined for the meta-classes Variability Element and Process Contribution allow Plugin content to directly contribute new content, replace existing content, or to cross-reference to any Content Element or Process within another Plugin that it extends.  Similar to UML 2.0's 'package merge' mechanism transformation interpretations, interpreting these Method Plugin mechanisms results into new extended Method Content and Processes."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MethodPlugin"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Domain" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A refineable hierarchy grouping related work products.  In other words, Domains can be further divided into sub-domains, with work product elements to be categorized only at the leaf-level of this hierarchy.&#xD;&#xA;Domain is a logical grouping of work products that have an affinity to each other based on resources, timing, or relationship.  A Domain may be divided into subdomains.  For example, GS Method uses six predefined Domains for Work Products: Application, Architecture, Business, Engagement, Operations and Organization."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Domain"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workProduct" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkProduct"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subdomain" upperBound="-1"
-        eType="#//Domain" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Subdomain"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Element">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A UML 2.0 meta-class Element."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Element"/>
-      <details key="kind" value="empty"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Estimate" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A specific type of Guidance that provides sizing measures, or standards for sizing the work effort associated with performing a particular piece of work and instructions for their successful use. It may be comprised of estimation considerations and estimation metrics."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Estimate"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="estimationMetric" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EstimationMetric"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="estimationConsiderations"
-        unique="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EstimationConsiderations"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EstimatingMetric" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A specific type of Guidance that describes a metric or measure that is associated with an element and which is used to calculate the size of the work effort as well as a range of potential labor."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="EstimatingMetric"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EstimationConsiderations" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A specific type of Guidance that qualifies the usage and application of estimation metrics in the development of an actual estimate."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="EstimationConsiderations"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Example" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A specific type of Guidance that represents a typical, partially completed, sample instance of one or more work products or scenario like descriptions of how Task may be performed. Examples can be related to Work Products as well as Tasks that produce them as well as any other Content Element."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Example"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Guidance" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Guidance is an abstract generalization of additional information related to content elements such as Roles, Tasks, and Work Products.  Examples for Guidance are Guidelines, Templates, Checklists, Tool Mentors, Estimates, Supporting Materials, Reports, Concepts, etc.  This package only contains the definition of the abstract Guidance class.  The package Guidance Types defines concrete guidance types."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Guidance"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GuidanceDescription" eSuperTypes="#//ContentDescription">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A generalized Content Description that is used to store the textual description for a Guidance."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="GuidanceDescription"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="attachment" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This field is primarily used for attachments augmenting the information provided for guidance.  In particular the attribute is used for Templates, Examples, and Reusable Assets to contain the actual attachment described in the mainDescription.  It can additionally contain representations of the guidance in just a third party format, e.g. PDF, MS Word, or Word Perfect."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Attachment"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Guideline" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A specific type of guidance that provides additional detail on how to perform a particular task or grouping of tasks (e.g. grouped together as activities) or that provides additional detail, rules, and recommendations on work products and their properties.  Amongst others, it can include details about best practices and different approaches for doing work, how to use particular types of work products, information on different subtypes and variants of the work product and how they evolve throughout a lifecycle, discussions on skills the performing roles should acquire or improve upon, measurements for progress and maturity, etc."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Guideline"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Iteration" eSuperTypes="#//Activity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Activity which prescribes pre-defined values for its instances for the attributes prefix ('Iteration') and isRepeatable ('True').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.&#xD;&#xA;Iteration groups a set of nested Activities that are repeated more than once.  It represents an important structuring element to organize work in repetitive cycles.  The concept of Iteration can be associated with different rules in different methods.  For example, the IBM Rational Unified Process method framework (RUP) defines a rule that Iterations are not allowed to span across Phases.  In contrast IBM Global Services Method (GSMethod) based method frameworks this rule does not apply and Iteration can be defined which nest Phases.  Rules like these, which play an important role for each individual method and are therefore not enforced by this meta-model.  Instead, process authors are expected to follow and check these rules manually.  (Note: Any Breakdown Element can be repeated; however, Iterations has been introduced as a special meta-model concept, because of its important role for many methods.)"/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Iteration"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodConfiguration" eSuperTypes="#//MethodUnit">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A collection of selected Method Models and MethodPackages. A configuration can be exported into its own standalone library when it includes the full transitive closure of all elements all other elements depend on."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="MethodConfiguration"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseConfiguration" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BaseConfiguration"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="methodPluginSelection"
-        unique="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MethodPluginSelection"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="methodPackageSelection"
-        unique="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MethodPackageSelection"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultView" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultView"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="processView" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ProcessView"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodElement" eSuperTypes="#//PackageableElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The root generalization for all UMA Method Elements.  Defines a common set of attributes inherited by all UMA Method Elements.  Method Element itself is derived from Packageable Element from the UML 2.0 Infrastructure."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="MethodElement"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group" unique="false" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:1"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedRule" upperBound="-1"
-        eType="#//Constraint" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the packaging rules for this Method Element."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OwnedRule"/>
-        <details key="group" value="#group:1"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="briefDescription" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every instance of Method Element shall be briefly described with one or two sentences summarizing the element."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="briefDescription"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every instance of Method Element has a global unique id."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="id"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="orderingGuide" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Used for CASE tool realizations of this model to contain information about layout and ordering of the method element and its parts."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="orderingGuide"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="suppressed" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If a Variability Element is derived from another Variability Element using the &quot;extends&quot; Variability Specialization, then this attribute can be used to suppress inherited Method Elements that were part of the based-on Variability Element, which can be any type of Method Element.  In other words, if this attribute is set to true on a Method Element that has the same name than an inherited method element then it will not be regarded as inherited at all."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="suppressed"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodLibrary" eSuperTypes="#//MethodUnit">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Method Library is a physical container for Method Plugins and Method Configuration definitions.  All Method Elements are stored in a Method Library."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="MethodLibrary"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPlugin" upperBound="-1"
-        eType="#//MethodPlugin" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MethodPlugin"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodConfiguration" upperBound="-1"
-        eType="#//MethodConfiguration" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MethodConfiguration"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tool" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodPackage" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An abstract class for packaging Method Elements.  All Method Elements shall be located in exactly one of Method Package's concrete specializations (e.g. Content Package).   Method Package defines common properties for all of its specializations. Elements are organized in Method Packages to structure large scale of method content and processes as well as to define a mechanism for reuse.  Method Elements from one package can reuse element from other packages by defining a reusedPackages link.  For example, a work product defined in one package can be used as an input for Tasks defined in other packages.  By reusing it from one common place (i.e. the package in which it has been defined) ensures that no redundant definitions of the same elements are required.  Also maintenance of method content is greatly improved as changes can be performed in only one place.  Note, that other packages will introduce more specializations of Method Package, e.g. Process Package and Process Component."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="MethodPackage"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group1" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:7"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="reusedPackage" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ReusedPackage"/>
-        <details key="group" value="#group:7"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPackage" upperBound="-1"
-        eType="#//MethodPackage" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MethodPackage"/>
-        <details key="group" value="#group:7"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="global" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Method Packages can have a global scope.  This means that every element of every other Method Package can see the global package's contents.  Global Method Packages are primarily used to store commonly used category definitions such as for Disciplines or Domains, which are used by many Task and Work Products respectively."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="global"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodPlugin" eSuperTypes="#//MethodUnit">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Method Unit that represents a physical container for Method Packages.  It defines a granularity level for the modularization and organization of method content and processes.  A Method Plugin can extend many other Method Plugins and it can be extended by many Method Plugins.  It can also be used stand-alone, i.e. with no Extension relationship to other plug-ins.&#xD;&#xA;Method Plugin conceptually represents a unit for configuration, modularization, extension, packaging, and deployment of method content and processes.  A Process Engineer shall design his Plugins and allocate his content to these Plugins with requirements for extensibility, modularity, reuse, and maintainability in mind.&#xD;&#xA;Special extensibility mechanisms defined for the meta-classes Variability Element and Process Contribution allow Plugin content to directly contribute new content, replace existing content, or to cross-reference to any Content Element or Process within another Plugin that it extends.  Similar to UML 2.0's 'package merge' mechanism transformation interpretations, interpreting these Method Plugin mechanisms results into new extended Method Content and Processes."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="MethodPlugin"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="referencedMethodPlugin"
-        unique="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ReferencedMethodPlugin"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodPackage" upperBound="-1"
-        eType="#//MethodPackage" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MethodPackage"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="userChangeable" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="userChangeable"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodUnit" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Method Element that shall be maintained in a Method Library as a separate unit of control."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="MethodUnit"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="copyright" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Copyright"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="authors" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Method Unit is being created and owned by an author or authoring team."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="authors"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="changeDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date the last change that resulted into this version has been made."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="changeDate"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="changeDescription" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The description of the last change that resulted into this version."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="changeDescription"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Package has a version number used to track changes."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="version"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Milestone" eSuperTypes="#//WorkBreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Breakdown Element that describes a significant event in a development project, such as a major decision, completion of a deliverable, or meeting of a major dependency (like completion of a project phase).  Because, Milestone is commonly used to refer to both the event itself and the point in time at which the event is scheduled to happen, it is modeled as a Breakdown Element (i.e. it appears as part of a breakdown structure)."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Milestone"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NamedElement" eSuperTypes="#//Element">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A UML 2.0 meta-class Named Element."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="NamedElement"/>
-      <details key="kind" value="empty"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="name"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Outcome" eSuperTypes="#//WorkProduct">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Work Product that describes intangible work products that are a result or state. Outcomes may also be used to describe work products that are not formally defined.  A key differentiator for outcomes against artifacts is that outcomes are not candidates for harvesting as reusable assets."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Outcome"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PackageableElement" eSuperTypes="#//NamedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A UML 2.0 meta-class Packagable Element."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="PackageableElement"/>
-      <details key="kind" value="empty"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Phase" eSuperTypes="#//Activity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Activity which prescribes pre-defined values for its instances for the attributes prefix ('Phase') and isRepeatable ('False').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.&#xD;&#xA;Phase represent a significant period in a project, ending with major management checkpoint, milestone or set of Deliverables.  It is included in the model as a predefined special Activity, because of its significance in defining breakdowns."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Phase"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PlanningData" eSuperTypes="#//ProcessElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Process Element that adds planning data to Breakdown Elements when it is used for a Process Planning Template.  For Delivery Processes and Capability Patterns this class can either not be instantiated or populated with default data.&#xD;&#xA;Planning Data factors out specific optional data needed for representing planning templates.  This association allows to access planning data if it is stored for the Breakdown Element.&#xD;&#xA;(NOTE, THE ATTRIBUTES FOR THIS CLASS ARE NOT COMPLETE, YET)"/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="PlanningData"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="finishDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default finish date for a planed Task."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="finishDate"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rank" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default rank for a planed Task."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="rank"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="startDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The default start date for a planed Task."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="startDate"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Practice" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A specific type of guidance that represents a proven way or strategy of doing work to achieve a goal that has a positive impact on work product or process quality.  Practices are defined orthogonal to methods and processes.  They could summarize aspects that impact many different parts of a method or specific processes.  Examples for practices would be &quot;Manage Risks&quot;, &quot;Continuously verify quality&quot;, &quot;Architecture-centric and component-based development&quot;, etc."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Practice"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activityReference" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ActivityReference"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="contentReference" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ContentReference"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subPractice" upperBound="-1"
-        eType="#//Practice" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SubPractice"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PracticeDescription" eSuperTypes="#//ContentDescription">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A generalized Content Description that is used to store the textual description for a Practice."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="PracticeDescription"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="additionalInfo" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Any additional Information not covered by the other attributes."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AdditionalInfo"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="application" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes how the Practice is being applied or introduced into the context described in background."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Application"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="background" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Elaboration on the background and the context in which the problem occurs and where the solution described by this Practice will fit in."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Background"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="goals" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A summary of the overall goals to be addressed by the Practice."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Goals"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="levelsOfAdoption" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Outlines the different forms or variants in which the practice could be realized. (e.g. full adoption verus a partial adoption of the Practice)"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="LevelsOfAdoption"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="problem" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A description of the problem the Practice addresses."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Problem"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Process" eSuperTypes="#//Activity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Activity that describes a structure for particular types of development projects.  To perform such a development project a Processes would be 'instantiated' and adapted for the specific situation.  Process is an abstract class and this meta-model defines different special types of Processes for different process management applications and different situations of process reuse.  Every Process comprises of and is the top-level element of an n-level breakdown structure using the Nesting association defined on Activity.&#xD;&#xA;Core Method Content provides step-by-step explanations, describing how very specific development goals are achieved independent of the placement of these steps within a development lifecycle.  Processes take these method elements and relate them into semi-ordered sequences that are customized to specific types of projects.  Thus, a process is a set of partially ordered work descriptions intended to reach a higher development goal, such as the release of a specific software system.  A process and the process meta-model structure defined in this specification focuses on the lifecycle and the sequencing of work in breakdown structures.  To achieve this it uses the Descriptor concept referencing method content and allowing defining time-specific customizations of the referenced content (e.g. defining a focus on different steps of the same Task and providing input Work Products in different states within the different Phases of a process lifecycle in which the same Task is performed)."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Process"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="includesPattern" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="IncludesPattern"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultContext" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DefaultContext"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="validContext" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ValidContext"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessComponent" eSuperTypes="#//ProcessPackage">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Process Package that applies the principles of encapsulation.  A Process Component realizes one or more Interfaces which specify inputs and outputs of the component. There might be many components realizing the same interfaces, but using different techniques to achieve similar outputs for similar inputs.  Whereas the Component Interfaces represent component specifications (black box descriptions of the component), good candidates for component realizations can be found in Capability Patterns (white box descriptions for the component).&#xD;&#xA;UMA supports replaceable and reusable Process Components realizing the principles of encapsulation. Certain situations in a software development project might require that concrete realizations of parts of the process remain undecided or will be decided by the executing team itself (e.g. in outsourcing situations).  UMA provides a unique component concept defining interfaces for work product input and output, allowing treating the actual definition of the work that produces the outputs as a &quot;black box&quot;.  At any point during a project the component &quot;realization&quot; detailing the work can be added to the process.  The component approach also allows that different styles or techniques of doing work can be replaced with one another.  For example, a software code output of a component could be produced with a model-driven development or a code-centric technique.  The component concept encapsulates the actual work and lets the development team choose the appropriate technique and fill the component's realization with their choice of Activities that produce the required outputs."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ProcessComponent"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="copyright" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Copyright"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="interface" eType="#//ProcessComponentInterface"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Interface"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="process" lowerBound="1"
-        eType="#//Process" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Process"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="authors" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Method Unit is being created and owned by an author or authoring team."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="authors"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="changeDate" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The date the last change that resulted into this version has been made."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="changeDate"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="changeDescription" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The description of the last change that resulted into this version."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="changeDescription"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Package has a version number used to track changes."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="version"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessComponentInterface" eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Comprises of a list of interface specifications (similar to operation declarations) that express inputs and outputs for a process component.  These interface specifications are expressed using Task Descriptors which are not linked to Tasks that are related to Work Product Descriptors as well as optional a Role Descriptor."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ProcessComponentInterface"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group1" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:19"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="interfaceSpecification"
-        upperBound="-1" eType="#//TaskDescriptor" volatile="true" transient="true"
-        derived="true" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="InterfaceSpecification"/>
-        <details key="group" value="#group:19"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="interfaceIO" upperBound="-1"
-        eType="#//WorkProductDescriptor" volatile="true" transient="true" derived="true"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="InterfaceIO"/>
-        <details key="group" value="#group:19"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessDescription" eSuperTypes="#//ActivityDescription">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A generalized Activity Description that is used to store the textual description for a Process."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ProcessDescription"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scope" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the scope of the Process, i.e. which types of projects does it address and which not."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Scope"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="usageNotes" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Any additional notes on how to apply and instantiate this process for a project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="UsageNotes"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalId" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="An external visible number that is used to reference this delivery patterns and models. It is used like a synonym."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="externalId"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessElement" eSuperTypes="#//DescribableElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Describable Element that represents an abstract generalization for all elements defined in the Process package.&#xD;&#xA;Process Elements represents Process specific elements that are supposed to be managed in Process Packages.  The separation of Process Element from Content Element allows to clearly distinguish between pure method content from content that is represented in processes. "/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ProcessElement"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessPackage" eSuperTypes="#//MethodPackage">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Method Package that contains Process Elements, only.&#xD;&#xA;A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ProcessPackage"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:11"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="processElement" upperBound="-1"
-        eType="#//ProcessElement" volatile="true" transient="true" derived="true"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ProcessElement"/>
-        <details key="group" value="#group:11"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProcessPlanningTemplate" eSuperTypes="#//Process">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Process that is prepared for instantiation by a project planning tool.  Typically, it is created based on a Process such as a Delivery Process as a whole (e.g. in case of a waterfall-based development approach) or in parts (e.g. in case of an iterative development approach).&#xD;&#xA;A Process Planning Template represents a partially finished plan for a concrete project.  It uses the same information structures as all other Process Types to represent templates for project plans.  However, certain planning decisions have already been applied to the template as well as information has been removed and/or reformatted to be ready for export to a specific planning tool.  Examples for such decisions are: a template has been created to represent a plan for a particular Iteration in an iterative development project, which fr example distinguishes early from late iterations in the Elaboration phase of a project; if the targeted planning tool cannot represent input and output of Task, then these have been removed from the structure; certain repetitions have been already applied, e.g. stating that a cycle of specific Task grouped in an Activity have to be repeated n-times; etc."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ProcessPlanningTemplate"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group3" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:42"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseProcess" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="BaseProcess"/>
-        <details key="group" value="#group:42"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Report" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A predefined template of a result that is generated on the basis of other work products as an output from some form of tool automation. An example for a report would be a use case model survey, which is generated by extracting diagram information from a graphical model and textual information from documents and combines these two types of information into a report."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Report"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ReusableAsset" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A specific type of guidance that provides a solution to a problem for a given context. The asset may have a variability point, which is a location in the asset that may have a value provided or customized by the asset consumer. The asset has rules for usage which are the instructions describing&#xD;&#xA;how the asset should be used."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ReusableAsset"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Roadmap" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A specific type of Guidance which is only related to Activates and therefore has been added by this package to the list of Guidance Types rather than listed in the Guidance Types package.  A Roadmap represents a linear walkthrough of an Activity, typically a Process.&#xD;&#xA;An instance of a Roadmap represents important documentation for the Activity or Process it is related to.  Often a complex Activity such as a Process can be much easier understood by providing a walkthrough with a linear thread of a typical instantiation of this Activity.  In addition to making the process practitioner understand how work in the process is being performed, a Roadmap provides additional information about how Activities and Tasks relate to each other over time.  Roadmaps are also used to show how specific aspects are distributed over a whole process providing a kind of filter on the process for this information."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Roadmap"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Role" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Content Element that defines a set of related skills, competencies, and responsibilities.  Roles are used by Tasks to define who performs them as well as define a set of work products they are responsible for.  &#xD;&#xA;A Role defines a set of related skills, competencies, and responsibilities of an individual or a set of individuals.  Roles are not individuals or resources.  Individual members of the development organization will wear different hats, or perform different roles. The mapping from individual to role, performed by the project manager when planning and staffing for a project, allows different individuals to act as several different roles, and for a role to be played by several individuals."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Role"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="responsibleFor" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ResponsibleFor"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleDescription" eSuperTypes="#//ContentDescription">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A generalized Content Description that is used to store the textual description for a Role."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="RoleDescription"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="assignmentApproaches" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Provides guidance on for assigning individuals to the Role in terms of what other roles these individuals could perform and what responsibility different individuals assigned to this role might have.  The guidance can also describe different assignment approaches for different types of projects, e.g. for large versus small teams where individuals could be allocated to roles full time versus sharing roles within the team."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AssignmentApproaches"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="skills" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Lists of set of required skills a person needs to possess to fulfill that Role."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Skills"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="synonyms" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Lists synonyms, i.e. other names the Role might be referred by.  Tool support for the meta-model might support that a Role name can be consistently be replaced with one of its synonyms throught a Process."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Synonyms"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleDescriptor" eSuperTypes="#//Descriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Descriptor that represents a Role in the context of one specific Activity.  Every breakdown structure can define different relationships of Role Descriptors to Task Descriptors and Work Product Descriptors.  Therefore one Role can be represented by many Role Descriptors each within the context of an Activity with its own set of relationships."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="RoleDescriptor"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="role" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Role"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="responsibleFor" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ResponsibleFor"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleSet" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Organizes Roles into categories.  It is used to group roles together that have certain commonalities.  For example, the &quot;Analysts&quot; Role Set could group the &quot;Business Process Analyst&quot;, &quot;System Analyst&quot;, as well as &quot;Requirements Specifier&quot; roles.  All of these work with similar techniques and have overlapping skills, but are required as distinct roles for a method (e.g. the method the IBM Rational Unified Process is based on)."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="RoleSet"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="role" unique="false" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String" volatile="true"
-        transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Role"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoleSetGrouping" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Role Sets can be categorized into Role Set Groupings.  For example, different methods might define similar Role Sets, which however need to be distinguished from each other on a global scale.  Thus, Role Set Groupings allow distinguishing, for example, Software Services Manager Role Sets from Software Development Organization Manager Role Sets."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="RoleSetGrouping"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="roleSet" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="RoleSet"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Section" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Method Element that represents structural subsections of a Content Description's sectionDescription attribute.  It is used for either large scale documentation of Content Elements organized into sections as well as to flexibly add new Sections to Content Elements using contribution variability added to the Section concept for Method Plug-ins."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Section"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subSection" eType="#//Section"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SubSection"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="predecessor" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Predecessor"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attributes store the description text for a Content Description's Section."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Description"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sectionName" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Every Section has a name used for external presentation of the section, e.g. when published or when section heading are listed in a table of contents.  This attribute is similar to Presentation Name for Content Elements."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="sectionName"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="variabilityBasedOnElement"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="variabilityBasedOnElement"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="variabilityType" unique="false"
-        eType="#//VariabilityType" defaultValueLiteral="na" unsettable="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="variabilityType"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SupportingMaterial" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A catchall for other types of guidance not specifically defined elsewhere. It can be related to all kinds of Content Elements, i.e. including other guidance elements."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="SupportingMaterial"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Task" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Content Element that describes work being performed by Roles.  It defines one default performing Role as well as many additional performers.  A Task is associated to input and output work products.  Inputs are differentiated in mandatory versus optional inputs.  The associations to Work Products are not instantiatable/variable-like parameters.  They rather express (hyper-)links to the descriptions of the work products types that are related to the Task as inputs and outputs.  In other words, these associations are not intended to be used to capture which concrete instances will be passed when instantiating the method in a project.  All of the Task's default associations can be overridden in an actual process definition.&#xD;&#xA;A Task describes an assignable unit of work.  Every Task is assigned to specific Roles.  The granularity of a Task is generally a few hours to a few days.  It usually affects one or only a small number of work products. A Task is used as an element of defining a process. Tasks are further used for planning and tracking progress; therefore, if they are defined too fine-grained, they will be neglected, and if they are too large, progress would have to be expressed in terms of a Task's parts (e.g. Steps, which is not recommended). &#xD;&#xA;A Task has a clear purpose in which the performing roles achieve a well defined goal.  It provides complete step-by-step explanations of doing all the work that needs to be done to achieve this goal.  This description is complete, independent of when in a process lifecycle the work would actually be done.  It therefore does not describe when you do what work at what point of time, but describes all the work that gets done throughout the development lifecycle that contributes to the achievement of this goal.  When the Task is being applied in a process then this process application (defined as Task Descriptor) provides the information of which pieces of the Task will actually be performed at any particular point in time. This assumes that the Task will be performed in the process over and over again, but each time with a slightly different emphasis on different steps or aspects of the task description. &#xD;&#xA;For example, a Task such as &quot;Develop Use Case Model&quot; describes all the work that needs to be done to develop a complete use case model. This would comprise of the identification and naming of use cases and actors, the writing of a brief description, the modeling of use cases and their relationships in diagrams, the detailed description of a basic flow, the detailed description of alternatives flows, performing of walkthroughs workshops and reviews, etc.  All of these parts contribute to the development goal of developing the use case model, but the parts will be performed at different points in time in a process.  Identification, naming, and brief descriptions would be performed early in a typical development process versus the writing of detailed alternative flows which would be performed much later.  All these parts or steps within the same Task define the &quot;method&quot; of Developing a Use Case Model.  Applying such a method in a lifecycle (i.e. in a process) is defining which steps are done when going from one iteration to the next."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Task"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="precondition" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Precondition"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="postcondition" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Postcondition"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="performedBy" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PerformedBy"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:24"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mandatoryInput" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MandatoryInput"/>
-        <details key="group" value="#group:24"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="output" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Output"/>
-        <details key="group" value="#group:24"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="additionallyPerformedBy"
-        unique="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AdditionallyPerformedBy"/>
-        <details key="group" value="#group:24"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="optionalInput" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OptionalInput"/>
-        <details key="group" value="#group:24"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="estimate" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Estimate"/>
-        <details key="group" value="#group:24"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="estimationConsiderations"
-        unique="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EstimationConsiderations"/>
-        <details key="group" value="#group:24"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="toolMentor" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ToolMentor"/>
-        <details key="group" value="#group:24"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TaskDescription" eSuperTypes="#//ContentDescription">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A generalized Content Description that is used to store the textual description for a Task."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="TaskDescription"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alternatives" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Comprises of summaries describing important exceptional and non-standard ways of achieving this Task's development goals that were not covered by the Task's Steps."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Alternatives"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="purpose" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Summarizes the main reason for performing this Task and what is intended to be achieved."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Purpose"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TaskDescriptor" eSuperTypes="#//WorkBreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Descriptor that represents a proxy for a Task in the context of one specific Activity.  Every breakdown structure can define different relationships of Task Descriptors to Work Product Descriptors and Role Descriptors. Therefore one Task can be represented by many Task Descriptors each within the context of an Activity with its own set of relationships.&#xD;&#xA;A key difference between Method Content and Process is that a Content Element such as Task describes all aspects of doing work defined around this Task.  This description is managed in steps, which are modeled as Sections of the Tasks' Content Descriptions.  When applying a Task in a Process' Activity with a Task Descriptor a Process Engineer needs to indicate that at that particular point in time in the Process definition for which the Task Descriptor has been created, only a subset of steps shall be performed.  He defines this selection using the selectedSteps association.  If he wants to add steps to a Task Descriptor, he can describe these either pragmatically in the refinedDescription attribute or 'properly' create a contributing Task to the Task the Task Descriptor refers to.&#xD;&#xA;"/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="TaskDescriptor"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="task" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Task"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="performedPrimarilyBy" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="PerformedPrimarilyBy"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="additionallyPerformedBy"
-        unique="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AdditionallyPerformedBy"/>
-        <details key="group" value="#group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="assistedBy" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="AssistedBy"/>
-        <details key="group" value="#group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalInput" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ExternalInput"/>
-        <details key="group" value="#group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mandatoryInput" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="MandatoryInput"/>
-        <details key="group" value="#group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="optionalInput" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="OptionalInput"/>
-        <details key="group" value="#group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="output" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Output"/>
-        <details key="group" value="#group:26"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="step" upperBound="-1" eType="#//Section"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Step"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSynchronizedWithSource"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="isSynchronizedWithSource"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TeamProfile" eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A Breakdown Element that groups Role Descriptors or Resource Definitions defining a nested hierarchy of teams and team members.&#xD;&#xA;Work assignments and Work Product responsibilities can be different from Activity to Activity in a development project. Different phases require different staffing profiles, i.e. different skills and resources doing different types of work.  Therefore, a process needs to define such different profiles in a flexible manner.  Whereas Core Method Content defines standard responsibilities and assignments, a process express by a breakdown structures needs to be able refine and redefine these throughout its definition.  Role Descriptors, Resource Definitions, as well as Team Profiles provide the data structure necessary to achieve this flexibility and to provide a process user with the capability to define different teams and role relationships for every Activity (including Activities on any nesting-level as well as Iterations or Phases).&#xD;&#xA;Hence, in addition to the work breakdown and work product breakdown structures defined so far, Team Profiles are used to define a third type of breakdown structure: team breakdown structures.  These are created as an Activity specific hierarchy of Team Profiles comprising of Role Descriptors and Resource Definitions.  These structures can be presented as well-known Org-Charts.  Just as with any other Breakdown Element and Descriptors, Team Profiles can be defined within the scope of any Activity in a breakdown structure.  In other words every Activity can define its own Team Profiles consisting of Activity specific Role Descriptors and Resource Definitions.  Typically, Team Profiles are defined on the level of Iterations or Phases or other higher-level Activity."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="TeamProfile"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group1" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:19"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="role" unique="false" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String" volatile="true"
-        transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Role"/>
-        <details key="group" value="#group:19"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="superTeam" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SuperTeam"/>
-        <details key="group" value="#group:19"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="subTeam" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="SubTeam"/>
-        <details key="group" value="#group:19"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Template" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A specific type of guidance that provides for a work product a pre-defined table of contents, sections, packages, and/or headings, a standardized format, as well as descriptions how the sections and packages are supposed to be used and completed. Templates cannot only be provided for documents, but also for conceptual models or physical data stores."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Template"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TermDefinition" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A specific type of guidance that defines concepts and are used to build up the Glossary. TermDefinitions are not directly related to ContentElements, but their relationship is being derived when the Term is used in the ContentElements description text."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="TermDefinition"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Tool" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A container/aggregate for ToolMentors.  It can also provide general descriptions of the tool and its general capabilities."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Tool"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="toolMentor" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ToolMentor"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ToolMentor" eSuperTypes="#//Guidance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A  specific type of guidance that shows how to use a specific tool to accomplish some piece of work a Work Product either in the context of or independent from a Task or Activity."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ToolMentor"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="VariabilityType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An Enumeration used for values for instances of Variability Element's attribute variabilityType.  It defines the nature of how a Variability Element extends another Variability Element. See enumeration literals for definitions for each type."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="VariabilityType"/>
-    </eAnnotations>
-    <eLiterals name="na"/>
-    <eLiterals name="contributes" value="1"/>
-    <eLiterals name="extends" value="2"/>
-    <eLiterals name="replaces" value="3"/>
-    <eLiterals name="localContribution" value="4"/>
-    <eLiterals name="localReplacement" value="5"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="VariabilityTypeObject" instanceClassName="org.eclipse.emf.common.util.Enumerator">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="VariabilityType:Object"/>
-      <details key="baseType" value="VariabilityType"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Whitepaper" eSuperTypes="#//Concept">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Concept guidance that have been externally reviewed or published and can be read and understood in isolation of other content elements and guidance."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Whitepaper"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkBreakdownElement" eSuperTypes="#//BreakdownElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Breakdown Element that provides specific properties for Breakdown Elements that represent or refer to Work Definitions.  For example its subclass Activity defines work as it is also a subclass of Work Definition.  Its subclass Task Descriptor does not define work by itself, but refers to a Work Definition and therefore can have the same common properties and Work Breakdown Element has."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkBreakdownElement"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group1" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:19"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="predecessor" upperBound="-1"
-        eType="#//WorkOrder" volatile="true" transient="true" derived="true" containment="true"
-        resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Predecessor"/>
-        <details key="group" value="#group:19"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isEventDriven" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The isEventDriven attribute indicates that the Process Work Definition describes an instance of work which is not started because it has been scheduled to start at a certain point of time, because preceding work is being completed, or input work products are available, but because another specific event has occurred.  Examples for such events are exceptions or problem situations which require specific work to be performed as a result.  Also change management work can be modeled as event driven work analyzing a change request or defect and allocating work dynamically to resources to deal with it following the work described with such Process Work Definition.  The events themselves are not modeled in this version of the specification.  They shall be described as part of the normal descriptions fields available.&#xD;&#xA;"/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="isEventDriven"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isOngoing" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If the isOngoing attribute is set to True for a Process Work Definition instance, then the element describes an ongoing piece of work without a fixed duration or end state.  For example, the Process Work Definition could represent work of an administrator continuously (e.g. 3h a day) working to ensure that systems are kept in a certain state.  Another example would be program management work overseeing many different projects being scheduled for one particular project at specific reoccurring intervals during the whole lifecycle of the project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="isOngoing"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isRepeatable" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute is used to define repetition of work, e.g. iterations.  A Process Work Definition with this attribute set to True shall be repeated more than once on the same set of artifacts.  For example, for an instance of Iteration (defined as a special Process Work Definition below) this attribute is set to True by default indicating that every sub-Activity will be repeated more than once.  However, any Process Work Definition can set this attribute to True to define iterations (e.g. to iterate one Activity consisting of many sub-activities or even Phases, but to iterate just one Task)."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="isRepeatable"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkDefinition" eSuperTypes="#//MethodElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An abstract Method Element that generalizes all descriptions of work within the Unified Method Architecture.  This package introduces two concrete types of Work Definitions: Task and Step.  Work Definitions can contain sets of pre- and post-conditions defining constraints that need to be valid before the described work can begin or before it can be declared as finished.  Note that general ownedRules can be used to define additional constraints and rules for Work Definitions.&#xD;&#xA;Work Definitions represent behavioral descriptions for doing work.  These behavioral descriptions are not bound to one specific classifier, but represent an arbitrary definition of work.  For example, a Work Definition could represent work that is being performed by a specific Role (e.g. a Role performing a specific Task or Steps of a Task), by many Roles working in close collaboration (many Roles all working together on the same interdisciplinary Task), or complex work that is performed throughout the lifecycle (e.g. a process defining a breakdown structure for organizing larger composite units of work performed by many Roles working in collaboration)."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkDefinition"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="precondition" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Precondition"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="postcondition" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Postcondition"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkOrder">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represents a relationship between two Breakdown Elements in which one Breakdown Elements depends on the start or finish of another Breakdown Elements in order to begin or end.  &#xD;&#xA;The Work Order class defines predecessor and successor relations amongst Breakdown Elements.  This information is in particular critical for planning applications.  See more details on different types of Work Order relationships at Work Order Type."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkOrder"/>
-      <details key="kind" value="simple"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value=":0"/>
-        <details key="kind" value="simple"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="linkType" unique="false"
-        eType="#//WorkOrderType" defaultValueLiteral="finishToStart" unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This attribute expresses the type of the Work Order relationship by assigning a value from the Work Order Type enumeration."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="linkType"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="WorkOrderType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represents a relationship between two Breakdown Element in which one Breakdown Element depends on the start or finish of another Breakdown Element in order to begin or end. This enumeration defines the different types of Work Order relationships available in UMA and is used to provide values for Work Order's linkType attribute."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkOrderType"/>
-    </eAnnotations>
-    <eLiterals name="finishToStart"/>
-    <eLiterals name="finishToFinish" value="1"/>
-    <eLiterals name="startToStart" value="2"/>
-    <eLiterals name="startToFinish" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="WorkOrderTypeObject" instanceClassName="org.eclipse.emf.common.util.Enumerator">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkOrderType:Object"/>
-      <details key="baseType" value="WorkOrderType"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProduct" eSuperTypes="#//ContentElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An abstract class which provides a generalization for the content element types Artifact, Outcome, and Deliverable.  The meta-model class Work Product actually represents work product types, i.e. an instance of Work Product is a description of a specific type of work product and not an individual work product instance.  However, for simplicity reasons and because of low risk of misinterpretation we did not append the word 'type' to every meta-class.&#xD;&#xA;A work product is an abstraction for descriptions of content elements that are used to define anything used, produced, or modified by a task."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkProduct"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="estimate" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Estimate"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="estimationConsiderations"
-        unique="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="EstimationConsiderations"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="report" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Report"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="template" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Template"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="toolMentor" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ToolMentor"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductDescription" eSuperTypes="#//ContentDescription">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A generalized Content Description that is used to store the textual description for a Work Product."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkProductDescription"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="impactOfNotHaving" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the consequences of not producing the work product.  This is intended to aid in the tailoring the method/process to the needs of a specific project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ImpactOfNotHaving"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="purpose" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes why the work product is produced and to what use it will be put."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Purpose"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="reasonsForNotNeeding" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the circumstances in which it is reasonable not to produce the work product.  This is intended to aid in the tailoring of the method/process to the needs of a specific project."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ReasonsForNotNeeding"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalId" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="An external visible number that is used to reference this artifact. Used like a synonym."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="externalId"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductDescriptor" eSuperTypes="#//Descriptor">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A special Descriptor that represents a Work Product in the context of one specific Activity.  Every breakdown structure can define different relationships of Work Product Descriptors to Task Descriptors and Role Descriptors.  Therefore one Work Product can be represented by many Work Product Descriptors each within the context of an Activity with its own set of relationships."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkProductDescriptor"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workProduct" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkProduct"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group1" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:22"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="impactedBy" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ImpactedBy"/>
-        <details key="group" value="#group:22"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="impacts" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Impacts"/>
-        <details key="group" value="#group:22"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deliverableParts" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="DeliverableParts"/>
-        <details key="group" value="#group:22"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activityEntryState" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Entry State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is initiated (i.e. work on the Activity's Task Descriptors is being initiated that use this Work Product Descriptor as input).  &#xD;&#xA;For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested]."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="activityEntryState"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activityExitState" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Exist State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is finished (i.e. work on the Activity's Task Descriptors has finished that have this Work Product Descriptor as output).&#xD;&#xA;For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested]."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="activityExitState"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkProductType" eSuperTypes="#//ContentCategory">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A second category for work products, which in contrast to Domain is more presentation oriented.  A work product can have many Work Product Types.  Examples, for a Work Product Type is &quot;Class Diagram&quot;, which categorizes the Artifacts Analysis Model, Design Model, User Experience Model, or &quot;Specification&quot;, which categorizes requirements specifications that define a system with a well-defined system boundary, such as use case or functional requirements specification.  A Work Product can be categorized to be of many Work Product Types.  For example, a use case model can be categorized as a Specification as well as Diagram Work Product Type."/>
-    </eAnnotations>
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="WorkProductType"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="group2" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="group"/>
-        <details key="name" value="group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="workProduct" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
-        volatile="true" transient="true" derived="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="WorkProduct"/>
-        <details key="group" value="#group:21"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.epf.xml.uma/src/model/UMA.genmodel b/plugins/org.eclipse.epf.xml.uma/src/model/UMA.genmodel
deleted file mode 100755
index cfd3858..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/model/UMA.genmodel
+++ /dev/null
@@ -1,406 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.epf.xml.uma/src"
-    editDirectory="/org.eclipse.epf.xml.uma.edit/src" editorDirectory="/org.eclipse.epf.xml.uma.editor/src"
-    modelPluginID="org.eclipse.epf.xml.uma" templateDirectory="" modelName="UMA" editPluginClass="org.eclipse.epf.xml.uma.edit.UMAEditPlugin"
-    editorPluginClass="org.eclipse.epf.xml.uma.editor.UMAEditorPlugin" rootExtendsInterface="org.eclipse.emf.ecore.sdo.EDataObject"
-    rootExtendsClass="org.eclipse.emf.ecore.sdo.impl.EDataObjectImpl" rootImplementsInterface=""
-    testSuiteClass="org.eclipse.epf.xml.uma.tests.UMAAllTests" importerID="org.eclipse.xsd.ecore.importer">
-  <foreignModel>file:/D:/shares/xml-uma-v10/EPF_Schema_200606191100.xsd</foreignModel>
-  <genPackages prefix="Uma" basePackage="org.eclipse.epf.xml" resource="XML" disposableProviderFactory="true"
-      ecorePackage="UMA.ecore#/">
-    <genEnums ecoreEnum="UMA.ecore#//VariabilityType">
-      <genEnumLiterals ecoreEnumLiteral="UMA.ecore#//VariabilityType/na"/>
-      <genEnumLiterals ecoreEnumLiteral="UMA.ecore#//VariabilityType/contributes"/>
-      <genEnumLiterals ecoreEnumLiteral="UMA.ecore#//VariabilityType/extends"/>
-      <genEnumLiterals ecoreEnumLiteral="UMA.ecore#//VariabilityType/replaces"/>
-      <genEnumLiterals ecoreEnumLiteral="UMA.ecore#//VariabilityType/localContribution"/>
-      <genEnumLiterals ecoreEnumLiteral="UMA.ecore#//VariabilityType/localReplacement"/>
-    </genEnums>
-    <genEnums ecoreEnum="UMA.ecore#//WorkOrderType">
-      <genEnumLiterals ecoreEnumLiteral="UMA.ecore#//WorkOrderType/finishToStart"/>
-      <genEnumLiterals ecoreEnumLiteral="UMA.ecore#//WorkOrderType/finishToFinish"/>
-      <genEnumLiterals ecoreEnumLiteral="UMA.ecore#//WorkOrderType/startToStart"/>
-      <genEnumLiterals ecoreEnumLiteral="UMA.ecore#//WorkOrderType/startToFinish"/>
-    </genEnums>
-    <genDataTypes ecoreDataType="UMA.ecore#//VariabilityTypeObject"/>
-    <genDataTypes ecoreDataType="UMA.ecore#//WorkOrderTypeObject"/>
-    <genClasses ecoreClass="UMA.ecore#//Activity">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Activity/precondition"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Activity/postcondition"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//Activity/group2"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//Activity/breakdownElement"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Activity/checklist"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Activity/concept"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Activity/example"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Activity/guideline"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Activity/roadmap"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Activity/reusableAsset"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Activity/supportingMaterial"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Activity/whitepaper"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Activity/isEnactable"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Activity/variabilityBasedOnElement"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Activity/variabilityType"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//ActivityDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ActivityDescription/alternatives"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ActivityDescription/howToStaff"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ActivityDescription/purpose"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//Artifact">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//Artifact/group3"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//Artifact/containedArtifact"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//ArtifactDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ArtifactDescription/briefOutline"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ArtifactDescription/representationOptions"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//BreakdownElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//BreakdownElement/presentedAfter"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//BreakdownElement/presentedBefore"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//BreakdownElement/planningData"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//BreakdownElement/superActivity"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//BreakdownElement/hasMultipleOccurrences"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//BreakdownElement/isOptional"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//BreakdownElement/isPlanned"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//BreakdownElement/prefix"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//BreakdownElementDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//BreakdownElementDescription/usageGuidance"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//CapabilityPattern"/>
-    <genClasses ecoreClass="UMA.ecore#//Checklist"/>
-    <genClasses ecoreClass="UMA.ecore#//CompositeRole">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//CompositeRole/group1"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//CompositeRole/aggregatedRole"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//Concept"/>
-    <genClasses ecoreClass="UMA.ecore#//Constraint">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Constraint/mainDescription"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//ContentCategory"/>
-    <genClasses ecoreClass="UMA.ecore#//ContentCategoryPackage">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//ContentCategoryPackage/group2"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//ContentCategoryPackage/contentCategory"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//ContentDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ContentDescription/mainDescription"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ContentDescription/keyConsiderations"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UMA.ecore#//ContentDescription/section"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//ContentElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//ContentElement/group1"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ContentElement/checklist"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ContentElement/concept"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ContentElement/example"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ContentElement/guideline"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ContentElement/reusableAsset"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ContentElement/supportingMaterial"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ContentElement/whitepaper"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ContentElement/variabilityBasedOnElement"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ContentElement/variabilityType"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//ContentPackage">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//ContentPackage/group2"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//ContentPackage/contentElement"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//CustomCategory">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//CustomCategory/group2"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//CustomCategory/categorizedElement"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//CustomCategory/subCategory"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//Deliverable">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//Deliverable/group3"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Deliverable/deliveredWorkProduct"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//DeliverableDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//DeliverableDescription/externalDescription"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//DeliverableDescription/packagingGuidance"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//DeliveryProcess">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//DeliveryProcess/group3"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//DeliveryProcess/communicationsMaterial"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//DeliveryProcess/educationMaterial"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//DeliveryProcessDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//DeliveryProcessDescription/scale"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//DeliveryProcessDescription/projectCharacteristics"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//DeliveryProcessDescription/riskLevel"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//DeliveryProcessDescription/estimatingTechnique"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//DeliveryProcessDescription/projectMemberExpertise"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//DeliveryProcessDescription/typeOfContract"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//DescribableElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UMA.ecore#//DescribableElement/presentation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//DescribableElement/nodeicon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//DescribableElement/presentationName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//DescribableElement/shapeicon"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//Descriptor">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Descriptor/isSynchronizedWithSource"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//DescriptorDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//DescriptorDescription/refinedDescription"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//Discipline">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//Discipline/group2"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Discipline/task"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//Discipline/subDiscipline"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Discipline/referenceWorkflow"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//DisciplineGrouping">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//DisciplineGrouping/group2"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//DisciplineGrouping/discipline"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//DocumentRoot">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//DocumentRoot/mixed"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//DocumentRoot/xMLNSPrefixMap"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//DocumentRoot/xSISchemaLocation"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//DocumentRoot/methodConfiguration"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//DocumentRoot/methodLibrary"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//DocumentRoot/methodPlugin"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//Domain">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//Domain/group2"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Domain/workProduct"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//Domain/subdomain"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//Element"/>
-    <genClasses ecoreClass="UMA.ecore#//Estimate">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//Estimate/group2"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Estimate/estimationMetric"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Estimate/estimationConsiderations"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//EstimatingMetric"/>
-    <genClasses ecoreClass="UMA.ecore#//EstimationConsiderations"/>
-    <genClasses ecoreClass="UMA.ecore#//Example"/>
-    <genClasses ecoreClass="UMA.ecore#//Guidance"/>
-    <genClasses ecoreClass="UMA.ecore#//GuidanceDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//GuidanceDescription/attachment"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//Guideline"/>
-    <genClasses ecoreClass="UMA.ecore#//Iteration"/>
-    <genClasses ecoreClass="UMA.ecore#//MethodConfiguration">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodConfiguration/baseConfiguration"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodConfiguration/methodPluginSelection"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodConfiguration/methodPackageSelection"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodConfiguration/defaultView"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodConfiguration/processView"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//MethodElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodElement/group"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//MethodElement/ownedRule"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodElement/briefDescription"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodElement/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodElement/orderingGuide"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodElement/suppressed"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//MethodLibrary">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UMA.ecore#//MethodLibrary/methodPlugin"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UMA.ecore#//MethodLibrary/methodConfiguration"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//MethodPackage">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodPackage/group1"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodPackage/reusedPackage"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//MethodPackage/methodPackage"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodPackage/global"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//MethodPlugin">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodPlugin/referencedMethodPlugin"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UMA.ecore#//MethodPlugin/methodPackage"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodPlugin/userChangeable"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//MethodUnit">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodUnit/copyright"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodUnit/authors"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodUnit/changeDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodUnit/changeDescription"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//MethodUnit/version"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//Milestone"/>
-    <genClasses ecoreClass="UMA.ecore#//NamedElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//NamedElement/name"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//Outcome"/>
-    <genClasses ecoreClass="UMA.ecore#//PackageableElement"/>
-    <genClasses ecoreClass="UMA.ecore#//Phase"/>
-    <genClasses ecoreClass="UMA.ecore#//PlanningData">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//PlanningData/finishDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//PlanningData/rank"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//PlanningData/startDate"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//Practice">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//Practice/group2"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Practice/activityReference"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Practice/contentReference"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//Practice/subPractice"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//PracticeDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//PracticeDescription/additionalInfo"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//PracticeDescription/application"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//PracticeDescription/background"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//PracticeDescription/goals"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//PracticeDescription/levelsOfAdoption"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//PracticeDescription/problem"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//Process">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Process/includesPattern"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Process/defaultContext"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Process/validContext"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//ProcessComponent">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ProcessComponent/copyright"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UMA.ecore#//ProcessComponent/interface"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UMA.ecore#//ProcessComponent/process"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ProcessComponent/authors"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ProcessComponent/changeDate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ProcessComponent/changeDescription"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ProcessComponent/version"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//ProcessComponentInterface">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//ProcessComponentInterface/group1"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//ProcessComponentInterface/interfaceSpecification"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//ProcessComponentInterface/interfaceIO"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//ProcessDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ProcessDescription/scope"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ProcessDescription/usageNotes"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ProcessDescription/externalId"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//ProcessElement"/>
-    <genClasses ecoreClass="UMA.ecore#//ProcessPackage">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//ProcessPackage/group2"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//ProcessPackage/processElement"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//ProcessPlanningTemplate">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//ProcessPlanningTemplate/group3"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//ProcessPlanningTemplate/baseProcess"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//Report"/>
-    <genClasses ecoreClass="UMA.ecore#//ReusableAsset"/>
-    <genClasses ecoreClass="UMA.ecore#//Roadmap"/>
-    <genClasses ecoreClass="UMA.ecore#//Role">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//Role/group2"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Role/responsibleFor"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//RoleDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//RoleDescription/assignmentApproaches"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//RoleDescription/skills"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//RoleDescription/synonyms"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//RoleDescriptor">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//RoleDescriptor/role"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//RoleDescriptor/responsibleFor"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//RoleSet">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//RoleSet/group2"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//RoleSet/role"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//RoleSetGrouping">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//RoleSetGrouping/group2"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//RoleSetGrouping/roleSet"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//Section">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UMA.ecore#//Section/subSection"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Section/predecessor"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Section/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Section/predecessor1"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Section/sectionName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Section/variabilityBasedOnElement"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Section/variabilityType"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//SupportingMaterial"/>
-    <genClasses ecoreClass="UMA.ecore#//Task">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Task/precondition"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Task/postcondition"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Task/performedBy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//Task/group2"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Task/mandatoryInput"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Task/output"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Task/additionallyPerformedBy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Task/optionalInput"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Task/estimate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Task/estimationConsiderations"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Task/toolMentor"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//TaskDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//TaskDescription/alternatives"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//TaskDescription/purpose"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//TaskDescriptor">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//TaskDescriptor/task"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//TaskDescriptor/performedPrimarilyBy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//TaskDescriptor/group2"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//TaskDescriptor/additionallyPerformedBy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//TaskDescriptor/assistedBy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//TaskDescriptor/externalInput"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//TaskDescriptor/mandatoryInput"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//TaskDescriptor/optionalInput"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//TaskDescriptor/output"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UMA.ecore#//TaskDescriptor/step"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//TaskDescriptor/isSynchronizedWithSource"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//TeamProfile">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//TeamProfile/group1"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//TeamProfile/role"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//TeamProfile/superTeam"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//TeamProfile/subTeam"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//Template"/>
-    <genClasses ecoreClass="UMA.ecore#//TermDefinition"/>
-    <genClasses ecoreClass="UMA.ecore#//Tool">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//Tool/group2"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//Tool/toolMentor"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//ToolMentor"/>
-    <genClasses ecoreClass="UMA.ecore#//Whitepaper"/>
-    <genClasses ecoreClass="UMA.ecore#//WorkBreakdownElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkBreakdownElement/group1"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UMA.ecore#//WorkBreakdownElement/predecessor"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkBreakdownElement/isEventDriven"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkBreakdownElement/isOngoing"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkBreakdownElement/isRepeatable"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//WorkDefinition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkDefinition/precondition"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkDefinition/postcondition"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//WorkOrder">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkOrder/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkOrder/linkType"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//WorkProduct">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProduct/group2"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProduct/estimate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProduct/estimationConsiderations"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProduct/report"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProduct/template"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProduct/toolMentor"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//WorkProductDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescription/impactOfNotHaving"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescription/purpose"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescription/reasonsForNotNeeding"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescription/externalId"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//WorkProductDescriptor">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescriptor/workProduct"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescriptor/responsibleRole"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescriptor/group1"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescriptor/externalInputTo"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescriptor/impactedBy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescriptor/impacts"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescriptor/mandatoryInputTo"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescriptor/optionalInputTo"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescriptor/outputFrom"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescriptor/deliverableParts"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescriptor/activityEntryState"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductDescriptor/activityExitState"/>
-    </genClasses>
-    <genClasses ecoreClass="UMA.ecore#//WorkProductType">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductType/group2"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UMA.ecore#//WorkProductType/workProduct"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.epf.xml.uma/src/model/UMA.xsd b/plugins/org.eclipse.epf.xml.uma/src/model/UMA.xsd
deleted file mode 100755
index 8b8e87e..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/model/UMA.xsd
+++ /dev/null
@@ -1,1387 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- EPF UMA XML Data Interchange Schema -->
-<xsd:schema xmlns:uma="http://www.eclipse.org/epf/uma/1.0.3" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.eclipse.org/epf/uma/1.0.3">
-	<xsd:simpleType name="WorkOrderType">
-		<xsd:annotation>
-			<xsd:documentation>Represents a relationship between two Breakdown Element in which one Breakdown Element depends on the start or finish of another Breakdown Element in order to begin or end. This enumeration defines the different types of Work Order relationships available in UMA and is used to provide values for Work Order's linkType attribute.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NCName">
-			<xsd:enumeration value="finishToStart"/>
-			<xsd:enumeration value="finishToFinish"/>
-			<xsd:enumeration value="startToStart"/>
-			<xsd:enumeration value="startToFinish"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="VariabilityType">
-		<xsd:annotation>
-			<xsd:documentation>An Enumeration used for values for instances of Variability Element's attribute variabilityType.  It defines the nature of how a Variability Element extends another Variability Element. See enumeration literals for definitions for each type.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NCName">
-			<xsd:enumeration value="na"/>
-			<xsd:enumeration value="contributes"/>
-			<xsd:enumeration value="extends"/>
-			<xsd:enumeration value="replaces"/>
-			<xsd:enumeration value="localContribution"/>
-			<xsd:enumeration value="localReplacement"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:complexType name="Element">
-		<xsd:annotation>
-			<xsd:documentation>A UML 2.0 meta-class Element.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:complexType>
-	<xsd:complexType name="NamedElement">
-		<xsd:annotation>
-			<xsd:documentation>A UML 2.0 meta-class Named Element.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Element">
-				<xsd:attribute name="name" type="xsd:string"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="PackageableElement">
-		<xsd:annotation>
-			<xsd:documentation>A UML 2.0 meta-class Packagable Element.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:NamedElement"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="MethodElement">
-		<xsd:annotation>
-			<xsd:documentation>The root generalization for all UMA Method Elements.  Defines a common set of attributes inherited by all UMA Method Elements.  Method Element itself is derived from Packageable Element from the UML 2.0 Infrastructure.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:PackageableElement">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="OwnedRule" type="uma:Constraint">
-						<xsd:annotation>
-							<xsd:documentation>Defines the packaging rules for this Method Element.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:choice>
-				<xsd:attribute name="id" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every instance of Method Element has a global unique id.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="briefDescription" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every instance of Method Element shall be briefly described with one or two sentences summarizing the element.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="suppressed" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>If a Variability Element is derived from another Variability Element using the "extends" Variability Specialization, then this attribute can be used to suppress inherited Method Elements that were part of the based-on Variability Element, which can be any type of Method Element.  In other words, if this attribute is set to true on a Method Element that has the same name than an inherited method element then it will not be regarded as inherited at all.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="orderingGuide" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Used for CASE tool realizations of this model to contain information about layout and ordering of the method element and its parts.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Constraint">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Method Element that represents a condition or restriction expressed in natural language text or in a machine readable language for the purpose of declaring some of the semantics of a Method Element.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:attribute name="mainDescription" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Stores the main definition of the constraint.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Section">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Element that represents structural subsections of a Content Description's sectionDescription attribute.  It is used for either large scale documentation of Content Elements organized into sections as well as to flexibly add new Sections to Content Elements using contribution variability added to the Section concept for Method Plug-ins.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="SubSection" type="uma:Section"/>
-					<xsd:element minOccurs="0" name="Predecessor" type="xsd:string"/>
-					<xsd:element minOccurs="0" name="Description" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>This attributes store the description text for a Content Description's Section.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-				<xsd:attribute name="sectionName" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Section has a name used for external presentation of the section, e.g. when published or when section heading are listed in a table of contents.  This attribute is similar to Presentation Name for Content Elements.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="variabilityType" type="uma:VariabilityType"/>
-				<xsd:attribute name="variabilityBasedOnElement" type="xsd:string"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="MethodUnit">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Element that shall be maintained in a Method Library as a separate unit of control.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="Copyright" type="xsd:string"/>
-				</xsd:sequence>
-				<xsd:attribute name="authors" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Method Unit is being created and owned by an author or authoring team.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="changeDate" type="xsd:dateTime">
-					<xsd:annotation>
-						<xsd:documentation>The date the last change that resulted into this version has been made.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="changeDescription" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>The description of the last change that resulted into this version.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="version" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Package has a version number used to track changes.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ContentDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Method Element that is used to store the textual description for a Content Element.  It defines standard attributes applicable for all Content Element types.  Specific Content Element sub-types can define their own matching Content Description sub-types. </xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodUnit">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="MainDescription" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Stores the main descriptive text for the Content Element.  All text that is not part of any of the more specific attributes shall be stored here.  If the Content Description is divided into sections using the Section class, then only the text from the 'start' of the content description to the first section will be stored here (similar to a normal document where you can place text between its beginning to its first diction heading).</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="KeyConsiderations" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Provides advise and guidance of a critical nature for the content element as well as warnings, cautions, pitfalls, dangers.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="Section" type="uma:Section"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="GuidanceDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Guidance.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:choice minOccurs="0">
-					<xsd:element name="Attachment" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>This field is primarily used for attachments augmenting the information provided for guidance.  In particular the attribute is used for Templates, Examples, and Reusable Assets to contain the actual attachment described in the mainDescription.  It can additionally contain representations of the guidance in just a third party format, e.g. PDF, MS Word, or Word Perfect.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="PracticeDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Practice.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="AdditionalInfo" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Any additional Information not covered by the other attributes.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="Application" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Describes how the Practice is being applied or introduced into the context described in background.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="Background" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Elaboration on the background and the context in which the problem occurs and where the solution described by this Practice will fit in.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="Goals" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>A summary of the overall goals to be addressed by the Practice.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="LevelsOfAdoption" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Outlines the different forms or variants in which the practice could be realized. (e.g. full adoption verus a partial adoption of the Practice)</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="Problem" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>A description of the problem the Practice addresses.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkProductDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Work Product.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="ImpactOfNotHaving" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Describes the consequences of not producing the work product.  This is intended to aid in the tailoring the method/process to the needs of a specific project.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="Purpose" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Describes why the work product is produced and to what use it will be put.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="ReasonsForNotNeeding" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Describes the circumstances in which it is reasonable not to produce the work product.  This is intended to aid in the tailoring of the method/process to the needs of a specific project.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-				<xsd:attribute name="externalId" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>An external visible number that is used to reference this artifact. Used like a synonym.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ArtifactDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Work Product Description that is used to store the textual description for an Artifact.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkProductDescription">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="BriefOutline" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Provides a brief description of the information that can be found in this artifact. For example, discusses the contents for key chapters of a document artifact or the key packages and modules of a model artifact.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="RepresentationOptions" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Discusses different possible alternative representations for the artifact. For example a design model can be represented as a UML model or an informal block diagram or by textual description only.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DeliverableDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Work Product Description that is used to store the textual description for a Deliverable.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkProductDescription">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="ExternalDescription" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>The description of the Deliverable used for client documents (proposal, statements of work or contractual agreements).  It might use a different language and follow legal constraints.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="PackagingGuidance" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Provides guidance on how to assemble the deliverable from all its required inputs.  This section describes the most common content medium and format.  Distribution of the deliverable is addressed in this section, if necessary.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="RoleDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Role.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="AssignmentApproaches" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Provides guidance on for assigning individuals to the Role in terms of what other roles these individuals could perform and what responsibility different individuals assigned to this role might have.  The guidance can also describe different assignment approaches for different types of projects, e.g. for large versus small teams where individuals could be allocated to roles full time versus sharing roles within the team.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="Skills" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Lists of set of required skills a person needs to possess to fulfill that Role.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="Synonyms" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Lists synonyms, i.e. other names the Role might be referred by.  Tool support for the meta-model might support that a Role name can be consistently be replaced with one of its synonyms throught a Process.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="TaskDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Task.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="Alternatives" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Comprises of summaries describing important exceptional and non-standard ways of achieving this Task's development goals that were not covered by the Task's Steps.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="Purpose" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Summarizes the main reason for performing this Task and what is intended to be achieved.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DescribableElement">
-		<xsd:annotation>
-			<xsd:documentation>An abstract generalization of Method Elements for which external presentation names as well as content descriptions have been defined, such as Roles or Work Products.  Presentation Name and Content Descriptions are typically localized using a resource allocation mechanism for its String type attributes.
-This abstraction represents all elements in the Method Content as well as Process space for which concrete textual descriptions are defined in the form of documenting attributes grouped in a matching Content Description instance.  Describable Elements are intended to be published in method or process publications (similar to the IBM Rational Unified Process web).  Describable Element defines that the element it represents will have content 'attached' to it.  Content Description is the abstraction for the actual places in which the content is being represented.  This separation allows a distinction between core method model elements describing the structure of the model from the actual description container providing, for example, the documentation of the content element in different alternatives languages, audiences, licensing levels, etc.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:choice minOccurs="0">
-					<xsd:element name="Presentation" type="uma:ContentDescription"/>
-				</xsd:choice>
-				<xsd:attribute name="presentationName" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Describable Element has a presentation name, which is used for external presentation of the element.  For example, name (the internal representation) might be set to "rup_architecture_document" to differentiate from a "j2ee_architcture_document" whereas the external presentation would always be "Architecture Document".</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="shapeicon" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>A reference to an icon that can be used for modeling with specific Content Element instances (as graphical stereotypes, e.g. a use case symbol for a use case artifact) as well as publication of content.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="nodeicon" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>A reference to an icon that can be used in tree browser presentations and breakdown structures.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ContentElement">
-		<xsd:annotation>
-			<xsd:documentation>A Describable Element that represents an abstract generalization for all elements that are considered to be and managed as Method Content.
-Content Elements represents reusable Method Content that is supposed to be managed in Content Packages.  The separation of Content Element from Process Element allows to clearly distinguish between pure method content from content that is represented in processes.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:DescribableElement">
-				<xsd:sequence>
-					<xsd:choice maxOccurs="unbounded" minOccurs="0">
-						<xsd:element name="Checklist" type="xsd:string"/>
-						<xsd:element name="Concept" type="xsd:string"/>
-						<xsd:element name="Example" type="xsd:string"/>
-						<xsd:element name="Guideline" type="xsd:string"/>
-						<xsd:element name="ReusableAsset" type="xsd:string"/>
-						<xsd:element name="SupportingMaterial" type="xsd:string"/>
-						<xsd:element name="Whitepaper" type="xsd:string"/>
-					</xsd:choice>
-				</xsd:sequence>
-				<xsd:attribute name="variabilityType" type="uma:VariabilityType"/>
-				<xsd:attribute name="variabilityBasedOnElement" type="xsd:string"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Guidance">
-		<xsd:annotation>
-			<xsd:documentation>Guidance is an abstract generalization of additional information related to content elements such as Roles, Tasks, and Work Products.  Examples for Guidance are Guidelines, Templates, Checklists, Tool Mentors, Estimates, Supporting Materials, Reports, Concepts, etc.  This package only contains the definition of the abstract Guidance class.  The package Guidance Types defines concrete guidance types.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentElement"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Concept">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that outlines key ideas associated with basic principles underlying the referenced item. Concepts normally address more general topics than Guidelines and span across sev-eral work product and/or tasks/activities.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Checklist">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that identifies a series of items that need to be completed or veri-fied.  Checklists are often used in reviews such as walkthroughs or inspections. </xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Example">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of Guidance that represents a typical, partially completed, sample instance of one or more work products or scenario like descriptions of how Task may be performed. Examples can be related to Work Products as well as Tasks that produce them as well as any other Content Element.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Guideline">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that provides additional detail on how to perform a particular task or grouping of tasks (e.g. grouped together as activities) or that provides additional detail, rules, and recommendations on work products and their properties.  Amongst others, it can include details about best practices and different approaches for doing work, how to use particular types of work products, information on different subtypes and variants of the work product and how they evolve throughout a lifecycle, discussions on skills the performing roles should acquire or improve upon, measurements for progress and maturity, etc.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Estimate">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of Guidance that provides sizing measures, or standards for sizing the work effort associated with performing a particular piece of work and instructions for their successful use. It may be comprised of estimation considerations and estimation metrics.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="EstimationMetric" type="xsd:string"/>
-					<xsd:element name="EstimationConsiderations" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="EstimatingMetric">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of Guidance that describes a metric or measure that is associated with an element and which is used to calculate the size of the work effort as well as a range of potential labor.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="EstimationConsiderations">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of Guidance that qualifies the usage and application of estimation metrics in the development of an actual estimate.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Roadmap">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of Guidance which is only related to Activates and therefore has been added by this package to the list of Guidance Types rather than listed in the Guidance Types package.  A Roadmap represents a linear walkthrough of an Activity, typically a Process.
-An instance of a Roadmap represents important documentation for the Activity or Process it is related to.  Often a complex Activity such as a Process can be much easier understood by providing a walkthrough with a linear thread of a typical instantiation of this Activity.  In addition to making the process practitioner understand how work in the process is being performed, a Roadmap provides additional information about how Activities and Tasks relate to each other over time.  Roadmaps are also used to show how specific aspects are distributed over a whole process providing a kind of filter on the process for this information.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Report">
-		<xsd:annotation>
-			<xsd:documentation>A predefined template of a result that is generated on the basis of other work products as an output from some form of tool automation. An example for a report would be a use case model survey, which is generated by extracting diagram information from a graphical model and textual information from documents and combines these two types of information into a report.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Template">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that provides for a work product a pre-defined table of contents, sections, packages, and/or headings, a standardized format, as well as descriptions how the sections and packages are supposed to be used and completed. Templates cannot only be provided for documents, but also for conceptual models or physical data stores.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="SupportingMaterial">
-		<xsd:annotation>
-			<xsd:documentation>A catchall for other types of guidance not specifically defined elsewhere. It can be related to all kinds of Content Elements, i.e. including other guidance elements.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ToolMentor">
-		<xsd:annotation>
-			<xsd:documentation>A  specific type of guidance that shows how to use a specific tool to accomplish some piece of work a Work Product either in the context of or independent from a Task or Activity.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Whitepaper">
-		<xsd:annotation>
-			<xsd:documentation>A special Concept guidance that have been externally reviewed or published and can be read and understood in isolation of other content elements and guidance.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Concept"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="TermDefinition">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that defines concepts and are used to build up the Glossary. TermDefinitions are not directly related to ContentElements, but their relationship is being derived when the Term is used in the ContentElements description text.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Practice">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that represents a proven way or strategy of doing work to achieve a goal that has a positive impact on work product or process quality.  Practices are defined orthogonal to methods and processes.  They could summarize aspects that impact many different parts of a method or specific processes.  Examples for practices would be "Manage Risks", "Continuously verify quality", "Architecture-centric and component-based development", etc.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="ActivityReference" type="xsd:string"/>
-					<xsd:element name="ContentReference" type="xsd:string"/>
-					<xsd:element name="SubPractice" type="uma:Practice"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ReusableAsset">
-		<xsd:annotation>
-			<xsd:documentation>A specific type of guidance that provides a solution to a problem for a given context. The asset may have a variability point, which is a location in the asset that may have a value provided or customized by the asset consumer. The asset has rules for usage which are the instructions describing
-how the asset should be used.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Guidance"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkProduct">
-		<xsd:annotation>
-			<xsd:documentation>An abstract class which provides a generalization for the content element types Artifact, Outcome, and Deliverable.  The meta-model class Work Product actually represents work product types, i.e. an instance of Work Product is a description of a specific type of work product and not an individual work product instance.  However, for simplicity reasons and because of low risk of misinterpretation we did not append the word 'type' to every meta-class.
-A work product is an abstraction for descriptions of content elements that are used to define anything used, produced, or modified by a task.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentElement">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="Estimate" type="xsd:string"/>
-					<xsd:element name="EstimationConsiderations" type="xsd:string"/>
-					<xsd:element name="Report" type="xsd:string"/>
-					<xsd:element name="Template" type="xsd:string"/>
-					<xsd:element name="ToolMentor" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Artifact">
-		<xsd:annotation>
-			<xsd:documentation>A Work Product that provides a description and definition for tangible work product types. Artifacts may be composed of other artifacts. For example, a model artifact can be composed of model elements, which are also artifacts.
-Artifacts are tangible work products consumed, produced, or modified by Tasks.  It may serve as a basis for defining reusable assets.  Roles use Artifacts to perform Tasks and produce Artifacts in the course of performing Tasks.  Artifacts are the responsibility of a single Role, making responsibility easy to identify and understand, and promoting the idea that every piece of information produced in the method requires the appropriate set of skills. Even though one role might "own" a specific type of Artifacts, other roles can still use the Artifacts; perhaps even update them if the Role has been given permission to do so.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkProduct">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="ContainedArtifact" type="uma:Artifact"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Deliverable">
-		<xsd:annotation>
-			<xsd:documentation>A Work Product that provides a description and definition for packaging other Work Products, and may be delivered to an internal or external party.  Therefore, a Deliverable aggregates other Work Products. Therefore, a Deliverable aggregates other Work Products.  A Deliverable is used to pre-define typical or recommended content in the form or work products that would be packaged for delivery.  The actual packaging of the Deliverable in an actual process or even project could be a modification of this recommendation.  Deliverables are used to represent an output from a process that has value, material or otherwise, to a client, customer or other stakeholder. </xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkProduct">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="DeliveredWorkProduct" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Outcome">
-		<xsd:annotation>
-			<xsd:documentation>A Work Product that describes intangible work products that are a result or state. Outcomes may also be used to describe work products that are not formally defined.  A key differentiator for outcomes against artifacts is that outcomes are not candidates for harvesting as reusable assets.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkProduct"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Role">
-		<xsd:annotation>
-			<xsd:documentation>A Content Element that defines a set of related skills, competencies, and responsibilities.  Roles are used by Tasks to define who performs them as well as define a set of work products they are responsible for.  
-A Role defines a set of related skills, competencies, and responsibilities of an individual or a set of individuals.  Roles are not individuals or resources.  Individual members of the development organization will wear different hats, or perform different roles. The mapping from individual to role, performed by the project manager when planning and staffing for a project, allows different individuals to act as several different roles, and for a role to be played by several individuals.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentElement">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="ResponsibleFor" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Task">
-		<xsd:annotation>
-			<xsd:documentation>A Content Element that describes work being performed by Roles.  It defines one default performing Role as well as many additional performers.  A Task is associated to input and output work products.  Inputs are differentiated in mandatory versus optional inputs.  The associations to Work Products are not instantiatable/variable-like parameters.  They rather express (hyper-)links to the descriptions of the work products types that are related to the Task as inputs and outputs.  In other words, these associations are not intended to be used to capture which concrete instances will be passed when instantiating the method in a project.  All of the Task's default associations can be overridden in an actual process definition.
-A Task describes an assignable unit of work.  Every Task is assigned to specific Roles.  The granularity of a Task is generally a few hours to a few days.  It usually affects one or only a small number of work products. A Task is used as an element of defining a process. Tasks are further used for planning and tracking progress; therefore, if they are defined too fine-grained, they will be neglected, and if they are too large, progress would have to be expressed in terms of a Task's parts (e.g. Steps, which is not recommended). 
-A Task has a clear purpose in which the performing roles achieve a well defined goal.  It provides complete step-by-step explanations of doing all the work that needs to be done to achieve this goal.  This description is complete, independent of when in a process lifecycle the work would actually be done.  It therefore does not describe when you do what work at what point of time, but describes all the work that gets done throughout the development lifecycle that contributes to the achievement of this goal.  When the Task is being applied in a process then this process application (defined as Task Descriptor) provides the information of which pieces of the Task will actually be performed at any particular point in time. This assumes that the Task will be performed in the process over and over again, but each time with a slightly different emphasis on different steps or aspects of the task description. 
-For example, a Task such as "Develop Use Case Model" describes all the work that needs to be done to develop a complete use case model. This would comprise of the identification and naming of use cases and actors, the writing of a brief description, the modeling of use cases and their relationships in diagrams, the detailed description of a basic flow, the detailed description of alternatives flows, performing of walkthroughs workshops and reviews, etc.  All of these parts contribute to the development goal of developing the use case model, but the parts will be performed at different points in time in a process.  Identification, naming, and brief descriptions would be performed early in a typical development process versus the writing of detailed alternative flows which would be performed much later.  All these parts or steps within the same Task define the "method" of Developing a Use Case Model.  Applying such a method in a lifecycle (i.e. in a process) is defining which steps are done when going from one iteration to the next.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentElement">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="Precondition" type="xsd:string"/>
-					<xsd:element minOccurs="0" name="Postcondition" type="xsd:string"/>
-					<xsd:element minOccurs="0" name="PerformedBy" type="xsd:string"/>
-					<xsd:choice maxOccurs="unbounded" minOccurs="0">
-						<xsd:element name="MandatoryInput" type="xsd:string"/>
-						<xsd:element name="Output" type="xsd:string"/>
-						<xsd:element name="AdditionallyPerformedBy" type="xsd:string"/>
-						<xsd:element name="OptionalInput" type="xsd:string"/>
-						<xsd:element name="Estimate" type="xsd:string"/>
-						<xsd:element name="EstimationConsiderations" type="xsd:string"/>
-						<xsd:element name="ToolMentor" type="xsd:string"/>
-					</xsd:choice>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkDefinition">
-		<xsd:annotation>
-			<xsd:documentation>An abstract Method Element that generalizes all descriptions of work within the Unified Method Architecture.  This package introduces two concrete types of Work Definitions: Task and Step.  Work Definitions can contain sets of pre- and post-conditions defining constraints that need to be valid before the described work can begin or before it can be declared as finished.  Note that general ownedRules can be used to define additional constraints and rules for Work Definitions.
-Work Definitions represent behavioral descriptions for doing work.  These behavioral descriptions are not bound to one specific classifier, but represent an arbitrary definition of work.  For example, a Work Definition could represent work that is being performed by a specific Role (e.g. a Role performing a specific Task or Steps of a Task), by many Roles working in close collaboration (many Roles all working together on the same interdisciplinary Task), or complex work that is performed throughout the lifecycle (e.g. a process defining a breakdown structure for organizing larger composite units of work performed by many Roles working in collaboration).</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="Precondition" type="xsd:string"/>
-					<xsd:element minOccurs="0" name="Postcondition" type="xsd:string"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ContentCategory">
-		<xsd:annotation>
-			<xsd:documentation>An abstract class generalizing content category types.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentElement"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Discipline">
-		<xsd:annotation>
-			<xsd:documentation>A categorization of work (i.e. Tasks for Method Content), based upon similarity of concerns and cooperation of work effort.
-A discipline is a collection of Tasks that are related to a major 'area of concern' within the overall project. The grouping of Tasks into disciplines is mainly an aid to understanding the project from a 'traditional' waterfall perspective. However, typically, for example, it is more common to perform certain requirements activities in close coordination with analysis and design activities. Separating these activities into separate disciplines makes the activities easier to comprehend.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="Task" type="xsd:string"/>
-					<xsd:element name="SubDiscipline" type="uma:Discipline"/>
-					<xsd:element name="ReferenceWorkflow" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DisciplineGrouping">
-		<xsd:annotation>
-			<xsd:documentation>Used to group Disciplines.  For example, the Discipline Grouping "Software Disciplines" would be the group of all disciplines related to developing software such as "Requirements Management" or "Testing"; "IT Infrastructure Management" would be a Disciplines Grouping for disciplines such as "IT Operational Services", "IT Customer Relationships", or "IT Enabling Services".  Disciplines can be associated to more than one Discipline Grouping.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="Discipline" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Domain">
-		<xsd:annotation>
-			<xsd:documentation>A refineable hierarchy grouping related work products.  In other words, Domains can be further divided into sub-domains, with work product elements to be categorized only at the leaf-level of this hierarchy.
-Domain is a logical grouping of work products that have an affinity to each other based on resources, timing, or relationship.  A Domain may be divided into subdomains.  For example, GS Method uses six predefined Domains for Work Products: Application, Architecture, Business, Engagement, Operations and Organization.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="WorkProduct" type="xsd:string"/>
-					<xsd:element name="Subdomain" type="uma:Domain"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="RoleSet">
-		<xsd:annotation>
-			<xsd:documentation>Organizes Roles into categories.  It is used to group roles together that have certain commonalities.  For example, the "Analysts" Role Set could group the "Business Process Analyst", "System Analyst", as well as "Requirements Specifier" roles.  All of these work with similar techniques and have overlapping skills, but are required as distinct roles for a method (e.g. the method the IBM Rational Unified Process is based on).</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="Role" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="RoleSetGrouping">
-		<xsd:annotation>
-			<xsd:documentation>Role Sets can be categorized into Role Set Groupings.  For example, different methods might define similar Role Sets, which however need to be distinguished from each other on a global scale.  Thus, Role Set Groupings allow distinguishing, for example, Software Services Manager Role Sets from Software Development Organization Manager Role Sets.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="RoleSet" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Tool">
-		<xsd:annotation>
-			<xsd:documentation>A container/aggregate for ToolMentors.  It can also provide general descriptions of the tool and its general capabilities.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="ToolMentor" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkProductType">
-		<xsd:annotation>
-			<xsd:documentation>A second category for work products, which in contrast to Domain is more presentation oriented.  A work product can have many Work Product Types.  Examples, for a Work Product Type is "Class Diagram", which categorizes the Artifacts Analysis Model, Design Model, User Experience Model, or "Specification", which categorizes requirements specifications that define a system with a well-defined system boundary, such as use case or functional requirements specification.  A Work Product can be categorized to be of many Work Product Types.  For example, a use case model can be categorized as a Specification as well as Diagram Work Product Type.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="WorkProduct" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="CustomCategory">
-		<xsd:annotation>
-			<xsd:documentation>A category introduced by a method content author to structure any number of method Content Elements of any subtype based on user-defined criteria.  Because Content Categories (and therefore Custom Categories, too) are Content Elements themselves, Custom Categories can be used to recursively categorize Content Categories as well.  Custom Categories can also be nested with any Content Category.  Custom categories can be used to categorize content based on the user's criteria as well as to define whole tree-structures of nested categories allowing the user to systematically navigate and browse method content and processes based on these categories.  For example, one could create a custom category to logically organize content relevant for the user's development organization departments; e.g. a "Testing" category that groups together all roles, work products, tasks, and guidance element relevant to testing.  Another example would be categories that express licensing levels of the content grouping freely distributable method content versus content that represent intellectual property and requires a license to be purchased to be able to use it.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentCategory">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="CategorizedElement" type="xsd:string"/>
-					<xsd:element name="SubCategory" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="MethodPackage">
-		<xsd:annotation>
-			<xsd:documentation>An abstract class for packaging Method Elements.  All Method Elements shall be located in exactly one of Method Package's concrete specializations (e.g. Content Package).   Method Package defines common properties for all of its specializations. Elements are organized in Method Packages to structure large scale of method content and processes as well as to define a mechanism for reuse.  Method Elements from one package can reuse element from other packages by defining a reusedPackages link.  For example, a work product defined in one package can be used as an input for Tasks defined in other packages.  By reusing it from one common place (i.e. the package in which it has been defined) ensures that no redundant definitions of the same elements are required.  Also maintenance of method content is greatly improved as changes can be performed in only one place.  Note, that other packages will introduce more specializations of Method Package, e.g. Process Package and Process Component.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodElement">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="ReusedPackage" type="xsd:string"/>
-					<xsd:element name="MethodPackage" type="uma:MethodPackage"/>
-				</xsd:choice>
-				<xsd:attribute name="global" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>Method Packages can have a global scope.  This means that every element of every other Method Package can see the global package's contents.  Global Method Packages are primarily used to store commonly used category definitions such as for Disciplines or Domains, which are used by many Task and Work Products respectively.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ContentPackage">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Package that contains Content Elements and Content Elements, only.  Examples for Content Element are Artifacts, Tasks, Roles, etc.  A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodPackage">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="ContentElement" type="uma:ContentElement"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ContentCategoryPackage">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Package that only contains Content Category Elements.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodPackage">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="ContentCategory" type="uma:ContentCategory"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessElement">
-		<xsd:annotation>
-			<xsd:documentation>A Describable Element that represents an abstract generalization for all elements defined in the Process package.
-Process Elements represents Process specific elements that are supposed to be managed in Process Packages.  The separation of Process Element from Content Element allows to clearly distinguish between pure method content from content that is represented in processes. </xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:DescribableElement"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="PlanningData">
-		<xsd:annotation>
-			<xsd:documentation>A Process Element that adds planning data to Breakdown Elements when it is used for a Process Planning Template.  For Delivery Processes and Capability Patterns this class can either not be instantiated or populated with default data.
-Planning Data factors out specific optional data needed for representing planning templates.  This association allows to access planning data if it is stored for the Breakdown Element.
-(NOTE, THE ATTRIBUTES FOR THIS CLASS ARE NOT COMPLETE, YET)</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ProcessElement">
-				<xsd:attribute name="startDate" type="xsd:dateTime">
-					<xsd:annotation>
-						<xsd:documentation>The default start date for a planed Task.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="finishDate" type="xsd:dateTime">
-					<xsd:annotation>
-						<xsd:documentation>The default finish date for a planed Task.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="rank" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>The default rank for a planed Task.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="BreakdownElement">
-		<xsd:annotation>
-			<xsd:documentation>An abstract generalization for any type of Method Element that is part of a breakdown structure.  It defines a set of properties available to all of its specializations.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ProcessElement">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="PresentedAfter" type="xsd:string"/>
-					<xsd:element minOccurs="0" name="PresentedBefore" type="xsd:string"/>
-					<xsd:element minOccurs="0" name="PlanningData" type="xsd:string"/>
-					<xsd:element name="SuperActivity" type="xsd:string"/>
-				</xsd:sequence>
-				<xsd:attribute name="prefix" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Prefix represents an additional label that will be presented as a prefix to any Breakdown Element to indicate a user-defined sub-type for the element.  For example, if the process engineer would like to distinguish his Activities by 'Module' (as done in the IBM Rational Summit Ascendant Method), he can define a different prefix for every model to be used in addition to naming Activities, e.g. "SRA.Establish Requirements" with SRA indicating that this Activity belongs to the "Software Requirements Analysis" module.  Another common application for prefix is to qualify roles in Role Descriptors.  For example, "Customer.Architect" would define a "Customer" prefix for the Role Descriptor "Architect" expressing that this is an architect on the customer side and not the development team side.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="isPlanned" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>A key application for Development Processes expressed with Breakdown structures is to generate a project plan from it.  A process as defined in UMA (cf. with Sections XX and 5.2) is a multi-dimensional structure defining what work is being performed at what time by which roles using which input and producing what outputs.  A project plan as it is represented in project planning tools such as IBM Rational Portfolio Manager or Microsoft Project normally does not need all this information and is normally limited to just representing a subset.  For example, a typical MS Project plan only represents the work breakdown consisting of Tasks and Activities (sometimes referred to as summary tasks).  It does not show the input and output Work Products for a Task, but it can show which roles shall be staffed for performing the Task.  However, such role allocation need to be replaced with concrete resources when instantiating the plan for a concrete project.  Sometimes project plans can then again be organized differently by organizing work by deliverables in which Work Products are mapped to the plan's summary tasks and Task that have these work products as output mapped below such as summary task.  Therefore, a process can make recommendations about which elements to include and which to exclude when generating a plan.  When the isPlanned attribute is set to False for an instance of a Breakdown Element, then this element shall not be not included when a concrete project plan is being generated from the breakdown structure that contains this element.
-</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="hasMultipleOccurrences" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>Just as the isPlanned attribute the hasMultipleOccurrences attribute has an impact on generating plans from a Process.  When this attribute is set to True for a Breakdown Element then it will typically occur multiple times within the same Activity.  For example, a Task such as "Detail Use Case" would be performed for every use case identified for a particular Iteration or Activity.  Generating a plan would list one Task instance per use case.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="isOptional" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>Indicates that the Breakdown Element describes work, a work result, or even work resources, which inclusion is not mandatory when performing a project that is planned based on a process containing this element.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkOrder">
-		<xsd:annotation>
-			<xsd:documentation>Represents a relationship between two Breakdown Elements in which one Breakdown Elements depends on the start or finish of another Breakdown Elements in order to begin or end.  
-The Work Order class defines predecessor and successor relations amongst Breakdown Elements.  This information is in particular critical for planning applications.  See more details on different types of Work Order relationships at Work Order Type.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attribute name="linkType" type="uma:WorkOrderType">
-					<xsd:annotation>
-						<xsd:documentation>This attribute expresses the type of the Work Order relationship by assigning a value from the Work Order Type enumeration.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkBreakdownElement">
-		<xsd:annotation>
-			<xsd:documentation>A special Breakdown Element that provides specific properties for Breakdown Elements that represent or refer to Work Definitions.  For example its subclass Activity defines work as it is also a subclass of Work Definition.  Its subclass Task Descriptor does not define work by itself, but refers to a Work Definition and therefore can have the same common properties and Work Breakdown Element has.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElement">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="Predecessor" type="uma:WorkOrder"/>
-				</xsd:choice>
-				<xsd:attribute name="isRepeatable" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>This attribute is used to define repetition of work, e.g. iterations.  A Process Work Definition with this attribute set to True shall be repeated more than once on the same set of artifacts.  For example, for an instance of Iteration (defined as a special Process Work Definition below) this attribute is set to True by default indicating that every sub-Activity will be repeated more than once.  However, any Process Work Definition can set this attribute to True to define iterations (e.g. to iterate one Activity consisting of many sub-activities or even Phases, but to iterate just one Task).</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="isOngoing" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>If the isOngoing attribute is set to True for a Process Work Definition instance, then the element describes an ongoing piece of work without a fixed duration or end state.  For example, the Process Work Definition could represent work of an administrator continuously (e.g. 3h a day) working to ensure that systems are kept in a certain state.  Another example would be program management work overseeing many different projects being scheduled for one particular project at specific reoccurring intervals during the whole lifecycle of the project.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="isEventDriven" type="xsd:boolean">
-					<xsd:annotation>
-						<xsd:documentation>The isEventDriven attribute indicates that the Process Work Definition describes an instance of work which is not started because it has been scheduled to start at a certain point of time, because preceding work is being completed, or input work products are available, but because another specific event has occurred.  Examples for such events are exceptions or problem situations which require specific work to be performed as a result.  Also change management work can be modeled as event driven work analyzing a change request or defect and allocating work dynamically to resources to deal with it following the work described with such Process Work Definition.  The events themselves are not modeled in this version of the specification.  They shall be described as part of the normal descriptions fields available.
-</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Milestone">
-		<xsd:annotation>
-			<xsd:documentation>A special Breakdown Element that describes a significant event in a development project, such as a major decision, completion of a deliverable, or meeting of a major dependency (like completion of a project phase).  Because, Milestone is commonly used to refer to both the event itself and the point in time at which the event is scheduled to happen, it is modeled as a Breakdown Element (i.e. it appears as part of a breakdown structure).</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkBreakdownElement"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Activity">
-		<xsd:annotation>
-			<xsd:documentation>A Work Breakdown Element and Work Definition which supports the nesting and logical grouping of related Breakdown Elements forming breakdown structures.  Although Activity is a concrete meta-class, other classes which represent breakdown structures derive from it; such as Phase, Iteration, Delivery Process, or Capability Pattern.
-Activity represents a grouping element for other Breakdown Elements such as Activities, Descriptors, Milestones, etc.  It is not per-se a 'high-level' grouping of only work as in other meta-models, but groups any kind of Breakdown Elements.  For example, one can define valid Activities that group only Work Products Descriptors without any matching Task Descriptors.  Activities also inherit all properties from Work Breakdown Element and indirectly from Process Element; i.e. Activity is ready to have a full content description attached to it.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkBreakdownElement">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="Precondition" type="xsd:string"/>
-					<xsd:element minOccurs="0" name="Postcondition" type="xsd:string"/>
-					<xsd:choice maxOccurs="unbounded" minOccurs="0">
-						<xsd:element name="BreakdownElement" type="uma:BreakdownElement"/>
-						<xsd:element name="Checklist" type="xsd:string"/>
-						<xsd:element name="Concept" type="xsd:string"/>
-						<xsd:element name="Example" type="xsd:string"/>
-						<xsd:element name="Guideline" type="xsd:string"/>
-						<xsd:element name="Roadmap" type="xsd:string"/>
-						<xsd:element name="ReusableAsset" type="xsd:string"/>
-						<xsd:element name="SupportingMaterial" type="xsd:string"/>
-						<xsd:element name="Whitepaper" type="xsd:string"/>
-					</xsd:choice>
-				</xsd:sequence>
-				<xsd:attribute name="variabilityType" type="uma:VariabilityType"/>
-				<xsd:attribute name="variabilityBasedOnElement" type="xsd:string"/>
-				<xsd:attribute name="IsEnactable" type="xsd:boolean"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Phase">
-		<xsd:annotation>
-			<xsd:documentation>A special Activity which prescribes pre-defined values for its instances for the attributes prefix ('Phase') and isRepeatable ('False').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.
-Phase represent a significant period in a project, ending with major management checkpoint, milestone or set of Deliverables.  It is included in the model as a predefined special Activity, because of its significance in defining breakdowns.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Activity"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Iteration">
-		<xsd:annotation>
-			<xsd:documentation>A special Activity which prescribes pre-defined values for its instances for the attributes prefix ('Iteration') and isRepeatable ('True').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.
-Iteration groups a set of nested Activities that are repeated more than once.  It represents an important structuring element to organize work in repetitive cycles.  The concept of Iteration can be associated with different rules in different methods.  For example, the IBM Rational Unified Process method framework (RUP) defines a rule that Iterations are not allowed to span across Phases.  In contrast IBM Global Services Method (GSMethod) based method frameworks this rule does not apply and Iteration can be defined which nest Phases.  Rules like these, which play an important role for each individual method and are therefore not enforced by this meta-model.  Instead, process authors are expected to follow and check these rules manually.  (Note: Any Breakdown Element can be repeated; however, Iterations has been introduced as a special meta-model concept, because of its important role for many methods.)</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Activity"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="BreakdownElementDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Content Description that is used to store the textual description for a Breakdown Element.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ContentDescription">
-				<xsd:attribute name="usageGuidance" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Provides information and guidance on the meaning of the Boolean flag values and under what circumstances they should be overridden. For example, it describes why the breakdown element is optional or considerations for repeating it and differences in the individual occurrences of this Breakdown Element across the lifecycle.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ActivityDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Breakdown Element Description that is used to store the textual description for an Activity.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElementDescription">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="Alternatives" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Comprises of summaries describing important exceptional and non-standard ways of doing the work of this Activity not covered by the Activity's Tasks.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="HowToStaff" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Provides background on who should be involved in this activity what are the required skills, experience,  and perhaps attitudes.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="Purpose" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Summarizes the main reason for performing this Activity, describes what the activity as a whole is intended to achieve.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DescriptorDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Breakdown Element Description that is used to store the textual description for a Descriptor.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElementDescription">
-				<xsd:choice minOccurs="0">
-					<xsd:element name="RefinedDescription" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>A Descriptor might add refinements to the main description of the Content Element it refers to.  For example, it could provide additional information about a Work Product relevant for the specific point in time in the process this Work Product type is being used.  It could describe additional skills needed for a Role at that particular point in time in a process, etc. </xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Activity Description that is used to store the textual description for a Process.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ActivityDescription">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="Scope" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Defines the scope of the Process, i.e. which types of projects does it address and which not.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="UsageNotes" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Any additional notes on how to apply and instantiate this process for a project.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-				<xsd:attribute name="externalId" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>An external visible number that is used to reference this delivery patterns and models. It is used like a synonym.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DeliveryProcessDescription">
-		<xsd:annotation>
-			<xsd:documentation>A generalized Process Description that is used to store the textual description for a Delivery Process.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ProcessDescription">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="Scale" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Outlines characteristics about the size of a typical project that performs this project expressed in team size, man years, etc.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="ProjectCharacteristics" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Characterizes the project that would typically perform this Process</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="RiskLevel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Outlines typical project risks that are addressed with this process.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="EstimatingTechnique" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Describes the Estimation Techniques provided for this Process.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="ProjectMemberExpertise" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Provides a profile of a typical project team, the distribution of roles, skills required for a team performs a project based on this process.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element minOccurs="0" name="TypeOfContract" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>Provides background information about the coI'm chaI'm ntracts that need to be established between a project team that performs this process and a client (e.g. for an IGS engagement).</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Descriptor">
-		<xsd:annotation>
-			<xsd:documentation>An abstract generalization for special Breakdown Elements that references one concrete Content Element.  A descriptor provides a representation of a Content Element within breakdown structures.  In addition to just referencing Content Elements it allows overriding the Content Elements structural relationships by defining its own sets of associations.
-Descriptors are the key concept for realizing the separation of processes from method content.  A Descriptor can be characterized as a reference object for one particular Content Element, which has its own relationships and properties.  When a Descriptor is created it shall be provided with congruent copies of the relationships defined for the referenced content element.  However, a user can modify these relationships for the particular process situation for which the descriptor has been created. </xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElement">
-				<xsd:attribute name="isSynchronizedWithSource" type="xsd:boolean"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="WorkProductDescriptor">
-		<xsd:annotation>
-			<xsd:documentation>A special Descriptor that represents a Work Product in the context of one specific Activity.  Every breakdown structure can define different relationships of Work Product Descriptors to Task Descriptors and Role Descriptors.  Therefore one Work Product can be represented by many Work Product Descriptors each within the context of an Activity with its own set of relationships.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Descriptor">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="WorkProduct" type="xsd:string"/>
-					<xsd:choice maxOccurs="unbounded" minOccurs="0">
-						<xsd:element name="ImpactedBy" type="xsd:string"/>
-						<xsd:element name="Impacts" type="xsd:string"/>
-						<xsd:element name="DeliverableParts" type="xsd:string"/>
-					</xsd:choice>
-				</xsd:sequence>
-				<xsd:attribute name="activityEntryState" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Entry State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is initiated (i.e. work on the Activity's Task Descriptors is being initiated that use this Work Product Descriptor as input).  
-For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested].</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="activityExitState" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Exist State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is finished (i.e. work on the Activity's Task Descriptors has finished that have this Work Product Descriptor as output).
-For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested].</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="RoleDescriptor">
-		<xsd:annotation>
-			<xsd:documentation>A special Descriptor that represents a Role in the context of one specific Activity.  Every breakdown structure can define different relationships of Role Descriptors to Task Descriptors and Work Product Descriptors.  Therefore one Role can be represented by many Role Descriptors each within the context of an Activity with its own set of relationships.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Descriptor">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="Role" type="xsd:string"/>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="ResponsibleFor" type="xsd:string"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="TaskDescriptor">
-		<xsd:annotation>
-			<xsd:documentation>A special Descriptor that represents a proxy for a Task in the context of one specific Activity.  Every breakdown structure can define different relationships of Task Descriptors to Work Product Descriptors and Role Descriptors. Therefore one Task can be represented by many Task Descriptors each within the context of an Activity with its own set of relationships.
-A key difference between Method Content and Process is that a Content Element such as Task describes all aspects of doing work defined around this Task.  This description is managed in steps, which are modeled as Sections of the Tasks' Content Descriptions.  When applying a Task in a Process' Activity with a Task Descriptor a Process Engineer needs to indicate that at that particular point in time in the Process definition for which the Task Descriptor has been created, only a subset of steps shall be performed.  He defines this selection using the selectedSteps association.  If he wants to add steps to a Task Descriptor, he can describe these either pragmatically in the refinedDescription attribute or 'properly' create a contributing Task to the Task the Task Descriptor refers to.
-</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:WorkBreakdownElement">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="Task" type="xsd:string"/>
-					<xsd:element minOccurs="0" name="PerformedPrimarilyBy" type="xsd:string"/>
-					<xsd:choice maxOccurs="unbounded" minOccurs="0">
-						<xsd:element name="AdditionallyPerformedBy" type="xsd:string"/>
-						<xsd:element name="AssistedBy" type="xsd:string"/>
-						<xsd:element name="ExternalInput" type="xsd:string"/>
-						<xsd:element name="MandatoryInput" type="xsd:string"/>
-						<xsd:element name="OptionalInput" type="xsd:string"/>
-						<xsd:element name="Output" type="xsd:string"/>
-					</xsd:choice>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="Step" type="uma:Section"/>
-				</xsd:sequence>
-				<xsd:attribute name="isSynchronizedWithSource" type="xsd:boolean"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="CompositeRole">
-		<xsd:annotation>
-			<xsd:documentation>A special Role Descriptor that relates to more then one Role.  It represents a grouping of Roles with the main purpose of simplification, i.e. reducing the number of roles for a process.
-A Composite Role is a grouping of Roles that can be used in an Activity or Process to reduce the number of Roles.  A typical application would be a process for a small team in which a standard set of roles from the method content would be all performed by one or more resource.  By using Composite Role the process would suggest a typical clustering of Roles to Resources.  A Composite Role could perform all Tasks defined for the Roles it refers to.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:RoleDescriptor">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="AggregatedRole" type="uma:Role"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="TeamProfile">
-		<xsd:annotation>
-			<xsd:documentation>A Breakdown Element that groups Role Descriptors or Resource Definitions defining a nested hierarchy of teams and team members.
-Work assignments and Work Product responsibilities can be different from Activity to Activity in a development project. Different phases require different staffing profiles, i.e. different skills and resources doing different types of work.  Therefore, a process needs to define such different profiles in a flexible manner.  Whereas Core Method Content defines standard responsibilities and assignments, a process express by a breakdown structures needs to be able refine and redefine these throughout its definition.  Role Descriptors, Resource Definitions, as well as Team Profiles provide the data structure necessary to achieve this flexibility and to provide a process user with the capability to define different teams and role relationships for every Activity (including Activities on any nesting-level as well as Iterations or Phases).
-Hence, in addition to the work breakdown and work product breakdown structures defined so far, Team Profiles are used to define a third type of breakdown structure: team breakdown structures.  These are created as an Activity specific hierarchy of Team Profiles comprising of Role Descriptors and Resource Definitions.  These structures can be presented as well-known Org-Charts.  Just as with any other Breakdown Element and Descriptors, Team Profiles can be defined within the scope of any Activity in a breakdown structure.  In other words every Activity can define its own Team Profiles consisting of Activity specific Role Descriptors and Resource Definitions.  Typically, Team Profiles are defined on the level of Iterations or Phases or other higher-level Activity.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElement">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="Role" type="xsd:string"/>
-					<xsd:element name="SuperTeam" type="xsd:string"/>
-					<xsd:element name="SubTeam" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="Process">
-		<xsd:annotation>
-			<xsd:documentation>A special Activity that describes a structure for particular types of development projects.  To perform such a development project a Processes would be 'instantiated' and adapted for the specific situation.  Process is an abstract class and this meta-model defines different special types of Processes for different process management applications and different situations of process reuse.  Every Process comprises of and is the top-level element of an n-level breakdown structure using the Nesting association defined on Activity.
-Core Method Content provides step-by-step explanations, describing how very specific development goals are achieved independent of the placement of these steps within a development lifecycle.  Processes take these method elements and relate them into semi-ordered sequences that are customized to specific types of projects.  Thus, a process is a set of partially ordered work descriptions intended to reach a higher development goal, such as the release of a specific software system.  A process and the process meta-model structure defined in this specification focuses on the lifecycle and the sequencing of work in breakdown structures.  To achieve this it uses the Descriptor concept referencing method content and allowing defining time-specific customizations of the referenced content (e.g. defining a focus on different steps of the same Task and providing input Work Products in different states within the different Phases of a process lifecycle in which the same Task is performed).</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Activity">
-				<xsd:sequence>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="IncludesPattern" type="xsd:string"/>
-					<xsd:element minOccurs="0" name="DefaultContext" type="xsd:string"/>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="ValidContext" type="xsd:string"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="DeliveryProcess">
-		<xsd:annotation>
-			<xsd:documentation>A special Process describing a complete and integrated approach for performing a specific project type.  It describes a complete project lifecycle end-to-end and shall be used as a reference for running projects with similar characteristics as defined for the process.  A Delivery Process is related to specific supporting information such as Roadmaps (inherited via Activity) as well as Communications and Education Material.
-A Delivery Process is a Process that covers a whole development lifecycle from beginning to end.  A Delivery Process shall be used as a template for planning and running a project.  It provides a complete lifecycle model with predefined phases, iterations, and activities that have been detailed by sequencing referencing method content in breakdown structures.  It is defined on the basis of experience with past projects or engagements, and/or the best practice use of a development or delivery approach.  It defines what gets produced, how those items are produced, and the required staffing in the form of integrated Work, Work Product, and Team Breakdown Structures.  For example, a process engineer can define alternative Delivery Processes for software development projects that differ in the scale of the engagement and staffing necessary, the type of the software application to be developed, the development methods and technologies to be used, etc.  Although, the Delivery Process aims to cover a whole project it keeps certain decision that are too project specific open.  For example, the breakdown structure defines which Breakdown Elements have multiple occurrences or is repeatable via it respective attributes, but does not say how many occurrences and how many repeats/iterations it will have.  These decisions have to be done by a project manager when planning a concrete project, project phase, or project iterations.  A Delivery Process is always a complete description of a process in terms of completeness of the lifecycle, as well as in terms of all three views on the process which are the Work Breakdown Structure, Work Product Breakdown Structure, and Team Breakdown Structure have to be fully and consistently populated.  Consistency of a Delivery Process is actually ensured by the fact that all three breakdowns are represented by one single data structure and one particular breakdown such as Team Breakdown is just a view on that data structure.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Process">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="CommunicationsMaterial" type="xsd:string"/>
-					<xsd:element name="EducationMaterial" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="CapabilityPattern">
-		<xsd:annotation>
-			<xsd:documentation>A special Process that describes a reusable cluster of doing work in common process areas.  Capabilities Patterns express and communicate process knowledge for a key area of interest such as a Discipline and can be directly used by process practitioner to guide his work.  They are also used as building blocks to assemble Delivery Processes or larger Capability Patterns ensuring optimal reuse and application of the key practices they express.
-A Capability Pattern is a special Process that describes a reusable cluster of doing work in a general process area that provides a consistent development approach to common problems.  Examples for Capability Pattern could be 'use case-based requirements management', 'use case analysis', or 'unit testing'. Typically but not necessarily, Capability Patterns have the scope of one discipline providing a breakdown of reusable complex Activities, relationships to the Roles which perform Tasks within these Activities, as well as to the Work Products that are used and produced.  A capability pattern does not relate to any specific phase or iteration of a development lifecycle, and should not imply any.  In other words, a pattern should be designed in a way that it is applicable anywhere in a Delivery Process.  This enables its Activities to be flexibly assigned to whatever phases there are in the Delivery Process to which it is being applied.  It is a good practice to design a Capability Pattern to produce one or more generic Deliverables.  The typical configuration is that each Activity in the Capability Pattern produces one Deliverable, and the last Task Descriptor in the Activity explicitly outputs just this Deliverable.  This enables the process engineer to select Patterns or just Activities by deciding which Deliverables are required.  It also offers a simple integration approach: an Activity from a capability pattern is linked to the Phase or Iteration which is required to produce the Activity's Deliverable.  Key applications areas of / areas of reuse for Capability Patterns are:
-- To serve as building blocks for assembling Delivery Processes or larger Capability Patterns.  Normally developing a Delivery Process is not done from scratch but by systematically applying and binding patterns.  In addition to the standard pattern application of 'copy-and-modify', which allows the process engineer to individually customize the pattern's content to the particular situation it is applied for, the Plugin meta-model package (Section 6.1) introduces even more sophisticated inheritance relationships that support dynamic binding of patterns (i.e. the pattern is referenced and not copied).  This unique new way of reusing process knowledge allows to factor out commonly reoccurring Activities into patterns and to apply them over and over again for a process.  When the pattern is being revised or updated, all changes will be automatically reflected in all pattern application in all processes because of the dynamic binding.
-- To support direct execution in a development project that does not work following a well-defined process, but works based on loosely connected process fragments of best practices in a flexible manner (e.g. Agile Development).
-- To support process education by describing knowledge for a key area such as best practices on how to perform the work for a Discipline (e.g. Requirements Management), for a specific development technique (aspect-oriented development), or a specific technical area (e.g. relational database design), which is used for education and teaching.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Process"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessPlanningTemplate">
-		<xsd:annotation>
-			<xsd:documentation>A special Process that is prepared for instantiation by a project planning tool.  Typically, it is created based on a Process such as a Delivery Process as a whole (e.g. in case of a waterfall-based development approach) or in parts (e.g. in case of an iterative development approach).
-A Process Planning Template represents a partially finished plan for a concrete project.  It uses the same information structures as all other Process Types to represent templates for project plans.  However, certain planning decisions have already been applied to the template as well as information has been removed and/or reformatted to be ready for export to a specific planning tool.  Examples for such decisions are: a template has been created to represent a plan for a particular Iteration in an iterative development project, which fr example distinguishes early from late iterations in the Elaboration phase of a project; if the targeted planning tool cannot represent input and output of Task, then these have been removed from the structure; certain repetitions have been already applied, e.g. stating that a cycle of specific Task grouped in an Activity have to be repeated n-times; etc.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:Process">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="BaseProcess" type="xsd:string"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessPackage">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Package that contains Process Elements, only.
-A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodPackage">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="ProcessElement" type="uma:ProcessElement"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessComponentInterface">
-		<xsd:annotation>
-			<xsd:documentation>Comprises of a list of interface specifications (similar to operation declarations) that express inputs and outputs for a process component.  These interface specifications are expressed using Task Descriptors which are not linked to Tasks that are related to Work Product Descriptors as well as optional a Role Descriptor.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:BreakdownElement">
-				<xsd:choice maxOccurs="unbounded" minOccurs="0">
-					<xsd:element name="InterfaceSpecification" type="uma:TaskDescriptor"/>
-					<xsd:element name="InterfaceIO" type="uma:WorkProductDescriptor"/>
-				</xsd:choice>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="ProcessComponent">
-		<xsd:annotation>
-			<xsd:documentation>A special Process Package that applies the principles of encapsulation.  A Process Component realizes one or more Interfaces which specify inputs and outputs of the component. There might be many components realizing the same interfaces, but using different techniques to achieve similar outputs for similar inputs.  Whereas the Component Interfaces represent component specifications (black box descriptions of the component), good candidates for component realizations can be found in Capability Patterns (white box descriptions for the component).
-UMA supports replaceable and reusable Process Components realizing the principles of encapsulation. Certain situations in a software development project might require that concrete realizations of parts of the process remain undecided or will be decided by the executing team itself (e.g. in outsourcing situations).  UMA provides a unique component concept defining interfaces for work product input and output, allowing treating the actual definition of the work that produces the outputs as a "black box".  At any point during a project the component "realization" detailing the work can be added to the process.  The component approach also allows that different styles or techniques of doing work can be replaced with one another.  For example, a software code output of a component could be produced with a model-driven development or a code-centric technique.  The component concept encapsulates the actual work and lets the development team choose the appropriate technique and fill the component's realization with their choice of Activities that produce the required outputs.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:ProcessPackage">
-				<xsd:sequence>
-					<xsd:element minOccurs="0" name="Copyright" type="xsd:string"/>
-					<xsd:element minOccurs="0" name="Interface" type="uma:ProcessComponentInterface"/>
-					<xsd:element name="Process" type="uma:Process"/>
-				</xsd:sequence>
-				<xsd:attribute name="authors" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Method Unit is being created and owned by an author or authoring team.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="changeDate" type="xsd:dateTime">
-					<xsd:annotation>
-						<xsd:documentation>The date the last change that resulted into this version has been made.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="changeDescription" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>The description of the last change that resulted into this version.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="version" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>Every Package has a version number used to track changes.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:complexType name="MethodPlugin">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Unit that represents a physical container for Method Packages.  It defines a granularity level for the modularization and organization of method content and processes.  A Method Plugin can extend many other Method Plugins and it can be extended by many Method Plugins.  It can also be used stand-alone, i.e. with no Extension relationship to other plug-ins.
-Method Plugin conceptually represents a unit for configuration, modularization, extension, packaging, and deployment of method content and processes.  A Process Engineer shall design his Plugins and allocate his content to these Plugins with requirements for extensibility, modularity, reuse, and maintainability in mind.
-Special extensibility mechanisms defined for the meta-classes Variability Element and Process Contribution allow Plugin content to directly contribute new content, replace existing content, or to cross-reference to any Content Element or Process within another Plugin that it extends.  Similar to UML 2.0's 'package merge' mechanism transformation interpretations, interpreting these Method Plugin mechanisms results into new extended Method Content and Processes.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodUnit">
-				<xsd:sequence>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="ReferencedMethodPlugin" type="xsd:string"/>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="MethodPackage" type="uma:MethodPackage"/>
-				</xsd:sequence>
-				<xsd:attribute name="userChangeable" type="xsd:boolean"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:element name="MethodPlugin" type="uma:MethodPlugin">
-		<xsd:annotation>
-			<xsd:documentation>A special Method Unit that represents a physical container for Method Packages.  It defines a granularity level for the modularization and organization of method content and processes.  A Method Plugin can extend many other Method Plugins and it can be extended by many Method Plugins.  It can also be used stand-alone, i.e. with no Extension relationship to other plug-ins.
-Method Plugin conceptually represents a unit for configuration, modularization, extension, packaging, and deployment of method content and processes.  A Process Engineer shall design his Plugins and allocate his content to these Plugins with requirements for extensibility, modularity, reuse, and maintainability in mind.
-Special extensibility mechanisms defined for the meta-classes Variability Element and Process Contribution allow Plugin content to directly contribute new content, replace existing content, or to cross-reference to any Content Element or Process within another Plugin that it extends.  Similar to UML 2.0's 'package merge' mechanism transformation interpretations, interpreting these Method Plugin mechanisms results into new extended Method Content and Processes.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:complexType name="MethodConfiguration">
-		<xsd:annotation>
-			<xsd:documentation>A collection of selected Method Models and MethodPackages. A configuration can be exported into its own standalone library when it includes the full transitive closure of all elements all other elements depend on.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodUnit">
-				<xsd:sequence>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="BaseConfiguration" type="xsd:string"/>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="MethodPluginSelection" type="xsd:string"/>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="MethodPackageSelection" type="xsd:string"/>
-					<xsd:element minOccurs="0" name="DefaultView" type="xsd:string"/>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="ProcessView" type="xsd:string"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:element name="MethodConfiguration" type="uma:MethodConfiguration">
-		<xsd:annotation>
-			<xsd:documentation>A collection of selected Method Models and MethodPackages. A configuration can be exported into its own standalone library when it includes the full transitive closure of all elements all other elements depend on.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:complexType name="MethodLibrary">
-		<xsd:annotation>
-			<xsd:documentation>A Method Library is a physical container for Method Plugins and Method Configuration definitions.  All Method Elements are stored in a Method Library.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="uma:MethodUnit">
-				<xsd:sequence>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="MethodPlugin" type="uma:MethodPlugin"/>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="MethodConfiguration" type="uma:MethodConfiguration"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:element name="MethodLibrary" type="uma:MethodLibrary">
-		<xsd:annotation>
-			<xsd:documentation>A Method Library is a physical container for Method Plugins and Method Configuration definitions.  All Method Elements are stored in a Method Library.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-</xsd:schema>
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Activity.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Activity.java
deleted file mode 100755
index 180499b..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Activity.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Activity.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Activity</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Work Breakdown Element and Work Definition which supports the nesting and logical grouping of related Breakdown Elements forming breakdown structures.  Although Activity is a concrete meta-class, other classes which represent breakdown structures derive from it; such as Phase, Iteration, Delivery Process, or Capability Pattern.
- * Activity represents a grouping element for other Breakdown Elements such as Activities, Descriptors, Milestones, etc.  It is not per-se a 'high-level' grouping of only work as in other meta-models, but groups any kind of Breakdown Elements.  For example, one can define valid Activities that group only Work Products Descriptors without any matching Task Descriptors.  Activities also inherit all properties from Work Breakdown Element and indirectly from Process Element; i.e. Activity is ready to have a full content description attached to it.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.Activity#getPrecondition <em>Precondition</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Activity#getPostcondition <em>Postcondition</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Activity#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Activity#getBreakdownElement <em>Breakdown Element</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Activity#getChecklist <em>Checklist</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Activity#getConcept <em>Concept</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Activity#getExample <em>Example</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Activity#getGuideline <em>Guideline</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Activity#getRoadmap <em>Roadmap</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Activity#getReusableAsset <em>Reusable Asset</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Activity#getSupportingMaterial <em>Supporting Material</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Activity#getWhitepaper <em>Whitepaper</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Activity#isIsEnactable <em>Is Enactable</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Activity#getVariabilityBasedOnElement <em>Variability Based On Element</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Activity#getVariabilityType <em>Variability Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity()
- * @model extendedMetaData="name='Activity' kind='elementOnly'"
- * @generated
- */
-public interface Activity extends WorkBreakdownElement {
-	/**
-	 * Returns the value of the '<em><b>Precondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Precondition</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Precondition</em>' attribute.
-	 * @see #setPrecondition(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity_Precondition()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Precondition'"
-	 * @generated
-	 */
-	String getPrecondition();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Activity#getPrecondition <em>Precondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Precondition</em>' attribute.
-	 * @see #getPrecondition()
-	 * @generated
-	 */
-	void setPrecondition(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Postcondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Postcondition</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Postcondition</em>' attribute.
-	 * @see #setPostcondition(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity_Postcondition()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Postcondition'"
-	 * @generated
-	 */
-	String getPostcondition();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Activity#getPostcondition <em>Postcondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Postcondition</em>' attribute.
-	 * @see #getPostcondition()
-	 * @generated
-	 */
-	void setPostcondition(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:26'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Breakdown Element</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.BreakdownElement}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Breakdown Element</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Breakdown Element</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity_BreakdownElement()
-	 * @model type="org.eclipse.epf.xml.uma.BreakdownElement" containment="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='BreakdownElement' group='#group:26'"
-	 * @generated
-	 */
-	EList getBreakdownElement();
-
-	/**
-	 * Returns the value of the '<em><b>Checklist</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Checklist</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Checklist</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity_Checklist()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Checklist' group='#group:26'"
-	 * @generated
-	 */
-	EList getChecklist();
-
-	/**
-	 * Returns the value of the '<em><b>Concept</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Concept</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Concept</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity_Concept()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Concept' group='#group:26'"
-	 * @generated
-	 */
-	EList getConcept();
-
-	/**
-	 * Returns the value of the '<em><b>Example</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Example</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Example</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity_Example()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Example' group='#group:26'"
-	 * @generated
-	 */
-	EList getExample();
-
-	/**
-	 * Returns the value of the '<em><b>Guideline</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Guideline</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Guideline</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity_Guideline()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Guideline' group='#group:26'"
-	 * @generated
-	 */
-	EList getGuideline();
-
-	/**
-	 * Returns the value of the '<em><b>Roadmap</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Roadmap</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Roadmap</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity_Roadmap()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Roadmap' group='#group:26'"
-	 * @generated
-	 */
-	EList getRoadmap();
-
-	/**
-	 * Returns the value of the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Reusable Asset</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Reusable Asset</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity_ReusableAsset()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ReusableAsset' group='#group:26'"
-	 * @generated
-	 */
-	EList getReusableAsset();
-
-	/**
-	 * Returns the value of the '<em><b>Supporting Material</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Supporting Material</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Supporting Material</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity_SupportingMaterial()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='SupportingMaterial' group='#group:26'"
-	 * @generated
-	 */
-	EList getSupportingMaterial();
-
-	/**
-	 * Returns the value of the '<em><b>Whitepaper</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Whitepaper</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Whitepaper</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity_Whitepaper()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Whitepaper' group='#group:26'"
-	 * @generated
-	 */
-	EList getWhitepaper();
-
-	/**
-	 * Returns the value of the '<em><b>Is Enactable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Is Enactable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Is Enactable</em>' attribute.
-	 * @see #isSetIsEnactable()
-	 * @see #unsetIsEnactable()
-	 * @see #setIsEnactable(boolean)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity_IsEnactable()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='attribute' name='IsEnactable'"
-	 * @generated
-	 */
-	boolean isIsEnactable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Activity#isIsEnactable <em>Is Enactable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Enactable</em>' attribute.
-	 * @see #isSetIsEnactable()
-	 * @see #unsetIsEnactable()
-	 * @see #isIsEnactable()
-	 * @generated
-	 */
-	void setIsEnactable(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.Activity#isIsEnactable <em>Is Enactable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsEnactable()
-	 * @see #isIsEnactable()
-	 * @see #setIsEnactable(boolean)
-	 * @generated
-	 */
-	void unsetIsEnactable();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.Activity#isIsEnactable <em>Is Enactable</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Enactable</em>' attribute is set.
-	 * @see #unsetIsEnactable()
-	 * @see #isIsEnactable()
-	 * @see #setIsEnactable(boolean)
-	 * @generated
-	 */
-	boolean isSetIsEnactable();
-
-	/**
-	 * Returns the value of the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Variability Based On Element</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Variability Based On Element</em>' attribute.
-	 * @see #setVariabilityBasedOnElement(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity_VariabilityBasedOnElement()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='variabilityBasedOnElement'"
-	 * @generated
-	 */
-	String getVariabilityBasedOnElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Activity#getVariabilityBasedOnElement <em>Variability Based On Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Variability Based On Element</em>' attribute.
-	 * @see #getVariabilityBasedOnElement()
-	 * @generated
-	 */
-	void setVariabilityBasedOnElement(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Variability Type</b></em>' attribute.
-	 * The default value is <code>"na"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.epf.xml.uma.VariabilityType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Variability Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Variability Type</em>' attribute.
-	 * @see org.eclipse.epf.xml.uma.VariabilityType
-	 * @see #isSetVariabilityType()
-	 * @see #unsetVariabilityType()
-	 * @see #setVariabilityType(VariabilityType)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivity_VariabilityType()
-	 * @model default="na" unique="false" unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='variabilityType'"
-	 * @generated
-	 */
-	VariabilityType getVariabilityType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Activity#getVariabilityType <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Variability Type</em>' attribute.
-	 * @see org.eclipse.epf.xml.uma.VariabilityType
-	 * @see #isSetVariabilityType()
-	 * @see #unsetVariabilityType()
-	 * @see #getVariabilityType()
-	 * @generated
-	 */
-	void setVariabilityType(VariabilityType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.Activity#getVariabilityType <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetVariabilityType()
-	 * @see #getVariabilityType()
-	 * @see #setVariabilityType(VariabilityType)
-	 * @generated
-	 */
-	void unsetVariabilityType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.Activity#getVariabilityType <em>Variability Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Variability Type</em>' attribute is set.
-	 * @see #unsetVariabilityType()
-	 * @see #getVariabilityType()
-	 * @see #setVariabilityType(VariabilityType)
-	 * @generated
-	 */
-	boolean isSetVariabilityType();
-
-} // Activity
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ActivityDescription.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ActivityDescription.java
deleted file mode 100755
index fee753b..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ActivityDescription.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ActivityDescription.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Activity Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A generalized Breakdown Element Description that is used to store the textual description for an Activity.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.ActivityDescription#getAlternatives <em>Alternatives</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ActivityDescription#getHowToStaff <em>How To Staff</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ActivityDescription#getPurpose <em>Purpose</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getActivityDescription()
- * @model extendedMetaData="name='ActivityDescription' kind='elementOnly'"
- * @generated
- */
-public interface ActivityDescription extends BreakdownElementDescription {
-	/**
-	 * Returns the value of the '<em><b>Alternatives</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Comprises of summaries describing important exceptional and non-standard ways of doing the work of this Activity not covered by the Activity's Tasks.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Alternatives</em>' attribute.
-	 * @see #setAlternatives(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivityDescription_Alternatives()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Alternatives'"
-	 * @generated
-	 */
-	String getAlternatives();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ActivityDescription#getAlternatives <em>Alternatives</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Alternatives</em>' attribute.
-	 * @see #getAlternatives()
-	 * @generated
-	 */
-	void setAlternatives(String value);
-
-	/**
-	 * Returns the value of the '<em><b>How To Staff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides background on who should be involved in this activity what are the required skills, experience,  and perhaps attitudes.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>How To Staff</em>' attribute.
-	 * @see #setHowToStaff(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivityDescription_HowToStaff()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='HowToStaff'"
-	 * @generated
-	 */
-	String getHowToStaff();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ActivityDescription#getHowToStaff <em>How To Staff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>How To Staff</em>' attribute.
-	 * @see #getHowToStaff()
-	 * @generated
-	 */
-	void setHowToStaff(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Summarizes the main reason for performing this Activity, describes what the activity as a whole is intended to achieve.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Purpose</em>' attribute.
-	 * @see #setPurpose(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getActivityDescription_Purpose()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Purpose'"
-	 * @generated
-	 */
-	String getPurpose();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ActivityDescription#getPurpose <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Purpose</em>' attribute.
-	 * @see #getPurpose()
-	 * @generated
-	 */
-	void setPurpose(String value);
-
-} // ActivityDescription
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Artifact.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Artifact.java
deleted file mode 100755
index 87f6f46..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Artifact.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Artifact.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Artifact</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Work Product that provides a description and definition for tangible work product types. Artifacts may be composed of other artifacts. For example, a model artifact can be composed of model elements, which are also artifacts.
- * Artifacts are tangible work products consumed, produced, or modified by Tasks.  It may serve as a basis for defining reusable assets.  Roles use Artifacts to perform Tasks and produce Artifacts in the course of performing Tasks.  Artifacts are the responsibility of a single Role, making responsibility easy to identify and understand, and promoting the idea that every piece of information produced in the method requires the appropriate set of skills. Even though one role might "own" a specific type of Artifacts, other roles can still use the Artifacts; perhaps even update them if the Role has been given permission to do so.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.Artifact#getGroup3 <em>Group3</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Artifact#getContainedArtifact <em>Contained Artifact</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getArtifact()
- * @model extendedMetaData="name='Artifact' kind='elementOnly'"
- * @generated
- */
-public interface Artifact extends WorkProduct {
-	/**
-	 * Returns the value of the '<em><b>Group3</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group3</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group3</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getArtifact_Group3()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:27'"
-	 * @generated
-	 */
-	FeatureMap getGroup3();
-
-	/**
-	 * Returns the value of the '<em><b>Contained Artifact</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.Artifact}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Contained Artifact</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Contained Artifact</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getArtifact_ContainedArtifact()
-	 * @model type="org.eclipse.epf.xml.uma.Artifact" containment="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ContainedArtifact' group='#group:27'"
-	 * @generated
-	 */
-	EList getContainedArtifact();
-
-} // Artifact
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ArtifactDescription.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ArtifactDescription.java
deleted file mode 100755
index 3649c56..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ArtifactDescription.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ArtifactDescription.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Artifact Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A generalized Work Product Description that is used to store the textual description for an Artifact.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.ArtifactDescription#getBriefOutline <em>Brief Outline</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ArtifactDescription#getRepresentationOptions <em>Representation Options</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getArtifactDescription()
- * @model extendedMetaData="name='ArtifactDescription' kind='elementOnly'"
- * @generated
- */
-public interface ArtifactDescription extends WorkProductDescription {
-	/**
-	 * Returns the value of the '<em><b>Brief Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides a brief description of the information that can be found in this artifact. For example, discusses the contents for key chapters of a document artifact or the key packages and modules of a model artifact.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Brief Outline</em>' attribute.
-	 * @see #setBriefOutline(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getArtifactDescription_BriefOutline()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='BriefOutline'"
-	 * @generated
-	 */
-	String getBriefOutline();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ArtifactDescription#getBriefOutline <em>Brief Outline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Brief Outline</em>' attribute.
-	 * @see #getBriefOutline()
-	 * @generated
-	 */
-	void setBriefOutline(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Representation Options</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Discusses different possible alternative representations for the artifact. For example a design model can be represented as a UML model or an informal block diagram or by textual description only.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Representation Options</em>' attribute.
-	 * @see #setRepresentationOptions(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getArtifactDescription_RepresentationOptions()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='RepresentationOptions'"
-	 * @generated
-	 */
-	String getRepresentationOptions();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ArtifactDescription#getRepresentationOptions <em>Representation Options</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Representation Options</em>' attribute.
-	 * @see #getRepresentationOptions()
-	 * @generated
-	 */
-	void setRepresentationOptions(String value);
-
-} // ArtifactDescription
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/BreakdownElement.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/BreakdownElement.java
deleted file mode 100755
index 6e5d7c0..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/BreakdownElement.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: BreakdownElement.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Breakdown Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An abstract generalization for any type of Method Element that is part of a breakdown structure.  It defines a set of properties available to all of its specializations.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.BreakdownElement#getPresentedAfter <em>Presented After</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.BreakdownElement#getPresentedBefore <em>Presented Before</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.BreakdownElement#getPlanningData <em>Planning Data</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.BreakdownElement#getSuperActivity <em>Super Activity</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.BreakdownElement#isHasMultipleOccurrences <em>Has Multiple Occurrences</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.BreakdownElement#isIsOptional <em>Is Optional</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.BreakdownElement#isIsPlanned <em>Is Planned</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.BreakdownElement#getPrefix <em>Prefix</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getBreakdownElement()
- * @model extendedMetaData="name='BreakdownElement' kind='elementOnly'"
- * @generated
- */
-public interface BreakdownElement extends ProcessElement {
-	/**
-	 * Returns the value of the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Presented After</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Presented After</em>' attribute.
-	 * @see #setPresentedAfter(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getBreakdownElement_PresentedAfter()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='PresentedAfter'"
-	 * @generated
-	 */
-	String getPresentedAfter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.BreakdownElement#getPresentedAfter <em>Presented After</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Presented After</em>' attribute.
-	 * @see #getPresentedAfter()
-	 * @generated
-	 */
-	void setPresentedAfter(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Presented Before</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Presented Before</em>' attribute.
-	 * @see #setPresentedBefore(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getBreakdownElement_PresentedBefore()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='PresentedBefore'"
-	 * @generated
-	 */
-	String getPresentedBefore();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.BreakdownElement#getPresentedBefore <em>Presented Before</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Presented Before</em>' attribute.
-	 * @see #getPresentedBefore()
-	 * @generated
-	 */
-	void setPresentedBefore(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Planning Data</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Planning Data</em>' attribute.
-	 * @see #setPlanningData(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getBreakdownElement_PlanningData()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='PlanningData'"
-	 * @generated
-	 */
-	String getPlanningData();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.BreakdownElement#getPlanningData <em>Planning Data</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Planning Data</em>' attribute.
-	 * @see #getPlanningData()
-	 * @generated
-	 */
-	void setPlanningData(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Super Activity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Super Activity</em>' attribute.
-	 * @see #setSuperActivity(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getBreakdownElement_SuperActivity()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 *        extendedMetaData="kind='element' name='SuperActivity'"
-	 * @generated
-	 */
-	String getSuperActivity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.BreakdownElement#getSuperActivity <em>Super Activity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Super Activity</em>' attribute.
-	 * @see #getSuperActivity()
-	 * @generated
-	 */
-	void setSuperActivity(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Just as the isPlanned attribute the hasMultipleOccurrences attribute has an impact on generating plans from a Process.  When this attribute is set to True for a Breakdown Element then it will typically occur multiple times within the same Activity.  For example, a Task such as "Detail Use Case" would be performed for every use case identified for a particular Iteration or Activity.  Generating a plan would list one Task instance per use case.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Has Multiple Occurrences</em>' attribute.
-	 * @see #isSetHasMultipleOccurrences()
-	 * @see #unsetHasMultipleOccurrences()
-	 * @see #setHasMultipleOccurrences(boolean)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getBreakdownElement_HasMultipleOccurrences()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='attribute' name='hasMultipleOccurrences'"
-	 * @generated
-	 */
-	boolean isHasMultipleOccurrences();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.BreakdownElement#isHasMultipleOccurrences <em>Has Multiple Occurrences</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Has Multiple Occurrences</em>' attribute.
-	 * @see #isSetHasMultipleOccurrences()
-	 * @see #unsetHasMultipleOccurrences()
-	 * @see #isHasMultipleOccurrences()
-	 * @generated
-	 */
-	void setHasMultipleOccurrences(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.BreakdownElement#isHasMultipleOccurrences <em>Has Multiple Occurrences</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetHasMultipleOccurrences()
-	 * @see #isHasMultipleOccurrences()
-	 * @see #setHasMultipleOccurrences(boolean)
-	 * @generated
-	 */
-	void unsetHasMultipleOccurrences();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.BreakdownElement#isHasMultipleOccurrences <em>Has Multiple Occurrences</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Has Multiple Occurrences</em>' attribute is set.
-	 * @see #unsetHasMultipleOccurrences()
-	 * @see #isHasMultipleOccurrences()
-	 * @see #setHasMultipleOccurrences(boolean)
-	 * @generated
-	 */
-	boolean isSetHasMultipleOccurrences();
-
-	/**
-	 * Returns the value of the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Indicates that the Breakdown Element describes work, a work result, or even work resources, which inclusion is not mandatory when performing a project that is planned based on a process containing this element.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Optional</em>' attribute.
-	 * @see #isSetIsOptional()
-	 * @see #unsetIsOptional()
-	 * @see #setIsOptional(boolean)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getBreakdownElement_IsOptional()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='attribute' name='isOptional'"
-	 * @generated
-	 */
-	boolean isIsOptional();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.BreakdownElement#isIsOptional <em>Is Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Optional</em>' attribute.
-	 * @see #isSetIsOptional()
-	 * @see #unsetIsOptional()
-	 * @see #isIsOptional()
-	 * @generated
-	 */
-	void setIsOptional(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.BreakdownElement#isIsOptional <em>Is Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsOptional()
-	 * @see #isIsOptional()
-	 * @see #setIsOptional(boolean)
-	 * @generated
-	 */
-	void unsetIsOptional();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.BreakdownElement#isIsOptional <em>Is Optional</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Optional</em>' attribute is set.
-	 * @see #unsetIsOptional()
-	 * @see #isIsOptional()
-	 * @see #setIsOptional(boolean)
-	 * @generated
-	 */
-	boolean isSetIsOptional();
-
-	/**
-	 * Returns the value of the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A key application for Development Processes expressed with Breakdown structures is to generate a project plan from it.  A process as defined in UMA (cf. with Sections XX and 5.2) is a multi-dimensional structure defining what work is being performed at what time by which roles using which input and producing what outputs.  A project plan as it is represented in project planning tools such as IBM Rational Portfolio Manager or Microsoft Project normally does not need all this information and is normally limited to just representing a subset.  For example, a typical MS Project plan only represents the work breakdown consisting of Tasks and Activities (sometimes referred to as summary tasks).  It does not show the input and output Work Products for a Task, but it can show which roles shall be staffed for performing the Task.  However, such role allocation need to be replaced with concrete resources when instantiating the plan for a concrete project.  Sometimes project plans can then again be organized differently by organizing work by deliverables in which Work Products are mapped to the plan's summary tasks and Task that have these work products as output mapped below such as summary task.  Therefore, a process can make recommendations about which elements to include and which to exclude when generating a plan.  When the isPlanned attribute is set to False for an instance of a Breakdown Element, then this element shall not be not included when a concrete project plan is being generated from the breakdown structure that contains this element.
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Planned</em>' attribute.
-	 * @see #isSetIsPlanned()
-	 * @see #unsetIsPlanned()
-	 * @see #setIsPlanned(boolean)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getBreakdownElement_IsPlanned()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='attribute' name='isPlanned'"
-	 * @generated
-	 */
-	boolean isIsPlanned();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.BreakdownElement#isIsPlanned <em>Is Planned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Planned</em>' attribute.
-	 * @see #isSetIsPlanned()
-	 * @see #unsetIsPlanned()
-	 * @see #isIsPlanned()
-	 * @generated
-	 */
-	void setIsPlanned(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.BreakdownElement#isIsPlanned <em>Is Planned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsPlanned()
-	 * @see #isIsPlanned()
-	 * @see #setIsPlanned(boolean)
-	 * @generated
-	 */
-	void unsetIsPlanned();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.BreakdownElement#isIsPlanned <em>Is Planned</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Planned</em>' attribute is set.
-	 * @see #unsetIsPlanned()
-	 * @see #isIsPlanned()
-	 * @see #setIsPlanned(boolean)
-	 * @generated
-	 */
-	boolean isSetIsPlanned();
-
-	/**
-	 * Returns the value of the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Prefix represents an additional label that will be presented as a prefix to any Breakdown Element to indicate a user-defined sub-type for the element.  For example, if the process engineer would like to distinguish his Activities by 'Module' (as done in the IBM Rational Summit Ascendant Method), he can define a different prefix for every model to be used in addition to naming Activities, e.g. "SRA.Establish Requirements" with SRA indicating that this Activity belongs to the "Software Requirements Analysis" module.  Another common application for prefix is to qualify roles in Role Descriptors.  For example, "Customer.Architect" would define a "Customer" prefix for the Role Descriptor "Architect" expressing that this is an architect on the customer side and not the development team side.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Prefix</em>' attribute.
-	 * @see #setPrefix(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getBreakdownElement_Prefix()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='prefix'"
-	 * @generated
-	 */
-	String getPrefix();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.BreakdownElement#getPrefix <em>Prefix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Prefix</em>' attribute.
-	 * @see #getPrefix()
-	 * @generated
-	 */
-	void setPrefix(String value);
-
-} // BreakdownElement
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/BreakdownElementDescription.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/BreakdownElementDescription.java
deleted file mode 100755
index 77d3d15..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/BreakdownElementDescription.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: BreakdownElementDescription.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Breakdown Element Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A generalized Content Description that is used to store the textual description for a Breakdown Element.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.BreakdownElementDescription#getUsageGuidance <em>Usage Guidance</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getBreakdownElementDescription()
- * @model extendedMetaData="name='BreakdownElementDescription' kind='elementOnly'"
- * @generated
- */
-public interface BreakdownElementDescription extends ContentDescription {
-	/**
-	 * Returns the value of the '<em><b>Usage Guidance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides information and guidance on the meaning of the Boolean flag values and under what circumstances they should be overridden. For example, it describes why the breakdown element is optional or considerations for repeating it and differences in the individual occurrences of this Breakdown Element across the lifecycle.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Usage Guidance</em>' attribute.
-	 * @see #setUsageGuidance(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getBreakdownElementDescription_UsageGuidance()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='usageGuidance'"
-	 * @generated
-	 */
-	String getUsageGuidance();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.BreakdownElementDescription#getUsageGuidance <em>Usage Guidance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Usage Guidance</em>' attribute.
-	 * @see #getUsageGuidance()
-	 * @generated
-	 */
-	void setUsageGuidance(String value);
-
-} // BreakdownElementDescription
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/CapabilityPattern.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/CapabilityPattern.java
deleted file mode 100755
index cf5d35b..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/CapabilityPattern.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CapabilityPattern.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Capability Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Process that describes a reusable cluster of doing work in common process areas.  Capabilities Patterns express and communicate process knowledge for a key area of interest such as a Discipline and can be directly used by process practitioner to guide his work.  They are also used as building blocks to assemble Delivery Processes or larger Capability Patterns ensuring optimal reuse and application of the key practices they express.
- * A Capability Pattern is a special Process that describes a reusable cluster of doing work in a general process area that provides a consistent development approach to common problems.  Examples for Capability Pattern could be 'use case-based requirements management', 'use case analysis', or 'unit testing'. Typically but not necessarily, Capability Patterns have the scope of one discipline providing a breakdown of reusable complex Activities, relationships to the Roles which perform Tasks within these Activities, as well as to the Work Products that are used and produced.  A capability pattern does not relate to any specific phase or iteration of a development lifecycle, and should not imply any.  In other words, a pattern should be designed in a way that it is applicable anywhere in a Delivery Process.  This enables its Activities to be flexibly assigned to whatever phases there are in the Delivery Process to which it is being applied.  It is a good practice to design a Capability Pattern to produce one or more generic Deliverables.  The typical configuration is that each Activity in the Capability Pattern produces one Deliverable, and the last Task Descriptor in the Activity explicitly outputs just this Deliverable.  This enables the process engineer to select Patterns or just Activities by deciding which Deliverables are required.  It also offers a simple integration approach: an Activity from a capability pattern is linked to the Phase or Iteration which is required to produce the Activity's Deliverable.  Key applications areas of / areas of reuse for Capability Patterns are:
- * - To serve as building blocks for assembling Delivery Processes or larger Capability Patterns.  Normally developing a Delivery Process is not done from scratch but by systematically applying and binding patterns.  In addition to the standard pattern application of 'copy-and-modify', which allows the process engineer to individually customize the pattern's content to the particular situation it is applied for, the Plugin meta-model package (Section 6.1) introduces even more sophisticated inheritance relationships that support dynamic binding of patterns (i.e. the pattern is referenced and not copied).  This unique new way of reusing process knowledge allows to factor out commonly reoccurring Activities into patterns and to apply them over and over again for a process.  When the pattern is being revised or updated, all changes will be automatically reflected in all pattern application in all processes because of the dynamic binding.
- * - To support direct execution in a development project that does not work following a well-defined process, but works based on loosely connected process fragments of best practices in a flexible manner (e.g. Agile Development).
- * - To support process education by describing knowledge for a key area such as best practices on how to perform the work for a Discipline (e.g. Requirements Management), for a specific development technique (aspect-oriented development), or a specific technical area (e.g. relational database design), which is used for education and teaching.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getCapabilityPattern()
- * @model extendedMetaData="name='CapabilityPattern' kind='elementOnly'"
- * @generated
- */
-public interface CapabilityPattern extends org.eclipse.epf.xml.uma.Process {
-} // CapabilityPattern
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Checklist.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Checklist.java
deleted file mode 100755
index 2b84405..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Checklist.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Checklist.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Checklist</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A specific type of guidance that identifies a series of items that need to be completed or veri-fied.  Checklists are often used in reviews such as walkthroughs or inspections. 
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getChecklist()
- * @model extendedMetaData="name='Checklist' kind='elementOnly'"
- * @generated
- */
-public interface Checklist extends Guidance {
-} // Checklist
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/CompositeRole.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/CompositeRole.java
deleted file mode 100755
index 0a9fa4a..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/CompositeRole.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CompositeRole.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Composite Role</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Role Descriptor that relates to more then one Role.  It represents a grouping of Roles with the main purpose of simplification, i.e. reducing the number of roles for a process.
- * A Composite Role is a grouping of Roles that can be used in an Activity or Process to reduce the number of Roles.  A typical application would be a process for a small team in which a standard set of roles from the method content would be all performed by one or more resource.  By using Composite Role the process would suggest a typical clustering of Roles to Resources.  A Composite Role could perform all Tasks defined for the Roles it refers to.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.CompositeRole#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.CompositeRole#getAggregatedRole <em>Aggregated Role</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getCompositeRole()
- * @model extendedMetaData="name='CompositeRole' kind='elementOnly'"
- * @generated
- */
-public interface CompositeRole extends RoleDescriptor {
-	/**
-	 * Returns the value of the '<em><b>Group1</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group1</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group1</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getCompositeRole_Group1()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:22'"
-	 * @generated
-	 */
-	FeatureMap getGroup1();
-
-	/**
-	 * Returns the value of the '<em><b>Aggregated Role</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.Role}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Aggregated Role</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Aggregated Role</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getCompositeRole_AggregatedRole()
-	 * @model type="org.eclipse.epf.xml.uma.Role" containment="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='AggregatedRole' group='#group:22'"
-	 * @generated
-	 */
-	EList getAggregatedRole();
-
-} // CompositeRole
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Concept.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Concept.java
deleted file mode 100755
index 05ccdcb..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Concept.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Concept.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Concept</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A specific type of guidance that outlines key ideas associated with basic principles underlying the referenced item. Concepts normally address more general topics than Guidelines and span across sev-eral work product and/or tasks/activities.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getConcept()
- * @model extendedMetaData="name='Concept' kind='elementOnly'"
- * @generated
- */
-public interface Concept extends Guidance {
-} // Concept
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Constraint.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Constraint.java
deleted file mode 100755
index 4ed9650..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Constraint.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Constraint.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A generalized Method Element that represents a condition or restriction expressed in natural language text or in a machine readable language for the purpose of declaring some of the semantics of a Method Element.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.Constraint#getMainDescription <em>Main Description</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getConstraint()
- * @model extendedMetaData="name='Constraint' kind='elementOnly'"
- * @generated
- */
-public interface Constraint extends MethodElement {
-	/**
-	 * Returns the value of the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Stores the main definition of the constraint.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Main Description</em>' attribute.
-	 * @see #setMainDescription(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getConstraint_MainDescription()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='mainDescription'"
-	 * @generated
-	 */
-	String getMainDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Constraint#getMainDescription <em>Main Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Main Description</em>' attribute.
-	 * @see #getMainDescription()
-	 * @generated
-	 */
-	void setMainDescription(String value);
-
-} // Constraint
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ContentCategory.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ContentCategory.java
deleted file mode 100755
index 76246bd..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ContentCategory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentCategory.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Content Category</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An abstract class generalizing content category types.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getContentCategory()
- * @model extendedMetaData="name='ContentCategory' kind='elementOnly'"
- * @generated
- */
-public interface ContentCategory extends ContentElement {
-} // ContentCategory
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ContentCategoryPackage.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ContentCategoryPackage.java
deleted file mode 100755
index 7d3ea49..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ContentCategoryPackage.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentCategoryPackage.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Content Category Package</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Method Package that only contains Content Category Elements.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentCategoryPackage#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentCategoryPackage#getContentCategory <em>Content Category</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getContentCategoryPackage()
- * @model extendedMetaData="name='ContentCategoryPackage' kind='elementOnly'"
- * @generated
- */
-public interface ContentCategoryPackage extends MethodPackage {
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentCategoryPackage_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:11'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Content Category</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.ContentCategory}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Content Category</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Content Category</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentCategoryPackage_ContentCategory()
-	 * @model type="org.eclipse.epf.xml.uma.ContentCategory" containment="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ContentCategory' group='#group:11'"
-	 * @generated
-	 */
-	EList getContentCategory();
-
-} // ContentCategoryPackage
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ContentDescription.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ContentDescription.java
deleted file mode 100755
index b76fd7c..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ContentDescription.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentDescription.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Content Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A generalized Method Element that is used to store the textual description for a Content Element.  It defines standard attributes applicable for all Content Element types.  Specific Content Element sub-types can define their own matching Content Description sub-types. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentDescription#getMainDescription <em>Main Description</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentDescription#getKeyConsiderations <em>Key Considerations</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentDescription#getSection <em>Section</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getContentDescription()
- * @model extendedMetaData="name='ContentDescription' kind='elementOnly'"
- * @generated
- */
-public interface ContentDescription extends MethodUnit {
-	/**
-	 * Returns the value of the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Stores the main descriptive text for the Content Element.  All text that is not part of any of the more specific attributes shall be stored here.  If the Content Description is divided into sections using the Section class, then only the text from the 'start' of the content description to the first section will be stored here (similar to a normal document where you can place text between its beginning to its first diction heading).
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Main Description</em>' attribute.
-	 * @see #setMainDescription(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentDescription_MainDescription()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='MainDescription'"
-	 * @generated
-	 */
-	String getMainDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ContentDescription#getMainDescription <em>Main Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Main Description</em>' attribute.
-	 * @see #getMainDescription()
-	 * @generated
-	 */
-	void setMainDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides advise and guidance of a critical nature for the content element as well as warnings, cautions, pitfalls, dangers.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Key Considerations</em>' attribute.
-	 * @see #setKeyConsiderations(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentDescription_KeyConsiderations()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='KeyConsiderations'"
-	 * @generated
-	 */
-	String getKeyConsiderations();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ContentDescription#getKeyConsiderations <em>Key Considerations</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Key Considerations</em>' attribute.
-	 * @see #getKeyConsiderations()
-	 * @generated
-	 */
-	void setKeyConsiderations(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Section</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.Section}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Section</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Section</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentDescription_Section()
-	 * @model type="org.eclipse.epf.xml.uma.Section" containment="true"
-	 *        extendedMetaData="kind='element' name='Section'"
-	 * @generated
-	 */
-	EList getSection();
-
-} // ContentDescription
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ContentElement.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ContentElement.java
deleted file mode 100755
index 35a3a81..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ContentElement.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentElement.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Content Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Describable Element that represents an abstract generalization for all elements that are considered to be and managed as Method Content.
- * Content Elements represents reusable Method Content that is supposed to be managed in Content Packages.  The separation of Content Element from Process Element allows to clearly distinguish between pure method content from content that is represented in processes.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentElement#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentElement#getChecklist <em>Checklist</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentElement#getConcept <em>Concept</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentElement#getExample <em>Example</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentElement#getGuideline <em>Guideline</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentElement#getReusableAsset <em>Reusable Asset</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentElement#getSupportingMaterial <em>Supporting Material</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentElement#getWhitepaper <em>Whitepaper</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentElement#getVariabilityBasedOnElement <em>Variability Based On Element</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentElement#getVariabilityType <em>Variability Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getContentElement()
- * @model extendedMetaData="name='ContentElement' kind='elementOnly'"
- * @generated
- */
-public interface ContentElement extends DescribableElement {
-	/**
-	 * Returns the value of the '<em><b>Group1</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group1</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group1</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentElement_Group1()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:11'"
-	 * @generated
-	 */
-	FeatureMap getGroup1();
-
-	/**
-	 * Returns the value of the '<em><b>Checklist</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Checklist</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Checklist</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentElement_Checklist()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Checklist' group='#group:11'"
-	 * @generated
-	 */
-	EList getChecklist();
-
-	/**
-	 * Returns the value of the '<em><b>Concept</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Concept</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Concept</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentElement_Concept()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Concept' group='#group:11'"
-	 * @generated
-	 */
-	EList getConcept();
-
-	/**
-	 * Returns the value of the '<em><b>Example</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Example</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Example</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentElement_Example()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Example' group='#group:11'"
-	 * @generated
-	 */
-	EList getExample();
-
-	/**
-	 * Returns the value of the '<em><b>Guideline</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Guideline</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Guideline</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentElement_Guideline()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Guideline' group='#group:11'"
-	 * @generated
-	 */
-	EList getGuideline();
-
-	/**
-	 * Returns the value of the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Reusable Asset</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Reusable Asset</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentElement_ReusableAsset()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ReusableAsset' group='#group:11'"
-	 * @generated
-	 */
-	EList getReusableAsset();
-
-	/**
-	 * Returns the value of the '<em><b>Supporting Material</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Supporting Material</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Supporting Material</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentElement_SupportingMaterial()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='SupportingMaterial' group='#group:11'"
-	 * @generated
-	 */
-	EList getSupportingMaterial();
-
-	/**
-	 * Returns the value of the '<em><b>Whitepaper</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Whitepaper</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Whitepaper</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentElement_Whitepaper()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Whitepaper' group='#group:11'"
-	 * @generated
-	 */
-	EList getWhitepaper();
-
-	/**
-	 * Returns the value of the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Variability Based On Element</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Variability Based On Element</em>' attribute.
-	 * @see #setVariabilityBasedOnElement(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentElement_VariabilityBasedOnElement()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='variabilityBasedOnElement'"
-	 * @generated
-	 */
-	String getVariabilityBasedOnElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ContentElement#getVariabilityBasedOnElement <em>Variability Based On Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Variability Based On Element</em>' attribute.
-	 * @see #getVariabilityBasedOnElement()
-	 * @generated
-	 */
-	void setVariabilityBasedOnElement(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Variability Type</b></em>' attribute.
-	 * The default value is <code>"na"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.epf.xml.uma.VariabilityType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Variability Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Variability Type</em>' attribute.
-	 * @see org.eclipse.epf.xml.uma.VariabilityType
-	 * @see #isSetVariabilityType()
-	 * @see #unsetVariabilityType()
-	 * @see #setVariabilityType(VariabilityType)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentElement_VariabilityType()
-	 * @model default="na" unique="false" unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='variabilityType'"
-	 * @generated
-	 */
-	VariabilityType getVariabilityType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ContentElement#getVariabilityType <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Variability Type</em>' attribute.
-	 * @see org.eclipse.epf.xml.uma.VariabilityType
-	 * @see #isSetVariabilityType()
-	 * @see #unsetVariabilityType()
-	 * @see #getVariabilityType()
-	 * @generated
-	 */
-	void setVariabilityType(VariabilityType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.ContentElement#getVariabilityType <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetVariabilityType()
-	 * @see #getVariabilityType()
-	 * @see #setVariabilityType(VariabilityType)
-	 * @generated
-	 */
-	void unsetVariabilityType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.ContentElement#getVariabilityType <em>Variability Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Variability Type</em>' attribute is set.
-	 * @see #unsetVariabilityType()
-	 * @see #getVariabilityType()
-	 * @see #setVariabilityType(VariabilityType)
-	 * @generated
-	 */
-	boolean isSetVariabilityType();
-
-} // ContentElement
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ContentPackage.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ContentPackage.java
deleted file mode 100755
index 922c49f..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ContentPackage.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentPackage.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Content Package</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Method Package that contains Content Elements and Content Elements, only.  Examples for Content Element are Artifacts, Tasks, Roles, etc.  A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentPackage#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ContentPackage#getContentElement <em>Content Element</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getContentPackage()
- * @model extendedMetaData="name='ContentPackage' kind='elementOnly'"
- * @generated
- */
-public interface ContentPackage extends MethodPackage {
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentPackage_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:11'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Content Element</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.ContentElement}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Content Element</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Content Element</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getContentPackage_ContentElement()
-	 * @model type="org.eclipse.epf.xml.uma.ContentElement" containment="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ContentElement' group='#group:11'"
-	 * @generated
-	 */
-	EList getContentElement();
-
-} // ContentPackage
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/CustomCategory.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/CustomCategory.java
deleted file mode 100755
index 25549f4..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/CustomCategory.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CustomCategory.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Custom Category</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A category introduced by a method content author to structure any number of method Content Elements of any subtype based on user-defined criteria.  Because Content Categories (and therefore Custom Categories, too) are Content Elements themselves, Custom Categories can be used to recursively categorize Content Categories as well.  Custom Categories can also be nested with any Content Category.  Custom categories can be used to categorize content based on the user's criteria as well as to define whole tree-structures of nested categories allowing the user to systematically navigate and browse method content and processes based on these categories.  For example, one could create a custom category to logically organize content relevant for the user's development organization departments; e.g. a "Testing" category that groups together all roles, work products, tasks, and guidance element relevant to testing.  Another example would be categories that express licensing levels of the content grouping freely distributable method content versus content that represent intellectual property and requires a license to be purchased to be able to use it.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.CustomCategory#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.CustomCategory#getCategorizedElement <em>Categorized Element</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.CustomCategory#getSubCategory <em>Sub Category</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getCustomCategory()
- * @model extendedMetaData="name='CustomCategory' kind='elementOnly'"
- * @generated
- */
-public interface CustomCategory extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getCustomCategory_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:21'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Categorized Element</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Categorized Element</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Categorized Element</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getCustomCategory_CategorizedElement()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='CategorizedElement' group='#group:21'"
-	 * @generated
-	 */
-	EList getCategorizedElement();
-
-	/**
-	 * Returns the value of the '<em><b>Sub Category</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sub Category</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sub Category</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getCustomCategory_SubCategory()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='SubCategory' group='#group:21'"
-	 * @generated
-	 */
-	EList getSubCategory();
-
-} // CustomCategory
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Deliverable.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Deliverable.java
deleted file mode 100755
index fec5c49..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Deliverable.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Deliverable.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Deliverable</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Work Product that provides a description and definition for packaging other Work Products, and may be delivered to an internal or external party.  Therefore, a Deliverable aggregates other Work Products. Therefore, a Deliverable aggregates other Work Products.  A Deliverable is used to pre-define typical or recommended content in the form or work products that would be packaged for delivery.  The actual packaging of the Deliverable in an actual process or even project could be a modification of this recommendation.  Deliverables are used to represent an output from a process that has value, material or otherwise, to a client, customer or other stakeholder. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.Deliverable#getGroup3 <em>Group3</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Deliverable#getDeliveredWorkProduct <em>Delivered Work Product</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliverable()
- * @model extendedMetaData="name='Deliverable' kind='elementOnly'"
- * @generated
- */
-public interface Deliverable extends WorkProduct {
-	/**
-	 * Returns the value of the '<em><b>Group3</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group3</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group3</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliverable_Group3()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:27'"
-	 * @generated
-	 */
-	FeatureMap getGroup3();
-
-	/**
-	 * Returns the value of the '<em><b>Delivered Work Product</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Delivered Work Product</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Delivered Work Product</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliverable_DeliveredWorkProduct()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='DeliveredWorkProduct' group='#group:27'"
-	 * @generated
-	 */
-	EList getDeliveredWorkProduct();
-
-} // Deliverable
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DeliverableDescription.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DeliverableDescription.java
deleted file mode 100755
index 3251145..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DeliverableDescription.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DeliverableDescription.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Deliverable Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A generalized Work Product Description that is used to store the textual description for a Deliverable.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.DeliverableDescription#getExternalDescription <em>External Description</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DeliverableDescription#getPackagingGuidance <em>Packaging Guidance</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliverableDescription()
- * @model extendedMetaData="name='DeliverableDescription' kind='elementOnly'"
- * @generated
- */
-public interface DeliverableDescription extends WorkProductDescription {
-	/**
-	 * Returns the value of the '<em><b>External Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The description of the Deliverable used for client documents (proposal, statements of work or contractual agreements).  It might use a different language and follow legal constraints.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>External Description</em>' attribute.
-	 * @see #setExternalDescription(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliverableDescription_ExternalDescription()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='ExternalDescription'"
-	 * @generated
-	 */
-	String getExternalDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DeliverableDescription#getExternalDescription <em>External Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>External Description</em>' attribute.
-	 * @see #getExternalDescription()
-	 * @generated
-	 */
-	void setExternalDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Packaging Guidance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides guidance on how to assemble the deliverable from all its required inputs.  This section describes the most common content medium and format.  Distribution of the deliverable is addressed in this section, if necessary.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Packaging Guidance</em>' attribute.
-	 * @see #setPackagingGuidance(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliverableDescription_PackagingGuidance()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='PackagingGuidance'"
-	 * @generated
-	 */
-	String getPackagingGuidance();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DeliverableDescription#getPackagingGuidance <em>Packaging Guidance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Packaging Guidance</em>' attribute.
-	 * @see #getPackagingGuidance()
-	 * @generated
-	 */
-	void setPackagingGuidance(String value);
-
-} // DeliverableDescription
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DeliveryProcess.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DeliveryProcess.java
deleted file mode 100755
index 57e4efe..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DeliveryProcess.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DeliveryProcess.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Delivery Process</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Process describing a complete and integrated approach for performing a specific project type.  It describes a complete project lifecycle end-to-end and shall be used as a reference for running projects with similar characteristics as defined for the process.  A Delivery Process is related to specific supporting information such as Roadmaps (inherited via Activity) as well as Communications and Education Material.
- * A Delivery Process is a Process that covers a whole development lifecycle from beginning to end.  A Delivery Process shall be used as a template for planning and running a project.  It provides a complete lifecycle model with predefined phases, iterations, and activities that have been detailed by sequencing referencing method content in breakdown structures.  It is defined on the basis of experience with past projects or engagements, and/or the best practice use of a development or delivery approach.  It defines what gets produced, how those items are produced, and the required staffing in the form of integrated Work, Work Product, and Team Breakdown Structures.  For example, a process engineer can define alternative Delivery Processes for software development projects that differ in the scale of the engagement and staffing necessary, the type of the software application to be developed, the development methods and technologies to be used, etc.  Although, the Delivery Process aims to cover a whole project it keeps certain decision that are too project specific open.  For example, the breakdown structure defines which Breakdown Elements have multiple occurrences or is repeatable via it respective attributes, but does not say how many occurrences and how many repeats/iterations it will have.  These decisions have to be done by a project manager when planning a concrete project, project phase, or project iterations.  A Delivery Process is always a complete description of a process in terms of completeness of the lifecycle, as well as in terms of all three views on the process which are the Work Breakdown Structure, Work Product Breakdown Structure, and Team Breakdown Structure have to be fully and consistently populated.  Consistency of a Delivery Process is actually ensured by the fact that all three breakdowns are represented by one single data structure and one particular breakdown such as Team Breakdown is just a view on that data structure.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.DeliveryProcess#getGroup3 <em>Group3</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DeliveryProcess#getCommunicationsMaterial <em>Communications Material</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DeliveryProcess#getEducationMaterial <em>Education Material</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliveryProcess()
- * @model extendedMetaData="name='DeliveryProcess' kind='elementOnly'"
- * @generated
- */
-public interface DeliveryProcess extends org.eclipse.epf.xml.uma.Process {
-	/**
-	 * Returns the value of the '<em><b>Group3</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group3</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group3</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliveryProcess_Group3()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:42'"
-	 * @generated
-	 */
-	FeatureMap getGroup3();
-
-	/**
-	 * Returns the value of the '<em><b>Communications Material</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Communications Material</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Communications Material</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliveryProcess_CommunicationsMaterial()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='CommunicationsMaterial' group='#group:42'"
-	 * @generated
-	 */
-	EList getCommunicationsMaterial();
-
-	/**
-	 * Returns the value of the '<em><b>Education Material</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Education Material</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Education Material</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliveryProcess_EducationMaterial()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='EducationMaterial' group='#group:42'"
-	 * @generated
-	 */
-	EList getEducationMaterial();
-
-} // DeliveryProcess
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DeliveryProcessDescription.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DeliveryProcessDescription.java
deleted file mode 100755
index d50fb08..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DeliveryProcessDescription.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DeliveryProcessDescription.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Delivery Process Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A generalized Process Description that is used to store the textual description for a Delivery Process.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getScale <em>Scale</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getProjectCharacteristics <em>Project Characteristics</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getRiskLevel <em>Risk Level</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getEstimatingTechnique <em>Estimating Technique</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getProjectMemberExpertise <em>Project Member Expertise</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getTypeOfContract <em>Type Of Contract</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliveryProcessDescription()
- * @model extendedMetaData="name='DeliveryProcessDescription' kind='elementOnly'"
- * @generated
- */
-public interface DeliveryProcessDescription extends ProcessDescription {
-	/**
-	 * Returns the value of the '<em><b>Scale</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Outlines characteristics about the size of a typical project that performs this project expressed in team size, man years, etc.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Scale</em>' attribute.
-	 * @see #setScale(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliveryProcessDescription_Scale()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Scale'"
-	 * @generated
-	 */
-	String getScale();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getScale <em>Scale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scale</em>' attribute.
-	 * @see #getScale()
-	 * @generated
-	 */
-	void setScale(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Project Characteristics</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Characterizes the project that would typically perform this Process
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Project Characteristics</em>' attribute.
-	 * @see #setProjectCharacteristics(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliveryProcessDescription_ProjectCharacteristics()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='ProjectCharacteristics'"
-	 * @generated
-	 */
-	String getProjectCharacteristics();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getProjectCharacteristics <em>Project Characteristics</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Project Characteristics</em>' attribute.
-	 * @see #getProjectCharacteristics()
-	 * @generated
-	 */
-	void setProjectCharacteristics(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Risk Level</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Outlines typical project risks that are addressed with this process.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Risk Level</em>' attribute.
-	 * @see #setRiskLevel(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliveryProcessDescription_RiskLevel()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='RiskLevel'"
-	 * @generated
-	 */
-	String getRiskLevel();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getRiskLevel <em>Risk Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Risk Level</em>' attribute.
-	 * @see #getRiskLevel()
-	 * @generated
-	 */
-	void setRiskLevel(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Estimating Technique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Describes the Estimation Techniques provided for this Process.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Estimating Technique</em>' attribute.
-	 * @see #setEstimatingTechnique(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliveryProcessDescription_EstimatingTechnique()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='EstimatingTechnique'"
-	 * @generated
-	 */
-	String getEstimatingTechnique();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getEstimatingTechnique <em>Estimating Technique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Estimating Technique</em>' attribute.
-	 * @see #getEstimatingTechnique()
-	 * @generated
-	 */
-	void setEstimatingTechnique(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Project Member Expertise</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides a profile of a typical project team, the distribution of roles, skills required for a team performs a project based on this process.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Project Member Expertise</em>' attribute.
-	 * @see #setProjectMemberExpertise(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliveryProcessDescription_ProjectMemberExpertise()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='ProjectMemberExpertise'"
-	 * @generated
-	 */
-	String getProjectMemberExpertise();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getProjectMemberExpertise <em>Project Member Expertise</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Project Member Expertise</em>' attribute.
-	 * @see #getProjectMemberExpertise()
-	 * @generated
-	 */
-	void setProjectMemberExpertise(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Type Of Contract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides background information about the coI'm chaI'm ntracts that need to be established between a project team that performs this process and a client (e.g. for an IGS engagement).
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Type Of Contract</em>' attribute.
-	 * @see #setTypeOfContract(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDeliveryProcessDescription_TypeOfContract()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='TypeOfContract'"
-	 * @generated
-	 */
-	String getTypeOfContract();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getTypeOfContract <em>Type Of Contract</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type Of Contract</em>' attribute.
-	 * @see #getTypeOfContract()
-	 * @generated
-	 */
-	void setTypeOfContract(String value);
-
-} // DeliveryProcessDescription
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DescribableElement.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DescribableElement.java
deleted file mode 100755
index 595a408..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DescribableElement.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DescribableElement.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Describable Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An abstract generalization of Method Elements for which external presentation names as well as content descriptions have been defined, such as Roles or Work Products.  Presentation Name and Content Descriptions are typically localized using a resource allocation mechanism for its String type attributes.
- * This abstraction represents all elements in the Method Content as well as Process space for which concrete textual descriptions are defined in the form of documenting attributes grouped in a matching Content Description instance.  Describable Elements are intended to be published in method or process publications (similar to the IBM Rational Unified Process web).  Describable Element defines that the element it represents will have content 'attached' to it.  Content Description is the abstraction for the actual places in which the content is being represented.  This separation allows a distinction between core method model elements describing the structure of the model from the actual description container providing, for example, the documentation of the content element in different alternatives languages, audiences, licensing levels, etc.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.DescribableElement#getPresentation <em>Presentation</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DescribableElement#getNodeicon <em>Nodeicon</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DescribableElement#getPresentationName <em>Presentation Name</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DescribableElement#getShapeicon <em>Shapeicon</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getDescribableElement()
- * @model extendedMetaData="name='DescribableElement' kind='elementOnly'"
- * @generated
- */
-public interface DescribableElement extends MethodElement {
-	/**
-	 * Returns the value of the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Presentation</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Presentation</em>' containment reference.
-	 * @see #setPresentation(ContentDescription)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDescribableElement_Presentation()
-	 * @model containment="true"
-	 *        extendedMetaData="kind='element' name='Presentation'"
-	 * @generated
-	 */
-	ContentDescription getPresentation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DescribableElement#getPresentation <em>Presentation</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Presentation</em>' containment reference.
-	 * @see #getPresentation()
-	 * @generated
-	 */
-	void setPresentation(ContentDescription value);
-
-	/**
-	 * Returns the value of the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A reference to an icon that can be used in tree browser presentations and breakdown structures.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Nodeicon</em>' attribute.
-	 * @see #setNodeicon(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDescribableElement_Nodeicon()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='nodeicon'"
-	 * @generated
-	 */
-	String getNodeicon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DescribableElement#getNodeicon <em>Nodeicon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Nodeicon</em>' attribute.
-	 * @see #getNodeicon()
-	 * @generated
-	 */
-	void setNodeicon(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Every Describable Element has a presentation name, which is used for external presentation of the element.  For example, name (the internal representation) might be set to "rup_architecture_document" to differentiate from a "j2ee_architcture_document" whereas the external presentation would always be "Architecture Document".
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Presentation Name</em>' attribute.
-	 * @see #setPresentationName(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDescribableElement_PresentationName()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='presentationName'"
-	 * @generated
-	 */
-	String getPresentationName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DescribableElement#getPresentationName <em>Presentation Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Presentation Name</em>' attribute.
-	 * @see #getPresentationName()
-	 * @generated
-	 */
-	void setPresentationName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A reference to an icon that can be used for modeling with specific Content Element instances (as graphical stereotypes, e.g. a use case symbol for a use case artifact) as well as publication of content.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Shapeicon</em>' attribute.
-	 * @see #setShapeicon(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDescribableElement_Shapeicon()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='shapeicon'"
-	 * @generated
-	 */
-	String getShapeicon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DescribableElement#getShapeicon <em>Shapeicon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Shapeicon</em>' attribute.
-	 * @see #getShapeicon()
-	 * @generated
-	 */
-	void setShapeicon(String value);
-
-} // DescribableElement
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Descriptor.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Descriptor.java
deleted file mode 100755
index b5c97be..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Descriptor.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Descriptor.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An abstract generalization for special Breakdown Elements that references one concrete Content Element.  A descriptor provides a representation of a Content Element within breakdown structures.  In addition to just referencing Content Elements it allows overriding the Content Elements structural relationships by defining its own sets of associations.
- * Descriptors are the key concept for realizing the separation of processes from method content.  A Descriptor can be characterized as a reference object for one particular Content Element, which has its own relationships and properties.  When a Descriptor is created it shall be provided with congruent copies of the relationships defined for the referenced content element.  However, a user can modify these relationships for the particular process situation for which the descriptor has been created. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.Descriptor#isIsSynchronizedWithSource <em>Is Synchronized With Source</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getDescriptor()
- * @model extendedMetaData="name='Descriptor' kind='elementOnly'"
- * @generated
- */
-public interface Descriptor extends BreakdownElement {
-	/**
-	 * Returns the value of the '<em><b>Is Synchronized With Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Is Synchronized With Source</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Is Synchronized With Source</em>' attribute.
-	 * @see #isSetIsSynchronizedWithSource()
-	 * @see #unsetIsSynchronizedWithSource()
-	 * @see #setIsSynchronizedWithSource(boolean)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDescriptor_IsSynchronizedWithSource()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='attribute' name='isSynchronizedWithSource'"
-	 * @generated
-	 */
-	boolean isIsSynchronizedWithSource();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Descriptor#isIsSynchronizedWithSource <em>Is Synchronized With Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Synchronized With Source</em>' attribute.
-	 * @see #isSetIsSynchronizedWithSource()
-	 * @see #unsetIsSynchronizedWithSource()
-	 * @see #isIsSynchronizedWithSource()
-	 * @generated
-	 */
-	void setIsSynchronizedWithSource(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.Descriptor#isIsSynchronizedWithSource <em>Is Synchronized With Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsSynchronizedWithSource()
-	 * @see #isIsSynchronizedWithSource()
-	 * @see #setIsSynchronizedWithSource(boolean)
-	 * @generated
-	 */
-	void unsetIsSynchronizedWithSource();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.Descriptor#isIsSynchronizedWithSource <em>Is Synchronized With Source</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Synchronized With Source</em>' attribute is set.
-	 * @see #unsetIsSynchronizedWithSource()
-	 * @see #isIsSynchronizedWithSource()
-	 * @see #setIsSynchronizedWithSource(boolean)
-	 * @generated
-	 */
-	boolean isSetIsSynchronizedWithSource();
-
-} // Descriptor
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DescriptorDescription.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DescriptorDescription.java
deleted file mode 100755
index ed68dfe..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DescriptorDescription.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DescriptorDescription.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Descriptor Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A generalized Breakdown Element Description that is used to store the textual description for a Descriptor.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.DescriptorDescription#getRefinedDescription <em>Refined Description</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getDescriptorDescription()
- * @model extendedMetaData="name='DescriptorDescription' kind='elementOnly'"
- * @generated
- */
-public interface DescriptorDescription extends BreakdownElementDescription {
-	/**
-	 * Returns the value of the '<em><b>Refined Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A Descriptor might add refinements to the main description of the Content Element it refers to.  For example, it could provide additional information about a Work Product relevant for the specific point in time in the process this Work Product type is being used.  It could describe additional skills needed for a Role at that particular point in time in a process, etc. 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Refined Description</em>' attribute.
-	 * @see #setRefinedDescription(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDescriptorDescription_RefinedDescription()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='RefinedDescription'"
-	 * @generated
-	 */
-	String getRefinedDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DescriptorDescription#getRefinedDescription <em>Refined Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Refined Description</em>' attribute.
-	 * @see #getRefinedDescription()
-	 * @generated
-	 */
-	void setRefinedDescription(String value);
-
-} // DescriptorDescription
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Discipline.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Discipline.java
deleted file mode 100755
index 3978416..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Discipline.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Discipline.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Discipline</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A categorization of work (i.e. Tasks for Method Content), based upon similarity of concerns and cooperation of work effort.
- * A discipline is a collection of Tasks that are related to a major 'area of concern' within the overall project. The grouping of Tasks into disciplines is mainly an aid to understanding the project from a 'traditional' waterfall perspective. However, typically, for example, it is more common to perform certain requirements activities in close coordination with analysis and design activities. Separating these activities into separate disciplines makes the activities easier to comprehend.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.Discipline#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Discipline#getTask <em>Task</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Discipline#getSubDiscipline <em>Sub Discipline</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Discipline#getReferenceWorkflow <em>Reference Workflow</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getDiscipline()
- * @model extendedMetaData="name='Discipline' kind='elementOnly'"
- * @generated
- */
-public interface Discipline extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDiscipline_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:21'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Task</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Task</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Task</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDiscipline_Task()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Task' group='#group:21'"
-	 * @generated
-	 */
-	EList getTask();
-
-	/**
-	 * Returns the value of the '<em><b>Sub Discipline</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.Discipline}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sub Discipline</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sub Discipline</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDiscipline_SubDiscipline()
-	 * @model type="org.eclipse.epf.xml.uma.Discipline" containment="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='SubDiscipline' group='#group:21'"
-	 * @generated
-	 */
-	EList getSubDiscipline();
-
-	/**
-	 * Returns the value of the '<em><b>Reference Workflow</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Reference Workflow</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Reference Workflow</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDiscipline_ReferenceWorkflow()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ReferenceWorkflow' group='#group:21'"
-	 * @generated
-	 */
-	EList getReferenceWorkflow();
-
-} // Discipline
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DisciplineGrouping.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DisciplineGrouping.java
deleted file mode 100755
index 181be3a..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DisciplineGrouping.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DisciplineGrouping.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Discipline Grouping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Used to group Disciplines.  For example, the Discipline Grouping "Software Disciplines" would be the group of all disciplines related to developing software such as "Requirements Management" or "Testing"; "IT Infrastructure Management" would be a Disciplines Grouping for disciplines such as "IT Operational Services", "IT Customer Relationships", or "IT Enabling Services".  Disciplines can be associated to more than one Discipline Grouping.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.DisciplineGrouping#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DisciplineGrouping#getDiscipline <em>Discipline</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getDisciplineGrouping()
- * @model extendedMetaData="name='DisciplineGrouping' kind='elementOnly'"
- * @generated
- */
-public interface DisciplineGrouping extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDisciplineGrouping_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:21'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Discipline</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Discipline</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Discipline</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDisciplineGrouping_Discipline()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Discipline' group='#group:21'"
-	 * @generated
-	 */
-	EList getDiscipline();
-
-} // DisciplineGrouping
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DocumentRoot.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DocumentRoot.java
deleted file mode 100755
index 831a189..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/DocumentRoot.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentRoot.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.sdo.EDataObject;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.DocumentRoot#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DocumentRoot#getMethodConfiguration <em>Method Configuration</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DocumentRoot#getMethodLibrary <em>Method Library</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.DocumentRoot#getMethodPlugin <em>Method Plugin</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getDocumentRoot()
- * @model extendedMetaData="name='' kind='mixed'"
- * @extends EDataObject
- * @generated
- */
-public interface DocumentRoot extends EDataObject {
-	/**
-	 * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mixed</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDocumentRoot_Mixed()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='elementWildcard' name=':mixed'"
-	 * @generated
-	 */
-	FeatureMap getMixed();
-
-	/**
-	 * Returns the value of the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XMLNS Prefix Map</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XMLNS Prefix Map</em>' map.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDocumentRoot_XMLNSPrefixMap()
-	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
-	 *        extendedMetaData="kind='attribute' name='xmlns:prefix'"
-	 * @generated
-	 */
-	EMap getXMLNSPrefixMap();
-
-	/**
-	 * Returns the value of the '<em><b>XSI Schema Location</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XSI Schema Location</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XSI Schema Location</em>' map.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDocumentRoot_XSISchemaLocation()
-	 * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
-	 *        extendedMetaData="kind='attribute' name='xsi:schemaLocation'"
-	 * @generated
-	 */
-	EMap getXSISchemaLocation();
-
-	/**
-	 * Returns the value of the '<em><b>Method Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A collection of selected Method Models and MethodPackages. A configuration can be exported into its own standalone library when it includes the full transitive closure of all elements all other elements depend on.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Method Configuration</em>' containment reference.
-	 * @see #setMethodConfiguration(MethodConfiguration)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDocumentRoot_MethodConfiguration()
-	 * @model containment="true" upper="-2" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='MethodConfiguration' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	MethodConfiguration getMethodConfiguration();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DocumentRoot#getMethodConfiguration <em>Method Configuration</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Configuration</em>' containment reference.
-	 * @see #getMethodConfiguration()
-	 * @generated
-	 */
-	void setMethodConfiguration(MethodConfiguration value);
-
-	/**
-	 * Returns the value of the '<em><b>Method Library</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A Method Library is a physical container for Method Plugins and Method Configuration definitions.  All Method Elements are stored in a Method Library.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Method Library</em>' containment reference.
-	 * @see #setMethodLibrary(MethodLibrary)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDocumentRoot_MethodLibrary()
-	 * @model containment="true" upper="-2" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='MethodLibrary' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	MethodLibrary getMethodLibrary();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DocumentRoot#getMethodLibrary <em>Method Library</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Library</em>' containment reference.
-	 * @see #getMethodLibrary()
-	 * @generated
-	 */
-	void setMethodLibrary(MethodLibrary value);
-
-	/**
-	 * Returns the value of the '<em><b>Method Plugin</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A special Method Unit that represents a physical container for Method Packages.  It defines a granularity level for the modularization and organization of method content and processes.  A Method Plugin can extend many other Method Plugins and it can be extended by many Method Plugins.  It can also be used stand-alone, i.e. with no Extension relationship to other plug-ins.
-	 * Method Plugin conceptually represents a unit for configuration, modularization, extension, packaging, and deployment of method content and processes.  A Process Engineer shall design his Plugins and allocate his content to these Plugins with requirements for extensibility, modularity, reuse, and maintainability in mind.
-	 * Special extensibility mechanisms defined for the meta-classes Variability Element and Process Contribution allow Plugin content to directly contribute new content, replace existing content, or to cross-reference to any Content Element or Process within another Plugin that it extends.  Similar to UML 2.0's 'package merge' mechanism transformation interpretations, interpreting these Method Plugin mechanisms results into new extended Method Content and Processes.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Method Plugin</em>' containment reference.
-	 * @see #setMethodPlugin(MethodPlugin)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDocumentRoot_MethodPlugin()
-	 * @model containment="true" upper="-2" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='MethodPlugin' namespace='##targetNamespace'"
-	 * @generated
-	 */
-	MethodPlugin getMethodPlugin();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.DocumentRoot#getMethodPlugin <em>Method Plugin</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Plugin</em>' containment reference.
-	 * @see #getMethodPlugin()
-	 * @generated
-	 */
-	void setMethodPlugin(MethodPlugin value);
-
-} // DocumentRoot
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Domain.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Domain.java
deleted file mode 100755
index d55766a..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Domain.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Domain.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Domain</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A refineable hierarchy grouping related work products.  In other words, Domains can be further divided into sub-domains, with work product elements to be categorized only at the leaf-level of this hierarchy.
- * Domain is a logical grouping of work products that have an affinity to each other based on resources, timing, or relationship.  A Domain may be divided into subdomains.  For example, GS Method uses six predefined Domains for Work Products: Application, Architecture, Business, Engagement, Operations and Organization.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.Domain#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Domain#getWorkProduct <em>Work Product</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Domain#getSubdomain <em>Subdomain</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getDomain()
- * @model extendedMetaData="name='Domain' kind='elementOnly'"
- * @generated
- */
-public interface Domain extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDomain_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:21'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Work Product</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Work Product</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Work Product</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDomain_WorkProduct()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='WorkProduct' group='#group:21'"
-	 * @generated
-	 */
-	EList getWorkProduct();
-
-	/**
-	 * Returns the value of the '<em><b>Subdomain</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.Domain}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Subdomain</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Subdomain</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getDomain_Subdomain()
-	 * @model type="org.eclipse.epf.xml.uma.Domain" containment="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Subdomain' group='#group:21'"
-	 * @generated
-	 */
-	EList getSubdomain();
-
-} // Domain
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Element.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Element.java
deleted file mode 100755
index 8a95b7a..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Element.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Element.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.ecore.sdo.EDataObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A UML 2.0 meta-class Element.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getElement()
- * @model extendedMetaData="name='Element' kind='empty'"
- * @extends EDataObject
- * @generated
- */
-public interface Element extends EDataObject {
-} // Element
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Estimate.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Estimate.java
deleted file mode 100755
index 3a3c7d2..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Estimate.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Estimate.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Estimate</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A specific type of Guidance that provides sizing measures, or standards for sizing the work effort associated with performing a particular piece of work and instructions for their successful use. It may be comprised of estimation considerations and estimation metrics.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.Estimate#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Estimate#getEstimationMetric <em>Estimation Metric</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Estimate#getEstimationConsiderations <em>Estimation Considerations</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getEstimate()
- * @model extendedMetaData="name='Estimate' kind='elementOnly'"
- * @generated
- */
-public interface Estimate extends Guidance {
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getEstimate_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:21'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Estimation Metric</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Estimation Metric</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Estimation Metric</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getEstimate_EstimationMetric()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='EstimationMetric' group='#group:21'"
-	 * @generated
-	 */
-	EList getEstimationMetric();
-
-	/**
-	 * Returns the value of the '<em><b>Estimation Considerations</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Estimation Considerations</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Estimation Considerations</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getEstimate_EstimationConsiderations()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='EstimationConsiderations' group='#group:21'"
-	 * @generated
-	 */
-	EList getEstimationConsiderations();
-
-} // Estimate
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/EstimatingMetric.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/EstimatingMetric.java
deleted file mode 100755
index c0007f9..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/EstimatingMetric.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EstimatingMetric.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Estimating Metric</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A specific type of Guidance that describes a metric or measure that is associated with an element and which is used to calculate the size of the work effort as well as a range of potential labor.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getEstimatingMetric()
- * @model extendedMetaData="name='EstimatingMetric' kind='elementOnly'"
- * @generated
- */
-public interface EstimatingMetric extends Guidance {
-} // EstimatingMetric
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/EstimationConsiderations.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/EstimationConsiderations.java
deleted file mode 100755
index c5c1ad1..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/EstimationConsiderations.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EstimationConsiderations.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Estimation Considerations</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A specific type of Guidance that qualifies the usage and application of estimation metrics in the development of an actual estimate.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getEstimationConsiderations()
- * @model extendedMetaData="name='EstimationConsiderations' kind='elementOnly'"
- * @generated
- */
-public interface EstimationConsiderations extends Guidance {
-} // EstimationConsiderations
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Example.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Example.java
deleted file mode 100755
index c04694b..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Example.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Example.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Example</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A specific type of Guidance that represents a typical, partially completed, sample instance of one or more work products or scenario like descriptions of how Task may be performed. Examples can be related to Work Products as well as Tasks that produce them as well as any other Content Element.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getExample()
- * @model extendedMetaData="name='Example' kind='elementOnly'"
- * @generated
- */
-public interface Example extends Guidance {
-} // Example
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Guidance.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Guidance.java
deleted file mode 100755
index fdf6198..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Guidance.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Guidance.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Guidance</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Guidance is an abstract generalization of additional information related to content elements such as Roles, Tasks, and Work Products.  Examples for Guidance are Guidelines, Templates, Checklists, Tool Mentors, Estimates, Supporting Materials, Reports, Concepts, etc.  This package only contains the definition of the abstract Guidance class.  The package Guidance Types defines concrete guidance types.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getGuidance()
- * @model extendedMetaData="name='Guidance' kind='elementOnly'"
- * @generated
- */
-public interface Guidance extends ContentElement {
-} // Guidance
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/GuidanceDescription.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/GuidanceDescription.java
deleted file mode 100755
index 36f1e21..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/GuidanceDescription.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GuidanceDescription.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Guidance Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A generalized Content Description that is used to store the textual description for a Guidance.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.GuidanceDescription#getAttachment <em>Attachment</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getGuidanceDescription()
- * @model extendedMetaData="name='GuidanceDescription' kind='elementOnly'"
- * @generated
- */
-public interface GuidanceDescription extends ContentDescription {
-	/**
-	 * Returns the value of the '<em><b>Attachment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This field is primarily used for attachments augmenting the information provided for guidance.  In particular the attribute is used for Templates, Examples, and Reusable Assets to contain the actual attachment described in the mainDescription.  It can additionally contain representations of the guidance in just a third party format, e.g. PDF, MS Word, or Word Perfect.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Attachment</em>' attribute.
-	 * @see #setAttachment(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getGuidanceDescription_Attachment()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Attachment'"
-	 * @generated
-	 */
-	String getAttachment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.GuidanceDescription#getAttachment <em>Attachment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attachment</em>' attribute.
-	 * @see #getAttachment()
-	 * @generated
-	 */
-	void setAttachment(String value);
-
-} // GuidanceDescription
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Guideline.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Guideline.java
deleted file mode 100755
index 41109e8..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Guideline.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Guideline.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Guideline</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A specific type of guidance that provides additional detail on how to perform a particular task or grouping of tasks (e.g. grouped together as activities) or that provides additional detail, rules, and recommendations on work products and their properties.  Amongst others, it can include details about best practices and different approaches for doing work, how to use particular types of work products, information on different subtypes and variants of the work product and how they evolve throughout a lifecycle, discussions on skills the performing roles should acquire or improve upon, measurements for progress and maturity, etc.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getGuideline()
- * @model extendedMetaData="name='Guideline' kind='elementOnly'"
- * @generated
- */
-public interface Guideline extends Guidance {
-} // Guideline
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Iteration.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Iteration.java
deleted file mode 100755
index ee0d0f5..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Iteration.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Iteration.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Iteration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Activity which prescribes pre-defined values for its instances for the attributes prefix ('Iteration') and isRepeatable ('True').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.
- * Iteration groups a set of nested Activities that are repeated more than once.  It represents an important structuring element to organize work in repetitive cycles.  The concept of Iteration can be associated with different rules in different methods.  For example, the IBM Rational Unified Process method framework (RUP) defines a rule that Iterations are not allowed to span across Phases.  In contrast IBM Global Services Method (GSMethod) based method frameworks this rule does not apply and Iteration can be defined which nest Phases.  Rules like these, which play an important role for each individual method and are therefore not enforced by this meta-model.  Instead, process authors are expected to follow and check these rules manually.  (Note: Any Breakdown Element can be repeated; however, Iterations has been introduced as a special meta-model concept, because of its important role for many methods.)
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getIteration()
- * @model extendedMetaData="name='Iteration' kind='elementOnly'"
- * @generated
- */
-public interface Iteration extends Activity {
-} // Iteration
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodConfiguration.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodConfiguration.java
deleted file mode 100755
index 75af118..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodConfiguration.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MethodConfiguration.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A collection of selected Method Models and MethodPackages. A configuration can be exported into its own standalone library when it includes the full transitive closure of all elements all other elements depend on.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodConfiguration#getBaseConfiguration <em>Base Configuration</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodConfiguration#getMethodPluginSelection <em>Method Plugin Selection</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodConfiguration#getMethodPackageSelection <em>Method Package Selection</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodConfiguration#getDefaultView <em>Default View</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodConfiguration#getProcessView <em>Process View</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodConfiguration()
- * @model extendedMetaData="name='MethodConfiguration' kind='elementOnly'"
- * @generated
- */
-public interface MethodConfiguration extends MethodUnit {
-	/**
-	 * Returns the value of the '<em><b>Base Configuration</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Base Configuration</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Base Configuration</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodConfiguration_BaseConfiguration()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='BaseConfiguration'"
-	 * @generated
-	 */
-	EList getBaseConfiguration();
-
-	/**
-	 * Returns the value of the '<em><b>Method Plugin Selection</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Plugin Selection</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Plugin Selection</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodConfiguration_MethodPluginSelection()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='MethodPluginSelection'"
-	 * @generated
-	 */
-	EList getMethodPluginSelection();
-
-	/**
-	 * Returns the value of the '<em><b>Method Package Selection</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Package Selection</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Package Selection</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodConfiguration_MethodPackageSelection()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='MethodPackageSelection'"
-	 * @generated
-	 */
-	EList getMethodPackageSelection();
-
-	/**
-	 * Returns the value of the '<em><b>Default View</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default View</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default View</em>' attribute.
-	 * @see #setDefaultView(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodConfiguration_DefaultView()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='DefaultView'"
-	 * @generated
-	 */
-	String getDefaultView();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.MethodConfiguration#getDefaultView <em>Default View</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default View</em>' attribute.
-	 * @see #getDefaultView()
-	 * @generated
-	 */
-	void setDefaultView(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Process View</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Process View</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Process View</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodConfiguration_ProcessView()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='ProcessView'"
-	 * @generated
-	 */
-	EList getProcessView();
-
-} // MethodConfiguration
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodElement.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodElement.java
deleted file mode 100755
index 7af7feb..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodElement.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MethodElement.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The root generalization for all UMA Method Elements.  Defines a common set of attributes inherited by all UMA Method Elements.  Method Element itself is derived from Packageable Element from the UML 2.0 Infrastructure.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodElement#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodElement#getOwnedRule <em>Owned Rule</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodElement#getBriefDescription <em>Brief Description</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodElement#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodElement#getOrderingGuide <em>Ordering Guide</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodElement#isSuppressed <em>Suppressed</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodElement()
- * @model extendedMetaData="name='MethodElement' kind='elementOnly'"
- * @generated
- */
-public interface MethodElement extends PackageableElement {
-	/**
-	 * Returns the value of the '<em><b>Group</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodElement_Group()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:1'"
-	 * @generated
-	 */
-	FeatureMap getGroup();
-
-	/**
-	 * Returns the value of the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.Constraint}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the packaging rules for this Method Element.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Owned Rule</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodElement_OwnedRule()
-	 * @model type="org.eclipse.epf.xml.uma.Constraint" containment="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='OwnedRule' group='#group:1'"
-	 * @generated
-	 */
-	EList getOwnedRule();
-
-	/**
-	 * Returns the value of the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Every instance of Method Element shall be briefly described with one or two sentences summarizing the element.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Brief Description</em>' attribute.
-	 * @see #setBriefDescription(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodElement_BriefDescription()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='briefDescription'"
-	 * @generated
-	 */
-	String getBriefDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.MethodElement#getBriefDescription <em>Brief Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Brief Description</em>' attribute.
-	 * @see #getBriefDescription()
-	 * @generated
-	 */
-	void setBriefDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Every instance of Method Element has a global unique id.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodElement_Id()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='id'"
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.MethodElement#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Used for CASE tool realizations of this model to contain information about layout and ordering of the method element and its parts.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ordering Guide</em>' attribute.
-	 * @see #setOrderingGuide(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodElement_OrderingGuide()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='orderingGuide'"
-	 * @generated
-	 */
-	String getOrderingGuide();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.MethodElement#getOrderingGuide <em>Ordering Guide</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ordering Guide</em>' attribute.
-	 * @see #getOrderingGuide()
-	 * @generated
-	 */
-	void setOrderingGuide(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If a Variability Element is derived from another Variability Element using the "extends" Variability Specialization, then this attribute can be used to suppress inherited Method Elements that were part of the based-on Variability Element, which can be any type of Method Element.  In other words, if this attribute is set to true on a Method Element that has the same name than an inherited method element then it will not be regarded as inherited at all.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Suppressed</em>' attribute.
-	 * @see #isSetSuppressed()
-	 * @see #unsetSuppressed()
-	 * @see #setSuppressed(boolean)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodElement_Suppressed()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='attribute' name='suppressed'"
-	 * @generated
-	 */
-	boolean isSuppressed();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.MethodElement#isSuppressed <em>Suppressed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Suppressed</em>' attribute.
-	 * @see #isSetSuppressed()
-	 * @see #unsetSuppressed()
-	 * @see #isSuppressed()
-	 * @generated
-	 */
-	void setSuppressed(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.MethodElement#isSuppressed <em>Suppressed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetSuppressed()
-	 * @see #isSuppressed()
-	 * @see #setSuppressed(boolean)
-	 * @generated
-	 */
-	void unsetSuppressed();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.MethodElement#isSuppressed <em>Suppressed</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Suppressed</em>' attribute is set.
-	 * @see #unsetSuppressed()
-	 * @see #isSuppressed()
-	 * @see #setSuppressed(boolean)
-	 * @generated
-	 */
-	boolean isSetSuppressed();
-
-} // MethodElement
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodLibrary.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodLibrary.java
deleted file mode 100755
index 1d3c456..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodLibrary.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MethodLibrary.java,v 1.3 2006/09/08 00:59:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Library</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Method Library is a physical container for Method Plugins and Method Configuration definitions.  All Method Elements are stored in a Method Library.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodLibrary#getMethodPlugin <em>Method Plugin</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodLibrary#getMethodConfiguration <em>Method Configuration</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodLibrary#getTool <em>Tool</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodLibrary()
- * @model extendedMetaData="name='MethodLibrary' kind='elementOnly'"
- * @generated
- */
-public interface MethodLibrary extends MethodUnit {
-	/**
-	 * Returns the value of the '<em><b>Method Plugin</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.MethodPlugin}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Plugin</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Plugin</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodLibrary_MethodPlugin()
-	 * @model type="org.eclipse.epf.xml.uma.MethodPlugin" containment="true"
-	 *        extendedMetaData="kind='element' name='MethodPlugin'"
-	 * @generated
-	 */
-	EList getMethodPlugin();
-
-	/**
-	 * Returns the value of the '<em><b>Method Configuration</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.MethodConfiguration}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Configuration</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Configuration</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodLibrary_MethodConfiguration()
-	 * @model type="org.eclipse.epf.xml.uma.MethodConfiguration" containment="true"
-	 *        extendedMetaData="kind='element' name='MethodConfiguration'"
-	 * @generated
-	 */
-	EList getMethodConfiguration();
-
-	/**
-	 * Returns the value of the '<em><b>Tool</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tool</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tool</em>' attribute.
-	 * @see #setTool(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodLibrary_Tool()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getTool();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.MethodLibrary#getTool <em>Tool</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Tool</em>' attribute.
-	 * @see #getTool()
-	 * @generated
-	 */
-	void setTool(String value);
-
-} // MethodLibrary
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodPackage.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodPackage.java
deleted file mode 100755
index e218c55..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodPackage.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MethodPackage.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Package</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An abstract class for packaging Method Elements.  All Method Elements shall be located in exactly one of Method Package's concrete specializations (e.g. Content Package).   Method Package defines common properties for all of its specializations. Elements are organized in Method Packages to structure large scale of method content and processes as well as to define a mechanism for reuse.  Method Elements from one package can reuse element from other packages by defining a reusedPackages link.  For example, a work product defined in one package can be used as an input for Tasks defined in other packages.  By reusing it from one common place (i.e. the package in which it has been defined) ensures that no redundant definitions of the same elements are required.  Also maintenance of method content is greatly improved as changes can be performed in only one place.  Note, that other packages will introduce more specializations of Method Package, e.g. Process Package and Process Component.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodPackage#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodPackage#getReusedPackage <em>Reused Package</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodPackage#getMethodPackage <em>Method Package</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodPackage#isGlobal <em>Global</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodPackage()
- * @model extendedMetaData="name='MethodPackage' kind='elementOnly'"
- * @generated
- */
-public interface MethodPackage extends MethodElement {
-	/**
-	 * Returns the value of the '<em><b>Group1</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group1</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group1</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodPackage_Group1()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:7'"
-	 * @generated
-	 */
-	FeatureMap getGroup1();
-
-	/**
-	 * Returns the value of the '<em><b>Reused Package</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Reused Package</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Reused Package</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodPackage_ReusedPackage()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ReusedPackage' group='#group:7'"
-	 * @generated
-	 */
-	EList getReusedPackage();
-
-	/**
-	 * Returns the value of the '<em><b>Method Package</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.MethodPackage}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Package</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Package</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodPackage_MethodPackage()
-	 * @model type="org.eclipse.epf.xml.uma.MethodPackage" containment="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='MethodPackage' group='#group:7'"
-	 * @generated
-	 */
-	EList getMethodPackage();
-
-	/**
-	 * Returns the value of the '<em><b>Global</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Method Packages can have a global scope.  This means that every element of every other Method Package can see the global package's contents.  Global Method Packages are primarily used to store commonly used category definitions such as for Disciplines or Domains, which are used by many Task and Work Products respectively.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Global</em>' attribute.
-	 * @see #isSetGlobal()
-	 * @see #unsetGlobal()
-	 * @see #setGlobal(boolean)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodPackage_Global()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='attribute' name='global'"
-	 * @generated
-	 */
-	boolean isGlobal();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.MethodPackage#isGlobal <em>Global</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Global</em>' attribute.
-	 * @see #isSetGlobal()
-	 * @see #unsetGlobal()
-	 * @see #isGlobal()
-	 * @generated
-	 */
-	void setGlobal(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.MethodPackage#isGlobal <em>Global</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetGlobal()
-	 * @see #isGlobal()
-	 * @see #setGlobal(boolean)
-	 * @generated
-	 */
-	void unsetGlobal();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.MethodPackage#isGlobal <em>Global</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Global</em>' attribute is set.
-	 * @see #unsetGlobal()
-	 * @see #isGlobal()
-	 * @see #setGlobal(boolean)
-	 * @generated
-	 */
-	boolean isSetGlobal();
-
-} // MethodPackage
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodPlugin.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodPlugin.java
deleted file mode 100755
index 18457da..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodPlugin.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MethodPlugin.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Plugin</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Method Unit that represents a physical container for Method Packages.  It defines a granularity level for the modularization and organization of method content and processes.  A Method Plugin can extend many other Method Plugins and it can be extended by many Method Plugins.  It can also be used stand-alone, i.e. with no Extension relationship to other plug-ins.
- * Method Plugin conceptually represents a unit for configuration, modularization, extension, packaging, and deployment of method content and processes.  A Process Engineer shall design his Plugins and allocate his content to these Plugins with requirements for extensibility, modularity, reuse, and maintainability in mind.
- * Special extensibility mechanisms defined for the meta-classes Variability Element and Process Contribution allow Plugin content to directly contribute new content, replace existing content, or to cross-reference to any Content Element or Process within another Plugin that it extends.  Similar to UML 2.0's 'package merge' mechanism transformation interpretations, interpreting these Method Plugin mechanisms results into new extended Method Content and Processes.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodPlugin#getReferencedMethodPlugin <em>Referenced Method Plugin</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodPlugin#getMethodPackage <em>Method Package</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodPlugin#isUserChangeable <em>User Changeable</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodPlugin()
- * @model extendedMetaData="name='MethodPlugin' kind='elementOnly'"
- * @generated
- */
-public interface MethodPlugin extends MethodUnit {
-	/**
-	 * Returns the value of the '<em><b>Referenced Method Plugin</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Referenced Method Plugin</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Referenced Method Plugin</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodPlugin_ReferencedMethodPlugin()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='ReferencedMethodPlugin'"
-	 * @generated
-	 */
-	EList getReferencedMethodPlugin();
-
-	/**
-	 * Returns the value of the '<em><b>Method Package</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.MethodPackage}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Package</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Package</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodPlugin_MethodPackage()
-	 * @model type="org.eclipse.epf.xml.uma.MethodPackage" containment="true"
-	 *        extendedMetaData="kind='element' name='MethodPackage'"
-	 * @generated
-	 */
-	EList getMethodPackage();
-
-	/**
-	 * Returns the value of the '<em><b>User Changeable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>User Changeable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>User Changeable</em>' attribute.
-	 * @see #isSetUserChangeable()
-	 * @see #unsetUserChangeable()
-	 * @see #setUserChangeable(boolean)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodPlugin_UserChangeable()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='attribute' name='userChangeable'"
-	 * @generated
-	 */
-	boolean isUserChangeable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.MethodPlugin#isUserChangeable <em>User Changeable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>User Changeable</em>' attribute.
-	 * @see #isSetUserChangeable()
-	 * @see #unsetUserChangeable()
-	 * @see #isUserChangeable()
-	 * @generated
-	 */
-	void setUserChangeable(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.MethodPlugin#isUserChangeable <em>User Changeable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetUserChangeable()
-	 * @see #isUserChangeable()
-	 * @see #setUserChangeable(boolean)
-	 * @generated
-	 */
-	void unsetUserChangeable();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.MethodPlugin#isUserChangeable <em>User Changeable</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>User Changeable</em>' attribute is set.
-	 * @see #unsetUserChangeable()
-	 * @see #isUserChangeable()
-	 * @see #setUserChangeable(boolean)
-	 * @generated
-	 */
-	boolean isSetUserChangeable();
-
-} // MethodPlugin
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodUnit.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodUnit.java
deleted file mode 100755
index 2357f7d..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/MethodUnit.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MethodUnit.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Unit</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Method Element that shall be maintained in a Method Library as a separate unit of control.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodUnit#getCopyright <em>Copyright</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodUnit#getAuthors <em>Authors</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodUnit#getChangeDate <em>Change Date</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodUnit#getChangeDescription <em>Change Description</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.MethodUnit#getVersion <em>Version</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodUnit()
- * @model extendedMetaData="name='MethodUnit' kind='elementOnly'"
- * @generated
- */
-public interface MethodUnit extends MethodElement {
-	/**
-	 * Returns the value of the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Copyright</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Copyright</em>' attribute.
-	 * @see #setCopyright(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodUnit_Copyright()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Copyright'"
-	 * @generated
-	 */
-	String getCopyright();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.MethodUnit#getCopyright <em>Copyright</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Copyright</em>' attribute.
-	 * @see #getCopyright()
-	 * @generated
-	 */
-	void setCopyright(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Every Method Unit is being created and owned by an author or authoring team.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Authors</em>' attribute.
-	 * @see #setAuthors(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodUnit_Authors()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='authors'"
-	 * @generated
-	 */
-	String getAuthors();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.MethodUnit#getAuthors <em>Authors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Authors</em>' attribute.
-	 * @see #getAuthors()
-	 * @generated
-	 */
-	void setAuthors(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The date the last change that resulted into this version has been made.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Change Date</em>' attribute.
-	 * @see #setChangeDate(Object)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodUnit_ChangeDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='attribute' name='changeDate'"
-	 * @generated
-	 */
-	Object getChangeDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.MethodUnit#getChangeDate <em>Change Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Change Date</em>' attribute.
-	 * @see #getChangeDate()
-	 * @generated
-	 */
-	void setChangeDate(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The description of the last change that resulted into this version.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Change Description</em>' attribute.
-	 * @see #setChangeDescription(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodUnit_ChangeDescription()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='changeDescription'"
-	 * @generated
-	 */
-	String getChangeDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.MethodUnit#getChangeDescription <em>Change Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Change Description</em>' attribute.
-	 * @see #getChangeDescription()
-	 * @generated
-	 */
-	void setChangeDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Every Package has a version number used to track changes.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #setVersion(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getMethodUnit_Version()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='version'"
-	 * @generated
-	 */
-	String getVersion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.MethodUnit#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #getVersion()
-	 * @generated
-	 */
-	void setVersion(String value);
-
-} // MethodUnit
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Milestone.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Milestone.java
deleted file mode 100755
index ed55789..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Milestone.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Milestone.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Milestone</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Breakdown Element that describes a significant event in a development project, such as a major decision, completion of a deliverable, or meeting of a major dependency (like completion of a project phase).  Because, Milestone is commonly used to refer to both the event itself and the point in time at which the event is scheduled to happen, it is modeled as a Breakdown Element (i.e. it appears as part of a breakdown structure).
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getMilestone()
- * @model extendedMetaData="name='Milestone' kind='elementOnly'"
- * @generated
- */
-public interface Milestone extends WorkBreakdownElement {
-} // Milestone
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/NamedElement.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/NamedElement.java
deleted file mode 100755
index bef4a47..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/NamedElement.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: NamedElement.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Named Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A UML 2.0 meta-class Named Element.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.NamedElement#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getNamedElement()
- * @model extendedMetaData="name='NamedElement' kind='empty'"
- * @generated
- */
-public interface NamedElement extends Element {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getNamedElement_Name()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='name'"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.NamedElement#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // NamedElement
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Outcome.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Outcome.java
deleted file mode 100755
index da2ae00..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Outcome.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Outcome.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Outcome</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Work Product that describes intangible work products that are a result or state. Outcomes may also be used to describe work products that are not formally defined.  A key differentiator for outcomes against artifacts is that outcomes are not candidates for harvesting as reusable assets.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getOutcome()
- * @model extendedMetaData="name='Outcome' kind='elementOnly'"
- * @generated
- */
-public interface Outcome extends WorkProduct {
-} // Outcome
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/PackageableElement.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/PackageableElement.java
deleted file mode 100755
index e3a809e..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/PackageableElement.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PackageableElement.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Packageable Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A UML 2.0 meta-class Packagable Element.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getPackageableElement()
- * @model extendedMetaData="name='PackageableElement' kind='empty'"
- * @generated
- */
-public interface PackageableElement extends NamedElement {
-} // PackageableElement
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Phase.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Phase.java
deleted file mode 100755
index fe90907..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Phase.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Phase.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Phase</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Activity which prescribes pre-defined values for its instances for the attributes prefix ('Phase') and isRepeatable ('False').  It has been included into the meta-model for convenience and to provide a special stereotype, because it represents a very commonly used Activity type.
- * Phase represent a significant period in a project, ending with major management checkpoint, milestone or set of Deliverables.  It is included in the model as a predefined special Activity, because of its significance in defining breakdowns.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getPhase()
- * @model extendedMetaData="name='Phase' kind='elementOnly'"
- * @generated
- */
-public interface Phase extends Activity {
-} // Phase
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/PlanningData.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/PlanningData.java
deleted file mode 100755
index c1c947e..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/PlanningData.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PlanningData.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Planning Data</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Process Element that adds planning data to Breakdown Elements when it is used for a Process Planning Template.  For Delivery Processes and Capability Patterns this class can either not be instantiated or populated with default data.
- * Planning Data factors out specific optional data needed for representing planning templates.  This association allows to access planning data if it is stored for the Breakdown Element.
- * (NOTE, THE ATTRIBUTES FOR THIS CLASS ARE NOT COMPLETE, YET)
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.PlanningData#getFinishDate <em>Finish Date</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.PlanningData#getRank <em>Rank</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.PlanningData#getStartDate <em>Start Date</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getPlanningData()
- * @model extendedMetaData="name='PlanningData' kind='elementOnly'"
- * @generated
- */
-public interface PlanningData extends ProcessElement {
-	/**
-	 * Returns the value of the '<em><b>Finish Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default finish date for a planed Task.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Finish Date</em>' attribute.
-	 * @see #setFinishDate(Object)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getPlanningData_FinishDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='attribute' name='finishDate'"
-	 * @generated
-	 */
-	Object getFinishDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.PlanningData#getFinishDate <em>Finish Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Finish Date</em>' attribute.
-	 * @see #getFinishDate()
-	 * @generated
-	 */
-	void setFinishDate(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Rank</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default rank for a planed Task.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Rank</em>' attribute.
-	 * @see #setRank(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getPlanningData_Rank()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='rank'"
-	 * @generated
-	 */
-	String getRank();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.PlanningData#getRank <em>Rank</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rank</em>' attribute.
-	 * @see #getRank()
-	 * @generated
-	 */
-	void setRank(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Start Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The default start date for a planed Task.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Start Date</em>' attribute.
-	 * @see #setStartDate(Object)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getPlanningData_StartDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='attribute' name='startDate'"
-	 * @generated
-	 */
-	Object getStartDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.PlanningData#getStartDate <em>Start Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start Date</em>' attribute.
-	 * @see #getStartDate()
-	 * @generated
-	 */
-	void setStartDate(Object value);
-
-} // PlanningData
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Practice.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Practice.java
deleted file mode 100755
index 3b35cbb..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Practice.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Practice.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Practice</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A specific type of guidance that represents a proven way or strategy of doing work to achieve a goal that has a positive impact on work product or process quality.  Practices are defined orthogonal to methods and processes.  They could summarize aspects that impact many different parts of a method or specific processes.  Examples for practices would be "Manage Risks", "Continuously verify quality", "Architecture-centric and component-based development", etc.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.Practice#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Practice#getActivityReference <em>Activity Reference</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Practice#getContentReference <em>Content Reference</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Practice#getSubPractice <em>Sub Practice</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getPractice()
- * @model extendedMetaData="name='Practice' kind='elementOnly'"
- * @generated
- */
-public interface Practice extends Guidance {
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getPractice_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:21'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Activity Reference</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Activity Reference</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Activity Reference</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getPractice_ActivityReference()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ActivityReference' group='#group:21'"
-	 * @generated
-	 */
-	EList getActivityReference();
-
-	/**
-	 * Returns the value of the '<em><b>Content Reference</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Content Reference</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Content Reference</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getPractice_ContentReference()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ContentReference' group='#group:21'"
-	 * @generated
-	 */
-	EList getContentReference();
-
-	/**
-	 * Returns the value of the '<em><b>Sub Practice</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.Practice}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sub Practice</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sub Practice</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getPractice_SubPractice()
-	 * @model type="org.eclipse.epf.xml.uma.Practice" containment="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='SubPractice' group='#group:21'"
-	 * @generated
-	 */
-	EList getSubPractice();
-
-} // Practice
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/PracticeDescription.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/PracticeDescription.java
deleted file mode 100755
index 37979d0..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/PracticeDescription.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PracticeDescription.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Practice Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A generalized Content Description that is used to store the textual description for a Practice.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.PracticeDescription#getAdditionalInfo <em>Additional Info</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.PracticeDescription#getApplication <em>Application</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.PracticeDescription#getBackground <em>Background</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.PracticeDescription#getGoals <em>Goals</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.PracticeDescription#getLevelsOfAdoption <em>Levels Of Adoption</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.PracticeDescription#getProblem <em>Problem</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getPracticeDescription()
- * @model extendedMetaData="name='PracticeDescription' kind='elementOnly'"
- * @generated
- */
-public interface PracticeDescription extends ContentDescription {
-	/**
-	 * Returns the value of the '<em><b>Additional Info</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Any additional Information not covered by the other attributes.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Additional Info</em>' attribute.
-	 * @see #setAdditionalInfo(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getPracticeDescription_AdditionalInfo()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='AdditionalInfo'"
-	 * @generated
-	 */
-	String getAdditionalInfo();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.PracticeDescription#getAdditionalInfo <em>Additional Info</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Additional Info</em>' attribute.
-	 * @see #getAdditionalInfo()
-	 * @generated
-	 */
-	void setAdditionalInfo(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Application</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Describes how the Practice is being applied or introduced into the context described in background.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Application</em>' attribute.
-	 * @see #setApplication(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getPracticeDescription_Application()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Application'"
-	 * @generated
-	 */
-	String getApplication();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.PracticeDescription#getApplication <em>Application</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Application</em>' attribute.
-	 * @see #getApplication()
-	 * @generated
-	 */
-	void setApplication(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Background</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Elaboration on the background and the context in which the problem occurs and where the solution described by this Practice will fit in.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Background</em>' attribute.
-	 * @see #setBackground(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getPracticeDescription_Background()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Background'"
-	 * @generated
-	 */
-	String getBackground();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.PracticeDescription#getBackground <em>Background</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Background</em>' attribute.
-	 * @see #getBackground()
-	 * @generated
-	 */
-	void setBackground(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Goals</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A summary of the overall goals to be addressed by the Practice.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Goals</em>' attribute.
-	 * @see #setGoals(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getPracticeDescription_Goals()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Goals'"
-	 * @generated
-	 */
-	String getGoals();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.PracticeDescription#getGoals <em>Goals</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Goals</em>' attribute.
-	 * @see #getGoals()
-	 * @generated
-	 */
-	void setGoals(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Levels Of Adoption</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Outlines the different forms or variants in which the practice could be realized. (e.g. full adoption verus a partial adoption of the Practice)
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Levels Of Adoption</em>' attribute.
-	 * @see #setLevelsOfAdoption(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getPracticeDescription_LevelsOfAdoption()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='LevelsOfAdoption'"
-	 * @generated
-	 */
-	String getLevelsOfAdoption();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.PracticeDescription#getLevelsOfAdoption <em>Levels Of Adoption</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Levels Of Adoption</em>' attribute.
-	 * @see #getLevelsOfAdoption()
-	 * @generated
-	 */
-	void setLevelsOfAdoption(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Problem</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A description of the problem the Practice addresses.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Problem</em>' attribute.
-	 * @see #setProblem(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getPracticeDescription_Problem()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Problem'"
-	 * @generated
-	 */
-	String getProblem();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.PracticeDescription#getProblem <em>Problem</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Problem</em>' attribute.
-	 * @see #getProblem()
-	 * @generated
-	 */
-	void setProblem(String value);
-
-} // PracticeDescription
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Process.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Process.java
deleted file mode 100755
index a5a7100..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Process.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Process.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Activity that describes a structure for particular types of development projects.  To perform such a development project a Processes would be 'instantiated' and adapted for the specific situation.  Process is an abstract class and this meta-model defines different special types of Processes for different process management applications and different situations of process reuse.  Every Process comprises of and is the top-level element of an n-level breakdown structure using the Nesting association defined on Activity.
- * Core Method Content provides step-by-step explanations, describing how very specific development goals are achieved independent of the placement of these steps within a development lifecycle.  Processes take these method elements and relate them into semi-ordered sequences that are customized to specific types of projects.  Thus, a process is a set of partially ordered work descriptions intended to reach a higher development goal, such as the release of a specific software system.  A process and the process meta-model structure defined in this specification focuses on the lifecycle and the sequencing of work in breakdown structures.  To achieve this it uses the Descriptor concept referencing method content and allowing defining time-specific customizations of the referenced content (e.g. defining a focus on different steps of the same Task and providing input Work Products in different states within the different Phases of a process lifecycle in which the same Task is performed).
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.Process#getIncludesPattern <em>Includes Pattern</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Process#getDefaultContext <em>Default Context</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Process#getValidContext <em>Valid Context</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getProcess()
- * @model extendedMetaData="name='Process' kind='elementOnly'"
- * @generated
- */
-public interface Process extends Activity {
-	/**
-	 * Returns the value of the '<em><b>Includes Pattern</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Includes Pattern</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Includes Pattern</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcess_IncludesPattern()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='IncludesPattern'"
-	 * @generated
-	 */
-	EList getIncludesPattern();
-
-	/**
-	 * Returns the value of the '<em><b>Default Context</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Context</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default Context</em>' attribute.
-	 * @see #setDefaultContext(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcess_DefaultContext()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='DefaultContext'"
-	 * @generated
-	 */
-	String getDefaultContext();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Process#getDefaultContext <em>Default Context</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Context</em>' attribute.
-	 * @see #getDefaultContext()
-	 * @generated
-	 */
-	void setDefaultContext(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Valid Context</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Valid Context</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Valid Context</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcess_ValidContext()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='ValidContext'"
-	 * @generated
-	 */
-	EList getValidContext();
-
-} // Process
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessComponent.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessComponent.java
deleted file mode 100755
index 19dd54a..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessComponent.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ProcessComponent.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process Component</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Process Package that applies the principles of encapsulation.  A Process Component realizes one or more Interfaces which specify inputs and outputs of the component. There might be many components realizing the same interfaces, but using different techniques to achieve similar outputs for similar inputs.  Whereas the Component Interfaces represent component specifications (black box descriptions of the component), good candidates for component realizations can be found in Capability Patterns (white box descriptions for the component).
- * UMA supports replaceable and reusable Process Components realizing the principles of encapsulation. Certain situations in a software development project might require that concrete realizations of parts of the process remain undecided or will be decided by the executing team itself (e.g. in outsourcing situations).  UMA provides a unique component concept defining interfaces for work product input and output, allowing treating the actual definition of the work that produces the outputs as a "black box".  At any point during a project the component "realization" detailing the work can be added to the process.  The component approach also allows that different styles or techniques of doing work can be replaced with one another.  For example, a software code output of a component could be produced with a model-driven development or a code-centric technique.  The component concept encapsulates the actual work and lets the development team choose the appropriate technique and fill the component's realization with their choice of Activities that produce the required outputs.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessComponent#getCopyright <em>Copyright</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessComponent#getInterface <em>Interface</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessComponent#getProcess <em>Process</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessComponent#getAuthors <em>Authors</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessComponent#getChangeDate <em>Change Date</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessComponent#getChangeDescription <em>Change Description</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessComponent#getVersion <em>Version</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessComponent()
- * @model extendedMetaData="name='ProcessComponent' kind='elementOnly'"
- * @generated
- */
-public interface ProcessComponent extends ProcessPackage {
-	/**
-	 * Returns the value of the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Copyright</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Copyright</em>' attribute.
-	 * @see #setCopyright(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessComponent_Copyright()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Copyright'"
-	 * @generated
-	 */
-	String getCopyright();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ProcessComponent#getCopyright <em>Copyright</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Copyright</em>' attribute.
-	 * @see #getCopyright()
-	 * @generated
-	 */
-	void setCopyright(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Interface</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Interface</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interface</em>' containment reference.
-	 * @see #setInterface(ProcessComponentInterface)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessComponent_Interface()
-	 * @model containment="true"
-	 *        extendedMetaData="kind='element' name='Interface'"
-	 * @generated
-	 */
-	ProcessComponentInterface getInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ProcessComponent#getInterface <em>Interface</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Interface</em>' containment reference.
-	 * @see #getInterface()
-	 * @generated
-	 */
-	void setInterface(ProcessComponentInterface value);
-
-	/**
-	 * Returns the value of the '<em><b>Process</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Process</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Process</em>' containment reference.
-	 * @see #setProcess(org.eclipse.epf.xml.uma.Process)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessComponent_Process()
-	 * @model containment="true" required="true"
-	 *        extendedMetaData="kind='element' name='Process'"
-	 * @generated
-	 */
-	org.eclipse.epf.xml.uma.Process getProcess();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ProcessComponent#getProcess <em>Process</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Process</em>' containment reference.
-	 * @see #getProcess()
-	 * @generated
-	 */
-	void setProcess(org.eclipse.epf.xml.uma.Process value);
-
-	/**
-	 * Returns the value of the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Every Method Unit is being created and owned by an author or authoring team.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Authors</em>' attribute.
-	 * @see #setAuthors(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessComponent_Authors()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='authors'"
-	 * @generated
-	 */
-	String getAuthors();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ProcessComponent#getAuthors <em>Authors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Authors</em>' attribute.
-	 * @see #getAuthors()
-	 * @generated
-	 */
-	void setAuthors(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The date the last change that resulted into this version has been made.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Change Date</em>' attribute.
-	 * @see #setChangeDate(Object)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessComponent_ChangeDate()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.DateTime"
-	 *        extendedMetaData="kind='attribute' name='changeDate'"
-	 * @generated
-	 */
-	Object getChangeDate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ProcessComponent#getChangeDate <em>Change Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Change Date</em>' attribute.
-	 * @see #getChangeDate()
-	 * @generated
-	 */
-	void setChangeDate(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The description of the last change that resulted into this version.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Change Description</em>' attribute.
-	 * @see #setChangeDescription(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessComponent_ChangeDescription()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='changeDescription'"
-	 * @generated
-	 */
-	String getChangeDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ProcessComponent#getChangeDescription <em>Change Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Change Description</em>' attribute.
-	 * @see #getChangeDescription()
-	 * @generated
-	 */
-	void setChangeDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Every Package has a version number used to track changes.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #setVersion(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessComponent_Version()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='version'"
-	 * @generated
-	 */
-	String getVersion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ProcessComponent#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #getVersion()
-	 * @generated
-	 */
-	void setVersion(String value);
-
-} // ProcessComponent
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessComponentInterface.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessComponentInterface.java
deleted file mode 100755
index 3c389b2..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessComponentInterface.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ProcessComponentInterface.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process Component Interface</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Comprises of a list of interface specifications (similar to operation declarations) that express inputs and outputs for a process component.  These interface specifications are expressed using Task Descriptors which are not linked to Tasks that are related to Work Product Descriptors as well as optional a Role Descriptor.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessComponentInterface#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessComponentInterface#getInterfaceSpecification <em>Interface Specification</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessComponentInterface#getInterfaceIO <em>Interface IO</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessComponentInterface()
- * @model extendedMetaData="name='ProcessComponentInterface' kind='elementOnly'"
- * @generated
- */
-public interface ProcessComponentInterface extends BreakdownElement {
-	/**
-	 * Returns the value of the '<em><b>Group1</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group1</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group1</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessComponentInterface_Group1()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:19'"
-	 * @generated
-	 */
-	FeatureMap getGroup1();
-
-	/**
-	 * Returns the value of the '<em><b>Interface Specification</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.TaskDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Interface Specification</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interface Specification</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessComponentInterface_InterfaceSpecification()
-	 * @model type="org.eclipse.epf.xml.uma.TaskDescriptor" containment="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='InterfaceSpecification' group='#group:19'"
-	 * @generated
-	 */
-	EList getInterfaceSpecification();
-
-	/**
-	 * Returns the value of the '<em><b>Interface IO</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.WorkProductDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Interface IO</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interface IO</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessComponentInterface_InterfaceIO()
-	 * @model type="org.eclipse.epf.xml.uma.WorkProductDescriptor" containment="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='InterfaceIO' group='#group:19'"
-	 * @generated
-	 */
-	EList getInterfaceIO();
-
-} // ProcessComponentInterface
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessDescription.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessDescription.java
deleted file mode 100755
index 1afcdbb..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessDescription.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ProcessDescription.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A generalized Activity Description that is used to store the textual description for a Process.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessDescription#getScope <em>Scope</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessDescription#getUsageNotes <em>Usage Notes</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessDescription#getExternalId <em>External Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessDescription()
- * @model extendedMetaData="name='ProcessDescription' kind='elementOnly'"
- * @generated
- */
-public interface ProcessDescription extends ActivityDescription {
-	/**
-	 * Returns the value of the '<em><b>Scope</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the scope of the Process, i.e. which types of projects does it address and which not.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Scope</em>' attribute.
-	 * @see #setScope(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessDescription_Scope()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Scope'"
-	 * @generated
-	 */
-	String getScope();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ProcessDescription#getScope <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scope</em>' attribute.
-	 * @see #getScope()
-	 * @generated
-	 */
-	void setScope(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Usage Notes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Any additional notes on how to apply and instantiate this process for a project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Usage Notes</em>' attribute.
-	 * @see #setUsageNotes(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessDescription_UsageNotes()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='UsageNotes'"
-	 * @generated
-	 */
-	String getUsageNotes();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ProcessDescription#getUsageNotes <em>Usage Notes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Usage Notes</em>' attribute.
-	 * @see #getUsageNotes()
-	 * @generated
-	 */
-	void setUsageNotes(String value);
-
-	/**
-	 * Returns the value of the '<em><b>External Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * An external visible number that is used to reference this delivery patterns and models. It is used like a synonym.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>External Id</em>' attribute.
-	 * @see #setExternalId(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessDescription_ExternalId()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='externalId'"
-	 * @generated
-	 */
-	String getExternalId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.ProcessDescription#getExternalId <em>External Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>External Id</em>' attribute.
-	 * @see #getExternalId()
-	 * @generated
-	 */
-	void setExternalId(String value);
-
-} // ProcessDescription
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessElement.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessElement.java
deleted file mode 100755
index 992fb17..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessElement.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ProcessElement.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Describable Element that represents an abstract generalization for all elements defined in the Process package.
- * Process Elements represents Process specific elements that are supposed to be managed in Process Packages.  The separation of Process Element from Content Element allows to clearly distinguish between pure method content from content that is represented in processes. 
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessElement()
- * @model extendedMetaData="name='ProcessElement' kind='elementOnly'"
- * @generated
- */
-public interface ProcessElement extends DescribableElement {
-} // ProcessElement
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessPackage.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessPackage.java
deleted file mode 100755
index dabc40e..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessPackage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ProcessPackage.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process Package</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Method Package that contains Process Elements, only.
- * A key separation of concerns in UMA is the distinction between Method Content and Process.  This separation is enforced by special package types, which do not allow the mixing of method content with processes.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessPackage#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessPackage#getProcessElement <em>Process Element</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessPackage()
- * @model extendedMetaData="name='ProcessPackage' kind='elementOnly'"
- * @generated
- */
-public interface ProcessPackage extends MethodPackage {
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessPackage_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:11'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Process Element</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.ProcessElement}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Process Element</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Process Element</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessPackage_ProcessElement()
-	 * @model type="org.eclipse.epf.xml.uma.ProcessElement" containment="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ProcessElement' group='#group:11'"
-	 * @generated
-	 */
-	EList getProcessElement();
-
-} // ProcessPackage
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessPlanningTemplate.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessPlanningTemplate.java
deleted file mode 100755
index 3ab25f1..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ProcessPlanningTemplate.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ProcessPlanningTemplate.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Process Planning Template</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Process that is prepared for instantiation by a project planning tool.  Typically, it is created based on a Process such as a Delivery Process as a whole (e.g. in case of a waterfall-based development approach) or in parts (e.g. in case of an iterative development approach).
- * A Process Planning Template represents a partially finished plan for a concrete project.  It uses the same information structures as all other Process Types to represent templates for project plans.  However, certain planning decisions have already been applied to the template as well as information has been removed and/or reformatted to be ready for export to a specific planning tool.  Examples for such decisions are: a template has been created to represent a plan for a particular Iteration in an iterative development project, which fr example distinguishes early from late iterations in the Elaboration phase of a project; if the targeted planning tool cannot represent input and output of Task, then these have been removed from the structure; certain repetitions have been already applied, e.g. stating that a cycle of specific Task grouped in an Activity have to be repeated n-times; etc.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessPlanningTemplate#getGroup3 <em>Group3</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.ProcessPlanningTemplate#getBaseProcess <em>Base Process</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessPlanningTemplate()
- * @model extendedMetaData="name='ProcessPlanningTemplate' kind='elementOnly'"
- * @generated
- */
-public interface ProcessPlanningTemplate extends org.eclipse.epf.xml.uma.Process {
-	/**
-	 * Returns the value of the '<em><b>Group3</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group3</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group3</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessPlanningTemplate_Group3()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:42'"
-	 * @generated
-	 */
-	FeatureMap getGroup3();
-
-	/**
-	 * Returns the value of the '<em><b>Base Process</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Base Process</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Base Process</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getProcessPlanningTemplate_BaseProcess()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='BaseProcess' group='#group:42'"
-	 * @generated
-	 */
-	EList getBaseProcess();
-
-} // ProcessPlanningTemplate
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Report.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Report.java
deleted file mode 100755
index 962b200..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Report.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Report.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Report</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A predefined template of a result that is generated on the basis of other work products as an output from some form of tool automation. An example for a report would be a use case model survey, which is generated by extracting diagram information from a graphical model and textual information from documents and combines these two types of information into a report.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getReport()
- * @model extendedMetaData="name='Report' kind='elementOnly'"
- * @generated
- */
-public interface Report extends Guidance {
-} // Report
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ReusableAsset.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ReusableAsset.java
deleted file mode 100755
index 8801ba3..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ReusableAsset.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ReusableAsset.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Reusable Asset</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A specific type of guidance that provides a solution to a problem for a given context. The asset may have a variability point, which is a location in the asset that may have a value provided or customized by the asset consumer. The asset has rules for usage which are the instructions describing
- * how the asset should be used.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getReusableAsset()
- * @model extendedMetaData="name='ReusableAsset' kind='elementOnly'"
- * @generated
- */
-public interface ReusableAsset extends Guidance {
-} // ReusableAsset
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Roadmap.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Roadmap.java
deleted file mode 100755
index 15361b2..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Roadmap.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Roadmap.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Roadmap</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A specific type of Guidance which is only related to Activates and therefore has been added by this package to the list of Guidance Types rather than listed in the Guidance Types package.  A Roadmap represents a linear walkthrough of an Activity, typically a Process.
- * An instance of a Roadmap represents important documentation for the Activity or Process it is related to.  Often a complex Activity such as a Process can be much easier understood by providing a walkthrough with a linear thread of a typical instantiation of this Activity.  In addition to making the process practitioner understand how work in the process is being performed, a Roadmap provides additional information about how Activities and Tasks relate to each other over time.  Roadmaps are also used to show how specific aspects are distributed over a whole process providing a kind of filter on the process for this information.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getRoadmap()
- * @model extendedMetaData="name='Roadmap' kind='elementOnly'"
- * @generated
- */
-public interface Roadmap extends Guidance {
-} // Roadmap
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Role.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Role.java
deleted file mode 100755
index 86c7fe7..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Role.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Role.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Role</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Content Element that defines a set of related skills, competencies, and responsibilities.  Roles are used by Tasks to define who performs them as well as define a set of work products they are responsible for.  
- * A Role defines a set of related skills, competencies, and responsibilities of an individual or a set of individuals.  Roles are not individuals or resources.  Individual members of the development organization will wear different hats, or perform different roles. The mapping from individual to role, performed by the project manager when planning and staffing for a project, allows different individuals to act as several different roles, and for a role to be played by several individuals.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.Role#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Role#getResponsibleFor <em>Responsible For</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getRole()
- * @model extendedMetaData="name='Role' kind='elementOnly'"
- * @generated
- */
-public interface Role extends ContentElement {
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getRole_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:21'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Responsible For</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Responsible For</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Responsible For</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getRole_ResponsibleFor()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ResponsibleFor' group='#group:21'"
-	 * @generated
-	 */
-	EList getResponsibleFor();
-
-} // Role
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/RoleDescription.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/RoleDescription.java
deleted file mode 100755
index 80a8312..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/RoleDescription.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RoleDescription.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Role Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A generalized Content Description that is used to store the textual description for a Role.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.RoleDescription#getAssignmentApproaches <em>Assignment Approaches</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.RoleDescription#getSkills <em>Skills</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.RoleDescription#getSynonyms <em>Synonyms</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getRoleDescription()
- * @model extendedMetaData="name='RoleDescription' kind='elementOnly'"
- * @generated
- */
-public interface RoleDescription extends ContentDescription {
-	/**
-	 * Returns the value of the '<em><b>Assignment Approaches</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides guidance on for assigning individuals to the Role in terms of what other roles these individuals could perform and what responsibility different individuals assigned to this role might have.  The guidance can also describe different assignment approaches for different types of projects, e.g. for large versus small teams where individuals could be allocated to roles full time versus sharing roles within the team.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Assignment Approaches</em>' attribute.
-	 * @see #setAssignmentApproaches(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getRoleDescription_AssignmentApproaches()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='AssignmentApproaches'"
-	 * @generated
-	 */
-	String getAssignmentApproaches();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.RoleDescription#getAssignmentApproaches <em>Assignment Approaches</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Assignment Approaches</em>' attribute.
-	 * @see #getAssignmentApproaches()
-	 * @generated
-	 */
-	void setAssignmentApproaches(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Skills</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Lists of set of required skills a person needs to possess to fulfill that Role.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Skills</em>' attribute.
-	 * @see #setSkills(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getRoleDescription_Skills()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Skills'"
-	 * @generated
-	 */
-	String getSkills();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.RoleDescription#getSkills <em>Skills</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Skills</em>' attribute.
-	 * @see #getSkills()
-	 * @generated
-	 */
-	void setSkills(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Synonyms</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Lists synonyms, i.e. other names the Role might be referred by.  Tool support for the meta-model might support that a Role name can be consistently be replaced with one of its synonyms throught a Process.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Synonyms</em>' attribute.
-	 * @see #setSynonyms(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getRoleDescription_Synonyms()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Synonyms'"
-	 * @generated
-	 */
-	String getSynonyms();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.RoleDescription#getSynonyms <em>Synonyms</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Synonyms</em>' attribute.
-	 * @see #getSynonyms()
-	 * @generated
-	 */
-	void setSynonyms(String value);
-
-} // RoleDescription
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/RoleDescriptor.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/RoleDescriptor.java
deleted file mode 100755
index 7376030..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/RoleDescriptor.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RoleDescriptor.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Role Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Descriptor that represents a Role in the context of one specific Activity.  Every breakdown structure can define different relationships of Role Descriptors to Task Descriptors and Work Product Descriptors.  Therefore one Role can be represented by many Role Descriptors each within the context of an Activity with its own set of relationships.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.RoleDescriptor#getRole <em>Role</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.RoleDescriptor#getResponsibleFor <em>Responsible For</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getRoleDescriptor()
- * @model extendedMetaData="name='RoleDescriptor' kind='elementOnly'"
- * @generated
- */
-public interface RoleDescriptor extends Descriptor {
-	/**
-	 * Returns the value of the '<em><b>Role</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Role</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Role</em>' attribute.
-	 * @see #setRole(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getRoleDescriptor_Role()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Role'"
-	 * @generated
-	 */
-	String getRole();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.RoleDescriptor#getRole <em>Role</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Role</em>' attribute.
-	 * @see #getRole()
-	 * @generated
-	 */
-	void setRole(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Responsible For</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Responsible For</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Responsible For</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getRoleDescriptor_ResponsibleFor()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='ResponsibleFor'"
-	 * @generated
-	 */
-	EList getResponsibleFor();
-
-} // RoleDescriptor
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/RoleSet.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/RoleSet.java
deleted file mode 100755
index ee6ee3a..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/RoleSet.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RoleSet.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Role Set</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Organizes Roles into categories.  It is used to group roles together that have certain commonalities.  For example, the "Analysts" Role Set could group the "Business Process Analyst", "System Analyst", as well as "Requirements Specifier" roles.  All of these work with similar techniques and have overlapping skills, but are required as distinct roles for a method (e.g. the method the IBM Rational Unified Process is based on).
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.RoleSet#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.RoleSet#getRole <em>Role</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getRoleSet()
- * @model extendedMetaData="name='RoleSet' kind='elementOnly'"
- * @generated
- */
-public interface RoleSet extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getRoleSet_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:21'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Role</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Role</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Role</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getRoleSet_Role()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Role' group='#group:21'"
-	 * @generated
-	 */
-	EList getRole();
-
-} // RoleSet
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/RoleSetGrouping.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/RoleSetGrouping.java
deleted file mode 100755
index cd91795..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/RoleSetGrouping.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RoleSetGrouping.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Role Set Grouping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Role Sets can be categorized into Role Set Groupings.  For example, different methods might define similar Role Sets, which however need to be distinguished from each other on a global scale.  Thus, Role Set Groupings allow distinguishing, for example, Software Services Manager Role Sets from Software Development Organization Manager Role Sets.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.RoleSetGrouping#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.RoleSetGrouping#getRoleSet <em>Role Set</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getRoleSetGrouping()
- * @model extendedMetaData="name='RoleSetGrouping' kind='elementOnly'"
- * @generated
- */
-public interface RoleSetGrouping extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getRoleSetGrouping_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:21'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Role Set</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Role Set</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Role Set</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getRoleSetGrouping_RoleSet()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='RoleSet' group='#group:21'"
-	 * @generated
-	 */
-	EList getRoleSet();
-
-} // RoleSetGrouping
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Section.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Section.java
deleted file mode 100755
index 1251b19..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Section.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Section.java,v 1.3 2006/06/30 00:40:11 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Section</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Method Element that represents structural subsections of a Content Description's sectionDescription attribute.  It is used for either large scale documentation of Content Elements organized into sections as well as to flexibly add new Sections to Content Elements using contribution variability added to the Section concept for Method Plug-ins.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.Section#getSubSection <em>Sub Section</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Section#getPredecessor <em>Predecessor</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Section#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Section#getSectionName <em>Section Name</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Section#getVariabilityBasedOnElement <em>Variability Based On Element</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Section#getVariabilityType <em>Variability Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getSection()
- * @model extendedMetaData="name='Section' kind='elementOnly'"
- * @generated
- */
-public interface Section extends MethodElement {
-	/**
-	 * Returns the value of the '<em><b>Sub Section</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sub Section</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sub Section</em>' containment reference.
-	 * @see #setSubSection(Section)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getSection_SubSection()
-	 * @model containment="true"
-	 *        extendedMetaData="kind='element' name='SubSection'"
-	 * @generated
-	 */
-	Section getSubSection();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Section#getSubSection <em>Sub Section</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Sub Section</em>' containment reference.
-	 * @see #getSubSection()
-	 * @generated
-	 */
-	void setSubSection(Section value);
-
-	/**
-	 * Returns the value of the '<em><b>Predecessor</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Predecessor</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Predecessor</em>' attribute.
-	 * @see #setPredecessor(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getSection_Predecessor()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Predecessor'"
-	 * @generated
-	 */
-	String getPredecessor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Section#getPredecessor <em>Predecessor</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Predecessor</em>' attribute.
-	 * @see #getPredecessor()
-	 * @generated
-	 */
-	void setPredecessor(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This attributes store the description text for a Content Description's Section.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getSection_Description()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Description'"
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Section#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Section Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Every Section has a name used for external presentation of the section, e.g. when published or when section heading are listed in a table of contents.  This attribute is similar to Presentation Name for Content Elements.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Section Name</em>' attribute.
-	 * @see #setSectionName(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getSection_SectionName()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='sectionName'"
-	 * @generated
-	 */
-	String getSectionName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Section#getSectionName <em>Section Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Section Name</em>' attribute.
-	 * @see #getSectionName()
-	 * @generated
-	 */
-	void setSectionName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Variability Based On Element</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Variability Based On Element</em>' attribute.
-	 * @see #setVariabilityBasedOnElement(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getSection_VariabilityBasedOnElement()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='variabilityBasedOnElement'"
-	 * @generated
-	 */
-	String getVariabilityBasedOnElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Section#getVariabilityBasedOnElement <em>Variability Based On Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Variability Based On Element</em>' attribute.
-	 * @see #getVariabilityBasedOnElement()
-	 * @generated
-	 */
-	void setVariabilityBasedOnElement(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Variability Type</b></em>' attribute.
-	 * The default value is <code>"na"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.epf.xml.uma.VariabilityType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Variability Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Variability Type</em>' attribute.
-	 * @see org.eclipse.epf.xml.uma.VariabilityType
-	 * @see #isSetVariabilityType()
-	 * @see #unsetVariabilityType()
-	 * @see #setVariabilityType(VariabilityType)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getSection_VariabilityType()
-	 * @model default="na" unique="false" unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='variabilityType'"
-	 * @generated
-	 */
-	VariabilityType getVariabilityType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Section#getVariabilityType <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Variability Type</em>' attribute.
-	 * @see org.eclipse.epf.xml.uma.VariabilityType
-	 * @see #isSetVariabilityType()
-	 * @see #unsetVariabilityType()
-	 * @see #getVariabilityType()
-	 * @generated
-	 */
-	void setVariabilityType(VariabilityType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.Section#getVariabilityType <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetVariabilityType()
-	 * @see #getVariabilityType()
-	 * @see #setVariabilityType(VariabilityType)
-	 * @generated
-	 */
-	void unsetVariabilityType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.Section#getVariabilityType <em>Variability Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Variability Type</em>' attribute is set.
-	 * @see #unsetVariabilityType()
-	 * @see #getVariabilityType()
-	 * @see #setVariabilityType(VariabilityType)
-	 * @generated
-	 */
-	boolean isSetVariabilityType();
-
-} // Section
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/SupportingMaterial.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/SupportingMaterial.java
deleted file mode 100755
index aed1635..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/SupportingMaterial.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SupportingMaterial.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Supporting Material</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A catchall for other types of guidance not specifically defined elsewhere. It can be related to all kinds of Content Elements, i.e. including other guidance elements.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getSupportingMaterial()
- * @model extendedMetaData="name='SupportingMaterial' kind='elementOnly'"
- * @generated
- */
-public interface SupportingMaterial extends Guidance {
-} // SupportingMaterial
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Task.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Task.java
deleted file mode 100755
index cd4fd7e..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Task.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Task.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Task</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Content Element that describes work being performed by Roles.  It defines one default performing Role as well as many additional performers.  A Task is associated to input and output work products.  Inputs are differentiated in mandatory versus optional inputs.  The associations to Work Products are not instantiatable/variable-like parameters.  They rather express (hyper-)links to the descriptions of the work products types that are related to the Task as inputs and outputs.  In other words, these associations are not intended to be used to capture which concrete instances will be passed when instantiating the method in a project.  All of the Task's default associations can be overridden in an actual process definition.
- * A Task describes an assignable unit of work.  Every Task is assigned to specific Roles.  The granularity of a Task is generally a few hours to a few days.  It usually affects one or only a small number of work products. A Task is used as an element of defining a process. Tasks are further used for planning and tracking progress; therefore, if they are defined too fine-grained, they will be neglected, and if they are too large, progress would have to be expressed in terms of a Task's parts (e.g. Steps, which is not recommended). 
- * A Task has a clear purpose in which the performing roles achieve a well defined goal.  It provides complete step-by-step explanations of doing all the work that needs to be done to achieve this goal.  This description is complete, independent of when in a process lifecycle the work would actually be done.  It therefore does not describe when you do what work at what point of time, but describes all the work that gets done throughout the development lifecycle that contributes to the achievement of this goal.  When the Task is being applied in a process then this process application (defined as Task Descriptor) provides the information of which pieces of the Task will actually be performed at any particular point in time. This assumes that the Task will be performed in the process over and over again, but each time with a slightly different emphasis on different steps or aspects of the task description. 
- * For example, a Task such as "Develop Use Case Model" describes all the work that needs to be done to develop a complete use case model. This would comprise of the identification and naming of use cases and actors, the writing of a brief description, the modeling of use cases and their relationships in diagrams, the detailed description of a basic flow, the detailed description of alternatives flows, performing of walkthroughs workshops and reviews, etc.  All of these parts contribute to the development goal of developing the use case model, but the parts will be performed at different points in time in a process.  Identification, naming, and brief descriptions would be performed early in a typical development process versus the writing of detailed alternative flows which would be performed much later.  All these parts or steps within the same Task define the "method" of Developing a Use Case Model.  Applying such a method in a lifecycle (i.e. in a process) is defining which steps are done when going from one iteration to the next.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.Task#getPrecondition <em>Precondition</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Task#getPostcondition <em>Postcondition</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Task#getPerformedBy <em>Performed By</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Task#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Task#getMandatoryInput <em>Mandatory Input</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Task#getOutput <em>Output</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Task#getAdditionallyPerformedBy <em>Additionally Performed By</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Task#getOptionalInput <em>Optional Input</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Task#getEstimate <em>Estimate</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Task#getEstimationConsiderations <em>Estimation Considerations</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Task#getToolMentor <em>Tool Mentor</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getTask()
- * @model extendedMetaData="name='Task' kind='elementOnly'"
- * @generated
- */
-public interface Task extends ContentElement {
-	/**
-	 * Returns the value of the '<em><b>Precondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Precondition</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Precondition</em>' attribute.
-	 * @see #setPrecondition(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTask_Precondition()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Precondition'"
-	 * @generated
-	 */
-	String getPrecondition();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Task#getPrecondition <em>Precondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Precondition</em>' attribute.
-	 * @see #getPrecondition()
-	 * @generated
-	 */
-	void setPrecondition(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Postcondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Postcondition</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Postcondition</em>' attribute.
-	 * @see #setPostcondition(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTask_Postcondition()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Postcondition'"
-	 * @generated
-	 */
-	String getPostcondition();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Task#getPostcondition <em>Postcondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Postcondition</em>' attribute.
-	 * @see #getPostcondition()
-	 * @generated
-	 */
-	void setPostcondition(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Performed By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Performed By</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Performed By</em>' attribute.
-	 * @see #setPerformedBy(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTask_PerformedBy()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='PerformedBy'"
-	 * @generated
-	 */
-	String getPerformedBy();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.Task#getPerformedBy <em>Performed By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Performed By</em>' attribute.
-	 * @see #getPerformedBy()
-	 * @generated
-	 */
-	void setPerformedBy(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTask_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:24'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Mandatory Input</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mandatory Input</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mandatory Input</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTask_MandatoryInput()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='MandatoryInput' group='#group:24'"
-	 * @generated
-	 */
-	EList getMandatoryInput();
-
-	/**
-	 * Returns the value of the '<em><b>Output</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Output</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Output</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTask_Output()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Output' group='#group:24'"
-	 * @generated
-	 */
-	EList getOutput();
-
-	/**
-	 * Returns the value of the '<em><b>Additionally Performed By</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Additionally Performed By</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Additionally Performed By</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTask_AdditionallyPerformedBy()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='AdditionallyPerformedBy' group='#group:24'"
-	 * @generated
-	 */
-	EList getAdditionallyPerformedBy();
-
-	/**
-	 * Returns the value of the '<em><b>Optional Input</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Optional Input</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Optional Input</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTask_OptionalInput()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='OptionalInput' group='#group:24'"
-	 * @generated
-	 */
-	EList getOptionalInput();
-
-	/**
-	 * Returns the value of the '<em><b>Estimate</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Estimate</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Estimate</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTask_Estimate()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Estimate' group='#group:24'"
-	 * @generated
-	 */
-	EList getEstimate();
-
-	/**
-	 * Returns the value of the '<em><b>Estimation Considerations</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Estimation Considerations</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Estimation Considerations</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTask_EstimationConsiderations()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='EstimationConsiderations' group='#group:24'"
-	 * @generated
-	 */
-	EList getEstimationConsiderations();
-
-	/**
-	 * Returns the value of the '<em><b>Tool Mentor</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tool Mentor</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tool Mentor</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTask_ToolMentor()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ToolMentor' group='#group:24'"
-	 * @generated
-	 */
-	EList getToolMentor();
-
-} // Task
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/TaskDescription.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/TaskDescription.java
deleted file mode 100755
index 23d6485..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/TaskDescription.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaskDescription.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Task Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A generalized Content Description that is used to store the textual description for a Task.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.TaskDescription#getAlternatives <em>Alternatives</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.TaskDescription#getPurpose <em>Purpose</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getTaskDescription()
- * @model extendedMetaData="name='TaskDescription' kind='elementOnly'"
- * @generated
- */
-public interface TaskDescription extends ContentDescription {
-	/**
-	 * Returns the value of the '<em><b>Alternatives</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Comprises of summaries describing important exceptional and non-standard ways of achieving this Task's development goals that were not covered by the Task's Steps.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Alternatives</em>' attribute.
-	 * @see #setAlternatives(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTaskDescription_Alternatives()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Alternatives'"
-	 * @generated
-	 */
-	String getAlternatives();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.TaskDescription#getAlternatives <em>Alternatives</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Alternatives</em>' attribute.
-	 * @see #getAlternatives()
-	 * @generated
-	 */
-	void setAlternatives(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Summarizes the main reason for performing this Task and what is intended to be achieved.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Purpose</em>' attribute.
-	 * @see #setPurpose(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTaskDescription_Purpose()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Purpose'"
-	 * @generated
-	 */
-	String getPurpose();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.TaskDescription#getPurpose <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Purpose</em>' attribute.
-	 * @see #getPurpose()
-	 * @generated
-	 */
-	void setPurpose(String value);
-
-} // TaskDescription
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/TaskDescriptor.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/TaskDescriptor.java
deleted file mode 100755
index d434ab5..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/TaskDescriptor.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaskDescriptor.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Task Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Descriptor that represents a proxy for a Task in the context of one specific Activity.  Every breakdown structure can define different relationships of Task Descriptors to Work Product Descriptors and Role Descriptors. Therefore one Task can be represented by many Task Descriptors each within the context of an Activity with its own set of relationships.
- * A key difference between Method Content and Process is that a Content Element such as Task describes all aspects of doing work defined around this Task.  This description is managed in steps, which are modeled as Sections of the Tasks' Content Descriptions.  When applying a Task in a Process' Activity with a Task Descriptor a Process Engineer needs to indicate that at that particular point in time in the Process definition for which the Task Descriptor has been created, only a subset of steps shall be performed.  He defines this selection using the selectedSteps association.  If he wants to add steps to a Task Descriptor, he can describe these either pragmatically in the refinedDescription attribute or 'properly' create a contributing Task to the Task the Task Descriptor refers to.
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.TaskDescriptor#getTask <em>Task</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.TaskDescriptor#getPerformedPrimarilyBy <em>Performed Primarily By</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.TaskDescriptor#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.TaskDescriptor#getAdditionallyPerformedBy <em>Additionally Performed By</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.TaskDescriptor#getAssistedBy <em>Assisted By</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.TaskDescriptor#getExternalInput <em>External Input</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.TaskDescriptor#getMandatoryInput <em>Mandatory Input</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.TaskDescriptor#getOptionalInput <em>Optional Input</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.TaskDescriptor#getOutput <em>Output</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.TaskDescriptor#getStep <em>Step</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.TaskDescriptor#isIsSynchronizedWithSource <em>Is Synchronized With Source</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getTaskDescriptor()
- * @model extendedMetaData="name='TaskDescriptor' kind='elementOnly'"
- * @generated
- */
-public interface TaskDescriptor extends WorkBreakdownElement {
-	/**
-	 * Returns the value of the '<em><b>Task</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Task</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Task</em>' attribute.
-	 * @see #setTask(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTaskDescriptor_Task()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Task'"
-	 * @generated
-	 */
-	String getTask();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.TaskDescriptor#getTask <em>Task</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Task</em>' attribute.
-	 * @see #getTask()
-	 * @generated
-	 */
-	void setTask(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Performed Primarily By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Performed Primarily By</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Performed Primarily By</em>' attribute.
-	 * @see #setPerformedPrimarilyBy(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTaskDescriptor_PerformedPrimarilyBy()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='PerformedPrimarilyBy'"
-	 * @generated
-	 */
-	String getPerformedPrimarilyBy();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.TaskDescriptor#getPerformedPrimarilyBy <em>Performed Primarily By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Performed Primarily By</em>' attribute.
-	 * @see #getPerformedPrimarilyBy()
-	 * @generated
-	 */
-	void setPerformedPrimarilyBy(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTaskDescriptor_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:26'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Additionally Performed By</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Additionally Performed By</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Additionally Performed By</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTaskDescriptor_AdditionallyPerformedBy()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='AdditionallyPerformedBy' group='#group:26'"
-	 * @generated
-	 */
-	EList getAdditionallyPerformedBy();
-
-	/**
-	 * Returns the value of the '<em><b>Assisted By</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Assisted By</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Assisted By</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTaskDescriptor_AssistedBy()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='AssistedBy' group='#group:26'"
-	 * @generated
-	 */
-	EList getAssistedBy();
-
-	/**
-	 * Returns the value of the '<em><b>External Input</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>External Input</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>External Input</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTaskDescriptor_ExternalInput()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ExternalInput' group='#group:26'"
-	 * @generated
-	 */
-	EList getExternalInput();
-
-	/**
-	 * Returns the value of the '<em><b>Mandatory Input</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mandatory Input</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mandatory Input</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTaskDescriptor_MandatoryInput()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='MandatoryInput' group='#group:26'"
-	 * @generated
-	 */
-	EList getMandatoryInput();
-
-	/**
-	 * Returns the value of the '<em><b>Optional Input</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Optional Input</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Optional Input</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTaskDescriptor_OptionalInput()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='OptionalInput' group='#group:26'"
-	 * @generated
-	 */
-	EList getOptionalInput();
-
-	/**
-	 * Returns the value of the '<em><b>Output</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Output</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Output</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTaskDescriptor_Output()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Output' group='#group:26'"
-	 * @generated
-	 */
-	EList getOutput();
-
-	/**
-	 * Returns the value of the '<em><b>Step</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.Section}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Step</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Step</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTaskDescriptor_Step()
-	 * @model type="org.eclipse.epf.xml.uma.Section" containment="true"
-	 *        extendedMetaData="kind='element' name='Step'"
-	 * @generated
-	 */
-	EList getStep();
-
-	/**
-	 * Returns the value of the '<em><b>Is Synchronized With Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Is Synchronized With Source</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Is Synchronized With Source</em>' attribute.
-	 * @see #isSetIsSynchronizedWithSource()
-	 * @see #unsetIsSynchronizedWithSource()
-	 * @see #setIsSynchronizedWithSource(boolean)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTaskDescriptor_IsSynchronizedWithSource()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='attribute' name='isSynchronizedWithSource'"
-	 * @generated
-	 */
-	boolean isIsSynchronizedWithSource();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.TaskDescriptor#isIsSynchronizedWithSource <em>Is Synchronized With Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Synchronized With Source</em>' attribute.
-	 * @see #isSetIsSynchronizedWithSource()
-	 * @see #unsetIsSynchronizedWithSource()
-	 * @see #isIsSynchronizedWithSource()
-	 * @generated
-	 */
-	void setIsSynchronizedWithSource(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.TaskDescriptor#isIsSynchronizedWithSource <em>Is Synchronized With Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsSynchronizedWithSource()
-	 * @see #isIsSynchronizedWithSource()
-	 * @see #setIsSynchronizedWithSource(boolean)
-	 * @generated
-	 */
-	void unsetIsSynchronizedWithSource();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.TaskDescriptor#isIsSynchronizedWithSource <em>Is Synchronized With Source</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Synchronized With Source</em>' attribute is set.
-	 * @see #unsetIsSynchronizedWithSource()
-	 * @see #isIsSynchronizedWithSource()
-	 * @see #setIsSynchronizedWithSource(boolean)
-	 * @generated
-	 */
-	boolean isSetIsSynchronizedWithSource();
-
-} // TaskDescriptor
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/TeamProfile.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/TeamProfile.java
deleted file mode 100755
index 3144480..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/TeamProfile.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TeamProfile.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Team Profile</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Breakdown Element that groups Role Descriptors or Resource Definitions defining a nested hierarchy of teams and team members.
- * Work assignments and Work Product responsibilities can be different from Activity to Activity in a development project. Different phases require different staffing profiles, i.e. different skills and resources doing different types of work.  Therefore, a process needs to define such different profiles in a flexible manner.  Whereas Core Method Content defines standard responsibilities and assignments, a process express by a breakdown structures needs to be able refine and redefine these throughout its definition.  Role Descriptors, Resource Definitions, as well as Team Profiles provide the data structure necessary to achieve this flexibility and to provide a process user with the capability to define different teams and role relationships for every Activity (including Activities on any nesting-level as well as Iterations or Phases).
- * Hence, in addition to the work breakdown and work product breakdown structures defined so far, Team Profiles are used to define a third type of breakdown structure: team breakdown structures.  These are created as an Activity specific hierarchy of Team Profiles comprising of Role Descriptors and Resource Definitions.  These structures can be presented as well-known Org-Charts.  Just as with any other Breakdown Element and Descriptors, Team Profiles can be defined within the scope of any Activity in a breakdown structure.  In other words every Activity can define its own Team Profiles consisting of Activity specific Role Descriptors and Resource Definitions.  Typically, Team Profiles are defined on the level of Iterations or Phases or other higher-level Activity.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.TeamProfile#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.TeamProfile#getRole <em>Role</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.TeamProfile#getSuperTeam <em>Super Team</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.TeamProfile#getSubTeam <em>Sub Team</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getTeamProfile()
- * @model extendedMetaData="name='TeamProfile' kind='elementOnly'"
- * @generated
- */
-public interface TeamProfile extends BreakdownElement {
-	/**
-	 * Returns the value of the '<em><b>Group1</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group1</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group1</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTeamProfile_Group1()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:19'"
-	 * @generated
-	 */
-	FeatureMap getGroup1();
-
-	/**
-	 * Returns the value of the '<em><b>Role</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Role</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Role</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTeamProfile_Role()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Role' group='#group:19'"
-	 * @generated
-	 */
-	EList getRole();
-
-	/**
-	 * Returns the value of the '<em><b>Super Team</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Super Team</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Super Team</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTeamProfile_SuperTeam()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='SuperTeam' group='#group:19'"
-	 * @generated
-	 */
-	EList getSuperTeam();
-
-	/**
-	 * Returns the value of the '<em><b>Sub Team</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sub Team</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sub Team</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTeamProfile_SubTeam()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='SubTeam' group='#group:19'"
-	 * @generated
-	 */
-	EList getSubTeam();
-
-} // TeamProfile
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Template.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Template.java
deleted file mode 100755
index c7b3b42..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Template.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Template.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Template</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A specific type of guidance that provides for a work product a pre-defined table of contents, sections, packages, and/or headings, a standardized format, as well as descriptions how the sections and packages are supposed to be used and completed. Templates cannot only be provided for documents, but also for conceptual models or physical data stores.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getTemplate()
- * @model extendedMetaData="name='Template' kind='elementOnly'"
- * @generated
- */
-public interface Template extends Guidance {
-} // Template
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/TermDefinition.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/TermDefinition.java
deleted file mode 100755
index 42ae7eb..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/TermDefinition.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TermDefinition.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Term Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A specific type of guidance that defines concepts and are used to build up the Glossary. TermDefinitions are not directly related to ContentElements, but their relationship is being derived when the Term is used in the ContentElements description text.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getTermDefinition()
- * @model extendedMetaData="name='TermDefinition' kind='elementOnly'"
- * @generated
- */
-public interface TermDefinition extends Guidance {
-} // TermDefinition
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Tool.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Tool.java
deleted file mode 100755
index 1e51abd..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Tool.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Tool.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tool</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A container/aggregate for ToolMentors.  It can also provide general descriptions of the tool and its general capabilities.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.Tool#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.Tool#getToolMentor <em>Tool Mentor</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getTool()
- * @model extendedMetaData="name='Tool' kind='elementOnly'"
- * @generated
- */
-public interface Tool extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTool_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:21'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Tool Mentor</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tool Mentor</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tool Mentor</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getTool_ToolMentor()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ToolMentor' group='#group:21'"
-	 * @generated
-	 */
-	EList getToolMentor();
-
-} // Tool
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ToolMentor.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ToolMentor.java
deleted file mode 100755
index 94416e8..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/ToolMentor.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ToolMentor.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tool Mentor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A  specific type of guidance that shows how to use a specific tool to accomplish some piece of work a Work Product either in the context of or independent from a Task or Activity.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getToolMentor()
- * @model extendedMetaData="name='ToolMentor' kind='elementOnly'"
- * @generated
- */
-public interface ToolMentor extends Guidance {
-} // ToolMentor
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/UmaFactory.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/UmaFactory.java
deleted file mode 100755
index 143ea9f..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/UmaFactory.java
+++ /dev/null
@@ -1,793 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UmaFactory.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.xml.uma.UmaPackage
- * @generated
- */
-public interface UmaFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	UmaFactory eINSTANCE = org.eclipse.epf.xml.uma.impl.UmaFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Activity</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Activity</em>'.
-	 * @generated
-	 */
-	Activity createActivity();
-
-	/**
-	 * Returns a new object of class '<em>Activity Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Activity Description</em>'.
-	 * @generated
-	 */
-	ActivityDescription createActivityDescription();
-
-	/**
-	 * Returns a new object of class '<em>Artifact</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Artifact</em>'.
-	 * @generated
-	 */
-	Artifact createArtifact();
-
-	/**
-	 * Returns a new object of class '<em>Artifact Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Artifact Description</em>'.
-	 * @generated
-	 */
-	ArtifactDescription createArtifactDescription();
-
-	/**
-	 * Returns a new object of class '<em>Breakdown Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Breakdown Element</em>'.
-	 * @generated
-	 */
-	BreakdownElement createBreakdownElement();
-
-	/**
-	 * Returns a new object of class '<em>Breakdown Element Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Breakdown Element Description</em>'.
-	 * @generated
-	 */
-	BreakdownElementDescription createBreakdownElementDescription();
-
-	/**
-	 * Returns a new object of class '<em>Capability Pattern</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Capability Pattern</em>'.
-	 * @generated
-	 */
-	CapabilityPattern createCapabilityPattern();
-
-	/**
-	 * Returns a new object of class '<em>Checklist</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Checklist</em>'.
-	 * @generated
-	 */
-	Checklist createChecklist();
-
-	/**
-	 * Returns a new object of class '<em>Composite Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Composite Role</em>'.
-	 * @generated
-	 */
-	CompositeRole createCompositeRole();
-
-	/**
-	 * Returns a new object of class '<em>Concept</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Concept</em>'.
-	 * @generated
-	 */
-	Concept createConcept();
-
-	/**
-	 * Returns a new object of class '<em>Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Constraint</em>'.
-	 * @generated
-	 */
-	Constraint createConstraint();
-
-	/**
-	 * Returns a new object of class '<em>Content Category</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Content Category</em>'.
-	 * @generated
-	 */
-	ContentCategory createContentCategory();
-
-	/**
-	 * Returns a new object of class '<em>Content Category Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Content Category Package</em>'.
-	 * @generated
-	 */
-	ContentCategoryPackage createContentCategoryPackage();
-
-	/**
-	 * Returns a new object of class '<em>Content Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Content Description</em>'.
-	 * @generated
-	 */
-	ContentDescription createContentDescription();
-
-	/**
-	 * Returns a new object of class '<em>Content Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Content Element</em>'.
-	 * @generated
-	 */
-	ContentElement createContentElement();
-
-	/**
-	 * Returns a new object of class '<em>Content Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Content Package</em>'.
-	 * @generated
-	 */
-	ContentPackage createContentPackage();
-
-	/**
-	 * Returns a new object of class '<em>Custom Category</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Custom Category</em>'.
-	 * @generated
-	 */
-	CustomCategory createCustomCategory();
-
-	/**
-	 * Returns a new object of class '<em>Deliverable</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Deliverable</em>'.
-	 * @generated
-	 */
-	Deliverable createDeliverable();
-
-	/**
-	 * Returns a new object of class '<em>Deliverable Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Deliverable Description</em>'.
-	 * @generated
-	 */
-	DeliverableDescription createDeliverableDescription();
-
-	/**
-	 * Returns a new object of class '<em>Delivery Process</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Delivery Process</em>'.
-	 * @generated
-	 */
-	DeliveryProcess createDeliveryProcess();
-
-	/**
-	 * Returns a new object of class '<em>Delivery Process Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Delivery Process Description</em>'.
-	 * @generated
-	 */
-	DeliveryProcessDescription createDeliveryProcessDescription();
-
-	/**
-	 * Returns a new object of class '<em>Describable Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Describable Element</em>'.
-	 * @generated
-	 */
-	DescribableElement createDescribableElement();
-
-	/**
-	 * Returns a new object of class '<em>Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Descriptor</em>'.
-	 * @generated
-	 */
-	Descriptor createDescriptor();
-
-	/**
-	 * Returns a new object of class '<em>Descriptor Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Descriptor Description</em>'.
-	 * @generated
-	 */
-	DescriptorDescription createDescriptorDescription();
-
-	/**
-	 * Returns a new object of class '<em>Discipline</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Discipline</em>'.
-	 * @generated
-	 */
-	Discipline createDiscipline();
-
-	/**
-	 * Returns a new object of class '<em>Discipline Grouping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Discipline Grouping</em>'.
-	 * @generated
-	 */
-	DisciplineGrouping createDisciplineGrouping();
-
-	/**
-	 * Returns a new object of class '<em>Document Root</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Document Root</em>'.
-	 * @generated
-	 */
-	DocumentRoot createDocumentRoot();
-
-	/**
-	 * Returns a new object of class '<em>Domain</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Domain</em>'.
-	 * @generated
-	 */
-	Domain createDomain();
-
-	/**
-	 * Returns a new object of class '<em>Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Element</em>'.
-	 * @generated
-	 */
-	Element createElement();
-
-	/**
-	 * Returns a new object of class '<em>Estimate</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Estimate</em>'.
-	 * @generated
-	 */
-	Estimate createEstimate();
-
-	/**
-	 * Returns a new object of class '<em>Estimating Metric</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Estimating Metric</em>'.
-	 * @generated
-	 */
-	EstimatingMetric createEstimatingMetric();
-
-	/**
-	 * Returns a new object of class '<em>Estimation Considerations</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Estimation Considerations</em>'.
-	 * @generated
-	 */
-	EstimationConsiderations createEstimationConsiderations();
-
-	/**
-	 * Returns a new object of class '<em>Example</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Example</em>'.
-	 * @generated
-	 */
-	Example createExample();
-
-	/**
-	 * Returns a new object of class '<em>Guidance</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Guidance</em>'.
-	 * @generated
-	 */
-	Guidance createGuidance();
-
-	/**
-	 * Returns a new object of class '<em>Guidance Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Guidance Description</em>'.
-	 * @generated
-	 */
-	GuidanceDescription createGuidanceDescription();
-
-	/**
-	 * Returns a new object of class '<em>Guideline</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Guideline</em>'.
-	 * @generated
-	 */
-	Guideline createGuideline();
-
-	/**
-	 * Returns a new object of class '<em>Iteration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Iteration</em>'.
-	 * @generated
-	 */
-	Iteration createIteration();
-
-	/**
-	 * Returns a new object of class '<em>Method Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Configuration</em>'.
-	 * @generated
-	 */
-	MethodConfiguration createMethodConfiguration();
-
-	/**
-	 * Returns a new object of class '<em>Method Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Element</em>'.
-	 * @generated
-	 */
-	MethodElement createMethodElement();
-
-	/**
-	 * Returns a new object of class '<em>Method Library</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Library</em>'.
-	 * @generated
-	 */
-	MethodLibrary createMethodLibrary();
-
-	/**
-	 * Returns a new object of class '<em>Method Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Package</em>'.
-	 * @generated
-	 */
-	MethodPackage createMethodPackage();
-
-	/**
-	 * Returns a new object of class '<em>Method Plugin</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Plugin</em>'.
-	 * @generated
-	 */
-	MethodPlugin createMethodPlugin();
-
-	/**
-	 * Returns a new object of class '<em>Method Unit</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Unit</em>'.
-	 * @generated
-	 */
-	MethodUnit createMethodUnit();
-
-	/**
-	 * Returns a new object of class '<em>Milestone</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Milestone</em>'.
-	 * @generated
-	 */
-	Milestone createMilestone();
-
-	/**
-	 * Returns a new object of class '<em>Named Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Named Element</em>'.
-	 * @generated
-	 */
-	NamedElement createNamedElement();
-
-	/**
-	 * Returns a new object of class '<em>Outcome</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Outcome</em>'.
-	 * @generated
-	 */
-	Outcome createOutcome();
-
-	/**
-	 * Returns a new object of class '<em>Packageable Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Packageable Element</em>'.
-	 * @generated
-	 */
-	PackageableElement createPackageableElement();
-
-	/**
-	 * Returns a new object of class '<em>Phase</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Phase</em>'.
-	 * @generated
-	 */
-	Phase createPhase();
-
-	/**
-	 * Returns a new object of class '<em>Planning Data</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Planning Data</em>'.
-	 * @generated
-	 */
-	PlanningData createPlanningData();
-
-	/**
-	 * Returns a new object of class '<em>Practice</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Practice</em>'.
-	 * @generated
-	 */
-	Practice createPractice();
-
-	/**
-	 * Returns a new object of class '<em>Practice Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Practice Description</em>'.
-	 * @generated
-	 */
-	PracticeDescription createPracticeDescription();
-
-	/**
-	 * Returns a new object of class '<em>Process</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Process</em>'.
-	 * @generated
-	 */
-	org.eclipse.epf.xml.uma.Process createProcess();
-
-	/**
-	 * Returns a new object of class '<em>Process Component</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Process Component</em>'.
-	 * @generated
-	 */
-	ProcessComponent createProcessComponent();
-
-	/**
-	 * Returns a new object of class '<em>Process Component Interface</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Process Component Interface</em>'.
-	 * @generated
-	 */
-	ProcessComponentInterface createProcessComponentInterface();
-
-	/**
-	 * Returns a new object of class '<em>Process Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Process Description</em>'.
-	 * @generated
-	 */
-	ProcessDescription createProcessDescription();
-
-	/**
-	 * Returns a new object of class '<em>Process Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Process Element</em>'.
-	 * @generated
-	 */
-	ProcessElement createProcessElement();
-
-	/**
-	 * Returns a new object of class '<em>Process Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Process Package</em>'.
-	 * @generated
-	 */
-	ProcessPackage createProcessPackage();
-
-	/**
-	 * Returns a new object of class '<em>Process Planning Template</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Process Planning Template</em>'.
-	 * @generated
-	 */
-	ProcessPlanningTemplate createProcessPlanningTemplate();
-
-	/**
-	 * Returns a new object of class '<em>Report</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Report</em>'.
-	 * @generated
-	 */
-	Report createReport();
-
-	/**
-	 * Returns a new object of class '<em>Reusable Asset</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Reusable Asset</em>'.
-	 * @generated
-	 */
-	ReusableAsset createReusableAsset();
-
-	/**
-	 * Returns a new object of class '<em>Roadmap</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Roadmap</em>'.
-	 * @generated
-	 */
-	Roadmap createRoadmap();
-
-	/**
-	 * Returns a new object of class '<em>Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Role</em>'.
-	 * @generated
-	 */
-	Role createRole();
-
-	/**
-	 * Returns a new object of class '<em>Role Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Role Description</em>'.
-	 * @generated
-	 */
-	RoleDescription createRoleDescription();
-
-	/**
-	 * Returns a new object of class '<em>Role Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Role Descriptor</em>'.
-	 * @generated
-	 */
-	RoleDescriptor createRoleDescriptor();
-
-	/**
-	 * Returns a new object of class '<em>Role Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Role Set</em>'.
-	 * @generated
-	 */
-	RoleSet createRoleSet();
-
-	/**
-	 * Returns a new object of class '<em>Role Set Grouping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Role Set Grouping</em>'.
-	 * @generated
-	 */
-	RoleSetGrouping createRoleSetGrouping();
-
-	/**
-	 * Returns a new object of class '<em>Section</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Section</em>'.
-	 * @generated
-	 */
-	Section createSection();
-
-	/**
-	 * Returns a new object of class '<em>Supporting Material</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Supporting Material</em>'.
-	 * @generated
-	 */
-	SupportingMaterial createSupportingMaterial();
-
-	/**
-	 * Returns a new object of class '<em>Task</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Task</em>'.
-	 * @generated
-	 */
-	Task createTask();
-
-	/**
-	 * Returns a new object of class '<em>Task Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Task Description</em>'.
-	 * @generated
-	 */
-	TaskDescription createTaskDescription();
-
-	/**
-	 * Returns a new object of class '<em>Task Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Task Descriptor</em>'.
-	 * @generated
-	 */
-	TaskDescriptor createTaskDescriptor();
-
-	/**
-	 * Returns a new object of class '<em>Team Profile</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Team Profile</em>'.
-	 * @generated
-	 */
-	TeamProfile createTeamProfile();
-
-	/**
-	 * Returns a new object of class '<em>Template</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Template</em>'.
-	 * @generated
-	 */
-	Template createTemplate();
-
-	/**
-	 * Returns a new object of class '<em>Term Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Term Definition</em>'.
-	 * @generated
-	 */
-	TermDefinition createTermDefinition();
-
-	/**
-	 * Returns a new object of class '<em>Tool</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tool</em>'.
-	 * @generated
-	 */
-	Tool createTool();
-
-	/**
-	 * Returns a new object of class '<em>Tool Mentor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tool Mentor</em>'.
-	 * @generated
-	 */
-	ToolMentor createToolMentor();
-
-	/**
-	 * Returns a new object of class '<em>Whitepaper</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Whitepaper</em>'.
-	 * @generated
-	 */
-	Whitepaper createWhitepaper();
-
-	/**
-	 * Returns a new object of class '<em>Work Breakdown Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Breakdown Element</em>'.
-	 * @generated
-	 */
-	WorkBreakdownElement createWorkBreakdownElement();
-
-	/**
-	 * Returns a new object of class '<em>Work Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Definition</em>'.
-	 * @generated
-	 */
-	WorkDefinition createWorkDefinition();
-
-	/**
-	 * Returns a new object of class '<em>Work Order</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Order</em>'.
-	 * @generated
-	 */
-	WorkOrder createWorkOrder();
-
-	/**
-	 * Returns a new object of class '<em>Work Product</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Product</em>'.
-	 * @generated
-	 */
-	WorkProduct createWorkProduct();
-
-	/**
-	 * Returns a new object of class '<em>Work Product Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Product Description</em>'.
-	 * @generated
-	 */
-	WorkProductDescription createWorkProductDescription();
-
-	/**
-	 * Returns a new object of class '<em>Work Product Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Product Descriptor</em>'.
-	 * @generated
-	 */
-	WorkProductDescriptor createWorkProductDescriptor();
-
-	/**
-	 * Returns a new object of class '<em>Work Product Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Work Product Type</em>'.
-	 * @generated
-	 */
-	WorkProductType createWorkProductType();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	UmaPackage getUmaPackage();
-
-} //UmaFactory
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/UmaPackage.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/UmaPackage.java
deleted file mode 100755
index f29b699..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/UmaPackage.java
+++ /dev/null
@@ -1,23607 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UmaPackage.java,v 1.6 2006/09/08 00:59:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.xml.uma.UmaFactory
- * @model kind="package"
- * @generated
- */
-public interface UmaPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "uma";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/epf/uma/1.0.3";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "uma";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	UmaPackage eINSTANCE = org.eclipse.epf.xml.uma.impl.UmaPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ElementImpl <em>Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ElementImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getElement()
-	 * @generated
-	 */
-	int ELEMENT = 28;
-
-	/**
-	 * The number of structural features of the '<em>Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.NamedElementImpl <em>Named Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.NamedElementImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getNamedElement()
-	 * @generated
-	 */
-	int NAMED_ELEMENT = 44;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMED_ELEMENT__NAME = ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Named Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMED_ELEMENT_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.PackageableElementImpl <em>Packageable Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.PackageableElementImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getPackageableElement()
-	 * @generated
-	 */
-	int PACKAGEABLE_ELEMENT = 46;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PACKAGEABLE_ELEMENT__NAME = NAMED_ELEMENT__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Packageable Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PACKAGEABLE_ELEMENT_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.MethodElementImpl <em>Method Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.MethodElementImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getMethodElement()
-	 * @generated
-	 */
-	int METHOD_ELEMENT = 38;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__NAME = PACKAGEABLE_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__GROUP = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__OWNED_RULE = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__BRIEF_DESCRIPTION = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__ID = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__ORDERING_GUIDE = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__SUPPRESSED = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Method Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT_FEATURE_COUNT = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.DescribableElementImpl <em>Describable Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.DescribableElementImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDescribableElement()
-	 * @generated
-	 */
-	int DESCRIBABLE_ELEMENT = 21;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__NAME = METHOD_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__GROUP = METHOD_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__OWNED_RULE = METHOD_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__BRIEF_DESCRIPTION = METHOD_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__ID = METHOD_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__ORDERING_GUIDE = METHOD_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__SUPPRESSED = METHOD_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__PRESENTATION = METHOD_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__NODEICON = METHOD_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__PRESENTATION_NAME = METHOD_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT__SHAPEICON = METHOD_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Describable Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIBABLE_ELEMENT_FEATURE_COUNT = METHOD_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ProcessElementImpl <em>Process Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ProcessElementImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getProcessElement()
-	 * @generated
-	 */
-	int PROCESS_ELEMENT = 55;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__NAME = DESCRIBABLE_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__GROUP = DESCRIBABLE_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__OWNED_RULE = DESCRIBABLE_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__BRIEF_DESCRIPTION = DESCRIBABLE_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__ID = DESCRIBABLE_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__ORDERING_GUIDE = DESCRIBABLE_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__SUPPRESSED = DESCRIBABLE_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__PRESENTATION = DESCRIBABLE_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__NODEICON = DESCRIBABLE_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__PRESENTATION_NAME = DESCRIBABLE_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT__SHAPEICON = DESCRIBABLE_ELEMENT__SHAPEICON;
-
-	/**
-	 * The number of structural features of the '<em>Process Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_ELEMENT_FEATURE_COUNT = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.BreakdownElementImpl <em>Breakdown Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.BreakdownElementImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getBreakdownElement()
-	 * @generated
-	 */
-	int BREAKDOWN_ELEMENT = 4;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__NAME = PROCESS_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__GROUP = PROCESS_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__OWNED_RULE = PROCESS_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION = PROCESS_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__ID = PROCESS_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__ORDERING_GUIDE = PROCESS_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__SUPPRESSED = PROCESS_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__PRESENTATION = PROCESS_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__NODEICON = PROCESS_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__PRESENTATION_NAME = PROCESS_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__SHAPEICON = PROCESS_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__PRESENTED_AFTER = PROCESS_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__PRESENTED_BEFORE = PROCESS_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__PLANNING_DATA = PROCESS_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__SUPER_ACTIVITY = PROCESS_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES = PROCESS_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__IS_OPTIONAL = PROCESS_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__IS_PLANNED = PROCESS_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT__PREFIX = PROCESS_ELEMENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the '<em>Breakdown Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_FEATURE_COUNT = PROCESS_ELEMENT_FEATURE_COUNT + 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.WorkBreakdownElementImpl <em>Work Breakdown Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.WorkBreakdownElementImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkBreakdownElement()
-	 * @generated
-	 */
-	int WORK_BREAKDOWN_ELEMENT = 77;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__NAME = BREAKDOWN_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__GROUP = BREAKDOWN_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__OWNED_RULE = BREAKDOWN_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION = BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__ID = BREAKDOWN_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__ORDERING_GUIDE = BREAKDOWN_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__SUPPRESSED = BREAKDOWN_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__PRESENTATION = BREAKDOWN_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__NODEICON = BREAKDOWN_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__PRESENTATION_NAME = BREAKDOWN_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__SHAPEICON = BREAKDOWN_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__PRESENTED_AFTER = BREAKDOWN_ELEMENT__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__PRESENTED_BEFORE = BREAKDOWN_ELEMENT__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__PLANNING_DATA = BREAKDOWN_ELEMENT__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__SUPER_ACTIVITY = BREAKDOWN_ELEMENT__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES = BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__IS_OPTIONAL = BREAKDOWN_ELEMENT__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__IS_PLANNED = BREAKDOWN_ELEMENT__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__PREFIX = BREAKDOWN_ELEMENT__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__GROUP1 = BREAKDOWN_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__PREDECESSOR = BREAKDOWN_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN = BREAKDOWN_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__IS_ONGOING = BREAKDOWN_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE = BREAKDOWN_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Work Breakdown Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT = BREAKDOWN_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ActivityImpl <em>Activity</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ActivityImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getActivity()
-	 * @generated
-	 */
-	int ACTIVITY = 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__NAME = WORK_BREAKDOWN_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__GROUP = WORK_BREAKDOWN_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__OWNED_RULE = WORK_BREAKDOWN_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__BRIEF_DESCRIPTION = WORK_BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__ID = WORK_BREAKDOWN_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__ORDERING_GUIDE = WORK_BREAKDOWN_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__SUPPRESSED = WORK_BREAKDOWN_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__PRESENTATION = WORK_BREAKDOWN_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__NODEICON = WORK_BREAKDOWN_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__PRESENTATION_NAME = WORK_BREAKDOWN_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__SHAPEICON = WORK_BREAKDOWN_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__PRESENTED_AFTER = WORK_BREAKDOWN_ELEMENT__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__PRESENTED_BEFORE = WORK_BREAKDOWN_ELEMENT__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__PLANNING_DATA = WORK_BREAKDOWN_ELEMENT__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__SUPER_ACTIVITY = WORK_BREAKDOWN_ELEMENT__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__HAS_MULTIPLE_OCCURRENCES = WORK_BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__IS_OPTIONAL = WORK_BREAKDOWN_ELEMENT__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__IS_PLANNED = WORK_BREAKDOWN_ELEMENT__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__PREFIX = WORK_BREAKDOWN_ELEMENT__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__GROUP1 = WORK_BREAKDOWN_ELEMENT__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__PREDECESSOR = WORK_BREAKDOWN_ELEMENT__PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__IS_EVENT_DRIVEN = WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__IS_ONGOING = WORK_BREAKDOWN_ELEMENT__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__IS_REPEATABLE = WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__PRECONDITION = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__POSTCONDITION = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__GROUP2 = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Breakdown Element</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__BREAKDOWN_ELEMENT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__CHECKLIST = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__CONCEPT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__EXAMPLE = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__GUIDELINE = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Roadmap</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__ROADMAP = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__REUSABLE_ASSET = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__SUPPORTING_MATERIAL = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 10;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__WHITEPAPER = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 11;
-
-	/**
-	 * The feature id for the '<em><b>Is Enactable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__IS_ENACTABLE = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 12;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__VARIABILITY_BASED_ON_ELEMENT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 13;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY__VARIABILITY_TYPE = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 14;
-
-	/**
-	 * The number of structural features of the '<em>Activity</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_FEATURE_COUNT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 15;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.MethodUnitImpl <em>Method Unit</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.MethodUnitImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getMethodUnit()
-	 * @generated
-	 */
-	int METHOD_UNIT = 42;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__NAME = METHOD_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__GROUP = METHOD_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__OWNED_RULE = METHOD_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__BRIEF_DESCRIPTION = METHOD_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__ID = METHOD_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__ORDERING_GUIDE = METHOD_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__SUPPRESSED = METHOD_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__COPYRIGHT = METHOD_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__AUTHORS = METHOD_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__CHANGE_DATE = METHOD_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__CHANGE_DESCRIPTION = METHOD_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT__VERSION = METHOD_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Method Unit</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_UNIT_FEATURE_COUNT = METHOD_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ContentDescriptionImpl <em>Content Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ContentDescriptionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getContentDescription()
-	 * @generated
-	 */
-	int CONTENT_DESCRIPTION = 13;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__NAME = METHOD_UNIT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__GROUP = METHOD_UNIT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__OWNED_RULE = METHOD_UNIT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__BRIEF_DESCRIPTION = METHOD_UNIT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__ID = METHOD_UNIT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__ORDERING_GUIDE = METHOD_UNIT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__SUPPRESSED = METHOD_UNIT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__COPYRIGHT = METHOD_UNIT__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__AUTHORS = METHOD_UNIT__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__CHANGE_DATE = METHOD_UNIT__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__CHANGE_DESCRIPTION = METHOD_UNIT__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__VERSION = METHOD_UNIT__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__MAIN_DESCRIPTION = METHOD_UNIT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__KEY_CONSIDERATIONS = METHOD_UNIT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Section</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION__SECTION = METHOD_UNIT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Content Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_DESCRIPTION_FEATURE_COUNT = METHOD_UNIT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.BreakdownElementDescriptionImpl <em>Breakdown Element Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.BreakdownElementDescriptionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getBreakdownElementDescription()
-	 * @generated
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION = 5;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__NAME = CONTENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__GROUP = CONTENT_DESCRIPTION__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__OWNED_RULE = CONTENT_DESCRIPTION__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__BRIEF_DESCRIPTION = CONTENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__ID = CONTENT_DESCRIPTION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__ORDERING_GUIDE = CONTENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__SUPPRESSED = CONTENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__COPYRIGHT = CONTENT_DESCRIPTION__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__AUTHORS = CONTENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__CHANGE_DATE = CONTENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__CHANGE_DESCRIPTION = CONTENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__VERSION = CONTENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__MAIN_DESCRIPTION = CONTENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__KEY_CONSIDERATIONS = CONTENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Section</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__SECTION = CONTENT_DESCRIPTION__SECTION;
-
-	/**
-	 * The feature id for the '<em><b>Usage Guidance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE = CONTENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Breakdown Element Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BREAKDOWN_ELEMENT_DESCRIPTION_FEATURE_COUNT = CONTENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ActivityDescriptionImpl <em>Activity Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ActivityDescriptionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getActivityDescription()
-	 * @generated
-	 */
-	int ACTIVITY_DESCRIPTION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__NAME = BREAKDOWN_ELEMENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__GROUP = BREAKDOWN_ELEMENT_DESCRIPTION__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__OWNED_RULE = BREAKDOWN_ELEMENT_DESCRIPTION__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__BRIEF_DESCRIPTION = BREAKDOWN_ELEMENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__ID = BREAKDOWN_ELEMENT_DESCRIPTION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__ORDERING_GUIDE = BREAKDOWN_ELEMENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__SUPPRESSED = BREAKDOWN_ELEMENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__COPYRIGHT = BREAKDOWN_ELEMENT_DESCRIPTION__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__AUTHORS = BREAKDOWN_ELEMENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__CHANGE_DATE = BREAKDOWN_ELEMENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__CHANGE_DESCRIPTION = BREAKDOWN_ELEMENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__VERSION = BREAKDOWN_ELEMENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__MAIN_DESCRIPTION = BREAKDOWN_ELEMENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__KEY_CONSIDERATIONS = BREAKDOWN_ELEMENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Section</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__SECTION = BREAKDOWN_ELEMENT_DESCRIPTION__SECTION;
-
-	/**
-	 * The feature id for the '<em><b>Usage Guidance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__USAGE_GUIDANCE = BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE;
-
-	/**
-	 * The feature id for the '<em><b>Alternatives</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__ALTERNATIVES = BREAKDOWN_ELEMENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>How To Staff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__HOW_TO_STAFF = BREAKDOWN_ELEMENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION__PURPOSE = BREAKDOWN_ELEMENT_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Activity Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVITY_DESCRIPTION_FEATURE_COUNT = BREAKDOWN_ELEMENT_DESCRIPTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ContentElementImpl <em>Content Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ContentElementImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getContentElement()
-	 * @generated
-	 */
-	int CONTENT_ELEMENT = 14;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__NAME = DESCRIBABLE_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__GROUP = DESCRIBABLE_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__OWNED_RULE = DESCRIBABLE_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__BRIEF_DESCRIPTION = DESCRIBABLE_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__ID = DESCRIBABLE_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__ORDERING_GUIDE = DESCRIBABLE_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__SUPPRESSED = DESCRIBABLE_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__PRESENTATION = DESCRIBABLE_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__NODEICON = DESCRIBABLE_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__PRESENTATION_NAME = DESCRIBABLE_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__SHAPEICON = DESCRIBABLE_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__GROUP1 = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__CHECKLIST = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__CONCEPT = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__EXAMPLE = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__GUIDELINE = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__REUSABLE_ASSET = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__SUPPORTING_MATERIAL = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__WHITEPAPER = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT__VARIABILITY_TYPE = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 9;
-
-	/**
-	 * The number of structural features of the '<em>Content Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_ELEMENT_FEATURE_COUNT = DESCRIBABLE_ELEMENT_FEATURE_COUNT + 10;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.WorkProductImpl <em>Work Product</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.WorkProductImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkProduct()
-	 * @generated
-	 */
-	int WORK_PRODUCT = 80;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__NAME = CONTENT_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__GROUP = CONTENT_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__OWNED_RULE = CONTENT_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__BRIEF_DESCRIPTION = CONTENT_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__ID = CONTENT_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__ORDERING_GUIDE = CONTENT_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__SUPPRESSED = CONTENT_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__PRESENTATION = CONTENT_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__NODEICON = CONTENT_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__PRESENTATION_NAME = CONTENT_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__SHAPEICON = CONTENT_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__GROUP1 = CONTENT_ELEMENT__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__CHECKLIST = CONTENT_ELEMENT__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__CONCEPT = CONTENT_ELEMENT__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__EXAMPLE = CONTENT_ELEMENT__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__GUIDELINE = CONTENT_ELEMENT__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__REUSABLE_ASSET = CONTENT_ELEMENT__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__SUPPORTING_MATERIAL = CONTENT_ELEMENT__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__WHITEPAPER = CONTENT_ELEMENT__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__VARIABILITY_BASED_ON_ELEMENT = CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__VARIABILITY_TYPE = CONTENT_ELEMENT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__GROUP2 = CONTENT_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Estimate</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__ESTIMATE = CONTENT_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Estimation Considerations</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__ESTIMATION_CONSIDERATIONS = CONTENT_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Report</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__REPORT = CONTENT_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Template</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__TEMPLATE = CONTENT_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Tool Mentor</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT__TOOL_MENTOR = CONTENT_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Work Product</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_FEATURE_COUNT = CONTENT_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ArtifactImpl <em>Artifact</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ArtifactImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getArtifact()
-	 * @generated
-	 */
-	int ARTIFACT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__NAME = WORK_PRODUCT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__GROUP = WORK_PRODUCT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__OWNED_RULE = WORK_PRODUCT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__BRIEF_DESCRIPTION = WORK_PRODUCT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__ID = WORK_PRODUCT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__ORDERING_GUIDE = WORK_PRODUCT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__SUPPRESSED = WORK_PRODUCT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__PRESENTATION = WORK_PRODUCT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__NODEICON = WORK_PRODUCT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__PRESENTATION_NAME = WORK_PRODUCT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__SHAPEICON = WORK_PRODUCT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__GROUP1 = WORK_PRODUCT__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__CHECKLIST = WORK_PRODUCT__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__CONCEPT = WORK_PRODUCT__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__EXAMPLE = WORK_PRODUCT__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__GUIDELINE = WORK_PRODUCT__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__REUSABLE_ASSET = WORK_PRODUCT__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__SUPPORTING_MATERIAL = WORK_PRODUCT__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__WHITEPAPER = WORK_PRODUCT__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__VARIABILITY_BASED_ON_ELEMENT = WORK_PRODUCT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__VARIABILITY_TYPE = WORK_PRODUCT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__GROUP2 = WORK_PRODUCT__GROUP2;
-
-	/**
-	 * The feature id for the '<em><b>Estimate</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__ESTIMATE = WORK_PRODUCT__ESTIMATE;
-
-	/**
-	 * The feature id for the '<em><b>Estimation Considerations</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__ESTIMATION_CONSIDERATIONS = WORK_PRODUCT__ESTIMATION_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Report</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__REPORT = WORK_PRODUCT__REPORT;
-
-	/**
-	 * The feature id for the '<em><b>Template</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__TEMPLATE = WORK_PRODUCT__TEMPLATE;
-
-	/**
-	 * The feature id for the '<em><b>Tool Mentor</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__TOOL_MENTOR = WORK_PRODUCT__TOOL_MENTOR;
-
-	/**
-	 * The feature id for the '<em><b>Group3</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__GROUP3 = WORK_PRODUCT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Contained Artifact</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__CONTAINED_ARTIFACT = WORK_PRODUCT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Artifact</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_FEATURE_COUNT = WORK_PRODUCT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.WorkProductDescriptionImpl <em>Work Product Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.WorkProductDescriptionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkProductDescription()
-	 * @generated
-	 */
-	int WORK_PRODUCT_DESCRIPTION = 81;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__NAME = CONTENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__GROUP = CONTENT_DESCRIPTION__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__OWNED_RULE = CONTENT_DESCRIPTION__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__BRIEF_DESCRIPTION = CONTENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__ID = CONTENT_DESCRIPTION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__ORDERING_GUIDE = CONTENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__SUPPRESSED = CONTENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__COPYRIGHT = CONTENT_DESCRIPTION__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__AUTHORS = CONTENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__CHANGE_DATE = CONTENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__CHANGE_DESCRIPTION = CONTENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__VERSION = CONTENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__MAIN_DESCRIPTION = CONTENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__KEY_CONSIDERATIONS = CONTENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Section</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__SECTION = CONTENT_DESCRIPTION__SECTION;
-
-	/**
-	 * The feature id for the '<em><b>Impact Of Not Having</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING = CONTENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__PURPOSE = CONTENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Reasons For Not Needing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING = CONTENT_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>External Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID = CONTENT_DESCRIPTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Work Product Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTION_FEATURE_COUNT = CONTENT_DESCRIPTION_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ArtifactDescriptionImpl <em>Artifact Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ArtifactDescriptionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getArtifactDescription()
-	 * @generated
-	 */
-	int ARTIFACT_DESCRIPTION = 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__NAME = WORK_PRODUCT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__GROUP = WORK_PRODUCT_DESCRIPTION__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__OWNED_RULE = WORK_PRODUCT_DESCRIPTION__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__BRIEF_DESCRIPTION = WORK_PRODUCT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__ID = WORK_PRODUCT_DESCRIPTION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__ORDERING_GUIDE = WORK_PRODUCT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__SUPPRESSED = WORK_PRODUCT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__COPYRIGHT = WORK_PRODUCT_DESCRIPTION__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__AUTHORS = WORK_PRODUCT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__CHANGE_DATE = WORK_PRODUCT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__CHANGE_DESCRIPTION = WORK_PRODUCT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__VERSION = WORK_PRODUCT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__MAIN_DESCRIPTION = WORK_PRODUCT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__KEY_CONSIDERATIONS = WORK_PRODUCT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Section</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__SECTION = WORK_PRODUCT_DESCRIPTION__SECTION;
-
-	/**
-	 * The feature id for the '<em><b>Impact Of Not Having</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__IMPACT_OF_NOT_HAVING = WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING;
-
-	/**
-	 * The feature id for the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__PURPOSE = WORK_PRODUCT_DESCRIPTION__PURPOSE;
-
-	/**
-	 * The feature id for the '<em><b>Reasons For Not Needing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__REASONS_FOR_NOT_NEEDING = WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING;
-
-	/**
-	 * The feature id for the '<em><b>External Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__EXTERNAL_ID = WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID;
-
-	/**
-	 * The feature id for the '<em><b>Brief Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__BRIEF_OUTLINE = WORK_PRODUCT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Representation Options</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS = WORK_PRODUCT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Artifact Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_DESCRIPTION_FEATURE_COUNT = WORK_PRODUCT_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ProcessImpl <em>Process</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ProcessImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getProcess()
-	 * @generated
-	 */
-	int PROCESS = 51;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__NAME = ACTIVITY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__GROUP = ACTIVITY__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__OWNED_RULE = ACTIVITY__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__BRIEF_DESCRIPTION = ACTIVITY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__ID = ACTIVITY__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__ORDERING_GUIDE = ACTIVITY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__SUPPRESSED = ACTIVITY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__PRESENTATION = ACTIVITY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__NODEICON = ACTIVITY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__PRESENTATION_NAME = ACTIVITY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__SHAPEICON = ACTIVITY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__PRESENTED_AFTER = ACTIVITY__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__PRESENTED_BEFORE = ACTIVITY__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__PLANNING_DATA = ACTIVITY__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__SUPER_ACTIVITY = ACTIVITY__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__HAS_MULTIPLE_OCCURRENCES = ACTIVITY__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__IS_OPTIONAL = ACTIVITY__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__IS_PLANNED = ACTIVITY__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__PREFIX = ACTIVITY__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__GROUP1 = ACTIVITY__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__PREDECESSOR = ACTIVITY__PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__IS_EVENT_DRIVEN = ACTIVITY__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__IS_ONGOING = ACTIVITY__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__IS_REPEATABLE = ACTIVITY__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__PRECONDITION = ACTIVITY__PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__POSTCONDITION = ACTIVITY__POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__GROUP2 = ACTIVITY__GROUP2;
-
-	/**
-	 * The feature id for the '<em><b>Breakdown Element</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__BREAKDOWN_ELEMENT = ACTIVITY__BREAKDOWN_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__CHECKLIST = ACTIVITY__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__CONCEPT = ACTIVITY__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__EXAMPLE = ACTIVITY__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__GUIDELINE = ACTIVITY__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Roadmap</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__ROADMAP = ACTIVITY__ROADMAP;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__REUSABLE_ASSET = ACTIVITY__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__SUPPORTING_MATERIAL = ACTIVITY__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__WHITEPAPER = ACTIVITY__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Is Enactable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__IS_ENACTABLE = ACTIVITY__IS_ENACTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__VARIABILITY_BASED_ON_ELEMENT = ACTIVITY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__VARIABILITY_TYPE = ACTIVITY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Includes Pattern</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__INCLUDES_PATTERN = ACTIVITY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Default Context</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__DEFAULT_CONTEXT = ACTIVITY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Valid Context</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS__VALID_CONTEXT = ACTIVITY_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Process</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_FEATURE_COUNT = ACTIVITY_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.CapabilityPatternImpl <em>Capability Pattern</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.CapabilityPatternImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getCapabilityPattern()
-	 * @generated
-	 */
-	int CAPABILITY_PATTERN = 6;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__NAME = PROCESS__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__GROUP = PROCESS__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__OWNED_RULE = PROCESS__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__BRIEF_DESCRIPTION = PROCESS__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__ID = PROCESS__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__ORDERING_GUIDE = PROCESS__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__SUPPRESSED = PROCESS__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__PRESENTATION = PROCESS__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__NODEICON = PROCESS__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__PRESENTATION_NAME = PROCESS__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__SHAPEICON = PROCESS__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__PRESENTED_AFTER = PROCESS__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__PRESENTED_BEFORE = PROCESS__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__PLANNING_DATA = PROCESS__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__SUPER_ACTIVITY = PROCESS__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__HAS_MULTIPLE_OCCURRENCES = PROCESS__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__IS_OPTIONAL = PROCESS__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__IS_PLANNED = PROCESS__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__PREFIX = PROCESS__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__GROUP1 = PROCESS__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__PREDECESSOR = PROCESS__PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__IS_EVENT_DRIVEN = PROCESS__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__IS_ONGOING = PROCESS__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__IS_REPEATABLE = PROCESS__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__PRECONDITION = PROCESS__PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__POSTCONDITION = PROCESS__POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__GROUP2 = PROCESS__GROUP2;
-
-	/**
-	 * The feature id for the '<em><b>Breakdown Element</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__BREAKDOWN_ELEMENT = PROCESS__BREAKDOWN_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__CHECKLIST = PROCESS__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__CONCEPT = PROCESS__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__EXAMPLE = PROCESS__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__GUIDELINE = PROCESS__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Roadmap</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__ROADMAP = PROCESS__ROADMAP;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__REUSABLE_ASSET = PROCESS__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__SUPPORTING_MATERIAL = PROCESS__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__WHITEPAPER = PROCESS__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Is Enactable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__IS_ENACTABLE = PROCESS__IS_ENACTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__VARIABILITY_BASED_ON_ELEMENT = PROCESS__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__VARIABILITY_TYPE = PROCESS__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Includes Pattern</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__INCLUDES_PATTERN = PROCESS__INCLUDES_PATTERN;
-
-	/**
-	 * The feature id for the '<em><b>Default Context</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__DEFAULT_CONTEXT = PROCESS__DEFAULT_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Valid Context</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN__VALID_CONTEXT = PROCESS__VALID_CONTEXT;
-
-	/**
-	 * The number of structural features of the '<em>Capability Pattern</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CAPABILITY_PATTERN_FEATURE_COUNT = PROCESS_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.GuidanceImpl <em>Guidance</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.GuidanceImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getGuidance()
-	 * @generated
-	 */
-	int GUIDANCE = 33;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__NAME = CONTENT_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__GROUP = CONTENT_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__OWNED_RULE = CONTENT_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__BRIEF_DESCRIPTION = CONTENT_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__ID = CONTENT_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__ORDERING_GUIDE = CONTENT_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__SUPPRESSED = CONTENT_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__PRESENTATION = CONTENT_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__NODEICON = CONTENT_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__PRESENTATION_NAME = CONTENT_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__SHAPEICON = CONTENT_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__GROUP1 = CONTENT_ELEMENT__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__CHECKLIST = CONTENT_ELEMENT__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__CONCEPT = CONTENT_ELEMENT__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__EXAMPLE = CONTENT_ELEMENT__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__GUIDELINE = CONTENT_ELEMENT__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__REUSABLE_ASSET = CONTENT_ELEMENT__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__SUPPORTING_MATERIAL = CONTENT_ELEMENT__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__WHITEPAPER = CONTENT_ELEMENT__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__VARIABILITY_BASED_ON_ELEMENT = CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE__VARIABILITY_TYPE = CONTENT_ELEMENT__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Guidance</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_FEATURE_COUNT = CONTENT_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ChecklistImpl <em>Checklist</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ChecklistImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getChecklist()
-	 * @generated
-	 */
-	int CHECKLIST = 7;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__GROUP = GUIDANCE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__OWNED_RULE = GUIDANCE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__ID = GUIDANCE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__GROUP1 = GUIDANCE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__CHECKLIST = GUIDANCE__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__CONCEPT = GUIDANCE__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__EXAMPLE = GUIDANCE__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__GUIDELINE = GUIDANCE__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__REUSABLE_ASSET = GUIDANCE__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__SUPPORTING_MATERIAL = GUIDANCE__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__WHITEPAPER = GUIDANCE__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Checklist</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECKLIST_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.DescriptorImpl <em>Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.DescriptorImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDescriptor()
-	 * @generated
-	 */
-	int DESCRIPTOR = 22;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__NAME = BREAKDOWN_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__GROUP = BREAKDOWN_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__OWNED_RULE = BREAKDOWN_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__BRIEF_DESCRIPTION = BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__ID = BREAKDOWN_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__ORDERING_GUIDE = BREAKDOWN_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__SUPPRESSED = BREAKDOWN_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__PRESENTATION = BREAKDOWN_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__NODEICON = BREAKDOWN_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__PRESENTATION_NAME = BREAKDOWN_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__SHAPEICON = BREAKDOWN_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__PRESENTED_AFTER = BREAKDOWN_ELEMENT__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__PRESENTED_BEFORE = BREAKDOWN_ELEMENT__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__PLANNING_DATA = BREAKDOWN_ELEMENT__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__SUPER_ACTIVITY = BREAKDOWN_ELEMENT__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES = BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__IS_OPTIONAL = BREAKDOWN_ELEMENT__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__IS_PLANNED = BREAKDOWN_ELEMENT__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__PREFIX = BREAKDOWN_ELEMENT__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Synchronized With Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE = BREAKDOWN_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_FEATURE_COUNT = BREAKDOWN_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.RoleDescriptorImpl <em>Role Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.RoleDescriptorImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getRoleDescriptor()
-	 * @generated
-	 */
-	int ROLE_DESCRIPTOR = 63;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__NAME = DESCRIPTOR__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__GROUP = DESCRIPTOR__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__OWNED_RULE = DESCRIPTOR__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__BRIEF_DESCRIPTION = DESCRIPTOR__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__ID = DESCRIPTOR__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__ORDERING_GUIDE = DESCRIPTOR__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__SUPPRESSED = DESCRIPTOR__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__PRESENTATION = DESCRIPTOR__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__NODEICON = DESCRIPTOR__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__PRESENTATION_NAME = DESCRIPTOR__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__SHAPEICON = DESCRIPTOR__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__PRESENTED_AFTER = DESCRIPTOR__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__PRESENTED_BEFORE = DESCRIPTOR__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__PLANNING_DATA = DESCRIPTOR__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__SUPER_ACTIVITY = DESCRIPTOR__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES = DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__IS_OPTIONAL = DESCRIPTOR__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__IS_PLANNED = DESCRIPTOR__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__PREFIX = DESCRIPTOR__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Synchronized With Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE = DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Role</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__ROLE = DESCRIPTOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Responsible For</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR__RESPONSIBLE_FOR = DESCRIPTOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Role Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTOR_FEATURE_COUNT = DESCRIPTOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.CompositeRoleImpl <em>Composite Role</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.CompositeRoleImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getCompositeRole()
-	 * @generated
-	 */
-	int COMPOSITE_ROLE = 8;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__NAME = ROLE_DESCRIPTOR__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__GROUP = ROLE_DESCRIPTOR__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__OWNED_RULE = ROLE_DESCRIPTOR__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__BRIEF_DESCRIPTION = ROLE_DESCRIPTOR__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__ID = ROLE_DESCRIPTOR__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__ORDERING_GUIDE = ROLE_DESCRIPTOR__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__SUPPRESSED = ROLE_DESCRIPTOR__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__PRESENTATION = ROLE_DESCRIPTOR__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__NODEICON = ROLE_DESCRIPTOR__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__PRESENTATION_NAME = ROLE_DESCRIPTOR__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__SHAPEICON = ROLE_DESCRIPTOR__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__PRESENTED_AFTER = ROLE_DESCRIPTOR__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__PRESENTED_BEFORE = ROLE_DESCRIPTOR__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__PLANNING_DATA = ROLE_DESCRIPTOR__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__SUPER_ACTIVITY = ROLE_DESCRIPTOR__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__HAS_MULTIPLE_OCCURRENCES = ROLE_DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__IS_OPTIONAL = ROLE_DESCRIPTOR__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__IS_PLANNED = ROLE_DESCRIPTOR__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__PREFIX = ROLE_DESCRIPTOR__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Synchronized With Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__IS_SYNCHRONIZED_WITH_SOURCE = ROLE_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Role</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__ROLE = ROLE_DESCRIPTOR__ROLE;
-
-	/**
-	 * The feature id for the '<em><b>Responsible For</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__RESPONSIBLE_FOR = ROLE_DESCRIPTOR__RESPONSIBLE_FOR;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__GROUP1 = ROLE_DESCRIPTOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Aggregated Role</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE__AGGREGATED_ROLE = ROLE_DESCRIPTOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Composite Role</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_ROLE_FEATURE_COUNT = ROLE_DESCRIPTOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ConceptImpl <em>Concept</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ConceptImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getConcept()
-	 * @generated
-	 */
-	int CONCEPT = 9;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__GROUP = GUIDANCE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__OWNED_RULE = GUIDANCE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__ID = GUIDANCE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__GROUP1 = GUIDANCE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__CHECKLIST = GUIDANCE__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__CONCEPT = GUIDANCE__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__EXAMPLE = GUIDANCE__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__GUIDELINE = GUIDANCE__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__REUSABLE_ASSET = GUIDANCE__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__SUPPORTING_MATERIAL = GUIDANCE__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__WHITEPAPER = GUIDANCE__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Concept</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONCEPT_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ConstraintImpl <em>Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ConstraintImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getConstraint()
-	 * @generated
-	 */
-	int CONSTRAINT = 10;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__NAME = METHOD_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__GROUP = METHOD_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__OWNED_RULE = METHOD_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__BRIEF_DESCRIPTION = METHOD_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__ID = METHOD_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__ORDERING_GUIDE = METHOD_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__SUPPRESSED = METHOD_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__MAIN_DESCRIPTION = METHOD_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT_FEATURE_COUNT = METHOD_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ContentCategoryImpl <em>Content Category</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ContentCategoryImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getContentCategory()
-	 * @generated
-	 */
-	int CONTENT_CATEGORY = 11;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__NAME = CONTENT_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__GROUP = CONTENT_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__OWNED_RULE = CONTENT_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__BRIEF_DESCRIPTION = CONTENT_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__ID = CONTENT_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__ORDERING_GUIDE = CONTENT_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__SUPPRESSED = CONTENT_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__PRESENTATION = CONTENT_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__NODEICON = CONTENT_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__PRESENTATION_NAME = CONTENT_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__SHAPEICON = CONTENT_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__GROUP1 = CONTENT_ELEMENT__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__CHECKLIST = CONTENT_ELEMENT__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__CONCEPT = CONTENT_ELEMENT__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__EXAMPLE = CONTENT_ELEMENT__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__GUIDELINE = CONTENT_ELEMENT__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__REUSABLE_ASSET = CONTENT_ELEMENT__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__SUPPORTING_MATERIAL = CONTENT_ELEMENT__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__WHITEPAPER = CONTENT_ELEMENT__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT = CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY__VARIABILITY_TYPE = CONTENT_ELEMENT__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Content Category</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_FEATURE_COUNT = CONTENT_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.MethodPackageImpl <em>Method Package</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.MethodPackageImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getMethodPackage()
-	 * @generated
-	 */
-	int METHOD_PACKAGE = 40;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__NAME = METHOD_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__GROUP = METHOD_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__OWNED_RULE = METHOD_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__BRIEF_DESCRIPTION = METHOD_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__ID = METHOD_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__ORDERING_GUIDE = METHOD_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__SUPPRESSED = METHOD_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__GROUP1 = METHOD_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Reused Package</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__REUSED_PACKAGE = METHOD_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Method Package</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__METHOD_PACKAGE = METHOD_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Global</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE__GLOBAL = METHOD_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Method Package</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PACKAGE_FEATURE_COUNT = METHOD_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ContentCategoryPackageImpl <em>Content Category Package</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ContentCategoryPackageImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getContentCategoryPackage()
-	 * @generated
-	 */
-	int CONTENT_CATEGORY_PACKAGE = 12;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_PACKAGE__NAME = METHOD_PACKAGE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_PACKAGE__GROUP = METHOD_PACKAGE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_PACKAGE__OWNED_RULE = METHOD_PACKAGE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_PACKAGE__BRIEF_DESCRIPTION = METHOD_PACKAGE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_PACKAGE__ID = METHOD_PACKAGE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_PACKAGE__ORDERING_GUIDE = METHOD_PACKAGE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_PACKAGE__SUPPRESSED = METHOD_PACKAGE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_PACKAGE__GROUP1 = METHOD_PACKAGE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Reused Package</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_PACKAGE__REUSED_PACKAGE = METHOD_PACKAGE__REUSED_PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Method Package</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_PACKAGE__METHOD_PACKAGE = METHOD_PACKAGE__METHOD_PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Global</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_PACKAGE__GLOBAL = METHOD_PACKAGE__GLOBAL;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_PACKAGE__GROUP2 = METHOD_PACKAGE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Content Category</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_PACKAGE__CONTENT_CATEGORY = METHOD_PACKAGE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Content Category Package</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_CATEGORY_PACKAGE_FEATURE_COUNT = METHOD_PACKAGE_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ContentPackageImpl <em>Content Package</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ContentPackageImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getContentPackage()
-	 * @generated
-	 */
-	int CONTENT_PACKAGE = 15;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__NAME = METHOD_PACKAGE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__GROUP = METHOD_PACKAGE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__OWNED_RULE = METHOD_PACKAGE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__BRIEF_DESCRIPTION = METHOD_PACKAGE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__ID = METHOD_PACKAGE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__ORDERING_GUIDE = METHOD_PACKAGE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__SUPPRESSED = METHOD_PACKAGE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__GROUP1 = METHOD_PACKAGE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Reused Package</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__REUSED_PACKAGE = METHOD_PACKAGE__REUSED_PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Method Package</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__METHOD_PACKAGE = METHOD_PACKAGE__METHOD_PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Global</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__GLOBAL = METHOD_PACKAGE__GLOBAL;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__GROUP2 = METHOD_PACKAGE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Content Element</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE__CONTENT_ELEMENT = METHOD_PACKAGE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Content Package</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTENT_PACKAGE_FEATURE_COUNT = METHOD_PACKAGE_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.CustomCategoryImpl <em>Custom Category</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.CustomCategoryImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getCustomCategory()
-	 * @generated
-	 */
-	int CUSTOM_CATEGORY = 16;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__GROUP = CONTENT_CATEGORY__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__OWNED_RULE = CONTENT_CATEGORY__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__ID = CONTENT_CATEGORY__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__GROUP1 = CONTENT_CATEGORY__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__CHECKLIST = CONTENT_CATEGORY__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__CONCEPT = CONTENT_CATEGORY__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__EXAMPLE = CONTENT_CATEGORY__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__GUIDELINE = CONTENT_CATEGORY__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__REUSABLE_ASSET = CONTENT_CATEGORY__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__SUPPORTING_MATERIAL = CONTENT_CATEGORY__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__WHITEPAPER = CONTENT_CATEGORY__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__GROUP2 = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Categorized Element</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__CATEGORIZED_ELEMENT = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Sub Category</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY__SUB_CATEGORY = CONTENT_CATEGORY_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Custom Category</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CATEGORY_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.DeliverableImpl <em>Deliverable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.DeliverableImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDeliverable()
-	 * @generated
-	 */
-	int DELIVERABLE = 17;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__NAME = WORK_PRODUCT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__GROUP = WORK_PRODUCT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__OWNED_RULE = WORK_PRODUCT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__BRIEF_DESCRIPTION = WORK_PRODUCT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__ID = WORK_PRODUCT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__ORDERING_GUIDE = WORK_PRODUCT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__SUPPRESSED = WORK_PRODUCT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__PRESENTATION = WORK_PRODUCT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__NODEICON = WORK_PRODUCT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__PRESENTATION_NAME = WORK_PRODUCT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__SHAPEICON = WORK_PRODUCT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__GROUP1 = WORK_PRODUCT__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__CHECKLIST = WORK_PRODUCT__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__CONCEPT = WORK_PRODUCT__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__EXAMPLE = WORK_PRODUCT__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__GUIDELINE = WORK_PRODUCT__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__REUSABLE_ASSET = WORK_PRODUCT__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__SUPPORTING_MATERIAL = WORK_PRODUCT__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__WHITEPAPER = WORK_PRODUCT__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__VARIABILITY_BASED_ON_ELEMENT = WORK_PRODUCT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__VARIABILITY_TYPE = WORK_PRODUCT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__GROUP2 = WORK_PRODUCT__GROUP2;
-
-	/**
-	 * The feature id for the '<em><b>Estimate</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__ESTIMATE = WORK_PRODUCT__ESTIMATE;
-
-	/**
-	 * The feature id for the '<em><b>Estimation Considerations</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__ESTIMATION_CONSIDERATIONS = WORK_PRODUCT__ESTIMATION_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Report</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__REPORT = WORK_PRODUCT__REPORT;
-
-	/**
-	 * The feature id for the '<em><b>Template</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__TEMPLATE = WORK_PRODUCT__TEMPLATE;
-
-	/**
-	 * The feature id for the '<em><b>Tool Mentor</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__TOOL_MENTOR = WORK_PRODUCT__TOOL_MENTOR;
-
-	/**
-	 * The feature id for the '<em><b>Group3</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__GROUP3 = WORK_PRODUCT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Delivered Work Product</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE__DELIVERED_WORK_PRODUCT = WORK_PRODUCT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Deliverable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_FEATURE_COUNT = WORK_PRODUCT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.DeliverableDescriptionImpl <em>Deliverable Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.DeliverableDescriptionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDeliverableDescription()
-	 * @generated
-	 */
-	int DELIVERABLE_DESCRIPTION = 18;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__NAME = WORK_PRODUCT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__GROUP = WORK_PRODUCT_DESCRIPTION__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__OWNED_RULE = WORK_PRODUCT_DESCRIPTION__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__BRIEF_DESCRIPTION = WORK_PRODUCT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__ID = WORK_PRODUCT_DESCRIPTION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__ORDERING_GUIDE = WORK_PRODUCT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__SUPPRESSED = WORK_PRODUCT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__COPYRIGHT = WORK_PRODUCT_DESCRIPTION__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__AUTHORS = WORK_PRODUCT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__CHANGE_DATE = WORK_PRODUCT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__CHANGE_DESCRIPTION = WORK_PRODUCT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__VERSION = WORK_PRODUCT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__MAIN_DESCRIPTION = WORK_PRODUCT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__KEY_CONSIDERATIONS = WORK_PRODUCT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Section</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__SECTION = WORK_PRODUCT_DESCRIPTION__SECTION;
-
-	/**
-	 * The feature id for the '<em><b>Impact Of Not Having</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__IMPACT_OF_NOT_HAVING = WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING;
-
-	/**
-	 * The feature id for the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__PURPOSE = WORK_PRODUCT_DESCRIPTION__PURPOSE;
-
-	/**
-	 * The feature id for the '<em><b>Reasons For Not Needing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__REASONS_FOR_NOT_NEEDING = WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING;
-
-	/**
-	 * The feature id for the '<em><b>External Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__EXTERNAL_ID = WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID;
-
-	/**
-	 * The feature id for the '<em><b>External Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION = WORK_PRODUCT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Packaging Guidance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE = WORK_PRODUCT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Deliverable Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERABLE_DESCRIPTION_FEATURE_COUNT = WORK_PRODUCT_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.DeliveryProcessImpl <em>Delivery Process</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.DeliveryProcessImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDeliveryProcess()
-	 * @generated
-	 */
-	int DELIVERY_PROCESS = 19;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__NAME = PROCESS__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__GROUP = PROCESS__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__OWNED_RULE = PROCESS__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__BRIEF_DESCRIPTION = PROCESS__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__ID = PROCESS__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__ORDERING_GUIDE = PROCESS__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__SUPPRESSED = PROCESS__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__PRESENTATION = PROCESS__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__NODEICON = PROCESS__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__PRESENTATION_NAME = PROCESS__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__SHAPEICON = PROCESS__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__PRESENTED_AFTER = PROCESS__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__PRESENTED_BEFORE = PROCESS__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__PLANNING_DATA = PROCESS__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__SUPER_ACTIVITY = PROCESS__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__HAS_MULTIPLE_OCCURRENCES = PROCESS__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__IS_OPTIONAL = PROCESS__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__IS_PLANNED = PROCESS__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__PREFIX = PROCESS__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__GROUP1 = PROCESS__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__PREDECESSOR = PROCESS__PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__IS_EVENT_DRIVEN = PROCESS__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__IS_ONGOING = PROCESS__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__IS_REPEATABLE = PROCESS__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__PRECONDITION = PROCESS__PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__POSTCONDITION = PROCESS__POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__GROUP2 = PROCESS__GROUP2;
-
-	/**
-	 * The feature id for the '<em><b>Breakdown Element</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__BREAKDOWN_ELEMENT = PROCESS__BREAKDOWN_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__CHECKLIST = PROCESS__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__CONCEPT = PROCESS__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__EXAMPLE = PROCESS__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__GUIDELINE = PROCESS__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Roadmap</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__ROADMAP = PROCESS__ROADMAP;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__REUSABLE_ASSET = PROCESS__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__SUPPORTING_MATERIAL = PROCESS__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__WHITEPAPER = PROCESS__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Is Enactable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__IS_ENACTABLE = PROCESS__IS_ENACTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__VARIABILITY_BASED_ON_ELEMENT = PROCESS__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__VARIABILITY_TYPE = PROCESS__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Includes Pattern</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__INCLUDES_PATTERN = PROCESS__INCLUDES_PATTERN;
-
-	/**
-	 * The feature id for the '<em><b>Default Context</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__DEFAULT_CONTEXT = PROCESS__DEFAULT_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Valid Context</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__VALID_CONTEXT = PROCESS__VALID_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Group3</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__GROUP3 = PROCESS_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Communications Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__COMMUNICATIONS_MATERIAL = PROCESS_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Education Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS__EDUCATION_MATERIAL = PROCESS_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Delivery Process</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_FEATURE_COUNT = PROCESS_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ProcessDescriptionImpl <em>Process Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ProcessDescriptionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getProcessDescription()
-	 * @generated
-	 */
-	int PROCESS_DESCRIPTION = 54;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__NAME = ACTIVITY_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__GROUP = ACTIVITY_DESCRIPTION__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__OWNED_RULE = ACTIVITY_DESCRIPTION__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__BRIEF_DESCRIPTION = ACTIVITY_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__ID = ACTIVITY_DESCRIPTION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__ORDERING_GUIDE = ACTIVITY_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__SUPPRESSED = ACTIVITY_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__COPYRIGHT = ACTIVITY_DESCRIPTION__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__AUTHORS = ACTIVITY_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__CHANGE_DATE = ACTIVITY_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__CHANGE_DESCRIPTION = ACTIVITY_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__VERSION = ACTIVITY_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__MAIN_DESCRIPTION = ACTIVITY_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__KEY_CONSIDERATIONS = ACTIVITY_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Section</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__SECTION = ACTIVITY_DESCRIPTION__SECTION;
-
-	/**
-	 * The feature id for the '<em><b>Usage Guidance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__USAGE_GUIDANCE = ACTIVITY_DESCRIPTION__USAGE_GUIDANCE;
-
-	/**
-	 * The feature id for the '<em><b>Alternatives</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__ALTERNATIVES = ACTIVITY_DESCRIPTION__ALTERNATIVES;
-
-	/**
-	 * The feature id for the '<em><b>How To Staff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__HOW_TO_STAFF = ACTIVITY_DESCRIPTION__HOW_TO_STAFF;
-
-	/**
-	 * The feature id for the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__PURPOSE = ACTIVITY_DESCRIPTION__PURPOSE;
-
-	/**
-	 * The feature id for the '<em><b>Scope</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__SCOPE = ACTIVITY_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Usage Notes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__USAGE_NOTES = ACTIVITY_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>External Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION__EXTERNAL_ID = ACTIVITY_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Process Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_DESCRIPTION_FEATURE_COUNT = ACTIVITY_DESCRIPTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.DeliveryProcessDescriptionImpl <em>Delivery Process Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.DeliveryProcessDescriptionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDeliveryProcessDescription()
-	 * @generated
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION = 20;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__NAME = PROCESS_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__GROUP = PROCESS_DESCRIPTION__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__OWNED_RULE = PROCESS_DESCRIPTION__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__BRIEF_DESCRIPTION = PROCESS_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__ID = PROCESS_DESCRIPTION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__ORDERING_GUIDE = PROCESS_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__SUPPRESSED = PROCESS_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__COPYRIGHT = PROCESS_DESCRIPTION__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__AUTHORS = PROCESS_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__CHANGE_DATE = PROCESS_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__CHANGE_DESCRIPTION = PROCESS_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__VERSION = PROCESS_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__MAIN_DESCRIPTION = PROCESS_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__KEY_CONSIDERATIONS = PROCESS_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Section</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__SECTION = PROCESS_DESCRIPTION__SECTION;
-
-	/**
-	 * The feature id for the '<em><b>Usage Guidance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__USAGE_GUIDANCE = PROCESS_DESCRIPTION__USAGE_GUIDANCE;
-
-	/**
-	 * The feature id for the '<em><b>Alternatives</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__ALTERNATIVES = PROCESS_DESCRIPTION__ALTERNATIVES;
-
-	/**
-	 * The feature id for the '<em><b>How To Staff</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__HOW_TO_STAFF = PROCESS_DESCRIPTION__HOW_TO_STAFF;
-
-	/**
-	 * The feature id for the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__PURPOSE = PROCESS_DESCRIPTION__PURPOSE;
-
-	/**
-	 * The feature id for the '<em><b>Scope</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__SCOPE = PROCESS_DESCRIPTION__SCOPE;
-
-	/**
-	 * The feature id for the '<em><b>Usage Notes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__USAGE_NOTES = PROCESS_DESCRIPTION__USAGE_NOTES;
-
-	/**
-	 * The feature id for the '<em><b>External Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__EXTERNAL_ID = PROCESS_DESCRIPTION__EXTERNAL_ID;
-
-	/**
-	 * The feature id for the '<em><b>Scale</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__SCALE = PROCESS_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Project Characteristics</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS = PROCESS_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Risk Level</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL = PROCESS_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Estimating Technique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE = PROCESS_DESCRIPTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Project Member Expertise</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE = PROCESS_DESCRIPTION_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Type Of Contract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT = PROCESS_DESCRIPTION_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Delivery Process Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELIVERY_PROCESS_DESCRIPTION_FEATURE_COUNT = PROCESS_DESCRIPTION_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.DescriptorDescriptionImpl <em>Descriptor Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.DescriptorDescriptionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDescriptorDescription()
-	 * @generated
-	 */
-	int DESCRIPTOR_DESCRIPTION = 23;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__NAME = BREAKDOWN_ELEMENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__GROUP = BREAKDOWN_ELEMENT_DESCRIPTION__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__OWNED_RULE = BREAKDOWN_ELEMENT_DESCRIPTION__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__BRIEF_DESCRIPTION = BREAKDOWN_ELEMENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__ID = BREAKDOWN_ELEMENT_DESCRIPTION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__ORDERING_GUIDE = BREAKDOWN_ELEMENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__SUPPRESSED = BREAKDOWN_ELEMENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__COPYRIGHT = BREAKDOWN_ELEMENT_DESCRIPTION__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__AUTHORS = BREAKDOWN_ELEMENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__CHANGE_DATE = BREAKDOWN_ELEMENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__CHANGE_DESCRIPTION = BREAKDOWN_ELEMENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__VERSION = BREAKDOWN_ELEMENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__MAIN_DESCRIPTION = BREAKDOWN_ELEMENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__KEY_CONSIDERATIONS = BREAKDOWN_ELEMENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Section</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__SECTION = BREAKDOWN_ELEMENT_DESCRIPTION__SECTION;
-
-	/**
-	 * The feature id for the '<em><b>Usage Guidance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__USAGE_GUIDANCE = BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE;
-
-	/**
-	 * The feature id for the '<em><b>Refined Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION = BREAKDOWN_ELEMENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Descriptor Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTOR_DESCRIPTION_FEATURE_COUNT = BREAKDOWN_ELEMENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.DisciplineImpl <em>Discipline</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.DisciplineImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDiscipline()
-	 * @generated
-	 */
-	int DISCIPLINE = 24;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__GROUP = CONTENT_CATEGORY__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__OWNED_RULE = CONTENT_CATEGORY__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__ID = CONTENT_CATEGORY__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__GROUP1 = CONTENT_CATEGORY__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__CHECKLIST = CONTENT_CATEGORY__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__CONCEPT = CONTENT_CATEGORY__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__EXAMPLE = CONTENT_CATEGORY__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__GUIDELINE = CONTENT_CATEGORY__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__REUSABLE_ASSET = CONTENT_CATEGORY__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__SUPPORTING_MATERIAL = CONTENT_CATEGORY__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__WHITEPAPER = CONTENT_CATEGORY__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__GROUP2 = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Task</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__TASK = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Sub Discipline</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__SUB_DISCIPLINE = CONTENT_CATEGORY_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Reference Workflow</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE__REFERENCE_WORKFLOW = CONTENT_CATEGORY_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Discipline</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.DisciplineGroupingImpl <em>Discipline Grouping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.DisciplineGroupingImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDisciplineGrouping()
-	 * @generated
-	 */
-	int DISCIPLINE_GROUPING = 25;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__GROUP = CONTENT_CATEGORY__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__OWNED_RULE = CONTENT_CATEGORY__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__ID = CONTENT_CATEGORY__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__GROUP1 = CONTENT_CATEGORY__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__CHECKLIST = CONTENT_CATEGORY__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__CONCEPT = CONTENT_CATEGORY__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__EXAMPLE = CONTENT_CATEGORY__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__GUIDELINE = CONTENT_CATEGORY__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__REUSABLE_ASSET = CONTENT_CATEGORY__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__SUPPORTING_MATERIAL = CONTENT_CATEGORY__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__WHITEPAPER = CONTENT_CATEGORY__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__GROUP2 = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Discipline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING__DISCIPLINE = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Discipline Grouping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISCIPLINE_GROUPING_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.DocumentRootImpl <em>Document Root</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.DocumentRootImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDocumentRoot()
-	 * @generated
-	 */
-	int DOCUMENT_ROOT = 26;
-
-	/**
-	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__MIXED = 0;
-
-	/**
-	 * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
-
-	/**
-	 * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Method Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__METHOD_CONFIGURATION = 3;
-
-	/**
-	 * The feature id for the '<em><b>Method Library</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__METHOD_LIBRARY = 4;
-
-	/**
-	 * The feature id for the '<em><b>Method Plugin</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__METHOD_PLUGIN = 5;
-
-	/**
-	 * The number of structural features of the '<em>Document Root</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.DomainImpl <em>Domain</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.DomainImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDomain()
-	 * @generated
-	 */
-	int DOMAIN = 27;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__GROUP = CONTENT_CATEGORY__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__OWNED_RULE = CONTENT_CATEGORY__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__ID = CONTENT_CATEGORY__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__GROUP1 = CONTENT_CATEGORY__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__CHECKLIST = CONTENT_CATEGORY__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__CONCEPT = CONTENT_CATEGORY__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__EXAMPLE = CONTENT_CATEGORY__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__GUIDELINE = CONTENT_CATEGORY__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__REUSABLE_ASSET = CONTENT_CATEGORY__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__SUPPORTING_MATERIAL = CONTENT_CATEGORY__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__WHITEPAPER = CONTENT_CATEGORY__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__GROUP2 = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Work Product</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__WORK_PRODUCT = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Subdomain</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN__SUBDOMAIN = CONTENT_CATEGORY_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Domain</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.EstimateImpl <em>Estimate</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.EstimateImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getEstimate()
-	 * @generated
-	 */
-	int ESTIMATE = 29;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__GROUP = GUIDANCE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__OWNED_RULE = GUIDANCE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__ID = GUIDANCE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__GROUP1 = GUIDANCE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__CHECKLIST = GUIDANCE__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__CONCEPT = GUIDANCE__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__EXAMPLE = GUIDANCE__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__GUIDELINE = GUIDANCE__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__REUSABLE_ASSET = GUIDANCE__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__SUPPORTING_MATERIAL = GUIDANCE__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__WHITEPAPER = GUIDANCE__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__GROUP2 = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Estimation Metric</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__ESTIMATION_METRIC = GUIDANCE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Estimation Considerations</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE__ESTIMATION_CONSIDERATIONS = GUIDANCE_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Estimate</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATE_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.EstimatingMetricImpl <em>Estimating Metric</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.EstimatingMetricImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getEstimatingMetric()
-	 * @generated
-	 */
-	int ESTIMATING_METRIC = 30;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__GROUP = GUIDANCE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__OWNED_RULE = GUIDANCE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__ID = GUIDANCE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__GROUP1 = GUIDANCE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__CHECKLIST = GUIDANCE__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__CONCEPT = GUIDANCE__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__EXAMPLE = GUIDANCE__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__GUIDELINE = GUIDANCE__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__REUSABLE_ASSET = GUIDANCE__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__SUPPORTING_MATERIAL = GUIDANCE__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__WHITEPAPER = GUIDANCE__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Estimating Metric</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATING_METRIC_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.EstimationConsiderationsImpl <em>Estimation Considerations</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.EstimationConsiderationsImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getEstimationConsiderations()
-	 * @generated
-	 */
-	int ESTIMATION_CONSIDERATIONS = 31;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__GROUP = GUIDANCE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__OWNED_RULE = GUIDANCE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__ID = GUIDANCE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__GROUP1 = GUIDANCE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__CHECKLIST = GUIDANCE__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__CONCEPT = GUIDANCE__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__EXAMPLE = GUIDANCE__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__GUIDELINE = GUIDANCE__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__REUSABLE_ASSET = GUIDANCE__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__SUPPORTING_MATERIAL = GUIDANCE__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__WHITEPAPER = GUIDANCE__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Estimation Considerations</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ESTIMATION_CONSIDERATIONS_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ExampleImpl <em>Example</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ExampleImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getExample()
-	 * @generated
-	 */
-	int EXAMPLE = 32;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__GROUP = GUIDANCE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__OWNED_RULE = GUIDANCE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__ID = GUIDANCE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__GROUP1 = GUIDANCE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__CHECKLIST = GUIDANCE__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__CONCEPT = GUIDANCE__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__EXAMPLE = GUIDANCE__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__GUIDELINE = GUIDANCE__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__REUSABLE_ASSET = GUIDANCE__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__SUPPORTING_MATERIAL = GUIDANCE__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__WHITEPAPER = GUIDANCE__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Example</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXAMPLE_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.GuidanceDescriptionImpl <em>Guidance Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.GuidanceDescriptionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getGuidanceDescription()
-	 * @generated
-	 */
-	int GUIDANCE_DESCRIPTION = 34;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__NAME = CONTENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__GROUP = CONTENT_DESCRIPTION__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__OWNED_RULE = CONTENT_DESCRIPTION__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__BRIEF_DESCRIPTION = CONTENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__ID = CONTENT_DESCRIPTION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__ORDERING_GUIDE = CONTENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__SUPPRESSED = CONTENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__COPYRIGHT = CONTENT_DESCRIPTION__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__AUTHORS = CONTENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__CHANGE_DATE = CONTENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__CHANGE_DESCRIPTION = CONTENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__VERSION = CONTENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__MAIN_DESCRIPTION = CONTENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__KEY_CONSIDERATIONS = CONTENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Section</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__SECTION = CONTENT_DESCRIPTION__SECTION;
-
-	/**
-	 * The feature id for the '<em><b>Attachment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION__ATTACHMENT = CONTENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Guidance Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDANCE_DESCRIPTION_FEATURE_COUNT = CONTENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.GuidelineImpl <em>Guideline</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.GuidelineImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getGuideline()
-	 * @generated
-	 */
-	int GUIDELINE = 35;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__GROUP = GUIDANCE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__OWNED_RULE = GUIDANCE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__ID = GUIDANCE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__GROUP1 = GUIDANCE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__CHECKLIST = GUIDANCE__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__CONCEPT = GUIDANCE__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__EXAMPLE = GUIDANCE__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__GUIDELINE = GUIDANCE__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__REUSABLE_ASSET = GUIDANCE__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__SUPPORTING_MATERIAL = GUIDANCE__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__WHITEPAPER = GUIDANCE__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Guideline</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GUIDELINE_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.IterationImpl <em>Iteration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.IterationImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getIteration()
-	 * @generated
-	 */
-	int ITERATION = 36;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__NAME = ACTIVITY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__GROUP = ACTIVITY__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__OWNED_RULE = ACTIVITY__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__BRIEF_DESCRIPTION = ACTIVITY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__ID = ACTIVITY__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__ORDERING_GUIDE = ACTIVITY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__SUPPRESSED = ACTIVITY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__PRESENTATION = ACTIVITY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__NODEICON = ACTIVITY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__PRESENTATION_NAME = ACTIVITY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__SHAPEICON = ACTIVITY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__PRESENTED_AFTER = ACTIVITY__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__PRESENTED_BEFORE = ACTIVITY__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__PLANNING_DATA = ACTIVITY__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__SUPER_ACTIVITY = ACTIVITY__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__HAS_MULTIPLE_OCCURRENCES = ACTIVITY__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__IS_OPTIONAL = ACTIVITY__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__IS_PLANNED = ACTIVITY__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__PREFIX = ACTIVITY__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__GROUP1 = ACTIVITY__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__PREDECESSOR = ACTIVITY__PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__IS_EVENT_DRIVEN = ACTIVITY__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__IS_ONGOING = ACTIVITY__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__IS_REPEATABLE = ACTIVITY__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__PRECONDITION = ACTIVITY__PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__POSTCONDITION = ACTIVITY__POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__GROUP2 = ACTIVITY__GROUP2;
-
-	/**
-	 * The feature id for the '<em><b>Breakdown Element</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__BREAKDOWN_ELEMENT = ACTIVITY__BREAKDOWN_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__CHECKLIST = ACTIVITY__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__CONCEPT = ACTIVITY__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__EXAMPLE = ACTIVITY__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__GUIDELINE = ACTIVITY__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Roadmap</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__ROADMAP = ACTIVITY__ROADMAP;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__REUSABLE_ASSET = ACTIVITY__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__SUPPORTING_MATERIAL = ACTIVITY__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__WHITEPAPER = ACTIVITY__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Is Enactable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__IS_ENACTABLE = ACTIVITY__IS_ENACTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__VARIABILITY_BASED_ON_ELEMENT = ACTIVITY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION__VARIABILITY_TYPE = ACTIVITY__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Iteration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITERATION_FEATURE_COUNT = ACTIVITY_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.MethodConfigurationImpl <em>Method Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.MethodConfigurationImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getMethodConfiguration()
-	 * @generated
-	 */
-	int METHOD_CONFIGURATION = 37;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__NAME = METHOD_UNIT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__GROUP = METHOD_UNIT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__OWNED_RULE = METHOD_UNIT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__BRIEF_DESCRIPTION = METHOD_UNIT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__ID = METHOD_UNIT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__ORDERING_GUIDE = METHOD_UNIT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__SUPPRESSED = METHOD_UNIT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__COPYRIGHT = METHOD_UNIT__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__AUTHORS = METHOD_UNIT__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__CHANGE_DATE = METHOD_UNIT__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__CHANGE_DESCRIPTION = METHOD_UNIT__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__VERSION = METHOD_UNIT__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Base Configuration</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__BASE_CONFIGURATION = METHOD_UNIT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Method Plugin Selection</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION = METHOD_UNIT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Method Package Selection</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION = METHOD_UNIT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Default View</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__DEFAULT_VIEW = METHOD_UNIT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Process View</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION__PROCESS_VIEW = METHOD_UNIT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Method Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_CONFIGURATION_FEATURE_COUNT = METHOD_UNIT_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.MethodLibraryImpl <em>Method Library</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.MethodLibraryImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getMethodLibrary()
-	 * @generated
-	 */
-	int METHOD_LIBRARY = 39;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__NAME = METHOD_UNIT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__GROUP = METHOD_UNIT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__OWNED_RULE = METHOD_UNIT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__BRIEF_DESCRIPTION = METHOD_UNIT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__ID = METHOD_UNIT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__ORDERING_GUIDE = METHOD_UNIT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__SUPPRESSED = METHOD_UNIT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__COPYRIGHT = METHOD_UNIT__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__AUTHORS = METHOD_UNIT__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__CHANGE_DATE = METHOD_UNIT__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__CHANGE_DESCRIPTION = METHOD_UNIT__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__VERSION = METHOD_UNIT__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Method Plugin</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__METHOD_PLUGIN = METHOD_UNIT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Method Configuration</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__METHOD_CONFIGURATION = METHOD_UNIT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Tool</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY__TOOL = METHOD_UNIT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Method Library</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_LIBRARY_FEATURE_COUNT = METHOD_UNIT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.MethodPluginImpl <em>Method Plugin</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.MethodPluginImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getMethodPlugin()
-	 * @generated
-	 */
-	int METHOD_PLUGIN = 41;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__NAME = METHOD_UNIT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__GROUP = METHOD_UNIT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__OWNED_RULE = METHOD_UNIT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__BRIEF_DESCRIPTION = METHOD_UNIT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__ID = METHOD_UNIT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__ORDERING_GUIDE = METHOD_UNIT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__SUPPRESSED = METHOD_UNIT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__COPYRIGHT = METHOD_UNIT__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__AUTHORS = METHOD_UNIT__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__CHANGE_DATE = METHOD_UNIT__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__CHANGE_DESCRIPTION = METHOD_UNIT__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__VERSION = METHOD_UNIT__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Referenced Method Plugin</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__REFERENCED_METHOD_PLUGIN = METHOD_UNIT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Method Package</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__METHOD_PACKAGE = METHOD_UNIT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>User Changeable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN__USER_CHANGEABLE = METHOD_UNIT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Method Plugin</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PLUGIN_FEATURE_COUNT = METHOD_UNIT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.MilestoneImpl <em>Milestone</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.MilestoneImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getMilestone()
-	 * @generated
-	 */
-	int MILESTONE = 43;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__NAME = WORK_BREAKDOWN_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__GROUP = WORK_BREAKDOWN_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__OWNED_RULE = WORK_BREAKDOWN_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__BRIEF_DESCRIPTION = WORK_BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__ID = WORK_BREAKDOWN_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__ORDERING_GUIDE = WORK_BREAKDOWN_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__SUPPRESSED = WORK_BREAKDOWN_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__PRESENTATION = WORK_BREAKDOWN_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__NODEICON = WORK_BREAKDOWN_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__PRESENTATION_NAME = WORK_BREAKDOWN_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__SHAPEICON = WORK_BREAKDOWN_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__PRESENTED_AFTER = WORK_BREAKDOWN_ELEMENT__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__PRESENTED_BEFORE = WORK_BREAKDOWN_ELEMENT__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__PLANNING_DATA = WORK_BREAKDOWN_ELEMENT__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__SUPER_ACTIVITY = WORK_BREAKDOWN_ELEMENT__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__HAS_MULTIPLE_OCCURRENCES = WORK_BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__IS_OPTIONAL = WORK_BREAKDOWN_ELEMENT__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__IS_PLANNED = WORK_BREAKDOWN_ELEMENT__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__PREFIX = WORK_BREAKDOWN_ELEMENT__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__GROUP1 = WORK_BREAKDOWN_ELEMENT__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__PREDECESSOR = WORK_BREAKDOWN_ELEMENT__PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__IS_EVENT_DRIVEN = WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__IS_ONGOING = WORK_BREAKDOWN_ELEMENT__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE__IS_REPEATABLE = WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE;
-
-	/**
-	 * The number of structural features of the '<em>Milestone</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MILESTONE_FEATURE_COUNT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.OutcomeImpl <em>Outcome</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.OutcomeImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getOutcome()
-	 * @generated
-	 */
-	int OUTCOME = 45;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__NAME = WORK_PRODUCT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__GROUP = WORK_PRODUCT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__OWNED_RULE = WORK_PRODUCT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__BRIEF_DESCRIPTION = WORK_PRODUCT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__ID = WORK_PRODUCT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__ORDERING_GUIDE = WORK_PRODUCT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__SUPPRESSED = WORK_PRODUCT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__PRESENTATION = WORK_PRODUCT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__NODEICON = WORK_PRODUCT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__PRESENTATION_NAME = WORK_PRODUCT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__SHAPEICON = WORK_PRODUCT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__GROUP1 = WORK_PRODUCT__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__CHECKLIST = WORK_PRODUCT__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__CONCEPT = WORK_PRODUCT__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__EXAMPLE = WORK_PRODUCT__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__GUIDELINE = WORK_PRODUCT__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__REUSABLE_ASSET = WORK_PRODUCT__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__SUPPORTING_MATERIAL = WORK_PRODUCT__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__WHITEPAPER = WORK_PRODUCT__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__VARIABILITY_BASED_ON_ELEMENT = WORK_PRODUCT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__VARIABILITY_TYPE = WORK_PRODUCT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__GROUP2 = WORK_PRODUCT__GROUP2;
-
-	/**
-	 * The feature id for the '<em><b>Estimate</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__ESTIMATE = WORK_PRODUCT__ESTIMATE;
-
-	/**
-	 * The feature id for the '<em><b>Estimation Considerations</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__ESTIMATION_CONSIDERATIONS = WORK_PRODUCT__ESTIMATION_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Report</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__REPORT = WORK_PRODUCT__REPORT;
-
-	/**
-	 * The feature id for the '<em><b>Template</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__TEMPLATE = WORK_PRODUCT__TEMPLATE;
-
-	/**
-	 * The feature id for the '<em><b>Tool Mentor</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME__TOOL_MENTOR = WORK_PRODUCT__TOOL_MENTOR;
-
-	/**
-	 * The number of structural features of the '<em>Outcome</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTCOME_FEATURE_COUNT = WORK_PRODUCT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.PhaseImpl <em>Phase</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.PhaseImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getPhase()
-	 * @generated
-	 */
-	int PHASE = 47;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__NAME = ACTIVITY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__GROUP = ACTIVITY__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__OWNED_RULE = ACTIVITY__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__BRIEF_DESCRIPTION = ACTIVITY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__ID = ACTIVITY__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__ORDERING_GUIDE = ACTIVITY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__SUPPRESSED = ACTIVITY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__PRESENTATION = ACTIVITY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__NODEICON = ACTIVITY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__PRESENTATION_NAME = ACTIVITY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__SHAPEICON = ACTIVITY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__PRESENTED_AFTER = ACTIVITY__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__PRESENTED_BEFORE = ACTIVITY__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__PLANNING_DATA = ACTIVITY__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__SUPER_ACTIVITY = ACTIVITY__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__HAS_MULTIPLE_OCCURRENCES = ACTIVITY__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__IS_OPTIONAL = ACTIVITY__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__IS_PLANNED = ACTIVITY__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__PREFIX = ACTIVITY__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__GROUP1 = ACTIVITY__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__PREDECESSOR = ACTIVITY__PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__IS_EVENT_DRIVEN = ACTIVITY__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__IS_ONGOING = ACTIVITY__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__IS_REPEATABLE = ACTIVITY__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__PRECONDITION = ACTIVITY__PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__POSTCONDITION = ACTIVITY__POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__GROUP2 = ACTIVITY__GROUP2;
-
-	/**
-	 * The feature id for the '<em><b>Breakdown Element</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__BREAKDOWN_ELEMENT = ACTIVITY__BREAKDOWN_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__CHECKLIST = ACTIVITY__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__CONCEPT = ACTIVITY__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__EXAMPLE = ACTIVITY__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__GUIDELINE = ACTIVITY__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Roadmap</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__ROADMAP = ACTIVITY__ROADMAP;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__REUSABLE_ASSET = ACTIVITY__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__SUPPORTING_MATERIAL = ACTIVITY__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__WHITEPAPER = ACTIVITY__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Is Enactable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__IS_ENACTABLE = ACTIVITY__IS_ENACTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__VARIABILITY_BASED_ON_ELEMENT = ACTIVITY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE__VARIABILITY_TYPE = ACTIVITY__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Phase</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PHASE_FEATURE_COUNT = ACTIVITY_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.PlanningDataImpl <em>Planning Data</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.PlanningDataImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getPlanningData()
-	 * @generated
-	 */
-	int PLANNING_DATA = 48;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__NAME = PROCESS_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__GROUP = PROCESS_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__OWNED_RULE = PROCESS_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__BRIEF_DESCRIPTION = PROCESS_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__ID = PROCESS_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__ORDERING_GUIDE = PROCESS_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__SUPPRESSED = PROCESS_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__PRESENTATION = PROCESS_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__NODEICON = PROCESS_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__PRESENTATION_NAME = PROCESS_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__SHAPEICON = PROCESS_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Finish Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__FINISH_DATE = PROCESS_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Rank</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__RANK = PROCESS_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Start Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA__START_DATE = PROCESS_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Planning Data</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PLANNING_DATA_FEATURE_COUNT = PROCESS_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.PracticeImpl <em>Practice</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.PracticeImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getPractice()
-	 * @generated
-	 */
-	int PRACTICE = 49;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__GROUP = GUIDANCE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__OWNED_RULE = GUIDANCE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__ID = GUIDANCE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__GROUP1 = GUIDANCE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__CHECKLIST = GUIDANCE__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__CONCEPT = GUIDANCE__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__EXAMPLE = GUIDANCE__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__GUIDELINE = GUIDANCE__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__REUSABLE_ASSET = GUIDANCE__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__SUPPORTING_MATERIAL = GUIDANCE__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__WHITEPAPER = GUIDANCE__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__GROUP2 = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Activity Reference</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__ACTIVITY_REFERENCE = GUIDANCE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Content Reference</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__CONTENT_REFERENCE = GUIDANCE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Sub Practice</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE__SUB_PRACTICE = GUIDANCE_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Practice</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.PracticeDescriptionImpl <em>Practice Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.PracticeDescriptionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getPracticeDescription()
-	 * @generated
-	 */
-	int PRACTICE_DESCRIPTION = 50;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__NAME = CONTENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__GROUP = CONTENT_DESCRIPTION__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__OWNED_RULE = CONTENT_DESCRIPTION__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__BRIEF_DESCRIPTION = CONTENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__ID = CONTENT_DESCRIPTION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__ORDERING_GUIDE = CONTENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__SUPPRESSED = CONTENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__COPYRIGHT = CONTENT_DESCRIPTION__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__AUTHORS = CONTENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__CHANGE_DATE = CONTENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__CHANGE_DESCRIPTION = CONTENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__VERSION = CONTENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__MAIN_DESCRIPTION = CONTENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__KEY_CONSIDERATIONS = CONTENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Section</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__SECTION = CONTENT_DESCRIPTION__SECTION;
-
-	/**
-	 * The feature id for the '<em><b>Additional Info</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__ADDITIONAL_INFO = CONTENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Application</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__APPLICATION = CONTENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Background</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__BACKGROUND = CONTENT_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Goals</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__GOALS = CONTENT_DESCRIPTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Levels Of Adoption</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION = CONTENT_DESCRIPTION_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Problem</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION__PROBLEM = CONTENT_DESCRIPTION_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Practice Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PRACTICE_DESCRIPTION_FEATURE_COUNT = CONTENT_DESCRIPTION_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ProcessPackageImpl <em>Process Package</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ProcessPackageImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getProcessPackage()
-	 * @generated
-	 */
-	int PROCESS_PACKAGE = 56;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__NAME = METHOD_PACKAGE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__GROUP = METHOD_PACKAGE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__OWNED_RULE = METHOD_PACKAGE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__BRIEF_DESCRIPTION = METHOD_PACKAGE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__ID = METHOD_PACKAGE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__ORDERING_GUIDE = METHOD_PACKAGE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__SUPPRESSED = METHOD_PACKAGE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__GROUP1 = METHOD_PACKAGE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Reused Package</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__REUSED_PACKAGE = METHOD_PACKAGE__REUSED_PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Method Package</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__METHOD_PACKAGE = METHOD_PACKAGE__METHOD_PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Global</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__GLOBAL = METHOD_PACKAGE__GLOBAL;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__GROUP2 = METHOD_PACKAGE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Process Element</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE__PROCESS_ELEMENT = METHOD_PACKAGE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Process Package</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PACKAGE_FEATURE_COUNT = METHOD_PACKAGE_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ProcessComponentImpl <em>Process Component</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ProcessComponentImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getProcessComponent()
-	 * @generated
-	 */
-	int PROCESS_COMPONENT = 52;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__NAME = PROCESS_PACKAGE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__GROUP = PROCESS_PACKAGE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__OWNED_RULE = PROCESS_PACKAGE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__BRIEF_DESCRIPTION = PROCESS_PACKAGE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__ID = PROCESS_PACKAGE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__ORDERING_GUIDE = PROCESS_PACKAGE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__SUPPRESSED = PROCESS_PACKAGE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__GROUP1 = PROCESS_PACKAGE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Reused Package</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__REUSED_PACKAGE = PROCESS_PACKAGE__REUSED_PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Method Package</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__METHOD_PACKAGE = PROCESS_PACKAGE__METHOD_PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Global</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__GLOBAL = PROCESS_PACKAGE__GLOBAL;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__GROUP2 = PROCESS_PACKAGE__GROUP2;
-
-	/**
-	 * The feature id for the '<em><b>Process Element</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__PROCESS_ELEMENT = PROCESS_PACKAGE__PROCESS_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__COPYRIGHT = PROCESS_PACKAGE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Interface</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__INTERFACE = PROCESS_PACKAGE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Process</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__PROCESS = PROCESS_PACKAGE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__AUTHORS = PROCESS_PACKAGE_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__CHANGE_DATE = PROCESS_PACKAGE_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__CHANGE_DESCRIPTION = PROCESS_PACKAGE_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT__VERSION = PROCESS_PACKAGE_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Process Component</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_FEATURE_COUNT = PROCESS_PACKAGE_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ProcessComponentInterfaceImpl <em>Process Component Interface</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ProcessComponentInterfaceImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getProcessComponentInterface()
-	 * @generated
-	 */
-	int PROCESS_COMPONENT_INTERFACE = 53;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__NAME = BREAKDOWN_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__GROUP = BREAKDOWN_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__OWNED_RULE = BREAKDOWN_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__BRIEF_DESCRIPTION = BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__ID = BREAKDOWN_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__ORDERING_GUIDE = BREAKDOWN_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__SUPPRESSED = BREAKDOWN_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__PRESENTATION = BREAKDOWN_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__NODEICON = BREAKDOWN_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__PRESENTATION_NAME = BREAKDOWN_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__SHAPEICON = BREAKDOWN_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__PRESENTED_AFTER = BREAKDOWN_ELEMENT__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__PRESENTED_BEFORE = BREAKDOWN_ELEMENT__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__PLANNING_DATA = BREAKDOWN_ELEMENT__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__SUPER_ACTIVITY = BREAKDOWN_ELEMENT__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__HAS_MULTIPLE_OCCURRENCES = BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__IS_OPTIONAL = BREAKDOWN_ELEMENT__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__IS_PLANNED = BREAKDOWN_ELEMENT__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__PREFIX = BREAKDOWN_ELEMENT__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__GROUP1 = BREAKDOWN_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Interface Specification</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATION = BREAKDOWN_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Interface IO</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE__INTERFACE_IO = BREAKDOWN_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Process Component Interface</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_COMPONENT_INTERFACE_FEATURE_COUNT = BREAKDOWN_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ProcessPlanningTemplateImpl <em>Process Planning Template</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ProcessPlanningTemplateImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getProcessPlanningTemplate()
-	 * @generated
-	 */
-	int PROCESS_PLANNING_TEMPLATE = 57;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__NAME = PROCESS__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__GROUP = PROCESS__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__OWNED_RULE = PROCESS__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__BRIEF_DESCRIPTION = PROCESS__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__ID = PROCESS__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__ORDERING_GUIDE = PROCESS__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__SUPPRESSED = PROCESS__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__PRESENTATION = PROCESS__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__NODEICON = PROCESS__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__PRESENTATION_NAME = PROCESS__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__SHAPEICON = PROCESS__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__PRESENTED_AFTER = PROCESS__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__PRESENTED_BEFORE = PROCESS__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__PLANNING_DATA = PROCESS__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__SUPER_ACTIVITY = PROCESS__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__HAS_MULTIPLE_OCCURRENCES = PROCESS__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__IS_OPTIONAL = PROCESS__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__IS_PLANNED = PROCESS__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__PREFIX = PROCESS__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__GROUP1 = PROCESS__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__PREDECESSOR = PROCESS__PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__IS_EVENT_DRIVEN = PROCESS__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__IS_ONGOING = PROCESS__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__IS_REPEATABLE = PROCESS__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__PRECONDITION = PROCESS__PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__POSTCONDITION = PROCESS__POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__GROUP2 = PROCESS__GROUP2;
-
-	/**
-	 * The feature id for the '<em><b>Breakdown Element</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__BREAKDOWN_ELEMENT = PROCESS__BREAKDOWN_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__CHECKLIST = PROCESS__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__CONCEPT = PROCESS__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__EXAMPLE = PROCESS__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__GUIDELINE = PROCESS__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Roadmap</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__ROADMAP = PROCESS__ROADMAP;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__REUSABLE_ASSET = PROCESS__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__SUPPORTING_MATERIAL = PROCESS__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__WHITEPAPER = PROCESS__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Is Enactable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__IS_ENACTABLE = PROCESS__IS_ENACTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__VARIABILITY_BASED_ON_ELEMENT = PROCESS__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__VARIABILITY_TYPE = PROCESS__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Includes Pattern</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__INCLUDES_PATTERN = PROCESS__INCLUDES_PATTERN;
-
-	/**
-	 * The feature id for the '<em><b>Default Context</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__DEFAULT_CONTEXT = PROCESS__DEFAULT_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Valid Context</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__VALID_CONTEXT = PROCESS__VALID_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Group3</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__GROUP3 = PROCESS_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Base Process</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE__BASE_PROCESS = PROCESS_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Process Planning Template</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESS_PLANNING_TEMPLATE_FEATURE_COUNT = PROCESS_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ReportImpl <em>Report</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ReportImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getReport()
-	 * @generated
-	 */
-	int REPORT = 58;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__GROUP = GUIDANCE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__OWNED_RULE = GUIDANCE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__ID = GUIDANCE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__GROUP1 = GUIDANCE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__CHECKLIST = GUIDANCE__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__CONCEPT = GUIDANCE__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__EXAMPLE = GUIDANCE__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__GUIDELINE = GUIDANCE__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__REUSABLE_ASSET = GUIDANCE__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__SUPPORTING_MATERIAL = GUIDANCE__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__WHITEPAPER = GUIDANCE__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Report</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REPORT_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ReusableAssetImpl <em>Reusable Asset</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ReusableAssetImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getReusableAsset()
-	 * @generated
-	 */
-	int REUSABLE_ASSET = 59;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__GROUP = GUIDANCE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__OWNED_RULE = GUIDANCE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__ID = GUIDANCE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__GROUP1 = GUIDANCE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__CHECKLIST = GUIDANCE__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__CONCEPT = GUIDANCE__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__EXAMPLE = GUIDANCE__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__GUIDELINE = GUIDANCE__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__REUSABLE_ASSET = GUIDANCE__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__SUPPORTING_MATERIAL = GUIDANCE__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__WHITEPAPER = GUIDANCE__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Reusable Asset</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REUSABLE_ASSET_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.RoadmapImpl <em>Roadmap</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.RoadmapImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getRoadmap()
-	 * @generated
-	 */
-	int ROADMAP = 60;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__GROUP = GUIDANCE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__OWNED_RULE = GUIDANCE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__ID = GUIDANCE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__GROUP1 = GUIDANCE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__CHECKLIST = GUIDANCE__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__CONCEPT = GUIDANCE__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__EXAMPLE = GUIDANCE__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__GUIDELINE = GUIDANCE__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__REUSABLE_ASSET = GUIDANCE__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__SUPPORTING_MATERIAL = GUIDANCE__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__WHITEPAPER = GUIDANCE__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Roadmap</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROADMAP_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.RoleImpl <em>Role</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.RoleImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getRole()
-	 * @generated
-	 */
-	int ROLE = 61;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__NAME = CONTENT_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__GROUP = CONTENT_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__OWNED_RULE = CONTENT_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__BRIEF_DESCRIPTION = CONTENT_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__ID = CONTENT_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__ORDERING_GUIDE = CONTENT_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__SUPPRESSED = CONTENT_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__PRESENTATION = CONTENT_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__NODEICON = CONTENT_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__PRESENTATION_NAME = CONTENT_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__SHAPEICON = CONTENT_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__GROUP1 = CONTENT_ELEMENT__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__CHECKLIST = CONTENT_ELEMENT__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__CONCEPT = CONTENT_ELEMENT__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__EXAMPLE = CONTENT_ELEMENT__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__GUIDELINE = CONTENT_ELEMENT__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__REUSABLE_ASSET = CONTENT_ELEMENT__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__SUPPORTING_MATERIAL = CONTENT_ELEMENT__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__WHITEPAPER = CONTENT_ELEMENT__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__VARIABILITY_BASED_ON_ELEMENT = CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__VARIABILITY_TYPE = CONTENT_ELEMENT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__GROUP2 = CONTENT_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Responsible For</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE__RESPONSIBLE_FOR = CONTENT_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Role</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_FEATURE_COUNT = CONTENT_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.RoleDescriptionImpl <em>Role Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.RoleDescriptionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getRoleDescription()
-	 * @generated
-	 */
-	int ROLE_DESCRIPTION = 62;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__NAME = CONTENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__GROUP = CONTENT_DESCRIPTION__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__OWNED_RULE = CONTENT_DESCRIPTION__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__BRIEF_DESCRIPTION = CONTENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__ID = CONTENT_DESCRIPTION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__ORDERING_GUIDE = CONTENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__SUPPRESSED = CONTENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__COPYRIGHT = CONTENT_DESCRIPTION__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__AUTHORS = CONTENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__CHANGE_DATE = CONTENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__CHANGE_DESCRIPTION = CONTENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__VERSION = CONTENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__MAIN_DESCRIPTION = CONTENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__KEY_CONSIDERATIONS = CONTENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Section</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__SECTION = CONTENT_DESCRIPTION__SECTION;
-
-	/**
-	 * The feature id for the '<em><b>Assignment Approaches</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES = CONTENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Skills</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__SKILLS = CONTENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Synonyms</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION__SYNONYMS = CONTENT_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Role Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_DESCRIPTION_FEATURE_COUNT = CONTENT_DESCRIPTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.RoleSetImpl <em>Role Set</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.RoleSetImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getRoleSet()
-	 * @generated
-	 */
-	int ROLE_SET = 64;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__GROUP = CONTENT_CATEGORY__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__OWNED_RULE = CONTENT_CATEGORY__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__ID = CONTENT_CATEGORY__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__GROUP1 = CONTENT_CATEGORY__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__CHECKLIST = CONTENT_CATEGORY__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__CONCEPT = CONTENT_CATEGORY__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__EXAMPLE = CONTENT_CATEGORY__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__GUIDELINE = CONTENT_CATEGORY__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__REUSABLE_ASSET = CONTENT_CATEGORY__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__SUPPORTING_MATERIAL = CONTENT_CATEGORY__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__WHITEPAPER = CONTENT_CATEGORY__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__GROUP2 = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Role</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET__ROLE = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Role Set</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.RoleSetGroupingImpl <em>Role Set Grouping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.RoleSetGroupingImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getRoleSetGrouping()
-	 * @generated
-	 */
-	int ROLE_SET_GROUPING = 65;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__GROUP = CONTENT_CATEGORY__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__OWNED_RULE = CONTENT_CATEGORY__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__ID = CONTENT_CATEGORY__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__GROUP1 = CONTENT_CATEGORY__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__CHECKLIST = CONTENT_CATEGORY__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__CONCEPT = CONTENT_CATEGORY__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__EXAMPLE = CONTENT_CATEGORY__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__GUIDELINE = CONTENT_CATEGORY__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__REUSABLE_ASSET = CONTENT_CATEGORY__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__SUPPORTING_MATERIAL = CONTENT_CATEGORY__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__WHITEPAPER = CONTENT_CATEGORY__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__GROUP2 = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Role Set</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING__ROLE_SET = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Role Set Grouping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SET_GROUPING_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.SectionImpl <em>Section</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.SectionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getSection()
-	 * @generated
-	 */
-	int SECTION = 66;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__NAME = METHOD_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__GROUP = METHOD_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__OWNED_RULE = METHOD_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__BRIEF_DESCRIPTION = METHOD_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__ID = METHOD_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__ORDERING_GUIDE = METHOD_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__SUPPRESSED = METHOD_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Sub Section</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__SUB_SECTION = METHOD_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__PREDECESSOR = METHOD_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__DESCRIPTION = METHOD_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Section Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__SECTION_NAME = METHOD_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__VARIABILITY_BASED_ON_ELEMENT = METHOD_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION__VARIABILITY_TYPE = METHOD_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Section</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECTION_FEATURE_COUNT = METHOD_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.SupportingMaterialImpl <em>Supporting Material</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.SupportingMaterialImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getSupportingMaterial()
-	 * @generated
-	 */
-	int SUPPORTING_MATERIAL = 67;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__GROUP = GUIDANCE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__OWNED_RULE = GUIDANCE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__ID = GUIDANCE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__GROUP1 = GUIDANCE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__CHECKLIST = GUIDANCE__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__CONCEPT = GUIDANCE__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__EXAMPLE = GUIDANCE__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__GUIDELINE = GUIDANCE__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__REUSABLE_ASSET = GUIDANCE__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__SUPPORTING_MATERIAL = GUIDANCE__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__WHITEPAPER = GUIDANCE__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Supporting Material</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUPPORTING_MATERIAL_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.TaskImpl <em>Task</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.TaskImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getTask()
-	 * @generated
-	 */
-	int TASK = 68;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__NAME = CONTENT_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__GROUP = CONTENT_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__OWNED_RULE = CONTENT_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__BRIEF_DESCRIPTION = CONTENT_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ID = CONTENT_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ORDERING_GUIDE = CONTENT_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__SUPPRESSED = CONTENT_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__PRESENTATION = CONTENT_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__NODEICON = CONTENT_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__PRESENTATION_NAME = CONTENT_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__SHAPEICON = CONTENT_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__GROUP1 = CONTENT_ELEMENT__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__CHECKLIST = CONTENT_ELEMENT__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__CONCEPT = CONTENT_ELEMENT__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__EXAMPLE = CONTENT_ELEMENT__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__GUIDELINE = CONTENT_ELEMENT__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__REUSABLE_ASSET = CONTENT_ELEMENT__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__SUPPORTING_MATERIAL = CONTENT_ELEMENT__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__WHITEPAPER = CONTENT_ELEMENT__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__VARIABILITY_BASED_ON_ELEMENT = CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__VARIABILITY_TYPE = CONTENT_ELEMENT__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__PRECONDITION = CONTENT_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__POSTCONDITION = CONTENT_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Performed By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__PERFORMED_BY = CONTENT_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__GROUP2 = CONTENT_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Mandatory Input</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__MANDATORY_INPUT = CONTENT_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Output</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__OUTPUT = CONTENT_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Additionally Performed By</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ADDITIONALLY_PERFORMED_BY = CONTENT_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Optional Input</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__OPTIONAL_INPUT = CONTENT_ELEMENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Estimate</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ESTIMATE = CONTENT_ELEMENT_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Estimation Considerations</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__ESTIMATION_CONSIDERATIONS = CONTENT_ELEMENT_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>Tool Mentor</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK__TOOL_MENTOR = CONTENT_ELEMENT_FEATURE_COUNT + 10;
-
-	/**
-	 * The number of structural features of the '<em>Task</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_FEATURE_COUNT = CONTENT_ELEMENT_FEATURE_COUNT + 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.TaskDescriptionImpl <em>Task Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.TaskDescriptionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getTaskDescription()
-	 * @generated
-	 */
-	int TASK_DESCRIPTION = 69;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__NAME = CONTENT_DESCRIPTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__GROUP = CONTENT_DESCRIPTION__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__OWNED_RULE = CONTENT_DESCRIPTION__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__BRIEF_DESCRIPTION = CONTENT_DESCRIPTION__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__ID = CONTENT_DESCRIPTION__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__ORDERING_GUIDE = CONTENT_DESCRIPTION__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__SUPPRESSED = CONTENT_DESCRIPTION__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Copyright</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__COPYRIGHT = CONTENT_DESCRIPTION__COPYRIGHT;
-
-	/**
-	 * The feature id for the '<em><b>Authors</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__AUTHORS = CONTENT_DESCRIPTION__AUTHORS;
-
-	/**
-	 * The feature id for the '<em><b>Change Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__CHANGE_DATE = CONTENT_DESCRIPTION__CHANGE_DATE;
-
-	/**
-	 * The feature id for the '<em><b>Change Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__CHANGE_DESCRIPTION = CONTENT_DESCRIPTION__CHANGE_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__VERSION = CONTENT_DESCRIPTION__VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Main Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__MAIN_DESCRIPTION = CONTENT_DESCRIPTION__MAIN_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Key Considerations</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__KEY_CONSIDERATIONS = CONTENT_DESCRIPTION__KEY_CONSIDERATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Section</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__SECTION = CONTENT_DESCRIPTION__SECTION;
-
-	/**
-	 * The feature id for the '<em><b>Alternatives</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__ALTERNATIVES = CONTENT_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION__PURPOSE = CONTENT_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Task Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTION_FEATURE_COUNT = CONTENT_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.TaskDescriptorImpl <em>Task Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.TaskDescriptorImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getTaskDescriptor()
-	 * @generated
-	 */
-	int TASK_DESCRIPTOR = 70;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__NAME = WORK_BREAKDOWN_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__GROUP = WORK_BREAKDOWN_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__OWNED_RULE = WORK_BREAKDOWN_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__BRIEF_DESCRIPTION = WORK_BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__ID = WORK_BREAKDOWN_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__ORDERING_GUIDE = WORK_BREAKDOWN_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__SUPPRESSED = WORK_BREAKDOWN_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__PRESENTATION = WORK_BREAKDOWN_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__NODEICON = WORK_BREAKDOWN_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__PRESENTATION_NAME = WORK_BREAKDOWN_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__SHAPEICON = WORK_BREAKDOWN_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__PRESENTED_AFTER = WORK_BREAKDOWN_ELEMENT__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__PRESENTED_BEFORE = WORK_BREAKDOWN_ELEMENT__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__PLANNING_DATA = WORK_BREAKDOWN_ELEMENT__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__SUPER_ACTIVITY = WORK_BREAKDOWN_ELEMENT__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES = WORK_BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__IS_OPTIONAL = WORK_BREAKDOWN_ELEMENT__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__IS_PLANNED = WORK_BREAKDOWN_ELEMENT__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__PREFIX = WORK_BREAKDOWN_ELEMENT__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__GROUP1 = WORK_BREAKDOWN_ELEMENT__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__PREDECESSOR = WORK_BREAKDOWN_ELEMENT__PREDECESSOR;
-
-	/**
-	 * The feature id for the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__IS_EVENT_DRIVEN = WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN;
-
-	/**
-	 * The feature id for the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__IS_ONGOING = WORK_BREAKDOWN_ELEMENT__IS_ONGOING;
-
-	/**
-	 * The feature id for the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__IS_REPEATABLE = WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Task</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__TASK = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Performed Primarily By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__GROUP2 = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Additionally Performed By</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Assisted By</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__ASSISTED_BY = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>External Input</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__EXTERNAL_INPUT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Mandatory Input</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__MANDATORY_INPUT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Optional Input</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__OPTIONAL_INPUT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Output</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__OUTPUT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Step</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__STEP = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>Is Synchronized With Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 10;
-
-	/**
-	 * The number of structural features of the '<em>Task Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_DESCRIPTOR_FEATURE_COUNT = WORK_BREAKDOWN_ELEMENT_FEATURE_COUNT + 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.TeamProfileImpl <em>Team Profile</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.TeamProfileImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getTeamProfile()
-	 * @generated
-	 */
-	int TEAM_PROFILE = 71;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__NAME = BREAKDOWN_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__GROUP = BREAKDOWN_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__OWNED_RULE = BREAKDOWN_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__BRIEF_DESCRIPTION = BREAKDOWN_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__ID = BREAKDOWN_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__ORDERING_GUIDE = BREAKDOWN_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__SUPPRESSED = BREAKDOWN_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__PRESENTATION = BREAKDOWN_ELEMENT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__NODEICON = BREAKDOWN_ELEMENT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__PRESENTATION_NAME = BREAKDOWN_ELEMENT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__SHAPEICON = BREAKDOWN_ELEMENT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__PRESENTED_AFTER = BREAKDOWN_ELEMENT__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__PRESENTED_BEFORE = BREAKDOWN_ELEMENT__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__PLANNING_DATA = BREAKDOWN_ELEMENT__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__SUPER_ACTIVITY = BREAKDOWN_ELEMENT__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__HAS_MULTIPLE_OCCURRENCES = BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__IS_OPTIONAL = BREAKDOWN_ELEMENT__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__IS_PLANNED = BREAKDOWN_ELEMENT__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__PREFIX = BREAKDOWN_ELEMENT__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__GROUP1 = BREAKDOWN_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Role</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__ROLE = BREAKDOWN_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Super Team</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__SUPER_TEAM = BREAKDOWN_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Sub Team</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE__SUB_TEAM = BREAKDOWN_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Team Profile</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEAM_PROFILE_FEATURE_COUNT = BREAKDOWN_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.TemplateImpl <em>Template</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.TemplateImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getTemplate()
-	 * @generated
-	 */
-	int TEMPLATE = 72;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__GROUP = GUIDANCE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__OWNED_RULE = GUIDANCE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__ID = GUIDANCE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__GROUP1 = GUIDANCE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__CHECKLIST = GUIDANCE__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__CONCEPT = GUIDANCE__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__EXAMPLE = GUIDANCE__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__GUIDELINE = GUIDANCE__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__REUSABLE_ASSET = GUIDANCE__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__SUPPORTING_MATERIAL = GUIDANCE__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__WHITEPAPER = GUIDANCE__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Template</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TEMPLATE_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.TermDefinitionImpl <em>Term Definition</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.TermDefinitionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getTermDefinition()
-	 * @generated
-	 */
-	int TERM_DEFINITION = 73;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__GROUP = GUIDANCE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__OWNED_RULE = GUIDANCE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__ID = GUIDANCE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__GROUP1 = GUIDANCE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__CHECKLIST = GUIDANCE__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__CONCEPT = GUIDANCE__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__EXAMPLE = GUIDANCE__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__GUIDELINE = GUIDANCE__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__REUSABLE_ASSET = GUIDANCE__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__SUPPORTING_MATERIAL = GUIDANCE__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__WHITEPAPER = GUIDANCE__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Term Definition</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERM_DEFINITION_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ToolImpl <em>Tool</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ToolImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getTool()
-	 * @generated
-	 */
-	int TOOL = 74;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__GROUP = CONTENT_CATEGORY__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__OWNED_RULE = CONTENT_CATEGORY__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__ID = CONTENT_CATEGORY__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__GROUP1 = CONTENT_CATEGORY__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__CHECKLIST = CONTENT_CATEGORY__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__CONCEPT = CONTENT_CATEGORY__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__EXAMPLE = CONTENT_CATEGORY__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__GUIDELINE = CONTENT_CATEGORY__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__REUSABLE_ASSET = CONTENT_CATEGORY__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__SUPPORTING_MATERIAL = CONTENT_CATEGORY__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__WHITEPAPER = CONTENT_CATEGORY__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__GROUP2 = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Tool Mentor</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL__TOOL_MENTOR = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Tool</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.ToolMentorImpl <em>Tool Mentor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.ToolMentorImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getToolMentor()
-	 * @generated
-	 */
-	int TOOL_MENTOR = 75;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__NAME = GUIDANCE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__GROUP = GUIDANCE__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__OWNED_RULE = GUIDANCE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__BRIEF_DESCRIPTION = GUIDANCE__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__ID = GUIDANCE__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__ORDERING_GUIDE = GUIDANCE__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__SUPPRESSED = GUIDANCE__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__PRESENTATION = GUIDANCE__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__NODEICON = GUIDANCE__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__PRESENTATION_NAME = GUIDANCE__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__SHAPEICON = GUIDANCE__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__GROUP1 = GUIDANCE__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__CHECKLIST = GUIDANCE__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__CONCEPT = GUIDANCE__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__EXAMPLE = GUIDANCE__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__GUIDELINE = GUIDANCE__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__REUSABLE_ASSET = GUIDANCE__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__SUPPORTING_MATERIAL = GUIDANCE__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__WHITEPAPER = GUIDANCE__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__VARIABILITY_BASED_ON_ELEMENT = GUIDANCE__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR__VARIABILITY_TYPE = GUIDANCE__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Tool Mentor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_MENTOR_FEATURE_COUNT = GUIDANCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.WhitepaperImpl <em>Whitepaper</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.WhitepaperImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWhitepaper()
-	 * @generated
-	 */
-	int WHITEPAPER = 76;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__NAME = CONCEPT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__GROUP = CONCEPT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__OWNED_RULE = CONCEPT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__BRIEF_DESCRIPTION = CONCEPT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__ID = CONCEPT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__ORDERING_GUIDE = CONCEPT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__SUPPRESSED = CONCEPT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__PRESENTATION = CONCEPT__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__NODEICON = CONCEPT__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__PRESENTATION_NAME = CONCEPT__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__SHAPEICON = CONCEPT__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__GROUP1 = CONCEPT__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__CHECKLIST = CONCEPT__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__CONCEPT = CONCEPT__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__EXAMPLE = CONCEPT__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__GUIDELINE = CONCEPT__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__REUSABLE_ASSET = CONCEPT__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__SUPPORTING_MATERIAL = CONCEPT__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__WHITEPAPER = CONCEPT__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__VARIABILITY_BASED_ON_ELEMENT = CONCEPT__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER__VARIABILITY_TYPE = CONCEPT__VARIABILITY_TYPE;
-
-	/**
-	 * The number of structural features of the '<em>Whitepaper</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WHITEPAPER_FEATURE_COUNT = CONCEPT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.WorkDefinitionImpl <em>Work Definition</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.WorkDefinitionImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkDefinition()
-	 * @generated
-	 */
-	int WORK_DEFINITION = 78;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__NAME = METHOD_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__GROUP = METHOD_ELEMENT__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__OWNED_RULE = METHOD_ELEMENT__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__BRIEF_DESCRIPTION = METHOD_ELEMENT__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__ID = METHOD_ELEMENT__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__ORDERING_GUIDE = METHOD_ELEMENT__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__SUPPRESSED = METHOD_ELEMENT__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__PRECONDITION = METHOD_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION__POSTCONDITION = METHOD_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Work Definition</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_DEFINITION_FEATURE_COUNT = METHOD_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.WorkOrderImpl <em>Work Order</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.WorkOrderImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkOrder()
-	 * @generated
-	 */
-	int WORK_ORDER = 79;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__VALUE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Link Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__LINK_TYPE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER__ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Work Order</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_ORDER_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.WorkProductDescriptorImpl <em>Work Product Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.WorkProductDescriptorImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkProductDescriptor()
-	 * @generated
-	 */
-	int WORK_PRODUCT_DESCRIPTOR = 82;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__NAME = DESCRIPTOR__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__GROUP = DESCRIPTOR__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__OWNED_RULE = DESCRIPTOR__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__BRIEF_DESCRIPTION = DESCRIPTOR__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__ID = DESCRIPTOR__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__ORDERING_GUIDE = DESCRIPTOR__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__SUPPRESSED = DESCRIPTOR__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__PRESENTATION = DESCRIPTOR__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__NODEICON = DESCRIPTOR__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__PRESENTATION_NAME = DESCRIPTOR__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__SHAPEICON = DESCRIPTOR__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presented After</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__PRESENTED_AFTER = DESCRIPTOR__PRESENTED_AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Presented Before</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__PRESENTED_BEFORE = DESCRIPTOR__PRESENTED_BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>Planning Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__PLANNING_DATA = DESCRIPTOR__PLANNING_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Super Activity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__SUPER_ACTIVITY = DESCRIPTOR__SUPER_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Has Multiple Occurrences</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES = DESCRIPTOR__HAS_MULTIPLE_OCCURRENCES;
-
-	/**
-	 * The feature id for the '<em><b>Is Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__IS_OPTIONAL = DESCRIPTOR__IS_OPTIONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Planned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__IS_PLANNED = DESCRIPTOR__IS_PLANNED;
-
-	/**
-	 * The feature id for the '<em><b>Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__PREFIX = DESCRIPTOR__PREFIX;
-
-	/**
-	 * The feature id for the '<em><b>Is Synchronized With Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE = DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Work Product</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT = DESCRIPTOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__GROUP1 = DESCRIPTOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Impacted By</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY = DESCRIPTOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Impacts</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__IMPACTS = DESCRIPTOR_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Deliverable Parts</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS = DESCRIPTOR_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Activity Entry State</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE = DESCRIPTOR_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Activity Exit State</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE = DESCRIPTOR_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Work Product Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_DESCRIPTOR_FEATURE_COUNT = DESCRIPTOR_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.impl.WorkProductTypeImpl <em>Work Product Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.impl.WorkProductTypeImpl
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkProductType()
-	 * @generated
-	 */
-	int WORK_PRODUCT_TYPE = 83;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__NAME = CONTENT_CATEGORY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__GROUP = CONTENT_CATEGORY__GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__OWNED_RULE = CONTENT_CATEGORY__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Brief Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__BRIEF_DESCRIPTION = CONTENT_CATEGORY__BRIEF_DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__ID = CONTENT_CATEGORY__ID;
-
-	/**
-	 * The feature id for the '<em><b>Ordering Guide</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__ORDERING_GUIDE = CONTENT_CATEGORY__ORDERING_GUIDE;
-
-	/**
-	 * The feature id for the '<em><b>Suppressed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__SUPPRESSED = CONTENT_CATEGORY__SUPPRESSED;
-
-	/**
-	 * The feature id for the '<em><b>Presentation</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__PRESENTATION = CONTENT_CATEGORY__PRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Nodeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__NODEICON = CONTENT_CATEGORY__NODEICON;
-
-	/**
-	 * The feature id for the '<em><b>Presentation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__PRESENTATION_NAME = CONTENT_CATEGORY__PRESENTATION_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Shapeicon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__SHAPEICON = CONTENT_CATEGORY__SHAPEICON;
-
-	/**
-	 * The feature id for the '<em><b>Group1</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__GROUP1 = CONTENT_CATEGORY__GROUP1;
-
-	/**
-	 * The feature id for the '<em><b>Checklist</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__CHECKLIST = CONTENT_CATEGORY__CHECKLIST;
-
-	/**
-	 * The feature id for the '<em><b>Concept</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__CONCEPT = CONTENT_CATEGORY__CONCEPT;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__EXAMPLE = CONTENT_CATEGORY__EXAMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Guideline</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__GUIDELINE = CONTENT_CATEGORY__GUIDELINE;
-
-	/**
-	 * The feature id for the '<em><b>Reusable Asset</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__REUSABLE_ASSET = CONTENT_CATEGORY__REUSABLE_ASSET;
-
-	/**
-	 * The feature id for the '<em><b>Supporting Material</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__SUPPORTING_MATERIAL = CONTENT_CATEGORY__SUPPORTING_MATERIAL;
-
-	/**
-	 * The feature id for the '<em><b>Whitepaper</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__WHITEPAPER = CONTENT_CATEGORY__WHITEPAPER;
-
-	/**
-	 * The feature id for the '<em><b>Variability Based On Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__VARIABILITY_BASED_ON_ELEMENT = CONTENT_CATEGORY__VARIABILITY_BASED_ON_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Variability Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__VARIABILITY_TYPE = CONTENT_CATEGORY__VARIABILITY_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Group2</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__GROUP2 = CONTENT_CATEGORY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Work Product</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE__WORK_PRODUCT = CONTENT_CATEGORY_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Work Product Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORK_PRODUCT_TYPE_FEATURE_COUNT = CONTENT_CATEGORY_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.VariabilityType <em>Variability Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.VariabilityType
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getVariabilityType()
-	 * @generated
-	 */
-	int VARIABILITY_TYPE = 84;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.epf.xml.uma.WorkOrderType <em>Work Order Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.WorkOrderType
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkOrderType()
-	 * @generated
-	 */
-	int WORK_ORDER_TYPE = 85;
-
-	/**
-	 * The meta object id for the '<em>Variability Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.VariabilityType
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getVariabilityTypeObject()
-	 * @generated
-	 */
-	int VARIABILITY_TYPE_OBJECT = 86;
-
-	/**
-	 * The meta object id for the '<em>Work Order Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.epf.xml.uma.WorkOrderType
-	 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkOrderTypeObject()
-	 * @generated
-	 */
-	int WORK_ORDER_TYPE_OBJECT = 87;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Activity <em>Activity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Activity</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity
-	 * @generated
-	 */
-	EClass getActivity();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Activity#getPrecondition <em>Precondition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Precondition</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity#getPrecondition()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EAttribute getActivity_Precondition();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Activity#getPostcondition <em>Postcondition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Postcondition</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity#getPostcondition()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EAttribute getActivity_Postcondition();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Activity#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity#getGroup2()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EAttribute getActivity_Group2();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.Activity#getBreakdownElement <em>Breakdown Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Breakdown Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity#getBreakdownElement()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EReference getActivity_BreakdownElement();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Activity#getChecklist <em>Checklist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Checklist</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity#getChecklist()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EAttribute getActivity_Checklist();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Activity#getConcept <em>Concept</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Concept</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity#getConcept()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EAttribute getActivity_Concept();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Activity#getExample <em>Example</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Example</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity#getExample()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EAttribute getActivity_Example();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Activity#getGuideline <em>Guideline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Guideline</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity#getGuideline()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EAttribute getActivity_Guideline();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Activity#getRoadmap <em>Roadmap</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Roadmap</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity#getRoadmap()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EAttribute getActivity_Roadmap();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Activity#getReusableAsset <em>Reusable Asset</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Reusable Asset</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity#getReusableAsset()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EAttribute getActivity_ReusableAsset();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Activity#getSupportingMaterial <em>Supporting Material</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Supporting Material</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity#getSupportingMaterial()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EAttribute getActivity_SupportingMaterial();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Activity#getWhitepaper <em>Whitepaper</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Whitepaper</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity#getWhitepaper()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EAttribute getActivity_Whitepaper();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Activity#isIsEnactable <em>Is Enactable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Enactable</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity#isIsEnactable()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EAttribute getActivity_IsEnactable();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Activity#getVariabilityBasedOnElement <em>Variability Based On Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Variability Based On Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity#getVariabilityBasedOnElement()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EAttribute getActivity_VariabilityBasedOnElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Activity#getVariabilityType <em>Variability Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Variability Type</em>'.
-	 * @see org.eclipse.epf.xml.uma.Activity#getVariabilityType()
-	 * @see #getActivity()
-	 * @generated
-	 */
-	EAttribute getActivity_VariabilityType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.ActivityDescription <em>Activity Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Activity Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.ActivityDescription
-	 * @generated
-	 */
-	EClass getActivityDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ActivityDescription#getAlternatives <em>Alternatives</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Alternatives</em>'.
-	 * @see org.eclipse.epf.xml.uma.ActivityDescription#getAlternatives()
-	 * @see #getActivityDescription()
-	 * @generated
-	 */
-	EAttribute getActivityDescription_Alternatives();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ActivityDescription#getHowToStaff <em>How To Staff</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>How To Staff</em>'.
-	 * @see org.eclipse.epf.xml.uma.ActivityDescription#getHowToStaff()
-	 * @see #getActivityDescription()
-	 * @generated
-	 */
-	EAttribute getActivityDescription_HowToStaff();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ActivityDescription#getPurpose <em>Purpose</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Purpose</em>'.
-	 * @see org.eclipse.epf.xml.uma.ActivityDescription#getPurpose()
-	 * @see #getActivityDescription()
-	 * @generated
-	 */
-	EAttribute getActivityDescription_Purpose();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Artifact <em>Artifact</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Artifact</em>'.
-	 * @see org.eclipse.epf.xml.uma.Artifact
-	 * @generated
-	 */
-	EClass getArtifact();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Artifact#getGroup3 <em>Group3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group3</em>'.
-	 * @see org.eclipse.epf.xml.uma.Artifact#getGroup3()
-	 * @see #getArtifact()
-	 * @generated
-	 */
-	EAttribute getArtifact_Group3();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.Artifact#getContainedArtifact <em>Contained Artifact</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Contained Artifact</em>'.
-	 * @see org.eclipse.epf.xml.uma.Artifact#getContainedArtifact()
-	 * @see #getArtifact()
-	 * @generated
-	 */
-	EReference getArtifact_ContainedArtifact();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.ArtifactDescription <em>Artifact Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Artifact Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.ArtifactDescription
-	 * @generated
-	 */
-	EClass getArtifactDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ArtifactDescription#getBriefOutline <em>Brief Outline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Brief Outline</em>'.
-	 * @see org.eclipse.epf.xml.uma.ArtifactDescription#getBriefOutline()
-	 * @see #getArtifactDescription()
-	 * @generated
-	 */
-	EAttribute getArtifactDescription_BriefOutline();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ArtifactDescription#getRepresentationOptions <em>Representation Options</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Representation Options</em>'.
-	 * @see org.eclipse.epf.xml.uma.ArtifactDescription#getRepresentationOptions()
-	 * @see #getArtifactDescription()
-	 * @generated
-	 */
-	EAttribute getArtifactDescription_RepresentationOptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.BreakdownElement <em>Breakdown Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Breakdown Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.BreakdownElement
-	 * @generated
-	 */
-	EClass getBreakdownElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.BreakdownElement#getPresentedAfter <em>Presented After</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Presented After</em>'.
-	 * @see org.eclipse.epf.xml.uma.BreakdownElement#getPresentedAfter()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getBreakdownElement_PresentedAfter();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.BreakdownElement#getPresentedBefore <em>Presented Before</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Presented Before</em>'.
-	 * @see org.eclipse.epf.xml.uma.BreakdownElement#getPresentedBefore()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getBreakdownElement_PresentedBefore();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.BreakdownElement#getPlanningData <em>Planning Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Planning Data</em>'.
-	 * @see org.eclipse.epf.xml.uma.BreakdownElement#getPlanningData()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getBreakdownElement_PlanningData();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.BreakdownElement#getSuperActivity <em>Super Activity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Super Activity</em>'.
-	 * @see org.eclipse.epf.xml.uma.BreakdownElement#getSuperActivity()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getBreakdownElement_SuperActivity();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.BreakdownElement#isHasMultipleOccurrences <em>Has Multiple Occurrences</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Has Multiple Occurrences</em>'.
-	 * @see org.eclipse.epf.xml.uma.BreakdownElement#isHasMultipleOccurrences()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getBreakdownElement_HasMultipleOccurrences();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.BreakdownElement#isIsOptional <em>Is Optional</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Optional</em>'.
-	 * @see org.eclipse.epf.xml.uma.BreakdownElement#isIsOptional()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getBreakdownElement_IsOptional();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.BreakdownElement#isIsPlanned <em>Is Planned</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Planned</em>'.
-	 * @see org.eclipse.epf.xml.uma.BreakdownElement#isIsPlanned()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getBreakdownElement_IsPlanned();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.BreakdownElement#getPrefix <em>Prefix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Prefix</em>'.
-	 * @see org.eclipse.epf.xml.uma.BreakdownElement#getPrefix()
-	 * @see #getBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getBreakdownElement_Prefix();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.BreakdownElementDescription <em>Breakdown Element Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Breakdown Element Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.BreakdownElementDescription
-	 * @generated
-	 */
-	EClass getBreakdownElementDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.BreakdownElementDescription#getUsageGuidance <em>Usage Guidance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Usage Guidance</em>'.
-	 * @see org.eclipse.epf.xml.uma.BreakdownElementDescription#getUsageGuidance()
-	 * @see #getBreakdownElementDescription()
-	 * @generated
-	 */
-	EAttribute getBreakdownElementDescription_UsageGuidance();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.CapabilityPattern <em>Capability Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Capability Pattern</em>'.
-	 * @see org.eclipse.epf.xml.uma.CapabilityPattern
-	 * @generated
-	 */
-	EClass getCapabilityPattern();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Checklist <em>Checklist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Checklist</em>'.
-	 * @see org.eclipse.epf.xml.uma.Checklist
-	 * @generated
-	 */
-	EClass getChecklist();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.CompositeRole <em>Composite Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Composite Role</em>'.
-	 * @see org.eclipse.epf.xml.uma.CompositeRole
-	 * @generated
-	 */
-	EClass getCompositeRole();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.CompositeRole#getGroup1 <em>Group1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group1</em>'.
-	 * @see org.eclipse.epf.xml.uma.CompositeRole#getGroup1()
-	 * @see #getCompositeRole()
-	 * @generated
-	 */
-	EAttribute getCompositeRole_Group1();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.CompositeRole#getAggregatedRole <em>Aggregated Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Aggregated Role</em>'.
-	 * @see org.eclipse.epf.xml.uma.CompositeRole#getAggregatedRole()
-	 * @see #getCompositeRole()
-	 * @generated
-	 */
-	EReference getCompositeRole_AggregatedRole();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Concept <em>Concept</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Concept</em>'.
-	 * @see org.eclipse.epf.xml.uma.Concept
-	 * @generated
-	 */
-	EClass getConcept();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Constraint <em>Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Constraint</em>'.
-	 * @see org.eclipse.epf.xml.uma.Constraint
-	 * @generated
-	 */
-	EClass getConstraint();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Constraint#getMainDescription <em>Main Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Main Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.Constraint#getMainDescription()
-	 * @see #getConstraint()
-	 * @generated
-	 */
-	EAttribute getConstraint_MainDescription();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.ContentCategory <em>Content Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Content Category</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentCategory
-	 * @generated
-	 */
-	EClass getContentCategory();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.ContentCategoryPackage <em>Content Category Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Content Category Package</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentCategoryPackage
-	 * @generated
-	 */
-	EClass getContentCategoryPackage();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.ContentCategoryPackage#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentCategoryPackage#getGroup2()
-	 * @see #getContentCategoryPackage()
-	 * @generated
-	 */
-	EAttribute getContentCategoryPackage_Group2();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.ContentCategoryPackage#getContentCategory <em>Content Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Content Category</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentCategoryPackage#getContentCategory()
-	 * @see #getContentCategoryPackage()
-	 * @generated
-	 */
-	EReference getContentCategoryPackage_ContentCategory();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.ContentDescription <em>Content Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Content Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentDescription
-	 * @generated
-	 */
-	EClass getContentDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ContentDescription#getMainDescription <em>Main Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Main Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentDescription#getMainDescription()
-	 * @see #getContentDescription()
-	 * @generated
-	 */
-	EAttribute getContentDescription_MainDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ContentDescription#getKeyConsiderations <em>Key Considerations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Key Considerations</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentDescription#getKeyConsiderations()
-	 * @see #getContentDescription()
-	 * @generated
-	 */
-	EAttribute getContentDescription_KeyConsiderations();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.ContentDescription#getSection <em>Section</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Section</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentDescription#getSection()
-	 * @see #getContentDescription()
-	 * @generated
-	 */
-	EReference getContentDescription_Section();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.ContentElement <em>Content Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Content Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentElement
-	 * @generated
-	 */
-	EClass getContentElement();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.ContentElement#getGroup1 <em>Group1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group1</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentElement#getGroup1()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EAttribute getContentElement_Group1();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.ContentElement#getChecklist <em>Checklist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Checklist</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentElement#getChecklist()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EAttribute getContentElement_Checklist();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.ContentElement#getConcept <em>Concept</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Concept</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentElement#getConcept()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EAttribute getContentElement_Concept();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.ContentElement#getExample <em>Example</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Example</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentElement#getExample()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EAttribute getContentElement_Example();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.ContentElement#getGuideline <em>Guideline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Guideline</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentElement#getGuideline()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EAttribute getContentElement_Guideline();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.ContentElement#getReusableAsset <em>Reusable Asset</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Reusable Asset</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentElement#getReusableAsset()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EAttribute getContentElement_ReusableAsset();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.ContentElement#getSupportingMaterial <em>Supporting Material</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Supporting Material</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentElement#getSupportingMaterial()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EAttribute getContentElement_SupportingMaterial();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.ContentElement#getWhitepaper <em>Whitepaper</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Whitepaper</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentElement#getWhitepaper()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EAttribute getContentElement_Whitepaper();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ContentElement#getVariabilityBasedOnElement <em>Variability Based On Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Variability Based On Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentElement#getVariabilityBasedOnElement()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EAttribute getContentElement_VariabilityBasedOnElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ContentElement#getVariabilityType <em>Variability Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Variability Type</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentElement#getVariabilityType()
-	 * @see #getContentElement()
-	 * @generated
-	 */
-	EAttribute getContentElement_VariabilityType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.ContentPackage <em>Content Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Content Package</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentPackage
-	 * @generated
-	 */
-	EClass getContentPackage();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.ContentPackage#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentPackage#getGroup2()
-	 * @see #getContentPackage()
-	 * @generated
-	 */
-	EAttribute getContentPackage_Group2();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.ContentPackage#getContentElement <em>Content Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Content Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.ContentPackage#getContentElement()
-	 * @see #getContentPackage()
-	 * @generated
-	 */
-	EReference getContentPackage_ContentElement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.CustomCategory <em>Custom Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Custom Category</em>'.
-	 * @see org.eclipse.epf.xml.uma.CustomCategory
-	 * @generated
-	 */
-	EClass getCustomCategory();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.CustomCategory#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.CustomCategory#getGroup2()
-	 * @see #getCustomCategory()
-	 * @generated
-	 */
-	EAttribute getCustomCategory_Group2();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.CustomCategory#getCategorizedElement <em>Categorized Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Categorized Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.CustomCategory#getCategorizedElement()
-	 * @see #getCustomCategory()
-	 * @generated
-	 */
-	EAttribute getCustomCategory_CategorizedElement();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.CustomCategory#getSubCategory <em>Sub Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Sub Category</em>'.
-	 * @see org.eclipse.epf.xml.uma.CustomCategory#getSubCategory()
-	 * @see #getCustomCategory()
-	 * @generated
-	 */
-	EAttribute getCustomCategory_SubCategory();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Deliverable <em>Deliverable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Deliverable</em>'.
-	 * @see org.eclipse.epf.xml.uma.Deliverable
-	 * @generated
-	 */
-	EClass getDeliverable();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Deliverable#getGroup3 <em>Group3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group3</em>'.
-	 * @see org.eclipse.epf.xml.uma.Deliverable#getGroup3()
-	 * @see #getDeliverable()
-	 * @generated
-	 */
-	EAttribute getDeliverable_Group3();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Deliverable#getDeliveredWorkProduct <em>Delivered Work Product</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Delivered Work Product</em>'.
-	 * @see org.eclipse.epf.xml.uma.Deliverable#getDeliveredWorkProduct()
-	 * @see #getDeliverable()
-	 * @generated
-	 */
-	EAttribute getDeliverable_DeliveredWorkProduct();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.DeliverableDescription <em>Deliverable Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Deliverable Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.DeliverableDescription
-	 * @generated
-	 */
-	EClass getDeliverableDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.DeliverableDescription#getExternalDescription <em>External Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>External Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.DeliverableDescription#getExternalDescription()
-	 * @see #getDeliverableDescription()
-	 * @generated
-	 */
-	EAttribute getDeliverableDescription_ExternalDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.DeliverableDescription#getPackagingGuidance <em>Packaging Guidance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Packaging Guidance</em>'.
-	 * @see org.eclipse.epf.xml.uma.DeliverableDescription#getPackagingGuidance()
-	 * @see #getDeliverableDescription()
-	 * @generated
-	 */
-	EAttribute getDeliverableDescription_PackagingGuidance();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.DeliveryProcess <em>Delivery Process</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Delivery Process</em>'.
-	 * @see org.eclipse.epf.xml.uma.DeliveryProcess
-	 * @generated
-	 */
-	EClass getDeliveryProcess();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.DeliveryProcess#getGroup3 <em>Group3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group3</em>'.
-	 * @see org.eclipse.epf.xml.uma.DeliveryProcess#getGroup3()
-	 * @see #getDeliveryProcess()
-	 * @generated
-	 */
-	EAttribute getDeliveryProcess_Group3();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.DeliveryProcess#getCommunicationsMaterial <em>Communications Material</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Communications Material</em>'.
-	 * @see org.eclipse.epf.xml.uma.DeliveryProcess#getCommunicationsMaterial()
-	 * @see #getDeliveryProcess()
-	 * @generated
-	 */
-	EAttribute getDeliveryProcess_CommunicationsMaterial();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.DeliveryProcess#getEducationMaterial <em>Education Material</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Education Material</em>'.
-	 * @see org.eclipse.epf.xml.uma.DeliveryProcess#getEducationMaterial()
-	 * @see #getDeliveryProcess()
-	 * @generated
-	 */
-	EAttribute getDeliveryProcess_EducationMaterial();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription <em>Delivery Process Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Delivery Process Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.DeliveryProcessDescription
-	 * @generated
-	 */
-	EClass getDeliveryProcessDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getScale <em>Scale</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Scale</em>'.
-	 * @see org.eclipse.epf.xml.uma.DeliveryProcessDescription#getScale()
-	 * @see #getDeliveryProcessDescription()
-	 * @generated
-	 */
-	EAttribute getDeliveryProcessDescription_Scale();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getProjectCharacteristics <em>Project Characteristics</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Project Characteristics</em>'.
-	 * @see org.eclipse.epf.xml.uma.DeliveryProcessDescription#getProjectCharacteristics()
-	 * @see #getDeliveryProcessDescription()
-	 * @generated
-	 */
-	EAttribute getDeliveryProcessDescription_ProjectCharacteristics();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getRiskLevel <em>Risk Level</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Risk Level</em>'.
-	 * @see org.eclipse.epf.xml.uma.DeliveryProcessDescription#getRiskLevel()
-	 * @see #getDeliveryProcessDescription()
-	 * @generated
-	 */
-	EAttribute getDeliveryProcessDescription_RiskLevel();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getEstimatingTechnique <em>Estimating Technique</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Estimating Technique</em>'.
-	 * @see org.eclipse.epf.xml.uma.DeliveryProcessDescription#getEstimatingTechnique()
-	 * @see #getDeliveryProcessDescription()
-	 * @generated
-	 */
-	EAttribute getDeliveryProcessDescription_EstimatingTechnique();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getProjectMemberExpertise <em>Project Member Expertise</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Project Member Expertise</em>'.
-	 * @see org.eclipse.epf.xml.uma.DeliveryProcessDescription#getProjectMemberExpertise()
-	 * @see #getDeliveryProcessDescription()
-	 * @generated
-	 */
-	EAttribute getDeliveryProcessDescription_ProjectMemberExpertise();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription#getTypeOfContract <em>Type Of Contract</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type Of Contract</em>'.
-	 * @see org.eclipse.epf.xml.uma.DeliveryProcessDescription#getTypeOfContract()
-	 * @see #getDeliveryProcessDescription()
-	 * @generated
-	 */
-	EAttribute getDeliveryProcessDescription_TypeOfContract();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.DescribableElement <em>Describable Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Describable Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.DescribableElement
-	 * @generated
-	 */
-	EClass getDescribableElement();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.xml.uma.DescribableElement#getPresentation <em>Presentation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Presentation</em>'.
-	 * @see org.eclipse.epf.xml.uma.DescribableElement#getPresentation()
-	 * @see #getDescribableElement()
-	 * @generated
-	 */
-	EReference getDescribableElement_Presentation();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.DescribableElement#getNodeicon <em>Nodeicon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Nodeicon</em>'.
-	 * @see org.eclipse.epf.xml.uma.DescribableElement#getNodeicon()
-	 * @see #getDescribableElement()
-	 * @generated
-	 */
-	EAttribute getDescribableElement_Nodeicon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.DescribableElement#getPresentationName <em>Presentation Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Presentation Name</em>'.
-	 * @see org.eclipse.epf.xml.uma.DescribableElement#getPresentationName()
-	 * @see #getDescribableElement()
-	 * @generated
-	 */
-	EAttribute getDescribableElement_PresentationName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.DescribableElement#getShapeicon <em>Shapeicon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Shapeicon</em>'.
-	 * @see org.eclipse.epf.xml.uma.DescribableElement#getShapeicon()
-	 * @see #getDescribableElement()
-	 * @generated
-	 */
-	EAttribute getDescribableElement_Shapeicon();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Descriptor <em>Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Descriptor</em>'.
-	 * @see org.eclipse.epf.xml.uma.Descriptor
-	 * @generated
-	 */
-	EClass getDescriptor();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Descriptor#isIsSynchronizedWithSource <em>Is Synchronized With Source</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Synchronized With Source</em>'.
-	 * @see org.eclipse.epf.xml.uma.Descriptor#isIsSynchronizedWithSource()
-	 * @see #getDescriptor()
-	 * @generated
-	 */
-	EAttribute getDescriptor_IsSynchronizedWithSource();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.DescriptorDescription <em>Descriptor Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Descriptor Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.DescriptorDescription
-	 * @generated
-	 */
-	EClass getDescriptorDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.DescriptorDescription#getRefinedDescription <em>Refined Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Refined Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.DescriptorDescription#getRefinedDescription()
-	 * @see #getDescriptorDescription()
-	 * @generated
-	 */
-	EAttribute getDescriptorDescription_RefinedDescription();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Discipline <em>Discipline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Discipline</em>'.
-	 * @see org.eclipse.epf.xml.uma.Discipline
-	 * @generated
-	 */
-	EClass getDiscipline();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Discipline#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.Discipline#getGroup2()
-	 * @see #getDiscipline()
-	 * @generated
-	 */
-	EAttribute getDiscipline_Group2();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Discipline#getTask <em>Task</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Task</em>'.
-	 * @see org.eclipse.epf.xml.uma.Discipline#getTask()
-	 * @see #getDiscipline()
-	 * @generated
-	 */
-	EAttribute getDiscipline_Task();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.Discipline#getSubDiscipline <em>Sub Discipline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Sub Discipline</em>'.
-	 * @see org.eclipse.epf.xml.uma.Discipline#getSubDiscipline()
-	 * @see #getDiscipline()
-	 * @generated
-	 */
-	EReference getDiscipline_SubDiscipline();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Discipline#getReferenceWorkflow <em>Reference Workflow</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Reference Workflow</em>'.
-	 * @see org.eclipse.epf.xml.uma.Discipline#getReferenceWorkflow()
-	 * @see #getDiscipline()
-	 * @generated
-	 */
-	EAttribute getDiscipline_ReferenceWorkflow();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.DisciplineGrouping <em>Discipline Grouping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Discipline Grouping</em>'.
-	 * @see org.eclipse.epf.xml.uma.DisciplineGrouping
-	 * @generated
-	 */
-	EClass getDisciplineGrouping();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.DisciplineGrouping#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.DisciplineGrouping#getGroup2()
-	 * @see #getDisciplineGrouping()
-	 * @generated
-	 */
-	EAttribute getDisciplineGrouping_Group2();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.DisciplineGrouping#getDiscipline <em>Discipline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Discipline</em>'.
-	 * @see org.eclipse.epf.xml.uma.DisciplineGrouping#getDiscipline()
-	 * @see #getDisciplineGrouping()
-	 * @generated
-	 */
-	EAttribute getDisciplineGrouping_Discipline();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.DocumentRoot <em>Document Root</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Document Root</em>'.
-	 * @see org.eclipse.epf.xml.uma.DocumentRoot
-	 * @generated
-	 */
-	EClass getDocumentRoot();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.DocumentRoot#getMixed <em>Mixed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Mixed</em>'.
-	 * @see org.eclipse.epf.xml.uma.DocumentRoot#getMixed()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EAttribute getDocumentRoot_Mixed();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.epf.xml.uma.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
-	 * @see org.eclipse.epf.xml.uma.DocumentRoot#getXMLNSPrefixMap()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_XMLNSPrefixMap();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.epf.xml.uma.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>XSI Schema Location</em>'.
-	 * @see org.eclipse.epf.xml.uma.DocumentRoot#getXSISchemaLocation()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_XSISchemaLocation();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.xml.uma.DocumentRoot#getMethodConfiguration <em>Method Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Method Configuration</em>'.
-	 * @see org.eclipse.epf.xml.uma.DocumentRoot#getMethodConfiguration()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_MethodConfiguration();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.xml.uma.DocumentRoot#getMethodLibrary <em>Method Library</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Method Library</em>'.
-	 * @see org.eclipse.epf.xml.uma.DocumentRoot#getMethodLibrary()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_MethodLibrary();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.xml.uma.DocumentRoot#getMethodPlugin <em>Method Plugin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Method Plugin</em>'.
-	 * @see org.eclipse.epf.xml.uma.DocumentRoot#getMethodPlugin()
-	 * @see #getDocumentRoot()
-	 * @generated
-	 */
-	EReference getDocumentRoot_MethodPlugin();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Domain <em>Domain</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Domain</em>'.
-	 * @see org.eclipse.epf.xml.uma.Domain
-	 * @generated
-	 */
-	EClass getDomain();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Domain#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.Domain#getGroup2()
-	 * @see #getDomain()
-	 * @generated
-	 */
-	EAttribute getDomain_Group2();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Domain#getWorkProduct <em>Work Product</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Work Product</em>'.
-	 * @see org.eclipse.epf.xml.uma.Domain#getWorkProduct()
-	 * @see #getDomain()
-	 * @generated
-	 */
-	EAttribute getDomain_WorkProduct();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.Domain#getSubdomain <em>Subdomain</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Subdomain</em>'.
-	 * @see org.eclipse.epf.xml.uma.Domain#getSubdomain()
-	 * @see #getDomain()
-	 * @generated
-	 */
-	EReference getDomain_Subdomain();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Element <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.Element
-	 * @generated
-	 */
-	EClass getElement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Estimate <em>Estimate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Estimate</em>'.
-	 * @see org.eclipse.epf.xml.uma.Estimate
-	 * @generated
-	 */
-	EClass getEstimate();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Estimate#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.Estimate#getGroup2()
-	 * @see #getEstimate()
-	 * @generated
-	 */
-	EAttribute getEstimate_Group2();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Estimate#getEstimationMetric <em>Estimation Metric</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Estimation Metric</em>'.
-	 * @see org.eclipse.epf.xml.uma.Estimate#getEstimationMetric()
-	 * @see #getEstimate()
-	 * @generated
-	 */
-	EAttribute getEstimate_EstimationMetric();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Estimate#getEstimationConsiderations <em>Estimation Considerations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Estimation Considerations</em>'.
-	 * @see org.eclipse.epf.xml.uma.Estimate#getEstimationConsiderations()
-	 * @see #getEstimate()
-	 * @generated
-	 */
-	EAttribute getEstimate_EstimationConsiderations();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.EstimatingMetric <em>Estimating Metric</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Estimating Metric</em>'.
-	 * @see org.eclipse.epf.xml.uma.EstimatingMetric
-	 * @generated
-	 */
-	EClass getEstimatingMetric();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.EstimationConsiderations <em>Estimation Considerations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Estimation Considerations</em>'.
-	 * @see org.eclipse.epf.xml.uma.EstimationConsiderations
-	 * @generated
-	 */
-	EClass getEstimationConsiderations();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Example <em>Example</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Example</em>'.
-	 * @see org.eclipse.epf.xml.uma.Example
-	 * @generated
-	 */
-	EClass getExample();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Guidance <em>Guidance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Guidance</em>'.
-	 * @see org.eclipse.epf.xml.uma.Guidance
-	 * @generated
-	 */
-	EClass getGuidance();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.GuidanceDescription <em>Guidance Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Guidance Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.GuidanceDescription
-	 * @generated
-	 */
-	EClass getGuidanceDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.GuidanceDescription#getAttachment <em>Attachment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Attachment</em>'.
-	 * @see org.eclipse.epf.xml.uma.GuidanceDescription#getAttachment()
-	 * @see #getGuidanceDescription()
-	 * @generated
-	 */
-	EAttribute getGuidanceDescription_Attachment();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Guideline <em>Guideline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Guideline</em>'.
-	 * @see org.eclipse.epf.xml.uma.Guideline
-	 * @generated
-	 */
-	EClass getGuideline();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Iteration <em>Iteration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Iteration</em>'.
-	 * @see org.eclipse.epf.xml.uma.Iteration
-	 * @generated
-	 */
-	EClass getIteration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.MethodConfiguration <em>Method Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Configuration</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodConfiguration
-	 * @generated
-	 */
-	EClass getMethodConfiguration();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.MethodConfiguration#getBaseConfiguration <em>Base Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Base Configuration</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodConfiguration#getBaseConfiguration()
-	 * @see #getMethodConfiguration()
-	 * @generated
-	 */
-	EAttribute getMethodConfiguration_BaseConfiguration();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.MethodConfiguration#getMethodPluginSelection <em>Method Plugin Selection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Method Plugin Selection</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodConfiguration#getMethodPluginSelection()
-	 * @see #getMethodConfiguration()
-	 * @generated
-	 */
-	EAttribute getMethodConfiguration_MethodPluginSelection();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.MethodConfiguration#getMethodPackageSelection <em>Method Package Selection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Method Package Selection</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodConfiguration#getMethodPackageSelection()
-	 * @see #getMethodConfiguration()
-	 * @generated
-	 */
-	EAttribute getMethodConfiguration_MethodPackageSelection();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.MethodConfiguration#getDefaultView <em>Default View</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Default View</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodConfiguration#getDefaultView()
-	 * @see #getMethodConfiguration()
-	 * @generated
-	 */
-	EAttribute getMethodConfiguration_DefaultView();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.MethodConfiguration#getProcessView <em>Process View</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Process View</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodConfiguration#getProcessView()
-	 * @see #getMethodConfiguration()
-	 * @generated
-	 */
-	EAttribute getMethodConfiguration_ProcessView();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.MethodElement <em>Method Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodElement
-	 * @generated
-	 */
-	EClass getMethodElement();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.MethodElement#getGroup <em>Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodElement#getGroup()
-	 * @see #getMethodElement()
-	 * @generated
-	 */
-	EAttribute getMethodElement_Group();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.MethodElement#getOwnedRule <em>Owned Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Owned Rule</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodElement#getOwnedRule()
-	 * @see #getMethodElement()
-	 * @generated
-	 */
-	EReference getMethodElement_OwnedRule();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.MethodElement#getBriefDescription <em>Brief Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Brief Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodElement#getBriefDescription()
-	 * @see #getMethodElement()
-	 * @generated
-	 */
-	EAttribute getMethodElement_BriefDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.MethodElement#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodElement#getId()
-	 * @see #getMethodElement()
-	 * @generated
-	 */
-	EAttribute getMethodElement_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.MethodElement#getOrderingGuide <em>Ordering Guide</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ordering Guide</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodElement#getOrderingGuide()
-	 * @see #getMethodElement()
-	 * @generated
-	 */
-	EAttribute getMethodElement_OrderingGuide();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.MethodElement#isSuppressed <em>Suppressed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Suppressed</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodElement#isSuppressed()
-	 * @see #getMethodElement()
-	 * @generated
-	 */
-	EAttribute getMethodElement_Suppressed();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.MethodLibrary <em>Method Library</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Library</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodLibrary
-	 * @generated
-	 */
-	EClass getMethodLibrary();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.MethodLibrary#getMethodPlugin <em>Method Plugin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Method Plugin</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodLibrary#getMethodPlugin()
-	 * @see #getMethodLibrary()
-	 * @generated
-	 */
-	EReference getMethodLibrary_MethodPlugin();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.MethodLibrary#getMethodConfiguration <em>Method Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Method Configuration</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodLibrary#getMethodConfiguration()
-	 * @see #getMethodLibrary()
-	 * @generated
-	 */
-	EReference getMethodLibrary_MethodConfiguration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.MethodLibrary#getTool <em>Tool</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Tool</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodLibrary#getTool()
-	 * @see #getMethodLibrary()
-	 * @generated
-	 */
-	EAttribute getMethodLibrary_Tool();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.MethodPackage <em>Method Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Package</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodPackage
-	 * @generated
-	 */
-	EClass getMethodPackage();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.MethodPackage#getGroup1 <em>Group1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group1</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodPackage#getGroup1()
-	 * @see #getMethodPackage()
-	 * @generated
-	 */
-	EAttribute getMethodPackage_Group1();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.MethodPackage#getReusedPackage <em>Reused Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Reused Package</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodPackage#getReusedPackage()
-	 * @see #getMethodPackage()
-	 * @generated
-	 */
-	EAttribute getMethodPackage_ReusedPackage();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.MethodPackage#getMethodPackage <em>Method Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Method Package</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodPackage#getMethodPackage()
-	 * @see #getMethodPackage()
-	 * @generated
-	 */
-	EReference getMethodPackage_MethodPackage();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.MethodPackage#isGlobal <em>Global</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Global</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodPackage#isGlobal()
-	 * @see #getMethodPackage()
-	 * @generated
-	 */
-	EAttribute getMethodPackage_Global();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.MethodPlugin <em>Method Plugin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Plugin</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodPlugin
-	 * @generated
-	 */
-	EClass getMethodPlugin();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.MethodPlugin#getReferencedMethodPlugin <em>Referenced Method Plugin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Referenced Method Plugin</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodPlugin#getReferencedMethodPlugin()
-	 * @see #getMethodPlugin()
-	 * @generated
-	 */
-	EAttribute getMethodPlugin_ReferencedMethodPlugin();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.MethodPlugin#getMethodPackage <em>Method Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Method Package</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodPlugin#getMethodPackage()
-	 * @see #getMethodPlugin()
-	 * @generated
-	 */
-	EReference getMethodPlugin_MethodPackage();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.MethodPlugin#isUserChangeable <em>User Changeable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>User Changeable</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodPlugin#isUserChangeable()
-	 * @see #getMethodPlugin()
-	 * @generated
-	 */
-	EAttribute getMethodPlugin_UserChangeable();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.MethodUnit <em>Method Unit</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Unit</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodUnit
-	 * @generated
-	 */
-	EClass getMethodUnit();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.MethodUnit#getCopyright <em>Copyright</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Copyright</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodUnit#getCopyright()
-	 * @see #getMethodUnit()
-	 * @generated
-	 */
-	EAttribute getMethodUnit_Copyright();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.MethodUnit#getAuthors <em>Authors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Authors</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodUnit#getAuthors()
-	 * @see #getMethodUnit()
-	 * @generated
-	 */
-	EAttribute getMethodUnit_Authors();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.MethodUnit#getChangeDate <em>Change Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Change Date</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodUnit#getChangeDate()
-	 * @see #getMethodUnit()
-	 * @generated
-	 */
-	EAttribute getMethodUnit_ChangeDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.MethodUnit#getChangeDescription <em>Change Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Change Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodUnit#getChangeDescription()
-	 * @see #getMethodUnit()
-	 * @generated
-	 */
-	EAttribute getMethodUnit_ChangeDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.MethodUnit#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.epf.xml.uma.MethodUnit#getVersion()
-	 * @see #getMethodUnit()
-	 * @generated
-	 */
-	EAttribute getMethodUnit_Version();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Milestone <em>Milestone</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Milestone</em>'.
-	 * @see org.eclipse.epf.xml.uma.Milestone
-	 * @generated
-	 */
-	EClass getMilestone();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.NamedElement <em>Named Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Named Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.NamedElement
-	 * @generated
-	 */
-	EClass getNamedElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.NamedElement#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.epf.xml.uma.NamedElement#getName()
-	 * @see #getNamedElement()
-	 * @generated
-	 */
-	EAttribute getNamedElement_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Outcome <em>Outcome</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Outcome</em>'.
-	 * @see org.eclipse.epf.xml.uma.Outcome
-	 * @generated
-	 */
-	EClass getOutcome();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.PackageableElement <em>Packageable Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Packageable Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.PackageableElement
-	 * @generated
-	 */
-	EClass getPackageableElement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Phase <em>Phase</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Phase</em>'.
-	 * @see org.eclipse.epf.xml.uma.Phase
-	 * @generated
-	 */
-	EClass getPhase();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.PlanningData <em>Planning Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Planning Data</em>'.
-	 * @see org.eclipse.epf.xml.uma.PlanningData
-	 * @generated
-	 */
-	EClass getPlanningData();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.PlanningData#getFinishDate <em>Finish Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Finish Date</em>'.
-	 * @see org.eclipse.epf.xml.uma.PlanningData#getFinishDate()
-	 * @see #getPlanningData()
-	 * @generated
-	 */
-	EAttribute getPlanningData_FinishDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.PlanningData#getRank <em>Rank</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Rank</em>'.
-	 * @see org.eclipse.epf.xml.uma.PlanningData#getRank()
-	 * @see #getPlanningData()
-	 * @generated
-	 */
-	EAttribute getPlanningData_Rank();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.PlanningData#getStartDate <em>Start Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Start Date</em>'.
-	 * @see org.eclipse.epf.xml.uma.PlanningData#getStartDate()
-	 * @see #getPlanningData()
-	 * @generated
-	 */
-	EAttribute getPlanningData_StartDate();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Practice <em>Practice</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Practice</em>'.
-	 * @see org.eclipse.epf.xml.uma.Practice
-	 * @generated
-	 */
-	EClass getPractice();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Practice#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.Practice#getGroup2()
-	 * @see #getPractice()
-	 * @generated
-	 */
-	EAttribute getPractice_Group2();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Practice#getActivityReference <em>Activity Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Activity Reference</em>'.
-	 * @see org.eclipse.epf.xml.uma.Practice#getActivityReference()
-	 * @see #getPractice()
-	 * @generated
-	 */
-	EAttribute getPractice_ActivityReference();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Practice#getContentReference <em>Content Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Content Reference</em>'.
-	 * @see org.eclipse.epf.xml.uma.Practice#getContentReference()
-	 * @see #getPractice()
-	 * @generated
-	 */
-	EAttribute getPractice_ContentReference();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.Practice#getSubPractice <em>Sub Practice</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Sub Practice</em>'.
-	 * @see org.eclipse.epf.xml.uma.Practice#getSubPractice()
-	 * @see #getPractice()
-	 * @generated
-	 */
-	EReference getPractice_SubPractice();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.PracticeDescription <em>Practice Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Practice Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.PracticeDescription
-	 * @generated
-	 */
-	EClass getPracticeDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.PracticeDescription#getAdditionalInfo <em>Additional Info</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Additional Info</em>'.
-	 * @see org.eclipse.epf.xml.uma.PracticeDescription#getAdditionalInfo()
-	 * @see #getPracticeDescription()
-	 * @generated
-	 */
-	EAttribute getPracticeDescription_AdditionalInfo();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.PracticeDescription#getApplication <em>Application</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Application</em>'.
-	 * @see org.eclipse.epf.xml.uma.PracticeDescription#getApplication()
-	 * @see #getPracticeDescription()
-	 * @generated
-	 */
-	EAttribute getPracticeDescription_Application();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.PracticeDescription#getBackground <em>Background</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Background</em>'.
-	 * @see org.eclipse.epf.xml.uma.PracticeDescription#getBackground()
-	 * @see #getPracticeDescription()
-	 * @generated
-	 */
-	EAttribute getPracticeDescription_Background();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.PracticeDescription#getGoals <em>Goals</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Goals</em>'.
-	 * @see org.eclipse.epf.xml.uma.PracticeDescription#getGoals()
-	 * @see #getPracticeDescription()
-	 * @generated
-	 */
-	EAttribute getPracticeDescription_Goals();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.PracticeDescription#getLevelsOfAdoption <em>Levels Of Adoption</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Levels Of Adoption</em>'.
-	 * @see org.eclipse.epf.xml.uma.PracticeDescription#getLevelsOfAdoption()
-	 * @see #getPracticeDescription()
-	 * @generated
-	 */
-	EAttribute getPracticeDescription_LevelsOfAdoption();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.PracticeDescription#getProblem <em>Problem</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Problem</em>'.
-	 * @see org.eclipse.epf.xml.uma.PracticeDescription#getProblem()
-	 * @see #getPracticeDescription()
-	 * @generated
-	 */
-	EAttribute getPracticeDescription_Problem();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Process <em>Process</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process</em>'.
-	 * @see org.eclipse.epf.xml.uma.Process
-	 * @generated
-	 */
-	EClass getProcess();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Process#getIncludesPattern <em>Includes Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Includes Pattern</em>'.
-	 * @see org.eclipse.epf.xml.uma.Process#getIncludesPattern()
-	 * @see #getProcess()
-	 * @generated
-	 */
-	EAttribute getProcess_IncludesPattern();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Process#getDefaultContext <em>Default Context</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Default Context</em>'.
-	 * @see org.eclipse.epf.xml.uma.Process#getDefaultContext()
-	 * @see #getProcess()
-	 * @generated
-	 */
-	EAttribute getProcess_DefaultContext();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Process#getValidContext <em>Valid Context</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Valid Context</em>'.
-	 * @see org.eclipse.epf.xml.uma.Process#getValidContext()
-	 * @see #getProcess()
-	 * @generated
-	 */
-	EAttribute getProcess_ValidContext();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.ProcessComponent <em>Process Component</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process Component</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessComponent
-	 * @generated
-	 */
-	EClass getProcessComponent();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ProcessComponent#getCopyright <em>Copyright</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Copyright</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessComponent#getCopyright()
-	 * @see #getProcessComponent()
-	 * @generated
-	 */
-	EAttribute getProcessComponent_Copyright();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.xml.uma.ProcessComponent#getInterface <em>Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Interface</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessComponent#getInterface()
-	 * @see #getProcessComponent()
-	 * @generated
-	 */
-	EReference getProcessComponent_Interface();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.xml.uma.ProcessComponent#getProcess <em>Process</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Process</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessComponent#getProcess()
-	 * @see #getProcessComponent()
-	 * @generated
-	 */
-	EReference getProcessComponent_Process();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ProcessComponent#getAuthors <em>Authors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Authors</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessComponent#getAuthors()
-	 * @see #getProcessComponent()
-	 * @generated
-	 */
-	EAttribute getProcessComponent_Authors();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ProcessComponent#getChangeDate <em>Change Date</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Change Date</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessComponent#getChangeDate()
-	 * @see #getProcessComponent()
-	 * @generated
-	 */
-	EAttribute getProcessComponent_ChangeDate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ProcessComponent#getChangeDescription <em>Change Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Change Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessComponent#getChangeDescription()
-	 * @see #getProcessComponent()
-	 * @generated
-	 */
-	EAttribute getProcessComponent_ChangeDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ProcessComponent#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessComponent#getVersion()
-	 * @see #getProcessComponent()
-	 * @generated
-	 */
-	EAttribute getProcessComponent_Version();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.ProcessComponentInterface <em>Process Component Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process Component Interface</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessComponentInterface
-	 * @generated
-	 */
-	EClass getProcessComponentInterface();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.ProcessComponentInterface#getGroup1 <em>Group1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group1</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessComponentInterface#getGroup1()
-	 * @see #getProcessComponentInterface()
-	 * @generated
-	 */
-	EAttribute getProcessComponentInterface_Group1();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.ProcessComponentInterface#getInterfaceSpecification <em>Interface Specification</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Interface Specification</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessComponentInterface#getInterfaceSpecification()
-	 * @see #getProcessComponentInterface()
-	 * @generated
-	 */
-	EReference getProcessComponentInterface_InterfaceSpecification();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.ProcessComponentInterface#getInterfaceIO <em>Interface IO</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Interface IO</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessComponentInterface#getInterfaceIO()
-	 * @see #getProcessComponentInterface()
-	 * @generated
-	 */
-	EReference getProcessComponentInterface_InterfaceIO();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.ProcessDescription <em>Process Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessDescription
-	 * @generated
-	 */
-	EClass getProcessDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ProcessDescription#getScope <em>Scope</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Scope</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessDescription#getScope()
-	 * @see #getProcessDescription()
-	 * @generated
-	 */
-	EAttribute getProcessDescription_Scope();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ProcessDescription#getUsageNotes <em>Usage Notes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Usage Notes</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessDescription#getUsageNotes()
-	 * @see #getProcessDescription()
-	 * @generated
-	 */
-	EAttribute getProcessDescription_UsageNotes();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.ProcessDescription#getExternalId <em>External Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>External Id</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessDescription#getExternalId()
-	 * @see #getProcessDescription()
-	 * @generated
-	 */
-	EAttribute getProcessDescription_ExternalId();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.ProcessElement <em>Process Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessElement
-	 * @generated
-	 */
-	EClass getProcessElement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.ProcessPackage <em>Process Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process Package</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessPackage
-	 * @generated
-	 */
-	EClass getProcessPackage();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.ProcessPackage#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessPackage#getGroup2()
-	 * @see #getProcessPackage()
-	 * @generated
-	 */
-	EAttribute getProcessPackage_Group2();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.ProcessPackage#getProcessElement <em>Process Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Process Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessPackage#getProcessElement()
-	 * @see #getProcessPackage()
-	 * @generated
-	 */
-	EReference getProcessPackage_ProcessElement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.ProcessPlanningTemplate <em>Process Planning Template</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Process Planning Template</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessPlanningTemplate
-	 * @generated
-	 */
-	EClass getProcessPlanningTemplate();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.ProcessPlanningTemplate#getGroup3 <em>Group3</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group3</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessPlanningTemplate#getGroup3()
-	 * @see #getProcessPlanningTemplate()
-	 * @generated
-	 */
-	EAttribute getProcessPlanningTemplate_Group3();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.ProcessPlanningTemplate#getBaseProcess <em>Base Process</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Base Process</em>'.
-	 * @see org.eclipse.epf.xml.uma.ProcessPlanningTemplate#getBaseProcess()
-	 * @see #getProcessPlanningTemplate()
-	 * @generated
-	 */
-	EAttribute getProcessPlanningTemplate_BaseProcess();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Report <em>Report</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Report</em>'.
-	 * @see org.eclipse.epf.xml.uma.Report
-	 * @generated
-	 */
-	EClass getReport();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.ReusableAsset <em>Reusable Asset</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Reusable Asset</em>'.
-	 * @see org.eclipse.epf.xml.uma.ReusableAsset
-	 * @generated
-	 */
-	EClass getReusableAsset();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Roadmap <em>Roadmap</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Roadmap</em>'.
-	 * @see org.eclipse.epf.xml.uma.Roadmap
-	 * @generated
-	 */
-	EClass getRoadmap();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Role <em>Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Role</em>'.
-	 * @see org.eclipse.epf.xml.uma.Role
-	 * @generated
-	 */
-	EClass getRole();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Role#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.Role#getGroup2()
-	 * @see #getRole()
-	 * @generated
-	 */
-	EAttribute getRole_Group2();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Role#getResponsibleFor <em>Responsible For</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Responsible For</em>'.
-	 * @see org.eclipse.epf.xml.uma.Role#getResponsibleFor()
-	 * @see #getRole()
-	 * @generated
-	 */
-	EAttribute getRole_ResponsibleFor();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.RoleDescription <em>Role Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Role Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.RoleDescription
-	 * @generated
-	 */
-	EClass getRoleDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.RoleDescription#getAssignmentApproaches <em>Assignment Approaches</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Assignment Approaches</em>'.
-	 * @see org.eclipse.epf.xml.uma.RoleDescription#getAssignmentApproaches()
-	 * @see #getRoleDescription()
-	 * @generated
-	 */
-	EAttribute getRoleDescription_AssignmentApproaches();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.RoleDescription#getSkills <em>Skills</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Skills</em>'.
-	 * @see org.eclipse.epf.xml.uma.RoleDescription#getSkills()
-	 * @see #getRoleDescription()
-	 * @generated
-	 */
-	EAttribute getRoleDescription_Skills();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.RoleDescription#getSynonyms <em>Synonyms</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Synonyms</em>'.
-	 * @see org.eclipse.epf.xml.uma.RoleDescription#getSynonyms()
-	 * @see #getRoleDescription()
-	 * @generated
-	 */
-	EAttribute getRoleDescription_Synonyms();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.RoleDescriptor <em>Role Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Role Descriptor</em>'.
-	 * @see org.eclipse.epf.xml.uma.RoleDescriptor
-	 * @generated
-	 */
-	EClass getRoleDescriptor();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.RoleDescriptor#getRole <em>Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Role</em>'.
-	 * @see org.eclipse.epf.xml.uma.RoleDescriptor#getRole()
-	 * @see #getRoleDescriptor()
-	 * @generated
-	 */
-	EAttribute getRoleDescriptor_Role();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.RoleDescriptor#getResponsibleFor <em>Responsible For</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Responsible For</em>'.
-	 * @see org.eclipse.epf.xml.uma.RoleDescriptor#getResponsibleFor()
-	 * @see #getRoleDescriptor()
-	 * @generated
-	 */
-	EAttribute getRoleDescriptor_ResponsibleFor();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.RoleSet <em>Role Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Role Set</em>'.
-	 * @see org.eclipse.epf.xml.uma.RoleSet
-	 * @generated
-	 */
-	EClass getRoleSet();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.RoleSet#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.RoleSet#getGroup2()
-	 * @see #getRoleSet()
-	 * @generated
-	 */
-	EAttribute getRoleSet_Group2();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.RoleSet#getRole <em>Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Role</em>'.
-	 * @see org.eclipse.epf.xml.uma.RoleSet#getRole()
-	 * @see #getRoleSet()
-	 * @generated
-	 */
-	EAttribute getRoleSet_Role();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.RoleSetGrouping <em>Role Set Grouping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Role Set Grouping</em>'.
-	 * @see org.eclipse.epf.xml.uma.RoleSetGrouping
-	 * @generated
-	 */
-	EClass getRoleSetGrouping();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.RoleSetGrouping#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.RoleSetGrouping#getGroup2()
-	 * @see #getRoleSetGrouping()
-	 * @generated
-	 */
-	EAttribute getRoleSetGrouping_Group2();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.RoleSetGrouping#getRoleSet <em>Role Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Role Set</em>'.
-	 * @see org.eclipse.epf.xml.uma.RoleSetGrouping#getRoleSet()
-	 * @see #getRoleSetGrouping()
-	 * @generated
-	 */
-	EAttribute getRoleSetGrouping_RoleSet();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Section <em>Section</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Section</em>'.
-	 * @see org.eclipse.epf.xml.uma.Section
-	 * @generated
-	 */
-	EClass getSection();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.epf.xml.uma.Section#getSubSection <em>Sub Section</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Sub Section</em>'.
-	 * @see org.eclipse.epf.xml.uma.Section#getSubSection()
-	 * @see #getSection()
-	 * @generated
-	 */
-	EReference getSection_SubSection();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Section#getPredecessor <em>Predecessor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Predecessor</em>'.
-	 * @see org.eclipse.epf.xml.uma.Section#getPredecessor()
-	 * @see #getSection()
-	 * @generated
-	 */
-	EAttribute getSection_Predecessor();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Section#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.Section#getDescription()
-	 * @see #getSection()
-	 * @generated
-	 */
-	EAttribute getSection_Description();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Section#getSectionName <em>Section Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Section Name</em>'.
-	 * @see org.eclipse.epf.xml.uma.Section#getSectionName()
-	 * @see #getSection()
-	 * @generated
-	 */
-	EAttribute getSection_SectionName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Section#getVariabilityBasedOnElement <em>Variability Based On Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Variability Based On Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.Section#getVariabilityBasedOnElement()
-	 * @see #getSection()
-	 * @generated
-	 */
-	EAttribute getSection_VariabilityBasedOnElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Section#getVariabilityType <em>Variability Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Variability Type</em>'.
-	 * @see org.eclipse.epf.xml.uma.Section#getVariabilityType()
-	 * @see #getSection()
-	 * @generated
-	 */
-	EAttribute getSection_VariabilityType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.SupportingMaterial <em>Supporting Material</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Supporting Material</em>'.
-	 * @see org.eclipse.epf.xml.uma.SupportingMaterial
-	 * @generated
-	 */
-	EClass getSupportingMaterial();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Task <em>Task</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Task</em>'.
-	 * @see org.eclipse.epf.xml.uma.Task
-	 * @generated
-	 */
-	EClass getTask();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Task#getPrecondition <em>Precondition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Precondition</em>'.
-	 * @see org.eclipse.epf.xml.uma.Task#getPrecondition()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Precondition();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Task#getPostcondition <em>Postcondition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Postcondition</em>'.
-	 * @see org.eclipse.epf.xml.uma.Task#getPostcondition()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Postcondition();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.Task#getPerformedBy <em>Performed By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Performed By</em>'.
-	 * @see org.eclipse.epf.xml.uma.Task#getPerformedBy()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_PerformedBy();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Task#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.Task#getGroup2()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Group2();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Task#getMandatoryInput <em>Mandatory Input</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Mandatory Input</em>'.
-	 * @see org.eclipse.epf.xml.uma.Task#getMandatoryInput()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_MandatoryInput();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Task#getOutput <em>Output</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Output</em>'.
-	 * @see org.eclipse.epf.xml.uma.Task#getOutput()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Output();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Task#getAdditionallyPerformedBy <em>Additionally Performed By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Additionally Performed By</em>'.
-	 * @see org.eclipse.epf.xml.uma.Task#getAdditionallyPerformedBy()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_AdditionallyPerformedBy();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Task#getOptionalInput <em>Optional Input</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Optional Input</em>'.
-	 * @see org.eclipse.epf.xml.uma.Task#getOptionalInput()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_OptionalInput();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Task#getEstimate <em>Estimate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Estimate</em>'.
-	 * @see org.eclipse.epf.xml.uma.Task#getEstimate()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_Estimate();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Task#getEstimationConsiderations <em>Estimation Considerations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Estimation Considerations</em>'.
-	 * @see org.eclipse.epf.xml.uma.Task#getEstimationConsiderations()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_EstimationConsiderations();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Task#getToolMentor <em>Tool Mentor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Tool Mentor</em>'.
-	 * @see org.eclipse.epf.xml.uma.Task#getToolMentor()
-	 * @see #getTask()
-	 * @generated
-	 */
-	EAttribute getTask_ToolMentor();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.TaskDescription <em>Task Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Task Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.TaskDescription
-	 * @generated
-	 */
-	EClass getTaskDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.TaskDescription#getAlternatives <em>Alternatives</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Alternatives</em>'.
-	 * @see org.eclipse.epf.xml.uma.TaskDescription#getAlternatives()
-	 * @see #getTaskDescription()
-	 * @generated
-	 */
-	EAttribute getTaskDescription_Alternatives();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.TaskDescription#getPurpose <em>Purpose</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Purpose</em>'.
-	 * @see org.eclipse.epf.xml.uma.TaskDescription#getPurpose()
-	 * @see #getTaskDescription()
-	 * @generated
-	 */
-	EAttribute getTaskDescription_Purpose();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.TaskDescriptor <em>Task Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Task Descriptor</em>'.
-	 * @see org.eclipse.epf.xml.uma.TaskDescriptor
-	 * @generated
-	 */
-	EClass getTaskDescriptor();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.TaskDescriptor#getTask <em>Task</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Task</em>'.
-	 * @see org.eclipse.epf.xml.uma.TaskDescriptor#getTask()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EAttribute getTaskDescriptor_Task();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.TaskDescriptor#getPerformedPrimarilyBy <em>Performed Primarily By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Performed Primarily By</em>'.
-	 * @see org.eclipse.epf.xml.uma.TaskDescriptor#getPerformedPrimarilyBy()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EAttribute getTaskDescriptor_PerformedPrimarilyBy();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.TaskDescriptor#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.TaskDescriptor#getGroup2()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EAttribute getTaskDescriptor_Group2();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.TaskDescriptor#getAdditionallyPerformedBy <em>Additionally Performed By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Additionally Performed By</em>'.
-	 * @see org.eclipse.epf.xml.uma.TaskDescriptor#getAdditionallyPerformedBy()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EAttribute getTaskDescriptor_AdditionallyPerformedBy();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.TaskDescriptor#getAssistedBy <em>Assisted By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Assisted By</em>'.
-	 * @see org.eclipse.epf.xml.uma.TaskDescriptor#getAssistedBy()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EAttribute getTaskDescriptor_AssistedBy();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.TaskDescriptor#getExternalInput <em>External Input</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>External Input</em>'.
-	 * @see org.eclipse.epf.xml.uma.TaskDescriptor#getExternalInput()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EAttribute getTaskDescriptor_ExternalInput();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.TaskDescriptor#getMandatoryInput <em>Mandatory Input</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Mandatory Input</em>'.
-	 * @see org.eclipse.epf.xml.uma.TaskDescriptor#getMandatoryInput()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EAttribute getTaskDescriptor_MandatoryInput();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.TaskDescriptor#getOptionalInput <em>Optional Input</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Optional Input</em>'.
-	 * @see org.eclipse.epf.xml.uma.TaskDescriptor#getOptionalInput()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EAttribute getTaskDescriptor_OptionalInput();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.TaskDescriptor#getOutput <em>Output</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Output</em>'.
-	 * @see org.eclipse.epf.xml.uma.TaskDescriptor#getOutput()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EAttribute getTaskDescriptor_Output();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.TaskDescriptor#getStep <em>Step</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Step</em>'.
-	 * @see org.eclipse.epf.xml.uma.TaskDescriptor#getStep()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EReference getTaskDescriptor_Step();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.TaskDescriptor#isIsSynchronizedWithSource <em>Is Synchronized With Source</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Synchronized With Source</em>'.
-	 * @see org.eclipse.epf.xml.uma.TaskDescriptor#isIsSynchronizedWithSource()
-	 * @see #getTaskDescriptor()
-	 * @generated
-	 */
-	EAttribute getTaskDescriptor_IsSynchronizedWithSource();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.TeamProfile <em>Team Profile</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Team Profile</em>'.
-	 * @see org.eclipse.epf.xml.uma.TeamProfile
-	 * @generated
-	 */
-	EClass getTeamProfile();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.TeamProfile#getGroup1 <em>Group1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group1</em>'.
-	 * @see org.eclipse.epf.xml.uma.TeamProfile#getGroup1()
-	 * @see #getTeamProfile()
-	 * @generated
-	 */
-	EAttribute getTeamProfile_Group1();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.TeamProfile#getRole <em>Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Role</em>'.
-	 * @see org.eclipse.epf.xml.uma.TeamProfile#getRole()
-	 * @see #getTeamProfile()
-	 * @generated
-	 */
-	EAttribute getTeamProfile_Role();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.TeamProfile#getSuperTeam <em>Super Team</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Super Team</em>'.
-	 * @see org.eclipse.epf.xml.uma.TeamProfile#getSuperTeam()
-	 * @see #getTeamProfile()
-	 * @generated
-	 */
-	EAttribute getTeamProfile_SuperTeam();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.TeamProfile#getSubTeam <em>Sub Team</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Sub Team</em>'.
-	 * @see org.eclipse.epf.xml.uma.TeamProfile#getSubTeam()
-	 * @see #getTeamProfile()
-	 * @generated
-	 */
-	EAttribute getTeamProfile_SubTeam();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Template <em>Template</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Template</em>'.
-	 * @see org.eclipse.epf.xml.uma.Template
-	 * @generated
-	 */
-	EClass getTemplate();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.TermDefinition <em>Term Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Term Definition</em>'.
-	 * @see org.eclipse.epf.xml.uma.TermDefinition
-	 * @generated
-	 */
-	EClass getTermDefinition();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Tool <em>Tool</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tool</em>'.
-	 * @see org.eclipse.epf.xml.uma.Tool
-	 * @generated
-	 */
-	EClass getTool();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Tool#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.Tool#getGroup2()
-	 * @see #getTool()
-	 * @generated
-	 */
-	EAttribute getTool_Group2();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.Tool#getToolMentor <em>Tool Mentor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Tool Mentor</em>'.
-	 * @see org.eclipse.epf.xml.uma.Tool#getToolMentor()
-	 * @see #getTool()
-	 * @generated
-	 */
-	EAttribute getTool_ToolMentor();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.ToolMentor <em>Tool Mentor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tool Mentor</em>'.
-	 * @see org.eclipse.epf.xml.uma.ToolMentor
-	 * @generated
-	 */
-	EClass getToolMentor();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.Whitepaper <em>Whitepaper</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Whitepaper</em>'.
-	 * @see org.eclipse.epf.xml.uma.Whitepaper
-	 * @generated
-	 */
-	EClass getWhitepaper();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement <em>Work Breakdown Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Breakdown Element</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkBreakdownElement
-	 * @generated
-	 */
-	EClass getWorkBreakdownElement();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#getGroup1 <em>Group1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group1</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkBreakdownElement#getGroup1()
-	 * @see #getWorkBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getWorkBreakdownElement_Group1();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#getPredecessor <em>Predecessor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Predecessor</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkBreakdownElement#getPredecessor()
-	 * @see #getWorkBreakdownElement()
-	 * @generated
-	 */
-	EReference getWorkBreakdownElement_Predecessor();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsEventDriven <em>Is Event Driven</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Event Driven</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsEventDriven()
-	 * @see #getWorkBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getWorkBreakdownElement_IsEventDriven();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsOngoing <em>Is Ongoing</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Ongoing</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsOngoing()
-	 * @see #getWorkBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getWorkBreakdownElement_IsOngoing();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsRepeatable <em>Is Repeatable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Repeatable</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsRepeatable()
-	 * @see #getWorkBreakdownElement()
-	 * @generated
-	 */
-	EAttribute getWorkBreakdownElement_IsRepeatable();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.WorkDefinition <em>Work Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Definition</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkDefinition
-	 * @generated
-	 */
-	EClass getWorkDefinition();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.WorkDefinition#getPrecondition <em>Precondition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Precondition</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkDefinition#getPrecondition()
-	 * @see #getWorkDefinition()
-	 * @generated
-	 */
-	EAttribute getWorkDefinition_Precondition();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.WorkDefinition#getPostcondition <em>Postcondition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Postcondition</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkDefinition#getPostcondition()
-	 * @see #getWorkDefinition()
-	 * @generated
-	 */
-	EAttribute getWorkDefinition_Postcondition();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.WorkOrder <em>Work Order</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Order</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkOrder
-	 * @generated
-	 */
-	EClass getWorkOrder();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.WorkOrder#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkOrder#getValue()
-	 * @see #getWorkOrder()
-	 * @generated
-	 */
-	EAttribute getWorkOrder_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.WorkOrder#getLinkType <em>Link Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Link Type</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkOrder#getLinkType()
-	 * @see #getWorkOrder()
-	 * @generated
-	 */
-	EAttribute getWorkOrder_LinkType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.WorkOrder#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkOrder#getId()
-	 * @see #getWorkOrder()
-	 * @generated
-	 */
-	EAttribute getWorkOrder_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.WorkProduct <em>Work Product</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Product</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProduct
-	 * @generated
-	 */
-	EClass getWorkProduct();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.WorkProduct#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProduct#getGroup2()
-	 * @see #getWorkProduct()
-	 * @generated
-	 */
-	EAttribute getWorkProduct_Group2();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.WorkProduct#getEstimate <em>Estimate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Estimate</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProduct#getEstimate()
-	 * @see #getWorkProduct()
-	 * @generated
-	 */
-	EAttribute getWorkProduct_Estimate();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.WorkProduct#getEstimationConsiderations <em>Estimation Considerations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Estimation Considerations</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProduct#getEstimationConsiderations()
-	 * @see #getWorkProduct()
-	 * @generated
-	 */
-	EAttribute getWorkProduct_EstimationConsiderations();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.WorkProduct#getReport <em>Report</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Report</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProduct#getReport()
-	 * @see #getWorkProduct()
-	 * @generated
-	 */
-	EAttribute getWorkProduct_Report();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.WorkProduct#getTemplate <em>Template</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Template</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProduct#getTemplate()
-	 * @see #getWorkProduct()
-	 * @generated
-	 */
-	EAttribute getWorkProduct_Template();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.WorkProduct#getToolMentor <em>Tool Mentor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Tool Mentor</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProduct#getToolMentor()
-	 * @see #getWorkProduct()
-	 * @generated
-	 */
-	EAttribute getWorkProduct_ToolMentor();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.WorkProductDescription <em>Work Product Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Product Description</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductDescription
-	 * @generated
-	 */
-	EClass getWorkProductDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.WorkProductDescription#getImpactOfNotHaving <em>Impact Of Not Having</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Impact Of Not Having</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductDescription#getImpactOfNotHaving()
-	 * @see #getWorkProductDescription()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescription_ImpactOfNotHaving();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.WorkProductDescription#getPurpose <em>Purpose</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Purpose</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductDescription#getPurpose()
-	 * @see #getWorkProductDescription()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescription_Purpose();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.WorkProductDescription#getReasonsForNotNeeding <em>Reasons For Not Needing</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Reasons For Not Needing</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductDescription#getReasonsForNotNeeding()
-	 * @see #getWorkProductDescription()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescription_ReasonsForNotNeeding();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.WorkProductDescription#getExternalId <em>External Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>External Id</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductDescription#getExternalId()
-	 * @see #getWorkProductDescription()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescription_ExternalId();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.WorkProductDescriptor <em>Work Product Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Product Descriptor</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductDescriptor
-	 * @generated
-	 */
-	EClass getWorkProductDescriptor();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getWorkProduct <em>Work Product</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Work Product</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductDescriptor#getWorkProduct()
-	 * @see #getWorkProductDescriptor()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescriptor_WorkProduct();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getGroup1 <em>Group1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group1</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductDescriptor#getGroup1()
-	 * @see #getWorkProductDescriptor()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescriptor_Group1();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getImpactedBy <em>Impacted By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Impacted By</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductDescriptor#getImpactedBy()
-	 * @see #getWorkProductDescriptor()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescriptor_ImpactedBy();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getImpacts <em>Impacts</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Impacts</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductDescriptor#getImpacts()
-	 * @see #getWorkProductDescriptor()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescriptor_Impacts();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getDeliverableParts <em>Deliverable Parts</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Deliverable Parts</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductDescriptor#getDeliverableParts()
-	 * @see #getWorkProductDescriptor()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescriptor_DeliverableParts();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getActivityEntryState <em>Activity Entry State</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Activity Entry State</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductDescriptor#getActivityEntryState()
-	 * @see #getWorkProductDescriptor()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescriptor_ActivityEntryState();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getActivityExitState <em>Activity Exit State</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Activity Exit State</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductDescriptor#getActivityExitState()
-	 * @see #getWorkProductDescriptor()
-	 * @generated
-	 */
-	EAttribute getWorkProductDescriptor_ActivityExitState();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.epf.xml.uma.WorkProductType <em>Work Product Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Work Product Type</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductType
-	 * @generated
-	 */
-	EClass getWorkProductType();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.WorkProductType#getGroup2 <em>Group2</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Group2</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductType#getGroup2()
-	 * @see #getWorkProductType()
-	 * @generated
-	 */
-	EAttribute getWorkProductType_Group2();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.epf.xml.uma.WorkProductType#getWorkProduct <em>Work Product</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Work Product</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkProductType#getWorkProduct()
-	 * @see #getWorkProductType()
-	 * @generated
-	 */
-	EAttribute getWorkProductType_WorkProduct();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.epf.xml.uma.VariabilityType <em>Variability Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Variability Type</em>'.
-	 * @see org.eclipse.epf.xml.uma.VariabilityType
-	 * @generated
-	 */
-	EEnum getVariabilityType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.epf.xml.uma.WorkOrderType <em>Work Order Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Work Order Type</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkOrderType
-	 * @generated
-	 */
-	EEnum getWorkOrderType();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.epf.xml.uma.VariabilityType <em>Variability Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Variability Type Object</em>'.
-	 * @see org.eclipse.epf.xml.uma.VariabilityType
-	 * @model instanceClass="org.eclipse.epf.xml.uma.VariabilityType"
-	 *        extendedMetaData="name='VariabilityType:Object' baseType='VariabilityType'" 
-	 * @generated
-	 */
-	EDataType getVariabilityTypeObject();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.epf.xml.uma.WorkOrderType <em>Work Order Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Work Order Type Object</em>'.
-	 * @see org.eclipse.epf.xml.uma.WorkOrderType
-	 * @model instanceClass="org.eclipse.epf.xml.uma.WorkOrderType"
-	 *        extendedMetaData="name='WorkOrderType:Object' baseType='WorkOrderType'" 
-	 * @generated
-	 */
-	EDataType getWorkOrderTypeObject();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	UmaFactory getUmaFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ActivityImpl <em>Activity</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ActivityImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getActivity()
-		 * @generated
-		 */
-		EClass ACTIVITY = eINSTANCE.getActivity();
-
-		/**
-		 * The meta object literal for the '<em><b>Precondition</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY__PRECONDITION = eINSTANCE.getActivity_Precondition();
-
-		/**
-		 * The meta object literal for the '<em><b>Postcondition</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY__POSTCONDITION = eINSTANCE.getActivity_Postcondition();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY__GROUP2 = eINSTANCE.getActivity_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Breakdown Element</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ACTIVITY__BREAKDOWN_ELEMENT = eINSTANCE.getActivity_BreakdownElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Checklist</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY__CHECKLIST = eINSTANCE.getActivity_Checklist();
-
-		/**
-		 * The meta object literal for the '<em><b>Concept</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY__CONCEPT = eINSTANCE.getActivity_Concept();
-
-		/**
-		 * The meta object literal for the '<em><b>Example</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY__EXAMPLE = eINSTANCE.getActivity_Example();
-
-		/**
-		 * The meta object literal for the '<em><b>Guideline</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY__GUIDELINE = eINSTANCE.getActivity_Guideline();
-
-		/**
-		 * The meta object literal for the '<em><b>Roadmap</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY__ROADMAP = eINSTANCE.getActivity_Roadmap();
-
-		/**
-		 * The meta object literal for the '<em><b>Reusable Asset</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY__REUSABLE_ASSET = eINSTANCE.getActivity_ReusableAsset();
-
-		/**
-		 * The meta object literal for the '<em><b>Supporting Material</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY__SUPPORTING_MATERIAL = eINSTANCE.getActivity_SupportingMaterial();
-
-		/**
-		 * The meta object literal for the '<em><b>Whitepaper</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY__WHITEPAPER = eINSTANCE.getActivity_Whitepaper();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Enactable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY__IS_ENACTABLE = eINSTANCE.getActivity_IsEnactable();
-
-		/**
-		 * The meta object literal for the '<em><b>Variability Based On Element</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY__VARIABILITY_BASED_ON_ELEMENT = eINSTANCE.getActivity_VariabilityBasedOnElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Variability Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY__VARIABILITY_TYPE = eINSTANCE.getActivity_VariabilityType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ActivityDescriptionImpl <em>Activity Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ActivityDescriptionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getActivityDescription()
-		 * @generated
-		 */
-		EClass ACTIVITY_DESCRIPTION = eINSTANCE.getActivityDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Alternatives</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY_DESCRIPTION__ALTERNATIVES = eINSTANCE.getActivityDescription_Alternatives();
-
-		/**
-		 * The meta object literal for the '<em><b>How To Staff</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY_DESCRIPTION__HOW_TO_STAFF = eINSTANCE.getActivityDescription_HowToStaff();
-
-		/**
-		 * The meta object literal for the '<em><b>Purpose</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ACTIVITY_DESCRIPTION__PURPOSE = eINSTANCE.getActivityDescription_Purpose();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ArtifactImpl <em>Artifact</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ArtifactImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getArtifact()
-		 * @generated
-		 */
-		EClass ARTIFACT = eINSTANCE.getArtifact();
-
-		/**
-		 * The meta object literal for the '<em><b>Group3</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ARTIFACT__GROUP3 = eINSTANCE.getArtifact_Group3();
-
-		/**
-		 * The meta object literal for the '<em><b>Contained Artifact</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ARTIFACT__CONTAINED_ARTIFACT = eINSTANCE.getArtifact_ContainedArtifact();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ArtifactDescriptionImpl <em>Artifact Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ArtifactDescriptionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getArtifactDescription()
-		 * @generated
-		 */
-		EClass ARTIFACT_DESCRIPTION = eINSTANCE.getArtifactDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Brief Outline</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ARTIFACT_DESCRIPTION__BRIEF_OUTLINE = eINSTANCE.getArtifactDescription_BriefOutline();
-
-		/**
-		 * The meta object literal for the '<em><b>Representation Options</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS = eINSTANCE.getArtifactDescription_RepresentationOptions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.BreakdownElementImpl <em>Breakdown Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.BreakdownElementImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getBreakdownElement()
-		 * @generated
-		 */
-		EClass BREAKDOWN_ELEMENT = eINSTANCE.getBreakdownElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Presented After</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BREAKDOWN_ELEMENT__PRESENTED_AFTER = eINSTANCE.getBreakdownElement_PresentedAfter();
-
-		/**
-		 * The meta object literal for the '<em><b>Presented Before</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BREAKDOWN_ELEMENT__PRESENTED_BEFORE = eINSTANCE.getBreakdownElement_PresentedBefore();
-
-		/**
-		 * The meta object literal for the '<em><b>Planning Data</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BREAKDOWN_ELEMENT__PLANNING_DATA = eINSTANCE.getBreakdownElement_PlanningData();
-
-		/**
-		 * The meta object literal for the '<em><b>Super Activity</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BREAKDOWN_ELEMENT__SUPER_ACTIVITY = eINSTANCE.getBreakdownElement_SuperActivity();
-
-		/**
-		 * The meta object literal for the '<em><b>Has Multiple Occurrences</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES = eINSTANCE.getBreakdownElement_HasMultipleOccurrences();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Optional</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BREAKDOWN_ELEMENT__IS_OPTIONAL = eINSTANCE.getBreakdownElement_IsOptional();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Planned</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BREAKDOWN_ELEMENT__IS_PLANNED = eINSTANCE.getBreakdownElement_IsPlanned();
-
-		/**
-		 * The meta object literal for the '<em><b>Prefix</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BREAKDOWN_ELEMENT__PREFIX = eINSTANCE.getBreakdownElement_Prefix();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.BreakdownElementDescriptionImpl <em>Breakdown Element Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.BreakdownElementDescriptionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getBreakdownElementDescription()
-		 * @generated
-		 */
-		EClass BREAKDOWN_ELEMENT_DESCRIPTION = eINSTANCE.getBreakdownElementDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Usage Guidance</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE = eINSTANCE.getBreakdownElementDescription_UsageGuidance();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.CapabilityPatternImpl <em>Capability Pattern</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.CapabilityPatternImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getCapabilityPattern()
-		 * @generated
-		 */
-		EClass CAPABILITY_PATTERN = eINSTANCE.getCapabilityPattern();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ChecklistImpl <em>Checklist</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ChecklistImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getChecklist()
-		 * @generated
-		 */
-		EClass CHECKLIST = eINSTANCE.getChecklist();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.CompositeRoleImpl <em>Composite Role</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.CompositeRoleImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getCompositeRole()
-		 * @generated
-		 */
-		EClass COMPOSITE_ROLE = eINSTANCE.getCompositeRole();
-
-		/**
-		 * The meta object literal for the '<em><b>Group1</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute COMPOSITE_ROLE__GROUP1 = eINSTANCE.getCompositeRole_Group1();
-
-		/**
-		 * The meta object literal for the '<em><b>Aggregated Role</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference COMPOSITE_ROLE__AGGREGATED_ROLE = eINSTANCE.getCompositeRole_AggregatedRole();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ConceptImpl <em>Concept</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ConceptImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getConcept()
-		 * @generated
-		 */
-		EClass CONCEPT = eINSTANCE.getConcept();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ConstraintImpl <em>Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ConstraintImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getConstraint()
-		 * @generated
-		 */
-		EClass CONSTRAINT = eINSTANCE.getConstraint();
-
-		/**
-		 * The meta object literal for the '<em><b>Main Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONSTRAINT__MAIN_DESCRIPTION = eINSTANCE.getConstraint_MainDescription();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ContentCategoryImpl <em>Content Category</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ContentCategoryImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getContentCategory()
-		 * @generated
-		 */
-		EClass CONTENT_CATEGORY = eINSTANCE.getContentCategory();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ContentCategoryPackageImpl <em>Content Category Package</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ContentCategoryPackageImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getContentCategoryPackage()
-		 * @generated
-		 */
-		EClass CONTENT_CATEGORY_PACKAGE = eINSTANCE.getContentCategoryPackage();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_CATEGORY_PACKAGE__GROUP2 = eINSTANCE.getContentCategoryPackage_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Content Category</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTENT_CATEGORY_PACKAGE__CONTENT_CATEGORY = eINSTANCE.getContentCategoryPackage_ContentCategory();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ContentDescriptionImpl <em>Content Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ContentDescriptionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getContentDescription()
-		 * @generated
-		 */
-		EClass CONTENT_DESCRIPTION = eINSTANCE.getContentDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Main Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_DESCRIPTION__MAIN_DESCRIPTION = eINSTANCE.getContentDescription_MainDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Key Considerations</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_DESCRIPTION__KEY_CONSIDERATIONS = eINSTANCE.getContentDescription_KeyConsiderations();
-
-		/**
-		 * The meta object literal for the '<em><b>Section</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTENT_DESCRIPTION__SECTION = eINSTANCE.getContentDescription_Section();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ContentElementImpl <em>Content Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ContentElementImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getContentElement()
-		 * @generated
-		 */
-		EClass CONTENT_ELEMENT = eINSTANCE.getContentElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Group1</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_ELEMENT__GROUP1 = eINSTANCE.getContentElement_Group1();
-
-		/**
-		 * The meta object literal for the '<em><b>Checklist</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_ELEMENT__CHECKLIST = eINSTANCE.getContentElement_Checklist();
-
-		/**
-		 * The meta object literal for the '<em><b>Concept</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_ELEMENT__CONCEPT = eINSTANCE.getContentElement_Concept();
-
-		/**
-		 * The meta object literal for the '<em><b>Example</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_ELEMENT__EXAMPLE = eINSTANCE.getContentElement_Example();
-
-		/**
-		 * The meta object literal for the '<em><b>Guideline</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_ELEMENT__GUIDELINE = eINSTANCE.getContentElement_Guideline();
-
-		/**
-		 * The meta object literal for the '<em><b>Reusable Asset</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_ELEMENT__REUSABLE_ASSET = eINSTANCE.getContentElement_ReusableAsset();
-
-		/**
-		 * The meta object literal for the '<em><b>Supporting Material</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_ELEMENT__SUPPORTING_MATERIAL = eINSTANCE.getContentElement_SupportingMaterial();
-
-		/**
-		 * The meta object literal for the '<em><b>Whitepaper</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_ELEMENT__WHITEPAPER = eINSTANCE.getContentElement_Whitepaper();
-
-		/**
-		 * The meta object literal for the '<em><b>Variability Based On Element</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT = eINSTANCE.getContentElement_VariabilityBasedOnElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Variability Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_ELEMENT__VARIABILITY_TYPE = eINSTANCE.getContentElement_VariabilityType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ContentPackageImpl <em>Content Package</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ContentPackageImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getContentPackage()
-		 * @generated
-		 */
-		EClass CONTENT_PACKAGE = eINSTANCE.getContentPackage();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CONTENT_PACKAGE__GROUP2 = eINSTANCE.getContentPackage_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Content Element</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTENT_PACKAGE__CONTENT_ELEMENT = eINSTANCE.getContentPackage_ContentElement();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.CustomCategoryImpl <em>Custom Category</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.CustomCategoryImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getCustomCategory()
-		 * @generated
-		 */
-		EClass CUSTOM_CATEGORY = eINSTANCE.getCustomCategory();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CUSTOM_CATEGORY__GROUP2 = eINSTANCE.getCustomCategory_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Categorized Element</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CUSTOM_CATEGORY__CATEGORIZED_ELEMENT = eINSTANCE.getCustomCategory_CategorizedElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Sub Category</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CUSTOM_CATEGORY__SUB_CATEGORY = eINSTANCE.getCustomCategory_SubCategory();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.DeliverableImpl <em>Deliverable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.DeliverableImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDeliverable()
-		 * @generated
-		 */
-		EClass DELIVERABLE = eINSTANCE.getDeliverable();
-
-		/**
-		 * The meta object literal for the '<em><b>Group3</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERABLE__GROUP3 = eINSTANCE.getDeliverable_Group3();
-
-		/**
-		 * The meta object literal for the '<em><b>Delivered Work Product</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERABLE__DELIVERED_WORK_PRODUCT = eINSTANCE.getDeliverable_DeliveredWorkProduct();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.DeliverableDescriptionImpl <em>Deliverable Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.DeliverableDescriptionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDeliverableDescription()
-		 * @generated
-		 */
-		EClass DELIVERABLE_DESCRIPTION = eINSTANCE.getDeliverableDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>External Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION = eINSTANCE.getDeliverableDescription_ExternalDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Packaging Guidance</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE = eINSTANCE.getDeliverableDescription_PackagingGuidance();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.DeliveryProcessImpl <em>Delivery Process</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.DeliveryProcessImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDeliveryProcess()
-		 * @generated
-		 */
-		EClass DELIVERY_PROCESS = eINSTANCE.getDeliveryProcess();
-
-		/**
-		 * The meta object literal for the '<em><b>Group3</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERY_PROCESS__GROUP3 = eINSTANCE.getDeliveryProcess_Group3();
-
-		/**
-		 * The meta object literal for the '<em><b>Communications Material</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERY_PROCESS__COMMUNICATIONS_MATERIAL = eINSTANCE.getDeliveryProcess_CommunicationsMaterial();
-
-		/**
-		 * The meta object literal for the '<em><b>Education Material</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERY_PROCESS__EDUCATION_MATERIAL = eINSTANCE.getDeliveryProcess_EducationMaterial();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.DeliveryProcessDescriptionImpl <em>Delivery Process Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.DeliveryProcessDescriptionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDeliveryProcessDescription()
-		 * @generated
-		 */
-		EClass DELIVERY_PROCESS_DESCRIPTION = eINSTANCE.getDeliveryProcessDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Scale</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERY_PROCESS_DESCRIPTION__SCALE = eINSTANCE.getDeliveryProcessDescription_Scale();
-
-		/**
-		 * The meta object literal for the '<em><b>Project Characteristics</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS = eINSTANCE.getDeliveryProcessDescription_ProjectCharacteristics();
-
-		/**
-		 * The meta object literal for the '<em><b>Risk Level</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL = eINSTANCE.getDeliveryProcessDescription_RiskLevel();
-
-		/**
-		 * The meta object literal for the '<em><b>Estimating Technique</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE = eINSTANCE.getDeliveryProcessDescription_EstimatingTechnique();
-
-		/**
-		 * The meta object literal for the '<em><b>Project Member Expertise</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE = eINSTANCE.getDeliveryProcessDescription_ProjectMemberExpertise();
-
-		/**
-		 * The meta object literal for the '<em><b>Type Of Contract</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT = eINSTANCE.getDeliveryProcessDescription_TypeOfContract();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.DescribableElementImpl <em>Describable Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.DescribableElementImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDescribableElement()
-		 * @generated
-		 */
-		EClass DESCRIBABLE_ELEMENT = eINSTANCE.getDescribableElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Presentation</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DESCRIBABLE_ELEMENT__PRESENTATION = eINSTANCE.getDescribableElement_Presentation();
-
-		/**
-		 * The meta object literal for the '<em><b>Nodeicon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DESCRIBABLE_ELEMENT__NODEICON = eINSTANCE.getDescribableElement_Nodeicon();
-
-		/**
-		 * The meta object literal for the '<em><b>Presentation Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DESCRIBABLE_ELEMENT__PRESENTATION_NAME = eINSTANCE.getDescribableElement_PresentationName();
-
-		/**
-		 * The meta object literal for the '<em><b>Shapeicon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DESCRIBABLE_ELEMENT__SHAPEICON = eINSTANCE.getDescribableElement_Shapeicon();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.DescriptorImpl <em>Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.DescriptorImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDescriptor()
-		 * @generated
-		 */
-		EClass DESCRIPTOR = eINSTANCE.getDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Synchronized With Source</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE = eINSTANCE.getDescriptor_IsSynchronizedWithSource();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.DescriptorDescriptionImpl <em>Descriptor Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.DescriptorDescriptionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDescriptorDescription()
-		 * @generated
-		 */
-		EClass DESCRIPTOR_DESCRIPTION = eINSTANCE.getDescriptorDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Refined Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION = eINSTANCE.getDescriptorDescription_RefinedDescription();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.DisciplineImpl <em>Discipline</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.DisciplineImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDiscipline()
-		 * @generated
-		 */
-		EClass DISCIPLINE = eINSTANCE.getDiscipline();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DISCIPLINE__GROUP2 = eINSTANCE.getDiscipline_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Task</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DISCIPLINE__TASK = eINSTANCE.getDiscipline_Task();
-
-		/**
-		 * The meta object literal for the '<em><b>Sub Discipline</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DISCIPLINE__SUB_DISCIPLINE = eINSTANCE.getDiscipline_SubDiscipline();
-
-		/**
-		 * The meta object literal for the '<em><b>Reference Workflow</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DISCIPLINE__REFERENCE_WORKFLOW = eINSTANCE.getDiscipline_ReferenceWorkflow();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.DisciplineGroupingImpl <em>Discipline Grouping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.DisciplineGroupingImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDisciplineGrouping()
-		 * @generated
-		 */
-		EClass DISCIPLINE_GROUPING = eINSTANCE.getDisciplineGrouping();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DISCIPLINE_GROUPING__GROUP2 = eINSTANCE.getDisciplineGrouping_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Discipline</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DISCIPLINE_GROUPING__DISCIPLINE = eINSTANCE.getDisciplineGrouping_Discipline();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.DocumentRootImpl <em>Document Root</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.DocumentRootImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDocumentRoot()
-		 * @generated
-		 */
-		EClass DOCUMENT_ROOT = eINSTANCE.getDocumentRoot();
-
-		/**
-		 * The meta object literal for the '<em><b>Mixed</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DOCUMENT_ROOT__MIXED = eINSTANCE.getDocumentRoot_Mixed();
-
-		/**
-		 * The meta object literal for the '<em><b>XMLNS Prefix Map</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DOCUMENT_ROOT__XMLNS_PREFIX_MAP = eINSTANCE.getDocumentRoot_XMLNSPrefixMap();
-
-		/**
-		 * The meta object literal for the '<em><b>XSI Schema Location</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = eINSTANCE.getDocumentRoot_XSISchemaLocation();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Configuration</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DOCUMENT_ROOT__METHOD_CONFIGURATION = eINSTANCE.getDocumentRoot_MethodConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Library</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DOCUMENT_ROOT__METHOD_LIBRARY = eINSTANCE.getDocumentRoot_MethodLibrary();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Plugin</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DOCUMENT_ROOT__METHOD_PLUGIN = eINSTANCE.getDocumentRoot_MethodPlugin();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.DomainImpl <em>Domain</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.DomainImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getDomain()
-		 * @generated
-		 */
-		EClass DOMAIN = eINSTANCE.getDomain();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DOMAIN__GROUP2 = eINSTANCE.getDomain_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Work Product</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DOMAIN__WORK_PRODUCT = eINSTANCE.getDomain_WorkProduct();
-
-		/**
-		 * The meta object literal for the '<em><b>Subdomain</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DOMAIN__SUBDOMAIN = eINSTANCE.getDomain_Subdomain();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ElementImpl <em>Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ElementImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getElement()
-		 * @generated
-		 */
-		EClass ELEMENT = eINSTANCE.getElement();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.EstimateImpl <em>Estimate</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.EstimateImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getEstimate()
-		 * @generated
-		 */
-		EClass ESTIMATE = eINSTANCE.getEstimate();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ESTIMATE__GROUP2 = eINSTANCE.getEstimate_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Estimation Metric</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ESTIMATE__ESTIMATION_METRIC = eINSTANCE.getEstimate_EstimationMetric();
-
-		/**
-		 * The meta object literal for the '<em><b>Estimation Considerations</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ESTIMATE__ESTIMATION_CONSIDERATIONS = eINSTANCE.getEstimate_EstimationConsiderations();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.EstimatingMetricImpl <em>Estimating Metric</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.EstimatingMetricImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getEstimatingMetric()
-		 * @generated
-		 */
-		EClass ESTIMATING_METRIC = eINSTANCE.getEstimatingMetric();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.EstimationConsiderationsImpl <em>Estimation Considerations</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.EstimationConsiderationsImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getEstimationConsiderations()
-		 * @generated
-		 */
-		EClass ESTIMATION_CONSIDERATIONS = eINSTANCE.getEstimationConsiderations();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ExampleImpl <em>Example</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ExampleImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getExample()
-		 * @generated
-		 */
-		EClass EXAMPLE = eINSTANCE.getExample();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.GuidanceImpl <em>Guidance</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.GuidanceImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getGuidance()
-		 * @generated
-		 */
-		EClass GUIDANCE = eINSTANCE.getGuidance();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.GuidanceDescriptionImpl <em>Guidance Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.GuidanceDescriptionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getGuidanceDescription()
-		 * @generated
-		 */
-		EClass GUIDANCE_DESCRIPTION = eINSTANCE.getGuidanceDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Attachment</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute GUIDANCE_DESCRIPTION__ATTACHMENT = eINSTANCE.getGuidanceDescription_Attachment();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.GuidelineImpl <em>Guideline</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.GuidelineImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getGuideline()
-		 * @generated
-		 */
-		EClass GUIDELINE = eINSTANCE.getGuideline();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.IterationImpl <em>Iteration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.IterationImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getIteration()
-		 * @generated
-		 */
-		EClass ITERATION = eINSTANCE.getIteration();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.MethodConfigurationImpl <em>Method Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.MethodConfigurationImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getMethodConfiguration()
-		 * @generated
-		 */
-		EClass METHOD_CONFIGURATION = eINSTANCE.getMethodConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Base Configuration</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_CONFIGURATION__BASE_CONFIGURATION = eINSTANCE.getMethodConfiguration_BaseConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Plugin Selection</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION = eINSTANCE.getMethodConfiguration_MethodPluginSelection();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Package Selection</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION = eINSTANCE.getMethodConfiguration_MethodPackageSelection();
-
-		/**
-		 * The meta object literal for the '<em><b>Default View</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_CONFIGURATION__DEFAULT_VIEW = eINSTANCE.getMethodConfiguration_DefaultView();
-
-		/**
-		 * The meta object literal for the '<em><b>Process View</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_CONFIGURATION__PROCESS_VIEW = eINSTANCE.getMethodConfiguration_ProcessView();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.MethodElementImpl <em>Method Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.MethodElementImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getMethodElement()
-		 * @generated
-		 */
-		EClass METHOD_ELEMENT = eINSTANCE.getMethodElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Group</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_ELEMENT__GROUP = eINSTANCE.getMethodElement_Group();
-
-		/**
-		 * The meta object literal for the '<em><b>Owned Rule</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_ELEMENT__OWNED_RULE = eINSTANCE.getMethodElement_OwnedRule();
-
-		/**
-		 * The meta object literal for the '<em><b>Brief Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_ELEMENT__BRIEF_DESCRIPTION = eINSTANCE.getMethodElement_BriefDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_ELEMENT__ID = eINSTANCE.getMethodElement_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Ordering Guide</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_ELEMENT__ORDERING_GUIDE = eINSTANCE.getMethodElement_OrderingGuide();
-
-		/**
-		 * The meta object literal for the '<em><b>Suppressed</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_ELEMENT__SUPPRESSED = eINSTANCE.getMethodElement_Suppressed();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.MethodLibraryImpl <em>Method Library</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.MethodLibraryImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getMethodLibrary()
-		 * @generated
-		 */
-		EClass METHOD_LIBRARY = eINSTANCE.getMethodLibrary();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Plugin</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_LIBRARY__METHOD_PLUGIN = eINSTANCE.getMethodLibrary_MethodPlugin();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Configuration</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_LIBRARY__METHOD_CONFIGURATION = eINSTANCE.getMethodLibrary_MethodConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Tool</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_LIBRARY__TOOL = eINSTANCE.getMethodLibrary_Tool();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.MethodPackageImpl <em>Method Package</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.MethodPackageImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getMethodPackage()
-		 * @generated
-		 */
-		EClass METHOD_PACKAGE = eINSTANCE.getMethodPackage();
-
-		/**
-		 * The meta object literal for the '<em><b>Group1</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PACKAGE__GROUP1 = eINSTANCE.getMethodPackage_Group1();
-
-		/**
-		 * The meta object literal for the '<em><b>Reused Package</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PACKAGE__REUSED_PACKAGE = eINSTANCE.getMethodPackage_ReusedPackage();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Package</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PACKAGE__METHOD_PACKAGE = eINSTANCE.getMethodPackage_MethodPackage();
-
-		/**
-		 * The meta object literal for the '<em><b>Global</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PACKAGE__GLOBAL = eINSTANCE.getMethodPackage_Global();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.MethodPluginImpl <em>Method Plugin</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.MethodPluginImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getMethodPlugin()
-		 * @generated
-		 */
-		EClass METHOD_PLUGIN = eINSTANCE.getMethodPlugin();
-
-		/**
-		 * The meta object literal for the '<em><b>Referenced Method Plugin</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PLUGIN__REFERENCED_METHOD_PLUGIN = eINSTANCE.getMethodPlugin_ReferencedMethodPlugin();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Package</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference METHOD_PLUGIN__METHOD_PACKAGE = eINSTANCE.getMethodPlugin_MethodPackage();
-
-		/**
-		 * The meta object literal for the '<em><b>User Changeable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_PLUGIN__USER_CHANGEABLE = eINSTANCE.getMethodPlugin_UserChangeable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.MethodUnitImpl <em>Method Unit</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.MethodUnitImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getMethodUnit()
-		 * @generated
-		 */
-		EClass METHOD_UNIT = eINSTANCE.getMethodUnit();
-
-		/**
-		 * The meta object literal for the '<em><b>Copyright</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_UNIT__COPYRIGHT = eINSTANCE.getMethodUnit_Copyright();
-
-		/**
-		 * The meta object literal for the '<em><b>Authors</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_UNIT__AUTHORS = eINSTANCE.getMethodUnit_Authors();
-
-		/**
-		 * The meta object literal for the '<em><b>Change Date</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_UNIT__CHANGE_DATE = eINSTANCE.getMethodUnit_ChangeDate();
-
-		/**
-		 * The meta object literal for the '<em><b>Change Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_UNIT__CHANGE_DESCRIPTION = eINSTANCE.getMethodUnit_ChangeDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute METHOD_UNIT__VERSION = eINSTANCE.getMethodUnit_Version();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.MilestoneImpl <em>Milestone</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.MilestoneImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getMilestone()
-		 * @generated
-		 */
-		EClass MILESTONE = eINSTANCE.getMilestone();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.NamedElementImpl <em>Named Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.NamedElementImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getNamedElement()
-		 * @generated
-		 */
-		EClass NAMED_ELEMENT = eINSTANCE.getNamedElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute NAMED_ELEMENT__NAME = eINSTANCE.getNamedElement_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.OutcomeImpl <em>Outcome</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.OutcomeImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getOutcome()
-		 * @generated
-		 */
-		EClass OUTCOME = eINSTANCE.getOutcome();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.PackageableElementImpl <em>Packageable Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.PackageableElementImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getPackageableElement()
-		 * @generated
-		 */
-		EClass PACKAGEABLE_ELEMENT = eINSTANCE.getPackageableElement();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.PhaseImpl <em>Phase</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.PhaseImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getPhase()
-		 * @generated
-		 */
-		EClass PHASE = eINSTANCE.getPhase();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.PlanningDataImpl <em>Planning Data</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.PlanningDataImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getPlanningData()
-		 * @generated
-		 */
-		EClass PLANNING_DATA = eINSTANCE.getPlanningData();
-
-		/**
-		 * The meta object literal for the '<em><b>Finish Date</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PLANNING_DATA__FINISH_DATE = eINSTANCE.getPlanningData_FinishDate();
-
-		/**
-		 * The meta object literal for the '<em><b>Rank</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PLANNING_DATA__RANK = eINSTANCE.getPlanningData_Rank();
-
-		/**
-		 * The meta object literal for the '<em><b>Start Date</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PLANNING_DATA__START_DATE = eINSTANCE.getPlanningData_StartDate();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.PracticeImpl <em>Practice</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.PracticeImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getPractice()
-		 * @generated
-		 */
-		EClass PRACTICE = eINSTANCE.getPractice();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PRACTICE__GROUP2 = eINSTANCE.getPractice_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Activity Reference</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PRACTICE__ACTIVITY_REFERENCE = eINSTANCE.getPractice_ActivityReference();
-
-		/**
-		 * The meta object literal for the '<em><b>Content Reference</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PRACTICE__CONTENT_REFERENCE = eINSTANCE.getPractice_ContentReference();
-
-		/**
-		 * The meta object literal for the '<em><b>Sub Practice</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PRACTICE__SUB_PRACTICE = eINSTANCE.getPractice_SubPractice();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.PracticeDescriptionImpl <em>Practice Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.PracticeDescriptionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getPracticeDescription()
-		 * @generated
-		 */
-		EClass PRACTICE_DESCRIPTION = eINSTANCE.getPracticeDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Additional Info</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PRACTICE_DESCRIPTION__ADDITIONAL_INFO = eINSTANCE.getPracticeDescription_AdditionalInfo();
-
-		/**
-		 * The meta object literal for the '<em><b>Application</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PRACTICE_DESCRIPTION__APPLICATION = eINSTANCE.getPracticeDescription_Application();
-
-		/**
-		 * The meta object literal for the '<em><b>Background</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PRACTICE_DESCRIPTION__BACKGROUND = eINSTANCE.getPracticeDescription_Background();
-
-		/**
-		 * The meta object literal for the '<em><b>Goals</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PRACTICE_DESCRIPTION__GOALS = eINSTANCE.getPracticeDescription_Goals();
-
-		/**
-		 * The meta object literal for the '<em><b>Levels Of Adoption</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION = eINSTANCE.getPracticeDescription_LevelsOfAdoption();
-
-		/**
-		 * The meta object literal for the '<em><b>Problem</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PRACTICE_DESCRIPTION__PROBLEM = eINSTANCE.getPracticeDescription_Problem();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ProcessImpl <em>Process</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ProcessImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getProcess()
-		 * @generated
-		 */
-		EClass PROCESS = eINSTANCE.getProcess();
-
-		/**
-		 * The meta object literal for the '<em><b>Includes Pattern</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS__INCLUDES_PATTERN = eINSTANCE.getProcess_IncludesPattern();
-
-		/**
-		 * The meta object literal for the '<em><b>Default Context</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS__DEFAULT_CONTEXT = eINSTANCE.getProcess_DefaultContext();
-
-		/**
-		 * The meta object literal for the '<em><b>Valid Context</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS__VALID_CONTEXT = eINSTANCE.getProcess_ValidContext();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ProcessComponentImpl <em>Process Component</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ProcessComponentImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getProcessComponent()
-		 * @generated
-		 */
-		EClass PROCESS_COMPONENT = eINSTANCE.getProcessComponent();
-
-		/**
-		 * The meta object literal for the '<em><b>Copyright</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS_COMPONENT__COPYRIGHT = eINSTANCE.getProcessComponent_Copyright();
-
-		/**
-		 * The meta object literal for the '<em><b>Interface</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS_COMPONENT__INTERFACE = eINSTANCE.getProcessComponent_Interface();
-
-		/**
-		 * The meta object literal for the '<em><b>Process</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS_COMPONENT__PROCESS = eINSTANCE.getProcessComponent_Process();
-
-		/**
-		 * The meta object literal for the '<em><b>Authors</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS_COMPONENT__AUTHORS = eINSTANCE.getProcessComponent_Authors();
-
-		/**
-		 * The meta object literal for the '<em><b>Change Date</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS_COMPONENT__CHANGE_DATE = eINSTANCE.getProcessComponent_ChangeDate();
-
-		/**
-		 * The meta object literal for the '<em><b>Change Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS_COMPONENT__CHANGE_DESCRIPTION = eINSTANCE.getProcessComponent_ChangeDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS_COMPONENT__VERSION = eINSTANCE.getProcessComponent_Version();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ProcessComponentInterfaceImpl <em>Process Component Interface</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ProcessComponentInterfaceImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getProcessComponentInterface()
-		 * @generated
-		 */
-		EClass PROCESS_COMPONENT_INTERFACE = eINSTANCE.getProcessComponentInterface();
-
-		/**
-		 * The meta object literal for the '<em><b>Group1</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS_COMPONENT_INTERFACE__GROUP1 = eINSTANCE.getProcessComponentInterface_Group1();
-
-		/**
-		 * The meta object literal for the '<em><b>Interface Specification</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATION = eINSTANCE.getProcessComponentInterface_InterfaceSpecification();
-
-		/**
-		 * The meta object literal for the '<em><b>Interface IO</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS_COMPONENT_INTERFACE__INTERFACE_IO = eINSTANCE.getProcessComponentInterface_InterfaceIO();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ProcessDescriptionImpl <em>Process Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ProcessDescriptionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getProcessDescription()
-		 * @generated
-		 */
-		EClass PROCESS_DESCRIPTION = eINSTANCE.getProcessDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Scope</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS_DESCRIPTION__SCOPE = eINSTANCE.getProcessDescription_Scope();
-
-		/**
-		 * The meta object literal for the '<em><b>Usage Notes</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS_DESCRIPTION__USAGE_NOTES = eINSTANCE.getProcessDescription_UsageNotes();
-
-		/**
-		 * The meta object literal for the '<em><b>External Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS_DESCRIPTION__EXTERNAL_ID = eINSTANCE.getProcessDescription_ExternalId();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ProcessElementImpl <em>Process Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ProcessElementImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getProcessElement()
-		 * @generated
-		 */
-		EClass PROCESS_ELEMENT = eINSTANCE.getProcessElement();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ProcessPackageImpl <em>Process Package</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ProcessPackageImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getProcessPackage()
-		 * @generated
-		 */
-		EClass PROCESS_PACKAGE = eINSTANCE.getProcessPackage();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS_PACKAGE__GROUP2 = eINSTANCE.getProcessPackage_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Process Element</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PROCESS_PACKAGE__PROCESS_ELEMENT = eINSTANCE.getProcessPackage_ProcessElement();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ProcessPlanningTemplateImpl <em>Process Planning Template</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ProcessPlanningTemplateImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getProcessPlanningTemplate()
-		 * @generated
-		 */
-		EClass PROCESS_PLANNING_TEMPLATE = eINSTANCE.getProcessPlanningTemplate();
-
-		/**
-		 * The meta object literal for the '<em><b>Group3</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS_PLANNING_TEMPLATE__GROUP3 = eINSTANCE.getProcessPlanningTemplate_Group3();
-
-		/**
-		 * The meta object literal for the '<em><b>Base Process</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESS_PLANNING_TEMPLATE__BASE_PROCESS = eINSTANCE.getProcessPlanningTemplate_BaseProcess();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ReportImpl <em>Report</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ReportImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getReport()
-		 * @generated
-		 */
-		EClass REPORT = eINSTANCE.getReport();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ReusableAssetImpl <em>Reusable Asset</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ReusableAssetImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getReusableAsset()
-		 * @generated
-		 */
-		EClass REUSABLE_ASSET = eINSTANCE.getReusableAsset();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.RoadmapImpl <em>Roadmap</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.RoadmapImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getRoadmap()
-		 * @generated
-		 */
-		EClass ROADMAP = eINSTANCE.getRoadmap();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.RoleImpl <em>Role</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.RoleImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getRole()
-		 * @generated
-		 */
-		EClass ROLE = eINSTANCE.getRole();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE__GROUP2 = eINSTANCE.getRole_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Responsible For</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE__RESPONSIBLE_FOR = eINSTANCE.getRole_ResponsibleFor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.RoleDescriptionImpl <em>Role Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.RoleDescriptionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getRoleDescription()
-		 * @generated
-		 */
-		EClass ROLE_DESCRIPTION = eINSTANCE.getRoleDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Assignment Approaches</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES = eINSTANCE.getRoleDescription_AssignmentApproaches();
-
-		/**
-		 * The meta object literal for the '<em><b>Skills</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE_DESCRIPTION__SKILLS = eINSTANCE.getRoleDescription_Skills();
-
-		/**
-		 * The meta object literal for the '<em><b>Synonyms</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE_DESCRIPTION__SYNONYMS = eINSTANCE.getRoleDescription_Synonyms();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.RoleDescriptorImpl <em>Role Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.RoleDescriptorImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getRoleDescriptor()
-		 * @generated
-		 */
-		EClass ROLE_DESCRIPTOR = eINSTANCE.getRoleDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Role</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE_DESCRIPTOR__ROLE = eINSTANCE.getRoleDescriptor_Role();
-
-		/**
-		 * The meta object literal for the '<em><b>Responsible For</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE_DESCRIPTOR__RESPONSIBLE_FOR = eINSTANCE.getRoleDescriptor_ResponsibleFor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.RoleSetImpl <em>Role Set</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.RoleSetImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getRoleSet()
-		 * @generated
-		 */
-		EClass ROLE_SET = eINSTANCE.getRoleSet();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE_SET__GROUP2 = eINSTANCE.getRoleSet_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Role</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE_SET__ROLE = eINSTANCE.getRoleSet_Role();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.RoleSetGroupingImpl <em>Role Set Grouping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.RoleSetGroupingImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getRoleSetGrouping()
-		 * @generated
-		 */
-		EClass ROLE_SET_GROUPING = eINSTANCE.getRoleSetGrouping();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE_SET_GROUPING__GROUP2 = eINSTANCE.getRoleSetGrouping_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Role Set</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ROLE_SET_GROUPING__ROLE_SET = eINSTANCE.getRoleSetGrouping_RoleSet();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.SectionImpl <em>Section</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.SectionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getSection()
-		 * @generated
-		 */
-		EClass SECTION = eINSTANCE.getSection();
-
-		/**
-		 * The meta object literal for the '<em><b>Sub Section</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SECTION__SUB_SECTION = eINSTANCE.getSection_SubSection();
-
-		/**
-		 * The meta object literal for the '<em><b>Predecessor</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECTION__PREDECESSOR = eINSTANCE.getSection_Predecessor();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECTION__DESCRIPTION = eINSTANCE.getSection_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Section Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECTION__SECTION_NAME = eINSTANCE.getSection_SectionName();
-
-		/**
-		 * The meta object literal for the '<em><b>Variability Based On Element</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECTION__VARIABILITY_BASED_ON_ELEMENT = eINSTANCE.getSection_VariabilityBasedOnElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Variability Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SECTION__VARIABILITY_TYPE = eINSTANCE.getSection_VariabilityType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.SupportingMaterialImpl <em>Supporting Material</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.SupportingMaterialImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getSupportingMaterial()
-		 * @generated
-		 */
-		EClass SUPPORTING_MATERIAL = eINSTANCE.getSupportingMaterial();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.TaskImpl <em>Task</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.TaskImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getTask()
-		 * @generated
-		 */
-		EClass TASK = eINSTANCE.getTask();
-
-		/**
-		 * The meta object literal for the '<em><b>Precondition</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK__PRECONDITION = eINSTANCE.getTask_Precondition();
-
-		/**
-		 * The meta object literal for the '<em><b>Postcondition</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK__POSTCONDITION = eINSTANCE.getTask_Postcondition();
-
-		/**
-		 * The meta object literal for the '<em><b>Performed By</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK__PERFORMED_BY = eINSTANCE.getTask_PerformedBy();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK__GROUP2 = eINSTANCE.getTask_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Mandatory Input</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK__MANDATORY_INPUT = eINSTANCE.getTask_MandatoryInput();
-
-		/**
-		 * The meta object literal for the '<em><b>Output</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK__OUTPUT = eINSTANCE.getTask_Output();
-
-		/**
-		 * The meta object literal for the '<em><b>Additionally Performed By</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK__ADDITIONALLY_PERFORMED_BY = eINSTANCE.getTask_AdditionallyPerformedBy();
-
-		/**
-		 * The meta object literal for the '<em><b>Optional Input</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK__OPTIONAL_INPUT = eINSTANCE.getTask_OptionalInput();
-
-		/**
-		 * The meta object literal for the '<em><b>Estimate</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK__ESTIMATE = eINSTANCE.getTask_Estimate();
-
-		/**
-		 * The meta object literal for the '<em><b>Estimation Considerations</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK__ESTIMATION_CONSIDERATIONS = eINSTANCE.getTask_EstimationConsiderations();
-
-		/**
-		 * The meta object literal for the '<em><b>Tool Mentor</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK__TOOL_MENTOR = eINSTANCE.getTask_ToolMentor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.TaskDescriptionImpl <em>Task Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.TaskDescriptionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getTaskDescription()
-		 * @generated
-		 */
-		EClass TASK_DESCRIPTION = eINSTANCE.getTaskDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Alternatives</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_DESCRIPTION__ALTERNATIVES = eINSTANCE.getTaskDescription_Alternatives();
-
-		/**
-		 * The meta object literal for the '<em><b>Purpose</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_DESCRIPTION__PURPOSE = eINSTANCE.getTaskDescription_Purpose();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.TaskDescriptorImpl <em>Task Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.TaskDescriptorImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getTaskDescriptor()
-		 * @generated
-		 */
-		EClass TASK_DESCRIPTOR = eINSTANCE.getTaskDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Task</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_DESCRIPTOR__TASK = eINSTANCE.getTaskDescriptor_Task();
-
-		/**
-		 * The meta object literal for the '<em><b>Performed Primarily By</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY = eINSTANCE.getTaskDescriptor_PerformedPrimarilyBy();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_DESCRIPTOR__GROUP2 = eINSTANCE.getTaskDescriptor_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Additionally Performed By</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY = eINSTANCE.getTaskDescriptor_AdditionallyPerformedBy();
-
-		/**
-		 * The meta object literal for the '<em><b>Assisted By</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_DESCRIPTOR__ASSISTED_BY = eINSTANCE.getTaskDescriptor_AssistedBy();
-
-		/**
-		 * The meta object literal for the '<em><b>External Input</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_DESCRIPTOR__EXTERNAL_INPUT = eINSTANCE.getTaskDescriptor_ExternalInput();
-
-		/**
-		 * The meta object literal for the '<em><b>Mandatory Input</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_DESCRIPTOR__MANDATORY_INPUT = eINSTANCE.getTaskDescriptor_MandatoryInput();
-
-		/**
-		 * The meta object literal for the '<em><b>Optional Input</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_DESCRIPTOR__OPTIONAL_INPUT = eINSTANCE.getTaskDescriptor_OptionalInput();
-
-		/**
-		 * The meta object literal for the '<em><b>Output</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_DESCRIPTOR__OUTPUT = eINSTANCE.getTaskDescriptor_Output();
-
-		/**
-		 * The meta object literal for the '<em><b>Step</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TASK_DESCRIPTOR__STEP = eINSTANCE.getTaskDescriptor_Step();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Synchronized With Source</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE = eINSTANCE.getTaskDescriptor_IsSynchronizedWithSource();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.TeamProfileImpl <em>Team Profile</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.TeamProfileImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getTeamProfile()
-		 * @generated
-		 */
-		EClass TEAM_PROFILE = eINSTANCE.getTeamProfile();
-
-		/**
-		 * The meta object literal for the '<em><b>Group1</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TEAM_PROFILE__GROUP1 = eINSTANCE.getTeamProfile_Group1();
-
-		/**
-		 * The meta object literal for the '<em><b>Role</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TEAM_PROFILE__ROLE = eINSTANCE.getTeamProfile_Role();
-
-		/**
-		 * The meta object literal for the '<em><b>Super Team</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TEAM_PROFILE__SUPER_TEAM = eINSTANCE.getTeamProfile_SuperTeam();
-
-		/**
-		 * The meta object literal for the '<em><b>Sub Team</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TEAM_PROFILE__SUB_TEAM = eINSTANCE.getTeamProfile_SubTeam();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.TemplateImpl <em>Template</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.TemplateImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getTemplate()
-		 * @generated
-		 */
-		EClass TEMPLATE = eINSTANCE.getTemplate();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.TermDefinitionImpl <em>Term Definition</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.TermDefinitionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getTermDefinition()
-		 * @generated
-		 */
-		EClass TERM_DEFINITION = eINSTANCE.getTermDefinition();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ToolImpl <em>Tool</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ToolImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getTool()
-		 * @generated
-		 */
-		EClass TOOL = eINSTANCE.getTool();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TOOL__GROUP2 = eINSTANCE.getTool_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Tool Mentor</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TOOL__TOOL_MENTOR = eINSTANCE.getTool_ToolMentor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.ToolMentorImpl <em>Tool Mentor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.ToolMentorImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getToolMentor()
-		 * @generated
-		 */
-		EClass TOOL_MENTOR = eINSTANCE.getToolMentor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.WhitepaperImpl <em>Whitepaper</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.WhitepaperImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWhitepaper()
-		 * @generated
-		 */
-		EClass WHITEPAPER = eINSTANCE.getWhitepaper();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.WorkBreakdownElementImpl <em>Work Breakdown Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.WorkBreakdownElementImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkBreakdownElement()
-		 * @generated
-		 */
-		EClass WORK_BREAKDOWN_ELEMENT = eINSTANCE.getWorkBreakdownElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Group1</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_BREAKDOWN_ELEMENT__GROUP1 = eINSTANCE.getWorkBreakdownElement_Group1();
-
-		/**
-		 * The meta object literal for the '<em><b>Predecessor</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORK_BREAKDOWN_ELEMENT__PREDECESSOR = eINSTANCE.getWorkBreakdownElement_Predecessor();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Event Driven</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN = eINSTANCE.getWorkBreakdownElement_IsEventDriven();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Ongoing</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_BREAKDOWN_ELEMENT__IS_ONGOING = eINSTANCE.getWorkBreakdownElement_IsOngoing();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Repeatable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE = eINSTANCE.getWorkBreakdownElement_IsRepeatable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.WorkDefinitionImpl <em>Work Definition</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.WorkDefinitionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkDefinition()
-		 * @generated
-		 */
-		EClass WORK_DEFINITION = eINSTANCE.getWorkDefinition();
-
-		/**
-		 * The meta object literal for the '<em><b>Precondition</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_DEFINITION__PRECONDITION = eINSTANCE.getWorkDefinition_Precondition();
-
-		/**
-		 * The meta object literal for the '<em><b>Postcondition</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_DEFINITION__POSTCONDITION = eINSTANCE.getWorkDefinition_Postcondition();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.WorkOrderImpl <em>Work Order</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.WorkOrderImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkOrder()
-		 * @generated
-		 */
-		EClass WORK_ORDER = eINSTANCE.getWorkOrder();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_ORDER__VALUE = eINSTANCE.getWorkOrder_Value();
-
-		/**
-		 * The meta object literal for the '<em><b>Link Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_ORDER__LINK_TYPE = eINSTANCE.getWorkOrder_LinkType();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_ORDER__ID = eINSTANCE.getWorkOrder_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.WorkProductImpl <em>Work Product</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.WorkProductImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkProduct()
-		 * @generated
-		 */
-		EClass WORK_PRODUCT = eINSTANCE.getWorkProduct();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT__GROUP2 = eINSTANCE.getWorkProduct_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Estimate</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT__ESTIMATE = eINSTANCE.getWorkProduct_Estimate();
-
-		/**
-		 * The meta object literal for the '<em><b>Estimation Considerations</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT__ESTIMATION_CONSIDERATIONS = eINSTANCE.getWorkProduct_EstimationConsiderations();
-
-		/**
-		 * The meta object literal for the '<em><b>Report</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT__REPORT = eINSTANCE.getWorkProduct_Report();
-
-		/**
-		 * The meta object literal for the '<em><b>Template</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT__TEMPLATE = eINSTANCE.getWorkProduct_Template();
-
-		/**
-		 * The meta object literal for the '<em><b>Tool Mentor</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT__TOOL_MENTOR = eINSTANCE.getWorkProduct_ToolMentor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.WorkProductDescriptionImpl <em>Work Product Description</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.WorkProductDescriptionImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkProductDescription()
-		 * @generated
-		 */
-		EClass WORK_PRODUCT_DESCRIPTION = eINSTANCE.getWorkProductDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Impact Of Not Having</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING = eINSTANCE.getWorkProductDescription_ImpactOfNotHaving();
-
-		/**
-		 * The meta object literal for the '<em><b>Purpose</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTION__PURPOSE = eINSTANCE.getWorkProductDescription_Purpose();
-
-		/**
-		 * The meta object literal for the '<em><b>Reasons For Not Needing</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING = eINSTANCE.getWorkProductDescription_ReasonsForNotNeeding();
-
-		/**
-		 * The meta object literal for the '<em><b>External Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID = eINSTANCE.getWorkProductDescription_ExternalId();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.WorkProductDescriptorImpl <em>Work Product Descriptor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.WorkProductDescriptorImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkProductDescriptor()
-		 * @generated
-		 */
-		EClass WORK_PRODUCT_DESCRIPTOR = eINSTANCE.getWorkProductDescriptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Work Product</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT = eINSTANCE.getWorkProductDescriptor_WorkProduct();
-
-		/**
-		 * The meta object literal for the '<em><b>Group1</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTOR__GROUP1 = eINSTANCE.getWorkProductDescriptor_Group1();
-
-		/**
-		 * The meta object literal for the '<em><b>Impacted By</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY = eINSTANCE.getWorkProductDescriptor_ImpactedBy();
-
-		/**
-		 * The meta object literal for the '<em><b>Impacts</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTOR__IMPACTS = eINSTANCE.getWorkProductDescriptor_Impacts();
-
-		/**
-		 * The meta object literal for the '<em><b>Deliverable Parts</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS = eINSTANCE.getWorkProductDescriptor_DeliverableParts();
-
-		/**
-		 * The meta object literal for the '<em><b>Activity Entry State</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE = eINSTANCE.getWorkProductDescriptor_ActivityEntryState();
-
-		/**
-		 * The meta object literal for the '<em><b>Activity Exit State</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE = eINSTANCE.getWorkProductDescriptor_ActivityExitState();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.impl.WorkProductTypeImpl <em>Work Product Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.impl.WorkProductTypeImpl
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkProductType()
-		 * @generated
-		 */
-		EClass WORK_PRODUCT_TYPE = eINSTANCE.getWorkProductType();
-
-		/**
-		 * The meta object literal for the '<em><b>Group2</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_TYPE__GROUP2 = eINSTANCE.getWorkProductType_Group2();
-
-		/**
-		 * The meta object literal for the '<em><b>Work Product</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute WORK_PRODUCT_TYPE__WORK_PRODUCT = eINSTANCE.getWorkProductType_WorkProduct();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.VariabilityType <em>Variability Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.VariabilityType
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getVariabilityType()
-		 * @generated
-		 */
-		EEnum VARIABILITY_TYPE = eINSTANCE.getVariabilityType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.epf.xml.uma.WorkOrderType <em>Work Order Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.WorkOrderType
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkOrderType()
-		 * @generated
-		 */
-		EEnum WORK_ORDER_TYPE = eINSTANCE.getWorkOrderType();
-
-		/**
-		 * The meta object literal for the '<em>Variability Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.VariabilityType
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getVariabilityTypeObject()
-		 * @generated
-		 */
-		EDataType VARIABILITY_TYPE_OBJECT = eINSTANCE.getVariabilityTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Work Order Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.epf.xml.uma.WorkOrderType
-		 * @see org.eclipse.epf.xml.uma.impl.UmaPackageImpl#getWorkOrderTypeObject()
-		 * @generated
-		 */
-		EDataType WORK_ORDER_TYPE_OBJECT = eINSTANCE.getWorkOrderTypeObject();
-
-	}
-
-} //UmaPackage
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/VariabilityType.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/VariabilityType.java
deleted file mode 100755
index daecea2..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/VariabilityType.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: VariabilityType.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Variability Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * An Enumeration used for values for instances of Variability Element's attribute variabilityType.  It defines the nature of how a Variability Element extends another Variability Element. See enumeration literals for definitions for each type.
- * <!-- end-model-doc -->
- * @see org.eclipse.epf.xml.uma.UmaPackage#getVariabilityType()
- * @model
- * @generated
- */
-public final class VariabilityType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Na</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Na</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NA_LITERAL
-	 * @model name="na"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NA = 0;
-
-	/**
-	 * The '<em><b>Contributes</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Contributes</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONTRIBUTES_LITERAL
-	 * @model name="contributes"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CONTRIBUTES = 1;
-
-	/**
-	 * The '<em><b>Extends</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Extends</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EXTENDS_LITERAL
-	 * @model name="extends"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EXTENDS = 2;
-
-	/**
-	 * The '<em><b>Replaces</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Replaces</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REPLACES_LITERAL
-	 * @model name="replaces"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REPLACES = 3;
-
-	/**
-	 * The '<em><b>Local Contribution</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Local Contribution</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_CONTRIBUTION_LITERAL
-	 * @model name="localContribution"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOCAL_CONTRIBUTION = 4;
-
-	/**
-	 * The '<em><b>Local Replacement</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Local Replacement</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_REPLACEMENT_LITERAL
-	 * @model name="localReplacement"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOCAL_REPLACEMENT = 5;
-
-	/**
-	 * The '<em><b>Na</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NA
-	 * @generated
-	 * @ordered
-	 */
-	public static final VariabilityType NA_LITERAL = new VariabilityType(NA, "na", "na");
-
-	/**
-	 * The '<em><b>Contributes</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CONTRIBUTES
-	 * @generated
-	 * @ordered
-	 */
-	public static final VariabilityType CONTRIBUTES_LITERAL = new VariabilityType(CONTRIBUTES, "contributes", "contributes");
-
-	/**
-	 * The '<em><b>Extends</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EXTENDS
-	 * @generated
-	 * @ordered
-	 */
-	public static final VariabilityType EXTENDS_LITERAL = new VariabilityType(EXTENDS, "extends", "extends");
-
-	/**
-	 * The '<em><b>Replaces</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REPLACES
-	 * @generated
-	 * @ordered
-	 */
-	public static final VariabilityType REPLACES_LITERAL = new VariabilityType(REPLACES, "replaces", "replaces");
-
-	/**
-	 * The '<em><b>Local Contribution</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_CONTRIBUTION
-	 * @generated
-	 * @ordered
-	 */
-	public static final VariabilityType LOCAL_CONTRIBUTION_LITERAL = new VariabilityType(LOCAL_CONTRIBUTION, "localContribution", "localContribution");
-
-	/**
-	 * The '<em><b>Local Replacement</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_REPLACEMENT
-	 * @generated
-	 * @ordered
-	 */
-	public static final VariabilityType LOCAL_REPLACEMENT_LITERAL = new VariabilityType(LOCAL_REPLACEMENT, "localReplacement", "localReplacement");
-
-	/**
-	 * An array of all the '<em><b>Variability Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final VariabilityType[] VALUES_ARRAY =
-		new VariabilityType[] {
-			NA_LITERAL,
-			CONTRIBUTES_LITERAL,
-			EXTENDS_LITERAL,
-			REPLACES_LITERAL,
-			LOCAL_CONTRIBUTION_LITERAL,
-			LOCAL_REPLACEMENT_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Variability Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Variability Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static VariabilityType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			VariabilityType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Variability Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static VariabilityType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			VariabilityType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Variability Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static VariabilityType get(int value) {
-		switch (value) {
-			case NA: return NA_LITERAL;
-			case CONTRIBUTES: return CONTRIBUTES_LITERAL;
-			case EXTENDS: return EXTENDS_LITERAL;
-			case REPLACES: return REPLACES_LITERAL;
-			case LOCAL_CONTRIBUTION: return LOCAL_CONTRIBUTION_LITERAL;
-			case LOCAL_REPLACEMENT: return LOCAL_REPLACEMENT_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private VariabilityType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //VariabilityType
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Whitepaper.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Whitepaper.java
deleted file mode 100755
index 0c05ccf..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/Whitepaper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Whitepaper.java,v 1.2 2006/06/23 00:01:27 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Whitepaper</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Concept guidance that have been externally reviewed or published and can be read and understood in isolation of other content elements and guidance.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getWhitepaper()
- * @model extendedMetaData="name='Whitepaper' kind='elementOnly'"
- * @generated
- */
-public interface Whitepaper extends Concept {
-} // Whitepaper
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkBreakdownElement.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkBreakdownElement.java
deleted file mode 100755
index 77dc36f..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkBreakdownElement.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkBreakdownElement.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Work Breakdown Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Breakdown Element that provides specific properties for Breakdown Elements that represent or refer to Work Definitions.  For example its subclass Activity defines work as it is also a subclass of Work Definition.  Its subclass Task Descriptor does not define work by itself, but refers to a Work Definition and therefore can have the same common properties and Work Breakdown Element has.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#getPredecessor <em>Predecessor</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsEventDriven <em>Is Event Driven</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsOngoing <em>Is Ongoing</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsRepeatable <em>Is Repeatable</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkBreakdownElement()
- * @model extendedMetaData="name='WorkBreakdownElement' kind='elementOnly'"
- * @generated
- */
-public interface WorkBreakdownElement extends BreakdownElement {
-	/**
-	 * Returns the value of the '<em><b>Group1</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group1</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group1</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkBreakdownElement_Group1()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:19'"
-	 * @generated
-	 */
-	FeatureMap getGroup1();
-
-	/**
-	 * Returns the value of the '<em><b>Predecessor</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.epf.xml.uma.WorkOrder}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Predecessor</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Predecessor</em>' containment reference list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkBreakdownElement_Predecessor()
-	 * @model type="org.eclipse.epf.xml.uma.WorkOrder" containment="true" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Predecessor' group='#group:19'"
-	 * @generated
-	 */
-	EList getPredecessor();
-
-	/**
-	 * Returns the value of the '<em><b>Is Event Driven</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The isEventDriven attribute indicates that the Process Work Definition describes an instance of work which is not started because it has been scheduled to start at a certain point of time, because preceding work is being completed, or input work products are available, but because another specific event has occurred.  Examples for such events are exceptions or problem situations which require specific work to be performed as a result.  Also change management work can be modeled as event driven work analyzing a change request or defect and allocating work dynamically to resources to deal with it following the work described with such Process Work Definition.  The events themselves are not modeled in this version of the specification.  They shall be described as part of the normal descriptions fields available.
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Event Driven</em>' attribute.
-	 * @see #isSetIsEventDriven()
-	 * @see #unsetIsEventDriven()
-	 * @see #setIsEventDriven(boolean)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkBreakdownElement_IsEventDriven()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='attribute' name='isEventDriven'"
-	 * @generated
-	 */
-	boolean isIsEventDriven();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsEventDriven <em>Is Event Driven</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Event Driven</em>' attribute.
-	 * @see #isSetIsEventDriven()
-	 * @see #unsetIsEventDriven()
-	 * @see #isIsEventDriven()
-	 * @generated
-	 */
-	void setIsEventDriven(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsEventDriven <em>Is Event Driven</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsEventDriven()
-	 * @see #isIsEventDriven()
-	 * @see #setIsEventDriven(boolean)
-	 * @generated
-	 */
-	void unsetIsEventDriven();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsEventDriven <em>Is Event Driven</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Event Driven</em>' attribute is set.
-	 * @see #unsetIsEventDriven()
-	 * @see #isIsEventDriven()
-	 * @see #setIsEventDriven(boolean)
-	 * @generated
-	 */
-	boolean isSetIsEventDriven();
-
-	/**
-	 * Returns the value of the '<em><b>Is Ongoing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If the isOngoing attribute is set to True for a Process Work Definition instance, then the element describes an ongoing piece of work without a fixed duration or end state.  For example, the Process Work Definition could represent work of an administrator continuously (e.g. 3h a day) working to ensure that systems are kept in a certain state.  Another example would be program management work overseeing many different projects being scheduled for one particular project at specific reoccurring intervals during the whole lifecycle of the project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Ongoing</em>' attribute.
-	 * @see #isSetIsOngoing()
-	 * @see #unsetIsOngoing()
-	 * @see #setIsOngoing(boolean)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkBreakdownElement_IsOngoing()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='attribute' name='isOngoing'"
-	 * @generated
-	 */
-	boolean isIsOngoing();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsOngoing <em>Is Ongoing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Ongoing</em>' attribute.
-	 * @see #isSetIsOngoing()
-	 * @see #unsetIsOngoing()
-	 * @see #isIsOngoing()
-	 * @generated
-	 */
-	void setIsOngoing(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsOngoing <em>Is Ongoing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsOngoing()
-	 * @see #isIsOngoing()
-	 * @see #setIsOngoing(boolean)
-	 * @generated
-	 */
-	void unsetIsOngoing();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsOngoing <em>Is Ongoing</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Ongoing</em>' attribute is set.
-	 * @see #unsetIsOngoing()
-	 * @see #isIsOngoing()
-	 * @see #setIsOngoing(boolean)
-	 * @generated
-	 */
-	boolean isSetIsOngoing();
-
-	/**
-	 * Returns the value of the '<em><b>Is Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This attribute is used to define repetition of work, e.g. iterations.  A Process Work Definition with this attribute set to True shall be repeated more than once on the same set of artifacts.  For example, for an instance of Iteration (defined as a special Process Work Definition below) this attribute is set to True by default indicating that every sub-Activity will be repeated more than once.  However, any Process Work Definition can set this attribute to True to define iterations (e.g. to iterate one Activity consisting of many sub-activities or even Phases, but to iterate just one Task).
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Repeatable</em>' attribute.
-	 * @see #isSetIsRepeatable()
-	 * @see #unsetIsRepeatable()
-	 * @see #setIsRepeatable(boolean)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkBreakdownElement_IsRepeatable()
-	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 *        extendedMetaData="kind='attribute' name='isRepeatable'"
-	 * @generated
-	 */
-	boolean isIsRepeatable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsRepeatable <em>Is Repeatable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Repeatable</em>' attribute.
-	 * @see #isSetIsRepeatable()
-	 * @see #unsetIsRepeatable()
-	 * @see #isIsRepeatable()
-	 * @generated
-	 */
-	void setIsRepeatable(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsRepeatable <em>Is Repeatable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsRepeatable()
-	 * @see #isIsRepeatable()
-	 * @see #setIsRepeatable(boolean)
-	 * @generated
-	 */
-	void unsetIsRepeatable();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement#isIsRepeatable <em>Is Repeatable</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is Repeatable</em>' attribute is set.
-	 * @see #unsetIsRepeatable()
-	 * @see #isIsRepeatable()
-	 * @see #setIsRepeatable(boolean)
-	 * @generated
-	 */
-	boolean isSetIsRepeatable();
-
-} // WorkBreakdownElement
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkDefinition.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkDefinition.java
deleted file mode 100755
index f93cfa7..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkDefinition.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkDefinition.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Work Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An abstract Method Element that generalizes all descriptions of work within the Unified Method Architecture.  This package introduces two concrete types of Work Definitions: Task and Step.  Work Definitions can contain sets of pre- and post-conditions defining constraints that need to be valid before the described work can begin or before it can be declared as finished.  Note that general ownedRules can be used to define additional constraints and rules for Work Definitions.
- * Work Definitions represent behavioral descriptions for doing work.  These behavioral descriptions are not bound to one specific classifier, but represent an arbitrary definition of work.  For example, a Work Definition could represent work that is being performed by a specific Role (e.g. a Role performing a specific Task or Steps of a Task), by many Roles working in close collaboration (many Roles all working together on the same interdisciplinary Task), or complex work that is performed throughout the lifecycle (e.g. a process defining a breakdown structure for organizing larger composite units of work performed by many Roles working in collaboration).
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkDefinition#getPrecondition <em>Precondition</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkDefinition#getPostcondition <em>Postcondition</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkDefinition()
- * @model extendedMetaData="name='WorkDefinition' kind='elementOnly'"
- * @generated
- */
-public interface WorkDefinition extends MethodElement {
-	/**
-	 * Returns the value of the '<em><b>Precondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Precondition</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Precondition</em>' attribute.
-	 * @see #setPrecondition(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkDefinition_Precondition()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Precondition'"
-	 * @generated
-	 */
-	String getPrecondition();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.WorkDefinition#getPrecondition <em>Precondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Precondition</em>' attribute.
-	 * @see #getPrecondition()
-	 * @generated
-	 */
-	void setPrecondition(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Postcondition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Postcondition</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Postcondition</em>' attribute.
-	 * @see #setPostcondition(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkDefinition_Postcondition()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Postcondition'"
-	 * @generated
-	 */
-	String getPostcondition();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.WorkDefinition#getPostcondition <em>Postcondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Postcondition</em>' attribute.
-	 * @see #getPostcondition()
-	 * @generated
-	 */
-	void setPostcondition(String value);
-
-} // WorkDefinition
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkOrder.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkOrder.java
deleted file mode 100755
index 4fcdf80..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkOrder.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkOrder.java,v 1.3 2006/08/25 22:59:14 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.ecore.sdo.EDataObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Work Order</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Represents a relationship between two Breakdown Elements in which one Breakdown Elements depends on the start or finish of another Breakdown Elements in order to begin or end.  
- * The Work Order class defines predecessor and successor relations amongst Breakdown Elements.  This information is in particular critical for planning applications.  See more details on different types of Work Order relationships at Work Order Type.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkOrder#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkOrder#getLinkType <em>Link Type</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkOrder#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkOrder()
- * @model extendedMetaData="name='WorkOrder' kind='simple'"
- * @extends EDataObject
- * @generated
- */
-public interface WorkOrder extends EDataObject {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkOrder_Value()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="name=':0' kind='simple'"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.WorkOrder#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Link Type</b></em>' attribute.
-	 * The default value is <code>"finishToStart"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.epf.xml.uma.WorkOrderType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This attribute expresses the type of the Work Order relationship by assigning a value from the Work Order Type enumeration.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Link Type</em>' attribute.
-	 * @see org.eclipse.epf.xml.uma.WorkOrderType
-	 * @see #isSetLinkType()
-	 * @see #unsetLinkType()
-	 * @see #setLinkType(WorkOrderType)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkOrder_LinkType()
-	 * @model default="finishToStart" unique="false" unsettable="true"
-	 *        extendedMetaData="kind='attribute' name='linkType'"
-	 * @generated
-	 */
-	WorkOrderType getLinkType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.WorkOrder#getLinkType <em>Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Link Type</em>' attribute.
-	 * @see org.eclipse.epf.xml.uma.WorkOrderType
-	 * @see #isSetLinkType()
-	 * @see #unsetLinkType()
-	 * @see #getLinkType()
-	 * @generated
-	 */
-	void setLinkType(WorkOrderType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.epf.xml.uma.WorkOrder#getLinkType <em>Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetLinkType()
-	 * @see #getLinkType()
-	 * @see #setLinkType(WorkOrderType)
-	 * @generated
-	 */
-	void unsetLinkType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.epf.xml.uma.WorkOrder#getLinkType <em>Link Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Link Type</em>' attribute is set.
-	 * @see #unsetLinkType()
-	 * @see #getLinkType()
-	 * @see #setLinkType(WorkOrderType)
-	 * @generated
-	 */
-	boolean isSetLinkType();
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkOrder_Id()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.WorkOrder#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // WorkOrder
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkOrderType.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkOrderType.java
deleted file mode 100755
index 9c288ec..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkOrderType.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkOrderType.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Work Order Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Represents a relationship between two Breakdown Element in which one Breakdown Element depends on the start or finish of another Breakdown Element in order to begin or end. This enumeration defines the different types of Work Order relationships available in UMA and is used to provide values for Work Order's linkType attribute.
- * <!-- end-model-doc -->
- * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkOrderType()
- * @model
- * @generated
- */
-public final class WorkOrderType extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Finish To Start</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Finish To Start</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FINISH_TO_START_LITERAL
-	 * @model name="finishToStart"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FINISH_TO_START = 0;
-
-	/**
-	 * The '<em><b>Finish To Finish</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Finish To Finish</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FINISH_TO_FINISH_LITERAL
-	 * @model name="finishToFinish"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FINISH_TO_FINISH = 1;
-
-	/**
-	 * The '<em><b>Start To Start</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Start To Start</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #START_TO_START_LITERAL
-	 * @model name="startToStart"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int START_TO_START = 2;
-
-	/**
-	 * The '<em><b>Start To Finish</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Start To Finish</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #START_TO_FINISH_LITERAL
-	 * @model name="startToFinish"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int START_TO_FINISH = 3;
-
-	/**
-	 * The '<em><b>Finish To Start</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FINISH_TO_START
-	 * @generated
-	 * @ordered
-	 */
-	public static final WorkOrderType FINISH_TO_START_LITERAL = new WorkOrderType(FINISH_TO_START, "finishToStart", "finishToStart");
-
-	/**
-	 * The '<em><b>Finish To Finish</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FINISH_TO_FINISH
-	 * @generated
-	 * @ordered
-	 */
-	public static final WorkOrderType FINISH_TO_FINISH_LITERAL = new WorkOrderType(FINISH_TO_FINISH, "finishToFinish", "finishToFinish");
-
-	/**
-	 * The '<em><b>Start To Start</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #START_TO_START
-	 * @generated
-	 * @ordered
-	 */
-	public static final WorkOrderType START_TO_START_LITERAL = new WorkOrderType(START_TO_START, "startToStart", "startToStart");
-
-	/**
-	 * The '<em><b>Start To Finish</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #START_TO_FINISH
-	 * @generated
-	 * @ordered
-	 */
-	public static final WorkOrderType START_TO_FINISH_LITERAL = new WorkOrderType(START_TO_FINISH, "startToFinish", "startToFinish");
-
-	/**
-	 * An array of all the '<em><b>Work Order Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final WorkOrderType[] VALUES_ARRAY =
-		new WorkOrderType[] {
-			FINISH_TO_START_LITERAL,
-			FINISH_TO_FINISH_LITERAL,
-			START_TO_START_LITERAL,
-			START_TO_FINISH_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Work Order Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Work Order Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static WorkOrderType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			WorkOrderType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Work Order Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static WorkOrderType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			WorkOrderType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Work Order Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static WorkOrderType get(int value) {
-		switch (value) {
-			case FINISH_TO_START: return FINISH_TO_START_LITERAL;
-			case FINISH_TO_FINISH: return FINISH_TO_FINISH_LITERAL;
-			case START_TO_START: return START_TO_START_LITERAL;
-			case START_TO_FINISH: return START_TO_FINISH_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private WorkOrderType(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //WorkOrderType
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkProduct.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkProduct.java
deleted file mode 100755
index 7451711..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkProduct.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkProduct.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Work Product</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An abstract class which provides a generalization for the content element types Artifact, Outcome, and Deliverable.  The meta-model class Work Product actually represents work product types, i.e. an instance of Work Product is a description of a specific type of work product and not an individual work product instance.  However, for simplicity reasons and because of low risk of misinterpretation we did not append the word 'type' to every meta-class.
- * A work product is an abstraction for descriptions of content elements that are used to define anything used, produced, or modified by a task.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProduct#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProduct#getEstimate <em>Estimate</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProduct#getEstimationConsiderations <em>Estimation Considerations</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProduct#getReport <em>Report</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProduct#getTemplate <em>Template</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProduct#getToolMentor <em>Tool Mentor</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProduct()
- * @model extendedMetaData="name='WorkProduct' kind='elementOnly'"
- * @generated
- */
-public interface WorkProduct extends ContentElement {
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProduct_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:21'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Estimate</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Estimate</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Estimate</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProduct_Estimate()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Estimate' group='#group:21'"
-	 * @generated
-	 */
-	EList getEstimate();
-
-	/**
-	 * Returns the value of the '<em><b>Estimation Considerations</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Estimation Considerations</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Estimation Considerations</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProduct_EstimationConsiderations()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='EstimationConsiderations' group='#group:21'"
-	 * @generated
-	 */
-	EList getEstimationConsiderations();
-
-	/**
-	 * Returns the value of the '<em><b>Report</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Report</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Report</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProduct_Report()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Report' group='#group:21'"
-	 * @generated
-	 */
-	EList getReport();
-
-	/**
-	 * Returns the value of the '<em><b>Template</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Template</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Template</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProduct_Template()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Template' group='#group:21'"
-	 * @generated
-	 */
-	EList getTemplate();
-
-	/**
-	 * Returns the value of the '<em><b>Tool Mentor</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tool Mentor</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tool Mentor</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProduct_ToolMentor()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ToolMentor' group='#group:21'"
-	 * @generated
-	 */
-	EList getToolMentor();
-
-} // WorkProduct
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkProductDescription.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkProductDescription.java
deleted file mode 100755
index b627e06..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkProductDescription.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkProductDescription.java,v 1.2 2006/06/23 00:01:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Work Product Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A generalized Content Description that is used to store the textual description for a Work Product.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProductDescription#getImpactOfNotHaving <em>Impact Of Not Having</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProductDescription#getPurpose <em>Purpose</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProductDescription#getReasonsForNotNeeding <em>Reasons For Not Needing</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProductDescription#getExternalId <em>External Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductDescription()
- * @model extendedMetaData="name='WorkProductDescription' kind='elementOnly'"
- * @generated
- */
-public interface WorkProductDescription extends ContentDescription {
-	/**
-	 * Returns the value of the '<em><b>Impact Of Not Having</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Describes the consequences of not producing the work product.  This is intended to aid in the tailoring the method/process to the needs of a specific project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Impact Of Not Having</em>' attribute.
-	 * @see #setImpactOfNotHaving(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductDescription_ImpactOfNotHaving()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='ImpactOfNotHaving'"
-	 * @generated
-	 */
-	String getImpactOfNotHaving();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.WorkProductDescription#getImpactOfNotHaving <em>Impact Of Not Having</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Impact Of Not Having</em>' attribute.
-	 * @see #getImpactOfNotHaving()
-	 * @generated
-	 */
-	void setImpactOfNotHaving(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Purpose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Describes why the work product is produced and to what use it will be put.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Purpose</em>' attribute.
-	 * @see #setPurpose(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductDescription_Purpose()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='Purpose'"
-	 * @generated
-	 */
-	String getPurpose();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.WorkProductDescription#getPurpose <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Purpose</em>' attribute.
-	 * @see #getPurpose()
-	 * @generated
-	 */
-	void setPurpose(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Reasons For Not Needing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Describes the circumstances in which it is reasonable not to produce the work product.  This is intended to aid in the tailoring of the method/process to the needs of a specific project.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Reasons For Not Needing</em>' attribute.
-	 * @see #setReasonsForNotNeeding(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductDescription_ReasonsForNotNeeding()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='ReasonsForNotNeeding'"
-	 * @generated
-	 */
-	String getReasonsForNotNeeding();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.WorkProductDescription#getReasonsForNotNeeding <em>Reasons For Not Needing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Reasons For Not Needing</em>' attribute.
-	 * @see #getReasonsForNotNeeding()
-	 * @generated
-	 */
-	void setReasonsForNotNeeding(String value);
-
-	/**
-	 * Returns the value of the '<em><b>External Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * An external visible number that is used to reference this artifact. Used like a synonym.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>External Id</em>' attribute.
-	 * @see #setExternalId(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductDescription_ExternalId()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='externalId'"
-	 * @generated
-	 */
-	String getExternalId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.WorkProductDescription#getExternalId <em>External Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>External Id</em>' attribute.
-	 * @see #getExternalId()
-	 * @generated
-	 */
-	void setExternalId(String value);
-
-} // WorkProductDescription
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkProductDescriptor.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkProductDescriptor.java
deleted file mode 100755
index d192ba7..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkProductDescriptor.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkProductDescriptor.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Work Product Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A special Descriptor that represents a Work Product in the context of one specific Activity.  Every breakdown structure can define different relationships of Work Product Descriptors to Task Descriptors and Role Descriptors.  Therefore one Work Product can be represented by many Work Product Descriptors each within the context of an Activity with its own set of relationships.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getWorkProduct <em>Work Product</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getImpactedBy <em>Impacted By</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getImpacts <em>Impacts</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getDeliverableParts <em>Deliverable Parts</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getActivityEntryState <em>Activity Entry State</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getActivityExitState <em>Activity Exit State</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductDescriptor()
- * @model extendedMetaData="name='WorkProductDescriptor' kind='elementOnly'"
- * @generated
- */
-public interface WorkProductDescriptor extends Descriptor {
-	/**
-	 * Returns the value of the '<em><b>Work Product</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Work Product</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Work Product</em>' attribute.
-	 * @see #setWorkProduct(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductDescriptor_WorkProduct()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='element' name='WorkProduct'"
-	 * @generated
-	 */
-	String getWorkProduct();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getWorkProduct <em>Work Product</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Work Product</em>' attribute.
-	 * @see #getWorkProduct()
-	 * @generated
-	 */
-	void setWorkProduct(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Group1</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group1</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group1</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductDescriptor_Group1()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:22'"
-	 * @generated
-	 */
-	FeatureMap getGroup1();
-
-	/**
-	 * Returns the value of the '<em><b>Impacted By</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Impacted By</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Impacted By</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductDescriptor_ImpactedBy()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='ImpactedBy' group='#group:22'"
-	 * @generated
-	 */
-	EList getImpactedBy();
-
-	/**
-	 * Returns the value of the '<em><b>Impacts</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Impacts</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Impacts</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductDescriptor_Impacts()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='Impacts' group='#group:22'"
-	 * @generated
-	 */
-	EList getImpacts();
-
-	/**
-	 * Returns the value of the '<em><b>Deliverable Parts</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Deliverable Parts</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Deliverable Parts</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductDescriptor_DeliverableParts()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='DeliverableParts' group='#group:22'"
-	 * @generated
-	 */
-	EList getDeliverableParts();
-
-	/**
-	 * Returns the value of the '<em><b>Activity Entry State</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Entry State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is initiated (i.e. work on the Activity's Task Descriptors is being initiated that use this Work Product Descriptor as input).  
-	 * For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested].
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Activity Entry State</em>' attribute.
-	 * @see #setActivityEntryState(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductDescriptor_ActivityEntryState()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='activityEntryState'"
-	 * @generated
-	 */
-	String getActivityEntryState();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getActivityEntryState <em>Activity Entry State</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Activity Entry State</em>' attribute.
-	 * @see #getActivityEntryState()
-	 * @generated
-	 */
-	void setActivityEntryState(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Activity Exit State</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Given that an instance of Work Product Descriptor has been created for a specific Activity, then the Activity Exist State attribute specifies the desired state of instances of the referenced Work Product when work on the Activity is finished (i.e. work on the Activity's Task Descriptors has finished that have this Work Product Descriptor as output).
-	 * For some Work Products state is expressed in percentage of completion, compliance to work product checklist, informal state descriptions, etc.  Others have very specific states expressed as enumerations such as [identified, briefly described, outlined, detailed] for use cases.  Other Work Product states relate to some quality measures or lifecycle states such as [reviewed, implemented, tested].
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Activity Exit State</em>' attribute.
-	 * @see #setActivityExitState(String)
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductDescriptor_ActivityExitState()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='activityExitState'"
-	 * @generated
-	 */
-	String getActivityExitState();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.epf.xml.uma.WorkProductDescriptor#getActivityExitState <em>Activity Exit State</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Activity Exit State</em>' attribute.
-	 * @see #getActivityExitState()
-	 * @generated
-	 */
-	void setActivityExitState(String value);
-
-} // WorkProductDescriptor
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkProductType.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkProductType.java
deleted file mode 100755
index 276ee4d..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/WorkProductType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkProductType.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Work Product Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A second category for work products, which in contrast to Domain is more presentation oriented.  A work product can have many Work Product Types.  Examples, for a Work Product Type is "Class Diagram", which categorizes the Artifacts Analysis Model, Design Model, User Experience Model, or "Specification", which categorizes requirements specifications that define a system with a well-defined system boundary, such as use case or functional requirements specification.  A Work Product can be categorized to be of many Work Product Types.  For example, a use case model can be categorized as a Specification as well as Diagram Work Product Type.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProductType#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.WorkProductType#getWorkProduct <em>Work Product</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductType()
- * @model extendedMetaData="name='WorkProductType' kind='elementOnly'"
- * @generated
- */
-public interface WorkProductType extends ContentCategory {
-	/**
-	 * Returns the value of the '<em><b>Group2</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group2</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group2</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductType_Group2()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
-	 *        extendedMetaData="kind='group' name='group:21'"
-	 * @generated
-	 */
-	FeatureMap getGroup2();
-
-	/**
-	 * Returns the value of the '<em><b>Work Product</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Work Product</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Work Product</em>' attribute list.
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#getWorkProductType_WorkProduct()
-	 * @model type="java.lang.String" unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
-	 *        extendedMetaData="kind='element' name='WorkProduct' group='#group:21'"
-	 * @generated
-	 */
-	EList getWorkProduct();
-
-} // WorkProductType
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ActivityDescriptionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ActivityDescriptionImpl.java
deleted file mode 100755
index 1cadc74..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ActivityDescriptionImpl.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ActivityDescriptionImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.ActivityDescription;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Activity Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityDescriptionImpl#getAlternatives <em>Alternatives</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityDescriptionImpl#getHowToStaff <em>How To Staff</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityDescriptionImpl#getPurpose <em>Purpose</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ActivityDescriptionImpl extends BreakdownElementDescriptionImpl implements ActivityDescription {
-	/**
-	 * The default value of the '{@link #getAlternatives() <em>Alternatives</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlternatives()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ALTERNATIVES_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAlternatives() <em>Alternatives</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlternatives()
-	 * @generated
-	 * @ordered
-	 */
-	protected String alternatives = ALTERNATIVES_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHowToStaff() <em>How To Staff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHowToStaff()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HOW_TO_STAFF_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHowToStaff() <em>How To Staff</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHowToStaff()
-	 * @generated
-	 * @ordered
-	 */
-	protected String howToStaff = HOW_TO_STAFF_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPurpose()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PURPOSE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPurpose()
-	 * @generated
-	 * @ordered
-	 */
-	protected String purpose = PURPOSE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ActivityDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ACTIVITY_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAlternatives() {
-		return alternatives;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAlternatives(String newAlternatives) {
-		String oldAlternatives = alternatives;
-		alternatives = newAlternatives;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.ACTIVITY_DESCRIPTION__ALTERNATIVES, oldAlternatives, alternatives));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHowToStaff() {
-		return howToStaff;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHowToStaff(String newHowToStaff) {
-		String oldHowToStaff = howToStaff;
-		howToStaff = newHowToStaff;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.ACTIVITY_DESCRIPTION__HOW_TO_STAFF, oldHowToStaff, howToStaff));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPurpose() {
-		return purpose;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPurpose(String newPurpose) {
-		String oldPurpose = purpose;
-		purpose = newPurpose;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.ACTIVITY_DESCRIPTION__PURPOSE, oldPurpose, purpose));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.ACTIVITY_DESCRIPTION__ALTERNATIVES:
-				return getAlternatives();
-			case UmaPackage.ACTIVITY_DESCRIPTION__HOW_TO_STAFF:
-				return getHowToStaff();
-			case UmaPackage.ACTIVITY_DESCRIPTION__PURPOSE:
-				return getPurpose();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.ACTIVITY_DESCRIPTION__ALTERNATIVES:
-				setAlternatives((String)newValue);
-				return;
-			case UmaPackage.ACTIVITY_DESCRIPTION__HOW_TO_STAFF:
-				setHowToStaff((String)newValue);
-				return;
-			case UmaPackage.ACTIVITY_DESCRIPTION__PURPOSE:
-				setPurpose((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ACTIVITY_DESCRIPTION__ALTERNATIVES:
-				setAlternatives(ALTERNATIVES_EDEFAULT);
-				return;
-			case UmaPackage.ACTIVITY_DESCRIPTION__HOW_TO_STAFF:
-				setHowToStaff(HOW_TO_STAFF_EDEFAULT);
-				return;
-			case UmaPackage.ACTIVITY_DESCRIPTION__PURPOSE:
-				setPurpose(PURPOSE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ACTIVITY_DESCRIPTION__ALTERNATIVES:
-				return ALTERNATIVES_EDEFAULT == null ? alternatives != null : !ALTERNATIVES_EDEFAULT.equals(alternatives);
-			case UmaPackage.ACTIVITY_DESCRIPTION__HOW_TO_STAFF:
-				return HOW_TO_STAFF_EDEFAULT == null ? howToStaff != null : !HOW_TO_STAFF_EDEFAULT.equals(howToStaff);
-			case UmaPackage.ACTIVITY_DESCRIPTION__PURPOSE:
-				return PURPOSE_EDEFAULT == null ? purpose != null : !PURPOSE_EDEFAULT.equals(purpose);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (alternatives: ");
-		result.append(alternatives);
-		result.append(", howToStaff: ");
-		result.append(howToStaff);
-		result.append(", purpose: ");
-		result.append(purpose);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ActivityDescriptionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ActivityImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ActivityImpl.java
deleted file mode 100755
index 73f480e..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ActivityImpl.java
+++ /dev/null
@@ -1,690 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ActivityImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.Activity;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.VariabilityType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Activity</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityImpl#getPrecondition <em>Precondition</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityImpl#getPostcondition <em>Postcondition</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityImpl#getBreakdownElement <em>Breakdown Element</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityImpl#getChecklist <em>Checklist</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityImpl#getConcept <em>Concept</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityImpl#getExample <em>Example</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityImpl#getGuideline <em>Guideline</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityImpl#getRoadmap <em>Roadmap</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityImpl#getReusableAsset <em>Reusable Asset</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityImpl#getSupportingMaterial <em>Supporting Material</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityImpl#getWhitepaper <em>Whitepaper</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityImpl#isIsEnactable <em>Is Enactable</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityImpl#getVariabilityBasedOnElement <em>Variability Based On Element</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ActivityImpl#getVariabilityType <em>Variability Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ActivityImpl extends WorkBreakdownElementImpl implements Activity {
-	/**
-	 * The default value of the '{@link #getPrecondition() <em>Precondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrecondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PRECONDITION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPrecondition() <em>Precondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrecondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected String precondition = PRECONDITION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPostcondition() <em>Postcondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostcondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String POSTCONDITION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPostcondition() <em>Postcondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostcondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected String postcondition = POSTCONDITION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * The default value of the '{@link #isIsEnactable() <em>Is Enactable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsEnactable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_ENACTABLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsEnactable() <em>Is Enactable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsEnactable()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isEnactable = IS_ENACTABLE_EDEFAULT;
-
-	/**
-	 * This is true if the Is Enactable attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isEnactableESet = false;
-
-	/**
-	 * The default value of the '{@link #getVariabilityBasedOnElement() <em>Variability Based On Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityBasedOnElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VARIABILITY_BASED_ON_ELEMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getVariabilityBasedOnElement() <em>Variability Based On Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityBasedOnElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected String variabilityBasedOnElement = VARIABILITY_BASED_ON_ELEMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getVariabilityType() <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final VariabilityType VARIABILITY_TYPE_EDEFAULT = VariabilityType.NA_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getVariabilityType() <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityType()
-	 * @generated
-	 * @ordered
-	 */
-	protected VariabilityType variabilityType = VARIABILITY_TYPE_EDEFAULT;
-
-	/**
-	 * This is true if the Variability Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean variabilityTypeESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ActivityImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ACTIVITY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPrecondition() {
-		return precondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPrecondition(String newPrecondition) {
-		String oldPrecondition = precondition;
-		precondition = newPrecondition;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.ACTIVITY__PRECONDITION, oldPrecondition, precondition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPostcondition() {
-		return postcondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPostcondition(String newPostcondition) {
-		String oldPostcondition = postcondition;
-		postcondition = newPostcondition;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.ACTIVITY__POSTCONDITION, oldPostcondition, postcondition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.ACTIVITY__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getBreakdownElement() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.ACTIVITY__BREAKDOWN_ELEMENT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getChecklist() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.ACTIVITY__CHECKLIST);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getConcept() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.ACTIVITY__CONCEPT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getExample() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.ACTIVITY__EXAMPLE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getGuideline() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.ACTIVITY__GUIDELINE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getRoadmap() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.ACTIVITY__ROADMAP);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getReusableAsset() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.ACTIVITY__REUSABLE_ASSET);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSupportingMaterial() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.ACTIVITY__SUPPORTING_MATERIAL);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getWhitepaper() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.ACTIVITY__WHITEPAPER);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsEnactable() {
-		return isEnactable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsEnactable(boolean newIsEnactable) {
-		boolean oldIsEnactable = isEnactable;
-		isEnactable = newIsEnactable;
-		boolean oldIsEnactableESet = isEnactableESet;
-		isEnactableESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.ACTIVITY__IS_ENACTABLE, oldIsEnactable, isEnactable, !oldIsEnactableESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsEnactable() {
-		boolean oldIsEnactable = isEnactable;
-		boolean oldIsEnactableESet = isEnactableESet;
-		isEnactable = IS_ENACTABLE_EDEFAULT;
-		isEnactableESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.ACTIVITY__IS_ENACTABLE, oldIsEnactable, IS_ENACTABLE_EDEFAULT, oldIsEnactableESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsEnactable() {
-		return isEnactableESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVariabilityBasedOnElement() {
-		return variabilityBasedOnElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVariabilityBasedOnElement(String newVariabilityBasedOnElement) {
-		String oldVariabilityBasedOnElement = variabilityBasedOnElement;
-		variabilityBasedOnElement = newVariabilityBasedOnElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.ACTIVITY__VARIABILITY_BASED_ON_ELEMENT, oldVariabilityBasedOnElement, variabilityBasedOnElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityType getVariabilityType() {
-		return variabilityType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVariabilityType(VariabilityType newVariabilityType) {
-		VariabilityType oldVariabilityType = variabilityType;
-		variabilityType = newVariabilityType == null ? VARIABILITY_TYPE_EDEFAULT : newVariabilityType;
-		boolean oldVariabilityTypeESet = variabilityTypeESet;
-		variabilityTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.ACTIVITY__VARIABILITY_TYPE, oldVariabilityType, variabilityType, !oldVariabilityTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetVariabilityType() {
-		VariabilityType oldVariabilityType = variabilityType;
-		boolean oldVariabilityTypeESet = variabilityTypeESet;
-		variabilityType = VARIABILITY_TYPE_EDEFAULT;
-		variabilityTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.ACTIVITY__VARIABILITY_TYPE, oldVariabilityType, VARIABILITY_TYPE_EDEFAULT, oldVariabilityTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetVariabilityType() {
-		return variabilityTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.ACTIVITY__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-			case UmaPackage.ACTIVITY__BREAKDOWN_ELEMENT:
-				return ((InternalEList)getBreakdownElement()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.ACTIVITY__PRECONDITION:
-				return getPrecondition();
-			case UmaPackage.ACTIVITY__POSTCONDITION:
-				return getPostcondition();
-			case UmaPackage.ACTIVITY__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.ACTIVITY__BREAKDOWN_ELEMENT:
-				return getBreakdownElement();
-			case UmaPackage.ACTIVITY__CHECKLIST:
-				return getChecklist();
-			case UmaPackage.ACTIVITY__CONCEPT:
-				return getConcept();
-			case UmaPackage.ACTIVITY__EXAMPLE:
-				return getExample();
-			case UmaPackage.ACTIVITY__GUIDELINE:
-				return getGuideline();
-			case UmaPackage.ACTIVITY__ROADMAP:
-				return getRoadmap();
-			case UmaPackage.ACTIVITY__REUSABLE_ASSET:
-				return getReusableAsset();
-			case UmaPackage.ACTIVITY__SUPPORTING_MATERIAL:
-				return getSupportingMaterial();
-			case UmaPackage.ACTIVITY__WHITEPAPER:
-				return getWhitepaper();
-			case UmaPackage.ACTIVITY__IS_ENACTABLE:
-				return isIsEnactable() ? Boolean.TRUE : Boolean.FALSE;
-			case UmaPackage.ACTIVITY__VARIABILITY_BASED_ON_ELEMENT:
-				return getVariabilityBasedOnElement();
-			case UmaPackage.ACTIVITY__VARIABILITY_TYPE:
-				return getVariabilityType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.ACTIVITY__PRECONDITION:
-				setPrecondition((String)newValue);
-				return;
-			case UmaPackage.ACTIVITY__POSTCONDITION:
-				setPostcondition((String)newValue);
-				return;
-			case UmaPackage.ACTIVITY__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.ACTIVITY__BREAKDOWN_ELEMENT:
-				getBreakdownElement().clear();
-				getBreakdownElement().addAll((Collection)newValue);
-				return;
-			case UmaPackage.ACTIVITY__CHECKLIST:
-				getChecklist().clear();
-				getChecklist().addAll((Collection)newValue);
-				return;
-			case UmaPackage.ACTIVITY__CONCEPT:
-				getConcept().clear();
-				getConcept().addAll((Collection)newValue);
-				return;
-			case UmaPackage.ACTIVITY__EXAMPLE:
-				getExample().clear();
-				getExample().addAll((Collection)newValue);
-				return;
-			case UmaPackage.ACTIVITY__GUIDELINE:
-				getGuideline().clear();
-				getGuideline().addAll((Collection)newValue);
-				return;
-			case UmaPackage.ACTIVITY__ROADMAP:
-				getRoadmap().clear();
-				getRoadmap().addAll((Collection)newValue);
-				return;
-			case UmaPackage.ACTIVITY__REUSABLE_ASSET:
-				getReusableAsset().clear();
-				getReusableAsset().addAll((Collection)newValue);
-				return;
-			case UmaPackage.ACTIVITY__SUPPORTING_MATERIAL:
-				getSupportingMaterial().clear();
-				getSupportingMaterial().addAll((Collection)newValue);
-				return;
-			case UmaPackage.ACTIVITY__WHITEPAPER:
-				getWhitepaper().clear();
-				getWhitepaper().addAll((Collection)newValue);
-				return;
-			case UmaPackage.ACTIVITY__IS_ENACTABLE:
-				setIsEnactable(((Boolean)newValue).booleanValue());
-				return;
-			case UmaPackage.ACTIVITY__VARIABILITY_BASED_ON_ELEMENT:
-				setVariabilityBasedOnElement((String)newValue);
-				return;
-			case UmaPackage.ACTIVITY__VARIABILITY_TYPE:
-				setVariabilityType((VariabilityType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ACTIVITY__PRECONDITION:
-				setPrecondition(PRECONDITION_EDEFAULT);
-				return;
-			case UmaPackage.ACTIVITY__POSTCONDITION:
-				setPostcondition(POSTCONDITION_EDEFAULT);
-				return;
-			case UmaPackage.ACTIVITY__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.ACTIVITY__BREAKDOWN_ELEMENT:
-				getBreakdownElement().clear();
-				return;
-			case UmaPackage.ACTIVITY__CHECKLIST:
-				getChecklist().clear();
-				return;
-			case UmaPackage.ACTIVITY__CONCEPT:
-				getConcept().clear();
-				return;
-			case UmaPackage.ACTIVITY__EXAMPLE:
-				getExample().clear();
-				return;
-			case UmaPackage.ACTIVITY__GUIDELINE:
-				getGuideline().clear();
-				return;
-			case UmaPackage.ACTIVITY__ROADMAP:
-				getRoadmap().clear();
-				return;
-			case UmaPackage.ACTIVITY__REUSABLE_ASSET:
-				getReusableAsset().clear();
-				return;
-			case UmaPackage.ACTIVITY__SUPPORTING_MATERIAL:
-				getSupportingMaterial().clear();
-				return;
-			case UmaPackage.ACTIVITY__WHITEPAPER:
-				getWhitepaper().clear();
-				return;
-			case UmaPackage.ACTIVITY__IS_ENACTABLE:
-				unsetIsEnactable();
-				return;
-			case UmaPackage.ACTIVITY__VARIABILITY_BASED_ON_ELEMENT:
-				setVariabilityBasedOnElement(VARIABILITY_BASED_ON_ELEMENT_EDEFAULT);
-				return;
-			case UmaPackage.ACTIVITY__VARIABILITY_TYPE:
-				unsetVariabilityType();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ACTIVITY__PRECONDITION:
-				return PRECONDITION_EDEFAULT == null ? precondition != null : !PRECONDITION_EDEFAULT.equals(precondition);
-			case UmaPackage.ACTIVITY__POSTCONDITION:
-				return POSTCONDITION_EDEFAULT == null ? postcondition != null : !POSTCONDITION_EDEFAULT.equals(postcondition);
-			case UmaPackage.ACTIVITY__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.ACTIVITY__BREAKDOWN_ELEMENT:
-				return !getBreakdownElement().isEmpty();
-			case UmaPackage.ACTIVITY__CHECKLIST:
-				return !getChecklist().isEmpty();
-			case UmaPackage.ACTIVITY__CONCEPT:
-				return !getConcept().isEmpty();
-			case UmaPackage.ACTIVITY__EXAMPLE:
-				return !getExample().isEmpty();
-			case UmaPackage.ACTIVITY__GUIDELINE:
-				return !getGuideline().isEmpty();
-			case UmaPackage.ACTIVITY__ROADMAP:
-				return !getRoadmap().isEmpty();
-			case UmaPackage.ACTIVITY__REUSABLE_ASSET:
-				return !getReusableAsset().isEmpty();
-			case UmaPackage.ACTIVITY__SUPPORTING_MATERIAL:
-				return !getSupportingMaterial().isEmpty();
-			case UmaPackage.ACTIVITY__WHITEPAPER:
-				return !getWhitepaper().isEmpty();
-			case UmaPackage.ACTIVITY__IS_ENACTABLE:
-				return isSetIsEnactable();
-			case UmaPackage.ACTIVITY__VARIABILITY_BASED_ON_ELEMENT:
-				return VARIABILITY_BASED_ON_ELEMENT_EDEFAULT == null ? variabilityBasedOnElement != null : !VARIABILITY_BASED_ON_ELEMENT_EDEFAULT.equals(variabilityBasedOnElement);
-			case UmaPackage.ACTIVITY__VARIABILITY_TYPE:
-				return isSetVariabilityType();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (precondition: ");
-		result.append(precondition);
-		result.append(", postcondition: ");
-		result.append(postcondition);
-		result.append(", group2: ");
-		result.append(group2);
-		result.append(", isEnactable: ");
-		if (isEnactableESet) result.append(isEnactable); else result.append("<unset>");
-		result.append(", variabilityBasedOnElement: ");
-		result.append(variabilityBasedOnElement);
-		result.append(", variabilityType: ");
-		if (variabilityTypeESet) result.append(variabilityType); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //ActivityImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ArtifactDescriptionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ArtifactDescriptionImpl.java
deleted file mode 100755
index f17ac33..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ArtifactDescriptionImpl.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ArtifactDescriptionImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.ArtifactDescription;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Artifact Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ArtifactDescriptionImpl#getBriefOutline <em>Brief Outline</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ArtifactDescriptionImpl#getRepresentationOptions <em>Representation Options</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ArtifactDescriptionImpl extends WorkProductDescriptionImpl implements ArtifactDescription {
-	/**
-	 * The default value of the '{@link #getBriefOutline() <em>Brief Outline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBriefOutline()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String BRIEF_OUTLINE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getBriefOutline() <em>Brief Outline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBriefOutline()
-	 * @generated
-	 * @ordered
-	 */
-	protected String briefOutline = BRIEF_OUTLINE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRepresentationOptions() <em>Representation Options</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRepresentationOptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REPRESENTATION_OPTIONS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRepresentationOptions() <em>Representation Options</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRepresentationOptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected String representationOptions = REPRESENTATION_OPTIONS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ArtifactDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ARTIFACT_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getBriefOutline() {
-		return briefOutline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBriefOutline(String newBriefOutline) {
-		String oldBriefOutline = briefOutline;
-		briefOutline = newBriefOutline;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.ARTIFACT_DESCRIPTION__BRIEF_OUTLINE, oldBriefOutline, briefOutline));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRepresentationOptions() {
-		return representationOptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRepresentationOptions(String newRepresentationOptions) {
-		String oldRepresentationOptions = representationOptions;
-		representationOptions = newRepresentationOptions;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS, oldRepresentationOptions, representationOptions));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.ARTIFACT_DESCRIPTION__BRIEF_OUTLINE:
-				return getBriefOutline();
-			case UmaPackage.ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS:
-				return getRepresentationOptions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.ARTIFACT_DESCRIPTION__BRIEF_OUTLINE:
-				setBriefOutline((String)newValue);
-				return;
-			case UmaPackage.ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS:
-				setRepresentationOptions((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ARTIFACT_DESCRIPTION__BRIEF_OUTLINE:
-				setBriefOutline(BRIEF_OUTLINE_EDEFAULT);
-				return;
-			case UmaPackage.ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS:
-				setRepresentationOptions(REPRESENTATION_OPTIONS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ARTIFACT_DESCRIPTION__BRIEF_OUTLINE:
-				return BRIEF_OUTLINE_EDEFAULT == null ? briefOutline != null : !BRIEF_OUTLINE_EDEFAULT.equals(briefOutline);
-			case UmaPackage.ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS:
-				return REPRESENTATION_OPTIONS_EDEFAULT == null ? representationOptions != null : !REPRESENTATION_OPTIONS_EDEFAULT.equals(representationOptions);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (briefOutline: ");
-		result.append(briefOutline);
-		result.append(", representationOptions: ");
-		result.append(representationOptions);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ArtifactDescriptionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ArtifactImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ArtifactImpl.java
deleted file mode 100755
index aff7b16..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ArtifactImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ArtifactImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.Artifact;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Artifact</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ArtifactImpl#getGroup3 <em>Group3</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ArtifactImpl#getContainedArtifact <em>Contained Artifact</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ArtifactImpl extends WorkProductImpl implements Artifact {
-	/**
-	 * The cached value of the '{@link #getGroup3() <em>Group3</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup3()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group3 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ArtifactImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ARTIFACT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup3() {
-		if (group3 == null) {
-			group3 = new BasicFeatureMap(this, UmaPackage.ARTIFACT__GROUP3);
-		}
-		return group3;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getContainedArtifact() {
-		return ((FeatureMap)getGroup3()).list(UmaPackage.Literals.ARTIFACT__CONTAINED_ARTIFACT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.ARTIFACT__GROUP3:
-				return ((InternalEList)getGroup3()).basicRemove(otherEnd, msgs);
-			case UmaPackage.ARTIFACT__CONTAINED_ARTIFACT:
-				return ((InternalEList)getContainedArtifact()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.ARTIFACT__GROUP3:
-				if (coreType) return getGroup3();
-				return ((FeatureMap.Internal)getGroup3()).getWrapper();
-			case UmaPackage.ARTIFACT__CONTAINED_ARTIFACT:
-				return getContainedArtifact();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.ARTIFACT__GROUP3:
-				((FeatureMap.Internal)getGroup3()).set(newValue);
-				return;
-			case UmaPackage.ARTIFACT__CONTAINED_ARTIFACT:
-				getContainedArtifact().clear();
-				getContainedArtifact().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ARTIFACT__GROUP3:
-				getGroup3().clear();
-				return;
-			case UmaPackage.ARTIFACT__CONTAINED_ARTIFACT:
-				getContainedArtifact().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ARTIFACT__GROUP3:
-				return group3 != null && !group3.isEmpty();
-			case UmaPackage.ARTIFACT__CONTAINED_ARTIFACT:
-				return !getContainedArtifact().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group3: ");
-		result.append(group3);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ArtifactImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/BreakdownElementDescriptionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/BreakdownElementDescriptionImpl.java
deleted file mode 100755
index 7fa765e..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/BreakdownElementDescriptionImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: BreakdownElementDescriptionImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.BreakdownElementDescription;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Breakdown Element Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.BreakdownElementDescriptionImpl#getUsageGuidance <em>Usage Guidance</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BreakdownElementDescriptionImpl extends ContentDescriptionImpl implements BreakdownElementDescription {
-	/**
-	 * The default value of the '{@link #getUsageGuidance() <em>Usage Guidance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUsageGuidance()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String USAGE_GUIDANCE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUsageGuidance() <em>Usage Guidance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUsageGuidance()
-	 * @generated
-	 * @ordered
-	 */
-	protected String usageGuidance = USAGE_GUIDANCE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BreakdownElementDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.BREAKDOWN_ELEMENT_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getUsageGuidance() {
-		return usageGuidance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUsageGuidance(String newUsageGuidance) {
-		String oldUsageGuidance = usageGuidance;
-		usageGuidance = newUsageGuidance;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE, oldUsageGuidance, usageGuidance));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE:
-				return getUsageGuidance();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE:
-				setUsageGuidance((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE:
-				setUsageGuidance(USAGE_GUIDANCE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE:
-				return USAGE_GUIDANCE_EDEFAULT == null ? usageGuidance != null : !USAGE_GUIDANCE_EDEFAULT.equals(usageGuidance);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (usageGuidance: ");
-		result.append(usageGuidance);
-		result.append(')');
-		return result.toString();
-	}
-
-} //BreakdownElementDescriptionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/BreakdownElementImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/BreakdownElementImpl.java
deleted file mode 100755
index 5dffc2b..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/BreakdownElementImpl.java
+++ /dev/null
@@ -1,637 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: BreakdownElementImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.BreakdownElement;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Breakdown Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.BreakdownElementImpl#getPresentedAfter <em>Presented After</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.BreakdownElementImpl#getPresentedBefore <em>Presented Before</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.BreakdownElementImpl#getPlanningData <em>Planning Data</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.BreakdownElementImpl#getSuperActivity <em>Super Activity</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.BreakdownElementImpl#isHasMultipleOccurrences <em>Has Multiple Occurrences</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.BreakdownElementImpl#isIsOptional <em>Is Optional</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.BreakdownElementImpl#isIsPlanned <em>Is Planned</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.BreakdownElementImpl#getPrefix <em>Prefix</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BreakdownElementImpl extends ProcessElementImpl implements BreakdownElement {
-	/**
-	 * The default value of the '{@link #getPresentedAfter() <em>Presented After</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPresentedAfter()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PRESENTED_AFTER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPresentedAfter() <em>Presented After</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPresentedAfter()
-	 * @generated
-	 * @ordered
-	 */
-	protected String presentedAfter = PRESENTED_AFTER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPresentedBefore() <em>Presented Before</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPresentedBefore()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PRESENTED_BEFORE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPresentedBefore() <em>Presented Before</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPresentedBefore()
-	 * @generated
-	 * @ordered
-	 */
-	protected String presentedBefore = PRESENTED_BEFORE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPlanningData() <em>Planning Data</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPlanningData()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PLANNING_DATA_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPlanningData() <em>Planning Data</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPlanningData()
-	 * @generated
-	 * @ordered
-	 */
-	protected String planningData = PLANNING_DATA_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSuperActivity() <em>Super Activity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSuperActivity()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SUPER_ACTIVITY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSuperActivity() <em>Super Activity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSuperActivity()
-	 * @generated
-	 * @ordered
-	 */
-	protected String superActivity = SUPER_ACTIVITY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isHasMultipleOccurrences() <em>Has Multiple Occurrences</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHasMultipleOccurrences()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean HAS_MULTIPLE_OCCURRENCES_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isHasMultipleOccurrences() <em>Has Multiple Occurrences</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHasMultipleOccurrences()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean hasMultipleOccurrences = HAS_MULTIPLE_OCCURRENCES_EDEFAULT;
-
-	/**
-	 * This is true if the Has Multiple Occurrences attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean hasMultipleOccurrencesESet = false;
-
-	/**
-	 * The default value of the '{@link #isIsOptional() <em>Is Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsOptional()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_OPTIONAL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsOptional() <em>Is Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsOptional()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isOptional = IS_OPTIONAL_EDEFAULT;
-
-	/**
-	 * This is true if the Is Optional attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isOptionalESet = false;
-
-	/**
-	 * The default value of the '{@link #isIsPlanned() <em>Is Planned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsPlanned()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_PLANNED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsPlanned() <em>Is Planned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsPlanned()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isPlanned = IS_PLANNED_EDEFAULT;
-
-	/**
-	 * This is true if the Is Planned attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isPlannedESet = false;
-
-	/**
-	 * The default value of the '{@link #getPrefix() <em>Prefix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrefix()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PREFIX_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPrefix() <em>Prefix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrefix()
-	 * @generated
-	 * @ordered
-	 */
-	protected String prefix = PREFIX_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BreakdownElementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.BREAKDOWN_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPresentedAfter() {
-		return presentedAfter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPresentedAfter(String newPresentedAfter) {
-		String oldPresentedAfter = presentedAfter;
-		presentedAfter = newPresentedAfter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_AFTER, oldPresentedAfter, presentedAfter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPresentedBefore() {
-		return presentedBefore;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPresentedBefore(String newPresentedBefore) {
-		String oldPresentedBefore = presentedBefore;
-		presentedBefore = newPresentedBefore;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_BEFORE, oldPresentedBefore, presentedBefore));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPlanningData() {
-		return planningData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPlanningData(String newPlanningData) {
-		String oldPlanningData = planningData;
-		planningData = newPlanningData;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA, oldPlanningData, planningData));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSuperActivity() {
-		return superActivity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSuperActivity(String newSuperActivity) {
-		String oldSuperActivity = superActivity;
-		superActivity = newSuperActivity;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.BREAKDOWN_ELEMENT__SUPER_ACTIVITY, oldSuperActivity, superActivity));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isHasMultipleOccurrences() {
-		return hasMultipleOccurrences;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHasMultipleOccurrences(boolean newHasMultipleOccurrences) {
-		boolean oldHasMultipleOccurrences = hasMultipleOccurrences;
-		hasMultipleOccurrences = newHasMultipleOccurrences;
-		boolean oldHasMultipleOccurrencesESet = hasMultipleOccurrencesESet;
-		hasMultipleOccurrencesESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES, oldHasMultipleOccurrences, hasMultipleOccurrences, !oldHasMultipleOccurrencesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetHasMultipleOccurrences() {
-		boolean oldHasMultipleOccurrences = hasMultipleOccurrences;
-		boolean oldHasMultipleOccurrencesESet = hasMultipleOccurrencesESet;
-		hasMultipleOccurrences = HAS_MULTIPLE_OCCURRENCES_EDEFAULT;
-		hasMultipleOccurrencesESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES, oldHasMultipleOccurrences, HAS_MULTIPLE_OCCURRENCES_EDEFAULT, oldHasMultipleOccurrencesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetHasMultipleOccurrences() {
-		return hasMultipleOccurrencesESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsOptional() {
-		return isOptional;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsOptional(boolean newIsOptional) {
-		boolean oldIsOptional = isOptional;
-		isOptional = newIsOptional;
-		boolean oldIsOptionalESet = isOptionalESet;
-		isOptionalESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.BREAKDOWN_ELEMENT__IS_OPTIONAL, oldIsOptional, isOptional, !oldIsOptionalESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsOptional() {
-		boolean oldIsOptional = isOptional;
-		boolean oldIsOptionalESet = isOptionalESet;
-		isOptional = IS_OPTIONAL_EDEFAULT;
-		isOptionalESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.BREAKDOWN_ELEMENT__IS_OPTIONAL, oldIsOptional, IS_OPTIONAL_EDEFAULT, oldIsOptionalESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsOptional() {
-		return isOptionalESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsPlanned() {
-		return isPlanned;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsPlanned(boolean newIsPlanned) {
-		boolean oldIsPlanned = isPlanned;
-		isPlanned = newIsPlanned;
-		boolean oldIsPlannedESet = isPlannedESet;
-		isPlannedESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.BREAKDOWN_ELEMENT__IS_PLANNED, oldIsPlanned, isPlanned, !oldIsPlannedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsPlanned() {
-		boolean oldIsPlanned = isPlanned;
-		boolean oldIsPlannedESet = isPlannedESet;
-		isPlanned = IS_PLANNED_EDEFAULT;
-		isPlannedESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.BREAKDOWN_ELEMENT__IS_PLANNED, oldIsPlanned, IS_PLANNED_EDEFAULT, oldIsPlannedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsPlanned() {
-		return isPlannedESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPrefix() {
-		return prefix;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPrefix(String newPrefix) {
-		String oldPrefix = prefix;
-		prefix = newPrefix;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.BREAKDOWN_ELEMENT__PREFIX, oldPrefix, prefix));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_AFTER:
-				return getPresentedAfter();
-			case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_BEFORE:
-				return getPresentedBefore();
-			case UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA:
-				return getPlanningData();
-			case UmaPackage.BREAKDOWN_ELEMENT__SUPER_ACTIVITY:
-				return getSuperActivity();
-			case UmaPackage.BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES:
-				return isHasMultipleOccurrences() ? Boolean.TRUE : Boolean.FALSE;
-			case UmaPackage.BREAKDOWN_ELEMENT__IS_OPTIONAL:
-				return isIsOptional() ? Boolean.TRUE : Boolean.FALSE;
-			case UmaPackage.BREAKDOWN_ELEMENT__IS_PLANNED:
-				return isIsPlanned() ? Boolean.TRUE : Boolean.FALSE;
-			case UmaPackage.BREAKDOWN_ELEMENT__PREFIX:
-				return getPrefix();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_AFTER:
-				setPresentedAfter((String)newValue);
-				return;
-			case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_BEFORE:
-				setPresentedBefore((String)newValue);
-				return;
-			case UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA:
-				setPlanningData((String)newValue);
-				return;
-			case UmaPackage.BREAKDOWN_ELEMENT__SUPER_ACTIVITY:
-				setSuperActivity((String)newValue);
-				return;
-			case UmaPackage.BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES:
-				setHasMultipleOccurrences(((Boolean)newValue).booleanValue());
-				return;
-			case UmaPackage.BREAKDOWN_ELEMENT__IS_OPTIONAL:
-				setIsOptional(((Boolean)newValue).booleanValue());
-				return;
-			case UmaPackage.BREAKDOWN_ELEMENT__IS_PLANNED:
-				setIsPlanned(((Boolean)newValue).booleanValue());
-				return;
-			case UmaPackage.BREAKDOWN_ELEMENT__PREFIX:
-				setPrefix((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_AFTER:
-				setPresentedAfter(PRESENTED_AFTER_EDEFAULT);
-				return;
-			case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_BEFORE:
-				setPresentedBefore(PRESENTED_BEFORE_EDEFAULT);
-				return;
-			case UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA:
-				setPlanningData(PLANNING_DATA_EDEFAULT);
-				return;
-			case UmaPackage.BREAKDOWN_ELEMENT__SUPER_ACTIVITY:
-				setSuperActivity(SUPER_ACTIVITY_EDEFAULT);
-				return;
-			case UmaPackage.BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES:
-				unsetHasMultipleOccurrences();
-				return;
-			case UmaPackage.BREAKDOWN_ELEMENT__IS_OPTIONAL:
-				unsetIsOptional();
-				return;
-			case UmaPackage.BREAKDOWN_ELEMENT__IS_PLANNED:
-				unsetIsPlanned();
-				return;
-			case UmaPackage.BREAKDOWN_ELEMENT__PREFIX:
-				setPrefix(PREFIX_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_AFTER:
-				return PRESENTED_AFTER_EDEFAULT == null ? presentedAfter != null : !PRESENTED_AFTER_EDEFAULT.equals(presentedAfter);
-			case UmaPackage.BREAKDOWN_ELEMENT__PRESENTED_BEFORE:
-				return PRESENTED_BEFORE_EDEFAULT == null ? presentedBefore != null : !PRESENTED_BEFORE_EDEFAULT.equals(presentedBefore);
-			case UmaPackage.BREAKDOWN_ELEMENT__PLANNING_DATA:
-				return PLANNING_DATA_EDEFAULT == null ? planningData != null : !PLANNING_DATA_EDEFAULT.equals(planningData);
-			case UmaPackage.BREAKDOWN_ELEMENT__SUPER_ACTIVITY:
-				return SUPER_ACTIVITY_EDEFAULT == null ? superActivity != null : !SUPER_ACTIVITY_EDEFAULT.equals(superActivity);
-			case UmaPackage.BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES:
-				return isSetHasMultipleOccurrences();
-			case UmaPackage.BREAKDOWN_ELEMENT__IS_OPTIONAL:
-				return isSetIsOptional();
-			case UmaPackage.BREAKDOWN_ELEMENT__IS_PLANNED:
-				return isSetIsPlanned();
-			case UmaPackage.BREAKDOWN_ELEMENT__PREFIX:
-				return PREFIX_EDEFAULT == null ? prefix != null : !PREFIX_EDEFAULT.equals(prefix);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (presentedAfter: ");
-		result.append(presentedAfter);
-		result.append(", presentedBefore: ");
-		result.append(presentedBefore);
-		result.append(", planningData: ");
-		result.append(planningData);
-		result.append(", superActivity: ");
-		result.append(superActivity);
-		result.append(", hasMultipleOccurrences: ");
-		if (hasMultipleOccurrencesESet) result.append(hasMultipleOccurrences); else result.append("<unset>");
-		result.append(", isOptional: ");
-		if (isOptionalESet) result.append(isOptional); else result.append("<unset>");
-		result.append(", isPlanned: ");
-		if (isPlannedESet) result.append(isPlanned); else result.append("<unset>");
-		result.append(", prefix: ");
-		result.append(prefix);
-		result.append(')');
-		return result.toString();
-	}
-
-} //BreakdownElementImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/CapabilityPatternImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/CapabilityPatternImpl.java
deleted file mode 100755
index 4691009..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/CapabilityPatternImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CapabilityPatternImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.CapabilityPattern;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Capability Pattern</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class CapabilityPatternImpl extends ProcessImpl implements CapabilityPattern {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CapabilityPatternImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CAPABILITY_PATTERN;
-	}
-
-} //CapabilityPatternImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ChecklistImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ChecklistImpl.java
deleted file mode 100755
index f0b8174..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ChecklistImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ChecklistImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.Checklist;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Checklist</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ChecklistImpl extends GuidanceImpl implements Checklist {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ChecklistImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CHECKLIST;
-	}
-
-} //ChecklistImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/CompositeRoleImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/CompositeRoleImpl.java
deleted file mode 100755
index 1a5ad1c..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/CompositeRoleImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CompositeRoleImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.CompositeRole;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Composite Role</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.CompositeRoleImpl#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.CompositeRoleImpl#getAggregatedRole <em>Aggregated Role</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CompositeRoleImpl extends RoleDescriptorImpl implements CompositeRole {
-	/**
-	 * The cached value of the '{@link #getGroup1() <em>Group1</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup1()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group1 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CompositeRoleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.COMPOSITE_ROLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup1() {
-		if (group1 == null) {
-			group1 = new BasicFeatureMap(this, UmaPackage.COMPOSITE_ROLE__GROUP1);
-		}
-		return group1;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getAggregatedRole() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.COMPOSITE_ROLE__AGGREGATED_ROLE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.COMPOSITE_ROLE__GROUP1:
-				return ((InternalEList)getGroup1()).basicRemove(otherEnd, msgs);
-			case UmaPackage.COMPOSITE_ROLE__AGGREGATED_ROLE:
-				return ((InternalEList)getAggregatedRole()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.COMPOSITE_ROLE__GROUP1:
-				if (coreType) return getGroup1();
-				return ((FeatureMap.Internal)getGroup1()).getWrapper();
-			case UmaPackage.COMPOSITE_ROLE__AGGREGATED_ROLE:
-				return getAggregatedRole();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.COMPOSITE_ROLE__GROUP1:
-				((FeatureMap.Internal)getGroup1()).set(newValue);
-				return;
-			case UmaPackage.COMPOSITE_ROLE__AGGREGATED_ROLE:
-				getAggregatedRole().clear();
-				getAggregatedRole().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.COMPOSITE_ROLE__GROUP1:
-				getGroup1().clear();
-				return;
-			case UmaPackage.COMPOSITE_ROLE__AGGREGATED_ROLE:
-				getAggregatedRole().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.COMPOSITE_ROLE__GROUP1:
-				return group1 != null && !group1.isEmpty();
-			case UmaPackage.COMPOSITE_ROLE__AGGREGATED_ROLE:
-				return !getAggregatedRole().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group1: ");
-		result.append(group1);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CompositeRoleImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ConceptImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ConceptImpl.java
deleted file mode 100755
index 77773a5..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ConceptImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ConceptImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.Concept;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Concept</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ConceptImpl extends GuidanceImpl implements Concept {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConceptImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CONCEPT;
-	}
-
-} //ConceptImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ConstraintImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ConstraintImpl.java
deleted file mode 100755
index b7aca68..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ConstraintImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ConstraintImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.Constraint;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ConstraintImpl#getMainDescription <em>Main Description</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ConstraintImpl extends MethodElementImpl implements Constraint {
-	/**
-	 * The default value of the '{@link #getMainDescription() <em>Main Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMainDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAIN_DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMainDescription() <em>Main Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMainDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mainDescription = MAIN_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConstraintImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CONSTRAINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMainDescription() {
-		return mainDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMainDescription(String newMainDescription) {
-		String oldMainDescription = mainDescription;
-		mainDescription = newMainDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.CONSTRAINT__MAIN_DESCRIPTION, oldMainDescription, mainDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.CONSTRAINT__MAIN_DESCRIPTION:
-				return getMainDescription();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.CONSTRAINT__MAIN_DESCRIPTION:
-				setMainDescription((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.CONSTRAINT__MAIN_DESCRIPTION:
-				setMainDescription(MAIN_DESCRIPTION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.CONSTRAINT__MAIN_DESCRIPTION:
-				return MAIN_DESCRIPTION_EDEFAULT == null ? mainDescription != null : !MAIN_DESCRIPTION_EDEFAULT.equals(mainDescription);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mainDescription: ");
-		result.append(mainDescription);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ConstraintImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ContentCategoryImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ContentCategoryImpl.java
deleted file mode 100755
index 1171491..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ContentCategoryImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentCategoryImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.ContentCategory;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Content Category</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ContentCategoryImpl extends ContentElementImpl implements ContentCategory {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContentCategoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CONTENT_CATEGORY;
-	}
-
-} //ContentCategoryImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ContentCategoryPackageImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ContentCategoryPackageImpl.java
deleted file mode 100755
index f574bec..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ContentCategoryPackageImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentCategoryPackageImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.ContentCategoryPackage;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Content Category Package</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentCategoryPackageImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentCategoryPackageImpl#getContentCategory <em>Content Category</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ContentCategoryPackageImpl extends MethodPackageImpl implements ContentCategoryPackage {
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContentCategoryPackageImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CONTENT_CATEGORY_PACKAGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.CONTENT_CATEGORY_PACKAGE__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getContentCategory() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.CONTENT_CATEGORY_PACKAGE__CONTENT_CATEGORY);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_CATEGORY_PACKAGE__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-			case UmaPackage.CONTENT_CATEGORY_PACKAGE__CONTENT_CATEGORY:
-				return ((InternalEList)getContentCategory()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_CATEGORY_PACKAGE__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.CONTENT_CATEGORY_PACKAGE__CONTENT_CATEGORY:
-				return getContentCategory();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_CATEGORY_PACKAGE__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.CONTENT_CATEGORY_PACKAGE__CONTENT_CATEGORY:
-				getContentCategory().clear();
-				getContentCategory().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_CATEGORY_PACKAGE__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.CONTENT_CATEGORY_PACKAGE__CONTENT_CATEGORY:
-				getContentCategory().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_CATEGORY_PACKAGE__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.CONTENT_CATEGORY_PACKAGE__CONTENT_CATEGORY:
-				return !getContentCategory().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ContentCategoryPackageImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ContentDescriptionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ContentDescriptionImpl.java
deleted file mode 100755
index 306614d..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ContentDescriptionImpl.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentDescriptionImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.ContentDescription;
-import org.eclipse.epf.xml.uma.Section;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Content Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentDescriptionImpl#getMainDescription <em>Main Description</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentDescriptionImpl#getKeyConsiderations <em>Key Considerations</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentDescriptionImpl#getSection <em>Section</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ContentDescriptionImpl extends MethodUnitImpl implements ContentDescription {
-	/**
-	 * The default value of the '{@link #getMainDescription() <em>Main Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMainDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAIN_DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMainDescription() <em>Main Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMainDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mainDescription = MAIN_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getKeyConsiderations() <em>Key Considerations</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getKeyConsiderations()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String KEY_CONSIDERATIONS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getKeyConsiderations() <em>Key Considerations</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getKeyConsiderations()
-	 * @generated
-	 * @ordered
-	 */
-	protected String keyConsiderations = KEY_CONSIDERATIONS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getSection() <em>Section</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSection()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList section = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContentDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CONTENT_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMainDescription() {
-		return mainDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMainDescription(String newMainDescription) {
-		String oldMainDescription = mainDescription;
-		mainDescription = newMainDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.CONTENT_DESCRIPTION__MAIN_DESCRIPTION, oldMainDescription, mainDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getKeyConsiderations() {
-		return keyConsiderations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKeyConsiderations(String newKeyConsiderations) {
-		String oldKeyConsiderations = keyConsiderations;
-		keyConsiderations = newKeyConsiderations;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.CONTENT_DESCRIPTION__KEY_CONSIDERATIONS, oldKeyConsiderations, keyConsiderations));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSection() {
-		if (section == null) {
-			section = new EObjectContainmentEList(Section.class, this, UmaPackage.CONTENT_DESCRIPTION__SECTION);
-		}
-		return section;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_DESCRIPTION__SECTION:
-				return ((InternalEList)getSection()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_DESCRIPTION__MAIN_DESCRIPTION:
-				return getMainDescription();
-			case UmaPackage.CONTENT_DESCRIPTION__KEY_CONSIDERATIONS:
-				return getKeyConsiderations();
-			case UmaPackage.CONTENT_DESCRIPTION__SECTION:
-				return getSection();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_DESCRIPTION__MAIN_DESCRIPTION:
-				setMainDescription((String)newValue);
-				return;
-			case UmaPackage.CONTENT_DESCRIPTION__KEY_CONSIDERATIONS:
-				setKeyConsiderations((String)newValue);
-				return;
-			case UmaPackage.CONTENT_DESCRIPTION__SECTION:
-				getSection().clear();
-				getSection().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_DESCRIPTION__MAIN_DESCRIPTION:
-				setMainDescription(MAIN_DESCRIPTION_EDEFAULT);
-				return;
-			case UmaPackage.CONTENT_DESCRIPTION__KEY_CONSIDERATIONS:
-				setKeyConsiderations(KEY_CONSIDERATIONS_EDEFAULT);
-				return;
-			case UmaPackage.CONTENT_DESCRIPTION__SECTION:
-				getSection().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_DESCRIPTION__MAIN_DESCRIPTION:
-				return MAIN_DESCRIPTION_EDEFAULT == null ? mainDescription != null : !MAIN_DESCRIPTION_EDEFAULT.equals(mainDescription);
-			case UmaPackage.CONTENT_DESCRIPTION__KEY_CONSIDERATIONS:
-				return KEY_CONSIDERATIONS_EDEFAULT == null ? keyConsiderations != null : !KEY_CONSIDERATIONS_EDEFAULT.equals(keyConsiderations);
-			case UmaPackage.CONTENT_DESCRIPTION__SECTION:
-				return section != null && !section.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mainDescription: ");
-		result.append(mainDescription);
-		result.append(", keyConsiderations: ");
-		result.append(keyConsiderations);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ContentDescriptionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ContentElementImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ContentElementImpl.java
deleted file mode 100755
index 8d42b8b..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ContentElementImpl.java
+++ /dev/null
@@ -1,450 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentElementImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.ContentElement;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.VariabilityType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Content Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentElementImpl#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentElementImpl#getChecklist <em>Checklist</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentElementImpl#getConcept <em>Concept</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentElementImpl#getExample <em>Example</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentElementImpl#getGuideline <em>Guideline</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentElementImpl#getReusableAsset <em>Reusable Asset</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentElementImpl#getSupportingMaterial <em>Supporting Material</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentElementImpl#getWhitepaper <em>Whitepaper</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentElementImpl#getVariabilityBasedOnElement <em>Variability Based On Element</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentElementImpl#getVariabilityType <em>Variability Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ContentElementImpl extends DescribableElementImpl implements ContentElement {
-	/**
-	 * The cached value of the '{@link #getGroup1() <em>Group1</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup1()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group1 = null;
-
-	/**
-	 * The default value of the '{@link #getVariabilityBasedOnElement() <em>Variability Based On Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityBasedOnElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VARIABILITY_BASED_ON_ELEMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getVariabilityBasedOnElement() <em>Variability Based On Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityBasedOnElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected String variabilityBasedOnElement = VARIABILITY_BASED_ON_ELEMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getVariabilityType() <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final VariabilityType VARIABILITY_TYPE_EDEFAULT = VariabilityType.NA_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getVariabilityType() <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityType()
-	 * @generated
-	 * @ordered
-	 */
-	protected VariabilityType variabilityType = VARIABILITY_TYPE_EDEFAULT;
-
-	/**
-	 * This is true if the Variability Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean variabilityTypeESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContentElementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CONTENT_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup1() {
-		if (group1 == null) {
-			group1 = new BasicFeatureMap(this, UmaPackage.CONTENT_ELEMENT__GROUP1);
-		}
-		return group1;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getChecklist() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.CONTENT_ELEMENT__CHECKLIST);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getConcept() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.CONTENT_ELEMENT__CONCEPT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getExample() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.CONTENT_ELEMENT__EXAMPLE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getGuideline() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.CONTENT_ELEMENT__GUIDELINE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getReusableAsset() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.CONTENT_ELEMENT__REUSABLE_ASSET);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSupportingMaterial() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.CONTENT_ELEMENT__SUPPORTING_MATERIAL);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getWhitepaper() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.CONTENT_ELEMENT__WHITEPAPER);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVariabilityBasedOnElement() {
-		return variabilityBasedOnElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVariabilityBasedOnElement(String newVariabilityBasedOnElement) {
-		String oldVariabilityBasedOnElement = variabilityBasedOnElement;
-		variabilityBasedOnElement = newVariabilityBasedOnElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT, oldVariabilityBasedOnElement, variabilityBasedOnElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityType getVariabilityType() {
-		return variabilityType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVariabilityType(VariabilityType newVariabilityType) {
-		VariabilityType oldVariabilityType = variabilityType;
-		variabilityType = newVariabilityType == null ? VARIABILITY_TYPE_EDEFAULT : newVariabilityType;
-		boolean oldVariabilityTypeESet = variabilityTypeESet;
-		variabilityTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.CONTENT_ELEMENT__VARIABILITY_TYPE, oldVariabilityType, variabilityType, !oldVariabilityTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetVariabilityType() {
-		VariabilityType oldVariabilityType = variabilityType;
-		boolean oldVariabilityTypeESet = variabilityTypeESet;
-		variabilityType = VARIABILITY_TYPE_EDEFAULT;
-		variabilityTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.CONTENT_ELEMENT__VARIABILITY_TYPE, oldVariabilityType, VARIABILITY_TYPE_EDEFAULT, oldVariabilityTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetVariabilityType() {
-		return variabilityTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_ELEMENT__GROUP1:
-				return ((InternalEList)getGroup1()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_ELEMENT__GROUP1:
-				if (coreType) return getGroup1();
-				return ((FeatureMap.Internal)getGroup1()).getWrapper();
-			case UmaPackage.CONTENT_ELEMENT__CHECKLIST:
-				return getChecklist();
-			case UmaPackage.CONTENT_ELEMENT__CONCEPT:
-				return getConcept();
-			case UmaPackage.CONTENT_ELEMENT__EXAMPLE:
-				return getExample();
-			case UmaPackage.CONTENT_ELEMENT__GUIDELINE:
-				return getGuideline();
-			case UmaPackage.CONTENT_ELEMENT__REUSABLE_ASSET:
-				return getReusableAsset();
-			case UmaPackage.CONTENT_ELEMENT__SUPPORTING_MATERIAL:
-				return getSupportingMaterial();
-			case UmaPackage.CONTENT_ELEMENT__WHITEPAPER:
-				return getWhitepaper();
-			case UmaPackage.CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-				return getVariabilityBasedOnElement();
-			case UmaPackage.CONTENT_ELEMENT__VARIABILITY_TYPE:
-				return getVariabilityType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_ELEMENT__GROUP1:
-				((FeatureMap.Internal)getGroup1()).set(newValue);
-				return;
-			case UmaPackage.CONTENT_ELEMENT__CHECKLIST:
-				getChecklist().clear();
-				getChecklist().addAll((Collection)newValue);
-				return;
-			case UmaPackage.CONTENT_ELEMENT__CONCEPT:
-				getConcept().clear();
-				getConcept().addAll((Collection)newValue);
-				return;
-			case UmaPackage.CONTENT_ELEMENT__EXAMPLE:
-				getExample().clear();
-				getExample().addAll((Collection)newValue);
-				return;
-			case UmaPackage.CONTENT_ELEMENT__GUIDELINE:
-				getGuideline().clear();
-				getGuideline().addAll((Collection)newValue);
-				return;
-			case UmaPackage.CONTENT_ELEMENT__REUSABLE_ASSET:
-				getReusableAsset().clear();
-				getReusableAsset().addAll((Collection)newValue);
-				return;
-			case UmaPackage.CONTENT_ELEMENT__SUPPORTING_MATERIAL:
-				getSupportingMaterial().clear();
-				getSupportingMaterial().addAll((Collection)newValue);
-				return;
-			case UmaPackage.CONTENT_ELEMENT__WHITEPAPER:
-				getWhitepaper().clear();
-				getWhitepaper().addAll((Collection)newValue);
-				return;
-			case UmaPackage.CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-				setVariabilityBasedOnElement((String)newValue);
-				return;
-			case UmaPackage.CONTENT_ELEMENT__VARIABILITY_TYPE:
-				setVariabilityType((VariabilityType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_ELEMENT__GROUP1:
-				getGroup1().clear();
-				return;
-			case UmaPackage.CONTENT_ELEMENT__CHECKLIST:
-				getChecklist().clear();
-				return;
-			case UmaPackage.CONTENT_ELEMENT__CONCEPT:
-				getConcept().clear();
-				return;
-			case UmaPackage.CONTENT_ELEMENT__EXAMPLE:
-				getExample().clear();
-				return;
-			case UmaPackage.CONTENT_ELEMENT__GUIDELINE:
-				getGuideline().clear();
-				return;
-			case UmaPackage.CONTENT_ELEMENT__REUSABLE_ASSET:
-				getReusableAsset().clear();
-				return;
-			case UmaPackage.CONTENT_ELEMENT__SUPPORTING_MATERIAL:
-				getSupportingMaterial().clear();
-				return;
-			case UmaPackage.CONTENT_ELEMENT__WHITEPAPER:
-				getWhitepaper().clear();
-				return;
-			case UmaPackage.CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-				setVariabilityBasedOnElement(VARIABILITY_BASED_ON_ELEMENT_EDEFAULT);
-				return;
-			case UmaPackage.CONTENT_ELEMENT__VARIABILITY_TYPE:
-				unsetVariabilityType();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_ELEMENT__GROUP1:
-				return group1 != null && !group1.isEmpty();
-			case UmaPackage.CONTENT_ELEMENT__CHECKLIST:
-				return !getChecklist().isEmpty();
-			case UmaPackage.CONTENT_ELEMENT__CONCEPT:
-				return !getConcept().isEmpty();
-			case UmaPackage.CONTENT_ELEMENT__EXAMPLE:
-				return !getExample().isEmpty();
-			case UmaPackage.CONTENT_ELEMENT__GUIDELINE:
-				return !getGuideline().isEmpty();
-			case UmaPackage.CONTENT_ELEMENT__REUSABLE_ASSET:
-				return !getReusableAsset().isEmpty();
-			case UmaPackage.CONTENT_ELEMENT__SUPPORTING_MATERIAL:
-				return !getSupportingMaterial().isEmpty();
-			case UmaPackage.CONTENT_ELEMENT__WHITEPAPER:
-				return !getWhitepaper().isEmpty();
-			case UmaPackage.CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT:
-				return VARIABILITY_BASED_ON_ELEMENT_EDEFAULT == null ? variabilityBasedOnElement != null : !VARIABILITY_BASED_ON_ELEMENT_EDEFAULT.equals(variabilityBasedOnElement);
-			case UmaPackage.CONTENT_ELEMENT__VARIABILITY_TYPE:
-				return isSetVariabilityType();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group1: ");
-		result.append(group1);
-		result.append(", variabilityBasedOnElement: ");
-		result.append(variabilityBasedOnElement);
-		result.append(", variabilityType: ");
-		if (variabilityTypeESet) result.append(variabilityType); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //ContentElementImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ContentPackageImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ContentPackageImpl.java
deleted file mode 100755
index 213e3d0..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ContentPackageImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentPackageImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.ContentPackage;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Content Package</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentPackageImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ContentPackageImpl#getContentElement <em>Content Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ContentPackageImpl extends MethodPackageImpl implements ContentPackage {
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContentPackageImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CONTENT_PACKAGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.CONTENT_PACKAGE__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getContentElement() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.CONTENT_PACKAGE__CONTENT_ELEMENT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_PACKAGE__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-			case UmaPackage.CONTENT_PACKAGE__CONTENT_ELEMENT:
-				return ((InternalEList)getContentElement()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_PACKAGE__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.CONTENT_PACKAGE__CONTENT_ELEMENT:
-				return getContentElement();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_PACKAGE__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.CONTENT_PACKAGE__CONTENT_ELEMENT:
-				getContentElement().clear();
-				getContentElement().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_PACKAGE__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.CONTENT_PACKAGE__CONTENT_ELEMENT:
-				getContentElement().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.CONTENT_PACKAGE__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.CONTENT_PACKAGE__CONTENT_ELEMENT:
-				return !getContentElement().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ContentPackageImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/CustomCategoryImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/CustomCategoryImpl.java
deleted file mode 100755
index 2a1af16..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/CustomCategoryImpl.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CustomCategoryImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.CustomCategory;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Custom Category</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.CustomCategoryImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.CustomCategoryImpl#getCategorizedElement <em>Categorized Element</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.CustomCategoryImpl#getSubCategory <em>Sub Category</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CustomCategoryImpl extends ContentCategoryImpl implements CustomCategory {
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomCategoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.CUSTOM_CATEGORY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.CUSTOM_CATEGORY__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getCategorizedElement() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.CUSTOM_CATEGORY__CATEGORIZED_ELEMENT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSubCategory() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.CUSTOM_CATEGORY__SUB_CATEGORY);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.CUSTOM_CATEGORY__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.CUSTOM_CATEGORY__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.CUSTOM_CATEGORY__CATEGORIZED_ELEMENT:
-				return getCategorizedElement();
-			case UmaPackage.CUSTOM_CATEGORY__SUB_CATEGORY:
-				return getSubCategory();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.CUSTOM_CATEGORY__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.CUSTOM_CATEGORY__CATEGORIZED_ELEMENT:
-				getCategorizedElement().clear();
-				getCategorizedElement().addAll((Collection)newValue);
-				return;
-			case UmaPackage.CUSTOM_CATEGORY__SUB_CATEGORY:
-				getSubCategory().clear();
-				getSubCategory().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.CUSTOM_CATEGORY__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.CUSTOM_CATEGORY__CATEGORIZED_ELEMENT:
-				getCategorizedElement().clear();
-				return;
-			case UmaPackage.CUSTOM_CATEGORY__SUB_CATEGORY:
-				getSubCategory().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.CUSTOM_CATEGORY__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.CUSTOM_CATEGORY__CATEGORIZED_ELEMENT:
-				return !getCategorizedElement().isEmpty();
-			case UmaPackage.CUSTOM_CATEGORY__SUB_CATEGORY:
-				return !getSubCategory().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CustomCategoryImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DeliverableDescriptionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DeliverableDescriptionImpl.java
deleted file mode 100755
index 710cc05..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DeliverableDescriptionImpl.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DeliverableDescriptionImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.DeliverableDescription;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Deliverable Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DeliverableDescriptionImpl#getExternalDescription <em>External Description</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DeliverableDescriptionImpl#getPackagingGuidance <em>Packaging Guidance</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DeliverableDescriptionImpl extends WorkProductDescriptionImpl implements DeliverableDescription {
-	/**
-	 * The default value of the '{@link #getExternalDescription() <em>External Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExternalDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXTERNAL_DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExternalDescription() <em>External Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExternalDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String externalDescription = EXTERNAL_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPackagingGuidance() <em>Packaging Guidance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPackagingGuidance()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PACKAGING_GUIDANCE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPackagingGuidance() <em>Packaging Guidance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPackagingGuidance()
-	 * @generated
-	 * @ordered
-	 */
-	protected String packagingGuidance = PACKAGING_GUIDANCE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DeliverableDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DELIVERABLE_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getExternalDescription() {
-		return externalDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExternalDescription(String newExternalDescription) {
-		String oldExternalDescription = externalDescription;
-		externalDescription = newExternalDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION, oldExternalDescription, externalDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPackagingGuidance() {
-		return packagingGuidance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPackagingGuidance(String newPackagingGuidance) {
-		String oldPackagingGuidance = packagingGuidance;
-		packagingGuidance = newPackagingGuidance;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE, oldPackagingGuidance, packagingGuidance));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION:
-				return getExternalDescription();
-			case UmaPackage.DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE:
-				return getPackagingGuidance();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION:
-				setExternalDescription((String)newValue);
-				return;
-			case UmaPackage.DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE:
-				setPackagingGuidance((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION:
-				setExternalDescription(EXTERNAL_DESCRIPTION_EDEFAULT);
-				return;
-			case UmaPackage.DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE:
-				setPackagingGuidance(PACKAGING_GUIDANCE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION:
-				return EXTERNAL_DESCRIPTION_EDEFAULT == null ? externalDescription != null : !EXTERNAL_DESCRIPTION_EDEFAULT.equals(externalDescription);
-			case UmaPackage.DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE:
-				return PACKAGING_GUIDANCE_EDEFAULT == null ? packagingGuidance != null : !PACKAGING_GUIDANCE_EDEFAULT.equals(packagingGuidance);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (externalDescription: ");
-		result.append(externalDescription);
-		result.append(", packagingGuidance: ");
-		result.append(packagingGuidance);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DeliverableDescriptionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DeliverableImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DeliverableImpl.java
deleted file mode 100755
index 40fe73c..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DeliverableImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DeliverableImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.Deliverable;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Deliverable</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DeliverableImpl#getGroup3 <em>Group3</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DeliverableImpl#getDeliveredWorkProduct <em>Delivered Work Product</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DeliverableImpl extends WorkProductImpl implements Deliverable {
-	/**
-	 * The cached value of the '{@link #getGroup3() <em>Group3</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup3()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group3 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DeliverableImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DELIVERABLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup3() {
-		if (group3 == null) {
-			group3 = new BasicFeatureMap(this, UmaPackage.DELIVERABLE__GROUP3);
-		}
-		return group3;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDeliveredWorkProduct() {
-		return ((FeatureMap)getGroup3()).list(UmaPackage.Literals.DELIVERABLE__DELIVERED_WORK_PRODUCT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.DELIVERABLE__GROUP3:
-				return ((InternalEList)getGroup3()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.DELIVERABLE__GROUP3:
-				if (coreType) return getGroup3();
-				return ((FeatureMap.Internal)getGroup3()).getWrapper();
-			case UmaPackage.DELIVERABLE__DELIVERED_WORK_PRODUCT:
-				return getDeliveredWorkProduct();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.DELIVERABLE__GROUP3:
-				((FeatureMap.Internal)getGroup3()).set(newValue);
-				return;
-			case UmaPackage.DELIVERABLE__DELIVERED_WORK_PRODUCT:
-				getDeliveredWorkProduct().clear();
-				getDeliveredWorkProduct().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DELIVERABLE__GROUP3:
-				getGroup3().clear();
-				return;
-			case UmaPackage.DELIVERABLE__DELIVERED_WORK_PRODUCT:
-				getDeliveredWorkProduct().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DELIVERABLE__GROUP3:
-				return group3 != null && !group3.isEmpty();
-			case UmaPackage.DELIVERABLE__DELIVERED_WORK_PRODUCT:
-				return !getDeliveredWorkProduct().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group3: ");
-		result.append(group3);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DeliverableImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DeliveryProcessDescriptionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DeliveryProcessDescriptionImpl.java
deleted file mode 100755
index dac05a7..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DeliveryProcessDescriptionImpl.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DeliveryProcessDescriptionImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.DeliveryProcessDescription;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Delivery Process Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DeliveryProcessDescriptionImpl#getScale <em>Scale</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DeliveryProcessDescriptionImpl#getProjectCharacteristics <em>Project Characteristics</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DeliveryProcessDescriptionImpl#getRiskLevel <em>Risk Level</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DeliveryProcessDescriptionImpl#getEstimatingTechnique <em>Estimating Technique</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DeliveryProcessDescriptionImpl#getProjectMemberExpertise <em>Project Member Expertise</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DeliveryProcessDescriptionImpl#getTypeOfContract <em>Type Of Contract</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DeliveryProcessDescriptionImpl extends ProcessDescriptionImpl implements DeliveryProcessDescription {
-	/**
-	 * The default value of the '{@link #getScale() <em>Scale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getScale()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SCALE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getScale() <em>Scale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getScale()
-	 * @generated
-	 * @ordered
-	 */
-	protected String scale = SCALE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getProjectCharacteristics() <em>Project Characteristics</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProjectCharacteristics()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PROJECT_CHARACTERISTICS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getProjectCharacteristics() <em>Project Characteristics</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProjectCharacteristics()
-	 * @generated
-	 * @ordered
-	 */
-	protected String projectCharacteristics = PROJECT_CHARACTERISTICS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRiskLevel() <em>Risk Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRiskLevel()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String RISK_LEVEL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRiskLevel() <em>Risk Level</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRiskLevel()
-	 * @generated
-	 * @ordered
-	 */
-	protected String riskLevel = RISK_LEVEL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEstimatingTechnique() <em>Estimating Technique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEstimatingTechnique()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ESTIMATING_TECHNIQUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEstimatingTechnique() <em>Estimating Technique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEstimatingTechnique()
-	 * @generated
-	 * @ordered
-	 */
-	protected String estimatingTechnique = ESTIMATING_TECHNIQUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getProjectMemberExpertise() <em>Project Member Expertise</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProjectMemberExpertise()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PROJECT_MEMBER_EXPERTISE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getProjectMemberExpertise() <em>Project Member Expertise</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProjectMemberExpertise()
-	 * @generated
-	 * @ordered
-	 */
-	protected String projectMemberExpertise = PROJECT_MEMBER_EXPERTISE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTypeOfContract() <em>Type Of Contract</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeOfContract()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_OF_CONTRACT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTypeOfContract() <em>Type Of Contract</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeOfContract()
-	 * @generated
-	 * @ordered
-	 */
-	protected String typeOfContract = TYPE_OF_CONTRACT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DeliveryProcessDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DELIVERY_PROCESS_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getScale() {
-		return scale;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setScale(String newScale) {
-		String oldScale = scale;
-		scale = newScale;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.DELIVERY_PROCESS_DESCRIPTION__SCALE, oldScale, scale));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getProjectCharacteristics() {
-		return projectCharacteristics;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setProjectCharacteristics(String newProjectCharacteristics) {
-		String oldProjectCharacteristics = projectCharacteristics;
-		projectCharacteristics = newProjectCharacteristics;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS, oldProjectCharacteristics, projectCharacteristics));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRiskLevel() {
-		return riskLevel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRiskLevel(String newRiskLevel) {
-		String oldRiskLevel = riskLevel;
-		riskLevel = newRiskLevel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL, oldRiskLevel, riskLevel));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEstimatingTechnique() {
-		return estimatingTechnique;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEstimatingTechnique(String newEstimatingTechnique) {
-		String oldEstimatingTechnique = estimatingTechnique;
-		estimatingTechnique = newEstimatingTechnique;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE, oldEstimatingTechnique, estimatingTechnique));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getProjectMemberExpertise() {
-		return projectMemberExpertise;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setProjectMemberExpertise(String newProjectMemberExpertise) {
-		String oldProjectMemberExpertise = projectMemberExpertise;
-		projectMemberExpertise = newProjectMemberExpertise;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE, oldProjectMemberExpertise, projectMemberExpertise));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTypeOfContract() {
-		return typeOfContract;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypeOfContract(String newTypeOfContract) {
-		String oldTypeOfContract = typeOfContract;
-		typeOfContract = newTypeOfContract;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT, oldTypeOfContract, typeOfContract));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__SCALE:
-				return getScale();
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS:
-				return getProjectCharacteristics();
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL:
-				return getRiskLevel();
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE:
-				return getEstimatingTechnique();
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE:
-				return getProjectMemberExpertise();
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT:
-				return getTypeOfContract();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__SCALE:
-				setScale((String)newValue);
-				return;
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS:
-				setProjectCharacteristics((String)newValue);
-				return;
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL:
-				setRiskLevel((String)newValue);
-				return;
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE:
-				setEstimatingTechnique((String)newValue);
-				return;
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE:
-				setProjectMemberExpertise((String)newValue);
-				return;
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT:
-				setTypeOfContract((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__SCALE:
-				setScale(SCALE_EDEFAULT);
-				return;
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS:
-				setProjectCharacteristics(PROJECT_CHARACTERISTICS_EDEFAULT);
-				return;
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL:
-				setRiskLevel(RISK_LEVEL_EDEFAULT);
-				return;
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE:
-				setEstimatingTechnique(ESTIMATING_TECHNIQUE_EDEFAULT);
-				return;
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE:
-				setProjectMemberExpertise(PROJECT_MEMBER_EXPERTISE_EDEFAULT);
-				return;
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT:
-				setTypeOfContract(TYPE_OF_CONTRACT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__SCALE:
-				return SCALE_EDEFAULT == null ? scale != null : !SCALE_EDEFAULT.equals(scale);
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS:
-				return PROJECT_CHARACTERISTICS_EDEFAULT == null ? projectCharacteristics != null : !PROJECT_CHARACTERISTICS_EDEFAULT.equals(projectCharacteristics);
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL:
-				return RISK_LEVEL_EDEFAULT == null ? riskLevel != null : !RISK_LEVEL_EDEFAULT.equals(riskLevel);
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE:
-				return ESTIMATING_TECHNIQUE_EDEFAULT == null ? estimatingTechnique != null : !ESTIMATING_TECHNIQUE_EDEFAULT.equals(estimatingTechnique);
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE:
-				return PROJECT_MEMBER_EXPERTISE_EDEFAULT == null ? projectMemberExpertise != null : !PROJECT_MEMBER_EXPERTISE_EDEFAULT.equals(projectMemberExpertise);
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT:
-				return TYPE_OF_CONTRACT_EDEFAULT == null ? typeOfContract != null : !TYPE_OF_CONTRACT_EDEFAULT.equals(typeOfContract);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (scale: ");
-		result.append(scale);
-		result.append(", projectCharacteristics: ");
-		result.append(projectCharacteristics);
-		result.append(", riskLevel: ");
-		result.append(riskLevel);
-		result.append(", estimatingTechnique: ");
-		result.append(estimatingTechnique);
-		result.append(", projectMemberExpertise: ");
-		result.append(projectMemberExpertise);
-		result.append(", typeOfContract: ");
-		result.append(typeOfContract);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DeliveryProcessDescriptionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DeliveryProcessImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DeliveryProcessImpl.java
deleted file mode 100755
index 9824f51..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DeliveryProcessImpl.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DeliveryProcessImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.DeliveryProcess;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Delivery Process</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DeliveryProcessImpl#getGroup3 <em>Group3</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DeliveryProcessImpl#getCommunicationsMaterial <em>Communications Material</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DeliveryProcessImpl#getEducationMaterial <em>Education Material</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DeliveryProcessImpl extends ProcessImpl implements DeliveryProcess {
-	/**
-	 * The cached value of the '{@link #getGroup3() <em>Group3</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup3()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group3 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DeliveryProcessImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DELIVERY_PROCESS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup3() {
-		if (group3 == null) {
-			group3 = new BasicFeatureMap(this, UmaPackage.DELIVERY_PROCESS__GROUP3);
-		}
-		return group3;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getCommunicationsMaterial() {
-		return ((FeatureMap)getGroup3()).list(UmaPackage.Literals.DELIVERY_PROCESS__COMMUNICATIONS_MATERIAL);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEducationMaterial() {
-		return ((FeatureMap)getGroup3()).list(UmaPackage.Literals.DELIVERY_PROCESS__EDUCATION_MATERIAL);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.DELIVERY_PROCESS__GROUP3:
-				return ((InternalEList)getGroup3()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.DELIVERY_PROCESS__GROUP3:
-				if (coreType) return getGroup3();
-				return ((FeatureMap.Internal)getGroup3()).getWrapper();
-			case UmaPackage.DELIVERY_PROCESS__COMMUNICATIONS_MATERIAL:
-				return getCommunicationsMaterial();
-			case UmaPackage.DELIVERY_PROCESS__EDUCATION_MATERIAL:
-				return getEducationMaterial();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.DELIVERY_PROCESS__GROUP3:
-				((FeatureMap.Internal)getGroup3()).set(newValue);
-				return;
-			case UmaPackage.DELIVERY_PROCESS__COMMUNICATIONS_MATERIAL:
-				getCommunicationsMaterial().clear();
-				getCommunicationsMaterial().addAll((Collection)newValue);
-				return;
-			case UmaPackage.DELIVERY_PROCESS__EDUCATION_MATERIAL:
-				getEducationMaterial().clear();
-				getEducationMaterial().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DELIVERY_PROCESS__GROUP3:
-				getGroup3().clear();
-				return;
-			case UmaPackage.DELIVERY_PROCESS__COMMUNICATIONS_MATERIAL:
-				getCommunicationsMaterial().clear();
-				return;
-			case UmaPackage.DELIVERY_PROCESS__EDUCATION_MATERIAL:
-				getEducationMaterial().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DELIVERY_PROCESS__GROUP3:
-				return group3 != null && !group3.isEmpty();
-			case UmaPackage.DELIVERY_PROCESS__COMMUNICATIONS_MATERIAL:
-				return !getCommunicationsMaterial().isEmpty();
-			case UmaPackage.DELIVERY_PROCESS__EDUCATION_MATERIAL:
-				return !getEducationMaterial().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group3: ");
-		result.append(group3);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DeliveryProcessImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DescribableElementImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DescribableElementImpl.java
deleted file mode 100755
index 63fbc7c..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DescribableElementImpl.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DescribableElementImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.ContentDescription;
-import org.eclipse.epf.xml.uma.DescribableElement;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Describable Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DescribableElementImpl#getPresentation <em>Presentation</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DescribableElementImpl#getNodeicon <em>Nodeicon</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DescribableElementImpl#getPresentationName <em>Presentation Name</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DescribableElementImpl#getShapeicon <em>Shapeicon</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DescribableElementImpl extends MethodElementImpl implements DescribableElement {
-	/**
-	 * The cached value of the '{@link #getPresentation() <em>Presentation</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPresentation()
-	 * @generated
-	 * @ordered
-	 */
-	protected ContentDescription presentation = null;
-
-	/**
-	 * The default value of the '{@link #getNodeicon() <em>Nodeicon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNodeicon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NODEICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNodeicon() <em>Nodeicon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNodeicon()
-	 * @generated
-	 * @ordered
-	 */
-	protected String nodeicon = NODEICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPresentationName() <em>Presentation Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPresentationName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PRESENTATION_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPresentationName() <em>Presentation Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPresentationName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String presentationName = PRESENTATION_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getShapeicon() <em>Shapeicon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getShapeicon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SHAPEICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getShapeicon() <em>Shapeicon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getShapeicon()
-	 * @generated
-	 * @ordered
-	 */
-	protected String shapeicon = SHAPEICON_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DescribableElementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DESCRIBABLE_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContentDescription getPresentation() {
-		return presentation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPresentation(ContentDescription newPresentation, NotificationChain msgs) {
-		ContentDescription oldPresentation = presentation;
-		presentation = newPresentation;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION, oldPresentation, newPresentation);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPresentation(ContentDescription newPresentation) {
-		if (newPresentation != presentation) {
-			NotificationChain msgs = null;
-			if (presentation != null)
-				msgs = ((InternalEObject)presentation).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION, null, msgs);
-			if (newPresentation != null)
-				msgs = ((InternalEObject)newPresentation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION, null, msgs);
-			msgs = basicSetPresentation(newPresentation, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION, newPresentation, newPresentation));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getNodeicon() {
-		return nodeicon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNodeicon(String newNodeicon) {
-		String oldNodeicon = nodeicon;
-		nodeicon = newNodeicon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.DESCRIBABLE_ELEMENT__NODEICON, oldNodeicon, nodeicon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPresentationName() {
-		return presentationName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPresentationName(String newPresentationName) {
-		String oldPresentationName = presentationName;
-		presentationName = newPresentationName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION_NAME, oldPresentationName, presentationName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getShapeicon() {
-		return shapeicon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setShapeicon(String newShapeicon) {
-		String oldShapeicon = shapeicon;
-		shapeicon = newShapeicon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.DESCRIBABLE_ELEMENT__SHAPEICON, oldShapeicon, shapeicon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION:
-				return basicSetPresentation(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION:
-				return getPresentation();
-			case UmaPackage.DESCRIBABLE_ELEMENT__NODEICON:
-				return getNodeicon();
-			case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION_NAME:
-				return getPresentationName();
-			case UmaPackage.DESCRIBABLE_ELEMENT__SHAPEICON:
-				return getShapeicon();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION:
-				setPresentation((ContentDescription)newValue);
-				return;
-			case UmaPackage.DESCRIBABLE_ELEMENT__NODEICON:
-				setNodeicon((String)newValue);
-				return;
-			case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION_NAME:
-				setPresentationName((String)newValue);
-				return;
-			case UmaPackage.DESCRIBABLE_ELEMENT__SHAPEICON:
-				setShapeicon((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION:
-				setPresentation((ContentDescription)null);
-				return;
-			case UmaPackage.DESCRIBABLE_ELEMENT__NODEICON:
-				setNodeicon(NODEICON_EDEFAULT);
-				return;
-			case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION_NAME:
-				setPresentationName(PRESENTATION_NAME_EDEFAULT);
-				return;
-			case UmaPackage.DESCRIBABLE_ELEMENT__SHAPEICON:
-				setShapeicon(SHAPEICON_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION:
-				return presentation != null;
-			case UmaPackage.DESCRIBABLE_ELEMENT__NODEICON:
-				return NODEICON_EDEFAULT == null ? nodeicon != null : !NODEICON_EDEFAULT.equals(nodeicon);
-			case UmaPackage.DESCRIBABLE_ELEMENT__PRESENTATION_NAME:
-				return PRESENTATION_NAME_EDEFAULT == null ? presentationName != null : !PRESENTATION_NAME_EDEFAULT.equals(presentationName);
-			case UmaPackage.DESCRIBABLE_ELEMENT__SHAPEICON:
-				return SHAPEICON_EDEFAULT == null ? shapeicon != null : !SHAPEICON_EDEFAULT.equals(shapeicon);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (nodeicon: ");
-		result.append(nodeicon);
-		result.append(", presentationName: ");
-		result.append(presentationName);
-		result.append(", shapeicon: ");
-		result.append(shapeicon);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DescribableElementImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DescriptorDescriptionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DescriptorDescriptionImpl.java
deleted file mode 100755
index 53c85e7..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DescriptorDescriptionImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DescriptorDescriptionImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.DescriptorDescription;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Descriptor Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DescriptorDescriptionImpl#getRefinedDescription <em>Refined Description</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DescriptorDescriptionImpl extends BreakdownElementDescriptionImpl implements DescriptorDescription {
-	/**
-	 * The default value of the '{@link #getRefinedDescription() <em>Refined Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRefinedDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REFINED_DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRefinedDescription() <em>Refined Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRefinedDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String refinedDescription = REFINED_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DescriptorDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DESCRIPTOR_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRefinedDescription() {
-		return refinedDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRefinedDescription(String newRefinedDescription) {
-		String oldRefinedDescription = refinedDescription;
-		refinedDescription = newRefinedDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION, oldRefinedDescription, refinedDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION:
-				return getRefinedDescription();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION:
-				setRefinedDescription((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION:
-				setRefinedDescription(REFINED_DESCRIPTION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION:
-				return REFINED_DESCRIPTION_EDEFAULT == null ? refinedDescription != null : !REFINED_DESCRIPTION_EDEFAULT.equals(refinedDescription);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (refinedDescription: ");
-		result.append(refinedDescription);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DescriptorDescriptionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DescriptorImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DescriptorImpl.java
deleted file mode 100755
index b8114f8..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DescriptorImpl.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DescriptorImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.Descriptor;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DescriptorImpl#isIsSynchronizedWithSource <em>Is Synchronized With Source</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DescriptorImpl extends BreakdownElementImpl implements Descriptor {
-	/**
-	 * The default value of the '{@link #isIsSynchronizedWithSource() <em>Is Synchronized With Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSynchronizedWithSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsSynchronizedWithSource() <em>Is Synchronized With Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSynchronizedWithSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isSynchronizedWithSource = IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT;
-
-	/**
-	 * This is true if the Is Synchronized With Source attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isSynchronizedWithSourceESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DescriptorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DESCRIPTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsSynchronizedWithSource() {
-		return isSynchronizedWithSource;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsSynchronizedWithSource(boolean newIsSynchronizedWithSource) {
-		boolean oldIsSynchronizedWithSource = isSynchronizedWithSource;
-		isSynchronizedWithSource = newIsSynchronizedWithSource;
-		boolean oldIsSynchronizedWithSourceESet = isSynchronizedWithSourceESet;
-		isSynchronizedWithSourceESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE, oldIsSynchronizedWithSource, isSynchronizedWithSource, !oldIsSynchronizedWithSourceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsSynchronizedWithSource() {
-		boolean oldIsSynchronizedWithSource = isSynchronizedWithSource;
-		boolean oldIsSynchronizedWithSourceESet = isSynchronizedWithSourceESet;
-		isSynchronizedWithSource = IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT;
-		isSynchronizedWithSourceESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE, oldIsSynchronizedWithSource, IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT, oldIsSynchronizedWithSourceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsSynchronizedWithSource() {
-		return isSynchronizedWithSourceESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-				return isIsSynchronizedWithSource() ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-				setIsSynchronizedWithSource(((Boolean)newValue).booleanValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-				unsetIsSynchronizedWithSource();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-				return isSetIsSynchronizedWithSource();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (isSynchronizedWithSource: ");
-		if (isSynchronizedWithSourceESet) result.append(isSynchronizedWithSource); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //DescriptorImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DisciplineGroupingImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DisciplineGroupingImpl.java
deleted file mode 100755
index 7927958..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DisciplineGroupingImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DisciplineGroupingImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.DisciplineGrouping;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Discipline Grouping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DisciplineGroupingImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DisciplineGroupingImpl#getDiscipline <em>Discipline</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DisciplineGroupingImpl extends ContentCategoryImpl implements DisciplineGrouping {
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DisciplineGroupingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DISCIPLINE_GROUPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.DISCIPLINE_GROUPING__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDiscipline() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.DISCIPLINE_GROUPING__DISCIPLINE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.DISCIPLINE_GROUPING__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.DISCIPLINE_GROUPING__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.DISCIPLINE_GROUPING__DISCIPLINE:
-				return getDiscipline();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.DISCIPLINE_GROUPING__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.DISCIPLINE_GROUPING__DISCIPLINE:
-				getDiscipline().clear();
-				getDiscipline().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DISCIPLINE_GROUPING__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.DISCIPLINE_GROUPING__DISCIPLINE:
-				getDiscipline().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DISCIPLINE_GROUPING__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.DISCIPLINE_GROUPING__DISCIPLINE:
-				return !getDiscipline().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DisciplineGroupingImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DisciplineImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DisciplineImpl.java
deleted file mode 100755
index b736a58..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DisciplineImpl.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DisciplineImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.Discipline;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Discipline</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DisciplineImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DisciplineImpl#getTask <em>Task</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DisciplineImpl#getSubDiscipline <em>Sub Discipline</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DisciplineImpl#getReferenceWorkflow <em>Reference Workflow</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DisciplineImpl extends ContentCategoryImpl implements Discipline {
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DisciplineImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DISCIPLINE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.DISCIPLINE__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTask() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.DISCIPLINE__TASK);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSubDiscipline() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.DISCIPLINE__SUB_DISCIPLINE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getReferenceWorkflow() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.DISCIPLINE__REFERENCE_WORKFLOW);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.DISCIPLINE__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-			case UmaPackage.DISCIPLINE__SUB_DISCIPLINE:
-				return ((InternalEList)getSubDiscipline()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.DISCIPLINE__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.DISCIPLINE__TASK:
-				return getTask();
-			case UmaPackage.DISCIPLINE__SUB_DISCIPLINE:
-				return getSubDiscipline();
-			case UmaPackage.DISCIPLINE__REFERENCE_WORKFLOW:
-				return getReferenceWorkflow();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.DISCIPLINE__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.DISCIPLINE__TASK:
-				getTask().clear();
-				getTask().addAll((Collection)newValue);
-				return;
-			case UmaPackage.DISCIPLINE__SUB_DISCIPLINE:
-				getSubDiscipline().clear();
-				getSubDiscipline().addAll((Collection)newValue);
-				return;
-			case UmaPackage.DISCIPLINE__REFERENCE_WORKFLOW:
-				getReferenceWorkflow().clear();
-				getReferenceWorkflow().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DISCIPLINE__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.DISCIPLINE__TASK:
-				getTask().clear();
-				return;
-			case UmaPackage.DISCIPLINE__SUB_DISCIPLINE:
-				getSubDiscipline().clear();
-				return;
-			case UmaPackage.DISCIPLINE__REFERENCE_WORKFLOW:
-				getReferenceWorkflow().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DISCIPLINE__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.DISCIPLINE__TASK:
-				return !getTask().isEmpty();
-			case UmaPackage.DISCIPLINE__SUB_DISCIPLINE:
-				return !getSubDiscipline().isEmpty();
-			case UmaPackage.DISCIPLINE__REFERENCE_WORKFLOW:
-				return !getReferenceWorkflow().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DisciplineImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DocumentRootImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DocumentRootImpl.java
deleted file mode 100755
index 157f07f..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DocumentRootImpl.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentRootImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
-import org.eclipse.emf.ecore.sdo.impl.EDataObjectImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.EcoreEMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.DocumentRoot;
-import org.eclipse.epf.xml.uma.MethodConfiguration;
-import org.eclipse.epf.xml.uma.MethodLibrary;
-import org.eclipse.epf.xml.uma.MethodPlugin;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DocumentRootImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DocumentRootImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DocumentRootImpl#getMethodConfiguration <em>Method Configuration</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DocumentRootImpl#getMethodLibrary <em>Method Library</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DocumentRootImpl#getMethodPlugin <em>Method Plugin</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DocumentRootImpl extends EDataObjectImpl implements DocumentRoot {
-	/**
-	 * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMixed()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap mixed = null;
-
-	/**
-	 * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXMLNSPrefixMap()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xMLNSPrefixMap = null;
-
-	/**
-	 * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getXSISchemaLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap xSISchemaLocation = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DocumentRootImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DOCUMENT_ROOT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getMixed() {
-		if (mixed == null) {
-			mixed = new BasicFeatureMap(this, UmaPackage.DOCUMENT_ROOT__MIXED);
-		}
-		return mixed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getXMLNSPrefixMap() {
-		if (xMLNSPrefixMap == null) {
-			xMLNSPrefixMap = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, UmaPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
-		}
-		return xMLNSPrefixMap;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getXSISchemaLocation() {
-		if (xSISchemaLocation == null) {
-			xSISchemaLocation = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, UmaPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
-		}
-		return xSISchemaLocation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodConfiguration getMethodConfiguration() {
-		return (MethodConfiguration)getMixed().get(UmaPackage.Literals.DOCUMENT_ROOT__METHOD_CONFIGURATION, true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMethodConfiguration(MethodConfiguration newMethodConfiguration, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(UmaPackage.Literals.DOCUMENT_ROOT__METHOD_CONFIGURATION, newMethodConfiguration, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethodConfiguration(MethodConfiguration newMethodConfiguration) {
-		((FeatureMap.Internal)getMixed()).set(UmaPackage.Literals.DOCUMENT_ROOT__METHOD_CONFIGURATION, newMethodConfiguration);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodLibrary getMethodLibrary() {
-		return (MethodLibrary)getMixed().get(UmaPackage.Literals.DOCUMENT_ROOT__METHOD_LIBRARY, true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMethodLibrary(MethodLibrary newMethodLibrary, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(UmaPackage.Literals.DOCUMENT_ROOT__METHOD_LIBRARY, newMethodLibrary, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethodLibrary(MethodLibrary newMethodLibrary) {
-		((FeatureMap.Internal)getMixed()).set(UmaPackage.Literals.DOCUMENT_ROOT__METHOD_LIBRARY, newMethodLibrary);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodPlugin getMethodPlugin() {
-		return (MethodPlugin)getMixed().get(UmaPackage.Literals.DOCUMENT_ROOT__METHOD_PLUGIN, true);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMethodPlugin(MethodPlugin newMethodPlugin, NotificationChain msgs) {
-		return ((FeatureMap.Internal)getMixed()).basicAdd(UmaPackage.Literals.DOCUMENT_ROOT__METHOD_PLUGIN, newMethodPlugin, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethodPlugin(MethodPlugin newMethodPlugin) {
-		((FeatureMap.Internal)getMixed()).set(UmaPackage.Literals.DOCUMENT_ROOT__METHOD_PLUGIN, newMethodPlugin);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.DOCUMENT_ROOT__MIXED:
-				return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
-			case UmaPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				return ((InternalEList)getXMLNSPrefixMap()).basicRemove(otherEnd, msgs);
-			case UmaPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				return ((InternalEList)getXSISchemaLocation()).basicRemove(otherEnd, msgs);
-			case UmaPackage.DOCUMENT_ROOT__METHOD_CONFIGURATION:
-				return basicSetMethodConfiguration(null, msgs);
-			case UmaPackage.DOCUMENT_ROOT__METHOD_LIBRARY:
-				return basicSetMethodLibrary(null, msgs);
-			case UmaPackage.DOCUMENT_ROOT__METHOD_PLUGIN:
-				return basicSetMethodPlugin(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.DOCUMENT_ROOT__MIXED:
-				if (coreType) return getMixed();
-				return ((FeatureMap.Internal)getMixed()).getWrapper();
-			case UmaPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				if (coreType) return getXMLNSPrefixMap();
-				else return getXMLNSPrefixMap().map();
-			case UmaPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				if (coreType) return getXSISchemaLocation();
-				else return getXSISchemaLocation().map();
-			case UmaPackage.DOCUMENT_ROOT__METHOD_CONFIGURATION:
-				return getMethodConfiguration();
-			case UmaPackage.DOCUMENT_ROOT__METHOD_LIBRARY:
-				return getMethodLibrary();
-			case UmaPackage.DOCUMENT_ROOT__METHOD_PLUGIN:
-				return getMethodPlugin();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.DOCUMENT_ROOT__MIXED:
-				((FeatureMap.Internal)getMixed()).set(newValue);
-				return;
-			case UmaPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				((EStructuralFeature.Setting)getXMLNSPrefixMap()).set(newValue);
-				return;
-			case UmaPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				((EStructuralFeature.Setting)getXSISchemaLocation()).set(newValue);
-				return;
-			case UmaPackage.DOCUMENT_ROOT__METHOD_CONFIGURATION:
-				setMethodConfiguration((MethodConfiguration)newValue);
-				return;
-			case UmaPackage.DOCUMENT_ROOT__METHOD_LIBRARY:
-				setMethodLibrary((MethodLibrary)newValue);
-				return;
-			case UmaPackage.DOCUMENT_ROOT__METHOD_PLUGIN:
-				setMethodPlugin((MethodPlugin)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DOCUMENT_ROOT__MIXED:
-				getMixed().clear();
-				return;
-			case UmaPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				getXMLNSPrefixMap().clear();
-				return;
-			case UmaPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				getXSISchemaLocation().clear();
-				return;
-			case UmaPackage.DOCUMENT_ROOT__METHOD_CONFIGURATION:
-				setMethodConfiguration((MethodConfiguration)null);
-				return;
-			case UmaPackage.DOCUMENT_ROOT__METHOD_LIBRARY:
-				setMethodLibrary((MethodLibrary)null);
-				return;
-			case UmaPackage.DOCUMENT_ROOT__METHOD_PLUGIN:
-				setMethodPlugin((MethodPlugin)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DOCUMENT_ROOT__MIXED:
-				return mixed != null && !mixed.isEmpty();
-			case UmaPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
-				return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
-			case UmaPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
-				return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
-			case UmaPackage.DOCUMENT_ROOT__METHOD_CONFIGURATION:
-				return getMethodConfiguration() != null;
-			case UmaPackage.DOCUMENT_ROOT__METHOD_LIBRARY:
-				return getMethodLibrary() != null;
-			case UmaPackage.DOCUMENT_ROOT__METHOD_PLUGIN:
-				return getMethodPlugin() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (mixed: ");
-		result.append(mixed);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DocumentRootImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DomainImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DomainImpl.java
deleted file mode 100755
index 46d18ae..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/DomainImpl.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DomainImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.Domain;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Domain</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DomainImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DomainImpl#getWorkProduct <em>Work Product</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.DomainImpl#getSubdomain <em>Subdomain</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DomainImpl extends ContentCategoryImpl implements Domain {
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DomainImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.DOMAIN;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.DOMAIN__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getWorkProduct() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.DOMAIN__WORK_PRODUCT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSubdomain() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.DOMAIN__SUBDOMAIN);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.DOMAIN__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-			case UmaPackage.DOMAIN__SUBDOMAIN:
-				return ((InternalEList)getSubdomain()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.DOMAIN__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.DOMAIN__WORK_PRODUCT:
-				return getWorkProduct();
-			case UmaPackage.DOMAIN__SUBDOMAIN:
-				return getSubdomain();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.DOMAIN__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.DOMAIN__WORK_PRODUCT:
-				getWorkProduct().clear();
-				getWorkProduct().addAll((Collection)newValue);
-				return;
-			case UmaPackage.DOMAIN__SUBDOMAIN:
-				getSubdomain().clear();
-				getSubdomain().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DOMAIN__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.DOMAIN__WORK_PRODUCT:
-				getWorkProduct().clear();
-				return;
-			case UmaPackage.DOMAIN__SUBDOMAIN:
-				getSubdomain().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.DOMAIN__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.DOMAIN__WORK_PRODUCT:
-				return !getWorkProduct().isEmpty();
-			case UmaPackage.DOMAIN__SUBDOMAIN:
-				return !getSubdomain().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DomainImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ElementImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ElementImpl.java
deleted file mode 100755
index be7957d..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ElementImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ElementImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.sdo.impl.EDataObjectImpl;
-import org.eclipse.epf.xml.uma.Element;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ElementImpl extends EDataObjectImpl implements Element {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ElementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ELEMENT;
-	}
-
-} //ElementImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/EstimateImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/EstimateImpl.java
deleted file mode 100755
index 08d52bc..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/EstimateImpl.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EstimateImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.Estimate;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Estimate</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.EstimateImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.EstimateImpl#getEstimationMetric <em>Estimation Metric</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.EstimateImpl#getEstimationConsiderations <em>Estimation Considerations</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EstimateImpl extends GuidanceImpl implements Estimate {
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EstimateImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ESTIMATE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.ESTIMATE__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEstimationMetric() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.ESTIMATE__ESTIMATION_METRIC);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEstimationConsiderations() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.ESTIMATE__ESTIMATION_CONSIDERATIONS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.ESTIMATE__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.ESTIMATE__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.ESTIMATE__ESTIMATION_METRIC:
-				return getEstimationMetric();
-			case UmaPackage.ESTIMATE__ESTIMATION_CONSIDERATIONS:
-				return getEstimationConsiderations();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.ESTIMATE__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.ESTIMATE__ESTIMATION_METRIC:
-				getEstimationMetric().clear();
-				getEstimationMetric().addAll((Collection)newValue);
-				return;
-			case UmaPackage.ESTIMATE__ESTIMATION_CONSIDERATIONS:
-				getEstimationConsiderations().clear();
-				getEstimationConsiderations().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ESTIMATE__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.ESTIMATE__ESTIMATION_METRIC:
-				getEstimationMetric().clear();
-				return;
-			case UmaPackage.ESTIMATE__ESTIMATION_CONSIDERATIONS:
-				getEstimationConsiderations().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ESTIMATE__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.ESTIMATE__ESTIMATION_METRIC:
-				return !getEstimationMetric().isEmpty();
-			case UmaPackage.ESTIMATE__ESTIMATION_CONSIDERATIONS:
-				return !getEstimationConsiderations().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //EstimateImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/EstimatingMetricImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/EstimatingMetricImpl.java
deleted file mode 100755
index 202518f..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/EstimatingMetricImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EstimatingMetricImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.EstimatingMetric;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Estimating Metric</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class EstimatingMetricImpl extends GuidanceImpl implements EstimatingMetric {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EstimatingMetricImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ESTIMATING_METRIC;
-	}
-
-} //EstimatingMetricImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/EstimationConsiderationsImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/EstimationConsiderationsImpl.java
deleted file mode 100755
index e0b3e2b..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/EstimationConsiderationsImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EstimationConsiderationsImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.EstimationConsiderations;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Estimation Considerations</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class EstimationConsiderationsImpl extends GuidanceImpl implements EstimationConsiderations {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EstimationConsiderationsImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ESTIMATION_CONSIDERATIONS;
-	}
-
-} //EstimationConsiderationsImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ExampleImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ExampleImpl.java
deleted file mode 100755
index d827b2e..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ExampleImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExampleImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.Example;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Example</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ExampleImpl extends GuidanceImpl implements Example {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExampleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.EXAMPLE;
-	}
-
-} //ExampleImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/GuidanceDescriptionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/GuidanceDescriptionImpl.java
deleted file mode 100755
index e805af3..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/GuidanceDescriptionImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GuidanceDescriptionImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.GuidanceDescription;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Guidance Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.GuidanceDescriptionImpl#getAttachment <em>Attachment</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class GuidanceDescriptionImpl extends ContentDescriptionImpl implements GuidanceDescription {
-	/**
-	 * The default value of the '{@link #getAttachment() <em>Attachment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttachment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ATTACHMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAttachment() <em>Attachment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttachment()
-	 * @generated
-	 * @ordered
-	 */
-	protected String attachment = ATTACHMENT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GuidanceDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.GUIDANCE_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAttachment() {
-		return attachment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAttachment(String newAttachment) {
-		String oldAttachment = attachment;
-		attachment = newAttachment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.GUIDANCE_DESCRIPTION__ATTACHMENT, oldAttachment, attachment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.GUIDANCE_DESCRIPTION__ATTACHMENT:
-				return getAttachment();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.GUIDANCE_DESCRIPTION__ATTACHMENT:
-				setAttachment((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.GUIDANCE_DESCRIPTION__ATTACHMENT:
-				setAttachment(ATTACHMENT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.GUIDANCE_DESCRIPTION__ATTACHMENT:
-				return ATTACHMENT_EDEFAULT == null ? attachment != null : !ATTACHMENT_EDEFAULT.equals(attachment);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (attachment: ");
-		result.append(attachment);
-		result.append(')');
-		return result.toString();
-	}
-
-} //GuidanceDescriptionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/GuidanceImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/GuidanceImpl.java
deleted file mode 100755
index 324120d..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/GuidanceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GuidanceImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.Guidance;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Guidance</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class GuidanceImpl extends ContentElementImpl implements Guidance {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GuidanceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.GUIDANCE;
-	}
-
-} //GuidanceImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/GuidelineImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/GuidelineImpl.java
deleted file mode 100755
index 5badad7..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/GuidelineImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GuidelineImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.Guideline;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Guideline</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class GuidelineImpl extends GuidanceImpl implements Guideline {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GuidelineImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.GUIDELINE;
-	}
-
-} //GuidelineImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/IterationImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/IterationImpl.java
deleted file mode 100755
index 3afd5de..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/IterationImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IterationImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.Iteration;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Iteration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class IterationImpl extends ActivityImpl implements Iteration {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IterationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ITERATION;
-	}
-
-} //IterationImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodConfigurationImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodConfigurationImpl.java
deleted file mode 100755
index e613499..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodConfigurationImpl.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MethodConfigurationImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeEList;
-import org.eclipse.epf.xml.uma.MethodConfiguration;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodConfigurationImpl#getBaseConfiguration <em>Base Configuration</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodConfigurationImpl#getMethodPluginSelection <em>Method Plugin Selection</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodConfigurationImpl#getMethodPackageSelection <em>Method Package Selection</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodConfigurationImpl#getDefaultView <em>Default View</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodConfigurationImpl#getProcessView <em>Process View</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodConfigurationImpl extends MethodUnitImpl implements MethodConfiguration {
-	/**
-	 * The cached value of the '{@link #getBaseConfiguration() <em>Base Configuration</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBaseConfiguration()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList baseConfiguration = null;
-
-	/**
-	 * The cached value of the '{@link #getMethodPluginSelection() <em>Method Plugin Selection</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodPluginSelection()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methodPluginSelection = null;
-
-	/**
-	 * The cached value of the '{@link #getMethodPackageSelection() <em>Method Package Selection</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodPackageSelection()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methodPackageSelection = null;
-
-	/**
-	 * The default value of the '{@link #getDefaultView() <em>Default View</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultView()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DEFAULT_VIEW_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDefaultView() <em>Default View</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultView()
-	 * @generated
-	 * @ordered
-	 */
-	protected String defaultView = DEFAULT_VIEW_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getProcessView() <em>Process View</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProcessView()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList processView = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.METHOD_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getBaseConfiguration() {
-		if (baseConfiguration == null) {
-			baseConfiguration = new EDataTypeEList(String.class, this, UmaPackage.METHOD_CONFIGURATION__BASE_CONFIGURATION);
-		}
-		return baseConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMethodPluginSelection() {
-		if (methodPluginSelection == null) {
-			methodPluginSelection = new EDataTypeEList(String.class, this, UmaPackage.METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION);
-		}
-		return methodPluginSelection;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMethodPackageSelection() {
-		if (methodPackageSelection == null) {
-			methodPackageSelection = new EDataTypeEList(String.class, this, UmaPackage.METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION);
-		}
-		return methodPackageSelection;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDefaultView() {
-		return defaultView;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultView(String newDefaultView) {
-		String oldDefaultView = defaultView;
-		defaultView = newDefaultView;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.METHOD_CONFIGURATION__DEFAULT_VIEW, oldDefaultView, defaultView));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getProcessView() {
-		if (processView == null) {
-			processView = new EDataTypeEList(String.class, this, UmaPackage.METHOD_CONFIGURATION__PROCESS_VIEW);
-		}
-		return processView;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.METHOD_CONFIGURATION__BASE_CONFIGURATION:
-				return getBaseConfiguration();
-			case UmaPackage.METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION:
-				return getMethodPluginSelection();
-			case UmaPackage.METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION:
-				return getMethodPackageSelection();
-			case UmaPackage.METHOD_CONFIGURATION__DEFAULT_VIEW:
-				return getDefaultView();
-			case UmaPackage.METHOD_CONFIGURATION__PROCESS_VIEW:
-				return getProcessView();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.METHOD_CONFIGURATION__BASE_CONFIGURATION:
-				getBaseConfiguration().clear();
-				getBaseConfiguration().addAll((Collection)newValue);
-				return;
-			case UmaPackage.METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION:
-				getMethodPluginSelection().clear();
-				getMethodPluginSelection().addAll((Collection)newValue);
-				return;
-			case UmaPackage.METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION:
-				getMethodPackageSelection().clear();
-				getMethodPackageSelection().addAll((Collection)newValue);
-				return;
-			case UmaPackage.METHOD_CONFIGURATION__DEFAULT_VIEW:
-				setDefaultView((String)newValue);
-				return;
-			case UmaPackage.METHOD_CONFIGURATION__PROCESS_VIEW:
-				getProcessView().clear();
-				getProcessView().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.METHOD_CONFIGURATION__BASE_CONFIGURATION:
-				getBaseConfiguration().clear();
-				return;
-			case UmaPackage.METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION:
-				getMethodPluginSelection().clear();
-				return;
-			case UmaPackage.METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION:
-				getMethodPackageSelection().clear();
-				return;
-			case UmaPackage.METHOD_CONFIGURATION__DEFAULT_VIEW:
-				setDefaultView(DEFAULT_VIEW_EDEFAULT);
-				return;
-			case UmaPackage.METHOD_CONFIGURATION__PROCESS_VIEW:
-				getProcessView().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.METHOD_CONFIGURATION__BASE_CONFIGURATION:
-				return baseConfiguration != null && !baseConfiguration.isEmpty();
-			case UmaPackage.METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION:
-				return methodPluginSelection != null && !methodPluginSelection.isEmpty();
-			case UmaPackage.METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION:
-				return methodPackageSelection != null && !methodPackageSelection.isEmpty();
-			case UmaPackage.METHOD_CONFIGURATION__DEFAULT_VIEW:
-				return DEFAULT_VIEW_EDEFAULT == null ? defaultView != null : !DEFAULT_VIEW_EDEFAULT.equals(defaultView);
-			case UmaPackage.METHOD_CONFIGURATION__PROCESS_VIEW:
-				return processView != null && !processView.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (baseConfiguration: ");
-		result.append(baseConfiguration);
-		result.append(", methodPluginSelection: ");
-		result.append(methodPluginSelection);
-		result.append(", methodPackageSelection: ");
-		result.append(methodPackageSelection);
-		result.append(", defaultView: ");
-		result.append(defaultView);
-		result.append(", processView: ");
-		result.append(processView);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MethodConfigurationImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodElementImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodElementImpl.java
deleted file mode 100755
index 75b3f64..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodElementImpl.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MethodElementImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.MethodElement;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodElementImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodElementImpl#getOwnedRule <em>Owned Rule</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodElementImpl#getBriefDescription <em>Brief Description</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodElementImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodElementImpl#getOrderingGuide <em>Ordering Guide</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodElementImpl#isSuppressed <em>Suppressed</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodElementImpl extends PackageableElementImpl implements MethodElement {
-	/**
-	 * The cached value of the '{@link #getGroup() <em>Group</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group = null;
-
-	/**
-	 * The default value of the '{@link #getBriefDescription() <em>Brief Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBriefDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String BRIEF_DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getBriefDescription() <em>Brief Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBriefDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String briefDescription = BRIEF_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOrderingGuide() <em>Ordering Guide</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOrderingGuide()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ORDERING_GUIDE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOrderingGuide() <em>Ordering Guide</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOrderingGuide()
-	 * @generated
-	 * @ordered
-	 */
-	protected String orderingGuide = ORDERING_GUIDE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isSuppressed() <em>Suppressed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSuppressed()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SUPPRESSED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isSuppressed() <em>Suppressed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSuppressed()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean suppressed = SUPPRESSED_EDEFAULT;
-
-	/**
-	 * This is true if the Suppressed attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean suppressedESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodElementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.METHOD_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup() {
-		if (group == null) {
-			group = new BasicFeatureMap(this, UmaPackage.METHOD_ELEMENT__GROUP);
-		}
-		return group;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getOwnedRule() {
-		return ((FeatureMap)getGroup()).list(UmaPackage.Literals.METHOD_ELEMENT__OWNED_RULE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getBriefDescription() {
-		return briefDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBriefDescription(String newBriefDescription) {
-		String oldBriefDescription = briefDescription;
-		briefDescription = newBriefDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.METHOD_ELEMENT__BRIEF_DESCRIPTION, oldBriefDescription, briefDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.METHOD_ELEMENT__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getOrderingGuide() {
-		return orderingGuide;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOrderingGuide(String newOrderingGuide) {
-		String oldOrderingGuide = orderingGuide;
-		orderingGuide = newOrderingGuide;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.METHOD_ELEMENT__ORDERING_GUIDE, oldOrderingGuide, orderingGuide));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSuppressed() {
-		return suppressed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSuppressed(boolean newSuppressed) {
-		boolean oldSuppressed = suppressed;
-		suppressed = newSuppressed;
-		boolean oldSuppressedESet = suppressedESet;
-		suppressedESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.METHOD_ELEMENT__SUPPRESSED, oldSuppressed, suppressed, !oldSuppressedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetSuppressed() {
-		boolean oldSuppressed = suppressed;
-		boolean oldSuppressedESet = suppressedESet;
-		suppressed = SUPPRESSED_EDEFAULT;
-		suppressedESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.METHOD_ELEMENT__SUPPRESSED, oldSuppressed, SUPPRESSED_EDEFAULT, oldSuppressedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetSuppressed() {
-		return suppressedESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.METHOD_ELEMENT__GROUP:
-				return ((InternalEList)getGroup()).basicRemove(otherEnd, msgs);
-			case UmaPackage.METHOD_ELEMENT__OWNED_RULE:
-				return ((InternalEList)getOwnedRule()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.METHOD_ELEMENT__GROUP:
-				if (coreType) return getGroup();
-				return ((FeatureMap.Internal)getGroup()).getWrapper();
-			case UmaPackage.METHOD_ELEMENT__OWNED_RULE:
-				return getOwnedRule();
-			case UmaPackage.METHOD_ELEMENT__BRIEF_DESCRIPTION:
-				return getBriefDescription();
-			case UmaPackage.METHOD_ELEMENT__ID:
-				return getId();
-			case UmaPackage.METHOD_ELEMENT__ORDERING_GUIDE:
-				return getOrderingGuide();
-			case UmaPackage.METHOD_ELEMENT__SUPPRESSED:
-				return isSuppressed() ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.METHOD_ELEMENT__GROUP:
-				((FeatureMap.Internal)getGroup()).set(newValue);
-				return;
-			case UmaPackage.METHOD_ELEMENT__OWNED_RULE:
-				getOwnedRule().clear();
-				getOwnedRule().addAll((Collection)newValue);
-				return;
-			case UmaPackage.METHOD_ELEMENT__BRIEF_DESCRIPTION:
-				setBriefDescription((String)newValue);
-				return;
-			case UmaPackage.METHOD_ELEMENT__ID:
-				setId((String)newValue);
-				return;
-			case UmaPackage.METHOD_ELEMENT__ORDERING_GUIDE:
-				setOrderingGuide((String)newValue);
-				return;
-			case UmaPackage.METHOD_ELEMENT__SUPPRESSED:
-				setSuppressed(((Boolean)newValue).booleanValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.METHOD_ELEMENT__GROUP:
-				getGroup().clear();
-				return;
-			case UmaPackage.METHOD_ELEMENT__OWNED_RULE:
-				getOwnedRule().clear();
-				return;
-			case UmaPackage.METHOD_ELEMENT__BRIEF_DESCRIPTION:
-				setBriefDescription(BRIEF_DESCRIPTION_EDEFAULT);
-				return;
-			case UmaPackage.METHOD_ELEMENT__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case UmaPackage.METHOD_ELEMENT__ORDERING_GUIDE:
-				setOrderingGuide(ORDERING_GUIDE_EDEFAULT);
-				return;
-			case UmaPackage.METHOD_ELEMENT__SUPPRESSED:
-				unsetSuppressed();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.METHOD_ELEMENT__GROUP:
-				return group != null && !group.isEmpty();
-			case UmaPackage.METHOD_ELEMENT__OWNED_RULE:
-				return !getOwnedRule().isEmpty();
-			case UmaPackage.METHOD_ELEMENT__BRIEF_DESCRIPTION:
-				return BRIEF_DESCRIPTION_EDEFAULT == null ? briefDescription != null : !BRIEF_DESCRIPTION_EDEFAULT.equals(briefDescription);
-			case UmaPackage.METHOD_ELEMENT__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case UmaPackage.METHOD_ELEMENT__ORDERING_GUIDE:
-				return ORDERING_GUIDE_EDEFAULT == null ? orderingGuide != null : !ORDERING_GUIDE_EDEFAULT.equals(orderingGuide);
-			case UmaPackage.METHOD_ELEMENT__SUPPRESSED:
-				return isSetSuppressed();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group: ");
-		result.append(group);
-		result.append(", briefDescription: ");
-		result.append(briefDescription);
-		result.append(", id: ");
-		result.append(id);
-		result.append(", orderingGuide: ");
-		result.append(orderingGuide);
-		result.append(", suppressed: ");
-		if (suppressedESet) result.append(suppressed); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //MethodElementImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodLibraryImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodLibraryImpl.java
deleted file mode 100755
index b527516..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodLibraryImpl.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MethodLibraryImpl.java,v 1.4 2006/09/08 00:59:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.MethodConfiguration;
-import org.eclipse.epf.xml.uma.MethodLibrary;
-import org.eclipse.epf.xml.uma.MethodPlugin;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Library</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodLibraryImpl#getMethodPlugin <em>Method Plugin</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodLibraryImpl#getMethodConfiguration <em>Method Configuration</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodLibraryImpl#getTool <em>Tool</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodLibraryImpl extends MethodUnitImpl implements MethodLibrary {
-	/**
-	 * The cached value of the '{@link #getMethodPlugin() <em>Method Plugin</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodPlugin()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methodPlugin = null;
-
-	/**
-	 * The cached value of the '{@link #getMethodConfiguration() <em>Method Configuration</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodConfiguration()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methodConfiguration = null;
-
-	/**
-	 * The default value of the '{@link #getTool() <em>Tool</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTool()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TOOL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTool() <em>Tool</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTool()
-	 * @generated
-	 * @ordered
-	 */
-	protected String tool = TOOL_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodLibraryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.METHOD_LIBRARY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMethodPlugin() {
-		if (methodPlugin == null) {
-			methodPlugin = new EObjectContainmentEList(MethodPlugin.class, this, UmaPackage.METHOD_LIBRARY__METHOD_PLUGIN);
-		}
-		return methodPlugin;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMethodConfiguration() {
-		if (methodConfiguration == null) {
-			methodConfiguration = new EObjectContainmentEList(MethodConfiguration.class, this, UmaPackage.METHOD_LIBRARY__METHOD_CONFIGURATION);
-		}
-		return methodConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTool() {
-		return tool;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTool(String newTool) {
-		String oldTool = tool;
-		tool = newTool;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.METHOD_LIBRARY__TOOL, oldTool, tool));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.METHOD_LIBRARY__METHOD_PLUGIN:
-				return ((InternalEList)getMethodPlugin()).basicRemove(otherEnd, msgs);
-			case UmaPackage.METHOD_LIBRARY__METHOD_CONFIGURATION:
-				return ((InternalEList)getMethodConfiguration()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.METHOD_LIBRARY__METHOD_PLUGIN:
-				return getMethodPlugin();
-			case UmaPackage.METHOD_LIBRARY__METHOD_CONFIGURATION:
-				return getMethodConfiguration();
-			case UmaPackage.METHOD_LIBRARY__TOOL:
-				return getTool();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.METHOD_LIBRARY__METHOD_PLUGIN:
-				getMethodPlugin().clear();
-				getMethodPlugin().addAll((Collection)newValue);
-				return;
-			case UmaPackage.METHOD_LIBRARY__METHOD_CONFIGURATION:
-				getMethodConfiguration().clear();
-				getMethodConfiguration().addAll((Collection)newValue);
-				return;
-			case UmaPackage.METHOD_LIBRARY__TOOL:
-				setTool((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.METHOD_LIBRARY__METHOD_PLUGIN:
-				getMethodPlugin().clear();
-				return;
-			case UmaPackage.METHOD_LIBRARY__METHOD_CONFIGURATION:
-				getMethodConfiguration().clear();
-				return;
-			case UmaPackage.METHOD_LIBRARY__TOOL:
-				setTool(TOOL_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.METHOD_LIBRARY__METHOD_PLUGIN:
-				return methodPlugin != null && !methodPlugin.isEmpty();
-			case UmaPackage.METHOD_LIBRARY__METHOD_CONFIGURATION:
-				return methodConfiguration != null && !methodConfiguration.isEmpty();
-			case UmaPackage.METHOD_LIBRARY__TOOL:
-				return TOOL_EDEFAULT == null ? tool != null : !TOOL_EDEFAULT.equals(tool);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (tool: ");
-		result.append(tool);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MethodLibraryImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodPackageImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodPackageImpl.java
deleted file mode 100755
index 0034a2c..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodPackageImpl.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MethodPackageImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.MethodPackage;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Package</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodPackageImpl#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodPackageImpl#getReusedPackage <em>Reused Package</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodPackageImpl#getMethodPackage <em>Method Package</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodPackageImpl#isGlobal <em>Global</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodPackageImpl extends MethodElementImpl implements MethodPackage {
-	/**
-	 * The cached value of the '{@link #getGroup1() <em>Group1</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup1()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group1 = null;
-
-	/**
-	 * The default value of the '{@link #isGlobal() <em>Global</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isGlobal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean GLOBAL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isGlobal() <em>Global</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isGlobal()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean global = GLOBAL_EDEFAULT;
-
-	/**
-	 * This is true if the Global attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean globalESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodPackageImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.METHOD_PACKAGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup1() {
-		if (group1 == null) {
-			group1 = new BasicFeatureMap(this, UmaPackage.METHOD_PACKAGE__GROUP1);
-		}
-		return group1;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getReusedPackage() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.METHOD_PACKAGE__REUSED_PACKAGE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMethodPackage() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.METHOD_PACKAGE__METHOD_PACKAGE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isGlobal() {
-		return global;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGlobal(boolean newGlobal) {
-		boolean oldGlobal = global;
-		global = newGlobal;
-		boolean oldGlobalESet = globalESet;
-		globalESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.METHOD_PACKAGE__GLOBAL, oldGlobal, global, !oldGlobalESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetGlobal() {
-		boolean oldGlobal = global;
-		boolean oldGlobalESet = globalESet;
-		global = GLOBAL_EDEFAULT;
-		globalESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.METHOD_PACKAGE__GLOBAL, oldGlobal, GLOBAL_EDEFAULT, oldGlobalESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetGlobal() {
-		return globalESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.METHOD_PACKAGE__GROUP1:
-				return ((InternalEList)getGroup1()).basicRemove(otherEnd, msgs);
-			case UmaPackage.METHOD_PACKAGE__METHOD_PACKAGE:
-				return ((InternalEList)getMethodPackage()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.METHOD_PACKAGE__GROUP1:
-				if (coreType) return getGroup1();
-				return ((FeatureMap.Internal)getGroup1()).getWrapper();
-			case UmaPackage.METHOD_PACKAGE__REUSED_PACKAGE:
-				return getReusedPackage();
-			case UmaPackage.METHOD_PACKAGE__METHOD_PACKAGE:
-				return getMethodPackage();
-			case UmaPackage.METHOD_PACKAGE__GLOBAL:
-				return isGlobal() ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.METHOD_PACKAGE__GROUP1:
-				((FeatureMap.Internal)getGroup1()).set(newValue);
-				return;
-			case UmaPackage.METHOD_PACKAGE__REUSED_PACKAGE:
-				getReusedPackage().clear();
-				getReusedPackage().addAll((Collection)newValue);
-				return;
-			case UmaPackage.METHOD_PACKAGE__METHOD_PACKAGE:
-				getMethodPackage().clear();
-				getMethodPackage().addAll((Collection)newValue);
-				return;
-			case UmaPackage.METHOD_PACKAGE__GLOBAL:
-				setGlobal(((Boolean)newValue).booleanValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.METHOD_PACKAGE__GROUP1:
-				getGroup1().clear();
-				return;
-			case UmaPackage.METHOD_PACKAGE__REUSED_PACKAGE:
-				getReusedPackage().clear();
-				return;
-			case UmaPackage.METHOD_PACKAGE__METHOD_PACKAGE:
-				getMethodPackage().clear();
-				return;
-			case UmaPackage.METHOD_PACKAGE__GLOBAL:
-				unsetGlobal();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.METHOD_PACKAGE__GROUP1:
-				return group1 != null && !group1.isEmpty();
-			case UmaPackage.METHOD_PACKAGE__REUSED_PACKAGE:
-				return !getReusedPackage().isEmpty();
-			case UmaPackage.METHOD_PACKAGE__METHOD_PACKAGE:
-				return !getMethodPackage().isEmpty();
-			case UmaPackage.METHOD_PACKAGE__GLOBAL:
-				return isSetGlobal();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group1: ");
-		result.append(group1);
-		result.append(", global: ");
-		if (globalESet) result.append(global); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //MethodPackageImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodPluginImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodPluginImpl.java
deleted file mode 100755
index 0e11b16..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodPluginImpl.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MethodPluginImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.MethodPackage;
-import org.eclipse.epf.xml.uma.MethodPlugin;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Plugin</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodPluginImpl#getReferencedMethodPlugin <em>Referenced Method Plugin</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodPluginImpl#getMethodPackage <em>Method Package</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodPluginImpl#isUserChangeable <em>User Changeable</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodPluginImpl extends MethodUnitImpl implements MethodPlugin {
-	/**
-	 * The cached value of the '{@link #getReferencedMethodPlugin() <em>Referenced Method Plugin</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReferencedMethodPlugin()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList referencedMethodPlugin = null;
-
-	/**
-	 * The cached value of the '{@link #getMethodPackage() <em>Method Package</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodPackage()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methodPackage = null;
-
-	/**
-	 * The default value of the '{@link #isUserChangeable() <em>User Changeable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isUserChangeable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean USER_CHANGEABLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isUserChangeable() <em>User Changeable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isUserChangeable()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean userChangeable = USER_CHANGEABLE_EDEFAULT;
-
-	/**
-	 * This is true if the User Changeable attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean userChangeableESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodPluginImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.METHOD_PLUGIN;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getReferencedMethodPlugin() {
-		if (referencedMethodPlugin == null) {
-			referencedMethodPlugin = new EDataTypeEList(String.class, this, UmaPackage.METHOD_PLUGIN__REFERENCED_METHOD_PLUGIN);
-		}
-		return referencedMethodPlugin;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMethodPackage() {
-		if (methodPackage == null) {
-			methodPackage = new EObjectContainmentEList(MethodPackage.class, this, UmaPackage.METHOD_PLUGIN__METHOD_PACKAGE);
-		}
-		return methodPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isUserChangeable() {
-		return userChangeable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUserChangeable(boolean newUserChangeable) {
-		boolean oldUserChangeable = userChangeable;
-		userChangeable = newUserChangeable;
-		boolean oldUserChangeableESet = userChangeableESet;
-		userChangeableESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.METHOD_PLUGIN__USER_CHANGEABLE, oldUserChangeable, userChangeable, !oldUserChangeableESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetUserChangeable() {
-		boolean oldUserChangeable = userChangeable;
-		boolean oldUserChangeableESet = userChangeableESet;
-		userChangeable = USER_CHANGEABLE_EDEFAULT;
-		userChangeableESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.METHOD_PLUGIN__USER_CHANGEABLE, oldUserChangeable, USER_CHANGEABLE_EDEFAULT, oldUserChangeableESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetUserChangeable() {
-		return userChangeableESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.METHOD_PLUGIN__METHOD_PACKAGE:
-				return ((InternalEList)getMethodPackage()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.METHOD_PLUGIN__REFERENCED_METHOD_PLUGIN:
-				return getReferencedMethodPlugin();
-			case UmaPackage.METHOD_PLUGIN__METHOD_PACKAGE:
-				return getMethodPackage();
-			case UmaPackage.METHOD_PLUGIN__USER_CHANGEABLE:
-				return isUserChangeable() ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.METHOD_PLUGIN__REFERENCED_METHOD_PLUGIN:
-				getReferencedMethodPlugin().clear();
-				getReferencedMethodPlugin().addAll((Collection)newValue);
-				return;
-			case UmaPackage.METHOD_PLUGIN__METHOD_PACKAGE:
-				getMethodPackage().clear();
-				getMethodPackage().addAll((Collection)newValue);
-				return;
-			case UmaPackage.METHOD_PLUGIN__USER_CHANGEABLE:
-				setUserChangeable(((Boolean)newValue).booleanValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.METHOD_PLUGIN__REFERENCED_METHOD_PLUGIN:
-				getReferencedMethodPlugin().clear();
-				return;
-			case UmaPackage.METHOD_PLUGIN__METHOD_PACKAGE:
-				getMethodPackage().clear();
-				return;
-			case UmaPackage.METHOD_PLUGIN__USER_CHANGEABLE:
-				unsetUserChangeable();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.METHOD_PLUGIN__REFERENCED_METHOD_PLUGIN:
-				return referencedMethodPlugin != null && !referencedMethodPlugin.isEmpty();
-			case UmaPackage.METHOD_PLUGIN__METHOD_PACKAGE:
-				return methodPackage != null && !methodPackage.isEmpty();
-			case UmaPackage.METHOD_PLUGIN__USER_CHANGEABLE:
-				return isSetUserChangeable();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (referencedMethodPlugin: ");
-		result.append(referencedMethodPlugin);
-		result.append(", userChangeable: ");
-		if (userChangeableESet) result.append(userChangeable); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //MethodPluginImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodUnitImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodUnitImpl.java
deleted file mode 100755
index 299de78..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MethodUnitImpl.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MethodUnitImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.MethodUnit;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Unit</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodUnitImpl#getCopyright <em>Copyright</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodUnitImpl#getAuthors <em>Authors</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodUnitImpl#getChangeDate <em>Change Date</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodUnitImpl#getChangeDescription <em>Change Description</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.MethodUnitImpl#getVersion <em>Version</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodUnitImpl extends MethodElementImpl implements MethodUnit {
-	/**
-	 * The default value of the '{@link #getCopyright() <em>Copyright</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCopyright()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COPYRIGHT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCopyright() <em>Copyright</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCopyright()
-	 * @generated
-	 * @ordered
-	 */
-	protected String copyright = COPYRIGHT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAuthors() <em>Authors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthors()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String AUTHORS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAuthors() <em>Authors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthors()
-	 * @generated
-	 * @ordered
-	 */
-	protected String authors = AUTHORS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getChangeDate() <em>Change Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object CHANGE_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getChangeDate() <em>Change Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object changeDate = CHANGE_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getChangeDescription() <em>Change Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CHANGE_DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getChangeDescription() <em>Change Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String changeDescription = CHANGE_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MethodUnitImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.METHOD_UNIT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCopyright() {
-		return copyright;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCopyright(String newCopyright) {
-		String oldCopyright = copyright;
-		copyright = newCopyright;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.METHOD_UNIT__COPYRIGHT, oldCopyright, copyright));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAuthors() {
-		return authors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthors(String newAuthors) {
-		String oldAuthors = authors;
-		authors = newAuthors;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.METHOD_UNIT__AUTHORS, oldAuthors, authors));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getChangeDate() {
-		return changeDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setChangeDate(Object newChangeDate) {
-		Object oldChangeDate = changeDate;
-		changeDate = newChangeDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.METHOD_UNIT__CHANGE_DATE, oldChangeDate, changeDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getChangeDescription() {
-		return changeDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setChangeDescription(String newChangeDescription) {
-		String oldChangeDescription = changeDescription;
-		changeDescription = newChangeDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.METHOD_UNIT__CHANGE_DESCRIPTION, oldChangeDescription, changeDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.METHOD_UNIT__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.METHOD_UNIT__COPYRIGHT:
-				return getCopyright();
-			case UmaPackage.METHOD_UNIT__AUTHORS:
-				return getAuthors();
-			case UmaPackage.METHOD_UNIT__CHANGE_DATE:
-				return getChangeDate();
-			case UmaPackage.METHOD_UNIT__CHANGE_DESCRIPTION:
-				return getChangeDescription();
-			case UmaPackage.METHOD_UNIT__VERSION:
-				return getVersion();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.METHOD_UNIT__COPYRIGHT:
-				setCopyright((String)newValue);
-				return;
-			case UmaPackage.METHOD_UNIT__AUTHORS:
-				setAuthors((String)newValue);
-				return;
-			case UmaPackage.METHOD_UNIT__CHANGE_DATE:
-				setChangeDate((Object)newValue);
-				return;
-			case UmaPackage.METHOD_UNIT__CHANGE_DESCRIPTION:
-				setChangeDescription((String)newValue);
-				return;
-			case UmaPackage.METHOD_UNIT__VERSION:
-				setVersion((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.METHOD_UNIT__COPYRIGHT:
-				setCopyright(COPYRIGHT_EDEFAULT);
-				return;
-			case UmaPackage.METHOD_UNIT__AUTHORS:
-				setAuthors(AUTHORS_EDEFAULT);
-				return;
-			case UmaPackage.METHOD_UNIT__CHANGE_DATE:
-				setChangeDate(CHANGE_DATE_EDEFAULT);
-				return;
-			case UmaPackage.METHOD_UNIT__CHANGE_DESCRIPTION:
-				setChangeDescription(CHANGE_DESCRIPTION_EDEFAULT);
-				return;
-			case UmaPackage.METHOD_UNIT__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.METHOD_UNIT__COPYRIGHT:
-				return COPYRIGHT_EDEFAULT == null ? copyright != null : !COPYRIGHT_EDEFAULT.equals(copyright);
-			case UmaPackage.METHOD_UNIT__AUTHORS:
-				return AUTHORS_EDEFAULT == null ? authors != null : !AUTHORS_EDEFAULT.equals(authors);
-			case UmaPackage.METHOD_UNIT__CHANGE_DATE:
-				return CHANGE_DATE_EDEFAULT == null ? changeDate != null : !CHANGE_DATE_EDEFAULT.equals(changeDate);
-			case UmaPackage.METHOD_UNIT__CHANGE_DESCRIPTION:
-				return CHANGE_DESCRIPTION_EDEFAULT == null ? changeDescription != null : !CHANGE_DESCRIPTION_EDEFAULT.equals(changeDescription);
-			case UmaPackage.METHOD_UNIT__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (copyright: ");
-		result.append(copyright);
-		result.append(", authors: ");
-		result.append(authors);
-		result.append(", changeDate: ");
-		result.append(changeDate);
-		result.append(", changeDescription: ");
-		result.append(changeDescription);
-		result.append(", version: ");
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MethodUnitImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MilestoneImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MilestoneImpl.java
deleted file mode 100755
index 47847b1..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/MilestoneImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MilestoneImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.Milestone;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Milestone</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class MilestoneImpl extends WorkBreakdownElementImpl implements Milestone {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MilestoneImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.MILESTONE;
-	}
-
-} //MilestoneImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/NamedElementImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/NamedElementImpl.java
deleted file mode 100755
index 8aea66e..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/NamedElementImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: NamedElementImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.NamedElement;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Named Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.NamedElementImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NamedElementImpl extends ElementImpl implements NamedElement {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NamedElementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.NAMED_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.NAMED_ELEMENT__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.NAMED_ELEMENT__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.NAMED_ELEMENT__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.NAMED_ELEMENT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.NAMED_ELEMENT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //NamedElementImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/OutcomeImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/OutcomeImpl.java
deleted file mode 100755
index 8f16374..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/OutcomeImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: OutcomeImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.Outcome;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Outcome</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class OutcomeImpl extends WorkProductImpl implements Outcome {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OutcomeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.OUTCOME;
-	}
-
-} //OutcomeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/PackageableElementImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/PackageableElementImpl.java
deleted file mode 100755
index 3b0e39e..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/PackageableElementImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PackageableElementImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.PackageableElement;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Packageable Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PackageableElementImpl extends NamedElementImpl implements PackageableElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PackageableElementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PACKAGEABLE_ELEMENT;
-	}
-
-} //PackageableElementImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/PhaseImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/PhaseImpl.java
deleted file mode 100755
index ad44d82..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/PhaseImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PhaseImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.Phase;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Phase</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PhaseImpl extends ActivityImpl implements Phase {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PhaseImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PHASE;
-	}
-
-} //PhaseImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/PlanningDataImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/PlanningDataImpl.java
deleted file mode 100755
index ad70d39..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/PlanningDataImpl.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PlanningDataImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.PlanningData;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Planning Data</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.PlanningDataImpl#getFinishDate <em>Finish Date</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.PlanningDataImpl#getRank <em>Rank</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.PlanningDataImpl#getStartDate <em>Start Date</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PlanningDataImpl extends ProcessElementImpl implements PlanningData {
-	/**
-	 * The default value of the '{@link #getFinishDate() <em>Finish Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinishDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object FINISH_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFinishDate() <em>Finish Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFinishDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object finishDate = FINISH_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRank() <em>Rank</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRank()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String RANK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRank() <em>Rank</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRank()
-	 * @generated
-	 * @ordered
-	 */
-	protected String rank = RANK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStartDate() <em>Start Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStartDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object START_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStartDate() <em>Start Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStartDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object startDate = START_DATE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PlanningDataImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PLANNING_DATA;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getFinishDate() {
-		return finishDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinishDate(Object newFinishDate) {
-		Object oldFinishDate = finishDate;
-		finishDate = newFinishDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PLANNING_DATA__FINISH_DATE, oldFinishDate, finishDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRank() {
-		return rank;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRank(String newRank) {
-		String oldRank = rank;
-		rank = newRank;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PLANNING_DATA__RANK, oldRank, rank));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getStartDate() {
-		return startDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStartDate(Object newStartDate) {
-		Object oldStartDate = startDate;
-		startDate = newStartDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PLANNING_DATA__START_DATE, oldStartDate, startDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.PLANNING_DATA__FINISH_DATE:
-				return getFinishDate();
-			case UmaPackage.PLANNING_DATA__RANK:
-				return getRank();
-			case UmaPackage.PLANNING_DATA__START_DATE:
-				return getStartDate();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.PLANNING_DATA__FINISH_DATE:
-				setFinishDate((Object)newValue);
-				return;
-			case UmaPackage.PLANNING_DATA__RANK:
-				setRank((String)newValue);
-				return;
-			case UmaPackage.PLANNING_DATA__START_DATE:
-				setStartDate((Object)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PLANNING_DATA__FINISH_DATE:
-				setFinishDate(FINISH_DATE_EDEFAULT);
-				return;
-			case UmaPackage.PLANNING_DATA__RANK:
-				setRank(RANK_EDEFAULT);
-				return;
-			case UmaPackage.PLANNING_DATA__START_DATE:
-				setStartDate(START_DATE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PLANNING_DATA__FINISH_DATE:
-				return FINISH_DATE_EDEFAULT == null ? finishDate != null : !FINISH_DATE_EDEFAULT.equals(finishDate);
-			case UmaPackage.PLANNING_DATA__RANK:
-				return RANK_EDEFAULT == null ? rank != null : !RANK_EDEFAULT.equals(rank);
-			case UmaPackage.PLANNING_DATA__START_DATE:
-				return START_DATE_EDEFAULT == null ? startDate != null : !START_DATE_EDEFAULT.equals(startDate);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (finishDate: ");
-		result.append(finishDate);
-		result.append(", rank: ");
-		result.append(rank);
-		result.append(", startDate: ");
-		result.append(startDate);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PlanningDataImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/PracticeDescriptionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/PracticeDescriptionImpl.java
deleted file mode 100755
index 07edde7..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/PracticeDescriptionImpl.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PracticeDescriptionImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.PracticeDescription;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Practice Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.PracticeDescriptionImpl#getAdditionalInfo <em>Additional Info</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.PracticeDescriptionImpl#getApplication <em>Application</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.PracticeDescriptionImpl#getBackground <em>Background</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.PracticeDescriptionImpl#getGoals <em>Goals</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.PracticeDescriptionImpl#getLevelsOfAdoption <em>Levels Of Adoption</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.PracticeDescriptionImpl#getProblem <em>Problem</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PracticeDescriptionImpl extends ContentDescriptionImpl implements PracticeDescription {
-	/**
-	 * The default value of the '{@link #getAdditionalInfo() <em>Additional Info</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdditionalInfo()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ADDITIONAL_INFO_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAdditionalInfo() <em>Additional Info</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdditionalInfo()
-	 * @generated
-	 * @ordered
-	 */
-	protected String additionalInfo = ADDITIONAL_INFO_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getApplication() <em>Application</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getApplication()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String APPLICATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getApplication() <em>Application</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getApplication()
-	 * @generated
-	 * @ordered
-	 */
-	protected String application = APPLICATION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getBackground() <em>Background</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBackground()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String BACKGROUND_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getBackground() <em>Background</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBackground()
-	 * @generated
-	 * @ordered
-	 */
-	protected String background = BACKGROUND_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getGoals() <em>Goals</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGoals()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String GOALS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getGoals() <em>Goals</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGoals()
-	 * @generated
-	 * @ordered
-	 */
-	protected String goals = GOALS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLevelsOfAdoption() <em>Levels Of Adoption</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevelsOfAdoption()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LEVELS_OF_ADOPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLevelsOfAdoption() <em>Levels Of Adoption</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLevelsOfAdoption()
-	 * @generated
-	 * @ordered
-	 */
-	protected String levelsOfAdoption = LEVELS_OF_ADOPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getProblem() <em>Problem</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProblem()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PROBLEM_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getProblem() <em>Problem</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProblem()
-	 * @generated
-	 * @ordered
-	 */
-	protected String problem = PROBLEM_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PracticeDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PRACTICE_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAdditionalInfo() {
-		return additionalInfo;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAdditionalInfo(String newAdditionalInfo) {
-		String oldAdditionalInfo = additionalInfo;
-		additionalInfo = newAdditionalInfo;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PRACTICE_DESCRIPTION__ADDITIONAL_INFO, oldAdditionalInfo, additionalInfo));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getApplication() {
-		return application;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setApplication(String newApplication) {
-		String oldApplication = application;
-		application = newApplication;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PRACTICE_DESCRIPTION__APPLICATION, oldApplication, application));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getBackground() {
-		return background;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBackground(String newBackground) {
-		String oldBackground = background;
-		background = newBackground;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PRACTICE_DESCRIPTION__BACKGROUND, oldBackground, background));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getGoals() {
-		return goals;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGoals(String newGoals) {
-		String oldGoals = goals;
-		goals = newGoals;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PRACTICE_DESCRIPTION__GOALS, oldGoals, goals));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLevelsOfAdoption() {
-		return levelsOfAdoption;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLevelsOfAdoption(String newLevelsOfAdoption) {
-		String oldLevelsOfAdoption = levelsOfAdoption;
-		levelsOfAdoption = newLevelsOfAdoption;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION, oldLevelsOfAdoption, levelsOfAdoption));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getProblem() {
-		return problem;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setProblem(String newProblem) {
-		String oldProblem = problem;
-		problem = newProblem;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PRACTICE_DESCRIPTION__PROBLEM, oldProblem, problem));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.PRACTICE_DESCRIPTION__ADDITIONAL_INFO:
-				return getAdditionalInfo();
-			case UmaPackage.PRACTICE_DESCRIPTION__APPLICATION:
-				return getApplication();
-			case UmaPackage.PRACTICE_DESCRIPTION__BACKGROUND:
-				return getBackground();
-			case UmaPackage.PRACTICE_DESCRIPTION__GOALS:
-				return getGoals();
-			case UmaPackage.PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION:
-				return getLevelsOfAdoption();
-			case UmaPackage.PRACTICE_DESCRIPTION__PROBLEM:
-				return getProblem();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.PRACTICE_DESCRIPTION__ADDITIONAL_INFO:
-				setAdditionalInfo((String)newValue);
-				return;
-			case UmaPackage.PRACTICE_DESCRIPTION__APPLICATION:
-				setApplication((String)newValue);
-				return;
-			case UmaPackage.PRACTICE_DESCRIPTION__BACKGROUND:
-				setBackground((String)newValue);
-				return;
-			case UmaPackage.PRACTICE_DESCRIPTION__GOALS:
-				setGoals((String)newValue);
-				return;
-			case UmaPackage.PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION:
-				setLevelsOfAdoption((String)newValue);
-				return;
-			case UmaPackage.PRACTICE_DESCRIPTION__PROBLEM:
-				setProblem((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PRACTICE_DESCRIPTION__ADDITIONAL_INFO:
-				setAdditionalInfo(ADDITIONAL_INFO_EDEFAULT);
-				return;
-			case UmaPackage.PRACTICE_DESCRIPTION__APPLICATION:
-				setApplication(APPLICATION_EDEFAULT);
-				return;
-			case UmaPackage.PRACTICE_DESCRIPTION__BACKGROUND:
-				setBackground(BACKGROUND_EDEFAULT);
-				return;
-			case UmaPackage.PRACTICE_DESCRIPTION__GOALS:
-				setGoals(GOALS_EDEFAULT);
-				return;
-			case UmaPackage.PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION:
-				setLevelsOfAdoption(LEVELS_OF_ADOPTION_EDEFAULT);
-				return;
-			case UmaPackage.PRACTICE_DESCRIPTION__PROBLEM:
-				setProblem(PROBLEM_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PRACTICE_DESCRIPTION__ADDITIONAL_INFO:
-				return ADDITIONAL_INFO_EDEFAULT == null ? additionalInfo != null : !ADDITIONAL_INFO_EDEFAULT.equals(additionalInfo);
-			case UmaPackage.PRACTICE_DESCRIPTION__APPLICATION:
-				return APPLICATION_EDEFAULT == null ? application != null : !APPLICATION_EDEFAULT.equals(application);
-			case UmaPackage.PRACTICE_DESCRIPTION__BACKGROUND:
-				return BACKGROUND_EDEFAULT == null ? background != null : !BACKGROUND_EDEFAULT.equals(background);
-			case UmaPackage.PRACTICE_DESCRIPTION__GOALS:
-				return GOALS_EDEFAULT == null ? goals != null : !GOALS_EDEFAULT.equals(goals);
-			case UmaPackage.PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION:
-				return LEVELS_OF_ADOPTION_EDEFAULT == null ? levelsOfAdoption != null : !LEVELS_OF_ADOPTION_EDEFAULT.equals(levelsOfAdoption);
-			case UmaPackage.PRACTICE_DESCRIPTION__PROBLEM:
-				return PROBLEM_EDEFAULT == null ? problem != null : !PROBLEM_EDEFAULT.equals(problem);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (additionalInfo: ");
-		result.append(additionalInfo);
-		result.append(", application: ");
-		result.append(application);
-		result.append(", background: ");
-		result.append(background);
-		result.append(", goals: ");
-		result.append(goals);
-		result.append(", levelsOfAdoption: ");
-		result.append(levelsOfAdoption);
-		result.append(", problem: ");
-		result.append(problem);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PracticeDescriptionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/PracticeImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/PracticeImpl.java
deleted file mode 100755
index c8a22b2..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/PracticeImpl.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PracticeImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.Practice;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Practice</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.PracticeImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.PracticeImpl#getActivityReference <em>Activity Reference</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.PracticeImpl#getContentReference <em>Content Reference</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.PracticeImpl#getSubPractice <em>Sub Practice</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PracticeImpl extends GuidanceImpl implements Practice {
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PracticeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PRACTICE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.PRACTICE__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getActivityReference() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.PRACTICE__ACTIVITY_REFERENCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getContentReference() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.PRACTICE__CONTENT_REFERENCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSubPractice() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.PRACTICE__SUB_PRACTICE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.PRACTICE__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-			case UmaPackage.PRACTICE__SUB_PRACTICE:
-				return ((InternalEList)getSubPractice()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.PRACTICE__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.PRACTICE__ACTIVITY_REFERENCE:
-				return getActivityReference();
-			case UmaPackage.PRACTICE__CONTENT_REFERENCE:
-				return getContentReference();
-			case UmaPackage.PRACTICE__SUB_PRACTICE:
-				return getSubPractice();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.PRACTICE__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.PRACTICE__ACTIVITY_REFERENCE:
-				getActivityReference().clear();
-				getActivityReference().addAll((Collection)newValue);
-				return;
-			case UmaPackage.PRACTICE__CONTENT_REFERENCE:
-				getContentReference().clear();
-				getContentReference().addAll((Collection)newValue);
-				return;
-			case UmaPackage.PRACTICE__SUB_PRACTICE:
-				getSubPractice().clear();
-				getSubPractice().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PRACTICE__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.PRACTICE__ACTIVITY_REFERENCE:
-				getActivityReference().clear();
-				return;
-			case UmaPackage.PRACTICE__CONTENT_REFERENCE:
-				getContentReference().clear();
-				return;
-			case UmaPackage.PRACTICE__SUB_PRACTICE:
-				getSubPractice().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PRACTICE__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.PRACTICE__ACTIVITY_REFERENCE:
-				return !getActivityReference().isEmpty();
-			case UmaPackage.PRACTICE__CONTENT_REFERENCE:
-				return !getContentReference().isEmpty();
-			case UmaPackage.PRACTICE__SUB_PRACTICE:
-				return !getSubPractice().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PracticeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessComponentImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessComponentImpl.java
deleted file mode 100755
index 7ea2f2e..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessComponentImpl.java
+++ /dev/null
@@ -1,519 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ProcessComponentImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.ProcessComponent;
-import org.eclipse.epf.xml.uma.ProcessComponentInterface;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process Component</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessComponentImpl#getCopyright <em>Copyright</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessComponentImpl#getInterface <em>Interface</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessComponentImpl#getProcess <em>Process</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessComponentImpl#getAuthors <em>Authors</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessComponentImpl#getChangeDate <em>Change Date</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessComponentImpl#getChangeDescription <em>Change Description</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessComponentImpl#getVersion <em>Version</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ProcessComponentImpl extends ProcessPackageImpl implements ProcessComponent {
-	/**
-	 * The default value of the '{@link #getCopyright() <em>Copyright</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCopyright()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COPYRIGHT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCopyright() <em>Copyright</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCopyright()
-	 * @generated
-	 * @ordered
-	 */
-	protected String copyright = COPYRIGHT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInterface() <em>Interface</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected ProcessComponentInterface interface_ = null;
-
-	/**
-	 * The cached value of the '{@link #getProcess() <em>Process</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProcess()
-	 * @generated
-	 * @ordered
-	 */
-	protected org.eclipse.epf.xml.uma.Process process = null;
-
-	/**
-	 * The default value of the '{@link #getAuthors() <em>Authors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthors()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String AUTHORS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAuthors() <em>Authors</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthors()
-	 * @generated
-	 * @ordered
-	 */
-	protected String authors = AUTHORS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getChangeDate() <em>Change Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object CHANGE_DATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getChangeDate() <em>Change Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object changeDate = CHANGE_DATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getChangeDescription() <em>Change Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CHANGE_DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getChangeDescription() <em>Change Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String changeDescription = CHANGE_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessComponentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS_COMPONENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCopyright() {
-		return copyright;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCopyright(String newCopyright) {
-		String oldCopyright = copyright;
-		copyright = newCopyright;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PROCESS_COMPONENT__COPYRIGHT, oldCopyright, copyright));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessComponentInterface getInterface() {
-		return interface_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInterface(ProcessComponentInterface newInterface, NotificationChain msgs) {
-		ProcessComponentInterface oldInterface = interface_;
-		interface_ = newInterface;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmaPackage.PROCESS_COMPONENT__INTERFACE, oldInterface, newInterface);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInterface(ProcessComponentInterface newInterface) {
-		if (newInterface != interface_) {
-			NotificationChain msgs = null;
-			if (interface_ != null)
-				msgs = ((InternalEObject)interface_).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmaPackage.PROCESS_COMPONENT__INTERFACE, null, msgs);
-			if (newInterface != null)
-				msgs = ((InternalEObject)newInterface).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmaPackage.PROCESS_COMPONENT__INTERFACE, null, msgs);
-			msgs = basicSetInterface(newInterface, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PROCESS_COMPONENT__INTERFACE, newInterface, newInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public org.eclipse.epf.xml.uma.Process getProcess() {
-		return process;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetProcess(org.eclipse.epf.xml.uma.Process newProcess, NotificationChain msgs) {
-		org.eclipse.epf.xml.uma.Process oldProcess = process;
-		process = newProcess;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmaPackage.PROCESS_COMPONENT__PROCESS, oldProcess, newProcess);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setProcess(org.eclipse.epf.xml.uma.Process newProcess) {
-		if (newProcess != process) {
-			NotificationChain msgs = null;
-			if (process != null)
-				msgs = ((InternalEObject)process).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmaPackage.PROCESS_COMPONENT__PROCESS, null, msgs);
-			if (newProcess != null)
-				msgs = ((InternalEObject)newProcess).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmaPackage.PROCESS_COMPONENT__PROCESS, null, msgs);
-			msgs = basicSetProcess(newProcess, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PROCESS_COMPONENT__PROCESS, newProcess, newProcess));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAuthors() {
-		return authors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthors(String newAuthors) {
-		String oldAuthors = authors;
-		authors = newAuthors;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PROCESS_COMPONENT__AUTHORS, oldAuthors, authors));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getChangeDate() {
-		return changeDate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setChangeDate(Object newChangeDate) {
-		Object oldChangeDate = changeDate;
-		changeDate = newChangeDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PROCESS_COMPONENT__CHANGE_DATE, oldChangeDate, changeDate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getChangeDescription() {
-		return changeDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setChangeDescription(String newChangeDescription) {
-		String oldChangeDescription = changeDescription;
-		changeDescription = newChangeDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PROCESS_COMPONENT__CHANGE_DESCRIPTION, oldChangeDescription, changeDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PROCESS_COMPONENT__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_COMPONENT__INTERFACE:
-				return basicSetInterface(null, msgs);
-			case UmaPackage.PROCESS_COMPONENT__PROCESS:
-				return basicSetProcess(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_COMPONENT__COPYRIGHT:
-				return getCopyright();
-			case UmaPackage.PROCESS_COMPONENT__INTERFACE:
-				return getInterface();
-			case UmaPackage.PROCESS_COMPONENT__PROCESS:
-				return getProcess();
-			case UmaPackage.PROCESS_COMPONENT__AUTHORS:
-				return getAuthors();
-			case UmaPackage.PROCESS_COMPONENT__CHANGE_DATE:
-				return getChangeDate();
-			case UmaPackage.PROCESS_COMPONENT__CHANGE_DESCRIPTION:
-				return getChangeDescription();
-			case UmaPackage.PROCESS_COMPONENT__VERSION:
-				return getVersion();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_COMPONENT__COPYRIGHT:
-				setCopyright((String)newValue);
-				return;
-			case UmaPackage.PROCESS_COMPONENT__INTERFACE:
-				setInterface((ProcessComponentInterface)newValue);
-				return;
-			case UmaPackage.PROCESS_COMPONENT__PROCESS:
-				setProcess((org.eclipse.epf.xml.uma.Process)newValue);
-				return;
-			case UmaPackage.PROCESS_COMPONENT__AUTHORS:
-				setAuthors((String)newValue);
-				return;
-			case UmaPackage.PROCESS_COMPONENT__CHANGE_DATE:
-				setChangeDate((Object)newValue);
-				return;
-			case UmaPackage.PROCESS_COMPONENT__CHANGE_DESCRIPTION:
-				setChangeDescription((String)newValue);
-				return;
-			case UmaPackage.PROCESS_COMPONENT__VERSION:
-				setVersion((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_COMPONENT__COPYRIGHT:
-				setCopyright(COPYRIGHT_EDEFAULT);
-				return;
-			case UmaPackage.PROCESS_COMPONENT__INTERFACE:
-				setInterface((ProcessComponentInterface)null);
-				return;
-			case UmaPackage.PROCESS_COMPONENT__PROCESS:
-				setProcess((org.eclipse.epf.xml.uma.Process)null);
-				return;
-			case UmaPackage.PROCESS_COMPONENT__AUTHORS:
-				setAuthors(AUTHORS_EDEFAULT);
-				return;
-			case UmaPackage.PROCESS_COMPONENT__CHANGE_DATE:
-				setChangeDate(CHANGE_DATE_EDEFAULT);
-				return;
-			case UmaPackage.PROCESS_COMPONENT__CHANGE_DESCRIPTION:
-				setChangeDescription(CHANGE_DESCRIPTION_EDEFAULT);
-				return;
-			case UmaPackage.PROCESS_COMPONENT__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_COMPONENT__COPYRIGHT:
-				return COPYRIGHT_EDEFAULT == null ? copyright != null : !COPYRIGHT_EDEFAULT.equals(copyright);
-			case UmaPackage.PROCESS_COMPONENT__INTERFACE:
-				return interface_ != null;
-			case UmaPackage.PROCESS_COMPONENT__PROCESS:
-				return process != null;
-			case UmaPackage.PROCESS_COMPONENT__AUTHORS:
-				return AUTHORS_EDEFAULT == null ? authors != null : !AUTHORS_EDEFAULT.equals(authors);
-			case UmaPackage.PROCESS_COMPONENT__CHANGE_DATE:
-				return CHANGE_DATE_EDEFAULT == null ? changeDate != null : !CHANGE_DATE_EDEFAULT.equals(changeDate);
-			case UmaPackage.PROCESS_COMPONENT__CHANGE_DESCRIPTION:
-				return CHANGE_DESCRIPTION_EDEFAULT == null ? changeDescription != null : !CHANGE_DESCRIPTION_EDEFAULT.equals(changeDescription);
-			case UmaPackage.PROCESS_COMPONENT__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (copyright: ");
-		result.append(copyright);
-		result.append(", authors: ");
-		result.append(authors);
-		result.append(", changeDate: ");
-		result.append(changeDate);
-		result.append(", changeDescription: ");
-		result.append(changeDescription);
-		result.append(", version: ");
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ProcessComponentImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessComponentInterfaceImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessComponentInterfaceImpl.java
deleted file mode 100755
index 36ed367..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessComponentInterfaceImpl.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ProcessComponentInterfaceImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.ProcessComponentInterface;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process Component Interface</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessComponentInterfaceImpl#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessComponentInterfaceImpl#getInterfaceSpecification <em>Interface Specification</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessComponentInterfaceImpl#getInterfaceIO <em>Interface IO</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ProcessComponentInterfaceImpl extends BreakdownElementImpl implements ProcessComponentInterface {
-	/**
-	 * The cached value of the '{@link #getGroup1() <em>Group1</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup1()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group1 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessComponentInterfaceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS_COMPONENT_INTERFACE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup1() {
-		if (group1 == null) {
-			group1 = new BasicFeatureMap(this, UmaPackage.PROCESS_COMPONENT_INTERFACE__GROUP1);
-		}
-		return group1;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getInterfaceSpecification() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATION);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getInterfaceIO() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.PROCESS_COMPONENT_INTERFACE__INTERFACE_IO);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE__GROUP1:
-				return ((InternalEList)getGroup1()).basicRemove(otherEnd, msgs);
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATION:
-				return ((InternalEList)getInterfaceSpecification()).basicRemove(otherEnd, msgs);
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_IO:
-				return ((InternalEList)getInterfaceIO()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE__GROUP1:
-				if (coreType) return getGroup1();
-				return ((FeatureMap.Internal)getGroup1()).getWrapper();
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATION:
-				return getInterfaceSpecification();
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_IO:
-				return getInterfaceIO();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE__GROUP1:
-				((FeatureMap.Internal)getGroup1()).set(newValue);
-				return;
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATION:
-				getInterfaceSpecification().clear();
-				getInterfaceSpecification().addAll((Collection)newValue);
-				return;
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_IO:
-				getInterfaceIO().clear();
-				getInterfaceIO().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE__GROUP1:
-				getGroup1().clear();
-				return;
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATION:
-				getInterfaceSpecification().clear();
-				return;
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_IO:
-				getInterfaceIO().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE__GROUP1:
-				return group1 != null && !group1.isEmpty();
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATION:
-				return !getInterfaceSpecification().isEmpty();
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE__INTERFACE_IO:
-				return !getInterfaceIO().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group1: ");
-		result.append(group1);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ProcessComponentInterfaceImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessDescriptionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessDescriptionImpl.java
deleted file mode 100755
index 6b97733..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessDescriptionImpl.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ProcessDescriptionImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.ProcessDescription;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessDescriptionImpl#getScope <em>Scope</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessDescriptionImpl#getUsageNotes <em>Usage Notes</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessDescriptionImpl#getExternalId <em>External Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ProcessDescriptionImpl extends ActivityDescriptionImpl implements ProcessDescription {
-	/**
-	 * The default value of the '{@link #getScope() <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getScope()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SCOPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getScope() <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getScope()
-	 * @generated
-	 * @ordered
-	 */
-	protected String scope = SCOPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getUsageNotes() <em>Usage Notes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUsageNotes()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String USAGE_NOTES_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUsageNotes() <em>Usage Notes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUsageNotes()
-	 * @generated
-	 * @ordered
-	 */
-	protected String usageNotes = USAGE_NOTES_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getExternalId() <em>External Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExternalId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXTERNAL_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExternalId() <em>External Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExternalId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String externalId = EXTERNAL_ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getScope() {
-		return scope;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setScope(String newScope) {
-		String oldScope = scope;
-		scope = newScope;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PROCESS_DESCRIPTION__SCOPE, oldScope, scope));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getUsageNotes() {
-		return usageNotes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUsageNotes(String newUsageNotes) {
-		String oldUsageNotes = usageNotes;
-		usageNotes = newUsageNotes;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PROCESS_DESCRIPTION__USAGE_NOTES, oldUsageNotes, usageNotes));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getExternalId() {
-		return externalId;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExternalId(String newExternalId) {
-		String oldExternalId = externalId;
-		externalId = newExternalId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PROCESS_DESCRIPTION__EXTERNAL_ID, oldExternalId, externalId));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_DESCRIPTION__SCOPE:
-				return getScope();
-			case UmaPackage.PROCESS_DESCRIPTION__USAGE_NOTES:
-				return getUsageNotes();
-			case UmaPackage.PROCESS_DESCRIPTION__EXTERNAL_ID:
-				return getExternalId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_DESCRIPTION__SCOPE:
-				setScope((String)newValue);
-				return;
-			case UmaPackage.PROCESS_DESCRIPTION__USAGE_NOTES:
-				setUsageNotes((String)newValue);
-				return;
-			case UmaPackage.PROCESS_DESCRIPTION__EXTERNAL_ID:
-				setExternalId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_DESCRIPTION__SCOPE:
-				setScope(SCOPE_EDEFAULT);
-				return;
-			case UmaPackage.PROCESS_DESCRIPTION__USAGE_NOTES:
-				setUsageNotes(USAGE_NOTES_EDEFAULT);
-				return;
-			case UmaPackage.PROCESS_DESCRIPTION__EXTERNAL_ID:
-				setExternalId(EXTERNAL_ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_DESCRIPTION__SCOPE:
-				return SCOPE_EDEFAULT == null ? scope != null : !SCOPE_EDEFAULT.equals(scope);
-			case UmaPackage.PROCESS_DESCRIPTION__USAGE_NOTES:
-				return USAGE_NOTES_EDEFAULT == null ? usageNotes != null : !USAGE_NOTES_EDEFAULT.equals(usageNotes);
-			case UmaPackage.PROCESS_DESCRIPTION__EXTERNAL_ID:
-				return EXTERNAL_ID_EDEFAULT == null ? externalId != null : !EXTERNAL_ID_EDEFAULT.equals(externalId);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (scope: ");
-		result.append(scope);
-		result.append(", usageNotes: ");
-		result.append(usageNotes);
-		result.append(", externalId: ");
-		result.append(externalId);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ProcessDescriptionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessElementImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessElementImpl.java
deleted file mode 100755
index 175c200..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessElementImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ProcessElementImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.ProcessElement;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ProcessElementImpl extends DescribableElementImpl implements ProcessElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessElementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS_ELEMENT;
-	}
-
-} //ProcessElementImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessImpl.java
deleted file mode 100755
index 0698603..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessImpl.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ProcessImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeEList;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessImpl#getIncludesPattern <em>Includes Pattern</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessImpl#getDefaultContext <em>Default Context</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessImpl#getValidContext <em>Valid Context</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ProcessImpl extends ActivityImpl implements org.eclipse.epf.xml.uma.Process {
-	/**
-	 * The cached value of the '{@link #getIncludesPattern() <em>Includes Pattern</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIncludesPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList includesPattern = null;
-
-	/**
-	 * The default value of the '{@link #getDefaultContext() <em>Default Context</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultContext()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DEFAULT_CONTEXT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDefaultContext() <em>Default Context</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultContext()
-	 * @generated
-	 * @ordered
-	 */
-	protected String defaultContext = DEFAULT_CONTEXT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getValidContext() <em>Valid Context</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValidContext()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList validContext = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getIncludesPattern() {
-		if (includesPattern == null) {
-			includesPattern = new EDataTypeEList(String.class, this, UmaPackage.PROCESS__INCLUDES_PATTERN);
-		}
-		return includesPattern;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDefaultContext() {
-		return defaultContext;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultContext(String newDefaultContext) {
-		String oldDefaultContext = defaultContext;
-		defaultContext = newDefaultContext;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.PROCESS__DEFAULT_CONTEXT, oldDefaultContext, defaultContext));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getValidContext() {
-		if (validContext == null) {
-			validContext = new EDataTypeEList(String.class, this, UmaPackage.PROCESS__VALID_CONTEXT);
-		}
-		return validContext;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.PROCESS__INCLUDES_PATTERN:
-				return getIncludesPattern();
-			case UmaPackage.PROCESS__DEFAULT_CONTEXT:
-				return getDefaultContext();
-			case UmaPackage.PROCESS__VALID_CONTEXT:
-				return getValidContext();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.PROCESS__INCLUDES_PATTERN:
-				getIncludesPattern().clear();
-				getIncludesPattern().addAll((Collection)newValue);
-				return;
-			case UmaPackage.PROCESS__DEFAULT_CONTEXT:
-				setDefaultContext((String)newValue);
-				return;
-			case UmaPackage.PROCESS__VALID_CONTEXT:
-				getValidContext().clear();
-				getValidContext().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PROCESS__INCLUDES_PATTERN:
-				getIncludesPattern().clear();
-				return;
-			case UmaPackage.PROCESS__DEFAULT_CONTEXT:
-				setDefaultContext(DEFAULT_CONTEXT_EDEFAULT);
-				return;
-			case UmaPackage.PROCESS__VALID_CONTEXT:
-				getValidContext().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PROCESS__INCLUDES_PATTERN:
-				return includesPattern != null && !includesPattern.isEmpty();
-			case UmaPackage.PROCESS__DEFAULT_CONTEXT:
-				return DEFAULT_CONTEXT_EDEFAULT == null ? defaultContext != null : !DEFAULT_CONTEXT_EDEFAULT.equals(defaultContext);
-			case UmaPackage.PROCESS__VALID_CONTEXT:
-				return validContext != null && !validContext.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (includesPattern: ");
-		result.append(includesPattern);
-		result.append(", defaultContext: ");
-		result.append(defaultContext);
-		result.append(", validContext: ");
-		result.append(validContext);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ProcessImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessPackageImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessPackageImpl.java
deleted file mode 100755
index 44c9dad..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessPackageImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ProcessPackageImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.ProcessPackage;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process Package</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessPackageImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessPackageImpl#getProcessElement <em>Process Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ProcessPackageImpl extends MethodPackageImpl implements ProcessPackage {
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessPackageImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS_PACKAGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.PROCESS_PACKAGE__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getProcessElement() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.PROCESS_PACKAGE__PROCESS_ELEMENT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_PACKAGE__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-			case UmaPackage.PROCESS_PACKAGE__PROCESS_ELEMENT:
-				return ((InternalEList)getProcessElement()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_PACKAGE__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.PROCESS_PACKAGE__PROCESS_ELEMENT:
-				return getProcessElement();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_PACKAGE__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.PROCESS_PACKAGE__PROCESS_ELEMENT:
-				getProcessElement().clear();
-				getProcessElement().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_PACKAGE__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.PROCESS_PACKAGE__PROCESS_ELEMENT:
-				getProcessElement().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_PACKAGE__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.PROCESS_PACKAGE__PROCESS_ELEMENT:
-				return !getProcessElement().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ProcessPackageImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessPlanningTemplateImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessPlanningTemplateImpl.java
deleted file mode 100755
index 8d58f65..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ProcessPlanningTemplateImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ProcessPlanningTemplateImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.ProcessPlanningTemplate;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Process Planning Template</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessPlanningTemplateImpl#getGroup3 <em>Group3</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ProcessPlanningTemplateImpl#getBaseProcess <em>Base Process</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ProcessPlanningTemplateImpl extends ProcessImpl implements ProcessPlanningTemplate {
-	/**
-	 * The cached value of the '{@link #getGroup3() <em>Group3</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup3()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group3 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessPlanningTemplateImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.PROCESS_PLANNING_TEMPLATE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup3() {
-		if (group3 == null) {
-			group3 = new BasicFeatureMap(this, UmaPackage.PROCESS_PLANNING_TEMPLATE__GROUP3);
-		}
-		return group3;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getBaseProcess() {
-		return ((FeatureMap)getGroup3()).list(UmaPackage.Literals.PROCESS_PLANNING_TEMPLATE__BASE_PROCESS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_PLANNING_TEMPLATE__GROUP3:
-				return ((InternalEList)getGroup3()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_PLANNING_TEMPLATE__GROUP3:
-				if (coreType) return getGroup3();
-				return ((FeatureMap.Internal)getGroup3()).getWrapper();
-			case UmaPackage.PROCESS_PLANNING_TEMPLATE__BASE_PROCESS:
-				return getBaseProcess();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_PLANNING_TEMPLATE__GROUP3:
-				((FeatureMap.Internal)getGroup3()).set(newValue);
-				return;
-			case UmaPackage.PROCESS_PLANNING_TEMPLATE__BASE_PROCESS:
-				getBaseProcess().clear();
-				getBaseProcess().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_PLANNING_TEMPLATE__GROUP3:
-				getGroup3().clear();
-				return;
-			case UmaPackage.PROCESS_PLANNING_TEMPLATE__BASE_PROCESS:
-				getBaseProcess().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.PROCESS_PLANNING_TEMPLATE__GROUP3:
-				return group3 != null && !group3.isEmpty();
-			case UmaPackage.PROCESS_PLANNING_TEMPLATE__BASE_PROCESS:
-				return !getBaseProcess().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group3: ");
-		result.append(group3);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ProcessPlanningTemplateImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ReportImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ReportImpl.java
deleted file mode 100755
index 8b7270f..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ReportImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ReportImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.Report;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Report</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ReportImpl extends GuidanceImpl implements Report {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReportImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.REPORT;
-	}
-
-} //ReportImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ReusableAssetImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ReusableAssetImpl.java
deleted file mode 100755
index 5ddcb1a..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ReusableAssetImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ReusableAssetImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.ReusableAsset;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Reusable Asset</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ReusableAssetImpl extends GuidanceImpl implements ReusableAsset {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReusableAssetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.REUSABLE_ASSET;
-	}
-
-} //ReusableAssetImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoadmapImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoadmapImpl.java
deleted file mode 100755
index f67c7e2..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoadmapImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RoadmapImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.Roadmap;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Roadmap</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class RoadmapImpl extends GuidanceImpl implements Roadmap {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoadmapImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ROADMAP;
-	}
-
-} //RoadmapImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoleDescriptionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoleDescriptionImpl.java
deleted file mode 100755
index 892ae2c..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoleDescriptionImpl.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RoleDescriptionImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.RoleDescription;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Role Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.RoleDescriptionImpl#getAssignmentApproaches <em>Assignment Approaches</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.RoleDescriptionImpl#getSkills <em>Skills</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.RoleDescriptionImpl#getSynonyms <em>Synonyms</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RoleDescriptionImpl extends ContentDescriptionImpl implements RoleDescription {
-	/**
-	 * The default value of the '{@link #getAssignmentApproaches() <em>Assignment Approaches</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAssignmentApproaches()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ASSIGNMENT_APPROACHES_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAssignmentApproaches() <em>Assignment Approaches</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAssignmentApproaches()
-	 * @generated
-	 * @ordered
-	 */
-	protected String assignmentApproaches = ASSIGNMENT_APPROACHES_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSkills() <em>Skills</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSkills()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SKILLS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSkills() <em>Skills</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSkills()
-	 * @generated
-	 * @ordered
-	 */
-	protected String skills = SKILLS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSynonyms() <em>Synonyms</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSynonyms()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SYNONYMS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSynonyms() <em>Synonyms</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSynonyms()
-	 * @generated
-	 * @ordered
-	 */
-	protected String synonyms = SYNONYMS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoleDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ROLE_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAssignmentApproaches() {
-		return assignmentApproaches;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAssignmentApproaches(String newAssignmentApproaches) {
-		String oldAssignmentApproaches = assignmentApproaches;
-		assignmentApproaches = newAssignmentApproaches;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES, oldAssignmentApproaches, assignmentApproaches));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSkills() {
-		return skills;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSkills(String newSkills) {
-		String oldSkills = skills;
-		skills = newSkills;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.ROLE_DESCRIPTION__SKILLS, oldSkills, skills));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSynonyms() {
-		return synonyms;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSynonyms(String newSynonyms) {
-		String oldSynonyms = synonyms;
-		synonyms = newSynonyms;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.ROLE_DESCRIPTION__SYNONYMS, oldSynonyms, synonyms));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES:
-				return getAssignmentApproaches();
-			case UmaPackage.ROLE_DESCRIPTION__SKILLS:
-				return getSkills();
-			case UmaPackage.ROLE_DESCRIPTION__SYNONYMS:
-				return getSynonyms();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES:
-				setAssignmentApproaches((String)newValue);
-				return;
-			case UmaPackage.ROLE_DESCRIPTION__SKILLS:
-				setSkills((String)newValue);
-				return;
-			case UmaPackage.ROLE_DESCRIPTION__SYNONYMS:
-				setSynonyms((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES:
-				setAssignmentApproaches(ASSIGNMENT_APPROACHES_EDEFAULT);
-				return;
-			case UmaPackage.ROLE_DESCRIPTION__SKILLS:
-				setSkills(SKILLS_EDEFAULT);
-				return;
-			case UmaPackage.ROLE_DESCRIPTION__SYNONYMS:
-				setSynonyms(SYNONYMS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES:
-				return ASSIGNMENT_APPROACHES_EDEFAULT == null ? assignmentApproaches != null : !ASSIGNMENT_APPROACHES_EDEFAULT.equals(assignmentApproaches);
-			case UmaPackage.ROLE_DESCRIPTION__SKILLS:
-				return SKILLS_EDEFAULT == null ? skills != null : !SKILLS_EDEFAULT.equals(skills);
-			case UmaPackage.ROLE_DESCRIPTION__SYNONYMS:
-				return SYNONYMS_EDEFAULT == null ? synonyms != null : !SYNONYMS_EDEFAULT.equals(synonyms);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (assignmentApproaches: ");
-		result.append(assignmentApproaches);
-		result.append(", skills: ");
-		result.append(skills);
-		result.append(", synonyms: ");
-		result.append(synonyms);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RoleDescriptionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoleDescriptorImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoleDescriptorImpl.java
deleted file mode 100755
index 9fad8b2..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoleDescriptorImpl.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RoleDescriptorImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeEList;
-import org.eclipse.epf.xml.uma.RoleDescriptor;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Role Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.RoleDescriptorImpl#getRole <em>Role</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.RoleDescriptorImpl#getResponsibleFor <em>Responsible For</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RoleDescriptorImpl extends DescriptorImpl implements RoleDescriptor {
-	/**
-	 * The default value of the '{@link #getRole() <em>Role</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRole()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ROLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRole() <em>Role</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRole()
-	 * @generated
-	 * @ordered
-	 */
-	protected String role = ROLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getResponsibleFor() <em>Responsible For</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResponsibleFor()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList responsibleFor = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoleDescriptorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ROLE_DESCRIPTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRole() {
-		return role;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRole(String newRole) {
-		String oldRole = role;
-		role = newRole;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.ROLE_DESCRIPTOR__ROLE, oldRole, role));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getResponsibleFor() {
-		if (responsibleFor == null) {
-			responsibleFor = new EDataTypeEList(String.class, this, UmaPackage.ROLE_DESCRIPTOR__RESPONSIBLE_FOR);
-		}
-		return responsibleFor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.ROLE_DESCRIPTOR__ROLE:
-				return getRole();
-			case UmaPackage.ROLE_DESCRIPTOR__RESPONSIBLE_FOR:
-				return getResponsibleFor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.ROLE_DESCRIPTOR__ROLE:
-				setRole((String)newValue);
-				return;
-			case UmaPackage.ROLE_DESCRIPTOR__RESPONSIBLE_FOR:
-				getResponsibleFor().clear();
-				getResponsibleFor().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ROLE_DESCRIPTOR__ROLE:
-				setRole(ROLE_EDEFAULT);
-				return;
-			case UmaPackage.ROLE_DESCRIPTOR__RESPONSIBLE_FOR:
-				getResponsibleFor().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ROLE_DESCRIPTOR__ROLE:
-				return ROLE_EDEFAULT == null ? role != null : !ROLE_EDEFAULT.equals(role);
-			case UmaPackage.ROLE_DESCRIPTOR__RESPONSIBLE_FOR:
-				return responsibleFor != null && !responsibleFor.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (role: ");
-		result.append(role);
-		result.append(", responsibleFor: ");
-		result.append(responsibleFor);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RoleDescriptorImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoleImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoleImpl.java
deleted file mode 100755
index 528437d..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoleImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RoleImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.Role;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Role</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.RoleImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.RoleImpl#getResponsibleFor <em>Responsible For</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RoleImpl extends ContentElementImpl implements Role {
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ROLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.ROLE__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getResponsibleFor() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.ROLE__RESPONSIBLE_FOR);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.ROLE__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.ROLE__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.ROLE__RESPONSIBLE_FOR:
-				return getResponsibleFor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.ROLE__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.ROLE__RESPONSIBLE_FOR:
-				getResponsibleFor().clear();
-				getResponsibleFor().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ROLE__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.ROLE__RESPONSIBLE_FOR:
-				getResponsibleFor().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ROLE__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.ROLE__RESPONSIBLE_FOR:
-				return !getResponsibleFor().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RoleImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoleSetGroupingImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoleSetGroupingImpl.java
deleted file mode 100755
index e244d2d..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoleSetGroupingImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RoleSetGroupingImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.RoleSetGrouping;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Role Set Grouping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.RoleSetGroupingImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.RoleSetGroupingImpl#getRoleSet <em>Role Set</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RoleSetGroupingImpl extends ContentCategoryImpl implements RoleSetGrouping {
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoleSetGroupingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ROLE_SET_GROUPING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.ROLE_SET_GROUPING__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getRoleSet() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.ROLE_SET_GROUPING__ROLE_SET);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.ROLE_SET_GROUPING__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.ROLE_SET_GROUPING__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.ROLE_SET_GROUPING__ROLE_SET:
-				return getRoleSet();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.ROLE_SET_GROUPING__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.ROLE_SET_GROUPING__ROLE_SET:
-				getRoleSet().clear();
-				getRoleSet().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ROLE_SET_GROUPING__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.ROLE_SET_GROUPING__ROLE_SET:
-				getRoleSet().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ROLE_SET_GROUPING__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.ROLE_SET_GROUPING__ROLE_SET:
-				return !getRoleSet().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RoleSetGroupingImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoleSetImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoleSetImpl.java
deleted file mode 100755
index 72e6a90..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/RoleSetImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RoleSetImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.RoleSet;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Role Set</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.RoleSetImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.RoleSetImpl#getRole <em>Role</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RoleSetImpl extends ContentCategoryImpl implements RoleSet {
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoleSetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.ROLE_SET;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.ROLE_SET__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getRole() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.ROLE_SET__ROLE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.ROLE_SET__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.ROLE_SET__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.ROLE_SET__ROLE:
-				return getRole();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.ROLE_SET__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.ROLE_SET__ROLE:
-				getRole().clear();
-				getRole().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ROLE_SET__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.ROLE_SET__ROLE:
-				getRole().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.ROLE_SET__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.ROLE_SET__ROLE:
-				return !getRole().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RoleSetImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/SectionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/SectionImpl.java
deleted file mode 100755
index 83d52f4..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/SectionImpl.java
+++ /dev/null
@@ -1,487 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SectionImpl.java,v 1.4 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.Section;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.VariabilityType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Section</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.SectionImpl#getSubSection <em>Sub Section</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.SectionImpl#getPredecessor <em>Predecessor</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.SectionImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.SectionImpl#getSectionName <em>Section Name</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.SectionImpl#getVariabilityBasedOnElement <em>Variability Based On Element</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.SectionImpl#getVariabilityType <em>Variability Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SectionImpl extends MethodElementImpl implements Section {
-	/**
-	 * The cached value of the '{@link #getSubSection() <em>Sub Section</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubSection()
-	 * @generated
-	 * @ordered
-	 */
-	protected Section subSection = null;
-
-	/**
-	 * The default value of the '{@link #getPredecessor() <em>Predecessor</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPredecessor()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PREDECESSOR_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPredecessor() <em>Predecessor</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPredecessor()
-	 * @generated
-	 * @ordered
-	 */
-	protected String predecessor = PREDECESSOR_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSectionName() <em>Section Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSectionName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SECTION_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSectionName() <em>Section Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSectionName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String sectionName = SECTION_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getVariabilityBasedOnElement() <em>Variability Based On Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityBasedOnElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VARIABILITY_BASED_ON_ELEMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getVariabilityBasedOnElement() <em>Variability Based On Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityBasedOnElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected String variabilityBasedOnElement = VARIABILITY_BASED_ON_ELEMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getVariabilityType() <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final VariabilityType VARIABILITY_TYPE_EDEFAULT = VariabilityType.NA_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getVariabilityType() <em>Variability Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariabilityType()
-	 * @generated
-	 * @ordered
-	 */
-	protected VariabilityType variabilityType = VARIABILITY_TYPE_EDEFAULT;
-
-	/**
-	 * This is true if the Variability Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean variabilityTypeESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SectionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.SECTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Section getSubSection() {
-		return subSection;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSubSection(Section newSubSection, NotificationChain msgs) {
-		Section oldSubSection = subSection;
-		subSection = newSubSection;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmaPackage.SECTION__SUB_SECTION, oldSubSection, newSubSection);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSubSection(Section newSubSection) {
-		if (newSubSection != subSection) {
-			NotificationChain msgs = null;
-			if (subSection != null)
-				msgs = ((InternalEObject)subSection).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmaPackage.SECTION__SUB_SECTION, null, msgs);
-			if (newSubSection != null)
-				msgs = ((InternalEObject)newSubSection).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmaPackage.SECTION__SUB_SECTION, null, msgs);
-			msgs = basicSetSubSection(newSubSection, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.SECTION__SUB_SECTION, newSubSection, newSubSection));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPredecessor() {
-		return predecessor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPredecessor(String newPredecessor) {
-		String oldPredecessor = predecessor;
-		predecessor = newPredecessor;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.SECTION__PREDECESSOR, oldPredecessor, predecessor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.SECTION__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSectionName() {
-		return sectionName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSectionName(String newSectionName) {
-		String oldSectionName = sectionName;
-		sectionName = newSectionName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.SECTION__SECTION_NAME, oldSectionName, sectionName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVariabilityBasedOnElement() {
-		return variabilityBasedOnElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVariabilityBasedOnElement(String newVariabilityBasedOnElement) {
-		String oldVariabilityBasedOnElement = variabilityBasedOnElement;
-		variabilityBasedOnElement = newVariabilityBasedOnElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.SECTION__VARIABILITY_BASED_ON_ELEMENT, oldVariabilityBasedOnElement, variabilityBasedOnElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityType getVariabilityType() {
-		return variabilityType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVariabilityType(VariabilityType newVariabilityType) {
-		VariabilityType oldVariabilityType = variabilityType;
-		variabilityType = newVariabilityType == null ? VARIABILITY_TYPE_EDEFAULT : newVariabilityType;
-		boolean oldVariabilityTypeESet = variabilityTypeESet;
-		variabilityTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.SECTION__VARIABILITY_TYPE, oldVariabilityType, variabilityType, !oldVariabilityTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetVariabilityType() {
-		VariabilityType oldVariabilityType = variabilityType;
-		boolean oldVariabilityTypeESet = variabilityTypeESet;
-		variabilityType = VARIABILITY_TYPE_EDEFAULT;
-		variabilityTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.SECTION__VARIABILITY_TYPE, oldVariabilityType, VARIABILITY_TYPE_EDEFAULT, oldVariabilityTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetVariabilityType() {
-		return variabilityTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.SECTION__SUB_SECTION:
-				return basicSetSubSection(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.SECTION__SUB_SECTION:
-				return getSubSection();
-			case UmaPackage.SECTION__PREDECESSOR:
-				return getPredecessor();
-			case UmaPackage.SECTION__DESCRIPTION:
-				return getDescription();
-			case UmaPackage.SECTION__SECTION_NAME:
-				return getSectionName();
-			case UmaPackage.SECTION__VARIABILITY_BASED_ON_ELEMENT:
-				return getVariabilityBasedOnElement();
-			case UmaPackage.SECTION__VARIABILITY_TYPE:
-				return getVariabilityType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.SECTION__SUB_SECTION:
-				setSubSection((Section)newValue);
-				return;
-			case UmaPackage.SECTION__PREDECESSOR:
-				setPredecessor((String)newValue);
-				return;
-			case UmaPackage.SECTION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case UmaPackage.SECTION__SECTION_NAME:
-				setSectionName((String)newValue);
-				return;
-			case UmaPackage.SECTION__VARIABILITY_BASED_ON_ELEMENT:
-				setVariabilityBasedOnElement((String)newValue);
-				return;
-			case UmaPackage.SECTION__VARIABILITY_TYPE:
-				setVariabilityType((VariabilityType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.SECTION__SUB_SECTION:
-				setSubSection((Section)null);
-				return;
-			case UmaPackage.SECTION__PREDECESSOR:
-				setPredecessor(PREDECESSOR_EDEFAULT);
-				return;
-			case UmaPackage.SECTION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case UmaPackage.SECTION__SECTION_NAME:
-				setSectionName(SECTION_NAME_EDEFAULT);
-				return;
-			case UmaPackage.SECTION__VARIABILITY_BASED_ON_ELEMENT:
-				setVariabilityBasedOnElement(VARIABILITY_BASED_ON_ELEMENT_EDEFAULT);
-				return;
-			case UmaPackage.SECTION__VARIABILITY_TYPE:
-				unsetVariabilityType();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.SECTION__SUB_SECTION:
-				return subSection != null;
-			case UmaPackage.SECTION__PREDECESSOR:
-				return PREDECESSOR_EDEFAULT == null ? predecessor != null : !PREDECESSOR_EDEFAULT.equals(predecessor);
-			case UmaPackage.SECTION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case UmaPackage.SECTION__SECTION_NAME:
-				return SECTION_NAME_EDEFAULT == null ? sectionName != null : !SECTION_NAME_EDEFAULT.equals(sectionName);
-			case UmaPackage.SECTION__VARIABILITY_BASED_ON_ELEMENT:
-				return VARIABILITY_BASED_ON_ELEMENT_EDEFAULT == null ? variabilityBasedOnElement != null : !VARIABILITY_BASED_ON_ELEMENT_EDEFAULT.equals(variabilityBasedOnElement);
-			case UmaPackage.SECTION__VARIABILITY_TYPE:
-				return isSetVariabilityType();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (predecessor: ");
-		result.append(predecessor);
-		result.append(", description: ");
-		result.append(description);
-		result.append(", sectionName: ");
-		result.append(sectionName);
-		result.append(", variabilityBasedOnElement: ");
-		result.append(variabilityBasedOnElement);
-		result.append(", variabilityType: ");
-		if (variabilityTypeESet) result.append(variabilityType); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //SectionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/SupportingMaterialImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/SupportingMaterialImpl.java
deleted file mode 100755
index d89a4de..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/SupportingMaterialImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SupportingMaterialImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.SupportingMaterial;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Supporting Material</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class SupportingMaterialImpl extends GuidanceImpl implements SupportingMaterial {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SupportingMaterialImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.SUPPORTING_MATERIAL;
-	}
-
-} //SupportingMaterialImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TaskDescriptionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TaskDescriptionImpl.java
deleted file mode 100755
index e48ec8f..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TaskDescriptionImpl.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaskDescriptionImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.TaskDescription;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Task Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskDescriptionImpl#getAlternatives <em>Alternatives</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskDescriptionImpl#getPurpose <em>Purpose</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TaskDescriptionImpl extends ContentDescriptionImpl implements TaskDescription {
-	/**
-	 * The default value of the '{@link #getAlternatives() <em>Alternatives</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlternatives()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ALTERNATIVES_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAlternatives() <em>Alternatives</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlternatives()
-	 * @generated
-	 * @ordered
-	 */
-	protected String alternatives = ALTERNATIVES_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPurpose()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PURPOSE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPurpose()
-	 * @generated
-	 * @ordered
-	 */
-	protected String purpose = PURPOSE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaskDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TASK_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAlternatives() {
-		return alternatives;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAlternatives(String newAlternatives) {
-		String oldAlternatives = alternatives;
-		alternatives = newAlternatives;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.TASK_DESCRIPTION__ALTERNATIVES, oldAlternatives, alternatives));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPurpose() {
-		return purpose;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPurpose(String newPurpose) {
-		String oldPurpose = purpose;
-		purpose = newPurpose;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.TASK_DESCRIPTION__PURPOSE, oldPurpose, purpose));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.TASK_DESCRIPTION__ALTERNATIVES:
-				return getAlternatives();
-			case UmaPackage.TASK_DESCRIPTION__PURPOSE:
-				return getPurpose();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.TASK_DESCRIPTION__ALTERNATIVES:
-				setAlternatives((String)newValue);
-				return;
-			case UmaPackage.TASK_DESCRIPTION__PURPOSE:
-				setPurpose((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.TASK_DESCRIPTION__ALTERNATIVES:
-				setAlternatives(ALTERNATIVES_EDEFAULT);
-				return;
-			case UmaPackage.TASK_DESCRIPTION__PURPOSE:
-				setPurpose(PURPOSE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.TASK_DESCRIPTION__ALTERNATIVES:
-				return ALTERNATIVES_EDEFAULT == null ? alternatives != null : !ALTERNATIVES_EDEFAULT.equals(alternatives);
-			case UmaPackage.TASK_DESCRIPTION__PURPOSE:
-				return PURPOSE_EDEFAULT == null ? purpose != null : !PURPOSE_EDEFAULT.equals(purpose);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (alternatives: ");
-		result.append(alternatives);
-		result.append(", purpose: ");
-		result.append(purpose);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TaskDescriptionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TaskDescriptorImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TaskDescriptorImpl.java
deleted file mode 100755
index a8cea1b..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TaskDescriptorImpl.java
+++ /dev/null
@@ -1,520 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaskDescriptorImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.Section;
-import org.eclipse.epf.xml.uma.TaskDescriptor;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Task Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskDescriptorImpl#getTask <em>Task</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskDescriptorImpl#getPerformedPrimarilyBy <em>Performed Primarily By</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskDescriptorImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskDescriptorImpl#getAdditionallyPerformedBy <em>Additionally Performed By</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskDescriptorImpl#getAssistedBy <em>Assisted By</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskDescriptorImpl#getExternalInput <em>External Input</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskDescriptorImpl#getMandatoryInput <em>Mandatory Input</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskDescriptorImpl#getOptionalInput <em>Optional Input</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskDescriptorImpl#getOutput <em>Output</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskDescriptorImpl#getStep <em>Step</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskDescriptorImpl#isIsSynchronizedWithSource <em>Is Synchronized With Source</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TaskDescriptorImpl extends WorkBreakdownElementImpl implements TaskDescriptor {
-	/**
-	 * The default value of the '{@link #getTask() <em>Task</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTask()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TASK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTask() <em>Task</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTask()
-	 * @generated
-	 * @ordered
-	 */
-	protected String task = TASK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPerformedPrimarilyBy() <em>Performed Primarily By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPerformedPrimarilyBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PERFORMED_PRIMARILY_BY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPerformedPrimarilyBy() <em>Performed Primarily By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPerformedPrimarilyBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected String performedPrimarilyBy = PERFORMED_PRIMARILY_BY_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * The cached value of the '{@link #getStep() <em>Step</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStep()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList step = null;
-
-	/**
-	 * The default value of the '{@link #isIsSynchronizedWithSource() <em>Is Synchronized With Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSynchronizedWithSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsSynchronizedWithSource() <em>Is Synchronized With Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsSynchronizedWithSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isSynchronizedWithSource = IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT;
-
-	/**
-	 * This is true if the Is Synchronized With Source attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isSynchronizedWithSourceESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaskDescriptorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TASK_DESCRIPTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTask() {
-		return task;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTask(String newTask) {
-		String oldTask = task;
-		task = newTask;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.TASK_DESCRIPTOR__TASK, oldTask, task));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPerformedPrimarilyBy() {
-		return performedPrimarilyBy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPerformedPrimarilyBy(String newPerformedPrimarilyBy) {
-		String oldPerformedPrimarilyBy = performedPrimarilyBy;
-		performedPrimarilyBy = newPerformedPrimarilyBy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY, oldPerformedPrimarilyBy, performedPrimarilyBy));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.TASK_DESCRIPTOR__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getAdditionallyPerformedBy() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getAssistedBy() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.TASK_DESCRIPTOR__ASSISTED_BY);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getExternalInput() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.TASK_DESCRIPTOR__EXTERNAL_INPUT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMandatoryInput() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.TASK_DESCRIPTOR__MANDATORY_INPUT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getOptionalInput() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.TASK_DESCRIPTOR__OPTIONAL_INPUT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getOutput() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.TASK_DESCRIPTOR__OUTPUT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getStep() {
-		if (step == null) {
-			step = new EObjectContainmentEList(Section.class, this, UmaPackage.TASK_DESCRIPTOR__STEP);
-		}
-		return step;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsSynchronizedWithSource() {
-		return isSynchronizedWithSource;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsSynchronizedWithSource(boolean newIsSynchronizedWithSource) {
-		boolean oldIsSynchronizedWithSource = isSynchronizedWithSource;
-		isSynchronizedWithSource = newIsSynchronizedWithSource;
-		boolean oldIsSynchronizedWithSourceESet = isSynchronizedWithSourceESet;
-		isSynchronizedWithSourceESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE, oldIsSynchronizedWithSource, isSynchronizedWithSource, !oldIsSynchronizedWithSourceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsSynchronizedWithSource() {
-		boolean oldIsSynchronizedWithSource = isSynchronizedWithSource;
-		boolean oldIsSynchronizedWithSourceESet = isSynchronizedWithSourceESet;
-		isSynchronizedWithSource = IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT;
-		isSynchronizedWithSourceESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE, oldIsSynchronizedWithSource, IS_SYNCHRONIZED_WITH_SOURCE_EDEFAULT, oldIsSynchronizedWithSourceESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsSynchronizedWithSource() {
-		return isSynchronizedWithSourceESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.TASK_DESCRIPTOR__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-			case UmaPackage.TASK_DESCRIPTOR__STEP:
-				return ((InternalEList)getStep()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.TASK_DESCRIPTOR__TASK:
-				return getTask();
-			case UmaPackage.TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY:
-				return getPerformedPrimarilyBy();
-			case UmaPackage.TASK_DESCRIPTOR__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY:
-				return getAdditionallyPerformedBy();
-			case UmaPackage.TASK_DESCRIPTOR__ASSISTED_BY:
-				return getAssistedBy();
-			case UmaPackage.TASK_DESCRIPTOR__EXTERNAL_INPUT:
-				return getExternalInput();
-			case UmaPackage.TASK_DESCRIPTOR__MANDATORY_INPUT:
-				return getMandatoryInput();
-			case UmaPackage.TASK_DESCRIPTOR__OPTIONAL_INPUT:
-				return getOptionalInput();
-			case UmaPackage.TASK_DESCRIPTOR__OUTPUT:
-				return getOutput();
-			case UmaPackage.TASK_DESCRIPTOR__STEP:
-				return getStep();
-			case UmaPackage.TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-				return isIsSynchronizedWithSource() ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.TASK_DESCRIPTOR__TASK:
-				setTask((String)newValue);
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY:
-				setPerformedPrimarilyBy((String)newValue);
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY:
-				getAdditionallyPerformedBy().clear();
-				getAdditionallyPerformedBy().addAll((Collection)newValue);
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__ASSISTED_BY:
-				getAssistedBy().clear();
-				getAssistedBy().addAll((Collection)newValue);
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__EXTERNAL_INPUT:
-				getExternalInput().clear();
-				getExternalInput().addAll((Collection)newValue);
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__MANDATORY_INPUT:
-				getMandatoryInput().clear();
-				getMandatoryInput().addAll((Collection)newValue);
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__OPTIONAL_INPUT:
-				getOptionalInput().clear();
-				getOptionalInput().addAll((Collection)newValue);
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__OUTPUT:
-				getOutput().clear();
-				getOutput().addAll((Collection)newValue);
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__STEP:
-				getStep().clear();
-				getStep().addAll((Collection)newValue);
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-				setIsSynchronizedWithSource(((Boolean)newValue).booleanValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.TASK_DESCRIPTOR__TASK:
-				setTask(TASK_EDEFAULT);
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY:
-				setPerformedPrimarilyBy(PERFORMED_PRIMARILY_BY_EDEFAULT);
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY:
-				getAdditionallyPerformedBy().clear();
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__ASSISTED_BY:
-				getAssistedBy().clear();
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__EXTERNAL_INPUT:
-				getExternalInput().clear();
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__MANDATORY_INPUT:
-				getMandatoryInput().clear();
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__OPTIONAL_INPUT:
-				getOptionalInput().clear();
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__OUTPUT:
-				getOutput().clear();
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__STEP:
-				getStep().clear();
-				return;
-			case UmaPackage.TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-				unsetIsSynchronizedWithSource();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.TASK_DESCRIPTOR__TASK:
-				return TASK_EDEFAULT == null ? task != null : !TASK_EDEFAULT.equals(task);
-			case UmaPackage.TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY:
-				return PERFORMED_PRIMARILY_BY_EDEFAULT == null ? performedPrimarilyBy != null : !PERFORMED_PRIMARILY_BY_EDEFAULT.equals(performedPrimarilyBy);
-			case UmaPackage.TASK_DESCRIPTOR__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY:
-				return !getAdditionallyPerformedBy().isEmpty();
-			case UmaPackage.TASK_DESCRIPTOR__ASSISTED_BY:
-				return !getAssistedBy().isEmpty();
-			case UmaPackage.TASK_DESCRIPTOR__EXTERNAL_INPUT:
-				return !getExternalInput().isEmpty();
-			case UmaPackage.TASK_DESCRIPTOR__MANDATORY_INPUT:
-				return !getMandatoryInput().isEmpty();
-			case UmaPackage.TASK_DESCRIPTOR__OPTIONAL_INPUT:
-				return !getOptionalInput().isEmpty();
-			case UmaPackage.TASK_DESCRIPTOR__OUTPUT:
-				return !getOutput().isEmpty();
-			case UmaPackage.TASK_DESCRIPTOR__STEP:
-				return step != null && !step.isEmpty();
-			case UmaPackage.TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE:
-				return isSetIsSynchronizedWithSource();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (task: ");
-		result.append(task);
-		result.append(", performedPrimarilyBy: ");
-		result.append(performedPrimarilyBy);
-		result.append(", group2: ");
-		result.append(group2);
-		result.append(", isSynchronizedWithSource: ");
-		if (isSynchronizedWithSourceESet) result.append(isSynchronizedWithSource); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //TaskDescriptorImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TaskImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TaskImpl.java
deleted file mode 100755
index c796cfb..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TaskImpl.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TaskImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.Task;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Task</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskImpl#getPrecondition <em>Precondition</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskImpl#getPostcondition <em>Postcondition</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskImpl#getPerformedBy <em>Performed By</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskImpl#getMandatoryInput <em>Mandatory Input</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskImpl#getOutput <em>Output</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskImpl#getAdditionallyPerformedBy <em>Additionally Performed By</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskImpl#getOptionalInput <em>Optional Input</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskImpl#getEstimate <em>Estimate</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskImpl#getEstimationConsiderations <em>Estimation Considerations</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TaskImpl#getToolMentor <em>Tool Mentor</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TaskImpl extends ContentElementImpl implements Task {
-	/**
-	 * The default value of the '{@link #getPrecondition() <em>Precondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrecondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PRECONDITION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPrecondition() <em>Precondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrecondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected String precondition = PRECONDITION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPostcondition() <em>Postcondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostcondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String POSTCONDITION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPostcondition() <em>Postcondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostcondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected String postcondition = POSTCONDITION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPerformedBy() <em>Performed By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPerformedBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PERFORMED_BY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPerformedBy() <em>Performed By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPerformedBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected String performedBy = PERFORMED_BY_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaskImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TASK;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPrecondition() {
-		return precondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPrecondition(String newPrecondition) {
-		String oldPrecondition = precondition;
-		precondition = newPrecondition;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.TASK__PRECONDITION, oldPrecondition, precondition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPostcondition() {
-		return postcondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPostcondition(String newPostcondition) {
-		String oldPostcondition = postcondition;
-		postcondition = newPostcondition;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.TASK__POSTCONDITION, oldPostcondition, postcondition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPerformedBy() {
-		return performedBy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPerformedBy(String newPerformedBy) {
-		String oldPerformedBy = performedBy;
-		performedBy = newPerformedBy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.TASK__PERFORMED_BY, oldPerformedBy, performedBy));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.TASK__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMandatoryInput() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.TASK__MANDATORY_INPUT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getOutput() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.TASK__OUTPUT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getAdditionallyPerformedBy() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.TASK__ADDITIONALLY_PERFORMED_BY);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getOptionalInput() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.TASK__OPTIONAL_INPUT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEstimate() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.TASK__ESTIMATE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEstimationConsiderations() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.TASK__ESTIMATION_CONSIDERATIONS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getToolMentor() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.TASK__TOOL_MENTOR);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.TASK__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.TASK__PRECONDITION:
-				return getPrecondition();
-			case UmaPackage.TASK__POSTCONDITION:
-				return getPostcondition();
-			case UmaPackage.TASK__PERFORMED_BY:
-				return getPerformedBy();
-			case UmaPackage.TASK__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.TASK__MANDATORY_INPUT:
-				return getMandatoryInput();
-			case UmaPackage.TASK__OUTPUT:
-				return getOutput();
-			case UmaPackage.TASK__ADDITIONALLY_PERFORMED_BY:
-				return getAdditionallyPerformedBy();
-			case UmaPackage.TASK__OPTIONAL_INPUT:
-				return getOptionalInput();
-			case UmaPackage.TASK__ESTIMATE:
-				return getEstimate();
-			case UmaPackage.TASK__ESTIMATION_CONSIDERATIONS:
-				return getEstimationConsiderations();
-			case UmaPackage.TASK__TOOL_MENTOR:
-				return getToolMentor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.TASK__PRECONDITION:
-				setPrecondition((String)newValue);
-				return;
-			case UmaPackage.TASK__POSTCONDITION:
-				setPostcondition((String)newValue);
-				return;
-			case UmaPackage.TASK__PERFORMED_BY:
-				setPerformedBy((String)newValue);
-				return;
-			case UmaPackage.TASK__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.TASK__MANDATORY_INPUT:
-				getMandatoryInput().clear();
-				getMandatoryInput().addAll((Collection)newValue);
-				return;
-			case UmaPackage.TASK__OUTPUT:
-				getOutput().clear();
-				getOutput().addAll((Collection)newValue);
-				return;
-			case UmaPackage.TASK__ADDITIONALLY_PERFORMED_BY:
-				getAdditionallyPerformedBy().clear();
-				getAdditionallyPerformedBy().addAll((Collection)newValue);
-				return;
-			case UmaPackage.TASK__OPTIONAL_INPUT:
-				getOptionalInput().clear();
-				getOptionalInput().addAll((Collection)newValue);
-				return;
-			case UmaPackage.TASK__ESTIMATE:
-				getEstimate().clear();
-				getEstimate().addAll((Collection)newValue);
-				return;
-			case UmaPackage.TASK__ESTIMATION_CONSIDERATIONS:
-				getEstimationConsiderations().clear();
-				getEstimationConsiderations().addAll((Collection)newValue);
-				return;
-			case UmaPackage.TASK__TOOL_MENTOR:
-				getToolMentor().clear();
-				getToolMentor().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.TASK__PRECONDITION:
-				setPrecondition(PRECONDITION_EDEFAULT);
-				return;
-			case UmaPackage.TASK__POSTCONDITION:
-				setPostcondition(POSTCONDITION_EDEFAULT);
-				return;
-			case UmaPackage.TASK__PERFORMED_BY:
-				setPerformedBy(PERFORMED_BY_EDEFAULT);
-				return;
-			case UmaPackage.TASK__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.TASK__MANDATORY_INPUT:
-				getMandatoryInput().clear();
-				return;
-			case UmaPackage.TASK__OUTPUT:
-				getOutput().clear();
-				return;
-			case UmaPackage.TASK__ADDITIONALLY_PERFORMED_BY:
-				getAdditionallyPerformedBy().clear();
-				return;
-			case UmaPackage.TASK__OPTIONAL_INPUT:
-				getOptionalInput().clear();
-				return;
-			case UmaPackage.TASK__ESTIMATE:
-				getEstimate().clear();
-				return;
-			case UmaPackage.TASK__ESTIMATION_CONSIDERATIONS:
-				getEstimationConsiderations().clear();
-				return;
-			case UmaPackage.TASK__TOOL_MENTOR:
-				getToolMentor().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.TASK__PRECONDITION:
-				return PRECONDITION_EDEFAULT == null ? precondition != null : !PRECONDITION_EDEFAULT.equals(precondition);
-			case UmaPackage.TASK__POSTCONDITION:
-				return POSTCONDITION_EDEFAULT == null ? postcondition != null : !POSTCONDITION_EDEFAULT.equals(postcondition);
-			case UmaPackage.TASK__PERFORMED_BY:
-				return PERFORMED_BY_EDEFAULT == null ? performedBy != null : !PERFORMED_BY_EDEFAULT.equals(performedBy);
-			case UmaPackage.TASK__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.TASK__MANDATORY_INPUT:
-				return !getMandatoryInput().isEmpty();
-			case UmaPackage.TASK__OUTPUT:
-				return !getOutput().isEmpty();
-			case UmaPackage.TASK__ADDITIONALLY_PERFORMED_BY:
-				return !getAdditionallyPerformedBy().isEmpty();
-			case UmaPackage.TASK__OPTIONAL_INPUT:
-				return !getOptionalInput().isEmpty();
-			case UmaPackage.TASK__ESTIMATE:
-				return !getEstimate().isEmpty();
-			case UmaPackage.TASK__ESTIMATION_CONSIDERATIONS:
-				return !getEstimationConsiderations().isEmpty();
-			case UmaPackage.TASK__TOOL_MENTOR:
-				return !getToolMentor().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (precondition: ");
-		result.append(precondition);
-		result.append(", postcondition: ");
-		result.append(postcondition);
-		result.append(", performedBy: ");
-		result.append(performedBy);
-		result.append(", group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TaskImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TeamProfileImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TeamProfileImpl.java
deleted file mode 100755
index f0e21ca..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TeamProfileImpl.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TeamProfileImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.TeamProfile;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Team Profile</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TeamProfileImpl#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TeamProfileImpl#getRole <em>Role</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TeamProfileImpl#getSuperTeam <em>Super Team</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.TeamProfileImpl#getSubTeam <em>Sub Team</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TeamProfileImpl extends BreakdownElementImpl implements TeamProfile {
-	/**
-	 * The cached value of the '{@link #getGroup1() <em>Group1</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup1()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group1 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TeamProfileImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TEAM_PROFILE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup1() {
-		if (group1 == null) {
-			group1 = new BasicFeatureMap(this, UmaPackage.TEAM_PROFILE__GROUP1);
-		}
-		return group1;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getRole() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.TEAM_PROFILE__ROLE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSuperTeam() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.TEAM_PROFILE__SUPER_TEAM);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSubTeam() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.TEAM_PROFILE__SUB_TEAM);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.TEAM_PROFILE__GROUP1:
-				return ((InternalEList)getGroup1()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.TEAM_PROFILE__GROUP1:
-				if (coreType) return getGroup1();
-				return ((FeatureMap.Internal)getGroup1()).getWrapper();
-			case UmaPackage.TEAM_PROFILE__ROLE:
-				return getRole();
-			case UmaPackage.TEAM_PROFILE__SUPER_TEAM:
-				return getSuperTeam();
-			case UmaPackage.TEAM_PROFILE__SUB_TEAM:
-				return getSubTeam();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.TEAM_PROFILE__GROUP1:
-				((FeatureMap.Internal)getGroup1()).set(newValue);
-				return;
-			case UmaPackage.TEAM_PROFILE__ROLE:
-				getRole().clear();
-				getRole().addAll((Collection)newValue);
-				return;
-			case UmaPackage.TEAM_PROFILE__SUPER_TEAM:
-				getSuperTeam().clear();
-				getSuperTeam().addAll((Collection)newValue);
-				return;
-			case UmaPackage.TEAM_PROFILE__SUB_TEAM:
-				getSubTeam().clear();
-				getSubTeam().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.TEAM_PROFILE__GROUP1:
-				getGroup1().clear();
-				return;
-			case UmaPackage.TEAM_PROFILE__ROLE:
-				getRole().clear();
-				return;
-			case UmaPackage.TEAM_PROFILE__SUPER_TEAM:
-				getSuperTeam().clear();
-				return;
-			case UmaPackage.TEAM_PROFILE__SUB_TEAM:
-				getSubTeam().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.TEAM_PROFILE__GROUP1:
-				return group1 != null && !group1.isEmpty();
-			case UmaPackage.TEAM_PROFILE__ROLE:
-				return !getRole().isEmpty();
-			case UmaPackage.TEAM_PROFILE__SUPER_TEAM:
-				return !getSuperTeam().isEmpty();
-			case UmaPackage.TEAM_PROFILE__SUB_TEAM:
-				return !getSubTeam().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group1: ");
-		result.append(group1);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TeamProfileImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TemplateImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TemplateImpl.java
deleted file mode 100755
index 9853712..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TemplateImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TemplateImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.Template;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Template</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class TemplateImpl extends GuidanceImpl implements Template {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TemplateImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TEMPLATE;
-	}
-
-} //TemplateImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TermDefinitionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TermDefinitionImpl.java
deleted file mode 100755
index bb50bc9..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/TermDefinitionImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TermDefinitionImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.TermDefinition;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Term Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class TermDefinitionImpl extends GuidanceImpl implements TermDefinition {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TermDefinitionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TERM_DEFINITION;
-	}
-
-} //TermDefinitionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ToolImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ToolImpl.java
deleted file mode 100755
index bd482fc..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ToolImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ToolImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.Tool;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tool</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ToolImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.ToolImpl#getToolMentor <em>Tool Mentor</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ToolImpl extends ContentCategoryImpl implements Tool {
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ToolImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TOOL;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.TOOL__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getToolMentor() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.TOOL__TOOL_MENTOR);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.TOOL__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.TOOL__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.TOOL__TOOL_MENTOR:
-				return getToolMentor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.TOOL__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.TOOL__TOOL_MENTOR:
-				getToolMentor().clear();
-				getToolMentor().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.TOOL__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.TOOL__TOOL_MENTOR:
-				getToolMentor().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.TOOL__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.TOOL__TOOL_MENTOR:
-				return !getToolMentor().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ToolImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ToolMentorImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ToolMentorImpl.java
deleted file mode 100755
index 1633a88..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/ToolMentorImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ToolMentorImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.ToolMentor;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tool Mentor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ToolMentorImpl extends GuidanceImpl implements ToolMentor {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ToolMentorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.TOOL_MENTOR;
-	}
-
-} //ToolMentorImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/UmaFactoryImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/UmaFactoryImpl.java
deleted file mode 100755
index daab7dd..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/UmaFactoryImpl.java
+++ /dev/null
@@ -1,1210 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UmaFactoryImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.epf.xml.uma.Activity;
-import org.eclipse.epf.xml.uma.ActivityDescription;
-import org.eclipse.epf.xml.uma.Artifact;
-import org.eclipse.epf.xml.uma.ArtifactDescription;
-import org.eclipse.epf.xml.uma.BreakdownElement;
-import org.eclipse.epf.xml.uma.BreakdownElementDescription;
-import org.eclipse.epf.xml.uma.CapabilityPattern;
-import org.eclipse.epf.xml.uma.Checklist;
-import org.eclipse.epf.xml.uma.CompositeRole;
-import org.eclipse.epf.xml.uma.Concept;
-import org.eclipse.epf.xml.uma.Constraint;
-import org.eclipse.epf.xml.uma.ContentCategory;
-import org.eclipse.epf.xml.uma.ContentCategoryPackage;
-import org.eclipse.epf.xml.uma.ContentDescription;
-import org.eclipse.epf.xml.uma.ContentElement;
-import org.eclipse.epf.xml.uma.ContentPackage;
-import org.eclipse.epf.xml.uma.CustomCategory;
-import org.eclipse.epf.xml.uma.Deliverable;
-import org.eclipse.epf.xml.uma.DeliverableDescription;
-import org.eclipse.epf.xml.uma.DeliveryProcess;
-import org.eclipse.epf.xml.uma.DeliveryProcessDescription;
-import org.eclipse.epf.xml.uma.DescribableElement;
-import org.eclipse.epf.xml.uma.Descriptor;
-import org.eclipse.epf.xml.uma.DescriptorDescription;
-import org.eclipse.epf.xml.uma.Discipline;
-import org.eclipse.epf.xml.uma.DisciplineGrouping;
-import org.eclipse.epf.xml.uma.DocumentRoot;
-import org.eclipse.epf.xml.uma.Domain;
-import org.eclipse.epf.xml.uma.Element;
-import org.eclipse.epf.xml.uma.Estimate;
-import org.eclipse.epf.xml.uma.EstimatingMetric;
-import org.eclipse.epf.xml.uma.EstimationConsiderations;
-import org.eclipse.epf.xml.uma.Example;
-import org.eclipse.epf.xml.uma.Guidance;
-import org.eclipse.epf.xml.uma.GuidanceDescription;
-import org.eclipse.epf.xml.uma.Guideline;
-import org.eclipse.epf.xml.uma.Iteration;
-import org.eclipse.epf.xml.uma.MethodConfiguration;
-import org.eclipse.epf.xml.uma.MethodElement;
-import org.eclipse.epf.xml.uma.MethodLibrary;
-import org.eclipse.epf.xml.uma.MethodPackage;
-import org.eclipse.epf.xml.uma.MethodPlugin;
-import org.eclipse.epf.xml.uma.MethodUnit;
-import org.eclipse.epf.xml.uma.Milestone;
-import org.eclipse.epf.xml.uma.NamedElement;
-import org.eclipse.epf.xml.uma.Outcome;
-import org.eclipse.epf.xml.uma.PackageableElement;
-import org.eclipse.epf.xml.uma.Phase;
-import org.eclipse.epf.xml.uma.PlanningData;
-import org.eclipse.epf.xml.uma.Practice;
-import org.eclipse.epf.xml.uma.PracticeDescription;
-import org.eclipse.epf.xml.uma.ProcessComponent;
-import org.eclipse.epf.xml.uma.ProcessComponentInterface;
-import org.eclipse.epf.xml.uma.ProcessDescription;
-import org.eclipse.epf.xml.uma.ProcessElement;
-import org.eclipse.epf.xml.uma.ProcessPackage;
-import org.eclipse.epf.xml.uma.ProcessPlanningTemplate;
-import org.eclipse.epf.xml.uma.Report;
-import org.eclipse.epf.xml.uma.ReusableAsset;
-import org.eclipse.epf.xml.uma.Roadmap;
-import org.eclipse.epf.xml.uma.Role;
-import org.eclipse.epf.xml.uma.RoleDescription;
-import org.eclipse.epf.xml.uma.RoleDescriptor;
-import org.eclipse.epf.xml.uma.RoleSet;
-import org.eclipse.epf.xml.uma.RoleSetGrouping;
-import org.eclipse.epf.xml.uma.Section;
-import org.eclipse.epf.xml.uma.SupportingMaterial;
-import org.eclipse.epf.xml.uma.Task;
-import org.eclipse.epf.xml.uma.TaskDescription;
-import org.eclipse.epf.xml.uma.TaskDescriptor;
-import org.eclipse.epf.xml.uma.TeamProfile;
-import org.eclipse.epf.xml.uma.Template;
-import org.eclipse.epf.xml.uma.TermDefinition;
-import org.eclipse.epf.xml.uma.Tool;
-import org.eclipse.epf.xml.uma.ToolMentor;
-import org.eclipse.epf.xml.uma.UmaFactory;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.VariabilityType;
-import org.eclipse.epf.xml.uma.Whitepaper;
-import org.eclipse.epf.xml.uma.WorkBreakdownElement;
-import org.eclipse.epf.xml.uma.WorkDefinition;
-import org.eclipse.epf.xml.uma.WorkOrder;
-import org.eclipse.epf.xml.uma.WorkOrderType;
-import org.eclipse.epf.xml.uma.WorkProduct;
-import org.eclipse.epf.xml.uma.WorkProductDescription;
-import org.eclipse.epf.xml.uma.WorkProductDescriptor;
-import org.eclipse.epf.xml.uma.WorkProductType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class UmaFactoryImpl extends EFactoryImpl implements UmaFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static UmaFactory init() {
-		try {
-			UmaFactory theUmaFactory = (UmaFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/epf/uma/1.0.3"); 
-			if (theUmaFactory != null) {
-				return theUmaFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new UmaFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UmaFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case UmaPackage.ACTIVITY: return (EObject)createActivity();
-			case UmaPackage.ACTIVITY_DESCRIPTION: return (EObject)createActivityDescription();
-			case UmaPackage.ARTIFACT: return (EObject)createArtifact();
-			case UmaPackage.ARTIFACT_DESCRIPTION: return (EObject)createArtifactDescription();
-			case UmaPackage.BREAKDOWN_ELEMENT: return (EObject)createBreakdownElement();
-			case UmaPackage.BREAKDOWN_ELEMENT_DESCRIPTION: return (EObject)createBreakdownElementDescription();
-			case UmaPackage.CAPABILITY_PATTERN: return (EObject)createCapabilityPattern();
-			case UmaPackage.CHECKLIST: return (EObject)createChecklist();
-			case UmaPackage.COMPOSITE_ROLE: return (EObject)createCompositeRole();
-			case UmaPackage.CONCEPT: return (EObject)createConcept();
-			case UmaPackage.CONSTRAINT: return (EObject)createConstraint();
-			case UmaPackage.CONTENT_CATEGORY: return (EObject)createContentCategory();
-			case UmaPackage.CONTENT_CATEGORY_PACKAGE: return (EObject)createContentCategoryPackage();
-			case UmaPackage.CONTENT_DESCRIPTION: return (EObject)createContentDescription();
-			case UmaPackage.CONTENT_ELEMENT: return (EObject)createContentElement();
-			case UmaPackage.CONTENT_PACKAGE: return (EObject)createContentPackage();
-			case UmaPackage.CUSTOM_CATEGORY: return (EObject)createCustomCategory();
-			case UmaPackage.DELIVERABLE: return (EObject)createDeliverable();
-			case UmaPackage.DELIVERABLE_DESCRIPTION: return (EObject)createDeliverableDescription();
-			case UmaPackage.DELIVERY_PROCESS: return (EObject)createDeliveryProcess();
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION: return (EObject)createDeliveryProcessDescription();
-			case UmaPackage.DESCRIBABLE_ELEMENT: return (EObject)createDescribableElement();
-			case UmaPackage.DESCRIPTOR: return (EObject)createDescriptor();
-			case UmaPackage.DESCRIPTOR_DESCRIPTION: return (EObject)createDescriptorDescription();
-			case UmaPackage.DISCIPLINE: return (EObject)createDiscipline();
-			case UmaPackage.DISCIPLINE_GROUPING: return (EObject)createDisciplineGrouping();
-			case UmaPackage.DOCUMENT_ROOT: return (EObject)createDocumentRoot();
-			case UmaPackage.DOMAIN: return (EObject)createDomain();
-			case UmaPackage.ELEMENT: return (EObject)createElement();
-			case UmaPackage.ESTIMATE: return (EObject)createEstimate();
-			case UmaPackage.ESTIMATING_METRIC: return (EObject)createEstimatingMetric();
-			case UmaPackage.ESTIMATION_CONSIDERATIONS: return (EObject)createEstimationConsiderations();
-			case UmaPackage.EXAMPLE: return (EObject)createExample();
-			case UmaPackage.GUIDANCE: return (EObject)createGuidance();
-			case UmaPackage.GUIDANCE_DESCRIPTION: return (EObject)createGuidanceDescription();
-			case UmaPackage.GUIDELINE: return (EObject)createGuideline();
-			case UmaPackage.ITERATION: return (EObject)createIteration();
-			case UmaPackage.METHOD_CONFIGURATION: return (EObject)createMethodConfiguration();
-			case UmaPackage.METHOD_ELEMENT: return (EObject)createMethodElement();
-			case UmaPackage.METHOD_LIBRARY: return (EObject)createMethodLibrary();
-			case UmaPackage.METHOD_PACKAGE: return (EObject)createMethodPackage();
-			case UmaPackage.METHOD_PLUGIN: return (EObject)createMethodPlugin();
-			case UmaPackage.METHOD_UNIT: return (EObject)createMethodUnit();
-			case UmaPackage.MILESTONE: return (EObject)createMilestone();
-			case UmaPackage.NAMED_ELEMENT: return (EObject)createNamedElement();
-			case UmaPackage.OUTCOME: return (EObject)createOutcome();
-			case UmaPackage.PACKAGEABLE_ELEMENT: return (EObject)createPackageableElement();
-			case UmaPackage.PHASE: return (EObject)createPhase();
-			case UmaPackage.PLANNING_DATA: return (EObject)createPlanningData();
-			case UmaPackage.PRACTICE: return (EObject)createPractice();
-			case UmaPackage.PRACTICE_DESCRIPTION: return (EObject)createPracticeDescription();
-			case UmaPackage.PROCESS: return (EObject)createProcess();
-			case UmaPackage.PROCESS_COMPONENT: return (EObject)createProcessComponent();
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE: return (EObject)createProcessComponentInterface();
-			case UmaPackage.PROCESS_DESCRIPTION: return (EObject)createProcessDescription();
-			case UmaPackage.PROCESS_ELEMENT: return (EObject)createProcessElement();
-			case UmaPackage.PROCESS_PACKAGE: return (EObject)createProcessPackage();
-			case UmaPackage.PROCESS_PLANNING_TEMPLATE: return (EObject)createProcessPlanningTemplate();
-			case UmaPackage.REPORT: return (EObject)createReport();
-			case UmaPackage.REUSABLE_ASSET: return (EObject)createReusableAsset();
-			case UmaPackage.ROADMAP: return (EObject)createRoadmap();
-			case UmaPackage.ROLE: return (EObject)createRole();
-			case UmaPackage.ROLE_DESCRIPTION: return (EObject)createRoleDescription();
-			case UmaPackage.ROLE_DESCRIPTOR: return (EObject)createRoleDescriptor();
-			case UmaPackage.ROLE_SET: return (EObject)createRoleSet();
-			case UmaPackage.ROLE_SET_GROUPING: return (EObject)createRoleSetGrouping();
-			case UmaPackage.SECTION: return (EObject)createSection();
-			case UmaPackage.SUPPORTING_MATERIAL: return (EObject)createSupportingMaterial();
-			case UmaPackage.TASK: return (EObject)createTask();
-			case UmaPackage.TASK_DESCRIPTION: return (EObject)createTaskDescription();
-			case UmaPackage.TASK_DESCRIPTOR: return (EObject)createTaskDescriptor();
-			case UmaPackage.TEAM_PROFILE: return (EObject)createTeamProfile();
-			case UmaPackage.TEMPLATE: return (EObject)createTemplate();
-			case UmaPackage.TERM_DEFINITION: return (EObject)createTermDefinition();
-			case UmaPackage.TOOL: return (EObject)createTool();
-			case UmaPackage.TOOL_MENTOR: return (EObject)createToolMentor();
-			case UmaPackage.WHITEPAPER: return (EObject)createWhitepaper();
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT: return (EObject)createWorkBreakdownElement();
-			case UmaPackage.WORK_DEFINITION: return (EObject)createWorkDefinition();
-			case UmaPackage.WORK_ORDER: return (EObject)createWorkOrder();
-			case UmaPackage.WORK_PRODUCT: return (EObject)createWorkProduct();
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION: return (EObject)createWorkProductDescription();
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR: return (EObject)createWorkProductDescriptor();
-			case UmaPackage.WORK_PRODUCT_TYPE: return (EObject)createWorkProductType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case UmaPackage.VARIABILITY_TYPE:
-				return createVariabilityTypeFromString(eDataType, initialValue);
-			case UmaPackage.WORK_ORDER_TYPE:
-				return createWorkOrderTypeFromString(eDataType, initialValue);
-			case UmaPackage.VARIABILITY_TYPE_OBJECT:
-				return createVariabilityTypeObjectFromString(eDataType, initialValue);
-			case UmaPackage.WORK_ORDER_TYPE_OBJECT:
-				return createWorkOrderTypeObjectFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case UmaPackage.VARIABILITY_TYPE:
-				return convertVariabilityTypeToString(eDataType, instanceValue);
-			case UmaPackage.WORK_ORDER_TYPE:
-				return convertWorkOrderTypeToString(eDataType, instanceValue);
-			case UmaPackage.VARIABILITY_TYPE_OBJECT:
-				return convertVariabilityTypeObjectToString(eDataType, instanceValue);
-			case UmaPackage.WORK_ORDER_TYPE_OBJECT:
-				return convertWorkOrderTypeObjectToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Activity createActivity() {
-		ActivityImpl activity = new ActivityImpl();
-		return activity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivityDescription createActivityDescription() {
-		ActivityDescriptionImpl activityDescription = new ActivityDescriptionImpl();
-		return activityDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Artifact createArtifact() {
-		ArtifactImpl artifact = new ArtifactImpl();
-		return artifact;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ArtifactDescription createArtifactDescription() {
-		ArtifactDescriptionImpl artifactDescription = new ArtifactDescriptionImpl();
-		return artifactDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BreakdownElement createBreakdownElement() {
-		BreakdownElementImpl breakdownElement = new BreakdownElementImpl();
-		return breakdownElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BreakdownElementDescription createBreakdownElementDescription() {
-		BreakdownElementDescriptionImpl breakdownElementDescription = new BreakdownElementDescriptionImpl();
-		return breakdownElementDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CapabilityPattern createCapabilityPattern() {
-		CapabilityPatternImpl capabilityPattern = new CapabilityPatternImpl();
-		return capabilityPattern;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Checklist createChecklist() {
-		ChecklistImpl checklist = new ChecklistImpl();
-		return checklist;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CompositeRole createCompositeRole() {
-		CompositeRoleImpl compositeRole = new CompositeRoleImpl();
-		return compositeRole;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Concept createConcept() {
-		ConceptImpl concept = new ConceptImpl();
-		return concept;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint createConstraint() {
-		ConstraintImpl constraint = new ConstraintImpl();
-		return constraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContentCategory createContentCategory() {
-		ContentCategoryImpl contentCategory = new ContentCategoryImpl();
-		return contentCategory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContentCategoryPackage createContentCategoryPackage() {
-		ContentCategoryPackageImpl contentCategoryPackage = new ContentCategoryPackageImpl();
-		return contentCategoryPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContentDescription createContentDescription() {
-		ContentDescriptionImpl contentDescription = new ContentDescriptionImpl();
-		return contentDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContentElement createContentElement() {
-		ContentElementImpl contentElement = new ContentElementImpl();
-		return contentElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContentPackage createContentPackage() {
-		ContentPackageImpl contentPackage = new ContentPackageImpl();
-		return contentPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomCategory createCustomCategory() {
-		CustomCategoryImpl customCategory = new CustomCategoryImpl();
-		return customCategory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Deliverable createDeliverable() {
-		DeliverableImpl deliverable = new DeliverableImpl();
-		return deliverable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DeliverableDescription createDeliverableDescription() {
-		DeliverableDescriptionImpl deliverableDescription = new DeliverableDescriptionImpl();
-		return deliverableDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DeliveryProcess createDeliveryProcess() {
-		DeliveryProcessImpl deliveryProcess = new DeliveryProcessImpl();
-		return deliveryProcess;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DeliveryProcessDescription createDeliveryProcessDescription() {
-		DeliveryProcessDescriptionImpl deliveryProcessDescription = new DeliveryProcessDescriptionImpl();
-		return deliveryProcessDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DescribableElement createDescribableElement() {
-		DescribableElementImpl describableElement = new DescribableElementImpl();
-		return describableElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Descriptor createDescriptor() {
-		DescriptorImpl descriptor = new DescriptorImpl();
-		return descriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DescriptorDescription createDescriptorDescription() {
-		DescriptorDescriptionImpl descriptorDescription = new DescriptorDescriptionImpl();
-		return descriptorDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Discipline createDiscipline() {
-		DisciplineImpl discipline = new DisciplineImpl();
-		return discipline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DisciplineGrouping createDisciplineGrouping() {
-		DisciplineGroupingImpl disciplineGrouping = new DisciplineGroupingImpl();
-		return disciplineGrouping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DocumentRoot createDocumentRoot() {
-		DocumentRootImpl documentRoot = new DocumentRootImpl();
-		return documentRoot;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Domain createDomain() {
-		DomainImpl domain = new DomainImpl();
-		return domain;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Element createElement() {
-		ElementImpl element = new ElementImpl();
-		return element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Estimate createEstimate() {
-		EstimateImpl estimate = new EstimateImpl();
-		return estimate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EstimatingMetric createEstimatingMetric() {
-		EstimatingMetricImpl estimatingMetric = new EstimatingMetricImpl();
-		return estimatingMetric;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EstimationConsiderations createEstimationConsiderations() {
-		EstimationConsiderationsImpl estimationConsiderations = new EstimationConsiderationsImpl();
-		return estimationConsiderations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Example createExample() {
-		ExampleImpl example = new ExampleImpl();
-		return example;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Guidance createGuidance() {
-		GuidanceImpl guidance = new GuidanceImpl();
-		return guidance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GuidanceDescription createGuidanceDescription() {
-		GuidanceDescriptionImpl guidanceDescription = new GuidanceDescriptionImpl();
-		return guidanceDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Guideline createGuideline() {
-		GuidelineImpl guideline = new GuidelineImpl();
-		return guideline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Iteration createIteration() {
-		IterationImpl iteration = new IterationImpl();
-		return iteration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodConfiguration createMethodConfiguration() {
-		MethodConfigurationImpl methodConfiguration = new MethodConfigurationImpl();
-		return methodConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodElement createMethodElement() {
-		MethodElementImpl methodElement = new MethodElementImpl();
-		return methodElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodLibrary createMethodLibrary() {
-		MethodLibraryImpl methodLibrary = new MethodLibraryImpl();
-		return methodLibrary;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodPackage createMethodPackage() {
-		MethodPackageImpl methodPackage = new MethodPackageImpl();
-		return methodPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodPlugin createMethodPlugin() {
-		MethodPluginImpl methodPlugin = new MethodPluginImpl();
-		return methodPlugin;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodUnit createMethodUnit() {
-		MethodUnitImpl methodUnit = new MethodUnitImpl();
-		return methodUnit;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Milestone createMilestone() {
-		MilestoneImpl milestone = new MilestoneImpl();
-		return milestone;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NamedElement createNamedElement() {
-		NamedElementImpl namedElement = new NamedElementImpl();
-		return namedElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Outcome createOutcome() {
-		OutcomeImpl outcome = new OutcomeImpl();
-		return outcome;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PackageableElement createPackageableElement() {
-		PackageableElementImpl packageableElement = new PackageableElementImpl();
-		return packageableElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Phase createPhase() {
-		PhaseImpl phase = new PhaseImpl();
-		return phase;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PlanningData createPlanningData() {
-		PlanningDataImpl planningData = new PlanningDataImpl();
-		return planningData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Practice createPractice() {
-		PracticeImpl practice = new PracticeImpl();
-		return practice;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PracticeDescription createPracticeDescription() {
-		PracticeDescriptionImpl practiceDescription = new PracticeDescriptionImpl();
-		return practiceDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public org.eclipse.epf.xml.uma.Process createProcess() {
-		ProcessImpl process = new ProcessImpl();
-		return process;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessComponent createProcessComponent() {
-		ProcessComponentImpl processComponent = new ProcessComponentImpl();
-		return processComponent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessComponentInterface createProcessComponentInterface() {
-		ProcessComponentInterfaceImpl processComponentInterface = new ProcessComponentInterfaceImpl();
-		return processComponentInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessDescription createProcessDescription() {
-		ProcessDescriptionImpl processDescription = new ProcessDescriptionImpl();
-		return processDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessElement createProcessElement() {
-		ProcessElementImpl processElement = new ProcessElementImpl();
-		return processElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessPackage createProcessPackage() {
-		ProcessPackageImpl processPackage = new ProcessPackageImpl();
-		return processPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProcessPlanningTemplate createProcessPlanningTemplate() {
-		ProcessPlanningTemplateImpl processPlanningTemplate = new ProcessPlanningTemplateImpl();
-		return processPlanningTemplate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Report createReport() {
-		ReportImpl report = new ReportImpl();
-		return report;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReusableAsset createReusableAsset() {
-		ReusableAssetImpl reusableAsset = new ReusableAssetImpl();
-		return reusableAsset;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Roadmap createRoadmap() {
-		RoadmapImpl roadmap = new RoadmapImpl();
-		return roadmap;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Role createRole() {
-		RoleImpl role = new RoleImpl();
-		return role;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleDescription createRoleDescription() {
-		RoleDescriptionImpl roleDescription = new RoleDescriptionImpl();
-		return roleDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleDescriptor createRoleDescriptor() {
-		RoleDescriptorImpl roleDescriptor = new RoleDescriptorImpl();
-		return roleDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleSet createRoleSet() {
-		RoleSetImpl roleSet = new RoleSetImpl();
-		return roleSet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleSetGrouping createRoleSetGrouping() {
-		RoleSetGroupingImpl roleSetGrouping = new RoleSetGroupingImpl();
-		return roleSetGrouping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Section createSection() {
-		SectionImpl section = new SectionImpl();
-		return section;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SupportingMaterial createSupportingMaterial() {
-		SupportingMaterialImpl supportingMaterial = new SupportingMaterialImpl();
-		return supportingMaterial;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Task createTask() {
-		TaskImpl task = new TaskImpl();
-		return task;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskDescription createTaskDescription() {
-		TaskDescriptionImpl taskDescription = new TaskDescriptionImpl();
-		return taskDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskDescriptor createTaskDescriptor() {
-		TaskDescriptorImpl taskDescriptor = new TaskDescriptorImpl();
-		return taskDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TeamProfile createTeamProfile() {
-		TeamProfileImpl teamProfile = new TeamProfileImpl();
-		return teamProfile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Template createTemplate() {
-		TemplateImpl template = new TemplateImpl();
-		return template;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TermDefinition createTermDefinition() {
-		TermDefinitionImpl termDefinition = new TermDefinitionImpl();
-		return termDefinition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Tool createTool() {
-		ToolImpl tool = new ToolImpl();
-		return tool;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ToolMentor createToolMentor() {
-		ToolMentorImpl toolMentor = new ToolMentorImpl();
-		return toolMentor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Whitepaper createWhitepaper() {
-		WhitepaperImpl whitepaper = new WhitepaperImpl();
-		return whitepaper;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkBreakdownElement createWorkBreakdownElement() {
-		WorkBreakdownElementImpl workBreakdownElement = new WorkBreakdownElementImpl();
-		return workBreakdownElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkDefinition createWorkDefinition() {
-		WorkDefinitionImpl workDefinition = new WorkDefinitionImpl();
-		return workDefinition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkOrder createWorkOrder() {
-		WorkOrderImpl workOrder = new WorkOrderImpl();
-		return workOrder;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProduct createWorkProduct() {
-		WorkProductImpl workProduct = new WorkProductImpl();
-		return workProduct;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProductDescription createWorkProductDescription() {
-		WorkProductDescriptionImpl workProductDescription = new WorkProductDescriptionImpl();
-		return workProductDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProductDescriptor createWorkProductDescriptor() {
-		WorkProductDescriptorImpl workProductDescriptor = new WorkProductDescriptorImpl();
-		return workProductDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkProductType createWorkProductType() {
-		WorkProductTypeImpl workProductType = new WorkProductTypeImpl();
-		return workProductType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityType createVariabilityTypeFromString(EDataType eDataType, String initialValue) {
-		VariabilityType result = VariabilityType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertVariabilityTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkOrderType createWorkOrderTypeFromString(EDataType eDataType, String initialValue) {
-		WorkOrderType result = WorkOrderType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertWorkOrderTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VariabilityType createVariabilityTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (VariabilityType)createVariabilityTypeFromString(UmaPackage.Literals.VARIABILITY_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertVariabilityTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertVariabilityTypeToString(UmaPackage.Literals.VARIABILITY_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkOrderType createWorkOrderTypeObjectFromString(EDataType eDataType, String initialValue) {
-		return (WorkOrderType)createWorkOrderTypeFromString(UmaPackage.Literals.WORK_ORDER_TYPE, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertWorkOrderTypeObjectToString(EDataType eDataType, Object instanceValue) {
-		return convertWorkOrderTypeToString(UmaPackage.Literals.WORK_ORDER_TYPE, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UmaPackage getUmaPackage() {
-		return (UmaPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static UmaPackage getPackage() {
-		return UmaPackage.eINSTANCE;
-	}
-
-} //UmaFactoryImpl
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/UmaPackageImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/UmaPackageImpl.java
deleted file mode 100755
index 1dc3e3c..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/UmaPackageImpl.java
+++ /dev/null
@@ -1,6890 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UmaPackageImpl.java,v 1.6 2006/09/08 00:59:26 jxi Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.epf.xml.uma.Activity;
-import org.eclipse.epf.xml.uma.ActivityDescription;
-import org.eclipse.epf.xml.uma.Artifact;
-import org.eclipse.epf.xml.uma.ArtifactDescription;
-import org.eclipse.epf.xml.uma.BreakdownElement;
-import org.eclipse.epf.xml.uma.BreakdownElementDescription;
-import org.eclipse.epf.xml.uma.CapabilityPattern;
-import org.eclipse.epf.xml.uma.Checklist;
-import org.eclipse.epf.xml.uma.CompositeRole;
-import org.eclipse.epf.xml.uma.Concept;
-import org.eclipse.epf.xml.uma.Constraint;
-import org.eclipse.epf.xml.uma.ContentCategory;
-import org.eclipse.epf.xml.uma.ContentCategoryPackage;
-import org.eclipse.epf.xml.uma.ContentDescription;
-import org.eclipse.epf.xml.uma.ContentElement;
-import org.eclipse.epf.xml.uma.ContentPackage;
-import org.eclipse.epf.xml.uma.CustomCategory;
-import org.eclipse.epf.xml.uma.Deliverable;
-import org.eclipse.epf.xml.uma.DeliverableDescription;
-import org.eclipse.epf.xml.uma.DeliveryProcess;
-import org.eclipse.epf.xml.uma.DeliveryProcessDescription;
-import org.eclipse.epf.xml.uma.DescribableElement;
-import org.eclipse.epf.xml.uma.DescriptorDescription;
-import org.eclipse.epf.xml.uma.Discipline;
-import org.eclipse.epf.xml.uma.DisciplineGrouping;
-import org.eclipse.epf.xml.uma.DocumentRoot;
-import org.eclipse.epf.xml.uma.Domain;
-import org.eclipse.epf.xml.uma.Element;
-import org.eclipse.epf.xml.uma.Estimate;
-import org.eclipse.epf.xml.uma.EstimatingMetric;
-import org.eclipse.epf.xml.uma.EstimationConsiderations;
-import org.eclipse.epf.xml.uma.Example;
-import org.eclipse.epf.xml.uma.Guidance;
-import org.eclipse.epf.xml.uma.GuidanceDescription;
-import org.eclipse.epf.xml.uma.Guideline;
-import org.eclipse.epf.xml.uma.Iteration;
-import org.eclipse.epf.xml.uma.MethodConfiguration;
-import org.eclipse.epf.xml.uma.MethodElement;
-import org.eclipse.epf.xml.uma.MethodLibrary;
-import org.eclipse.epf.xml.uma.MethodPackage;
-import org.eclipse.epf.xml.uma.MethodPlugin;
-import org.eclipse.epf.xml.uma.MethodUnit;
-import org.eclipse.epf.xml.uma.Milestone;
-import org.eclipse.epf.xml.uma.NamedElement;
-import org.eclipse.epf.xml.uma.Outcome;
-import org.eclipse.epf.xml.uma.PackageableElement;
-import org.eclipse.epf.xml.uma.Phase;
-import org.eclipse.epf.xml.uma.PlanningData;
-import org.eclipse.epf.xml.uma.Practice;
-import org.eclipse.epf.xml.uma.PracticeDescription;
-import org.eclipse.epf.xml.uma.ProcessComponent;
-import org.eclipse.epf.xml.uma.ProcessComponentInterface;
-import org.eclipse.epf.xml.uma.ProcessDescription;
-import org.eclipse.epf.xml.uma.ProcessElement;
-import org.eclipse.epf.xml.uma.ProcessPackage;
-import org.eclipse.epf.xml.uma.ProcessPlanningTemplate;
-import org.eclipse.epf.xml.uma.Report;
-import org.eclipse.epf.xml.uma.ReusableAsset;
-import org.eclipse.epf.xml.uma.Roadmap;
-import org.eclipse.epf.xml.uma.Role;
-import org.eclipse.epf.xml.uma.RoleDescription;
-import org.eclipse.epf.xml.uma.RoleDescriptor;
-import org.eclipse.epf.xml.uma.RoleSet;
-import org.eclipse.epf.xml.uma.RoleSetGrouping;
-import org.eclipse.epf.xml.uma.Section;
-import org.eclipse.epf.xml.uma.SupportingMaterial;
-import org.eclipse.epf.xml.uma.Task;
-import org.eclipse.epf.xml.uma.TaskDescription;
-import org.eclipse.epf.xml.uma.TaskDescriptor;
-import org.eclipse.epf.xml.uma.TeamProfile;
-import org.eclipse.epf.xml.uma.Template;
-import org.eclipse.epf.xml.uma.TermDefinition;
-import org.eclipse.epf.xml.uma.Tool;
-import org.eclipse.epf.xml.uma.ToolMentor;
-import org.eclipse.epf.xml.uma.UmaFactory;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.VariabilityType;
-import org.eclipse.epf.xml.uma.Whitepaper;
-import org.eclipse.epf.xml.uma.WorkBreakdownElement;
-import org.eclipse.epf.xml.uma.WorkDefinition;
-import org.eclipse.epf.xml.uma.WorkOrder;
-import org.eclipse.epf.xml.uma.WorkOrderType;
-import org.eclipse.epf.xml.uma.WorkProduct;
-import org.eclipse.epf.xml.uma.WorkProductDescription;
-import org.eclipse.epf.xml.uma.WorkProductDescriptor;
-import org.eclipse.epf.xml.uma.WorkProductType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class UmaPackageImpl extends EPackageImpl implements UmaPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass activityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass activityDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass artifactEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass artifactDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass breakdownElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass breakdownElementDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass capabilityPatternEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass checklistEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass compositeRoleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass conceptEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass constraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass contentCategoryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass contentCategoryPackageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass contentDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass contentElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass contentPackageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass customCategoryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass deliverableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass deliverableDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass deliveryProcessEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass deliveryProcessDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass describableElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass descriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass descriptorDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass disciplineEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass disciplineGroupingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass documentRootEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass domainEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass elementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass estimateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass estimatingMetricEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass estimationConsiderationsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass exampleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass guidanceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass guidanceDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass guidelineEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass iterationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodLibraryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodPackageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodPluginEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodUnitEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass milestoneEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass namedElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass outcomeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass packageableElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass phaseEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass planningDataEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass practiceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass practiceDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processComponentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processComponentInterfaceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processPackageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass processPlanningTemplateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass reportEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass reusableAssetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roadmapEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleDescriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleSetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleSetGroupingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass sectionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass supportingMaterialEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass taskEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass taskDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass taskDescriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass teamProfileEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass templateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass termDefinitionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass toolEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass toolMentorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass whitepaperEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workBreakdownElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workDefinitionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workOrderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workProductEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workProductDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workProductDescriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workProductTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum variabilityTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum workOrderTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType variabilityTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType workOrderTypeObjectEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.epf.xml.uma.UmaPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private UmaPackageImpl() {
-		super(eNS_URI, UmaFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static UmaPackage init() {
-		if (isInited) return (UmaPackage)EPackage.Registry.INSTANCE.getEPackage(UmaPackage.eNS_URI);
-
-		// Obtain or create and register package
-		UmaPackageImpl theUmaPackage = (UmaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof UmaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new UmaPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theUmaPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theUmaPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theUmaPackage.freeze();
-
-		return theUmaPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getActivity() {
-		return activityEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivity_Precondition() {
-		return (EAttribute)activityEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivity_Postcondition() {
-		return (EAttribute)activityEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivity_Group2() {
-		return (EAttribute)activityEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivity_BreakdownElement() {
-		return (EReference)activityEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivity_Checklist() {
-		return (EAttribute)activityEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivity_Concept() {
-		return (EAttribute)activityEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivity_Example() {
-		return (EAttribute)activityEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivity_Guideline() {
-		return (EAttribute)activityEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivity_Roadmap() {
-		return (EAttribute)activityEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivity_ReusableAsset() {
-		return (EAttribute)activityEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivity_SupportingMaterial() {
-		return (EAttribute)activityEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivity_Whitepaper() {
-		return (EAttribute)activityEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivity_IsEnactable() {
-		return (EAttribute)activityEClass.getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivity_VariabilityBasedOnElement() {
-		return (EAttribute)activityEClass.getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivity_VariabilityType() {
-		return (EAttribute)activityEClass.getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getActivityDescription() {
-		return activityDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivityDescription_Alternatives() {
-		return (EAttribute)activityDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivityDescription_HowToStaff() {
-		return (EAttribute)activityDescriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivityDescription_Purpose() {
-		return (EAttribute)activityDescriptionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getArtifact() {
-		return artifactEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getArtifact_Group3() {
-		return (EAttribute)artifactEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getArtifact_ContainedArtifact() {
-		return (EReference)artifactEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getArtifactDescription() {
-		return artifactDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getArtifactDescription_BriefOutline() {
-		return (EAttribute)artifactDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getArtifactDescription_RepresentationOptions() {
-		return (EAttribute)artifactDescriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBreakdownElement() {
-		return breakdownElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBreakdownElement_PresentedAfter() {
-		return (EAttribute)breakdownElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBreakdownElement_PresentedBefore() {
-		return (EAttribute)breakdownElementEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBreakdownElement_PlanningData() {
-		return (EAttribute)breakdownElementEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBreakdownElement_SuperActivity() {
-		return (EAttribute)breakdownElementEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBreakdownElement_HasMultipleOccurrences() {
-		return (EAttribute)breakdownElementEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBreakdownElement_IsOptional() {
-		return (EAttribute)breakdownElementEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBreakdownElement_IsPlanned() {
-		return (EAttribute)breakdownElementEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBreakdownElement_Prefix() {
-		return (EAttribute)breakdownElementEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBreakdownElementDescription() {
-		return breakdownElementDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBreakdownElementDescription_UsageGuidance() {
-		return (EAttribute)breakdownElementDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCapabilityPattern() {
-		return capabilityPatternEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getChecklist() {
-		return checklistEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCompositeRole() {
-		return compositeRoleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCompositeRole_Group1() {
-		return (EAttribute)compositeRoleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCompositeRole_AggregatedRole() {
-		return (EReference)compositeRoleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getConcept() {
-		return conceptEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getConstraint() {
-		return constraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getConstraint_MainDescription() {
-		return (EAttribute)constraintEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getContentCategory() {
-		return contentCategoryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getContentCategoryPackage() {
-		return contentCategoryPackageEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentCategoryPackage_Group2() {
-		return (EAttribute)contentCategoryPackageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContentCategoryPackage_ContentCategory() {
-		return (EReference)contentCategoryPackageEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getContentDescription() {
-		return contentDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentDescription_MainDescription() {
-		return (EAttribute)contentDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentDescription_KeyConsiderations() {
-		return (EAttribute)contentDescriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContentDescription_Section() {
-		return (EReference)contentDescriptionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getContentElement() {
-		return contentElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentElement_Group1() {
-		return (EAttribute)contentElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentElement_Checklist() {
-		return (EAttribute)contentElementEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentElement_Concept() {
-		return (EAttribute)contentElementEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentElement_Example() {
-		return (EAttribute)contentElementEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentElement_Guideline() {
-		return (EAttribute)contentElementEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentElement_ReusableAsset() {
-		return (EAttribute)contentElementEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentElement_SupportingMaterial() {
-		return (EAttribute)contentElementEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentElement_Whitepaper() {
-		return (EAttribute)contentElementEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentElement_VariabilityBasedOnElement() {
-		return (EAttribute)contentElementEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentElement_VariabilityType() {
-		return (EAttribute)contentElementEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getContentPackage() {
-		return contentPackageEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContentPackage_Group2() {
-		return (EAttribute)contentPackageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContentPackage_ContentElement() {
-		return (EReference)contentPackageEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCustomCategory() {
-		return customCategoryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCustomCategory_Group2() {
-		return (EAttribute)customCategoryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCustomCategory_CategorizedElement() {
-		return (EAttribute)customCategoryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCustomCategory_SubCategory() {
-		return (EAttribute)customCategoryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDeliverable() {
-		return deliverableEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliverable_Group3() {
-		return (EAttribute)deliverableEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliverable_DeliveredWorkProduct() {
-		return (EAttribute)deliverableEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDeliverableDescription() {
-		return deliverableDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliverableDescription_ExternalDescription() {
-		return (EAttribute)deliverableDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliverableDescription_PackagingGuidance() {
-		return (EAttribute)deliverableDescriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDeliveryProcess() {
-		return deliveryProcessEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliveryProcess_Group3() {
-		return (EAttribute)deliveryProcessEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliveryProcess_CommunicationsMaterial() {
-		return (EAttribute)deliveryProcessEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliveryProcess_EducationMaterial() {
-		return (EAttribute)deliveryProcessEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDeliveryProcessDescription() {
-		return deliveryProcessDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliveryProcessDescription_Scale() {
-		return (EAttribute)deliveryProcessDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliveryProcessDescription_ProjectCharacteristics() {
-		return (EAttribute)deliveryProcessDescriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliveryProcessDescription_RiskLevel() {
-		return (EAttribute)deliveryProcessDescriptionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliveryProcessDescription_EstimatingTechnique() {
-		return (EAttribute)deliveryProcessDescriptionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliveryProcessDescription_ProjectMemberExpertise() {
-		return (EAttribute)deliveryProcessDescriptionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDeliveryProcessDescription_TypeOfContract() {
-		return (EAttribute)deliveryProcessDescriptionEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDescribableElement() {
-		return describableElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDescribableElement_Presentation() {
-		return (EReference)describableElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescribableElement_Nodeicon() {
-		return (EAttribute)describableElementEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescribableElement_PresentationName() {
-		return (EAttribute)describableElementEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescribableElement_Shapeicon() {
-		return (EAttribute)describableElementEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDescriptor() {
-		return descriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescriptor_IsSynchronizedWithSource() {
-		return (EAttribute)descriptorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDescriptorDescription() {
-		return descriptorDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescriptorDescription_RefinedDescription() {
-		return (EAttribute)descriptorDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDiscipline() {
-		return disciplineEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDiscipline_Group2() {
-		return (EAttribute)disciplineEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDiscipline_Task() {
-		return (EAttribute)disciplineEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiscipline_SubDiscipline() {
-		return (EReference)disciplineEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDiscipline_ReferenceWorkflow() {
-		return (EAttribute)disciplineEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDisciplineGrouping() {
-		return disciplineGroupingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDisciplineGrouping_Group2() {
-		return (EAttribute)disciplineGroupingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDisciplineGrouping_Discipline() {
-		return (EAttribute)disciplineGroupingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDocumentRoot() {
-		return documentRootEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDocumentRoot_Mixed() {
-		return (EAttribute)documentRootEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_XMLNSPrefixMap() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_XSISchemaLocation() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_MethodConfiguration() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_MethodLibrary() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDocumentRoot_MethodPlugin() {
-		return (EReference)documentRootEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDomain() {
-		return domainEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDomain_Group2() {
-		return (EAttribute)domainEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDomain_WorkProduct() {
-		return (EAttribute)domainEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDomain_Subdomain() {
-		return (EReference)domainEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getElement() {
-		return elementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEstimate() {
-		return estimateEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEstimate_Group2() {
-		return (EAttribute)estimateEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEstimate_EstimationMetric() {
-		return (EAttribute)estimateEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEstimate_EstimationConsiderations() {
-		return (EAttribute)estimateEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEstimatingMetric() {
-		return estimatingMetricEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEstimationConsiderations() {
-		return estimationConsiderationsEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExample() {
-		return exampleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGuidance() {
-		return guidanceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGuidanceDescription() {
-		return guidanceDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGuidanceDescription_Attachment() {
-		return (EAttribute)guidanceDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGuideline() {
-		return guidelineEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIteration() {
-		return iterationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodConfiguration() {
-		return methodConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodConfiguration_BaseConfiguration() {
-		return (EAttribute)methodConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodConfiguration_MethodPluginSelection() {
-		return (EAttribute)methodConfigurationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodConfiguration_MethodPackageSelection() {
-		return (EAttribute)methodConfigurationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodConfiguration_DefaultView() {
-		return (EAttribute)methodConfigurationEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodConfiguration_ProcessView() {
-		return (EAttribute)methodConfigurationEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodElement() {
-		return methodElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodElement_Group() {
-		return (EAttribute)methodElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodElement_OwnedRule() {
-		return (EReference)methodElementEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodElement_BriefDescription() {
-		return (EAttribute)methodElementEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodElement_Id() {
-		return (EAttribute)methodElementEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodElement_OrderingGuide() {
-		return (EAttribute)methodElementEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodElement_Suppressed() {
-		return (EAttribute)methodElementEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodLibrary() {
-		return methodLibraryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodLibrary_MethodPlugin() {
-		return (EReference)methodLibraryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodLibrary_MethodConfiguration() {
-		return (EReference)methodLibraryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodLibrary_Tool() {
-		return (EAttribute)methodLibraryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodPackage() {
-		return methodPackageEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodPackage_Group1() {
-		return (EAttribute)methodPackageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodPackage_ReusedPackage() {
-		return (EAttribute)methodPackageEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodPackage_MethodPackage() {
-		return (EReference)methodPackageEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodPackage_Global() {
-		return (EAttribute)methodPackageEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodPlugin() {
-		return methodPluginEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodPlugin_ReferencedMethodPlugin() {
-		return (EAttribute)methodPluginEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodPlugin_MethodPackage() {
-		return (EReference)methodPluginEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodPlugin_UserChangeable() {
-		return (EAttribute)methodPluginEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodUnit() {
-		return methodUnitEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodUnit_Copyright() {
-		return (EAttribute)methodUnitEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodUnit_Authors() {
-		return (EAttribute)methodUnitEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodUnit_ChangeDate() {
-		return (EAttribute)methodUnitEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodUnit_ChangeDescription() {
-		return (EAttribute)methodUnitEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodUnit_Version() {
-		return (EAttribute)methodUnitEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMilestone() {
-		return milestoneEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getNamedElement() {
-		return namedElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getNamedElement_Name() {
-		return (EAttribute)namedElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOutcome() {
-		return outcomeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPackageableElement() {
-		return packageableElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPhase() {
-		return phaseEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPlanningData() {
-		return planningDataEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPlanningData_FinishDate() {
-		return (EAttribute)planningDataEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPlanningData_Rank() {
-		return (EAttribute)planningDataEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPlanningData_StartDate() {
-		return (EAttribute)planningDataEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPractice() {
-		return practiceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPractice_Group2() {
-		return (EAttribute)practiceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPractice_ActivityReference() {
-		return (EAttribute)practiceEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPractice_ContentReference() {
-		return (EAttribute)practiceEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPractice_SubPractice() {
-		return (EReference)practiceEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPracticeDescription() {
-		return practiceDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPracticeDescription_AdditionalInfo() {
-		return (EAttribute)practiceDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPracticeDescription_Application() {
-		return (EAttribute)practiceDescriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPracticeDescription_Background() {
-		return (EAttribute)practiceDescriptionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPracticeDescription_Goals() {
-		return (EAttribute)practiceDescriptionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPracticeDescription_LevelsOfAdoption() {
-		return (EAttribute)practiceDescriptionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPracticeDescription_Problem() {
-		return (EAttribute)practiceDescriptionEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcess() {
-		return processEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcess_IncludesPattern() {
-		return (EAttribute)processEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcess_DefaultContext() {
-		return (EAttribute)processEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcess_ValidContext() {
-		return (EAttribute)processEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcessComponent() {
-		return processComponentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessComponent_Copyright() {
-		return (EAttribute)processComponentEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcessComponent_Interface() {
-		return (EReference)processComponentEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcessComponent_Process() {
-		return (EReference)processComponentEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessComponent_Authors() {
-		return (EAttribute)processComponentEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessComponent_ChangeDate() {
-		return (EAttribute)processComponentEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessComponent_ChangeDescription() {
-		return (EAttribute)processComponentEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessComponent_Version() {
-		return (EAttribute)processComponentEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcessComponentInterface() {
-		return processComponentInterfaceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessComponentInterface_Group1() {
-		return (EAttribute)processComponentInterfaceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcessComponentInterface_InterfaceSpecification() {
-		return (EReference)processComponentInterfaceEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcessComponentInterface_InterfaceIO() {
-		return (EReference)processComponentInterfaceEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcessDescription() {
-		return processDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessDescription_Scope() {
-		return (EAttribute)processDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessDescription_UsageNotes() {
-		return (EAttribute)processDescriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessDescription_ExternalId() {
-		return (EAttribute)processDescriptionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcessElement() {
-		return processElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcessPackage() {
-		return processPackageEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessPackage_Group2() {
-		return (EAttribute)processPackageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getProcessPackage_ProcessElement() {
-		return (EReference)processPackageEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcessPlanningTemplate() {
-		return processPlanningTemplateEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessPlanningTemplate_Group3() {
-		return (EAttribute)processPlanningTemplateEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessPlanningTemplate_BaseProcess() {
-		return (EAttribute)processPlanningTemplateEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getReport() {
-		return reportEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getReusableAsset() {
-		return reusableAssetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRoadmap() {
-		return roadmapEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRole() {
-		return roleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRole_Group2() {
-		return (EAttribute)roleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRole_ResponsibleFor() {
-		return (EAttribute)roleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRoleDescription() {
-		return roleDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRoleDescription_AssignmentApproaches() {
-		return (EAttribute)roleDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRoleDescription_Skills() {
-		return (EAttribute)roleDescriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRoleDescription_Synonyms() {
-		return (EAttribute)roleDescriptionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRoleDescriptor() {
-		return roleDescriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRoleDescriptor_Role() {
-		return (EAttribute)roleDescriptorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRoleDescriptor_ResponsibleFor() {
-		return (EAttribute)roleDescriptorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRoleSet() {
-		return roleSetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRoleSet_Group2() {
-		return (EAttribute)roleSetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRoleSet_Role() {
-		return (EAttribute)roleSetEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRoleSetGrouping() {
-		return roleSetGroupingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRoleSetGrouping_Group2() {
-		return (EAttribute)roleSetGroupingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRoleSetGrouping_RoleSet() {
-		return (EAttribute)roleSetGroupingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSection() {
-		return sectionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSection_SubSection() {
-		return (EReference)sectionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSection_Predecessor() {
-		return (EAttribute)sectionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSection_Description() {
-		return (EAttribute)sectionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSection_SectionName() {
-		return (EAttribute)sectionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSection_VariabilityBasedOnElement() {
-		return (EAttribute)sectionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSection_VariabilityType() {
-		return (EAttribute)sectionEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSupportingMaterial() {
-		return supportingMaterialEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTask() {
-		return taskEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Precondition() {
-		return (EAttribute)taskEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Postcondition() {
-		return (EAttribute)taskEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_PerformedBy() {
-		return (EAttribute)taskEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Group2() {
-		return (EAttribute)taskEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_MandatoryInput() {
-		return (EAttribute)taskEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Output() {
-		return (EAttribute)taskEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_AdditionallyPerformedBy() {
-		return (EAttribute)taskEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_OptionalInput() {
-		return (EAttribute)taskEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_Estimate() {
-		return (EAttribute)taskEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_EstimationConsiderations() {
-		return (EAttribute)taskEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTask_ToolMentor() {
-		return (EAttribute)taskEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTaskDescription() {
-		return taskDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskDescription_Alternatives() {
-		return (EAttribute)taskDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskDescription_Purpose() {
-		return (EAttribute)taskDescriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTaskDescriptor() {
-		return taskDescriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskDescriptor_Task() {
-		return (EAttribute)taskDescriptorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskDescriptor_PerformedPrimarilyBy() {
-		return (EAttribute)taskDescriptorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskDescriptor_Group2() {
-		return (EAttribute)taskDescriptorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskDescriptor_AdditionallyPerformedBy() {
-		return (EAttribute)taskDescriptorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskDescriptor_AssistedBy() {
-		return (EAttribute)taskDescriptorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskDescriptor_ExternalInput() {
-		return (EAttribute)taskDescriptorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskDescriptor_MandatoryInput() {
-		return (EAttribute)taskDescriptorEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskDescriptor_OptionalInput() {
-		return (EAttribute)taskDescriptorEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskDescriptor_Output() {
-		return (EAttribute)taskDescriptorEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTaskDescriptor_Step() {
-		return (EReference)taskDescriptorEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskDescriptor_IsSynchronizedWithSource() {
-		return (EAttribute)taskDescriptorEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTeamProfile() {
-		return teamProfileEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTeamProfile_Group1() {
-		return (EAttribute)teamProfileEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTeamProfile_Role() {
-		return (EAttribute)teamProfileEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTeamProfile_SuperTeam() {
-		return (EAttribute)teamProfileEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTeamProfile_SubTeam() {
-		return (EAttribute)teamProfileEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTemplate() {
-		return templateEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTermDefinition() {
-		return termDefinitionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTool() {
-		return toolEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTool_Group2() {
-		return (EAttribute)toolEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTool_ToolMentor() {
-		return (EAttribute)toolEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getToolMentor() {
-		return toolMentorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWhitepaper() {
-		return whitepaperEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkBreakdownElement() {
-		return workBreakdownElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkBreakdownElement_Group1() {
-		return (EAttribute)workBreakdownElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkBreakdownElement_Predecessor() {
-		return (EReference)workBreakdownElementEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkBreakdownElement_IsEventDriven() {
-		return (EAttribute)workBreakdownElementEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkBreakdownElement_IsOngoing() {
-		return (EAttribute)workBreakdownElementEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkBreakdownElement_IsRepeatable() {
-		return (EAttribute)workBreakdownElementEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkDefinition() {
-		return workDefinitionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkDefinition_Precondition() {
-		return (EAttribute)workDefinitionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkDefinition_Postcondition() {
-		return (EAttribute)workDefinitionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkOrder() {
-		return workOrderEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkOrder_Value() {
-		return (EAttribute)workOrderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkOrder_LinkType() {
-		return (EAttribute)workOrderEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkOrder_Id() {
-		return (EAttribute)workOrderEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkProduct() {
-		return workProductEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProduct_Group2() {
-		return (EAttribute)workProductEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProduct_Estimate() {
-		return (EAttribute)workProductEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProduct_EstimationConsiderations() {
-		return (EAttribute)workProductEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProduct_Report() {
-		return (EAttribute)workProductEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProduct_Template() {
-		return (EAttribute)workProductEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProduct_ToolMentor() {
-		return (EAttribute)workProductEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkProductDescription() {
-		return workProductDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescription_ImpactOfNotHaving() {
-		return (EAttribute)workProductDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescription_Purpose() {
-		return (EAttribute)workProductDescriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescription_ReasonsForNotNeeding() {
-		return (EAttribute)workProductDescriptionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescription_ExternalId() {
-		return (EAttribute)workProductDescriptionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkProductDescriptor() {
-		return workProductDescriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescriptor_WorkProduct() {
-		return (EAttribute)workProductDescriptorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescriptor_Group1() {
-		return (EAttribute)workProductDescriptorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescriptor_ImpactedBy() {
-		return (EAttribute)workProductDescriptorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescriptor_Impacts() {
-		return (EAttribute)workProductDescriptorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescriptor_DeliverableParts() {
-		return (EAttribute)workProductDescriptorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescriptor_ActivityEntryState() {
-		return (EAttribute)workProductDescriptorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductDescriptor_ActivityExitState() {
-		return (EAttribute)workProductDescriptorEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkProductType() {
-		return workProductTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductType_Group2() {
-		return (EAttribute)workProductTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWorkProductType_WorkProduct() {
-		return (EAttribute)workProductTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getVariabilityType() {
-		return variabilityTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getWorkOrderType() {
-		return workOrderTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getVariabilityTypeObject() {
-		return variabilityTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getWorkOrderTypeObject() {
-		return workOrderTypeObjectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UmaFactory getUmaFactory() {
-		return (UmaFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		activityEClass = createEClass(ACTIVITY);
-		createEAttribute(activityEClass, ACTIVITY__PRECONDITION);
-		createEAttribute(activityEClass, ACTIVITY__POSTCONDITION);
-		createEAttribute(activityEClass, ACTIVITY__GROUP2);
-		createEReference(activityEClass, ACTIVITY__BREAKDOWN_ELEMENT);
-		createEAttribute(activityEClass, ACTIVITY__CHECKLIST);
-		createEAttribute(activityEClass, ACTIVITY__CONCEPT);
-		createEAttribute(activityEClass, ACTIVITY__EXAMPLE);
-		createEAttribute(activityEClass, ACTIVITY__GUIDELINE);
-		createEAttribute(activityEClass, ACTIVITY__ROADMAP);
-		createEAttribute(activityEClass, ACTIVITY__REUSABLE_ASSET);
-		createEAttribute(activityEClass, ACTIVITY__SUPPORTING_MATERIAL);
-		createEAttribute(activityEClass, ACTIVITY__WHITEPAPER);
-		createEAttribute(activityEClass, ACTIVITY__IS_ENACTABLE);
-		createEAttribute(activityEClass, ACTIVITY__VARIABILITY_BASED_ON_ELEMENT);
-		createEAttribute(activityEClass, ACTIVITY__VARIABILITY_TYPE);
-
-		activityDescriptionEClass = createEClass(ACTIVITY_DESCRIPTION);
-		createEAttribute(activityDescriptionEClass, ACTIVITY_DESCRIPTION__ALTERNATIVES);
-		createEAttribute(activityDescriptionEClass, ACTIVITY_DESCRIPTION__HOW_TO_STAFF);
-		createEAttribute(activityDescriptionEClass, ACTIVITY_DESCRIPTION__PURPOSE);
-
-		artifactEClass = createEClass(ARTIFACT);
-		createEAttribute(artifactEClass, ARTIFACT__GROUP3);
-		createEReference(artifactEClass, ARTIFACT__CONTAINED_ARTIFACT);
-
-		artifactDescriptionEClass = createEClass(ARTIFACT_DESCRIPTION);
-		createEAttribute(artifactDescriptionEClass, ARTIFACT_DESCRIPTION__BRIEF_OUTLINE);
-		createEAttribute(artifactDescriptionEClass, ARTIFACT_DESCRIPTION__REPRESENTATION_OPTIONS);
-
-		breakdownElementEClass = createEClass(BREAKDOWN_ELEMENT);
-		createEAttribute(breakdownElementEClass, BREAKDOWN_ELEMENT__PRESENTED_AFTER);
-		createEAttribute(breakdownElementEClass, BREAKDOWN_ELEMENT__PRESENTED_BEFORE);
-		createEAttribute(breakdownElementEClass, BREAKDOWN_ELEMENT__PLANNING_DATA);
-		createEAttribute(breakdownElementEClass, BREAKDOWN_ELEMENT__SUPER_ACTIVITY);
-		createEAttribute(breakdownElementEClass, BREAKDOWN_ELEMENT__HAS_MULTIPLE_OCCURRENCES);
-		createEAttribute(breakdownElementEClass, BREAKDOWN_ELEMENT__IS_OPTIONAL);
-		createEAttribute(breakdownElementEClass, BREAKDOWN_ELEMENT__IS_PLANNED);
-		createEAttribute(breakdownElementEClass, BREAKDOWN_ELEMENT__PREFIX);
-
-		breakdownElementDescriptionEClass = createEClass(BREAKDOWN_ELEMENT_DESCRIPTION);
-		createEAttribute(breakdownElementDescriptionEClass, BREAKDOWN_ELEMENT_DESCRIPTION__USAGE_GUIDANCE);
-
-		capabilityPatternEClass = createEClass(CAPABILITY_PATTERN);
-
-		checklistEClass = createEClass(CHECKLIST);
-
-		compositeRoleEClass = createEClass(COMPOSITE_ROLE);
-		createEAttribute(compositeRoleEClass, COMPOSITE_ROLE__GROUP1);
-		createEReference(compositeRoleEClass, COMPOSITE_ROLE__AGGREGATED_ROLE);
-
-		conceptEClass = createEClass(CONCEPT);
-
-		constraintEClass = createEClass(CONSTRAINT);
-		createEAttribute(constraintEClass, CONSTRAINT__MAIN_DESCRIPTION);
-
-		contentCategoryEClass = createEClass(CONTENT_CATEGORY);
-
-		contentCategoryPackageEClass = createEClass(CONTENT_CATEGORY_PACKAGE);
-		createEAttribute(contentCategoryPackageEClass, CONTENT_CATEGORY_PACKAGE__GROUP2);
-		createEReference(contentCategoryPackageEClass, CONTENT_CATEGORY_PACKAGE__CONTENT_CATEGORY);
-
-		contentDescriptionEClass = createEClass(CONTENT_DESCRIPTION);
-		createEAttribute(contentDescriptionEClass, CONTENT_DESCRIPTION__MAIN_DESCRIPTION);
-		createEAttribute(contentDescriptionEClass, CONTENT_DESCRIPTION__KEY_CONSIDERATIONS);
-		createEReference(contentDescriptionEClass, CONTENT_DESCRIPTION__SECTION);
-
-		contentElementEClass = createEClass(CONTENT_ELEMENT);
-		createEAttribute(contentElementEClass, CONTENT_ELEMENT__GROUP1);
-		createEAttribute(contentElementEClass, CONTENT_ELEMENT__CHECKLIST);
-		createEAttribute(contentElementEClass, CONTENT_ELEMENT__CONCEPT);
-		createEAttribute(contentElementEClass, CONTENT_ELEMENT__EXAMPLE);
-		createEAttribute(contentElementEClass, CONTENT_ELEMENT__GUIDELINE);
-		createEAttribute(contentElementEClass, CONTENT_ELEMENT__REUSABLE_ASSET);
-		createEAttribute(contentElementEClass, CONTENT_ELEMENT__SUPPORTING_MATERIAL);
-		createEAttribute(contentElementEClass, CONTENT_ELEMENT__WHITEPAPER);
-		createEAttribute(contentElementEClass, CONTENT_ELEMENT__VARIABILITY_BASED_ON_ELEMENT);
-		createEAttribute(contentElementEClass, CONTENT_ELEMENT__VARIABILITY_TYPE);
-
-		contentPackageEClass = createEClass(CONTENT_PACKAGE);
-		createEAttribute(contentPackageEClass, CONTENT_PACKAGE__GROUP2);
-		createEReference(contentPackageEClass, CONTENT_PACKAGE__CONTENT_ELEMENT);
-
-		customCategoryEClass = createEClass(CUSTOM_CATEGORY);
-		createEAttribute(customCategoryEClass, CUSTOM_CATEGORY__GROUP2);
-		createEAttribute(customCategoryEClass, CUSTOM_CATEGORY__CATEGORIZED_ELEMENT);
-		createEAttribute(customCategoryEClass, CUSTOM_CATEGORY__SUB_CATEGORY);
-
-		deliverableEClass = createEClass(DELIVERABLE);
-		createEAttribute(deliverableEClass, DELIVERABLE__GROUP3);
-		createEAttribute(deliverableEClass, DELIVERABLE__DELIVERED_WORK_PRODUCT);
-
-		deliverableDescriptionEClass = createEClass(DELIVERABLE_DESCRIPTION);
-		createEAttribute(deliverableDescriptionEClass, DELIVERABLE_DESCRIPTION__EXTERNAL_DESCRIPTION);
-		createEAttribute(deliverableDescriptionEClass, DELIVERABLE_DESCRIPTION__PACKAGING_GUIDANCE);
-
-		deliveryProcessEClass = createEClass(DELIVERY_PROCESS);
-		createEAttribute(deliveryProcessEClass, DELIVERY_PROCESS__GROUP3);
-		createEAttribute(deliveryProcessEClass, DELIVERY_PROCESS__COMMUNICATIONS_MATERIAL);
-		createEAttribute(deliveryProcessEClass, DELIVERY_PROCESS__EDUCATION_MATERIAL);
-
-		deliveryProcessDescriptionEClass = createEClass(DELIVERY_PROCESS_DESCRIPTION);
-		createEAttribute(deliveryProcessDescriptionEClass, DELIVERY_PROCESS_DESCRIPTION__SCALE);
-		createEAttribute(deliveryProcessDescriptionEClass, DELIVERY_PROCESS_DESCRIPTION__PROJECT_CHARACTERISTICS);
-		createEAttribute(deliveryProcessDescriptionEClass, DELIVERY_PROCESS_DESCRIPTION__RISK_LEVEL);
-		createEAttribute(deliveryProcessDescriptionEClass, DELIVERY_PROCESS_DESCRIPTION__ESTIMATING_TECHNIQUE);
-		createEAttribute(deliveryProcessDescriptionEClass, DELIVERY_PROCESS_DESCRIPTION__PROJECT_MEMBER_EXPERTISE);
-		createEAttribute(deliveryProcessDescriptionEClass, DELIVERY_PROCESS_DESCRIPTION__TYPE_OF_CONTRACT);
-
-		describableElementEClass = createEClass(DESCRIBABLE_ELEMENT);
-		createEReference(describableElementEClass, DESCRIBABLE_ELEMENT__PRESENTATION);
-		createEAttribute(describableElementEClass, DESCRIBABLE_ELEMENT__NODEICON);
-		createEAttribute(describableElementEClass, DESCRIBABLE_ELEMENT__PRESENTATION_NAME);
-		createEAttribute(describableElementEClass, DESCRIBABLE_ELEMENT__SHAPEICON);
-
-		descriptorEClass = createEClass(DESCRIPTOR);
-		createEAttribute(descriptorEClass, DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE);
-
-		descriptorDescriptionEClass = createEClass(DESCRIPTOR_DESCRIPTION);
-		createEAttribute(descriptorDescriptionEClass, DESCRIPTOR_DESCRIPTION__REFINED_DESCRIPTION);
-
-		disciplineEClass = createEClass(DISCIPLINE);
-		createEAttribute(disciplineEClass, DISCIPLINE__GROUP2);
-		createEAttribute(disciplineEClass, DISCIPLINE__TASK);
-		createEReference(disciplineEClass, DISCIPLINE__SUB_DISCIPLINE);
-		createEAttribute(disciplineEClass, DISCIPLINE__REFERENCE_WORKFLOW);
-
-		disciplineGroupingEClass = createEClass(DISCIPLINE_GROUPING);
-		createEAttribute(disciplineGroupingEClass, DISCIPLINE_GROUPING__GROUP2);
-		createEAttribute(disciplineGroupingEClass, DISCIPLINE_GROUPING__DISCIPLINE);
-
-		documentRootEClass = createEClass(DOCUMENT_ROOT);
-		createEAttribute(documentRootEClass, DOCUMENT_ROOT__MIXED);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__METHOD_CONFIGURATION);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__METHOD_LIBRARY);
-		createEReference(documentRootEClass, DOCUMENT_ROOT__METHOD_PLUGIN);
-
-		domainEClass = createEClass(DOMAIN);
-		createEAttribute(domainEClass, DOMAIN__GROUP2);
-		createEAttribute(domainEClass, DOMAIN__WORK_PRODUCT);
-		createEReference(domainEClass, DOMAIN__SUBDOMAIN);
-
-		elementEClass = createEClass(ELEMENT);
-
-		estimateEClass = createEClass(ESTIMATE);
-		createEAttribute(estimateEClass, ESTIMATE__GROUP2);
-		createEAttribute(estimateEClass, ESTIMATE__ESTIMATION_METRIC);
-		createEAttribute(estimateEClass, ESTIMATE__ESTIMATION_CONSIDERATIONS);
-
-		estimatingMetricEClass = createEClass(ESTIMATING_METRIC);
-
-		estimationConsiderationsEClass = createEClass(ESTIMATION_CONSIDERATIONS);
-
-		exampleEClass = createEClass(EXAMPLE);
-
-		guidanceEClass = createEClass(GUIDANCE);
-
-		guidanceDescriptionEClass = createEClass(GUIDANCE_DESCRIPTION);
-		createEAttribute(guidanceDescriptionEClass, GUIDANCE_DESCRIPTION__ATTACHMENT);
-
-		guidelineEClass = createEClass(GUIDELINE);
-
-		iterationEClass = createEClass(ITERATION);
-
-		methodConfigurationEClass = createEClass(METHOD_CONFIGURATION);
-		createEAttribute(methodConfigurationEClass, METHOD_CONFIGURATION__BASE_CONFIGURATION);
-		createEAttribute(methodConfigurationEClass, METHOD_CONFIGURATION__METHOD_PLUGIN_SELECTION);
-		createEAttribute(methodConfigurationEClass, METHOD_CONFIGURATION__METHOD_PACKAGE_SELECTION);
-		createEAttribute(methodConfigurationEClass, METHOD_CONFIGURATION__DEFAULT_VIEW);
-		createEAttribute(methodConfigurationEClass, METHOD_CONFIGURATION__PROCESS_VIEW);
-
-		methodElementEClass = createEClass(METHOD_ELEMENT);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__GROUP);
-		createEReference(methodElementEClass, METHOD_ELEMENT__OWNED_RULE);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__BRIEF_DESCRIPTION);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__ID);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__ORDERING_GUIDE);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__SUPPRESSED);
-
-		methodLibraryEClass = createEClass(METHOD_LIBRARY);
-		createEReference(methodLibraryEClass, METHOD_LIBRARY__METHOD_PLUGIN);
-		createEReference(methodLibraryEClass, METHOD_LIBRARY__METHOD_CONFIGURATION);
-		createEAttribute(methodLibraryEClass, METHOD_LIBRARY__TOOL);
-
-		methodPackageEClass = createEClass(METHOD_PACKAGE);
-		createEAttribute(methodPackageEClass, METHOD_PACKAGE__GROUP1);
-		createEAttribute(methodPackageEClass, METHOD_PACKAGE__REUSED_PACKAGE);
-		createEReference(methodPackageEClass, METHOD_PACKAGE__METHOD_PACKAGE);
-		createEAttribute(methodPackageEClass, METHOD_PACKAGE__GLOBAL);
-
-		methodPluginEClass = createEClass(METHOD_PLUGIN);
-		createEAttribute(methodPluginEClass, METHOD_PLUGIN__REFERENCED_METHOD_PLUGIN);
-		createEReference(methodPluginEClass, METHOD_PLUGIN__METHOD_PACKAGE);
-		createEAttribute(methodPluginEClass, METHOD_PLUGIN__USER_CHANGEABLE);
-
-		methodUnitEClass = createEClass(METHOD_UNIT);
-		createEAttribute(methodUnitEClass, METHOD_UNIT__COPYRIGHT);
-		createEAttribute(methodUnitEClass, METHOD_UNIT__AUTHORS);
-		createEAttribute(methodUnitEClass, METHOD_UNIT__CHANGE_DATE);
-		createEAttribute(methodUnitEClass, METHOD_UNIT__CHANGE_DESCRIPTION);
-		createEAttribute(methodUnitEClass, METHOD_UNIT__VERSION);
-
-		milestoneEClass = createEClass(MILESTONE);
-
-		namedElementEClass = createEClass(NAMED_ELEMENT);
-		createEAttribute(namedElementEClass, NAMED_ELEMENT__NAME);
-
-		outcomeEClass = createEClass(OUTCOME);
-
-		packageableElementEClass = createEClass(PACKAGEABLE_ELEMENT);
-
-		phaseEClass = createEClass(PHASE);
-
-		planningDataEClass = createEClass(PLANNING_DATA);
-		createEAttribute(planningDataEClass, PLANNING_DATA__FINISH_DATE);
-		createEAttribute(planningDataEClass, PLANNING_DATA__RANK);
-		createEAttribute(planningDataEClass, PLANNING_DATA__START_DATE);
-
-		practiceEClass = createEClass(PRACTICE);
-		createEAttribute(practiceEClass, PRACTICE__GROUP2);
-		createEAttribute(practiceEClass, PRACTICE__ACTIVITY_REFERENCE);
-		createEAttribute(practiceEClass, PRACTICE__CONTENT_REFERENCE);
-		createEReference(practiceEClass, PRACTICE__SUB_PRACTICE);
-
-		practiceDescriptionEClass = createEClass(PRACTICE_DESCRIPTION);
-		createEAttribute(practiceDescriptionEClass, PRACTICE_DESCRIPTION__ADDITIONAL_INFO);
-		createEAttribute(practiceDescriptionEClass, PRACTICE_DESCRIPTION__APPLICATION);
-		createEAttribute(practiceDescriptionEClass, PRACTICE_DESCRIPTION__BACKGROUND);
-		createEAttribute(practiceDescriptionEClass, PRACTICE_DESCRIPTION__GOALS);
-		createEAttribute(practiceDescriptionEClass, PRACTICE_DESCRIPTION__LEVELS_OF_ADOPTION);
-		createEAttribute(practiceDescriptionEClass, PRACTICE_DESCRIPTION__PROBLEM);
-
-		processEClass = createEClass(PROCESS);
-		createEAttribute(processEClass, PROCESS__INCLUDES_PATTERN);
-		createEAttribute(processEClass, PROCESS__DEFAULT_CONTEXT);
-		createEAttribute(processEClass, PROCESS__VALID_CONTEXT);
-
-		processComponentEClass = createEClass(PROCESS_COMPONENT);
-		createEAttribute(processComponentEClass, PROCESS_COMPONENT__COPYRIGHT);
-		createEReference(processComponentEClass, PROCESS_COMPONENT__INTERFACE);
-		createEReference(processComponentEClass, PROCESS_COMPONENT__PROCESS);
-		createEAttribute(processComponentEClass, PROCESS_COMPONENT__AUTHORS);
-		createEAttribute(processComponentEClass, PROCESS_COMPONENT__CHANGE_DATE);
-		createEAttribute(processComponentEClass, PROCESS_COMPONENT__CHANGE_DESCRIPTION);
-		createEAttribute(processComponentEClass, PROCESS_COMPONENT__VERSION);
-
-		processComponentInterfaceEClass = createEClass(PROCESS_COMPONENT_INTERFACE);
-		createEAttribute(processComponentInterfaceEClass, PROCESS_COMPONENT_INTERFACE__GROUP1);
-		createEReference(processComponentInterfaceEClass, PROCESS_COMPONENT_INTERFACE__INTERFACE_SPECIFICATION);
-		createEReference(processComponentInterfaceEClass, PROCESS_COMPONENT_INTERFACE__INTERFACE_IO);
-
-		processDescriptionEClass = createEClass(PROCESS_DESCRIPTION);
-		createEAttribute(processDescriptionEClass, PROCESS_DESCRIPTION__SCOPE);
-		createEAttribute(processDescriptionEClass, PROCESS_DESCRIPTION__USAGE_NOTES);
-		createEAttribute(processDescriptionEClass, PROCESS_DESCRIPTION__EXTERNAL_ID);
-
-		processElementEClass = createEClass(PROCESS_ELEMENT);
-
-		processPackageEClass = createEClass(PROCESS_PACKAGE);
-		createEAttribute(processPackageEClass, PROCESS_PACKAGE__GROUP2);
-		createEReference(processPackageEClass, PROCESS_PACKAGE__PROCESS_ELEMENT);
-
-		processPlanningTemplateEClass = createEClass(PROCESS_PLANNING_TEMPLATE);
-		createEAttribute(processPlanningTemplateEClass, PROCESS_PLANNING_TEMPLATE__GROUP3);
-		createEAttribute(processPlanningTemplateEClass, PROCESS_PLANNING_TEMPLATE__BASE_PROCESS);
-
-		reportEClass = createEClass(REPORT);
-
-		reusableAssetEClass = createEClass(REUSABLE_ASSET);
-
-		roadmapEClass = createEClass(ROADMAP);
-
-		roleEClass = createEClass(ROLE);
-		createEAttribute(roleEClass, ROLE__GROUP2);
-		createEAttribute(roleEClass, ROLE__RESPONSIBLE_FOR);
-
-		roleDescriptionEClass = createEClass(ROLE_DESCRIPTION);
-		createEAttribute(roleDescriptionEClass, ROLE_DESCRIPTION__ASSIGNMENT_APPROACHES);
-		createEAttribute(roleDescriptionEClass, ROLE_DESCRIPTION__SKILLS);
-		createEAttribute(roleDescriptionEClass, ROLE_DESCRIPTION__SYNONYMS);
-
-		roleDescriptorEClass = createEClass(ROLE_DESCRIPTOR);
-		createEAttribute(roleDescriptorEClass, ROLE_DESCRIPTOR__ROLE);
-		createEAttribute(roleDescriptorEClass, ROLE_DESCRIPTOR__RESPONSIBLE_FOR);
-
-		roleSetEClass = createEClass(ROLE_SET);
-		createEAttribute(roleSetEClass, ROLE_SET__GROUP2);
-		createEAttribute(roleSetEClass, ROLE_SET__ROLE);
-
-		roleSetGroupingEClass = createEClass(ROLE_SET_GROUPING);
-		createEAttribute(roleSetGroupingEClass, ROLE_SET_GROUPING__GROUP2);
-		createEAttribute(roleSetGroupingEClass, ROLE_SET_GROUPING__ROLE_SET);
-
-		sectionEClass = createEClass(SECTION);
-		createEReference(sectionEClass, SECTION__SUB_SECTION);
-		createEAttribute(sectionEClass, SECTION__PREDECESSOR);
-		createEAttribute(sectionEClass, SECTION__DESCRIPTION);
-		createEAttribute(sectionEClass, SECTION__SECTION_NAME);
-		createEAttribute(sectionEClass, SECTION__VARIABILITY_BASED_ON_ELEMENT);
-		createEAttribute(sectionEClass, SECTION__VARIABILITY_TYPE);
-
-		supportingMaterialEClass = createEClass(SUPPORTING_MATERIAL);
-
-		taskEClass = createEClass(TASK);
-		createEAttribute(taskEClass, TASK__PRECONDITION);
-		createEAttribute(taskEClass, TASK__POSTCONDITION);
-		createEAttribute(taskEClass, TASK__PERFORMED_BY);
-		createEAttribute(taskEClass, TASK__GROUP2);
-		createEAttribute(taskEClass, TASK__MANDATORY_INPUT);
-		createEAttribute(taskEClass, TASK__OUTPUT);
-		createEAttribute(taskEClass, TASK__ADDITIONALLY_PERFORMED_BY);
-		createEAttribute(taskEClass, TASK__OPTIONAL_INPUT);
-		createEAttribute(taskEClass, TASK__ESTIMATE);
-		createEAttribute(taskEClass, TASK__ESTIMATION_CONSIDERATIONS);
-		createEAttribute(taskEClass, TASK__TOOL_MENTOR);
-
-		taskDescriptionEClass = createEClass(TASK_DESCRIPTION);
-		createEAttribute(taskDescriptionEClass, TASK_DESCRIPTION__ALTERNATIVES);
-		createEAttribute(taskDescriptionEClass, TASK_DESCRIPTION__PURPOSE);
-
-		taskDescriptorEClass = createEClass(TASK_DESCRIPTOR);
-		createEAttribute(taskDescriptorEClass, TASK_DESCRIPTOR__TASK);
-		createEAttribute(taskDescriptorEClass, TASK_DESCRIPTOR__PERFORMED_PRIMARILY_BY);
-		createEAttribute(taskDescriptorEClass, TASK_DESCRIPTOR__GROUP2);
-		createEAttribute(taskDescriptorEClass, TASK_DESCRIPTOR__ADDITIONALLY_PERFORMED_BY);
-		createEAttribute(taskDescriptorEClass, TASK_DESCRIPTOR__ASSISTED_BY);
-		createEAttribute(taskDescriptorEClass, TASK_DESCRIPTOR__EXTERNAL_INPUT);
-		createEAttribute(taskDescriptorEClass, TASK_DESCRIPTOR__MANDATORY_INPUT);
-		createEAttribute(taskDescriptorEClass, TASK_DESCRIPTOR__OPTIONAL_INPUT);
-		createEAttribute(taskDescriptorEClass, TASK_DESCRIPTOR__OUTPUT);
-		createEReference(taskDescriptorEClass, TASK_DESCRIPTOR__STEP);
-		createEAttribute(taskDescriptorEClass, TASK_DESCRIPTOR__IS_SYNCHRONIZED_WITH_SOURCE);
-
-		teamProfileEClass = createEClass(TEAM_PROFILE);
-		createEAttribute(teamProfileEClass, TEAM_PROFILE__GROUP1);
-		createEAttribute(teamProfileEClass, TEAM_PROFILE__ROLE);
-		createEAttribute(teamProfileEClass, TEAM_PROFILE__SUPER_TEAM);
-		createEAttribute(teamProfileEClass, TEAM_PROFILE__SUB_TEAM);
-
-		templateEClass = createEClass(TEMPLATE);
-
-		termDefinitionEClass = createEClass(TERM_DEFINITION);
-
-		toolEClass = createEClass(TOOL);
-		createEAttribute(toolEClass, TOOL__GROUP2);
-		createEAttribute(toolEClass, TOOL__TOOL_MENTOR);
-
-		toolMentorEClass = createEClass(TOOL_MENTOR);
-
-		whitepaperEClass = createEClass(WHITEPAPER);
-
-		workBreakdownElementEClass = createEClass(WORK_BREAKDOWN_ELEMENT);
-		createEAttribute(workBreakdownElementEClass, WORK_BREAKDOWN_ELEMENT__GROUP1);
-		createEReference(workBreakdownElementEClass, WORK_BREAKDOWN_ELEMENT__PREDECESSOR);
-		createEAttribute(workBreakdownElementEClass, WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN);
-		createEAttribute(workBreakdownElementEClass, WORK_BREAKDOWN_ELEMENT__IS_ONGOING);
-		createEAttribute(workBreakdownElementEClass, WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE);
-
-		workDefinitionEClass = createEClass(WORK_DEFINITION);
-		createEAttribute(workDefinitionEClass, WORK_DEFINITION__PRECONDITION);
-		createEAttribute(workDefinitionEClass, WORK_DEFINITION__POSTCONDITION);
-
-		workOrderEClass = createEClass(WORK_ORDER);
-		createEAttribute(workOrderEClass, WORK_ORDER__VALUE);
-		createEAttribute(workOrderEClass, WORK_ORDER__LINK_TYPE);
-		createEAttribute(workOrderEClass, WORK_ORDER__ID);
-
-		workProductEClass = createEClass(WORK_PRODUCT);
-		createEAttribute(workProductEClass, WORK_PRODUCT__GROUP2);
-		createEAttribute(workProductEClass, WORK_PRODUCT__ESTIMATE);
-		createEAttribute(workProductEClass, WORK_PRODUCT__ESTIMATION_CONSIDERATIONS);
-		createEAttribute(workProductEClass, WORK_PRODUCT__REPORT);
-		createEAttribute(workProductEClass, WORK_PRODUCT__TEMPLATE);
-		createEAttribute(workProductEClass, WORK_PRODUCT__TOOL_MENTOR);
-
-		workProductDescriptionEClass = createEClass(WORK_PRODUCT_DESCRIPTION);
-		createEAttribute(workProductDescriptionEClass, WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING);
-		createEAttribute(workProductDescriptionEClass, WORK_PRODUCT_DESCRIPTION__PURPOSE);
-		createEAttribute(workProductDescriptionEClass, WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING);
-		createEAttribute(workProductDescriptionEClass, WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID);
-
-		workProductDescriptorEClass = createEClass(WORK_PRODUCT_DESCRIPTOR);
-		createEAttribute(workProductDescriptorEClass, WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT);
-		createEAttribute(workProductDescriptorEClass, WORK_PRODUCT_DESCRIPTOR__GROUP1);
-		createEAttribute(workProductDescriptorEClass, WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY);
-		createEAttribute(workProductDescriptorEClass, WORK_PRODUCT_DESCRIPTOR__IMPACTS);
-		createEAttribute(workProductDescriptorEClass, WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS);
-		createEAttribute(workProductDescriptorEClass, WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE);
-		createEAttribute(workProductDescriptorEClass, WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE);
-
-		workProductTypeEClass = createEClass(WORK_PRODUCT_TYPE);
-		createEAttribute(workProductTypeEClass, WORK_PRODUCT_TYPE__GROUP2);
-		createEAttribute(workProductTypeEClass, WORK_PRODUCT_TYPE__WORK_PRODUCT);
-
-		// Create enums
-		variabilityTypeEEnum = createEEnum(VARIABILITY_TYPE);
-		workOrderTypeEEnum = createEEnum(WORK_ORDER_TYPE);
-
-		// Create data types
-		variabilityTypeObjectEDataType = createEDataType(VARIABILITY_TYPE_OBJECT);
-		workOrderTypeObjectEDataType = createEDataType(WORK_ORDER_TYPE_OBJECT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
-		// Add supertypes to classes
-		activityEClass.getESuperTypes().add(this.getWorkBreakdownElement());
-		activityDescriptionEClass.getESuperTypes().add(this.getBreakdownElementDescription());
-		artifactEClass.getESuperTypes().add(this.getWorkProduct());
-		artifactDescriptionEClass.getESuperTypes().add(this.getWorkProductDescription());
-		breakdownElementEClass.getESuperTypes().add(this.getProcessElement());
-		breakdownElementDescriptionEClass.getESuperTypes().add(this.getContentDescription());
-		capabilityPatternEClass.getESuperTypes().add(this.getProcess());
-		checklistEClass.getESuperTypes().add(this.getGuidance());
-		compositeRoleEClass.getESuperTypes().add(this.getRoleDescriptor());
-		conceptEClass.getESuperTypes().add(this.getGuidance());
-		constraintEClass.getESuperTypes().add(this.getMethodElement());
-		contentCategoryEClass.getESuperTypes().add(this.getContentElement());
-		contentCategoryPackageEClass.getESuperTypes().add(this.getMethodPackage());
-		contentDescriptionEClass.getESuperTypes().add(this.getMethodUnit());
-		contentElementEClass.getESuperTypes().add(this.getDescribableElement());
-		contentPackageEClass.getESuperTypes().add(this.getMethodPackage());
-		customCategoryEClass.getESuperTypes().add(this.getContentCategory());
-		deliverableEClass.getESuperTypes().add(this.getWorkProduct());
-		deliverableDescriptionEClass.getESuperTypes().add(this.getWorkProductDescription());
-		deliveryProcessEClass.getESuperTypes().add(this.getProcess());
-		deliveryProcessDescriptionEClass.getESuperTypes().add(this.getProcessDescription());
-		describableElementEClass.getESuperTypes().add(this.getMethodElement());
-		descriptorEClass.getESuperTypes().add(this.getBreakdownElement());
-		descriptorDescriptionEClass.getESuperTypes().add(this.getBreakdownElementDescription());
-		disciplineEClass.getESuperTypes().add(this.getContentCategory());
-		disciplineGroupingEClass.getESuperTypes().add(this.getContentCategory());
-		domainEClass.getESuperTypes().add(this.getContentCategory());
-		estimateEClass.getESuperTypes().add(this.getGuidance());
-		estimatingMetricEClass.getESuperTypes().add(this.getGuidance());
-		estimationConsiderationsEClass.getESuperTypes().add(this.getGuidance());
-		exampleEClass.getESuperTypes().add(this.getGuidance());
-		guidanceEClass.getESuperTypes().add(this.getContentElement());
-		guidanceDescriptionEClass.getESuperTypes().add(this.getContentDescription());
-		guidelineEClass.getESuperTypes().add(this.getGuidance());
-		iterationEClass.getESuperTypes().add(this.getActivity());
-		methodConfigurationEClass.getESuperTypes().add(this.getMethodUnit());
-		methodElementEClass.getESuperTypes().add(this.getPackageableElement());
-		methodLibraryEClass.getESuperTypes().add(this.getMethodUnit());
-		methodPackageEClass.getESuperTypes().add(this.getMethodElement());
-		methodPluginEClass.getESuperTypes().add(this.getMethodUnit());
-		methodUnitEClass.getESuperTypes().add(this.getMethodElement());
-		milestoneEClass.getESuperTypes().add(this.getWorkBreakdownElement());
-		namedElementEClass.getESuperTypes().add(this.getElement());
-		outcomeEClass.getESuperTypes().add(this.getWorkProduct());
-		packageableElementEClass.getESuperTypes().add(this.getNamedElement());
-		phaseEClass.getESuperTypes().add(this.getActivity());
-		planningDataEClass.getESuperTypes().add(this.getProcessElement());
-		practiceEClass.getESuperTypes().add(this.getGuidance());
-		practiceDescriptionEClass.getESuperTypes().add(this.getContentDescription());
-		processEClass.getESuperTypes().add(this.getActivity());
-		processComponentEClass.getESuperTypes().add(this.getProcessPackage());
-		processComponentInterfaceEClass.getESuperTypes().add(this.getBreakdownElement());
-		processDescriptionEClass.getESuperTypes().add(this.getActivityDescription());
-		processElementEClass.getESuperTypes().add(this.getDescribableElement());
-		processPackageEClass.getESuperTypes().add(this.getMethodPackage());
-		processPlanningTemplateEClass.getESuperTypes().add(this.getProcess());
-		reportEClass.getESuperTypes().add(this.getGuidance());
-		reusableAssetEClass.getESuperTypes().add(this.getGuidance());
-		roadmapEClass.getESuperTypes().add(this.getGuidance());
-		roleEClass.getESuperTypes().add(this.getContentElement());
-		roleDescriptionEClass.getESuperTypes().add(this.getContentDescription());
-		roleDescriptorEClass.getESuperTypes().add(this.getDescriptor());
-		roleSetEClass.getESuperTypes().add(this.getContentCategory());
-		roleSetGroupingEClass.getESuperTypes().add(this.getContentCategory());
-		sectionEClass.getESuperTypes().add(this.getMethodElement());
-		supportingMaterialEClass.getESuperTypes().add(this.getGuidance());
-		taskEClass.getESuperTypes().add(this.getContentElement());
-		taskDescriptionEClass.getESuperTypes().add(this.getContentDescription());
-		taskDescriptorEClass.getESuperTypes().add(this.getWorkBreakdownElement());
-		teamProfileEClass.getESuperTypes().add(this.getBreakdownElement());
-		templateEClass.getESuperTypes().add(this.getGuidance());
-		termDefinitionEClass.getESuperTypes().add(this.getGuidance());
-		toolEClass.getESuperTypes().add(this.getContentCategory());
-		toolMentorEClass.getESuperTypes().add(this.getGuidance());
-		whitepaperEClass.getESuperTypes().add(this.getConcept());
-		workBreakdownElementEClass.getESuperTypes().add(this.getBreakdownElement());
-		workDefinitionEClass.getESuperTypes().add(this.getMethodElement());
-		workProductEClass.getESuperTypes().add(this.getContentElement());
-		workProductDescriptionEClass.getESuperTypes().add(this.getContentDescription());
-		workProductDescriptorEClass.getESuperTypes().add(this.getDescriptor());
-		workProductTypeEClass.getESuperTypes().add(this.getContentCategory());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(activityEClass, Activity.class, "Activity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getActivity_Precondition(), theXMLTypePackage.getString(), "precondition", null, 0, 1, Activity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivity_Postcondition(), theXMLTypePackage.getString(), "postcondition", null, 0, 1, Activity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivity_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, Activity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getActivity_BreakdownElement(), this.getBreakdownElement(), null, "breakdownElement", null, 0, -1, Activity.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivity_Checklist(), theXMLTypePackage.getString(), "checklist", null, 0, -1, Activity.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivity_Concept(), theXMLTypePackage.getString(), "concept", null, 0, -1, Activity.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivity_Example(), theXMLTypePackage.getString(), "example", null, 0, -1, Activity.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivity_Guideline(), theXMLTypePackage.getString(), "guideline", null, 0, -1, Activity.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivity_Roadmap(), theXMLTypePackage.getString(), "roadmap", null, 0, -1, Activity.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivity_ReusableAsset(), theXMLTypePackage.getString(), "reusableAsset", null, 0, -1, Activity.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivity_SupportingMaterial(), theXMLTypePackage.getString(), "supportingMaterial", null, 0, -1, Activity.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivity_Whitepaper(), theXMLTypePackage.getString(), "whitepaper", null, 0, -1, Activity.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivity_IsEnactable(), theXMLTypePackage.getBoolean(), "isEnactable", null, 0, 1, Activity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivity_VariabilityBasedOnElement(), theXMLTypePackage.getString(), "variabilityBasedOnElement", null, 0, 1, Activity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivity_VariabilityType(), this.getVariabilityType(), "variabilityType", "na", 0, 1, Activity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(activityDescriptionEClass, ActivityDescription.class, "ActivityDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getActivityDescription_Alternatives(), theXMLTypePackage.getString(), "alternatives", null, 0, 1, ActivityDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivityDescription_HowToStaff(), theXMLTypePackage.getString(), "howToStaff", null, 0, 1, ActivityDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getActivityDescription_Purpose(), theXMLTypePackage.getString(), "purpose", null, 0, 1, ActivityDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(artifactEClass, Artifact.class, "Artifact", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getArtifact_Group3(), ecorePackage.getEFeatureMapEntry(), "group3", null, 0, -1, Artifact.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getArtifact_ContainedArtifact(), this.getArtifact(), null, "containedArtifact", null, 0, -1, Artifact.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(artifactDescriptionEClass, ArtifactDescription.class, "ArtifactDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getArtifactDescription_BriefOutline(), theXMLTypePackage.getString(), "briefOutline", null, 0, 1, ArtifactDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getArtifactDescription_RepresentationOptions(), theXMLTypePackage.getString(), "representationOptions", null, 0, 1, ArtifactDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(breakdownElementEClass, BreakdownElement.class, "BreakdownElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBreakdownElement_PresentedAfter(), theXMLTypePackage.getString(), "presentedAfter", null, 0, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBreakdownElement_PresentedBefore(), theXMLTypePackage.getString(), "presentedBefore", null, 0, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBreakdownElement_PlanningData(), theXMLTypePackage.getString(), "planningData", null, 0, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBreakdownElement_SuperActivity(), theXMLTypePackage.getString(), "superActivity", null, 1, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBreakdownElement_HasMultipleOccurrences(), theXMLTypePackage.getBoolean(), "hasMultipleOccurrences", null, 0, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBreakdownElement_IsOptional(), theXMLTypePackage.getBoolean(), "isOptional", null, 0, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBreakdownElement_IsPlanned(), theXMLTypePackage.getBoolean(), "isPlanned", null, 0, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBreakdownElement_Prefix(), theXMLTypePackage.getString(), "prefix", null, 0, 1, BreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(breakdownElementDescriptionEClass, BreakdownElementDescription.class, "BreakdownElementDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBreakdownElementDescription_UsageGuidance(), theXMLTypePackage.getString(), "usageGuidance", null, 0, 1, BreakdownElementDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(capabilityPatternEClass, CapabilityPattern.class, "CapabilityPattern", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(checklistEClass, Checklist.class, "Checklist", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(compositeRoleEClass, CompositeRole.class, "CompositeRole", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCompositeRole_Group1(), ecorePackage.getEFeatureMapEntry(), "group1", null, 0, -1, CompositeRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCompositeRole_AggregatedRole(), this.getRole(), null, "aggregatedRole", null, 0, -1, CompositeRole.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(conceptEClass, Concept.class, "Concept", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(constraintEClass, Constraint.class, "Constraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getConstraint_MainDescription(), theXMLTypePackage.getString(), "mainDescription", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(contentCategoryEClass, ContentCategory.class, "ContentCategory", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(contentCategoryPackageEClass, ContentCategoryPackage.class, "ContentCategoryPackage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getContentCategoryPackage_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, ContentCategoryPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getContentCategoryPackage_ContentCategory(), this.getContentCategory(), null, "contentCategory", null, 0, -1, ContentCategoryPackage.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(contentDescriptionEClass, ContentDescription.class, "ContentDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getContentDescription_MainDescription(), theXMLTypePackage.getString(), "mainDescription", null, 0, 1, ContentDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContentDescription_KeyConsiderations(), theXMLTypePackage.getString(), "keyConsiderations", null, 0, 1, ContentDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getContentDescription_Section(), this.getSection(), null, "section", null, 0, -1, ContentDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(contentElementEClass, ContentElement.class, "ContentElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getContentElement_Group1(), ecorePackage.getEFeatureMapEntry(), "group1", null, 0, -1, ContentElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContentElement_Checklist(), theXMLTypePackage.getString(), "checklist", null, 0, -1, ContentElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContentElement_Concept(), theXMLTypePackage.getString(), "concept", null, 0, -1, ContentElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContentElement_Example(), theXMLTypePackage.getString(), "example", null, 0, -1, ContentElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContentElement_Guideline(), theXMLTypePackage.getString(), "guideline", null, 0, -1, ContentElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContentElement_ReusableAsset(), theXMLTypePackage.getString(), "reusableAsset", null, 0, -1, ContentElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContentElement_SupportingMaterial(), theXMLTypePackage.getString(), "supportingMaterial", null, 0, -1, ContentElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContentElement_Whitepaper(), theXMLTypePackage.getString(), "whitepaper", null, 0, -1, ContentElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContentElement_VariabilityBasedOnElement(), theXMLTypePackage.getString(), "variabilityBasedOnElement", null, 0, 1, ContentElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContentElement_VariabilityType(), this.getVariabilityType(), "variabilityType", "na", 0, 1, ContentElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(contentPackageEClass, ContentPackage.class, "ContentPackage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getContentPackage_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, ContentPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getContentPackage_ContentElement(), this.getContentElement(), null, "contentElement", null, 0, -1, ContentPackage.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(customCategoryEClass, CustomCategory.class, "CustomCategory", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCustomCategory_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, CustomCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCustomCategory_CategorizedElement(), theXMLTypePackage.getString(), "categorizedElement", null, 0, -1, CustomCategory.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCustomCategory_SubCategory(), theXMLTypePackage.getString(), "subCategory", null, 0, -1, CustomCategory.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(deliverableEClass, Deliverable.class, "Deliverable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDeliverable_Group3(), ecorePackage.getEFeatureMapEntry(), "group3", null, 0, -1, Deliverable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDeliverable_DeliveredWorkProduct(), theXMLTypePackage.getString(), "deliveredWorkProduct", null, 0, -1, Deliverable.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(deliverableDescriptionEClass, DeliverableDescription.class, "DeliverableDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDeliverableDescription_ExternalDescription(), theXMLTypePackage.getString(), "externalDescription", null, 0, 1, DeliverableDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDeliverableDescription_PackagingGuidance(), theXMLTypePackage.getString(), "packagingGuidance", null, 0, 1, DeliverableDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(deliveryProcessEClass, DeliveryProcess.class, "DeliveryProcess", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDeliveryProcess_Group3(), ecorePackage.getEFeatureMapEntry(), "group3", null, 0, -1, DeliveryProcess.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDeliveryProcess_CommunicationsMaterial(), theXMLTypePackage.getString(), "communicationsMaterial", null, 0, -1, DeliveryProcess.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDeliveryProcess_EducationMaterial(), theXMLTypePackage.getString(), "educationMaterial", null, 0, -1, DeliveryProcess.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(deliveryProcessDescriptionEClass, DeliveryProcessDescription.class, "DeliveryProcessDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDeliveryProcessDescription_Scale(), theXMLTypePackage.getString(), "scale", null, 0, 1, DeliveryProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDeliveryProcessDescription_ProjectCharacteristics(), theXMLTypePackage.getString(), "projectCharacteristics", null, 0, 1, DeliveryProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDeliveryProcessDescription_RiskLevel(), theXMLTypePackage.getString(), "riskLevel", null, 0, 1, DeliveryProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDeliveryProcessDescription_EstimatingTechnique(), theXMLTypePackage.getString(), "estimatingTechnique", null, 0, 1, DeliveryProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDeliveryProcessDescription_ProjectMemberExpertise(), theXMLTypePackage.getString(), "projectMemberExpertise", null, 0, 1, DeliveryProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDeliveryProcessDescription_TypeOfContract(), theXMLTypePackage.getString(), "typeOfContract", null, 0, 1, DeliveryProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(describableElementEClass, DescribableElement.class, "DescribableElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDescribableElement_Presentation(), this.getContentDescription(), null, "presentation", null, 0, 1, DescribableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDescribableElement_Nodeicon(), theXMLTypePackage.getString(), "nodeicon", null, 0, 1, DescribableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDescribableElement_PresentationName(), theXMLTypePackage.getString(), "presentationName", null, 0, 1, DescribableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDescribableElement_Shapeicon(), theXMLTypePackage.getString(), "shapeicon", null, 0, 1, DescribableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(descriptorEClass, org.eclipse.epf.xml.uma.Descriptor.class, "Descriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDescriptor_IsSynchronizedWithSource(), theXMLTypePackage.getBoolean(), "isSynchronizedWithSource", null, 0, 1, org.eclipse.epf.xml.uma.Descriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(descriptorDescriptionEClass, DescriptorDescription.class, "DescriptorDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDescriptorDescription_RefinedDescription(), theXMLTypePackage.getString(), "refinedDescription", null, 0, 1, DescriptorDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(disciplineEClass, Discipline.class, "Discipline", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDiscipline_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, Discipline.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDiscipline_Task(), theXMLTypePackage.getString(), "task", null, 0, -1, Discipline.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getDiscipline_SubDiscipline(), this.getDiscipline(), null, "subDiscipline", null, 0, -1, Discipline.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDiscipline_ReferenceWorkflow(), theXMLTypePackage.getString(), "referenceWorkflow", null, 0, -1, Discipline.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(disciplineGroupingEClass, DisciplineGrouping.class, "DisciplineGrouping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDisciplineGrouping_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, DisciplineGrouping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDisciplineGrouping_Discipline(), theXMLTypePackage.getString(), "discipline", null, 0, -1, DisciplineGrouping.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(documentRootEClass, DocumentRoot.class, "DocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDocumentRoot_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_MethodConfiguration(), this.getMethodConfiguration(), null, "methodConfiguration", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_MethodLibrary(), this.getMethodLibrary(), null, "methodLibrary", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentRoot_MethodPlugin(), this.getMethodPlugin(), null, "methodPlugin", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(domainEClass, Domain.class, "Domain", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDomain_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, Domain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDomain_WorkProduct(), theXMLTypePackage.getString(), "workProduct", null, 0, -1, Domain.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getDomain_Subdomain(), this.getDomain(), null, "subdomain", null, 0, -1, Domain.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(elementEClass, Element.class, "Element", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(estimateEClass, Estimate.class, "Estimate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEstimate_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, Estimate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEstimate_EstimationMetric(), theXMLTypePackage.getString(), "estimationMetric", null, 0, -1, Estimate.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEstimate_EstimationConsiderations(), theXMLTypePackage.getString(), "estimationConsiderations", null, 0, -1, Estimate.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(estimatingMetricEClass, EstimatingMetric.class, "EstimatingMetric", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(estimationConsiderationsEClass, EstimationConsiderations.class, "EstimationConsiderations", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(exampleEClass, Example.class, "Example", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(guidanceEClass, Guidance.class, "Guidance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(guidanceDescriptionEClass, GuidanceDescription.class, "GuidanceDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getGuidanceDescription_Attachment(), theXMLTypePackage.getString(), "attachment", null, 0, 1, GuidanceDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(guidelineEClass, Guideline.class, "Guideline", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(iterationEClass, Iteration.class, "Iteration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(methodConfigurationEClass, MethodConfiguration.class, "MethodConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMethodConfiguration_BaseConfiguration(), theXMLTypePackage.getString(), "baseConfiguration", null, 0, -1, MethodConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodConfiguration_MethodPluginSelection(), theXMLTypePackage.getString(), "methodPluginSelection", null, 0, -1, MethodConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodConfiguration_MethodPackageSelection(), theXMLTypePackage.getString(), "methodPackageSelection", null, 0, -1, MethodConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodConfiguration_DefaultView(), theXMLTypePackage.getString(), "defaultView", null, 0, 1, MethodConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodConfiguration_ProcessView(), theXMLTypePackage.getString(), "processView", null, 0, -1, MethodConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(methodElementEClass, MethodElement.class, "MethodElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMethodElement_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodElement_OwnedRule(), this.getConstraint(), null, "ownedRule", null, 0, -1, MethodElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodElement_BriefDescription(), theXMLTypePackage.getString(), "briefDescription", null, 0, 1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodElement_Id(), theXMLTypePackage.getString(), "id", null, 0, 1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodElement_OrderingGuide(), theXMLTypePackage.getString(), "orderingGuide", null, 0, 1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodElement_Suppressed(), theXMLTypePackage.getBoolean(), "suppressed", null, 0, 1, MethodElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(methodLibraryEClass, MethodLibrary.class, "MethodLibrary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMethodLibrary_MethodPlugin(), this.getMethodPlugin(), null, "methodPlugin", null, 0, -1, MethodLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodLibrary_MethodConfiguration(), this.getMethodConfiguration(), null, "methodConfiguration", null, 0, -1, MethodLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodLibrary_Tool(), theXMLTypePackage.getString(), "tool", null, 0, 1, MethodLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(methodPackageEClass, MethodPackage.class, "MethodPackage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMethodPackage_Group1(), ecorePackage.getEFeatureMapEntry(), "group1", null, 0, -1, MethodPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodPackage_ReusedPackage(), theXMLTypePackage.getString(), "reusedPackage", null, 0, -1, MethodPackage.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodPackage_MethodPackage(), this.getMethodPackage(), null, "methodPackage", null, 0, -1, MethodPackage.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodPackage_Global(), theXMLTypePackage.getBoolean(), "global", null, 0, 1, MethodPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(methodPluginEClass, MethodPlugin.class, "MethodPlugin", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMethodPlugin_ReferencedMethodPlugin(), theXMLTypePackage.getString(), "referencedMethodPlugin", null, 0, -1, MethodPlugin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodPlugin_MethodPackage(), this.getMethodPackage(), null, "methodPackage", null, 0, -1, MethodPlugin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodPlugin_UserChangeable(), theXMLTypePackage.getBoolean(), "userChangeable", null, 0, 1, MethodPlugin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(methodUnitEClass, MethodUnit.class, "MethodUnit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMethodUnit_Copyright(), theXMLTypePackage.getString(), "copyright", null, 0, 1, MethodUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodUnit_Authors(), theXMLTypePackage.getString(), "authors", null, 0, 1, MethodUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodUnit_ChangeDate(), theXMLTypePackage.getDateTime(), "changeDate", null, 0, 1, MethodUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodUnit_ChangeDescription(), theXMLTypePackage.getString(), "changeDescription", null, 0, 1, MethodUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMethodUnit_Version(), theXMLTypePackage.getString(), "version", null, 0, 1, MethodUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(milestoneEClass, Milestone.class, "Milestone", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(namedElementEClass, NamedElement.class, "NamedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getNamedElement_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, NamedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(outcomeEClass, Outcome.class, "Outcome", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(packageableElementEClass, PackageableElement.class, "PackageableElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(phaseEClass, Phase.class, "Phase", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(planningDataEClass, PlanningData.class, "PlanningData", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPlanningData_FinishDate(), theXMLTypePackage.getDateTime(), "finishDate", null, 0, 1, PlanningData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPlanningData_Rank(), theXMLTypePackage.getString(), "rank", null, 0, 1, PlanningData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPlanningData_StartDate(), theXMLTypePackage.getDateTime(), "startDate", null, 0, 1, PlanningData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(practiceEClass, Practice.class, "Practice", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPractice_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, Practice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPractice_ActivityReference(), theXMLTypePackage.getString(), "activityReference", null, 0, -1, Practice.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPractice_ContentReference(), theXMLTypePackage.getString(), "contentReference", null, 0, -1, Practice.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getPractice_SubPractice(), this.getPractice(), null, "subPractice", null, 0, -1, Practice.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(practiceDescriptionEClass, PracticeDescription.class, "PracticeDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPracticeDescription_AdditionalInfo(), theXMLTypePackage.getString(), "additionalInfo", null, 0, 1, PracticeDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPracticeDescription_Application(), theXMLTypePackage.getString(), "application", null, 0, 1, PracticeDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPracticeDescription_Background(), theXMLTypePackage.getString(), "background", null, 0, 1, PracticeDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPracticeDescription_Goals(), theXMLTypePackage.getString(), "goals", null, 0, 1, PracticeDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPracticeDescription_LevelsOfAdoption(), theXMLTypePackage.getString(), "levelsOfAdoption", null, 0, 1, PracticeDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPracticeDescription_Problem(), theXMLTypePackage.getString(), "problem", null, 0, 1, PracticeDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(processEClass, org.eclipse.epf.xml.uma.Process.class, "Process", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getProcess_IncludesPattern(), theXMLTypePackage.getString(), "includesPattern", null, 0, -1, org.eclipse.epf.xml.uma.Process.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getProcess_DefaultContext(), theXMLTypePackage.getString(), "defaultContext", null, 0, 1, org.eclipse.epf.xml.uma.Process.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getProcess_ValidContext(), theXMLTypePackage.getString(), "validContext", null, 0, -1, org.eclipse.epf.xml.uma.Process.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(processComponentEClass, ProcessComponent.class, "ProcessComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getProcessComponent_Copyright(), theXMLTypePackage.getString(), "copyright", null, 0, 1, ProcessComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getProcessComponent_Interface(), this.getProcessComponentInterface(), null, "interface", null, 0, 1, ProcessComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getProcessComponent_Process(), this.getProcess(), null, "process", null, 1, 1, ProcessComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getProcessComponent_Authors(), theXMLTypePackage.getString(), "authors", null, 0, 1, ProcessComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getProcessComponent_ChangeDate(), theXMLTypePackage.getDateTime(), "changeDate", null, 0, 1, ProcessComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getProcessComponent_ChangeDescription(), theXMLTypePackage.getString(), "changeDescription", null, 0, 1, ProcessComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getProcessComponent_Version(), theXMLTypePackage.getString(), "version", null, 0, 1, ProcessComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(processComponentInterfaceEClass, ProcessComponentInterface.class, "ProcessComponentInterface", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getProcessComponentInterface_Group1(), ecorePackage.getEFeatureMapEntry(), "group1", null, 0, -1, ProcessComponentInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getProcessComponentInterface_InterfaceSpecification(), this.getTaskDescriptor(), null, "interfaceSpecification", null, 0, -1, ProcessComponentInterface.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getProcessComponentInterface_InterfaceIO(), this.getWorkProductDescriptor(), null, "interfaceIO", null, 0, -1, ProcessComponentInterface.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(processDescriptionEClass, ProcessDescription.class, "ProcessDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getProcessDescription_Scope(), theXMLTypePackage.getString(), "scope", null, 0, 1, ProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getProcessDescription_UsageNotes(), theXMLTypePackage.getString(), "usageNotes", null, 0, 1, ProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getProcessDescription_ExternalId(), theXMLTypePackage.getString(), "externalId", null, 0, 1, ProcessDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(processElementEClass, ProcessElement.class, "ProcessElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(processPackageEClass, ProcessPackage.class, "ProcessPackage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getProcessPackage_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, ProcessPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getProcessPackage_ProcessElement(), this.getProcessElement(), null, "processElement", null, 0, -1, ProcessPackage.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(processPlanningTemplateEClass, ProcessPlanningTemplate.class, "ProcessPlanningTemplate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getProcessPlanningTemplate_Group3(), ecorePackage.getEFeatureMapEntry(), "group3", null, 0, -1, ProcessPlanningTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getProcessPlanningTemplate_BaseProcess(), theXMLTypePackage.getString(), "baseProcess", null, 0, -1, ProcessPlanningTemplate.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(reportEClass, Report.class, "Report", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(reusableAssetEClass, ReusableAsset.class, "ReusableAsset", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(roadmapEClass, Roadmap.class, "Roadmap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(roleEClass, Role.class, "Role", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRole_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, Role.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRole_ResponsibleFor(), theXMLTypePackage.getString(), "responsibleFor", null, 0, -1, Role.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(roleDescriptionEClass, RoleDescription.class, "RoleDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRoleDescription_AssignmentApproaches(), theXMLTypePackage.getString(), "assignmentApproaches", null, 0, 1, RoleDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRoleDescription_Skills(), theXMLTypePackage.getString(), "skills", null, 0, 1, RoleDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRoleDescription_Synonyms(), theXMLTypePackage.getString(), "synonyms", null, 0, 1, RoleDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(roleDescriptorEClass, RoleDescriptor.class, "RoleDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRoleDescriptor_Role(), theXMLTypePackage.getString(), "role", null, 0, 1, RoleDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRoleDescriptor_ResponsibleFor(), theXMLTypePackage.getString(), "responsibleFor", null, 0, -1, RoleDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(roleSetEClass, RoleSet.class, "RoleSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRoleSet_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, RoleSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRoleSet_Role(), theXMLTypePackage.getString(), "role", null, 0, -1, RoleSet.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(roleSetGroupingEClass, RoleSetGrouping.class, "RoleSetGrouping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRoleSetGrouping_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, RoleSetGrouping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRoleSetGrouping_RoleSet(), theXMLTypePackage.getString(), "roleSet", null, 0, -1, RoleSetGrouping.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(sectionEClass, Section.class, "Section", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getSection_SubSection(), this.getSection(), null, "subSection", null, 0, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSection_Predecessor(), theXMLTypePackage.getString(), "predecessor", null, 0, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSection_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSection_SectionName(), theXMLTypePackage.getString(), "sectionName", null, 0, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSection_VariabilityBasedOnElement(), theXMLTypePackage.getString(), "variabilityBasedOnElement", null, 0, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSection_VariabilityType(), this.getVariabilityType(), "variabilityType", "na", 0, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(supportingMaterialEClass, SupportingMaterial.class, "SupportingMaterial", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(taskEClass, Task.class, "Task", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTask_Precondition(), theXMLTypePackage.getString(), "precondition", null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTask_Postcondition(), theXMLTypePackage.getString(), "postcondition", null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTask_PerformedBy(), theXMLTypePackage.getString(), "performedBy", null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTask_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTask_MandatoryInput(), theXMLTypePackage.getString(), "mandatoryInput", null, 0, -1, Task.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTask_Output(), theXMLTypePackage.getString(), "output", null, 0, -1, Task.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTask_AdditionallyPerformedBy(), theXMLTypePackage.getString(), "additionallyPerformedBy", null, 0, -1, Task.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTask_OptionalInput(), theXMLTypePackage.getString(), "optionalInput", null, 0, -1, Task.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTask_Estimate(), theXMLTypePackage.getString(), "estimate", null, 0, -1, Task.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTask_EstimationConsiderations(), theXMLTypePackage.getString(), "estimationConsiderations", null, 0, -1, Task.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTask_ToolMentor(), theXMLTypePackage.getString(), "toolMentor", null, 0, -1, Task.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(taskDescriptionEClass, TaskDescription.class, "TaskDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTaskDescription_Alternatives(), theXMLTypePackage.getString(), "alternatives", null, 0, 1, TaskDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaskDescription_Purpose(), theXMLTypePackage.getString(), "purpose", null, 0, 1, TaskDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(taskDescriptorEClass, TaskDescriptor.class, "TaskDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTaskDescriptor_Task(), theXMLTypePackage.getString(), "task", null, 0, 1, TaskDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaskDescriptor_PerformedPrimarilyBy(), theXMLTypePackage.getString(), "performedPrimarilyBy", null, 0, 1, TaskDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaskDescriptor_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, TaskDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaskDescriptor_AdditionallyPerformedBy(), theXMLTypePackage.getString(), "additionallyPerformedBy", null, 0, -1, TaskDescriptor.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaskDescriptor_AssistedBy(), theXMLTypePackage.getString(), "assistedBy", null, 0, -1, TaskDescriptor.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaskDescriptor_ExternalInput(), theXMLTypePackage.getString(), "externalInput", null, 0, -1, TaskDescriptor.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaskDescriptor_MandatoryInput(), theXMLTypePackage.getString(), "mandatoryInput", null, 0, -1, TaskDescriptor.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaskDescriptor_OptionalInput(), theXMLTypePackage.getString(), "optionalInput", null, 0, -1, TaskDescriptor.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaskDescriptor_Output(), theXMLTypePackage.getString(), "output", null, 0, -1, TaskDescriptor.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getTaskDescriptor_Step(), this.getSection(), null, "step", null, 0, -1, TaskDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaskDescriptor_IsSynchronizedWithSource(), theXMLTypePackage.getBoolean(), "isSynchronizedWithSource", null, 0, 1, TaskDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(teamProfileEClass, TeamProfile.class, "TeamProfile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTeamProfile_Group1(), ecorePackage.getEFeatureMapEntry(), "group1", null, 0, -1, TeamProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTeamProfile_Role(), theXMLTypePackage.getString(), "role", null, 0, -1, TeamProfile.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTeamProfile_SuperTeam(), theXMLTypePackage.getString(), "superTeam", null, 0, -1, TeamProfile.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTeamProfile_SubTeam(), theXMLTypePackage.getString(), "subTeam", null, 0, -1, TeamProfile.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(templateEClass, Template.class, "Template", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(termDefinitionEClass, TermDefinition.class, "TermDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(toolEClass, Tool.class, "Tool", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTool_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, Tool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTool_ToolMentor(), theXMLTypePackage.getString(), "toolMentor", null, 0, -1, Tool.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(toolMentorEClass, ToolMentor.class, "ToolMentor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(whitepaperEClass, Whitepaper.class, "Whitepaper", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(workBreakdownElementEClass, WorkBreakdownElement.class, "WorkBreakdownElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWorkBreakdownElement_Group1(), ecorePackage.getEFeatureMapEntry(), "group1", null, 0, -1, WorkBreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWorkBreakdownElement_Predecessor(), this.getWorkOrder(), null, "predecessor", null, 0, -1, WorkBreakdownElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkBreakdownElement_IsEventDriven(), theXMLTypePackage.getBoolean(), "isEventDriven", null, 0, 1, WorkBreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkBreakdownElement_IsOngoing(), theXMLTypePackage.getBoolean(), "isOngoing", null, 0, 1, WorkBreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkBreakdownElement_IsRepeatable(), theXMLTypePackage.getBoolean(), "isRepeatable", null, 0, 1, WorkBreakdownElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(workDefinitionEClass, WorkDefinition.class, "WorkDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWorkDefinition_Precondition(), theXMLTypePackage.getString(), "precondition", null, 0, 1, WorkDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkDefinition_Postcondition(), theXMLTypePackage.getString(), "postcondition", null, 0, 1, WorkDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(workOrderEClass, WorkOrder.class, "WorkOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWorkOrder_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, WorkOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkOrder_LinkType(), this.getWorkOrderType(), "linkType", "finishToStart", 0, 1, WorkOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkOrder_Id(), theXMLTypePackage.getString(), "id", null, 0, 1, WorkOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(workProductEClass, WorkProduct.class, "WorkProduct", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWorkProduct_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, WorkProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkProduct_Estimate(), theXMLTypePackage.getString(), "estimate", null, 0, -1, WorkProduct.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkProduct_EstimationConsiderations(), theXMLTypePackage.getString(), "estimationConsiderations", null, 0, -1, WorkProduct.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkProduct_Report(), theXMLTypePackage.getString(), "report", null, 0, -1, WorkProduct.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkProduct_Template(), theXMLTypePackage.getString(), "template", null, 0, -1, WorkProduct.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkProduct_ToolMentor(), theXMLTypePackage.getString(), "toolMentor", null, 0, -1, WorkProduct.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(workProductDescriptionEClass, WorkProductDescription.class, "WorkProductDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWorkProductDescription_ImpactOfNotHaving(), theXMLTypePackage.getString(), "impactOfNotHaving", null, 0, 1, WorkProductDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkProductDescription_Purpose(), theXMLTypePackage.getString(), "purpose", null, 0, 1, WorkProductDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkProductDescription_ReasonsForNotNeeding(), theXMLTypePackage.getString(), "reasonsForNotNeeding", null, 0, 1, WorkProductDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkProductDescription_ExternalId(), theXMLTypePackage.getString(), "externalId", null, 0, 1, WorkProductDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(workProductDescriptorEClass, WorkProductDescriptor.class, "WorkProductDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWorkProductDescriptor_WorkProduct(), theXMLTypePackage.getString(), "workProduct", null, 0, 1, WorkProductDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkProductDescriptor_Group1(), ecorePackage.getEFeatureMapEntry(), "group1", null, 0, -1, WorkProductDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkProductDescriptor_ImpactedBy(), theXMLTypePackage.getString(), "impactedBy", null, 0, -1, WorkProductDescriptor.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkProductDescriptor_Impacts(), theXMLTypePackage.getString(), "impacts", null, 0, -1, WorkProductDescriptor.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkProductDescriptor_DeliverableParts(), theXMLTypePackage.getString(), "deliverableParts", null, 0, -1, WorkProductDescriptor.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkProductDescriptor_ActivityEntryState(), theXMLTypePackage.getString(), "activityEntryState", null, 0, 1, WorkProductDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkProductDescriptor_ActivityExitState(), theXMLTypePackage.getString(), "activityExitState", null, 0, 1, WorkProductDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(workProductTypeEClass, WorkProductType.class, "WorkProductType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWorkProductType_Group2(), ecorePackage.getEFeatureMapEntry(), "group2", null, 0, -1, WorkProductType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWorkProductType_WorkProduct(), theXMLTypePackage.getString(), "workProduct", null, 0, -1, WorkProductType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(variabilityTypeEEnum, VariabilityType.class, "VariabilityType");
-		addEEnumLiteral(variabilityTypeEEnum, VariabilityType.NA_LITERAL);
-		addEEnumLiteral(variabilityTypeEEnum, VariabilityType.CONTRIBUTES_LITERAL);
-		addEEnumLiteral(variabilityTypeEEnum, VariabilityType.EXTENDS_LITERAL);
-		addEEnumLiteral(variabilityTypeEEnum, VariabilityType.REPLACES_LITERAL);
-		addEEnumLiteral(variabilityTypeEEnum, VariabilityType.LOCAL_CONTRIBUTION_LITERAL);
-		addEEnumLiteral(variabilityTypeEEnum, VariabilityType.LOCAL_REPLACEMENT_LITERAL);
-
-		initEEnum(workOrderTypeEEnum, WorkOrderType.class, "WorkOrderType");
-		addEEnumLiteral(workOrderTypeEEnum, WorkOrderType.FINISH_TO_START_LITERAL);
-		addEEnumLiteral(workOrderTypeEEnum, WorkOrderType.FINISH_TO_FINISH_LITERAL);
-		addEEnumLiteral(workOrderTypeEEnum, WorkOrderType.START_TO_START_LITERAL);
-		addEEnumLiteral(workOrderTypeEEnum, WorkOrderType.START_TO_FINISH_LITERAL);
-
-		// Initialize data types
-		initEDataType(variabilityTypeObjectEDataType, VariabilityType.class, "VariabilityTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(workOrderTypeObjectEDataType, WorkOrderType.class, "WorkOrderTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-		createExtendedMetaDataAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";			
-		addAnnotation
-		  (activityEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Activity",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getActivity_Precondition(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Precondition"
-		   });		
-		addAnnotation
-		  (getActivity_Postcondition(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Postcondition"
-		   });		
-		addAnnotation
-		  (getActivity_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:26"
-		   });		
-		addAnnotation
-		  (getActivity_BreakdownElement(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "BreakdownElement",
-			 "group", "#group:26"
-		   });		
-		addAnnotation
-		  (getActivity_Checklist(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Checklist",
-			 "group", "#group:26"
-		   });		
-		addAnnotation
-		  (getActivity_Concept(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Concept",
-			 "group", "#group:26"
-		   });		
-		addAnnotation
-		  (getActivity_Example(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Example",
-			 "group", "#group:26"
-		   });		
-		addAnnotation
-		  (getActivity_Guideline(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Guideline",
-			 "group", "#group:26"
-		   });		
-		addAnnotation
-		  (getActivity_Roadmap(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Roadmap",
-			 "group", "#group:26"
-		   });		
-		addAnnotation
-		  (getActivity_ReusableAsset(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ReusableAsset",
-			 "group", "#group:26"
-		   });		
-		addAnnotation
-		  (getActivity_SupportingMaterial(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "SupportingMaterial",
-			 "group", "#group:26"
-		   });		
-		addAnnotation
-		  (getActivity_Whitepaper(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Whitepaper",
-			 "group", "#group:26"
-		   });		
-		addAnnotation
-		  (getActivity_IsEnactable(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "IsEnactable"
-		   });		
-		addAnnotation
-		  (getActivity_VariabilityBasedOnElement(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "variabilityBasedOnElement"
-		   });		
-		addAnnotation
-		  (getActivity_VariabilityType(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "variabilityType"
-		   });			
-		addAnnotation
-		  (activityDescriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ActivityDescription",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (getActivityDescription_Alternatives(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Alternatives"
-		   });			
-		addAnnotation
-		  (getActivityDescription_HowToStaff(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "HowToStaff"
-		   });			
-		addAnnotation
-		  (getActivityDescription_Purpose(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Purpose"
-		   });			
-		addAnnotation
-		  (artifactEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Artifact",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getArtifact_Group3(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:27"
-		   });		
-		addAnnotation
-		  (getArtifact_ContainedArtifact(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ContainedArtifact",
-			 "group", "#group:27"
-		   });			
-		addAnnotation
-		  (artifactDescriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ArtifactDescription",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (getArtifactDescription_BriefOutline(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "BriefOutline"
-		   });			
-		addAnnotation
-		  (getArtifactDescription_RepresentationOptions(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "RepresentationOptions"
-		   });			
-		addAnnotation
-		  (breakdownElementEClass, 
-		   source, 
-		   new String[] {
-			 "name", "BreakdownElement",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getBreakdownElement_PresentedAfter(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "PresentedAfter"
-		   });		
-		addAnnotation
-		  (getBreakdownElement_PresentedBefore(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "PresentedBefore"
-		   });		
-		addAnnotation
-		  (getBreakdownElement_PlanningData(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "PlanningData"
-		   });		
-		addAnnotation
-		  (getBreakdownElement_SuperActivity(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "SuperActivity"
-		   });			
-		addAnnotation
-		  (getBreakdownElement_HasMultipleOccurrences(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "hasMultipleOccurrences"
-		   });			
-		addAnnotation
-		  (getBreakdownElement_IsOptional(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "isOptional"
-		   });			
-		addAnnotation
-		  (getBreakdownElement_IsPlanned(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "isPlanned"
-		   });			
-		addAnnotation
-		  (getBreakdownElement_Prefix(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "prefix"
-		   });			
-		addAnnotation
-		  (breakdownElementDescriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "BreakdownElementDescription",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (getBreakdownElementDescription_UsageGuidance(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "usageGuidance"
-		   });			
-		addAnnotation
-		  (capabilityPatternEClass, 
-		   source, 
-		   new String[] {
-			 "name", "CapabilityPattern",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (checklistEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Checklist",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (compositeRoleEClass, 
-		   source, 
-		   new String[] {
-			 "name", "CompositeRole",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getCompositeRole_Group1(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:22"
-		   });		
-		addAnnotation
-		  (getCompositeRole_AggregatedRole(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "AggregatedRole",
-			 "group", "#group:22"
-		   });			
-		addAnnotation
-		  (conceptEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Concept",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (constraintEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Constraint",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (getConstraint_MainDescription(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "mainDescription"
-		   });			
-		addAnnotation
-		  (contentCategoryEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ContentCategory",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (contentCategoryPackageEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ContentCategoryPackage",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getContentCategoryPackage_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:11"
-		   });		
-		addAnnotation
-		  (getContentCategoryPackage_ContentCategory(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ContentCategory",
-			 "group", "#group:11"
-		   });			
-		addAnnotation
-		  (contentDescriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ContentDescription",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (getContentDescription_MainDescription(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "MainDescription"
-		   });			
-		addAnnotation
-		  (getContentDescription_KeyConsiderations(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "KeyConsiderations"
-		   });		
-		addAnnotation
-		  (getContentDescription_Section(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Section"
-		   });			
-		addAnnotation
-		  (contentElementEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ContentElement",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getContentElement_Group1(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:11"
-		   });		
-		addAnnotation
-		  (getContentElement_Checklist(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Checklist",
-			 "group", "#group:11"
-		   });		
-		addAnnotation
-		  (getContentElement_Concept(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Concept",
-			 "group", "#group:11"
-		   });		
-		addAnnotation
-		  (getContentElement_Example(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Example",
-			 "group", "#group:11"
-		   });		
-		addAnnotation
-		  (getContentElement_Guideline(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Guideline",
-			 "group", "#group:11"
-		   });		
-		addAnnotation
-		  (getContentElement_ReusableAsset(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ReusableAsset",
-			 "group", "#group:11"
-		   });		
-		addAnnotation
-		  (getContentElement_SupportingMaterial(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "SupportingMaterial",
-			 "group", "#group:11"
-		   });		
-		addAnnotation
-		  (getContentElement_Whitepaper(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Whitepaper",
-			 "group", "#group:11"
-		   });		
-		addAnnotation
-		  (getContentElement_VariabilityBasedOnElement(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "variabilityBasedOnElement"
-		   });		
-		addAnnotation
-		  (getContentElement_VariabilityType(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "variabilityType"
-		   });			
-		addAnnotation
-		  (contentPackageEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ContentPackage",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getContentPackage_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:11"
-		   });		
-		addAnnotation
-		  (getContentPackage_ContentElement(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ContentElement",
-			 "group", "#group:11"
-		   });			
-		addAnnotation
-		  (customCategoryEClass, 
-		   source, 
-		   new String[] {
-			 "name", "CustomCategory",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getCustomCategory_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:21"
-		   });		
-		addAnnotation
-		  (getCustomCategory_CategorizedElement(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "CategorizedElement",
-			 "group", "#group:21"
-		   });		
-		addAnnotation
-		  (getCustomCategory_SubCategory(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "SubCategory",
-			 "group", "#group:21"
-		   });			
-		addAnnotation
-		  (deliverableEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Deliverable",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getDeliverable_Group3(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:27"
-		   });		
-		addAnnotation
-		  (getDeliverable_DeliveredWorkProduct(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "DeliveredWorkProduct",
-			 "group", "#group:27"
-		   });			
-		addAnnotation
-		  (deliverableDescriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "DeliverableDescription",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (getDeliverableDescription_ExternalDescription(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ExternalDescription"
-		   });			
-		addAnnotation
-		  (getDeliverableDescription_PackagingGuidance(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "PackagingGuidance"
-		   });			
-		addAnnotation
-		  (deliveryProcessEClass, 
-		   source, 
-		   new String[] {
-			 "name", "DeliveryProcess",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getDeliveryProcess_Group3(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:42"
-		   });		
-		addAnnotation
-		  (getDeliveryProcess_CommunicationsMaterial(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "CommunicationsMaterial",
-			 "group", "#group:42"
-		   });		
-		addAnnotation
-		  (getDeliveryProcess_EducationMaterial(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "EducationMaterial",
-			 "group", "#group:42"
-		   });			
-		addAnnotation
-		  (deliveryProcessDescriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "DeliveryProcessDescription",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (getDeliveryProcessDescription_Scale(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Scale"
-		   });			
-		addAnnotation
-		  (getDeliveryProcessDescription_ProjectCharacteristics(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ProjectCharacteristics"
-		   });			
-		addAnnotation
-		  (getDeliveryProcessDescription_RiskLevel(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "RiskLevel"
-		   });			
-		addAnnotation
-		  (getDeliveryProcessDescription_EstimatingTechnique(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "EstimatingTechnique"
-		   });			
-		addAnnotation
-		  (getDeliveryProcessDescription_ProjectMemberExpertise(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ProjectMemberExpertise"
-		   });			
-		addAnnotation
-		  (getDeliveryProcessDescription_TypeOfContract(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "TypeOfContract"
-		   });			
-		addAnnotation
-		  (describableElementEClass, 
-		   source, 
-		   new String[] {
-			 "name", "DescribableElement",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getDescribableElement_Presentation(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Presentation"
-		   });			
-		addAnnotation
-		  (getDescribableElement_Nodeicon(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "nodeicon"
-		   });			
-		addAnnotation
-		  (getDescribableElement_PresentationName(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "presentationName"
-		   });			
-		addAnnotation
-		  (getDescribableElement_Shapeicon(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "shapeicon"
-		   });			
-		addAnnotation
-		  (descriptorEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Descriptor",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getDescriptor_IsSynchronizedWithSource(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "isSynchronizedWithSource"
-		   });			
-		addAnnotation
-		  (descriptorDescriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "DescriptorDescription",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (getDescriptorDescription_RefinedDescription(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "RefinedDescription"
-		   });			
-		addAnnotation
-		  (disciplineEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Discipline",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getDiscipline_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:21"
-		   });		
-		addAnnotation
-		  (getDiscipline_Task(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Task",
-			 "group", "#group:21"
-		   });		
-		addAnnotation
-		  (getDiscipline_SubDiscipline(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "SubDiscipline",
-			 "group", "#group:21"
-		   });		
-		addAnnotation
-		  (getDiscipline_ReferenceWorkflow(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ReferenceWorkflow",
-			 "group", "#group:21"
-		   });			
-		addAnnotation
-		  (disciplineGroupingEClass, 
-		   source, 
-		   new String[] {
-			 "name", "DisciplineGrouping",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getDisciplineGrouping_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:21"
-		   });		
-		addAnnotation
-		  (getDisciplineGrouping_Discipline(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Discipline",
-			 "group", "#group:21"
-		   });		
-		addAnnotation
-		  (documentRootEClass, 
-		   source, 
-		   new String[] {
-			 "name", "",
-			 "kind", "mixed"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_Mixed(), 
-		   source, 
-		   new String[] {
-			 "kind", "elementWildcard",
-			 "name", ":mixed"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_XMLNSPrefixMap(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "xmlns:prefix"
-		   });		
-		addAnnotation
-		  (getDocumentRoot_XSISchemaLocation(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "xsi:schemaLocation"
-		   });			
-		addAnnotation
-		  (getDocumentRoot_MethodConfiguration(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "MethodConfiguration",
-			 "namespace", "##targetNamespace"
-		   });			
-		addAnnotation
-		  (getDocumentRoot_MethodLibrary(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "MethodLibrary",
-			 "namespace", "##targetNamespace"
-		   });			
-		addAnnotation
-		  (getDocumentRoot_MethodPlugin(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "MethodPlugin",
-			 "namespace", "##targetNamespace"
-		   });			
-		addAnnotation
-		  (domainEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Domain",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getDomain_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:21"
-		   });		
-		addAnnotation
-		  (getDomain_WorkProduct(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "WorkProduct",
-			 "group", "#group:21"
-		   });		
-		addAnnotation
-		  (getDomain_Subdomain(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Subdomain",
-			 "group", "#group:21"
-		   });			
-		addAnnotation
-		  (elementEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Element",
-			 "kind", "empty"
-		   });			
-		addAnnotation
-		  (estimateEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Estimate",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getEstimate_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:21"
-		   });		
-		addAnnotation
-		  (getEstimate_EstimationMetric(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "EstimationMetric",
-			 "group", "#group:21"
-		   });		
-		addAnnotation
-		  (getEstimate_EstimationConsiderations(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "EstimationConsiderations",
-			 "group", "#group:21"
-		   });			
-		addAnnotation
-		  (estimatingMetricEClass, 
-		   source, 
-		   new String[] {
-			 "name", "EstimatingMetric",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (estimationConsiderationsEClass, 
-		   source, 
-		   new String[] {
-			 "name", "EstimationConsiderations",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (exampleEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Example",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (guidanceEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Guidance",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (guidanceDescriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "GuidanceDescription",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (getGuidanceDescription_Attachment(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Attachment"
-		   });			
-		addAnnotation
-		  (guidelineEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Guideline",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (iterationEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Iteration",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (methodConfigurationEClass, 
-		   source, 
-		   new String[] {
-			 "name", "MethodConfiguration",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getMethodConfiguration_BaseConfiguration(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "BaseConfiguration"
-		   });		
-		addAnnotation
-		  (getMethodConfiguration_MethodPluginSelection(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "MethodPluginSelection"
-		   });		
-		addAnnotation
-		  (getMethodConfiguration_MethodPackageSelection(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "MethodPackageSelection"
-		   });		
-		addAnnotation
-		  (getMethodConfiguration_DefaultView(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "DefaultView"
-		   });		
-		addAnnotation
-		  (getMethodConfiguration_ProcessView(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ProcessView"
-		   });			
-		addAnnotation
-		  (methodElementEClass, 
-		   source, 
-		   new String[] {
-			 "name", "MethodElement",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getMethodElement_Group(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:1"
-		   });			
-		addAnnotation
-		  (getMethodElement_OwnedRule(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "OwnedRule",
-			 "group", "#group:1"
-		   });			
-		addAnnotation
-		  (getMethodElement_BriefDescription(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "briefDescription"
-		   });			
-		addAnnotation
-		  (getMethodElement_Id(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "id"
-		   });			
-		addAnnotation
-		  (getMethodElement_OrderingGuide(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "orderingGuide"
-		   });			
-		addAnnotation
-		  (getMethodElement_Suppressed(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "suppressed"
-		   });			
-		addAnnotation
-		  (methodLibraryEClass, 
-		   source, 
-		   new String[] {
-			 "name", "MethodLibrary",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getMethodLibrary_MethodPlugin(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "MethodPlugin"
-		   });		
-		addAnnotation
-		  (getMethodLibrary_MethodConfiguration(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "MethodConfiguration"
-		   });			
-		addAnnotation
-		  (methodPackageEClass, 
-		   source, 
-		   new String[] {
-			 "name", "MethodPackage",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getMethodPackage_Group1(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:7"
-		   });		
-		addAnnotation
-		  (getMethodPackage_ReusedPackage(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ReusedPackage",
-			 "group", "#group:7"
-		   });		
-		addAnnotation
-		  (getMethodPackage_MethodPackage(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "MethodPackage",
-			 "group", "#group:7"
-		   });			
-		addAnnotation
-		  (getMethodPackage_Global(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "global"
-		   });			
-		addAnnotation
-		  (methodPluginEClass, 
-		   source, 
-		   new String[] {
-			 "name", "MethodPlugin",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getMethodPlugin_ReferencedMethodPlugin(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ReferencedMethodPlugin"
-		   });		
-		addAnnotation
-		  (getMethodPlugin_MethodPackage(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "MethodPackage"
-		   });		
-		addAnnotation
-		  (getMethodPlugin_UserChangeable(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "userChangeable"
-		   });			
-		addAnnotation
-		  (methodUnitEClass, 
-		   source, 
-		   new String[] {
-			 "name", "MethodUnit",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getMethodUnit_Copyright(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Copyright"
-		   });			
-		addAnnotation
-		  (getMethodUnit_Authors(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "authors"
-		   });			
-		addAnnotation
-		  (getMethodUnit_ChangeDate(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "changeDate"
-		   });			
-		addAnnotation
-		  (getMethodUnit_ChangeDescription(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "changeDescription"
-		   });			
-		addAnnotation
-		  (getMethodUnit_Version(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "version"
-		   });			
-		addAnnotation
-		  (milestoneEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Milestone",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (namedElementEClass, 
-		   source, 
-		   new String[] {
-			 "name", "NamedElement",
-			 "kind", "empty"
-		   });		
-		addAnnotation
-		  (getNamedElement_Name(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "name"
-		   });			
-		addAnnotation
-		  (outcomeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Outcome",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (packageableElementEClass, 
-		   source, 
-		   new String[] {
-			 "name", "PackageableElement",
-			 "kind", "empty"
-		   });			
-		addAnnotation
-		  (phaseEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Phase",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (planningDataEClass, 
-		   source, 
-		   new String[] {
-			 "name", "PlanningData",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (getPlanningData_FinishDate(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "finishDate"
-		   });			
-		addAnnotation
-		  (getPlanningData_Rank(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "rank"
-		   });			
-		addAnnotation
-		  (getPlanningData_StartDate(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "startDate"
-		   });			
-		addAnnotation
-		  (practiceEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Practice",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getPractice_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:21"
-		   });		
-		addAnnotation
-		  (getPractice_ActivityReference(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ActivityReference",
-			 "group", "#group:21"
-		   });		
-		addAnnotation
-		  (getPractice_ContentReference(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ContentReference",
-			 "group", "#group:21"
-		   });		
-		addAnnotation
-		  (getPractice_SubPractice(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "SubPractice",
-			 "group", "#group:21"
-		   });			
-		addAnnotation
-		  (practiceDescriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "PracticeDescription",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (getPracticeDescription_AdditionalInfo(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "AdditionalInfo"
-		   });			
-		addAnnotation
-		  (getPracticeDescription_Application(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Application"
-		   });			
-		addAnnotation
-		  (getPracticeDescription_Background(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Background"
-		   });			
-		addAnnotation
-		  (getPracticeDescription_Goals(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Goals"
-		   });			
-		addAnnotation
-		  (getPracticeDescription_LevelsOfAdoption(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "LevelsOfAdoption"
-		   });			
-		addAnnotation
-		  (getPracticeDescription_Problem(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Problem"
-		   });			
-		addAnnotation
-		  (processEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Process",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getProcess_IncludesPattern(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "IncludesPattern"
-		   });		
-		addAnnotation
-		  (getProcess_DefaultContext(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "DefaultContext"
-		   });		
-		addAnnotation
-		  (getProcess_ValidContext(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ValidContext"
-		   });			
-		addAnnotation
-		  (processComponentEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ProcessComponent",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getProcessComponent_Copyright(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Copyright"
-		   });		
-		addAnnotation
-		  (getProcessComponent_Interface(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Interface"
-		   });		
-		addAnnotation
-		  (getProcessComponent_Process(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Process"
-		   });			
-		addAnnotation
-		  (getProcessComponent_Authors(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "authors"
-		   });			
-		addAnnotation
-		  (getProcessComponent_ChangeDate(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "changeDate"
-		   });			
-		addAnnotation
-		  (getProcessComponent_ChangeDescription(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "changeDescription"
-		   });			
-		addAnnotation
-		  (getProcessComponent_Version(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "version"
-		   });			
-		addAnnotation
-		  (processComponentInterfaceEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ProcessComponentInterface",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getProcessComponentInterface_Group1(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:19"
-		   });		
-		addAnnotation
-		  (getProcessComponentInterface_InterfaceSpecification(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "InterfaceSpecification",
-			 "group", "#group:19"
-		   });		
-		addAnnotation
-		  (getProcessComponentInterface_InterfaceIO(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "InterfaceIO",
-			 "group", "#group:19"
-		   });			
-		addAnnotation
-		  (processDescriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ProcessDescription",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (getProcessDescription_Scope(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Scope"
-		   });			
-		addAnnotation
-		  (getProcessDescription_UsageNotes(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "UsageNotes"
-		   });			
-		addAnnotation
-		  (getProcessDescription_ExternalId(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "externalId"
-		   });			
-		addAnnotation
-		  (processElementEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ProcessElement",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (processPackageEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ProcessPackage",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getProcessPackage_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:11"
-		   });		
-		addAnnotation
-		  (getProcessPackage_ProcessElement(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ProcessElement",
-			 "group", "#group:11"
-		   });			
-		addAnnotation
-		  (processPlanningTemplateEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ProcessPlanningTemplate",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getProcessPlanningTemplate_Group3(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:42"
-		   });		
-		addAnnotation
-		  (getProcessPlanningTemplate_BaseProcess(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "BaseProcess",
-			 "group", "#group:42"
-		   });			
-		addAnnotation
-		  (reportEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Report",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (reusableAssetEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ReusableAsset",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (roadmapEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Roadmap",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (roleEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Role",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getRole_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:21"
-		   });		
-		addAnnotation
-		  (getRole_ResponsibleFor(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ResponsibleFor",
-			 "group", "#group:21"
-		   });			
-		addAnnotation
-		  (roleDescriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "RoleDescription",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (getRoleDescription_AssignmentApproaches(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "AssignmentApproaches"
-		   });			
-		addAnnotation
-		  (getRoleDescription_Skills(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Skills"
-		   });			
-		addAnnotation
-		  (getRoleDescription_Synonyms(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Synonyms"
-		   });			
-		addAnnotation
-		  (roleDescriptorEClass, 
-		   source, 
-		   new String[] {
-			 "name", "RoleDescriptor",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getRoleDescriptor_Role(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Role"
-		   });		
-		addAnnotation
-		  (getRoleDescriptor_ResponsibleFor(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ResponsibleFor"
-		   });			
-		addAnnotation
-		  (roleSetEClass, 
-		   source, 
-		   new String[] {
-			 "name", "RoleSet",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getRoleSet_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:21"
-		   });		
-		addAnnotation
-		  (getRoleSet_Role(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Role",
-			 "group", "#group:21"
-		   });			
-		addAnnotation
-		  (roleSetGroupingEClass, 
-		   source, 
-		   new String[] {
-			 "name", "RoleSetGrouping",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getRoleSetGrouping_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:21"
-		   });		
-		addAnnotation
-		  (getRoleSetGrouping_RoleSet(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "RoleSet",
-			 "group", "#group:21"
-		   });			
-		addAnnotation
-		  (sectionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Section",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getSection_SubSection(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "SubSection"
-		   });		
-		addAnnotation
-		  (getSection_Predecessor(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Predecessor"
-		   });			
-		addAnnotation
-		  (getSection_Description(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Description"
-		   });			
-		addAnnotation
-		  (getSection_SectionName(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "sectionName"
-		   });		
-		addAnnotation
-		  (getSection_VariabilityBasedOnElement(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "variabilityBasedOnElement"
-		   });		
-		addAnnotation
-		  (getSection_VariabilityType(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "variabilityType"
-		   });			
-		addAnnotation
-		  (supportingMaterialEClass, 
-		   source, 
-		   new String[] {
-			 "name", "SupportingMaterial",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (taskEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Task",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getTask_Precondition(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Precondition"
-		   });		
-		addAnnotation
-		  (getTask_Postcondition(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Postcondition"
-		   });		
-		addAnnotation
-		  (getTask_PerformedBy(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "PerformedBy"
-		   });		
-		addAnnotation
-		  (getTask_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:24"
-		   });		
-		addAnnotation
-		  (getTask_MandatoryInput(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "MandatoryInput",
-			 "group", "#group:24"
-		   });		
-		addAnnotation
-		  (getTask_Output(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Output",
-			 "group", "#group:24"
-		   });		
-		addAnnotation
-		  (getTask_AdditionallyPerformedBy(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "AdditionallyPerformedBy",
-			 "group", "#group:24"
-		   });		
-		addAnnotation
-		  (getTask_OptionalInput(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "OptionalInput",
-			 "group", "#group:24"
-		   });		
-		addAnnotation
-		  (getTask_Estimate(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Estimate",
-			 "group", "#group:24"
-		   });		
-		addAnnotation
-		  (getTask_EstimationConsiderations(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "EstimationConsiderations",
-			 "group", "#group:24"
-		   });		
-		addAnnotation
-		  (getTask_ToolMentor(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ToolMentor",
-			 "group", "#group:24"
-		   });			
-		addAnnotation
-		  (taskDescriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "TaskDescription",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (getTaskDescription_Alternatives(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Alternatives"
-		   });			
-		addAnnotation
-		  (getTaskDescription_Purpose(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Purpose"
-		   });			
-		addAnnotation
-		  (taskDescriptorEClass, 
-		   source, 
-		   new String[] {
-			 "name", "TaskDescriptor",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getTaskDescriptor_Task(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Task"
-		   });		
-		addAnnotation
-		  (getTaskDescriptor_PerformedPrimarilyBy(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "PerformedPrimarilyBy"
-		   });		
-		addAnnotation
-		  (getTaskDescriptor_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:26"
-		   });		
-		addAnnotation
-		  (getTaskDescriptor_AdditionallyPerformedBy(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "AdditionallyPerformedBy",
-			 "group", "#group:26"
-		   });		
-		addAnnotation
-		  (getTaskDescriptor_AssistedBy(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "AssistedBy",
-			 "group", "#group:26"
-		   });		
-		addAnnotation
-		  (getTaskDescriptor_ExternalInput(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ExternalInput",
-			 "group", "#group:26"
-		   });		
-		addAnnotation
-		  (getTaskDescriptor_MandatoryInput(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "MandatoryInput",
-			 "group", "#group:26"
-		   });		
-		addAnnotation
-		  (getTaskDescriptor_OptionalInput(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "OptionalInput",
-			 "group", "#group:26"
-		   });		
-		addAnnotation
-		  (getTaskDescriptor_Output(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Output",
-			 "group", "#group:26"
-		   });		
-		addAnnotation
-		  (getTaskDescriptor_Step(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Step"
-		   });		
-		addAnnotation
-		  (getTaskDescriptor_IsSynchronizedWithSource(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "isSynchronizedWithSource"
-		   });			
-		addAnnotation
-		  (teamProfileEClass, 
-		   source, 
-		   new String[] {
-			 "name", "TeamProfile",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getTeamProfile_Group1(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:19"
-		   });		
-		addAnnotation
-		  (getTeamProfile_Role(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Role",
-			 "group", "#group:19"
-		   });		
-		addAnnotation
-		  (getTeamProfile_SuperTeam(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "SuperTeam",
-			 "group", "#group:19"
-		   });		
-		addAnnotation
-		  (getTeamProfile_SubTeam(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "SubTeam",
-			 "group", "#group:19"
-		   });			
-		addAnnotation
-		  (templateEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Template",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (termDefinitionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "TermDefinition",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (toolEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Tool",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getTool_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:21"
-		   });		
-		addAnnotation
-		  (getTool_ToolMentor(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ToolMentor",
-			 "group", "#group:21"
-		   });			
-		addAnnotation
-		  (toolMentorEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ToolMentor",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (variabilityTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "VariabilityType"
-		   });		
-		addAnnotation
-		  (variabilityTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "VariabilityType:Object",
-			 "baseType", "VariabilityType"
-		   });			
-		addAnnotation
-		  (whitepaperEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Whitepaper",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (workBreakdownElementEClass, 
-		   source, 
-		   new String[] {
-			 "name", "WorkBreakdownElement",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getWorkBreakdownElement_Group1(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:19"
-		   });		
-		addAnnotation
-		  (getWorkBreakdownElement_Predecessor(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Predecessor",
-			 "group", "#group:19"
-		   });			
-		addAnnotation
-		  (getWorkBreakdownElement_IsEventDriven(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "isEventDriven"
-		   });			
-		addAnnotation
-		  (getWorkBreakdownElement_IsOngoing(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "isOngoing"
-		   });			
-		addAnnotation
-		  (getWorkBreakdownElement_IsRepeatable(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "isRepeatable"
-		   });			
-		addAnnotation
-		  (workDefinitionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "WorkDefinition",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getWorkDefinition_Precondition(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Precondition"
-		   });		
-		addAnnotation
-		  (getWorkDefinition_Postcondition(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Postcondition"
-		   });			
-		addAnnotation
-		  (workOrderEClass, 
-		   source, 
-		   new String[] {
-			 "name", "WorkOrder",
-			 "kind", "simple"
-		   });		
-		addAnnotation
-		  (getWorkOrder_Value(), 
-		   source, 
-		   new String[] {
-			 "name", ":0",
-			 "kind", "simple"
-		   });			
-		addAnnotation
-		  (getWorkOrder_LinkType(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "linkType"
-		   });			
-		addAnnotation
-		  (workOrderTypeEEnum, 
-		   source, 
-		   new String[] {
-			 "name", "WorkOrderType"
-		   });		
-		addAnnotation
-		  (workOrderTypeObjectEDataType, 
-		   source, 
-		   new String[] {
-			 "name", "WorkOrderType:Object",
-			 "baseType", "WorkOrderType"
-		   });			
-		addAnnotation
-		  (workProductEClass, 
-		   source, 
-		   new String[] {
-			 "name", "WorkProduct",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getWorkProduct_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:21"
-		   });		
-		addAnnotation
-		  (getWorkProduct_Estimate(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Estimate",
-			 "group", "#group:21"
-		   });		
-		addAnnotation
-		  (getWorkProduct_EstimationConsiderations(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "EstimationConsiderations",
-			 "group", "#group:21"
-		   });		
-		addAnnotation
-		  (getWorkProduct_Report(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Report",
-			 "group", "#group:21"
-		   });		
-		addAnnotation
-		  (getWorkProduct_Template(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Template",
-			 "group", "#group:21"
-		   });		
-		addAnnotation
-		  (getWorkProduct_ToolMentor(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ToolMentor",
-			 "group", "#group:21"
-		   });			
-		addAnnotation
-		  (workProductDescriptionEClass, 
-		   source, 
-		   new String[] {
-			 "name", "WorkProductDescription",
-			 "kind", "elementOnly"
-		   });			
-		addAnnotation
-		  (getWorkProductDescription_ImpactOfNotHaving(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ImpactOfNotHaving"
-		   });			
-		addAnnotation
-		  (getWorkProductDescription_Purpose(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Purpose"
-		   });			
-		addAnnotation
-		  (getWorkProductDescription_ReasonsForNotNeeding(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ReasonsForNotNeeding"
-		   });			
-		addAnnotation
-		  (getWorkProductDescription_ExternalId(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "externalId"
-		   });			
-		addAnnotation
-		  (workProductDescriptorEClass, 
-		   source, 
-		   new String[] {
-			 "name", "WorkProductDescriptor",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getWorkProductDescriptor_WorkProduct(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "WorkProduct"
-		   });		
-		addAnnotation
-		  (getWorkProductDescriptor_Group1(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:22"
-		   });		
-		addAnnotation
-		  (getWorkProductDescriptor_ImpactedBy(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ImpactedBy",
-			 "group", "#group:22"
-		   });		
-		addAnnotation
-		  (getWorkProductDescriptor_Impacts(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Impacts",
-			 "group", "#group:22"
-		   });		
-		addAnnotation
-		  (getWorkProductDescriptor_DeliverableParts(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "DeliverableParts",
-			 "group", "#group:22"
-		   });			
-		addAnnotation
-		  (getWorkProductDescriptor_ActivityEntryState(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "activityEntryState"
-		   });			
-		addAnnotation
-		  (getWorkProductDescriptor_ActivityExitState(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute",
-			 "name", "activityExitState"
-		   });			
-		addAnnotation
-		  (workProductTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "WorkProductType",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getWorkProductType_Group2(), 
-		   source, 
-		   new String[] {
-			 "kind", "group",
-			 "name", "group:21"
-		   });		
-		addAnnotation
-		  (getWorkProductType_WorkProduct(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "WorkProduct",
-			 "group", "#group:21"
-		   });
-	}
-
-} //UmaPackageImpl
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WhitepaperImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WhitepaperImpl.java
deleted file mode 100755
index c30353e..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WhitepaperImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WhitepaperImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.Whitepaper;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Whitepaper</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class WhitepaperImpl extends ConceptImpl implements Whitepaper {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WhitepaperImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WHITEPAPER;
-	}
-
-} //WhitepaperImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkBreakdownElementImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkBreakdownElementImpl.java
deleted file mode 100755
index 9b5716d..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkBreakdownElementImpl.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkBreakdownElementImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.WorkBreakdownElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Work Breakdown Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkBreakdownElementImpl#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkBreakdownElementImpl#getPredecessor <em>Predecessor</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkBreakdownElementImpl#isIsEventDriven <em>Is Event Driven</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkBreakdownElementImpl#isIsOngoing <em>Is Ongoing</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkBreakdownElementImpl#isIsRepeatable <em>Is Repeatable</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkBreakdownElementImpl extends BreakdownElementImpl implements WorkBreakdownElement {
-	/**
-	 * The cached value of the '{@link #getGroup1() <em>Group1</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup1()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group1 = null;
-
-	/**
-	 * The default value of the '{@link #isIsEventDriven() <em>Is Event Driven</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsEventDriven()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_EVENT_DRIVEN_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsEventDriven() <em>Is Event Driven</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsEventDriven()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isEventDriven = IS_EVENT_DRIVEN_EDEFAULT;
-
-	/**
-	 * This is true if the Is Event Driven attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isEventDrivenESet = false;
-
-	/**
-	 * The default value of the '{@link #isIsOngoing() <em>Is Ongoing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsOngoing()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_ONGOING_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsOngoing() <em>Is Ongoing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsOngoing()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isOngoing = IS_ONGOING_EDEFAULT;
-
-	/**
-	 * This is true if the Is Ongoing attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isOngoingESet = false;
-
-	/**
-	 * The default value of the '{@link #isIsRepeatable() <em>Is Repeatable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsRepeatable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_REPEATABLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsRepeatable() <em>Is Repeatable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsRepeatable()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isRepeatable = IS_REPEATABLE_EDEFAULT;
-
-	/**
-	 * This is true if the Is Repeatable attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isRepeatableESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkBreakdownElementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WORK_BREAKDOWN_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup1() {
-		if (group1 == null) {
-			group1 = new BasicFeatureMap(this, UmaPackage.WORK_BREAKDOWN_ELEMENT__GROUP1);
-		}
-		return group1;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getPredecessor() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.WORK_BREAKDOWN_ELEMENT__PREDECESSOR);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsEventDriven() {
-		return isEventDriven;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsEventDriven(boolean newIsEventDriven) {
-		boolean oldIsEventDriven = isEventDriven;
-		isEventDriven = newIsEventDriven;
-		boolean oldIsEventDrivenESet = isEventDrivenESet;
-		isEventDrivenESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN, oldIsEventDriven, isEventDriven, !oldIsEventDrivenESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsEventDriven() {
-		boolean oldIsEventDriven = isEventDriven;
-		boolean oldIsEventDrivenESet = isEventDrivenESet;
-		isEventDriven = IS_EVENT_DRIVEN_EDEFAULT;
-		isEventDrivenESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN, oldIsEventDriven, IS_EVENT_DRIVEN_EDEFAULT, oldIsEventDrivenESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsEventDriven() {
-		return isEventDrivenESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsOngoing() {
-		return isOngoing;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsOngoing(boolean newIsOngoing) {
-		boolean oldIsOngoing = isOngoing;
-		isOngoing = newIsOngoing;
-		boolean oldIsOngoingESet = isOngoingESet;
-		isOngoingESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_ONGOING, oldIsOngoing, isOngoing, !oldIsOngoingESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsOngoing() {
-		boolean oldIsOngoing = isOngoing;
-		boolean oldIsOngoingESet = isOngoingESet;
-		isOngoing = IS_ONGOING_EDEFAULT;
-		isOngoingESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_ONGOING, oldIsOngoing, IS_ONGOING_EDEFAULT, oldIsOngoingESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsOngoing() {
-		return isOngoingESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsRepeatable() {
-		return isRepeatable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsRepeatable(boolean newIsRepeatable) {
-		boolean oldIsRepeatable = isRepeatable;
-		isRepeatable = newIsRepeatable;
-		boolean oldIsRepeatableESet = isRepeatableESet;
-		isRepeatableESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE, oldIsRepeatable, isRepeatable, !oldIsRepeatableESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsRepeatable() {
-		boolean oldIsRepeatable = isRepeatable;
-		boolean oldIsRepeatableESet = isRepeatableESet;
-		isRepeatable = IS_REPEATABLE_EDEFAULT;
-		isRepeatableESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE, oldIsRepeatable, IS_REPEATABLE_EDEFAULT, oldIsRepeatableESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsRepeatable() {
-		return isRepeatableESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__GROUP1:
-				return ((InternalEList)getGroup1()).basicRemove(otherEnd, msgs);
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__PREDECESSOR:
-				return ((InternalEList)getPredecessor()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__GROUP1:
-				if (coreType) return getGroup1();
-				return ((FeatureMap.Internal)getGroup1()).getWrapper();
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__PREDECESSOR:
-				return getPredecessor();
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN:
-				return isIsEventDriven() ? Boolean.TRUE : Boolean.FALSE;
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_ONGOING:
-				return isIsOngoing() ? Boolean.TRUE : Boolean.FALSE;
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE:
-				return isIsRepeatable() ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__GROUP1:
-				((FeatureMap.Internal)getGroup1()).set(newValue);
-				return;
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__PREDECESSOR:
-				getPredecessor().clear();
-				getPredecessor().addAll((Collection)newValue);
-				return;
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN:
-				setIsEventDriven(((Boolean)newValue).booleanValue());
-				return;
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_ONGOING:
-				setIsOngoing(((Boolean)newValue).booleanValue());
-				return;
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE:
-				setIsRepeatable(((Boolean)newValue).booleanValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__GROUP1:
-				getGroup1().clear();
-				return;
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__PREDECESSOR:
-				getPredecessor().clear();
-				return;
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN:
-				unsetIsEventDriven();
-				return;
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_ONGOING:
-				unsetIsOngoing();
-				return;
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE:
-				unsetIsRepeatable();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__GROUP1:
-				return group1 != null && !group1.isEmpty();
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__PREDECESSOR:
-				return !getPredecessor().isEmpty();
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_EVENT_DRIVEN:
-				return isSetIsEventDriven();
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_ONGOING:
-				return isSetIsOngoing();
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT__IS_REPEATABLE:
-				return isSetIsRepeatable();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group1: ");
-		result.append(group1);
-		result.append(", isEventDriven: ");
-		if (isEventDrivenESet) result.append(isEventDriven); else result.append("<unset>");
-		result.append(", isOngoing: ");
-		if (isOngoingESet) result.append(isOngoing); else result.append("<unset>");
-		result.append(", isRepeatable: ");
-		if (isRepeatableESet) result.append(isRepeatable); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //WorkBreakdownElementImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkDefinitionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkDefinitionImpl.java
deleted file mode 100755
index 974c061..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkDefinitionImpl.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkDefinitionImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.WorkDefinition;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Work Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkDefinitionImpl#getPrecondition <em>Precondition</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkDefinitionImpl#getPostcondition <em>Postcondition</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkDefinitionImpl extends MethodElementImpl implements WorkDefinition {
-	/**
-	 * The default value of the '{@link #getPrecondition() <em>Precondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrecondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PRECONDITION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPrecondition() <em>Precondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrecondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected String precondition = PRECONDITION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPostcondition() <em>Postcondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostcondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String POSTCONDITION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPostcondition() <em>Postcondition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostcondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected String postcondition = POSTCONDITION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkDefinitionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WORK_DEFINITION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPrecondition() {
-		return precondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPrecondition(String newPrecondition) {
-		String oldPrecondition = precondition;
-		precondition = newPrecondition;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.WORK_DEFINITION__PRECONDITION, oldPrecondition, precondition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPostcondition() {
-		return postcondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPostcondition(String newPostcondition) {
-		String oldPostcondition = postcondition;
-		postcondition = newPostcondition;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.WORK_DEFINITION__POSTCONDITION, oldPostcondition, postcondition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.WORK_DEFINITION__PRECONDITION:
-				return getPrecondition();
-			case UmaPackage.WORK_DEFINITION__POSTCONDITION:
-				return getPostcondition();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.WORK_DEFINITION__PRECONDITION:
-				setPrecondition((String)newValue);
-				return;
-			case UmaPackage.WORK_DEFINITION__POSTCONDITION:
-				setPostcondition((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.WORK_DEFINITION__PRECONDITION:
-				setPrecondition(PRECONDITION_EDEFAULT);
-				return;
-			case UmaPackage.WORK_DEFINITION__POSTCONDITION:
-				setPostcondition(POSTCONDITION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.WORK_DEFINITION__PRECONDITION:
-				return PRECONDITION_EDEFAULT == null ? precondition != null : !PRECONDITION_EDEFAULT.equals(precondition);
-			case UmaPackage.WORK_DEFINITION__POSTCONDITION:
-				return POSTCONDITION_EDEFAULT == null ? postcondition != null : !POSTCONDITION_EDEFAULT.equals(postcondition);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (precondition: ");
-		result.append(precondition);
-		result.append(", postcondition: ");
-		result.append(postcondition);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WorkDefinitionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkOrderImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkOrderImpl.java
deleted file mode 100755
index 36a5468..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkOrderImpl.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkOrderImpl.java,v 1.4 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.sdo.impl.EDataObjectImpl;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.WorkOrder;
-import org.eclipse.epf.xml.uma.WorkOrderType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Work Order</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkOrderImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkOrderImpl#getLinkType <em>Link Type</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkOrderImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkOrderImpl extends EDataObjectImpl implements WorkOrder {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLinkType() <em>Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLinkType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final WorkOrderType LINK_TYPE_EDEFAULT = WorkOrderType.FINISH_TO_START_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getLinkType() <em>Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLinkType()
-	 * @generated
-	 * @ordered
-	 */
-	protected WorkOrderType linkType = LINK_TYPE_EDEFAULT;
-
-	/**
-	 * This is true if the Link Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean linkTypeESet = false;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkOrderImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WORK_ORDER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.WORK_ORDER__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkOrderType getLinkType() {
-		return linkType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLinkType(WorkOrderType newLinkType) {
-		WorkOrderType oldLinkType = linkType;
-		linkType = newLinkType == null ? LINK_TYPE_EDEFAULT : newLinkType;
-		boolean oldLinkTypeESet = linkTypeESet;
-		linkTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.WORK_ORDER__LINK_TYPE, oldLinkType, linkType, !oldLinkTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetLinkType() {
-		WorkOrderType oldLinkType = linkType;
-		boolean oldLinkTypeESet = linkTypeESet;
-		linkType = LINK_TYPE_EDEFAULT;
-		linkTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, UmaPackage.WORK_ORDER__LINK_TYPE, oldLinkType, LINK_TYPE_EDEFAULT, oldLinkTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetLinkType() {
-		return linkTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.WORK_ORDER__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.WORK_ORDER__VALUE:
-				return getValue();
-			case UmaPackage.WORK_ORDER__LINK_TYPE:
-				return getLinkType();
-			case UmaPackage.WORK_ORDER__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.WORK_ORDER__VALUE:
-				setValue((String)newValue);
-				return;
-			case UmaPackage.WORK_ORDER__LINK_TYPE:
-				setLinkType((WorkOrderType)newValue);
-				return;
-			case UmaPackage.WORK_ORDER__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.WORK_ORDER__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case UmaPackage.WORK_ORDER__LINK_TYPE:
-				unsetLinkType();
-				return;
-			case UmaPackage.WORK_ORDER__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.WORK_ORDER__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case UmaPackage.WORK_ORDER__LINK_TYPE:
-				return isSetLinkType();
-			case UmaPackage.WORK_ORDER__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(", linkType: ");
-		if (linkTypeESet) result.append(linkType); else result.append("<unset>");
-		result.append(", id: ");
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WorkOrderImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkProductDescriptionImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkProductDescriptionImpl.java
deleted file mode 100755
index 46750f2..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkProductDescriptionImpl.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkProductDescriptionImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.WorkProductDescription;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Work Product Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductDescriptionImpl#getImpactOfNotHaving <em>Impact Of Not Having</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductDescriptionImpl#getPurpose <em>Purpose</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductDescriptionImpl#getReasonsForNotNeeding <em>Reasons For Not Needing</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductDescriptionImpl#getExternalId <em>External Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkProductDescriptionImpl extends ContentDescriptionImpl implements WorkProductDescription {
-	/**
-	 * The default value of the '{@link #getImpactOfNotHaving() <em>Impact Of Not Having</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImpactOfNotHaving()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String IMPACT_OF_NOT_HAVING_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getImpactOfNotHaving() <em>Impact Of Not Having</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImpactOfNotHaving()
-	 * @generated
-	 * @ordered
-	 */
-	protected String impactOfNotHaving = IMPACT_OF_NOT_HAVING_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPurpose()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PURPOSE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPurpose()
-	 * @generated
-	 * @ordered
-	 */
-	protected String purpose = PURPOSE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getReasonsForNotNeeding() <em>Reasons For Not Needing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReasonsForNotNeeding()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REASONS_FOR_NOT_NEEDING_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getReasonsForNotNeeding() <em>Reasons For Not Needing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReasonsForNotNeeding()
-	 * @generated
-	 * @ordered
-	 */
-	protected String reasonsForNotNeeding = REASONS_FOR_NOT_NEEDING_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getExternalId() <em>External Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExternalId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXTERNAL_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExternalId() <em>External Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExternalId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String externalId = EXTERNAL_ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkProductDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WORK_PRODUCT_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getImpactOfNotHaving() {
-		return impactOfNotHaving;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImpactOfNotHaving(String newImpactOfNotHaving) {
-		String oldImpactOfNotHaving = impactOfNotHaving;
-		impactOfNotHaving = newImpactOfNotHaving;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING, oldImpactOfNotHaving, impactOfNotHaving));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPurpose() {
-		return purpose;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPurpose(String newPurpose) {
-		String oldPurpose = purpose;
-		purpose = newPurpose;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.WORK_PRODUCT_DESCRIPTION__PURPOSE, oldPurpose, purpose));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getReasonsForNotNeeding() {
-		return reasonsForNotNeeding;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReasonsForNotNeeding(String newReasonsForNotNeeding) {
-		String oldReasonsForNotNeeding = reasonsForNotNeeding;
-		reasonsForNotNeeding = newReasonsForNotNeeding;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING, oldReasonsForNotNeeding, reasonsForNotNeeding));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getExternalId() {
-		return externalId;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExternalId(String newExternalId) {
-		String oldExternalId = externalId;
-		externalId = newExternalId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID, oldExternalId, externalId));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING:
-				return getImpactOfNotHaving();
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__PURPOSE:
-				return getPurpose();
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING:
-				return getReasonsForNotNeeding();
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID:
-				return getExternalId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING:
-				setImpactOfNotHaving((String)newValue);
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__PURPOSE:
-				setPurpose((String)newValue);
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING:
-				setReasonsForNotNeeding((String)newValue);
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID:
-				setExternalId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING:
-				setImpactOfNotHaving(IMPACT_OF_NOT_HAVING_EDEFAULT);
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__PURPOSE:
-				setPurpose(PURPOSE_EDEFAULT);
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING:
-				setReasonsForNotNeeding(REASONS_FOR_NOT_NEEDING_EDEFAULT);
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID:
-				setExternalId(EXTERNAL_ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__IMPACT_OF_NOT_HAVING:
-				return IMPACT_OF_NOT_HAVING_EDEFAULT == null ? impactOfNotHaving != null : !IMPACT_OF_NOT_HAVING_EDEFAULT.equals(impactOfNotHaving);
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__PURPOSE:
-				return PURPOSE_EDEFAULT == null ? purpose != null : !PURPOSE_EDEFAULT.equals(purpose);
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__REASONS_FOR_NOT_NEEDING:
-				return REASONS_FOR_NOT_NEEDING_EDEFAULT == null ? reasonsForNotNeeding != null : !REASONS_FOR_NOT_NEEDING_EDEFAULT.equals(reasonsForNotNeeding);
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION__EXTERNAL_ID:
-				return EXTERNAL_ID_EDEFAULT == null ? externalId != null : !EXTERNAL_ID_EDEFAULT.equals(externalId);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (impactOfNotHaving: ");
-		result.append(impactOfNotHaving);
-		result.append(", purpose: ");
-		result.append(purpose);
-		result.append(", reasonsForNotNeeding: ");
-		result.append(reasonsForNotNeeding);
-		result.append(", externalId: ");
-		result.append(externalId);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WorkProductDescriptionImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkProductDescriptorImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkProductDescriptorImpl.java
deleted file mode 100755
index 14eef87..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkProductDescriptorImpl.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkProductDescriptorImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.WorkProductDescriptor;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Work Product Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductDescriptorImpl#getWorkProduct <em>Work Product</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductDescriptorImpl#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductDescriptorImpl#getImpactedBy <em>Impacted By</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductDescriptorImpl#getImpacts <em>Impacts</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductDescriptorImpl#getDeliverableParts <em>Deliverable Parts</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductDescriptorImpl#getActivityEntryState <em>Activity Entry State</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductDescriptorImpl#getActivityExitState <em>Activity Exit State</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkProductDescriptorImpl extends DescriptorImpl implements WorkProductDescriptor {
-	/**
-	 * The default value of the '{@link #getWorkProduct() <em>Work Product</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkProduct()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String WORK_PRODUCT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWorkProduct() <em>Work Product</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkProduct()
-	 * @generated
-	 * @ordered
-	 */
-	protected String workProduct = WORK_PRODUCT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getGroup1() <em>Group1</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup1()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group1 = null;
-
-	/**
-	 * The default value of the '{@link #getActivityEntryState() <em>Activity Entry State</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivityEntryState()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ACTIVITY_ENTRY_STATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActivityEntryState() <em>Activity Entry State</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivityEntryState()
-	 * @generated
-	 * @ordered
-	 */
-	protected String activityEntryState = ACTIVITY_ENTRY_STATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActivityExitState() <em>Activity Exit State</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivityExitState()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ACTIVITY_EXIT_STATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActivityExitState() <em>Activity Exit State</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivityExitState()
-	 * @generated
-	 * @ordered
-	 */
-	protected String activityExitState = ACTIVITY_EXIT_STATE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkProductDescriptorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WORK_PRODUCT_DESCRIPTOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getWorkProduct() {
-		return workProduct;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWorkProduct(String newWorkProduct) {
-		String oldWorkProduct = workProduct;
-		workProduct = newWorkProduct;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT, oldWorkProduct, workProduct));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup1() {
-		if (group1 == null) {
-			group1 = new BasicFeatureMap(this, UmaPackage.WORK_PRODUCT_DESCRIPTOR__GROUP1);
-		}
-		return group1;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getImpactedBy() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getImpacts() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.WORK_PRODUCT_DESCRIPTOR__IMPACTS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDeliverableParts() {
-		return ((FeatureMap)getGroup1()).list(UmaPackage.Literals.WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getActivityEntryState() {
-		return activityEntryState;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActivityEntryState(String newActivityEntryState) {
-		String oldActivityEntryState = activityEntryState;
-		activityEntryState = newActivityEntryState;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE, oldActivityEntryState, activityEntryState));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getActivityExitState() {
-		return activityExitState;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActivityExitState(String newActivityExitState) {
-		String oldActivityExitState = activityExitState;
-		activityExitState = newActivityExitState;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE, oldActivityExitState, activityExitState));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__GROUP1:
-				return ((InternalEList)getGroup1()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT:
-				return getWorkProduct();
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__GROUP1:
-				if (coreType) return getGroup1();
-				return ((FeatureMap.Internal)getGroup1()).getWrapper();
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY:
-				return getImpactedBy();
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTS:
-				return getImpacts();
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS:
-				return getDeliverableParts();
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE:
-				return getActivityEntryState();
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE:
-				return getActivityExitState();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT:
-				setWorkProduct((String)newValue);
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__GROUP1:
-				((FeatureMap.Internal)getGroup1()).set(newValue);
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY:
-				getImpactedBy().clear();
-				getImpactedBy().addAll((Collection)newValue);
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTS:
-				getImpacts().clear();
-				getImpacts().addAll((Collection)newValue);
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS:
-				getDeliverableParts().clear();
-				getDeliverableParts().addAll((Collection)newValue);
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE:
-				setActivityEntryState((String)newValue);
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE:
-				setActivityExitState((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT:
-				setWorkProduct(WORK_PRODUCT_EDEFAULT);
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__GROUP1:
-				getGroup1().clear();
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY:
-				getImpactedBy().clear();
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTS:
-				getImpacts().clear();
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS:
-				getDeliverableParts().clear();
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE:
-				setActivityEntryState(ACTIVITY_ENTRY_STATE_EDEFAULT);
-				return;
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE:
-				setActivityExitState(ACTIVITY_EXIT_STATE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__WORK_PRODUCT:
-				return WORK_PRODUCT_EDEFAULT == null ? workProduct != null : !WORK_PRODUCT_EDEFAULT.equals(workProduct);
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__GROUP1:
-				return group1 != null && !group1.isEmpty();
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTED_BY:
-				return !getImpactedBy().isEmpty();
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__IMPACTS:
-				return !getImpacts().isEmpty();
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__DELIVERABLE_PARTS:
-				return !getDeliverableParts().isEmpty();
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_ENTRY_STATE:
-				return ACTIVITY_ENTRY_STATE_EDEFAULT == null ? activityEntryState != null : !ACTIVITY_ENTRY_STATE_EDEFAULT.equals(activityEntryState);
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR__ACTIVITY_EXIT_STATE:
-				return ACTIVITY_EXIT_STATE_EDEFAULT == null ? activityExitState != null : !ACTIVITY_EXIT_STATE_EDEFAULT.equals(activityExitState);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (workProduct: ");
-		result.append(workProduct);
-		result.append(", group1: ");
-		result.append(group1);
-		result.append(", activityEntryState: ");
-		result.append(activityEntryState);
-		result.append(", activityExitState: ");
-		result.append(activityExitState);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WorkProductDescriptorImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkProductImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkProductImpl.java
deleted file mode 100755
index 1a4f805..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkProductImpl.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkProductImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.WorkProduct;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Work Product</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductImpl#getEstimate <em>Estimate</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductImpl#getEstimationConsiderations <em>Estimation Considerations</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductImpl#getReport <em>Report</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductImpl#getTemplate <em>Template</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductImpl#getToolMentor <em>Tool Mentor</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkProductImpl extends ContentElementImpl implements WorkProduct {
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkProductImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WORK_PRODUCT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.WORK_PRODUCT__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEstimate() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.WORK_PRODUCT__ESTIMATE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEstimationConsiderations() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.WORK_PRODUCT__ESTIMATION_CONSIDERATIONS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getReport() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.WORK_PRODUCT__REPORT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTemplate() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.WORK_PRODUCT__TEMPLATE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getToolMentor() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.WORK_PRODUCT__TOOL_MENTOR);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.WORK_PRODUCT__ESTIMATE:
-				return getEstimate();
-			case UmaPackage.WORK_PRODUCT__ESTIMATION_CONSIDERATIONS:
-				return getEstimationConsiderations();
-			case UmaPackage.WORK_PRODUCT__REPORT:
-				return getReport();
-			case UmaPackage.WORK_PRODUCT__TEMPLATE:
-				return getTemplate();
-			case UmaPackage.WORK_PRODUCT__TOOL_MENTOR:
-				return getToolMentor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.WORK_PRODUCT__ESTIMATE:
-				getEstimate().clear();
-				getEstimate().addAll((Collection)newValue);
-				return;
-			case UmaPackage.WORK_PRODUCT__ESTIMATION_CONSIDERATIONS:
-				getEstimationConsiderations().clear();
-				getEstimationConsiderations().addAll((Collection)newValue);
-				return;
-			case UmaPackage.WORK_PRODUCT__REPORT:
-				getReport().clear();
-				getReport().addAll((Collection)newValue);
-				return;
-			case UmaPackage.WORK_PRODUCT__TEMPLATE:
-				getTemplate().clear();
-				getTemplate().addAll((Collection)newValue);
-				return;
-			case UmaPackage.WORK_PRODUCT__TOOL_MENTOR:
-				getToolMentor().clear();
-				getToolMentor().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.WORK_PRODUCT__ESTIMATE:
-				getEstimate().clear();
-				return;
-			case UmaPackage.WORK_PRODUCT__ESTIMATION_CONSIDERATIONS:
-				getEstimationConsiderations().clear();
-				return;
-			case UmaPackage.WORK_PRODUCT__REPORT:
-				getReport().clear();
-				return;
-			case UmaPackage.WORK_PRODUCT__TEMPLATE:
-				getTemplate().clear();
-				return;
-			case UmaPackage.WORK_PRODUCT__TOOL_MENTOR:
-				getToolMentor().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.WORK_PRODUCT__ESTIMATE:
-				return !getEstimate().isEmpty();
-			case UmaPackage.WORK_PRODUCT__ESTIMATION_CONSIDERATIONS:
-				return !getEstimationConsiderations().isEmpty();
-			case UmaPackage.WORK_PRODUCT__REPORT:
-				return !getReport().isEmpty();
-			case UmaPackage.WORK_PRODUCT__TEMPLATE:
-				return !getTemplate().isEmpty();
-			case UmaPackage.WORK_PRODUCT__TOOL_MENTOR:
-				return !getToolMentor().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WorkProductImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkProductTypeImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkProductTypeImpl.java
deleted file mode 100755
index 19d165e..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/WorkProductTypeImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: WorkProductTypeImpl.java,v 1.3 2006/09/07 00:05:59 klow Exp $
- */
-package org.eclipse.epf.xml.uma.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.WorkProductType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Work Product Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductTypeImpl#getGroup2 <em>Group2</em>}</li>
- *   <li>{@link org.eclipse.epf.xml.uma.impl.WorkProductTypeImpl#getWorkProduct <em>Work Product</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkProductTypeImpl extends ContentCategoryImpl implements WorkProductType {
-	/**
-	 * The cached value of the '{@link #getGroup2() <em>Group2</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup2()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureMap group2 = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkProductTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return UmaPackage.Literals.WORK_PRODUCT_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureMap getGroup2() {
-		if (group2 == null) {
-			group2 = new BasicFeatureMap(this, UmaPackage.WORK_PRODUCT_TYPE__GROUP2);
-		}
-		return group2;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getWorkProduct() {
-		return ((FeatureMap)getGroup2()).list(UmaPackage.Literals.WORK_PRODUCT_TYPE__WORK_PRODUCT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT_TYPE__GROUP2:
-				return ((InternalEList)getGroup2()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT_TYPE__GROUP2:
-				if (coreType) return getGroup2();
-				return ((FeatureMap.Internal)getGroup2()).getWrapper();
-			case UmaPackage.WORK_PRODUCT_TYPE__WORK_PRODUCT:
-				return getWorkProduct();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT_TYPE__GROUP2:
-				((FeatureMap.Internal)getGroup2()).set(newValue);
-				return;
-			case UmaPackage.WORK_PRODUCT_TYPE__WORK_PRODUCT:
-				getWorkProduct().clear();
-				getWorkProduct().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT_TYPE__GROUP2:
-				getGroup2().clear();
-				return;
-			case UmaPackage.WORK_PRODUCT_TYPE__WORK_PRODUCT:
-				getWorkProduct().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UmaPackage.WORK_PRODUCT_TYPE__GROUP2:
-				return group2 != null && !group2.isEmpty();
-			case UmaPackage.WORK_PRODUCT_TYPE__WORK_PRODUCT:
-				return !getWorkProduct().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (group2: ");
-		result.append(group2);
-		result.append(')');
-		return result.toString();
-	}
-
-} //WorkProductTypeImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/package.html b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/package.html
deleted file mode 100755
index 4ee28de..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/impl/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the implementation of the XML UMA model objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/package.html b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/package.html
deleted file mode 100755
index 746a192..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces for the UMA XML model objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaAdapterFactory.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaAdapterFactory.java
deleted file mode 100755
index 075f25e..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaAdapterFactory.java
+++ /dev/null
@@ -1,1611 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UmaAdapterFactory.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.xml.uma.Activity;
-import org.eclipse.epf.xml.uma.ActivityDescription;
-import org.eclipse.epf.xml.uma.Artifact;
-import org.eclipse.epf.xml.uma.ArtifactDescription;
-import org.eclipse.epf.xml.uma.BreakdownElement;
-import org.eclipse.epf.xml.uma.BreakdownElementDescription;
-import org.eclipse.epf.xml.uma.CapabilityPattern;
-import org.eclipse.epf.xml.uma.Checklist;
-import org.eclipse.epf.xml.uma.CompositeRole;
-import org.eclipse.epf.xml.uma.Concept;
-import org.eclipse.epf.xml.uma.Constraint;
-import org.eclipse.epf.xml.uma.ContentCategory;
-import org.eclipse.epf.xml.uma.ContentCategoryPackage;
-import org.eclipse.epf.xml.uma.ContentDescription;
-import org.eclipse.epf.xml.uma.ContentElement;
-import org.eclipse.epf.xml.uma.ContentPackage;
-import org.eclipse.epf.xml.uma.CustomCategory;
-import org.eclipse.epf.xml.uma.Deliverable;
-import org.eclipse.epf.xml.uma.DeliverableDescription;
-import org.eclipse.epf.xml.uma.DeliveryProcess;
-import org.eclipse.epf.xml.uma.DeliveryProcessDescription;
-import org.eclipse.epf.xml.uma.DescribableElement;
-import org.eclipse.epf.xml.uma.Descriptor;
-import org.eclipse.epf.xml.uma.DescriptorDescription;
-import org.eclipse.epf.xml.uma.Discipline;
-import org.eclipse.epf.xml.uma.DisciplineGrouping;
-import org.eclipse.epf.xml.uma.DocumentRoot;
-import org.eclipse.epf.xml.uma.Domain;
-import org.eclipse.epf.xml.uma.Element;
-import org.eclipse.epf.xml.uma.Estimate;
-import org.eclipse.epf.xml.uma.EstimatingMetric;
-import org.eclipse.epf.xml.uma.EstimationConsiderations;
-import org.eclipse.epf.xml.uma.Example;
-import org.eclipse.epf.xml.uma.Guidance;
-import org.eclipse.epf.xml.uma.GuidanceDescription;
-import org.eclipse.epf.xml.uma.Guideline;
-import org.eclipse.epf.xml.uma.Iteration;
-import org.eclipse.epf.xml.uma.MethodConfiguration;
-import org.eclipse.epf.xml.uma.MethodElement;
-import org.eclipse.epf.xml.uma.MethodLibrary;
-import org.eclipse.epf.xml.uma.MethodPackage;
-import org.eclipse.epf.xml.uma.MethodPlugin;
-import org.eclipse.epf.xml.uma.MethodUnit;
-import org.eclipse.epf.xml.uma.Milestone;
-import org.eclipse.epf.xml.uma.NamedElement;
-import org.eclipse.epf.xml.uma.Outcome;
-import org.eclipse.epf.xml.uma.PackageableElement;
-import org.eclipse.epf.xml.uma.Phase;
-import org.eclipse.epf.xml.uma.PlanningData;
-import org.eclipse.epf.xml.uma.Practice;
-import org.eclipse.epf.xml.uma.PracticeDescription;
-import org.eclipse.epf.xml.uma.ProcessComponent;
-import org.eclipse.epf.xml.uma.ProcessComponentInterface;
-import org.eclipse.epf.xml.uma.ProcessDescription;
-import org.eclipse.epf.xml.uma.ProcessElement;
-import org.eclipse.epf.xml.uma.ProcessPackage;
-import org.eclipse.epf.xml.uma.ProcessPlanningTemplate;
-import org.eclipse.epf.xml.uma.Report;
-import org.eclipse.epf.xml.uma.ReusableAsset;
-import org.eclipse.epf.xml.uma.Roadmap;
-import org.eclipse.epf.xml.uma.Role;
-import org.eclipse.epf.xml.uma.RoleDescription;
-import org.eclipse.epf.xml.uma.RoleDescriptor;
-import org.eclipse.epf.xml.uma.RoleSet;
-import org.eclipse.epf.xml.uma.RoleSetGrouping;
-import org.eclipse.epf.xml.uma.Section;
-import org.eclipse.epf.xml.uma.SupportingMaterial;
-import org.eclipse.epf.xml.uma.Task;
-import org.eclipse.epf.xml.uma.TaskDescription;
-import org.eclipse.epf.xml.uma.TaskDescriptor;
-import org.eclipse.epf.xml.uma.TeamProfile;
-import org.eclipse.epf.xml.uma.Template;
-import org.eclipse.epf.xml.uma.TermDefinition;
-import org.eclipse.epf.xml.uma.Tool;
-import org.eclipse.epf.xml.uma.ToolMentor;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.Whitepaper;
-import org.eclipse.epf.xml.uma.WorkBreakdownElement;
-import org.eclipse.epf.xml.uma.WorkDefinition;
-import org.eclipse.epf.xml.uma.WorkOrder;
-import org.eclipse.epf.xml.uma.WorkProduct;
-import org.eclipse.epf.xml.uma.WorkProductDescription;
-import org.eclipse.epf.xml.uma.WorkProductDescriptor;
-import org.eclipse.epf.xml.uma.WorkProductType;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.xml.uma.UmaPackage
- * @generated
- */
-public class UmaAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static UmaPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UmaAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = UmaPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UmaSwitch modelSwitch =
-		new UmaSwitch() {
-			public Object caseActivity(Activity object) {
-				return createActivityAdapter();
-			}
-			public Object caseActivityDescription(ActivityDescription object) {
-				return createActivityDescriptionAdapter();
-			}
-			public Object caseArtifact(Artifact object) {
-				return createArtifactAdapter();
-			}
-			public Object caseArtifactDescription(ArtifactDescription object) {
-				return createArtifactDescriptionAdapter();
-			}
-			public Object caseBreakdownElement(BreakdownElement object) {
-				return createBreakdownElementAdapter();
-			}
-			public Object caseBreakdownElementDescription(BreakdownElementDescription object) {
-				return createBreakdownElementDescriptionAdapter();
-			}
-			public Object caseCapabilityPattern(CapabilityPattern object) {
-				return createCapabilityPatternAdapter();
-			}
-			public Object caseChecklist(Checklist object) {
-				return createChecklistAdapter();
-			}
-			public Object caseCompositeRole(CompositeRole object) {
-				return createCompositeRoleAdapter();
-			}
-			public Object caseConcept(Concept object) {
-				return createConceptAdapter();
-			}
-			public Object caseConstraint(Constraint object) {
-				return createConstraintAdapter();
-			}
-			public Object caseContentCategory(ContentCategory object) {
-				return createContentCategoryAdapter();
-			}
-			public Object caseContentCategoryPackage(ContentCategoryPackage object) {
-				return createContentCategoryPackageAdapter();
-			}
-			public Object caseContentDescription(ContentDescription object) {
-				return createContentDescriptionAdapter();
-			}
-			public Object caseContentElement(ContentElement object) {
-				return createContentElementAdapter();
-			}
-			public Object caseContentPackage(ContentPackage object) {
-				return createContentPackageAdapter();
-			}
-			public Object caseCustomCategory(CustomCategory object) {
-				return createCustomCategoryAdapter();
-			}
-			public Object caseDeliverable(Deliverable object) {
-				return createDeliverableAdapter();
-			}
-			public Object caseDeliverableDescription(DeliverableDescription object) {
-				return createDeliverableDescriptionAdapter();
-			}
-			public Object caseDeliveryProcess(DeliveryProcess object) {
-				return createDeliveryProcessAdapter();
-			}
-			public Object caseDeliveryProcessDescription(DeliveryProcessDescription object) {
-				return createDeliveryProcessDescriptionAdapter();
-			}
-			public Object caseDescribableElement(DescribableElement object) {
-				return createDescribableElementAdapter();
-			}
-			public Object caseDescriptor(Descriptor object) {
-				return createDescriptorAdapter();
-			}
-			public Object caseDescriptorDescription(DescriptorDescription object) {
-				return createDescriptorDescriptionAdapter();
-			}
-			public Object caseDiscipline(Discipline object) {
-				return createDisciplineAdapter();
-			}
-			public Object caseDisciplineGrouping(DisciplineGrouping object) {
-				return createDisciplineGroupingAdapter();
-			}
-			public Object caseDocumentRoot(DocumentRoot object) {
-				return createDocumentRootAdapter();
-			}
-			public Object caseDomain(Domain object) {
-				return createDomainAdapter();
-			}
-			public Object caseElement(Element object) {
-				return createElementAdapter();
-			}
-			public Object caseEstimate(Estimate object) {
-				return createEstimateAdapter();
-			}
-			public Object caseEstimatingMetric(EstimatingMetric object) {
-				return createEstimatingMetricAdapter();
-			}
-			public Object caseEstimationConsiderations(EstimationConsiderations object) {
-				return createEstimationConsiderationsAdapter();
-			}
-			public Object caseExample(Example object) {
-				return createExampleAdapter();
-			}
-			public Object caseGuidance(Guidance object) {
-				return createGuidanceAdapter();
-			}
-			public Object caseGuidanceDescription(GuidanceDescription object) {
-				return createGuidanceDescriptionAdapter();
-			}
-			public Object caseGuideline(Guideline object) {
-				return createGuidelineAdapter();
-			}
-			public Object caseIteration(Iteration object) {
-				return createIterationAdapter();
-			}
-			public Object caseMethodConfiguration(MethodConfiguration object) {
-				return createMethodConfigurationAdapter();
-			}
-			public Object caseMethodElement(MethodElement object) {
-				return createMethodElementAdapter();
-			}
-			public Object caseMethodLibrary(MethodLibrary object) {
-				return createMethodLibraryAdapter();
-			}
-			public Object caseMethodPackage(MethodPackage object) {
-				return createMethodPackageAdapter();
-			}
-			public Object caseMethodPlugin(MethodPlugin object) {
-				return createMethodPluginAdapter();
-			}
-			public Object caseMethodUnit(MethodUnit object) {
-				return createMethodUnitAdapter();
-			}
-			public Object caseMilestone(Milestone object) {
-				return createMilestoneAdapter();
-			}
-			public Object caseNamedElement(NamedElement object) {
-				return createNamedElementAdapter();
-			}
-			public Object caseOutcome(Outcome object) {
-				return createOutcomeAdapter();
-			}
-			public Object casePackageableElement(PackageableElement object) {
-				return createPackageableElementAdapter();
-			}
-			public Object casePhase(Phase object) {
-				return createPhaseAdapter();
-			}
-			public Object casePlanningData(PlanningData object) {
-				return createPlanningDataAdapter();
-			}
-			public Object casePractice(Practice object) {
-				return createPracticeAdapter();
-			}
-			public Object casePracticeDescription(PracticeDescription object) {
-				return createPracticeDescriptionAdapter();
-			}
-			public Object caseProcess(org.eclipse.epf.xml.uma.Process object) {
-				return createProcessAdapter();
-			}
-			public Object caseProcessComponent(ProcessComponent object) {
-				return createProcessComponentAdapter();
-			}
-			public Object caseProcessComponentInterface(ProcessComponentInterface object) {
-				return createProcessComponentInterfaceAdapter();
-			}
-			public Object caseProcessDescription(ProcessDescription object) {
-				return createProcessDescriptionAdapter();
-			}
-			public Object caseProcessElement(ProcessElement object) {
-				return createProcessElementAdapter();
-			}
-			public Object caseProcessPackage(ProcessPackage object) {
-				return createProcessPackageAdapter();
-			}
-			public Object caseProcessPlanningTemplate(ProcessPlanningTemplate object) {
-				return createProcessPlanningTemplateAdapter();
-			}
-			public Object caseReport(Report object) {
-				return createReportAdapter();
-			}
-			public Object caseReusableAsset(ReusableAsset object) {
-				return createReusableAssetAdapter();
-			}
-			public Object caseRoadmap(Roadmap object) {
-				return createRoadmapAdapter();
-			}
-			public Object caseRole(Role object) {
-				return createRoleAdapter();
-			}
-			public Object caseRoleDescription(RoleDescription object) {
-				return createRoleDescriptionAdapter();
-			}
-			public Object caseRoleDescriptor(RoleDescriptor object) {
-				return createRoleDescriptorAdapter();
-			}
-			public Object caseRoleSet(RoleSet object) {
-				return createRoleSetAdapter();
-			}
-			public Object caseRoleSetGrouping(RoleSetGrouping object) {
-				return createRoleSetGroupingAdapter();
-			}
-			public Object caseSection(Section object) {
-				return createSectionAdapter();
-			}
-			public Object caseSupportingMaterial(SupportingMaterial object) {
-				return createSupportingMaterialAdapter();
-			}
-			public Object caseTask(Task object) {
-				return createTaskAdapter();
-			}
-			public Object caseTaskDescription(TaskDescription object) {
-				return createTaskDescriptionAdapter();
-			}
-			public Object caseTaskDescriptor(TaskDescriptor object) {
-				return createTaskDescriptorAdapter();
-			}
-			public Object caseTeamProfile(TeamProfile object) {
-				return createTeamProfileAdapter();
-			}
-			public Object caseTemplate(Template object) {
-				return createTemplateAdapter();
-			}
-			public Object caseTermDefinition(TermDefinition object) {
-				return createTermDefinitionAdapter();
-			}
-			public Object caseTool(Tool object) {
-				return createToolAdapter();
-			}
-			public Object caseToolMentor(ToolMentor object) {
-				return createToolMentorAdapter();
-			}
-			public Object caseWhitepaper(Whitepaper object) {
-				return createWhitepaperAdapter();
-			}
-			public Object caseWorkBreakdownElement(WorkBreakdownElement object) {
-				return createWorkBreakdownElementAdapter();
-			}
-			public Object caseWorkDefinition(WorkDefinition object) {
-				return createWorkDefinitionAdapter();
-			}
-			public Object caseWorkOrder(WorkOrder object) {
-				return createWorkOrderAdapter();
-			}
-			public Object caseWorkProduct(WorkProduct object) {
-				return createWorkProductAdapter();
-			}
-			public Object caseWorkProductDescription(WorkProductDescription object) {
-				return createWorkProductDescriptionAdapter();
-			}
-			public Object caseWorkProductDescriptor(WorkProductDescriptor object) {
-				return createWorkProductDescriptorAdapter();
-			}
-			public Object caseWorkProductType(WorkProductType object) {
-				return createWorkProductTypeAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Activity <em>Activity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Activity
-	 * @generated
-	 */
-	public Adapter createActivityAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.ActivityDescription <em>Activity Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.ActivityDescription
-	 * @generated
-	 */
-	public Adapter createActivityDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Artifact <em>Artifact</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Artifact
-	 * @generated
-	 */
-	public Adapter createArtifactAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.ArtifactDescription <em>Artifact Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.ArtifactDescription
-	 * @generated
-	 */
-	public Adapter createArtifactDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.BreakdownElement <em>Breakdown Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.BreakdownElement
-	 * @generated
-	 */
-	public Adapter createBreakdownElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.BreakdownElementDescription <em>Breakdown Element Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.BreakdownElementDescription
-	 * @generated
-	 */
-	public Adapter createBreakdownElementDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.CapabilityPattern <em>Capability Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.CapabilityPattern
-	 * @generated
-	 */
-	public Adapter createCapabilityPatternAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Checklist <em>Checklist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Checklist
-	 * @generated
-	 */
-	public Adapter createChecklistAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.CompositeRole <em>Composite Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.CompositeRole
-	 * @generated
-	 */
-	public Adapter createCompositeRoleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Concept <em>Concept</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Concept
-	 * @generated
-	 */
-	public Adapter createConceptAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Constraint <em>Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Constraint
-	 * @generated
-	 */
-	public Adapter createConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.ContentCategory <em>Content Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.ContentCategory
-	 * @generated
-	 */
-	public Adapter createContentCategoryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.ContentCategoryPackage <em>Content Category Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.ContentCategoryPackage
-	 * @generated
-	 */
-	public Adapter createContentCategoryPackageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.ContentDescription <em>Content Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.ContentDescription
-	 * @generated
-	 */
-	public Adapter createContentDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.ContentElement <em>Content Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.ContentElement
-	 * @generated
-	 */
-	public Adapter createContentElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.ContentPackage <em>Content Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.ContentPackage
-	 * @generated
-	 */
-	public Adapter createContentPackageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.CustomCategory <em>Custom Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.CustomCategory
-	 * @generated
-	 */
-	public Adapter createCustomCategoryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Deliverable <em>Deliverable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Deliverable
-	 * @generated
-	 */
-	public Adapter createDeliverableAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.DeliverableDescription <em>Deliverable Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.DeliverableDescription
-	 * @generated
-	 */
-	public Adapter createDeliverableDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.DeliveryProcess <em>Delivery Process</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.DeliveryProcess
-	 * @generated
-	 */
-	public Adapter createDeliveryProcessAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.DeliveryProcessDescription <em>Delivery Process Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.DeliveryProcessDescription
-	 * @generated
-	 */
-	public Adapter createDeliveryProcessDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.DescribableElement <em>Describable Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.DescribableElement
-	 * @generated
-	 */
-	public Adapter createDescribableElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Descriptor <em>Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Descriptor
-	 * @generated
-	 */
-	public Adapter createDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.DescriptorDescription <em>Descriptor Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.DescriptorDescription
-	 * @generated
-	 */
-	public Adapter createDescriptorDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Discipline <em>Discipline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Discipline
-	 * @generated
-	 */
-	public Adapter createDisciplineAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.DisciplineGrouping <em>Discipline Grouping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.DisciplineGrouping
-	 * @generated
-	 */
-	public Adapter createDisciplineGroupingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.DocumentRoot <em>Document Root</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.DocumentRoot
-	 * @generated
-	 */
-	public Adapter createDocumentRootAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Domain <em>Domain</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Domain
-	 * @generated
-	 */
-	public Adapter createDomainAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Element <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Element
-	 * @generated
-	 */
-	public Adapter createElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Estimate <em>Estimate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Estimate
-	 * @generated
-	 */
-	public Adapter createEstimateAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.EstimatingMetric <em>Estimating Metric</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.EstimatingMetric
-	 * @generated
-	 */
-	public Adapter createEstimatingMetricAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.EstimationConsiderations <em>Estimation Considerations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.EstimationConsiderations
-	 * @generated
-	 */
-	public Adapter createEstimationConsiderationsAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Example <em>Example</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Example
-	 * @generated
-	 */
-	public Adapter createExampleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Guidance <em>Guidance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Guidance
-	 * @generated
-	 */
-	public Adapter createGuidanceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.GuidanceDescription <em>Guidance Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.GuidanceDescription
-	 * @generated
-	 */
-	public Adapter createGuidanceDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Guideline <em>Guideline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Guideline
-	 * @generated
-	 */
-	public Adapter createGuidelineAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Iteration <em>Iteration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Iteration
-	 * @generated
-	 */
-	public Adapter createIterationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.MethodConfiguration <em>Method Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.MethodConfiguration
-	 * @generated
-	 */
-	public Adapter createMethodConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.MethodElement <em>Method Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.MethodElement
-	 * @generated
-	 */
-	public Adapter createMethodElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.MethodLibrary <em>Method Library</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.MethodLibrary
-	 * @generated
-	 */
-	public Adapter createMethodLibraryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.MethodPackage <em>Method Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.MethodPackage
-	 * @generated
-	 */
-	public Adapter createMethodPackageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.MethodPlugin <em>Method Plugin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.MethodPlugin
-	 * @generated
-	 */
-	public Adapter createMethodPluginAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.MethodUnit <em>Method Unit</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.MethodUnit
-	 * @generated
-	 */
-	public Adapter createMethodUnitAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Milestone <em>Milestone</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Milestone
-	 * @generated
-	 */
-	public Adapter createMilestoneAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.NamedElement <em>Named Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.NamedElement
-	 * @generated
-	 */
-	public Adapter createNamedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Outcome <em>Outcome</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Outcome
-	 * @generated
-	 */
-	public Adapter createOutcomeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.PackageableElement <em>Packageable Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.PackageableElement
-	 * @generated
-	 */
-	public Adapter createPackageableElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Phase <em>Phase</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Phase
-	 * @generated
-	 */
-	public Adapter createPhaseAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.PlanningData <em>Planning Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.PlanningData
-	 * @generated
-	 */
-	public Adapter createPlanningDataAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Practice <em>Practice</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Practice
-	 * @generated
-	 */
-	public Adapter createPracticeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.PracticeDescription <em>Practice Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.PracticeDescription
-	 * @generated
-	 */
-	public Adapter createPracticeDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Process <em>Process</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Process
-	 * @generated
-	 */
-	public Adapter createProcessAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.ProcessComponent <em>Process Component</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.ProcessComponent
-	 * @generated
-	 */
-	public Adapter createProcessComponentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.ProcessComponentInterface <em>Process Component Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.ProcessComponentInterface
-	 * @generated
-	 */
-	public Adapter createProcessComponentInterfaceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.ProcessDescription <em>Process Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.ProcessDescription
-	 * @generated
-	 */
-	public Adapter createProcessDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.ProcessElement <em>Process Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.ProcessElement
-	 * @generated
-	 */
-	public Adapter createProcessElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.ProcessPackage <em>Process Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.ProcessPackage
-	 * @generated
-	 */
-	public Adapter createProcessPackageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.ProcessPlanningTemplate <em>Process Planning Template</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.ProcessPlanningTemplate
-	 * @generated
-	 */
-	public Adapter createProcessPlanningTemplateAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Report <em>Report</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Report
-	 * @generated
-	 */
-	public Adapter createReportAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.ReusableAsset <em>Reusable Asset</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.ReusableAsset
-	 * @generated
-	 */
-	public Adapter createReusableAssetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Roadmap <em>Roadmap</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Roadmap
-	 * @generated
-	 */
-	public Adapter createRoadmapAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Role <em>Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Role
-	 * @generated
-	 */
-	public Adapter createRoleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.RoleDescription <em>Role Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.RoleDescription
-	 * @generated
-	 */
-	public Adapter createRoleDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.RoleDescriptor <em>Role Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.RoleDescriptor
-	 * @generated
-	 */
-	public Adapter createRoleDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.RoleSet <em>Role Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.RoleSet
-	 * @generated
-	 */
-	public Adapter createRoleSetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.RoleSetGrouping <em>Role Set Grouping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.RoleSetGrouping
-	 * @generated
-	 */
-	public Adapter createRoleSetGroupingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Section <em>Section</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Section
-	 * @generated
-	 */
-	public Adapter createSectionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.SupportingMaterial <em>Supporting Material</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.SupportingMaterial
-	 * @generated
-	 */
-	public Adapter createSupportingMaterialAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Task <em>Task</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Task
-	 * @generated
-	 */
-	public Adapter createTaskAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.TaskDescription <em>Task Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.TaskDescription
-	 * @generated
-	 */
-	public Adapter createTaskDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.TaskDescriptor <em>Task Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.TaskDescriptor
-	 * @generated
-	 */
-	public Adapter createTaskDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.TeamProfile <em>Team Profile</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.TeamProfile
-	 * @generated
-	 */
-	public Adapter createTeamProfileAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Template <em>Template</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Template
-	 * @generated
-	 */
-	public Adapter createTemplateAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.TermDefinition <em>Term Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.TermDefinition
-	 * @generated
-	 */
-	public Adapter createTermDefinitionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Tool <em>Tool</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Tool
-	 * @generated
-	 */
-	public Adapter createToolAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.ToolMentor <em>Tool Mentor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.ToolMentor
-	 * @generated
-	 */
-	public Adapter createToolMentorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.Whitepaper <em>Whitepaper</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.Whitepaper
-	 * @generated
-	 */
-	public Adapter createWhitepaperAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.WorkBreakdownElement <em>Work Breakdown Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.WorkBreakdownElement
-	 * @generated
-	 */
-	public Adapter createWorkBreakdownElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.WorkDefinition <em>Work Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.WorkDefinition
-	 * @generated
-	 */
-	public Adapter createWorkDefinitionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.WorkOrder <em>Work Order</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.WorkOrder
-	 * @generated
-	 */
-	public Adapter createWorkOrderAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.WorkProduct <em>Work Product</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.WorkProduct
-	 * @generated
-	 */
-	public Adapter createWorkProductAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.WorkProductDescription <em>Work Product Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.WorkProductDescription
-	 * @generated
-	 */
-	public Adapter createWorkProductDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.WorkProductDescriptor <em>Work Product Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.WorkProductDescriptor
-	 * @generated
-	 */
-	public Adapter createWorkProductDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.epf.xml.uma.WorkProductType <em>Work Product Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.epf.xml.uma.WorkProductType
-	 * @generated
-	 */
-	public Adapter createWorkProductTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //UmaAdapterFactory
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaResourceFactoryImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaResourceFactoryImpl.java
deleted file mode 100755
index c417bd8..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaResourceFactoryImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UmaResourceFactoryImpl.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.xml.uma.util.UmaResourceImpl
- * @generated
- */
-public class UmaResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UmaResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Resource createResource(URI uri) {
-		XMLResource result = new UmaResourceImpl(uri);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
-		return result;
-	}
-
-} //UmaResourceFactoryImpl
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaResourceImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaResourceImpl.java
deleted file mode 100755
index 92fc8d2..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaResourceImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UmaResourceImpl.java,v 1.1 2006/05/01 19:50:00 jthario Exp $
- */
-package org.eclipse.epf.xml.uma.util;
-
-import java.io.IOException;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.XMLSave;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.xml.uma.util.UmaResourceFactoryImpl
- * @generated
- */
-public class UmaResourceImpl extends XMLResourceImpl {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public UmaResourceImpl(URI uri) {
-		super(uri);
-	}
-
-	////////////////////////////////////////////////////////////////////////
-	// customization here, Jinhua Xi 04/28/2006
-	////////////////////////////////////////////////////////////////////////
-	
-	/*
-	 * Javadoc copied from interface.
-	 */
-	public void save(Map options) throws IOException {
-		super.save(options);
-	}
-
-	protected XMLSave createXMLSave() {
-		// return super.createXMLSave();
-		return new UmaXMLSaveImpl(createXMLHelper());
-	}
-	
-} //UmaResourceImpl
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaSwitch.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaSwitch.java
deleted file mode 100755
index 9570f3d..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaSwitch.java
+++ /dev/null
@@ -1,2483 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UmaSwitch.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.epf.xml.uma.Activity;
-import org.eclipse.epf.xml.uma.ActivityDescription;
-import org.eclipse.epf.xml.uma.Artifact;
-import org.eclipse.epf.xml.uma.ArtifactDescription;
-import org.eclipse.epf.xml.uma.BreakdownElement;
-import org.eclipse.epf.xml.uma.BreakdownElementDescription;
-import org.eclipse.epf.xml.uma.CapabilityPattern;
-import org.eclipse.epf.xml.uma.Checklist;
-import org.eclipse.epf.xml.uma.CompositeRole;
-import org.eclipse.epf.xml.uma.Concept;
-import org.eclipse.epf.xml.uma.Constraint;
-import org.eclipse.epf.xml.uma.ContentCategory;
-import org.eclipse.epf.xml.uma.ContentCategoryPackage;
-import org.eclipse.epf.xml.uma.ContentDescription;
-import org.eclipse.epf.xml.uma.ContentElement;
-import org.eclipse.epf.xml.uma.ContentPackage;
-import org.eclipse.epf.xml.uma.CustomCategory;
-import org.eclipse.epf.xml.uma.Deliverable;
-import org.eclipse.epf.xml.uma.DeliverableDescription;
-import org.eclipse.epf.xml.uma.DeliveryProcess;
-import org.eclipse.epf.xml.uma.DeliveryProcessDescription;
-import org.eclipse.epf.xml.uma.DescribableElement;
-import org.eclipse.epf.xml.uma.Descriptor;
-import org.eclipse.epf.xml.uma.DescriptorDescription;
-import org.eclipse.epf.xml.uma.Discipline;
-import org.eclipse.epf.xml.uma.DisciplineGrouping;
-import org.eclipse.epf.xml.uma.DocumentRoot;
-import org.eclipse.epf.xml.uma.Domain;
-import org.eclipse.epf.xml.uma.Element;
-import org.eclipse.epf.xml.uma.Estimate;
-import org.eclipse.epf.xml.uma.EstimatingMetric;
-import org.eclipse.epf.xml.uma.EstimationConsiderations;
-import org.eclipse.epf.xml.uma.Example;
-import org.eclipse.epf.xml.uma.Guidance;
-import org.eclipse.epf.xml.uma.GuidanceDescription;
-import org.eclipse.epf.xml.uma.Guideline;
-import org.eclipse.epf.xml.uma.Iteration;
-import org.eclipse.epf.xml.uma.MethodConfiguration;
-import org.eclipse.epf.xml.uma.MethodElement;
-import org.eclipse.epf.xml.uma.MethodLibrary;
-import org.eclipse.epf.xml.uma.MethodPackage;
-import org.eclipse.epf.xml.uma.MethodPlugin;
-import org.eclipse.epf.xml.uma.MethodUnit;
-import org.eclipse.epf.xml.uma.Milestone;
-import org.eclipse.epf.xml.uma.NamedElement;
-import org.eclipse.epf.xml.uma.Outcome;
-import org.eclipse.epf.xml.uma.PackageableElement;
-import org.eclipse.epf.xml.uma.Phase;
-import org.eclipse.epf.xml.uma.PlanningData;
-import org.eclipse.epf.xml.uma.Practice;
-import org.eclipse.epf.xml.uma.PracticeDescription;
-import org.eclipse.epf.xml.uma.ProcessComponent;
-import org.eclipse.epf.xml.uma.ProcessComponentInterface;
-import org.eclipse.epf.xml.uma.ProcessDescription;
-import org.eclipse.epf.xml.uma.ProcessElement;
-import org.eclipse.epf.xml.uma.ProcessPackage;
-import org.eclipse.epf.xml.uma.ProcessPlanningTemplate;
-import org.eclipse.epf.xml.uma.Report;
-import org.eclipse.epf.xml.uma.ReusableAsset;
-import org.eclipse.epf.xml.uma.Roadmap;
-import org.eclipse.epf.xml.uma.Role;
-import org.eclipse.epf.xml.uma.RoleDescription;
-import org.eclipse.epf.xml.uma.RoleDescriptor;
-import org.eclipse.epf.xml.uma.RoleSet;
-import org.eclipse.epf.xml.uma.RoleSetGrouping;
-import org.eclipse.epf.xml.uma.Section;
-import org.eclipse.epf.xml.uma.SupportingMaterial;
-import org.eclipse.epf.xml.uma.Task;
-import org.eclipse.epf.xml.uma.TaskDescription;
-import org.eclipse.epf.xml.uma.TaskDescriptor;
-import org.eclipse.epf.xml.uma.TeamProfile;
-import org.eclipse.epf.xml.uma.Template;
-import org.eclipse.epf.xml.uma.TermDefinition;
-import org.eclipse.epf.xml.uma.Tool;
-import org.eclipse.epf.xml.uma.ToolMentor;
-import org.eclipse.epf.xml.uma.UmaPackage;
-import org.eclipse.epf.xml.uma.Whitepaper;
-import org.eclipse.epf.xml.uma.WorkBreakdownElement;
-import org.eclipse.epf.xml.uma.WorkDefinition;
-import org.eclipse.epf.xml.uma.WorkOrder;
-import org.eclipse.epf.xml.uma.WorkProduct;
-import org.eclipse.epf.xml.uma.WorkProductDescription;
-import org.eclipse.epf.xml.uma.WorkProductDescriptor;
-import org.eclipse.epf.xml.uma.WorkProductType;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.epf.xml.uma.UmaPackage
- * @generated
- */
-public class UmaSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static UmaPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UmaSwitch() {
-		if (modelPackage == null) {
-			modelPackage = UmaPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case UmaPackage.ACTIVITY: {
-				Activity activity = (Activity)theEObject;
-				Object result = caseActivity(activity);
-				if (result == null) result = caseWorkBreakdownElement(activity);
-				if (result == null) result = caseBreakdownElement(activity);
-				if (result == null) result = caseProcessElement(activity);
-				if (result == null) result = caseDescribableElement(activity);
-				if (result == null) result = caseMethodElement(activity);
-				if (result == null) result = casePackageableElement(activity);
-				if (result == null) result = caseNamedElement(activity);
-				if (result == null) result = caseElement(activity);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.ACTIVITY_DESCRIPTION: {
-				ActivityDescription activityDescription = (ActivityDescription)theEObject;
-				Object result = caseActivityDescription(activityDescription);
-				if (result == null) result = caseBreakdownElementDescription(activityDescription);
-				if (result == null) result = caseContentDescription(activityDescription);
-				if (result == null) result = caseMethodUnit(activityDescription);
-				if (result == null) result = caseMethodElement(activityDescription);
-				if (result == null) result = casePackageableElement(activityDescription);
-				if (result == null) result = caseNamedElement(activityDescription);
-				if (result == null) result = caseElement(activityDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.ARTIFACT: {
-				Artifact artifact = (Artifact)theEObject;
-				Object result = caseArtifact(artifact);
-				if (result == null) result = caseWorkProduct(artifact);
-				if (result == null) result = caseContentElement(artifact);
-				if (result == null) result = caseDescribableElement(artifact);
-				if (result == null) result = caseMethodElement(artifact);
-				if (result == null) result = casePackageableElement(artifact);
-				if (result == null) result = caseNamedElement(artifact);
-				if (result == null) result = caseElement(artifact);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.ARTIFACT_DESCRIPTION: {
-				ArtifactDescription artifactDescription = (ArtifactDescription)theEObject;
-				Object result = caseArtifactDescription(artifactDescription);
-				if (result == null) result = caseWorkProductDescription(artifactDescription);
-				if (result == null) result = caseContentDescription(artifactDescription);
-				if (result == null) result = caseMethodUnit(artifactDescription);
-				if (result == null) result = caseMethodElement(artifactDescription);
-				if (result == null) result = casePackageableElement(artifactDescription);
-				if (result == null) result = caseNamedElement(artifactDescription);
-				if (result == null) result = caseElement(artifactDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.BREAKDOWN_ELEMENT: {
-				BreakdownElement breakdownElement = (BreakdownElement)theEObject;
-				Object result = caseBreakdownElement(breakdownElement);
-				if (result == null) result = caseProcessElement(breakdownElement);
-				if (result == null) result = caseDescribableElement(breakdownElement);
-				if (result == null) result = caseMethodElement(breakdownElement);
-				if (result == null) result = casePackageableElement(breakdownElement);
-				if (result == null) result = caseNamedElement(breakdownElement);
-				if (result == null) result = caseElement(breakdownElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.BREAKDOWN_ELEMENT_DESCRIPTION: {
-				BreakdownElementDescription breakdownElementDescription = (BreakdownElementDescription)theEObject;
-				Object result = caseBreakdownElementDescription(breakdownElementDescription);
-				if (result == null) result = caseContentDescription(breakdownElementDescription);
-				if (result == null) result = caseMethodUnit(breakdownElementDescription);
-				if (result == null) result = caseMethodElement(breakdownElementDescription);
-				if (result == null) result = casePackageableElement(breakdownElementDescription);
-				if (result == null) result = caseNamedElement(breakdownElementDescription);
-				if (result == null) result = caseElement(breakdownElementDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.CAPABILITY_PATTERN: {
-				CapabilityPattern capabilityPattern = (CapabilityPattern)theEObject;
-				Object result = caseCapabilityPattern(capabilityPattern);
-				if (result == null) result = caseProcess(capabilityPattern);
-				if (result == null) result = caseActivity(capabilityPattern);
-				if (result == null) result = caseWorkBreakdownElement(capabilityPattern);
-				if (result == null) result = caseBreakdownElement(capabilityPattern);
-				if (result == null) result = caseProcessElement(capabilityPattern);
-				if (result == null) result = caseDescribableElement(capabilityPattern);
-				if (result == null) result = caseMethodElement(capabilityPattern);
-				if (result == null) result = casePackageableElement(capabilityPattern);
-				if (result == null) result = caseNamedElement(capabilityPattern);
-				if (result == null) result = caseElement(capabilityPattern);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.CHECKLIST: {
-				Checklist checklist = (Checklist)theEObject;
-				Object result = caseChecklist(checklist);
-				if (result == null) result = caseGuidance(checklist);
-				if (result == null) result = caseContentElement(checklist);
-				if (result == null) result = caseDescribableElement(checklist);
-				if (result == null) result = caseMethodElement(checklist);
-				if (result == null) result = casePackageableElement(checklist);
-				if (result == null) result = caseNamedElement(checklist);
-				if (result == null) result = caseElement(checklist);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.COMPOSITE_ROLE: {
-				CompositeRole compositeRole = (CompositeRole)theEObject;
-				Object result = caseCompositeRole(compositeRole);
-				if (result == null) result = caseRoleDescriptor(compositeRole);
-				if (result == null) result = caseDescriptor(compositeRole);
-				if (result == null) result = caseBreakdownElement(compositeRole);
-				if (result == null) result = caseProcessElement(compositeRole);
-				if (result == null) result = caseDescribableElement(compositeRole);
-				if (result == null) result = caseMethodElement(compositeRole);
-				if (result == null) result = casePackageableElement(compositeRole);
-				if (result == null) result = caseNamedElement(compositeRole);
-				if (result == null) result = caseElement(compositeRole);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.CONCEPT: {
-				Concept concept = (Concept)theEObject;
-				Object result = caseConcept(concept);
-				if (result == null) result = caseGuidance(concept);
-				if (result == null) result = caseContentElement(concept);
-				if (result == null) result = caseDescribableElement(concept);
-				if (result == null) result = caseMethodElement(concept);
-				if (result == null) result = casePackageableElement(concept);
-				if (result == null) result = caseNamedElement(concept);
-				if (result == null) result = caseElement(concept);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.CONSTRAINT: {
-				Constraint constraint = (Constraint)theEObject;
-				Object result = caseConstraint(constraint);
-				if (result == null) result = caseMethodElement(constraint);
-				if (result == null) result = casePackageableElement(constraint);
-				if (result == null) result = caseNamedElement(constraint);
-				if (result == null) result = caseElement(constraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.CONTENT_CATEGORY: {
-				ContentCategory contentCategory = (ContentCategory)theEObject;
-				Object result = caseContentCategory(contentCategory);
-				if (result == null) result = caseContentElement(contentCategory);
-				if (result == null) result = caseDescribableElement(contentCategory);
-				if (result == null) result = caseMethodElement(contentCategory);
-				if (result == null) result = casePackageableElement(contentCategory);
-				if (result == null) result = caseNamedElement(contentCategory);
-				if (result == null) result = caseElement(contentCategory);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.CONTENT_CATEGORY_PACKAGE: {
-				ContentCategoryPackage contentCategoryPackage = (ContentCategoryPackage)theEObject;
-				Object result = caseContentCategoryPackage(contentCategoryPackage);
-				if (result == null) result = caseMethodPackage(contentCategoryPackage);
-				if (result == null) result = caseMethodElement(contentCategoryPackage);
-				if (result == null) result = casePackageableElement(contentCategoryPackage);
-				if (result == null) result = caseNamedElement(contentCategoryPackage);
-				if (result == null) result = caseElement(contentCategoryPackage);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.CONTENT_DESCRIPTION: {
-				ContentDescription contentDescription = (ContentDescription)theEObject;
-				Object result = caseContentDescription(contentDescription);
-				if (result == null) result = caseMethodUnit(contentDescription);
-				if (result == null) result = caseMethodElement(contentDescription);
-				if (result == null) result = casePackageableElement(contentDescription);
-				if (result == null) result = caseNamedElement(contentDescription);
-				if (result == null) result = caseElement(contentDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.CONTENT_ELEMENT: {
-				ContentElement contentElement = (ContentElement)theEObject;
-				Object result = caseContentElement(contentElement);
-				if (result == null) result = caseDescribableElement(contentElement);
-				if (result == null) result = caseMethodElement(contentElement);
-				if (result == null) result = casePackageableElement(contentElement);
-				if (result == null) result = caseNamedElement(contentElement);
-				if (result == null) result = caseElement(contentElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.CONTENT_PACKAGE: {
-				ContentPackage contentPackage = (ContentPackage)theEObject;
-				Object result = caseContentPackage(contentPackage);
-				if (result == null) result = caseMethodPackage(contentPackage);
-				if (result == null) result = caseMethodElement(contentPackage);
-				if (result == null) result = casePackageableElement(contentPackage);
-				if (result == null) result = caseNamedElement(contentPackage);
-				if (result == null) result = caseElement(contentPackage);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.CUSTOM_CATEGORY: {
-				CustomCategory customCategory = (CustomCategory)theEObject;
-				Object result = caseCustomCategory(customCategory);
-				if (result == null) result = caseContentCategory(customCategory);
-				if (result == null) result = caseContentElement(customCategory);
-				if (result == null) result = caseDescribableElement(customCategory);
-				if (result == null) result = caseMethodElement(customCategory);
-				if (result == null) result = casePackageableElement(customCategory);
-				if (result == null) result = caseNamedElement(customCategory);
-				if (result == null) result = caseElement(customCategory);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.DELIVERABLE: {
-				Deliverable deliverable = (Deliverable)theEObject;
-				Object result = caseDeliverable(deliverable);
-				if (result == null) result = caseWorkProduct(deliverable);
-				if (result == null) result = caseContentElement(deliverable);
-				if (result == null) result = caseDescribableElement(deliverable);
-				if (result == null) result = caseMethodElement(deliverable);
-				if (result == null) result = casePackageableElement(deliverable);
-				if (result == null) result = caseNamedElement(deliverable);
-				if (result == null) result = caseElement(deliverable);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.DELIVERABLE_DESCRIPTION: {
-				DeliverableDescription deliverableDescription = (DeliverableDescription)theEObject;
-				Object result = caseDeliverableDescription(deliverableDescription);
-				if (result == null) result = caseWorkProductDescription(deliverableDescription);
-				if (result == null) result = caseContentDescription(deliverableDescription);
-				if (result == null) result = caseMethodUnit(deliverableDescription);
-				if (result == null) result = caseMethodElement(deliverableDescription);
-				if (result == null) result = casePackageableElement(deliverableDescription);
-				if (result == null) result = caseNamedElement(deliverableDescription);
-				if (result == null) result = caseElement(deliverableDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.DELIVERY_PROCESS: {
-				DeliveryProcess deliveryProcess = (DeliveryProcess)theEObject;
-				Object result = caseDeliveryProcess(deliveryProcess);
-				if (result == null) result = caseProcess(deliveryProcess);
-				if (result == null) result = caseActivity(deliveryProcess);
-				if (result == null) result = caseWorkBreakdownElement(deliveryProcess);
-				if (result == null) result = caseBreakdownElement(deliveryProcess);
-				if (result == null) result = caseProcessElement(deliveryProcess);
-				if (result == null) result = caseDescribableElement(deliveryProcess);
-				if (result == null) result = caseMethodElement(deliveryProcess);
-				if (result == null) result = casePackageableElement(deliveryProcess);
-				if (result == null) result = caseNamedElement(deliveryProcess);
-				if (result == null) result = caseElement(deliveryProcess);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.DELIVERY_PROCESS_DESCRIPTION: {
-				DeliveryProcessDescription deliveryProcessDescription = (DeliveryProcessDescription)theEObject;
-				Object result = caseDeliveryProcessDescription(deliveryProcessDescription);
-				if (result == null) result = caseProcessDescription(deliveryProcessDescription);
-				if (result == null) result = caseActivityDescription(deliveryProcessDescription);
-				if (result == null) result = caseBreakdownElementDescription(deliveryProcessDescription);
-				if (result == null) result = caseContentDescription(deliveryProcessDescription);
-				if (result == null) result = caseMethodUnit(deliveryProcessDescription);
-				if (result == null) result = caseMethodElement(deliveryProcessDescription);
-				if (result == null) result = casePackageableElement(deliveryProcessDescription);
-				if (result == null) result = caseNamedElement(deliveryProcessDescription);
-				if (result == null) result = caseElement(deliveryProcessDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.DESCRIBABLE_ELEMENT: {
-				DescribableElement describableElement = (DescribableElement)theEObject;
-				Object result = caseDescribableElement(describableElement);
-				if (result == null) result = caseMethodElement(describableElement);
-				if (result == null) result = casePackageableElement(describableElement);
-				if (result == null) result = caseNamedElement(describableElement);
-				if (result == null) result = caseElement(describableElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.DESCRIPTOR: {
-				Descriptor descriptor = (Descriptor)theEObject;
-				Object result = caseDescriptor(descriptor);
-				if (result == null) result = caseBreakdownElement(descriptor);
-				if (result == null) result = caseProcessElement(descriptor);
-				if (result == null) result = caseDescribableElement(descriptor);
-				if (result == null) result = caseMethodElement(descriptor);
-				if (result == null) result = casePackageableElement(descriptor);
-				if (result == null) result = caseNamedElement(descriptor);
-				if (result == null) result = caseElement(descriptor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.DESCRIPTOR_DESCRIPTION: {
-				DescriptorDescription descriptorDescription = (DescriptorDescription)theEObject;
-				Object result = caseDescriptorDescription(descriptorDescription);
-				if (result == null) result = caseBreakdownElementDescription(descriptorDescription);
-				if (result == null) result = caseContentDescription(descriptorDescription);
-				if (result == null) result = caseMethodUnit(descriptorDescription);
-				if (result == null) result = caseMethodElement(descriptorDescription);
-				if (result == null) result = casePackageableElement(descriptorDescription);
-				if (result == null) result = caseNamedElement(descriptorDescription);
-				if (result == null) result = caseElement(descriptorDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.DISCIPLINE: {
-				Discipline discipline = (Discipline)theEObject;
-				Object result = caseDiscipline(discipline);
-				if (result == null) result = caseContentCategory(discipline);
-				if (result == null) result = caseContentElement(discipline);
-				if (result == null) result = caseDescribableElement(discipline);
-				if (result == null) result = caseMethodElement(discipline);
-				if (result == null) result = casePackageableElement(discipline);
-				if (result == null) result = caseNamedElement(discipline);
-				if (result == null) result = caseElement(discipline);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.DISCIPLINE_GROUPING: {
-				DisciplineGrouping disciplineGrouping = (DisciplineGrouping)theEObject;
-				Object result = caseDisciplineGrouping(disciplineGrouping);
-				if (result == null) result = caseContentCategory(disciplineGrouping);
-				if (result == null) result = caseContentElement(disciplineGrouping);
-				if (result == null) result = caseDescribableElement(disciplineGrouping);
-				if (result == null) result = caseMethodElement(disciplineGrouping);
-				if (result == null) result = casePackageableElement(disciplineGrouping);
-				if (result == null) result = caseNamedElement(disciplineGrouping);
-				if (result == null) result = caseElement(disciplineGrouping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.DOCUMENT_ROOT: {
-				DocumentRoot documentRoot = (DocumentRoot)theEObject;
-				Object result = caseDocumentRoot(documentRoot);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.DOMAIN: {
-				Domain domain = (Domain)theEObject;
-				Object result = caseDomain(domain);
-				if (result == null) result = caseContentCategory(domain);
-				if (result == null) result = caseContentElement(domain);
-				if (result == null) result = caseDescribableElement(domain);
-				if (result == null) result = caseMethodElement(domain);
-				if (result == null) result = casePackageableElement(domain);
-				if (result == null) result = caseNamedElement(domain);
-				if (result == null) result = caseElement(domain);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.ELEMENT: {
-				Element element = (Element)theEObject;
-				Object result = caseElement(element);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.ESTIMATE: {
-				Estimate estimate = (Estimate)theEObject;
-				Object result = caseEstimate(estimate);
-				if (result == null) result = caseGuidance(estimate);
-				if (result == null) result = caseContentElement(estimate);
-				if (result == null) result = caseDescribableElement(estimate);
-				if (result == null) result = caseMethodElement(estimate);
-				if (result == null) result = casePackageableElement(estimate);
-				if (result == null) result = caseNamedElement(estimate);
-				if (result == null) result = caseElement(estimate);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.ESTIMATING_METRIC: {
-				EstimatingMetric estimatingMetric = (EstimatingMetric)theEObject;
-				Object result = caseEstimatingMetric(estimatingMetric);
-				if (result == null) result = caseGuidance(estimatingMetric);
-				if (result == null) result = caseContentElement(estimatingMetric);
-				if (result == null) result = caseDescribableElement(estimatingMetric);
-				if (result == null) result = caseMethodElement(estimatingMetric);
-				if (result == null) result = casePackageableElement(estimatingMetric);
-				if (result == null) result = caseNamedElement(estimatingMetric);
-				if (result == null) result = caseElement(estimatingMetric);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.ESTIMATION_CONSIDERATIONS: {
-				EstimationConsiderations estimationConsiderations = (EstimationConsiderations)theEObject;
-				Object result = caseEstimationConsiderations(estimationConsiderations);
-				if (result == null) result = caseGuidance(estimationConsiderations);
-				if (result == null) result = caseContentElement(estimationConsiderations);
-				if (result == null) result = caseDescribableElement(estimationConsiderations);
-				if (result == null) result = caseMethodElement(estimationConsiderations);
-				if (result == null) result = casePackageableElement(estimationConsiderations);
-				if (result == null) result = caseNamedElement(estimationConsiderations);
-				if (result == null) result = caseElement(estimationConsiderations);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.EXAMPLE: {
-				Example example = (Example)theEObject;
-				Object result = caseExample(example);
-				if (result == null) result = caseGuidance(example);
-				if (result == null) result = caseContentElement(example);
-				if (result == null) result = caseDescribableElement(example);
-				if (result == null) result = caseMethodElement(example);
-				if (result == null) result = casePackageableElement(example);
-				if (result == null) result = caseNamedElement(example);
-				if (result == null) result = caseElement(example);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.GUIDANCE: {
-				Guidance guidance = (Guidance)theEObject;
-				Object result = caseGuidance(guidance);
-				if (result == null) result = caseContentElement(guidance);
-				if (result == null) result = caseDescribableElement(guidance);
-				if (result == null) result = caseMethodElement(guidance);
-				if (result == null) result = casePackageableElement(guidance);
-				if (result == null) result = caseNamedElement(guidance);
-				if (result == null) result = caseElement(guidance);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.GUIDANCE_DESCRIPTION: {
-				GuidanceDescription guidanceDescription = (GuidanceDescription)theEObject;
-				Object result = caseGuidanceDescription(guidanceDescription);
-				if (result == null) result = caseContentDescription(guidanceDescription);
-				if (result == null) result = caseMethodUnit(guidanceDescription);
-				if (result == null) result = caseMethodElement(guidanceDescription);
-				if (result == null) result = casePackageableElement(guidanceDescription);
-				if (result == null) result = caseNamedElement(guidanceDescription);
-				if (result == null) result = caseElement(guidanceDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.GUIDELINE: {
-				Guideline guideline = (Guideline)theEObject;
-				Object result = caseGuideline(guideline);
-				if (result == null) result = caseGuidance(guideline);
-				if (result == null) result = caseContentElement(guideline);
-				if (result == null) result = caseDescribableElement(guideline);
-				if (result == null) result = caseMethodElement(guideline);
-				if (result == null) result = casePackageableElement(guideline);
-				if (result == null) result = caseNamedElement(guideline);
-				if (result == null) result = caseElement(guideline);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.ITERATION: {
-				Iteration iteration = (Iteration)theEObject;
-				Object result = caseIteration(iteration);
-				if (result == null) result = caseActivity(iteration);
-				if (result == null) result = caseWorkBreakdownElement(iteration);
-				if (result == null) result = caseBreakdownElement(iteration);
-				if (result == null) result = caseProcessElement(iteration);
-				if (result == null) result = caseDescribableElement(iteration);
-				if (result == null) result = caseMethodElement(iteration);
-				if (result == null) result = casePackageableElement(iteration);
-				if (result == null) result = caseNamedElement(iteration);
-				if (result == null) result = caseElement(iteration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.METHOD_CONFIGURATION: {
-				MethodConfiguration methodConfiguration = (MethodConfiguration)theEObject;
-				Object result = caseMethodConfiguration(methodConfiguration);
-				if (result == null) result = caseMethodUnit(methodConfiguration);
-				if (result == null) result = caseMethodElement(methodConfiguration);
-				if (result == null) result = casePackageableElement(methodConfiguration);
-				if (result == null) result = caseNamedElement(methodConfiguration);
-				if (result == null) result = caseElement(methodConfiguration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.METHOD_ELEMENT: {
-				MethodElement methodElement = (MethodElement)theEObject;
-				Object result = caseMethodElement(methodElement);
-				if (result == null) result = casePackageableElement(methodElement);
-				if (result == null) result = caseNamedElement(methodElement);
-				if (result == null) result = caseElement(methodElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.METHOD_LIBRARY: {
-				MethodLibrary methodLibrary = (MethodLibrary)theEObject;
-				Object result = caseMethodLibrary(methodLibrary);
-				if (result == null) result = caseMethodUnit(methodLibrary);
-				if (result == null) result = caseMethodElement(methodLibrary);
-				if (result == null) result = casePackageableElement(methodLibrary);
-				if (result == null) result = caseNamedElement(methodLibrary);
-				if (result == null) result = caseElement(methodLibrary);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.METHOD_PACKAGE: {
-				MethodPackage methodPackage = (MethodPackage)theEObject;
-				Object result = caseMethodPackage(methodPackage);
-				if (result == null) result = caseMethodElement(methodPackage);
-				if (result == null) result = casePackageableElement(methodPackage);
-				if (result == null) result = caseNamedElement(methodPackage);
-				if (result == null) result = caseElement(methodPackage);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.METHOD_PLUGIN: {
-				MethodPlugin methodPlugin = (MethodPlugin)theEObject;
-				Object result = caseMethodPlugin(methodPlugin);
-				if (result == null) result = caseMethodUnit(methodPlugin);
-				if (result == null) result = caseMethodElement(methodPlugin);
-				if (result == null) result = casePackageableElement(methodPlugin);
-				if (result == null) result = caseNamedElement(methodPlugin);
-				if (result == null) result = caseElement(methodPlugin);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.METHOD_UNIT: {
-				MethodUnit methodUnit = (MethodUnit)theEObject;
-				Object result = caseMethodUnit(methodUnit);
-				if (result == null) result = caseMethodElement(methodUnit);
-				if (result == null) result = casePackageableElement(methodUnit);
-				if (result == null) result = caseNamedElement(methodUnit);
-				if (result == null) result = caseElement(methodUnit);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.MILESTONE: {
-				Milestone milestone = (Milestone)theEObject;
-				Object result = caseMilestone(milestone);
-				if (result == null) result = caseWorkBreakdownElement(milestone);
-				if (result == null) result = caseBreakdownElement(milestone);
-				if (result == null) result = caseProcessElement(milestone);
-				if (result == null) result = caseDescribableElement(milestone);
-				if (result == null) result = caseMethodElement(milestone);
-				if (result == null) result = casePackageableElement(milestone);
-				if (result == null) result = caseNamedElement(milestone);
-				if (result == null) result = caseElement(milestone);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.NAMED_ELEMENT: {
-				NamedElement namedElement = (NamedElement)theEObject;
-				Object result = caseNamedElement(namedElement);
-				if (result == null) result = caseElement(namedElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.OUTCOME: {
-				Outcome outcome = (Outcome)theEObject;
-				Object result = caseOutcome(outcome);
-				if (result == null) result = caseWorkProduct(outcome);
-				if (result == null) result = caseContentElement(outcome);
-				if (result == null) result = caseDescribableElement(outcome);
-				if (result == null) result = caseMethodElement(outcome);
-				if (result == null) result = casePackageableElement(outcome);
-				if (result == null) result = caseNamedElement(outcome);
-				if (result == null) result = caseElement(outcome);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.PACKAGEABLE_ELEMENT: {
-				PackageableElement packageableElement = (PackageableElement)theEObject;
-				Object result = casePackageableElement(packageableElement);
-				if (result == null) result = caseNamedElement(packageableElement);
-				if (result == null) result = caseElement(packageableElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.PHASE: {
-				Phase phase = (Phase)theEObject;
-				Object result = casePhase(phase);
-				if (result == null) result = caseActivity(phase);
-				if (result == null) result = caseWorkBreakdownElement(phase);
-				if (result == null) result = caseBreakdownElement(phase);
-				if (result == null) result = caseProcessElement(phase);
-				if (result == null) result = caseDescribableElement(phase);
-				if (result == null) result = caseMethodElement(phase);
-				if (result == null) result = casePackageableElement(phase);
-				if (result == null) result = caseNamedElement(phase);
-				if (result == null) result = caseElement(phase);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.PLANNING_DATA: {
-				PlanningData planningData = (PlanningData)theEObject;
-				Object result = casePlanningData(planningData);
-				if (result == null) result = caseProcessElement(planningData);
-				if (result == null) result = caseDescribableElement(planningData);
-				if (result == null) result = caseMethodElement(planningData);
-				if (result == null) result = casePackageableElement(planningData);
-				if (result == null) result = caseNamedElement(planningData);
-				if (result == null) result = caseElement(planningData);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.PRACTICE: {
-				Practice practice = (Practice)theEObject;
-				Object result = casePractice(practice);
-				if (result == null) result = caseGuidance(practice);
-				if (result == null) result = caseContentElement(practice);
-				if (result == null) result = caseDescribableElement(practice);
-				if (result == null) result = caseMethodElement(practice);
-				if (result == null) result = casePackageableElement(practice);
-				if (result == null) result = caseNamedElement(practice);
-				if (result == null) result = caseElement(practice);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.PRACTICE_DESCRIPTION: {
-				PracticeDescription practiceDescription = (PracticeDescription)theEObject;
-				Object result = casePracticeDescription(practiceDescription);
-				if (result == null) result = caseContentDescription(practiceDescription);
-				if (result == null) result = caseMethodUnit(practiceDescription);
-				if (result == null) result = caseMethodElement(practiceDescription);
-				if (result == null) result = casePackageableElement(practiceDescription);
-				if (result == null) result = caseNamedElement(practiceDescription);
-				if (result == null) result = caseElement(practiceDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.PROCESS: {
-				org.eclipse.epf.xml.uma.Process process = (org.eclipse.epf.xml.uma.Process)theEObject;
-				Object result = caseProcess(process);
-				if (result == null) result = caseActivity(process);
-				if (result == null) result = caseWorkBreakdownElement(process);
-				if (result == null) result = caseBreakdownElement(process);
-				if (result == null) result = caseProcessElement(process);
-				if (result == null) result = caseDescribableElement(process);
-				if (result == null) result = caseMethodElement(process);
-				if (result == null) result = casePackageableElement(process);
-				if (result == null) result = caseNamedElement(process);
-				if (result == null) result = caseElement(process);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.PROCESS_COMPONENT: {
-				ProcessComponent processComponent = (ProcessComponent)theEObject;
-				Object result = caseProcessComponent(processComponent);
-				if (result == null) result = caseProcessPackage(processComponent);
-				if (result == null) result = caseMethodPackage(processComponent);
-				if (result == null) result = caseMethodElement(processComponent);
-				if (result == null) result = casePackageableElement(processComponent);
-				if (result == null) result = caseNamedElement(processComponent);
-				if (result == null) result = caseElement(processComponent);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.PROCESS_COMPONENT_INTERFACE: {
-				ProcessComponentInterface processComponentInterface = (ProcessComponentInterface)theEObject;
-				Object result = caseProcessComponentInterface(processComponentInterface);
-				if (result == null) result = caseBreakdownElement(processComponentInterface);
-				if (result == null) result = caseProcessElement(processComponentInterface);
-				if (result == null) result = caseDescribableElement(processComponentInterface);
-				if (result == null) result = caseMethodElement(processComponentInterface);
-				if (result == null) result = casePackageableElement(processComponentInterface);
-				if (result == null) result = caseNamedElement(processComponentInterface);
-				if (result == null) result = caseElement(processComponentInterface);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.PROCESS_DESCRIPTION: {
-				ProcessDescription processDescription = (ProcessDescription)theEObject;
-				Object result = caseProcessDescription(processDescription);
-				if (result == null) result = caseActivityDescription(processDescription);
-				if (result == null) result = caseBreakdownElementDescription(processDescription);
-				if (result == null) result = caseContentDescription(processDescription);
-				if (result == null) result = caseMethodUnit(processDescription);
-				if (result == null) result = caseMethodElement(processDescription);
-				if (result == null) result = casePackageableElement(processDescription);
-				if (result == null) result = caseNamedElement(processDescription);
-				if (result == null) result = caseElement(processDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.PROCESS_ELEMENT: {
-				ProcessElement processElement = (ProcessElement)theEObject;
-				Object result = caseProcessElement(processElement);
-				if (result == null) result = caseDescribableElement(processElement);
-				if (result == null) result = caseMethodElement(processElement);
-				if (result == null) result = casePackageableElement(processElement);
-				if (result == null) result = caseNamedElement(processElement);
-				if (result == null) result = caseElement(processElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.PROCESS_PACKAGE: {
-				ProcessPackage processPackage = (ProcessPackage)theEObject;
-				Object result = caseProcessPackage(processPackage);
-				if (result == null) result = caseMethodPackage(processPackage);
-				if (result == null) result = caseMethodElement(processPackage);
-				if (result == null) result = casePackageableElement(processPackage);
-				if (result == null) result = caseNamedElement(processPackage);
-				if (result == null) result = caseElement(processPackage);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.PROCESS_PLANNING_TEMPLATE: {
-				ProcessPlanningTemplate processPlanningTemplate = (ProcessPlanningTemplate)theEObject;
-				Object result = caseProcessPlanningTemplate(processPlanningTemplate);
-				if (result == null) result = caseProcess(processPlanningTemplate);
-				if (result == null) result = caseActivity(processPlanningTemplate);
-				if (result == null) result = caseWorkBreakdownElement(processPlanningTemplate);
-				if (result == null) result = caseBreakdownElement(processPlanningTemplate);
-				if (result == null) result = caseProcessElement(processPlanningTemplate);
-				if (result == null) result = caseDescribableElement(processPlanningTemplate);
-				if (result == null) result = caseMethodElement(processPlanningTemplate);
-				if (result == null) result = casePackageableElement(processPlanningTemplate);
-				if (result == null) result = caseNamedElement(processPlanningTemplate);
-				if (result == null) result = caseElement(processPlanningTemplate);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.REPORT: {
-				Report report = (Report)theEObject;
-				Object result = caseReport(report);
-				if (result == null) result = caseGuidance(report);
-				if (result == null) result = caseContentElement(report);
-				if (result == null) result = caseDescribableElement(report);
-				if (result == null) result = caseMethodElement(report);
-				if (result == null) result = casePackageableElement(report);
-				if (result == null) result = caseNamedElement(report);
-				if (result == null) result = caseElement(report);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.REUSABLE_ASSET: {
-				ReusableAsset reusableAsset = (ReusableAsset)theEObject;
-				Object result = caseReusableAsset(reusableAsset);
-				if (result == null) result = caseGuidance(reusableAsset);
-				if (result == null) result = caseContentElement(reusableAsset);
-				if (result == null) result = caseDescribableElement(reusableAsset);
-				if (result == null) result = caseMethodElement(reusableAsset);
-				if (result == null) result = casePackageableElement(reusableAsset);
-				if (result == null) result = caseNamedElement(reusableAsset);
-				if (result == null) result = caseElement(reusableAsset);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.ROADMAP: {
-				Roadmap roadmap = (Roadmap)theEObject;
-				Object result = caseRoadmap(roadmap);
-				if (result == null) result = caseGuidance(roadmap);
-				if (result == null) result = caseContentElement(roadmap);
-				if (result == null) result = caseDescribableElement(roadmap);
-				if (result == null) result = caseMethodElement(roadmap);
-				if (result == null) result = casePackageableElement(roadmap);
-				if (result == null) result = caseNamedElement(roadmap);
-				if (result == null) result = caseElement(roadmap);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.ROLE: {
-				Role role = (Role)theEObject;
-				Object result = caseRole(role);
-				if (result == null) result = caseContentElement(role);
-				if (result == null) result = caseDescribableElement(role);
-				if (result == null) result = caseMethodElement(role);
-				if (result == null) result = casePackageableElement(role);
-				if (result == null) result = caseNamedElement(role);
-				if (result == null) result = caseElement(role);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.ROLE_DESCRIPTION: {
-				RoleDescription roleDescription = (RoleDescription)theEObject;
-				Object result = caseRoleDescription(roleDescription);
-				if (result == null) result = caseContentDescription(roleDescription);
-				if (result == null) result = caseMethodUnit(roleDescription);
-				if (result == null) result = caseMethodElement(roleDescription);
-				if (result == null) result = casePackageableElement(roleDescription);
-				if (result == null) result = caseNamedElement(roleDescription);
-				if (result == null) result = caseElement(roleDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.ROLE_DESCRIPTOR: {
-				RoleDescriptor roleDescriptor = (RoleDescriptor)theEObject;
-				Object result = caseRoleDescriptor(roleDescriptor);
-				if (result == null) result = caseDescriptor(roleDescriptor);
-				if (result == null) result = caseBreakdownElement(roleDescriptor);
-				if (result == null) result = caseProcessElement(roleDescriptor);
-				if (result == null) result = caseDescribableElement(roleDescriptor);
-				if (result == null) result = caseMethodElement(roleDescriptor);
-				if (result == null) result = casePackageableElement(roleDescriptor);
-				if (result == null) result = caseNamedElement(roleDescriptor);
-				if (result == null) result = caseElement(roleDescriptor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.ROLE_SET: {
-				RoleSet roleSet = (RoleSet)theEObject;
-				Object result = caseRoleSet(roleSet);
-				if (result == null) result = caseContentCategory(roleSet);
-				if (result == null) result = caseContentElement(roleSet);
-				if (result == null) result = caseDescribableElement(roleSet);
-				if (result == null) result = caseMethodElement(roleSet);
-				if (result == null) result = casePackageableElement(roleSet);
-				if (result == null) result = caseNamedElement(roleSet);
-				if (result == null) result = caseElement(roleSet);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.ROLE_SET_GROUPING: {
-				RoleSetGrouping roleSetGrouping = (RoleSetGrouping)theEObject;
-				Object result = caseRoleSetGrouping(roleSetGrouping);
-				if (result == null) result = caseContentCategory(roleSetGrouping);
-				if (result == null) result = caseContentElement(roleSetGrouping);
-				if (result == null) result = caseDescribableElement(roleSetGrouping);
-				if (result == null) result = caseMethodElement(roleSetGrouping);
-				if (result == null) result = casePackageableElement(roleSetGrouping);
-				if (result == null) result = caseNamedElement(roleSetGrouping);
-				if (result == null) result = caseElement(roleSetGrouping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.SECTION: {
-				Section section = (Section)theEObject;
-				Object result = caseSection(section);
-				if (result == null) result = caseMethodElement(section);
-				if (result == null) result = casePackageableElement(section);
-				if (result == null) result = caseNamedElement(section);
-				if (result == null) result = caseElement(section);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.SUPPORTING_MATERIAL: {
-				SupportingMaterial supportingMaterial = (SupportingMaterial)theEObject;
-				Object result = caseSupportingMaterial(supportingMaterial);
-				if (result == null) result = caseGuidance(supportingMaterial);
-				if (result == null) result = caseContentElement(supportingMaterial);
-				if (result == null) result = caseDescribableElement(supportingMaterial);
-				if (result == null) result = caseMethodElement(supportingMaterial);
-				if (result == null) result = casePackageableElement(supportingMaterial);
-				if (result == null) result = caseNamedElement(supportingMaterial);
-				if (result == null) result = caseElement(supportingMaterial);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.TASK: {
-				Task task = (Task)theEObject;
-				Object result = caseTask(task);
-				if (result == null) result = caseContentElement(task);
-				if (result == null) result = caseDescribableElement(task);
-				if (result == null) result = caseMethodElement(task);
-				if (result == null) result = casePackageableElement(task);
-				if (result == null) result = caseNamedElement(task);
-				if (result == null) result = caseElement(task);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.TASK_DESCRIPTION: {
-				TaskDescription taskDescription = (TaskDescription)theEObject;
-				Object result = caseTaskDescription(taskDescription);
-				if (result == null) result = caseContentDescription(taskDescription);
-				if (result == null) result = caseMethodUnit(taskDescription);
-				if (result == null) result = caseMethodElement(taskDescription);
-				if (result == null) result = casePackageableElement(taskDescription);
-				if (result == null) result = caseNamedElement(taskDescription);
-				if (result == null) result = caseElement(taskDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.TASK_DESCRIPTOR: {
-				TaskDescriptor taskDescriptor = (TaskDescriptor)theEObject;
-				Object result = caseTaskDescriptor(taskDescriptor);
-				if (result == null) result = caseWorkBreakdownElement(taskDescriptor);
-				if (result == null) result = caseBreakdownElement(taskDescriptor);
-				if (result == null) result = caseProcessElement(taskDescriptor);
-				if (result == null) result = caseDescribableElement(taskDescriptor);
-				if (result == null) result = caseMethodElement(taskDescriptor);
-				if (result == null) result = casePackageableElement(taskDescriptor);
-				if (result == null) result = caseNamedElement(taskDescriptor);
-				if (result == null) result = caseElement(taskDescriptor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.TEAM_PROFILE: {
-				TeamProfile teamProfile = (TeamProfile)theEObject;
-				Object result = caseTeamProfile(teamProfile);
-				if (result == null) result = caseBreakdownElement(teamProfile);
-				if (result == null) result = caseProcessElement(teamProfile);
-				if (result == null) result = caseDescribableElement(teamProfile);
-				if (result == null) result = caseMethodElement(teamProfile);
-				if (result == null) result = casePackageableElement(teamProfile);
-				if (result == null) result = caseNamedElement(teamProfile);
-				if (result == null) result = caseElement(teamProfile);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.TEMPLATE: {
-				Template template = (Template)theEObject;
-				Object result = caseTemplate(template);
-				if (result == null) result = caseGuidance(template);
-				if (result == null) result = caseContentElement(template);
-				if (result == null) result = caseDescribableElement(template);
-				if (result == null) result = caseMethodElement(template);
-				if (result == null) result = casePackageableElement(template);
-				if (result == null) result = caseNamedElement(template);
-				if (result == null) result = caseElement(template);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.TERM_DEFINITION: {
-				TermDefinition termDefinition = (TermDefinition)theEObject;
-				Object result = caseTermDefinition(termDefinition);
-				if (result == null) result = caseGuidance(termDefinition);
-				if (result == null) result = caseContentElement(termDefinition);
-				if (result == null) result = caseDescribableElement(termDefinition);
-				if (result == null) result = caseMethodElement(termDefinition);
-				if (result == null) result = casePackageableElement(termDefinition);
-				if (result == null) result = caseNamedElement(termDefinition);
-				if (result == null) result = caseElement(termDefinition);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.TOOL: {
-				Tool tool = (Tool)theEObject;
-				Object result = caseTool(tool);
-				if (result == null) result = caseContentCategory(tool);
-				if (result == null) result = caseContentElement(tool);
-				if (result == null) result = caseDescribableElement(tool);
-				if (result == null) result = caseMethodElement(tool);
-				if (result == null) result = casePackageableElement(tool);
-				if (result == null) result = caseNamedElement(tool);
-				if (result == null) result = caseElement(tool);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.TOOL_MENTOR: {
-				ToolMentor toolMentor = (ToolMentor)theEObject;
-				Object result = caseToolMentor(toolMentor);
-				if (result == null) result = caseGuidance(toolMentor);
-				if (result == null) result = caseContentElement(toolMentor);
-				if (result == null) result = caseDescribableElement(toolMentor);
-				if (result == null) result = caseMethodElement(toolMentor);
-				if (result == null) result = casePackageableElement(toolMentor);
-				if (result == null) result = caseNamedElement(toolMentor);
-				if (result == null) result = caseElement(toolMentor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.WHITEPAPER: {
-				Whitepaper whitepaper = (Whitepaper)theEObject;
-				Object result = caseWhitepaper(whitepaper);
-				if (result == null) result = caseConcept(whitepaper);
-				if (result == null) result = caseGuidance(whitepaper);
-				if (result == null) result = caseContentElement(whitepaper);
-				if (result == null) result = caseDescribableElement(whitepaper);
-				if (result == null) result = caseMethodElement(whitepaper);
-				if (result == null) result = casePackageableElement(whitepaper);
-				if (result == null) result = caseNamedElement(whitepaper);
-				if (result == null) result = caseElement(whitepaper);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.WORK_BREAKDOWN_ELEMENT: {
-				WorkBreakdownElement workBreakdownElement = (WorkBreakdownElement)theEObject;
-				Object result = caseWorkBreakdownElement(workBreakdownElement);
-				if (result == null) result = caseBreakdownElement(workBreakdownElement);
-				if (result == null) result = caseProcessElement(workBreakdownElement);
-				if (result == null) result = caseDescribableElement(workBreakdownElement);
-				if (result == null) result = caseMethodElement(workBreakdownElement);
-				if (result == null) result = casePackageableElement(workBreakdownElement);
-				if (result == null) result = caseNamedElement(workBreakdownElement);
-				if (result == null) result = caseElement(workBreakdownElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.WORK_DEFINITION: {
-				WorkDefinition workDefinition = (WorkDefinition)theEObject;
-				Object result = caseWorkDefinition(workDefinition);
-				if (result == null) result = caseMethodElement(workDefinition);
-				if (result == null) result = casePackageableElement(workDefinition);
-				if (result == null) result = caseNamedElement(workDefinition);
-				if (result == null) result = caseElement(workDefinition);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.WORK_ORDER: {
-				WorkOrder workOrder = (WorkOrder)theEObject;
-				Object result = caseWorkOrder(workOrder);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.WORK_PRODUCT: {
-				WorkProduct workProduct = (WorkProduct)theEObject;
-				Object result = caseWorkProduct(workProduct);
-				if (result == null) result = caseContentElement(workProduct);
-				if (result == null) result = caseDescribableElement(workProduct);
-				if (result == null) result = caseMethodElement(workProduct);
-				if (result == null) result = casePackageableElement(workProduct);
-				if (result == null) result = caseNamedElement(workProduct);
-				if (result == null) result = caseElement(workProduct);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.WORK_PRODUCT_DESCRIPTION: {
-				WorkProductDescription workProductDescription = (WorkProductDescription)theEObject;
-				Object result = caseWorkProductDescription(workProductDescription);
-				if (result == null) result = caseContentDescription(workProductDescription);
-				if (result == null) result = caseMethodUnit(workProductDescription);
-				if (result == null) result = caseMethodElement(workProductDescription);
-				if (result == null) result = casePackageableElement(workProductDescription);
-				if (result == null) result = caseNamedElement(workProductDescription);
-				if (result == null) result = caseElement(workProductDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.WORK_PRODUCT_DESCRIPTOR: {
-				WorkProductDescriptor workProductDescriptor = (WorkProductDescriptor)theEObject;
-				Object result = caseWorkProductDescriptor(workProductDescriptor);
-				if (result == null) result = caseDescriptor(workProductDescriptor);
-				if (result == null) result = caseBreakdownElement(workProductDescriptor);
-				if (result == null) result = caseProcessElement(workProductDescriptor);
-				if (result == null) result = caseDescribableElement(workProductDescriptor);
-				if (result == null) result = caseMethodElement(workProductDescriptor);
-				if (result == null) result = casePackageableElement(workProductDescriptor);
-				if (result == null) result = caseNamedElement(workProductDescriptor);
-				if (result == null) result = caseElement(workProductDescriptor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UmaPackage.WORK_PRODUCT_TYPE: {
-				WorkProductType workProductType = (WorkProductType)theEObject;
-				Object result = caseWorkProductType(workProductType);
-				if (result == null) result = caseContentCategory(workProductType);
-				if (result == null) result = caseContentElement(workProductType);
-				if (result == null) result = caseDescribableElement(workProductType);
-				if (result == null) result = caseMethodElement(workProductType);
-				if (result == null) result = casePackageableElement(workProductType);
-				if (result == null) result = caseNamedElement(workProductType);
-				if (result == null) result = caseElement(workProductType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Activity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Activity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseActivity(Activity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Activity Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Activity Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseActivityDescription(ActivityDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Artifact</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Artifact</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseArtifact(Artifact object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Artifact Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Artifact Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseArtifactDescription(ArtifactDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Breakdown Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Breakdown Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseBreakdownElement(BreakdownElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Breakdown Element Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Breakdown Element Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseBreakdownElementDescription(BreakdownElementDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Capability Pattern</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Capability Pattern</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCapabilityPattern(CapabilityPattern object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Checklist</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Checklist</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseChecklist(Checklist object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Composite Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Composite Role</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompositeRole(CompositeRole object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Concept</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Concept</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseConcept(Concept object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseConstraint(Constraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Content Category</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Content Category</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseContentCategory(ContentCategory object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Content Category Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Content Category Package</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseContentCategoryPackage(ContentCategoryPackage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Content Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Content Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseContentDescription(ContentDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Content Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Content Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseContentElement(ContentElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Content Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Content Package</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseContentPackage(ContentPackage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Custom Category</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Custom Category</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCustomCategory(CustomCategory object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Deliverable</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Deliverable</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDeliverable(Deliverable object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Deliverable Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Deliverable Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDeliverableDescription(DeliverableDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Delivery Process</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Delivery Process</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDeliveryProcess(DeliveryProcess object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Delivery Process Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Delivery Process Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDeliveryProcessDescription(DeliveryProcessDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Describable Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Describable Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescribableElement(DescribableElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptor(Descriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Descriptor Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Descriptor Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptorDescription(DescriptorDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Discipline</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Discipline</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDiscipline(Discipline object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Discipline Grouping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Discipline Grouping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDisciplineGrouping(DisciplineGrouping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Document Root</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Document Root</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDocumentRoot(DocumentRoot object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Domain</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Domain</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDomain(Domain object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseElement(Element object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Estimate</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Estimate</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEstimate(Estimate object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Estimating Metric</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Estimating Metric</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEstimatingMetric(EstimatingMetric object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Estimation Considerations</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Estimation Considerations</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEstimationConsiderations(EstimationConsiderations object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Example</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Example</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExample(Example object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Guidance</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Guidance</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseGuidance(Guidance object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Guidance Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Guidance Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseGuidanceDescription(GuidanceDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Guideline</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Guideline</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseGuideline(Guideline object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Iteration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Iteration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIteration(Iteration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodConfiguration(MethodConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodElement(MethodElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Library</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Library</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodLibrary(MethodLibrary object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Package</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodPackage(MethodPackage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Plugin</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Plugin</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodPlugin(MethodPlugin object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Unit</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Unit</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodUnit(MethodUnit object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Milestone</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Milestone</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMilestone(Milestone object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Named Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Named Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseNamedElement(NamedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Outcome</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Outcome</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseOutcome(Outcome object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Packageable Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Packageable Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePackageableElement(PackageableElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Phase</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Phase</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePhase(Phase object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Planning Data</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Planning Data</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePlanningData(PlanningData object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Practice</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Practice</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePractice(Practice object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Practice Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Practice Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePracticeDescription(PracticeDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcess(org.eclipse.epf.xml.uma.Process object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process Component</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process Component</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcessComponent(ProcessComponent object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process Component Interface</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process Component Interface</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcessComponentInterface(ProcessComponentInterface object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcessDescription(ProcessDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcessElement(ProcessElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process Package</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process Package</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcessPackage(ProcessPackage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Process Planning Template</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Process Planning Template</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseProcessPlanningTemplate(ProcessPlanningTemplate object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Report</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Report</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseReport(Report object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Reusable Asset</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Reusable Asset</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseReusableAsset(ReusableAsset object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Roadmap</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Roadmap</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoadmap(Roadmap object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRole(Role object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoleDescription(RoleDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoleDescriptor(RoleDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role Set</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoleSet(RoleSet object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role Set Grouping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role Set Grouping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoleSetGrouping(RoleSetGrouping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Section</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Section</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSection(Section object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Supporting Material</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Supporting Material</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSupportingMaterial(SupportingMaterial object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Task</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Task</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTask(Task object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Task Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Task Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTaskDescription(TaskDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Task Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Task Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTaskDescriptor(TaskDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Team Profile</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Team Profile</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTeamProfile(TeamProfile object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Template</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Template</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTemplate(Template object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Term Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Term Definition</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTermDefinition(TermDefinition object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Tool</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Tool</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTool(Tool object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Tool Mentor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Tool Mentor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseToolMentor(ToolMentor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Whitepaper</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Whitepaper</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWhitepaper(Whitepaper object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Breakdown Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Breakdown Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkBreakdownElement(WorkBreakdownElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Definition</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkDefinition(WorkDefinition object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Order</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Order</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkOrder(WorkOrder object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Product</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Product</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkProduct(WorkProduct object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Product Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Product Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkProductDescription(WorkProductDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Product Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Product Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkProductDescriptor(WorkProductDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Work Product Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Work Product Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWorkProductType(WorkProductType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //UmaSwitch
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaXMLProcessor.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaXMLProcessor.java
deleted file mode 100755
index f1f936b..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaXMLProcessor.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UmaXMLProcessor.java,v 1.3 2006/09/07 00:06:00 klow Exp $
- */
-package org.eclipse.epf.xml.uma.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-import org.eclipse.epf.xml.uma.UmaPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class UmaXMLProcessor extends XMLProcessor {
-	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UmaXMLProcessor() {
-		super((EPackage.Registry.INSTANCE));
-		UmaPackage.eINSTANCE.eClass();
-	}
-	
-	/**
-	 * Register for "*" and "xml" file extensions the UmaResourceFactoryImpl factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Map getRegistrations() {
-		if (registrations == null) {
-			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new UmaResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new UmaResourceFactoryImpl());
-		}
-		return registrations;
-	}
-
-} //UmaXMLProcessor
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaXMLSaveImpl.java b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaXMLSaveImpl.java
deleted file mode 100755
index e6ac6c0..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/UmaXMLSaveImpl.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.eclipse.epf.xml.uma.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.impl.XMLSaveImpl;
-import org.eclipse.epf.common.serviceability.VersionUtil;
-
-/**
- * This class customize the XMLSaveImpl to save the string tags as CDATA
- * 
- * @author Jinhua Xi
- * @since 1.0
- *
- */
-public class UmaXMLSaveImpl extends XMLSaveImpl {
-
-	public static List cdataFeatureNames = new ArrayList();
-	static {
-		
-		cdataFeatureNames.add("alternatives");
-		cdataFeatureNames.add("mainDescription");
-		cdataFeatureNames.add("howToStaff");
-		cdataFeatureNames.add("keyConsiderations");
-		cdataFeatureNames.add("purpose");	
-		cdataFeatureNames.add("scope");					// ProcessDescription
-		cdataFeatureNames.add("usageNotes");			// ProcessDescription
-	}
-	
-	private boolean isCDATAFeature(EStructuralFeature f, boolean isAttribute) {
-		
-		if ( isAttribute ) {
-			return false;
-		}
-		
-//		if ( f == UmaPackage.eINSTANCE.getContentDescription_KeyConsiderations() 
-//			|| f == UmaPackage.eINSTANCE.getContentDescription_MainDescription()
-//			|| f == UmaPackage.eINSTANCE.getSection_Description()
-//		) {
-//			System.out.println("test");
-//		}
-		
-		return cdataFeatureNames.contains(f.getName());
-	}
-	
-	/**
-	 * 
-	 * @param helper
-	 */
-	public UmaXMLSaveImpl(XMLHelper helper) {
-		super(helper);
-	}
-
-	/**
-	 * 
-	 * @param options Map
-	 * @param helper XMLHelper
-	 * @param encoding String
-	 */
-	public UmaXMLSaveImpl(Map options, XMLHelper helper, String encoding) {
-		super(options, helper, encoding);
-	}
-
-	protected String getDatatypeValue(Object value, EStructuralFeature f,
-			boolean isAttribute) {	
-		
-		if ( value == null || value.toString().equals("") ) {
-			return "";
-		}				
-		
-		if ( isCDATAFeature(f, isAttribute) ) {
-			String str = value.toString();
-			String replaced = "]]>";								//$NON-NLS-1$
-			if (str != null && str.indexOf(replaced) >= 0) {
-				str = str.replaceAll(replaced, "]]]]><![CDATA[>" );	//$NON-NLS-1$	//175395
-			}
-			return "<![CDATA[" + str + "]]>";
-		}
-		
-		return super.getDatatypeValue(value, f, isAttribute);
-	}
-	
-}
diff --git a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/package.html b/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/package.html
deleted file mode 100755
index fe59fcc..0000000
--- a/plugins/org.eclipse.epf.xml.uma/src/org/eclipse/epf/xml/uma/util/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides implementation support for accessing the XML UMA model objects.
-</body>
-</html>
\ No newline at end of file